From c76d12d1ded72b5bf74a51fdb1647f87bb935edc Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@umorpha.io>
Date: Fri, 15 Dec 2023 10:58:20 -0700
Subject: [PATCH 001/666] Oidc: Properly query the UserInfo Endpoint

BooksStack's OIDC Client requests the 'profile' and 'email' scope values
in order to have access to the 'name', 'email', and other claims.  It
looks for these claims in the ID Token that is returned along with the
Access Token.

However, the OIDC-core specification section 5.4 [1] only requires that
the Provider include those claims in the ID Token *if* an Access Token is
not also issued.  If an Access Token is issued, the Provider can leave out
those claims from the ID Token, and the Client is supposed to obtain them
by submitting the Access Token to the UserInfo Endpoint.

So I suppose it's just good luck that the OIDC Providers that BookStack
has been tested with just so happen to also stick those claims in the ID
Token even though they don't have to.  But others (in particular:
https://login.infomaniak.com) don't do so, and require fetching the
UserInfo Endpoint.)

A workaround is currently possible by having the user write a theme with a
ThemeEvents::OIDC_ID_TOKEN_PRE_VALIDATE hook that fetches the UserInfo
Endpoint.  This workaround isn't great, for a few reasons:
 1. Asking the user to implement core parts of the OIDC protocol is silly.
 2. The user either needs to re-fetch the .well-known/openid-configuration
    file to discover the endpoint (adding yet another round-trip to each
    login) or hard-code the endpoint, which is fragile.
 3. The hook doesn't receive the HTTP client configuration.

So, have BookStack's OidcService fetch the UserInfo Endpoint and inject
those claims into the ID Token, if a UserInfo Endpoint is defined.
Two points about this:
 - Injecting them into the ID Token's claims is the most obvious approach
   given the current code structure; though I'm not sure it is the best
   approach, perhaps it should instead fetch the user info in
   processAuthorizationResponse() and pass that as an argument to
   processAccessTokenCallback() which would then need a bit of
   restructuring.  But this made sense because it's also how the
   ThemeEvents::OIDC_ID_TOKEN_PRE_VALIDATE hook works.
 - OIDC *requires* that a UserInfo Endpoint exists, so why bother with
   that "if a UserInfo Endpoint is defined" bit?  Simply out of an
   abundance of caution that there's an existing BookStack user that is
   relying on it not fetching the UserInfo Endpoint in order to work with
   a non-compliant OIDC Provider.

[1]: https://openid.net/specs/openid-connect-core-1_0.html#ScopeClaims
---
 .env.example.complete                    |  1 +
 app/Access/Oidc/OidcProviderSettings.php |  7 ++++-
 app/Access/Oidc/OidcService.php          | 12 ++++++++
 app/Config/oidc.php                      |  1 +
 tests/Auth/OidcTest.php                  | 38 ++++++++++++++++++++++--
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/.env.example.complete b/.env.example.complete
index e8520a24cae..1242968182a 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -267,6 +267,7 @@ OIDC_ISSUER_DISCOVER=false
 OIDC_PUBLIC_KEY=null
 OIDC_AUTH_ENDPOINT=null
 OIDC_TOKEN_ENDPOINT=null
+OIDC_USERINFO_ENDPOINT=null
 OIDC_ADDITIONAL_SCOPES=null
 OIDC_DUMP_USER_DETAILS=false
 OIDC_USER_TO_GROUPS=false
diff --git a/app/Access/Oidc/OidcProviderSettings.php b/app/Access/Oidc/OidcProviderSettings.php
index bea6a523e77..49ccab6f0de 100644
--- a/app/Access/Oidc/OidcProviderSettings.php
+++ b/app/Access/Oidc/OidcProviderSettings.php
@@ -22,6 +22,7 @@ class OidcProviderSettings
     public ?string $authorizationEndpoint;
     public ?string $tokenEndpoint;
     public ?string $endSessionEndpoint;
+    public ?string $userinfoEndpoint;
 
     /**
      * @var string[]|array[]
@@ -128,6 +129,10 @@ protected function loadSettingsFromIssuerDiscovery(ClientInterface $httpClient):
             $discoveredSettings['tokenEndpoint'] = $result['token_endpoint'];
         }
 
+        if (!empty($result['userinfo_endpoint'])) {
+            $discoveredSettings['userinfoEndpoint'] = $result['userinfo_endpoint'];
+        }
+
         if (!empty($result['jwks_uri'])) {
             $keys = $this->loadKeysFromUri($result['jwks_uri'], $httpClient);
             $discoveredSettings['keys'] = $this->filterKeys($keys);
@@ -177,7 +182,7 @@ protected function loadKeysFromUri(string $uri, ClientInterface $httpClient): ar
      */
     public function arrayForProvider(): array
     {
-        $settingKeys = ['clientId', 'clientSecret', 'redirectUri', 'authorizationEndpoint', 'tokenEndpoint'];
+        $settingKeys = ['clientId', 'clientSecret', 'redirectUri', 'authorizationEndpoint', 'tokenEndpoint', 'userinfoEndpoint'];
         $settings = [];
         foreach ($settingKeys as $setting) {
             $settings[$setting] = $this->$setting;
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index f1e5b25af14..24495799195 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -85,6 +85,7 @@ protected function getProviderSettings(): OidcProviderSettings
             'authorizationEndpoint' => $config['authorization_endpoint'],
             'tokenEndpoint'         => $config['token_endpoint'],
             'endSessionEndpoint'    => is_string($config['end_session_endpoint']) ? $config['end_session_endpoint'] : null,
+            'userinfoEndpoint'      => $config['userinfo_endpoint'],
         ]);
 
         // Use keys if configured
@@ -228,6 +229,17 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
 
         session()->put("oidc_id_token", $idTokenText);
 
+        if (!empty($settings->userinfoEndpoint)) {
+            $provider = $this->getProvider($settings);
+            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
+            $response = $provider->getParsedResponse($request);
+            $claims = $idToken->getAllClaims();
+            foreach ($response as $key => $value) {
+                $claims[$key] = $value;
+            }
+            $idToken->replaceClaims($claims);
+        }
+
         $returnClaims = Theme::dispatch(ThemeEvents::OIDC_ID_TOKEN_PRE_VALIDATE, $idToken->getAllClaims(), [
             'access_token' => $accessToken->getToken(),
             'expires_in' => $accessToken->getExpires(),
diff --git a/app/Config/oidc.php b/app/Config/oidc.php
index 7f8f40d4190..8b5470931d0 100644
--- a/app/Config/oidc.php
+++ b/app/Config/oidc.php
@@ -35,6 +35,7 @@
     // OAuth2 endpoints.
     'authorization_endpoint' => env('OIDC_AUTH_ENDPOINT', null),
     'token_endpoint'         => env('OIDC_TOKEN_ENDPOINT', null),
+    'userinfo_endpoint'      => env('OIDC_USERINFO_ENDPOINT', null),
 
     // OIDC RP-Initiated Logout endpoint URL.
     // A false value force-disables RP-Initiated Logout.
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index dbf26f1bd30..f47a201005d 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -668,11 +668,44 @@ protected function withAutodiscovery()
 
     protected function runLogin($claimOverrides = []): TestResponse
     {
+        // These two variables should perhaps be arguments instead of
+        // assuming that they're tied to whether discovery is enabled,
+        // but that's how the tests are written for now.
+        $claimsInIdToken = !config('oidc.discover');
+        $tokenEndpoint = config('oidc.discover')
+                       ? OidcJwtHelper::defaultIssuer() . '/oidc/token'
+                       : 'https://oidc.local/token';
+
         $this->post('/oidc/login');
         $state = session()->get('oidc_state');
-        $this->mockHttpClient([$this->getMockAuthorizationResponse($claimOverrides)]);
 
-        return $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
+        $providerResponses = [$this->getMockAuthorizationResponse($claimsInIdToken ? $claimOverrides : [])];
+        if (!$claimsInIdToken) {
+            $providerResponses[] = new Response(200, [
+                'Content-Type'  => 'application/json',
+                'Cache-Control' => 'no-cache, no-store',
+                'Pragma'        => 'no-cache',
+            ], json_encode($claimOverrides));
+        }
+
+        $transactions = $this->mockHttpClient($providerResponses);
+
+        $response = $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
+
+        if (auth()->check()) {
+            $this->assertEquals($claimsInIdToken ? 1 : 2, $transactions->requestCount());
+            $tokenRequest = $transactions->requestAt(0);
+            $this->assertEquals($tokenEndpoint, (string) $tokenRequest->getUri());
+            $this->assertEquals('POST', $tokenRequest->getMethod());
+            if (!$claimsInIdToken) {
+                $userinfoRequest = $transactions->requestAt(1);
+                $this->assertEquals(OidcJwtHelper::defaultIssuer() . '/oidc/userinfo', (string) $userinfoRequest->getUri());
+                $this->assertEquals('GET', $userinfoRequest->getMethod());
+                $this->assertEquals('Bearer abc123', $userinfoRequest->getHeader('Authorization')[0]);
+            }
+        }
+
+        return $response;
     }
 
     protected function getAutoDiscoveryResponse($responseOverrides = []): Response
@@ -684,6 +717,7 @@ protected function getAutoDiscoveryResponse($responseOverrides = []): Response
         ], json_encode(array_merge([
             'token_endpoint'         => OidcJwtHelper::defaultIssuer() . '/oidc/token',
             'authorization_endpoint' => OidcJwtHelper::defaultIssuer() . '/oidc/authorize',
+            'userinfo_endpoint'      => OidcJwtHelper::defaultIssuer() . '/oidc/userinfo',
             'jwks_uri'               => OidcJwtHelper::defaultIssuer() . '/oidc/keys',
             'issuer'                 => OidcJwtHelper::defaultIssuer(),
             'end_session_endpoint'   => OidcJwtHelper::defaultIssuer() . '/oidc/logout',

From 70bfebcd7c9396c9d17757ec57a584371dce2e9f Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Mon, 1 Jan 2024 21:58:49 +0100
Subject: [PATCH 002/666] Added Default Templates for Chapters

---
 .../Controllers/ChapterController.php         | 14 ++++----
 app/Entities/Controllers/PageController.php   |  9 +++--
 app/Entities/Models/Chapter.php               | 11 ++++++
 app/Entities/Repos/ChapterRepo.php            | 34 +++++++++++++++++++
 app/Entities/Repos/PageRepo.php               |  8 ++++-
 app/Entities/Tools/TrashCan.php               |  6 ++++
 ...04542_add_default_template_to_chapters.php | 32 +++++++++++++++++
 lang/en/entities.php                          |  3 ++
 resources/views/chapters/parts/form.blade.php | 23 +++++++++++++
 9 files changed, 131 insertions(+), 9 deletions(-)
 create mode 100644 database/migrations/2024_01_01_104542_add_default_template_to_chapters.php

diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 28ad35fa4b3..00616888a70 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -49,9 +49,10 @@ public function create(string $bookSlug)
     public function store(Request $request, string $bookSlug)
     {
         $validated = $this->validate($request, [
-            'name'             => ['required', 'string', 'max:255'],
-            'description_html' => ['string', 'max:2000'],
-            'tags'             => ['array'],
+            'name'                => ['required', 'string', 'max:255'],
+            'description_html'    => ['string', 'max:2000'],
+            'tags'                => ['array'],
+            'default_template_id' => ['nullable', 'integer'],
         ]);
 
         $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
@@ -111,9 +112,10 @@ public function edit(string $bookSlug, string $chapterSlug)
     public function update(Request $request, string $bookSlug, string $chapterSlug)
     {
         $validated = $this->validate($request, [
-            'name'             => ['required', 'string', 'max:255'],
-            'description_html' => ['string', 'max:2000'],
-            'tags'             => ['array'],
+            'name'                => ['required', 'string', 'max:255'],
+            'description_html'    => ['string', 'max:2000'],
+            'tags'                => ['array'],
+            'default_template_id' => ['nullable', 'integer'],
         ]);
 
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index adafcdc7bd9..74dd4f531b4 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -6,6 +6,7 @@
 use BookStack\Activity\Tools\CommentTree;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\BookContents;
@@ -259,7 +260,9 @@ public function showDelete(string $bookSlug, string $pageSlug)
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
-        $usedAsTemplate = Book::query()->where('default_template_id', '=', $page->id)->count() > 0;
+        $usedAsTemplate = 
+            Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
+            Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
 
         return view('pages.delete', [
             'book'    => $page->book,
@@ -279,7 +282,9 @@ public function showDeleteDraft(string $bookSlug, int $pageId)
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
-        $usedAsTemplate = Book::query()->where('default_template_id', '=', $page->id)->count() > 0;
+        $usedAsTemplate = 
+            Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
+            Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
 
         return view('pages.delete', [
             'book'    => $page->book,
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index f30d77b5c5c..d3a7101116b 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Entities\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
@@ -11,6 +12,8 @@
  *
  * @property Collection<Page> $pages
  * @property string           $description
+ * @property ?int             $default_template_id
+ * @property ?Page            $defaultTemplate
  */
 class Chapter extends BookChild
 {
@@ -48,6 +51,14 @@ public function getUrl(string $path = ''): string
         return url('/' . implode('/', $parts));
     }
 
+    /**
+     * Get the Page that is used as default template for newly created pages within this Chapter.
+     */
+    public function defaultTemplate(): BelongsTo
+    {
+        return $this->belongsTo(Page::class, 'default_template_id');
+    }
+
     /**
      * Get the visible pages in this chapter.
      */
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 977193d85bb..9534a406082 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\BookContents;
@@ -46,6 +47,7 @@ public function create(array $input, Book $parentBook): Chapter
         $chapter->book_id = $parentBook->id;
         $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
         $this->baseRepo->create($chapter, $input);
+        $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
         return $chapter;
@@ -57,6 +59,11 @@ public function create(array $input, Book $parentBook): Chapter
     public function update(Chapter $chapter, array $input): Chapter
     {
         $this->baseRepo->update($chapter, $input);
+
+        if (array_key_exists('default_template_id', $input)) {
+            $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id']));
+        }
+
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 
         return $chapter;
@@ -101,6 +108,33 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
         return $parent;
     }
 
+    /**
+     * Update the default page template used for this chapter.
+     * Checks that, if changing, the provided value is a valid template and the user
+     * has visibility of the provided page template id.
+     */
+    protected function updateChapterDefaultTemplate(Chapter $chapter, int $templateId): void
+    {
+        $changing = $templateId !== intval($chapter->default_template_id);
+        if (!$changing) {
+            return;
+        }
+
+        if ($templateId === 0) {
+            $chapter->default_template_id = null;
+            $chapter->save();
+            return;
+        }
+
+        $templateExists = Page::query()->visible()
+            ->where('template', '=', true)
+            ->where('id', '=', $templateId)
+            ->exists();
+
+        $chapter->default_template_id = $templateExists ? $templateId : null;
+        $chapter->save();
+    }
+
     /**
      * Find a page parent entity via an identifier string in the format:
      * {type}:{id}
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 7b14ea7d278..67c4b222547 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -136,7 +136,13 @@ public function getNewDraftPage(Entity $parent)
             $page->book_id = $parent->id;
         }
 
-        $defaultTemplate = $page->book->defaultTemplate;
+        // check for chapter
+        if ($page->chapter_id) {
+            $defaultTemplate = $page->chapter->defaultTemplate;
+        } else {
+            $defaultTemplate = $page->book->defaultTemplate;
+        }
+        
         if ($defaultTemplate && userCan('view', $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index b2510398541..e5bcfe71ac2 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -208,6 +208,12 @@ protected function destroyPage(Page $page): int
 
         $page->forceDelete();
 
+        // Remove chapter template usages
+        Chapter::query()->where('default_template_id', '=', $page->id)
+            ->update(['default_template_id' => null]);
+
+        $page->forceDelete();
+
         return 1;
     }
 
diff --git a/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
new file mode 100644
index 00000000000..5e9ea1de311
--- /dev/null
+++ b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDefaultTemplateToChapters extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('chapters', function (Blueprint $table) {
+            $table->integer('default_template_id')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('chapters', function (Blueprint $table) {
+            $table->dropColumn('default_template_id');
+        });
+    }
+}
diff --git a/lang/en/entities.php b/lang/en/entities.php
index f1f915544d1..4ab9de47dfb 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -192,6 +192,9 @@
     'chapters_permissions_success' => 'Chapter Permissions Updated',
     'chapters_search_this' => 'Search this chapter',
     'chapter_sort_book' => 'Sort Book',
+    'chapter_default_template' => 'Default Page Template',
+    'chapter_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this chapter. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
+    'chapter_default_template_select' => 'Select a template page',
 
     // Pages
     'page' => 'Page',
diff --git a/resources/views/chapters/parts/form.blade.php b/resources/views/chapters/parts/form.blade.php
index c6052c93af4..ea7f84bc839 100644
--- a/resources/views/chapters/parts/form.blade.php
+++ b/resources/views/chapters/parts/form.blade.php
@@ -22,6 +22,29 @@
     </div>
 </div>
 
+<div class="form-group collapsible" component="collapsible" id="template-control">
+    <button refs="collapsible@trigger" type="button" class="collapse-title text-link" aria-expanded="false">
+        <label for="template-manager">{{ trans('entities.chapter_default_template') }}</label>
+    </button>
+    <div refs="collapsible@content" class="collapse-content">
+        <div class="flex-container-row gap-l justify-space-between pb-xs wrap">
+            <p class="text-muted small my-none min-width-xs flex">
+                {{ trans('entities.chapter_default_template_explain') }}
+            </p>
+
+            <div class="min-width-m">
+                @include('form.page-picker', [
+                    'name' => 'default_template_id',
+                    'placeholder' => trans('entities.chapter_default_template_select'),
+                    'value' => $chapter->default_template_id ?? null,
+                    'selectorEndpoint' => '/search/entity-selector-templates',
+                ])
+            </div>
+        </div>
+
+    </div>
+</div>
+
 <div class="form-group text-right">
     <a href="{{ isset($chapter) ? $chapter->getUrl() : $book->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
     <button type="submit" class="button">{{ trans('entities.chapters_save') }}</button>

From b4d9029dc301f73f0e87026b8eff78cf2cda6164 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 7 Jan 2024 14:03:13 +0000
Subject: [PATCH 003/666] Range requests: Extracted stream output handling to
 new class

---
 app/Http/DownloadResponseFactory.php          | 36 ++++--------
 app/Http/RangeSupportedStream.php             | 57 +++++++++++++++++++
 app/Uploads/AttachmentService.php             | 10 +++-
 .../Controllers/AttachmentController.php      |  5 +-
 4 files changed, 80 insertions(+), 28 deletions(-)
 create mode 100644 app/Http/RangeSupportedStream.php

diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index 20032f52534..f8c10165c80 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -9,11 +9,9 @@
 
 class DownloadResponseFactory
 {
-    protected Request $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
+    public function __construct(
+        protected Request $request
+    ) {
     }
 
     /**
@@ -27,19 +25,11 @@ public function directly(string $content, string $fileName): Response
     /**
      * Create a response that forces a download, from a given stream of content.
      */
-    public function streamedDirectly($stream, string $fileName): StreamedResponse
+    public function streamedDirectly($stream, string $fileName, int $fileSize): StreamedResponse
     {
-        return response()->stream(function () use ($stream) {
-
-            // End & flush the output buffer, if we're in one, otherwise we still use memory.
-            // Output buffer may or may not exist depending on PHP `output_buffering` setting.
-            // Ignore in testing since output buffers are used to gather a response.
-            if (!empty(ob_get_status()) && !app()->runningUnitTests()) {
-                ob_end_clean();
-            }
-
-            fpassthru($stream);
-            fclose($stream);
+        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);
+        return response()->stream(function () use ($rangeStream) {
+            $rangeStream->outputAndClose();
         }, 200, $this->getHeaders($fileName));
     }
 
@@ -48,15 +38,13 @@ public function streamedDirectly($stream, string $fileName): StreamedResponse
      * correct for the file, in a way so the browser can show the content in browser,
      * for a given content stream.
      */
-    public function streamedInline($stream, string $fileName): StreamedResponse
+    public function streamedInline($stream, string $fileName, int $fileSize): StreamedResponse
     {
-        $sniffContent = fread($stream, 2000);
-        $mime = (new WebSafeMimeSniffer())->sniff($sniffContent);
+        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);
+        $mime = $rangeStream->sniffMime();
 
-        return response()->stream(function () use ($sniffContent, $stream) {
-            echo $sniffContent;
-            fpassthru($stream);
-            fclose($stream);
+        return response()->stream(function () use ($rangeStream) {
+            $rangeStream->outputAndClose();
         }, 200, $this->getHeaders($fileName, $mime));
     }
 
diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
new file mode 100644
index 00000000000..dc310503567
--- /dev/null
+++ b/app/Http/RangeSupportedStream.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace BookStack\Http;
+
+use BookStack\Util\WebSafeMimeSniffer;
+use Symfony\Component\HttpFoundation\HeaderBag;
+
+class RangeSupportedStream
+{
+    protected string $sniffContent;
+
+    public function __construct(
+        protected $stream,
+        protected int $fileSize,
+        protected HeaderBag $requestHeaders,
+    ) {
+    }
+
+    /**
+     * Sniff a mime type from the stream.
+     */
+    public function sniffMime(): string
+    {
+        $offset = min(2000, $this->fileSize);
+        $this->sniffContent = fread($this->stream, $offset);
+
+        return (new WebSafeMimeSniffer())->sniff($this->sniffContent);
+    }
+
+    /**
+     * Output the current stream to stdout before closing out the stream.
+     */
+    public function outputAndClose(): void
+    {
+        // End & flush the output buffer, if we're in one, otherwise we still use memory.
+        // Output buffer may or may not exist depending on PHP `output_buffering` setting.
+        // Ignore in testing since output buffers are used to gather a response.
+        if (!empty(ob_get_status()) && !app()->runningUnitTests()) {
+            ob_end_clean();
+        }
+
+        $outStream = fopen('php://output', 'w');
+        $offset = 0;
+
+        if (!empty($this->sniffContent)) {
+            fwrite($outStream, $this->sniffContent);
+            $offset = strlen($this->sniffContent);
+        }
+
+        $toWrite = $this->fileSize - $offset;
+        stream_copy_to_stream($this->stream, $outStream, $toWrite);
+        fpassthru($this->stream);
+
+        fclose($this->stream);
+        fclose($outStream);
+    }
+}
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index ddabec09f27..72f78e347bf 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -66,8 +66,6 @@ protected function adjustPathForStorageDisk(string $path): string
     /**
      * Stream an attachment from storage.
      *
-     * @throws FileNotFoundException
-     *
      * @return resource|null
      */
     public function streamAttachmentFromStorage(Attachment $attachment)
@@ -75,6 +73,14 @@ public function streamAttachmentFromStorage(Attachment $attachment)
         return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
     }
 
+    /**
+     * Read the file size of an attachment from storage, in bytes.
+     */
+    public function getAttachmentFileSize(Attachment $attachment): int
+    {
+        return $this->getStorageDisk()->size($this->adjustPathForStorageDisk($attachment->path));
+    }
+
     /**
      * Store a new attachment upon user upload.
      *
diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
index 92f23465d22..e61c1033884 100644
--- a/app/Uploads/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -226,12 +226,13 @@ public function get(Request $request, string $attachmentId)
 
         $fileName = $attachment->getFileName();
         $attachmentStream = $this->attachmentService->streamAttachmentFromStorage($attachment);
+        $attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment);
 
         if ($request->get('open') === 'true') {
-            return $this->download()->streamedInline($attachmentStream, $fileName);
+            return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize);
         }
 
-        return $this->download()->streamedDirectly($attachmentStream, $fileName);
+        return $this->download()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);
     }
 
     /**

From d94762549a3ef364d4486a27f1585122f60c10ec Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 7 Jan 2024 20:34:03 +0000
Subject: [PATCH 004/666] Range requests: Added basic HTTP range support

---
 app/Http/DownloadResponseFactory.php | 28 ++++----
 app/Http/RangeSupportedStream.php    | 95 +++++++++++++++++++++++++---
 2 files changed, 103 insertions(+), 20 deletions(-)

diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index f8c10165c80..f29aaa2e45a 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Http;
 
-use BookStack\Util\WebSafeMimeSniffer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -19,7 +18,7 @@ public function __construct(
      */
     public function directly(string $content, string $fileName): Response
     {
-        return response()->make($content, 200, $this->getHeaders($fileName));
+        return response()->make($content, 200, $this->getHeaders($fileName, strlen($content)));
     }
 
     /**
@@ -27,10 +26,13 @@ public function directly(string $content, string $fileName): Response
      */
     public function streamedDirectly($stream, string $fileName, int $fileSize): StreamedResponse
     {
-        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);
-        return response()->stream(function () use ($rangeStream) {
-            $rangeStream->outputAndClose();
-        }, 200, $this->getHeaders($fileName));
+        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request);
+        $headers = array_merge($this->getHeaders($fileName, $fileSize), $rangeStream->getResponseHeaders());
+        return response()->stream(
+            fn() => $rangeStream->outputAndClose(),
+            $rangeStream->getResponseStatus(),
+            $headers,
+        );
     }
 
     /**
@@ -40,24 +42,28 @@ public function streamedDirectly($stream, string $fileName, int $fileSize): Stre
      */
     public function streamedInline($stream, string $fileName, int $fileSize): StreamedResponse
     {
-        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request->headers);
+        $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request);
         $mime = $rangeStream->sniffMime();
+        $headers = array_merge($this->getHeaders($fileName, $fileSize, $mime), $rangeStream->getResponseHeaders());
 
-        return response()->stream(function () use ($rangeStream) {
-            $rangeStream->outputAndClose();
-        }, 200, $this->getHeaders($fileName, $mime));
+        return response()->stream(
+            fn() => $rangeStream->outputAndClose(),
+            $rangeStream->getResponseStatus(),
+            $headers,
+        );
     }
 
     /**
      * Get the common headers to provide for a download response.
      */
-    protected function getHeaders(string $fileName, string $mime = 'application/octet-stream'): array
+    protected function getHeaders(string $fileName, int $fileSize, string $mime = 'application/octet-stream'): array
     {
         $disposition = ($mime === 'application/octet-stream') ? 'attachment' : 'inline';
         $downloadName = str_replace('"', '', $fileName);
 
         return [
             'Content-Type'           => $mime,
+            'Content-Length'         => $fileSize,
             'Content-Disposition'    => "{$disposition}; filename=\"{$downloadName}\"",
             'X-Content-Type-Options' => 'nosniff',
         ];
diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
index dc310503567..b51d4a5498f 100644
--- a/app/Http/RangeSupportedStream.php
+++ b/app/Http/RangeSupportedStream.php
@@ -3,17 +3,30 @@
 namespace BookStack\Http;
 
 use BookStack\Util\WebSafeMimeSniffer;
-use Symfony\Component\HttpFoundation\HeaderBag;
+use Illuminate\Http\Request;
 
+/**
+ * Helper wrapper for range-based stream response handling.
+ * Much of this used symfony/http-foundation as a reference during build.
+ * URL: https://github.com/symfony/http-foundation/blob/v6.0.20/BinaryFileResponse.php
+ * License: MIT license, Copyright (c) Fabien Potencier.
+ */
 class RangeSupportedStream
 {
     protected string $sniffContent;
+    protected array $responseHeaders;
+    protected int $responseStatus = 200;
+
+    protected int $responseLength = 0;
+    protected int $responseOffset = 0;
 
     public function __construct(
         protected $stream,
         protected int $fileSize,
-        protected HeaderBag $requestHeaders,
+        Request $request,
     ) {
+        $this->responseLength = $this->fileSize;
+        $this->parseRequest($request);
     }
 
     /**
@@ -40,18 +53,82 @@ public function outputAndClose(): void
         }
 
         $outStream = fopen('php://output', 'w');
-        $offset = 0;
+        $sniffOffset = strlen($this->sniffContent);
 
-        if (!empty($this->sniffContent)) {
-            fwrite($outStream, $this->sniffContent);
-            $offset = strlen($this->sniffContent);
+        if (!empty($this->sniffContent) && $this->responseOffset < $sniffOffset) {
+            $sniffOutput = substr($this->sniffContent, $this->responseOffset, min($sniffOffset, $this->responseLength));
+            fwrite($outStream, $sniffOutput);
+        } else if ($this->responseOffset !== 0) {
+            fseek($this->stream, $this->responseOffset);
         }
 
-        $toWrite = $this->fileSize - $offset;
-        stream_copy_to_stream($this->stream, $outStream, $toWrite);
-        fpassthru($this->stream);
+        stream_copy_to_stream($this->stream, $outStream, $this->responseLength);
 
         fclose($this->stream);
         fclose($outStream);
     }
+
+    public function getResponseHeaders(): array
+    {
+        return $this->responseHeaders;
+    }
+
+    public function getResponseStatus(): int
+    {
+        return $this->responseStatus;
+    }
+
+    protected function parseRequest(Request $request): void
+    {
+        $this->responseHeaders['Accept-Ranges'] = $request->isMethodSafe() ? 'bytes' : 'none';
+
+        $range = $this->getRangeFromRequest($request);
+        if ($range) {
+            [$start, $end] = $range;
+            if ($start < 0 || $start > $end) {
+                $this->responseStatus = 416;
+                $this->responseHeaders['Content-Range'] = sprintf('bytes */%s', $this->fileSize);
+            } elseif ($end - $start < $this->fileSize - 1) {
+                $this->responseLength = $end < $this->fileSize ? $end - $start + 1 : -1;
+                $this->responseOffset = $start;
+                $this->responseStatus = 206;
+                $this->responseHeaders['Content-Range'] = sprintf('bytes %s-%s/%s', $start, $end, $this->fileSize);
+                $this->responseHeaders['Content-Length'] = $end - $start + 1;
+            }
+        }
+
+        if ($request->isMethod('HEAD')) {
+            $this->responseLength = 0;
+        }
+    }
+
+    protected function getRangeFromRequest(Request $request): ?array
+    {
+        $range = $request->headers->get('Range');
+        if (!$range || !$request->isMethod('GET') || !str_starts_with($range, 'bytes=')) {
+            return null;
+        }
+
+        if ($request->headers->has('If-Range')) {
+            return null;
+        }
+
+        [$start, $end] = explode('-', substr($range, 6), 2) + [0];
+
+        $end = ('' === $end) ? $this->fileSize - 1 : (int) $end;
+
+        if ('' === $start) {
+            $start = $this->fileSize - $end;
+            $end = $this->fileSize - 1;
+        } else {
+            $start = (int) $start;
+        }
+
+        if ($start > $end) {
+            return null;
+        }
+
+        $end = min($end, $this->fileSize - 1);
+        return [$start, $end];
+    }
 }

From 91d8d6eaaa5ae42fc9872901d6fcbcae8e19236e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jan 2024 15:50:00 +0000
Subject: [PATCH 005/666] Range requests: Added test cases to cover
 functionality

Fixed some found issues in the process.
---
 app/Http/RangeSupportedStream.php |  20 +++---
 tests/Uploads/AttachmentTest.php  | 101 ++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
index b51d4a5498f..300f4488cf4 100644
--- a/app/Http/RangeSupportedStream.php
+++ b/app/Http/RangeSupportedStream.php
@@ -13,8 +13,8 @@
  */
 class RangeSupportedStream
 {
-    protected string $sniffContent;
-    protected array $responseHeaders;
+    protected string $sniffContent = '';
+    protected array $responseHeaders = [];
     protected int $responseStatus = 200;
 
     protected int $responseLength = 0;
@@ -53,16 +53,20 @@ public function outputAndClose(): void
         }
 
         $outStream = fopen('php://output', 'w');
-        $sniffOffset = strlen($this->sniffContent);
+        $sniffLength = strlen($this->sniffContent);
+        $bytesToWrite = $this->responseLength;
 
-        if (!empty($this->sniffContent) && $this->responseOffset < $sniffOffset) {
-            $sniffOutput = substr($this->sniffContent, $this->responseOffset, min($sniffOffset, $this->responseLength));
+        if ($sniffLength > 0 && $this->responseOffset < $sniffLength) {
+            $sniffEnd = min($sniffLength, $bytesToWrite + $this->responseOffset);
+            $sniffOutLength = $sniffEnd - $this->responseOffset;
+            $sniffOutput = substr($this->sniffContent, $this->responseOffset, $sniffOutLength);
             fwrite($outStream, $sniffOutput);
+            $bytesToWrite -= $sniffOutLength;
         } else if ($this->responseOffset !== 0) {
             fseek($this->stream, $this->responseOffset);
         }
 
-        stream_copy_to_stream($this->stream, $outStream, $this->responseLength);
+        stream_copy_to_stream($this->stream, $outStream, $bytesToWrite);
 
         fclose($this->stream);
         fclose($outStream);
@@ -124,10 +128,6 @@ protected function getRangeFromRequest(Request $request): ?array
             $start = (int) $start;
         }
 
-        if ($start > $end) {
-            return null;
-        }
-
         $end = min($end, $this->fileSize - 1);
         return [$start, $end];
     }
diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index bd03c339c43..2e1a7b3395a 100644
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -316,4 +316,105 @@ public function test_file_upload_works_when_local_secure_restricted_is_in_use()
         $this->assertFileExists(storage_path($attachment->path));
         $this->files->deleteAllAttachmentFiles();
     }
+
+    public function test_file_get_range_access()
+    {
+        $page = $this->entities->page();
+        $this->asAdmin();
+        $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'my_text.txt', 'abc123456', 'text/plain');
+
+        // Download access
+        $resp = $this->get($attachment->getUrl(), ['Range' => 'bytes=3-5']);
+        $resp->assertStatus(206);
+        $resp->assertStreamedContent('123');
+        $resp->assertHeader('Content-Length', '3');
+        $resp->assertHeader('Content-Range', 'bytes 3-5/9');
+
+        // Inline access
+        $resp = $this->get($attachment->getUrl(true), ['Range' => 'bytes=5-7']);
+        $resp->assertStatus(206);
+        $resp->assertStreamedContent('345');
+        $resp->assertHeader('Content-Length', '3');
+        $resp->assertHeader('Content-Range', 'bytes 5-7/9');
+
+        $this->files->deleteAllAttachmentFiles();
+    }
+
+    public function test_file_head_range_returns_no_content()
+    {
+        $page = $this->entities->page();
+        $this->asAdmin();
+        $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'my_text.txt', 'abc123456', 'text/plain');
+
+        $resp = $this->head($attachment->getUrl(), ['Range' => 'bytes=0-9']);
+        $resp->assertStreamedContent('');
+        $resp->assertHeader('Content-Length', '9');
+        $resp->assertStatus(200);
+
+        $this->files->deleteAllAttachmentFiles();
+    }
+
+    public function test_file_head_range_edge_cases()
+    {
+        $page = $this->entities->page();
+        $this->asAdmin();
+
+        // Mime-type "sniffing" happens on first 2k bytes, hence this content (2005 bytes)
+        $content = '01234' . str_repeat('a', 1990) . '0123456789';
+        $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'my_text.txt', $content, 'text/plain');
+
+        // Test for both inline and download attachment serving
+        foreach ([true, false] as $isInline) {
+            // No end range
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=5-']);
+            $resp->assertStreamedContent(substr($content, 5));
+            $resp->assertHeader('Content-Length', '2000');
+            $resp->assertHeader('Content-Range', 'bytes 5-2004/2005');
+            $resp->assertStatus(206);
+
+            // End only range
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=-10']);
+            $resp->assertStreamedContent('0123456789');
+            $resp->assertHeader('Content-Length', '10');
+            $resp->assertHeader('Content-Range', 'bytes 1995-2004/2005');
+            $resp->assertStatus(206);
+
+            // Range across sniff point
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=1997-2002']);
+            $resp->assertStreamedContent('234567');
+            $resp->assertHeader('Content-Length', '6');
+            $resp->assertHeader('Content-Range', 'bytes 1997-2002/2005');
+            $resp->assertStatus(206);
+
+            // Range up to sniff point
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=0-1997']);
+            $resp->assertHeader('Content-Length', '1998');
+            $resp->assertHeader('Content-Range', 'bytes 0-1997/2005');
+            $resp->assertStreamedContent(substr($content, 0, 1998));
+            $resp->assertStatus(206);
+
+            // Range beyond sniff point
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=2001-2003']);
+            $resp->assertStreamedContent('678');
+            $resp->assertHeader('Content-Length', '3');
+            $resp->assertHeader('Content-Range', 'bytes 2001-2003/2005');
+            $resp->assertStatus(206);
+
+            // Range beyond content
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=0-2010']);
+            $resp->assertStreamedContent($content);
+            $resp->assertHeader('Content-Length', '2005');
+            $resp->assertHeaderMissing('Content-Range');
+            $resp->assertStatus(200);
+
+            // Range start before end
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=50-10']);
+            $resp->assertStreamedContent($content);
+            $resp->assertHeader('Content-Length', '2005');
+            $resp->assertHeader('Content-Range', 'bytes */2005');
+            $resp->assertStatus(416);
+        }
+
+        $this->files->deleteAllAttachmentFiles();
+    }
 }

From c1552fb799cda7fbb6de27ebcb01aa2580fd5330 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 15 Jan 2024 11:50:05 +0000
Subject: [PATCH 006/666] Attachments: Drag and drop video support

Supports dragging and dropping video attahchments to embed them in the
editor as HTML video tags.
---
 app/Uploads/Attachment.php                    | 19 +++++++++++++++++--
 .../views/attachments/manager-list.blade.php  |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php
index 4fd6d4cdcb7..57d7cb3346c 100644
--- a/app/Uploads/Attachment.php
+++ b/app/Uploads/Attachment.php
@@ -77,7 +77,22 @@ public function getUrl($openInline = false): string
     }
 
     /**
-     * Generate a HTML link to this attachment.
+     * Get the representation of this attachment in a format suitable for the page editors.
+     * Detects and adapts video content to use an inline video embed.
+     */
+    public function editorContent(): array
+    {
+        $videoExtensions = ['mp4', 'webm', 'mkv', 'ogg', 'avi'];
+        if (in_array(strtolower($this->extension), $videoExtensions)) {
+            $html = '<video src="' . e($this->getUrl(true)) . '" controls width="480" height="270"></video>';
+            return ['text/html' => $html, 'text/plain' => $html];
+        }
+
+        return ['text/html' => $this->htmlLink(), 'text/plain' => $this->markdownLink()];
+    }
+
+    /**
+     * Generate the HTML link to this attachment.
      */
     public function htmlLink(): string
     {
@@ -85,7 +100,7 @@ public function htmlLink(): string
     }
 
     /**
-     * Generate a markdown link to this attachment.
+     * Generate a MarkDown link to this attachment.
      */
     public function markdownLink(): string
     {
diff --git a/resources/views/attachments/manager-list.blade.php b/resources/views/attachments/manager-list.blade.php
index 342b46dcad7..0e841a042f7 100644
--- a/resources/views/attachments/manager-list.blade.php
+++ b/resources/views/attachments/manager-list.blade.php
@@ -4,7 +4,7 @@
         <div component="ajax-delete-row"
              option:ajax-delete-row:url="{{ url('/attachments/' . $attachment->id) }}"
              data-id="{{ $attachment->id }}"
-             data-drag-content="{{ json_encode(['text/html' => $attachment->htmlLink(), 'text/plain' => $attachment->markdownLink()]) }}"
+             data-drag-content="{{ json_encode($attachment->editorContent()) }}"
              class="card drag-card">
             <div class="handle">@icon('grip')</div>
             <div class="py-s">

From 2dc454d206b518804aecd0551a71d338cf889c08 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 15 Jan 2024 13:36:04 +0000
Subject: [PATCH 007/666] Uploads: Explicitly disabled s3 streaming in config

This was the default option anyway, just adding here for
better visibility of this being set.
Can't enable without issues as the app will attempt to seek which does
not work for these streams. Also have not tested on non-s3, s3-like
systems.
---
 app/Config/filesystems.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Config/filesystems.php b/app/Config/filesystems.php
index e6ae0fed364..1319c8886f6 100644
--- a/app/Config/filesystems.php
+++ b/app/Config/filesystems.php
@@ -58,6 +58,7 @@
             'endpoint'                => env('STORAGE_S3_ENDPOINT', null),
             'use_path_style_endpoint' => env('STORAGE_S3_ENDPOINT', null) !== null,
             'throw'                   => true,
+            'stream_reads'            => false,
         ],
 
     ],

From 655ae5ecaeba3eaea73bd20c970387f1fa993e6a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 23 Jan 2024 12:31:44 +0000
Subject: [PATCH 008/666] Text: Tweaks to EN text for consistency/readability

As suggested by Tim in discord chat.
---
 lang/en/activities.php | 6 +++---
 lang/en/settings.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/en/activities.php b/lang/en/activities.php
index d5b55c03dcb..092398ef0e1 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'User successfully removed',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 03e9bf462e2..7b7f5d2a2e3 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
     'recycle_bin_empty' => 'Empty Recycle Bin',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',

From 8c6b1164724fffd1766792fb3d6fef4972ba1b9e Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Tue, 23 Jan 2024 21:37:00 +0100
Subject: [PATCH 009/666] Update TrashCan.php

remove duplicate call of $page->forceDelete();
---
 app/Entities/Tools/TrashCan.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index e5bcfe71ac2..8e9f010df0f 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -206,8 +206,6 @@ protected function destroyPage(Page $page): int
         Book::query()->where('default_template_id', '=', $page->id)
             ->update(['default_template_id' => null]);
 
-        $page->forceDelete();
-
         // Remove chapter template usages
         Chapter::query()->where('default_template_id', '=', $page->id)
             ->update(['default_template_id' => null]);

From 0fc02a2532fd33c443838de77f5700df220b79c9 Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Tue, 23 Jan 2024 22:37:15 +0100
Subject: [PATCH 010/666] fixed error from phpcs

---
 app/Entities/Controllers/PageController.php | 4 ++--
 app/Entities/Repos/PageRepo.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 74dd4f531b4..eaad3c0b79d 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -260,7 +260,7 @@ public function showDelete(string $bookSlug, string $pageSlug)
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
-        $usedAsTemplate = 
+        $usedAsTemplate =
             Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
             Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
 
@@ -282,7 +282,7 @@ public function showDeleteDraft(string $bookSlug, int $pageId)
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
-        $usedAsTemplate = 
+        $usedAsTemplate =
             Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
             Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
 
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 67c4b222547..d9bda019892 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -142,7 +142,7 @@ public function getNewDraftPage(Entity $parent)
         } else {
             $defaultTemplate = $page->book->defaultTemplate;
         }
-        
+
         if ($defaultTemplate && userCan('view', $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,

From 3e9e196cdada5a6c515d5bbab971c80a90d333ab Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 25 Jan 2024 14:24:46 +0000
Subject: [PATCH 011/666] OIDC: Added PKCE functionality

Related to #4734.
Uses core logic from League AbstractProvider.
---
 app/Access/Oidc/OidcOAuthProvider.php | 31 +++++++++++----------------
 app/Access/Oidc/OidcService.php       | 12 ++++++++++-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/Access/Oidc/OidcOAuthProvider.php b/app/Access/Oidc/OidcOAuthProvider.php
index d2dc829b729..371bfcecb54 100644
--- a/app/Access/Oidc/OidcOAuthProvider.php
+++ b/app/Access/Oidc/OidcOAuthProvider.php
@@ -83,15 +83,9 @@ protected function getScopeSeparator(): string
 
     /**
      * Checks a provider response for errors.
-     *
-     * @param ResponseInterface $response
-     * @param array|string      $data     Parsed response data
-     *
      * @throws IdentityProviderException
-     *
-     * @return void
      */
-    protected function checkResponse(ResponseInterface $response, $data)
+    protected function checkResponse(ResponseInterface $response, $data): void
     {
         if ($response->getStatusCode() >= 400 || isset($data['error'])) {
             throw new IdentityProviderException(
@@ -105,13 +99,8 @@ protected function checkResponse(ResponseInterface $response, $data)
     /**
      * Generates a resource owner object from a successful resource owner
      * details request.
-     *
-     * @param array       $response
-     * @param AccessToken $token
-     *
-     * @return ResourceOwnerInterface
      */
-    protected function createResourceOwner(array $response, AccessToken $token)
+    protected function createResourceOwner(array $response, AccessToken $token): ResourceOwnerInterface
     {
         return new GenericResourceOwner($response, '');
     }
@@ -121,14 +110,18 @@ protected function createResourceOwner(array $response, AccessToken $token)
      *
      * The grant that was used to fetch the response can be used to provide
      * additional context.
-     *
-     * @param array         $response
-     * @param AbstractGrant $grant
-     *
-     * @return OidcAccessToken
      */
-    protected function createAccessToken(array $response, AbstractGrant $grant)
+    protected function createAccessToken(array $response, AbstractGrant $grant): OidcAccessToken
     {
         return new OidcAccessToken($response);
     }
+
+    /**
+     * Get the method used for PKCE code verifier hashing, which is passed
+     * in the "code_challenge_method" parameter in the authorization request.
+     */
+    protected function getPkceMethod(): string
+    {
+        return static::PKCE_METHOD_S256;
+    }
 }
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index f1e5b25af14..036c9fc47ef 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -33,6 +33,8 @@ public function __construct(
 
     /**
      * Initiate an authorization flow.
+     * Provides back an authorize redirect URL, in addition to other
+     * details which may be required for the auth flow.
      *
      * @throws OidcException
      *
@@ -42,8 +44,12 @@ public function login(): array
     {
         $settings = $this->getProviderSettings();
         $provider = $this->getProvider($settings);
+
+        $url = $provider->getAuthorizationUrl();
+        session()->put('oidc_pkce_code', $provider->getPkceCode() ?? '');
+
         return [
-            'url'   => $provider->getAuthorizationUrl(),
+            'url'   => $url,
             'state' => $provider->getState(),
         ];
     }
@@ -63,6 +69,10 @@ public function processAuthorizeResponse(?string $authorizationCode): User
         $settings = $this->getProviderSettings();
         $provider = $this->getProvider($settings);
 
+        // Set PKCE code flashed at login
+        $pkceCode = session()->pull('oidc_pkce_code', '');
+        $provider->setPkceCode($pkceCode);
+
         // Try to exchange authorization code for access token
         $accessToken = $provider->getAccessToken('authorization_code', [
             'code' => $authorizationCode,

From 1dc094ffafc216e15c8355b400b21524137de5e4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 27 Jan 2024 16:41:15 +0000
Subject: [PATCH 012/666] OIDC: Added testing of PKCE flow

Also compared full flow to RFC spec during this process
---
 tests/Auth/OidcTest.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index dbf26f1bd30..345d1dc780b 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -655,6 +655,34 @@ public function test_oidc_id_token_pre_validate_theme_event_with_return()
         ]);
     }
 
+    public function test_pkce_used_on_authorize_and_access()
+    {
+        // Start auth
+        $resp = $this->post('/oidc/login');
+        $state = session()->get('oidc_state');
+
+        $pkceCode = session()->get('oidc_pkce_code');
+        $this->assertGreaterThan(30, strlen($pkceCode));
+
+        $expectedCodeChallenge = trim(strtr(base64_encode(hash('sha256', $pkceCode, true)), '+/', '-_'), '=');
+        $redirect = $resp->headers->get('Location');
+        $redirectParams = [];
+        parse_str(parse_url($redirect, PHP_URL_QUERY), $redirectParams);
+        $this->assertEquals($expectedCodeChallenge, $redirectParams['code_challenge']);
+        $this->assertEquals('S256', $redirectParams['code_challenge_method']);
+
+        $transactions = $this->mockHttpClient([$this->getMockAuthorizationResponse([
+            'email' => 'benny@example.com',
+            'sub'   => 'benny1010101',
+        ])]);
+
+        $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
+        $tokenRequest = $transactions->latestRequest();
+        $bodyParams = [];
+        parse_str($tokenRequest->getBody(), $bodyParams);
+        $this->assertEquals($pkceCode, $bodyParams['code_verifier']);
+    }
+
     protected function withAutodiscovery()
     {
         config()->set([

From 2a849894bee6ac7846261938c9606fb18a4a1761 Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Mon, 29 Jan 2024 19:37:59 +0100
Subject: [PATCH 013/666] Update entities.php

changed text of `pages_delete_warning_template` to include chapters
---
 lang/en/entities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index 4ab9de47dfb..21ef93fed3c 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -210,7 +210,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Are you sure you want to delete this page?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',

From 64c783c6f8efb351dd73a1cfb4b5f214a731bd57 Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Mon, 29 Jan 2024 19:55:39 +0100
Subject: [PATCH 014/666] extraded template form to own file and changed
 translations

---
 lang/en/entities.php                           |  9 +++------
 resources/views/books/parts/form.blade.php     | 18 ++----------------
 resources/views/chapters/parts/form.blade.php  | 18 ++----------------
 .../views/entities/template-selector.blade.php | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 38 deletions(-)
 create mode 100644 resources/views/entities/template-selector.blade.php

diff --git a/lang/en/entities.php b/lang/en/entities.php
index 21ef93fed3c..8860e243e77 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book/chapter. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edit Book :bookName',
     'books_form_book_name' => 'Book Name',
     'books_save' => 'Save Book',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Book Permissions',
     'books_permissions_updated' => 'Book Permissions Updated',
     'books_empty_contents' => 'No pages or chapters have been created for this book.',
@@ -192,9 +192,6 @@
     'chapters_permissions_success' => 'Chapter Permissions Updated',
     'chapters_search_this' => 'Search this chapter',
     'chapter_sort_book' => 'Sort Book',
-    'chapter_default_template' => 'Default Page Template',
-    'chapter_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this chapter. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'chapter_default_template_select' => 'Select a template page',
 
     // Pages
     'page' => 'Page',
diff --git a/resources/views/books/parts/form.blade.php b/resources/views/books/parts/form.blade.php
index fa8f16e52f4..ee261e72d4a 100644
--- a/resources/views/books/parts/form.blade.php
+++ b/resources/views/books/parts/form.blade.php
@@ -40,24 +40,10 @@
 
 <div class="form-group collapsible" component="collapsible" id="template-control">
     <button refs="collapsible@trigger" type="button" class="collapse-title text-link" aria-expanded="false">
-        <label for="template-manager">{{ trans('entities.books_default_template') }}</label>
+        <label for="template-manager">{{ trans('entities.default_template') }}</label>
     </button>
     <div refs="collapsible@content" class="collapse-content">
-        <div class="flex-container-row gap-l justify-space-between pb-xs wrap">
-            <p class="text-muted small my-none min-width-xs flex">
-                {{ trans('entities.books_default_template_explain') }}
-            </p>
-
-            <div class="min-width-m">
-                @include('form.page-picker', [
-                    'name' => 'default_template_id',
-                    'placeholder' => trans('entities.books_default_template_select'),
-                    'value' => $book->default_template_id ?? null,
-                    'selectorEndpoint' => '/search/entity-selector-templates',
-                ])
-            </div>
-        </div>
-
+        @include('entities.template-selector', ['entity' => $book ?? null])
     </div>
 </div>
 
diff --git a/resources/views/chapters/parts/form.blade.php b/resources/views/chapters/parts/form.blade.php
index ea7f84bc839..602693916ea 100644
--- a/resources/views/chapters/parts/form.blade.php
+++ b/resources/views/chapters/parts/form.blade.php
@@ -24,24 +24,10 @@
 
 <div class="form-group collapsible" component="collapsible" id="template-control">
     <button refs="collapsible@trigger" type="button" class="collapse-title text-link" aria-expanded="false">
-        <label for="template-manager">{{ trans('entities.chapter_default_template') }}</label>
+        <label for="template-manager">{{ trans('entities.default_template') }}</label>
     </button>
     <div refs="collapsible@content" class="collapse-content">
-        <div class="flex-container-row gap-l justify-space-between pb-xs wrap">
-            <p class="text-muted small my-none min-width-xs flex">
-                {{ trans('entities.chapter_default_template_explain') }}
-            </p>
-
-            <div class="min-width-m">
-                @include('form.page-picker', [
-                    'name' => 'default_template_id',
-                    'placeholder' => trans('entities.chapter_default_template_select'),
-                    'value' => $chapter->default_template_id ?? null,
-                    'selectorEndpoint' => '/search/entity-selector-templates',
-                ])
-            </div>
-        </div>
-
+        @include('entities.template-selector', ['entity' => $chapter ?? null])
     </div>
 </div>
 
diff --git a/resources/views/entities/template-selector.blade.php b/resources/views/entities/template-selector.blade.php
new file mode 100644
index 00000000000..80b2f49b2b9
--- /dev/null
+++ b/resources/views/entities/template-selector.blade.php
@@ -0,0 +1,14 @@
+<div class="flex-container-row gap-l justify-space-between pb-xs wrap">
+    <p class="text-muted small my-none min-width-xs flex">
+        {{ trans('entities.default_template_explain') }}
+    </p>
+
+    <div class="min-width-m">
+        @include('form.page-picker', [
+            'name' => 'default_template_id',
+            'placeholder' => trans('entities.default_template_select'),
+            'value' => $entity->default_template_id ?? null,
+            'selectorEndpoint' => '/search/entity-selector-templates',
+        ])
+    </div>
+</div>
\ No newline at end of file

From 4a8f70240fd01f28980dfd4031c7df2b1db4949a Mon Sep 17 00:00:00 2001
From: Sascha <mib.jelinek@gmail.com>
Date: Mon, 29 Jan 2024 19:59:03 +0100
Subject: [PATCH 015/666] added template to chapter API controller

---
 .../Controllers/ChapterApiController.php      | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index c2132326200..27b8206592d 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -15,20 +15,22 @@ class ChapterApiController extends ApiController
 {
     protected $rules = [
         'create' => [
-            'book_id'          => ['required', 'integer'],
-            'name'             => ['required', 'string', 'max:255'],
-            'description'      => ['string', 'max:1900'],
-            'description_html' => ['string', 'max:2000'],
-            'tags'             => ['array'],
-            'priority'         => ['integer'],
+            'book_id'             => ['required', 'integer'],
+            'name'                => ['required', 'string', 'max:255'],
+            'description'         => ['string', 'max:1900'],
+            'description_html'    => ['string', 'max:2000'],
+            'tags'                => ['array'],
+            'priority'            => ['integer'],
+            'default_template_id' => ['nullable', 'integer'],
         ],
         'update' => [
-            'book_id'          => ['integer'],
-            'name'             => ['string', 'min:1', 'max:255'],
-            'description'      => ['string', 'max:1900'],
-            'description_html' => ['string', 'max:2000'],
-            'tags'             => ['array'],
-            'priority'         => ['integer'],
+            'book_id'             => ['integer'],
+            'name'                => ['string', 'min:1', 'max:255'],
+            'description'         => ['string', 'max:1900'],
+            'description_html'    => ['string', 'max:2000'],
+            'tags'                => ['array'],
+            'priority'            => ['integer'],
+            'default_template_id' => ['nullable', 'integer'],
         ],
     ];
 

From 24e6dc4b37f857ffe6f8eab85ca177ed290bb38a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 30 Jan 2024 11:38:47 +0000
Subject: [PATCH 016/666] WYSIWYG: Altered how custom head added to editors

Updated to parse and add as DOM nodes instead of innerHTML to avoid
triggering an update of all head content, which would throw warnings in
chromium in regard to setting the base URI.

For #4814
---
 resources/js/wysiwyg/config.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 6c96e47e9c3..36d78b32515 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -143,16 +143,23 @@ function gatherPlugins(options) {
 }
 
 /**
- * Fetch custom HTML head content from the parent page head into the editor.
+ * Fetch custom HTML head content nodes from the outer page head
+ * and add them to the given editor document.
+ * @param {Document} editorDoc
  */
-function fetchCustomHeadContent() {
+function addCustomHeadContent(editorDoc) {
     const headContentLines = document.head.innerHTML.split('\n');
     const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->');
     const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->');
     if (startLineIndex === -1 || endLineIndex === -1) {
-        return '';
+        return;
     }
-    return headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
+
+    const customHeadHtml = headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
+    const el = editorDoc.createElement('div');
+    el.innerHTML = customHeadHtml;
+
+    editorDoc.head.append(...el.children);
 }
 
 /**
@@ -284,8 +291,7 @@ export function buildForEditor(options) {
             }
         },
         init_instance_callback(editor) {
-            const head = editor.getDoc().querySelector('head');
-            head.innerHTML += fetchCustomHeadContent();
+            addCustomHeadContent(editor.getDoc());
         },
         setup(editor) {
             registerCustomIcons(editor);
@@ -335,8 +341,7 @@ export function buildForInput(options) {
         file_picker_types: 'file',
         file_picker_callback: filePickerCallback,
         init_instance_callback(editor) {
-            const head = editor.getDoc().querySelector('head');
-            head.innerHTML += fetchCustomHeadContent();
+            addCustomHeadContent(editor.getDoc());
 
             editor.contentDocument.documentElement.classList.toggle('dark-mode', options.darkMode);
         },

From 5c92b72fdd419ccb6f77bfdf0a1cb1358c51a9d8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 30 Jan 2024 14:27:09 +0000
Subject: [PATCH 017/666] Comments: Added input wysiwyg for creating/updating
 comments

Not supporting old content, existing HTML or updating yet.
---
 app/Activity/Tools/CommentTree.php          | 11 ++++++++
 resources/js/components/page-comment.js     | 27 ++++++++++++++++---
 resources/js/components/page-comments.js    | 30 ++++++++++++++++++---
 resources/js/components/wysiwyg-input.js    |  7 ++---
 resources/sass/_tinymce.scss                |  7 +++++
 resources/views/comments/comment.blade.php  |  2 ++
 resources/views/comments/comments.blade.php | 10 ++++++-
 resources/views/layouts/base.blade.php      |  3 +++
 8 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index 3303add39b8..16f6804ea42 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -41,6 +41,17 @@ public function get(): array
         return $this->tree;
     }
 
+    public function canUpdateAny(): bool
+    {
+        foreach ($this->comments as $comment) {
+            if (userCan('comment-update', $comment)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param Comment[] $comments
      */
diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.js
index 8284d7f20d8..dc6ca826425 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.js
@@ -1,5 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
+import {buildForInput} from "../wysiwyg/config";
 
 export class PageComment extends Component {
 
@@ -11,7 +12,12 @@ export class PageComment extends Component {
         this.deletedText = this.$opts.deletedText;
         this.updatedText = this.$opts.updatedText;
 
-        // Element References
+        // Editor reference and text options
+        this.wysiwygEditor = null;
+        this.wysiwygLanguage = this.$opts.wysiwygLanguage;
+        this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
+
+        // Element references
         this.container = this.$el;
         this.contentContainer = this.$refs.contentContainer;
         this.form = this.$refs.form;
@@ -50,8 +56,23 @@ export class PageComment extends Component {
 
     startEdit() {
         this.toggleEditMode(true);
-        const lineCount = this.$refs.input.value.split('\n').length;
-        this.$refs.input.style.height = `${(lineCount * 20) + 40}px`;
+
+        if (this.wysiwygEditor) {
+            return;
+        }
+
+        const config = buildForInput({
+            language: this.wysiwygLanguage,
+            containerElement: this.input,
+            darkMode: document.documentElement.classList.contains('dark-mode'),
+            textDirection: this.wysiwygTextDirection,
+            translations: {},
+            translationMap: window.editor_translations,
+        });
+
+        window.tinymce.init(config).then(editors => {
+            this.wysiwygEditor = editors[0];
+        });
     }
 
     async update(event) {
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index e2911afc6a0..ebcc95f07f4 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -1,5 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
+import {buildForInput} from "../wysiwyg/config";
 
 export class PageComments extends Component {
 
@@ -21,6 +22,11 @@ export class PageComments extends Component {
         this.hideFormButton = this.$refs.hideFormButton;
         this.removeReplyToButton = this.$refs.removeReplyToButton;
 
+        // WYSIWYG options
+        this.wysiwygLanguage = this.$opts.wysiwygLanguage;
+        this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
+        this.wysiwygEditor = null;
+
         // Translations
         this.createdText = this.$opts.createdText;
         this.countText = this.$opts.countText;
@@ -96,9 +102,7 @@ export class PageComments extends Component {
         this.formContainer.toggleAttribute('hidden', false);
         this.addButtonContainer.toggleAttribute('hidden', true);
         this.formContainer.scrollIntoView({behavior: 'smooth', block: 'nearest'});
-        setTimeout(() => {
-            this.formInput.focus();
-        }, 100);
+        this.loadEditor();
     }
 
     hideForm() {
@@ -112,6 +116,26 @@ export class PageComments extends Component {
         this.addButtonContainer.toggleAttribute('hidden', false);
     }
 
+    loadEditor() {
+        if (this.wysiwygEditor) {
+            return;
+        }
+
+        const config = buildForInput({
+            language: this.wysiwygLanguage,
+            containerElement: this.formInput,
+            darkMode: document.documentElement.classList.contains('dark-mode'),
+            textDirection: this.wysiwygTextDirection,
+            translations: {},
+            translationMap: window.editor_translations,
+        });
+
+        window.tinymce.init(config).then(editors => {
+            this.wysiwygEditor = editors[0];
+            this.wysiwygEditor.focus();
+        });
+    }
+
     getCommentCount() {
         return this.container.querySelectorAll('[component="page-comment"]').length;
     }
diff --git a/resources/js/components/wysiwyg-input.js b/resources/js/components/wysiwyg-input.js
index 88c06a334c6..ad964aed2c4 100644
--- a/resources/js/components/wysiwyg-input.js
+++ b/resources/js/components/wysiwyg-input.js
@@ -10,11 +10,8 @@ export class WysiwygInput extends Component {
             language: this.$opts.language,
             containerElement: this.elem,
             darkMode: document.documentElement.classList.contains('dark-mode'),
-            textDirection: this.textDirection,
-            translations: {
-                imageUploadErrorText: this.$opts.imageUploadErrorText,
-                serverUploadLimitText: this.$opts.serverUploadLimitText,
-            },
+            textDirection: this.$opts.textDirection,
+            translations: {},
             translationMap: window.editor_translations,
         });
 
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index c4336da7cb7..fb5ea7e6ffe 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -30,6 +30,13 @@
   display: block;
 }
 
+.wysiwyg-input.mce-content-body:before {
+  padding: 1rem;
+  top: 4px;
+  font-style: italic;
+  color: rgba(34,47,62,.5)
+}
+
 // Default styles for our custom root nodes
 .page-content.mce-content-body doc-root {
   display: block;
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 1cb70916087..4340cfdf5c4 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -4,6 +4,8 @@
      option:page-comment:comment-parent-id="{{ $comment->parent_id }}"
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
+     option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
+     option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"
      class="comment-box">
     <div class="header">
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 26d286290c2..2c314864bc2 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -2,6 +2,8 @@
          option:page-comments:page-id="{{ $page->id }}"
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
          option:page-comments:count-text="{{ trans('entities.comment_count') }}"
+         option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
+         option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
          class="comments-list"
          aria-label="{{ trans('entities.comments') }}">
 
@@ -24,7 +26,6 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
 
     @if(userCan('comment-create-all'))
         @include('comments.create')
-
         @if (!$commentTree->empty())
             <div refs="page-comments@addButtonContainer" class="text-right">
                 <button type="button"
@@ -34,4 +35,11 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
         @endif
     @endif
 
+    @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
+        @push('post-app-scripts')
+            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
+            @include('form.editor-translations')
+        @endpush
+    @endif
+
 </section>
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index cf15e5426b8..43cca6b14c5 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -68,10 +68,13 @@ class="@stack('body-class')">
     </div>
 
     @yield('bottom')
+
+
     @if($cspNonce ?? false)
         <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
     @endif
     @yield('scripts')
+    @stack('post-app-scripts')
 
     @include('layouts.parts.base-body-end')
 </body>

From adf0baebb9ffc61cc944c0572ec6dbb12a5b41a0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 30 Jan 2024 15:16:58 +0000
Subject: [PATCH 018/666] Comments: Added back-end HTML support, fixed editor
 focus

Also fixed handling of editors when moved in DOM, to properly remove
then re-init before & after move to avoid issues.
---
 app/Activity/CommentRepo.php                  | 26 ++++---------------
 .../Controllers/CommentController.php         | 17 +++++++-----
 resources/js/components/page-comment.js       |  6 +++--
 resources/js/components/page-comments.js      | 17 +++++++++---
 resources/views/comments/comment.blade.php    |  2 +-
 resources/views/comments/create.blade.php     |  2 +-
 6 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index ce2950e4d79..3336e17e988 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -5,7 +5,7 @@
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity as ActivityService;
-use League\CommonMark\CommonMarkConverter;
+use BookStack\Util\HtmlDescriptionFilter;
 
 class CommentRepo
 {
@@ -20,13 +20,12 @@ public function getById(int $id): Comment
     /**
      * Create a new comment on an entity.
      */
-    public function create(Entity $entity, string $text, ?int $parent_id): Comment
+    public function create(Entity $entity, string $html, ?int $parent_id): Comment
     {
         $userId = user()->id;
         $comment = new Comment();
 
-        $comment->text = $text;
-        $comment->html = $this->commentToHtml($text);
+        $comment->html = HtmlDescriptionFilter::filterFromString($html);
         $comment->created_by = $userId;
         $comment->updated_by = $userId;
         $comment->local_id = $this->getNextLocalId($entity);
@@ -42,11 +41,10 @@ public function create(Entity $entity, string $text, ?int $parent_id): Comment
     /**
      * Update an existing comment.
      */
-    public function update(Comment $comment, string $text): Comment
+    public function update(Comment $comment, string $html): Comment
     {
         $comment->updated_by = user()->id;
-        $comment->text = $text;
-        $comment->html = $this->commentToHtml($text);
+        $comment->html = HtmlDescriptionFilter::filterFromString($html);
         $comment->save();
 
         ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
@@ -64,20 +62,6 @@ public function delete(Comment $comment): void
         ActivityService::add(ActivityType::COMMENT_DELETE, $comment);
     }
 
-    /**
-     * Convert the given comment Markdown to HTML.
-     */
-    public function commentToHtml(string $commentText): string
-    {
-        $converter = new CommonMarkConverter([
-            'html_input'         => 'strip',
-            'max_nesting_level'  => 10,
-            'allow_unsafe_links' => false,
-        ]);
-
-        return $converter->convert($commentText);
-    }
-
     /**
      * Get the next local ID relative to the linked entity.
      */
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 516bcac759a..340524cd069 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -22,8 +22,8 @@ public function __construct(
      */
     public function savePageComment(Request $request, int $pageId)
     {
-        $this->validate($request, [
-            'text'      => ['required', 'string'],
+        $input = $this->validate($request, [
+            'html'      => ['required', 'string'],
             'parent_id' => ['nullable', 'integer'],
         ]);
 
@@ -39,7 +39,7 @@ public function savePageComment(Request $request, int $pageId)
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
-        $comment = $this->commentRepo->create($page, $request->get('text'), $request->get('parent_id'));
+        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null);
 
         return view('comments.comment-branch', [
             'readOnly' => false,
@@ -57,17 +57,20 @@ public function savePageComment(Request $request, int $pageId)
      */
     public function update(Request $request, int $commentId)
     {
-        $this->validate($request, [
-            'text' => ['required', 'string'],
+        $input = $this->validate($request, [
+            'html' => ['required', 'string'],
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 
-        $comment = $this->commentRepo->update($comment, $request->get('text'));
+        $comment = $this->commentRepo->update($comment, $input['html']);
 
-        return view('comments.comment', ['comment' => $comment, 'readOnly' => false]);
+        return view('comments.comment', [
+            'comment' => $comment,
+            'readOnly' => false,
+        ]);
     }
 
     /**
diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.js
index dc6ca826425..79c9d3c2c67 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.js
@@ -1,6 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from "../wysiwyg/config";
+import {buildForInput} from '../wysiwyg/config';
 
 export class PageComment extends Component {
 
@@ -58,6 +58,7 @@ export class PageComment extends Component {
         this.toggleEditMode(true);
 
         if (this.wysiwygEditor) {
+            this.wysiwygEditor.focus();
             return;
         }
 
@@ -72,6 +73,7 @@ export class PageComment extends Component {
 
         window.tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
+            setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
     }
 
@@ -81,7 +83,7 @@ export class PageComment extends Component {
         this.form.toggleAttribute('hidden', true);
 
         const reqData = {
-            text: this.input.value,
+            html: this.wysiwygEditor.getContent(),
             parent_id: this.parentId || null,
         };
 
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index ebcc95f07f4..cfb0634a904 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -1,6 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from "../wysiwyg/config";
+import {buildForInput} from '../wysiwyg/config';
 
 export class PageComments extends Component {
 
@@ -65,9 +65,8 @@ export class PageComments extends Component {
         this.form.after(loading);
         this.form.toggleAttribute('hidden', true);
 
-        const text = this.formInput.value;
         const reqData = {
-            text,
+            html: this.wysiwygEditor.getContent(),
             parent_id: this.parentId || null,
         };
 
@@ -92,6 +91,7 @@ export class PageComments extends Component {
     }
 
     resetForm() {
+        this.removeEditor();
         this.formInput.value = '';
         this.parentId = null;
         this.replyToRow.toggleAttribute('hidden', true);
@@ -99,6 +99,7 @@ export class PageComments extends Component {
     }
 
     showForm() {
+        this.removeEditor();
         this.formContainer.toggleAttribute('hidden', false);
         this.addButtonContainer.toggleAttribute('hidden', true);
         this.formContainer.scrollIntoView({behavior: 'smooth', block: 'nearest'});
@@ -118,6 +119,7 @@ export class PageComments extends Component {
 
     loadEditor() {
         if (this.wysiwygEditor) {
+            this.wysiwygEditor.focus();
             return;
         }
 
@@ -132,10 +134,17 @@ export class PageComments extends Component {
 
         window.tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
-            this.wysiwygEditor.focus();
+            setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
     }
 
+    removeEditor() {
+        if (this.wysiwygEditor) {
+            this.wysiwygEditor.remove();
+            this.wysiwygEditor = null;
+        }
+    }
+
     getCommentCount() {
         return this.container.querySelectorAll('[component="page-comment"]').length;
     }
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 4340cfdf5c4..e00307f0fbc 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -77,7 +77,7 @@ class="comment-box">
     @if(!$readOnly && userCan('comment-update', $comment))
         <form novalidate refs="page-comment@form" hidden class="content pt-s px-s block">
             <div class="form-group description-input">
-                <textarea refs="page-comment@input" name="markdown" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $comment->text }}</textarea>
+                <textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $comment->html }}</textarea>
             </div>
             <div class="form-group text-right">
                 <button type="button" class="button outline" refs="page-comment@form-cancel">{{ trans('common.cancel') }}</button>
diff --git a/resources/views/comments/create.blade.php b/resources/views/comments/create.blade.php
index cb7905ddc44..417f0c60602 100644
--- a/resources/views/comments/create.blade.php
+++ b/resources/views/comments/create.blade.php
@@ -16,7 +16,7 @@
         <div class="content px-s pt-s">
             <form refs="page-comments@form" novalidate>
                 <div class="form-group description-input">
-                <textarea refs="page-comments@form-input" name="markdown"
+                <textarea refs="page-comments@form-input" name="html"
                           rows="3"
                           placeholder="{{ trans('entities.comment_placeholder') }}"></textarea>
                 </div>

From e9a19d587857ba5afcaa411718af61b62aaff1ac Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 31 Jan 2024 14:22:04 +0000
Subject: [PATCH 019/666] Comments: Added wysiwyg link selector, updated tests,
 removed command

- Updated existing tests with recent back-end changes, mainly to use
  HTML data.
- Removed old comment regen command that's no longer required.
---
 .../RegenerateCommentContentCommand.php       | 49 -----------
 .../Activity/Models/CommentFactory.php        |  1 +
 resources/views/comments/comments.blade.php   |  3 +
 resources/views/layouts/base.blade.php        |  2 +-
 tests/Activity/WatchTest.php                  | 10 +--
 .../RegenerateCommentContentCommandTest.php   | 31 -------
 tests/Entity/CommentTest.php                  | 82 +++++++++++--------
 7 files changed, 58 insertions(+), 120 deletions(-)
 delete mode 100644 app/Console/Commands/RegenerateCommentContentCommand.php
 delete mode 100644 tests/Commands/RegenerateCommentContentCommandTest.php

diff --git a/app/Console/Commands/RegenerateCommentContentCommand.php b/app/Console/Commands/RegenerateCommentContentCommand.php
deleted file mode 100644
index f7ec426209f..00000000000
--- a/app/Console/Commands/RegenerateCommentContentCommand.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace BookStack\Console\Commands;
-
-use BookStack\Activity\CommentRepo;
-use BookStack\Activity\Models\Comment;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-
-class RegenerateCommentContentCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'bookstack:regenerate-comment-content
-                            {--database= : The database connection to use}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Regenerate the stored HTML of all comments';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(CommentRepo $commentRepo): int
-    {
-        $connection = DB::getDefaultConnection();
-        if ($this->option('database') !== null) {
-            DB::setDefaultConnection($this->option('database'));
-        }
-
-        Comment::query()->chunk(100, function ($comments) use ($commentRepo) {
-            foreach ($comments as $comment) {
-                $comment->html = $commentRepo->commentToHtml($comment->text);
-                $comment->save();
-            }
-        });
-
-        DB::setDefaultConnection($connection);
-        $this->comment('Comment HTML content has been regenerated');
-
-        return 0;
-    }
-}
diff --git a/database/factories/Activity/Models/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
index 4b76cd11dec..35d6db9bdca 100644
--- a/database/factories/Activity/Models/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -27,6 +27,7 @@ public function definition()
             'html'      => $html,
             'text'      => $text,
             'parent_id' => null,
+            'local_id'  => 1,
         ];
     }
 }
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 2c314864bc2..37329c42cf8 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -40,6 +40,9 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
             <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
             @include('form.editor-translations')
         @endpush
+        @push('post-app-html')
+            @include('entities.selector-popup')
+        @endpush
     @endif
 
 </section>
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 43cca6b14c5..4d4d07dc2ac 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -68,7 +68,7 @@ class="@stack('body-class')">
     </div>
 
     @yield('bottom')
-
+    @stack('post-app-html')
 
     @if($cspNonce ?? false)
         <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
diff --git a/tests/Activity/WatchTest.php b/tests/Activity/WatchTest.php
index 38935bbf5c9..605b60fd498 100644
--- a/tests/Activity/WatchTest.php
+++ b/tests/Activity/WatchTest.php
@@ -196,7 +196,7 @@ public function test_notify_own_page_comments()
         $notifications = Notification::fake();
 
         $this->asAdmin()->post("/comment/{$entities['page']->id}", [
-            'text' => 'My new comment'
+            'html' => '<p>My new comment</p>'
         ]);
         $notifications->assertSentTo($editor, CommentCreationNotification::class);
     }
@@ -217,12 +217,12 @@ public function test_notify_comment_replies()
         $notifications = Notification::fake();
 
         $this->actingAs($editor)->post("/comment/{$entities['page']->id}", [
-            'text' => 'My new comment'
+            'html' => '<p>My new comment</p>'
         ]);
         $comment = $entities['page']->comments()->orderBy('id', 'desc')->first();
 
         $this->asAdmin()->post("/comment/{$entities['page']->id}", [
-            'text' => 'My new comment response',
+            'html' => '<p>My new comment response</p>',
             'parent_id' => $comment->local_id,
         ]);
         $notifications->assertSentTo($editor, CommentCreationNotification::class);
@@ -257,7 +257,7 @@ public function test_notify_watch_parent_book_comments()
 
         // Comment post
         $this->actingAs($admin)->post("/comment/{$entities['page']->id}", [
-            'text' => 'My new comment response',
+            'html' => '<p>My new comment response</p>',
         ]);
 
         $notifications->assertSentTo($editor, function (CommentCreationNotification $notification) use ($editor, $admin, $entities) {
@@ -376,7 +376,7 @@ public function test_notifications_not_sent_if_lacking_view_permission_for_relat
         $this->permissions->disableEntityInheritedPermissions($page);
 
         $this->asAdmin()->post("/comment/{$page->id}", [
-            'text' => 'My new comment response',
+            'html' => '<p>My new comment response</p>',
         ])->assertOk();
 
         $notifications->assertNothingSentTo($editor);
diff --git a/tests/Commands/RegenerateCommentContentCommandTest.php b/tests/Commands/RegenerateCommentContentCommandTest.php
deleted file mode 100644
index 4940d66c343..00000000000
--- a/tests/Commands/RegenerateCommentContentCommandTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Tests\Commands;
-
-use BookStack\Activity\Models\Comment;
-use Tests\TestCase;
-
-class RegenerateCommentContentCommandTest extends TestCase
-{
-    public function test_regenerate_comment_content_command()
-    {
-        Comment::query()->forceCreate([
-            'html' => 'some_old_content',
-            'text' => 'some_fresh_content',
-        ]);
-
-        $this->assertDatabaseHas('comments', [
-            'html' => 'some_old_content',
-        ]);
-
-        $exitCode = \Artisan::call('bookstack:regenerate-comment-content');
-        $this->assertTrue($exitCode === 0, 'Command executed successfully');
-
-        $this->assertDatabaseMissing('comments', [
-            'html' => 'some_old_content',
-        ]);
-        $this->assertDatabaseHas('comments', [
-            'html' => "<p>some_fresh_content</p>\n",
-        ]);
-    }
-}
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 23fc6819741..c080359bc9d 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -27,7 +27,7 @@ public function test_add_comment()
             'local_id'    => 1,
             'entity_id'   => $page->id,
             'entity_type' => Page::newModelInstance()->getMorphClass(),
-            'text'        => $comment->text,
+            'text'        => null,
             'parent_id'   => 2,
         ]);
 
@@ -43,17 +43,17 @@ public function test_comment_edit()
         $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $comment = $page->comments()->first();
-        $newText = 'updated text content';
+        $newHtml = '<p>updated text content</p>';
         $resp = $this->putJson("/comment/$comment->id", [
-            'text' => $newText,
+            'html' => $newHtml,
         ]);
 
         $resp->assertStatus(200);
-        $resp->assertSee($newText);
-        $resp->assertDontSee($comment->text);
+        $resp->assertSee($newHtml, false);
+        $resp->assertDontSee($comment->html, false);
 
         $this->assertDatabaseHas('comments', [
-            'text'      => $newText,
+            'html'      => $newHtml,
             'entity_id' => $page->id,
         ]);
 
@@ -80,46 +80,28 @@ public function test_comment_delete()
         $this->assertActivityExists(ActivityType::COMMENT_DELETE);
     }
 
-    public function test_comments_converts_markdown_input_to_html()
-    {
-        $page = $this->entities->page();
-        $this->asAdmin()->postJson("/comment/$page->id", [
-            'text' => '# My Title',
-        ]);
-
-        $this->assertDatabaseHas('comments', [
-            'entity_id'   => $page->id,
-            'entity_type' => $page->getMorphClass(),
-            'text'        => '# My Title',
-            'html'        => "<h1>My Title</h1>\n",
-        ]);
-
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertSee('<h1>My Title</h1>', false);
-    }
-
-    public function test_html_cannot_be_injected_via_comment_content()
+    public function test_scripts_cannot_be_injected_via_comment_html()
     {
         $this->asAdmin();
         $page = $this->entities->page();
 
-        $script = '<script>const a = "script";</script>\n\n# sometextinthecomment';
+        $script = '<script>const a = "script";</script><p onclick="1">My lovely comment</p>';
         $this->postJson("/comment/$page->id", [
-            'text' => $script,
+            'html' => $script,
         ]);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($script, false);
-        $pageView->assertSee('sometextinthecomment');
+        $pageView->assertSee('<p>My lovely comment</p>', false);
 
         $comment = $page->comments()->first();
         $this->putJson("/comment/$comment->id", [
-            'text' => $script . 'updated',
+            'html' => $script . '<p>updated</p>',
         ]);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($script, false);
-        $pageView->assertSee('sometextinthecommentupdated');
+        $pageView->assertSee('<p>My lovely comment</p><p>updated</p>');
     }
 
     public function test_reply_comments_are_nested()
@@ -127,15 +109,17 @@ public function test_reply_comments_are_nested()
         $this->asAdmin();
         $page = $this->entities->page();
 
-        $this->postJson("/comment/$page->id", ['text' => 'My new comment']);
-        $this->postJson("/comment/$page->id", ['text' => 'My new comment']);
+        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
+        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
 
         $respHtml = $this->withHtml($this->get($page->getUrl()));
         $respHtml->assertElementCount('.comment-branch', 3);
         $respHtml->assertElementNotExists('.comment-branch .comment-branch');
 
         $comment = $page->comments()->first();
-        $resp = $this->postJson("/comment/$page->id", ['text' => 'My nested comment', 'parent_id' => $comment->local_id]);
+        $resp = $this->postJson("/comment/$page->id", [
+            'html' => '<p>My nested comment</p>', 'parent_id' => $comment->local_id
+        ]);
         $resp->assertStatus(200);
 
         $respHtml = $this->withHtml($this->get($page->getUrl()));
@@ -147,7 +131,7 @@ public function test_comments_are_visible_in_the_page_editor()
     {
         $page = $this->entities->page();
 
-        $this->asAdmin()->postJson("/comment/$page->id", ['text' => 'My great comment to see in the editor']);
+        $this->asAdmin()->postJson("/comment/$page->id", ['html' => '<p>My great comment to see in the editor</p>']);
 
         $respHtml = $this->withHtml($this->get($page->getUrl('/edit')));
         $respHtml->assertElementContains('.comment-box .content', 'My great comment to see in the editor');
@@ -164,4 +148,34 @@ public function test_comment_creator_name_truncated()
         $pageResp = $this->asAdmin()->get($page->getUrl());
         $pageResp->assertSee('Wolfeschlegels…');
     }
+
+    public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
+    {
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertSee('tinymce.min.js?', false);
+        $resp->assertSee('window.editor_translations', false);
+        $resp->assertSee('component="entity-selector"', false);
+
+        $this->permissions->removeUserRolePermissions($editor, ['comment-create-all']);
+        $this->permissions->grantUserRolePermissions($editor, ['comment-update-own']);
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertDontSee('tinymce.min.js?', false);
+        $resp->assertDontSee('window.editor_translations', false);
+        $resp->assertDontSee('component="entity-selector"', false);
+
+        Comment::factory()->create([
+            'created_by'  => $editor->id,
+            'entity_type' => 'page',
+            'entity_id'   => $page->id,
+        ]);
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertSee('tinymce.min.js?', false);
+        $resp->assertSee('window.editor_translations', false);
+        $resp->assertSee('component="entity-selector"', false);
+    }
 }

From 06901b878f2c8057a6f9b7d2e0adfda425c68dee Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 31 Jan 2024 16:20:22 +0000
Subject: [PATCH 020/666] Comments: Added HTML filter on load, tinymce elem
 filtering

- Added filter on load to help prevent potentially dangerous comment
  HTML in DB at load time (if it gets passed input filtering, or is
  existing).
- Added TinyMCE valid_elements for input wysiwygs, to gracefully degrade
  content at point of user-view, rather than surprising the user by
  stripping content, which TinyMCE would show, post-save.
---
 app/Activity/Models/Comment.php            |  6 ++++++
 resources/js/wysiwyg/config.js             |  1 +
 resources/views/comments/comment.blade.php |  7 +++++--
 tests/Entity/CommentTest.php               | 17 +++++++++++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 6efa3df6ff0..038788afb9d 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -4,6 +4,7 @@
 
 use BookStack\App\Model;
 use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Util\HtmlContentFilter;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -73,4 +74,9 @@ public function logDescriptor(): string
     {
         return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->entity_type} (ID: {$this->entity_id})";
     }
+
+    public function safeHtml(): string
+    {
+        return HtmlContentFilter::removeScriptsFromHtmlString($this->html ?? '');
+    }
 }
diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 36d78b32515..fa2df9c1172 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -339,6 +339,7 @@ export function buildForInput(options) {
         toolbar: 'bold italic link bullist numlist',
         content_style: getContentStyle(options),
         file_picker_types: 'file',
+        valid_elements: 'p,a[href|title],ol,ul,li,strong,em,br',
         file_picker_callback: filePickerCallback,
         init_instance_callback(editor) {
             addCustomHeadContent(editor.getDoc());
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index e00307f0fbc..b507a810bb1 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -1,3 +1,6 @@
+@php
+    $commentHtml = $comment->safeHtml();
+@endphp
 <div component="{{ $readOnly ? '' : 'page-comment' }}"
      option:page-comment:comment-id="{{ $comment->id }}"
      option:page-comment:comment-local-id="{{ $comment->local_id }}"
@@ -71,13 +74,13 @@ class="comment-box">
                 <a class="text-muted text-small" href="#comment{{ $comment->parent_id }}">@icon('reply'){{ trans('entities.comment_in_reply_to', ['commentId' => '#' . $comment->parent_id]) }}</a>
             </p>
         @endif
-        {!! $comment->html  !!}
+        {!! $commentHtml  !!}
     </div>
 
     @if(!$readOnly && userCan('comment-update', $comment))
         <form novalidate refs="page-comment@form" hidden class="content pt-s px-s block">
             <div class="form-group description-input">
-                <textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $comment->html }}</textarea>
+                <textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $commentHtml }}</textarea>
             </div>
             <div class="form-group text-right">
                 <button type="button" class="button outline" refs="page-comment@form-cancel">{{ trans('common.cancel') }}</button>
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index c080359bc9d..76e014e80dc 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -82,11 +82,10 @@ public function test_comment_delete()
 
     public function test_scripts_cannot_be_injected_via_comment_html()
     {
-        $this->asAdmin();
         $page = $this->entities->page();
 
         $script = '<script>const a = "script";</script><p onclick="1">My lovely comment</p>';
-        $this->postJson("/comment/$page->id", [
+        $this->asAdmin()->postJson("/comment/$page->id", [
             'html' => $script,
         ]);
 
@@ -104,6 +103,20 @@ public function test_scripts_cannot_be_injected_via_comment_html()
         $pageView->assertSee('<p>My lovely comment</p><p>updated</p>');
     }
 
+    public function test_scripts_are_removed_even_if_already_in_db()
+    {
+        $page = $this->entities->page();
+        Comment::factory()->create([
+            'html' => '<script>superbadscript</script><p onclick="superbadonclick">scriptincommentest</p>',
+            'entity_type' => 'page', 'entity_id' => $page
+        ]);
+
+        $resp = $this->asAdmin()->get($page->getUrl());
+        $resp->assertSee('scriptincommentest', false);
+        $resp->assertDontSee('superbadscript', false);
+        $resp->assertDontSee('superbadonclick', false);
+    }
+
     public function test_reply_comments_are_nested()
     {
         $this->asAdmin();

From fee9045dacd5deca3ae88b17a22b3fff60c01195 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 31 Jan 2024 16:35:58 +0000
Subject: [PATCH 021/666] Comments: Removed remaining uses of redundant 'text'
 field

Opened #4821 to remove the DB field in a few releases time.
---
 app/Activity/Models/Comment.php                       | 4 ++--
 database/factories/Activity/Models/CommentFactory.php | 1 -
 tests/Entity/CommentTest.php                          | 4 ++--
 tests/Permissions/RolePermissionsTest.php             | 8 ++------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 038788afb9d..7d1c54646c1 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -11,7 +11,7 @@
 
 /**
  * @property int      $id
- * @property string   $text
+ * @property string   $text - Deprecated & now unused (#4821)
  * @property string   $html
  * @property int|null $parent_id  - Relates to local_id, not id
  * @property int      $local_id
@@ -25,7 +25,7 @@ class Comment extends Model implements Loggable
     use HasFactory;
     use HasCreatorAndUpdater;
 
-    protected $fillable = ['text', 'parent_id'];
+    protected $fillable = ['parent_id'];
     protected $appends = ['created', 'updated'];
 
     /**
diff --git a/database/factories/Activity/Models/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
index 35d6db9bdca..efbd183b31d 100644
--- a/database/factories/Activity/Models/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -25,7 +25,6 @@ public function definition()
 
         return [
             'html'      => $html,
-            'text'      => $text,
             'parent_id' => null,
             'local_id'  => 1,
         ];
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 76e014e80dc..eb4bccb7cae 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -18,10 +18,10 @@ public function test_add_comment()
         $resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $resp->assertStatus(200);
-        $resp->assertSee($comment->text);
+        $resp->assertSee($comment->html, false);
 
         $pageResp = $this->get($page->getUrl());
-        $pageResp->assertSee($comment->text);
+        $pageResp->assertSee($comment->html, false);
 
         $this->assertDatabaseHas('comments', [
             'local_id'    => 1,
diff --git a/tests/Permissions/RolePermissionsTest.php b/tests/Permissions/RolePermissionsTest.php
index ccb158faf5f..d3146bd47bd 100644
--- a/tests/Permissions/RolePermissionsTest.php
+++ b/tests/Permissions/RolePermissionsTest.php
@@ -738,16 +738,12 @@ public function test_comment_delete_all_permission()
 
     private function addComment(Page $page): TestResponse
     {
-        $comment = Comment::factory()->make();
-
-        return $this->postJson("/comment/$page->id", $comment->only('text', 'html'));
+        return $this->postJson("/comment/$page->id", ['html' => '<p>New comment content</p>']);
     }
 
     private function updateComment(Comment $comment): TestResponse
     {
-        $commentData = Comment::factory()->make();
-
-        return $this->putJson("/comment/{$comment->id}", $commentData->only('text', 'html'));
+        return $this->putJson("/comment/{$comment->id}", ['html' => '<p>Updated comment content</p>']);
     }
 
     private function deleteComment(Comment $comment): TestResponse

From 47f082c085ab8440b294f701b57289f101ddd1f4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 31 Jan 2024 16:47:58 +0000
Subject: [PATCH 022/666] Comments: Added HTML filter test, fixed placeholder
 in dark mode

---
 resources/sass/_tinymce.scss |  2 +-
 tests/Entity/CommentTest.php | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index fb5ea7e6ffe..b6a2156df19 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -34,7 +34,7 @@
   padding: 1rem;
   top: 4px;
   font-style: italic;
-  color: rgba(34,47,62,.5)
+  @include lightDark(color, rgba(34,47,62,.5), rgba(155,155,155,.5))
 }
 
 // Default styles for our custom root nodes
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index eb4bccb7cae..73136235ce0 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -117,6 +117,29 @@ public function test_scripts_are_removed_even_if_already_in_db()
         $resp->assertDontSee('superbadonclick', false);
     }
 
+    public function test_comment_html_is_limited()
+    {
+        $page = $this->entities->page();
+        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" data-a="b">a</a><section>Hello</section></p>';
+        $expected = '<p>Content<a href="#cat">a</a></p>';
+
+        $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
+        $resp->assertOk();
+        $this->assertDatabaseHas('comments', [
+           'entity_type' => 'page',
+           'entity_id' => $page->id,
+           'html' => $expected,
+        ]);
+
+        $comment = $page->comments()->first();
+        $resp = $this->put("/comment/{$comment->id}", ['html' => $input]);
+        $resp->assertOk();
+        $this->assertDatabaseHas('comments', [
+            'id'   => $comment->id,
+            'html' => $expected,
+        ]);
+    }
+
     public function test_reply_comments_are_nested()
     {
         $this->asAdmin();

From 4137cf9c8fc1f9088f8792b64fcc889f787e8958 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 1 Feb 2024 12:22:16 +0000
Subject: [PATCH 023/666] Default chapter templates: Updated api docs and tests

Also applied minor tweaks to some wording and logic.

During review of #4750
---
 app/Api/ListingResponseBuilder.php            |  2 +
 app/Entities/Repos/PageRepo.php               |  8 +--
 ...04542_add_default_template_to_chapters.php | 64 +++++++++----------
 dev/api/requests/chapters-create.json         |  1 +
 dev/api/requests/chapters-update.json         |  1 +
 dev/api/responses/chapters-create.json        |  1 +
 dev/api/responses/chapters-read.json          |  1 +
 dev/api/responses/chapters-update.json        |  1 +
 lang/en/entities.php                          |  2 +-
 tests/Api/ChaptersApiTest.php                 |  5 ++
 10 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/app/Api/ListingResponseBuilder.php b/app/Api/ListingResponseBuilder.php
index 44117bad975..329f5ce1c58 100644
--- a/app/Api/ListingResponseBuilder.php
+++ b/app/Api/ListingResponseBuilder.php
@@ -61,6 +61,8 @@ public function toResponse(): JsonResponse
             }
         });
 
+        dd($data->first());
+
         return response()->json([
             'data'  => $data,
             'total' => $total,
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index d9bda019892..85237a75219 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -136,13 +136,7 @@ public function getNewDraftPage(Entity $parent)
             $page->book_id = $parent->id;
         }
 
-        // check for chapter
-        if ($page->chapter_id) {
-            $defaultTemplate = $page->chapter->defaultTemplate;
-        } else {
-            $defaultTemplate = $page->book->defaultTemplate;
-        }
-
+        $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
         if ($defaultTemplate && userCan('view', $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
diff --git a/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
index 5e9ea1de311..b3a103a0173 100644
--- a/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
+++ b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
@@ -1,32 +1,32 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddDefaultTemplateToChapters extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('chapters', function (Blueprint $table) {
-            $table->integer('default_template_id')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('chapters', function (Blueprint $table) {
-            $table->dropColumn('default_template_id');
-        });
-    }
-}
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDefaultTemplateToChapters extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('chapters', function (Blueprint $table) {
+            $table->integer('default_template_id')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('chapters', function (Blueprint $table) {
+            $table->dropColumn('default_template_id');
+        });
+    }
+}
diff --git a/dev/api/requests/chapters-create.json b/dev/api/requests/chapters-create.json
index e9d9033874e..02aee9eeabf 100644
--- a/dev/api/requests/chapters-create.json
+++ b/dev/api/requests/chapters-create.json
@@ -3,6 +3,7 @@
   "name": "My fantastic new chapter",
   "description_html": "<p>This is a <strong>great new chapter</strong> that I've created via the API</p>",
   "priority": 15,
+  "default_template_id": 25,
   "tags": [
     {"name": "Category", "value": "Top Content"},
     {"name": "Rating", "value": "Highest"}
diff --git a/dev/api/requests/chapters-update.json b/dev/api/requests/chapters-update.json
index be675772bc6..cf9c89eacdc 100644
--- a/dev/api/requests/chapters-update.json
+++ b/dev/api/requests/chapters-update.json
@@ -3,6 +3,7 @@
   "name": "My fantastic updated chapter",
   "description_html": "<p>This is an <strong>updated chapter</strong> that I've altered via the API</p>",
   "priority": 16,
+  "default_template_id": 2428,
   "tags": [
     {"name": "Category", "value": "Kinda Good Content"},
     {"name": "Rating", "value": "Medium"}
diff --git a/dev/api/responses/chapters-create.json b/dev/api/responses/chapters-create.json
index 183186b0b42..1e81a1e6363 100644
--- a/dev/api/responses/chapters-create.json
+++ b/dev/api/responses/chapters-create.json
@@ -11,6 +11,7 @@
   "updated_by": 1,
   "owned_by": 1,
   "description_html": "<p>This is a <strong>great new chapter<\/strong> that I've created via the API<\/p>",
+  "default_template_id": 25,
   "tags": [
     {
       "name": "Category",
diff --git a/dev/api/responses/chapters-read.json b/dev/api/responses/chapters-read.json
index 192ffce7cd2..01a2f4b9f98 100644
--- a/dev/api/responses/chapters-read.json
+++ b/dev/api/responses/chapters-read.json
@@ -5,6 +5,7 @@
   "name": "Content Creation",
   "description": "How to create documentation on whatever subject you need to write about.",
   "description_html": "<p>How to create <strong>documentation</strong> on whatever subject you need to write about.</p>",
+  "default_template_id": 25,
   "priority": 3,
   "created_at": "2019-05-05T21:49:56.000000Z",
   "updated_at": "2019-09-28T11:24:23.000000Z",
diff --git a/dev/api/responses/chapters-update.json b/dev/api/responses/chapters-update.json
index 5ac3c64c12f..4d8d0024e6a 100644
--- a/dev/api/responses/chapters-update.json
+++ b/dev/api/responses/chapters-update.json
@@ -11,6 +11,7 @@
   "updated_by": 1,
   "owned_by": 1,
   "description_html": "<p>This is an <strong>updated chapter<\/strong> that I've altered via the API<\/p>",
+  "default_template_id": 2428,
   "tags": [
     {
       "name": "Category",
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 8860e243e77..9e620b24ed1 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -40,7 +40,7 @@
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
     'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book/chapter. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
diff --git a/tests/Api/ChaptersApiTest.php b/tests/Api/ChaptersApiTest.php
index 81a91887794..fdb80a4973e 100644
--- a/tests/Api/ChaptersApiTest.php
+++ b/tests/Api/ChaptersApiTest.php
@@ -35,6 +35,7 @@ public function test_create_endpoint()
     {
         $this->actingAsApiEditor();
         $book = $this->entities->book();
+        $templatePage = $this->entities->templatePage();
         $details = [
             'name'        => 'My API chapter',
             'description' => 'A chapter created via the API',
@@ -46,6 +47,7 @@ public function test_create_endpoint()
                 ],
             ],
             'priority' => 15,
+            'default_template_id' => $templatePage->id,
         ];
 
         $resp = $this->postJson($this->baseEndpoint, $details);
@@ -147,6 +149,7 @@ public function test_read_endpoint()
                     'name' => $page->name,
                 ],
             ],
+            'default_template_id' => null,
         ]);
         $resp->assertJsonCount($chapter->pages()->count(), 'pages');
     }
@@ -155,6 +158,7 @@ public function test_update_endpoint()
     {
         $this->actingAsApiEditor();
         $chapter = $this->entities->chapter();
+        $templatePage = $this->entities->templatePage();
         $details = [
             'name'        => 'My updated API chapter',
             'description' => 'A chapter updated via the API',
@@ -165,6 +169,7 @@ public function test_update_endpoint()
                 ],
             ],
             'priority'    => 15,
+            'default_template_id' => $templatePage->id,
         ];
 
         $resp = $this->putJson($this->baseEndpoint . "/{$chapter->id}", $details);

From 43a72fb9a5dd40885c70c41bc578bffbec9c25ee Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 1 Feb 2024 12:51:47 +0000
Subject: [PATCH 024/666] Default chapter templates: Added tests, extracted
 repo logic

- Updated existing book tests to be generic to all default templates,
  and updated with chapter testing.
- Extracted repeated logic in the Book/Chapter repos to be shared in the
  BaseRepo.

Review of #4750
---
 app/Entities/Repos/BaseRepo.php          |  30 ++
 app/Entities/Repos/BookRepo.php          |  31 +--
 app/Entities/Repos/ChapterRepo.php       |  32 +--
 tests/Entity/BookDefaultTemplateTest.php | 185 ------------
 tests/Entity/DefaultTemplateTest.php     | 341 +++++++++++++++++++++++
 5 files changed, 375 insertions(+), 244 deletions(-)
 delete mode 100644 tests/Entity/BookDefaultTemplateTest.php
 create mode 100644 tests/Entity/DefaultTemplateTest.php

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 27bf0016186..17208ae032a 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -3,9 +3,12 @@
 namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\TagRepo;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\HasHtmlDescription;
+use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
@@ -104,6 +107,33 @@ public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $remov
         }
     }
 
+    /**
+     * Update the default page template used for this item.
+     * Checks that, if changing, the provided value is a valid template and the user
+     * has visibility of the provided page template id.
+     */
+    public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): void
+    {
+        $changing = $templateId !== intval($entity->default_template_id);
+        if (!$changing) {
+            return;
+        }
+
+        if ($templateId === 0) {
+            $entity->default_template_id = null;
+            $entity->save();
+            return;
+        }
+
+        $templateExists = Page::query()->visible()
+            ->where('template', '=', true)
+            ->where('id', '=', $templateId)
+            ->exists();
+
+        $entity->default_template_id = $templateExists ? $templateId : null;
+        $entity->save();
+    }
+
     protected function updateDescription(Entity $entity, array $input): void
     {
         if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 03e1118b122..bf765b22d15 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -86,7 +86,7 @@ public function create(array $input): Book
         $book = new Book();
         $this->baseRepo->create($book, $input);
         $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
-        $this->updateBookDefaultTemplate($book, intval($input['default_template_id'] ?? null));
+        $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::BOOK_CREATE, $book);
 
         return $book;
@@ -100,7 +100,7 @@ public function update(Book $book, array $input): Book
         $this->baseRepo->update($book, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $this->updateBookDefaultTemplate($book, intval($input['default_template_id']));
+            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id']));
         }
 
         if (array_key_exists('image', $input)) {
@@ -112,33 +112,6 @@ public function update(Book $book, array $input): Book
         return $book;
     }
 
-    /**
-     * Update the default page template used for this book.
-     * Checks that, if changing, the provided value is a valid template and the user
-     * has visibility of the provided page template id.
-     */
-    protected function updateBookDefaultTemplate(Book $book, int $templateId): void
-    {
-        $changing = $templateId !== intval($book->default_template_id);
-        if (!$changing) {
-            return;
-        }
-
-        if ($templateId === 0) {
-            $book->default_template_id = null;
-            $book->save();
-            return;
-        }
-
-        $templateExists = Page::query()->visible()
-            ->where('template', '=', true)
-            ->where('id', '=', $templateId)
-            ->exists();
-
-        $book->default_template_id = $templateExists ? $templateId : null;
-        $book->save();
-    }
-
     /**
      * Update the given book's cover image, or clear it.
      *
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 9534a406082..50b554d68dc 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -6,7 +6,6 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
@@ -47,7 +46,7 @@ public function create(array $input, Book $parentBook): Chapter
         $chapter->book_id = $parentBook->id;
         $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
         $this->baseRepo->create($chapter, $input);
-        $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
+        $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
         return $chapter;
@@ -61,7 +60,7 @@ public function update(Chapter $chapter, array $input): Chapter
         $this->baseRepo->update($chapter, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $this->updateChapterDefaultTemplate($chapter, intval($input['default_template_id']));
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id']));
         }
 
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
@@ -108,33 +107,6 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
         return $parent;
     }
 
-    /**
-     * Update the default page template used for this chapter.
-     * Checks that, if changing, the provided value is a valid template and the user
-     * has visibility of the provided page template id.
-     */
-    protected function updateChapterDefaultTemplate(Chapter $chapter, int $templateId): void
-    {
-        $changing = $templateId !== intval($chapter->default_template_id);
-        if (!$changing) {
-            return;
-        }
-
-        if ($templateId === 0) {
-            $chapter->default_template_id = null;
-            $chapter->save();
-            return;
-        }
-
-        $templateExists = Page::query()->visible()
-            ->where('template', '=', true)
-            ->where('id', '=', $templateId)
-            ->exists();
-
-        $chapter->default_template_id = $templateExists ? $templateId : null;
-        $chapter->save();
-    }
-
     /**
      * Find a page parent entity via an identifier string in the format:
      * {type}:{id}
diff --git a/tests/Entity/BookDefaultTemplateTest.php b/tests/Entity/BookDefaultTemplateTest.php
deleted file mode 100644
index d4cd5b2c3a9..00000000000
--- a/tests/Entity/BookDefaultTemplateTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-namespace Tests\Entity;
-
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Page;
-use Tests\TestCase;
-
-class BookDefaultTemplateTest extends TestCase
-{
-    public function test_creating_book_with_default_template()
-    {
-        $templatePage = $this->entities->templatePage();
-        $details = [
-            'name' => 'My book with default template',
-            'default_template_id' => $templatePage->id,
-        ];
-
-        $this->asEditor()->post('/books', $details);
-        $this->assertDatabaseHas('books', $details);
-    }
-
-    public function test_updating_book_with_default_template()
-    {
-        $book = $this->entities->book();
-        $templatePage = $this->entities->templatePage();
-
-        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => strval($templatePage->id)]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
-
-        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => '']);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
-    }
-
-    public function test_default_template_cannot_be_set_if_not_a_template()
-    {
-        $book = $this->entities->book();
-        $page = $this->entities->page();
-        $this->assertFalse($page->template);
-
-        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $page->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
-    }
-
-    public function test_default_template_cannot_be_set_if_not_have_access()
-    {
-        $book = $this->entities->book();
-        $templatePage = $this->entities->templatePage();
-        $this->permissions->disableEntityInheritedPermissions($templatePage);
-
-        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
-    }
-
-    public function test_inaccessible_default_template_can_be_set_if_unchanged()
-    {
-        $templatePage = $this->entities->templatePage();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-        $this->permissions->disableEntityInheritedPermissions($templatePage);
-
-        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
-    }
-
-    public function test_default_page_template_option_shows_on_book_form()
-    {
-        $templatePage = $this->entities->templatePage();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-
-        $resp = $this->asEditor()->get($book->getUrl('/edit'));
-        $this->withHtml($resp)->assertElementExists('input[name="default_template_id"][value="' . $templatePage->id . '"]');
-    }
-
-    public function test_default_page_template_option_only_shows_template_name_if_visible()
-    {
-        $templatePage = $this->entities->templatePage();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-
-        $resp = $this->asEditor()->get($book->getUrl('/edit'));
-        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
-
-        $this->permissions->disableEntityInheritedPermissions($templatePage);
-
-        $resp = $this->asEditor()->get($book->getUrl('/edit'));
-        $this->withHtml($resp)->assertElementNotContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
-        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}");
-    }
-
-    public function test_creating_book_page_uses_default_template()
-    {
-        $templatePage = $this->entities->templatePage();
-        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-
-        $this->asEditor()->get($book->getUrl('/create-page'));
-        $latestPage = $book->pages()
-            ->where('draft', '=', true)
-            ->where('template', '=', false)
-            ->latest()->first();
-
-        $this->assertEquals('<p>My template page</p>', $latestPage->html);
-        $this->assertEquals('# My template page', $latestPage->markdown);
-    }
-
-    public function test_creating_chapter_page_uses_default_template()
-    {
-        $templatePage = $this->entities->templatePage();
-        $templatePage->forceFill(['html' => '<p>My template page in chapter</p>', 'markdown' => '# My template page in chapter'])->save();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-        $chapter = $book->chapters()->first();
-
-        $this->asEditor()->get($chapter->getUrl('/create-page'));
-        $latestPage = $chapter->pages()
-            ->where('draft', '=', true)
-            ->where('template', '=', false)
-            ->latest()->first();
-
-        $this->assertEquals('<p>My template page in chapter</p>', $latestPage->html);
-        $this->assertEquals('# My template page in chapter', $latestPage->markdown);
-    }
-
-    public function test_creating_book_page_as_guest_uses_default_template()
-    {
-        $templatePage = $this->entities->templatePage();
-        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-        $guest = $this->users->guest();
-
-        $this->permissions->makeAppPublic();
-        $this->permissions->grantUserRolePermissions($guest, ['page-create-all', 'page-update-all']);
-
-        $resp = $this->post($book->getUrl('/create-guest-page'), [
-            'name' => 'My guest page with template'
-        ]);
-        $latestPage = $book->pages()
-            ->where('draft', '=', false)
-            ->where('template', '=', false)
-            ->where('created_by', '=', $guest->id)
-            ->latest()->first();
-
-        $this->assertEquals('<p>My template page</p>', $latestPage->html);
-        $this->assertEquals('# My template page', $latestPage->markdown);
-    }
-
-    public function test_creating_book_page_does_not_use_template_if_not_visible()
-    {
-        $templatePage = $this->entities->templatePage();
-        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-        $this->permissions->disableEntityInheritedPermissions($templatePage);
-
-        $this->asEditor()->get($book->getUrl('/create-page'));
-        $latestPage = $book->pages()
-            ->where('draft', '=', true)
-            ->where('template', '=', false)
-            ->latest()->first();
-
-        $this->assertEquals('', $latestPage->html);
-        $this->assertEquals('', $latestPage->markdown);
-    }
-
-    public function test_template_page_delete_removes_book_template_usage()
-    {
-        $templatePage = $this->entities->templatePage();
-        $book = $this->bookUsingDefaultTemplate($templatePage);
-
-        $book->refresh();
-        $this->assertEquals($templatePage->id, $book->default_template_id);
-
-        $this->asEditor()->delete($templatePage->getUrl());
-        $this->asAdmin()->post('/settings/recycle-bin/empty');
-
-        $book->refresh();
-        $this->assertEquals(null, $book->default_template_id);
-    }
-
-    protected function bookUsingDefaultTemplate(Page $page): Book
-    {
-        $book = $this->entities->book();
-        $book->default_template_id = $page->id;
-        $book->save();
-
-        return $book;
-    }
-}
diff --git a/tests/Entity/DefaultTemplateTest.php b/tests/Entity/DefaultTemplateTest.php
new file mode 100644
index 00000000000..5369a5430bc
--- /dev/null
+++ b/tests/Entity/DefaultTemplateTest.php
@@ -0,0 +1,341 @@
+<?php
+
+namespace Tests\Entity;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use Tests\TestCase;
+
+class DefaultTemplateTest extends TestCase
+{
+    public function test_creating_book_with_default_template()
+    {
+        $templatePage = $this->entities->templatePage();
+        $details = [
+            'name' => 'My book with default template',
+            'default_template_id' => $templatePage->id,
+        ];
+
+        $this->asEditor()->post('/books', $details);
+        $this->assertDatabaseHas('books', $details);
+    }
+
+    public function test_creating_chapter_with_default_template()
+    {
+        $templatePage = $this->entities->templatePage();
+        $book = $this->entities->book();
+        $details = [
+            'name' => 'My chapter with default template',
+            'default_template_id' => $templatePage->id,
+        ];
+
+        $this->asEditor()->post($book->getUrl('/create-chapter'), $details);
+        $this->assertDatabaseHas('chapters', $details);
+    }
+
+    public function test_updating_book_with_default_template()
+    {
+        $book = $this->entities->book();
+        $templatePage = $this->entities->templatePage();
+
+        $this->asEditor()->put($book->getUrl(), ['name' => $book->name, 'default_template_id' => strval($templatePage->id)]);
+        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
+
+        $this->asEditor()->put($book->getUrl(), ['name' => $book->name, 'default_template_id' => '']);
+        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+    }
+
+    public function test_updating_chapter_with_default_template()
+    {
+        $chapter = $this->entities->chapter();
+        $templatePage = $this->entities->templatePage();
+
+        $this->asEditor()->put($chapter->getUrl(), ['name' => $chapter->name, 'default_template_id' => strval($templatePage->id)]);
+        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
+
+        $this->asEditor()->put($chapter->getUrl(), ['name' => $chapter->name, 'default_template_id' => '']);
+        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+    }
+
+    public function test_default_book_template_cannot_be_set_if_not_a_template()
+    {
+        $book = $this->entities->book();
+        $page = $this->entities->page();
+        $this->assertFalse($page->template);
+
+        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $page->id]);
+        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+    }
+
+    public function test_default_chapter_template_cannot_be_set_if_not_a_template()
+    {
+        $chapter = $this->entities->chapter();
+        $page = $this->entities->page();
+        $this->assertFalse($page->template);
+
+        $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $page->id]);
+        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+    }
+
+
+    public function test_default_book_template_cannot_be_set_if_not_have_access()
+    {
+        $book = $this->entities->book();
+        $templatePage = $this->entities->templatePage();
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+    }
+
+    public function test_default_chapter_template_cannot_be_set_if_not_have_access()
+    {
+        $chapter = $this->entities->chapter();
+        $templatePage = $this->entities->templatePage();
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+    }
+
+    public function test_inaccessible_book_default_template_can_be_set_if_unchanged()
+    {
+        $templatePage = $this->entities->templatePage();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
+    }
+
+    public function test_inaccessible_chapter_default_template_can_be_set_if_unchanged()
+    {
+        $templatePage = $this->entities->templatePage();
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
+    }
+
+    public function test_default_page_template_option_shows_on_book_form()
+    {
+        $templatePage = $this->entities->templatePage();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+
+        $resp = $this->asEditor()->get($book->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('input[name="default_template_id"][value="' . $templatePage->id . '"]');
+    }
+
+    public function test_default_page_template_option_shows_on_chapter_form()
+    {
+        $templatePage = $this->entities->templatePage();
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('input[name="default_template_id"][value="' . $templatePage->id . '"]');
+    }
+
+    public function test_book_default_page_template_option_only_shows_template_name_if_visible()
+    {
+        $templatePage = $this->entities->templatePage();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+
+        $resp = $this->asEditor()->get($book->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
+
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $resp = $this->asEditor()->get($book->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementNotContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
+        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}");
+    }
+
+    public function test_chapter_default_page_template_option_only_shows_template_name_if_visible()
+    {
+        $templatePage = $this->entities->templatePage();
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
+
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementNotContains('#template-control a.text-page', "#{$templatePage->id}, {$templatePage->name}");
+        $this->withHtml($resp)->assertElementContains('#template-control a.text-page', "#{$templatePage->id}");
+    }
+
+    public function test_creating_book_page_uses_book_default_template()
+    {
+        $templatePage = $this->entities->templatePage();
+        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $latestPage = $book->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My template page</p>', $latestPage->html);
+        $this->assertEquals('# My template page', $latestPage->markdown);
+    }
+
+    public function test_creating_chapter_page_uses_chapter_default_template()
+    {
+        $templatePage = $this->entities->templatePage();
+        $templatePage->forceFill(['html' => '<p>My chapter template page</p>', 'markdown' => '# My chapter template page'])->save();
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+
+        $this->asEditor()->get($chapter->getUrl('/create-page'));
+        $latestPage = $chapter->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My chapter template page</p>', $latestPage->html);
+        $this->assertEquals('# My chapter template page', $latestPage->markdown);
+    }
+
+    public function test_creating_chapter_page_uses_book_default_template_if_no_chapter_template_set()
+    {
+        $templatePage = $this->entities->templatePage();
+        $templatePage->forceFill(['html' => '<p>My template page in chapter</p>', 'markdown' => '# My template page in chapter'])->save();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+        $chapter = $book->chapters()->first();
+
+        $this->asEditor()->get($chapter->getUrl('/create-page'));
+        $latestPage = $chapter->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My template page in chapter</p>', $latestPage->html);
+        $this->assertEquals('# My template page in chapter', $latestPage->markdown);
+    }
+
+    public function test_creating_chapter_page_uses_chapter_template_instead_of_book_template()
+    {
+        $bookTemplatePage = $this->entities->templatePage();
+        $bookTemplatePage->forceFill(['html' => '<p>My book template</p>', 'markdown' => '# My book template'])->save();
+        $book = $this->bookUsingDefaultTemplate($bookTemplatePage);
+
+        $chapterTemplatePage = $this->entities->templatePage();
+        $chapterTemplatePage->forceFill(['html' => '<p>My chapter template</p>', 'markdown' => '# My chapter template'])->save();
+        $chapter = $book->chapters()->first();
+        $chapter->default_template_id = $chapterTemplatePage->id;
+        $chapter->save();
+
+        $this->asEditor()->get($chapter->getUrl('/create-page'));
+        $latestPage = $chapter->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My chapter template</p>', $latestPage->html);
+        $this->assertEquals('# My chapter template', $latestPage->markdown);
+    }
+
+    public function test_creating_page_as_guest_uses_default_template()
+    {
+        $templatePage = $this->entities->templatePage();
+        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+        $guest = $this->users->guest();
+
+        $this->permissions->makeAppPublic();
+        $this->permissions->grantUserRolePermissions($guest, ['page-create-all', 'page-update-all']);
+
+        $this->post($book->getUrl('/create-guest-page'), [
+            'name' => 'My guest page with template'
+        ]);
+        $latestBookPage = $book->pages()
+            ->where('draft', '=', false)
+            ->where('template', '=', false)
+            ->where('created_by', '=', $guest->id)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My template page</p>', $latestBookPage->html);
+        $this->assertEquals('# My template page', $latestBookPage->markdown);
+
+        $this->post($chapter->getUrl('/create-guest-page'), [
+            'name' => 'My guest page with template'
+        ]);
+        $latestChapterPage = $chapter->pages()
+            ->where('draft', '=', false)
+            ->where('template', '=', false)
+            ->where('created_by', '=', $guest->id)
+            ->latest()->first();
+
+        $this->assertEquals('<p>My template page</p>', $latestChapterPage->html);
+        $this->assertEquals('# My template page', $latestChapterPage->markdown);
+    }
+
+    public function test_templates_not_used_if_not_visible()
+    {
+        $templatePage = $this->entities->templatePage();
+        $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+
+        $this->permissions->disableEntityInheritedPermissions($templatePage);
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $latestBookPage = $book->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('', $latestBookPage->html);
+        $this->assertEquals('', $latestBookPage->markdown);
+
+        $this->asEditor()->get($chapter->getUrl('/create-page'));
+        $latestChapterPage = $chapter->pages()
+            ->where('draft', '=', true)
+            ->where('template', '=', false)
+            ->latest()->first();
+
+        $this->assertEquals('', $latestChapterPage->html);
+        $this->assertEquals('', $latestChapterPage->markdown);
+    }
+
+    public function test_template_page_delete_removes_template_usage()
+    {
+        $templatePage = $this->entities->templatePage();
+        $book = $this->bookUsingDefaultTemplate($templatePage);
+        $chapter = $this->chapterUsingDefaultTemplate($templatePage);
+
+        $book->refresh();
+        $this->assertEquals($templatePage->id, $book->default_template_id);
+        $this->assertEquals($templatePage->id, $chapter->default_template_id);
+
+        $this->asEditor()->delete($templatePage->getUrl());
+        $this->asAdmin()->post('/settings/recycle-bin/empty');
+
+        $book->refresh();
+        $chapter->refresh();
+        $this->assertEquals(null, $book->default_template_id);
+        $this->assertEquals(null, $chapter->default_template_id);
+    }
+
+    protected function bookUsingDefaultTemplate(Page $page): Book
+    {
+        $book = $this->entities->book();
+        $book->default_template_id = $page->id;
+        $book->save();
+
+        return $book;
+    }
+
+    protected function chapterUsingDefaultTemplate(Page $page): Chapter
+    {
+        $chapter = $this->entities->chapter();
+        $chapter->default_template_id = $page->id;
+        $chapter->save();
+
+        return $chapter;
+    }
+}

From 2460e7c56e4d0d8368cd37e09e68d25f24e705a3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 1 Feb 2024 12:57:26 +0000
Subject: [PATCH 025/666] Plonker Remediation: Removed dd line left in from
 debugging

---
 app/Api/ListingResponseBuilder.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Api/ListingResponseBuilder.php b/app/Api/ListingResponseBuilder.php
index 329f5ce1c58..44117bad975 100644
--- a/app/Api/ListingResponseBuilder.php
+++ b/app/Api/ListingResponseBuilder.php
@@ -61,8 +61,6 @@ public function toResponse(): JsonResponse
             }
         });
 
-        dd($data->first());
-
         return response()->json([
             'data'  => $data,
             'total' => $total,

From a70ed81908a8bcd67e6c449eb7d0cdd6f26ef998 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 4 Feb 2024 14:39:01 +0000
Subject: [PATCH 026/666] DB: Started update of entity loading to avoid global
 selects

Removes page/chpater addSelect global query, to load book slug, and
instead extracts base queries to be managed in new static class, while
updating specific entitiy relation loading to use our more efficient
MixedEntityListLoader where appropriate.

Related to #4823
---
 app/Activity/ActivityQueries.php              | 14 ++++----
 app/App/HomeController.php                    | 10 +++---
 app/Entities/Models/BookChild.php             | 14 --------
 app/Entities/Queries/EntityQuery.php          |  6 ++++
 app/Entities/Queries/PageQueries.php          | 31 ++++++++++++++++++
 app/Entities/Queries/RecentlyViewed.php       | 12 ++++---
 app/Entities/Queries/TopFavourites.php        | 10 +++---
 app/Entities/Tools/MixedEntityListLoader.php  | 25 ++++++++++++---
 app/References/ReferenceFetcher.php           |  2 +-
 ...4_02_04_141358_add_views_updated_index.php | 32 +++++++++++++++++++
 10 files changed, 115 insertions(+), 41 deletions(-)
 create mode 100644 app/Entities/Queries/PageQueries.php
 create mode 100644 database/migrations/2024_02_04_141358_add_views_updated_index.php

diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index c69cf7a36e7..dae0791b1cd 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -14,11 +15,10 @@
 
 class ActivityQueries
 {
-    protected PermissionApplicator $permissions;
-
-    public function __construct(PermissionApplicator $permissions)
-    {
-        $this->permissions = $permissions;
+    public function __construct(
+        protected PermissionApplicator $permissions,
+        protected MixedEntityListLoader $listLoader,
+    ) {
     }
 
     /**
@@ -29,11 +29,13 @@ public function latest(int $count = 20, int $page = 0): array
         $activityList = $this->permissions
             ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
             ->orderBy('created_at', 'desc')
-            ->with(['user', 'entity'])
+            ->with(['user'])
             ->skip($count * $page)
             ->take($count)
             ->get();
 
+        $this->listLoader->loadIntoRelations($activityList->all(), 'entity', false);
+
         return $this->filterSimilar($activityList);
     }
 
diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 8188ad0102f..48d60b8e490 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Queries\RecentlyViewed;
 use BookStack\Entities\Queries\TopFavourites;
 use BookStack\Entities\Repos\BookRepo;
@@ -26,9 +27,7 @@ public function index(Request $request, ActivityQueries $activities)
         $draftPages = [];
 
         if ($this->isSignedIn()) {
-            $draftPages = Page::visible()
-                ->where('draft', '=', true)
-                ->where('created_by', '=', user()->id)
+            $draftPages = PageQueries::currentUserDraftsForList()
                 ->orderBy('updated_at', 'desc')
                 ->with('book')
                 ->take(6)
@@ -40,11 +39,10 @@ public function index(Request $request, ActivityQueries $activities)
             (new RecentlyViewed())->run(12 * $recentFactor, 1)
             : Book::visible()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
         $favourites = (new TopFavourites())->run(6);
-        $recentlyUpdatedPages = Page::visible()->with('book')
+        $recentlyUpdatedPages = PageQueries::visibleForList()
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')
             ->take($favourites->count() > 0 ? 5 : 10)
-            ->select(Page::$listAttributes)
             ->get();
 
         $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
@@ -95,7 +93,7 @@ public function index(Request $request, ActivityQueries $activities)
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
             /** @var Page $customHomepage */
-            $customHomepage = Page::query()->where('draft', '=', false)->findOrFail($id);
+            $customHomepage = PageQueries::start()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);
             $customHomepage->html = $pageContent->render(false);
 
diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php
index 18735e56b72..d19a2466a40 100644
--- a/app/Entities/Models/BookChild.php
+++ b/app/Entities/Models/BookChild.php
@@ -18,20 +18,6 @@
  */
 abstract class BookChild extends Entity
 {
-    protected static function boot()
-    {
-        parent::boot();
-
-        // Load book slugs onto these models by default during query-time
-        static::addGlobalScope('book_slug', function (Builder $builder) {
-            $builder->addSelect(['book_slug' => function ($builder) {
-                $builder->select('slug')
-                    ->from('books')
-                    ->whereColumn('books.id', '=', 'book_id');
-            }]);
-        });
-    }
-
     /**
      * Scope a query to find items where the child has the given childSlug
      * where its parent has the bookSlug.
diff --git a/app/Entities/Queries/EntityQuery.php b/app/Entities/Queries/EntityQuery.php
index 2246e13b179..bd7a98b5e56 100644
--- a/app/Entities/Queries/EntityQuery.php
+++ b/app/Entities/Queries/EntityQuery.php
@@ -3,10 +3,16 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\EntityProvider;
+use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
 
 abstract class EntityQuery
 {
+    protected function mixedEntityListLoader(): MixedEntityListLoader
+    {
+        return app()->make(MixedEntityListLoader::class);
+    }
+
     protected function permissionService(): PermissionApplicator
     {
         return app()->make(PermissionApplicator::class);
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
new file mode 100644
index 00000000000..7b7ac1e5e70
--- /dev/null
+++ b/app/Entities/Queries/PageQueries.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\Page;
+use Illuminate\Database\Eloquent\Builder;
+
+class PageQueries
+{
+    public static function start(): Builder
+    {
+        return Page::query();
+    }
+
+    public static function visibleForList(): Builder
+    {
+        return Page::visible()
+            ->select(array_merge(Page::$listAttributes, ['book_slug' => function ($builder) {
+                $builder->select('slug')
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'pages.book_id');
+            }]));
+    }
+
+    public static function currentUserDraftsForList(): Builder
+    {
+        return static::visibleForList()
+            ->where('draft', '=', true)
+            ->where('created_by', '=', user()->id);
+    }
+}
diff --git a/app/Entities/Queries/RecentlyViewed.php b/app/Entities/Queries/RecentlyViewed.php
index 5895b97a2ae..fed15ca5aca 100644
--- a/app/Entities/Queries/RecentlyViewed.php
+++ b/app/Entities/Queries/RecentlyViewed.php
@@ -10,7 +10,7 @@ class RecentlyViewed extends EntityQuery
     public function run(int $count, int $page): Collection
     {
         $user = user();
-        if ($user === null || $user->isGuest()) {
+        if ($user->isGuest()) {
             return collect();
         }
 
@@ -23,11 +23,13 @@ public function run(int $count, int $page): Collection
             ->orderBy('views.updated_at', 'desc')
             ->where('user_id', '=', user()->id);
 
-        return $query->with('viewable')
+        $views = $query
             ->skip(($page - 1) * $count)
             ->take($count)
-            ->get()
-            ->pluck('viewable')
-            ->filter();
+            ->get();
+
+        $this->mixedEntityListLoader()->loadIntoRelations($views->all(), 'viewable', false);
+
+        return $views->pluck('viewable')->filter();
     }
 }
diff --git a/app/Entities/Queries/TopFavourites.php b/app/Entities/Queries/TopFavourites.php
index a2f8d9ea1d2..47d4b77f7b3 100644
--- a/app/Entities/Queries/TopFavourites.php
+++ b/app/Entities/Queries/TopFavourites.php
@@ -25,11 +25,13 @@ public function run(int $count, int $skip = 0)
             ->orderBy('views.views', 'desc')
             ->where('favourites.user_id', '=', user()->id);
 
-        return $query->with('favouritable')
+        $favourites = $query
             ->skip($skip)
             ->take($count)
-            ->get()
-            ->pluck('favouritable')
-            ->filter();
+            ->get();
+
+        $this->mixedEntityListLoader()->loadIntoRelations($favourites->all(), 'favouritable', false);
+
+        return $favourites->pluck('favouritable')->filter();
     }
 }
diff --git a/app/Entities/Tools/MixedEntityListLoader.php b/app/Entities/Tools/MixedEntityListLoader.php
index 50079e3bfe8..a0df791db5b 100644
--- a/app/Entities/Tools/MixedEntityListLoader.php
+++ b/app/Entities/Tools/MixedEntityListLoader.php
@@ -26,7 +26,7 @@ public function __construct(
      * This will look for a model id and type via 'name_id' and 'name_type'.
      * @param Model[] $relations
      */
-    public function loadIntoRelations(array $relations, string $relationName): void
+    public function loadIntoRelations(array $relations, string $relationName, bool $loadParents): void
     {
         $idsByType = [];
         foreach ($relations as $relation) {
@@ -40,7 +40,7 @@ public function loadIntoRelations(array $relations, string $relationName): void
             $idsByType[$type][] = $id;
         }
 
-        $modelMap = $this->idsByTypeToModelMap($idsByType);
+        $modelMap = $this->idsByTypeToModelMap($idsByType, $loadParents);
 
         foreach ($relations as $relation) {
             $type = $relation->getAttribute($relationName . '_type');
@@ -56,7 +56,7 @@ public function loadIntoRelations(array $relations, string $relationName): void
      * @param array<string, int[]> $idsByType
      * @return array<string, array<int, Model>>
      */
-    protected function idsByTypeToModelMap(array $idsByType): array
+    protected function idsByTypeToModelMap(array $idsByType, bool $eagerLoadParents): array
     {
         $modelMap = [];
 
@@ -67,10 +67,10 @@ protected function idsByTypeToModelMap(array $idsByType): array
 
             $instance = $this->entityProvider->get($type);
             $models = $instance->newQuery()
-                ->select($this->listAttributes[$type])
+                ->select(array_merge($this->listAttributes[$type], $this->getSubSelectsForQuery($type)))
                 ->scopes('visible')
                 ->whereIn('id', $ids)
-                ->with($this->getRelationsToEagerLoad($type))
+                ->with($eagerLoadParents ? $this->getRelationsToEagerLoad($type) : [])
                 ->get();
 
             if (count($models) > 0) {
@@ -100,4 +100,19 @@ protected function getRelationsToEagerLoad(string $type): array
 
         return $toLoad;
     }
+
+    protected function getSubSelectsForQuery(string $type): array
+    {
+        $subSelects = [];
+
+        if ($type === 'chapter' || $type === 'page') {
+            $subSelects['book_slug'] = function ($builder) {
+                $builder->select('slug')
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'book_id');
+            };
+        }
+
+        return $subSelects;
+    }
 }
diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.php
index 0d9883a3edc..655ea7c09eb 100644
--- a/app/References/ReferenceFetcher.php
+++ b/app/References/ReferenceFetcher.php
@@ -23,7 +23,7 @@ public function __construct(
     public function getReferencesToEntity(Entity $entity): Collection
     {
         $references = $this->queryReferencesToEntity($entity)->get();
-        $this->mixedEntityListLoader->loadIntoRelations($references->all(), 'from');
+        $this->mixedEntityListLoader->loadIntoRelations($references->all(), 'from', true);
 
         return $references;
     }
diff --git a/database/migrations/2024_02_04_141358_add_views_updated_index.php b/database/migrations/2024_02_04_141358_add_views_updated_index.php
new file mode 100644
index 00000000000..a643b3a1e0e
--- /dev/null
+++ b/database/migrations/2024_02_04_141358_add_views_updated_index.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('views', function (Blueprint $table) {
+            $table->index(['updated_at'], 'views_updated_at_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('views', function (Blueprint $table) {
+            $table->dropIndex('views_updated_at_index');
+        });
+    }
+};

From 1559b0acd1018edff3f173df0c87f631549462fa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 4 Feb 2024 17:35:16 +0000
Subject: [PATCH 027/666] Queries: Migrated BookRepo queries to new query class

Also moved to a non-static approach, and added a high-level class to
allow easy access to all other entity queries, for use in mixed-entity
scenarios and easier/simpler injection.
---
 app/App/HomeController.php                    | 18 ++++--
 app/Entities/Controllers/BookController.php   | 30 +++++-----
 .../Controllers/BookExportController.php      | 24 +++-----
 .../Controllers/BookSortController.php        | 16 +++---
 app/Entities/Queries/BookQueries.php          | 56 ++++++++++++++++++
 app/Entities/Queries/EntityQueries.php        | 12 ++++
 app/Entities/Queries/PageQueries.php          | 10 ++--
 app/Entities/Repos/BookRepo.php               | 57 -------------------
 8 files changed, 118 insertions(+), 105 deletions(-)
 create mode 100644 app/Entities/Queries/BookQueries.php
 create mode 100644 app/Entities/Queries/EntityQueries.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 48d60b8e490..dacd4bcc2c8 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -5,10 +5,9 @@
 use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Queries\PageQueries;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\RecentlyViewed;
 use BookStack\Entities\Queries\TopFavourites;
-use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
@@ -18,6 +17,11 @@
 
 class HomeController extends Controller
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
     /**
      * Display the homepage.
      */
@@ -27,7 +31,7 @@ public function index(Request $request, ActivityQueries $activities)
         $draftPages = [];
 
         if ($this->isSignedIn()) {
-            $draftPages = PageQueries::currentUserDraftsForList()
+            $draftPages = $this->queries->pages->currentUserDraftsForList()
                 ->orderBy('updated_at', 'desc')
                 ->with('book')
                 ->take(6)
@@ -39,7 +43,7 @@ public function index(Request $request, ActivityQueries $activities)
             (new RecentlyViewed())->run(12 * $recentFactor, 1)
             : Book::visible()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
         $favourites = (new TopFavourites())->run(6);
-        $recentlyUpdatedPages = PageQueries::visibleForList()
+        $recentlyUpdatedPages = $this->queries->pages->visibleForList()
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')
             ->take($favourites->count() > 0 ? 5 : 10)
@@ -83,7 +87,9 @@ public function index(Request $request, ActivityQueries $activities)
         }
 
         if ($homepageOption === 'books') {
-            $books = app()->make(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $books = $this->queries->books->visibleForListWithCover()
+                ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
+                ->paginate(18);
             $data = array_merge($commonData, ['books' => $books]);
 
             return view('home.books', $data);
@@ -93,7 +99,7 @@ public function index(Request $request, ActivityQueries $activities)
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
             /** @var Page $customHomepage */
-            $customHomepage = PageQueries::start()->where('draft', '=', false)->findOrFail($id);
+            $customHomepage = $this->queries->pages->start()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);
             $customHomepage->html = $pageContent->render(false);
 
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index 412feca2fe5..a956a47d64f 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -7,6 +7,7 @@
 use BookStack\Activity\Models\View;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
@@ -27,7 +28,8 @@ class BookController extends Controller
     public function __construct(
         protected ShelfContext $shelfContext,
         protected BookRepo $bookRepo,
-        protected ReferenceFetcher $referenceFetcher
+        protected BookQueries $queries,
+        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -43,10 +45,12 @@ public function index(Request $request)
             'updated_at' => trans('common.sort_updated_at'),
         ]);
 
-        $books = $this->bookRepo->getAllPaginated(18, $listOptions->getSort(), $listOptions->getOrder());
-        $recents = $this->isSignedIn() ? $this->bookRepo->getRecentlyViewed(4) : false;
-        $popular = $this->bookRepo->getPopular(4);
-        $new = $this->bookRepo->getRecentlyCreated(4);
+        $books = $this->queries->visibleForListWithCover()
+            ->orderBy($listOptions->getSort(), $listOptions->getOrder())
+            ->paginate(18);
+        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->take(4)->get() : false;
+        $popular = $this->queries->popularForList()->take(4)->get();
+        $new = $this->queries->visibleForList()->orderBy('created_at', 'desc')->take(4)->get();
 
         $this->shelfContext->clearShelfContext();
 
@@ -120,7 +124,7 @@ public function store(Request $request, string $shelfSlug = null)
      */
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
-        $book = $this->bookRepo->getBySlug($slug);
+        $book = $this->queries->findVisibleBySlug($slug);
         $bookChildren = (new BookContents($book))->getTree(true);
         $bookParentShelves = $book->shelves()->scopes('visible')->get();
 
@@ -147,7 +151,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
      */
     public function edit(string $slug)
     {
-        $book = $this->bookRepo->getBySlug($slug);
+        $book = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName' => $book->getShortName()]));
 
@@ -163,7 +167,7 @@ public function edit(string $slug)
      */
     public function update(Request $request, string $slug)
     {
-        $book = $this->bookRepo->getBySlug($slug);
+        $book = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('book-update', $book);
 
         $validated = $this->validate($request, [
@@ -190,7 +194,7 @@ public function update(Request $request, string $slug)
      */
     public function showDelete(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
 
@@ -204,7 +208,7 @@ public function showDelete(string $bookSlug)
      */
     public function destroy(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 
         $this->bookRepo->destroy($book);
@@ -219,7 +223,7 @@ public function destroy(string $bookSlug)
      */
     public function showCopy(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-view', $book);
 
         session()->flashInput(['name' => $book->name]);
@@ -236,7 +240,7 @@ public function showCopy(string $bookSlug)
      */
     public function copy(Request $request, Cloner $cloner, string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-view', $book);
         $this->checkPermission('book-create-all');
 
@@ -252,7 +256,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug)
      */
     public function convertToShelf(HierarchyTransformer $transformer, string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
         $this->checkOwnablePermission('book-delete', $book);
         $this->checkPermission('bookshelf-create-all');
diff --git a/app/Entities/Controllers/BookExportController.php b/app/Entities/Controllers/BookExportController.php
index 1a6b20db966..6540df97808 100644
--- a/app/Entities/Controllers/BookExportController.php
+++ b/app/Entities/Controllers/BookExportController.php
@@ -2,23 +2,17 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\Controller;
 use Throwable;
 
 class BookExportController extends Controller
 {
-    protected $bookRepo;
-    protected $exportFormatter;
-
-    /**
-     * BookExportController constructor.
-     */
-    public function __construct(BookRepo $bookRepo, ExportFormatter $exportFormatter)
-    {
-        $this->bookRepo = $bookRepo;
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected BookQueries $queries,
+        protected ExportFormatter $exportFormatter,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -29,7 +23,7 @@ public function __construct(BookRepo $bookRepo, ExportFormatter $exportFormatter
      */
     public function pdf(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
         return $this->download()->directly($pdfContent, $bookSlug . '.pdf');
@@ -42,7 +36,7 @@ public function pdf(string $bookSlug)
      */
     public function html(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
         return $this->download()->directly($htmlContent, $bookSlug . '.html');
@@ -53,7 +47,7 @@ public function html(string $bookSlug)
      */
     public function plainText(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
         return $this->download()->directly($textContent, $bookSlug . '.txt');
@@ -64,7 +58,7 @@ public function plainText(string $bookSlug)
      */
     public function markdown(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $textContent = $this->exportFormatter->bookToMarkdown($book);
 
         return $this->download()->directly($textContent, $bookSlug . '.md');
diff --git a/app/Entities/Controllers/BookSortController.php b/app/Entities/Controllers/BookSortController.php
index f2310e2055d..5d7024952cd 100644
--- a/app/Entities/Controllers/BookSortController.php
+++ b/app/Entities/Controllers/BookSortController.php
@@ -3,7 +3,7 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\ActivityType;
-use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\BookSortMap;
 use BookStack\Facades\Activity;
@@ -12,11 +12,9 @@
 
 class BookSortController extends Controller
 {
-    protected $bookRepo;
-
-    public function __construct(BookRepo $bookRepo)
-    {
-        $this->bookRepo = $bookRepo;
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
     }
 
     /**
@@ -24,7 +22,7 @@ public function __construct(BookRepo $bookRepo)
      */
     public function show(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
 
         $bookChildren = (new BookContents($book))->getTree(false);
@@ -40,7 +38,7 @@ public function show(string $bookSlug)
      */
     public function showItem(string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $bookChildren = (new BookContents($book))->getTree();
 
         return view('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
@@ -51,7 +49,7 @@ public function showItem(string $bookSlug)
      */
     public function update(Request $request, string $bookSlug)
     {
-        $book = $this->bookRepo->getBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
new file mode 100644
index 00000000000..6de28f0c264
--- /dev/null
+++ b/app/Entities/Queries/BookQueries.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Exceptions\NotFoundException;
+use Illuminate\Database\Eloquent\Builder;
+
+class BookQueries
+{
+    public function start(): Builder
+    {
+        return Book::query();
+    }
+
+    public function findVisibleBySlug(string $slug): Book
+    {
+        /** @var ?Book $book */
+        $book = $this->start()
+            ->scopes('visible')
+            ->where('slug', '=', $slug)
+            ->first();
+
+        if ($book === null) {
+            throw new NotFoundException(trans('errors.book_not_found'));
+        }
+
+        return $book;
+    }
+
+    public function visibleForList(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
+
+    public function visibleForListWithCover(): Builder
+    {
+        return $this->visibleForList()->with('cover');
+    }
+
+    public function recentlyViewedForCurrentUser(): Builder
+    {
+        return $this->visibleForList()
+            ->scopes('withLastView')
+            ->having('last_viewed_at', '>', 0)
+            ->orderBy('last_viewed_at', 'desc');
+    }
+
+    public function popularForList(): Builder
+    {
+        return $this->visibleForList()
+            ->scopes('withViewCount')
+            ->having('view_count', '>', 0)
+            ->orderBy('view_count', 'desc');
+    }
+}
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
new file mode 100644
index 00000000000..417db455c85
--- /dev/null
+++ b/app/Entities/Queries/EntityQueries.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+class EntityQueries
+{
+    public function __construct(
+        public BookQueries $books,
+        public PageQueries $pages,
+    ) {
+    }
+}
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index 7b7ac1e5e70..b9c64f63ce8 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -7,14 +7,14 @@
 
 class PageQueries
 {
-    public static function start(): Builder
+    public function start(): Builder
     {
         return Page::query();
     }
 
-    public static function visibleForList(): Builder
+    public function visibleForList(): Builder
     {
-        return Page::visible()
+        return $this->start()
             ->select(array_merge(Page::$listAttributes, ['book_slug' => function ($builder) {
                 $builder->select('slug')
                     ->from('books')
@@ -22,9 +22,9 @@ public static function visibleForList(): Builder
             }]));
     }
 
-    public static function currentUserDraftsForList(): Builder
+    public function currentUserDraftsForList(): Builder
     {
-        return static::visibleForList()
+        return $this->visibleForList()
             ->where('draft', '=', true)
             ->where('created_by', '=', user()->id);
     }
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index bf765b22d15..26b9414fbac 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -5,16 +5,12 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\ImageRepo;
 use Exception;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Collection;
 
 class BookRepo
 {
@@ -25,59 +21,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * Get all books in a paginated format.
-     */
-    public function getAllPaginated(int $count = 20, string $sort = 'name', string $order = 'asc'): LengthAwarePaginator
-    {
-        return Book::visible()->with('cover')->orderBy($sort, $order)->paginate($count);
-    }
-
-    /**
-     * Get the books that were most recently viewed by this user.
-     */
-    public function getRecentlyViewed(int $count = 20): Collection
-    {
-        return Book::visible()->withLastView()
-            ->having('last_viewed_at', '>', 0)
-            ->orderBy('last_viewed_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most popular books in the system.
-     */
-    public function getPopular(int $count = 20): Collection
-    {
-        return Book::visible()->withViewCount()
-            ->having('view_count', '>', 0)
-            ->orderBy('view_count', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most recently created books from the system.
-     */
-    public function getRecentlyCreated(int $count = 20): Collection
-    {
-        return Book::visible()->orderBy('created_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get a book by its slug.
-     */
-    public function getBySlug(string $slug): Book
-    {
-        $book = Book::visible()->where('slug', '=', $slug)->first();
-
-        if ($book === null) {
-            throw new NotFoundException(trans('errors.book_not_found'));
-        }
-
-        return $book;
-    }
-
     /**
      * Create a new book in the system.
      */

From 3886aedf54873a1bf90cfdaa9cafc6f22c1d03fd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 4 Feb 2024 19:32:19 +0000
Subject: [PATCH 028/666] Queries: Migrated bookshelf repo queries to new class

---
 app/App/HomeController.php                    |  5 +-
 .../Controllers/BookshelfController.php       | 27 ++++---
 app/Entities/Queries/BookshelfQueries.php     | 56 +++++++++++++++
 app/Entities/Queries/EntityQueries.php        |  1 +
 app/Entities/Repos/BookshelfRepo.php          | 70 +------------------
 5 files changed, 80 insertions(+), 79 deletions(-)
 create mode 100644 app/Entities/Queries/BookshelfQueries.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index dacd4bcc2c8..f5a3c7ed6cb 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -8,7 +8,6 @@
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\RecentlyViewed;
 use BookStack\Entities\Queries\TopFavourites;
-use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
 use BookStack\Uploads\FaviconHandler;
@@ -80,7 +79,9 @@ public function index(Request $request, ActivityQueries $activities)
         }
 
         if ($homepageOption === 'bookshelves') {
-            $shelves = app()->make(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $shelves = $this->queries->shelves->visibleForListWithCover()
+                ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
+                ->paginate(18);
             $data = array_merge($commonData, ['shelves' => $shelves]);
 
             return view('home.shelves', $data);
diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index 2f5461cdb0b..bc3fc2a6ff0 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\Models\View;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
@@ -20,8 +21,9 @@ class BookshelfController extends Controller
 {
     public function __construct(
         protected BookshelfRepo $shelfRepo,
+        protected BookshelfQueries $queries,
         protected ShelfContext $shelfContext,
-        protected ReferenceFetcher $referenceFetcher
+        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -37,10 +39,15 @@ public function index(Request $request)
             'updated_at' => trans('common.sort_updated_at'),
         ]);
 
-        $shelves = $this->shelfRepo->getAllPaginated(18, $listOptions->getSort(), $listOptions->getOrder());
-        $recents = $this->isSignedIn() ? $this->shelfRepo->getRecentlyViewed(4) : false;
-        $popular = $this->shelfRepo->getPopular(4);
-        $new = $this->shelfRepo->getRecentlyCreated(4);
+        $shelves = $this->queries->visibleForListWithCover()
+            ->orderBy($listOptions->getSort(), $listOptions->getOrder())
+            ->paginate(18);
+        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->get() : false;
+        $popular = $this->queries->popularForList()->get();
+        $new = $this->queries->visibleForList()
+            ->orderBy('created_at', 'desc')
+            ->take(4)
+            ->get();
 
         $this->shelfContext->clearShelfContext();
         $this->setPageTitle(trans('entities.shelves'));
@@ -96,7 +103,7 @@ public function store(Request $request)
      */
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
-        $shelf = $this->shelfRepo->getBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('bookshelf-view', $shelf);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
@@ -134,7 +141,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
      */
     public function edit(string $slug)
     {
-        $shelf = $this->shelfRepo->getBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
@@ -157,7 +164,7 @@ public function edit(string $slug)
      */
     public function update(Request $request, string $slug)
     {
-        $shelf = $this->shelfRepo->getBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('bookshelf-update', $shelf);
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
@@ -183,7 +190,7 @@ public function update(Request $request, string $slug)
      */
     public function showDelete(string $slug)
     {
-        $shelf = $this->shelfRepo->getBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $shelf->getShortName()]));
@@ -198,7 +205,7 @@ public function showDelete(string $slug)
      */
     public function destroy(string $slug)
     {
-        $shelf = $this->shelfRepo->getBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlug($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->shelfRepo->destroy($shelf);
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
new file mode 100644
index 00000000000..7edff45b958
--- /dev/null
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Exceptions\NotFoundException;
+use Illuminate\Database\Eloquent\Builder;
+
+class BookshelfQueries
+{
+    public function start(): Builder
+    {
+        return Bookshelf::query();
+    }
+
+    public function findVisibleBySlug(string $slug): Bookshelf
+    {
+        /** @var ?Bookshelf $shelf */
+        $shelf = $this->start()
+            ->scopes('visible')
+            ->where('slug', '=', $slug)
+            ->first();
+
+        if ($shelf === null) {
+            throw new NotFoundException(trans('errors.bookshelf_not_found'));
+        }
+
+        return $shelf;
+    }
+
+    public function visibleForList(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
+
+    public function visibleForListWithCover(): Builder
+    {
+        return $this->visibleForList()->with('cover');
+    }
+
+    public function recentlyViewedForCurrentUser(): Builder
+    {
+        return $this->visibleForList()
+            ->scopes('withLastView')
+            ->having('last_viewed_at', '>', 0)
+            ->orderBy('last_viewed_at', 'desc');
+    }
+
+    public function popularForList(): Builder
+    {
+        return $this->visibleForList()
+            ->scopes('withViewCount')
+            ->having('view_count', '>', 0)
+            ->orderBy('view_count', 'desc');
+    }
+}
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 417db455c85..b1973b0ea43 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -5,6 +5,7 @@
 class EntityQueries
 {
     public function __construct(
+        public BookshelfQueries $shelves,
         public BookQueries $books,
         public PageQueries $pages,
     ) {
diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index 27333b5b15c..479e6178f7b 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -6,78 +6,14 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Tools\TrashCan;
-use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use Exception;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
 
 class BookshelfRepo
 {
-    protected $baseRepo;
-
-    /**
-     * BookshelfRepo constructor.
-     */
-    public function __construct(BaseRepo $baseRepo)
-    {
-        $this->baseRepo = $baseRepo;
-    }
-
-    /**
-     * Get all bookshelves in a paginated format.
-     */
-    public function getAllPaginated(int $count = 20, string $sort = 'name', string $order = 'asc'): LengthAwarePaginator
-    {
-        return Bookshelf::visible()
-            ->with(['visibleBooks', 'cover'])
-            ->orderBy($sort, $order)
-            ->paginate($count);
-    }
-
-    /**
-     * Get the bookshelves that were most recently viewed by this user.
-     */
-    public function getRecentlyViewed(int $count = 20): Collection
-    {
-        return Bookshelf::visible()->withLastView()
-            ->having('last_viewed_at', '>', 0)
-            ->orderBy('last_viewed_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most popular bookshelves in the system.
-     */
-    public function getPopular(int $count = 20): Collection
-    {
-        return Bookshelf::visible()->withViewCount()
-            ->having('view_count', '>', 0)
-            ->orderBy('view_count', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get the most recently created bookshelves from the system.
-     */
-    public function getRecentlyCreated(int $count = 20): Collection
-    {
-        return Bookshelf::visible()->orderBy('created_at', 'desc')
-            ->take($count)->get();
-    }
-
-    /**
-     * Get a shelf by its slug.
-     */
-    public function getBySlug(string $slug): Bookshelf
-    {
-        $shelf = Bookshelf::visible()->where('slug', '=', $slug)->first();
-
-        if ($shelf === null) {
-            throw new NotFoundException(trans('errors.bookshelf_not_found'));
-        }
-
-        return $shelf;
+    public function __construct(
+        protected BaseRepo $baseRepo,
+    ) {
     }
 
     /**

From 9fa68fd8aba200ebc51589432afaf3aaf8bb2e39 Mon Sep 17 00:00:00 2001
From: Mikhail Shashin <shashinma@icloud.com>
Date: Mon, 5 Feb 2024 04:28:22 +0300
Subject: [PATCH 029/666] Update PWA manifest orientation to any

Changed the orientation settings in PwaManifestBuilder.php from 'portrait' to 'any'. This allows the PWA to adjust to any screen orientation, enhancing user flexibility.
---
 app/App/PwaManifestBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/App/PwaManifestBuilder.php b/app/App/PwaManifestBuilder.php
index ba4331a0f14..81ab2fcd711 100644
--- a/app/App/PwaManifestBuilder.php
+++ b/app/App/PwaManifestBuilder.php
@@ -26,7 +26,7 @@ public function build(): array
             "launch_handler" => [
                 "client_mode" => "focus-existing"
             ],
-            "orientation" => "portrait",
+            "orientation" => "any",
             "icons" => [
                 [
                     "src" => setting('app-icon-32') ?: url('/icon-32.png'),

From 8e78b4c43eb980f47d9c207a0ce3330699d54103 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 Feb 2024 15:59:20 +0000
Subject: [PATCH 030/666] Queries: Extracted chapter repo queries to class

Updated query classes to align to interface for common aligned
operations.
Extracted repeated string-identifier-based finding from page/chapter
repos to shared higher-level entity queries.
---
 .../Controllers/ChapterController.php         | 39 ++++++++------
 .../Controllers/ChapterExportController.php   | 24 ++++-----
 app/Entities/Controllers/PageController.php   |  8 ++-
 app/Entities/Models/Chapter.php               |  1 -
 app/Entities/Queries/BookQueries.php          |  7 ++-
 app/Entities/Queries/BookshelfQueries.php     |  7 ++-
 app/Entities/Queries/ChapterQueries.php       | 53 +++++++++++++++++++
 app/Entities/Queries/EntityQueries.php        | 30 +++++++++++
 app/Entities/Queries/PageQueries.php          |  7 ++-
 .../Queries/ProvidesEntityQueries.php         | 12 +++++
 app/Entities/Repos/ChapterRepo.php            | 46 ++--------------
 app/Entities/Repos/PageRepo.php               | 28 ++--------
 12 files changed, 160 insertions(+), 102 deletions(-)
 create mode 100644 app/Entities/Queries/ChapterQueries.php
 create mode 100644 app/Entities/Queries/ProvidesEntityQueries.php

diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 00616888a70..4b0a525eb37 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -5,6 +5,8 @@
 use BookStack\Activity\Models\View;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Queries\ChapterQueries;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
@@ -24,7 +26,9 @@ class ChapterController extends Controller
 {
     public function __construct(
         protected ChapterRepo $chapterRepo,
-        protected ReferenceFetcher $referenceFetcher
+        protected ChapterQueries $queries,
+        protected EntityQueries $entityQueries,
+        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -33,12 +37,15 @@ public function __construct(
      */
     public function create(string $bookSlug)
     {
-        $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
+        $book = $this->entityQueries->books->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));
 
-        return view('chapters.create', ['book' => $book, 'current' => $book]);
+        return view('chapters.create', [
+            'book' => $book,
+            'current' => $book,
+        ]);
     }
 
     /**
@@ -55,7 +62,7 @@ public function store(Request $request, string $bookSlug)
             'default_template_id' => ['nullable', 'integer'],
         ]);
 
-        $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
+        $book = $this->entityQueries->books->findVisibleBySlug($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($validated, $book);
@@ -68,7 +75,7 @@ public function store(Request $request, string $bookSlug)
      */
     public function show(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
@@ -96,7 +103,7 @@ public function show(string $bookSlug, string $chapterSlug)
      */
     public function edit(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
@@ -118,7 +125,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
             'default_template_id' => ['nullable', 'integer'],
         ]);
 
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->chapterRepo->update($chapter, $validated);
@@ -133,7 +140,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
      */
     public function showDelete(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
@@ -149,7 +156,7 @@ public function showDelete(string $bookSlug, string $chapterSlug)
      */
     public function destroy(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->chapterRepo->destroy($chapter);
@@ -164,7 +171,7 @@ public function destroy(string $bookSlug, string $chapterSlug)
      */
     public function showMove(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
@@ -182,7 +189,7 @@ public function showMove(string $bookSlug, string $chapterSlug)
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
@@ -211,7 +218,7 @@ public function move(Request $request, string $bookSlug, string $chapterSlug)
      */
     public function showCopy(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         session()->flashInput(['name' => $chapter->name]);
@@ -230,13 +237,13 @@ public function showCopy(string $bookSlug, string $chapterSlug)
      */
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         $entitySelection = $request->get('entity_selection') ?: null;
-        $newParentBook = $entitySelection ? $this->chapterRepo->findParentByIdentifier($entitySelection) : $chapter->getParent();
+        $newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent();
 
-        if (is_null($newParentBook)) {
+        if (!$newParentBook instanceof Book) {
             $this->showErrorNotification(trans('errors.selected_book_not_found'));
 
             return redirect($chapter->getUrl('/copy'));
@@ -256,7 +263,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
      */
     public function convertToBook(HierarchyTransformer $transformer, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $this->checkPermission('book-create-all');
diff --git a/app/Entities/Controllers/ChapterExportController.php b/app/Entities/Controllers/ChapterExportController.php
index b67ec9b373b..0e071fc82bd 100644
--- a/app/Entities/Controllers/ChapterExportController.php
+++ b/app/Entities/Controllers/ChapterExportController.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Repos\ChapterRepo;
+use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
@@ -10,16 +10,10 @@
 
 class ChapterExportController extends Controller
 {
-    protected $chapterRepo;
-    protected $exportFormatter;
-
-    /**
-     * ChapterExportController constructor.
-     */
-    public function __construct(ChapterRepo $chapterRepo, ExportFormatter $exportFormatter)
-    {
-        $this->chapterRepo = $chapterRepo;
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected ChapterQueries $queries,
+        protected ExportFormatter $exportFormatter,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -31,7 +25,7 @@ public function __construct(ChapterRepo $chapterRepo, ExportFormatter $exportFor
      */
     public function pdf(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
         return $this->download()->directly($pdfContent, $chapterSlug . '.pdf');
@@ -45,7 +39,7 @@ public function pdf(string $bookSlug, string $chapterSlug)
      */
     public function html(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $containedHtml = $this->exportFormatter->chapterToContainedHtml($chapter);
 
         return $this->download()->directly($containedHtml, $chapterSlug . '.html');
@@ -58,7 +52,7 @@ public function html(string $bookSlug, string $chapterSlug)
      */
     public function plainText(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToPlainText($chapter);
 
         return $this->download()->directly($chapterText, $chapterSlug . '.txt');
@@ -71,7 +65,7 @@ public function plainText(string $bookSlug, string $chapterSlug)
      */
     public function markdown(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToMarkdown($chapter);
 
         return $this->download()->directly($chapterText, $chapterSlug . '.md');
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index eaad3c0b79d..f2cd729c676 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -8,6 +8,8 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
@@ -29,6 +31,8 @@ class PageController extends Controller
 {
     public function __construct(
         protected PageRepo $pageRepo,
+        protected PageQueries $pageQueries,
+        protected EntityQueries $entityQueries,
         protected ReferenceFetcher $referenceFetcher
     ) {
     }
@@ -435,9 +439,9 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
         $this->checkOwnablePermission('page-view', $page);
 
         $entitySelection = $request->get('entity_selection') ?: null;
-        $newParent = $entitySelection ? $this->pageRepo->findParentByIdentifier($entitySelection) : $page->getParent();
+        $newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent();
 
-        if (is_null($newParent)) {
+        if (!$newParent instanceof Book && !$newParent instanceof Chapter) {
             $this->showErrorNotification(trans('errors.selected_book_chapter_not_found'));
 
             return redirect($page->getUrl('/copy'));
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index d3a7101116b..422c82442fe 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -11,7 +11,6 @@
  * Class Chapter.
  *
  * @property Collection<Page> $pages
- * @property string           $description
  * @property ?int             $default_template_id
  * @property ?Page            $defaultTemplate
  */
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 6de28f0c264..5e85523cf67 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -6,13 +6,18 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-class BookQueries
+class BookQueries implements ProvidesEntityQueries
 {
     public function start(): Builder
     {
         return Book::query();
     }
 
+    public function findVisibleById(int $id): ?Book
+    {
+        return $this->start()->scopes('visible')->find($id);
+    }
+
     public function findVisibleBySlug(string $slug): Book
     {
         /** @var ?Book $book */
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 7edff45b958..52e123087ce 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -6,13 +6,18 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
-class BookshelfQueries
+class BookshelfQueries implements ProvidesEntityQueries
 {
     public function start(): Builder
     {
         return Bookshelf::query();
     }
 
+    public function findVisibleById(int $id): ?Bookshelf
+    {
+        return $this->start()->scopes('visible')->find($id);
+    }
+
     public function findVisibleBySlug(string $slug): Bookshelf
     {
         /** @var ?Bookshelf $shelf */
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
new file mode 100644
index 00000000000..dcfc4aad30c
--- /dev/null
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\Chapter;
+use BookStack\Exceptions\NotFoundException;
+use Illuminate\Database\Eloquent\Builder;
+
+class ChapterQueries implements ProvidesEntityQueries
+{
+    protected static array $listAttributes = [
+        'id', 'slug', 'name', 'description', 'priority',
+        'created_at', 'updated_at',
+        'created_by', 'updated_by', 'owned_by',
+    ];
+
+    public function start(): Builder
+    {
+        return Chapter::query();
+    }
+
+    public function findVisibleById(int $id): ?Chapter
+    {
+        return $this->start()->scopes('visible')->find($id);
+    }
+
+    public function findVisibleBySlugs(string $bookSlug, string $chapterSlug): Chapter
+    {
+        /** @var ?Chapter $chapter */
+        $chapter = $this->start()->with('book')
+            ->whereHas('book', function (Builder $query) use ($bookSlug) {
+                $query->where('slug', '=', $bookSlug);
+            })
+            ->where('slug', '=', $chapterSlug)
+            ->first();
+
+        if ($chapter === null) {
+            throw new NotFoundException(trans('errors.chapter_not_found'));
+        }
+
+        return $chapter;
+    }
+
+    public function visibleForList(): Builder
+    {
+        return $this->start()
+            ->select(array_merge(static::$listAttributes, ['book_slug' => function ($builder) {
+                $builder->select('slug')
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'chapters.book_id');
+            }]));
+    }
+}
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index b1973b0ea43..39a21c9138c 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -2,12 +2,42 @@
 
 namespace BookStack\Entities\Queries;
 
+use BookStack\Entities\Models\Entity;
+
 class EntityQueries
 {
     public function __construct(
         public BookshelfQueries $shelves,
         public BookQueries $books,
+        public ChapterQueries $chapters,
         public PageQueries $pages,
     ) {
     }
+
+    /**
+     * Find an entity via an identifier string in the format:
+     * {type}:{id}
+     * Example: (book:5).
+     */
+    public function findVisibleByStringIdentifier(string $identifier): ?Entity
+    {
+        $explodedId = explode(':', $identifier);
+        $entityType = $explodedId[0];
+        $entityId = intval($explodedId[1]);
+
+        /** @var ?ProvidesEntityQueries $queries */
+        $queries = match ($entityType) {
+            'page' => $this->pages,
+            'chapter' => $this->chapters,
+            'book' => $this->books,
+            'bookshelf' => $this->shelves,
+            default => null,
+        };
+
+        if (is_null($queries)) {
+            return null;
+        }
+
+        return $queries->findVisibleById($entityId);
+    }
 }
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index b9c64f63ce8..f1991626f07 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -5,13 +5,18 @@
 use BookStack\Entities\Models\Page;
 use Illuminate\Database\Eloquent\Builder;
 
-class PageQueries
+class PageQueries implements ProvidesEntityQueries
 {
     public function start(): Builder
     {
         return Page::query();
     }
 
+    public function findVisibleById(int $id): ?Page
+    {
+        return $this->start()->scopes('visible')->find($id);
+    }
+
     public function visibleForList(): Builder
     {
         return $this->start()
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
new file mode 100644
index 00000000000..5c37b02e417
--- /dev/null
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\Entity;
+use Illuminate\Database\Eloquent\Builder;
+
+interface ProvidesEntityQueries
+{
+    public function start(): Builder;
+    public function findVisibleById(int $id): ?Entity;
+}
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 50b554d68dc..cacca93f6e9 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -4,12 +4,11 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
-use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use Exception;
@@ -17,26 +16,11 @@
 class ChapterRepo
 {
     public function __construct(
-        protected BaseRepo $baseRepo
+        protected BaseRepo $baseRepo,
+        protected EntityQueries $entityQueries,
     ) {
     }
 
-    /**
-     * Get a chapter via the slug.
-     *
-     * @throws NotFoundException
-     */
-    public function getBySlug(string $bookSlug, string $chapterSlug): Chapter
-    {
-        $chapter = Chapter::visible()->whereSlugs($bookSlug, $chapterSlug)->first();
-
-        if ($chapter === null) {
-            throw new NotFoundException(trans('errors.chapter_not_found'));
-        }
-
-        return $chapter;
-    }
-
     /**
      * Create a new chapter in the system.
      */
@@ -91,8 +75,8 @@ public function destroy(Chapter $chapter)
      */
     public function move(Chapter $chapter, string $parentIdentifier): Book
     {
-        $parent = $this->findParentByIdentifier($parentIdentifier);
-        if (is_null($parent)) {
+        $parent = $this->entityQueries->findVisibleByStringIdentifier($parentIdentifier);
+        if (!$parent instanceof Book) {
             throw new MoveOperationException('Book to move chapter into not found');
         }
 
@@ -106,24 +90,4 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
 
         return $parent;
     }
-
-    /**
-     * Find a page parent entity via an identifier string in the format:
-     * {type}:{id}
-     * Example: (book:5).
-     *
-     * @throws MoveOperationException
-     */
-    public function findParentByIdentifier(string $identifier): ?Book
-    {
-        $stringExploded = explode(':', $identifier);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
-
-        if ($entityType !== 'book') {
-            throw new MoveOperationException('Chapters can only be in books');
-        }
-
-        return Book::visible()->where('id', '=', $entityId)->first();
-    }
 }
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 85237a75219..929de528d62 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditorData;
@@ -26,6 +27,7 @@ class PageRepo
     public function __construct(
         protected BaseRepo $baseRepo,
         protected RevisionRepo $revisionRepo,
+        protected EntityQueries $entityQueries,
         protected ReferenceStore $referenceStore,
         protected ReferenceUpdater $referenceUpdater
     ) {
@@ -324,8 +326,8 @@ public function restoreRevision(Page $page, int $revisionId): Page
      */
     public function move(Page $page, string $parentIdentifier): Entity
     {
-        $parent = $this->findParentByIdentifier($parentIdentifier);
-        if (is_null($parent)) {
+        $parent = $this->entityQueries->findVisibleByStringIdentifier($parentIdentifier);
+        if (!$parent instanceof Chapter && !$parent instanceof Book) {
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
@@ -343,28 +345,6 @@ public function move(Page $page, string $parentIdentifier): Entity
         return $parent;
     }
 
-    /**
-     * Find a page parent entity via an identifier string in the format:
-     * {type}:{id}
-     * Example: (book:5).
-     *
-     * @throws MoveOperationException
-     */
-    public function findParentByIdentifier(string $identifier): ?Entity
-    {
-        $stringExploded = explode(':', $identifier);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
-
-        if ($entityType !== 'book' && $entityType !== 'chapter') {
-            throw new MoveOperationException('Pages can only be in books or chapters');
-        }
-
-        $parentClass = $entityType === 'book' ? Book::class : Chapter::class;
-
-        return $parentClass::visible()->where('id', '=', $entityId)->first();
-    }
-
     /**
      * Get a new priority for a page.
      */

From 222c665018cd7fc231d2970307e3a7423e4a377f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 Feb 2024 17:35:49 +0000
Subject: [PATCH 031/666] Queries: Extracted PageRepo queries to own class

Started new class for PageRevisions too as part of these changes
---
 app/Entities/Controllers/BookController.php   | 16 ++--
 .../Controllers/BookExportController.php      |  8 +-
 .../Controllers/BookSortController.php        |  6 +-
 .../Controllers/BookshelfController.php       | 10 +--
 .../Controllers/ChapterController.php         | 24 ++---
 .../Controllers/ChapterExportController.php   |  8 +-
 .../Controllers/PageApiController.php         | 10 ++-
 app/Entities/Controllers/PageController.php   | 57 +++++++-----
 .../Controllers/PageExportController.php      | 24 ++---
 .../Controllers/PageRevisionController.php    | 14 +--
 .../Controllers/PageTemplateController.php    | 29 ++++---
 app/Entities/Queries/BookQueries.php          |  2 +-
 app/Entities/Queries/BookshelfQueries.php     |  2 +-
 app/Entities/Queries/ChapterQueries.php       |  4 +-
 app/Entities/Queries/EntityQueries.php        |  1 +
 app/Entities/Queries/PageQueries.php          | 35 ++++++++
 app/Entities/Queries/PageRevisionQueries.php  | 41 +++++++++
 .../Queries/ProvidesEntityQueries.php         | 11 ++-
 app/Entities/Repos/PageRepo.php               | 87 -------------------
 app/Entities/Tools/PageEditorData.php         | 14 +--
 .../Controllers/AttachmentController.php      | 12 +--
 21 files changed, 219 insertions(+), 196 deletions(-)
 create mode 100644 app/Entities/Queries/PageRevisionQueries.php

diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index a956a47d64f..0e9346dbd53 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -124,7 +124,7 @@ public function store(Request $request, string $shelfSlug = null)
      */
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
-        $book = $this->queries->findVisibleBySlug($slug);
+        $book = $this->queries->findVisibleBySlugOrFail($slug);
         $bookChildren = (new BookContents($book))->getTree(true);
         $bookParentShelves = $book->shelves()->scopes('visible')->get();
 
@@ -151,7 +151,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
      */
     public function edit(string $slug)
     {
-        $book = $this->queries->findVisibleBySlug($slug);
+        $book = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('book-update', $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName' => $book->getShortName()]));
 
@@ -167,7 +167,7 @@ public function edit(string $slug)
      */
     public function update(Request $request, string $slug)
     {
-        $book = $this->queries->findVisibleBySlug($slug);
+        $book = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('book-update', $book);
 
         $validated = $this->validate($request, [
@@ -194,7 +194,7 @@ public function update(Request $request, string $slug)
      */
     public function showDelete(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
 
@@ -208,7 +208,7 @@ public function showDelete(string $bookSlug)
      */
     public function destroy(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-delete', $book);
 
         $this->bookRepo->destroy($book);
@@ -223,7 +223,7 @@ public function destroy(string $bookSlug)
      */
     public function showCopy(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-view', $book);
 
         session()->flashInput(['name' => $book->name]);
@@ -240,7 +240,7 @@ public function showCopy(string $bookSlug)
      */
     public function copy(Request $request, Cloner $cloner, string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-view', $book);
         $this->checkPermission('book-create-all');
 
@@ -256,7 +256,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug)
      */
     public function convertToShelf(HierarchyTransformer $transformer, string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
         $this->checkOwnablePermission('book-delete', $book);
         $this->checkPermission('bookshelf-create-all');
diff --git a/app/Entities/Controllers/BookExportController.php b/app/Entities/Controllers/BookExportController.php
index 6540df97808..5c1a964c1e1 100644
--- a/app/Entities/Controllers/BookExportController.php
+++ b/app/Entities/Controllers/BookExportController.php
@@ -23,7 +23,7 @@ public function __construct(
      */
     public function pdf(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
         return $this->download()->directly($pdfContent, $bookSlug . '.pdf');
@@ -36,7 +36,7 @@ public function pdf(string $bookSlug)
      */
     public function html(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
         return $this->download()->directly($htmlContent, $bookSlug . '.html');
@@ -47,7 +47,7 @@ public function html(string $bookSlug)
      */
     public function plainText(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
         return $this->download()->directly($textContent, $bookSlug . '.txt');
@@ -58,7 +58,7 @@ public function plainText(string $bookSlug)
      */
     public function markdown(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToMarkdown($book);
 
         return $this->download()->directly($textContent, $bookSlug . '.md');
diff --git a/app/Entities/Controllers/BookSortController.php b/app/Entities/Controllers/BookSortController.php
index 5d7024952cd..5aefc583279 100644
--- a/app/Entities/Controllers/BookSortController.php
+++ b/app/Entities/Controllers/BookSortController.php
@@ -22,7 +22,7 @@ public function __construct(
      */
     public function show(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
 
         $bookChildren = (new BookContents($book))->getTree(false);
@@ -38,7 +38,7 @@ public function show(string $bookSlug)
      */
     public function showItem(string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $bookChildren = (new BookContents($book))->getTree();
 
         return view('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren]);
@@ -49,7 +49,7 @@ public function showItem(string $bookSlug)
      */
     public function update(Request $request, string $bookSlug)
     {
-        $book = $this->queries->findVisibleBySlug($bookSlug);
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
 
         // Return if no map sent
diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index bc3fc2a6ff0..3118325da00 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -103,7 +103,7 @@ public function store(Request $request)
      */
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('bookshelf-view', $shelf);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
@@ -141,7 +141,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
      */
     public function edit(string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
@@ -164,7 +164,7 @@ public function edit(string $slug)
      */
     public function update(Request $request, string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('bookshelf-update', $shelf);
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
@@ -190,7 +190,7 @@ public function update(Request $request, string $slug)
      */
     public function showDelete(string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $shelf->getShortName()]));
@@ -205,7 +205,7 @@ public function showDelete(string $slug)
      */
     public function destroy(string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlug($slug);
+        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->shelfRepo->destroy($shelf);
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 4b0a525eb37..2e36a84b94d 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -37,7 +37,7 @@ public function __construct(
      */
     public function create(string $bookSlug)
     {
-        $book = $this->entityQueries->books->findVisibleBySlug($bookSlug);
+        $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));
@@ -62,7 +62,7 @@ public function store(Request $request, string $bookSlug)
             'default_template_id' => ['nullable', 'integer'],
         ]);
 
-        $book = $this->entityQueries->books->findVisibleBySlug($bookSlug);
+        $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($validated, $book);
@@ -75,7 +75,7 @@ public function store(Request $request, string $bookSlug)
      */
     public function show(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
@@ -103,7 +103,7 @@ public function show(string $bookSlug, string $chapterSlug)
      */
     public function edit(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
@@ -125,7 +125,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
             'default_template_id' => ['nullable', 'integer'],
         ]);
 
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         $this->chapterRepo->update($chapter, $validated);
@@ -140,7 +140,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
      */
     public function showDelete(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
@@ -156,7 +156,7 @@ public function showDelete(string $bookSlug, string $chapterSlug)
      */
     public function destroy(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->chapterRepo->destroy($chapter);
@@ -171,7 +171,7 @@ public function destroy(string $bookSlug, string $chapterSlug)
      */
     public function showMove(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
@@ -189,7 +189,7 @@ public function showMove(string $bookSlug, string $chapterSlug)
      */
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
@@ -218,7 +218,7 @@ public function move(Request $request, string $bookSlug, string $chapterSlug)
      */
     public function showCopy(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         session()->flashInput(['name' => $chapter->name]);
@@ -237,7 +237,7 @@ public function showCopy(string $bookSlug, string $chapterSlug)
      */
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         $entitySelection = $request->get('entity_selection') ?: null;
@@ -263,7 +263,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
      */
     public function convertToBook(HierarchyTransformer $transformer, string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $this->checkPermission('book-create-all');
diff --git a/app/Entities/Controllers/ChapterExportController.php b/app/Entities/Controllers/ChapterExportController.php
index 0e071fc82bd..ead601ab46b 100644
--- a/app/Entities/Controllers/ChapterExportController.php
+++ b/app/Entities/Controllers/ChapterExportController.php
@@ -25,7 +25,7 @@ public function __construct(
      */
     public function pdf(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
         return $this->download()->directly($pdfContent, $chapterSlug . '.pdf');
@@ -39,7 +39,7 @@ public function pdf(string $bookSlug, string $chapterSlug)
      */
     public function html(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $containedHtml = $this->exportFormatter->chapterToContainedHtml($chapter);
 
         return $this->download()->directly($containedHtml, $chapterSlug . '.html');
@@ -52,7 +52,7 @@ public function html(string $bookSlug, string $chapterSlug)
      */
     public function plainText(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToPlainText($chapter);
 
         return $this->download()->directly($chapterText, $chapterSlug . '.txt');
@@ -65,7 +65,7 @@ public function plainText(string $bookSlug, string $chapterSlug)
      */
     public function markdown(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToMarkdown($chapter);
 
         return $this->download()->directly($chapterText, $chapterSlug . '.md');
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index d2947f1bb72..6e3880aedc4 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
@@ -35,7 +36,8 @@ class PageApiController extends ApiController
     ];
 
     public function __construct(
-        protected PageRepo $pageRepo
+        protected PageRepo $pageRepo,
+        protected PageQueries $queries,
     ) {
     }
 
@@ -97,7 +99,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $page = $this->pageRepo->getById($id, []);
+        $page = $this->queries->findVisibleByIdOrFail($id);
 
         return response()->json($page->forJsonDisplay());
     }
@@ -113,7 +115,7 @@ public function update(Request $request, string $id)
     {
         $requestData = $this->validate($request, $this->rules['update']);
 
-        $page = $this->pageRepo->getById($id, []);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $this->checkOwnablePermission('page-update', $page);
 
         $parent = null;
@@ -148,7 +150,7 @@ public function update(Request $request, string $id)
      */
     public function delete(string $id)
     {
-        $page = $this->pageRepo->getById($id, []);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $this->checkOwnablePermission('page-delete', $page);
 
         $this->pageRepo->destroy($page);
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index f2cd729c676..3a5bdbd0bf1 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -31,7 +31,7 @@ class PageController extends Controller
 {
     public function __construct(
         protected PageRepo $pageRepo,
-        protected PageQueries $pageQueries,
+        protected PageQueries $queries,
         protected EntityQueries $entityQueries,
         protected ReferenceFetcher $referenceFetcher
     ) {
@@ -44,7 +44,12 @@ public function __construct(
      */
     public function create(string $bookSlug, string $chapterSlug = null)
     {
-        $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);
+        if ($chapterSlug) {
+            $parent = $this->entityQueries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        } else {
+            $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
+        }
+
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
@@ -71,7 +76,12 @@ public function createAsGuest(Request $request, string $bookSlug, string $chapte
             'name' => ['required', 'string', 'max:255'],
         ]);
 
-        $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);
+        if ($chapterSlug) {
+            $parent = $this->entityQueries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        } else {
+            $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
+        }
+
         $this->checkOwnablePermission('page-create', $parent);
 
         $page = $this->pageRepo->getNewDraftPage($parent);
@@ -89,10 +99,10 @@ public function createAsGuest(Request $request, string $bookSlug, string $chapte
      */
     public function editDraft(Request $request, string $bookSlug, int $pageId)
     {
-        $draft = $this->pageRepo->getById($pageId);
+        $draft = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-create', $draft->getParent());
 
-        $editorData = new PageEditorData($draft, $this->pageRepo, $request->query('editor', ''));
+        $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         return view('pages.edit', $editorData->getViewData());
@@ -109,7 +119,7 @@ public function store(Request $request, string $bookSlug, int $pageId)
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
         ]);
-        $draftPage = $this->pageRepo->getById($pageId);
+        $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-create', $draftPage->getParent());
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
@@ -126,11 +136,12 @@ public function store(Request $request, string $bookSlug, int $pageId)
     public function show(string $bookSlug, string $pageSlug)
     {
         try {
-            $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+            $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         } catch (NotFoundException $e) {
-            $page = $this->pageRepo->getByOldSlug($bookSlug, $pageSlug);
+            $revision = $this->entityQueries->revisions->findLatestVersionBySlugs($bookSlug, $pageSlug);
+            $page = $revision->page ?? null;
 
-            if ($page === null) {
+            if (is_null($page)) {
                 throw $e;
             }
 
@@ -171,7 +182,7 @@ public function show(string $bookSlug, string $pageSlug)
      */
     public function getPageAjax(int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->queries->findVisibleByIdOrFail($pageId);
         $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));
         $page->makeHidden(['book']);
 
@@ -185,10 +196,10 @@ public function getPageAjax(int $pageId)
      */
     public function edit(Request $request, string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-update', $page);
 
-        $editorData = new PageEditorData($page, $this->pageRepo, $request->query('editor', ''));
+        $editorData = new PageEditorData($page, $this->entityQueries, $request->query('editor', ''));
         if ($editorData->getWarnings()) {
             $this->showWarningNotification(implode("\n", $editorData->getWarnings()));
         }
@@ -209,7 +220,7 @@ public function update(Request $request, string $bookSlug, string $pageSlug)
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
         ]);
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-update', $page);
 
         $this->pageRepo->update($page, $request->all());
@@ -224,7 +235,7 @@ public function update(Request $request, string $bookSlug, string $pageSlug)
      */
     public function saveDraft(Request $request, int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->isSignedIn()) {
@@ -249,7 +260,7 @@ public function saveDraft(Request $request, int $pageId)
      */
     public function redirectFromLink(int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->queries->findVisibleByIdOrFail($pageId);
 
         return redirect($page->getUrl());
     }
@@ -261,7 +272,7 @@ public function redirectFromLink(int $pageId)
      */
     public function showDelete(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
@@ -283,7 +294,7 @@ public function showDelete(string $bookSlug, string $pageSlug)
      */
     public function showDeleteDraft(string $bookSlug, int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
@@ -306,7 +317,7 @@ public function showDeleteDraft(string $bookSlug, int $pageId)
      */
     public function destroy(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
         $parent = $page->getParent();
 
@@ -323,7 +334,7 @@ public function destroy(string $bookSlug, string $pageSlug)
      */
     public function destroyDraft(string $bookSlug, int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->queries->findVisibleByIdOrFail($pageId);
         $book = $page->book;
         $chapter = $page->chapter;
         $this->checkOwnablePermission('page-update', $page);
@@ -370,7 +381,7 @@ public function showRecentlyUpdated()
      */
     public function showMove(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-delete', $page);
 
@@ -388,7 +399,7 @@ public function showMove(string $bookSlug, string $pageSlug)
      */
     public function move(Request $request, string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-delete', $page);
 
@@ -417,7 +428,7 @@ public function move(Request $request, string $bookSlug, string $pageSlug)
      */
     public function showCopy(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-view', $page);
         session()->flashInput(['name' => $page->name]);
 
@@ -435,7 +446,7 @@ public function showCopy(string $bookSlug, string $pageSlug)
      */
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-view', $page);
 
         $entitySelection = $request->get('entity_selection') ?: null;
diff --git a/app/Entities/Controllers/PageExportController.php b/app/Entities/Controllers/PageExportController.php
index 31862c8acc0..be97f1930bd 100644
--- a/app/Entities/Controllers/PageExportController.php
+++ b/app/Entities/Controllers/PageExportController.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Repos\PageRepo;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
@@ -11,16 +11,10 @@
 
 class PageExportController extends Controller
 {
-    protected $pageRepo;
-    protected $exportFormatter;
-
-    /**
-     * PageExportController constructor.
-     */
-    public function __construct(PageRepo $pageRepo, ExportFormatter $exportFormatter)
-    {
-        $this->pageRepo = $pageRepo;
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected PageQueries $queries,
+        protected ExportFormatter $exportFormatter,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -33,7 +27,7 @@ public function __construct(PageRepo $pageRepo, ExportFormatter $exportFormatter
      */
     public function pdf(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $page->html = (new PageContent($page))->render();
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
@@ -48,7 +42,7 @@ public function pdf(string $bookSlug, string $pageSlug)
      */
     public function html(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $page->html = (new PageContent($page))->render();
         $containedHtml = $this->exportFormatter->pageToContainedHtml($page);
 
@@ -62,7 +56,7 @@ public function html(string $bookSlug, string $pageSlug)
      */
     public function plainText(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToPlainText($page);
 
         return $this->download()->directly($pageText, $pageSlug . '.txt');
@@ -75,7 +69,7 @@ public function plainText(string $bookSlug, string $pageSlug)
      */
     public function markdown(string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToMarkdown($page);
 
         return $this->download()->directly($pageText, $pageSlug . '.md');
diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index a3190a0fc43..232d40668f4 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\RevisionRepo;
 use BookStack\Entities\Tools\PageContent;
@@ -18,6 +19,7 @@ class PageRevisionController extends Controller
 {
     public function __construct(
         protected PageRepo $pageRepo,
+        protected PageQueries $pageQueries,
         protected RevisionRepo $revisionRepo,
     ) {
     }
@@ -29,7 +31,7 @@ public function __construct(
      */
     public function index(Request $request, string $bookSlug, string $pageSlug)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $listOptions = SimpleListOptions::fromRequest($request, 'page_revisions', true)->withSortOptions([
             'id' => trans('entities.pages_revisions_sort_number')
         ]);
@@ -60,7 +62,7 @@ public function index(Request $request, string $bookSlug, string $pageSlug)
      */
     public function show(string $bookSlug, string $pageSlug, int $revisionId)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         /** @var ?PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
@@ -89,7 +91,7 @@ public function show(string $bookSlug, string $pageSlug, int $revisionId)
      */
     public function changes(string $bookSlug, string $pageSlug, int $revisionId)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         /** @var ?PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
@@ -121,7 +123,7 @@ public function changes(string $bookSlug, string $pageSlug, int $revisionId)
      */
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-update', $page);
 
         $page = $this->pageRepo->restoreRevision($page, $revisionId);
@@ -136,7 +138,7 @@ public function restore(string $bookSlug, string $pageSlug, int $revisionId)
      */
     public function destroy(string $bookSlug, string $pageSlug, int $revId)
     {
-        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('page-delete', $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
@@ -162,7 +164,7 @@ public function destroy(string $bookSlug, string $pageSlug, int $revId)
      */
     public function destroyUserDraft(string $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         return response('', 200);
diff --git a/app/Entities/Controllers/PageTemplateController.php b/app/Entities/Controllers/PageTemplateController.php
index e4e7b568064..c0b97214856 100644
--- a/app/Entities/Controllers/PageTemplateController.php
+++ b/app/Entities/Controllers/PageTemplateController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Entities\Controllers;
 
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
@@ -9,14 +10,10 @@
 
 class PageTemplateController extends Controller
 {
-    protected $pageRepo;
-
-    /**
-     * PageTemplateController constructor.
-     */
-    public function __construct(PageRepo $pageRepo)
-    {
-        $this->pageRepo = $pageRepo;
+    public function __construct(
+        protected PageRepo $pageRepo,
+        protected PageQueries $pageQueries,
+    ) {
     }
 
     /**
@@ -26,7 +23,19 @@ public function list(Request $request)
     {
         $page = $request->get('page', 1);
         $search = $request->get('search', '');
-        $templates = $this->pageRepo->getTemplates(10, $page, $search);
+        $count = 10;
+
+        $query = $this->pageQueries->visibleTemplates()
+            ->orderBy('name', 'asc')
+            ->skip(($page - 1) * $count)
+            ->take($count);
+
+        if ($search) {
+            $query->where('name', 'like', '%' . $search . '%');
+        }
+
+        $templates = $query->paginate($count, ['*'], 'page', $page);
+        $templates->withPath('/templates');
 
         if ($search) {
             $templates->appends(['search' => $search]);
@@ -44,7 +53,7 @@ public function list(Request $request)
      */
     public function get(int $templateId)
     {
-        $page = $this->pageRepo->getById($templateId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($templateId);
 
         if (!$page->template) {
             throw new NotFoundException();
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 5e85523cf67..3d7474b3dfa 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -18,7 +18,7 @@ public function findVisibleById(int $id): ?Book
         return $this->start()->scopes('visible')->find($id);
     }
 
-    public function findVisibleBySlug(string $slug): Book
+    public function findVisibleBySlugOrFail(string $slug): Book
     {
         /** @var ?Book $book */
         $book = $this->start()
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 52e123087ce..d61607e7a5a 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -18,7 +18,7 @@ public function findVisibleById(int $id): ?Bookshelf
         return $this->start()->scopes('visible')->find($id);
     }
 
-    public function findVisibleBySlug(string $slug): Bookshelf
+    public function findVisibleBySlugOrFail(string $slug): Bookshelf
     {
         /** @var ?Bookshelf $shelf */
         $shelf = $this->start()
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index dcfc4aad30c..200514932cd 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -24,7 +24,7 @@ public function findVisibleById(int $id): ?Chapter
         return $this->start()->scopes('visible')->find($id);
     }
 
-    public function findVisibleBySlugs(string $bookSlug, string $chapterSlug): Chapter
+    public function findVisibleBySlugsOrFail(string $bookSlug, string $chapterSlug): Chapter
     {
         /** @var ?Chapter $chapter */
         $chapter = $this->start()->with('book')
@@ -34,7 +34,7 @@ public function findVisibleBySlugs(string $bookSlug, string $chapterSlug): Chapt
             ->where('slug', '=', $chapterSlug)
             ->first();
 
-        if ($chapter === null) {
+        if (is_null($chapter)) {
             throw new NotFoundException(trans('errors.chapter_not_found'));
         }
 
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 39a21c9138c..31e5b913ad1 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -11,6 +11,7 @@ public function __construct(
         public BookQueries $books,
         public ChapterQueries $chapters,
         public PageQueries $pages,
+        public PageRevisionQueries $revisions,
     ) {
     }
 
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index f1991626f07..1640dc2db54 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
 class PageQueries implements ProvidesEntityQueries
@@ -17,6 +18,34 @@ public function findVisibleById(int $id): ?Page
         return $this->start()->scopes('visible')->find($id);
     }
 
+    public function findVisibleByIdOrFail(int $id): Page
+    {
+        $page = $this->findVisibleById($id);
+
+        if (is_null($page)) {
+            throw new NotFoundException(trans('errors.page_not_found'));
+        }
+
+        return $page;
+    }
+
+    public function findVisibleBySlugsOrFail(string $bookSlug, string $pageSlug): Page
+    {
+        /** @var ?Page $page */
+        $page = $this->start()->with('book')
+            ->whereHas('book', function (Builder $query) use ($bookSlug) {
+                $query->where('slug', '=', $bookSlug);
+            })
+            ->where('slug', '=', $pageSlug)
+            ->first();
+
+        if (is_null($page)) {
+            throw new NotFoundException(trans('errors.chapter_not_found'));
+        }
+
+        return $page;
+    }
+
     public function visibleForList(): Builder
     {
         return $this->start()
@@ -33,4 +62,10 @@ public function currentUserDraftsForList(): Builder
             ->where('draft', '=', true)
             ->where('created_by', '=', user()->id);
     }
+
+    public function visibleTemplates(): Builder
+    {
+        return $this->visibleForList()
+            ->where('template', '=', true);
+    }
 }
diff --git a/app/Entities/Queries/PageRevisionQueries.php b/app/Entities/Queries/PageRevisionQueries.php
new file mode 100644
index 00000000000..2dcd428f53b
--- /dev/null
+++ b/app/Entities/Queries/PageRevisionQueries.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\PageRevision;
+use Illuminate\Database\Eloquent\Builder;
+
+class PageRevisionQueries
+{
+    public function start(): Builder
+    {
+        return PageRevision::query();
+    }
+
+    public function findLatestVersionBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
+    {
+        return PageRevision::query()
+            ->whereHas('page', function (Builder $query) {
+                $query->scopes('visible');
+            })
+            ->where('slug', '=', $pageSlug)
+            ->where('type', '=', 'version')
+            ->where('book_slug', '=', $bookSlug)
+            ->orderBy('created_at', 'desc')
+            ->first();
+    }
+
+    public function findLatestCurrentUserDraftsForPageId(int $pageId): ?PageRevision
+    {
+        return $this->latestCurrentUserDraftsForPageId($pageId)->first();
+    }
+
+    public function latestCurrentUserDraftsForPageId(int $pageId): Builder
+    {
+        return $this->start()
+            ->where('created_by', '=', user()->id)
+            ->where('type', 'update_draft')
+            ->where('page_id', '=', $pageId)
+            ->orderBy('created_at', 'desc');
+    }
+}
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index 5c37b02e417..ea83d6cdd57 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -2,9 +2,18 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\Entities\Models\Entity;
+use BookStack\App\Model;
 use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * Interface for our classes which provide common queries for our
+ * entity objects. Ideally all queries for entities should run through
+ * these classes.
+ * Any added methods should return a builder instances to allow extension
+ * via building on the query, unless the method starts with 'find'
+ * in which case an entity object should be returned.
+ * (nullable unless it's a *OrFail method).
+ */
 interface ProvidesEntityQueries
 {
     public function start(): Builder;
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 929de528d62..74aed072a06 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -14,13 +14,11 @@
 use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
-use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use Exception;
-use Illuminate\Pagination\LengthAwarePaginator;
 
 class PageRepo
 {
@@ -33,91 +31,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * Get a page by ID.
-     *
-     * @throws NotFoundException
-     */
-    public function getById(int $id, array $relations = ['book']): Page
-    {
-        /** @var Page $page */
-        $page = Page::visible()->with($relations)->find($id);
-
-        if (!$page) {
-            throw new NotFoundException(trans('errors.page_not_found'));
-        }
-
-        return $page;
-    }
-
-    /**
-     * Get a page its book and own slug.
-     *
-     * @throws NotFoundException
-     */
-    public function getBySlug(string $bookSlug, string $pageSlug): Page
-    {
-        $page = Page::visible()->whereSlugs($bookSlug, $pageSlug)->first();
-
-        if (!$page) {
-            throw new NotFoundException(trans('errors.page_not_found'));
-        }
-
-        return $page;
-    }
-
-    /**
-     * Get a page by its old slug but checking the revisions table
-     * for the last revision that matched the given page and book slug.
-     */
-    public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
-    {
-        $revision = $this->revisionRepo->getBySlugs($bookSlug, $pageSlug);
-
-        return $revision->page ?? null;
-    }
-
-    /**
-     * Get pages that have been marked as a template.
-     */
-    public function getTemplates(int $count = 10, int $page = 1, string $search = ''): LengthAwarePaginator
-    {
-        $query = Page::visible()
-            ->where('template', '=', true)
-            ->orderBy('name', 'asc')
-            ->skip(($page - 1) * $count)
-            ->take($count);
-
-        if ($search) {
-            $query->where('name', 'like', '%' . $search . '%');
-        }
-
-        $paginator = $query->paginate($count, ['*'], 'page', $page);
-        $paginator->withPath('/templates');
-
-        return $paginator;
-    }
-
-    /**
-     * Get a parent item via slugs.
-     */
-    public function getParentFromSlugs(string $bookSlug, string $chapterSlug = null): Entity
-    {
-        if ($chapterSlug !== null) {
-            return Chapter::visible()->whereSlugs($bookSlug, $chapterSlug)->firstOrFail();
-        }
-
-        return Book::visible()->where('slug', '=', $bookSlug)->firstOrFail();
-    }
-
-    /**
-     * Get the draft copy of the given page for the current user.
-     */
-    public function getUserDraft(Page $page): ?PageRevision
-    {
-        return $this->revisionRepo->getLatestDraftForCurrentUser($page);
-    }
-
     /**
      * Get a new draft page belonging to the given parent entity.
      */
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index 3c7c9e2eaf0..20bf19eb2f4 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -4,7 +4,7 @@
 
 use BookStack\Activity\Tools\CommentTree;
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Repos\PageRepo;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
 
@@ -15,7 +15,7 @@ class PageEditorData
 
     public function __construct(
         protected Page $page,
-        protected PageRepo $pageRepo,
+        protected EntityQueries $queries,
         protected string $requestedEditor
     ) {
         $this->viewData = $this->build();
@@ -35,7 +35,11 @@ protected function build(): array
     {
         $page = clone $this->page;
         $isDraft = boolval($this->page->draft);
-        $templates = $this->pageRepo->getTemplates(10);
+        $templates = $this->queries->pages->visibleTemplates()
+            ->orderBy('name', 'asc')
+            ->take(10)
+            ->get();
+
         $draftsEnabled = auth()->check();
 
         $isDraftRevision = false;
@@ -47,8 +51,8 @@ protected function build(): array
         }
 
         // Check for a current draft version for this user
-        $userDraft = $this->pageRepo->getUserDraft($page);
-        if ($userDraft !== null) {
+        $userDraft = $this->queries->revisions->findLatestCurrentUserDraftsForPageId($page->id)->first();
+        if (!is_null($userDraft)) {
             $page->forceFill($userDraft->only(['name', 'html', 'markdown']));
             $isDraftRevision = true;
             $this->warnings[] = $editActivity->getEditingActiveDraftMessage($userDraft);
diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
index e61c1033884..809cdfa581f 100644
--- a/app/Uploads/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads\Controllers;
 
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\NotFoundException;
@@ -18,6 +19,7 @@ class AttachmentController extends Controller
 {
     public function __construct(
         protected AttachmentService $attachmentService,
+        protected PageQueries $pageQueries,
         protected PageRepo $pageRepo
     ) {
     }
@@ -36,7 +38,7 @@ public function upload(Request $request)
         ]);
 
         $pageId = $request->get('uploaded_to');
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);
@@ -152,7 +154,7 @@ public function attachLink(Request $request)
             ]), 422);
         }
 
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);
@@ -173,7 +175,7 @@ public function attachLink(Request $request)
      */
     public function listForPage(int $pageId)
     {
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-view', $page);
 
         return view('attachments.manager-list', [
@@ -192,7 +194,7 @@ public function sortForPage(Request $request, int $pageId)
         $this->validate($request, [
             'order' => ['required', 'array'],
         ]);
-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-update', $page);
 
         $attachmentOrder = $request->get('order');
@@ -213,7 +215,7 @@ public function get(Request $request, string $attachmentId)
         $attachment = Attachment::query()->findOrFail($attachmentId);
 
         try {
-            $page = $this->pageRepo->getById($attachment->uploaded_to);
+            $page = $this->pageQueries->findVisibleByIdOrFail($attachment->uploaded_to);
         } catch (NotFoundException $exception) {
             throw new NotFoundException(trans('errors.attachment_not_found'));
         }

From c95f4ca40fecf0584eccb5f89d49b245d4ec7369 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Feb 2024 15:09:16 +0000
Subject: [PATCH 032/666] Queries: Migrated revision repo queries to new class

---
 app/Entities/Queries/PageRevisionQueries.php  |  5 +-
 .../Queries/ProvidesEntityQueries.php         |  2 +-
 app/Entities/Repos/RevisionRepo.php           | 50 +++----------------
 3 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/app/Entities/Queries/PageRevisionQueries.php b/app/Entities/Queries/PageRevisionQueries.php
index 2dcd428f53b..6e017a742dc 100644
--- a/app/Entities/Queries/PageRevisionQueries.php
+++ b/app/Entities/Queries/PageRevisionQueries.php
@@ -27,7 +27,10 @@ public function findLatestVersionBySlugs(string $bookSlug, string $pageSlug): ?P
 
     public function findLatestCurrentUserDraftsForPageId(int $pageId): ?PageRevision
     {
-        return $this->latestCurrentUserDraftsForPageId($pageId)->first();
+        /** @var ?PageRevision $revision */
+        $revision = $this->latestCurrentUserDraftsForPageId($pageId)->first();
+
+        return $revision;
     }
 
     public function latestCurrentUserDraftsForPageId(int $pageId): Builder
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index ea83d6cdd57..1033522447a 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\App\Model;
+use BookStack\Entities\Models\Entity;
 use Illuminate\Database\Eloquent\Builder;
 
 /**
diff --git a/app/Entities/Repos/RevisionRepo.php b/app/Entities/Repos/RevisionRepo.php
index 064327ee945..daf55777ce3 100644
--- a/app/Entities/Repos/RevisionRepo.php
+++ b/app/Entities/Repos/RevisionRepo.php
@@ -4,39 +4,13 @@
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
-use Illuminate\Database\Eloquent\Builder;
+use BookStack\Entities\Queries\PageRevisionQueries;
 
 class RevisionRepo
 {
-    /**
-     * Get a revision by its stored book and page slug values.
-     */
-    public function getBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
-    {
-        /** @var ?PageRevision $revision */
-        $revision = PageRevision::query()
-            ->whereHas('page', function (Builder $query) {
-                $query->scopes('visible');
-            })
-            ->where('slug', '=', $pageSlug)
-            ->where('type', '=', 'version')
-            ->where('book_slug', '=', $bookSlug)
-            ->orderBy('created_at', 'desc')
-            ->with('page')
-            ->first();
-
-        return $revision;
-    }
-
-    /**
-     * Get the latest draft revision, for the given page, belonging to the current user.
-     */
-    public function getLatestDraftForCurrentUser(Page $page): ?PageRevision
-    {
-        /** @var ?PageRevision $revision */
-        $revision = $this->queryForCurrentUserDraft($page->id)->first();
-
-        return $revision;
+    public function __construct(
+        protected PageRevisionQueries $queries,
+    ) {
     }
 
     /**
@@ -44,7 +18,7 @@ public function getLatestDraftForCurrentUser(Page $page): ?PageRevision
      */
     public function deleteDraftsForCurrentUser(Page $page): void
     {
-        $this->queryForCurrentUserDraft($page->id)->delete();
+        $this->queries->latestCurrentUserDraftsForPageId($page->id)->delete();
     }
 
     /**
@@ -53,7 +27,7 @@ public function deleteDraftsForCurrentUser(Page $page): void
      */
     public function getNewDraftForCurrentUser(Page $page): PageRevision
     {
-        $draft = $this->getLatestDraftForCurrentUser($page);
+        $draft = $this->queries->findLatestCurrentUserDraftsForPageId($page->id);
 
         if ($draft) {
             return $draft;
@@ -116,16 +90,4 @@ protected function deleteOldRevisions(Page $page)
             PageRevision::query()->whereIn('id', $revisionsToDelete->pluck('id'))->delete();
         }
     }
-
-    /**
-     * Query update draft revisions for the current user.
-     */
-    protected function queryForCurrentUserDraft(int $pageId): Builder
-    {
-        return PageRevision::query()
-            ->where('created_by', '=', user()->id)
-            ->where('type', 'update_draft')
-            ->where('page_id', '=', $pageId)
-            ->orderBy('created_at', 'desc');
-    }
 }

From 483410749bdfb03d1e3fb98db82c092583a88449 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Feb 2024 16:37:36 +0000
Subject: [PATCH 033/666] Queries: Updated all app book static query uses

---
 app/App/HomeController.php                    |  2 +-
 .../Controllers/BookApiController.php         | 12 +++---
 .../Controllers/BookExportApiController.php   | 19 +++++----
 .../Controllers/BookshelfController.php       | 10 +++--
 .../Controllers/ChapterApiController.php      | 17 ++++----
 .../Controllers/PageApiController.php         | 15 ++++---
 app/Entities/Controllers/PageController.php   |  8 ++--
 .../Controllers/RecycleBinController.php      |  4 +-
 app/Entities/Models/Book.php                  | 11 +----
 app/Entities/Queries/BookQueries.php          |  5 +++
 app/Entities/Queries/ChapterQueries.php       | 19 ++++++++-
 app/Entities/Queries/PageQueries.php          | 22 ++++++++++
 app/Entities/Repos/BookRepo.php               |  8 ++--
 app/Entities/Repos/BookshelfRepo.php          | 11 ++---
 app/Entities/Repos/ChapterRepo.php            |  6 +--
 app/Entities/Repos/PageRepo.php               |  8 ++--
 app/Entities/Tools/BookContents.php           | 38 ++++++++++--------
 app/Entities/Tools/Cloner.php                 |  2 +-
 app/Entities/Tools/SiblingFetcher.php         | 12 ++++--
 app/Entities/Tools/TrashCan.php               | 12 +++++-
 app/Permissions/JointPermissionBuilder.php    | 13 ++++--
 app/Permissions/PermissionsController.php     | 40 +++++++++----------
 app/References/CrossLinkParser.php            | 13 +++---
 .../ModelResolvers/BookLinkModelResolver.php  |  8 +++-
 .../BookshelfLinkModelResolver.php            |  7 +++-
 .../ChapterLinkModelResolver.php              |  8 +++-
 .../ModelResolvers/PageLinkModelResolver.php  |  8 +++-
 .../PagePermalinkModelResolver.php            |  8 +++-
 app/References/ReferenceController.php        | 12 +++---
 app/Search/SearchController.php               |  4 +-
 app/Settings/MaintenanceController.php        |  4 +-
 app/Uploads/ImageService.php                  |  8 ++--
 .../Controllers/UserProfileController.php     | 19 ++++++---
 app/Users/Queries/UserContentCounts.php       | 19 +++++----
 .../Queries/UserRecentlyCreatedContent.php    | 18 +++++----
 tests/Entity/BookTest.php                     |  6 +--
 tests/Entity/EntitySearchTest.php             |  4 +-
 37 files changed, 278 insertions(+), 162 deletions(-)

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index f5a3c7ed6cb..6a4cb017669 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -40,7 +40,7 @@ public function index(Request $request, ActivityQueries $activities)
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recents = $this->isSignedIn() ?
             (new RecentlyViewed())->run(12 * $recentFactor, 1)
-            : Book::visible()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
+            : $this->queries->books->visibleForList()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
         $favourites = (new TopFavourites())->run(6);
         $recentlyUpdatedPages = $this->queries->pages->visibleForList()
             ->where('draft', false)
diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index aa21aea472a..955bd707bc6 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Http\ApiController;
@@ -15,7 +16,8 @@
 class BookApiController extends ApiController
 {
     public function __construct(
-        protected BookRepo $bookRepo
+        protected BookRepo $bookRepo,
+        protected BookQueries $queries,
     ) {
     }
 
@@ -24,7 +26,7 @@ public function __construct(
      */
     public function list()
     {
-        $books = Book::visible();
+        $books = $this->queries->visibleForList();
 
         return $this->apiListingResponse($books, [
             'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'owned_by',
@@ -56,7 +58,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail(intval($id));
         $book = $this->forJsonDisplay($book);
         $book->load(['createdBy', 'updatedBy', 'ownedBy']);
 
@@ -83,7 +85,7 @@ public function read(string $id)
      */
     public function update(Request $request, string $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('book-update', $book);
 
         $requestData = $this->validate($request, $this->rules()['update']);
@@ -100,7 +102,7 @@ public function update(Request $request, string $id)
      */
     public function delete(string $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('book-delete', $book);
 
         $this->bookRepo->destroy($book);
diff --git a/app/Entities/Controllers/BookExportApiController.php b/app/Entities/Controllers/BookExportApiController.php
index 5b6826c193d..1161ddb8886 100644
--- a/app/Entities/Controllers/BookExportApiController.php
+++ b/app/Entities/Controllers/BookExportApiController.php
@@ -2,18 +2,17 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Book;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
 class BookExportApiController extends ApiController
 {
-    protected $exportFormatter;
-
-    public function __construct(ExportFormatter $exportFormatter)
-    {
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected ExportFormatter $exportFormatter,
+        protected BookQueries $queries,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -24,7 +23,7 @@ public function __construct(ExportFormatter $exportFormatter)
      */
     public function exportPdf(int $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
         return $this->download()->directly($pdfContent, $book->slug . '.pdf');
@@ -37,7 +36,7 @@ public function exportPdf(int $id)
      */
     public function exportHtml(int $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
         return $this->download()->directly($htmlContent, $book->slug . '.html');
@@ -48,7 +47,7 @@ public function exportHtml(int $id)
      */
     public function exportPlainText(int $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
         return $this->download()->directly($textContent, $book->slug . '.txt');
@@ -59,7 +58,7 @@ public function exportPlainText(int $id)
      */
     public function exportMarkdown(int $id)
     {
-        $book = Book::visible()->findOrFail($id);
+        $book = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->bookToMarkdown($book);
 
         return $this->download()->directly($markdown, $book->slug . '.md');
diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index 3118325da00..6cedd23e7df 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -4,7 +4,7 @@
 
 use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\Models\View;
-use BookStack\Entities\Models\Book;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\ShelfContext;
@@ -22,6 +22,7 @@ class BookshelfController extends Controller
     public function __construct(
         protected BookshelfRepo $shelfRepo,
         protected BookshelfQueries $queries,
+        protected BookQueries $bookQueries,
         protected ShelfContext $shelfContext,
         protected ReferenceFetcher $referenceFetcher,
     ) {
@@ -68,7 +69,7 @@ public function index(Request $request)
     public function create()
     {
         $this->checkPermission('bookshelf-create-all');
-        $books = Book::visible()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
+        $books = $this->bookQueries->visibleForList()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
         $this->setPageTitle(trans('entities.shelves_create'));
 
         return view('shelves.create', ['books' => $books]);
@@ -145,7 +146,10 @@ public function edit(string $slug)
         $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
-        $books = Book::visible()->whereNotIn('id', $shelfBookIds)->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
+        $books = $this->bookQueries->visibleForList()
+            ->whereNotIn('id', $shelfBookIds)
+            ->orderBy('name')
+            ->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
 
         $this->setPageTitle(trans('entities.shelves_edit_named', ['name' => $shelf->getShortName()]));
 
diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index 3fbe8522205..fb484b85d72 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -2,8 +2,9 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
@@ -35,7 +36,9 @@ class ChapterApiController extends ApiController
     ];
 
     public function __construct(
-        protected ChapterRepo $chapterRepo
+        protected ChapterRepo $chapterRepo,
+        protected ChapterQueries $queries,
+        protected BookQueries $bookQueries,
     ) {
     }
 
@@ -44,7 +47,7 @@ public function __construct(
      */
     public function list()
     {
-        $chapters = Chapter::visible();
+        $chapters = $this->queries->visibleForList();
 
         return $this->apiListingResponse($chapters, [
             'id', 'book_id', 'name', 'slug', 'description', 'priority',
@@ -60,7 +63,7 @@ public function create(Request $request)
         $requestData = $this->validate($request, $this->rules['create']);
 
         $bookId = $request->get('book_id');
-        $book = Book::visible()->findOrFail($bookId);
+        $book = $this->bookQueries->findVisibleByIdOrFail(intval($bookId));
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($requestData, $book);
@@ -73,7 +76,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
         $chapter = $this->forJsonDisplay($chapter);
 
         $chapter->load([
@@ -94,7 +97,7 @@ public function read(string $id)
     public function update(Request $request, string $id)
     {
         $requestData = $this->validate($request, $this->rules()['update']);
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('chapter-update', $chapter);
 
         if ($request->has('book_id') && $chapter->book_id !== intval($requestData['book_id'])) {
@@ -122,7 +125,7 @@ public function update(Request $request, string $id)
      */
     public function delete(string $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('chapter-delete', $chapter);
 
         $this->chapterRepo->destroy($chapter);
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index 6e3880aedc4..d2a5a3ee351 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -2,9 +2,7 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\PermissionsException;
@@ -38,6 +36,7 @@ class PageApiController extends ApiController
     public function __construct(
         protected PageRepo $pageRepo,
         protected PageQueries $queries,
+        protected EntityQueries $entityQueries,
     ) {
     }
 
@@ -46,7 +45,7 @@ public function __construct(
      */
     public function list()
     {
-        $pages = Page::visible();
+        $pages = $this->queries->visibleForList();
 
         return $this->apiListingResponse($pages, [
             'id', 'book_id', 'chapter_id', 'name', 'slug', 'priority',
@@ -72,9 +71,9 @@ public function create(Request $request)
         $this->validate($request, $this->rules['create']);
 
         if ($request->has('chapter_id')) {
-            $parent = Chapter::visible()->findOrFail($request->get('chapter_id'));
+            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id')));
         } else {
-            $parent = Book::visible()->findOrFail($request->get('book_id'));
+            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
         }
         $this->checkOwnablePermission('page-create', $parent);
 
@@ -120,9 +119,9 @@ public function update(Request $request, string $id)
 
         $parent = null;
         if ($request->has('chapter_id')) {
-            $parent = Chapter::visible()->findOrFail($request->get('chapter_id'));
+            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id')));
         } elseif ($request->has('book_id')) {
-            $parent = Book::visible()->findOrFail($request->get('book_id'));
+            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
         }
 
         if ($parent && !$parent->matches($page->getParent())) {
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 3a5bdbd0bf1..471df8184ba 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -276,8 +276,8 @@ public function showDelete(string $bookSlug, string $pageSlug)
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
-            Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
-            Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
+            $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
+            $this->entityQueries->chapters->start()->where('default_template_id', '=', $page->id)->count() > 0;
 
         return view('pages.delete', [
             'book'    => $page->book,
@@ -298,8 +298,8 @@ public function showDeleteDraft(string $bookSlug, int $pageId)
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
-            Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||
-            Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;
+            $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
+            $this->entityQueries->chapters->start()->where('default_template_id', '=', $page->id)->count() > 0;
 
         return view('pages.delete', [
             'book'    => $page->book,
diff --git a/app/Entities/Controllers/RecycleBinController.php b/app/Entities/Controllers/RecycleBinController.php
index 78f86a5ae50..d11dde4dd73 100644
--- a/app/Entities/Controllers/RecycleBinController.php
+++ b/app/Entities/Controllers/RecycleBinController.php
@@ -116,9 +116,9 @@ public function destroy(DeletionRepo $deletionRepo, string $id)
      *
      * @throws \Exception
      */
-    public function empty()
+    public function empty(TrashCan $trash)
     {
-        $deleteCount = (new TrashCan())->empty();
+        $deleteCount = $trash->empty();
 
         $this->logActivity(ActivityType::RECYCLE_BIN_EMPTY);
         $this->showSuccessNotification(trans('settings.recycle_bin_destroy_notification', ['count' => $deleteCount]));
diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 14cb790c5c5..c1644dcf5fb 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -117,20 +117,11 @@ public function shelves(): BelongsToMany
     /**
      * Get the direct child items within this book.
      */
-    public function getDirectChildren(): Collection
+    public function getDirectVisibleChildren(): Collection
     {
         $pages = $this->directPages()->scopes('visible')->get();
         $chapters = $this->chapters()->scopes('visible')->get();
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }
-
-    /**
-     * Get a visible book by its slug.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlug(string $slug): self
-    {
-        return static::visible()->where('slug', '=', $slug)->firstOrFail();
-    }
 }
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 3d7474b3dfa..2ffff5eca2e 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -18,6 +18,11 @@ public function findVisibleById(int $id): ?Book
         return $this->start()->scopes('visible')->find($id);
     }
 
+    public function findVisibleByIdOrFail(int $id): Book
+    {
+        return $this->start()->scopes('visible')->findOrFail($id);
+    }
+
     public function findVisibleBySlugOrFail(string $slug): Book
     {
         /** @var ?Book $book */
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index 200514932cd..31193c7ea73 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -24,10 +24,17 @@ public function findVisibleById(int $id): ?Chapter
         return $this->start()->scopes('visible')->find($id);
     }
 
+    public function findVisibleByIdOrFail(int $id): Chapter
+    {
+        return $this->start()->scopes('visible')->findOrFail($id);
+    }
+
     public function findVisibleBySlugsOrFail(string $bookSlug, string $chapterSlug): Chapter
     {
         /** @var ?Chapter $chapter */
-        $chapter = $this->start()->with('book')
+        $chapter = $this->start()
+            ->scopes('visible')
+            ->with('book')
             ->whereHas('book', function (Builder $query) use ($bookSlug) {
                 $query->where('slug', '=', $bookSlug);
             })
@@ -41,9 +48,19 @@ public function findVisibleBySlugsOrFail(string $bookSlug, string $chapterSlug):
         return $chapter;
     }
 
+    public function usingSlugs(string $bookSlug, string $chapterSlug): Builder
+    {
+        return $this->start()
+            ->where('slug', '=', $chapterSlug)
+            ->whereHas('book', function (Builder $query) use ($bookSlug) {
+                $query->where('slug', '=', $bookSlug);
+            });
+    }
+
     public function visibleForList(): Builder
     {
         return $this->start()
+            ->scopes('visible')
             ->select(array_merge(static::$listAttributes, ['book_slug' => function ($builder) {
                 $builder->select('slug')
                     ->from('books')
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index 1640dc2db54..e22769c3af6 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -33,6 +33,7 @@ public function findVisibleBySlugsOrFail(string $bookSlug, string $pageSlug): Pa
     {
         /** @var ?Page $page */
         $page = $this->start()->with('book')
+            ->scopes('visible')
             ->whereHas('book', function (Builder $query) use ($bookSlug) {
                 $query->where('slug', '=', $bookSlug);
             })
@@ -46,9 +47,19 @@ public function findVisibleBySlugsOrFail(string $bookSlug, string $pageSlug): Pa
         return $page;
     }
 
+    public function usingSlugs(string $bookSlug, string $pageSlug): Builder
+    {
+        return $this->start()
+            ->where('slug', '=', $pageSlug)
+            ->whereHas('book', function (Builder $query) use ($bookSlug) {
+                $query->where('slug', '=', $bookSlug);
+            });
+    }
+
     public function visibleForList(): Builder
     {
         return $this->start()
+            ->scopes('visible')
             ->select(array_merge(Page::$listAttributes, ['book_slug' => function ($builder) {
                 $builder->select('slug')
                     ->from('books')
@@ -56,6 +67,17 @@ public function visibleForList(): Builder
             }]));
     }
 
+    public function visibleWithContents(): Builder
+    {
+        return $this->start()
+            ->scopes('visible')
+            ->select(array_merge(Page::$contentAttributes, ['book_slug' => function ($builder) {
+                $builder->select('slug')
+                    ->from('books')
+                    ->whereColumn('books.id', '=', 'pages.book_id');
+            }]));
+    }
+
     public function currentUserDraftsForList(): Builder
     {
         return $this->visibleForList()
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 26b9414fbac..19d159eb1e7 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -17,7 +17,8 @@ class BookRepo
     public function __construct(
         protected BaseRepo $baseRepo,
         protected TagRepo $tagRepo,
-        protected ImageRepo $imageRepo
+        protected ImageRepo $imageRepo,
+        protected TrashCan $trashCan,
     ) {
     }
 
@@ -73,10 +74,9 @@ public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $re
      */
     public function destroy(Book $book)
     {
-        $trashCan = new TrashCan();
-        $trashCan->softDestroyBook($book);
+        $this->trashCan->softDestroyBook($book);
         Activity::add(ActivityType::BOOK_DELETE, $book);
 
-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();
     }
 }
diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index 479e6178f7b..a00349ef1ae 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -3,8 +3,8 @@
 namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\ActivityType;
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Facades\Activity;
 use Exception;
@@ -13,6 +13,8 @@ class BookshelfRepo
 {
     public function __construct(
         protected BaseRepo $baseRepo,
+        protected BookQueries $bookQueries,
+        protected TrashCan $trashCan,
     ) {
     }
 
@@ -60,7 +62,7 @@ protected function updateBooks(Bookshelf $shelf, array $bookIds)
             return intval($id);
         });
 
-        $syncData = Book::visible()
+        $syncData = $this->bookQueries->visibleForList()
             ->whereIn('id', $bookIds)
             ->pluck('id')
             ->mapWithKeys(function ($bookId) use ($numericIDs) {
@@ -77,9 +79,8 @@ protected function updateBooks(Bookshelf $shelf, array $bookIds)
      */
     public function destroy(Bookshelf $shelf)
     {
-        $trashCan = new TrashCan();
-        $trashCan->softDestroyShelf($shelf);
+        $this->trashCan->softDestroyShelf($shelf);
         Activity::add(ActivityType::BOOKSHELF_DELETE, $shelf);
-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();
     }
 }
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index cacca93f6e9..17cbccd4133 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -18,6 +18,7 @@ class ChapterRepo
     public function __construct(
         protected BaseRepo $baseRepo,
         protected EntityQueries $entityQueries,
+        protected TrashCan $trashCan,
     ) {
     }
 
@@ -59,10 +60,9 @@ public function update(Chapter $chapter, array $input): Chapter
      */
     public function destroy(Chapter $chapter)
     {
-        $trashCan = new TrashCan();
-        $trashCan->softDestroyChapter($chapter);
+        $this->trashCan->softDestroyChapter($chapter);
         Activity::add(ActivityType::CHAPTER_DELETE, $chapter);
-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();
     }
 
     /**
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 74aed072a06..2526b6c445d 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -27,7 +27,8 @@ public function __construct(
         protected RevisionRepo $revisionRepo,
         protected EntityQueries $entityQueries,
         protected ReferenceStore $referenceStore,
-        protected ReferenceUpdater $referenceUpdater
+        protected ReferenceUpdater $referenceUpdater,
+        protected TrashCan $trashCan,
     ) {
     }
 
@@ -184,10 +185,9 @@ public function updatePageDraft(Page $page, array $input)
      */
     public function destroy(Page $page)
     {
-        $trashCan = new TrashCan();
-        $trashCan->softDestroyPage($page);
+        $this->trashCan->softDestroyPage($page);
         Activity::add(ActivityType::PAGE_DELETE, $page);
-        $trashCan->autoClearOld();
+        $this->trashCan->autoClearOld();
     }
 
     /**
diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php
index f45bdfcc1b9..7fa2134b7fa 100644
--- a/app/Entities/Tools/BookContents.php
+++ b/app/Entities/Tools/BookContents.php
@@ -7,15 +7,17 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use Illuminate\Support\Collection;
 
 class BookContents
 {
-    protected Book $book;
+    protected EntityQueries $queries;
 
-    public function __construct(Book $book)
-    {
-        $this->book = $book;
+    public function __construct(
+        protected Book $book,
+    ) {
+        $this->queries = app()->make(EntityQueries::class);
     }
 
     /**
@@ -23,10 +25,12 @@ public function __construct(Book $book)
      */
     public function getLastPriority(): int
     {
-        $maxPage = Page::visible()->where('book_id', '=', $this->book->id)
+        $maxPage = $this->book->pages()
             ->where('draft', '=', false)
-            ->where('chapter_id', '=', 0)->max('priority');
-        $maxChapter = Chapter::visible()->where('book_id', '=', $this->book->id)
+            ->where('chapter_id', '=', 0)
+            ->max('priority');
+
+        $maxChapter = $this->book->chapters()
             ->max('priority');
 
         return max($maxChapter, $maxPage, 1);
@@ -38,7 +42,7 @@ public function getLastPriority(): int
     public function getTree(bool $showDrafts = false, bool $renderPages = false): Collection
     {
         $pages = $this->getPages($showDrafts, $renderPages);
-        $chapters = Chapter::visible()->where('book_id', '=', $this->book->id)->get();
+        $chapters = $this->book->chapters()->scopes('visible')->get();
         $all = collect()->concat($pages)->concat($chapters);
         $chapterMap = $chapters->keyBy('id');
         $lonePages = collect();
@@ -87,15 +91,17 @@ protected function bookChildSortFunc(): callable
      */
     protected function getPages(bool $showDrafts = false, bool $getPageContent = false): Collection
     {
-        $query = Page::visible()
-            ->select($getPageContent ? Page::$contentAttributes : Page::$listAttributes)
-            ->where('book_id', '=', $this->book->id);
+        if ($getPageContent) {
+            $query = $this->queries->pages->visibleWithContents();
+        } else {
+            $query = $this->queries->pages->visibleForList();
+        }
 
         if (!$showDrafts) {
             $query->where('draft', '=', false);
         }
 
-        return $query->get();
+        return $query->where('book_id', '=', $this->book->id)->get();
     }
 
     /**
@@ -126,7 +132,7 @@ public function sortUsingMap(BookSortMap $sortMap): array
 
         /** @var Book[] $booksInvolved */
         $booksInvolved = array_values(array_filter($modelMap, function (string $key) {
-            return strpos($key, 'book:') === 0;
+            return str_starts_with($key, 'book:');
         }, ARRAY_FILTER_USE_KEY));
 
         // Update permissions of books involved
@@ -279,7 +285,7 @@ protected function loadModelsFromSortMap(BookSortMap $sortMap): array
             }
         }
 
-        $pages = Page::visible()->whereIn('id', array_unique($ids['page']))->get(Page::$listAttributes);
+        $pages = $this->queries->pages->visibleForList()->whereIn('id', array_unique($ids['page']))->get();
         /** @var Page $page */
         foreach ($pages as $page) {
             $modelMap['page:' . $page->id] = $page;
@@ -289,14 +295,14 @@ protected function loadModelsFromSortMap(BookSortMap $sortMap): array
             }
         }
 
-        $chapters = Chapter::visible()->whereIn('id', array_unique($ids['chapter']))->get();
+        $chapters = $this->queries->chapters->visibleForList()->whereIn('id', array_unique($ids['chapter']))->get();
         /** @var Chapter $chapter */
         foreach ($chapters as $chapter) {
             $modelMap['chapter:' . $chapter->id] = $chapter;
             $ids['book'][] = $chapter->book_id;
         }
 
-        $books = Book::visible()->whereIn('id', array_unique($ids['book']))->get();
+        $books = $this->queries->books->visibleForList()->whereIn('id', array_unique($ids['book']))->get();
         /** @var Book $book */
         foreach ($books as $book) {
             $modelMap['book:' . $book->id] = $book;
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index f7ed4b72dcb..2030b050c4b 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -77,7 +77,7 @@ public function cloneBook(Book $original, string $newName): Book
         $copyBook = $this->bookRepo->create($bookDetails);
 
         // Clone contents
-        $directChildren = $original->getDirectChildren();
+        $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
             if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
diff --git a/app/Entities/Tools/SiblingFetcher.php b/app/Entities/Tools/SiblingFetcher.php
index 617ef4a620d..7b8ac37ad87 100644
--- a/app/Entities/Tools/SiblingFetcher.php
+++ b/app/Entities/Tools/SiblingFetcher.php
@@ -7,10 +7,16 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use Illuminate\Support\Collection;
 
 class SiblingFetcher
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
     /**
      * Search among the siblings of the entity of given type and id.
      */
@@ -26,7 +32,7 @@ public function fetch(string $entityType, int $entityId): Collection
 
         // Page in book or chapter
         if (($entity instanceof Page && !$entity->chapter) || $entity instanceof Chapter) {
-            $entities = $entity->book->getDirectChildren();
+            $entities = $entity->book->getDirectVisibleChildren();
         }
 
         // Book
@@ -36,13 +42,13 @@ public function fetch(string $entityType, int $entityId): Collection
             if ($contextShelf) {
                 $entities = $contextShelf->visibleBooks()->get();
             } else {
-                $entities = Book::visible()->get();
+                $entities = $this->queries->books->visibleForList()->get();
             }
         }
 
         // Shelf
         if ($entity instanceof Bookshelf) {
-            $entities = Bookshelf::visible()->get();
+            $entities = $this->queries->shelves->visibleForList()->get();
         }
 
         return $entities;
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index 8e9f010df0f..39c982cdc92 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -10,6 +10,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\AttachmentService;
@@ -20,6 +21,11 @@
 
 class TrashCan
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
     /**
      * Send a shelf to the recycle bin.
      *
@@ -203,11 +209,13 @@ protected function destroyPage(Page $page): int
         }
 
         // Remove book template usages
-        Book::query()->where('default_template_id', '=', $page->id)
+        $this->queries->books->start()
+            ->where('default_template_id', '=', $page->id)
             ->update(['default_template_id' => null]);
 
         // Remove chapter template usages
-        Chapter::query()->where('default_template_id', '=', $page->id)
+        $this->queries->chapters->start()
+            ->where('default_template_id', '=', $page->id)
             ->update(['default_template_id' => null]);
 
         $page->forceDelete();
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 8c961fb1306..49eaf0774f1 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Builder;
@@ -20,6 +21,12 @@
  */
 class JointPermissionBuilder
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
+
     /**
      * Re-generate all entity permission from scratch.
      */
@@ -36,7 +43,7 @@ public function rebuildForAll()
         });
 
         // Chunk through all bookshelves
-        Bookshelf::query()->withTrashed()->select(['id', 'owned_by'])
+        $this->queries->shelves->start()->withTrashed()->select(['id', 'owned_by'])
             ->chunk(50, function (EloquentCollection $shelves) use ($roles) {
                 $this->createManyJointPermissions($shelves->all(), $roles);
             });
@@ -88,7 +95,7 @@ public function rebuildForRole(Role $role)
         });
 
         // Chunk through all bookshelves
-        Bookshelf::query()->select(['id', 'owned_by'])
+        $this->queries->shelves->start()->select(['id', 'owned_by'])
             ->chunk(100, function ($shelves) use ($roles) {
                 $this->createManyJointPermissions($shelves->all(), $roles);
             });
@@ -99,7 +106,7 @@ public function rebuildForRole(Role $role)
      */
     protected function bookFetchQuery(): Builder
     {
-        return Book::query()->withTrashed()
+        return $this->queries->books->start()->withTrashed()
             ->select(['id', 'owned_by'])->with([
                 'chapters' => function ($query) {
                     $query->withTrashed()->select(['id', 'owned_by', 'book_id']);
diff --git a/app/Permissions/PermissionsController.php b/app/Permissions/PermissionsController.php
index f2014ea73f6..5d2035870bc 100644
--- a/app/Permissions/PermissionsController.php
+++ b/app/Permissions/PermissionsController.php
@@ -2,10 +2,7 @@
 
 namespace BookStack\Permissions;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\PermissionsUpdater;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Models\EntityPermission;
@@ -14,19 +11,18 @@
 
 class PermissionsController extends Controller
 {
-    protected PermissionsUpdater $permissionsUpdater;
-
-    public function __construct(PermissionsUpdater $permissionsUpdater)
-    {
-        $this->permissionsUpdater = $permissionsUpdater;
+    public function __construct(
+        protected PermissionsUpdater $permissionsUpdater,
+        protected EntityQueries $queries,
+    ) {
     }
 
     /**
-     * Show the Permissions view for a page.
+     * Show the permissions view for a page.
      */
     public function showForPage(string $bookSlug, string $pageSlug)
     {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
+        $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 
         $this->setPageTitle(trans('entities.pages_permissions'));
@@ -41,7 +37,7 @@ public function showForPage(string $bookSlug, string $pageSlug)
      */
     public function updateForPage(Request $request, string $bookSlug, string $pageSlug)
     {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
+        $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 
         $this->permissionsUpdater->updateFromPermissionsForm($page, $request);
@@ -52,11 +48,11 @@ public function updateForPage(Request $request, string $bookSlug, string $pageSl
     }
 
     /**
-     * Show the Restrictions view for a chapter.
+     * Show the permissions view for a chapter.
      */
     public function showForChapter(string $bookSlug, string $chapterSlug)
     {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 
         $this->setPageTitle(trans('entities.chapters_permissions'));
@@ -67,11 +63,11 @@ public function showForChapter(string $bookSlug, string $chapterSlug)
     }
 
     /**
-     * Set the restrictions for a chapter.
+     * Set the permissions for a chapter.
      */
     public function updateForChapter(Request $request, string $bookSlug, string $chapterSlug)
     {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 
         $this->permissionsUpdater->updateFromPermissionsForm($chapter, $request);
@@ -86,7 +82,7 @@ public function updateForChapter(Request $request, string $bookSlug, string $cha
      */
     public function showForBook(string $slug)
     {
-        $book = Book::getBySlug($slug);
+        $book = $this->queries->books->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $book);
 
         $this->setPageTitle(trans('entities.books_permissions'));
@@ -97,11 +93,11 @@ public function showForBook(string $slug)
     }
 
     /**
-     * Set the restrictions for a book.
+     * Set the permissions for a book.
      */
     public function updateForBook(Request $request, string $slug)
     {
-        $book = Book::getBySlug($slug);
+        $book = $this->queries->books->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $book);
 
         $this->permissionsUpdater->updateFromPermissionsForm($book, $request);
@@ -116,7 +112,7 @@ public function updateForBook(Request $request, string $slug)
      */
     public function showForShelf(string $slug)
     {
-        $shelf = Bookshelf::getBySlug($slug);
+        $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
         $this->setPageTitle(trans('entities.shelves_permissions'));
@@ -131,7 +127,7 @@ public function showForShelf(string $slug)
      */
     public function updateForShelf(Request $request, string $slug)
     {
-        $shelf = Bookshelf::getBySlug($slug);
+        $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
         $this->permissionsUpdater->updateFromPermissionsForm($shelf, $request);
@@ -146,7 +142,7 @@ public function updateForShelf(Request $request, string $slug)
      */
     public function copyShelfPermissionsToBooks(string $slug)
     {
-        $shelf = Bookshelf::getBySlug($slug);
+        $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
         $updateCount = $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf);
diff --git a/app/References/CrossLinkParser.php b/app/References/CrossLinkParser.php
index b9c3ad205ae..1fd4c1b3e3c 100644
--- a/app/References/CrossLinkParser.php
+++ b/app/References/CrossLinkParser.php
@@ -3,6 +3,7 @@
 namespace BookStack\References;
 
 use BookStack\App\Model;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\References\ModelResolvers\BookLinkModelResolver;
 use BookStack\References\ModelResolvers\BookshelfLinkModelResolver;
 use BookStack\References\ModelResolvers\ChapterLinkModelResolver;
@@ -85,12 +86,14 @@ protected function linkToModel(string $link): ?Model
      */
     public static function createWithEntityResolvers(): self
     {
+        $queries = app()->make(EntityQueries::class);
+
         return new self([
-            new PagePermalinkModelResolver(),
-            new PageLinkModelResolver(),
-            new ChapterLinkModelResolver(),
-            new BookLinkModelResolver(),
-            new BookshelfLinkModelResolver(),
+            new PagePermalinkModelResolver($queries->pages),
+            new PageLinkModelResolver($queries->pages),
+            new ChapterLinkModelResolver($queries->chapters),
+            new BookLinkModelResolver($queries->books),
+            new BookshelfLinkModelResolver($queries->shelves),
         ]);
     }
 }
diff --git a/app/References/ModelResolvers/BookLinkModelResolver.php b/app/References/ModelResolvers/BookLinkModelResolver.php
index d404fe2fd84..a671fbf5700 100644
--- a/app/References/ModelResolvers/BookLinkModelResolver.php
+++ b/app/References/ModelResolvers/BookLinkModelResolver.php
@@ -4,9 +4,15 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Queries\BookQueries;
 
 class BookLinkModelResolver implements CrossLinkModelResolver
 {
+    public function __construct(
+        protected BookQueries $queries
+    ) {
+    }
+
     public function resolve(string $link): ?Model
     {
         $pattern = '/^' . preg_quote(url('/books'), '/') . '\/([\w-]+)' . '([#?\/]|$)/';
@@ -19,7 +25,7 @@ public function resolve(string $link): ?Model
         $bookSlug = $matches[1];
 
         /** @var ?Book $model */
-        $model = Book::query()->where('slug', '=', $bookSlug)->first(['id']);
+        $model = $this->queries->start()->where('slug', '=', $bookSlug)->first(['id']);
 
         return $model;
     }
diff --git a/app/References/ModelResolvers/BookshelfLinkModelResolver.php b/app/References/ModelResolvers/BookshelfLinkModelResolver.php
index cc9df034e60..d79c760e070 100644
--- a/app/References/ModelResolvers/BookshelfLinkModelResolver.php
+++ b/app/References/ModelResolvers/BookshelfLinkModelResolver.php
@@ -4,9 +4,14 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookshelfQueries;
 
 class BookshelfLinkModelResolver implements CrossLinkModelResolver
 {
+    public function __construct(
+        protected BookshelfQueries $queries
+    ) {
+    }
     public function resolve(string $link): ?Model
     {
         $pattern = '/^' . preg_quote(url('/shelves'), '/') . '\/([\w-]+)' . '([#?\/]|$)/';
@@ -19,7 +24,7 @@ public function resolve(string $link): ?Model
         $shelfSlug = $matches[1];
 
         /** @var ?Bookshelf $model */
-        $model = Bookshelf::query()->where('slug', '=', $shelfSlug)->first(['id']);
+        $model = $this->queries->start()->where('slug', '=', $shelfSlug)->first(['id']);
 
         return $model;
     }
diff --git a/app/References/ModelResolvers/ChapterLinkModelResolver.php b/app/References/ModelResolvers/ChapterLinkModelResolver.php
index 4733c68eead..318b5ed35f4 100644
--- a/app/References/ModelResolvers/ChapterLinkModelResolver.php
+++ b/app/References/ModelResolvers/ChapterLinkModelResolver.php
@@ -4,9 +4,15 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Queries\ChapterQueries;
 
 class ChapterLinkModelResolver implements CrossLinkModelResolver
 {
+    public function __construct(
+        protected ChapterQueries $queries
+    ) {
+    }
+
     public function resolve(string $link): ?Model
     {
         $pattern = '/^' . preg_quote(url('/books'), '/') . '\/([\w-]+)' . '\/chapter\/' . '([\w-]+)' . '([#?\/]|$)/';
@@ -20,7 +26,7 @@ public function resolve(string $link): ?Model
         $chapterSlug = $matches[2];
 
         /** @var ?Chapter $model */
-        $model = Chapter::query()->whereSlugs($bookSlug, $chapterSlug)->first(['id']);
+        $model = $this->queries->usingSlugs($bookSlug, $chapterSlug)->first(['id']);
 
         return $model;
     }
diff --git a/app/References/ModelResolvers/PageLinkModelResolver.php b/app/References/ModelResolvers/PageLinkModelResolver.php
index 736382becdd..9a01416a445 100644
--- a/app/References/ModelResolvers/PageLinkModelResolver.php
+++ b/app/References/ModelResolvers/PageLinkModelResolver.php
@@ -4,9 +4,15 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 
 class PageLinkModelResolver implements CrossLinkModelResolver
 {
+    public function __construct(
+        protected PageQueries $queries
+    ) {
+    }
+
     public function resolve(string $link): ?Model
     {
         $pattern = '/^' . preg_quote(url('/books'), '/') . '\/([\w-]+)' . '\/page\/' . '([\w-]+)' . '([#?\/]|$)/';
@@ -20,7 +26,7 @@ public function resolve(string $link): ?Model
         $pageSlug = $matches[2];
 
         /** @var ?Page $model */
-        $model = Page::query()->whereSlugs($bookSlug, $pageSlug)->first(['id']);
+        $model = $this->queries->usingSlugs($bookSlug, $pageSlug)->first(['id']);
 
         return $model;
     }
diff --git a/app/References/ModelResolvers/PagePermalinkModelResolver.php b/app/References/ModelResolvers/PagePermalinkModelResolver.php
index 9ed00b36dd4..59d509f3399 100644
--- a/app/References/ModelResolvers/PagePermalinkModelResolver.php
+++ b/app/References/ModelResolvers/PagePermalinkModelResolver.php
@@ -4,9 +4,15 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 
 class PagePermalinkModelResolver implements CrossLinkModelResolver
 {
+    public function __construct(
+        protected PageQueries $queries
+    ) {
+    }
+
     public function resolve(string $link): ?Model
     {
         $pattern = '/^' . preg_quote(url('/link'), '/') . '\/(\d+)/';
@@ -18,7 +24,7 @@ public function resolve(string $link): ?Model
 
         $id = intval($matches[1]);
         /** @var ?Page $model */
-        $model = Page::query()->find($id, ['id']);
+        $model = $this->queries->start()->find($id, ['id']);
 
         return $model;
     }
diff --git a/app/References/ReferenceController.php b/app/References/ReferenceController.php
index 991f47225b8..57dbcce3c51 100644
--- a/app/References/ReferenceController.php
+++ b/app/References/ReferenceController.php
@@ -6,12 +6,14 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Http\Controller;
 
 class ReferenceController extends Controller
 {
     public function __construct(
-        protected ReferenceFetcher $referenceFetcher
+        protected ReferenceFetcher $referenceFetcher,
+        protected EntityQueries $queries,
     ) {
     }
 
@@ -20,7 +22,7 @@ public function __construct(
      */
     public function page(string $bookSlug, string $pageSlug)
     {
-        $page = Page::getBySlugs($bookSlug, $pageSlug);
+        $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $references = $this->referenceFetcher->getReferencesToEntity($page);
 
         return view('pages.references', [
@@ -34,7 +36,7 @@ public function page(string $bookSlug, string $pageSlug)
      */
     public function chapter(string $bookSlug, string $chapterSlug)
     {
-        $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
+        $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $references = $this->referenceFetcher->getReferencesToEntity($chapter);
 
         return view('chapters.references', [
@@ -48,7 +50,7 @@ public function chapter(string $bookSlug, string $chapterSlug)
      */
     public function book(string $slug)
     {
-        $book = Book::getBySlug($slug);
+        $book = $this->queries->books->findVisibleBySlugOrFail($slug);
         $references = $this->referenceFetcher->getReferencesToEntity($book);
 
         return view('books.references', [
@@ -62,7 +64,7 @@ public function book(string $slug)
      */
     public function shelf(string $slug)
     {
-        $shelf = Bookshelf::getBySlug($slug);
+        $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $references = $this->referenceFetcher->getReferencesToEntity($shelf);
 
         return view('shelves.references', [
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php
index 6cf12a57920..bc3f2ddb403 100644
--- a/app/Search/SearchController.php
+++ b/app/Search/SearchController.php
@@ -130,12 +130,12 @@ public function searchSuggestions(Request $request)
     /**
      * Search siblings items in the system.
      */
-    public function searchSiblings(Request $request)
+    public function searchSiblings(Request $request, SiblingFetcher $siblingFetcher)
     {
         $type = $request->get('entity_type', null);
         $id = $request->get('entity_id', null);
 
-        $entities = (new SiblingFetcher())->fetch($type, $id);
+        $entities = $siblingFetcher->fetch($type, $id);
 
         return view('entities.list-basic', ['entities' => $entities, 'style' => 'compact']);
     }
diff --git a/app/Settings/MaintenanceController.php b/app/Settings/MaintenanceController.php
index 62eeecf39a9..0382ae08a6d 100644
--- a/app/Settings/MaintenanceController.php
+++ b/app/Settings/MaintenanceController.php
@@ -14,7 +14,7 @@ class MaintenanceController extends Controller
     /**
      * Show the page for application maintenance.
      */
-    public function index()
+    public function index(TrashCan $trashCan)
     {
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.maint'));
@@ -23,7 +23,7 @@ public function index()
         $version = trim(file_get_contents(base_path('version')));
 
         // Recycle bin details
-        $recycleStats = (new TrashCan())->getTrashedCounts();
+        $recycleStats = $trashCan->getTrashedCounts();
 
         return view('settings.maintenance', [
             'version'      => $version,
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 1655a4cc3aa..ee2cb8a3533 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\ImageUploadException;
 use Exception;
 use Illuminate\Support\Facades\DB;
@@ -20,6 +21,7 @@ class ImageService
     public function __construct(
         protected ImageStorage $storage,
         protected ImageResizer $resizer,
+        protected EntityQueries $queries,
     ) {
     }
 
@@ -278,15 +280,15 @@ protected function checkUserHasAccessToRelationOfImageAtPath(string $path): bool
         }
 
         if ($imageType === 'gallery' || $imageType === 'drawio') {
-            return Page::visible()->where('id', '=', $image->uploaded_to)->exists();
+            return $this->queries->pages->visibleForList()->where('id', '=', $image->uploaded_to)->exists();
         }
 
         if ($imageType === 'cover_book') {
-            return Book::visible()->where('id', '=', $image->uploaded_to)->exists();
+            return $this->queries->books->visibleForList()->where('id', '=', $image->uploaded_to)->exists();
         }
 
         if ($imageType === 'cover_bookshelf') {
-            return Bookshelf::visible()->where('id', '=', $image->uploaded_to)->exists();
+            return $this->queries->shelves->visibleForList()->where('id', '=', $image->uploaded_to)->exists();
         }
 
         return false;
diff --git a/app/Users/Controllers/UserProfileController.php b/app/Users/Controllers/UserProfileController.php
index bdf268260a1..963d69a6247 100644
--- a/app/Users/Controllers/UserProfileController.php
+++ b/app/Users/Controllers/UserProfileController.php
@@ -10,16 +10,25 @@
 
 class UserProfileController extends Controller
 {
+    public function __construct(
+        protected UserRepo $userRepo,
+        protected ActivityQueries $activityQueries,
+        protected UserContentCounts $contentCounts,
+        protected UserRecentlyCreatedContent $recentlyCreatedContent
+    ) {
+    }
+
+
     /**
      * Show the user profile page.
      */
-    public function show(UserRepo $repo, ActivityQueries $activities, string $slug)
+    public function show(string $slug)
     {
-        $user = $repo->getBySlug($slug);
+        $user = $this->userRepo->getBySlug($slug);
 
-        $userActivity = $activities->userActivity($user);
-        $recentlyCreated = (new UserRecentlyCreatedContent())->run($user, 5);
-        $assetCounts = (new UserContentCounts())->run($user);
+        $userActivity = $this->activityQueries->userActivity($user);
+        $recentlyCreated = $this->recentlyCreatedContent->run($user, 5);
+        $assetCounts = $this->contentCounts->run($user);
 
         $this->setPageTitle($user->name);
 
diff --git a/app/Users/Queries/UserContentCounts.php b/app/Users/Queries/UserContentCounts.php
index 178d8536b1d..af38bfa7e2a 100644
--- a/app/Users/Queries/UserContentCounts.php
+++ b/app/Users/Queries/UserContentCounts.php
@@ -2,10 +2,7 @@
 
 namespace BookStack\Users\Queries;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Users\Models\User;
 
 /**
@@ -13,6 +10,12 @@
  */
 class UserContentCounts
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
+
     /**
      * @return array{pages: int, chapters: int, books: int, shelves: int}
      */
@@ -21,10 +24,10 @@ public function run(User $user): array
         $createdBy = ['created_by' => $user->id];
 
         return [
-            'pages'    => Page::visible()->where($createdBy)->count(),
-            'chapters' => Chapter::visible()->where($createdBy)->count(),
-            'books'    => Book::visible()->where($createdBy)->count(),
-            'shelves'  => Bookshelf::visible()->where($createdBy)->count(),
+            'pages'    => $this->queries->pages->visibleForList()->where($createdBy)->count(),
+            'chapters' => $this->queries->chapters->visibleForList()->where($createdBy)->count(),
+            'books'    => $this->queries->books->visibleForList()->where($createdBy)->count(),
+            'shelves'  => $this->queries->shelves->visibleForList()->where($createdBy)->count(),
         ];
     }
 }
diff --git a/app/Users/Queries/UserRecentlyCreatedContent.php b/app/Users/Queries/UserRecentlyCreatedContent.php
index 23db2c1f1a2..23850e07201 100644
--- a/app/Users/Queries/UserRecentlyCreatedContent.php
+++ b/app/Users/Queries/UserRecentlyCreatedContent.php
@@ -2,10 +2,7 @@
 
 namespace BookStack\Users\Queries;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -15,6 +12,11 @@
  */
 class UserRecentlyCreatedContent
 {
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
     /**
      * @return array{pages: Collection, chapters: Collection, books: Collection, shelves: Collection}
      */
@@ -28,10 +30,10 @@ public function run(User $user, int $count): array
         };
 
         return [
-            'pages'    => $query(Page::visible()->where('draft', '=', false)),
-            'chapters' => $query(Chapter::visible()),
-            'books'    => $query(Book::visible()),
-            'shelves'  => $query(Bookshelf::visible()),
+            'pages'    => $query($this->queries->pages->visibleForList()->where('draft', '=', false)),
+            'chapters' => $query($this->queries->chapters->visibleForList()),
+            'books'    => $query($this->queries->books->visibleForList()),
+            'shelves'  => $query($this->queries->shelves->visibleForList()),
         ];
     }
 }
diff --git a/tests/Entity/BookTest.php b/tests/Entity/BookTest.php
index 3740892460b..04dff293fac 100644
--- a/tests/Entity/BookTest.php
+++ b/tests/Entity/BookTest.php
@@ -317,7 +317,7 @@ public function test_copy()
         $copy = Book::query()->where('name', '=', 'My copy book')->first();
 
         $resp->assertRedirect($copy->getUrl());
-        $this->assertEquals($book->getDirectChildren()->count(), $copy->getDirectChildren()->count());
+        $this->assertEquals($book->getDirectVisibleChildren()->count(), $copy->getDirectVisibleChildren()->count());
 
         $this->get($copy->getUrl())->assertSee($book->description_html, false);
     }
@@ -329,7 +329,7 @@ public function test_copy_does_not_copy_non_visible_content()
 
         // Hide child content
         /** @var BookChild $page */
-        foreach ($book->getDirectChildren() as $child) {
+        foreach ($book->getDirectVisibleChildren() as $child) {
             $this->permissions->setEntityPermissions($child, [], []);
         }
 
@@ -337,7 +337,7 @@ public function test_copy_does_not_copy_non_visible_content()
         /** @var Book $copy */
         $copy = Book::query()->where('name', '=', 'My copy book')->first();
 
-        $this->assertEquals(0, $copy->getDirectChildren()->count());
+        $this->assertEquals(0, $copy->getDirectVisibleChildren()->count());
     }
 
     public function test_copy_does_not_copy_pages_or_chapters_if_user_cant_create()
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 9b77a32ab80..dcc06204446 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -303,7 +303,7 @@ public function test_sibling_search_for_pages()
     public function test_sibling_search_for_pages_without_chapter()
     {
         $page = $this->entities->pageNotWithinChapter();
-        $bookChildren = $page->book->getDirectChildren();
+        $bookChildren = $page->book->getDirectVisibleChildren();
         $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
 
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page");
@@ -318,7 +318,7 @@ public function test_sibling_search_for_pages_without_chapter()
     public function test_sibling_search_for_chapters()
     {
         $chapter = $this->entities->chapter();
-        $bookChildren = $chapter->book->getDirectChildren();
+        $bookChildren = $chapter->book->getDirectVisibleChildren();
         $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
 
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$chapter->id}&entity_type=chapter");

From 546cfb0dcc801c4fa6560ca0e6d18b4f1edd830f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Feb 2024 21:58:27 +0000
Subject: [PATCH 034/666] Queries: Extracted static page,chapter,shelf queries
 to classes

---
 .../Controllers/CommentController.php         |  6 ++++--
 .../Commands/CopyShelfPermissionsCommand.php  |  7 ++++---
 app/Entities/Controllers/BookController.php   |  6 ++++--
 .../Controllers/BookshelfApiController.php    | 12 ++++++-----
 .../ChapterExportApiController.php            | 21 ++++++++-----------
 app/Entities/Controllers/PageController.php   |  4 +++-
 .../Controllers/PageExportApiController.php   | 18 ++++++++--------
 app/Entities/Queries/BookshelfQueries.php     | 11 ++++++++++
 app/Entities/Repos/BaseRepo.php               |  5 +++--
 app/Entities/Tools/PageContent.php            |  6 +++++-
 app/Entities/Tools/ShelfContext.php           | 15 ++++++++-----
 app/Search/SearchController.php               |  9 ++++----
 .../Controllers/AttachmentApiController.php   |  8 ++++---
 .../Controllers/ImageGalleryApiController.php |  6 ++++--
 app/Uploads/ImageRepo.php                     | 19 +++++++++--------
 15 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 340524cd069..0e8db9eaf3c 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\CommentRepo;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -11,7 +12,8 @@
 class CommentController extends Controller
 {
     public function __construct(
-        protected CommentRepo $commentRepo
+        protected CommentRepo $commentRepo,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -27,7 +29,7 @@ public function savePageComment(Request $request, int $pageId)
             'parent_id' => ['nullable', 'integer'],
         ]);
 
-        $page = Page::visible()->find($pageId);
+        $page = $this->pageQueries->findVisibleById($pageId);
         if ($page === null) {
             return response('Not found', 404);
         }
diff --git a/app/Console/Commands/CopyShelfPermissionsCommand.php b/app/Console/Commands/CopyShelfPermissionsCommand.php
index fc11484bd4d..8463ccd03f8 100644
--- a/app/Console/Commands/CopyShelfPermissionsCommand.php
+++ b/app/Console/Commands/CopyShelfPermissionsCommand.php
@@ -3,6 +3,7 @@
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Tools\PermissionsUpdater;
 use Illuminate\Console\Command;
 
@@ -28,7 +29,7 @@ class CopyShelfPermissionsCommand extends Command
     /**
      * Execute the console command.
      */
-    public function handle(PermissionsUpdater $permissionsUpdater): int
+    public function handle(PermissionsUpdater $permissionsUpdater, BookshelfQueries $queries): int
     {
         $shelfSlug = $this->option('slug');
         $cascadeAll = $this->option('all');
@@ -51,11 +52,11 @@ public function handle(PermissionsUpdater $permissionsUpdater): int
                 return 0;
             }
 
-            $shelves = Bookshelf::query()->get(['id']);
+            $shelves = $queries->start()->get(['id']);
         }
 
         if ($shelfSlug) {
-            $shelves = Bookshelf::query()->where('slug', '=', $shelfSlug)->get(['id']);
+            $shelves = $queries->start()->where('slug', '=', $shelfSlug)->get(['id']);
             if ($shelves->count() === 0) {
                 $this->info('No shelves found with the given slug.');
             }
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index 0e9346dbd53..a0b98636fc8 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -8,6 +8,7 @@
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Queries\BookQueries;
+use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
@@ -29,6 +30,7 @@ public function __construct(
         protected ShelfContext $shelfContext,
         protected BookRepo $bookRepo,
         protected BookQueries $queries,
+        protected BookshelfQueries $shelfQueries,
         protected ReferenceFetcher $referenceFetcher,
     ) {
     }
@@ -75,7 +77,7 @@ public function create(string $shelfSlug = null)
 
         $bookshelf = null;
         if ($shelfSlug !== null) {
-            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
@@ -105,7 +107,7 @@ public function store(Request $request, string $shelfSlug = null)
 
         $bookshelf = null;
         if ($shelfSlug !== null) {
-            $bookshelf = Bookshelf::visible()->where('slug', '=', $shelfSlug)->firstOrFail();
+            $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
             $this->checkOwnablePermission('bookshelf-update', $bookshelf);
         }
 
diff --git a/app/Entities/Controllers/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
index a12dc90ac62..9170226a5e8 100644
--- a/app/Entities/Controllers/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Http\ApiController;
 use Exception;
@@ -13,7 +14,8 @@
 class BookshelfApiController extends ApiController
 {
     public function __construct(
-        protected BookshelfRepo $bookshelfRepo
+        protected BookshelfRepo $bookshelfRepo,
+        protected BookshelfQueries $queries,
     ) {
     }
 
@@ -22,7 +24,7 @@ public function __construct(
      */
     public function list()
     {
-        $shelves = Bookshelf::visible();
+        $shelves = $this->queries->visibleForList();
 
         return $this->apiListingResponse($shelves, [
             'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'owned_by',
@@ -54,7 +56,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $shelf = Bookshelf::visible()->findOrFail($id);
+        $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
         $shelf = $this->forJsonDisplay($shelf);
         $shelf->load([
             'createdBy', 'updatedBy', 'ownedBy',
@@ -78,7 +80,7 @@ public function read(string $id)
      */
     public function update(Request $request, string $id)
     {
-        $shelf = Bookshelf::visible()->findOrFail($id);
+        $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('bookshelf-update', $shelf);
 
         $requestData = $this->validate($request, $this->rules()['update']);
@@ -97,7 +99,7 @@ public function update(Request $request, string $id)
      */
     public function delete(string $id)
     {
-        $shelf = Bookshelf::visible()->findOrFail($id);
+        $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission('bookshelf-delete', $shelf);
 
         $this->bookshelfRepo->destroy($shelf);
diff --git a/app/Entities/Controllers/ChapterExportApiController.php b/app/Entities/Controllers/ChapterExportApiController.php
index d1523e665c9..08aa959b3eb 100644
--- a/app/Entities/Controllers/ChapterExportApiController.php
+++ b/app/Entities/Controllers/ChapterExportApiController.php
@@ -3,20 +3,17 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
 class ChapterExportApiController extends ApiController
 {
-    protected $exportFormatter;
-
-    /**
-     * ChapterExportController constructor.
-     */
-    public function __construct(ExportFormatter $exportFormatter)
-    {
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected ExportFormatter $exportFormatter,
+        protected ChapterQueries $queries,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -27,7 +24,7 @@ public function __construct(ExportFormatter $exportFormatter)
      */
     public function exportPdf(int $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
         return $this->download()->directly($pdfContent, $chapter->slug . '.pdf');
@@ -40,7 +37,7 @@ public function exportPdf(int $id)
      */
     public function exportHtml(int $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->chapterToContainedHtml($chapter);
 
         return $this->download()->directly($htmlContent, $chapter->slug . '.html');
@@ -51,7 +48,7 @@ public function exportHtml(int $id)
      */
     public function exportPlainText(int $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->chapterToPlainText($chapter);
 
         return $this->download()->directly($textContent, $chapter->slug . '.txt');
@@ -62,7 +59,7 @@ public function exportPlainText(int $id)
      */
     public function exportMarkdown(int $id)
     {
-        $chapter = Chapter::visible()->findOrFail($id);
+        $chapter = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->chapterToMarkdown($chapter);
 
         return $this->download()->directly($markdown, $chapter->slug . '.md');
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 471df8184ba..44ba999e807 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -359,7 +359,9 @@ public function showRecentlyUpdated()
             $query->scopes('visible');
         };
 
-        $pages = Page::visible()->with(['updatedBy', 'book' => $visibleBelongsScope, 'chapter' => $visibleBelongsScope])
+        $pages = $this->queries->visibleForList()
+            ->addSelect('updated_by')
+            ->with(['updatedBy', 'book' => $visibleBelongsScope, 'chapter' => $visibleBelongsScope])
             ->orderBy('updated_at', 'desc')
             ->paginate(20)
             ->setPath(url('/pages/recently-updated'));
diff --git a/app/Entities/Controllers/PageExportApiController.php b/app/Entities/Controllers/PageExportApiController.php
index d936a0de2b4..8737f2f3eba 100644
--- a/app/Entities/Controllers/PageExportApiController.php
+++ b/app/Entities/Controllers/PageExportApiController.php
@@ -3,17 +3,17 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
 class PageExportApiController extends ApiController
 {
-    protected $exportFormatter;
-
-    public function __construct(ExportFormatter $exportFormatter)
-    {
-        $this->exportFormatter = $exportFormatter;
+    public function __construct(
+        protected ExportFormatter $exportFormatter,
+        protected PageQueries $queries,
+    ) {
         $this->middleware('can:content-export');
     }
 
@@ -24,7 +24,7 @@ public function __construct(ExportFormatter $exportFormatter)
      */
     public function exportPdf(int $id)
     {
-        $page = Page::visible()->findOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
         return $this->download()->directly($pdfContent, $page->slug . '.pdf');
@@ -37,7 +37,7 @@ public function exportPdf(int $id)
      */
     public function exportHtml(int $id)
     {
-        $page = Page::visible()->findOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->pageToContainedHtml($page);
 
         return $this->download()->directly($htmlContent, $page->slug . '.html');
@@ -48,7 +48,7 @@ public function exportHtml(int $id)
      */
     public function exportPlainText(int $id)
     {
-        $page = Page::visible()->findOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->pageToPlainText($page);
 
         return $this->download()->directly($textContent, $page->slug . '.txt');
@@ -59,7 +59,7 @@ public function exportPlainText(int $id)
      */
     public function exportMarkdown(int $id)
     {
-        $page = Page::visible()->findOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->pageToMarkdown($page);
 
         return $this->download()->directly($markdown, $page->slug . '.md');
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index d61607e7a5a..f2fe5053143 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -18,6 +18,17 @@ public function findVisibleById(int $id): ?Bookshelf
         return $this->start()->scopes('visible')->find($id);
     }
 
+    public function findVisibleByIdOrFail(int $id): Bookshelf
+    {
+        $shelf = $this->findVisibleById($id);
+
+        if (is_null($shelf)) {
+            throw new NotFoundException(trans('errors.bookshelf_not_found'));
+        }
+
+        return $shelf;
+    }
+
     public function findVisibleBySlugOrFail(string $slug): Bookshelf
     {
         /** @var ?Bookshelf $shelf */
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 17208ae032a..6674f559a2e 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -9,6 +9,7 @@
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\HasHtmlDescription;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
@@ -23,6 +24,7 @@ public function __construct(
         protected ImageRepo $imageRepo,
         protected ReferenceUpdater $referenceUpdater,
         protected ReferenceStore $referenceStore,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -125,8 +127,7 @@ public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): vo
             return;
         }
 
-        $templateExists = Page::query()->visible()
-            ->where('template', '=', true)
+        $templateExists = $this->pageQueries->visibleTemplates()
             ->where('id', '=', $templateId)
             ->exists();
 
diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 6a89ff62631..88987f054e8 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Facades\Theme;
@@ -21,9 +22,12 @@
 
 class PageContent
 {
+    protected PageQueries $pageQueries;
+
     public function __construct(
         protected Page $page
     ) {
+        $this->pageQueries = app()->make(PageQueries::class);
     }
 
     /**
@@ -331,7 +335,7 @@ protected function getContentProviderClosure(bool $blankIncludes): Closure
                 return PageIncludeContent::fromHtmlAndTag('', $tag);
             }
 
-            $matchedPage = Page::visible()->find($tag->getPageId());
+            $matchedPage = $this->pageQueries->findVisibleById($tag->getPageId());
             $content = PageIncludeContent::fromHtmlAndTag($matchedPage->html ?? '', $tag);
 
             if (Theme::hasListeners(ThemeEvents::PAGE_INCLUDE_PARSE)) {
diff --git a/app/Entities/Tools/ShelfContext.php b/app/Entities/Tools/ShelfContext.php
index 50c7047d9e3..5ed33487854 100644
--- a/app/Entities/Tools/ShelfContext.php
+++ b/app/Entities/Tools/ShelfContext.php
@@ -4,10 +4,16 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Queries\BookshelfQueries;
 
 class ShelfContext
 {
-    protected $KEY_SHELF_CONTEXT_ID = 'context_bookshelf_id';
+    protected string $KEY_SHELF_CONTEXT_ID = 'context_bookshelf_id';
+
+    public function __construct(
+        protected BookshelfQueries $shelfQueries,
+    ) {
+    }
 
     /**
      * Get the current bookshelf context for the given book.
@@ -20,8 +26,7 @@ public function getContextualShelfForBook(Book $book): ?Bookshelf
             return null;
         }
 
-        /** @var Bookshelf $shelf */
-        $shelf = Bookshelf::visible()->find($contextBookshelfId);
+        $shelf = $this->shelfQueries->findVisibleById($contextBookshelfId);
         $shelfContainsBook = $shelf && $shelf->contains($book);
 
         return $shelfContainsBook ? $shelf : null;
@@ -30,7 +35,7 @@ public function getContextualShelfForBook(Book $book): ?Bookshelf
     /**
      * Store the current contextual shelf ID.
      */
-    public function setShelfContext(int $shelfId)
+    public function setShelfContext(int $shelfId): void
     {
         session()->put($this->KEY_SHELF_CONTEXT_ID, $shelfId);
     }
@@ -38,7 +43,7 @@ public function setShelfContext(int $shelfId)
     /**
      * Clear the session stored shelf context id.
      */
-    public function clearShelfContext()
+    public function clearShelfContext(): void
     {
         session()->forget($this->KEY_SHELF_CONTEXT_ID);
     }
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php
index bc3f2ddb403..08f0826dd60 100644
--- a/app/Search/SearchController.php
+++ b/app/Search/SearchController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Search;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Queries\Popular;
 use BookStack\Entities\Tools\SiblingFetcher;
 use BookStack\Http\Controller;
@@ -11,7 +12,8 @@
 class SearchController extends Controller
 {
     public function __construct(
-        protected SearchRunner $searchRunner
+        protected SearchRunner $searchRunner,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -95,12 +97,11 @@ public function templatesForSelector(Request $request)
             $searchOptions->setFilter('is_template');
             $entities = $this->searchRunner->searchEntities($searchOptions, 'page', 1, 20)['results'];
         } else {
-            $entities = Page::visible()
-                ->where('template', '=', true)
+            $entities = $this->pageQueries->visibleTemplates()
                 ->where('draft', '=', false)
                 ->orderBy('updated_at', 'desc')
                 ->take(20)
-                ->get(Page::$listAttributes);
+                ->get();
         }
 
         return view('search.parts.entity-selector-list', [
diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index 2e6d1620575..2832fa8e172 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Http\ApiController;
 use BookStack\Uploads\Attachment;
@@ -15,7 +16,8 @@
 class AttachmentApiController extends ApiController
 {
     public function __construct(
-        protected AttachmentService $attachmentService
+        protected AttachmentService $attachmentService,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -48,7 +50,7 @@ public function create(Request $request)
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $pageId = $request->get('uploaded_to');
-        $page = Page::visible()->findOrFail($pageId);
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission('page-update', $page);
 
         if ($request->hasFile('file')) {
@@ -132,7 +134,7 @@ public function update(Request $request, string $id)
         $page = $attachment->page;
         if ($requestData['uploaded_to'] ?? false) {
             $pageId = $request->get('uploaded_to');
-            $page = Page::visible()->findOrFail($pageId);
+            $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
             $attachment->uploaded_to = $requestData['uploaded_to'];
         }
 
diff --git a/app/Uploads/Controllers/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
index ec96e4593bc..cec47feb016 100644
--- a/app/Uploads/Controllers/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\ApiController;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
@@ -18,6 +19,7 @@ class ImageGalleryApiController extends ApiController
     public function __construct(
         protected ImageRepo $imageRepo,
         protected ImageResizer $imageResizer,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -66,9 +68,9 @@ public function create(Request $request)
     {
         $this->checkPermission('image-create-all');
         $data = $this->validate($request, $this->rules()['create']);
-        Page::visible()->findOrFail($data['uploaded_to']);
+        $page = $this->pageQueries->findVisibleByIdOrFail($data['uploaded_to']);
 
-        $image = $this->imageRepo->saveNew($data['image'], $data['type'], $data['uploaded_to']);
+        $image = $this->imageRepo->saveNew($data['image'], $data['type'], $page->id);
 
         if (isset($data['name'])) {
             $image->refresh();
diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 0e312d88327..160a02fa11c 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -3,6 +3,7 @@
 namespace BookStack\Uploads;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Permissions\PermissionApplicator;
 use Exception;
@@ -15,6 +16,7 @@ public function __construct(
         protected ImageService $imageService,
         protected PermissionApplicator $permissions,
         protected ImageResizer $imageResizer,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -77,14 +79,13 @@ public function getPaginatedByType(
      */
     public function getEntityFiltered(
         string $type,
-        string $filterType = null,
-        int $page = 0,
-        int $pageSize = 24,
-        int $uploadedTo = null,
-        string $search = null
+        ?string $filterType,
+        int $page,
+        int $pageSize,
+        int $uploadedTo,
+        ?string $search
     ): array {
-        /** @var Page $contextPage */
-        $contextPage = Page::visible()->findOrFail($uploadedTo);
+        $contextPage = $this->pageQueries->findVisibleByIdOrFail($uploadedTo);
         $parentFilter = null;
 
         if ($filterType === 'book' || $filterType === 'page') {
@@ -225,9 +226,9 @@ public function getImageData(Image $image): ?string
      */
     public function getPagesUsingImage(Image $image): array
     {
-        $pages = Page::visible()
+        $pages = $this->pageQueries->visibleForList()
             ->where('html', 'like', '%' . $image->url . '%')
-            ->get(['id', 'name', 'slug', 'book_id']);
+            ->get();
 
         foreach ($pages as $page) {
             $page->setAttribute('url', $page->getUrl());

From b77ab6f3af996f924bd2ddbac6e88f61a8bf6cf9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Feb 2024 22:41:45 +0000
Subject: [PATCH 035/666] Queries: Moved out or removed some class-level items

Also ran auto-removal of unused imports across app folder.
---
 .../Controllers/CommentController.php         |  1 -
 app/Api/ApiDocsGenerator.php                  |  1 -
 app/App/HomeController.php                    |  1 -
 app/App/Providers/ThemeServiceProvider.php    |  1 -
 .../Commands/CopyShelfPermissionsCommand.php  |  1 -
 app/Entities/Controllers/BookController.php   |  1 -
 .../ChapterExportApiController.php            |  1 -
 app/Entities/Controllers/PageController.php   |  1 -
 .../Controllers/PageExportApiController.php   |  1 -
 app/Entities/Models/BookChild.php             | 15 ------
 app/Entities/Models/Chapter.php               |  9 ----
 app/Entities/Models/Page.php                  | 12 -----
 app/Entities/Queries/BookQueries.php          |  7 ++-
 app/Entities/Queries/BookshelfQueries.php     |  6 ++-
 app/Entities/Queries/ChapterQueries.php       |  3 +-
 app/Entities/Queries/EntityQueries.php        | 24 ++++++++--
 app/Entities/Queries/PageQueries.php          | 30 ++++++++----
 .../Queries/ProvidesEntityQueries.php         | 13 +++++
 app/Entities/Repos/BaseRepo.php               |  1 -
 app/Permissions/JointPermissionBuilder.php    |  1 -
 app/References/ReferenceController.php        |  4 --
 app/Search/SearchController.php               |  1 -
 app/Search/SearchRunner.php                   | 48 ++++++++-----------
 app/Uploads/AttachmentService.php             |  1 -
 .../Controllers/AttachmentApiController.php   |  1 -
 .../Controllers/GalleryImageController.php    |  2 -
 .../Controllers/ImageGalleryApiController.php |  1 -
 app/Uploads/ImageRepo.php                     |  1 -
 app/Uploads/ImageService.php                  |  3 --
 29 files changed, 85 insertions(+), 107 deletions(-)

diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 0e8db9eaf3c..52ccc823864 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -3,7 +3,6 @@
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\CommentRepo;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php
index bffc38623bf..9cae80617e5 100644
--- a/app/Api/ApiDocsGenerator.php
+++ b/app/Api/ApiDocsGenerator.php
@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Password;
diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 6a4cb017669..56f3d81a8db 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -3,7 +3,6 @@
 namespace BookStack\App;
 
 use BookStack\Activity\ActivityQueries;
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\RecentlyViewed;
diff --git a/app/App/Providers/ThemeServiceProvider.php b/app/App/Providers/ThemeServiceProvider.php
index c15b43a6b4c..4c657d91232 100644
--- a/app/App/Providers/ThemeServiceProvider.php
+++ b/app/App/Providers/ThemeServiceProvider.php
@@ -4,7 +4,6 @@
 
 use BookStack\Theming\ThemeEvents;
 use BookStack\Theming\ThemeService;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 
 class ThemeServiceProvider extends ServiceProvider
diff --git a/app/Console/Commands/CopyShelfPermissionsCommand.php b/app/Console/Commands/CopyShelfPermissionsCommand.php
index 8463ccd03f8..c5e2d504e75 100644
--- a/app/Console/Commands/CopyShelfPermissionsCommand.php
+++ b/app/Console/Commands/CopyShelfPermissionsCommand.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Tools\PermissionsUpdater;
 use Illuminate\Console\Command;
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index a0b98636fc8..a1c586f47e7 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -6,7 +6,6 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\View;
 use BookStack\Activity\Tools\UserEntityWatchOptions;
-use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookRepo;
diff --git a/app/Entities/Controllers/ChapterExportApiController.php b/app/Entities/Controllers/ChapterExportApiController.php
index 08aa959b3eb..ceb2522b211 100644
--- a/app/Entities/Controllers/ChapterExportApiController.php
+++ b/app/Entities/Controllers/ChapterExportApiController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\ApiController;
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 44ba999e807..eab53bb2510 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -7,7 +7,6 @@
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
diff --git a/app/Entities/Controllers/PageExportApiController.php b/app/Entities/Controllers/PageExportApiController.php
index 8737f2f3eba..693760bc8e7 100644
--- a/app/Entities/Controllers/PageExportApiController.php
+++ b/app/Entities/Controllers/PageExportApiController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Http\ApiController;
diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php
index d19a2466a40..ad54fb926a9 100644
--- a/app/Entities/Models/BookChild.php
+++ b/app/Entities/Models/BookChild.php
@@ -13,24 +13,9 @@
  * @property int    $priority
  * @property string $book_slug
  * @property Book   $book
- *
- * @method Builder whereSlugs(string $bookSlug, string $childSlug)
  */
 abstract class BookChild extends Entity
 {
-    /**
-     * Scope a query to find items where the child has the given childSlug
-     * where its parent has the bookSlug.
-     */
-    public function scopeWhereSlugs(Builder $query, string $bookSlug, string $childSlug)
-    {
-        return $query->with('book')
-            ->whereHas('book', function (Builder $query) use ($bookSlug) {
-                $query->where('slug', '=', $bookSlug);
-            })
-            ->where('slug', '=', $childSlug);
-    }
-
     /**
      * Get the book this page sits in.
      */
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index 422c82442fe..c926aaa647a 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -69,13 +69,4 @@ public function getVisiblePages(): Collection
         ->orderBy('priority', 'asc')
         ->get();
     }
-
-    /**
-     * Get a visible chapter by its book and page slugs.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlugs(string $bookSlug, string $chapterSlug): self
-    {
-        return static::visible()->whereSlugs($bookSlug, $chapterSlug)->firstOrFail();
-    }
 }
diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index 17d6f9a016f..3a433338bfe 100644
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -32,9 +32,6 @@ class Page extends BookChild
 {
     use HasFactory;
 
-    public static $listAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'text', 'created_at', 'updated_at', 'priority'];
-    public static $contentAttributes = ['name', 'id', 'slug', 'book_id', 'chapter_id', 'draft', 'template', 'html', 'text', 'created_at', 'updated_at', 'priority'];
-
     protected $fillable = ['name', 'priority'];
 
     public string $textField = 'text';
@@ -145,13 +142,4 @@ public function forJsonDisplay(): self
 
         return $refreshed;
     }
-
-    /**
-     * Get a visible page by its book and page slugs.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlugs(string $bookSlug, string $pageSlug): self
-    {
-        return static::visible()->whereSlugs($bookSlug, $pageSlug)->firstOrFail();
-    }
 }
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 2ffff5eca2e..8f62e513c7c 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -8,6 +8,10 @@
 
 class BookQueries implements ProvidesEntityQueries
 {
+    protected static array $listAttributes = [
+        'id', 'slug', 'name', 'description', 'created_at', 'updated_at', 'image_id'
+    ];
+
     public function start(): Builder
     {
         return Book::query();
@@ -40,7 +44,8 @@ public function findVisibleBySlugOrFail(string $slug): Book
 
     public function visibleForList(): Builder
     {
-        return $this->start()->scopes('visible');
+        return $this->start()->scopes('visible')
+            ->select(static::$listAttributes);
     }
 
     public function visibleForListWithCover(): Builder
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index f2fe5053143..47ff068a93b 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -8,6 +8,10 @@
 
 class BookshelfQueries implements ProvidesEntityQueries
 {
+    protected static array $listAttributes = [
+        'id', 'slug', 'name', 'description', 'created_at', 'updated_at', 'image_id'
+    ];
+
     public function start(): Builder
     {
         return Bookshelf::query();
@@ -46,7 +50,7 @@ public function findVisibleBySlugOrFail(string $slug): Bookshelf
 
     public function visibleForList(): Builder
     {
-        return $this->start()->scopes('visible');
+        return $this->start()->scopes('visible')->select(static::$listAttributes);
     }
 
     public function visibleForListWithCover(): Builder
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index 31193c7ea73..34f762a1581 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -10,8 +10,7 @@ class ChapterQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
         'id', 'slug', 'name', 'description', 'priority',
-        'created_at', 'updated_at',
-        'created_by', 'updated_by', 'owned_by',
+        'created_at', 'updated_at'
     ];
 
     public function start(): Builder
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 31e5b913ad1..36dc6c0bc8a 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -3,6 +3,8 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Entity;
+use Illuminate\Database\Eloquent\Builder;
+use InvalidArgumentException;
 
 class EntityQueries
 {
@@ -25,9 +27,25 @@ public function findVisibleByStringIdentifier(string $identifier): ?Entity
         $explodedId = explode(':', $identifier);
         $entityType = $explodedId[0];
         $entityId = intval($explodedId[1]);
+        $queries = $this->getQueriesForType($entityType);
 
+        return $queries->findVisibleById($entityId);
+    }
+
+    /**
+     * Start a query of visible entities of the given type,
+     * suitable for listing display.
+     */
+    public function visibleForList(string $entityType): Builder
+    {
+        $queries = $this->getQueriesForType($entityType);
+        return $queries->visibleForList();
+    }
+
+    protected function getQueriesForType(string $type): ProvidesEntityQueries
+    {
         /** @var ?ProvidesEntityQueries $queries */
-        $queries = match ($entityType) {
+        $queries = match ($type) {
             'page' => $this->pages,
             'chapter' => $this->chapters,
             'book' => $this->books,
@@ -36,9 +54,9 @@ public function findVisibleByStringIdentifier(string $identifier): ?Entity
         };
 
         if (is_null($queries)) {
-            return null;
+            throw new InvalidArgumentException("No entity query class configured for {$type}");
         }
 
-        return $queries->findVisibleById($entityId);
+        return $queries;
     }
 }
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index e22769c3af6..ec27ba4aa6e 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -8,6 +8,15 @@
 
 class PageQueries implements ProvidesEntityQueries
 {
+    protected static array $contentAttributes = [
+        'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
+        'template', 'html', 'text', 'created_at', 'updated_at', 'priority'
+    ];
+    protected static array $listAttributes = [
+        'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
+        'template', 'text', 'created_at', 'updated_at', 'priority'
+    ];
+
     public function start(): Builder
     {
         return Page::query();
@@ -60,22 +69,14 @@ public function visibleForList(): Builder
     {
         return $this->start()
             ->scopes('visible')
-            ->select(array_merge(Page::$listAttributes, ['book_slug' => function ($builder) {
-                $builder->select('slug')
-                    ->from('books')
-                    ->whereColumn('books.id', '=', 'pages.book_id');
-            }]));
+            ->select($this->mergeBookSlugForSelect(static::$listAttributes));
     }
 
     public function visibleWithContents(): Builder
     {
         return $this->start()
             ->scopes('visible')
-            ->select(array_merge(Page::$contentAttributes, ['book_slug' => function ($builder) {
-                $builder->select('slug')
-                    ->from('books')
-                    ->whereColumn('books.id', '=', 'pages.book_id');
-            }]));
+            ->select($this->mergeBookSlugForSelect(static::$contentAttributes));
     }
 
     public function currentUserDraftsForList(): Builder
@@ -90,4 +91,13 @@ public function visibleTemplates(): Builder
         return $this->visibleForList()
             ->where('template', '=', true);
     }
+
+    protected function mergeBookSlugForSelect(array $columns): array
+    {
+        return array_merge($columns, ['book_slug' => function ($builder) {
+            $builder->select('slug')
+                ->from('books')
+                ->whereColumn('books.id', '=', 'pages.book_id');
+        }]);
+    }
 }
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index 1033522447a..611d0ae526b 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -16,6 +16,19 @@
  */
 interface ProvidesEntityQueries
 {
+    /**
+     * Start a new query for this entity type.
+     */
     public function start(): Builder;
+
+    /**
+     * Find the entity of the given ID, or return null if not found.
+     */
     public function findVisibleById(int $id): ?Entity;
+
+    /**
+     * Start a query for items that are visible, with selection
+     * configured for list display of this item.
+     */
+    public function visibleForList(): Builder;
 }
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 6674f559a2e..033350743e0 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -8,7 +8,6 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\HasHtmlDescription;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 49eaf0774f1..c2922cdc961 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -4,7 +4,6 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
diff --git a/app/References/ReferenceController.php b/app/References/ReferenceController.php
index 57dbcce3c51..2fe86fd594b 100644
--- a/app/References/ReferenceController.php
+++ b/app/References/ReferenceController.php
@@ -2,10 +2,6 @@
 
 namespace BookStack\References;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Http\Controller;
 
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php
index 08f0826dd60..b94ec1ec7ce 100644
--- a/app/Search/SearchController.php
+++ b/app/Search/SearchController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Search;
 
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Queries\Popular;
 use BookStack\Entities\Tools\SiblingFetcher;
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index aac9d10005b..94518dbf7b2 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -3,9 +3,9 @@
 namespace BookStack\Search;
 
 use BookStack\Entities\EntityProvider;
-use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Connection;
@@ -20,9 +20,6 @@
 
 class SearchRunner
 {
-    protected EntityProvider $entityProvider;
-    protected PermissionApplicator $permissions;
-
     /**
      * Acceptable operators to be used in a query.
      *
@@ -38,10 +35,11 @@ class SearchRunner
      */
     protected $termAdjustmentCache;
 
-    public function __construct(EntityProvider $entityProvider, PermissionApplicator $permissions)
-    {
-        $this->entityProvider = $entityProvider;
-        $this->permissions = $permissions;
+    public function __construct(
+        protected EntityProvider $entityProvider,
+        protected PermissionApplicator $permissions,
+        protected EntityQueries $entityQueries,
+    ) {
         $this->termAdjustmentCache = new SplObjectStorage();
     }
 
@@ -72,10 +70,9 @@ public function searchEntities(SearchOptions $searchOpts, string $entityType = '
                 continue;
             }
 
-            $entityModelInstance = $this->entityProvider->get($entityType);
-            $searchQuery = $this->buildQuery($searchOpts, $entityModelInstance);
+            $searchQuery = $this->buildQuery($searchOpts, $entityType);
             $entityTotal = $searchQuery->count();
-            $searchResults = $this->getPageOfDataFromQuery($searchQuery, $entityModelInstance, $page, $count);
+            $searchResults = $this->getPageOfDataFromQuery($searchQuery, $entityType, $page, $count);
 
             if ($entityTotal > ($page * $count)) {
                 $hasMore = true;
@@ -108,8 +105,7 @@ public function searchBook(int $bookId, string $searchString): Collection
                 continue;
             }
 
-            $entityModelInstance = $this->entityProvider->get($entityType);
-            $search = $this->buildQuery($opts, $entityModelInstance)->where('book_id', '=', $bookId)->take(20)->get();
+            $search = $this->buildQuery($opts, $entityType)->where('book_id', '=', $bookId)->take(20)->get();
             $results = $results->merge($search);
         }
 
@@ -122,8 +118,7 @@ public function searchBook(int $bookId, string $searchString): Collection
     public function searchChapter(int $chapterId, string $searchString): Collection
     {
         $opts = SearchOptions::fromString($searchString);
-        $entityModelInstance = $this->entityProvider->get('page');
-        $pages = $this->buildQuery($opts, $entityModelInstance)->where('chapter_id', '=', $chapterId)->take(20)->get();
+        $pages = $this->buildQuery($opts, 'page')->where('chapter_id', '=', $chapterId)->take(20)->get();
 
         return $pages->sortByDesc('score');
     }
@@ -131,17 +126,17 @@ public function searchChapter(int $chapterId, string $searchString): Collection
     /**
      * Get a page of result data from the given query based on the provided page parameters.
      */
-    protected function getPageOfDataFromQuery(EloquentBuilder $query, Entity $entityModelInstance, int $page = 1, int $count = 20): EloquentCollection
+    protected function getPageOfDataFromQuery(EloquentBuilder $query, string $entityType, int $page = 1, int $count = 20): EloquentCollection
     {
         $relations = ['tags'];
 
-        if ($entityModelInstance instanceof BookChild) {
+        if ($entityType === 'page' || $entityType === 'chapter') {
             $relations['book'] = function (BelongsTo $query) {
                 $query->scopes('visible');
             };
         }
 
-        if ($entityModelInstance instanceof Page) {
+        if ($entityType === 'page') {
             $relations['chapter'] = function (BelongsTo $query) {
                 $query->scopes('visible');
             };
@@ -157,18 +152,13 @@ protected function getPageOfDataFromQuery(EloquentBuilder $query, Entity $entity
     /**
      * Create a search query for an entity.
      */
-    protected function buildQuery(SearchOptions $searchOpts, Entity $entityModelInstance): EloquentBuilder
+    protected function buildQuery(SearchOptions $searchOpts, string $entityType): EloquentBuilder
     {
-        $entityQuery = $entityModelInstance->newQuery()->scopes('visible');
-
-        if ($entityModelInstance instanceof Page) {
-            $entityQuery->select(array_merge($entityModelInstance::$listAttributes, ['owned_by']));
-        } else {
-            $entityQuery->select(['*']);
-        }
+        $entityModelInstance = $this->entityProvider->get($entityType);
+        $entityQuery = $this->entityQueries->visibleForList($entityType);
 
         // Handle normal search terms
-        $this->applyTermSearch($entityQuery, $searchOpts, $entityModelInstance);
+        $this->applyTermSearch($entityQuery, $searchOpts, $entityType);
 
         // Handle exact term matching
         foreach ($searchOpts->exacts as $inputTerm) {
@@ -198,7 +188,7 @@ protected function buildQuery(SearchOptions $searchOpts, Entity $entityModelInst
     /**
      * For the given search query, apply the queries for handling the regular search terms.
      */
-    protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $options, Entity $entity): void
+    protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $options, string $entityType): void
     {
         $terms = $options->searches;
         if (count($terms) === 0) {
@@ -216,7 +206,7 @@ protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $
 
         $subQuery->addBinding($scoreSelect['bindings'], 'select');
 
-        $subQuery->where('entity_type', '=', $entity->getMorphClass());
+        $subQuery->where('entity_type', '=', $entityType);
         $subQuery->where(function (Builder $query) use ($terms) {
             foreach ($terms as $inputTerm) {
                 $inputTerm = str_replace('\\', '\\\\', $inputTerm);
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 72f78e347bf..bd319fbd795 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -4,7 +4,6 @@
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index 2832fa8e172..9040ba6d3a9 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Uploads\Controllers;
 
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Http\ApiController;
diff --git a/app/Uploads/Controllers/GalleryImageController.php b/app/Uploads/Controllers/GalleryImageController.php
index 258f2bef6bd..1bc9da2d724 100644
--- a/app/Uploads/Controllers/GalleryImageController.php
+++ b/app/Uploads/Controllers/GalleryImageController.php
@@ -8,8 +8,6 @@
 use BookStack\Uploads\ImageResizer;
 use BookStack\Util\OutOfMemoryHandler;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 
 class GalleryImageController extends Controller
diff --git a/app/Uploads/Controllers/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
index cec47feb016..6d4657a7a5a 100644
--- a/app/Uploads/Controllers/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Uploads\Controllers;
 
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\ApiController;
 use BookStack\Uploads\Image;
diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 160a02fa11c..1e58816a4f3 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Permissions\PermissionApplicator;
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index ee2cb8a3533..8d8da61ec18 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -2,9 +2,6 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\ImageUploadException;
 use Exception;

From ed21a6d798a5a7b4148bf388051c016a2b3315e4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 8 Feb 2024 16:39:59 +0000
Subject: [PATCH 036/666] Queries: Updated old use-specific entity query
 classes

- Updated name to align, and differentate from new 'XQueries' clases.
- Removed old sketchy base class with app resolving workarounds, to a
  proper injection-based approach.
- Also fixed wrong translation text used in PageQueries.
---
 .../Controllers/FavouriteController.php       |  4 +--
 app/App/HomeController.php                    | 16 +++++----
 app/Entities/Queries/EntityQuery.php          | 25 -------------
 app/Entities/Queries/PageQueries.php          |  2 +-
 .../Queries/{Popular.php => QueryPopular.php} | 16 ++++++---
 ...ntlyViewed.php => QueryRecentlyViewed.php} | 14 ++++++--
 ...pFavourites.php => QueryTopFavourites.php} | 14 ++++++--
 app/Entities/Tools/MixedEntityListLoader.php  | 35 ++-----------------
 app/Search/SearchController.php               |  6 ++--
 resources/views/errors/404.blade.php          |  8 ++---
 10 files changed, 57 insertions(+), 83 deletions(-)
 delete mode 100644 app/Entities/Queries/EntityQuery.php
 rename app/Entities/Queries/{Popular.php => QueryPopular.php} (80%)
 rename app/Entities/Queries/{RecentlyViewed.php => QueryRecentlyViewed.php} (61%)
 rename app/Entities/Queries/{TopFavourites.php => QueryTopFavourites.php} (71%)

diff --git a/app/Activity/Controllers/FavouriteController.php b/app/Activity/Controllers/FavouriteController.php
index b3aff1cef42..3125a25ad33 100644
--- a/app/Activity/Controllers/FavouriteController.php
+++ b/app/Activity/Controllers/FavouriteController.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Activity\Controllers;
 
-use BookStack\Entities\Queries\TopFavourites;
+use BookStack\Entities\Queries\QueryTopFavourites;
 use BookStack\Entities\Tools\MixedEntityRequestHelper;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
@@ -21,7 +21,7 @@ public function index(Request $request)
     {
         $viewCount = 20;
         $page = intval($request->get('page', 1));
-        $favourites = (new TopFavourites())->run($viewCount + 1, (($page - 1) * $viewCount));
+        $favourites = (new QueryTopFavourites())->run($viewCount + 1, (($page - 1) * $viewCount));
 
         $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;
 
diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 56f3d81a8db..116f5c8a4bc 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -5,8 +5,8 @@
 use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
-use BookStack\Entities\Queries\RecentlyViewed;
-use BookStack\Entities\Queries\TopFavourites;
+use BookStack\Entities\Queries\QueryRecentlyViewed;
+use BookStack\Entities\Queries\QueryTopFavourites;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
 use BookStack\Uploads\FaviconHandler;
@@ -23,8 +23,12 @@ public function __construct(
     /**
      * Display the homepage.
      */
-    public function index(Request $request, ActivityQueries $activities)
-    {
+    public function index(
+        Request $request,
+        ActivityQueries $activities,
+        QueryRecentlyViewed $recentlyViewed,
+        QueryTopFavourites $topFavourites,
+    ) {
         $activity = $activities->latest(10);
         $draftPages = [];
 
@@ -38,9 +42,9 @@ public function index(Request $request, ActivityQueries $activities)
 
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recents = $this->isSignedIn() ?
-            (new RecentlyViewed())->run(12 * $recentFactor, 1)
+            $recentlyViewed->run(12 * $recentFactor, 1)
             : $this->queries->books->visibleForList()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
-        $favourites = (new TopFavourites())->run(6);
+        $favourites = $topFavourites->run(6);
         $recentlyUpdatedPages = $this->queries->pages->visibleForList()
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')
diff --git a/app/Entities/Queries/EntityQuery.php b/app/Entities/Queries/EntityQuery.php
deleted file mode 100644
index bd7a98b5e56..00000000000
--- a/app/Entities/Queries/EntityQuery.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Queries;
-
-use BookStack\Entities\EntityProvider;
-use BookStack\Entities\Tools\MixedEntityListLoader;
-use BookStack\Permissions\PermissionApplicator;
-
-abstract class EntityQuery
-{
-    protected function mixedEntityListLoader(): MixedEntityListLoader
-    {
-        return app()->make(MixedEntityListLoader::class);
-    }
-
-    protected function permissionService(): PermissionApplicator
-    {
-        return app()->make(PermissionApplicator::class);
-    }
-
-    protected function entityProvider(): EntityProvider
-    {
-        return app()->make(EntityProvider::class);
-    }
-}
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index ec27ba4aa6e..8fb02075ae3 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -50,7 +50,7 @@ public function findVisibleBySlugsOrFail(string $bookSlug, string $pageSlug): Pa
             ->first();
 
         if (is_null($page)) {
-            throw new NotFoundException(trans('errors.chapter_not_found'));
+            throw new NotFoundException(trans('errors.page_not_found'));
         }
 
         return $page;
diff --git a/app/Entities/Queries/Popular.php b/app/Entities/Queries/QueryPopular.php
similarity index 80%
rename from app/Entities/Queries/Popular.php
rename to app/Entities/Queries/QueryPopular.php
index a934f346b95..b2ca565eb05 100644
--- a/app/Entities/Queries/Popular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -3,24 +3,32 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Activity\Models\View;
+use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\PermissionApplicator;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
-class Popular extends EntityQuery
+class QueryPopular
 {
+    public function __construct(
+        protected PermissionApplicator $permissions,
+        protected EntityProvider $entityProvider,
+    ) {
+    }
+
     public function run(int $count, int $page, array $filterModels = null)
     {
-        $query = $this->permissionService()
+        $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
             ->select('*', 'viewable_id', 'viewable_type', DB::raw('SUM(views) as view_count'))
             ->groupBy('viewable_id', 'viewable_type')
             ->orderBy('view_count', 'desc');
 
         if ($filterModels) {
-            $query->whereIn('viewable_type', $this->entityProvider()->getMorphClasses($filterModels));
+            $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 
         $entities = $query->with('viewable')
@@ -35,7 +43,7 @@ public function run(int $count, int $page, array $filterModels = null)
         return $entities;
     }
 
-    protected function loadBooksForChildren(Collection $entities)
+    protected function loadBooksForChildren(Collection $entities): void
     {
         $bookChildren = $entities->filter(fn(Entity $entity) => $entity instanceof BookChild);
         $eloquent = (new \Illuminate\Database\Eloquent\Collection($bookChildren));
diff --git a/app/Entities/Queries/RecentlyViewed.php b/app/Entities/Queries/QueryRecentlyViewed.php
similarity index 61%
rename from app/Entities/Queries/RecentlyViewed.php
rename to app/Entities/Queries/QueryRecentlyViewed.php
index fed15ca5aca..f28b8f8652f 100644
--- a/app/Entities/Queries/RecentlyViewed.php
+++ b/app/Entities/Queries/QueryRecentlyViewed.php
@@ -3,10 +3,18 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Activity\Models\View;
+use BookStack\Entities\Tools\MixedEntityListLoader;
+use BookStack\Permissions\PermissionApplicator;
 use Illuminate\Support\Collection;
 
-class RecentlyViewed extends EntityQuery
+class QueryRecentlyViewed
 {
+    public function __construct(
+        protected PermissionApplicator $permissions,
+        protected MixedEntityListLoader $listLoader,
+    ) {
+    }
+
     public function run(int $count, int $page): Collection
     {
         $user = user();
@@ -14,7 +22,7 @@ public function run(int $count, int $page): Collection
             return collect();
         }
 
-        $query = $this->permissionService()->restrictEntityRelationQuery(
+        $query = $this->permissions->restrictEntityRelationQuery(
             View::query(),
             'views',
             'viewable_id',
@@ -28,7 +36,7 @@ public function run(int $count, int $page): Collection
             ->take($count)
             ->get();
 
-        $this->mixedEntityListLoader()->loadIntoRelations($views->all(), 'viewable', false);
+        $this->listLoader->loadIntoRelations($views->all(), 'viewable', false);
 
         return $views->pluck('viewable')->filter();
     }
diff --git a/app/Entities/Queries/TopFavourites.php b/app/Entities/Queries/QueryTopFavourites.php
similarity index 71%
rename from app/Entities/Queries/TopFavourites.php
rename to app/Entities/Queries/QueryTopFavourites.php
index 47d4b77f7b3..6340e35ef18 100644
--- a/app/Entities/Queries/TopFavourites.php
+++ b/app/Entities/Queries/QueryTopFavourites.php
@@ -3,10 +3,18 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Activity\Models\Favourite;
+use BookStack\Entities\Tools\MixedEntityListLoader;
+use BookStack\Permissions\PermissionApplicator;
 use Illuminate\Database\Query\JoinClause;
 
-class TopFavourites extends EntityQuery
+class QueryTopFavourites
 {
+    public function __construct(
+        protected PermissionApplicator $permissions,
+        protected MixedEntityListLoader $listLoader,
+    ) {
+    }
+
     public function run(int $count, int $skip = 0)
     {
         $user = user();
@@ -14,7 +22,7 @@ public function run(int $count, int $skip = 0)
             return collect();
         }
 
-        $query = $this->permissionService()
+        $query = $this->permissions
             ->restrictEntityRelationQuery(Favourite::query(), 'favourites', 'favouritable_id', 'favouritable_type')
             ->select('favourites.*')
             ->leftJoin('views', function (JoinClause $join) {
@@ -30,7 +38,7 @@ public function run(int $count, int $skip = 0)
             ->take($count)
             ->get();
 
-        $this->mixedEntityListLoader()->loadIntoRelations($favourites->all(), 'favouritable', false);
+        $this->listLoader->loadIntoRelations($favourites->all(), 'favouritable', false);
 
         return $favourites->pluck('favouritable')->filter();
     }
diff --git a/app/Entities/Tools/MixedEntityListLoader.php b/app/Entities/Tools/MixedEntityListLoader.php
index a0df791db5b..f9a940b981b 100644
--- a/app/Entities/Tools/MixedEntityListLoader.php
+++ b/app/Entities/Tools/MixedEntityListLoader.php
@@ -3,20 +3,13 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\App\Model;
-use BookStack\Entities\EntityProvider;
+use BookStack\Entities\Queries\EntityQueries;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
 class MixedEntityListLoader
 {
-    protected array $listAttributes = [
-        'page'      => ['id', 'name', 'slug', 'book_id', 'chapter_id', 'text', 'draft'],
-        'chapter'   => ['id', 'name', 'slug', 'book_id', 'description'],
-        'book'      => ['id', 'name', 'slug', 'description'],
-        'bookshelf' => ['id', 'name', 'slug', 'description'],
-    ];
-
     public function __construct(
-        protected EntityProvider $entityProvider
+        protected EntityQueries $queries,
     ) {
     }
 
@@ -61,14 +54,7 @@ protected function idsByTypeToModelMap(array $idsByType, bool $eagerLoadParents)
         $modelMap = [];
 
         foreach ($idsByType as $type => $ids) {
-            if (!isset($this->listAttributes[$type])) {
-                continue;
-            }
-
-            $instance = $this->entityProvider->get($type);
-            $models = $instance->newQuery()
-                ->select(array_merge($this->listAttributes[$type], $this->getSubSelectsForQuery($type)))
-                ->scopes('visible')
+            $models = $this->queries->visibleForList($type)
                 ->whereIn('id', $ids)
                 ->with($eagerLoadParents ? $this->getRelationsToEagerLoad($type) : [])
                 ->get();
@@ -100,19 +86,4 @@ protected function getRelationsToEagerLoad(string $type): array
 
         return $toLoad;
     }
-
-    protected function getSubSelectsForQuery(string $type): array
-    {
-        $subSelects = [];
-
-        if ($type === 'chapter' || $type === 'page') {
-            $subSelects['book_slug'] = function ($builder) {
-                $builder->select('slug')
-                    ->from('books')
-                    ->whereColumn('books.id', '=', 'book_id');
-            };
-        }
-
-        return $subSelects;
-    }
 }
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php
index b94ec1ec7ce..2fce6a3d53f 100644
--- a/app/Search/SearchController.php
+++ b/app/Search/SearchController.php
@@ -3,7 +3,7 @@
 namespace BookStack\Search;
 
 use BookStack\Entities\Queries\PageQueries;
-use BookStack\Entities\Queries\Popular;
+use BookStack\Entities\Queries\QueryPopular;
 use BookStack\Entities\Tools\SiblingFetcher;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
@@ -67,7 +67,7 @@ public function searchChapter(Request $request, int $chapterId)
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
      */
-    public function searchForSelector(Request $request)
+    public function searchForSelector(Request $request, QueryPopular $queryPopular)
     {
         $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
         $searchTerm = $request->get('term', false);
@@ -78,7 +78,7 @@ public function searchForSelector(Request $request)
             $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';
             $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20)['results'];
         } else {
-            $entities = (new Popular())->run(20, 0, $entityTypes);
+            $entities = $queryPopular->run(20, 0, $entityTypes);
         }
 
         return view('search.parts.entity-selector-list', ['entities' => $entities, 'permission' => $permission]);
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 27d66b30bb9..dc24a558d84 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,5 +1,5 @@
 @extends('layouts.simple')
-
+@inject('popular', \BookStack\Entities\Queries\QueryPopular::class)
 @section('content')
     <div class="container mt-l">
 
@@ -28,7 +28,7 @@
                     <div class="card mb-xl">
                         <h3 class="card-title">{{ trans('entities.pages_popular') }}</h3>
                         <div class="px-m">
-                            @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['page']), 'style' => 'compact'])
+                            @include('entities.list', ['entities' => $popular->run(10, 0, ['page']), 'style' => 'compact'])
                         </div>
                     </div>
                 </div>
@@ -36,7 +36,7 @@
                     <div class="card mb-xl">
                         <h3 class="card-title">{{ trans('entities.books_popular') }}</h3>
                         <div class="px-m">
-                            @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['book']), 'style' => 'compact'])
+                            @include('entities.list', ['entities' => $popular->run(10, 0, ['book']), 'style' => 'compact'])
                         </div>
                     </div>
                 </div>
@@ -44,7 +44,7 @@
                     <div class="card mb-xl">
                         <h3 class="card-title">{{ trans('entities.chapters_popular') }}</h3>
                         <div class="px-m">
-                            @include('entities.list', ['entities' => (new \BookStack\Entities\Queries\Popular)->run(10, 0, ['chapter']), 'style' => 'compact'])
+                            @include('entities.list', ['entities' => $popular->run(10, 0, ['chapter']), 'style' => 'compact'])
                         </div>
                     </div>
                 </div>

From ed9c013f6e7ee7a7bfe1c67b4cb1a84ca198b7a6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 8 Feb 2024 17:18:03 +0000
Subject: [PATCH 037/666] Queries: Addressed failing test cases from recent
 changes

---
 app/Activity/Controllers/FavouriteController.php | 4 ++--
 app/Entities/Queries/BookQueries.php             | 3 ++-
 app/Entities/Queries/BookshelfQueries.php        | 3 ++-
 app/Entities/Queries/ChapterQueries.php          | 2 +-
 app/Entities/Queries/PageQueries.php             | 5 +++--
 app/Entities/Tools/PageContent.php               | 5 +++--
 app/Entities/Tools/PageEditorData.php            | 5 +++--
 app/Entities/Tools/SiblingFetcher.php            | 3 ++-
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/Activity/Controllers/FavouriteController.php b/app/Activity/Controllers/FavouriteController.php
index 3125a25ad33..deeb4b0afb4 100644
--- a/app/Activity/Controllers/FavouriteController.php
+++ b/app/Activity/Controllers/FavouriteController.php
@@ -17,11 +17,11 @@ public function __construct(
     /**
      * Show a listing of all favourite items for the current user.
      */
-    public function index(Request $request)
+    public function index(Request $request, QueryTopFavourites $topFavourites)
     {
         $viewCount = 20;
         $page = intval($request->get('page', 1));
-        $favourites = (new QueryTopFavourites())->run($viewCount + 1, (($page - 1) * $viewCount));
+        $favourites = $topFavourites->run($viewCount + 1, (($page - 1) * $viewCount));
 
         $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;
 
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 8f62e513c7c..534640621ee 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -9,7 +9,8 @@
 class BookQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
-        'id', 'slug', 'name', 'description', 'created_at', 'updated_at', 'image_id'
+        'id', 'slug', 'name', 'description',
+        'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
     public function start(): Builder
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 47ff068a93b..19717fb7cd4 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -9,7 +9,8 @@
 class BookshelfQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
-        'id', 'slug', 'name', 'description', 'created_at', 'updated_at', 'image_id'
+        'id', 'slug', 'name', 'description',
+        'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
     public function start(): Builder
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index 34f762a1581..53c5bc9d842 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -10,7 +10,7 @@ class ChapterQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
         'id', 'slug', 'name', 'description', 'priority',
-        'created_at', 'updated_at'
+        'book_id', 'created_at', 'updated_at', 'owned_by',
     ];
 
     public function start(): Builder
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index 8fb02075ae3..a5938f754ef 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -10,11 +10,12 @@ class PageQueries implements ProvidesEntityQueries
 {
     protected static array $contentAttributes = [
         'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'html', 'text', 'created_at', 'updated_at', 'priority'
+        'template', 'html', 'text', 'created_at', 'updated_at', 'priority',
+        'created_by', 'updated_by', 'owned_by',
     ];
     protected static array $listAttributes = [
         'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'text', 'created_at', 'updated_at', 'priority'
+        'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by',
     ];
 
     public function start(): Builder
diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 88987f054e8..4f68b828fc5 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -329,13 +329,14 @@ public function render(bool $blankIncludes = false): string
     protected function getContentProviderClosure(bool $blankIncludes): Closure
     {
         $contextPage = $this->page;
+        $queries = $this->pageQueries;
 
-        return function (PageIncludeTag $tag) use ($blankIncludes, $contextPage): PageIncludeContent {
+        return function (PageIncludeTag $tag) use ($blankIncludes, $contextPage, $queries): PageIncludeContent {
             if ($blankIncludes) {
                 return PageIncludeContent::fromHtmlAndTag('', $tag);
             }
 
-            $matchedPage = $this->pageQueries->findVisibleById($tag->getPageId());
+            $matchedPage = $queries->findVisibleById($tag->getPageId());
             $content = PageIncludeContent::fromHtmlAndTag($matchedPage->html ?? '', $tag);
 
             if (Theme::hasListeners(ThemeEvents::PAGE_INCLUDE_PARSE)) {
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index 20bf19eb2f4..f0bd235897d 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -38,7 +38,8 @@ protected function build(): array
         $templates = $this->queries->pages->visibleTemplates()
             ->orderBy('name', 'asc')
             ->take(10)
-            ->get();
+            ->paginate()
+            ->withPath('/templates');
 
         $draftsEnabled = auth()->check();
 
@@ -51,7 +52,7 @@ protected function build(): array
         }
 
         // Check for a current draft version for this user
-        $userDraft = $this->queries->revisions->findLatestCurrentUserDraftsForPageId($page->id)->first();
+        $userDraft = $this->queries->revisions->findLatestCurrentUserDraftsForPageId($page->id);
         if (!is_null($userDraft)) {
             $page->forceFill($userDraft->only(['name', 'html', 'markdown']));
             $isDraftRevision = true;
diff --git a/app/Entities/Tools/SiblingFetcher.php b/app/Entities/Tools/SiblingFetcher.php
index 7b8ac37ad87..34d0fc6b07e 100644
--- a/app/Entities/Tools/SiblingFetcher.php
+++ b/app/Entities/Tools/SiblingFetcher.php
@@ -14,6 +14,7 @@ class SiblingFetcher
 {
     public function __construct(
         protected EntityQueries $queries,
+        protected ShelfContext $shelfContext,
     ) {
     }
 
@@ -38,7 +39,7 @@ public function fetch(string $entityType, int $entityId): Collection
         // Book
         // Gets just the books in a shelf if shelf is in context
         if ($entity instanceof Book) {
-            $contextShelf = (new ShelfContext())->getContextualShelfForBook($entity);
+            $contextShelf = $this->shelfContext->getContextualShelfForBook($entity);
             if ($contextShelf) {
                 $entities = $contextShelf->visibleBooks()->get();
             } else {

From 1ea2ac864aaa7e4ee3995ec675fd92db7b2722cd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 11 Feb 2024 15:42:37 +0000
Subject: [PATCH 038/666] Queries: Update API to align data with previous
 versions

Ensures fields returned match API docs and previous versions of
BookStack where we were accidentally returning more fields than
expected.
Updates tests to cover many of these.
Also updated clockwork to ignore image requests for less noisy
debugging.
Also updated chapter page query to not be loading all page data, via new
query in PageQueries.
---
 app/Config/clockwork.php                      |  2 ++
 .../Controllers/BookApiController.php         |  4 +++-
 .../Controllers/BookshelfApiController.php    |  4 +++-
 .../Controllers/ChapterApiController.php      | 23 +++++++++++--------
 .../Controllers/ChapterController.php         |  3 ++-
 .../Controllers/PageApiController.php         |  3 ++-
 app/Entities/Queries/PageQueries.php          |  8 +++++++
 tests/Api/BooksApiTest.php                    |  3 +++
 tests/Api/ChaptersApiTest.php                 | 13 +++++++++++
 tests/Api/PagesApiTest.php                    |  4 ++++
 tests/Api/ShelvesApiTest.php                  |  3 +++
 11 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/app/Config/clockwork.php b/app/Config/clockwork.php
index 394af845172..bd59eaf71d8 100644
--- a/app/Config/clockwork.php
+++ b/app/Config/clockwork.php
@@ -173,6 +173,8 @@
 
         // List of URIs that should not be collected
         'except' => [
+            '/uploads/images/.*', // BookStack image requests
+
             '/horizon/.*', // Laravel Horizon requests
             '/telescope/.*', // Laravel Telescope requests
             '/_debugbar/.*', // Laravel DebugBar requests
diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index 955bd707bc6..15e67a0f723 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -26,7 +26,9 @@ public function __construct(
      */
     public function list()
     {
-        $books = $this->queries->visibleForList();
+        $books = $this->queries
+            ->visibleForList()
+            ->addSelect(['created_by', 'updated_by']);
 
         return $this->apiListingResponse($books, [
             'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'owned_by',
diff --git a/app/Entities/Controllers/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
index 9170226a5e8..a665bcb6bab 100644
--- a/app/Entities/Controllers/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -24,7 +24,9 @@ public function __construct(
      */
     public function list()
     {
-        $shelves = $this->queries->visibleForList();
+        $shelves = $this->queries
+            ->visibleForList()
+            ->addSelect(['created_by', 'updated_by']);
 
         return $this->apiListingResponse($shelves, [
             'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'owned_by',
diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index fb484b85d72..430654330f3 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -3,8 +3,8 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\ChapterQueries;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
@@ -38,7 +38,7 @@ class ChapterApiController extends ApiController
     public function __construct(
         protected ChapterRepo $chapterRepo,
         protected ChapterQueries $queries,
-        protected BookQueries $bookQueries,
+        protected EntityQueries $entityQueries,
     ) {
     }
 
@@ -47,7 +47,8 @@ public function __construct(
      */
     public function list()
     {
-        $chapters = $this->queries->visibleForList();
+        $chapters = $this->queries->visibleForList()
+            ->addSelect(['created_by', 'updated_by']);
 
         return $this->apiListingResponse($chapters, [
             'id', 'book_id', 'name', 'slug', 'description', 'priority',
@@ -63,7 +64,7 @@ public function create(Request $request)
         $requestData = $this->validate($request, $this->rules['create']);
 
         $bookId = $request->get('book_id');
-        $book = $this->bookQueries->findVisibleByIdOrFail(intval($bookId));
+        $book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId));
         $this->checkOwnablePermission('chapter-create', $book);
 
         $chapter = $this->chapterRepo->create($requestData, $book);
@@ -79,12 +80,14 @@ public function read(string $id)
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
         $chapter = $this->forJsonDisplay($chapter);
 
-        $chapter->load([
-            'createdBy', 'updatedBy', 'ownedBy',
-            'pages' => function (HasMany $query) {
-                $query->scopes('visible')->get(['id', 'name', 'slug']);
-            }
-        ]);
+        $chapter->load(['createdBy', 'updatedBy', 'ownedBy']);
+
+        // Note: More fields than usual here, for backwards compatibility,
+        // due to previously accidentally including more fields that desired.
+        $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)
+            ->addSelect(['created_by', 'updated_by', 'revision_count', 'editor'])
+            ->get();
+        $chapter->setRelation('pages', $pages);
 
         return response()->json($chapter);
     }
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 2e36a84b94d..4274589e260 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -79,7 +79,8 @@ public function show(string $bookSlug, string $chapterSlug)
         $this->checkOwnablePermission('chapter-view', $chapter);
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
-        $pages = $chapter->getVisiblePages();
+        $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)->get();
+
         $nextPreviousLocator = new NextPreviousContentLocator($chapter, $sidebarTree);
         View::incrementFor($chapter);
 
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index d2a5a3ee351..40598e20983 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -45,7 +45,8 @@ public function __construct(
      */
     public function list()
     {
-        $pages = $this->queries->visibleForList();
+        $pages = $this->queries->visibleForList()
+            ->addSelect(['created_by', 'updated_by', 'revision_count', 'editor']);
 
         return $this->apiListingResponse($pages, [
             'id', 'book_id', 'chapter_id', 'name', 'slug', 'priority',
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index a5938f754ef..06298f470b9 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -73,6 +73,14 @@ public function visibleForList(): Builder
             ->select($this->mergeBookSlugForSelect(static::$listAttributes));
     }
 
+    public function visibleForChapterList(int $chapterId): Builder
+    {
+        return $this->visibleForList()
+            ->where('chapter_id', '=', $chapterId)
+            ->orderBy('draft', 'desc')
+            ->orderBy('priority', 'asc');
+    }
+
     public function visibleWithContents(): Builder
     {
         return $this->start()
diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index b31bd7d37ee..b8c2b613387 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -24,6 +24,9 @@ public function test_index_endpoint_returns_expected_book()
                 'id'   => $firstBook->id,
                 'name' => $firstBook->name,
                 'slug' => $firstBook->slug,
+                'owned_by' => $firstBook->owned_by,
+                'created_by' => $firstBook->created_by,
+                'updated_by' => $firstBook->updated_by,
             ],
         ]]);
     }
diff --git a/tests/Api/ChaptersApiTest.php b/tests/Api/ChaptersApiTest.php
index e2d6cfc81f0..9698d4dd9c2 100644
--- a/tests/Api/ChaptersApiTest.php
+++ b/tests/Api/ChaptersApiTest.php
@@ -28,6 +28,9 @@ public function test_index_endpoint_returns_expected_chapter()
                 'book_id'   => $firstChapter->book->id,
                 'priority'  => $firstChapter->priority,
                 'book_slug' => $firstChapter->book->slug,
+                'owned_by'   => $firstChapter->owned_by,
+                'created_by' => $firstChapter->created_by,
+                'updated_by' => $firstChapter->updated_by,
             ],
         ]]);
     }
@@ -149,6 +152,16 @@ public function test_read_endpoint()
                     'id'   => $page->id,
                     'slug' => $page->slug,
                     'name' => $page->name,
+                    'owned_by' => $page->owned_by,
+                    'created_by' => $page->created_by,
+                    'updated_by' => $page->updated_by,
+                    'book_id' => $page->id,
+                    'chapter_id' => $chapter->id,
+                    'priority' => $page->priority,
+                    'book_slug' => $chapter->book->slug,
+                    'draft' => $page->draft,
+                    'template' => $page->template,
+                    'editor' => $page->editor,
                 ],
             ],
             'default_template_id' => null,
diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php
index 0d084472d1a..22659d5bb72 100644
--- a/tests/Api/PagesApiTest.php
+++ b/tests/Api/PagesApiTest.php
@@ -27,6 +27,10 @@ public function test_index_endpoint_returns_expected_page()
                 'slug'     => $firstPage->slug,
                 'book_id'  => $firstPage->book->id,
                 'priority' => $firstPage->priority,
+                'owned_by'   => $firstPage->owned_by,
+                'created_by' => $firstPage->created_by,
+                'updated_by' => $firstPage->updated_by,
+                'revision_count' => $firstPage->revision_count,
             ],
         ]]);
     }
diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php
index f1b8ed98553..be276e11004 100644
--- a/tests/Api/ShelvesApiTest.php
+++ b/tests/Api/ShelvesApiTest.php
@@ -25,6 +25,9 @@ public function test_index_endpoint_returns_expected_shelf()
                 'id'   => $firstBookshelf->id,
                 'name' => $firstBookshelf->name,
                 'slug' => $firstBookshelf->slug,
+                'owned_by' => $firstBookshelf->owned_by,
+                'created_by' => $firstBookshelf->created_by,
+                'updated_by' => $firstBookshelf->updated_by,
             ],
         ]]);
     }

From 12daa1c2b982522d31bcc422477708a39aea9c92 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 13 Feb 2024 14:00:34 +0000
Subject: [PATCH 039/666] Header: Fixed mobile menu falling out of header

Changed button to be within-DOM rather than absolute positioned.
Also improves RTL handling by showing menu on the right side.

Fixes #4841
---
 resources/sass/_header.scss                    | 10 +---------
 resources/views/layouts/parts/header.blade.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss
index e2daae437b6..d72b6672948 100644
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -205,9 +205,6 @@ header .search-box.search-active:focus-within {
   border: 2px solid rgba(255, 255, 255, 0.8);
   border-radius: 4px;
   padding: 0 $-xs;
-  position: absolute;
-  right: $-m;
-  top: 13px;
   line-height: 1;
   cursor: pointer;
   user-select: none;
@@ -215,20 +212,15 @@ header .search-box.search-active:focus-within {
     margin: 0;
     bottom: -2px;
   }
-  @include rtl() {
-    left: $-m;
-    right: auto;
-  }
 }
 
 
-
 @include smaller-than($l) {
   header .header-links {
     @include lightDark(background-color, #fff, #333);
     display: none;
     z-index: 10;
-    right: $-m;
+    inset-inline-end: $-m;
     border-radius: 4px;
     overflow: hidden;
     position: absolute;
diff --git a/resources/views/layouts/parts/header.blade.php b/resources/views/layouts/parts/header.blade.php
index 0e3ad44664b..729b975044d 100644
--- a/resources/views/layouts/parts/header.blade.php
+++ b/resources/views/layouts/parts/header.blade.php
@@ -1,11 +1,13 @@
 <header id="header" component="header-mobile-toggle" class="primary-background px-xl grid print-hidden">
-    <div>
+    <div class="flex-container-row justify-space-between gap-s items-center">
         @include('layouts.parts.header-logo')
-        <button type="button"
-                refs="header-mobile-toggle@toggle"
-                title="{{ trans('common.header_menu_expand') }}"
-                aria-expanded="false"
-                class="mobile-menu-toggle hide-over-l">@icon('more')</button>
+        <div class="hide-over-l py-s">
+            <button type="button"
+                    refs="header-mobile-toggle@toggle"
+                    title="{{ trans('common.header_menu_expand') }}"
+                    aria-expanded="false"
+                    class="mobile-menu-toggle">@icon('more')</button>
+        </div>
     </div>
 
     <div class="flex-container-column items-center justify-center hide-under-l">

From c66b8ad842a14e83e8a5ecb44710ca94ac1430e8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 14 Feb 2024 10:36:00 +0000
Subject: [PATCH 040/666] RTL: Fixed pagination not responding to RTL layout

For #4808
---
 resources/sass/_lists.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 865b503c83e..00aa04f485c 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -358,13 +358,10 @@ details.sort-box[open] summary .caret-container svg {
 }
 
 ul.pagination {
-  display: inline-block;
+  display: inline-flex;
   list-style: none;
   margin: $-m 0;
   padding-inline-start: 1px;
-  li {
-    float: left;
-  }
   li:first-child {
     a, span {
       border-radius: 3px 0 0 3px;

From cafea1c02d61a30038babd2d5286762421537b65 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 15 Feb 2024 14:12:47 +0000
Subject: [PATCH 041/666] Updated tinymce from 6.7.2 to 6.8.3

---
 public/libs/tinymce/models/dom/model.min.js   |  2 +-
 .../tinymce/plugins/advlist/plugin.min.js     |  2 +-
 .../libs/tinymce/plugins/anchor/plugin.min.js |  2 +-
 .../tinymce/plugins/autolink/plugin.min.js    |  2 +-
 .../tinymce/plugins/autoresize/plugin.min.js  |  2 +-
 .../tinymce/plugins/autosave/plugin.min.js    |  2 +-
 .../tinymce/plugins/charmap/plugin.min.js     |  2 +-
 .../libs/tinymce/plugins/code/plugin.min.js   |  2 +-
 .../tinymce/plugins/codesample/plugin.min.js  |  2 +-
 .../plugins/directionality/plugin.min.js      |  2 +-
 .../tinymce/plugins/fullscreen/plugin.min.js  |  4 +--
 .../libs/tinymce/plugins/image/plugin.min.js  |  4 +--
 .../tinymce/plugins/importcss/plugin.min.js   |  4 +--
 .../plugins/insertdatetime/plugin.min.js      |  2 +-
 .../libs/tinymce/plugins/link/plugin.min.js   |  4 +--
 .../libs/tinymce/plugins/lists/plugin.min.js  |  4 +--
 .../libs/tinymce/plugins/media/plugin.min.js  |  4 +--
 .../tinymce/plugins/nonbreaking/plugin.min.js |  2 +-
 .../tinymce/plugins/pagebreak/plugin.min.js   |  2 +-
 .../tinymce/plugins/preview/plugin.min.js     |  2 +-
 .../tinymce/plugins/quickbars/plugin.min.js   |  2 +-
 .../libs/tinymce/plugins/save/plugin.min.js   |  2 +-
 .../plugins/searchreplace/plugin.min.js       |  4 +--
 .../libs/tinymce/plugins/table/plugin.min.js  |  2 +-
 .../tinymce/plugins/template/plugin.min.js    |  2 +-
 .../plugins/visualblocks/plugin.min.js        |  2 +-
 .../tinymce/plugins/visualchars/plugin.min.js |  2 +-
 .../tinymce/plugins/wordcount/plugin.min.js   |  2 +-
 .../tinymce/skins/content/dark/content.js     |  2 ++
 .../tinymce/skins/content/default/content.js  |  2 ++
 .../tinymce/skins/content/document/content.js |  2 ++
 .../skins/content/tinymce-5-dark/content.js   |  2 ++
 .../skins/content/tinymce-5/content.js        |  2 ++
 .../tinymce/skins/content/writer/content.js   |  2 ++
 .../ui/oxide-dark/content.inline.min.css      |  1 -
 .../skins/ui/oxide-dark/content.min.css       |  1 -
 .../tinymce/skins/ui/oxide-dark/skin.min.css  |  1 -
 .../ui/oxide-dark/skin.shadowdom.min.css      |  1 -
 .../skins/ui/oxide/content.inline.min.css     |  1 -
 .../tinymce/skins/ui/oxide/content.min.css    |  1 -
 .../libs/tinymce/skins/ui/oxide/skin.min.css  |  1 -
 .../skins/ui/oxide/skin.shadowdom.min.css     |  1 -
 .../skins/ui/tinymce-5-dark/content.inline.js |  2 ++
 .../skins/ui/tinymce-5-dark/content.js        |  2 ++
 .../tinymce/skins/ui/tinymce-5-dark/skin.js   |  2 ++
 .../skins/ui/tinymce-5-dark/skin.min.css      |  2 +-
 .../skins/ui/tinymce-5-dark/skin.shadowdom.js |  2 ++
 .../skins/ui/tinymce-5/content.inline.js      |  2 ++
 .../tinymce/skins/ui/tinymce-5/content.js     |  2 ++
 .../libs/tinymce/skins/ui/tinymce-5/skin.js   |  2 ++
 .../tinymce/skins/ui/tinymce-5/skin.min.css   |  2 +-
 .../skins/ui/tinymce-5/skin.shadowdom.js      |  2 ++
 .../libs/tinymce/themes/silver/theme.min.js   |  4 +--
 public/libs/tinymce/tinymce.d.ts              | 26 +++++++++++++++++++
 public/libs/tinymce/tinymce.min.js            |  4 +--
 55 files changed, 95 insertions(+), 49 deletions(-)
 create mode 100644 public/libs/tinymce/skins/content/dark/content.js
 create mode 100644 public/libs/tinymce/skins/content/default/content.js
 create mode 100644 public/libs/tinymce/skins/content/document/content.js
 create mode 100644 public/libs/tinymce/skins/content/tinymce-5-dark/content.js
 create mode 100644 public/libs/tinymce/skins/content/tinymce-5/content.js
 create mode 100644 public/libs/tinymce/skins/content/writer/content.js
 delete mode 100644 public/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide-dark/content.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide-dark/skin.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide/content.inline.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide/content.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide/skin.min.css
 delete mode 100644 public/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5-dark/content.inline.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5-dark/content.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5-dark/skin.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5/content.inline.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5/content.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5/skin.js
 create mode 100644 public/libs/tinymce/skins/ui/tinymce-5/skin.shadowdom.js

diff --git a/public/libs/tinymce/models/dom/model.min.js b/public/libs/tinymce/models/dom/model.min.js
index a6b5053210f..268a4352bab 100644
--- a/public/libs/tinymce/models/dom/model.min.js
+++ b/public/libs/tinymce/models/dom/model.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.ModelManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(o=n=e,(r=String).prototype.isPrototypeOf(o)||(null===(s=n.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var o,n,r,s})(t)===e,o=e=>t=>typeof t===e,n=e=>t=>e===t,r=t("string"),s=t("object"),l=t("array"),a=n(null),c=o("boolean"),i=n(void 0),m=e=>!(e=>null==e)(e),d=o("function"),u=o("number"),f=()=>{},g=e=>()=>e,h=e=>e,p=(e,t)=>e===t;function w(e,...t){return(...o)=>{const n=t.concat(o);return e.apply(null,n)}}const b=e=>t=>!e(t),v=e=>e(),y=g(!1),x=g(!0);class C{constructor(e,t){this.tag=e,this.value=t}static some(e){return new C(!0,e)}static none(){return C.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?C.some(e(this.value)):C.none()}bind(e){return this.tag?e(this.value):C.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:C.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return m(e)?C.some(e):C.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}C.singletonNone=new C(!1);const S=Array.prototype.slice,T=Array.prototype.indexOf,R=Array.prototype.push,D=(e,t)=>{return o=e,n=t,T.call(o,n)>-1;var o,n},O=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return!0;return!1},k=(e,t)=>{const o=[];for(let n=0;n<e;n++)o.push(t(n));return o},E=(e,t)=>{const o=e.length,n=new Array(o);for(let r=0;r<o;r++){const o=e[r];n[r]=t(o,r)}return n},N=(e,t)=>{for(let o=0,n=e.length;o<n;o++)t(e[o],o)},B=(e,t)=>{const o=[],n=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?o:n).push(s)}return{pass:o,fail:n}},_=(e,t)=>{const o=[];for(let n=0,r=e.length;n<r;n++){const r=e[n];t(r,n)&&o.push(r)}return o},z=(e,t,o)=>(((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(e,((e,n)=>{o=t(o,e,n)})),o),A=(e,t,o)=>(N(e,((e,n)=>{o=t(o,e,n)})),o),L=(e,t)=>((e,t,o)=>{for(let n=0,r=e.length;n<r;n++){const r=e[n];if(t(r,n))return C.some(r);if(o(r,n))break}return C.none()})(e,t,y),W=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return C.some(o);return C.none()},M=e=>{const t=[];for(let o=0,n=e.length;o<n;++o){if(!l(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);R.apply(t,e[o])}return t},j=(e,t)=>M(E(e,t)),P=(e,t)=>{for(let o=0,n=e.length;o<n;++o)if(!0!==t(e[o],o))return!1;return!0},I=(e,t)=>{const o={};for(let n=0,r=e.length;n<r;n++){const r=e[n];o[String(r)]=t(r,n)}return o},F=(e,t)=>t>=0&&t<e.length?C.some(e[t]):C.none(),H=e=>F(e,0),$=e=>F(e,e.length-1),V=(e,t)=>{for(let o=0;o<e.length;o++){const n=t(e[o],o);if(n.isSome())return n}return C.none()},q=Object.keys,U=Object.hasOwnProperty,G=(e,t)=>{const o=q(e);for(let n=0,r=o.length;n<r;n++){const r=o[n];t(e[r],r)}},K=(e,t)=>Y(e,((e,o)=>({k:o,v:t(e,o)}))),Y=(e,t)=>{const o={};return G(e,((e,n)=>{const r=t(e,n);o[r.k]=r.v})),o},J=(e,t)=>{const o=[];return G(e,((e,n)=>{o.push(t(e,n))})),o},Q=e=>J(e,h),X=(e,t)=>U.call(e,t),Z="undefined"!=typeof window?window:Function("return this;")(),ee=(e,t)=>((e,t)=>{let o=null!=t?t:Z;for(let t=0;t<e.length&&null!=o;++t)o=o[e[t]];return o})(e.split("."),t),te=Object.getPrototypeOf,oe=e=>{const t=ee("ownerDocument.defaultView",e);return s(e)&&((e=>((e,t)=>{const o=((e,t)=>ee(e,t))(e,t);if(null==o)throw new Error(e+" not available on this browser");return o})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(te(e).constructor.name))},ne=e=>e.dom.nodeName.toLowerCase(),re=e=>e.dom.nodeType,se=e=>t=>re(t)===e,le=e=>8===re(e)||"#comment"===ne(e),ae=e=>ce(e)&&oe(e.dom),ce=se(1),ie=se(3),me=se(9),de=se(11),ue=e=>t=>ce(t)&&ne(t)===e,fe=(e,t,o)=>{if(!(r(o)||c(o)||u(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},ge=(e,t,o)=>{fe(e.dom,t,o)},he=(e,t)=>{const o=e.dom;G(t,((e,t)=>{fe(o,t,e)}))},pe=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},we=(e,t)=>C.from(pe(e,t)),be=(e,t)=>{e.dom.removeAttribute(t)},ve=e=>A(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),ye=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},xe={fromHtml:(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return ye(o.childNodes[0])},fromTag:(e,t)=>{const o=(t||document).createElement(e);return ye(o)},fromText:(e,t)=>{const o=(t||document).createTextNode(e);return ye(o)},fromDom:ye,fromPoint:(e,t,o)=>C.from(e.dom.elementFromPoint(t,o)).map(ye)},Ce=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},Se=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,Te=(e,t)=>{const o=void 0===t?document:t.dom;return Se(o)?C.none():C.from(o.querySelector(e)).map(xe.fromDom)},Re=(e,t)=>e.dom===t.dom,De=(e,t)=>{const o=e.dom,n=t.dom;return o!==n&&o.contains(n)},Oe=Ce,ke=e=>xe.fromDom(e.dom.ownerDocument),Ee=e=>me(e)?e:ke(e),Ne=e=>C.from(e.dom.parentNode).map(xe.fromDom),Be=e=>C.from(e.dom.parentElement).map(xe.fromDom),_e=(e,t)=>{const o=d(t)?t:y;let n=e.dom;const r=[];for(;null!==n.parentNode&&void 0!==n.parentNode;){const e=n.parentNode,t=xe.fromDom(e);if(r.push(t),!0===o(t))break;n=e}return r},ze=e=>C.from(e.dom.previousSibling).map(xe.fromDom),Ae=e=>C.from(e.dom.nextSibling).map(xe.fromDom),Le=e=>E(e.dom.childNodes,xe.fromDom),We=(e,t)=>{const o=e.dom.childNodes;return C.from(o[t]).map(xe.fromDom)},Me=(e,t)=>{Ne(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},je=(e,t)=>{Ae(e).fold((()=>{Ne(e).each((e=>{Ie(e,t)}))}),(e=>{Me(e,t)}))},Pe=(e,t)=>{const o=(e=>We(e,0))(e);o.fold((()=>{Ie(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},Ie=(e,t)=>{e.dom.appendChild(t.dom)},Fe=(e,t)=>{Me(e,t),Ie(t,e)},He=(e,t)=>{N(t,((o,n)=>{const r=0===n?e:t[n-1];je(r,o)}))},$e=(e,t)=>{N(t,(t=>{Ie(e,t)}))},Ve=e=>{e.dom.textContent="",N(Le(e),(e=>{qe(e)}))},qe=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Ue=e=>{const t=Le(e);t.length>0&&He(e,t),qe(e)},Ge=(e,t)=>xe.fromDom(e.dom.cloneNode(t)),Ke=e=>Ge(e,!1),Ye=e=>Ge(e,!0),Je=(e,t)=>{const o=xe.fromTag(t),n=ve(e);return he(o,n),o},Qe=["tfoot","thead","tbody","colgroup"],Xe=(e,t,o)=>({element:e,rowspan:t,colspan:o}),Ze=(e,t,o)=>({element:e,cells:t,section:o}),et=(e,t,o)=>({element:e,isNew:t,isLocked:o}),tt=(e,t,o,n)=>({element:e,cells:t,section:o,isNew:n}),ot=d(Element.prototype.attachShadow)&&d(Node.prototype.getRootNode),nt=g(ot),rt=ot?e=>xe.fromDom(e.dom.getRootNode()):Ee,st=e=>xe.fromDom(e.dom.host),lt=e=>{const t=ie(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return(e=>{const t=rt(e);return de(o=t)&&m(o.dom.host)?C.some(t):C.none();var o})(xe.fromDom(t)).fold((()=>o.body.contains(t)),(n=lt,r=st,e=>n(r(e))));var n,r},at=e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return xe.fromDom(t)},ct=(e,t)=>{let o=[];return N(Le(e),(e=>{t(e)&&(o=o.concat([e])),o=o.concat(ct(e,t))})),o},it=(e,t,o)=>((e,o,n)=>_(_e(e,n),(e=>Ce(e,t))))(e,0,o),mt=(e,t)=>((e,o)=>_(Le(e),(e=>Ce(e,t))))(e),dt=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Se(o)?[]:E(o.querySelectorAll(e),xe.fromDom)})(t,e);var ut=(e,t,o,n,r)=>e(o,n)?C.some(o):d(r)&&r(o)?C.none():t(o,n,r);const ft=(e,t,o)=>{let n=e.dom;const r=d(o)?o:y;for(;n.parentNode;){n=n.parentNode;const e=xe.fromDom(n);if(t(e))return C.some(e);if(r(e))break}return C.none()},gt=(e,t,o)=>ut(((e,t)=>t(e)),ft,e,t,o),ht=(e,t,o)=>ft(e,(e=>Ce(e,t)),o),pt=(e,t)=>((e,o)=>L(e.dom.childNodes,(e=>{return o=xe.fromDom(e),Ce(o,t);var o})).map(xe.fromDom))(e),wt=(e,t)=>Te(t,e),bt=(e,t,o)=>ut(((e,t)=>Ce(e,t)),ht,e,t,o),vt=(e,t,o=p)=>e.exists((e=>o(e,t))),yt=e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t},xt=(e,t)=>e?C.some(t):C.none(),Ct=(e,t,o)=>""===t||e.length>=t.length&&e.substr(o,o+t.length)===t,St=(e,t,o=0,n)=>{const r=e.indexOf(t,o);return-1!==r&&(!!i(n)||r+t.length<=n)},Tt=(e,t)=>Ct(e,t,0),Rt=(e,t)=>Ct(e,t,e.length-t.length),Dt=(e=>t=>t.replace(e,""))(/^\s+|\s+$/g),Ot=e=>e.length>0,kt=e=>void 0!==e.style&&d(e.style.getPropertyValue),Et=(e,t,o)=>{if(!r(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);kt(e)&&e.style.setProperty(t,o)},Nt=(e,t,o)=>{const n=e.dom;Et(n,t,o)},Bt=(e,t)=>{const o=e.dom;G(t,((e,t)=>{Et(o,t,e)}))},_t=(e,t)=>{const o=e.dom,n=window.getComputedStyle(o).getPropertyValue(t);return""!==n||lt(e)?n:zt(o,t)},zt=(e,t)=>kt(e)?e.style.getPropertyValue(t):"",At=(e,t)=>{const o=e.dom,n=zt(o,t);return C.from(n).filter((e=>e.length>0))},Lt=(e,t)=>{((e,t)=>{kt(e)&&e.style.removeProperty(t)})(e.dom,t),vt(we(e,"style").map(Dt),"")&&be(e,"style")},Wt=(e,t,o=0)=>we(e,t).map((e=>parseInt(e,10))).getOr(o),Mt=(e,t)=>Wt(e,t,1),jt=e=>ue("col")(e)?Wt(e,"span",1)>1:Mt(e,"colspan")>1,Pt=e=>Mt(e,"rowspan")>1,It=(e,t)=>parseInt(_t(e,t),10),Ft=g(10),Ht=g(10),$t=(e,t)=>Vt(e,t,x),Vt=(e,t,o)=>j(Le(e),(e=>Ce(e,t)?o(e)?[e]:[]:Vt(e,t,o))),qt=(e,t)=>((e,t,o=y)=>o(t)?C.none():D(e,ne(t))?C.some(t):ht(t,e.join(","),(e=>Ce(e,"table")||o(e))))(["td","th"],e,t),Ut=e=>$t(e,"th,td"),Gt=e=>Ce(e,"colgroup")?mt(e,"col"):j(Jt(e),(e=>mt(e,"col"))),Kt=(e,t)=>bt(e,"table",t),Yt=e=>$t(e,"tr"),Jt=e=>Kt(e).fold(g([]),(e=>mt(e,"colgroup"))),Qt=(e,t)=>E(e,(e=>{if("colgroup"===ne(e)){const t=E(Gt(e),(e=>{const t=Wt(e,"span",1);return Xe(e,1,t)}));return Ze(e,t,"colgroup")}{const o=E(Ut(e),(e=>{const t=Wt(e,"rowspan",1),o=Wt(e,"colspan",1);return Xe(e,t,o)}));return Ze(e,o,t(e))}})),Xt=e=>Ne(e).map((e=>{const t=ne(e);return(e=>D(Qe,e))(t)?t:"tbody"})).getOr("tbody"),Zt=e=>{const t=Yt(e),o=[...Jt(e),...t];return Qt(o,Xt)},eo=e=>{let t,o=!1;return(...n)=>(o||(o=!0,t=e.apply(null,n)),t)},to=()=>oo(0,0),oo=(e,t)=>({major:e,minor:t}),no={nu:oo,detect:(e,t)=>{const o=String(t).toLowerCase();return 0===e.length?to():((e,t)=>{const o=((e,t)=>{for(let o=0;o<e.length;o++){const n=e[o];if(n.test(t))return n}})(e,t);if(!o)return{major:0,minor:0};const n=e=>Number(t.replace(o,"$"+e));return oo(n(1),n(2))})(e,o)},unknown:to},ro=(e,t)=>{const o=String(t).toLowerCase();return L(e,(e=>e.search(o)))},so=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,lo=e=>t=>St(t,e),ao=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>St(e,"edge/")&&St(e,"chrome")&&St(e,"safari")&&St(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,so],search:e=>St(e,"chrome")&&!St(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>St(e,"msie")||St(e,"trident")},{name:"Opera",versionRegexes:[so,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:lo("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:lo("firefox")},{name:"Safari",versionRegexes:[so,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(St(e,"safari")||St(e,"mobile/"))&&St(e,"applewebkit")}],co=[{name:"Windows",search:lo("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>St(e,"iphone")||St(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:lo("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:lo("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:lo("linux"),versionRegexes:[]},{name:"Solaris",search:lo("sunos"),versionRegexes:[]},{name:"FreeBSD",search:lo("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:lo("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],io={browsers:g(ao),oses:g(co)},mo="Edge",uo="Chromium",fo="Opera",go="Firefox",ho="Safari",po=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isEdge:n(mo),isChromium:n(uo),isIE:n("IE"),isOpera:n(fo),isFirefox:n(go),isSafari:n(ho)}},wo=()=>po({current:void 0,version:no.unknown()}),bo=po,vo=(g(mo),g(uo),g("IE"),g(fo),g(go),g(ho),"Windows"),yo="Android",xo="Linux",Co="macOS",So="Solaris",To="FreeBSD",Ro="ChromeOS",Do=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isWindows:n(vo),isiOS:n("iOS"),isAndroid:n(yo),isMacOS:n(Co),isLinux:n(xo),isSolaris:n(So),isFreeBSD:n(To),isChromeOS:n(Ro)}},Oo=()=>Do({current:void 0,version:no.unknown()}),ko=Do,Eo=(g(vo),g("iOS"),g(yo),g(xo),g(Co),g(So),g(To),g(Ro),e=>window.matchMedia(e).matches);let No=eo((()=>((e,t,o)=>{const n=io.browsers(),r=io.oses(),s=t.bind((e=>((e,t)=>V(t.brands,(t=>{const o=t.brand.toLowerCase();return L(e,(e=>{var t;return o===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:no.nu(parseInt(t.version,10),0)})))})))(n,e))).orThunk((()=>((e,t)=>ro(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(n,e))).fold(wo,bo),l=((e,t)=>ro(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(r,e).fold(Oo,ko),a=((e,t,o,n)=>{const r=e.isiOS()&&!0===/ipad/i.test(o),s=e.isiOS()&&!r,l=e.isiOS()||e.isAndroid(),a=l||n("(pointer:coarse)"),c=r||!s&&l&&n("(min-device-width:768px)"),i=s||l&&!c,m=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(o),d=!i&&!c&&!m;return{isiPad:g(r),isiPhone:g(s),isTablet:g(c),isPhone:g(i),isTouch:g(a),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:g(m),isDesktop:g(d)}})(l,s,e,o);return{browser:s,os:l,deviceType:a}})(navigator.userAgent,C.from(navigator.userAgentData),Eo)));const Bo=()=>No(),_o=(e,t)=>{const o=o=>{const n=t(o);if(n<=0||null===n){const t=_t(o,e);return parseFloat(t)||0}return n},n=(e,t)=>A(t,((t,o)=>{const n=_t(e,o),r=void 0===n?0:parseInt(n,10);return isNaN(r)?t:t+r}),0);return{set:(t,o)=>{if(!u(o)&&!o.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+o);const n=t.dom;kt(n)&&(n.style[e]=o+"px")},get:o,getOuter:o,aggregate:n,max:(e,t,o)=>{const r=n(e,o);return t>r?t-r:0}}},zo=(e,t,o)=>((e,t)=>(e=>{const t=parseFloat(e);return isNaN(t)?C.none():C.some(t)})(e).getOr(t))(_t(e,t),o),Ao=_o("width",(e=>e.dom.offsetWidth)),Lo=e=>Ao.get(e),Wo=e=>Ao.getOuter(e),Mo=e=>((e,t)=>{const o=e.dom,n=o.getBoundingClientRect().width||o.offsetWidth;return"border-box"===t?n:((e,t,o,n)=>t-zo(e,`padding-${o}`,0)-zo(e,`padding-${n}`,0)-zo(e,`border-${o}-width`,0)-zo(e,`border-${n}-width`,0))(e,n,"left","right")})(e,"content-box"),jo=(e,t,o)=>{const n=e.cells,r=n.slice(0,t),s=n.slice(t),l=r.concat(o).concat(s);return Fo(e,l)},Po=(e,t,o)=>jo(e,t,[o]),Io=(e,t,o)=>{e.cells[t]=o},Fo=(e,t)=>tt(e.element,t,e.section,e.isNew),Ho=(e,t)=>e.cells[t],$o=(e,t)=>Ho(e,t).element,Vo=e=>e.cells.length,qo=e=>{const t=B(e,(e=>"colgroup"===e.section));return{rows:t.fail,cols:t.pass}},Uo=(e,t,o)=>{const n=E(e.cells,o);return tt(t(e.element),n,e.section,!0)},Go="data-snooker-locked-cols",Ko=e=>we(e,Go).bind((e=>C.from(e.match(/\d+/g)))).map((e=>I(e,x))),Yo=e=>{const t=A(qo(e).rows,((e,t)=>(N(t.cells,((t,o)=>{t.isLocked&&(e[o]=!0)})),e)),{}),o=J(t,((e,t)=>parseInt(t,10)));return((e,t)=>{const o=S.call(e,0);return o.sort(void 0),o})(o)},Jo=(e,t)=>e+","+t,Qo=(e,t)=>{const o=j(e.all,(e=>e.cells));return _(o,t)},Xo=e=>{const t={},o=[],n=H(e).map((e=>e.element)).bind(Kt).bind(Ko).getOr({});let r=0,s=0,l=0;const{pass:a,fail:c}=B(e,(e=>"colgroup"===e.section));N(c,(e=>{const a=[];N(e.cells,(e=>{let o=0;for(;void 0!==t[Jo(l,o)];)o++;const r=((e,t)=>X(e,t)&&void 0!==e[t]&&null!==e[t])(n,o.toString()),c=((e,t,o,n,r,s)=>({element:e,rowspan:t,colspan:o,row:n,column:r,isLocked:s}))(e.element,e.rowspan,e.colspan,l,o,r);for(let n=0;n<e.colspan;n++)for(let r=0;r<e.rowspan;r++){const e=o+n,a=Jo(l+r,e);t[a]=c,s=Math.max(s,e+1)}a.push(c)})),r++,o.push(Ze(e.element,a,e.section)),l++}));const{columns:i,colgroups:m}=$(a).map((e=>{const t=(e=>{const t={};let o=0;return N(e.cells,(e=>{const n=e.colspan;k(n,(r=>{const s=o+r;t[s]=((e,t,o)=>({element:e,colspan:t,column:o}))(e.element,n,s)})),o+=n})),t})(e),o=((e,t)=>({element:e,columns:t}))(e.element,Q(t));return{colgroups:[o],columns:t}})).getOrThunk((()=>({colgroups:[],columns:{}}))),d=((e,t)=>({rows:e,columns:t}))(r,s);return{grid:d,access:t,all:o,columns:i,colgroups:m}},Zo=e=>{const t=Zt(e);return Xo(t)},en=Xo,tn=(e,t,o)=>C.from(e.access[Jo(t,o)]),on=(e,t,o)=>{const n=Qo(e,(e=>o(t,e.element)));return n.length>0?C.some(n[0]):C.none()},nn=Qo,rn=e=>j(e.all,(e=>e.cells)),sn=e=>Q(e.columns),ln=e=>q(e.columns).length>0,an=(e,t)=>C.from(e.columns[t]),cn=(e,t=x)=>{const o=e.grid,n=k(o.columns,h),r=k(o.rows,h);return E(n,(o=>mn((()=>j(r,(t=>tn(e,t,o).filter((e=>e.column===o)).toArray()))),(e=>1===e.colspan&&t(e.element)),(()=>tn(e,0,o)))))},mn=(e,t,o)=>{const n=e();return L(n,t).orThunk((()=>C.from(n[0]).orThunk(o))).map((e=>e.element))},dn=e=>{const t=e.grid,o=k(t.rows,h),n=k(t.columns,h);return E(o,(t=>mn((()=>j(n,(o=>tn(e,t,o).filter((e=>e.row===t)).fold(g([]),(e=>[e]))))),(e=>1===e.rowspan),(()=>tn(e,t,0)))))},un=(e,t)=>o=>"rtl"===fn(o)?t:e,fn=e=>"rtl"===_t(e,"direction")?"rtl":"ltr",gn=_o("height",(e=>{const t=e.dom;return lt(e)?t.getBoundingClientRect().height:t.offsetHeight})),hn=e=>gn.get(e),pn=e=>gn.getOuter(e),wn=(e,t)=>({left:e,top:t,translate:(o,n)=>wn(e+o,t+n)}),bn=wn,vn=(e,t)=>void 0!==e?e:void 0!==t?t:0,yn=e=>{const t=e.dom.ownerDocument,o=t.body,n=t.defaultView,r=t.documentElement;if(o===e.dom)return bn(o.offsetLeft,o.offsetTop);const s=vn(null==n?void 0:n.pageYOffset,r.scrollTop),l=vn(null==n?void 0:n.pageXOffset,r.scrollLeft),a=vn(r.clientTop,o.clientTop),c=vn(r.clientLeft,o.clientLeft);return xn(e).translate(l-c,s-a)},xn=e=>{const t=e.dom,o=t.ownerDocument.body;return o===t?bn(o.offsetLeft,o.offsetTop):lt(e)?(e=>{const t=e.getBoundingClientRect();return bn(t.left,t.top)})(t):bn(0,0)},Cn=(e,t)=>({row:e,y:t}),Sn=(e,t)=>({col:e,x:t}),Tn=e=>yn(e).left+Wo(e),Rn=e=>yn(e).left,Dn=(e,t)=>Sn(e,Rn(t)),On=(e,t)=>Sn(e,Tn(t)),kn=e=>yn(e).top,En=(e,t)=>Cn(e,kn(t)),Nn=(e,t)=>Cn(e,kn(t)+pn(t)),Bn=(e,t,o)=>{if(0===o.length)return[];const n=E(o.slice(1),((t,o)=>t.map((t=>e(o,t))))),r=o[o.length-1].map((e=>t(o.length-1,e)));return n.concat([r])},_n={delta:h,positions:e=>Bn(En,Nn,e),edge:kn},zn=un({delta:h,edge:Rn,positions:e=>Bn(Dn,On,e)},{delta:e=>-e,edge:Tn,positions:e=>Bn(On,Dn,e)}),An={delta:(e,t)=>zn(t).delta(e,t),positions:(e,t)=>zn(t).positions(e,t),edge:e=>zn(e).edge(e)},Ln={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},Wn=(()=>{const e="[0-9]+",t="[eE][+-]?"+e,o=e=>`(?:${e})?`,n=["Infinity",e+"\\."+o(e)+o(t),"\\."+e+o(t),e+o(t)].join("|");return new RegExp(`^([+-]?(?:${n}))(.*)$`)})(),Mn=/(\d+(\.\d+)?)%/,jn=/(\d+(\.\d+)?)px|em/,Pn=ue("col"),In=(e,t,o)=>{const n=Be(e).getOrThunk((()=>at(ke(e))));return t(e)/o(n)*100},Fn=(e,t)=>{Nt(e,"width",t+"px")},Hn=(e,t)=>{Nt(e,"width",t+"%")},$n=(e,t)=>{Nt(e,"height",t+"px")},Vn=e=>{const t=(e=>{return zo(t=e,"height",t.dom.offsetHeight)+"px";var t})(e);return t?((e,t,o,n)=>{const r=parseFloat(e);return Rt(e,"%")&&"table"!==ne(t)?((e,t,o,n)=>{const r=Kt(e).map((e=>{const n=o(e);return Math.floor(t/100*n)})).getOr(t);return n(e,r),r})(t,r,o,n):r})(t,e,hn,$n):hn(e)},qn=(e,t)=>At(e,t).orThunk((()=>we(e,t).map((e=>e+"px")))),Un=e=>qn(e,"width"),Gn=e=>In(e,Lo,Mo),Kn=e=>{return Pn(e)?Lo(e):zo(t=e,"width",t.dom.offsetWidth);var t},Yn=e=>((e,t,o)=>o(e)/Mt(e,"rowspan"))(e,0,Vn),Jn=(e,t,o)=>{Nt(e,"width",t+o)},Qn=e=>In(e,Lo,Mo)+"%",Xn=g(Mn),Zn=ue("col"),er=e=>Un(e).getOrThunk((()=>Kn(e)+"px")),tr=e=>{return(t=e,qn(t,"height")).getOrThunk((()=>Yn(e)+"px"));var t},or=(e,t,o,n,r,s)=>e.filter(n).fold((()=>s(((e,t)=>{if(t<0||t>=e.length-1)return C.none();const o=e[t].fold((()=>{const o=(e=>{const t=S.call(e,0);return t.reverse(),t})(e.slice(0,t));return V(o,((e,t)=>e.map((e=>({value:e,delta:t+1})))))}),(e=>C.some({value:e,delta:0}))),n=e[t+1].fold((()=>{const o=e.slice(t+1);return V(o,((e,t)=>e.map((e=>({value:e,delta:t+1})))))}),(e=>C.some({value:e,delta:1})));return o.bind((e=>n.map((t=>{const o=t.delta+e.delta;return Math.abs(t.value-e.value)/o}))))})(o,t))),(e=>r(e))),nr=(e,t,o,n)=>{const r=cn(e),s=ln(e)?(e=>E(sn(e),(e=>C.from(e.element))))(e):r,l=[C.some(An.edge(t))].concat(E(An.positions(r,t),(e=>e.map((e=>e.x))))),a=b(jt);return E(s,((e,t)=>or(e,t,l,a,(e=>{if((e=>{const t=Bo().browser,o=t.isChromium()||t.isFirefox();return!Zn(e)||o})(e))return o(e);{const e=null!=(s=r[t])?h(s):C.none();return or(e,t,l,a,(e=>n(C.some(Lo(e)))),n)}var s}),n)))},rr=e=>e.map((e=>e+"px")).getOr(""),sr=(e,t,o)=>nr(e,t,Kn,(e=>e.getOrThunk(o.minCellWidth))),lr=(e,t,o,n,r)=>{const s=dn(e),l=[C.some(o.edge(t))].concat(E(o.positions(s,t),(e=>e.map((e=>e.y)))));return E(s,((e,t)=>or(e,t,l,b(Pt),n,r)))},ar=(e,t)=>()=>lt(e)?t(e):parseFloat(At(e,"width").getOr("0")),cr=e=>{const t=ar(e,(e=>parseFloat(Qn(e)))),o=ar(e,Lo);return{width:t,pixelWidth:o,getWidths:(t,o)=>((e,t,o)=>nr(e,t,Gn,(e=>e.fold((()=>o.minCellWidth()),(e=>e/o.pixelWidth()*100)))))(t,e,o),getCellDelta:e=>e/o()*100,singleColumnWidth:(e,t)=>[100-e],minCellWidth:()=>Ft()/o()*100,setElementWidth:Hn,adjustTableWidth:o=>{const n=t();Hn(e,n+o/100*n)},isRelative:!0,label:"percent"}},ir=e=>{const t=ar(e,Lo);return{width:t,pixelWidth:t,getWidths:(t,o)=>sr(t,e,o),getCellDelta:h,singleColumnWidth:(e,t)=>[Math.max(Ft(),e+t)-e],minCellWidth:Ft,setElementWidth:Fn,adjustTableWidth:o=>{const n=t()+o;Fn(e,n)},isRelative:!1,label:"pixel"}},mr=e=>Un(e).fold((()=>(e=>{const t=ar(e,Lo),o=g(0);return{width:t,pixelWidth:t,getWidths:(t,o)=>sr(t,e,o),getCellDelta:o,singleColumnWidth:g([0]),minCellWidth:o,setElementWidth:f,adjustTableWidth:f,isRelative:!0,label:"none"}})(e)),(t=>((e,t)=>null!==Xn().exec(t)?cr(e):ir(e))(e,t))),dr=ir,ur=cr,fr=(e,t,o)=>{const n=e[o].element,r=xe.fromTag("td");Ie(r,xe.fromTag("br")),(t?Ie:Pe)(n,r)},gr=((e,t)=>{const o=t=>e(t)?C.from(t.dom.nodeValue):C.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(ie),hr=e=>gr.get(e),pr=e=>gr.getOption(e),wr=(e,t)=>gr.set(e,t),br=e=>"img"===ne(e)?1:pr(e).fold((()=>Le(e).length),(e=>e.length)),vr=["img","br"],yr=e=>pr(e).filter((e=>0!==e.trim().length||e.indexOf("\xa0")>-1)).isSome()||D(vr,ne(e))||(e=>ae(e)&&"false"===pe(e,"contenteditable"))(e),xr=e=>((e,t)=>{const o=e=>{for(let n=0;n<e.childNodes.length;n++){const r=xe.fromDom(e.childNodes[n]);if(t(r))return C.some(r);const s=o(e.childNodes[n]);if(s.isSome())return s}return C.none()};return o(e.dom)})(e,yr),Cr=e=>Sr(e,yr),Sr=(e,t)=>{const o=e=>{const n=Le(e);for(let e=n.length-1;e>=0;e--){const r=n[e];if(t(r))return C.some(r);const s=o(r);if(s.isSome())return s}return C.none()};return o(e)},Tr={scope:["row","col"]},Rr=e=>()=>{const t=xe.fromTag("td",e.dom);return Ie(t,xe.fromTag("br",e.dom)),t},Dr=e=>()=>xe.fromTag("col",e.dom),Or=e=>()=>xe.fromTag("colgroup",e.dom),kr=e=>()=>xe.fromTag("tr",e.dom),Er=(e,t,o)=>{const n=((e,t)=>{const o=Je(e,t),n=Le(Ye(e));return $e(o,n),o})(e,t);return G(o,((e,t)=>{null===e?be(n,t):ge(n,t,e)})),n},Nr=e=>e,Br=(e,t,o)=>{const n=(e,t)=>{((e,t)=>{const o=e.dom,n=t.dom;kt(o)&&kt(n)&&(n.style.cssText=o.style.cssText)})(e.element,t),Lt(t,"height"),1!==e.colspan&&Lt(t,"width")};return{col:o=>{const r=xe.fromTag(ne(o.element),t.dom);return n(o,r),e(o.element,r),r},colgroup:Or(t),row:kr(t),cell:r=>{const s=xe.fromTag(ne(r.element),t.dom),l=o.getOr(["strong","em","b","i","span","font","h1","h2","h3","h4","h5","h6","p","div"]),a=l.length>0?((e,t,o)=>xr(e).map((n=>{const r=o.join(","),s=it(n,r,(t=>Re(t,e)));return z(s,((e,t)=>{const o=Ke(t);return Ie(e,o),o}),t)})).getOr(t))(r.element,s,l):s;return Ie(a,xe.fromTag("br")),n(r,s),((e,t)=>{G(Tr,((o,n)=>we(e,n).filter((e=>D(o,e))).each((e=>ge(t,n,e)))))})(r.element,s),e(r.element,s),s},replace:Er,colGap:Dr(t),gap:Rr(t)}},_r=e=>({col:Dr(e),colgroup:Or(e),row:kr(e),cell:Rr(e),replace:Nr,colGap:Dr(e),gap:Rr(e)}),zr=e=>t=>t.options.get(e),Ar="100%",Lr=e=>{var t;const o=e.dom,n=null!==(t=o.getParent(e.selection.getStart(),o.isBlock))&&void 0!==t?t:e.getBody();return Mo(xe.fromDom(n))+"px"},Wr=e=>C.from(e.options.get("table_clone_elements")),Mr=zr("table_header_type"),jr=zr("table_column_resizing"),Pr=e=>"preservetable"===jr(e),Ir=e=>"resizetable"===jr(e),Fr=zr("table_sizing_mode"),Hr=e=>"relative"===Fr(e),$r=e=>"fixed"===Fr(e),Vr=e=>"responsive"===Fr(e),qr=zr("table_resize_bars"),Ur=zr("table_style_by_css"),Gr=zr("table_merge_content_on_paste"),Kr=e=>{const t=e.options,o=t.get("table_default_attributes");return t.isSet("table_default_attributes")?o:((e,t)=>Vr(e)||Ur(e)?t:$r(e)?{...t,width:Lr(e)}:{...t,width:Ar})(e,o)},Yr=zr("table_use_colgroups"),Jr=e=>bt(e,"[contenteditable]"),Qr=(e,t=!1)=>lt(e)?e.dom.isContentEditable:Jr(e).fold(g(t),(e=>"true"===Xr(e))),Xr=e=>e.dom.contentEditable,Zr=e=>xe.fromDom(e.getBody()),es=e=>t=>Re(t,Zr(e)),ts=e=>{be(e,"data-mce-style");const t=e=>be(e,"data-mce-style");N(Ut(e),t),N(Gt(e),t),N(Yt(e),t)},os=e=>xe.fromDom(e.selection.getStart()),ns=e=>e.getBoundingClientRect().width,rs=e=>e.getBoundingClientRect().height,ss=e=>gt(e,ue("table")).exists(Qr),ls=(e,t)=>{const o=t.column,n=t.column+t.colspan-1,r=t.row,s=t.row+t.rowspan-1;return o<=e.finishCol&&n>=e.startCol&&r<=e.finishRow&&s>=e.startRow},as=(e,t)=>t.column>=e.startCol&&t.column+t.colspan-1<=e.finishCol&&t.row>=e.startRow&&t.row+t.rowspan-1<=e.finishRow,cs=(e,t,o)=>{const n=on(e,t,Re),r=on(e,o,Re);return n.bind((e=>r.map((t=>{return o=e,n=t,{startRow:Math.min(o.row,n.row),startCol:Math.min(o.column,n.column),finishRow:Math.max(o.row+o.rowspan-1,n.row+n.rowspan-1),finishCol:Math.max(o.column+o.colspan-1,n.column+n.colspan-1)};var o,n}))))},is=(e,t,o)=>cs(e,t,o).map((t=>{const o=nn(e,w(ls,t));return E(o,(e=>e.element))})),ms=(e,t)=>on(e,t,((e,t)=>De(t,e))).map((e=>e.element)),ds=(e,t,o)=>{const n=fs(e);return is(n,t,o)},us=(e,t,o,n,r)=>{const s=fs(e),l=Re(e,o)?C.some(t):ms(s,t),a=Re(e,r)?C.some(n):ms(s,n);return l.bind((e=>a.bind((t=>is(s,e,t)))))},fs=Zo;var gs=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],hs=()=>({up:g({selector:ht,closest:bt,predicate:ft,all:_e}),down:g({selector:dt,predicate:ct}),styles:g({get:_t,getRaw:At,set:Nt,remove:Lt}),attrs:g({get:pe,set:ge,remove:be,copyTo:(e,t)=>{const o=ve(e);he(t,o)}}),insert:g({before:Me,after:je,afterAll:He,append:Ie,appendAll:$e,prepend:Pe,wrap:Fe}),remove:g({unwrap:Ue,remove:qe}),create:g({nu:xe.fromTag,clone:e=>xe.fromDom(e.dom.cloneNode(!1)),text:xe.fromText}),query:g({comparePosition:(e,t)=>e.dom.compareDocumentPosition(t.dom),prevSibling:ze,nextSibling:Ae}),property:g({children:Le,name:ne,parent:Ne,document:e=>Ee(e).dom,isText:ie,isComment:le,isElement:ce,isSpecial:e=>{const t=ne(e);return D(["script","noscript","iframe","noframes","noembed","title","style","textarea","xmp"],t)},getLanguage:e=>ce(e)?we(e,"lang"):C.none(),getText:hr,setText:wr,isBoundary:e=>!!ce(e)&&("body"===ne(e)||D(gs,ne(e))),isEmptyTag:e=>!!ce(e)&&D(["br","img","hr","input"],ne(e)),isNonEditable:e=>ce(e)&&"false"===pe(e,"contenteditable")}),eq:Re,is:Oe});const ps=(e,t,o,n)=>{const r=t(e,o);return z(n,((o,n)=>{const r=t(e,n);return ws(e,o,r)}),r)},ws=(e,t,o)=>t.bind((t=>o.filter(w(e.eq,t)))),bs=hs(),vs=(e,t)=>((e,t,o)=>o.length>0?((e,t,o,n)=>n(e,t,o[0],o.slice(1)))(e,t,o,ps):C.none())(bs,((t,o)=>e(o)),t),ys=e=>ht(e,"table"),xs=(e,t,o)=>{const n=e=>t=>void 0!==o&&o(t)||Re(t,e);return Re(e,t)?C.some({boxes:C.some([e]),start:e,finish:t}):ys(e).bind((r=>ys(t).bind((s=>{if(Re(r,s))return C.some({boxes:ds(r,e,t),start:e,finish:t});if(De(r,s)){const o=it(t,"td,th",n(r)),l=o.length>0?o[o.length-1]:t;return C.some({boxes:us(r,e,r,t,s),start:e,finish:l})}if(De(s,r)){const o=it(e,"td,th",n(s)),l=o.length>0?o[o.length-1]:e;return C.some({boxes:us(s,e,r,t,s),start:e,finish:l})}return((e,t,o)=>((e,t,o,n=y)=>{const r=[t].concat(e.up().all(t)),s=[o].concat(e.up().all(o)),l=e=>W(e,n).fold((()=>e),(t=>e.slice(0,t+1))),a=l(r),c=l(s),i=L(a,(t=>O(c,((e,t)=>w(e.eq,t))(e,t))));return{firstpath:a,secondpath:c,shared:i}})(bs,e,t,void 0))(e,t).shared.bind((l=>bt(l,"table",o).bind((o=>{const l=it(t,"td,th",n(o)),a=l.length>0?l[l.length-1]:t,c=it(e,"td,th",n(o)),i=c.length>0?c[c.length-1]:e;return C.some({boxes:us(o,e,r,t,s),start:i,finish:a})}))))}))))},Cs=(e,t)=>{const o=dt(e,t);return o.length>0?C.some(o):C.none()},Ss=(e,t,o)=>wt(e,t).bind((t=>wt(e,o).bind((e=>vs(ys,[t,e]).map((o=>({first:t,last:e,table:o}))))))),Ts=(e,t,o,n,r)=>((e,t)=>L(e,(e=>Ce(e,t))))(e,r).bind((e=>((e,t,o)=>Kt(e).bind((n=>((e,t,o,n)=>on(e,t,Re).bind((t=>{const r=o>0?t.row+t.rowspan-1:t.row,s=n>0?t.column+t.colspan-1:t.column;return tn(e,r+o,s+n).map((e=>e.element))})))(fs(n),e,t,o))))(e,t,o).bind((e=>((e,t)=>ht(e,"table").bind((o=>wt(o,t).bind((t=>xs(t,e).bind((e=>e.boxes.map((t=>({boxes:t,start:e.start,finish:e.finish}))))))))))(e,n))))),Rs=(e,t)=>Cs(e,t),Ds=(e,t,o)=>Ss(e,t,o).bind((t=>{const o=t=>Re(e,t),n="thead,tfoot,tbody,table",r=ht(t.first,n,o),s=ht(t.last,n,o);return r.bind((e=>s.bind((o=>Re(e,o)?((e,t,o)=>((e,t,o)=>cs(e,t,o).bind((t=>((e,t)=>{let o=!0;const n=w(as,t);for(let r=t.startRow;r<=t.finishRow;r++)for(let s=t.startCol;s<=t.finishCol;s++)o=o&&tn(e,r,s).exists(n);return o?C.some(t):C.none()})(e,t))))(fs(e),t,o))(t.table,t.first,t.last):C.none()))))})),Os=h,ks=e=>{const t=(e,t)=>we(e,t).exists((e=>parseInt(e,10)>1));return e.length>0&&P(e,(e=>t(e,"rowspan")||t(e,"colspan")))?C.some(e):C.none()},Es=(e,t,o)=>t.length<=1?C.none():Ds(e,o.firstSelectedSelector,o.lastSelectedSelector).map((e=>({bounds:e,cells:t}))),Ns="data-mce-selected",Bs="data-mce-first-selected",_s="data-mce-last-selected",zs="["+Ns+"]",As={selected:Ns,selectedSelector:"td["+Ns+"],th["+Ns+"]",firstSelected:Bs,firstSelectedSelector:"td["+Bs+"],th["+Bs+"]",lastSelected:_s,lastSelectedSelector:"td["+_s+"],th["+_s+"]"},Ls=(e,t,o)=>({element:o,mergable:Es(t,e,As),unmergable:ks(e),selection:Os(e)}),Ws=e=>(t,o)=>{const n=ne(t),r="col"===n||"colgroup"===n?Kt(s=t).bind((e=>Rs(e,As.firstSelectedSelector))).fold(g(s),(e=>e[0])):t;var s;return bt(r,e,o)},Ms=Ws("th,td,caption"),js=Ws("th,td"),Ps=e=>{return t=e.model.table.getSelectedCells(),E(t,xe.fromDom);var t},Is=(e,t)=>{e.on("BeforeGetContent",(t=>{const o=o=>{t.preventDefault(),(e=>Kt(e[0]).map((e=>{const t=((e,t)=>{const o=e=>Ce(e.element,t),n=Ye(e),r=Zt(n),s=mr(e),l=en(r),a=((e,t)=>{const o=e.grid.columns;let n=e.grid.rows,r=o,s=0,l=0;const a=[],c=[];return G(e.access,(e=>{if(a.push(e),t(e)){c.push(e);const t=e.row,o=t+e.rowspan-1,a=e.column,i=a+e.colspan-1;t<n?n=t:o>s&&(s=o),a<r?r=a:i>l&&(l=i)}})),((e,t,o,n,r,s)=>({minRow:e,minCol:t,maxRow:o,maxCol:n,allCells:r,selectedCells:s}))(n,r,s,l,a,c)})(l,o),c="th:not("+t+"),td:not("+t+")",i=Vt(n,"th,td",(e=>Ce(e,c)));N(i,qe),((e,t,o,n)=>{const r=_(e,(e=>"colgroup"!==e.section)),s=t.grid.columns,l=t.grid.rows;for(let e=0;e<l;e++){let l=!1;for(let a=0;a<s;a++)e<o.minRow||e>o.maxRow||a<o.minCol||a>o.maxCol||(tn(t,e,a).filter(n).isNone()?fr(r,l,e):l=!0)}})(r,l,a,o);const m=((e,t,o,n)=>{if(0===n.minCol&&t.grid.columns===n.maxCol+1)return 0;const r=sr(t,e,o),s=A(r,((e,t)=>e+t),0),l=A(r.slice(n.minCol,n.maxCol+1),((e,t)=>e+t),0),a=l/s*o.pixelWidth()-o.pixelWidth();return o.getCellDelta(a)})(e,Zo(e),s,a);return((e,t,o,n)=>{G(o.columns,(e=>{(e.column<t.minCol||e.column>t.maxCol)&&qe(e.element)}));const r=_($t(e,"tr"),(e=>0===e.dom.childElementCount));N(r,qe),t.minCol!==t.maxCol&&t.minRow!==t.maxRow||N($t(e,"th,td"),(e=>{be(e,"rowspan"),be(e,"colspan")})),be(e,Go),be(e,"data-snooker-col-series"),mr(e).adjustTableWidth(n)})(n,a,l,m),n})(e,zs);return ts(t),[t]})))(o).each((o=>{t.content="text"===t.format?(e=>E(e,(e=>e.dom.innerText)).join(""))(o):((e,t)=>E(t,(t=>e.selection.serializer.serialize(t.dom,{}))).join(""))(e,o)}))};if(!0===t.selection){const t=(e=>_(Ps(e),(e=>Ce(e,As.selectedSelector))))(e);t.length>=1&&o(t)}})),e.on("BeforeSetContent",(o=>{if(!0===o.selection&&!0===o.paste){const n=Ps(e);H(n).each((n=>{Kt(n).each((r=>{const s=_(((e,t)=>{const o=document.createElement("div");return o.innerHTML=e,Le(xe.fromDom(o))})(o.content),(e=>"meta"!==ne(e))),l=ue("table");if(Gr(e)&&1===s.length&&l(s[0])){o.preventDefault();const l=xe.fromDom(e.getDoc()),a=_r(l),c=((e,t,o)=>({element:e,clipboard:t,generators:o}))(n,s[0],a);t.pasteCells(r,c).each((()=>{e.focus()}))}}))}))}}))},Fs=(e,t)=>({element:e,offset:t}),Hs=(e,t,o)=>e.property().isText(t)&&0===e.property().getText(t).trim().length||e.property().isComment(t)?o(t).bind((t=>Hs(e,t,o).orThunk((()=>C.some(t))))):C.none(),$s=(e,t)=>e.property().isText(t)?e.property().getText(t).length:e.property().children(t).length,Vs=(e,t)=>{const o=Hs(e,t,e.query().prevSibling).getOr(t);if(e.property().isText(o))return Fs(o,$s(e,o));const n=e.property().children(o);return n.length>0?Vs(e,n[n.length-1]):Fs(o,$s(e,o))},qs=Vs,Us=hs(),Gs=(e,t)=>{if(!jt(e)){const o=(e=>Un(e).bind((e=>{return t=e,o=["fixed","relative","empty"],C.from(Wn.exec(t)).bind((e=>{const t=Number(e[1]),n=e[2];return((e,t)=>O(t,(t=>O(Ln[t],(t=>e===t)))))(n,o)?C.some({value:t,unit:n}):C.none()}));var t,o})))(e);o.each((o=>{const n=o.value/2;Jn(e,n,o.unit),Jn(t,n,o.unit)}))}},Ks=e=>E(e,g(0)),Ys=(e,t,o,n,r)=>r(e.slice(0,t)).concat(n).concat(r(e.slice(o))),Js=e=>(t,o,n,r)=>{if(e(n)){const e=Math.max(r,t[o]-Math.abs(n)),s=Math.abs(e-t[o]);return n>=0?s:-s}return n},Qs=Js((e=>e<0)),Xs=Js(x),Zs=()=>{const e=(e,t,o,n)=>{const r=(100+o)/100,s=Math.max(n,(e[t]+o)/r);return E(e,((e,o)=>(o===t?s:e/r)-e))},t=(t,o,n,r,s,l)=>l?e(t,o,r,s):((e,t,o,n,r)=>{const s=Qs(e,t,n,r);return Ys(e,t,o+1,[s,0],Ks)})(t,o,n,r,s);return{resizeTable:(e,t)=>e(t),clampTableDelta:Qs,calcLeftEdgeDeltas:t,calcMiddleDeltas:(e,o,n,r,s,l,a)=>t(e,n,r,s,l,a),calcRightEdgeDeltas:(t,o,n,r,s,l)=>{if(l)return e(t,n,r,s);{const e=Qs(t,n,r,s);return Ks(t.slice(0,n)).concat([e])}},calcRedestributedWidths:(e,t,o,n)=>{if(n){const n=(t+o)/t,r=E(e,(e=>e/n));return{delta:100*n-100,newSizes:r}}return{delta:o,newSizes:e}}}},el=()=>{const e=(e,t,o,n,r)=>{const s=Xs(e,n>=0?o:t,n,r);return Ys(e,t,o+1,[s,-s],Ks)};return{resizeTable:(e,t,o)=>{o&&e(t)},clampTableDelta:(e,t,o,n,r)=>{if(r){if(o>=0)return o;{const t=A(e,((e,t)=>e+t-n),0);return Math.max(-t,o)}}return Qs(e,t,o,n)},calcLeftEdgeDeltas:e,calcMiddleDeltas:(t,o,n,r,s,l)=>e(t,n,r,s,l),calcRightEdgeDeltas:(e,t,o,n,r,s)=>{if(s)return Ks(e);{const t=n/e.length;return E(e,g(t))}},calcRedestributedWidths:(e,t,o,n)=>({delta:0,newSizes:e})}},tl=e=>Zo(e).grid,ol=ue("th"),nl=e=>P(e,(e=>ol(e.element))),rl=(e,t)=>e&&t?"sectionCells":e?"section":"cells",sl=e=>{const t="thead"===e.section,o=vt(ll(e.cells),"th");return"tfoot"===e.section?{type:"footer"}:t||o?{type:"header",subType:rl(t,o)}:{type:"body"}},ll=e=>{const t=_(e,(e=>ol(e.element)));return 0===t.length?C.some("td"):t.length===e.length?C.some("th"):C.none()},al=(e,t,o)=>et(o(e.element,t),!0,e.isLocked),cl=(e,t)=>e.section!==t?tt(e.element,e.cells,t,e.isNew):e,il=()=>({transformRow:cl,transformCell:(e,t,o)=>{const n=o(e.element,t),r="td"!==ne(n)?((e,t)=>{const o=Je(e,"td");je(e,o);const n=Le(e);return $e(o,n),qe(e),o})(n):n;return et(r,e.isNew,e.isLocked)}}),ml=()=>({transformRow:cl,transformCell:al}),dl=()=>({transformRow:(e,t)=>cl(e,"thead"===t?"tbody":t),transformCell:al}),ul=il,fl=ml,gl=dl,hl=()=>({transformRow:h,transformCell:al}),pl=(e,t,o,n)=>{o===n?be(e,t):ge(e,t,o)},wl=(e,t,o)=>{$(mt(e,t)).fold((()=>Pe(e,o)),(e=>je(e,o)))},bl=(e,t)=>{const o=[],n=[],r=e=>E(e,(e=>{e.isNew&&o.push(e.element);const t=e.element;return Ve(t),N(e.cells,(e=>{e.isNew&&n.push(e.element),pl(e.element,"colspan",e.colspan,1),pl(e.element,"rowspan",e.rowspan,1),Ie(t,e.element)})),t})),s=e=>j(e,(e=>E(e.cells,(e=>(pl(e.element,"span",e.colspan,1),e.element))))),l=(t,o)=>{const n=((e,t)=>{const o=pt(e,t).getOrThunk((()=>{const o=xe.fromTag(t,ke(e).dom);return"thead"===t?wl(e,"caption,colgroup",o):"colgroup"===t?wl(e,"caption",o):Ie(e,o),o}));return Ve(o),o})(e,o),l=("colgroup"===o?s:r)(t);$e(n,l)},a=(t,o)=>{t.length>0?l(t,o):(t=>{pt(e,t).each(qe)})(o)},c=[],i=[],m=[],d=[];return N(t,(e=>{switch(e.section){case"thead":c.push(e);break;case"tbody":i.push(e);break;case"tfoot":m.push(e);break;case"colgroup":d.push(e)}})),a(d,"colgroup"),a(c,"thead"),a(i,"tbody"),a(m,"tfoot"),{newRows:o,newCells:n}},vl=(e,t)=>{if(0===e.length)return 0;const o=e[0];return W(e,(e=>!t(o.element,e.element))).getOr(e.length)},yl=(e,t)=>{const o=E(e,(e=>E(e.cells,y)));return E(e,((n,r)=>{const s=j(n.cells,((n,s)=>{if(!1===o[r][s]){const m=((e,t,o,n)=>{const r=((e,t)=>e[t])(e,t),s="colgroup"===r.section,l=vl(r.cells.slice(o),n),a=s?1:vl(((e,t)=>E(e,(e=>Ho(e,t))))(e.slice(t),o),n);return{colspan:l,rowspan:a}})(e,r,s,t);return((e,t,n,r)=>{for(let s=e;s<e+n;s++)for(let e=t;e<t+r;e++)o[s][e]=!0})(r,s,m.rowspan,m.colspan),[(l=n.element,a=m.rowspan,c=m.colspan,i=n.isNew,{element:l,rowspan:a,colspan:c,isNew:i})]}return[];var l,a,c,i}));return((e,t,o,n)=>({element:e,cells:t,section:o,isNew:n}))(n.element,s,n.section,n.isNew)}))},xl=(e,t,o)=>{const n=[];N(e.colgroups,(r=>{const s=[];for(let n=0;n<e.grid.columns;n++){const r=an(e,n).map((e=>et(e.element,o,!1))).getOrThunk((()=>et(t.colGap(),!0,!1)));s.push(r)}n.push(tt(r.element,s,"colgroup",o))}));for(let r=0;r<e.grid.rows;r++){const s=[];for(let n=0;n<e.grid.columns;n++){const l=tn(e,r,n).map((e=>et(e.element,o,e.isLocked))).getOrThunk((()=>et(t.gap(),!0,!1)));s.push(l)}const l=e.all[r],a=tt(l.element,s,l.section,o);n.push(a)}return n},Cl=e=>yl(e,Re),Sl=(e,t)=>V(e.all,(e=>L(e.cells,(e=>Re(t,e.element))))),Tl=(e,t,o)=>{const n=E(t.selection,(t=>qt(t).bind((t=>Sl(e,t))).filter(o))),r=yt(n);return xt(r.length>0,r)},Rl=(e,t,o,n,r)=>(s,l,a,c)=>{const i=Zo(s),m=C.from(null==c?void 0:c.section).getOrThunk(hl);return t(i,l).map((t=>{const o=((e,t)=>xl(e,t,!1))(i,a),n=e(o,t,Re,r(a),m),s=Yo(n.grid);return{info:t,grid:Cl(n.grid),cursor:n.cursor,lockedColumns:s}})).bind((e=>{const t=bl(s,e.grid),r=C.from(null==c?void 0:c.sizing).getOrThunk((()=>mr(s))),l=C.from(null==c?void 0:c.resize).getOrThunk(el);return o(s,e.grid,e.info,{sizing:r,resize:l,section:m}),n(s),be(s,Go),e.lockedColumns.length>0&&ge(s,Go,e.lockedColumns.join(",")),C.some({cursor:e.cursor,newRows:t.newRows,newCells:t.newCells})}))},Dl=(e,t)=>Tl(e,t,x).map((e=>({cells:e,generators:t.generators,clipboard:t.clipboard}))),Ol=(e,t)=>Tl(e,t,x),kl=(e,t)=>Tl(e,t,(e=>!e.isLocked)),El=(e,t)=>P(t,(t=>((e,t)=>Sl(e,t).exists((e=>!e.isLocked)))(e,t))),Nl=(e,t,o,n)=>{const r=qo(e).rows;let s=!0;for(let e=0;e<r.length;e++)for(let l=0;l<Vo(r[0]);l++){const a=r[e],c=Ho(a,l),i=o(c.element,t);i&&!s?Io(a,l,et(n(),!0,c.isLocked)):i&&(s=!1)}return e},Bl=e=>{const t=t=>t(e),o=g(e),n=()=>r,r={tag:!0,inner:e,fold:(t,o)=>o(e),isValue:x,isError:y,map:t=>zl.value(t(e)),mapError:n,bind:t,exists:t,forall:t,getOr:o,or:n,getOrThunk:o,orThunk:n,getOrDie:o,each:t=>{t(e)},toOptional:()=>C.some(e)};return r},_l=e=>{const t=()=>o,o={tag:!1,inner:e,fold:(t,o)=>t(e),isValue:y,isError:x,map:t,mapError:t=>zl.error(t(e)),bind:t,exists:y,forall:x,getOr:h,or:h,getOrThunk:v,orThunk:v,getOrDie:(n=String(e),()=>{throw new Error(n)}),each:f,toOptional:C.none};var n;return o},zl={value:Bl,error:_l,fromOption:(e,t)=>e.fold((()=>_l(t)),Bl)},Al=(e,t)=>({rowDelta:0,colDelta:Vo(e[0])-Vo(t[0])}),Ll=(e,t)=>({rowDelta:e.length-t.length,colDelta:0}),Wl=(e,t,o,n)=>{const r="colgroup"===t.section?o.col:o.cell;return k(e,(e=>et(r(),!0,n(e))))},Ml=(e,t,o,n)=>{const r=e[e.length-1];return e.concat(k(t,(()=>{const e="colgroup"===r.section?o.colgroup:o.row,t=Uo(r,e,h),s=Wl(t.cells.length,t,o,(e=>X(n,e.toString())));return Fo(t,s)})))},jl=(e,t,o,n)=>E(e,(e=>{const r=Wl(t,e,o,y);return jo(e,n,r)})),Pl=(e,t,o)=>{const n=t.colDelta<0?jl:h,r=t.rowDelta<0?Ml:h,s=Yo(e),l=Vo(e[0]),a=O(s,(e=>e===l-1)),c=n(e,Math.abs(t.colDelta),o,a?l-1:l),i=Yo(c);return r(c,Math.abs(t.rowDelta),o,I(i,x))},Il=(e,t,o,n)=>{const r=w(n,Ho(e[t],o).element),s=e[t];return e.length>1&&Vo(s)>1&&(o>0&&r($o(s,o-1))||o<s.cells.length-1&&r($o(s,o+1))||t>0&&r($o(e[t-1],o))||t<e.length-1&&r($o(e[t+1],o)))},Fl=(e,t,o)=>_(o,(o=>o>=e.column&&o<=Vo(t[0])+e.column)),Hl=(e,t,o,n,r)=>{((e,t,o,n)=>{t>0&&t<e[0].cells.length&&N(e,(e=>{const r=e.cells[t-1];let s=0;const l=n();for(;e.cells.length>t+s&&o(r.element,e.cells[t+s].element);)Io(e,t+s,et(l,!0,e.cells[t+s].isLocked)),s++}))})(t,e,r,n.cell);const s=Ll(o,t),l=Pl(o,s,n),a=Ll(t,l),c=Pl(t,a,n);return E(c,((t,o)=>jo(t,e,l[o].cells)))},$l=(e,t,o,n,r)=>{((e,t,o,n)=>{const r=qo(e).rows;if(t>0&&t<r.length){const e=((e,t)=>A(e,((e,o)=>O(e,(e=>t(e.element,o.element)))?e:e.concat([o])),[]))(r[t-1].cells,o);N(e,(e=>{let s=C.none();for(let l=t;l<r.length;l++)for(let t=0;t<Vo(r[0]);t++){const a=r[l],c=Ho(a,t);o(c.element,e.element)&&(s.isNone()&&(s=C.some(n())),s.each((e=>{Io(a,t,et(e,!0,c.isLocked))})))}}))}})(t,e,r,n.cell);const s=Yo(t),l=Al(t,o),a={...l,colDelta:l.colDelta-s.length},c=Pl(t,a,n),{cols:i,rows:m}=qo(c),d=Yo(c),u=Al(o,t),f={...u,colDelta:u.colDelta+d.length},g=(p=n,w=d,E(o,(e=>A(w,((t,o)=>{const n=Wl(1,e,p,x)[0];return Po(t,o,n)}),e)))),h=Pl(g,f,n);var p,w;return[...i,...m.slice(0,e),...h,...m.slice(e,m.length)]},Vl=(e,t,o,n,r)=>{const{rows:s,cols:l}=qo(e),a=s.slice(0,t),c=s.slice(t);return[...l,...a,((e,t,o,n)=>Uo(e,(e=>n(e,o)),t))(s[o],((e,o)=>t>0&&t<s.length&&n($o(s[t-1],o),$o(s[t],o))?Ho(s[t],o):et(r(e.element,n),!0,e.isLocked)),n,r),...c]},ql=(e,t,o,n,r)=>E(e,(e=>{const s=t>0&&t<Vo(e)&&n($o(e,t-1),$o(e,t)),l=((e,t,o,n,r,s,l)=>{if("colgroup"!==o&&n)return Ho(e,t);{const t=Ho(e,r);return et(l(t.element,s),!0,!1)}})(e,t,e.section,s,o,n,r);return Po(e,t,l)})),Ul=(e,t,o,n)=>((e,t,o,n)=>void 0!==$o(e[t],o)&&t>0&&n($o(e[t-1],o),$o(e[t],o)))(e,t,o,n)||((e,t,o)=>t>0&&o($o(e,t-1),$o(e,t)))(e[t],o,n),Gl=(e,t,o,n)=>{const r=e=>(e=>"row"===e?Pt(t):jt(t))(e)?`${e}group`:e;return e?ol(t)?r(o):null:n&&ol(t)?r("row"===o?"col":"row"):null},Kl=(e,t,o)=>et(o(e.element,t),!0,e.isLocked),Yl=(e,t,o,n,r,s,l)=>E(e,((e,a)=>((e,c)=>{const i=e.cells,m=E(i,((e,c)=>{if((e=>O(t,(t=>o(e.element,t.element))))(e)){const t=l(e,a,c)?r(e,o,n):e;return s(t,a,c).each((e=>{var o,n;o=t.element,n={scope:C.from(e)},G(n,((e,t)=>{e.fold((()=>{be(o,t)}),(e=>{fe(o.dom,t,e)}))}))})),t}return e}));return tt(e.element,m,e.section,e.isNew)})(e))),Jl=(e,t,o)=>j(e,((n,r)=>Ul(e,r,t,o)?[]:[Ho(n,t)])),Ql=(e,t,o,n,r)=>{const s=qo(e).rows,l=j(t,(e=>Jl(s,e,n))),a=E(s,(e=>nl(e.cells))),c=((e,t)=>P(t,h)&&nl(e)?x:(e,o,n)=>!("th"===ne(e.element)&&t[o]))(l,a),i=((e,t)=>(o,n)=>C.some(Gl(e,o.element,"row",t[n])))(o,a);return Yl(e,l,n,r,Kl,i,c)},Xl=(e,t,o,n)=>{const r=qo(e).rows,s=E(t,(e=>Ho(r[e.row],e.column)));return Yl(e,s,o,n,Kl,C.none,x)},Zl=e=>{if(!l(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};return N(e,((n,r)=>{const s=q(n);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],c=n[a];if(void 0!==o[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!l(c))throw new Error("case arguments must be an array");t.push(a),o[a]=(...o)=>{const n=o.length;if(n!==c.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+c.length+" ("+c+"), got "+n);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,o)},match:e=>{const n=q(e);if(t.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+n.join(","));if(!P(t,(e=>D(n,e))))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:a,params:o})}}}})),o},ea={...Zl([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}])},ta=(e,t,o)=>{let n=0;for(let r=e;r<t;r++)n+=void 0!==o[r]?o[r]:0;return n},oa=(e,t)=>{const o=rn(e);return E(o,(e=>{const o=ta(e.row,e.row+e.rowspan,t);return{element:e.element,height:o,rowspan:e.rowspan}}))},na=(e,t,o)=>{const n=((e,t)=>ln(e)?((e,t)=>{const o=sn(e);return E(o,((e,o)=>({element:e.element,width:t[o],colspan:e.colspan})))})(e,t):((e,t)=>{const o=rn(e);return E(o,(e=>{const o=ta(e.column,e.column+e.colspan,t);return{element:e.element,width:o,colspan:e.colspan}}))})(e,t))(e,t);N(n,(e=>{o.setElementWidth(e.element,e.width)}))},ra=(e,t,o,n,r)=>{const s=Zo(e),l=r.getCellDelta(t),a=r.getWidths(s,r),c=o===s.grid.columns-1,i=n.clampTableDelta(a,o,l,r.minCellWidth(),c),m=((e,t,o,n,r)=>{const s=e.slice(0),l=((e,t)=>0===e.length?ea.none():1===e.length?ea.only(0):0===t?ea.left(0,1):t===e.length-1?ea.right(t-1,t):t>0&&t<e.length-1?ea.middle(t-1,t,t+1):ea.none())(e,t),a=g(E(s,g(0)));return l.fold(a,(e=>n.singleColumnWidth(s[e],o)),((e,t)=>r.calcLeftEdgeDeltas(s,e,t,o,n.minCellWidth(),n.isRelative)),((e,t,l)=>r.calcMiddleDeltas(s,e,t,l,o,n.minCellWidth(),n.isRelative)),((e,t)=>r.calcRightEdgeDeltas(s,e,t,o,n.minCellWidth(),n.isRelative)))})(a,o,i,r,n),d=E(m,((e,t)=>e+a[t]));na(s,d,r),n.resizeTable(r.adjustTableWidth,i,c)},sa=e=>A(e,((e,t)=>O(e,(e=>e.column===t.column))?e:e.concat([t])),[]).sort(((e,t)=>e.column-t.column)),la=ue("col"),aa=ue("colgroup"),ca=e=>"tr"===ne(e)||aa(e),ia=e=>({element:e,colspan:Wt(e,"colspan",1),rowspan:Wt(e,"rowspan",1)}),ma=e=>we(e,"scope").map((e=>e.substr(0,3))),da=(e,t=ia)=>{const o=o=>{if(ca(o))return aa((r={element:o}).element)?e.colgroup(r):e.row(r);{const r=o,s=(t=>la(t.element)?e.col(t):e.cell(t))(t(r));return n=C.some({item:r,replacement:s}),s}var r};let n=C.none();return{getOrInit:(e,t)=>n.fold((()=>o(e)),(n=>t(e,n.item)?n.replacement:o(e)))}},ua=e=>t=>{const o=[],n=n=>{const r="td"===e?{scope:null}:{},s=t.replace(n,e,r);return o.push({item:n,sub:s}),s};return{replaceOrInit:(e,t)=>{if(ca(e)||la(e))return e;{const r=e;return((e,t)=>L(o,(o=>t(o.item,e))))(r,t).fold((()=>n(r)),(o=>t(e,o.item)?o.sub:n(r)))}}}},fa=e=>({unmerge:t=>{const o=ma(t);return o.each((e=>ge(t,"scope",e))),()=>{const n=e.cell({element:t,colspan:1,rowspan:1});return Lt(n,"width"),Lt(t,"width"),o.each((e=>ge(n,"scope",e))),n}},merge:e=>(Lt(e[0],"width"),(()=>{const t=yt(E(e,ma));if(0===t.length)return C.none();{const e=t[0],o=["row","col"];return O(t,(t=>t!==e&&D(o,t)))?C.none():C.from(e)}})().fold((()=>be(e[0],"scope")),(t=>ge(e[0],"scope",t+"group"))),g(e[0]))}),ga=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","table","thead","tfoot","tbody","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],ha=hs(),pa=e=>((e,t)=>{const o=e.property().name(t);return D(ga,o)})(ha,e),wa=e=>((e,t)=>{const o=e.property().name(t);return D(["ol","ul"],o)})(ha,e),ba=e=>{const t=ue("br"),o=e=>Cr(e).bind((o=>{const n=Ae(o).map((e=>!!pa(e)||!!((e,t)=>D(["br","img","hr","input"],e.property().name(t)))(ha,e)&&"img"!==ne(e))).getOr(!1);return Ne(o).map((r=>{return!0===n||("li"===ne(s=r)||ft(s,wa).isSome())||t(o)||pa(r)&&!Re(e,r)?[]:[xe.fromTag("br")];var s}))})).getOr([]),n=(()=>{const n=j(e,(e=>{const n=Le(e);return(e=>P(e,(e=>t(e)||ie(e)&&0===hr(e).trim().length)))(n)?[]:n.concat(o(e))}));return 0===n.length?[xe.fromTag("br")]:n})();Ve(e[0]),$e(e[0],n)},va=e=>Qr(e,!0),ya=e=>{0===Ut(e).length&&qe(e)},xa=(e,t)=>({grid:e,cursor:t}),Ca=(e,t,o)=>{const n=((e,t,o)=>{var n,r;const s=qo(e).rows;return C.from(null===(r=null===(n=s[t])||void 0===n?void 0:n.cells[o])||void 0===r?void 0:r.element).filter(va).orThunk((()=>(e=>V(e,(e=>V(e.cells,(e=>{const t=e.element;return xt(va(t),t)})))))(s)))})(e,t,o);return xa(e,n)},Sa=e=>A(e,((e,t)=>O(e,(e=>e.row===t.row))?e:e.concat([t])),[]).sort(((e,t)=>e.row-t.row)),Ta=(e,t)=>(o,n,r,s,l)=>{const a=Sa(n),c=E(a,(e=>e.row)),i=((e,t,o,n,r,s,l)=>{const{cols:a,rows:c}=qo(e),i=c[t[0]],m=j(t,(e=>((e,t,o)=>{const n=e[t];return j(n.cells,((n,r)=>Ul(e,t,r,o)?[]:[n]))})(c,e,r))),d=E(i.cells,((e,t)=>nl(Jl(c,t,r)))),u=[...c];N(t,(e=>{u[e]=l.transformRow(c[e],o)}));const f=[...a,...u],g=((e,t)=>P(t,h)&&nl(e.cells)?x:(e,o,n)=>!("th"===ne(e.element)&&t[n]))(i,d),p=((e,t)=>(o,n,r)=>C.some(Gl(e,o.element,"col",t[r])))(n,d);return Yl(f,m,r,s,l.transformCell,p,g)})(o,c,e,t,r,s.replaceOrInit,l);return Ca(i,n[0].row,n[0].column)},Ra=Ta("thead",!0),Da=Ta("tbody",!1),Oa=Ta("tfoot",!1),ka=(e,t,o)=>{const n=((e,t)=>Qt(e,(()=>t)))(e,o.section),r=en(n);return xl(r,t,!0)},Ea=(e,t,o,n)=>((e,t,o,n)=>{const r=en(t),s=n.getWidths(r,n);na(r,s,n)})(0,t,0,n.sizing),Na=(e,t,o,n)=>((e,t,o,n,r)=>{const s=en(t),l=n.getWidths(s,n),a=n.pixelWidth(),{newSizes:c,delta:i}=r.calcRedestributedWidths(l,a,o.pixelDelta,n.isRelative);na(s,c,n),n.adjustTableWidth(i)})(0,t,o,n.sizing,n.resize),Ba=(e,t)=>O(t,(e=>0===e.column&&e.isLocked)),_a=(e,t)=>O(t,(t=>t.column+t.colspan>=e.grid.columns&&t.isLocked)),za=(e,t)=>{const o=cn(e),n=sa(t);return A(n,((e,t)=>e+o[t.column].map(Wo).getOr(0)),0)},Aa=e=>(t,o)=>Ol(t,o).filter((o=>!(e?Ba:_a)(t,o))).map((e=>({details:e,pixelDelta:za(t,e)}))),La=e=>(t,o)=>Dl(t,o).filter((o=>!(e?Ba:_a)(t,o.cells))),Wa=ua("th"),Ma=ua("td"),ja=Rl(((e,t,o,n)=>{const r=t[0].row,s=Sa(t),l=z(s,((e,t)=>({grid:Vl(e.grid,r,t.row+e.delta,o,n.getOrInit),delta:e.delta+1})),{grid:e,delta:0}).grid;return Ca(l,r,t[0].column)}),Ol,f,f,da),Pa=Rl(((e,t,o,n)=>{const r=Sa(t),s=r[r.length-1],l=s.row+s.rowspan,a=z(r,((e,t)=>Vl(e,l,t.row,o,n.getOrInit)),e);return Ca(a,l,t[0].column)}),Ol,f,f,da),Ia=Rl(((e,t,o,n)=>{const r=t.details,s=sa(r),l=s[0].column,a=z(s,((e,t)=>({grid:ql(e.grid,l,t.column+e.delta,o,n.getOrInit),delta:e.delta+1})),{grid:e,delta:0}).grid;return Ca(a,r[0].row,l)}),Aa(!0),Na,f,da),Fa=Rl(((e,t,o,n)=>{const r=t.details,s=r[r.length-1],l=s.column+s.colspan,a=sa(r),c=z(a,((e,t)=>ql(e,l,t.column,o,n.getOrInit)),e);return Ca(c,r[0].row,l)}),Aa(!1),Na,f,da),Ha=Rl(((e,t,o,n)=>{const r=sa(t.details),s=((e,t)=>j(e,(e=>{const o=e.cells,n=z(t,((e,t)=>t>=0&&t<e.length?e.slice(0,t).concat(e.slice(t+1)):e),o);return n.length>0?[tt(e.element,n,e.section,e.isNew)]:[]})))(e,E(r,(e=>e.column))),l=s.length>0?s[0].cells.length-1:0;return Ca(s,r[0].row,Math.min(r[0].column,l))}),((e,t)=>kl(e,t).map((t=>({details:t,pixelDelta:-za(e,t)})))),Na,ya,da),$a=Rl(((e,t,o,n)=>{const r=Sa(t),s=((e,t,o)=>{const{rows:n,cols:r}=qo(e);return[...r,...n.slice(0,t),...n.slice(o+1)]})(e,r[0].row,r[r.length-1].row),l=s.length>0?s.length-1:0;return Ca(s,Math.min(t[0].row,l),t[0].column)}),Ol,f,ya,da),Va=Rl(((e,t,o,n)=>{const r=sa(t),s=E(r,(e=>e.column)),l=Ql(e,s,!0,o,n.replaceOrInit);return Ca(l,t[0].row,t[0].column)}),kl,f,f,Wa),qa=Rl(((e,t,o,n)=>{const r=sa(t),s=E(r,(e=>e.column)),l=Ql(e,s,!1,o,n.replaceOrInit);return Ca(l,t[0].row,t[0].column)}),kl,f,f,Ma),Ua=Rl(Ra,kl,f,f,Wa),Ga=Rl(Da,kl,f,f,Ma),Ka=Rl(Oa,kl,f,f,Ma),Ya=Rl(((e,t,o,n)=>{const r=Xl(e,t,o,n.replaceOrInit);return Ca(r,t[0].row,t[0].column)}),kl,f,f,Wa),Ja=Rl(((e,t,o,n)=>{const r=Xl(e,t,o,n.replaceOrInit);return Ca(r,t[0].row,t[0].column)}),kl,f,f,Ma),Qa=Rl(((e,t,o,n)=>{const r=t.cells;ba(r);const s=((e,t,o,n)=>{const r=qo(e).rows;if(0===r.length)return e;for(let e=t.startRow;e<=t.finishRow;e++)for(let o=t.startCol;o<=t.finishCol;o++){const t=r[e],s=Ho(t,o).isLocked;Io(t,o,et(n(),!1,s))}return e})(e,t.bounds,0,n.merge(r));return xa(s,C.from(r[0]))}),((e,t)=>((e,t)=>t.mergable)(0,t).filter((t=>El(e,t.cells)))),Ea,f,fa),Xa=Rl(((e,t,o,n)=>{const r=z(t,((e,t)=>Nl(e,t,o,n.unmerge(t))),e);return xa(r,C.from(t[0]))}),((e,t)=>((e,t)=>t.unmergable)(0,t).filter((t=>El(e,t)))),Ea,f,fa),Za=Rl(((e,t,o,n)=>{const r=((e,t)=>{const o=Zo(e);return xl(o,t,!0)})(t.clipboard,t.generators);var s,l;return((e,t,o,n,r)=>{const s=Yo(t),l=((e,t,o)=>{const n=Vo(t[0]),r=qo(t).cols.length+e.row,s=k(n-e.column,(t=>t+e.column));return{row:r,column:L(s,(e=>P(o,(t=>t!==e)))).getOr(n-1)}})(e,t,s),a=qo(o).rows,c=Fl(l,a,s),i=((e,t,o)=>{if(e.row>=t.length||e.column>Vo(t[0]))return zl.error("invalid start address out of table bounds, row: "+e.row+", column: "+e.column);const n=t.slice(e.row),r=n[0].cells.slice(e.column),s=Vo(o[0]),l=o.length;return zl.value({rowDelta:n.length-l,colDelta:r.length-s})})(l,t,a);return i.map((e=>{const o={...e,colDelta:e.colDelta-c.length},s=Pl(t,o,n),i=Yo(s),m=Fl(l,a,i);return((e,t,o,n,r,s)=>{const l=e.row,a=e.column,c=l+o.length,i=a+Vo(o[0])+s.length,m=I(s,x);for(let e=l;e<c;e++){let s=0;for(let c=a;c<i;c++){if(m[c]){s++;continue}Il(t,e,c,r)&&Nl(t,$o(t[e],c),r,n.cell);const i=c-a-s,d=Ho(o[e-l],i),u=d.element,f=n.replace(u);Io(t[e],c,et(f,!0,d.isLocked))}}return t})(l,s,a,n,r,m)}))})((s=t.row,l=t.column,{row:s,column:l}),e,r,t.generators,o).fold((()=>xa(e,C.some(t.element))),(e=>Ca(e,t.row,t.column)))}),((e,t)=>qt(t.element).bind((o=>Sl(e,o).map((e=>({...e,generators:t.generators,clipboard:t.clipboard})))))),Ea,f,da),ec=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[0].column,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=Hl(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),La(!0),f,f,da),tc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[t.cells.length-1].column+t.cells[t.cells.length-1].colspan,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=Hl(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),La(!1),f,f,da),oc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[0].row,l=r[s],a=ka(t.clipboard,t.generators,l),c=$l(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),Dl,f,f,da),nc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[t.cells.length-1].row+t.cells[t.cells.length-1].rowspan,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=$l(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),Dl,f,f,da),rc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind((e=>{const t=e[e.length-1],n=e[0].column,r=t.column+t.colspan,s=M(E(o.all,(e=>_(e.cells,(e=>e.column>=n&&e.column<r)))));return ll(s)})).getOr("")},sc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind(ll).getOr("")},lc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind((e=>{const t=e[e.length-1],n=e[0].row,r=t.row+t.rowspan;return(e=>{const t=E(e,(e=>sl(e).type)),o=D(t,"header"),n=D(t,"footer");if(o||n){const e=D(t,"body");return!o||e||n?o||e||!n?C.none():C.some("footer"):C.some("header")}return C.some("body")})(o.all.slice(n,r))})).getOr("")},ac=(e,t)=>e.dispatch("NewRow",{node:t}),cc=(e,t)=>e.dispatch("NewCell",{node:t}),ic=(e,t,o)=>{e.dispatch("TableModified",{...o,table:t})},mc={structure:!1,style:!0},dc={structure:!0,style:!1},uc={structure:!0,style:!0},fc=(e,t)=>Hr(e)?ur(t):$r(e)?dr(t):mr(t),gc=(e,t,o)=>{const n=e=>"table"===ne(Zr(e)),r=Wr(e),s=Ir(e)?f:Gs,l=t=>{switch(Mr(e)){case"section":return ul();case"sectionCells":return fl();case"cells":return gl();default:return((e,t)=>{var o;switch((o=Zo(e),V(o.all,(e=>{const t=sl(e);return"header"===t.type?C.from(t.subType):C.none()}))).getOr(t)){case"section":return il();case"sectionCells":return ml();case"cells":return dl()}})(t,"section")}},a=(n,s,a,c)=>(i,m,d=!1)=>{ts(i);const u=xe.fromDom(e.getDoc()),f=Br(a,u,r),g={sizing:fc(e,i),resize:Ir(e)?Zs():el(),section:l(i)};return s(i)?n(i,m,f,g).bind((n=>{t.refresh(i.dom),N(n.newRows,(t=>{ac(e,t.dom)})),N(n.newCells,(t=>{cc(e,t.dom)}));const r=((t,n)=>n.cursor.fold((()=>{const n=Ut(t);return H(n).filter(lt).map((n=>{o.clearSelectedCells(t.dom);const r=e.dom.createRng();return r.selectNode(n.dom),e.selection.setRng(r),ge(n,"data-mce-selected","1"),r}))}),(n=>{const r=qs(Us,n),s=e.dom.createRng();return s.setStart(r.element.dom,r.offset),s.setEnd(r.element.dom,r.offset),e.selection.setRng(s),o.clearSelectedCells(t.dom),C.some(s)})))(i,n);return lt(i)&&(ts(i),d||ic(e,i.dom,c)),r.map((e=>({rng:e,effect:c})))})):C.none()},c=a($a,(t=>!n(e)||tl(t).rows>1),f,dc),i=a(Ha,(t=>!n(e)||tl(t).columns>1),f,dc);return{deleteRow:c,deleteColumn:i,insertRowsBefore:a(ja,x,f,dc),insertRowsAfter:a(Pa,x,f,dc),insertColumnsBefore:a(Ia,x,s,dc),insertColumnsAfter:a(Fa,x,s,dc),mergeCells:a(Qa,x,f,dc),unmergeCells:a(Xa,x,f,dc),pasteColsBefore:a(ec,x,f,dc),pasteColsAfter:a(tc,x,f,dc),pasteRowsBefore:a(oc,x,f,dc),pasteRowsAfter:a(nc,x,f,dc),pasteCells:a(Za,x,f,uc),makeCellsHeader:a(Ya,x,f,dc),unmakeCellsHeader:a(Ja,x,f,dc),makeColumnsHeader:a(Va,x,f,dc),unmakeColumnsHeader:a(qa,x,f,dc),makeRowsHeader:a(Ua,x,f,dc),makeRowsBody:a(Ga,x,f,dc),makeRowsFooter:a(Ka,x,f,dc),getTableRowType:lc,getTableCellType:sc,getTableColType:rc}},hc=(e,t,o)=>{const n=Wt(e,t,1);1===o||n<=1?be(e,t):ge(e,t,Math.min(o,n))},pc=(e,t)=>o=>{const n=o.column+o.colspan-1,r=o.column;return n>=e&&r<t},wc=Zl([{invalid:["raw"]},{pixels:["value"]},{percent:["value"]}]),bc=(e,t,o)=>{const n=o.substring(0,o.length-e.length),r=parseFloat(n);return n===r.toString()?t(r):wc.invalid(o)},vc={...wc,from:e=>Rt(e,"%")?bc("%",wc.percent,e):Rt(e,"px")?bc("px",wc.pixels,e):wc.invalid(e)},yc=(e,t,o)=>{const n=vc.from(o),r=P(e,(e=>"0px"===e))?((e,t)=>{const o=e.fold((()=>g("")),(e=>g(e/t+"px")),(()=>g(100/t+"%")));return k(t,o)})(n,e.length):((e,t,o)=>e.fold((()=>t),(e=>((e,t,o)=>{const n=o/t;return E(e,(e=>vc.from(e).fold((()=>e),(e=>e*n+"px"),(e=>e/100*o+"px"))))})(t,o,e)),(e=>((e,t)=>E(e,(e=>vc.from(e).fold((()=>e),(e=>e/t*100+"%"),(e=>e+"%")))))(t,o))))(n,e,t);return Sc(r)},xc=(e,t)=>0===e.length?t:z(e,((e,t)=>vc.from(t).fold(g(0),h,h)+e),0),Cc=(e,t)=>vc.from(e).fold(g(e),(e=>e+t+"px"),(e=>e+t+"%")),Sc=e=>{if(0===e.length)return e;const t=z(e,((e,t)=>{const o=vc.from(t).fold((()=>({value:t,remainder:0})),(e=>((e,t)=>{const o=Math.floor(e);return{value:o+"px",remainder:e-o}})(e)),(e=>({value:e+"%",remainder:0})));return{output:[o.value].concat(e.output),remainder:e.remainder+o.remainder}}),{output:[],remainder:0}),o=t.output;return o.slice(0,o.length-1).concat([Cc(o[o.length-1],Math.round(t.remainder))])},Tc=vc.from,Rc=e=>Tc(e).fold(g("px"),g("px"),g("%")),Dc=(e,t,o)=>{const n=Zo(e),r=n.all,s=rn(n),l=sn(n);t.each((t=>{const o=Rc(t),r=Lo(e),a=((e,t)=>nr(e,t,er,rr))(n,e),c=yc(a,r,t);ln(n)?((e,t,o)=>{N(t,((t,n)=>{const r=xc([e[n]],Ft());Nt(t.element,"width",r+o)}))})(c,l,o):((e,t,o)=>{N(t,(t=>{const n=e.slice(t.column,t.colspan+t.column),r=xc(n,Ft());Nt(t.element,"width",r+o)}))})(c,s,o),Nt(e,"width",t)})),o.each((t=>{const o=Rc(t),l=hn(e),a=((e,t,o)=>lr(e,t,o,tr,rr))(n,e,_n);((e,t,o,n)=>{N(o,(t=>{const o=e.slice(t.row,t.rowspan+t.row),r=xc(o,Ht());Nt(t.element,"height",r+n)})),N(t,((t,o)=>{Nt(t.element,"height",e[o])}))})(yc(a,l,t),r,s,o),Nt(e,"height",t)}))},Oc=e=>Un(e).exists((e=>Mn.test(e))),kc=e=>Un(e).exists((e=>jn.test(e))),Ec=e=>Un(e).isNone(),Nc=e=>{be(e,"width")},Bc=e=>{const t=Qn(e);Dc(e,C.some(t),C.none()),Nc(e)},_c=e=>{const t=(e=>Lo(e)+"px")(e);Dc(e,C.some(t),C.none()),Nc(e)},zc=e=>{Lt(e,"width");const t=Gt(e),o=t.length>0?t:Ut(e);N(o,(e=>{Lt(e,"width"),Nc(e)})),Nc(e)},Ac={styles:{"border-collapse":"collapse",width:"100%"},attributes:{border:"1"},colGroups:!1},Lc=(e,t,o,n)=>k(e,(e=>((e,t,o,n)=>{const r=xe.fromTag("tr");for(let s=0;s<e;s++){const e=xe.fromTag(n<t||s<o?"th":"td");s<o&&ge(e,"scope","row"),n<t&&ge(e,"scope","col"),Ie(e,xe.fromTag("br")),Ie(r,e)}return r})(t,o,n,e))),Wc=(e,t)=>{e.selection.select(t.dom,!0),e.selection.collapse(!0)},Mc=(e,t,o,n,s)=>{const l=(e=>{const t=e.options,o=t.get("table_default_styles");return t.isSet("table_default_styles")?o:((e,t)=>Vr(e)||!Ur(e)?t:$r(e)?{...t,width:Lr(e)}:{...t,width:Ar})(e,o)})(e),a={styles:l,attributes:Kr(e),colGroups:Yr(e)};return e.undoManager.ignore((()=>{const r=((e,t,o,n,r,s=Ac)=>{const l=xe.fromTag("table"),a="cells"!==r;Bt(l,s.styles),he(l,s.attributes),s.colGroups&&Ie(l,(e=>{const t=xe.fromTag("colgroup");return k(e,(()=>Ie(t,xe.fromTag("col")))),t})(t));const c=Math.min(e,o);if(a&&o>0){const e=xe.fromTag("thead");Ie(l,e);const s=Lc(o,t,"sectionCells"===r?c:0,n);$e(e,s)}const i=xe.fromTag("tbody");Ie(l,i);const m=Lc(a?e-c:e,t,a?0:o,n);return $e(i,m),l})(o,t,s,n,Mr(e),a);ge(r,"data-mce-id","__mce");const l=(e=>{const t=xe.fromTag("div"),o=xe.fromDom(e.dom.cloneNode(!0));return Ie(t,o),(e=>e.dom.innerHTML)(t)})(r);e.insertContent(l),e.addVisual()})),wt(Zr(e),'table[data-mce-id="__mce"]').map((t=>($r(e)?_c(t):Vr(e)?zc(t):(Hr(e)||(e=>r(e)&&-1!==e.indexOf("%"))(l.width))&&Bc(t),ts(t),be(t,"data-mce-id"),((e,t)=>{N(dt(t,"tr"),(t=>{ac(e,t.dom),N(dt(t,"th,td"),(t=>{cc(e,t.dom)}))}))})(e,t),((e,t)=>{wt(t,"td,th").each(w(Wc,e))})(e,t),t.dom))).getOrNull()};var jc=tinymce.util.Tools.resolve("tinymce.FakeClipboard");const Pc="x-tinymce/dom-table-",Ic=Pc+"rows",Fc=Pc+"columns",Hc=e=>{const t=jc.FakeClipboardItem(e);jc.write([t])},$c=e=>{var t;const o=null!==(t=jc.read())&&void 0!==t?t:[];return V(o,(t=>C.from(t.getType(e))))},Vc=e=>{$c(e).isSome()&&jc.clear()},qc=e=>{e.fold(Gc,(e=>Hc({[Ic]:e})))},Uc=()=>$c(Ic),Gc=()=>Vc(Ic),Kc=e=>{e.fold(Jc,(e=>Hc({[Fc]:e})))},Yc=()=>$c(Fc),Jc=()=>Vc(Fc),Qc=e=>Ms(os(e),es(e)).filter(ss),Xc=(e,t)=>{const o=es(e),n=e=>Kt(e,o),l=t=>(e=>js(os(e),es(e)).filter(ss))(e).bind((e=>n(e).map((o=>t(o,e))))),a=t=>{e.focus()},c=(t,o=!1)=>l(((n,r)=>{const s=Ls(Ps(e),n,r);t(n,s,o).each(a)})),i=()=>l(((t,o)=>((e,t,o)=>{const n=Zo(e);return Ol(n,t).bind((e=>{const t=xl(n,o,!1),r=qo(t).rows.slice(e[0].row,e[e.length-1].row+e[e.length-1].rowspan),s=j(r,(e=>{const t=_(e.cells,(e=>!e.isLocked));return t.length>0?[{...e,cells:t}]:[]})),l=Cl(s);return xt(l.length>0,l)})).map((e=>E(e,(e=>{const t=Ke(e.element);return N(e.cells,(e=>{const o=Ye(e.element);pl(o,"colspan",e.colspan,1),pl(o,"rowspan",e.rowspan,1),Ie(t,o)})),t}))))})(t,Ls(Ps(e),t,o),Br(f,xe.fromDom(e.getDoc()),C.none())))),m=()=>l(((t,o)=>((e,t)=>{const o=Zo(e);return kl(o,t).map((e=>{const t=e[e.length-1],n=e[0].column,r=t.column+t.colspan,s=((e,t,o)=>{if(ln(e)){const n=_(sn(e),pc(t,o)),r=E(n,(e=>{const n=Ye(e.element);return hc(n,"span",o-t),n})),s=xe.fromTag("colgroup");return $e(s,r),[s]}return[]})(o,n,r),l=((e,t,o)=>E(e.all,(e=>{const n=_(e.cells,pc(t,o)),r=E(n,(e=>{const n=Ye(e.element);return hc(n,"colspan",o-t),n})),s=xe.fromTag("tr");return $e(s,r),s})))(o,n,r);return[...s,...l]}))})(t,Ls(Ps(e),t,o)))),d=(t,o)=>o().each((o=>{const n=E(o,(e=>Ye(e)));l(((o,r)=>{const s=_r(xe.fromDom(e.getDoc())),l=((e,t,o,n)=>({selection:Os(e),clipboard:o,generators:n}))(Ps(e),0,n,s);t(o,l).each(a)}))})),g=e=>(t,o)=>((e,t)=>X(e,t)?C.from(e[t]):C.none())(o,"type").each((t=>{c(e(t),o.no_events)}));G({mceTableSplitCells:()=>c(t.unmergeCells),mceTableMergeCells:()=>c(t.mergeCells),mceTableInsertRowBefore:()=>c(t.insertRowsBefore),mceTableInsertRowAfter:()=>c(t.insertRowsAfter),mceTableInsertColBefore:()=>c(t.insertColumnsBefore),mceTableInsertColAfter:()=>c(t.insertColumnsAfter),mceTableDeleteCol:()=>c(t.deleteColumn),mceTableDeleteRow:()=>c(t.deleteRow),mceTableCutCol:()=>m().each((e=>{Kc(e),c(t.deleteColumn)})),mceTableCutRow:()=>i().each((e=>{qc(e),c(t.deleteRow)})),mceTableCopyCol:()=>m().each((e=>Kc(e))),mceTableCopyRow:()=>i().each((e=>qc(e))),mceTablePasteColBefore:()=>d(t.pasteColsBefore,Yc),mceTablePasteColAfter:()=>d(t.pasteColsAfter,Yc),mceTablePasteRowBefore:()=>d(t.pasteRowsBefore,Uc),mceTablePasteRowAfter:()=>d(t.pasteRowsAfter,Uc),mceTableDelete:()=>Qc(e).each((t=>{Kt(t,o).filter(b(o)).each((t=>{const o=xe.fromText("");if(je(t,o),qe(t),e.dom.isEmpty(e.getBody()))e.setContent(""),e.selection.setCursorLocation();else{const t=e.dom.createRng();t.setStart(o.dom,0),t.setEnd(o.dom,0),e.selection.setRng(t),e.nodeChanged()}}))})),mceTableCellToggleClass:(t,o)=>{l((t=>{const n=Ps(e),r=P(n,(t=>e.formatter.match("tablecellclass",{value:o},t.dom))),s=r?e.formatter.remove:e.formatter.apply;N(n,(e=>s("tablecellclass",{value:o},e.dom))),ic(e,t.dom,mc)}))},mceTableToggleClass:(t,o)=>{l((t=>{e.formatter.toggle("tableclass",{value:o},t.dom),ic(e,t.dom,mc)}))},mceTableToggleCaption:()=>{Qc(e).each((t=>{Kt(t,o).each((o=>{pt(o,"caption").fold((()=>{const t=xe.fromTag("caption");Ie(t,xe.fromText("Caption")),((e,t,o)=>{We(e,0).fold((()=>{Ie(e,t)}),(e=>{Me(e,t)}))})(o,t),e.selection.setCursorLocation(t.dom,0)}),(n=>{ue("caption")(t)&&Te("td",o).each((t=>e.selection.setCursorLocation(t.dom,0))),qe(n)})),ic(e,o.dom,dc)}))}))},mceTableSizingMode:(t,n)=>(t=>Qc(e).each((n=>{Vr(e)||$r(e)||Hr(e)||Kt(n,o).each((o=>{"relative"!==t||Oc(o)?"fixed"!==t||kc(o)?"responsive"!==t||Ec(o)||zc(o):_c(o):Bc(o),ts(o),ic(e,o.dom,dc)}))})))(n),mceTableCellType:g((e=>"th"===e?t.makeCellsHeader:t.unmakeCellsHeader)),mceTableColType:g((e=>"th"===e?t.makeColumnsHeader:t.unmakeColumnsHeader)),mceTableRowType:g((e=>{switch(e){case"header":return t.makeRowsHeader;case"footer":return t.makeRowsFooter;default:return t.makeRowsBody}}))},((t,o)=>e.addCommand(o,t))),e.addCommand("mceInsertTable",((t,o)=>{((e,t,o,n={})=>{const r=e=>u(e)&&e>0;if(r(t)&&r(o)){const r=n.headerRows||0,s=n.headerColumns||0;return Mc(e,o,t,s,r)}console.error("Invalid values for mceInsertTable - rows and columns values are required to insert a table.")})(e,o.rows,o.columns,o.options)})),e.addCommand("mceTableApplyCellStyle",((t,o)=>{const l=e=>"tablecell"+e.toLowerCase().replace("-","");if(!s(o))return;const a=_(Ps(e),ss);if(0===a.length)return;const c=((e,t)=>{const o={};return((e,t,o,n)=>{G(e,((e,r)=>{(t(e,r)?o:n)(e,r)}))})(e,t,(e=>(t,o)=>{e[o]=t})(o),f),o})(o,((t,o)=>e.formatter.has(l(o))&&r(t)));(e=>{for(const t in e)if(U.call(e,t))return!1;return!0})(c)||(G(c,((t,o)=>{const n=l(o);N(a,(o=>{""===t?e.formatter.remove(n,{value:null},o.dom,!0):e.formatter.apply(n,{value:t},o.dom)}))})),n(a[0]).each((t=>ic(e,t.dom,mc))))}))},Zc=Zl([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),ei={before:Zc.before,on:Zc.on,after:Zc.after,cata:(e,t,o,n)=>e.fold(t,o,n),getStart:e=>e.fold(h,h,h)},ti=(e,t)=>({selection:e,kill:t}),oi=(e,t)=>{const o=e.document.createRange();return o.selectNode(t.dom),o},ni=(e,t)=>{const o=e.document.createRange();return ri(o,t),o},ri=(e,t)=>e.selectNodeContents(t.dom),si=(e,t,o)=>{const n=e.document.createRange();var r;return r=n,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,o)=>{e.setEnd(t.dom,o)}),(t=>{e.setEndAfter(t.dom)}))})(n,o),n},li=(e,t,o,n,r)=>{const s=e.document.createRange();return s.setStart(t.dom,o),s.setEnd(n.dom,r),s},ai=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom,width:e.width,height:e.height}),ci=Zl([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),ii=(e,t,o)=>t(xe.fromDom(o.startContainer),o.startOffset,xe.fromDom(o.endContainer),o.endOffset),mi=(e,t)=>{const o=((e,t)=>t.match({domRange:e=>({ltr:g(e),rtl:C.none}),relative:(t,o)=>({ltr:eo((()=>si(e,t,o))),rtl:eo((()=>C.some(si(e,o,t))))}),exact:(t,o,n,r)=>({ltr:eo((()=>li(e,t,o,n,r))),rtl:eo((()=>C.some(li(e,n,r,t,o))))})}))(e,t);return((e,t)=>{const o=t.ltr();return o.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>ci.rtl(xe.fromDom(e.endContainer),e.endOffset,xe.fromDom(e.startContainer),e.startOffset))).getOrThunk((()=>ii(0,ci.ltr,o))):ii(0,ci.ltr,o)})(0,o)},di=(e,t)=>mi(e,t).match({ltr:(t,o,n,r)=>{const s=e.document.createRange();return s.setStart(t.dom,o),s.setEnd(n.dom,r),s},rtl:(t,o,n,r)=>{const s=e.document.createRange();return s.setStart(n.dom,r),s.setEnd(t.dom,o),s}});ci.ltr,ci.rtl;const ui=(e,t,o,n)=>({start:e,soffset:t,finish:o,foffset:n}),fi=(e,t,o,n)=>({start:ei.on(e,t),finish:ei.on(o,n)}),gi=(e,t)=>{const o=di(e,t);return ui(xe.fromDom(o.startContainer),o.startOffset,xe.fromDom(o.endContainer),o.endOffset)},hi=fi,pi=(e,t,o,n,r)=>Re(o,n)?C.none():xs(o,n,t).bind((t=>{const n=t.boxes.getOr([]);return n.length>1?(r(e,n,t.start,t.finish),C.some(ti(C.some(hi(o,0,o,br(o))),!0))):C.none()})),wi=(e,t)=>({item:e,mode:t}),bi=(e,t,o,n=vi)=>e.property().parent(t).map((e=>wi(e,n))),vi=(e,t,o,n=yi)=>o.sibling(e,t).map((e=>wi(e,n))),yi=(e,t,o,n=yi)=>{const r=e.property().children(t);return o.first(r).map((e=>wi(e,n)))},xi=[{current:bi,next:vi,fallback:C.none()},{current:vi,next:yi,fallback:C.some(bi)},{current:yi,next:yi,fallback:C.some(vi)}],Ci=(e,t,o,n,r=xi)=>L(r,(e=>e.current===o)).bind((o=>o.current(e,t,n,o.next).orThunk((()=>o.fallback.bind((o=>Ci(e,t,o,n))))))),Si=(e,t,o,n,r,s)=>Ci(e,t,n,r).bind((t=>s(t.item)?C.none():o(t.item)?C.some(t.item):Si(e,t.item,o,t.mode,r,s))),Ti=e=>t=>0===e.property().children(t).length,Ri=(e,t,o,n)=>Si(e,t,o,vi,{sibling:(e,t)=>e.query().prevSibling(t),first:e=>e.length>0?C.some(e[e.length-1]):C.none()},n),Di=(e,t,o,n)=>Si(e,t,o,vi,{sibling:(e,t)=>e.query().nextSibling(t),first:e=>e.length>0?C.some(e[0]):C.none()},n),Oi=hs(),ki=(e,t)=>((e,t,o)=>Ri(e,t,Ti(e),o))(Oi,e,t),Ei=(e,t)=>((e,t,o)=>Di(e,t,Ti(e),o))(Oi,e,t),Ni=Zl([{none:["message"]},{success:[]},{failedUp:["cell"]},{failedDown:["cell"]}]),Bi=e=>bt(e,"tr"),_i={...Ni,verify:(e,t,o,n,r,s,l)=>bt(n,"td,th",l).bind((o=>bt(t,"td,th",l).map((t=>Re(o,t)?Re(n,o)&&br(o)===r?s(t):Ni.none("in same cell"):vs(Bi,[o,t]).fold((()=>((e,t,o)=>{const n=e.getRect(t),r=e.getRect(o);return r.right>n.left&&r.left<n.right})(e,t,o)?Ni.success():s(t)),(e=>s(t))))))).getOr(Ni.none("default")),cata:(e,t,o,n,r)=>e.fold(t,o,n,r)},zi=ue("br"),Ai=(e,t,o)=>t(e,o).bind((e=>ie(e)&&0===hr(e).trim().length?Ai(e,t,o):C.some(e))),Li=(e,t,o,n)=>((e,t)=>We(e,t).filter(zi).orThunk((()=>We(e,t-1).filter(zi))))(t,o).bind((t=>n.traverse(t).fold((()=>Ai(t,n.gather,e).map(n.relative)),(e=>(e=>Ne(e).bind((t=>{const o=Le(t);return((e,t)=>W(e,w(Re,t)))(o,e).map((n=>((e,t,o,n)=>({parent:e,children:t,element:o,index:n}))(t,o,e,n)))})))(e).map((e=>ei.on(e.parent,e.index))))))),Wi=(e,t)=>({left:e.left,top:e.top+t,right:e.right,bottom:e.bottom+t}),Mi=(e,t)=>({left:e.left,top:e.top-t,right:e.right,bottom:e.bottom-t}),ji=(e,t,o)=>({left:e.left+t,top:e.top+o,right:e.right+t,bottom:e.bottom+o}),Pi=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom}),Ii=(e,t)=>C.some(e.getRect(t)),Fi=(e,t,o)=>ce(t)?Ii(e,t).map(Pi):ie(t)?((e,t,o)=>o>=0&&o<br(t)?e.getRangedRect(t,o,t,o+1):o>0?e.getRangedRect(t,o-1,t,o):C.none())(e,t,o).map(Pi):C.none(),Hi=(e,t)=>ce(t)?Ii(e,t).map(Pi):ie(t)?e.getRangedRect(t,0,t,br(t)).map(Pi):C.none(),$i=Zl([{none:[]},{retry:["caret"]}]),Vi=(e,t,o)=>gt(t,pa).fold(y,(t=>Hi(e,t).exists((e=>((e,t)=>e.left<t.left||Math.abs(t.right-e.left)<1||e.left>t.right)(o,e))))),qi={point:e=>e.bottom,adjuster:(e,t,o,n,r)=>{const s=Wi(r,5);return Math.abs(o.bottom-n.bottom)<1||o.top>r.bottom?$i.retry(s):o.top===r.bottom?$i.retry(Wi(r,1)):Vi(e,t,r)?$i.retry(ji(s,5,0)):$i.none()},move:Wi,gather:Ei},Ui=(e,t,o,n,r)=>0===r?C.some(n):((e,t,o)=>e.elementFromPoint(t,o).filter((e=>"table"===ne(e))).isSome())(e,n.left,t.point(n))?((e,t,o,n,r)=>Ui(e,t,o,t.move(n,5),r))(e,t,o,n,r-1):e.situsFromPoint(n.left,t.point(n)).bind((s=>s.start.fold(C.none,(s=>Hi(e,s).bind((l=>t.adjuster(e,s,l,o,n).fold(C.none,(n=>Ui(e,t,o,n,r-1))))).orThunk((()=>C.some(n)))),C.none))),Gi=(e,t,o)=>{const n=e.move(o,5),r=Ui(t,e,o,n,100).getOr(n);return((e,t,o)=>e.point(t)>o.getInnerHeight()?C.some(e.point(t)-o.getInnerHeight()):e.point(t)<0?C.some(-e.point(t)):C.none())(e,r,t).fold((()=>t.situsFromPoint(r.left,e.point(r))),(o=>(t.scrollBy(0,o),t.situsFromPoint(r.left,e.point(r)-o))))},Ki={tryUp:w(Gi,{point:e=>e.top,adjuster:(e,t,o,n,r)=>{const s=Mi(r,5);return Math.abs(o.top-n.top)<1||o.bottom<r.top?$i.retry(s):o.bottom===r.top?$i.retry(Mi(r,1)):Vi(e,t,r)?$i.retry(ji(s,5,0)):$i.none()},move:Mi,gather:ki}),tryDown:w(Gi,qi),getJumpSize:g(5)},Yi=(e,t,o)=>e.getSelection().bind((n=>((e,t,o,n)=>{const r=zi(t)?((e,t,o)=>o.traverse(t).orThunk((()=>Ai(t,o.gather,e))).map(o.relative))(e,t,n):Li(e,t,o,n);return r.map((e=>({start:e,finish:e})))})(t,n.finish,n.foffset,o).fold((()=>C.some(Fs(n.finish,n.foffset))),(r=>{const s=e.fromSitus(r);return l=_i.verify(e,n.finish,n.foffset,s.finish,s.foffset,o.failure,t),_i.cata(l,(e=>C.none()),(()=>C.none()),(e=>C.some(Fs(e,0))),(e=>C.some(Fs(e,br(e)))));var l})))),Ji=(e,t,o,n,r,s)=>0===s?C.none():Zi(e,t,o,n,r).bind((l=>{const a=e.fromSitus(l),c=_i.verify(e,o,n,a.finish,a.foffset,r.failure,t);return _i.cata(c,(()=>C.none()),(()=>C.some(l)),(l=>Re(o,l)&&0===n?Qi(e,o,n,Mi,r):Ji(e,t,l,0,r,s-1)),(l=>Re(o,l)&&n===br(l)?Qi(e,o,n,Wi,r):Ji(e,t,l,br(l),r,s-1)))})),Qi=(e,t,o,n,r)=>Fi(e,t,o).bind((t=>Xi(e,r,n(t,Ki.getJumpSize())))),Xi=(e,t,o)=>{const n=Bo().browser;return n.isChromium()||n.isSafari()||n.isFirefox()?t.retry(e,o):C.none()},Zi=(e,t,o,n,r)=>Fi(e,o,n).bind((t=>Xi(e,r,t))),em=(e,t,o,n,r)=>bt(n,"td,th",t).bind((n=>bt(n,"table",t).bind((s=>((e,t)=>ft(e,(e=>Ne(e).exists((e=>Re(e,t)))),void 0).isSome())(r,s)?((e,t,o)=>Yi(e,t,o).bind((n=>Ji(e,t,n.element,n.offset,o,20).map(e.fromSitus))))(e,t,o).bind((e=>bt(e.finish,"td,th",t).map((t=>({start:n,finish:t,range:e}))))):C.none())))),tm=(e,t,o,n,r,s)=>s(n,t).orThunk((()=>em(e,t,o,n,r).map((e=>{const t=e.range;return ti(C.some(hi(t.start,t.soffset,t.finish,t.foffset)),!0)})))),om=(e,t)=>bt(e,"tr",t).bind((e=>bt(e,"table",t).bind((o=>{const n=dt(o,"tr");return Re(e,n[0])?((e,t,o)=>Ri(Oi,e,(e=>Cr(e).isSome()),o))(o,0,t).map((e=>{const t=br(e);return ti(C.some(hi(e,t,e,t)),!0)})):C.none()})))),nm=(e,t)=>bt(e,"tr",t).bind((e=>bt(e,"table",t).bind((o=>{const n=dt(o,"tr");return Re(e,n[n.length-1])?((e,t,o)=>Di(Oi,e,(e=>xr(e).isSome()),o))(o,0,t).map((e=>ti(C.some(hi(e,0,e,0)),!0))):C.none()})))),rm=(e,t,o,n,r,s,l)=>em(e,o,n,r,s).bind((e=>pi(t,o,e.start,e.finish,l))),sm=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},lm=()=>{const e=(e=>{const t=sm(C.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(C.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(C.some(e))}}})(f);return{...e,on:t=>e.get().each(t)}},am=(e,t)=>bt(e,"td,th",t),cm=e=>Be(e).exists(Qr),im={traverse:Ae,gather:Ei,relative:ei.before,retry:Ki.tryDown,failure:_i.failedDown},mm={traverse:ze,gather:ki,relative:ei.before,retry:Ki.tryUp,failure:_i.failedUp},dm=e=>t=>t===e,um=dm(38),fm=dm(40),gm=e=>e>=37&&e<=40,hm={isBackward:dm(37),isForward:dm(39)},pm={isBackward:dm(39),isForward:dm(37)},wm=Zl([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),bm={domRange:wm.domRange,relative:wm.relative,exact:wm.exact,exactFromRange:e=>wm.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>xe.fromDom(e.startContainer),relative:(e,t)=>ei.getStart(e),exact:(e,t,o,n)=>e}))(e);return xe.fromDom(Ee(t).dom.defaultView)},range:ui},vm=document.caretPositionFromPoint?(e,t,o)=>{var n,r;return C.from(null===(r=(n=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(n,t,o)).bind((t=>{if(null===t.offsetNode)return C.none();const o=e.dom.createRange();return o.setStart(t.offsetNode,t.offset),o.collapse(),C.some(o)}))}:document.caretRangeFromPoint?(e,t,o)=>{var n,r;return C.from(null===(r=(n=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(n,t,o))}:C.none,ym=(e,t)=>{const o=ne(e);return"input"===o?ei.after(e):D(["br","img"],o)?0===t?ei.before(e):ei.after(e):ei.on(e,t)},xm=e=>C.from(e.getSelection()),Cm=(e,t)=>{xm(e).each((e=>{e.removeAllRanges(),e.addRange(t)}))},Sm=(e,t,o,n,r)=>{const s=li(e,t,o,n,r);Cm(e,s)},Tm=(e,t)=>mi(e,t).match({ltr:(t,o,n,r)=>{Sm(e,t,o,n,r)},rtl:(t,o,n,r)=>{xm(e).each((s=>{if(s.setBaseAndExtent)s.setBaseAndExtent(t.dom,o,n.dom,r);else if(s.extend)try{((e,t,o,n,r,s)=>{t.collapse(o.dom,n),t.extend(r.dom,s)})(0,s,t,o,n,r)}catch(s){Sm(e,n,r,t,o)}else Sm(e,n,r,t,o)}))}}),Rm=(e,t,o,n,r)=>{const s=((e,t,o,n)=>{const r=ym(e,t),s=ym(o,n);return bm.relative(r,s)})(t,o,n,r);Tm(e,s)},Dm=(e,t,o)=>{const n=((e,t)=>{const o=e.fold(ei.before,ym,ei.after),n=t.fold(ei.before,ym,ei.after);return bm.relative(o,n)})(t,o);Tm(e,n)},Om=e=>{if(e.rangeCount>0){const t=e.getRangeAt(0),o=e.getRangeAt(e.rangeCount-1);return C.some(ui(xe.fromDom(t.startContainer),t.startOffset,xe.fromDom(o.endContainer),o.endOffset))}return C.none()},km=e=>{if(null===e.anchorNode||null===e.focusNode)return Om(e);{const t=xe.fromDom(e.anchorNode),o=xe.fromDom(e.focusNode);return((e,t,o,n)=>{const r=((e,t,o,n)=>{const r=ke(e).dom.createRange();return r.setStart(e.dom,t),r.setEnd(o.dom,n),r})(e,t,o,n),s=Re(e,o)&&t===n;return r.collapsed&&!s})(t,e.anchorOffset,o,e.focusOffset)?C.some(ui(t,e.anchorOffset,o,e.focusOffset)):Om(e)}},Em=(e,t,o=!0)=>{const n=(o?ni:oi)(e,t);Cm(e,n)},Nm=e=>(e=>xm(e).filter((e=>e.rangeCount>0)).bind(km))(e).map((e=>bm.exact(e.start,e.soffset,e.finish,e.foffset))),Bm=e=>({elementFromPoint:(t,o)=>xe.fromPoint(xe.fromDom(e.document),t,o),getRect:e=>e.dom.getBoundingClientRect(),getRangedRect:(t,o,n,r)=>{const s=bm.exact(t,o,n,r);return((e,t)=>(e=>{const t=e.getClientRects(),o=t.length>0?t[0]:e.getBoundingClientRect();return o.width>0||o.height>0?C.some(o).map(ai):C.none()})(di(e,t)))(e,s)},getSelection:()=>Nm(e).map((t=>gi(e,t))),fromSitus:t=>{const o=bm.relative(t.start,t.finish);return gi(e,o)},situsFromPoint:(t,o)=>((e,t,o)=>((e,t,o)=>{const n=xe.fromDom(e.document);return vm(n,t,o).map((e=>ui(xe.fromDom(e.startContainer),e.startOffset,xe.fromDom(e.endContainer),e.endOffset)))})(e,t,o))(e,t,o).map((e=>fi(e.start,e.soffset,e.finish,e.foffset))),clearSelection:()=>{(e=>{xm(e).each((e=>e.removeAllRanges()))})(e)},collapseSelection:(t=!1)=>{Nm(e).each((o=>o.fold((e=>e.collapse(t)),((o,n)=>{const r=t?o:n;Dm(e,r,r)}),((o,n,r,s)=>{const l=t?o:r,a=t?n:s;Rm(e,l,a,l,a)}))))},setSelection:t=>{Rm(e,t.start,t.soffset,t.finish,t.foffset)},setRelativeSelection:(t,o)=>{Dm(e,t,o)},selectNode:t=>{Em(e,t,!1)},selectContents:t=>{Em(e,t)},getInnerHeight:()=>e.innerHeight,getScrollY:()=>(e=>{const t=void 0!==e?e.dom:document,o=t.body.scrollLeft||t.documentElement.scrollLeft,n=t.body.scrollTop||t.documentElement.scrollTop;return bn(o,n)})(xe.fromDom(e.document)).top,scrollBy:(t,o)=>{((e,t,o)=>{const n=(void 0!==o?o.dom:document).defaultView;n&&n.scrollBy(e,t)})(t,o,xe.fromDom(e.document))}}),_m=(e,t)=>({rows:e,cols:t}),zm=e=>gt(e,ae).exists(Qr),Am=(e,t)=>zm(e)||zm(t),Lm=e=>void 0!==e.dom.classList,Wm=(e,t)=>((e,t,o)=>{const n=((e,t)=>{const o=pe(e,t);return void 0===o||""===o?[]:o.split(" ")})(e,t).concat([o]);return ge(e,t,n.join(" ")),!0})(e,"class",t),Mm=(e,t)=>{Lm(e)?e.dom.classList.add(t):Wm(e,t)},jm=(e,t)=>Lm(e)&&e.dom.classList.contains(t),Pm=()=>({tag:"none"}),Im=e=>({tag:"multiple",elements:e}),Fm=e=>({tag:"single",element:e}),Hm=e=>{const t=xe.fromDom((e=>{if(nt()&&m(e.target)){const t=xe.fromDom(e.target);if(ce(t)&&m(t.dom.shadowRoot)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return H(t)}}return C.from(e.target)})(e).getOr(e.target)),o=()=>e.stopPropagation(),n=()=>e.preventDefault(),r=(s=n,l=o,(...e)=>s(l.apply(null,e)));var s,l;return((e,t,o,n,r,s,l)=>({target:e,x:t,y:o,stop:n,prevent:r,kill:s,raw:l}))(t,e.clientX,e.clientY,o,n,r,e)},$m=(e,t,o,n)=>{e.dom.removeEventListener(t,o,n)},Vm=x,qm=(e,t,o)=>((e,t,o,n)=>((e,t,o,n,r)=>{const s=((e,t)=>o=>{e(o)&&t(Hm(o))})(o,n);return e.dom.addEventListener(t,s,r),{unbind:w($m,e,t,s,r)}})(e,t,o,n,!1))(e,t,Vm,o),Um=Hm,Gm=e=>!jm(xe.fromDom(e.target),"ephox-snooker-resizer-bar"),Km=(e,t)=>{const o=(r=As.selectedSelector,{get:()=>Rs(xe.fromDom(e.getBody()),r).fold((()=>js(os(e),es(e)).fold(Pm,Fm)),Im)}),n=((e,t,o)=>{const n=t=>{be(t,e.selected),be(t,e.firstSelected),be(t,e.lastSelected)},r=t=>{ge(t,e.selected,"1")},s=e=>{l(e),o()},l=t=>{const o=dt(t,`${e.selectedSelector},${e.firstSelectedSelector},${e.lastSelectedSelector}`);N(o,n)};return{clearBeforeUpdate:l,clear:s,selectRange:(o,n,l,a)=>{s(o),N(n,r),ge(l,e.firstSelected,"1"),ge(a,e.lastSelected,"1"),t(n,l,a)},selectedSelector:e.selectedSelector,firstSelectedSelector:e.firstSelectedSelector,lastSelectedSelector:e.lastSelectedSelector}})(As,((t,o,n)=>{Kt(o).each((r=>{const s=Wr(e),l=Br(f,xe.fromDom(e.getDoc()),s),a=((e,t,o)=>{const n=Zo(e);return Ol(n,t).map((e=>{const t=xl(n,o,!1),{rows:r}=qo(t),s=((e,t)=>{const o=e.slice(0,t[t.length-1].row+1),n=Cl(o);return j(n,(e=>{const o=e.cells.slice(0,t[t.length-1].column+1);return E(o,(e=>e.element))}))})(r,e),l=((e,t)=>{const o=e.slice(t[0].row+t[0].rowspan-1,e.length),n=Cl(o);return j(n,(e=>{const o=e.cells.slice(t[0].column+t[0].colspan-1,e.cells.length);return E(o,(e=>e.element))}))})(r,e);return{upOrLeftCells:s,downOrRightCells:l}}))})(r,{selection:Ps(e)},l);((e,t,o,n,r)=>{e.dispatch("TableSelectionChange",{cells:t,start:o,finish:n,otherCells:r})})(e,t,o,n,a)}))}),(()=>(e=>{e.dispatch("TableSelectionClear")})(e)));var r;return e.on("init",(o=>{const r=e.getWin(),s=Zr(e),l=es(e),a=((e,t,o,n)=>{const r=((e,t,o,n)=>{const r=lm(),s=r.clear,l=s=>{r.on((r=>{n.clearBeforeUpdate(t),am(s.target,o).each((l=>{xs(r,l,o).each((o=>{const r=o.boxes.getOr([]);if(1===r.length){const o=r[0],l="false"===Xr(o),a=vt(Jr(s.target),o,Re);l&&a&&(n.selectRange(t,r,o,o),e.selectContents(o))}else r.length>1&&(n.selectRange(t,r,o.start,o.finish),e.selectContents(l))}))}))}))};return{clearstate:s,mousedown:e=>{n.clear(t),am(e.target,o).filter(cm).each(r.set)},mouseover:e=>{l(e)},mouseup:e=>{l(e),s()}}})(Bm(e),t,o,n);return{clearstate:r.clearstate,mousedown:r.mousedown,mouseover:r.mouseover,mouseup:r.mouseup}})(r,s,l,n),c=((e,t,o,n)=>{const r=Bm(e),s=()=>(n.clear(t),C.none());return{keydown:(e,l,a,c,i,m)=>{const d=e.raw,u=d.which,f=!0===d.shiftKey,g=Cs(t,n.selectedSelector).fold((()=>(gm(u)&&!f&&n.clearBeforeUpdate(t),gm(u)&&f&&!Am(l,c)?C.none:fm(u)&&f?w(rm,r,t,o,im,c,l,n.selectRange):um(u)&&f?w(rm,r,t,o,mm,c,l,n.selectRange):fm(u)?w(tm,r,o,im,c,l,nm):um(u)?w(tm,r,o,mm,c,l,om):C.none)),(e=>{const o=o=>()=>{const s=V(o,(o=>((e,t,o,n,r)=>Ts(n,e,t,r.firstSelectedSelector,r.lastSelectedSelector).map((e=>(r.clearBeforeUpdate(o),r.selectRange(o,e.boxes,e.start,e.finish),e.boxes))))(o.rows,o.cols,t,e,n)));return s.fold((()=>Ss(t,n.firstSelectedSelector,n.lastSelectedSelector).map((e=>{const o=fm(u)||m.isForward(u)?ei.after:ei.before;return r.setRelativeSelection(ei.on(e.first,0),o(e.table)),n.clear(t),ti(C.none(),!0)}))),(e=>C.some(ti(C.none(),!0))))};return gm(u)&&f&&!Am(l,c)?C.none:fm(u)&&f?o([_m(1,0)]):um(u)&&f?o([_m(-1,0)]):m.isBackward(u)&&f?o([_m(0,-1),_m(-1,0)]):m.isForward(u)&&f?o([_m(0,1),_m(1,0)]):gm(u)&&!f?s:C.none}));return g()},keyup:(e,r,s,l,a)=>Cs(t,n.selectedSelector).fold((()=>{const c=e.raw,i=c.which;return!0===c.shiftKey&&gm(i)&&Am(r,l)?((e,t,o,n,r,s,l)=>Re(o,r)&&n===s?C.none():bt(o,"td,th",t).bind((o=>bt(r,"td,th",t).bind((n=>pi(e,t,o,n,l))))))(t,o,r,s,l,a,n.selectRange):C.none()}),C.none)}})(r,s,l,n),i=((e,t,o,n)=>{const r=Bm(e);return(e,s)=>{n.clearBeforeUpdate(t),xs(e,s,o).each((e=>{const o=e.boxes.getOr([]);n.selectRange(t,o,e.start,e.finish),r.selectContents(s),r.collapseSelection()}))}})(r,s,l,n);e.on("TableSelectorChange",(e=>i(e.start,e.finish)));const m=(t,o)=>{(e=>!0===e.raw.shiftKey)(t)&&(o.kill&&t.kill(),o.selection.each((t=>{const o=bm.relative(t.start,t.finish),n=di(r,o);e.selection.setRng(n)})))},d=e=>0===e.button,u=(()=>{const e=sm(xe.fromDom(s)),t=sm(0);return{touchEnd:o=>{const n=xe.fromDom(o.target);if(ue("td")(n)||ue("th")(n)){const r=e.get(),s=t.get();Re(r,n)&&o.timeStamp-s<300&&(o.preventDefault(),i(n,n))}e.set(n),t.set(o.timeStamp)}}})();e.on("dragstart",(e=>{a.clearstate()})),e.on("mousedown",(e=>{d(e)&&Gm(e)&&a.mousedown(Um(e))})),e.on("mouseover",(e=>{var t;void 0!==(t=e).buttons&&0==(1&t.buttons)||!Gm(e)||a.mouseover(Um(e))})),e.on("mouseup",(e=>{d(e)&&Gm(e)&&a.mouseup(Um(e))})),e.on("touchend",u.touchEnd),e.on("keyup",(t=>{const o=Um(t);if(o.raw.shiftKey&&gm(o.raw.which)){const t=e.selection.getRng(),n=xe.fromDom(t.startContainer),r=xe.fromDom(t.endContainer);c.keyup(o,n,t.startOffset,r,t.endOffset).each((e=>{m(o,e)}))}})),e.on("keydown",(o=>{const n=Um(o);t.hide();const r=e.selection.getRng(),s=xe.fromDom(r.startContainer),l=xe.fromDom(r.endContainer),a=un(hm,pm)(xe.fromDom(e.selection.getStart()));c.keydown(n,s,r.startOffset,l,r.endOffset,a).each((e=>{m(n,e)})),t.show()})),e.on("NodeChange",(()=>{const t=e.selection,o=xe.fromDom(t.getStart()),r=xe.fromDom(t.getEnd());vs(Kt,[o,r]).fold((()=>n.clear(s)),f)}))})),e.on("PreInit",(()=>{e.serializer.addTempAttr(As.firstSelected),e.serializer.addTempAttr(As.lastSelected)})),{getSelectedCells:()=>((e,t,o,n)=>{switch(e.tag){case"none":return t();case"single":return(e=>[e.dom])(e.element);case"multiple":return(e=>E(e,(e=>e.dom)))(e.elements)}})(o.get(),g([])),clearSelectedCells:e=>n.clear(xe.fromDom(e))}},Ym=e=>{let t=[];return{bind:e=>{if(void 0===e)throw new Error("Event bind error: undefined handler");t.push(e)},unbind:e=>{t=_(t,(t=>t!==e))},trigger:(...o)=>{const n={};N(e,((e,t)=>{n[e]=o[t]})),N(t,(e=>{e(n)}))}}},Jm=e=>({registry:K(e,(e=>({bind:e.bind,unbind:e.unbind}))),trigger:K(e,(e=>e.trigger))}),Qm=e=>e.slice(0).sort(),Xm=(e,t)=>{const o=_(t,(t=>!D(e,t)));o.length>0&&(e=>{throw new Error("Unsupported keys for object: "+Qm(e).join(", "))})(o)},Zm=e=>((e,t)=>((e,t,o)=>{if(0===t.length)throw new Error("You must specify at least one required field.");return((e,t)=>{if(!l(t))throw new Error("The "+e+" fields must be an array. Was: "+t+".");N(t,(t=>{if(!r(t))throw new Error("The value "+t+" in the "+e+" fields was not a string.")}))})("required",t),(e=>{const t=Qm(e);L(t,((e,o)=>o<t.length-1&&e===t[o+1])).each((e=>{throw new Error("The field: "+e+" occurs more than once in the combined fields: ["+t.join(", ")+"].")}))})(t),n=>{const r=q(n);P(t,(e=>D(r,e)))||((e,t)=>{throw new Error("All required keys ("+Qm(e).join(", ")+") were not specified. Specified keys were: "+Qm(t).join(", ")+".")})(t,r),e(t,r);const s=_(t,(e=>!o.validate(n[e],e)));return s.length>0&&((e,t)=>{throw new Error("All values need to be of type: "+t+". Keys ("+Qm(e).join(", ")+") were not.")})(s,o.label),n}})(e,t,{validate:d,label:"function"}))(Xm,e),ed=Zm(["compare","extract","mutate","sink"]),td=Zm(["element","start","stop","destroy"]),od=Zm(["forceDrop","drop","move","delayDrop"]),nd=()=>{const e=(()=>{const e=Jm({move:Ym(["info"])});return{onEvent:f,reset:f,events:e.registry}})(),t=(()=>{let e=C.none();const t=Jm({move:Ym(["info"])});return{onEvent:(o,n)=>{n.extract(o).each((o=>{const r=((t,o)=>{const n=e.map((e=>t.compare(e,o)));return e=C.some(o),n})(n,o);r.each((e=>{t.trigger.move(e)}))}))},reset:()=>{e=C.none()},events:t.registry}})();let o=e;return{on:()=>{o.reset(),o=t},off:()=>{o.reset(),o=e},isOn:()=>o===t,onEvent:(e,t)=>{o.onEvent(e,t)},events:t.events}},rd=e=>{const t=e.replace(/\./g,"-");return{resolve:e=>t+"-"+e}},sd=rd("ephox-dragster").resolve;var ld=ed({compare:(e,t)=>bn(t.left-e.left,t.top-e.top),extract:e=>C.some(bn(e.x,e.y)),sink:(e,t)=>{const o=(e=>{const t={layerClass:sd("blocker"),...e},o=xe.fromTag("div");return ge(o,"role","presentation"),Bt(o,{position:"fixed",left:"0px",top:"0px",width:"100%",height:"100%"}),Mm(o,sd("blocker")),Mm(o,t.layerClass),{element:g(o),destroy:()=>{qe(o)}}})(t),n=qm(o.element(),"mousedown",e.forceDrop),r=qm(o.element(),"mouseup",e.drop),s=qm(o.element(),"mousemove",e.move),l=qm(o.element(),"mouseout",e.delayDrop);return td({element:o.element,start:e=>{Ie(e,o.element())},stop:()=>{qe(o.element())},destroy:()=>{o.destroy(),r.unbind(),s.unbind(),l.unbind(),n.unbind()}})},mutate:(e,t)=>{e.mutate(t.left,t.top)}});const ad=rd("ephox-snooker").resolve,cd=ad("resizer-bar"),id=ad("resizer-rows"),md=ad("resizer-cols"),dd=e=>{const t=dt(e.parent(),"."+cd);N(t,qe)},ud=(e,t,o)=>{const n=e.origin();N(t,(t=>{t.each((t=>{const r=o(n,t);Mm(r,cd),Ie(e.parent(),r)}))}))},fd=(e,t,o,n,r)=>{const s=yn(o),l=t.isResizable,a=n.length>0?_n.positions(n,o):[],c=a.length>0?((e,t)=>j(e.all,((e,o)=>t(e.element)?[o]:[])))(e,l):[];((e,t,o,n)=>{ud(e,t,((e,t)=>{const r=((e,t,o,n,r)=>{const s=xe.fromTag("div");return Bt(s,{position:"absolute",left:t+"px",top:o-3.5+"px",height:"7px",width:n+"px"}),he(s,{"data-row":e,role:"presentation"}),s})(t.row,o.left-e.left,t.y-e.top,n);return Mm(r,id),r}))})(t,_(a,((e,t)=>O(c,(e=>t===e)))),s,Wo(o));const i=r.length>0?An.positions(r,o):[],m=i.length>0?((e,t)=>{const o=[];return k(e.grid.columns,(n=>{an(e,n).map((e=>e.element)).forall(t)&&o.push(n)})),_(o,(o=>{const n=nn(e,(e=>e.column===o));return P(n,(e=>t(e.element)))}))})(e,l):[];((e,t,o,n)=>{ud(e,t,((e,t)=>{const r=((e,t,o,n,r)=>{const s=xe.fromTag("div");return Bt(s,{position:"absolute",left:t-3.5+"px",top:o+"px",height:r+"px",width:"7px"}),he(s,{"data-column":e,role:"presentation"}),s})(t.col,t.x-e.left,o.top-e.top,0,n);return Mm(r,md),r}))})(t,_(i,((e,t)=>O(m,(e=>t===e)))),s,pn(o))},gd=(e,t)=>{if(dd(e),e.isResizable(t)){const o=Zo(t),n=dn(o),r=cn(o);fd(o,e,t,n,r)}},hd=(e,t)=>{const o=dt(e.parent(),"."+cd);N(o,t)},pd=e=>{hd(e,(e=>{Nt(e,"display","none")}))},wd=e=>{hd(e,(e=>{Nt(e,"display","block")}))},bd=ad("resizer-bar-dragging"),vd=e=>{const t=(()=>{const e=Jm({drag:Ym(["xDelta","yDelta","target"])});let t=C.none();const o=(()=>{const e=Jm({drag:Ym(["xDelta","yDelta"])});return{mutate:(t,o)=>{e.trigger.drag(t,o)},events:e.registry}})();return o.events.drag.bind((o=>{t.each((t=>{e.trigger.drag(o.xDelta,o.yDelta,t)}))})),{assign:e=>{t=C.some(e)},get:()=>t,mutate:o.mutate,events:e.registry}})(),o=((e,t={})=>{var o;return((e,t,o)=>{let n=!1;const r=Jm({start:Ym([]),stop:Ym([])}),s=nd(),l=()=>{m.stop(),s.isOn()&&(s.off(),r.trigger.stop())},c=((e,t)=>{let o=null;const n=()=>{a(o)||(clearTimeout(o),o=null)};return{cancel:n,throttle:(...t)=>{n(),o=setTimeout((()=>{o=null,e.apply(null,t)}),200)}}})(l);s.events.move.bind((o=>{t.mutate(e,o.info)}));const i=e=>(...t)=>{n&&e.apply(null,t)},m=t.sink(od({forceDrop:l,drop:i(l),move:i((e=>{c.cancel(),s.onEvent(e,t)})),delayDrop:i(c.throttle)}),o);return{element:m.element,go:e=>{m.start(e),s.on(),r.trigger.start()},on:()=>{n=!0},off:()=>{n=!1},isActive:()=>n,destroy:()=>{m.destroy()},events:r.registry}})(e,null!==(o=t.mode)&&void 0!==o?o:ld,t)})(t,{});let n=C.none();const r=(e,t)=>C.from(pe(e,t));t.events.drag.bind((e=>{r(e.target,"data-row").each((t=>{const o=It(e.target,"top");Nt(e.target,"top",o+e.yDelta+"px")})),r(e.target,"data-column").each((t=>{const o=It(e.target,"left");Nt(e.target,"left",o+e.xDelta+"px")}))}));const s=(e,t)=>It(e,t)-Wt(e,"data-initial-"+t,0);o.events.stop.bind((()=>{t.get().each((t=>{n.each((o=>{r(t,"data-row").each((e=>{const n=s(t,"top");be(t,"data-initial-top"),d.trigger.adjustHeight(o,n,parseInt(e,10))})),r(t,"data-column").each((e=>{const n=s(t,"left");be(t,"data-initial-left"),d.trigger.adjustWidth(o,n,parseInt(e,10))})),gd(e,o)}))}))}));const l=(n,r)=>{d.trigger.startAdjust(),t.assign(n),ge(n,"data-initial-"+r,It(n,r)),Mm(n,bd),Nt(n,"opacity","0.2"),o.go(e.parent())},c=qm(e.parent(),"mousedown",(e=>{var t;t=e.target,jm(t,id)&&l(e.target,"top"),(e=>jm(e,md))(e.target)&&l(e.target,"left")})),i=t=>Re(t,e.view()),m=qm(e.view(),"mouseover",(t=>{var r;(r=t.target,bt(r,"table",i).filter(Qr)).fold((()=>{lt(t.target)&&dd(e)}),(t=>{o.isActive()&&(n=C.some(t),gd(e,t))}))})),d=Jm({adjustHeight:Ym(["table","delta","row"]),adjustWidth:Ym(["table","delta","column"]),startAdjust:Ym([])});return{destroy:()=>{c.unbind(),m.unbind(),o.destroy(),dd(e)},refresh:t=>{gd(e,t)},on:o.on,off:o.off,hideBars:w(pd,e),showBars:w(wd,e),events:d.registry}},yd=(e,t,o)=>{const n=_n,r=An,s=vd(e),l=Jm({beforeResize:Ym(["table","type"]),afterResize:Ym(["table","type"]),startDrag:Ym([])});return s.events.adjustHeight.bind((e=>{const t=e.table;l.trigger.beforeResize(t,"row");((e,t,o,n)=>{const r=Zo(e),s=((e,t,o)=>lr(e,t,o,Yn,(e=>e.getOrThunk(Ht))))(r,e,n),l=E(s,((e,n)=>o===n?Math.max(t+e,Ht()):e)),a=oa(r,l),c=((e,t)=>E(e.all,((e,o)=>({element:e.element,height:t[o]}))))(r,l);N(c,(e=>{$n(e.element,e.height)})),N(a,(e=>{$n(e.element,e.height)}));const i=z(l,((e,t)=>e+t),0);$n(e,i)})(t,n.delta(e.delta,t),e.row,n),l.trigger.afterResize(t,"row")})),s.events.startAdjust.bind((e=>{l.trigger.startDrag()})),s.events.adjustWidth.bind((e=>{const n=e.table;l.trigger.beforeResize(n,"col");const s=r.delta(e.delta,n),a=o(n);ra(n,s,e.column,t,a),l.trigger.afterResize(n,"col")})),{on:s.on,off:s.off,refreshBars:s.refresh,hideBars:s.hideBars,showBars:s.showBars,destroy:s.destroy,events:l.registry}},xd=e=>m(e)&&"TABLE"===e.nodeName,Cd="bar-",Sd=e=>"false"!==pe(e,"data-mce-resize"),Td=e=>{const t=lm(),o=lm(),n=lm();let r,s;const l=t=>fc(e,t),a=()=>Pr(e)?el():Zs();return e.on("init",(()=>{const r=((e,t)=>e.inline?((e,t,o)=>({parent:g(t),view:g(e),origin:g(bn(0,0)),isResizable:o}))(xe.fromDom(e.getBody()),(()=>{const e=xe.fromTag("div");return Bt(e,{position:"static",height:"0",width:"0",padding:"0",margin:"0",border:"0"}),Ie(at(xe.fromDom(document)),e),e})(),t):((e,t)=>{const o=me(e)?(e=>xe.fromDom(Ee(e).dom.documentElement))(e):e;return{parent:g(o),view:g(e),origin:g(bn(0,0)),isResizable:t}})(xe.fromDom(e.getDoc()),t))(e,Sd);if(n.set(r),(e=>{const t=e.options.get("object_resizing");return D(t.split(","),"table")})(e)&&qr(e)){const n=a(),s=yd(r,n,l);s.on(),s.events.startDrag.bind((o=>{t.set(e.selection.getRng())})),s.events.beforeResize.bind((t=>{const o=t.table.dom;((e,t,o,n,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:o,height:n,origin:r})})(e,o,ns(o),rs(o),Cd+t.type)})),s.events.afterResize.bind((o=>{const n=o.table,r=n.dom;ts(n),t.on((t=>{e.selection.setRng(t),e.focus()})),((e,t,o,n,r)=>{e.dispatch("ObjectResized",{target:t,width:o,height:n,origin:r})})(e,r,ns(r),rs(r),Cd+o.type),e.undoManager.add()})),o.set(s)}})),e.on("ObjectResizeStart",(t=>{const o=t.target;if(xd(o)){const n=xe.fromDom(o);N(e.dom.select(".mce-clonedresizable"),(t=>{e.dom.addClass(t,"mce-"+jr(e)+"-columns")})),!kc(n)&&$r(e)?_c(n):!Oc(n)&&Hr(e)&&Bc(n),Ec(n)&&Tt(t.origin,Cd)&&Bc(n),r=t.width,s=Vr(e)?"":((e,t)=>{const o=e.dom.getStyle(t,"width")||e.dom.getAttrib(t,"width");return C.from(o).filter(Ot)})(e,o).getOr("")}})),e.on("ObjectResized",(t=>{const o=t.target;if(xd(o)){const n=xe.fromDom(o),c=t.origin;Tt(c,"corner-")&&((t,o,n)=>{const c=Rt(o,"e");if(""===s&&Bc(t),n!==r&&""!==s){Nt(t,"width",s);const o=a(),i=l(t),m=Pr(e)||c?(e=>tl(e).columns)(t)-1:0;ra(t,n-r,m,o,i)}else if((e=>/^(\d+(\.\d+)?)%$/.test(e))(s)){const e=parseFloat(s.replace("%",""));Nt(t,"width",n*e/r+"%")}(e=>/^(\d+(\.\d+)?)px$/.test(e))(s)&&(e=>{const t=Zo(e);ln(t)||N(Ut(e),(e=>{const t=_t(e,"width");Nt(e,"width",t),be(e,"width")}))})(t)})(n,c,t.width),ts(n),ic(e,n.dom,mc)}})),e.on("SwitchMode",(()=>{o.on((t=>{e.mode.isReadOnly()?t.hideBars():t.showBars()}))})),e.on("dragstart dragend",(e=>{o.on((t=>{"dragstart"===e.type?(t.hideBars(),t.off()):(t.on(),t.showBars())}))})),e.on("remove",(()=>{o.on((e=>{e.destroy()})),n.on((t=>{((e,t)=>{e.inline&&qe(t.parent())})(e,t)}))})),{refresh:e=>{o.on((t=>t.refreshBars(xe.fromDom(e))))},hide:()=>{o.on((e=>e.hideBars()))},show:()=>{o.on((e=>e.showBars()))}}},Rd=e=>{(e=>{const t=e.options.register;t("table_clone_elements",{processor:"string[]"}),t("table_use_colgroups",{processor:"boolean",default:!0}),t("table_header_type",{processor:e=>{const t=D(["section","cells","sectionCells","auto"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: section, cells, sectionCells or auto."}},default:"section"}),t("table_sizing_mode",{processor:"string",default:"auto"}),t("table_default_attributes",{processor:"object",default:{border:"1"}}),t("table_default_styles",{processor:"object",default:{"border-collapse":"collapse"}}),t("table_column_resizing",{processor:e=>{const t=D(["preservetable","resizetable"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be preservetable, or resizetable."}},default:"preservetable"}),t("table_resize_bars",{processor:"boolean",default:!0}),t("table_style_by_css",{processor:"boolean",default:!0}),t("table_merge_content_on_paste",{processor:"boolean",default:!0})})(e);const t=Td(e),o=Km(e,t),n=gc(e,t,o);return Xc(e,n),((e,t)=>{const o=es(e),n=t=>js(os(e)).bind((n=>Kt(n,o).map((o=>{const r=Ls(Ps(e),o,n);return t(o,r)})))).getOr("");G({mceTableRowType:()=>n(t.getTableRowType),mceTableCellType:()=>n(t.getTableCellType),mceTableColType:()=>n(t.getTableColType)},((t,o)=>e.addQueryValueHandler(o,t)))})(e,n),Is(e,n),{getSelectedCells:o.getSelectedCells,clearSelectedCells:o.clearSelectedCells}};e.add("dom",(e=>({table:Rd(e)})))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/advlist/plugin.min.js b/public/libs/tinymce/plugins/advlist/plugin.min.js
index 244b01974ce..ef5c0141bc2 100644
--- a/public/libs/tinymce/plugins/advlist/plugin.min.js
+++ b/public/libs/tinymce/plugins/advlist/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=(t,e,s)=>{const r="UL"===e?"InsertUnorderedList":"InsertOrderedList";t.execCommand(r,!1,!1===s?null:{"list-style-type":s})},s=t=>e=>e.options.get(t),r=s("advlist_number_styles"),n=s("advlist_bullet_styles"),i=t=>null==t,l=t=>!i(t);var o=tinymce.util.Tools.resolve("tinymce.util.Tools");class a{constructor(t,e){this.tag=t,this.value=e}static some(t){return new a(!0,t)}static none(){return a.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?a.some(t(this.value)):a.none()}bind(t){return this.tag?t(this.value):a.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:a.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return l(t)?a.some(t):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);const u=t=>e=>l(e)&&t.test(e.nodeName),d=u(/^(OL|UL|DL)$/),g=u(/^(TH|TD)$/),c=t=>i(t)||"default"===t?"":t,h=(t,e)=>s=>((t,e)=>{const s=t.selection.getNode();return e({parents:t.dom.getParents(s),element:s}),t.on("NodeChange",e),()=>t.off("NodeChange",e)})(t,(r=>((t,r)=>{const n=t.selection.getStart(!0);s.setActive(((t,e,s)=>((t,e,s)=>{for(let e=0,n=t.length;e<n;e++){const n=t[e];if(d(r=n)&&!/\btox\-/.test(r.className))return a.some(n);if(s(n,e))break}var r;return a.none()})(e,0,g).exists((e=>e.nodeName===s&&((t,e)=>t.dom.isChildOf(e,t.getBody()))(t,e))))(t,r,e)),s.setEnabled(!((t,e)=>{const s=t.dom.getParent(e,"ol,ul,dl");return((t,e)=>null!==e&&!t.dom.isEditable(e))(t,s)&&t.selection.isEditable()})(t,n)&&t.selection.isEditable())})(t,r.parents))),m=(t,s,r,n,i,l)=>{l.length>1?((t,s,r,n,i,l)=>{t.ui.registry.addSplitButton(s,{tooltip:r,icon:"OL"===i?"ordered-list":"unordered-list",presets:"listpreview",columns:3,fetch:t=>{t(o.map(l,(t=>{const e="OL"===i?"num":"bull",s="disc"===t||"decimal"===t?"default":t,r=c(t),n=(t=>t.replace(/\-/g," ").replace(/\b\w/g,(t=>t.toUpperCase())))(t);return{type:"choiceitem",value:r,icon:"list-"+e+"-"+s,text:n}})))},onAction:()=>t.execCommand(n),onItemAction:(s,r)=>{e(t,i,r)},select:e=>{const s=(t=>{const e=t.dom.getParent(t.selection.getNode(),"ol,ul"),s=t.dom.getStyle(e,"listStyleType");return a.from(s)})(t);return s.map((t=>e===t)).getOr(!1)},onSetup:h(t,i)})})(t,s,r,n,i,l):((t,s,r,n,i,l)=>{t.ui.registry.addToggleButton(s,{active:!1,tooltip:r,icon:"OL"===i?"ordered-list":"unordered-list",onSetup:h(t,i),onAction:()=>t.queryCommandState(n)||""===l?t.execCommand(n):e(t,i,l)})})(t,s,r,n,i,c(l[0]))};t.add("advlist",(t=>{t.hasPlugin("lists")?((t=>{const e=t.options.register;e("advlist_number_styles",{processor:"string[]",default:"default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman".split(",")}),e("advlist_bullet_styles",{processor:"string[]",default:"default,circle,square".split(",")})})(t),(t=>{m(t,"numlist","Numbered list","InsertOrderedList","OL",r(t)),m(t,"bullist","Bullet list","InsertUnorderedList","UL",n(t))})(t),(t=>{t.addCommand("ApplyUnorderedListStyle",((s,r)=>{e(t,"UL",r["list-style-type"])})),t.addCommand("ApplyOrderedListStyle",((s,r)=>{e(t,"OL",r["list-style-type"])}))})(t)):console.error("Please use the Lists plugin together with the Advanced List plugin.")}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/anchor/plugin.min.js b/public/libs/tinymce/plugins/anchor/plugin.min.js
index e1c650ff1c3..cf19304ed5f 100644
--- a/public/libs/tinymce/plugins/anchor/plugin.min.js
+++ b/public/libs/tinymce/plugins/anchor/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),o=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=("allow_html_in_named_anchor",e=>e.options.get("allow_html_in_named_anchor"));const a="a:not([href])",r=e=>!e,i=e=>e.getAttribute("id")||e.getAttribute("name")||"",l=e=>(e=>"a"===e.nodeName.toLowerCase())(e)&&!e.getAttribute("href")&&""!==i(e),s=e=>e.dom.getParent(e.selection.getStart(),a),d=(e,a)=>{const r=s(e);r?((e,t,o)=>{o.removeAttribute("name"),o.id=t,e.addVisual(),e.undoManager.add()})(e,a,r):((e,a)=>{e.undoManager.transact((()=>{n(e)||e.selection.collapse(!0),e.selection.isCollapsed()?e.insertContent(e.dom.createHTML("a",{id:a})):((e=>{const n=e.dom;t(n).walk(e.selection.getRng(),(e=>{o.each(e,(e=>{var t;l(t=e)&&!t.firstChild&&n.remove(e,!1)}))}))})(e),e.formatter.remove("namedAnchor",void 0,void 0,!0),e.formatter.apply("namedAnchor",{value:a}),e.addVisual())}))})(e,a),e.focus()},c=e=>(e=>r(e.attr("href"))&&!r(e.attr("id")||e.attr("name")))(e)&&!e.firstChild,m=e=>t=>{for(let o=0;o<t.length;o++){const n=t[o];c(n)&&n.attr("contenteditable",e)}},u=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}};e.add("anchor",(e=>{(e=>{(0,e.options.register)("allow_html_in_named_anchor",{processor:"boolean",default:!1})})(e),(e=>{e.on("PreInit",(()=>{e.parser.addNodeFilter("a",m("false")),e.serializer.addNodeFilter("a",m(null))}))})(e),(e=>{e.addCommand("mceAnchor",(()=>{(e=>{const t=(e=>{const t=s(e);return t?i(t):""})(e);e.windowManager.open({title:"Anchor",size:"normal",body:{type:"panel",items:[{name:"id",type:"input",label:"ID",placeholder:"example"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{id:t},onSubmit:t=>{((e,t)=>/^[A-Za-z][A-Za-z0-9\-:._]*$/.test(t)?(d(e,t),!0):(e.windowManager.alert("ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores."),!1))(e,t.getData().id)&&t.close()}})})(e)}))})(e),(e=>{const t=()=>e.execCommand("mceAnchor");e.ui.registry.addToggleButton("anchor",{icon:"bookmark",tooltip:"Anchor",onAction:t,onSetup:t=>{const o=e.selection.selectorChangedWithUnbind("a:not([href])",t.setActive).unbind,n=u(e)(t);return()=>{o(),n()}}}),e.ui.registry.addMenuItem("anchor",{icon:"bookmark",text:"Anchor...",onAction:t,onSetup:u(e)})})(e),e.on("PreInit",(()=>{(e=>{e.formatter.register("namedAnchor",{inline:"a",selector:a,remove:"all",split:!0,deep:!0,attributes:{id:"%value"},onmatch:(e,t,o)=>l(e)})})(e)}))}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autolink/plugin.min.js b/public/libs/tinymce/plugins/autolink/plugin.min.js
index 220664d5ac9..df56de1f648 100644
--- a/public/libs/tinymce/plugins/autolink/plugin.min.js
+++ b/public/libs/tinymce/plugins/autolink/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>t.options.get(e),n=t("autolink_pattern"),o=t("link_default_target"),r=t("link_default_protocol"),a=t("allow_unsafe_link_target"),s=("string",e=>"string"===(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(a=o.constructor)||void 0===a?void 0:a.name)===r.name)?"string":t;var n,o,r,a})(e));const l=(void 0,e=>undefined===e);const i=e=>!(e=>null==e)(e),c=Object.hasOwnProperty,d=e=>"\ufeff"===e;var u=tinymce.util.Tools.resolve("tinymce.dom.TextSeeker");const f=e=>/^[(\[{ \u00a0]$/.test(e),g=(e,t,n)=>{for(let o=t-1;o>=0;o--){const t=e.charAt(o);if(!d(t)&&n(t))return o}return-1},m=(e,t)=>{var o;const a=e.schema.getVoidElements(),s=n(e),{dom:i,selection:d}=e;if(null!==i.getParent(d.getNode(),"a[href]"))return null;const m=d.getRng(),k=u(i,(e=>{return i.isBlock(e)||(t=a,n=e.nodeName.toLowerCase(),c.call(t,n))||"false"===i.getContentEditable(e);var t,n})),{container:p,offset:y}=((e,t)=>{let n=e,o=t;for(;1===n.nodeType&&n.childNodes[o];)n=n.childNodes[o],o=3===n.nodeType?n.data.length:n.childNodes.length;return{container:n,offset:o}})(m.endContainer,m.endOffset),w=null!==(o=i.getParent(p,i.isBlock))&&void 0!==o?o:i.getRoot(),h=k.backwards(p,y+t,((e,t)=>{const n=e.data,o=g(n,t,(r=f,e=>!r(e)));var r,a;return-1===o||(a=n[o],/[?!,.;:]/.test(a))?o:o+1}),w);if(!h)return null;let v=h.container;const _=k.backwards(h.container,h.offset,((e,t)=>{v=e;const n=g(e.data,t,f);return-1===n?n:n+1}),w),A=i.createRng();_?A.setStart(_.container,_.offset):A.setStart(v,0),A.setEnd(h.container,h.offset);const C=A.toString().replace(/\uFEFF/g,"").match(s);if(C){let t=C[0];return $="www.",(b=t).length>=4&&b.substr(0,4)===$?t=r(e)+"://"+t:((e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!l(o)||r+t.length<=o)})(t,"@")&&!(e=>/^([A-Za-z][A-Za-z\d.+-]*:\/\/)|mailto:/.test(e))(t)&&(t="mailto:"+t),{rng:A,url:t}}var b,$;return null},k=(e,t)=>{const{dom:n,selection:r}=e,{rng:l,url:i}=t,c=r.getBookmark();r.setRng(l);const d="createlink",u={command:d,ui:!1,value:i};if(!e.dispatch("BeforeExecCommand",u).isDefaultPrevented()){e.getDoc().execCommand(d,!1,i),e.dispatch("ExecCommand",u);const t=o(e);if(s(t)){const o=r.getNode();n.setAttrib(o,"target",t),"_blank"!==t||a(e)||n.setAttrib(o,"rel","noopener")}}r.moveToBookmark(c),e.nodeChanged()},p=e=>{const t=m(e,-1);i(t)&&k(e,t)},y=p;e.add("autolink",(e=>{(e=>{const t=e.options.register;t("autolink_pattern",{processor:"regexp",default:new RegExp("^"+/(?:[A-Za-z][A-Za-z\d.+-]{0,14}:\/\/(?:[-.~*+=!&;:'%@?^${}(),\w]+@)?|www\.|[-;:&=+$,.\w]+@)[A-Za-z\d-]+(?:\.[A-Za-z\d-]+)*(?::\d+)?(?:\/(?:[-.~*+=!;:'%@$(),\/\w]*[-~*+=%@$()\/\w])?)?(?:\?(?:[-.~*+=!&;:'%@?^${}(),\/\w]+))?(?:#(?:[-.~*+=!&;:'%@?^${}(),\/\w]+))?/g.source+"$","i")}),t("link_default_target",{processor:"string"}),t("link_default_protocol",{processor:"string",default:"https"})})(e),(e=>{e.on("keydown",(t=>{13!==t.keyCode||t.isDefaultPrevented()||(e=>{const t=m(e,0);i(t)&&k(e,t)})(e)})),e.on("keyup",(t=>{32===t.keyCode?p(e):(48===t.keyCode&&t.shiftKey||221===t.keyCode)&&y(e)}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autoresize/plugin.min.js b/public/libs/tinymce/plugins/autoresize/plugin.min.js
index 0432684a406..c4d6f877515 100644
--- a/public/libs/tinymce/plugins/autoresize/plugin.min.js
+++ b/public/libs/tinymce/plugins/autoresize/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.Env");const o=e=>t=>t.options.get(e),s=o("min_height"),i=o("max_height"),n=o("autoresize_overflow_padding"),r=o("autoresize_bottom_margin"),l=(e,t)=>{const o=e.getBody();o&&(o.style.overflowY=t?"":"hidden",t||(o.scrollTop=0))},g=(e,t,o,s)=>{var i;const n=parseInt(null!==(i=e.getStyle(t,o,s))&&void 0!==i?i:"",10);return isNaN(n)?0:n},a=(e,o,r,c)=>{var d;const f=e.dom,u=e.getDoc();if(!u)return;if((e=>e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen())(e))return void l(e,!0);const m=u.documentElement,h=c?c():n(e),p=null!==(d=s(e))&&void 0!==d?d:e.getElement().offsetHeight;let y=p;const S=g(f,m,"margin-top",!0),v=g(f,m,"margin-bottom",!0);let C=m.offsetHeight+S+v+h;C<0&&(C=0);const b=e.getContainer().offsetHeight-e.getContentAreaContainer().offsetHeight;C+b>p&&(y=C+b);const w=i(e);if(w&&y>w?(y=w,l(e,!0)):l(e,!1),y!==o.get()){const s=y-o.get();if(f.setStyle(e.getContainer(),"height",y+"px"),o.set(y),(e=>{e.dispatch("ResizeEditor")})(e),t.browser.isSafari()&&(t.os.isMacOS()||t.os.isiOS())){const t=e.getWin();t.scrollTo(t.pageXOffset,t.pageYOffset)}e.hasFocus()&&(e=>{if("setcontent"===(null==e?void 0:e.type.toLowerCase())){const t=e;return!0===t.selection||!0===t.paste}return!1})(r)&&e.selection.scrollIntoView(),(t.browser.isSafari()||t.browser.isChromium())&&s<0&&a(e,o,r,c)}};e.add("autoresize",(e=>{if((e=>{const t=e.options.register;t("autoresize_overflow_padding",{processor:"number",default:1}),t("autoresize_bottom_margin",{processor:"number",default:50})})(e),e.options.isSet("resize")||e.options.set("resize",!1),!e.inline){const o=(e=>{let t=0;return{get:()=>t,set:e=>{t=e}}})();((e,t)=>{e.addCommand("mceAutoResize",(()=>{a(e,t)}))})(e,o),((e,o)=>{let s,i,l=()=>r(e);e.on("init",(i=>{s=0;const r=n(e),g=e.dom;g.setStyles(e.getDoc().documentElement,{height:"auto"}),t.browser.isEdge()||t.browser.isIE()?g.setStyles(e.getBody(),{paddingLeft:r,paddingRight:r,"min-height":0}):g.setStyles(e.getBody(),{paddingLeft:r,paddingRight:r}),a(e,o,i,l),s+=1})),e.on("NodeChange SetContent keyup FullscreenStateChanged ResizeContent",(t=>{if(1===s)i=e.getContainer().offsetHeight,a(e,o,t,l),s+=1;else if(2===s){const t=i<e.getContainer().offsetHeight;if(t){const t=e.dom,o=e.getDoc();t.setStyles(o.documentElement,{"min-height":0}),t.setStyles(e.getBody(),{"min-height":"inherit"})}l=t?(0,()=>0):l,s+=1}else a(e,o,t,l)}))})(e,o)}}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autosave/plugin.min.js b/public/libs/tinymce/plugins/autosave/plugin.min.js
index 362325ff77f..110f508d65d 100644
--- a/public/libs/tinymce/plugins/autosave/plugin.min.js
+++ b/public/libs/tinymce/plugins/autosave/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=("string",t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(r=o=t,(a=String).prototype.isPrototypeOf(r)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===a.name)?"string":e;var r,o,a,s})(t));const r=(void 0,t=>undefined===t);var o=tinymce.util.Tools.resolve("tinymce.util.Delay"),a=tinymce.util.Tools.resolve("tinymce.util.LocalStorage"),s=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=t=>{const e=/^(\d+)([ms]?)$/.exec(t);return(e&&e[2]?{s:1e3,m:6e4}[e[2]]:1)*parseInt(t,10)},i=t=>e=>e.options.get(t),u=i("autosave_ask_before_unload"),l=i("autosave_restore_when_empty"),c=i("autosave_interval"),d=i("autosave_retention"),m=t=>{const e=document.location;return t.options.get("autosave_prefix").replace(/{path}/g,e.pathname).replace(/{query}/g,e.search).replace(/{hash}/g,e.hash).replace(/{id}/g,t.id)},v=(t,e)=>{if(r(e))return t.dom.isEmpty(t.getBody());{const r=s.trim(e);if(""===r)return!0;{const e=(new DOMParser).parseFromString(r,"text/html");return t.dom.isEmpty(e)}}},f=t=>{var e;const r=parseInt(null!==(e=a.getItem(m(t)+"time"))&&void 0!==e?e:"0",10)||0;return!((new Date).getTime()-r>d(t)&&(p(t,!1),1))},p=(t,e)=>{const r=m(t);a.removeItem(r+"draft"),a.removeItem(r+"time"),!1!==e&&(t=>{t.dispatch("RemoveDraft")})(t)},g=t=>{const e=m(t);!v(t)&&t.isDirty()&&(a.setItem(e+"draft",t.getContent({format:"raw",no_events:!0})),a.setItem(e+"time",(new Date).getTime().toString()),(t=>{t.dispatch("StoreDraft")})(t))},y=t=>{var e;const r=m(t);f(t)&&(t.setContent(null!==(e=a.getItem(r+"draft"))&&void 0!==e?e:"",{format:"raw"}),(t=>{t.dispatch("RestoreDraft")})(t))};var D=tinymce.util.Tools.resolve("tinymce.EditorManager");const h=t=>e=>{e.setEnabled(f(t));const r=()=>e.setEnabled(f(t));return t.on("StoreDraft RestoreDraft RemoveDraft",r),()=>t.off("StoreDraft RestoreDraft RemoveDraft",r)};t.add("autosave",(t=>((t=>{const r=t.options.register,o=t=>{const r=e(t);return r?{value:n(t),valid:r}:{valid:!1,message:"Must be a string."}};r("autosave_ask_before_unload",{processor:"boolean",default:!0}),r("autosave_prefix",{processor:"string",default:"tinymce-autosave-{path}{query}{hash}-{id}-"}),r("autosave_restore_when_empty",{processor:"boolean",default:!1}),r("autosave_interval",{processor:o,default:"30s"}),r("autosave_retention",{processor:o,default:"20m"})})(t),(t=>{t.editorManager.on("BeforeUnload",(t=>{let e;s.each(D.get(),(t=>{t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&u(t)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))})),e&&(t.preventDefault(),t.returnValue=e)}))})(t),(t=>{(t=>{const e=c(t);o.setEditorInterval(t,(()=>{g(t)}),e)})(t);const e=()=>{(t=>{t.undoManager.transact((()=>{y(t),p(t)})),t.focus()})(t)};t.ui.registry.addButton("restoredraft",{tooltip:"Restore last draft",icon:"restore-draft",onAction:e,onSetup:h(t)}),t.ui.registry.addMenuItem("restoredraft",{text:"Restore last draft",icon:"restore-draft",onAction:e,onSetup:h(t)})})(t),t.on("init",(()=>{l(t)&&t.dom.isEmpty(t.getBody())&&y(t)})),(t=>({hasDraft:()=>f(t),storeDraft:()=>g(t),restoreDraft:()=>y(t),removeDraft:e=>p(t,e),isEmpty:e=>v(t,e)}))(t))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/charmap/plugin.min.js b/public/libs/tinymce/plugins/charmap/plugin.min.js
index 9660ebd9e72..9f7f1c161af 100644
--- a/public/libs/tinymce/plugins/charmap/plugin.min.js
+++ b/public/libs/tinymce/plugins/charmap/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=(e,t)=>{const r=((e,t)=>e.dispatch("insertCustomChar",{chr:t}))(e,t).chr;e.execCommand("mceInsertContent",!1,r)},r=e=>t=>e===t,a=("array",e=>"array"===(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(r=a=e,(n=String).prototype.isPrototypeOf(r)||(null===(i=a.constructor)||void 0===i?void 0:i.name)===n.name)?"string":t;var r,a,n,i})(e));const n=r(null),i=r(void 0),o=e=>"function"==typeof e,s=(!1,()=>false);class l{constructor(e,t){this.tag=e,this.value=t}static some(e){return new l(!0,e)}static none(){return l.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?l.some(e(this.value)):l.none()}bind(e){return this.tag?e(this.value):l.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:l.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?l.none():l.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}l.singletonNone=new l(!1);const c=Array.prototype.push,u=(e,t)=>{const r=e.length,a=new Array(r);for(let n=0;n<r;n++){const r=e[n];a[n]=t(r,n)}return a};var g=tinymce.util.Tools.resolve("tinymce.util.Tools");const h=e=>t=>t.options.get(e),m=h("charmap"),p=h("charmap_append"),d=g.isArray,f="User Defined",y=e=>{return d(e)?(t=e,g.grep(t,(e=>d(e)&&2===e.length))):"function"==typeof e?e():[];var t},b=e=>{const t=((e,t)=>{const r=m(e);r&&(t=[{name:f,characters:y(r)}]);const a=p(e);if(a){const e=g.grep(t,(e=>e.name===f));return e.length?(e[0].characters=[...e[0].characters,...y(a)],t):t.concat({name:f,characters:y(a)})}return t})(e,[{name:"Currency",characters:[[36,"dollar sign"],[162,"cent sign"],[8364,"euro sign"],[163,"pound sign"],[165,"yen sign"],[164,"currency sign"],[8352,"euro-currency sign"],[8353,"colon sign"],[8354,"cruzeiro sign"],[8355,"french franc sign"],[8356,"lira sign"],[8357,"mill sign"],[8358,"naira sign"],[8359,"peseta sign"],[8360,"rupee sign"],[8361,"won sign"],[8362,"new sheqel sign"],[8363,"dong sign"],[8365,"kip sign"],[8366,"tugrik sign"],[8367,"drachma sign"],[8368,"german penny symbol"],[8369,"peso sign"],[8370,"guarani sign"],[8371,"austral sign"],[8372,"hryvnia sign"],[8373,"cedi sign"],[8374,"livre tournois sign"],[8375,"spesmilo sign"],[8376,"tenge sign"],[8377,"indian rupee sign"],[8378,"turkish lira sign"],[8379,"nordic mark sign"],[8380,"manat sign"],[8381,"ruble sign"],[20870,"yen character"],[20803,"yuan character"],[22291,"yuan character, in hong kong and taiwan"],[22278,"yen/yuan character variant one"]]},{name:"Text",characters:[[169,"copyright sign"],[174,"registered sign"],[8482,"trade mark sign"],[8240,"per mille sign"],[181,"micro sign"],[183,"middle dot"],[8226,"bullet"],[8230,"three dot leader"],[8242,"minutes / feet"],[8243,"seconds / inches"],[167,"section sign"],[182,"paragraph sign"],[223,"sharp s / ess-zed"]]},{name:"Quotations",characters:[[8249,"single left-pointing angle quotation mark"],[8250,"single right-pointing angle quotation mark"],[171,"left pointing guillemet"],[187,"right pointing guillemet"],[8216,"left single quotation mark"],[8217,"right single quotation mark"],[8220,"left double quotation mark"],[8221,"right double quotation mark"],[8218,"single low-9 quotation mark"],[8222,"double low-9 quotation mark"],[60,"less-than sign"],[62,"greater-than sign"],[8804,"less-than or equal to"],[8805,"greater-than or equal to"],[8211,"en dash"],[8212,"em dash"],[175,"macron"],[8254,"overline"],[164,"currency sign"],[166,"broken bar"],[168,"diaeresis"],[161,"inverted exclamation mark"],[191,"turned question mark"],[710,"circumflex accent"],[732,"small tilde"],[176,"degree sign"],[8722,"minus sign"],[177,"plus-minus sign"],[247,"division sign"],[8260,"fraction slash"],[215,"multiplication sign"],[185,"superscript one"],[178,"superscript two"],[179,"superscript three"],[188,"fraction one quarter"],[189,"fraction one half"],[190,"fraction three quarters"]]},{name:"Mathematical",characters:[[402,"function / florin"],[8747,"integral"],[8721,"n-ary sumation"],[8734,"infinity"],[8730,"square root"],[8764,"similar to"],[8773,"approximately equal to"],[8776,"almost equal to"],[8800,"not equal to"],[8801,"identical to"],[8712,"element of"],[8713,"not an element of"],[8715,"contains as member"],[8719,"n-ary product"],[8743,"logical and"],[8744,"logical or"],[172,"not sign"],[8745,"intersection"],[8746,"union"],[8706,"partial differential"],[8704,"for all"],[8707,"there exists"],[8709,"diameter"],[8711,"backward difference"],[8727,"asterisk operator"],[8733,"proportional to"],[8736,"angle"]]},{name:"Extended Latin",characters:[[192,"A - grave"],[193,"A - acute"],[194,"A - circumflex"],[195,"A - tilde"],[196,"A - diaeresis"],[197,"A - ring above"],[256,"A - macron"],[198,"ligature AE"],[199,"C - cedilla"],[200,"E - grave"],[201,"E - acute"],[202,"E - circumflex"],[203,"E - diaeresis"],[274,"E - macron"],[204,"I - grave"],[205,"I - acute"],[206,"I - circumflex"],[207,"I - diaeresis"],[298,"I - macron"],[208,"ETH"],[209,"N - tilde"],[210,"O - grave"],[211,"O - acute"],[212,"O - circumflex"],[213,"O - tilde"],[214,"O - diaeresis"],[216,"O - slash"],[332,"O - macron"],[338,"ligature OE"],[352,"S - caron"],[217,"U - grave"],[218,"U - acute"],[219,"U - circumflex"],[220,"U - diaeresis"],[362,"U - macron"],[221,"Y - acute"],[376,"Y - diaeresis"],[562,"Y - macron"],[222,"THORN"],[224,"a - grave"],[225,"a - acute"],[226,"a - circumflex"],[227,"a - tilde"],[228,"a - diaeresis"],[229,"a - ring above"],[257,"a - macron"],[230,"ligature ae"],[231,"c - cedilla"],[232,"e - grave"],[233,"e - acute"],[234,"e - circumflex"],[235,"e - diaeresis"],[275,"e - macron"],[236,"i - grave"],[237,"i - acute"],[238,"i - circumflex"],[239,"i - diaeresis"],[299,"i - macron"],[240,"eth"],[241,"n - tilde"],[242,"o - grave"],[243,"o - acute"],[244,"o - circumflex"],[245,"o - tilde"],[246,"o - diaeresis"],[248,"o slash"],[333,"o macron"],[339,"ligature oe"],[353,"s - caron"],[249,"u - grave"],[250,"u - acute"],[251,"u - circumflex"],[252,"u - diaeresis"],[363,"u - macron"],[253,"y - acute"],[254,"thorn"],[255,"y - diaeresis"],[563,"y - macron"],[913,"Alpha"],[914,"Beta"],[915,"Gamma"],[916,"Delta"],[917,"Epsilon"],[918,"Zeta"],[919,"Eta"],[920,"Theta"],[921,"Iota"],[922,"Kappa"],[923,"Lambda"],[924,"Mu"],[925,"Nu"],[926,"Xi"],[927,"Omicron"],[928,"Pi"],[929,"Rho"],[931,"Sigma"],[932,"Tau"],[933,"Upsilon"],[934,"Phi"],[935,"Chi"],[936,"Psi"],[937,"Omega"],[945,"alpha"],[946,"beta"],[947,"gamma"],[948,"delta"],[949,"epsilon"],[950,"zeta"],[951,"eta"],[952,"theta"],[953,"iota"],[954,"kappa"],[955,"lambda"],[956,"mu"],[957,"nu"],[958,"xi"],[959,"omicron"],[960,"pi"],[961,"rho"],[962,"final sigma"],[963,"sigma"],[964,"tau"],[965,"upsilon"],[966,"phi"],[967,"chi"],[968,"psi"],[969,"omega"]]},{name:"Symbols",characters:[[8501,"alef symbol"],[982,"pi symbol"],[8476,"real part symbol"],[978,"upsilon - hook symbol"],[8472,"Weierstrass p"],[8465,"imaginary part"]]},{name:"Arrows",characters:[[8592,"leftwards arrow"],[8593,"upwards arrow"],[8594,"rightwards arrow"],[8595,"downwards arrow"],[8596,"left right arrow"],[8629,"carriage return"],[8656,"leftwards double arrow"],[8657,"upwards double arrow"],[8658,"rightwards double arrow"],[8659,"downwards double arrow"],[8660,"left right double arrow"],[8756,"therefore"],[8834,"subset of"],[8835,"superset of"],[8836,"not a subset of"],[8838,"subset of or equal to"],[8839,"superset of or equal to"],[8853,"circled plus"],[8855,"circled times"],[8869,"perpendicular"],[8901,"dot operator"],[8968,"left ceiling"],[8969,"right ceiling"],[8970,"left floor"],[8971,"right floor"],[9001,"left-pointing angle bracket"],[9002,"right-pointing angle bracket"],[9674,"lozenge"],[9824,"black spade suit"],[9827,"black club suit"],[9829,"black heart suit"],[9830,"black diamond suit"],[8194,"en space"],[8195,"em space"],[8201,"thin space"],[8204,"zero width non-joiner"],[8205,"zero width joiner"],[8206,"left-to-right mark"],[8207,"right-to-left mark"]]}]);return t.length>1?[{name:"All",characters:(r=t,n=e=>e.characters,(e=>{const t=[];for(let r=0,n=e.length;r<n;++r){if(!a(e[r]))throw new Error("Arr.flatten item "+r+" was not an array, input: "+e);c.apply(t,e[r])}return t})(u(r,n)))}].concat(t):t;var r,n},w=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},v=(e,t,r=0,a)=>{const n=e.indexOf(t,r);return-1!==n&&(!!i(a)||n+t.length<=a)},k=String.fromCodePoint,C=(e,t)=>{const r=[],a=t.toLowerCase();return((e,t)=>{for(let t=0,i=e.length;t<i;t++)((e,t,r)=>!!v(k(e).toLowerCase(),r)||v(t.toLowerCase(),r)||v(t.toLowerCase().replace(/\s+/g,""),r))((n=e[t])[0],n[1],a)&&r.push(n);var n})(e.characters),u(r,(e=>({text:e[1],value:k(e[0]),icon:k(e[0])})))},x="pattern",A=(e,r)=>{const a=()=>[{label:"Search",type:"input",name:x},{type:"collection",name:"results"}],i=1===r.length?w(f):w("All"),o=((e,t)=>{let r=null;const a=()=>{n(r)||(clearTimeout(r),r=null)};return{cancel:a,throttle:(...t)=>{a(),r=setTimeout((()=>{r=null,e.apply(null,t)}),40)}}})((e=>{const t=e.getData().pattern;((e,t)=>{var a,n;(a=r,n=e=>e.name===i.get(),((e,t,r)=>{for(let a=0,n=e.length;a<n;a++){const n=e[a];if(t(n,a))return l.some(n);if(r(n,a))break}return l.none()})(a,n,s)).each((r=>{const a=C(r,t);e.setData({results:a})}))})(e,t)})),c={title:"Special Character",size:"normal",body:1===r.length?{type:"panel",items:a()}:{type:"tabpanel",tabs:u(r,(e=>({title:e.name,name:e.name,items:a()})))},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}],initialData:{pattern:"",results:C(r[0],"")},onAction:(r,a)=>{"results"===a.name&&(t(e,a.value),r.close())},onTabChange:(e,t)=>{i.set(t.newTabName),o.throttle(e)},onChange:(e,t)=>{t.name===x&&o.throttle(e)}};e.windowManager.open(c).focus(x)},q=e=>t=>{const r=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",r),r(),()=>{e.off("NodeChange",r)}};e.add("charmap",(e=>{(e=>{const t=e.options.register,r=e=>o(e)||a(e);t("charmap",{processor:r}),t("charmap_append",{processor:r})})(e);const r=b(e);return((e,t)=>{e.addCommand("mceShowCharmap",(()=>{A(e,t)}))})(e,r),(e=>{const t=()=>e.execCommand("mceShowCharmap");e.ui.registry.addButton("charmap",{icon:"insert-character",tooltip:"Special character",onAction:t,onSetup:q(e)}),e.ui.registry.addMenuItem("charmap",{icon:"insert-character",text:"Special character...",onAction:t,onSetup:q(e)})})(e),((e,t)=>{e.ui.registry.addAutocompleter("charmap",{trigger:":",columns:"auto",minChars:2,fetch:(e,r)=>new Promise(((r,a)=>{r(C(t,e))})),onAction:(t,r,a)=>{e.selection.setRng(r),e.insertContent(a),t.hide()}})})(e,r[0]),(e=>({getCharMap:()=>b(e),insertChar:r=>{t(e,r)}}))(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/code/plugin.min.js b/public/libs/tinymce/plugins/code/plugin.min.js
index 644eee54c31..a76b4982452 100644
--- a/public/libs/tinymce/plugins/code/plugin.min.js
+++ b/public/libs/tinymce/plugins/code/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";tinymce.util.Tools.resolve("tinymce.PluginManager").add("code",(e=>((e=>{e.addCommand("mceCodeEditor",(()=>{(e=>{const o=(e=>e.getContent({source_view:!0}))(e);e.windowManager.open({title:"Source Code",size:"large",body:{type:"panel",items:[{type:"textarea",name:"code"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{code:o},onSubmit:o=>{((e,o)=>{e.focus(),e.undoManager.transact((()=>{e.setContent(o)})),e.selection.setCursorLocation(),e.nodeChanged()})(e,o.getData().code),o.close()}})})(e)}))})(e),(e=>{const o=()=>e.execCommand("mceCodeEditor");e.ui.registry.addButton("code",{icon:"sourcecode",tooltip:"Source code",onAction:o}),e.ui.registry.addMenuItem("code",{icon:"sourcecode",text:"Source code",onAction:o})})(e),{})))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/codesample/plugin.min.js b/public/libs/tinymce/plugins/codesample/plugin.min.js
index 71d3e4f26f7..f3936a81051 100644
--- a/public/libs/tinymce/plugins/codesample/plugin.min.js
+++ b/public/libs/tinymce/plugins/codesample/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>!(e=>null==e)(e),n=()=>{};class a{constructor(e,t){this.tag=e,this.value=t}static some(e){return new a(!0,e)}static none(){return a.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?a.some(e(this.value)):a.none()}bind(e){return this.tag?e(this.value):a.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:a.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return t(e)?a.some(e):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);var s=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils");const r="undefined"!=typeof window?window:Function("return this;")(),i=function(e,t,n){const a=window.Prism;window.Prism={manual:!0};var s=function(e){var t=/(?:^|\s)lang(?:uage)?-([\w-]+)(?=\s|$)/i,n=0,a={},s={manual:e.Prism&&e.Prism.manual,disableWorkerMessageHandler:e.Prism&&e.Prism.disableWorkerMessageHandler,util:{encode:function e(t){return t instanceof r?new r(t.type,e(t.content),t.alias):Array.isArray(t)?t.map(e):t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).slice(8,-1)},objId:function(e){return e.__id||Object.defineProperty(e,"__id",{value:++n}),e.__id},clone:function e(t,n){var a,r;switch(n=n||{},s.util.type(t)){case"Object":if(r=s.util.objId(t),n[r])return n[r];for(var i in a={},n[r]=a,t)t.hasOwnProperty(i)&&(a[i]=e(t[i],n));return a;case"Array":return r=s.util.objId(t),n[r]?n[r]:(a=[],n[r]=a,t.forEach((function(t,s){a[s]=e(t,n)})),a);default:return t}},getLanguage:function(e){for(;e;){var n=t.exec(e.className);if(n)return n[1].toLowerCase();e=e.parentElement}return"none"},setLanguage:function(e,n){e.className=e.className.replace(RegExp(t,"gi"),""),e.classList.add("language-"+n)},currentScript:function(){if("undefined"==typeof document)return null;if("currentScript"in document)return document.currentScript;try{throw new Error}catch(a){var e=(/at [^(\r\n]*\((.*):[^:]+:[^:]+\)$/i.exec(a.stack)||[])[1];if(e){var t=document.getElementsByTagName("script");for(var n in t)if(t[n].src==e)return t[n]}return null}},isActive:function(e,t,n){for(var a="no-"+t;e;){var s=e.classList;if(s.contains(t))return!0;if(s.contains(a))return!1;e=e.parentElement}return!!n}},languages:{plain:a,plaintext:a,text:a,txt:a,extend:function(e,t){var n=s.util.clone(s.languages[e]);for(var a in t)n[a]=t[a];return n},insertBefore:function(e,t,n,a){var r=(a=a||s.languages)[e],i={};for(var o in r)if(r.hasOwnProperty(o)){if(o==t)for(var l in n)n.hasOwnProperty(l)&&(i[l]=n[l]);n.hasOwnProperty(o)||(i[o]=r[o])}var u=a[e];return a[e]=i,s.languages.DFS(s.languages,(function(t,n){n===u&&t!=e&&(this[t]=i)})),i},DFS:function e(t,n,a,r){r=r||{};var i=s.util.objId;for(var o in t)if(t.hasOwnProperty(o)){n.call(t,o,t[o],a||o);var l=t[o],u=s.util.type(l);"Object"!==u||r[i(l)]?"Array"!==u||r[i(l)]||(r[i(l)]=!0,e(l,n,o,r)):(r[i(l)]=!0,e(l,n,null,r))}}},plugins:{},highlightAll:function(e,t){s.highlightAllUnder(document,e,t)},highlightAllUnder:function(e,t,n){var a={callback:n,container:e,selector:'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'};s.hooks.run("before-highlightall",a),a.elements=Array.prototype.slice.apply(a.container.querySelectorAll(a.selector)),s.hooks.run("before-all-elements-highlight",a);for(var r,i=0;r=a.elements[i++];)s.highlightElement(r,!0===t,a.callback)},highlightElement:function(t,n,a){var r=s.util.getLanguage(t),i=s.languages[r];s.util.setLanguage(t,r);var o=t.parentElement;o&&"pre"===o.nodeName.toLowerCase()&&s.util.setLanguage(o,r);var l={element:t,language:r,grammar:i,code:t.textContent};function u(e){l.highlightedCode=e,s.hooks.run("before-insert",l),l.element.innerHTML=l.highlightedCode,s.hooks.run("after-highlight",l),s.hooks.run("complete",l),a&&a.call(l.element)}if(s.hooks.run("before-sanity-check",l),(o=l.element.parentElement)&&"pre"===o.nodeName.toLowerCase()&&!o.hasAttribute("tabindex")&&o.setAttribute("tabindex","0"),!l.code)return s.hooks.run("complete",l),void(a&&a.call(l.element));if(s.hooks.run("before-highlight",l),l.grammar)if(n&&e.Worker){var c=new Worker(s.filename);c.onmessage=function(e){u(e.data)},c.postMessage(JSON.stringify({language:l.language,code:l.code,immediateClose:!0}))}else u(s.highlight(l.code,l.grammar,l.language));else u(s.util.encode(l.code))},highlight:function(e,t,n){var a={code:e,grammar:t,language:n};if(s.hooks.run("before-tokenize",a),!a.grammar)throw new Error('The language "'+a.language+'" has no grammar.');return a.tokens=s.tokenize(a.code,a.grammar),s.hooks.run("after-tokenize",a),r.stringify(s.util.encode(a.tokens),a.language)},tokenize:function(e,t){var n=t.rest;if(n){for(var a in n)t[a]=n[a];delete t.rest}var s=new l;return u(s,s.head,e),o(e,s,t,s.head,0),function(e){for(var t=[],n=e.head.next;n!==e.tail;)t.push(n.value),n=n.next;return t}(s)},hooks:{all:{},add:function(e,t){var n=s.hooks.all;n[e]=n[e]||[],n[e].push(t)},run:function(e,t){var n=s.hooks.all[e];if(n&&n.length)for(var a,r=0;a=n[r++];)a(t)}},Token:r};function r(e,t,n,a){this.type=e,this.content=t,this.alias=n,this.length=0|(a||"").length}function i(e,t,n,a){e.lastIndex=t;var s=e.exec(n);if(s&&a&&s[1]){var r=s[1].length;s.index+=r,s[0]=s[0].slice(r)}return s}function o(e,t,n,a,l,d){for(var g in n)if(n.hasOwnProperty(g)&&n[g]){var p=n[g];p=Array.isArray(p)?p:[p];for(var b=0;b<p.length;++b){if(d&&d.cause==g+","+b)return;var h=p[b],f=h.inside,m=!!h.lookbehind,y=!!h.greedy,w=h.alias;if(y&&!h.pattern.global){var k=h.pattern.toString().match(/[imsuy]*$/)[0];h.pattern=RegExp(h.pattern.source,k+"g")}for(var v=h.pattern||h,_=a.next,x=l;_!==t.tail&&!(d&&x>=d.reach);x+=_.value.length,_=_.next){var F=_.value;if(t.length>e.length)return;if(!(F instanceof r)){var A,S=1;if(y){if(!(A=i(v,x,e,m))||A.index>=e.length)break;var $=A.index,z=A.index+A[0].length,E=x;for(E+=_.value.length;$>=E;)E+=(_=_.next).value.length;if(x=E-=_.value.length,_.value instanceof r)continue;for(var C=_;C!==t.tail&&(E<z||"string"==typeof C.value);C=C.next)S++,E+=C.value.length;S--,F=e.slice(x,E),A.index-=x}else if(!(A=i(v,0,F,m)))continue;$=A.index;var j=A[0],B=F.slice(0,$),T=F.slice($+j.length),O=x+F.length;d&&O>d.reach&&(d.reach=O);var P=_.prev;if(B&&(P=u(t,P,B),x+=B.length),c(t,P,S),_=u(t,P,new r(g,f?s.tokenize(j,f):j,w,j)),T&&u(t,_,T),S>1){var N={cause:g+","+b,reach:O};o(e,t,n,_.prev,x,N),d&&N.reach>d.reach&&(d.reach=N.reach)}}}}}}function l(){var e={value:null,prev:null,next:null},t={value:null,prev:e,next:null};e.next=t,this.head=e,this.tail=t,this.length=0}function u(e,t,n){var a=t.next,s={value:n,prev:t,next:a};return t.next=s,a.prev=s,e.length++,s}function c(e,t,n){for(var a=t.next,s=0;s<n&&a!==e.tail;s++)a=a.next;t.next=a,a.prev=t,e.length-=s}if(e.Prism=s,r.stringify=function e(t,n){if("string"==typeof t)return t;if(Array.isArray(t)){var a="";return t.forEach((function(t){a+=e(t,n)})),a}var r={type:t.type,content:e(t.content,n),tag:"span",classes:["token",t.type],attributes:{},language:n},i=t.alias;i&&(Array.isArray(i)?Array.prototype.push.apply(r.classes,i):r.classes.push(i)),s.hooks.run("wrap",r);var o="";for(var l in r.attributes)o+=" "+l+'="'+(r.attributes[l]||"").replace(/"/g,"&quot;")+'"';return"<"+r.tag+' class="'+r.classes.join(" ")+'"'+o+">"+r.content+"</"+r.tag+">"},!e.document)return e.addEventListener?(s.disableWorkerMessageHandler||e.addEventListener("message",(function(t){var n=JSON.parse(t.data),a=n.language,r=n.code,i=n.immediateClose;e.postMessage(s.highlight(r,s.languages[a],a)),i&&e.close()}),!1),s):s;var d=s.util.currentScript();function g(){s.manual||s.highlightAll()}if(d&&(s.filename=d.src,d.hasAttribute("data-manual")&&(s.manual=!0)),!s.manual){var p=document.readyState;"loading"===p||"interactive"===p&&d&&d.defer?document.addEventListener("DOMContentLoaded",g):window.requestAnimationFrame?window.requestAnimationFrame(g):window.setTimeout(g,16)}return s}("undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{});return s.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/(\b(?:class|extends|implements|instanceof|interface|new|trait)\s+|\bcatch\s+\()[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:break|catch|continue|do|else|finally|for|function|if|in|instanceof|new|null|return|throw|try|while)\b/,boolean:/\b(?:false|true)\b/,function:/\b\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,punctuation:/[{}[\];(),.:]/},function(e){function t(e,t){return"___"+e.toUpperCase()+t+"___"}Object.defineProperties(e.languages["markup-templating"]={},{buildPlaceholders:{value:function(n,a,s,r){if(n.language===a){var i=n.tokenStack=[];n.code=n.code.replace(s,(function(e){if("function"==typeof r&&!r(e))return e;for(var s,o=i.length;-1!==n.code.indexOf(s=t(a,o));)++o;return i[o]=e,s})),n.grammar=e.languages.markup}}},tokenizePlaceholders:{value:function(n,a){if(n.language===a&&n.tokenStack){n.grammar=e.languages[a];var s=0,r=Object.keys(n.tokenStack);!function i(o){for(var l=0;l<o.length&&!(s>=r.length);l++){var u=o[l];if("string"==typeof u||u.content&&"string"==typeof u.content){var c=r[s],d=n.tokenStack[c],g="string"==typeof u?u:u.content,p=t(a,c),b=g.indexOf(p);if(b>-1){++s;var h=g.substring(0,b),f=new e.Token(a,e.tokenize(d,n.grammar),"language-"+a,d),m=g.substring(b+p.length),y=[];h&&y.push.apply(y,i([h])),y.push(f),m&&y.push.apply(y,i([m])),"string"==typeof u?o.splice.apply(o,[l,1].concat(y)):u.content=y}}else u.content&&i(u.content)}return o}(n.tokens)}}}})}(s),s.languages.c=s.languages.extend("clike",{comment:{pattern:/\/\/(?:[^\r\n\\]|\\(?:\r\n?|\n|(?![\r\n])))*|\/\*[\s\S]*?(?:\*\/|$)/,greedy:!0},string:{pattern:/"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,greedy:!0},"class-name":{pattern:/(\b(?:enum|struct)\s+(?:__attribute__\s*\(\([\s\S]*?\)\)\s*)?)\w+|\b[a-z]\w*_t\b/,lookbehind:!0},keyword:/\b(?:_Alignas|_Alignof|_Atomic|_Bool|_Complex|_Generic|_Imaginary|_Noreturn|_Static_assert|_Thread_local|__attribute__|asm|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|inline|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|typeof|union|unsigned|void|volatile|while)\b/,function:/\b[a-z_]\w*(?=\s*\()/i,number:/(?:\b0x(?:[\da-f]+(?:\.[\da-f]*)?|\.[\da-f]+)(?:p[+-]?\d+)?|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?)[ful]{0,4}/i,operator:/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?/}),s.languages.insertBefore("c","string",{char:{pattern:/'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n]){0,32}'/,greedy:!0}}),s.languages.insertBefore("c","string",{macro:{pattern:/(^[\t ]*)#\s*[a-z](?:[^\r\n\\/]|\/(?!\*)|\/\*(?:[^*]|\*(?!\/))*\*\/|\\(?:\r\n|[\s\S]))*/im,lookbehind:!0,greedy:!0,alias:"property",inside:{string:[{pattern:/^(#\s*include\s*)<[^>]+>/,lookbehind:!0},s.languages.c.string],char:s.languages.c.char,comment:s.languages.c.comment,"macro-name":[{pattern:/(^#\s*define\s+)\w+\b(?!\()/i,lookbehind:!0},{pattern:/(^#\s*define\s+)\w+\b(?=\()/i,lookbehind:!0,alias:"function"}],directive:{pattern:/^(#\s*)[a-z]+/,lookbehind:!0,alias:"keyword"},"directive-hash":/^#/,punctuation:/##|\\(?=[\r\n])/,expression:{pattern:/\S[\s\S]*/,inside:s.languages.c}}}}),s.languages.insertBefore("c","function",{constant:/\b(?:EOF|NULL|SEEK_CUR|SEEK_END|SEEK_SET|__DATE__|__FILE__|__LINE__|__TIMESTAMP__|__TIME__|__func__|stderr|stdin|stdout)\b/}),delete s.languages.c.boolean,function(e){var t=/\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|char8_t|class|co_await|co_return|co_yield|compl|concept|const|const_cast|consteval|constexpr|constinit|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|final|float|for|friend|goto|if|import|inline|int|int16_t|int32_t|int64_t|int8_t|long|module|mutable|namespace|new|noexcept|nullptr|operator|override|private|protected|public|register|reinterpret_cast|requires|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|uint16_t|uint32_t|uint64_t|uint8_t|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,n=/\b(?!<keyword>)\w+(?:\s*\.\s*\w+)*\b/.source.replace(/<keyword>/g,(function(){return t.source}));e.languages.cpp=e.languages.extend("c",{"class-name":[{pattern:RegExp(/(\b(?:class|concept|enum|struct|typename)\s+)(?!<keyword>)\w+/.source.replace(/<keyword>/g,(function(){return t.source}))),lookbehind:!0},/\b[A-Z]\w*(?=\s*::\s*\w+\s*\()/,/\b[A-Z_]\w*(?=\s*::\s*~\w+\s*\()/i,/\b\w+(?=\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>\s*::\s*\w+\s*\()/],keyword:t,number:{pattern:/(?:\b0b[01']+|\b0x(?:[\da-f']+(?:\.[\da-f']*)?|\.[\da-f']+)(?:p[+-]?[\d']+)?|(?:\b[\d']+(?:\.[\d']*)?|\B\.[\d']+)(?:e[+-]?[\d']+)?)[ful]{0,4}/i,greedy:!0},operator:/>>=?|<<=?|->|--|\+\+|&&|\|\||[?:~]|<=>|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,boolean:/\b(?:false|true)\b/}),e.languages.insertBefore("cpp","string",{module:{pattern:RegExp(/(\b(?:import|module)\s+)/.source+"(?:"+/"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|<[^<>\r\n]*>/.source+"|"+/<mod-name>(?:\s*:\s*<mod-name>)?|:\s*<mod-name>/.source.replace(/<mod-name>/g,(function(){return n}))+")"),lookbehind:!0,greedy:!0,inside:{string:/^[<"][\s\S]+/,operator:/:/,punctuation:/\./}},"raw-string":{pattern:/R"([^()\\ ]{0,16})\([\s\S]*?\)\1"/,alias:"string",greedy:!0}}),e.languages.insertBefore("cpp","keyword",{"generic-function":{pattern:/\b(?!operator\b)[a-z_]\w*\s*<(?:[^<>]|<[^<>]*>)*>(?=\s*\()/i,inside:{function:/^\w+/,generic:{pattern:/<[\s\S]+/,alias:"class-name",inside:e.languages.cpp}}}}),e.languages.insertBefore("cpp","operator",{"double-colon":{pattern:/::/,alias:"punctuation"}}),e.languages.insertBefore("cpp","class-name",{"base-clause":{pattern:/(\b(?:class|struct)\s+\w+\s*:\s*)[^;{}"'\s]+(?:\s+[^;{}"'\s]+)*(?=\s*[;{])/,lookbehind:!0,greedy:!0,inside:e.languages.extend("cpp",{})}}),e.languages.insertBefore("inside","double-colon",{"class-name":/\b[a-z_]\w*\b(?!\s*::)/i},e.languages.cpp["base-clause"])}(s),function(e){function t(e,t){return e.replace(/<<(\d+)>>/g,(function(e,n){return"(?:"+t[+n]+")"}))}function n(e,n,a){return RegExp(t(e,n),a||"")}function a(e,t){for(var n=0;n<t;n++)e=e.replace(/<<self>>/g,(function(){return"(?:"+e+")"}));return e.replace(/<<self>>/g,"[^\\s\\S]")}var s="bool byte char decimal double dynamic float int long object sbyte short string uint ulong ushort var void",r="class enum interface record struct",i="add alias and ascending async await by descending from(?=\\s*(?:\\w|$)) get global group into init(?=\\s*;) join let nameof not notnull on or orderby partial remove select set unmanaged value when where with(?=\\s*{)",o="abstract as base break case catch checked const continue default delegate do else event explicit extern finally fixed for foreach goto if implicit in internal is lock namespace new null operator out override params private protected public readonly ref return sealed sizeof stackalloc static switch this throw try typeof unchecked unsafe using virtual volatile while yield";function l(e){return"\\b(?:"+e.trim().replace(/ /g,"|")+")\\b"}var u=l(r),c=RegExp(l(s+" "+r+" "+i+" "+o)),d=l(r+" "+i+" "+o),g=l(s+" "+r+" "+o),p=a(/<(?:[^<>;=+\-*/%&|^]|<<self>>)*>/.source,2),b=a(/\((?:[^()]|<<self>>)*\)/.source,2),h=/@?\b[A-Za-z_]\w*\b/.source,f=t(/<<0>>(?:\s*<<1>>)?/.source,[h,p]),m=t(/(?!<<0>>)<<1>>(?:\s*\.\s*<<1>>)*/.source,[d,f]),y=/\[\s*(?:,\s*)*\]/.source,w=t(/<<0>>(?:\s*(?:\?\s*)?<<1>>)*(?:\s*\?)?/.source,[m,y]),k=t(/[^,()<>[\];=+\-*/%&|^]|<<0>>|<<1>>|<<2>>/.source,[p,b,y]),v=t(/\(<<0>>+(?:,<<0>>+)+\)/.source,[k]),_=t(/(?:<<0>>|<<1>>)(?:\s*(?:\?\s*)?<<2>>)*(?:\s*\?)?/.source,[v,m,y]),x={keyword:c,punctuation:/[<>()?,.:[\]]/},F=/'(?:[^\r\n'\\]|\\.|\\[Uux][\da-fA-F]{1,8})'/.source,A=/"(?:\\.|[^\\"\r\n])*"/.source,S=/@"(?:""|\\[\s\S]|[^\\"])*"(?!")/.source;e.languages.csharp=e.languages.extend("clike",{string:[{pattern:n(/(^|[^$\\])<<0>>/.source,[S]),lookbehind:!0,greedy:!0},{pattern:n(/(^|[^@$\\])<<0>>/.source,[A]),lookbehind:!0,greedy:!0}],"class-name":[{pattern:n(/(\busing\s+static\s+)<<0>>(?=\s*;)/.source,[m]),lookbehind:!0,inside:x},{pattern:n(/(\busing\s+<<0>>\s*=\s*)<<1>>(?=\s*;)/.source,[h,_]),lookbehind:!0,inside:x},{pattern:n(/(\busing\s+)<<0>>(?=\s*=)/.source,[h]),lookbehind:!0},{pattern:n(/(\b<<0>>\s+)<<1>>/.source,[u,f]),lookbehind:!0,inside:x},{pattern:n(/(\bcatch\s*\(\s*)<<0>>/.source,[m]),lookbehind:!0,inside:x},{pattern:n(/(\bwhere\s+)<<0>>/.source,[h]),lookbehind:!0},{pattern:n(/(\b(?:is(?:\s+not)?|as)\s+)<<0>>/.source,[w]),lookbehind:!0,inside:x},{pattern:n(/\b<<0>>(?=\s+(?!<<1>>|with\s*\{)<<2>>(?:\s*[=,;:{)\]]|\s+(?:in|when)\b))/.source,[_,g,h]),inside:x}],keyword:c,number:/(?:\b0(?:x[\da-f_]*[\da-f]|b[01_]*[01])|(?:\B\.\d+(?:_+\d+)*|\b\d+(?:_+\d+)*(?:\.\d+(?:_+\d+)*)?)(?:e[-+]?\d+(?:_+\d+)*)?)(?:[dflmu]|lu|ul)?\b/i,operator:/>>=?|<<=?|[-=]>|([-+&|])\1|~|\?\?=?|[-+*/%&|^!=<>]=?/,punctuation:/\?\.?|::|[{}[\];(),.:]/}),e.languages.insertBefore("csharp","number",{range:{pattern:/\.\./,alias:"operator"}}),e.languages.insertBefore("csharp","punctuation",{"named-parameter":{pattern:n(/([(,]\s*)<<0>>(?=\s*:)/.source,[h]),lookbehind:!0,alias:"punctuation"}}),e.languages.insertBefore("csharp","class-name",{namespace:{pattern:n(/(\b(?:namespace|using)\s+)<<0>>(?:\s*\.\s*<<0>>)*(?=\s*[;{])/.source,[h]),lookbehind:!0,inside:{punctuation:/\./}},"type-expression":{pattern:n(/(\b(?:default|sizeof|typeof)\s*\(\s*(?!\s))(?:[^()\s]|\s(?!\s)|<<0>>)*(?=\s*\))/.source,[b]),lookbehind:!0,alias:"class-name",inside:x},"return-type":{pattern:n(/<<0>>(?=\s+(?:<<1>>\s*(?:=>|[({]|\.\s*this\s*\[)|this\s*\[))/.source,[_,m]),inside:x,alias:"class-name"},"constructor-invocation":{pattern:n(/(\bnew\s+)<<0>>(?=\s*[[({])/.source,[_]),lookbehind:!0,inside:x,alias:"class-name"},"generic-method":{pattern:n(/<<0>>\s*<<1>>(?=\s*\()/.source,[h,p]),inside:{function:n(/^<<0>>/.source,[h]),generic:{pattern:RegExp(p),alias:"class-name",inside:x}}},"type-list":{pattern:n(/\b((?:<<0>>\s+<<1>>|record\s+<<1>>\s*<<5>>|where\s+<<2>>)\s*:\s*)(?:<<3>>|<<4>>|<<1>>\s*<<5>>|<<6>>)(?:\s*,\s*(?:<<3>>|<<4>>|<<6>>))*(?=\s*(?:where|[{;]|=>|$))/.source,[u,f,h,_,c.source,b,/\bnew\s*\(\s*\)/.source]),lookbehind:!0,inside:{"record-arguments":{pattern:n(/(^(?!new\s*\()<<0>>\s*)<<1>>/.source,[f,b]),lookbehind:!0,greedy:!0,inside:e.languages.csharp},keyword:c,"class-name":{pattern:RegExp(_),greedy:!0,inside:x},punctuation:/[,()]/}},preprocessor:{pattern:/(^[\t ]*)#.*/m,lookbehind:!0,alias:"property",inside:{directive:{pattern:/(#)\b(?:define|elif|else|endif|endregion|error|if|line|nullable|pragma|region|undef|warning)\b/,lookbehind:!0,alias:"keyword"}}}});var $=A+"|"+F,z=t(/\/(?![*/])|\/\/[^\r\n]*[\r\n]|\/\*(?:[^*]|\*(?!\/))*\*\/|<<0>>/.source,[$]),E=a(t(/[^"'/()]|<<0>>|\(<<self>>*\)/.source,[z]),2),C=/\b(?:assembly|event|field|method|module|param|property|return|type)\b/.source,j=t(/<<0>>(?:\s*\(<<1>>*\))?/.source,[m,E]);e.languages.insertBefore("csharp","class-name",{attribute:{pattern:n(/((?:^|[^\s\w>)?])\s*\[\s*)(?:<<0>>\s*:\s*)?<<1>>(?:\s*,\s*<<1>>)*(?=\s*\])/.source,[C,j]),lookbehind:!0,greedy:!0,inside:{target:{pattern:n(/^<<0>>(?=\s*:)/.source,[C]),alias:"keyword"},"attribute-arguments":{pattern:n(/\(<<0>>*\)/.source,[E]),inside:e.languages.csharp},"class-name":{pattern:RegExp(m),inside:{punctuation:/\./}},punctuation:/[:,]/}}});var B=/:[^}\r\n]+/.source,T=a(t(/[^"'/()]|<<0>>|\(<<self>>*\)/.source,[z]),2),O=t(/\{(?!\{)(?:(?![}:])<<0>>)*<<1>>?\}/.source,[T,B]),P=a(t(/[^"'/()]|\/(?!\*)|\/\*(?:[^*]|\*(?!\/))*\*\/|<<0>>|\(<<self>>*\)/.source,[$]),2),N=t(/\{(?!\{)(?:(?![}:])<<0>>)*<<1>>?\}/.source,[P,B]);function R(t,a){return{interpolation:{pattern:n(/((?:^|[^{])(?:\{\{)*)<<0>>/.source,[t]),lookbehind:!0,inside:{"format-string":{pattern:n(/(^\{(?:(?![}:])<<0>>)*)<<1>>(?=\}$)/.source,[a,B]),lookbehind:!0,inside:{punctuation:/^:/}},punctuation:/^\{|\}$/,expression:{pattern:/[\s\S]+/,alias:"language-csharp",inside:e.languages.csharp}}},string:/[\s\S]+/}}e.languages.insertBefore("csharp","string",{"interpolation-string":[{pattern:n(/(^|[^\\])(?:\$@|@\$)"(?:""|\\[\s\S]|\{\{|<<0>>|[^\\{"])*"/.source,[O]),lookbehind:!0,greedy:!0,inside:R(O,T)},{pattern:n(/(^|[^@\\])\$"(?:\\.|\{\{|<<0>>|[^\\"{])*"/.source,[N]),lookbehind:!0,greedy:!0,inside:R(N,P)}],char:{pattern:RegExp(F),greedy:!0}}),e.languages.dotnet=e.languages.cs=e.languages.csharp}(s),function(e){var t=/(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;e.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:RegExp("@[\\w-](?:"+/[^;{\s"']|\s+(?!\s)/.source+"|"+t.source+")*?"+/(?:;|(?=\s*\{))/.source),inside:{rule:/^@[\w-]+/,"selector-function-argument":{pattern:/(\bselector\s*\(\s*(?![\s)]))(?:[^()\s]|\s+(?![\s)])|\((?:[^()]|\([^()]*\))*\))+(?=\s*\))/,lookbehind:!0,alias:"selector"},keyword:{pattern:/(^|[^\w-])(?:and|not|only|or)(?![\w-])/,lookbehind:!0}}},url:{pattern:RegExp("\\burl\\((?:"+t.source+"|"+/(?:[^\\\r\n()"']|\\[\s\S])*/.source+")\\)","i"),greedy:!0,inside:{function:/^url/i,punctuation:/^\(|\)$/,string:{pattern:RegExp("^"+t.source+"$"),alias:"url"}}},selector:{pattern:RegExp("(^|[{}\\s])[^{}\\s](?:[^{};\"'\\s]|\\s+(?![\\s{])|"+t.source+")*(?=\\s*\\{)"),lookbehind:!0},string:{pattern:t,greedy:!0},property:{pattern:/(^|[^-\w\xA0-\uFFFF])(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,lookbehind:!0},important:/!important\b/i,function:{pattern:/(^|[^-a-z0-9])[-a-z0-9]+(?=\()/i,lookbehind:!0},punctuation:/[(){};:,]/},e.languages.css.atrule.inside.rest=e.languages.css;var n=e.languages.markup;n&&(n.tag.addInlined("style","css"),n.tag.addAttribute("style","css"))}(s),function(e){var t=/\b(?:abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|exports|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|module|native|new|non-sealed|null|open|opens|package|permits|private|protected|provides|public|record(?!\s*[(){}[\]<>=%~.:,;?+\-*/&|^])|requires|return|sealed|short|static|strictfp|super|switch|synchronized|this|throw|throws|to|transient|transitive|try|uses|var|void|volatile|while|with|yield)\b/,n=/(?:[a-z]\w*\s*\.\s*)*(?:[A-Z]\w*\s*\.\s*)*/.source,a={pattern:RegExp(/(^|[^\w.])/.source+n+/[A-Z](?:[\d_A-Z]*[a-z]\w*)?\b/.source),lookbehind:!0,inside:{namespace:{pattern:/^[a-z]\w*(?:\s*\.\s*[a-z]\w*)*(?:\s*\.)?/,inside:{punctuation:/\./}},punctuation:/\./}};e.languages.java=e.languages.extend("clike",{string:{pattern:/(^|[^\\])"(?:\\.|[^"\\\r\n])*"/,lookbehind:!0,greedy:!0},"class-name":[a,{pattern:RegExp(/(^|[^\w.])/.source+n+/[A-Z]\w*(?=\s+\w+\s*[;,=()]|\s*(?:\[[\s,]*\]\s*)?::\s*new\b)/.source),lookbehind:!0,inside:a.inside},{pattern:RegExp(/(\b(?:class|enum|extends|implements|instanceof|interface|new|record|throws)\s+)/.source+n+/[A-Z]\w*\b/.source),lookbehind:!0,inside:a.inside}],keyword:t,function:[e.languages.clike.function,{pattern:/(::\s*)[a-z_]\w*/,lookbehind:!0}],number:/\b0b[01][01_]*L?\b|\b0x(?:\.[\da-f_p+-]+|[\da-f_]+(?:\.[\da-f_p+-]+)?)\b|(?:\b\d[\d_]*(?:\.[\d_]*)?|\B\.\d[\d_]*)(?:e[+-]?\d[\d_]*)?[dfl]?/i,operator:{pattern:/(^|[^.])(?:<<=?|>>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,lookbehind:!0},constant:/\b[A-Z][A-Z_\d]+\b/}),e.languages.insertBefore("java","string",{"triple-quoted-string":{pattern:/"""[ \t]*[\r\n](?:(?:"|"")?(?:\\.|[^"\\]))*"""/,greedy:!0,alias:"string"},char:{pattern:/'(?:\\.|[^'\\\r\n]){1,6}'/,greedy:!0}}),e.languages.insertBefore("java","class-name",{annotation:{pattern:/(^|[^.])@\w+(?:\s*\.\s*\w+)*/,lookbehind:!0,alias:"punctuation"},generics:{pattern:/<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&))*>)*>)*>)*>/,inside:{"class-name":a,keyword:t,punctuation:/[<>(),.:]/,operator:/[?&|]/}},import:[{pattern:RegExp(/(\bimport\s+)/.source+n+/(?:[A-Z]\w*|\*)(?=\s*;)/.source),lookbehind:!0,inside:{namespace:a.inside.namespace,punctuation:/\./,operator:/\*/,"class-name":/\w+/}},{pattern:RegExp(/(\bimport\s+static\s+)/.source+n+/(?:\w+|\*)(?=\s*;)/.source),lookbehind:!0,alias:"static",inside:{namespace:a.inside.namespace,static:/\b\w+$/,punctuation:/\./,operator:/\*/,"class-name":/\w+/}}],namespace:{pattern:RegExp(/(\b(?:exports|import(?:\s+static)?|module|open|opens|package|provides|requires|to|transitive|uses|with)\s+)(?!<keyword>)[a-z]\w*(?:\.[a-z]\w*)*\.?/.source.replace(/<keyword>/g,(function(){return t.source}))),lookbehind:!0,inside:{punctuation:/\./}}})}(s),s.languages.javascript=s.languages.extend("clike",{"class-name":[s.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:constructor|prototype))/,lookbehind:!0}],keyword:[{pattern:/((?:^|\})\s*)catch\b/,lookbehind:!0},{pattern:/(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],function:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,number:{pattern:RegExp(/(^|[^\w$])/.source+"(?:"+/NaN|Infinity/.source+"|"+/0[bB][01]+(?:_[01]+)*n?/.source+"|"+/0[oO][0-7]+(?:_[0-7]+)*n?/.source+"|"+/0[xX][\dA-Fa-f]+(?:_[\dA-Fa-f]+)*n?/.source+"|"+/\d+(?:_\d+)*n/.source+"|"+/(?:\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\.\d+(?:_\d+)*)(?:[Ee][+-]?\d+(?:_\d+)*)?/.source+")"+/(?![\w$])/.source),lookbehind:!0},operator:/--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/}),s.languages.javascript["class-name"][0].pattern=/(\b(?:class|extends|implements|instanceof|interface|new)\s+)[\w.\\]+/,s.languages.insertBefore("javascript","keyword",{regex:{pattern:RegExp(/((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)/.source+/\//.source+"(?:"+/(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}/.source+"|"+/(?:\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.)*\])*\])*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}v[dgimyus]{0,7}/.source+")"+/(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/.source),lookbehind:!0,greedy:!0,inside:{"regex-source":{pattern:/^(\/)[\s\S]+(?=\/[a-z]*$)/,lookbehind:!0,alias:"language-regex",inside:s.languages.regex},"regex-delimiter":/^\/|\/$/,"regex-flags":/^[a-z]+$/}},"function-variable":{pattern:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/,lookbehind:!0,inside:s.languages.javascript},{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,lookbehind:!0,inside:s.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/,lookbehind:!0,inside:s.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/,lookbehind:!0,inside:s.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),s.languages.insertBefore("javascript","string",{hashbang:{pattern:/^#!.*/,greedy:!0,alias:"comment"},"template-string":{pattern:/`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:s.languages.javascript}},string:/[\s\S]+/}},"string-property":{pattern:/((?:^|[,{])[ \t]*)(["'])(?:\\(?:\r\n|[\s\S])|(?!\2)[^\\\r\n])*\2(?=\s*:)/m,lookbehind:!0,greedy:!0,alias:"property"}}),s.languages.insertBefore("javascript","operator",{"literal-property":{pattern:/((?:^|[,{])[ \t]*)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*:)/m,lookbehind:!0,alias:"property"}}),s.languages.markup&&(s.languages.markup.tag.addInlined("script","javascript"),s.languages.markup.tag.addAttribute(/on(?:abort|blur|change|click|composition(?:end|start|update)|dblclick|error|focus(?:in|out)?|key(?:down|up)|load|mouse(?:down|enter|leave|move|out|over|up)|reset|resize|scroll|select|slotchange|submit|unload|wheel)/.source,"javascript")),s.languages.js=s.languages.javascript,s.languages.markup={comment:{pattern:/<!--(?:(?!<!--)[\s\S])*?-->/,greedy:!0},prolog:{pattern:/<\?[\s\S]+?\?>/,greedy:!0},doctype:{pattern:/<!DOCTYPE(?:[^>"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|<!--(?:[^-]|-(?!->))*-->)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(^[^\[]*\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^<!|>$|[[\]]/,"doctype-tag":/^DOCTYPE/i,name:/[^\s<>'"]+/}},cdata:{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,greedy:!0},tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"special-attr":[],"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{punctuation:[{pattern:/^=/,alias:"attr-equals"},{pattern:/^(\s*)["']|["']$/,lookbehind:!0}]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:[{pattern:/&[\da-z]{1,8};/i,alias:"named-entity"},/&#x?[\da-f]{1,8};/i]},s.languages.markup.tag.inside["attr-value"].inside.entity=s.languages.markup.entity,s.languages.markup.doctype.inside["internal-subset"].inside=s.languages.markup,s.hooks.add("wrap",(function(e){"entity"===e.type&&(e.attributes.title=e.content.replace(/&amp;/,"&"))})),Object.defineProperty(s.languages.markup.tag,"addInlined",{value:function(e,t){var n={};n["language-"+t]={pattern:/(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,lookbehind:!0,inside:s.languages[t]},n.cdata=/^<!\[CDATA\[|\]\]>$/i;var a={"included-cdata":{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,inside:n}};a["language-"+t]={pattern:/[\s\S]+/,inside:s.languages[t]};var r={};r[e]={pattern:RegExp(/(<__[^>]*>)(?:<!\[CDATA\[(?:[^\]]|\](?!\]>))*\]\]>|(?!<!\[CDATA\[)[\s\S])*?(?=<\/__>)/.source.replace(/__/g,(function(){return e})),"i"),lookbehind:!0,greedy:!0,inside:a},s.languages.insertBefore("markup","cdata",r)}}),Object.defineProperty(s.languages.markup.tag,"addAttribute",{value:function(e,t){s.languages.markup.tag.inside["special-attr"].push({pattern:RegExp(/(^|["'\s])/.source+"(?:"+e+")"+/\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))/.source,"i"),lookbehind:!0,inside:{"attr-name":/^[^\s=]+/,"attr-value":{pattern:/=[\s\S]+/,inside:{value:{pattern:/(^=\s*(["']|(?!["'])))\S[\s\S]*(?=\2$)/,lookbehind:!0,alias:[t,"language-"+t],inside:s.languages[t]},punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}}}})}}),s.languages.html=s.languages.markup,s.languages.mathml=s.languages.markup,s.languages.svg=s.languages.markup,s.languages.xml=s.languages.extend("markup",{}),s.languages.ssml=s.languages.xml,s.languages.atom=s.languages.xml,s.languages.rss=s.languages.xml,function(e){var t=/\/\*[\s\S]*?\*\/|\/\/.*|#(?!\[).*/,n=[{pattern:/\b(?:false|true)\b/i,alias:"boolean"},{pattern:/(::\s*)\b[a-z_]\w*\b(?!\s*\()/i,greedy:!0,lookbehind:!0},{pattern:/(\b(?:case|const)\s+)\b[a-z_]\w*(?=\s*[;=])/i,greedy:!0,lookbehind:!0},/\b(?:null)\b/i,/\b[A-Z_][A-Z0-9_]*\b(?!\s*\()/],a=/\b0b[01]+(?:_[01]+)*\b|\b0o[0-7]+(?:_[0-7]+)*\b|\b0x[\da-f]+(?:_[\da-f]+)*\b|(?:\b\d+(?:_\d+)*\.?(?:\d+(?:_\d+)*)?|\B\.\d+)(?:e[+-]?\d+)?/i,s=/<?=>|\?\?=?|\.{3}|\??->|[!=]=?=?|::|\*\*=?|--|\+\+|&&|\|\||<<|>>|[?~]|[/^|%*&<>.+-]=?/,r=/[{}\[\](),:;]/;e.languages.php={delimiter:{pattern:/\?>$|^<\?(?:php(?=\s)|=)?/i,alias:"important"},comment:t,variable:/\$+(?:\w+\b|(?=\{))/,package:{pattern:/(namespace\s+|use\s+(?:function\s+)?)(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,lookbehind:!0,inside:{punctuation:/\\/}},"class-name-definition":{pattern:/(\b(?:class|enum|interface|trait)\s+)\b[a-z_]\w*(?!\\)\b/i,lookbehind:!0,alias:"class-name"},"function-definition":{pattern:/(\bfunction\s+)[a-z_]\w*(?=\s*\()/i,lookbehind:!0,alias:"function"},keyword:[{pattern:/(\(\s*)\b(?:array|bool|boolean|float|int|integer|object|string)\b(?=\s*\))/i,alias:"type-casting",greedy:!0,lookbehind:!0},{pattern:/([(,?]\s*)\b(?:array(?!\s*\()|bool|callable|(?:false|null)(?=\s*\|)|float|int|iterable|mixed|object|self|static|string)\b(?=\s*\$)/i,alias:"type-hint",greedy:!0,lookbehind:!0},{pattern:/(\)\s*:\s*(?:\?\s*)?)\b(?:array(?!\s*\()|bool|callable|(?:false|null)(?=\s*\|)|float|int|iterable|mixed|never|object|self|static|string|void)\b/i,alias:"return-type",greedy:!0,lookbehind:!0},{pattern:/\b(?:array(?!\s*\()|bool|float|int|iterable|mixed|object|string|void)\b/i,alias:"type-declaration",greedy:!0},{pattern:/(\|\s*)(?:false|null)\b|\b(?:false|null)(?=\s*\|)/i,alias:"type-declaration",greedy:!0,lookbehind:!0},{pattern:/\b(?:parent|self|static)(?=\s*::)/i,alias:"static-context",greedy:!0},{pattern:/(\byield\s+)from\b/i,lookbehind:!0},/\bclass\b/i,{pattern:/((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|fn|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|match|namespace|never|new|or|parent|print|private|protected|public|readonly|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield|__halt_compiler)\b/i,lookbehind:!0}],"argument-name":{pattern:/([(,]\s*)\b[a-z_]\w*(?=\s*:(?!:))/i,lookbehind:!0},"class-name":[{pattern:/(\b(?:extends|implements|instanceof|new(?!\s+self|\s+static))\s+|\bcatch\s*\()\b[a-z_]\w*(?!\\)\b/i,greedy:!0,lookbehind:!0},{pattern:/(\|\s*)\b[a-z_]\w*(?!\\)\b/i,greedy:!0,lookbehind:!0},{pattern:/\b[a-z_]\w*(?!\\)\b(?=\s*\|)/i,greedy:!0},{pattern:/(\|\s*)(?:\\?\b[a-z_]\w*)+\b/i,alias:"class-name-fully-qualified",greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/(?:\\?\b[a-z_]\w*)+\b(?=\s*\|)/i,alias:"class-name-fully-qualified",greedy:!0,inside:{punctuation:/\\/}},{pattern:/(\b(?:extends|implements|instanceof|new(?!\s+self\b|\s+static\b))\s+|\bcatch\s*\()(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,alias:"class-name-fully-qualified",greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/\b[a-z_]\w*(?=\s*\$)/i,alias:"type-declaration",greedy:!0},{pattern:/(?:\\?\b[a-z_]\w*)+(?=\s*\$)/i,alias:["class-name-fully-qualified","type-declaration"],greedy:!0,inside:{punctuation:/\\/}},{pattern:/\b[a-z_]\w*(?=\s*::)/i,alias:"static-context",greedy:!0},{pattern:/(?:\\?\b[a-z_]\w*)+(?=\s*::)/i,alias:["class-name-fully-qualified","static-context"],greedy:!0,inside:{punctuation:/\\/}},{pattern:/([(,?]\s*)[a-z_]\w*(?=\s*\$)/i,alias:"type-hint",greedy:!0,lookbehind:!0},{pattern:/([(,?]\s*)(?:\\?\b[a-z_]\w*)+(?=\s*\$)/i,alias:["class-name-fully-qualified","type-hint"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/(\)\s*:\s*(?:\?\s*)?)\b[a-z_]\w*(?!\\)\b/i,alias:"return-type",greedy:!0,lookbehind:!0},{pattern:/(\)\s*:\s*(?:\?\s*)?)(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,alias:["class-name-fully-qualified","return-type"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}}],constant:n,function:{pattern:/(^|[^\\\w])\\?[a-z_](?:[\w\\]*\w)?(?=\s*\()/i,lookbehind:!0,inside:{punctuation:/\\/}},property:{pattern:/(->\s*)\w+/,lookbehind:!0},number:a,operator:s,punctuation:r};var i={pattern:/\{\$(?:\{(?:\{[^{}]+\}|[^{}]+)\}|[^{}])+\}|(^|[^\\{])\$+(?:\w+(?:\[[^\r\n\[\]]+\]|->\w+)?)/,lookbehind:!0,inside:e.languages.php},o=[{pattern:/<<<'([^']+)'[\r\n](?:.*[\r\n])*?\1;/,alias:"nowdoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<<'[^']+'|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<'?|[';]$/}}}},{pattern:/<<<(?:"([^"]+)"[\r\n](?:.*[\r\n])*?\1;|([a-z_]\w*)[\r\n](?:.*[\r\n])*?\2;)/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<"?|[";]$/}},interpolation:i}},{pattern:/`(?:\\[\s\S]|[^\\`])*`/,alias:"backtick-quoted-string",greedy:!0},{pattern:/'(?:\\[\s\S]|[^\\'])*'/,alias:"single-quoted-string",greedy:!0},{pattern:/"(?:\\[\s\S]|[^\\"])*"/,alias:"double-quoted-string",greedy:!0,inside:{interpolation:i}}];e.languages.insertBefore("php","variable",{string:o,attribute:{pattern:/#\[(?:[^"'\/#]|\/(?![*/])|\/\/.*$|#(?!\[).*$|\/\*(?:[^*]|\*(?!\/))*\*\/|"(?:\\[\s\S]|[^\\"])*"|'(?:\\[\s\S]|[^\\'])*')+\](?=\s*[a-z$#])/im,greedy:!0,inside:{"attribute-content":{pattern:/^(#\[)[\s\S]+(?=\]$)/,lookbehind:!0,inside:{comment:t,string:o,"attribute-class-name":[{pattern:/([^:]|^)\b[a-z_]\w*(?!\\)\b/i,alias:"class-name",greedy:!0,lookbehind:!0},{pattern:/([^:]|^)(?:\\?\b[a-z_]\w*)+/i,alias:["class-name","class-name-fully-qualified"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}}],constant:n,number:a,operator:s,punctuation:r}},delimiter:{pattern:/^#\[|\]$/,alias:"punctuation"}}}}),e.hooks.add("before-tokenize",(function(t){/<\?/.test(t.code)&&e.languages["markup-templating"].buildPlaceholders(t,"php",/<\?(?:[^"'/#]|\/(?![*/])|("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|(?:\/\/|#(?!\[))(?:[^?\n\r]|\?(?!>))*(?=$|\?>|[\r\n])|#\[|\/\*(?:[^*]|\*(?!\/))*(?:\*\/|$))*?(?:\?>|$)/g)})),e.hooks.add("after-tokenize",(function(t){e.languages["markup-templating"].tokenizePlaceholders(t,"php")}))}(s),s.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0,greedy:!0},"string-interpolation":{pattern:/(?:f|fr|rf)(?:("""|''')[\s\S]*?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2)/i,greedy:!0,inside:{interpolation:{pattern:/((?:^|[^{])(?:\{\{)*)\{(?!\{)(?:[^{}]|\{(?!\{)(?:[^{}]|\{(?!\{)(?:[^{}])+\})+\})+\}/,lookbehind:!0,inside:{"format-spec":{pattern:/(:)[^:(){}]+(?=\}$)/,lookbehind:!0},"conversion-option":{pattern:/![sra](?=[:}]$)/,alias:"punctuation"},rest:null}},string:/[\s\S]+/}},"triple-quoted-string":{pattern:/(?:[rub]|br|rb)?("""|''')[\s\S]*?\1/i,greedy:!0,alias:"string"},string:{pattern:/(?:[rub]|br|rb)?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/i,greedy:!0},function:{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_]\w*(?=\s*\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)\w+/i,lookbehind:!0},decorator:{pattern:/(^[\t ]*)@\w+(?:\.\w+)*/m,lookbehind:!0,alias:["annotation","punctuation"],inside:{punctuation:/\./}},keyword:/\b(?:_(?=\s*:)|and|as|assert|async|await|break|case|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|match|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b/,builtin:/\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/,boolean:/\b(?:False|None|True)\b/,number:/\b0(?:b(?:_?[01])+|o(?:_?[0-7])+|x(?:_?[a-f0-9])+)\b|(?:\b\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\B\.\d+(?:_\d+)*)(?:e[+-]?\d+(?:_\d+)*)?j?(?!\w)/i,operator:/[-+%=]=?|!=|:=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/,punctuation:/[{}[\];(),.:]/},s.languages.python["string-interpolation"].inside.interpolation.inside.rest=s.languages.python,s.languages.py=s.languages.python,function(e){e.languages.ruby=e.languages.extend("clike",{comment:{pattern:/#.*|^=begin\s[\s\S]*?^=end/m,greedy:!0},"class-name":{pattern:/(\b(?:class|module)\s+|\bcatch\s+\()[\w.\\]+|\b[A-Z_]\w*(?=\s*\.\s*new\b)/,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:BEGIN|END|alias|and|begin|break|case|class|def|define_method|defined|do|each|else|elsif|end|ensure|extend|for|if|in|include|module|new|next|nil|not|or|prepend|private|protected|public|raise|redo|require|rescue|retry|return|self|super|then|throw|undef|unless|until|when|while|yield)\b/,operator:/\.{2,3}|&\.|===|<?=>|[!=]?~|(?:&&|\|\||<<|>>|\*\*|[+\-*/%<>!^&|=])=?|[?:]/,punctuation:/[(){}[\].,;]/}),e.languages.insertBefore("ruby","operator",{"double-colon":{pattern:/::/,alias:"punctuation"}});var t={pattern:/((?:^|[^\\])(?:\\{2})*)#\{(?:[^{}]|\{[^{}]*\})*\}/,lookbehind:!0,inside:{content:{pattern:/^(#\{)[\s\S]+(?=\}$)/,lookbehind:!0,inside:e.languages.ruby},delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"}}};delete e.languages.ruby.function;var n="(?:"+[/([^a-zA-Z0-9\s{(\[<=])(?:(?!\1)[^\\]|\\[\s\S])*\1/.source,/\((?:[^()\\]|\\[\s\S]|\((?:[^()\\]|\\[\s\S])*\))*\)/.source,/\{(?:[^{}\\]|\\[\s\S]|\{(?:[^{}\\]|\\[\s\S])*\})*\}/.source,/\[(?:[^\[\]\\]|\\[\s\S]|\[(?:[^\[\]\\]|\\[\s\S])*\])*\]/.source,/<(?:[^<>\\]|\\[\s\S]|<(?:[^<>\\]|\\[\s\S])*>)*>/.source].join("|")+")",a=/(?:"(?:\\.|[^"\\\r\n])*"|(?:\b[a-zA-Z_]\w*|[^\s\0-\x7F]+)[?!]?|\$.)/.source;e.languages.insertBefore("ruby","keyword",{"regex-literal":[{pattern:RegExp(/%r/.source+n+/[egimnosux]{0,6}/.source),greedy:!0,inside:{interpolation:t,regex:/[\s\S]+/}},{pattern:/(^|[^/])\/(?!\/)(?:\[[^\r\n\]]+\]|\\.|[^[/\\\r\n])+\/[egimnosux]{0,6}(?=\s*(?:$|[\r\n,.;})#]))/,lookbehind:!0,greedy:!0,inside:{interpolation:t,regex:/[\s\S]+/}}],variable:/[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,symbol:[{pattern:RegExp(/(^|[^:]):/.source+a),lookbehind:!0,greedy:!0},{pattern:RegExp(/([\r\n{(,][ \t]*)/.source+a+/(?=:(?!:))/.source),lookbehind:!0,greedy:!0}],"method-definition":{pattern:/(\bdef\s+)\w+(?:\s*\.\s*\w+)?/,lookbehind:!0,inside:{function:/\b\w+$/,keyword:/^self\b/,"class-name":/^\w+/,punctuation:/\./}}}),e.languages.insertBefore("ruby","string",{"string-literal":[{pattern:RegExp(/%[qQiIwWs]?/.source+n),greedy:!0,inside:{interpolation:t,string:/[\s\S]+/}},{pattern:/("|')(?:#\{[^}]+\}|#(?!\{)|\\(?:\r\n|[\s\S])|(?!\1)[^\\#\r\n])*\1/,greedy:!0,inside:{interpolation:t,string:/[\s\S]+/}},{pattern:/<<[-~]?([a-z_]\w*)[\r\n](?:.*[\r\n])*?[\t ]*\1/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<[-~]?[a-z_]\w*|\b[a-z_]\w*$/i,inside:{symbol:/\b\w+/,punctuation:/^<<[-~]?/}},interpolation:t,string:/[\s\S]+/}},{pattern:/<<[-~]?'([a-z_]\w*)'[\r\n](?:.*[\r\n])*?[\t ]*\1/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<[-~]?'[a-z_]\w*'|\b[a-z_]\w*$/i,inside:{symbol:/\b\w+/,punctuation:/^<<[-~]?'|'$/}},string:/[\s\S]+/}}],"command-literal":[{pattern:RegExp(/%x/.source+n),greedy:!0,inside:{interpolation:t,command:{pattern:/[\s\S]+/,alias:"string"}}},{pattern:/`(?:#\{[^}]+\}|#(?!\{)|\\(?:\r\n|[\s\S])|[^\\`#\r\n])*`/,greedy:!0,inside:{interpolation:t,command:{pattern:/[\s\S]+/,alias:"string"}}}]}),delete e.languages.ruby.string,e.languages.insertBefore("ruby","number",{builtin:/\b(?:Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Fixnum|Float|Hash|IO|Integer|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|Stat|String|Struct|Symbol|TMS|Thread|ThreadGroup|Time|TrueClass)\b/,constant:/\b[A-Z][A-Z0-9_]*(?:[?!]|\b)/}),e.languages.rb=e.languages.ruby}(s),window.Prism=a,s}(),o=e=>t=>t.options.get(e),l=o("codesample_languages"),u=o("codesample_global_prismjs"),c=e=>r.Prism&&u(e)?r.Prism:i,d=e=>t(e)&&"PRE"===e.nodeName&&-1!==e.className.indexOf("language-"),g=e=>{const t=e.selection?e.selection.getNode():null;return d(t)?a.some(t):a.none()},p=e=>{const t=(e=>l(e)||[{text:"HTML/XML",value:"markup"},{text:"JavaScript",value:"javascript"},{text:"CSS",value:"css"},{text:"PHP",value:"php"},{text:"Ruby",value:"ruby"},{text:"Python",value:"python"},{text:"Java",value:"java"},{text:"C",value:"c"},{text:"C#",value:"csharp"},{text:"C++",value:"cpp"}])(e),n=(r=t,((e,t)=>0<e.length?a.some(e[0]):a.none())(r)).fold(("",()=>""),(e=>e.value));var r;const i=((e,t)=>g(e).fold((()=>t),(e=>{const n=e.className.match(/language-(\w+)/);return n?n[1]:t})))(e,n),o=(e=>g(e).bind((e=>a.from(e.textContent))).getOr(""))(e);e.windowManager.open({title:"Insert/Edit Code Sample",size:"large",body:{type:"panel",items:[{type:"listbox",name:"language",label:"Language",items:t},{type:"textarea",name:"code",label:"Code view"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{language:i,code:o},onSubmit:t=>{const n=t.getData();((e,t,n)=>{const a=e.dom;e.undoManager.transact((()=>{const r=g(e);return n=s.DOM.encode(n),r.fold((()=>{e.insertContent('<pre id="__new" class="language-'+t+'">'+n+"</pre>");const s=a.select("#__new")[0];a.setAttrib(s,"id",null),e.selection.select(s)}),(s=>{a.setAttrib(s,"class","language-"+t),s.innerHTML=n,c(e).highlightElement(s),e.selection.select(s)}))}))})(e,n.language,n.code),t.close()}})},b=(h=/^\s+|\s+$/g,e=>e.replace(h,""));var h,f=tinymce.util.Tools.resolve("tinymce.util.Tools");const m=(e,t=n)=>n=>{const a=()=>{n.setEnabled(e.selection.isEditable()),t(n)};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("codesample",(e=>{(e=>{const t=e.options.register;t("codesample_languages",{processor:"object[]"}),t("codesample_global_prismjs",{processor:"boolean",default:!1})})(e),(e=>{e.on("PreProcess",(t=>{const n=e.dom,a=n.select("pre[contenteditable=false]",t.node);f.each(f.grep(a,d),(e=>{const t=e.textContent;let a;for(n.setAttrib(e,"class",b(n.getAttrib(e,"class"))),n.setAttrib(e,"contentEditable",null),n.setAttrib(e,"data-mce-highlighted",null);a=e.firstChild;)e.removeChild(a);n.add(e,"code").textContent=t}))})),e.on("SetContent",(()=>{const t=e.dom,n=f.grep(t.select("pre"),(e=>d(e)&&"true"!==t.getAttrib(e,"data-mce-highlighted")));n.length&&e.undoManager.transact((()=>{f.each(n,(n=>{var a;f.each(t.select("br",n),(n=>{t.replace(e.getDoc().createTextNode("\n"),n)})),n.innerHTML=t.encode(null!==(a=n.textContent)&&void 0!==a?a:""),c(e).highlightElement(n),t.setAttrib(n,"data-mce-highlighted",!0),n.className=b(n.className)}))}))})),e.on("PreInit",(()=>{e.parser.addNodeFilter("pre",(e=>{var t;for(let n=0,a=e.length;n<a;n++){const a=e[n];-1!==(null!==(t=a.attr("class"))&&void 0!==t?t:"").indexOf("language-")&&(a.attr("contenteditable","false"),a.attr("data-mce-highlighted","false"))}}))}))})(e),(e=>{const t=()=>e.execCommand("codesample");e.ui.registry.addToggleButton("codesample",{icon:"code-sample",tooltip:"Insert/edit code sample",onAction:t,onSetup:m(e,(t=>{t.setActive((e=>{const t=e.selection.getStart();return e.dom.is(t,'pre[class*="language-"]')})(e))}))}),e.ui.registry.addMenuItem("codesample",{text:"Code sample...",icon:"code-sample",onAction:t,onSetup:m(e)})})(e),(e=>{e.addCommand("codesample",(()=>{const t=e.selection.getNode();e.selection.isCollapsed()||d(t)?p(e):e.formatter.toggle("code")}))})(e),e.on("dblclick",(t=>{d(t.target)&&p(e)}))}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/directionality/plugin.min.js b/public/libs/tinymce/plugins/directionality/plugin.min.js
index d6a2eacef7f..c91d2bb2787 100644
--- a/public/libs/tinymce/plugins/directionality/plugin.min.js
+++ b/public/libs/tinymce/plugins/directionality/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>typeof e===t,o=t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(o=r=t,(n=String).prototype.isPrototypeOf(o)||(null===(i=r.constructor)||void 0===i?void 0:i.name)===n.name)?"string":e;var o,r,n,i})(t),r=e("boolean"),n=t=>!(t=>null==t)(t),i=e("function"),s=e("number"),l=(!1,()=>false);class a{constructor(t,e){this.tag=t,this.value=e}static some(t){return new a(!0,t)}static none(){return a.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?a.some(t(this.value)):a.none()}bind(t){return this.tag?t(this.value):a.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:a.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return n(t)?a.some(t):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);const u=(t,e)=>{for(let o=0,r=t.length;o<r;o++)e(t[o],o)},c=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},d=c,h=(t,e)=>{const o=t.dom;if(1!==o.nodeType)return!1;{const t=o;if(void 0!==t.matches)return t.matches(e);if(void 0!==t.msMatchesSelector)return t.msMatchesSelector(e);if(void 0!==t.webkitMatchesSelector)return t.webkitMatchesSelector(e);if(void 0!==t.mozMatchesSelector)return t.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")}};"undefined"!=typeof window?window:Function("return this;")();const m=t=>e=>(t=>t.dom.nodeType)(e)===t,g=m(1),f=m(3),v=m(9),y=m(11),p=(t,e)=>{t.dom.removeAttribute(e)},w=i(Element.prototype.attachShadow)&&i(Node.prototype.getRootNode)?t=>d(t.dom.getRootNode()):t=>v(t)?t:d(t.dom.ownerDocument),b=t=>d(t.dom.host),N=t=>{const e=f(t)?t.dom.parentNode:t.dom;if(null==e||null===e.ownerDocument)return!1;const o=e.ownerDocument;return(t=>{const e=w(t);return y(o=e)&&n(o.dom.host)?a.some(e):a.none();var o})(d(e)).fold((()=>o.body.contains(e)),(r=N,i=b,t=>r(i(t))));var r,i},S=t=>"rtl"===((t,e)=>{const o=t.dom,r=window.getComputedStyle(o).getPropertyValue(e);return""!==r||N(t)?r:((t,e)=>(t=>void 0!==t.style&&i(t.style.getPropertyValue))(t)?t.style.getPropertyValue(e):"")(o,e)})(t,"direction")?"rtl":"ltr",A=(t,e)=>((t,o)=>((t,e)=>{const o=[];for(let r=0,n=t.length;r<n;r++){const n=t[r];e(n,r)&&o.push(n)}return o})(((t,e)=>{const o=t.length,r=new Array(o);for(let n=0;n<o;n++){const o=t[n];r[n]=e(o,n)}return r})(t.dom.childNodes,d),(t=>h(t,e))))(t),E=("li",t=>g(t)&&"li"===t.dom.nodeName.toLowerCase());const T=(t,e,n)=>{u(e,(e=>{const c=d(e),m=E(c),f=((t,e)=>{return(e?(o=t,r="ol,ul",((t,e,o)=>{let n=t.dom;const s=i(o)?o:l;for(;n.parentNode;){n=n.parentNode;const t=d(n);if(h(t,r))return a.some(t);if(s(t))break}return a.none()})(o,0,n)):a.some(t)).getOr(t);var o,r,n})(c,m);var v;(v=f,(t=>a.from(t.dom.parentNode).map(d))(v).filter(g)).each((e=>{if(t.setStyle(f.dom,"direction",null),S(e)===n?p(f,"dir"):((t,e,n)=>{((t,e,n)=>{if(!(o(n)||r(n)||s(n)))throw console.error("Invalid call to Attribute.set. Key ",e,":: Value ",n,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(e,n+"")})(t.dom,e,n)})(f,"dir",n),S(f)!==n&&t.setStyle(f.dom,"direction",n),m){const e=A(f,"li[dir],li[style]");u(e,(e=>{p(e,"dir"),t.setStyle(e.dom,"direction",null)}))}}))}))},C=(t,e)=>{t.selection.isEditable()&&(T(t.dom,t.selection.getSelectedBlocks(),e),t.nodeChanged())},D=(t,e)=>o=>{const r=r=>{const n=d(r.element);o.setActive(S(n)===e),o.setEnabled(t.selection.isEditable())};return t.on("NodeChange",r),o.setEnabled(t.selection.isEditable()),()=>t.off("NodeChange",r)};t.add("directionality",(t=>{(t=>{t.addCommand("mceDirectionLTR",(()=>{C(t,"ltr")})),t.addCommand("mceDirectionRTL",(()=>{C(t,"rtl")}))})(t),(t=>{t.ui.registry.addToggleButton("ltr",{tooltip:"Left to right",icon:"ltr",onAction:()=>t.execCommand("mceDirectionLTR"),onSetup:D(t,"ltr")}),t.ui.registry.addToggleButton("rtl",{tooltip:"Right to left",icon:"rtl",onAction:()=>t.execCommand("mceDirectionRTL"),onSetup:D(t,"rtl")})})(t)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/fullscreen/plugin.min.js b/public/libs/tinymce/plugins/fullscreen/plugin.min.js
index f9cdcf9862d..c4d5cfc997e 100644
--- a/public/libs/tinymce/plugins/fullscreen/plugin.min.js
+++ b/public/libs/tinymce/plugins/fullscreen/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=r=e,(o=String).prototype.isPrototypeOf(n)||(null===(s=r.constructor)||void 0===s?void 0:s.name)===o.name)?"string":t;var n,r,o,s})(t)===e,r=e=>t=>typeof t===e,o=e=>t=>e===t,s=n("string"),i=n("array"),l=o(null),a=r("boolean"),c=o(void 0),u=e=>!(e=>null==e)(e),d=r("function"),m=r("number"),h=()=>{},g=e=>()=>e;function p(e,...t){return(...n)=>{const r=t.concat(n);return e.apply(null,r)}}const f=g(!1),v=g(!0);class w{constructor(e,t){this.tag=e,this.value=t}static some(e){return new w(!0,e)}static none(){return w.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?w.some(e(this.value)):w.none()}bind(e){return this.tag?e(this.value):w.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:w.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return u(e)?w.some(e):w.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}w.singletonNone=new w(!1);const y=t=>{const n=e(w.none()),r=()=>n.get().each(t);return{clear:()=>{r(),n.set(w.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{r(),n.set(w.some(e))}}},b=()=>y((e=>e.unbind())),S=Array.prototype.push,x=(e,t)=>{const n=e.length,r=new Array(n);for(let o=0;o<n;o++){const n=e[o];r[o]=t(n,o)}return r},E=(e,t)=>{for(let n=0,r=e.length;n<r;n++)t(e[n],n)},F=(e,t)=>{const n=[];for(let r=0,o=e.length;r<o;r++){const o=e[r];t(o,r)&&n.push(o)}return n},O=(e,t)=>((e,t,n)=>{for(let r=0,o=e.length;r<o;r++){const o=e[r];if(t(o,r))return w.some(o);if(n(o,r))break}return w.none()})(e,t,f),T=Object.keys,k=(e,t,n=0,r)=>{const o=e.indexOf(t,n);return-1!==o&&(!!c(r)||o+t.length<=r)},C=e=>void 0!==e.style&&d(e.style.getPropertyValue),A=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},R=A;"undefined"!=typeof window?window:Function("return this;")();const L=e=>t=>(e=>e.dom.nodeType)(t)===e,M=L(1),N=L(3),P=L(9),D=L(11),W=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},q=e=>R(e.dom.ownerDocument),H=e=>x(e.dom.childNodes,R),I=d(Element.prototype.attachShadow)&&d(Node.prototype.getRootNode),B=g(I),V=I?e=>R(e.dom.getRootNode()):e=>P(e)?e:q(e),_=e=>{const t=V(e);return D(n=t)&&u(n.dom.host)?w.some(t):w.none();var n},j=e=>R(e.dom.host),z=e=>{const t=N(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return _(R(t)).fold((()=>n.body.contains(t)),(r=z,o=j,e=>r(o(e))));var r,o},$=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},U=(e,t)=>{e.dom.removeAttribute(t)},K=(e,t)=>{const n=e.dom;((e,t)=>{const n=T(e);for(let r=0,o=n.length;r<o;r++){const o=n[r];t(e[o],o)}})(t,((e,t)=>{((e,t,n)=>{if(!s(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);C(e)&&e.style.setProperty(t,n)})(n,t,e)}))},X=e=>{const t=R((e=>{if(B()&&u(e.target)){const t=R(e.target);if(M(t)&&u(t.dom.shadowRoot)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return((e,t)=>0<e.length?w.some(e[0]):w.none())(t)}}return w.from(e.target)})(e).getOr(e.target)),n=()=>e.stopPropagation(),r=()=>e.preventDefault(),o=(s=r,i=n,(...e)=>s(i.apply(null,e)));var s,i;return((e,t,n,r,o,s,i)=>({target:e,x:t,y:n,stop:r,prevent:o,kill:s,raw:i}))(t,e.clientX,e.clientY,n,r,o,e)},Y=(e,t,n,r)=>{e.dom.removeEventListener(t,n,r)},G=v,J=(e,t,n)=>((e,t,n,r)=>((e,t,n,r,o)=>{const s=((e,t)=>n=>{e(n)&&t(X(n))})(n,r);return e.dom.addEventListener(t,s,o),{unbind:p(Y,e,t,s,o)}})(e,t,n,r,!1))(e,t,G,n),Q=()=>Z(0,0),Z=(e,t)=>({major:e,minor:t}),ee={nu:Z,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?Q():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const r=e[n];if(r.test(t))return r}})(e,t);if(!n)return{major:0,minor:0};const r=e=>Number(t.replace(n,"$"+e));return Z(r(1),r(2))})(e,n)},unknown:Q},te=(e,t)=>{const n=String(t).toLowerCase();return O(e,(e=>e.search(n)))},ne=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,re=e=>t=>k(t,e),oe=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>k(e,"edge/")&&k(e,"chrome")&&k(e,"safari")&&k(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,ne],search:e=>k(e,"chrome")&&!k(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>k(e,"msie")||k(e,"trident")},{name:"Opera",versionRegexes:[ne,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:re("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:re("firefox")},{name:"Safari",versionRegexes:[ne,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(k(e,"safari")||k(e,"mobile/"))&&k(e,"applewebkit")}],se=[{name:"Windows",search:re("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>k(e,"iphone")||k(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:re("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:re("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:re("linux"),versionRegexes:[]},{name:"Solaris",search:re("sunos"),versionRegexes:[]},{name:"FreeBSD",search:re("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:re("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],ie={browsers:g(oe),oses:g(se)},le="Edge",ae="Chromium",ce="Opera",ue="Firefox",de="Safari",me=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isEdge:r(le),isChromium:r(ae),isIE:r("IE"),isOpera:r(ce),isFirefox:r(ue),isSafari:r(de)}},he=()=>me({current:void 0,version:ee.unknown()}),ge=me,pe=(g(le),g(ae),g("IE"),g(ce),g(ue),g(de),"Windows"),fe="Android",ve="Linux",we="macOS",ye="Solaris",be="FreeBSD",Se="ChromeOS",xe=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isWindows:r(pe),isiOS:r("iOS"),isAndroid:r(fe),isMacOS:r(we),isLinux:r(ve),isSolaris:r(ye),isFreeBSD:r(be),isChromeOS:r(Se)}},Ee=()=>xe({current:void 0,version:ee.unknown()}),Fe=xe,Oe=(g(pe),g("iOS"),g(fe),g(ve),g(we),g(ye),g(be),g(Se),(e,t,n)=>{const r=ie.browsers(),o=ie.oses(),s=t.bind((e=>((e,t)=>((e,t)=>{for(let n=0;n<e.length;n++){const r=t(e[n]);if(r.isSome())return r}return w.none()})(t.brands,(t=>{const n=t.brand.toLowerCase();return O(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:ee.nu(parseInt(t.version,10),0)})))})))(r,e))).orThunk((()=>((e,t)=>te(e,t).map((e=>{const n=ee.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e))).fold(he,ge),i=((e,t)=>te(e,t).map((e=>{const n=ee.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e).fold(Ee,Fe),l=((e,t,n,r)=>{const o=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!o,i=e.isiOS()||e.isAndroid(),l=i||r("(pointer:coarse)"),a=o||!s&&i&&r("(min-device-width:768px)"),c=s||i&&!a,u=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),d=!c&&!a&&!u;return{isiPad:g(o),isiPhone:g(s),isTablet:g(a),isPhone:g(c),isTouch:g(l),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:g(u),isDesktop:g(d)}})(i,s,e,n);return{browser:s,os:i,deviceType:l}}),Te=e=>window.matchMedia(e).matches;let ke=(e=>{let t,n=!1;return(...r)=>(n||(n=!0,t=e.apply(null,r)),t)})((()=>Oe(navigator.userAgent,w.from(navigator.userAgentData),Te)));const Ce=(e,t)=>({left:e,top:t,translate:(n,r)=>Ce(e+n,t+r)}),Ae=Ce,Re=e=>{const t=void 0===e?window:e;return ke().browser.isFirefox()?w.none():w.from(t.visualViewport)},Le=(e,t,n,r)=>({x:e,y:t,width:n,height:r,right:e+n,bottom:t+r}),Me=e=>{const t=void 0===e?window:e,n=t.document,r=(e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop;return Ae(n,r)})(R(n));return Re(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,o=e.clientHeight;return Le(r.left,r.top,n,o)}),(e=>Le(Math.max(e.pageLeft,r.left),Math.max(e.pageTop,r.top),e.width,e.height)))},Ne=(e,t,n)=>Re(n).map((n=>{const r=e=>t(X(e));return n.addEventListener(e,r),{unbind:()=>n.removeEventListener(e,r)}})).getOrThunk((()=>({unbind:h})));var Pe=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),De=tinymce.util.Tools.resolve("tinymce.Env");const We=(e,t)=>{e.dispatch("FullscreenStateChanged",{state:t}),e.dispatch("ResizeEditor")},qe=("fullscreen_native",e=>e.options.get("fullscreen_native"));const He=e=>{return e.dom===(void 0!==(t=q(e).dom).fullscreenElement?t.fullscreenElement:void 0!==t.msFullscreenElement?t.msFullscreenElement:void 0!==t.webkitFullscreenElement?t.webkitFullscreenElement:null);var t},Ie=(e,t,n)=>((e,t,n)=>F(((e,t)=>{const n=d(t)?t:f;let r=e.dom;const o=[];for(;null!==r.parentNode&&void 0!==r.parentNode;){const e=r.parentNode,t=R(e);if(o.push(t),!0===n(t))break;r=e}return o})(e,n),t))(e,(e=>W(e,t)),n),Be=(e,t)=>((e,n)=>{return F((e=>w.from(e.dom.parentNode).map(R))(r=e).map(H).map((e=>F(e,(e=>{return t=e,!(r.dom===t.dom);var t})))).getOr([]),(e=>W(e,t)));var r})(e),Ve="data-ephox-mobile-fullscreen-style",_e="position:absolute!important;",je="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",ze=De.os.isAndroid(),$e=e=>{const t=((e,t)=>{const n=e.dom,r=window.getComputedStyle(n).getPropertyValue(t);return""!==r||z(e)?r:((e,t)=>C(e)?e.style.getPropertyValue(t):"")(n,t)})(e,"background-color");return void 0!==t&&""!==t?"background-color:"+t+"!important":"background-color:rgb(255,255,255)!important;"},Ue=Pe.DOM,Ke=Re().fold((()=>({bind:h,unbind:h})),(e=>{const t=(()=>{const e=y(h);return{...e,on:t=>e.get().each(t)}})(),n=b(),r=b(),o=((e,t)=>{let n=null;return{cancel:()=>{l(n)||(clearTimeout(n),n=null)},throttle:(...t)=>{l(n)&&(n=setTimeout((()=>{n=null,e.apply(null,t)}),50))}}})((()=>{document.body.scrollTop=0,document.documentElement.scrollTop=0,window.requestAnimationFrame((()=>{t.on((t=>K(t,{top:e.offsetTop+"px",left:e.offsetLeft+"px",height:e.height+"px",width:e.width+"px"})))}))}));return{bind:e=>{t.set(e),o.throttle(),n.set(Ne("resize",o.throttle)),r.set(Ne("scroll",o.throttle))},unbind:()=>{t.on((()=>{n.clear(),r.clear()})),t.clear()}}})),Xe=(e,t)=>{const n=document.body,r=document.documentElement,o=e.getContainer(),l=R(o),c=(e=>{const t=R(e.getElement());return _(t).map(j).getOrThunk((()=>(e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return R(t)})(q(t))))})(e),u=t.get(),d=R(e.getBody()),h=De.deviceType.isTouch(),g=o.style,p=e.iframeElement,f=null==p?void 0:p.style,v=e=>{e(n,"tox-fullscreen"),e(r,"tox-fullscreen"),e(o,"tox-fullscreen"),_(l).map((e=>j(e).dom)).each((t=>{e(t,"tox-fullscreen"),e(t,"tox-shadowhost")}))},y=()=>{h&&(e=>{const t=((e,t)=>{const n=document;return 1!==(r=n).nodeType&&9!==r.nodeType&&11!==r.nodeType||0===r.childElementCount?[]:x(n.querySelectorAll(e),R);var r})("["+Ve+"]");E(t,(t=>{const n=$(t,Ve);n&&"no-styles"!==n?K(t,e.parseStyle(n)):U(t,"style"),U(t,Ve)}))})(e.dom),v(Ue.removeClass),Ke.unbind(),w.from(t.get()).each((e=>e.fullscreenChangeHandler.unbind()))};if(u)u.fullscreenChangeHandler.unbind(),qe(e)&&He(c)&&(e=>{const t=e.dom;t.exitFullscreen?t.exitFullscreen():t.msExitFullscreen?t.msExitFullscreen():t.webkitCancelFullScreen&&t.webkitCancelFullScreen()})(q(c)),f.width=u.iframeWidth,f.height=u.iframeHeight,g.width=u.containerWidth,g.height=u.containerHeight,g.top=u.containerTop,g.left=u.containerLeft,y(),b=u.scrollPos,window.scrollTo(b.x,b.y),t.set(null),We(e,!1),e.off("remove",y);else{const n=J(q(c),void 0!==document.fullscreenElement?"fullscreenchange":void 0!==document.msFullscreenElement?"MSFullscreenChange":void 0!==document.webkitFullscreenElement?"webkitfullscreenchange":"fullscreenchange",(n=>{qe(e)&&(He(c)||null===t.get()||Xe(e,t))})),r={scrollPos:Me(window),containerWidth:g.width,containerHeight:g.height,containerTop:g.top,containerLeft:g.left,iframeWidth:f.width,iframeHeight:f.height,fullscreenChangeHandler:n};h&&((e,t,n)=>{const r=t=>n=>{const r=$(n,"style"),o=void 0===r?"no-styles":r.trim();o!==t&&(((e,t,n)=>{((e,t,n)=>{if(!(s(n)||a(n)||m(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(n,Ve,o),K(n,e.parseStyle(t)))},o=Ie(t,"*"),l=(e=>{const t=[];for(let n=0,r=e.length;n<r;++n){if(!i(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);S.apply(t,e[n])}return t})(x(o,(e=>Be(e,"*:not(.tox-silver-sink)")))),c=$e(n);E(l,r("display:none!important;")),E(o,r(_e+je+c)),r((!0===ze?"":_e)+je+c)(t)})(e.dom,l,d),f.width=f.height="100%",g.width=g.height="",v(Ue.addClass),Ke.bind(l),e.on("remove",y),t.set(r),qe(e)&&(e=>{const t=e.dom;t.requestFullscreen?t.requestFullscreen():t.msRequestFullscreen?t.msRequestFullscreen():t.webkitRequestFullScreen&&t.webkitRequestFullScreen()})(c),We(e,!0)}var b},Ye=(e,t)=>n=>{n.setActive(null!==t.get());const r=e=>n.setActive(e.state);return e.on("FullscreenStateChanged",r),()=>e.off("FullscreenStateChanged",r)};t.add("fullscreen",(t=>{const n=e(null);return t.inline||((e=>{(0,e.options.register)("fullscreen_native",{processor:"boolean",default:!1})})(t),((e,t)=>{e.addCommand("mceFullScreen",(()=>{Xe(e,t)}))})(t,n),((e,t)=>{const n=()=>e.execCommand("mceFullScreen");e.ui.registry.addToggleMenuItem("fullscreen",{text:"Fullscreen",icon:"fullscreen",shortcut:"Meta+Shift+F",onAction:n,onSetup:Ye(e,t)}),e.ui.registry.addToggleButton("fullscreen",{tooltip:"Fullscreen",icon:"fullscreen",onAction:n,onSetup:Ye(e,t)})})(t,n),t.addShortcut("Meta+Shift+F","","mceFullScreen")),(e=>({isFullscreen:()=>null!==e.get()}))(n)}))}();
\ No newline at end of file
+!function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=r=e,(o=String).prototype.isPrototypeOf(n)||(null===(s=r.constructor)||void 0===s?void 0:s.name)===o.name)?"string":t;var n,r,o,s})(t)===e,r=e=>t=>typeof t===e,o=e=>t=>e===t,s=n("string"),i=n("object"),l=n("array"),a=o(null),c=r("boolean"),u=o(void 0),d=e=>!(e=>null==e)(e),m=r("function"),h=r("number"),g=()=>{},p=e=>()=>e;function f(e,...t){return(...n)=>{const r=t.concat(n);return e.apply(null,r)}}const v=p(!1),w=p(!0);class b{constructor(e,t){this.tag=e,this.value=t}static some(e){return new b(!0,e)}static none(){return b.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?b.some(e(this.value)):b.none()}bind(e){return this.tag?e(this.value):b.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:b.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return d(e)?b.some(e):b.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}b.singletonNone=new b(!1);const y=Array.prototype.push,S=(e,t)=>{const n=e.length,r=new Array(n);for(let o=0;o<n;o++){const n=e[o];r[o]=t(n,o)}return r},x=(e,t)=>{for(let n=0,r=e.length;n<r;n++)t(e[n],n)},E=(e,t)=>{const n=[];for(let r=0,o=e.length;r<o;r++){const o=e[r];t(o,r)&&n.push(o)}return n},F=(e,t)=>((e,t,n)=>{for(let r=0,o=e.length;r<o;r++){const o=e[r];if(t(o,r))return b.some(o);if(n(o,r))break}return b.none()})(e,t,v),O=t=>{const n=e(b.none()),r=()=>n.get().each(t);return{clear:()=>{r(),n.set(b.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{r(),n.set(b.some(e))}}},k=()=>O((e=>e.unbind())),T=Object.keys,C="undefined"!=typeof window?window:Function("return this;")(),A=(e,t)=>((e,t)=>{let n=null!=t?t:C;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),R=Object.getPrototypeOf,L=e=>{const t=A("ownerDocument.defaultView",e);return i(e)&&((e=>((e,t)=>{const n=((e,t)=>A(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(R(e).constructor.name))},M=e=>t=>(e=>e.dom.nodeType)(t)===e,P=M(1),D=M(3),N=M(9),H=M(11),W=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},q=(e,t)=>{e.dom.removeAttribute(t)},I=(e,t,n=0,r)=>{const o=e.indexOf(t,n);return-1!==o&&(!!u(r)||o+t.length<=r)},V=e=>void 0!==e.style&&m(e.style.getPropertyValue),j=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},B=j,_=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},z=e=>B(e.dom.ownerDocument),$=e=>S(e.dom.childNodes,B),U=m(Element.prototype.attachShadow)&&m(Node.prototype.getRootNode),K=p(U),X=U?e=>B(e.dom.getRootNode()):e=>N(e)?e:z(e),Y=e=>{const t=X(e);return H(n=t)&&d(n.dom.host)?b.some(t):b.none();var n},G=e=>B(e.dom.host),J=e=>{const t=D(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return Y(B(t)).fold((()=>n.body.contains(t)),(r=J,o=G,e=>r(o(e))));var r,o},Q=(e,t,n)=>{if(!s(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);V(e)&&e.style.setProperty(t,n)},Z=(e,t,n)=>{const r=e.dom;Q(r,t,n)},ee=(e,t)=>{const n=e.dom;((e,t)=>{const n=T(e);for(let r=0,o=n.length;r<o;r++){const o=n[r];t(e[o],o)}})(t,((e,t)=>{Q(n,t,e)}))},te=(e,t)=>{const n=e.dom,r=window.getComputedStyle(n).getPropertyValue(t);return""!==r||J(e)?r:ne(n,t)},ne=(e,t)=>V(e)?e.style.getPropertyValue(t):"",re=e=>{const t=B((e=>{if(K()&&d(e.target)){const t=B(e.target);if(P(t)&&d(t.dom.shadowRoot)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return((e,t)=>0<e.length?b.some(e[0]):b.none())(t)}}return b.from(e.target)})(e).getOr(e.target)),n=()=>e.stopPropagation(),r=()=>e.preventDefault(),o=(s=r,i=n,(...e)=>s(i.apply(null,e)));var s,i;return((e,t,n,r,o,s,i)=>({target:e,x:t,y:n,stop:r,prevent:o,kill:s,raw:i}))(t,e.clientX,e.clientY,n,r,o,e)},oe=(e,t,n,r)=>{e.dom.removeEventListener(t,n,r)},se=w,ie=(e,t,n)=>((e,t,n,r)=>((e,t,n,r,o)=>{const s=((e,t)=>n=>{e(n)&&t(re(n))})(n,r);return e.dom.addEventListener(t,s,o),{unbind:f(oe,e,t,s,o)}})(e,t,n,r,!1))(e,t,se,n),le=()=>ae(0,0),ae=(e,t)=>({major:e,minor:t}),ce={nu:ae,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const r=e[n];if(r.test(t))return r}})(e,t);if(!n)return{major:0,minor:0};const r=e=>Number(t.replace(n,"$"+e));return ae(r(1),r(2))})(e,n)},unknown:le},ue=(e,t)=>{const n=String(t).toLowerCase();return F(e,(e=>e.search(n)))},de=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,me=e=>t=>I(t,e),he=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>I(e,"edge/")&&I(e,"chrome")&&I(e,"safari")&&I(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,de],search:e=>I(e,"chrome")&&!I(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>I(e,"msie")||I(e,"trident")},{name:"Opera",versionRegexes:[de,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:me("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:me("firefox")},{name:"Safari",versionRegexes:[de,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(I(e,"safari")||I(e,"mobile/"))&&I(e,"applewebkit")}],ge=[{name:"Windows",search:me("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>I(e,"iphone")||I(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:me("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:me("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:me("linux"),versionRegexes:[]},{name:"Solaris",search:me("sunos"),versionRegexes:[]},{name:"FreeBSD",search:me("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:me("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],pe={browsers:p(he),oses:p(ge)},fe="Edge",ve="Chromium",we="Opera",be="Firefox",ye="Safari",Se=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isEdge:r(fe),isChromium:r(ve),isIE:r("IE"),isOpera:r(we),isFirefox:r(be),isSafari:r(ye)}},xe=()=>Se({current:void 0,version:ce.unknown()}),Ee=Se,Fe=(p(fe),p(ve),p("IE"),p(we),p(be),p(ye),"Windows"),Oe="Android",ke="Linux",Te="macOS",Ce="Solaris",Ae="FreeBSD",Re="ChromeOS",Le=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isWindows:r(Fe),isiOS:r("iOS"),isAndroid:r(Oe),isMacOS:r(Te),isLinux:r(ke),isSolaris:r(Ce),isFreeBSD:r(Ae),isChromeOS:r(Re)}},Me=()=>Le({current:void 0,version:ce.unknown()}),Pe=Le,De=(p(Fe),p("iOS"),p(Oe),p(ke),p(Te),p(Ce),p(Ae),p(Re),(e,t,n)=>{const r=pe.browsers(),o=pe.oses(),s=t.bind((e=>((e,t)=>((e,t)=>{for(let n=0;n<e.length;n++){const r=t(e[n]);if(r.isSome())return r}return b.none()})(t.brands,(t=>{const n=t.brand.toLowerCase();return F(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:ce.nu(parseInt(t.version,10),0)})))})))(r,e))).orThunk((()=>((e,t)=>ue(e,t).map((e=>{const n=ce.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e))).fold(xe,Ee),i=((e,t)=>ue(e,t).map((e=>{const n=ce.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e).fold(Me,Pe),l=((e,t,n,r)=>{const o=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!o,i=e.isiOS()||e.isAndroid(),l=i||r("(pointer:coarse)"),a=o||!s&&i&&r("(min-device-width:768px)"),c=s||i&&!a,u=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),d=!c&&!a&&!u;return{isiPad:p(o),isiPhone:p(s),isTablet:p(a),isPhone:p(c),isTouch:p(l),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:p(u),isDesktop:p(d)}})(i,s,e,n);return{browser:s,os:i,deviceType:l}}),Ne=e=>window.matchMedia(e).matches;let He=(e=>{let t,n=!1;return(...r)=>(n||(n=!0,t=e.apply(null,r)),t)})((()=>De(navigator.userAgent,b.from(navigator.userAgentData),Ne)));const We=(e,t)=>({left:e,top:t,translate:(n,r)=>We(e+n,t+r)}),qe=We,Ie=e=>{const t=void 0===e?window:e;return He().browser.isFirefox()?b.none():b.from(t.visualViewport)},Ve=(e,t,n,r)=>({x:e,y:t,width:n,height:r,right:e+n,bottom:t+r}),je=e=>{const t=void 0===e?window:e,n=t.document,r=(e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop;return qe(n,r)})(B(n));return Ie(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,o=e.clientHeight;return Ve(r.left,r.top,n,o)}),(e=>Ve(Math.max(e.pageLeft,r.left),Math.max(e.pageTop,r.top),e.width,e.height)))},Be=(e,t,n)=>Ie(n).map((n=>{const r=e=>t(re(e));return n.addEventListener(e,r),{unbind:()=>n.removeEventListener(e,r)}})).getOrThunk((()=>({unbind:g})));var _e=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),ze=tinymce.util.Tools.resolve("tinymce.Env");const $e=(e,t)=>{e.dispatch("FullscreenStateChanged",{state:t}),e.dispatch("ResizeEditor")},Ue=("fullscreen_native",e=>e.options.get("fullscreen_native"));const Ke=e=>{return e.dom===(void 0!==(t=z(e).dom).fullscreenElement?t.fullscreenElement:void 0!==t.msFullscreenElement?t.msFullscreenElement:void 0!==t.webkitFullscreenElement?t.webkitFullscreenElement:null);var t},Xe=(e,t,n)=>((e,t,n)=>E(((e,t)=>{const n=m(t)?t:v;let r=e.dom;const o=[];for(;null!==r.parentNode&&void 0!==r.parentNode;){const e=r.parentNode,t=B(e);if(o.push(t),!0===n(t))break;r=e}return o})(e,n),t))(e,(e=>_(e,t)),n),Ye=(e,t)=>((e,n)=>{return E((e=>b.from(e.dom.parentNode).map(B))(r=e).map($).map((e=>E(e,(e=>{return t=e,!(r.dom===t.dom);var t})))).getOr([]),(e=>_(e,t)));var r})(e),Ge="data-ephox-mobile-fullscreen-style",Je="position:absolute!important;",Qe="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",Ze=ze.os.isAndroid(),et=(e,t,n)=>{const r=t=>n=>{const r=W(n,"style"),o=void 0===r?"no-styles":r.trim();o!==t&&(((e,t,n)=>{((e,t,n)=>{if(!(s(n)||c(n)||h(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(n,Ge,o),ee(n,e.parseStyle(t)))},o=Xe(t,"*"),i=(e=>{const t=[];for(let n=0,r=e.length;n<r;++n){if(!l(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);y.apply(t,e[n])}return t})(S(o,(e=>Ye(e,"*:not(.tox-silver-sink)")))),a=(e=>{const t=te(e,"background-color");return void 0!==t&&""!==t?"background-color:"+t+"!important":"background-color:rgb(255,255,255)!important;"})(n);x(i,r("display:none!important;")),x(o,r(Je+Qe+a)),r((!0===Ze?"":Je)+Qe+a)(t)},tt=_e.DOM,nt=Ie().fold((()=>({bind:g,unbind:g})),(e=>{const t=(()=>{const e=O(g);return{...e,on:t=>e.get().each(t)}})(),n=k(),r=k(),o=((e,t)=>{let n=null;return{cancel:()=>{a(n)||(clearTimeout(n),n=null)},throttle:(...t)=>{a(n)&&(n=setTimeout((()=>{n=null,e.apply(null,t)}),50))}}})((()=>{document.body.scrollTop=0,document.documentElement.scrollTop=0,window.requestAnimationFrame((()=>{t.on((t=>ee(t,{top:e.offsetTop+"px",left:e.offsetLeft+"px",height:e.height+"px",width:e.width+"px"})))}))}));return{bind:e=>{t.set(e),o.throttle(),n.set(Be("resize",o.throttle)),r.set(Be("scroll",o.throttle))},unbind:()=>{t.on((()=>{n.clear(),r.clear()})),t.clear()}}})),rt=(e,t)=>{const n=document.body,r=document.documentElement,o=e.getContainer(),s=B(o),i=(l=s,b.from(l.dom.nextSibling).map(B)).filter((e=>(e=>P(e)&&L(e.dom))(e)&&((e,t)=>(e=>void 0!==e.dom.classList)(e)&&e.dom.classList.contains("tox-silver-sink"))(e)));var l;const a=(e=>{const t=B(e.getElement());return Y(t).map(G).getOrThunk((()=>(e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return B(t)})(z(t))))})(e),c=t.get(),u=B(e.getBody()),d=ze.deviceType.isTouch(),m=o.style,h=e.iframeElement,g=null==h?void 0:h.style,p=e=>{e(n,"tox-fullscreen"),e(r,"tox-fullscreen"),e(o,"tox-fullscreen"),Y(s).map((e=>G(e).dom)).each((t=>{e(t,"tox-fullscreen"),e(t,"tox-shadowhost")}))},f=()=>{d&&(e=>{const t=((e,t)=>{const n=document;return 1!==(r=n).nodeType&&9!==r.nodeType&&11!==r.nodeType||0===r.childElementCount?[]:S(n.querySelectorAll(e),B);var r})("["+Ge+"]");x(t,(t=>{const n=W(t,Ge);n&&"no-styles"!==n?ee(t,e.parseStyle(n)):q(t,"style"),q(t,Ge)}))})(e.dom),p(tt.removeClass),nt.unbind(),b.from(t.get()).each((e=>e.fullscreenChangeHandler.unbind()))};if(c)c.fullscreenChangeHandler.unbind(),Ue(e)&&Ke(a)&&(e=>{const t=e.dom;t.exitFullscreen?t.exitFullscreen():t.msExitFullscreen?t.msExitFullscreen():t.webkitCancelFullScreen&&t.webkitCancelFullScreen()})(z(a)),g.width=c.iframeWidth,g.height=c.iframeHeight,m.width=c.containerWidth,m.height=c.containerHeight,m.top=c.containerTop,m.left=c.containerLeft,w=i,y=c.sinkCssPosition,E=(e,t)=>{Z(e,"position",t)},w.isSome()&&y.isSome()?b.some(E(w.getOrDie(),y.getOrDie())):b.none(),f(),v=c.scrollPos,window.scrollTo(v.x,v.y),t.set(null),$e(e,!1),e.off("remove",f);else{const n=ie(z(a),void 0!==document.fullscreenElement?"fullscreenchange":void 0!==document.msFullscreenElement?"MSFullscreenChange":void 0!==document.webkitFullscreenElement?"webkitfullscreenchange":"fullscreenchange",(n=>{Ue(e)&&(Ke(a)||null===t.get()||rt(e,t))})),r={scrollPos:je(window),containerWidth:m.width,containerHeight:m.height,containerTop:m.top,containerLeft:m.left,iframeWidth:g.width,iframeHeight:g.height,fullscreenChangeHandler:n,sinkCssPosition:i.map((e=>te(e,"position")))};d&&et(e.dom,s,u),g.width=g.height="100%",m.width=m.height="",p(tt.addClass),i.each((e=>{Z(e,"position","fixed")})),nt.bind(s),e.on("remove",f),t.set(r),Ue(e)&&(e=>{const t=e.dom;t.requestFullscreen?t.requestFullscreen():t.msRequestFullscreen?t.msRequestFullscreen():t.webkitRequestFullScreen&&t.webkitRequestFullScreen()})(a),$e(e,!0)}var v,w,y,E},ot=(e,t)=>n=>{n.setActive(null!==t.get());const r=e=>n.setActive(e.state);return e.on("FullscreenStateChanged",r),()=>e.off("FullscreenStateChanged",r)};t.add("fullscreen",(t=>{const n=e(null);return t.inline||((e=>{(0,e.options.register)("fullscreen_native",{processor:"boolean",default:!1})})(t),((e,t)=>{e.addCommand("mceFullScreen",(()=>{rt(e,t)}))})(t,n),((e,t)=>{const n=()=>e.execCommand("mceFullScreen");e.ui.registry.addToggleMenuItem("fullscreen",{text:"Fullscreen",icon:"fullscreen",shortcut:"Meta+Shift+F",onAction:n,onSetup:ot(e,t)}),e.ui.registry.addToggleButton("fullscreen",{tooltip:"Fullscreen",icon:"fullscreen",onAction:n,onSetup:ot(e,t)})})(t,n),t.addShortcut("Meta+Shift+F","","mceFullScreen")),(e=>({isFullscreen:()=>null!==e.get()}))(n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/image/plugin.min.js b/public/libs/tinymce/plugins/image/plugin.min.js
index 905b47535e0..0fa3f5f72dd 100644
--- a/public/libs/tinymce/plugins/image/plugin.min.js
+++ b/public/libs/tinymce/plugins/image/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=Object.getPrototypeOf,a=(e,t,a)=>{var i;return!!a(e,t.prototype)||(null===(i=e.constructor)||void 0===i?void 0:i.name)===t.name},i=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&a(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,s=e=>t=>typeof t===e,r=i("string"),o=i("object"),n=e=>((e,i)=>o(e)&&a(e,i,((e,a)=>t(e)===a)))(e,Object),l=i("array"),c=(null,e=>null===e);const m=s("boolean"),d=e=>!(e=>null==e)(e),g=s("function"),u=s("number"),p=()=>{};class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return d(e)?h.some(e):h.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const b=Object.keys,v=Object.hasOwnProperty,y=(e,t)=>v.call(e,t),f=Array.prototype.push,w=e=>{const t=[];for(let a=0,i=e.length;a<i;++a){if(!l(e[a]))throw new Error("Arr.flatten item "+a+" was not an array, input: "+e);f.apply(t,e[a])}return t};"undefined"!=typeof window?window:Function("return this;")();const A=(e,t,a)=>{((e,t,a)=>{if(!(r(a)||m(a)||u(a)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",a,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,a+"")})(e.dom,t,a)},D=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},_=D;var C=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),I=tinymce.util.Tools.resolve("tinymce.util.URI");const U=e=>e.length>0,S=e=>t=>t.options.get(e),x=S("image_dimensions"),N=S("image_advtab"),T=S("image_uploadtab"),O=S("image_prepend_url"),E=S("image_class_list"),L=S("image_description"),j=S("image_title"),M=S("image_caption"),R=S("image_list"),k=S("a11y_advanced_options"),z=S("automatic_uploads"),P=(e,t)=>Math.max(parseInt(e,10),parseInt(t,10)),B=e=>(e&&(e=e.replace(/px$/,"")),e),F=e=>(e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e),H=e=>"IMG"===e.nodeName&&(e.hasAttribute("data-mce-object")||e.hasAttribute("data-mce-placeholder")),G=(e,t)=>{const a=e.options.get;return I.isDomSafe(t,"img",{allow_html_data_urls:a("allow_html_data_urls"),allow_script_urls:a("allow_script_urls"),allow_svg_data_urls:a("allow_svg_data_urls")})},W=C.DOM,$=e=>e.style.marginLeft&&e.style.marginRight&&e.style.marginLeft===e.style.marginRight?B(e.style.marginLeft):"",V=e=>e.style.marginTop&&e.style.marginBottom&&e.style.marginTop===e.style.marginBottom?B(e.style.marginTop):"",K=e=>e.style.borderWidth?B(e.style.borderWidth):"",Z=(e,t)=>{var a;return e.hasAttribute(t)&&null!==(a=e.getAttribute(t))&&void 0!==a?a:""},q=e=>null!==e.parentNode&&"FIGURE"===e.parentNode.nodeName,J=(e,t,a)=>{""===a||null===a?e.removeAttribute(t):e.setAttribute(t,a)},Q=(e,t)=>{const a=e.getAttribute("style"),i=t(null!==a?a:"");i.length>0?(e.setAttribute("style",i),e.setAttribute("data-mce-style",i)):e.removeAttribute("style")},X=(e,t)=>(e,a,i)=>{const s=e.style;s[a]?(s[a]=F(i),Q(e,t)):J(e,a,i)},Y=(e,t)=>e.style[t]?B(e.style[t]):Z(e,t),ee=(e,t)=>{const a=F(t);e.style.marginLeft=a,e.style.marginRight=a},te=(e,t)=>{const a=F(t);e.style.marginTop=a,e.style.marginBottom=a},ae=(e,t)=>{const a=F(t);e.style.borderWidth=a},ie=(e,t)=>{e.style.borderStyle=t},se=e=>{var t;return null!==(t=e.style.borderStyle)&&void 0!==t?t:""},re=e=>d(e)&&"FIGURE"===e.nodeName,oe=e=>0===W.getAttrib(e,"alt").length&&"presentation"===W.getAttrib(e,"role"),ne=e=>oe(e)?"":Z(e,"alt"),le=(e,t)=>{var a;const i=document.createElement("img");return J(i,"style",t.style),($(i)||""!==t.hspace)&&ee(i,t.hspace),(V(i)||""!==t.vspace)&&te(i,t.vspace),(K(i)||""!==t.border)&&ae(i,t.border),(se(i)||""!==t.borderStyle)&&ie(i,t.borderStyle),e(null!==(a=i.getAttribute("style"))&&void 0!==a?a:"")},ce=(e,t)=>({src:Z(t,"src"),alt:ne(t),title:Z(t,"title"),width:Y(t,"width"),height:Y(t,"height"),class:Z(t,"class"),style:e(Z(t,"style")),caption:q(t),hspace:$(t),vspace:V(t),border:K(t),borderStyle:se(t),isDecorative:oe(t)}),me=(e,t,a,i,s)=>{a[i]!==t[i]&&s(e,i,String(a[i]))},de=(e,t,a)=>{if(a){W.setAttrib(e,"role","presentation");const t=_(e);A(t,"alt","")}else{if(c(t)){"alt",_(e).dom.removeAttribute("alt")}else{const a=_(e);A(a,"alt",t)}"presentation"===W.getAttrib(e,"role")&&W.setAttrib(e,"role","")}},ge=(e,t)=>(a,i,s)=>{e(a,s),Q(a,t)},ue=(e,t,a)=>{const i=ce(e,a);me(a,i,t,"caption",((e,t,a)=>(e=>{q(e)?(e=>{const t=e.parentNode;d(t)&&(W.insertAfter(e,t),W.remove(t))})(e):(e=>{const t=W.create("figure",{class:"image"});W.insertAfter(t,e),t.appendChild(e),t.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),t.contentEditable="false"})(e)})(e))),me(a,i,t,"src",J),me(a,i,t,"title",J),me(a,i,t,"width",X(0,e)),me(a,i,t,"height",X(0,e)),me(a,i,t,"class",J),me(a,i,t,"style",ge(((e,t)=>J(e,"style",t)),e)),me(a,i,t,"hspace",ge(ee,e)),me(a,i,t,"vspace",ge(te,e)),me(a,i,t,"border",ge(ae,e)),me(a,i,t,"borderStyle",ge(ie,e)),((e,t,a)=>{a.alt===t.alt&&a.isDecorative===t.isDecorative||de(e,a.alt,a.isDecorative)})(a,i,t)},pe=(e,t)=>{const a=(e=>{if(e.margin){const t=String(e.margin).split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e})(e.dom.styles.parse(t)),i=e.dom.styles.parse(e.dom.styles.serialize(a));return e.dom.styles.serialize(i)},he=e=>{const t=e.selection.getNode(),a=e.dom.getParent(t,"figure.image");return a?e.dom.select("img",a)[0]:t&&("IMG"!==t.nodeName||H(t))?null:t},be=(e,t)=>{var a;const i=e.dom,s=((t,a)=>{const i={};var s;return((e,t,a,i)=>{((e,t)=>{const a=b(e);for(let i=0,s=a.length;i<s;i++){const s=a[i];t(e[s],s)}})(e,((e,s)=>{(t(e,s)?a:i)(e,s)}))})(t,((t,a)=>!e.schema.isValidChild(a,"figure")),(s=i,(e,t)=>{s[t]=e}),p),i})(e.schema.getTextBlockElements()),r=i.getParent(t.parentNode,(e=>{return t=s,a=e.nodeName,y(t,a)&&void 0!==t[a]&&null!==t[a];var t,a}),e.getBody());return r&&null!==(a=i.split(r,t))&&void 0!==a?a:t},ve=(e,t)=>{const a=((t,a)=>{const i=document.createElement("img");if(ue((t=>pe(e,t)),{...a,caption:!1},i),de(i,a.alt,a.isDecorative),a.caption){const e=W.create("figure",{class:"image"});return e.appendChild(i),e.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),e.contentEditable="false",e}return i})(0,t);e.dom.setAttrib(a,"data-mce-id","__mcenew"),e.focus(),e.selection.setContent(a.outerHTML);const i=e.dom.select('*[data-mce-id="__mcenew"]')[0];if(e.dom.setAttrib(i,"data-mce-id",null),re(i)){const t=be(e,i);e.selection.select(t)}else e.selection.select(i)},ye=(e,t)=>{const a=he(e);if(a){const i={...ce((t=>pe(e,t)),a),...t},s=((e,t)=>{const a=t.src;return{...t,src:G(e,a)?a:""}})(e,i);i.src?((e,t)=>{const a=he(e);if(a)if(ue((t=>pe(e,t)),t,a),((e,t)=>{e.dom.setAttrib(t,"src",t.getAttribute("src"))})(e,a),re(a.parentNode)){const t=a.parentNode;be(e,t),e.selection.select(a.parentNode)}else e.selection.select(a),((e,t,a)=>{const i=()=>{a.onload=a.onerror=null,e.selection&&(e.selection.select(a),e.nodeChanged())};a.onload=()=>{t.width||t.height||!x(e)||e.dom.setAttribs(a,{width:String(a.clientWidth),height:String(a.clientHeight)}),i()},a.onerror=i})(e,t,a)})(e,s):((e,t)=>{if(t){const a=e.dom.is(t.parentNode,"figure.image")?t.parentNode:t;e.dom.remove(a),e.focus(),e.nodeChanged(),e.dom.isEmpty(e.getBody())&&(e.setContent(""),e.selection.setCursorLocation())}})(e,a)}else t.src&&ve(e,{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1,...t})},fe=(we=(e,t)=>n(e)&&n(t)?fe(e,t):t,(...e)=>{if(0===e.length)throw new Error("Can't merge zero objects");const t={};for(let a=0;a<e.length;a++){const i=e[a];for(const e in i)y(i,e)&&(t[e]=we(t[e],i[e]))}return t});var we,Ae=tinymce.util.Tools.resolve("tinymce.util.ImageUploader"),De=tinymce.util.Tools.resolve("tinymce.util.Tools");const _e=e=>r(e.value)?e.value:"",Ce=(e,t)=>{const a=[];return De.each(e,(e=>{const i=(e=>r(e.text)?e.text:r(e.title)?e.title:"")(e);if(void 0!==e.menu){const s=Ce(e.menu,t);a.push({text:i,items:s})}else{const s=t(e);a.push({text:i,value:s})}})),a},Ie=(e=_e)=>t=>t?h.from(t).map((t=>Ce(t,e))):h.none(),Ue=(e,t)=>((e,a)=>{for(let a=0;a<e.length;a++){const s=(e=>y(e,"items"))(i=e[a])?Ue(i.items,t):i.value===t?h.some(i):h.none();if(s.isSome())return s}var i;return h.none()})(e),Se=Ie,xe=(e,t)=>e.bind((e=>Ue(e,t))),Ne=e=>{const t=Se((t=>e.convertURL(t.value||t.url||"","src"))),a=new Promise((a=>{((e,t)=>{const a=R(e);r(a)?fetch(a).then((e=>{e.ok&&e.json().then(t)})):g(a)?a(t):t(a)})(e,(e=>{a(t(e).map((e=>w([[{text:"None",value:""}],e]))))}))})),i=(A=E(e),Ie(_e)(A)),s=N(e),o=T(e),n=(e=>U(e.options.get("images_upload_url")))(e),l=(e=>d(e.options.get("images_upload_handler")))(e),c=(e=>{const t=he(e);return t?ce((t=>pe(e,t)),t):{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1}})(e),m=L(e),u=j(e),p=x(e),b=M(e),v=k(e),y=z(e),f=h.some(O(e)).filter((e=>r(e)&&e.length>0));var A;return a.then((e=>({image:c,imageList:e,classList:i,hasAdvTab:s,hasUploadTab:o,hasUploadUrl:n,hasUploadHandler:l,hasDescription:m,hasImageTitle:u,hasDimensions:p,hasImageCaption:b,prependURL:f,hasAccessibilityOptions:v,automaticUploads:y})))},Te=e=>{const t=e.imageList.map((e=>({name:"images",type:"listbox",label:"Image list",items:e}))),a={name:"alt",type:"input",label:"Alternative description",enabled:!(e.hasAccessibilityOptions&&e.image.isDecorative)},i=e.classList.map((e=>({name:"classes",type:"listbox",label:"Class",items:e})));return w([[{name:"src",type:"urlinput",filetype:"image",label:"Source"}],t.toArray(),e.hasAccessibilityOptions&&e.hasDescription?[{type:"label",label:"Accessibility",items:[{name:"isDecorative",type:"checkbox",label:"Image is decorative"}]}]:[],e.hasDescription?[a]:[],e.hasImageTitle?[{name:"title",type:"input",label:"Image title"}]:[],e.hasDimensions?[{name:"dimensions",type:"sizeinput"}]:[],[{...(s=e.classList.isSome()&&e.hasImageCaption,s?{type:"grid",columns:2}:{type:"panel"}),items:w([i.toArray(),e.hasImageCaption?[{type:"label",label:"Caption",items:[{type:"checkbox",name:"caption",label:"Show caption"}]}]:[]])}]]);var s},Oe=e=>({title:"General",name:"general",items:Te(e)}),Ee=Te,Le=e=>({src:{value:e.src,meta:{}},images:e.src,alt:e.alt,title:e.title,dimensions:{width:e.width,height:e.height},classes:e.class,caption:e.caption,style:e.style,vspace:e.vspace,border:e.border,hspace:e.hspace,borderstyle:e.borderStyle,fileinput:[],isDecorative:e.isDecorative}),je=(e,t)=>({src:e.src.value,alt:null!==e.alt&&0!==e.alt.length||!t?e.alt:null,title:e.title,width:e.dimensions.width,height:e.dimensions.height,class:e.classes,style:e.style,caption:e.caption,hspace:e.hspace,vspace:e.vspace,border:e.border,borderStyle:e.borderstyle,isDecorative:e.isDecorative}),Me=(e,t,a,i)=>{((e,t)=>{const a=t.getData();((e,t)=>/^(?:[a-zA-Z]+:)?\/\//.test(t)?h.none():e.prependURL.bind((e=>t.substring(0,e.length)!==e?h.some(e+t):h.none())))(e,a.src.value).each((e=>{t.setData({src:{value:e,meta:a.src.meta}})}))})(t,i),((e,t)=>{const a=t.getData(),i=a.src.meta;if(void 0!==i){const s=fe({},a);((e,t,a)=>{e.hasDescription&&r(a.alt)&&(t.alt=a.alt),e.hasAccessibilityOptions&&(t.isDecorative=a.isDecorative||t.isDecorative||!1),e.hasImageTitle&&r(a.title)&&(t.title=a.title),e.hasDimensions&&(r(a.width)&&(t.dimensions.width=a.width),r(a.height)&&(t.dimensions.height=a.height)),r(a.class)&&xe(e.classList,a.class).each((e=>{t.classes=e.value})),e.hasImageCaption&&m(a.caption)&&(t.caption=a.caption),e.hasAdvTab&&(r(a.style)&&(t.style=a.style),r(a.vspace)&&(t.vspace=a.vspace),r(a.border)&&(t.border=a.border),r(a.hspace)&&(t.hspace=a.hspace),r(a.borderstyle)&&(t.borderstyle=a.borderstyle))})(e,s,i),t.setData(s)}})(t,i),((e,t,a,i)=>{const s=i.getData(),r=s.src.value,o=s.src.meta||{};o.width||o.height||!t.hasDimensions||(U(r)?e.imageSize(r).then((e=>{a.open&&i.setData({dimensions:e})})).catch((e=>console.error(e))):i.setData({dimensions:{width:"",height:""}}))})(e,t,a,i),((e,t,a)=>{const i=a.getData(),s=xe(e.imageList,i.src.value);t.prevImage=s,a.setData({images:s.map((e=>e.value)).getOr("")})})(t,a,i)},Re=(e,t,a,i)=>{const s=i.getData();var r;i.block("Uploading image"),(r=s.fileinput,((e,t)=>0<e.length?h.some(e[0]):h.none())(r)).fold((()=>{i.unblock()}),(s=>{const r=URL.createObjectURL(s),o=()=>{i.unblock(),URL.revokeObjectURL(r)},n=s=>{i.setData({src:{value:s,meta:{}}}),i.showTab("general"),Me(e,t,a,i)};var l;(l=s,new Promise(((e,t)=>{const a=new FileReader;a.onload=()=>{e(a.result)},a.onerror=()=>{var e;t(null===(e=a.error)||void 0===e?void 0:e.message)},a.readAsDataURL(l)}))).then((a=>{const l=e.createBlobCache(s,r,a);t.automaticUploads?e.uploadImage(l).then((e=>{n(e.url),o()})).catch((t=>{o(),e.alertErr(t)})):(e.addToBlobCache(l),n(l.blobUri()),i.unblock())}))}))},ke=(e,t,a)=>(i,s)=>{"src"===s.name?Me(e,t,a,i):"images"===s.name?((e,t,a,i)=>{const s=i.getData(),r=xe(t.imageList,s.images);r.each((e=>{const t=""===s.alt||a.prevImage.map((e=>e.text===s.alt)).getOr(!1);t?""===e.value?i.setData({src:e,alt:a.prevAlt}):i.setData({src:e,alt:e.text}):i.setData({src:e})})),a.prevImage=r,Me(e,t,a,i)})(e,t,a,i):"alt"===s.name?a.prevAlt=i.getData().alt:"fileinput"===s.name?Re(e,t,a,i):"isDecorative"===s.name&&i.setEnabled("alt",!i.getData().isDecorative)},ze=e=>()=>{e.open=!1},Pe=e=>e.hasAdvTab||e.hasUploadUrl||e.hasUploadHandler?{type:"tabpanel",tabs:w([[Oe(e)],e.hasAdvTab?[{title:"Advanced",name:"advanced",items:[{type:"grid",columns:2,items:[{type:"input",label:"Vertical space",name:"vspace",inputMode:"numeric"},{type:"input",label:"Horizontal space",name:"hspace",inputMode:"numeric"},{type:"input",label:"Border width",name:"border",inputMode:"numeric"},{type:"listbox",name:"borderstyle",label:"Border style",items:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]}]}]}]:[],e.hasUploadTab&&(e.hasUploadUrl||e.hasUploadHandler)?[{title:"Upload",name:"upload",items:[{type:"dropzone",name:"fileinput"}]}]:[]])}:{type:"panel",items:Ee(e)},Be=(e,t,a)=>i=>{const s=fe(Le(t.image),i.getData()),r={...s,style:le(a.normalizeCss,je(s,!1))};e.execCommand("mceUpdateImage",!1,je(r,t.hasAccessibilityOptions)),e.editorUpload.uploadImagesAuto(),i.close()},Fe=e=>t=>G(e,t)?(e=>new Promise((t=>{const a=document.createElement("img"),i=e=>{a.onload=a.onerror=null,a.parentNode&&a.parentNode.removeChild(a),t(e)};a.onload=()=>{const e={width:P(a.width,a.clientWidth),height:P(a.height,a.clientHeight)};i(Promise.resolve(e))},a.onerror=()=>{i(Promise.reject(`Failed to get image dimensions for: ${e}`))};const s=a.style;s.visibility="hidden",s.position="fixed",s.bottom=s.left="0px",s.width=s.height="auto",document.body.appendChild(a),a.src=e})))(e.documentBaseURI.toAbsolute(t)).then((e=>({width:String(e.width),height:String(e.height)}))):Promise.resolve({width:"",height:""}),He=e=>(t,a,i)=>{var s;return e.editorUpload.blobCache.create({blob:t,blobUri:a,name:null===(s=t.name)||void 0===s?void 0:s.replace(/\.[^\.]+$/,""),filename:t.name,base64:i.split(",")[1]})},Ge=e=>t=>{e.editorUpload.blobCache.add(t)},We=e=>t=>{e.windowManager.alert(t)},$e=e=>t=>pe(e,t),Ve=e=>t=>e.dom.parseStyle(t),Ke=e=>(t,a)=>e.dom.serializeStyle(t,a),Ze=e=>t=>Ae(e).upload([t],!1).then((e=>{var t;return 0===e.length?Promise.reject("Failed to upload image"):!1===e[0].status?Promise.reject(null===(t=e[0].error)||void 0===t?void 0:t.message):e[0]})),qe=e=>{const t={imageSize:Fe(e),addToBlobCache:Ge(e),createBlobCache:He(e),alertErr:We(e),normalizeCss:$e(e),parseStyle:Ve(e),serializeStyle:Ke(e),uploadImage:Ze(e)};return{open:()=>{Ne(e).then((a=>{const i=(e=>({prevImage:xe(e.imageList,e.image.src),prevAlt:e.image.alt,open:!0}))(a);return{title:"Insert/Edit Image",size:"normal",body:Pe(a),buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:Le(a.image),onSubmit:Be(e,a,t),onChange:ke(t,a,i),onClose:ze(i)}})).then(e.windowManager.open)}}},Je=e=>{const t=e.attr("class");return d(t)&&/\bimage\b/.test(t)},Qe=e=>t=>{let a=t.length;const i=t=>{t.attr("contenteditable",e?"true":null)};for(;a--;){const s=t[a];Je(s)&&(s.attr("contenteditable",e?"false":null),De.each(s.getAll("figcaption"),i))}},Xe=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("image",(e=>{(e=>{const t=e.options.register;t("image_dimensions",{processor:"boolean",default:!0}),t("image_advtab",{processor:"boolean",default:!1}),t("image_uploadtab",{processor:"boolean",default:!0}),t("image_prepend_url",{processor:"string",default:""}),t("image_class_list",{processor:"object[]"}),t("image_description",{processor:"boolean",default:!0}),t("image_title",{processor:"boolean",default:!1}),t("image_caption",{processor:"boolean",default:!1}),t("image_list",{processor:e=>{const t=!1===e||r(e)||((e,t)=>{if(l(e)){for(let a=0,i=e.length;a<i;++a)if(!t(e[a]))return!1;return!0}return!1})(e,o)||g(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be false, a string, an array or a function."}},default:!1})})(e),(e=>{e.on("PreInit",(()=>{e.parser.addNodeFilter("figure",Qe(!0)),e.serializer.addNodeFilter("figure",Qe(!1))}))})(e),(e=>{e.ui.registry.addToggleButton("image",{icon:"image",tooltip:"Insert/edit image",onAction:qe(e).open,onSetup:t=>{t.setActive(d(he(e)));const a=e.selection.selectorChangedWithUnbind("img:not([data-mce-object]):not([data-mce-placeholder]),figure.image",t.setActive).unbind,i=Xe(e)(t);return()=>{a(),i()}}}),e.ui.registry.addMenuItem("image",{icon:"image",text:"Image...",onAction:qe(e).open,onSetup:Xe(e)}),e.ui.registry.addContextMenu("image",{update:t=>e.selection.isEditable()&&(re(t)||"IMG"===t.nodeName&&!H(t))?["image"]:[]})})(e),(e=>{e.addCommand("mceImage",qe(e).open),e.addCommand("mceUpdateImage",((t,a)=>{e.undoManager.transact((()=>ye(e,a)))}))})(e)}))}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=Object.getPrototypeOf,a=(e,t,a)=>{var i;return!!a(e,t.prototype)||(null===(i=e.constructor)||void 0===i?void 0:i.name)===t.name},i=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&a(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,s=e=>t=>typeof t===e,r=i("string"),o=i("object"),n=e=>((e,i)=>o(e)&&a(e,i,((e,a)=>t(e)===a)))(e,Object),l=i("array"),c=(null,e=>null===e);const m=s("boolean"),d=e=>!(e=>null==e)(e),g=s("function"),u=s("number"),p=()=>{};class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return d(e)?h.some(e):h.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const b=Object.keys,v=Object.hasOwnProperty,y=(e,t)=>v.call(e,t),f=Array.prototype.push,w=e=>{const t=[];for(let a=0,i=e.length;a<i;++a){if(!l(e[a]))throw new Error("Arr.flatten item "+a+" was not an array, input: "+e);f.apply(t,e[a])}return t};"undefined"!=typeof window?window:Function("return this;")();const A=(e,t,a)=>{((e,t,a)=>{if(!(r(a)||m(a)||u(a)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",a,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,a+"")})(e.dom,t,a)},D=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},_=D;var C=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),I=tinymce.util.Tools.resolve("tinymce.util.URI");const U=e=>e.length>0,x=e=>t=>t.options.get(e),S=x("image_dimensions"),N=x("image_advtab"),T=x("image_uploadtab"),O=x("image_prepend_url"),E=x("image_class_list"),L=x("image_description"),j=x("image_title"),M=x("image_caption"),R=x("image_list"),k=x("a11y_advanced_options"),z=x("automatic_uploads"),B=(e,t)=>Math.max(parseInt(e,10),parseInt(t,10)),P=e=>(e&&(e=e.replace(/px$/,"")),e),F=e=>(e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e),H=e=>"IMG"===e.nodeName&&(e.hasAttribute("data-mce-object")||e.hasAttribute("data-mce-placeholder")),G=(e,t)=>{const a=e.options.get;return I.isDomSafe(t,"img",{allow_html_data_urls:a("allow_html_data_urls"),allow_script_urls:a("allow_script_urls"),allow_svg_data_urls:a("allow_svg_data_urls")})},W=C.DOM,$=e=>e.style.marginLeft&&e.style.marginRight&&e.style.marginLeft===e.style.marginRight?P(e.style.marginLeft):"",V=e=>e.style.marginTop&&e.style.marginBottom&&e.style.marginTop===e.style.marginBottom?P(e.style.marginTop):"",K=e=>e.style.borderWidth?P(e.style.borderWidth):"",Z=(e,t)=>{var a;return e.hasAttribute(t)&&null!==(a=e.getAttribute(t))&&void 0!==a?a:""},q=e=>null!==e.parentNode&&"FIGURE"===e.parentNode.nodeName,J=(e,t,a)=>{""===a||null===a?e.removeAttribute(t):e.setAttribute(t,a)},Q=(e,t)=>{const a=e.getAttribute("style"),i=t(null!==a?a:"");i.length>0?(e.setAttribute("style",i),e.setAttribute("data-mce-style",i)):e.removeAttribute("style")},X=(e,t)=>(e,a,i)=>{const s=e.style;s[a]?(s[a]=F(i),Q(e,t)):J(e,a,i)},Y=(e,t)=>e.style[t]?P(e.style[t]):Z(e,t),ee=(e,t)=>{const a=F(t);e.style.marginLeft=a,e.style.marginRight=a},te=(e,t)=>{const a=F(t);e.style.marginTop=a,e.style.marginBottom=a},ae=(e,t)=>{const a=F(t);e.style.borderWidth=a},ie=(e,t)=>{e.style.borderStyle=t},se=e=>{var t;return null!==(t=e.style.borderStyle)&&void 0!==t?t:""},re=e=>d(e)&&"FIGURE"===e.nodeName,oe=e=>0===W.getAttrib(e,"alt").length&&"presentation"===W.getAttrib(e,"role"),ne=e=>oe(e)?"":Z(e,"alt"),le=(e,t)=>{var a;const i=document.createElement("img");return J(i,"style",t.style),($(i)||""!==t.hspace)&&ee(i,t.hspace),(V(i)||""!==t.vspace)&&te(i,t.vspace),(K(i)||""!==t.border)&&ae(i,t.border),(se(i)||""!==t.borderStyle)&&ie(i,t.borderStyle),e(null!==(a=i.getAttribute("style"))&&void 0!==a?a:"")},ce=(e,t)=>({src:Z(t,"src"),alt:ne(t),title:Z(t,"title"),width:Y(t,"width"),height:Y(t,"height"),class:Z(t,"class"),style:e(Z(t,"style")),caption:q(t),hspace:$(t),vspace:V(t),border:K(t),borderStyle:se(t),isDecorative:oe(t)}),me=(e,t,a,i,s)=>{a[i]!==t[i]&&s(e,i,String(a[i]))},de=(e,t,a)=>{if(a){W.setAttrib(e,"role","presentation");const t=_(e);A(t,"alt","")}else{if(c(t)){"alt",_(e).dom.removeAttribute("alt")}else{const a=_(e);A(a,"alt",t)}"presentation"===W.getAttrib(e,"role")&&W.setAttrib(e,"role","")}},ge=(e,t)=>(a,i,s)=>{e(a,s),Q(a,t)},ue=(e,t,a)=>{const i=ce(e,a);me(a,i,t,"caption",((e,t,a)=>(e=>{q(e)?(e=>{const t=e.parentNode;d(t)&&(W.insertAfter(e,t),W.remove(t))})(e):(e=>{const t=W.create("figure",{class:"image"});W.insertAfter(t,e),t.appendChild(e),t.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),t.contentEditable="false"})(e)})(e))),me(a,i,t,"src",J),me(a,i,t,"title",J),me(a,i,t,"width",X(0,e)),me(a,i,t,"height",X(0,e)),me(a,i,t,"class",J),me(a,i,t,"style",ge(((e,t)=>J(e,"style",t)),e)),me(a,i,t,"hspace",ge(ee,e)),me(a,i,t,"vspace",ge(te,e)),me(a,i,t,"border",ge(ae,e)),me(a,i,t,"borderStyle",ge(ie,e)),((e,t,a)=>{a.alt===t.alt&&a.isDecorative===t.isDecorative||de(e,a.alt,a.isDecorative)})(a,i,t)},pe=(e,t)=>{const a=(e=>{if(e.margin){const t=String(e.margin).split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e})(e.dom.styles.parse(t)),i=e.dom.styles.parse(e.dom.styles.serialize(a));return e.dom.styles.serialize(i)},he=e=>{const t=e.selection.getNode(),a=e.dom.getParent(t,"figure.image");return a?e.dom.select("img",a)[0]:t&&("IMG"!==t.nodeName||H(t))?null:t},be=(e,t)=>{var a;const i=e.dom,s=((t,a)=>{const i={};var s;return((e,t,a,i)=>{((e,t)=>{const a=b(e);for(let i=0,s=a.length;i<s;i++){const s=a[i];t(e[s],s)}})(e,((e,s)=>{(t(e,s)?a:i)(e,s)}))})(t,((t,a)=>!e.schema.isValidChild(a,"figure")),(s=i,(e,t)=>{s[t]=e}),p),i})(e.schema.getTextBlockElements()),r=i.getParent(t.parentNode,(e=>{return t=s,a=e.nodeName,y(t,a)&&void 0!==t[a]&&null!==t[a];var t,a}),e.getBody());return r&&null!==(a=i.split(r,t))&&void 0!==a?a:t},ve=(e,t)=>{const a=((t,a)=>{const i=document.createElement("img");if(ue((t=>pe(e,t)),{...a,caption:!1},i),de(i,a.alt,a.isDecorative),a.caption){const e=W.create("figure",{class:"image"});return e.appendChild(i),e.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),e.contentEditable="false",e}return i})(0,t);e.dom.setAttrib(a,"data-mce-id","__mcenew"),e.focus(),e.selection.setContent(a.outerHTML);const i=e.dom.select('*[data-mce-id="__mcenew"]')[0];if(e.dom.setAttrib(i,"data-mce-id",null),re(i)){const t=be(e,i);e.selection.select(t)}else e.selection.select(i)},ye=(e,t)=>{const a=he(e);if(a){const i={...ce((t=>pe(e,t)),a),...t},s=((e,t)=>{const a=t.src;return{...t,src:G(e,a)?a:""}})(e,i);i.src?((e,t)=>{const a=he(e);if(a)if(ue((t=>pe(e,t)),t,a),((e,t)=>{e.dom.setAttrib(t,"src",t.getAttribute("src"))})(e,a),re(a.parentNode)){const t=a.parentNode;be(e,t),e.selection.select(a.parentNode)}else e.selection.select(a),((e,t,a)=>{const i=()=>{a.onload=a.onerror=null,e.selection&&(e.selection.select(a),e.nodeChanged())};a.onload=()=>{t.width||t.height||!S(e)||e.dom.setAttribs(a,{width:String(a.clientWidth),height:String(a.clientHeight)}),i()},a.onerror=i})(e,t,a)})(e,s):((e,t)=>{if(t){const a=e.dom.is(t.parentNode,"figure.image")?t.parentNode:t;e.dom.remove(a),e.focus(),e.nodeChanged(),e.dom.isEmpty(e.getBody())&&(e.setContent(""),e.selection.setCursorLocation())}})(e,a)}else t.src&&ve(e,{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1,...t})},fe=(we=(e,t)=>n(e)&&n(t)?fe(e,t):t,(...e)=>{if(0===e.length)throw new Error("Can't merge zero objects");const t={};for(let a=0;a<e.length;a++){const i=e[a];for(const e in i)y(i,e)&&(t[e]=we(t[e],i[e]))}return t});var we,Ae=tinymce.util.Tools.resolve("tinymce.util.ImageUploader"),De=tinymce.util.Tools.resolve("tinymce.util.Tools");const _e=e=>r(e.value)?e.value:"",Ce=(e,t)=>{const a=[];return De.each(e,(e=>{const i=(e=>r(e.text)?e.text:r(e.title)?e.title:"")(e);if(void 0!==e.menu){const s=Ce(e.menu,t);a.push({text:i,items:s})}else{const s=t(e);a.push({text:i,value:s})}})),a},Ie=(e=_e)=>t=>t?h.from(t).map((t=>Ce(t,e))):h.none(),Ue=(e,t)=>((e,a)=>{for(let a=0;a<e.length;a++){const s=(e=>y(e,"items"))(i=e[a])?Ue(i.items,t):i.value===t?h.some(i):h.none();if(s.isSome())return s}var i;return h.none()})(e),xe=Ie,Se=(e,t)=>e.bind((e=>Ue(e,t))),Ne=e=>{const t=xe((t=>e.convertURL(t.value||t.url||"","src"))),a=new Promise((a=>{((e,t)=>{const a=R(e);r(a)?fetch(a).then((e=>{e.ok&&e.json().then(t)})):g(a)?a(t):t(a)})(e,(e=>{a(t(e).map((e=>w([[{text:"None",value:""}],e]))))}))})),i=(A=E(e),Ie(_e)(A)),s=N(e),o=T(e),n=(e=>U(e.options.get("images_upload_url")))(e),l=(e=>d(e.options.get("images_upload_handler")))(e),c=(e=>{const t=he(e);return t?ce((t=>pe(e,t)),t):{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1}})(e),m=L(e),u=j(e),p=S(e),b=M(e),v=k(e),y=z(e),f=h.some(O(e)).filter((e=>r(e)&&e.length>0));var A;return a.then((e=>({image:c,imageList:e,classList:i,hasAdvTab:s,hasUploadTab:o,hasUploadUrl:n,hasUploadHandler:l,hasDescription:m,hasImageTitle:u,hasDimensions:p,hasImageCaption:b,prependURL:f,hasAccessibilityOptions:v,automaticUploads:y})))},Te=e=>{const t=e.imageList.map((e=>({name:"images",type:"listbox",label:"Image list",items:e}))),a={name:"alt",type:"input",label:"Alternative description",enabled:!(e.hasAccessibilityOptions&&e.image.isDecorative)},i=e.classList.map((e=>({name:"classes",type:"listbox",label:"Class",items:e})));return w([[{name:"src",type:"urlinput",filetype:"image",label:"Source",picker_text:"Browse files"}],t.toArray(),e.hasAccessibilityOptions&&e.hasDescription?[{type:"label",label:"Accessibility",items:[{name:"isDecorative",type:"checkbox",label:"Image is decorative"}]}]:[],e.hasDescription?[a]:[],e.hasImageTitle?[{name:"title",type:"input",label:"Image title"}]:[],e.hasDimensions?[{name:"dimensions",type:"sizeinput"}]:[],[{...(s=e.classList.isSome()&&e.hasImageCaption,s?{type:"grid",columns:2}:{type:"panel"}),items:w([i.toArray(),e.hasImageCaption?[{type:"label",label:"Caption",items:[{type:"checkbox",name:"caption",label:"Show caption"}]}]:[]])}]]);var s},Oe=e=>({title:"General",name:"general",items:Te(e)}),Ee=Te,Le=e=>({src:{value:e.src,meta:{}},images:e.src,alt:e.alt,title:e.title,dimensions:{width:e.width,height:e.height},classes:e.class,caption:e.caption,style:e.style,vspace:e.vspace,border:e.border,hspace:e.hspace,borderstyle:e.borderStyle,fileinput:[],isDecorative:e.isDecorative}),je=(e,t)=>({src:e.src.value,alt:null!==e.alt&&0!==e.alt.length||!t?e.alt:null,title:e.title,width:e.dimensions.width,height:e.dimensions.height,class:e.classes,style:e.style,caption:e.caption,hspace:e.hspace,vspace:e.vspace,border:e.border,borderStyle:e.borderstyle,isDecorative:e.isDecorative}),Me=(e,t,a,i)=>{((e,t)=>{const a=t.getData();((e,t)=>/^(?:[a-zA-Z]+:)?\/\//.test(t)?h.none():e.prependURL.bind((e=>t.substring(0,e.length)!==e?h.some(e+t):h.none())))(e,a.src.value).each((e=>{t.setData({src:{value:e,meta:a.src.meta}})}))})(t,i),((e,t)=>{const a=t.getData(),i=a.src.meta;if(void 0!==i){const s=fe({},a);((e,t,a)=>{e.hasDescription&&r(a.alt)&&(t.alt=a.alt),e.hasAccessibilityOptions&&(t.isDecorative=a.isDecorative||t.isDecorative||!1),e.hasImageTitle&&r(a.title)&&(t.title=a.title),e.hasDimensions&&(r(a.width)&&(t.dimensions.width=a.width),r(a.height)&&(t.dimensions.height=a.height)),r(a.class)&&Se(e.classList,a.class).each((e=>{t.classes=e.value})),e.hasImageCaption&&m(a.caption)&&(t.caption=a.caption),e.hasAdvTab&&(r(a.style)&&(t.style=a.style),r(a.vspace)&&(t.vspace=a.vspace),r(a.border)&&(t.border=a.border),r(a.hspace)&&(t.hspace=a.hspace),r(a.borderstyle)&&(t.borderstyle=a.borderstyle))})(e,s,i),t.setData(s)}})(t,i),((e,t,a,i)=>{const s=i.getData(),r=s.src.value,o=s.src.meta||{};o.width||o.height||!t.hasDimensions||(U(r)?e.imageSize(r).then((e=>{a.open&&i.setData({dimensions:e})})).catch((e=>console.error(e))):i.setData({dimensions:{width:"",height:""}}))})(e,t,a,i),((e,t,a)=>{const i=a.getData(),s=Se(e.imageList,i.src.value);t.prevImage=s,a.setData({images:s.map((e=>e.value)).getOr("")})})(t,a,i)},Re=(e,t,a,i)=>{const s=i.getData();var r;i.block("Uploading image"),(r=s.fileinput,((e,t)=>0<e.length?h.some(e[0]):h.none())(r)).fold((()=>{i.unblock()}),(s=>{const r=URL.createObjectURL(s),o=()=>{i.unblock(),URL.revokeObjectURL(r)},n=s=>{i.setData({src:{value:s,meta:{}}}),i.showTab("general"),Me(e,t,a,i)};var l;(l=s,new Promise(((e,t)=>{const a=new FileReader;a.onload=()=>{e(a.result)},a.onerror=()=>{var e;t(null===(e=a.error)||void 0===e?void 0:e.message)},a.readAsDataURL(l)}))).then((a=>{const l=e.createBlobCache(s,r,a);t.automaticUploads?e.uploadImage(l).then((e=>{n(e.url),o()})).catch((t=>{o(),e.alertErr(t)})):(e.addToBlobCache(l),n(l.blobUri()),i.unblock())}))}))},ke=(e,t,a)=>(i,s)=>{"src"===s.name?Me(e,t,a,i):"images"===s.name?((e,t,a,i)=>{const s=i.getData(),r=Se(t.imageList,s.images);r.each((e=>{const t=""===s.alt||a.prevImage.map((e=>e.text===s.alt)).getOr(!1);t?""===e.value?i.setData({src:e,alt:a.prevAlt}):i.setData({src:e,alt:e.text}):i.setData({src:e})})),a.prevImage=r,Me(e,t,a,i)})(e,t,a,i):"alt"===s.name?a.prevAlt=i.getData().alt:"fileinput"===s.name?Re(e,t,a,i):"isDecorative"===s.name&&i.setEnabled("alt",!i.getData().isDecorative)},ze=e=>()=>{e.open=!1},Be=e=>e.hasAdvTab||e.hasUploadUrl||e.hasUploadHandler?{type:"tabpanel",tabs:w([[Oe(e)],e.hasAdvTab?[{title:"Advanced",name:"advanced",items:[{type:"grid",columns:2,items:[{type:"input",label:"Vertical space",name:"vspace",inputMode:"numeric"},{type:"input",label:"Horizontal space",name:"hspace",inputMode:"numeric"},{type:"input",label:"Border width",name:"border",inputMode:"numeric"},{type:"listbox",name:"borderstyle",label:"Border style",items:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]}]}]}]:[],e.hasUploadTab&&(e.hasUploadUrl||e.hasUploadHandler)?[{title:"Upload",name:"upload",items:[{type:"dropzone",name:"fileinput"}]}]:[]])}:{type:"panel",items:Ee(e)},Pe=(e,t,a)=>i=>{const s=fe(Le(t.image),i.getData()),r={...s,style:le(a.normalizeCss,je(s,!1))};e.execCommand("mceUpdateImage",!1,je(r,t.hasAccessibilityOptions)),e.editorUpload.uploadImagesAuto(),i.close()},Fe=e=>t=>G(e,t)?(e=>new Promise((t=>{const a=document.createElement("img"),i=e=>{a.onload=a.onerror=null,a.parentNode&&a.parentNode.removeChild(a),t(e)};a.onload=()=>{const e={width:B(a.width,a.clientWidth),height:B(a.height,a.clientHeight)};i(Promise.resolve(e))},a.onerror=()=>{i(Promise.reject(`Failed to get image dimensions for: ${e}`))};const s=a.style;s.visibility="hidden",s.position="fixed",s.bottom=s.left="0px",s.width=s.height="auto",document.body.appendChild(a),a.src=e})))(e.documentBaseURI.toAbsolute(t)).then((e=>({width:String(e.width),height:String(e.height)}))):Promise.resolve({width:"",height:""}),He=e=>(t,a,i)=>{var s;return e.editorUpload.blobCache.create({blob:t,blobUri:a,name:null===(s=t.name)||void 0===s?void 0:s.replace(/\.[^\.]+$/,""),filename:t.name,base64:i.split(",")[1]})},Ge=e=>t=>{e.editorUpload.blobCache.add(t)},We=e=>t=>{e.windowManager.alert(t)},$e=e=>t=>pe(e,t),Ve=e=>t=>e.dom.parseStyle(t),Ke=e=>(t,a)=>e.dom.serializeStyle(t,a),Ze=e=>t=>Ae(e).upload([t],!1).then((e=>{var t;return 0===e.length?Promise.reject("Failed to upload image"):!1===e[0].status?Promise.reject(null===(t=e[0].error)||void 0===t?void 0:t.message):e[0]})),qe=e=>{const t={imageSize:Fe(e),addToBlobCache:Ge(e),createBlobCache:He(e),alertErr:We(e),normalizeCss:$e(e),parseStyle:Ve(e),serializeStyle:Ke(e),uploadImage:Ze(e)};return{open:()=>{Ne(e).then((a=>{const i=(e=>({prevImage:Se(e.imageList,e.image.src),prevAlt:e.image.alt,open:!0}))(a);return{title:"Insert/Edit Image",size:"normal",body:Be(a),buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:Le(a.image),onSubmit:Pe(e,a,t),onChange:ke(t,a,i),onClose:ze(i)}})).then(e.windowManager.open)}}},Je=e=>{const t=e.attr("class");return d(t)&&/\bimage\b/.test(t)},Qe=e=>t=>{let a=t.length;const i=t=>{t.attr("contenteditable",e?"true":null)};for(;a--;){const s=t[a];Je(s)&&(s.attr("contenteditable",e?"false":null),De.each(s.getAll("figcaption"),i))}},Xe=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("image",(e=>{(e=>{const t=e.options.register;t("image_dimensions",{processor:"boolean",default:!0}),t("image_advtab",{processor:"boolean",default:!1}),t("image_uploadtab",{processor:"boolean",default:!0}),t("image_prepend_url",{processor:"string",default:""}),t("image_class_list",{processor:"object[]"}),t("image_description",{processor:"boolean",default:!0}),t("image_title",{processor:"boolean",default:!1}),t("image_caption",{processor:"boolean",default:!1}),t("image_list",{processor:e=>{const t=!1===e||r(e)||((e,t)=>{if(l(e)){for(let a=0,i=e.length;a<i;++a)if(!t(e[a]))return!1;return!0}return!1})(e,o)||g(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be false, a string, an array or a function."}},default:!1})})(e),(e=>{e.on("PreInit",(()=>{e.parser.addNodeFilter("figure",Qe(!0)),e.serializer.addNodeFilter("figure",Qe(!1))}))})(e),(e=>{e.ui.registry.addToggleButton("image",{icon:"image",tooltip:"Insert/edit image",onAction:qe(e).open,onSetup:t=>{t.setActive(d(he(e)));const a=e.selection.selectorChangedWithUnbind("img:not([data-mce-object]):not([data-mce-placeholder]),figure.image",t.setActive).unbind,i=Xe(e)(t);return()=>{a(),i()}}}),e.ui.registry.addMenuItem("image",{icon:"image",text:"Image...",onAction:qe(e).open,onSetup:Xe(e)}),e.ui.registry.addContextMenu("image",{update:t=>e.selection.isEditable()&&(re(t)||"IMG"===t.nodeName&&!H(t))?["image"]:[]})})(e),(e=>{e.addCommand("mceImage",qe(e).open),e.addCommand("mceUpdateImage",((t,a)=>{e.undoManager.transact((()=>ye(e,a)))}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/importcss/plugin.min.js b/public/libs/tinymce/plugins/importcss/plugin.min.js
index 9afd216c861..4b8006a4170 100644
--- a/public/libs/tinymce/plugins/importcss/plugin.min.js
+++ b/public/libs/tinymce/plugins/importcss/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(s=r=e,(o=String).prototype.isPrototypeOf(s)||(null===(n=r.constructor)||void 0===n?void 0:n.name)===o.name)?"string":t;var s,r,o,n})(t)===e,s=t("string"),r=t("object"),o=t("array"),n=("function",e=>"function"==typeof e);var c=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),i=tinymce.util.Tools.resolve("tinymce.EditorManager"),l=tinymce.util.Tools.resolve("tinymce.Env"),a=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=e=>t=>t.options.get(e),u=p("importcss_merge_classes"),m=p("importcss_exclusive"),f=p("importcss_selector_converter"),y=p("importcss_selector_filter"),d=p("importcss_groups"),h=p("importcss_append"),_=p("importcss_file_filter"),g=p("skin"),v=p("skin_url"),b=Array.prototype.push,x=/^\.(?:ephox|tiny-pageembed|mce)(?:[.-]+\w+)+$/,T=e=>s(e)?t=>-1!==t.indexOf(e):e instanceof RegExp?t=>e.test(t):e,S=(e,t)=>{let s={};const r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(!r)return;const o=r[1],n=r[2].substr(1).split(".").join(" "),c=a.makeMap("a,img");return r[1]?(s={title:t},e.schema.getTextBlockElements()[o]?s.block=o:e.schema.getBlockElements()[o]||c[o.toLowerCase()]?s.selector=o:s.inline=o):r[2]&&(s={inline:"span",title:t.substr(1),classes:n}),u(e)?s.classes=n:s.attributes={class:n},s},k=(e,t)=>null===t||m(e),w=e=>{e.on("init",(()=>{const t=(()=>{const e=[],t=[],s={};return{addItemToGroup:(e,r)=>{s[e]?s[e].push(r):(t.push(e),s[e]=[r])},addItem:t=>{e.push(t)},toFormats:()=>{return(r=t,n=e=>{const t=s[e];return 0===t.length?[]:[{title:e,items:t}]},(e=>{const t=[];for(let s=0,r=e.length;s<r;++s){if(!o(e[s]))throw new Error("Arr.flatten item "+s+" was not an array, input: "+e);b.apply(t,e[s])}return t})(((e,t)=>{const s=e.length,r=new Array(s);for(let o=0;o<s;o++){const s=e[o];r[o]=t(s,o)}return r})(r,n))).concat(e);var r,n}}})(),r={},n=T(y(e)),p=(e=>a.map(e,(e=>a.extend({},e,{original:e,selectors:{},filter:T(e.filter)}))))(d(e)),u=(t,s)=>{if(((e,t,s,r)=>!(k(e,s)?t in r:t in s.selectors))(e,t,s,r)){((e,t,s,r)=>{k(e,s)?r[t]=!0:s.selectors[t]=!0})(e,t,s,r);const o=((e,t,s,r)=>{let o;const n=f(e);return o=r&&r.selector_converter?r.selector_converter:n||(()=>S(e,s)),o.call(t,s,r)})(e,e.plugins.importcss,t,s);if(o){const t=o.name||c.DOM.uniqueId();return e.formatter.register(t,o),{title:o.title,format:t}}}return null};a.each(((e,t,r)=>{const o=[],n={},c=(t,n)=>{let p,u=t.href;if(u=(e=>{const t=l.cacheSuffix;return s(e)&&(e=e.replace("?"+t,"").replace("&"+t,"")),e})(u),u&&(!r||r(u,n))&&!((e,t)=>{const s=g(e);if(s){const r=v(e),o=r?e.documentBaseURI.toAbsolute(r):i.baseURL+"/skins/ui/"+s,n=i.baseURL+"/skins/content/";return t===o+"/content"+(e.inline?".inline":"")+".min.css"||-1!==t.indexOf(n)}return!1})(e,u)){a.each(t.imports,(e=>{c(e,!0)}));try{p=t.cssRules||t.rules}catch(e){}a.each(p,(e=>{e.styleSheet?c(e.styleSheet,!0):e.selectorText&&a.each(e.selectorText.split(","),(e=>{o.push(a.trim(e))}))}))}};a.each(e.contentCSS,(e=>{n[e]=!0})),r||(r=(e,t)=>t||n[e]);try{a.each(t.styleSheets,(e=>{c(e)}))}catch(e){}return o})(e,e.getDoc(),T(_(e))),(e=>{if(!x.test(e)&&(!n||n(e))){const s=((e,t)=>a.grep(e,(e=>!e.filter||e.filter(t))))(p,e);if(s.length>0)a.each(s,(s=>{const r=u(e,s);r&&t.addItemToGroup(s.title,r)}));else{const s=u(e,null);s&&t.addItem(s)}}}));const m=t.toFormats();e.dispatch("addStyleModifications",{items:m,replace:!h(e)})}))};e.add("importcss",(e=>((e=>{const t=e.options.register,o=e=>s(e)||n(e)||r(e);t("importcss_merge_classes",{processor:"boolean",default:!0}),t("importcss_exclusive",{processor:"boolean",default:!0}),t("importcss_selector_converter",{processor:"function"}),t("importcss_selector_filter",{processor:o}),t("importcss_file_filter",{processor:o}),t("importcss_groups",{processor:"object[]"}),t("importcss_append",{processor:"boolean",default:!1})})(e),w(e),(e=>({convertSelectorToFormat:t=>S(e,t)}))(e))))}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(s=r=e,(o=String).prototype.isPrototypeOf(s)||(null===(n=r.constructor)||void 0===n?void 0:n.name)===o.name)?"string":t;var s,r,o,n})(t)===e,s=t("string"),r=t("object"),o=t("array"),n=("function",e=>"function"==typeof e);var c=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),i=tinymce.util.Tools.resolve("tinymce.EditorManager"),l=tinymce.util.Tools.resolve("tinymce.Env"),a=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=e=>t=>t.options.get(e),u=p("importcss_merge_classes"),m=p("importcss_exclusive"),f=p("importcss_selector_converter"),y=p("importcss_selector_filter"),d=p("importcss_groups"),h=p("importcss_append"),_=p("importcss_file_filter"),g=p("skin"),v=p("skin_url"),b=Array.prototype.push,x=/^\.(?:ephox|tiny-pageembed|mce)(?:[.-]+\w+)+$/,T=e=>s(e)?t=>-1!==t.indexOf(e):e instanceof RegExp?t=>e.test(t):e,S=(e,t)=>{let s={};const r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(!r)return;const o=r[1],n=r[2].substr(1).split(".").join(" "),c=a.makeMap("a,img");return r[1]?(s={title:t},e.schema.getTextBlockElements()[o]?s.block=o:e.schema.getBlockElements()[o]||c[o.toLowerCase()]?s.selector=o:s.inline=o):r[2]&&(s={inline:"span",title:t.substr(1),classes:n}),u(e)?s.classes=n:s.attributes={class:n},s},k=(e,t)=>null===t||m(e),w=e=>{e.on("init",(()=>{const t=(()=>{const e=[],t=[],s={};return{addItemToGroup:(e,r)=>{s[e]?s[e].push(r):(t.push(e),s[e]=[r])},addItem:t=>{e.push(t)},toFormats:()=>{return(r=t,n=e=>{const t=s[e];return 0===t.length?[]:[{title:e,items:t}]},(e=>{const t=[];for(let s=0,r=e.length;s<r;++s){if(!o(e[s]))throw new Error("Arr.flatten item "+s+" was not an array, input: "+e);b.apply(t,e[s])}return t})(((e,t)=>{const s=e.length,r=new Array(s);for(let o=0;o<s;o++){const s=e[o];r[o]=t(s,o)}return r})(r,n))).concat(e);var r,n}}})(),r={},n=T(y(e)),p=(e=>a.map(e,(e=>a.extend({},e,{original:e,selectors:{},filter:T(e.filter)}))))(d(e)),u=(t,s)=>{if(((e,t,s,r)=>!(k(e,s)?t in r:t in s.selectors))(e,t,s,r)){((e,t,s,r)=>{k(e,s)?r[t]=!0:s.selectors[t]=!0})(e,t,s,r);const o=((e,t,s,r)=>{let o;const n=f(e);return o=r&&r.selector_converter?r.selector_converter:n||(()=>S(e,s)),o.call(t,s,r)})(e,e.plugins.importcss,t,s);if(o){const t=o.name||c.DOM.uniqueId();return e.formatter.register(t,o),{title:o.title,format:t}}}return null};a.each(((e,t,r)=>{const o=[],n={},c=(t,n)=>{let p,u=t.href;if(u=(e=>{const t=l.cacheSuffix;return s(e)&&(e=e.replace("?"+t,"").replace("&"+t,"")),e})(u),u&&(!r||r(u,n))&&!((e,t)=>{const s=g(e);if(s){const r=v(e),o=r?e.documentBaseURI.toAbsolute(r):i.baseURL+"/skins/ui/"+s,n=i.baseURL+"/skins/content/";return t===o+"/content"+(e.inline?".inline":"")+".min.css"||-1!==t.indexOf(n)}return!1})(e,u)){a.each(t.imports,(e=>{c(e,!0)}));try{p=t.cssRules||t.rules}catch(e){}a.each(p,(e=>{e.styleSheet&&e.styleSheet?c(e.styleSheet,!0):e.selectorText&&a.each(e.selectorText.split(","),(e=>{o.push(a.trim(e))}))}))}};a.each(e.contentCSS,(e=>{n[e]=!0})),r||(r=(e,t)=>t||n[e]);try{a.each(t.styleSheets,(e=>{c(e)}))}catch(e){}return o})(e,e.getDoc(),T(_(e))),(e=>{if(!x.test(e)&&(!n||n(e))){const s=((e,t)=>a.grep(e,(e=>!e.filter||e.filter(t))))(p,e);if(s.length>0)a.each(s,(s=>{const r=u(e,s);r&&t.addItemToGroup(s.title,r)}));else{const s=u(e,null);s&&t.addItem(s)}}}));const m=t.toFormats();e.dispatch("addStyleModifications",{items:m,replace:!h(e)})}))};e.add("importcss",(e=>((e=>{const t=e.options.register,o=e=>s(e)||n(e)||r(e);t("importcss_merge_classes",{processor:"boolean",default:!0}),t("importcss_exclusive",{processor:"boolean",default:!0}),t("importcss_selector_converter",{processor:"function"}),t("importcss_selector_filter",{processor:o}),t("importcss_file_filter",{processor:o}),t("importcss_groups",{processor:"object[]"}),t("importcss_append",{processor:"boolean",default:!1})})(e),w(e),(e=>({convertSelectorToFormat:t=>S(e,t)}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/insertdatetime/plugin.min.js b/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
index e0c4d38c60f..19294c925ce 100644
--- a/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
+++ b/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>t.options.get(e),a=t("insertdatetime_dateformat"),n=t("insertdatetime_timeformat"),r=t("insertdatetime_formats"),s=t("insertdatetime_element"),i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),o="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),l="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),m="January February March April May June July August September October November December".split(" "),c=(e,t)=>{if((e=""+e).length<t)for(let a=0;a<t-e.length;a++)e="0"+e;return e},d=(e,t,a=new Date)=>(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=t.replace("%D","%m/%d/%Y")).replace("%r","%I:%M:%S %p")).replace("%Y",""+a.getFullYear())).replace("%y",""+a.getYear())).replace("%m",c(a.getMonth()+1,2))).replace("%d",c(a.getDate(),2))).replace("%H",""+c(a.getHours(),2))).replace("%M",""+c(a.getMinutes(),2))).replace("%S",""+c(a.getSeconds(),2))).replace("%I",""+((a.getHours()+11)%12+1))).replace("%p",a.getHours()<12?"AM":"PM")).replace("%B",""+e.translate(m[a.getMonth()]))).replace("%b",""+e.translate(l[a.getMonth()]))).replace("%A",""+e.translate(o[a.getDay()]))).replace("%a",""+e.translate(i[a.getDay()]))).replace("%%","%"),u=(e,t)=>{if(s(e)){const a=d(e,t);let n;n=/%[HMSIp]/.test(t)?d(e,"%Y-%m-%dT%H:%M"):d(e,"%Y-%m-%d");const r=e.dom.getParent(e.selection.getStart(),"time");r?((e,t,a,n)=>{const r=e.dom.create("time",{datetime:a},n);e.dom.replace(r,t),e.selection.select(r,!0),e.selection.collapse(!1)})(e,r,n,a):e.insertContent('<time datetime="'+n+'">'+a+"</time>")}else e.insertContent(d(e,t))};var p=tinymce.util.Tools.resolve("tinymce.util.Tools");const g=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("insertdatetime",(e=>{(e=>{const t=e.options.register;t("insertdatetime_dateformat",{processor:"string",default:e.translate("%Y-%m-%d")}),t("insertdatetime_timeformat",{processor:"string",default:e.translate("%H:%M:%S")}),t("insertdatetime_formats",{processor:"string[]",default:["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"]}),t("insertdatetime_element",{processor:"boolean",default:!1})})(e),(e=>{e.addCommand("mceInsertDate",((t,n)=>{u(e,null!=n?n:a(e))})),e.addCommand("mceInsertTime",((t,a)=>{u(e,null!=a?a:n(e))}))})(e),(e=>{const t=r(e),a=(e=>{let t=e;return{get:()=>t,set:e=>{t=e}}})((e=>{const t=r(e);return t.length>0?t[0]:n(e)})(e)),s=t=>e.execCommand("mceInsertDate",!1,t);e.ui.registry.addSplitButton("insertdatetime",{icon:"insert-time",tooltip:"Insert date/time",select:e=>e===a.get(),fetch:a=>{a(p.map(t,(t=>({type:"choiceitem",text:d(e,t),value:t}))))},onAction:e=>{s(a.get())},onItemAction:(e,t)=>{a.set(t),s(t)},onSetup:g(e)});const i=e=>()=>{a.set(e),s(e)};e.ui.registry.addNestedMenuItem("insertdatetime",{icon:"insert-time",text:"Date/time",getSubmenuItems:()=>p.map(t,(t=>({type:"menuitem",text:d(e,t),onAction:i(t)}))),onSetup:g(e)})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/link/plugin.min.js b/public/libs/tinymce/plugins/link/plugin.min.js
index fa1f87339f9..51deeec63fc 100644
--- a/public/libs/tinymce/plugins/link/plugin.min.js
+++ b/public/libs/tinymce/plugins/link/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(l=o.constructor)||void 0===l?void 0:l.name)===r.name)?"string":t;var n,o,r,l})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),l=t("array"),a=(null,e=>null===e);const i=n("boolean"),s=e=>!(e=>null==e)(e),c=n("function"),u=(e,t)=>{if(l(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},g=()=>{},d=(e,t)=>e===t;class m{constructor(e,t){this.tag=e,this.value=t}static some(e){return new m(!0,e)}static none(){return m.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?m.some(e(this.value)):m.none()}bind(e){return this.tag?e(this.value):m.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:m.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?m.some(e):m.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}m.singletonNone=new m(!1);const h=Array.prototype.indexOf,f=Array.prototype.push,p=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!l(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);f.apply(t,e[n])}return t},k=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return m.none()},v=(e,t,n=d)=>e.exists((e=>n(e,t))),y=e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t},x=(e,t)=>e?m.some(t):m.none(),b=e=>t=>t.options.get(e),_=b("link_assume_external_targets"),w=b("link_context_toolbar"),C=b("link_list"),O=b("link_default_target"),N=b("link_default_protocol"),A=b("link_target_list"),S=b("link_rel_list"),E=b("link_class_list"),T=b("link_title"),R=b("allow_unsafe_link_target"),P=b("link_quicklink");var L=tinymce.util.Tools.resolve("tinymce.util.Tools");const M=e=>o(e.value)?e.value:"",D=(e,t)=>{const n=[];return L.each(e,(e=>{const r=(e=>o(e.text)?e.text:o(e.title)?e.title:"")(e);if(void 0!==e.menu){const o=D(e.menu,t);n.push({text:r,items:o})}else{const o=t(e);n.push({text:r,value:o})}})),n},B=(e=M)=>t=>m.from(t).map((t=>D(t,e))),I=e=>B(M)(e),j=B,K=(e,t)=>n=>({name:e,type:"listbox",label:t,items:n}),U=M,q=Object.keys,F=Object.hasOwnProperty,V=(e,t)=>F.call(e,t);var $=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),z=tinymce.util.Tools.resolve("tinymce.util.URI");const G=e=>s(e)&&"a"===e.nodeName.toLowerCase(),H=e=>G(e)&&!!Q(e),J=(e,t)=>{if(e.collapsed)return[];{const n=e.cloneContents(),o=n.firstChild,r=new $(o,n),l=[];let a=o;do{t(a)&&l.push(a)}while(a=r.next());return l}},W=e=>/^\w+:/i.test(e),Q=e=>{var t,n;return null!==(n=null!==(t=e.getAttribute("data-mce-href"))&&void 0!==t?t:e.getAttribute("href"))&&void 0!==n?n:""},X=(e,t)=>{const n=["noopener"],o=e?e.split(/\s+/):[],r=e=>e.filter((e=>-1===L.inArray(n,e))),l=t?(e=>(e=r(e)).length>0?e.concat(n):n)(o):r(o);return l.length>0?(e=>L.trim(e.sort().join(" ")))(l):""},Y=(e,t)=>(t=t||te(e.selection.getRng())[0]||e.selection.getNode(),le(t)?m.from(e.dom.select("a[href]",t)[0]):m.from(e.dom.getParent(t,"a[href]"))),Z=(e,t)=>Y(e,t).isSome(),ee=(e,t)=>t.fold((()=>e.getContent({format:"text"})),(e=>e.innerText||e.textContent||"")).replace(/\uFEFF/g,""),te=e=>J(e,H),ne=e=>L.grep(e,H),oe=e=>ne(e).length>0,re=e=>{const t=e.schema.getTextInlineElements();if(Y(e).exists((e=>e.hasAttribute("data-mce-block"))))return!1;const n=e.selection.getRng();return!!n.collapsed||0===J(n,(e=>1===e.nodeType&&!G(e)&&!V(t,e.nodeName.toLowerCase()))).length},le=e=>s(e)&&"FIGURE"===e.nodeName&&/\bimage\b/i.test(e.className),ae=(e,t,n)=>{const o=e.selection.getNode(),r=Y(e,o),l=((e,t)=>{const n={...t};if(0===S(e).length&&!R(e)){const e=X(n.rel,"_blank"===n.target);n.rel=e||null}return m.from(n.target).isNone()&&!1===A(e)&&(n.target=O(e)),n.href=((e,t)=>"http"!==t&&"https"!==t||W(e)?e:t+"://"+e)(n.href,_(e)),n})(e,(e=>{return t=["title","rel","class","target"],n=(t,n)=>(e[n].each((e=>{t[n]=e.length>0?e:null})),t),o={href:e.href},((e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)})(t,((e,t)=>{o=n(o,e)})),o;var t,n,o})(n));e.undoManager.transact((()=>{n.href===t.href&&t.attach(),r.fold((()=>{((e,t,n,o)=>{const r=e.dom;le(t)?ge(r,t,o):n.fold((()=>{e.execCommand("mceInsertLink",!1,o)}),(t=>{e.insertContent(r.createHTML("a",o,r.encode(t)))}))})(e,o,n.text,l)}),(t=>{e.focus(),((e,t,n,o)=>{n.each((e=>{V(t,"innerText")?t.innerText=e:t.textContent=e})),e.dom.setAttribs(t,o),e.selection.select(t)})(e,t,n.text,l)}))}))},ie=e=>{const{class:t,href:n,rel:o,target:r,text:l,title:i}=e;return((e,t)=>{const n={};var o;return((e,t,n,o)=>{((e,t)=>{const n=q(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}})(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,((e,t)=>!1===a(e)),(o=n,(e,t)=>{o[t]=e}),g),n})({class:t.getOrNull(),href:n,rel:o.getOrNull(),target:r.getOrNull(),text:l.getOrNull(),title:i.getOrNull()})},se=(e,t,n)=>{const o=((e,t)=>{const n=e.options.get,o={allow_html_data_urls:n("allow_html_data_urls"),allow_script_urls:n("allow_script_urls"),allow_svg_data_urls:n("allow_svg_data_urls")},r=t.href;return{...t,href:z.isDomSafe(r,"a",o)?r:""}})(e,n);e.hasPlugin("rtc",!0)?e.execCommand("createlink",!1,ie(o)):ae(e,t,o)},ce=e=>{e.hasPlugin("rtc",!0)?e.execCommand("unlink"):(e=>{e.undoManager.transact((()=>{const t=e.selection.getNode();le(t)?ue(e,t):(e=>{const t=e.dom,n=e.selection,o=n.getBookmark(),r=n.getRng().cloneRange(),l=t.getParent(r.startContainer,"a[href]",e.getBody()),a=t.getParent(r.endContainer,"a[href]",e.getBody());l&&r.setStartBefore(l),a&&r.setEndAfter(a),n.setRng(r),e.execCommand("unlink"),n.moveToBookmark(o)})(e),e.focus()}))})(e)},ue=(e,t)=>{var n;const o=e.dom.select("img",t)[0];if(o){const r=e.dom.getParents(o,"a[href]",t)[0];r&&(null===(n=r.parentNode)||void 0===n||n.insertBefore(o,r),e.dom.remove(r))}},ge=(e,t,n)=>{var o;const r=e.select("img",t)[0];if(r){const t=e.create("a",n);null===(o=r.parentNode)||void 0===o||o.insertBefore(t,r),t.appendChild(r)}},de=(e,t)=>k(t,(t=>(e=>{return V(t=e,n="items")&&void 0!==t[n]&&null!==t[n];var t,n})(t)?de(e,t.items):x(t.value===e,t))),me=(e,t)=>{const n={text:e.text,title:e.title},o=(e,o)=>{const r=(l=t,a=o,"link"===a?l.link:"anchor"===a?l.anchor:m.none()).getOr([]);var l,a;return((e,t,n,o)=>{const r=o[t],l=e.length>0;return void 0!==r?de(r,n).map((t=>({url:{value:t.value,meta:{text:l?e:t.text,attach:g}},text:l?e:t.text}))):m.none()})(n.text,o,r,e)};return{onChange:(e,t)=>{const r=t.name;return"url"===r?(e=>{const t=(o=e.url,x(n.text.length<=0,m.from(null===(r=o.meta)||void 0===r?void 0:r.text).getOr(o.value)));var o,r;const l=(e=>{var t;return x(n.title.length<=0,m.from(null===(t=e.meta)||void 0===t?void 0:t.title).getOr(""))})(e.url);return t.isSome()||l.isSome()?m.some({...t.map((e=>({text:e}))).getOr({}),...l.map((e=>({title:e}))).getOr({})}):m.none()})(e()):((e,t)=>h.call(e,t))(["anchor","link"],r)>-1?o(e(),r):"text"===r||"title"===r?(n[r]=e()[r],m.none()):m.none()}}};var he=tinymce.util.Tools.resolve("tinymce.util.Delay");const fe=e=>{const t=e.href;return t.indexOf("@")>0&&-1===t.indexOf("/")&&-1===t.indexOf("mailto:")?m.some({message:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",preprocess:e=>({...e,href:"mailto:"+t})}):m.none()},pe=(e,t)=>n=>{const o=n.href;return 1===e&&!W(o)||0===e&&/^\s*www(\.|\d\.)/i.test(o)?m.some({message:`The URL you entered seems to be an external link. Do you want to add the required ${t}:// prefix?`,preprocess:e=>({...e,href:t+"://"+o})}):m.none()},ke=e=>{const t=e.dom.select("a:not([href])"),n=p(((e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o})(t,(e=>{const t=e.name||e.id;return t?[{text:t,value:"#"+t}]:[]})));return n.length>0?m.some([{text:"None",value:""}].concat(n)):m.none()},ve=e=>{const t=E(e);return t.length>0?I(t):m.none()},ye=e=>{try{return m.some(JSON.parse(e))}catch(e){return m.none()}},xe=(e,t)=>{const n=S(e);if(n.length>0){const o=v(t,"_blank"),r=e=>X(U(e),o);return(!1===R(e)?j(r):I)(n)}return m.none()},be=[{text:"Current window",value:""},{text:"New window",value:"_blank"}],_e=e=>{const t=A(e);return l(t)?I(t).orThunk((()=>m.some(be))):!1===t?m.none():m.some(be)},we=(e,t,n)=>{const o=e.getAttrib(t,n);return null!==o&&o.length>0?m.some(o):m.none()},Ce=(e,t)=>(e=>{const t=t=>e.convertURL(t.value||t.url||"","href"),n=C(e);return new Promise((e=>{o(n)?fetch(n).then((e=>e.ok?e.text().then(ye):Promise.reject())).then(e,(()=>e(m.none()))):c(n)?n((t=>e(m.some(t)))):e(m.from(n))})).then((e=>e.bind(j(t)).map((e=>e.length>0?[{text:"None",value:""}].concat(e):e))))})(e).then((n=>{const o=((e,t)=>{const n=e.dom,o=re(e)?m.some(ee(e.selection,t)):m.none(),r=t.bind((e=>m.from(n.getAttrib(e,"href")))),l=t.bind((e=>m.from(n.getAttrib(e,"target")))),a=t.bind((e=>we(n,e,"rel"))),i=t.bind((e=>we(n,e,"class")));return{url:r,text:o,title:t.bind((e=>we(n,e,"title"))),target:l,rel:a,linkClass:i}})(e,t);return{anchor:o,catalogs:{targets:_e(e),rels:xe(e,o.target),classes:ve(e),anchor:ke(e),link:n},optNode:t,flags:{titleEnabled:T(e)}}})),Oe=e=>{const t=(e=>{const t=Y(e);return Ce(e,t)})(e);t.then((t=>{const n=((e,t)=>n=>{const o=n.getData();if(!o.url.value)return ce(e),void n.close();const r=e=>m.from(o[e]).filter((n=>!v(t.anchor[e],n))),l={href:o.url.value,text:r("text"),target:r("target"),rel:r("rel"),class:r("linkClass"),title:r("title")},a={href:o.url.value,attach:void 0!==o.url.meta&&o.url.meta.attach?o.url.meta.attach:g};((e,t)=>k([fe,pe(_(e),N(e))],(e=>e(t))).fold((()=>Promise.resolve(t)),(n=>new Promise((o=>{((e,t,n)=>{const o=e.selection.getRng();he.setEditorTimeout(e,(()=>{e.windowManager.confirm(t,(t=>{e.selection.setRng(o),n(t)}))}))})(e,n.message,(e=>{o(e?n.preprocess(t):t)}))})))))(e,l).then((t=>{se(e,a,t)})),n.close()})(e,t);return((e,t,n)=>{const o=e.anchor.text.map((()=>({name:"text",type:"input",label:"Text to display"}))).toArray(),r=e.flags.titleEnabled?[{name:"title",type:"input",label:"Title"}]:[],l=((e,t)=>{const n=e.anchor,o=n.url.getOr("");return{url:{value:o,meta:{original:{value:o}}},text:n.text.getOr(""),title:n.title.getOr(""),anchor:o,link:o,rel:n.rel.getOr(""),target:n.target.or(t).getOr(""),linkClass:n.linkClass.getOr("")}})(e,m.from(O(n))),a=e.catalogs,i=me(l,a);return{title:"Insert/Edit Link",size:"normal",body:{type:"panel",items:p([[{name:"url",type:"urlinput",filetype:"file",label:"URL"}],o,r,y([a.anchor.map(K("anchor","Anchors")),a.rels.map(K("rel","Rel")),a.targets.map(K("target","Open link in...")),a.link.map(K("link","Link list")),a.classes.map(K("linkClass","Class"))])])},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:l,onChange:(e,{name:t})=>{i.onChange(e.getData,{name:t}).each((t=>{e.setData(t)}))},onSubmit:t}})(t,n,e)})).then((t=>{e.windowManager.open(t)}))};var Ne=tinymce.util.Tools.resolve("tinymce.util.VK");const Ae=(e,t)=>e.dom.getParent(t,"a[href]"),Se=e=>Ae(e,e.selection.getStart()),Ee=(e,t)=>{if(t){const n=Q(t);if(/^#/.test(n)){const t=e.dom.select(n);t.length&&e.selection.scrollIntoView(t[0],!0)}else(e=>{const t=document.createElement("a");t.target="_blank",t.href=e,t.rel="noreferrer noopener";const n=document.createEvent("MouseEvents");n.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),((e,t)=>{document.body.appendChild(e),e.dispatchEvent(t),document.body.removeChild(e)})(t,n)})(t.href)}},Te=e=>()=>{e.execCommand("mceLink",!1,{dialog:!0})},Re=e=>()=>{Ee(e,Se(e))},Pe=(e,t)=>(e.on("NodeChange",t),()=>e.off("NodeChange",t)),Le=e=>t=>{const n=()=>{t.setActive(!e.mode.isReadOnly()&&Z(e,e.selection.getNode())),t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},Me=e=>t=>{const n=()=>{t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},De=e=>t=>{const n=()=>t.setEnabled((e=>1===(e.selection.isCollapsed()?ne(e.dom.getParents(e.selection.getStart())):te(e.selection.getRng())).length)(e));return n(),Pe(e,n)},Be=e=>t=>{const n=e.dom.getParents(e.selection.getStart()),o=n=>{t.setEnabled((t=>{return oe(t)||(n=e.selection.getRng(),te(n).length>0);var n})(n)&&e.selection.isEditable())};return o(n),Pe(e,(e=>o(e.parents)))};e.add("link",(e=>{(e=>{const t=e.options.register;t("link_assume_external_targets",{processor:e=>{const t=o(e)||i(e);return t?!0===e?{value:1,valid:t}:"http"===e||"https"===e?{value:e,valid:t}:{value:0,valid:t}:{valid:!1,message:"Must be a string or a boolean."}},default:!1}),t("link_context_toolbar",{processor:"boolean",default:!1}),t("link_list",{processor:e=>o(e)||c(e)||u(e,r)}),t("link_default_target",{processor:"string"}),t("link_default_protocol",{processor:"string",default:"https"}),t("link_target_list",{processor:e=>i(e)||u(e,r),default:!0}),t("link_rel_list",{processor:"object[]",default:[]}),t("link_class_list",{processor:"object[]",default:[]}),t("link_title",{processor:"boolean",default:!0}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("link_quicklink",{processor:"boolean",default:!1})})(e),(e=>{e.ui.registry.addToggleButton("link",{icon:"link",tooltip:"Insert/edit link",onAction:Te(e),onSetup:Le(e)}),e.ui.registry.addButton("openlink",{icon:"new-tab",tooltip:"Open link",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addButton("unlink",{icon:"unlink",tooltip:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addMenuItem("openlink",{text:"Open link",icon:"new-tab",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addMenuItem("link",{icon:"link",text:"Link...",shortcut:"Meta+K",onSetup:Me(e),onAction:Te(e)}),e.ui.registry.addMenuItem("unlink",{icon:"unlink",text:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addContextMenu("link",{update:t=>e.dom.isEditable(t)?oe(e.dom.getParents(t,"a"))?"link unlink openlink":"link":""})})(e),(e=>{const t=t=>{const n=e.selection.getNode();return t.setEnabled(Z(e,n)),g};e.ui.registry.addContextForm("quicklink",{launch:{type:"contextformtogglebutton",icon:"link",tooltip:"Link",onSetup:Le(e)},label:"Link",predicate:t=>w(e)&&Z(e,t),initValue:()=>Y(e).fold((()=>""),Q),commands:[{type:"contextformtogglebutton",icon:"link",tooltip:"Link",primary:!0,onSetup:t=>{const n=e.selection.getNode();return t.setActive(Z(e,n)),Le(e)(t)},onAction:t=>{const n=t.getValue(),o=(t=>{const n=Y(e),o=re(e);if(n.isNone()&&o){const o=ee(e.selection,n);return x(0===o.length,t)}return m.none()})(n);se(e,{href:n,attach:g},{href:n,text:o,title:m.none(),rel:m.none(),target:m.none(),class:m.none()}),(e=>{e.selection.collapse(!1)})(e),t.hide()}},{type:"contextformbutton",icon:"unlink",tooltip:"Remove link",onSetup:t,onAction:t=>{ce(e),t.hide()}},{type:"contextformbutton",icon:"new-tab",tooltip:"Open link",onSetup:t,onAction:t=>{Re(e)(),t.hide()}}]})})(e),(e=>{e.on("click",(t=>{const n=Ae(e,t.target);n&&Ne.metaKeyPressed(t)&&(t.preventDefault(),Ee(e,n))})),e.on("keydown",(t=>{if(!t.isDefaultPrevented()&&13===t.keyCode&&(e=>!0===e.altKey&&!1===e.shiftKey&&!1===e.ctrlKey&&!1===e.metaKey)(t)){const n=Se(e);n&&(t.preventDefault(),Ee(e,n))}}))})(e),(e=>{e.addCommand("mceLink",((t,n)=>{!0!==(null==n?void 0:n.dialog)&&P(e)?e.dispatch("contexttoolbar-show",{toolbarKey:"quicklink"}):Oe(e)}))})(e),(e=>{e.addShortcut("Meta+K","",(()=>{e.execCommand("mceLink")}))})(e)}))}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(l=o.constructor)||void 0===l?void 0:l.name)===r.name)?"string":t;var n,o,r,l})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),l=t("array"),i=(null,e=>null===e);const a=n("boolean"),s=e=>!(e=>null==e)(e),c=n("function"),u=(e,t)=>{if(l(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},g=()=>{},d=(e,t)=>e===t;class m{constructor(e,t){this.tag=e,this.value=t}static some(e){return new m(!0,e)}static none(){return m.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?m.some(e(this.value)):m.none()}bind(e){return this.tag?e(this.value):m.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:m.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?m.some(e):m.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}m.singletonNone=new m(!1);const h=Array.prototype.indexOf,f=Array.prototype.push,p=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!l(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);f.apply(t,e[n])}return t},k=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return m.none()},v=(e,t,n=d)=>e.exists((e=>n(e,t))),x=e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t},y=(e,t)=>e?m.some(t):m.none(),b=e=>t=>t.options.get(e),_=b("link_assume_external_targets"),w=b("link_context_toolbar"),C=b("link_list"),O=b("link_default_target"),N=b("link_default_protocol"),A=b("link_target_list"),S=b("link_rel_list"),E=b("link_class_list"),T=b("link_title"),R=b("allow_unsafe_link_target"),P=b("link_quicklink");var L=tinymce.util.Tools.resolve("tinymce.util.Tools");const M=e=>o(e.value)?e.value:"",D=(e,t)=>{const n=[];return L.each(e,(e=>{const r=(e=>o(e.text)?e.text:o(e.title)?e.title:"")(e);if(void 0!==e.menu){const o=D(e.menu,t);n.push({text:r,items:o})}else{const o=t(e);n.push({text:r,value:o})}})),n},B=(e=M)=>t=>m.from(t).map((t=>D(t,e))),I=e=>B(M)(e),j=B,K=(e,t)=>n=>({name:e,type:"listbox",label:t,items:n}),U=M,q=Object.keys,F=Object.hasOwnProperty,V=(e,t)=>F.call(e,t);var $=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),z=tinymce.util.Tools.resolve("tinymce.util.URI");const G=e=>s(e)&&"a"===e.nodeName.toLowerCase(),H=e=>G(e)&&!!Q(e),J=(e,t)=>{if(e.collapsed)return[];{const n=e.cloneContents(),o=n.firstChild,r=new $(o,n),l=[];let i=o;do{t(i)&&l.push(i)}while(i=r.next());return l}},W=e=>/^\w+:/i.test(e),Q=e=>{var t,n;return null!==(n=null!==(t=e.getAttribute("data-mce-href"))&&void 0!==t?t:e.getAttribute("href"))&&void 0!==n?n:""},X=(e,t)=>{const n=["noopener"],o=e?e.split(/\s+/):[],r=e=>e.filter((e=>-1===L.inArray(n,e))),l=t?(e=>(e=r(e)).length>0?e.concat(n):n)(o):r(o);return l.length>0?(e=>L.trim(e.sort().join(" ")))(l):""},Y=(e,t)=>(t=t||te(e.selection.getRng())[0]||e.selection.getNode(),le(t)?m.from(e.dom.select("a[href]",t)[0]):m.from(e.dom.getParent(t,"a[href]"))),Z=(e,t)=>Y(e,t).isSome(),ee=(e,t)=>t.fold((()=>e.getContent({format:"text"})),(e=>e.innerText||e.textContent||"")).replace(/\uFEFF/g,""),te=e=>J(e,H),ne=e=>L.grep(e,H),oe=e=>ne(e).length>0,re=e=>{const t=e.schema.getTextInlineElements();if(Y(e).exists((e=>e.hasAttribute("data-mce-block"))))return!1;const n=e.selection.getRng();return!!n.collapsed||0===J(n,(e=>1===e.nodeType&&!G(e)&&!V(t,e.nodeName.toLowerCase()))).length},le=e=>s(e)&&"FIGURE"===e.nodeName&&/\bimage\b/i.test(e.className),ie=(e,t,n)=>{const o=e.selection.getNode(),r=Y(e,o),l=((e,t)=>{const n={...t};if(0===S(e).length&&!R(e)){const e=X(n.rel,"_blank"===n.target);n.rel=e||null}return m.from(n.target).isNone()&&!1===A(e)&&(n.target=O(e)),n.href=((e,t)=>"http"!==t&&"https"!==t||W(e)?e:t+"://"+e)(n.href,_(e)),n})(e,(e=>{return t=["title","rel","class","target"],n=(t,n)=>(e[n].each((e=>{t[n]=e.length>0?e:null})),t),o={href:e.href},((e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)})(t,((e,t)=>{o=n(o,e)})),o;var t,n,o})(n));e.undoManager.transact((()=>{n.href===t.href&&t.attach(),r.fold((()=>{((e,t,n,o)=>{const r=e.dom;le(t)?ge(r,t,o):n.fold((()=>{e.execCommand("mceInsertLink",!1,o)}),(t=>{e.insertContent(r.createHTML("a",o,r.encode(t)))}))})(e,o,n.text,l)}),(t=>{e.focus(),((e,t,n,o)=>{n.each((e=>{V(t,"innerText")?t.innerText=e:t.textContent=e})),e.dom.setAttribs(t,o),e.selection.select(t)})(e,t,n.text,l)}))}))},ae=e=>{const{class:t,href:n,rel:o,target:r,text:l,title:a}=e;return((e,t)=>{const n={};var o;return((e,t,n,o)=>{((e,t)=>{const n=q(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}})(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,((e,t)=>!1===i(e)),(o=n,(e,t)=>{o[t]=e}),g),n})({class:t.getOrNull(),href:n,rel:o.getOrNull(),target:r.getOrNull(),text:l.getOrNull(),title:a.getOrNull()})},se=(e,t,n)=>{const o=((e,t)=>{const n=e.options.get,o={allow_html_data_urls:n("allow_html_data_urls"),allow_script_urls:n("allow_script_urls"),allow_svg_data_urls:n("allow_svg_data_urls")},r=t.href;return{...t,href:z.isDomSafe(r,"a",o)?r:""}})(e,n);e.hasPlugin("rtc",!0)?e.execCommand("createlink",!1,ae(o)):ie(e,t,o)},ce=e=>{e.hasPlugin("rtc",!0)?e.execCommand("unlink"):(e=>{e.undoManager.transact((()=>{const t=e.selection.getNode();le(t)?ue(e,t):(e=>{const t=e.dom,n=e.selection,o=n.getBookmark(),r=n.getRng().cloneRange(),l=t.getParent(r.startContainer,"a[href]",e.getBody()),i=t.getParent(r.endContainer,"a[href]",e.getBody());l&&r.setStartBefore(l),i&&r.setEndAfter(i),n.setRng(r),e.execCommand("unlink"),n.moveToBookmark(o)})(e),e.focus()}))})(e)},ue=(e,t)=>{var n;const o=e.dom.select("img",t)[0];if(o){const r=e.dom.getParents(o,"a[href]",t)[0];r&&(null===(n=r.parentNode)||void 0===n||n.insertBefore(o,r),e.dom.remove(r))}},ge=(e,t,n)=>{var o;const r=e.select("img",t)[0];if(r){const t=e.create("a",n);null===(o=r.parentNode)||void 0===o||o.insertBefore(t,r),t.appendChild(r)}},de=(e,t)=>k(t,(t=>(e=>{return V(t=e,n="items")&&void 0!==t[n]&&null!==t[n];var t,n})(t)?de(e,t.items):y(t.value===e,t))),me=(e,t)=>{const n={text:e.text,title:e.title},o=(e,o)=>{const r=(l=t,i=o,"link"===i?l.link:"anchor"===i?l.anchor:m.none()).getOr([]);var l,i;return((e,t,n,o)=>{const r=o[t],l=e.length>0;return void 0!==r?de(r,n).map((t=>({url:{value:t.value,meta:{text:l?e:t.text,attach:g}},text:l?e:t.text}))):m.none()})(n.text,o,r,e)};return{onChange:(e,t)=>{const r=t.name;return"url"===r?(e=>{const t=(o=e.url,y(n.text.length<=0,m.from(null===(r=o.meta)||void 0===r?void 0:r.text).getOr(o.value)));var o,r;const l=(e=>{var t;return y(n.title.length<=0,m.from(null===(t=e.meta)||void 0===t?void 0:t.title).getOr(""))})(e.url);return t.isSome()||l.isSome()?m.some({...t.map((e=>({text:e}))).getOr({}),...l.map((e=>({title:e}))).getOr({})}):m.none()})(e()):((e,t)=>h.call(e,t))(["anchor","link"],r)>-1?o(e(),r):"text"===r||"title"===r?(n[r]=e()[r],m.none()):m.none()}}};var he=tinymce.util.Tools.resolve("tinymce.util.Delay");const fe=e=>{const t=e.href;return t.indexOf("@")>0&&-1===t.indexOf("/")&&-1===t.indexOf("mailto:")?m.some({message:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",preprocess:e=>({...e,href:"mailto:"+t})}):m.none()},pe=(e,t)=>n=>{const o=n.href;return 1===e&&!W(o)||0===e&&/^\s*www(\.|\d\.)/i.test(o)?m.some({message:`The URL you entered seems to be an external link. Do you want to add the required ${t}:// prefix?`,preprocess:e=>({...e,href:t+"://"+o})}):m.none()},ke=e=>{const t=e.dom.select("a:not([href])"),n=p(((e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o})(t,(e=>{const t=e.name||e.id;return t?[{text:t,value:"#"+t}]:[]})));return n.length>0?m.some([{text:"None",value:""}].concat(n)):m.none()},ve=e=>{const t=E(e);return t.length>0?I(t):m.none()},xe=e=>{try{return m.some(JSON.parse(e))}catch(e){return m.none()}},ye=(e,t)=>{const n=S(e);if(n.length>0){const o=v(t,"_blank"),r=e=>X(U(e),o);return(!1===R(e)?j(r):I)(n)}return m.none()},be=[{text:"Current window",value:""},{text:"New window",value:"_blank"}],_e=e=>{const t=A(e);return l(t)?I(t).orThunk((()=>m.some(be))):!1===t?m.none():m.some(be)},we=(e,t,n)=>{const o=e.getAttrib(t,n);return null!==o&&o.length>0?m.some(o):m.none()},Ce=(e,t)=>(e=>{const t=t=>e.convertURL(t.value||t.url||"","href"),n=C(e);return new Promise((e=>{o(n)?fetch(n).then((e=>e.ok?e.text().then(xe):Promise.reject())).then(e,(()=>e(m.none()))):c(n)?n((t=>e(m.some(t)))):e(m.from(n))})).then((e=>e.bind(j(t)).map((e=>e.length>0?[{text:"None",value:""}].concat(e):e))))})(e).then((n=>{const o=((e,t)=>{const n=e.dom,o=re(e)?m.some(ee(e.selection,t)):m.none(),r=t.bind((e=>m.from(n.getAttrib(e,"href")))),l=t.bind((e=>m.from(n.getAttrib(e,"target")))),i=t.bind((e=>we(n,e,"rel"))),a=t.bind((e=>we(n,e,"class")));return{url:r,text:o,title:t.bind((e=>we(n,e,"title"))),target:l,rel:i,linkClass:a}})(e,t);return{anchor:o,catalogs:{targets:_e(e),rels:ye(e,o.target),classes:ve(e),anchor:ke(e),link:n},optNode:t,flags:{titleEnabled:T(e)}}})),Oe=e=>{const t=(e=>{const t=Y(e);return Ce(e,t)})(e);t.then((t=>{const n=((e,t)=>n=>{const o=n.getData();if(!o.url.value)return ce(e),void n.close();const r=e=>m.from(o[e]).filter((n=>!v(t.anchor[e],n))),l={href:o.url.value,text:r("text"),target:r("target"),rel:r("rel"),class:r("linkClass"),title:r("title")},i={href:o.url.value,attach:void 0!==o.url.meta&&o.url.meta.attach?o.url.meta.attach:g};((e,t)=>k([fe,pe(_(e),N(e))],(e=>e(t))).fold((()=>Promise.resolve(t)),(n=>new Promise((o=>{((e,t,n)=>{const o=e.selection.getRng();he.setEditorTimeout(e,(()=>{e.windowManager.confirm(t,(t=>{e.selection.setRng(o),n(t)}))}))})(e,n.message,(e=>{o(e?n.preprocess(t):t)}))})))))(e,l).then((t=>{se(e,i,t)})),n.close()})(e,t);return((e,t,n)=>{const o=e.anchor.text.map((()=>({name:"text",type:"input",label:"Text to display"}))).toArray(),r=e.flags.titleEnabled?[{name:"title",type:"input",label:"Title"}]:[],l=((e,t)=>{const n=e.anchor,o=n.url.getOr("");return{url:{value:o,meta:{original:{value:o}}},text:n.text.getOr(""),title:n.title.getOr(""),anchor:o,link:o,rel:n.rel.getOr(""),target:n.target.or(t).getOr(""),linkClass:n.linkClass.getOr("")}})(e,m.from(O(n))),i=e.catalogs,a=me(l,i);return{title:"Insert/Edit Link",size:"normal",body:{type:"panel",items:p([[{name:"url",type:"urlinput",filetype:"file",label:"URL",picker_text:"Browse links"}],o,r,x([i.anchor.map(K("anchor","Anchors")),i.rels.map(K("rel","Rel")),i.targets.map(K("target","Open link in...")),i.link.map(K("link","Link list")),i.classes.map(K("linkClass","Class"))])])},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:l,onChange:(e,{name:t})=>{a.onChange(e.getData,{name:t}).each((t=>{e.setData(t)}))},onSubmit:t}})(t,n,e)})).then((t=>{e.windowManager.open(t)}))};var Ne=tinymce.util.Tools.resolve("tinymce.util.VK");const Ae=(e,t)=>e.dom.getParent(t,"a[href]"),Se=e=>Ae(e,e.selection.getStart()),Ee=(e,t)=>{if(t){const n=Q(t);if(/^#/.test(n)){const t=e.dom.select(n);t.length&&e.selection.scrollIntoView(t[0],!0)}else(e=>{const t=document.createElement("a");t.target="_blank",t.href=e,t.rel="noreferrer noopener";const n=document.createEvent("MouseEvents");n.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),((e,t)=>{document.body.appendChild(e),e.dispatchEvent(t),document.body.removeChild(e)})(t,n)})(t.href)}},Te=e=>()=>{e.execCommand("mceLink",!1,{dialog:!0})},Re=e=>()=>{Ee(e,Se(e))},Pe=(e,t)=>(e.on("NodeChange",t),()=>e.off("NodeChange",t)),Le=e=>t=>{const n=()=>{t.setActive(!e.mode.isReadOnly()&&Z(e,e.selection.getNode())),t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},Me=e=>t=>{const n=()=>{t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},De=e=>t=>{const n=()=>t.setEnabled((e=>1===(e.selection.isCollapsed()?ne(e.dom.getParents(e.selection.getStart())):te(e.selection.getRng())).length)(e));return n(),Pe(e,n)},Be=e=>t=>{const n=e.dom.getParents(e.selection.getStart()),o=n=>{t.setEnabled((t=>{return oe(t)||(n=e.selection.getRng(),te(n).length>0);var n})(n)&&e.selection.isEditable())};return o(n),Pe(e,(e=>o(e.parents)))};e.add("link",(e=>{(e=>{const t=e.options.register;t("link_assume_external_targets",{processor:e=>{const t=o(e)||a(e);return t?!0===e?{value:1,valid:t}:"http"===e||"https"===e?{value:e,valid:t}:{value:0,valid:t}:{valid:!1,message:"Must be a string or a boolean."}},default:!1}),t("link_context_toolbar",{processor:"boolean",default:!1}),t("link_list",{processor:e=>o(e)||c(e)||u(e,r)}),t("link_default_target",{processor:"string"}),t("link_default_protocol",{processor:"string",default:"https"}),t("link_target_list",{processor:e=>a(e)||u(e,r),default:!0}),t("link_rel_list",{processor:"object[]",default:[]}),t("link_class_list",{processor:"object[]",default:[]}),t("link_title",{processor:"boolean",default:!0}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("link_quicklink",{processor:"boolean",default:!1})})(e),(e=>{e.ui.registry.addToggleButton("link",{icon:"link",tooltip:"Insert/edit link",onAction:Te(e),onSetup:Le(e)}),e.ui.registry.addButton("openlink",{icon:"new-tab",tooltip:"Open link",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addButton("unlink",{icon:"unlink",tooltip:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addMenuItem("openlink",{text:"Open link",icon:"new-tab",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addMenuItem("link",{icon:"link",text:"Link...",shortcut:"Meta+K",onSetup:Me(e),onAction:Te(e)}),e.ui.registry.addMenuItem("unlink",{icon:"unlink",text:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addContextMenu("link",{update:t=>e.dom.isEditable(t)?oe(e.dom.getParents(t,"a"))?"link unlink openlink":"link":""})})(e),(e=>{const t=t=>{const n=e.selection.getNode();return t.setEnabled(Z(e,n)),g};e.ui.registry.addContextForm("quicklink",{launch:{type:"contextformtogglebutton",icon:"link",tooltip:"Link",onSetup:Le(e)},label:"Link",predicate:t=>w(e)&&Z(e,t),initValue:()=>Y(e).fold((()=>""),Q),commands:[{type:"contextformtogglebutton",icon:"link",tooltip:"Link",primary:!0,onSetup:t=>{const n=e.selection.getNode();return t.setActive(Z(e,n)),Le(e)(t)},onAction:t=>{const n=t.getValue(),o=(t=>{const n=Y(e),o=re(e);if(n.isNone()&&o){const o=ee(e.selection,n);return y(0===o.length,t)}return m.none()})(n);se(e,{href:n,attach:g},{href:n,text:o,title:m.none(),rel:m.none(),target:m.none(),class:m.none()}),(e=>{e.selection.collapse(!1)})(e),t.hide()}},{type:"contextformbutton",icon:"unlink",tooltip:"Remove link",onSetup:t,onAction:t=>{ce(e),t.hide()}},{type:"contextformbutton",icon:"new-tab",tooltip:"Open link",onSetup:t,onAction:t=>{Re(e)(),t.hide()}}]})})(e),(e=>{e.on("click",(t=>{const n=Ae(e,t.target);n&&Ne.metaKeyPressed(t)&&(t.preventDefault(),Ee(e,n))})),e.on("keydown",(t=>{if(!t.isDefaultPrevented()&&13===t.keyCode&&(e=>!0===e.altKey&&!1===e.shiftKey&&!1===e.ctrlKey&&!1===e.metaKey)(t)){const n=Se(e);n&&(t.preventDefault(),Ee(e,n))}}))})(e),(e=>{e.addCommand("mceLink",((t,n)=>{!0!==(null==n?void 0:n.dialog)&&P(e)?e.dispatch("contexttoolbar-show",{toolbarKey:"quicklink"}):Oe(e)}))})(e),(e=>{e.addShortcut("Meta+K","",(()=>{e.execCommand("mceLink")}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/lists/plugin.min.js b/public/libs/tinymce/plugins/lists/plugin.min.js
index e72e1336b9f..5d3b73577ad 100644
--- a/public/libs/tinymce/plugins/lists/plugin.min.js
+++ b/public/libs/tinymce/plugins/lists/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var n,o,r,s})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),s=t("array"),i=n("boolean"),l=e=>!(e=>null==e)(e),a=n("function"),d=n("number"),c=()=>{},m=(e,t)=>e===t,u=e=>t=>!e(t),p=(!1,()=>false);class g{constructor(e,t){this.tag=e,this.value=t}static some(e){return new g(!0,e)}static none(){return g.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?g.some(e(this.value)):g.none()}bind(e){return this.tag?e(this.value):g.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:g.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return l(e)?g.some(e):g.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}g.singletonNone=new g(!1);const h=Array.prototype.slice,f=Array.prototype.indexOf,y=Array.prototype.push,v=(e,t)=>{return n=e,o=t,f.call(n,o)>-1;var n,o},C=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},b=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},S=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},N=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},L=(e,t,n)=>(S(e,((e,o)=>{n=t(n,e,o)})),n),O=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return g.some(r);if(n(r,o))break}return g.none()},A=(e,t)=>O(e,t,p),x=(e,t)=>(e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);y.apply(t,e[n])}return t})(b(e,t)),k=e=>{const t=h.call(e,0);return t.reverse(),t},T=(e,t)=>t>=0&&t<e.length?g.some(e[t]):g.none(),E=e=>T(e,0),w=e=>T(e,e.length-1),D=(e,t)=>{const n=[],o=a(t)?e=>C(n,(n=>t(n,e))):e=>v(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n},B=(e,t,n=m)=>e.exists((e=>n(e,t))),I=(e,t,n)=>e.isSome()&&t.isSome()?g.some(n(e.getOrDie(),t.getOrDie())):g.none(),P=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},M=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return P(n.childNodes[0])},R=(e,t)=>{const n=(t||document).createElement(e);return P(n)},U=P,$=(e,t)=>e.dom===t.dom;"undefined"!=typeof window?window:Function("return this;")();const _=e=>e.dom.nodeName.toLowerCase(),H=e=>e.dom.nodeType,V=(1,e=>1===H(e));const F=e=>t=>V(t)&&_(t)===e,j=e=>g.from(e.dom.parentNode).map(U),K=e=>b(e.dom.childNodes,U),z=(e,t)=>{const n=e.dom.childNodes;return g.from(n[t]).map(U)},Q=e=>z(e,0),W=e=>z(e,e.dom.childNodes.length-1),q=(e,t,n)=>{let o=e.dom;const r=a(n)?n:p;for(;o.parentNode;){o=o.parentNode;const e=U(o);if(t(e))return g.some(e);if(r(e))break}return g.none()},Z=(e,t,n)=>((e,t,n,o,r)=>o(n)?g.some(n):a(r)&&r(n)?g.none():t(n,o,r))(0,q,e,t,n),G=(e,t)=>{j(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},J=(e,t)=>{e.dom.appendChild(t.dom)},X=(e,t)=>{S(t,(t=>{J(e,t)}))},Y=e=>{e.dom.textContent="",S(K(e),(e=>{ee(e)}))},ee=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)};var te=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),ne=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),oe=tinymce.util.Tools.resolve("tinymce.util.VK");const re=e=>b(e,U),se=Object.keys,ie=(e,t)=>{const n=se(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},le=(e,t)=>{const n=e.dom;ie(t,((e,t)=>{((e,t,n)=>{if(!(o(n)||i(n)||d(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(n,t,e)}))},ae=e=>L(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),de=e=>((e,t)=>U(e.dom.cloneNode(!0)))(e),ce=(e,t)=>{const n=((e,t)=>{const n=R(t),o=ae(e);return le(n,o),n})(e,t);var o,r;r=n,(e=>g.from(e.dom.nextSibling).map(U))(o=e).fold((()=>{j(o).each((e=>{J(e,r)}))}),(e=>{G(e,r)}));const s=K(e);return X(n,s),ee(e),n};var me=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),ue=tinymce.util.Tools.resolve("tinymce.util.Tools");const pe=e=>t=>l(t)&&t.nodeName.toLowerCase()===e,ge=e=>t=>l(t)&&e.test(t.nodeName),he=e=>l(e)&&3===e.nodeType,fe=e=>l(e)&&1===e.nodeType,ye=ge(/^(OL|UL|DL)$/),ve=ge(/^(OL|UL)$/),Ce=pe("ol"),be=ge(/^(LI|DT|DD)$/),Se=ge(/^(DT|DD)$/),Ne=ge(/^(TH|TD)$/),Le=pe("br"),Oe=(e,t)=>l(t)&&t.nodeName in e.schema.getTextBlockElements(),Ae=(e,t)=>l(e)&&e.nodeName in t,xe=(e,t)=>l(t)&&t.nodeName in e.schema.getVoidElements(),ke=(e,t,n)=>{const o=e.isEmpty(t);return!(n&&e.select("span[data-mce-type=bookmark]",t).length>0)&&o},Te=(e,t)=>e.isChildOf(t,e.getRoot()),Ee=e=>t=>t.options.get(e),we=Ee("lists_indent_on_tab"),De=Ee("forced_root_block"),Be=Ee("forced_root_block_attrs"),Ie=(e,t)=>{const n=e.dom,o=e.schema.getBlockElements(),r=n.createFragment(),s=De(e),i=Be(e);let l,a,d=!1;for(a=n.create(s,i),Ae(t.firstChild,o)||r.appendChild(a);l=t.firstChild;){const e=l.nodeName;d||"SPAN"===e&&"bookmark"===l.getAttribute("data-mce-type")||(d=!0),Ae(l,o)?(r.appendChild(l),a=null):(a||(a=n.create(s,i),r.appendChild(a)),a.appendChild(l))}return!d&&a&&a.appendChild(n.create("br",{"data-mce-bogus":"1"})),r},Pe=me.DOM,Me=F("dd"),Re=F("dt"),Ue=(e,t)=>{var n;Me(t)?ce(t,"dt"):Re(t)&&(n=t,g.from(n.dom.parentElement).map(U)).each((n=>((e,t,n)=>{const o=Pe.select('span[data-mce-type="bookmark"]',t),r=Ie(e,n),s=Pe.createRng();s.setStartAfter(n),s.setEndAfter(t);const i=s.extractContents();for(let t=i.firstChild;t;t=t.firstChild)if("LI"===t.nodeName&&e.dom.isEmpty(t)){Pe.remove(t);break}e.dom.isEmpty(i)||Pe.insertAfter(i,t),Pe.insertAfter(r,t);const l=n.parentElement;l&&ke(e.dom,l)&&(e=>{const t=e.parentNode;t&&ue.each(o,(e=>{t.insertBefore(e,n.parentNode)})),Pe.remove(e)})(l),Pe.remove(n),ke(e.dom,t)&&Pe.remove(t)})(e,n.dom,t.dom)))},$e=e=>{Re(e)&&ce(e,"dd")},_e=(e,t)=>{if(he(e))return{container:e,offset:t};const n=te.getNode(e,t);return he(n)?{container:n,offset:t>=e.childNodes.length?n.data.length:0}:n.previousSibling&&he(n.previousSibling)?{container:n.previousSibling,offset:n.previousSibling.data.length}:n.nextSibling&&he(n.nextSibling)?{container:n.nextSibling,offset:0}:{container:e,offset:t}},He=e=>{const t=e.cloneRange(),n=_e(e.startContainer,e.startOffset);t.setStart(n.container,n.offset);const o=_e(e.endContainer,e.endOffset);return t.setEnd(o.container,o.offset),t},Ve=["OL","UL","DL"],Fe=Ve.join(","),je=(e,t)=>{const n=t||e.selection.getStart(!0);return e.dom.getParent(n,Fe,Qe(e,n))},Ke=e=>{const t=e.selection.getSelectedBlocks();return N(((e,t)=>{const n=ue.map(t,(t=>e.dom.getParent(t,"li,dd,dt",Qe(e,t))||t));return D(n)})(e,t),be)},ze=(e,t)=>{const n=e.dom.getParents(t,"TD,TH");return n.length>0?n[0]:e.getBody()},Qe=(e,t)=>{const n=e.dom.getParents(t,e.dom.isBlock),o=A(n,(t=>{return n=e.schema,!ye(o=t)&&!be(o)&&C(Ve,(e=>n.isValidChild(o.nodeName,e)));var n,o}));return o.getOr(e.getBody())},We=(e,t)=>{const n=e.dom.getParents(t,"ol,ul",Qe(e,t));return w(n)},qe=(e,t)=>{const n=b(t,(t=>We(e,t).getOr(t)));return D(n)},Ze=e=>/\btox\-/.test(e.className),Ge=(e,t)=>O(e,ye,Ne).exists((e=>e.nodeName===t&&!Ze(e))),Je=(e,t)=>null!==t&&!e.dom.isEditable(t),Xe=(e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return Je(e,n)},Ye=(e,t)=>{const n=e.selection.getNode();return t({parents:e.dom.getParents(n),element:n}),e.on("NodeChange",t),()=>e.off("NodeChange",t)},et=(e,t)=>{const n=(t||document).createDocumentFragment();return S(e,(e=>{n.appendChild(e.dom)})),U(n)},tt=(e,t,n)=>e.dispatch("ListMutation",{action:t,element:n}),nt=(ot=/^\s+|\s+$/g,e=>e.replace(ot,""));var ot;const rt=(e,t,n)=>{((e,t,n)=>{if(!o(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);(e=>void 0!==e.style&&a(e.style.getPropertyValue))(e)&&e.style.setProperty(t,n)})(e.dom,t,n)},st=e=>((e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}})(e,"OL,UL"),it=e=>Q(e).exists(st),lt=e=>"listAttributes"in e,at=e=>"isComment"in e,dt=e=>e.depth>0,ct=e=>e.isSelected,mt=e=>{const t=K(e),n=W(e).exists(st)?t.slice(0,-1):t;return b(n,de)},ut=(e,t)=>{J(e.item,t.list)},pt=(e,t)=>{const n={list:R(t,e),item:R("li",e)};return J(n.list,n.item),n},gt=(e,t,n)=>{const o=t.slice(0,n.depth);return w(o).each((t=>{if(lt(n)){const o=((e,t,n)=>{const o=R("li",e);return le(o,t),X(o,n),o})(e,n.itemAttributes,n.content);((e,t)=>{J(e.list,t),e.item=t})(t,o),((e,t)=>{_(e.list)!==t.listType&&(e.list=ce(e.list,t.listType)),le(e.list,t.listAttributes)})(t,n)}else if((e=>"isInPreviousLi"in e)(n)){if(n.isInPreviousLi){const o=((e,t,n,o)=>{const r=R(o,e);return le(r,t),X(r,n),r})(e,n.attributes,n.content,n.type);J(t.item,o)}}else{const e=M(`\x3c!--${n.content}--\x3e`);J(t.list,e)}})),o},ht=(e,t)=>{let n=g.none();const o=L(t,((t,o,r)=>lt(o)?o.depth>t.length?((e,t,n)=>{const o=((e,t,n)=>{const o=[];for(let r=0;r<n;r++)o.push(pt(e,t.listType));return o})(e,n,n.depth-t.length);var r;return(e=>{for(let t=1;t<e.length;t++)ut(e[t-1],e[t])})(o),((e,t)=>{for(let t=0;t<e.length-1;t++)rt(e[t].item,"list-style-type","none");w(e).each((e=>{le(e.list,t.listAttributes),le(e.item,t.itemAttributes),X(e.item,t.content)}))})(o,n),r=o,I(w(t),E(r),ut),t.concat(o)})(e,t,o):gt(e,t,o):0===r&&at(o)?(n=g.some(o),t):gt(e,t,o)),[]);return n.each((e=>{const t=M(`\x3c!--${e.content}--\x3e`);E(o).each((e=>{((e,t)=>{Q(e).fold((()=>{J(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))})(e.list,t)}))})),E(o).map((e=>e.list))},ft=e=>(S(e,((t,n)=>{((e,t)=>{const n=e[t].depth,o=e=>e.depth===n&&!e.dirty,r=e=>e.depth<n;return O(k(e.slice(0,t)),o,r).orThunk((()=>O(e.slice(t+1),o,r)))})(e,n).fold((()=>{t.dirty&&lt(t)&&(e=>{e.listAttributes=((e,t)=>{const n={};var o;return((e,t,n,o)=>{ie(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,t,(o=n,(e,t)=>{o[t]=e}),c),n})(e.listAttributes,((e,t)=>"start"!==t))})(t)}),(e=>{return o=e,void(lt(n=t)&&lt(o)&&(n.listType=o.listType,n.listAttributes={...o.listAttributes}));var n,o}))})),e),yt=(e,t,n,o)=>{var r,s;if(8===H(s=o)||"#comment"===_(s))return[{depth:e+1,content:null!==(r=o.dom.nodeValue)&&void 0!==r?r:"",dirty:!1,isSelected:!1,isComment:!0}];t.each((e=>{$(e.start,o)&&n.set(!0)}));const i=((e,t,n)=>j(e).filter(V).map((o=>({depth:t,dirty:!1,isSelected:n,content:mt(e),itemAttributes:ae(e),listAttributes:ae(o),listType:_(o),isInPreviousLi:!1}))))(o,e,n.get());t.each((e=>{$(e.end,o)&&n.set(!1)}));const l=W(o).filter(st).map((o=>Ct(e,t,n,o))).getOr([]);return i.toArray().concat(l)},vt=(e,t,n,o)=>Q(o).filter(st).fold((()=>yt(e,t,n,o)),(r=>{const s=L(K(o),((o,r,s)=>{if(0===s)return o;{const s=yt(e,t,n,r).map((e=>((e,t,n)=>lt(e)?{depth:e.depth,dirty:e.dirty,content:e.content,isSelected:e.isSelected,type:t,attributes:e.itemAttributes,isInPreviousLi:!0}:e)(e,r.dom.nodeName.toLowerCase())));return o.concat(s)}}),[]);return Ct(e,t,n,r).concat(s)})),Ct=(e,t,n,o)=>x(K(o),(o=>(st(o)?Ct:vt)(e+1,t,n,o))),bt=(e,t,n)=>{const o=((e,t)=>{const n=(e=>{let t=!1;return{get:()=>t,set:e=>{t=e}}})();return b(e,(e=>({sourceList:e,entries:Ct(0,t,n,e)})))})(t,(e=>{const t=b(Ke(e),U);return I(A(t,u(it)),A(k(t),u(it)),((e,t)=>({start:e,end:t})))})(e));S(o,(t=>{((e,t)=>{S(N(e,ct),(e=>((e,t)=>{switch(e){case"Indent":t.depth++;break;case"Outdent":t.depth--;break;case"Flatten":t.depth=0}t.dirty=!0})(t,e)))})(t.entries,n);const o=((e,t)=>x(((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const o=[];let r=[];for(let s=0,i=e.length;s<i;s++){const i=e[s],l=t(i);l!==n&&(o.push(r),r=[]),n=l,r.push(i)}return 0!==r.length&&o.push(r),o}})(t,dt),(t=>E(t).exists(dt)?((e,t)=>{const n=ft(t);return ht(e.contentDocument,n).toArray()})(e,t):((e,t)=>{const n=ft(t);return b(n,(t=>{const n=at(t)?et([M(`\x3c!--${t.content}--\x3e`)]):et(t.content);return U(Ie(e,n.dom))}))})(e,t))))(e,t.entries);var r;S(o,(t=>{tt(e,"Indent"===n?"IndentList":"OutdentList",t.dom)})),r=t.sourceList,S(o,(e=>{G(r,e)})),ee(t.sourceList)}))},St=(e,t)=>{const n=re((e=>{const t=(e=>{const t=We(e,e.selection.getStart()),n=N(e.selection.getSelectedBlocks(),ve);return t.toArray().concat(n)})(e),n=(e=>{const t=e.selection.getStart();return e.dom.getParents(t,"ol,ul",Qe(e,t))})(e);return A(n,(e=>{return t=U(e),j(t).exists((e=>be(e.dom)&&Q(e).exists((e=>!ye(e.dom)))&&W(e).exists((e=>!ye(e.dom)))));var t})).fold((()=>qe(e,t)),(e=>[e]))})(e)),o=re((e=>N(Ke(e),Se))(e));let r=!1;if(n.length||o.length){const s=e.selection.getBookmark();bt(e,n,t),((e,t,n)=>{S(n,"Indent"===t?$e:t=>Ue(e,t))})(e,t,o),e.selection.moveToBookmark(s),e.selection.setRng(He(e.selection.getRng())),e.nodeChanged(),r=!0}return r},Nt=(e,t)=>!(e=>{const t=je(e);return Je(e,t)})(e)&&St(e,t),Lt=e=>Nt(e,"Indent"),Ot=e=>Nt(e,"Outdent"),At=e=>Nt(e,"Flatten"),xt=e=>"\ufeff"===e;var kt=tinymce.util.Tools.resolve("tinymce.dom.BookmarkManager");const Tt=me.DOM,Et=e=>{const t={},n=n=>{let o=e[n?"startContainer":"endContainer"],r=e[n?"startOffset":"endOffset"];if(fe(o)){const e=Tt.create("span",{"data-mce-type":"bookmark"});o.hasChildNodes()?(r=Math.min(r,o.childNodes.length-1),n?o.insertBefore(e,o.childNodes[r]):Tt.insertAfter(e,o.childNodes[r])):o.appendChild(e),o=e,r=0}t[n?"startContainer":"endContainer"]=o,t[n?"startOffset":"endOffset"]=r};return n(!0),e.collapsed||n(),t},wt=e=>{const t=t=>{let n=e[t?"startContainer":"endContainer"],o=e[t?"startOffset":"endOffset"];if(n){if(fe(n)&&n.parentNode){const e=n;o=(e=>{var t;let n=null===(t=e.parentNode)||void 0===t?void 0:t.firstChild,o=0;for(;n;){if(n===e)return o;fe(n)&&"bookmark"===n.getAttribute("data-mce-type")||o++,n=n.nextSibling}return-1})(n),n=n.parentNode,Tt.remove(e),!n.hasChildNodes()&&Tt.isBlock(n)&&n.appendChild(Tt.create("br"))}e[t?"startContainer":"endContainer"]=n,e[t?"startOffset":"endOffset"]=o}};t(!0),t();const n=Tt.createRng();return n.setStart(e.startContainer,e.startOffset),e.endContainer&&n.setEnd(e.endContainer,e.endOffset),He(n)},Dt=e=>{switch(e){case"UL":return"ToggleUlList";case"OL":return"ToggleOlList";case"DL":return"ToggleDLList"}},Bt=(e,t)=>{ue.each(t,((t,n)=>{e.setAttribute(n,t)}))},It=(e,t,n)=>{((e,t,n)=>{const o=n["list-style-type"]?n["list-style-type"]:null;e.setStyle(t,"list-style-type",o)})(e,t,n),((e,t,n)=>{Bt(t,n["list-attributes"]),ue.each(e.select("li",t),(e=>{Bt(e,n["list-item-attributes"])}))})(e,t,n)},Pt=(e,t)=>l(t)&&!Ae(t,e.schema.getBlockElements()),Mt=(e,t,n,o)=>{let r=t[n?"startContainer":"endContainer"];const s=t[n?"startOffset":"endOffset"];fe(r)&&(r=r.childNodes[Math.min(s,r.childNodes.length-1)]||r),!n&&Le(r.nextSibling)&&(r=r.nextSibling);const i=(t,n)=>{var r;const s=new ne(t,(t=>{for(;!e.dom.isBlock(t)&&t.parentNode&&o!==t;)t=t.parentNode;return t})(t)),i=n?"next":"prev";let l;for(;l=s[i]();)if(!xe(e,l)&&!xt(l.textContent)&&0!==(null===(r=l.textContent)||void 0===r?void 0:r.length))return g.some(l);return g.none()};if(n&&he(r))if(xt(r.textContent))r=i(r,!1).getOr(r);else for(null!==r.parentNode&&Pt(e,r.parentNode)&&(r=r.parentNode);null!==r.previousSibling&&(Pt(e,r.previousSibling)||he(r.previousSibling));)r=r.previousSibling;if(!n&&he(r))if(xt(r.textContent))r=i(r,!0).getOr(r);else for(null!==r.parentNode&&Pt(e,r.parentNode)&&(r=r.parentNode);null!==r.nextSibling&&(Pt(e,r.nextSibling)||he(r.nextSibling));)r=r.nextSibling;for(;r.parentNode!==o;){const t=r.parentNode;if(Oe(e,r))return r;if(/^(TD|TH)$/.test(t.nodeName))return r;r=t}return r},Rt=(e,t,n)=>{const o=e.selection.getRng();let r="LI";const s=Qe(e,((e,t)=>{const n=e.selection.getStart(!0),o=Mt(e,t,!0,e.getBody());return r=U(o),s=U(t.commonAncestorContainer),i=r,l=function(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}($,s),q(i,l,void 0).isSome()?t.commonAncestorContainer:n;var r,s,i,l})(e,o)),i=e.dom;if("false"===i.getContentEditable(e.selection.getNode()))return;"DL"===(t=t.toUpperCase())&&(r="DT");const l=Et(o),a=N(((e,t,n)=>{const o=[],r=e.dom,s=Mt(e,t,!0,n),i=Mt(e,t,!1,n);let l;const a=[];for(let e=s;e&&(a.push(e),e!==i);e=e.nextSibling);return ue.each(a,(t=>{var s;if(Oe(e,t))return o.push(t),void(l=null);if(r.isBlock(t)||Le(t))return Le(t)&&r.remove(t),void(l=null);const i=t.nextSibling;kt.isBookmarkNode(t)&&(ye(i)||Oe(e,i)||!i&&t.parentNode===n)?l=null:(l||(l=r.create("p"),null===(s=t.parentNode)||void 0===s||s.insertBefore(l,t),o.push(l)),l.appendChild(t))})),o})(e,o,s),e.dom.isEditable);ue.each(a,(o=>{let s;const l=o.previousSibling,a=o.parentNode;be(a)||(l&&ye(l)&&l.nodeName===t&&((e,t,n)=>{const o=e.getStyle(t,"list-style-type");let r=n?n["list-style-type"]:"";return r=null===r?"":r,o===r})(i,l,n)?(s=l,o=i.rename(o,r),l.appendChild(o)):(s=i.create(t),a.insertBefore(s,o),s.appendChild(o),o=i.rename(o,r)),((e,t,n)=>{ue.each(["margin","margin-right","margin-bottom","margin-left","margin-top","padding","padding-right","padding-bottom","padding-left","padding-top"],(n=>e.setStyle(t,n,"")))})(i,o),It(i,s,n),$t(e.dom,s))})),e.selection.setRng(wt(l))},Ut=(e,t,n)=>{return((e,t)=>ye(e)&&e.nodeName===(null==t?void 0:t.nodeName))(t,n)&&((e,t,n)=>e.getStyle(t,"list-style-type",!0)===e.getStyle(n,"list-style-type",!0))(e,t,n)&&(o=n,t.className===o.className);var o},$t=(e,t)=>{let n,o=t.nextSibling;if(Ut(e,t,o)){const r=o;for(;n=r.firstChild;)t.appendChild(n);e.remove(r)}if(o=t.previousSibling,Ut(e,t,o)){const r=o;for(;n=r.lastChild;)t.insertBefore(n,t.firstChild);e.remove(r)}},_t=(e,t,n,o)=>{if(t.nodeName!==n){const r=e.dom.rename(t,n);It(e.dom,r,o),tt(e,Dt(n),r)}else It(e.dom,t,o),tt(e,Dt(n),t)},Ht=(e,t,n,o)=>{if(t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),t.nodeName!==n){const r=e.dom.rename(t,n);It(e.dom,r,o),tt(e,Dt(n),r)}else It(e.dom,t,o),tt(e,Dt(n),t)},Vt=e=>"list-style-type"in e,Ft=(e,t,n)=>{const o=je(e);if(Xe(e,o))return;const s=(e=>{const t=je(e),n=e.selection.getSelectedBlocks();return((e,t)=>l(e)&&1===t.length&&t[0]===e)(t,n)?(e=>N(e.querySelectorAll(Fe),ye))(t):N(n,(e=>ye(e)&&t!==e))})(e),i=r(n)?n:{};s.length>0?((e,t,n,o,r)=>{const s=ye(t);if(!s||t.nodeName!==o||Vt(r)||Ze(t)){Rt(e,o,r);const i=Et(e.selection.getRng()),l=s?[t,...n]:n,a=s&&Ze(t)?Ht:_t;ue.each(l,(t=>{a(e,t,o,r)})),e.selection.setRng(wt(i))}else At(e)})(e,o,s,t,i):((e,t,n,o)=>{if(t!==e.getBody())if(t)if(t.nodeName!==n||Vt(o)||Ze(t)){const r=Et(e.selection.getRng());Ze(t)&&t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),It(e.dom,t,o);const s=e.dom.rename(t,n);$t(e.dom,s),e.selection.setRng(wt(r)),Rt(e,n,o),tt(e,Dt(n),s)}else At(e);else Rt(e,n,o),tt(e,Dt(n),t)})(e,o,t,i)},jt=me.DOM,Kt=(e,t)=>{const n=ue.grep(e.select("ol,ul",t));ue.each(n,(t=>{((e,t)=>{const n=t.parentElement;if(n&&"LI"===n.nodeName&&n.firstChild===t){const o=n.previousSibling;o&&"LI"===o.nodeName?(o.appendChild(t),ke(e,n)&&jt.remove(n)):jt.setStyle(n,"listStyleType","none")}if(ye(n)){const e=n.previousSibling;e&&"LI"===e.nodeName&&e.appendChild(t)}})(e,t)}))},zt=(e,t,n,o)=>{let r=t.startContainer;const s=t.startOffset;if(he(r)&&(n?s<r.data.length:s>0))return r;const i=e.schema.getNonEmptyElements();fe(r)&&(r=te.getNode(r,s));const l=new ne(r,o);n&&((e,t)=>!!Le(t)&&e.isBlock(t.nextSibling)&&!Le(t.previousSibling))(e.dom,r)&&l.next();const a=n?l.next.bind(l):l.prev2.bind(l);for(;r=a();){if("LI"===r.nodeName&&!r.hasChildNodes())return r;if(i[r.nodeName])return r;if(he(r)&&r.data.length>0)return r}return null},Qt=(e,t)=>{const n=t.childNodes;return 1===n.length&&!ye(n[0])&&e.isBlock(n[0])},Wt=(e,t,n)=>{let o;const r=t.parentNode;if(!Te(e,t)||!Te(e,n))return;ye(n.lastChild)&&(o=n.lastChild),r===n.lastChild&&Le(r.previousSibling)&&e.remove(r.previousSibling);const s=n.lastChild;s&&Le(s)&&t.hasChildNodes()&&e.remove(s),ke(e,n,!0)&&Y(U(n)),((e,t,n)=>{let o;const r=Qt(e,n)?n.firstChild:n;if(((e,t)=>{Qt(e,t)&&e.remove(t.firstChild,!0)})(e,t),!ke(e,t,!0))for(;o=t.firstChild;)r.appendChild(o)})(e,t,n),o&&n.appendChild(o);const i=((e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)})(U(n),U(t))?e.getParents(t,ye,n):[];e.remove(t),S(i,(t=>{ke(e,t)&&t!==e.getRoot()&&e.remove(t)}))},qt=(e,t)=>{const n=e.dom,o=e.selection,r=o.getStart(),s=ze(e,r),i=n.getParent(o.getStart(),"LI",s);if(i){const r=i.parentElement;if(r===e.getBody()&&ke(n,r))return!0;const l=He(o.getRng()),a=n.getParent(zt(e,l,t,s),"LI",s);if(a&&a!==i)return e.undoManager.transact((()=>{var n,o;t?((e,t,n,o)=>{const r=e.dom;if(r.isEmpty(o))((e,t,n)=>{Y(U(n)),Wt(e.dom,t,n),e.selection.setCursorLocation(n,0)})(e,n,o);else{const s=Et(t);Wt(r,n,o),e.selection.setRng(wt(s))}})(e,l,a,i):(null===(o=(n=i).parentNode)||void 0===o?void 0:o.firstChild)===n?Ot(e):((e,t,n,o)=>{const r=Et(t);Wt(e.dom,n,o);const s=wt(r);e.selection.setRng(s)})(e,l,i,a)})),!0;if(!a&&!t&&0===l.startOffset&&0===l.endOffset)return e.undoManager.transact((()=>{At(e)})),!0}return!1},Zt=e=>{const t=e.selection.getStart(),n=ze(e,t);return e.dom.getParent(t,"LI,DT,DD",n)||Ke(e).length>0},Gt=(e,t)=>{const n=e.selection;return!Xe(e,n.getNode())&&(n.isCollapsed()?((e,t)=>qt(e,t)||((e,t)=>{const n=e.dom,o=e.selection.getStart(),r=ze(e,o),s=n.getParent(o,n.isBlock,r);if(s&&n.isEmpty(s)){const o=He(e.selection.getRng()),i=n.getParent(zt(e,o,t,r),"LI",r);if(i){const l=e=>v(["td","th","caption"],_(e)),a=e=>e.dom===r;return!!((e,t,n=m)=>I(e,t,n).getOr(e.isNone()&&t.isNone()))(Z(U(i),l,a),Z(U(o.startContainer),l,a),$)&&(e.undoManager.transact((()=>{const o=i.parentNode;((e,t,n)=>{const o=e.getParent(t.parentNode,e.isBlock,n);e.remove(t),o&&e.isEmpty(o)&&e.remove(o)})(n,s,r),$t(n,o),e.selection.select(i,!0),e.selection.collapse(t)})),!0)}}return!1})(e,t))(e,t):(e=>!!Zt(e)&&(e.undoManager.transact((()=>{e.execCommand("Delete"),Kt(e.dom,e.getBody())})),!0))(e))},Jt=e=>{const t=k(nt(e).split("")),n=b(t,((e,t)=>{const n=e.toUpperCase().charCodeAt(0)-"A".charCodeAt(0)+1;return Math.pow(26,t)*n}));return L(n,((e,t)=>e+t),0)},Xt=e=>{if(--e<0)return"";{const t=e%26,n=Math.floor(e/26);return Xt(n)+String.fromCharCode("A".charCodeAt(0)+t)}},Yt=e=>{const t=parseInt(e.start,10);return B(e.listStyleType,"upper-alpha")?Xt(t):B(e.listStyleType,"lower-alpha")?Xt(t).toLowerCase():e.start},en=(e,t)=>()=>{const n=je(e);return l(n)&&n.nodeName===t},tn=e=>{e.addCommand("mceListProps",(()=>{(e=>{const t=je(e);Ce(t)&&!Xe(e,t)&&e.windowManager.open({title:"List Properties",body:{type:"panel",items:[{type:"input",name:"start",label:"Start list at number",inputMode:"numeric"}]},initialData:{start:Yt({start:e.dom.getAttrib(t,"start","1"),listStyleType:g.from(e.dom.getStyle(t,"list-style-type"))})},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{(e=>{switch((e=>/^[0-9]+$/.test(e)?2:/^[A-Z]+$/.test(e)?0:/^[a-z]+$/.test(e)?1:e.length>0?4:3)(e)){case 2:return g.some({listStyleType:g.none(),start:e});case 0:return g.some({listStyleType:g.some("upper-alpha"),start:Jt(e).toString()});case 1:return g.some({listStyleType:g.some("lower-alpha"),start:Jt(e).toString()});case 3:return g.some({listStyleType:g.none(),start:""});case 4:return g.none()}})(t.getData().start).each((t=>{e.execCommand("mceListUpdate",!1,{attrs:{start:"1"===t.start?"":t.start},styles:{"list-style-type":t.listStyleType.getOr("")}})})),t.close()}})})(e)}))};var nn=tinymce.util.Tools.resolve("tinymce.html.Node");const on=e=>3===e.type,rn=e=>0===e.length,sn=e=>{const t=(t,n)=>{const o=nn.create("li");S(t,(e=>o.append(e))),n?e.insert(o,n,!0):e.append(o)},n=L(e.children(),((e,n)=>on(n)?[...e,n]:rn(e)||on(n)?e:(t(e,n),[])),[]);rn(n)||t(n)},ln=(e,t)=>n=>(n.setEnabled(e.selection.isEditable()),Ye(e,(o=>{n.setActive(Ge(o.parents,t)),n.setEnabled(!Xe(e,o.element)&&e.selection.isEditable())}))),an=(e,t)=>n=>Ye(e,(o=>n.setEnabled(Ge(o.parents,t)&&!Xe(e,o.element))));e.add("lists",(e=>((e=>{(0,e.options.register)("lists_indent_on_tab",{processor:"boolean",default:!0})})(e),(e=>{e.on("PreInit",(()=>{const{parser:t}=e;t.addNodeFilter("ul,ol",(e=>S(e,sn)))}))})(e),e.hasPlugin("rtc",!0)?tn(e):((e=>{we(e)&&(e=>{e.on("keydown",(t=>{t.keyCode!==oe.TAB||oe.metaKeyPressed(t)||e.undoManager.transact((()=>{(t.shiftKey?Ot(e):Lt(e))&&t.preventDefault()}))}))})(e),(e=>{e.on("ExecCommand",(t=>{const n=t.command.toLowerCase();"delete"!==n&&"forwarddelete"!==n||!Zt(e)||Kt(e.dom,e.getBody())})),e.on("keydown",(t=>{t.keyCode===oe.BACKSPACE?Gt(e,!1)&&t.preventDefault():t.keyCode===oe.DELETE&&Gt(e,!0)&&t.preventDefault()}))})(e)})(e),(e=>{e.on("BeforeExecCommand",(t=>{const n=t.command.toLowerCase();"indent"===n?Lt(e):"outdent"===n&&Ot(e)})),e.addCommand("InsertUnorderedList",((t,n)=>{Ft(e,"UL",n)})),e.addCommand("InsertOrderedList",((t,n)=>{Ft(e,"OL",n)})),e.addCommand("InsertDefinitionList",((t,n)=>{Ft(e,"DL",n)})),e.addCommand("RemoveList",(()=>{At(e)})),tn(e),e.addCommand("mceListUpdate",((t,n)=>{r(n)&&((e,t)=>{const n=je(e);null===n||Xe(e,n)||e.undoManager.transact((()=>{r(t.styles)&&e.dom.setStyles(n,t.styles),r(t.attrs)&&ie(t.attrs,((t,o)=>e.dom.setAttrib(n,o,t)))}))})(e,n)})),e.addQueryStateHandler("InsertUnorderedList",en(e,"UL")),e.addQueryStateHandler("InsertOrderedList",en(e,"OL")),e.addQueryStateHandler("InsertDefinitionList",en(e,"DL"))})(e)),(e=>{const t=t=>()=>e.execCommand(t);e.hasPlugin("advlist")||(e.ui.registry.addToggleButton("numlist",{icon:"ordered-list",active:!1,tooltip:"Numbered list",onAction:t("InsertOrderedList"),onSetup:ln(e,"OL")}),e.ui.registry.addToggleButton("bullist",{icon:"unordered-list",active:!1,tooltip:"Bullet list",onAction:t("InsertUnorderedList"),onSetup:ln(e,"UL")}))})(e),(e=>{const t={text:"List properties...",icon:"ordered-list",onAction:()=>e.execCommand("mceListProps"),onSetup:an(e,"OL")};e.ui.registry.addMenuItem("listprops",t),e.ui.registry.addContextMenu("lists",{update:t=>{const n=je(e,t);return Ce(n)?["listprops"]:[]}})})(e),(e=>({backspaceDelete:t=>{Gt(e,t)}}))(e))))}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var n,o,r,s})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),s=t("array"),i=n("boolean"),l=e=>!(e=>null==e)(e),a=n("function"),d=n("number"),c=()=>{},m=e=>()=>e,u=(e,t)=>e===t,p=e=>t=>!e(t),g=m(!1);class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return l(e)?h.some(e):h.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const f=Array.prototype.slice,y=Array.prototype.indexOf,v=Array.prototype.push,C=(e,t)=>{return n=e,o=t,y.call(n,o)>-1;var n,o},b=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},N=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},S=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},L=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},O=(e,t,n)=>(S(e,((e,o)=>{n=t(n,e,o)})),n),A=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return h.some(r);if(n(r,o))break}return h.none()},T=(e,t)=>A(e,t,g),x=(e,t)=>(e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);v.apply(t,e[n])}return t})(N(e,t)),E=e=>{const t=f.call(e,0);return t.reverse(),t},w=(e,t)=>t>=0&&t<e.length?h.some(e[t]):h.none(),k=e=>w(e,0),D=e=>w(e,e.length-1),B=(e,t)=>{const n=[],o=a(t)?e=>b(n,(n=>t(n,e))):e=>C(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n},M=(e,t,n=u)=>e.exists((e=>n(e,t))),P=(e,t,n)=>e.isSome()&&t.isSome()?h.some(n(e.getOrDie(),t.getOrDie())):h.none(),I=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},R=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return I(n.childNodes[0])},U=(e,t)=>{const n=(t||document).createElement(e);return I(n)},$=I,_=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},H=(e,t)=>e.dom===t.dom,F=_,V="undefined"!=typeof window?window:Function("return this;")(),j=(e,t)=>((e,t)=>{let n=null!=t?t:V;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),K=Object.getPrototypeOf,z=e=>{const t=j("ownerDocument.defaultView",e);return r(e)&&((e=>((e,t)=>{const n=((e,t)=>j(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(K(e).constructor.name))},Q=e=>e.dom.nodeName.toLowerCase(),W=e=>e.dom.nodeType,q=e=>t=>W(t)===e,Z=e=>G(e)&&z(e.dom),G=q(1),J=q(3),X=q(9),Y=q(11),ee=e=>t=>G(t)&&Q(t)===e,te=e=>h.from(e.dom.parentNode).map($),ne=e=>N(e.dom.childNodes,$),oe=(e,t)=>{const n=e.dom.childNodes;return h.from(n[t]).map($)},re=e=>oe(e,0),se=e=>oe(e,e.dom.childNodes.length-1),ie=a(Element.prototype.attachShadow)&&a(Node.prototype.getRootNode)?e=>$(e.dom.getRootNode()):e=>X(e)?e:$(e.dom.ownerDocument),le=e=>$(e.dom.host),ae=e=>{const t=J(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=ie(e);return Y(n=t)&&l(n.dom.host)?h.some(t):h.none();var n})($(t)).fold((()=>n.body.contains(t)),(o=ae,r=le,e=>o(r(e))));var o,r};var de=(e,t,n,o,r)=>e(n,o)?h.some(n):a(r)&&r(n)?h.none():t(n,o,r);const ce=(e,t,n)=>{let o=e.dom;const r=a(n)?n:g;for(;o.parentNode;){o=o.parentNode;const e=$(o);if(t(e))return h.some(e);if(r(e))break}return h.none()},me=(e,t,n)=>de(((e,t)=>t(e)),ce,e,t,n),ue=(e,t,n)=>ce(e,(e=>_(e,t)),n),pe=(e,t)=>{te(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},ge=(e,t)=>{e.dom.appendChild(t.dom)},he=(e,t)=>{S(t,(t=>{ge(e,t)}))},fe=e=>{e.dom.textContent="",S(ne(e),(e=>{ye(e)}))},ye=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)};var ve=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),Ce=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),be=tinymce.util.Tools.resolve("tinymce.util.VK");const Ne=e=>N(e,$),Se=Object.keys,Le=(e,t)=>{const n=Se(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},Oe=(e,t)=>{const n=e.dom;Le(t,((e,t)=>{((e,t,n)=>{if(!(o(n)||i(n)||d(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(n,t,e)}))},Ae=e=>O(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),Te=e=>((e,t)=>$(e.dom.cloneNode(!0)))(e),xe=(e,t)=>{const n=((e,t)=>{const n=U(t),o=Ae(e);return Oe(n,o),n})(e,t);var o,r;r=n,(e=>h.from(e.dom.nextSibling).map($))(o=e).fold((()=>{te(o).each((e=>{ge(e,r)}))}),(e=>{pe(e,r)}));const s=ne(e);return he(n,s),ye(e),n};var Ee=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),we=tinymce.util.Tools.resolve("tinymce.util.Tools");const ke=e=>t=>l(t)&&t.nodeName.toLowerCase()===e,De=e=>t=>l(t)&&e.test(t.nodeName),Be=e=>l(e)&&3===e.nodeType,Me=e=>l(e)&&1===e.nodeType,Pe=De(/^(OL|UL|DL)$/),Ie=De(/^(OL|UL)$/),Re=ke("ol"),Ue=De(/^(LI|DT|DD)$/),$e=De(/^(DT|DD)$/),_e=De(/^(TH|TD)$/),He=ke("br"),Fe=(e,t)=>l(t)&&t.nodeName in e.schema.getTextBlockElements(),Ve=(e,t)=>l(e)&&e.nodeName in t,je=(e,t)=>l(t)&&t.nodeName in e.schema.getVoidElements(),Ke=(e,t,n)=>{const o=e.isEmpty(t);return!(n&&e.select("span[data-mce-type=bookmark]",t).length>0)&&o},ze=(e,t)=>e.isChildOf(t,e.getRoot()),Qe=e=>t=>t.options.get(e),We=Qe("lists_indent_on_tab"),qe=Qe("forced_root_block"),Ze=Qe("forced_root_block_attrs"),Ge=(e,t)=>{const n=e.dom,o=e.schema.getBlockElements(),r=n.createFragment(),s=qe(e),i=Ze(e);let l,a,d=!1;for(a=n.create(s,i),Ve(t.firstChild,o)||r.appendChild(a);l=t.firstChild;){const e=l.nodeName;d||"SPAN"===e&&"bookmark"===l.getAttribute("data-mce-type")||(d=!0),Ve(l,o)?(r.appendChild(l),a=null):(a||(a=n.create(s,i),r.appendChild(a)),a.appendChild(l))}return!d&&a&&a.appendChild(n.create("br",{"data-mce-bogus":"1"})),r},Je=Ee.DOM,Xe=ee("dd"),Ye=ee("dt"),et=(e,t)=>{var n;Xe(t)?xe(t,"dt"):Ye(t)&&(n=t,h.from(n.dom.parentElement).map($)).each((n=>((e,t,n)=>{const o=Je.select('span[data-mce-type="bookmark"]',t),r=Ge(e,n),s=Je.createRng();s.setStartAfter(n),s.setEndAfter(t);const i=s.extractContents();for(let t=i.firstChild;t;t=t.firstChild)if("LI"===t.nodeName&&e.dom.isEmpty(t)){Je.remove(t);break}e.dom.isEmpty(i)||Je.insertAfter(i,t),Je.insertAfter(r,t);const l=n.parentElement;l&&Ke(e.dom,l)&&(e=>{const t=e.parentNode;t&&we.each(o,(e=>{t.insertBefore(e,n.parentNode)})),Je.remove(e)})(l),Je.remove(n),Ke(e.dom,t)&&Je.remove(t)})(e,n.dom,t.dom)))},tt=e=>{Ye(e)&&xe(e,"dd")},nt=(e,t)=>{if(Be(e))return{container:e,offset:t};const n=ve.getNode(e,t);return Be(n)?{container:n,offset:t>=e.childNodes.length?n.data.length:0}:n.previousSibling&&Be(n.previousSibling)?{container:n.previousSibling,offset:n.previousSibling.data.length}:n.nextSibling&&Be(n.nextSibling)?{container:n.nextSibling,offset:0}:{container:e,offset:t}},ot=e=>{const t=e.cloneRange(),n=nt(e.startContainer,e.startOffset);t.setStart(n.container,n.offset);const o=nt(e.endContainer,e.endOffset);return t.setEnd(o.container,o.offset),t},rt=["OL","UL","DL"],st=rt.join(","),it=(e,t)=>{const n=t||e.selection.getStart(!0);return e.dom.getParent(n,st,dt(e,n))},lt=e=>{const t=e.selection.getSelectedBlocks();return L(((e,t)=>{const n=we.map(t,(t=>e.dom.getParent(t,"li,dd,dt",dt(e,t))||t));return B(n)})(e,t),Ue)},at=(e,t)=>{const n=e.dom.getParents(t,"TD,TH");return n.length>0?n[0]:e.getBody()},dt=(e,t)=>{const n=e.dom.getParents(t,e.dom.isBlock),o=T(n,(t=>{return n=e.schema,!Pe(o=t)&&!Ue(o)&&b(rt,(e=>n.isValidChild(o.nodeName,e)));var n,o}));return o.getOr(e.getBody())},ct=(e,t)=>{const n=e.dom.getParents(t,"ol,ul",dt(e,t));return D(n)},mt=(e,t)=>{const n=N(t,(t=>ct(e,t).getOr(t)));return B(n)},ut=e=>/\btox\-/.test(e.className),pt=(e,t)=>A(e,Pe,_e).exists((e=>e.nodeName===t&&!ut(e))),gt=(e,t)=>null!==t&&!e.dom.isEditable(t),ht=(e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return gt(e,n)},ft=(e,t)=>{const n=e.selection.getNode();return t({parents:e.dom.getParents(n),element:n}),e.on("NodeChange",t),()=>e.off("NodeChange",t)},yt=(e,t)=>{const n=(t||document).createDocumentFragment();return S(e,(e=>{n.appendChild(e.dom)})),$(n)},vt=(e,t,n)=>e.dispatch("ListMutation",{action:t,element:n}),Ct=(bt=/^\s+|\s+$/g,e=>e.replace(bt,""));var bt;const Nt=(e,t,n)=>{((e,t,n)=>{if(!o(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);(e=>void 0!==e.style&&a(e.style.getPropertyValue))(e)&&e.style.setProperty(t,n)})(e.dom,t,n)},St=e=>F(e,"OL,UL"),Lt=e=>re(e).exists(St),Ot=e=>"listAttributes"in e,At=e=>"isComment"in e,Tt=e=>e.depth>0,xt=e=>e.isSelected,Et=e=>{const t=ne(e),n=se(e).exists(St)?t.slice(0,-1):t;return N(n,Te)},wt=(e,t)=>{ge(e.item,t.list)},kt=(e,t)=>{const n={list:U(t,e),item:U("li",e)};return ge(n.list,n.item),n},Dt=(e,t,n)=>{const o=t.slice(0,n.depth);return D(o).each((t=>{if(Ot(n)){const o=((e,t,n)=>{const o=U("li",e);return Oe(o,t),he(o,n),o})(e,n.itemAttributes,n.content);((e,t)=>{ge(e.list,t),e.item=t})(t,o),((e,t)=>{Q(e.list)!==t.listType&&(e.list=xe(e.list,t.listType)),Oe(e.list,t.listAttributes)})(t,n)}else if((e=>"isFragment"in e)(n))he(t.item,n.content);else{const e=R(`\x3c!--${n.content}--\x3e`);ge(t.list,e)}})),o},Bt=(e,t)=>{let n=h.none();const o=O(t,((t,o,r)=>At(o)?0===r?(n=h.some(o),t):Dt(e,t,o):o.depth>t.length?((e,t,n)=>{const o=((e,t,n)=>{const o=[];for(let r=0;r<n;r++)o.push(kt(e,Ot(t)?t.listType:t.parentListType));return o})(e,n,n.depth-t.length);var r;return(e=>{for(let t=1;t<e.length;t++)wt(e[t-1],e[t])})(o),((e,t)=>{for(let t=0;t<e.length-1;t++)Nt(e[t].item,"list-style-type","none");D(e).each((e=>{Ot(t)&&(Oe(e.list,t.listAttributes),Oe(e.item,t.itemAttributes)),he(e.item,t.content)}))})(o,n),r=o,P(D(t),k(r),wt),t.concat(o)})(e,t,o):Dt(e,t,o)),[]);return n.each((e=>{const t=R(`\x3c!--${e.content}--\x3e`);k(o).each((e=>{((e,t)=>{re(e).fold((()=>{ge(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))})(e.list,t)}))})),k(o).map((e=>e.list))},Mt=e=>(S(e,((t,n)=>{((e,t)=>{const n=e[t].depth,o=e=>e.depth===n&&!e.dirty,r=e=>e.depth<n;return A(E(e.slice(0,t)),o,r).orThunk((()=>A(e.slice(t+1),o,r)))})(e,n).fold((()=>{t.dirty&&Ot(t)&&(e=>{e.listAttributes=((e,t)=>{const n={};var o;return((e,t,n,o)=>{Le(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,t,(o=n,(e,t)=>{o[t]=e}),c),n})(e.listAttributes,((e,t)=>"start"!==t))})(t)}),(e=>{return o=e,void(Ot(n=t)&&Ot(o)&&(n.listType=o.listType,n.listAttributes={...o.listAttributes}));var n,o}))})),e),Pt=(e,t,n,o)=>{var r,s;if(8===W(s=o)||"#comment"===Q(s))return[{depth:e+1,content:null!==(r=o.dom.nodeValue)&&void 0!==r?r:"",dirty:!1,isSelected:!1,isComment:!0}];t.each((e=>{H(e.start,o)&&n.set(!0)}));const i=((e,t,n)=>te(e).filter(G).map((o=>({depth:t,dirty:!1,isSelected:n,content:Et(e),itemAttributes:Ae(e),listAttributes:Ae(o),listType:Q(o),isInPreviousLi:!1}))))(o,e,n.get());t.each((e=>{H(e.end,o)&&n.set(!1)}));const l=se(o).filter(St).map((o=>Rt(e,t,n,o))).getOr([]);return i.toArray().concat(l)},It=(e,t,n,o)=>re(o).filter(St).fold((()=>Pt(e,t,n,o)),(r=>{const s=O(ne(o),((o,s,i)=>{if(0===i)return o;if(F(s,"LI"))return o.concat(Pt(e,t,n,s));{const t={isFragment:!0,depth:e,content:[s],isSelected:!1,dirty:!1,parentListType:Q(r)};return o.concat(t)}}),[]);return Rt(e,t,n,r).concat(s)})),Rt=(e,t,n,o)=>x(ne(o),(o=>(St(o)?Rt:It)(e+1,t,n,o))),Ut=(e,t,n)=>{const o=((e,t)=>{const n=(e=>{let t=!1;return{get:()=>t,set:e=>{t=e}}})();return N(e,(e=>({sourceList:e,entries:Rt(0,t,n,e)})))})(t,(e=>{const t=N(lt(e),$);return P(T(t,p(Lt)),T(E(t),p(Lt)),((e,t)=>({start:e,end:t})))})(e));S(o,(t=>{((e,t)=>{S(L(e,xt),(e=>((e,t)=>{switch(e){case"Indent":t.depth++;break;case"Outdent":t.depth--;break;case"Flatten":t.depth=0}t.dirty=!0})(t,e)))})(t.entries,n);const o=((e,t)=>x(((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const o=[];let r=[];for(let s=0,i=e.length;s<i;s++){const i=e[s],l=t(i);l!==n&&(o.push(r),r=[]),n=l,r.push(i)}return 0!==r.length&&o.push(r),o}})(t,Tt),(t=>k(t).exists(Tt)?((e,t)=>{const n=Mt(t);return Bt(e.contentDocument,n).toArray()})(e,t):((e,t)=>{const n=Mt(t);return N(n,(t=>{const n=At(t)?yt([R(`\x3c!--${t.content}--\x3e`)]):yt(t.content);return $(Ge(e,n.dom))}))})(e,t))))(e,t.entries);var r;S(o,(t=>{vt(e,"Indent"===n?"IndentList":"OutdentList",t.dom)})),r=t.sourceList,S(o,(e=>{pe(r,e)})),ye(t.sourceList)}))},$t=(e,t)=>{const n=Ne((e=>{const t=(e=>{const t=ct(e,e.selection.getStart()),n=L(e.selection.getSelectedBlocks(),Ie);return t.toArray().concat(n)})(e),n=(e=>{const t=e.selection.getStart();return e.dom.getParents(t,"ol,ul",dt(e,t))})(e);return T(n,(e=>{return t=$(e),te(t).exists((e=>Ue(e.dom)&&re(e).exists((e=>!Pe(e.dom)))&&se(e).exists((e=>!Pe(e.dom)))));var t})).fold((()=>mt(e,t)),(e=>[e]))})(e)),o=Ne((e=>L(lt(e),$e))(e));let r=!1;if(n.length||o.length){const s=e.selection.getBookmark();Ut(e,n,t),((e,t,n)=>{S(n,"Indent"===t?tt:t=>et(e,t))})(e,t,o),e.selection.moveToBookmark(s),e.selection.setRng(ot(e.selection.getRng())),e.nodeChanged(),r=!0}return r},_t=(e,t)=>!(e=>{const t=it(e);return gt(e,t)})(e)&&$t(e,t),Ht=e=>_t(e,"Indent"),Ft=e=>_t(e,"Outdent"),Vt=e=>_t(e,"Flatten"),jt=e=>"\ufeff"===e;var Kt=tinymce.util.Tools.resolve("tinymce.dom.BookmarkManager");const zt=Ee.DOM,Qt=e=>{const t={},n=n=>{let o=e[n?"startContainer":"endContainer"],r=e[n?"startOffset":"endOffset"];if(Me(o)){const e=zt.create("span",{"data-mce-type":"bookmark"});o.hasChildNodes()?(r=Math.min(r,o.childNodes.length-1),n?o.insertBefore(e,o.childNodes[r]):zt.insertAfter(e,o.childNodes[r])):o.appendChild(e),o=e,r=0}t[n?"startContainer":"endContainer"]=o,t[n?"startOffset":"endOffset"]=r};return n(!0),e.collapsed||n(),t},Wt=e=>{const t=t=>{let n=e[t?"startContainer":"endContainer"],o=e[t?"startOffset":"endOffset"];if(n){if(Me(n)&&n.parentNode){const e=n;o=(e=>{var t;let n=null===(t=e.parentNode)||void 0===t?void 0:t.firstChild,o=0;for(;n;){if(n===e)return o;Me(n)&&"bookmark"===n.getAttribute("data-mce-type")||o++,n=n.nextSibling}return-1})(n),n=n.parentNode,zt.remove(e),!n.hasChildNodes()&&zt.isBlock(n)&&n.appendChild(zt.create("br"))}e[t?"startContainer":"endContainer"]=n,e[t?"startOffset":"endOffset"]=o}};t(!0),t();const n=zt.createRng();return n.setStart(e.startContainer,e.startOffset),e.endContainer&&n.setEnd(e.endContainer,e.endOffset),ot(n)},qt=e=>{switch(e){case"UL":return"ToggleUlList";case"OL":return"ToggleOlList";case"DL":return"ToggleDLList"}},Zt=(e,t)=>{we.each(t,((t,n)=>{e.setAttribute(n,t)}))},Gt=(e,t,n)=>{((e,t,n)=>{const o=n["list-style-type"]?n["list-style-type"]:null;e.setStyle(t,"list-style-type",o)})(e,t,n),((e,t,n)=>{Zt(t,n["list-attributes"]),we.each(e.select("li",t),(e=>{Zt(e,n["list-item-attributes"])}))})(e,t,n)},Jt=(e,t)=>l(t)&&!Ve(t,e.schema.getBlockElements()),Xt=(e,t,n,o)=>{let r=t[n?"startContainer":"endContainer"];const s=t[n?"startOffset":"endOffset"];Me(r)&&(r=r.childNodes[Math.min(s,r.childNodes.length-1)]||r),!n&&He(r.nextSibling)&&(r=r.nextSibling);const i=(t,n)=>{var r;const s=new Ce(t,(t=>{for(;!e.dom.isBlock(t)&&t.parentNode&&o!==t;)t=t.parentNode;return t})(t)),i=n?"next":"prev";let l;for(;l=s[i]();)if(!je(e,l)&&!jt(l.textContent)&&0!==(null===(r=l.textContent)||void 0===r?void 0:r.length))return h.some(l);return h.none()};if(n&&Be(r))if(jt(r.textContent))r=i(r,!1).getOr(r);else for(null!==r.parentNode&&Jt(e,r.parentNode)&&(r=r.parentNode);null!==r.previousSibling&&(Jt(e,r.previousSibling)||Be(r.previousSibling));)r=r.previousSibling;if(!n&&Be(r))if(jt(r.textContent))r=i(r,!0).getOr(r);else for(null!==r.parentNode&&Jt(e,r.parentNode)&&(r=r.parentNode);null!==r.nextSibling&&(Jt(e,r.nextSibling)||Be(r.nextSibling));)r=r.nextSibling;for(;r.parentNode!==o;){const t=r.parentNode;if(Fe(e,r))return r;if(/^(TD|TH)$/.test(t.nodeName))return r;r=t}return r},Yt=(e,t,n)=>{const o=e.selection.getRng();let r="LI";const s=dt(e,((e,t)=>{const n=e.selection.getStart(!0),o=Xt(e,t,!0,e.getBody());return r=$(o),s=$(t.commonAncestorContainer),i=r,l=function(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}(H,s),ce(i,l,void 0).isSome()?t.commonAncestorContainer:n;var r,s,i,l})(e,o)),i=e.dom;if("false"===i.getContentEditable(e.selection.getNode()))return;"DL"===(t=t.toUpperCase())&&(r="DT");const l=Qt(o),a=L(((e,t,n)=>{const o=[],r=e.dom,s=Xt(e,t,!0,n),i=Xt(e,t,!1,n);let l;const a=[];for(let e=s;e&&(a.push(e),e!==i);e=e.nextSibling);return we.each(a,(t=>{var s;if(Fe(e,t))return o.push(t),void(l=null);if(r.isBlock(t)||He(t))return He(t)&&r.remove(t),void(l=null);const i=t.nextSibling;Kt.isBookmarkNode(t)&&(Pe(i)||Fe(e,i)||!i&&t.parentNode===n)?l=null:(l||(l=r.create("p"),null===(s=t.parentNode)||void 0===s||s.insertBefore(l,t),o.push(l)),l.appendChild(t))})),o})(e,o,s),e.dom.isEditable);we.each(a,(o=>{let s;const l=o.previousSibling,a=o.parentNode;Ue(a)||(l&&Pe(l)&&l.nodeName===t&&((e,t,n)=>{const o=e.getStyle(t,"list-style-type");let r=n?n["list-style-type"]:"";return r=null===r?"":r,o===r})(i,l,n)?(s=l,o=i.rename(o,r),l.appendChild(o)):(s=i.create(t),a.insertBefore(s,o),s.appendChild(o),o=i.rename(o,r)),((e,t,n)=>{we.each(["margin","margin-right","margin-bottom","margin-left","margin-top","padding","padding-right","padding-bottom","padding-left","padding-top"],(n=>e.setStyle(t,n,"")))})(i,o),Gt(i,s,n),tn(e.dom,s))})),e.selection.setRng(Wt(l))},en=(e,t,n)=>{return((e,t)=>Pe(e)&&e.nodeName===(null==t?void 0:t.nodeName))(t,n)&&((e,t,n)=>e.getStyle(t,"list-style-type",!0)===e.getStyle(n,"list-style-type",!0))(e,t,n)&&(o=n,t.className===o.className);var o},tn=(e,t)=>{let n,o=t.nextSibling;if(en(e,t,o)){const r=o;for(;n=r.firstChild;)t.appendChild(n);e.remove(r)}if(o=t.previousSibling,en(e,t,o)){const r=o;for(;n=r.lastChild;)t.insertBefore(n,t.firstChild);e.remove(r)}},nn=(e,t,n,o)=>{if(t.nodeName!==n){const r=e.dom.rename(t,n);Gt(e.dom,r,o),vt(e,qt(n),r)}else Gt(e.dom,t,o),vt(e,qt(n),t)},on=(e,t,n,o)=>{if(t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),t.nodeName!==n){const r=e.dom.rename(t,n);Gt(e.dom,r,o),vt(e,qt(n),r)}else Gt(e.dom,t,o),vt(e,qt(n),t)},rn=e=>"list-style-type"in e,sn=(e,t,n)=>{const o=it(e);if(ht(e,o))return;const s=(e=>{const t=it(e),n=e.selection.getSelectedBlocks();return((e,t)=>l(e)&&1===t.length&&t[0]===e)(t,n)?(e=>L(e.querySelectorAll(st),Pe))(t):L(n,(e=>Pe(e)&&t!==e))})(e),i=r(n)?n:{};s.length>0?((e,t,n,o,r)=>{const s=Pe(t);if(!s||t.nodeName!==o||rn(r)||ut(t)){Yt(e,o,r);const i=Qt(e.selection.getRng()),l=s?[t,...n]:n,a=s&&ut(t)?on:nn;we.each(l,(t=>{a(e,t,o,r)})),e.selection.setRng(Wt(i))}else Vt(e)})(e,o,s,t,i):((e,t,n,o)=>{if(t!==e.getBody())if(t)if(t.nodeName!==n||rn(o)||ut(t)){const r=Qt(e.selection.getRng());ut(t)&&t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),Gt(e.dom,t,o);const s=e.dom.rename(t,n);tn(e.dom,s),e.selection.setRng(Wt(r)),Yt(e,n,o),vt(e,qt(n),s)}else Vt(e);else Yt(e,n,o),vt(e,qt(n),t)})(e,o,t,i)},ln=Ee.DOM,an=(e,t)=>{const n=we.grep(e.select("ol,ul",t));we.each(n,(t=>{((e,t)=>{const n=t.parentElement;if(n&&"LI"===n.nodeName&&n.firstChild===t){const o=n.previousSibling;o&&"LI"===o.nodeName?(o.appendChild(t),Ke(e,n)&&ln.remove(n)):ln.setStyle(n,"listStyleType","none")}if(Pe(n)){const e=n.previousSibling;e&&"LI"===e.nodeName&&e.appendChild(t)}})(e,t)}))},dn=(e,t,n,o)=>{let r=t.startContainer;const s=t.startOffset;if(Be(r)&&(n?s<r.data.length:s>0))return r;const i=e.schema.getNonEmptyElements();Me(r)&&(r=ve.getNode(r,s));const l=new Ce(r,o);n&&((e,t)=>!!He(t)&&e.isBlock(t.nextSibling)&&!He(t.previousSibling))(e.dom,r)&&l.next();const a=n?l.next.bind(l):l.prev2.bind(l);for(;r=a();){if("LI"===r.nodeName&&!r.hasChildNodes())return r;if(i[r.nodeName])return r;if(Be(r)&&r.data.length>0)return r}return null},cn=(e,t)=>{const n=t.childNodes;return 1===n.length&&!Pe(n[0])&&e.isBlock(n[0])},mn=e=>h.from(e).map($).filter(Z).exists((e=>((e,t=!1)=>{return ae(e)?e.dom.isContentEditable:(n=e,de(((e,t)=>_(e,t)),ue,n,"[contenteditable]",void 0)).fold(m(t),(e=>"true"===(e=>e.dom.contentEditable)(e)));var n})(e)&&!C(["details"],Q(e)))),un=(e,t,n)=>{let o;const r=cn(e,n)?n.firstChild:n;if(((e,t)=>{cn(e,t)&&mn(t.firstChild)&&e.remove(t.firstChild,!0)})(e,t),!Ke(e,t,!0))for(;o=t.firstChild;)r.appendChild(o)},pn=(e,t,n)=>{let o;const r=t.parentNode;if(!ze(e,t)||!ze(e,n))return;Pe(n.lastChild)&&(o=n.lastChild),r===n.lastChild&&He(r.previousSibling)&&e.remove(r.previousSibling);const s=n.lastChild;s&&He(s)&&t.hasChildNodes()&&e.remove(s),Ke(e,n,!0)&&fe($(n)),un(e,t,n),o&&n.appendChild(o);const i=((e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)})($(n),$(t))?e.getParents(t,Pe,n):[];e.remove(t),S(i,(t=>{Ke(e,t)&&t!==e.getRoot()&&e.remove(t)}))},gn=(e,t)=>{const n=e.dom,o=e.selection,r=o.getStart(),s=at(e,r),i=n.getParent(o.getStart(),"LI",s);if(i){const r=i.parentElement;if(r===e.getBody()&&Ke(n,r))return!0;const l=ot(o.getRng()),a=n.getParent(dn(e,l,t,s),"LI",s),d=a&&(t?n.isChildOf(i,a):n.isChildOf(a,i));if(a&&a!==i&&!d)return e.undoManager.transact((()=>{var n,o;t?((e,t,n,o)=>{const r=e.dom;if(r.isEmpty(o))((e,t,n)=>{fe($(n)),pn(e.dom,t,n),e.selection.setCursorLocation(n,0)})(e,n,o);else{const s=Qt(t);pn(r,n,o),e.selection.setRng(Wt(s))}})(e,l,a,i):(null===(o=(n=i).parentNode)||void 0===o?void 0:o.firstChild)===n?Ft(e):((e,t,n,o)=>{const r=Qt(t);pn(e.dom,n,o);const s=Wt(r);e.selection.setRng(s)})(e,l,i,a)})),!0;if(d&&!t&&a!==i)return e.undoManager.transact((()=>{if(l.commonAncestorContainer.parentElement){const t=Qt(l),o=l.commonAncestorContainer.parentElement;un(n,l.commonAncestorContainer.parentElement,a),o.remove();const r=Wt(t);e.selection.setRng(r)}})),!0;if(!a&&!t&&0===l.startOffset&&0===l.endOffset)return e.undoManager.transact((()=>{Vt(e)})),!0}return!1},hn=e=>{const t=e.selection.getStart(),n=at(e,t);return e.dom.getParent(t,"LI,DT,DD",n)||lt(e).length>0},fn=(e,t)=>{const n=e.selection;return!ht(e,n.getNode())&&(n.isCollapsed()?((e,t)=>gn(e,t)||((e,t)=>{const n=e.dom,o=e.selection.getStart(),r=at(e,o),s=n.getParent(o,n.isBlock,r);if(s&&n.isEmpty(s)){const o=ot(e.selection.getRng()),i=n.getParent(dn(e,o,t,r),"LI",r);if(i){const l=e=>C(["td","th","caption"],Q(e)),a=e=>e.dom===r;return!!((e,t,n=u)=>P(e,t,n).getOr(e.isNone()&&t.isNone()))(me($(i),l,a),me($(o.startContainer),l,a),H)&&(e.undoManager.transact((()=>{const o=i.parentNode;((e,t,n)=>{const o=e.getParent(t.parentNode,e.isBlock,n);e.remove(t),o&&e.isEmpty(o)&&e.remove(o)})(n,s,r),tn(n,o),e.selection.select(i,!0),e.selection.collapse(t)})),!0)}}return!1})(e,t))(e,t):(e=>!!hn(e)&&(e.undoManager.transact((()=>{e.execCommand("Delete"),an(e.dom,e.getBody())})),!0))(e))},yn=e=>{const t=E(Ct(e).split("")),n=N(t,((e,t)=>{const n=e.toUpperCase().charCodeAt(0)-"A".charCodeAt(0)+1;return Math.pow(26,t)*n}));return O(n,((e,t)=>e+t),0)},vn=e=>{if(--e<0)return"";{const t=e%26,n=Math.floor(e/26);return vn(n)+String.fromCharCode("A".charCodeAt(0)+t)}},Cn=e=>{const t=parseInt(e.start,10);return M(e.listStyleType,"upper-alpha")?vn(t):M(e.listStyleType,"lower-alpha")?vn(t).toLowerCase():e.start},bn=(e,t)=>()=>{const n=it(e);return l(n)&&n.nodeName===t},Nn=e=>{e.addCommand("mceListProps",(()=>{(e=>{const t=it(e);Re(t)&&!ht(e,t)&&e.windowManager.open({title:"List Properties",body:{type:"panel",items:[{type:"input",name:"start",label:"Start list at number",inputMode:"numeric"}]},initialData:{start:Cn({start:e.dom.getAttrib(t,"start","1"),listStyleType:h.from(e.dom.getStyle(t,"list-style-type"))})},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{(e=>{switch((e=>/^[0-9]+$/.test(e)?2:/^[A-Z]+$/.test(e)?0:/^[a-z]+$/.test(e)?1:e.length>0?4:3)(e)){case 2:return h.some({listStyleType:h.none(),start:e});case 0:return h.some({listStyleType:h.some("upper-alpha"),start:yn(e).toString()});case 1:return h.some({listStyleType:h.some("lower-alpha"),start:yn(e).toString()});case 3:return h.some({listStyleType:h.none(),start:""});case 4:return h.none()}})(t.getData().start).each((t=>{e.execCommand("mceListUpdate",!1,{attrs:{start:"1"===t.start?"":t.start},styles:{"list-style-type":t.listStyleType.getOr("")}})})),t.close()}})})(e)}))};var Sn=tinymce.util.Tools.resolve("tinymce.html.Node");const Ln=e=>3===e.type,On=e=>0===e.length,An=e=>{const t=(t,n)=>{const o=Sn.create("li");S(t,(e=>o.append(e))),n?e.insert(o,n,!0):e.append(o)},n=O(e.children(),((e,n)=>Ln(n)?[...e,n]:On(e)||Ln(n)?e:(t(e,n),[])),[]);On(n)||t(n)},Tn=(e,t)=>n=>(n.setEnabled(e.selection.isEditable()),ft(e,(o=>{n.setActive(pt(o.parents,t)),n.setEnabled(!ht(e,o.element)&&e.selection.isEditable())}))),xn=(e,t)=>n=>ft(e,(o=>n.setEnabled(pt(o.parents,t)&&!ht(e,o.element))));e.add("lists",(e=>((e=>{(0,e.options.register)("lists_indent_on_tab",{processor:"boolean",default:!0})})(e),(e=>{e.on("PreInit",(()=>{const{parser:t}=e;t.addNodeFilter("ul,ol",(e=>S(e,An)))}))})(e),e.hasPlugin("rtc",!0)?Nn(e):((e=>{We(e)&&(e=>{e.on("keydown",(t=>{t.keyCode!==be.TAB||be.metaKeyPressed(t)||e.undoManager.transact((()=>{(t.shiftKey?Ft(e):Ht(e))&&t.preventDefault()}))}))})(e),(e=>{e.on("ExecCommand",(t=>{const n=t.command.toLowerCase();"delete"!==n&&"forwarddelete"!==n||!hn(e)||an(e.dom,e.getBody())})),e.on("keydown",(t=>{t.keyCode===be.BACKSPACE?fn(e,!1)&&t.preventDefault():t.keyCode===be.DELETE&&fn(e,!0)&&t.preventDefault()}))})(e)})(e),(e=>{e.on("BeforeExecCommand",(t=>{const n=t.command.toLowerCase();"indent"===n?Ht(e):"outdent"===n&&Ft(e)})),e.addCommand("InsertUnorderedList",((t,n)=>{sn(e,"UL",n)})),e.addCommand("InsertOrderedList",((t,n)=>{sn(e,"OL",n)})),e.addCommand("InsertDefinitionList",((t,n)=>{sn(e,"DL",n)})),e.addCommand("RemoveList",(()=>{Vt(e)})),Nn(e),e.addCommand("mceListUpdate",((t,n)=>{r(n)&&((e,t)=>{const n=it(e);null===n||ht(e,n)||e.undoManager.transact((()=>{r(t.styles)&&e.dom.setStyles(n,t.styles),r(t.attrs)&&Le(t.attrs,((t,o)=>e.dom.setAttrib(n,o,t)))}))})(e,n)})),e.addQueryStateHandler("InsertUnorderedList",bn(e,"UL")),e.addQueryStateHandler("InsertOrderedList",bn(e,"OL")),e.addQueryStateHandler("InsertDefinitionList",bn(e,"DL"))})(e)),(e=>{const t=t=>()=>e.execCommand(t);e.hasPlugin("advlist")||(e.ui.registry.addToggleButton("numlist",{icon:"ordered-list",active:!1,tooltip:"Numbered list",onAction:t("InsertOrderedList"),onSetup:Tn(e,"OL")}),e.ui.registry.addToggleButton("bullist",{icon:"unordered-list",active:!1,tooltip:"Bullet list",onAction:t("InsertUnorderedList"),onSetup:Tn(e,"UL")}))})(e),(e=>{const t={text:"List properties...",icon:"ordered-list",onAction:()=>e.execCommand("mceListProps"),onSetup:xn(e,"OL")};e.ui.registry.addMenuItem("listprops",t),e.ui.registry.addContextMenu("lists",{update:t=>{const n=it(e,t);return Re(n)?["listprops"]:[]}})})(e),(e=>({backspaceDelete:t=>{fn(e,t)}}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/media/plugin.min.js b/public/libs/tinymce/plugins/media/plugin.min.js
index f9b72e957e8..498cefafcf1 100644
--- a/public/libs/tinymce/plugins/media/plugin.min.js
+++ b/public/libs/tinymce/plugins/media/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(r=o=e,(a=String).prototype.isPrototypeOf(r)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===a.name)?"string":t;var r,o,a,s})(t)===e,r=t("string"),o=t("object"),a=t("array"),s=e=>!(e=>null==e)(e);class i{constructor(e,t){this.tag=e,this.value=t}static some(e){return new i(!0,e)}static none(){return i.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?i.some(e(this.value)):i.none()}bind(e){return this.tag?e(this.value):i.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:i.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?i.some(e):i.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}i.singletonNone=new i(!1);const n=Array.prototype.push,l=(e,t)=>{for(let r=0,o=e.length;r<o;r++)t(e[r],r)},c=e=>{const t=[];for(let r=0,o=e.length;r<o;++r){if(!a(e[r]))throw new Error("Arr.flatten item "+r+" was not an array, input: "+e);n.apply(t,e[r])}return t},m=Object.keys,u=Object.hasOwnProperty,d=(e,t)=>h(e,t)?i.from(e[t]):i.none(),h=(e,t)=>u.call(e,t),p=e=>t=>t.options.get(e),g=p("audio_template_callback"),b=p("video_template_callback"),w=p("iframe_template_callback"),v=p("media_live_embeds"),f=p("media_filter_html"),y=p("media_url_resolver"),x=p("media_alt_source"),_=p("media_poster"),k=p("media_dimensions");var j=tinymce.util.Tools.resolve("tinymce.util.Tools"),O=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),A=tinymce.util.Tools.resolve("tinymce.html.DomParser");const S=O.DOM,$=e=>e.replace(/px$/,""),C=e=>{const t=e.attr("style"),r=t?S.parseStyle(t):{};return{type:"ephox-embed-iri",source:e.attr("data-ephox-embed-iri"),altsource:"",poster:"",width:d(r,"max-width").map($).getOr(""),height:d(r,"max-height").map($).getOr("")}},T=(e,t)=>{let r={};for(let o=A({validate:!1,forced_root_block:!1},t).parse(e);o;o=o.walk())if(1===o.type){const e=o.name;if(o.attr("data-ephox-embed-iri")){r=C(o);break}r.source||"param"!==e||(r.source=o.attr("movie")),"iframe"!==e&&"object"!==e&&"embed"!==e&&"video"!==e&&"audio"!==e||(r.type||(r.type=e),r=j.extend(o.attributes.map,r)),"source"===e&&(r.source?r.altsource||(r.altsource=o.attr("src")):r.source=o.attr("src")),"img"!==e||r.poster||(r.poster=o.attr("src"))}return r.source=r.source||r.src||"",r.altsource=r.altsource||"",r.poster=r.poster||"",r},z=e=>{var t;const r=null!==(t=e.toLowerCase().split(".").pop())&&void 0!==t?t:"";return d({mp3:"audio/mpeg",m4a:"audio/x-m4a",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"},r).getOr("")};var D=tinymce.util.Tools.resolve("tinymce.html.Node"),F=tinymce.util.Tools.resolve("tinymce.html.Serializer");const M=(e,t={})=>A({forced_root_block:!1,validate:!1,allow_conditional_comments:!0,...t},e),N=O.DOM,R=e=>/^[0-9.]+$/.test(e)?e+"px":e,E=(e,t)=>{const r=t.attr("style"),o=r?N.parseStyle(r):{};s(e.width)&&(o["max-width"]=R(e.width)),s(e.height)&&(o["max-height"]=R(e.height)),t.attr("style",N.serializeStyle(o))},U=["source","altsource"],P=(e,t,r,o)=>{let a=0,s=0;const i=M(o);i.addNodeFilter("source",(e=>a=e.length));const n=i.parse(e);for(let e=n;e;e=e.walk())if(1===e.type){const o=e.name;if(e.attr("data-ephox-embed-iri")){E(t,e);break}switch(o){case"video":case"object":case"embed":case"img":case"iframe":void 0!==t.height&&void 0!==t.width&&(e.attr("width",t.width),e.attr("height",t.height))}if(r)switch(o){case"video":e.attr("poster",t.poster),e.attr("src",null);for(let r=a;r<2;r++)if(t[U[r]]){const o=new D("source",1);o.attr("src",t[U[r]]),o.attr("type",t[U[r]+"mime"]||null),e.append(o)}break;case"iframe":e.attr("src",t.source);break;case"object":const r=e.getAll("img").length>0;if(t.poster&&!r){e.attr("src",t.poster);const r=new D("img",1);r.attr("src",t.poster),r.attr("width",t.width),r.attr("height",t.height),e.append(r)}break;case"source":if(s<2&&(e.attr("src",t[U[s]]),e.attr("type",t[U[s]+"mime"]||null),!t[U[s]])){e.remove();continue}s++;break;case"img":t.poster||e.remove()}}return F({},o).serialize(n)},L=[{regex:/youtu\.be\/([\w\-_\?&=.]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$2?$4",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?h=$2&title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?h=$3&title=0&amp;byline=0",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?title=0&amp;byline=0",allowFullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0},{regex:/dai\.ly\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0}],I=(e,t)=>{const r=(e=>{const t=e.match(/^(https?:\/\/|www\.)(.+)$/i);return t&&t.length>1?"www."===t[1]?"https://":t[1]:"https://"})(t),o=e.regex.exec(t);let a=r+e.url;if(s(o))for(let e=0;e<o.length;e++)a=a.replace("$"+e,(()=>o[e]?o[e]:""));return a.replace(/\?$/,"")},B=e=>{const t=L.filter((t=>t.regex.test(e)));return t.length>0?j.extend({},t[0],{url:I(t[0],e)}):null},G=(e,t)=>{var r;const o=j.extend({},t);if(!o.source&&(j.extend(o,T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema)),!o.source))return"";o.altsource||(o.altsource=""),o.poster||(o.poster=""),o.source=e.convertURL(o.source,"source"),o.altsource=e.convertURL(o.altsource,"source"),o.sourcemime=z(o.source),o.altsourcemime=z(o.altsource),o.poster=e.convertURL(o.poster,"poster");const a=B(o.source);if(a&&(o.source=a.url,o.type=a.type,o.allowfullscreen=a.allowFullscreen,o.width=o.width||String(a.w),o.height=o.height||String(a.h)),o.embed)return P(o.embed,o,!0,e.schema);{const t=g(e),r=b(e),a=w(e);return o.width=o.width||"300",o.height=o.height||"150",j.each(o,((t,r)=>{o[r]=e.dom.encode(""+t)})),"iframe"===o.type?((e,t)=>{if(t)return t(e);{const t=e.allowfullscreen?' allowFullscreen="1"':"";return'<iframe src="'+e.source+'" width="'+e.width+'" height="'+e.height+'"'+t+"></iframe>"}})(o,a):"application/x-shockwave-flash"===o.sourcemime?(e=>{let t='<object data="'+e.source+'" width="'+e.width+'" height="'+e.height+'" type="application/x-shockwave-flash">';return e.poster&&(t+='<img src="'+e.poster+'" width="'+e.width+'" height="'+e.height+'" />'),t+="</object>",t})(o):-1!==o.sourcemime.indexOf("audio")?((e,t)=>t?t(e):'<audio controls="controls" src="'+e.source+'">'+(e.altsource?'\n<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</audio>")(o,t):((e,t)=>t?t(e):'<video width="'+e.width+'" height="'+e.height+'"'+(e.poster?' poster="'+e.poster+'"':"")+' controls="controls">\n<source src="'+e.source+'"'+(e.sourcemime?' type="'+e.sourcemime+'"':"")+" />\n"+(e.altsource?'<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</video>")(o,r)}},W=e=>e.hasAttribute("data-mce-object")||e.hasAttribute("data-ephox-embed-iri"),q={},H=e=>t=>G(e,t),J=(e,t)=>{const r=y(e);return r?((e,t,r)=>new Promise(((o,a)=>{const s=r=>(r.html&&(q[e.source]=r),o({url:e.source,html:r.html?r.html:t(e)}));q[e.source]?s(q[e.source]):r({url:e.source},s,a)})))(t,H(e),r):((e,t)=>Promise.resolve({html:t(e),url:e.source}))(t,H(e))},K=(e,t)=>{const r={};return d(e,"dimensions").each((e=>{l(["width","height"],(o=>{d(t,o).orThunk((()=>d(e,o))).each((e=>r[o]=e))}))})),r},Q=(e,t)=>{const r=t&&"dimensions"!==t?((e,t)=>d(t,e).bind((e=>d(e,"meta"))))(t,e).getOr({}):{},a=((e,t,r)=>a=>{const s=()=>d(e,a),n=()=>d(t,a),l=e=>d(e,"value").bind((e=>e.length>0?i.some(e):i.none()));return{[a]:(a===r?s().bind((e=>o(e)?l(e).orThunk(n):n().orThunk((()=>i.from(e))))):n().orThunk((()=>s().bind((e=>o(e)?l(e):i.from(e)))))).getOr("")}})(e,r,t);return{...a("source"),...a("altsource"),...a("poster"),...a("embed"),...K(e,r)}},V=e=>{const t={...e,source:{value:d(e,"source").getOr("")},altsource:{value:d(e,"altsource").getOr("")},poster:{value:d(e,"poster").getOr("")}};return l(["width","height"],(r=>{d(e,r).each((e=>{const o=t.dimensions||{};o[r]=e,t.dimensions=o}))})),t},X=e=>t=>{const r=t&&t.msg?"Media embed handler error: "+t.msg:"Media embed handler threw unknown error.";e.notificationManager.open({type:"error",text:r})},Y=(e,t)=>o=>{if(r(o.url)&&o.url.trim().length>0){const r=o.html,a={...T(r,t.schema),source:o.url,embed:r};e.setData(V(a))}},Z=(e,t)=>{const r=e.dom.select("*[data-mce-object]");e.insertContent(t),((e,t)=>{const r=e.dom.select("*[data-mce-object]");for(let e=0;e<t.length;e++)for(let o=r.length-1;o>=0;o--)t[e]===r[o]&&r.splice(o,1);e.selection.select(r[0])})(e,r),e.nodeChanged()},ee=(e,t)=>s(t)&&"ephox-embed-iri"===t&&s(B(e)),te=(e,t)=>((e,t)=>e.width!==t.width||e.height!==t.height)(e,t)&&ee(t.source,e.type),re=e=>{const t=(e=>{const t=e.selection.getNode(),r=W(t)?e.serializer.serialize(t,{selection:!0}):"",o=T(r,e.schema),a=(()=>{if(ee(o.source,o.type)){const r=e.dom.getRect(t);return{width:r.w.toString().replace(/px$/,""),height:r.h.toString().replace(/px$/,"")}}return{}})();return{embed:r,...o,...a}})(e),r=(e=>{let t=e;return{get:()=>t,set:e=>{t=e}}})(t),o=V(t),a=k(e)?[{type:"sizeinput",name:"dimensions",label:"Constrain proportions",constrain:!0}]:[],s={title:"General",name:"general",items:c([[{name:"source",type:"urlinput",filetype:"media",label:"Source"}],a])},i=[];x(e)&&i.push({name:"altsource",type:"urlinput",filetype:"media",label:"Alternative source URL"}),_(e)&&i.push({name:"poster",type:"urlinput",filetype:"image",label:"Media poster (Image URL)"});const n={title:"Advanced",name:"advanced",items:i},l=[s,{title:"Embed",items:[{type:"textarea",name:"embed",label:"Paste your embed code below:"}]}];i.length>0&&l.push(n);const m={type:"tabpanel",tabs:l},u=e.windowManager.open({title:"Insert/Edit Media",size:"normal",body:m,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{const o=Q(t.getData());((e,t,r)=>{var o,a;t.embed=te(e,t)&&k(r)?G(r,{...t,embed:""}):P(null!==(o=t.embed)&&void 0!==o?o:"",t,!1,r.schema),t.embed&&(e.source===t.source||(a=t.source,h(q,a)))?Z(r,t.embed):J(r,t).then((e=>{Z(r,e.html)})).catch(X(r))})(r.get(),o,e),t.close()},onChange:(t,o)=>{switch(o.name){case"source":((t,r)=>{const o=Q(r.getData(),"source");t.source!==o.source&&(Y(u,e)({url:o.source,html:""}),J(e,o).then(Y(u,e)).catch(X(e)))})(r.get(),t);break;case"embed":(t=>{var r;const o=Q(t.getData()),a=T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema);t.setData(V(a))})(t);break;case"dimensions":case"altsource":case"poster":((t,r,o)=>{const a=Q(t.getData(),r),s=te(o,a)&&k(e)?{...a,embed:""}:a,i=G(e,s);t.setData(V({...s,embed:i}))})(t,o.name,r.get())}r.set(Q(t.getData()))},initialData:o})};var oe=tinymce.util.Tools.resolve("tinymce.Env");const ae=e=>{const t=e.name;return"iframe"===t||"video"===t||"audio"===t},se=(e,t,r,o=null)=>{const a=e.attr(r);return s(a)?a:h(t,r)?null:o},ie=(e,t,r)=>{const o="img"===t.name||"video"===e.name,a=o?"300":null,s="audio"===e.name?"30":"150",i=o?s:null;t.attr({width:se(e,r,"width",a),height:se(e,r,"height",i)})},ne=(e,t)=>{const r=t.name,o=new D("img",1);return ce(e,t,o),ie(t,o,{}),o.attr({style:t.attr("style"),src:oe.transparentSrc,"data-mce-object":r,class:"mce-object mce-object-"+r}),o},le=(e,t)=>{var r;const o=t.name,a=new D("span",1);a.attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":o,class:"mce-preview-object mce-object-"+o}),ce(e,t,a);const i=e.dom.parseStyle(null!==(r=t.attr("style"))&&void 0!==r?r:""),n=new D(o,1);if(ie(t,n,i),n.attr({src:t.attr("src"),style:t.attr("style"),class:t.attr("class")}),"iframe"===o)n.attr({allowfullscreen:t.attr("allowfullscreen"),frameborder:"0"});else{l(["controls","crossorigin","currentTime","loop","muted","poster","preload"],(e=>{n.attr(e,t.attr(e))}));const r=a.attr("data-mce-html");s(r)&&((e,t,r,o)=>{const a=M(e.schema).parse(o,{context:t});for(;a.firstChild;)r.append(a.firstChild)})(e,o,n,unescape(r))}const c=new D("span",1);return c.attr("class","mce-shim"),a.append(n),a.append(c),a},ce=(e,t,r)=>{var o;const a=null!==(o=t.attributes)&&void 0!==o?o:[];let s=a.length;for(;s--;){const t=a[s].name;let o=a[s].value;"width"===t||"height"===t||"style"===t||(n="data-mce-",(i=t).length>=9&&i.substr(0,9)===n)||("data"!==t&&"src"!==t||(o=e.convertURL(o,t)),r.attr("data-mce-p-"+t,o))}var i,n;const c=F({inner:!0},e.schema),m=new D("div",1);l(t.children(),(e=>m.append(e)));const u=c.serialize(m);u&&(r.attr("data-mce-html",escape(u)),r.empty())},me=e=>{const t=e.attr("class");return r(t)&&/\btiny-pageembed\b/.test(t)},ue=e=>{let t=e;for(;t=t.parent;)if(t.attr("data-ephox-embed-iri")||me(t))return!0;return!1},de=(e,t,r)=>{const o=(0,e.options.get)("xss_sanitization"),a=f(e);return M(e.schema,{sanitize:o,validate:a}).parse(r,{context:t})},he=e=>t=>{const r=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",r),r(),()=>{e.off("NodeChange",r)}};e.add("media",(e=>((e=>{const t=e.options.register;t("audio_template_callback",{processor:"function"}),t("video_template_callback",{processor:"function"}),t("iframe_template_callback",{processor:"function"}),t("media_live_embeds",{processor:"boolean",default:!0}),t("media_filter_html",{processor:"boolean",default:!0}),t("media_url_resolver",{processor:"function"}),t("media_alt_source",{processor:"boolean",default:!0}),t("media_poster",{processor:"boolean",default:!0}),t("media_dimensions",{processor:"boolean",default:!0})})(e),(e=>{e.addCommand("mceMedia",(()=>{re(e)}))})(e),(e=>{const t=()=>e.execCommand("mceMedia");e.ui.registry.addToggleButton("media",{tooltip:"Insert/edit media",icon:"embed",onAction:t,onSetup:t=>{const r=e.selection;t.setActive(W(r.getNode()));const o=r.selectorChangedWithUnbind("img[data-mce-object],span[data-mce-object],div[data-ephox-embed-iri]",t.setActive).unbind,a=he(e)(t);return()=>{o(),a()}}}),e.ui.registry.addMenuItem("media",{icon:"embed",text:"Media...",onAction:t,onSetup:he(e)})})(e),(e=>{e.on("ResolveName",(e=>{let t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}))})(e),(e=>{e.on("PreInit",(()=>{const{schema:t,serializer:r,parser:o}=e,a=t.getBoolAttrs();l("webkitallowfullscreen mozallowfullscreen".split(" "),(e=>{a[e]={}})),((e,t)=>{const r=m(e);for(let o=0,a=r.length;o<a;o++){const a=r[o];t(e[a],a)}})({embed:["wmode"]},((e,r)=>{const o=t.getElementRule(r);o&&l(e,(e=>{o.attributes[e]={},o.attributesOrder.push(e)}))})),o.addNodeFilter("iframe,video,audio,object,embed",(e=>t=>{let r,o=t.length;for(;o--;)r=t[o],r.parent&&(r.parent.attr("data-mce-object")||(ae(r)&&v(e)?ue(r)||r.replace(le(e,r)):ue(r)||r.replace(ne(e,r))))})(e)),r.addAttributeFilter("data-mce-object",((t,r)=>{var o;let a=t.length;for(;a--;){const s=t[a];if(!s.parent)continue;const i=s.attr(r),n=new D(i,1);if("audio"!==i){const e=s.attr("class");e&&-1!==e.indexOf("mce-preview-object")&&s.firstChild?n.attr({width:s.firstChild.attr("width"),height:s.firstChild.attr("height")}):n.attr({width:s.attr("width"),height:s.attr("height")})}n.attr({style:s.attr("style")});const c=null!==(o=s.attributes)&&void 0!==o?o:[];let m=c.length;for(;m--;){const e=c[m].name;0===e.indexOf("data-mce-p-")&&n.attr(e.substr(11),c[m].value)}const u=s.attr("data-mce-html");if(u){const t=de(e,i,unescape(u));l(t.children(),(e=>n.append(e)))}s.replace(n)}}))})),e.on("SetContent",(()=>{const t=e.dom;l(t.select("span.mce-preview-object"),(e=>{0===t.select("span.mce-shim",e).length&&t.add(e,"span",{class:"mce-shim"})}))}))})(e),(e=>{e.on("click keyup touchend",(()=>{const t=e.selection.getNode();t&&e.dom.hasClass(t,"mce-preview-object")&&e.dom.getAttrib(t,"data-mce-selected")&&t.setAttribute("data-mce-selected","2")})),e.on("ObjectResized",(t=>{const r=t.target;if(r.getAttribute("data-mce-object")){let o=r.getAttribute("data-mce-html");o&&(o=unescape(o),r.setAttribute("data-mce-html",escape(P(o,{width:String(t.width),height:String(t.height)},!1,e.schema))))}}))})(e),(e=>({showDialog:()=>{re(e)}}))(e))))}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(r=o=e,(a=String).prototype.isPrototypeOf(r)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===a.name)?"string":t;var r,o,a,s})(t)===e,r=t("string"),o=t("object"),a=t("array"),s=e=>!(e=>null==e)(e);class i{constructor(e,t){this.tag=e,this.value=t}static some(e){return new i(!0,e)}static none(){return i.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?i.some(e(this.value)):i.none()}bind(e){return this.tag?e(this.value):i.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:i.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?i.some(e):i.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}i.singletonNone=new i(!1);const n=Array.prototype.push,l=(e,t)=>{for(let r=0,o=e.length;r<o;r++)t(e[r],r)},c=e=>{const t=[];for(let r=0,o=e.length;r<o;++r){if(!a(e[r]))throw new Error("Arr.flatten item "+r+" was not an array, input: "+e);n.apply(t,e[r])}return t},m=Object.keys,u=Object.hasOwnProperty,d=(e,t)=>h(e,t)?i.from(e[t]):i.none(),h=(e,t)=>u.call(e,t),p=e=>t=>t.options.get(e),g=p("audio_template_callback"),b=p("video_template_callback"),w=p("iframe_template_callback"),v=p("media_live_embeds"),f=p("media_filter_html"),y=p("media_url_resolver"),x=p("media_alt_source"),_=p("media_poster"),k=p("media_dimensions");var j=tinymce.util.Tools.resolve("tinymce.util.Tools"),O=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),A=tinymce.util.Tools.resolve("tinymce.html.DomParser");const S=O.DOM,$=e=>e.replace(/px$/,""),C=e=>{const t=e.attr("style"),r=t?S.parseStyle(t):{};return{type:"ephox-embed-iri",source:e.attr("data-ephox-embed-iri"),altsource:"",poster:"",width:d(r,"max-width").map($).getOr(""),height:d(r,"max-height").map($).getOr("")}},T=(e,t)=>{let r={};for(let o=A({validate:!1,forced_root_block:!1},t).parse(e);o;o=o.walk())if(1===o.type){const e=o.name;if(o.attr("data-ephox-embed-iri")){r=C(o);break}r.source||"param"!==e||(r.source=o.attr("movie")),"iframe"!==e&&"object"!==e&&"embed"!==e&&"video"!==e&&"audio"!==e||(r.type||(r.type=e),r=j.extend(o.attributes.map,r)),"source"===e&&(r.source?r.altsource||(r.altsource=o.attr("src")):r.source=o.attr("src")),"img"!==e||r.poster||(r.poster=o.attr("src"))}return r.source=r.source||r.src||"",r.altsource=r.altsource||"",r.poster=r.poster||"",r},z=e=>{var t;const r=null!==(t=e.toLowerCase().split(".").pop())&&void 0!==t?t:"";return d({mp3:"audio/mpeg",m4a:"audio/x-m4a",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"},r).getOr("")};var D=tinymce.util.Tools.resolve("tinymce.html.Node"),F=tinymce.util.Tools.resolve("tinymce.html.Serializer");const M=(e,t={})=>A({forced_root_block:!1,validate:!1,allow_conditional_comments:!0,...t},e),N=O.DOM,R=e=>/^[0-9.]+$/.test(e)?e+"px":e,E=(e,t)=>{const r=t.attr("style"),o=r?N.parseStyle(r):{};s(e.width)&&(o["max-width"]=R(e.width)),s(e.height)&&(o["max-height"]=R(e.height)),t.attr("style",N.serializeStyle(o))},U=["source","altsource"],P=(e,t,r,o)=>{let a=0,s=0;const i=M(o);i.addNodeFilter("source",(e=>a=e.length));const n=i.parse(e);for(let e=n;e;e=e.walk())if(1===e.type){const o=e.name;if(e.attr("data-ephox-embed-iri")){E(t,e);break}switch(o){case"video":case"object":case"embed":case"img":case"iframe":void 0!==t.height&&void 0!==t.width&&(e.attr("width",t.width),e.attr("height",t.height))}if(r)switch(o){case"video":e.attr("poster",t.poster),e.attr("src",null);for(let r=a;r<2;r++)if(t[U[r]]){const o=new D("source",1);o.attr("src",t[U[r]]),o.attr("type",t[U[r]+"mime"]||null),e.append(o)}break;case"iframe":e.attr("src",t.source);break;case"object":const r=e.getAll("img").length>0;if(t.poster&&!r){e.attr("src",t.poster);const r=new D("img",1);r.attr("src",t.poster),r.attr("width",t.width),r.attr("height",t.height),e.append(r)}break;case"source":if(s<2&&(e.attr("src",t[U[s]]),e.attr("type",t[U[s]+"mime"]||null),!t[U[s]])){e.remove();continue}s++;break;case"img":t.poster||e.remove()}}return F({},o).serialize(n)},L=[{regex:/youtu\.be\/([\w\-_\?&=.]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$2?$4",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?h=$2&title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?h=$3&title=0&amp;byline=0",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?title=0&amp;byline=0",allowFullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0},{regex:/dai\.ly\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0}],I=(e,t)=>{const r=(e=>{const t=e.match(/^(https?:\/\/|www\.)(.+)$/i);return t&&t.length>1?"www."===t[1]?"https://":t[1]:"https://"})(t),o=e.regex.exec(t);let a=r+e.url;if(s(o))for(let e=0;e<o.length;e++)a=a.replace("$"+e,(()=>o[e]?o[e]:""));return a.replace(/\?$/,"")},B=e=>{const t=L.filter((t=>t.regex.test(e)));return t.length>0?j.extend({},t[0],{url:I(t[0],e)}):null},G=(e,t)=>{var r;const o=j.extend({},t);if(!o.source&&(j.extend(o,T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema)),!o.source))return"";o.altsource||(o.altsource=""),o.poster||(o.poster=""),o.source=e.convertURL(o.source,"source"),o.altsource=e.convertURL(o.altsource,"source"),o.sourcemime=z(o.source),o.altsourcemime=z(o.altsource),o.poster=e.convertURL(o.poster,"poster");const a=B(o.source);if(a&&(o.source=a.url,o.type=a.type,o.allowfullscreen=a.allowFullscreen,o.width=o.width||String(a.w),o.height=o.height||String(a.h)),o.embed)return P(o.embed,o,!0,e.schema);{const t=g(e),r=b(e),a=w(e);return o.width=o.width||"300",o.height=o.height||"150",j.each(o,((t,r)=>{o[r]=e.dom.encode(""+t)})),"iframe"===o.type?((e,t)=>{if(t)return t(e);{const t=e.allowfullscreen?' allowFullscreen="1"':"";return'<iframe src="'+e.source+'" width="'+e.width+'" height="'+e.height+'"'+t+"></iframe>"}})(o,a):"application/x-shockwave-flash"===o.sourcemime?(e=>{let t='<object data="'+e.source+'" width="'+e.width+'" height="'+e.height+'" type="application/x-shockwave-flash">';return e.poster&&(t+='<img src="'+e.poster+'" width="'+e.width+'" height="'+e.height+'" />'),t+="</object>",t})(o):-1!==o.sourcemime.indexOf("audio")?((e,t)=>t?t(e):'<audio controls="controls" src="'+e.source+'">'+(e.altsource?'\n<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</audio>")(o,t):((e,t)=>t?t(e):'<video width="'+e.width+'" height="'+e.height+'"'+(e.poster?' poster="'+e.poster+'"':"")+' controls="controls">\n<source src="'+e.source+'"'+(e.sourcemime?' type="'+e.sourcemime+'"':"")+" />\n"+(e.altsource?'<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</video>")(o,r)}},W=e=>e.hasAttribute("data-mce-object")||e.hasAttribute("data-ephox-embed-iri"),q={},H=e=>t=>G(e,t),J=(e,t)=>{const r=y(e);return r?((e,t,r)=>new Promise(((o,a)=>{const s=r=>(r.html&&(q[e.source]=r),o({url:e.source,html:r.html?r.html:t(e)}));q[e.source]?s(q[e.source]):r({url:e.source},s,a)})))(t,H(e),r):((e,t)=>Promise.resolve({html:t(e),url:e.source}))(t,H(e))},K=(e,t)=>{const r={};return d(e,"dimensions").each((e=>{l(["width","height"],(o=>{d(t,o).orThunk((()=>d(e,o))).each((e=>r[o]=e))}))})),r},Q=(e,t)=>{const r=t&&"dimensions"!==t?((e,t)=>d(t,e).bind((e=>d(e,"meta"))))(t,e).getOr({}):{},a=((e,t,r)=>a=>{const s=()=>d(e,a),n=()=>d(t,a),l=e=>d(e,"value").bind((e=>e.length>0?i.some(e):i.none()));return{[a]:(a===r?s().bind((e=>o(e)?l(e).orThunk(n):n().orThunk((()=>i.from(e))))):n().orThunk((()=>s().bind((e=>o(e)?l(e):i.from(e)))))).getOr("")}})(e,r,t);return{...a("source"),...a("altsource"),...a("poster"),...a("embed"),...K(e,r)}},V=e=>{const t={...e,source:{value:d(e,"source").getOr("")},altsource:{value:d(e,"altsource").getOr("")},poster:{value:d(e,"poster").getOr("")}};return l(["width","height"],(r=>{d(e,r).each((e=>{const o=t.dimensions||{};o[r]=e,t.dimensions=o}))})),t},X=e=>t=>{const r=t&&t.msg?"Media embed handler error: "+t.msg:"Media embed handler threw unknown error.";e.notificationManager.open({type:"error",text:r})},Y=(e,t)=>o=>{if(r(o.url)&&o.url.trim().length>0){const r=o.html,a={...T(r,t.schema),source:o.url,embed:r};e.setData(V(a))}},Z=(e,t)=>{const r=e.dom.select("*[data-mce-object]");e.insertContent(t),((e,t)=>{const r=e.dom.select("*[data-mce-object]");for(let e=0;e<t.length;e++)for(let o=r.length-1;o>=0;o--)t[e]===r[o]&&r.splice(o,1);e.selection.select(r[0])})(e,r),e.nodeChanged()},ee=(e,t)=>s(t)&&"ephox-embed-iri"===t&&s(B(e)),te=(e,t)=>((e,t)=>e.width!==t.width||e.height!==t.height)(e,t)&&ee(t.source,e.type),re=e=>{const t=(e=>{const t=e.selection.getNode(),r=W(t)?e.serializer.serialize(t,{selection:!0}):"",o=T(r,e.schema),a=(()=>{if(ee(o.source,o.type)){const r=e.dom.getRect(t);return{width:r.w.toString().replace(/px$/,""),height:r.h.toString().replace(/px$/,"")}}return{}})();return{embed:r,...o,...a}})(e),r=(e=>{let t=e;return{get:()=>t,set:e=>{t=e}}})(t),o=V(t),a=k(e)?[{type:"sizeinput",name:"dimensions",label:"Constrain proportions",constrain:!0}]:[],s={title:"General",name:"general",items:c([[{name:"source",type:"urlinput",filetype:"media",label:"Source",picker_text:"Browse files"}],a])},i=[];x(e)&&i.push({name:"altsource",type:"urlinput",filetype:"media",label:"Alternative source URL"}),_(e)&&i.push({name:"poster",type:"urlinput",filetype:"image",label:"Media poster (Image URL)"});const n={title:"Advanced",name:"advanced",items:i},l=[s,{title:"Embed",items:[{type:"textarea",name:"embed",label:"Paste your embed code below:"}]}];i.length>0&&l.push(n);const m={type:"tabpanel",tabs:l},u=e.windowManager.open({title:"Insert/Edit Media",size:"normal",body:m,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{const o=Q(t.getData());((e,t,r)=>{var o,a;t.embed=te(e,t)&&k(r)?G(r,{...t,embed:""}):P(null!==(o=t.embed)&&void 0!==o?o:"",t,!1,r.schema),t.embed&&(e.source===t.source||(a=t.source,h(q,a)))?Z(r,t.embed):J(r,t).then((e=>{Z(r,e.html)})).catch(X(r))})(r.get(),o,e),t.close()},onChange:(t,o)=>{switch(o.name){case"source":((t,r)=>{const o=Q(r.getData(),"source");t.source!==o.source&&(Y(u,e)({url:o.source,html:""}),J(e,o).then(Y(u,e)).catch(X(e)))})(r.get(),t);break;case"embed":(t=>{var r;const o=Q(t.getData()),a=T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema);t.setData(V(a))})(t);break;case"dimensions":case"altsource":case"poster":((t,r,o)=>{const a=Q(t.getData(),r),s=te(o,a)&&k(e)?{...a,embed:""}:a,i=G(e,s);t.setData(V({...s,embed:i}))})(t,o.name,r.get())}r.set(Q(t.getData()))},initialData:o})};var oe=tinymce.util.Tools.resolve("tinymce.Env");const ae=e=>{const t=e.name;return"iframe"===t||"video"===t||"audio"===t},se=(e,t,r,o=null)=>{const a=e.attr(r);return s(a)?a:h(t,r)?null:o},ie=(e,t,r)=>{const o="img"===t.name||"video"===e.name,a=o?"300":null,s="audio"===e.name?"30":"150",i=o?s:null;t.attr({width:se(e,r,"width",a),height:se(e,r,"height",i)})},ne=(e,t)=>{const r=t.name,o=new D("img",1);return ce(e,t,o),ie(t,o,{}),o.attr({style:t.attr("style"),src:oe.transparentSrc,"data-mce-object":r,class:"mce-object mce-object-"+r}),o},le=(e,t)=>{var r;const o=t.name,a=new D("span",1);a.attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":o,class:"mce-preview-object mce-object-"+o}),ce(e,t,a);const i=e.dom.parseStyle(null!==(r=t.attr("style"))&&void 0!==r?r:""),n=new D(o,1);if(ie(t,n,i),n.attr({src:t.attr("src"),style:t.attr("style"),class:t.attr("class")}),"iframe"===o)n.attr({allowfullscreen:t.attr("allowfullscreen"),frameborder:"0",sandbox:t.attr("sandbox")});else{l(["controls","crossorigin","currentTime","loop","muted","poster","preload"],(e=>{n.attr(e,t.attr(e))}));const r=a.attr("data-mce-html");s(r)&&((e,t,r,o)=>{const a=M(e.schema).parse(o,{context:t});for(;a.firstChild;)r.append(a.firstChild)})(e,o,n,unescape(r))}const c=new D("span",1);return c.attr("class","mce-shim"),a.append(n),a.append(c),a},ce=(e,t,r)=>{var o;const a=null!==(o=t.attributes)&&void 0!==o?o:[];let s=a.length;for(;s--;){const t=a[s].name;let o=a[s].value;"width"===t||"height"===t||"style"===t||(n="data-mce-",(i=t).length>=9&&i.substr(0,9)===n)||("data"!==t&&"src"!==t||(o=e.convertURL(o,t)),r.attr("data-mce-p-"+t,o))}var i,n;const c=F({inner:!0},e.schema),m=new D("div",1);l(t.children(),(e=>m.append(e)));const u=c.serialize(m);u&&(r.attr("data-mce-html",escape(u)),r.empty())},me=e=>{const t=e.attr("class");return r(t)&&/\btiny-pageembed\b/.test(t)},ue=e=>{let t=e;for(;t=t.parent;)if(t.attr("data-ephox-embed-iri")||me(t))return!0;return!1},de=(e,t,r)=>{const o=(0,e.options.get)("xss_sanitization"),a=f(e);return M(e.schema,{sanitize:o,validate:a}).parse(r,{context:t})},he=e=>t=>{const r=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",r),r(),()=>{e.off("NodeChange",r)}};e.add("media",(e=>((e=>{const t=e.options.register;t("audio_template_callback",{processor:"function"}),t("video_template_callback",{processor:"function"}),t("iframe_template_callback",{processor:"function"}),t("media_live_embeds",{processor:"boolean",default:!0}),t("media_filter_html",{processor:"boolean",default:!0}),t("media_url_resolver",{processor:"function"}),t("media_alt_source",{processor:"boolean",default:!0}),t("media_poster",{processor:"boolean",default:!0}),t("media_dimensions",{processor:"boolean",default:!0})})(e),(e=>{e.addCommand("mceMedia",(()=>{re(e)}))})(e),(e=>{const t=()=>e.execCommand("mceMedia");e.ui.registry.addToggleButton("media",{tooltip:"Insert/edit media",icon:"embed",onAction:t,onSetup:t=>{const r=e.selection;t.setActive(W(r.getNode()));const o=r.selectorChangedWithUnbind("img[data-mce-object],span[data-mce-object],div[data-ephox-embed-iri]",t.setActive).unbind,a=he(e)(t);return()=>{o(),a()}}}),e.ui.registry.addMenuItem("media",{icon:"embed",text:"Media...",onAction:t,onSetup:he(e)})})(e),(e=>{e.on("ResolveName",(e=>{let t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}))})(e),(e=>{e.on("PreInit",(()=>{const{schema:t,serializer:r,parser:o}=e,a=t.getBoolAttrs();l("webkitallowfullscreen mozallowfullscreen".split(" "),(e=>{a[e]={}})),((e,t)=>{const r=m(e);for(let o=0,a=r.length;o<a;o++){const a=r[o];t(e[a],a)}})({embed:["wmode"]},((e,r)=>{const o=t.getElementRule(r);o&&l(e,(e=>{o.attributes[e]={},o.attributesOrder.push(e)}))})),o.addNodeFilter("iframe,video,audio,object,embed",(e=>t=>{let r,o=t.length;for(;o--;)r=t[o],r.parent&&(r.parent.attr("data-mce-object")||(ae(r)&&v(e)?ue(r)||r.replace(le(e,r)):ue(r)||r.replace(ne(e,r))))})(e)),r.addAttributeFilter("data-mce-object",((t,r)=>{var o;let a=t.length;for(;a--;){const s=t[a];if(!s.parent)continue;const i=s.attr(r),n=new D(i,1);if("audio"!==i){const e=s.attr("class");e&&-1!==e.indexOf("mce-preview-object")&&s.firstChild?n.attr({width:s.firstChild.attr("width"),height:s.firstChild.attr("height")}):n.attr({width:s.attr("width"),height:s.attr("height")})}n.attr({style:s.attr("style")});const c=null!==(o=s.attributes)&&void 0!==o?o:[];let m=c.length;for(;m--;){const e=c[m].name;0===e.indexOf("data-mce-p-")&&n.attr(e.substr(11),c[m].value)}const u=s.attr("data-mce-html");if(u){const t=de(e,i,unescape(u));l(t.children(),(e=>n.append(e)))}s.replace(n)}}))})),e.on("SetContent",(()=>{const t=e.dom;l(t.select("span.mce-preview-object"),(e=>{0===t.select("span.mce-shim",e).length&&t.add(e,"span",{class:"mce-shim"})}))}))})(e),(e=>{e.on("click keyup touchend",(()=>{const t=e.selection.getNode();t&&e.dom.hasClass(t,"mce-preview-object")&&e.dom.getAttrib(t,"data-mce-selected")&&t.setAttribute("data-mce-selected","2")})),e.on("ObjectResized",(t=>{const r=t.target;if(r.getAttribute("data-mce-object")){let o=r.getAttribute("data-mce-html");o&&(o=unescape(o),r.setAttribute("data-mce-html",escape(P(o,{width:String(t.width),height:String(t.height)},!1,e.schema))))}}))})(e),(e=>({showDialog:()=>{re(e)}}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/nonbreaking/plugin.min.js b/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
index 1406420fa44..6112af0efdb 100644
--- a/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
+++ b/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var n=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=n=>e=>typeof e===n,o=e("boolean"),a=e("number"),t=n=>e=>e.options.get(n),i=t("nonbreaking_force_tab"),s=t("nonbreaking_wrap"),r=(n,e)=>{let o="";for(let a=0;a<e;a++)o+=n;return o},c=(n,e)=>{const o=s(n)||n.plugins.visualchars?`<span class="${(n=>!!n.plugins.visualchars&&n.plugins.visualchars.isEnabled())(n)?"mce-nbsp-wrap mce-nbsp":"mce-nbsp-wrap"}" contenteditable="false">${r("&nbsp;",e)}</span>`:r("&nbsp;",e);n.undoManager.transact((()=>n.insertContent(o)))};var l=tinymce.util.Tools.resolve("tinymce.util.VK");const u=n=>e=>{const o=()=>{e.setEnabled(n.selection.isEditable())};return n.on("NodeChange",o),o(),()=>{n.off("NodeChange",o)}};n.add("nonbreaking",(n=>{(n=>{const e=n.options.register;e("nonbreaking_force_tab",{processor:n=>o(n)?{value:n?3:0,valid:!0}:a(n)?{value:n,valid:!0}:{valid:!1,message:"Must be a boolean or number."},default:!1}),e("nonbreaking_wrap",{processor:"boolean",default:!0})})(n),(n=>{n.addCommand("mceNonBreaking",(()=>{c(n,1)}))})(n),(n=>{const e=()=>n.execCommand("mceNonBreaking");n.ui.registry.addButton("nonbreaking",{icon:"non-breaking",tooltip:"Nonbreaking space",onAction:e,onSetup:u(n)}),n.ui.registry.addMenuItem("nonbreaking",{icon:"non-breaking",text:"Nonbreaking space",onAction:e,onSetup:u(n)})})(n),(n=>{const e=i(n);e>0&&n.on("keydown",(o=>{if(o.keyCode===l.TAB&&!o.isDefaultPrevented()){if(o.shiftKey)return;o.preventDefault(),o.stopImmediatePropagation(),c(n,e)}}))})(n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/pagebreak/plugin.min.js b/public/libs/tinymce/plugins/pagebreak/plugin.min.js
index d27a40e5ac9..1621d834d32 100644
--- a/public/libs/tinymce/plugins/pagebreak/plugin.min.js
+++ b/public/libs/tinymce/plugins/pagebreak/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),a=tinymce.util.Tools.resolve("tinymce.Env");const t=e=>a=>a.options.get(e),n=t("pagebreak_separator"),o=t("pagebreak_split_block"),r="mce-pagebreak",s=e=>{const t=`<img src="${a.transparentSrc}" class="${r}" data-mce-resize="false" data-mce-placeholder />`;return e?`<p>${t}</p>`:t},c=e=>a=>{const t=()=>{a.setEnabled(e.selection.isEditable())};return e.on("NodeChange",t),t(),()=>{e.off("NodeChange",t)}};e.add("pagebreak",(e=>{(e=>{const a=e.options.register;a("pagebreak_separator",{processor:"string",default:"\x3c!-- pagebreak --\x3e"}),a("pagebreak_split_block",{processor:"boolean",default:!1})})(e),(e=>{e.addCommand("mcePageBreak",(()=>{e.insertContent(s(o(e)))}))})(e),(e=>{const a=()=>e.execCommand("mcePageBreak");e.ui.registry.addButton("pagebreak",{icon:"page-break",tooltip:"Page break",onAction:a,onSetup:c(e)}),e.ui.registry.addMenuItem("pagebreak",{text:"Page break",icon:"page-break",onAction:a,onSetup:c(e)})})(e),(e=>{const a=n(e),t=()=>o(e),c=new RegExp(a.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,(e=>"\\"+e)),"gi");e.on("BeforeSetContent",(e=>{e.content=e.content.replace(c,s(t()))})),e.on("PreInit",(()=>{e.serializer.addNodeFilter("img",(n=>{let o,s,c=n.length;for(;c--;)if(o=n[c],s=o.attr("class"),s&&-1!==s.indexOf(r)){const n=o.parent;if(n&&e.schema.getBlockElements()[n.name]&&t()){n.type=3,n.value=a,n.raw=!0,o.remove();continue}o.type=3,o.value=a,o.raw=!0}}))}))})(e),(e=>{e.on("ResolveName",(a=>{"IMG"===a.target.nodeName&&e.dom.hasClass(a.target,r)&&(a.name="pagebreak")}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/preview/plugin.min.js b/public/libs/tinymce/plugins/preview/plugin.min.js
index 97eb3761ac0..76885123d1d 100644
--- a/public/libs/tinymce/plugins/preview/plugin.min.js
+++ b/public/libs/tinymce/plugins/preview/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.Env"),o=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=e=>t=>t.options.get(e),i=n("content_style"),s=n("content_css_cors"),c=n("body_class"),r=n("body_id");e.add("preview",(e=>{(e=>{e.addCommand("mcePreview",(()=>{(e=>{const n=(e=>{var n;let l="";const a=e.dom.encode,d=null!==(n=i(e))&&void 0!==n?n:"";l+='<base href="'+a(e.documentBaseURI.getURI())+'">';const m=s(e)?' crossorigin="anonymous"':"";o.each(e.contentCSS,(t=>{l+='<link type="text/css" rel="stylesheet" href="'+a(e.documentBaseURI.toAbsolute(t))+'"'+m+">"})),d&&(l+='<style type="text/css">'+d+"</style>");const y=r(e),u=c(e),v='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A" && !('+(t.os.isMacOS()||t.os.isiOS()?"e.metaKey":"e.ctrlKey && !e.altKey")+")) {e.preventDefault();}}}, false);<\/script> ",p=e.getBody().dir,w=p?' dir="'+a(p)+'"':"";return"<!DOCTYPE html><html><head>"+l+'</head><body id="'+a(y)+'" class="mce-content-body '+a(u)+'"'+w+">"+e.getContent()+v+"</body></html>"})(e);e.windowManager.open({title:"Preview",size:"large",body:{type:"panel",items:[{name:"preview",type:"iframe",sandboxed:!0,transparent:!1}]},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}],initialData:{preview:n}}).focus("close")})(e)}))})(e),(e=>{const t=()=>e.execCommand("mcePreview");e.ui.registry.addButton("preview",{icon:"preview",tooltip:"Preview",onAction:t}),e.ui.registry.addMenuItem("preview",{icon:"preview",text:"Preview",onAction:t})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/quickbars/plugin.min.js b/public/libs/tinymce/plugins/quickbars/plugin.min.js
index 7ca4179a5d1..72087175832 100644
--- a/public/libs/tinymce/plugins/quickbars/plugin.min.js
+++ b/public/libs/tinymce/plugins/quickbars/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>typeof e===t,o=("string",t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(o=n=t,(r=String).prototype.isPrototypeOf(o)||(null===(i=n.constructor)||void 0===i?void 0:i.name)===r.name)?"string":e;var o,n,r,i})(t));const n=e("boolean"),r=e("function"),i=t=>e=>e.options.get(t),s=i("quickbars_selection_toolbar"),a=i("quickbars_insert_toolbar"),l=i("quickbars_image_toolbar");let c=0;var u=tinymce.util.Tools.resolve("tinymce.util.Delay");const d=t=>{t.ui.registry.addButton("quickimage",{icon:"image",tooltip:"Insert image",onAction:()=>{(t=>new Promise((e=>{let o=!1;const n=document.createElement("input");n.type="file",n.accept="image/*",n.style.position="fixed",n.style.left="0",n.style.top="0",n.style.opacity="0.001",document.body.appendChild(n);const r=t=>{var r;o||(null===(r=n.parentNode)||void 0===r||r.removeChild(n),o=!0,e(t))},i=t=>{r(Array.prototype.slice.call(t.target.files))};n.addEventListener("input",i),n.addEventListener("change",i);const s=e=>{const n=()=>{r([])};o||("focusin"===e.type?u.setEditorTimeout(t,n,1e3):n()),t.off("focusin remove",s)};t.on("focusin remove",s),n.click()})))(t).then((e=>{if(e.length>0){const o=e[0];(t=>new Promise((e=>{const o=new FileReader;o.onloadend=()=>{e(o.result.split(",")[1])},o.readAsDataURL(t)})))(o).then((e=>{((t,e,o)=>{const n=t.editorUpload.blobCache,r=n.create((t=>{const e=(new Date).getTime(),o=Math.floor(1e9*Math.random());return c++,"mceu_"+o+c+String(e)})(),o,e);n.add(r),t.insertContent(t.dom.createHTML("img",{src:r.blobUri()}))})(t,e,o)}))}}))}}),t.ui.registry.addButton("quicktable",{icon:"table",tooltip:"Insert table",onAction:()=>{((t,e,o)=>{t.execCommand("mceInsertTable",!1,{rows:2,columns:2})})(t)}})},m=(!1,()=>false);class g{constructor(t,e){this.tag=t,this.value=e}static some(t){return new g(!0,t)}static none(){return g.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?g.some(t(this.value)):g.none()}bind(t){return this.tag?t(this.value):g.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:g.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return null==t?g.none():g.some(t)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}g.singletonNone=new g(!1),"undefined"!=typeof window?window:Function("return this;")();var h=(t,e,o,n,i)=>t(o,n)?g.some(o):r(i)&&i(o)?g.none():e(o,n,i);const b=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},p=b,v=(t,e)=>{const o=t.dom;if(1!==o.nodeType)return!1;{const t=o;if(void 0!==t.matches)return t.matches(e);if(void 0!==t.msMatchesSelector)return t.msMatchesSelector(e);if(void 0!==t.webkitMatchesSelector)return t.webkitMatchesSelector(e);if(void 0!==t.mozMatchesSelector)return t.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")}},f=(t,e,o)=>{let n=t.dom;const i=r(o)?o:m;for(;n.parentNode;){n=n.parentNode;const t=p(n);if(e(t))return g.some(t);if(i(t))break}return g.none()},y=(t,e,o)=>f(t,(t=>v(t,e)),o),k=t=>{const e=a(t);e.length>0&&t.ui.registry.addContextToolbar("quickblock",{predicate:e=>{const o=p(e),n=t.schema.getTextBlockElements(),r=e=>e.dom===t.getBody();return!((t,e)=>{const o=t.dom;return!(!o||!o.hasAttribute)&&o.hasAttribute("data-mce-bogus")})(o)&&((t,e,o)=>h(((t,e)=>v(t,e)),y,t,'table,[data-mce-bogus="all"]',o))(o,0,r).fold((()=>((t,e,o)=>((t,e,o)=>h(((t,e)=>e(t)),f,t,e,o))(t,e,o).isSome())(o,(e=>e.dom.nodeName.toLowerCase()in n&&t.dom.isEmpty(e.dom)),r)),m)},items:e,position:"line",scope:"editor"})};t.add("quickbars",(t=>{(t=>{const e=t.options.register,r=t=>e=>{const r=n(e)||o(e);return r?n(e)?{value:e?t:"",valid:r}:{value:e.trim(),valid:r}:{valid:!1,message:"Must be a boolean or string."}},i="bold italic | quicklink h2 h3 blockquote";e("quickbars_selection_toolbar",{processor:r(i),default:i});const s="quickimage quicktable";e("quickbars_insert_toolbar",{processor:r(s),default:s});const a="alignleft aligncenter alignright";e("quickbars_image_toolbar",{processor:r(a),default:a})})(t),d(t),k(t),(t=>{const e=e=>t.dom.isEditable(e),o=t=>{const o="FIGURE"===t.nodeName&&/image/i.test(t.className),n="IMG"===t.nodeName||o,r=(t=>void 0!==t.dom.classList)(i=p(t))&&i.dom.classList.contains("mce-pagebreak");var i;return n&&e(t.parentElement)&&!r},n=l(t);n.length>0&&t.ui.registry.addContextToolbar("imageselection",{predicate:o,items:n,position:"node"});const r=s(t);r.length>0&&t.ui.registry.addContextToolbar("textselection",{predicate:n=>!o(n)&&!t.selection.isCollapsed()&&e(n),items:r,position:"selection",scope:"editor"})})(t)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/save/plugin.min.js b/public/libs/tinymce/plugins/save/plugin.min.js
index c9496a8db42..b8775442d0f 100644
--- a/public/libs/tinymce/plugins/save/plugin.min.js
+++ b/public/libs/tinymce/plugins/save/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=("function",e=>"function"==typeof e);var o=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),t=tinymce.util.Tools.resolve("tinymce.util.Tools");const a=e=>n=>n.options.get(e),c=a("save_enablewhendirty"),i=a("save_onsavecallback"),s=a("save_oncancelcallback"),r=(e,n)=>{e.notificationManager.open({text:n,type:"error"})},l=e=>n=>{const o=()=>{n.setEnabled(!c(e)||e.isDirty())};return o(),e.on("NodeChange dirty",o),()=>e.off("NodeChange dirty",o)};e.add("save",(e=>{(e=>{const n=e.options.register;n("save_enablewhendirty",{processor:"boolean",default:!0}),n("save_onsavecallback",{processor:"function"}),n("save_oncancelcallback",{processor:"function"})})(e),(e=>{e.ui.registry.addButton("save",{icon:"save",tooltip:"Save",enabled:!1,onAction:()=>e.execCommand("mceSave"),onSetup:l(e)}),e.ui.registry.addButton("cancel",{icon:"cancel",tooltip:"Cancel",enabled:!1,onAction:()=>e.execCommand("mceCancel"),onSetup:l(e)}),e.addShortcut("Meta+S","","mceSave")})(e),(e=>{e.addCommand("mceSave",(()=>{(e=>{const t=o.DOM.getParent(e.id,"form");if(c(e)&&!e.isDirty())return;e.save();const a=i(e);if(n(a))return a.call(e,e),void e.nodeChanged();t?(e.setDirty(!1),t.onsubmit&&!t.onsubmit()||("function"==typeof t.submit?t.submit():r(e,"Error: Form submit field collision.")),e.nodeChanged()):r(e,"Error: No form element found.")})(e)})),e.addCommand("mceCancel",(()=>{(e=>{const o=t.trim(e.startContent),a=s(e);n(a)?a.call(e,e):e.resetContent(o)})(e)}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/searchreplace/plugin.min.js b/public/libs/tinymce/plugins/searchreplace/plugin.min.js
index a02513cec66..d80595a84c4 100644
--- a/public/libs/tinymce/plugins/searchreplace/plugin.min.js
+++ b/public/libs/tinymce/plugins/searchreplace/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var n,o,r,s})(t)===e,o=e=>t=>typeof t===e,r=n("string"),s=n("array"),a=o("boolean"),l=o("number"),i=()=>{},c=e=>()=>e,d=c(!0),u=c("[~\u2116|!-*+-\\/:;?@\\[-`{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]");class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?h.none():h.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const m=u;var g=tinymce.util.Tools.resolve("tinymce.Env"),f=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=Array.prototype.slice,x=Array.prototype.push,y=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},w=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},b=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},v=(e,t)=>(e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);x.apply(t,e[n])}return t})(y(e,t)),C=Object.hasOwnProperty,E=(e,t)=>C.call(e,t);"undefined"!=typeof window?window:Function("return this;")();const O=(3,e=>3===(e=>e.dom.nodeType)(e));const N=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},T=N,k=(e,t)=>({element:e,offset:t}),A=(e,t)=>{((e,t)=>{const n=(e=>h.from(e.dom.parentNode).map(T))(e);n.each((n=>{n.dom.insertBefore(t.dom,e.dom)}))})(e,t),((e,t)=>{e.dom.appendChild(t.dom)})(t,e)},S=((e,t)=>{const n=t=>e(t)?h.from(t.dom.nodeValue):h.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(O),B=e=>S.get(e);var F=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker");const I=(e,t)=>e.isBlock(t)||E(e.schema.getVoidElements(),t.nodeName),R=(e,t)=>"false"===e.getContentEditable(t),M=(e,t)=>!e.isBlock(t)&&E(e.schema.getWhitespaceElements(),t.nodeName),D=(e,t)=>((e,t)=>{const n=(e=>y(e.dom.childNodes,T))(e);return n.length>0&&t<n.length?k(n[t],0):k(e,t)})(T(e),t),P=(e,t,n,o,r,s=!0)=>{let a=s?t(!1):n;for(;a;){const n=R(e,a);if(n||M(e,a)){if(n?o.cef(a):o.boundary(a))break;a=t(!0)}else{if(I(e,a)){if(o.boundary(a))break}else 3===a.nodeType&&o.text(a);if(a===r)break;a=t(!1)}}},W=(e,t,n,o,r)=>{var s;if(((e,t)=>I(e,t)||R(e,t)||M(e,t)||((e,t)=>"true"===e.getContentEditable(t)&&t.parentNode&&"false"===e.getContentEditableParent(t.parentNode))(e,t))(e,n))return;const a=null!==(s=e.getParent(o,e.isBlock))&&void 0!==s?s:e.getRoot(),l=new F(n,a),i=r?l.next.bind(l):l.prev.bind(l);P(e,i,n,{boundary:d,cef:d,text:e=>{r?t.fOffset+=e.length:t.sOffset+=e.length,t.elements.push(T(e))}})},$=(e,t,n,o,r,s=!0)=>{const a=new F(n,t),l=[];let i={sOffset:0,fOffset:0,elements:[]};W(e,i,n,t,!1);const c=()=>(i.elements.length>0&&(l.push(i),i={sOffset:0,fOffset:0,elements:[]}),!1);return P(e,a.next.bind(a),n,{boundary:c,cef:e=>(c(),r&&l.push(...r.cef(e)),!1),text:e=>{i.elements.push(T(e)),r&&r.text(e,i)}},o,s),o&&W(e,i,o,t,!0),c(),l},V=(e,t)=>{const n=D(t.startContainer,t.startOffset),o=n.element.dom,r=D(t.endContainer,t.endOffset),s=r.element.dom;return $(e,t.commonAncestorContainer,o,s,{text:(e,t)=>{e===s?t.fOffset+=e.length-r.offset:e===o&&(t.sOffset+=n.offset)},cef:t=>{return((e,t)=>{const n=p.call(e,0);return n.sort(((e,t)=>((e,t)=>((e,t,n)=>0!=(e.compareDocumentPosition(t)&n))(e,t,Node.DOCUMENT_POSITION_PRECEDING))(e.elements[0].dom,t.elements[0].dom)?1:-1)),n})(v((n=T(t),((e,t)=>{const n=void 0===t?document:t.dom;return 1!==(o=n).nodeType&&9!==o.nodeType&&11!==o.nodeType||0===o.childElementCount?[]:y(n.querySelectorAll(e),T);var o})("*[contenteditable=true]",n)),(t=>{const n=t.dom;return $(e,n,n)})));var n}},!1)},j=(e,t)=>t.collapsed?[]:V(e,t),z=(e,t)=>{const n=e.createRng();return n.selectNode(t),j(e,n)},U=(e,t)=>v(t,(t=>{const n=t.elements,o=y(n,B).join(""),r=((e,t,n=0,o=e.length)=>{const r=t.regex;r.lastIndex=n;const s=[];let a;for(;a=r.exec(e);){const e=a[t.matchIndex],n=a.index+a[0].indexOf(e),l=n+e.length;if(l>o)break;s.push({start:n,finish:l}),r.lastIndex=l}return s})(o,e,t.sOffset,o.length-t.fOffset);return((e,t)=>{const n=(o=e,r=(e,n)=>{const o=B(n),r=e.last,s=r+o.length,a=v(t,((e,t)=>e.start<s&&e.finish>r?[{element:n,start:Math.max(r,e.start)-r,finish:Math.min(s,e.finish)-r,matchId:t}]:[]));return{results:e.results.concat(a),last:s}},s={results:[],last:0},w(o,((e,t)=>{s=r(s,e)})),s).results;var o,r,s;return((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const o=[];let r=[];for(let s=0,a=e.length;s<a;s++){const a=e[s],l=t(a);l!==n&&(o.push(r),r=[]),n=l,r.push(a)}return 0!==r.length&&o.push(r),o}})(n,(e=>e.matchId))})(n,r)})),_=(e,t)=>{b(e,((e,n)=>{b(e,(e=>{const o=T(t.cloneNode(!1));((e,t,n)=>{((e,t,n)=>{if(!(r(n)||a(n)||l(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(o,"data-mce-index",n);const s=e.element.dom;if(s.length===e.finish&&0===e.start)A(e.element,o);else{s.length!==e.finish&&s.splitText(e.finish);const t=s.splitText(e.start);A(T(t),o)}}))}))},q=e=>e.getAttribute("data-mce-index"),G=(e,t,n,o)=>{const r=e.dom.create("span",{"data-mce-bogus":1});r.className="mce-match-marker";const s=e.getBody();return te(e,t,!1),o?((e,t,n,o)=>{const r=n.getBookmark(),s=e.select("td[data-mce-selected],th[data-mce-selected]"),a=s.length>0?((e,t)=>v(t,(t=>z(e,t))))(e,s):j(e,n.getRng()),l=U(t,a);return _(l,o),n.moveToBookmark(r),l.length})(e.dom,n,e.selection,r):((e,t,n,o)=>{const r=z(e,n),s=U(t,r);return _(s,o),s.length})(e.dom,n,s,r)},K=e=>{var t;const n=e.parentNode;e.firstChild&&n.insertBefore(e.firstChild,e),null===(t=e.parentNode)||void 0===t||t.removeChild(e)},H=(e,t)=>{const n=[],o=f.toArray(e.getBody().getElementsByTagName("span"));if(o.length)for(let e=0;e<o.length;e++){const r=q(o[e]);null!==r&&r.length&&r===t.toString()&&n.push(o[e])}return n},J=(e,t,n)=>{const o=t.get();let r=o.index;const s=e.dom;n?r+1===o.count?r=0:r++:r-1==-1?r=o.count-1:r--,s.removeClass(H(e,o.index),"mce-match-marker-selected");const a=H(e,r);return a.length?(s.addClass(H(e,r),"mce-match-marker-selected"),e.selection.scrollIntoView(a[0]),r):-1},L=(e,t)=>{const n=t.parentNode;e.remove(t),n&&e.isEmpty(n)&&e.remove(n)},Q=(e,t,n,o,r,s)=>{const a=e.selection,l=((e,t)=>{const n="("+e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&").replace(/\s/g,"[^\\S\\r\\n\\uFEFF]")+")";return t?`(?:^|\\s|${m()})`+n+`(?=$|\\s|${m()})`:n})(n,r),i=a.isForward(),c={regex:new RegExp(l,o?"g":"gi"),matchIndex:1},d=G(e,t,c,s);if(g.browser.isSafari()&&a.setRng(a.getRng(),i),d){const a=J(e,t,!0);t.set({index:a,count:d,text:n,matchCase:o,wholeWord:r,inSelection:s})}return d},X=(e,t)=>{const n=J(e,t,!0);t.set({...t.get(),index:n})},Y=(e,t)=>{const n=J(e,t,!1);t.set({...t.get(),index:n})},Z=e=>{const t=q(e);return null!==t&&t.length>0},ee=(e,t,n,o,r)=>{const s=t.get(),a=s.index;let l,i=a;o=!1!==o;const c=e.getBody(),d=f.grep(f.toArray(c.getElementsByTagName("span")),Z);for(let t=0;t<d.length;t++){const c=q(d[t]);let u=l=parseInt(c,10);if(r||u===s.index){for(n.length?(d[t].innerText=n,K(d[t])):L(e.dom,d[t]);d[++t];){if(u=parseInt(q(d[t]),10),u!==l){t--;break}L(e.dom,d[t])}o&&i--}else l>a&&d[t].setAttribute("data-mce-index",String(l-1))}return t.set({...s,count:r?0:s.count-1,index:i}),o?X(e,t):Y(e,t),!r&&t.get().count>0},te=(e,t,n)=>{let o,r;const s=t.get(),a=f.toArray(e.getBody().getElementsByTagName("span"));for(let e=0;e<a.length;e++){const t=q(a[e]);null!==t&&t.length&&(t===s.index.toString()&&(o||(o=a[e].firstChild),r=a[e].firstChild),K(a[e]))}if(t.set({...s,index:-1,count:0,text:""}),o&&r){const t=e.dom.createRng();return t.setStart(o,0),t.setEnd(r,r.data.length),!1!==n&&e.selection.setRng(t),t}},ne=(t,n)=>{const o=(()=>{const t=(t=>{const n=e(h.none()),o=()=>n.get().each(t);return{clear:()=>{o(),n.set(h.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{o(),n.set(h.some(e))}}})(i);return{...t,on:e=>t.get().each(e)}})();t.undoManager.add();const r=f.trim(t.selection.getContent({format:"text"})),s=e=>{e.setEnabled("next",((e,t)=>t.get().count>1)(0,n)),e.setEnabled("prev",((e,t)=>t.get().count>1)(0,n))},a=(e,t)=>{w(["replace","replaceall","prev","next"],(n=>e.setEnabled(n,!t)))},l=(e,t)=>{t.redial(y(e,t.getData()))},c=(e,t)=>{g.browser.isSafari()&&g.deviceType.isTouch()&&("find"===t||"replace"===t||"replaceall"===t)&&e.focus(t)},d=e=>{te(t,n,!1),a(e,!0),s(e)},u=e=>{const o=e.getData(),r=n.get();if(o.findtext.length){if(r.text===o.findtext&&r.matchCase===o.matchcase&&r.wholeWord===o.wholewords)X(t,n);else{const r=Q(t,n,o.findtext,o.matchcase,o.wholewords,o.inselection);r<=0&&l(!0,e),a(e,0===r)}s(e)}else d(e)},m=n.get(),p={findtext:r,replacetext:"",wholewords:m.wholeWord,matchcase:m.matchCase,inselection:m.inSelection},x=e=>{const t=[{type:"bar",items:[{type:"input",name:"findtext",placeholder:"Find",maximized:!0,inputMode:"search"},{type:"button",name:"prev",text:"Previous",icon:"action-prev",enabled:!1,borderless:!0},{type:"button",name:"next",text:"Next",icon:"action-next",enabled:!1,borderless:!0}]},{type:"input",name:"replacetext",placeholder:"Replace with",inputMode:"search"}];return e&&t.push({type:"alertbanner",level:"error",text:"Could not find the specified string.",icon:"warning"}),t},y=(e,o)=>({title:"Find and Replace",size:"normal",body:{type:"panel",items:x(e)},buttons:[{type:"menu",name:"options",icon:"preferences",tooltip:"Preferences",align:"start",items:[{type:"togglemenuitem",name:"matchcase",text:"Match case"},{type:"togglemenuitem",name:"wholewords",text:"Find whole words only"},{type:"togglemenuitem",name:"inselection",text:"Find in selection"}]},{type:"custom",name:"find",text:"Find",primary:!0},{type:"custom",name:"replace",text:"Replace",enabled:!1},{type:"custom",name:"replaceall",text:"Replace all",enabled:!1}],initialData:o,onChange:(t,o)=>{e&&l(!1,t),"findtext"===o.name&&n.get().count>0&&d(t)},onAction:(e,o)=>{const r=e.getData();switch(o.name){case"find":u(e);break;case"replace":ee(t,n,r.replacetext)?s(e):d(e);break;case"replaceall":ee(t,n,r.replacetext,!0,!0),d(e);break;case"prev":Y(t,n),s(e);break;case"next":X(t,n),s(e);break;case"matchcase":case"wholewords":case"inselection":l(!1,e),(e=>{const t=e.getData(),o=n.get();n.set({...o,matchCase:t.matchcase,wholeWord:t.wholewords,inSelection:t.inselection})})(e),d(e)}c(e,o.name)},onSubmit:e=>{u(e),c(e,"find")},onClose:()=>{t.focus(),te(t,n),t.undoManager.add()}});o.set(t.windowManager.open(y(!1,p),{inline:"toolbar"}))},oe=(e,t)=>()=>{ne(e,t)};t.add("searchreplace",(t=>{const n=e({index:-1,count:0,text:"",matchCase:!1,wholeWord:!1,inSelection:!1});return((e,t)=>{e.addCommand("SearchReplace",(()=>{ne(e,t)}))})(t,n),((e,t)=>{e.ui.registry.addMenuItem("searchreplace",{text:"Find and replace...",shortcut:"Meta+F",onAction:oe(e,t),icon:"search"}),e.ui.registry.addButton("searchreplace",{tooltip:"Find and replace",onAction:oe(e,t),icon:"search"}),e.shortcuts.add("Meta+F","",oe(e,t))})(t,n),((e,t)=>({done:n=>te(e,t,n),find:(n,o,r,s=!1)=>Q(e,t,n,o,r,s),next:()=>X(e,t),prev:()=>Y(e,t),replace:(n,o,r)=>ee(e,t,n,o,r)}))(t,n)}))}();
\ No newline at end of file
+!function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=r=e,(o=String).prototype.isPrototypeOf(n)||(null===(s=r.constructor)||void 0===s?void 0:s.name)===o.name)?"string":t;var n,r,o,s})(t)===e,r=e=>t=>typeof t===e,o=n("string"),s=n("array"),a=r("boolean"),l=r("number"),i=()=>{},c=e=>()=>e,d=c(!0),u=c("[~\u2116|!-*+-\\/:;?@\\[-`{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]");class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?h.none():h.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const m=u;var g=tinymce.util.Tools.resolve("tinymce.Env"),f=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=Array.prototype.slice,x=Array.prototype.push,y=(e,t)=>{const n=e.length,r=new Array(n);for(let o=0;o<n;o++){const n=e[o];r[o]=t(n,o)}return r},w=(e,t)=>{for(let n=0,r=e.length;n<r;n++)t(e[n],n)},b=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},v=(e,t)=>(e=>{const t=[];for(let n=0,r=e.length;n<r;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);x.apply(t,e[n])}return t})(y(e,t)),C=Object.hasOwnProperty,E=(e,t)=>C.call(e,t);"undefined"!=typeof window?window:Function("return this;")();const O=(3,e=>3===(e=>e.dom.nodeType)(e));const N=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},T=N,k=(e,t)=>({element:e,offset:t}),A=(e,t)=>{((e,t)=>{const n=(e=>h.from(e.dom.parentNode).map(T))(e);n.each((n=>{n.dom.insertBefore(t.dom,e.dom)}))})(e,t),((e,t)=>{e.dom.appendChild(t.dom)})(t,e)},S=((e,t)=>{const n=t=>e(t)?h.from(t.dom.nodeValue):h.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(O),B=e=>S.get(e);var F=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker");const I=(e,t)=>e.isBlock(t)||E(e.schema.getVoidElements(),t.nodeName),R=(e,t)=>!e.isEditable(t),M=(e,t)=>!e.isBlock(t)&&E(e.schema.getWhitespaceElements(),t.nodeName),D=(e,t)=>((e,t)=>{const n=(e=>y(e.dom.childNodes,T))(e);return n.length>0&&t<n.length?k(n[t],0):k(e,t)})(T(e),t),P=(e,t,n,r,o,s=!0)=>{let a=s?t(!1):n;for(;a;){const n=R(e,a);if(n||M(e,a)){if(n?r.cef(a):r.boundary(a))break;a=t(!0)}else{if(I(e,a)){if(r.boundary(a))break}else 3===a.nodeType&&r.text(a);if(a===o)break;a=t(!1)}}},W=(e,t,n,r,o)=>{var s;if(((e,t)=>I(e,t)||R(e,t)||M(e,t)||((e,t)=>"true"===e.getContentEditable(t)&&t.parentNode&&!e.isEditable(t.parentNode))(e,t))(e,n))return;const a=null!==(s=e.getParent(r,e.isBlock))&&void 0!==s?s:e.getRoot(),l=new F(n,a),i=o?l.next.bind(l):l.prev.bind(l);P(e,i,n,{boundary:d,cef:d,text:e=>{o?t.fOffset+=e.length:t.sOffset+=e.length,t.elements.push(T(e))}})},$=(e,t,n,r,o,s=!0)=>{const a=new F(n,t),l=[];let i={sOffset:0,fOffset:0,elements:[]};W(e,i,n,t,!1);const c=()=>(i.elements.length>0&&(l.push(i),i={sOffset:0,fOffset:0,elements:[]}),!1);return P(e,a.next.bind(a),n,{boundary:c,cef:e=>(c(),o&&l.push(...o.cef(e)),!1),text:e=>{i.elements.push(T(e)),o&&o.text(e,i)}},r,s),r&&W(e,i,r,t,!0),c(),l},V=(e,t)=>{const n=D(t.startContainer,t.startOffset),r=n.element.dom,o=D(t.endContainer,t.endOffset),s=o.element.dom;return $(e,t.commonAncestorContainer,r,s,{text:(e,t)=>{e===s?t.fOffset+=e.length-o.offset:e===r&&(t.sOffset+=n.offset)},cef:t=>{return((e,t)=>{const n=p.call(e,0);return n.sort(((e,t)=>((e,t)=>((e,t,n)=>0!=(e.compareDocumentPosition(t)&n))(e,t,Node.DOCUMENT_POSITION_PRECEDING))(e.elements[0].dom,t.elements[0].dom)?1:-1)),n})(v((n=T(t),((e,t)=>{const n=void 0===t?document:t.dom;return 1!==(r=n).nodeType&&9!==r.nodeType&&11!==r.nodeType||0===r.childElementCount?[]:y(n.querySelectorAll(e),T);var r})("*[contenteditable=true]",n)),(t=>{const n=t.dom;return $(e,n,n)})));var n}},!1)},j=(e,t)=>t.collapsed?[]:V(e,t),z=(e,t)=>{const n=e.createRng();return n.selectNode(t),j(e,n)},U=(e,t)=>v(t,(t=>{const n=t.elements,r=y(n,B).join(""),o=((e,t,n=0,r=e.length)=>{const o=t.regex;o.lastIndex=n;const s=[];let a;for(;a=o.exec(e);){const e=a[t.matchIndex],n=a.index+a[0].indexOf(e),l=n+e.length;if(l>r)break;s.push({start:n,finish:l}),o.lastIndex=l}return s})(r,e,t.sOffset,r.length-t.fOffset);return((e,t)=>{const n=(r=e,o=(e,n)=>{const r=B(n),o=e.last,s=o+r.length,a=v(t,((e,t)=>e.start<s&&e.finish>o?[{element:n,start:Math.max(o,e.start)-o,finish:Math.min(s,e.finish)-o,matchId:t}]:[]));return{results:e.results.concat(a),last:s}},s={results:[],last:0},w(r,((e,t)=>{s=o(s,e)})),s).results;var r,o,s;return((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const r=[];let o=[];for(let s=0,a=e.length;s<a;s++){const a=e[s],l=t(a);l!==n&&(r.push(o),o=[]),n=l,o.push(a)}return 0!==o.length&&r.push(o),r}})(n,(e=>e.matchId))})(n,o)})),_=(e,t)=>{b(e,((e,n)=>{b(e,(e=>{const r=T(t.cloneNode(!1));((e,t,n)=>{((e,t,n)=>{if(!(o(n)||a(n)||l(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(r,"data-mce-index",n);const s=e.element.dom;if(s.length===e.finish&&0===e.start)A(e.element,r);else{s.length!==e.finish&&s.splitText(e.finish);const t=s.splitText(e.start);A(T(t),r)}}))}))},q=e=>e.getAttribute("data-mce-index"),G=(e,t,n,r)=>{const o=e.dom.create("span",{"data-mce-bogus":1});o.className="mce-match-marker";const s=e.getBody();return te(e,t,!1),r?((e,t,n,r)=>{const o=n.getBookmark(),s=e.select("td[data-mce-selected],th[data-mce-selected]"),a=s.length>0?((e,t)=>v(t,(t=>z(e,t))))(e,s):j(e,n.getRng()),l=U(t,a);return _(l,r),n.moveToBookmark(o),l.length})(e.dom,n,e.selection,o):((e,t,n,r)=>{const o=z(e,n),s=U(t,o);return _(s,r),s.length})(e.dom,n,s,o)},K=e=>{var t;const n=e.parentNode;e.firstChild&&n.insertBefore(e.firstChild,e),null===(t=e.parentNode)||void 0===t||t.removeChild(e)},H=(e,t)=>{const n=[],r=f.toArray(e.getBody().getElementsByTagName("span"));if(r.length)for(let e=0;e<r.length;e++){const o=q(r[e]);null!==o&&o.length&&o===t.toString()&&n.push(r[e])}return n},J=(e,t,n)=>{const r=t.get();let o=r.index;const s=e.dom;n?o+1===r.count?o=0:o++:o-1==-1?o=r.count-1:o--,s.removeClass(H(e,r.index),"mce-match-marker-selected");const a=H(e,o);return a.length?(s.addClass(H(e,o),"mce-match-marker-selected"),e.selection.scrollIntoView(a[0]),o):-1},L=(e,t)=>{const n=t.parentNode;e.remove(t),n&&e.isEmpty(n)&&e.remove(n)},Q=(e,t,n,r,o,s)=>{const a=e.selection,l=((e,t)=>{const n="("+e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&").replace(/\s/g,"[^\\S\\r\\n\\uFEFF]")+")";return t?`(?:^|\\s|${m()})`+n+`(?=$|\\s|${m()})`:n})(n,o),i=a.isForward(),c={regex:new RegExp(l,r?"g":"gi"),matchIndex:1},d=G(e,t,c,s);if(g.browser.isSafari()&&a.setRng(a.getRng(),i),d){const a=J(e,t,!0);t.set({index:a,count:d,text:n,matchCase:r,wholeWord:o,inSelection:s})}return d},X=(e,t)=>{const n=J(e,t,!0);t.set({...t.get(),index:n})},Y=(e,t)=>{const n=J(e,t,!1);t.set({...t.get(),index:n})},Z=e=>{const t=q(e);return null!==t&&t.length>0},ee=(e,t,n,r,o)=>{const s=t.get(),a=s.index;let l,i=a;r=!1!==r;const c=e.getBody(),d=f.grep(f.toArray(c.getElementsByTagName("span")),Z);for(let t=0;t<d.length;t++){const c=q(d[t]);let u=l=parseInt(c,10);if(o||u===s.index){for(n.length?(d[t].innerText=n,K(d[t])):L(e.dom,d[t]);d[++t];){if(u=parseInt(q(d[t]),10),u!==l){t--;break}L(e.dom,d[t])}r&&i--}else l>a&&d[t].setAttribute("data-mce-index",String(l-1))}return t.set({...s,count:o?0:s.count-1,index:i}),r?X(e,t):Y(e,t),!o&&t.get().count>0},te=(e,t,n)=>{let r,o;const s=t.get(),a=f.toArray(e.getBody().getElementsByTagName("span"));for(let e=0;e<a.length;e++){const t=q(a[e]);null!==t&&t.length&&(t===s.index.toString()&&(r||(r=a[e].firstChild),o=a[e].firstChild),K(a[e]))}if(t.set({...s,index:-1,count:0,text:""}),r&&o){const t=e.dom.createRng();return t.setStart(r,0),t.setEnd(o,o.data.length),!1!==n&&e.selection.setRng(t),t}},ne=(t,n)=>{const r=(()=>{const t=(t=>{const n=e(h.none()),r=()=>n.get().each(t);return{clear:()=>{r(),n.set(h.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{r(),n.set(h.some(e))}}})(i);return{...t,on:e=>t.get().each(e)}})();t.undoManager.add();const o=f.trim(t.selection.getContent({format:"text"})),s=e=>{e.setEnabled("next",((e,t)=>t.get().count>1)(0,n)),e.setEnabled("prev",((e,t)=>t.get().count>1)(0,n))},a=(e,t)=>{w(["replace","replaceall","prev","next"],(n=>e.setEnabled(n,!t)))},l=(e,t)=>{t.redial(y(e,t.getData()))},c=(e,t)=>{g.browser.isSafari()&&g.deviceType.isTouch()&&("find"===t||"replace"===t||"replaceall"===t)&&e.focus(t)},d=e=>{te(t,n,!1),a(e,!0),s(e)},u=e=>{const r=e.getData(),o=n.get();if(r.findtext.length){if(o.text===r.findtext&&o.matchCase===r.matchcase&&o.wholeWord===r.wholewords)X(t,n);else{const o=Q(t,n,r.findtext,r.matchcase,r.wholewords,r.inselection);o<=0&&l(!0,e),a(e,0===o)}s(e)}else d(e)},m=n.get(),p={findtext:o,replacetext:"",wholewords:m.wholeWord,matchcase:m.matchCase,inselection:m.inSelection},x=e=>{const t=[{type:"bar",items:[{type:"input",name:"findtext",placeholder:"Find",maximized:!0,inputMode:"search"},{type:"button",name:"prev",text:"Previous",icon:"action-prev",enabled:!1,borderless:!0},{type:"button",name:"next",text:"Next",icon:"action-next",enabled:!1,borderless:!0}]},{type:"input",name:"replacetext",placeholder:"Replace with",inputMode:"search"}];return e&&t.push({type:"alertbanner",level:"error",text:"Could not find the specified string.",icon:"warning"}),t},y=(e,r)=>({title:"Find and Replace",size:"normal",body:{type:"panel",items:x(e)},buttons:[{type:"menu",name:"options",icon:"preferences",tooltip:"Preferences",align:"start",items:[{type:"togglemenuitem",name:"matchcase",text:"Match case"},{type:"togglemenuitem",name:"wholewords",text:"Find whole words only"},{type:"togglemenuitem",name:"inselection",text:"Find in selection"}]},{type:"custom",name:"find",text:"Find",primary:!0},{type:"custom",name:"replace",text:"Replace",enabled:!1},{type:"custom",name:"replaceall",text:"Replace all",enabled:!1}],initialData:r,onChange:(t,r)=>{e&&l(!1,t),"findtext"===r.name&&n.get().count>0&&d(t)},onAction:(e,r)=>{const o=e.getData();switch(r.name){case"find":u(e);break;case"replace":ee(t,n,o.replacetext)?s(e):d(e);break;case"replaceall":ee(t,n,o.replacetext,!0,!0),d(e);break;case"prev":Y(t,n),s(e);break;case"next":X(t,n),s(e);break;case"matchcase":case"wholewords":case"inselection":l(!1,e),(e=>{const t=e.getData(),r=n.get();n.set({...r,matchCase:t.matchcase,wholeWord:t.wholewords,inSelection:t.inselection})})(e),d(e)}c(e,r.name)},onSubmit:e=>{u(e),c(e,"find")},onClose:()=>{t.focus(),te(t,n),t.undoManager.add()}});r.set(t.windowManager.open(y(!1,p),{inline:"toolbar"}))},re=(e,t)=>()=>{ne(e,t)};t.add("searchreplace",(t=>{const n=e({index:-1,count:0,text:"",matchCase:!1,wholeWord:!1,inSelection:!1});return((e,t)=>{e.addCommand("SearchReplace",(()=>{ne(e,t)}))})(t,n),((e,t)=>{e.ui.registry.addMenuItem("searchreplace",{text:"Find and replace...",shortcut:"Meta+F",onAction:re(e,t),icon:"search"}),e.ui.registry.addButton("searchreplace",{tooltip:"Find and replace",onAction:re(e,t),icon:"search"}),e.shortcuts.add("Meta+F","",re(e,t))})(t,n),((e,t)=>({done:n=>te(e,t,n),find:(n,r,o,s=!1)=>Q(e,t,n,r,o,s),next:()=>X(e,t),prev:()=>Y(e,t),replace:(n,r,o)=>ee(e,t,n,r,o)}))(t,n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/table/plugin.min.js b/public/libs/tinymce/plugins/table/plugin.min.js
index a0dec457f30..63748a19c29 100644
--- a/public/libs/tinymce/plugins/table/plugin.min.js
+++ b/public/libs/tinymce/plugins/table/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(o=l=e,(n=String).prototype.isPrototypeOf(o)||(null===(r=l.constructor)||void 0===r?void 0:r.name)===n.name)?"string":t;var o,l,n,r})(t)===e,o=e=>t=>typeof t===e,l=t("string"),n=t("array"),r=o("boolean"),a=(void 0,e=>undefined===e);const s=e=>!(e=>null==e)(e),c=o("function"),i=o("number"),m=()=>{},d=e=>()=>e,u=e=>e,p=(e,t)=>e===t;function b(e,...t){return(...o)=>{const l=t.concat(o);return e.apply(null,l)}}const g=e=>{e()},h=d(!1),f=d(!0);class y{constructor(e,t){this.tag=e,this.value=t}static some(e){return new y(!0,e)}static none(){return y.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?y.some(e(this.value)):y.none()}bind(e){return this.tag?e(this.value):y.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:y.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?y.some(e):y.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}y.singletonNone=new y(!1);const w=Object.keys,S=Object.hasOwnProperty,C=(e,t)=>{const o=w(e);for(let l=0,n=o.length;l<n;l++){const n=o[l];t(e[n],n)}},v=(e,t)=>{const o={};var l;return((e,t,o,l)=>{C(e,((e,n)=>{(t(e,n)?o:l)(e,n)}))})(e,t,(l=o,(e,t)=>{l[t]=e}),m),o},T=e=>w(e).length,x=(e,t)=>A(e,t)?y.from(e[t]):y.none(),A=(e,t)=>S.call(e,t),R=(e,t)=>A(e,t)&&void 0!==e[t]&&null!==e[t],O=Array.prototype.indexOf,_=Array.prototype.push,D=(e,t)=>((e,t)=>O.call(e,t))(e,t)>-1,N=(e,t)=>{for(let o=0,l=e.length;o<l;o++)if(t(e[o],o))return!0;return!1},I=(e,t)=>{const o=[];for(let l=0;l<e;l++)o.push(t(l));return o},M=(e,t)=>{const o=e.length,l=new Array(o);for(let n=0;n<o;n++){const o=e[n];l[n]=t(o,n)}return l},P=(e,t)=>{for(let o=0,l=e.length;o<l;o++)t(e[o],o)},k=(e,t)=>{const o=[];for(let l=0,n=e.length;l<n;l++){const n=e[l];t(n,l)&&o.push(n)}return o},E=(e,t,o)=>(P(e,((e,l)=>{o=t(o,e,l)})),o),B=(e,t)=>((e,t,o)=>{for(let l=0,n=e.length;l<n;l++){const n=e[l];if(t(n,l))return y.some(n);if(o(n,l))break}return y.none()})(e,t,h),F=(e,t)=>(e=>{const t=[];for(let o=0,l=e.length;o<l;++o){if(!n(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);_.apply(t,e[o])}return t})(M(e,t)),q=(e,t)=>{for(let o=0,l=e.length;o<l;++o)if(!0!==t(e[o],o))return!1;return!0},L=(e,t)=>t>=0&&t<e.length?y.some(e[t]):y.none(),H=(e,t)=>{for(let o=0;o<e.length;o++){const l=t(e[o],o);if(l.isSome())return l}return y.none()},j=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},V={fromHtml:(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return j(o.childNodes[0])},fromTag:(e,t)=>{const o=(t||document).createElement(e);return j(o)},fromText:(e,t)=>{const o=(t||document).createTextNode(e);return j(o)},fromDom:j,fromPoint:(e,t,o)=>y.from(e.dom.elementFromPoint(t,o)).map(j)},$=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},W=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,z=(e,t)=>e.dom===t.dom,U=$;"undefined"!=typeof window?window:Function("return this;")();const G=e=>e.dom.nodeName.toLowerCase(),K=e=>e.dom.nodeType,J=e=>t=>K(t)===e,Q=J(1),X=J(3),Y=J(9),Z=J(11),ee=e=>t=>Q(t)&&G(t)===e,te=e=>Y(e)?e:V.fromDom(e.dom.ownerDocument),oe=e=>y.from(e.dom.parentNode).map(V.fromDom),le=e=>y.from(e.dom.nextSibling).map(V.fromDom),ne=e=>M(e.dom.childNodes,V.fromDom),re=c(Element.prototype.attachShadow)&&c(Node.prototype.getRootNode)?e=>V.fromDom(e.dom.getRootNode()):te,ae=e=>V.fromDom(e.dom.host),se=e=>{const t=X(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return(e=>{const t=re(e);return Z(o=t)&&s(o.dom.host)?y.some(t):y.none();var o})(V.fromDom(t)).fold((()=>o.body.contains(t)),(l=se,n=ae,e=>l(n(e))));var l,n};var ce=(e,t,o,l,n)=>e(o,l)?y.some(o):c(n)&&n(o)?y.none():t(o,l,n);const ie=(e,t,o)=>{let l=e.dom;const n=c(o)?o:h;for(;l.parentNode;){l=l.parentNode;const e=V.fromDom(l);if(t(e))return y.some(e);if(n(e))break}return y.none()},me=(e,t,o)=>ie(e,(e=>$(e,t)),o),de=(e,t)=>((e,o)=>B(e.dom.childNodes,(e=>{return o=V.fromDom(e),$(o,t);var o})).map(V.fromDom))(e),ue=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return W(o)?y.none():y.from(o.querySelector(e)).map(V.fromDom)})(t,e),pe=(e,t,o)=>ce(((e,t)=>$(e,t)),me,e,t,o),be=(e,t=!1)=>{return se(e)?e.dom.isContentEditable:(o=e,pe(o,"[contenteditable]")).fold(d(t),(e=>"true"===ge(e)));var o},ge=e=>e.dom.contentEditable,he=e=>t=>z(t,(e=>V.fromDom(e.getBody()))(e)),fe=e=>/^\d+(\.\d+)?$/.test(e)?e+"px":e,ye=e=>V.fromDom(e.selection.getStart()),we=(e,t)=>{let o=[];return P(ne(e),(e=>{t(e)&&(o=o.concat([e])),o=o.concat(we(e,t))})),o},Se=(e,t)=>((e,o)=>k(ne(e),(e=>$(e,t))))(e),Ce=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return W(o)?[]:M(o.querySelectorAll(e),V.fromDom)})(t,e),ve=(e,t,o)=>{if(!(l(o)||r(o)||i(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},Te=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},xe=(e,t)=>y.from(Te(e,t)),Ae=(e,t)=>{e.dom.removeAttribute(t)},Re=(e,t,o=p)=>e.exists((e=>o(e,t))),Oe=(e,t,o)=>e.isSome()&&t.isSome()?y.some(o(e.getOrDie(),t.getOrDie())):y.none(),_e=(e,t)=>((e,t,o)=>""===t||e.length>=t.length&&e.substr(0,0+t.length)===t)(e,t),De=(Ne=/^\s+|\s+$/g,e=>e.replace(Ne,""));var Ne;const Ie=e=>e.length>0,Me=(e,t=10)=>{const o=parseInt(e,t);return isNaN(o)?y.none():y.some(o)},Pe=e=>void 0!==e.style&&c(e.style.getPropertyValue),ke=(e,t)=>{const o=e.dom,l=window.getComputedStyle(o).getPropertyValue(t);return""!==l||se(e)?l:Ee(o,t)},Ee=(e,t)=>Pe(e)?e.style.getPropertyValue(t):"",Be=(e,t)=>{const o=e.dom,l=Ee(o,t);return y.from(l).filter((e=>e.length>0))},Fe=(e,t,o=0)=>xe(e,t).map((e=>parseInt(e,10))).getOr(o),qe=(e,t)=>Le(e,t,f),Le=(e,t,o)=>F(ne(e),(e=>$(e,t)?o(e)?[e]:[]:Le(e,t,o))),He=["tfoot","thead","tbody","colgroup"],je=(e,t,o)=>({element:e,rowspan:t,colspan:o}),Ve=(e,t,o)=>({element:e,cells:t,section:o}),$e=(e,t)=>pe(e,"table",t),We=e=>qe(e,"tr"),ze=e=>$e(e).fold(d([]),(e=>Se(e,"colgroup"))),Ue=e=>oe(e).map((e=>{const t=G(e);return(e=>D(He,e))(t)?t:"tbody"})).getOr("tbody"),Ge=e=>xe(e,"data-snooker-locked-cols").bind((e=>y.from(e.match(/\d+/g)))).map((e=>((e,t)=>{const o={};for(let l=0,n=e.length;l<n;l++){const n=e[l];o[String(n)]=t(n,l)}return o})(e,f))),Ke=(e,t)=>e+","+t,Je=e=>{const t={},o=[];var l;const n=(l=e,L(l,0)).map((e=>e.element)).bind($e).bind(Ge).getOr({});let r=0,a=0,s=0;const{pass:c,fail:i}=((e,t)=>{const o=[],l=[];for(let t=0,r=e.length;t<r;t++){const r=e[t];(n=r,"colgroup"===n.section?o:l).push(r)}var n;return{pass:o,fail:l}})(e);P(i,(e=>{const l=[];P(e.cells,(e=>{let o=0;for(;void 0!==t[Ke(s,o)];)o++;const r=R(n,o.toString()),c=((e,t,o,l,n,r)=>({element:e,rowspan:t,colspan:o,row:l,column:n,isLocked:r}))(e.element,e.rowspan,e.colspan,s,o,r);for(let l=0;l<e.colspan;l++)for(let n=0;n<e.rowspan;n++){const e=o+l,r=Ke(s+n,e);t[r]=c,a=Math.max(a,e+1)}l.push(c)})),r++,o.push(Ve(e.element,l,e.section)),s++}));const{columns:m,colgroups:d}=(e=>L(e,e.length-1))(c).map((e=>{const t=(e=>{const t={};let o=0;return P(e.cells,(e=>{const l=e.colspan;I(l,(n=>{const r=o+n;t[r]=((e,t,o)=>({element:e,colspan:t,column:o}))(e.element,l,r)})),o+=l})),t})(e),o=((e,t)=>({element:e,columns:t}))(e.element,((e,t)=>{const o=[];return C(e,((e,l)=>{o.push(t(e,l))})),o})(t,u));return{colgroups:[o],columns:t}})).getOrThunk((()=>({colgroups:[],columns:{}}))),p=((e,t)=>({rows:e,columns:t}))(r,a);return{grid:p,access:t,all:o,columns:m,colgroups:d}},Qe=e=>{const t=(e=>{const t=We(e);return((e,t)=>M(e,(e=>{if("colgroup"===G(e)){const t=M((e=>$(e,"colgroup")?Se(e,"col"):F(ze(e),(e=>Se(e,"col"))))(e),(e=>{const t=Fe(e,"span",1);return je(e,1,t)}));return Ve(e,t,"colgroup")}{const o=M((e=>qe(e,"th,td"))(e),(e=>{const t=Fe(e,"rowspan",1),o=Fe(e,"colspan",1);return je(e,t,o)}));return Ve(e,o,t(e))}})))([...ze(e),...t],Ue)})(e);return Je(t)},Xe=(e,t,o)=>y.from(e.access[Ke(t,o)]),Ye=(e,t,o)=>{const l=((e,t)=>{const o=F(e.all,(e=>e.cells));return k(o,t)})(e,(e=>o(t,e.element)));return l.length>0?y.some(l[0]):y.none()},Ze=(e,t)=>y.from(e.columns[t]);var et=tinymce.util.Tools.resolve("tinymce.util.Tools");const tt=(e,t,o)=>{const l=e.select("td,th",t);let n;for(let t=0;t<l.length;t++){const r=e.getStyle(l[t],o);if(a(n)&&(n=r),n!==r)return""}return n},ot=(e,t,o)=>{et.each("left center right".split(" "),(l=>{l!==o&&e.formatter.remove("align"+l,{},t)})),o&&e.formatter.apply("align"+o,{},t)},lt=(e,t,o)=>{e.dispatch("TableModified",{...o,table:t})},nt=(e,t,o)=>((e,t)=>(e=>{const t=parseFloat(e);return isNaN(t)?y.none():y.some(t)})(e).getOr(t))(ke(e,t),o),rt=e=>((e,t)=>{const o=e.dom,l=o.getBoundingClientRect().width||o.offsetWidth;return"border-box"===t?l:((e,t,o,l)=>t-nt(e,`padding-${o}`,0)-nt(e,`padding-${l}`,0)-nt(e,`border-${o}-width`,0)-nt(e,`border-${l}-width`,0))(e,l,"left","right")})(e,"content-box");var at=tinymce.util.Tools.resolve("tinymce.Env");const st=I(5,(e=>{const t=`${e+1}px`;return{title:t,value:t}})),ct=M(["Solid","Dotted","Dashed","Double","Groove","Ridge","Inset","Outset","None","Hidden"],(e=>({title:e,value:e.toLowerCase()}))),it="100%",mt=e=>{var t;const o=e.dom,l=null!==(t=o.getParent(e.selection.getStart(),o.isBlock))&&void 0!==t?t:e.getBody();return rt(V.fromDom(l))+"px"},dt=e=>t=>t.options.get(e),ut=dt("table_sizing_mode"),pt=dt("table_border_widths"),bt=dt("table_border_styles"),gt=dt("table_cell_advtab"),ht=dt("table_row_advtab"),ft=dt("table_advtab"),yt=dt("table_appearance_options"),wt=dt("table_grid"),St=dt("table_style_by_css"),Ct=dt("table_cell_class_list"),vt=dt("table_row_class_list"),Tt=dt("table_class_list"),xt=dt("table_toolbar"),At=dt("table_background_color_map"),Rt=dt("table_border_color_map"),Ot=e=>"fixed"===ut(e),_t=e=>"responsive"===ut(e),Dt=e=>{const t=e.options,o=t.get("table_default_styles");return t.isSet("table_default_styles")?o:((e,t)=>_t(e)||!St(e)?t:Ot(e)?{...t,width:mt(e)}:{...t,width:it})(e,o)},Nt=e=>{const t=e.options,o=t.get("table_default_attributes");return t.isSet("table_default_attributes")?o:((e,t)=>_t(e)||St(e)?t:Ot(e)?{...t,width:mt(e)}:{...t,width:it})(e,o)},It=(e,t)=>t.column>=e.startCol&&t.column+t.colspan-1<=e.finishCol&&t.row>=e.startRow&&t.row+t.rowspan-1<=e.finishRow,Mt=(e,t,o)=>((e,t,o)=>{const l=Ye(e,t,z),n=Ye(e,o,z);return l.bind((e=>n.map((t=>{return o=e,l=t,{startRow:Math.min(o.row,l.row),startCol:Math.min(o.column,l.column),finishRow:Math.max(o.row+o.rowspan-1,l.row+l.rowspan-1),finishCol:Math.max(o.column+o.colspan-1,l.column+l.colspan-1)};var o,l}))))})(e,t,o).bind((t=>((e,t)=>{let o=!0;const l=b(It,t);for(let n=t.startRow;n<=t.finishRow;n++)for(let r=t.startCol;r<=t.finishCol;r++)o=o&&Xe(e,n,r).exists(l);return o?y.some(t):y.none()})(e,t))),Pt=Qe,kt=(e,t)=>{oe(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},Et=(e,t)=>{le(e).fold((()=>{oe(e).each((e=>{Bt(e,t)}))}),(e=>{kt(e,t)}))},Bt=(e,t)=>{e.dom.appendChild(t.dom)},Ft=(e,t)=>{P(t,((o,l)=>{const n=0===l?e:t[l-1];Et(n,o)}))},qt=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Lt=((e,t)=>{const o=t=>e(t)?y.from(t.dom.nodeValue):y.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(X);var Ht=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"];const jt=(e,t,o,l)=>{const n=t(e,o);return r=(o,l)=>{const n=t(e,l);return Vt(e,o,n)},a=n,((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(l,((e,t)=>{a=r(a,e)})),a;var r,a},Vt=(e,t,o)=>t.bind((t=>o.filter(b(e.eq,t)))),$t={up:d({selector:me,closest:pe,predicate:ie,all:(e,t)=>{const o=c(t)?t:h;let l=e.dom;const n=[];for(;null!==l.parentNode&&void 0!==l.parentNode;){const e=l.parentNode,t=V.fromDom(e);if(n.push(t),!0===o(t))break;l=e}return n}}),down:d({selector:Ce,predicate:we}),styles:d({get:ke,getRaw:Be,set:(e,t,o)=>{((e,t,o)=>{if(!l(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);Pe(e)&&e.style.setProperty(t,o)})(e.dom,t,o)},remove:(e,t)=>{((e,t)=>{Pe(e)&&e.style.removeProperty(t)})(e.dom,t),Re(xe(e,"style").map(De),"")&&Ae(e,"style")}}),attrs:d({get:Te,set:(e,t,o)=>{ve(e.dom,t,o)},remove:Ae,copyTo:(e,t)=>{((e,t)=>{const o=e.dom;C(t,((e,t)=>{ve(o,t,e)}))})(t,E(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}))}}),insert:d({before:kt,after:Et,afterAll:Ft,append:Bt,appendAll:(e,t)=>{P(t,(t=>{Bt(e,t)}))},prepend:(e,t)=>{(e=>((e,t)=>{const o=e.dom.childNodes;return y.from(o[0]).map(V.fromDom)})(e))(e).fold((()=>{Bt(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},wrap:(e,t)=>{kt(e,t),Bt(t,e)}}),remove:d({unwrap:e=>{const t=ne(e);t.length>0&&Ft(e,t),qt(e)},remove:qt}),create:d({nu:V.fromTag,clone:e=>V.fromDom(e.dom.cloneNode(!1)),text:V.fromText}),query:d({comparePosition:(e,t)=>e.dom.compareDocumentPosition(t.dom),prevSibling:e=>y.from(e.dom.previousSibling).map(V.fromDom),nextSibling:le}),property:d({children:ne,name:G,parent:oe,document:e=>te(e).dom,isText:X,isComment:e=>8===K(e)||"#comment"===G(e),isElement:Q,isSpecial:e=>{const t=G(e);return D(["script","noscript","iframe","noframes","noembed","title","style","textarea","xmp"],t)},getLanguage:e=>Q(e)?xe(e,"lang"):y.none(),getText:e=>Lt.get(e),setText:(e,t)=>Lt.set(e,t),isBoundary:e=>!!Q(e)&&("body"===G(e)||D(Ht,G(e))),isEmptyTag:e=>!!Q(e)&&D(["br","img","hr","input"],G(e)),isNonEditable:e=>Q(e)&&"false"===Te(e,"contenteditable")}),eq:z,is:U},Wt=e=>me(e,"table"),zt=(e,t,o)=>ue(e,t).bind((t=>ue(e,o).bind((e=>{return(o=Wt,l=[t,e],((e,t,o)=>o.length>0?((e,t,o,l)=>l(e,t,o[0],o.slice(1)))(e,t,o,jt):y.none())($t,((e,t)=>o(t)),l)).map((o=>({first:t,last:e,table:o})));var o,l})))),Ut=e=>M(e,V.fromDom),Gt="data-mce-selected",Kt="data-mce-first-selected",Jt="data-mce-last-selected",Qt={selected:Gt,selectedSelector:"td["+Gt+"],th["+Gt+"]",firstSelected:Kt,firstSelectedSelector:"td["+Kt+"],th["+Kt+"]",lastSelected:Jt,lastSelectedSelector:"td["+Jt+"],th["+Jt+"]"},Xt=e=>(t,o)=>{const l=G(t),n="col"===l||"colgroup"===l?$e(r=t).bind((e=>((e,t)=>((e,t)=>{const o=Ce(e,t);return o.length>0?y.some(o):y.none()})(e,t))(e,Qt.firstSelectedSelector))).fold(d(r),(e=>e[0])):t;var r;return pe(n,e,o)},Yt=Xt("th,td,caption"),Zt=Xt("th,td"),eo=e=>Ut(e.model.table.getSelectedCells()),to=(e,t)=>{const o=Zt(e),l=o.bind((e=>$e(e))).map((e=>We(e)));return Oe(o,l,((e,o)=>k(o,(o=>N(Ut(o.dom.cells),(o=>"1"===Te(o,t)||z(o,e))))))).getOr([])},oo=[{text:"None",value:""},{text:"Top",value:"top"},{text:"Middle",value:"middle"},{text:"Bottom",value:"bottom"}],lo=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,no=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,ro=e=>{return(t=e,"#",_e(t,"#")?((e,t)=>e.substring(1))(t):t).toUpperCase();var t},ao=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},so=e=>{return t=ao(e.red)+ao(e.green)+ao(e.blue),{value:ro(t)};var t},co=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,io=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,mo=(e,t,o,l)=>({red:e,green:t,blue:o,alpha:l}),uo=(e,t,o,l)=>{const n=parseInt(e,10),r=parseInt(t,10),a=parseInt(o,10),s=parseFloat(l);return mo(n,r,a,s)},po=e=>{if("transparent"===e)return y.some(mo(0,0,0,0));const t=co.exec(e);if(null!==t)return y.some(uo(t[1],t[2],t[3],"1"));const o=io.exec(e);return null!==o?y.some(uo(o[1],o[2],o[3],o[4])):y.none()},bo=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},go=(e,t,o)=>l=>{const n=(e=>{const t=bo(y.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(y.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(y.some(e))}}})((e=>e.unbind())),r=!Ie(o),a=()=>{const a=eo(e),s=l=>e.formatter.match(t,{value:o},l.dom,r);r?(l.setActive(!N(a,s)),n.set(e.formatter.formatChanged(t,(e=>l.setActive(!e)),!0))):(l.setActive(q(a,s)),n.set(e.formatter.formatChanged(t,l.setActive,!1,{value:o})))};return e.initialized?a():e.on("init",a),n.clear},ho=e=>R(e,"menu"),fo=e=>M(e,(e=>{const t=e.text||e.title||"";return ho(e)?{text:t,items:fo(e.menu)}:{text:t,value:e.value}})),yo=(e,t,o,l)=>M(t,(t=>{const n=t.text||t.title;return ho(t)?{type:"nestedmenuitem",text:n,getSubmenuItems:()=>yo(e,t.menu,o,l)}:{text:n,type:"togglemenuitem",onAction:()=>l(t.value),onSetup:go(e,o,t.value)}})),wo=(e,t)=>o=>{e.execCommand("mceTableApplyCellStyle",!1,{[t]:o})},So=e=>F(e,(e=>ho(e)?[{...e,menu:So(e.menu)}]:Ie(e.value)?[e]:[])),Co=(e,t,o,l)=>n=>n(yo(e,t,o,l)),vo=(e,t,o)=>{const l=M(t,(e=>{return{text:e.title,value:"#"+(o=e.value,(t=o,(e=>lo.test(e)||no.test(e))(t)?y.some({value:ro(t)}):y.none()).orThunk((()=>po(o).map(so))).getOrThunk((()=>{const e=document.createElement("canvas");e.height=1,e.width=1;const t=e.getContext("2d");t.clearRect(0,0,e.width,e.height),t.fillStyle="#FFFFFF",t.fillStyle=o,t.fillRect(0,0,1,1);const l=t.getImageData(0,0,1,1).data,n=l[0],r=l[1],a=l[2],s=l[3];return so(mo(n,r,a,s))}))).value,type:"choiceitem"};var t,o}));return[{type:"fancymenuitem",fancytype:"colorswatch",initData:{colors:l.length>0?l:void 0,allowCustomColors:!1},onAction:t=>{const l="remove"===t.value?"":t.value;e.execCommand("mceTableApplyCellStyle",!1,{[o]:l})}}]},To=e=>()=>{const t="header"===e.queryCommandValue("mceTableRowType")?"body":"header";e.execCommand("mceTableRowType",!1,{type:t})},xo=e=>()=>{const t="th"===e.queryCommandValue("mceTableColType")?"td":"th";e.execCommand("mceTableColType",!1,{type:t})},Ao=[{name:"width",type:"input",label:"Width"},{name:"height",type:"input",label:"Height"},{name:"celltype",type:"listbox",label:"Cell type",items:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{name:"scope",type:"listbox",label:"Scope",items:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{name:"halign",type:"listbox",label:"Horizontal align",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{name:"valign",type:"listbox",label:"Vertical align",items:oo}],Ro=e=>Ao.concat((e=>{const t=fo(Ct(e));return t.length>0?y.some({name:"class",type:"listbox",label:"Class",items:t}):y.none()})(e).toArray()),Oo=(e,t)=>{const o=[{name:"borderstyle",type:"listbox",label:"Border style",items:[{text:"Select...",value:""}].concat(fo(bt(e)))},{name:"bordercolor",type:"colorinput",label:"Border color"},{name:"backgroundcolor",type:"colorinput",label:"Background color"}];return{title:"Advanced",name:"advanced",items:"cell"===t?[{name:"borderwidth",type:"input",label:"Border width"}].concat(o):o}},_o=(e,t)=>{const o=e.dom;return{setAttrib:(e,l)=>{o.setAttrib(t,e,l)},setStyle:(e,l)=>{o.setStyle(t,e,l)},setFormat:(o,l)=>{""===l?e.formatter.remove(o,{value:null},t,!0):e.formatter.apply(o,{value:l},t)}}},Do=ee("th"),No=(e,t)=>e&&t?"sectionCells":e?"section":"cells",Io=e=>{const t=M(e,(e=>(e=>{const t="thead"===e.section,o=Re((e=>{const t=k(e,(e=>Do(e.element)));return 0===t.length?y.some("td"):t.length===e.length?y.some("th"):y.none()})(e.cells),"th");return"tfoot"===e.section?{type:"footer"}:t||o?{type:"header",subType:No(t,o)}:{type:"body"}})(e).type)),o=D(t,"header"),l=D(t,"footer");if(o||l){const e=D(t,"body");return!o||e||l?o||e||!l?y.none():y.some("footer"):y.some("header")}return y.some("body")},Mo=(e,t)=>H(e.all,(e=>B(e.cells,(e=>z(t,e.element))))),Po=(e,t,o)=>{const l=(e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t})(M(t.selection,(t=>{return(l=t,((e,t,o=h)=>o(t)?y.none():D(e,G(t))?y.some(t):me(t,e.join(","),(e=>$(e,"table")||o(e))))(["td","th"],l,n)).bind((t=>Mo(e,t))).filter(o);var l,n})));return n=l,l.length>0?y.some(n):y.none();var n},ko=(e,t)=>Po(e,t,f),Eo=(e,t)=>q(t,(t=>((e,t)=>Mo(e,t).exists((e=>!e.isLocked)))(e,t))),Bo=(e,t)=>((e,t)=>t.mergable)(0,t).filter((t=>Eo(e,t.cells))),Fo=(e,t)=>((e,t)=>t.unmergable)(0,t).filter((t=>Eo(e,t))),qo=((e=>{if(!n(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};P(e,((l,r)=>{const a=w(l);if(1!==a.length)throw new Error("one and only one name per case");const s=a[0],c=l[s];if(void 0!==o[s])throw new Error("duplicate key detected:"+s);if("cata"===s)throw new Error("cannot have a case named cata (sorry)");if(!n(c))throw new Error("case arguments must be an array");t.push(s),o[s]=(...o)=>{const l=o.length;if(l!==c.length)throw new Error("Wrong number of arguments to case "+s+". Expected "+c.length+" ("+c+"), got "+l);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,o)},match:e=>{const l=w(e);if(t.length!==l.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+l.join(","));if(!q(t,(e=>D(l,e))))throw new Error("Not all branches were specified when using match. Specified: "+l.join(", ")+"\nRequired: "+t.join(", "));return e[s].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:s,params:o})}}}}))})([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}]),(e,t)=>{const o=Qe(e);return ko(o,t).bind((e=>{const t=e[e.length-1],l=e[0].row,n=t.row+t.rowspan,r=o.all.slice(l,n);return Io(r)})).getOr("")}),Lo=e=>{return _e(e,"rgb")?po(t=e).map(so).map((e=>"#"+e.value)).getOr(t):e;var t},Ho=e=>{const t=V.fromDom(e);return{borderwidth:Be(t,"border-width").getOr(""),borderstyle:Be(t,"border-style").getOr(""),bordercolor:Be(t,"border-color").map(Lo).getOr(""),backgroundcolor:Be(t,"background-color").map(Lo).getOr("")}},jo=e=>{const t=e[0],o=e.slice(1);return P(o,(e=>{P(w(t),(o=>{C(e,((e,l)=>{const n=t[o];""!==n&&o===l&&n!==e&&(t[o]="")}))}))})),t},Vo=(e,t,o,l)=>B(e,(e=>!a(o.formatter.matchNode(l,t+e)))).getOr(""),$o=b(Vo,["left","center","right"],"align"),Wo=b(Vo,["top","middle","bottom"],"valign"),zo=e=>$e(V.fromDom(e)).map((t=>{const o={selection:Ut(e.cells)};return qo(t,o)})).getOr(""),Uo=(e,t)=>{const o=Qe(e),l=(e=>F(e.all,(e=>e.cells)))(o),n=k(l,(e=>N(t,(t=>z(e.element,t)))));return M(n,(e=>({element:e.element.dom,column:Ze(o,e.column).map((e=>e.element.dom))})))},Go=(e,t,o,l)=>{const n=l.getData();l.close(),e.undoManager.transact((()=>{((e,t,o,l)=>{const n=v(l,((e,t)=>o[t]!==e));T(n)>0&&t.length>=1&&$e(t[0]).each((o=>{const r=Uo(o,t),a=T(v(n,((e,t)=>"scope"!==t&&"celltype"!==t)))>0,s=A(n,"celltype");(a||A(n,"scope"))&&((e,t,o,l)=>{const n=1===t.length;P(t,(t=>{const r=t.element,a=n?f:l,s=_o(e,r);((e,t,o,l)=>{l("scope")&&e.setAttrib("scope",o.scope),l("class")&&e.setAttrib("class",o.class),l("height")&&e.setStyle("height",fe(o.height)),l("width")&&t.setStyle("width",fe(o.width))})(s,t.column.map((t=>_o(e,t))).getOr(s),o,a),gt(e)&&((e,t,o)=>{o("backgroundcolor")&&e.setFormat("tablecellbackgroundcolor",t.backgroundcolor),o("bordercolor")&&e.setFormat("tablecellbordercolor",t.bordercolor),o("borderstyle")&&e.setFormat("tablecellborderstyle",t.borderstyle),o("borderwidth")&&e.setFormat("tablecellborderwidth",fe(t.borderwidth))})(s,o,a),l("halign")&&ot(e,r,o.halign),l("valign")&&((e,t,o)=>{et.each("top middle bottom".split(" "),(l=>{l!==o&&e.formatter.remove("valign"+l,{},t)})),o&&e.formatter.apply("valign"+o,{},t)})(e,r,o.valign)}))})(e,r,l,b(A,n)),s&&((e,t)=>{e.execCommand("mceTableCellType",!1,{type:t.celltype,no_events:!0})})(e,l),lt(e,o.dom,{structure:s,style:a})}))})(e,t,o,n),e.focus()}))},Ko=e=>{const t=eo(e);if(0===t.length)return;const o=((e,t)=>{const o=$e(t[0]).map((o=>M(Uo(o,t),(t=>((e,t,o,l)=>{const n=e.dom,r=(e,t)=>n.getStyle(e,t)||n.getAttrib(e,t);return{width:r(l.getOr(t),"width"),height:r(t,"height"),scope:n.getAttrib(t,"scope"),celltype:(a=t,a.nodeName.toLowerCase()),class:n.getAttrib(t,"class",""),halign:$o(e,t),valign:Wo(e,t),...o?Ho(t):{}};var a})(e,t.element,gt(e),t.column)))));return jo(o.getOrDie())})(e,t),l={type:"tabpanel",tabs:[{title:"General",name:"general",items:Ro(e)},Oo(e,"cell")]},n={type:"panel",items:[{type:"grid",columns:2,items:Ro(e)}]};e.windowManager.open({title:"Cell Properties",size:"normal",body:gt(e)?l:n,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:o,onSubmit:b(Go,e,t,o)})},Jo=[{type:"listbox",name:"type",label:"Row type",items:[{text:"Header",value:"header"},{text:"Body",value:"body"},{text:"Footer",value:"footer"}]},{type:"listbox",name:"align",label:"Alignment",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height",type:"input"}],Qo=e=>Jo.concat((e=>{const t=fo(vt(e));return t.length>0?y.some({name:"class",type:"listbox",label:"Class",items:t}):y.none()})(e).toArray()),Xo=(e,t,o,l)=>{const n=l.getData();l.close(),e.undoManager.transact((()=>{((e,t,o,l)=>{const n=v(l,((e,t)=>o[t]!==e));if(T(n)>0){const o=A(n,"type"),r=!o||T(n)>1;r&&((e,t,o,l)=>{const n=1===t.length?f:l;P(t,(t=>{const r=_o(e,t);((e,t,o)=>{o("class")&&e.setAttrib("class",t.class),o("height")&&e.setStyle("height",fe(t.height))})(r,o,n),ht(e)&&((e,t,o)=>{o("backgroundcolor")&&e.setStyle("background-color",t.backgroundcolor),o("bordercolor")&&e.setStyle("border-color",t.bordercolor),o("borderstyle")&&e.setStyle("border-style",t.borderstyle)})(r,o,n),l("align")&&ot(e,t,o.align)}))})(e,t,l,b(A,n)),o&&((e,t)=>{e.execCommand("mceTableRowType",!1,{type:t.type,no_events:!0})})(e,l),$e(V.fromDom(t[0])).each((t=>lt(e,t.dom,{structure:o,style:r})))}})(e,t,o,n),e.focus()}))},Yo=e=>{const t=to(ye(e),Qt.selected);if(0===t.length)return;const o=M(t,(t=>((e,t,o)=>{const l=e.dom;return{height:l.getStyle(t,"height")||l.getAttrib(t,"height"),class:l.getAttrib(t,"class",""),type:zo(t),align:$o(e,t),...o?Ho(t):{}}})(e,t.dom,ht(e)))),l=jo(o),n={type:"tabpanel",tabs:[{title:"General",name:"general",items:Qo(e)},Oo(e,"row")]},r={type:"panel",items:[{type:"grid",columns:2,items:Qo(e)}]};e.windowManager.open({title:"Row Properties",size:"normal",body:ht(e)?n:r,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:l,onSubmit:b(Xo,e,M(t,(e=>e.dom)),l)})},Zo=(e,t,o)=>{const l=o?[{type:"input",name:"cols",label:"Cols",inputMode:"numeric"},{type:"input",name:"rows",label:"Rows",inputMode:"numeric"}]:[],n=yt(e)?[{type:"input",name:"cellspacing",label:"Cell spacing",inputMode:"numeric"},{type:"input",name:"cellpadding",label:"Cell padding",inputMode:"numeric"},{type:"input",name:"border",label:"Border width"},{type:"label",label:"Caption",items:[{type:"checkbox",name:"caption",label:"Show caption"}]}]:[],r=t.length>0?[{type:"listbox",name:"class",label:"Class",items:t}]:[];return l.concat([{type:"input",name:"width",label:"Width"},{type:"input",name:"height",label:"Height"}]).concat(n).concat([{type:"listbox",name:"align",label:"Alignment",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]).concat(r)},el=(e,t,o,n)=>{if("TD"===t.tagName||"TH"===t.tagName)l(o)&&s(n)?e.setStyle(t,o,n):e.setStyles(t,o);else if(t.children)for(let l=0;l<t.children.length;l++)el(e,t.children[l],o,n)},tl=(e,t,o,l)=>{const n=e.dom,r=l.getData(),s=v(r,((e,t)=>o[t]!==e));l.close(),""===r.class&&delete r.class,e.undoManager.transact((()=>{if(!t){const o=Me(r.cols).getOr(1),l=Me(r.rows).getOr(1);e.execCommand("mceInsertTable",!1,{rows:l,columns:o}),t=Zt(ye(e),he(e)).bind((t=>$e(t,he(e)))).map((e=>e.dom)).getOrDie()}if(T(s)>0){const o={border:A(s,"border"),bordercolor:A(s,"bordercolor"),cellpadding:A(s,"cellpadding")};((e,t,o,l)=>{const n=e.dom,r={},s={},c=St(e),i=ft(e);if(a(o.class)||(r.class=o.class),s.height=fe(o.height),c?s.width=fe(o.width):n.getAttrib(t,"width")&&(r.width=(e=>e?e.replace(/px$/,""):"")(o.width)),c?(s["border-width"]=fe(o.border),s["border-spacing"]=fe(o.cellspacing)):(r.border=o.border,r.cellpadding=o.cellpadding,r.cellspacing=o.cellspacing),c&&t.children){const e={};if(l.border&&(e["border-width"]=fe(o.border)),l.cellpadding&&(e.padding=fe(o.cellpadding)),i&&l.bordercolor&&(e["border-color"]=o.bordercolor),!(e=>{for(const t in e)if(S.call(e,t))return!1;return!0})(e))for(let o=0;o<t.children.length;o++)el(n,t.children[o],e)}if(i){const e=o;s["background-color"]=e.backgroundcolor,s["border-color"]=e.bordercolor,s["border-style"]=e.borderstyle}n.setStyles(t,{...Dt(e),...s}),n.setAttribs(t,{...Nt(e),...r})})(e,t,r,o);const l=n.select("caption",t)[0];(l&&!r.caption||!l&&r.caption)&&e.execCommand("mceTableToggleCaption"),ot(e,t,r.align)}if(e.focus(),e.addVisual(),T(s)>0){const o=A(s,"caption"),l=!o||T(s)>1;lt(e,t,{structure:o,style:l})}}))},ol=(e,t)=>{const o=e.dom;let l,n=((e,t)=>{const o=Dt(e),l=Nt(e),n=t?{borderstyle:x(o,"border-style").getOr(""),bordercolor:Lo(x(o,"border-color").getOr("")),backgroundcolor:Lo(x(o,"background-color").getOr(""))}:{};return{height:"",width:"100%",cellspacing:"",cellpadding:"",caption:!1,class:"",align:"",border:"",...o,...l,...n,...(()=>{const t=o["border-width"];return St(e)&&t?{border:t}:x(l,"border").fold((()=>({})),(e=>({border:e})))})(),...{...x(o,"border-spacing").or(x(l,"cellspacing")).fold((()=>({})),(e=>({cellspacing:e}))),...x(o,"border-padding").or(x(l,"cellpadding")).fold((()=>({})),(e=>({cellpadding:e})))}}})(e,ft(e));t?(n.cols="1",n.rows="1",ft(e)&&(n.borderstyle="",n.bordercolor="",n.backgroundcolor="")):(l=o.getParent(e.selection.getStart(),"table",e.getBody()),l?n=((e,t,o)=>{const l=e.dom,n=St(e)?l.getStyle(t,"border-spacing")||l.getAttrib(t,"cellspacing"):l.getAttrib(t,"cellspacing")||l.getStyle(t,"border-spacing"),r=St(e)?tt(l,t,"padding")||l.getAttrib(t,"cellpadding"):l.getAttrib(t,"cellpadding")||tt(l,t,"padding");return{width:l.getStyle(t,"width")||l.getAttrib(t,"width"),height:l.getStyle(t,"height")||l.getAttrib(t,"height"),cellspacing:null!=n?n:"",cellpadding:null!=r?r:"",border:((t,o)=>{const l=Be(V.fromDom(o),"border-width");return St(e)&&l.isSome()?l.getOr(""):t.getAttrib(o,"border")||tt(e.dom,o,"border-width")||tt(e.dom,o,"border")||""})(l,t),caption:!!l.select("caption",t)[0],class:l.getAttrib(t,"class",""),align:$o(e,t),...o?Ho(t):{}}})(e,l,ft(e)):ft(e)&&(n.borderstyle="",n.bordercolor="",n.backgroundcolor=""));const r=fo(Tt(e));r.length>0&&n.class&&(n.class=n.class.replace(/\s*mce\-item\-table\s*/g,""));const a={type:"grid",columns:2,items:Zo(e,r,t)},s=ft(e)?{type:"tabpanel",tabs:[{title:"General",name:"general",items:[a]},Oo(e,"table")]}:{type:"panel",items:[a]};e.windowManager.open({title:"Table Properties",size:"normal",body:s,onSubmit:b(tl,e,l,n),buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:n})},ll=e=>{C({mceTableProps:b(ol,e,!1),mceTableRowProps:b(Yo,e),mceTableCellProps:b(Ko,e),mceInsertTableDialog:b(ol,e,!0)},((t,o)=>e.addCommand(o,(()=>{return o=t,void((e=>{return(t=e,o=ee("table"),ce(((e,t)=>t(e)),ie,t,o,void 0)).forall(be);var t,o})(ye(e))&&o());var o}))))},nl=u,rl=e=>{const t=(e,t)=>xe(e,t).exists((e=>parseInt(e,10)>1));return e.length>0&&q(e,(e=>t(e,"rowspan")||t(e,"colspan")))?y.some(e):y.none()},al=(e,t,o)=>{return t.length<=1?y.none():(l=e,n=o.firstSelectedSelector,r=o.lastSelectedSelector,zt(l,n,r).bind((e=>{const t=e=>z(l,e),o="thead,tfoot,tbody,table",n=me(e.first,o,t),r=me(e.last,o,t);return n.bind((t=>r.bind((o=>z(t,o)?((e,t,o)=>{const l=Pt(e);return Mt(l,t,o)})(e.table,e.first,e.last):y.none()))))}))).map((e=>({bounds:e,cells:t})));var l,n,r},sl=e=>{const t=bo(y.none()),o=bo([]);let l=y.none();const n=ee("caption"),r=e=>l.forall((t=>!t[e])),a=()=>Yt(ye(e),he(e)).bind((t=>{return o=Oe($e(t),Yt((e=>V.fromDom(e.selection.getEnd()))(e),he(e)).bind($e),((o,l)=>z(o,l)?n(t)?y.some((e=>({element:e,mergable:y.none(),unmergable:y.none(),selection:[e]}))(t)):y.some(((e,t,o)=>({element:o,mergable:al(t,e,Qt),unmergable:rl(e),selection:nl(e)}))(eo(e),o,t)):y.none())),o.bind(u);var o})),s=e=>$e(e.element).map((t=>{const o=Qe(t),l=ko(o,e).getOr([]),n=E(l,((e,t)=>(t.isLocked&&(e.onAny=!0,0===t.column?e.onFirst=!0:t.column+t.colspan>=o.grid.columns&&(e.onLast=!0)),e)),{onAny:!1,onFirst:!1,onLast:!1});return{mergeable:Bo(o,e).isSome(),unmergeable:Fo(o,e).isSome(),locked:n}})),c=()=>{t.set((e=>{let t,o=!1;return(...l)=>(o||(o=!0,t=e.apply(null,l)),t)})(a)()),l=t.get().bind(s),P(o.get(),g)},i=e=>(e(),o.set(o.get().concat([e])),()=>{o.set(k(o.get(),(t=>t!==e)))}),m=(o,l)=>i((()=>t.get().fold((()=>{o.setEnabled(!1)}),(t=>{o.setEnabled(!l(t)&&e.selection.isEditable())})))),d=(o,l,n)=>i((()=>t.get().fold((()=>{o.setEnabled(!1),o.setActive(!1)}),(t=>{o.setEnabled(!l(t)&&e.selection.isEditable()),o.setActive(n(t))})))),p=e=>l.exists((t=>t.locked[e])),b=(t,o)=>l=>d(l,(e=>n(e.element)),(()=>e.queryCommandValue(t)===o)),f=b("mceTableRowType","header"),w=b("mceTableColType","th");return e.on("NodeChange ExecCommand TableSelectorChange",c),{onSetupTable:e=>m(e,(e=>!1)),onSetupCellOrRow:e=>m(e,(e=>n(e.element))),onSetupColumn:e=>t=>m(t,(t=>n(t.element)||p(e))),onSetupPasteable:e=>t=>m(t,(t=>n(t.element)||e().isNone())),onSetupPasteableColumn:(e,t)=>o=>m(o,(o=>n(o.element)||e().isNone()||p(t))),onSetupMergeable:e=>m(e,(e=>r("mergeable"))),onSetupUnmergeable:e=>m(e,(e=>r("unmergeable"))),resetTargets:c,onSetupTableWithCaption:t=>d(t,h,(t=>$e(t.element,he(e)).exists((e=>de(e,"caption").isSome())))),onSetupTableRowHeaders:f,onSetupTableColumnHeaders:w,targets:t.get}};var cl=tinymce.util.Tools.resolve("tinymce.FakeClipboard");const il="x-tinymce/dom-table-",ml=il+"rows",dl=il+"columns",ul=e=>{var t;const o=null!==(t=cl.read())&&void 0!==t?t:[];return H(o,(t=>y.from(t.getType(e))))},pl=()=>ul(ml),bl=()=>ul(dl),gl=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}},hl=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}};e.add("table",(e=>{const t=sl(e);(e=>{const t=e.options.register;t("table_border_widths",{processor:"object[]",default:st}),t("table_border_styles",{processor:"object[]",default:ct}),t("table_cell_advtab",{processor:"boolean",default:!0}),t("table_row_advtab",{processor:"boolean",default:!0}),t("table_advtab",{processor:"boolean",default:!0}),t("table_appearance_options",{processor:"boolean",default:!0}),t("table_grid",{processor:"boolean",default:!at.deviceType.isTouch()}),t("table_cell_class_list",{processor:"object[]",default:[]}),t("table_row_class_list",{processor:"object[]",default:[]}),t("table_class_list",{processor:"object[]",default:[]}),t("table_toolbar",{processor:"string",default:"tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol"}),t("table_background_color_map",{processor:"object[]",default:[]}),t("table_border_color_map",{processor:"object[]",default:[]})})(e),ll(e),((e,t)=>{const o=t=>()=>e.execCommand(t),l=(t,l)=>!!e.queryCommandSupported(l.command)&&(e.ui.registry.addMenuItem(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)}),!0),n=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addToggleMenuItem(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})},r=t=>{e.execCommand("mceInsertTable",!1,{rows:t.numRows,columns:t.numColumns})},a=[l("tableinsertrowbefore",{text:"Insert row before",icon:"table-insert-row-above",command:"mceTableInsertRowBefore",onSetup:t.onSetupCellOrRow}),l("tableinsertrowafter",{text:"Insert row after",icon:"table-insert-row-after",command:"mceTableInsertRowAfter",onSetup:t.onSetupCellOrRow}),l("tabledeleterow",{text:"Delete row",icon:"table-delete-row",command:"mceTableDeleteRow",onSetup:t.onSetupCellOrRow}),l("tablerowprops",{text:"Row properties",icon:"table-row-properties",command:"mceTableRowProps",onSetup:t.onSetupCellOrRow}),l("tablecutrow",{text:"Cut row",icon:"cut-row",command:"mceTableCutRow",onSetup:t.onSetupCellOrRow}),l("tablecopyrow",{text:"Copy row",icon:"duplicate-row",command:"mceTableCopyRow",onSetup:t.onSetupCellOrRow}),l("tablepasterowbefore",{text:"Paste row before",icon:"paste-row-before",command:"mceTablePasteRowBefore",onSetup:t.onSetupPasteable(pl)}),l("tablepasterowafter",{text:"Paste row after",icon:"paste-row-after",command:"mceTablePasteRowAfter",onSetup:t.onSetupPasteable(pl)})],s=[l("tableinsertcolumnbefore",{text:"Insert column before",icon:"table-insert-column-before",command:"mceTableInsertColBefore",onSetup:t.onSetupColumn("onFirst")}),l("tableinsertcolumnafter",{text:"Insert column after",icon:"table-insert-column-after",command:"mceTableInsertColAfter",onSetup:t.onSetupColumn("onLast")}),l("tabledeletecolumn",{text:"Delete column",icon:"table-delete-column",command:"mceTableDeleteCol",onSetup:t.onSetupColumn("onAny")}),l("tablecutcolumn",{text:"Cut column",icon:"cut-column",command:"mceTableCutCol",onSetup:t.onSetupColumn("onAny")}),l("tablecopycolumn",{text:"Copy column",icon:"duplicate-column",command:"mceTableCopyCol",onSetup:t.onSetupColumn("onAny")}),l("tablepastecolumnbefore",{text:"Paste column before",icon:"paste-column-before",command:"mceTablePasteColBefore",onSetup:t.onSetupPasteableColumn(bl,"onFirst")}),l("tablepastecolumnafter",{text:"Paste column after",icon:"paste-column-after",command:"mceTablePasteColAfter",onSetup:t.onSetupPasteableColumn(bl,"onLast")})],i=[l("tablecellprops",{text:"Cell properties",icon:"table-cell-properties",command:"mceTableCellProps",onSetup:t.onSetupCellOrRow}),l("tablemergecells",{text:"Merge cells",icon:"table-merge-cells",command:"mceTableMergeCells",onSetup:t.onSetupMergeable}),l("tablesplitcells",{text:"Split cell",icon:"table-split-cells",command:"mceTableSplitCells",onSetup:t.onSetupUnmergeable})];wt(e)?e.ui.registry.addNestedMenuItem("inserttable",{text:"Table",icon:"table",getSubmenuItems:()=>[{type:"fancymenuitem",fancytype:"inserttable",onAction:r}],onSetup:hl(e)}):e.ui.registry.addMenuItem("inserttable",{text:"Table",icon:"table",onAction:o("mceInsertTableDialog"),onSetup:hl(e)}),e.ui.registry.addMenuItem("inserttabledialog",{text:"Insert table",icon:"table",onAction:o("mceInsertTableDialog"),onSetup:hl(e)}),l("tableprops",{text:"Table properties",onSetup:t.onSetupTable,command:"mceTableProps"}),l("deletetable",{text:"Delete table",icon:"table-delete-table",onSetup:t.onSetupTable,command:"mceTableDelete"}),D(a,!0)&&e.ui.registry.addNestedMenuItem("row",{type:"nestedmenuitem",text:"Row",getSubmenuItems:d("tableinsertrowbefore tableinsertrowafter tabledeleterow tablerowprops | tablecutrow tablecopyrow tablepasterowbefore tablepasterowafter")}),D(s,!0)&&e.ui.registry.addNestedMenuItem("column",{type:"nestedmenuitem",text:"Column",getSubmenuItems:d("tableinsertcolumnbefore tableinsertcolumnafter tabledeletecolumn | tablecutcolumn tablecopycolumn tablepastecolumnbefore tablepastecolumnafter")}),D(i,!0)&&e.ui.registry.addNestedMenuItem("cell",{type:"nestedmenuitem",text:"Cell",getSubmenuItems:d("tablecellprops tablemergecells tablesplitcells")}),e.ui.registry.addContextMenu("table",{update:()=>(t.resetTargets(),t.targets().fold(d(""),(e=>"caption"===G(e.element)?"tableprops deletetable":"cell row column | advtablesort | tableprops deletetable")))});const m=So(Tt(e));0!==m.length&&e.queryCommandSupported("mceTableToggleClass")&&e.ui.registry.addNestedMenuItem("tableclass",{icon:"table-classes",text:"Table styles",getSubmenuItems:()=>yo(e,m,"tableclass",(t=>e.execCommand("mceTableToggleClass",!1,t))),onSetup:t.onSetupTable});const u=So(Ct(e));0!==u.length&&e.queryCommandSupported("mceTableCellToggleClass")&&e.ui.registry.addNestedMenuItem("tablecellclass",{icon:"table-cell-classes",text:"Cell styles",getSubmenuItems:()=>yo(e,u,"tablecellclass",(t=>e.execCommand("mceTableCellToggleClass",!1,t))),onSetup:t.onSetupCellOrRow}),e.queryCommandSupported("mceTableApplyCellStyle")&&(e.ui.registry.addNestedMenuItem("tablecellvalign",{icon:"vertical-align",text:"Vertical align",getSubmenuItems:()=>yo(e,oo,"tablecellverticalalign",wo(e,"vertical-align")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellborderwidth",{icon:"border-width",text:"Border width",getSubmenuItems:()=>yo(e,pt(e),"tablecellborderwidth",wo(e,"border-width")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellborderstyle",{icon:"border-style",text:"Border style",getSubmenuItems:()=>yo(e,bt(e),"tablecellborderstyle",wo(e,"border-style")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellbackgroundcolor",{icon:"cell-background-color",text:"Background color",getSubmenuItems:()=>vo(e,At(e),"background-color"),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellbordercolor",{icon:"cell-border-color",text:"Border color",getSubmenuItems:()=>vo(e,Rt(e),"border-color"),onSetup:t.onSetupCellOrRow})),n("tablecaption",{icon:"table-caption",text:"Table caption",command:"mceTableToggleCaption",onSetup:t.onSetupTableWithCaption}),n("tablerowheader",{text:"Row header",icon:"table-top-header",command:"mceTableRowType",onAction:To(e),onSetup:t.onSetupTableRowHeaders}),n("tablecolheader",{text:"Column header",icon:"table-left-header",command:"mceTableColType",onAction:xo(e),onSetup:t.onSetupTableRowHeaders})})(e,t),((e,t)=>{e.ui.registry.addMenuButton("table",{tooltip:"Table",icon:"table",onSetup:gl(e),fetch:e=>e("inserttable | cell row column | advtablesort | tableprops deletetable")});const o=t=>()=>e.execCommand(t),l=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addButton(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})},n=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addToggleButton(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})};l("tableprops",{tooltip:"Table properties",command:"mceTableProps",icon:"table",onSetup:t.onSetupTable}),l("tabledelete",{tooltip:"Delete table",command:"mceTableDelete",icon:"table-delete-table",onSetup:t.onSetupTable}),l("tablecellprops",{tooltip:"Cell properties",command:"mceTableCellProps",icon:"table-cell-properties",onSetup:t.onSetupCellOrRow}),l("tablemergecells",{tooltip:"Merge cells",command:"mceTableMergeCells",icon:"table-merge-cells",onSetup:t.onSetupMergeable}),l("tablesplitcells",{tooltip:"Split cell",command:"mceTableSplitCells",icon:"table-split-cells",onSetup:t.onSetupUnmergeable}),l("tableinsertrowbefore",{tooltip:"Insert row before",command:"mceTableInsertRowBefore",icon:"table-insert-row-above",onSetup:t.onSetupCellOrRow}),l("tableinsertrowafter",{tooltip:"Insert row after",command:"mceTableInsertRowAfter",icon:"table-insert-row-after",onSetup:t.onSetupCellOrRow}),l("tabledeleterow",{tooltip:"Delete row",command:"mceTableDeleteRow",icon:"table-delete-row",onSetup:t.onSetupCellOrRow}),l("tablerowprops",{tooltip:"Row properties",command:"mceTableRowProps",icon:"table-row-properties",onSetup:t.onSetupCellOrRow}),l("tableinsertcolbefore",{tooltip:"Insert column before",command:"mceTableInsertColBefore",icon:"table-insert-column-before",onSetup:t.onSetupColumn("onFirst")}),l("tableinsertcolafter",{tooltip:"Insert column after",command:"mceTableInsertColAfter",icon:"table-insert-column-after",onSetup:t.onSetupColumn("onLast")}),l("tabledeletecol",{tooltip:"Delete column",command:"mceTableDeleteCol",icon:"table-delete-column",onSetup:t.onSetupColumn("onAny")}),l("tablecutrow",{tooltip:"Cut row",command:"mceTableCutRow",icon:"cut-row",onSetup:t.onSetupCellOrRow}),l("tablecopyrow",{tooltip:"Copy row",command:"mceTableCopyRow",icon:"duplicate-row",onSetup:t.onSetupCellOrRow}),l("tablepasterowbefore",{tooltip:"Paste row before",command:"mceTablePasteRowBefore",icon:"paste-row-before",onSetup:t.onSetupPasteable(pl)}),l("tablepasterowafter",{tooltip:"Paste row after",command:"mceTablePasteRowAfter",icon:"paste-row-after",onSetup:t.onSetupPasteable(pl)}),l("tablecutcol",{tooltip:"Cut column",command:"mceTableCutCol",icon:"cut-column",onSetup:t.onSetupColumn("onAny")}),l("tablecopycol",{tooltip:"Copy column",command:"mceTableCopyCol",icon:"duplicate-column",onSetup:t.onSetupColumn("onAny")}),l("tablepastecolbefore",{tooltip:"Paste column before",command:"mceTablePasteColBefore",icon:"paste-column-before",onSetup:t.onSetupPasteableColumn(bl,"onFirst")}),l("tablepastecolafter",{tooltip:"Paste column after",command:"mceTablePasteColAfter",icon:"paste-column-after",onSetup:t.onSetupPasteableColumn(bl,"onLast")}),l("tableinsertdialog",{tooltip:"Insert table",command:"mceInsertTableDialog",icon:"table",onSetup:gl(e)});const r=So(Tt(e));0!==r.length&&e.queryCommandSupported("mceTableToggleClass")&&e.ui.registry.addMenuButton("tableclass",{icon:"table-classes",tooltip:"Table styles",fetch:Co(e,r,"tableclass",(t=>e.execCommand("mceTableToggleClass",!1,t))),onSetup:t.onSetupTable});const a=So(Ct(e));0!==a.length&&e.queryCommandSupported("mceTableCellToggleClass")&&e.ui.registry.addMenuButton("tablecellclass",{icon:"table-cell-classes",tooltip:"Cell styles",fetch:Co(e,a,"tablecellclass",(t=>e.execCommand("mceTableCellToggleClass",!1,t))),onSetup:t.onSetupCellOrRow}),e.queryCommandSupported("mceTableApplyCellStyle")&&(e.ui.registry.addMenuButton("tablecellvalign",{icon:"vertical-align",tooltip:"Vertical align",fetch:Co(e,oo,"tablecellverticalalign",wo(e,"vertical-align")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellborderwidth",{icon:"border-width",tooltip:"Border width",fetch:Co(e,pt(e),"tablecellborderwidth",wo(e,"border-width")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellborderstyle",{icon:"border-style",tooltip:"Border style",fetch:Co(e,bt(e),"tablecellborderstyle",wo(e,"border-style")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellbackgroundcolor",{icon:"cell-background-color",tooltip:"Background color",fetch:t=>t(vo(e,At(e),"background-color")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellbordercolor",{icon:"cell-border-color",tooltip:"Border color",fetch:t=>t(vo(e,Rt(e),"border-color")),onSetup:t.onSetupCellOrRow})),n("tablecaption",{tooltip:"Table caption",icon:"table-caption",command:"mceTableToggleCaption",onSetup:t.onSetupTableWithCaption}),n("tablerowheader",{tooltip:"Row header",icon:"table-top-header",command:"mceTableRowType",onAction:To(e),onSetup:t.onSetupTableRowHeaders}),n("tablecolheader",{tooltip:"Column header",icon:"table-left-header",command:"mceTableColType",onAction:xo(e),onSetup:t.onSetupTableColumnHeaders})})(e,t),(e=>{const t=xt(e);t.length>0&&e.ui.registry.addContextToolbar("table",{predicate:t=>e.dom.is(t,"table")&&e.getBody().contains(t)&&e.dom.isEditable(t.parentNode),items:t,scope:"node",position:"node"})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/template/plugin.min.js b/public/libs/tinymce/plugins/template/plugin.min.js
index 6b47bd5a9ab..c5a21fadb59 100644
--- a/public/libs/tinymce/plugins/template/plugin.min.js
+++ b/public/libs/tinymce/plugins/template/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(a=n=e,(r=String).prototype.isPrototypeOf(a)||(null===(s=n.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var a,n,r,s})(t)===e,a=t("string"),n=t("object"),r=t("array"),s=("function",e=>"function"==typeof e);const l=(!1,()=>false);var o=tinymce.util.Tools.resolve("tinymce.util.Tools");const c=e=>t=>t.options.get(e),i=c("template_cdate_classes"),u=c("template_mdate_classes"),m=c("template_selected_content_classes"),p=c("template_preview_replace_values"),d=c("template_replace_values"),h=c("templates"),g=c("template_cdate_format"),v=c("template_mdate_format"),f=c("content_style"),y=c("content_css_cors"),b=c("body_class"),_=(e,t)=>{if((e=""+e).length<t)for(let a=0;a<t-e.length;a++)e="0"+e;return e},M=(e,t,a=new Date)=>{const n="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),s="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),l="January February March April May June July August September October November December".split(" ");return(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=t.replace("%D","%m/%d/%Y")).replace("%r","%I:%M:%S %p")).replace("%Y",""+a.getFullYear())).replace("%y",""+a.getYear())).replace("%m",_(a.getMonth()+1,2))).replace("%d",_(a.getDate(),2))).replace("%H",""+_(a.getHours(),2))).replace("%M",""+_(a.getMinutes(),2))).replace("%S",""+_(a.getSeconds(),2))).replace("%I",""+((a.getHours()+11)%12+1))).replace("%p",a.getHours()<12?"AM":"PM")).replace("%B",""+e.translate(l[a.getMonth()]))).replace("%b",""+e.translate(s[a.getMonth()]))).replace("%A",""+e.translate(r[a.getDay()]))).replace("%a",""+e.translate(n[a.getDay()]))).replace("%%","%")};class T{constructor(e,t){this.tag=e,this.value=t}static some(e){return new T(!0,e)}static none(){return T.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?T.some(e(this.value)):T.none()}bind(e){return this.tag?e(this.value):T.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:T.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?T.none():T.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}T.singletonNone=new T(!1);const S=Object.hasOwnProperty;var x=tinymce.util.Tools.resolve("tinymce.html.Serializer");const C={'"':"&quot;","<":"&lt;",">":"&gt;","&":"&amp;","'":"&#039;"},w=e=>e.replace(/["'<>&]/g,(e=>{return(t=C,a=e,((e,t)=>S.call(e,t))(t,a)?T.from(t[a]):T.none()).getOr(e);var t,a})),O=(e,t,a)=>((a,n)=>{for(let n=0,s=a.length;n<s;n++)if(r=a[n],e.hasClass(t,r))return!0;var r;return!1})(a.split(/\s+/)),A=(e,t)=>x({validate:!0},e.schema).serialize(e.parser.parse(t,{insert:!0})),D=(e,t)=>(o.each(t,((t,a)=>{s(t)&&(t=t(a)),e=e.replace(new RegExp("\\{\\$"+a.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")+"\\}","g"),t)})),e),N=(e,t)=>{const a=e.dom,n=d(e);o.each(a.select("*",t),(e=>{o.each(n,((t,n)=>{a.hasClass(e,n)&&s(t)&&t(e)}))}))},I=(e,t,a)=>{const n=e.dom,r=e.selection.getContent();a=D(a,d(e));let s=n.create("div",{},A(e,a));const l=n.select(".mceTmpl",s);l&&l.length>0&&(s=n.create("div"),s.appendChild(l[0].cloneNode(!0))),o.each(n.select("*",s),(t=>{O(n,t,i(e))&&(t.innerHTML=M(e,g(e))),O(n,t,u(e))&&(t.innerHTML=M(e,v(e))),O(n,t,m(e))&&(t.innerHTML=r)})),N(e,s),e.execCommand("mceInsertContent",!1,s.innerHTML),e.addVisual()};var E=tinymce.util.Tools.resolve("tinymce.Env");const k=(e,t)=>{const a=(e,t)=>((e,t,a)=>{for(let n=0,r=e.length;n<r;n++){const r=e[n];if(t(r,n))return T.some(r);if(a(r,n))break}return T.none()})(e,(e=>e.text===t),l),n=t=>{e.windowManager.alert("Could not load the specified template.",(()=>t.focus("template")))},r=e=>e.value.url.fold((()=>Promise.resolve(e.value.content.getOr(""))),(e=>fetch(e).then((e=>e.ok?e.text():Promise.reject())))),s=(e,t)=>(s,l)=>{if("template"===l.name){const l=s.getData().template;a(e,l).each((e=>{s.block("Loading..."),r(e).then((a=>{t(s,e,a)})).catch((()=>{t(s,e,""),s.setEnabled("save",!1),n(s)}))}))}},c=t=>s=>{const l=s.getData();a(t,l.template).each((t=>{r(t).then((t=>{e.execCommand("mceInsertTemplate",!1,t),s.close()})).catch((()=>{s.setEnabled("save",!1),n(s)}))}))};(()=>{if(!t||0===t.length){const t=e.translate("No templates defined.");return e.notificationManager.open({text:t,type:"info"}),T.none()}return T.from(o.map(t,((e,t)=>{const a=e=>void 0!==e.url;return{selected:0===t,text:e.title,value:{url:a(e)?T.from(e.url):T.none(),content:a(e)?T.none():T.from(e.content),description:e.description}}})))})().each((t=>{const a=(e=>((e,t)=>{const a=e.length,n=new Array(a);for(let t=0;t<a;t++){const a=e[t];n[t]={text:(r=a).text,value:r.text}}var r;return n})(e))(t),l=(e,a)=>({title:"Insert Template",size:"large",body:{type:"panel",items:e},initialData:a,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:c(t),onChange:s(t,i)}),i=(t,n,r)=>{const s=((e,t)=>{var a;let n=A(e,t);if(-1===t.indexOf("<html>")){let t="";const r=null!==(a=f(e))&&void 0!==a?a:"",s=y(e)?' crossorigin="anonymous"':"";o.each(e.contentCSS,(a=>{t+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(a)+'"'+s+">"})),r&&(t+='<style type="text/css">'+r+"</style>");const l=b(e),c=e.dom.encode,i='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A" && !('+(E.os.isMacOS()||E.os.isiOS()?"e.metaKey":"e.ctrlKey && !e.altKey")+")) {e.preventDefault();}}}, false);<\/script> ",u=e.getBody().dir,m=u?' dir="'+c(u)+'"':"";n='<!DOCTYPE html><html><head><base href="'+c(e.documentBaseURI.getURI())+'">'+t+i+'</head><body class="'+c(l)+'"'+m+">"+n+"</body></html>"}return D(n,p(e))})(e,r),c=[{type:"listbox",name:"template",label:"Templates",items:a},{type:"htmlpanel",html:`<p aria-live="polite">${w(n.value.description)}</p>`},{label:"Preview",type:"iframe",name:"preview",sandboxed:!1,transparent:!1}],i={template:n.text,preview:s};t.unblock(),t.redial(l(c,i)),t.focus("template")},u=e.windowManager.open(l([],{template:"",preview:""}));u.block("Loading..."),r(t[0]).then((e=>{i(u,t[0],e)})).catch((()=>{i(u,t[0],""),u.setEnabled("save",!1),n(u)}))}))},P=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("template",(e=>{(e=>{const t=e.options.register;t("template_cdate_classes",{processor:"string",default:"cdate"}),t("template_mdate_classes",{processor:"string",default:"mdate"}),t("template_selected_content_classes",{processor:"string",default:"selcontent"}),t("template_preview_replace_values",{processor:"object"}),t("template_replace_values",{processor:"object"}),t("templates",{processor:e=>a(e)||((e,t)=>{if(r(e)){for(let a=0,n=e.length;a<n;++a)if(!t(e[a]))return!1;return!0}return!1})(e,n)||s(e),default:[]}),t("template_cdate_format",{processor:"string",default:e.translate("%Y-%m-%d")}),t("template_mdate_format",{processor:"string",default:e.translate("%Y-%m-%d")})})(e),(e=>{const t=()=>e.execCommand("mceTemplate");e.ui.registry.addButton("template",{icon:"template",tooltip:"Insert template",onSetup:P(e),onAction:t}),e.ui.registry.addMenuItem("template",{icon:"template",text:"Insert template...",onSetup:P(e),onAction:t})})(e),(e=>{e.addCommand("mceInsertTemplate",function(e,...t){return(...a)=>{const n=t.concat(a);return e.apply(null,n)}}(I,e)),e.addCommand("mceTemplate",((e,t)=>()=>{const n=h(e);s(n)?n(t):a(n)?fetch(n).then((e=>{e.ok&&e.json().then(t)})):t(n)})(e,(e=>t=>{k(e,t)})(e)))})(e),(e=>{e.on("PreProcess",(t=>{const a=e.dom,n=v(e);o.each(a.select("div",t.node),(t=>{a.hasClass(t,"mceTmpl")&&(o.each(a.select("*",t),(t=>{O(a,t,u(e))&&(t.innerHTML=M(e,n))})),N(e,t))}))}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/visualblocks/plugin.min.js b/public/libs/tinymce/plugins/visualblocks/plugin.min.js
index a4abc67910c..c665a872b28 100644
--- a/public/libs/tinymce/plugins/visualblocks/plugin.min.js
+++ b/public/libs/tinymce/plugins/visualblocks/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const s=(t,s,o)=>{t.dom.toggleClass(t.getBody(),"mce-visualblocks"),o.set(!o.get()),((t,s)=>{t.dispatch("VisualBlocks",{state:s})})(t,o.get())},o=("visualblocks_default_state",t=>t.options.get("visualblocks_default_state"));const e=(t,s)=>o=>{o.setActive(s.get());const e=t=>o.setActive(t.state);return t.on("VisualBlocks",e),()=>t.off("VisualBlocks",e)};t.add("visualblocks",((t,l)=>{(t=>{(0,t.options.register)("visualblocks_default_state",{processor:"boolean",default:!1})})(t);const a=(t=>{let s=!1;return{get:()=>s,set:t=>{s=t}}})();((t,o,e)=>{t.addCommand("mceVisualBlocks",(()=>{s(t,0,e)}))})(t,0,a),((t,s)=>{const o=()=>t.execCommand("mceVisualBlocks");t.ui.registry.addToggleButton("visualblocks",{icon:"visualblocks",tooltip:"Show blocks",onAction:o,onSetup:e(t,s)}),t.ui.registry.addToggleMenuItem("visualblocks",{text:"Show blocks",icon:"visualblocks",onAction:o,onSetup:e(t,s)})})(t,a),((t,e,l)=>{t.on("PreviewFormats AfterPreviewFormats",(s=>{l.get()&&t.dom.toggleClass(t.getBody(),"mce-visualblocks","afterpreviewformats"===s.type)})),t.on("init",(()=>{o(t)&&s(t,0,l)}))})(t,0,a)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/visualchars/plugin.min.js b/public/libs/tinymce/plugins/visualchars/plugin.min.js
index 80f42b79314..d6e884798d9 100644
--- a/public/libs/tinymce/plugins/visualchars/plugin.min.js
+++ b/public/libs/tinymce/plugins/visualchars/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(n=o=t,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":e;var n,o,r,s})(e)===t,n=t=>e=>typeof e===t,o=e("string"),r=e("object"),s=(null,t=>null===t);const a=n("boolean"),l=n("number");class i{constructor(t,e){this.tag=t,this.value=e}static some(t){return new i(!0,t)}static none(){return i.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?i.some(t(this.value)):i.none()}bind(t){return this.tag?t(this.value):i.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:i.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return null==t?i.none():i.some(t)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}i.singletonNone=new i(!1);const u=(t,e)=>{for(let n=0,o=t.length;n<o;n++)e(t[n],n)},c=Object.keys,d=(t,e)=>{const n=c(t);for(let o=0,r=n.length;o<r;o++){const r=n[o];e(t[r],r)}},h="undefined"!=typeof window?window:Function("return this;")(),m=(t,e)=>((t,e)=>{let n=null!=e?e:h;for(let e=0;e<t.length&&null!=n;++e)n=n[t[e]];return n})(t.split("."),e),g=Object.getPrototypeOf,v=t=>{const e=m("ownerDocument.defaultView",t);return r(t)&&((t=>((t,e)=>{const n=((t,e)=>m(t,e))(t,e);if(null==n)throw new Error(t+" not available on this browser");return n})("HTMLElement",t))(e).prototype.isPrototypeOf(t)||/^HTML\w*Element$/.test(g(t).constructor.name))},f=t=>t.dom.nodeValue,p=t=>e=>(t=>t.dom.nodeType)(e)===t,b=t=>w(t)&&v(t.dom),w=p(1),y=p(3),A=(t,e,n)=>{((t,e,n)=>{if(!(o(n)||a(n)||l(n)))throw console.error("Invalid call to Attribute.set. Key ",e,":: Value ",n,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(e,n+"")})(t.dom,e,n)},k=(t,e)=>{t.dom.removeAttribute(e)},N=(t,e)=>{const n=((t,e)=>{const n=t.dom.getAttribute(e);return null===n?void 0:n})(t,e);return void 0===n||""===n?[]:n.split(" ")},T=t=>void 0!==t.dom.classList,C=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},E=C,O={"\xa0":"nbsp","\xad":"shy"},L=(t,e)=>{let n="";return d(t,((t,e)=>{n+=e})),new RegExp("["+n+"]",e?"g":"")},V=L(O),j=L(O,!0),B=(t=>{let e="";return d(t,(t=>{e&&(e+=","),e+="span.mce-"+t})),e})(O),S="mce-nbsp",_=t=>t.dom.contentEditable,x=t=>'<span data-mce-bogus="1" class="mce-'+O[t]+'">'+t+"</span>",M=t=>"span"===t.nodeName.toLowerCase()&&t.classList.contains("mce-nbsp-wrap"),P=t=>{const e=f(t);return y(t)&&o(e)&&V.test(e)},D=(t,e,n)=>{let o=[];const r=((t,e)=>{const n=t.length,o=new Array(n);for(let r=0;r<n;r++){const n=t[r];o[r]=e(n,r)}return o})(t.dom.childNodes,E);return u(r,(t=>{var r;n&&(M((r=t).dom)||!(t=>b(t)&&"false"===_(t))(r))&&e(t)&&(o=o.concat([t])),o=o.concat(D(t,e,((t,e)=>{if(b(t)&&!M(t.dom)){const e=_(t);if("true"===e)return!0;if("false"===e)return!1}return e})(t,n)))})),o},H=(t,e)=>{const n=t.dom,o=D(E(e),P,t.dom.isEditable(e));u(o,(e=>{var o;const r=e.dom.parentNode;if(M(r))s=E(r),a=S,T(s)?s.dom.classList.add(a):((t,e)=>{((t,e,n)=>{const o=N(t,e).concat([n]);A(t,e,o.join(" "))})(t,"class",e)})(s,a);else{const r=n.encode(null!==(o=f(e))&&void 0!==o?o:"").replace(j,x),s=n.create("div",{},r);let a;for(;a=s.lastChild;)n.insertAfter(a,e.dom);t.dom.remove(e.dom)}var s,a}))},I=(t,e)=>{const n=t.dom.select(B,e);u(n,(e=>{var n,o;M(e)?(n=E(e),o=S,T(n)?n.dom.classList.remove(o):((t,e)=>{((t,e,n)=>{const o=((t,e)=>{const o=[];for(let e=0,r=t.length;e<r;e++){const r=t[e];r!==n&&o.push(r)}return o})(N(t,e));o.length>0?A(t,e,o.join(" ")):k(t,e)})(t,"class",e)})(n,o),(t=>{const e=T(t)?t.dom.classList:(t=>N(t,"class"))(t);0===e.length&&k(t,"class")})(n)):t.dom.remove(e,!0)}))},$=t=>{const e=t.getBody(),n=t.selection.getBookmark();let o=((t,e)=>{for(;t.parentNode;){if(t.parentNode===e)return e;t=t.parentNode}})(t.selection.getNode(),e);o=void 0!==o?o:e,I(t,o),H(t,o),t.selection.moveToBookmark(n)},F=(t,e)=>{((t,e)=>{t.dispatch("VisualChars",{state:e})})(t,e.get());const n=t.getBody();!0===e.get()?H(t,n):I(t,n)},K=("visualchars_default_state",t=>t.options.get("visualchars_default_state"));const R=(t,e)=>{const n=((t,e)=>{let n=null;return{cancel:()=>{s(n)||(clearTimeout(n),n=null)},throttle:(...e)=>{s(n)&&(n=setTimeout((()=>{n=null,t.apply(null,e)}),300))}}})((()=>{$(t)}));t.on("keydown",(o=>{!0===e.get()&&(13===o.keyCode?$(t):n.throttle())})),t.on("remove",n.cancel)},U=(t,e)=>n=>{n.setActive(e.get());const o=t=>n.setActive(t.state);return t.on("VisualChars",o),()=>t.off("VisualChars",o)};t.add("visualchars",(t=>{(t=>{(0,t.options.register)("visualchars_default_state",{processor:"boolean",default:!1})})(t);const e=(t=>{let e=t;return{get:()=>e,set:t=>{e=t}}})(K(t));return((t,e)=>{t.addCommand("mceVisualChars",(()=>{((t,e)=>{e.set(!e.get());const n=t.selection.getBookmark();F(t,e),t.selection.moveToBookmark(n)})(t,e)}))})(t,e),((t,e)=>{const n=()=>t.execCommand("mceVisualChars");t.ui.registry.addToggleButton("visualchars",{tooltip:"Show invisible characters",icon:"visualchars",onAction:n,onSetup:U(t,e)}),t.ui.registry.addToggleMenuItem("visualchars",{text:"Show invisible characters",icon:"visualchars",onAction:n,onSetup:U(t,e)})})(t,e),R(t,e),((t,e)=>{t.on("init",(()=>{F(t,e)}))})(t,e),(t=>({isEnabled:()=>t.get()}))(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/wordcount/plugin.min.js b/public/libs/tinymce/plugins/wordcount/plugin.min.js
index bf18864cb14..41e0cb6c1b4 100644
--- a/public/libs/tinymce/plugins/wordcount/plugin.min.js
+++ b/public/libs/tinymce/plugins/wordcount/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=(null,t=>null===t);const n=t=>t,o=(t,e)=>{const n=t.length,o=new Array(n);for(let r=0;r<n;r++){const n=t[r];o[r]=e(n,r)}return o},r="[-'\\.\u2018\u2019\u2024\ufe52\uff07\uff0e]",c="[:\xb7\xb7\u05f4\u2027\ufe13\ufe55\uff1a]",u="[\xb1+*/,;;\u0589\u060c\u060d\u066c\u07f8\u2044\ufe10\ufe14\ufe50\ufe54\uff0c\uff1b]",s="[0-9\u0660-\u0669\u066b\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u1090-\u1099\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1a80-\u1a89\u1a90-\u1a99\u1b50-\u1b59\u1bb0-\u1bb9\u1c40-\u1c49\u1c50-\u1c59\ua620-\ua629\ua8d0-\ua8d9\ua900-\ua909\ua9d0-\ua9d9\uaa50-\uaa59\uabf0-\uabf9]",a="\\r",l="\\n",i="[\v\f\x85\u2028\u2029]",d="[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f\u109a-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b6-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u192b\u1930-\u193b\u19b0-\u19c0\u19c8\u19c9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f\u1b00-\u1b04\u1b34-\u1b44\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1baa\u1be6-\u1bf3\u1c24-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe3-\uabea\uabec\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]",g="[\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200e\u200f\u202a-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb]",p="[\u3031-\u3035\u309b\u309c\u30a0-\u30fa\u30fc-\u30ff\u31f0-\u31ff\u32d0-\u32fe\u3300-\u3357\uff66-\uff9d]",h="[=_\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f\u2200-\u22ff<>]",C="[~\u2116|!-*+-\\/:;?@\\[-`{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]",y=10,m=[new RegExp("[A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f3\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bc0-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u24b6-\u24e9\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005\u303b\u303c\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790\ua791\ua7a0-\ua7a9\ua7fa-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]"),new RegExp(r),new RegExp(c),new RegExp(u),new RegExp(s),new RegExp(a),new RegExp(l),new RegExp(i),new RegExp(d),new RegExp(g),new RegExp(p),new RegExp(h),new RegExp("@")],w=new RegExp("^"+C+"$"),W=m,f=t=>{let e=13;const n=W.length;for(let o=0;o<n;++o){const n=W[o];if(n&&n.test(t)){e=o;break}}return e},x=(t,e)=>{const n=t[e],o=t[e+1];if(e<0||e>t.length-1&&0!==e)return!1;if(0===n&&0===o)return!1;const r=t[e+2];if(0===n&&(2===o||1===o||12===o)&&0===r)return!1;const c=t[e-1];return(2!==n&&1!==n&&12!==o||0!==o||0!==c)&&(4!==n&&0!==n||4!==o&&0!==o)&&(3!==n&&1!==n||4!==o||4!==c)&&(4!==n||3!==o&&1!==o||4!==r)&&(8!==n&&9!==n||0!==o&&4!==o&&o!==y&&8!==o&&9!==o)&&(8!==o&&(9!==o||0!==r&&4!==r&&r!==y&&8!==r&&9!==r)||0!==n&&4!==n&&n!==y&&8!==n&&9!==n)&&(5!==n||6!==o)&&(7===n||5===n||6===n||7===o||5===o||6===o||(n!==y||o!==y)&&(11!==o||0!==n&&4!==n&&n!==y&&11!==n)&&(11!==n||0!==o&&4!==o&&o!==y)&&12!==n)},E=/^\s+$/,R=w,S=t=>"http"===t||"https"===t,b=(t,e)=>{const n=((t,e)=>{let n;for(n=e;n<t.length&&!E.test(t[n]);n++);return n})(t,e+1);return"://"===t.slice(e+1,n).join("").substr(0,3)?n:e},v=(t,e,n)=>((t,e,n)=>{n={includeWhitespace:!1,includePunctuation:!1,...n};const r=o(t,e);return((t,e,n,o)=>{const r=[],c=[];let u=[];for(let s=0;s<n.length;++s)if(u.push(t[s]),x(n,s)){const n=e[s];if((o.includeWhitespace||!E.test(n))&&(o.includePunctuation||!R.test(n))){const n=s-u.length+1,o=s+1,a=e.slice(n,o).join("");if(S(a)){const n=b(e,s),r=t.slice(o,n);Array.prototype.push.apply(u,r),s=n}r.push(u),c.push({start:n,end:o})}u=[]}return{words:r,indices:c}})(t,r,(t=>{const e=(t=>{const e={};return n=>{if(e[n])return e[n];{const o=t(n);return e[n]=o,o}}})(f);return o(t,e)})(r),n)})(t,e,n).words;var F=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker");const T=(t,e)=>{const n=e.getBlockElements(),o=e.getVoidElements(),r=t=>n[t.nodeName]||o[t.nodeName],c=[];let u="";const s=new F(t,t);let a;for(;a=s.next();)3===a.nodeType?u+=a.data.replace(/\uFEFF/g,""):r(a)&&u.length&&(c.push(u),u="");return u.length&&c.push(u),c},A=t=>t.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"_").length,B=(t,e)=>{const o=(t=>t.replace(/\u200B/g,""))(T(t,e).join("\n"));return v(o.split(""),n).length},D=(t,e)=>{const n=T(t,e).join("");return A(n)},j=(t,e)=>{const n=T(t,e).join("").replace(/\s/g,"");return A(n)},k=(t,e)=>()=>e(t.getBody(),t.schema),U=(t,e)=>()=>e(t.selection.getRng().cloneContents(),t.schema),M=t=>k(t,B);var P=tinymce.util.Tools.resolve("tinymce.util.Delay");const N=(t,e)=>{((t,e)=>{t.dispatch("wordCountUpdate",{wordCount:{words:e.body.getWordCount(),characters:e.body.getCharacterCount(),charactersWithoutSpaces:e.body.getCharacterCountWithoutSpaces()}})})(t,e)},V=(t,n,o)=>{const r=((t,n)=>{let o=null;return{cancel:()=>{e(o)||(clearTimeout(o),o=null)},throttle:(...r)=>{e(o)&&(o=setTimeout((()=>{o=null,t.apply(null,r)}),n))}}})((()=>N(t,n)),o);t.on("init",(()=>{N(t,n),P.setEditorTimeout(t,(()=>{t.on("SetContent BeforeAddUndo Undo Redo ViewUpdate keyup",r.throttle)}),0),t.on("remove",r.cancel)}))};((e=300)=>{t.add("wordcount",(t=>{const n=(t=>({body:{getWordCount:M(t),getCharacterCount:k(t,D),getCharacterCountWithoutSpaces:k(t,j)},selection:{getWordCount:U(t,B),getCharacterCount:U(t,D),getCharacterCountWithoutSpaces:U(t,j)},getCount:M(t)}))(t);return((t,e)=>{t.addCommand("mceWordCount",(()=>((t,e)=>{t.windowManager.open({title:"Word Count",body:{type:"panel",items:[{type:"table",header:["Count","Document","Selection"],cells:[["Words",String(e.body.getWordCount()),String(e.selection.getWordCount())],["Characters (no spaces)",String(e.body.getCharacterCountWithoutSpaces()),String(e.selection.getCharacterCountWithoutSpaces())],["Characters",String(e.body.getCharacterCount()),String(e.selection.getCharacterCount())]]}]},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}]})})(t,e)))})(t,n),(t=>{const e=()=>t.execCommand("mceWordCount");t.ui.registry.addButton("wordcount",{tooltip:"Word count",icon:"character-count",onAction:e}),t.ui.registry.addMenuItem("wordcount",{text:"Word count",icon:"character-count",onAction:e})})(t),V(t,n,e),n}))})()}();
\ No newline at end of file
diff --git a/public/libs/tinymce/skins/content/dark/content.js b/public/libs/tinymce/skins/content/dark/content.js
new file mode 100644
index 00000000000..e6c4254c771
--- /dev/null
+++ b/public/libs/tinymce/skins/content/dark/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/dark/content.css', "body{background-color:#222f3e;color:#fff;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#6d737b}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/content/default/content.js b/public/libs/tinymce/skins/content/default/content.js
new file mode 100644
index 00000000000..37724029dfc
--- /dev/null
+++ b/public/libs/tinymce/skins/content/default/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/default/content.css', "body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/content/document/content.js b/public/libs/tinymce/skins/content/document/content.js
new file mode 100644
index 00000000000..18a04050c7b
--- /dev/null
+++ b/public/libs/tinymce/skins/content/document/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/document/content.css', "@media screen{html{background:#f4f4f4;min-height:100%}}body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif}@media screen{body{background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.15);box-sizing:border-box;margin:1rem auto 0;max-width:820px;min-height:calc(100vh - 1rem);padding:4rem 6rem 6rem 6rem}}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#ccc}figure figcaption{color:#999;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/content/tinymce-5-dark/content.js b/public/libs/tinymce/skins/content/tinymce-5-dark/content.js
new file mode 100644
index 00000000000..f99dddf0100
--- /dev/null
+++ b/public/libs/tinymce/skins/content/tinymce-5-dark/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/tinymce-5-dark/content.css', "body{background-color:#2f3742;color:#dfe0e4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#6d737b}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/content/tinymce-5/content.js b/public/libs/tinymce/skins/content/tinymce-5/content.js
new file mode 100644
index 00000000000..2ed6b82e74d
--- /dev/null
+++ b/public/libs/tinymce/skins/content/tinymce-5/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/tinymce-5/content.css', "body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/content/writer/content.js b/public/libs/tinymce/skins/content/writer/content.js
new file mode 100644
index 00000000000..c682f29a94b
--- /dev/null
+++ b/public/libs/tinymce/skins/content/writer/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('content/writer/content.css', "body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem auto;max-width:900px}table{border-collapse:collapse}table:not([cellpadding]) td,table:not([cellpadding]) th{padding:.4rem}table[border]:not([border=\"0\"]):not([style*=border-width]) td,table[border]:not([border=\"0\"]):not([style*=border-width]) th{border-width:1px}table[border]:not([border=\"0\"]):not([style*=border-style]) td,table[border]:not([border=\"0\"]):not([style*=border-style]) th{border-style:solid}table[border]:not([border=\"0\"]):not([style*=border-color]) td,table[border]:not([border=\"0\"]):not([style*=border-color]) th{border-color:#ccc}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css b/public/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
deleted file mode 100644
index e272cc74837..00000000000
--- a/public/libs/tinymce/skins/ui/oxide-dark/content.inline.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
diff --git a/public/libs/tinymce/skins/ui/oxide-dark/content.min.css b/public/libs/tinymce/skins/ui/oxide-dark/content.min.css
deleted file mode 100644
index 75c0f83812f..00000000000
--- a/public/libs/tinymce/skins/ui/oxide-dark/content.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%236d737b%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#f8f8f2;background:0 0;text-shadow:0 1px rgba(0,0,0,.3);font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto;border-radius:.3em}:not(pre)>code[class*=language-],pre[class*=language-]{background:#282a36}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#6272a4}.token.punctuation{color:#f8f8f2}.namespace{opacity:.7}.token.constant,.token.deleted,.token.property,.token.symbol,.token.tag{color:#ff79c6}.token.boolean,.token.number{color:#bd93f9}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#50fa7b}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url,.token.variable{color:#f8f8f2}.token.atrule,.token.attr-value,.token.class-name,.token.function{color:#f1fa8c}.token.keyword{color:#8be9fd}.token.important,.token.regex{color:#ffb86c}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.3)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.3);color:#006ce7}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #4099ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #4099ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #4099ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #4099ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #4099ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#4099ff}.mce-content-body .mce-edit-focus{outline:3px solid #4099ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid transparent;bottom:-1px;content:'';left:-1px;mix-blend-mode:lighten;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#4099ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/public/libs/tinymce/skins/ui/oxide-dark/skin.min.css b/public/libs/tinymce/skins/ui/oxide-dark/skin.min.css
deleted file mode 100644
index bb6e83491a5..00000000000
--- a/public/libs/tinymce/skins/ui/oxide-dark/skin.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:2px solid #161f29;border-radius:10px;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#222f3e;border:2px solid #161f29;border-radius:10px;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:6px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(0,101,216,.4);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#006ce7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#0060ce}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#0054b4}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#161f29;border-radius:10px;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#006ce7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#006ce7;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:6px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #006ce7,0 0 0 3px rgba(0,108,231,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#006ce7;background-image:none;border-color:#006ce7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#0060ce;background-image:none;border-color:#0060ce;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#0060ce;background-image:none;border-color:#0060ce;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#00489b;background-image:none;border-color:#00489b;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#00489b;background-image:none;border-color:#00489b;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#003c81;background-image:none;border-color:#003c81;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#3d546f;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#3d546f;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;color:#fff;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#3d546f;background-image:none;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:hover:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:active:not(:disabled){background-color:#2b3b4e;background-image:none;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled{background-color:#2b5c93;background-image:none;border-color:#2b5c93;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#2b5c93;background-image:none;border-color:#2b5c93;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#254f80;background-image:none;border-color:#254f80;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#254f80;background-image:none;border-color:#254f80;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#1f436c;background-image:none;border-color:#1f436c;box-shadow:none;color:#fff}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked[disabled]{background-color:rgba(255,255,255,.2);border-color:transparent;box-shadow:unset;color:rgba(255,255,255,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:rgba(255,255,255,.2);border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked:focus:not(:disabled){background-color:rgba(255,255,255,.2);border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked:active:not(:disabled){background-color:rgba(255,255,255,.3);border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#fff}.tox .tox-checkbox{align-items:center;border-radius:6px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:6px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(255,255,255,.2)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#006ce7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#006ce7}.tox .tox-checkbox--disabled{color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(255,255,255,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:6px;box-shadow:inset 0 0 0 1px #006ce7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:rgba(255,255,255,.15);border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:rgba(255,255,255,.15);color:rgba(255,255,255,.5);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#fff;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#2b3b4e;color:#fff}.tox .tox-collection--list .tox-collection__item--active{background-color:#3389ec}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#599fef;color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#3389ec}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#599fef;color:#fff}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#3389ec;color:#fff}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(255,255,255,.5);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#fff}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(255,255,255,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#2b3b4e;border:1px solid rgba(255,255,255,.15);border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:28px;margin:6px 1px 5px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid transparent}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid transparent}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:5px 0 6px 11px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px -4px}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#fff;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#3389ec}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#fff;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#2b3b4e;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#2b3b4e;border:1px solid #161f29;border-radius:6px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#fff;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#fff;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#fff;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(255,255,255,.5);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#2b3b4e;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(43,59,78,0),#2b3b4e);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#2b3b4e;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#fff;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#2b3b4e;box-shadow:0 0 8px 8px #2b3b4e;color:#fff;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#2b3b4e;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(255,255,255,.5)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#fff;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(34,47,62,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#222f3e}.tox .tox-dialog{background-color:#2b3b4e;border-color:#161f29;border-radius:10px;border-style:solid;border-width:0;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#2b3b4e;border-bottom:none;color:#fff;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#fff;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(255,255,255,.5);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(0,108,231,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #67aeff;color:#67aeff}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#67aeff;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#cde5ff;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #67aeff;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#fff;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#fff}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#fff;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#fff;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#2b3b4e;border-top:none;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(34,47,62,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #000}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #161f29;border-radius:6px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #161f29;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(255,255,255,.5);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #fff;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #161f29}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#222f3e;border-bottom:1px solid rgba(255,255,255,.15);box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid rgba(255,255,255,.15);box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#222f3e;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:none}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#006ce7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(255,255,255,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(255,255,255,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #2b3b4e;border-radius:6px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(255,255,255,.5);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#161f29;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 5.5px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#222f3e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#2b3b4e;border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#006ce7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#fff}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#161f29;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 5.5px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#2b3b4e;border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#161f29;border-radius:6px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:rgba(255,255,255,.15);border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(0,108,231,.5);border-color:rgba(0,108,231,.5)}.tox .tox-insert-table-picker__label{color:#fff;display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#2b3b4e;border:1px solid rgba(255,255,255,.15);border-radius:6px;box-shadow:none;display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 4px}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:8px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:8px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:repeating-linear-gradient(transparent 0 1px,transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 11px 0 12px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:repeating-linear-gradient(transparent 0 1px,transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;background-color:#222f3e;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;justify-content:center;margin:5px 1px 6px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#3389ec;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn--active{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#3389ec;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#334840;border-color:#3c5440;color:#fff}.tox .tox-notification--success p{color:#fff}.tox .tox-notification--success a{color:#b5d199}.tox .tox-notification--success svg{fill:#fff}.tox .tox-notification--error{background-color:#442632;border-color:#55212b;color:#fff}.tox .tox-notification--error p{color:#fff}.tox .tox-notification--error a{color:#e68080}.tox .tox-notification--error svg{fill:#fff}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#222f3e;border-color:rgba(255,255,255,.15);color:#fff0b3}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#fff0b3}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#fc0}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#fff0b3}.tox .tox-notification--info{background-color:#254161;border-color:#264972;color:#fff}.tox .tox-notification--info p{color:#fff}.tox .tox-notification--info a{color:#83b7f3}.tox .tox-notification--info svg{fill:#fff}.tox .tox-notification__body{align-self:center;color:#fff;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#222f3e;border:1px solid #161f29;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#222f3e transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#161f29 transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #222f3e transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #161f29 transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #222f3e transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #161f29 transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #222f3e;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #161f29;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#222f3e;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #161f29;border-radius:6px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#006ce7;border:2px solid #0054b4;border-radius:6px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(255,255,255,.5);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#222f3e;border-top:1px solid rgba(255,255,255,.15);color:rgba(255,255,255,.75);display:flex;flex:0 0 auto;font-size:14px;font-weight:400;height:25px;overflow:hidden;padding:0 8px;position:relative;text-transform:none}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(255,255,255,.75);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(255,255,255,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#fff}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(255,255,255,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#434e5b;border-radius:1px 1px 5px 1px;box-shadow:0 0 0 2px #434e5b}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(34,47,62,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;justify-content:center;margin:6px 1px 5px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#fff}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#3389ec;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#3389ec;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:hover svg{fill:#fff}.tox .tox-tbtn:active{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:active svg{fill:#fff}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#fff}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#fff}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:42px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:56px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:6px 1px 5px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:#2f4055;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#3389ec}.tox .tox-number-input input{border-radius:3px;color:#fff;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#3389ec;color:#fff}.tox .tox-number-input input:focus{background:#fff;color:#222f3e}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button{background:#2f4055;color:#fff;height:28px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#fff;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#3389ec}.tox .tox-number-input button:hover{background:#3389ec;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:hover svg{fill:#fff}.tox .tox-number-input button:active{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:active svg{fill:#fff}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#3389ec}.tox .tox-tbtn--select{margin:6px 1px 5px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--bespoke{background:#2f4055}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:4px}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:6px 1px 5px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #3389ec inset}.tox .tox-split-button:focus{background:#3389ec;box-shadow:none;color:#fff}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(255,255,255,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#222f3e}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#222f3e;background-image:repeating-linear-gradient(rgba(255,255,255,.15) 0 1px,transparent 1px 39px);background-position:center top 40px;background-repeat:no-repeat;background-size:calc(100% - 11px * 2) calc(100% - 41px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 11px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid transparent;margin-top:-1px;padding-bottom:1px;padding-top:1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#222f3e;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 11px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 11px 0 12px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid transparent}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid transparent}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#3d546f;border-radius:6px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #3d546f;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #3d546f;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #3d546f;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #3d546f;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#fff}.tox .tox-tree .tox-trbtn:focus{background:#3389ec;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#3389ec;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:active{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:active svg{fill:#fff}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#599fef;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#fff}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#222f3e;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #161f29;border-radius:6px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #161f29;border-radius:6px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #161f29;border-radius:6px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox.tox-tinymce-aux .tox-toolbar__overflow{box-shadow:0 0 0 1px rgba(255,255,255,.15)}
diff --git a/public/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css b/public/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
deleted file mode 100644
index 8745951a484..00000000000
--- a/public/libs/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}
diff --git a/public/libs/tinymce/skins/ui/oxide/content.inline.min.css b/public/libs/tinymce/skins/ui/oxide/content.inline.min.css
deleted file mode 100644
index e272cc74837..00000000000
--- a/public/libs/tinymce/skins/ui/oxide/content.inline.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}
diff --git a/public/libs/tinymce/skins/ui/oxide/content.min.css b/public/libs/tinymce/skins/ui/oxide/content.min.css
deleted file mode 100644
index 3dbd91b6c78..00000000000
--- a/public/libs/tinymce/skins/ui/oxide/content.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-content-body .mce-item-anchor{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected="2"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border="0"],.mce-item-table[border="0"] caption,.mce-item-table[border="0"] td,.mce-item-table[border="0"] th,table[style*="border-width: 0px"],table[style*="border-width: 0px"] caption,table[style*="border-width: 0px"] td,table[style*="border-width: 0px"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}
diff --git a/public/libs/tinymce/skins/ui/oxide/skin.min.css b/public/libs/tinymce/skins/ui/oxide/skin.min.css
deleted file mode 100644
index 20fb052214e..00000000000
--- a/public/libs/tinymce/skins/ui/oxide/skin.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:2px solid #eee;border-radius:10px;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#fff;border:2px solid #eee;border-radius:10px;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:6px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(0,101,216,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#006ce7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#006ce7}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#006ce7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#0060ce}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#0054b4}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.08);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#527530}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#527530}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#eee;border-radius:10px;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#006ce7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#006ce7;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:6px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #006ce7,0 0 0 3px rgba(0,108,231,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#006ce7;background-image:none;border-color:#006ce7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#0060ce;background-image:none;border-color:#0060ce;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#0060ce;background-image:none;border-color:#0060ce;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#0054b4;background-image:none;border-color:#0054b4;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#00489b;background-image:none;border-color:#00489b;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#00489b;background-image:none;border-color:#00489b;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#003c81;background-image:none;border-color:#003c81;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled{background-color:#a8c8ed;background-image:none;border-color:#a8c8ed;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#a8c8ed;background-image:none;border-color:#a8c8ed;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#93bbe9;background-image:none;border-color:#93bbe9;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#93bbe9;background-image:none;border-color:#93bbe9;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#7daee4;background-image:none;border-color:#7daee4;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:rgba(34,47,62,.12);border-color:transparent;box-shadow:unset;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:rgba(34,47,62,.12);border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:rgba(34,47,62,.12);border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:rgba(34,47,62,.18);border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:6px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:6px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#006ce7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#006ce7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:6px;box-shadow:inset 0 0 0 1px #006ce7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#e3e3e3;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#fcfcfc;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#222f3e;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#cce2fa}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#a6ccf7;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#cce2fa}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#a6ccf7;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#cce2fa;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #e3e3e3;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:28px;margin:6px 1px 5px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid transparent}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid transparent}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:5px 0 6px 11px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px -4px}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#222f3e;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#cce2fa}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#222f3e;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #eee;border-radius:6px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#222f3e;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#222f3e;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#eee;border-radius:10px;border-style:solid;border-width:0;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(0,108,231,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #006ce7;color:#006ce7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#006ce7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#003c81;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #006ce7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#00244e;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:none;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #626262}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #eee;border-radius:6px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #eee;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #eee}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#fff;border-bottom:none;box-shadow:0 2px 2px -2px rgba(34,47,62,.1),0 8px 8px -4px rgba(34,47,62,.07);padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #e3e3e3;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#fff;box-shadow:0 2px 2px -2px rgba(34,47,62,.2),0 8px 8px -4px rgba(34,47,62,.15);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 2px 2px -2px rgba(34,47,62,.2),0 8px 8px -4px rgba(34,47,62,.15)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#006ce7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:6px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#eee;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 5.5px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#006ce7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#eee;border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 5.5px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#006ce7;box-shadow:0 0 0 2px rgba(0,108,231,.25);outline:0}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#eee;border-radius:6px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#eee;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(0,108,231,.5);border-color:rgba(0,108,231,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid transparent;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 4px}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:8px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:8px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:repeating-linear-gradient(transparent 0 1px,transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 11px 0 12px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:repeating-linear-gradient(transparent 0 1px,transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;background-color:#fff;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;justify-content:center;margin:5px 1px 6px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#cce2fa;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#cce2fa;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:6px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#517342}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f5cccc;border-color:#f0b3b3;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#77181f}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fff5cc;border-color:#fff0b3;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#7a6e25}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d6e7fb;border-color:#c1dbf9;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#2a64a6}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{align-self:center;color:#222f3e;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #eee;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#eee transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #eee transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #eee transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #eee;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #eee;border-radius:6px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#006ce7;border:2px solid #0054b4;border-radius:6px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #e3e3e3;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:14px;font-weight:400;height:25px;overflow:hidden;padding:0 8px;position:relative;text-transform:none}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#222f3e;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(34,47,62,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#222f3e}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px 1px 5px 1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;justify-content:center;margin:6px 1px 5px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#cce2fa;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#cce2fa;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:42px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:56px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:6px 1px 5px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:#f7f7f7;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#cce2fa}.tox .tox-number-input input{border-radius:3px;color:#222f3e;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#cce2fa;color:#222f3e}.tox .tox-number-input input:focus{background:#fff;color:#222f3e}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button{background:#f7f7f7;color:#222f3e;height:28px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#222f3e;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#cce2fa}.tox .tox-number-input button:hover{background:#cce2fa;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:hover svg{fill:#222f3e}.tox .tox-number-input button:active{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:active svg{fill:#222f3e}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#cce2fa}.tox .tox-tbtn--select{margin:6px 1px 5px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke{background:#f7f7f7}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:4px}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:6px 1px 5px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #cce2fa inset}.tox .tox-split-button:focus{background:#cce2fa;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#fff;background-image:repeating-linear-gradient(#e3e3e3 0 1px,transparent 1px 39px);background-position:center top 40px;background-repeat:no-repeat;background-size:calc(100% - 11px * 2) calc(100% - 41px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 11px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid transparent;margin-top:-1px;padding-bottom:1px;padding-top:1px}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:6px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 11px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 11px 0 12px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid transparent}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid transparent}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:6px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#222f3e}.tox .tox-tree .tox-trbtn:focus{background:#cce2fa;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#cce2fa;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:active svg{fill:#222f3e}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#a6ccf7;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#fff;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #eee;border-radius:6px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #eee;border-radius:6px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #eee;border-radius:6px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}
diff --git a/public/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css b/public/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
deleted file mode 100644
index 8745951a484..00000000000
--- a/public/libs/tinymce/skins/ui/oxide/skin.shadowdom.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}
diff --git a/public/libs/tinymce/skins/ui/tinymce-5-dark/content.inline.js b/public/libs/tinymce/skins/ui/tinymce-5-dark/content.inline.js
new file mode 100644
index 00000000000..dc35e9a1cf8
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5-dark/content.inline.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5-dark/content.inline.css', ".mce-content-body .mce-item-anchor{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A\"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected=\"2\"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected=\"2\"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A\") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border=\"0\"],.mce-item-table[border=\"0\"] caption,.mce-item-table[border=\"0\"] td,.mce-item-table[border=\"0\"] th,table[style*=\"border-width: 0px\"],table[style*=\"border-width: 0px\"] caption,table[style*=\"border-width: 0px\"] td,table[style*=\"border-width: 0px\"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}")
+//# sourceMappingURL=content.inline.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5-dark/content.js b/public/libs/tinymce/skins/ui/tinymce-5-dark/content.js
new file mode 100644
index 00000000000..de781d5a0c4
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5-dark/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5-dark/content.css', ".mce-content-body .mce-item-anchor{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%236d737b%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#f8f8f2;background:0 0;text-shadow:0 1px rgba(0,0,0,.3);font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto;border-radius:.3em}:not(pre)>code[class*=language-],pre[class*=language-]{background:#282a36}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#6272a4}.token.punctuation{color:#f8f8f2}.namespace{opacity:.7}.token.constant,.token.deleted,.token.property,.token.symbol,.token.tag{color:#ff79c6}.token.boolean,.token.number{color:#bd93f9}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#50fa7b}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url,.token.variable{color:#f8f8f2}.token.atrule,.token.attr-value,.token.class-name,.token.function{color:#f1fa8c}.token.keyword{color:#8be9fd}.token.important,.token.regex{color:#ffb86c}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A\"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected=\"2\"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.3)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.3);color:#006ce7}.mce-object{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected=\"2\"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A\") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #4099ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #4099ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #4099ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #4099ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #4099ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#4099ff}.mce-content-body .mce-edit-focus{outline:3px solid #4099ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid transparent;bottom:-1px;content:'';left:-1px;mix-blend-mode:lighten;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#4099ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border=\"0\"],.mce-item-table[border=\"0\"] caption,.mce-item-table[border=\"0\"] td,.mce-item-table[border=\"0\"] th,table[style*=\"border-width: 0px\"],table[style*=\"border-width: 0px\"] caption,table[style*=\"border-width: 0px\"] td,table[style*=\"border-width: 0px\"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.js b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.js
new file mode 100644
index 00000000000..16432fe8a15
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5-dark/skin.css', ".tox{box-shadow:none;box-sizing:content-box;color:#2a3746;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #000;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#222f3e;border:1px solid #000;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.4);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#000;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#3d546f;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#3d546f;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#fff;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#3d546f;background-image:none;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:hover:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:active:not(:disabled){background-color:#2b3b4e;background-image:none;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#264560;background-image:none;border-color:#264560;box-shadow:none;color:#fff}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked[disabled]{background-color:#3d546f;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:focus:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:active:not(:disabled){background-color:#2b3b4e;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#fff}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(255,255,255,.2)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(255,255,255,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#1a1a1a;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#333;color:#fff;cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#fff;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#2b3b4e;color:#fff}.tox .tox-collection--list .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#4a5562;color:#fff}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(255,255,255,.5);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#fff}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(255,255,255,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#2b3b4e;border:1px solid #1a1a1a;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #000}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #000}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-spectrum:focus,.tox .tox-sv-palette-spectrum:focus{outline:#08f solid}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#fff;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#4a5562}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#fff;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#2b3b4e;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#fff;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#fff;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#fff;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(255,255,255,.5);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#2b3b4e;bottom:0;content:\"\";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(43,59,78,0),#2b3b4e);bottom:0;content:\"\";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#2b3b4e;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#fff;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#2b3b4e;box-shadow:0 0 8px 8px #2b3b4e;color:#fff;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#2b3b4e;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(255,255,255,.5)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#fff;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(34,47,62,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#222f3e}.tox .tox-dialog{background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(42,55,70,.15),0 0 40px 1px rgba(42,55,70,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#2b3b4e;border-bottom:none;color:#fff;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#fff;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(255,255,255,.5);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#fff}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#fff;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#fff;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#2b3b4e;border-top:1px solid #000;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(34,47,62,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #000}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #000;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #000;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(255,255,255,.5);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #000}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#222f3e;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #000;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#222f3e;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(42,55,70,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(255,255,255,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(255,255,255,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #2b3b4e;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(255,255,255,.5);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#222f3e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#fff}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size=\"0\"],.tox:not([dir=rtl]) .tox-selectfield select[size=\"1\"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size=\"0\"],.tox[dir=rtl] .tox-selectfield select[size=\"1\"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#000;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#000;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:#fff;display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E\") left 0 top 0 #222f3e;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E\") left 0 top 0 #222f3e;background-color:#222f3e;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn--active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#334840;border-color:#3c5440;color:#fff}.tox .tox-notification--success p{color:#fff}.tox .tox-notification--success a{color:#b5d199}.tox .tox-notification--success svg{fill:#fff}.tox .tox-notification--error{background-color:#442632;border-color:#55212b;color:#fff}.tox .tox-notification--error p{color:#fff}.tox .tox-notification--error a{color:#e68080}.tox .tox-notification--error svg{fill:#fff}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#222f3e;border-color:#000;color:#fff0b3}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#fff0b3}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#fc0}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#fff0b3}.tox .tox-notification--info{background-color:#254161;border-color:#264972;color:#fff}.tox .tox-notification--info p{color:#fff}.tox .tox-notification--info a{color:#83b7f3}.tox .tox-notification--info svg{fill:#fff}.tox .tox-notification__body{align-self:center;color:#fff;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#222f3e;border:1px solid #000;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#222f3e transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#000 transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #222f3e transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #000 transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #222f3e transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #000 transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #222f3e;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #000;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#222f3e;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #000;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(255,255,255,.5);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#222f3e;border-top:1px solid #000;color:#fff;display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:#fff;text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(255,255,255,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#fff}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(255,255,255,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#4a5562;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #4a5562}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(34,47,62,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#fff}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:hover svg{fill:#fff}.tox .tox-tbtn:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:active svg{fill:#fff}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#fff}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#fff}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#4a5562}.tox .tox-number-input input{border-radius:3px;color:#fff;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#4a5562;color:#fff}.tox .tox-number-input input:focus{background:#fff;color:#2a3746}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#fff;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#fff;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#4a5562}.tox .tox-number-input button:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:hover svg{fill:#fff}.tox .tox-number-input button:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:active svg{fill:#fff}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#4a5562}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #4a5562 inset}.tox .tox-split-button:focus{background:#4a5562;box-shadow:none;color:#fff}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(255,255,255,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#222f3e}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#222f3e;background-image:repeating-linear-gradient(#000 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #000;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#222f3e;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #000}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #000}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#3d546f;border-radius:3px;box-shadow:0 2px 4px rgba(42,55,70,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #3d546f;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #3d546f;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #3d546f;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #3d546f;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#fff}.tox .tox-tree .tox-trbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:active{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:active svg{fill:#fff}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#fff}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#222f3e;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #000;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #000;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #000;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:\"\";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E\") left 0 top 0 #222f3e!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #000;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #000;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #000}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #000}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}")
+//# sourceMappingURL=skin.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.min.css b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.min.css
index bbf8fb2c8cf..016656e8048 100644
--- a/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.min.css
+++ b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.min.css
@@ -1 +1 @@
-.tox{box-shadow:none;box-sizing:content-box;color:#2a3746;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #000;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#222f3e;border:1px solid #000;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.4);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#000;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#3d546f;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#3d546f;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#fff;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#3d546f;background-image:none;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:hover:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:active:not(:disabled){background-color:#2b3b4e;background-image:none;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#264560;background-image:none;border-color:#264560;box-shadow:none;color:#fff}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked[disabled]{background-color:#3d546f;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:focus:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:active:not(:disabled){background-color:#2b3b4e;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#fff}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(255,255,255,.2)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(255,255,255,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#1a1a1a;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#333;color:#fff;cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#fff;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#2b3b4e;color:#fff}.tox .tox-collection--list .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#4a5562;color:#fff}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(255,255,255,.5);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#fff}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(255,255,255,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#2b3b4e;border:1px solid #1a1a1a;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #000}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #000}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#fff;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#4a5562}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#fff;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#2b3b4e;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#fff;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#fff;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#fff;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(255,255,255,.5);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#2b3b4e;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(43,59,78,0),#2b3b4e);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#2b3b4e;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#fff;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#2b3b4e;box-shadow:0 0 8px 8px #2b3b4e;color:#fff;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#2b3b4e;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(255,255,255,.5)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#fff;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(34,47,62,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#222f3e}.tox .tox-dialog{background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(42,55,70,.15),0 0 40px 1px rgba(42,55,70,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#2b3b4e;border-bottom:none;color:#fff;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#fff;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(255,255,255,.5);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#fff}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#fff;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#fff;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#2b3b4e;border-top:1px solid #000;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(34,47,62,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #000}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #000;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #000;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(255,255,255,.5);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #000}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#222f3e;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #000;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#222f3e;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(42,55,70,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(255,255,255,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(255,255,255,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #2b3b4e;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(255,255,255,.5);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#222f3e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#fff}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#000;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#000;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:#fff;display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn--active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#334840;border-color:#3c5440;color:#fff}.tox .tox-notification--success p{color:#fff}.tox .tox-notification--success a{color:#b5d199}.tox .tox-notification--success svg{fill:#fff}.tox .tox-notification--error{background-color:#442632;border-color:#55212b;color:#fff}.tox .tox-notification--error p{color:#fff}.tox .tox-notification--error a{color:#e68080}.tox .tox-notification--error svg{fill:#fff}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#222f3e;border-color:#000;color:#fff0b3}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#fff0b3}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#fc0}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#fff0b3}.tox .tox-notification--info{background-color:#254161;border-color:#264972;color:#fff}.tox .tox-notification--info p{color:#fff}.tox .tox-notification--info a{color:#83b7f3}.tox .tox-notification--info svg{fill:#fff}.tox .tox-notification__body{align-self:center;color:#fff;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#222f3e;border:1px solid #000;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#222f3e transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#000 transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #222f3e transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #000 transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #222f3e transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #000 transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #222f3e;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #000;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#222f3e;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #000;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(255,255,255,.5);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#222f3e;border-top:1px solid #000;color:#fff;display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:#fff;text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(255,255,255,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#fff}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(255,255,255,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#4a5562;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #4a5562}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(34,47,62,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#fff}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:hover svg{fill:#fff}.tox .tox-tbtn:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:active svg{fill:#fff}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#fff}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#fff}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#4a5562}.tox .tox-number-input input{border-radius:3px;color:#fff;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#4a5562;color:#fff}.tox .tox-number-input input:focus{background:#fff;color:#2a3746}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#fff;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#fff;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#4a5562}.tox .tox-number-input button:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:hover svg{fill:#fff}.tox .tox-number-input button:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:active svg{fill:#fff}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#4a5562}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #4a5562 inset}.tox .tox-split-button:focus{background:#4a5562;box-shadow:none;color:#fff}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(255,255,255,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#222f3e}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#222f3e;background-image:repeating-linear-gradient(#000 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #000;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#222f3e;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #000}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #000}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#3d546f;border-radius:3px;box-shadow:0 2px 4px rgba(42,55,70,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #3d546f;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #3d546f;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #3d546f;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #3d546f;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#fff}.tox .tox-tree .tox-trbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:active{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:active svg{fill:#fff}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#fff}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#222f3e;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #000;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #000;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #000;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #000;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #000;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #000}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #000}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}
+.tox{box-shadow:none;box-sizing:content-box;color:#2a3746;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #000;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#222f3e;border:1px solid #000;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.4);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#2a3746}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.5);color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#fff}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#fff}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#000;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#3d546f;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#3d546f;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#fff;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#3d546f;background-image:none;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:hover:not(:disabled){background-color:#34485f;background-image:none;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--secondary:active:not(:disabled){background-color:#2b3b4e;background-image:none;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#346085;background-image:none;border-color:#346085;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#2d5373;background-image:none;border-color:#2d5373;box-shadow:none;color:#fff}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#264560;background-image:none;border-color:#264560;box-shadow:none;color:#fff}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#fff}.tox .tox-button--naked[disabled]{background-color:#3d546f;border-color:#3d546f;box-shadow:none;color:rgba(255,255,255,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:focus:not(:disabled){background-color:#34485f;border-color:#34485f;box-shadow:none;color:#fff}.tox .tox-button--naked:active:not(:disabled){background-color:#2b3b4e;border-color:#2b3b4e;box-shadow:none;color:#fff}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#fff}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(255,255,255,.2)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(255,255,255,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(255,255,255,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#1a1a1a;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#333;color:#fff;cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#fff;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#2b3b4e;color:#fff}.tox .tox-collection--list .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#4a5562}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#757d87;color:#fff}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#4a5562;color:#fff}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#fff}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(255,255,255,.5);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#fff}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(255,255,255,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#2b3b4e;border:1px solid #1a1a1a;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #000}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #000}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-spectrum:focus,.tox .tox-sv-palette-spectrum:focus{outline:#08f solid}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#fff;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#4a5562}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#fff;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#2b3b4e;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#fff;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#fff;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#fff;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(255,255,255,.5);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#2b3b4e;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(43,59,78,0),#2b3b4e);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#2b3b4e;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#fff;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#2b3b4e;box-shadow:0 0 8px 8px #2b3b4e;color:#fff;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#2b3b4e;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(255,255,255,.5)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#fff;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(34,47,62,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#222f3e}.tox .tox-dialog{background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(42,55,70,.15),0 0 40px 1px rgba(42,55,70,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#2b3b4e;border-bottom:none;color:#fff;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#fff;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(255,255,255,.5);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#fff}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#fff;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#fff;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#2b3b4e;border-top:1px solid #000;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(34,47,62,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #000}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #000;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #000;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(255,255,255,.5);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #000}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#222f3e;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #000;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#222f3e;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(42,55,70,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(255,255,255,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(255,255,255,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(255,255,255,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #2b3b4e;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(255,255,255,.5);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#222f3e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#fff}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#fff}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#2b3b4e;border-color:#000;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#19232e;color:rgba(255,255,255,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#2b3b4e;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#000;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#000;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:#fff;display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#2b3b4e;border:1px solid #000;border-radius:3px;box-shadow:0 4px 8px 0 rgba(42,55,70,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e;background-color:#222f3e;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn--active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#334840;border-color:#3c5440;color:#fff}.tox .tox-notification--success p{color:#fff}.tox .tox-notification--success a{color:#b5d199}.tox .tox-notification--success svg{fill:#fff}.tox .tox-notification--error{background-color:#442632;border-color:#55212b;color:#fff}.tox .tox-notification--error p{color:#fff}.tox .tox-notification--error a{color:#e68080}.tox .tox-notification--error svg{fill:#fff}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#222f3e;border-color:#000;color:#fff0b3}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#fff0b3}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#fc0}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#fff0b3}.tox .tox-notification--info{background-color:#254161;border-color:#264972;color:#fff}.tox .tox-notification--info p{color:#fff}.tox .tox-notification--info a{color:#83b7f3}.tox .tox-notification--info svg{fill:#fff}.tox .tox-notification__body{align-self:center;color:#fff;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#222f3e;border:1px solid #000;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#222f3e transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#000 transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #222f3e transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #000 transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #222f3e transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #000 transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #222f3e;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #000;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#222f3e;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #000;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(255,255,255,.5);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#222f3e;border-top:1px solid #000;color:#fff;display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:#fff;text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(255,255,255,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#fff}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(255,255,255,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#4a5562;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #4a5562}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(34,47,62,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#fff}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:hover svg{fill:#fff}.tox .tox-tbtn:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn:active svg{fill:#fff}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#fff}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#fff}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#fff}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#4a5562}.tox .tox-number-input input{border-radius:3px;color:#fff;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#4a5562;color:#fff}.tox .tox-number-input input:focus{background:#fff;color:#2a3746}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#fff;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#fff;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#4a5562}.tox .tox-number-input button:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:hover svg{fill:#fff}.tox .tox-number-input button:active{background:#757d87;border:0;box-shadow:none;color:#fff}.tox .tox-number-input button:active svg{fill:#fff}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(255,255,255,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#4a5562}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #4a5562 inset}.tox .tox-split-button:focus{background:#4a5562;box-shadow:none;color:#fff}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(255,255,255,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(255,255,255,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#222f3e}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#222f3e;background-image:repeating-linear-gradient(#000 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #000;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#222f3e;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(42,55,70,.2),0 4px 8px 0 rgba(42,55,70,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #000}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #000}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#3d546f;border-radius:3px;box-shadow:0 2px 4px rgba(42,55,70,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #3d546f;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #3d546f;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #3d546f;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #3d546f;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#fff;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#fff}.tox .tox-tree .tox-trbtn:focus{background:#4a5562;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#4a5562;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:active{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn:active svg{fill:#fff}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(255,255,255,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#6ea9d0;border:0;box-shadow:none;color:#fff}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#fff}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#fff}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#fff}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#fff}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#222f3e;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #000;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #000;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #000;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23000000'/%3E%3C/svg%3E") left 0 top 0 #222f3e!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #000;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #000;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #000}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #000}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#fff;text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}
diff --git a/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.js b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.js
new file mode 100644
index 00000000000..8490587ac7c
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5-dark/skin.shadowdom.css', "body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}")
+//# sourceMappingURL=skin.shadowdom.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5/content.inline.js b/public/libs/tinymce/skins/ui/tinymce-5/content.inline.js
new file mode 100644
index 00000000000..786074961d5
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5/content.inline.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5/content.inline.css', ".mce-content-body .mce-item-anchor{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A\"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected=\"2\"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected=\"2\"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A\") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border=\"0\"],.mce-item-table[border=\"0\"] caption,.mce-item-table[border=\"0\"] td,.mce-item-table[border=\"0\"] th,table[style*=\"border-width: 0px\"],table[style*=\"border-width: 0px\"] caption,table[style*=\"border-width: 0px\"] td,table[style*=\"border-width: 0px\"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}")
+//# sourceMappingURL=content.inline.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5/content.js b/public/libs/tinymce/skins/ui/tinymce-5/content.js
new file mode 100644
index 00000000000..0a0db44c733
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5/content.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5/content.css', ".mce-content-body .mce-item-anchor{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center}.mce-content-body .mce-item-anchor:empty{cursor:default;display:inline-block;height:12px!important;padding:0 2px;-webkit-user-modify:read-only;-moz-user-modify:read-only;-webkit-user-select:all;-moz-user-select:all;user-select:all;width:8px!important}.mce-content-body .mce-item-anchor:not(:empty){background-position-x:2px;display:inline-block;padding-left:12px}.mce-content-body .mce-item-anchor[data-mce-selected]{outline-offset:1px}.tox-comments-visible .tox-comment[contenteditable=false]:not([data-mce-selected]),.tox-comments-visible span.tox-comment img:not([data-mce-selected]),.tox-comments-visible span.tox-comment span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment>video:not([data-mce-selected]){outline:3px solid #ffe89d}.tox-comments-visible .tox-comment[contenteditable=false][data-mce-annotation-active=true]:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] img:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true] span.mce-preview-object:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>audio:not([data-mce-selected]),.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]>video:not([data-mce-selected]){outline:3px solid #fed635}.tox-comments-visible span.tox-comment:not([data-mce-selected]){background-color:#ffe89d;outline:0}.tox-comments-visible span.tox-comment[data-mce-annotation-active=true]:not([data-mce-selected=inline-boundary]){background-color:#fed635}.tox-checklist>li:not(.tox-checklist--hidden){list-style:none;margin:.25em 0}.tox-checklist>li:not(.tox-checklist--hidden)::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\");cursor:pointer;height:1em;margin-left:-1.5em;margin-top:.125em;position:absolute;width:1em}.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before{content:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A\")}[dir=rtl] .tox-checklist>li:not(.tox-checklist--hidden)::before{margin-left:0;margin-right:-1.5em}code[class*=language-],pre[class*=language-]{color:#000;background:0 0;text-shadow:0 1px #fff;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;tab-size:4;-webkit-hyphens:none;hyphens:none}code[class*=language-] ::-moz-selection,code[class*=language-]::-moz-selection,pre[class*=language-] ::-moz-selection,pre[class*=language-]::-moz-selection{text-shadow:none;background:#b3d4fc}code[class*=language-] ::selection,code[class*=language-]::selection,pre[class*=language-] ::selection,pre[class*=language-]::selection{text-shadow:none;background:#b3d4fc}@media print{code[class*=language-],pre[class*=language-]{text-shadow:none}}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#f5f2f0}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#708090}.token.punctuation{color:#999}.token.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#905}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string{color:#690}.language-css .token.string,.style .token.string,.token.entity,.token.operator,.token.url{color:#9a6e3a;background:hsla(0,0%,100%,.5)}.token.atrule,.token.attr-value,.token.keyword{color:#07a}.token.class-name,.token.function{color:#dd4a68}.token.important,.token.regex,.token.variable{color:#e90}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.mce-content-body{overflow-wrap:break-word;word-wrap:break-word}.mce-content-body .mce-visual-caret{background-color:#000;background-color:currentColor;position:absolute}.mce-content-body .mce-visual-caret-hidden{display:none}.mce-content-body [data-mce-caret]{left:-1000px;margin:0;padding:0;position:absolute;right:auto;top:0}.mce-content-body .mce-offscreen-selection{left:-2000000px;max-width:1000000px;position:absolute}.mce-content-body [contentEditable=false]{cursor:default}.mce-content-body [contentEditable=true]{cursor:text}.tox-cursor-format-painter{cursor:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A\"),default}div.mce-footnotes hr{margin-inline-end:auto;margin-inline-start:0;width:25%}div.mce-footnotes li>a.mce-footnotes-backlink{text-decoration:none}@media print{sup.mce-footnote a{color:#000;text-decoration:none}div.mce-footnotes{break-inside:avoid;width:100%}div.mce-footnotes li>a.mce-footnotes-backlink{display:none}}.mce-content-body figure.align-left{float:left}.mce-content-body figure.align-right{float:right}.mce-content-body figure.image.align-center{display:table;margin-left:auto;margin-right:auto}.mce-preview-object{border:1px solid gray;display:inline-block;line-height:0;margin:0 2px 0 2px;position:relative}.mce-preview-object .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.mce-preview-object[data-mce-selected=\"2\"] .mce-shim{display:none}.mce-content-body .mce-mergetag{cursor:default!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body .mce-mergetag:hover{background-color:rgba(0,108,231,.1)}.mce-content-body .mce-mergetag-affix{background-color:rgba(0,108,231,.1);color:#006ce7}.mce-object{background:transparent url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A\") no-repeat center;border:1px dashed #aaa}.mce-pagebreak{border:1px dashed #aaa;cursor:default;display:block;height:5px;margin-top:15px;page-break-before:always;width:100%}@media print{.mce-pagebreak{border:0}}.tiny-pageembed .mce-shim{background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);height:100%;left:0;position:absolute;top:0;width:100%}.tiny-pageembed[data-mce-selected=\"2\"] .mce-shim{display:none}.tiny-pageembed{display:inline-block;position:relative}.tiny-pageembed--16by9,.tiny-pageembed--1by1,.tiny-pageembed--21by9,.tiny-pageembed--4by3{display:block;overflow:hidden;padding:0;position:relative;width:100%}.tiny-pageembed--21by9{padding-top:42.857143%}.tiny-pageembed--16by9{padding-top:56.25%}.tiny-pageembed--4by3{padding-top:75%}.tiny-pageembed--1by1{padding-top:100%}.tiny-pageembed--16by9 iframe,.tiny-pageembed--1by1 iframe,.tiny-pageembed--21by9 iframe,.tiny-pageembed--4by3 iframe{border:0;height:100%;left:0;position:absolute;top:0;width:100%}.mce-content-body[data-mce-placeholder]{position:relative}.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before{color:rgba(34,47,62,.7);content:attr(data-mce-placeholder);position:absolute}.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before{left:1px}.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before{right:1px}.mce-content-body div.mce-resizehandle{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;height:10px;position:absolute;width:10px;z-index:1298}.mce-content-body div.mce-resizehandle:hover{background-color:#4099ff}.mce-content-body div.mce-resizehandle:nth-of-type(1){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(2){cursor:nesw-resize}.mce-content-body div.mce-resizehandle:nth-of-type(3){cursor:nwse-resize}.mce-content-body div.mce-resizehandle:nth-of-type(4){cursor:nesw-resize}.mce-content-body .mce-resize-backdrop{z-index:10000}.mce-content-body .mce-clonedresizable{cursor:default;opacity:.5;outline:1px dashed #000;position:absolute;z-index:10001}.mce-content-body .mce-clonedresizable.mce-resizetable-columns td,.mce-content-body .mce-clonedresizable.mce-resizetable-columns th{border:0}.mce-content-body .mce-resize-helper{background:#555;background:rgba(0,0,0,.75);border:1px;border-radius:3px;color:#fff;display:none;font-family:sans-serif;font-size:12px;line-height:14px;margin:5px 10px;padding:5px;position:absolute;white-space:nowrap;z-index:10002}.tox-rtc-user-selection{position:relative}.tox-rtc-user-cursor{bottom:0;cursor:default;position:absolute;top:0;width:2px}.tox-rtc-user-cursor::before{background-color:inherit;border-radius:50%;content:'';display:block;height:8px;position:absolute;right:-3px;top:-3px;width:8px}.tox-rtc-user-cursor:hover::after{background-color:inherit;border-radius:100px;box-sizing:border-box;color:#fff;content:attr(data-user);display:block;font-size:12px;font-weight:700;left:-5px;min-height:8px;min-width:8px;padding:0 12px;position:absolute;top:-11px;white-space:nowrap;z-index:1000}.tox-rtc-user-selection--1 .tox-rtc-user-cursor{background-color:#2dc26b}.tox-rtc-user-selection--2 .tox-rtc-user-cursor{background-color:#e03e2d}.tox-rtc-user-selection--3 .tox-rtc-user-cursor{background-color:#f1c40f}.tox-rtc-user-selection--4 .tox-rtc-user-cursor{background-color:#3598db}.tox-rtc-user-selection--5 .tox-rtc-user-cursor{background-color:#b96ad9}.tox-rtc-user-selection--6 .tox-rtc-user-cursor{background-color:#e67e23}.tox-rtc-user-selection--7 .tox-rtc-user-cursor{background-color:#aaa69d}.tox-rtc-user-selection--8 .tox-rtc-user-cursor{background-color:#f368e0}.tox-rtc-remote-image{background:#eaeaea url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A\") no-repeat center center;border:1px solid #ccc;min-height:240px;min-width:320px}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-match-marker-selected::-moz-selection{background:#39f;color:#fff}.mce-match-marker-selected::selection{background:#39f;color:#fff}.mce-content-body audio[data-mce-selected],.mce-content-body details[data-mce-selected],.mce-content-body embed[data-mce-selected],.mce-content-body img[data-mce-selected],.mce-content-body object[data-mce-selected],.mce-content-body table[data-mce-selected],.mce-content-body video[data-mce-selected]{outline:3px solid #b4d7ff}.mce-content-body hr[data-mce-selected]{outline:3px solid #b4d7ff;outline-offset:1px}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:3px solid #b4d7ff}.mce-content-body [contentEditable=false][data-mce-selected]{cursor:not-allowed;outline:3px solid #b4d7ff}.mce-content-body.mce-content-readonly [contentEditable=true]:focus,.mce-content-body.mce-content-readonly [contentEditable=true]:hover{outline:0}.mce-content-body [data-mce-selected=inline-boundary]{background-color:#b4d7ff}.mce-content-body .mce-edit-focus{outline:3px solid #b4d7ff}.mce-content-body td[data-mce-selected],.mce-content-body th[data-mce-selected]{position:relative}.mce-content-body td[data-mce-selected]::-moz-selection,.mce-content-body th[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body td[data-mce-selected]::selection,.mce-content-body th[data-mce-selected]::selection{background:0 0}.mce-content-body td[data-mce-selected] *,.mce-content-body th[data-mce-selected] *{outline:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{background-color:rgba(180,215,255,.7);border:1px solid rgba(180,215,255,.7);bottom:-1px;content:'';left:-1px;mix-blend-mode:multiply;position:absolute;right:-1px;top:-1px}@media screen and (-ms-high-contrast:active),(-ms-high-contrast:none){.mce-content-body td[data-mce-selected]::after,.mce-content-body th[data-mce-selected]::after{border-color:rgba(0,84,180,.7)}}.mce-content-body img[data-mce-selected]::-moz-selection{background:0 0}.mce-content-body img[data-mce-selected]::selection{background:0 0}.ephox-snooker-resizer-bar{background-color:#b4d7ff;opacity:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:1}.mce-spellchecker-word{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default;height:2rem}.mce-spellchecker-grammar{background-image:url(\"data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A\");background-position:0 calc(100% + 1px);background-repeat:repeat-x;background-size:auto 6px;cursor:default}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc ul>li{list-style-type:none}[data-mce-block]{display:block}.mce-item-table:not([border]),.mce-item-table:not([border]) caption,.mce-item-table:not([border]) td,.mce-item-table:not([border]) th,.mce-item-table[border=\"0\"],.mce-item-table[border=\"0\"] caption,.mce-item-table[border=\"0\"] td,.mce-item-table[border=\"0\"] th,table[style*=\"border-width: 0px\"],table[style*=\"border-width: 0px\"] caption,table[style*=\"border-width: 0px\"] td,table[style*=\"border-width: 0px\"] th{border:1px dashed #bbb}.mce-visualblocks address,.mce-visualblocks article,.mce-visualblocks aside,.mce-visualblocks blockquote,.mce-visualblocks div:not([data-mce-bogus]),.mce-visualblocks dl,.mce-visualblocks figcaption,.mce-visualblocks figure,.mce-visualblocks h1,.mce-visualblocks h2,.mce-visualblocks h3,.mce-visualblocks h4,.mce-visualblocks h5,.mce-visualblocks h6,.mce-visualblocks hgroup,.mce-visualblocks ol,.mce-visualblocks p,.mce-visualblocks pre,.mce-visualblocks section,.mce-visualblocks ul{background-repeat:no-repeat;border:1px dashed #bbb;margin-left:3px;padding-top:10px}.mce-visualblocks p{background-image:url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}.mce-visualblocks h1{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}.mce-visualblocks h2{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}.mce-visualblocks h3{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}.mce-visualblocks h4{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}.mce-visualblocks h5{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}.mce-visualblocks h6{background-image:url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}.mce-visualblocks div:not([data-mce-bogus]){background-image:url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}.mce-visualblocks section{background-image:url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}.mce-visualblocks article{background-image:url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}.mce-visualblocks blockquote{background-image:url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}.mce-visualblocks address{background-image:url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}.mce-visualblocks pre{background-image:url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}.mce-visualblocks figure{background-image:url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}.mce-visualblocks figcaption{border:1px dashed #bbb}.mce-visualblocks hgroup{background-image:url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}.mce-visualblocks aside{background-image:url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}.mce-visualblocks ul{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)}.mce-visualblocks ol{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==)}.mce-visualblocks dl{background-image:url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==)}.mce-visualblocks:not([dir=rtl]) address,.mce-visualblocks:not([dir=rtl]) article,.mce-visualblocks:not([dir=rtl]) aside,.mce-visualblocks:not([dir=rtl]) blockquote,.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),.mce-visualblocks:not([dir=rtl]) dl,.mce-visualblocks:not([dir=rtl]) figcaption,.mce-visualblocks:not([dir=rtl]) figure,.mce-visualblocks:not([dir=rtl]) h1,.mce-visualblocks:not([dir=rtl]) h2,.mce-visualblocks:not([dir=rtl]) h3,.mce-visualblocks:not([dir=rtl]) h4,.mce-visualblocks:not([dir=rtl]) h5,.mce-visualblocks:not([dir=rtl]) h6,.mce-visualblocks:not([dir=rtl]) hgroup,.mce-visualblocks:not([dir=rtl]) ol,.mce-visualblocks:not([dir=rtl]) p,.mce-visualblocks:not([dir=rtl]) pre,.mce-visualblocks:not([dir=rtl]) section,.mce-visualblocks:not([dir=rtl]) ul{margin-left:3px}.mce-visualblocks[dir=rtl] address,.mce-visualblocks[dir=rtl] article,.mce-visualblocks[dir=rtl] aside,.mce-visualblocks[dir=rtl] blockquote,.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),.mce-visualblocks[dir=rtl] dl,.mce-visualblocks[dir=rtl] figcaption,.mce-visualblocks[dir=rtl] figure,.mce-visualblocks[dir=rtl] h1,.mce-visualblocks[dir=rtl] h2,.mce-visualblocks[dir=rtl] h3,.mce-visualblocks[dir=rtl] h4,.mce-visualblocks[dir=rtl] h5,.mce-visualblocks[dir=rtl] h6,.mce-visualblocks[dir=rtl] hgroup,.mce-visualblocks[dir=rtl] ol,.mce-visualblocks[dir=rtl] p,.mce-visualblocks[dir=rtl] pre,.mce-visualblocks[dir=rtl] section,.mce-visualblocks[dir=rtl] ul{background-position-x:right;margin-right:3px}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}body{font-family:sans-serif}table{border-collapse:collapse}")
+//# sourceMappingURL=content.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5/skin.js b/public/libs/tinymce/skins/ui/tinymce-5/skin.js
new file mode 100644
index 00000000000..f7162277b69
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5/skin.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5/skin.css', ".tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#fff;border:1px solid #ccc;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.08);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#527530}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#527530}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#ccc;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#8db5d0;background-image:none;border-color:#8db5d0;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#222f3e;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-spectrum:focus,.tox .tox-sv-palette-spectrum:focus{outline:#08f solid}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#222f3e;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#222f3e;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#222f3e;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:\"\";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:\"\";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#222f3e;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #404040}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #ccc;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#fff;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #ccc;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#fff;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size=\"0\"],.tox:not([dir=rtl]) .tox-selectfield select[size=\"1\"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size=\"0\"],.tox[dir=rtl] .tox-selectfield select[size=\"1\"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E\") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E\") left 0 top 0 #fff;background-color:#fff;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#517342}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f5cccc;border-color:#f0b3b3;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#77181f}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fff5cc;border-color:#fff0b3;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#7a6e25}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d6e7fb;border-color:#c1dbf9;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#2a64a6}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{align-self:center;color:#222f3e;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#222f3e;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(34,47,62,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#222f3e}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#dee0e2}.tox .tox-number-input input{border-radius:3px;color:#222f3e;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#dee0e2;color:#222f3e}.tox .tox-number-input input:focus{background:#fff;color:#222f3e}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#222f3e;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#222f3e;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#dee0e2}.tox .tox-number-input button:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:hover svg{fill:#222f3e}.tox .tox-number-input button:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:active svg{fill:#222f3e}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#dee0e2}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#fff;background-image:repeating-linear-gradient(#ccc 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #ccc;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#222f3e}.tox .tox-tree .tox-trbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:active svg{fill:#222f3e}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#fff;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #ccc;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:\"\";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url(\"data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E\") left 0 top 0 #fff!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #ccc;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:rgba(34,47,62,.7);text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}")
+//# sourceMappingURL=skin.js.map
diff --git a/public/libs/tinymce/skins/ui/tinymce-5/skin.min.css b/public/libs/tinymce/skins/ui/tinymce-5/skin.min.css
index 55bfb3b6b0f..f7b2cb34d8e 100644
--- a/public/libs/tinymce/skins/ui/tinymce-5/skin.min.css
+++ b/public/libs/tinymce/skins/ui/tinymce-5/skin.min.css
@@ -1 +1 @@
-.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#fff;border:1px solid #ccc;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.08);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#527530}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#527530}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#ccc;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#8db5d0;background-image:none;border-color:#8db5d0;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#222f3e;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#222f3e;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#222f3e;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#222f3e;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#222f3e;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #404040}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #ccc;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#fff;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #ccc;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#fff;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#517342}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f5cccc;border-color:#f0b3b3;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#77181f}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fff5cc;border-color:#fff0b3;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#7a6e25}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d6e7fb;border-color:#c1dbf9;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#2a64a6}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{align-self:center;color:#222f3e;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#222f3e;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(34,47,62,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#222f3e}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#dee0e2}.tox .tox-number-input input{border-radius:3px;color:#222f3e;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#dee0e2;color:#222f3e}.tox .tox-number-input input:focus{background:#fff;color:#222f3e}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#222f3e;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#222f3e;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#dee0e2}.tox .tox-number-input button:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:hover svg{fill:#222f3e}.tox .tox-number-input button:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:active svg{fill:#222f3e}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#dee0e2}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#fff;background-image:repeating-linear-gradient(#ccc 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #ccc;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#222f3e}.tox .tox-tree .tox-trbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:active svg{fill:#222f3e}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#fff;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #ccc;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #ccc;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:rgba(34,47,62,.7);text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}
+.tox{box-shadow:none;box-sizing:content-box;color:#222f3e;cursor:auto;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-style:normal;font-weight:400;line-height:normal;-webkit-tap-highlight-color:transparent;text-decoration:none;text-shadow:none;text-transform:none;vertical-align:initial;white-space:normal}.tox :not(svg):not(rect){box-sizing:inherit;color:inherit;cursor:inherit;direction:inherit;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;line-height:inherit;-webkit-tap-highlight-color:inherit;text-align:inherit;text-decoration:inherit;text-shadow:inherit;text-transform:inherit;vertical-align:inherit;white-space:inherit}.tox :not(svg):not(rect){background:0 0;border:0;box-shadow:none;float:none;height:auto;margin:0;max-width:none;outline:0;padding:0;position:static;width:auto}.tox:not([dir=rtl]){direction:ltr;text-align:left}.tox[dir=rtl]{direction:rtl;text-align:right}.tox-tinymce{border:1px solid #ccc;border-radius:0;box-shadow:none;box-sizing:border-box;display:flex;flex-direction:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;overflow:hidden;position:relative;visibility:inherit!important}.tox.tox-tinymce-inline{border:none;box-shadow:none;overflow:initial}.tox.tox-tinymce-inline .tox-editor-container{overflow:initial}.tox.tox-tinymce-inline .tox-editor-header{background-color:#fff;border:1px solid #ccc;border-radius:0;box-shadow:none;overflow:hidden}.tox-tinymce-aux{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;z-index:1300}.tox-tinymce :focus,.tox-tinymce-aux :focus{outline:0}button::-moz-focus-inner{border:0}.tox[dir=rtl] .tox-icon--flip svg{transform:rotateY(180deg)}.tox .accessibility-issue__header{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description{align-items:stretch;border-radius:3px;display:flex;justify-content:space-between}.tox .accessibility-issue__description>div{padding-bottom:4px}.tox .accessibility-issue__description>div>div{align-items:center;display:flex;margin-bottom:4px}.tox .accessibility-issue__description>div>div .tox-icon svg{display:block}.tox .accessibility-issue__repair{margin-top:16px}.tox .tox-dialog__body-content .accessibility-issue--info .accessibility-issue__description{background-color:rgba(30,113,170,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--info .tox-form__group h2{color:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info .tox-icon svg{fill:#207ab7}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon{background-color:#207ab7;color:#fff}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:hover{background-color:#1c6ca1}.tox .tox-dialog__body-content .accessibility-issue--info a.tox-button--naked.tox-button--icon:active{background-color:#185d8c}.tox .tox-dialog__body-content .accessibility-issue--warn .accessibility-issue__description{background-color:rgba(255,165,0,.08);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-form__group h2{color:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn .tox-icon svg{fill:#8f5d00}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon{background-color:#ffe89d;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:hover{background-color:#f2d574;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--warn a.tox-button--naked.tox-button--icon:active{background-color:#e8c657;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .accessibility-issue__description{background-color:rgba(204,0,0,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error .tox-form__group h2{color:#c00}.tox .tox-dialog__body-content .accessibility-issue--error .tox-icon svg{fill:#c00}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon{background-color:#f2bfbf;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:focus,.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:hover{background-color:#e9a4a4;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--error a.tox-button--naked.tox-button--icon:active{background-color:#ee9494;color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description{background-color:rgba(120,171,70,.1);color:#222f3e}.tox .tox-dialog__body-content .accessibility-issue--success .accessibility-issue__description>:last-child{display:none}.tox .tox-dialog__body-content .accessibility-issue--success .tox-form__group h2{color:#527530}.tox .tox-dialog__body-content .accessibility-issue--success .tox-icon svg{fill:#527530}.tox .tox-dialog__body-content .accessibility-issue__header .tox-form__group h1,.tox .tox-dialog__body-content .tox-form__group .accessibility-issue__description h2{font-size:14px;margin-top:0}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-left:4px}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-left:auto}.tox:not([dir=rtl]) .tox-dialog__body-content .accessibility-issue__description{padding:4px 4px 4px 8px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header .tox-button{margin-right:4px}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__header>:nth-last-child(2){margin-right:auto}.tox[dir=rtl] .tox-dialog__body-content .accessibility-issue__description{padding:4px 8px 4px 4px}.tox .tox-advtemplate .tox-form__grid{flex:1}.tox .tox-advtemplate .tox-form__grid>div:first-child{display:flex;flex-direction:column;width:30%}.tox .tox-advtemplate .tox-form__grid>div:first-child>div:nth-child(2){flex-basis:0;flex-grow:1;overflow:auto}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-advtemplate .tox-form__grid>div:first-child{width:100%}}.tox .tox-advtemplate iframe{border-color:#ccc;border-radius:0;border-style:solid;border-width:1px;margin:0 10px}.tox .tox-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bottom-anchorbar{display:flex;flex:0 0 auto}.tox .tox-bar{display:flex;flex:0 0 auto}.tox .tox-button{background-color:#207ab7;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#207ab7;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#fff;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;line-height:24px;margin:0;outline:0;padding:4px 16px;position:relative;text-align:center;text-decoration:none;text-transform:none;white-space:nowrap}.tox .tox-button::before{border-radius:3px;bottom:-1px;box-shadow:inset 0 0 0 2px #fff,0 0 0 1px #207ab7,0 0 0 3px rgba(32,122,183,.25);content:'';left:-1px;opacity:0;pointer-events:none;position:absolute;right:-1px;top:-1px}.tox .tox-button[disabled]{background-color:#207ab7;background-image:none;border-color:#207ab7;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button:focus:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:focus-visible:not(:disabled)::before{opacity:1}.tox .tox-button:hover:not(:disabled){background-color:#1c6ca1;background-image:none;border-color:#1c6ca1;box-shadow:none;color:#fff}.tox .tox-button:active:not(:disabled){background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled[disabled]{background-color:#185d8c;background-image:none;border-color:#185d8c;box-shadow:none;color:rgba(255,255,255,.5);cursor:not-allowed}.tox .tox-button.tox-button--enabled:focus:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:hover:not(:disabled){background-color:#154f76;background-image:none;border-color:#154f76;box-shadow:none;color:#fff}.tox .tox-button.tox-button--enabled:active:not(:disabled){background-color:#114060;background-image:none;border-color:#114060;box-shadow:none;color:#fff}.tox .tox-button--icon-and-text,.tox .tox-button.tox-button--icon-and-text,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text{display:flex;padding:5px 4px}.tox .tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--icon-and-text .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon-and-text .tox-icon svg{display:block;fill:currentColor}.tox .tox-button--secondary{background-color:#f0f0f0;background-image:none;background-position:0 0;background-repeat:repeat;border-color:#f0f0f0;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;color:#222f3e;font-size:14px;font-style:normal;font-weight:700;letter-spacing:normal;outline:0;padding:4px 16px;text-decoration:none;text-transform:none}.tox .tox-button--secondary[disabled]{background-color:#f0f0f0;background-image:none;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary:focus:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:hover:not(:disabled){background-color:#e3e3e3;background-image:none;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--secondary:active:not(:disabled){background-color:#d6d6d6;background-image:none;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled[disabled]{background-color:#b1ccdf;background-image:none;border-color:#b1ccdf;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--secondary.tox-button--enabled:focus:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:hover:not(:disabled){background-color:#9fc1d7;background-image:none;border-color:#9fc1d7;box-shadow:none;color:#222f3e}.tox .tox-button--secondary.tox-button--enabled:active:not(:disabled){background-color:#8db5d0;background-image:none;border-color:#8db5d0;box-shadow:none;color:#222f3e}.tox .tox-button--icon,.tox .tox-button.tox-button--icon,.tox .tox-button.tox-button--secondary.tox-button--icon{padding:4px}.tox .tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--icon .tox-icon svg,.tox .tox-button.tox-button--secondary.tox-button--icon .tox-icon svg{display:block;fill:currentColor}.tox .tox-button-link{background:0;border:none;box-sizing:border-box;cursor:pointer;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;white-space:nowrap}.tox .tox-button-link--sm{font-size:14px}.tox .tox-button--naked{background-color:transparent;border-color:transparent;box-shadow:unset;color:#222f3e}.tox .tox-button--naked[disabled]{background-color:#f0f0f0;border-color:#f0f0f0;box-shadow:none;color:rgba(34,47,62,.5)}.tox .tox-button--naked:hover:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:focus:not(:disabled){background-color:#e3e3e3;border-color:#e3e3e3;box-shadow:none;color:#222f3e}.tox .tox-button--naked:active:not(:disabled){background-color:#d6d6d6;border-color:#d6d6d6;box-shadow:none;color:#222f3e}.tox .tox-button--naked .tox-icon svg{fill:currentColor}.tox .tox-button--naked.tox-button--icon:hover:not(:disabled){color:#222f3e}.tox .tox-checkbox{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:36px;min-width:36px}.tox .tox-checkbox__input{height:1px;overflow:hidden;position:absolute;top:auto;width:1px}.tox .tox-checkbox__icons{align-items:center;border-radius:3px;box-shadow:0 0 0 2px transparent;box-sizing:content-box;display:flex;height:24px;justify-content:center;padding:calc(4px - 1px);width:24px}.tox .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:block;fill:rgba(34,47,62,.3)}.tox .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:none;fill:#207ab7}.tox .tox-checkbox__icons .tox-checkbox-icon__checked svg{display:none;fill:#207ab7}.tox .tox-checkbox--disabled{color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__checked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__unchecked svg{fill:rgba(34,47,62,.5)}.tox .tox-checkbox--disabled .tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{fill:rgba(34,47,62,.5)}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:checked+.tox-checkbox__icons .tox-checkbox-icon__checked svg{display:block}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__unchecked svg{display:none}.tox input.tox-checkbox__input:indeterminate+.tox-checkbox__icons .tox-checkbox-icon__indeterminate svg{display:block}.tox input.tox-checkbox__input:focus+.tox-checkbox__icons{border-radius:3px;box-shadow:inset 0 0 0 1px #207ab7;padding:calc(4px - 1px)}.tox:not([dir=rtl]) .tox-checkbox__label{margin-left:4px}.tox:not([dir=rtl]) .tox-checkbox__input{left:-10000px}.tox:not([dir=rtl]) .tox-bar .tox-checkbox{margin-left:4px}.tox[dir=rtl] .tox-checkbox__label{margin-right:4px}.tox[dir=rtl] .tox-checkbox__input{right:-10000px}.tox[dir=rtl] .tox-bar .tox-checkbox{margin-right:4px}.tox .tox-collection--toolbar .tox-collection__group{display:flex;padding:0}.tox .tox-collection--grid .tox-collection__group{display:flex;flex-wrap:wrap;max-height:208px;overflow-x:hidden;overflow-y:auto;padding:0}.tox .tox-collection--list .tox-collection__group{border-bottom-width:0;border-color:#ccc;border-left-width:0;border-right-width:0;border-style:solid;border-top-width:1px;padding:4px 0}.tox .tox-collection--list .tox-collection__group:first-child{border-top-width:0}.tox .tox-collection__group-heading{background-color:#e6e6e6;color:rgba(34,47,62,.7);cursor:default;font-size:12px;font-style:normal;font-weight:400;margin-bottom:4px;margin-top:-4px;padding:4px 8px;text-transform:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection__item{align-items:center;border-radius:3px;color:#222f3e;display:flex;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}.tox .tox-collection--list .tox-collection__item{padding:4px 8px}.tox .tox-collection--toolbar .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--grid .tox-collection__item{border-radius:3px;padding:4px}.tox .tox-collection--list .tox-collection__item--enabled{background-color:#fff;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--toolbar .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active{background-color:#dee0e2}.tox .tox-collection--grid .tox-collection__item--enabled{background-color:#c8cbcf;color:#222f3e}.tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled){background-color:#dee0e2;color:#222f3e}.tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled){color:#222f3e}.tox .tox-collection__item-checkmark,.tox .tox-collection__item-icon{align-items:center;display:flex;height:24px;justify-content:center;width:24px}.tox .tox-collection__item-checkmark svg,.tox .tox-collection__item-icon svg{fill:currentColor}.tox .tox-collection--toolbar-lg .tox-collection__item-icon{height:48px;width:48px}.tox .tox-collection__item-label{color:currentColor;display:inline-block;flex:1;font-size:14px;font-style:normal;font-weight:400;line-height:24px;max-width:100%;text-transform:none;word-break:break-all}.tox .tox-collection__item-accessory{color:rgba(34,47,62,.7);display:inline-block;font-size:14px;height:24px;line-height:24px;text-transform:none}.tox .tox-collection__item-caret{align-items:center;display:flex;min-height:24px}.tox .tox-collection__item-caret::after{content:'';font-size:0;min-height:inherit}.tox .tox-collection__item-caret svg{fill:#222f3e}.tox .tox-collection__item--state-disabled{background-color:transparent;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-collection__item--state-disabled .tox-collection__item-caret svg{fill:rgba(34,47,62,.5)}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg{display:none}.tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-accessory+.tox-collection__item-checkmark{display:none}.tox .tox-collection--horizontal{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:nowrap;margin-bottom:0;overflow-x:auto;padding:0}.tox .tox-collection--horizontal .tox-collection__group{align-items:center;display:flex;flex-wrap:nowrap;margin:0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item{height:34px;margin:3px 0 2px 0;padding:0 4px}.tox .tox-collection--horizontal .tox-collection__item-label{white-space:nowrap}.tox .tox-collection--horizontal .tox-collection__item-caret{margin-left:4px}.tox .tox-collection__item-container{display:flex}.tox .tox-collection__item-container--row{align-items:center;flex:1 1 auto;flex-direction:row}.tox .tox-collection__item-container--row.tox-collection__item-container--align-left{margin-right:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--align-right{justify-content:flex-end;margin-left:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-top{align-items:flex-start;margin-bottom:auto}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-middle{align-items:center}.tox .tox-collection__item-container--row.tox-collection__item-container--valign-bottom{align-items:flex-end;margin-top:auto}.tox .tox-collection__item-container--column{align-self:center;flex:1 1 auto;flex-direction:column}.tox .tox-collection__item-container--column.tox-collection__item-container--align-left{align-items:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--align-right{align-items:flex-end}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-top{align-self:flex-start}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-middle{align-self:center}.tox .tox-collection__item-container--column.tox-collection__item-container--valign-bottom{align-self:flex-end}.tox:not([dir=rtl]) .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-right:1px solid #ccc}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>:not(:first-child){margin-left:8px}.tox:not([dir=rtl]) .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-left:4px}.tox:not([dir=rtl]) .tox-collection__item-accessory{margin-left:16px;text-align:right}.tox:not([dir=rtl]) .tox-collection .tox-collection__item-caret{margin-left:16px}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__group:not(:last-of-type){border-left:1px solid #ccc}.tox[dir=rtl] .tox-collection--list .tox-collection__item>:not(:first-child){margin-right:8px}.tox[dir=rtl] .tox-collection--list .tox-collection__item>.tox-collection__item-label:first-child{margin-right:4px}.tox[dir=rtl] .tox-collection__item-accessory{margin-right:16px;text-align:left}.tox[dir=rtl] .tox-collection .tox-collection__item-caret{margin-right:16px;transform:rotateY(180deg)}.tox[dir=rtl] .tox-collection--horizontal .tox-collection__item-caret{margin-right:4px}.tox .tox-color-picker-container{display:flex;flex-direction:row;height:225px;margin:0}.tox .tox-sv-palette{box-sizing:border-box;display:flex;height:100%}.tox .tox-sv-palette-spectrum{height:100%}.tox .tox-sv-palette,.tox .tox-sv-palette-spectrum{width:225px}.tox .tox-sv-palette-thumb{background:0 0;border:1px solid #000;border-radius:50%;box-sizing:content-box;height:12px;position:absolute;width:12px}.tox .tox-sv-palette-inner-thumb{border:1px solid #fff;border-radius:50%;height:10px;position:absolute;width:10px}.tox .tox-hue-slider{box-sizing:border-box;height:100%;width:25px}.tox .tox-hue-slider-spectrum{background:linear-gradient(to bottom,red,#ff0080,#f0f,#8000ff,#00f,#0080ff,#0ff,#00ff80,#0f0,#80ff00,#ff0,#ff8000,red);height:100%;width:100%}.tox .tox-hue-slider,.tox .tox-hue-slider-spectrum{width:20px}.tox .tox-hue-slider-spectrum:focus,.tox .tox-sv-palette-spectrum:focus{outline:#08f solid}.tox .tox-hue-slider-thumb{background:#fff;border:1px solid #000;box-sizing:content-box;height:4px;width:100%}.tox .tox-rgb-form{display:flex;flex-direction:column;justify-content:space-between}.tox .tox-rgb-form div{align-items:center;display:flex;justify-content:space-between;margin-bottom:5px;width:inherit}.tox .tox-rgb-form input{width:6em}.tox .tox-rgb-form input.tox-invalid{border:1px solid red!important}.tox .tox-rgb-form .tox-rgba-preview{border:1px solid #000;flex-grow:2;margin-bottom:0}.tox:not([dir=rtl]) .tox-sv-palette{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider{margin-right:15px}.tox:not([dir=rtl]) .tox-hue-slider-thumb{margin-left:-1px}.tox:not([dir=rtl]) .tox-rgb-form label{margin-right:.5em}.tox[dir=rtl] .tox-sv-palette{margin-left:15px}.tox[dir=rtl] .tox-hue-slider{margin-left:15px}.tox[dir=rtl] .tox-hue-slider-thumb{margin-right:-1px}.tox[dir=rtl] .tox-rgb-form label{margin-left:.5em}.tox .tox-toolbar .tox-swatches,.tox .tox-toolbar__overflow .tox-swatches,.tox .tox-toolbar__primary .tox-swatches{margin:2px 0 3px 4px}.tox .tox-collection--list .tox-collection__group .tox-swatches-menu{border:0;margin:-4px 0}.tox .tox-swatches__row{display:flex}.tox .tox-swatch{height:30px;transition:transform .15s,box-shadow .15s;width:30px}.tox .tox-swatch:focus,.tox .tox-swatch:hover{box-shadow:0 0 0 1px rgba(127,127,127,.3) inset;transform:scale(.8)}.tox .tox-swatch--remove{align-items:center;display:flex;justify-content:center}.tox .tox-swatch--remove svg path{stroke:#e74c3c}.tox .tox-swatches__picker-btn{align-items:center;background-color:transparent;border:0;cursor:pointer;display:flex;height:30px;justify-content:center;outline:0;padding:0;width:30px}.tox .tox-swatches__picker-btn svg{fill:#222f3e;height:24px;width:24px}.tox .tox-swatches__picker-btn:hover{background:#dee0e2}.tox div.tox-swatch:not(.tox-swatch--remove) svg{display:none;fill:#222f3e;height:24px;margin:calc((30px - 24px)/ 2) calc((30px - 24px)/ 2);width:24px}.tox div.tox-swatch:not(.tox-swatch--remove) svg path{fill:#fff;paint-order:stroke;stroke:#222f3e;stroke-width:2px}.tox div.tox-swatch:not(.tox-swatch--remove).tox-collection__item--enabled svg{display:block}.tox:not([dir=rtl]) .tox-swatches__picker-btn{margin-left:auto}.tox[dir=rtl] .tox-swatches__picker-btn{margin-right:auto}.tox .tox-comment-thread{background:#fff;position:relative}.tox .tox-comment-thread>:not(:first-child){margin-top:8px}.tox .tox-comment{background:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);padding:8px 8px 16px 8px;position:relative}.tox .tox-comment__header{align-items:center;color:#222f3e;display:flex;justify-content:space-between}.tox .tox-comment__date{color:#222f3e;font-size:12px;line-height:18px}.tox .tox-comment__body{color:#222f3e;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;margin-top:8px;position:relative;text-transform:initial}.tox .tox-comment__body textarea{resize:none;white-space:normal;width:100%}.tox .tox-comment__expander{padding-top:8px}.tox .tox-comment__expander p{color:rgba(34,47,62,.7);font-size:14px;font-style:normal}.tox .tox-comment__body p{margin:0}.tox .tox-comment__buttonspacing{padding-top:16px;text-align:center}.tox .tox-comment-thread__overlay::after{background:#fff;bottom:0;content:"";display:flex;left:0;opacity:.9;position:absolute;right:0;top:0;z-index:5}.tox .tox-comment__reply{display:flex;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;margin-top:8px}.tox .tox-comment__reply>:first-child{margin-bottom:8px;width:100%}.tox .tox-comment__edit{display:flex;flex-wrap:wrap;justify-content:flex-end;margin-top:16px}.tox .tox-comment__gradient::after{background:linear-gradient(rgba(255,255,255,0),#fff);bottom:0;content:"";display:block;height:5em;margin-top:-40px;position:absolute;width:100%}.tox .tox-comment__overlay{background:#fff;bottom:0;display:flex;flex-direction:column;flex-grow:1;left:0;opacity:.9;position:absolute;right:0;text-align:center;top:0;z-index:5}.tox .tox-comment__loading-text{align-items:center;color:#222f3e;display:flex;flex-direction:column;position:relative}.tox .tox-comment__loading-text>div{padding-bottom:16px}.tox .tox-comment__overlaytext{bottom:0;flex-direction:column;font-size:14px;left:0;padding:1em;position:absolute;right:0;top:0;z-index:10}.tox .tox-comment__overlaytext p{background-color:#fff;box-shadow:0 0 8px 8px #fff;color:#222f3e;text-align:center}.tox .tox-comment__overlaytext div:nth-of-type(2){font-size:.8em}.tox .tox-comment__busy-spinner{align-items:center;background-color:#fff;bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:20}.tox .tox-comment__scroll{display:flex;flex-direction:column;flex-shrink:1;overflow:auto}.tox .tox-conversations{margin:8px}.tox:not([dir=rtl]) .tox-comment__edit{margin-left:8px}.tox:not([dir=rtl]) .tox-comment__buttonspacing>:last-child,.tox:not([dir=rtl]) .tox-comment__edit>:last-child,.tox:not([dir=rtl]) .tox-comment__reply>:last-child{margin-left:8px}.tox[dir=rtl] .tox-comment__edit{margin-right:8px}.tox[dir=rtl] .tox-comment__buttonspacing>:last-child,.tox[dir=rtl] .tox-comment__edit>:last-child,.tox[dir=rtl] .tox-comment__reply>:last-child{margin-right:8px}.tox .tox-user{align-items:center;display:flex}.tox .tox-user__avatar svg{fill:rgba(34,47,62,.7)}.tox .tox-user__avatar img{border-radius:50%;height:36px;object-fit:cover;vertical-align:middle;width:36px}.tox .tox-user__name{color:#222f3e;font-size:14px;font-style:normal;font-weight:700;line-height:18px;text-transform:none}.tox:not([dir=rtl]) .tox-user__avatar img,.tox:not([dir=rtl]) .tox-user__avatar svg{margin-right:8px}.tox:not([dir=rtl]) .tox-user__avatar+.tox-user__name{margin-left:8px}.tox[dir=rtl] .tox-user__avatar img,.tox[dir=rtl] .tox-user__avatar svg{margin-left:8px}.tox[dir=rtl] .tox-user__avatar+.tox-user__name{margin-right:8px}.tox .tox-dialog-wrap{align-items:center;bottom:0;display:flex;justify-content:center;left:0;position:fixed;right:0;top:0;z-index:1100}.tox .tox-dialog-wrap__backdrop{background-color:rgba(255,255,255,.75);bottom:0;left:0;position:absolute;right:0;top:0;z-index:1}.tox .tox-dialog-wrap__backdrop--opaque{background-color:#fff}.tox .tox-dialog{background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:0 16px 16px -10px rgba(34,47,62,.15),0 0 40px 1px rgba(34,47,62,.15);display:flex;flex-direction:column;max-height:100%;max-width:480px;overflow:hidden;position:relative;width:95vw;z-index:2}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog{align-self:flex-start;margin:8px auto;max-height:calc(100vh - 8px * 2);width:calc(100vw - 16px)}}.tox .tox-dialog-inline{z-index:1100}.tox .tox-dialog__header{align-items:center;background-color:#fff;border-bottom:none;color:#222f3e;display:flex;font-size:16px;justify-content:space-between;padding:8px 16px 0 16px;position:relative}.tox .tox-dialog__header .tox-button{z-index:1}.tox .tox-dialog__draghandle{cursor:grab;height:100%;left:0;position:absolute;top:0;width:100%}.tox .tox-dialog__draghandle:active{cursor:grabbing}.tox .tox-dialog__dismiss{margin-left:auto}.tox .tox-dialog__title{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:20px;font-style:normal;font-weight:400;line-height:1.3;margin:0;text-transform:none}.tox .tox-dialog__body{color:#222f3e;display:flex;flex:1;font-size:16px;font-style:normal;font-weight:400;line-height:1.3;min-width:0;text-align:left;text-transform:none}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body{flex-direction:column}}.tox .tox-dialog__body-nav{align-items:flex-start;display:flex;flex-direction:column;flex-shrink:0;padding:16px 16px}@media only screen and (min-width:768px){.tox .tox-dialog__body-nav{max-width:11em}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox .tox-dialog__body-nav{flex-direction:row;-webkit-overflow-scrolling:touch;overflow-x:auto;padding-bottom:0}}.tox .tox-dialog__body-nav-item{border-bottom:2px solid transparent;color:rgba(34,47,62,.7);display:inline-block;flex-shrink:0;font-size:14px;line-height:1.3;margin-bottom:8px;max-width:13em;text-decoration:none}.tox .tox-dialog__body-nav-item:focus{background-color:rgba(32,122,183,.1)}.tox .tox-dialog__body-nav-item--active{border-bottom:2px solid #207ab7;color:#207ab7}.tox .tox-dialog__body-content{box-sizing:border-box;display:flex;flex:1;flex-direction:column;max-height:min(650px,calc(100vh - 110px));overflow:auto;-webkit-overflow-scrolling:touch;padding:16px 16px}.tox .tox-dialog__body-content>*{margin-bottom:0;margin-top:16px}.tox .tox-dialog__body-content>:first-child{margin-top:0}.tox .tox-dialog__body-content>:last-child{margin-bottom:0}.tox .tox-dialog__body-content>:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content a{color:#207ab7;cursor:pointer;text-decoration:underline}.tox .tox-dialog__body-content a:focus,.tox .tox-dialog__body-content a:hover{color:#114060;text-decoration:underline}.tox .tox-dialog__body-content a:focus-visible{border-radius:1px;outline:2px solid #207ab7;outline-offset:2px}.tox .tox-dialog__body-content a:active{color:#092335;text-decoration:underline}.tox .tox-dialog__body-content svg{fill:#222f3e}.tox .tox-dialog__body-content strong{font-weight:700}.tox .tox-dialog__body-content ul{list-style-type:disc}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{padding-inline-start:2.5rem}.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{margin-bottom:16px}.tox .tox-dialog__body-content dd,.tox .tox-dialog__body-content dl,.tox .tox-dialog__body-content dt,.tox .tox-dialog__body-content ol,.tox .tox-dialog__body-content ul{display:block;margin-inline-end:0;margin-inline-start:0}.tox .tox-dialog__body-content .tox-form__group h1{color:#222f3e;font-size:20px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group h2{color:#222f3e;font-size:16px;font-style:normal;font-weight:700;letter-spacing:normal;margin-bottom:16px;margin-top:2rem;text-transform:none}.tox .tox-dialog__body-content .tox-form__group p{margin-bottom:16px}.tox .tox-dialog__body-content .tox-form__group h1:first-child,.tox .tox-dialog__body-content .tox-form__group h2:first-child,.tox .tox-dialog__body-content .tox-form__group p:first-child{margin-top:0}.tox .tox-dialog__body-content .tox-form__group h1:last-child,.tox .tox-dialog__body-content .tox-form__group h2:last-child,.tox .tox-dialog__body-content .tox-form__group p:last-child{margin-bottom:0}.tox .tox-dialog__body-content .tox-form__group h1:only-child,.tox .tox-dialog__body-content .tox-form__group h2:only-child,.tox .tox-dialog__body-content .tox-form__group p:only-child{margin-bottom:0;margin-top:0}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--center{text-align:center}.tox .tox-dialog__body-content .tox-form__group .tox-label.tox-label--end{text-align:end}.tox .tox-dialog--width-lg{height:650px;max-width:1200px}.tox .tox-dialog--fullscreen{height:100%;max-width:100%}.tox .tox-dialog--fullscreen .tox-dialog__body-content{max-height:100%}.tox .tox-dialog--width-md{max-width:800px}.tox .tox-dialog--width-md .tox-dialog__body-content{overflow:auto}.tox .tox-dialog__body-content--centered{text-align:center}.tox .tox-dialog__footer{align-items:center;background-color:#fff;border-top:1px solid #ccc;display:flex;justify-content:space-between;padding:8px 16px}.tox .tox-dialog__footer-end,.tox .tox-dialog__footer-start{display:flex}.tox .tox-dialog__busy-spinner{align-items:center;background-color:rgba(255,255,255,.75);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:3}.tox .tox-dialog__table{border-collapse:collapse;width:100%}.tox .tox-dialog__table thead th{font-weight:700;padding-bottom:8px}.tox .tox-dialog__table thead th:first-child{padding-right:8px}.tox .tox-dialog__table tbody tr{border-bottom:1px solid #404040}.tox .tox-dialog__table tbody tr:last-child{border-bottom:none}.tox .tox-dialog__table td{padding-bottom:8px;padding-top:8px}.tox .tox-dialog__table td:first-child{padding-right:8px}.tox .tox-dialog__iframe{min-height:200px}.tox .tox-dialog__iframe.tox-dialog__iframe--opaque{background:#fff}.tox .tox-navobj-bordered{position:relative}.tox .tox-navobj-bordered::before{border:1px solid #ccc;border-radius:3px;content:'';inset:0;opacity:1;pointer-events:none;position:absolute;z-index:1}.tox .tox-navobj-bordered-focus.tox-navobj-bordered::before{border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-dialog__popups{position:absolute;width:100%;z-index:1100}.tox .tox-dialog__body-iframe{display:flex;flex:1;flex-direction:column}.tox .tox-dialog__body-iframe .tox-navobj{display:flex;flex:1}.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2){flex:1;height:100%}.tox .tox-dialog-dock-fadeout{opacity:0;visibility:hidden}.tox .tox-dialog-dock-fadein{opacity:1;visibility:visible}.tox .tox-dialog-dock-transition{transition:visibility 0s linear .3s,opacity .3s ease}.tox .tox-dialog-dock-transition.tox-dialog-dock-fadein{transition-delay:0s}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav{margin-right:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox:not([dir=rtl]) .tox-dialog__body-nav-item:not(:first-child){margin-left:8px}}.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-end>*,.tox:not([dir=rtl]) .tox-dialog__footer .tox-dialog__footer-start>*{margin-left:8px}.tox[dir=rtl] .tox-dialog__body{text-align:right}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav{margin-left:0}}@media only screen and (max-width:767px){body:not(.tox-force-desktop) .tox[dir=rtl] .tox-dialog__body-nav-item:not(:first-child){margin-right:8px}}.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-end>*,.tox[dir=rtl] .tox-dialog__footer .tox-dialog__footer-start>*{margin-right:8px}body.tox-dialog__disable-scroll{overflow:hidden}.tox .tox-dropzone-container{display:flex;flex:1}.tox .tox-dropzone{align-items:center;background:#fff;border:2px dashed #ccc;box-sizing:border-box;display:flex;flex-direction:column;flex-grow:1;justify-content:center;min-height:100px;padding:10px}.tox .tox-dropzone p{color:rgba(34,47,62,.7);margin:0 0 16px 0}.tox .tox-edit-area{display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-edit-area::before{border:2px solid #2d6adf;border-radius:4px;content:'';inset:0;opacity:0;pointer-events:none;position:absolute;transition:opacity .15s;z-index:1}.tox .tox-edit-area__iframe{background-color:#fff;border:0;box-sizing:border-box;flex:1;height:100%;position:absolute;width:100%}.tox.tox-edit-focus .tox-edit-area::before{opacity:1}.tox.tox-inline-edit-area{border:1px dotted #ccc}.tox .tox-editor-container{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-editor-header{display:grid;grid-template-columns:1fr min-content;z-index:2}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:#fff;border-bottom:none;box-shadow:none;padding:4px 0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(.tox-editor-dock-transition){transition:box-shadow .5s}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:1px solid #ccc;box-shadow:none}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:#fff;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:4px 0}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox.tox:not(.tox-tinymce-inline) .tox-editor-header.tox-editor-header--empty{background:0 0;border:none;box-shadow:none;padding:0}.tox-editor-dock-fadeout{opacity:0;visibility:hidden}.tox-editor-dock-fadein{opacity:1;visibility:visible}.tox-editor-dock-transition{transition:visibility 0s linear .25s,opacity .25s ease}.tox-editor-dock-transition.tox-editor-dock-fadein{transition-delay:0s}.tox .tox-control-wrap{flex:1;position:relative}.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,.tox .tox-control-wrap:not(.tox-control-wrap--status-unknown) .tox-control-wrap__status-icon-unknown,.tox .tox-control-wrap:not(.tox-control-wrap--status-valid) .tox-control-wrap__status-icon-valid{display:none}.tox .tox-control-wrap svg{display:block}.tox .tox-control-wrap__status-icon-wrap{position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-control-wrap__status-icon-invalid svg{fill:#c00}.tox .tox-control-wrap__status-icon-unknown svg{fill:orange}.tox .tox-control-wrap__status-icon-valid svg{fill:green}.tox:not([dir=rtl]) .tox-control-wrap--status-invalid .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-unknown .tox-textfield,.tox:not([dir=rtl]) .tox-control-wrap--status-valid .tox-textfield{padding-right:32px}.tox:not([dir=rtl]) .tox-control-wrap__status-icon-wrap{right:4px}.tox[dir=rtl] .tox-control-wrap--status-invalid .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-unknown .tox-textfield,.tox[dir=rtl] .tox-control-wrap--status-valid .tox-textfield{padding-left:32px}.tox[dir=rtl] .tox-control-wrap__status-icon-wrap{left:4px}.tox .tox-autocompleter{max-width:25em}.tox .tox-autocompleter .tox-menu{box-sizing:border-box;max-width:25em}.tox .tox-autocompleter .tox-autocompleter-highlight{font-weight:700}.tox .tox-color-input{display:flex;position:relative;z-index:1}.tox .tox-color-input .tox-textfield{z-index:-1}.tox .tox-color-input span{border-color:rgba(34,47,62,.2);border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;height:24px;position:absolute;top:6px;width:24px}.tox .tox-color-input span:focus:not([aria-disabled=true]),.tox .tox-color-input span:hover:not([aria-disabled=true]){border-color:#207ab7;cursor:pointer}.tox .tox-color-input span::before{background-image:linear-gradient(45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(-45deg,rgba(0,0,0,.25) 25%,transparent 25%),linear-gradient(45deg,transparent 75%,rgba(0,0,0,.25) 75%),linear-gradient(-45deg,transparent 75%,rgba(0,0,0,.25) 75%);background-position:0 0,0 6px,6px -6px,-6px 0;background-size:12px 12px;border:1px solid #fff;border-radius:3px;box-sizing:border-box;content:'';height:24px;left:-1px;position:absolute;top:-1px;width:24px;z-index:-1}.tox .tox-color-input span[aria-disabled=true]{cursor:not-allowed}.tox:not([dir=rtl]) .tox-color-input .tox-textfield{padding-left:36px}.tox:not([dir=rtl]) .tox-color-input span{left:6px}.tox[dir=rtl] .tox-color-input .tox-textfield{padding-right:36px}.tox[dir=rtl] .tox-color-input span{right:6px}.tox .tox-label,.tox .tox-toolbar-label{color:rgba(34,47,62,.7);display:block;font-size:14px;font-style:normal;font-weight:400;line-height:1.3;padding:0 8px 0 0;text-transform:none;white-space:nowrap}.tox .tox-toolbar-label{padding:0 8px}.tox[dir=rtl] .tox-label{padding:0 0 0 8px}.tox .tox-form{display:flex;flex:1;flex-direction:column}.tox .tox-form__group{box-sizing:border-box;margin-bottom:4px}.tox .tox-form-group--maximize{flex:1}.tox .tox-form__group--error{color:#c00}.tox .tox-form__group--collection{display:flex}.tox .tox-form__grid{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-between}.tox .tox-form__grid--2col>.tox-form__group{width:calc(50% - (8px / 2))}.tox .tox-form__grid--3col>.tox-form__group{width:calc(100% / 3 - (8px / 2))}.tox .tox-form__grid--4col>.tox-form__group{width:calc(25% - (8px / 2))}.tox .tox-form__controls-h-stack{align-items:center;display:flex}.tox .tox-form__group--inline{align-items:center;display:flex}.tox .tox-form__group--stretched{display:flex;flex:1;flex-direction:column}.tox .tox-form__group--stretched .tox-textarea{flex:1}.tox .tox-form__group--stretched .tox-navobj{display:flex;flex:1}.tox .tox-form__group--stretched .tox-navobj :nth-child(2){flex:1;height:100%}.tox:not([dir=rtl]) .tox-form__controls-h-stack>:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-form__controls-h-stack>:not(:first-child){margin-right:4px}.tox .tox-lock.tox-locked .tox-lock-icon__unlock,.tox .tox-lock:not(.tox-locked) .tox-lock-icon__lock{display:none}.tox .tox-listboxfield .tox-listbox--select,.tox .tox-textarea,.tox .tox-textarea-wrap .tox-textarea:focus,.tox .tox-textfield,.tox .tox-toolbar-textfield{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-textarea[disabled],.tox .tox-textfield[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-custom-editor:focus-within,.tox .tox-listboxfield .tox-listbox--select:focus,.tox .tox-textarea-wrap:focus-within,.tox .tox-textarea:focus,.tox .tox-textfield:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-toolbar-textfield{border-width:0;margin-bottom:3px;margin-top:2px;max-width:250px}.tox .tox-naked-btn{background-color:transparent;border:0;border-color:transparent;box-shadow:unset;color:#207ab7;cursor:pointer;display:block;margin:0;padding:0}.tox .tox-naked-btn svg{display:block;fill:#222f3e}.tox:not([dir=rtl]) .tox-toolbar-textfield+*{margin-left:4px}.tox[dir=rtl] .tox-toolbar-textfield+*{margin-right:4px}.tox .tox-listboxfield{cursor:pointer;position:relative}.tox .tox-listboxfield .tox-listbox--select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-listbox__select-label{cursor:default;flex:1;margin:0 4px}.tox .tox-listbox__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-listbox__select-chevron svg{fill:#222f3e}.tox .tox-listboxfield .tox-listbox--select{align-items:center;display:flex}.tox:not([dir=rtl]) .tox-listboxfield svg{right:8px}.tox[dir=rtl] .tox-listboxfield svg{left:8px}.tox .tox-selectfield{cursor:pointer;position:relative}.tox .tox-selectfield select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;color:#222f3e;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;font-size:16px;line-height:24px;margin:0;min-height:34px;outline:0;padding:5px 4.75px;resize:none;width:100%}.tox .tox-selectfield select[disabled]{background-color:#f2f2f2;color:rgba(34,47,62,.85);cursor:not-allowed}.tox .tox-selectfield select::-ms-expand{display:none}.tox .tox-selectfield select:focus{background-color:#fff;border-color:#207ab7;box-shadow:none;outline:2px solid rgba(32,122,183,.25)}.tox .tox-selectfield svg{pointer-events:none;position:absolute;top:50%;transform:translateY(-50%)}.tox:not([dir=rtl]) .tox-selectfield select[size="0"],.tox:not([dir=rtl]) .tox-selectfield select[size="1"]{padding-right:24px}.tox:not([dir=rtl]) .tox-selectfield svg{right:8px}.tox[dir=rtl] .tox-selectfield select[size="0"],.tox[dir=rtl] .tox-selectfield select[size="1"]{padding-left:24px}.tox[dir=rtl] .tox-selectfield svg{left:8px}.tox .tox-textarea-wrap{border-color:#ccc;border-radius:3px;border-style:solid;border-width:1px;display:flex;flex:1;overflow:hidden}.tox .tox-textarea{-webkit-appearance:textarea;-moz-appearance:textarea;appearance:textarea;white-space:pre-wrap}.tox .tox-textarea-wrap .tox-textarea{border:none}.tox .tox-textarea-wrap .tox-textarea:focus{border:none}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}.tox .tox-help__more-link{list-style:none;margin-top:1em}.tox .tox-imagepreview{background-color:#666;height:380px;overflow:hidden;position:relative;width:100%}.tox .tox-imagepreview.tox-imagepreview__loaded{overflow:auto}.tox .tox-imagepreview__container{display:flex;left:100vw;position:absolute;top:100vw}.tox .tox-imagepreview__image{background:url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==)}.tox .tox-image-tools .tox-spacer{flex:1}.tox .tox-image-tools .tox-bar{align-items:center;display:flex;height:60px;justify-content:center}.tox .tox-image-tools .tox-imagepreview,.tox .tox-image-tools .tox-imagepreview+.tox-bar{margin-top:8px}.tox .tox-image-tools .tox-croprect-block{background:#000;opacity:.5;position:absolute;zoom:1}.tox .tox-image-tools .tox-croprect-handle{border:2px solid #fff;height:20px;left:0;position:absolute;top:0;width:20px}.tox .tox-image-tools .tox-croprect-handle-move{border:0;cursor:move;position:absolute}.tox .tox-image-tools .tox-croprect-handle-nw{border-width:2px 0 0 2px;cursor:nw-resize;left:100px;margin:-2px 0 0 -2px;top:100px}.tox .tox-image-tools .tox-croprect-handle-ne{border-width:2px 2px 0 0;cursor:ne-resize;left:200px;margin:-2px 0 0 -20px;top:100px}.tox .tox-image-tools .tox-croprect-handle-sw{border-width:0 0 2px 2px;cursor:sw-resize;left:100px;margin:-20px 2px 0 -2px;top:200px}.tox .tox-image-tools .tox-croprect-handle-se{border-width:0 2px 2px 0;cursor:se-resize;left:200px;margin:-20px 0 0 -20px;top:200px}.tox .tox-insert-table-picker{display:flex;flex-wrap:wrap;width:170px}.tox .tox-insert-table-picker>div{border-color:#ccc;border-style:solid;border-width:0 1px 1px 0;box-sizing:border-box;height:17px;width:17px}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:0 -4px}.tox .tox-insert-table-picker .tox-insert-table-picker__selected{background-color:rgba(32,122,183,.5);border-color:rgba(32,122,183,.5)}.tox .tox-insert-table-picker__label{color:rgba(34,47,62,.7);display:block;font-size:14px;padding:4px;text-align:center;width:100%}.tox:not([dir=rtl]) .tox-insert-table-picker>div:nth-child(10n){border-right:0}.tox[dir=rtl] .tox-insert-table-picker>div:nth-child(10n+1){border-right:0}.tox .tox-menu{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 4px 8px 0 rgba(34,47,62,.1);display:inline-block;overflow:hidden;vertical-align:top;z-index:1150}.tox .tox-menu.tox-collection.tox-collection--list{padding:0 0}.tox .tox-menu.tox-collection.tox-collection--toolbar{padding:4px}.tox .tox-menu.tox-collection.tox-collection--grid{padding:4px}@media only screen and (min-width:768px){.tox .tox-menu .tox-collection__item-label{overflow-wrap:break-word;word-break:normal}.tox .tox-dialog__popups .tox-menu .tox-collection__item-label{word-break:break-all}}.tox .tox-menu__label blockquote,.tox .tox-menu__label code,.tox .tox-menu__label h1,.tox .tox-menu__label h2,.tox .tox-menu__label h3,.tox .tox-menu__label h4,.tox .tox-menu__label h5,.tox .tox-menu__label h6,.tox .tox-menu__label p{margin:0}.tox .tox-menubar{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;grid-column:1/-1;grid-row:1;padding:0 4px 0 4px}.tox .tox-promotion+.tox-menubar{grid-column:1}.tox .tox-promotion{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff;background-color:#fff;grid-column:2;grid-row:1;padding-inline-end:8px;padding-inline-start:4px;padding-top:5px}.tox .tox-promotion-link{align-items:unsafe center;background-color:#e8f1f8;border-radius:5px;color:#086be6;cursor:pointer;display:flex;font-size:14px;height:26.6px;padding:4px 8px;white-space:nowrap}.tox .tox-promotion-link:hover{background-color:#b4d7ff}.tox .tox-promotion-link:focus{background-color:#d9edf7}.tox .tox-mbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:2px 0 3px 0;outline:0;overflow:hidden;padding:0 4px;text-transform:none;width:auto}.tox .tox-mbtn[disabled]{background-color:transparent;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-mbtn:focus:not(:disabled){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn--active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active){background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-mbtn__select-label{cursor:default;font-weight:400;margin:0 4px}.tox .tox-mbtn[disabled] .tox-mbtn__select-label{cursor:not-allowed}.tox .tox-mbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px;display:none}.tox .tox-notification{border-radius:3px;border-style:solid;border-width:1px;box-shadow:none;box-sizing:border-box;display:grid;font-size:14px;font-weight:400;grid-template-columns:minmax(40px,1fr) auto minmax(40px,1fr);margin-top:4px;opacity:0;padding:4px;transition:transform .1s ease-in,opacity 150ms ease-in}.tox .tox-notification p{font-size:14px;font-weight:400}.tox .tox-notification a{cursor:pointer;text-decoration:underline}.tox .tox-notification--in{opacity:1}.tox .tox-notification--success{background-color:#e4eeda;border-color:#d7e6c8;color:#222f3e}.tox .tox-notification--success p{color:#222f3e}.tox .tox-notification--success a{color:#517342}.tox .tox-notification--success svg{fill:#222f3e}.tox .tox-notification--error{background-color:#f5cccc;border-color:#f0b3b3;color:#222f3e}.tox .tox-notification--error p{color:#222f3e}.tox .tox-notification--error a{color:#77181f}.tox .tox-notification--error svg{fill:#222f3e}.tox .tox-notification--warn,.tox .tox-notification--warning{background-color:#fff5cc;border-color:#fff0b3;color:#222f3e}.tox .tox-notification--warn p,.tox .tox-notification--warning p{color:#222f3e}.tox .tox-notification--warn a,.tox .tox-notification--warning a{color:#7a6e25}.tox .tox-notification--warn svg,.tox .tox-notification--warning svg{fill:#222f3e}.tox .tox-notification--info{background-color:#d6e7fb;border-color:#c1dbf9;color:#222f3e}.tox .tox-notification--info p{color:#222f3e}.tox .tox-notification--info a{color:#2a64a6}.tox .tox-notification--info svg{fill:#222f3e}.tox .tox-notification__body{align-self:center;color:#222f3e;font-size:14px;grid-column-end:3;grid-column-start:2;grid-row-end:2;grid-row-start:1;text-align:center;white-space:normal;word-break:break-all;word-break:break-word}.tox .tox-notification__body>*{margin:0}.tox .tox-notification__body>*+*{margin-top:1rem}.tox .tox-notification__icon{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification__icon svg{display:block}.tox .tox-notification__dismiss{align-self:start;grid-column-end:4;grid-column-start:3;grid-row-end:2;grid-row-start:1;justify-self:end}.tox .tox-notification .tox-progress-bar{grid-column-end:4;grid-column-start:1;grid-row-end:3;grid-row-start:2;justify-self:center}.tox .tox-pop{display:inline-block;position:relative}.tox .tox-pop--resizing{transition:width .1s ease}.tox .tox-pop--resizing .tox-toolbar,.tox .tox-pop--resizing .tox-toolbar__group{flex-wrap:nowrap}.tox .tox-pop--transition{transition:.15s ease;transition-property:left,right,top,bottom}.tox .tox-pop--transition::after,.tox .tox-pop--transition::before{transition:all .15s,visibility 0s,opacity 75ms ease 75ms}.tox .tox-pop__dialog{background-color:#fff;border:1px solid #ccc;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);min-width:0;overflow:hidden}.tox .tox-pop__dialog>:not(.tox-toolbar){margin:4px 4px 4px 8px}.tox .tox-pop__dialog .tox-toolbar{background-color:transparent;margin-bottom:-1px}.tox .tox-pop::after,.tox .tox-pop::before{border-style:solid;content:'';display:block;height:0;opacity:1;position:absolute;width:0}.tox .tox-pop.tox-pop--inset::after,.tox .tox-pop.tox-pop--inset::before{opacity:0;transition:all 0s .15s,visibility 0s,opacity 75ms ease}.tox .tox-pop.tox-pop--bottom::after,.tox .tox-pop.tox-pop--bottom::before{left:50%;top:100%}.tox .tox-pop.tox-pop--bottom::after{border-color:#fff transparent transparent transparent;border-width:8px;margin-left:-8px;margin-top:-1px}.tox .tox-pop.tox-pop--bottom::before{border-color:#ccc transparent transparent transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--top::after,.tox .tox-pop.tox-pop--top::before{left:50%;top:0;transform:translateY(-100%)}.tox .tox-pop.tox-pop--top::after{border-color:transparent transparent #fff transparent;border-width:8px;margin-left:-8px;margin-top:1px}.tox .tox-pop.tox-pop--top::before{border-color:transparent transparent #ccc transparent;border-width:9px;margin-left:-9px}.tox .tox-pop.tox-pop--left::after,.tox .tox-pop.tox-pop--left::before{left:0;top:calc(50% - 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--left::after{border-color:transparent #fff transparent transparent;border-width:8px;margin-left:-15px}.tox .tox-pop.tox-pop--left::before{border-color:transparent #ccc transparent transparent;border-width:10px;margin-left:-19px}.tox .tox-pop.tox-pop--right::after,.tox .tox-pop.tox-pop--right::before{left:100%;top:calc(50% + 1px);transform:translateY(-50%)}.tox .tox-pop.tox-pop--right::after{border-color:transparent transparent transparent #fff;border-width:8px;margin-left:-1px}.tox .tox-pop.tox-pop--right::before{border-color:transparent transparent transparent #ccc;border-width:10px;margin-left:-1px}.tox .tox-pop.tox-pop--align-left::after,.tox .tox-pop.tox-pop--align-left::before{left:20px}.tox .tox-pop.tox-pop--align-right::after,.tox .tox-pop.tox-pop--align-right::before{left:calc(100% - 20px)}.tox .tox-sidebar-wrap{display:flex;flex-direction:row;flex-grow:1;min-height:0}.tox .tox-sidebar{background-color:#fff;display:flex;flex-direction:row;justify-content:flex-end}.tox .tox-sidebar__slider{display:flex;overflow:hidden}.tox .tox-sidebar__pane-container{display:flex}.tox .tox-sidebar__pane{display:flex}.tox .tox-sidebar--sliding-closed{opacity:0}.tox .tox-sidebar--sliding-open{opacity:1}.tox .tox-sidebar--sliding-growing,.tox .tox-sidebar--sliding-shrinking{transition:width .5s ease,opacity .5s ease}.tox .tox-selector{background-color:#4099ff;border-color:#4099ff;border-style:solid;border-width:1px;box-sizing:border-box;display:inline-block;height:10px;position:absolute;width:10px}.tox.tox-platform-touch .tox-selector{height:12px;width:12px}.tox .tox-slider{align-items:center;display:flex;flex:1;height:24px;justify-content:center;position:relative}.tox .tox-slider__rail{background-color:transparent;border:1px solid #ccc;border-radius:3px;height:10px;min-width:120px;width:100%}.tox .tox-slider__handle{background-color:#207ab7;border:2px solid #185d8c;border-radius:3px;box-shadow:none;height:24px;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%);width:14px}.tox .tox-form__controls-h-stack>.tox-slider:not(:first-of-type){margin-inline-start:8px}.tox .tox-form__controls-h-stack>.tox-form__group+.tox-slider{margin-inline-start:32px}.tox .tox-form__controls-h-stack>.tox-slider+.tox-form__group{margin-inline-start:32px}.tox .tox-source-code{overflow:auto}.tox .tox-spinner{display:flex}.tox .tox-spinner>div{animation:tam-bouncing-dots 1.5s ease-in-out 0s infinite both;background-color:rgba(34,47,62,.7);border-radius:100%;height:8px;width:8px}.tox .tox-spinner>div:nth-child(1){animation-delay:-.32s}.tox .tox-spinner>div:nth-child(2){animation-delay:-.16s}@keyframes tam-bouncing-dots{0%,100%,80%{transform:scale(0)}40%{transform:scale(1)}}.tox:not([dir=rtl]) .tox-spinner>div:not(:first-child){margin-left:4px}.tox[dir=rtl] .tox-spinner>div:not(:first-child){margin-right:4px}.tox .tox-statusbar{align-items:center;background-color:#fff;border-top:1px solid #ccc;color:rgba(34,47,62,.7);display:flex;flex:0 0 auto;font-size:12px;font-weight:400;height:18px;overflow:hidden;padding:0 8px;position:relative;text-transform:uppercase}.tox .tox-statusbar__path{display:flex;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-statusbar__right-container{display:flex;justify-content:flex-end;white-space:nowrap}.tox .tox-statusbar__help-text{text-align:center}.tox .tox-statusbar__text-container{display:flex;flex:1 1 auto;justify-content:space-between;overflow:hidden}@media only screen and (min-width:768px){.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__help-text,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__path,.tox .tox-statusbar__text-container.tox-statusbar__text-container-3-cols>.tox-statusbar__right-container{flex:0 0 calc(100% / 3)}}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-end{justify-content:flex-end}.tox .tox-statusbar__text-container.tox-statusbar__text-container--flex-start{justify-content:flex-start}.tox .tox-statusbar__text-container.tox-statusbar__text-container--space-around{justify-content:space-around}.tox .tox-statusbar__path>*{display:inline;white-space:nowrap}.tox .tox-statusbar__wordcount{flex:0 0 auto;margin-left:1ch}@media only screen and (max-width:767px){.tox .tox-statusbar__text-container .tox-statusbar__help-text{display:none}.tox .tox-statusbar__text-container .tox-statusbar__help-text:only-child{display:block}}.tox .tox-statusbar a,.tox .tox-statusbar__path-item,.tox .tox-statusbar__wordcount{color:rgba(34,47,62,.7);text-decoration:none}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:#222f3e;cursor:pointer}.tox .tox-statusbar__branding svg{fill:rgba(34,47,62,.8);height:1.14em;vertical-align:-.28em;width:3.6em}.tox .tox-statusbar__branding a:focus:not(:disabled):not([aria-disabled=true]) svg,.tox .tox-statusbar__branding a:hover:not(:disabled):not([aria-disabled=true]) svg{fill:#222f3e}.tox .tox-statusbar__resize-handle{align-items:flex-end;align-self:stretch;cursor:nwse-resize;display:flex;flex:0 0 auto;justify-content:flex-end;margin-left:auto;margin-right:-8px;padding-bottom:3px;padding-left:1ch;padding-right:3px}.tox .tox-statusbar__resize-handle svg{display:block;fill:rgba(34,47,62,.5)}.tox .tox-statusbar__resize-handle:focus svg{background-color:#dee0e2;border-radius:1px 1px -4px 1px;box-shadow:0 0 0 2px #dee0e2}.tox:not([dir=rtl]) .tox-statusbar__path>*{margin-right:4px}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:2ch}.tox[dir=rtl] .tox-statusbar{flex-direction:row-reverse}.tox[dir=rtl] .tox-statusbar__path>*{margin-left:4px}.tox .tox-throbber{z-index:1299}.tox .tox-throbber__busy-spinner{align-items:center;background-color:rgba(255,255,255,.6);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.tox .tox-tbtn{align-items:center;background:0 0;border:0;border-radius:3px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:34px;justify-content:center;margin:3px 0 2px 0;outline:0;overflow:hidden;padding:0;text-transform:none;width:34px}.tox .tox-tbtn svg{display:block;fill:#222f3e}.tox .tox-tbtn.tox-tbtn-more{padding-left:5px;padding-right:5px;width:inherit}.tox .tox-tbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:hover svg{fill:#222f3e}.tox .tox-tbtn:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn:active svg{fill:#222f3e}.tox .tox-tbtn--disabled .tox-tbtn--enabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--disabled,.tox .tox-tbtn--disabled:hover,.tox .tox-tbtn:disabled,.tox .tox-tbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tbtn--disabled svg,.tox .tox-tbtn--disabled:hover svg,.tox .tox-tbtn:disabled svg,.tox .tox-tbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--enabled,.tox .tox-tbtn--enabled:hover{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-tbtn--enabled:hover>*,.tox .tox-tbtn--enabled>*{transform:none}.tox .tox-tbtn--enabled svg,.tox .tox-tbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tbtn--enabled.tox-tbtn--disabled svg,.tox .tox-tbtn--enabled:hover.tox-tbtn--disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled){color:#222f3e}.tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg{fill:#222f3e}.tox .tox-tbtn:active>*{transform:none}.tox .tox-tbtn--md{height:51px;width:51px}.tox .tox-tbtn--lg{flex-direction:column;height:68px;width:68px}.tox .tox-tbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tbtn--labeled{padding:0 4px;width:unset}.tox .tox-tbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-number-input{border-radius:3px;display:flex;margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-number-input .tox-input-wrapper{background:0 0;display:flex;pointer-events:none;text-align:center}.tox .tox-number-input .tox-input-wrapper:focus{background:#dee0e2}.tox .tox-number-input input{border-radius:3px;color:#222f3e;font-size:14px;margin:2px 0;pointer-events:all;width:60px}.tox .tox-number-input input:hover{background:#dee0e2;color:#222f3e}.tox .tox-number-input input:focus{background:#fff;color:#222f3e}.tox .tox-number-input input:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button{background:0 0;color:#222f3e;height:34px;text-align:center;width:24px}.tox .tox-number-input button svg{display:block;fill:#222f3e;margin:0 auto;transform:scale(.67)}.tox .tox-number-input button:focus{background:#dee0e2}.tox .tox-number-input button:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:hover svg{fill:#222f3e}.tox .tox-number-input button:active{background:#c8cbcf;border:0;box-shadow:none;color:#222f3e}.tox .tox-number-input button:active svg{fill:#222f3e}.tox .tox-number-input button:disabled{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-number-input button:disabled svg{fill:rgba(34,47,62,.5)}.tox .tox-number-input button.minus{border-radius:3px 0 0 3px}.tox .tox-number-input button.plus{border-radius:0 3px 3px 0}.tox .tox-number-input:focus:not(:active)>.tox-input-wrapper,.tox .tox-number-input:focus:not(:active)>button{background:#dee0e2}.tox .tox-tbtn--select{margin:3px 0 2px 0;padding:0 4px;width:auto}.tox .tox-tbtn__select-label{cursor:default;font-weight:400;height:initial;margin:0 4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tbtn__select-chevron{align-items:center;display:flex;justify-content:center;width:16px}.tox .tox-tbtn__select-chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-tbtn--bespoke{background:0 0}.tox .tox-tbtn--bespoke+.tox-tbtn--bespoke{margin-inline-start:0}.tox .tox-tbtn--bespoke .tox-tbtn__select-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:7em}.tox .tox-tbtn--disabled .tox-tbtn__select-label,.tox .tox-tbtn--select:disabled .tox-tbtn__select-label{cursor:not-allowed}.tox .tox-split-button{border:0;border-radius:3px;box-sizing:border-box;display:flex;margin:3px 0 2px 0;overflow:hidden}.tox .tox-split-button:hover{box-shadow:0 0 0 1px #dee0e2 inset}.tox .tox-split-button:focus{background:#dee0e2;box-shadow:none;color:#222f3e}.tox .tox-split-button>*{border-radius:0}.tox .tox-split-button__chevron{width:16px}.tox .tox-split-button__chevron svg{fill:rgba(34,47,62,.5)}.tox .tox-split-button .tox-tbtn{margin:0}.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:focus,.tox .tox-split-button.tox-tbtn--disabled .tox-tbtn:hover,.tox .tox-split-button.tox-tbtn--disabled:focus,.tox .tox-split-button.tox-tbtn--disabled:hover{background:0 0;box-shadow:none;color:rgba(34,47,62,.5)}.tox.tox-platform-touch .tox-split-button .tox-tbtn--select{padding:0 0}.tox.tox-platform-touch .tox-split-button .tox-tbtn:not(.tox-tbtn--select):first-child{width:30px}.tox.tox-platform-touch .tox-split-button__chevron{width:20px}.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-highlight-bg-color__color,.tox .tox-split-button.tox-tbtn--disabled svg #tox-icon-text-color__color{opacity:.6}.tox .tox-toolbar-overlord{background-color:#fff}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background-attachment:local;background-color:#fff;background-image:repeating-linear-gradient(#ccc 0 1px,transparent 1px 39px);background-position:center top 39px;background-repeat:no-repeat;background-size:calc(100% - 4px * 2) calc(100% - 39px);display:flex;flex:0 0 auto;flex-shrink:0;flex-wrap:wrap;padding:0 0;transform:perspective(1px)}.tox .tox-toolbar-overlord>.tox-toolbar,.tox .tox-toolbar-overlord>.tox-toolbar__overflow,.tox .tox-toolbar-overlord>.tox-toolbar__primary{background-position:center top 0;background-size:calc(100% - 4px * 2) calc(100% - 0px)}.tox .tox-toolbar__overflow.tox-toolbar__overflow--closed{height:0;opacity:0;padding-bottom:0;padding-top:0;visibility:hidden}.tox .tox-toolbar__overflow--growing{transition:height .3s ease,opacity .2s linear .1s}.tox .tox-toolbar__overflow--shrinking{transition:opacity .3s ease,height .2s linear .1s,visibility 0s linear .3s}.tox .tox-anchorbar,.tox .tox-toolbar-overlord{grid-column:1/-1}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord{border-top:1px solid #ccc;margin-top:-1px;padding-bottom:0;padding-top:0}.tox .tox-toolbar--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-pop .tox-toolbar{border-width:0}.tox .tox-toolbar--no-divider{background-image:none}.tox .tox-toolbar-overlord .tox-toolbar:not(.tox-toolbar--scrolling):first-child,.tox .tox-toolbar-overlord .tox-toolbar__primary{background-position:center top 39px}.tox .tox-editor-header>.tox-toolbar--scrolling,.tox .tox-toolbar-overlord .tox-toolbar--scrolling:first-child{background-image:none}.tox.tox-tinymce-aux .tox-toolbar__overflow{background-color:#fff;background-position:center top 43px;background-size:calc(100% - 8px * 2) calc(100% - 51px);border:none;border-radius:3px;box-shadow:0 0 2px 0 rgba(34,47,62,.2),0 4px 8px 0 rgba(34,47,62,.15);overscroll-behavior:none;padding:4px 0}.tox-pop .tox-pop__dialog .tox-toolbar{background-position:center top 43px;background-size:calc(100% - 4px * 2) calc(100% - 51px);padding:4px 0}.tox .tox-toolbar__group{align-items:center;display:flex;flex-wrap:wrap;margin:0 0;padding:0 4px 0 4px}.tox .tox-toolbar__group--pull-right{margin-left:auto}.tox .tox-toolbar--scrolling .tox-toolbar__group{flex-shrink:0;flex-wrap:nowrap}.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type){border-right:1px solid #ccc}.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type){border-left:1px solid #ccc}.tox .tox-tooltip{display:inline-block;padding:8px;position:relative}.tox .tox-tooltip__body{background-color:#222f3e;border-radius:3px;box-shadow:0 2px 4px rgba(34,47,62,.3);color:rgba(255,255,255,.75);font-size:14px;font-style:normal;font-weight:400;padding:4px 8px;text-transform:none}.tox .tox-tooltip__arrow{position:absolute}.tox .tox-tooltip--down .tox-tooltip__arrow{border-left:8px solid transparent;border-right:8px solid transparent;border-top:8px solid #222f3e;bottom:0;left:50%;position:absolute;transform:translateX(-50%)}.tox .tox-tooltip--up .tox-tooltip__arrow{border-bottom:8px solid #222f3e;border-left:8px solid transparent;border-right:8px solid transparent;left:50%;position:absolute;top:0;transform:translateX(-50%)}.tox .tox-tooltip--right .tox-tooltip__arrow{border-bottom:8px solid transparent;border-left:8px solid #222f3e;border-top:8px solid transparent;position:absolute;right:0;top:50%;transform:translateY(-50%)}.tox .tox-tooltip--left .tox-tooltip__arrow{border-bottom:8px solid transparent;border-right:8px solid #222f3e;border-top:8px solid transparent;left:0;position:absolute;top:50%;transform:translateY(-50%)}.tox .tox-tree{display:flex;flex-direction:column}.tox .tox-tree .tox-trbtn{align-items:center;background:0 0;border:0;border-radius:4px;box-shadow:none;color:#222f3e;display:flex;flex:0 0 auto;font-size:14px;font-style:normal;font-weight:400;height:28px;margin-bottom:4px;margin-top:4px;outline:0;overflow:hidden;padding:0;padding-left:8px;text-transform:none}.tox .tox-tree .tox-trbtn .tox-tree__label{cursor:default;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tox .tox-tree .tox-trbtn svg{display:block;fill:#222f3e}.tox .tox-tree .tox-trbtn:focus{background:#dee0e2;border:0;box-shadow:none}.tox .tox-tree .tox-trbtn:hover{background:#dee0e2;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn:active svg{fill:#222f3e}.tox .tox-tree .tox-trbtn--disabled,.tox .tox-tree .tox-trbtn--disabled:hover,.tox .tox-tree .tox-trbtn:disabled,.tox .tox-tree .tox-trbtn:disabled:hover{background:0 0;border:0;box-shadow:none;color:rgba(34,47,62,.5);cursor:not-allowed}.tox .tox-tree .tox-trbtn--disabled svg,.tox .tox-tree .tox-trbtn--disabled:hover svg,.tox .tox-tree .tox-trbtn:disabled svg,.tox .tox-tree .tox-trbtn:disabled:hover svg{fill:rgba(34,47,62,.5)}.tox .tox-tree .tox-trbtn--enabled,.tox .tox-tree .tox-trbtn--enabled:hover{background:#b1d0e6;border:0;box-shadow:none;color:#222f3e}.tox .tox-tree .tox-trbtn--enabled:hover>*,.tox .tox-tree .tox-trbtn--enabled>*{transform:none}.tox .tox-tree .tox-trbtn--enabled svg,.tox .tox-tree .tox-trbtn--enabled:hover svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled){color:#222f3e}.tox .tox-tree .tox-trbtn:focus:not(.tox-trbtn--disabled) svg{fill:#222f3e}.tox .tox-tree .tox-trbtn:active>*{transform:none}.tox .tox-tree .tox-trbtn--return{align-self:stretch;height:unset;width:16px}.tox .tox-tree .tox-trbtn--labeled{padding:0 4px;width:unset}.tox .tox-tree .tox-trbtn__vlabel{display:block;font-size:10px;font-weight:400;letter-spacing:-.025em;margin-bottom:4px;white-space:nowrap}.tox .tox-tree .tox-tree--directory{display:flex;flex-direction:column}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label{font-weight:700}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:focus .tox-mbtn svg,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label .tox-chevron{margin-right:6px}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--shrinking) .tox-chevron{transition:transform .5s ease-in-out}.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--growing) .tox-chevron,.tox .tox-tree .tox-tree--directory .tox-tree--directory__label:has(+.tox-tree--directory__children--open) .tox-chevron{transform:rotate(90deg)}.tox .tox-tree .tox-tree--leaf__label{font-weight:400}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn{margin-left:auto}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn svg{fill:transparent}.tox .tox-tree .tox-tree--leaf__label .tox-mbtn.tox-mbtn--active svg,.tox .tox-tree .tox-tree--leaf__label .tox-mbtn:focus svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover .tox-mbtn svg{fill:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover){background-color:transparent;color:#222f3e}.tox .tox-tree .tox-tree--leaf__label:hover:has(.tox-mbtn:hover) .tox-chevron svg{fill:#222f3e}.tox .tox-tree .tox-tree--directory__children{overflow:hidden;padding-left:16px}.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--growing,.tox .tox-tree .tox-tree--directory__children.tox-tree--directory__children--shrinking{transition:height .5s ease-in-out}.tox .tox-tree .tox-trbtn.tox-tree--leaf__label{display:flex;justify-content:space-between}.tox .tox-view-wrap,.tox .tox-view-wrap__slot-container{background-color:#fff;display:flex;flex:1;flex-direction:column}.tox .tox-view{display:flex;flex:1 1 auto;flex-direction:column;overflow:hidden}.tox .tox-view__header{align-items:center;display:flex;font-size:16px;justify-content:space-between;padding:8px 8px 0 8px;position:relative}.tox .tox-view--mobile.tox-view__header,.tox .tox-view--mobile.tox-view__toolbar{padding:8px}.tox .tox-view--scrolling{flex-wrap:nowrap;overflow-x:auto}.tox .tox-view__toolbar{display:flex;flex-direction:row;gap:8px;justify-content:space-between;padding:8px 8px 0 8px}.tox .tox-view__toolbar__group{display:flex;flex-direction:row;gap:12px}.tox .tox-view__header-end,.tox .tox-view__header-start{display:flex}.tox .tox-view__pane{height:100%;padding:8px;width:100%}.tox .tox-view__pane_panel{border:1px solid #ccc;border-radius:3px}.tox:not([dir=rtl]) .tox-view__header .tox-view__header-end>*,.tox:not([dir=rtl]) .tox-view__header .tox-view__header-start>*{margin-left:8px}.tox[dir=rtl] .tox-view__header .tox-view__header-end>*,.tox[dir=rtl] .tox-view__header .tox-view__header-start>*{margin-right:8px}.tox .tox-well{border:1px solid #ccc;border-radius:3px;padding:8px;width:100%}.tox .tox-well>:first-child{margin-top:0}.tox .tox-well>:last-child{margin-bottom:0}.tox .tox-well>:only-child{margin:0}.tox .tox-custom-editor{border:1px solid #ccc;border-radius:3px;display:flex;flex:1;overflow:hidden;position:relative}.tox .tox-dialog-loading::before{background-color:rgba(0,0,0,.5);content:"";height:100%;position:absolute;width:100%;z-index:1000}.tox .tox-tab{cursor:pointer}.tox .tox-dialog__content-js{display:flex;flex:1}.tox .tox-dialog__body-content .tox-collection{display:flex;flex:1}.tox:not(.tox-tinymce-inline) .tox-editor-header{background-color:none;padding:0}.tox.tox-tinymce--toolbar-bottom .tox-editor-header,.tox.tox-tinymce-inline .tox-editor-header{margin-bottom:-1px}.tox.tox-tinymce-inline .tox-editor-container{overflow:hidden}.tox:not(.tox-tinymce-inline).tox-tinymce--toolbar-bottom .tox-editor-header{border-top:none;box-shadow:none}.tox.tox.tox-tinymce--toolbar-sticky-on .tox-editor-header{background-color:transparent;box-shadow:0 4px 4px -3px rgba(0,0,0,.25);padding:0}.tox.tox.tox-tinymce--toolbar-sticky-on.tox-tinymce--toolbar-bottom .tox-editor-header{box-shadow:0 4px 4px -3px rgba(0,0,0,.25)}.tox .tox-collection--list .tox-collection__group .tox-insert-table-picker{margin:-4px 0}.tox .tox-menu.tox-collection.tox-collection--list{padding:0}.tox .tox-pop{box-shadow:none}.tox .tox-number-input,.tox .tox-split-button,.tox .tox-tbtn,.tox .tox-tbtn--select{margin:2px 0 3px 0}.tox .tox-toolbar,.tox .tox-toolbar__overflow,.tox .tox-toolbar__primary{background:url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%23cccccc'/%3E%3C/svg%3E") left 0 top 0 #fff!important}.tox .tox-menubar+.tox-toolbar-overlord{border-top:none}.tox .tox-menubar+.tox-toolbar,.tox .tox-menubar+.tox-toolbar-overlord .tox-toolbar__primary{border-top:1px solid #ccc;margin-top:-1px}.tox.tox-tinymce-aux .tox-toolbar__overflow{border:1px solid #ccc;padding:0}.tox .tox-pop .tox-pop__dialog .tox-toolbar{padding:0}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar{border-top:1px solid #ccc}.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar-overlord:first-child .tox-toolbar__primary,.tox:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-toolbar:first-child{border-top:1px solid #ccc}.tox .tox-toolbar__group{padding:0 4px 0 4px}.tox .tox-collection__item{border-radius:0;cursor:pointer}.tox .tox-statusbar a:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar a:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__path-item:hover:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:focus:not(:disabled):not([aria-disabled=true]),.tox .tox-statusbar__wordcount:hover:not(:disabled):not([aria-disabled=true]){color:rgba(34,47,62,.7);text-decoration:underline}.tox .tox-statusbar__branding svg{vertical-align:-.25em}.tox:not([dir=rtl]) .tox-statusbar__branding{margin-left:1ch}.tox .tox-statusbar__resize-handle{padding-bottom:0;padding-right:0}.tox .tox-button::before{display:none}
diff --git a/public/libs/tinymce/skins/ui/tinymce-5/skin.shadowdom.js b/public/libs/tinymce/skins/ui/tinymce-5/skin.shadowdom.js
new file mode 100644
index 00000000000..d5b36921289
--- /dev/null
+++ b/public/libs/tinymce/skins/ui/tinymce-5/skin.shadowdom.js
@@ -0,0 +1,2 @@
+tinymce.Resource.add('ui/tinymce-5/skin.shadowdom.css', "body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;margin:0;overflow:hidden;overscroll-behavior:none;padding:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox-shadowhost.tox-fullscreen,.tox.tox-tinymce.tox-fullscreen{left:0;position:fixed;top:0;z-index:1200}.tox.tox-tinymce.tox-fullscreen{background-color:transparent}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}")
+//# sourceMappingURL=skin.shadowdom.js.map
diff --git a/public/libs/tinymce/themes/silver/theme.min.js b/public/libs/tinymce/themes/silver/theme.min.js
index b52e884b413..6f37cfb56cc 100644
--- a/public/libs/tinymce/themes/silver/theme.min.js
+++ b/public/libs/tinymce/themes/silver/theme.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";const e=Object.getPrototypeOf,t=(e,t,o)=>{var n;return!!o(e,t.prototype)||(null===(n=e.constructor)||void 0===n?void 0:n.name)===t.name},o=e=>o=>(e=>{const o=typeof e;return null===e?"null":"object"===o&&Array.isArray(e)?"array":"object"===o&&t(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":o})(o)===e,n=e=>t=>typeof t===e,s=e=>t=>e===t,r=o("string"),a=o("object"),i=o=>((o,n)=>a(o)&&t(o,n,((t,o)=>e(t)===o)))(o,Object),l=o("array"),c=s(null),d=n("boolean"),u=s(void 0),m=e=>null==e,g=e=>!m(e),p=n("function"),h=n("number"),f=(e,t)=>{if(l(e)){for(let o=0,n=e.length;o<n;++o)if(!t(e[o]))return!1;return!0}return!1},b=()=>{},v=e=>()=>e(),y=(e,t)=>(...o)=>e(t.apply(null,o)),x=e=>()=>e,w=e=>e,S=(e,t)=>e===t;function k(e,...t){return(...o)=>{const n=t.concat(o);return e.apply(null,n)}}const C=e=>t=>!e(t),O=e=>()=>{throw new Error(e)},_=e=>e(),T=x(!1),E=x(!0);class A{constructor(e,t){this.tag=e,this.value=t}static some(e){return new A(!0,e)}static none(){return A.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?A.some(e(this.value)):A.none()}bind(e){return this.tag?e(this.value):A.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:A.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return g(e)?A.some(e):A.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}A.singletonNone=new A(!1);const M=Array.prototype.slice,D=Array.prototype.indexOf,B=Array.prototype.push,F=(e,t)=>D.call(e,t),I=(e,t)=>{const o=F(e,t);return-1===o?A.none():A.some(o)},R=(e,t)=>F(e,t)>-1,N=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return!0;return!1},V=(e,t)=>{const o=[];for(let n=0;n<e;n++)o.push(t(n));return o},z=(e,t)=>{const o=[];for(let n=0;n<e.length;n+=t){const s=M.call(e,n,n+t);o.push(s)}return o},H=(e,t)=>{const o=e.length,n=new Array(o);for(let s=0;s<o;s++){const o=e[s];n[s]=t(o,s)}return n},L=(e,t)=>{for(let o=0,n=e.length;o<n;o++)t(e[o],o)},P=(e,t)=>{const o=[],n=[];for(let s=0,r=e.length;s<r;s++){const r=e[s];(t(r,s)?o:n).push(r)}return{pass:o,fail:n}},U=(e,t)=>{const o=[];for(let n=0,s=e.length;n<s;n++){const s=e[n];t(s,n)&&o.push(s)}return o},W=(e,t,o)=>(((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(e,((e,n)=>{o=t(o,e,n)})),o),j=(e,t,o)=>(L(e,((e,n)=>{o=t(o,e,n)})),o),G=(e,t)=>((e,t,o)=>{for(let n=0,s=e.length;n<s;n++){const s=e[n];if(t(s,n))return A.some(s);if(o(s,n))break}return A.none()})(e,t,T),$=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return A.some(o);return A.none()},q=e=>{const t=[];for(let o=0,n=e.length;o<n;++o){if(!l(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);B.apply(t,e[o])}return t},X=(e,t)=>q(H(e,t)),Y=(e,t)=>{for(let o=0,n=e.length;o<n;++o)if(!0!==t(e[o],o))return!1;return!0},K=e=>{const t=M.call(e,0);return t.reverse(),t},J=(e,t)=>U(e,(e=>!R(t,e))),Z=(e,t)=>{const o={};for(let n=0,s=e.length;n<s;n++){const s=e[n];o[String(s)]=t(s,n)}return o},Q=e=>[e],ee=(e,t)=>{const o=M.call(e,0);return o.sort(t),o},te=(e,t)=>t>=0&&t<e.length?A.some(e[t]):A.none(),oe=e=>te(e,0),ne=e=>te(e,e.length-1),se=p(Array.from)?Array.from:e=>M.call(e),re=(e,t)=>{for(let o=0;o<e.length;o++){const n=t(e[o],o);if(n.isSome())return n}return A.none()},ae=Object.keys,ie=Object.hasOwnProperty,le=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n];t(e[s],s)}},ce=(e,t)=>de(e,((e,o)=>({k:o,v:t(e,o)}))),de=(e,t)=>{const o={};return le(e,((e,n)=>{const s=t(e,n);o[s.k]=s.v})),o},ue=e=>(t,o)=>{e[o]=t},me=(e,t,o,n)=>{le(e,((e,s)=>{(t(e,s)?o:n)(e,s)}))},ge=(e,t)=>{const o={};return me(e,t,ue(o),b),o},pe=(e,t)=>{const o=[];return le(e,((e,n)=>{o.push(t(e,n))})),o},he=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n],r=e[s];if(t(r,s,e))return A.some(r)}return A.none()},fe=e=>pe(e,w),be=(e,t)=>ve(e,t)?A.from(e[t]):A.none(),ve=(e,t)=>ie.call(e,t),ye=(e,t)=>ve(e,t)&&void 0!==e[t]&&null!==e[t],xe=(e,t,o=S)=>e.exists((e=>o(e,t))),we=e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t},Se=(e,t,o)=>e.isSome()&&t.isSome()?A.some(o(e.getOrDie(),t.getOrDie())):A.none(),ke=(e,t)=>null!=e?A.some(t(e)):A.none(),Ce=(e,t)=>e?A.some(t):A.none(),Oe=(e,t,o)=>""===t||e.length>=t.length&&e.substr(o,o+t.length)===t,_e=(e,t)=>Ee(e,t)?((e,t)=>e.substring(t))(e,t.length):e,Te=(e,t,o=0,n)=>{const s=e.indexOf(t,o);return-1!==s&&(!!u(n)||s+t.length<=n)},Ee=(e,t)=>Oe(e,t,0),Ae=(e,t)=>Oe(e,t,e.length-t.length),Me=(Ao=/^\s+|\s+$/g,e=>e.replace(Ao,"")),De=e=>e.length>0,Be=e=>void 0!==e.style&&p(e.style.getPropertyValue),Fe=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},Ie=(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return Fe(o.childNodes[0])},Re=(e,t)=>{const o=(t||document).createElement(e);return Fe(o)},Ne=(e,t)=>{const o=(t||document).createTextNode(e);return Fe(o)},Ve=Fe,ze="undefined"!=typeof window?window:Function("return this;")(),He=(e,t)=>((e,t)=>{let o=null!=t?t:ze;for(let t=0;t<e.length&&null!=o;++t)o=o[e[t]];return o})(e.split("."),t),Le=Object.getPrototypeOf,Pe=e=>{const t=He("ownerDocument.defaultView",e);return a(e)&&((e=>((e,t)=>{const o=((e,t)=>He(e,t))(e,t);if(null==o)throw new Error(e+" not available on this browser");return o})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(Le(e).constructor.name))},Ue=e=>e.dom.nodeName.toLowerCase(),We=e=>t=>(e=>e.dom.nodeType)(t)===e,je=e=>Ge(e)&&Pe(e.dom),Ge=We(1),$e=We(3),qe=We(9),Xe=We(11),Ye=e=>t=>Ge(t)&&Ue(t)===e,Ke=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},Je=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,Ze=(e,t)=>e.dom===t.dom,Qe=(e,t)=>{const o=e.dom,n=t.dom;return o!==n&&o.contains(n)},et=e=>Ve(e.dom.ownerDocument),tt=e=>qe(e)?e:et(e),ot=e=>Ve(tt(e).dom.documentElement),nt=e=>Ve(tt(e).dom.defaultView),st=e=>A.from(e.dom.parentNode).map(Ve),rt=e=>A.from(e.dom.parentElement).map(Ve),at=e=>A.from(e.dom.offsetParent).map(Ve),it=e=>H(e.dom.childNodes,Ve),lt=(e,t)=>{const o=e.dom.childNodes;return A.from(o[t]).map(Ve)},ct=e=>lt(e,0),dt=(e,t)=>({element:e,offset:t}),ut=(e,t)=>{const o=it(e);return o.length>0&&t<o.length?dt(o[t],0):dt(e,t)},mt=e=>Xe(e)&&g(e.dom.host),gt=p(Element.prototype.attachShadow)&&p(Node.prototype.getRootNode),pt=x(gt),ht=gt?e=>Ve(e.dom.getRootNode()):tt,ft=e=>mt(e)?e:Ve(tt(e).dom.body),bt=e=>{const t=ht(e);return mt(t)?A.some(t):A.none()},vt=e=>Ve(e.dom.host),yt=e=>{const t=$e(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return bt(Ve(t)).fold((()=>o.body.contains(t)),(n=yt,s=vt,e=>n(s(e))));var n,s},xt=()=>wt(Ve(document)),wt=e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return Ve(t)},St=(e,t,o)=>{if(!(r(o)||d(o)||h(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},kt=(e,t,o)=>{St(e.dom,t,o)},Ct=(e,t)=>{const o=e.dom;le(t,((e,t)=>{St(o,t,e)}))},Ot=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},_t=(e,t)=>A.from(Ot(e,t)),Tt=(e,t)=>{const o=e.dom;return!(!o||!o.hasAttribute)&&o.hasAttribute(t)},Et=(e,t)=>{e.dom.removeAttribute(t)},At=(e,t,o)=>{if(!r(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);Be(e)&&e.style.setProperty(t,o)},Mt=(e,t)=>{Be(e)&&e.style.removeProperty(t)},Dt=(e,t,o)=>{const n=e.dom;At(n,t,o)},Bt=(e,t)=>{const o=e.dom;le(t,((e,t)=>{At(o,t,e)}))},Ft=(e,t)=>{const o=e.dom;le(t,((e,t)=>{e.fold((()=>{Mt(o,t)}),(e=>{At(o,t,e)}))}))},It=(e,t)=>{const o=e.dom,n=window.getComputedStyle(o).getPropertyValue(t);return""!==n||yt(e)?n:Rt(o,t)},Rt=(e,t)=>Be(e)?e.style.getPropertyValue(t):"",Nt=(e,t)=>{const o=e.dom,n=Rt(o,t);return A.from(n).filter((e=>e.length>0))},Vt=e=>{const t={},o=e.dom;if(Be(o))for(let e=0;e<o.style.length;e++){const n=o.style.item(e);t[n]=o.style[n]}return t},zt=(e,t,o)=>{const n=Re(e);return Dt(n,t,o),Nt(n,t).isSome()},Ht=(e,t)=>{const o=e.dom;Mt(o,t),xe(_t(e,"style").map(Me),"")&&Et(e,"style")},Lt=e=>e.dom.offsetWidth,Pt=(e,t)=>{const o=o=>{const n=t(o);if(n<=0||null===n){const t=It(o,e);return parseFloat(t)||0}return n},n=(e,t)=>j(t,((t,o)=>{const n=It(e,o),s=void 0===n?0:parseInt(n,10);return isNaN(s)?t:t+s}),0);return{set:(t,o)=>{if(!h(o)&&!o.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+o);const n=t.dom;Be(n)&&(n.style[e]=o+"px")},get:o,getOuter:o,aggregate:n,max:(e,t,o)=>{const s=n(e,o);return t>s?t-s:0}}},Ut=Pt("height",(e=>{const t=e.dom;return yt(e)?t.getBoundingClientRect().height:t.offsetHeight})),Wt=e=>Ut.get(e),jt=e=>Ut.getOuter(e),Gt=(e,t)=>({left:e,top:t,translate:(o,n)=>Gt(e+o,t+n)}),$t=Gt,qt=(e,t)=>void 0!==e?e:void 0!==t?t:0,Xt=e=>{const t=e.dom.ownerDocument,o=t.body,n=t.defaultView,s=t.documentElement;if(o===e.dom)return $t(o.offsetLeft,o.offsetTop);const r=qt(null==n?void 0:n.pageYOffset,s.scrollTop),a=qt(null==n?void 0:n.pageXOffset,s.scrollLeft),i=qt(s.clientTop,o.clientTop),l=qt(s.clientLeft,o.clientLeft);return Yt(e).translate(a-l,r-i)},Yt=e=>{const t=e.dom,o=t.ownerDocument.body;return o===t?$t(o.offsetLeft,o.offsetTop):yt(e)?(e=>{const t=e.getBoundingClientRect();return $t(t.left,t.top)})(t):$t(0,0)},Kt=Pt("width",(e=>e.dom.offsetWidth)),Jt=e=>Kt.get(e),Zt=e=>Kt.getOuter(e),Qt=e=>{let t,o=!1;return(...n)=>(o||(o=!0,t=e.apply(null,n)),t)},eo=()=>to(0,0),to=(e,t)=>({major:e,minor:t}),oo={nu:to,detect:(e,t)=>{const o=String(t).toLowerCase();return 0===e.length?eo():((e,t)=>{const o=((e,t)=>{for(let o=0;o<e.length;o++){const n=e[o];if(n.test(t))return n}})(e,t);if(!o)return{major:0,minor:0};const n=e=>Number(t.replace(o,"$"+e));return to(n(1),n(2))})(e,o)},unknown:eo},no=(e,t)=>{const o=String(t).toLowerCase();return G(e,(e=>e.search(o)))},so=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,ro=e=>t=>Te(t,e),ao=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>Te(e,"edge/")&&Te(e,"chrome")&&Te(e,"safari")&&Te(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,so],search:e=>Te(e,"chrome")&&!Te(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>Te(e,"msie")||Te(e,"trident")},{name:"Opera",versionRegexes:[so,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:ro("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:ro("firefox")},{name:"Safari",versionRegexes:[so,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(Te(e,"safari")||Te(e,"mobile/"))&&Te(e,"applewebkit")}],io=[{name:"Windows",search:ro("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>Te(e,"iphone")||Te(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:ro("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:ro("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:ro("linux"),versionRegexes:[]},{name:"Solaris",search:ro("sunos"),versionRegexes:[]},{name:"FreeBSD",search:ro("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:ro("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],lo={browsers:x(ao),oses:x(io)},co="Edge",uo="Chromium",mo="Opera",go="Firefox",po="Safari",ho=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isEdge:n(co),isChromium:n(uo),isIE:n("IE"),isOpera:n(mo),isFirefox:n(go),isSafari:n(po)}},fo=()=>ho({current:void 0,version:oo.unknown()}),bo=ho,vo=(x(co),x(uo),x("IE"),x(mo),x(go),x(po),"Windows"),yo="Android",xo="Linux",wo="macOS",So="Solaris",ko="FreeBSD",Co="ChromeOS",Oo=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isWindows:n(vo),isiOS:n("iOS"),isAndroid:n(yo),isMacOS:n(wo),isLinux:n(xo),isSolaris:n(So),isFreeBSD:n(ko),isChromeOS:n(Co)}},_o=()=>Oo({current:void 0,version:oo.unknown()}),To=Oo,Eo=(x(vo),x("iOS"),x(yo),x(xo),x(wo),x(So),x(ko),x(Co),e=>window.matchMedia(e).matches);var Ao;let Mo=Qt((()=>((e,t,o)=>{const n=lo.browsers(),s=lo.oses(),r=t.bind((e=>((e,t)=>re(t.brands,(t=>{const o=t.brand.toLowerCase();return G(e,(e=>{var t;return o===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:oo.nu(parseInt(t.version,10),0)})))})))(n,e))).orThunk((()=>((e,t)=>no(e,t).map((e=>{const o=oo.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(n,e))).fold(fo,bo),a=((e,t)=>no(e,t).map((e=>{const o=oo.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(s,e).fold(_o,To),i=((e,t,o,n)=>{const s=e.isiOS()&&!0===/ipad/i.test(o),r=e.isiOS()&&!s,a=e.isiOS()||e.isAndroid(),i=a||n("(pointer:coarse)"),l=s||!r&&a&&n("(min-device-width:768px)"),c=r||a&&!l,d=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(o),u=!c&&!l&&!d;return{isiPad:x(s),isiPhone:x(r),isTablet:x(l),isPhone:x(c),isTouch:x(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:x(d),isDesktop:x(u)}})(a,r,e,o);return{browser:r,os:a,deviceType:i}})(navigator.userAgent,A.from(navigator.userAgentData),Eo)));const Do=()=>Mo(),Bo=e=>{const t=Ve((e=>{if(pt()&&g(e.target)){const t=Ve(e.target);if(Ge(t)&&(e=>g(e.dom.shadowRoot))(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return oe(t)}}return A.from(e.target)})(e).getOr(e.target)),o=()=>e.stopPropagation(),n=()=>e.preventDefault(),s=y(n,o);return((e,t,o,n,s,r,a)=>({target:e,x:t,y:o,stop:n,prevent:s,kill:r,raw:a}))(t,e.clientX,e.clientY,o,n,s,e)},Fo=(e,t,o,n,s)=>{const r=((e,t)=>o=>{e(o)&&t(Bo(o))})(o,n);return e.dom.addEventListener(t,r,s),{unbind:k(Io,e,t,r,s)}},Io=(e,t,o,n)=>{e.dom.removeEventListener(t,o,n)},Ro=(e,t)=>{st(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},No=(e,t)=>{const o=(e=>A.from(e.dom.nextSibling).map(Ve))(e);o.fold((()=>{st(e).each((e=>{zo(e,t)}))}),(e=>{Ro(e,t)}))},Vo=(e,t)=>{ct(e).fold((()=>{zo(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},zo=(e,t)=>{e.dom.appendChild(t.dom)},Ho=(e,t)=>{L(t,(t=>{zo(e,t)}))},Lo=e=>{e.dom.textContent="",L(it(e),(e=>{Po(e)}))},Po=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Uo=e=>{const t=void 0!==e?e.dom:document,o=t.body.scrollLeft||t.documentElement.scrollLeft,n=t.body.scrollTop||t.documentElement.scrollTop;return $t(o,n)},Wo=(e,t,o)=>{const n=(void 0!==o?o.dom:document).defaultView;n&&n.scrollTo(e,t)},jo=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),Go=e=>{const t=void 0===e?window:e,o=t.document,n=Uo(Ve(o));return(e=>{const t=void 0===e?window:e;return Do().browser.isFirefox()?A.none():A.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,o=e.clientWidth,s=e.clientHeight;return jo(n.left,n.top,o,s)}),(e=>jo(Math.max(e.pageLeft,n.left),Math.max(e.pageTop,n.top),e.width,e.height)))},$o=()=>Ve(document),qo=(e,t)=>e.view(t).fold(x([]),(t=>{const o=e.owner(t),n=qo(e,o);return[t].concat(n)}));var Xo=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?A.none():A.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(Ve)},owner:e=>et(e)});const Yo=e=>{const t=$o(),o=Uo(t),n=((e,t)=>{const o=t.owner(e),n=qo(t,o);return A.some(n)})(e,Xo);return n.fold(k(Xt,e),(t=>{const n=Yt(e),s=W(t,((e,t)=>{const o=Yt(t);return{left:e.left+o.left,top:e.top+o.top}}),{left:0,top:0});return $t(s.left+n.left+o.left,s.top+n.top+o.top)}))},Ko=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),Jo=e=>{const t=Xt(e),o=Zt(e),n=jt(e);return Ko(t.left,t.top,o,n)},Zo=e=>{const t=Yo(e),o=Zt(e),n=jt(e);return Ko(t.left,t.top,o,n)},Qo=(e,t)=>{const o=Math.max(e.x,t.x),n=Math.max(e.y,t.y),s=Math.min(e.right,t.right),r=Math.min(e.bottom,t.bottom);return Ko(o,n,s-o,r-n)},en=()=>Go(window);var tn=tinymce.util.Tools.resolve("tinymce.ThemeManager");const on=e=>{const t=t=>t(e),o=x(e),n=()=>s,s={tag:!0,inner:e,fold:(t,o)=>o(e),isValue:E,isError:T,map:t=>sn.value(t(e)),mapError:n,bind:t,exists:t,forall:t,getOr:o,or:n,getOrThunk:o,orThunk:n,getOrDie:o,each:t=>{t(e)},toOptional:()=>A.some(e)};return s},nn=e=>{const t=()=>o,o={tag:!1,inner:e,fold:(t,o)=>t(e),isValue:T,isError:E,map:t,mapError:t=>sn.error(t(e)),bind:t,exists:T,forall:E,getOr:w,or:w,getOrThunk:_,orThunk:_,getOrDie:O(String(e)),each:b,toOptional:A.none};return o},sn={value:on,error:nn,fromOption:(e,t)=>e.fold((()=>nn(t)),on)};var rn;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}(rn||(rn={}));const an=(e,t,o)=>e.stype===rn.Error?t(e.serror):o(e.svalue),ln=e=>({stype:rn.Value,svalue:e}),cn=e=>({stype:rn.Error,serror:e}),dn=ln,un=cn,mn=an,gn=(e,t,o,n)=>({tag:"field",key:e,newKey:t,presence:o,prop:n}),pn=(e,t,o)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return o(e.newKey,e.instantiator)}},hn=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const o={};for(let n=0;n<t.length;n++){const s=t[n];for(const t in s)ve(s,t)&&(o[t]=e(o[t],s[t]))}return o},fn=hn(((e,t)=>i(e)&&i(t)?fn(e,t):t)),bn=hn(((e,t)=>t)),vn=e=>({tag:"defaultedThunk",process:e}),yn=e=>vn(x(e)),xn=e=>({tag:"mergeWithThunk",process:e}),wn=e=>{const t=(e=>{const t=[],o=[];return L(e,(e=>{an(e,(e=>o.push(e)),(e=>t.push(e)))})),{values:t,errors:o}})(e);return t.errors.length>0?(o=t.errors,y(un,q)(o)):dn(t.values);var o},Sn=e=>a(e)&&ae(e).length>100?" removed due to size":JSON.stringify(e,null,2),kn=(e,t)=>un([{path:e,getErrorInfo:t}]),Cn=e=>({extract:(t,o)=>((e,t)=>e.stype===rn.Error?t(e.serror):e)(e(o),(e=>((e,t)=>kn(e,x(t)))(t,e))),toString:x("val")}),On=Cn(dn),_n=(e,t,o,n)=>n(be(e,t).getOrThunk((()=>o(e)))),Tn=(e,t,o,n,s)=>{const r=e=>s.extract(t.concat([n]),e),a=e=>e.fold((()=>dn(A.none())),(e=>((e,t)=>e.stype===rn.Value?{stype:rn.Value,svalue:t(e.svalue)}:e)(s.extract(t.concat([n]),e),A.some)));switch(e.tag){case"required":return((e,t,o,n)=>be(t,o).fold((()=>((e,t,o)=>kn(e,(()=>'Could not find valid *required* value for "'+t+'" in '+Sn(o))))(e,o,t)),n))(t,o,n,r);case"defaultedThunk":return _n(o,n,e.process,r);case"option":return((e,t,o)=>o(be(e,t)))(o,n,a);case"defaultedOptionThunk":return((e,t,o,n)=>n(be(e,t).map((t=>!0===t?o(e):t))))(o,n,e.process,a);case"mergeWithThunk":return _n(o,n,x({}),(t=>{const n=fn(e.process(o),t);return r(n)}))}},En=e=>({extract:(t,o)=>e().extract(t,o),toString:()=>e().toString()}),An=e=>ae(ge(e,g)),Mn=e=>{const t=Dn(e),o=W(e,((e,t)=>pn(t,(t=>fn(e,{[t]:!0})),x(e))),{});return{extract:(e,n)=>{const s=d(n)?[]:An(n),r=U(s,(e=>!ye(o,e)));return 0===r.length?t.extract(e,n):((e,t)=>kn(e,(()=>"There are unsupported fields: ["+t.join(", ")+"] specified")))(e,r)},toString:t.toString}},Dn=e=>({extract:(t,o)=>((e,t,o)=>{const n={},s=[];for(const r of o)pn(r,((o,r,a,i)=>{const l=Tn(a,e,t,o,i);mn(l,(e=>{s.push(...e)}),(e=>{n[r]=e}))}),((e,o)=>{n[e]=o(t)}));return s.length>0?un(s):dn(n)})(t,o,e),toString:()=>{const t=H(e,(e=>pn(e,((e,t,o,n)=>e+" -> "+n.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),Bn=e=>({extract:(t,o)=>{const n=H(o,((o,n)=>e.extract(t.concat(["["+n+"]"]),o)));return wn(n)},toString:()=>"array("+e.toString()+")"}),Fn=(e,t)=>{const o=void 0!==t?t:w;return{extract:(t,n)=>{const s=[];for(const r of e){const e=r.extract(t,n);if(e.stype===rn.Value)return{stype:rn.Value,svalue:o(e.svalue)};s.push(e)}return wn(s)},toString:()=>"oneOf("+H(e,(e=>e.toString())).join(", ")+")"}},In=(e,t)=>({extract:(o,n)=>{const s=ae(n),r=((t,o)=>Bn(Cn(e)).extract(t,o))(o,s);return((e,t)=>e.stype===rn.Value?t(e.svalue):e)(r,(e=>{const s=H(e,(e=>gn(e,e,{tag:"required",process:{}},t)));return Dn(s).extract(o,n)}))},toString:()=>"setOf("+t.toString()+")"}),Rn=y(Bn,Dn),Nn=x(On),Vn=(e,t)=>Cn((o=>{const n=typeof o;return e(o)?dn(o):un(`Expected type: ${t} but got: ${n}`)})),zn=Vn(h,"number"),Hn=Vn(r,"string"),Ln=Vn(d,"boolean"),Pn=Vn(p,"function"),Un=e=>{if(Object(e)!==e)return!0;switch({}.toString.call(e).slice(8,-1)){case"Boolean":case"Number":case"String":case"Date":case"RegExp":case"Blob":case"FileList":case"ImageData":case"ImageBitmap":case"ArrayBuffer":return!0;case"Array":case"Object":return Object.keys(e).every((t=>Un(e[t])));default:return!1}},Wn=Cn((e=>Un(e)?dn(e):un("Expected value to be acceptable for sending via postMessage"))),jn=(e,t)=>({extract:(o,n)=>be(n,e).fold((()=>((e,t)=>kn(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(o,e)),(e=>((e,t,o,n)=>be(o,n).fold((()=>((e,t,o)=>kn(e,(()=>'The chosen schema: "'+o+'" did not exist in branches: '+Sn(t))))(e,o,n)),(o=>o.extract(e.concat(["branch: "+n]),t))))(o,n,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+ae(t)}),Gn=e=>Cn((t=>e(t).fold(un,dn))),$n=(e,t)=>In((t=>e(t).fold(cn,ln)),t),qn=(e,t,o)=>{return n=((e,t,o)=>((e,t)=>e.stype===rn.Error?{stype:rn.Error,serror:t(e.serror)}:e)(t.extract([e],o),(e=>({input:o,errors:e}))))(e,t,o),an(n,sn.error,sn.value);var n},Xn=e=>e.fold((e=>{throw new Error(Kn(e))}),w),Yn=(e,t,o)=>Xn(qn(e,t,o)),Kn=e=>"Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:x("... (only showing first ten failures)")}]):e;return H(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})(e.errors).join("\n")+"\n\nInput object: "+Sn(e.input),Jn=(e,t)=>jn(e,ce(t,Dn)),Zn=(e,t)=>((e,t)=>{const o=Qt(t);return{extract:(e,t)=>o().extract(e,t),toString:()=>o().toString()}})(0,t),Qn=gn,es=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),ts=e=>Gn((t=>R(e,t)?sn.value(t):sn.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`))),os=e=>Qn(e,e,{tag:"required",process:{}},Nn()),ns=(e,t)=>Qn(e,e,{tag:"required",process:{}},t),ss=e=>ns(e,zn),rs=e=>ns(e,Hn),as=(e,t)=>Qn(e,e,{tag:"required",process:{}},ts(t)),is=e=>ns(e,Pn),ls=(e,t)=>Qn(e,e,{tag:"required",process:{}},Dn(t)),cs=(e,t)=>Qn(e,e,{tag:"required",process:{}},Rn(t)),ds=(e,t)=>Qn(e,e,{tag:"required",process:{}},Bn(t)),us=e=>Qn(e,e,{tag:"option",process:{}},Nn()),ms=(e,t)=>Qn(e,e,{tag:"option",process:{}},t),gs=e=>ms(e,zn),ps=e=>ms(e,Hn),hs=(e,t)=>ms(e,ts(t)),fs=e=>ms(e,Pn),bs=(e,t)=>ms(e,Bn(t)),vs=(e,t)=>ms(e,Dn(t)),ys=(e,t)=>Qn(e,e,yn(t),Nn()),xs=(e,t,o)=>Qn(e,e,yn(t),o),ws=(e,t)=>xs(e,t,zn),Ss=(e,t)=>xs(e,t,Hn),ks=(e,t,o)=>xs(e,t,ts(o)),Cs=(e,t)=>xs(e,t,Ln),Os=(e,t)=>xs(e,t,Pn),_s=(e,t,o)=>xs(e,t,Bn(o)),Ts=(e,t,o)=>xs(e,t,Dn(o)),Es=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},As=e=>{if(!l(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};return L(e,((n,s)=>{const r=ae(n);if(1!==r.length)throw new Error("one and only one name per case");const a=r[0],i=n[a];if(void 0!==o[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!l(i))throw new Error("case arguments must be an array");t.push(a),o[a]=(...o)=>{const n=o.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+n);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[s].apply(null,o)},match:e=>{const n=ae(e);if(t.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+n.join(","));if(!Y(t,(e=>R(n,e))))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:a,params:o})}}}})),o};As([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const Ms=(e,t)=>((e,t)=>({[e]:t}))(e,t),Ds=e=>(e=>{const t={};return L(e,(e=>{t[e.key]=e.value})),t})(e),Bs=e=>p(e)?e:T,Fs=(e,t,o)=>{let n=e.dom;const s=Bs(o);for(;n.parentNode;){n=n.parentNode;const e=Ve(n),o=t(e);if(o.isSome())return o;if(s(e))break}return A.none()},Is=(e,t,o)=>{const n=t(e),s=Bs(o);return n.orThunk((()=>s(e)?A.none():Fs(e,t,s)))},Rs=(e,t)=>Ze(e.element,t.event.target),Ns={can:E,abort:T,run:b},Vs=e=>{if(!ye(e,"can")&&!ye(e,"abort")&&!ye(e,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(e,null,2)+" does not have can, abort, or run!");return{...Ns,...e}},zs=x,Hs=zs("touchstart"),Ls=zs("touchmove"),Ps=zs("touchend"),Us=zs("touchcancel"),Ws=zs("mousedown"),js=zs("mousemove"),Gs=zs("mouseout"),$s=zs("mouseup"),qs=zs("mouseover"),Xs=zs("focusin"),Ys=zs("focusout"),Ks=zs("keydown"),Js=zs("keyup"),Zs=zs("input"),Qs=zs("change"),er=zs("click"),tr=zs("transitioncancel"),or=zs("transitionend"),nr=zs("transitionstart"),sr=zs("selectstart"),rr=e=>x("alloy."+e),ar={tap:rr("tap")},ir=rr("focus"),lr=rr("blur.post"),cr=rr("paste.post"),dr=rr("receive"),ur=rr("execute"),mr=rr("focus.item"),gr=ar.tap,pr=rr("longpress"),hr=rr("sandbox.close"),fr=rr("typeahead.cancel"),br=rr("system.init"),vr=rr("system.touchmove"),yr=rr("system.touchend"),xr=rr("system.scroll"),wr=rr("system.resize"),Sr=rr("system.attached"),kr=rr("system.detached"),Cr=rr("system.dismissRequested"),Or=rr("system.repositionRequested"),_r=rr("focusmanager.shifted"),Tr=rr("slotcontainer.visibility"),Er=rr("system.external.element.scroll"),Ar=rr("change.tab"),Mr=rr("dismiss.tab"),Dr=rr("highlight"),Br=rr("dehighlight"),Fr=(e,t)=>{Vr(e,e.element,t,{})},Ir=(e,t,o)=>{Vr(e,e.element,t,o)},Rr=e=>{Fr(e,ur())},Nr=(e,t,o)=>{Vr(e,t,o,{})},Vr=(e,t,o,n)=>{const s={target:t,...n};e.getSystem().triggerEvent(o,t,s)},zr=(e,t,o,n)=>{e.getSystem().triggerEvent(o,t,n.event)},Hr=e=>Ds(e),Lr=(e,t)=>({key:e,value:Vs({abort:t})}),Pr=e=>({key:e,value:Vs({run:(e,t)=>{t.event.prevent()}})}),Ur=(e,t)=>({key:e,value:Vs({run:t})}),Wr=(e,t,o)=>({key:e,value:Vs({run:(e,n)=>{t.apply(void 0,[e,n].concat(o))}})}),jr=e=>t=>({key:e,value:Vs({run:(e,o)=>{Rs(e,o)&&t(e,o)}})}),Gr=(e,t,o)=>((e,t)=>Ur(e,((o,n)=>{o.getSystem().getByUid(t).each((t=>{zr(t,t.element,e,n)}))})))(e,t.partUids[o]),$r=(e,t)=>Ur(e,((e,o)=>{const n=o.event,s=e.getSystem().getByDom(n.target).getOrThunk((()=>Is(n.target,(t=>e.getSystem().getByDom(t).toOptional()),T).getOr(e)));t(e,s,o)})),qr=e=>Ur(e,((e,t)=>{t.cut()})),Xr=e=>Ur(e,((e,t)=>{t.stop()})),Yr=(e,t)=>jr(e)(t),Kr=jr(Sr()),Jr=jr(kr()),Zr=jr(br()),Qr=(ra=ur(),e=>Ur(ra,e)),ea=e=>e.dom.innerHTML,ta=(e,t)=>{const o=et(e).dom,n=Ve(o.createDocumentFragment()),s=((e,t)=>{const o=(t||document).createElement("div");return o.innerHTML=e,it(Ve(o))})(t,o);Ho(n,s),Lo(e),zo(e,n)},oa=e=>mt(e)?"#shadow-root":(e=>{const t=Re("div"),o=Ve(e.dom.cloneNode(!0));return zo(t,o),ea(t)})((e=>((e,t)=>Ve(e.dom.cloneNode(!1)))(e))(e)),na=e=>oa(e),sa=Hr([((e,t)=>({key:e,value:Vs({can:(e,t)=>{const o=t.event,n=o.originator,s=o.target;return!((e,t,o)=>Ze(t,e.element)&&!Ze(t,o))(e,n,s)||(console.warn(ir()+" did not get interpreted by the desired target. \nOriginator: "+na(n)+"\nTarget: "+na(s)+"\nCheck the "+ir()+" event handlers"),!1)}})}))(ir())]);var ra,aa=Object.freeze({__proto__:null,events:sa});let ia=0;const la=e=>{const t=(new Date).getTime(),o=Math.floor(1e9*Math.random());return ia++,e+"_"+o+ia+String(t)},ca=x("alloy-id-"),da=x("data-alloy-id"),ua=ca(),ma=da(),ga=(e,t)=>{Object.defineProperty(e.dom,ma,{value:t,writable:!0})},pa=e=>{const t=Ge(e)?e.dom[ma]:null;return A.from(t)},ha=e=>la(e),fa=w,ba=e=>{const t=t=>`The component must be in a context to execute: ${t}`+(e?"\n"+na(e().element)+" is not in context.":""),o=e=>()=>{throw new Error(t(e))},n=e=>()=>{console.warn(t(e))};return{debugInfo:x("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),broadcastEvent:n("broadcastEvent"),build:o("build"),buildOrPatch:o("buildOrPatch"),addToWorld:o("addToWorld"),removeFromWorld:o("removeFromWorld"),addToGui:o("addToGui"),removeFromGui:o("removeFromGui"),getByUid:o("getByUid"),getByDom:o("getByDom"),isConnected:T}},va=ba(),ya=e=>H(e,(e=>Ae(e,"/*")?e.substring(0,e.length-2):e)),xa=(e,t)=>{const o=e.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:ya(r)}),e},wa=la("alloy-premade"),Sa=e=>(Object.defineProperty(e.element.dom,wa,{value:e.uid,writable:!0}),Ms(wa,e)),ka=e=>be(e,wa),Ca=e=>((e,t)=>{const o=t.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:"OVERRIDE",parameters:ya(r.slice(1))}),e})(((t,...o)=>e(t.getApis(),t,...o)),e),Oa={init:()=>_a({readState:x("No State required")})},_a=e=>e,Ta=(e,t)=>{const o={};return le(e,((e,n)=>{le(e,((e,s)=>{const r=be(o,s).getOr([]);o[s]=r.concat([t(n,e)])}))})),o},Ea=e=>({classes:u(e.classes)?[]:e.classes,attributes:u(e.attributes)?{}:e.attributes,styles:u(e.styles)?{}:e.styles}),Aa=e=>e.cHandler,Ma=(e,t)=>({name:e,handler:t}),Da=(e,t)=>{const o={};return L(e,(e=>{o[e.name()]=e.handlers(t)})),o},Ba=(e,t,o)=>{const n=t[o];return n?((e,t,o,n)=>{try{const s=ee(o,((o,s)=>{const r=o[t],a=s[t],i=n.indexOf(r),l=n.indexOf(a);if(-1===i)throw new Error("The ordering for "+e+" does not have an entry for "+r+".\nOrder specified: "+JSON.stringify(n,null,2));if(-1===l)throw new Error("The ordering for "+e+" does not have an entry for "+a+".\nOrder specified: "+JSON.stringify(n,null,2));return i<l?-1:l<i?1:0}));return sn.value(s)}catch(e){return sn.error([e])}})("Event: "+o,"name",e,n).map((e=>(e=>{const t=((e,t)=>(...t)=>j(e,((e,o)=>e&&(e=>e.can)(o).apply(void 0,t)),!0))(e),o=((e,t)=>(...t)=>j(e,((e,o)=>e||(e=>e.abort)(o).apply(void 0,t)),!1))(e);return{can:t,abort:o,run:(...t)=>{L(e,(e=>{e.run.apply(void 0,t)}))}}})(H(e,(e=>e.handler))))):((e,t)=>sn.error(["The event ("+e+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(H(t,(e=>e.name)),null,2)]))(o,e)},Fa=(e,t)=>((e,t)=>{const o=(e=>{const t=[],o=[];return L(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{o.push(e)}))})),{errors:t,values:o}})(e);return o.errors.length>0?(n=o.errors,sn.error(q(n))):((e,t)=>0===e.length?sn.value(t):sn.value(fn(t,bn.apply(void 0,e))))(o.values,t);var n})(pe(e,((e,o)=>(1===e.length?sn.value(e[0].handler):Ba(e,t,o)).map((n=>{const s=(e=>{const t=(e=>p(e)?{can:E,abort:T,run:e}:e)(e);return(e,o,...n)=>{const s=[e,o].concat(n);t.abort.apply(void 0,s)?o.stop():t.can.apply(void 0,s)&&t.run.apply(void 0,s)}})(n),r=e.length>1?U(t[o],(t=>N(e,(e=>e.name===t)))).join(" > "):e[0].name;return Ms(o,((e,t)=>({handler:e,purpose:t}))(s,r))})))),{}),Ia="alloy.base.behaviour",Ra=Dn([Qn("dom","dom",{tag:"required",process:{}},Dn([os("tag"),ys("styles",{}),ys("classes",[]),ys("attributes",{}),us("value"),us("innerHtml")])),os("components"),os("uid"),ys("events",{}),ys("apis",{}),Qn("eventOrder","eventOrder",(ii={[ur()]:["disabling",Ia,"toggling","typeaheadevents"],[ir()]:[Ia,"focusing","keying"],[br()]:[Ia,"disabling","toggling","representing"],[Zs()]:[Ia,"representing","streaming","invalidating"],[kr()]:[Ia,"representing","item-events","tooltipping"],[Ws()]:["focusing",Ia,"item-type-events"],[Hs()]:["focusing",Ia,"item-type-events"],[qs()]:["item-type-events","tooltipping"],[dr()]:["receiving","reflecting","tooltipping"]},xn(x(ii))),Nn()),us("domModification")]),Na=e=>e.events,Va=(e,t)=>{const o=Ot(e,t);return void 0===o||""===o?[]:o.split(" ")},za=e=>void 0!==e.dom.classList,Ha=e=>Va(e,"class"),La=(e,t)=>{za(e)?e.dom.classList.add(t):((e,t)=>{((e,t,o)=>{const n=Va(e,t).concat([o]);kt(e,t,n.join(" "))})(e,"class",t)})(e,t)},Pa=(e,t)=>{za(e)?e.dom.classList.remove(t):((e,t)=>{((e,t,o)=>{const n=U(Va(e,t),(e=>e!==o));n.length>0?kt(e,t,n.join(" ")):Et(e,t)})(e,"class",t)})(e,t),(e=>{0===(za(e)?e.dom.classList:Ha(e)).length&&Et(e,"class")})(e)},Ua=(e,t)=>za(e)&&e.dom.classList.contains(t),Wa=(e,t)=>{L(t,(t=>{La(e,t)}))},ja=(e,t)=>{L(t,(t=>{Pa(e,t)}))},Ga=(e,t)=>Y(t,(t=>Ua(e,t))),$a=e=>e.dom.value,qa=(e,t)=>{if(void 0===t)throw new Error("Value.set was undefined");e.dom.value=t},Xa=(e,t,o)=>{o.fold((()=>zo(e,t)),(e=>{Ze(e,t)||(Ro(e,t),Po(e))}))},Ya=(e,t,o)=>{const n=H(t,o),s=it(e);return L(s.slice(n.length),Po),n},Ka=(e,t,o,n)=>{const s=lt(e,t),r=n(o,s),a=((e,t,o)=>lt(e,t).map((e=>{if(o.exists((t=>!Ze(t,e)))){const t=o.map(Ue).getOr("span"),n=Re(t);return Ro(e,n),n}return e})))(e,t,s);return Xa(e,r.element,a),r},Ja=(e,t)=>{const o=ae(e),n=ae(t),s=J(n,o),r=((e,o)=>{const n={},s={};return me(e,((e,o)=>!ve(t,o)||e!==t[o]),ue(n),ue(s)),{t:n,f:s}})(e).t;return{toRemove:s,toSet:r}},Za=(e,t)=>{const{class:o,style:n,...s}=(e=>j(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}))(t),{toSet:r,toRemove:a}=Ja(e.attributes,s),i=Vt(t),{toSet:l,toRemove:c}=Ja(e.styles,i),d=(e=>za(e)?(e=>{const t=e.dom.classList,o=new Array(t.length);for(let e=0;e<t.length;e++){const n=t.item(e);null!==n&&(o[e]=n)}return o})(e):Ha(e))(t),u=J(d,e.classes),m=J(e.classes,d);return L(a,(e=>Et(t,e))),Ct(t,r),Wa(t,m),ja(t,u),L(c,(e=>Ht(t,e))),Bt(t,l),e.innerHtml.fold((()=>{const o=e.domChildren;((e,t)=>{Ya(e,t,((t,o)=>{const n=lt(e,o);return Xa(e,t,n),t}))})(t,o)}),(e=>{ta(t,e)})),(()=>{const o=t,n=e.value.getOrUndefined();n!==$a(o)&&qa(o,null!=n?n:"")})(),t},Qa=e=>{const t=(e=>{const t=be(e,"behaviours").getOr({});return X(ae(t),(e=>{const o=t[e];return g(o)?[o.me]:[]}))})(e);return((e,t)=>((e,t)=>{const o=H(t,(e=>vs(e.name(),[os("config"),ys("state",Oa)]))),n=qn("component.behaviours",Dn(o),e.behaviours).fold((t=>{throw new Error(Kn(t)+"\nComplete spec:\n"+JSON.stringify(e,null,2))}),w);return{list:t,data:ce(n,(e=>{const t=e.map((e=>({config:e.config,state:e.state.init(e.config)})));return x(t)}))}})(e,t))(e,t)},ei=(e,t)=>{const o=()=>m,n=Es(va),s=Xn((e=>qn("custom.definition",Ra,e))(e)),r=Qa(e),a=(e=>e.list)(r),i=(e=>e.data)(r),l=((e,t,o)=>{const n={...(s=e).dom,uid:s.uid,domChildren:H(s.components,(e=>e.element))};var s;const r=(e=>e.domModification.fold((()=>Ea({})),Ea))(e),a={"alloy.base.modification":r},i=t.length>0?((e,t,o,n)=>{const s={...t};L(o,(t=>{s[t.name()]=t.exhibit(e,n)}));const r=Ta(s,((e,t)=>({name:e,modification:t}))),a=e=>W(e,((e,t)=>({...t.modification,...e})),{}),i=W(r.classes,((e,t)=>t.modification.concat(e)),[]),l=a(r.attributes),c=a(r.styles);return Ea({classes:i,attributes:l,styles:c})})(o,a,t,n):r;return l=n,c=i,{...l,attributes:{...l.attributes,...c.attributes},styles:{...l.styles,...c.styles},classes:l.classes.concat(c.classes)};var l,c})(s,a,i),c=((e,t)=>{const o=t.filter((t=>Ue(t)===e.tag&&!(e=>e.innerHtml.isSome()&&e.domChildren.length>0)(e)&&!(e=>ve(e.dom,wa))(t))).bind((t=>((e,t)=>{try{const o=Za(e,t);return A.some(o)}catch(e){return A.none()}})(e,t))).getOrThunk((()=>(e=>{const t=Re(e.tag);Ct(t,e.attributes),Wa(t,e.classes),Bt(t,e.styles),e.innerHtml.each((e=>ta(t,e)));const o=e.domChildren;return Ho(t,o),e.value.each((e=>{qa(t,e)})),t})(e)));return ga(o,e.uid),o})(l,t),d=((e,t,o)=>{const n={"alloy.base.behaviour":Na(e)};return((e,t,o,n)=>{const s=((e,t,o)=>{const n={...o,...Da(t,e)};return Ta(n,Ma)})(e,o,n);return Fa(s,t)})(o,e.eventOrder,t,n).getOrDie()})(s,a,i),u=Es(s.components),m={uid:e.uid,getSystem:n.get,config:t=>{const o=i;return(p(o[t.name()])?o[t.name()]:()=>{throw new Error("Could not find "+t.name()+" in "+JSON.stringify(e,null,2))})()},hasConfigured:e=>p(i[e.name()]),spec:e,readState:e=>i[e]().map((e=>e.state.readState())).getOr("not enabled"),getApis:()=>s.apis,connect:e=>{n.set(e)},disconnect:()=>{n.set(ba(o))},element:c,syncComponents:()=>{const e=it(c),t=X(e,(e=>n.get().getByDom(e).fold((()=>[]),Q)));u.set(t)},components:u.get,events:d};return m},ti=e=>{const t=Ne(e);return oi({element:t})},oi=e=>{const t=Yn("external.component",Mn([os("element"),us("uid")]),e),o=Es(ba()),n=t.uid.getOrThunk((()=>ha("external")));ga(t.element,n);const s={uid:n,getSystem:o.get,config:A.none,hasConfigured:T,connect:e=>{o.set(e)},disconnect:()=>{o.set(ba((()=>s)))},getApis:()=>({}),element:t.element,spec:e,readState:x("No state"),syncComponents:b,components:x([]),events:{}};return Sa(s)},ni=ha,si=(e,t)=>ka(e).getOrThunk((()=>((e,t)=>{const{events:o,...n}=fa(e),s=((e,t)=>{const o=be(e,"components").getOr([]);return t.fold((()=>H(o,ri)),(e=>H(o,((t,o)=>si(t,lt(e,o))))))})(n,t),r={...n,events:{...aa,...o},components:s};return sn.value(ei(r,t))})((e=>ve(e,"uid"))(e)?e:{uid:ni(""),...e},t).getOrDie())),ri=e=>si(e,A.none()),ai=Sa;var ii,li=(e,t,o,n,s)=>e(o,n)?A.some(o):p(s)&&s(o)?A.none():t(o,n,s);const ci=(e,t,o)=>{let n=e.dom;const s=p(o)?o:T;for(;n.parentNode;){n=n.parentNode;const e=Ve(n);if(t(e))return A.some(e);if(s(e))break}return A.none()},di=(e,t,o)=>li(((e,t)=>t(e)),ci,e,t,o),ui=(e,t,o)=>di(e,t,o).isSome(),mi=(e,t,o)=>ci(e,(e=>Ke(e,t)),o),gi=(e,t)=>((e,o)=>G(e.dom.childNodes,(e=>{return o=Ve(e),Ke(o,t);var o})).map(Ve))(e),pi=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Je(o)?A.none():A.from(o.querySelector(e)).map(Ve)})(t,e),hi=(e,t,o)=>li(((e,t)=>Ke(e,t)),mi,e,t,o),fi="aria-controls",bi=()=>{const e=la(fi);return{id:e,link:t=>{kt(t,fi,e)},unlink:e=>{Et(e,fi)}}},vi=(e,t)=>ui(t,(t=>Ze(t,e.element)),T)||((e,t)=>(e=>di(e,(e=>{if(!Ge(e))return!1;const t=Ot(e,"id");return void 0!==t&&t.indexOf(fi)>-1})).bind((e=>{const t=Ot(e,"id"),o=ht(e);return pi(o,`[${fi}="${t}"]`)})))(t).exists((t=>vi(e,t))))(e,t);var yi;!function(e){e[e.STOP=0]="STOP",e[e.NORMAL=1]="NORMAL",e[e.LOGGING=2]="LOGGING"}(yi||(yi={}));const xi=Es({}),wi=["alloy/data/Fields","alloy/debugging/Debugging"],Si=(e,t,o)=>((e,t,o)=>{switch(be(xi.get(),e).orThunk((()=>{const t=ae(xi.get());return re(t,(t=>e.indexOf(t)>-1?A.some(xi.get()[t]):A.none()))})).getOr(yi.NORMAL)){case yi.NORMAL:return o(ki());case yi.LOGGING:{const n=((e,t)=>{const o=[],n=(new Date).getTime();return{logEventCut:(e,t,n)=>{o.push({outcome:"cut",target:t,purpose:n})},logEventStopped:(e,t,n)=>{o.push({outcome:"stopped",target:t,purpose:n})},logNoParent:(e,t,n)=>{o.push({outcome:"no-parent",target:t,purpose:n})},logEventNoHandlers:(e,t)=>{o.push({outcome:"no-handlers-left",target:t})},logEventResponse:(e,t,n)=>{o.push({outcome:"response",purpose:n,target:t})},write:()=>{const s=(new Date).getTime();R(["mousemove","mouseover","mouseout",br()],e)||console.log(e,{event:e,time:s-n,target:t.dom,sequence:H(o,(e=>R(["cut","stopped","response"],e.outcome)?"{"+e.purpose+"} "+e.outcome+" at ("+na(e.target)+")":e.outcome))})}}})(e,t),s=o(n);return n.write(),s}case yi.STOP:return!0}})(e,t,o),ki=x({logEventCut:b,logEventStopped:b,logNoParent:b,logEventNoHandlers:b,logEventResponse:b,write:b}),Ci=x([os("menu"),os("selectedMenu")]),Oi=x([os("item"),os("selectedItem")]);x(Dn(Oi().concat(Ci())));const _i=x(Dn(Oi())),Ti=ls("initSize",[os("numColumns"),os("numRows")]),Ei=()=>ls("markers",[os("backgroundMenu")].concat(Ci()).concat(Oi())),Ai=e=>ls("markers",H(e,os)),Mi=(e,t,o)=>((()=>{const e=new Error;if(void 0!==e.stack){const t=e.stack.split("\n");G(t,(e=>e.indexOf("alloy")>0&&!N(wi,(t=>e.indexOf(t)>-1)))).getOr("unknown")}})(),Qn(t,t,o,Gn((e=>sn.value(((...t)=>e.apply(void 0,t))))))),Di=e=>Mi(0,e,yn(b)),Bi=e=>Mi(0,e,yn(A.none)),Fi=e=>Mi(0,e,{tag:"required",process:{}}),Ii=e=>Mi(0,e,{tag:"required",process:{}}),Ri=(e,t)=>es(e,x(t)),Ni=e=>es(e,w),Vi=x(Ti),zi=(e,t,o,n,s,r,a,i=!1)=>({x:e,y:t,bubble:o,direction:n,placement:s,restriction:r,label:`${a}-${s}`,alwaysFit:i}),Hi=As([{southeast:[]},{southwest:[]},{northeast:[]},{northwest:[]},{south:[]},{north:[]},{east:[]},{west:[]}]),Li=Hi.southeast,Pi=Hi.southwest,Ui=Hi.northeast,Wi=Hi.northwest,ji=Hi.south,Gi=Hi.north,$i=Hi.east,qi=Hi.west,Xi=(e,t,o,n)=>{const s=e+t;return s>n?o:s<o?n:s},Yi=(e,t,o)=>Math.min(Math.max(e,t),o),Ki=(e,t)=>Z(["left","right","top","bottom"],(o=>be(t,o).map((t=>((e,t)=>{switch(t){case 1:return e.x;case 0:return e.x+e.width;case 2:return e.y;case 3:return e.y+e.height}})(e,t))))),Ji="layout",Zi=e=>e.x,Qi=(e,t)=>e.x+e.width/2-t.width/2,el=(e,t)=>e.x+e.width-t.width,tl=(e,t)=>e.y-t.height,ol=e=>e.y+e.height,nl=(e,t)=>e.y+e.height/2-t.height/2,sl=(e,t,o)=>zi(Zi(e),ol(e),o.southeast(),Li(),"southeast",Ki(e,{left:1,top:3}),Ji),rl=(e,t,o)=>zi(el(e,t),ol(e),o.southwest(),Pi(),"southwest",Ki(e,{right:0,top:3}),Ji),al=(e,t,o)=>zi(Zi(e),tl(e,t),o.northeast(),Ui(),"northeast",Ki(e,{left:1,bottom:2}),Ji),il=(e,t,o)=>zi(el(e,t),tl(e,t),o.northwest(),Wi(),"northwest",Ki(e,{right:0,bottom:2}),Ji),ll=(e,t,o)=>zi(Qi(e,t),tl(e,t),o.north(),Gi(),"north",Ki(e,{bottom:2}),Ji),cl=(e,t,o)=>zi(Qi(e,t),ol(e),o.south(),ji(),"south",Ki(e,{top:3}),Ji),dl=(e,t,o)=>zi((e=>e.x+e.width)(e),nl(e,t),o.east(),$i(),"east",Ki(e,{left:0}),Ji),ul=(e,t,o)=>zi(((e,t)=>e.x-t.width)(e,t),nl(e,t),o.west(),qi(),"west",Ki(e,{right:1}),Ji),ml=()=>[sl,rl,al,il,cl,ll,dl,ul],gl=()=>[rl,sl,il,al,cl,ll,dl,ul],pl=()=>[al,il,sl,rl,ll,cl],hl=()=>[il,al,rl,sl,ll,cl],fl=()=>[sl,rl,al,il,cl,ll],bl=()=>[rl,sl,il,al,cl,ll];var vl=Object.freeze({__proto__:null,events:e=>Hr([Ur(dr(),((t,o)=>{const n=e.channels,s=ae(n),r=o,a=((e,t)=>t.universal?e:U(e,(e=>R(t.channels,e))))(s,r);L(a,(e=>{const o=n[e],s=o.schema,a=Yn("channel["+e+"] data\nReceiver: "+na(t.element),s,r.data);o.onReceive(t,a)}))}))])}),yl=[ns("channels",$n(sn.value,Mn([Fi("onReceive"),ys("schema",Nn())])))];const xl=(e,t,o)=>Zr(((n,s)=>{o(n,e,t)})),wl=e=>({key:e,value:void 0}),Sl=(e,t,o,n,s,r,a)=>{const i=e=>ye(e,o)?e[o]():A.none(),l=ce(s,((e,t)=>((e,t,o)=>((e,t,o)=>{const n=o.toString(),s=n.indexOf(")")+1,r=n.indexOf("("),a=n.substring(r+1,s-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:ya(a.slice(0,1).concat(a.slice(3)))}),e})(((n,...s)=>{const r=[n].concat(s);return n.config({name:x(e)}).fold((()=>{throw new Error("We could not find any behaviour configuration for: "+e+". Using API: "+o)}),(e=>{const o=Array.prototype.slice.call(r,1);return t.apply(void 0,[n,e.config,e.state].concat(o))}))}),o,t))(o,e,t))),c={...ce(r,((e,t)=>xa(e,t))),...l,revoke:k(wl,o),config:t=>{const n=Yn(o+"-config",e,t);return{key:o,value:{config:n,me:c,configAsRaw:Qt((()=>Yn(o+"-config",e,t))),initialConfig:t,state:a}}},schema:x(t),exhibit:(e,t)=>Se(i(e),be(n,"exhibit"),((e,o)=>o(t,e.config,e.state))).getOrThunk((()=>Ea({}))),name:x(o),handlers:e=>i(e).map((e=>be(n,"events").getOr((()=>({})))(e.config,e.state))).getOr({})};return c},kl=e=>Ds(e),Cl=Mn([os("fields"),os("name"),ys("active",{}),ys("apis",{}),ys("state",Oa),ys("extra",{})]),Ol=e=>{const t=Yn("Creating behaviour: "+e.name,Cl,e);return((e,t,o,n,s,r)=>{const a=Mn(e),i=vs(t,[("config",l=e,ms("config",Mn(l)))]);var l;return Sl(a,i,t,o,n,s,r)})(t.fields,t.name,t.active,t.apis,t.extra,t.state)},_l=Mn([os("branchKey"),os("branches"),os("name"),ys("active",{}),ys("apis",{}),ys("state",Oa),ys("extra",{})]),Tl=e=>{const t=Yn("Creating behaviour: "+e.name,_l,e);return((e,t,o,n,s,r)=>{const a=e,i=vs(t,[ms("config",e)]);return Sl(a,i,t,o,n,s,r)})(Jn(t.branchKey,t.branches),t.name,t.active,t.apis,t.extra,t.state)},El=x(void 0),Al=Ol({fields:yl,name:"receiving",active:vl});var Ml=Object.freeze({__proto__:null,exhibit:(e,t)=>Ea({classes:[],styles:t.useFixed()?{}:{position:"relative"}})});const Dl=e=>e.dom.focus(),Bl=e=>e.dom.blur(),Fl=e=>{const t=ht(e).dom;return e.dom===t.activeElement},Il=(e=$o())=>A.from(e.dom.activeElement).map(Ve),Rl=e=>Il(ht(e)).filter((t=>e.dom.contains(t.dom))),Nl=(e,t)=>{const o=ht(t),n=Il(o).bind((e=>{const o=t=>Ze(e,t);return o(t)?A.some(t):((e,t)=>{const o=e=>{for(let n=0;n<e.childNodes.length;n++){const s=Ve(e.childNodes[n]);if(t(s))return A.some(s);const r=o(e.childNodes[n]);if(r.isSome())return r}return A.none()};return o(e.dom)})(t,o)})),s=e(t);return n.each((e=>{Il(o).filter((t=>Ze(t,e))).fold((()=>{Dl(e)}),b)})),s},Vl=(e,t,o,n,s)=>{const r=e=>e+"px";return{position:e,left:t.map(r),top:o.map(r),right:n.map(r),bottom:s.map(r)}},zl=(e,t)=>{Ft(e,(e=>({...e,position:A.some(e.position)}))(t))},Hl=As([{none:[]},{relative:["x","y","width","height"]},{fixed:["x","y","width","height"]}]),Ll=(e,t,o,n,s,r)=>{const a=t.rect,i=a.x-o,l=a.y-n,c=s-(i+a.width),d=r-(l+a.height),u=A.some(i),m=A.some(l),g=A.some(c),p=A.some(d),h=A.none();return t.direction.fold((()=>Vl(e,u,m,h,h)),(()=>Vl(e,h,m,g,h)),(()=>Vl(e,u,h,h,p)),(()=>Vl(e,h,h,g,p)),(()=>Vl(e,u,m,h,h)),(()=>Vl(e,u,h,h,p)),(()=>Vl(e,u,m,h,h)),(()=>Vl(e,h,m,g,h)))},Pl=(e,t)=>e.fold((()=>{const e=t.rect;return Vl("absolute",A.some(e.x),A.some(e.y),A.none(),A.none())}),((e,o,n,s)=>Ll("absolute",t,e,o,n,s)),((e,o,n,s)=>Ll("fixed",t,e,o,n,s))),Ul=(e,t)=>{const o=k(Yo,t),n=e.fold(o,o,(()=>{const e=Uo();return Yo(t).translate(-e.left,-e.top)})),s=Zt(t),r=jt(t);return Ko(n.left,n.top,s,r)},Wl=(e,t)=>t.fold((()=>e.fold(en,en,Ko)),(t=>e.fold(x(t),x(t),(()=>{const o=jl(e,t.x,t.y);return Ko(o.left,o.top,t.width,t.height)})))),jl=(e,t,o)=>{const n=$t(t,o);return e.fold(x(n),x(n),(()=>{const e=Uo();return n.translate(-e.left,-e.top)}))};Hl.none;const Gl=Hl.relative,$l=Hl.fixed,ql="data-alloy-placement",Xl=e=>_t(e,ql),Yl=As([{fit:["reposition"]},{nofit:["reposition","visibleW","visibleH","isVisible"]}]),Kl=(e,t,o,n)=>{const s=e.bubble,r=s.offset,a=((e,t,o)=>{const n=(n,s)=>t[n].map((t=>{const r="top"===n||"bottom"===n,a=r?o.top:o.left,i=("left"===n||"top"===n?Math.max:Math.min)(t,s)+a;return r?Yi(i,e.y,e.bottom):Yi(i,e.x,e.right)})).getOr(s),s=n("left",e.x),r=n("top",e.y),a=n("right",e.right),i=n("bottom",e.bottom);return Ko(s,r,a-s,i-r)})(n,e.restriction,r),i=e.x+r.left,l=e.y+r.top,c=Ko(i,l,t,o),{originInBounds:d,sizeInBounds:u,visibleW:m,visibleH:g}=((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,right:l,bottom:c,width:d,height:u}=e;return{originInBounds:a>=o&&a<=s&&i>=n&&i<=r,sizeInBounds:l<=s&&l>=o&&c<=r&&c>=n,visibleW:Math.min(d,a>=o?s-a:l-o),visibleH:Math.min(u,i>=n?r-i:c-n)}})(c,a),p=d&&u,h=p?c:((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,width:l,height:c}=e,d=Math.max(o,s-l),u=Math.max(n,r-c),m=Yi(a,o,d),g=Yi(i,n,u),p=Math.min(m+l,s)-m,h=Math.min(g+c,r)-g;return Ko(m,g,p,h)})(c,a),f=h.width>0&&h.height>0,{maxWidth:b,maxHeight:v}=((e,t,o)=>{const n=x(t.bottom-o.y),s=x(o.bottom-t.y),r=((e,t,o,n)=>e.fold(t,t,n,n,t,n,o,o))(e,s,s,n),a=x(t.right-o.x),i=x(o.right-t.x),l=((e,t,o,n)=>e.fold(t,n,t,n,o,o,t,n))(e,i,i,a);return{maxWidth:l,maxHeight:r}})(e.direction,h,n),y={rect:h,maxHeight:v,maxWidth:b,direction:e.direction,placement:e.placement,classes:{on:s.classesOn,off:s.classesOff},layout:e.label,testY:l};return p||e.alwaysFit?Yl.fit(y):Yl.nofit(y,m,g,f)},Jl=e=>{const t=Es(A.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(A.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(A.some(e))}}},Zl=()=>Jl((e=>e.unbind())),Ql=()=>{const e=Jl(b);return{...e,on:t=>e.get().each(t)}},ec=E,tc=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!1))(e,t,ec,o),oc=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!0))(e,t,ec,o),nc=Bo,sc=["top","bottom","right","left"],rc="data-alloy-transition-timer",ac=(e,t,o,n,s,a)=>{const i=((e,t,o)=>o.exists((o=>{const n=e.mode;return"all"===n||o[n]!==t[n]})))(n,s,a);if(i||((e,t)=>Ga(e,t.classes))(e,n)){Dt(e,"position",o.position);const a=Ul(t,e),l=Pl(t,{...s,rect:a}),c=Z(sc,(e=>l[e]));((e,t)=>{const o=e=>parseFloat(e).toFixed(3);return he(t,((t,n)=>!((e,t,o=S)=>Se(e,t,o).getOr(e.isNone()&&t.isNone()))(e[n].map(o),t.map(o)))).isSome()})(o,c)&&(Ft(e,c),i&&((e,t)=>{Wa(e,t.classes),_t(e,rc).each((t=>{clearTimeout(parseInt(t,10)),Et(e,rc)})),((e,t)=>{const o=Zl(),n=Zl();let s;const a=t=>{var o;const n=null!==(o=t.raw.pseudoElement)&&void 0!==o?o:"";return Ze(t.target,e)&&!De(n)&&R(sc,t.raw.propertyName)},i=r=>{if(m(r)||a(r)){o.clear(),n.clear();const a=null==r?void 0:r.raw.type;(m(a)||a===or())&&(clearTimeout(s),Et(e,rc),ja(e,t.classes))}},l=tc(e,nr(),(t=>{a(t)&&(l.unbind(),o.set(tc(e,or(),i)),n.set(tc(e,tr(),i)))})),c=(e=>{const t=t=>{const o=It(e,t).split(/\s*,\s*/);return U(o,De)},o=e=>{if(r(e)&&/^[\d.]+/.test(e)){const t=parseFloat(e);return Ae(e,"ms")?t:1e3*t}return 0},n=t("transition-delay"),s=t("transition-duration");return j(s,((e,t,s)=>{const r=o(n[s])+o(t);return Math.max(e,r)}),0)})(e);requestAnimationFrame((()=>{s=setTimeout(i,c+17),kt(e,rc,s)}))})(e,t)})(e,n),Lt(e))}else ja(e,n.classes)},ic=(e,t)=>{((e,t)=>{const o=Ut.max(e,t,["margin-top","border-top-width","padding-top","padding-bottom","border-bottom-width","margin-bottom"]);Dt(e,"max-height",o+"px")})(e,Math.floor(t))},lc=x(((e,t)=>{ic(e,t),Bt(e,{"overflow-x":"hidden","overflow-y":"auto"})})),cc=x(((e,t)=>{ic(e,t)})),dc=(e,t,o)=>void 0===e[t]?o:e[t],uc=(e,t,o,n)=>{const s=((e,t,o,n)=>{Ht(t,"max-height"),Ht(t,"max-width");const s={width:Zt(r=t),height:jt(r)};var r;return((e,t,o,n,s,r)=>{const a=n.width,i=n.height,l=(t,l,c,d,u)=>{const m=t(o,n,s,e,r),g=Kl(m,a,i,r);return g.fold(x(g),((e,t,o,n)=>(u===n?o>d||t>c:!u&&n)?g:Yl.nofit(l,c,d,u)))};return j(t,((e,t)=>{const o=k(l,t);return e.fold(x(e),o)}),Yl.nofit({rect:o,maxHeight:n.height,maxWidth:n.width,direction:Li(),placement:"southeast",classes:{on:[],off:[]},layout:"none",testY:o.y},-1,-1,!1)).fold(w,w)})(t,n.preference,e,s,o,n.bounds)})(e,t,o,n);return((e,t,o)=>{const n=Pl(o.origin,t);o.transition.each((s=>{ac(e,o.origin,n,s,t,o.lastPlacement)})),zl(e,n)})(t,s,n),((e,t)=>{((e,t)=>{kt(e,ql,t)})(e,t.placement)})(t,s),((e,t)=>{const o=t.classes;ja(e,o.off),Wa(e,o.on)})(t,s),((e,t,o)=>{(0,o.maxHeightFunction)(e,t.maxHeight)})(t,s,n),((e,t,o)=>{(0,o.maxWidthFunction)(e,t.maxWidth)})(t,s,n),{layout:s.layout,placement:s.placement}},mc=["valignCentre","alignLeft","alignRight","alignCentre","top","bottom","left","right","inset"],gc=(e,t,o,n=1)=>{const s=e*n,r=t*n,a=e=>be(o,e).getOr([]),i=(e,t,o)=>{const n=J(mc,o);return{offset:$t(e,t),classesOn:X(o,a),classesOff:X(n,a)}};return{southeast:()=>i(-e,t,["top","alignLeft"]),southwest:()=>i(e,t,["top","alignRight"]),south:()=>i(-e/2,t,["top","alignCentre"]),northeast:()=>i(-e,-t,["bottom","alignLeft"]),northwest:()=>i(e,-t,["bottom","alignRight"]),north:()=>i(-e/2,-t,["bottom","alignCentre"]),east:()=>i(e,-t/2,["valignCentre","left"]),west:()=>i(-e,-t/2,["valignCentre","right"]),insetNortheast:()=>i(s,r,["top","alignLeft","inset"]),insetNorthwest:()=>i(-s,r,["top","alignRight","inset"]),insetNorth:()=>i(-s/2,r,["top","alignCentre","inset"]),insetSoutheast:()=>i(s,-r,["bottom","alignLeft","inset"]),insetSouthwest:()=>i(-s,-r,["bottom","alignRight","inset"]),insetSouth:()=>i(-s/2,-r,["bottom","alignCentre","inset"]),insetEast:()=>i(-s,-r/2,["valignCentre","right","inset"]),insetWest:()=>i(s,-r/2,["valignCentre","left","inset"])}},pc=()=>gc(0,0,{}),hc=w,fc=(e,t)=>o=>"rtl"===bc(o)?t:e,bc=e=>"rtl"===It(e,"direction")?"rtl":"ltr";var vc;!function(e){e.TopToBottom="toptobottom",e.BottomToTop="bottomtotop"}(vc||(vc={}));const yc="data-alloy-vertical-dir",xc=e=>ui(e,(e=>Ge(e)&&Ot(e,"data-alloy-vertical-dir")===vc.BottomToTop)),wc=()=>vs("layouts",[os("onLtr"),os("onRtl"),us("onBottomLtr"),us("onBottomRtl")]),Sc=(e,t,o,n,s,r,a)=>{const i=a.map(xc).getOr(!1),l=t.layouts.map((t=>t.onLtr(e))),c=t.layouts.map((t=>t.onRtl(e))),d=i?t.layouts.bind((t=>t.onBottomLtr.map((t=>t(e))))).or(l).getOr(s):l.getOr(o),u=i?t.layouts.bind((t=>t.onBottomRtl.map((t=>t(e))))).or(c).getOr(r):c.getOr(n);return fc(d,u)(e)};var kc=[os("hotspot"),us("bubble"),ys("overrides",{}),wc(),Ri("placement",((e,t,o)=>{const n=t.hotspot,s=Ul(o,n.element),r=Sc(e.element,t,fl(),bl(),pl(),hl(),A.some(t.hotspot.element));return A.some(hc({anchorBox:s,bubble:t.bubble.getOr(pc()),overrides:t.overrides,layouts:r}))}))],Cc=[os("x"),os("y"),ys("height",0),ys("width",0),ys("bubble",pc()),ys("overrides",{}),wc(),Ri("placement",((e,t,o)=>{const n=jl(o,t.x,t.y),s=Ko(n.left,n.top,t.width,t.height),r=Sc(e.element,t,ml(),gl(),ml(),gl(),A.none());return A.some(hc({anchorBox:s,bubble:t.bubble,overrides:t.overrides,layouts:r}))}))];const Oc=As([{screen:["point"]},{absolute:["point","scrollLeft","scrollTop"]}]),_c=e=>e.fold(w,((e,t,o)=>e.translate(-t,-o))),Tc=e=>e.fold(w,w),Ec=e=>j(e,((e,t)=>e.translate(t.left,t.top)),$t(0,0)),Ac=e=>{const t=H(e,Tc);return Ec(t)},Mc=Oc.screen,Dc=Oc.absolute,Bc=(e,t,o)=>{const n=et(e.element),s=Uo(n),r=((e,t,o)=>{const n=nt(o.root).dom;return A.from(n.frameElement).map(Ve).filter((t=>{const o=et(t),n=et(e.element);return Ze(o,n)})).map(Xt)})(e,0,o).getOr(s);return Dc(r,s.left,s.top)},Fc=(e,t,o,n)=>{const s=Mc($t(e,t));return A.some(((e,t,o)=>({point:e,width:t,height:o}))(s,o,n))},Ic=(e,t,o,n,s)=>e.map((e=>{const r=[t,e.point],a=(i=()=>Ac(r),l=()=>Ac(r),c=()=>(e=>{const t=H(e,_c);return Ec(t)})(r),n.fold(i,l,c));var i,l,c;const d=(p=a.left,h=a.top,f=e.width,b=e.height,{x:p,y:h,width:f,height:b}),u=o.showAbove?pl():fl(),m=o.showAbove?hl():bl(),g=Sc(s,o,u,m,u,m,A.none());var p,h,f,b;return hc({anchorBox:d,bubble:o.bubble.getOr(pc()),overrides:o.overrides,layouts:g})}));var Rc=[os("node"),os("root"),us("bubble"),wc(),ys("overrides",{}),ys("showAbove",!1),Ri("placement",((e,t,o)=>{const n=Bc(e,0,t);return t.node.filter(yt).bind((s=>{const r=s.dom.getBoundingClientRect(),a=Fc(r.left,r.top,r.width,r.height),i=t.node.getOr(e.element);return Ic(a,n,t,o,i)}))}))];const Nc=(e,t,o,n)=>({start:e,soffset:t,finish:o,foffset:n}),Vc=As([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),zc=(Vc.before,Vc.on,Vc.after,e=>e.fold(w,w,w)),Hc=As([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Lc={domRange:Hc.domRange,relative:Hc.relative,exact:Hc.exact,exactFromRange:e=>Hc.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>Ve(e.startContainer),relative:(e,t)=>zc(e),exact:(e,t,o,n)=>e}))(e);return nt(t)},range:Nc},Pc=(e,t,o)=>{const n=e.document.createRange();var s;return s=n,t.fold((e=>{s.setStartBefore(e.dom)}),((e,t)=>{s.setStart(e.dom,t)}),(e=>{s.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,o)=>{e.setEnd(t.dom,o)}),(t=>{e.setEndAfter(t.dom)}))})(n,o),n},Uc=(e,t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},Wc=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom,width:e.width,height:e.height}),jc=As([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Gc=(e,t,o)=>t(Ve(o.startContainer),o.startOffset,Ve(o.endContainer),o.endOffset),$c=(e,t)=>((e,t)=>{const o=((e,t)=>t.match({domRange:e=>({ltr:x(e),rtl:A.none}),relative:(t,o)=>({ltr:Qt((()=>Pc(e,t,o))),rtl:Qt((()=>A.some(Pc(e,o,t))))}),exact:(t,o,n,s)=>({ltr:Qt((()=>Uc(e,t,o,n,s))),rtl:Qt((()=>A.some(Uc(e,n,s,t,o))))})}))(e,t);return((e,t)=>{const o=t.ltr();return o.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>jc.rtl(Ve(e.endContainer),e.endOffset,Ve(e.startContainer),e.startOffset))).getOrThunk((()=>Gc(0,jc.ltr,o))):Gc(0,jc.ltr,o)})(0,o)})(e,t).match({ltr:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},rtl:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(n.dom,s),r.setEnd(t.dom,o),r}});jc.ltr,jc.rtl;const qc=(e,t,o)=>U(((e,t)=>{const o=p(t)?t:T;let n=e.dom;const s=[];for(;null!==n.parentNode&&void 0!==n.parentNode;){const e=n.parentNode,t=Ve(e);if(s.push(t),!0===o(t))break;n=e}return s})(e,o),t),Xc=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Je(o)?[]:H(o.querySelectorAll(e),Ve)})(t,e),Yc=e=>{if(e.rangeCount>0){const t=e.getRangeAt(0),o=e.getRangeAt(e.rangeCount-1);return A.some(Nc(Ve(t.startContainer),t.startOffset,Ve(o.endContainer),o.endOffset))}return A.none()},Kc=e=>{if(null===e.anchorNode||null===e.focusNode)return Yc(e);{const t=Ve(e.anchorNode),o=Ve(e.focusNode);return((e,t,o,n)=>{const s=((e,t,o,n)=>{const s=et(e).dom.createRange();return s.setStart(e.dom,t),s.setEnd(o.dom,n),s})(e,t,o,n),r=Ze(e,o)&&t===n;return s.collapsed&&!r})(t,e.anchorOffset,o,e.focusOffset)?A.some(Nc(t,e.anchorOffset,o,e.focusOffset)):Yc(e)}},Jc=(e,t)=>(e=>{const t=e.getClientRects(),o=t.length>0?t[0]:e.getBoundingClientRect();return o.width>0||o.height>0?A.some(o).map(Wc):A.none()})($c(e,t)),Zc=((e,t)=>{const o=t=>e(t)?A.from(t.dom.nodeValue):A.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})($e),Qc=(e,t)=>({element:e,offset:t}),ed=(e,t)=>$e(e)?Qc(e,t):((e,t)=>{const o=it(e);if(0===o.length)return Qc(e,t);if(t<o.length)return Qc(o[t],0);{const e=o[o.length-1],t=$e(e)?(e=>Zc.get(e))(e).length:it(e).length;return Qc(e,t)}})(e,t),td=e=>void 0!==e.foffset,od=(e,t)=>t.getSelection.getOrThunk((()=>()=>(e=>(e=>A.from(e.getSelection()))(e).filter((e=>e.rangeCount>0)).bind(Kc))(e)))().map((e=>{if(td(e)){const t=ed(e.start,e.soffset),o=ed(e.finish,e.foffset);return Lc.range(t.element,t.offset,o.element,o.offset)}return e}));var nd=[us("getSelection"),os("root"),us("bubble"),wc(),ys("overrides",{}),ys("showAbove",!1),Ri("placement",((e,t,o)=>{const n=nt(t.root).dom,s=Bc(e,0,t),r=od(n,t).bind((e=>{if(td(e)){const t=((e,t)=>(e=>{const t=e.getBoundingClientRect();return t.width>0||t.height>0?A.some(t).map(Wc):A.none()})($c(e,t)))(n,Lc.exactFromRange(e)).orThunk((()=>{const t=Ne("\ufeff");Ro(e.start,t);const o=Jc(n,Lc.exact(t,0,t,1));return Po(t),o}));return t.bind((e=>Fc(e.left,e.top,e.width,e.height)))}{const t=ce(e,(e=>e.dom.getBoundingClientRect())),o={left:Math.min(t.firstCell.left,t.lastCell.left),right:Math.max(t.firstCell.right,t.lastCell.right),top:Math.min(t.firstCell.top,t.lastCell.top),bottom:Math.max(t.firstCell.bottom,t.lastCell.bottom)};return Fc(o.left,o.top,o.right-o.left,o.bottom-o.top)}})),a=od(n,t).bind((e=>td(e)?Ge(e.start)?A.some(e.start):rt(e.start):A.some(e.firstCell))).getOr(e.element);return Ic(r,s,t,o,a)}))];const sd="link-layout",rd=e=>e.x+e.width,ad=(e,t)=>e.x-t.width,id=(e,t)=>e.y-t.height+e.height,ld=e=>e.y,cd=(e,t,o)=>zi(rd(e),ld(e),o.southeast(),Li(),"southeast",Ki(e,{left:0,top:2}),sd),dd=(e,t,o)=>zi(ad(e,t),ld(e),o.southwest(),Pi(),"southwest",Ki(e,{right:1,top:2}),sd),ud=(e,t,o)=>zi(rd(e),id(e,t),o.northeast(),Ui(),"northeast",Ki(e,{left:0,bottom:3}),sd),md=(e,t,o)=>zi(ad(e,t),id(e,t),o.northwest(),Wi(),"northwest",Ki(e,{right:1,bottom:3}),sd),gd=()=>[cd,dd,ud,md],pd=()=>[dd,cd,md,ud];var hd=[os("item"),wc(),ys("overrides",{}),Ri("placement",((e,t,o)=>{const n=Ul(o,t.item.element),s=Sc(e.element,t,gd(),pd(),gd(),pd(),A.none());return A.some(hc({anchorBox:n,bubble:pc(),overrides:t.overrides,layouts:s}))}))],fd=Jn("type",{selection:nd,node:Rc,hotspot:kc,submenu:hd,makeshift:Cc});const bd=[ds("classes",Hn),ks("mode","all",["all","layout","placement"])],vd=[ys("useFixed",T),us("getBounds")],yd=[ns("anchor",fd),vs("transition",bd)],xd=(e,t,o,n,s,r)=>{const a=Yn("placement.info",Dn(yd),s),i=a.anchor,l=n.element,c=o.get(n.uid);Nl((()=>{Dt(l,"position","fixed");const s=Nt(l,"visibility");Dt(l,"visibility","hidden");const d=t.useFixed()?(()=>{const e=document.documentElement;return $l(0,0,e.clientWidth,e.clientHeight)})():(e=>{const t=Xt(e.element),o=e.element.dom.getBoundingClientRect();return Gl(t.left,t.top,o.width,o.height)})(e);i.placement(e,i,d).each((e=>{const s=r.orThunk((()=>t.getBounds.map(_))),i=((e,t,o,n,s,r)=>((e,t,o,n,s,r,a,i)=>{const l=dc(a,"maxHeightFunction",lc()),c=dc(a,"maxWidthFunction",b),d=e.anchorBox,u=e.origin,m={bounds:Wl(u,r),origin:u,preference:n,maxHeightFunction:l,maxWidthFunction:c,lastPlacement:s,transition:i};return uc(d,t,o,m)})(((e,t)=>((e,t)=>({anchorBox:e,origin:t}))(e,t))(t.anchorBox,e),n.element,t.bubble,t.layouts,s,o,t.overrides,r))(d,e,s,n,c,a.transition);o.set(n.uid,i)})),s.fold((()=>{Ht(l,"visibility")}),(e=>{Dt(l,"visibility",e)})),Nt(l,"left").isNone()&&Nt(l,"top").isNone()&&Nt(l,"right").isNone()&&Nt(l,"bottom").isNone()&&xe(Nt(l,"position"),"fixed")&&Ht(l,"position")}),l)};var wd=Object.freeze({__proto__:null,position:(e,t,o,n,s)=>{const r=A.none();xd(e,t,o,n,s,r)},positionWithinBounds:xd,getMode:(e,t,o)=>t.useFixed()?"fixed":"absolute",reset:(e,t,o,n)=>{const s=n.element;L(["position","left","right","top","bottom"],(e=>Ht(s,e))),(e=>{Et(e,ql)})(s),o.clear(n.uid)}});const Sd=Ol({fields:vd,name:"positioning",active:Ml,apis:wd,state:Object.freeze({__proto__:null,init:()=>{let e={};return _a({readState:()=>e,clear:t=>{g(t)?delete e[t]:e={}},set:(t,o)=>{e[t]=o},get:t=>be(e,t)})}})}),kd=e=>e.getSystem().isConnected(),Cd=e=>{Fr(e,kr());const t=e.components();L(t,Cd)},Od=e=>{const t=e.components();L(t,Od),Fr(e,Sr())},_d=(e,t)=>{e.getSystem().addToWorld(t),yt(e.element)&&Od(t)},Td=e=>{Cd(e),e.getSystem().removeFromWorld(e)},Ed=(e,t)=>{zo(e.element,t.element)},Ad=(e,t)=>{Md(e,t,zo)},Md=(e,t,o)=>{e.getSystem().addToWorld(t),o(e.element,t.element),yt(e.element)&&Od(t),e.syncComponents()},Dd=e=>{Cd(e),Po(e.element),e.getSystem().removeFromWorld(e)},Bd=e=>{const t=st(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()));Dd(e),t.each((e=>{e.syncComponents()}))},Fd=e=>{const t=e.components();L(t,Dd),Lo(e.element),e.syncComponents()},Id=(e,t)=>{Nd(e,t,zo)},Rd=(e,t)=>{Nd(e,t,No)},Nd=(e,t,o)=>{o(e,t.element);const n=it(t.element);L(n,(e=>{t.getByDom(e).each(Od)}))},Vd=e=>{const t=it(e.element);L(t,(t=>{e.getByDom(t).each(Cd)})),Po(e.element)},zd=(e,t,o,n)=>{o.get().each((t=>{Fd(e)}));const s=t.getAttachPoint(e);Ad(s,e);const r=e.getSystem().build(n);return Ad(e,r),o.set(r),r},Hd=(e,t,o,n)=>{const s=zd(e,t,o,n);return t.onOpen(e,s),s},Ld=(e,t,o)=>{o.get().each((n=>{Fd(e),Bd(e),t.onClose(e,n),o.clear()}))},Pd=(e,t,o)=>o.isOpen(),Ud=(e,t,o)=>{const n=t.getAttachPoint(e);Dt(e.element,"position",Sd.getMode(n)),((e,t,o,n)=>{Nt(e.element,t).fold((()=>{Et(e.element,o)}),(t=>{kt(e.element,o,t)})),Dt(e.element,t,"hidden")})(e,"visibility",t.cloakVisibilityAttr)},Wd=(e,t,o)=>{(e=>N(["top","left","right","bottom"],(t=>Nt(e,t).isSome())))(e.element)||Ht(e.element,"position"),((e,t,o)=>{_t(e.element,o).fold((()=>Ht(e.element,t)),(o=>Dt(e.element,t,o)))})(e,"visibility",t.cloakVisibilityAttr)};var jd=Object.freeze({__proto__:null,cloak:Ud,decloak:Wd,open:Hd,openWhileCloaked:(e,t,o,n,s)=>{Ud(e,t),Hd(e,t,o,n),s(),Wd(e,t)},close:Ld,isOpen:Pd,isPartOf:(e,t,o,n)=>Pd(0,0,o)&&o.get().exists((o=>t.isPartOf(e,o,n))),getState:(e,t,o)=>o.get(),setContent:(e,t,o,n)=>o.get().map((()=>zd(e,t,o,n)))}),Gd=Object.freeze({__proto__:null,events:(e,t)=>Hr([Ur(hr(),((o,n)=>{Ld(o,e,t)}))])}),$d=[Di("onOpen"),Di("onClose"),os("isPartOf"),os("getAttachPoint"),ys("cloakVisibilityAttr","data-precloak-visibility")],qd=Object.freeze({__proto__:null,init:()=>{const e=Ql(),t=x("not-implemented");return _a({readState:t,isOpen:e.isSet,clear:e.clear,set:e.set,get:e.get})}});const Xd=Ol({fields:$d,name:"sandboxing",active:Gd,apis:jd,state:qd}),Yd=x("dismiss.popups"),Kd=x("reposition.popups"),Jd=x("mouse.released"),Zd=Mn([ys("isExtraPart",T),vs("fireEventInstead",[ys("event",Cr())])]),Qd=e=>{const t=Yn("Dismissal",Zd,e);return{[Yd()]:{schema:Mn([os("target")]),onReceive:(e,o)=>{Xd.isOpen(e)&&(Xd.isPartOf(e,o.target)||t.isExtraPart(e,o.target)||t.fireEventInstead.fold((()=>Xd.close(e)),(t=>Fr(e,t.event))))}}}},eu=Mn([vs("fireEventInstead",[ys("event",Or())]),is("doReposition")]),tu=e=>{const t=Yn("Reposition",eu,e);return{[Kd()]:{onReceive:e=>{Xd.isOpen(e)&&t.fireEventInstead.fold((()=>t.doReposition(e)),(t=>Fr(e,t.event)))}}}},ou=(e,t,o)=>{t.store.manager.onLoad(e,t,o)},nu=(e,t,o)=>{t.store.manager.onUnload(e,t,o)};var su=Object.freeze({__proto__:null,onLoad:ou,onUnload:nu,setValue:(e,t,o,n)=>{t.store.manager.setValue(e,t,o,n)},getValue:(e,t,o)=>t.store.manager.getValue(e,t,o),getState:(e,t,o)=>o}),ru=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.resetOnDom?[Kr(((o,n)=>{ou(o,e,t)})),Jr(((o,n)=>{nu(o,e,t)}))]:[xl(e,t,ou)];return Hr(o)}});const au=()=>{const e=Es(null);return _a({set:e.set,get:e.get,isNotSet:()=>null===e.get(),clear:()=>{e.set(null)},readState:()=>({mode:"memory",value:e.get()})})},iu=()=>{const e=Es({}),t=Es({});return _a({readState:()=>({mode:"dataset",dataByValue:e.get(),dataByText:t.get()}),lookup:o=>be(e.get(),o).orThunk((()=>be(t.get(),o))),update:o=>{const n=e.get(),s=t.get(),r={},a={};L(o,(e=>{r[e.value]=e,be(e,"meta").each((t=>{be(t,"text").each((t=>{a[t]=e}))}))})),e.set({...n,...r}),t.set({...s,...a})},clear:()=>{e.set({}),t.set({})}})};var lu=Object.freeze({__proto__:null,memory:au,dataset:iu,manual:()=>_a({readState:b}),init:e=>e.store.manager.state(e)});const cu=(e,t,o,n)=>{const s=t.store;o.update([n]),s.setValue(e,n),t.onSetValue(e,n)};var du=[us("initialValue"),os("getFallbackEntry"),os("getDataKey"),os("setValue"),Ri("manager",{setValue:cu,getValue:(e,t,o)=>{const n=t.store,s=n.getDataKey(e);return o.lookup(s).getOrThunk((()=>n.getFallbackEntry(s)))},onLoad:(e,t,o)=>{t.store.initialValue.each((n=>{cu(e,t,o,n)}))},onUnload:(e,t,o)=>{o.clear()},state:iu})],uu=[os("getValue"),ys("setValue",b),us("initialValue"),Ri("manager",{setValue:(e,t,o,n)=>{t.store.setValue(e,n),t.onSetValue(e,n)},getValue:(e,t,o)=>t.store.getValue(e),onLoad:(e,t,o)=>{t.store.initialValue.each((o=>{t.store.setValue(e,o)}))},onUnload:b,state:Oa.init})],mu=[us("initialValue"),Ri("manager",{setValue:(e,t,o,n)=>{o.set(n),t.onSetValue(e,n)},getValue:(e,t,o)=>o.get(),onLoad:(e,t,o)=>{t.store.initialValue.each((e=>{o.isNotSet()&&o.set(e)}))},onUnload:(e,t,o)=>{o.clear()},state:au})],gu=[xs("store",{mode:"memory"},Jn("mode",{memory:mu,manual:uu,dataset:du})),Di("onSetValue"),ys("resetOnDom",!1)];const pu=Ol({fields:gu,name:"representing",active:ru,apis:su,extra:{setValueFrom:(e,t)=>{const o=pu.getValue(t);pu.setValue(e,o)}},state:lu}),hu=(e,t)=>Ts(e,{},H(t,(t=>{return o=t.name(),n="Cannot configure "+t.name()+" for "+e,Qn(o,o,{tag:"option",process:{}},Cn((e=>un("The field: "+o+" is forbidden. "+n))));var o,n})).concat([es("dump",w)])),fu=e=>e.dump,bu=(e,t)=>({...kl(t),...e.dump}),vu=hu,yu=bu,xu="placeholder",wu=As([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Su=e=>ve(e,"uiType"),ku=(e,t,o,n)=>((e,t,o,n)=>Su(o)&&o.uiType===xu?((e,t,o,n)=>e.exists((e=>e!==o.owner))?wu.single(!0,x(o)):be(n,o.name).fold((()=>{throw new Error("Unknown placeholder component: "+o.name+"\nKnown: ["+ae(n)+"]\nNamespace: "+e.getOr("none")+"\nSpec: "+JSON.stringify(o,null,2))}),(e=>e.replace())))(e,0,o,n):wu.single(!1,x(o)))(e,0,o,n).fold(((s,r)=>{const a=Su(o)?r(t,o.config,o.validated):r(t),i=be(a,"components").getOr([]),l=X(i,(o=>ku(e,t,o,n)));return[{...a,components:l}]}),((e,n)=>{if(Su(o)){const e=n(t,o.config,o.validated);return o.validated.preprocess.getOr(w)(e)}return n(t)})),Cu=wu.single,Ou=wu.multiple,_u=x(xu),Tu=As([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Eu=ys("factory",{sketch:w}),Au=ys("schema",[]),Mu=os("name"),Du=Qn("pname","pname",vn((e=>"<alloy."+la(e.name)+">")),Nn()),Bu=es("schema",(()=>[us("preprocess")])),Fu=ys("defaults",x({})),Iu=ys("overrides",x({})),Ru=Dn([Eu,Au,Mu,Du,Fu,Iu]),Nu=Dn([Eu,Au,Mu,Fu,Iu]),Vu=Dn([Eu,Au,Mu,Du,Fu,Iu]),zu=Dn([Eu,Bu,Mu,os("unit"),Du,Fu,Iu]),Hu=e=>e.fold(A.some,A.none,A.some,A.some),Lu=e=>{const t=e=>e.name;return e.fold(t,t,t,t)},Pu=(e,t)=>o=>{const n=Yn("Converting part type",t,o);return e(n)},Uu=Pu(Tu.required,Ru),Wu=Pu(Tu.external,Nu),ju=Pu(Tu.optional,Vu),Gu=Pu(Tu.group,zu),$u=x("entirety");var qu=Object.freeze({__proto__:null,required:Uu,external:Wu,optional:ju,group:Gu,asNamedPart:Hu,name:Lu,asCommon:e=>e.fold(w,w,w,w),original:$u});const Xu=(e,t,o,n)=>fn(t.defaults(e,o,n),o,{uid:e.partUids[t.name]},t.overrides(e,o,n)),Yu=(e,t)=>{const o={};return L(t,(t=>{Hu(t).each((t=>{const n=Ku(e,t.pname);o[t.name]=o=>{const s=Yn("Part: "+t.name+" in "+e,Dn(t.schema),o);return{...n,config:o,validated:s}}}))})),o},Ku=(e,t)=>({uiType:_u(),owner:e,name:t}),Ju=(e,t,o)=>({uiType:_u(),owner:e,name:t,config:o,validated:{}}),Zu=e=>X(e,(e=>e.fold(A.none,A.some,A.none,A.none).map((e=>ls(e.name,e.schema.concat([Ni($u())])))).toArray())),Qu=e=>H(e,Lu),em=(e,t,o)=>((e,t,o)=>{const n={},s={};return L(o,(e=>{e.fold((e=>{n[e.pname]=Cu(!0,((t,o,n)=>e.factory.sketch(Xu(t,e,o,n))))}),(e=>{const o=t.parts[e.name];s[e.name]=x(e.factory.sketch(Xu(t,e,o[$u()]),o))}),(e=>{n[e.pname]=Cu(!1,((t,o,n)=>e.factory.sketch(Xu(t,e,o,n))))}),(e=>{n[e.pname]=Ou(!0,((t,o,n)=>{const s=t[e.name];return H(s,(o=>e.factory.sketch(fn(e.defaults(t,o,n),o,e.overrides(t,o)))))}))}))})),{internals:x(n),externals:x(s)}})(0,t,o),tm=(e,t,o)=>((e,t,o,n)=>{const s=ce(n,((e,t)=>((e,t)=>{let o=!1;return{name:x(e),required:()=>t.fold(((e,t)=>e),((e,t)=>e)),used:()=>o,replace:()=>{if(o)throw new Error("Trying to use the same placeholder more than once: "+e);return o=!0,t}}})(t,e))),r=((e,t,o,n)=>X(o,(o=>ku(e,t,o,n))))(e,t,o,s);return le(s,(o=>{if(!1===o.used()&&o.required())throw new Error("Placeholder: "+o.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+JSON.stringify(t.components,null,2))})),r})(A.some(e),t,t.components,o),om=(e,t,o)=>{const n=t.partUids[o];return e.getSystem().getByUid(n).toOptional()},nm=(e,t,o)=>om(e,t,o).getOrDie("Could not find part: "+o),sm=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return L(o,(e=>{n[e]=x(r.getByUid(s[e]))})),n},rm=(e,t)=>{const o=e.getSystem();return ce(t.partUids,((e,t)=>x(o.getByUid(e))))},am=e=>ae(e.partUids),im=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return L(o,(e=>{n[e]=x(r.getByUid(s[e]).getOrDie())})),n},lm=(e,t)=>{const o=Qu(t);return Ds(H(o,(t=>({key:t,value:e+"-"+t}))))},cm=e=>Qn("partUids","partUids",xn((t=>lm(t.uid,e))),Nn());var dm=Object.freeze({__proto__:null,generate:Yu,generateOne:Ju,schemas:Zu,names:Qu,substitutes:em,components:tm,defaultUids:lm,defaultUidsSchema:cm,getAllParts:rm,getAllPartNames:am,getPart:om,getPartOrDie:nm,getParts:sm,getPartsOrDie:im});const um=(e,t,o,n,s)=>{const r=((e,t)=>(e.length>0?[ls("parts",e)]:[]).concat([os("uid"),ys("dom",{}),ys("components",[]),Ni("originalSpec"),ys("debug.sketcher",{})]).concat(t))(n,s);return Yn(e+" [SpecSchema]",Mn(r.concat(t)),o)},mm=(e,t,o,n,s)=>{const r=gm(s),a=Zu(o),i=cm(o),l=um(e,t,r,a,[i]),c=em(0,l,o);return n(l,tm(e,l,c.internals()),r,c.externals())},gm=e=>(e=>ve(e,"uid"))(e)?e:{...e,uid:ha("uid")},pm=Mn([os("name"),os("factory"),os("configFields"),ys("apis",{}),ys("extraApis",{})]),hm=Mn([os("name"),os("factory"),os("configFields"),os("partFields"),ys("apis",{}),ys("extraApis",{})]),fm=e=>{const t=Yn("Sketcher for "+e.name,pm,e),o=ce(t.apis,Ca),n=ce(t.extraApis,((e,t)=>xa(e,t)));return{name:t.name,configFields:t.configFields,sketch:e=>((e,t,o,n)=>{const s=gm(n);return o(um(e,t,s,[],[]),s)})(t.name,t.configFields,t.factory,e),...o,...n}},bm=e=>{const t=Yn("Sketcher for "+e.name,hm,e),o=Yu(t.name,t.partFields),n=ce(t.apis,Ca),s=ce(t.extraApis,((e,t)=>xa(e,t)));return{name:t.name,partFields:t.partFields,configFields:t.configFields,sketch:e=>mm(t.name,t.configFields,t.partFields,t.factory,e),parts:o,...n,...s}},vm=e=>Ye("input")(e)&&"radio"!==Ot(e,"type")||Ye("textarea")(e);var ym=Object.freeze({__proto__:null,getCurrent:(e,t,o)=>t.find(e)});const xm=[os("find")],wm=Ol({fields:xm,name:"composing",apis:ym}),Sm=["input","button","textarea","select"],km=(e,t,o)=>{(t.disabled()?Am:Mm)(e,t)},Cm=(e,t)=>!0===t.useNative&&R(Sm,Ue(e.element)),Om=e=>{kt(e.element,"disabled","disabled")},_m=e=>{Et(e.element,"disabled")},Tm=e=>{kt(e.element,"aria-disabled","true")},Em=e=>{kt(e.element,"aria-disabled","false")},Am=(e,t,o)=>{t.disableClass.each((t=>{La(e.element,t)})),(Cm(e,t)?Om:Tm)(e),t.onDisabled(e)},Mm=(e,t,o)=>{t.disableClass.each((t=>{Pa(e.element,t)})),(Cm(e,t)?_m:Em)(e),t.onEnabled(e)},Dm=(e,t)=>Cm(e,t)?(e=>Tt(e.element,"disabled"))(e):(e=>"true"===Ot(e.element,"aria-disabled"))(e);var Bm=Object.freeze({__proto__:null,enable:Mm,disable:Am,isDisabled:Dm,onLoad:km,set:(e,t,o,n)=>{(n?Am:Mm)(e,t)}}),Fm=Object.freeze({__proto__:null,exhibit:(e,t)=>Ea({classes:t.disabled()?t.disableClass.toArray():[]}),events:(e,t)=>Hr([Lr(ur(),((t,o)=>Dm(t,e))),xl(e,t,km)])}),Im=[Os("disabled",T),ys("useNative",!0),us("disableClass"),Di("onDisabled"),Di("onEnabled")];const Rm=Ol({fields:Im,name:"disabling",active:Fm,apis:Bm}),Nm=(e,t,o,n)=>{const s=Xc(e.element,"."+t.highlightClass);L(s,(o=>{N(n,(e=>Ze(e.element,o)))||(Pa(o,t.highlightClass),e.getSystem().getByDom(o).each((o=>{t.onDehighlight(e,o),Fr(o,Br())})))}))},Vm=(e,t,o,n)=>{Nm(e,t,0,[n]),zm(e,t,o,n)||(La(n.element,t.highlightClass),t.onHighlight(e,n),Fr(n,Dr()))},zm=(e,t,o,n)=>Ua(n.element,t.highlightClass),Hm=(e,t,o)=>pi(e.element,"."+t.itemClass).bind((t=>e.getSystem().getByDom(t).toOptional())),Lm=(e,t,o)=>{const n=Xc(e.element,"."+t.itemClass);return(n.length>0?A.some(n[n.length-1]):A.none()).bind((t=>e.getSystem().getByDom(t).toOptional()))},Pm=(e,t,o,n)=>{const s=Xc(e.element,"."+t.itemClass);return $(s,(e=>Ua(e,t.highlightClass))).bind((t=>{const o=Xi(t,n,0,s.length-1);return e.getSystem().getByDom(s[o]).toOptional()}))},Um=(e,t,o)=>{const n=Xc(e.element,"."+t.itemClass);return we(H(n,(t=>e.getSystem().getByDom(t).toOptional())))};var Wm=Object.freeze({__proto__:null,dehighlightAll:(e,t,o)=>Nm(e,t,0,[]),dehighlight:(e,t,o,n)=>{zm(e,t,o,n)&&(Pa(n.element,t.highlightClass),t.onDehighlight(e,n),Fr(n,Br()))},highlight:Vm,highlightFirst:(e,t,o)=>{Hm(e,t).each((n=>{Vm(e,t,o,n)}))},highlightLast:(e,t,o)=>{Lm(e,t).each((n=>{Vm(e,t,o,n)}))},highlightAt:(e,t,o,n)=>{((e,t,o,n)=>{const s=Xc(e.element,"."+t.itemClass);return A.from(s[n]).fold((()=>sn.error(new Error("No element found with index "+n))),e.getSystem().getByDom)})(e,t,0,n).fold((e=>{throw e}),(n=>{Vm(e,t,o,n)}))},highlightBy:(e,t,o,n)=>{const s=Um(e,t);G(s,n).each((n=>{Vm(e,t,o,n)}))},isHighlighted:zm,getHighlighted:(e,t,o)=>pi(e.element,"."+t.highlightClass).bind((t=>e.getSystem().getByDom(t).toOptional())),getFirst:Hm,getLast:Lm,getPrevious:(e,t,o)=>Pm(e,t,0,-1),getNext:(e,t,o)=>Pm(e,t,0,1),getCandidates:Um}),jm=[os("highlightClass"),os("itemClass"),Di("onHighlight"),Di("onDehighlight")];const Gm=Ol({fields:jm,name:"highlighting",apis:Wm}),$m=[8],qm=[9],Xm=[13],Ym=[27],Km=[32],Jm=[37],Zm=[38],Qm=[39],eg=[40],tg=(e,t,o)=>{const n=K(e.slice(0,t)),s=K(e.slice(t+1));return G(n.concat(s),o)},og=(e,t,o)=>{const n=K(e.slice(0,t));return G(n,o)},ng=(e,t,o)=>{const n=e.slice(0,t),s=e.slice(t+1);return G(s.concat(n),o)},sg=(e,t,o)=>{const n=e.slice(t+1);return G(n,o)},rg=e=>t=>{const o=t.raw;return R(e,o.which)},ag=e=>t=>Y(e,(e=>e(t))),ig=e=>!0===e.raw.shiftKey,lg=e=>!0===e.raw.ctrlKey,cg=C(ig),dg=(e,t)=>({matches:e,classification:t}),ug=(e,t,o)=>{t.exists((e=>o.exists((t=>Ze(t,e)))))||Ir(e,_r(),{prevFocus:t,newFocus:o})},mg=()=>{const e=e=>Rl(e.element);return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().triggerFocus(o,t.element);const s=e(t);ug(t,n,s)}}},gg=()=>{const e=e=>Gm.getHighlighted(e).map((e=>e.element));return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().getByDom(o).fold(b,(e=>{Gm.highlight(t,e)}));const s=e(t);ug(t,n,s)}}};var pg;!function(e){e.OnFocusMode="onFocus",e.OnEnterOrSpaceMode="onEnterOrSpace",e.OnApiMode="onApi"}(pg||(pg={}));const hg=(e,t,o,n,s)=>{const r=(e,t,o,n,s)=>{return(r=o(e,t,n,s),a=t.event,G(r,(e=>e.matches(a))).map((e=>e.classification))).bind((o=>o(e,t,n,s)));var r,a},a={schema:()=>e.concat([ys("focusManager",mg()),xs("focusInside","onFocus",Gn((e=>R(["onFocus","onEnterOrSpace","onApi"],e)?sn.value(e):sn.error("Invalid value for focusInside")))),Ri("handler",a),Ri("state",t),Ri("sendFocusIn",s)]),processKey:r,toEvents:(e,t)=>{const a=e.focusInside!==pg.OnFocusMode?A.none():s(e).map((o=>Ur(ir(),((n,s)=>{o(n,e,t),s.stop()})))),i=[Ur(Ks(),((n,a)=>{r(n,a,o,e,t).fold((()=>{((o,n)=>{const r=rg(Km.concat(Xm))(n.event);e.focusInside===pg.OnEnterOrSpaceMode&&r&&Rs(o,n)&&s(e).each((s=>{s(o,e,t),n.stop()}))})(n,a)}),(e=>{a.stop()}))})),Ur(Js(),((o,s)=>{r(o,s,n,e,t).each((e=>{s.stop()}))}))];return Hr(a.toArray().concat(i))}};return a},fg=e=>{const t=[us("onEscape"),us("onEnter"),ys("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),ys("firstTabstop",0),ys("useTabstopAt",E),us("visibilitySelector")].concat([e]),o=(e,t)=>{const o=e.visibilitySelector.bind((e=>hi(t,e))).getOr(t);return Wt(o)>0},n=(e,t)=>t.focusManager.get(e).bind((e=>hi(e,t.selector))),s=(e,t,n)=>{((e,t)=>{const n=Xc(e.element,t.selector),s=U(n,(e=>o(t,e)));return A.from(s[t.firstTabstop])})(e,t).each((o=>{t.focusManager.set(e,o)}))},r=(e,t,s,r)=>{const a=Xc(e.element,s.selector);return n(e,s).bind((t=>$(a,k(Ze,t)).bind((t=>((e,t,n,s,r)=>r(t,n,(e=>((e,t)=>o(e,t)&&e.useTabstopAt(t))(s,e))).fold((()=>s.cyclic?A.some(!0):A.none()),(t=>(s.focusManager.set(e,t),A.some(!0)))))(e,a,t,s,r)))))},a=(e,t,o)=>{const n=o.cyclic?tg:og;return r(e,0,o,n)},i=(e,t,o)=>{const n=o.cyclic?ng:sg;return r(e,0,o,n)},l=x([dg(ag([ig,rg(qm)]),a),dg(rg(qm),i),dg(ag([cg,rg(Xm)]),((e,t,o)=>o.onEnter.bind((o=>o(e,t)))))]),c=x([dg(rg(Ym),((e,t,o)=>o.onEscape.bind((o=>o(e,t))))),dg(rg(qm),((e,t,o)=>n(e,o).filter((e=>!o.useTabstopAt(e))).bind((n=>((e=>(e=>st(e))(e).bind(ct).exists((t=>Ze(t,e))))(n)?a:i)(e,t,o)))))]);return hg(t,Oa.init,l,c,(()=>A.some(s)))};var bg=fg(es("cyclic",T)),vg=fg(es("cyclic",E));const yg=(e,t,o)=>vm(o)&&rg(Km)(t.event)?A.none():((e,t,o)=>(Nr(e,o,ur()),A.some(!0)))(e,0,o),xg=(e,t)=>A.some(!0),wg=[ys("execute",yg),ys("useSpace",!1),ys("useEnter",!0),ys("useControlEnter",!1),ys("useDown",!1)],Sg=(e,t,o)=>o.execute(e,t,e.element);var kg=hg(wg,Oa.init,((e,t,o,n)=>{const s=o.useSpace&&!vm(e.element)?Km:[],r=o.useEnter?Xm:[],a=o.useDown?eg:[],i=s.concat(r).concat(a);return[dg(rg(i),Sg)].concat(o.useControlEnter?[dg(ag([lg,rg(Xm)]),Sg)]:[])}),((e,t,o,n)=>o.useSpace&&!vm(e.element)?[dg(rg(Km),xg)]:[]),(()=>A.none()));const Cg=()=>{const e=Ql();return _a({readState:()=>e.get().map((e=>({numRows:String(e.numRows),numColumns:String(e.numColumns)}))).getOr({numRows:"?",numColumns:"?"}),setGridSize:(t,o)=>{e.set({numRows:t,numColumns:o})},getNumRows:()=>e.get().map((e=>e.numRows)),getNumColumns:()=>e.get().map((e=>e.numColumns))})};var Og=Object.freeze({__proto__:null,flatgrid:Cg,init:e=>e.state(e)});const _g=e=>(t,o,n,s)=>{const r=e(t.element);return Mg(r,t,o,n,s)},Tg=(e,t)=>{const o=fc(e,t);return _g(o)},Eg=(e,t)=>{const o=fc(t,e);return _g(o)},Ag=e=>(t,o,n,s)=>Mg(e,t,o,n,s),Mg=(e,t,o,n,s)=>n.focusManager.get(t).bind((o=>e(t.element,o,n,s))).map((e=>(n.focusManager.set(t,e),!0))),Dg=Ag,Bg=Ag,Fg=Ag,Ig=e=>!(e=>e.offsetWidth<=0&&e.offsetHeight<=0)(e.dom),Rg=(e,t,o)=>{const n=Xc(e,o);return((e,o)=>$(e,(e=>Ze(e,t))).map((t=>({index:t,candidates:e}))))(U(n,Ig))},Ng=(e,t)=>$(e,(e=>Ze(t,e))),Vg=(e,t,o,n)=>n(Math.floor(t/o),t%o).bind((t=>{const n=t.row*o+t.column;return n>=0&&n<e.length?A.some(e[n]):A.none()})),zg=(e,t,o,n,s)=>Vg(e,t,n,((t,r)=>{const a=t===o-1?e.length-t*n:n,i=Xi(r,s,0,a-1);return A.some({row:t,column:i})})),Hg=(e,t,o,n,s)=>Vg(e,t,n,((t,r)=>{const a=Xi(t,s,0,o-1),i=a===o-1?e.length-a*n:n,l=Yi(r,0,i-1);return A.some({row:a,column:l})})),Lg=[os("selector"),ys("execute",yg),Bi("onEscape"),ys("captureTab",!1),Vi()],Pg=(e,t,o)=>{pi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},Ug=e=>(t,o,n,s)=>Rg(t,o,n.selector).bind((t=>e(t.candidates,t.index,s.getNumRows().getOr(n.initSize.numRows),s.getNumColumns().getOr(n.initSize.numColumns)))),Wg=(e,t,o)=>o.captureTab?A.some(!0):A.none(),jg=Ug(((e,t,o,n)=>zg(e,t,o,n,-1))),Gg=Ug(((e,t,o,n)=>zg(e,t,o,n,1))),$g=Ug(((e,t,o,n)=>Hg(e,t,o,n,-1))),qg=Ug(((e,t,o,n)=>Hg(e,t,o,n,1))),Xg=x([dg(rg(Jm),Tg(jg,Gg)),dg(rg(Qm),Eg(jg,Gg)),dg(rg(Zm),Dg($g)),dg(rg(eg),Bg(qg)),dg(ag([ig,rg(qm)]),Wg),dg(ag([cg,rg(qm)]),Wg),dg(rg(Km.concat(Xm)),((e,t,o,n)=>((e,t)=>t.focusManager.get(e).bind((e=>hi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n)))))]),Yg=x([dg(rg(Ym),((e,t,o)=>o.onEscape(e,t))),dg(rg(Km),xg)]);var Kg=hg(Lg,Cg,Xg,Yg,(()=>A.some(Pg)));const Jg=(e,t,o,n,s)=>{const r=(e,t,o)=>s(e,t,n,0,o.length-1,o[t],(t=>{return n=o[t],"button"===Ue(n)&&"disabled"===Ot(n,"disabled")?r(e,t,o):A.from(o[t]);var n}));return Rg(e,o,t).bind((e=>{const t=e.index,o=e.candidates;return r(t,t,o)}))},Zg=(e,t,o,n)=>Jg(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Yi(t+o,n,s);return i===e?A.from(r):a(i)})),Qg=(e,t,o,n)=>Jg(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Xi(t,o,n,s);return i===e?A.none():a(i)})),ep=[os("selector"),ys("getInitial",A.none),ys("execute",yg),Bi("onEscape"),ys("executeOnMove",!1),ys("allowVertical",!0),ys("allowHorizontal",!0),ys("cycles",!0)],tp=(e,t,o)=>((e,t)=>t.focusManager.get(e).bind((e=>hi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n))),op=(e,t,o)=>{t.getInitial(e).orThunk((()=>pi(e.element,t.selector))).each((o=>{t.focusManager.set(e,o)}))},np=(e,t,o)=>(o.cycles?Qg:Zg)(e,o.selector,t,-1),sp=(e,t,o)=>(o.cycles?Qg:Zg)(e,o.selector,t,1),rp=e=>(t,o,n,s)=>e(t,o,n,s).bind((()=>n.executeOnMove?tp(t,o,n):A.some(!0))),ap=x([dg(rg(Km),xg),dg(rg(Ym),((e,t,o)=>o.onEscape(e,t)))]);var ip=hg(ep,Oa.init,((e,t,o,n)=>{const s=[...o.allowHorizontal?Jm:[]].concat(o.allowVertical?Zm:[]),r=[...o.allowHorizontal?Qm:[]].concat(o.allowVertical?eg:[]);return[dg(rg(s),rp(Tg(np,sp))),dg(rg(r),rp(Eg(np,sp))),dg(rg(Xm),tp),dg(rg(Km),tp)]}),ap,(()=>A.some(op)));const lp=(e,t,o)=>A.from(e[t]).bind((e=>A.from(e[o]).map((e=>({rowIndex:t,columnIndex:o,cell:e}))))),cp=(e,t,o,n)=>{const s=e[t].length,r=Xi(o,n,0,s-1);return lp(e,t,r)},dp=(e,t,o,n)=>{const s=Xi(o,n,0,e.length-1),r=e[s].length,a=Yi(t,0,r-1);return lp(e,s,a)},up=(e,t,o,n)=>{const s=e[t].length,r=Yi(o+n,0,s-1);return lp(e,t,r)},mp=(e,t,o,n)=>{const s=Yi(o+n,0,e.length-1),r=e[s].length,a=Yi(t,0,r-1);return lp(e,s,a)},gp=[ls("selectors",[os("row"),os("cell")]),ys("cycles",!0),ys("previousSelector",A.none),ys("execute",yg)],pp=(e,t,o)=>{t.previousSelector(e).orThunk((()=>{const o=t.selectors;return pi(e.element,o.cell)})).each((o=>{t.focusManager.set(e,o)}))},hp=(e,t)=>(o,n,s)=>{const r=s.cycles?e:t;return hi(n,s.selectors.row).bind((e=>{const t=Xc(e,s.selectors.cell);return Ng(t,n).bind((t=>{const n=Xc(o,s.selectors.row);return Ng(n,e).bind((e=>{const o=((e,t)=>H(e,(e=>Xc(e,t.selectors.cell))))(n,s);return r(o,e,t).map((e=>e.cell))}))}))}))},fp=hp(((e,t,o)=>cp(e,t,o,-1)),((e,t,o)=>up(e,t,o,-1))),bp=hp(((e,t,o)=>cp(e,t,o,1)),((e,t,o)=>up(e,t,o,1))),vp=hp(((e,t,o)=>dp(e,o,t,-1)),((e,t,o)=>mp(e,o,t,-1))),yp=hp(((e,t,o)=>dp(e,o,t,1)),((e,t,o)=>mp(e,o,t,1))),xp=x([dg(rg(Jm),Tg(fp,bp)),dg(rg(Qm),Eg(fp,bp)),dg(rg(Zm),Dg(vp)),dg(rg(eg),Bg(yp)),dg(rg(Km.concat(Xm)),((e,t,o)=>Rl(e.element).bind((n=>o.execute(e,t,n)))))]),wp=x([dg(rg(Km),xg)]);var Sp=hg(gp,Oa.init,xp,wp,(()=>A.some(pp)));const kp=[os("selector"),ys("execute",yg),ys("moveOnTab",!1)],Cp=(e,t,o)=>o.focusManager.get(e).bind((n=>o.execute(e,t,n))),Op=(e,t,o)=>{pi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},_p=(e,t,o)=>Qg(e,o.selector,t,-1),Tp=(e,t,o)=>Qg(e,o.selector,t,1),Ep=x([dg(rg(Zm),Fg(_p)),dg(rg(eg),Fg(Tp)),dg(ag([ig,rg(qm)]),((e,t,o,n)=>o.moveOnTab?Fg(_p)(e,t,o,n):A.none())),dg(ag([cg,rg(qm)]),((e,t,o,n)=>o.moveOnTab?Fg(Tp)(e,t,o,n):A.none())),dg(rg(Xm),Cp),dg(rg(Km),Cp)]),Ap=x([dg(rg(Km),xg)]);var Mp=hg(kp,Oa.init,Ep,Ap,(()=>A.some(Op)));const Dp=[Bi("onSpace"),Bi("onEnter"),Bi("onShiftEnter"),Bi("onLeft"),Bi("onRight"),Bi("onTab"),Bi("onShiftTab"),Bi("onUp"),Bi("onDown"),Bi("onEscape"),ys("stopSpaceKeyup",!1),us("focusIn")];var Bp=hg(Dp,Oa.init,((e,t,o)=>[dg(rg(Km),o.onSpace),dg(ag([cg,rg(Xm)]),o.onEnter),dg(ag([ig,rg(Xm)]),o.onShiftEnter),dg(ag([ig,rg(qm)]),o.onShiftTab),dg(ag([cg,rg(qm)]),o.onTab),dg(rg(Zm),o.onUp),dg(rg(eg),o.onDown),dg(rg(Jm),o.onLeft),dg(rg(Qm),o.onRight),dg(rg(Km),o.onSpace)]),((e,t,o)=>[...o.stopSpaceKeyup?[dg(rg(Km),xg)]:[],dg(rg(Ym),o.onEscape)]),(e=>e.focusIn));const Fp=bg.schema(),Ip=vg.schema(),Rp=ip.schema(),Np=Kg.schema(),Vp=Sp.schema(),zp=kg.schema(),Hp=Mp.schema(),Lp=Bp.schema(),Pp=Tl({branchKey:"mode",branches:Object.freeze({__proto__:null,acyclic:Fp,cyclic:Ip,flow:Rp,flatgrid:Np,matrix:Vp,execution:zp,menu:Hp,special:Lp}),name:"keying",active:{events:(e,t)=>e.handler.toEvents(e,t)},apis:{focusIn:(e,t,o)=>{t.sendFocusIn(t).fold((()=>{e.getSystem().triggerFocus(e.element,e.element)}),(n=>{n(e,t,o)}))},setGridSize:(e,t,o,n,s)=>{(e=>ye(e,"setGridSize"))(o)?o.setGridSize(n,s):console.error("Layout does not support setGridSize")}},state:Og}),Up=(e,t)=>{Nl((()=>{((e,t,o)=>{const n=e.components();(e=>{L(e.components(),(e=>Po(e.element))),Lo(e.element),e.syncComponents()})(e);const s=o(t),r=J(n,s);L(r,(t=>{Cd(t),e.getSystem().removeFromWorld(t)})),L(s,(t=>{kd(t)?Ed(e,t):(e.getSystem().addToWorld(t),Ed(e,t),yt(e.element)&&Od(t))})),e.syncComponents()})(e,t,(()=>H(t,e.getSystem().build)))}),e.element)},Wp=(e,t)=>{Nl((()=>{((o,n,s)=>{const r=o.components(),a=X(n,(e=>ka(e).toArray()));L(r,(e=>{R(a,e)||Td(e)}));const i=((e,t,o)=>Ya(e,t,((t,n)=>Ka(e,n,t,o))))(e.element,t,e.getSystem().buildOrPatch),l=J(r,i);L(l,(e=>{kd(e)&&Td(e)})),L(i,(e=>{kd(e)||_d(o,e)})),o.syncComponents()})(e,t)}),e.element)},jp=(e,t,o,n)=>{Td(t);const s=Ka(e.element,o,n,e.getSystem().buildOrPatch);_d(e,s),e.syncComponents()},Gp=(e,t,o)=>{const n=e.getSystem().build(o);Md(e,n,t)},$p=(e,t,o,n)=>{Bd(t),Gp(e,((e,t)=>((e,t,o)=>{lt(e,o).fold((()=>{zo(e,t)}),(e=>{Ro(e,t)}))})(e,t,o)),n)},qp=(e,t)=>e.components(),Xp=(e,t,o,n,s)=>{const r=qp(e);return A.from(r[n]).map((o=>(s.fold((()=>Bd(o)),(s=>{(t.reuseDom?jp:$p)(e,o,n,s)})),o)))};var Yp=Object.freeze({__proto__:null,append:(e,t,o,n)=>{Gp(e,zo,n)},prepend:(e,t,o,n)=>{Gp(e,Vo,n)},remove:(e,t,o,n)=>{const s=qp(e),r=G(s,(e=>Ze(n.element,e.element)));r.each(Bd)},replaceAt:Xp,replaceBy:(e,t,o,n,s)=>{const r=qp(e);return $(r,n).bind((o=>Xp(e,t,0,o,s)))},set:(e,t,o,n)=>(t.reuseDom?Wp:Up)(e,n),contents:qp});const Kp=Ol({fields:[Cs("reuseDom",!0)],name:"replacing",apis:Yp}),Jp=(e,t)=>{const o=((e,t)=>{const o=Hr(t);return Ol({fields:[os("enabled")],name:e,active:{events:x(o)}})})(e,t);return{key:e,value:{config:{},me:o,configAsRaw:x({}),initialConfig:{},state:Oa}}},Zp=(e,t)=>{t.ignore||(Dl(e.element),t.onFocus(e))};var Qp=Object.freeze({__proto__:null,focus:Zp,blur:(e,t)=>{t.ignore||Bl(e.element)},isFocused:e=>Fl(e.element)}),eh=Object.freeze({__proto__:null,exhibit:(e,t)=>{const o=t.ignore?{}:{attributes:{tabindex:"-1"}};return Ea(o)},events:e=>Hr([Ur(ir(),((t,o)=>{Zp(t,e),o.stop()}))].concat(e.stopMousedown?[Ur(Ws(),((e,t)=>{t.event.prevent()}))]:[]))}),th=[Di("onFocus"),ys("stopMousedown",!1),ys("ignore",!1)];const oh=Ol({fields:th,name:"focusing",active:eh,apis:Qp}),nh=(e,t,o,n)=>{const s=o.get();o.set(n),((e,t,o)=>{t.toggleClass.each((t=>{o.get()?La(e.element,t):Pa(e.element,t)}))})(e,t,o),((e,t,o)=>{const n=t.aria;n.update(e,n,o.get())})(e,t,o),s!==n&&t.onToggled(e,n)},sh=(e,t,o)=>{nh(e,t,o,!o.get())},rh=(e,t,o)=>{nh(e,t,o,t.selected)};var ah=Object.freeze({__proto__:null,onLoad:rh,toggle:sh,isOn:(e,t,o)=>o.get(),on:(e,t,o)=>{nh(e,t,o,!0)},off:(e,t,o)=>{nh(e,t,o,!1)},set:nh}),ih=Object.freeze({__proto__:null,exhibit:()=>Ea({}),events:(e,t)=>{const o=(n=e,s=t,r=sh,Qr((e=>{r(e,n,s)})));var n,s,r;const a=xl(e,t,rh);return Hr(q([e.toggleOnExecute?[o]:[],[a]]))}});const lh=(e,t,o)=>{kt(e.element,"aria-expanded",o)};var ch=[ys("selected",!1),us("toggleClass"),ys("toggleOnExecute",!0),Di("onToggled"),xs("aria",{mode:"none"},Jn("mode",{pressed:[ys("syncWithExpanded",!1),Ri("update",((e,t,o)=>{kt(e.element,"aria-pressed",o),t.syncWithExpanded&&lh(e,0,o)}))],checked:[Ri("update",((e,t,o)=>{kt(e.element,"aria-checked",o)}))],expanded:[Ri("update",lh)],selected:[Ri("update",((e,t,o)=>{kt(e.element,"aria-selected",o)}))],none:[Ri("update",b)]}))];const dh=Ol({fields:ch,name:"toggling",active:ih,apis:ah,state:(!1,{init:()=>{const e=Es(false);return{get:()=>e.get(),set:t=>e.set(t),clear:()=>e.set(false),readState:()=>e.get()}}})});const uh=()=>{const e=(e,t)=>{t.stop(),Rr(e)};return[Ur(er(),e),Ur(gr(),e),qr(Hs()),qr(Ws())]},mh=e=>Hr(q([e.map((e=>Qr(((t,o)=>{e(t),o.stop()})))).toArray(),uh()])),gh="alloy.item-hover",ph="alloy.item-focus",hh="alloy.item-toggled",fh=e=>{(Rl(e.element).isNone()||oh.isFocused(e))&&(oh.isFocused(e)||oh.focus(e),Ir(e,gh,{item:e}))},bh=e=>{Ir(e,ph,{item:e})},vh=x(gh),yh=x(ph),xh=x(hh),wh=e=>e.toggling.map((e=>e.exclusive?"menuitemradio":"menuitemcheckbox")).getOr("menuitem"),Sh=[os("data"),os("components"),os("dom"),ys("hasSubmenu",!1),us("toggling"),vu("itemBehaviours",[dh,oh,Pp,pu]),ys("ignoreFocus",!1),ys("domModification",{}),Ri("builder",(e=>({dom:e.dom,domModification:{...e.domModification,attributes:{role:wh(e),...e.domModification.attributes,"aria-haspopup":e.hasSubmenu,...e.hasSubmenu?{"aria-expanded":!1}:{}}},behaviours:yu(e.itemBehaviours,[e.toggling.fold(dh.revoke,(e=>dh.config((e=>({aria:{mode:"checked"},...ge(e,((e,t)=>"exclusive"!==t)),onToggled:(t,o)=>{p(e.onToggled)&&e.onToggled(t,o),((e,t)=>{Ir(e,hh,{item:e,state:t})})(t,o)}}))(e)))),oh.config({ignore:e.ignoreFocus,stopMousedown:e.ignoreFocus,onFocus:e=>{bh(e)}}),Pp.config({mode:"execution"}),pu.config({store:{mode:"memory",initialValue:e.data}}),Jp("item-type-events",[...uh(),Ur(qs(),fh),Ur(mr(),oh.focus)])]),components:e.components,eventOrder:e.eventOrder}))),ys("eventOrder",{})],kh=[os("dom"),os("components"),Ri("builder",(e=>({dom:e.dom,components:e.components,events:Hr([Xr(mr())])})))],Ch=x("item-widget"),Oh=x([Uu({name:"widget",overrides:e=>({behaviours:kl([pu.config({store:{mode:"manual",getValue:t=>e.data,setValue:b}})])})})]),_h=[os("uid"),os("data"),os("components"),os("dom"),ys("autofocus",!1),ys("ignoreFocus",!1),vu("widgetBehaviours",[pu,oh,Pp]),ys("domModification",{}),cm(Oh()),Ri("builder",(e=>{const t=em(Ch(),e,Oh()),o=tm(Ch(),e,t.internals()),n=t=>om(t,e,"widget").map((e=>(Pp.focusIn(e),e))),s=(t,o)=>vm(o.event.target)?A.none():e.autofocus?(o.setSource(t.element),A.none()):A.none();return{dom:e.dom,components:o,domModification:e.domModification,events:Hr([Qr(((e,t)=>{n(e).each((e=>{t.stop()}))})),Ur(qs(),fh),Ur(mr(),((t,o)=>{e.autofocus?n(t):oh.focus(t)}))]),behaviours:yu(e.widgetBehaviours,[pu.config({store:{mode:"memory",initialValue:e.data}}),oh.config({ignore:e.ignoreFocus,onFocus:e=>{bh(e)}}),Pp.config({mode:"special",focusIn:e.autofocus?e=>{n(e)}:El(),onLeft:s,onRight:s,onEscape:(t,o)=>oh.isFocused(t)||e.autofocus?e.autofocus?(o.setSource(t.element),A.none()):A.none():(oh.focus(t),A.some(!0))})])}}))],Th=Jn("type",{widget:_h,item:Sh,separator:kh}),Eh=x([Gu({factory:{sketch:e=>{const t=Yn("menu.spec item",Th,e);return t.builder(t)}},name:"items",unit:"item",defaults:(e,t)=>ve(t,"uid")?t:{...t,uid:ha("item")},overrides:(e,t)=>({type:t.type,ignoreFocus:e.fakeFocus,domModification:{classes:[e.markers.item]}})})]),Ah=x([os("value"),os("items"),os("dom"),os("components"),ys("eventOrder",{}),hu("menuBehaviours",[Gm,pu,wm,Pp]),xs("movement",{mode:"menu",moveOnTab:!0},Jn("mode",{grid:[Vi(),Ri("config",((e,t)=>({mode:"flatgrid",selector:"."+e.markers.item,initSize:{numColumns:t.initSize.numColumns,numRows:t.initSize.numRows},focusManager:e.focusManager})))],matrix:[Ri("config",((e,t)=>({mode:"matrix",selectors:{row:t.rowSelector,cell:"."+e.markers.item},previousSelector:t.previousSelector,focusManager:e.focusManager}))),os("rowSelector"),ys("previousSelector",A.none)],menu:[ys("moveOnTab",!0),Ri("config",((e,t)=>({mode:"menu",selector:"."+e.markers.item,moveOnTab:t.moveOnTab,focusManager:e.focusManager})))]})),ns("markers",_i()),ys("fakeFocus",!1),ys("focusManager",mg()),Di("onHighlight"),Di("onDehighlight")]),Mh=x("alloy.menu-focus"),Dh=bm({name:"Menu",configFields:Ah(),partFields:Eh(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,markers:e.markers,behaviours:bu(e.menuBehaviours,[Gm.config({highlightClass:e.markers.selectedItem,itemClass:e.markers.item,onHighlight:e.onHighlight,onDehighlight:e.onDehighlight}),pu.config({store:{mode:"memory",initialValue:e.value}}),wm.config({find:A.some}),Pp.config(e.movement.config(e,e.movement))]),events:Hr([Ur(yh(),((e,t)=>{const o=t.event;e.getSystem().getByDom(o.target).each((o=>{Gm.highlight(e,o),t.stop(),Ir(e,Mh(),{menu:e,item:o})}))})),Ur(vh(),((e,t)=>{const o=t.event.item;Gm.highlight(e,o)})),Ur(xh(),((e,t)=>{const{item:o,state:n}=t.event;n&&"menuitemradio"===Ot(o.element,"role")&&((e,t)=>{const o=Xc(e.element,'[role="menuitemradio"][aria-checked="true"]');L(o,(o=>{Ze(o,t.element)||e.getSystem().getByDom(o).each((e=>{dh.off(e)}))}))})(e,o)}))]),components:t,eventOrder:e.eventOrder,domModification:{attributes:{role:"menu"}}})}),Bh=(e,t,o,n)=>be(o,n).bind((n=>be(e,n).bind((n=>{const s=Bh(e,t,o,n);return A.some([n].concat(s))})))).getOr([]),Fh=e=>"prepared"===e.type?A.some(e.menu):A.none(),Ih=()=>{const e=Es({}),t=Es({}),o=Es({}),n=Ql(),s=Es({}),r=e=>a(e).bind(Fh),a=e=>be(t.get(),e),i=t=>be(e.get(),t);return{setMenuBuilt:(e,o)=>{t.set({...t.get(),[e]:{type:"prepared",menu:o}})},setContents:(r,a,i,l)=>{n.set(r),e.set(i),t.set(a),s.set(l);const c=((e,t)=>{const o={};le(e,((e,t)=>{L(e,(e=>{o[e]=t}))}));const n=t,s=de(t,((e,t)=>({k:e,v:t}))),r=ce(s,((e,t)=>[t].concat(Bh(o,n,s,t))));return ce(o,(e=>be(r,e).getOr([e])))})(l,i);o.set(c)},expand:t=>be(e.get(),t).map((e=>{const n=be(o.get(),t).getOr([]);return[e].concat(n)})),refresh:e=>be(o.get(),e),collapse:e=>be(o.get(),e).bind((e=>e.length>1?A.some(e.slice(1)):A.none())),lookupMenu:a,lookupItem:i,otherMenus:e=>{const t=s.get();return J(ae(t),e)},getPrimary:()=>n.get().bind(r),getMenus:()=>t.get(),clear:()=>{e.set({}),t.set({}),o.set({}),n.clear()},isClear:()=>n.get().isNone(),getTriggeringPath:(t,s)=>{const a=U(i(t).toArray(),(e=>r(e).isSome()));return be(o.get(),t).bind((t=>{const o=K(a.concat(t));return(e=>{const t=[];for(let o=0;o<e.length;o++){const n=e[o];if(!n.isSome())return A.none();t.push(n.getOrDie())}return A.some(t)})(X(o,((t,a)=>((t,o,n)=>r(t).bind((s=>(t=>he(e.get(),((e,o)=>e===t)))(t).bind((e=>o(e).map((e=>({triggeredMenu:s,triggeringItem:e,triggeringPath:n}))))))))(t,s,o.slice(0,a+1)).fold((()=>xe(n.get(),t)?[]:[A.none()]),(e=>[A.some(e)])))))}))}}},Rh=Fh,Nh=la("tiered-menu-item-highlight"),Vh=la("tiered-menu-item-dehighlight");var zh;!function(e){e[e.HighlightMenuAndItem=0]="HighlightMenuAndItem",e[e.HighlightJustMenu=1]="HighlightJustMenu",e[e.HighlightNone=2]="HighlightNone"}(zh||(zh={}));const Hh=x("collapse-item"),Lh=fm({name:"TieredMenu",configFields:[Ii("onExecute"),Ii("onEscape"),Fi("onOpenMenu"),Fi("onOpenSubmenu"),Di("onRepositionMenu"),Di("onCollapseMenu"),ys("highlightOnOpen",zh.HighlightMenuAndItem),ls("data",[os("primary"),os("menus"),os("expansions")]),ys("fakeFocus",!1),Di("onHighlightItem"),Di("onDehighlightItem"),Di("onHover"),Ei(),os("dom"),ys("navigateOnHover",!0),ys("stayInDom",!1),hu("tmenuBehaviours",[Pp,Gm,wm,Kp]),ys("eventOrder",{})],apis:{collapseMenu:(e,t)=>{e.collapseMenu(t)},highlightPrimary:(e,t)=>{e.highlightPrimary(t)},repositionMenus:(e,t)=>{e.repositionMenus(t)}},factory:(e,t)=>{const o=Ql(),n=Ih(),s=e=>pu.getValue(e).value,r=t=>ce(e.data.menus,((e,t)=>X(e.items,(e=>"separator"===e.type?[]:[e.data.value])))),a=Gm.highlight,i=(t,o)=>{a(t,o),Gm.getHighlighted(o).orThunk((()=>Gm.getFirst(o))).each((n=>{e.fakeFocus?Gm.highlight(o,n):Nr(t,n.element,mr())}))},l=(e,t)=>we(H(t,(t=>e.lookupMenu(t).bind((e=>"prepared"===e.type?A.some(e.menu):A.none()))))),c=(t,o,n)=>{const s=l(o,o.otherMenus(n));L(s,(o=>{ja(o.element,[e.markers.backgroundMenu]),e.stayInDom||Kp.remove(t,o)}))},d=(t,n)=>{const r=(t=>o.get().getOrThunk((()=>{const n={},r=Xc(t.element,`.${e.markers.item}`),a=U(r,(e=>"true"===Ot(e,"aria-haspopup")));return L(a,(e=>{t.getSystem().getByDom(e).each((e=>{const t=s(e);n[t]=e}))})),o.set(n),n})))(t);le(r,((e,t)=>{const o=R(n,t);kt(e.element,"aria-expanded",o)}))},u=(t,o,n)=>A.from(n[0]).bind((s=>o.lookupMenu(s).bind((s=>{if("notbuilt"===s.type)return A.none();{const r=s.menu,a=l(o,n.slice(1));return L(a,(t=>{La(t.element,e.markers.backgroundMenu)})),yt(r.element)||Kp.append(t,ai(r)),ja(r.element,[e.markers.backgroundMenu]),i(t,r),c(t,o,n),A.some(r)}}))));let m;!function(e){e[e.HighlightSubmenu=0]="HighlightSubmenu",e[e.HighlightParent=1]="HighlightParent"}(m||(m={}));const g=(t,o,r=m.HighlightSubmenu)=>{if(o.hasConfigured(Rm)&&Rm.isDisabled(o))return A.some(o);{const a=s(o);return n.expand(a).bind((s=>(d(t,s),A.from(s[0]).bind((a=>n.lookupMenu(a).bind((i=>{const l=((e,t,o)=>{if("notbuilt"===o.type){const s=e.getSystem().build(o.nbMenu());return n.setMenuBuilt(t,s),s}return o.menu})(t,a,i);return yt(l.element)||Kp.append(t,ai(l)),e.onOpenSubmenu(t,o,l,K(s)),r===m.HighlightSubmenu?(Gm.highlightFirst(l),u(t,n,s)):(Gm.dehighlightAll(l),A.some(o))})))))))}},p=(t,o)=>{const r=s(o);return n.collapse(r).bind((s=>(d(t,s),u(t,n,s).map((n=>(e.onCollapseMenu(t,o,n),n))))))},h=t=>(o,n)=>hi(n.getSource(),`.${e.markers.item}`).bind((e=>o.getSystem().getByDom(e).toOptional().bind((e=>t(o,e).map(E))))),f=Hr([Ur(Mh(),((e,t)=>{const o=t.event.item;n.lookupItem(s(o)).each((()=>{const o=t.event.menu;Gm.highlight(e,o);const r=s(t.event.item);n.refresh(r).each((t=>c(e,n,t)))}))})),Qr(((t,o)=>{const n=o.event.target;t.getSystem().getByDom(n).each((o=>{0===s(o).indexOf("collapse-item")&&p(t,o),g(t,o,m.HighlightSubmenu).fold((()=>{e.onExecute(t,o)}),b)}))})),Kr(((t,o)=>{(t=>{const o=((t,o,n)=>ce(n,((n,s)=>{const r=()=>Dh.sketch({...n,value:s,markers:e.markers,fakeFocus:e.fakeFocus,onHighlight:(e,t)=>{Ir(e,Nh,{menuComp:e,itemComp:t})},onDehighlight:(e,t)=>{Ir(e,Vh,{menuComp:e,itemComp:t})},focusManager:e.fakeFocus?gg():mg()});return s===o?{type:"prepared",menu:t.getSystem().build(r())}:{type:"notbuilt",nbMenu:r}})))(t,e.data.primary,e.data.menus),s=r();return n.setContents(e.data.primary,o,e.data.expansions,s),n.getPrimary()})(t).each((o=>{Kp.append(t,ai(o)),e.onOpenMenu(t,o),e.highlightOnOpen===zh.HighlightMenuAndItem?i(t,o):e.highlightOnOpen===zh.HighlightJustMenu&&a(t,o)}))})),Ur(Nh,((t,o)=>{e.onHighlightItem(t,o.event.menuComp,o.event.itemComp)})),Ur(Vh,((t,o)=>{e.onDehighlightItem(t,o.event.menuComp,o.event.itemComp)})),...e.navigateOnHover?[Ur(vh(),((t,o)=>{const r=o.event.item;((e,t)=>{const o=s(t);n.refresh(o).bind((t=>(d(e,t),u(e,n,t))))})(t,r),g(t,r,m.HighlightParent),e.onHover(t,r)}))]:[]]),v=e=>Gm.getHighlighted(e).bind(Gm.getHighlighted),y={collapseMenu:e=>{v(e).each((t=>{p(e,t)}))},highlightPrimary:e=>{n.getPrimary().each((t=>{i(e,t)}))},repositionMenus:t=>{const o=n.getPrimary().bind((e=>v(t).bind((e=>{const t=s(e),o=fe(n.getMenus()),r=we(H(o,Rh));return n.getTriggeringPath(t,(e=>((e,t,o)=>re(t,(e=>{if(!e.getSystem().isConnected())return A.none();const t=Gm.getCandidates(e);return G(t,(e=>s(e)===o))})))(0,r,e)))})).map((t=>({primary:e,triggeringPath:t})))));o.fold((()=>{(e=>A.from(e.components()[0]).filter((e=>"menu"===Ot(e.element,"role"))))(t).each((o=>{e.onRepositionMenu(t,o,[])}))}),(({primary:o,triggeringPath:n})=>{e.onRepositionMenu(t,o,n)}))}};return{uid:e.uid,dom:e.dom,markers:e.markers,behaviours:bu(e.tmenuBehaviours,[Pp.config({mode:"special",onRight:h(((e,t)=>vm(t.element)?A.none():g(e,t,m.HighlightSubmenu))),onLeft:h(((e,t)=>vm(t.element)?A.none():p(e,t))),onEscape:h(((t,o)=>p(t,o).orThunk((()=>e.onEscape(t,o).map((()=>t)))))),focusIn:(e,t)=>{n.getPrimary().each((t=>{Nr(e,t.element,mr())}))}}),Gm.config({highlightClass:e.markers.selectedMenu,itemClass:e.markers.menu}),wm.config({find:e=>Gm.getHighlighted(e)}),Kp.config({})]),eventOrder:e.eventOrder,apis:y,events:f}},extraApis:{tieredData:(e,t,o)=>({primary:e,menus:t,expansions:o}),singleData:(e,t)=>({primary:e,menus:Ms(e,t),expansions:{}}),collapseItem:e=>({value:la(Hh()),meta:{text:e}})}}),Ph=fm({name:"InlineView",configFields:[os("lazySink"),Di("onShow"),Di("onHide"),fs("onEscape"),hu("inlineBehaviours",[Xd,pu,Al]),vs("fireDismissalEventInstead",[ys("event",Cr())]),vs("fireRepositionEventInstead",[ys("event",Or())]),ys("getRelated",A.none),ys("isExtraPart",T),ys("eventOrder",A.none)],factory:(e,t)=>{const o=(t,o,n,s)=>{const r=e.lazySink(t).getOrDie();Xd.openWhileCloaked(t,o,(()=>Sd.positionWithinBounds(r,t,n,s()))),pu.setValue(t,A.some({mode:"position",config:n,getBounds:s}))},n=(t,o,n,s)=>{const r=((e,t,o,n,s)=>{const r=()=>e.lazySink(t),a="horizontal"===n.type?{layouts:{onLtr:()=>fl(),onRtl:()=>bl()}}:{},i=e=>(e=>2===e.length)(e)?a:{};return Lh.sketch({dom:{tag:"div"},data:n.data,markers:n.menu.markers,highlightOnOpen:n.menu.highlightOnOpen,fakeFocus:n.menu.fakeFocus,onEscape:()=>(Xd.close(t),e.onEscape.map((e=>e(t))),A.some(!0)),onExecute:()=>A.some(!0),onOpenMenu:(e,t)=>{Sd.positionWithinBounds(r().getOrDie(),t,o,s())},onOpenSubmenu:(e,t,o,n)=>{const s=r().getOrDie();Sd.position(s,o,{anchor:{type:"submenu",item:t,...i(n)}})},onRepositionMenu:(e,t,n)=>{const a=r().getOrDie();Sd.positionWithinBounds(a,t,o,s()),L(n,(e=>{const t=i(e.triggeringPath);Sd.position(a,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem,...t}})}))}})})(e,t,o,n,s);Xd.open(t,r),pu.setValue(t,A.some({mode:"menu",menu:r}))},s=t=>{Xd.isOpen(t)&&pu.getValue(t).each((o=>{switch(o.mode){case"menu":Xd.getState(t).each(Lh.repositionMenus);break;case"position":const n=e.lazySink(t).getOrDie();Sd.positionWithinBounds(n,t,o.config,o.getBounds())}}))},r={setContent:(e,t)=>{Xd.setContent(e,t)},showAt:(e,t,n)=>{const s=A.none;o(e,t,n,s)},showWithinBounds:o,showMenuAt:(e,t,o)=>{n(e,t,o,A.none)},showMenuWithinBounds:n,hide:e=>{Xd.isOpen(e)&&(pu.setValue(e,A.none()),Xd.close(e))},getContent:e=>Xd.getState(e),reposition:s,isOpen:Xd.isOpen};return{uid:e.uid,dom:e.dom,behaviours:bu(e.inlineBehaviours,[Xd.config({isPartOf:(t,o,n)=>vi(o,n)||((t,o)=>e.getRelated(t).exists((e=>vi(e,o))))(t,n),getAttachPoint:t=>e.lazySink(t).getOrDie(),onOpen:t=>{e.onShow(t)},onClose:t=>{e.onHide(t)}}),pu.config({store:{mode:"memory",initialValue:A.none()}}),Al.config({channels:{...Qd({isExtraPart:t.isExtraPart,...e.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...tu({...e.fireRepositionEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({}),doReposition:s})}})]),eventOrder:e.eventOrder,apis:r}},apis:{showAt:(e,t,o,n)=>{e.showAt(t,o,n)},showWithinBounds:(e,t,o,n,s)=>{e.showWithinBounds(t,o,n,s)},showMenuAt:(e,t,o,n)=>{e.showMenuAt(t,o,n)},showMenuWithinBounds:(e,t,o,n,s)=>{e.showMenuWithinBounds(t,o,n,s)},hide:(e,t)=>{e.hide(t)},isOpen:(e,t)=>e.isOpen(t),getContent:(e,t)=>e.getContent(t),setContent:(e,t,o)=>{e.setContent(t,o)},reposition:(e,t)=>{e.reposition(t)}}});var Uh=tinymce.util.Tools.resolve("tinymce.util.Delay");const Wh=fm({name:"Button",factory:e=>{const t=mh(e.action),o=e.dom.tag,n=t=>be(e.dom,"attributes").bind((e=>be(e,t)));return{uid:e.uid,dom:e.dom,components:e.components,events:t,behaviours:yu(e.buttonBehaviours,[oh.config({}),Pp.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:"button"===o?{type:n("type").getOr("button"),...n("role").map((e=>({role:e}))).getOr({})}:{role:e.role.getOr(n("role").getOr("button"))}},eventOrder:e.eventOrder}},configFields:[ys("uid",void 0),os("dom"),ys("components",[]),vu("buttonBehaviours",[oh,Pp]),us("action"),us("role"),ys("eventOrder",{})]}),jh=e=>{const t=Ie(e),o=it(t),n=(e=>{const t=void 0!==e.dom.attributes?e.dom.attributes:[];return j(t,((e,t)=>"class"===t.name?e:{...e,[t.name]:t.value}),{})})(t),s=(e=>Array.prototype.slice.call(e.dom.classList,0))(t),r=0===o.length?{}:{innerHtml:ea(t)};return{tag:Ue(t),classes:s,attributes:n,...r}},Gh=e=>{const t=(e=>void 0!==e.uid)(e)&&ye(e,"uid")?e.uid:ha("memento");return{get:e=>e.getSystem().getByUid(t).getOrDie(),getOpt:e=>e.getSystem().getByUid(t).toOptional(),asSpec:()=>({...e,uid:t})}};function $h(e){return $h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},$h(e)}function qh(e,t){return qh=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e},qh(e,t)}function Xh(e,t,o){return Xh=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}()?Reflect.construct:function(e,t,o){var n=[null];n.push.apply(n,t);var s=new(Function.bind.apply(e,n));return o&&qh(s,o.prototype),s},Xh.apply(null,arguments)}function Yh(e){return function(e){if(Array.isArray(e))return Kh(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(e){if("string"==typeof e)return Kh(e,t);var o=Object.prototype.toString.call(e).slice(8,-1);return"Object"===o&&e.constructor&&(o=e.constructor.name),"Map"===o||"Set"===o?Array.from(e):"Arguments"===o||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o)?Kh(e,t):void 0}}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Kh(e,t){(null==t||t>e.length)&&(t=e.length);for(var o=0,n=new Array(t);o<t;o++)n[o]=e[o];return n}var Jh=Object.hasOwnProperty,Zh=Object.setPrototypeOf,Qh=Object.isFrozen,ef=Object.getPrototypeOf,tf=Object.getOwnPropertyDescriptor,of=Object.freeze,nf=Object.seal,sf=Object.create,rf="undefined"!=typeof Reflect&&Reflect,af=rf.apply,lf=rf.construct;af||(af=function(e,t,o){return e.apply(t,o)}),of||(of=function(e){return e}),nf||(nf=function(e){return e}),lf||(lf=function(e,t){return Xh(e,Yh(t))});var cf,df=xf(Array.prototype.forEach),uf=xf(Array.prototype.pop),mf=xf(Array.prototype.push),gf=xf(String.prototype.toLowerCase),pf=xf(String.prototype.match),hf=xf(String.prototype.replace),ff=xf(String.prototype.indexOf),bf=xf(String.prototype.trim),vf=xf(RegExp.prototype.test),yf=(cf=TypeError,function(){for(var e=arguments.length,t=new Array(e),o=0;o<e;o++)t[o]=arguments[o];return lf(cf,t)});function xf(e){return function(t){for(var o=arguments.length,n=new Array(o>1?o-1:0),s=1;s<o;s++)n[s-1]=arguments[s];return af(e,t,n)}}function wf(e,t){Zh&&Zh(e,null);for(var o=t.length;o--;){var n=t[o];if("string"==typeof n){var s=gf(n);s!==n&&(Qh(t)||(t[o]=s),n=s)}e[n]=!0}return e}function Sf(e){var t,o=sf(null);for(t in e)af(Jh,e,[t])&&(o[t]=e[t]);return o}function kf(e,t){for(;null!==e;){var o=tf(e,t);if(o){if(o.get)return xf(o.get);if("function"==typeof o.value)return xf(o.value)}e=ef(e)}return function(e){return console.warn("fallback value for",e),null}}var Cf=of(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Of=of(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),_f=of(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),Tf=of(["animate","color-profile","cursor","discard","fedropshadow","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),Ef=of(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover"]),Af=of(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Mf=of(["#text"]),Df=of(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),Bf=of(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Ff=of(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),If=of(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Rf=nf(/\{\{[\w\W]*|[\w\W]*\}\}/gm),Nf=nf(/<%[\w\W]*|[\w\W]*%>/gm),Vf=nf(/^data-[\-\w.\u00B7-\uFFFF]/),zf=nf(/^aria-[\-\w]+$/),Hf=nf(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Lf=nf(/^(?:\w+script|data):/i),Pf=nf(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Uf=nf(/^html$/i),Wf=function(){return"undefined"==typeof window?null:window},jf=function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Wf(),o=function(t){return e(t)};if(o.version="2.3.8",o.removed=[],!t||!t.document||9!==t.document.nodeType)return o.isSupported=!1,o;var n=t.document,s=t.document,r=t.DocumentFragment,a=t.HTMLTemplateElement,i=t.Node,l=t.Element,c=t.NodeFilter,d=t.NamedNodeMap,u=void 0===d?t.NamedNodeMap||t.MozNamedAttrMap:d,m=t.HTMLFormElement,g=t.DOMParser,p=t.trustedTypes,h=l.prototype,f=kf(h,"cloneNode"),b=kf(h,"nextSibling"),v=kf(h,"childNodes"),y=kf(h,"parentNode");if("function"==typeof a){var x=s.createElement("template");x.content&&x.content.ownerDocument&&(s=x.content.ownerDocument)}var w=function(e,t){if("object"!==$h(e)||"function"!=typeof e.createPolicy)return null;var o=null,n="data-tt-policy-suffix";t.currentScript&&t.currentScript.hasAttribute(n)&&(o=t.currentScript.getAttribute(n));var s="dompurify"+(o?"#"+o:"");try{return e.createPolicy(s,{createHTML:function(e){return e}})}catch(e){return console.warn("TrustedTypes policy "+s+" could not be created."),null}}(p,n),S=w?w.createHTML(""):"",k=s,C=k.implementation,O=k.createNodeIterator,_=k.createDocumentFragment,T=k.getElementsByTagName,E=n.importNode,A={};try{A=Sf(s).documentMode?s.documentMode:{}}catch(e){}var M={};o.isSupported="function"==typeof y&&C&&void 0!==C.createHTMLDocument&&9!==A;var D,B,F=Rf,I=Nf,R=Vf,N=zf,V=Lf,z=Pf,H=Hf,L=null,P=wf({},[].concat(Yh(Cf),Yh(Of),Yh(_f),Yh(Ef),Yh(Mf))),U=null,W=wf({},[].concat(Yh(Df),Yh(Bf),Yh(Ff),Yh(If))),j=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),G=null,$=null,q=!0,X=!0,Y=!1,K=!1,J=!1,Z=!1,Q=!1,ee=!1,te=!1,oe=!1,ne=!0,se=!0,re=!1,ae={},ie=null,le=wf({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),ce=null,de=wf({},["audio","video","img","source","image","track"]),ue=null,me=wf({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ge="http://www.w3.org/1998/Math/MathML",pe="http://www.w3.org/2000/svg",he="http://www.w3.org/1999/xhtml",fe=he,be=!1,ve=["application/xhtml+xml","text/html"],ye=null,xe=s.createElement("form"),we=function(e){return e instanceof RegExp||e instanceof Function},Se=function(e){ye&&ye===e||(e&&"object"===$h(e)||(e={}),e=Sf(e),L="ALLOWED_TAGS"in e?wf({},e.ALLOWED_TAGS):P,U="ALLOWED_ATTR"in e?wf({},e.ALLOWED_ATTR):W,ue="ADD_URI_SAFE_ATTR"in e?wf(Sf(me),e.ADD_URI_SAFE_ATTR):me,ce="ADD_DATA_URI_TAGS"in e?wf(Sf(de),e.ADD_DATA_URI_TAGS):de,ie="FORBID_CONTENTS"in e?wf({},e.FORBID_CONTENTS):le,G="FORBID_TAGS"in e?wf({},e.FORBID_TAGS):{},$="FORBID_ATTR"in e?wf({},e.FORBID_ATTR):{},ae="USE_PROFILES"in e&&e.USE_PROFILES,q=!1!==e.ALLOW_ARIA_ATTR,X=!1!==e.ALLOW_DATA_ATTR,Y=e.ALLOW_UNKNOWN_PROTOCOLS||!1,K=e.SAFE_FOR_TEMPLATES||!1,J=e.WHOLE_DOCUMENT||!1,ee=e.RETURN_DOM||!1,te=e.RETURN_DOM_FRAGMENT||!1,oe=e.RETURN_TRUSTED_TYPE||!1,Q=e.FORCE_BODY||!1,ne=!1!==e.SANITIZE_DOM,se=!1!==e.KEEP_CONTENT,re=e.IN_PLACE||!1,H=e.ALLOWED_URI_REGEXP||H,fe=e.NAMESPACE||he,e.CUSTOM_ELEMENT_HANDLING&&we(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(j.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&we(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(j.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(j.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),D=D=-1===ve.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,B="application/xhtml+xml"===D?function(e){return e}:gf,K&&(X=!1),te&&(ee=!0),ae&&(L=wf({},Yh(Mf)),U=[],!0===ae.html&&(wf(L,Cf),wf(U,Df)),!0===ae.svg&&(wf(L,Of),wf(U,Bf),wf(U,If)),!0===ae.svgFilters&&(wf(L,_f),wf(U,Bf),wf(U,If)),!0===ae.mathMl&&(wf(L,Ef),wf(U,Ff),wf(U,If))),e.ADD_TAGS&&(L===P&&(L=Sf(L)),wf(L,e.ADD_TAGS)),e.ADD_ATTR&&(U===W&&(U=Sf(U)),wf(U,e.ADD_ATTR)),e.ADD_URI_SAFE_ATTR&&wf(ue,e.ADD_URI_SAFE_ATTR),e.FORBID_CONTENTS&&(ie===le&&(ie=Sf(ie)),wf(ie,e.FORBID_CONTENTS)),se&&(L["#text"]=!0),J&&wf(L,["html","head","body"]),L.table&&(wf(L,["tbody"]),delete G.tbody),of&&of(e),ye=e)},ke=wf({},["mi","mo","mn","ms","mtext"]),Ce=wf({},["foreignobject","desc","title","annotation-xml"]),Oe=wf({},["title","style","font","a","script"]),_e=wf({},Of);wf(_e,_f),wf(_e,Tf);var Te=wf({},Ef);wf(Te,Af);var Ee=function(e){mf(o.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){try{e.outerHTML=S}catch(t){e.remove()}}},Ae=function(e,t){try{mf(o.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){mf(o.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!U[e])if(ee||te)try{Ee(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Me=function(e){var t,o;if(Q)e="<remove></remove>"+e;else{var n=pf(e,/^[\r\n\t ]+/);o=n&&n[0]}"application/xhtml+xml"===D&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");var r=w?w.createHTML(e):e;if(fe===he)try{t=(new g).parseFromString(r,D)}catch(e){}if(!t||!t.documentElement){t=C.createDocument(fe,"template",null);try{t.documentElement.innerHTML=be?"":r}catch(e){}}var a=t.body||t.documentElement;return e&&o&&a.insertBefore(s.createTextNode(o),a.childNodes[0]||null),fe===he?T.call(t,J?"html":"body")[0]:J?t.documentElement:a},De=function(e){return O.call(e.ownerDocument||e,e,c.SHOW_ELEMENT|c.SHOW_COMMENT|c.SHOW_TEXT,null,!1)},Be=function(e){return"object"===$h(i)?e instanceof i:e&&"object"===$h(e)&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Fe=function(e,t,n){M[e]&&df(M[e],(function(e){e.call(o,t,n,ye)}))},Ie=function(e){var t,n;if(Fe("beforeSanitizeElements",e,null),(n=e)instanceof m&&("string"!=typeof n.nodeName||"string"!=typeof n.textContent||"function"!=typeof n.removeChild||!(n.attributes instanceof u)||"function"!=typeof n.removeAttribute||"function"!=typeof n.setAttribute||"string"!=typeof n.namespaceURI||"function"!=typeof n.insertBefore))return Ee(e),!0;if(vf(/[\u0080-\uFFFF]/,e.nodeName))return Ee(e),!0;var s=B(e.nodeName);if(Fe("uponSanitizeElement",e,{tagName:s,allowedTags:L}),e.hasChildNodes()&&!Be(e.firstElementChild)&&(!Be(e.content)||!Be(e.content.firstElementChild))&&vf(/<[/\w]/g,e.innerHTML)&&vf(/<[/\w]/g,e.textContent))return Ee(e),!0;if("select"===s&&vf(/<template/i,e.innerHTML))return Ee(e),!0;if(!L[s]||G[s]){if(!G[s]&&Ne(s)){if(j.tagNameCheck instanceof RegExp&&vf(j.tagNameCheck,s))return!1;if(j.tagNameCheck instanceof Function&&j.tagNameCheck(s))return!1}if(se&&!ie[s]){var r=y(e)||e.parentNode,a=v(e)||e.childNodes;if(a&&r)for(var i=a.length-1;i>=0;--i)r.insertBefore(f(a[i],!0),b(e))}return Ee(e),!0}return e instanceof l&&!function(e){var t=y(e);t&&t.tagName||(t={namespaceURI:he,tagName:"template"});var o=gf(e.tagName),n=gf(t.tagName);return e.namespaceURI===pe?t.namespaceURI===he?"svg"===o:t.namespaceURI===ge?"svg"===o&&("annotation-xml"===n||ke[n]):Boolean(_e[o]):e.namespaceURI===ge?t.namespaceURI===he?"math"===o:t.namespaceURI===pe?"math"===o&&Ce[n]:Boolean(Te[o]):e.namespaceURI===he&&!(t.namespaceURI===pe&&!Ce[n])&&!(t.namespaceURI===ge&&!ke[n])&&!Te[o]&&(Oe[o]||!_e[o])}(e)?(Ee(e),!0):"noscript"!==s&&"noembed"!==s||!vf(/<\/no(script|embed)/i,e.innerHTML)?(K&&3===e.nodeType&&(t=e.textContent,t=hf(t,F," "),t=hf(t,I," "),e.textContent!==t&&(mf(o.removed,{element:e.cloneNode()}),e.textContent=t)),Fe("afterSanitizeElements",e,null),!1):(Ee(e),!0)},Re=function(e,t,o){if(ne&&("id"===t||"name"===t)&&(o in s||o in xe))return!1;if(X&&!$[t]&&vf(R,t));else if(q&&vf(N,t));else if(!U[t]||$[t]){if(!(Ne(e)&&(j.tagNameCheck instanceof RegExp&&vf(j.tagNameCheck,e)||j.tagNameCheck instanceof Function&&j.tagNameCheck(e))&&(j.attributeNameCheck instanceof RegExp&&vf(j.attributeNameCheck,t)||j.attributeNameCheck instanceof Function&&j.attributeNameCheck(t))||"is"===t&&j.allowCustomizedBuiltInElements&&(j.tagNameCheck instanceof RegExp&&vf(j.tagNameCheck,o)||j.tagNameCheck instanceof Function&&j.tagNameCheck(o))))return!1}else if(ue[t]);else if(vf(H,hf(o,z,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==ff(o,"data:")||!ce[e])if(Y&&!vf(V,hf(o,z,"")));else if(o)return!1;return!0},Ne=function(e){return e.indexOf("-")>0},Ve=function(e){var t,o,n,s;Fe("beforeSanitizeAttributes",e,null);var r=e.attributes;if(r){var a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:U};for(s=r.length;s--;){var i=t=r[s],l=i.name,c=i.namespaceURI;o="value"===l?t.value:bf(t.value),n=B(l);var d=o;if(a.attrName=n,a.attrValue=o,a.keepAttr=!0,a.forceKeepAttr=void 0,Fe("uponSanitizeAttribute",e,a),o=a.attrValue,!a.forceKeepAttr)if(a.keepAttr)if(vf(/\/>/i,o))Ae(l,e);else{K&&(o=hf(o,F," "),o=hf(o,I," "));var u=B(e.nodeName);if(Re(u,n,o)){if(o!==d)try{c?e.setAttributeNS(c,l,o):e.setAttribute(l,o)}catch(t){Ae(l,e)}}else Ae(l,e)}else Ae(l,e)}Fe("afterSanitizeAttributes",e,null)}},ze=function e(t){var o,n=De(t);for(Fe("beforeSanitizeShadowDOM",t,null);o=n.nextNode();)Fe("uponSanitizeShadowNode",o,null),Ie(o)||(o.content instanceof r&&e(o.content),Ve(o));Fe("afterSanitizeShadowDOM",t,null)};return o.sanitize=function(e,s){var a,l,c,d,u;if((be=!e)&&(e="\x3c!--\x3e"),"string"!=typeof e&&!Be(e)){if("function"!=typeof e.toString)throw yf("toString is not a function");if("string"!=typeof(e=e.toString()))throw yf("dirty is not a string, aborting")}if(!o.isSupported){if("object"===$h(t.toStaticHTML)||"function"==typeof t.toStaticHTML){if("string"==typeof e)return t.toStaticHTML(e);if(Be(e))return t.toStaticHTML(e.outerHTML)}return e}if(Z||Se(s),o.removed=[],"string"==typeof e&&(re=!1),re){if(e.nodeName){var m=B(e.nodeName);if(!L[m]||G[m])throw yf("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof i)1===(l=(a=Me("\x3c!----\x3e")).ownerDocument.importNode(e,!0)).nodeType&&"BODY"===l.nodeName||"HTML"===l.nodeName?a=l:a.appendChild(l);else{if(!ee&&!K&&!J&&-1===e.indexOf("<"))return w&&oe?w.createHTML(e):e;if(!(a=Me(e)))return ee?null:oe?S:""}a&&Q&&Ee(a.firstChild);for(var g=De(re?e:a);c=g.nextNode();)3===c.nodeType&&c===d||Ie(c)||(c.content instanceof r&&ze(c.content),Ve(c),d=c);if(d=null,re)return e;if(ee){if(te)for(u=_.call(a.ownerDocument);a.firstChild;)u.appendChild(a.firstChild);else u=a;return U.shadowroot&&(u=E.call(n,u,!0)),u}var p=J?a.outerHTML:a.innerHTML;return J&&L["!doctype"]&&a.ownerDocument&&a.ownerDocument.doctype&&a.ownerDocument.doctype.name&&vf(Uf,a.ownerDocument.doctype.name)&&(p="<!DOCTYPE "+a.ownerDocument.doctype.name+">\n"+p),K&&(p=hf(p,F," "),p=hf(p,I," ")),w&&oe?w.createHTML(p):p},o.setConfig=function(e){Se(e),Z=!0},o.clearConfig=function(){ye=null,Z=!1},o.isValidAttribute=function(e,t,o){ye||Se({});var n=B(e),s=B(t);return Re(n,s,o)},o.addHook=function(e,t){"function"==typeof t&&(M[e]=M[e]||[],mf(M[e],t))},o.removeHook=function(e){if(M[e])return uf(M[e])},o.removeHooks=function(e){M[e]&&(M[e]=[])},o.removeAllHooks=function(){M={}},o}();const Gf=e=>jf().sanitize(e);var $f=tinymce.util.Tools.resolve("tinymce.util.I18n");const qf={indent:!0,outdent:!0,"table-insert-column-after":!0,"table-insert-column-before":!0,"paste-column-after":!0,"paste-column-before":!0,"unordered-list":!0,"list-bull-circle":!0,"list-bull-default":!0,"list-bull-square":!0},Xf="temporary-placeholder",Yf=e=>()=>be(e,Xf).getOr("!not found!"),Kf=(e,t)=>{const o=e.toLowerCase();if($f.isRtl()){const e=((e,t)=>Ae(e,t)?e:((e,t)=>e+t)(e,t))(o,"-rtl");return ve(t,e)?e:o}return o},Jf=(e,t)=>be(t,Kf(e,t)),Zf=(e,t)=>{const o=t();return Jf(e,o).getOrThunk(Yf(o))},Qf=()=>Jp("add-focusable",[Kr((e=>{gi(e.element,"svg").each((e=>kt(e,"focusable","false")))}))]),eb=(e,t,o,n)=>{var s,r;const a=(e=>!!$f.isRtl()&&ve(qf,e))(t)?["tox-icon--flip"]:[],i=be(o,Kf(t,o)).or(n).getOrThunk(Yf(o));return{dom:{tag:e.tag,attributes:null!==(s=e.attributes)&&void 0!==s?s:{},classes:e.classes.concat(a),innerHtml:i},behaviours:kl([...null!==(r=e.behaviours)&&void 0!==r?r:[],Qf()])}},tb=(e,t,o,n=A.none())=>eb(t,e,o(),n),ob={success:"checkmark",error:"warning",err:"error",warning:"warning",warn:"warning",info:"info"},nb=fm({name:"Notification",factory:e=>{const t=Gh({dom:jh(`<p>${Gf(e.translationProvider(e.text))}</p>`),behaviours:kl([Kp.config({})])}),o=e=>({dom:{tag:"div",classes:["tox-bar"],styles:{width:`${e}%`}}}),n=e=>({dom:{tag:"div",classes:["tox-text"],innerHtml:`${e}%`}}),s=Gh({dom:{tag:"div",classes:e.progress?["tox-progress-bar","tox-progress-indicator"]:["tox-progress-bar"]},components:[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(0)]},n(0)],behaviours:kl([Kp.config({})])}),r={updateProgress:(e,t)=>{e.getSystem().isConnected()&&s.getOpt(e).each((e=>{Kp.set(e,[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(t)]},n(t)])}))},updateText:(e,o)=>{if(e.getSystem().isConnected()){const n=t.get(e);Kp.set(n,[ti(o)])}}},a=q([e.icon.toArray(),e.level.toArray(),e.level.bind((e=>A.from(ob[e]))).toArray()]),i=Gh(Wh.sketch({dom:{tag:"button",classes:["tox-notification__dismiss","tox-button","tox-button--naked","tox-button--icon"]},components:[tb("close",{tag:"span",classes:["tox-icon"],attributes:{"aria-label":e.translationProvider("Close")}},e.iconProvider)],action:t=>{e.onAction(t)}})),l=((e,t,o)=>{const n=o(),s=G(e,(e=>ve(n,Kf(e,n))));return eb({tag:"div",classes:["tox-notification__icon"]},s.getOr(Xf),n,A.none())})(a,0,e.iconProvider),c=[l,{dom:{tag:"div",classes:["tox-notification__body"]},components:[t.asSpec()],behaviours:kl([Kp.config({})])}];return{uid:e.uid,dom:{tag:"div",attributes:{role:"alert"},classes:e.level.map((e=>["tox-notification","tox-notification--in",`tox-notification--${e}`])).getOr(["tox-notification","tox-notification--in"])},behaviours:kl([oh.config({}),Jp("notification-events",[Ur(Xs(),(e=>{i.getOpt(e).each(oh.focus)}))])]),components:c.concat(e.progress?[s.asSpec()]:[]).concat(e.closeButton?[i.asSpec()]:[]),apis:r}},configFields:[us("level"),os("progress"),us("icon"),os("onAction"),os("text"),os("iconProvider"),os("translationProvider"),Cs("closeButton",!0)],apis:{updateProgress:(e,t,o)=>{e.updateProgress(t,o)},updateText:(e,t,o)=>{e.updateText(t,o)}}});var sb,rb,ab=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),ib=tinymce.util.Tools.resolve("tinymce.EditorManager"),lb=tinymce.util.Tools.resolve("tinymce.Env");!function(e){e.default="wrap",e.floating="floating",e.sliding="sliding",e.scrolling="scrolling"}(sb||(sb={})),function(e){e.auto="auto",e.top="top",e.bottom="bottom"}(rb||(rb={}));const cb=e=>t=>t.options.get(e),db=e=>t=>A.from(e(t)),ub=e=>{const t=lb.deviceType.isPhone(),o=lb.deviceType.isTablet()||t,n=e.options.register,s=e=>r(e)||!1===e,a=e=>r(e)||h(e);n("skin",{processor:e=>r(e)||!1===e,default:"oxide"}),n("skin_url",{processor:"string"}),n("height",{processor:a,default:Math.max(e.getElement().offsetHeight,400)}),n("width",{processor:a,default:ab.DOM.getStyle(e.getElement(),"width")}),n("min_height",{processor:"number",default:100}),n("min_width",{processor:"number"}),n("max_height",{processor:"number"}),n("max_width",{processor:"number"}),n("style_formats",{processor:"object[]"}),n("style_formats_merge",{processor:"boolean",default:!1}),n("style_formats_autohide",{processor:"boolean",default:!1}),n("line_height_formats",{processor:"string",default:"1 1.1 1.2 1.3 1.4 1.5 2"}),n("font_family_formats",{processor:"string",default:"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"}),n("font_size_formats",{processor:"string",default:"8pt 10pt 12pt 14pt 18pt 24pt 36pt"}),n("font_size_input_default_unit",{processor:"string",default:"pt"}),n("block_formats",{processor:"string",default:"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre"}),n("content_langs",{processor:"object[]"}),n("removed_menuitems",{processor:"string",default:""}),n("menubar",{processor:e=>r(e)||d(e),default:!t}),n("menu",{processor:"object",default:{}}),n("toolbar",{processor:e=>d(e)||r(e)||l(e)?{value:e,valid:!0}:{valid:!1,message:"Must be a boolean, string or array."},default:!0}),V(9,(e=>{n("toolbar"+(e+1),{processor:"string"})})),n("toolbar_mode",{processor:"string",default:o?"scrolling":"floating"}),n("toolbar_groups",{processor:"object",default:{}}),n("toolbar_location",{processor:"string",default:rb.auto}),n("toolbar_persist",{processor:"boolean",default:!1}),n("toolbar_sticky",{processor:"boolean",default:e.inline}),n("toolbar_sticky_offset",{processor:"number",default:0}),n("fixed_toolbar_container",{processor:"string",default:""}),n("fixed_toolbar_container_target",{processor:"object"}),n("ui_mode",{processor:"string",default:"combined"}),n("file_picker_callback",{processor:"function"}),n("file_picker_validator_handler",{processor:"function"}),n("file_picker_types",{processor:"string"}),n("typeahead_urls",{processor:"boolean",default:!0}),n("anchor_top",{processor:s,default:"#top"}),n("anchor_bottom",{processor:s,default:"#bottom"}),n("draggable_modal",{processor:"boolean",default:!1}),n("statusbar",{processor:"boolean",default:!0}),n("elementpath",{processor:"boolean",default:!0}),n("branding",{processor:"boolean",default:!0}),n("promotion",{processor:"boolean",default:!0}),n("resize",{processor:e=>"both"===e||d(e),default:!lb.deviceType.isTouch()}),n("sidebar_show",{processor:"string"}),n("help_accessibility",{processor:"boolean",default:e.hasPlugin("help")})},mb=cb("readonly"),gb=cb("height"),pb=cb("width"),hb=db(cb("min_width")),fb=db(cb("min_height")),bb=db(cb("max_width")),vb=db(cb("max_height")),yb=db(cb("style_formats")),xb=cb("style_formats_merge"),wb=cb("style_formats_autohide"),Sb=cb("content_langs"),kb=cb("removed_menuitems"),Cb=cb("toolbar_mode"),Ob=cb("toolbar_groups"),_b=cb("toolbar_location"),Tb=cb("fixed_toolbar_container"),Eb=cb("fixed_toolbar_container_target"),Ab=cb("toolbar_persist"),Mb=cb("toolbar_sticky_offset"),Db=cb("menubar"),Bb=cb("toolbar"),Fb=cb("file_picker_callback"),Ib=cb("file_picker_validator_handler"),Rb=cb("font_size_input_default_unit"),Nb=cb("file_picker_types"),Vb=cb("typeahead_urls"),zb=cb("anchor_top"),Hb=cb("anchor_bottom"),Lb=cb("draggable_modal"),Pb=cb("statusbar"),Ub=cb("elementpath"),Wb=cb("branding"),jb=cb("resize"),Gb=cb("paste_as_text"),$b=cb("sidebar_show"),qb=cb("promotion"),Xb=cb("help_accessibility"),Yb=e=>!1===e.options.get("skin"),Kb=e=>!1!==e.options.get("menubar"),Jb=e=>{const t=e.options.get("skin_url");if(Yb(e))return t;if(t)return e.documentBaseURI.toAbsolute(t);{const t=e.options.get("skin");return ib.baseURL+"/skins/ui/"+t}},Zb=e=>e.options.get("line_height_formats").split(" "),Qb=e=>{const t=Bb(e),o=r(t),n=l(t)&&t.length>0;return!tv(e)&&(n||o||!0===t)},ev=e=>{const t=V(9,(t=>e.options.get("toolbar"+(t+1)))),o=U(t,r);return Ce(o.length>0,o)},tv=e=>ev(e).fold((()=>{const t=Bb(e);return f(t,r)&&t.length>0}),E),ov=e=>_b(e)===rb.bottom,nv=e=>{var t;if(!e.inline)return A.none();const o=null!==(t=Tb(e))&&void 0!==t?t:"";if(o.length>0)return pi(xt(),o);const n=Eb(e);return g(n)?A.some(Ve(n)):A.none()},sv=e=>e.inline&&nv(e).isSome(),rv=e=>nv(e).getOrThunk((()=>ft(ht(Ve(e.getElement()))))),av=e=>e.inline&&!Kb(e)&&!Qb(e)&&!tv(e),iv=e=>(e.options.get("toolbar_sticky")||e.inline)&&!sv(e)&&!av(e),lv=e=>!sv(e)&&"split"===e.options.get("ui_mode"),cv=e=>{const t=e.options.get("menu");return ce(t,(e=>({...e,items:e.items})))};var dv=Object.freeze({__proto__:null,get ToolbarMode(){return sb},get ToolbarLocation(){return rb},register:ub,getSkinUrl:Jb,isReadOnly:mb,isSkinDisabled:Yb,getHeightOption:gb,getWidthOption:pb,getMinWidthOption:hb,getMinHeightOption:fb,getMaxWidthOption:bb,getMaxHeightOption:vb,getUserStyleFormats:yb,shouldMergeStyleFormats:xb,shouldAutoHideStyleFormats:wb,getLineHeightFormats:Zb,getContentLanguages:Sb,getRemovedMenuItems:kb,isMenubarEnabled:Kb,isMultipleToolbars:tv,isToolbarEnabled:Qb,isToolbarPersist:Ab,getMultipleToolbarsOption:ev,getUiContainer:rv,useFixedContainer:sv,isSplitUiMode:lv,getToolbarMode:Cb,isDraggableModal:Lb,isDistractionFree:av,isStickyToolbar:iv,getStickyToolbarOffset:Mb,getToolbarLocation:_b,isToolbarLocationBottom:ov,getToolbarGroups:Ob,getMenus:cv,getMenubar:Db,getToolbar:Bb,getFilePickerCallback:Fb,getFilePickerTypes:Nb,useTypeaheadUrls:Vb,getAnchorTop:zb,getAnchorBottom:Hb,getFilePickerValidatorHandler:Ib,getFontSizeInputDefaultUnit:Rb,useStatusBar:Pb,useElementPath:Ub,promotionEnabled:qb,useBranding:Wb,getResize:jb,getPasteAsText:Gb,getSidebarShow:$b,useHelpAccessibility:Xb});const uv="[data-mce-autocompleter]",mv=e=>hi(e,uv);var gv;!function(e){e[e.CLOSE_ON_EXECUTE=0]="CLOSE_ON_EXECUTE",e[e.BUBBLE_TO_SANDBOX=1]="BUBBLE_TO_SANDBOX"}(gv||(gv={}));var pv=gv;const hv="tox-menu-nav__js",fv="tox-collection__item",bv="tox-swatch",vv={normal:hv,color:bv},yv="tox-collection__item--enabled",xv="tox-collection__item-icon",wv="tox-collection__item-label",Sv="tox-collection__item-caret",kv="tox-collection__item--active",Cv="tox-collection__item-container",Ov="tox-collection__item-container--row",_v=e=>be(vv,e).getOr(hv),Tv=e=>"color"===e?"tox-swatches":"tox-menu",Ev=e=>({backgroundMenu:"tox-background-menu",selectedMenu:"tox-selected-menu",selectedItem:"tox-collection__item--active",hasIcons:"tox-menu--has-icons",menu:Tv(e),tieredMenu:"tox-tiered-menu"}),Av=e=>{const t=Ev(e);return{backgroundMenu:t.backgroundMenu,selectedMenu:t.selectedMenu,menu:t.menu,selectedItem:t.selectedItem,item:_v(e)}},Mv=(e,t,o)=>{const n=Ev(o);return{tag:"div",classes:q([[n.menu,`tox-menu-${t}-column`],e?[n.hasIcons]:[]])}},Dv=[Dh.parts.items({})],Bv=(e,t,o)=>{const n=Ev(o);return{dom:{tag:"div",classes:q([[n.tieredMenu]])},markers:Av(o)}},Fv=x([us("data"),ys("inputAttributes",{}),ys("inputStyles",{}),ys("tag","input"),ys("inputClasses",[]),Di("onSetValue"),ys("styles",{}),ys("eventOrder",{}),hu("inputBehaviours",[pu,oh]),ys("selectOnFocus",!0)]),Iv=e=>kl([oh.config({onFocus:e.selectOnFocus?e=>{const t=e.element,o=$a(t);t.dom.setSelectionRange(0,o.length)}:b})]),Rv=e=>({...Iv(e),...bu(e.inputBehaviours,[pu.config({store:{mode:"manual",...e.data.map((e=>({initialValue:e}))).getOr({}),getValue:e=>$a(e.element),setValue:(e,t)=>{$a(e.element)!==t&&qa(e.element,t)}},onSetValue:e.onSetValue})])}),Nv=e=>({tag:e.tag,attributes:{type:"text",...e.inputAttributes},styles:e.inputStyles,classes:e.inputClasses}),Vv=fm({name:"Input",configFields:Fv(),factory:(e,t)=>({uid:e.uid,dom:Nv(e),components:[],behaviours:Rv(e),eventOrder:e.eventOrder})}),zv=la("refetch-trigger-event"),Hv=la("redirect-menu-item-interaction"),Lv="tox-menu__searcher",Pv=e=>pi(e.element,`.${Lv}`).bind((t=>e.getSystem().getByDom(t).toOptional())),Uv=Pv,Wv=e=>({fetchPattern:pu.getValue(e),selectionStart:e.element.dom.selectionStart,selectionEnd:e.element.dom.selectionEnd}),jv=e=>{const t=(e,t)=>(t.cut(),A.none()),o=(e,t)=>{const o={interactionEvent:t.event,eventType:t.event.raw.type};return Ir(e,Hv,o),A.some(!0)},n="searcher-events";return{dom:{tag:"div",classes:[fv]},components:[Vv.sketch({inputClasses:[Lv,"tox-textfield"],inputAttributes:{...e.placeholder.map((t=>({placeholder:e.i18n(t)}))).getOr({}),type:"search","aria-autocomplete":"list"},inputBehaviours:kl([Jp(n,[Ur(Zs(),(e=>{Fr(e,zv)})),Ur(Ks(),((e,t)=>{"Escape"===t.event.raw.key&&t.stop()}))]),Pp.config({mode:"special",onLeft:t,onRight:t,onSpace:t,onEnter:o,onEscape:o,onUp:o,onDown:o})]),eventOrder:{keydown:[n,Pp.name()]}})]}},Gv="tox-collection--results__js",$v=e=>{var t;return e.dom?{...e,dom:{...e.dom,attributes:{...null!==(t=e.dom.attributes)&&void 0!==t?t:{},id:la("aria-item-search-result-id"),"aria-selected":"false"}}}:e},qv=(e,t)=>o=>{const n=z(o,t);return H(n,(t=>({dom:e,components:t})))},Xv=(e,t)=>{const o=[];let n=[];return L(e,((e,s)=>{t(e,s)?(n.length>0&&o.push(n),n=[],(ve(e.dom,"innerHtml")||e.components&&e.components.length>0)&&n.push(e)):n.push(e)})),n.length>0&&o.push(n),H(o,(e=>({dom:{tag:"div",classes:["tox-collection__group"]},components:e})))},Yv=(e,t,o)=>Dh.parts.items({preprocess:n=>{const s=H(n,o);return"auto"!==e&&e>1?qv({tag:"div",classes:["tox-collection__group"]},e)(s):Xv(s,((e,o)=>"separator"===t[o].type))}}),Kv=(e,t,o=!0)=>({dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[Yv(e,t,w)]}),Jv=e=>N(e,(e=>"icon"in e&&void 0!==e.icon)),Zv=e=>(console.error(Kn(e)),console.log(e),A.none()),Qv=(e,t,o,n,s)=>{const r=(a=o,{dom:{tag:"div",classes:["tox-collection","tox-collection--horizontal"]},components:[Dh.parts.items({preprocess:e=>Xv(e,((e,t)=>"separator"===a[t].type))})]});var a;return{value:e,dom:r.dom,components:r.components,items:o}},ey=(e,t,o,n,s)=>{if("color"===s.menuType){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-swatches-menu"]},components:[{dom:{tag:"div",classes:["tox-swatches"]},components:[Dh.parts.items({preprocess:"auto"!==e?qv({tag:"div",classes:["tox-swatches__row"]},e):w})]}]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType&&"auto"===n){const t=Kv(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType||"searchable"===s.menuType){const t="searchable"!==s.menuType?Kv(n,o):"search-with-field"===s.searchMode.searchMode?((e,t,o)=>{const n=la("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[jv({i18n:$f.translate,placeholder:o.placeholder}),{dom:{tag:"div",classes:[...1===e?["tox-collection--list"]:["tox-collection--grid"],Gv],attributes:{id:n}},components:[Yv(e,t,$v)]}]}})(n,o,s.searchMode):((e,t,o=!0)=>{const n=la("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection",Gv].concat(1===e?["tox-collection--list"]:["tox-collection--grid"]),attributes:{id:n}},components:[Yv(e,t,$v)]}})(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("listpreview"===s.menuType&&"auto"!==n){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-collection","tox-collection--toolbar","tox-collection--toolbar-lg"]},components:[Dh.parts.items({preprocess:qv({tag:"div",classes:["tox-collection__group"]},e)})]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}return{value:e,dom:Mv(t,n,s.menuType),components:Dv,items:o}},ty=rs("type"),oy=rs("name"),ny=rs("label"),sy=rs("text"),ry=rs("title"),ay=rs("icon"),iy=rs("value"),ly=is("fetch"),cy=is("getSubmenuItems"),dy=is("onAction"),uy=is("onItemAction"),my=Os("onSetup",(()=>b)),gy=ps("name"),py=ps("text"),hy=ps("icon"),fy=ps("tooltip"),by=ps("label"),vy=ps("shortcut"),yy=fs("select"),xy=Cs("active",!1),wy=Cs("borderless",!1),Sy=Cs("enabled",!0),ky=Cs("primary",!1),Cy=e=>ys("columns",e),Oy=ys("meta",{}),_y=Os("onAction",b),Ty=e=>Ss("type",e),Ey=e=>Qn("name","name",vn((()=>la(`${e}-name`))),Hn),Ay=Dn([ty,py]),My=Dn([Ty("autocompleteitem"),xy,Sy,Oy,iy,py,hy]),Dy=[Sy,fy,hy,py,my],By=Dn([ty,dy].concat(Dy)),Fy=e=>qn("toolbarbutton",By,e),Iy=[xy].concat(Dy),Ry=Dn(Iy.concat([ty,dy])),Ny=e=>qn("ToggleButton",Ry,e),Vy=[Os("predicate",T),ks("scope","node",["node","editor"]),ks("position","selection",["node","selection","line"])],zy=Dy.concat([Ty("contextformbutton"),ky,dy,es("original",w)]),Hy=Iy.concat([Ty("contextformbutton"),ky,dy,es("original",w)]),Ly=Dy.concat([Ty("contextformbutton")]),Py=Iy.concat([Ty("contextformtogglebutton")]),Uy=Jn("type",{contextformbutton:zy,contextformtogglebutton:Hy}),Wy=Dn([Ty("contextform"),Os("initValue",x("")),by,ds("commands",Uy),ms("launch",Jn("type",{contextformbutton:Ly,contextformtogglebutton:Py}))].concat(Vy)),jy=Dn([Ty("contexttoolbar"),rs("items")].concat(Vy)),Gy=[ty,rs("src"),ps("alt"),_s("classes",[],Hn)],$y=Dn(Gy),qy=[ty,sy,gy,_s("classes",["tox-collection__item-label"],Hn)],Xy=Dn(qy),Yy=En((()=>jn("type",{cardimage:$y,cardtext:Xy,cardcontainer:Ky}))),Ky=Dn([ty,Ss("direction","horizontal"),Ss("align","left"),Ss("valign","middle"),ds("items",Yy)]),Jy=[Sy,py,vy,("menuitem",Qn("value","value",vn((()=>la("menuitem-value"))),Nn())),Oy];const Zy=Dn([ty,by,ds("items",Yy),my,_y].concat(Jy)),Qy=Dn([ty,xy,hy].concat(Jy)),ex=[ty,rs("fancytype"),_y],tx=[ys("initData",{})].concat(ex),ox=[fs("select"),Ts("initData",{},[Cs("allowCustomColors",!0),Ss("storageKey","default"),bs("colors",Nn())])].concat(ex),nx=Jn("fancytype",{inserttable:tx,colorswatch:ox}),sx=Dn([ty,my,_y,hy].concat(Jy)),rx=Dn([ty,cy,my,hy].concat(Jy)),ax=Dn([ty,hy,xy,my,dy].concat(Jy)),ix=(e,t,o)=>{const n=Xc(e.element,"."+o);if(n.length>0){const e=$(n,(e=>{const o=e.dom.getBoundingClientRect().top,s=n[0].dom.getBoundingClientRect().top;return Math.abs(o-s)>t})).getOr(n.length);return A.some({numColumns:e,numRows:Math.ceil(n.length/e)})}return A.none()},lx=e=>((e,t)=>kl([Jp(e,t)]))(la("unnamed-events"),e),cx=la("tooltip.exclusive"),dx=la("tooltip.show"),ux=la("tooltip.hide"),mx=(e,t,o)=>{e.getSystem().broadcastOn([cx],{})};var gx=Object.freeze({__proto__:null,hideAllExclusive:mx,setComponents:(e,t,o,n)=>{o.getTooltip().each((e=>{e.getSystem().isConnected()&&Kp.set(e,n)}))}}),px=Object.freeze({__proto__:null,events:(e,t)=>{const o=o=>{t.getTooltip().each((n=>{Bd(n),e.onHide(o,n),t.clearTooltip()})),t.clearTimer()};return Hr(q([[Ur(dx,(o=>{t.resetTimer((()=>{(o=>{if(!t.isShowing()){mx(o);const n=e.lazySink(o).getOrDie(),s=o.getSystem().build({dom:e.tooltipDom,components:e.tooltipComponents,events:Hr("normal"===e.mode?[Ur(qs(),(e=>{Fr(o,dx)})),Ur(Gs(),(e=>{Fr(o,ux)}))]:[]),behaviours:kl([Kp.config({})])});t.setTooltip(s),Ad(n,s),e.onShow(o,s),Sd.position(n,s,{anchor:e.anchor(o)})}})(o)}),e.delay)})),Ur(ux,(n=>{t.resetTimer((()=>{o(n)}),e.delay)})),Ur(dr(),((e,t)=>{const n=t;n.universal||R(n.channels,cx)&&o(e)})),Jr((e=>{o(e)}))],"normal"===e.mode?[Ur(Xs(),(e=>{Fr(e,dx)})),Ur(lr(),(e=>{Fr(e,ux)})),Ur(qs(),(e=>{Fr(e,dx)})),Ur(Gs(),(e=>{Fr(e,ux)}))]:[Ur(Dr(),((e,t)=>{Fr(e,dx)})),Ur(Br(),(e=>{Fr(e,ux)}))]]))}}),hx=[os("lazySink"),os("tooltipDom"),ys("exclusive",!0),ys("tooltipComponents",[]),ys("delay",300),ks("mode","normal",["normal","follow-highlight"]),ys("anchor",(e=>({type:"hotspot",hotspot:e,layouts:{onLtr:x([cl,ll,sl,al,rl,il]),onRtl:x([cl,ll,sl,al,rl,il])}}))),Di("onHide"),Di("onShow")],fx=Object.freeze({__proto__:null,init:()=>{const e=Ql(),t=Ql(),o=()=>{e.on(clearTimeout)},n=x("not-implemented");return _a({getTooltip:t.get,isShowing:t.isSet,setTooltip:t.set,clearTooltip:t.clear,clearTimer:o,resetTimer:(t,n)=>{o(),e.set(setTimeout(t,n))},readState:n})}});const bx=Ol({fields:hx,name:"tooltipping",active:px,state:fx,apis:gx}),vx="silver.readonly",yx=Dn([("readonly",ns("readonly",Ln))]);const xx=(e,t)=>{const o=e.mainUi.outerContainer.element,n=[e.mainUi.mothership,...e.uiMotherships];t&&L(n,(e=>{e.broadcastOn([Yd()],{target:o})})),L(n,(e=>{e.broadcastOn([vx],{readonly:t})}))},wx=(e,t)=>{e.on("init",(()=>{e.mode.isReadOnly()&&xx(t,!0)})),e.on("SwitchMode",(()=>xx(t,e.mode.isReadOnly()))),mb(e)&&e.mode.set("readonly")},Sx=()=>Al.config({channels:{[vx]:{schema:yx,onReceive:(e,t)=>{Rm.set(e,t.readonly)}}}}),kx=e=>Rm.config({disabled:e}),Cx=e=>Rm.config({disabled:e,disableClass:"tox-tbtn--disabled"}),Ox=e=>Rm.config({disabled:e,disableClass:"tox-tbtn--disabled",useNative:!1}),_x=(e,t)=>{const o=e.getApi(t);return e=>{e(o)}},Tx=(e,t)=>Kr((o=>{_x(e,o)((o=>{const n=e.onSetup(o);p(n)&&t.set(n)}))})),Ex=(e,t)=>Jr((o=>_x(e,o)(t.get()))),Ax=(e,t)=>Qr(((o,n)=>{_x(e,o)(e.onAction),e.triggersSubmenu||t!==pv.CLOSE_ON_EXECUTE||(o.getSystem().isConnected()&&Fr(o,hr()),n.stop())})),Mx={[ur()]:["disabling","alloy.base.behaviour","toggling","item-events"]},Dx=we,Bx=(e,t,o,n)=>{const s=Es(b);return{type:"item",dom:t.dom,components:Dx(t.optComponents),data:e.data,eventOrder:Mx,hasSubmenu:e.triggersSubmenu,itemBehaviours:kl([Jp("item-events",[Ax(e,o),Tx(e,s),Ex(e,s)]),(r=()=>!e.enabled||n.isDisabled(),Rm.config({disabled:r,disableClass:"tox-collection__item--state-disabled"})),Sx(),Kp.config({})].concat(e.itemBehaviours))};var r},Fx=e=>({value:e.value,meta:{text:e.text.getOr(""),...e.meta}}),Ix=e=>{const t=lb.os.isMacOS()||lb.os.isiOS(),o=t?{alt:"\u2325",ctrl:"\u2303",shift:"\u21e7",meta:"\u2318",access:"\u2303\u2325"}:{meta:"Ctrl",access:"Shift+Alt"},n=e.split("+"),s=H(n,(e=>{const t=e.toLowerCase().trim();return ve(o,t)?o[t]:e}));return t?s.join(""):s.join("+")},Rx=(e,t,o=[xv])=>tb(e,{tag:"div",classes:o},t),Nx=e=>({dom:{tag:"div",classes:[wv]},components:[ti($f.translate(e))]}),Vx=(e,t)=>({dom:{tag:"div",classes:t,innerHtml:e}}),zx=(e,t)=>({dom:{tag:"div",classes:[wv]},components:[{dom:{tag:e.tag,styles:e.styles},components:[ti($f.translate(t))]}]}),Hx=e=>({dom:{tag:"div",classes:["tox-collection__item-accessory"]},components:[ti(Ix(e))]}),Lx=e=>Rx("checkmark",e,["tox-collection__item-checkmark"]),Px=e=>{const t=e.map((e=>({attributes:{title:$f.translate(e),id:la("menu-item")}}))).getOr({});return{tag:"div",classes:[hv,fv],...t}},Ux=(e,t,o,n=A.none())=>"color"===e.presets?((e,t,o)=>{const n=e.ariaLabel,s=e.value,r=e.iconContent.map((e=>((e,t,o)=>{const n=t();return Jf(e,n).or(o).getOrThunk(Yf(n))})(e,t.icons,o)));return{dom:(()=>{const e=bv,o=r.getOr(""),a=n.map((e=>({title:t.translate(e)}))).getOr({}),i={tag:"div",attributes:a,classes:[e]};return"custom"===s?{...i,tag:"button",classes:[...i.classes,"tox-swatches__picker-btn"],innerHtml:o}:"remove"===s?{...i,classes:[...i.classes,"tox-swatch--remove"],innerHtml:o}:g(s)?{...i,attributes:{...i.attributes,"data-mce-color":s},styles:{"background-color":s},innerHtml:o}:i})(),optComponents:[]}})(e,t,n):((e,t,o,n)=>{const s={tag:"div",classes:[xv]},r=o?e.iconContent.map((e=>tb(e,s,t.icons,n))).orThunk((()=>A.some({dom:s}))):A.none(),a=e.checkMark,i=A.from(e.meta).fold((()=>Nx),(e=>ve(e,"style")?k(zx,e.style):Nx)),l=e.htmlContent.fold((()=>e.textContent.map(i)),(e=>A.some(Vx(e,[wv]))));return{dom:Px(e.ariaLabel),optComponents:[r,l,e.shortcutContent.map(Hx),a,e.caret]}})(e,t,o,n),Wx=(e,t)=>be(e,"tooltipWorker").map((e=>[bx.config({lazySink:t.getSink,tooltipDom:{tag:"div",classes:["tox-tooltip-worker-container"]},tooltipComponents:[],anchor:e=>({type:"submenu",item:e,overrides:{maxHeightFunction:cc}}),mode:"follow-highlight",onShow:(t,o)=>{e((e=>{bx.setComponents(t,[oi({element:Ve(e)})])}))}})])).getOr([]),jx=(e,t)=>{const o=(e=>ab.DOM.encode(e))($f.translate(e));if(t.length>0){const e=new RegExp((e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"))(t),"gi");return o.replace(e,(e=>`<span class="tox-autocompleter-highlight">${e}</span>`))}return o},Gx=(e,t)=>H(e,(e=>{switch(e.type){case"cardcontainer":return((e,t)=>{const o="vertical"===e.direction?"tox-collection__item-container--column":Ov,n="left"===e.align?"tox-collection__item-container--align-left":"tox-collection__item-container--align-right";return{dom:{tag:"div",classes:[Cv,o,n,(()=>{switch(e.valign){case"top":return"tox-collection__item-container--valign-top";case"middle":return"tox-collection__item-container--valign-middle";case"bottom":return"tox-collection__item-container--valign-bottom"}})()]},components:t}})(e,Gx(e.items,t));case"cardimage":return((e,t,o)=>({dom:{tag:"img",classes:t,attributes:{src:e,alt:o.getOr("")}}}))(e.src,e.classes,e.alt);case"cardtext":const o=e.name.exists((e=>R(t.cardText.highlightOn,e))),n=o?A.from(t.cardText.matchText).getOr(""):"";return Vx(jx(e.text,n),e.classes)}})),$x=Yu(Ch(),Oh()),qx=e=>({value:Jx(e)}),Xx=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,Yx=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,Kx=e=>Xx.test(e)||Yx.test(e),Jx=e=>_e(e,"#").toUpperCase(),Zx=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},Qx=e=>{const t=Zx(e.red)+Zx(e.green)+Zx(e.blue);return qx(t)},ew=Math.min,tw=Math.max,ow=Math.round,nw=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,sw=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,rw=(e,t,o,n)=>({red:e,green:t,blue:o,alpha:n}),aw=e=>{const t=parseInt(e,10);return t.toString()===e&&t>=0&&t<=255},iw=e=>{let t,o,n;const s=(e.hue||0)%360;let r=e.saturation/100,a=e.value/100;if(r=tw(0,ew(r,1)),a=tw(0,ew(a,1)),0===r)return t=o=n=ow(255*a),rw(t,o,n,1);const i=s/60,l=a*r,c=l*(1-Math.abs(i%2-1)),d=a-l;switch(Math.floor(i)){case 0:t=l,o=c,n=0;break;case 1:t=c,o=l,n=0;break;case 2:t=0,o=l,n=c;break;case 3:t=0,o=c,n=l;break;case 4:t=c,o=0,n=l;break;case 5:t=l,o=0,n=c;break;default:t=o=n=0}return t=ow(255*(t+d)),o=ow(255*(o+d)),n=ow(255*(n+d)),rw(t,o,n,1)},lw=e=>{const t=(e=>{const t=(e=>{const t=e.value.replace(Xx,((e,t,o,n)=>t+t+o+o+n+n));return{value:t}})(e),o=Yx.exec(t.value);return null===o?["FFFFFF","FF","FF","FF"]:o})(e),o=parseInt(t[1],16),n=parseInt(t[2],16),s=parseInt(t[3],16);return rw(o,n,s,1)},cw=(e,t,o,n)=>{const s=parseInt(e,10),r=parseInt(t,10),a=parseInt(o,10),i=parseFloat(n);return rw(s,r,a,i)},dw=e=>{if("transparent"===e)return A.some(rw(0,0,0,0));const t=nw.exec(e);if(null!==t)return A.some(cw(t[1],t[2],t[3],"1"));const o=sw.exec(e);return null!==o?A.some(cw(o[1],o[2],o[3],o[4])):A.none()},uw=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,mw=rw(255,0,0,1),gw=(e,t)=>{e.dispatch("ResizeContent",t)},pw=(e,t)=>{e.dispatch("TextColorChange",t)},hw=(e,t)=>e.dispatch("ResolveName",{name:t.nodeName.toLowerCase(),target:t}),fw=(e,t)=>()=>{e(),t()},bw=e=>yw(e,"NodeChange",(t=>{t.setEnabled(e.selection.isEditable())})),vw=(e,t)=>o=>{const n=bw(e)(o),s=((e,t)=>o=>{const n=Zl(),s=()=>{o.setActive(e.formatter.match(t));const s=e.formatter.formatChanged(t,o.setActive);n.set(s)};return e.initialized?s():e.once("init",s),()=>{e.off("init",s),n.clear()}})(e,t)(o);return()=>{n(),s()}},yw=(e,t,o)=>n=>{const s=()=>o(n),r=()=>{o(n),e.on(t,s)};return e.initialized?r():e.once("init",r),()=>{e.off("init",r),e.off(t,s)}},xw=e=>t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("mceToggleFormat",!1,t.format)}))},ww=(e,t)=>()=>e.execCommand(t);var Sw=tinymce.util.Tools.resolve("tinymce.util.LocalStorage");const kw={},Cw=e=>be(kw,e).getOrThunk((()=>{const t=`tinymce-custom-colors-${e}`,o=Sw.getItem(t);if(m(o)){const e=Sw.getItem("tinymce-custom-colors");Sw.setItem(t,g(e)?e:"[]")}const n=((e,t=10)=>{const o=Sw.getItem(e),n=r(o)?JSON.parse(o):[],s=t-(a=n).length<0?a.slice(0,t):a;var a;const i=e=>{s.splice(e,1)};return{add:o=>{I(s,o).each(i),s.unshift(o),s.length>t&&s.pop(),Sw.setItem(e,JSON.stringify(s))},state:()=>s.slice(0)}})(t,10);return kw[e]=n,n})),Ow=(e,t)=>{Cw(e).add(t)},_w=(e,t,o)=>({hue:e,saturation:t,value:o}),Tw=e=>{let t=0,o=0,n=0;const s=e.red/255,r=e.green/255,a=e.blue/255,i=Math.min(s,Math.min(r,a)),l=Math.max(s,Math.max(r,a));return i===l?(n=i,_w(0,0,100*n)):(t=s===i?3:a===i?1:5,t=60*(t-(s===i?r-a:a===i?s-r:a-s)/(l-i)),o=(l-i)/l,n=l,_w(Math.round(t),Math.round(100*o),Math.round(100*n)))},Ew=e=>Qx(iw(e)),Aw=e=>{return(t=e,Kx(t)?A.some({value:Jx(t)}):A.none()).orThunk((()=>dw(e).map(Qx))).getOrThunk((()=>{const t=document.createElement("canvas");t.height=1,t.width=1;const o=t.getContext("2d");o.clearRect(0,0,t.width,t.height),o.fillStyle="#FFFFFF",o.fillStyle=e,o.fillRect(0,0,1,1);const n=o.getImageData(0,0,1,1).data,s=n[0],r=n[1],a=n[2],i=n[3];return Qx(rw(s,r,a,i))}));var t},Mw="forecolor",Dw="hilitecolor",Bw=e=>{const t=[];for(let o=0;o<e.length;o+=2)t.push({text:e[o+1],value:"#"+Aw(e[o]).value,icon:"checkmark",type:"choiceitem"});return t},Fw=e=>t=>t.options.get(e),Iw="#000000",Rw=(e,t)=>t===Mw&&e.options.isSet("color_map_foreground")?Fw("color_map_foreground")(e):t===Dw&&e.options.isSet("color_map_background")?Fw("color_map_background")(e):Fw("color_map")(e),Nw=(e,t="default")=>Math.max(5,Math.ceil(Math.sqrt(Rw(e,t).length))),Vw=(e,t)=>{const o=Fw("color_cols")(e),n=Nw(e,t);return o===Nw(e)?n:o},zw=(e,t="default")=>Math.round(t===Mw?Fw("color_cols_foreground")(e):t===Dw?Fw("color_cols_background")(e):Fw("color_cols")(e)),Hw=Fw("custom_colors"),Lw=Fw("color_default_foreground"),Pw=Fw("color_default_background"),Uw=(e,t)=>{const o=Ve(e.selection.getStart()),n="hilitecolor"===t?Is(o,(e=>{if(Ge(e)){const t=It(e,"background-color");return Ce(dw(t).exists((e=>0!==e.alpha)),t)}return A.none()})).getOr("rgba(0, 0, 0, 0)"):It(o,"color");return dw(n).map((e=>"#"+Qx(e).value))},Ww=e=>{const t="choiceitem",o={type:t,text:"Remove color",icon:"color-swatch-remove-color",value:"remove"};return e?[o,{type:t,text:"Custom color",icon:"color-picker",value:"custom"}]:[o]},jw=(e,t,o,n)=>{"custom"===o?Jw(e)((o=>{o.each((o=>{Ow(t,o),e.execCommand("mceApplyTextcolor",t,o),n(o)}))}),Uw(e,t).getOr(Iw)):"remove"===o?(n(""),e.execCommand("mceRemoveTextcolor",t)):(n(o),e.execCommand("mceApplyTextcolor",t,o))},Gw=(e,t,o)=>e.concat((e=>H(Cw(e).state(),(e=>({type:"choiceitem",text:e,icon:"checkmark",value:e}))))(t).concat(Ww(o))),$w=(e,t,o)=>n=>{n(Gw(e,t,o))},qw=(e,t,o)=>{const n="forecolor"===t?"tox-icon-text-color__color":"tox-icon-highlight-bg-color__color";e.setIconFill(n,o)},Xw=(e,t)=>o=>{const n=Uw(e,t);return xe(n,o.toUpperCase())},Yw=(e,t,o,n,s)=>{e.ui.registry.addSplitButton(t,{tooltip:n,presets:"color",icon:"forecolor"===t?"text-color":"highlight-bg-color",select:Xw(e,o),columns:zw(e,o),fetch:$w(Rw(e,o),o,Hw(e)),onAction:t=>{jw(e,o,s.get(),b)},onItemAction:(n,r)=>{jw(e,o,r,(o=>{s.set(o),pw(e,{name:t,color:o})}))},onSetup:o=>{qw(o,t,s.get());const n=e=>{e.name===t&&qw(o,e.name,e.color)};return e.on("TextColorChange",n),fw(bw(e)(o),(()=>{e.off("TextColorChange",n)}))}})},Kw=(e,t,o,n,s)=>{e.ui.registry.addNestedMenuItem(t,{text:n,icon:"forecolor"===t?"text-color":"highlight-bg-color",onSetup:o=>(qw(o,t,s.get()),bw(e)(o)),getSubmenuItems:()=>[{type:"fancymenuitem",fancytype:"colorswatch",select:Xw(e,o),initData:{storageKey:o},onAction:n=>{jw(e,o,n.value,(o=>{s.set(o),pw(e,{name:t,color:o})}))}}]})},Jw=e=>(t,o)=>{let n=!1;const s={colorpicker:o};e.windowManager.open({title:"Color Picker",size:"normal",body:{type:"panel",items:[{type:"colorpicker",name:"colorpicker",label:"Color"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:s,onAction:(e,t)=>{"hex-valid"===t.name&&(n=t.value)},onSubmit:o=>{const s=o.getData().colorpicker;n?(t(A.from(s)),o.close()):e.windowManager.alert(e.translate(["Invalid hex color code: {0}",s]))},onClose:b,onCancel:()=>{t(A.none())}})},Zw=(e,t,o,n,s,r,a,i)=>{const l=Jv(t),c=Qw(t,o,n,"color"!==s?"normal":"color",r,a,i);return ey(e,l,c,n,{menuType:s})},Qw=(e,t,o,n,s,r,a)=>we(H(e,(i=>{return"choiceitem"===i.type?(l=i,qn("choicemenuitem",Qy,l)).fold(Zv,(i=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Ux({presets:o,textContent:t?e.text:A.none(),htmlContent:A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:t?e.shortcut:A.none(),checkMark:t?A.some(Lx(a.icons)):A.none(),caret:A.none(),value:e.value},a,i);return fn(Bx({data:Fx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{dh.set(e,t)},isActive:()=>dh.isOn(e),isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t)}),onAction:t=>n(e.value),onSetup:e=>(e.setActive(s),b),triggersSubmenu:!1,itemBehaviours:[]},l,r,a),{toggling:{toggleClass:yv,toggleOnExecute:!1,selected:e.active,exclusive:!0}})})(i,1===o,n,t,r(i.value),s,a,Jv(e))))):A.none();var l}))),eS=(e,t)=>{const o=Av(t);return 1===e?{mode:"menu",moveOnTab:!0}:"auto"===e?{mode:"grid",selector:"."+o.item,initSize:{numColumns:1,numRows:1}}:{mode:"matrix",rowSelector:"."+("color"===t?"tox-swatches__row":"tox-collection__group"),previousSelector:e=>"color"===t?pi(e.element,"[aria-checked=true]"):A.none()}},tS=la("cell-over"),oS=la("cell-execute"),nS=(e,t,o)=>{const n=o=>Ir(o,oS,{row:e,col:t}),s=(e,t)=>{t.stop(),n(e)};return ri({dom:{tag:"div",attributes:{role:"button","aria-label":o}},behaviours:kl([Jp("insert-table-picker-cell",[Ur(qs(),oh.focus),Ur(ur(),n),Ur(er(),s),Ur(gr(),s)]),dh.config({toggleClass:"tox-insert-table-picker__selected",toggleOnExecute:!1}),oh.config({onFocus:o=>Ir(o,tS,{row:e,col:t})})])})},sS=e=>X(e,(e=>H(e,ai))),rS=(e,t)=>ti(`${t}x${e}`),aS={inserttable:(e,t)=>{const o=(e=>(t,o)=>e.shared.providers.translate(`${o} columns, ${t} rows`))(t),n=((e,t,o)=>{const n=[];for(let t=0;t<10;t++){const o=[];for(let n=0;n<10;n++){const s=e(t+1,n+1);o.push(nS(t,n,s))}n.push(o)}return n})(o),s=rS(0,0),r=Gh({dom:{tag:"span",classes:["tox-insert-table-picker__label"]},components:[s],behaviours:kl([Kp.config({})])});return{type:"widget",data:{value:la("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[$x.widget({dom:{tag:"div",classes:["tox-insert-table-picker"]},components:sS(n).concat(r.asSpec()),behaviours:kl([Jp("insert-table-picker",[Kr((e=>{Kp.set(r.get(e),[s])})),$r(tS,((e,t,o)=>{const{row:s,col:a}=o.event;((e,t,o,n,s)=>{for(let n=0;n<10;n++)for(let s=0;s<10;s++)dh.set(e[n][s],n<=t&&s<=o)})(n,s,a),Kp.set(r.get(e),[rS(s+1,a+1)])})),$r(oS,((t,o,n)=>{const{row:s,col:r}=n.event;e.onAction({numRows:s+1,numColumns:r+1}),Fr(t,hr())}))]),Pp.config({initSize:{numRows:10,numColumns:10},mode:"flatgrid",selector:'[role="button"]'})])})]}},colorswatch:(e,t)=>{const o=((e,t)=>{const o=e.initData.allowCustomColors&&t.colorinput.hasCustomColors();return e.initData.colors.fold((()=>Gw(t.colorinput.getColors(e.initData.storageKey),e.initData.storageKey,o)),(e=>e.concat(Ww(o))))})(e,t),n=t.colorinput.getColorCols(e.initData.storageKey),s="color",r={...Zw(la("menu-value"),o,(t=>{e.onAction({value:t})}),n,s,pv.CLOSE_ON_EXECUTE,e.select.getOr(T),t.shared.providers),markers:Av(s),movement:eS(n,s)};return{type:"widget",data:{value:la("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[$x.widget(Dh.sketch(r))]}}},iS=e=>({type:"separator",dom:{tag:"div",classes:[fv,"tox-collection__group-heading"]},components:e.text.map(ti).toArray()});var lS=Object.freeze({__proto__:null,getCoupled:(e,t,o,n)=>o.getOrCreate(e,t,n),getExistingCoupled:(e,t,o,n)=>o.getExisting(e,t,n)}),cS=[ns("others",$n(sn.value,Nn()))],dS=Object.freeze({__proto__:null,init:()=>{const e={},t=(t,o)=>{if(0===ae(t.others).length)throw new Error("Cannot find any known coupled components");return be(e,o)},o=x({});return _a({readState:o,getExisting:(e,o,n)=>t(o,n).orThunk((()=>(be(o.others,n).getOrDie("No information found for coupled component: "+n),A.none()))),getOrCreate:(o,n,s)=>t(n,s).getOrThunk((()=>{const t=be(n.others,s).getOrDie("No information found for coupled component: "+s)(o),r=o.getSystem().build(t);return e[s]=r,r}))})}});const uS=Ol({fields:cS,name:"coupling",apis:lS,state:dS}),mS=e=>{let t=A.none(),o=[];const n=e=>{s()?r(e):o.push(e)},s=()=>t.isSome(),r=e=>{t.each((t=>{setTimeout((()=>{e(t)}),0)}))};return e((e=>{s()||(t=A.some(e),L(o,r),o=[])})),{get:n,map:e=>mS((t=>{n((o=>{t(e(o))}))})),isReady:s}},gS={nu:mS,pure:e=>mS((t=>{t(e)}))},pS=e=>{setTimeout((()=>{throw e}),0)},hS=e=>{const t=t=>{e().then(t,pS)};return{map:t=>hS((()=>e().then(t))),bind:t=>hS((()=>e().then((e=>t(e).toPromise())))),anonBind:t=>hS((()=>e().then((()=>t.toPromise())))),toLazy:()=>gS.nu(t),toCached:()=>{let t=null;return hS((()=>(null===t&&(t=e()),t)))},toPromise:e,get:t}},fS=e=>hS((()=>new Promise(e))),bS=e=>hS((()=>Promise.resolve(e))),vS=x("sink"),yS=x(ju({name:vS(),overrides:x({dom:{tag:"div"},behaviours:kl([Sd.config({useFixed:E})]),events:Hr([qr(Ks()),qr(Ws()),qr(er())])})})),xS=(e,t)=>{const o=e.getHotspot(t).getOr(t),n="hotspot",s=e.getAnchorOverrides();return e.layouts.fold((()=>({type:n,hotspot:o,overrides:s})),(e=>({type:n,hotspot:o,overrides:s,layouts:e})))},wS=(e,t,o,n,s,r,a)=>{const i=((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>(0,e.fetch)(o).map(t))(e,t,n),l=CS(n,e);return i.map((e=>e.bind((e=>A.from(Lh.sketch({...r.menu(),uid:ha(""),data:e,highlightOnOpen:a,onOpenMenu:(e,t)=>{const n=l().getOrDie();Sd.position(n,t,{anchor:o}),Xd.decloak(s)},onOpenSubmenu:(e,t,o)=>{const n=l().getOrDie();Sd.position(n,o,{anchor:{type:"submenu",item:t}}),Xd.decloak(s)},onRepositionMenu:(e,t,n)=>{const s=l().getOrDie();Sd.position(s,t,{anchor:o}),L(n,(e=>{Sd.position(s,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem}})}))},onEscape:()=>(oh.focus(n),Xd.close(s),A.some(!0))}))))))})(e,t,xS(e,o),o,n,s,a);return i.map((e=>(e.fold((()=>{Xd.isOpen(n)&&Xd.close(n)}),(e=>{Xd.cloak(n),Xd.open(n,e),r(n)})),n)))},SS=(e,t,o,n,s,r,a)=>(Xd.close(n),bS(n)),kS=(e,t,o,n,s,r)=>{const a=uS.getCoupled(o,"sandbox");return(Xd.isOpen(a)?SS:wS)(e,t,o,a,n,s,r)},CS=(e,t)=>e.getSystem().getByUid(t.uid+"-"+vS()).map((e=>()=>sn.value(e))).getOrThunk((()=>t.lazySink.fold((()=>()=>sn.error(new Error("No internal sink is specified, nor could an external sink be found"))),(t=>()=>t(e))))),OS=e=>{Xd.getState(e).each((e=>{Lh.repositionMenus(e)}))},_S=(e,t,o)=>{const n=bi(),s=CS(t,e);return{dom:{tag:"div",classes:e.sandboxClasses,attributes:{id:n.id,role:"listbox"}},behaviours:yu(e.sandboxBehaviours,[pu.config({store:{mode:"memory",initialValue:t}}),Xd.config({onOpen:(s,r)=>{const a=xS(e,t);n.link(t.element),e.matchWidth&&((e,t,o)=>{const n=wm.getCurrent(t).getOr(t),s=Jt(e.element);o?Dt(n.element,"min-width",s+"px"):((e,t)=>{Kt.set(e,t)})(n.element,s)})(a.hotspot,r,e.useMinWidth),e.onOpen(a,s,r),void 0!==o&&void 0!==o.onOpen&&o.onOpen(s,r)},onClose:(e,s)=>{n.unlink(t.element),void 0!==o&&void 0!==o.onClose&&o.onClose(e,s)},isPartOf:(e,o,n)=>vi(o,n)||vi(t,n),getAttachPoint:()=>s().getOrDie()}),wm.config({find:e=>Xd.getState(e).bind((e=>wm.getCurrent(e)))}),Al.config({channels:{...Qd({isExtraPart:T}),...tu({doReposition:OS})}})])}},TS=e=>{const t=uS.getCoupled(e,"sandbox");OS(t)},ES=()=>[ys("sandboxClasses",[]),vu("sandboxBehaviours",[wm,Al,Xd,pu])],AS=x([os("dom"),os("fetch"),Di("onOpen"),Bi("onExecute"),ys("getHotspot",A.some),ys("getAnchorOverrides",x({})),wc(),hu("dropdownBehaviours",[dh,uS,Pp,oh]),os("toggleClass"),ys("eventOrder",{}),us("lazySink"),ys("matchWidth",!1),ys("useMinWidth",!1),us("role")].concat(ES())),MS=x([Wu({schema:[Ei(),ys("fakeFocus",!1)],name:"menu",defaults:e=>({onExecute:e.onExecute})}),yS()]),DS=bm({name:"Dropdown",configFields:AS(),partFields:MS(),factory:(e,t,o,n)=>{const s=e=>{Xd.getState(e).each((e=>{Lh.highlightPrimary(e)}))},r=(t,o,s)=>kS(e,w,t,n,o,s),a={expand:e=>{dh.isOn(e)||r(e,b,zh.HighlightNone).get(b)},open:e=>{dh.isOn(e)||r(e,b,zh.HighlightMenuAndItem).get(b)},refetch:t=>uS.getExistingCoupled(t,"sandbox").fold((()=>r(t,b,zh.HighlightMenuAndItem).map(b)),(o=>wS(e,w,t,o,n,b,zh.HighlightMenuAndItem).map(b))),isOpen:dh.isOn,close:e=>{dh.isOn(e)&&r(e,b,zh.HighlightMenuAndItem).get(b)},repositionMenus:e=>{dh.isOn(e)&&TS(e)}},i=(e,t)=>(Rr(e),A.some(!0));return{uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.dropdownBehaviours,[dh.config({toggleClass:e.toggleClass,aria:{mode:"expanded"}}),uS.config({others:{sandbox:t=>_S(e,t,{onOpen:()=>dh.on(t),onClose:()=>dh.off(t)})}}),Pp.config({mode:"special",onSpace:i,onEnter:i,onDown:(e,t)=>{if(DS.isOpen(e)){const t=uS.getCoupled(e,"sandbox");s(t)}else DS.open(e);return A.some(!0)},onEscape:(e,t)=>DS.isOpen(e)?(DS.close(e),A.some(!0)):A.none()}),oh.config({})]),events:mh(A.some((e=>{r(e,s,zh.HighlightMenuAndItem).get(b)}))),eventOrder:{...e.eventOrder,[ur()]:["disabling","toggling","alloy.base.behaviour"]},apis:a,domModification:{attributes:{"aria-haspopup":"true",...e.role.fold((()=>({})),(e=>({role:e}))),..."button"===e.dom.tag?{type:("type",be(e.dom,"attributes").bind((e=>be(e,"type")))).getOr("button")}:{}}}}},apis:{open:(e,t)=>e.open(t),refetch:(e,t)=>e.refetch(t),expand:(e,t)=>e.expand(t),close:(e,t)=>e.close(t),isOpen:(e,t)=>e.isOpen(t),repositionMenus:(e,t)=>e.repositionMenus(t)}}),BS=(e,t,o)=>{Uv(e).each((e=>{var n;((e,t)=>{_t(t.element,"id").each((t=>kt(e.element,"aria-activedescendant",t)))})(e,o),(Ua((n=t).element,Gv)?A.some(n.element):pi(n.element,"."+Gv)).each((t=>{_t(t,"id").each((t=>kt(e.element,"aria-controls",t)))}))})),kt(o.element,"aria-selected","true")},FS=(e,t,o)=>{kt(o.element,"aria-selected","false")},IS=e=>uS.getExistingCoupled(e,"sandbox").bind(Pv).map(Wv).map((e=>e.fetchPattern)).getOr("");var RS;!function(e){e[e.ContentFocus=0]="ContentFocus",e[e.UiFocus=1]="UiFocus"}(RS||(RS={}));const NS=(e,t,o,n,s)=>{const r=o.shared.providers,a=e=>s?{...e,shortcut:A.none(),icon:e.text.isSome()?A.none():e.icon}:e;switch(e.type){case"menuitem":return(i=e,qn("menuitem",sx,i)).fold(Zv,(e=>A.some(((e,t,o,n=!0)=>{const s=Ux({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.none(),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Bx({data:Fx(e),getApi:e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t)}),enabled:e.enabled,onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o)})(a(e),t,r,n))));case"nestedmenuitem":return(e=>qn("nestedmenuitem",rx,e))(e).fold(Zv,(e=>A.some(((e,t,o,n=!0,s=!1)=>{const r=s?(a=o.icons,Rx("chevron-down",a,[Sv])):(e=>Rx("chevron-right",e,[Sv]))(o.icons);var a;const i=Ux({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.some(r),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Bx({data:Fx(e),getApi:e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t),setIconFill:(t,o)=>{pi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{kt(e,"fill",o)}))}}),enabled:e.enabled,onAction:b,onSetup:e.onSetup,triggersSubmenu:!0,itemBehaviours:[]},i,t,o)})(a(e),t,r,n,s))));case"togglemenuitem":return(e=>qn("togglemenuitem",ax,e))(e).fold(Zv,(e=>A.some(((e,t,o,n=!0)=>{const s=Ux({iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,checkMark:A.some(Lx(o.icons)),caret:A.none(),shortcutContent:e.shortcut,presets:"normal",meta:e.meta},o,n);return fn(Bx({data:Fx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{dh.set(e,t)},isActive:()=>dh.isOn(e),isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t)}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o),{toggling:{toggleClass:yv,toggleOnExecute:!1,selected:e.active}})})(a(e),t,r,n))));case"separator":return(e=>qn("separatormenuitem",Ay,e))(e).fold(Zv,(e=>A.some(iS(e))));case"fancymenuitem":return(e=>qn("fancymenuitem",nx,e))(e).fold(Zv,(e=>((e,t)=>be(aS,e.fancytype).map((o=>o(e,t))))(e,o)));default:return console.error("Unknown item in general menu",e),A.none()}var i},VS=(e,t,o,n,s,r,a)=>{const i=1===n,l=!i||Jv(e);return we(H(e,(e=>{switch(e.type){case"separator":return(n=e,qn("Autocompleter.Separator",Ay,n)).fold(Zv,(e=>A.some(iS(e))));case"cardmenuitem":return(e=>qn("cardmenuitem",Zy,e))(e).fold(Zv,(e=>A.some(((e,t,o,n)=>{const s={dom:Px(e.label),optComponents:[A.some({dom:{tag:"div",classes:[Cv,Ov]},components:Gx(e.items,n)})]};return Bx({data:Fx({text:A.none(),...e}),enabled:e.enabled,getApi:e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>{Rm.set(e,!t),L(Xc(e.element,"*"),(o=>{e.getSystem().getByDom(o).each((e=>{e.hasConfigured(Rm)&&Rm.set(e,!t)}))}))}}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:A.from(n.itemBehaviours).getOr([])},s,t,o.providers)})({...e,onAction:t=>{e.onAction(t),o(e.value,e.meta)}},s,r,{itemBehaviours:Wx(e.meta,r),cardText:{matchText:t,highlightOn:a}}))));default:return(e=>qn("Autocompleter.Item",My,e))(e).fold(Zv,(e=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Ux({presets:n,textContent:A.none(),htmlContent:o?e.text.map((e=>jx(e,t))):A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:A.none(),checkMark:A.none(),caret:A.none(),value:e.value},a.providers,i,e.icon);return Bx({data:Fx(e),enabled:e.enabled,getApi:x({}),onAction:t=>s(e.value,e.meta),onSetup:x(b),triggersSubmenu:!1,itemBehaviours:Wx(e.meta,a)},l,r,a.providers)})(e,t,i,"normal",o,s,r,l))))}var n})))},zS=(e,t,o,n,s,r)=>{const a=Jv(t),i=we(H(t,(e=>{const t=e=>NS(e,o,n,(e=>s?!ve(e,"text"):a)(e),s);return"nestedmenuitem"===e.type&&e.getSubmenuItems().length<=0?t({...e,enabled:!1}):t(e)}))),l=(e=>"no-search"===e.searchMode?{menuType:"normal"}:{menuType:"searchable",searchMode:e})(r);return(s?Qv:ey)(e,a,i,1,l)},HS=e=>Lh.singleData(e.value,e),LS=(e,t)=>{const o=Es(!1),n=Es(!1),s=ri(Ph.sketch({dom:{tag:"div",classes:["tox-autocompleter"]},components:[],fireDismissalEventInstead:{},inlineBehaviours:kl([Jp("dismissAutocompleter",[Ur(Cr(),(()=>c()))])]),lazySink:t.getSink})),r=()=>Ph.isOpen(s),a=n.get,i=()=>{r()&&Ph.hide(s)},l=()=>Ph.getContent(s).bind((e=>te(e.components(),0))),c=()=>e.execCommand("mceAutocompleterClose"),d=n=>{const r=(n=>{const s=re(n,(e=>A.from(e.columns))).getOr(1);return X(n,(n=>{const r=n.items;return VS(r,n.matchText,((t,s)=>{const r=e.selection.getRng();((e,t)=>mv(Ve(t.startContainer)).map((t=>{const o=e.createRng();return o.selectNode(t.dom),o})))(e.dom,r).each((r=>{const a={hide:()=>c(),reload:t=>{i(),e.execCommand("mceAutocompleterReload",!1,{fetchOptions:t})}};o.set(!0),n.onAction(a,r,t,s),o.set(!1)}))}),s,pv.BUBBLE_TO_SANDBOX,t,n.highlightOn)}))})(n);r.length>0?((t,o)=>{var n;(n=Ve(e.getBody()),pi(n,uv)).each((n=>{const r=re(t,(e=>A.from(e.columns))).getOr(1);Ph.showMenuAt(s,{anchor:{type:"node",root:Ve(e.getBody()),node:A.from(n)}},((e,t,o,n)=>{const s=eS(t,n),r=Av(n);return{data:HS({...e,movement:s,menuBehaviours:lx("auto"!==t?[]:[Kr(((e,t)=>{ix(e,4,r.item).each((({numColumns:t,numRows:o})=>{Pp.setGridSize(e,o,t)}))}))])}),menu:{markers:Av(n),fakeFocus:o===RS.ContentFocus}}})(ey("autocompleter-value",!0,o,r,{menuType:"normal"}),r,RS.ContentFocus,"normal"))})),l().each(Gm.highlightFirst)})(n,r):i()};e.on("AutocompleterStart",(({lookupData:e})=>{n.set(!0),o.set(!1),d(e)})),e.on("AutocompleterUpdate",(({lookupData:e})=>d(e))),e.on("AutocompleterEnd",(()=>{i(),n.set(!1),o.set(!1)}));((e,t)=>{const o=(e,t)=>{Ir(e,Ks(),{raw:t})},n=()=>e.getMenu().bind(Gm.getHighlighted);t.on("keydown",(t=>{const s=t.which;e.isActive()&&(e.isMenuOpen()?13===s?(n().each(Rr),t.preventDefault()):40===s?(n().fold((()=>{e.getMenu().each(Gm.highlightFirst)}),(e=>{o(e,t)})),t.preventDefault(),t.stopImmediatePropagation()):37!==s&&38!==s&&39!==s||n().each((e=>{o(e,t),t.preventDefault(),t.stopImmediatePropagation()})):13!==s&&38!==s&&40!==s||e.cancelIfNecessary())})),t.on("NodeChange",(t=>{e.isActive()&&!e.isProcessingAction()&&mv(Ve(t.element)).isNone()&&e.cancelIfNecessary()}))})({cancelIfNecessary:c,isMenuOpen:r,isActive:a,isProcessingAction:o.get,getMenu:l},e)},PS=["visible","hidden","clip"],US=e=>Me(e).length>0&&!R(PS,e),WS=e=>{if(je(e)){const t=It(e,"overflow-x"),o=It(e,"overflow-y");return US(t)||US(o)}return!1},jS=(e,t)=>lv(e)?(e=>{const t=qc(e,WS),o=0===t.length?bt(e).map(vt).map((e=>qc(e,WS))).getOr([]):t;return oe(o).map((e=>({element:e,others:o.slice(1)})))})(t):A.none(),GS=e=>{const t=[...H(e.others,Jo),en()];return((e,t)=>j(t,((e,t)=>Qo(e,t)),e))(Jo(e.element),t)},$S=(e,t,o)=>hi(e,t,o).isSome(),qS=(e,t)=>{let o=null;return{cancel:()=>{null!==o&&(clearTimeout(o),o=null)},schedule:(...n)=>{o=setTimeout((()=>{e.apply(null,n),o=null}),t)}}},XS=e=>{const t=e.raw;return void 0===t.touches||1!==t.touches.length?A.none():A.some(t.touches[0])},YS=(e,t)=>{const o={stopBackspace:!0,...t},n=(e=>{const t=Ql(),o=Es(!1),n=qS((t=>{e.triggerEvent(pr(),t),o.set(!0)}),400),s=Ds([{key:Hs(),value:e=>(XS(e).each((s=>{n.cancel();const r={x:s.clientX,y:s.clientY,target:e.target};n.schedule(e),o.set(!1),t.set(r)})),A.none())},{key:Ls(),value:e=>(n.cancel(),XS(e).each((e=>{t.on((o=>{((e,t)=>{const o=Math.abs(e.clientX-t.x),n=Math.abs(e.clientY-t.y);return o>5||n>5})(e,o)&&t.clear()}))})),A.none())},{key:Ps(),value:s=>(n.cancel(),t.get().filter((e=>Ze(e.target,s.target))).map((t=>o.get()?(s.prevent(),!1):e.triggerEvent(gr(),s))))}]);return{fireIfReady:(e,t)=>be(s,t).bind((t=>t(e)))}})(o),s=H(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","transitioncancel","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),(t=>tc(e,t,(e=>{n.fireIfReady(e,t).each((t=>{t&&e.kill()})),o.triggerEvent(t,e)&&e.kill()})))),r=Ql(),a=tc(e,"paste",(e=>{n.fireIfReady(e,"paste").each((t=>{t&&e.kill()})),o.triggerEvent("paste",e)&&e.kill(),r.set(setTimeout((()=>{o.triggerEvent(cr(),e)}),0))})),i=tc(e,"keydown",(e=>{o.triggerEvent("keydown",e)?e.kill():o.stopBackspace&&(e=>e.raw.which===$m[0]&&!R(["input","textarea"],Ue(e.target))&&!$S(e.target,'[contenteditable="true"]'))(e)&&e.prevent()})),l=tc(e,"focusin",(e=>{o.triggerEvent("focusin",e)&&e.kill()})),c=Ql(),d=tc(e,"focusout",(e=>{o.triggerEvent("focusout",e)&&e.kill(),c.set(setTimeout((()=>{o.triggerEvent(lr(),e)}),0))}));return{unbind:()=>{L(s,(e=>{e.unbind()})),i.unbind(),l.unbind(),d.unbind(),a.unbind(),r.on(clearTimeout),c.on(clearTimeout)}}},KS=(e,t)=>{const o=be(e,"target").getOr(t);return Es(o)},JS=As([{stopped:[]},{resume:["element"]},{complete:[]}]),ZS=(e,t,o,n,s,r)=>{const a=e(t,n),i=((e,t)=>{const o=Es(!1),n=Es(!1);return{stop:()=>{o.set(!0)},cut:()=>{n.set(!0)},isStopped:o.get,isCut:n.get,event:e,setSource:t.set,getSource:t.get}})(o,s);return a.fold((()=>(r.logEventNoHandlers(t,n),JS.complete())),(e=>{const o=e.descHandler;return Aa(o)(i),i.isStopped()?(r.logEventStopped(t,e.element,o.purpose),JS.stopped()):i.isCut()?(r.logEventCut(t,e.element,o.purpose),JS.complete()):st(e.element).fold((()=>(r.logNoParent(t,e.element,o.purpose),JS.complete())),(n=>(r.logEventResponse(t,e.element,o.purpose),JS.resume(n))))}))},QS=(e,t,o,n,s,r)=>ZS(e,t,o,n,s,r).fold(E,(n=>QS(e,t,o,n,s,r)),T),ek=(e,t,o,n,s)=>{const r=KS(o,n);return QS(e,t,o,n,r,s)},tk=()=>{const e=(()=>{const e={};return{registerId:(t,o,n)=>{le(n,((n,s)=>{const r=void 0!==e[s]?e[s]:{};r[o]=((e,t)=>({cHandler:k.apply(void 0,[e.handler].concat(t)),purpose:e.purpose}))(n,t),e[s]=r}))},unregisterId:t=>{le(e,((e,o)=>{ve(e,t)&&delete e[t]}))},filterByType:t=>be(e,t).map((e=>pe(e,((e,t)=>((e,t)=>({id:e,descHandler:t}))(t,e))))).getOr([]),find:(t,o,n)=>be(e,o).bind((e=>Is(n,(t=>((e,t)=>pa(t).bind((t=>be(e,t))).map((e=>((e,t)=>({element:e,descHandler:t}))(t,e))))(e,t)),t)))}})(),t={},o=o=>{pa(o.element).each((o=>{delete t[o],e.unregisterId(o)}))};return{find:(t,o,n)=>e.find(t,o,n),filter:t=>e.filterByType(t),register:n=>{const s=(e=>{const t=e.element;return pa(t).getOrThunk((()=>((e,t)=>{const o=la(ua+"uid-");return ga(t,o),o})(0,e.element)))})(n);ye(t,s)&&((e,n)=>{const s=t[n];if(s!==e)throw new Error('The tagId "'+n+'" is already used by: '+na(s.element)+"\nCannot use it for: "+na(e.element)+"\nThe conflicting element is"+(yt(s.element)?" ":" not ")+"already in the DOM");o(e)})(n,s);const r=[n];e.registerId(r,s,n.events),t[s]=n},unregister:o,getById:e=>be(t,e)}},ok=fm({name:"Container",factory:e=>{const{attributes:t,...o}=e.dom;return{uid:e.uid,dom:{tag:"div",attributes:{role:"presentation",...t},...o},components:e.components,behaviours:fu(e.containerBehaviours),events:e.events,domModification:e.domModification,eventOrder:e.eventOrder}},configFields:[ys("components",[]),hu("containerBehaviours",[]),ys("events",{}),ys("domModification",{}),ys("eventOrder",{})]}),nk=e=>{const t=t=>st(e.element).fold(E,(e=>Ze(t,e))),o=tk(),n=(e,n)=>o.find(t,e,n),s=YS(e.element,{triggerEvent:(e,t)=>Si(e,t.target,(o=>((e,t,o,n)=>ek(e,t,o,o.target,n))(n,e,t,o)))}),r={debugInfo:x("real"),triggerEvent:(e,t,o)=>{Si(e,t,(s=>ek(n,e,o,t,s)))},triggerFocus:(e,t)=>{pa(e).fold((()=>{Dl(e)}),(o=>{Si(ir(),e,(o=>(((e,t,o,n,s)=>{const r=KS(o,n);ZS(e,t,o,n,r,s)})(n,ir(),{originator:t,kill:b,prevent:b,target:e},e,o),!1)))}))},triggerEscape:(e,t)=>{r.triggerEvent("keydown",e.element,t.event)},getByUid:e=>p(e),getByDom:e=>h(e),build:ri,buildOrPatch:si,addToGui:e=>{l(e)},removeFromGui:e=>{c(e)},addToWorld:e=>{a(e)},removeFromWorld:e=>{i(e)},broadcast:e=>{u(e)},broadcastOn:(e,t)=>{m(e,t)},broadcastEvent:(e,t)=>{g(e,t)},isConnected:E},a=e=>{e.connect(r),$e(e.element)||(o.register(e),L(e.components(),a),r.triggerEvent(br(),e.element,{target:e.element}))},i=e=>{$e(e.element)||(L(e.components(),i),o.unregister(e)),e.disconnect()},l=t=>{Ad(e,t)},c=e=>{Bd(e)},d=e=>{const t=o.filter(dr());L(t,(t=>{const o=t.descHandler;Aa(o)(e)}))},u=e=>{d({universal:!0,data:e})},m=(e,t)=>{d({universal:!1,channels:e,data:t})},g=(e,t)=>((e,t,o)=>{const n=(e=>{const t=Es(!1);return{stop:()=>{t.set(!0)},cut:b,isStopped:t.get,isCut:T,event:e,setSource:O("Cannot set source of a broadcasted event"),getSource:O("Cannot get source of a broadcasted event")}})(t);return L(e,(e=>{const t=e.descHandler;Aa(t)(n)})),n.isStopped()})(o.filter(e),t),p=e=>o.getById(e).fold((()=>sn.error(new Error('Could not find component with uid: "'+e+'" in system.'))),sn.value),h=e=>{const t=pa(e).getOr("not found");return p(t)};return a(e),{root:e,element:e.element,destroy:()=>{s.unbind(),Po(e.element)},add:l,remove:c,getByUid:p,getByDom:h,addToWorld:a,removeFromWorld:i,broadcast:u,broadcastOn:m,broadcastEvent:g}},sk=x([ys("prefix","form-field"),hu("fieldBehaviours",[wm,pu])]),rk=x([ju({schema:[os("dom")],name:"label"}),ju({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[os("text")],name:"aria-descriptor"}),Uu({factory:{sketch:e=>{const t=((e,t)=>{const o={};return le(e,((e,n)=>{R(t,n)||(o[n]=e)})),o})(e,["factory"]);return e.factory.sketch(t)}},schema:[os("factory")],name:"field"})]),ak=bm({name:"FormField",configFields:sk(),partFields:rk(),factory:(e,t,o,n)=>{const s=bu(e.fieldBehaviours,[wm.config({find:t=>om(t,e,"field")}),pu.config({store:{mode:"manual",getValue:e=>wm.getCurrent(e).bind(pu.getValue),setValue:(e,t)=>{wm.getCurrent(e).each((e=>{pu.setValue(e,t)}))}}})]),r=Hr([Kr(((t,o)=>{const n=sm(t,e,["label","field","aria-descriptor"]);n.field().each((t=>{const o=la(e.prefix);n.label().each((e=>{kt(e.element,"for",o),kt(t.element,"id",o)})),n["aria-descriptor"]().each((o=>{const n=la(e.prefix);kt(o.element,"id",n),kt(t.element,"aria-describedby",n)}))}))}))]),a={getField:t=>om(t,e,"field"),getLabel:t=>om(t,e,"label")};return{uid:e.uid,dom:e.dom,components:t,behaviours:s,events:r,apis:a}},apis:{getField:(e,t)=>e.getField(t),getLabel:(e,t)=>e.getLabel(t)}});var ik=Object.freeze({__proto__:null,exhibit:(e,t)=>Ea({attributes:Ds([{key:t.tabAttr,value:"true"}])})}),lk=[ys("tabAttr","data-alloy-tabstop")];const ck=Ol({fields:lk,name:"tabstopping",active:ik});var dk=tinymce.util.Tools.resolve("tinymce.html.Entities");const uk=(e,t,o,n)=>{const s=mk(e,t,o,n);return ak.sketch(s)},mk=(e,t,o,n)=>({dom:gk(o),components:e.toArray().concat([t]),fieldBehaviours:kl(n)}),gk=e=>({tag:"div",classes:["tox-form__group"].concat(e)}),pk=(e,t)=>ak.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ti(t.translate(e))]}),hk=la("form-component-change"),fk=la("form-close"),bk=la("form-cancel"),vk=la("form-action"),yk=la("form-submit"),xk=la("form-block"),wk=la("form-unblock"),Sk=la("form-tabchange"),kk=la("form-resize"),Ck=["input","textarea"],Ok=e=>{const t=Ue(e);return R(Ck,t)},_k=(e,t)=>{const o=t.getRoot(e).getOr(e.element);Pa(o,t.invalidClass),t.notify.each((t=>{Ok(e.element)&&kt(e.element,"aria-invalid",!1),t.getContainer(e).each((e=>{ta(e,t.validHtml)})),t.onValid(e)}))},Tk=(e,t,o,n)=>{const s=t.getRoot(e).getOr(e.element);La(s,t.invalidClass),t.notify.each((t=>{Ok(e.element)&&kt(e.element,"aria-invalid",!0),t.getContainer(e).each((e=>{ta(e,n)})),t.onInvalid(e,n)}))},Ek=(e,t,o)=>t.validator.fold((()=>bS(sn.value(!0))),(t=>t.validate(e))),Ak=(e,t,o)=>(t.notify.each((t=>{t.onValidate(e)})),Ek(e,t).map((o=>e.getSystem().isConnected()?o.fold((o=>(Tk(e,t,0,o),sn.error(o))),(o=>(_k(e,t),sn.value(o)))):sn.error("No longer in system"))));var Mk=Object.freeze({__proto__:null,markValid:_k,markInvalid:Tk,query:Ek,run:Ak,isInvalid:(e,t)=>{const o=t.getRoot(e).getOr(e.element);return Ua(o,t.invalidClass)}}),Dk=Object.freeze({__proto__:null,events:(e,t)=>e.validator.map((t=>Hr([Ur(t.onEvent,(t=>{Ak(t,e).get(w)}))].concat(t.validateOnLoad?[Kr((t=>{Ak(t,e).get(b)}))]:[])))).getOr({})}),Bk=[os("invalidClass"),ys("getRoot",A.none),vs("notify",[ys("aria","alert"),ys("getContainer",A.none),ys("validHtml",""),Di("onValid"),Di("onInvalid"),Di("onValidate")]),vs("validator",[os("validate"),ys("onEvent","input"),ys("validateOnLoad",!0)])];const Fk=Ol({fields:Bk,name:"invalidating",active:Dk,apis:Mk,extra:{validation:e=>t=>{const o=pu.getValue(t);return bS(e(o))}}}),Ik=Ol({fields:[],name:"unselecting",active:Object.freeze({__proto__:null,events:()=>Hr([Lr(sr(),E)]),exhibit:()=>Ea({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})})}),Rk=la("color-input-change"),Nk=la("color-swatch-change"),Vk=la("color-picker-cancel"),zk=ju({schema:[os("dom")],name:"label"}),Hk=e=>ju({name:e+"-edge",overrides:t=>t.model.manager.edgeActions[e].fold((()=>({})),(e=>({events:Hr([Wr(Hs(),((t,o,n)=>e(t,n)),[t]),Wr(Ws(),((t,o,n)=>e(t,n)),[t]),Wr(js(),((t,o,n)=>{n.mouseIsDown.get()&&e(t,n)}),[t])])})))}),Lk=Hk("top-left"),Pk=Hk("top"),Uk=Hk("top-right"),Wk=Hk("right"),jk=Hk("bottom-right"),Gk=Hk("bottom"),$k=Hk("bottom-left");var qk=[zk,Hk("left"),Wk,Pk,Gk,Lk,Uk,$k,jk,Uu({name:"thumb",defaults:x({dom:{styles:{position:"absolute"}}}),overrides:e=>({events:Hr([Gr(Hs(),e,"spectrum"),Gr(Ls(),e,"spectrum"),Gr(Ps(),e,"spectrum"),Gr(Ws(),e,"spectrum"),Gr(js(),e,"spectrum"),Gr($s(),e,"spectrum")])})}),Uu({schema:[es("mouseIsDown",(()=>Es(!1)))],name:"spectrum",overrides:e=>{const t=e.model.manager,o=(o,n)=>t.getValueFromEvent(n).map((n=>t.setValueFrom(o,e,n)));return{behaviours:kl([Pp.config({mode:"special",onLeft:o=>t.onLeft(o,e),onRight:o=>t.onRight(o,e),onUp:o=>t.onUp(o,e),onDown:o=>t.onDown(o,e)}),oh.config({})]),events:Hr([Ur(Hs(),o),Ur(Ls(),o),Ur(Ws(),o),Ur(js(),((t,n)=>{e.mouseIsDown.get()&&o(t,n)}))])}}})];const Xk=x("slider.change.value"),Yk=e=>{const t=e.event.raw;if((e=>-1!==e.type.indexOf("touch"))(t)){const e=t;return void 0!==e.touches&&1===e.touches.length?A.some(e.touches[0]).map((e=>$t(e.clientX,e.clientY))):A.none()}{const e=t;return void 0!==e.clientX?A.some(e).map((e=>$t(e.clientX,e.clientY))):A.none()}},Kk=e=>e.model.minX,Jk=e=>e.model.minY,Zk=e=>e.model.minX-1,Qk=e=>e.model.minY-1,eC=e=>e.model.maxX,tC=e=>e.model.maxY,oC=e=>e.model.maxX+1,nC=e=>e.model.maxY+1,sC=(e,t,o)=>t(e)-o(e),rC=e=>sC(e,eC,Kk),aC=e=>sC(e,tC,Jk),iC=e=>rC(e)/2,lC=e=>aC(e)/2,cC=e=>e.stepSize,dC=e=>e.snapToGrid,uC=e=>e.snapStart,mC=e=>e.rounded,gC=(e,t)=>void 0!==e[t+"-edge"],pC=e=>gC(e,"left"),hC=e=>gC(e,"right"),fC=e=>gC(e,"top"),bC=e=>gC(e,"bottom"),vC=e=>e.model.value.get(),yC=(e,t)=>({x:e,y:t}),xC=(e,t)=>{Ir(e,Xk(),{value:t})},wC=(e,t,o,n)=>e<t?e:e>o?o:e===t?t-1:Math.max(t,e-n),SC=(e,t,o,n)=>e>o?e:e<t?t:e===o?o+1:Math.min(o,e+n),kC=(e,t,o)=>Math.max(t,Math.min(o,e)),CC=e=>{const{min:t,max:o,range:n,value:s,step:r,snap:a,snapStart:i,rounded:l,hasMinEdge:c,hasMaxEdge:d,minBound:u,maxBound:m,screenRange:g}=e,p=c?t-1:t,h=d?o+1:o;if(s<u)return p;if(s>m)return h;{const e=((e,t,o)=>Math.min(o,Math.max(e,t))-t)(s,u,m),c=kC(e/g*n+t,p,h);return a&&c>=t&&c<=o?((e,t,o,n,s)=>s.fold((()=>{const s=e-t,r=Math.round(s/n)*n;return kC(t+r,t-1,o+1)}),(t=>{const s=(e-t)%n,r=Math.round(s/n),a=Math.floor((e-t)/n),i=Math.floor((o-t)/n),l=t+Math.min(i,a+r)*n;return Math.max(t,l)})))(c,t,o,r,i):l?Math.round(c):c}},OC=e=>{const{min:t,max:o,range:n,value:s,hasMinEdge:r,hasMaxEdge:a,maxBound:i,maxOffset:l,centerMinEdge:c,centerMaxEdge:d}=e;return s<t?r?0:c:s>o?a?i:d:(s-t)/n*l},_C="top",TC="right",EC="bottom",AC="left",MC=e=>e.element.dom.getBoundingClientRect(),DC=(e,t)=>e[t],BC=e=>{const t=MC(e);return DC(t,AC)},FC=e=>{const t=MC(e);return DC(t,TC)},IC=e=>{const t=MC(e);return DC(t,_C)},RC=e=>{const t=MC(e);return DC(t,EC)},NC=e=>{const t=MC(e);return DC(t,"width")},VC=e=>{const t=MC(e);return DC(t,"height")},zC=(e,t,o)=>(e+t)/2-o,HC=(e,t)=>{const o=MC(e),n=MC(t),s=DC(o,AC),r=DC(o,TC),a=DC(n,AC);return zC(s,r,a)},LC=(e,t)=>{const o=MC(e),n=MC(t),s=DC(o,_C),r=DC(o,EC),a=DC(n,_C);return zC(s,r,a)},PC=(e,t)=>{Ir(e,Xk(),{value:t})},UC=(e,t,o)=>{const n={min:Kk(t),max:eC(t),range:rC(t),value:o,step:cC(t),snap:dC(t),snapStart:uC(t),rounded:mC(t),hasMinEdge:pC(t),hasMaxEdge:hC(t),minBound:BC(e),maxBound:FC(e),screenRange:NC(e)};return CC(n)},WC=e=>(t,o)=>((e,t,o)=>{const n=(e>0?SC:wC)(vC(o),Kk(o),eC(o),cC(o));return PC(t,n),A.some(n)})(e,t,o).map(E),jC=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=NC(e),a=n.bind((t=>A.some(HC(t,e)))).getOr(0),i=s.bind((t=>A.some(HC(t,e)))).getOr(r),l={min:Kk(t),max:eC(t),range:rC(t),value:o,hasMinEdge:pC(t),hasMaxEdge:hC(t),minBound:BC(e),minOffset:0,maxBound:FC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return OC(l)})(t,r,o,n,s);return BC(t)-BC(e)+a},GC=WC(-1),$C=WC(1),qC=A.none,XC=A.none,YC={"top-left":A.none(),top:A.none(),"top-right":A.none(),right:A.some(((e,t)=>{xC(e,oC(t))})),"bottom-right":A.none(),bottom:A.none(),"bottom-left":A.none(),left:A.some(((e,t)=>{xC(e,Zk(t))}))};var KC=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=UC(e,t,o);return PC(e,n),n},setToMin:(e,t)=>{const o=Kk(t);PC(e,o)},setToMax:(e,t)=>{const o=eC(t);PC(e,o)},findValueOfOffset:UC,getValueFromEvent:e=>Yk(e).map((e=>e.left)),findPositionOfValue:jC,setPositionFromValue:(e,t,o,n)=>{const s=vC(o),r=jC(e,n.getSpectrum(e),s,n.getLeftEdge(e),n.getRightEdge(e),o),a=Jt(t.element)/2;Dt(t.element,"left",r-a+"px")},onLeft:GC,onRight:$C,onUp:qC,onDown:XC,edgeActions:YC});const JC=(e,t)=>{Ir(e,Xk(),{value:t})},ZC=(e,t,o)=>{const n={min:Jk(t),max:tC(t),range:aC(t),value:o,step:cC(t),snap:dC(t),snapStart:uC(t),rounded:mC(t),hasMinEdge:fC(t),hasMaxEdge:bC(t),minBound:IC(e),maxBound:RC(e),screenRange:VC(e)};return CC(n)},QC=e=>(t,o)=>((e,t,o)=>{const n=(e>0?SC:wC)(vC(o),Jk(o),tC(o),cC(o));return JC(t,n),A.some(n)})(e,t,o).map(E),eO=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=VC(e),a=n.bind((t=>A.some(LC(t,e)))).getOr(0),i=s.bind((t=>A.some(LC(t,e)))).getOr(r),l={min:Jk(t),max:tC(t),range:aC(t),value:o,hasMinEdge:fC(t),hasMaxEdge:bC(t),minBound:IC(e),minOffset:0,maxBound:RC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return OC(l)})(t,r,o,n,s);return IC(t)-IC(e)+a},tO=A.none,oO=A.none,nO=QC(-1),sO=QC(1),rO={"top-left":A.none(),top:A.some(((e,t)=>{xC(e,Qk(t))})),"top-right":A.none(),right:A.none(),"bottom-right":A.none(),bottom:A.some(((e,t)=>{xC(e,nC(t))})),"bottom-left":A.none(),left:A.none()};var aO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=ZC(e,t,o);return JC(e,n),n},setToMin:(e,t)=>{const o=Jk(t);JC(e,o)},setToMax:(e,t)=>{const o=tC(t);JC(e,o)},findValueOfOffset:ZC,getValueFromEvent:e=>Yk(e).map((e=>e.top)),findPositionOfValue:eO,setPositionFromValue:(e,t,o,n)=>{const s=vC(o),r=eO(e,n.getSpectrum(e),s,n.getTopEdge(e),n.getBottomEdge(e),o),a=Wt(t.element)/2;Dt(t.element,"top",r-a+"px")},onLeft:tO,onRight:oO,onUp:nO,onDown:sO,edgeActions:rO});const iO=(e,t)=>{Ir(e,Xk(),{value:t})},lO=(e,t)=>({x:e,y:t}),cO=(e,t)=>(o,n)=>((e,t,o,n)=>{const s=e>0?SC:wC,r=t?vC(n).x:s(vC(n).x,Kk(n),eC(n),cC(n)),a=t?s(vC(n).y,Jk(n),tC(n),cC(n)):vC(n).y;return iO(o,lO(r,a)),A.some(r)})(e,t,o,n).map(E),dO=cO(-1,!1),uO=cO(1,!1),mO=cO(-1,!0),gO=cO(1,!0),pO={"top-left":A.some(((e,t)=>{xC(e,yC(Zk(t),Qk(t)))})),top:A.some(((e,t)=>{xC(e,yC(iC(t),Qk(t)))})),"top-right":A.some(((e,t)=>{xC(e,yC(oC(t),Qk(t)))})),right:A.some(((e,t)=>{xC(e,yC(oC(t),lC(t)))})),"bottom-right":A.some(((e,t)=>{xC(e,yC(oC(t),nC(t)))})),bottom:A.some(((e,t)=>{xC(e,yC(iC(t),nC(t)))})),"bottom-left":A.some(((e,t)=>{xC(e,yC(Zk(t),nC(t)))})),left:A.some(((e,t)=>{xC(e,yC(Zk(t),lC(t)))}))};var hO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=UC(e,t,o.left),s=ZC(e,t,o.top),r=lO(n,s);return iO(e,r),r},setToMin:(e,t)=>{const o=Kk(t),n=Jk(t);iO(e,lO(o,n))},setToMax:(e,t)=>{const o=eC(t),n=tC(t);iO(e,lO(o,n))},getValueFromEvent:e=>Yk(e),setPositionFromValue:(e,t,o,n)=>{const s=vC(o),r=jC(e,n.getSpectrum(e),s.x,n.getLeftEdge(e),n.getRightEdge(e),o),a=eO(e,n.getSpectrum(e),s.y,n.getTopEdge(e),n.getBottomEdge(e),o),i=Jt(t.element)/2,l=Wt(t.element)/2;Dt(t.element,"left",r-i+"px"),Dt(t.element,"top",a-l+"px")},onLeft:dO,onRight:uO,onUp:mO,onDown:gO,edgeActions:pO});const fO=bm({name:"Slider",configFields:[ys("stepSize",1),ys("onChange",b),ys("onChoose",b),ys("onInit",b),ys("onDragStart",b),ys("onDragEnd",b),ys("snapToGrid",!1),ys("rounded",!0),us("snapStart"),ns("model",Jn("mode",{x:[ys("minX",0),ys("maxX",100),es("value",(e=>Es(e.mode.minX))),os("getInitialValue"),Ri("manager",KC)],y:[ys("minY",0),ys("maxY",100),es("value",(e=>Es(e.mode.minY))),os("getInitialValue"),Ri("manager",aO)],xy:[ys("minX",0),ys("maxX",100),ys("minY",0),ys("maxY",100),es("value",(e=>Es({x:e.mode.minX,y:e.mode.minY}))),os("getInitialValue"),Ri("manager",hO)]})),hu("sliderBehaviours",[Pp,pu]),es("mouseIsDown",(()=>Es(!1)))],partFields:qk,factory:(e,t,o,n)=>{const s=t=>nm(t,e,"thumb"),r=t=>nm(t,e,"spectrum"),a=t=>om(t,e,"left-edge"),i=t=>om(t,e,"right-edge"),l=t=>om(t,e,"top-edge"),c=t=>om(t,e,"bottom-edge"),d=e.model,u=d.manager,m=(t,o)=>{u.setPositionFromValue(t,o,e,{getLeftEdge:a,getRightEdge:i,getTopEdge:l,getBottomEdge:c,getSpectrum:r})},g=(e,t)=>{d.value.set(t);const o=s(e);m(e,o)},p=t=>{const o=e.mouseIsDown.get();e.mouseIsDown.set(!1),o&&om(t,e,"thumb").each((o=>{const n=d.value.get();e.onChoose(t,o,n)}))},h=(t,o)=>{o.stop(),e.mouseIsDown.set(!0),e.onDragStart(t,s(t))},f=(t,o)=>{o.stop(),e.onDragEnd(t,s(t)),p(t)};return{uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.sliderBehaviours,[Pp.config({mode:"special",focusIn:t=>om(t,e,"spectrum").map(Pp.focusIn).map(E)}),pu.config({store:{mode:"manual",getValue:e=>d.value.get(),setValue:g}}),Al.config({channels:{[Jd()]:{onReceive:p}}})]),events:Hr([Ur(Xk(),((t,o)=>{((t,o)=>{g(t,o);const n=s(t);e.onChange(t,n,o),A.some(!0)})(t,o.event.value)})),Kr(((t,o)=>{const n=d.getInitialValue();d.value.set(n);const a=s(t);m(t,a);const i=r(t);e.onInit(t,a,i,d.value.get())})),Ur(Hs(),h),Ur(Ps(),f),Ur(Ws(),h),Ur($s(),f)]),apis:{resetToMin:t=>{u.setToMin(t,e)},resetToMax:t=>{u.setToMax(t,e)},setValue:g,refresh:m},domModification:{styles:{position:"relative"}}}},apis:{setValue:(e,t,o)=>{e.setValue(t,o)},resetToMin:(e,t)=>{e.resetToMin(t)},resetToMax:(e,t)=>{e.resetToMax(t)},refresh:(e,t)=>{e.refresh(t)}}}),bO=la("rgb-hex-update"),vO=la("slider-update"),yO=la("palette-update"),xO="form",wO=[hu("formBehaviours",[pu])],SO=e=>"<alloy.field."+e+">",kO=(e,t)=>({uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.formBehaviours,[pu.config({store:{mode:"manual",getValue:t=>{const o=rm(t,e);return ce(o,((e,t)=>e().bind((e=>{return o=wm.getCurrent(e),n=new Error(`Cannot find a current component to extract the value from for form part '${t}': `+na(e.element)),o.fold((()=>sn.error(n)),sn.value);var o,n})).map(pu.getValue)))},setValue:(t,o)=>{le(o,((o,n)=>{om(t,e,n).each((e=>{wm.getCurrent(e).each((e=>{pu.setValue(e,o)}))}))}))}}})]),apis:{getField:(t,o)=>om(t,e,o).bind(wm.getCurrent)}}),CO={getField:Ca(((e,t,o)=>e.getField(t,o))),sketch:e=>{const t=(()=>{const e=[];return{field:(t,o)=>(e.push(t),Ju(xO,SO(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=H(n,(e=>Uu({name:e,pname:SO(e)})));return mm(xO,wO,s,kO,o)}},OO=la("valid-input"),_O=la("invalid-input"),TO=la("validating-input"),EO="colorcustom.rgb.",AO=(e,t,o,n)=>{const s=(o,n)=>Fk.config({invalidClass:t("invalid"),notify:{onValidate:e=>{Ir(e,TO,{type:o})},onValid:e=>{Ir(e,OO,{type:o,value:pu.getValue(e)})},onInvalid:e=>{Ir(e,_O,{type:o,value:pu.getValue(e)})}},validator:{validate:t=>{const o=pu.getValue(t),s=n(o)?sn.value(!0):sn.error(e("aria.input.invalid"));return bS(s)},validateOnLoad:!1}}),r=(o,n,r,a,i)=>{const l=e(EO+"range"),c=ak.parts.label({dom:{tag:"label",attributes:{"aria-label":a}},components:[ti(r)]}),d=ak.parts.field({data:i,factory:Vv,inputAttributes:{type:"text",..."hex"===n?{"aria-live":"polite"}:{}},inputClasses:[t("textfield")],inputBehaviours:kl([s(n,o),ck.config({})]),onSetValue:e=>{Fk.isInvalid(e)&&Fk.run(e).get(b)}}),u=[c,d],m="hex"!==n?[ak.parts["aria-descriptor"]({text:l})]:[];return{dom:{tag:"div",attributes:{role:"presentation"}},components:u.concat(m)}},a=(e,t)=>{const o=t.red,n=t.green,s=t.blue;pu.setValue(e,{red:o,green:n,blue:s})},i=Gh({dom:{tag:"div",classes:[t("rgba-preview")],styles:{"background-color":"white"},attributes:{role:"presentation"}}}),l=(e,t)=>{i.getOpt(e).each((e=>{Dt(e.element,"background-color","#"+t.value)}))},c=fm({factory:()=>{const s={red:Es(A.some(255)),green:Es(A.some(255)),blue:Es(A.some(255)),hex:Es(A.some("ffffff"))},c=e=>s[e].get(),d=(e,t)=>{s[e].set(t)},u=e=>{const t=e.red,o=e.green,n=e.blue;d("red",A.some(t)),d("green",A.some(o)),d("blue",A.some(n))},m=(e,t)=>{const o=t.event;"hex"!==o.type?d(o.type,A.none()):n(e)},g=(e,t)=>{const n=t.event;(e=>"hex"===e.type)(n)?((e,t)=>{o(e);const n=qx(t);d("hex",A.some(n.value));const s=lw(n);a(e,s),u(s),Ir(e,bO,{hex:n}),l(e,n)})(e,n.value):((e,t,o)=>{const n=parseInt(o,10);d(t,A.some(n)),c("red").bind((e=>c("green").bind((t=>c("blue").map((o=>rw(e,t,o,1))))))).each((t=>{const o=((e,t)=>{const o=Qx(t);return CO.getField(e,"hex").each((t=>{oh.isFocused(t)||pu.setValue(e,{hex:o.value})})),o})(e,t);Ir(e,bO,{hex:o}),l(e,o)}))})(e,n.type,n.value)},p=t=>({label:e(EO+t+".label"),description:e(EO+t+".description")}),h=p("red"),f=p("green"),b=p("blue"),v=p("hex");return fn(CO.sketch((o=>({dom:{tag:"form",classes:[t("rgb-form")],attributes:{"aria-label":e("aria.color.picker")}},components:[o.field("red",ak.sketch(r(aw,"red",h.label,h.description,255))),o.field("green",ak.sketch(r(aw,"green",f.label,f.description,255))),o.field("blue",ak.sketch(r(aw,"blue",b.label,b.description,255))),o.field("hex",ak.sketch(r(Kx,"hex",v.label,v.description,"ffffff"))),i.asSpec()],formBehaviours:kl([Fk.config({invalidClass:t("form-invalid")}),Jp("rgb-form-events",[Ur(OO,g),Ur(_O,m),Ur(TO,m)])])}))),{apis:{updateHex:(e,t)=>{pu.setValue(e,{hex:t.value}),((e,t)=>{const o=lw(t);a(e,o),u(o)})(e,t),l(e,t)}}})},name:"RgbForm",configFields:[],apis:{updateHex:(e,t,o)=>{e.updateHex(t,o)}},extraApis:{}});return c},MO=(e,t)=>{const o=fm({name:"ColourPicker",configFields:[os("dom"),ys("onValidHex",b),ys("onInvalidHex",b)],factory:o=>{const n=AO(e,t,o.onValidHex,o.onInvalidHex),s=((e,t)=>{const o=fO.parts.spectrum({dom:{tag:"canvas",attributes:{role:"presentation"},classes:[t("sv-palette-spectrum")]}}),n=fO.parts.thumb({dom:{tag:"div",attributes:{role:"presentation"},classes:[t("sv-palette-thumb")],innerHtml:`<div class=${t("sv-palette-inner-thumb")} role="presentation"></div>`}}),s=(e,t)=>{const{width:o,height:n}=e,s=e.getContext("2d");if(null===s)return;s.fillStyle=t,s.fillRect(0,0,o,n);const r=s.createLinearGradient(0,0,o,0);r.addColorStop(0,"rgba(255,255,255,1)"),r.addColorStop(1,"rgba(255,255,255,0)"),s.fillStyle=r,s.fillRect(0,0,o,n);const a=s.createLinearGradient(0,0,0,n);a.addColorStop(0,"rgba(0,0,0,0)"),a.addColorStop(1,"rgba(0,0,0,1)"),s.fillStyle=a,s.fillRect(0,0,o,n)};return fm({factory:e=>{const r=x({x:0,y:0}),a=kl([wm.config({find:A.some}),oh.config({})]);return fO.sketch({dom:{tag:"div",attributes:{role:"presentation"},classes:[t("sv-palette")]},model:{mode:"xy",getInitialValue:r},rounded:!1,components:[o,n],onChange:(e,t,o)=>{Ir(e,yO,{value:o})},onInit:(e,t,o,n)=>{s(o.element.dom,uw(mw))},sliderBehaviours:a})},name:"SaturationBrightnessPalette",configFields:[],apis:{setHue:(e,t,o)=>{((e,t)=>{const o=e.components()[0].element.dom,n=_w(t,100,100),r=iw(n);s(o,uw(r))})(t,o)},setThumb:(e,t,o)=>{((e,t)=>{const o=Tw(lw(t));fO.setValue(e,{x:o.saturation,y:100-o.value})})(t,o)}},extraApis:{}})})(0,t),r={paletteRgba:Es(mw),paletteHue:Es(0)},a=Gh(((e,t)=>{const o=fO.parts.spectrum({dom:{tag:"div",classes:[t("hue-slider-spectrum")],attributes:{role:"presentation"}}}),n=fO.parts.thumb({dom:{tag:"div",classes:[t("hue-slider-thumb")],attributes:{role:"presentation"}}});return fO.sketch({dom:{tag:"div",classes:[t("hue-slider")],attributes:{role:"presentation"}},rounded:!1,model:{mode:"y",getInitialValue:x(0)},components:[o,n],sliderBehaviours:kl([oh.config({})]),onChange:(e,t,o)=>{Ir(e,vO,{value:o})}})})(0,t)),i=Gh(s.sketch({})),l=Gh(n.sketch({})),c=(e,t,o)=>{i.getOpt(e).each((e=>{s.setHue(e,o)}))},d=(e,t)=>{l.getOpt(e).each((e=>{n.updateHex(e,t)}))},u=(e,t,o)=>{a.getOpt(e).each((e=>{fO.setValue(e,(e=>100-e/360*100)(o))}))},m=(e,t)=>{i.getOpt(e).each((e=>{s.setThumb(e,t)}))},g=(e,t,o,n)=>{((e,t)=>{const o=lw(e);r.paletteRgba.set(o),r.paletteHue.set(t)})(t,o),L(n,(n=>{n(e,t,o)}))};return{uid:o.uid,dom:o.dom,components:[i.asSpec(),a.asSpec(),l.asSpec()],behaviours:kl([Jp("colour-picker-events",[Ur(bO,(()=>{const e=[c,u,m];return(t,o)=>{const n=o.event.hex,s=(e=>Tw(lw(e)))(n);g(t,n,s.hue,e)}})()),Ur(yO,(()=>{const e=[d];return(t,o)=>{const n=o.event.value,s=r.paletteHue.get(),a=_w(s,n.x,100-n.y),i=Ew(a);g(t,i,s,e)}})()),Ur(vO,(()=>{const e=[c,d];return(t,o)=>{const n=(e=>(100-e)/100*360)(o.event.value),s=r.paletteRgba.get(),a=Tw(s),i=_w(n,a.saturation,a.value),l=Ew(i);g(t,l,n,e)}})())]),wm.config({find:e=>l.getOpt(e)}),Pp.config({mode:"acyclic"})])}}});return o},DO=()=>wm.config({find:A.some}),BO=e=>wm.config({find:t=>lt(t.element,e).bind((e=>t.getSystem().getByDom(e).toOptional()))}),FO=Dn([ys("preprocess",w),ys("postprocess",w)]),IO=(e,t)=>{const o=Yn("RepresentingConfigs.memento processors",FO,t);return pu.config({store:{mode:"manual",getValue:t=>{const n=e.get(t),s=pu.getValue(n);return o.postprocess(s)},setValue:(t,n)=>{const s=o.preprocess(n),r=e.get(t);pu.setValue(r,s)}}})},RO=(e,t,o)=>pu.config({store:{mode:"manual",...e.map((e=>({initialValue:e}))).getOr({}),getValue:t,setValue:o}}),NO=(e,t,o)=>RO(e,(e=>t(e.element)),((e,t)=>o(e.element,t))),VO=e=>pu.config({store:{mode:"memory",initialValue:e}}),zO={"colorcustom.rgb.red.label":"R","colorcustom.rgb.red.description":"Red component","colorcustom.rgb.green.label":"G","colorcustom.rgb.green.description":"Green component","colorcustom.rgb.blue.label":"B","colorcustom.rgb.blue.description":"Blue component","colorcustom.rgb.hex.label":"#","colorcustom.rgb.hex.description":"Hex color code","colorcustom.rgb.range":"Range 0 to 255","aria.color.picker":"Color Picker","aria.input.invalid":"Invalid input"};var HO=tinymce.util.Tools.resolve("tinymce.Resource"),LO=tinymce.util.Tools.resolve("tinymce.util.Tools");const PO=(e,t)=>{let o=null;const n=()=>{c(o)||(clearTimeout(o),o=null)};return{cancel:n,throttle:(...s)=>{n(),o=setTimeout((()=>{o=null,e.apply(null,s)}),t)}}},UO=la("alloy-fake-before-tabstop"),WO=la("alloy-fake-after-tabstop"),jO=e=>({dom:{tag:"div",styles:{width:"1px",height:"1px",outline:"none"},attributes:{tabindex:"0"},classes:e},behaviours:kl([oh.config({ignore:!0}),ck.config({})])}),GO=(e,t)=>({dom:{tag:"div",classes:["tox-navobj",...e.getOr([])]},components:[jO([UO]),t,jO([WO])],behaviours:kl([BO(1)])}),$O=(e,t)=>{Ir(e,Ks(),{raw:{which:9,shiftKey:t}})},qO=(e,t)=>{const o=t.element;Ua(o,UO)?$O(e,!0):Ua(o,WO)&&$O(e,!1)},XO=e=>$S(e,["."+UO,"."+WO].join(","),T),YO=la("update-dialog"),KO=la("update-title"),JO=la("update-body"),ZO=la("update-footer"),QO=la("body-send-message"),e_=la("dialog-focus-shifted"),t_=Do().browser,o_=t_.isSafari(),n_=t_.isFirefox(),s_=o_||n_,r_=t_.isChromium(),a_=({scrollTop:e,scrollHeight:t,clientHeight:o})=>Math.ceil(e)+o>=t,i_=(e,t)=>e.scrollTo(0,"bottom"===t?99999999:t),l_=(e,t,o)=>{const n=e.dom;A.from(n.contentDocument).fold(o,(e=>{let o=0;const s=((e,t)=>{const o=e.body;return A.from(!/^<!DOCTYPE (html|HTML)/.test(t)&&(!r_&&!o_||g(o)&&(0!==o.scrollTop||Math.abs(o.scrollHeight-o.clientHeight)>1))?o:e.documentElement)})(e,t).map((e=>(o=e.scrollTop,e))).forall(a_),r=()=>{const e=n.contentWindow;g(e)&&(s?i_(e,"bottom"):!s&&s_&&0!==o&&i_(e,o))};o_&&n.addEventListener("load",r,{once:!0}),e.open(),e.write(t),e.close(),o_||r()}))},c_=Ce(s_,o_?500:200).map((e=>((e,t)=>{let o=null,n=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null,n=null)},throttle:(...s)=>{n=s,c(o)&&(o=setTimeout((()=>{const t=n;o=null,n=null,e.apply(null,t)}),t))}}})(l_,e))),d_=la("toolbar.button.execute"),u_=la("common-button-display-events"),m_={[ur()]:["disabling","alloy.base.behaviour","toggling","toolbar-button-events"],[Sr()]:["toolbar-button-events",u_],[Ws()]:["focusing","alloy.base.behaviour",u_]},g_=e=>Dt(e.element,"width",It(e.element,"width")),p_=(e,t,o)=>tb(e,{tag:"span",classes:["tox-icon","tox-tbtn__icon-wrap"],behaviours:o},t),h_=(e,t)=>p_(e,t,[]),f_=(e,t)=>p_(e,t,[Kp.config({})]),b_=(e,t,o)=>({dom:{tag:"span",classes:[`${t}__select-label`]},components:[ti(o.translate(e))],behaviours:kl([Kp.config({})])}),v_=la("update-menu-text"),y_=la("update-menu-icon"),x_=(e,t,o)=>{const n=Es(b),s=e.text.map((e=>Gh(b_(e,t,o.providers)))),r=e.icon.map((e=>Gh(f_(e,o.providers.icons)))),a=(e,t)=>{const o=pu.getValue(e);return oh.focus(o),Ir(o,"keydown",{raw:t.event.raw}),DS.close(o),A.some(!0)},i=e.role.fold((()=>({})),(e=>({role:e}))),l=e.tooltip.fold((()=>({})),(e=>{const t=o.providers.translate(e);return{title:t,"aria-label":t}})),c=tb("chevron-down",{tag:"div",classes:[`${t}__select-chevron`]},o.providers.icons),d=la("common-button-display-events"),u=Gh(DS.sketch({...e.uid?{uid:e.uid}:{},...i,dom:{tag:"button",classes:[t,`${t}--select`].concat(H(e.classes,(e=>`${t}--${e}`))),attributes:{...l}},components:Dx([r.map((e=>e.asSpec())),s.map((e=>e.asSpec())),A.some(c)]),matchWidth:!0,useMinWidth:!0,onOpen:(t,o,n)=>{e.searchable&&(e=>{Uv(e).each((e=>oh.focus(e)))})(n)},dropdownBehaviours:kl([...e.dropdownBehaviours,kx((()=>e.disabled||o.providers.isDisabled())),Sx(),Ik.config({}),Kp.config({}),Jp("dropdown-events",[Tx(e,n),Ex(e,n)]),Jp(d,[Kr(((e,t)=>g_(e)))]),Jp("menubutton-update-display-text",[Ur(v_,((e,t)=>{s.bind((t=>t.getOpt(e))).each((e=>{Kp.set(e,[ti(o.providers.translate(t.event.text))])}))})),Ur(y_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{Kp.set(e,[f_(t.event.icon,o.providers.icons)])}))}))])]),eventOrder:fn(m_,{mousedown:["focusing","alloy.base.behaviour","item-type-events","normal-dropdown-events"],[Sr()]:["toolbar-button-events","dropdown-events",d]}),sandboxBehaviours:kl([Pp.config({mode:"special",onLeft:a,onRight:a}),Jp("dropdown-sandbox-events",[Ur(zv,((e,t)=>{(e=>{const t=pu.getValue(e),o=Pv(e).map(Wv);DS.refetch(t).get((()=>{const e=uS.getCoupled(t,"sandbox");o.each((t=>Pv(e).each((e=>((e,t)=>{pu.setValue(e,t.fetchPattern),e.element.dom.selectionStart=t.selectionStart,e.element.dom.selectionEnd=t.selectionEnd})(e,t)))))}))})(e),t.stop()})),Ur(Hv,((e,t)=>{((e,t)=>{(e=>Xd.getState(e).bind(Gm.getHighlighted).bind(Gm.getHighlighted))(e).each((o=>{((e,t,o,n)=>{const s={...n,target:t};e.getSystem().triggerEvent(o,t,s)})(e,o.element,t.event.eventType,t.event.interactionEvent)}))})(e,t),t.stop()}))])]),lazySink:o.getSink,toggleClass:`${t}--active`,parts:{menu:{...Bv(0,e.columns,e.presets),fakeFocus:e.searchable,onHighlightItem:BS,onCollapseMenu:(e,t,o)=>{Gm.getHighlighted(o).each((t=>{BS(e,o,t)}))},onDehighlightItem:FS}},getAnchorOverrides:()=>({maxHeightFunction:(e,t)=>{lc()(e,t-10)}}),fetch:t=>fS(k(e.fetch,t))}));return u.asSpec()},w_=e=>"separator"===e.type,S_={type:"separator"},k_=(e,t)=>{const o=((e,t)=>{const o=j(e,((e,o)=>(e=>r(e))(o)?""===o?e:"|"===o?e.length>0&&!w_(e[e.length-1])?e.concat([S_]):e:ve(t,o.toLowerCase())?e.concat([t[o.toLowerCase()]]):e:e.concat([o])),[]);return o.length>0&&w_(o[o.length-1])&&o.pop(),o})(r(e)?e.split(" "):e,t);return W(o,((e,o)=>{if((e=>ve(e,"getSubmenuItems"))(o)){const n=(e=>{const t=be(e,"value").getOrThunk((()=>la("generated-menu-item")));return fn({value:t},e)})(o),s=((e,t)=>{const o=e.getSubmenuItems(),n=k_(o,t);return{item:e,menus:fn(n.menus,{[e.value]:n.items}),expansions:fn(n.expansions,{[e.value]:e.value})}})(n,t);return{menus:fn(e.menus,s.menus),items:[s.item,...e.items],expansions:fn(e.expansions,s.expansions)}}return{...e,items:[o,...e.items]}}),{menus:{},expansions:{},items:[]})},C_=(e,t,o,n)=>{const s=la("primary-menu"),r=k_(e,o.shared.providers.menuItems());if(0===r.items.length)return A.none();const a=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-field",placeholder:e.placeholder}))))(n),i=zS(s,r.items,t,o,n.isHorizontalMenu,a),l=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-results"}))))(n),c=ce(r.menus,((e,n)=>zS(n,e,t,o,!1,l))),d=fn(c,Ms(s,i));return A.from(Lh.tieredData(s,d,r.expansions))},O_=e=>!ve(e,"items"),__="data-value",T_=(e,t,o,n)=>H(o,(o=>O_(o)?{type:"togglemenuitem",text:o.text,value:o.value,active:o.value===n,onAction:()=>{pu.setValue(e,o.value),Ir(e,hk,{name:t}),oh.focus(e)}}:{type:"nestedmenuitem",text:o.text,getSubmenuItems:()=>T_(e,t,o.items,n)})),E_=(e,t)=>re(e,(e=>O_(e)?Ce(e.value===t,e):E_(e.items,t))),A_=fm({name:"HtmlSelect",configFields:[os("options"),hu("selectBehaviours",[oh,pu]),ys("selectClasses",[]),ys("selectAttributes",{}),us("data")],factory:(e,t)=>{const o=H(e.options,(e=>({dom:{tag:"option",value:e.value,innerHtml:e.text}}))),n=e.data.map((e=>Ms("initialValue",e))).getOr({});return{uid:e.uid,dom:{tag:"select",classes:e.selectClasses,attributes:e.selectAttributes},components:o,behaviours:bu(e.selectBehaviours,[oh.config({}),pu.config({store:{mode:"manual",getValue:e=>$a(e.element),setValue:(t,o)=>{const n=oe(e.options);G(e.options,(e=>e.value===o)).isSome()?qa(t.element,o):-1===t.element.dom.selectedIndex&&""===o&&n.each((e=>qa(t.element,e.value)))},...n}})])}}}),M_=x([ys("field1Name","field1"),ys("field2Name","field2"),Fi("onLockedChange"),Ai(["lockClass"]),ys("locked",!1),vu("coupledFieldBehaviours",[wm,pu])]),D_=(e,t)=>Uu({factory:ak,name:e,overrides:e=>({fieldBehaviours:kl([Jp("coupled-input-behaviour",[Ur(Zs(),(o=>{((e,t,o)=>om(e,t,o).bind(wm.getCurrent))(o,e,t).each((t=>{om(o,e,"lock").each((n=>{dh.isOn(n)&&e.onLockedChange(o,t,n)}))}))}))])])})}),B_=x([D_("field1","field2"),D_("field2","field1"),Uu({factory:Wh,schema:[os("dom")],name:"lock",overrides:e=>({buttonBehaviours:kl([dh.config({selected:e.locked,toggleClass:e.markers.lockClass,aria:{mode:"pressed"}})])})})]),F_=bm({name:"FormCoupledInputs",configFields:M_(),partFields:B_(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:yu(e.coupledFieldBehaviours,[wm.config({find:A.some}),pu.config({store:{mode:"manual",getValue:t=>{const o=im(t,e,["field1","field2"]);return{[e.field1Name]:pu.getValue(o.field1()),[e.field2Name]:pu.getValue(o.field2())}},setValue:(t,o)=>{const n=im(t,e,["field1","field2"]);ye(o,e.field1Name)&&pu.setValue(n.field1(),o[e.field1Name]),ye(o,e.field2Name)&&pu.setValue(n.field2(),o[e.field2Name])}}})]),apis:{getField1:t=>om(t,e,"field1"),getField2:t=>om(t,e,"field2"),getLock:t=>om(t,e,"lock")}}),apis:{getField1:(e,t)=>e.getField1(t),getField2:(e,t)=>e.getField2(t),getLock:(e,t)=>e.getLock(t)}}),I_=e=>{const t=/^\s*(\d+(?:\.\d+)?)\s*(|cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)\s*$/.exec(e);if(null!==t){const e=parseFloat(t[1]),o=t[2];return sn.value({value:e,unit:o})}return sn.error(e)},R_=(e,t)=>{const o={"":96,px:96,pt:72,cm:2.54,pc:12,mm:25.4,in:1},n=e=>ve(o,e);return e.unit===t?A.some(e.value):n(e.unit)&&n(t)?o[e.unit]===o[t]?A.some(e.value):A.some(e.value/o[e.unit]*o[t]):A.none()},N_=e=>A.none(),V_=(e,t)=>{const o=e.label.map((e=>pk(e,t))),n=[Rm.config({disabled:()=>e.disabled||t.isDisabled()}),Sx(),Pp.config({mode:"execution",useEnter:!0!==e.multiline,useControlEnter:!0===e.multiline,execute:e=>(Fr(e,yk),A.some(!0))}),Jp("textfield-change",[Ur(Zs(),((t,o)=>{Ir(t,hk,{name:e.name})})),Ur(cr(),((t,o)=>{Ir(t,hk,{name:e.name})}))]),ck.config({})],s=e.validation.map((e=>Fk.config({getRoot:e=>rt(e.element),invalidClass:"tox-invalid",validator:{validate:t=>{const o=pu.getValue(t),n=e.validator(o);return bS(!0===n?sn.value(o):sn.error(n))},validateOnLoad:e.validateOnLoad}}))).toArray(),r={...e.placeholder.fold(x({}),(e=>({placeholder:t.translate(e)}))),...e.inputMode.fold(x({}),(e=>({inputmode:e})))},a=ak.parts.field({tag:!0===e.multiline?"textarea":"input",...e.data.map((e=>({data:e}))).getOr({}),inputAttributes:r,inputClasses:[e.classname],inputBehaviours:kl(q([n,s])),selectOnFocus:!1,factory:Vv}),i=e.multiline?{dom:{tag:"div",classes:["tox-textarea-wrap"]},components:[a]}:a,l=(e.flex?["tox-form__group--stretched"]:[]).concat(e.maximized?["tox-form-group--maximize"]:[]),c=[Rm.config({disabled:()=>e.disabled||t.isDisabled(),onDisabled:e=>{ak.getField(e).each(Rm.disable)},onEnabled:e=>{ak.getField(e).each(Rm.enable)}}),Sx()];return uk(o,i,l,c)},z_=(e,t)=>t.getAnimationRoot.fold((()=>e.element),(t=>t(e))),H_=e=>e.dimension.property,L_=(e,t)=>e.dimension.getDimension(t),P_=(e,t)=>{const o=z_(e,t);ja(o,[t.shrinkingClass,t.growingClass])},U_=(e,t)=>{Pa(e.element,t.openClass),La(e.element,t.closedClass),Dt(e.element,H_(t),"0px"),Lt(e.element)},W_=(e,t)=>{Pa(e.element,t.closedClass),La(e.element,t.openClass),Ht(e.element,H_(t))},j_=(e,t,o,n)=>{o.setCollapsed(),Dt(e.element,H_(t),L_(t,e.element)),P_(e,t),U_(e,t),t.onStartShrink(e),t.onShrunk(e)},G_=(e,t,o,n)=>{const s=n.getOrThunk((()=>L_(t,e.element)));o.setCollapsed(),Dt(e.element,H_(t),s),Lt(e.element);const r=z_(e,t);Pa(r,t.growingClass),La(r,t.shrinkingClass),U_(e,t),t.onStartShrink(e)},$_=(e,t,o)=>{const n=L_(t,e.element);("0px"===n?j_:G_)(e,t,o,A.some(n))},q_=(e,t,o)=>{const n=z_(e,t),s=Ua(n,t.shrinkingClass),r=L_(t,e.element);W_(e,t);const a=L_(t,e.element);(s?()=>{Dt(e.element,H_(t),r),Lt(e.element)}:()=>{U_(e,t)})(),Pa(n,t.shrinkingClass),La(n,t.growingClass),W_(e,t),Dt(e.element,H_(t),a),o.setExpanded(),t.onStartGrow(e)},X_=(e,t,o)=>{const n=z_(e,t);return!0===Ua(n,t.growingClass)},Y_=(e,t,o)=>{const n=z_(e,t);return!0===Ua(n,t.shrinkingClass)};var K_=Object.freeze({__proto__:null,refresh:(e,t,o)=>{if(o.isExpanded()){Ht(e.element,H_(t));const o=L_(t,e.element);Dt(e.element,H_(t),o)}},grow:(e,t,o)=>{o.isExpanded()||q_(e,t,o)},shrink:(e,t,o)=>{o.isExpanded()&&$_(e,t,o)},immediateShrink:(e,t,o)=>{o.isExpanded()&&j_(e,t,o)},hasGrown:(e,t,o)=>o.isExpanded(),hasShrunk:(e,t,o)=>o.isCollapsed(),isGrowing:X_,isShrinking:Y_,isTransitioning:(e,t,o)=>X_(e,t)||Y_(e,t),toggleGrow:(e,t,o)=>{(o.isExpanded()?$_:q_)(e,t,o)},disableTransitions:P_,immediateGrow:(e,t,o)=>{o.isExpanded()||(W_(e,t),Dt(e.element,H_(t),L_(t,e.element)),P_(e,t),o.setExpanded(),t.onStartGrow(e),t.onGrown(e))}}),J_=Object.freeze({__proto__:null,exhibit:(e,t,o)=>{const n=t.expanded;return Ea(n?{classes:[t.openClass],styles:{}}:{classes:[t.closedClass],styles:Ms(t.dimension.property,"0px")})},events:(e,t)=>Hr([Yr(or(),((o,n)=>{n.event.raw.propertyName===e.dimension.property&&(P_(o,e),t.isExpanded()&&Ht(o.element,e.dimension.property),(t.isExpanded()?e.onGrown:e.onShrunk)(o))}))])}),Z_=[os("closedClass"),os("openClass"),os("shrinkingClass"),os("growingClass"),us("getAnimationRoot"),Di("onShrunk"),Di("onStartShrink"),Di("onGrown"),Di("onStartGrow"),ys("expanded",!1),ns("dimension",Jn("property",{width:[Ri("property","width"),Ri("getDimension",(e=>Jt(e)+"px"))],height:[Ri("property","height"),Ri("getDimension",(e=>Wt(e)+"px"))]}))];const Q_=Ol({fields:Z_,name:"sliding",active:J_,apis:K_,state:Object.freeze({__proto__:null,init:e=>{const t=Es(e.expanded);return _a({isExpanded:()=>!0===t.get(),isCollapsed:()=>!1===t.get(),setCollapsed:k(t.set,!1),setExpanded:k(t.set,!0),readState:()=>"expanded: "+t.get()})}})}),eT=e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t),setActive:t=>{const o=e.element;t?(La(o,"tox-tbtn--enabled"),kt(o,"aria-pressed",!0)):(Pa(o,"tox-tbtn--enabled"),Et(o,"aria-pressed"))},isActive:()=>Ua(e.element,"tox-tbtn--enabled"),setText:t=>{Ir(e,v_,{text:t})},setIcon:t=>Ir(e,y_,{icon:t})}),tT=(e,t,o,n,s=!0)=>x_({text:e.text,icon:e.icon,tooltip:e.tooltip,searchable:e.search.isSome(),role:n,fetch:(t,n)=>{const s={pattern:e.search.isSome()?IS(t):""};e.fetch((t=>{n(C_(t,pv.CLOSE_ON_EXECUTE,o,{isHorizontalMenu:!1,search:e.search}))}),s,eT(t))},onSetup:e.onSetup,getApi:eT,columns:1,presets:"normal",classes:[],dropdownBehaviours:[...s?[ck.config({})]:[]]},t,o.shared),oT=(e,t,o)=>{const n=e=>n=>{const s=!n.isActive();n.setActive(s),e.storage.set(s),o.shared.getSink().each((o=>{t().getOpt(o).each((t=>{Dl(t.element),Ir(t,vk,{name:e.name,value:e.storage.get()})}))}))},s=e=>t=>{t.setActive(e.storage.get())};return t=>{t(H(e,(e=>{const t=e.text.fold((()=>({})),(e=>({text:e})));return{type:e.type,active:!1,...t,onAction:n(e),onSetup:s(e)}})))}},nT=e=>({dom:{tag:"span",classes:["tox-tree__label"],attributes:{title:e,"aria-label":e}},components:[ti(e)]}),sT=la("leaf-label-event-id"),rT=({leaf:e,onLeafAction:t,visible:o,treeId:n,selectedId:s,backstage:r})=>{const a=e.menu.map((e=>tT(e,"tox-mbtn",r,A.none(),o))),i=[nT(e.title)];return a.each((e=>i.push(e))),Wh.sketch({dom:{tag:"div",classes:["tox-tree--leaf__label","tox-trbtn"].concat(o?["tox-tree--leaf__label--visible"]:[])},components:i,role:"treeitem",action:o=>{t(e.id),o.getSystem().broadcastOn([`update-active-item-${n}`],{value:e.id})},eventOrder:{[Ks()]:[sT,"keying"]},buttonBehaviours:kl([...o?[ck.config({})]:[],dh.config({toggleClass:"tox-trbtn--enabled",toggleOnExecute:!1,aria:{mode:"selected"}}),Al.config({channels:{[`update-active-item-${n}`]:{onReceive:(t,o)=>{(o.value===e.id?dh.on:dh.off)(t)}}}}),Jp(sT,[Kr(((t,o)=>{s.each((o=>{(o===e.id?dh.on:dh.off)(t)}))})),Ur(Ks(),((e,t)=>{const o="ArrowLeft"===t.event.raw.code,n="ArrowRight"===t.event.raw.code;o?(mi(e.element,".tox-tree--directory").each((t=>{e.getSystem().getByDom(t).each((e=>{gi(t,".tox-tree--directory__label").each((t=>{e.getSystem().getByDom(t).each(oh.focus)}))}))})),t.stop()):n&&t.stop()}))])])})},aT=la("directory-label-event-id"),iT=({directory:e,visible:t,noChildren:o,backstage:n})=>{const s=e.menu.map((e=>tT(e,"tox-mbtn",n,A.none()))),r=[{dom:{tag:"div",classes:["tox-chevron"]},components:[(a="chevron-right",i=n.shared.providers.icons,((e,t,o)=>tb(e,{tag:"span",classes:["tox-tree__icon-wrap","tox-icon"],behaviours:[]},t))(a,i))]},nT(e.title)];var a,i;s.each((e=>{r.push(e)}));const l=t=>{mi(t.element,".tox-tree--directory").each((o=>{t.getSystem().getByDom(o).each((o=>{const n=!dh.isOn(o);dh.toggle(o),Ir(t,"expand-tree-node",{expanded:n,node:e.id})}))}))};return Wh.sketch({dom:{tag:"div",classes:["tox-tree--directory__label","tox-trbtn"].concat(t?["tox-tree--directory__label--visible"]:[])},components:r,action:l,eventOrder:{[Ks()]:[aT,"keying"]},buttonBehaviours:kl([...t?[ck.config({})]:[],Jp(aT,[Ur(Ks(),((e,t)=>{const n="ArrowRight"===t.event.raw.code,s="ArrowLeft"===t.event.raw.code;n&&o&&t.stop(),(n||s)&&mi(e.element,".tox-tree--directory").each((o=>{e.getSystem().getByDom(o).each((o=>{!dh.isOn(o)&&n||dh.isOn(o)&&s?(l(e),t.stop()):s&&!dh.isOn(o)&&(mi(o.element,".tox-tree--directory").each((e=>{gi(e,".tox-tree--directory__label").each((e=>{o.getSystem().getByDom(e).each(oh.focus)}))})),t.stop())}))}))}))])])})},lT=({children:e,onLeafAction:t,visible:o,treeId:n,expandedIds:s,selectedId:r,backstage:a})=>({dom:{tag:"div",classes:["tox-tree--directory__children"]},components:e.map((e=>"leaf"===e.type?rT({leaf:e,selectedId:r,onLeafAction:t,visible:o,treeId:n,backstage:a}):dT({directory:e,expandedIds:s,selectedId:r,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:a}))),behaviours:kl([Q_.config({dimension:{property:"height"},closedClass:"tox-tree--directory__children--closed",openClass:"tox-tree--directory__children--open",growingClass:"tox-tree--directory__children--growing",shrinkingClass:"tox-tree--directory__children--shrinking",expanded:o}),Kp.config({})])}),cT=la("directory-event-id"),dT=({directory:e,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:s,expandedIds:r,selectedId:a})=>{const{children:i}=e,l=Es(r),c=r.includes(e.id);return{dom:{tag:"div",classes:["tox-tree--directory"],attributes:{role:"treeitem"}},components:[iT({directory:e,visible:o,noChildren:0===e.children.length,backstage:s}),lT({children:i,expandedIds:r,selectedId:a,onLeafAction:t,visible:c,treeId:n,backstage:s})],behaviours:kl([Jp(cT,[Kr(((e,t)=>{dh.set(e,c)})),Ur("expand-tree-node",((e,t)=>{const{expanded:o,node:n}=t.event;l.set(o?[...l.get(),n]:l.get().filter((e=>e!==n)))}))]),dh.config({...e.children.length>0?{aria:{mode:"expanded"}}:{},toggleClass:"tox-tree--directory--expanded",onToggled:(e,o)=>{const r=e.components()[1],c=(d=o,i.map((e=>"leaf"===e.type?rT({leaf:e,selectedId:a,onLeafAction:t,visible:d,treeId:n,backstage:s}):dT({directory:e,expandedIds:l.get(),selectedId:a,onLeafAction:t,labelTabstopping:d,treeId:n,backstage:s}))));var d;o?Q_.grow(r):Q_.shrink(r),Kp.set(r,c)}})])}},uT=la("tree-event-id");var mT=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.stream.streams.setup(e,t);return Hr([Ur(e.event,o),Jr((()=>t.cancel()))].concat(e.cancelEvent.map((e=>[Ur(e,(()=>t.cancel()))])).getOr([])))}});const gT=e=>{const t=Es(null);return _a({readState:()=>({timer:null!==t.get()?"set":"unset"}),setTimer:e=>{t.set(e)},cancel:()=>{const e=t.get();null!==e&&e.cancel()}})};var pT=Object.freeze({__proto__:null,throttle:gT,init:e=>e.stream.streams.state(e)}),hT=[ns("stream",Jn("mode",{throttle:[os("delay"),ys("stopEvent",!0),Ri("streams",{setup:(e,t)=>{const o=e.stream,n=PO(e.onStream,o.delay);return t.setTimer(n),(e,t)=>{n.throttle(e,t),o.stopEvent&&t.stop()}},state:gT})]})),ys("event","input"),us("cancelEvent"),Fi("onStream")];const fT=Ol({fields:hT,name:"streaming",active:mT,state:pT}),bT=(e,t,o)=>{const n=pu.getValue(o);pu.setValue(t,n),yT(t)},vT=(e,t)=>{const o=e.element,n=$a(o),s=o.dom;"number"!==Ot(o,"type")&&t(s,n)},yT=e=>{vT(e,((e,t)=>e.setSelectionRange(t.length,t.length)))},xT=x("alloy.typeahead.itemexecute"),wT=x([us("lazySink"),os("fetch"),ys("minChars",5),ys("responseTime",1e3),Di("onOpen"),ys("getHotspot",A.some),ys("getAnchorOverrides",x({})),ys("layouts",A.none()),ys("eventOrder",{}),Ts("model",{},[ys("getDisplayText",(e=>void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.value)),ys("selectsOver",!0),ys("populateFromBrowse",!0)]),Di("onSetValue"),Bi("onExecute"),Di("onItemExecute"),ys("inputClasses",[]),ys("inputAttributes",{}),ys("inputStyles",{}),ys("matchWidth",!0),ys("useMinWidth",!1),ys("dismissOnBlur",!0),Ai(["openClass"]),us("initialData"),hu("typeaheadBehaviours",[oh,pu,fT,Pp,dh,uS]),es("lazyTypeaheadComp",(()=>Es(A.none))),es("previewing",(()=>Es(!0)))].concat(Fv()).concat(ES())),ST=x([Wu({schema:[Ei()],name:"menu",overrides:e=>({fakeFocus:!0,onHighlightItem:(t,o,n)=>{e.previewing.get()?e.lazyTypeaheadComp.get().each((t=>{((e,t,o)=>{if(e.selectsOver){const n=pu.getValue(t),s=e.getDisplayText(n),r=pu.getValue(o);return 0===e.getDisplayText(r).indexOf(s)?A.some((()=>{bT(0,t,o),((e,t)=>{vT(e,((e,o)=>e.setSelectionRange(t,o.length)))})(t,s.length)})):A.none()}return A.none()})(e.model,t,n).fold((()=>{e.model.selectsOver?(Gm.dehighlight(o,n),e.previewing.set(!0)):e.previewing.set(!1)}),(t=>{t(),e.previewing.set(!1)}))})):e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&bT(e.model,t,n),_t(n.element,"id").each((e=>kt(t.element,"aria-activedescendant",e)))}))},onExecute:(t,o)=>e.lazyTypeaheadComp.get().map((e=>(Ir(e,xT(),{item:o}),!0))),onHover:(t,o)=>{e.previewing.set(!1),e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&bT(e.model,t,o)}))}})})]),kT=bm({name:"Typeahead",configFields:wT(),partFields:ST(),factory:(e,t,o,n)=>{const s=(t,o,s)=>{e.previewing.set(!1);const r=uS.getCoupled(t,"sandbox");if(Xd.isOpen(r))wm.getCurrent(r).each((e=>{Gm.getHighlighted(e).fold((()=>{s(e)}),(()=>{zr(r,e.element,"keydown",o)}))}));else{const o=e=>{wm.getCurrent(e).each(s)};wS(e,a(t),t,r,n,o,zh.HighlightMenuAndItem).get(b)}},r=Iv(e),a=e=>t=>t.map((t=>{const o=fe(t.menus),n=X(o,(e=>U(e.items,(e=>"item"===e.type))));return pu.getState(e).update(H(n,(e=>e.data))),t})),i=e=>wm.getCurrent(e),l="typeaheadevents",c=[oh.config({}),pu.config({onSetValue:e.onSetValue,store:{mode:"dataset",getDataKey:e=>$a(e.element),getFallbackEntry:e=>({value:e,meta:{}}),setValue:(t,o)=>{qa(t.element,e.model.getDisplayText(o))},...e.initialData.map((e=>Ms("initialValue",e))).getOr({})}}),fT.config({stream:{mode:"throttle",delay:e.responseTime,stopEvent:!1},onStream:(t,o)=>{const s=uS.getCoupled(t,"sandbox");if(oh.isFocused(t)&&$a(t.element).length>=e.minChars){const o=i(s).bind((e=>Gm.getHighlighted(e).map(pu.getValue)));e.previewing.set(!0);const r=t=>{i(s).each((t=>{o.fold((()=>{e.model.selectsOver&&Gm.highlightFirst(t)}),(e=>{Gm.highlightBy(t,(t=>pu.getValue(t).value===e.value)),Gm.getHighlighted(t).orThunk((()=>(Gm.highlightFirst(t),A.none())))}))}))};wS(e,a(t),t,s,n,r,zh.HighlightJustMenu).get(b)}},cancelEvent:fr()}),Pp.config({mode:"special",onDown:(e,t)=>(s(e,t,Gm.highlightFirst),A.some(!0)),onEscape:e=>{const t=uS.getCoupled(e,"sandbox");return Xd.isOpen(t)?(Xd.close(t),A.some(!0)):A.none()},onUp:(e,t)=>(s(e,t,Gm.highlightLast),A.some(!0)),onEnter:t=>{const o=uS.getCoupled(t,"sandbox"),n=Xd.isOpen(o);if(n&&!e.previewing.get())return i(o).bind((e=>Gm.getHighlighted(e))).map((e=>(Ir(t,xT(),{item:e}),!0)));{const s=pu.getValue(t);return Fr(t,fr()),e.onExecute(o,t,s),n&&Xd.close(o),A.some(!0)}}}),dh.config({toggleClass:e.markers.openClass,aria:{mode:"expanded"}}),uS.config({others:{sandbox:t=>_S(e,t,{onOpen:()=>dh.on(t),onClose:()=>{e.lazyTypeaheadComp.get().each((e=>Et(e.element,"aria-activedescendant"))),dh.off(t)}})}}),Jp(l,[Kr((t=>{e.lazyTypeaheadComp.set(A.some(t))})),Jr((t=>{e.lazyTypeaheadComp.set(A.none())})),Qr((t=>{const o=b;kS(e,a(t),t,n,o,zh.HighlightMenuAndItem).get(b)})),Ur(xT(),((t,o)=>{const n=uS.getCoupled(t,"sandbox");bT(e.model,t,o.event.item),Fr(t,fr()),e.onItemExecute(t,n,o.event.item,pu.getValue(t)),Xd.close(n),yT(t)}))].concat(e.dismissOnBlur?[Ur(lr(),(e=>{const t=uS.getCoupled(e,"sandbox");Rl(t.element).isNone()&&Xd.close(t)}))]:[]))],d={[kr()]:[pu.name(),fT.name(),l],...e.eventOrder};return{uid:e.uid,dom:Nv(fn(e,{inputAttributes:{role:"combobox","aria-autocomplete":"list","aria-haspopup":"true"}})),behaviours:{...r,...bu(e.typeaheadBehaviours,c)},eventOrder:d}}}),CT=e=>({...e,toCached:()=>CT(e.toCached()),bindFuture:t=>CT(e.bind((e=>e.fold((e=>bS(sn.error(e))),(e=>t(e)))))),bindResult:t=>CT(e.map((e=>e.bind(t)))),mapResult:t=>CT(e.map((e=>e.map(t)))),mapError:t=>CT(e.map((e=>e.mapError(t)))),foldResult:(t,o)=>e.map((e=>e.fold(t,o))),withTimeout:(t,o)=>CT(fS((n=>{let s=!1;const r=setTimeout((()=>{s=!0,n(sn.error(o()))}),t);e.get((e=>{s||(clearTimeout(r),n(e))}))})))}),OT=e=>CT(fS(e)),_T=(e,t,o=[],n,s,r)=>{const a=t.fold((()=>({})),(e=>({action:e}))),i={buttonBehaviours:kl([kx((()=>!e.enabled||r.isDisabled())),Sx(),ck.config({}),Jp("button press",[Pr("click"),Pr("mousedown")])].concat(o)),eventOrder:{click:["button press","alloy.base.behaviour"],mousedown:["button press","alloy.base.behaviour"]},...a},l=fn(i,{dom:n});return fn(l,{components:s})},TT=(e,t,o,n=[])=>{const s={tag:"button",classes:["tox-tbtn"],attributes:e.tooltip.map((e=>({"aria-label":o.translate(e),title:o.translate(e)}))).getOr({})},r=e.icon.map((e=>h_(e,o.icons))),a=Dx([r]);return _T(e,t,n,s,a,o)},ET=e=>{switch(e){case"primary":return["tox-button"];case"toolbar":return["tox-tbtn"];default:return["tox-button","tox-button--secondary"]}},AT=(e,t,o,n=[],s=[])=>{const r=o.translate(e.text),a=e.icon.map((e=>h_(e,o.icons))),i=[a.getOrThunk((()=>ti(r)))],l=e.buttonType.getOr(e.primary||e.borderless?"primary":"secondary"),c=[...ET(l),...a.isSome()?["tox-button--icon"]:[],...e.borderless?["tox-button--naked"]:[],...s];return _T(e,t,n,{tag:"button",classes:c,attributes:{title:r}},i,o)},MT=(e,t,o,n=[],s=[])=>{const r=AT(e,A.some(t),o,n,s);return Wh.sketch(r)},DT=(e,t)=>o=>{"custom"===t?Ir(o,vk,{name:e,value:{}}):"submit"===t?Fr(o,yk):"cancel"===t?Fr(o,bk):console.error("Unknown button type: ",t)},BT=(e,t,o)=>{if(((e,t)=>"menu"===t)(0,t)){const t=()=>r,n=e,s={...e,type:"menubutton",search:A.none(),onSetup:t=>(t.setEnabled(e.enabled),b),fetch:oT(n.items,t,o)},r=Gh(tT(s,"tox-tbtn",o,A.none()));return r.asSpec()}if(((e,t)=>"custom"===t||"cancel"===t||"submit"===t)(0,t)){const n=DT(e.name,t),s={...e,borderless:!1};return MT(s,n,o.shared.providers,[])}if(((e,t)=>"togglebutton"===t)(0,t))return((e,t)=>{var o,n;const s=e.icon.map((e=>f_(e,t.icons))).map(Gh),r=e.buttonType.getOr(e.primary?"primary":"secondary"),a={...e,name:null!==(o=e.name)&&void 0!==o?o:"",primary:"primary"===r,tooltip:A.from(e.tooltip),enabled:null!==(n=e.enabled)&&void 0!==n&&n,borderless:!1},i=a.tooltip.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),l=ET(null!=r?r:"secondary"),c=e.icon.isSome()&&e.text.isSome(),d={tag:"button",classes:[...l.concat(e.icon.isSome()?["tox-button--icon"]:[]),...e.active?["tox-button--enabled"]:[],...c?["tox-button--icon-and-text"]:[]],attributes:i},u=t.translate(e.text.getOr("")),m=ti(u),g=[...Dx([s.map((e=>e.asSpec()))]),...e.text.isSome()?[m]:[]],p=_T(a,A.some((o=>{Ir(o,vk,{name:e.name,value:{setIcon:e=>{s.map((n=>n.getOpt(o).each((o=>{Kp.set(o,[f_(e,t.icons)])}))))}}})})),[],d,g,t);return Wh.sketch(p)})(e,o.shared.providers);throw console.error("Unknown footer button type: ",t),new Error("Unknown footer button type")},FT={type:"separator"},IT=e=>({type:"menuitem",value:e.url,text:e.title,meta:{attach:e.attach},onAction:b}),RT=(e,t)=>({type:"menuitem",value:t,text:e,meta:{attach:void 0},onAction:b}),NT=(e,t)=>(e=>H(e,IT))(((e,t)=>U(t,(t=>t.type===e)))(e,t)),VT=e=>NT("header",e.targets),zT=e=>NT("anchor",e.targets),HT=e=>A.from(e.anchorTop).map((e=>RT("<top>",e))).toArray(),LT=e=>A.from(e.anchorBottom).map((e=>RT("<bottom>",e))).toArray(),PT=(e,t)=>{const o=e.toLowerCase();return U(t,(e=>{var t;const n=void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.text,s=null!==(t=e.value)&&void 0!==t?t:"";return Te(n.toLowerCase(),o)||Te(s.toLowerCase(),o)}))},UT=la("aria-invalid"),WT=(e,t)=>{e.dom.checked=t},jT=e=>e.dom.checked,GT=e=>(t,o,n,s)=>be(o,"name").fold((()=>e(o,s,A.none())),(r=>t.field(r,e(o,s,be(n,r))))),$T={bar:GT(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-bar","tox-form__controls-h-stack"]},components:H(e.items,t.interpreter)}))(e,t.shared))),collection:GT(((e,t,o)=>((e,t,o)=>{const n=e.label.map((e=>pk(e,t))),s=e=>(t,o)=>{hi(o.event.target,"[data-collection-item-value]").each((n=>{e(t,o,n,Ot(n,"data-collection-item-value"))}))},r=s(((o,n,s,r)=>{n.stop(),t.isDisabled()||Ir(o,vk,{name:e.name,value:r})})),a=[Ur(qs(),s(((e,t,o)=>{Dl(o)}))),Ur(er(),r),Ur(gr(),r),Ur(Xs(),s(((e,t,o)=>{pi(e.element,"."+kv).each((e=>{Pa(e,kv)})),La(o,kv)}))),Ur(Ys(),s((e=>{pi(e.element,"."+kv).each((e=>{Pa(e,kv)}))}))),Qr(s(((t,o,n,s)=>{Ir(t,vk,{name:e.name,value:s})})))],i=(e,t)=>H(Xc(e.element,".tox-collection__item"),t),l=ak.parts.field({dom:{tag:"div",classes:["tox-collection"].concat(1!==e.columns?["tox-collection--grid"]:["tox-collection--list"])},components:[],factory:{sketch:w},behaviours:kl([Rm.config({disabled:t.isDisabled,onDisabled:e=>{i(e,(e=>{La(e,"tox-collection__item--state-disabled"),kt(e,"aria-disabled",!0)}))},onEnabled:e=>{i(e,(e=>{Pa(e,"tox-collection__item--state-disabled"),Et(e,"aria-disabled")}))}}),Sx(),Kp.config({}),pu.config({store:{mode:"memory",initialValue:o.getOr([])},onSetValue:(o,n)=>{((o,n)=>{const s=H(n,(o=>{const n=$f.translate(o.text),s=1===e.columns?`<div class="tox-collection__item-label">${n}</div>`:"",r=`<div class="tox-collection__item-icon">${o.icon}</div>`,a={_:" "," - ":" ","-":" "},i=n.replace(/\_| \- |\-/g,(e=>a[e]));return`<div class="tox-collection__item${t.isDisabled()?" tox-collection__item--state-disabled":""}" tabindex="-1" data-collection-item-value="${dk.encodeAllRaw(o.value)}" title="${i}" aria-label="${i}">${r}${s}</div>`})),r="auto"!==e.columns&&e.columns>1?z(s,e.columns):[s],a=H(r,(e=>`<div class="tox-collection__group">${e.join("")}</div>`));ta(o.element,a.join(""))})(o,n),"auto"===e.columns&&ix(o,5,"tox-collection__item").each((({numRows:e,numColumns:t})=>{Pp.setGridSize(o,e,t)})),Fr(o,kk)}}),ck.config({}),Pp.config((c=e.columns,1===c?{mode:"menu",moveOnTab:!1,selector:".tox-collection__item"}:"auto"===c?{mode:"flatgrid",selector:".tox-collection__item",initSize:{numColumns:1,numRows:1}}:{mode:"matrix",selectors:{row:".tox-collection__group",cell:`.${fv}`}})),Jp("collection-events",a)]),eventOrder:{[ur()]:["disabling","alloy.base.behaviour","collection-events"]}});var c;return uk(n,l,["tox-form__group--collection"],[])})(e,t.shared.providers,o))),alertbanner:GT(((e,t)=>((e,t)=>{const o=Zf(e.icon,t.icons);return ok.sketch({dom:{tag:"div",attributes:{role:"alert"},classes:["tox-notification","tox-notification--in",`tox-notification--${e.level}`]},components:[{dom:{tag:"div",classes:["tox-notification__icon"],innerHtml:e.url?void 0:o},components:e.url?[Wh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--naked","tox-button--icon"],innerHtml:o,attributes:{title:t.translate(e.iconTooltip)}},action:t=>Ir(t,vk,{name:"alert-banner",value:e.url}),buttonBehaviours:kl([Qf()])})]:void 0},{dom:{tag:"div",classes:["tox-notification__body"],innerHtml:t.translate(e.text)}}]})})(e,t.shared.providers))),input:GT(((e,t,o)=>((e,t,o)=>V_({name:e.name,multiline:!1,label:e.label,inputMode:e.inputMode,placeholder:e.placeholder,flex:!1,disabled:!e.enabled,classname:"tox-textfield",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),textarea:GT(((e,t,o)=>((e,t,o)=>V_({name:e.name,multiline:!0,label:e.label,inputMode:A.none(),placeholder:e.placeholder,flex:!0,disabled:!e.enabled,classname:"tox-textarea",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),label:GT(((e,t)=>((e,t)=>{const o="tox-label";return{dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"label",classes:[o,..."center"===e.align?[`${o}--center`]:[],..."end"===e.align?[`${o}--end`]:[]]},components:[ti(t.providers.translate(e.label))]},...H(e.items,t.interpreter)],behaviours:kl([DO(),Kp.config({}),(n=A.none(),NO(n,ea,ta)),Pp.config({mode:"acyclic"})])};var n})(e,t.shared))),iframe:(vA=(e,t,o)=>((e,t,o)=>{const n="tox-dialog__iframe",s=e.transparent?[]:[`${n}--opaque`],r=e.border?["tox-navobj-bordered"]:[],a={...e.label.map((e=>({title:e}))).getOr({}),...o.map((e=>({srcdoc:e}))).getOr({}),...e.sandboxed?{sandbox:"allow-scripts allow-same-origin"}:{}},i=((e,t)=>{const o=Es(e.getOr(""));return{getValue:e=>o.get(),setValue:(e,n)=>{if(o.get()!==n){const o=e.element,s=()=>kt(o,"srcdoc",n);t?c_.fold(x(l_),(e=>e.throttle))(o,n,s):s()}o.set(n)}}})(o,e.streamContent),l=e.label.map((e=>pk(e,t))),c=ak.parts.field({factory:{sketch:e=>GO(A.from(r),{uid:e.uid,dom:{tag:"iframe",attributes:a,classes:[n,...s]},behaviours:kl([ck.config({}),oh.config({}),RO(o,i.getValue,i.setValue),Al.config({channels:{[e_]:{onReceive:(e,t)=>{t.newFocus.each((t=>{rt(e.element).each((o=>{(Ze(e.element,t)?La:Pa)(o,"tox-navobj-bordered-focus")}))}))}}}})])})}});return uk(l,c,["tox-form__group--stretched"],[])})(e,t.shared.providers,o),(e,t,o,n)=>{const s=fn(t,{source:"dynamic"});return GT(vA)(e,s,o,n)}),button:GT(((e,t)=>((e,t)=>{const o=DT(e.name,"custom");return n=A.none(),s=ak.parts.field({factory:Wh,...AT(e,A.some(o),t,[VO(""),DO()])}),uk(n,s,[],[]);var n,s})(e,t.shared.providers))),checkbox:GT(((e,t,o)=>((e,t,o)=>{const n=e=>(e.element.dom.click(),A.some(!0)),s=ak.parts.field({factory:{sketch:w},dom:{tag:"input",classes:["tox-checkbox__input"],attributes:{type:"checkbox"}},behaviours:kl([DO(),Rm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{rt(e.element).each((e=>La(e,"tox-checkbox--disabled")))},onEnabled:e=>{rt(e.element).each((e=>Pa(e,"tox-checkbox--disabled")))}}),ck.config({}),oh.config({}),NO(o,jT,WT),Pp.config({mode:"special",onEnter:n,onSpace:n,stopSpaceKeyup:!0}),Jp("checkbox-events",[Ur(Qs(),((t,o)=>{Ir(t,hk,{name:e.name})}))])])}),r=ak.parts.label({dom:{tag:"span",classes:["tox-checkbox__label"]},components:[ti(t.translate(e.label))],behaviours:kl([Ik.config({})])}),a=e=>tb("checked"===e?"selected":"unselected",{tag:"span",classes:["tox-icon","tox-checkbox-icon__"+e]},t.icons),i=Gh({dom:{tag:"div",classes:["tox-checkbox__icons"]},components:[a("checked"),a("unchecked")]});return ak.sketch({dom:{tag:"label",classes:["tox-checkbox"]},components:[s,i.asSpec(),r],fieldBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled()}),Sx()])})})(e,t.shared.providers,o))),colorinput:GT(((e,t,o)=>((e,t,o,n)=>{const s=ak.parts.field({factory:Vv,inputClasses:["tox-textfield"],data:n,onSetValue:e=>Fk.run(e).get(b),inputBehaviours:kl([Rm.config({disabled:t.providers.isDisabled}),Sx(),ck.config({}),Fk.config({invalidClass:"tox-textbox-field-invalid",getRoot:e=>rt(e.element),notify:{onValid:e=>{const t=pu.getValue(e);Ir(e,Rk,{color:t})}},validator:{validateOnLoad:!1,validate:e=>{const t=pu.getValue(e);if(0===t.length)return bS(sn.value(!0));{const e=Re("span");Dt(e,"background-color",t);const o=Nt(e,"background-color").fold((()=>sn.error("blah")),(e=>sn.value(t)));return bS(o)}}}})]),selectOnFocus:!1}),r=e.label.map((e=>pk(e,t.providers))),a=(e,t)=>{Ir(e,Nk,{value:t})},i=Gh(((e,t)=>DS.sketch({dom:e.dom,components:e.components,toggleClass:"mce-active",dropdownBehaviours:kl([kx(t.providers.isDisabled),Sx(),Ik.config({}),ck.config({})]),layouts:e.layouts,sandboxClasses:["tox-dialog__popups"],lazySink:t.getSink,fetch:o=>fS((t=>e.fetch(t))).map((n=>A.from(HS(fn(Zw(la("menu-value"),n,(t=>{e.onItemAction(o,t)}),e.columns,e.presets,pv.CLOSE_ON_EXECUTE,T,t.providers),{movement:eS(e.columns,e.presets)}))))),parts:{menu:Bv(0,0,e.presets)}}))({dom:{tag:"span",attributes:{"aria-label":t.providers.translate("Color swatch")}},layouts:{onRtl:()=>[rl,sl,cl],onLtr:()=>[sl,rl,cl]},components:[],fetch:$w(o.getColors(e.storageKey),e.storageKey,o.hasCustomColors()),columns:o.getColorCols(e.storageKey),presets:"color",onItemAction:(t,n)=>{i.getOpt(t).each((t=>{"custom"===n?o.colorPicker((o=>{o.fold((()=>Fr(t,Vk)),(o=>{a(t,o),Ow(e.storageKey,o)}))}),"#ffffff"):a(t,"remove"===n?"":n)}))}},t));return ak.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:r.toArray().concat([{dom:{tag:"div",classes:["tox-color-input"]},components:[s,i.asSpec()]}]),fieldBehaviours:kl([Jp("form-field-events",[Ur(Rk,((t,o)=>{i.getOpt(t).each((e=>{Dt(e.element,"background-color",o.event.color)})),Ir(t,hk,{name:e.name})})),Ur(Nk,((e,t)=>{ak.getField(e).each((o=>{pu.setValue(o,t.event.value),wm.getCurrent(e).each(oh.focus)}))})),Ur(Vk,((e,t)=>{ak.getField(e).each((t=>{wm.getCurrent(e).each(oh.focus)}))}))])])})})(e,t.shared,t.colorinput,o))),colorpicker:GT(((e,t,o)=>((e,t,o)=>{const n=e=>"tox-"+e,s=MO((e=>t=>e.translate(zO[t]))(t),n),r=Gh(s.sketch({dom:{tag:"div",classes:[n("color-picker-container")],attributes:{role:"presentation"}},onValidHex:e=>{Ir(e,vk,{name:"hex-valid",value:!0})},onInvalidHex:e=>{Ir(e,vk,{name:"hex-valid",value:!1})}}));return{dom:{tag:"div"},components:[r.asSpec()],behaviours:kl([RO(o,(e=>{const t=r.get(e);return wm.getCurrent(t).bind((e=>pu.getValue(e).hex)).map((e=>"#"+_e(e,"#"))).getOr("")}),((e,t)=>{const o=A.from(/^#([a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?)/.exec(t)).bind((e=>te(e,1))),n=r.get(e);wm.getCurrent(n).fold((()=>{console.log("Can not find form")}),(e=>{pu.setValue(e,{hex:o.getOr("")}),CO.getField(e,"hex").each((e=>{Fr(e,Zs())}))}))})),DO()])}})(0,t.shared.providers,o))),dropzone:GT(((e,t,o)=>((e,t,o)=>{const n=(e,t)=>{t.stop()},s=e=>(t,o)=>{L(e,(e=>{e(t,o)}))},r=(e,t)=>{var o;if(!Rm.isDisabled(e)){const n=t.event.raw;i(e,null===(o=n.dataTransfer)||void 0===o?void 0:o.files)}},a=(e,t)=>{const o=t.event.raw.target;i(e,o.files)},i=(o,n)=>{n&&(pu.setValue(o,((e,t)=>{const o=LO.explode(t.getOption("images_file_types"));return U(se(e),(e=>N(o,(t=>Ae(e.name.toLowerCase(),`.${t.toLowerCase()}`)))))})(n,t)),Ir(o,hk,{name:e.name}))},l=Gh({dom:{tag:"input",attributes:{type:"file",accept:"image/*"},styles:{display:"none"}},behaviours:kl([Jp("input-file-events",[qr(er()),qr(gr())])])}),c=e.label.map((e=>pk(e,t))),d=ak.parts.field({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-dropzone-container"]},behaviours:kl([VO(o.getOr([])),DO(),Rm.config({}),dh.config({toggleClass:"dragenter",toggleOnExecute:!1}),Jp("dropzone-events",[Ur("dragenter",s([n,dh.toggle])),Ur("dragleave",s([n,dh.toggle])),Ur("dragover",n),Ur("drop",s([n,r])),Ur(Qs(),a)])]),components:[{dom:{tag:"div",classes:["tox-dropzone"],styles:{}},components:[{dom:{tag:"p"},components:[ti(t.translate("Drop an image here"))]},Wh.sketch({dom:{tag:"button",styles:{position:"relative"},classes:["tox-button","tox-button--secondary"]},components:[ti(t.translate("Browse for an image")),l.asSpec()],action:e=>{l.get(e).element.dom.click()},buttonBehaviours:kl([ck.config({}),kx(t.isDisabled),Sx()])})]}]})}});return uk(c,d,["tox-form__group--stretched"],[])})(e,t.shared.providers,o))),grid:GT(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-form__grid",`tox-form__grid--${e.columns}col`]},components:H(e.items,t.interpreter)}))(e,t.shared))),listbox:GT(((e,t,o)=>((e,t,o)=>{const n=t.shared.providers,s=o.bind((t=>E_(e.items,t))).orThunk((()=>oe(e.items).filter(O_))),r=e.label.map((e=>pk(e,n))),a=ak.parts.field({dom:{},factory:{sketch:o=>x_({uid:o.uid,text:s.map((e=>e.text)),icon:A.none(),tooltip:e.label,role:A.none(),fetch:(o,n)=>{const s=T_(o,e.name,e.items,pu.getValue(o));n(C_(s,pv.CLOSE_ON_EXECUTE,t,{isHorizontalMenu:!1,search:A.none()}))},onSetup:x(b),getApi:x({}),columns:1,presets:"normal",classes:[],dropdownBehaviours:[ck.config({}),RO(s.map((e=>e.value)),(e=>Ot(e.element,__)),((t,o)=>{E_(e.items,o).each((e=>{kt(t.element,__,e.value),Ir(t,v_,{text:e.text})}))}))]},"tox-listbox",t.shared)}}),i={dom:{tag:"div",classes:["tox-listboxfield"]},components:[a]};return ak.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([r.toArray(),[i]]),fieldBehaviours:kl([Rm.config({disabled:x(!e.enabled),onDisabled:e=>{ak.getField(e).each(Rm.disable)},onEnabled:e=>{ak.getField(e).each(Rm.enable)}})])})})(e,t,o))),selectbox:GT(((e,t,o)=>((e,t,o)=>{const n=H(e.items,(e=>({text:t.translate(e.text),value:e.value}))),s=e.label.map((e=>pk(e,t))),r=ak.parts.field({dom:{},...o.map((e=>({data:e}))).getOr({}),selectAttributes:{size:e.size},options:n,factory:A_,selectBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled()}),ck.config({}),Jp("selectbox-change",[Ur(Qs(),((t,o)=>{Ir(t,hk,{name:e.name})}))])])}),a=e.size>1?A.none():A.some(tb("chevron-down",{tag:"div",classes:["tox-selectfield__icon-js"]},t.icons)),i={dom:{tag:"div",classes:["tox-selectfield"]},components:q([[r],a.toArray()])};return ak.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([s.toArray(),[i]]),fieldBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{ak.getField(e).each(Rm.disable)},onEnabled:e=>{ak.getField(e).each(Rm.enable)}}),Sx()])})})(e,t.shared.providers,o))),sizeinput:GT(((e,t)=>((e,t)=>{let o=N_;const n=la("ratio-event"),s=e=>tb(e,{tag:"span",classes:["tox-icon","tox-lock-icon__"+e]},t.icons),r=F_.parts.lock({dom:{tag:"button",classes:["tox-lock","tox-button","tox-button--naked","tox-button--icon"],attributes:{title:t.translate(e.label.getOr("Constrain proportions"))}},components:[s("lock"),s("unlock")],buttonBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled()}),Sx(),ck.config({})])}),a=e=>({dom:{tag:"div",classes:["tox-form__group"]},components:e}),i=o=>ak.parts.field({factory:Vv,inputClasses:["tox-textfield"],inputBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled()}),Sx(),ck.config({}),Jp("size-input-events",[Ur(Xs(),((e,t)=>{Ir(e,n,{isField1:o})})),Ur(Qs(),((t,o)=>{Ir(t,hk,{name:e.name})}))])]),selectOnFocus:!1}),l=e=>({dom:{tag:"label",classes:["tox-label"]},components:[ti(t.translate(e))]}),c=F_.parts.field1(a([ak.parts.label(l("Width")),i(!0)])),d=F_.parts.field2(a([ak.parts.label(l("Height")),i(!1)]));return F_.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:[c,d,a([l("\xa0"),r])]}],field1Name:"width",field2Name:"height",locked:!0,markers:{lockClass:"tox-locked"},onLockedChange:(e,t,n)=>{I_(pu.getValue(e)).each((e=>{o(e).each((e=>{pu.setValue(t,(e=>{const t={"":0,px:0,pt:1,mm:1,pc:2,ex:2,em:2,ch:2,rem:2,cm:3,in:4,"%":4};let o=e.value.toFixed((n=e.unit)in t?t[n]:1);var n;return-1!==o.indexOf(".")&&(o=o.replace(/\.?0*$/,"")),o+e.unit})(e))}))}))},coupledFieldBehaviours:kl([Rm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{F_.getField1(e).bind(ak.getField).each(Rm.disable),F_.getField2(e).bind(ak.getField).each(Rm.disable),F_.getLock(e).each(Rm.disable)},onEnabled:e=>{F_.getField1(e).bind(ak.getField).each(Rm.enable),F_.getField2(e).bind(ak.getField).each(Rm.enable),F_.getLock(e).each(Rm.enable)}}),Sx(),Jp("size-input-events2",[Ur(n,((e,t)=>{const n=t.event.isField1,s=n?F_.getField1(e):F_.getField2(e),r=n?F_.getField2(e):F_.getField1(e),a=s.map(pu.getValue).getOr(""),i=r.map(pu.getValue).getOr("");o=((e,t)=>{const o=I_(e).toOptional(),n=I_(t).toOptional();return Se(o,n,((e,t)=>R_(e,t.unit).map((e=>t.value/e)).map((e=>{return o=e,n=t.unit,e=>R_(e,n).map((e=>({value:e*o,unit:n})));var o,n})).getOr(N_))).getOr(N_)})(a,i)}))])])})})(e,t.shared.providers))),slider:GT(((e,t,o)=>((e,t,o)=>{const n=fO.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ti(t.translate(e.label))]}),s=fO.parts.spectrum({dom:{tag:"div",classes:["tox-slider__rail"],attributes:{role:"presentation"}}}),r=fO.parts.thumb({dom:{tag:"div",classes:["tox-slider__handle"],attributes:{role:"presentation"}}});return fO.sketch({dom:{tag:"div",classes:["tox-slider"],attributes:{role:"presentation"}},model:{mode:"x",minX:e.min,maxX:e.max,getInitialValue:x(o.getOrThunk((()=>(Math.abs(e.max)-Math.abs(e.min))/2)))},components:[n,s,r],sliderBehaviours:kl([DO(),oh.config({})]),onChoose:(t,o,n)=>{Ir(t,hk,{name:e.name,value:n})}})})(e,t.shared.providers,o))),urlinput:GT(((e,t,o)=>((e,t,o,n)=>{const s=t.shared.providers,r=t=>{const n=pu.getValue(t);o.addToHistory(n.value,e.filetype)},a={...n.map((e=>({initialData:e}))).getOr({}),dismissOnBlur:!0,inputClasses:["tox-textfield"],sandboxClasses:["tox-dialog__popups"],inputAttributes:{"aria-errormessage":UT,type:"url"},minChars:0,responseTime:0,fetch:n=>{const s=((e,t,o)=>{var n,s;const r=pu.getValue(t),a=null!==(s=null===(n=null==r?void 0:r.meta)||void 0===n?void 0:n.text)&&void 0!==s?s:r.value;return o.getLinkInformation().fold((()=>[]),(t=>{const n=PT(a,(e=>H(e,(e=>RT(e,e))))(o.getHistory(e)));return"file"===e?(s=[n,PT(a,VT(t)),PT(a,q([HT(t),zT(t),LT(t)]))],j(s,((e,t)=>0===e.length||0===t.length?e.concat(t):e.concat(FT,t)),[])):n;var s}))})(e.filetype,n,o),r=C_(s,pv.BUBBLE_TO_SANDBOX,t,{isHorizontalMenu:!1,search:A.none()});return bS(r)},getHotspot:e=>g.getOpt(e),onSetValue:(e,t)=>{e.hasConfigured(Fk)&&Fk.run(e).get(b)},typeaheadBehaviours:kl([...o.getValidationHandler().map((t=>Fk.config({getRoot:e=>rt(e.element),invalidClass:"tox-control-wrap--status-invalid",notify:{onInvalid:(e,t)=>{c.getOpt(e).each((e=>{kt(e.element,"title",s.translate(t))}))}},validator:{validate:o=>{const n=pu.getValue(o);return OT((o=>{t({type:e.filetype,url:n.value},(e=>{if("invalid"===e.status){const t=sn.error(e.message);o(t)}else{const t=sn.value(e.message);o(t)}}))}))},validateOnLoad:!1}}))).toArray(),Rm.config({disabled:()=>!e.enabled||s.isDisabled()}),ck.config({}),Jp("urlinput-events",[Ur(Zs(),(t=>{const o=$a(t.element),n=o.trim();n!==o&&qa(t.element,n),"file"===e.filetype&&Ir(t,hk,{name:e.name})})),Ur(Qs(),(t=>{Ir(t,hk,{name:e.name}),r(t)})),Ur(cr(),(t=>{Ir(t,hk,{name:e.name}),r(t)}))])]),eventOrder:{[Zs()]:["streaming","urlinput-events","invalidating"]},model:{getDisplayText:e=>e.value,selectsOver:!1,populateFromBrowse:!1},markers:{openClass:"tox-textfield--popup-open"},lazySink:t.shared.getSink,parts:{menu:Bv(0,0,"normal")},onExecute:(e,t,o)=>{Ir(t,yk,{})},onItemExecute:(t,o,n,s)=>{r(t),Ir(t,hk,{name:e.name})}},i=ak.parts.field({...a,factory:kT}),l=e.label.map((e=>pk(e,s))),c=Gh(((e,t,o=e,n=e)=>tb(o,{tag:"div",classes:["tox-icon","tox-control-wrap__status-icon-"+e],attributes:{title:s.translate(n),"aria-live":"polite",...t.fold((()=>({})),(e=>({id:e})))}},s.icons))("invalid",A.some(UT),"warning")),d=Gh({dom:{tag:"div",classes:["tox-control-wrap__status-icon-wrap"]},components:[c.asSpec()]}),u=o.getUrlPicker(e.filetype),m=la("browser.url.event"),g=Gh({dom:{tag:"div",classes:["tox-control-wrap"]},components:[i,d.asSpec()],behaviours:kl([Rm.config({disabled:()=>!e.enabled||s.isDisabled()})])}),p=Gh(MT({name:e.name,icon:A.some("browse"),text:e.label.getOr(""),enabled:e.enabled,primary:!1,buttonType:A.none(),borderless:!0},(e=>Fr(e,m)),s,[],["tox-browse-url"]));return ak.sketch({dom:gk([]),components:l.toArray().concat([{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:q([[g.asSpec()],u.map((()=>p.asSpec())).toArray()])}]),fieldBehaviours:kl([Rm.config({disabled:()=>!e.enabled||s.isDisabled(),onDisabled:e=>{ak.getField(e).each(Rm.disable),p.getOpt(e).each(Rm.disable)},onEnabled:e=>{ak.getField(e).each(Rm.enable),p.getOpt(e).each(Rm.enable)}}),Sx(),Jp("url-input-events",[Ur(m,(t=>{wm.getCurrent(t).each((o=>{const n=pu.getValue(o),s={fieldname:e.name,...n};u.each((n=>{n(s).get((n=>{pu.setValue(o,n),Ir(t,hk,{name:e.name})}))}))}))}))])])})})(e,t,t.urlinput,o))),customeditor:GT((e=>{const t=Ql(),o=Gh({dom:{tag:e.tag}}),n=Ql();return{dom:{tag:"div",classes:["tox-custom-editor"]},behaviours:kl([Jp("custom-editor-events",[Kr((s=>{o.getOpt(s).each((o=>{((e=>ve(e,"init"))(e)?e.init(o.element.dom):HO.load(e.scriptId,e.scriptUrl).then((t=>t(o.element.dom,e.settings)))).then((e=>{n.on((t=>{e.setValue(t)})),n.clear(),t.set(e)}))}))}))]),RO(A.none(),(()=>t.get().fold((()=>n.get().getOr("")),(e=>e.getValue()))),((e,o)=>{t.get().fold((()=>n.set(o)),(e=>e.setValue(o)))})),DO()]),components:[o.asSpec()]}})),htmlpanel:GT((e=>"presentation"===e.presets?ok.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html}}):ok.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html,attributes:{role:"document"}},containerBehaviours:kl([ck.config({}),oh.config({})])}))),imagepreview:GT(((e,t,o)=>((e,t)=>{const o=Es(t.getOr({url:""})),n=Gh({dom:{tag:"img",classes:["tox-imagepreview__image"],attributes:t.map((e=>({src:e.url}))).getOr({})}}),s=Gh({dom:{tag:"div",classes:["tox-imagepreview__container"],attributes:{role:"presentation"}},components:[n.asSpec()]}),r={};e.height.each((e=>r.height=e));const a=t.map((e=>({url:e.url,zoom:A.from(e.zoom),cachedWidth:A.from(e.cachedWidth),cachedHeight:A.from(e.cachedHeight)})));return{dom:{tag:"div",classes:["tox-imagepreview"],styles:r,attributes:{role:"presentation"}},components:[s.asSpec()],behaviours:kl([DO(),RO(a,(()=>o.get()),((e,t)=>{const r={url:t.url};t.zoom.each((e=>r.zoom=e)),t.cachedWidth.each((e=>r.cachedWidth=e)),t.cachedHeight.each((e=>r.cachedHeight=e)),o.set(r);const a=()=>{const{cachedWidth:t,cachedHeight:o,zoom:n}=r;if(!u(t)&&!u(o)){if(u(n)){const n=((e,t,o)=>{const n=Jt(e),s=Wt(e);return Math.min(n/t,s/o,1)})(e.element,t,o);r.zoom=n}const a=((e,t,o,n,s)=>{const r=o*s,a=n*s,i=Math.max(0,e/2-r/2),l=Math.max(0,t/2-a/2);return{left:i.toString()+"px",top:l.toString()+"px",width:r.toString()+"px",height:a.toString()+"px"}})(Jt(e.element),Wt(e.element),t,o,r.zoom);s.getOpt(e).each((e=>{Bt(e.element,a)}))}};n.getOpt(e).each((o=>{const n=o.element;var s;t.url!==Ot(n,"src")&&(kt(n,"src",t.url),Pa(e.element,"tox-imagepreview__loaded")),a(),(s=n,new Promise(((e,t)=>{const o=()=>{r(),e(s)},n=[tc(s,"load",o),tc(s,"error",(()=>{r(),t("Unable to load data from image: "+s.dom.src)}))],r=()=>L(n,(e=>e.unbind()));s.dom.complete&&o()}))).then((t=>{e.getSystem().isConnected()&&(La(e.element,"tox-imagepreview__loaded"),r.cachedWidth=t.dom.naturalWidth,r.cachedHeight=t.dom.naturalHeight,a())}))}))}))])}})(e,o))),table:GT(((e,t)=>((e,t)=>{const o=e=>({dom:{tag:"td",innerHtml:t.translate(e)}});return{dom:{tag:"table",classes:["tox-dialog__table"]},components:[(s=e.header,{dom:{tag:"thead"},components:[{dom:{tag:"tr"},components:H(s,(e=>({dom:{tag:"th",innerHtml:t.translate(e)}})))}]}),(n=e.cells,{dom:{tag:"tbody"},components:H(n,(e=>({dom:{tag:"tr"},components:H(e,o)})))})],behaviours:kl([ck.config({}),oh.config({})])};var n,s})(e,t.shared.providers))),tree:GT(((e,t)=>((e,t)=>{const o=e.onLeafAction.getOr(b),n=e.onToggleExpand.getOr(b),s=e.defaultExpandedIds,r=Es(s),a=Es(e.defaultSelectedId),i=la("tree-id"),l=(n,s)=>e.items.map((e=>"leaf"===e.type?rT({leaf:e,selectedId:n,onLeafAction:o,visible:!0,treeId:i,backstage:t}):dT({directory:e,selectedId:n,onLeafAction:o,expandedIds:s,labelTabstopping:!0,treeId:i,backstage:t})));return{dom:{tag:"div",classes:["tox-tree"],attributes:{role:"tree"}},components:l(a.get(),r.get()),behaviours:kl([Pp.config({mode:"flow",selector:".tox-tree--leaf__label--visible, .tox-tree--directory__label--visible",cycles:!1}),Jp(uT,[Ur("expand-tree-node",((e,t)=>{const{expanded:o,node:s}=t.event;r.set(o?[...r.get(),s]:r.get().filter((e=>e!==s))),n(r.get(),{expanded:o,node:s})}))]),Al.config({channels:{[`update-active-item-${i}`]:{onReceive:(e,t)=>{a.set(A.some(t.value)),Kp.set(e,l(A.some(t.value),r.get()))}}}}),Kp.config({})])}})(e,t))),panel:GT(((e,t)=>((e,t)=>({dom:{tag:"div",classes:e.classes},components:H(e.items,t.shared.interpreter)}))(e,t)))},qT={field:(e,t)=>t,record:x([])},XT=(e,t,o,n)=>{const s=fn(n,{shared:{interpreter:t=>YT(e,t,o,s)}});return YT(e,t,o,s)},YT=(e,t,o,n)=>be($T,t.type).fold((()=>(console.error(`Unknown factory type "${t.type}", defaulting to container: `,t),t)),(s=>s(e,t,o,n))),KT=(e,t,o)=>YT(qT,e,t,o),JT="layout-inset",ZT=e=>e.x,QT=(e,t)=>e.x+e.width/2-t.width/2,eE=(e,t)=>e.x+e.width-t.width,tE=e=>e.y,oE=(e,t)=>e.y+e.height-t.height,nE=(e,t)=>e.y+e.height/2-t.height/2,sE=(e,t,o)=>zi(eE(e,t),oE(e,t),o.insetSouthwest(),Wi(),"southwest",Ki(e,{right:0,bottom:3}),JT),rE=(e,t,o)=>zi(ZT(e),oE(e,t),o.insetSoutheast(),Ui(),"southeast",Ki(e,{left:1,bottom:3}),JT),aE=(e,t,o)=>zi(eE(e,t),tE(e),o.insetNorthwest(),Pi(),"northwest",Ki(e,{right:0,top:2}),JT),iE=(e,t,o)=>zi(ZT(e),tE(e),o.insetNortheast(),Li(),"northeast",Ki(e,{left:1,top:2}),JT),lE=(e,t,o)=>zi(QT(e,t),tE(e),o.insetNorth(),ji(),"north",Ki(e,{top:2}),JT),cE=(e,t,o)=>zi(QT(e,t),oE(e,t),o.insetSouth(),Gi(),"south",Ki(e,{bottom:3}),JT),dE=(e,t,o)=>zi(eE(e,t),nE(e,t),o.insetEast(),qi(),"east",Ki(e,{right:0}),JT),uE=(e,t,o)=>zi(ZT(e),nE(e,t),o.insetWest(),$i(),"west",Ki(e,{left:1}),JT),mE=e=>{switch(e){case"north":return lE;case"northeast":return iE;case"northwest":return aE;case"south":return cE;case"southeast":return rE;case"southwest":return sE;case"east":return dE;case"west":return uE}},gE=(e,t,o,n,s)=>Xl(n).map(mE).getOr(lE)(e,t,o,n,s),pE=e=>{switch(e){case"north":return cE;case"northeast":return rE;case"northwest":return sE;case"south":return lE;case"southeast":return iE;case"southwest":return aE;case"east":return uE;case"west":return dE}},hE=(e,t,o,n,s)=>Xl(n).map(pE).getOr(lE)(e,t,o,n,s),fE={valignCentre:[],alignCentre:[],alignLeft:[],alignRight:[],right:[],left:[],bottom:[],top:[]},bE=(e,t,o)=>{const n={maxHeightFunction:cc()};return()=>o()?{type:"node",root:ft(ht(e())),node:A.from(e()),bubble:gc(12,12,fE),layouts:{onRtl:()=>[iE],onLtr:()=>[aE]},overrides:n}:{type:"hotspot",hotspot:t(),bubble:gc(-12,12,fE),layouts:{onRtl:()=>[sl,rl,cl],onLtr:()=>[rl,sl,cl]},overrides:n}},vE=(e,t,o,n)=>{const s={maxHeightFunction:cc()};return()=>n()?{type:"node",root:ft(ht(t())),node:A.from(t()),bubble:gc(12,12,fE),layouts:{onRtl:()=>[lE],onLtr:()=>[lE]},overrides:s}:e?{type:"node",root:ft(ht(t())),node:A.from(t()),bubble:gc(0,-jt(t()),fE),layouts:{onRtl:()=>[ll],onLtr:()=>[ll]},overrides:s}:{type:"hotspot",hotspot:o(),bubble:gc(0,0,fE),layouts:{onRtl:()=>[ll],onLtr:()=>[ll]},overrides:s}},yE=(e,t,o)=>()=>o()?{type:"node",root:ft(ht(e())),node:A.from(e()),layouts:{onRtl:()=>[lE],onLtr:()=>[lE]}}:{type:"hotspot",hotspot:t(),layouts:{onRtl:()=>[cl],onLtr:()=>[cl]}},xE=(e,t)=>()=>({type:"selection",root:t(),getSelection:()=>{const t=e.selection.getRng(),o=e.model.table.getSelectedCells();if(o.length>1){const e=o[0],t=o[o.length-1],n={firstCell:Ve(e),lastCell:Ve(t)};return A.some(n)}return A.some(Lc.range(Ve(t.startContainer),t.startOffset,Ve(t.endContainer),t.endOffset))}}),wE=e=>t=>({type:"node",root:e(),node:t}),SE=(e,t,o,n)=>{const s=sv(e),r=()=>Ve(e.getBody()),a=()=>Ve(e.getContentAreaContainer()),i=()=>s||!n();return{inlineDialog:bE(a,t,i),inlineBottomDialog:vE(e.inline,a,o,i),banner:yE(a,t,i),cursor:xE(e,r),node:wE(r)}},kE=e=>(t,o)=>{Jw(e)(t,o)},CE=e=>()=>Hw(e),OE=e=>t=>Rw(e,t),_E=e=>t=>zw(e,t),TE=e=>()=>Lb(e),EE=e=>ye(e,"items"),AE=e=>ye(e,"format"),ME=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",format:"bold"},{title:"Italic",format:"italic"},{title:"Underline",format:"underline"},{title:"Strikethrough",format:"strikethrough"},{title:"Superscript",format:"superscript"},{title:"Subscript",format:"subscript"},{title:"Code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Align",items:[{title:"Left",format:"alignleft"},{title:"Center",format:"aligncenter"},{title:"Right",format:"alignright"},{title:"Justify",format:"alignjustify"}]}],DE=e=>j(e,((e,t)=>{if(ve(t,"items")){const o=DE(t.items);return{customFormats:e.customFormats.concat(o.customFormats),formats:e.formats.concat([{title:t.title,items:o.formats}])}}if(ve(t,"inline")||(e=>ve(e,"block"))(t)||(e=>ve(e,"selector"))(t)){const o=`custom-${r(t.name)?t.name:t.title.toLowerCase()}`;return{customFormats:e.customFormats.concat([{name:o,format:t}]),formats:e.formats.concat([{title:t.title,format:o,icon:t.icon}])}}return{...e,formats:e.formats.concat(t)}}),{customFormats:[],formats:[]}),BE=e=>yb(e).map((t=>{const o=((e,t)=>{const o=DE(t),n=t=>{L(t,(t=>{e.formatter.has(t.name)||e.formatter.register(t.name,t.format)}))};return e.formatter?n(o.customFormats):e.on("init",(()=>{n(o.customFormats)})),o.formats})(e,t);return xb(e)?ME.concat(o):o})).getOr(ME),FE=(e,t,o)=>({...e,type:"formatter",isSelected:t(e.format),getStylePreview:o(e.format)}),IE=(e,t,o,n)=>{const s=t=>H(t,(t=>EE(t)?(e=>{const t=s(e.items);return{...e,type:"submenu",getStyleItems:x(t)}})(t):AE(t)?(e=>FE(e,o,n))(t):(e=>{const t=ae(e);return 1===t.length&&R(t,"title")})(t)?{...t,type:"separator"}:(t=>{const s=r(t.name)?t.name:la(t.title),a=`custom-${s}`,i={...t,type:"formatter",format:a,isSelected:o(a),getStylePreview:n(a)};return e.formatter.register(s,i),i})(t)));return s(t)},RE=LO.trim,NE=e=>t=>{if((e=>g(e)&&1===e.nodeType)(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},VE=NE("true"),zE=NE("false"),HE=(e,t,o,n,s)=>({type:e,title:t,url:o,level:n,attach:s}),LE=e=>e.innerText||e.textContent,PE=e=>(e=>e&&"A"===e.nodeName&&void 0!==(e.id||e.name))(e)&&WE(e),UE=e=>e&&/^(H[1-6])$/.test(e.nodeName),WE=e=>(e=>{let t=e;for(;t=t.parentNode;){const e=t.contentEditable;if(e&&"inherit"!==e)return VE(t)}return!1})(e)&&!zE(e),jE=e=>UE(e)&&WE(e),GE=e=>{var t;const o=(e=>e.id?e.id:la("h"))(e);return HE("header",null!==(t=LE(e))&&void 0!==t?t:"","#"+o,(e=>UE(e)?parseInt(e.nodeName.substr(1),10):0)(e),(()=>{e.id=o}))},$E=e=>{const t=e.id||e.name,o=LE(e);return HE("anchor",o||"#"+t,"#"+t,0,b)},qE=e=>RE(e.title).length>0,XE=e=>{const t=(e=>{const t=H(Xc(Ve(e),"h1,h2,h3,h4,h5,h6,a:not([href])"),(e=>e.dom));return t})(e);return U((e=>H(U(e,jE),GE))(t).concat((e=>H(U(e,PE),$E))(t)),qE)},YE="tinymce-url-history",KE=e=>r(e)&&/^https?/.test(e),JE=e=>a(e)&&he(e,(e=>{return!(l(t=e)&&t.length<=5&&Y(t,KE));var t})).isNone(),ZE=()=>{const e=Sw.getItem(YE);if(null===e)return{};let t;try{t=JSON.parse(e)}catch(e){if(e instanceof SyntaxError)return console.log("Local storage "+YE+" was not valid JSON",e),{};throw e}return JE(t)?t:(console.log("Local storage "+YE+" was not valid format",t),{})},QE=e=>{const t=ZE();return be(t,e).getOr([])},eA=(e,t)=>{if(!KE(e))return;const o=ZE(),n=be(o,t).getOr([]),s=U(n,(t=>t!==e));o[t]=[e].concat(s).slice(0,5),(e=>{if(!JE(e))throw new Error("Bad format for history:\n"+JSON.stringify(e));Sw.setItem(YE,JSON.stringify(e))})(o)},tA=e=>!!e,oA=e=>ce(LO.makeMap(e,/[, ]/),tA),nA=e=>A.from(Fb(e)),sA=e=>A.from(e).filter(r).getOrUndefined(),rA=e=>({getHistory:QE,addToHistory:eA,getLinkInformation:()=>(e=>Vb(e)?A.some({targets:XE(e.getBody()),anchorTop:sA(zb(e)),anchorBottom:sA(Hb(e))}):A.none())(e),getValidationHandler:()=>(e=>A.from(Ib(e)))(e),getUrlPicker:t=>((e,t)=>((e,t)=>{const o=(e=>{const t=A.from(Nb(e)).filter(tA).map(oA);return nA(e).fold(T,(e=>t.fold(E,(e=>ae(e).length>0&&e))))})(e);return d(o)?o?nA(e):A.none():o[t]?nA(e):A.none()})(e,t).map((o=>n=>fS((s=>{const i={filetype:t,fieldname:n.fieldname,...A.from(n.meta).getOr({})};o.call(e,((e,t)=>{if(!r(e))throw new Error("Expected value to be string");if(void 0!==t&&!a(t))throw new Error("Expected meta to be a object");s({value:e,meta:t})}),n.value,i)})))))(e,t)}),aA=dm,iA=qu,lA=x([ys("shell",!1),os("makeItem"),ys("setupItem",b),vu("listBehaviours",[Kp])]),cA=ju({name:"items",overrides:()=>({behaviours:kl([Kp.config({})])})}),dA=x([cA]),uA=bm({name:x("CustomList")(),configFields:lA(),partFields:dA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[Kp.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:bu(e.listBehaviours,s.behaviours),apis:{setItems:(t,o)=>{var n;(n=t,e.shell?A.some(n):om(n,e,"items")).fold((()=>{throw console.error("Custom List was defined to not be a shell, but no item container was specified in components"),new Error("Custom List was defined to not be a shell, but no item container was specified in components")}),(n=>{const s=Kp.contents(n),r=o.length,a=r-s.length,i=a>0?V(a,(()=>e.makeItem())):[],l=s.slice(r);L(l,(e=>Kp.remove(n,e))),L(i,(e=>Kp.append(n,e)));const c=Kp.contents(n);L(c,((n,s)=>{e.setupItem(t,n,o[s],s)}))}))}}}},apis:{setItems:(e,t,o)=>{e.setItems(t,o)}}}),mA=x([os("dom"),ys("shell",!0),hu("toolbarBehaviours",[Kp])]),gA=x([ju({name:"groups",overrides:()=>({behaviours:kl([Kp.config({})])})})]),pA=bm({name:"Toolbar",configFields:mA(),partFields:gA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[Kp.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:bu(e.toolbarBehaviours,s.behaviours),apis:{setGroups:(t,o)=>{var n;(n=t,e.shell?A.some(n):om(n,e,"groups")).fold((()=>{throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")}),(e=>{Kp.set(e,o)}))},refresh:b},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)}}}),hA=b,fA=T,bA=x([]);var vA,yA=Object.freeze({__proto__:null,setup:hA,isDocked:fA,getBehaviours:bA});const xA=e=>(xe(Nt(e,"position"),"fixed")?A.none():at(e)).orThunk((()=>{const t=Re("span");return st(e).bind((e=>{zo(e,t);const o=at(t);return Po(t),o}))})),wA=e=>xA(e).map(Xt).getOrThunk((()=>$t(0,0))),SA=(e,t)=>{const o=e.element;La(o,t.transitionClass),Pa(o,t.fadeOutClass),La(o,t.fadeInClass),t.onShow(e)},kA=(e,t)=>{const o=e.element;La(o,t.transitionClass),Pa(o,t.fadeInClass),La(o,t.fadeOutClass),t.onHide(e)},CA=(e,t)=>e.y>=t.y,OA=(e,t)=>e.bottom<=t.bottom,_A=(e,t,o)=>({location:"top",leftX:t,topY:o.bounds.y-e.y}),TA=(e,t,o)=>({location:"bottom",leftX:t,bottomY:e.bottom-o.bounds.bottom}),EA=e=>e.box.x-e.win.x,AA=(e,t,o)=>o.getInitialPos().map((o=>{const n=((e,t)=>{const o=t.optScrollEnv.fold(x(e.bounds.y),(t=>t.scrollElmTop+(e.bounds.y-t.currentScrollTop)));return $t(e.bounds.x,o)})(o,t);return{box:Ko(n.left,n.top,Jt(e),Wt(e)),location:o.location}})),MA=(e,t,o,n,s)=>{const r=((e,t)=>{const o=t.optScrollEnv.fold(x(e.y),(t=>e.y+t.currentScrollTop-t.scrollElmTop));return $t(e.x,o)})(t,o),a=Ko(r.left,r.top,t.width,t.height);n.setInitialPos({style:Vt(e),position:It(e,"position")||"static",bounds:a,location:s.location})},DA=(e,t,o)=>o.getInitialPos().bind((n=>{var s;switch(o.clearInitialPos(),n.position){case"static":return A.some({morph:"static"});case"absolute":const o=xA(e).getOr(xt()),r=Jo(o),a=null!==(s=o.dom.scrollTop)&&void 0!==s?s:0;return A.some({morph:"absolute",positionCss:Vl("absolute",be(n.style,"left").map((e=>t.x-r.x)),be(n.style,"top").map((e=>t.y-r.y+a)),be(n.style,"right").map((e=>r.right-t.right)),be(n.style,"bottom").map((e=>r.bottom-t.bottom)))});default:return A.none()}})),BA=e=>{switch(e.location){case"top":return A.some({morph:"fixed",positionCss:Vl("fixed",A.some(e.leftX),A.some(e.topY),A.none(),A.none())});case"bottom":return A.some({morph:"fixed",positionCss:Vl("fixed",A.some(e.leftX),A.none(),A.none(),A.some(e.bottomY))});default:return A.none()}},FA=(e,t,o)=>{const n=e.element;return xe(Nt(n,"position"),"fixed")?((e,t,o)=>((e,t,o)=>AA(e,t,o).filter((({box:e})=>((e,t,o)=>Y(e,(e=>{switch(e){case"bottom":return OA(t,o.bounds);case"top":return CA(t,o.bounds)}})))(o.getModes(),e,t))).bind((({box:t})=>DA(e,t,o))))(e,t,o).orThunk((()=>t.optScrollEnv.bind((n=>AA(e,t,o))).bind((({box:e,location:o})=>{const n=en(),s=EA({win:n,box:e}),r="top"===o?_A(n,s,t):TA(n,s,t);return BA(r)})))))(n,t,o):((e,t,o)=>{const n=Jo(e),s=en(),r=((e,t,o)=>{const n=t.win,s=t.box,r=EA(t);return re(e,(e=>{switch(e){case"bottom":return OA(s,o.bounds)?A.none():A.some(TA(n,r,o));case"top":return CA(s,o.bounds)?A.none():A.some(_A(n,r,o));default:return A.none()}})).getOr({location:"no-dock"})})(o.getModes(),{win:s,box:n},t);return"top"===r.location||"bottom"===r.location?(MA(e,n,t,o,r),BA(r)):A.none()})(n,t,o)},IA=(e,t,o)=>{o.setDocked(!1),L(["left","right","top","bottom","position"],(t=>Ht(e.element,t))),t.onUndocked(e)},RA=(e,t,o,n)=>{const s="fixed"===n.position;o.setDocked(s),zl(e.element,n),(s?t.onDocked:t.onUndocked)(e)},NA=(e,t,o,n,s=!1)=>{t.contextual.each((t=>{t.lazyContext(e).each((r=>{const a=((e,t)=>e.y<t.bottom&&e.bottom>t.y)(r,n.bounds);a!==o.isVisible()&&(o.setVisible(a),s&&!a?(Wa(e.element,[t.fadeOutClass]),t.onHide(e)):(a?SA:kA)(e,t))}))}))},VA=(e,t,o,n,s)=>{NA(e,t,o,n,!0),RA(e,t,o,s.positionCss)},zA=(e,t,o)=>{e.getSystem().isConnected()&&((e,t,o)=>{const n=t.lazyViewport(e);NA(e,t,o,n),FA(e,n,o).each((s=>{((e,t,o,n,s)=>{switch(s.morph){case"static":return IA(e,t,o);case"absolute":return RA(e,t,o,s.positionCss);case"fixed":VA(e,t,o,n,s)}})(e,t,o,n,s)}))})(e,t,o)},HA=(e,t,o)=>{o.isDocked()&&((e,t,o)=>{const n=e.element;o.setDocked(!1);const s=t.lazyViewport(e);((e,t,o)=>{const n=e.element;return AA(n,t,o).bind((({box:e})=>DA(n,e,o)))})(e,s,o).each((n=>{switch(n.morph){case"static":IA(e,t,o);break;case"absolute":RA(e,t,o,n.positionCss)}})),o.setVisible(!0),t.contextual.each((t=>{ja(n,[t.fadeInClass,t.fadeOutClass,t.transitionClass]),t.onShow(e)})),zA(e,t,o)})(e,t,o)},LA=e=>(t,o,n)=>{const s=o.lazyViewport(t);((e,t,o,n)=>{const s=Jo(e),r=en(),a=n(r,EA({win:r,box:s}),t);return"bottom"===a.location||"top"===a.location?(((e,t,o,n,s)=>{n.getInitialPos().fold((()=>MA(e,t,o,n,s)),(()=>b))})(e,s,t,o,a),BA(a)):A.none()})(t.element,s,n,e).each((e=>{VA(t,o,n,s,e)}))},PA=LA(_A),UA=LA(TA);var WA=Object.freeze({__proto__:null,refresh:zA,reset:HA,isDocked:(e,t,o)=>o.isDocked(),getModes:(e,t,o)=>o.getModes(),setModes:(e,t,o,n)=>o.setModes(n),forceDockToTop:PA,forceDockToBottom:UA}),jA=Object.freeze({__proto__:null,events:(e,t)=>Hr([Yr(or(),((o,n)=>{e.contextual.each((e=>{Ua(o.element,e.transitionClass)&&(ja(o.element,[e.transitionClass,e.fadeInClass]),(t.isVisible()?e.onShown:e.onHidden)(o)),n.stop()}))})),Ur(xr(),((o,n)=>{zA(o,e,t)})),Ur(Er(),((o,n)=>{zA(o,e,t)})),Ur(wr(),((o,n)=>{HA(o,e,t)}))])}),GA=[vs("contextual",[rs("fadeInClass"),rs("fadeOutClass"),rs("transitionClass"),is("lazyContext"),Di("onShow"),Di("onShown"),Di("onHide"),Di("onHidden")]),Os("lazyViewport",(()=>({bounds:en(),optScrollEnv:A.none()}))),_s("modes",["top","bottom"],Hn),Di("onDocked"),Di("onUndocked")];const $A=Ol({fields:GA,name:"docking",active:jA,apis:WA,state:Object.freeze({__proto__:null,init:e=>{const t=Es(!1),o=Es(!0),n=Ql(),s=Es(e.modes);return _a({isDocked:t.get,setDocked:t.set,getInitialPos:n.get,setInitialPos:n.set,clearInitialPos:n.clear,isVisible:o.get,setVisible:o.set,getModes:s.get,setModes:s.set,readState:()=>`docked:  ${t.get()}, visible: ${o.get()}, modes: ${s.get().join(",")}`})}})}),qA=x(la("toolbar-height-change")),XA={fadeInClass:"tox-editor-dock-fadein",fadeOutClass:"tox-editor-dock-fadeout",transitionClass:"tox-editor-dock-transition"},YA="tox-tinymce--toolbar-sticky-on",KA="tox-tinymce--toolbar-sticky-off",JA=(e,t)=>R($A.getModes(e),t),ZA=e=>{const t=e.element;rt(t).each((o=>{const n="padding-"+$A.getModes(e)[0];if($A.isDocked(e)){const e=Jt(o);Dt(t,"width",e+"px"),Dt(o,n,(e=>jt(e)+(parseInt(It(e,"margin-top"),10)||0)+(parseInt(It(e,"margin-bottom"),10)||0))(t)+"px")}else Ht(t,"width"),Ht(o,n)}))},QA=(e,t)=>{t?(Pa(e,XA.fadeOutClass),Wa(e,[XA.transitionClass,XA.fadeInClass])):(Pa(e,XA.fadeInClass),Wa(e,[XA.fadeOutClass,XA.transitionClass]))},eM=(e,t)=>{const o=Ve(e.getContainer());t?(La(o,YA),Pa(o,KA)):(La(o,KA),Pa(o,YA))},tM=(e,t)=>{const o=Ql(),n=t.getSink,s=e=>{n().each((t=>e(t.element)))},r=t=>{e.inline||ZA(t),eM(e,$A.isDocked(t)),t.getSystem().broadcastOn([Kd()],{}),n().each((e=>e.getSystem().broadcastOn([Kd()],{})))},a=e.inline?[]:[Al.config({channels:{[qA()]:{onReceive:ZA}}})];return[oh.config({}),$A.config({contextual:{lazyContext:t=>{const o=jt(t.element),n=e.inline?e.getContentAreaContainer():e.getContainer();return A.from(n).map((n=>{const s=Jo(Ve(n));return jS(e,t.element).fold((()=>{const e=s.height-o,n=s.y+(JA(t,"top")?0:o);return Ko(s.x,n,s.width,e)}),(e=>{const n=Qo(s,GS(e)),r=JA(t,"top")?n.y:n.y+o;return Ko(n.x,r,n.width,n.height-o)}))}))},onShow:()=>{s((e=>QA(e,!0)))},onShown:e=>{s((e=>ja(e,[XA.transitionClass,XA.fadeInClass]))),o.get().each((t=>{((e,t)=>{const o=et(t);Il(o).filter((e=>!Ze(t,e))).filter((t=>Ze(t,Ve(o.dom.body))||Qe(e,t))).each((()=>Dl(t)))})(e.element,t),o.clear()}))},onHide:e=>{((e,t)=>Rl(e).orThunk((()=>t().toOptional().bind((e=>Rl(e.element))))))(e.element,n).fold(o.clear,o.set),s((e=>QA(e,!1)))},onHidden:()=>{s((e=>ja(e,[XA.transitionClass])))},...XA},lazyViewport:t=>jS(e,t.element).fold((()=>{const o=en(),n=Mb(e),s=o.y+(JA(t,"top")?n:0),r=o.height-(JA(t,"bottom")?n:0);return{bounds:Ko(o.x,s,o.width,r),optScrollEnv:A.none()}}),(e=>({bounds:GS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))),modes:[t.header.getDockingMode()],onDocked:r,onUndocked:r}),...a]};var oM=Object.freeze({__proto__:null,setup:(e,t,o)=>{e.inline||(t.header.isPositionedAtTop()||e.on("ResizeEditor",(()=>{o().each($A.reset)})),e.on("ResizeWindow ResizeEditor",(()=>{o().each(ZA)})),e.on("SkinLoaded",(()=>{o().each((e=>{$A.isDocked(e)?$A.reset(e):$A.refresh(e)}))})),e.on("FullscreenStateChanged",(()=>{o().each($A.reset)}))),e.on("AfterScrollIntoView",(e=>{o().each((t=>{$A.refresh(t);const o=t.element;Ig(o)&&((e,t)=>{const o=et(t),n=nt(t).dom.innerHeight,s=Uo(o),r=Ve(e.elm),a=Zo(r),i=Wt(r),l=a.y,c=l+i,d=Xt(t),u=Wt(t),m=d.top,g=m+u,p=Math.abs(m-s.top)<2,h=Math.abs(g-(s.top+n))<2;if(p&&l<g)Wo(s.left,l-u,o);else if(h&&c>m){const e=l-n+i+u;Wo(s.left,e,o)}})(e,o)}))})),e.on("PostRender",(()=>{eM(e,!1)}))},isDocked:e=>e().map($A.isDocked).getOr(!1),getBehaviours:tM});const nM=Dn([ty,ns("items",Fn([Rn([oy,ds("items",Hn)]),Hn]))].concat(Dy)),sM=[ps("text"),ps("tooltip"),ps("icon"),xs("search",!1,Fn([Ln,Dn([ps("placeholder")])],(e=>d(e)?e?A.some({placeholder:A.none()}):A.none():A.some(e)))),is("fetch"),Os("onSetup",(()=>b))],rM=Dn([ty,...sM]),aM=e=>qn("menubutton",rM,e),iM=Dn([ty,fy,hy,py,yy,ly,my,ks("presets","normal",["normal","color","listpreview"]),Cy(1),dy,uy]);var lM=fm({factory:(e,t)=>{const o={focus:Pp.focusIn,setMenus:(e,o)=>{const n=H(o,(e=>{const o={type:"menubutton",text:e.text,fetch:t=>{t(e.getItems())}},n=aM(o).mapError((e=>Kn(e))).getOrDie();return tT(n,"tox-mbtn",t.backstage,A.some("menuitem"))}));Kp.set(e,n)}};return{uid:e.uid,dom:e.dom,components:[],behaviours:kl([Kp.config({}),Jp("menubar-events",[Kr((t=>{e.onSetup(t)})),Ur(qs(),((e,t)=>{pi(e.element,".tox-mbtn--active").each((o=>{hi(t.event.target,".tox-mbtn").each((t=>{Ze(o,t)||e.getSystem().getByDom(o).each((o=>{e.getSystem().getByDom(t).each((e=>{DS.expand(e),DS.close(o),oh.focus(e)}))}))}))}))})),Ur(_r(),((e,t)=>{t.event.prevFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((o=>{t.event.newFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((e=>{DS.isOpen(o)&&(DS.expand(e),DS.close(o))}))}))}))]),Pp.config({mode:"flow",selector:".tox-mbtn",onEscape:t=>(e.onEscape(t),A.some(!0))}),ck.config({})]),apis:o,domModification:{attributes:{role:"menubar"}}}},name:"silver.Menubar",configFields:[os("dom"),os("uid"),os("onEscape"),os("backstage"),ys("onSetup",b)],apis:{focus:(e,t)=>{e.focus(t)},setMenus:(e,t,o)=>{e.setMenus(t,o)}}});const cM="container",dM=[hu("slotBehaviours",[])],uM=e=>"<alloy.field."+e+">",mM=(e,t)=>{const o=t=>am(e),n=(t,o)=>(n,s)=>om(n,e,s).map((e=>t(e,s))).getOr(o),s=(e,t)=>"true"!==Ot(e.element,"aria-hidden"),r=n(s,!1),a=n(((e,t)=>{if(s(e)){const o=e.element;Dt(o,"display","none"),kt(o,"aria-hidden","true"),Ir(e,Tr(),{name:t,visible:!1})}})),i=(e=>(t,o)=>{L(o,(o=>e(t,o)))})(a),l=n(((e,t)=>{if(!s(e)){const o=e.element;Ht(o,"display"),Et(o,"aria-hidden"),Ir(e,Tr(),{name:t,visible:!0})}})),c={getSlotNames:o,getSlot:(t,o)=>om(t,e,o),isShowing:r,hideSlot:a,hideAllSlots:e=>i(e,o()),showSlot:l};return{uid:e.uid,dom:e.dom,components:t,behaviours:fu(e.slotBehaviours),apis:c}},gM=ce({getSlotNames:(e,t)=>e.getSlotNames(t),getSlot:(e,t,o)=>e.getSlot(t,o),isShowing:(e,t,o)=>e.isShowing(t,o),hideSlot:(e,t,o)=>e.hideSlot(t,o),hideAllSlots:(e,t)=>e.hideAllSlots(t),showSlot:(e,t,o)=>e.showSlot(t,o)},(e=>Ca(e))),pM={...gM,sketch:e=>{const t=(()=>{const e=[];return{slot:(t,o)=>(e.push(t),Ju(cM,uM(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=H(n,(e=>Uu({name:e,pname:uM(e)})));return mm(cM,dM,s,mM,o)}},hM=Dn([hy,fy,Os("onShow",b),Os("onHide",b),my]),fM=e=>({element:()=>e.element.dom}),bM=(e,t)=>{const o=H(ae(t),(e=>{const o=t[e],n=Xn((e=>qn("sidebar",hM,e))(o));return{name:e,getApi:fM,onSetup:n.onSetup,onShow:n.onShow,onHide:n.onHide}}));return H(o,(t=>{const n=Es(b);return e.slot(t.name,{dom:{tag:"div",classes:["tox-sidebar__pane"]},behaviours:lx([Tx(t,n),Ex(t,n),Ur(Tr(),((e,t)=>{const n=t.event,s=G(o,(e=>e.name===n.name));s.each((t=>{(n.visible?t.onShow:t.onHide)(t.getApi(e))}))}))])})}))},vM=e=>pM.sketch((t=>({dom:{tag:"div",classes:["tox-sidebar__pane-container"]},components:bM(t,e),slotBehaviours:lx([Kr((e=>pM.hideAllSlots(e)))])}))),yM=(e,t)=>{kt(e,"role",t)},xM=e=>wm.getCurrent(e).bind((e=>Q_.isGrowing(e)||Q_.hasGrown(e)?wm.getCurrent(e).bind((e=>G(pM.getSlotNames(e),(t=>pM.isShowing(e,t))))):A.none())),wM=la("FixSizeEvent"),SM=la("AutoSizeEvent");var kM=Object.freeze({__proto__:null,block:(e,t,o,n)=>{kt(e.element,"aria-busy",!0);const s=t.getRoot(e).getOr(e),r=kl([Pp.config({mode:"special",onTab:()=>A.some(!0),onShiftTab:()=>A.some(!0)}),oh.config({})]),a=n(s,r),i=s.getSystem().build(a);Kp.append(s,ai(i)),i.hasConfigured(Pp)&&t.focus&&Pp.focusIn(i),o.isBlocked()||t.onBlock(e),o.blockWith((()=>Kp.remove(s,i)))},unblock:(e,t,o)=>{Et(e.element,"aria-busy"),o.isBlocked()&&t.onUnblock(e),o.clear()},isBlocked:(e,t,o)=>o.isBlocked()}),CM=[Os("getRoot",A.none),Cs("focus",!0),Di("onBlock"),Di("onUnblock")];const OM=Ol({fields:CM,name:"blocking",apis:kM,state:Object.freeze({__proto__:null,init:()=>{const e=Jl((e=>e.destroy()));return _a({readState:e.isSet,blockWith:t=>{e.set({destroy:t})},clear:e.clear,isBlocked:e.isSet})}})}),_M=e=>wm.getCurrent(e).each((e=>Dl(e.element))),TM=(e,t,o)=>{const n=Es(!1),s=Ql(),r=o=>{var s;n.get()&&(!(e=>"focusin"===e.type)(s=o)||!(s.composed?oe(s.composedPath()):A.from(s.target)).map(Ve).filter(Ge).exists((e=>Ua(e,"mce-pastebin"))))&&(o.preventDefault(),_M(t()),e.editorManager.setActive(e))};e.inline||e.on("PreInit",(()=>{e.dom.bind(e.getWin(),"focusin",r),e.on("BeforeExecCommand",(e=>{"mcefocus"===e.command.toLowerCase()&&!0!==e.value&&r(e)}))}));const a=s=>{s!==n.get()&&(n.set(s),((e,t,o,n)=>{const s=t.element;if(((e,t)=>{const o="tabindex",n=`data-mce-${o}`;A.from(e.iframeElement).map(Ve).each((e=>{t?(_t(e,o).each((t=>kt(e,n,t))),kt(e,o,-1)):(Et(e,o),_t(e,n).each((t=>{kt(e,o,t),Et(e,n)})))}))})(e,o),o)OM.block(t,(e=>(t,o)=>({dom:{tag:"div",attributes:{"aria-label":e.translate("Loading..."),tabindex:"0"},classes:["tox-throbber__busy-spinner"]},components:[{dom:jh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}))(n)),Ht(s,"display"),Et(s,"aria-hidden"),e.hasFocus()&&_M(t);else{const o=wm.getCurrent(t).exists((e=>Fl(e.element)));OM.unblock(t),Dt(s,"display","none"),kt(s,"aria-hidden","true"),o&&e.focus()}})(e,t(),s,o.providers),((e,t)=>{e.dispatch("AfterProgressState",{state:t})})(e,s))};e.on("ProgressState",(t=>{if(s.on(clearTimeout),h(t.time)){const o=Uh.setEditorTimeout(e,(()=>a(t.state)),t.time);s.set(o)}else a(t.state),s.clear()}))},EM=(e,t,o)=>({within:e,extra:t,withinWidth:o}),AM=(e,t,o)=>{const n=j(e,((e,t)=>((e,t)=>{const n=o(e);return A.some({element:e,start:t,finish:t+n,width:n})})(t,e.len).fold(x(e),(t=>({len:t.finish,list:e.list.concat([t])})))),{len:0,list:[]}).list,s=U(n,(e=>e.finish<=t)),r=W(s,((e,t)=>e+t.width),0);return{within:s,extra:n.slice(s.length),withinWidth:r}},MM=e=>H(e,(e=>e.element)),DM=(e,t)=>{const o=H(t,(e=>ai(e)));pA.setGroups(e,o)},BM=(e,t,o)=>{const n=t.builtGroups.get();if(0===n.length)return;const s=nm(e,t,"primary"),r=uS.getCoupled(e,"overflowGroup");Dt(s.element,"visibility","hidden");const a=n.concat([r]),i=re(a,(e=>Rl(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()))));o([]),DM(s,a);const l=((e,t,o,n)=>{const s=((e,t,o)=>{const n=AM(t,e,o);return 0===n.extra.length?A.some(n):A.none()})(e,t,o).getOrThunk((()=>AM(t,e-o(n),o))),r=s.within,a=s.extra,i=s.withinWidth;return 1===a.length&&a[0].width<=o(n)?((e,t,o)=>{const n=MM(e.concat(t));return EM(n,[],o)})(r,a,i):a.length>=1?((e,t,o,n)=>{const s=MM(e).concat([o]);return EM(s,MM(t),n)})(r,a,n,i):((e,t,o)=>EM(MM(e),[],o))(r,0,i)})(Jt(s.element),t.builtGroups.get(),(e=>Jt(e.element)),r);0===l.extra.length?(Kp.remove(s,r),o([])):(DM(s,l.within),o(l.extra)),Ht(s.element,"visibility"),Lt(s.element),i.each(oh.focus)},FM=x([hu("splitToolbarBehaviours",[uS]),es("builtGroups",(()=>Es([])))]),IM=x([Ai(["overflowToggledClass"]),fs("getOverflowBounds"),os("lazySink"),es("overflowGroups",(()=>Es([]))),Di("onOpened"),Di("onClosed")].concat(FM())),RM=x([Uu({factory:pA,schema:mA(),name:"primary"}),Wu({schema:mA(),name:"overflow"}),Wu({name:"overflow-button"}),Wu({name:"overflow-group"})]),NM=x(((e,t)=>{((e,t)=>{const o=Kt.max(e,t,["margin-left","border-left-width","padding-left","padding-right","border-right-width","margin-right"]);Dt(e,"max-width",o+"px")})(e,Math.floor(t))})),VM=x([Ai(["toggledClass"]),os("lazySink"),is("fetch"),fs("getBounds"),vs("fireDismissalEventInstead",[ys("event",Cr())]),wc(),Di("onToggled")]),zM=x([Wu({name:"button",overrides:e=>({dom:{attributes:{"aria-haspopup":"true"}},buttonBehaviours:kl([dh.config({toggleClass:e.markers.toggledClass,aria:{mode:"expanded"},toggleOnExecute:!1,onToggled:e.onToggled})])})}),Wu({factory:pA,schema:mA(),name:"toolbar",overrides:e=>({toolbarBehaviours:kl([Pp.config({mode:"cyclic",onEscape:t=>(om(t,e,"button").each(oh.focus),A.none())})])})})]),HM=Ql(),LM=(e,t)=>{const o=uS.getCoupled(e,"toolbarSandbox");Xd.isOpen(o)?Xd.close(o):Xd.open(o,t.toolbar())},PM=(e,t,o,n)=>{const s=o.getBounds.map((e=>e())),r=o.lazySink(e).getOrDie();Sd.positionWithinBounds(r,t,{anchor:{type:"hotspot",hotspot:e,layouts:n,overrides:{maxWidthFunction:NM()}}},s)},UM=(e,t,o,n,s)=>{pA.setGroups(t,s),PM(e,t,o,n),dh.on(e)},WM=bm({name:"FloatingToolbarButton",factory:(e,t,o,n)=>({...Wh.sketch({...n.button(),action:e=>{LM(e,n)},buttonBehaviours:yu({dump:n.button().buttonBehaviours},[uS.config({others:{toolbarSandbox:t=>((e,t,o)=>{const n=bi();return{dom:{tag:"div",attributes:{id:n.id}},behaviours:kl([Pp.config({mode:"special",onEscape:e=>(Xd.close(e),A.some(!0))}),Xd.config({onOpen:(s,r)=>{const a=HM.get().getOr(!1);o.fetch().get((s=>{UM(e,r,o,t.layouts,s),n.link(e.element),a||Pp.focusIn(r)}))},onClose:()=>{dh.off(e),HM.get().getOr(!1)||oh.focus(e),n.unlink(e.element)},isPartOf:(t,o,n)=>vi(o,n)||vi(e,n),getAttachPoint:()=>o.lazySink(e).getOrDie()}),Al.config({channels:{...Qd({isExtraPart:T,...o.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...tu({doReposition:()=>{Xd.getState(uS.getCoupled(e,"toolbarSandbox")).each((n=>{PM(e,n,o,t.layouts)}))}})}})])}})(t,o,e)}})])}),apis:{setGroups:(t,n)=>{Xd.getState(uS.getCoupled(t,"toolbarSandbox")).each((s=>{UM(t,s,e,o.layouts,n)}))},reposition:t=>{Xd.getState(uS.getCoupled(t,"toolbarSandbox")).each((n=>{PM(t,n,e,o.layouts)}))},toggle:e=>{LM(e,n)},toggleWithoutFocusing:e=>{((e,t)=>{HM.set(!0),LM(e,t),HM.clear()})(e,n)},getToolbar:e=>Xd.getState(uS.getCoupled(e,"toolbarSandbox")),isOpen:e=>Xd.isOpen(uS.getCoupled(e,"toolbarSandbox"))}}),configFields:VM(),partFields:zM(),apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggleWithoutFocusing(t)},getToolbar:(e,t)=>e.getToolbar(t),isOpen:(e,t)=>e.isOpen(t)}}),jM=x([os("items"),Ai(["itemSelector"]),hu("tgroupBehaviours",[Pp])]),GM=x([Gu({name:"items",unit:"item"})]),$M=bm({name:"ToolbarGroup",configFields:jM(),partFields:GM(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.tgroupBehaviours,[Pp.config({mode:"flow",selector:e.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}})}),qM=e=>H(e,(e=>ai(e))),XM=(e,t,o)=>{BM(e,o,(n=>{o.overflowGroups.set(n),t.getOpt(e).each((e=>{WM.setGroups(e,qM(n))}))}))},YM=bm({name:"SplitFloatingToolbar",configFields:IM(),partFields:RM(),factory:(e,t,o,n)=>{const s=Gh(WM.sketch({fetch:()=>fS((t=>{t(qM(e.overflowGroups.get()))})),layouts:{onLtr:()=>[rl,sl],onRtl:()=>[sl,rl],onBottomLtr:()=>[il,al],onBottomRtl:()=>[al,il]},getBounds:o.getOverflowBounds,lazySink:e.lazySink,fireDismissalEventInstead:{},markers:{toggledClass:e.markers.overflowToggledClass},parts:{button:n["overflow-button"](),toolbar:n.overflow()},onToggled:(t,o)=>e[o?"onOpened":"onClosed"](t)}));return{uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.splitToolbarBehaviours,[uS.config({others:{overflowGroup:()=>$M.sketch({...n["overflow-group"](),items:[s.asSpec()]})}})]),apis:{setGroups:(t,o)=>{e.builtGroups.set(H(o,t.getSystem().build)),XM(t,s,e)},refresh:t=>XM(t,s,e),toggle:e=>{s.getOpt(e).each((e=>{WM.toggle(e)}))},toggleWithoutFocusing:e=>{s.getOpt(e).each(WM.toggleWithoutFocusing)},isOpen:e=>s.getOpt(e).map(WM.isOpen).getOr(!1),reposition:e=>{s.getOpt(e).each((e=>{WM.reposition(e)}))},getOverflow:e=>s.getOpt(e).bind(WM.getToolbar)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t),getOverflow:(e,t)=>e.getOverflow(t)}}),KM=x([Ai(["closedClass","openClass","shrinkingClass","growingClass","overflowToggledClass"]),Di("onOpened"),Di("onClosed")].concat(FM())),JM=x([Uu({factory:pA,schema:mA(),name:"primary"}),Uu({factory:pA,schema:mA(),name:"overflow",overrides:e=>({toolbarBehaviours:kl([Q_.config({dimension:{property:"height"},closedClass:e.markers.closedClass,openClass:e.markers.openClass,shrinkingClass:e.markers.shrinkingClass,growingClass:e.markers.growingClass,onShrunk:t=>{om(t,e,"overflow-button").each((e=>{dh.off(e),oh.focus(e)})),e.onClosed(t)},onGrown:t=>{Pp.focusIn(t),e.onOpened(t)},onStartGrow:t=>{om(t,e,"overflow-button").each(dh.on)}}),Pp.config({mode:"acyclic",onEscape:t=>(om(t,e,"overflow-button").each(oh.focus),A.some(!0))})])})}),Wu({name:"overflow-button",overrides:e=>({buttonBehaviours:kl([dh.config({toggleClass:e.markers.overflowToggledClass,aria:{mode:"pressed"},toggleOnExecute:!1})])})}),Wu({name:"overflow-group"})]),ZM=(e,t)=>{om(e,t,"overflow-button").bind((()=>om(e,t,"overflow"))).each((o=>{QM(e,t),Q_.toggleGrow(o)}))},QM=(e,t)=>{om(e,t,"overflow").each((o=>{BM(e,t,(e=>{const t=H(e,(e=>ai(e)));pA.setGroups(o,t)})),om(e,t,"overflow-button").each((e=>{Q_.hasGrown(o)&&dh.on(e)})),Q_.refresh(o)}))},eD=bm({name:"SplitSlidingToolbar",configFields:KM(),partFields:JM(),factory:(e,t,o,n)=>{const s="alloy.toolbar.toggle";return{uid:e.uid,dom:e.dom,components:t,behaviours:bu(e.splitToolbarBehaviours,[uS.config({others:{overflowGroup:e=>$M.sketch({...n["overflow-group"](),items:[Wh.sketch({...n["overflow-button"](),action:t=>{Fr(e,s)}})]})}}),Jp("toolbar-toggle-events",[Ur(s,(t=>{ZM(t,e)}))])]),apis:{setGroups:(t,o)=>{((t,o)=>{const n=H(o,t.getSystem().build);e.builtGroups.set(n)})(t,o),QM(t,e)},refresh:t=>QM(t,e),toggle:t=>ZM(t,e),isOpen:t=>((e,t)=>om(e,t,"overflow").map(Q_.hasGrown).getOr(!1))(t,e)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},toggle:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t)}}),tD=e=>{const t=e.title.fold((()=>({})),(e=>({attributes:{title:e}})));return{dom:{tag:"div",classes:["tox-toolbar__group"],...t},components:[$M.parts.items({})],items:e.items,markers:{itemSelector:"*:not(.tox-split-button) > .tox-tbtn:not([disabled]), .tox-split-button:not([disabled]), .tox-toolbar-nav-js:not([disabled]), .tox-number-input:not([disabled])"},tgroupBehaviours:kl([ck.config({}),oh.config({})])}},oD=e=>$M.sketch(tD(e)),nD=(e,t)=>{const o=Kr((t=>{const o=H(e.initGroups,oD);pA.setGroups(t,o)}));return kl([Ox(e.providers.isDisabled),Sx(),Pp.config({mode:t,onEscape:e.onEscape,selector:".tox-toolbar__group"}),Jp("toolbar-events",[o])])},sD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return{uid:e.uid,dom:{tag:"div",classes:["tox-toolbar-overlord"]},parts:{"overflow-group":tD({title:A.none(),items:[]}),"overflow-button":TT({name:"more",icon:A.some("more-drawer"),enabled:!0,tooltip:A.some("Reveal or hide additional toolbar items"),primary:!1,buttonType:A.none(),borderless:!1},A.none(),e.providers)},splitToolbarBehaviours:nD(e,t)}},rD=e=>{const t=sD(e),o=YM.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}});return YM.sketch({...t,lazySink:e.getSink,getOverflowBounds:()=>{const t=e.moreDrawerData.lazyHeader().element,o=Zo(t),n=ot(t),s=Zo(n),r=Math.max(n.dom.scrollHeight,s.height);return Ko(o.x+4,s.y,o.width-8,r)},parts:{...t.parts,overflow:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:e.attributes}}},components:[o],markers:{overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>e.onToggled(t,!0),onClosed:t=>e.onToggled(t,!1)})},aD=e=>{const t=eD.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}}),o=eD.parts.overflow({dom:{tag:"div",classes:["tox-toolbar__overflow"]}}),n=sD(e);return eD.sketch({...n,components:[t,o],markers:{openClass:"tox-toolbar__overflow--open",closedClass:"tox-toolbar__overflow--closed",growingClass:"tox-toolbar__overflow--growing",shrinkingClass:"tox-toolbar__overflow--shrinking",overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>{t.getSystem().broadcastOn([qA()],{type:"opened"}),e.onToggled(t,!0)},onClosed:t=>{t.getSystem().broadcastOn([qA()],{type:"closed"}),e.onToggled(t,!1)}})},iD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return pA.sketch({uid:e.uid,dom:{tag:"div",classes:["tox-toolbar"].concat(e.type===sb.scrolling?["tox-toolbar--scrolling"]:[])},components:[pA.parts.groups({})],toolbarBehaviours:nD(e,t)})},lD=[py,hy,ps("tooltip"),ks("buttonType","secondary",["primary","secondary"]),Cs("borderless",!1),is("onAction")],cD={button:[...lD,sy,as("type",["button"])],togglebutton:[...lD,Cs("active",!1),as("type",["togglebutton"])]},dD=[as("type",["group"]),_s("buttons",[],Jn("type",cD))],uD=Jn("type",{...cD,group:dD}),mD=Dn([_s("buttons",[],uD),is("onShow"),is("onHide")]),gD=(e,t)=>((e,t)=>{var o,n;const s="togglebutton"===e.type,r=e.icon.map((e=>f_(e,t.icons))).map(Gh),a={...e,name:s?e.text.getOr(e.icon.getOr("")):null!==(o=e.text)&&void 0!==o?o:e.icon.getOr(""),primary:"primary"===e.buttonType,buttonType:A.from(e.buttonType),tooltip:e.tooltip,icon:e.icon,enabled:!0,borderless:e.borderless},i=ET(null!==(n=e.buttonType)&&void 0!==n?n:"secondary"),l=s?e.text.map(t.translate):A.some(t.translate(e.text)),c=l.map(ti),d=a.tooltip.or(l).map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),u=r.map((e=>e.asSpec())),m=Dx([u,c]),g=e.icon.isSome()&&c.isSome(),p={tag:"button",classes:i.concat(...e.icon.isSome()&&!g?["tox-button--icon"]:[]).concat(...g?["tox-button--icon-and-text"]:[]).concat(...e.borderless?["tox-button--naked"]:[]).concat(..."togglebutton"===e.type&&e.active?["tox-button--enabled"]:[]),attributes:d},h=_T(a,A.some((o=>{const n=e=>{r.map((n=>n.getOpt(o).each((o=>{Kp.set(o,[f_(e,t.icons)])}))))};return s?e.onAction({setIcon:n,setActive:e=>{const t=o.element;e?(La(t,"tox-button--enabled"),kt(t,"aria-pressed",!0)):(Pa(t,"tox-button--enabled"),Et(t,"aria-pressed"))},isActive:()=>Ua(o.element,"tox-button--enabled")}):"button"===e.type?e.onAction({setIcon:n}):void 0})),[],p,m,t);return Wh.sketch(h)})(e,t),pD=Do().deviceType,hD=pD.isPhone(),fD=pD.isTablet();var bD=bm({name:"silver.View",configFields:[os("viewConfig")],partFields:[ju({factory:{sketch:e=>{let t=!1;const o=H(e.buttons,(o=>"group"===o.type?(t=!0,((e,t)=>({dom:{tag:"div",classes:["tox-view__toolbar__group"]},components:H(e.buttons,(e=>gD(e,t)))}))(o,e.providers)):gD(o,e.providers)));return{uid:e.uid,dom:{tag:"div",classes:[t?"tox-view__toolbar":"tox-view__header",...hD||fD?["tox-view--mobile","tox-view--scrolling"]:[]]},behaviours:kl([oh.config({}),Pp.config({mode:"flow",selector:"button, .tox-button",focusInside:pg.OnEnterOrSpaceMode})]),components:t?o:[ok.sketch({dom:{tag:"div",classes:["tox-view__header-start"]},components:[]}),ok.sketch({dom:{tag:"div",classes:["tox-view__header-end"]},components:o})]}}},schema:[os("buttons"),os("providers")],name:"header"}),ju({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-view__pane"]}})},schema:[],name:"pane"})],factory:(e,t,o,n)=>{const s={getPane:t=>aA.getPart(t,e,"pane"),getOnShow:t=>e.viewConfig.onShow,getOnHide:t=>e.viewConfig.onHide};return{uid:e.uid,dom:e.dom,components:t,apis:s}},apis:{getPane:(e,t)=>e.getPane(t),getOnShow:(e,t)=>e.getOnShow(t),getOnHide:(e,t)=>e.getOnHide(t)}});const vD=(e,t,o)=>pe(t,((t,n)=>{const s=Xn(qn("view",mD,t));return e.slot(n,bD.sketch({dom:{tag:"div",classes:["tox-view"]},viewConfig:s,components:[...s.buttons.length>0?[bD.parts.header({buttons:s.buttons,providers:o})]:[],bD.parts.pane({})]}))})),yD=(e,t)=>pM.sketch((o=>({dom:{tag:"div",classes:["tox-view-wrap__slot-container"]},components:vD(o,e,t),slotBehaviours:lx([Kr((e=>pM.hideAllSlots(e)))])}))),xD=e=>G(pM.getSlotNames(e),(t=>pM.isShowing(e,t))),wD=(e,t,o)=>{pM.getSlot(e,t).each((e=>{bD.getPane(e).each((t=>{var n;o(e)((n=t.element.dom,{getContainer:x(n)}))}))}))};var SD=fm({factory:(e,t)=>{const o={setViews:(e,o)=>{Kp.set(e,[yD(o,t.backstage.shared.providers)])},whichView:e=>wm.getCurrent(e).bind(xD),toggleView:(e,t,o,n)=>wm.getCurrent(e).exists((s=>{const r=xD(s),a=r.exists((e=>n===e)),i=pM.getSlot(s,n).isSome();return i&&(pM.hideAllSlots(s),a?((e=>{const t=e.element;Dt(t,"display","none"),kt(t,"aria-hidden","true")})(e),t()):(o(),(e=>{const t=e.element;Ht(t,"display"),Et(t,"aria-hidden")})(e),pM.showSlot(s,n),((e,t)=>{wD(e,t,bD.getOnShow)})(s,n)),r.each((e=>((e,t)=>wD(e,t,bD.getOnHide))(s,e)))),i}))};return{uid:e.uid,dom:{tag:"div",classes:["tox-view-wrap"],attributes:{"aria-hidden":"true"},styles:{display:"none"}},components:[],behaviours:kl([Kp.config({}),wm.config({find:e=>{const t=Kp.contents(e);return oe(t)}})]),apis:o}},name:"silver.ViewWrapper",configFields:[os("backstage")],apis:{setViews:(e,t,o)=>e.setViews(t,o),toggleView:(e,t,o,n,s)=>e.toggleView(t,o,n,s),whichView:(e,t)=>e.whichView(t)}});const kD=iA.optional({factory:lM,name:"menubar",schema:[os("backstage")]}),CD=iA.optional({factory:{sketch:e=>uA.sketch({uid:e.uid,dom:e.dom,listBehaviours:kl([Pp.config({mode:"acyclic",selector:".tox-toolbar"})]),makeItem:()=>iD({type:e.type,uid:la("multiple-toolbar-item"),cyclicKeying:!1,initGroups:[],providers:e.providers,onEscape:()=>(e.onEscape(),A.some(!0))}),setupItem:(e,t,o,n)=>{pA.setGroups(t,o)},shell:!0})},name:"multiple-toolbar",schema:[os("dom"),os("onEscape")]}),OD=iA.optional({factory:{sketch:e=>{const t=(e=>e.type===sb.sliding?aD:e.type===sb.floating?rD:iD)(e);return t({type:e.type,uid:e.uid,onEscape:()=>(e.onEscape(),A.some(!0)),onToggled:(t,o)=>e.onToolbarToggled(o),cyclicKeying:!1,initGroups:[],getSink:e.getSink,providers:e.providers,moreDrawerData:{lazyToolbar:e.lazyToolbar,lazyMoreButton:e.lazyMoreButton,lazyHeader:e.lazyHeader},attributes:e.attributes})}},name:"toolbar",schema:[os("dom"),os("onEscape"),os("getSink")]}),_D=iA.optional({factory:{sketch:e=>{const t=e.editor,o=e.sticky?tM:bA;return{uid:e.uid,dom:e.dom,components:e.components,behaviours:kl(o(t,e.sharedBackstage))}}},name:"header",schema:[os("dom")]}),TD=iA.optional({factory:{sketch:e=>({uid:e.uid,dom:e.dom,components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/tinymce-self-hosted-premium-features/?utm_source=TinyMCE&utm_medium=SPAP&utm_campaign=SPAP&utm_id=editorreferral",rel:"noopener",target:"_blank","aria-hidden":"true"},classes:["tox-promotion-link"],innerHtml:"\u26a1\ufe0fUpgrade"}}]})},name:"promotion",schema:[os("dom")]}),ED=iA.optional({name:"socket",schema:[os("dom")]}),AD=iA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-sidebar"],attributes:{role:"presentation"}},components:[{dom:{tag:"div",classes:["tox-sidebar__slider"]},components:[],behaviours:kl([ck.config({}),oh.config({}),Q_.config({dimension:{property:"width"},closedClass:"tox-sidebar--sliding-closed",openClass:"tox-sidebar--sliding-open",shrinkingClass:"tox-sidebar--sliding-shrinking",growingClass:"tox-sidebar--sliding-growing",onShrunk:e=>{wm.getCurrent(e).each(pM.hideAllSlots),Fr(e,SM)},onGrown:e=>{Fr(e,SM)},onStartGrow:e=>{Ir(e,wM,{width:Nt(e.element,"width").getOr("")})},onStartShrink:e=>{Ir(e,wM,{width:Jt(e.element)+"px"})}}),Kp.config({}),wm.config({find:e=>{const t=Kp.contents(e);return oe(t)}})])}],behaviours:kl([BO(0),Jp("sidebar-sliding-events",[Ur(wM,((e,t)=>{Dt(e.element,"width",t.event.width)})),Ur(SM,((e,t)=>{Ht(e.element,"width")}))])])})},name:"sidebar",schema:[os("dom")]}),MD=iA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",attributes:{"aria-hidden":"true"},classes:["tox-throbber"],styles:{display:"none"}},behaviours:kl([Kp.config({}),OM.config({focus:!1}),wm.config({find:e=>oe(e.components())})]),components:[]})},name:"throbber",schema:[os("dom")]}),DD=iA.optional({factory:SD,name:"viewWrapper",schema:[os("backstage")]}),BD=iA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-editor-container"]},components:e.components})},name:"editorContainer",schema:[]});var FD=bm({name:"OuterContainer",factory:(e,t,o)=>{let n=!1;const s={getSocket:t=>aA.getPart(t,e,"socket"),setSidebar:(t,o,n)=>{aA.getPart(t,e,"sidebar").each((e=>((e,t,o)=>{wm.getCurrent(e).each((n=>{Kp.set(n,[vM(t)]);const s=null==o?void 0:o.toLowerCase();r(s)&&ve(t,s)&&wm.getCurrent(n).each((t=>{pM.showSlot(t,s),Q_.immediateGrow(n),Ht(n.element,"width"),yM(e.element,"region")}))}))})(e,o,n)))},toggleSidebar:(t,o)=>{aA.getPart(t,e,"sidebar").each((e=>((e,t)=>{wm.getCurrent(e).each((o=>{wm.getCurrent(o).each((n=>{Q_.hasGrown(o)?pM.isShowing(n,t)?(Q_.shrink(o),yM(e.element,"presentation")):(pM.hideAllSlots(n),pM.showSlot(n,t),yM(e.element,"region")):(pM.hideAllSlots(n),pM.showSlot(n,t),Q_.grow(o),yM(e.element,"region"))}))}))})(e,o)))},whichSidebar:t=>aA.getPart(t,e,"sidebar").bind(xM).getOrNull(),getHeader:t=>aA.getPart(t,e,"header"),getToolbar:t=>aA.getPart(t,e,"toolbar"),setToolbar:(t,o)=>{aA.getPart(t,e,"toolbar").each((e=>{const t=H(o,oD);e.getApis().setGroups(e,t)}))},setToolbars:(t,o)=>{aA.getPart(t,e,"multiple-toolbar").each((e=>{const t=H(o,(e=>H(e,oD)));uA.setItems(e,t)}))},refreshToolbar:t=>{aA.getPart(t,e,"toolbar").each((e=>e.getApis().refresh(e)))},toggleToolbarDrawer:t=>{aA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggle,(t=>t(e)))}))},toggleToolbarDrawerWithoutFocusing:t=>{aA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggleWithoutFocusing,(t=>t(e)))}))},isToolbarDrawerToggled:t=>aA.getPart(t,e,"toolbar").bind((e=>A.from(e.getApis().isOpen).map((t=>t(e))))).getOr(!1),getThrobber:t=>aA.getPart(t,e,"throbber"),focusToolbar:t=>{aA.getPart(t,e,"toolbar").orThunk((()=>aA.getPart(t,e,"multiple-toolbar"))).each((e=>{Pp.focusIn(e)}))},setMenubar:(t,o)=>{aA.getPart(t,e,"menubar").each((e=>{lM.setMenus(e,o)}))},focusMenubar:t=>{aA.getPart(t,e,"menubar").each((e=>{lM.focus(e)}))},setViews:(t,o)=>{aA.getPart(t,e,"viewWrapper").each((e=>{SD.setViews(e,o)}))},toggleView:(t,o)=>aA.getPart(t,e,"viewWrapper").exists((e=>SD.toggleView(e,(()=>s.showMainView(t)),(()=>s.hideMainView(t)),o))),whichView:t=>aA.getPart(t,e,"viewWrapper").bind(SD.whichView).getOrNull(),hideMainView:t=>{n=s.isToolbarDrawerToggled(t),n&&s.toggleToolbarDrawer(t),aA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Dt(t,"display","none"),kt(t,"aria-hidden","true")}))},showMainView:t=>{n&&s.toggleToolbarDrawer(t),aA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Ht(t,"display"),Et(t,"aria-hidden")}))}};return{uid:e.uid,dom:e.dom,components:t,apis:s,behaviours:e.behaviours}},configFields:[os("dom"),os("behaviours")],partFields:[_D,kD,OD,CD,ED,AD,TD,MD,DD,BD],apis:{getSocket:(e,t)=>e.getSocket(t),setSidebar:(e,t,o,n)=>{e.setSidebar(t,o,n)},toggleSidebar:(e,t,o)=>{e.toggleSidebar(t,o)},whichSidebar:(e,t)=>e.whichSidebar(t),getHeader:(e,t)=>e.getHeader(t),getToolbar:(e,t)=>e.getToolbar(t),setToolbar:(e,t,o)=>{e.setToolbar(t,o)},setToolbars:(e,t,o)=>{e.setToolbars(t,o)},refreshToolbar:(e,t)=>e.refreshToolbar(t),toggleToolbarDrawer:(e,t)=>{e.toggleToolbarDrawer(t)},toggleToolbarDrawerWithoutFocusing:(e,t)=>{e.toggleToolbarDrawerWithoutFocusing(t)},isToolbarDrawerToggled:(e,t)=>e.isToolbarDrawerToggled(t),getThrobber:(e,t)=>e.getThrobber(t),setMenubar:(e,t,o)=>{e.setMenubar(t,o)},focusMenubar:(e,t)=>{e.focusMenubar(t)},focusToolbar:(e,t)=>{e.focusToolbar(t)},setViews:(e,t,o)=>{e.setViews(t,o)},toggleView:(e,t,o)=>e.toggleView(t,o),whichView:(e,t)=>e.whichView(t)}});const ID={file:{title:"File",items:"newdocument restoredraft | preview | export print | deleteallconversations"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall | searchreplace"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen | showcomments"},insert:{title:"Insert",items:"image link media addcomment pageembed template inserttemplate codesample inserttable accordion | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents footnotes | mergetags | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | styles blocks fontfamily fontsize align lineheight | forecolor backcolor | language | removeformat"},tools:{title:"Tools",items:"aidialog aishortcuts | spellchecker spellcheckerlanguage | autocorrect capitalization | a11ycheck code typography wordcount addtemplate"},table:{title:"Table",items:"inserttable | cell row column | advtablesort | tableprops deletetable"},help:{title:"Help",items:"help"}},RD=e=>e.split(" "),ND=(e,t)=>{const o={...ID,...t.menus},n=ae(t.menus).length>0,s=void 0===t.menubar||!0===t.menubar?RD("file edit view insert format tools table help"):RD(!1===t.menubar?"":t.menubar),a=U(s,(e=>{const o=ve(ID,e);return n?o||be(t.menus,e).exists((e=>ve(e,"items"))):o})),i=H(a,(n=>{const s=o[n];return((e,t,o)=>{const n=kb(o).split(/[ ,]/);return{text:e.title,getItems:()=>X(e.items,(e=>{const o=e.toLowerCase();return 0===o.trim().length||N(n,(e=>e===o))?[]:"separator"===o||"|"===o?[{type:"separator"}]:t.menuItems[o]?[t.menuItems[o]]:[]}))}})({title:s.title,items:RD(s.items)},t,e)}));return U(i,(e=>e.getItems().length>0&&N(e.getItems(),(e=>r(e)||"separator"!==e.type))))},VD=e=>{const t=()=>{e._skinLoaded=!0,(e=>{e.dispatch("SkinLoaded")})(e)};return()=>{e.initialized?t():e.on("init",t)}},zD=(e,t,o)=>(e.on("remove",(()=>o.unload(t))),o.load(t)),HD=(e,t)=>zD(e,t+"/skin.min.css",e.ui.styleSheetLoader),LD=(e,t)=>{var o;return o=Ve(e.getElement()),bt(o).isSome()?zD(e,t+"/skin.shadowdom.min.css",ab.DOM.styleSheetLoader):Promise.resolve()},PD=(e,t)=>{const o=Jb(t);return o&&t.contentCSS.push(o+(e?"/content.inline":"/content")+".min.css"),!Yb(t)&&r(o)?Promise.all([HD(t,o),LD(t,o)]).then(VD(t),((e,t)=>()=>((e,t)=>{e.dispatch("SkinLoadError",t)})(e,{message:"Skin could not be loaded"}))(t)):Promise.resolve(VD(t)())},UD=k(PD,!1),WD=k(PD,!0),jD=(e,t,o)=>{const n=(e,n,r,a)=>{const i=t.shared.providers.translate(e.title);if("separator"===e.type)return A.some({type:"separator",text:i});if("submenu"===e.type){const t=X(e.getStyleItems(),(e=>s(e,n,a)));return 0===n&&t.length<=0?A.none():A.some({type:"nestedmenuitem",text:i,enabled:t.length>0,getSubmenuItems:()=>X(e.getStyleItems(),(e=>s(e,n,a)))})}return A.some({type:"togglemenuitem",text:i,icon:e.icon,active:e.isSelected(a),enabled:!r,onAction:o.onAction(e),...e.getStylePreview().fold((()=>({})),(e=>({meta:{style:e}})))})},s=(e,t,s)=>{const r="formatter"===e.type&&o.isInvalid(e);return 0===t?r?[]:n(e,t,!1,s).toArray():n(e,t,r,s).toArray()},r=e=>{const t=o.getCurrentValue(),n=o.shouldHide?0:1;return X(e,(e=>s(e,n,t)))};return{validateItems:r,getFetch:(e,t)=>(o,n)=>{const s=t(),a=r(s);n(C_(a,pv.CLOSE_ON_EXECUTE,e,{isHorizontalMenu:!1,search:A.none()}))}}},GD=(e,t,o)=>{const n=o.dataset,s="basic"===n.type?()=>H(n.data,(e=>FE(e,o.isSelectedFor,o.getPreviewFor))):n.getData;return{items:jD(0,t,o),getStyleItems:s}},$D=(e,t,o)=>{const{items:n,getStyleItems:s}=GD(0,t,o),r=yw(e,"NodeChange",(t=>{const n=t.getComponent();o.updateText(n),Rm.set(t.getComponent(),!e.selection.isEditable())}));return x_({text:o.icon.isSome()?A.none():o.text,icon:o.icon,tooltip:A.from(o.tooltip),role:A.none(),fetch:n.getFetch(t,s),onSetup:r,getApi:e=>({getComponent:x(e)}),columns:1,presets:"normal",classes:o.icon.isSome()?[]:["bespoke"],dropdownBehaviours:[]},"tox-tbtn",t.shared)};var qD;!function(e){e[e.SemiColon=0]="SemiColon",e[e.Space=1]="Space"}(qD||(qD={}));const XD=(e,t,o)=>{const n=(s=((e,t)=>t===qD.SemiColon?e.replace(/;$/,"").split(";"):e.split(" "))(e.options.get(t),o),H(s,(e=>{let t=e,o=e;const n=e.split("=");return n.length>1&&(t=n[0],o=n[1]),{title:t,format:o}})));var s;return{type:"basic",data:n}},YD=[{title:"Left",icon:"align-left",format:"alignleft",command:"JustifyLeft"},{title:"Center",icon:"align-center",format:"aligncenter",command:"JustifyCenter"},{title:"Right",icon:"align-right",format:"alignright",command:"JustifyRight"},{title:"Justify",icon:"align-justify",format:"alignjustify",command:"JustifyFull"}],KD=e=>{const t={type:"basic",data:YD};return{tooltip:"Align",text:A.none(),icon:A.some("align-left"),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:e=>A.none,onAction:t=>()=>G(YD,(e=>e.format===t.format)).each((t=>e.execCommand(t.command))),updateText:t=>{const o=G(YD,(t=>e.formatter.match(t.format))).fold(x("left"),(e=>e.title.toLowerCase()));Ir(t,y_,{icon:`align-${o}`})},dataset:t,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},JD=(e,t)=>{const o=t(),n=H(o,(e=>e.format));return A.from(e.formatter.closest(n)).bind((e=>G(o,(t=>t.format===e)))).orThunk((()=>Ce(e.formatter.match("p"),{title:"Paragraph",format:"p"})))},ZD=e=>{const t="Paragraph",o=XD(e,"block_formats",qD.SemiColon);return{tooltip:"Blocks",text:A.some(t),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:xw(e),updateText:n=>{const s=JD(e,(()=>o.data)).fold(x(t),(e=>e.title));Ir(n,v_,{text:s})},dataset:o,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},QD=["-apple-system","Segoe UI","Roboto","Helvetica Neue","sans-serif"],eB=e=>{const t=e.split(/\s*,\s*/);return H(t,(e=>e.replace(/^['"]+|['"]+$/g,"")))},tB=e=>{const t="System Font",o=()=>{const o=e=>e?eB(e)[0]:"",s=e.queryCommandValue("FontName"),r=n.data,a=s?s.toLowerCase():"",i=G(r,(e=>{const t=e.format;return t.toLowerCase()===a||o(t).toLowerCase()===o(a).toLowerCase()})).orThunk((()=>Ce((e=>0===e.indexOf("-apple-system")&&(()=>{const t=eB(e.toLowerCase());return Y(QD,(e=>t.indexOf(e.toLowerCase())>-1))})())(a),{title:t,format:a})));return{matchOpt:i,font:s}},n=XD(e,"font_family_formats",qD.SemiColon);return{tooltip:"Fonts",text:A.some(t),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getCurrentValue:()=>{const{matchOpt:e}=o();return e},getPreviewFor:e=>()=>A.some({tag:"div",styles:-1===e.indexOf("dings")?{"font-family":e}:{}}),onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontName",!1,t.format)}))},updateText:e=>{const{matchOpt:t,font:n}=o(),s=t.fold(x(n),(e=>e.title));Ir(e,v_,{text:s})},dataset:n,shouldHide:!1,isInvalid:T}},oB={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},nB=(()=>{const e="[0-9]+",t="[eE][+-]?"+e,o=e=>`(?:${e})?`,n=["Infinity",e+"\\."+o(e)+o(t),"\\."+e+o(t),e+o(t)].join("|");return new RegExp(`^([+-]?(?:${n}))(.*)$`)})(),sB=(e,t)=>A.from(nB.exec(e)).bind((e=>{const o=Number(e[1]),n=e[2];return((e,t)=>N(t,(t=>N(oB[t],(t=>e===t)))))(n,t)?A.some({value:o,unit:n}):A.none()})),rB={tab:x(9),escape:x(27),enter:x(13),backspace:x(8),delete:x(46),left:x(37),up:x(38),right:x(39),down:x(40),space:x(32),home:x(36),end:x(35),pageUp:x(33),pageDown:x(34)},aB={"8pt":"1","10pt":"2","12pt":"3","14pt":"4","18pt":"5","24pt":"6","36pt":"7"},iB={"xx-small":"7pt","x-small":"8pt",small:"10pt",medium:"12pt",large:"14pt","x-large":"18pt","xx-large":"24pt"},lB=(e,t)=>/[0-9.]+px$/.test(e)?((e,t)=>{const o=Math.pow(10,t);return Math.round(e*o)/o})(72*parseInt(e,10)/96,t||0)+"pt":be(iB,e).getOr(e),cB=e=>be(aB,e).getOr(""),dB=e=>{const t=()=>{let t=A.none();const o=n.data,s=e.queryCommandValue("FontSize");if(s)for(let e=3;t.isNone()&&e>=0;e--){const n=lB(s,e),r=cB(n);t=G(o,(e=>e.format===s||e.format===n||e.format===r))}return{matchOpt:t,size:s}},o=x(A.none),n=XD(e,"font_size_formats",qD.Space);return{tooltip:"Font sizes",text:A.some("12pt"),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getPreviewFor:o,getCurrentValue:()=>{const{matchOpt:e}=t();return e},onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontSize",!1,t.format)}))},updateText:e=>{const{matchOpt:o,size:n}=t(),s=o.fold(x(n),(e=>e.title));Ir(e,v_,{text:s})},dataset:n,shouldHide:!1,isInvalid:T}},uB=(e,t)=>{const o="Paragraph";return{tooltip:"Formats",text:A.some(o),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:xw(e),updateText:t=>{const n=e=>EE(e)?X(e.items,n):AE(e)?[{title:e.title,format:e.format}]:[],s=X(BE(e),n),r=JD(e,x(s)).fold(x(o),(e=>e.title));Ir(t,v_,{text:r})},shouldHide:wb(e),isInvalid:t=>!e.formatter.canApply(t.format),dataset:t}},mB=x([os("toggleClass"),os("fetch"),Fi("onExecute"),ys("getHotspot",A.some),ys("getAnchorOverrides",x({})),wc(),Fi("onItemExecute"),us("lazySink"),os("dom"),Di("onOpen"),hu("splitDropdownBehaviours",[uS,Pp,oh]),ys("matchWidth",!1),ys("useMinWidth",!1),ys("eventOrder",{}),us("role")].concat(ES())),gB=Uu({factory:Wh,schema:[os("dom")],name:"arrow",defaults:()=>({buttonBehaviours:kl([oh.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each(Rr)},buttonBehaviours:kl([dh.config({toggleOnExecute:!1,toggleClass:e.toggleClass})])})}),pB=Uu({factory:Wh,schema:[os("dom")],name:"button",defaults:()=>({buttonBehaviours:kl([oh.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each((o=>{e.onExecute(o,t)}))}})}),hB=x([gB,pB,ju({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[os("text")],name:"aria-descriptor"}),Wu({schema:[Ei()],name:"menu",defaults:e=>({onExecute:(t,o)=>{t.getSystem().getByUid(e.uid).each((n=>{e.onItemExecute(n,t,o)}))}})}),yS()]),fB=bm({name:"SplitDropdown",configFields:mB(),partFields:hB(),factory:(e,t,o,n)=>{const s=e=>{wm.getCurrent(e).each((e=>{Gm.highlightFirst(e),Pp.focusIn(e)}))},r=t=>{kS(e,w,t,n,s,zh.HighlightMenuAndItem).get(b)},a=t=>{const o=nm(t,e,"button");return Rr(o),A.some(!0)},i={...Hr([Kr(((t,o)=>{om(t,e,"aria-descriptor").each((e=>{const o=la("aria");kt(e.element,"id",o),kt(t.element,"aria-describedby",o)}))}))]),...mh(A.some(r))},l={repositionMenus:e=>{dh.isOn(e)&&TS(e)}};return{uid:e.uid,dom:e.dom,components:t,apis:l,eventOrder:{...e.eventOrder,[ur()]:["disabling","toggling","alloy.base.behaviour"]},events:i,behaviours:bu(e.splitDropdownBehaviours,[uS.config({others:{sandbox:t=>{const o=nm(t,e,"arrow");return _S(e,t,{onOpen:()=>{dh.on(o),dh.on(t)},onClose:()=>{dh.off(o),dh.off(t)}})}}}),Pp.config({mode:"special",onSpace:a,onEnter:a,onDown:e=>(r(e),A.some(!0))}),oh.config({}),dh.config({toggleOnExecute:!1,aria:{mode:"expanded"}})]),domModification:{attributes:{role:e.role.getOr("button"),"aria-haspopup":!0}}}},apis:{repositionMenus:(e,t)=>e.repositionMenus(t)}}),bB=e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t),setText:t=>Ir(e,v_,{text:t}),setIcon:t=>Ir(e,y_,{icon:t})}),vB=e=>({setActive:t=>{dh.set(e,t)},isActive:()=>dh.isOn(e),isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t),setText:t=>Ir(e,v_,{text:t}),setIcon:t=>Ir(e,y_,{icon:t})}),yB=(e,t)=>e.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),xB=la("focus-button"),wB=(e,t,o,n,s)=>{const r=t.map((e=>Gh(b_(e,"tox-tbtn",s)))),a=e.map((e=>Gh(f_(e,s.icons))));return{dom:{tag:"button",classes:["tox-tbtn"].concat(t.isSome()?["tox-tbtn--select"]:[]),attributes:yB(o,s)},components:Dx([a.map((e=>e.asSpec())),r.map((e=>e.asSpec()))]),eventOrder:{[Ws()]:["focusing","alloy.base.behaviour",u_],[Sr()]:[u_,"toolbar-group-button-events"]},buttonBehaviours:kl([Ox(s.isDisabled),Sx(),Jp(u_,[Kr(((e,t)=>g_(e))),Ur(v_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{Kp.set(e,[ti(s.translate(t.event.text))])}))})),Ur(y_,((e,t)=>{a.bind((t=>t.getOpt(e))).each((e=>{Kp.set(e,[f_(t.event.icon,s.icons)])}))})),Ur(Ws(),((e,t)=>{t.event.prevent(),Fr(e,xB)}))])].concat(n.getOr([])))}},SB=(e,t,o)=>{var n;const s=Es(b),r=wB(e.icon,e.text,e.tooltip,A.none(),o);return Wh.sketch({dom:r.dom,components:r.components,eventOrder:m_,buttonBehaviours:{...kl([Jp("toolbar-button-events",[(a={onAction:e.onAction,getApi:t.getApi},Qr(((e,t)=>{_x(a,e)((t=>{Ir(e,d_,{buttonApi:t}),a.onAction(t)}))}))),Tx(t,s),Ex(t,s)]),Ox((()=>!e.enabled||o.isDisabled())),Sx()].concat(t.toolbarButtonBehaviours)),[u_]:null===(n=r.buttonBehaviours)||void 0===n?void 0:n[u_]}});var a},kB=(e,t,o)=>SB(e,{toolbarButtonBehaviours:o.length>0?[Jp("toolbarButtonWith",o)]:[],getApi:bB,onSetup:e.onSetup},t),CB=(e,t,o)=>SB(e,{toolbarButtonBehaviours:[Kp.config({}),dh.config({toggleClass:"tox-tbtn--enabled",aria:{mode:"pressed"},toggleOnExecute:!1})].concat(o.length>0?[Jp("toolbarToggleButtonWith",o)]:[]),getApi:vB,onSetup:e.onSetup},t),OB=(e,t,o)=>n=>fS((e=>t.fetch(e))).map((s=>A.from(HS(fn(Zw(la("menu-value"),s,(o=>{t.onItemAction(e(n),o)}),t.columns,t.presets,pv.CLOSE_ON_EXECUTE,t.select.getOr(T),o),{movement:eS(t.columns,t.presets),menuBehaviours:lx("auto"!==t.columns?[]:[Kr(((e,o)=>{ix(e,4,_v(t.presets)).each((({numRows:t,numColumns:o})=>{Pp.setGridSize(e,t,o)}))}))])}))))),_B=[{name:"history",items:["undo","redo"]},{name:"ai",items:["aidialog","aishortcuts"]},{name:"styles",items:["styles"]},{name:"formatting",items:["bold","italic"]},{name:"alignment",items:["alignleft","aligncenter","alignright","alignjustify"]},{name:"indentation",items:["outdent","indent"]},{name:"permanent pen",items:["permanentpen"]},{name:"comments",items:["addcomment"]}],TB=(e,t)=>(o,n,s)=>{const r=e(o).mapError((e=>Kn(e))).getOrDie();return t(r,n,s)},EB={button:TB(Fy,((e,t)=>{return o=e,n=t.shared.providers,kB(o,n,[]);var o,n})),togglebutton:TB(Ny,((e,t)=>{return o=e,n=t.shared.providers,CB(o,n,[]);var o,n})),menubutton:TB(aM,((e,t)=>tT(e,"tox-tbtn",t,A.none(),!1))),splitbutton:TB((e=>qn("SplitButton",iM,e)),((e,t)=>((e,t)=>{const o=e=>({isEnabled:()=>!Rm.isDisabled(e),setEnabled:t=>Rm.set(e,!t),setIconFill:(t,o)=>{pi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{kt(e,"fill",o)}))},setActive:t=>{kt(e.element,"aria-pressed",t),pi(e.element,"span").each((o=>{e.getSystem().getByDom(o).each((e=>dh.set(e,t)))}))},isActive:()=>pi(e.element,"span").exists((t=>e.getSystem().getByDom(t).exists(dh.isOn))),setText:t=>pi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Ir(e,v_,{text:t}))))),setIcon:t=>pi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Ir(e,y_,{icon:t})))))}),n=Es(b),s={getApi:o,onSetup:e.onSetup};return fB.sketch({dom:{tag:"div",classes:["tox-split-button"],attributes:{"aria-pressed":!1,...yB(e.tooltip,t.providers)}},onExecute:t=>{const n=o(t);n.isEnabled()&&e.onAction(n)},onItemExecute:(e,t,o)=>{},splitDropdownBehaviours:kl([Cx(t.providers.isDisabled),Sx(),Jp("split-dropdown-events",[Kr(((e,t)=>g_(e))),Ur(xB,oh.focus),Tx(s,n),Ex(s,n)]),Ik.config({})]),eventOrder:{[Sr()]:["alloy.base.behaviour","split-dropdown-events"]},toggleClass:"tox-tbtn--enabled",lazySink:t.getSink,fetch:OB(o,e,t.providers),parts:{menu:Bv(0,e.columns,e.presets)},components:[fB.parts.button(wB(e.icon,e.text,A.none(),A.some([dh.config({toggleClass:"tox-tbtn--enabled",toggleOnExecute:!1})]),t.providers)),fB.parts.arrow({dom:{tag:"button",classes:["tox-tbtn","tox-split-button__chevron"],innerHtml:Zf("chevron-down",t.providers.icons)},buttonBehaviours:kl([Cx(t.providers.isDisabled),Sx(),Qf()])}),fB.parts["aria-descriptor"]({text:t.providers.translate("To open the popup, press Shift+Enter")})]})})(e,t.shared))),grouptoolbarbutton:TB((e=>qn("GroupToolbarButton",nM,e)),((e,t,o)=>{const n=o.ui.registry.getAll().buttons,s={[yc]:t.shared.header.isPositionedAtTop()?vc.TopToBottom:vc.BottomToTop};if(Cb(o)===sb.floating)return((e,t,o,n)=>{const s=t.shared,r=Es(b),a={toolbarButtonBehaviours:[],getApi:bB,onSetup:e.onSetup},i=[Jp("toolbar-group-button-events",[Tx(a,r),Ex(a,r)])];return WM.sketch({lazySink:s.getSink,fetch:()=>fS((t=>{t(H(o(e.items),oD))})),markers:{toggledClass:"tox-tbtn--enabled"},parts:{button:wB(e.icon,e.text,e.tooltip,A.some(i),s.providers),toolbar:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:n}}}})})(e,t,(e=>MB(o,{buttons:n,toolbar:e,allowToolbarGroups:!1},t,A.none())),s);throw new Error("Toolbar groups are only supported when using floating toolbar mode")}))},AB={styles:(e,t)=>{const o={type:"advanced",...t.styles};return $D(e,t,uB(e,o))},fontsize:(e,t)=>$D(e,t,dB(e)),fontsizeinput:(e,t)=>((e,t,o)=>{let n=A.none();const s=yw(e,"NodeChange SwitchMode",(t=>{const s=t.getComponent();n=A.some(s),o.updateInputValue(s),Rm.set(s,!e.selection.isEditable())})),r=e=>({getComponent:x(e)}),a=Es(b),i=la("custom-number-input-events"),l=(e,t,s)=>{const r=n.map((e=>pu.getValue(e))).getOr(""),a=o.getNewValue(r,e),i=r.length-`${a}`.length,l=n.map((e=>e.element.dom.selectionStart-i)),c=n.map((e=>e.element.dom.selectionEnd-i));o.onAction(a,s),n.each((e=>{pu.setValue(e,a),t&&(l.each((t=>e.element.dom.selectionStart=t)),c.each((t=>e.element.dom.selectionEnd=t)))}))},c=(e,t)=>l(((e,t)=>e-t),e,t),d=(e,t)=>l(((e,t)=>e+t),e,t),u=e=>rt(e.element).fold(A.none,(e=>(Dl(e),A.some(!0)))),m=e=>Fl(e.element)?(ct(e.element).each((e=>Dl(e))),A.some(!0)):A.none(),g=(o,n,s,i)=>{const l=t.shared.providers.translate(s),c=la("altExecuting"),d=yw(e,"NodeChange SwitchMode",(t=>{Rm.set(t.getComponent(),!e.selection.isEditable())})),u=e=>{Rm.isDisabled(e)||o(!0)};return Wh.sketch({dom:{tag:"button",attributes:{title:l,"aria-label":l},classes:i.concat(n)},components:[h_(n,t.shared.providers.icons)],buttonBehaviours:kl([Rm.config({}),Jp(c,[Tx({onSetup:d,getApi:r},a),Ex({getApi:r},a),Ur(Ks(),((e,t)=>{t.event.raw.keyCode!==rB.space()&&t.event.raw.keyCode!==rB.enter()||Rm.isDisabled(e)||o(!1)})),Ur(er(),u),Ur(Ps(),u)])]),eventOrder:{[Ks()]:[c,"keying"],[er()]:[c,"alloy.base.behaviour"],[Ps()]:[c,"alloy.base.behaviour"]}})},p=Gh(g((e=>c(!1,e)),"minus","Decrease font size",["highlight-on-focus"])),h=Gh(g((e=>d(!1,e)),"plus","Increase font size",["highlight-on-focus"])),f=Gh({dom:{tag:"div",classes:["tox-input-wrapper","highlight-on-focus"]},components:[Vv.sketch({inputBehaviours:kl([Rm.config({}),Jp(i,[Tx({onSetup:s,getApi:r},a),Ex({getApi:r},a)]),Jp("input-update-display-text",[Ur(v_,((e,t)=>{pu.setValue(e,t.event.text)})),Ur(Ys(),(e=>{o.onAction(pu.getValue(e))})),Ur(Qs(),(e=>{o.onAction(pu.getValue(e))}))]),Pp.config({mode:"special",onEnter:e=>(l(w,!0,!0),A.some(!0)),onEscape:u,onUp:e=>(d(!0,!1),A.some(!0)),onDown:e=>(c(!0,!1),A.some(!0)),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})],behaviours:kl([oh.config({}),Pp.config({mode:"special",onEnter:m,onSpace:m,onEscape:u}),Jp("input-wrapper-events",[Ur(qs(),(e=>{L([p,h],(t=>{const o=Ve(t.get(e).element.dom);Fl(o)&&Bl(o)}))}))])])});return{dom:{tag:"div",classes:["tox-number-input"]},components:[p.asSpec(),f.asSpec(),h.asSpec()],behaviours:kl([oh.config({}),Pp.config({mode:"flow",focusInside:pg.OnEnterOrSpaceMode,cycles:!1,selector:"button, .tox-input-wrapper",onEscape:e=>Fl(e.element)?A.none():(Dl(e.element),A.some(!0))})])}})(e,t,(e=>{const t=()=>e.queryCommandValue("FontSize");return{updateInputValue:e=>Ir(e,v_,{text:t()}),onAction:(t,o)=>e.execCommand("FontSize",!1,t,{skip_focus:!o}),getNewValue:(o,n)=>{sB(o,["unsupportedLength","empty"]);const s=sB(o,["unsupportedLength","empty"]).or(sB(t(),["unsupportedLength","empty"])),r=s.map((e=>e.value)).getOr(16),a=Rb(e),i=s.map((e=>e.unit)).filter((e=>""!==e)).getOr(a),l=n(r,(e=>{var t;return null!==(t={em:{step:.1},cm:{step:.1},in:{step:.1},pc:{step:.1},ch:{step:.1},rem:{step:.1}}[e])&&void 0!==t?t:{step:1}})(i).step);return`${(e=>e>=0)(l)?l:r}${i}`}}})(e)),fontfamily:(e,t)=>$D(e,t,tB(e)),blocks:(e,t)=>$D(e,t,ZD(e)),align:(e,t)=>$D(e,t,KD(e))},MB=(e,t,o,n)=>{const s=(e=>{const t=e.toolbar,o=e.buttons;return!1===t?[]:void 0===t||!0===t?(e=>{const t=H(_B,(t=>{const o=U(t.items,(t=>ve(e,t)||ve(AB,t)));return{name:t.name,items:o}}));return U(t,(e=>e.items.length>0))})(o):r(t)?(e=>{const t=e.split("|");return H(t,(e=>({items:e.trim().split(" ")})))})(t):(e=>f(e,(e=>ve(e,"name")&&ve(e,"items"))))(t)?t:(console.error("Toolbar type should be string, string[], boolean or ToolbarGroup[]"),[])})(t),a=H(s,(s=>{const r=X(s.items,(s=>0===s.trim().length?[]:((e,t,o,n,s,r)=>be(t,o.toLowerCase()).orThunk((()=>r.bind((e=>re(e,(e=>be(t,e+o.toLowerCase()))))))).fold((()=>be(AB,o.toLowerCase()).map((t=>t(e,s)))),(t=>"grouptoolbarbutton"!==t.type||n?((e,t,o)=>be(EB,e.type).fold((()=>(console.error("skipping button defined by",e),A.none())),(n=>A.some(n(e,t,o)))))(t,s,e):(console.warn(`Ignoring the '${o}' toolbar button. Group toolbar buttons are only supported when using floating toolbar mode and cannot be nested.`),A.none()))))(e,t.buttons,s,t.allowToolbarGroups,o,n).toArray()));return{title:A.from(e.translate(s.name)),items:r}}));return U(a,(e=>e.items.length>0))},DB=(e,t,o,n)=>{const s=t.mainUi.outerContainer,a=o.toolbar,i=o.buttons;if(f(a,r)){const t=a.map((t=>{const s={toolbar:t,buttons:i,allowToolbarGroups:o.allowToolbarGroups};return MB(e,s,n,A.none())}));FD.setToolbars(s,t)}else FD.setToolbar(s,MB(e,o,n,A.none()))},BB=Do(),FB=BB.os.isiOS()&&BB.os.version.major<=12;var IB=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=t,i=Es(0),l=r.outerContainer;e.on("SkinLoaded",(()=>{DB(e,t,o,n)})),UD(e);const d=Ve(s.targetNode),u=ft(ht(d));Rd(d,r.mothership),((e,t,o)=>{lv(e)&&Rd(o.mainUi.mothership.element,o.popupUi.mothership),Id(t,o.dialogUi.mothership)})(e,u,t),e.on("PostRender",(()=>{FD.setSidebar(l,o.sidebar,$b(e)),DB(e,t,o,n),i.set(e.getWin().innerWidth),FD.setMenubar(l,ND(e,o)),FD.setViews(l,o.views),((e,t)=>{const{uiMotherships:o}=t,n=e.dom;let s=e.getWin();const r=e.getDoc().documentElement,a=Es($t(s.innerWidth,s.innerHeight)),i=Es($t(r.offsetWidth,r.offsetHeight)),l=()=>{const t=a.get();t.left===s.innerWidth&&t.top===s.innerHeight||(a.set($t(s.innerWidth,s.innerHeight)),gw(e))},c=()=>{const t=e.getDoc().documentElement,o=i.get();o.left===t.offsetWidth&&o.top===t.offsetHeight||(i.set($t(t.offsetWidth,t.offsetHeight)),gw(e))},d=t=>{((e,t)=>{e.dispatch("ScrollContent",t)})(e,t)};n.bind(s,"resize",l),n.bind(s,"scroll",d);const u=oc(Ve(e.getBody()),"load",c);e.on("hide",(()=>{L(o,(e=>{Dt(e.element,"display","none")}))})),e.on("show",(()=>{L(o,(e=>{Ht(e.element,"display")}))})),e.on("NodeChange",c),e.on("remove",(()=>{u.unbind(),n.unbind(s,"resize",l),n.unbind(s,"scroll",d),s=null}))})(e,t)}));const m=FD.getSocket(l).getOrDie("Could not find expected socket element");if(FB){Bt(m.element,{overflow:"scroll","-webkit-overflow-scrolling":"touch"});const t=((e,t)=>{let o=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null)},throttle:(...t)=>{c(o)&&(o=setTimeout((()=>{o=null,e.apply(null,t)}),20))}}})((()=>{e.dispatch("ScrollContent")})),o=tc(m.element,"scroll",t.throttle);e.on("remove",o.unbind)}wx(e,t),e.addCommand("ToggleSidebar",((t,o)=>{FD.toggleSidebar(l,o),e.dispatch("ToggleSidebar")})),e.addQueryValueHandler("ToggleSidebar",(()=>{var e;return null!==(e=FD.whichSidebar(l))&&void 0!==e?e:""})),e.addCommand("ToggleView",((t,o)=>{if(FD.toggleView(l,o)){const t=l.element;r.mothership.broadcastOn([Yd()],{target:t}),L(a,(e=>{e.broadcastOn([Yd()],{target:t})})),c(FD.whichView(l))&&(e.focus(),e.nodeChanged(),FD.refreshToolbar(l))}})),e.addQueryValueHandler("ToggleView",(()=>{var e;return null!==(e=FD.whichView(l))&&void 0!==e?e:""}));const g=Cb(e);g!==sb.sliding&&g!==sb.floating||e.on("ResizeWindow ResizeEditor ResizeContent",(()=>{const o=e.getWin().innerWidth;o!==i.get()&&(FD.refreshToolbar(t.mainUi.outerContainer),i.set(o))}));const p={setEnabled:e=>{xx(t,!e)},isEnabled:()=>!Rm.isDisabled(l)};return{iframeContainer:m.element.dom,editorContainer:l.element.dom,api:p}}});const RB=e=>/^[0-9\.]+(|px)$/i.test(""+e)?A.some(parseInt(""+e,10)):A.none(),NB=e=>h(e)?e+"px":e,VB=(e,t,o)=>{const n=t.filter((t=>e<t)),s=o.filter((t=>e>t));return n.or(s).getOr(e)},zB=e=>{const t=pb(e),o=hb(e),n=bb(e);return RB(t).map((e=>VB(e,o,n)))},{ToolbarLocation:HB,ToolbarMode:LB}=dv,PB=(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=o,i=ab.DOM,l=sv(e),c=iv(e),d=bb(e).or(zB(e)),u=n.shared.header,m=u.isPositionedAtTop,g=Cb(e),p=g===LB.sliding||g===LB.floating,h=Es(!1),f=()=>h.get()&&!e.removed,b=e=>p?e.fold(x(0),(e=>e.components().length>1?Wt(e.components()[1].element):0)):0,v=()=>{L(a,(e=>{e.broadcastOn([Kd()],{})}))},y=o=>{if(!f())return;l||s.on((e=>{const o=d.getOrThunk((()=>{const e=RB(It(xt(),"margin-left")).getOr(0);return Jt(xt())-Xt(t).left+e}));Dt(e.element,"max-width",o+"px")}));const n=l?A.none():(()=>{if(l)return A.none();if(Xt(r.outerContainer.element).left+Zt(r.outerContainer.element)>=window.innerWidth-40||Nt(r.outerContainer.element,"width").isSome()){Dt(r.outerContainer.element,"position","absolute"),Dt(r.outerContainer.element,"left","0px"),Ht(r.outerContainer.element,"width");const e=Zt(r.outerContainer.element);return A.some(e)}return A.none()})();p&&FD.refreshToolbar(r.outerContainer),l||(o=>{s.on((n=>{const s=FD.getToolbar(r.outerContainer),a=b(s),i=Jo(t),{top:l,left:c}=((e,t)=>lv(e)?xA(t):A.none())(e,r.outerContainer.element).fold((()=>({top:m()?Math.max(i.y-Wt(n.element)+a,0):i.bottom,left:i.x})),(e=>{var t;const o=Jo(e),s=null!==(t=e.dom.scrollTop)&&void 0!==t?t:0,r=Ze(e,xt()),l=r?Math.max(i.y-Wt(n.element)+a,0):i.y-o.y+s-Wt(n.element)+a;return{top:m()?l:i.bottom,left:r?i.x:i.x-o.x}})),d={position:"absolute",left:Math.round(c)+"px",top:Math.round(l)+"px"},u=o.map((e=>{const t=Uo(),o=window.innerWidth-(c-t.left);return{width:Math.max(Math.min(e,o),150)+"px"}})).getOr({});Bt(r.outerContainer.element,{...d,...u})}))})(n),c&&s.on(o),v()},w=()=>!(l||!c||!f())&&s.get().exists((o=>{const n=u.getDockingMode(),a=(o=>{switch(_b(e)){case HB.auto:const e=FD.getToolbar(r.outerContainer),n=b(e),s=Wt(o.element)-n,a=Jo(t);if(a.y>s)return"top";{const e=ot(t),o=Math.max(e.dom.scrollHeight,Wt(e));return a.bottom<o-s||en().bottom<a.bottom-s?"bottom":"top"}case HB.bottom:return"bottom";case HB.top:default:return"top"}})(o);return a!==n&&(i=a,s.on((e=>{$A.setModes(e,[i]),u.setDockingMode(i);const t=m()?vc.TopToBottom:vc.BottomToTop;kt(e.element,yc,t)})),!0);var i}));return{isVisible:f,isPositionedAtTop:m,show:()=>{h.set(!0),Dt(r.outerContainer.element,"display","flex"),i.addClass(e.getBody(),"mce-edit-focus"),L(a,(e=>{Ht(e.element,"display")})),w(),lv(e)?y((e=>$A.isDocked(e)?$A.reset(e):$A.refresh(e))):y($A.refresh)},hide:()=>{h.set(!1),Dt(r.outerContainer.element,"display","none"),i.removeClass(e.getBody(),"mce-edit-focus"),L(a,(e=>{Dt(e.element,"display","none")}))},update:y,updateMode:()=>{w()&&y($A.reset)},repositionPopups:v}},UB=(e,t)=>{const o=Jo(e);return{pos:t?o.y:o.bottom,bounds:o}};var WB=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r}=t,a=Ql(),i=Ve(s.targetNode),l=PB(e,i,t,n,a),c=Ab(e);WD(e);const d=()=>{if(a.isSet())return void l.show();a.set(FD.getHeader(r.outerContainer).getOrDie());const s=rv(e);lv(e)?(Rd(i,r.mothership),Rd(i,t.popupUi.mothership)):Id(s,r.mothership),Id(s,t.dialogUi.mothership),DB(e,t,o,n),FD.setMenubar(r.outerContainer,ND(e,o)),l.show(),((e,t,o,n)=>{const s=Es(UB(t,o.isPositionedAtTop())),r=n=>{const{pos:r,bounds:a}=UB(t,o.isPositionedAtTop()),{pos:i,bounds:l}=s.get(),c=a.height!==l.height||a.width!==l.width;s.set({pos:r,bounds:a}),c&&gw(e,n),o.isVisible()&&(i!==r?o.update($A.reset):c&&(o.updateMode(),o.repositionPopups()))};n||(e.on("activate",o.show),e.on("deactivate",o.hide)),e.on("SkinLoaded ResizeWindow",(()=>o.update($A.reset))),e.on("NodeChange keydown",(e=>{requestAnimationFrame((()=>r(e)))}));let a=0;const i=PO((()=>o.update($A.refresh)),33);e.on("ScrollWindow",(()=>{const e=Uo().left;e!==a&&(a=e,i.throttle()),o.updateMode()})),lv(e)&&e.on("ElementScroll",(e=>{o.update($A.refresh)}));const l=Zl();l.set(oc(Ve(e.getBody()),"load",(e=>r(e.raw)))),e.on("remove",(()=>{l.clear()}))})(e,i,l,c),e.nodeChanged()};e.on("show",d),e.on("hide",l.hide),c||(e.on("focus",d),e.on("blur",l.hide)),e.on("init",(()=>{(e.hasFocus()||c)&&d()})),wx(e,t);const u={show:d,hide:l.hide,setEnabled:e=>{xx(t,!e)},isEnabled:()=>!Rm.isDisabled(r.outerContainer)};return{editorContainer:r.outerContainer.element.dom,api:u}}});const jB="contexttoolbar-hide",GB=(e,t)=>Ur(d_,((o,n)=>{const s=(e=>({hide:()=>Fr(e,hr()),getValue:()=>pu.getValue(e)}))(e.get(o));t.onAction(s,n.event.buttonApi)})),$B=(e,t)=>{const o=e.label.fold((()=>({})),(e=>({"aria-label":e}))),n=Gh(Vv.sketch({inputClasses:["tox-toolbar-textfield","tox-toolbar-nav-js"],data:e.initValue(),inputAttributes:o,selectOnFocus:!0,inputBehaviours:kl([Pp.config({mode:"special",onEnter:e=>s.findPrimary(e).map((e=>(Rr(e),!0))),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})),s=((e,t,o)=>{const n=H(t,(t=>Gh(((e,t,o)=>(e=>"contextformtogglebutton"===e.type)(t)?((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Ny({...s,type:"togglebutton",onAction:b}));return CB(r,o,[GB(e,t)])})(e,t,o):((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Fy({...s,type:"button",onAction:b}));return kB(r,o,[GB(e,t)])})(e,t,o))(e,t,o))));return{asSpecs:()=>H(n,(e=>e.asSpec())),findPrimary:e=>re(t,((t,o)=>t.primary?A.from(n[o]).bind((t=>t.getOpt(e))).filter(C(Rm.isDisabled)):A.none()))}})(n,e.commands,t);return[{title:A.none(),items:[n.asSpec()]},{title:A.none(),items:s.asSpecs()}]},qB=(e,t,o)=>t.bottom-e.y>=o&&e.bottom-t.y>=o,XB=e=>{const t=(e=>{const t=e.getBoundingClientRect();if(t.height<=0&&t.width<=0){const o=ut(Ve(e.startContainer),e.startOffset).element;return($e(o)?st(o):A.some(o)).filter(Ge).map((e=>e.dom.getBoundingClientRect())).getOr(t)}return t})(e.selection.getRng());if(e.inline){const e=Uo();return Ko(e.left+t.left,e.top+t.top,t.width,t.height)}{const o=Zo(Ve(e.getBody()));return Ko(o.x+t.left,o.y+t.top,t.width,t.height)}},YB=(e,t,o,n=0)=>{const s=Go(window),r=Jo(Ve(e.getContentAreaContainer())),a=Kb(e)||Qb(e)||tv(e),{x:i,width:l}=((e,t,o)=>{const n=Math.max(e.x+o,t.x);return{x:n,width:Math.min(e.right-o,t.right)-n}})(r,s,n);if(e.inline&&!a)return Ko(i,s.y,l,s.height);{const a=t.header.isPositionedAtTop(),{y:c,bottom:d}=((e,t,o,n,s,r)=>{const a=Ve(e.getContainer()),i=pi(a,".tox-editor-header").getOr(a),l=Jo(i),c=l.y>=t.bottom,d=n&&!c;if(e.inline&&d)return{y:Math.max(l.bottom+r,o.y),bottom:o.bottom};if(e.inline&&!d)return{y:o.y,bottom:Math.min(l.y-r,o.bottom)};const u="line"===s?Jo(a):t;return d?{y:Math.max(l.bottom+r,o.y),bottom:Math.min(u.bottom-r,o.bottom)}:{y:Math.max(u.y+r,o.y),bottom:Math.min(l.y-r,o.bottom)}})(e,r,s,a,o,n);return Ko(i,c,l,d-c)}},KB={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"],inset:["tox-pop--inset"]},JB={maxHeightFunction:cc(),maxWidthFunction:NM()},ZB=e=>"node"===e,QB=(e,t,o,n,s)=>{const r=XB(e),a=n.lastElement().exists((e=>Ze(o,e)));return((e,t)=>{const o=e.selection.getRng(),n=ut(Ve(o.startContainer),o.startOffset);return o.startContainer===o.endContainer&&o.startOffset===o.endOffset-1&&Ze(n.element,t)})(e,o)?a?gE:lE:a?((e,o,s)=>{const a=Nt(e,"position");Dt(e,"position",o);const i=qB(r,Jo(t),-20)&&!n.isReposition()?hE:gE;return a.each((t=>Dt(e,"position",t))),i})(t,n.getMode()):("fixed"===n.getMode()?s.y+Uo().top:s.y)+(Wt(t)+12)<=r.y?lE:cE},eF=(e,t,o,n)=>{const s=t=>(n,s,r,a,i)=>({...QB(e,a,t,o,i)({...n,y:i.y,height:i.height},s,r,a,i),alwaysFit:!0}),r=e=>ZB(n)?[s(e)]:[];return t?{onLtr:e=>[cl,sl,rl,al,il,ll].concat(r(e)),onRtl:e=>[cl,rl,sl,il,al,ll].concat(r(e))}:{onLtr:e=>[ll,cl,al,sl,il,rl].concat(r(e)),onRtl:e=>[ll,cl,il,rl,al,sl].concat(r(e))}},tF=(e,t)=>{const o=U(t,(t=>t.predicate(e.dom))),{pass:n,fail:s}=P(o,(e=>"contexttoolbar"===e.type));return{contextToolbars:n,contextForms:s}},oF=(e,t)=>{const o={},n=[],s=[],r={},a={},i=ae(e);return L(i,(i=>{const l=e[i];"contextform"===l.type?((e,i)=>{const l=Xn(qn("ContextForm",Wy,i));o[e]=l,l.launch.map((o=>{r["form:"+e]={...i.launch,type:"contextformtogglebutton"===o.type?"togglebutton":"button",onAction:()=>{t(l)}}})),"editor"===l.scope?s.push(l):n.push(l),a[e]=l})(i,l):"contexttoolbar"===l.type&&((e,t)=>{var o;(o=t,qn("ContextToolbar",jy,o)).each((o=>{"editor"===t.scope?s.push(o):n.push(o),a[e]=o}))})(i,l)})),{forms:o,inNodeScope:n,inEditorScope:s,lookupTable:a,formNavigators:r}},nF=la("forward-slide"),sF=la("backward-slide"),rF=la("change-slide-event"),aF="tox-pop--resizing",iF="tox-pop--transition",lF=(e,t,o,n)=>{const s=n.backstage,r=s.shared,a=Do().deviceType.isTouch,i=Ql(),l=Ql(),c=Ql(),d=ri((e=>{const t=Es([]);return Ph.sketch({dom:{tag:"div",classes:["tox-pop"]},fireDismissalEventInstead:{event:"doNotDismissYet"},onShow:e=>{t.set([]),Ph.getContent(e).each((e=>{Ht(e.element,"visibility")})),Pa(e.element,aF),Ht(e.element,"width")},inlineBehaviours:kl([Jp("context-toolbar-events",[Yr(or(),((e,t)=>{"width"===t.event.raw.propertyName&&(Pa(e.element,aF),Ht(e.element,"width"))})),Ur(rF,((e,t)=>{const o=e.element;Ht(o,"width");const n=Jt(o);Ph.setContent(e,t.event.contents),La(o,aF);const s=Jt(o);Dt(o,"width",n+"px"),Ph.getContent(e).each((e=>{t.event.focus.bind((e=>(Dl(e),Rl(o)))).orThunk((()=>(Pp.focusIn(e),Il(ht(o)))))})),setTimeout((()=>{Dt(e.element,"width",s+"px")}),0)})),Ur(nF,((e,o)=>{Ph.getContent(e).each((o=>{t.set(t.get().concat([{bar:o,focus:Il(ht(e.element))}]))})),Ir(e,rF,{contents:o.event.forwardContents,focus:A.none()})})),Ur(sF,((e,o)=>{ne(t.get()).each((o=>{t.set(t.get().slice(0,t.get().length-1)),Ir(e,rF,{contents:ai(o.bar),focus:o.focus})}))}))]),Pp.config({mode:"special",onEscape:o=>ne(t.get()).fold((()=>e.onEscape()),(e=>(Fr(o,sF),A.some(!0))))})]),lazySink:()=>sn.value(e.sink)})})({sink:o,onEscape:()=>(e.focus(),A.some(!0))})),u=()=>{const t=c.get().getOr("node"),o=ZB(t)?1:0;return YB(e,r,t,o)},m=()=>!(e.removed||a()&&s.isContextMenuOpen()),g=()=>{if(m()){const t=u(),o=xe(c.get(),"node")?((e,t)=>t.filter((e=>yt(e)&&je(e))).map(Zo).getOrThunk((()=>XB(e))))(e,i.get()):XB(e);return t.height<=0||!qB(o,t,.01)}return!0},p=()=>{i.clear(),l.clear(),c.clear(),Ph.hide(d)},h=()=>{if(Ph.isOpen(d)){const e=d.element;Ht(e,"display"),g()?Dt(e,"display","none"):(l.set(0),Ph.reposition(d))}},f=t=>({dom:{tag:"div",classes:["tox-pop__dialog"]},components:[t],behaviours:kl([Pp.config({mode:"acyclic"}),Jp("pop-dialog-wrap-events",[Kr((t=>{e.shortcuts.add("ctrl+F9","focus statusbar",(()=>Pp.focusIn(t)))})),Jr((t=>{e.shortcuts.remove("ctrl+F9")}))])])}),v=Qt((()=>oF(t,(e=>{const t=y([e]);Ir(d,nF,{forwardContents:f(t)})})))),y=t=>{const{buttons:o}=e.ui.registry.getAll(),s={...o,...v().formNavigators},a=Cb(e)===sb.scrolling?sb.scrolling:sb.default,i=q(H(t,(t=>"contexttoolbar"===t.type?((t,o)=>MB(e,{buttons:t,toolbar:o.items,allowToolbarGroups:!1},n.backstage,A.some(["form:"])))(s,t):((e,t)=>$B(e,t))(t,r.providers))));return iD({type:a,uid:la("context-toolbar"),initGroups:i,onEscape:A.none,cyclicKeying:!0,providers:r.providers})},x=(t,n)=>{if(S.cancel(),!m())return;const s=y(t),p=t[0].position,h=((t,n)=>{const s="node"===t?r.anchors.node(n):r.anchors.cursor(),c=((e,t,o,n)=>"line"===t?{bubble:gc(12,0,KB),layouts:{onLtr:()=>[dl],onRtl:()=>[ul]},overrides:JB}:{bubble:gc(0,12,KB,1/12),layouts:eF(e,o,n,t),overrides:JB})(e,t,a(),{lastElement:i.get,isReposition:()=>xe(l.get(),0),getMode:()=>Sd.getMode(o)});return fn(s,c)})(p,n);c.set(p),l.set(1);const b=d.element;Ht(b,"display"),(e=>xe(Se(e,i.get(),Ze),!0))(n)||(Pa(b,iF),Sd.reset(o,d)),Ph.showWithinBounds(d,f(s),{anchor:h,transition:{classes:[iF],mode:"placement"}},(()=>A.some(u()))),n.fold(i.clear,i.set),g()&&Dt(b,"display","none")};let w=!1;const S=PO((()=>{!e.hasFocus()||e.removed||w||(Ua(d.element,iF)?S.throttle():((e,t)=>{const o=Ve(t.getBody()),n=e=>Ze(e,o),s=Ve(t.selection.getNode());return(e=>!n(e)&&!Qe(o,e))(s)?A.none():((e,t,o)=>{const n=tF(e,t);if(n.contextForms.length>0)return A.some({elem:e,toolbars:[n.contextForms[0]]});{const t=tF(e,o);if(t.contextForms.length>0)return A.some({elem:e,toolbars:[t.contextForms[0]]});if(n.contextToolbars.length>0||t.contextToolbars.length>0){const o=(e=>{if(e.length<=1)return e;{const t=t=>N(e,(e=>e.position===t)),o=t=>U(e,(e=>e.position===t)),n=t("selection"),s=t("node");if(n||s){if(s&&n){const e=o("node"),t=H(o("selection"),(e=>({...e,position:"node"})));return e.concat(t)}return o(n?"selection":"node")}return o("line")}})(n.contextToolbars.concat(t.contextToolbars));return A.some({elem:e,toolbars:o})}return A.none()}})(s,e.inNodeScope,e.inEditorScope).orThunk((()=>((e,t,o)=>e(t)?A.none():Fs(t,(e=>{if(Ge(e)){const{contextToolbars:t,contextForms:n}=tF(e,o.inNodeScope),s=n.length>0?n:(e=>{if(e.length<=1)return e;{const t=t=>G(e,(e=>e.position===t));return t("selection").orThunk((()=>t("node"))).orThunk((()=>t("line"))).map((e=>e.position)).fold((()=>[]),(t=>U(e,(e=>e.position===t))))}})(t);return s.length>0?A.some({elem:e,toolbars:s}):A.none()}return A.none()}),e))(n,s,e)))})(v(),e).fold(p,(e=>{x(e.toolbars,A.some(e.elem))})))}),17);e.on("init",(()=>{e.on("remove",p),e.on("ScrollContent ScrollWindow ObjectResized ResizeEditor longpress",h),e.on("click keyup focus SetContent",S.throttle),e.on(jB,p),e.on("contexttoolbar-show",(t=>{const o=v();be(o.lookupTable,t.toolbarKey).each((o=>{x([o],Ce(t.target!==e,t.target)),Ph.getContent(d).each(Pp.focusIn)}))})),e.on("focusout",(t=>{Uh.setEditorTimeout(e,(()=>{Rl(o.element).isNone()&&Rl(d.element).isNone()&&p()}),0)})),e.on("SwitchMode",(()=>{e.mode.isReadOnly()&&p()})),e.on("AfterProgressState",(t=>{t.state?p():e.hasFocus()&&S.throttle()})),e.on("dragstart",(()=>{w=!0})),e.on("dragend drop",(()=>{w=!1})),e.on("NodeChange",(e=>{Rl(d.element).fold(S.throttle,b)}))}))},cF=(e,t)=>{const o=()=>{const o=t.getOptions(e),n=t.getCurrent(e).map(t.hash),s=Ql();return H(o,(o=>({type:"togglemenuitem",text:t.display(o),onSetup:r=>{const a=e=>{e&&(s.on((e=>e.setActive(!1))),s.set(r)),r.setActive(e)};a(xe(n,t.hash(o)));const i=t.watcher(e,o,a);return()=>{s.clear(),i()}},onAction:()=>t.setCurrent(e,o)})))};e.ui.registry.addMenuButton(t.name,{tooltip:t.text,icon:t.icon,fetch:e=>e(o()),onSetup:t.onToolbarSetup}),e.ui.registry.addNestedMenuItem(t.name,{type:"nestedmenuitem",text:t.text,getSubmenuItems:o,onSetup:t.onMenuSetup})},dF=e=>{cF(e,(e=>({name:"lineheight",text:"Line height",icon:"line-height",getOptions:Zb,hash:e=>((e,t)=>sB(e,["fixed","relative","empty"]).map((({value:e,unit:t})=>e+t)))(e).getOr(e),display:w,watcher:(e,t,o)=>e.formatter.formatChanged("lineheight",o,!1,{value:t}).unbind,getCurrent:e=>A.from(e.queryCommandValue("LineHeight")),setCurrent:(e,t)=>e.execCommand("LineHeight",!1,t),onToolbarSetup:bw(e),onMenuSetup:bw(e)}))(e)),(e=>A.from(Sb(e)).map((t=>({name:"language",text:"Language",icon:"language",getOptions:x(t),hash:e=>u(e.customCode)?e.code:`${e.code}/${e.customCode}`,display:e=>e.title,watcher:(e,t,o)=>{var n;return e.formatter.formatChanged("lang",o,!1,{value:t.code,customValue:null!==(n=t.customCode)&&void 0!==n?n:null}).unbind},getCurrent:e=>{const t=Ve(e.selection.getNode());return Is(t,(e=>A.some(e).filter(Ge).bind((e=>_t(e,"lang").map((t=>({code:t,customCode:_t(e,"data-mce-lang").getOrUndefined(),title:""})))))))},setCurrent:(e,t)=>e.execCommand("Lang",!1,t),onToolbarSetup:t=>{const o=Zl();return t.setActive(e.formatter.match("lang",{},void 0,!0)),o.set(e.formatter.formatChanged("lang",t.setActive,!0)),fw(o.clear,bw(e)(t))},onMenuSetup:bw(e)}))))(e).each((t=>cF(e,t)))},uF=e=>yw(e,"NodeChange",(t=>{t.setEnabled(e.queryCommandState("outdent")&&e.selection.isEditable())})),mF=(e,t)=>o=>{o.setActive(t.get());const n=e=>{t.set(e.state),o.setActive(e.state)};return e.on("PastePlainTextToggle",n),fw((()=>e.off("PastePlainTextToggle",n)),bw(e)(o))},gF=(e,t)=>()=>{e.execCommand("mceToggleFormat",!1,t)},pF=e=>{(e=>{(e=>{LO.each([{name:"bold",text:"Bold",icon:"bold"},{name:"italic",text:"Italic",icon:"italic"},{name:"underline",text:"Underline",icon:"underline"},{name:"strikethrough",text:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",icon:"superscript"}],((t,o)=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:vw(e,t.name),onAction:gF(e,t.name)})}));for(let t=1;t<=6;t++){const o="h"+t;e.ui.registry.addToggleButton(o,{text:o.toUpperCase(),tooltip:"Heading "+t,onSetup:vw(e,o),onAction:gF(e,o)})}})(e),(e=>{LO.each([{name:"copy",text:"Copy",action:"Copy",icon:"copy"},{name:"help",text:"Help",action:"mceHelp",icon:"help"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all"},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"print",text:"Print",action:"mcePrint",icon:"print"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onAction:ww(e,t.action)})})),LO.each([{name:"cut",text:"Cut",action:"Cut",icon:"cut"},{name:"paste",text:"Paste",action:"Paste",icon:"paste"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"remove",text:"Remove",action:"Delete",icon:"remove"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:bw(e),onAction:ww(e,t.action)})}))})(e),(e=>{LO.each([{name:"blockquote",text:"Blockquote",action:"mceBlockQuote",icon:"quote"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:ww(e,t.action),onSetup:vw(e,t.name)})}))})(e)})(e),(e=>{LO.each([{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"copy",text:"Copy",action:"Copy",icon:"copy",shortcut:"Meta+C"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all",shortcut:"Meta+A"},{name:"print",text:"Print...",action:"mcePrint",icon:"print",shortcut:"Meta+P"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onAction:ww(e,t.action)})})),LO.each([{name:"bold",text:"Bold",action:"Bold",icon:"bold",shortcut:"Meta+B"},{name:"italic",text:"Italic",action:"Italic",icon:"italic",shortcut:"Meta+I"},{name:"underline",text:"Underline",action:"Underline",icon:"underline",shortcut:"Meta+U"},{name:"strikethrough",text:"Strikethrough",action:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",action:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",action:"Superscript",icon:"superscript"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"cut",text:"Cut",action:"Cut",icon:"cut",shortcut:"Meta+X"},{name:"paste",text:"Paste",action:"Paste",icon:"paste",shortcut:"Meta+V"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onSetup:bw(e),onAction:ww(e,t.action)})})),e.ui.registry.addMenuItem("codeformat",{text:"Code",icon:"sourcecode",onSetup:bw(e),onAction:gF(e,"code")})})(e)},hF=(e,t)=>yw(e,"Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",(o=>{o.setEnabled(!e.mode.isReadOnly()&&e.undoManager[t]())})),fF=e=>yw(e,"VisualAid",(t=>{t.setActive(e.hasVisual)})),bF=(e,t)=>{(e=>{L([{name:"alignleft",text:"Align left",cmd:"JustifyLeft",icon:"align-left"},{name:"aligncenter",text:"Align center",cmd:"JustifyCenter",icon:"align-center"},{name:"alignright",text:"Align right",cmd:"JustifyRight",icon:"align-right"},{name:"alignjustify",text:"Justify",cmd:"JustifyFull",icon:"align-justify"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:ww(e,t.cmd),onSetup:vw(e,t.name)})})),e.ui.registry.addButton("alignnone",{tooltip:"No alignment",icon:"align-none",onSetup:bw(e),onAction:ww(e,"JustifyNone")})})(e),pF(e),((e,t)=>{((e,t)=>{const o=GD(0,t,KD(e));e.ui.registry.addNestedMenuItem("align",{text:t.shared.providers.translate("Align"),onSetup:bw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=GD(0,t,tB(e));e.ui.registry.addNestedMenuItem("fontfamily",{text:t.shared.providers.translate("Fonts"),onSetup:bw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o={type:"advanced",...t.styles},n=GD(0,t,uB(e,o));e.ui.registry.addNestedMenuItem("styles",{text:"Formats",onSetup:bw(e),getSubmenuItems:()=>n.items.validateItems(n.getStyleItems())})})(e,t),((e,t)=>{const o=GD(0,t,ZD(e));e.ui.registry.addNestedMenuItem("blocks",{text:"Blocks",onSetup:bw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=GD(0,t,dB(e));e.ui.registry.addNestedMenuItem("fontsize",{text:"Font sizes",onSetup:bw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t)})(e,t),(e=>{(e=>{e.ui.registry.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onSetup:hF(e,"hasUndo"),onAction:ww(e,"undo")}),e.ui.registry.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onSetup:hF(e,"hasRedo"),onAction:ww(e,"redo")})})(e),(e=>{e.ui.registry.addButton("undo",{tooltip:"Undo",icon:"undo",enabled:!1,onSetup:hF(e,"hasUndo"),onAction:ww(e,"undo")}),e.ui.registry.addButton("redo",{tooltip:"Redo",icon:"redo",enabled:!1,onSetup:hF(e,"hasRedo"),onAction:ww(e,"redo")})})(e)})(e),(e=>{(e=>{e.addCommand("mceApplyTextcolor",((t,o)=>{((e,t,o)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.apply(t,{value:o}),e.nodeChanged()}))})(e,t,o)})),e.addCommand("mceRemoveTextcolor",(t=>{((e,t)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.remove(t,{value:null},void 0,!0),e.nodeChanged()}))})(e,t)}))})(e);const t=Lw(e),o=Pw(e),n=Es(t),s=Es(o);Yw(e,"forecolor","forecolor","Text color",n),Yw(e,"backcolor","hilitecolor","Background color",s),Kw(e,"forecolor","forecolor","Text color",n),Kw(e,"backcolor","hilitecolor","Background color",s)})(e),(e=>{(e=>{e.ui.registry.addButton("visualaid",{tooltip:"Visual aids",text:"Visual aids",onAction:ww(e,"mceToggleVisualAid")})})(e),(e=>{e.ui.registry.addToggleMenuItem("visualaid",{text:"Visual aids",onSetup:fF(e),onAction:ww(e,"mceToggleVisualAid")})})(e)})(e),(e=>{(e=>{e.ui.registry.addButton("outdent",{tooltip:"Decrease indent",icon:"outdent",onSetup:uF(e),onAction:ww(e,"outdent")}),e.ui.registry.addButton("indent",{tooltip:"Increase indent",icon:"indent",onSetup:bw(e),onAction:ww(e,"indent")})})(e)})(e),dF(e),(e=>{const t=Es(Gb(e)),o=()=>e.execCommand("mceTogglePlainTextPaste");e.ui.registry.addToggleButton("pastetext",{active:!1,icon:"paste-text",tooltip:"Paste as text",onAction:o,onSetup:mF(e,t)}),e.ui.registry.addToggleMenuItem("pastetext",{text:"Paste as text",icon:"paste-text",onAction:o,onSetup:mF(e,t)})})(e)},vF=e=>r(e)?e.split(/[ ,]/):e,yF=e=>t=>t.options.get(e),xF=yF("contextmenu_never_use_native"),wF=yF("contextmenu_avoid_overlap"),SF=e=>{const t=e.ui.registry.getAll().contextMenus,o=e.options.get("contextmenu");return e.options.isSet("contextmenu")?o:U(o,(e=>ve(t,e)))},kF=(e,t)=>({type:"makeshift",x:e,y:t}),CF=e=>"longpress"===e.type||0===e.type.indexOf("touch"),OF=(e,t)=>"contextmenu"===t.type||"longpress"===t.type?e.inline?(e=>{if(CF(e)){const t=e.touches[0];return kF(t.pageX,t.pageY)}return kF(e.pageX,e.pageY)})(t):((e,t)=>{const o=ab.DOM.getPos(e);return((e,t,o)=>kF(e.x+t,e.y+o))(t,o.x,o.y)})(e.getContentAreaContainer(),(e=>{if(CF(e)){const t=e.touches[0];return kF(t.clientX,t.clientY)}return kF(e.clientX,e.clientY)})(t)):_F(e),_F=e=>({type:"selection",root:Ve(e.selection.getNode())}),TF=(e,t,o)=>{switch(o){case"node":return(e=>({type:"node",node:A.some(Ve(e.selection.getNode())),root:Ve(e.getBody())}))(e);case"point":return OF(e,t);case"selection":return _F(e)}},EF=(e,t,o,n,s,r)=>{const a=o(),i=TF(e,t,r);C_(a,pv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!1,search:A.none()}).map((e=>{t.preventDefault(),Ph.showMenuAt(s,{anchor:i},{menu:{markers:Av("normal")},data:e})}))},AF={onLtr:()=>[cl,sl,rl,al,il,ll,lE,cE,iE,rE,aE,sE],onRtl:()=>[cl,rl,sl,il,al,ll,lE,cE,aE,sE,iE,rE]},MF={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},DF=(e,t,o,n,s,r)=>{const a=Do(),i=a.os.isiOS(),l=a.os.isMacOS(),c=a.os.isAndroid(),d=a.deviceType.isTouch(),u=()=>{const a=o();((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>{const n=TF(e,t,o);return{bubble:gc(0,"point"===o?12:0,MF),layouts:AF,overrides:{maxWidthFunction:NM(),maxHeightFunction:cc()},...n}})(e,t,r);C_(o,pv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!0,search:A.none()}).map((o=>{t.preventDefault();const l=a?zh.HighlightMenuAndItem:zh.HighlightNone;Ph.showMenuWithinBounds(s,{anchor:i},{menu:{markers:Av("normal"),highlightOnOpen:l},data:o,type:"horizontal"},(()=>A.some(YB(e,n.shared,"node"===r?"node":"selection")))),e.dispatch(jB)}))})(e,t,a,n,s,r,!(c||i||l&&d))};if((l||i)&&"node"!==r){const o=()=>{(e=>{const t=e.selection.getRng(),o=()=>{Uh.setEditorTimeout(e,(()=>{e.selection.setRng(t)}),10),r()};e.once("touchend",o);const n=e=>{e.preventDefault(),e.stopImmediatePropagation()};e.on("mousedown",n,!0);const s=()=>r();e.once("longpresscancel",s);const r=()=>{e.off("touchend",o),e.off("longpresscancel",s),e.off("mousedown",n)}})(e),u()};((e,t)=>{const o=e.selection;if(o.isCollapsed()||t.touches.length<1)return!1;{const n=t.touches[0],s=o.getRng();return Jc(e.getWin(),Lc.domRange(s)).exists((e=>e.left<=n.clientX&&e.right>=n.clientX&&e.top<=n.clientY&&e.bottom>=n.clientY))}})(e,t)?o():(e.once("selectionchange",o),e.once("touchend",(()=>e.off("selectionchange",o))))}else u()},BF=e=>r(e)?"|"===e:"separator"===e.type,FF={type:"separator"},IF=e=>{const t=e=>({text:e.text,icon:e.icon,enabled:e.enabled,shortcut:e.shortcut});if(r(e))return e;switch(e.type){case"separator":return FF;case"submenu":return{type:"nestedmenuitem",...t(e),getSubmenuItems:()=>{const t=e.getSubmenuItems();return r(t)?t:H(t,IF)}};default:const o=e;return{type:"menuitem",...t(o),onAction:v(o.onAction)}}},RF=(e,t)=>{if(0===t.length)return e;const o=ne(e).filter((e=>!BF(e))).fold((()=>[]),(e=>[FF]));return e.concat(o).concat(t).concat([FF])},NF=(e,t)=>!(e=>"longpress"===e.type||ve(e,"touches"))(t)&&(2!==t.button||t.target===e.getBody()&&""===t.pointerType),VF=(e,t)=>NF(e,t)?e.selection.getStart(!0):t.target,zF=(e,t,o)=>{const n=Do().deviceType.isTouch,s=ri(Ph.sketch({dom:{tag:"div"},lazySink:t,onEscape:()=>e.focus(),onShow:()=>o.setContextMenuState(!0),onHide:()=>o.setContextMenuState(!1),fireDismissalEventInstead:{},inlineBehaviours:kl([Jp("dismissContextMenu",[Ur(Cr(),((t,o)=>{Xd.close(t),e.focus()}))])])})),a=()=>Ph.hide(s),i=t=>{if(xF(e)&&t.preventDefault(),((e,t)=>t.ctrlKey&&!xF(e))(e,t)||(e=>0===SF(e).length)(e))return;const a=((e,t)=>{const o=wF(e),n=NF(e,t)?"selection":"point";if(De(o)){const s=VF(e,t);return $S(Ve(s),o)?"node":n}return n})(e,t);(n()?DF:EF)(e,t,(()=>{const o=VF(e,t),n=e.ui.registry.getAll(),s=SF(e);return((e,t,o)=>{const n=j(t,((t,n)=>be(e,n.toLowerCase()).map((e=>{const n=e.update(o);if(r(n)&&De(Me(n)))return RF(t,n.split(" "));if(l(n)&&n.length>0){const e=H(n,IF);return RF(t,e)}return t})).getOrThunk((()=>t.concat([n])))),[]);return n.length>0&&BF(n[n.length-1])&&n.pop(),n})(n.contextMenus,s,o)}),o,s,a)};e.on("init",(()=>{const t="ResizeEditor ScrollContent ScrollWindow longpresscancel"+(n()?"":" ResizeWindow");e.on(t,a),e.on("longpress contextmenu",i)}))},HF=As([{offset:["x","y"]},{absolute:["x","y"]},{fixed:["x","y"]}]),LF=e=>t=>t.translate(-e.left,-e.top),PF=e=>t=>t.translate(e.left,e.top),UF=e=>(t,o)=>j(e,((e,t)=>t(e)),$t(t,o)),WF=(e,t,o)=>e.fold(UF([PF(o),LF(t)]),UF([LF(t)]),UF([])),jF=(e,t,o)=>e.fold(UF([PF(o)]),UF([]),UF([PF(t)])),GF=(e,t,o)=>e.fold(UF([]),UF([LF(o)]),UF([PF(t),LF(o)])),$F=(e,t,o)=>{const n=e.fold(((e,t)=>({position:A.some("absolute"),left:A.some(e+"px"),top:A.some(t+"px")})),((e,t)=>({position:A.some("absolute"),left:A.some(e-o.left+"px"),top:A.some(t-o.top+"px")})),((e,t)=>({position:A.some("fixed"),left:A.some(e+"px"),top:A.some(t+"px")})));return{right:A.none(),bottom:A.none(),...n}},qF=(e,t,o,n)=>{const s=(e,s)=>(r,a)=>{const i=e(t,o,n);return s(r.getOr(i.left),a.getOr(i.top))};return e.fold(s(GF,XF),s(jF,YF),s(WF,KF))},XF=HF.offset,YF=HF.absolute,KF=HF.fixed,JF=(e,t)=>{const o=Ot(e,t);return u(o)?NaN:parseInt(o,10)},ZF=(e,t,o,n,s,r)=>{const a=((e,t,o,n)=>((e,t)=>{const o=e.element,n=JF(o,t.leftAttr),s=JF(o,t.topAttr);return isNaN(n)||isNaN(s)?A.none():A.some($t(n,s))})(e,t).fold((()=>o),(e=>KF(e.left+n.left,e.top+n.top))))(e,t,o,n),i=t.mustSnap?eI(e,t,a,s,r):tI(e,t,a,s,r),l=WF(a,s,r);return((e,t,o)=>{const n=e.element;kt(n,t.leftAttr,o.left+"px"),kt(n,t.topAttr,o.top+"px")})(e,t,l),i.fold((()=>({coord:KF(l.left,l.top),extra:A.none()})),(e=>({coord:e.output,extra:e.extra})))},QF=(e,t,o,n)=>re(e,(e=>{const s=e.sensor,r=((e,t,o,n,s,r)=>{const a=jF(e,s,r),i=jF(t,s,r);return Math.abs(a.left-i.left)<=o&&Math.abs(a.top-i.top)<=n})(t,s,e.range.left,e.range.top,o,n);return r?A.some({output:qF(e.output,t,o,n),extra:e.extra}):A.none()})),eI=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return QF(r,o,n,s).orThunk((()=>{const e=j(r,((e,t)=>{const r=t.sensor,a=((e,t,o,n,s,r)=>{const a=jF(e,s,r),i=jF(t,s,r),l=Math.abs(a.left-i.left),c=Math.abs(a.top-i.top);return $t(l,c)})(o,r,t.range.left,t.range.top,n,s);return e.deltas.fold((()=>({deltas:A.some(a),snap:A.some(t)})),(o=>(a.left+a.top)/2<=(o.left+o.top)/2?{deltas:A.some(a),snap:A.some(t)}:e))}),{deltas:A.none(),snap:A.none()});return e.snap.map((e=>({output:qF(e.output,o,n,s),extra:e.extra})))}))},tI=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return QF(r,o,n,s)};var oI=Object.freeze({__proto__:null,snapTo:(e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const t=et(e.element),o=Uo(t),r=wA(s),a=((e,t,o)=>({coord:qF(e.output,e.output,t,o),extra:e.extra}))(n,o,r),i=$F(a.coord,0,r);Ft(s,i)}}});const nI="data-initial-z-index",sI=(e,t)=>{e.getSystem().addToGui(t),(e=>{st(e.element).filter(Ge).each((t=>{Nt(t,"z-index").each((e=>{kt(t,nI,e)})),Dt(t,"z-index",It(e.element,"z-index"))}))})(t)},rI=e=>{(e=>{st(e.element).filter(Ge).each((e=>{_t(e,nI).fold((()=>Ht(e,"z-index")),(t=>Dt(e,"z-index",t))),Et(e,nI)}))})(e),e.getSystem().removeFromGui(e)},aI=(e,t,o)=>e.getSystem().build(ok.sketch({dom:{styles:{left:"0px",top:"0px",width:"100%",height:"100%",position:"fixed","z-index":"1000000000000000"},classes:[t]},events:o}));var iI=vs("snaps",[os("getSnapPoints"),Di("onSensor"),os("leftAttr"),os("topAttr"),ys("lazyViewport",en),ys("mustSnap",!1)]);const lI=[ys("useFixed",T),os("blockerClass"),ys("getTarget",w),ys("onDrag",b),ys("repositionTarget",!0),ys("onDrop",b),Os("getBounds",en),iI],cI=e=>{return(t=Nt(e,"left"),o=Nt(e,"top"),n=Nt(e,"position"),t.isSome()&&o.isSome()&&n.isSome()?A.some(((e,t,o)=>("fixed"===o?KF:XF)(parseInt(e,10),parseInt(t,10)))(t.getOrDie(),o.getOrDie(),n.getOrDie())):A.none()).getOrThunk((()=>{const t=Xt(e);return YF(t.left,t.top)}));var t,o,n},dI=(e,t)=>({bounds:e.getBounds(),height:jt(t.element),width:Zt(t.element)}),uI=(e,t,o,n,s)=>{const r=o.update(n,s),a=o.getStartData().getOrThunk((()=>dI(t,e)));r.each((o=>{((e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const r=et(e.element),a=Uo(r),i=wA(s),l=cI(s),c=((e,t,o,n,s,r,a)=>((e,t,o,n,s)=>{const r=s.bounds,a=jF(t,o,n),i=Yi(a.left,r.x,r.x+r.width-s.width),l=Yi(a.top,r.y,r.y+r.height-s.height),c=YF(i,l);return t.fold((()=>{const e=GF(c,o,n);return XF(e.left,e.top)}),x(c),(()=>{const e=WF(c,o,n);return KF(e.left,e.top)}))})(0,t.fold((()=>{const e=(t=o,a=r.left,i=r.top,t.fold(((e,t)=>XF(e+a,t+i)),((e,t)=>YF(e+a,t+i)),((e,t)=>KF(e+a,t+i))));var t,a,i;const l=WF(e,n,s);return KF(l.left,l.top)}),(t=>{const a=ZF(e,t,o,r,n,s);return a.extra.each((o=>{t.onSensor(e,o)})),a.coord})),n,s,a))(e,t.snaps,l,a,i,n,o),d=$F(c,0,i);Ft(s,d)}t.onDrag(e,s,n)})(e,t,a,o)}))},mI=(e,t,o,n)=>{t.each(rI),o.snaps.each((t=>{((e,t)=>{((e,t)=>{const o=e.element;Et(o,t.leftAttr),Et(o,t.topAttr)})(e,t)})(e,t)}));const s=o.getTarget(e.element);n.reset(),o.onDrop(e,s)},gI=e=>(t,o)=>{const n=e=>{o.setStartData(dI(t,e))};return Hr([Ur(xr(),(e=>{o.getStartData().each((()=>n(e)))})),...e(t,o,n)])};var pI=Object.freeze({__proto__:null,getData:e=>A.from($t(e.x,e.y)),getDelta:(e,t)=>$t(t.left-e.left,t.top-e.top)});const hI=(e,t,o)=>[Ur(Ws(),((n,s)=>{if(0!==s.event.raw.button)return;s.stop();const r=()=>mI(n,A.some(l),e,t),a=qS(r,200),i={drop:r,delayDrop:a.schedule,forceDrop:r,move:o=>{a.cancel(),uI(n,e,t,pI,o)}},l=aI(n,e.blockerClass,(e=>Hr([Ur(Ws(),e.forceDrop),Ur($s(),e.drop),Ur(js(),((t,o)=>{e.move(o.event)})),Ur(Gs(),e.delayDrop)]))(i));o(n),sI(n,l)}))],fI=[...lI,Ri("dragger",{handlers:gI(hI)})];var bI=Object.freeze({__proto__:null,getData:e=>{const t=e.raw.touches;return 1===t.length?(e=>{const t=e[0];return A.some($t(t.clientX,t.clientY))})(t):A.none()},getDelta:(e,t)=>$t(t.left-e.left,t.top-e.top)});const vI=(e,t,o)=>{const n=Ql(),s=o=>{mI(o,n.get(),e,t),n.clear()};return[Ur(Hs(),((r,a)=>{a.stop();const i=()=>s(r),l={drop:i,delayDrop:b,forceDrop:i,move:o=>{uI(r,e,t,bI,o)}},c=aI(r,e.blockerClass,(e=>Hr([Ur(Hs(),e.forceDrop),Ur(Ps(),e.drop),Ur(Us(),e.drop),Ur(Ls(),((t,o)=>{e.move(o.event)}))]))(l));n.set(c),o(r),sI(r,c)})),Ur(Ls(),((o,n)=>{n.stop(),uI(o,e,t,bI,n.event)})),Ur(Ps(),((e,t)=>{t.stop(),s(e)})),Ur(Us(),s)]},yI=fI,xI=[...lI,Ri("dragger",{handlers:gI(vI)})],wI=[...lI,Ri("dragger",{handlers:gI(((e,t,o)=>[...hI(e,t,o),...vI(e,t,o)]))})];var SI=Object.freeze({__proto__:null,mouse:yI,touch:xI,mouseOrTouch:wI}),kI=Object.freeze({__proto__:null,init:()=>{let e=A.none(),t=A.none();const o=x({});return _a({readState:o,reset:()=>{e=A.none(),t=A.none()},update:(t,o)=>t.getData(o).bind((o=>((t,o)=>{const n=e.map((e=>t.getDelta(e,o)));return e=A.some(o),n})(t,o))),getStartData:()=>t,setStartData:e=>{t=A.some(e)}})}});const CI=Tl({branchKey:"mode",branches:SI,name:"dragging",active:{events:(e,t)=>e.dragger.handlers(e,t)},extra:{snap:e=>({sensor:e.sensor,range:e.range,output:e.output,extra:A.from(e.extra)})},state:kI,apis:oI}),OI=(e,t,o,n,s,r)=>e.fold((()=>CI.snap({sensor:YF(o-20,n-20),range:$t(s,r),output:YF(A.some(o),A.some(n)),extra:{td:t}})),(e=>{const s=o-20,r=n-20,a=e.element.dom.getBoundingClientRect();return CI.snap({sensor:YF(s,r),range:$t(40,40),output:YF(A.some(o-a.width/2),A.some(n-a.height/2)),extra:{td:t}})})),_I=(e,t,o)=>({getSnapPoints:e,leftAttr:"data-drag-left",topAttr:"data-drag-top",onSensor:(e,n)=>{const s=n.td;((e,t)=>e.exists((e=>Ze(e,t))))(t.get(),s)||(t.set(s),o(s))},mustSnap:!0}),TI=e=>Gh(Wh.sketch({dom:{tag:"div",classes:["tox-selector"]},buttonBehaviours:kl([CI.config({mode:"mouseOrTouch",blockerClass:"blocker",snaps:e}),Ik.config({})]),eventOrder:{mousedown:["dragging","alloy.base.behaviour"],touchstart:["dragging","alloy.base.behaviour"]}})),EI=(e,t)=>{const o=Es([]),n=Es([]),s=Es(!1),r=Ql(),a=Ql(),i=e=>{const o=Zo(e);return OI(u.getOpt(t),e,o.x,o.y,o.width,o.height)},l=e=>{const o=Zo(e);return OI(m.getOpt(t),e,o.right,o.bottom,o.width,o.height)},c=_I((()=>H(o.get(),(e=>i(e)))),r,(t=>{a.get().each((o=>{e.dispatch("TableSelectorChange",{start:t,finish:o})}))})),d=_I((()=>H(n.get(),(e=>l(e)))),a,(t=>{r.get().each((o=>{e.dispatch("TableSelectorChange",{start:o,finish:t})}))})),u=TI(c),m=TI(d),g=ri(u.asSpec()),p=ri(m.asSpec()),h=(t,o,n,s)=>{const r=n(o);CI.snapTo(t,r),((t,o,n,r)=>{const a=o.dom.getBoundingClientRect();Ht(t.element,"display");const i=nt(Ve(e.getBody())).dom.innerHeight,l=a[s]<0,c=((e,t)=>e[s]>t)(a,i);(l||c)&&Dt(t.element,"display","none")})(t,o)},f=e=>h(g,e,i,"top"),b=e=>h(p,e,l,"bottom");Do().deviceType.isTouch()&&(e.on("TableSelectionChange",(e=>{s.get()||(Ad(t,g),Ad(t,p),s.set(!0)),r.set(e.start),a.set(e.finish),e.otherCells.each((t=>{o.set(t.upOrLeftCells),n.set(t.downOrRightCells),f(e.start),b(e.finish)}))})),e.on("ResizeEditor ResizeWindow ScrollContent",(()=>{r.get().each(f),a.get().each(b)})),e.on("TableSelectionClear",(()=>{s.get()&&(Bd(g),Bd(p),s.set(!1)),r.clear(),a.clear()})))},AI=(e,t,o)=>{var n;const s=null!==(n=t.delimiter)&&void 0!==n?n:"\u203a";return{dom:{tag:"div",classes:["tox-statusbar__path"],attributes:{role:"navigation"}},behaviours:kl([Pp.config({mode:"flow",selector:"div[role=button]"}),Rm.config({disabled:o.isDisabled}),Sx(),ck.config({}),Kp.config({}),Jp("elementPathEvents",[Kr(((t,n)=>{e.shortcuts.add("alt+F11","focus statusbar elementpath",(()=>Pp.focusIn(t))),e.on("NodeChange",(n=>{const r=(t=>{const o=[];let n=t.length;for(;n-- >0;){const r=t[n];if(1===r.nodeType&&"BR"!==(s=r).nodeName&&!s.getAttribute("data-mce-bogus")&&"bookmark"!==s.getAttribute("data-mce-type")){const t=hw(e,r);if(t.isDefaultPrevented()||o.push({name:t.name,element:r}),t.isPropagationStopped())break}}var s;return o})(n.parents),a=r.length>0?j(r,((t,n,r)=>{const a=((t,n,s)=>Wh.sketch({dom:{tag:"div",classes:["tox-statusbar__path-item"],attributes:{"data-index":s,"aria-level":s+1}},components:[ti(t)],action:t=>{e.focus(),e.selection.select(n),e.nodeChanged()},buttonBehaviours:kl([kx(o.isDisabled),Sx()])}))(n.name,n.element,r);return 0===r?t.concat([a]):t.concat([{dom:{tag:"div",classes:["tox-statusbar__path-divider"],attributes:{"aria-hidden":!0}},components:[ti(` ${s} `)]},a])}),[]):[];Kp.set(t,a)}))}))])]),components:[]}};var MI;!function(e){e[e.None=0]="None",e[e.Both=1]="Both",e[e.Vertical=2]="Vertical"}(MI||(MI={}));const DI=(e,t,o)=>{const n=Ve(e.getContainer()),s=((e,t,o,n,s)=>{const r={height:VB(n+t.top,fb(e),vb(e))};return o===MI.Both&&(r.width=VB(s+t.left,hb(e),bb(e))),r})(e,t,o,Wt(n),Jt(n));le(s,((e,t)=>{h(e)&&Dt(n,t,NB(e))})),(e=>{e.dispatch("ResizeEditor")})(e)},BI=(e,t,o,n)=>{const s=$t(20*o,20*n);return DI(e,s,t),A.some(!0)},FI=(e,t)=>{const o=()=>{const o=[],n=Xb(e),s=Ub(e),r=Wb(e)||e.hasPlugin("wordcount");return s&&o.push(AI(e,{},t)),n&&o.push((()=>{const e=Ix("Alt+0");return{dom:{tag:"div",classes:["tox-statusbar__help-text"]},components:[ti($f.translate(["Press {0} for help",e]))]}})()),r&&o.push((()=>{const o=[];return e.hasPlugin("wordcount")&&o.push(((e,t)=>{const o=(e,o,n)=>Kp.set(e,[ti(t.translate(["{0} "+n,o[n]]))]);return Wh.sketch({dom:{tag:"button",classes:["tox-statusbar__wordcount"]},components:[],buttonBehaviours:kl([kx(t.isDisabled),Sx(),ck.config({}),Kp.config({}),pu.config({store:{mode:"memory",initialValue:{mode:"words",count:{words:0,characters:0}}}}),Jp("wordcount-events",[Qr((e=>{const t=pu.getValue(e),n="words"===t.mode?"characters":"words";pu.setValue(e,{mode:n,count:t.count}),o(e,t.count,n)})),Kr((t=>{e.on("wordCountUpdate",(e=>{const{mode:n}=pu.getValue(t);pu.setValue(t,{mode:n,count:e.wordCount}),o(t,e.wordCount,n)}))}))])]),eventOrder:{[ur()]:["disabling","alloy.base.behaviour","wordcount-events"]}})})(e,t)),Wb(e)&&o.push({dom:{tag:"span",classes:["tox-statusbar__branding"]},components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/powered-by-tiny?utm_campaign=editor_referral&utm_medium=poweredby&utm_source=tinymce&utm_content=v6",rel:"noopener",target:"_blank","aria-label":$f.translate(["Powered by {0}","Tiny"])},innerHtml:'<svg width="50px" height="16px" viewBox="0 0 50 16" xmlns="http://www.w3.org/2000/svg">\n  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.143 0c2.608.015 5.186 2.178 5.186 5.331 0 0 .077 3.812-.084 4.87-.361 2.41-2.164 4.074-4.65 4.496-1.453.284-2.523.49-3.212.623-.373.071-.634.122-.785.152-.184.038-.997.145-1.35.145-2.732 0-5.21-2.04-5.248-5.33 0 0 0-3.514.03-4.442.093-2.4 1.758-4.342 4.926-4.963 0 0 3.875-.752 4.036-.782.368-.07.775-.1 1.15-.1Zm1.826 2.8L5.83 3.989v2.393l-2.455.475v5.968l6.137-1.189V9.243l2.456-.476V2.8ZM5.83 6.382l3.682-.713v3.574l-3.682.713V6.382Zm27.173-1.64-.084-1.066h-2.226v9.132h2.456V7.743c-.008-1.151.998-2.064 2.149-2.072 1.15-.008 1.987.92 1.995 2.072v5.065h2.455V7.359c-.015-2.18-1.657-3.929-3.837-3.913a3.993 3.993 0 0 0-2.908 1.296Zm-6.3-4.266L29.16 0v2.387l-2.456.475V.476Zm0 3.2v9.132h2.456V3.676h-2.456Zm18.179 11.787L49.11 3.676H46.58l-1.612 4.527-.46 1.382-.384-1.382-1.611-4.527H39.98l3.3 9.132L42.15 16l2.732-.537ZM22.867 9.738c0 .752.568 1.075.921 1.075.353 0 .668-.047.998-.154l.537 1.765c-.23.154-.92.537-2.225.537-1.305 0-2.655-.997-2.686-2.686a136.877 136.877 0 0 1 0-4.374H18.8V3.676h1.612v-1.98l2.455-.476v2.456h2.302V5.9h-2.302v3.837Z"/>\n</svg>\n'.trim()},behaviours:kl([oh.config({})])}]}),{dom:{tag:"div",classes:["tox-statusbar__right-container"]},components:o}})()),o.length>0?[{dom:{tag:"div",classes:["tox-statusbar__text-container",...(()=>{const e="tox-statusbar__text-container--flex-start",t="tox-statusbar__text-container--flex-end";if(n){const o="tox-statusbar__text-container-3-cols";return r||s?r&&!s?[o,t]:[o,e]:[o,"tox-statusbar__text-container--space-around"]}return[r&&!s?t:e]})()]},components:o}]:[]};return{dom:{tag:"div",classes:["tox-statusbar"]},components:(()=>{const n=o(),s=((e,t)=>{const o=(e=>{const t=jb(e);return!1===t?MI.None:"both"===t?MI.Both:MI.Vertical})(e);if(o===MI.None)return A.none();const n=o===MI.Both?"Press the arrow keys to resize the editor.":"Press the Up and Down arrow keys to resize the editor.";return A.some(tb("resize-handle",{tag:"div",classes:["tox-statusbar__resize-handle"],attributes:{title:t.translate("Resize"),"aria-label":t.translate(n)},behaviours:[CI.config({mode:"mouse",repositionTarget:!1,onDrag:(t,n,s)=>DI(e,s,o),blockerClass:"tox-blocker"}),Pp.config({mode:"special",onLeft:()=>BI(e,o,-1,0),onRight:()=>BI(e,o,1,0),onUp:()=>BI(e,o,0,-1),onDown:()=>BI(e,o,0,1)}),ck.config({}),oh.config({})]},t.icons))})(e,t);return n.concat(s.toArray())})()}},II=(e,t)=>t.get().getOrDie(`UI for ${e} has not been rendered`),RI=(e,t)=>{const o=e.inline,n=o?WB:IB,s=iv(e)?oM:yA,r=(()=>{const e=Ql(),t=Ql(),o=Ql();return{dialogUi:e,popupUi:t,mainUi:o,getUiMotherships:()=>{const o=e.get().map((e=>e.mothership)),n=t.get().map((e=>e.mothership));return o.fold((()=>n.toArray()),(e=>n.fold((()=>[e]),(t=>Ze(e.element,t.element)?[e]:[e,t]))))},lazyGetInOuterOrDie:(e,t)=>()=>o.get().bind((e=>t(e.outerContainer))).getOrDie(`Could not find ${e} element in OuterContainer`)}})(),a=Ql(),i=Ql(),l=Ql(),c=Do().deviceType.isTouch()?["tox-platform-touch"]:[],d=ov(e),u=Cb(e),m=Gh({dom:{tag:"div",classes:["tox-anchorbar"]}}),g=Gh({dom:{tag:"div",classes:["tox-bottom-anchorbar"]}}),p=()=>r.mainUi.get().map((e=>e.outerContainer)).bind(FD.getHeader),h=r.lazyGetInOuterOrDie("anchor bar",m.getOpt),f=r.lazyGetInOuterOrDie("bottom anchor bar",g.getOpt),b=r.lazyGetInOuterOrDie("toolbar",FD.getToolbar),v=r.lazyGetInOuterOrDie("throbber",FD.getThrobber),y=((e,t,o,n)=>{const s=Es(!1),r=(e=>{const t=Es(ov(e)?"bottom":"top");return{isPositionedAtTop:()=>"top"===t.get(),getDockingMode:t.get,setDockingMode:t.set}})(t),a={icons:()=>t.ui.registry.getAll().icons,menuItems:()=>t.ui.registry.getAll().menuItems,translate:$f.translate,isDisabled:()=>t.mode.isReadOnly()||!t.ui.isEnabled(),getOption:t.options.get},i=rA(t),l=(e=>{const t=t=>()=>e.formatter.match(t),o=t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},n=Es([]),s=Es([]),r=Es(!1);return e.on("PreInit",(s=>{const r=BE(e),a=IE(e,r,t,o);n.set(a)})),e.on("addStyleModifications",(n=>{const a=IE(e,n.items,t,o);s.set(a),r.set(n.replace)})),{getData:()=>{const e=r.get()?[]:n.get(),t=s.get();return e.concat(t)}}})(t),c=(e=>({colorPicker:kE(e),hasCustomColors:CE(e),getColors:OE(e),getColorCols:_E(e)}))(t),d=(e=>({isDraggableModal:TE(e)}))(t),u={shared:{providers:a,anchors:SE(t,o,n,r.isPositionedAtTop),header:r},urlinput:i,styles:l,colorinput:c,dialog:d,isContextMenuOpen:()=>s.get(),setContextMenuState:e=>s.set(e)},m={...u,shared:{...u.shared,interpreter:e=>KT(e,{},m),getSink:e.popup}},g={...u,shared:{...u.shared,interpreter:e=>KT(e,{},g),getSink:e.dialog}};return{popup:m,dialog:g}})({popup:()=>sn.fromOption(r.popupUi.get().map((e=>e.sink)),"(popup) UI has not been rendered"),dialog:()=>sn.fromOption(r.dialogUi.get().map((e=>e.sink)),"UI has not been rendered")},e,h,f),x=()=>{const t=(()=>{const t={attributes:{[yc]:d?vc.BottomToTop:vc.TopToBottom}},o=FD.parts.menubar({dom:{tag:"div",classes:["tox-menubar"]},backstage:y.popup,onEscape:()=>{e.focus()}}),n=FD.parts.toolbar({dom:{tag:"div",classes:["tox-toolbar"]},getSink:y.popup.shared.getSink,providers:y.popup.shared.providers,onEscape:()=>{e.focus()},onToolbarToggled:t=>{((e,t)=>{e.dispatch("ToggleToolbarDrawer",{state:t})})(e,t)},type:u,lazyToolbar:b,lazyHeader:()=>p().getOrDie("Could not find header element"),...t}),s=FD.parts["multiple-toolbar"]({dom:{tag:"div",classes:["tox-toolbar-overlord"]},providers:y.popup.shared.providers,onEscape:()=>{e.focus()},type:u}),r=tv(e),a=Qb(e),i=Kb(e),l=qb(e),c=FD.parts.promotion({dom:{tag:"div",classes:["tox-promotion"]}}),g=r||a||i,h=l?[c,o]:[o];return FD.parts.header({dom:{tag:"div",classes:["tox-editor-header"].concat(g?[]:["tox-editor-header--empty"]),...t},components:q([i?h:[],r?[s]:a?[n]:[],sv(e)?[]:[m.asSpec()]]),sticky:iv(e),editor:e,sharedBackstage:y.popup.shared})})(),n={dom:{tag:"div",classes:["tox-sidebar-wrap"]},components:[FD.parts.socket({dom:{tag:"div",classes:["tox-edit-area"]}}),FD.parts.sidebar({dom:{tag:"div",classes:["tox-sidebar"]}})]},s=FD.parts.throbber({dom:{tag:"div",classes:["tox-throbber"]},backstage:y.popup}),r=FD.parts.viewWrapper({backstage:y.popup}),i=Pb(e)&&!o?A.some(FI(e,y.popup.shared.providers)):A.none(),l=q([d?[]:[t],o?[]:[n],d?[t]:[]]),h=FD.parts.editorContainer({components:q([l,o?[]:[g.asSpec(),...i.toArray()]])}),f=av(e),v={role:"application",...$f.isRtl()?{dir:"rtl"}:{},...f?{"aria-hidden":"true"}:{}},x=ri(FD.sketch({dom:{tag:"div",classes:["tox","tox-tinymce"].concat(o?["tox-tinymce-inline"]:[]).concat(d?["tox-tinymce--toolbar-bottom"]:[]).concat(c),styles:{visibility:"hidden",...f?{opacity:"0",border:"0"}:{}},attributes:v},components:[h,...o?[]:[r],s],behaviours:kl([Sx(),Rm.config({disableClass:"tox-tinymce--disabled"}),Pp.config({mode:"cyclic",selector:".tox-menubar, .tox-toolbar, .tox-toolbar__primary, .tox-toolbar__overflow--open, .tox-sidebar__overflow--open, .tox-statusbar__path, .tox-statusbar__wordcount, .tox-statusbar__branding a, .tox-statusbar__resize-handle"})])})),w=nk(x);return a.set(w),{mothership:w,outerContainer:x}},w=t=>{const o=NB((e=>{const t=(e=>{const t=gb(e),o=fb(e),n=vb(e);return RB(t).map((e=>VB(e,o,n)))})(e);return t.getOr(gb(e))})(e)),n=NB((e=>zB(e).getOr(pb(e)))(e));return e.inline||(zt("div","width",n)&&Dt(t.element,"width",n),zt("div","height",o)?Dt(t.element,"height",o):Dt(t.element,"height","400px")),o};return{popups:{backstage:y.popup,getMothership:()=>II("popups",l)},dialogs:{backstage:y.dialog,getMothership:()=>II("dialogs",i)},renderUI:()=>{const o=x(),a=(()=>{const t=rv(e),o=Ze(xt(),t)&&"grid"===It(t,"display"),n={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-tinymce-aux"].concat(c),attributes:{...$f.isRtl()?{dir:"rtl"}:{}}},behaviours:kl([Sd.config({useFixed:()=>s.isDocked(p)})])},r={dom:{styles:{width:document.body.clientWidth+"px"}},events:Hr([Ur(wr(),(e=>{Dt(e.element,"width",document.body.clientWidth+"px")}))])},a=ri(fn(n,o?r:{})),l=nk(a);return i.set(l),{sink:a,mothership:l}})(),d=lv(e)?(()=>{const e={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-silver-popup-sink","tox-tinymce-aux"].concat(c),attributes:{...$f.isRtl()?{dir:"rtl"}:{}}},behaviours:kl([Sd.config({useFixed:()=>s.isDocked(p),getBounds:()=>t.getPopupSinkBounds()})])},o=ri(e),n=nk(o);return l.set(n),{sink:o,mothership:n}})():(e=>(l.set(e.mothership),e))(a);r.dialogUi.set(a),r.popupUi.set(d),r.mainUi.set(o);return(t=>{const{mainUi:o,popupUi:r,uiMotherships:a}=t;ce(Ob(e),((t,o)=>{e.ui.registry.addGroupToolbarButton(o,t)}));const{buttons:i,menuItems:l,contextToolbars:c,sidebars:d,views:m}=e.ui.registry.getAll(),g=ev(e),h={menuItems:l,menus:cv(e),menubar:Db(e),toolbar:g.getOrThunk((()=>Bb(e))),allowToolbarGroups:u===sb.floating,buttons:i,sidebar:d,views:m};var f;f=o.outerContainer,e.addShortcut("alt+F9","focus menubar",(()=>{FD.focusMenubar(f)})),e.addShortcut("alt+F10","focus toolbar",(()=>{FD.focusToolbar(f)})),e.addCommand("ToggleToolbarDrawer",((e,t)=>{(null==t?void 0:t.skipFocus)?FD.toggleToolbarDrawerWithoutFocusing(f):FD.toggleToolbarDrawer(f)})),e.addQueryStateHandler("ToggleToolbarDrawer",(()=>FD.isToolbarDrawerToggled(f))),((e,t,o)=>{const n=(e,n)=>{L([t,...o],(t=>{t.broadcastEvent(e,n)}))},s=(e,n)=>{L([t,...o],(t=>{t.broadcastOn([e],n)}))},r=e=>s(Yd(),{target:e.target}),a=$o(),i=tc(a,"touchstart",r),l=tc(a,"touchmove",(e=>n(vr(),e))),c=tc(a,"touchend",(e=>n(yr(),e))),d=tc(a,"mousedown",r),u=tc(a,"mouseup",(e=>{0===e.raw.button&&s(Jd(),{target:e.target})})),m=e=>s(Yd(),{target:Ve(e.target)}),g=e=>{0===e.button&&s(Jd(),{target:Ve(e.target)})},p=()=>{L(e.editorManager.get(),(t=>{e!==t&&t.dispatch("DismissPopups",{relatedTarget:e})}))},h=e=>n(xr(),nc(e)),f=e=>{s(Kd(),{}),n(wr(),nc(e))},b=ht(Ve(e.getElement())),v=oc(b,"scroll",(o=>{requestAnimationFrame((()=>{if(null!=e.getContainer()){const s=jS(e,t.element).map((e=>[e.element,...e.others])).getOr([]);N(s,(e=>Ze(e,o.target)))&&(e.dispatch("ElementScroll",{target:o.target.dom}),n(Er(),o))}}))})),y=()=>s(Kd(),{}),x=t=>{t.state&&s(Yd(),{target:Ve(e.getContainer())})},w=e=>{s(Yd(),{target:Ve(e.relatedTarget.getContainer())})};e.on("PostRender",(()=>{e.on("click",m),e.on("tap",m),e.on("mouseup",g),e.on("mousedown",p),e.on("ScrollWindow",h),e.on("ResizeWindow",f),e.on("ResizeEditor",y),e.on("AfterProgressState",x),e.on("DismissPopups",w)})),e.on("remove",(()=>{e.off("click",m),e.off("tap",m),e.off("mouseup",g),e.off("mousedown",p),e.off("ScrollWindow",h),e.off("ResizeWindow",f),e.off("ResizeEditor",y),e.off("AfterProgressState",x),e.off("DismissPopups",w),d.unbind(),i.unbind(),l.unbind(),c.unbind(),u.unbind(),v.unbind()})),e.on("detach",(()=>{L([t,...o],Vd),L([t,...o],(e=>e.destroy()))}))})(e,o.mothership,a),s.setup(e,y.popup.shared,p),bF(e,y.popup),zF(e,y.popup.shared.getSink,y.popup),(e=>{const{sidebars:t}=e.ui.registry.getAll();L(ae(t),(o=>{const n=t[o],s=()=>xe(A.from(e.queryCommandValue("ToggleSidebar")),o);e.ui.registry.addToggleButton(o,{icon:n.icon,tooltip:n.tooltip,onAction:t=>{e.execCommand("ToggleSidebar",!1,o),t.setActive(s())},onSetup:t=>{t.setActive(s());const o=()=>t.setActive(s());return e.on("ToggleSidebar",o),()=>{e.off("ToggleSidebar",o)}}})}))})(e),TM(e,v,y.popup.shared),lF(e,c,r.sink,{backstage:y.popup}),EI(e,r.sink);const b={targetNode:e.getElement(),height:w(o.outerContainer)};return n.render(e,t,h,y.popup,b)})({popupUi:d,dialogUi:a,mainUi:o,uiMotherships:r.getUiMotherships()})}}},NI=x([os("lazySink"),us("dragBlockClass"),Os("getBounds",en),ys("useTabstopAt",E),ys("firstTabstop",0),ys("eventOrder",{}),hu("modalBehaviours",[Pp]),Bi("onExecute"),Ii("onEscape")]),VI={sketch:w},zI=x([ju({name:"draghandle",overrides:(e,t)=>({behaviours:kl([CI.config({mode:"mouse",getTarget:e=>mi(e,'[role="dialog"]').getOr(e),blockerClass:e.dragBlockClass.getOrDie(new Error("The drag blocker class was not specified for a dialog with a drag handle: \n"+JSON.stringify(t,null,2)).message),getBounds:e.getDragBounds})])})}),Uu({schema:[os("dom")],name:"title"}),Uu({factory:VI,schema:[os("dom")],name:"close"}),Uu({factory:VI,schema:[os("dom")],name:"body"}),ju({factory:VI,schema:[os("dom")],name:"footer"}),Wu({factory:{sketch:(e,t)=>({...e,dom:t.dom,components:t.components})},schema:[ys("dom",{tag:"div",styles:{position:"fixed",left:"0px",top:"0px",right:"0px",bottom:"0px"}}),ys("components",[])],name:"blocker"})]),HI=bm({name:"ModalDialog",configFields:NI(),partFields:zI(),factory:(e,t,o,n)=>{const s=Ql(),r=la("modal-events"),a={...e.eventOrder,[Sr()]:[r].concat(e.eventOrder["alloy.system.attached"]||[])};return{uid:e.uid,dom:e.dom,components:t,apis:{show:t=>{s.set(t);const o=e.lazySink(t).getOrDie(),r=n.blocker(),a=o.getSystem().build({...r,components:r.components.concat([ai(t)]),behaviours:kl([oh.config({}),Jp("dialog-blocker-events",[Yr(Xs(),(()=>{OM.isBlocked(t)||Pp.focusIn(t)}))])])});Ad(o,a),Pp.focusIn(t)},hide:e=>{s.clear(),st(e.element).each((t=>{e.getSystem().getByDom(t).each((e=>{Bd(e)}))}))},getBody:t=>nm(t,e,"body"),getFooter:t=>om(t,e,"footer"),setIdle:e=>{OM.unblock(e)},setBusy:(e,t)=>{OM.block(e,t)}},eventOrder:a,domModification:{attributes:{role:"dialog","aria-modal":"true"}},behaviours:bu(e.modalBehaviours,[Kp.config({}),Pp.config({mode:"cyclic",onEnter:e.onExecute,onEscape:e.onEscape,useTabstopAt:e.useTabstopAt,firstTabstop:e.firstTabstop}),OM.config({getRoot:s.get}),Jp(r,[Kr((t=>{((e,t)=>{const o=_t(e,"id").fold((()=>{const e=la("dialog-label");return kt(t,"id",e),e}),w);kt(e,"aria-labelledby",o)})(t.element,nm(t,e,"title").element)}))])])}},apis:{show:(e,t)=>{e.show(t)},hide:(e,t)=>{e.hide(t)},getBody:(e,t)=>e.getBody(t),getFooter:(e,t)=>e.getFooter(t),setBusy:(e,t,o)=>{e.setBusy(t,o)},setIdle:(e,t)=>{e.setIdle(t)}}}),LI=Dn([ty,oy].concat(Jy)),PI=Ln,UI=[Ey("button"),hy,ks("align","end",["start","end"]),ky,Sy,hs("buttonType",["primary","secondary"])],WI=[...UI,sy],jI=[as("type",["submit","cancel","custom"]),...WI],GI=[as("type",["menu"]),py,fy,hy,ds("items",LI),...UI],$I=[...UI,as("type",["togglebutton"]),rs("tooltip"),hy,py,Cs("active",!1)],qI=Jn("type",{submit:jI,cancel:jI,custom:jI,menu:GI,togglebutton:$I}),XI=[ty,sy,as("level",["info","warn","error","success"]),ay,ys("url","")],YI=Dn(XI),KI=[ty,sy,Sy,Ey("button"),hy,wy,hs("buttonType",["primary","secondary","toolbar"]),ky],JI=Dn(KI),ZI=[ty,oy],QI=ZI.concat([by]),eR=ZI.concat([ny,Sy]),tR=Dn(eR),oR=Ln,nR=QI.concat([Cy("auto")]),sR=Dn(nR),rR=Rn([iy,sy,ay]),aR=QI.concat([Ss("storageKey","default")]),iR=Dn(aR),lR=Hn,cR=Dn(QI),dR=Hn,uR=ZI.concat([Ss("tag","textarea"),rs("scriptId"),rs("scriptUrl"),xs("settings",void 0,Wn)]),mR=ZI.concat([Ss("tag","textarea"),is("init")]),gR=Gn((e=>qn("customeditor.old",Mn(mR),e).orThunk((()=>qn("customeditor.new",Mn(uR),e))))),pR=Hn,hR=Dn(QI),fR=Bn(On),bR=e=>[ty,ss("columns"),e],vR=[ty,rs("html"),ks("presets","presentation",["presentation","document"])],yR=Dn(vR),xR=QI.concat([Cs("border",!1),Cs("sandboxed",!0),Cs("streamContent",!1),Cs("transparent",!0)]),wR=Dn(xR),SR=Hn,kR=Dn(ZI.concat([ps("height")])),CR=Dn([rs("url"),gs("zoom"),gs("cachedWidth"),gs("cachedHeight")]),OR=QI.concat([ps("inputMode"),ps("placeholder"),Cs("maximized",!1),Sy]),_R=Dn(OR),TR=Hn,ER=e=>[ty,ny,e,ks("align","start",["start","center","end"])],AR=[sy,iy],MR=[sy,ds("items",Zn(0,(()=>DR)))],DR=Fn([Dn(AR),Dn(MR)]),BR=QI.concat([ds("items",DR),Sy]),FR=Dn(BR),IR=Hn,RR=QI.concat([cs("items",[sy,iy]),ws("size",1),Sy]),NR=Dn(RR),VR=Hn,zR=QI.concat([Cs("constrain",!0),Sy]),HR=Dn(zR),LR=Dn([rs("width"),rs("height")]),PR=ZI.concat([ny,ws("min",0),ws("max",0)]),UR=Dn(PR),WR=zn,jR=[ty,ds("header",Hn),ds("cells",Bn(Hn))],GR=Dn(jR),$R=QI.concat([ps("placeholder"),Cs("maximized",!1),Sy]),qR=Dn($R),XR=Hn,YR=[as("type",["directory","leaf"]),ry,rs("id"),ms("menu",rM)],KR=Dn(YR),JR=YR.concat([ds("children",Zn(0,(()=>jn("type",{directory:ZR,leaf:KR}))))]),ZR=Dn(JR),QR=jn("type",{directory:ZR,leaf:KR}),eN=[ty,ds("items",QR),fs("onLeafAction"),fs("onToggleExpand"),_s("defaultExpandedIds",[],Hn),ps("defaultSelectedId")],tN=Dn(eN),oN=QI.concat([ks("filetype","file",["image","media","file"]),Sy]),nN=Dn(oN),sN=Dn([iy,Oy]),rN=e=>Qn("items","items",{tag:"required",process:{}},Bn(Gn((t=>qn(`Checking item of ${e}`,aN,t).fold((e=>sn.error(Kn(e))),(e=>sn.value(e))))))),aN=En((()=>{return jn("type",{alertbanner:YI,bar:Dn((e=rN("bar"),[ty,e])),button:JI,checkbox:tR,colorinput:iR,colorpicker:cR,dropzone:hR,grid:Dn(bR(rN("grid"))),iframe:wR,input:_R,listbox:FR,selectbox:NR,sizeinput:HR,slider:UR,textarea:qR,urlinput:nN,customeditor:gR,htmlpanel:yR,imagepreview:kR,collection:sR,label:Dn(ER(rN("label"))),table:GR,tree:tN,panel:lN});var e})),iN=[ty,ys("classes",[]),ds("items",aN)],lN=Dn(iN),cN=[Ey("tab"),ry,ds("items",aN)],dN=[ty,cs("tabs",cN)],uN=Dn(dN),mN=WI,gN=qI,pN=Dn([rs("title"),ns("body",jn("type",{panel:lN,tabpanel:uN})),Ss("size","normal"),_s("buttons",[],gN),ys("initialData",{}),Os("onAction",b),Os("onChange",b),Os("onSubmit",b),Os("onClose",b),Os("onCancel",b),Os("onTabChange",b)]),hN=Dn([as("type",["cancel","custom"]),...mN]),fN=Dn([rs("title"),rs("url"),gs("height"),gs("width"),bs("buttons",hN),Os("onAction",b),Os("onCancel",b),Os("onClose",b),Os("onMessage",b)]),bN=e=>a(e)?[e].concat(X(fe(e),bN)):l(e)?X(e,bN):[],vN=e=>r(e.type)&&r(e.name),yN={checkbox:oR,colorinput:lR,colorpicker:dR,dropzone:fR,input:TR,iframe:SR,imagepreview:CR,selectbox:VR,sizeinput:LR,slider:WR,listbox:IR,size:LR,textarea:XR,urlinput:sN,customeditor:pR,collection:rR,togglemenuitem:PI},xN=e=>{const t=(e=>U(bN(e),vN))(e),o=X(t,(e=>(e=>A.from(yN[e.type]))(e).fold((()=>[]),(t=>[ns(e.name,t)]))));return Dn(o)},wN=e=>{var t;return{internalDialog:Xn(qn("dialog",pN,e)),dataValidator:xN(e),initialData:null!==(t=e.initialData)&&void 0!==t?t:{}}},SN={open:(e,t)=>{const o=wN(t);return e(o.internalDialog,o.initialData,o.dataValidator)},openUrl:(e,t)=>e(Xn(qn("dialog",fN,t))),redial:e=>wN(e)};var kN=Object.freeze({__proto__:null,events:(e,t)=>{const o=(o,n)=>{e.updateState.each((e=>{const s=e(o,n);t.set(s)})),e.renderComponents.each((s=>{const r=s(n,t.get());(e.reuseDom?Wp:Up)(o,r)}))};return Hr([Ur(dr(),((t,n)=>{const s=n;if(!s.universal){const n=e.channel;R(s.channels,n)&&o(t,s.data)}})),Kr(((t,n)=>{e.initialData.each((e=>{o(t,e)}))}))])}}),CN=Object.freeze({__proto__:null,getState:(e,t,o)=>o}),ON=[os("channel"),us("renderComponents"),us("updateState"),us("initialData"),Cs("reuseDom",!0)];const _N=Ol({fields:ON,name:"reflecting",active:kN,apis:CN,state:Object.freeze({__proto__:null,init:()=>{const e=Es(A.none());return{readState:()=>e.get().getOr("none"),get:e.get,set:e.set,clear:()=>e.set(A.none())}}})}),TN=e=>{const t=[],o={};return le(e,((e,n)=>{e.fold((()=>{t.push(n)}),(e=>{o[n]=e}))})),t.length>0?sn.error(t):sn.value(o)},EN=(e,t,o)=>{const n=Gh(CO.sketch((n=>({dom:{tag:"div",classes:["tox-form"].concat(e.classes)},components:H(e.items,(e=>XT(n,e,t,o)))}))));return{dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[n.asSpec()]}],behaviours:kl([Pp.config({mode:"acyclic",useTabstopAt:C(XO)}),(s=n,wm.config({find:s.getOpt})),IO(n,{postprocess:e=>TN(e).fold((e=>(console.error(e),{})),w)}),Jp("dialog-body-panel",[Ur(Xs(),((e,t)=>{e.getSystem().broadcastOn([e_],{newFocus:A.some(t.event.target)})}))])])};var s},AN=fm({name:"TabButton",configFields:[ys("uid",void 0),os("value"),Qn("dom","dom",xn((()=>({attributes:{role:"tab",id:la("aria"),"aria-selected":"false"}}))),Nn()),us("action"),ys("domModification",{}),hu("tabButtonBehaviours",[oh,Pp,pu]),os("view")],factory:(e,t)=>({uid:e.uid,dom:e.dom,components:e.components,events:mh(e.action),behaviours:bu(e.tabButtonBehaviours,[oh.config({}),Pp.config({mode:"execution",useSpace:!0,useEnter:!0}),pu.config({store:{mode:"memory",initialValue:e.value}})]),domModification:e.domModification})}),MN=x([os("tabs"),os("dom"),ys("clickToDismiss",!1),hu("tabbarBehaviours",[Gm,Pp]),Ai(["tabClass","selectedClass"])]),DN=Gu({factory:AN,name:"tabs",unit:"tab",overrides:e=>{const t=(e,t)=>{Gm.dehighlight(e,t),Ir(e,Mr(),{tabbar:e,button:t})},o=(e,t)=>{Gm.highlight(e,t),Ir(e,Ar(),{tabbar:e,button:t})};return{action:n=>{const s=n.getSystem().getByUid(e.uid).getOrDie(),r=Gm.isHighlighted(s,n);(r&&e.clickToDismiss?t:r?b:o)(s,n)},domModification:{classes:[e.markers.tabClass]}}}}),BN=x([DN]),FN=bm({name:"Tabbar",configFields:MN(),partFields:BN(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,"debug.sketcher":"Tabbar",domModification:{attributes:{role:"tablist"}},behaviours:bu(e.tabbarBehaviours,[Gm.config({highlightClass:e.markers.selectedClass,itemClass:e.markers.tabClass,onHighlight:(e,t)=>{kt(t.element,"aria-selected","true")},onDehighlight:(e,t)=>{kt(t.element,"aria-selected","false")}}),Pp.config({mode:"flow",getInitial:e=>Gm.getHighlighted(e).map((e=>e.element)),selector:"."+e.markers.tabClass,executeOnMove:!0})])})}),IN=fm({name:"Tabview",configFields:[hu("tabviewBehaviours",[Kp])],factory:(e,t)=>({uid:e.uid,dom:e.dom,behaviours:bu(e.tabviewBehaviours,[Kp.config({})]),domModification:{attributes:{role:"tabpanel"}}})}),RN=x([ys("selectFirst",!0),Di("onChangeTab"),Di("onDismissTab"),ys("tabs",[]),hu("tabSectionBehaviours",[])]),NN=Uu({factory:FN,schema:[os("dom"),ls("markers",[os("tabClass"),os("selectedClass")])],name:"tabbar",defaults:e=>({tabs:e.tabs})}),VN=Uu({factory:IN,name:"tabview"}),zN=x([NN,VN]),HN=bm({name:"TabSection",configFields:RN(),partFields:zN(),factory:(e,t,o,n)=>{const s=(t,o)=>{om(t,e,"tabbar").each((e=>{o(e).each(Rr)}))};return{uid:e.uid,dom:e.dom,components:t,behaviours:fu(e.tabSectionBehaviours),events:Hr(q([e.selectFirst?[Kr(((e,t)=>{s(e,Gm.getFirst)}))]:[],[Ur(Ar(),((t,o)=>{(t=>{const o=pu.getValue(t);om(t,e,"tabview").each((n=>{G(e.tabs,(e=>e.value===o)).each((o=>{const s=o.view();_t(t.element,"id").each((e=>{kt(n.element,"aria-labelledby",e)})),Kp.set(n,s),e.onChangeTab(n,t,s)}))}))})(o.event.button)})),Ur(Mr(),((t,o)=>{const n=o.event.button;e.onDismissTab(t,n)}))]])),apis:{getViewItems:t=>om(t,e,"tabview").map((e=>Kp.contents(e))).getOr([]),showTab:(e,t)=>{s(e,(e=>{const o=Gm.getCandidates(e);return G(o,(e=>pu.getValue(e)===t)).filter((t=>!Gm.isHighlighted(e,t)))}))}}}},apis:{getViewItems:(e,t)=>e.getViewItems(t),showTab:(e,t,o)=>{e.showTab(t,o)}}}),LN=(e,t)=>{Dt(e,"height",t+"px"),Dt(e,"flex-basis",t+"px")},PN=(e,t,o)=>{mi(e,'[role="dialog"]').each((e=>{pi(e,'[role="tablist"]').each((n=>{o.get().map((o=>(Dt(t,"height","0"),Dt(t,"flex-basis","0"),Math.min(o,((e,t,o)=>{const n=ot(e).dom,s=mi(e,".tox-dialog-wrap").getOr(e);let r;r="fixed"===It(s,"position")?Math.max(n.clientHeight,window.innerHeight):Math.max(n.offsetHeight,n.scrollHeight);const a=Wt(t),i=t.dom.offsetLeft>=o.dom.offsetLeft+Jt(o)?Math.max(Wt(o),a):a,l=parseInt(It(e,"margin-top"),10)||0,c=parseInt(It(e,"margin-bottom"),10)||0;return r-(Wt(e)+l+c-i)})(e,t,n))))).each((e=>{LN(t,e)}))}))}))},UN=e=>pi(e,'[role="tabpanel"]'),WN="send-data-to-section",jN="send-data-to-view",GN=(e,t,o)=>{const n=Es({}),s=e=>{const t=pu.getValue(e),o=TN(t).getOr({}),s=n.get(),r=fn(s,o);n.set(r)},r=e=>{const t=n.get();pu.setValue(e,t)},a=Es(null),i=H(e.tabs,(e=>({value:e.name,dom:{tag:"div",classes:["tox-dialog__body-nav-item"]},components:[ti(o.shared.providers.translate(e.title))],view:()=>[CO.sketch((n=>({dom:{tag:"div",classes:["tox-form"]},components:H(e.items,(e=>XT(n,e,t,o))),formBehaviours:kl([Pp.config({mode:"acyclic",useTabstopAt:C(XO)}),Jp("TabView.form.events",[Kr(r),Jr(s)]),Al.config({channels:Ds([{key:WN,value:{onReceive:s}},{key:jN,value:{onReceive:r}}])})])})))]}))),l=(e=>{const t=Ql(),o=[Kr((o=>{const n=o.element;UN(n).each((s=>{Dt(s,"visibility","hidden"),o.getSystem().getByDom(s).toOptional().each((o=>{const n=((e,t,o)=>H(e,((n,s)=>{Kp.set(o,e[s].view());const r=t.dom.getBoundingClientRect();return Kp.set(o,[]),r.height})))(e,s,o),r=(e=>oe(ee(e,((e,t)=>e>t?-1:e<t?1:0))))(n);r.fold(t.clear,t.set)})),PN(n,s,t),Ht(s,"visibility"),((e,t)=>{oe(e).each((e=>HN.showTab(t,e.value)))})(e,o),requestAnimationFrame((()=>{PN(n,s,t)}))}))})),Ur(wr(),(e=>{const o=e.element;UN(o).each((e=>{PN(o,e,t)}))})),Ur(kk,((e,o)=>{const n=e.element;UN(n).each((e=>{const o=Il(ht(e));Dt(e,"visibility","hidden");const s=Nt(e,"height").map((e=>parseInt(e,10)));Ht(e,"height"),Ht(e,"flex-basis");const r=e.dom.getBoundingClientRect().height;s.forall((e=>r>e))?(t.set(r),PN(n,e,t)):s.each((t=>{LN(e,t)})),Ht(e,"visibility"),o.each(Dl)}))}))];return{extraEvents:o,selectFirst:!1}})(i);return HN.sketch({dom:{tag:"div",classes:["tox-dialog__body"]},onChangeTab:(e,t,o)=>{const n=pu.getValue(t);Ir(e,Sk,{name:n,oldName:a.get()}),a.set(n)},tabs:i,components:[HN.parts.tabbar({dom:{tag:"div",classes:["tox-dialog__body-nav"]},components:[FN.parts.tabs({})],markers:{tabClass:"tox-tab",selectedClass:"tox-dialog__body-nav-item--active"},tabbarBehaviours:kl([ck.config({})])}),HN.parts.tabview({dom:{tag:"div",classes:["tox-dialog__body-content"]}})],selectFirst:l.selectFirst,tabSectionBehaviours:kl([Jp("tabpanel",l.extraEvents),Pp.config({mode:"acyclic"}),wm.config({find:e=>oe(HN.getViewItems(e))}),RO(A.none(),(e=>(e.getSystem().broadcastOn([WN],{}),n.get())),((e,t)=>{n.set(t),e.getSystem().broadcastOn([jN],{})}))])})},$N=(e,t,o,n,s)=>({dom:{tag:"div",classes:["tox-dialog__content-js"],attributes:{...o.map((e=>({id:e}))).getOr({}),...s?{"aria-live":"polite"}:{}}},components:[],behaviours:kl([BO(0),_N.config({channel:`${JO}-${t}`,updateState:(e,t)=>A.some({isTabPanel:()=>"tabpanel"===t.body.type}),renderComponents:e=>{const t=e.body;return"tabpanel"===t.type?[GN(t,e.initialData,n)]:[EN(t,e.initialData,n)]},initialData:e})])}),qN=lb.deviceType.isTouch(),XN=(e,t)=>({dom:{tag:"div",styles:{display:"none"},classes:["tox-dialog__header"]},components:[e,t]}),YN=(e,t)=>HI.parts.close(Wh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":t.translate("Close")}},action:e,buttonBehaviours:kl([ck.config({})])})),KN=()=>HI.parts.title({dom:{tag:"div",classes:["tox-dialog__title"],innerHtml:"",styles:{display:"none"}}}),JN=(e,t)=>HI.parts.body({dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[{dom:jh(`<p>${Gf(t.translate(e))}</p>`)}]}]}),ZN=e=>HI.parts.footer({dom:{tag:"div",classes:["tox-dialog__footer"]},components:e}),QN=(e,t)=>[ok.sketch({dom:{tag:"div",classes:["tox-dialog__footer-start"]},components:e}),ok.sketch({dom:{tag:"div",classes:["tox-dialog__footer-end"]},components:t})],eV=e=>{const t="tox-dialog",o=t+"-wrap",n=o+"__backdrop",s=t+"__disable-scroll";return HI.sketch({lazySink:e.lazySink,onEscape:t=>(e.onEscape(t),A.some(!0)),useTabstopAt:e=>!XO(e),firstTabstop:e.firstTabstop,dom:{tag:"div",classes:[t].concat(e.extraClasses),styles:{position:"relative",...e.extraStyles}},components:[e.header,e.body,...e.footer.toArray()],parts:{blocker:{dom:jh(`<div class="${o}"></div>`),components:[{dom:{tag:"div",classes:qN?[n,n+"--opaque"]:[n]}}]}},dragBlockClass:o,modalBehaviours:kl([oh.config({}),Jp("dialog-events",e.dialogEvents.concat([Yr(Xs(),((e,t)=>{OM.isBlocked(e)||Pp.focusIn(e)})),Ur(_r(),((e,t)=>{e.getSystem().broadcastOn([e_],{newFocus:t.event.newFocus})}))])),Jp("scroll-lock",[Kr((()=>{La(xt(),s)})),Jr((()=>{Pa(xt(),s)}))]),...e.extraBehaviours]),eventOrder:{[ur()]:["dialog-events"],[Sr()]:["scroll-lock","dialog-events","alloy.base.behaviour"],[kr()]:["alloy.base.behaviour","dialog-events","scroll-lock"],...e.eventOrder}})},tV=e=>Wh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":e.translate("Close"),title:e.translate("Close")}},buttonBehaviours:kl([ck.config({})]),components:[tb("close",{tag:"span",classes:["tox-icon"]},e.icons)],action:e=>{Fr(e,bk)}}),oV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__title"],attributes:{...o.map((e=>({id:e}))).getOr({})}},components:[],behaviours:kl([_N.config({channel:`${KO}-${t}`,initialData:e,renderComponents:e=>[ti(n.translate(e.title))]})])}),nV=()=>({dom:jh('<div class="tox-dialog__draghandle"></div>')}),sV=(e,t,o)=>((e,t,o)=>{const n=HI.parts.title(oV(e,t,A.none(),o)),s=HI.parts.draghandle(nV()),r=HI.parts.close(tV(o)),a=[n].concat(e.draggable?[s]:[]).concat([r]);return ok.sketch({dom:jh('<div class="tox-dialog__header"></div>'),components:a})})({title:o.shared.providers.translate(e),draggable:o.dialog.isDraggableModal()},t,o.shared.providers),rV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__busy-spinner"],attributes:{"aria-label":o.translate(e)},styles:{left:"0px",right:"0px",bottom:"0px",top:`${n.getOr(0)}px`,position:"absolute"}},behaviours:t,components:[{dom:jh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}),aV=(e,t,o)=>({onClose:()=>o.closeWindow(),onBlock:o=>{const n=pi(e().element,".tox-dialog__header").map((e=>Wt(e)));HI.setBusy(e(),((e,s)=>rV(o.message,s,t,n)))},onUnblock:()=>{HI.setIdle(e())}}),iV=(e,t,o,n)=>ri(eV({...e,firstTabstop:1,lazySink:n.shared.getSink,extraBehaviours:[_N.config({channel:`${YO}-${e.id}`,updateState:(e,t)=>A.some(t),initialData:t}),VO({}),...e.extraBehaviours],onEscape:e=>{Fr(e,bk)},dialogEvents:o,eventOrder:{[dr()]:[_N.name(),Al.name()],[Sr()]:["scroll-lock",_N.name(),"messages","dialog-events","alloy.base.behaviour"],[kr()]:["alloy.base.behaviour","dialog-events","messages",_N.name(),"scroll-lock"]}})),lV=(e,t={})=>H(e,(e=>"menu"===e.type?(e=>{const o=H(e.items,(e=>{const o=be(t,e.name).getOr(Es(!1));return{...e,storage:o}}));return{...e,items:o}})(e):e)),cV=e=>j(e,((e,t)=>"menu"===t.type?j(t.items,((e,t)=>(e[t.name]=t.storage,e)),e):e),{}),dV=(e,t)=>[$r(Xs(),qO),e(fk,((e,o,n,s)=>{Il(ht(s.element)).fold(b,Bl),t.onClose(),o.onClose()})),e(bk,((e,t,o,n)=>{t.onCancel(e),Fr(n,fk)})),Ur(wk,((e,o)=>t.onUnblock())),Ur(xk,((e,o)=>t.onBlock(o.event)))],uV=(e,t,o)=>{const n=(t,o)=>Ur(t,((t,n)=>{s(t,((s,r)=>{o(e(),s,n.event,t)}))})),s=(e,t)=>{_N.getState(e).get().each((o=>{t(o.internalDialog,e)}))};return[...dV(n,t),n(yk,((e,t)=>t.onSubmit(e))),n(hk,((e,t,o)=>{t.onChange(e,{name:o.name})})),n(vk,((e,t,n,s)=>{const r=()=>s.getSystem().isConnected()?Pp.focusIn(s):void 0,a=e=>Tt(e,"disabled")||_t(e,"aria-disabled").exists((e=>"true"===e)),i=ht(s.element),l=Il(i);t.onAction(e,{name:n.name,value:n.value}),Il(i).fold(r,(e=>{a(e)||l.exists((t=>Qe(e,t)&&a(t)))?r():o().toOptional().filter((t=>!Qe(t.element,e))).each(r)}))})),n(Sk,((e,t,o)=>{t.onTabChange(e,{newTabName:o.name,oldTabName:o.oldName})})),Jr((t=>{const o=e();pu.setValue(t,o.getData())}))]},mV=(e,t)=>{const o=t.map((e=>e.footerButtons)).getOr([]),n=P(o,(e=>"start"===e.align)),s=(e,t)=>ok.sketch({dom:{tag:"div",classes:[`tox-dialog__footer-${e}`]},components:H(t,(e=>e.memento.asSpec()))});return[s("start",n.pass),s("end",n.fail)]},gV=(e,t,o)=>({dom:jh('<div class="tox-dialog__footer"></div>'),components:[],behaviours:kl([_N.config({channel:`${ZO}-${t}`,initialData:e,updateState:(e,t)=>{const n=H(t.buttons,(e=>{const t=Gh(((e,t)=>BT(e,e.type,t))(e,o));return{name:e.name,align:e.align,memento:t}}));return A.some({lookupByName:t=>((e,t,o)=>G(t,(e=>e.name===o)).bind((t=>t.memento.getOpt(e))))(e,n,t),footerButtons:n})},renderComponents:mV})])}),pV=(e,t,o)=>HI.parts.footer(gV(e,t,o)),hV=(e,t)=>{if(e.getRoot().getSystem().isConnected()){const o=wm.getCurrent(e.getFormWrapper()).getOr(e.getFormWrapper());return CO.getField(o,t).orThunk((()=>{const o=e.getFooter().bind((e=>_N.getState(e).get()));return o.bind((e=>e.lookupByName(t)))}))}return A.none()},fV=(e,t,o)=>{const n=t=>{const o=e.getRoot();o.getSystem().isConnected()&&t(o)},s={getData:()=>{const t=e.getRoot(),n=t.getSystem().isConnected()?e.getFormWrapper():t;return{...pu.getValue(n),...ce(o,(e=>e.get()))}},setData:t=>{n((n=>{const r=s.getData(),a=fn(r,t),i=((e,t)=>{const o=e.getRoot();return _N.getState(o).get().map((e=>Xn(qn("data",e.dataValidator,t)))).getOr(t)})(e,a),l=e.getFormWrapper();pu.setValue(l,i),le(o,((e,t)=>{ve(a,t)&&e.set(a[t])}))}))},setEnabled:(t,o)=>{hV(e,t).each(o?Rm.enable:Rm.disable)},focus:t=>{hV(e,t).each(oh.focus)},block:e=>{if(!r(e))throw new Error("The dialogInstanceAPI.block function should be passed a blocking message of type string as an argument");n((t=>{Ir(t,xk,{message:e})}))},unblock:()=>{n((e=>{Fr(e,wk)}))},showTab:t=>{n((o=>{const n=e.getBody();_N.getState(n).get().exists((e=>e.isTabPanel()))&&wm.getCurrent(n).each((e=>{HN.showTab(e,t)}))}))},redial:r=>{n((n=>{const a=e.getId(),i=t(r),l=lV(i.internalDialog.buttons,o);n.getSystem().broadcastOn([`${YO}-${a}`],i),n.getSystem().broadcastOn([`${KO}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${JO}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${ZO}-${a}`],{...i.internalDialog,buttons:l}),s.setData(i.initialData)}))},close:()=>{n((e=>{Fr(e,fk)}))},toggleFullscreen:e.toggleFullscreen};return s},bV=(e,t,o,n=!1)=>{const s=la("dialog"),r=la("dialog-label"),a=la("dialog-content"),i=e.internalDialog,l="medium"===i.size?A.some("tox-dialog--width-md"):A.none(),c=Gh(((e,t,o,n)=>ok.sketch({dom:jh('<div class="tox-dialog__header"></div>'),components:[oV(e,t,A.some(o),n),nV(),tV(n)],containerBehaviours:kl([CI.config({mode:"mouse",blockerClass:"blocker",getTarget:e=>hi(e,'[role="dialog"]').getOrDie(),snaps:{getSnapPoints:()=>[],leftAttr:"data-drag-left",topAttr:"data-drag-top"}})])}))({title:i.title,draggable:!0},s,r,o.shared.providers)),d=Gh(((e,t,o,n,s)=>$N(e,t,A.some(o),n,s))({body:i.body,initialData:i.initialData},s,a,o,n)),u=lV(i.buttons),m=cV(u),g=Ce(0!==u.length,Gh(((e,t,o)=>gV(e,t,o))({buttons:u},s,o))),p=uV((()=>b),{onBlock:e=>{OM.block(f,((t,n)=>{const s=c.getOpt(f).map((e=>Wt(e.element)));return rV(e.message,n,o.shared.providers,s)}))},onUnblock:()=>{OM.unblock(f)},onClose:()=>t.closeWindow()},o.shared.getSink),h="tox-dialog-inline",f=ri({dom:{tag:"div",classes:["tox-dialog",h,...l.toArray()],attributes:{role:"dialog","aria-labelledby":r}},eventOrder:{[dr()]:[_N.name(),Al.name()],[ur()]:["execute-on-form"],[Sr()]:["reflecting","execute-on-form"]},behaviours:kl([Pp.config({mode:"cyclic",onEscape:e=>(Fr(e,fk),A.some(!0)),useTabstopAt:e=>!XO(e)&&("button"!==Ue(e)||"disabled"!==Ot(e,"disabled")),firstTabstop:1}),_N.config({channel:`${YO}-${s}`,updateState:(e,t)=>A.some(t),initialData:e}),oh.config({}),Jp("execute-on-form",p.concat([Yr(Xs(),((e,t)=>{Pp.focusIn(e)})),Ur(_r(),((e,t)=>{e.getSystem().broadcastOn([e_],{newFocus:t.event.newFocus})}))])),OM.config({getRoot:()=>A.some(f)}),Kp.config({}),VO({})]),components:[c.asSpec(),d.asSpec(),...g.map((e=>e.asSpec())).toArray()]}),b=fV({getId:x(s),getRoot:x(f),getFooter:()=>g.map((e=>e.get(f))),getBody:()=>d.get(f),getFormWrapper:()=>{const e=d.get(f);return wm.getCurrent(e).getOr(e)},toggleFullscreen:()=>{const e="tox-dialog--fullscreen",t=Ve(f.element.dom);Ga(t,[e])?(ja(t,[e]),Wa(t,[h])):(ja(t,[h]),Wa(t,[e]))}},t.redial,m);return{dialog:f,instanceApi:b}};var vV=tinymce.util.Tools.resolve("tinymce.util.URI");const yV=["insertContent","setContent","execCommand","close","block","unblock"],xV=e=>a(e)&&-1!==yV.indexOf(e.mceAction),wV=(e,t,o,n)=>{const s=la("dialog"),i=sV(e.title,s,n),l=(e=>{const t={dom:{tag:"div",classes:["tox-dialog__content-js"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-iframe"]},components:[GO(A.none(),{dom:{tag:"iframe",attributes:{src:e.url}},behaviours:kl([ck.config({}),oh.config({})])})]}],behaviours:kl([Pp.config({mode:"acyclic",useTabstopAt:C(XO)})])};return HI.parts.body(t)})(e),c=e.buttons.bind((e=>0===e.length?A.none():A.some(pV({buttons:e},s,n)))),u=((e,t)=>{const o=(e,t)=>Ur(e,((e,o)=>{n(e,((n,s)=>{t(x,n,o.event,e)}))})),n=(e,t)=>{_N.getState(e).get().each((o=>{t(o,e)}))};return[...dV(o,t),o(vk,((e,t,o)=>{t.onAction(e,{name:o.name})}))]})(0,aV((()=>y),n.shared.providers,t)),m={...e.height.fold((()=>({})),(e=>({height:e+"px","max-height":e+"px"}))),...e.width.fold((()=>({})),(e=>({width:e+"px","max-width":e+"px"})))},p=e.width.isNone()&&e.height.isNone()?["tox-dialog--width-lg"]:[],h=new vV(e.url,{base_uri:new vV(window.location.href)}),f=`${h.protocol}://${h.host}${h.port?":"+h.port:""}`,b=Zl(),v=[Jp("messages",[Kr((()=>{const t=tc(Ve(window),"message",(t=>{if(h.isSameOrigin(new vV(t.raw.origin))){const n=t.raw.data;xV(n)?((e,t,o)=>{switch(o.mceAction){case"insertContent":e.insertContent(o.content);break;case"setContent":e.setContent(o.content);break;case"execCommand":const n=!!d(o.ui)&&o.ui;e.execCommand(o.cmd,n,o.value);break;case"close":t.close();break;case"block":t.block(o.message);break;case"unblock":t.unblock()}})(o,x,n):(e=>!xV(e)&&a(e)&&ve(e,"mceAction"))(n)&&e.onMessage(x,n)}}));b.set(t)})),Jr(b.clear)]),Al.config({channels:{[QO]:{onReceive:(e,t)=>{pi(e.element,"iframe").each((e=>{const o=e.dom.contentWindow;g(o)&&o.postMessage(t,f)}))}}}})],y=iV({id:s,header:i,body:l,footer:c,extraClasses:p,extraBehaviours:v,extraStyles:m},e,u,n),x=(e=>{const t=t=>{e.getSystem().isConnected()&&t(e)};return{block:e=>{if(!r(e))throw new Error("The urlDialogInstanceAPI.block function should be passed a blocking message of type string as an argument");t((t=>{Ir(t,xk,{message:e})}))},unblock:()=>{t((e=>{Fr(e,wk)}))},close:()=>{t((e=>{Fr(e,fk)}))},sendMessage:e=>{t((t=>{t.getSystem().broadcastOn([QO],e)}))}}})(y);return{dialog:y,instanceApi:x}},SV=(e,t)=>Xn(qn("data",t,e)),kV=e=>$S(e,".tox-alert-dialog")||$S(e,".tox-confirm-dialog"),CV=(e,t,o)=>t&&o?[]:[$A.config({contextual:{lazyContext:()=>A.some(Jo(Ve(e.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top"],lazyViewport:t=>jS(e,t.element).map((e=>({bounds:GS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:en(),optScrollEnv:A.none()})))})],OV=e=>{const t=e.editor,o=iv(t),n=(e=>{const t=e.shared;return{open:(o,n)=>{const s=()=>{HI.hide(l),n()},r=Gh(BT({name:"close-alert",text:"OK",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"cancel",e)),a=KN(),i=YN(s,t.providers),l=ri(eV({lazySink:()=>t.getSink(),header:XN(a,i),body:JN(o,t.providers),footer:A.some(ZN(QN([],[r.asSpec()]))),onEscape:s,extraClasses:["tox-alert-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Ur(bk,s)],eventOrder:{}}));HI.show(l);const c=r.get(l);oh.focus(c)}}})(e.backstages.dialog),s=(e=>{const t=e.shared;return{open:(o,n)=>{const s=e=>{HI.hide(c),n(e)},r=Gh(BT({name:"yes",text:"Yes",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"submit",e)),a=BT({name:"no",text:"No",primary:!1,buttonType:A.some("secondary"),align:"end",enabled:!0,icon:A.none()},"cancel",e),i=KN(),l=YN((()=>s(!1)),t.providers),c=ri(eV({lazySink:()=>t.getSink(),header:XN(i,l),body:JN(o,t.providers),footer:A.some(ZN(QN([],[a,r.asSpec()]))),onEscape:()=>s(!1),extraClasses:["tox-confirm-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Ur(bk,(()=>s(!1))),Ur(yk,(()=>s(!0)))],eventOrder:{}}));HI.show(c);const d=r.get(c);oh.focus(d)}}})(e.backstages.dialog),r=(t,o)=>SN.open(((t,n,s)=>{const r=n,a=((e,t,o)=>{const n=la("dialog"),s=e.internalDialog,r=sV(s.title,n,o),a=((e,t,o)=>{const n=$N(e,t,A.none(),o,!1);return HI.parts.body(n)})({body:s.body,initialData:s.initialData},n,o),i=lV(s.buttons),l=cV(i),c=Ce(0!==i.length,pV({buttons:i},n,o)),d=uV((()=>p),aV((()=>m),o.shared.providers,t),o.shared.getSink),u=(e=>{switch(e){case"large":return["tox-dialog--width-lg"];case"medium":return["tox-dialog--width-md"];default:return[]}})(s.size),m=iV({id:n,header:r,body:a,footer:c,extraClasses:u,extraBehaviours:[],extraStyles:{}},e,d,o),g={getId:x(n),getRoot:x(m),getBody:()=>HI.getBody(m),getFooter:()=>HI.getFooter(m),getFormWrapper:()=>{const e=HI.getBody(m);return wm.getCurrent(e).getOr(e)},toggleFullscreen:()=>{const e="tox-dialog--fullscreen",t=Ve(m.element.dom);Ua(t,e)?(Pa(t,e),Wa(t,u)):(ja(t,u),La(t,e))}},p=fV(g,t.redial,l);return{dialog:m,instanceApi:p}})({dataValidator:s,initialData:r,internalDialog:t},{redial:SN.redial,closeWindow:()=>{HI.hide(a.dialog),o(a.instanceApi)}},e.backstages.dialog);return HI.show(a.dialog),a.instanceApi.setData(r),a.instanceApi}),t),a=(n,s,r,a)=>SN.open(((n,i,l)=>{const c=SV(i,l),d=Ql(),u=e.backstages.popup.shared.header.isPositionedAtTop(),m=()=>d.on((e=>{Ph.reposition(e),$A.refresh(e)})),g=bV({dataValidator:l,initialData:c,internalDialog:n},{redial:SN.redial,closeWindow:()=>{d.on(Ph.hide),t.off("ResizeEditor",m),d.clear(),r(g.instanceApi)}},e.backstages.popup,a.ariaAttrs),p=ri(Ph.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:a.persistent?{event:"doNotDismissYet"}:{},...u?{}:{fireRepositionEventInstead:{}},inlineBehaviours:kl([Jp("window-manager-inline-events",[Ur(Cr(),((e,t)=>{Fr(g.dialog,bk)}))]),...CV(t,o,u)]),isExtraPart:(e,t)=>kV(t)}));return d.set(p),Ph.showWithinBounds(p,ai(g.dialog),{anchor:s},(()=>{const e=t.inline?xt():Ve(t.getContainer()),o=Jo(e);return A.some(o)})),o&&u||($A.refresh(p),t.on("ResizeEditor",m)),g.instanceApi.setData(c),Pp.focusIn(g.dialog),g.instanceApi}),n),i=(o,n,s,r)=>SN.open(((o,a,i)=>{const l=SV(a,i),c=Ql(),d=e.backstages.popup.shared.header.isPositionedAtTop(),u=()=>c.on((e=>{Ph.reposition(e),$A.refresh(e)})),m=bV({dataValidator:i,initialData:l,internalDialog:o},{redial:SN.redial,closeWindow:()=>{c.on(Ph.hide),t.off("ResizeEditor ScrollWindow ElementScroll",u),c.clear(),s(m.instanceApi)}},e.backstages.popup,r.ariaAttrs),g=ri(Ph.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:r.persistent?{event:"doNotDismissYet"}:{},...d?{}:{fireRepositionEventInstead:{}},inlineBehaviours:kl([Jp("window-manager-inline-events",[Ur(Cr(),((e,t)=>{Fr(m.dialog,bk)}))]),$A.config({contextual:{lazyContext:()=>A.some(Jo(Ve(t.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top","bottom"],lazyViewport:e=>jS(t,e.element).map((e=>({bounds:GS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:en(),optScrollEnv:A.none()})))})]),isExtraPart:(e,t)=>kV(t)}));return c.set(g),Ph.showWithinBounds(g,ai(m.dialog),{anchor:n},(()=>e.backstages.popup.shared.getSink().toOptional().bind((e=>{const o=jS(t,e.element).map((e=>GS(e))).getOr(en()),n=Jo(Ve(t.getContentAreaContainer())),s=Qo(n,o);return A.some(Ko(s.x,s.y,s.width,s.height-15))})))),$A.refresh(g),t.on("ResizeEditor ScrollWindow ElementScroll",u),m.instanceApi.setData(l),Pp.focusIn(m.dialog),m.instanceApi}),o);return{open:(t,o,n)=>{if(!u(o)){if("toolbar"===o.inline)return a(t,e.backstages.popup.shared.anchors.inlineDialog(),n,o);if("bottom"===o.inline)return i(t,e.backstages.popup.shared.anchors.inlineBottomDialog(),n,o);if("cursor"===o.inline)return a(t,e.backstages.popup.shared.anchors.cursor(),n,o)}return r(t,n)},openUrl:(o,n)=>((o,n)=>SN.openUrl((o=>{const s=wV(o,{closeWindow:()=>{HI.hide(s.dialog),n(s.instanceApi)}},t,e.backstages.dialog);return HI.show(s.dialog),s.instanceApi}),o))(o,n),alert:(e,t)=>{n.open(e,t)},close:e=>{e.close()},confirm:(e,t)=>{s.open(e,t)}}};tn.add("silver",(e=>{(e=>{ub(e),(e=>{const t=e.options.register,o=e=>f(e,r)?{value:Bw(e),valid:!0}:{valid:!1,message:"Must be an array of strings."},n=e=>h(e)&&e>0?{value:e,valid:!0}:{valid:!1,message:"Must be a positive number."};t("color_map",{processor:o,default:["#BFEDD2","Light Green","#FBEEB8","Light Yellow","#F8CAC6","Light Red","#ECCAFA","Light Purple","#C2E0F4","Light Blue","#2DC26B","Green","#F1C40F","Yellow","#E03E2D","Red","#B96AD9","Purple","#3598DB","Blue","#169179","Dark Turquoise","#E67E23","Orange","#BA372A","Dark Red","#843FA1","Dark Purple","#236FA1","Dark Blue","#ECF0F1","Light Gray","#CED4D9","Medium Gray","#95A5A6","Gray","#7E8C8D","Dark Gray","#34495E","Navy Blue","#000000","Black","#ffffff","White"]}),t("color_map_background",{processor:o}),t("color_map_foreground",{processor:o}),t("color_cols",{processor:n,default:Nw(e)}),t("color_cols_foreground",{processor:n,default:Vw(e,Mw)}),t("color_cols_background",{processor:n,default:Vw(e,Dw)}),t("custom_colors",{processor:"boolean",default:!0}),t("color_default_foreground",{processor:"string",default:Iw}),t("color_default_background",{processor:"string",default:Iw})})(e),(e=>{const t=e.options.register;t("contextmenu_avoid_overlap",{processor:"string",default:""}),t("contextmenu_never_use_native",{processor:"boolean",default:!1}),t("contextmenu",{processor:e=>!1===e?{value:[],valid:!0}:r(e)||f(e,r)?{value:vF(e),valid:!0}:{valid:!1,message:"Must be false or a string."},default:"link linkchecker image editimage table spellchecker configurepermanentpen"})})(e)})(e);let t=()=>en();const{dialogs:o,popups:n,renderUI:s}=RI(e,{getPopupSinkBounds:()=>t()});LS(e,n.backstage.shared);const a=OV({editor:e,backstages:{popup:n.backstage,dialog:o.backstage}});return{renderUI:()=>{const o=s();return jS(e,n.getMothership().element).each((e=>{t=()=>GS(e)})),o},getWindowManagerImpl:x(a),getNotificationManagerImpl:()=>((e,t,o)=>{const n=t.backstage.shared,s=()=>{const t=Jo(Ve(e.getContentAreaContainer())),o=en(),n=Yi(o.x,t.x,t.right),s=Yi(o.y,t.y,t.bottom),r=Math.max(t.right,o.right),a=Math.max(t.bottom,o.bottom);return A.some(Ko(n,s,r-n,a-s))};return{open:(t,r)=>{const a=()=>{r(),Ph.hide(l)},i=ri(nb.sketch({text:t.text,level:R(["success","error","warning","warn","info"],t.type)?t.type:void 0,progress:!0===t.progressBar,icon:t.icon,closeButton:t.closeButton,onAction:a,iconProvider:n.providers.icons,translationProvider:n.providers.translate})),l=ri(Ph.sketch({dom:{tag:"div",classes:["tox-notifications-container"]},lazySink:n.getSink,fireDismissalEventInstead:{},...n.header.isPositionedAtTop()?{}:{fireRepositionEventInstead:{}}}));o.add(l),h(t.timeout)&&t.timeout>0&&Uh.setEditorTimeout(e,(()=>{a()}),t.timeout);const c={close:a,reposition:()=>{const t=ai(i),o={maxHeightFunction:cc()},r=e.notificationManager.getNotifications();if(r[0]===c){const e={...n.anchors.banner(),overrides:o};Ph.showWithinBounds(l,t,{anchor:e},s)}else I(r,c).each((e=>{const n=r[e-1].getEl(),a={type:"node",root:xt(),node:A.some(Ve(n)),overrides:o,layouts:{onRtl:()=>[cl],onLtr:()=>[cl]}};Ph.showWithinBounds(l,t,{anchor:a},s)}))},text:e=>{nb.updateText(i,e)},settings:t,getEl:()=>i.element.dom,progressBar:{value:e=>{nb.updateProgress(i,e)}}};return c},close:e=>{e.close()},getArgs:e=>e.settings}})(e,{backstage:n.backstage},n.getMothership())}}))}();
\ No newline at end of file
+!function(){"use strict";const e=Object.getPrototypeOf,t=(e,t,o)=>{var n;return!!o(e,t.prototype)||(null===(n=e.constructor)||void 0===n?void 0:n.name)===t.name},o=e=>o=>(e=>{const o=typeof e;return null===e?"null":"object"===o&&Array.isArray(e)?"array":"object"===o&&t(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":o})(o)===e,n=e=>t=>typeof t===e,s=e=>t=>e===t,r=o("string"),a=o("object"),i=o=>((o,n)=>a(o)&&t(o,n,((t,o)=>e(t)===o)))(o,Object),l=o("array"),c=s(null),d=n("boolean"),u=s(void 0),m=e=>null==e,g=e=>!m(e),p=n("function"),h=n("number"),f=(e,t)=>{if(l(e)){for(let o=0,n=e.length;o<n;++o)if(!t(e[o]))return!1;return!0}return!1},b=()=>{},v=e=>()=>e(),y=(e,t)=>(...o)=>e(t.apply(null,o)),x=e=>()=>e,w=e=>e,S=(e,t)=>e===t;function k(e,...t){return(...o)=>{const n=t.concat(o);return e.apply(null,n)}}const C=e=>t=>!e(t),O=e=>()=>{throw new Error(e)},_=e=>e(),T=x(!1),E=x(!0);class A{constructor(e,t){this.tag=e,this.value=t}static some(e){return new A(!0,e)}static none(){return A.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?A.some(e(this.value)):A.none()}bind(e){return this.tag?e(this.value):A.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:A.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return g(e)?A.some(e):A.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}A.singletonNone=new A(!1);const M=Array.prototype.slice,D=Array.prototype.indexOf,B=Array.prototype.push,I=(e,t)=>D.call(e,t),F=(e,t)=>{const o=I(e,t);return-1===o?A.none():A.some(o)},R=(e,t)=>I(e,t)>-1,N=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return!0;return!1},V=(e,t)=>{const o=[];for(let n=0;n<e;n++)o.push(t(n));return o},z=(e,t)=>{const o=[];for(let n=0;n<e.length;n+=t){const s=M.call(e,n,n+t);o.push(s)}return o},L=(e,t)=>{const o=e.length,n=new Array(o);for(let s=0;s<o;s++){const o=e[s];n[s]=t(o,s)}return n},H=(e,t)=>{for(let o=0,n=e.length;o<n;o++)t(e[o],o)},P=(e,t)=>{const o=[],n=[];for(let s=0,r=e.length;s<r;s++){const r=e[s];(t(r,s)?o:n).push(r)}return{pass:o,fail:n}},U=(e,t)=>{const o=[];for(let n=0,s=e.length;n<s;n++){const s=e[n];t(s,n)&&o.push(s)}return o},W=(e,t,o)=>(((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(e,((e,n)=>{o=t(o,e,n)})),o),j=(e,t,o)=>(H(e,((e,n)=>{o=t(o,e,n)})),o),G=(e,t)=>((e,t,o)=>{for(let n=0,s=e.length;n<s;n++){const s=e[n];if(t(s,n))return A.some(s);if(o(s,n))break}return A.none()})(e,t,T),$=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return A.some(o);return A.none()},q=e=>{const t=[];for(let o=0,n=e.length;o<n;++o){if(!l(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);B.apply(t,e[o])}return t},Y=(e,t)=>q(L(e,t)),X=(e,t)=>{for(let o=0,n=e.length;o<n;++o)if(!0!==t(e[o],o))return!1;return!0},K=e=>{const t=M.call(e,0);return t.reverse(),t},J=(e,t)=>U(e,(e=>!R(t,e))),Z=(e,t)=>{const o={};for(let n=0,s=e.length;n<s;n++){const s=e[n];o[String(s)]=t(s,n)}return o},Q=e=>[e],ee=(e,t)=>{const o=M.call(e,0);return o.sort(t),o},te=(e,t)=>t>=0&&t<e.length?A.some(e[t]):A.none(),oe=e=>te(e,0),ne=e=>te(e,e.length-1),se=p(Array.from)?Array.from:e=>M.call(e),re=(e,t)=>{for(let o=0;o<e.length;o++){const n=t(e[o],o);if(n.isSome())return n}return A.none()},ae=Object.keys,ie=Object.hasOwnProperty,le=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n];t(e[s],s)}},ce=(e,t)=>de(e,((e,o)=>({k:o,v:t(e,o)}))),de=(e,t)=>{const o={};return le(e,((e,n)=>{const s=t(e,n);o[s.k]=s.v})),o},ue=e=>(t,o)=>{e[o]=t},me=(e,t,o,n)=>{le(e,((e,s)=>{(t(e,s)?o:n)(e,s)}))},ge=(e,t)=>{const o={};return me(e,t,ue(o),b),o},pe=(e,t)=>{const o=[];return le(e,((e,n)=>{o.push(t(e,n))})),o},he=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n],r=e[s];if(t(r,s,e))return A.some(r)}return A.none()},fe=e=>pe(e,w),be=(e,t)=>ve(e,t)?A.from(e[t]):A.none(),ve=(e,t)=>ie.call(e,t),ye=(e,t)=>ve(e,t)&&void 0!==e[t]&&null!==e[t],xe=(e,t,o=S)=>e.exists((e=>o(e,t))),we=e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t},Se=(e,t,o)=>e.isSome()&&t.isSome()?A.some(o(e.getOrDie(),t.getOrDie())):A.none(),ke=(e,t)=>null!=e?A.some(t(e)):A.none(),Ce=(e,t)=>e?A.some(t):A.none(),Oe=(e,t,o)=>""===t||e.length>=t.length&&e.substr(o,o+t.length)===t,_e=(e,t)=>Ee(e,t)?((e,t)=>e.substring(t))(e,t.length):e,Te=(e,t,o=0,n)=>{const s=e.indexOf(t,o);return-1!==s&&(!!u(n)||s+t.length<=n)},Ee=(e,t)=>Oe(e,t,0),Ae=(e,t)=>Oe(e,t,e.length-t.length),Me=(Mo=/^\s+|\s+$/g,e=>e.replace(Mo,"")),De=e=>e.length>0,Be=e=>!De(e),Ie=e=>void 0!==e.style&&p(e.style.getPropertyValue),Fe=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},Re=(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return Fe(o.childNodes[0])},Ne=(e,t)=>{const o=(t||document).createElement(e);return Fe(o)},Ve=(e,t)=>{const o=(t||document).createTextNode(e);return Fe(o)},ze=Fe,Le="undefined"!=typeof window?window:Function("return this;")(),He=(e,t)=>((e,t)=>{let o=null!=t?t:Le;for(let t=0;t<e.length&&null!=o;++t)o=o[e[t]];return o})(e.split("."),t),Pe=Object.getPrototypeOf,Ue=e=>{const t=He("ownerDocument.defaultView",e);return a(e)&&((e=>((e,t)=>{const o=((e,t)=>He(e,t))(e,t);if(null==o)throw new Error(e+" not available on this browser");return o})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(Pe(e).constructor.name))},We=e=>e.dom.nodeName.toLowerCase(),je=e=>t=>(e=>e.dom.nodeType)(t)===e,Ge=e=>$e(e)&&Ue(e.dom),$e=je(1),qe=je(3),Ye=je(9),Xe=je(11),Ke=e=>t=>$e(t)&&We(t)===e,Je=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},Ze=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,Qe=(e,t)=>e.dom===t.dom,et=(e,t)=>{const o=e.dom,n=t.dom;return o!==n&&o.contains(n)},tt=e=>ze(e.dom.ownerDocument),ot=e=>Ye(e)?e:tt(e),nt=e=>ze(ot(e).dom.documentElement),st=e=>ze(ot(e).dom.defaultView),rt=e=>A.from(e.dom.parentNode).map(ze),at=e=>A.from(e.dom.parentElement).map(ze),it=e=>A.from(e.dom.offsetParent).map(ze),lt=e=>L(e.dom.childNodes,ze),ct=(e,t)=>{const o=e.dom.childNodes;return A.from(o[t]).map(ze)},dt=e=>ct(e,0),ut=(e,t)=>({element:e,offset:t}),mt=(e,t)=>{const o=lt(e);return o.length>0&&t<o.length?ut(o[t],0):ut(e,t)},gt=e=>Xe(e)&&g(e.dom.host),pt=p(Element.prototype.attachShadow)&&p(Node.prototype.getRootNode),ht=x(pt),ft=pt?e=>ze(e.dom.getRootNode()):ot,bt=e=>gt(e)?e:ze(ot(e).dom.body),vt=e=>{const t=ft(e);return gt(t)?A.some(t):A.none()},yt=e=>ze(e.dom.host),xt=e=>{const t=qe(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return vt(ze(t)).fold((()=>o.body.contains(t)),(n=xt,s=yt,e=>n(s(e))));var n,s},wt=()=>St(ze(document)),St=e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return ze(t)},kt=(e,t,o)=>{if(!(r(o)||d(o)||h(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},Ct=(e,t,o)=>{kt(e.dom,t,o)},Ot=(e,t)=>{const o=e.dom;le(t,((e,t)=>{kt(o,t,e)}))},_t=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},Tt=(e,t)=>A.from(_t(e,t)),Et=(e,t)=>{const o=e.dom;return!(!o||!o.hasAttribute)&&o.hasAttribute(t)},At=(e,t)=>{e.dom.removeAttribute(t)},Mt=(e,t,o)=>{if(!r(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);Ie(e)&&e.style.setProperty(t,o)},Dt=(e,t)=>{Ie(e)&&e.style.removeProperty(t)},Bt=(e,t,o)=>{const n=e.dom;Mt(n,t,o)},It=(e,t)=>{const o=e.dom;le(t,((e,t)=>{Mt(o,t,e)}))},Ft=(e,t)=>{const o=e.dom;le(t,((e,t)=>{e.fold((()=>{Dt(o,t)}),(e=>{Mt(o,t,e)}))}))},Rt=(e,t)=>{const o=e.dom,n=window.getComputedStyle(o).getPropertyValue(t);return""!==n||xt(e)?n:Nt(o,t)},Nt=(e,t)=>Ie(e)?e.style.getPropertyValue(t):"",Vt=(e,t)=>{const o=e.dom,n=Nt(o,t);return A.from(n).filter((e=>e.length>0))},zt=e=>{const t={},o=e.dom;if(Ie(o))for(let e=0;e<o.style.length;e++){const n=o.style.item(e);t[n]=o.style[n]}return t},Lt=(e,t,o)=>{const n=Ne(e);return Bt(n,t,o),Vt(n,t).isSome()},Ht=(e,t)=>{const o=e.dom;Dt(o,t),xe(Tt(e,"style").map(Me),"")&&At(e,"style")},Pt=e=>e.dom.offsetWidth,Ut=(e,t)=>{const o=o=>{const n=t(o);if(n<=0||null===n){const t=Rt(o,e);return parseFloat(t)||0}return n},n=(e,t)=>j(t,((t,o)=>{const n=Rt(e,o),s=void 0===n?0:parseInt(n,10);return isNaN(s)?t:t+s}),0);return{set:(t,o)=>{if(!h(o)&&!o.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+o);const n=t.dom;Ie(n)&&(n.style[e]=o+"px")},get:o,getOuter:o,aggregate:n,max:(e,t,o)=>{const s=n(e,o);return t>s?t-s:0}}},Wt=Ut("height",(e=>{const t=e.dom;return xt(e)?t.getBoundingClientRect().height:t.offsetHeight})),jt=e=>Wt.get(e),Gt=e=>Wt.getOuter(e),$t=(e,t)=>({left:e,top:t,translate:(o,n)=>$t(e+o,t+n)}),qt=$t,Yt=(e,t)=>void 0!==e?e:void 0!==t?t:0,Xt=e=>{const t=e.dom.ownerDocument,o=t.body,n=t.defaultView,s=t.documentElement;if(o===e.dom)return qt(o.offsetLeft,o.offsetTop);const r=Yt(null==n?void 0:n.pageYOffset,s.scrollTop),a=Yt(null==n?void 0:n.pageXOffset,s.scrollLeft),i=Yt(s.clientTop,o.clientTop),l=Yt(s.clientLeft,o.clientLeft);return Kt(e).translate(a-l,r-i)},Kt=e=>{const t=e.dom,o=t.ownerDocument.body;return o===t?qt(o.offsetLeft,o.offsetTop):xt(e)?(e=>{const t=e.getBoundingClientRect();return qt(t.left,t.top)})(t):qt(0,0)},Jt=Ut("width",(e=>e.dom.offsetWidth)),Zt=e=>Jt.get(e),Qt=e=>Jt.getOuter(e),eo=e=>{let t,o=!1;return(...n)=>(o||(o=!0,t=e.apply(null,n)),t)},to=()=>oo(0,0),oo=(e,t)=>({major:e,minor:t}),no={nu:oo,detect:(e,t)=>{const o=String(t).toLowerCase();return 0===e.length?to():((e,t)=>{const o=((e,t)=>{for(let o=0;o<e.length;o++){const n=e[o];if(n.test(t))return n}})(e,t);if(!o)return{major:0,minor:0};const n=e=>Number(t.replace(o,"$"+e));return oo(n(1),n(2))})(e,o)},unknown:to},so=(e,t)=>{const o=String(t).toLowerCase();return G(e,(e=>e.search(o)))},ro=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,ao=e=>t=>Te(t,e),io=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>Te(e,"edge/")&&Te(e,"chrome")&&Te(e,"safari")&&Te(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,ro],search:e=>Te(e,"chrome")&&!Te(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>Te(e,"msie")||Te(e,"trident")},{name:"Opera",versionRegexes:[ro,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:ao("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:ao("firefox")},{name:"Safari",versionRegexes:[ro,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(Te(e,"safari")||Te(e,"mobile/"))&&Te(e,"applewebkit")}],lo=[{name:"Windows",search:ao("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>Te(e,"iphone")||Te(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:ao("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:ao("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:ao("linux"),versionRegexes:[]},{name:"Solaris",search:ao("sunos"),versionRegexes:[]},{name:"FreeBSD",search:ao("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:ao("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],co={browsers:x(io),oses:x(lo)},uo="Edge",mo="Chromium",go="Opera",po="Firefox",ho="Safari",fo=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isEdge:n(uo),isChromium:n(mo),isIE:n("IE"),isOpera:n(go),isFirefox:n(po),isSafari:n(ho)}},bo=()=>fo({current:void 0,version:no.unknown()}),vo=fo,yo=(x(uo),x(mo),x("IE"),x(go),x(po),x(ho),"Windows"),xo="Android",wo="Linux",So="macOS",ko="Solaris",Co="FreeBSD",Oo="ChromeOS",_o=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isWindows:n(yo),isiOS:n("iOS"),isAndroid:n(xo),isMacOS:n(So),isLinux:n(wo),isSolaris:n(ko),isFreeBSD:n(Co),isChromeOS:n(Oo)}},To=()=>_o({current:void 0,version:no.unknown()}),Eo=_o,Ao=(x(yo),x("iOS"),x(xo),x(wo),x(So),x(ko),x(Co),x(Oo),e=>window.matchMedia(e).matches);var Mo;let Do=eo((()=>((e,t,o)=>{const n=co.browsers(),s=co.oses(),r=t.bind((e=>((e,t)=>re(t.brands,(t=>{const o=t.brand.toLowerCase();return G(e,(e=>{var t;return o===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:no.nu(parseInt(t.version,10),0)})))})))(n,e))).orThunk((()=>((e,t)=>so(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(n,e))).fold(bo,vo),a=((e,t)=>so(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(s,e).fold(To,Eo),i=((e,t,o,n)=>{const s=e.isiOS()&&!0===/ipad/i.test(o),r=e.isiOS()&&!s,a=e.isiOS()||e.isAndroid(),i=a||n("(pointer:coarse)"),l=s||!r&&a&&n("(min-device-width:768px)"),c=r||a&&!l,d=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(o),u=!c&&!l&&!d;return{isiPad:x(s),isiPhone:x(r),isTablet:x(l),isPhone:x(c),isTouch:x(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:x(d),isDesktop:x(u)}})(a,r,e,o);return{browser:r,os:a,deviceType:i}})(navigator.userAgent,A.from(navigator.userAgentData),Ao)));const Bo=()=>Do(),Io=e=>{const t=ze((e=>{if(ht()&&g(e.target)){const t=ze(e.target);if($e(t)&&(e=>g(e.dom.shadowRoot))(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return oe(t)}}return A.from(e.target)})(e).getOr(e.target)),o=()=>e.stopPropagation(),n=()=>e.preventDefault(),s=y(n,o);return((e,t,o,n,s,r,a)=>({target:e,x:t,y:o,stop:n,prevent:s,kill:r,raw:a}))(t,e.clientX,e.clientY,o,n,s,e)},Fo=(e,t,o,n,s)=>{const r=((e,t)=>o=>{e(o)&&t(Io(o))})(o,n);return e.dom.addEventListener(t,r,s),{unbind:k(Ro,e,t,r,s)}},Ro=(e,t,o,n)=>{e.dom.removeEventListener(t,o,n)},No=(e,t)=>{rt(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},Vo=(e,t)=>{const o=(e=>A.from(e.dom.nextSibling).map(ze))(e);o.fold((()=>{rt(e).each((e=>{Lo(e,t)}))}),(e=>{No(e,t)}))},zo=(e,t)=>{dt(e).fold((()=>{Lo(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},Lo=(e,t)=>{e.dom.appendChild(t.dom)},Ho=(e,t)=>{H(t,(t=>{Lo(e,t)}))},Po=e=>{e.dom.textContent="",H(lt(e),(e=>{Uo(e)}))},Uo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Wo=e=>{const t=void 0!==e?e.dom:document,o=t.body.scrollLeft||t.documentElement.scrollLeft,n=t.body.scrollTop||t.documentElement.scrollTop;return qt(o,n)},jo=(e,t,o)=>{const n=(void 0!==o?o.dom:document).defaultView;n&&n.scrollTo(e,t)},Go=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),$o=e=>{const t=void 0===e?window:e,o=t.document,n=Wo(ze(o));return(e=>{const t=void 0===e?window:e;return Bo().browser.isFirefox()?A.none():A.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,o=e.clientWidth,s=e.clientHeight;return Go(n.left,n.top,o,s)}),(e=>Go(Math.max(e.pageLeft,n.left),Math.max(e.pageTop,n.top),e.width,e.height)))},qo=()=>ze(document),Yo=(e,t)=>e.view(t).fold(x([]),(t=>{const o=e.owner(t),n=Yo(e,o);return[t].concat(n)}));var Xo=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?A.none():A.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(ze)},owner:e=>tt(e)});const Ko=e=>{const t=qo(),o=Wo(t),n=((e,t)=>{const o=t.owner(e),n=Yo(t,o);return A.some(n)})(e,Xo);return n.fold(k(Xt,e),(t=>{const n=Kt(e),s=W(t,((e,t)=>{const o=Kt(t);return{left:e.left+o.left,top:e.top+o.top}}),{left:0,top:0});return qt(s.left+n.left+o.left,s.top+n.top+o.top)}))},Jo=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),Zo=e=>{const t=Xt(e),o=Qt(e),n=Gt(e);return Jo(t.left,t.top,o,n)},Qo=e=>{const t=Ko(e),o=Qt(e),n=Gt(e);return Jo(t.left,t.top,o,n)},en=(e,t)=>{const o=Math.max(e.x,t.x),n=Math.max(e.y,t.y),s=Math.min(e.right,t.right),r=Math.min(e.bottom,t.bottom);return Jo(o,n,s-o,r-n)},tn=()=>$o(window);var on=tinymce.util.Tools.resolve("tinymce.ThemeManager");const nn=e=>{const t=t=>t(e),o=x(e),n=()=>s,s={tag:!0,inner:e,fold:(t,o)=>o(e),isValue:E,isError:T,map:t=>rn.value(t(e)),mapError:n,bind:t,exists:t,forall:t,getOr:o,or:n,getOrThunk:o,orThunk:n,getOrDie:o,each:t=>{t(e)},toOptional:()=>A.some(e)};return s},sn=e=>{const t=()=>o,o={tag:!1,inner:e,fold:(t,o)=>t(e),isValue:T,isError:E,map:t,mapError:t=>rn.error(t(e)),bind:t,exists:T,forall:E,getOr:w,or:w,getOrThunk:_,orThunk:_,getOrDie:O(String(e)),each:b,toOptional:A.none};return o},rn={value:nn,error:sn,fromOption:(e,t)=>e.fold((()=>sn(t)),nn)};var an;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}(an||(an={}));const ln=(e,t,o)=>e.stype===an.Error?t(e.serror):o(e.svalue),cn=e=>({stype:an.Value,svalue:e}),dn=e=>({stype:an.Error,serror:e}),un=cn,mn=dn,gn=ln,pn=(e,t,o,n)=>({tag:"field",key:e,newKey:t,presence:o,prop:n}),hn=(e,t,o)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return o(e.newKey,e.instantiator)}},fn=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const o={};for(let n=0;n<t.length;n++){const s=t[n];for(const t in s)ve(s,t)&&(o[t]=e(o[t],s[t]))}return o},bn=fn(((e,t)=>i(e)&&i(t)?bn(e,t):t)),vn=fn(((e,t)=>t)),yn=e=>({tag:"defaultedThunk",process:e}),xn=e=>yn(x(e)),wn=e=>({tag:"mergeWithThunk",process:e}),Sn=e=>{const t=(e=>{const t=[],o=[];return H(e,(e=>{ln(e,(e=>o.push(e)),(e=>t.push(e)))})),{values:t,errors:o}})(e);return t.errors.length>0?(o=t.errors,y(mn,q)(o)):un(t.values);var o},kn=e=>a(e)&&ae(e).length>100?" removed due to size":JSON.stringify(e,null,2),Cn=(e,t)=>mn([{path:e,getErrorInfo:t}]),On=e=>({extract:(t,o)=>((e,t)=>e.stype===an.Error?t(e.serror):e)(e(o),(e=>((e,t)=>Cn(e,x(t)))(t,e))),toString:x("val")}),_n=On(un),Tn=(e,t,o,n)=>n(be(e,t).getOrThunk((()=>o(e)))),En=(e,t,o,n,s)=>{const r=e=>s.extract(t.concat([n]),e),a=e=>e.fold((()=>un(A.none())),(e=>((e,t)=>e.stype===an.Value?{stype:an.Value,svalue:t(e.svalue)}:e)(s.extract(t.concat([n]),e),A.some)));switch(e.tag){case"required":return((e,t,o,n)=>be(t,o).fold((()=>((e,t,o)=>Cn(e,(()=>'Could not find valid *required* value for "'+t+'" in '+kn(o))))(e,o,t)),n))(t,o,n,r);case"defaultedThunk":return Tn(o,n,e.process,r);case"option":return((e,t,o)=>o(be(e,t)))(o,n,a);case"defaultedOptionThunk":return((e,t,o,n)=>n(be(e,t).map((t=>!0===t?o(e):t))))(o,n,e.process,a);case"mergeWithThunk":return Tn(o,n,x({}),(t=>{const n=bn(e.process(o),t);return r(n)}))}},An=e=>({extract:(t,o)=>e().extract(t,o),toString:()=>e().toString()}),Mn=e=>ae(ge(e,g)),Dn=e=>{const t=Bn(e),o=W(e,((e,t)=>hn(t,(t=>bn(e,{[t]:!0})),x(e))),{});return{extract:(e,n)=>{const s=d(n)?[]:Mn(n),r=U(s,(e=>!ye(o,e)));return 0===r.length?t.extract(e,n):((e,t)=>Cn(e,(()=>"There are unsupported fields: ["+t.join(", ")+"] specified")))(e,r)},toString:t.toString}},Bn=e=>({extract:(t,o)=>((e,t,o)=>{const n={},s=[];for(const r of o)hn(r,((o,r,a,i)=>{const l=En(a,e,t,o,i);gn(l,(e=>{s.push(...e)}),(e=>{n[r]=e}))}),((e,o)=>{n[e]=o(t)}));return s.length>0?mn(s):un(n)})(t,o,e),toString:()=>{const t=L(e,(e=>hn(e,((e,t,o,n)=>e+" -> "+n.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),In=e=>({extract:(t,o)=>{const n=L(o,((o,n)=>e.extract(t.concat(["["+n+"]"]),o)));return Sn(n)},toString:()=>"array("+e.toString()+")"}),Fn=(e,t)=>{const o=void 0!==t?t:w;return{extract:(t,n)=>{const s=[];for(const r of e){const e=r.extract(t,n);if(e.stype===an.Value)return{stype:an.Value,svalue:o(e.svalue)};s.push(e)}return Sn(s)},toString:()=>"oneOf("+L(e,(e=>e.toString())).join(", ")+")"}},Rn=(e,t)=>({extract:(o,n)=>{const s=ae(n),r=((t,o)=>In(On(e)).extract(t,o))(o,s);return((e,t)=>e.stype===an.Value?t(e.svalue):e)(r,(e=>{const s=L(e,(e=>pn(e,e,{tag:"required",process:{}},t)));return Bn(s).extract(o,n)}))},toString:()=>"setOf("+t.toString()+")"}),Nn=y(In,Bn),Vn=x(_n),zn=(e,t)=>On((o=>{const n=typeof o;return e(o)?un(o):mn(`Expected type: ${t} but got: ${n}`)})),Ln=zn(h,"number"),Hn=zn(r,"string"),Pn=zn(d,"boolean"),Un=zn(p,"function"),Wn=e=>{if(Object(e)!==e)return!0;switch({}.toString.call(e).slice(8,-1)){case"Boolean":case"Number":case"String":case"Date":case"RegExp":case"Blob":case"FileList":case"ImageData":case"ImageBitmap":case"ArrayBuffer":return!0;case"Array":case"Object":return Object.keys(e).every((t=>Wn(e[t])));default:return!1}},jn=On((e=>Wn(e)?un(e):mn("Expected value to be acceptable for sending via postMessage"))),Gn=(e,t)=>({extract:(o,n)=>be(n,e).fold((()=>((e,t)=>Cn(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(o,e)),(e=>((e,t,o,n)=>be(o,n).fold((()=>((e,t,o)=>Cn(e,(()=>'The chosen schema: "'+o+'" did not exist in branches: '+kn(t))))(e,o,n)),(o=>o.extract(e.concat(["branch: "+n]),t))))(o,n,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+ae(t)}),$n=e=>On((t=>e(t).fold(mn,un))),qn=(e,t)=>Rn((t=>e(t).fold(dn,cn)),t),Yn=(e,t,o)=>{return n=((e,t,o)=>((e,t)=>e.stype===an.Error?{stype:an.Error,serror:t(e.serror)}:e)(t.extract([e],o),(e=>({input:o,errors:e}))))(e,t,o),ln(n,rn.error,rn.value);var n},Xn=e=>e.fold((e=>{throw new Error(Jn(e))}),w),Kn=(e,t,o)=>Xn(Yn(e,t,o)),Jn=e=>"Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:x("... (only showing first ten failures)")}]):e;return L(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})(e.errors).join("\n")+"\n\nInput object: "+kn(e.input),Zn=(e,t)=>Gn(e,ce(t,Bn)),Qn=(e,t)=>((e,t)=>{const o=eo(t);return{extract:(e,t)=>o().extract(e,t),toString:()=>o().toString()}})(0,t),es=pn,ts=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),os=e=>$n((t=>R(e,t)?rn.value(t):rn.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`))),ns=e=>es(e,e,{tag:"required",process:{}},Vn()),ss=(e,t)=>es(e,e,{tag:"required",process:{}},t),rs=e=>ss(e,Ln),as=e=>ss(e,Hn),is=(e,t)=>es(e,e,{tag:"required",process:{}},os(t)),ls=e=>ss(e,Un),cs=(e,t)=>es(e,e,{tag:"required",process:{}},Bn(t)),ds=(e,t)=>es(e,e,{tag:"required",process:{}},Nn(t)),us=(e,t)=>es(e,e,{tag:"required",process:{}},In(t)),ms=e=>es(e,e,{tag:"option",process:{}},Vn()),gs=(e,t)=>es(e,e,{tag:"option",process:{}},t),ps=e=>gs(e,Ln),hs=e=>gs(e,Hn),fs=(e,t)=>gs(e,os(t)),bs=e=>gs(e,Un),vs=(e,t)=>gs(e,In(t)),ys=(e,t)=>gs(e,Bn(t)),xs=(e,t)=>es(e,e,xn(t),Vn()),ws=(e,t,o)=>es(e,e,xn(t),o),Ss=(e,t)=>ws(e,t,Ln),ks=(e,t)=>ws(e,t,Hn),Cs=(e,t,o)=>ws(e,t,os(o)),Os=(e,t)=>ws(e,t,Pn),_s=(e,t)=>ws(e,t,Un),Ts=(e,t,o)=>ws(e,t,In(o)),Es=(e,t,o)=>ws(e,t,Bn(o)),As=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},Ms=e=>{if(!l(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};return H(e,((n,s)=>{const r=ae(n);if(1!==r.length)throw new Error("one and only one name per case");const a=r[0],i=n[a];if(void 0!==o[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!l(i))throw new Error("case arguments must be an array");t.push(a),o[a]=(...o)=>{const n=o.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+n);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[s].apply(null,o)},match:e=>{const n=ae(e);if(t.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+n.join(","));if(!X(t,(e=>R(n,e))))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:a,params:o})}}}})),o};Ms([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const Ds=(e,t)=>((e,t)=>({[e]:t}))(e,t),Bs=e=>(e=>{const t={};return H(e,(e=>{t[e.key]=e.value})),t})(e),Is=e=>p(e)?e:T,Fs=(e,t,o)=>{let n=e.dom;const s=Is(o);for(;n.parentNode;){n=n.parentNode;const e=ze(n),o=t(e);if(o.isSome())return o;if(s(e))break}return A.none()},Rs=(e,t,o)=>{const n=t(e),s=Is(o);return n.orThunk((()=>s(e)?A.none():Fs(e,t,s)))},Ns=(e,t)=>Qe(e.element,t.event.target),Vs={can:E,abort:T,run:b},zs=e=>{if(!ye(e,"can")&&!ye(e,"abort")&&!ye(e,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(e,null,2)+" does not have can, abort, or run!");return{...Vs,...e}},Ls=x,Hs=Ls("touchstart"),Ps=Ls("touchmove"),Us=Ls("touchend"),Ws=Ls("touchcancel"),js=Ls("mousedown"),Gs=Ls("mousemove"),$s=Ls("mouseout"),qs=Ls("mouseup"),Ys=Ls("mouseover"),Xs=Ls("focusin"),Ks=Ls("focusout"),Js=Ls("keydown"),Zs=Ls("keyup"),Qs=Ls("input"),er=Ls("change"),tr=Ls("click"),or=Ls("transitioncancel"),nr=Ls("transitionend"),sr=Ls("transitionstart"),rr=Ls("selectstart"),ar=e=>x("alloy."+e),ir={tap:ar("tap")},lr=ar("focus"),cr=ar("blur.post"),dr=ar("paste.post"),ur=ar("receive"),mr=ar("execute"),gr=ar("focus.item"),pr=ir.tap,hr=ar("longpress"),fr=ar("sandbox.close"),br=ar("typeahead.cancel"),vr=ar("system.init"),yr=ar("system.touchmove"),xr=ar("system.touchend"),wr=ar("system.scroll"),Sr=ar("system.resize"),kr=ar("system.attached"),Cr=ar("system.detached"),Or=ar("system.dismissRequested"),_r=ar("system.repositionRequested"),Tr=ar("focusmanager.shifted"),Er=ar("slotcontainer.visibility"),Ar=ar("system.external.element.scroll"),Mr=ar("change.tab"),Dr=ar("dismiss.tab"),Br=ar("highlight"),Ir=ar("dehighlight"),Fr=(e,t)=>{zr(e,e.element,t,{})},Rr=(e,t,o)=>{zr(e,e.element,t,o)},Nr=e=>{Fr(e,mr())},Vr=(e,t,o)=>{zr(e,t,o,{})},zr=(e,t,o,n)=>{const s={target:t,...n};e.getSystem().triggerEvent(o,t,s)},Lr=(e,t,o,n)=>{e.getSystem().triggerEvent(o,t,n.event)},Hr=e=>Bs(e),Pr=(e,t)=>({key:e,value:zs({abort:t})}),Ur=e=>({key:e,value:zs({run:(e,t)=>{t.event.prevent()}})}),Wr=(e,t)=>({key:e,value:zs({run:t})}),jr=(e,t,o)=>({key:e,value:zs({run:(e,n)=>{t.apply(void 0,[e,n].concat(o))}})}),Gr=e=>t=>({key:e,value:zs({run:(e,o)=>{Ns(e,o)&&t(e,o)}})}),$r=(e,t,o)=>((e,t)=>Wr(e,((o,n)=>{o.getSystem().getByUid(t).each((t=>{Lr(t,t.element,e,n)}))})))(e,t.partUids[o]),qr=(e,t)=>Wr(e,((e,o)=>{const n=o.event,s=e.getSystem().getByDom(n.target).getOrThunk((()=>Rs(n.target,(t=>e.getSystem().getByDom(t).toOptional()),T).getOr(e)));t(e,s,o)})),Yr=e=>Wr(e,((e,t)=>{t.cut()})),Xr=e=>Wr(e,((e,t)=>{t.stop()})),Kr=(e,t)=>Gr(e)(t),Jr=Gr(kr()),Zr=Gr(Cr()),Qr=Gr(vr()),ea=(aa=mr(),e=>Wr(aa,e)),ta=e=>e.dom.innerHTML,oa=(e,t)=>{const o=tt(e).dom,n=ze(o.createDocumentFragment()),s=((e,t)=>{const o=(t||document).createElement("div");return o.innerHTML=e,lt(ze(o))})(t,o);Ho(n,s),Po(e),Lo(e,n)},na=(e,t)=>ze(e.dom.cloneNode(t)),sa=e=>(e=>{if(gt(e))return"#shadow-root";{const t=(e=>na(e,!1))(e);return(e=>{const t=Ne("div"),o=ze(e.dom.cloneNode(!0));return Lo(t,o),ta(t)})(t)}})(e),ra=Hr([((e,t)=>({key:e,value:zs({can:(e,t)=>{const o=t.event,n=o.originator,s=o.target;return!((e,t,o)=>Qe(t,e.element)&&!Qe(t,o))(e,n,s)||(console.warn(lr()+" did not get interpreted by the desired target. \nOriginator: "+sa(n)+"\nTarget: "+sa(s)+"\nCheck the "+lr()+" event handlers"),!1)}})}))(lr())]);var aa,ia=Object.freeze({__proto__:null,events:ra});let la=0;const ca=e=>{const t=(new Date).getTime(),o=Math.floor(1e9*Math.random());return la++,e+"_"+o+la+String(t)},da=x("alloy-id-"),ua=x("data-alloy-id"),ma=da(),ga=ua(),pa=(e,t)=>{Object.defineProperty(e.dom,ga,{value:t,writable:!0})},ha=e=>{const t=$e(e)?e.dom[ga]:null;return A.from(t)},fa=e=>ca(e),ba=w,va=e=>{const t=t=>`The component must be in a context to execute: ${t}`+(e?"\n"+sa(e().element)+" is not in context.":""),o=e=>()=>{throw new Error(t(e))},n=e=>()=>{console.warn(t(e))};return{debugInfo:x("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),broadcastEvent:n("broadcastEvent"),build:o("build"),buildOrPatch:o("buildOrPatch"),addToWorld:o("addToWorld"),removeFromWorld:o("removeFromWorld"),addToGui:o("addToGui"),removeFromGui:o("removeFromGui"),getByUid:o("getByUid"),getByDom:o("getByDom"),isConnected:T}},ya=va(),xa=e=>L(e,(e=>Ae(e,"/*")?e.substring(0,e.length-2):e)),wa=(e,t)=>{const o=e.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:xa(r)}),e},Sa=ca("alloy-premade"),ka=e=>(Object.defineProperty(e.element.dom,Sa,{value:e.uid,writable:!0}),Ds(Sa,e)),Ca=e=>be(e,Sa),Oa=e=>((e,t)=>{const o=t.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:"OVERRIDE",parameters:xa(r.slice(1))}),e})(((t,...o)=>e(t.getApis(),t,...o)),e),_a={init:()=>Ta({readState:x("No State required")})},Ta=e=>e,Ea=(e,t)=>{const o={};return le(e,((e,n)=>{le(e,((e,s)=>{const r=be(o,s).getOr([]);o[s]=r.concat([t(n,e)])}))})),o},Aa=e=>({classes:u(e.classes)?[]:e.classes,attributes:u(e.attributes)?{}:e.attributes,styles:u(e.styles)?{}:e.styles}),Ma=e=>e.cHandler,Da=(e,t)=>({name:e,handler:t}),Ba=(e,t)=>{const o={};return H(e,(e=>{o[e.name()]=e.handlers(t)})),o},Ia=(e,t,o)=>{const n=t[o];return n?((e,t,o,n)=>{try{const s=ee(o,((o,s)=>{const r=o[t],a=s[t],i=n.indexOf(r),l=n.indexOf(a);if(-1===i)throw new Error("The ordering for "+e+" does not have an entry for "+r+".\nOrder specified: "+JSON.stringify(n,null,2));if(-1===l)throw new Error("The ordering for "+e+" does not have an entry for "+a+".\nOrder specified: "+JSON.stringify(n,null,2));return i<l?-1:l<i?1:0}));return rn.value(s)}catch(e){return rn.error([e])}})("Event: "+o,"name",e,n).map((e=>(e=>{const t=((e,t)=>(...t)=>j(e,((e,o)=>e&&(e=>e.can)(o).apply(void 0,t)),!0))(e),o=((e,t)=>(...t)=>j(e,((e,o)=>e||(e=>e.abort)(o).apply(void 0,t)),!1))(e);return{can:t,abort:o,run:(...t)=>{H(e,(e=>{e.run.apply(void 0,t)}))}}})(L(e,(e=>e.handler))))):((e,t)=>rn.error(["The event ("+e+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(L(t,(e=>e.name)),null,2)]))(o,e)},Fa=(e,t)=>((e,t)=>{const o=(e=>{const t=[],o=[];return H(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{o.push(e)}))})),{errors:t,values:o}})(e);return o.errors.length>0?(n=o.errors,rn.error(q(n))):((e,t)=>0===e.length?rn.value(t):rn.value(bn(t,vn.apply(void 0,e))))(o.values,t);var n})(pe(e,((e,o)=>(1===e.length?rn.value(e[0].handler):Ia(e,t,o)).map((n=>{const s=(e=>{const t=(e=>p(e)?{can:E,abort:T,run:e}:e)(e);return(e,o,...n)=>{const s=[e,o].concat(n);t.abort.apply(void 0,s)?o.stop():t.can.apply(void 0,s)&&t.run.apply(void 0,s)}})(n),r=e.length>1?U(t[o],(t=>N(e,(e=>e.name===t)))).join(" > "):e[0].name;return Ds(o,((e,t)=>({handler:e,purpose:t}))(s,r))})))),{}),Ra="alloy.base.behaviour",Na=Bn([es("dom","dom",{tag:"required",process:{}},Bn([ns("tag"),xs("styles",{}),xs("classes",[]),xs("attributes",{}),ms("value"),ms("innerHtml")])),ns("components"),ns("uid"),xs("events",{}),xs("apis",{}),es("eventOrder","eventOrder",(ui={[mr()]:["disabling",Ra,"toggling","typeaheadevents"],[lr()]:[Ra,"focusing","keying"],[vr()]:[Ra,"disabling","toggling","representing"],[Qs()]:[Ra,"representing","streaming","invalidating"],[Cr()]:[Ra,"representing","item-events","tooltipping"],[js()]:["focusing",Ra,"item-type-events"],[Hs()]:["focusing",Ra,"item-type-events"],[Ys()]:["item-type-events","tooltipping"],[ur()]:["receiving","reflecting","tooltipping"]},wn(x(ui))),Vn()),ms("domModification")]),Va=e=>e.events,za=(e,t)=>{const o=_t(e,t);return void 0===o||""===o?[]:o.split(" ")},La=e=>void 0!==e.dom.classList,Ha=e=>za(e,"class"),Pa=(e,t)=>((e,t,o)=>{const n=za(e,t).concat([o]);return Ct(e,t,n.join(" ")),!0})(e,"class",t),Ua=(e,t)=>((e,t,o)=>{const n=U(za(e,t),(e=>e!==o));return n.length>0?Ct(e,t,n.join(" ")):At(e,t),!1})(e,"class",t),Wa=(e,t)=>{La(e)?e.dom.classList.add(t):Pa(e,t)},ja=e=>{0===(La(e)?e.dom.classList:Ha(e)).length&&At(e,"class")},Ga=(e,t)=>{La(e)?e.dom.classList.remove(t):Ua(e,t),ja(e)},$a=(e,t)=>La(e)&&e.dom.classList.contains(t),qa=(e,t)=>{H(t,(t=>{Wa(e,t)}))},Ya=(e,t)=>{H(t,(t=>{Ga(e,t)}))},Xa=e=>La(e)?(e=>{const t=e.dom.classList,o=new Array(t.length);for(let e=0;e<t.length;e++){const n=t.item(e);null!==n&&(o[e]=n)}return o})(e):Ha(e),Ka=e=>e.dom.value,Ja=(e,t)=>{if(void 0===t)throw new Error("Value.set was undefined");e.dom.value=t},Za=(e,t,o)=>{o.fold((()=>Lo(e,t)),(e=>{Qe(e,t)||(No(e,t),Uo(e))}))},Qa=(e,t,o)=>{const n=L(t,o),s=lt(e);return H(s.slice(n.length),Uo),n},ei=(e,t,o,n)=>{const s=ct(e,t),r=n(o,s),a=((e,t,o)=>ct(e,t).map((e=>{if(o.exists((t=>!Qe(t,e)))){const t=o.map(We).getOr("span"),n=Ne(t);return No(e,n),n}return e})))(e,t,s);return Za(e,r.element,a),r},ti=(e,t)=>{const o=ae(e),n=ae(t),s=J(n,o),r=((e,o)=>{const n={},s={};return me(e,((e,o)=>!ve(t,o)||e!==t[o]),ue(n),ue(s)),{t:n,f:s}})(e).t;return{toRemove:s,toSet:r}},oi=(e,t)=>{const o=t.filter((t=>We(t)===e.tag&&!(e=>e.innerHtml.isSome()&&e.domChildren.length>0)(e)&&!(e=>ve(e.dom,Sa))(t))).bind((t=>((e,t)=>{try{const o=((e,t)=>{const{class:o,style:n,...s}=(e=>j(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}))(t),{toSet:r,toRemove:a}=ti(e.attributes,s),i=zt(t),{toSet:l,toRemove:c}=ti(e.styles,i),d=Xa(t),u=J(d,e.classes),m=J(e.classes,d);return H(a,(e=>At(t,e))),Ot(t,r),qa(t,m),Ya(t,u),H(c,(e=>Ht(t,e))),It(t,l),e.innerHtml.fold((()=>{const o=e.domChildren;((e,t)=>{Qa(e,t,((t,o)=>{const n=ct(e,o);return Za(e,t,n),t}))})(t,o)}),(e=>{oa(t,e)})),(()=>{const o=t,n=e.value.getOrUndefined();n!==Ka(o)&&Ja(o,null!=n?n:"")})(),t})(e,t);return A.some(o)}catch(e){return A.none()}})(e,t))).getOrThunk((()=>(e=>{const t=Ne(e.tag);Ot(t,e.attributes),qa(t,e.classes),It(t,e.styles),e.innerHtml.each((e=>oa(t,e)));const o=e.domChildren;return Ho(t,o),e.value.each((e=>{Ja(t,e)})),t})(e)));return pa(o,e.uid),o},ni=e=>{const t=(e=>{const t=be(e,"behaviours").getOr({});return Y(ae(t),(e=>{const o=t[e];return g(o)?[o.me]:[]}))})(e);return((e,t)=>((e,t)=>{const o=L(t,(e=>ys(e.name(),[ns("config"),xs("state",_a)]))),n=Yn("component.behaviours",Bn(o),e.behaviours).fold((t=>{throw new Error(Jn(t)+"\nComplete spec:\n"+JSON.stringify(e,null,2))}),w);return{list:t,data:ce(n,(e=>{const t=e.map((e=>({config:e.config,state:e.state.init(e.config)})));return x(t)}))}})(e,t))(e,t)},si=(e,t)=>{const o=()=>m,n=As(ya),s=Xn((e=>Yn("custom.definition",Na,e))(e)),r=ni(e),a=(e=>e.list)(r),i=(e=>e.data)(r),l=((e,t,o)=>{const n={...(s=e).dom,uid:s.uid,domChildren:L(s.components,(e=>e.element))};var s;const r=(e=>e.domModification.fold((()=>Aa({})),Aa))(e),a={"alloy.base.modification":r},i=t.length>0?((e,t,o,n)=>{const s={...t};H(o,(t=>{s[t.name()]=t.exhibit(e,n)}));const r=Ea(s,((e,t)=>({name:e,modification:t}))),a=e=>W(e,((e,t)=>({...t.modification,...e})),{}),i=W(r.classes,((e,t)=>t.modification.concat(e)),[]),l=a(r.attributes),c=a(r.styles);return Aa({classes:i,attributes:l,styles:c})})(o,a,t,n):r;return l=n,c=i,{...l,attributes:{...l.attributes,...c.attributes},styles:{...l.styles,...c.styles},classes:l.classes.concat(c.classes)};var l,c})(s,a,i),c=oi(l,t),d=((e,t,o)=>{const n={"alloy.base.behaviour":Va(e)};return((e,t,o,n)=>{const s=((e,t,o)=>{const n={...o,...Ba(t,e)};return Ea(n,Da)})(e,o,n);return Fa(s,t)})(o,e.eventOrder,t,n).getOrDie()})(s,a,i),u=As(s.components),m={uid:e.uid,getSystem:n.get,config:t=>{const o=i;return(p(o[t.name()])?o[t.name()]:()=>{throw new Error("Could not find "+t.name()+" in "+JSON.stringify(e,null,2))})()},hasConfigured:e=>p(i[e.name()]),spec:e,readState:e=>i[e]().map((e=>e.state.readState())).getOr("not enabled"),getApis:()=>s.apis,connect:e=>{n.set(e)},disconnect:()=>{n.set(va(o))},element:c,syncComponents:()=>{const e=lt(c),t=Y(e,(e=>n.get().getByDom(e).fold((()=>[]),Q)));u.set(t)},components:u.get,events:d};return m},ri=e=>{const t=Ve(e);return ai({element:t})},ai=e=>{const t=Kn("external.component",Dn([ns("element"),ms("uid")]),e),o=As(va()),n=t.uid.getOrThunk((()=>fa("external")));pa(t.element,n);const s={uid:n,getSystem:o.get,config:A.none,hasConfigured:T,connect:e=>{o.set(e)},disconnect:()=>{o.set(va((()=>s)))},getApis:()=>({}),element:t.element,spec:e,readState:x("No state"),syncComponents:b,components:x([]),events:{}};return ka(s)},ii=fa,li=(e,t)=>Ca(e).getOrThunk((()=>((e,t)=>{const{events:o,...n}=ba(e),s=((e,t)=>{const o=be(e,"components").getOr([]);return t.fold((()=>L(o,ci)),(e=>L(o,((t,o)=>li(t,ct(e,o))))))})(n,t),r={...n,events:{...ia,...o},components:s};return rn.value(si(r,t))})((e=>ve(e,"uid"))(e)?e:{uid:ii(""),...e},t).getOrDie())),ci=e=>li(e,A.none()),di=ka;var ui,mi=(e,t,o,n,s)=>e(o,n)?A.some(o):p(s)&&s(o)?A.none():t(o,n,s);const gi=(e,t,o)=>{let n=e.dom;const s=p(o)?o:T;for(;n.parentNode;){n=n.parentNode;const e=ze(n);if(t(e))return A.some(e);if(s(e))break}return A.none()},pi=(e,t,o)=>mi(((e,t)=>t(e)),gi,e,t,o),hi=(e,t,o)=>pi(e,t,o).isSome(),fi=(e,t,o)=>gi(e,(e=>Je(e,t)),o),bi=(e,t)=>((e,o)=>G(e.dom.childNodes,(e=>{return o=ze(e),Je(o,t);var o})).map(ze))(e),vi=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Ze(o)?A.none():A.from(o.querySelector(e)).map(ze)})(t,e),yi=(e,t,o)=>mi(((e,t)=>Je(e,t)),fi,e,t,o),xi="aria-controls",wi=()=>{const e=ca(xi);return{id:e,link:t=>{Ct(t,xi,e)},unlink:e=>{At(e,xi)}}},Si=(e,t)=>hi(t,(t=>Qe(t,e.element)),T)||((e,t)=>(e=>pi(e,(e=>{if(!$e(e))return!1;const t=_t(e,"id");return void 0!==t&&t.indexOf(xi)>-1})).bind((e=>{const t=_t(e,"id"),o=ft(e);return vi(o,`[${xi}="${t}"]`)})))(t).exists((t=>Si(e,t))))(e,t);var ki;!function(e){e[e.STOP=0]="STOP",e[e.NORMAL=1]="NORMAL",e[e.LOGGING=2]="LOGGING"}(ki||(ki={}));const Ci=As({}),Oi=["alloy/data/Fields","alloy/debugging/Debugging"],_i=(e,t,o)=>((e,t,o)=>{switch(be(Ci.get(),e).orThunk((()=>{const t=ae(Ci.get());return re(t,(t=>e.indexOf(t)>-1?A.some(Ci.get()[t]):A.none()))})).getOr(ki.NORMAL)){case ki.NORMAL:return o(Ti());case ki.LOGGING:{const n=((e,t)=>{const o=[],n=(new Date).getTime();return{logEventCut:(e,t,n)=>{o.push({outcome:"cut",target:t,purpose:n})},logEventStopped:(e,t,n)=>{o.push({outcome:"stopped",target:t,purpose:n})},logNoParent:(e,t,n)=>{o.push({outcome:"no-parent",target:t,purpose:n})},logEventNoHandlers:(e,t)=>{o.push({outcome:"no-handlers-left",target:t})},logEventResponse:(e,t,n)=>{o.push({outcome:"response",purpose:n,target:t})},write:()=>{const s=(new Date).getTime();R(["mousemove","mouseover","mouseout",vr()],e)||console.log(e,{event:e,time:s-n,target:t.dom,sequence:L(o,(e=>R(["cut","stopped","response"],e.outcome)?"{"+e.purpose+"} "+e.outcome+" at ("+sa(e.target)+")":e.outcome))})}}})(e,t),s=o(n);return n.write(),s}case ki.STOP:return!0}})(e,t,o),Ti=x({logEventCut:b,logEventStopped:b,logNoParent:b,logEventNoHandlers:b,logEventResponse:b,write:b}),Ei=x([ns("menu"),ns("selectedMenu")]),Ai=x([ns("item"),ns("selectedItem")]);x(Bn(Ai().concat(Ei())));const Mi=x(Bn(Ai())),Di=cs("initSize",[ns("numColumns"),ns("numRows")]),Bi=()=>cs("markers",[ns("backgroundMenu")].concat(Ei()).concat(Ai())),Ii=e=>cs("markers",L(e,ns)),Fi=(e,t,o)=>((()=>{const e=new Error;if(void 0!==e.stack){const t=e.stack.split("\n");G(t,(e=>e.indexOf("alloy")>0&&!N(Oi,(t=>e.indexOf(t)>-1)))).getOr("unknown")}})(),es(t,t,o,$n((e=>rn.value(((...t)=>e.apply(void 0,t))))))),Ri=e=>Fi(0,e,xn(b)),Ni=e=>Fi(0,e,xn(A.none)),Vi=e=>Fi(0,e,{tag:"required",process:{}}),zi=e=>Fi(0,e,{tag:"required",process:{}}),Li=(e,t)=>ts(e,x(t)),Hi=e=>ts(e,w),Pi=x(Di),Ui=(e,t,o,n,s,r,a,i=!1)=>({x:e,y:t,bubble:o,direction:n,placement:s,restriction:r,label:`${a}-${s}`,alwaysFit:i}),Wi=Ms([{southeast:[]},{southwest:[]},{northeast:[]},{northwest:[]},{south:[]},{north:[]},{east:[]},{west:[]}]),ji=Wi.southeast,Gi=Wi.southwest,$i=Wi.northeast,qi=Wi.northwest,Yi=Wi.south,Xi=Wi.north,Ki=Wi.east,Ji=Wi.west,Zi=(e,t,o,n)=>{const s=e+t;return s>n?o:s<o?n:s},Qi=(e,t,o)=>Math.min(Math.max(e,t),o),el=(e,t)=>Z(["left","right","top","bottom"],(o=>be(t,o).map((t=>((e,t)=>{switch(t){case 1:return e.x;case 0:return e.x+e.width;case 2:return e.y;case 3:return e.y+e.height}})(e,t))))),tl="layout",ol=e=>e.x,nl=(e,t)=>e.x+e.width/2-t.width/2,sl=(e,t)=>e.x+e.width-t.width,rl=(e,t)=>e.y-t.height,al=e=>e.y+e.height,il=(e,t)=>e.y+e.height/2-t.height/2,ll=(e,t,o)=>Ui(ol(e),al(e),o.southeast(),ji(),"southeast",el(e,{left:1,top:3}),tl),cl=(e,t,o)=>Ui(sl(e,t),al(e),o.southwest(),Gi(),"southwest",el(e,{right:0,top:3}),tl),dl=(e,t,o)=>Ui(ol(e),rl(e,t),o.northeast(),$i(),"northeast",el(e,{left:1,bottom:2}),tl),ul=(e,t,o)=>Ui(sl(e,t),rl(e,t),o.northwest(),qi(),"northwest",el(e,{right:0,bottom:2}),tl),ml=(e,t,o)=>Ui(nl(e,t),rl(e,t),o.north(),Xi(),"north",el(e,{bottom:2}),tl),gl=(e,t,o)=>Ui(nl(e,t),al(e),o.south(),Yi(),"south",el(e,{top:3}),tl),pl=(e,t,o)=>Ui((e=>e.x+e.width)(e),il(e,t),o.east(),Ki(),"east",el(e,{left:0}),tl),hl=(e,t,o)=>Ui(((e,t)=>e.x-t.width)(e,t),il(e,t),o.west(),Ji(),"west",el(e,{right:1}),tl),fl=()=>[ll,cl,dl,ul,gl,ml,pl,hl],bl=()=>[cl,ll,ul,dl,gl,ml,pl,hl],vl=()=>[dl,ul,ll,cl,ml,gl],yl=()=>[ul,dl,cl,ll,ml,gl],xl=()=>[ll,cl,dl,ul,gl,ml],wl=()=>[cl,ll,ul,dl,gl,ml];var Sl=Object.freeze({__proto__:null,events:e=>Hr([Wr(ur(),((t,o)=>{const n=e.channels,s=ae(n),r=o,a=((e,t)=>t.universal?e:U(e,(e=>R(t.channels,e))))(s,r);H(a,(e=>{const o=n[e],s=o.schema,a=Kn("channel["+e+"] data\nReceiver: "+sa(t.element),s,r.data);o.onReceive(t,a)}))}))])}),kl=[ss("channels",qn(rn.value,Dn([Vi("onReceive"),xs("schema",Vn())])))];const Cl=(e,t,o)=>Qr(((n,s)=>{o(n,e,t)})),Ol=e=>({key:e,value:void 0}),_l=(e,t,o,n,s,r,a)=>{const i=e=>ye(e,o)?e[o]():A.none(),l=ce(s,((e,t)=>((e,t,o)=>((e,t,o)=>{const n=o.toString(),s=n.indexOf(")")+1,r=n.indexOf("("),a=n.substring(r+1,s-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:xa(a.slice(0,1).concat(a.slice(3)))}),e})(((n,...s)=>{const r=[n].concat(s);return n.config({name:x(e)}).fold((()=>{throw new Error("We could not find any behaviour configuration for: "+e+". Using API: "+o)}),(e=>{const o=Array.prototype.slice.call(r,1);return t.apply(void 0,[n,e.config,e.state].concat(o))}))}),o,t))(o,e,t))),c={...ce(r,((e,t)=>wa(e,t))),...l,revoke:k(Ol,o),config:t=>{const n=Kn(o+"-config",e,t);return{key:o,value:{config:n,me:c,configAsRaw:eo((()=>Kn(o+"-config",e,t))),initialConfig:t,state:a}}},schema:x(t),exhibit:(e,t)=>Se(i(e),be(n,"exhibit"),((e,o)=>o(t,e.config,e.state))).getOrThunk((()=>Aa({}))),name:x(o),handlers:e=>i(e).map((e=>be(n,"events").getOr((()=>({})))(e.config,e.state))).getOr({})};return c},Tl=e=>Bs(e),El=Dn([ns("fields"),ns("name"),xs("active",{}),xs("apis",{}),xs("state",_a),xs("extra",{})]),Al=e=>{const t=Kn("Creating behaviour: "+e.name,El,e);return((e,t,o,n,s,r)=>{const a=Dn(e),i=ys(t,[("config",l=e,gs("config",Dn(l)))]);var l;return _l(a,i,t,o,n,s,r)})(t.fields,t.name,t.active,t.apis,t.extra,t.state)},Ml=Dn([ns("branchKey"),ns("branches"),ns("name"),xs("active",{}),xs("apis",{}),xs("state",_a),xs("extra",{})]),Dl=e=>{const t=Kn("Creating behaviour: "+e.name,Ml,e);return((e,t,o,n,s,r)=>{const a=e,i=ys(t,[gs("config",e)]);return _l(a,i,t,o,n,s,r)})(Zn(t.branchKey,t.branches),t.name,t.active,t.apis,t.extra,t.state)},Bl=x(void 0),Il=Al({fields:kl,name:"receiving",active:Sl});var Fl=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({classes:[],styles:t.useFixed()?{}:{position:"relative"}})});const Rl=(e,t=!1)=>e.dom.focus({preventScroll:t}),Nl=e=>e.dom.blur(),Vl=e=>{const t=ft(e).dom;return e.dom===t.activeElement},zl=(e=qo())=>A.from(e.dom.activeElement).map(ze),Ll=e=>zl(ft(e)).filter((t=>e.dom.contains(t.dom))),Hl=(e,t)=>{const o=ft(t),n=zl(o).bind((e=>{const o=t=>Qe(e,t);return o(t)?A.some(t):((e,t)=>{const o=e=>{for(let n=0;n<e.childNodes.length;n++){const s=ze(e.childNodes[n]);if(t(s))return A.some(s);const r=o(e.childNodes[n]);if(r.isSome())return r}return A.none()};return o(e.dom)})(t,o)})),s=e(t);return n.each((e=>{zl(o).filter((t=>Qe(t,e))).fold((()=>{Rl(e)}),b)})),s},Pl=(e,t,o,n,s)=>{const r=e=>e+"px";return{position:e,left:t.map(r),top:o.map(r),right:n.map(r),bottom:s.map(r)}},Ul=(e,t)=>{Ft(e,(e=>({...e,position:A.some(e.position)}))(t))},Wl=Ms([{none:[]},{relative:["x","y","width","height"]},{fixed:["x","y","width","height"]}]),jl=(e,t,o,n,s,r)=>{const a=t.rect,i=a.x-o,l=a.y-n,c=s-(i+a.width),d=r-(l+a.height),u=A.some(i),m=A.some(l),g=A.some(c),p=A.some(d),h=A.none();return t.direction.fold((()=>Pl(e,u,m,h,h)),(()=>Pl(e,h,m,g,h)),(()=>Pl(e,u,h,h,p)),(()=>Pl(e,h,h,g,p)),(()=>Pl(e,u,m,h,h)),(()=>Pl(e,u,h,h,p)),(()=>Pl(e,u,m,h,h)),(()=>Pl(e,h,m,g,h)))},Gl=(e,t)=>e.fold((()=>{const e=t.rect;return Pl("absolute",A.some(e.x),A.some(e.y),A.none(),A.none())}),((e,o,n,s)=>jl("absolute",t,e,o,n,s)),((e,o,n,s)=>jl("fixed",t,e,o,n,s))),$l=(e,t)=>{const o=k(Ko,t),n=e.fold(o,o,(()=>{const e=Wo();return Ko(t).translate(-e.left,-e.top)})),s=Qt(t),r=Gt(t);return Jo(n.left,n.top,s,r)},ql=(e,t)=>t.fold((()=>e.fold(tn,tn,Jo)),(t=>e.fold(x(t),x(t),(()=>{const o=Yl(e,t.x,t.y);return Jo(o.left,o.top,t.width,t.height)})))),Yl=(e,t,o)=>{const n=qt(t,o);return e.fold(x(n),x(n),(()=>{const e=Wo();return n.translate(-e.left,-e.top)}))};Wl.none;const Xl=Wl.relative,Kl=Wl.fixed,Jl="data-alloy-placement",Zl=e=>Tt(e,Jl),Ql=Ms([{fit:["reposition"]},{nofit:["reposition","visibleW","visibleH","isVisible"]}]),ec=(e,t,o,n)=>{const s=e.bubble,r=s.offset,a=((e,t,o)=>{const n=(n,s)=>t[n].map((t=>{const r="top"===n||"bottom"===n,a=r?o.top:o.left,i=("left"===n||"top"===n?Math.max:Math.min)(t,s)+a;return r?Qi(i,e.y,e.bottom):Qi(i,e.x,e.right)})).getOr(s),s=n("left",e.x),r=n("top",e.y),a=n("right",e.right),i=n("bottom",e.bottom);return Jo(s,r,a-s,i-r)})(n,e.restriction,r),i=e.x+r.left,l=e.y+r.top,c=Jo(i,l,t,o),{originInBounds:d,sizeInBounds:u,visibleW:m,visibleH:g}=((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,right:l,bottom:c,width:d,height:u}=e;return{originInBounds:a>=o&&a<=s&&i>=n&&i<=r,sizeInBounds:l<=s&&l>=o&&c<=r&&c>=n,visibleW:Math.min(d,a>=o?s-a:l-o),visibleH:Math.min(u,i>=n?r-i:c-n)}})(c,a),p=d&&u,h=p?c:((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,width:l,height:c}=e,d=Math.max(o,s-l),u=Math.max(n,r-c),m=Qi(a,o,d),g=Qi(i,n,u),p=Math.min(m+l,s)-m,h=Math.min(g+c,r)-g;return Jo(m,g,p,h)})(c,a),f=h.width>0&&h.height>0,{maxWidth:b,maxHeight:v}=((e,t,o)=>{const n=x(t.bottom-o.y),s=x(o.bottom-t.y),r=((e,t,o,n)=>e.fold(t,t,n,n,t,n,o,o))(e,s,s,n),a=x(t.right-o.x),i=x(o.right-t.x),l=((e,t,o,n)=>e.fold(t,n,t,n,o,o,t,n))(e,i,i,a);return{maxWidth:l,maxHeight:r}})(e.direction,h,n),y={rect:h,maxHeight:v,maxWidth:b,direction:e.direction,placement:e.placement,classes:{on:s.classesOn,off:s.classesOff},layout:e.label,testY:l};return p||e.alwaysFit?Ql.fit(y):Ql.nofit(y,m,g,f)},tc=e=>{const t=As(A.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(A.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(A.some(e))}}},oc=()=>tc((e=>e.unbind())),nc=()=>{const e=tc(b);return{...e,on:t=>e.get().each(t)}},sc=E,rc=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!1))(e,t,sc,o),ac=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!0))(e,t,sc,o),ic=Io,lc=["top","bottom","right","left"],cc="data-alloy-transition-timer",dc=(e,t,o,n,s,a)=>{const i=((e,t,o)=>o.exists((o=>{const n=e.mode;return"all"===n||o[n]!==t[n]})))(n,s,a);if(i||((e,t)=>((e,t)=>X(t,(t=>$a(e,t))))(e,t.classes))(e,n)){Bt(e,"position",o.position);const a=$l(t,e),l=Gl(t,{...s,rect:a}),c=Z(lc,(e=>l[e]));((e,t)=>{const o=e=>parseFloat(e).toFixed(3);return he(t,((t,n)=>!((e,t,o=S)=>Se(e,t,o).getOr(e.isNone()&&t.isNone()))(e[n].map(o),t.map(o)))).isSome()})(o,c)&&(Ft(e,c),i&&((e,t)=>{qa(e,t.classes),Tt(e,cc).each((t=>{clearTimeout(parseInt(t,10)),At(e,cc)})),((e,t)=>{const o=oc(),n=oc();let s;const a=t=>{var o;const n=null!==(o=t.raw.pseudoElement)&&void 0!==o?o:"";return Qe(t.target,e)&&Be(n)&&R(lc,t.raw.propertyName)},i=r=>{if(m(r)||a(r)){o.clear(),n.clear();const a=null==r?void 0:r.raw.type;(m(a)||a===nr())&&(clearTimeout(s),At(e,cc),Ya(e,t.classes))}},l=rc(e,sr(),(t=>{a(t)&&(l.unbind(),o.set(rc(e,nr(),i)),n.set(rc(e,or(),i)))})),c=(e=>{const t=t=>{const o=Rt(e,t).split(/\s*,\s*/);return U(o,De)},o=e=>{if(r(e)&&/^[\d.]+/.test(e)){const t=parseFloat(e);return Ae(e,"ms")?t:1e3*t}return 0},n=t("transition-delay"),s=t("transition-duration");return j(s,((e,t,s)=>{const r=o(n[s])+o(t);return Math.max(e,r)}),0)})(e);requestAnimationFrame((()=>{s=setTimeout(i,c+17),Ct(e,cc,s)}))})(e,t)})(e,n),Pt(e))}else Ya(e,n.classes)},uc=(e,t)=>{((e,t)=>{const o=Wt.max(e,t,["margin-top","border-top-width","padding-top","padding-bottom","border-bottom-width","margin-bottom"]);Bt(e,"max-height",o+"px")})(e,Math.floor(t))},mc=x(((e,t)=>{uc(e,t),It(e,{"overflow-x":"hidden","overflow-y":"auto"})})),gc=x(((e,t)=>{uc(e,t)})),pc=(e,t,o)=>void 0===e[t]?o:e[t],hc=(e,t,o,n)=>{const s=((e,t,o,n)=>{Ht(t,"max-height"),Ht(t,"max-width");const s={width:Qt(r=t),height:Gt(r)};var r;return((e,t,o,n,s,r)=>{const a=n.width,i=n.height,l=(t,l,c,d,u)=>{const m=t(o,n,s,e,r),g=ec(m,a,i,r);return g.fold(x(g),((e,t,o,n)=>(u===n?o>d||t>c:!u&&n)?g:Ql.nofit(l,c,d,u)))};return j(t,((e,t)=>{const o=k(l,t);return e.fold(x(e),o)}),Ql.nofit({rect:o,maxHeight:n.height,maxWidth:n.width,direction:ji(),placement:"southeast",classes:{on:[],off:[]},layout:"none",testY:o.y},-1,-1,!1)).fold(w,w)})(t,n.preference,e,s,o,n.bounds)})(e,t,o,n);return((e,t,o)=>{const n=Gl(o.origin,t);o.transition.each((s=>{dc(e,o.origin,n,s,t,o.lastPlacement)})),Ul(e,n)})(t,s,n),((e,t)=>{((e,t)=>{Ct(e,Jl,t)})(e,t.placement)})(t,s),((e,t)=>{const o=t.classes;Ya(e,o.off),qa(e,o.on)})(t,s),((e,t,o)=>{(0,o.maxHeightFunction)(e,t.maxHeight)})(t,s,n),((e,t,o)=>{(0,o.maxWidthFunction)(e,t.maxWidth)})(t,s,n),{layout:s.layout,placement:s.placement}},fc=["valignCentre","alignLeft","alignRight","alignCentre","top","bottom","left","right","inset"],bc=(e,t,o,n=1)=>{const s=e*n,r=t*n,a=e=>be(o,e).getOr([]),i=(e,t,o)=>{const n=J(fc,o);return{offset:qt(e,t),classesOn:Y(o,a),classesOff:Y(n,a)}};return{southeast:()=>i(-e,t,["top","alignLeft"]),southwest:()=>i(e,t,["top","alignRight"]),south:()=>i(-e/2,t,["top","alignCentre"]),northeast:()=>i(-e,-t,["bottom","alignLeft"]),northwest:()=>i(e,-t,["bottom","alignRight"]),north:()=>i(-e/2,-t,["bottom","alignCentre"]),east:()=>i(e,-t/2,["valignCentre","left"]),west:()=>i(-e,-t/2,["valignCentre","right"]),insetNortheast:()=>i(s,r,["top","alignLeft","inset"]),insetNorthwest:()=>i(-s,r,["top","alignRight","inset"]),insetNorth:()=>i(-s/2,r,["top","alignCentre","inset"]),insetSoutheast:()=>i(s,-r,["bottom","alignLeft","inset"]),insetSouthwest:()=>i(-s,-r,["bottom","alignRight","inset"]),insetSouth:()=>i(-s/2,-r,["bottom","alignCentre","inset"]),insetEast:()=>i(-s,-r/2,["valignCentre","right","inset"]),insetWest:()=>i(s,-r/2,["valignCentre","left","inset"])}},vc=()=>bc(0,0,{}),yc=w,xc=(e,t)=>o=>"rtl"===wc(o)?t:e,wc=e=>"rtl"===Rt(e,"direction")?"rtl":"ltr";var Sc;!function(e){e.TopToBottom="toptobottom",e.BottomToTop="bottomtotop"}(Sc||(Sc={}));const kc="data-alloy-vertical-dir",Cc=e=>hi(e,(e=>$e(e)&&_t(e,"data-alloy-vertical-dir")===Sc.BottomToTop)),Oc=()=>ys("layouts",[ns("onLtr"),ns("onRtl"),ms("onBottomLtr"),ms("onBottomRtl")]),_c=(e,t,o,n,s,r,a)=>{const i=a.map(Cc).getOr(!1),l=t.layouts.map((t=>t.onLtr(e))),c=t.layouts.map((t=>t.onRtl(e))),d=i?t.layouts.bind((t=>t.onBottomLtr.map((t=>t(e))))).or(l).getOr(s):l.getOr(o),u=i?t.layouts.bind((t=>t.onBottomRtl.map((t=>t(e))))).or(c).getOr(r):c.getOr(n);return xc(d,u)(e)};var Tc=[ns("hotspot"),ms("bubble"),xs("overrides",{}),Oc(),Li("placement",((e,t,o)=>{const n=t.hotspot,s=$l(o,n.element),r=_c(e.element,t,xl(),wl(),vl(),yl(),A.some(t.hotspot.element));return A.some(yc({anchorBox:s,bubble:t.bubble.getOr(vc()),overrides:t.overrides,layouts:r}))}))],Ec=[ns("x"),ns("y"),xs("height",0),xs("width",0),xs("bubble",vc()),xs("overrides",{}),Oc(),Li("placement",((e,t,o)=>{const n=Yl(o,t.x,t.y),s=Jo(n.left,n.top,t.width,t.height),r=_c(e.element,t,fl(),bl(),fl(),bl(),A.none());return A.some(yc({anchorBox:s,bubble:t.bubble,overrides:t.overrides,layouts:r}))}))];const Ac=Ms([{screen:["point"]},{absolute:["point","scrollLeft","scrollTop"]}]),Mc=e=>e.fold(w,((e,t,o)=>e.translate(-t,-o))),Dc=e=>e.fold(w,w),Bc=e=>j(e,((e,t)=>e.translate(t.left,t.top)),qt(0,0)),Ic=e=>{const t=L(e,Dc);return Bc(t)},Fc=Ac.screen,Rc=Ac.absolute,Nc=(e,t,o)=>{const n=tt(e.element),s=Wo(n),r=((e,t,o)=>{const n=st(o.root).dom;return A.from(n.frameElement).map(ze).filter((t=>{const o=tt(t),n=tt(e.element);return Qe(o,n)})).map(Xt)})(e,0,o).getOr(s);return Rc(r,s.left,s.top)},Vc=(e,t,o,n)=>{const s=Fc(qt(e,t));return A.some(((e,t,o)=>({point:e,width:t,height:o}))(s,o,n))},zc=(e,t,o,n,s)=>e.map((e=>{const r=[t,e.point],a=(i=()=>Ic(r),l=()=>Ic(r),c=()=>(e=>{const t=L(e,Mc);return Bc(t)})(r),n.fold(i,l,c));var i,l,c;const d=(p=a.left,h=a.top,f=e.width,b=e.height,{x:p,y:h,width:f,height:b}),u=o.showAbove?vl():xl(),m=o.showAbove?yl():wl(),g=_c(s,o,u,m,u,m,A.none());var p,h,f,b;return yc({anchorBox:d,bubble:o.bubble.getOr(vc()),overrides:o.overrides,layouts:g})}));var Lc=[ns("node"),ns("root"),ms("bubble"),Oc(),xs("overrides",{}),xs("showAbove",!1),Li("placement",((e,t,o)=>{const n=Nc(e,0,t);return t.node.filter(xt).bind((s=>{const r=s.dom.getBoundingClientRect(),a=Vc(r.left,r.top,r.width,r.height),i=t.node.getOr(e.element);return zc(a,n,t,o,i)}))}))];const Hc=(e,t,o,n)=>({start:e,soffset:t,finish:o,foffset:n}),Pc=Ms([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Uc=(Pc.before,Pc.on,Pc.after,e=>e.fold(w,w,w)),Wc=Ms([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),jc={domRange:Wc.domRange,relative:Wc.relative,exact:Wc.exact,exactFromRange:e=>Wc.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>ze(e.startContainer),relative:(e,t)=>Uc(e),exact:(e,t,o,n)=>e}))(e);return st(t)},range:Hc},Gc=(e,t,o)=>{const n=e.document.createRange();var s;return s=n,t.fold((e=>{s.setStartBefore(e.dom)}),((e,t)=>{s.setStart(e.dom,t)}),(e=>{s.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,o)=>{e.setEnd(t.dom,o)}),(t=>{e.setEndAfter(t.dom)}))})(n,o),n},$c=(e,t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},qc=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom,width:e.width,height:e.height}),Yc=Ms([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Xc=(e,t,o)=>t(ze(o.startContainer),o.startOffset,ze(o.endContainer),o.endOffset),Kc=(e,t)=>((e,t)=>{const o=((e,t)=>t.match({domRange:e=>({ltr:x(e),rtl:A.none}),relative:(t,o)=>({ltr:eo((()=>Gc(e,t,o))),rtl:eo((()=>A.some(Gc(e,o,t))))}),exact:(t,o,n,s)=>({ltr:eo((()=>$c(e,t,o,n,s))),rtl:eo((()=>A.some($c(e,n,s,t,o))))})}))(e,t);return((e,t)=>{const o=t.ltr();return o.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>Yc.rtl(ze(e.endContainer),e.endOffset,ze(e.startContainer),e.startOffset))).getOrThunk((()=>Xc(0,Yc.ltr,o))):Xc(0,Yc.ltr,o)})(0,o)})(e,t).match({ltr:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},rtl:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(n.dom,s),r.setEnd(t.dom,o),r}});Yc.ltr,Yc.rtl;const Jc=(e,t,o)=>U(((e,t)=>{const o=p(t)?t:T;let n=e.dom;const s=[];for(;null!==n.parentNode&&void 0!==n.parentNode;){const e=n.parentNode,t=ze(e);if(s.push(t),!0===o(t))break;n=e}return s})(e,o),t),Zc=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Ze(o)?[]:L(o.querySelectorAll(e),ze)})(t,e),Qc=e=>{if(e.rangeCount>0){const t=e.getRangeAt(0),o=e.getRangeAt(e.rangeCount-1);return A.some(Hc(ze(t.startContainer),t.startOffset,ze(o.endContainer),o.endOffset))}return A.none()},ed=e=>{if(null===e.anchorNode||null===e.focusNode)return Qc(e);{const t=ze(e.anchorNode),o=ze(e.focusNode);return((e,t,o,n)=>{const s=((e,t,o,n)=>{const s=tt(e).dom.createRange();return s.setStart(e.dom,t),s.setEnd(o.dom,n),s})(e,t,o,n),r=Qe(e,o)&&t===n;return s.collapsed&&!r})(t,e.anchorOffset,o,e.focusOffset)?A.some(Hc(t,e.anchorOffset,o,e.focusOffset)):Qc(e)}},td=(e,t)=>(e=>{const t=e.getClientRects(),o=t.length>0?t[0]:e.getBoundingClientRect();return o.width>0||o.height>0?A.some(o).map(qc):A.none()})(Kc(e,t)),od=((e,t)=>{const o=t=>e(t)?A.from(t.dom.nodeValue):A.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(qe),nd=(e,t)=>({element:e,offset:t}),sd=(e,t)=>qe(e)?nd(e,t):((e,t)=>{const o=lt(e);if(0===o.length)return nd(e,t);if(t<o.length)return nd(o[t],0);{const e=o[o.length-1],t=qe(e)?(e=>od.get(e))(e).length:lt(e).length;return nd(e,t)}})(e,t),rd=e=>void 0!==e.foffset,ad=(e,t)=>t.getSelection.getOrThunk((()=>()=>(e=>(e=>A.from(e.getSelection()))(e).filter((e=>e.rangeCount>0)).bind(ed))(e)))().map((e=>{if(rd(e)){const t=sd(e.start,e.soffset),o=sd(e.finish,e.foffset);return jc.range(t.element,t.offset,o.element,o.offset)}return e}));var id=[ms("getSelection"),ns("root"),ms("bubble"),Oc(),xs("overrides",{}),xs("showAbove",!1),Li("placement",((e,t,o)=>{const n=st(t.root).dom,s=Nc(e,0,t),r=ad(n,t).bind((e=>{if(rd(e)){const t=((e,t)=>(e=>{const t=e.getBoundingClientRect();return t.width>0||t.height>0?A.some(t).map(qc):A.none()})(Kc(e,t)))(n,jc.exactFromRange(e)).orThunk((()=>{const t=Ve("\ufeff");No(e.start,t);const o=td(n,jc.exact(t,0,t,1));return Uo(t),o}));return t.bind((e=>Vc(e.left,e.top,e.width,e.height)))}{const t=ce(e,(e=>e.dom.getBoundingClientRect())),o={left:Math.min(t.firstCell.left,t.lastCell.left),right:Math.max(t.firstCell.right,t.lastCell.right),top:Math.min(t.firstCell.top,t.lastCell.top),bottom:Math.max(t.firstCell.bottom,t.lastCell.bottom)};return Vc(o.left,o.top,o.right-o.left,o.bottom-o.top)}})),a=ad(n,t).bind((e=>rd(e)?$e(e.start)?A.some(e.start):at(e.start):A.some(e.firstCell))).getOr(e.element);return zc(r,s,t,o,a)}))];const ld="link-layout",cd=e=>e.x+e.width,dd=(e,t)=>e.x-t.width,ud=(e,t)=>e.y-t.height+e.height,md=e=>e.y,gd=(e,t,o)=>Ui(cd(e),md(e),o.southeast(),ji(),"southeast",el(e,{left:0,top:2}),ld),pd=(e,t,o)=>Ui(dd(e,t),md(e),o.southwest(),Gi(),"southwest",el(e,{right:1,top:2}),ld),hd=(e,t,o)=>Ui(cd(e),ud(e,t),o.northeast(),$i(),"northeast",el(e,{left:0,bottom:3}),ld),fd=(e,t,o)=>Ui(dd(e,t),ud(e,t),o.northwest(),qi(),"northwest",el(e,{right:1,bottom:3}),ld),bd=()=>[gd,pd,hd,fd],vd=()=>[pd,gd,fd,hd];var yd=[ns("item"),Oc(),xs("overrides",{}),Li("placement",((e,t,o)=>{const n=$l(o,t.item.element),s=_c(e.element,t,bd(),vd(),bd(),vd(),A.none());return A.some(yc({anchorBox:n,bubble:vc(),overrides:t.overrides,layouts:s}))}))],xd=Zn("type",{selection:id,node:Lc,hotspot:Tc,submenu:yd,makeshift:Ec});const wd=[us("classes",Hn),Cs("mode","all",["all","layout","placement"])],Sd=[xs("useFixed",T),ms("getBounds")],kd=[ss("anchor",xd),ys("transition",wd)],Cd=(e,t,o,n,s,r)=>{const a=Kn("placement.info",Bn(kd),s),i=a.anchor,l=n.element,c=o.get(n.uid);Hl((()=>{Bt(l,"position","fixed");const s=Vt(l,"visibility");Bt(l,"visibility","hidden");const d=t.useFixed()?(()=>{const e=document.documentElement;return Kl(0,0,e.clientWidth,e.clientHeight)})():(e=>{const t=Xt(e.element),o=e.element.dom.getBoundingClientRect();return Xl(t.left,t.top,o.width,o.height)})(e);i.placement(e,i,d).each((e=>{const s=r.orThunk((()=>t.getBounds.map(_))),i=((e,t,o,n,s,r)=>((e,t,o,n,s,r,a,i)=>{const l=pc(a,"maxHeightFunction",mc()),c=pc(a,"maxWidthFunction",b),d=e.anchorBox,u=e.origin,m={bounds:ql(u,r),origin:u,preference:n,maxHeightFunction:l,maxWidthFunction:c,lastPlacement:s,transition:i};return hc(d,t,o,m)})(((e,t)=>((e,t)=>({anchorBox:e,origin:t}))(e,t))(t.anchorBox,e),n.element,t.bubble,t.layouts,s,o,t.overrides,r))(d,e,s,n,c,a.transition);o.set(n.uid,i)})),s.fold((()=>{Ht(l,"visibility")}),(e=>{Bt(l,"visibility",e)})),Vt(l,"left").isNone()&&Vt(l,"top").isNone()&&Vt(l,"right").isNone()&&Vt(l,"bottom").isNone()&&xe(Vt(l,"position"),"fixed")&&Ht(l,"position")}),l)};var Od=Object.freeze({__proto__:null,position:(e,t,o,n,s)=>{const r=A.none();Cd(e,t,o,n,s,r)},positionWithinBounds:Cd,getMode:(e,t,o)=>t.useFixed()?"fixed":"absolute",reset:(e,t,o,n)=>{const s=n.element;H(["position","left","right","top","bottom"],(e=>Ht(s,e))),(e=>{At(e,Jl)})(s),o.clear(n.uid)}});const _d=Al({fields:Sd,name:"positioning",active:Fl,apis:Od,state:Object.freeze({__proto__:null,init:()=>{let e={};return Ta({readState:()=>e,clear:t=>{g(t)?delete e[t]:e={}},set:(t,o)=>{e[t]=o},get:t=>be(e,t)})}})}),Td=e=>e.getSystem().isConnected(),Ed=e=>{Fr(e,Cr());const t=e.components();H(t,Ed)},Ad=e=>{const t=e.components();H(t,Ad),Fr(e,kr())},Md=(e,t)=>{e.getSystem().addToWorld(t),xt(e.element)&&Ad(t)},Dd=e=>{Ed(e),e.getSystem().removeFromWorld(e)},Bd=(e,t)=>{Lo(e.element,t.element)},Id=(e,t)=>{Fd(e,t,Lo)},Fd=(e,t,o)=>{e.getSystem().addToWorld(t),o(e.element,t.element),xt(e.element)&&Ad(t),e.syncComponents()},Rd=e=>{Ed(e),Uo(e.element),e.getSystem().removeFromWorld(e)},Nd=e=>{const t=rt(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()));Rd(e),t.each((e=>{e.syncComponents()}))},Vd=e=>{const t=e.components();H(t,Rd),Po(e.element),e.syncComponents()},zd=(e,t)=>{Hd(e,t,Lo)},Ld=(e,t)=>{Hd(e,t,Vo)},Hd=(e,t,o)=>{o(e,t.element);const n=lt(t.element);H(n,(e=>{t.getByDom(e).each(Ad)}))},Pd=e=>{const t=lt(e.element);H(t,(t=>{e.getByDom(t).each(Ed)})),Uo(e.element)},Ud=(e,t,o,n)=>{o.get().each((t=>{Vd(e)}));const s=t.getAttachPoint(e);Id(s,e);const r=e.getSystem().build(n);return Id(e,r),o.set(r),r},Wd=(e,t,o,n)=>{const s=Ud(e,t,o,n);return t.onOpen(e,s),s},jd=(e,t,o)=>{o.get().each((n=>{Vd(e),Nd(e),t.onClose(e,n),o.clear()}))},Gd=(e,t,o)=>o.isOpen(),$d=(e,t,o)=>{const n=t.getAttachPoint(e);Bt(e.element,"position",_d.getMode(n)),((e,t,o,n)=>{Vt(e.element,t).fold((()=>{At(e.element,o)}),(t=>{Ct(e.element,o,t)})),Bt(e.element,t,"hidden")})(e,"visibility",t.cloakVisibilityAttr)},qd=(e,t,o)=>{(e=>N(["top","left","right","bottom"],(t=>Vt(e,t).isSome())))(e.element)||Ht(e.element,"position"),((e,t,o)=>{Tt(e.element,o).fold((()=>Ht(e.element,t)),(o=>Bt(e.element,t,o)))})(e,"visibility",t.cloakVisibilityAttr)};var Yd=Object.freeze({__proto__:null,cloak:$d,decloak:qd,open:Wd,openWhileCloaked:(e,t,o,n,s)=>{$d(e,t),Wd(e,t,o,n),s(),qd(e,t)},close:jd,isOpen:Gd,isPartOf:(e,t,o,n)=>Gd(0,0,o)&&o.get().exists((o=>t.isPartOf(e,o,n))),getState:(e,t,o)=>o.get(),setContent:(e,t,o,n)=>o.get().map((()=>Ud(e,t,o,n)))}),Xd=Object.freeze({__proto__:null,events:(e,t)=>Hr([Wr(fr(),((o,n)=>{jd(o,e,t)}))])}),Kd=[Ri("onOpen"),Ri("onClose"),ns("isPartOf"),ns("getAttachPoint"),xs("cloakVisibilityAttr","data-precloak-visibility")],Jd=Object.freeze({__proto__:null,init:()=>{const e=nc(),t=x("not-implemented");return Ta({readState:t,isOpen:e.isSet,clear:e.clear,set:e.set,get:e.get})}});const Zd=Al({fields:Kd,name:"sandboxing",active:Xd,apis:Yd,state:Jd}),Qd=x("dismiss.popups"),eu=x("reposition.popups"),tu=x("mouse.released"),ou=Dn([xs("isExtraPart",T),ys("fireEventInstead",[xs("event",Or())])]),nu=e=>{const t=Kn("Dismissal",ou,e);return{[Qd()]:{schema:Dn([ns("target")]),onReceive:(e,o)=>{Zd.isOpen(e)&&(Zd.isPartOf(e,o.target)||t.isExtraPart(e,o.target)||t.fireEventInstead.fold((()=>Zd.close(e)),(t=>Fr(e,t.event))))}}}},su=Dn([ys("fireEventInstead",[xs("event",_r())]),ls("doReposition")]),ru=e=>{const t=Kn("Reposition",su,e);return{[eu()]:{onReceive:e=>{Zd.isOpen(e)&&t.fireEventInstead.fold((()=>t.doReposition(e)),(t=>Fr(e,t.event)))}}}},au=(e,t,o)=>{t.store.manager.onLoad(e,t,o)},iu=(e,t,o)=>{t.store.manager.onUnload(e,t,o)};var lu=Object.freeze({__proto__:null,onLoad:au,onUnload:iu,setValue:(e,t,o,n)=>{t.store.manager.setValue(e,t,o,n)},getValue:(e,t,o)=>t.store.manager.getValue(e,t,o),getState:(e,t,o)=>o}),cu=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.resetOnDom?[Jr(((o,n)=>{au(o,e,t)})),Zr(((o,n)=>{iu(o,e,t)}))]:[Cl(e,t,au)];return Hr(o)}});const du=()=>{const e=As(null);return Ta({set:e.set,get:e.get,isNotSet:()=>null===e.get(),clear:()=>{e.set(null)},readState:()=>({mode:"memory",value:e.get()})})},uu=()=>{const e=As({}),t=As({});return Ta({readState:()=>({mode:"dataset",dataByValue:e.get(),dataByText:t.get()}),lookup:o=>be(e.get(),o).orThunk((()=>be(t.get(),o))),update:o=>{const n=e.get(),s=t.get(),r={},a={};H(o,(e=>{r[e.value]=e,be(e,"meta").each((t=>{be(t,"text").each((t=>{a[t]=e}))}))})),e.set({...n,...r}),t.set({...s,...a})},clear:()=>{e.set({}),t.set({})}})};var mu=Object.freeze({__proto__:null,memory:du,dataset:uu,manual:()=>Ta({readState:b}),init:e=>e.store.manager.state(e)});const gu=(e,t,o,n)=>{const s=t.store;o.update([n]),s.setValue(e,n),t.onSetValue(e,n)};var pu=[ms("initialValue"),ns("getFallbackEntry"),ns("getDataKey"),ns("setValue"),Li("manager",{setValue:gu,getValue:(e,t,o)=>{const n=t.store,s=n.getDataKey(e);return o.lookup(s).getOrThunk((()=>n.getFallbackEntry(s)))},onLoad:(e,t,o)=>{t.store.initialValue.each((n=>{gu(e,t,o,n)}))},onUnload:(e,t,o)=>{o.clear()},state:uu})],hu=[ns("getValue"),xs("setValue",b),ms("initialValue"),Li("manager",{setValue:(e,t,o,n)=>{t.store.setValue(e,n),t.onSetValue(e,n)},getValue:(e,t,o)=>t.store.getValue(e),onLoad:(e,t,o)=>{t.store.initialValue.each((o=>{t.store.setValue(e,o)}))},onUnload:b,state:_a.init})],fu=[ms("initialValue"),Li("manager",{setValue:(e,t,o,n)=>{o.set(n),t.onSetValue(e,n)},getValue:(e,t,o)=>o.get(),onLoad:(e,t,o)=>{t.store.initialValue.each((e=>{o.isNotSet()&&o.set(e)}))},onUnload:(e,t,o)=>{o.clear()},state:du})],bu=[ws("store",{mode:"memory"},Zn("mode",{memory:fu,manual:hu,dataset:pu})),Ri("onSetValue"),xs("resetOnDom",!1)];const vu=Al({fields:bu,name:"representing",active:cu,apis:lu,extra:{setValueFrom:(e,t)=>{const o=vu.getValue(t);vu.setValue(e,o)}},state:mu}),yu=(e,t)=>Es(e,{},L(t,(t=>{return o=t.name(),n="Cannot configure "+t.name()+" for "+e,es(o,o,{tag:"option",process:{}},On((e=>mn("The field: "+o+" is forbidden. "+n))));var o,n})).concat([ts("dump",w)])),xu=e=>e.dump,wu=(e,t)=>({...Tl(t),...e.dump}),Su=yu,ku=wu,Cu="placeholder",Ou=Ms([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),_u=e=>ve(e,"uiType"),Tu=(e,t,o,n)=>((e,t,o,n)=>_u(o)&&o.uiType===Cu?((e,t,o,n)=>e.exists((e=>e!==o.owner))?Ou.single(!0,x(o)):be(n,o.name).fold((()=>{throw new Error("Unknown placeholder component: "+o.name+"\nKnown: ["+ae(n)+"]\nNamespace: "+e.getOr("none")+"\nSpec: "+JSON.stringify(o,null,2))}),(e=>e.replace())))(e,0,o,n):Ou.single(!1,x(o)))(e,0,o,n).fold(((s,r)=>{const a=_u(o)?r(t,o.config,o.validated):r(t),i=be(a,"components").getOr([]),l=Y(i,(o=>Tu(e,t,o,n)));return[{...a,components:l}]}),((e,n)=>{if(_u(o)){const e=n(t,o.config,o.validated);return o.validated.preprocess.getOr(w)(e)}return n(t)})),Eu=Ou.single,Au=Ou.multiple,Mu=x(Cu),Du=Ms([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Bu=xs("factory",{sketch:w}),Iu=xs("schema",[]),Fu=ns("name"),Ru=es("pname","pname",yn((e=>"<alloy."+ca(e.name)+">")),Vn()),Nu=ts("schema",(()=>[ms("preprocess")])),Vu=xs("defaults",x({})),zu=xs("overrides",x({})),Lu=Bn([Bu,Iu,Fu,Ru,Vu,zu]),Hu=Bn([Bu,Iu,Fu,Vu,zu]),Pu=Bn([Bu,Iu,Fu,Ru,Vu,zu]),Uu=Bn([Bu,Nu,Fu,ns("unit"),Ru,Vu,zu]),Wu=e=>e.fold(A.some,A.none,A.some,A.some),ju=e=>{const t=e=>e.name;return e.fold(t,t,t,t)},Gu=(e,t)=>o=>{const n=Kn("Converting part type",t,o);return e(n)},$u=Gu(Du.required,Lu),qu=Gu(Du.external,Hu),Yu=Gu(Du.optional,Pu),Xu=Gu(Du.group,Uu),Ku=x("entirety");var Ju=Object.freeze({__proto__:null,required:$u,external:qu,optional:Yu,group:Xu,asNamedPart:Wu,name:ju,asCommon:e=>e.fold(w,w,w,w),original:Ku});const Zu=(e,t,o,n)=>bn(t.defaults(e,o,n),o,{uid:e.partUids[t.name]},t.overrides(e,o,n)),Qu=(e,t)=>{const o={};return H(t,(t=>{Wu(t).each((t=>{const n=em(e,t.pname);o[t.name]=o=>{const s=Kn("Part: "+t.name+" in "+e,Bn(t.schema),o);return{...n,config:o,validated:s}}}))})),o},em=(e,t)=>({uiType:Mu(),owner:e,name:t}),tm=(e,t,o)=>({uiType:Mu(),owner:e,name:t,config:o,validated:{}}),om=e=>Y(e,(e=>e.fold(A.none,A.some,A.none,A.none).map((e=>cs(e.name,e.schema.concat([Hi(Ku())])))).toArray())),nm=e=>L(e,ju),sm=(e,t,o)=>((e,t,o)=>{const n={},s={};return H(o,(e=>{e.fold((e=>{n[e.pname]=Eu(!0,((t,o,n)=>e.factory.sketch(Zu(t,e,o,n))))}),(e=>{const o=t.parts[e.name];s[e.name]=x(e.factory.sketch(Zu(t,e,o[Ku()]),o))}),(e=>{n[e.pname]=Eu(!1,((t,o,n)=>e.factory.sketch(Zu(t,e,o,n))))}),(e=>{n[e.pname]=Au(!0,((t,o,n)=>{const s=t[e.name];return L(s,(o=>e.factory.sketch(bn(e.defaults(t,o,n),o,e.overrides(t,o)))))}))}))})),{internals:x(n),externals:x(s)}})(0,t,o),rm=(e,t,o)=>((e,t,o,n)=>{const s=ce(n,((e,t)=>((e,t)=>{let o=!1;return{name:x(e),required:()=>t.fold(((e,t)=>e),((e,t)=>e)),used:()=>o,replace:()=>{if(o)throw new Error("Trying to use the same placeholder more than once: "+e);return o=!0,t}}})(t,e))),r=((e,t,o,n)=>Y(o,(o=>Tu(e,t,o,n))))(e,t,o,s);return le(s,(o=>{if(!1===o.used()&&o.required())throw new Error("Placeholder: "+o.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+JSON.stringify(t.components,null,2))})),r})(A.some(e),t,t.components,o),am=(e,t,o)=>{const n=t.partUids[o];return e.getSystem().getByUid(n).toOptional()},im=(e,t,o)=>am(e,t,o).getOrDie("Could not find part: "+o),lm=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return H(o,(e=>{n[e]=x(r.getByUid(s[e]))})),n},cm=(e,t)=>{const o=e.getSystem();return ce(t.partUids,((e,t)=>x(o.getByUid(e))))},dm=e=>ae(e.partUids),um=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return H(o,(e=>{n[e]=x(r.getByUid(s[e]).getOrDie())})),n},mm=(e,t)=>{const o=nm(t);return Bs(L(o,(t=>({key:t,value:e+"-"+t}))))},gm=e=>es("partUids","partUids",wn((t=>mm(t.uid,e))),Vn());var pm=Object.freeze({__proto__:null,generate:Qu,generateOne:tm,schemas:om,names:nm,substitutes:sm,components:rm,defaultUids:mm,defaultUidsSchema:gm,getAllParts:cm,getAllPartNames:dm,getPart:am,getPartOrDie:im,getParts:lm,getPartsOrDie:um});const hm=(e,t,o,n,s)=>{const r=((e,t)=>(e.length>0?[cs("parts",e)]:[]).concat([ns("uid"),xs("dom",{}),xs("components",[]),Hi("originalSpec"),xs("debug.sketcher",{})]).concat(t))(n,s);return Kn(e+" [SpecSchema]",Dn(r.concat(t)),o)},fm=(e,t,o,n,s)=>{const r=bm(s),a=om(o),i=gm(o),l=hm(e,t,r,a,[i]),c=sm(0,l,o);return n(l,rm(e,l,c.internals()),r,c.externals())},bm=e=>(e=>ve(e,"uid"))(e)?e:{...e,uid:fa("uid")},vm=Dn([ns("name"),ns("factory"),ns("configFields"),xs("apis",{}),xs("extraApis",{})]),ym=Dn([ns("name"),ns("factory"),ns("configFields"),ns("partFields"),xs("apis",{}),xs("extraApis",{})]),xm=e=>{const t=Kn("Sketcher for "+e.name,vm,e),o=ce(t.apis,Oa),n=ce(t.extraApis,((e,t)=>wa(e,t)));return{name:t.name,configFields:t.configFields,sketch:e=>((e,t,o,n)=>{const s=bm(n);return o(hm(e,t,s,[],[]),s)})(t.name,t.configFields,t.factory,e),...o,...n}},wm=e=>{const t=Kn("Sketcher for "+e.name,ym,e),o=Qu(t.name,t.partFields),n=ce(t.apis,Oa),s=ce(t.extraApis,((e,t)=>wa(e,t)));return{name:t.name,partFields:t.partFields,configFields:t.configFields,sketch:e=>fm(t.name,t.configFields,t.partFields,t.factory,e),parts:o,...n,...s}},Sm=e=>Ke("input")(e)&&"radio"!==_t(e,"type")||Ke("textarea")(e);var km=Object.freeze({__proto__:null,getCurrent:(e,t,o)=>t.find(e)});const Cm=[ns("find")],Om=Al({fields:Cm,name:"composing",apis:km}),_m=["input","button","textarea","select"],Tm=(e,t,o)=>{(t.disabled()?Im:Fm)(e,t)},Em=(e,t)=>!0===t.useNative&&R(_m,We(e.element)),Am=e=>{Ct(e.element,"disabled","disabled")},Mm=e=>{At(e.element,"disabled")},Dm=e=>{Ct(e.element,"aria-disabled","true")},Bm=e=>{Ct(e.element,"aria-disabled","false")},Im=(e,t,o)=>{t.disableClass.each((t=>{Wa(e.element,t)})),(Em(e,t)?Am:Dm)(e),t.onDisabled(e)},Fm=(e,t,o)=>{t.disableClass.each((t=>{Ga(e.element,t)})),(Em(e,t)?Mm:Bm)(e),t.onEnabled(e)},Rm=(e,t)=>Em(e,t)?(e=>Et(e.element,"disabled"))(e):(e=>"true"===_t(e.element,"aria-disabled"))(e);var Nm=Object.freeze({__proto__:null,enable:Fm,disable:Im,isDisabled:Rm,onLoad:Tm,set:(e,t,o,n)=>{(n?Im:Fm)(e,t)}}),Vm=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({classes:t.disabled()?t.disableClass.toArray():[]}),events:(e,t)=>Hr([Pr(mr(),((t,o)=>Rm(t,e))),Cl(e,t,Tm)])}),zm=[_s("disabled",T),xs("useNative",!0),ms("disableClass"),Ri("onDisabled"),Ri("onEnabled")];const Lm=Al({fields:zm,name:"disabling",active:Vm,apis:Nm}),Hm=(e,t,o,n)=>{const s=Zc(e.element,"."+t.highlightClass);H(s,(o=>{N(n,(e=>Qe(e.element,o)))||(Ga(o,t.highlightClass),e.getSystem().getByDom(o).each((o=>{t.onDehighlight(e,o),Fr(o,Ir())})))}))},Pm=(e,t,o,n)=>{Hm(e,t,0,[n]),Um(e,t,o,n)||(Wa(n.element,t.highlightClass),t.onHighlight(e,n),Fr(n,Br()))},Um=(e,t,o,n)=>$a(n.element,t.highlightClass),Wm=(e,t,o)=>vi(e.element,"."+t.itemClass).bind((t=>e.getSystem().getByDom(t).toOptional())),jm=(e,t,o)=>{const n=Zc(e.element,"."+t.itemClass);return(n.length>0?A.some(n[n.length-1]):A.none()).bind((t=>e.getSystem().getByDom(t).toOptional()))},Gm=(e,t,o,n)=>{const s=Zc(e.element,"."+t.itemClass);return $(s,(e=>$a(e,t.highlightClass))).bind((t=>{const o=Zi(t,n,0,s.length-1);return e.getSystem().getByDom(s[o]).toOptional()}))},$m=(e,t,o)=>{const n=Zc(e.element,"."+t.itemClass);return we(L(n,(t=>e.getSystem().getByDom(t).toOptional())))};var qm=Object.freeze({__proto__:null,dehighlightAll:(e,t,o)=>Hm(e,t,0,[]),dehighlight:(e,t,o,n)=>{Um(e,t,o,n)&&(Ga(n.element,t.highlightClass),t.onDehighlight(e,n),Fr(n,Ir()))},highlight:Pm,highlightFirst:(e,t,o)=>{Wm(e,t).each((n=>{Pm(e,t,o,n)}))},highlightLast:(e,t,o)=>{jm(e,t).each((n=>{Pm(e,t,o,n)}))},highlightAt:(e,t,o,n)=>{((e,t,o,n)=>{const s=Zc(e.element,"."+t.itemClass);return A.from(s[n]).fold((()=>rn.error(new Error("No element found with index "+n))),e.getSystem().getByDom)})(e,t,0,n).fold((e=>{throw e}),(n=>{Pm(e,t,o,n)}))},highlightBy:(e,t,o,n)=>{const s=$m(e,t);G(s,n).each((n=>{Pm(e,t,o,n)}))},isHighlighted:Um,getHighlighted:(e,t,o)=>vi(e.element,"."+t.highlightClass).bind((t=>e.getSystem().getByDom(t).toOptional())),getFirst:Wm,getLast:jm,getPrevious:(e,t,o)=>Gm(e,t,0,-1),getNext:(e,t,o)=>Gm(e,t,0,1),getCandidates:$m}),Ym=[ns("highlightClass"),ns("itemClass"),Ri("onHighlight"),Ri("onDehighlight")];const Xm=Al({fields:Ym,name:"highlighting",apis:qm}),Km=[8],Jm=[9],Zm=[13],Qm=[27],eg=[32],tg=[37],og=[38],ng=[39],sg=[40],rg=(e,t,o)=>{const n=K(e.slice(0,t)),s=K(e.slice(t+1));return G(n.concat(s),o)},ag=(e,t,o)=>{const n=K(e.slice(0,t));return G(n,o)},ig=(e,t,o)=>{const n=e.slice(0,t),s=e.slice(t+1);return G(s.concat(n),o)},lg=(e,t,o)=>{const n=e.slice(t+1);return G(n,o)},cg=e=>t=>{const o=t.raw;return R(e,o.which)},dg=e=>t=>X(e,(e=>e(t))),ug=e=>!0===e.raw.shiftKey,mg=e=>!0===e.raw.ctrlKey,gg=C(ug),pg=(e,t)=>({matches:e,classification:t}),hg=(e,t,o)=>{t.exists((e=>o.exists((t=>Qe(t,e)))))||Rr(e,Tr(),{prevFocus:t,newFocus:o})},fg=()=>{const e=e=>Ll(e.element);return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().triggerFocus(o,t.element);const s=e(t);hg(t,n,s)}}},bg=()=>{const e=e=>Xm.getHighlighted(e).map((e=>e.element));return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().getByDom(o).fold(b,(e=>{Xm.highlight(t,e)}));const s=e(t);hg(t,n,s)}}};var vg;!function(e){e.OnFocusMode="onFocus",e.OnEnterOrSpaceMode="onEnterOrSpace",e.OnApiMode="onApi"}(vg||(vg={}));const yg=(e,t,o,n,s)=>{const r=(e,t,o,n,s)=>{return(r=o(e,t,n,s),a=t.event,G(r,(e=>e.matches(a))).map((e=>e.classification))).bind((o=>o(e,t,n,s)));var r,a},a={schema:()=>e.concat([xs("focusManager",fg()),ws("focusInside","onFocus",$n((e=>R(["onFocus","onEnterOrSpace","onApi"],e)?rn.value(e):rn.error("Invalid value for focusInside")))),Li("handler",a),Li("state",t),Li("sendFocusIn",s)]),processKey:r,toEvents:(e,t)=>{const a=e.focusInside!==vg.OnFocusMode?A.none():s(e).map((o=>Wr(lr(),((n,s)=>{o(n,e,t),s.stop()})))),i=[Wr(Js(),((n,a)=>{r(n,a,o,e,t).fold((()=>{((o,n)=>{const r=cg(eg.concat(Zm))(n.event);e.focusInside===vg.OnEnterOrSpaceMode&&r&&Ns(o,n)&&s(e).each((s=>{s(o,e,t),n.stop()}))})(n,a)}),(e=>{a.stop()}))})),Wr(Zs(),((o,s)=>{r(o,s,n,e,t).each((e=>{s.stop()}))}))];return Hr(a.toArray().concat(i))}};return a},xg=e=>{const t=[ms("onEscape"),ms("onEnter"),xs("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),xs("firstTabstop",0),xs("useTabstopAt",E),ms("visibilitySelector")].concat([e]),o=(e,t)=>{const o=e.visibilitySelector.bind((e=>yi(t,e))).getOr(t);return jt(o)>0},n=(e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))),s=(e,t,n)=>{((e,t)=>{const n=Zc(e.element,t.selector),s=U(n,(e=>o(t,e)));return A.from(s[t.firstTabstop])})(e,t).each((o=>{t.focusManager.set(e,o)}))},r=(e,t,s,r)=>{const a=Zc(e.element,s.selector);return n(e,s).bind((t=>$(a,k(Qe,t)).bind((t=>((e,t,n,s,r)=>r(t,n,(e=>((e,t)=>o(e,t)&&e.useTabstopAt(t))(s,e))).fold((()=>s.cyclic?A.some(!0):A.none()),(t=>(s.focusManager.set(e,t),A.some(!0)))))(e,a,t,s,r)))))},a=(e,t,o)=>{const n=o.cyclic?rg:ag;return r(e,0,o,n)},i=(e,t,o)=>{const n=o.cyclic?ig:lg;return r(e,0,o,n)},l=x([pg(dg([ug,cg(Jm)]),a),pg(cg(Jm),i),pg(dg([gg,cg(Zm)]),((e,t,o)=>o.onEnter.bind((o=>o(e,t)))))]),c=x([pg(cg(Qm),((e,t,o)=>o.onEscape.bind((o=>o(e,t))))),pg(cg(Jm),((e,t,o)=>n(e,o).filter((e=>!o.useTabstopAt(e))).bind((n=>((e=>(e=>rt(e))(e).bind(dt).exists((t=>Qe(t,e))))(n)?a:i)(e,t,o)))))]);return yg(t,_a.init,l,c,(()=>A.some(s)))};var wg=xg(ts("cyclic",T)),Sg=xg(ts("cyclic",E));const kg=(e,t,o)=>Sm(o)&&cg(eg)(t.event)?A.none():((e,t,o)=>(Vr(e,o,mr()),A.some(!0)))(e,0,o),Cg=(e,t)=>A.some(!0),Og=[xs("execute",kg),xs("useSpace",!1),xs("useEnter",!0),xs("useControlEnter",!1),xs("useDown",!1)],_g=(e,t,o)=>o.execute(e,t,e.element);var Tg=yg(Og,_a.init,((e,t,o,n)=>{const s=o.useSpace&&!Sm(e.element)?eg:[],r=o.useEnter?Zm:[],a=o.useDown?sg:[],i=s.concat(r).concat(a);return[pg(cg(i),_g)].concat(o.useControlEnter?[pg(dg([mg,cg(Zm)]),_g)]:[])}),((e,t,o,n)=>o.useSpace&&!Sm(e.element)?[pg(cg(eg),Cg)]:[]),(()=>A.none()));const Eg=()=>{const e=nc();return Ta({readState:()=>e.get().map((e=>({numRows:String(e.numRows),numColumns:String(e.numColumns)}))).getOr({numRows:"?",numColumns:"?"}),setGridSize:(t,o)=>{e.set({numRows:t,numColumns:o})},getNumRows:()=>e.get().map((e=>e.numRows)),getNumColumns:()=>e.get().map((e=>e.numColumns))})};var Ag=Object.freeze({__proto__:null,flatgrid:Eg,init:e=>e.state(e)});const Mg=e=>(t,o,n,s)=>{const r=e(t.element);return Fg(r,t,o,n,s)},Dg=(e,t)=>{const o=xc(e,t);return Mg(o)},Bg=(e,t)=>{const o=xc(t,e);return Mg(o)},Ig=e=>(t,o,n,s)=>Fg(e,t,o,n,s),Fg=(e,t,o,n,s)=>n.focusManager.get(t).bind((o=>e(t.element,o,n,s))).map((e=>(n.focusManager.set(t,e),!0))),Rg=Ig,Ng=Ig,Vg=Ig,zg=e=>!(e=>e.offsetWidth<=0&&e.offsetHeight<=0)(e.dom),Lg=(e,t,o)=>{const n=Zc(e,o);return((e,o)=>$(e,(e=>Qe(e,t))).map((t=>({index:t,candidates:e}))))(U(n,zg))},Hg=(e,t)=>$(e,(e=>Qe(t,e))),Pg=(e,t,o,n)=>n(Math.floor(t/o),t%o).bind((t=>{const n=t.row*o+t.column;return n>=0&&n<e.length?A.some(e[n]):A.none()})),Ug=(e,t,o,n,s)=>Pg(e,t,n,((t,r)=>{const a=t===o-1?e.length-t*n:n,i=Zi(r,s,0,a-1);return A.some({row:t,column:i})})),Wg=(e,t,o,n,s)=>Pg(e,t,n,((t,r)=>{const a=Zi(t,s,0,o-1),i=a===o-1?e.length-a*n:n,l=Qi(r,0,i-1);return A.some({row:a,column:l})})),jg=[ns("selector"),xs("execute",kg),Ni("onEscape"),xs("captureTab",!1),Pi()],Gg=(e,t,o)=>{vi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},$g=e=>(t,o,n,s)=>Lg(t,o,n.selector).bind((t=>e(t.candidates,t.index,s.getNumRows().getOr(n.initSize.numRows),s.getNumColumns().getOr(n.initSize.numColumns)))),qg=(e,t,o)=>o.captureTab?A.some(!0):A.none(),Yg=$g(((e,t,o,n)=>Ug(e,t,o,n,-1))),Xg=$g(((e,t,o,n)=>Ug(e,t,o,n,1))),Kg=$g(((e,t,o,n)=>Wg(e,t,o,n,-1))),Jg=$g(((e,t,o,n)=>Wg(e,t,o,n,1))),Zg=x([pg(cg(tg),Dg(Yg,Xg)),pg(cg(ng),Bg(Yg,Xg)),pg(cg(og),Rg(Kg)),pg(cg(sg),Ng(Jg)),pg(dg([ug,cg(Jm)]),qg),pg(dg([gg,cg(Jm)]),qg),pg(cg(eg.concat(Zm)),((e,t,o,n)=>((e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n)))))]),Qg=x([pg(cg(Qm),((e,t,o)=>o.onEscape(e,t))),pg(cg(eg),Cg)]);var ep=yg(jg,Eg,Zg,Qg,(()=>A.some(Gg)));const tp=(e,t,o,n,s)=>{const r=(e,t,o)=>s(e,t,n,0,o.length-1,o[t],(t=>{return n=o[t],"button"===We(n)&&"disabled"===_t(n,"disabled")?r(e,t,o):A.from(o[t]);var n}));return Lg(e,o,t).bind((e=>{const t=e.index,o=e.candidates;return r(t,t,o)}))},op=(e,t,o,n)=>tp(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Qi(t+o,n,s);return i===e?A.from(r):a(i)})),np=(e,t,o,n)=>tp(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Zi(t,o,n,s);return i===e?A.none():a(i)})),sp=[ns("selector"),xs("getInitial",A.none),xs("execute",kg),Ni("onEscape"),xs("executeOnMove",!1),xs("allowVertical",!0),xs("allowHorizontal",!0),xs("cycles",!0)],rp=(e,t,o)=>((e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n))),ap=(e,t,o)=>{t.getInitial(e).orThunk((()=>vi(e.element,t.selector))).each((o=>{t.focusManager.set(e,o)}))},ip=(e,t,o)=>(o.cycles?np:op)(e,o.selector,t,-1),lp=(e,t,o)=>(o.cycles?np:op)(e,o.selector,t,1),cp=e=>(t,o,n,s)=>e(t,o,n,s).bind((()=>n.executeOnMove?rp(t,o,n):A.some(!0))),dp=x([pg(cg(eg),Cg),pg(cg(Qm),((e,t,o)=>o.onEscape(e,t)))]);var up=yg(sp,_a.init,((e,t,o,n)=>{const s=[...o.allowHorizontal?tg:[]].concat(o.allowVertical?og:[]),r=[...o.allowHorizontal?ng:[]].concat(o.allowVertical?sg:[]);return[pg(cg(s),cp(Dg(ip,lp))),pg(cg(r),cp(Bg(ip,lp))),pg(cg(Zm),rp),pg(cg(eg),rp)]}),dp,(()=>A.some(ap)));const mp=(e,t,o)=>A.from(e[t]).bind((e=>A.from(e[o]).map((e=>({rowIndex:t,columnIndex:o,cell:e}))))),gp=(e,t,o,n)=>{const s=e[t].length,r=Zi(o,n,0,s-1);return mp(e,t,r)},pp=(e,t,o,n)=>{const s=Zi(o,n,0,e.length-1),r=e[s].length,a=Qi(t,0,r-1);return mp(e,s,a)},hp=(e,t,o,n)=>{const s=e[t].length,r=Qi(o+n,0,s-1);return mp(e,t,r)},fp=(e,t,o,n)=>{const s=Qi(o+n,0,e.length-1),r=e[s].length,a=Qi(t,0,r-1);return mp(e,s,a)},bp=[cs("selectors",[ns("row"),ns("cell")]),xs("cycles",!0),xs("previousSelector",A.none),xs("execute",kg)],vp=(e,t,o)=>{t.previousSelector(e).orThunk((()=>{const o=t.selectors;return vi(e.element,o.cell)})).each((o=>{t.focusManager.set(e,o)}))},yp=(e,t)=>(o,n,s)=>{const r=s.cycles?e:t;return yi(n,s.selectors.row).bind((e=>{const t=Zc(e,s.selectors.cell);return Hg(t,n).bind((t=>{const n=Zc(o,s.selectors.row);return Hg(n,e).bind((e=>{const o=((e,t)=>L(e,(e=>Zc(e,t.selectors.cell))))(n,s);return r(o,e,t).map((e=>e.cell))}))}))}))},xp=yp(((e,t,o)=>gp(e,t,o,-1)),((e,t,o)=>hp(e,t,o,-1))),wp=yp(((e,t,o)=>gp(e,t,o,1)),((e,t,o)=>hp(e,t,o,1))),Sp=yp(((e,t,o)=>pp(e,o,t,-1)),((e,t,o)=>fp(e,o,t,-1))),kp=yp(((e,t,o)=>pp(e,o,t,1)),((e,t,o)=>fp(e,o,t,1))),Cp=x([pg(cg(tg),Dg(xp,wp)),pg(cg(ng),Bg(xp,wp)),pg(cg(og),Rg(Sp)),pg(cg(sg),Ng(kp)),pg(cg(eg.concat(Zm)),((e,t,o)=>Ll(e.element).bind((n=>o.execute(e,t,n)))))]),Op=x([pg(cg(eg),Cg)]);var _p=yg(bp,_a.init,Cp,Op,(()=>A.some(vp)));const Tp=[ns("selector"),xs("execute",kg),xs("moveOnTab",!1)],Ep=(e,t,o)=>o.focusManager.get(e).bind((n=>o.execute(e,t,n))),Ap=(e,t,o)=>{vi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},Mp=(e,t,o)=>np(e,o.selector,t,-1),Dp=(e,t,o)=>np(e,o.selector,t,1),Bp=x([pg(cg(og),Vg(Mp)),pg(cg(sg),Vg(Dp)),pg(dg([ug,cg(Jm)]),((e,t,o,n)=>o.moveOnTab?Vg(Mp)(e,t,o,n):A.none())),pg(dg([gg,cg(Jm)]),((e,t,o,n)=>o.moveOnTab?Vg(Dp)(e,t,o,n):A.none())),pg(cg(Zm),Ep),pg(cg(eg),Ep)]),Ip=x([pg(cg(eg),Cg)]);var Fp=yg(Tp,_a.init,Bp,Ip,(()=>A.some(Ap)));const Rp=[Ni("onSpace"),Ni("onEnter"),Ni("onShiftEnter"),Ni("onLeft"),Ni("onRight"),Ni("onTab"),Ni("onShiftTab"),Ni("onUp"),Ni("onDown"),Ni("onEscape"),xs("stopSpaceKeyup",!1),ms("focusIn")];var Np=yg(Rp,_a.init,((e,t,o)=>[pg(cg(eg),o.onSpace),pg(dg([gg,cg(Zm)]),o.onEnter),pg(dg([ug,cg(Zm)]),o.onShiftEnter),pg(dg([ug,cg(Jm)]),o.onShiftTab),pg(dg([gg,cg(Jm)]),o.onTab),pg(cg(og),o.onUp),pg(cg(sg),o.onDown),pg(cg(tg),o.onLeft),pg(cg(ng),o.onRight),pg(cg(eg),o.onSpace)]),((e,t,o)=>[...o.stopSpaceKeyup?[pg(cg(eg),Cg)]:[],pg(cg(Qm),o.onEscape)]),(e=>e.focusIn));const Vp=wg.schema(),zp=Sg.schema(),Lp=up.schema(),Hp=ep.schema(),Pp=_p.schema(),Up=Tg.schema(),Wp=Fp.schema(),jp=Np.schema(),Gp=Dl({branchKey:"mode",branches:Object.freeze({__proto__:null,acyclic:Vp,cyclic:zp,flow:Lp,flatgrid:Hp,matrix:Pp,execution:Up,menu:Wp,special:jp}),name:"keying",active:{events:(e,t)=>e.handler.toEvents(e,t)},apis:{focusIn:(e,t,o)=>{t.sendFocusIn(t).fold((()=>{e.getSystem().triggerFocus(e.element,e.element)}),(n=>{n(e,t,o)}))},setGridSize:(e,t,o,n,s)=>{(e=>ye(e,"setGridSize"))(o)?o.setGridSize(n,s):console.error("Layout does not support setGridSize")}},state:Ag}),$p=(e,t)=>{Hl((()=>{((e,t,o)=>{const n=e.components();(e=>{H(e.components(),(e=>Uo(e.element))),Po(e.element),e.syncComponents()})(e);const s=o(t),r=J(n,s);H(r,(t=>{Ed(t),e.getSystem().removeFromWorld(t)})),H(s,(t=>{Td(t)?Bd(e,t):(e.getSystem().addToWorld(t),Bd(e,t),xt(e.element)&&Ad(t))})),e.syncComponents()})(e,t,(()=>L(t,e.getSystem().build)))}),e.element)},qp=(e,t)=>{Hl((()=>{((o,n,s)=>{const r=o.components(),a=Y(n,(e=>Ca(e).toArray()));H(r,(e=>{R(a,e)||Dd(e)}));const i=((e,t,o)=>Qa(e,t,((t,n)=>ei(e,n,t,o))))(e.element,t,e.getSystem().buildOrPatch),l=J(r,i);H(l,(e=>{Td(e)&&Dd(e)})),H(i,(e=>{Td(e)||Md(o,e)})),o.syncComponents()})(e,t)}),e.element)},Yp=(e,t,o,n)=>{Dd(t);const s=ei(e.element,o,n,e.getSystem().buildOrPatch);Md(e,s),e.syncComponents()},Xp=(e,t,o)=>{const n=e.getSystem().build(o);Fd(e,n,t)},Kp=(e,t,o,n)=>{Nd(t),Xp(e,((e,t)=>((e,t,o)=>{ct(e,o).fold((()=>{Lo(e,t)}),(e=>{No(e,t)}))})(e,t,o)),n)},Jp=(e,t)=>e.components(),Zp=(e,t,o,n,s)=>{const r=Jp(e);return A.from(r[n]).map((o=>(s.fold((()=>Nd(o)),(s=>{(t.reuseDom?Yp:Kp)(e,o,n,s)})),o)))};var Qp=Object.freeze({__proto__:null,append:(e,t,o,n)=>{Xp(e,Lo,n)},prepend:(e,t,o,n)=>{Xp(e,zo,n)},remove:(e,t,o,n)=>{const s=Jp(e),r=G(s,(e=>Qe(n.element,e.element)));r.each(Nd)},replaceAt:Zp,replaceBy:(e,t,o,n,s)=>{const r=Jp(e);return $(r,n).bind((o=>Zp(e,t,0,o,s)))},set:(e,t,o,n)=>(t.reuseDom?qp:$p)(e,n),contents:Jp});const eh=Al({fields:[Os("reuseDom",!0)],name:"replacing",apis:Qp}),th=(e,t)=>{const o=((e,t)=>{const o=Hr(t);return Al({fields:[ns("enabled")],name:e,active:{events:x(o)}})})(e,t);return{key:e,value:{config:{},me:o,configAsRaw:x({}),initialConfig:{},state:_a}}},oh=(e,t)=>{t.ignore||(Rl(e.element),t.onFocus(e))};var nh=Object.freeze({__proto__:null,focus:oh,blur:(e,t)=>{t.ignore||Nl(e.element)},isFocused:e=>Vl(e.element)}),sh=Object.freeze({__proto__:null,exhibit:(e,t)=>{const o=t.ignore?{}:{attributes:{tabindex:"-1"}};return Aa(o)},events:e=>Hr([Wr(lr(),((t,o)=>{oh(t,e),o.stop()}))].concat(e.stopMousedown?[Wr(js(),((e,t)=>{t.event.prevent()}))]:[]))}),rh=[Ri("onFocus"),xs("stopMousedown",!1),xs("ignore",!1)];const ah=Al({fields:rh,name:"focusing",active:sh,apis:nh}),ih=(e,t,o,n)=>{const s=o.get();o.set(n),((e,t,o)=>{t.toggleClass.each((t=>{o.get()?Wa(e.element,t):Ga(e.element,t)}))})(e,t,o),((e,t,o)=>{const n=t.aria;n.update(e,n,o.get())})(e,t,o),s!==n&&t.onToggled(e,n)},lh=(e,t,o)=>{ih(e,t,o,!o.get())},ch=(e,t,o)=>{ih(e,t,o,t.selected)};var dh=Object.freeze({__proto__:null,onLoad:ch,toggle:lh,isOn:(e,t,o)=>o.get(),on:(e,t,o)=>{ih(e,t,o,!0)},off:(e,t,o)=>{ih(e,t,o,!1)},set:ih}),uh=Object.freeze({__proto__:null,exhibit:()=>Aa({}),events:(e,t)=>{const o=(n=e,s=t,r=lh,ea((e=>{r(e,n,s)})));var n,s,r;const a=Cl(e,t,ch);return Hr(q([e.toggleOnExecute?[o]:[],[a]]))}});const mh=(e,t,o)=>{Ct(e.element,"aria-expanded",o)};var gh=[xs("selected",!1),ms("toggleClass"),xs("toggleOnExecute",!0),Ri("onToggled"),ws("aria",{mode:"none"},Zn("mode",{pressed:[xs("syncWithExpanded",!1),Li("update",((e,t,o)=>{Ct(e.element,"aria-pressed",o),t.syncWithExpanded&&mh(e,0,o)}))],checked:[Li("update",((e,t,o)=>{Ct(e.element,"aria-checked",o)}))],expanded:[Li("update",mh)],selected:[Li("update",((e,t,o)=>{Ct(e.element,"aria-selected",o)}))],none:[Li("update",b)]}))];const ph=Al({fields:gh,name:"toggling",active:uh,apis:dh,state:(!1,{init:()=>{const e=As(false);return{get:()=>e.get(),set:t=>e.set(t),clear:()=>e.set(false),readState:()=>e.get()}}})});const hh=()=>{const e=(e,t)=>{t.stop(),Nr(e)};return[Wr(tr(),e),Wr(pr(),e),Yr(Hs()),Yr(js())]},fh=e=>Hr(q([e.map((e=>ea(((t,o)=>{e(t),o.stop()})))).toArray(),hh()])),bh="alloy.item-hover",vh="alloy.item-focus",yh="alloy.item-toggled",xh=e=>{(Ll(e.element).isNone()||ah.isFocused(e))&&(ah.isFocused(e)||ah.focus(e),Rr(e,bh,{item:e}))},wh=e=>{Rr(e,vh,{item:e})},Sh=x(bh),kh=x(vh),Ch=x(yh),Oh=e=>e.toggling.map((e=>e.exclusive?"menuitemradio":"menuitemcheckbox")).getOr("menuitem"),_h=[ns("data"),ns("components"),ns("dom"),xs("hasSubmenu",!1),ms("toggling"),Su("itemBehaviours",[ph,ah,Gp,vu]),xs("ignoreFocus",!1),xs("domModification",{}),Li("builder",(e=>({dom:e.dom,domModification:{...e.domModification,attributes:{role:Oh(e),...e.domModification.attributes,"aria-haspopup":e.hasSubmenu,...e.hasSubmenu?{"aria-expanded":!1}:{}}},behaviours:ku(e.itemBehaviours,[e.toggling.fold(ph.revoke,(e=>ph.config((e=>({aria:{mode:"checked"},...ge(e,((e,t)=>"exclusive"!==t)),onToggled:(t,o)=>{p(e.onToggled)&&e.onToggled(t,o),((e,t)=>{Rr(e,yh,{item:e,state:t})})(t,o)}}))(e)))),ah.config({ignore:e.ignoreFocus,stopMousedown:e.ignoreFocus,onFocus:e=>{wh(e)}}),Gp.config({mode:"execution"}),vu.config({store:{mode:"memory",initialValue:e.data}}),th("item-type-events",[...hh(),Wr(Ys(),xh),Wr(gr(),ah.focus)])]),components:e.components,eventOrder:e.eventOrder}))),xs("eventOrder",{})],Th=[ns("dom"),ns("components"),Li("builder",(e=>({dom:e.dom,components:e.components,events:Hr([Xr(gr())])})))],Eh=x("item-widget"),Ah=x([$u({name:"widget",overrides:e=>({behaviours:Tl([vu.config({store:{mode:"manual",getValue:t=>e.data,setValue:b}})])})})]),Mh=[ns("uid"),ns("data"),ns("components"),ns("dom"),xs("autofocus",!1),xs("ignoreFocus",!1),Su("widgetBehaviours",[vu,ah,Gp]),xs("domModification",{}),gm(Ah()),Li("builder",(e=>{const t=sm(Eh(),e,Ah()),o=rm(Eh(),e,t.internals()),n=t=>am(t,e,"widget").map((e=>(Gp.focusIn(e),e))),s=(t,o)=>Sm(o.event.target)?A.none():e.autofocus?(o.setSource(t.element),A.none()):A.none();return{dom:e.dom,components:o,domModification:e.domModification,events:Hr([ea(((e,t)=>{n(e).each((e=>{t.stop()}))})),Wr(Ys(),xh),Wr(gr(),((t,o)=>{e.autofocus?n(t):ah.focus(t)}))]),behaviours:ku(e.widgetBehaviours,[vu.config({store:{mode:"memory",initialValue:e.data}}),ah.config({ignore:e.ignoreFocus,onFocus:e=>{wh(e)}}),Gp.config({mode:"special",focusIn:e.autofocus?e=>{n(e)}:Bl(),onLeft:s,onRight:s,onEscape:(t,o)=>ah.isFocused(t)||e.autofocus?e.autofocus?(o.setSource(t.element),A.none()):A.none():(ah.focus(t),A.some(!0))})])}}))],Dh=Zn("type",{widget:Mh,item:_h,separator:Th}),Bh=x([Xu({factory:{sketch:e=>{const t=Kn("menu.spec item",Dh,e);return t.builder(t)}},name:"items",unit:"item",defaults:(e,t)=>ve(t,"uid")?t:{...t,uid:fa("item")},overrides:(e,t)=>({type:t.type,ignoreFocus:e.fakeFocus,domModification:{classes:[e.markers.item]}})})]),Ih=x([ns("value"),ns("items"),ns("dom"),ns("components"),xs("eventOrder",{}),yu("menuBehaviours",[Xm,vu,Om,Gp]),ws("movement",{mode:"menu",moveOnTab:!0},Zn("mode",{grid:[Pi(),Li("config",((e,t)=>({mode:"flatgrid",selector:"."+e.markers.item,initSize:{numColumns:t.initSize.numColumns,numRows:t.initSize.numRows},focusManager:e.focusManager})))],matrix:[Li("config",((e,t)=>({mode:"matrix",selectors:{row:t.rowSelector,cell:"."+e.markers.item},previousSelector:t.previousSelector,focusManager:e.focusManager}))),ns("rowSelector"),xs("previousSelector",A.none)],menu:[xs("moveOnTab",!0),Li("config",((e,t)=>({mode:"menu",selector:"."+e.markers.item,moveOnTab:t.moveOnTab,focusManager:e.focusManager})))]})),ss("markers",Mi()),xs("fakeFocus",!1),xs("focusManager",fg()),Ri("onHighlight"),Ri("onDehighlight")]),Fh=x("alloy.menu-focus"),Rh=wm({name:"Menu",configFields:Ih(),partFields:Bh(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,markers:e.markers,behaviours:wu(e.menuBehaviours,[Xm.config({highlightClass:e.markers.selectedItem,itemClass:e.markers.item,onHighlight:e.onHighlight,onDehighlight:e.onDehighlight}),vu.config({store:{mode:"memory",initialValue:e.value}}),Om.config({find:A.some}),Gp.config(e.movement.config(e,e.movement))]),events:Hr([Wr(kh(),((e,t)=>{const o=t.event;e.getSystem().getByDom(o.target).each((o=>{Xm.highlight(e,o),t.stop(),Rr(e,Fh(),{menu:e,item:o})}))})),Wr(Sh(),((e,t)=>{const o=t.event.item;Xm.highlight(e,o)})),Wr(Ch(),((e,t)=>{const{item:o,state:n}=t.event;n&&"menuitemradio"===_t(o.element,"role")&&((e,t)=>{const o=Zc(e.element,'[role="menuitemradio"][aria-checked="true"]');H(o,(o=>{Qe(o,t.element)||e.getSystem().getByDom(o).each((e=>{ph.off(e)}))}))})(e,o)}))]),components:t,eventOrder:e.eventOrder,domModification:{attributes:{role:"menu"}}})}),Nh=(e,t,o,n)=>be(o,n).bind((n=>be(e,n).bind((n=>{const s=Nh(e,t,o,n);return A.some([n].concat(s))})))).getOr([]),Vh=e=>"prepared"===e.type?A.some(e.menu):A.none(),zh=()=>{const e=As({}),t=As({}),o=As({}),n=nc(),s=As({}),r=e=>a(e).bind(Vh),a=e=>be(t.get(),e),i=t=>be(e.get(),t);return{setMenuBuilt:(e,o)=>{t.set({...t.get(),[e]:{type:"prepared",menu:o}})},setContents:(r,a,i,l)=>{n.set(r),e.set(i),t.set(a),s.set(l);const c=((e,t)=>{const o={};le(e,((e,t)=>{H(e,(e=>{o[e]=t}))}));const n=t,s=de(t,((e,t)=>({k:e,v:t}))),r=ce(s,((e,t)=>[t].concat(Nh(o,n,s,t))));return ce(o,(e=>be(r,e).getOr([e])))})(l,i);o.set(c)},expand:t=>be(e.get(),t).map((e=>{const n=be(o.get(),t).getOr([]);return[e].concat(n)})),refresh:e=>be(o.get(),e),collapse:e=>be(o.get(),e).bind((e=>e.length>1?A.some(e.slice(1)):A.none())),lookupMenu:a,lookupItem:i,otherMenus:e=>{const t=s.get();return J(ae(t),e)},getPrimary:()=>n.get().bind(r),getMenus:()=>t.get(),clear:()=>{e.set({}),t.set({}),o.set({}),n.clear()},isClear:()=>n.get().isNone(),getTriggeringPath:(t,s)=>{const a=U(i(t).toArray(),(e=>r(e).isSome()));return be(o.get(),t).bind((t=>{const o=K(a.concat(t));return(e=>{const t=[];for(let o=0;o<e.length;o++){const n=e[o];if(!n.isSome())return A.none();t.push(n.getOrDie())}return A.some(t)})(Y(o,((t,a)=>((t,o,n)=>r(t).bind((s=>(t=>he(e.get(),((e,o)=>e===t)))(t).bind((e=>o(e).map((e=>({triggeredMenu:s,triggeringItem:e,triggeringPath:n}))))))))(t,s,o.slice(0,a+1)).fold((()=>xe(n.get(),t)?[]:[A.none()]),(e=>[A.some(e)])))))}))}}},Lh=Vh,Hh=ca("tiered-menu-item-highlight"),Ph=ca("tiered-menu-item-dehighlight");var Uh;!function(e){e[e.HighlightMenuAndItem=0]="HighlightMenuAndItem",e[e.HighlightJustMenu=1]="HighlightJustMenu",e[e.HighlightNone=2]="HighlightNone"}(Uh||(Uh={}));const Wh=x("collapse-item"),jh=xm({name:"TieredMenu",configFields:[zi("onExecute"),zi("onEscape"),Vi("onOpenMenu"),Vi("onOpenSubmenu"),Ri("onRepositionMenu"),Ri("onCollapseMenu"),xs("highlightOnOpen",Uh.HighlightMenuAndItem),cs("data",[ns("primary"),ns("menus"),ns("expansions")]),xs("fakeFocus",!1),Ri("onHighlightItem"),Ri("onDehighlightItem"),Ri("onHover"),Bi(),ns("dom"),xs("navigateOnHover",!0),xs("stayInDom",!1),yu("tmenuBehaviours",[Gp,Xm,Om,eh]),xs("eventOrder",{})],apis:{collapseMenu:(e,t)=>{e.collapseMenu(t)},highlightPrimary:(e,t)=>{e.highlightPrimary(t)},repositionMenus:(e,t)=>{e.repositionMenus(t)}},factory:(e,t)=>{const o=nc(),n=zh(),s=e=>vu.getValue(e).value,r=t=>ce(e.data.menus,((e,t)=>Y(e.items,(e=>"separator"===e.type?[]:[e.data.value])))),a=Xm.highlight,i=(t,o)=>{a(t,o),Xm.getHighlighted(o).orThunk((()=>Xm.getFirst(o))).each((n=>{e.fakeFocus?Xm.highlight(o,n):Vr(t,n.element,gr())}))},l=(e,t)=>we(L(t,(t=>e.lookupMenu(t).bind((e=>"prepared"===e.type?A.some(e.menu):A.none()))))),c=(t,o,n)=>{const s=l(o,o.otherMenus(n));H(s,(o=>{Ya(o.element,[e.markers.backgroundMenu]),e.stayInDom||eh.remove(t,o)}))},d=(t,n)=>{const r=(t=>o.get().getOrThunk((()=>{const n={},r=Zc(t.element,`.${e.markers.item}`),a=U(r,(e=>"true"===_t(e,"aria-haspopup")));return H(a,(e=>{t.getSystem().getByDom(e).each((e=>{const t=s(e);n[t]=e}))})),o.set(n),n})))(t);le(r,((e,t)=>{const o=R(n,t);Ct(e.element,"aria-expanded",o)}))},u=(t,o,n)=>A.from(n[0]).bind((s=>o.lookupMenu(s).bind((s=>{if("notbuilt"===s.type)return A.none();{const r=s.menu,a=l(o,n.slice(1));return H(a,(t=>{Wa(t.element,e.markers.backgroundMenu)})),xt(r.element)||eh.append(t,di(r)),Ya(r.element,[e.markers.backgroundMenu]),i(t,r),c(t,o,n),A.some(r)}}))));let m;!function(e){e[e.HighlightSubmenu=0]="HighlightSubmenu",e[e.HighlightParent=1]="HighlightParent"}(m||(m={}));const g=(t,o,r=m.HighlightSubmenu)=>{if(o.hasConfigured(Lm)&&Lm.isDisabled(o))return A.some(o);{const a=s(o);return n.expand(a).bind((s=>(d(t,s),A.from(s[0]).bind((a=>n.lookupMenu(a).bind((i=>{const l=((e,t,o)=>{if("notbuilt"===o.type){const s=e.getSystem().build(o.nbMenu());return n.setMenuBuilt(t,s),s}return o.menu})(t,a,i);return xt(l.element)||eh.append(t,di(l)),e.onOpenSubmenu(t,o,l,K(s)),r===m.HighlightSubmenu?(Xm.highlightFirst(l),u(t,n,s)):(Xm.dehighlightAll(l),A.some(o))})))))))}},p=(t,o)=>{const r=s(o);return n.collapse(r).bind((s=>(d(t,s),u(t,n,s).map((n=>(e.onCollapseMenu(t,o,n),n))))))},h=t=>(o,n)=>yi(n.getSource(),`.${e.markers.item}`).bind((e=>o.getSystem().getByDom(e).toOptional().bind((e=>t(o,e).map(E))))),f=Hr([Wr(Fh(),((e,t)=>{const o=t.event.item;n.lookupItem(s(o)).each((()=>{const o=t.event.menu;Xm.highlight(e,o);const r=s(t.event.item);n.refresh(r).each((t=>c(e,n,t)))}))})),ea(((t,o)=>{const n=o.event.target;t.getSystem().getByDom(n).each((o=>{0===s(o).indexOf("collapse-item")&&p(t,o),g(t,o,m.HighlightSubmenu).fold((()=>{e.onExecute(t,o)}),b)}))})),Jr(((t,o)=>{(t=>{const o=((t,o,n)=>ce(n,((n,s)=>{const r=()=>Rh.sketch({...n,value:s,markers:e.markers,fakeFocus:e.fakeFocus,onHighlight:(e,t)=>{Rr(e,Hh,{menuComp:e,itemComp:t})},onDehighlight:(e,t)=>{Rr(e,Ph,{menuComp:e,itemComp:t})},focusManager:e.fakeFocus?bg():fg()});return s===o?{type:"prepared",menu:t.getSystem().build(r())}:{type:"notbuilt",nbMenu:r}})))(t,e.data.primary,e.data.menus),s=r();return n.setContents(e.data.primary,o,e.data.expansions,s),n.getPrimary()})(t).each((o=>{eh.append(t,di(o)),e.onOpenMenu(t,o),e.highlightOnOpen===Uh.HighlightMenuAndItem?i(t,o):e.highlightOnOpen===Uh.HighlightJustMenu&&a(t,o)}))})),Wr(Hh,((t,o)=>{e.onHighlightItem(t,o.event.menuComp,o.event.itemComp)})),Wr(Ph,((t,o)=>{e.onDehighlightItem(t,o.event.menuComp,o.event.itemComp)})),...e.navigateOnHover?[Wr(Sh(),((t,o)=>{const r=o.event.item;((e,t)=>{const o=s(t);n.refresh(o).bind((t=>(d(e,t),u(e,n,t))))})(t,r),g(t,r,m.HighlightParent),e.onHover(t,r)}))]:[]]),v=e=>Xm.getHighlighted(e).bind(Xm.getHighlighted),y={collapseMenu:e=>{v(e).each((t=>{p(e,t)}))},highlightPrimary:e=>{n.getPrimary().each((t=>{i(e,t)}))},repositionMenus:t=>{const o=n.getPrimary().bind((e=>v(t).bind((e=>{const t=s(e),o=fe(n.getMenus()),r=we(L(o,Lh));return n.getTriggeringPath(t,(e=>((e,t,o)=>re(t,(e=>{if(!e.getSystem().isConnected())return A.none();const t=Xm.getCandidates(e);return G(t,(e=>s(e)===o))})))(0,r,e)))})).map((t=>({primary:e,triggeringPath:t})))));o.fold((()=>{(e=>A.from(e.components()[0]).filter((e=>"menu"===_t(e.element,"role"))))(t).each((o=>{e.onRepositionMenu(t,o,[])}))}),(({primary:o,triggeringPath:n})=>{e.onRepositionMenu(t,o,n)}))}};return{uid:e.uid,dom:e.dom,markers:e.markers,behaviours:wu(e.tmenuBehaviours,[Gp.config({mode:"special",onRight:h(((e,t)=>Sm(t.element)?A.none():g(e,t,m.HighlightSubmenu))),onLeft:h(((e,t)=>Sm(t.element)?A.none():p(e,t))),onEscape:h(((t,o)=>p(t,o).orThunk((()=>e.onEscape(t,o).map((()=>t)))))),focusIn:(e,t)=>{n.getPrimary().each((t=>{Vr(e,t.element,gr())}))}}),Xm.config({highlightClass:e.markers.selectedMenu,itemClass:e.markers.menu}),Om.config({find:e=>Xm.getHighlighted(e)}),eh.config({})]),eventOrder:e.eventOrder,apis:y,events:f}},extraApis:{tieredData:(e,t,o)=>({primary:e,menus:t,expansions:o}),singleData:(e,t)=>({primary:e,menus:Ds(e,t),expansions:{}}),collapseItem:e=>({value:ca(Wh()),meta:{text:e}})}}),Gh=xm({name:"InlineView",configFields:[ns("lazySink"),Ri("onShow"),Ri("onHide"),bs("onEscape"),yu("inlineBehaviours",[Zd,vu,Il]),ys("fireDismissalEventInstead",[xs("event",Or())]),ys("fireRepositionEventInstead",[xs("event",_r())]),xs("getRelated",A.none),xs("isExtraPart",T),xs("eventOrder",A.none)],factory:(e,t)=>{const o=(t,o,n,s)=>{const r=e.lazySink(t).getOrDie();Zd.openWhileCloaked(t,o,(()=>_d.positionWithinBounds(r,t,n,s()))),vu.setValue(t,A.some({mode:"position",config:n,getBounds:s}))},n=(t,o,n,s)=>{const r=((e,t,o,n,s)=>{const r=()=>e.lazySink(t),a="horizontal"===n.type?{layouts:{onLtr:()=>xl(),onRtl:()=>wl()}}:{},i=e=>(e=>2===e.length)(e)?a:{};return jh.sketch({dom:{tag:"div"},data:n.data,markers:n.menu.markers,highlightOnOpen:n.menu.highlightOnOpen,fakeFocus:n.menu.fakeFocus,onEscape:()=>(Zd.close(t),e.onEscape.map((e=>e(t))),A.some(!0)),onExecute:()=>A.some(!0),onOpenMenu:(e,t)=>{_d.positionWithinBounds(r().getOrDie(),t,o,s())},onOpenSubmenu:(e,t,o,n)=>{const s=r().getOrDie();_d.position(s,o,{anchor:{type:"submenu",item:t,...i(n)}})},onRepositionMenu:(e,t,n)=>{const a=r().getOrDie();_d.positionWithinBounds(a,t,o,s()),H(n,(e=>{const t=i(e.triggeringPath);_d.position(a,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem,...t}})}))}})})(e,t,o,n,s);Zd.open(t,r),vu.setValue(t,A.some({mode:"menu",menu:r}))},s=t=>{Zd.isOpen(t)&&vu.getValue(t).each((o=>{switch(o.mode){case"menu":Zd.getState(t).each(jh.repositionMenus);break;case"position":const n=e.lazySink(t).getOrDie();_d.positionWithinBounds(n,t,o.config,o.getBounds())}}))},r={setContent:(e,t)=>{Zd.setContent(e,t)},showAt:(e,t,n)=>{const s=A.none;o(e,t,n,s)},showWithinBounds:o,showMenuAt:(e,t,o)=>{n(e,t,o,A.none)},showMenuWithinBounds:n,hide:e=>{Zd.isOpen(e)&&(vu.setValue(e,A.none()),Zd.close(e))},getContent:e=>Zd.getState(e),reposition:s,isOpen:Zd.isOpen};return{uid:e.uid,dom:e.dom,behaviours:wu(e.inlineBehaviours,[Zd.config({isPartOf:(t,o,n)=>Si(o,n)||((t,o)=>e.getRelated(t).exists((e=>Si(e,o))))(t,n),getAttachPoint:t=>e.lazySink(t).getOrDie(),onOpen:t=>{e.onShow(t)},onClose:t=>{e.onHide(t)}}),vu.config({store:{mode:"memory",initialValue:A.none()}}),Il.config({channels:{...nu({isExtraPart:t.isExtraPart,...e.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...ru({...e.fireRepositionEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({}),doReposition:s})}})]),eventOrder:e.eventOrder,apis:r}},apis:{showAt:(e,t,o,n)=>{e.showAt(t,o,n)},showWithinBounds:(e,t,o,n,s)=>{e.showWithinBounds(t,o,n,s)},showMenuAt:(e,t,o,n)=>{e.showMenuAt(t,o,n)},showMenuWithinBounds:(e,t,o,n,s)=>{e.showMenuWithinBounds(t,o,n,s)},hide:(e,t)=>{e.hide(t)},isOpen:(e,t)=>e.isOpen(t),getContent:(e,t)=>e.getContent(t),setContent:(e,t,o)=>{e.setContent(t,o)},reposition:(e,t)=>{e.reposition(t)}}});var $h=tinymce.util.Tools.resolve("tinymce.util.Delay");const qh=xm({name:"Button",factory:e=>{const t=fh(e.action),o=e.dom.tag,n=t=>be(e.dom,"attributes").bind((e=>be(e,t)));return{uid:e.uid,dom:e.dom,components:e.components,events:t,behaviours:ku(e.buttonBehaviours,[ah.config({}),Gp.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:"button"===o?{type:n("type").getOr("button"),...n("role").map((e=>({role:e}))).getOr({})}:{role:e.role.getOr(n("role").getOr("button"))}},eventOrder:e.eventOrder}},configFields:[xs("uid",void 0),ns("dom"),xs("components",[]),Su("buttonBehaviours",[ah,Gp]),ms("action"),ms("role"),xs("eventOrder",{})]}),Yh=e=>{const t=Re(e),o=lt(t),n=(e=>{const t=void 0!==e.dom.attributes?e.dom.attributes:[];return j(t,((e,t)=>"class"===t.name?e:{...e,[t.name]:t.value}),{})})(t),s=(e=>Array.prototype.slice.call(e.dom.classList,0))(t),r=0===o.length?{}:{innerHtml:ta(t)};return{tag:We(t),classes:s,attributes:n,...r}},Xh=e=>{const t=(e=>void 0!==e.uid)(e)&&ye(e,"uid")?e.uid:fa("memento");return{get:e=>e.getSystem().getByUid(t).getOrDie(),getOpt:e=>e.getSystem().getByUid(t).toOptional(),asSpec:()=>({...e,uid:t})}},{entries:Kh,setPrototypeOf:Jh,isFrozen:Zh,getPrototypeOf:Qh,getOwnPropertyDescriptor:ef}=Object;let{freeze:tf,seal:of,create:nf}=Object,{apply:sf,construct:rf}="undefined"!=typeof Reflect&&Reflect;sf||(sf=function(e,t,o){return e.apply(t,o)}),tf||(tf=function(e){return e}),of||(of=function(e){return e}),rf||(rf=function(e,t){return new e(...t)});const af=yf(Array.prototype.forEach),lf=yf(Array.prototype.pop),cf=yf(Array.prototype.push),df=yf(String.prototype.toLowerCase),uf=yf(String.prototype.toString),mf=yf(String.prototype.match),gf=yf(String.prototype.replace),pf=yf(String.prototype.indexOf),hf=yf(String.prototype.trim),ff=yf(RegExp.prototype.test),bf=(vf=TypeError,function(){for(var e=arguments.length,t=new Array(e),o=0;o<e;o++)t[o]=arguments[o];return rf(vf,t)});var vf;function yf(e){return function(t){for(var o=arguments.length,n=new Array(o>1?o-1:0),s=1;s<o;s++)n[s-1]=arguments[s];return sf(e,t,n)}}function xf(e,t,o){var n;o=null!==(n=o)&&void 0!==n?n:df,Jh&&Jh(e,null);let s=t.length;for(;s--;){let n=t[s];if("string"==typeof n){const e=o(n);e!==n&&(Zh(t)||(t[s]=e),n=e)}e[n]=!0}return e}function wf(e){const t=nf(null);for(const[o,n]of Kh(e))t[o]=n;return t}function Sf(e,t){for(;null!==e;){const o=ef(e,t);if(o){if(o.get)return yf(o.get);if("function"==typeof o.value)return yf(o.value)}e=Qh(e)}return function(e){return console.warn("fallback value for",e),null}}const kf=tf(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Cf=tf(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),Of=tf(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),_f=tf(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),Tf=tf(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),Ef=tf(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Af=tf(["#text"]),Mf=tf(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),Df=tf(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Bf=tf(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),If=tf(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Ff=of(/\{\{[\w\W]*|[\w\W]*\}\}/gm),Rf=of(/<%[\w\W]*|[\w\W]*%>/gm),Nf=of(/\${[\w\W]*}/gm),Vf=of(/^data-[\-\w.\u00B7-\uFFFF]/),zf=of(/^aria-[\-\w]+$/),Lf=of(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Hf=of(/^(?:\w+script|data):/i),Pf=of(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Uf=of(/^html$/i);var Wf=Object.freeze({__proto__:null,MUSTACHE_EXPR:Ff,ERB_EXPR:Rf,TMPLIT_EXPR:Nf,DATA_ATTR:Vf,ARIA_ATTR:zf,IS_ALLOWED_URI:Lf,IS_SCRIPT_OR_DATA:Hf,ATTR_WHITESPACE:Pf,DOCTYPE_NAME:Uf});const jf=()=>"undefined"==typeof window?null:window;var Gf=function e(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:jf();const o=t=>e(t);if(o.version="3.0.5",o.removed=[],!t||!t.document||9!==t.document.nodeType)return o.isSupported=!1,o;const n=t.document,s=n.currentScript;let{document:r}=t;const{DocumentFragment:a,HTMLTemplateElement:i,Node:l,Element:c,NodeFilter:d,NamedNodeMap:u=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:m,DOMParser:g,trustedTypes:p}=t,h=c.prototype,f=Sf(h,"cloneNode"),b=Sf(h,"nextSibling"),v=Sf(h,"childNodes"),y=Sf(h,"parentNode");if("function"==typeof i){const e=r.createElement("template");e.content&&e.content.ownerDocument&&(r=e.content.ownerDocument)}let x,w="";const{implementation:S,createNodeIterator:k,createDocumentFragment:C,getElementsByTagName:O}=r,{importNode:_}=n;let T={};o.isSupported="function"==typeof Kh&&"function"==typeof y&&S&&void 0!==S.createHTMLDocument;const{MUSTACHE_EXPR:E,ERB_EXPR:A,TMPLIT_EXPR:M,DATA_ATTR:D,ARIA_ATTR:B,IS_SCRIPT_OR_DATA:I,ATTR_WHITESPACE:F}=Wf;let{IS_ALLOWED_URI:R}=Wf,N=null;const V=xf({},[...kf,...Cf,...Of,...Tf,...Af]);let z=null;const L=xf({},[...Mf,...Df,...Bf,...If]);let H=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),P=null,U=null,W=!0,j=!0,G=!1,$=!0,q=!1,Y=!1,X=!1,K=!1,J=!1,Z=!1,Q=!1,ee=!0,te=!1,oe=!0,ne=!1,se={},re=null;const ae=xf({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]);let ie=null;const le=xf({},["audio","video","img","source","image","track"]);let ce=null;const de=xf({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ue="http://www.w3.org/1998/Math/MathML",me="http://www.w3.org/2000/svg",ge="http://www.w3.org/1999/xhtml";let pe=ge,he=!1,fe=null;const be=xf({},[ue,me,ge],uf);let ve;const ye=["application/xhtml+xml","text/html"];let xe,we=null;const Se=r.createElement("form"),ke=function(e){return e instanceof RegExp||e instanceof Function},Ce=function(e){if(!we||we!==e){if(e&&"object"==typeof e||(e={}),e=wf(e),ve=ve=-1===ye.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,xe="application/xhtml+xml"===ve?uf:df,N="ALLOWED_TAGS"in e?xf({},e.ALLOWED_TAGS,xe):V,z="ALLOWED_ATTR"in e?xf({},e.ALLOWED_ATTR,xe):L,fe="ALLOWED_NAMESPACES"in e?xf({},e.ALLOWED_NAMESPACES,uf):be,ce="ADD_URI_SAFE_ATTR"in e?xf(wf(de),e.ADD_URI_SAFE_ATTR,xe):de,ie="ADD_DATA_URI_TAGS"in e?xf(wf(le),e.ADD_DATA_URI_TAGS,xe):le,re="FORBID_CONTENTS"in e?xf({},e.FORBID_CONTENTS,xe):ae,P="FORBID_TAGS"in e?xf({},e.FORBID_TAGS,xe):{},U="FORBID_ATTR"in e?xf({},e.FORBID_ATTR,xe):{},se="USE_PROFILES"in e&&e.USE_PROFILES,W=!1!==e.ALLOW_ARIA_ATTR,j=!1!==e.ALLOW_DATA_ATTR,G=e.ALLOW_UNKNOWN_PROTOCOLS||!1,$=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,q=e.SAFE_FOR_TEMPLATES||!1,Y=e.WHOLE_DOCUMENT||!1,J=e.RETURN_DOM||!1,Z=e.RETURN_DOM_FRAGMENT||!1,Q=e.RETURN_TRUSTED_TYPE||!1,K=e.FORCE_BODY||!1,ee=!1!==e.SANITIZE_DOM,te=e.SANITIZE_NAMED_PROPS||!1,oe=!1!==e.KEEP_CONTENT,ne=e.IN_PLACE||!1,R=e.ALLOWED_URI_REGEXP||Lf,pe=e.NAMESPACE||ge,H=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&ke(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(H.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&ke(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(H.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(H.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),q&&(j=!1),Z&&(J=!0),se&&(N=xf({},[...Af]),z=[],!0===se.html&&(xf(N,kf),xf(z,Mf)),!0===se.svg&&(xf(N,Cf),xf(z,Df),xf(z,If)),!0===se.svgFilters&&(xf(N,Of),xf(z,Df),xf(z,If)),!0===se.mathMl&&(xf(N,Tf),xf(z,Bf),xf(z,If))),e.ADD_TAGS&&(N===V&&(N=wf(N)),xf(N,e.ADD_TAGS,xe)),e.ADD_ATTR&&(z===L&&(z=wf(z)),xf(z,e.ADD_ATTR,xe)),e.ADD_URI_SAFE_ATTR&&xf(ce,e.ADD_URI_SAFE_ATTR,xe),e.FORBID_CONTENTS&&(re===ae&&(re=wf(re)),xf(re,e.FORBID_CONTENTS,xe)),oe&&(N["#text"]=!0),Y&&xf(N,["html","head","body"]),N.table&&(xf(N,["tbody"]),delete P.tbody),e.TRUSTED_TYPES_POLICY){if("function"!=typeof e.TRUSTED_TYPES_POLICY.createHTML)throw bf('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if("function"!=typeof e.TRUSTED_TYPES_POLICY.createScriptURL)throw bf('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');x=e.TRUSTED_TYPES_POLICY,w=x.createHTML("")}else void 0===x&&(x=function(e,t){if("object"!=typeof e||"function"!=typeof e.createPolicy)return null;let o=null;const n="data-tt-policy-suffix";t&&t.hasAttribute(n)&&(o=t.getAttribute(n));const s="dompurify"+(o?"#"+o:"");try{return e.createPolicy(s,{createHTML:e=>e,createScriptURL:e=>e})}catch(e){return console.warn("TrustedTypes policy "+s+" could not be created."),null}}(p,s)),null!==x&&"string"==typeof w&&(w=x.createHTML(""));tf&&tf(e),we=e}},Oe=xf({},["mi","mo","mn","ms","mtext"]),_e=xf({},["foreignobject","desc","title","annotation-xml"]),Te=xf({},["title","style","font","a","script"]),Ee=xf({},Cf);xf(Ee,Of),xf(Ee,_f);const Ae=xf({},Tf);xf(Ae,Ef);const Me=function(e){cf(o.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){e.remove()}},De=function(e,t){try{cf(o.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){cf(o.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!z[e])if(J||Z)try{Me(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Be=function(e){let t,o;if(K)e="<remove></remove>"+e;else{const t=mf(e,/^[\r\n\t ]+/);o=t&&t[0]}"application/xhtml+xml"===ve&&pe===ge&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");const n=x?x.createHTML(e):e;if(pe===ge)try{t=(new g).parseFromString(n,ve)}catch(e){}if(!t||!t.documentElement){t=S.createDocument(pe,"template",null);try{t.documentElement.innerHTML=he?w:n}catch(e){}}const s=t.body||t.documentElement;return e&&o&&s.insertBefore(r.createTextNode(o),s.childNodes[0]||null),pe===ge?O.call(t,Y?"html":"body")[0]:Y?t.documentElement:s},Ie=function(e){return k.call(e.ownerDocument||e,e,d.SHOW_ELEMENT|d.SHOW_COMMENT|d.SHOW_TEXT,null,!1)},Fe=function(e){return"object"==typeof l?e instanceof l:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Re=function(e,t,n){T[e]&&af(T[e],(e=>{e.call(o,t,n,we)}))},Ne=function(e){let t;if(Re("beforeSanitizeElements",e,null),(n=e)instanceof m&&("string"!=typeof n.nodeName||"string"!=typeof n.textContent||"function"!=typeof n.removeChild||!(n.attributes instanceof u)||"function"!=typeof n.removeAttribute||"function"!=typeof n.setAttribute||"string"!=typeof n.namespaceURI||"function"!=typeof n.insertBefore||"function"!=typeof n.hasChildNodes))return Me(e),!0;var n;const s=xe(e.nodeName);if(Re("uponSanitizeElement",e,{tagName:s,allowedTags:N}),e.hasChildNodes()&&!Fe(e.firstElementChild)&&(!Fe(e.content)||!Fe(e.content.firstElementChild))&&ff(/<[/\w]/g,e.innerHTML)&&ff(/<[/\w]/g,e.textContent))return Me(e),!0;if(!N[s]||P[s]){if(!P[s]&&ze(s)){if(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,s))return!1;if(H.tagNameCheck instanceof Function&&H.tagNameCheck(s))return!1}if(oe&&!re[s]){const t=y(e)||e.parentNode,o=v(e)||e.childNodes;if(o&&t)for(let n=o.length-1;n>=0;--n)t.insertBefore(f(o[n],!0),b(e))}return Me(e),!0}return e instanceof c&&!function(e){let t=y(e);t&&t.tagName||(t={namespaceURI:pe,tagName:"template"});const o=df(e.tagName),n=df(t.tagName);return!!fe[e.namespaceURI]&&(e.namespaceURI===me?t.namespaceURI===ge?"svg"===o:t.namespaceURI===ue?"svg"===o&&("annotation-xml"===n||Oe[n]):Boolean(Ee[o]):e.namespaceURI===ue?t.namespaceURI===ge?"math"===o:t.namespaceURI===me?"math"===o&&_e[n]:Boolean(Ae[o]):e.namespaceURI===ge?!(t.namespaceURI===me&&!_e[n])&&!(t.namespaceURI===ue&&!Oe[n])&&!Ae[o]&&(Te[o]||!Ee[o]):!("application/xhtml+xml"!==ve||!fe[e.namespaceURI]))}(e)?(Me(e),!0):"noscript"!==s&&"noembed"!==s&&"noframes"!==s||!ff(/<\/no(script|embed|frames)/i,e.innerHTML)?(q&&3===e.nodeType&&(t=e.textContent,t=gf(t,E," "),t=gf(t,A," "),t=gf(t,M," "),e.textContent!==t&&(cf(o.removed,{element:e.cloneNode()}),e.textContent=t)),Re("afterSanitizeElements",e,null),!1):(Me(e),!0)},Ve=function(e,t,o){if(ee&&("id"===t||"name"===t)&&(o in r||o in Se))return!1;if(j&&!U[t]&&ff(D,t));else if(W&&ff(B,t));else if(!z[t]||U[t]){if(!(ze(e)&&(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,e)||H.tagNameCheck instanceof Function&&H.tagNameCheck(e))&&(H.attributeNameCheck instanceof RegExp&&ff(H.attributeNameCheck,t)||H.attributeNameCheck instanceof Function&&H.attributeNameCheck(t))||"is"===t&&H.allowCustomizedBuiltInElements&&(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,o)||H.tagNameCheck instanceof Function&&H.tagNameCheck(o))))return!1}else if(ce[t]);else if(ff(R,gf(o,F,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==pf(o,"data:")||!ie[e])if(G&&!ff(I,gf(o,F,"")));else if(o)return!1;return!0},ze=function(e){return e.indexOf("-")>0},Le=function(e){let t,o,n,s;Re("beforeSanitizeAttributes",e,null);const{attributes:r}=e;if(!r)return;const a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:z};for(s=r.length;s--;){t=r[s];const{name:i,namespaceURI:l}=t;o="value"===i?t.value:hf(t.value);const c=o;if(n=xe(i),a.attrName=n,a.attrValue=o,a.keepAttr=!0,a.forceKeepAttr=void 0,Re("uponSanitizeAttribute",e,a),o=a.attrValue,a.forceKeepAttr)continue;if(!a.keepAttr){De(i,e);continue}if(!$&&ff(/\/>/i,o)){De(i,e);continue}q&&(o=gf(o,E," "),o=gf(o,A," "),o=gf(o,M," "));const d=xe(e.nodeName);if(Ve(d,n,o)){if(!te||"id"!==n&&"name"!==n||(De(i,e),o="user-content-"+o),x&&"object"==typeof p&&"function"==typeof p.getAttributeType)if(l);else switch(p.getAttributeType(d,n)){case"TrustedHTML":o=x.createHTML(o);break;case"TrustedScriptURL":o=x.createScriptURL(o)}if(o!==c)try{l?e.setAttributeNS(l,i,o):e.setAttribute(i,o)}catch(t){De(i,e)}}else De(i,e)}Re("afterSanitizeAttributes",e,null)},He=function e(t){let o;const n=Ie(t);for(Re("beforeSanitizeShadowDOM",t,null);o=n.nextNode();)Re("uponSanitizeShadowNode",o,null),Ne(o)||(o.content instanceof a&&e(o.content),Le(o));Re("afterSanitizeShadowDOM",t,null)};return o.sanitize=function(e){let t,s,r,i,c=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(he=!e,he&&(e="\x3c!--\x3e"),"string"!=typeof e&&!Fe(e)){if("function"!=typeof e.toString)throw bf("toString is not a function");if("string"!=typeof(e=e.toString()))throw bf("dirty is not a string, aborting")}if(!o.isSupported)return e;if(X||Ce(c),o.removed=[],"string"==typeof e&&(ne=!1),ne){if(e.nodeName){const t=xe(e.nodeName);if(!N[t]||P[t])throw bf("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof l)t=Be("\x3c!----\x3e"),s=t.ownerDocument.importNode(e,!0),1===s.nodeType&&"BODY"===s.nodeName||"HTML"===s.nodeName?t=s:t.appendChild(s);else{if(!J&&!q&&!Y&&-1===e.indexOf("<"))return x&&Q?x.createHTML(e):e;if(t=Be(e),!t)return J?null:Q?w:""}t&&K&&Me(t.firstChild);const d=Ie(ne?e:t);for(;r=d.nextNode();)Ne(r)||(r.content instanceof a&&He(r.content),Le(r));if(ne)return e;if(J){if(Z)for(i=C.call(t.ownerDocument);t.firstChild;)i.appendChild(t.firstChild);else i=t;return(z.shadowroot||z.shadowrootmode)&&(i=_.call(n,i,!0)),i}let u=Y?t.outerHTML:t.innerHTML;return Y&&N["!doctype"]&&t.ownerDocument&&t.ownerDocument.doctype&&t.ownerDocument.doctype.name&&ff(Uf,t.ownerDocument.doctype.name)&&(u="<!DOCTYPE "+t.ownerDocument.doctype.name+">\n"+u),q&&(u=gf(u,E," "),u=gf(u,A," "),u=gf(u,M," ")),x&&Q?x.createHTML(u):u},o.setConfig=function(e){Ce(e),X=!0},o.clearConfig=function(){we=null,X=!1},o.isValidAttribute=function(e,t,o){we||Ce({});const n=xe(e),s=xe(t);return Ve(n,s,o)},o.addHook=function(e,t){"function"==typeof t&&(T[e]=T[e]||[],cf(T[e],t))},o.removeHook=function(e){if(T[e])return lf(T[e])},o.removeHooks=function(e){T[e]&&(T[e]=[])},o.removeAllHooks=function(){T={}},o}();const $f=e=>Gf().sanitize(e);var qf=tinymce.util.Tools.resolve("tinymce.util.I18n");const Yf={indent:!0,outdent:!0,"table-insert-column-after":!0,"table-insert-column-before":!0,"paste-column-after":!0,"paste-column-before":!0,"unordered-list":!0,"list-bull-circle":!0,"list-bull-default":!0,"list-bull-square":!0},Xf="temporary-placeholder",Kf=e=>()=>be(e,Xf).getOr("!not found!"),Jf=(e,t)=>{const o=e.toLowerCase();if(qf.isRtl()){const e=((e,t)=>Ae(e,t)?e:((e,t)=>e+t)(e,t))(o,"-rtl");return ve(t,e)?e:o}return o},Zf=(e,t)=>be(t,Jf(e,t)),Qf=(e,t)=>{const o=t();return Zf(e,o).getOrThunk(Kf(o))},eb=()=>th("add-focusable",[Jr((e=>{bi(e.element,"svg").each((e=>Ct(e,"focusable","false")))}))]),tb=(e,t,o,n)=>{var s,r;const a=(e=>!!qf.isRtl()&&ve(Yf,e))(t)?["tox-icon--flip"]:[],i=be(o,Jf(t,o)).or(n).getOrThunk(Kf(o));return{dom:{tag:e.tag,attributes:null!==(s=e.attributes)&&void 0!==s?s:{},classes:e.classes.concat(a),innerHtml:i},behaviours:Tl([...null!==(r=e.behaviours)&&void 0!==r?r:[],eb()])}},ob=(e,t,o,n=A.none())=>tb(t,e,o(),n),nb={success:"checkmark",error:"warning",err:"error",warning:"warning",warn:"warning",info:"info"},sb=xm({name:"Notification",factory:e=>{const t=Xh({dom:Yh(`<p>${$f(e.translationProvider(e.text))}</p>`),behaviours:Tl([eh.config({})])}),o=e=>({dom:{tag:"div",classes:["tox-bar"],styles:{width:`${e}%`}}}),n=e=>({dom:{tag:"div",classes:["tox-text"],innerHtml:`${e}%`}}),s=Xh({dom:{tag:"div",classes:e.progress?["tox-progress-bar","tox-progress-indicator"]:["tox-progress-bar"]},components:[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(0)]},n(0)],behaviours:Tl([eh.config({})])}),r={updateProgress:(e,t)=>{e.getSystem().isConnected()&&s.getOpt(e).each((e=>{eh.set(e,[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(t)]},n(t)])}))},updateText:(e,o)=>{if(e.getSystem().isConnected()){const n=t.get(e);eh.set(n,[ri(o)])}}},a=q([e.icon.toArray(),e.level.toArray(),e.level.bind((e=>A.from(nb[e]))).toArray()]),i=Xh(qh.sketch({dom:{tag:"button",classes:["tox-notification__dismiss","tox-button","tox-button--naked","tox-button--icon"]},components:[ob("close",{tag:"span",classes:["tox-icon"],attributes:{"aria-label":e.translationProvider("Close")}},e.iconProvider)],action:t=>{e.onAction(t)}})),l=((e,t,o)=>{const n=o(),s=G(e,(e=>ve(n,Jf(e,n))));return tb({tag:"div",classes:["tox-notification__icon"]},s.getOr(Xf),n,A.none())})(a,0,e.iconProvider),c=[l,{dom:{tag:"div",classes:["tox-notification__body"]},components:[t.asSpec()],behaviours:Tl([eh.config({})])}];return{uid:e.uid,dom:{tag:"div",attributes:{role:"alert"},classes:e.level.map((e=>["tox-notification","tox-notification--in",`tox-notification--${e}`])).getOr(["tox-notification","tox-notification--in"])},behaviours:Tl([ah.config({}),th("notification-events",[Wr(Xs(),(e=>{i.getOpt(e).each(ah.focus)}))])]),components:c.concat(e.progress?[s.asSpec()]:[]).concat(e.closeButton?[i.asSpec()]:[]),apis:r}},configFields:[ms("level"),ns("progress"),ms("icon"),ns("onAction"),ns("text"),ns("iconProvider"),ns("translationProvider"),Os("closeButton",!0)],apis:{updateProgress:(e,t,o)=>{e.updateProgress(t,o)},updateText:(e,t,o)=>{e.updateText(t,o)}}});var rb,ab,ib=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),lb=tinymce.util.Tools.resolve("tinymce.EditorManager"),cb=tinymce.util.Tools.resolve("tinymce.Env");!function(e){e.default="wrap",e.floating="floating",e.sliding="sliding",e.scrolling="scrolling"}(rb||(rb={})),function(e){e.auto="auto",e.top="top",e.bottom="bottom"}(ab||(ab={}));const db=e=>t=>t.options.get(e),ub=e=>t=>A.from(e(t)),mb=e=>{const t=cb.deviceType.isPhone(),o=cb.deviceType.isTablet()||t,n=e.options.register,s=e=>r(e)||!1===e,a=e=>r(e)||h(e);n("skin",{processor:e=>r(e)||!1===e,default:"oxide"}),n("skin_url",{processor:"string"}),n("height",{processor:a,default:Math.max(e.getElement().offsetHeight,400)}),n("width",{processor:a,default:ib.DOM.getStyle(e.getElement(),"width")}),n("min_height",{processor:"number",default:100}),n("min_width",{processor:"number"}),n("max_height",{processor:"number"}),n("max_width",{processor:"number"}),n("style_formats",{processor:"object[]"}),n("style_formats_merge",{processor:"boolean",default:!1}),n("style_formats_autohide",{processor:"boolean",default:!1}),n("line_height_formats",{processor:"string",default:"1 1.1 1.2 1.3 1.4 1.5 2"}),n("font_family_formats",{processor:"string",default:"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"}),n("font_size_formats",{processor:"string",default:"8pt 10pt 12pt 14pt 18pt 24pt 36pt"}),n("font_size_input_default_unit",{processor:"string",default:"pt"}),n("block_formats",{processor:"string",default:"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre"}),n("content_langs",{processor:"object[]"}),n("removed_menuitems",{processor:"string",default:""}),n("menubar",{processor:e=>r(e)||d(e),default:!t}),n("menu",{processor:"object",default:{}}),n("toolbar",{processor:e=>d(e)||r(e)||l(e)?{value:e,valid:!0}:{valid:!1,message:"Must be a boolean, string or array."},default:!0}),V(9,(e=>{n("toolbar"+(e+1),{processor:"string"})})),n("toolbar_mode",{processor:"string",default:o?"scrolling":"floating"}),n("toolbar_groups",{processor:"object",default:{}}),n("toolbar_location",{processor:"string",default:ab.auto}),n("toolbar_persist",{processor:"boolean",default:!1}),n("toolbar_sticky",{processor:"boolean",default:e.inline}),n("toolbar_sticky_offset",{processor:"number",default:0}),n("fixed_toolbar_container",{processor:"string",default:""}),n("fixed_toolbar_container_target",{processor:"object"}),n("ui_mode",{processor:"string",default:"combined"}),n("file_picker_callback",{processor:"function"}),n("file_picker_validator_handler",{processor:"function"}),n("file_picker_types",{processor:"string"}),n("typeahead_urls",{processor:"boolean",default:!0}),n("anchor_top",{processor:s,default:"#top"}),n("anchor_bottom",{processor:s,default:"#bottom"}),n("draggable_modal",{processor:"boolean",default:!1}),n("statusbar",{processor:"boolean",default:!0}),n("elementpath",{processor:"boolean",default:!0}),n("branding",{processor:"boolean",default:!0}),n("promotion",{processor:"boolean",default:!0}),n("resize",{processor:e=>"both"===e||d(e),default:!cb.deviceType.isTouch()}),n("sidebar_show",{processor:"string"}),n("help_accessibility",{processor:"boolean",default:e.hasPlugin("help")}),n("default_font_stack",{processor:"string[]",default:[]})},gb=db("readonly"),pb=db("height"),hb=db("width"),fb=ub(db("min_width")),bb=ub(db("min_height")),vb=ub(db("max_width")),yb=ub(db("max_height")),xb=ub(db("style_formats")),wb=db("style_formats_merge"),Sb=db("style_formats_autohide"),kb=db("content_langs"),Cb=db("removed_menuitems"),Ob=db("toolbar_mode"),_b=db("toolbar_groups"),Tb=db("toolbar_location"),Eb=db("fixed_toolbar_container"),Ab=db("fixed_toolbar_container_target"),Mb=db("toolbar_persist"),Db=db("toolbar_sticky_offset"),Bb=db("menubar"),Ib=db("toolbar"),Fb=db("file_picker_callback"),Rb=db("file_picker_validator_handler"),Nb=db("font_size_input_default_unit"),Vb=db("file_picker_types"),zb=db("typeahead_urls"),Lb=db("anchor_top"),Hb=db("anchor_bottom"),Pb=db("draggable_modal"),Ub=db("statusbar"),Wb=db("elementpath"),jb=db("branding"),Gb=db("resize"),$b=db("paste_as_text"),qb=db("sidebar_show"),Yb=db("promotion"),Xb=db("help_accessibility"),Kb=db("default_font_stack"),Jb=e=>!1===e.options.get("skin"),Zb=e=>!1!==e.options.get("menubar"),Qb=e=>{const t=e.options.get("skin_url");if(Jb(e))return t;if(t)return e.documentBaseURI.toAbsolute(t);{const t=e.options.get("skin");return lb.baseURL+"/skins/ui/"+t}},ev=e=>A.from(e.options.get("skin_url")),tv=e=>e.options.get("line_height_formats").split(" "),ov=e=>{const t=Ib(e),o=r(t),n=l(t)&&t.length>0;return!sv(e)&&(n||o||!0===t)},nv=e=>{const t=V(9,(t=>e.options.get("toolbar"+(t+1)))),o=U(t,r);return Ce(o.length>0,o)},sv=e=>nv(e).fold((()=>{const t=Ib(e);return f(t,r)&&t.length>0}),E),rv=e=>Tb(e)===ab.bottom,av=e=>{var t;if(!e.inline)return A.none();const o=null!==(t=Eb(e))&&void 0!==t?t:"";if(o.length>0)return vi(wt(),o);const n=Ab(e);return g(n)?A.some(ze(n)):A.none()},iv=e=>e.inline&&av(e).isSome(),lv=e=>av(e).getOrThunk((()=>bt(ft(ze(e.getElement()))))),cv=e=>e.inline&&!Zb(e)&&!ov(e)&&!sv(e),dv=e=>(e.options.get("toolbar_sticky")||e.inline)&&!iv(e)&&!cv(e),uv=e=>!iv(e)&&"split"===e.options.get("ui_mode"),mv=e=>{const t=e.options.get("menu");return ce(t,(e=>({...e,items:e.items})))};var gv=Object.freeze({__proto__:null,get ToolbarMode(){return rb},get ToolbarLocation(){return ab},register:mb,getSkinUrl:Qb,getSkinUrlOption:ev,isReadOnly:gb,isSkinDisabled:Jb,getHeightOption:pb,getWidthOption:hb,getMinWidthOption:fb,getMinHeightOption:bb,getMaxWidthOption:vb,getMaxHeightOption:yb,getUserStyleFormats:xb,shouldMergeStyleFormats:wb,shouldAutoHideStyleFormats:Sb,getLineHeightFormats:tv,getContentLanguages:kb,getRemovedMenuItems:Cb,isMenubarEnabled:Zb,isMultipleToolbars:sv,isToolbarEnabled:ov,isToolbarPersist:Mb,getMultipleToolbarsOption:nv,getUiContainer:lv,useFixedContainer:iv,isSplitUiMode:uv,getToolbarMode:Ob,isDraggableModal:Pb,isDistractionFree:cv,isStickyToolbar:dv,getStickyToolbarOffset:Db,getToolbarLocation:Tb,isToolbarLocationBottom:rv,getToolbarGroups:_b,getMenus:mv,getMenubar:Bb,getToolbar:Ib,getFilePickerCallback:Fb,getFilePickerTypes:Vb,useTypeaheadUrls:zb,getAnchorTop:Lb,getAnchorBottom:Hb,getFilePickerValidatorHandler:Rb,getFontSizeInputDefaultUnit:Nb,useStatusBar:Ub,useElementPath:Wb,promotionEnabled:Yb,useBranding:jb,getResize:Gb,getPasteAsText:$b,getSidebarShow:qb,useHelpAccessibility:Xb,getDefaultFontStack:Kb});const pv="[data-mce-autocompleter]",hv=e=>yi(e,pv);var fv;!function(e){e[e.CLOSE_ON_EXECUTE=0]="CLOSE_ON_EXECUTE",e[e.BUBBLE_TO_SANDBOX=1]="BUBBLE_TO_SANDBOX"}(fv||(fv={}));var bv=fv;const vv="tox-menu-nav__js",yv="tox-collection__item",xv="tox-swatch",wv={normal:vv,color:xv},Sv="tox-collection__item--enabled",kv="tox-collection__item-icon",Cv="tox-collection__item-label",Ov="tox-collection__item-caret",_v="tox-collection__item--active",Tv="tox-collection__item-container",Ev="tox-collection__item-container--row",Av=e=>be(wv,e).getOr(vv),Mv=e=>"color"===e?"tox-swatches":"tox-menu",Dv=e=>({backgroundMenu:"tox-background-menu",selectedMenu:"tox-selected-menu",selectedItem:"tox-collection__item--active",hasIcons:"tox-menu--has-icons",menu:Mv(e),tieredMenu:"tox-tiered-menu"}),Bv=e=>{const t=Dv(e);return{backgroundMenu:t.backgroundMenu,selectedMenu:t.selectedMenu,menu:t.menu,selectedItem:t.selectedItem,item:Av(e)}},Iv=(e,t,o)=>{const n=Dv(o);return{tag:"div",classes:q([[n.menu,`tox-menu-${t}-column`],e?[n.hasIcons]:[]])}},Fv=[Rh.parts.items({})],Rv=(e,t,o)=>{const n=Dv(o);return{dom:{tag:"div",classes:q([[n.tieredMenu]])},markers:Bv(o)}},Nv=x([ms("data"),xs("inputAttributes",{}),xs("inputStyles",{}),xs("tag","input"),xs("inputClasses",[]),Ri("onSetValue"),xs("styles",{}),xs("eventOrder",{}),yu("inputBehaviours",[vu,ah]),xs("selectOnFocus",!0)]),Vv=e=>Tl([ah.config({onFocus:e.selectOnFocus?e=>{const t=e.element,o=Ka(t);t.dom.setSelectionRange(0,o.length)}:b})]),zv=e=>({...Vv(e),...wu(e.inputBehaviours,[vu.config({store:{mode:"manual",...e.data.map((e=>({initialValue:e}))).getOr({}),getValue:e=>Ka(e.element),setValue:(e,t)=>{Ka(e.element)!==t&&Ja(e.element,t)}},onSetValue:e.onSetValue})])}),Lv=e=>({tag:e.tag,attributes:{type:"text",...e.inputAttributes},styles:e.inputStyles,classes:e.inputClasses}),Hv=xm({name:"Input",configFields:Nv(),factory:(e,t)=>({uid:e.uid,dom:Lv(e),components:[],behaviours:zv(e),eventOrder:e.eventOrder})}),Pv=ca("refetch-trigger-event"),Uv=ca("redirect-menu-item-interaction"),Wv="tox-menu__searcher",jv=e=>vi(e.element,`.${Wv}`).bind((t=>e.getSystem().getByDom(t).toOptional())),Gv=jv,$v=e=>({fetchPattern:vu.getValue(e),selectionStart:e.element.dom.selectionStart,selectionEnd:e.element.dom.selectionEnd}),qv=e=>{const t=(e,t)=>(t.cut(),A.none()),o=(e,t)=>{const o={interactionEvent:t.event,eventType:t.event.raw.type};return Rr(e,Uv,o),A.some(!0)},n="searcher-events";return{dom:{tag:"div",classes:[yv]},components:[Hv.sketch({inputClasses:[Wv,"tox-textfield"],inputAttributes:{...e.placeholder.map((t=>({placeholder:e.i18n(t)}))).getOr({}),type:"search","aria-autocomplete":"list"},inputBehaviours:Tl([th(n,[Wr(Qs(),(e=>{Fr(e,Pv)})),Wr(Js(),((e,t)=>{"Escape"===t.event.raw.key&&t.stop()}))]),Gp.config({mode:"special",onLeft:t,onRight:t,onSpace:t,onEnter:o,onEscape:o,onUp:o,onDown:o})]),eventOrder:{keydown:[n,Gp.name()]}})]}},Yv="tox-collection--results__js",Xv=e=>{var t;return e.dom?{...e,dom:{...e.dom,attributes:{...null!==(t=e.dom.attributes)&&void 0!==t?t:{},id:ca("aria-item-search-result-id"),"aria-selected":"false"}}}:e},Kv=(e,t)=>o=>{const n=z(o,t);return L(n,(t=>({dom:e,components:t})))},Jv=(e,t)=>{const o=[];let n=[];return H(e,((e,s)=>{t(e,s)?(n.length>0&&o.push(n),n=[],(ve(e.dom,"innerHtml")||e.components&&e.components.length>0)&&n.push(e)):n.push(e)})),n.length>0&&o.push(n),L(o,(e=>({dom:{tag:"div",classes:["tox-collection__group"]},components:e})))},Zv=(e,t,o)=>Rh.parts.items({preprocess:n=>{const s=L(n,o);return"auto"!==e&&e>1?Kv({tag:"div",classes:["tox-collection__group"]},e)(s):Jv(s,((e,o)=>"separator"===t[o].type))}}),Qv=(e,t,o=!0)=>({dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[Zv(e,t,w)]}),ey=e=>N(e,(e=>"icon"in e&&void 0!==e.icon)),ty=e=>(console.error(Jn(e)),console.log(e),A.none()),oy=(e,t,o,n,s)=>{const r=(a=o,{dom:{tag:"div",classes:["tox-collection","tox-collection--horizontal"]},components:[Rh.parts.items({preprocess:e=>Jv(e,((e,t)=>"separator"===a[t].type))})]});var a;return{value:e,dom:r.dom,components:r.components,items:o}},ny=(e,t,o,n,s)=>{if("color"===s.menuType){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-swatches-menu"]},components:[{dom:{tag:"div",classes:["tox-swatches"]},components:[Rh.parts.items({preprocess:"auto"!==e?Kv({tag:"div",classes:["tox-swatches__row"]},e):w})]}]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType&&"auto"===n){const t=Qv(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType||"searchable"===s.menuType){const t="searchable"!==s.menuType?Qv(n,o):"search-with-field"===s.searchMode.searchMode?((e,t,o)=>{const n=ca("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[qv({i18n:qf.translate,placeholder:o.placeholder}),{dom:{tag:"div",classes:[...1===e?["tox-collection--list"]:["tox-collection--grid"],Yv],attributes:{id:n}},components:[Zv(e,t,Xv)]}]}})(n,o,s.searchMode):((e,t,o=!0)=>{const n=ca("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection",Yv].concat(1===e?["tox-collection--list"]:["tox-collection--grid"]),attributes:{id:n}},components:[Zv(e,t,Xv)]}})(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("listpreview"===s.menuType&&"auto"!==n){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-collection","tox-collection--toolbar","tox-collection--toolbar-lg"]},components:[Rh.parts.items({preprocess:Kv({tag:"div",classes:["tox-collection__group"]},e)})]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}return{value:e,dom:Iv(t,n,s.menuType),components:Fv,items:o}},sy=as("type"),ry=as("name"),ay=as("label"),iy=as("text"),ly=as("title"),cy=as("icon"),dy=as("value"),uy=ls("fetch"),my=ls("getSubmenuItems"),gy=ls("onAction"),py=ls("onItemAction"),hy=_s("onSetup",(()=>b)),fy=hs("name"),by=hs("text"),vy=hs("icon"),yy=hs("tooltip"),xy=hs("label"),wy=hs("shortcut"),Sy=bs("select"),ky=Os("active",!1),Cy=Os("borderless",!1),Oy=Os("enabled",!0),_y=Os("primary",!1),Ty=e=>xs("columns",e),Ey=xs("meta",{}),Ay=_s("onAction",b),My=e=>ks("type",e),Dy=e=>es("name","name",yn((()=>ca(`${e}-name`))),Hn),By=Bn([sy,by]),Iy=Bn([My("autocompleteitem"),ky,Oy,Ey,dy,by,vy]),Fy=[Oy,yy,vy,by,hy],Ry=Bn([sy,gy].concat(Fy)),Ny=e=>Yn("toolbarbutton",Ry,e),Vy=[ky].concat(Fy),zy=Bn(Vy.concat([sy,gy])),Ly=e=>Yn("ToggleButton",zy,e),Hy=[_s("predicate",T),Cs("scope","node",["node","editor"]),Cs("position","selection",["node","selection","line"])],Py=Fy.concat([My("contextformbutton"),_y,gy,ts("original",w)]),Uy=Vy.concat([My("contextformbutton"),_y,gy,ts("original",w)]),Wy=Fy.concat([My("contextformbutton")]),jy=Vy.concat([My("contextformtogglebutton")]),Gy=Zn("type",{contextformbutton:Py,contextformtogglebutton:Uy}),$y=Bn([My("contextform"),_s("initValue",x("")),xy,us("commands",Gy),gs("launch",Zn("type",{contextformbutton:Wy,contextformtogglebutton:jy}))].concat(Hy)),qy=Bn([My("contexttoolbar"),as("items")].concat(Hy)),Yy=[sy,as("src"),hs("alt"),Ts("classes",[],Hn)],Xy=Bn(Yy),Ky=[sy,iy,fy,Ts("classes",["tox-collection__item-label"],Hn)],Jy=Bn(Ky),Zy=An((()=>Gn("type",{cardimage:Xy,cardtext:Jy,cardcontainer:Qy}))),Qy=Bn([sy,ks("direction","horizontal"),ks("align","left"),ks("valign","middle"),us("items",Zy)]),ex=[Oy,by,wy,("menuitem",es("value","value",yn((()=>ca("menuitem-value"))),Vn())),Ey];const tx=Bn([sy,xy,us("items",Zy),hy,Ay].concat(ex)),ox=Bn([sy,ky,vy].concat(ex)),nx=[sy,as("fancytype"),Ay],sx=[xs("initData",{})].concat(nx),rx=[bs("select"),Es("initData",{},[Os("allowCustomColors",!0),ks("storageKey","default"),vs("colors",Vn())])].concat(nx),ax=Zn("fancytype",{inserttable:sx,colorswatch:rx}),ix=Bn([sy,hy,Ay,vy].concat(ex)),lx=Bn([sy,my,hy,vy].concat(ex)),cx=Bn([sy,vy,ky,hy,gy].concat(ex)),dx=(e,t,o)=>{const n=Zc(e.element,"."+o);if(n.length>0){const e=$(n,(e=>{const o=e.dom.getBoundingClientRect().top,s=n[0].dom.getBoundingClientRect().top;return Math.abs(o-s)>t})).getOr(n.length);return A.some({numColumns:e,numRows:Math.ceil(n.length/e)})}return A.none()},ux=e=>((e,t)=>Tl([th(e,t)]))(ca("unnamed-events"),e),mx=ca("tooltip.exclusive"),gx=ca("tooltip.show"),px=ca("tooltip.hide"),hx=(e,t,o)=>{e.getSystem().broadcastOn([mx],{})};var fx=Object.freeze({__proto__:null,hideAllExclusive:hx,setComponents:(e,t,o,n)=>{o.getTooltip().each((e=>{e.getSystem().isConnected()&&eh.set(e,n)}))}}),bx=Object.freeze({__proto__:null,events:(e,t)=>{const o=o=>{t.getTooltip().each((n=>{Nd(n),e.onHide(o,n),t.clearTooltip()})),t.clearTimer()};return Hr(q([[Wr(gx,(o=>{t.resetTimer((()=>{(o=>{if(!t.isShowing()){hx(o);const n=e.lazySink(o).getOrDie(),s=o.getSystem().build({dom:e.tooltipDom,components:e.tooltipComponents,events:Hr("normal"===e.mode?[Wr(Ys(),(e=>{Fr(o,gx)})),Wr($s(),(e=>{Fr(o,px)}))]:[]),behaviours:Tl([eh.config({})])});t.setTooltip(s),Id(n,s),e.onShow(o,s),_d.position(n,s,{anchor:e.anchor(o)})}})(o)}),e.delay)})),Wr(px,(n=>{t.resetTimer((()=>{o(n)}),e.delay)})),Wr(ur(),((e,t)=>{const n=t;n.universal||R(n.channels,mx)&&o(e)})),Zr((e=>{o(e)}))],"normal"===e.mode?[Wr(Xs(),(e=>{Fr(e,gx)})),Wr(cr(),(e=>{Fr(e,px)})),Wr(Ys(),(e=>{Fr(e,gx)})),Wr($s(),(e=>{Fr(e,px)}))]:[Wr(Br(),((e,t)=>{Fr(e,gx)})),Wr(Ir(),(e=>{Fr(e,px)}))]]))}}),vx=[ns("lazySink"),ns("tooltipDom"),xs("exclusive",!0),xs("tooltipComponents",[]),xs("delay",300),Cs("mode","normal",["normal","follow-highlight"]),xs("anchor",(e=>({type:"hotspot",hotspot:e,layouts:{onLtr:x([gl,ml,ll,dl,cl,ul]),onRtl:x([gl,ml,ll,dl,cl,ul])}}))),Ri("onHide"),Ri("onShow")],yx=Object.freeze({__proto__:null,init:()=>{const e=nc(),t=nc(),o=()=>{e.on(clearTimeout)},n=x("not-implemented");return Ta({getTooltip:t.get,isShowing:t.isSet,setTooltip:t.set,clearTooltip:t.clear,clearTimer:o,resetTimer:(t,n)=>{o(),e.set(setTimeout(t,n))},readState:n})}});const xx=Al({fields:vx,name:"tooltipping",active:bx,state:yx,apis:fx}),wx="silver.readonly",Sx=Bn([("readonly",ss("readonly",Pn))]);const kx=(e,t)=>{const o=e.mainUi.outerContainer.element,n=[e.mainUi.mothership,...e.uiMotherships];t&&H(n,(e=>{e.broadcastOn([Qd()],{target:o})})),H(n,(e=>{e.broadcastOn([wx],{readonly:t})}))},Cx=(e,t)=>{e.on("init",(()=>{e.mode.isReadOnly()&&kx(t,!0)})),e.on("SwitchMode",(()=>kx(t,e.mode.isReadOnly()))),gb(e)&&e.mode.set("readonly")},Ox=()=>Il.config({channels:{[wx]:{schema:Sx,onReceive:(e,t)=>{Lm.set(e,t.readonly)}}}}),_x=e=>Lm.config({disabled:e}),Tx=e=>Lm.config({disabled:e,disableClass:"tox-tbtn--disabled"}),Ex=e=>Lm.config({disabled:e,disableClass:"tox-tbtn--disabled",useNative:!1}),Ax=(e,t)=>{const o=e.getApi(t);return e=>{e(o)}},Mx=(e,t)=>Jr((o=>{Ax(e,o)((o=>{const n=e.onSetup(o);p(n)&&t.set(n)}))})),Dx=(e,t)=>Zr((o=>Ax(e,o)(t.get()))),Bx=(e,t)=>ea(((o,n)=>{Ax(e,o)(e.onAction),e.triggersSubmenu||t!==bv.CLOSE_ON_EXECUTE||(o.getSystem().isConnected()&&Fr(o,fr()),n.stop())})),Ix={[mr()]:["disabling","alloy.base.behaviour","toggling","item-events"]},Fx=we,Rx=(e,t,o,n)=>{const s=As(b);return{type:"item",dom:t.dom,components:Fx(t.optComponents),data:e.data,eventOrder:Ix,hasSubmenu:e.triggersSubmenu,itemBehaviours:Tl([th("item-events",[Bx(e,o),Mx(e,s),Dx(e,s)]),(r=()=>!e.enabled||n.isDisabled(),Lm.config({disabled:r,disableClass:"tox-collection__item--state-disabled"})),Ox(),eh.config({})].concat(e.itemBehaviours))};var r},Nx=e=>({value:e.value,meta:{text:e.text.getOr(""),...e.meta}}),Vx=e=>{const t=cb.os.isMacOS()||cb.os.isiOS(),o=t?{alt:"\u2325",ctrl:"\u2303",shift:"\u21e7",meta:"\u2318",access:"\u2303\u2325"}:{meta:"Ctrl",access:"Shift+Alt"},n=e.split("+"),s=L(n,(e=>{const t=e.toLowerCase().trim();return ve(o,t)?o[t]:e}));return t?s.join(""):s.join("+")},zx=(e,t,o=[kv])=>ob(e,{tag:"div",classes:o},t),Lx=e=>({dom:{tag:"div",classes:[Cv]},components:[ri(qf.translate(e))]}),Hx=(e,t)=>({dom:{tag:"div",classes:t,innerHtml:e}}),Px=(e,t)=>({dom:{tag:"div",classes:[Cv]},components:[{dom:{tag:e.tag,styles:e.styles},components:[ri(qf.translate(t))]}]}),Ux=e=>({dom:{tag:"div",classes:["tox-collection__item-accessory"]},components:[ri(Vx(e))]}),Wx=e=>zx("checkmark",e,["tox-collection__item-checkmark"]),jx=e=>{const t=e.map((e=>({attributes:{title:qf.translate(e),id:ca("menu-item")}}))).getOr({});return{tag:"div",classes:[vv,yv],...t}},Gx=(e,t,o,n=A.none())=>"color"===e.presets?((e,t,o)=>{const n=e.ariaLabel,s=e.value,r=e.iconContent.map((e=>((e,t,o)=>{const n=t();return Zf(e,n).or(o).getOrThunk(Kf(n))})(e,t.icons,o)));return{dom:(()=>{const e=xv,o=r.getOr(""),a=n.map((e=>({title:t.translate(e)}))).getOr({}),i={tag:"div",attributes:a,classes:[e]};return"custom"===s?{...i,tag:"button",classes:[...i.classes,"tox-swatches__picker-btn"],innerHtml:o}:"remove"===s?{...i,classes:[...i.classes,"tox-swatch--remove"],innerHtml:o}:g(s)?{...i,attributes:{...i.attributes,"data-mce-color":s},styles:{"background-color":s},innerHtml:o}:i})(),optComponents:[]}})(e,t,n):((e,t,o,n)=>{const s={tag:"div",classes:[kv]},r=o?e.iconContent.map((e=>ob(e,s,t.icons,n))).orThunk((()=>A.some({dom:s}))):A.none(),a=e.checkMark,i=A.from(e.meta).fold((()=>Lx),(e=>ve(e,"style")?k(Px,e.style):Lx)),l=e.htmlContent.fold((()=>e.textContent.map(i)),(e=>A.some(Hx(e,[Cv]))));return{dom:jx(e.ariaLabel),optComponents:[r,l,e.shortcutContent.map(Ux),a,e.caret]}})(e,t,o,n),$x=(e,t)=>be(e,"tooltipWorker").map((e=>[xx.config({lazySink:t.getSink,tooltipDom:{tag:"div",classes:["tox-tooltip-worker-container"]},tooltipComponents:[],anchor:e=>({type:"submenu",item:e,overrides:{maxHeightFunction:gc}}),mode:"follow-highlight",onShow:(t,o)=>{e((e=>{xx.setComponents(t,[ai({element:ze(e)})])}))}})])).getOr([]),qx=(e,t)=>{const o=(e=>ib.DOM.encode(e))(qf.translate(e));if(t.length>0){const e=new RegExp((e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"))(t),"gi");return o.replace(e,(e=>`<span class="tox-autocompleter-highlight">${e}</span>`))}return o},Yx=(e,t)=>L(e,(e=>{switch(e.type){case"cardcontainer":return((e,t)=>{const o="vertical"===e.direction?"tox-collection__item-container--column":Ev,n="left"===e.align?"tox-collection__item-container--align-left":"tox-collection__item-container--align-right";return{dom:{tag:"div",classes:[Tv,o,n,(()=>{switch(e.valign){case"top":return"tox-collection__item-container--valign-top";case"middle":return"tox-collection__item-container--valign-middle";case"bottom":return"tox-collection__item-container--valign-bottom"}})()]},components:t}})(e,Yx(e.items,t));case"cardimage":return((e,t,o)=>({dom:{tag:"img",classes:t,attributes:{src:e,alt:o.getOr("")}}}))(e.src,e.classes,e.alt);case"cardtext":const o=e.name.exists((e=>R(t.cardText.highlightOn,e))),n=o?A.from(t.cardText.matchText).getOr(""):"";return Hx(qx(e.text,n),e.classes)}})),Xx=Qu(Eh(),Ah()),Kx=e=>({value:ew(e)}),Jx=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,Zx=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,Qx=e=>Jx.test(e)||Zx.test(e),ew=e=>_e(e,"#").toUpperCase(),tw=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},ow=e=>{const t=tw(e.red)+tw(e.green)+tw(e.blue);return Kx(t)},nw=Math.min,sw=Math.max,rw=Math.round,aw=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,iw=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,lw=(e,t,o,n)=>({red:e,green:t,blue:o,alpha:n}),cw=e=>{const t=parseInt(e,10);return t.toString()===e&&t>=0&&t<=255},dw=e=>{let t,o,n;const s=(e.hue||0)%360;let r=e.saturation/100,a=e.value/100;if(r=sw(0,nw(r,1)),a=sw(0,nw(a,1)),0===r)return t=o=n=rw(255*a),lw(t,o,n,1);const i=s/60,l=a*r,c=l*(1-Math.abs(i%2-1)),d=a-l;switch(Math.floor(i)){case 0:t=l,o=c,n=0;break;case 1:t=c,o=l,n=0;break;case 2:t=0,o=l,n=c;break;case 3:t=0,o=c,n=l;break;case 4:t=c,o=0,n=l;break;case 5:t=l,o=0,n=c;break;default:t=o=n=0}return t=rw(255*(t+d)),o=rw(255*(o+d)),n=rw(255*(n+d)),lw(t,o,n,1)},uw=e=>{const t=(e=>{const t=(e=>{const t=e.value.replace(Jx,((e,t,o,n)=>t+t+o+o+n+n));return{value:t}})(e),o=Zx.exec(t.value);return null===o?["FFFFFF","FF","FF","FF"]:o})(e),o=parseInt(t[1],16),n=parseInt(t[2],16),s=parseInt(t[3],16);return lw(o,n,s,1)},mw=(e,t,o,n)=>{const s=parseInt(e,10),r=parseInt(t,10),a=parseInt(o,10),i=parseFloat(n);return lw(s,r,a,i)},gw=e=>{if("transparent"===e)return A.some(lw(0,0,0,0));const t=aw.exec(e);if(null!==t)return A.some(mw(t[1],t[2],t[3],"1"));const o=iw.exec(e);return null!==o?A.some(mw(o[1],o[2],o[3],o[4])):A.none()},pw=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,hw=lw(255,0,0,1),fw=(e,t)=>{e.dispatch("ResizeContent",t)},bw=(e,t)=>{e.dispatch("TextColorChange",t)},vw=(e,t)=>e.dispatch("ResolveName",{name:t.nodeName.toLowerCase(),target:t}),yw=(e,t)=>()=>{e(),t()},xw=e=>Sw(e,"NodeChange",(t=>{t.setEnabled(e.selection.isEditable())})),ww=(e,t)=>o=>{const n=xw(e)(o),s=((e,t)=>o=>{const n=oc(),s=()=>{o.setActive(e.formatter.match(t));const s=e.formatter.formatChanged(t,o.setActive);n.set(s)};return e.initialized?s():e.once("init",s),()=>{e.off("init",s),n.clear()}})(e,t)(o);return()=>{n(),s()}},Sw=(e,t,o)=>n=>{const s=()=>o(n),r=()=>{o(n),e.on(t,s)};return e.initialized?r():e.once("init",r),()=>{e.off("init",r),e.off(t,s)}},kw=e=>t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("mceToggleFormat",!1,t.format)}))},Cw=(e,t)=>()=>e.execCommand(t);var Ow=tinymce.util.Tools.resolve("tinymce.util.LocalStorage");const _w={},Tw=e=>be(_w,e).getOrThunk((()=>{const t=`tinymce-custom-colors-${e}`,o=Ow.getItem(t);if(m(o)){const e=Ow.getItem("tinymce-custom-colors");Ow.setItem(t,g(e)?e:"[]")}const n=((e,t=10)=>{const o=Ow.getItem(e),n=r(o)?JSON.parse(o):[],s=t-(a=n).length<0?a.slice(0,t):a;var a;const i=e=>{s.splice(e,1)};return{add:o=>{F(s,o).each(i),s.unshift(o),s.length>t&&s.pop(),Ow.setItem(e,JSON.stringify(s))},state:()=>s.slice(0)}})(t,10);return _w[e]=n,n})),Ew=(e,t)=>{Tw(e).add(t)},Aw=(e,t,o)=>({hue:e,saturation:t,value:o}),Mw=e=>{let t=0,o=0,n=0;const s=e.red/255,r=e.green/255,a=e.blue/255,i=Math.min(s,Math.min(r,a)),l=Math.max(s,Math.max(r,a));return i===l?(n=i,Aw(0,0,100*n)):(t=s===i?3:a===i?1:5,t=60*(t-(s===i?r-a:a===i?s-r:a-s)/(l-i)),o=(l-i)/l,n=l,Aw(Math.round(t),Math.round(100*o),Math.round(100*n)))},Dw=e=>ow(dw(e)),Bw=e=>{return(t=e,Qx(t)?A.some({value:ew(t)}):A.none()).orThunk((()=>gw(e).map(ow))).getOrThunk((()=>{const t=document.createElement("canvas");t.height=1,t.width=1;const o=t.getContext("2d");o.clearRect(0,0,t.width,t.height),o.fillStyle="#FFFFFF",o.fillStyle=e,o.fillRect(0,0,1,1);const n=o.getImageData(0,0,1,1).data,s=n[0],r=n[1],a=n[2],i=n[3];return ow(lw(s,r,a,i))}));var t},Iw="forecolor",Fw="hilitecolor",Rw=e=>{const t=[];for(let o=0;o<e.length;o+=2)t.push({text:e[o+1],value:"#"+Bw(e[o]).value,icon:"checkmark",type:"choiceitem"});return t},Nw=e=>t=>t.options.get(e),Vw="#000000",zw=(e,t)=>t===Iw&&e.options.isSet("color_map_foreground")?Nw("color_map_foreground")(e):t===Fw&&e.options.isSet("color_map_background")?Nw("color_map_background")(e):Nw("color_map")(e),Lw=(e,t="default")=>Math.max(5,Math.ceil(Math.sqrt(zw(e,t).length))),Hw=(e,t)=>{const o=Nw("color_cols")(e),n=Lw(e,t);return o===Lw(e)?n:o},Pw=(e,t="default")=>Math.round(t===Iw?Nw("color_cols_foreground")(e):t===Fw?Nw("color_cols_background")(e):Nw("color_cols")(e)),Uw=Nw("custom_colors"),Ww=Nw("color_default_foreground"),jw=Nw("color_default_background"),Gw=(e,t)=>{const o=ze(e.selection.getStart()),n="hilitecolor"===t?Rs(o,(e=>{if($e(e)){const t=Rt(e,"background-color");return Ce(gw(t).exists((e=>0!==e.alpha)),t)}return A.none()})).getOr("rgba(0, 0, 0, 0)"):Rt(o,"color");return gw(n).map((e=>"#"+ow(e).value))},$w=e=>{const t="choiceitem",o={type:t,text:"Remove color",icon:"color-swatch-remove-color",value:"remove"};return e?[o,{type:t,text:"Custom color",icon:"color-picker",value:"custom"}]:[o]},qw=(e,t,o,n)=>{"custom"===o?oS(e)((o=>{o.each((o=>{Ew(t,o),e.execCommand("mceApplyTextcolor",t,o),n(o)}))}),Gw(e,t).getOr(Vw)):"remove"===o?(n(""),e.execCommand("mceRemoveTextcolor",t)):(n(o),e.execCommand("mceApplyTextcolor",t,o))},Yw=(e,t,o)=>e.concat((e=>L(Tw(e).state(),(e=>({type:"choiceitem",text:e,icon:"checkmark",value:e}))))(t).concat($w(o))),Xw=(e,t,o)=>n=>{n(Yw(e,t,o))},Kw=(e,t,o)=>{const n="forecolor"===t?"tox-icon-text-color__color":"tox-icon-highlight-bg-color__color";e.setIconFill(n,o)},Jw=(e,t)=>{e.setTooltip(t)},Zw=(e,t)=>o=>{const n=Gw(e,t);return xe(n,o.toUpperCase())},Qw=(e,t,o)=>{if(Be(o))return"forecolor"===t?"Text color":"Background color";const n="forecolor"===t?"Text color {0}":"Background color {0}",s=Yw(zw(e,t),t,!1),r=G(s,(e=>e.value===o)).getOr({text:""}).text;return e.translate([n,e.translate(r)])},eS=(e,t,o,n)=>{e.ui.registry.addSplitButton(t,{tooltip:Qw(e,o,n.get()),presets:"color",icon:"forecolor"===t?"text-color":"highlight-bg-color",select:Zw(e,o),columns:Pw(e,o),fetch:Xw(zw(e,o),o,Uw(e)),onAction:t=>{qw(e,o,n.get(),b)},onItemAction:(s,r)=>{qw(e,o,r,(o=>{n.set(o),bw(e,{name:t,color:o})}))},onSetup:s=>{Kw(s,t,n.get());const r=n=>{n.name===t&&(Kw(s,n.name,n.color),Jw(s,Qw(e,o,n.color)))};return e.on("TextColorChange",r),yw(xw(e)(s),(()=>{e.off("TextColorChange",r)}))}})},tS=(e,t,o,n,s)=>{e.ui.registry.addNestedMenuItem(t,{text:n,icon:"forecolor"===t?"text-color":"highlight-bg-color",onSetup:n=>(Jw(n,Qw(e,o,s.get())),Kw(n,t,s.get()),xw(e)(n)),getSubmenuItems:()=>[{type:"fancymenuitem",fancytype:"colorswatch",select:Zw(e,o),initData:{storageKey:o},onAction:n=>{qw(e,o,n.value,(o=>{s.set(o),bw(e,{name:t,color:o})}))}}]})},oS=e=>(t,o)=>{let n=!1;const s={colorpicker:o};e.windowManager.open({title:"Color Picker",size:"normal",body:{type:"panel",items:[{type:"colorpicker",name:"colorpicker",label:"Color"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:s,onAction:(e,t)=>{"hex-valid"===t.name&&(n=t.value)},onSubmit:o=>{const s=o.getData().colorpicker;n?(t(A.from(s)),o.close()):e.windowManager.alert(e.translate(["Invalid hex color code: {0}",s]))},onClose:b,onCancel:()=>{t(A.none())}})},nS=(e,t,o,n,s,r,a,i)=>{const l=ey(t),c=sS(t,o,n,"color"!==s?"normal":"color",r,a,i);return ny(e,l,c,n,{menuType:s})},sS=(e,t,o,n,s,r,a)=>we(L(e,(i=>{return"choiceitem"===i.type?(l=i,Yn("choicemenuitem",ox,l)).fold(ty,(i=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Gx({presets:o,textContent:t?e.text:A.none(),htmlContent:A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:t?e.shortcut:A.none(),checkMark:t?A.some(Wx(a.icons)):A.none(),caret:A.none(),value:e.value},a,i);return bn(Rx({data:Nx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),onAction:t=>n(e.value),onSetup:e=>(e.setActive(s),b),triggersSubmenu:!1,itemBehaviours:[]},l,r,a),{toggling:{toggleClass:Sv,toggleOnExecute:!1,selected:e.active,exclusive:!0}})})(i,1===o,n,t,r(i.value),s,a,ey(e))))):A.none();var l}))),rS=(e,t)=>{const o=Bv(t);return 1===e?{mode:"menu",moveOnTab:!0}:"auto"===e?{mode:"grid",selector:"."+o.item,initSize:{numColumns:1,numRows:1}}:{mode:"matrix",rowSelector:"."+("color"===t?"tox-swatches__row":"tox-collection__group"),previousSelector:e=>"color"===t?vi(e.element,"[aria-checked=true]"):A.none()}},aS=ca("cell-over"),iS=ca("cell-execute"),lS=(e,t,o)=>{const n=o=>Rr(o,iS,{row:e,col:t}),s=(e,t)=>{t.stop(),n(e)};return ci({dom:{tag:"div",attributes:{role:"button","aria-label":o}},behaviours:Tl([th("insert-table-picker-cell",[Wr(Ys(),ah.focus),Wr(mr(),n),Wr(tr(),s),Wr(pr(),s)]),ph.config({toggleClass:"tox-insert-table-picker__selected",toggleOnExecute:!1}),ah.config({onFocus:o=>Rr(o,aS,{row:e,col:t})})])})},cS=e=>Y(e,(e=>L(e,di))),dS=(e,t)=>ri(`${t}x${e}`),uS={inserttable:(e,t)=>{const o=(e=>(t,o)=>e.shared.providers.translate(["{0} columns, {1} rows",o,t]))(t),n=((e,t,o)=>{const n=[];for(let t=0;t<10;t++){const o=[];for(let n=0;n<10;n++){const s=e(t+1,n+1);o.push(lS(t,n,s))}n.push(o)}return n})(o),s=dS(0,0),r=Xh({dom:{tag:"span",classes:["tox-insert-table-picker__label"]},components:[s],behaviours:Tl([eh.config({})])});return{type:"widget",data:{value:ca("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[Xx.widget({dom:{tag:"div",classes:["tox-insert-table-picker"]},components:cS(n).concat(r.asSpec()),behaviours:Tl([th("insert-table-picker",[Jr((e=>{eh.set(r.get(e),[s])})),qr(aS,((e,t,o)=>{const{row:s,col:a}=o.event;((e,t,o,n,s)=>{for(let n=0;n<10;n++)for(let s=0;s<10;s++)ph.set(e[n][s],n<=t&&s<=o)})(n,s,a),eh.set(r.get(e),[dS(s+1,a+1)])})),qr(iS,((t,o,n)=>{const{row:s,col:r}=n.event;e.onAction({numRows:s+1,numColumns:r+1}),Fr(t,fr())}))]),Gp.config({initSize:{numRows:10,numColumns:10},mode:"flatgrid",selector:'[role="button"]'})])})]}},colorswatch:(e,t)=>{const o=((e,t)=>{const o=e.initData.allowCustomColors&&t.colorinput.hasCustomColors();return e.initData.colors.fold((()=>Yw(t.colorinput.getColors(e.initData.storageKey),e.initData.storageKey,o)),(e=>e.concat($w(o))))})(e,t),n=t.colorinput.getColorCols(e.initData.storageKey),s="color",r={...nS(ca("menu-value"),o,(t=>{e.onAction({value:t})}),n,s,bv.CLOSE_ON_EXECUTE,e.select.getOr(T),t.shared.providers),markers:Bv(s),movement:rS(n,s)};return{type:"widget",data:{value:ca("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[Xx.widget(Rh.sketch(r))]}}},mS=e=>({type:"separator",dom:{tag:"div",classes:[yv,"tox-collection__group-heading"]},components:e.text.map(ri).toArray()});var gS=Object.freeze({__proto__:null,getCoupled:(e,t,o,n)=>o.getOrCreate(e,t,n),getExistingCoupled:(e,t,o,n)=>o.getExisting(e,t,n)}),pS=[ss("others",qn(rn.value,Vn()))],hS=Object.freeze({__proto__:null,init:()=>{const e={},t=(t,o)=>{if(0===ae(t.others).length)throw new Error("Cannot find any known coupled components");return be(e,o)},o=x({});return Ta({readState:o,getExisting:(e,o,n)=>t(o,n).orThunk((()=>(be(o.others,n).getOrDie("No information found for coupled component: "+n),A.none()))),getOrCreate:(o,n,s)=>t(n,s).getOrThunk((()=>{const t=be(n.others,s).getOrDie("No information found for coupled component: "+s)(o),r=o.getSystem().build(t);return e[s]=r,r}))})}});const fS=Al({fields:pS,name:"coupling",apis:gS,state:hS}),bS=e=>{let t=A.none(),o=[];const n=e=>{s()?r(e):o.push(e)},s=()=>t.isSome(),r=e=>{t.each((t=>{setTimeout((()=>{e(t)}),0)}))};return e((e=>{s()||(t=A.some(e),H(o,r),o=[])})),{get:n,map:e=>bS((t=>{n((o=>{t(e(o))}))})),isReady:s}},vS={nu:bS,pure:e=>bS((t=>{t(e)}))},yS=e=>{setTimeout((()=>{throw e}),0)},xS=e=>{const t=t=>{e().then(t,yS)};return{map:t=>xS((()=>e().then(t))),bind:t=>xS((()=>e().then((e=>t(e).toPromise())))),anonBind:t=>xS((()=>e().then((()=>t.toPromise())))),toLazy:()=>vS.nu(t),toCached:()=>{let t=null;return xS((()=>(null===t&&(t=e()),t)))},toPromise:e,get:t}},wS=e=>xS((()=>new Promise(e))),SS=e=>xS((()=>Promise.resolve(e))),kS=x("sink"),CS=x(Yu({name:kS(),overrides:x({dom:{tag:"div"},behaviours:Tl([_d.config({useFixed:E})]),events:Hr([Yr(Js()),Yr(js()),Yr(tr())])})})),OS=(e,t)=>{const o=e.getHotspot(t).getOr(t),n="hotspot",s=e.getAnchorOverrides();return e.layouts.fold((()=>({type:n,hotspot:o,overrides:s})),(e=>({type:n,hotspot:o,overrides:s,layouts:e})))},_S=(e,t,o,n,s,r,a)=>{const i=((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>(0,e.fetch)(o).map(t))(e,t,n),l=AS(n,e);return i.map((e=>e.bind((e=>A.from(jh.sketch({...r.menu(),uid:fa(""),data:e,highlightOnOpen:a,onOpenMenu:(e,t)=>{const n=l().getOrDie();_d.position(n,t,{anchor:o}),Zd.decloak(s)},onOpenSubmenu:(e,t,o)=>{const n=l().getOrDie();_d.position(n,o,{anchor:{type:"submenu",item:t}}),Zd.decloak(s)},onRepositionMenu:(e,t,n)=>{const s=l().getOrDie();_d.position(s,t,{anchor:o}),H(n,(e=>{_d.position(s,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem}})}))},onEscape:()=>(ah.focus(n),Zd.close(s),A.some(!0))}))))))})(e,t,OS(e,o),o,n,s,a);return i.map((e=>(e.fold((()=>{Zd.isOpen(n)&&Zd.close(n)}),(e=>{Zd.cloak(n),Zd.open(n,e),r(n)})),n)))},TS=(e,t,o,n,s,r,a)=>(Zd.close(n),SS(n)),ES=(e,t,o,n,s,r)=>{const a=fS.getCoupled(o,"sandbox");return(Zd.isOpen(a)?TS:_S)(e,t,o,a,n,s,r)},AS=(e,t)=>e.getSystem().getByUid(t.uid+"-"+kS()).map((e=>()=>rn.value(e))).getOrThunk((()=>t.lazySink.fold((()=>()=>rn.error(new Error("No internal sink is specified, nor could an external sink be found"))),(t=>()=>t(e))))),MS=e=>{Zd.getState(e).each((e=>{jh.repositionMenus(e)}))},DS=(e,t,o)=>{const n=wi(),s=AS(t,e);return{dom:{tag:"div",classes:e.sandboxClasses,attributes:{id:n.id,role:"listbox"}},behaviours:ku(e.sandboxBehaviours,[vu.config({store:{mode:"memory",initialValue:t}}),Zd.config({onOpen:(s,r)=>{const a=OS(e,t);n.link(t.element),e.matchWidth&&((e,t,o)=>{const n=Om.getCurrent(t).getOr(t),s=Zt(e.element);o?Bt(n.element,"min-width",s+"px"):((e,t)=>{Jt.set(e,t)})(n.element,s)})(a.hotspot,r,e.useMinWidth),e.onOpen(a,s,r),void 0!==o&&void 0!==o.onOpen&&o.onOpen(s,r)},onClose:(e,s)=>{n.unlink(t.element),void 0!==o&&void 0!==o.onClose&&o.onClose(e,s)},isPartOf:(e,o,n)=>Si(o,n)||Si(t,n),getAttachPoint:()=>s().getOrDie()}),Om.config({find:e=>Zd.getState(e).bind((e=>Om.getCurrent(e)))}),Il.config({channels:{...nu({isExtraPart:T}),...ru({doReposition:MS})}})])}},BS=e=>{const t=fS.getCoupled(e,"sandbox");MS(t)},IS=()=>[xs("sandboxClasses",[]),Su("sandboxBehaviours",[Om,Il,Zd,vu])],FS=x([ns("dom"),ns("fetch"),Ri("onOpen"),Ni("onExecute"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),Oc(),yu("dropdownBehaviours",[ph,fS,Gp,ah]),ns("toggleClass"),xs("eventOrder",{}),ms("lazySink"),xs("matchWidth",!1),xs("useMinWidth",!1),ms("role")].concat(IS())),RS=x([qu({schema:[Bi(),xs("fakeFocus",!1)],name:"menu",defaults:e=>({onExecute:e.onExecute})}),CS()]),NS=wm({name:"Dropdown",configFields:FS(),partFields:RS(),factory:(e,t,o,n)=>{const s=e=>{Zd.getState(e).each((e=>{jh.highlightPrimary(e)}))},r=(t,o,s)=>ES(e,w,t,n,o,s),a={expand:e=>{ph.isOn(e)||r(e,b,Uh.HighlightNone).get(b)},open:e=>{ph.isOn(e)||r(e,b,Uh.HighlightMenuAndItem).get(b)},refetch:t=>fS.getExistingCoupled(t,"sandbox").fold((()=>r(t,b,Uh.HighlightMenuAndItem).map(b)),(o=>_S(e,w,t,o,n,b,Uh.HighlightMenuAndItem).map(b))),isOpen:ph.isOn,close:e=>{ph.isOn(e)&&r(e,b,Uh.HighlightMenuAndItem).get(b)},repositionMenus:e=>{ph.isOn(e)&&BS(e)}},i=(e,t)=>(Nr(e),A.some(!0));return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.dropdownBehaviours,[ph.config({toggleClass:e.toggleClass,aria:{mode:"expanded"}}),fS.config({others:{sandbox:t=>DS(e,t,{onOpen:()=>ph.on(t),onClose:()=>ph.off(t)})}}),Gp.config({mode:"special",onSpace:i,onEnter:i,onDown:(e,t)=>{if(NS.isOpen(e)){const t=fS.getCoupled(e,"sandbox");s(t)}else NS.open(e);return A.some(!0)},onEscape:(e,t)=>NS.isOpen(e)?(NS.close(e),A.some(!0)):A.none()}),ah.config({})]),events:fh(A.some((e=>{r(e,s,Uh.HighlightMenuAndItem).get(b)}))),eventOrder:{...e.eventOrder,[mr()]:["disabling","toggling","alloy.base.behaviour"]},apis:a,domModification:{attributes:{"aria-haspopup":"true",...e.role.fold((()=>({})),(e=>({role:e}))),..."button"===e.dom.tag?{type:("type",be(e.dom,"attributes").bind((e=>be(e,"type")))).getOr("button")}:{}}}}},apis:{open:(e,t)=>e.open(t),refetch:(e,t)=>e.refetch(t),expand:(e,t)=>e.expand(t),close:(e,t)=>e.close(t),isOpen:(e,t)=>e.isOpen(t),repositionMenus:(e,t)=>e.repositionMenus(t)}}),VS=(e,t,o)=>{Gv(e).each((e=>{var n;((e,t)=>{Tt(t.element,"id").each((t=>Ct(e.element,"aria-activedescendant",t)))})(e,o),($a((n=t).element,Yv)?A.some(n.element):vi(n.element,"."+Yv)).each((t=>{Tt(t,"id").each((t=>Ct(e.element,"aria-controls",t)))}))})),Ct(o.element,"aria-selected","true")},zS=(e,t,o)=>{Ct(o.element,"aria-selected","false")},LS=e=>fS.getExistingCoupled(e,"sandbox").bind(jv).map($v).map((e=>e.fetchPattern)).getOr("");var HS;!function(e){e[e.ContentFocus=0]="ContentFocus",e[e.UiFocus=1]="UiFocus"}(HS||(HS={}));const PS=(e,t,o,n,s)=>{const r=o.shared.providers,a=e=>s?{...e,shortcut:A.none(),icon:e.text.isSome()?A.none():e.icon}:e;switch(e.type){case"menuitem":return(i=e,Yn("menuitem",ix,i)).fold(ty,(e=>A.some(((e,t,o,n=!0)=>{const s=Gx({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.none(),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Rx({data:Nx(e),getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),enabled:e.enabled,onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o)})(a(e),t,r,n))));case"nestedmenuitem":return(e=>Yn("nestedmenuitem",lx,e))(e).fold(ty,(e=>A.some(((e,t,o,n=!0,s=!1)=>{const r=s?(a=o.icons,zx("chevron-down",a,[Ov])):(e=>zx("chevron-right",e,[Ov]))(o.icons);var a;const i=Gx({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.some(r),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Rx({data:Nx(e),getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setIconFill:(t,o)=>{vi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{Ct(e,"fill",o)}))},setTooltip:t=>{const n=o.translate(t);Ot(e.element,{"aria-label":n,title:n})}}),enabled:e.enabled,onAction:b,onSetup:e.onSetup,triggersSubmenu:!0,itemBehaviours:[]},i,t,o)})(a(e),t,r,n,s))));case"togglemenuitem":return(e=>Yn("togglemenuitem",cx,e))(e).fold(ty,(e=>A.some(((e,t,o,n=!0)=>{const s=Gx({iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,checkMark:A.some(Wx(o.icons)),caret:A.none(),shortcutContent:e.shortcut,presets:"normal",meta:e.meta},o,n);return bn(Rx({data:Nx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o),{toggling:{toggleClass:Sv,toggleOnExecute:!1,selected:e.active}})})(a(e),t,r,n))));case"separator":return(e=>Yn("separatormenuitem",By,e))(e).fold(ty,(e=>A.some(mS(e))));case"fancymenuitem":return(e=>Yn("fancymenuitem",ax,e))(e).fold(ty,(e=>((e,t)=>be(uS,e.fancytype).map((o=>o(e,t))))(e,o)));default:return console.error("Unknown item in general menu",e),A.none()}var i},US=(e,t,o,n,s,r,a)=>{const i=1===n,l=!i||ey(e);return we(L(e,(e=>{switch(e.type){case"separator":return(n=e,Yn("Autocompleter.Separator",By,n)).fold(ty,(e=>A.some(mS(e))));case"cardmenuitem":return(e=>Yn("cardmenuitem",tx,e))(e).fold(ty,(e=>A.some(((e,t,o,n)=>{const s={dom:jx(e.label),optComponents:[A.some({dom:{tag:"div",classes:[Tv,Ev]},components:Yx(e.items,n)})]};return Rx({data:Nx({text:A.none(),...e}),enabled:e.enabled,getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>{Lm.set(e,!t),H(Zc(e.element,"*"),(o=>{e.getSystem().getByDom(o).each((e=>{e.hasConfigured(Lm)&&Lm.set(e,!t)}))}))}}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:A.from(n.itemBehaviours).getOr([])},s,t,o.providers)})({...e,onAction:t=>{e.onAction(t),o(e.value,e.meta)}},s,r,{itemBehaviours:$x(e.meta,r),cardText:{matchText:t,highlightOn:a}}))));default:return(e=>Yn("Autocompleter.Item",Iy,e))(e).fold(ty,(e=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Gx({presets:n,textContent:A.none(),htmlContent:o?e.text.map((e=>qx(e,t))):A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:A.none(),checkMark:A.none(),caret:A.none(),value:e.value},a.providers,i,e.icon);return Rx({data:Nx(e),enabled:e.enabled,getApi:x({}),onAction:t=>s(e.value,e.meta),onSetup:x(b),triggersSubmenu:!1,itemBehaviours:$x(e.meta,a)},l,r,a.providers)})(e,t,i,"normal",o,s,r,l))))}var n})))},WS=(e,t,o,n,s,r)=>{const a=ey(t),i=we(L(t,(e=>{const t=e=>PS(e,o,n,(e=>s?!ve(e,"text"):a)(e),s);return"nestedmenuitem"===e.type&&e.getSubmenuItems().length<=0?t({...e,enabled:!1}):t(e)}))),l=(e=>"no-search"===e.searchMode?{menuType:"normal"}:{menuType:"searchable",searchMode:e})(r);return(s?oy:ny)(e,a,i,1,l)},jS=e=>jh.singleData(e.value,e),GS=(e,t)=>{const o=ca("autocompleter"),n=As(!1),s=As(!1),r=ci(Gh.sketch({dom:{tag:"div",classes:["tox-autocompleter"],attributes:{id:o}},components:[],fireDismissalEventInstead:{},inlineBehaviours:Tl([th("dismissAutocompleter",[Wr(Or(),(()=>d())),Wr(Br(),((t,o)=>{Tt(o.event.target,"id").each((t=>Ct(ze(e.getBody()),"aria-activedescendant",t)))}))])]),lazySink:t.getSink})),a=()=>Gh.isOpen(r),i=s.get,l=()=>{if(a()){Gh.hide(r),e.dom.remove(o,!1);const t=ze(e.getBody());Tt(t,"aria-owns").filter((e=>e===o)).each((()=>{At(t,"aria-owns"),At(t,"aria-activedescendant")}))}},c=()=>Gh.getContent(r).bind((e=>te(e.components(),0))),d=()=>e.execCommand("mceAutocompleterClose"),u=s=>{const a=(o=>{const s=re(o,(e=>A.from(e.columns))).getOr(1);return Y(o,(o=>{const r=o.items;return US(r,o.matchText,((t,s)=>{const r=e.selection.getRng();((e,t)=>hv(ze(t.startContainer)).map((t=>{const o=e.createRng();return o.selectNode(t.dom),o})))(e.dom,r).each((r=>{const a={hide:()=>d(),reload:t=>{l(),e.execCommand("mceAutocompleterReload",!1,{fetchOptions:t})}};n.set(!0),o.onAction(a,r,t,s),n.set(!1)}))}),s,bv.BUBBLE_TO_SANDBOX,t,o.highlightOn)}))})(s);a.length>0?(((t,o)=>{var n;(n=ze(e.getBody()),vi(n,pv)).each((n=>{const s=re(t,(e=>A.from(e.columns))).getOr(1);Gh.showMenuAt(r,{anchor:{type:"node",root:ze(e.getBody()),node:A.from(n)}},((e,t,o,n)=>{const s=rS(t,n),r=Bv(n);return{data:jS({...e,movement:s,menuBehaviours:ux("auto"!==t?[]:[Jr(((e,t)=>{dx(e,4,r.item).each((({numColumns:t,numRows:o})=>{Gp.setGridSize(e,o,t)}))}))])}),menu:{markers:Bv(n),fakeFocus:o===HS.ContentFocus}}})(ny("autocompleter-value",!0,o,s,{menuType:"normal"}),s,HS.ContentFocus,"normal"))})),c().each(Xm.highlightFirst)})(s,a),Ct(ze(e.getBody()),"aria-owns",o),e.inline||m()):l()},m=()=>{e.dom.get(o)&&e.dom.remove(o,!1);const t=e.getDoc().documentElement,n=e.selection.getNode(),s=(e=>na(e,!0))(r.element);It(s,{border:"0",clip:"rect(0 0 0 0)",height:"1px",margin:"-1px",overflow:"hidden",padding:"0",position:"absolute",width:"1px",top:`${n.offsetTop}px`,left:`${n.offsetLeft}px`}),e.dom.add(t,s.dom),vi(s,'[role="menu"]').each((e=>{Ht(e,"position"),Ht(e,"max-height")}))};e.on("AutocompleterStart",(({lookupData:e})=>{s.set(!0),n.set(!1),u(e)})),e.on("AutocompleterUpdate",(({lookupData:e})=>u(e))),e.on("AutocompleterEnd",(()=>{l(),s.set(!1),n.set(!1)}));((e,t)=>{const o=(e,t)=>{Rr(e,Js(),{raw:t})},n=()=>e.getMenu().bind(Xm.getHighlighted);t.on("keydown",(t=>{const s=t.which;e.isActive()&&(e.isMenuOpen()?13===s?(n().each(Nr),t.preventDefault()):40===s?(n().fold((()=>{e.getMenu().each(Xm.highlightFirst)}),(e=>{o(e,t)})),t.preventDefault(),t.stopImmediatePropagation()):37!==s&&38!==s&&39!==s||n().each((e=>{o(e,t),t.preventDefault(),t.stopImmediatePropagation()})):13!==s&&38!==s&&40!==s||e.cancelIfNecessary())})),t.on("NodeChange",(t=>{e.isActive()&&!e.isProcessingAction()&&hv(ze(t.element)).isNone()&&e.cancelIfNecessary()}))})({cancelIfNecessary:d,isMenuOpen:a,isActive:i,isProcessingAction:n.get,getMenu:c},e)},$S=["visible","hidden","clip"],qS=e=>Me(e).length>0&&!R($S,e),YS=e=>{if(Ge(e)){const t=Rt(e,"overflow-x"),o=Rt(e,"overflow-y");return qS(t)||qS(o)}return!1},XS=(e,t)=>uv(e)?(e=>{const t=Jc(e,YS),o=0===t.length?vt(e).map(yt).map((e=>Jc(e,YS))).getOr([]):t;return oe(o).map((e=>({element:e,others:o.slice(1)})))})(t):A.none(),KS=e=>{const t=[...L(e.others,Zo),tn()];return((e,t)=>j(t,((e,t)=>en(e,t)),e))(Zo(e.element),t)},JS=(e,t,o)=>yi(e,t,o).isSome(),ZS=(e,t)=>{let o=null;return{cancel:()=>{null!==o&&(clearTimeout(o),o=null)},schedule:(...n)=>{o=setTimeout((()=>{e.apply(null,n),o=null}),t)}}},QS=e=>{const t=e.raw;return void 0===t.touches||1!==t.touches.length?A.none():A.some(t.touches[0])},ek=(e,t)=>{const o={stopBackspace:!0,...t},n=(e=>{const t=nc(),o=As(!1),n=ZS((t=>{e.triggerEvent(hr(),t),o.set(!0)}),400),s=Bs([{key:Hs(),value:e=>(QS(e).each((s=>{n.cancel();const r={x:s.clientX,y:s.clientY,target:e.target};n.schedule(e),o.set(!1),t.set(r)})),A.none())},{key:Ps(),value:e=>(n.cancel(),QS(e).each((e=>{t.on((o=>{((e,t)=>{const o=Math.abs(e.clientX-t.x),n=Math.abs(e.clientY-t.y);return o>5||n>5})(e,o)&&t.clear()}))})),A.none())},{key:Us(),value:s=>(n.cancel(),t.get().filter((e=>Qe(e.target,s.target))).map((t=>o.get()?(s.prevent(),!1):e.triggerEvent(pr(),s))))}]);return{fireIfReady:(e,t)=>be(s,t).bind((t=>t(e)))}})(o),s=L(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","transitioncancel","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),(t=>rc(e,t,(e=>{n.fireIfReady(e,t).each((t=>{t&&e.kill()})),o.triggerEvent(t,e)&&e.kill()})))),r=nc(),a=rc(e,"paste",(e=>{n.fireIfReady(e,"paste").each((t=>{t&&e.kill()})),o.triggerEvent("paste",e)&&e.kill(),r.set(setTimeout((()=>{o.triggerEvent(dr(),e)}),0))})),i=rc(e,"keydown",(e=>{o.triggerEvent("keydown",e)?e.kill():o.stopBackspace&&(e=>e.raw.which===Km[0]&&!R(["input","textarea"],We(e.target))&&!JS(e.target,'[contenteditable="true"]'))(e)&&e.prevent()})),l=rc(e,"focusin",(e=>{o.triggerEvent("focusin",e)&&e.kill()})),c=nc(),d=rc(e,"focusout",(e=>{o.triggerEvent("focusout",e)&&e.kill(),c.set(setTimeout((()=>{o.triggerEvent(cr(),e)}),0))}));return{unbind:()=>{H(s,(e=>{e.unbind()})),i.unbind(),l.unbind(),d.unbind(),a.unbind(),r.on(clearTimeout),c.on(clearTimeout)}}},tk=(e,t)=>{const o=be(e,"target").getOr(t);return As(o)},ok=Ms([{stopped:[]},{resume:["element"]},{complete:[]}]),nk=(e,t,o,n,s,r)=>{const a=e(t,n),i=((e,t)=>{const o=As(!1),n=As(!1);return{stop:()=>{o.set(!0)},cut:()=>{n.set(!0)},isStopped:o.get,isCut:n.get,event:e,setSource:t.set,getSource:t.get}})(o,s);return a.fold((()=>(r.logEventNoHandlers(t,n),ok.complete())),(e=>{const o=e.descHandler;return Ma(o)(i),i.isStopped()?(r.logEventStopped(t,e.element,o.purpose),ok.stopped()):i.isCut()?(r.logEventCut(t,e.element,o.purpose),ok.complete()):rt(e.element).fold((()=>(r.logNoParent(t,e.element,o.purpose),ok.complete())),(n=>(r.logEventResponse(t,e.element,o.purpose),ok.resume(n))))}))},sk=(e,t,o,n,s,r)=>nk(e,t,o,n,s,r).fold(E,(n=>sk(e,t,o,n,s,r)),T),rk=(e,t,o,n,s)=>{const r=tk(o,n);return sk(e,t,o,n,r,s)},ak=()=>{const e=(()=>{const e={};return{registerId:(t,o,n)=>{le(n,((n,s)=>{const r=void 0!==e[s]?e[s]:{};r[o]=((e,t)=>({cHandler:k.apply(void 0,[e.handler].concat(t)),purpose:e.purpose}))(n,t),e[s]=r}))},unregisterId:t=>{le(e,((e,o)=>{ve(e,t)&&delete e[t]}))},filterByType:t=>be(e,t).map((e=>pe(e,((e,t)=>((e,t)=>({id:e,descHandler:t}))(t,e))))).getOr([]),find:(t,o,n)=>be(e,o).bind((e=>Rs(n,(t=>((e,t)=>ha(t).bind((t=>be(e,t))).map((e=>((e,t)=>({element:e,descHandler:t}))(t,e))))(e,t)),t)))}})(),t={},o=o=>{ha(o.element).each((o=>{delete t[o],e.unregisterId(o)}))};return{find:(t,o,n)=>e.find(t,o,n),filter:t=>e.filterByType(t),register:n=>{const s=(e=>{const t=e.element;return ha(t).getOrThunk((()=>((e,t)=>{const o=ca(ma+"uid-");return pa(t,o),o})(0,e.element)))})(n);ye(t,s)&&((e,n)=>{const s=t[n];if(s!==e)throw new Error('The tagId "'+n+'" is already used by: '+sa(s.element)+"\nCannot use it for: "+sa(e.element)+"\nThe conflicting element is"+(xt(s.element)?" ":" not ")+"already in the DOM");o(e)})(n,s);const r=[n];e.registerId(r,s,n.events),t[s]=n},unregister:o,getById:e=>be(t,e)}},ik=xm({name:"Container",factory:e=>{const{attributes:t,...o}=e.dom;return{uid:e.uid,dom:{tag:"div",attributes:{role:"presentation",...t},...o},components:e.components,behaviours:xu(e.containerBehaviours),events:e.events,domModification:e.domModification,eventOrder:e.eventOrder}},configFields:[xs("components",[]),yu("containerBehaviours",[]),xs("events",{}),xs("domModification",{}),xs("eventOrder",{})]}),lk=e=>{const t=t=>rt(e.element).fold(E,(e=>Qe(t,e))),o=ak(),n=(e,n)=>o.find(t,e,n),s=ek(e.element,{triggerEvent:(e,t)=>_i(e,t.target,(o=>((e,t,o,n)=>rk(e,t,o,o.target,n))(n,e,t,o)))}),r={debugInfo:x("real"),triggerEvent:(e,t,o)=>{_i(e,t,(s=>rk(n,e,o,t,s)))},triggerFocus:(e,t)=>{ha(e).fold((()=>{Rl(e)}),(o=>{_i(lr(),e,(o=>(((e,t,o,n,s)=>{const r=tk(o,n);nk(e,t,o,n,r,s)})(n,lr(),{originator:t,kill:b,prevent:b,target:e},e,o),!1)))}))},triggerEscape:(e,t)=>{r.triggerEvent("keydown",e.element,t.event)},getByUid:e=>p(e),getByDom:e=>h(e),build:ci,buildOrPatch:li,addToGui:e=>{l(e)},removeFromGui:e=>{c(e)},addToWorld:e=>{a(e)},removeFromWorld:e=>{i(e)},broadcast:e=>{u(e)},broadcastOn:(e,t)=>{m(e,t)},broadcastEvent:(e,t)=>{g(e,t)},isConnected:E},a=e=>{e.connect(r),qe(e.element)||(o.register(e),H(e.components(),a),r.triggerEvent(vr(),e.element,{target:e.element}))},i=e=>{qe(e.element)||(H(e.components(),i),o.unregister(e)),e.disconnect()},l=t=>{Id(e,t)},c=e=>{Nd(e)},d=e=>{const t=o.filter(ur());H(t,(t=>{const o=t.descHandler;Ma(o)(e)}))},u=e=>{d({universal:!0,data:e})},m=(e,t)=>{d({universal:!1,channels:e,data:t})},g=(e,t)=>((e,t,o)=>{const n=(e=>{const t=As(!1);return{stop:()=>{t.set(!0)},cut:b,isStopped:t.get,isCut:T,event:e,setSource:O("Cannot set source of a broadcasted event"),getSource:O("Cannot get source of a broadcasted event")}})(t);return H(e,(e=>{const t=e.descHandler;Ma(t)(n)})),n.isStopped()})(o.filter(e),t),p=e=>o.getById(e).fold((()=>rn.error(new Error('Could not find component with uid: "'+e+'" in system.'))),rn.value),h=e=>{const t=ha(e).getOr("not found");return p(t)};return a(e),{root:e,element:e.element,destroy:()=>{s.unbind(),Uo(e.element)},add:l,remove:c,getByUid:p,getByDom:h,addToWorld:a,removeFromWorld:i,broadcast:u,broadcastOn:m,broadcastEvent:g}},ck=x([xs("prefix","form-field"),yu("fieldBehaviours",[Om,vu])]),dk=x([Yu({schema:[ns("dom")],name:"label"}),Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[ns("text")],name:"aria-descriptor"}),$u({factory:{sketch:e=>{const t=((e,t)=>{const o={};return le(e,((e,n)=>{R(t,n)||(o[n]=e)})),o})(e,["factory"]);return e.factory.sketch(t)}},schema:[ns("factory")],name:"field"})]),uk=wm({name:"FormField",configFields:ck(),partFields:dk(),factory:(e,t,o,n)=>{const s=wu(e.fieldBehaviours,[Om.config({find:t=>am(t,e,"field")}),vu.config({store:{mode:"manual",getValue:e=>Om.getCurrent(e).bind(vu.getValue),setValue:(e,t)=>{Om.getCurrent(e).each((e=>{vu.setValue(e,t)}))}}})]),r=Hr([Jr(((t,o)=>{const n=lm(t,e,["label","field","aria-descriptor"]);n.field().each((t=>{const o=ca(e.prefix);n.label().each((e=>{Ct(e.element,"for",o),Ct(t.element,"id",o)})),n["aria-descriptor"]().each((o=>{const n=ca(e.prefix);Ct(o.element,"id",n),Ct(t.element,"aria-describedby",n)}))}))}))]),a={getField:t=>am(t,e,"field"),getLabel:t=>am(t,e,"label")};return{uid:e.uid,dom:e.dom,components:t,behaviours:s,events:r,apis:a}},apis:{getField:(e,t)=>e.getField(t),getLabel:(e,t)=>e.getLabel(t)}});var mk=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({attributes:Bs([{key:t.tabAttr,value:"true"}])})}),gk=[xs("tabAttr","data-alloy-tabstop")];const pk=Al({fields:gk,name:"tabstopping",active:mk});var hk=tinymce.util.Tools.resolve("tinymce.html.Entities");const fk=(e,t,o,n)=>{const s=bk(e,t,o,n);return uk.sketch(s)},bk=(e,t,o,n)=>({dom:vk(o),components:e.toArray().concat([t]),fieldBehaviours:Tl(n)}),vk=e=>({tag:"div",classes:["tox-form__group"].concat(e)}),yk=(e,t)=>uk.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e))]}),xk=ca("form-component-change"),wk=ca("form-close"),Sk=ca("form-cancel"),kk=ca("form-action"),Ck=ca("form-submit"),Ok=ca("form-block"),_k=ca("form-unblock"),Tk=ca("form-tabchange"),Ek=ca("form-resize"),Ak=(e,t,o)=>{const n=e.label.map((e=>yk(e,t))),s=t.icons(),r=e=>(t,o)=>{yi(o.event.target,"[data-collection-item-value]").each((n=>{e(t,o,n,_t(n,"data-collection-item-value"))}))},a=r(((o,n,s,r)=>{n.stop(),t.isDisabled()||Rr(o,kk,{name:e.name,value:r})})),i=[Wr(Ys(),r(((e,t,o)=>{Rl(o)}))),Wr(tr(),a),Wr(pr(),a),Wr(Xs(),r(((e,t,o)=>{vi(e.element,"."+_v).each((e=>{Ga(e,_v)})),Wa(o,_v)}))),Wr(Ks(),r((e=>{vi(e.element,"."+_v).each((e=>{Ga(e,_v)}))}))),ea(r(((t,o,n,s)=>{Rr(t,kk,{name:e.name,value:s})})))],l=(e,t)=>L(Zc(e.element,".tox-collection__item"),t),c=uk.parts.field({dom:{tag:"div",classes:["tox-collection"].concat(1!==e.columns?["tox-collection--grid"]:["tox-collection--list"])},components:[],factory:{sketch:w},behaviours:Tl([Lm.config({disabled:t.isDisabled,onDisabled:e=>{l(e,(e=>{Wa(e,"tox-collection__item--state-disabled"),Ct(e,"aria-disabled",!0)}))},onEnabled:e=>{l(e,(e=>{Ga(e,"tox-collection__item--state-disabled"),At(e,"aria-disabled")}))}}),Ox(),eh.config({}),vu.config({store:{mode:"memory",initialValue:o.getOr([])},onSetValue:(o,n)=>{((o,n)=>{const r=L(n,(o=>{const n=qf.translate(o.text),r=1===e.columns?`<div class="tox-collection__item-label">${n}</div>`:"",a=`<div class="tox-collection__item-icon">${(e=>{var t;return null!==(t=s[e])&&void 0!==t?t:e})(o.icon)}</div>`,i={_:" "," - ":" ","-":" "},l=n.replace(/\_| \- |\-/g,(e=>i[e]));return`<div class="tox-collection__item${t.isDisabled()?" tox-collection__item--state-disabled":""}" tabindex="-1" data-collection-item-value="${hk.encodeAllRaw(o.value)}" title="${l}" aria-label="${l}">${a}${r}</div>`})),a="auto"!==e.columns&&e.columns>1?z(r,e.columns):[r],i=L(a,(e=>`<div class="tox-collection__group">${e.join("")}</div>`));oa(o.element,i.join(""))})(o,n),"auto"===e.columns&&dx(o,5,"tox-collection__item").each((({numRows:e,numColumns:t})=>{Gp.setGridSize(o,e,t)})),Fr(o,Ek)}}),pk.config({}),Gp.config((d=e.columns,"normal",1===d?{mode:"menu",moveOnTab:!1,selector:".tox-collection__item"}:"auto"===d?{mode:"flatgrid",selector:".tox-collection__item",initSize:{numColumns:1,numRows:1}}:{mode:"matrix",selectors:{row:".tox-collection__group",cell:`.${yv}`}})),th("collection-events",i)]),eventOrder:{[mr()]:["disabling","alloy.base.behaviour","collection-events"]}});var d;return fk(n,c,["tox-form__group--collection"],[])},Mk=["input","textarea"],Dk=e=>{const t=We(e);return R(Mk,t)},Bk=(e,t)=>{const o=t.getRoot(e).getOr(e.element);Ga(o,t.invalidClass),t.notify.each((t=>{Dk(e.element)&&Ct(e.element,"aria-invalid",!1),t.getContainer(e).each((e=>{oa(e,t.validHtml)})),t.onValid(e)}))},Ik=(e,t,o,n)=>{const s=t.getRoot(e).getOr(e.element);Wa(s,t.invalidClass),t.notify.each((t=>{Dk(e.element)&&Ct(e.element,"aria-invalid",!0),t.getContainer(e).each((e=>{oa(e,n)})),t.onInvalid(e,n)}))},Fk=(e,t,o)=>t.validator.fold((()=>SS(rn.value(!0))),(t=>t.validate(e))),Rk=(e,t,o)=>(t.notify.each((t=>{t.onValidate(e)})),Fk(e,t).map((o=>e.getSystem().isConnected()?o.fold((o=>(Ik(e,t,0,o),rn.error(o))),(o=>(Bk(e,t),rn.value(o)))):rn.error("No longer in system"))));var Nk=Object.freeze({__proto__:null,markValid:Bk,markInvalid:Ik,query:Fk,run:Rk,isInvalid:(e,t)=>{const o=t.getRoot(e).getOr(e.element);return $a(o,t.invalidClass)}}),Vk=Object.freeze({__proto__:null,events:(e,t)=>e.validator.map((t=>Hr([Wr(t.onEvent,(t=>{Rk(t,e).get(w)}))].concat(t.validateOnLoad?[Jr((t=>{Rk(t,e).get(b)}))]:[])))).getOr({})}),zk=[ns("invalidClass"),xs("getRoot",A.none),ys("notify",[xs("aria","alert"),xs("getContainer",A.none),xs("validHtml",""),Ri("onValid"),Ri("onInvalid"),Ri("onValidate")]),ys("validator",[ns("validate"),xs("onEvent","input"),xs("validateOnLoad",!0)])];const Lk=Al({fields:zk,name:"invalidating",active:Vk,apis:Nk,extra:{validation:e=>t=>{const o=vu.getValue(t);return SS(e(o))}}}),Hk=Al({fields:[],name:"unselecting",active:Object.freeze({__proto__:null,events:()=>Hr([Pr(rr(),E)]),exhibit:()=>Aa({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})})}),Pk=ca("color-input-change"),Uk=ca("color-swatch-change"),Wk=ca("color-picker-cancel"),jk=Yu({schema:[ns("dom")],name:"label"}),Gk=e=>Yu({name:e+"-edge",overrides:t=>t.model.manager.edgeActions[e].fold((()=>({})),(e=>({events:Hr([jr(Hs(),((t,o,n)=>e(t,n)),[t]),jr(js(),((t,o,n)=>e(t,n)),[t]),jr(Gs(),((t,o,n)=>{n.mouseIsDown.get()&&e(t,n)}),[t])])})))}),$k=Gk("top-left"),qk=Gk("top"),Yk=Gk("top-right"),Xk=Gk("right"),Kk=Gk("bottom-right"),Jk=Gk("bottom"),Zk=Gk("bottom-left"),Qk=Gk("left"),eC=$u({name:"thumb",defaults:x({dom:{styles:{position:"absolute"}}}),overrides:e=>({events:Hr([$r(Hs(),e,"spectrum"),$r(Ps(),e,"spectrum"),$r(Us(),e,"spectrum"),$r(js(),e,"spectrum"),$r(Gs(),e,"spectrum"),$r(qs(),e,"spectrum")])})}),tC=e=>ug(e.event);var oC=[jk,Qk,Xk,qk,Jk,$k,Yk,Zk,Kk,eC,$u({schema:[ts("mouseIsDown",(()=>As(!1)))],name:"spectrum",overrides:e=>{const t=e.model.manager,o=(o,n)=>t.getValueFromEvent(n).map((n=>t.setValueFrom(o,e,n)));return{behaviours:Tl([Gp.config({mode:"special",onLeft:(o,n)=>t.onLeft(o,e,tC(n)),onRight:(o,n)=>t.onRight(o,e,tC(n)),onUp:(o,n)=>t.onUp(o,e,tC(n)),onDown:(o,n)=>t.onDown(o,e,tC(n))}),pk.config({}),ah.config({})]),events:Hr([Wr(Hs(),o),Wr(Ps(),o),Wr(js(),o),Wr(Gs(),((t,n)=>{e.mouseIsDown.get()&&o(t,n)}))])}}})];const nC=x("slider.change.value"),sC=e=>{const t=e.event.raw;if((e=>-1!==e.type.indexOf("touch"))(t)){const e=t;return void 0!==e.touches&&1===e.touches.length?A.some(e.touches[0]).map((e=>qt(e.clientX,e.clientY))):A.none()}{const e=t;return void 0!==e.clientX?A.some(e).map((e=>qt(e.clientX,e.clientY))):A.none()}},rC=e=>e.model.minX,aC=e=>e.model.minY,iC=e=>e.model.minX-1,lC=e=>e.model.minY-1,cC=e=>e.model.maxX,dC=e=>e.model.maxY,uC=e=>e.model.maxX+1,mC=e=>e.model.maxY+1,gC=(e,t,o)=>t(e)-o(e),pC=e=>gC(e,cC,rC),hC=e=>gC(e,dC,aC),fC=e=>pC(e)/2,bC=e=>hC(e)/2,vC=(e,t)=>t?e.stepSize*e.speedMultiplier:e.stepSize,yC=e=>e.snapToGrid,xC=e=>e.snapStart,wC=e=>e.rounded,SC=(e,t)=>void 0!==e[t+"-edge"],kC=e=>SC(e,"left"),CC=e=>SC(e,"right"),OC=e=>SC(e,"top"),_C=e=>SC(e,"bottom"),TC=e=>e.model.value.get(),EC=(e,t)=>({x:e,y:t}),AC=(e,t)=>{Rr(e,nC(),{value:t})},MC=(e,t,o,n)=>e<t?e:e>o?o:e===t?t-1:Math.max(t,e-n),DC=(e,t,o,n)=>e>o?e:e<t?t:e===o?o+1:Math.min(o,e+n),BC=(e,t,o)=>Math.max(t,Math.min(o,e)),IC=e=>{const{min:t,max:o,range:n,value:s,step:r,snap:a,snapStart:i,rounded:l,hasMinEdge:c,hasMaxEdge:d,minBound:u,maxBound:m,screenRange:g}=e,p=c?t-1:t,h=d?o+1:o;if(s<u)return p;if(s>m)return h;{const e=((e,t,o)=>Math.min(o,Math.max(e,t))-t)(s,u,m),c=BC(e/g*n+t,p,h);return a&&c>=t&&c<=o?((e,t,o,n,s)=>s.fold((()=>{const s=e-t,r=Math.round(s/n)*n;return BC(t+r,t-1,o+1)}),(t=>{const s=(e-t)%n,r=Math.round(s/n),a=Math.floor((e-t)/n),i=Math.floor((o-t)/n),l=t+Math.min(i,a+r)*n;return Math.max(t,l)})))(c,t,o,r,i):l?Math.round(c):c}},FC=e=>{const{min:t,max:o,range:n,value:s,hasMinEdge:r,hasMaxEdge:a,maxBound:i,maxOffset:l,centerMinEdge:c,centerMaxEdge:d}=e;return s<t?r?0:c:s>o?a?i:d:(s-t)/n*l},RC="top",NC="right",VC="bottom",zC="left",LC=e=>e.element.dom.getBoundingClientRect(),HC=(e,t)=>e[t],PC=e=>{const t=LC(e);return HC(t,zC)},UC=e=>{const t=LC(e);return HC(t,NC)},WC=e=>{const t=LC(e);return HC(t,RC)},jC=e=>{const t=LC(e);return HC(t,VC)},GC=e=>{const t=LC(e);return HC(t,"width")},$C=e=>{const t=LC(e);return HC(t,"height")},qC=(e,t,o)=>(e+t)/2-o,YC=(e,t)=>{const o=LC(e),n=LC(t),s=HC(o,zC),r=HC(o,NC),a=HC(n,zC);return qC(s,r,a)},XC=(e,t)=>{const o=LC(e),n=LC(t),s=HC(o,RC),r=HC(o,VC),a=HC(n,RC);return qC(s,r,a)},KC=(e,t)=>{Rr(e,nC(),{value:t})},JC=(e,t,o)=>{const n={min:rC(t),max:cC(t),range:pC(t),value:o,step:vC(t),snap:yC(t),snapStart:xC(t),rounded:wC(t),hasMinEdge:kC(t),hasMaxEdge:CC(t),minBound:PC(e),maxBound:UC(e),screenRange:GC(e)};return IC(n)},ZC=e=>(t,o,n)=>((e,t,o,n)=>{const s=(e>0?DC:MC)(TC(o),rC(o),cC(o),vC(o,n));return KC(t,s),A.some(s)})(e,t,o,n).map(E),QC=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=GC(e),a=n.bind((t=>A.some(YC(t,e)))).getOr(0),i=s.bind((t=>A.some(YC(t,e)))).getOr(r),l={min:rC(t),max:cC(t),range:pC(t),value:o,hasMinEdge:kC(t),hasMaxEdge:CC(t),minBound:PC(e),minOffset:0,maxBound:UC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return FC(l)})(t,r,o,n,s);return PC(t)-PC(e)+a},eO=ZC(-1),tO=ZC(1),oO=A.none,nO=A.none,sO={"top-left":A.none(),top:A.none(),"top-right":A.none(),right:A.some(((e,t)=>{AC(e,uC(t))})),"bottom-right":A.none(),bottom:A.none(),"bottom-left":A.none(),left:A.some(((e,t)=>{AC(e,iC(t))}))};var rO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=JC(e,t,o);return KC(e,n),n},setToMin:(e,t)=>{const o=rC(t);KC(e,o)},setToMax:(e,t)=>{const o=cC(t);KC(e,o)},findValueOfOffset:JC,getValueFromEvent:e=>sC(e).map((e=>e.left)),findPositionOfValue:QC,setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=QC(e,n.getSpectrum(e),s,n.getLeftEdge(e),n.getRightEdge(e),o),a=Zt(t.element)/2;Bt(t.element,"left",r-a+"px")},onLeft:eO,onRight:tO,onUp:oO,onDown:nO,edgeActions:sO});const aO=(e,t)=>{Rr(e,nC(),{value:t})},iO=(e,t,o)=>{const n={min:aC(t),max:dC(t),range:hC(t),value:o,step:vC(t),snap:yC(t),snapStart:xC(t),rounded:wC(t),hasMinEdge:OC(t),hasMaxEdge:_C(t),minBound:WC(e),maxBound:jC(e),screenRange:$C(e)};return IC(n)},lO=e=>(t,o,n)=>((e,t,o,n)=>{const s=(e>0?DC:MC)(TC(o),aC(o),dC(o),vC(o,n));return aO(t,s),A.some(s)})(e,t,o,n).map(E),cO=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=$C(e),a=n.bind((t=>A.some(XC(t,e)))).getOr(0),i=s.bind((t=>A.some(XC(t,e)))).getOr(r),l={min:aC(t),max:dC(t),range:hC(t),value:o,hasMinEdge:OC(t),hasMaxEdge:_C(t),minBound:WC(e),minOffset:0,maxBound:jC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return FC(l)})(t,r,o,n,s);return WC(t)-WC(e)+a},dO=A.none,uO=A.none,mO=lO(-1),gO=lO(1),pO={"top-left":A.none(),top:A.some(((e,t)=>{AC(e,lC(t))})),"top-right":A.none(),right:A.none(),"bottom-right":A.none(),bottom:A.some(((e,t)=>{AC(e,mC(t))})),"bottom-left":A.none(),left:A.none()};var hO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=iO(e,t,o);return aO(e,n),n},setToMin:(e,t)=>{const o=aC(t);aO(e,o)},setToMax:(e,t)=>{const o=dC(t);aO(e,o)},findValueOfOffset:iO,getValueFromEvent:e=>sC(e).map((e=>e.top)),findPositionOfValue:cO,setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=cO(e,n.getSpectrum(e),s,n.getTopEdge(e),n.getBottomEdge(e),o),a=jt(t.element)/2;Bt(t.element,"top",r-a+"px")},onLeft:dO,onRight:uO,onUp:mO,onDown:gO,edgeActions:pO});const fO=(e,t)=>{Rr(e,nC(),{value:t})},bO=(e,t)=>({x:e,y:t}),vO=(e,t)=>(o,n,s)=>((e,t,o,n,s)=>{const r=e>0?DC:MC,a=t?TC(n).x:r(TC(n).x,rC(n),cC(n),vC(n,s)),i=t?r(TC(n).y,aC(n),dC(n),vC(n,s)):TC(n).y;return fO(o,bO(a,i)),A.some(a)})(e,t,o,n,s).map(E),yO=vO(-1,!1),xO=vO(1,!1),wO=vO(-1,!0),SO=vO(1,!0),kO={"top-left":A.some(((e,t)=>{AC(e,EC(iC(t),lC(t)))})),top:A.some(((e,t)=>{AC(e,EC(fC(t),lC(t)))})),"top-right":A.some(((e,t)=>{AC(e,EC(uC(t),lC(t)))})),right:A.some(((e,t)=>{AC(e,EC(uC(t),bC(t)))})),"bottom-right":A.some(((e,t)=>{AC(e,EC(uC(t),mC(t)))})),bottom:A.some(((e,t)=>{AC(e,EC(fC(t),mC(t)))})),"bottom-left":A.some(((e,t)=>{AC(e,EC(iC(t),mC(t)))})),left:A.some(((e,t)=>{AC(e,EC(iC(t),bC(t)))}))};var CO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=JC(e,t,o.left),s=iO(e,t,o.top),r=bO(n,s);return fO(e,r),r},setToMin:(e,t)=>{const o=rC(t),n=aC(t);fO(e,bO(o,n))},setToMax:(e,t)=>{const o=cC(t),n=dC(t);fO(e,bO(o,n))},getValueFromEvent:e=>sC(e),setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=QC(e,n.getSpectrum(e),s.x,n.getLeftEdge(e),n.getRightEdge(e),o),a=cO(e,n.getSpectrum(e),s.y,n.getTopEdge(e),n.getBottomEdge(e),o),i=Zt(t.element)/2,l=jt(t.element)/2;Bt(t.element,"left",r-i+"px"),Bt(t.element,"top",a-l+"px")},onLeft:yO,onRight:xO,onUp:wO,onDown:SO,edgeActions:kO});const OO=wm({name:"Slider",configFields:[xs("stepSize",1),xs("speedMultiplier",10),xs("onChange",b),xs("onChoose",b),xs("onInit",b),xs("onDragStart",b),xs("onDragEnd",b),xs("snapToGrid",!1),xs("rounded",!0),ms("snapStart"),ss("model",Zn("mode",{x:[xs("minX",0),xs("maxX",100),ts("value",(e=>As(e.mode.minX))),ns("getInitialValue"),Li("manager",rO)],y:[xs("minY",0),xs("maxY",100),ts("value",(e=>As(e.mode.minY))),ns("getInitialValue"),Li("manager",hO)],xy:[xs("minX",0),xs("maxX",100),xs("minY",0),xs("maxY",100),ts("value",(e=>As({x:e.mode.minX,y:e.mode.minY}))),ns("getInitialValue"),Li("manager",CO)]})),yu("sliderBehaviours",[Gp,vu]),ts("mouseIsDown",(()=>As(!1)))],partFields:oC,factory:(e,t,o,n)=>{const s=t=>im(t,e,"thumb"),r=t=>im(t,e,"spectrum"),a=t=>am(t,e,"left-edge"),i=t=>am(t,e,"right-edge"),l=t=>am(t,e,"top-edge"),c=t=>am(t,e,"bottom-edge"),d=e.model,u=d.manager,m=(t,o)=>{u.setPositionFromValue(t,o,e,{getLeftEdge:a,getRightEdge:i,getTopEdge:l,getBottomEdge:c,getSpectrum:r})},g=(e,t)=>{d.value.set(t);const o=s(e);m(e,o)},p=t=>{const o=e.mouseIsDown.get();e.mouseIsDown.set(!1),o&&am(t,e,"thumb").each((o=>{const n=d.value.get();e.onChoose(t,o,n)}))},h=(t,o)=>{o.stop(),e.mouseIsDown.set(!0),e.onDragStart(t,s(t))},f=(t,o)=>{o.stop(),e.onDragEnd(t,s(t)),p(t)},b=t=>{am(t,e,"spectrum").map(Gp.focusIn)};return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.sliderBehaviours,[Gp.config({mode:"special",focusIn:b}),vu.config({store:{mode:"manual",getValue:e=>d.value.get(),setValue:g}}),Il.config({channels:{[tu()]:{onReceive:p}}})]),events:Hr([Wr(nC(),((t,o)=>{((t,o)=>{g(t,o);const n=s(t);e.onChange(t,n,o),A.some(!0)})(t,o.event.value)})),Jr(((t,o)=>{const n=d.getInitialValue();d.value.set(n);const a=s(t);m(t,a);const i=r(t);e.onInit(t,a,i,d.value.get())})),Wr(Hs(),h),Wr(Us(),f),Wr(js(),((e,t)=>{b(e),h(e,t)})),Wr(qs(),f)]),apis:{resetToMin:t=>{u.setToMin(t,e)},resetToMax:t=>{u.setToMax(t,e)},setValue:g,refresh:m},domModification:{styles:{position:"relative"}}}},apis:{setValue:(e,t,o)=>{e.setValue(t,o)},resetToMin:(e,t)=>{e.resetToMin(t)},resetToMax:(e,t)=>{e.resetToMax(t)},refresh:(e,t)=>{e.refresh(t)}}}),_O=ca("rgb-hex-update"),TO=ca("slider-update"),EO=ca("palette-update"),AO="form",MO=[yu("formBehaviours",[vu])],DO=e=>"<alloy.field."+e+">",BO=(e,t)=>({uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.formBehaviours,[vu.config({store:{mode:"manual",getValue:t=>{const o=cm(t,e);return ce(o,((e,t)=>e().bind((e=>{return o=Om.getCurrent(e),n=new Error(`Cannot find a current component to extract the value from for form part '${t}': `+sa(e.element)),o.fold((()=>rn.error(n)),rn.value);var o,n})).map(vu.getValue)))},setValue:(t,o)=>{le(o,((o,n)=>{am(t,e,n).each((e=>{Om.getCurrent(e).each((e=>{vu.setValue(e,o)}))}))}))}}})]),apis:{getField:(t,o)=>am(t,e,o).bind(Om.getCurrent)}}),IO={getField:Oa(((e,t,o)=>e.getField(t,o))),sketch:e=>{const t=(()=>{const e=[];return{field:(t,o)=>(e.push(t),tm(AO,DO(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=L(n,(e=>$u({name:e,pname:DO(e)})));return fm(AO,MO,s,BO,o)}},FO=ca("valid-input"),RO=ca("invalid-input"),NO=ca("validating-input"),VO="colorcustom.rgb.",zO=(e,t,o,n)=>{const s=(o,n)=>Lk.config({invalidClass:t("invalid"),notify:{onValidate:e=>{Rr(e,NO,{type:o})},onValid:e=>{Rr(e,FO,{type:o,value:vu.getValue(e)})},onInvalid:e=>{Rr(e,RO,{type:o,value:vu.getValue(e)})}},validator:{validate:t=>{const o=vu.getValue(t),s=n(o)?rn.value(!0):rn.error(e("aria.input.invalid"));return SS(s)},validateOnLoad:!1}}),r=(o,n,r,a,i)=>{const l=e(VO+"range"),c=uk.parts.label({dom:{tag:"label",attributes:{"aria-label":a}},components:[ri(r)]}),d=uk.parts.field({data:i,factory:Hv,inputAttributes:{type:"text",..."hex"===n?{"aria-live":"polite"}:{}},inputClasses:[t("textfield")],inputBehaviours:Tl([s(n,o),pk.config({})]),onSetValue:e=>{Lk.isInvalid(e)&&Lk.run(e).get(b)}}),u=[c,d],m="hex"!==n?[uk.parts["aria-descriptor"]({text:l})]:[];return{dom:{tag:"div",attributes:{role:"presentation"}},components:u.concat(m)}},a=(e,t)=>{const o=t.red,n=t.green,s=t.blue;vu.setValue(e,{red:o,green:n,blue:s})},i=Xh({dom:{tag:"div",classes:[t("rgba-preview")],styles:{"background-color":"white"},attributes:{role:"presentation"}}}),l=(e,t)=>{i.getOpt(e).each((e=>{Bt(e.element,"background-color","#"+t.value)}))},c=xm({factory:()=>{const s={red:As(A.some(255)),green:As(A.some(255)),blue:As(A.some(255)),hex:As(A.some("ffffff"))},c=e=>s[e].get(),d=(e,t)=>{s[e].set(t)},u=e=>{const t=e.red,o=e.green,n=e.blue;d("red",A.some(t)),d("green",A.some(o)),d("blue",A.some(n))},m=(e,t)=>{const o=t.event;"hex"!==o.type?d(o.type,A.none()):n(e)},g=(e,t)=>{const n=t.event;(e=>"hex"===e.type)(n)?((e,t)=>{o(e);const n=Kx(t);d("hex",A.some(n.value));const s=uw(n);a(e,s),u(s),Rr(e,_O,{hex:n}),l(e,n)})(e,n.value):((e,t,o)=>{const n=parseInt(o,10);d(t,A.some(n)),c("red").bind((e=>c("green").bind((t=>c("blue").map((o=>lw(e,t,o,1))))))).each((t=>{const o=((e,t)=>{const o=ow(t);return IO.getField(e,"hex").each((t=>{ah.isFocused(t)||vu.setValue(e,{hex:o.value})})),o})(e,t);Rr(e,_O,{hex:o}),l(e,o)}))})(e,n.type,n.value)},p=t=>({label:e(VO+t+".label"),description:e(VO+t+".description")}),h=p("red"),f=p("green"),b=p("blue"),v=p("hex");return bn(IO.sketch((o=>({dom:{tag:"form",classes:[t("rgb-form")],attributes:{"aria-label":e("aria.color.picker")}},components:[o.field("red",uk.sketch(r(cw,"red",h.label,h.description,255))),o.field("green",uk.sketch(r(cw,"green",f.label,f.description,255))),o.field("blue",uk.sketch(r(cw,"blue",b.label,b.description,255))),o.field("hex",uk.sketch(r(Qx,"hex",v.label,v.description,"ffffff"))),i.asSpec()],formBehaviours:Tl([Lk.config({invalidClass:t("form-invalid")}),th("rgb-form-events",[Wr(FO,g),Wr(RO,m),Wr(NO,m)])])}))),{apis:{updateHex:(e,t)=>{vu.setValue(e,{hex:t.value}),((e,t)=>{const o=uw(t);a(e,o),u(o)})(e,t),l(e,t)}}})},name:"RgbForm",configFields:[],apis:{updateHex:(e,t,o)=>{e.updateHex(t,o)}},extraApis:{}});return c},LO=(e,t)=>{const o=xm({name:"ColourPicker",configFields:[ns("dom"),xs("onValidHex",b),xs("onInvalidHex",b)],factory:o=>{const n=zO(e,t,o.onValidHex,o.onInvalidHex),s=((e,t)=>{const o=OO.parts.spectrum({dom:{tag:"canvas",attributes:{role:"presentation"},classes:[t("sv-palette-spectrum")]}}),n=OO.parts.thumb({dom:{tag:"div",attributes:{role:"presentation"},classes:[t("sv-palette-thumb")],innerHtml:`<div class=${t("sv-palette-inner-thumb")} role="presentation"></div>`}}),s=(e,t)=>{const{width:o,height:n}=e,s=e.getContext("2d");if(null===s)return;s.fillStyle=t,s.fillRect(0,0,o,n);const r=s.createLinearGradient(0,0,o,0);r.addColorStop(0,"rgba(255,255,255,1)"),r.addColorStop(1,"rgba(255,255,255,0)"),s.fillStyle=r,s.fillRect(0,0,o,n);const a=s.createLinearGradient(0,0,0,n);a.addColorStop(0,"rgba(0,0,0,0)"),a.addColorStop(1,"rgba(0,0,0,1)"),s.fillStyle=a,s.fillRect(0,0,o,n)};return xm({factory:r=>{const a=x({x:0,y:0}),i=Tl([Om.config({find:A.some}),ah.config({})]);return OO.sketch({dom:{tag:"div",attributes:{role:"slider","aria-valuetext":e(["Saturation {0}%, Brightness {1}%",0,0])},classes:[t("sv-palette")]},model:{mode:"xy",getInitialValue:a},rounded:!1,components:[o,n],onChange:(t,o,n)=>{h(n)||Ct(t.element,"aria-valuetext",e(["Saturation {0}%, Brightness {1}%",Math.floor(n.x),Math.floor(100-n.y)])),Rr(t,EO,{value:n})},onInit:(e,t,o,n)=>{s(o.element.dom,pw(hw))},sliderBehaviours:i})},name:"SaturationBrightnessPalette",configFields:[],apis:{setHue:(e,t,o)=>{((e,t)=>{const o=e.components()[0].element.dom,n=Aw(t,100,100),r=dw(n);s(o,pw(r))})(t,o)},setThumb:(t,o,n)=>{((t,o)=>{const n=Mw(uw(o));OO.setValue(t,{x:n.saturation,y:100-n.value}),Ct(t.element,"aria-valuetext",e(["Saturation {0}%, Brightness {1}%",n.saturation,n.value]))})(o,n)}},extraApis:{}})})(e,t),r={paletteRgba:As(hw),paletteHue:As(0)},a=Xh(((e,t)=>{const o=OO.parts.spectrum({dom:{tag:"div",classes:[t("hue-slider-spectrum")],attributes:{role:"presentation"}}}),n=OO.parts.thumb({dom:{tag:"div",classes:[t("hue-slider-thumb")],attributes:{role:"presentation"}}});return OO.sketch({dom:{tag:"div",classes:[t("hue-slider")],attributes:{role:"slider","aria-valuemin":0,"aria-valuemax":360,"aria-valuenow":120}},rounded:!1,model:{mode:"y",getInitialValue:x(0)},components:[o,n],sliderBehaviours:Tl([ah.config({})]),onChange:(e,t,o)=>{Ct(e.element,"aria-valuenow",Math.floor(360-3.6*o)),Rr(e,TO,{value:o})}})})(0,t)),i=Xh(s.sketch({})),l=Xh(n.sketch({})),c=(e,t,o)=>{i.getOpt(e).each((e=>{s.setHue(e,o)}))},d=(e,t)=>{l.getOpt(e).each((e=>{n.updateHex(e,t)}))},u=(e,t,o)=>{a.getOpt(e).each((e=>{OO.setValue(e,(e=>100-e/360*100)(o))}))},m=(e,t)=>{i.getOpt(e).each((e=>{s.setThumb(e,t)}))},g=(e,t,o,n)=>{((e,t)=>{const o=uw(e);r.paletteRgba.set(o),r.paletteHue.set(t)})(t,o),H(n,(n=>{n(e,t,o)}))};return{uid:o.uid,dom:o.dom,components:[i.asSpec(),a.asSpec(),l.asSpec()],behaviours:Tl([th("colour-picker-events",[Wr(_O,(()=>{const e=[c,u,m];return(t,o)=>{const n=o.event.hex,s=(e=>Mw(uw(e)))(n);g(t,n,s.hue,e)}})()),Wr(EO,(()=>{const e=[d];return(t,o)=>{const n=o.event.value,s=r.paletteHue.get(),a=Aw(s,n.x,100-n.y),i=Dw(a);g(t,i,s,e)}})()),Wr(TO,(()=>{const e=[c,d];return(t,o)=>{const n=(e=>(100-e)/100*360)(o.event.value),s=r.paletteRgba.get(),a=Mw(s),i=Aw(n,a.saturation,a.value),l=Dw(i);g(t,l,n,e)}})())]),Om.config({find:e=>l.getOpt(e)}),Gp.config({mode:"acyclic"})])}}});return o},HO=()=>Om.config({find:A.some}),PO=e=>Om.config({find:t=>ct(t.element,e).bind((e=>t.getSystem().getByDom(e).toOptional()))}),UO=Bn([xs("preprocess",w),xs("postprocess",w)]),WO=(e,t)=>{const o=Kn("RepresentingConfigs.memento processors",UO,t);return vu.config({store:{mode:"manual",getValue:t=>{const n=e.get(t),s=vu.getValue(n);return o.postprocess(s)},setValue:(t,n)=>{const s=o.preprocess(n),r=e.get(t);vu.setValue(r,s)}}})},jO=(e,t,o)=>vu.config({store:{mode:"manual",...e.map((e=>({initialValue:e}))).getOr({}),getValue:t,setValue:o}}),GO=(e,t,o)=>jO(e,(e=>t(e.element)),((e,t)=>o(e.element,t))),$O=e=>vu.config({store:{mode:"memory",initialValue:e}}),qO={"colorcustom.rgb.red.label":"R","colorcustom.rgb.red.description":"Red component","colorcustom.rgb.green.label":"G","colorcustom.rgb.green.description":"Green component","colorcustom.rgb.blue.label":"B","colorcustom.rgb.blue.description":"Blue component","colorcustom.rgb.hex.label":"#","colorcustom.rgb.hex.description":"Hex color code","colorcustom.rgb.range":"Range 0 to 255","aria.color.picker":"Color Picker","aria.input.invalid":"Invalid input"};var YO=tinymce.util.Tools.resolve("tinymce.Resource"),XO=tinymce.util.Tools.resolve("tinymce.util.Tools");const KO=(e,t)=>{let o=null;const n=()=>{c(o)||(clearTimeout(o),o=null)};return{cancel:n,throttle:(...s)=>{n(),o=setTimeout((()=>{o=null,e.apply(null,s)}),t)}}},JO=ca("alloy-fake-before-tabstop"),ZO=ca("alloy-fake-after-tabstop"),QO=e=>({dom:{tag:"div",styles:{width:"1px",height:"1px",outline:"none"},attributes:{tabindex:"0"},classes:e},behaviours:Tl([ah.config({ignore:!0}),pk.config({})])}),e_=(e,t)=>({dom:{tag:"div",classes:["tox-navobj",...e.getOr([])]},components:[QO([JO]),t,QO([ZO])],behaviours:Tl([PO(1)])}),t_=(e,t)=>{Rr(e,Js(),{raw:{which:9,shiftKey:t}})},o_=(e,t)=>{const o=t.element;$a(o,JO)?t_(e,!0):$a(o,ZO)&&t_(e,!1)},n_=e=>JS(e,["."+JO,"."+ZO].join(","),T),s_=ca("update-dialog"),r_=ca("update-title"),a_=ca("update-body"),i_=ca("update-footer"),l_=ca("body-send-message"),c_=ca("dialog-focus-shifted"),d_=Bo().browser,u_=d_.isSafari(),m_=d_.isFirefox(),g_=u_||m_,p_=d_.isChromium(),h_=({scrollTop:e,scrollHeight:t,clientHeight:o})=>Math.ceil(e)+o>=t,f_=(e,t)=>e.scrollTo(0,"bottom"===t?99999999:t),b_=(e,t,o)=>{const n=e.dom;A.from(n.contentDocument).fold(o,(e=>{let o=0;const s=((e,t)=>{const o=e.body;return A.from(!/^<!DOCTYPE (html|HTML)/.test(t)&&(!p_&&!u_||g(o)&&(0!==o.scrollTop||Math.abs(o.scrollHeight-o.clientHeight)>1))?o:e.documentElement)})(e,t).map((e=>(o=e.scrollTop,e))).forall(h_),r=()=>{const e=n.contentWindow;g(e)&&(s?f_(e,"bottom"):!s&&g_&&0!==o&&f_(e,o))};u_&&n.addEventListener("load",r,{once:!0}),e.open(),e.write(t),e.close(),u_||r()}))},v_=Ce(g_,u_?500:200).map((e=>((e,t)=>{let o=null,n=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null,n=null)},throttle:(...s)=>{n=s,c(o)&&(o=setTimeout((()=>{const t=n;o=null,n=null,e.apply(null,t)}),t))}}})(b_,e))),y_=ca("toolbar.button.execute"),x_=ca("common-button-display-events"),w_={[mr()]:["disabling","alloy.base.behaviour","toggling","toolbar-button-events"],[kr()]:["toolbar-button-events",x_],[js()]:["focusing","alloy.base.behaviour",x_]},S_=e=>Bt(e.element,"width",Rt(e.element,"width")),k_=(e,t,o)=>ob(e,{tag:"span",classes:["tox-icon","tox-tbtn__icon-wrap"],behaviours:o},t),C_=(e,t)=>k_(e,t,[]),O_=(e,t)=>k_(e,t,[eh.config({})]),__=(e,t,o)=>({dom:{tag:"span",classes:[`${t}__select-label`]},components:[ri(o.translate(e))],behaviours:Tl([eh.config({})])}),T_=ca("update-menu-text"),E_=ca("update-menu-icon"),A_=(e,t,o)=>{const n=As(b),s=e.text.map((e=>Xh(__(e,t,o.providers)))),r=e.icon.map((e=>Xh(O_(e,o.providers.icons)))),a=(e,t)=>{const o=vu.getValue(e);return ah.focus(o),Rr(o,"keydown",{raw:t.event.raw}),NS.close(o),A.some(!0)},i=e.role.fold((()=>({})),(e=>({role:e}))),l=e.tooltip.fold((()=>({})),(e=>{const t=o.providers.translate(e);return{title:t,"aria-label":t}})),c=ob("chevron-down",{tag:"div",classes:[`${t}__select-chevron`]},o.providers.icons),d=ca("common-button-display-events"),u=Xh(NS.sketch({...e.uid?{uid:e.uid}:{},...i,dom:{tag:"button",classes:[t,`${t}--select`].concat(L(e.classes,(e=>`${t}--${e}`))),attributes:{...l}},components:Fx([r.map((e=>e.asSpec())),s.map((e=>e.asSpec())),A.some(c)]),matchWidth:!0,useMinWidth:!0,onOpen:(t,o,n)=>{e.searchable&&(e=>{Gv(e).each((e=>ah.focus(e)))})(n)},dropdownBehaviours:Tl([...e.dropdownBehaviours,_x((()=>e.disabled||o.providers.isDisabled())),Ox(),Hk.config({}),eh.config({}),th("dropdown-events",[Mx(e,n),Dx(e,n)]),th(d,[Jr(((e,t)=>S_(e)))]),th("menubutton-update-display-text",[Wr(T_,((e,t)=>{s.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[ri(o.providers.translate(t.event.text))])}))})),Wr(E_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[O_(t.event.icon,o.providers.icons)])}))}))])]),eventOrder:bn(w_,{mousedown:["focusing","alloy.base.behaviour","item-type-events","normal-dropdown-events"],[kr()]:["toolbar-button-events","dropdown-events",d]}),sandboxBehaviours:Tl([Gp.config({mode:"special",onLeft:a,onRight:a}),th("dropdown-sandbox-events",[Wr(Pv,((e,t)=>{(e=>{const t=vu.getValue(e),o=jv(e).map($v);NS.refetch(t).get((()=>{const e=fS.getCoupled(t,"sandbox");o.each((t=>jv(e).each((e=>((e,t)=>{vu.setValue(e,t.fetchPattern),e.element.dom.selectionStart=t.selectionStart,e.element.dom.selectionEnd=t.selectionEnd})(e,t)))))}))})(e),t.stop()})),Wr(Uv,((e,t)=>{((e,t)=>{(e=>Zd.getState(e).bind(Xm.getHighlighted).bind(Xm.getHighlighted))(e).each((o=>{((e,t,o,n)=>{const s={...n,target:t};e.getSystem().triggerEvent(o,t,s)})(e,o.element,t.event.eventType,t.event.interactionEvent)}))})(e,t),t.stop()}))])]),lazySink:o.getSink,toggleClass:`${t}--active`,parts:{menu:{...Rv(0,e.columns,e.presets),fakeFocus:e.searchable,onHighlightItem:VS,onCollapseMenu:(e,t,o)=>{Xm.getHighlighted(o).each((t=>{VS(e,o,t)}))},onDehighlightItem:zS}},getAnchorOverrides:()=>({maxHeightFunction:(e,t)=>{mc()(e,t-10)}}),fetch:t=>wS(k(e.fetch,t))}));return u.asSpec()},M_=e=>"separator"===e.type,D_={type:"separator"},B_=(e,t)=>{const o=((e,t)=>{const o=j(e,((e,o)=>(e=>r(e))(o)?""===o?e:"|"===o?e.length>0&&!M_(e[e.length-1])?e.concat([D_]):e:ve(t,o.toLowerCase())?e.concat([t[o.toLowerCase()]]):e:e.concat([o])),[]);return o.length>0&&M_(o[o.length-1])&&o.pop(),o})(r(e)?e.split(" "):e,t);return W(o,((e,o)=>{if((e=>ve(e,"getSubmenuItems"))(o)){const n=(e=>{const t=be(e,"value").getOrThunk((()=>ca("generated-menu-item")));return bn({value:t},e)})(o),s=((e,t)=>{const o=e.getSubmenuItems(),n=B_(o,t);return{item:e,menus:bn(n.menus,{[e.value]:n.items}),expansions:bn(n.expansions,{[e.value]:e.value})}})(n,t);return{menus:bn(e.menus,s.menus),items:[s.item,...e.items],expansions:bn(e.expansions,s.expansions)}}return{...e,items:[o,...e.items]}}),{menus:{},expansions:{},items:[]})},I_=(e,t,o,n)=>{const s=ca("primary-menu"),r=B_(e,o.shared.providers.menuItems());if(0===r.items.length)return A.none();const a=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-field",placeholder:e.placeholder}))))(n),i=WS(s,r.items,t,o,n.isHorizontalMenu,a),l=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-results"}))))(n),c=ce(r.menus,((e,n)=>WS(n,e,t,o,!1,l))),d=bn(c,Ds(s,i));return A.from(jh.tieredData(s,d,r.expansions))},F_=e=>!ve(e,"items"),R_="data-value",N_=(e,t,o,n)=>L(o,(o=>F_(o)?{type:"togglemenuitem",text:o.text,value:o.value,active:o.value===n,onAction:()=>{vu.setValue(e,o.value),Rr(e,xk,{name:t}),ah.focus(e)}}:{type:"nestedmenuitem",text:o.text,getSubmenuItems:()=>N_(e,t,o.items,n)})),V_=(e,t)=>re(e,(e=>F_(e)?Ce(e.value===t,e):V_(e.items,t))),z_=xm({name:"HtmlSelect",configFields:[ns("options"),yu("selectBehaviours",[ah,vu]),xs("selectClasses",[]),xs("selectAttributes",{}),ms("data")],factory:(e,t)=>{const o=L(e.options,(e=>({dom:{tag:"option",value:e.value,innerHtml:e.text}}))),n=e.data.map((e=>Ds("initialValue",e))).getOr({});return{uid:e.uid,dom:{tag:"select",classes:e.selectClasses,attributes:e.selectAttributes},components:o,behaviours:wu(e.selectBehaviours,[ah.config({}),vu.config({store:{mode:"manual",getValue:e=>Ka(e.element),setValue:(t,o)=>{const n=oe(e.options);G(e.options,(e=>e.value===o)).isSome()?Ja(t.element,o):-1===t.element.dom.selectedIndex&&""===o&&n.each((e=>Ja(t.element,e.value)))},...n}})])}}}),L_=x([xs("field1Name","field1"),xs("field2Name","field2"),Vi("onLockedChange"),Ii(["lockClass"]),xs("locked",!1),Su("coupledFieldBehaviours",[Om,vu])]),H_=(e,t)=>$u({factory:uk,name:e,overrides:e=>({fieldBehaviours:Tl([th("coupled-input-behaviour",[Wr(Qs(),(o=>{((e,t,o)=>am(e,t,o).bind(Om.getCurrent))(o,e,t).each((t=>{am(o,e,"lock").each((n=>{ph.isOn(n)&&e.onLockedChange(o,t,n)}))}))}))])])})}),P_=x([H_("field1","field2"),H_("field2","field1"),$u({factory:qh,schema:[ns("dom")],name:"lock",overrides:e=>({buttonBehaviours:Tl([ph.config({selected:e.locked,toggleClass:e.markers.lockClass,aria:{mode:"pressed"}})])})})]),U_=wm({name:"FormCoupledInputs",configFields:L_(),partFields:P_(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:ku(e.coupledFieldBehaviours,[Om.config({find:A.some}),vu.config({store:{mode:"manual",getValue:t=>{const o=um(t,e,["field1","field2"]);return{[e.field1Name]:vu.getValue(o.field1()),[e.field2Name]:vu.getValue(o.field2())}},setValue:(t,o)=>{const n=um(t,e,["field1","field2"]);ye(o,e.field1Name)&&vu.setValue(n.field1(),o[e.field1Name]),ye(o,e.field2Name)&&vu.setValue(n.field2(),o[e.field2Name])}}})]),apis:{getField1:t=>am(t,e,"field1"),getField2:t=>am(t,e,"field2"),getLock:t=>am(t,e,"lock")}}),apis:{getField1:(e,t)=>e.getField1(t),getField2:(e,t)=>e.getField2(t),getLock:(e,t)=>e.getLock(t)}}),W_=e=>{const t=/^\s*(\d+(?:\.\d+)?)\s*(|cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)\s*$/.exec(e);if(null!==t){const e=parseFloat(t[1]),o=t[2];return rn.value({value:e,unit:o})}return rn.error(e)},j_=(e,t)=>{const o={"":96,px:96,pt:72,cm:2.54,pc:12,mm:25.4,in:1},n=e=>ve(o,e);return e.unit===t?A.some(e.value):n(e.unit)&&n(t)?o[e.unit]===o[t]?A.some(e.value):A.some(e.value/o[e.unit]*o[t]):A.none()},G_=e=>A.none(),$_=(e,t)=>{const o=e.label.map((e=>yk(e,t))),n=[Lm.config({disabled:()=>e.disabled||t.isDisabled()}),Ox(),Gp.config({mode:"execution",useEnter:!0!==e.multiline,useControlEnter:!0===e.multiline,execute:e=>(Fr(e,Ck),A.some(!0))}),th("textfield-change",[Wr(Qs(),((t,o)=>{Rr(t,xk,{name:e.name})})),Wr(dr(),((t,o)=>{Rr(t,xk,{name:e.name})}))]),pk.config({})],s=e.validation.map((e=>Lk.config({getRoot:e=>at(e.element),invalidClass:"tox-invalid",validator:{validate:t=>{const o=vu.getValue(t),n=e.validator(o);return SS(!0===n?rn.value(o):rn.error(n))},validateOnLoad:e.validateOnLoad}}))).toArray(),r={...e.placeholder.fold(x({}),(e=>({placeholder:t.translate(e)}))),...e.inputMode.fold(x({}),(e=>({inputmode:e})))},a=uk.parts.field({tag:!0===e.multiline?"textarea":"input",...e.data.map((e=>({data:e}))).getOr({}),inputAttributes:r,inputClasses:[e.classname],inputBehaviours:Tl(q([n,s])),selectOnFocus:!1,factory:Hv}),i=e.multiline?{dom:{tag:"div",classes:["tox-textarea-wrap"]},components:[a]}:a,l=(e.flex?["tox-form__group--stretched"]:[]).concat(e.maximized?["tox-form-group--maximize"]:[]),c=[Lm.config({disabled:()=>e.disabled||t.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}}),Ox()];return fk(o,i,l,c)},q_=(e,t)=>t.getAnimationRoot.fold((()=>e.element),(t=>t(e))),Y_=e=>e.dimension.property,X_=(e,t)=>e.dimension.getDimension(t),K_=(e,t)=>{const o=q_(e,t);Ya(o,[t.shrinkingClass,t.growingClass])},J_=(e,t)=>{Ga(e.element,t.openClass),Wa(e.element,t.closedClass),Bt(e.element,Y_(t),"0px"),Pt(e.element)},Z_=(e,t)=>{Ga(e.element,t.closedClass),Wa(e.element,t.openClass),Ht(e.element,Y_(t))},Q_=(e,t,o,n)=>{o.setCollapsed(),Bt(e.element,Y_(t),X_(t,e.element)),K_(e,t),J_(e,t),t.onStartShrink(e),t.onShrunk(e)},eT=(e,t,o,n)=>{const s=n.getOrThunk((()=>X_(t,e.element)));o.setCollapsed(),Bt(e.element,Y_(t),s),Pt(e.element);const r=q_(e,t);Ga(r,t.growingClass),Wa(r,t.shrinkingClass),J_(e,t),t.onStartShrink(e)},tT=(e,t,o)=>{const n=X_(t,e.element);("0px"===n?Q_:eT)(e,t,o,A.some(n))},oT=(e,t,o)=>{const n=q_(e,t),s=$a(n,t.shrinkingClass),r=X_(t,e.element);Z_(e,t);const a=X_(t,e.element);(s?()=>{Bt(e.element,Y_(t),r),Pt(e.element)}:()=>{J_(e,t)})(),Ga(n,t.shrinkingClass),Wa(n,t.growingClass),Z_(e,t),Bt(e.element,Y_(t),a),o.setExpanded(),t.onStartGrow(e)},nT=(e,t,o)=>{const n=q_(e,t);return!0===$a(n,t.growingClass)},sT=(e,t,o)=>{const n=q_(e,t);return!0===$a(n,t.shrinkingClass)};var rT=Object.freeze({__proto__:null,refresh:(e,t,o)=>{if(o.isExpanded()){Ht(e.element,Y_(t));const o=X_(t,e.element);Bt(e.element,Y_(t),o)}},grow:(e,t,o)=>{o.isExpanded()||oT(e,t,o)},shrink:(e,t,o)=>{o.isExpanded()&&tT(e,t,o)},immediateShrink:(e,t,o)=>{o.isExpanded()&&Q_(e,t,o)},hasGrown:(e,t,o)=>o.isExpanded(),hasShrunk:(e,t,o)=>o.isCollapsed(),isGrowing:nT,isShrinking:sT,isTransitioning:(e,t,o)=>nT(e,t)||sT(e,t),toggleGrow:(e,t,o)=>{(o.isExpanded()?tT:oT)(e,t,o)},disableTransitions:K_,immediateGrow:(e,t,o)=>{o.isExpanded()||(Z_(e,t),Bt(e.element,Y_(t),X_(t,e.element)),K_(e,t),o.setExpanded(),t.onStartGrow(e),t.onGrown(e))}}),aT=Object.freeze({__proto__:null,exhibit:(e,t,o)=>{const n=t.expanded;return Aa(n?{classes:[t.openClass],styles:{}}:{classes:[t.closedClass],styles:Ds(t.dimension.property,"0px")})},events:(e,t)=>Hr([Kr(nr(),((o,n)=>{n.event.raw.propertyName===e.dimension.property&&(K_(o,e),t.isExpanded()&&Ht(o.element,e.dimension.property),(t.isExpanded()?e.onGrown:e.onShrunk)(o))}))])}),iT=[ns("closedClass"),ns("openClass"),ns("shrinkingClass"),ns("growingClass"),ms("getAnimationRoot"),Ri("onShrunk"),Ri("onStartShrink"),Ri("onGrown"),Ri("onStartGrow"),xs("expanded",!1),ss("dimension",Zn("property",{width:[Li("property","width"),Li("getDimension",(e=>Zt(e)+"px"))],height:[Li("property","height"),Li("getDimension",(e=>jt(e)+"px"))]}))];const lT=Al({fields:iT,name:"sliding",active:aT,apis:rT,state:Object.freeze({__proto__:null,init:e=>{const t=As(e.expanded);return Ta({isExpanded:()=>!0===t.get(),isCollapsed:()=>!1===t.get(),setCollapsed:k(t.set,!1),setExpanded:k(t.set,!0),readState:()=>"expanded: "+t.get()})}})}),cT=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setActive:t=>{const o=e.element;t?(Wa(o,"tox-tbtn--enabled"),Ct(o,"aria-pressed",!0)):(Ga(o,"tox-tbtn--enabled"),At(o,"aria-pressed"))},isActive:()=>$a(e.element,"tox-tbtn--enabled"),setText:t=>{Rr(e,T_,{text:t})},setIcon:t=>Rr(e,E_,{icon:t})}),dT=(e,t,o,n,s=!0)=>A_({text:e.text,icon:e.icon,tooltip:e.tooltip,searchable:e.search.isSome(),role:n,fetch:(t,n)=>{const s={pattern:e.search.isSome()?LS(t):""};e.fetch((t=>{n(I_(t,bv.CLOSE_ON_EXECUTE,o,{isHorizontalMenu:!1,search:e.search}))}),s,cT(t))},onSetup:e.onSetup,getApi:cT,columns:1,presets:"normal",classes:[],dropdownBehaviours:[...s?[pk.config({})]:[]]},t,o.shared),uT=(e,t,o)=>{const n=e=>n=>{const s=!n.isActive();n.setActive(s),e.storage.set(s),o.shared.getSink().each((o=>{t().getOpt(o).each((t=>{Rl(t.element),Rr(t,kk,{name:e.name,value:e.storage.get()})}))}))},s=e=>t=>{t.setActive(e.storage.get())};return t=>{t(L(e,(e=>{const t=e.text.fold((()=>({})),(e=>({text:e})));return{type:e.type,active:!1,...t,onAction:n(e),onSetup:s(e)}})))}},mT=e=>({dom:{tag:"span",classes:["tox-tree__label"],attributes:{title:e,"aria-label":e}},components:[ri(e)]}),gT=ca("leaf-label-event-id"),pT=({leaf:e,onLeafAction:t,visible:o,treeId:n,selectedId:s,backstage:r})=>{const a=e.menu.map((e=>dT(e,"tox-mbtn",r,A.none(),o))),i=[mT(e.title)];return a.each((e=>i.push(e))),qh.sketch({dom:{tag:"div",classes:["tox-tree--leaf__label","tox-trbtn"].concat(o?["tox-tree--leaf__label--visible"]:[])},components:i,role:"treeitem",action:o=>{t(e.id),o.getSystem().broadcastOn([`update-active-item-${n}`],{value:e.id})},eventOrder:{[Js()]:[gT,"keying"]},buttonBehaviours:Tl([...o?[pk.config({})]:[],ph.config({toggleClass:"tox-trbtn--enabled",toggleOnExecute:!1,aria:{mode:"selected"}}),Il.config({channels:{[`update-active-item-${n}`]:{onReceive:(t,o)=>{(o.value===e.id?ph.on:ph.off)(t)}}}}),th(gT,[Jr(((t,o)=>{s.each((o=>{(o===e.id?ph.on:ph.off)(t)}))})),Wr(Js(),((e,t)=>{const o="ArrowLeft"===t.event.raw.code,n="ArrowRight"===t.event.raw.code;o?(fi(e.element,".tox-tree--directory").each((t=>{e.getSystem().getByDom(t).each((e=>{bi(t,".tox-tree--directory__label").each((t=>{e.getSystem().getByDom(t).each(ah.focus)}))}))})),t.stop()):n&&t.stop()}))])])})},hT=ca("directory-label-event-id"),fT=({directory:e,visible:t,noChildren:o,backstage:n})=>{const s=e.menu.map((e=>dT(e,"tox-mbtn",n,A.none()))),r=[{dom:{tag:"div",classes:["tox-chevron"]},components:[(a="chevron-right",i=n.shared.providers.icons,((e,t,o)=>ob(e,{tag:"span",classes:["tox-tree__icon-wrap","tox-icon"],behaviours:[]},t))(a,i))]},mT(e.title)];var a,i;s.each((e=>{r.push(e)}));const l=t=>{fi(t.element,".tox-tree--directory").each((o=>{t.getSystem().getByDom(o).each((o=>{const n=!ph.isOn(o);ph.toggle(o),Rr(t,"expand-tree-node",{expanded:n,node:e.id})}))}))};return qh.sketch({dom:{tag:"div",classes:["tox-tree--directory__label","tox-trbtn"].concat(t?["tox-tree--directory__label--visible"]:[])},components:r,action:l,eventOrder:{[Js()]:[hT,"keying"]},buttonBehaviours:Tl([...t?[pk.config({})]:[],th(hT,[Wr(Js(),((e,t)=>{const n="ArrowRight"===t.event.raw.code,s="ArrowLeft"===t.event.raw.code;n&&o&&t.stop(),(n||s)&&fi(e.element,".tox-tree--directory").each((o=>{e.getSystem().getByDom(o).each((o=>{!ph.isOn(o)&&n||ph.isOn(o)&&s?(l(e),t.stop()):s&&!ph.isOn(o)&&(fi(o.element,".tox-tree--directory").each((e=>{bi(e,".tox-tree--directory__label").each((e=>{o.getSystem().getByDom(e).each(ah.focus)}))})),t.stop())}))}))}))])])})},bT=({children:e,onLeafAction:t,visible:o,treeId:n,expandedIds:s,selectedId:r,backstage:a})=>({dom:{tag:"div",classes:["tox-tree--directory__children"]},components:e.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:r,onLeafAction:t,visible:o,treeId:n,backstage:a}):yT({directory:e,expandedIds:s,selectedId:r,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:a}))),behaviours:Tl([lT.config({dimension:{property:"height"},closedClass:"tox-tree--directory__children--closed",openClass:"tox-tree--directory__children--open",growingClass:"tox-tree--directory__children--growing",shrinkingClass:"tox-tree--directory__children--shrinking",expanded:o}),eh.config({})])}),vT=ca("directory-event-id"),yT=({directory:e,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:s,expandedIds:r,selectedId:a})=>{const{children:i}=e,l=As(r),c=r.includes(e.id);return{dom:{tag:"div",classes:["tox-tree--directory"],attributes:{role:"treeitem"}},components:[fT({directory:e,visible:o,noChildren:0===e.children.length,backstage:s}),bT({children:i,expandedIds:r,selectedId:a,onLeafAction:t,visible:c,treeId:n,backstage:s})],behaviours:Tl([th(vT,[Jr(((e,t)=>{ph.set(e,c)})),Wr("expand-tree-node",((e,t)=>{const{expanded:o,node:n}=t.event;l.set(o?[...l.get(),n]:l.get().filter((e=>e!==n)))}))]),ph.config({...e.children.length>0?{aria:{mode:"expanded"}}:{},toggleClass:"tox-tree--directory--expanded",onToggled:(e,o)=>{const r=e.components()[1],c=(d=o,i.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:a,onLeafAction:t,visible:d,treeId:n,backstage:s}):yT({directory:e,expandedIds:l.get(),selectedId:a,onLeafAction:t,labelTabstopping:d,treeId:n,backstage:s}))));var d;o?lT.grow(r):lT.shrink(r),eh.set(r,c)}})])}},xT=ca("tree-event-id");var wT=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.stream.streams.setup(e,t);return Hr([Wr(e.event,o),Zr((()=>t.cancel()))].concat(e.cancelEvent.map((e=>[Wr(e,(()=>t.cancel()))])).getOr([])))}});const ST=e=>{const t=As(null);return Ta({readState:()=>({timer:null!==t.get()?"set":"unset"}),setTimer:e=>{t.set(e)},cancel:()=>{const e=t.get();null!==e&&e.cancel()}})};var kT=Object.freeze({__proto__:null,throttle:ST,init:e=>e.stream.streams.state(e)}),CT=[ss("stream",Zn("mode",{throttle:[ns("delay"),xs("stopEvent",!0),Li("streams",{setup:(e,t)=>{const o=e.stream,n=KO(e.onStream,o.delay);return t.setTimer(n),(e,t)=>{n.throttle(e,t),o.stopEvent&&t.stop()}},state:ST})]})),xs("event","input"),ms("cancelEvent"),Vi("onStream")];const OT=Al({fields:CT,name:"streaming",active:wT,state:kT}),_T=(e,t,o)=>{const n=vu.getValue(o);vu.setValue(t,n),ET(t)},TT=(e,t)=>{const o=e.element,n=Ka(o),s=o.dom;"number"!==_t(o,"type")&&t(s,n)},ET=e=>{TT(e,((e,t)=>e.setSelectionRange(t.length,t.length)))},AT=x("alloy.typeahead.itemexecute"),MT=x([ms("lazySink"),ns("fetch"),xs("minChars",5),xs("responseTime",1e3),Ri("onOpen"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),xs("layouts",A.none()),xs("eventOrder",{}),Es("model",{},[xs("getDisplayText",(e=>void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.value)),xs("selectsOver",!0),xs("populateFromBrowse",!0)]),Ri("onSetValue"),Ni("onExecute"),Ri("onItemExecute"),xs("inputClasses",[]),xs("inputAttributes",{}),xs("inputStyles",{}),xs("matchWidth",!0),xs("useMinWidth",!1),xs("dismissOnBlur",!0),Ii(["openClass"]),ms("initialData"),yu("typeaheadBehaviours",[ah,vu,OT,Gp,ph,fS]),ts("lazyTypeaheadComp",(()=>As(A.none))),ts("previewing",(()=>As(!0)))].concat(Nv()).concat(IS())),DT=x([qu({schema:[Bi()],name:"menu",overrides:e=>({fakeFocus:!0,onHighlightItem:(t,o,n)=>{e.previewing.get()?e.lazyTypeaheadComp.get().each((t=>{((e,t,o)=>{if(e.selectsOver){const n=vu.getValue(t),s=e.getDisplayText(n),r=vu.getValue(o);return 0===e.getDisplayText(r).indexOf(s)?A.some((()=>{_T(0,t,o),((e,t)=>{TT(e,((e,o)=>e.setSelectionRange(t,o.length)))})(t,s.length)})):A.none()}return A.none()})(e.model,t,n).fold((()=>{e.model.selectsOver?(Xm.dehighlight(o,n),e.previewing.set(!0)):e.previewing.set(!1)}),(t=>{t(),e.previewing.set(!1)}))})):e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&_T(e.model,t,n),Tt(n.element,"id").each((e=>Ct(t.element,"aria-activedescendant",e)))}))},onExecute:(t,o)=>e.lazyTypeaheadComp.get().map((e=>(Rr(e,AT(),{item:o}),!0))),onHover:(t,o)=>{e.previewing.set(!1),e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&_T(e.model,t,o)}))}})})]),BT=wm({name:"Typeahead",configFields:MT(),partFields:DT(),factory:(e,t,o,n)=>{const s=(t,o,s)=>{e.previewing.set(!1);const r=fS.getCoupled(t,"sandbox");if(Zd.isOpen(r))Om.getCurrent(r).each((e=>{Xm.getHighlighted(e).fold((()=>{s(e)}),(()=>{Lr(r,e.element,"keydown",o)}))}));else{const o=e=>{Om.getCurrent(e).each(s)};_S(e,a(t),t,r,n,o,Uh.HighlightMenuAndItem).get(b)}},r=Vv(e),a=e=>t=>t.map((t=>{const o=fe(t.menus),n=Y(o,(e=>U(e.items,(e=>"item"===e.type))));return vu.getState(e).update(L(n,(e=>e.data))),t})),i=e=>Om.getCurrent(e),l="typeaheadevents",c=[ah.config({}),vu.config({onSetValue:e.onSetValue,store:{mode:"dataset",getDataKey:e=>Ka(e.element),getFallbackEntry:e=>({value:e,meta:{}}),setValue:(t,o)=>{Ja(t.element,e.model.getDisplayText(o))},...e.initialData.map((e=>Ds("initialValue",e))).getOr({})}}),OT.config({stream:{mode:"throttle",delay:e.responseTime,stopEvent:!1},onStream:(t,o)=>{const s=fS.getCoupled(t,"sandbox");if(ah.isFocused(t)&&Ka(t.element).length>=e.minChars){const o=i(s).bind((e=>Xm.getHighlighted(e).map(vu.getValue)));e.previewing.set(!0);const r=t=>{i(s).each((t=>{o.fold((()=>{e.model.selectsOver&&Xm.highlightFirst(t)}),(e=>{Xm.highlightBy(t,(t=>vu.getValue(t).value===e.value)),Xm.getHighlighted(t).orThunk((()=>(Xm.highlightFirst(t),A.none())))}))}))};_S(e,a(t),t,s,n,r,Uh.HighlightJustMenu).get(b)}},cancelEvent:br()}),Gp.config({mode:"special",onDown:(e,t)=>(s(e,t,Xm.highlightFirst),A.some(!0)),onEscape:e=>{const t=fS.getCoupled(e,"sandbox");return Zd.isOpen(t)?(Zd.close(t),A.some(!0)):A.none()},onUp:(e,t)=>(s(e,t,Xm.highlightLast),A.some(!0)),onEnter:t=>{const o=fS.getCoupled(t,"sandbox"),n=Zd.isOpen(o);if(n&&!e.previewing.get())return i(o).bind((e=>Xm.getHighlighted(e))).map((e=>(Rr(t,AT(),{item:e}),!0)));{const s=vu.getValue(t);return Fr(t,br()),e.onExecute(o,t,s),n&&Zd.close(o),A.some(!0)}}}),ph.config({toggleClass:e.markers.openClass,aria:{mode:"expanded"}}),fS.config({others:{sandbox:t=>DS(e,t,{onOpen:()=>ph.on(t),onClose:()=>{e.lazyTypeaheadComp.get().each((e=>At(e.element,"aria-activedescendant"))),ph.off(t)}})}}),th(l,[Jr((t=>{e.lazyTypeaheadComp.set(A.some(t))})),Zr((t=>{e.lazyTypeaheadComp.set(A.none())})),ea((t=>{const o=b;ES(e,a(t),t,n,o,Uh.HighlightMenuAndItem).get(b)})),Wr(AT(),((t,o)=>{const n=fS.getCoupled(t,"sandbox");_T(e.model,t,o.event.item),Fr(t,br()),e.onItemExecute(t,n,o.event.item,vu.getValue(t)),Zd.close(n),ET(t)}))].concat(e.dismissOnBlur?[Wr(cr(),(e=>{const t=fS.getCoupled(e,"sandbox");Ll(t.element).isNone()&&Zd.close(t)}))]:[]))],d={[Cr()]:[vu.name(),OT.name(),l],...e.eventOrder};return{uid:e.uid,dom:Lv(bn(e,{inputAttributes:{role:"combobox","aria-autocomplete":"list","aria-haspopup":"true"}})),behaviours:{...r,...wu(e.typeaheadBehaviours,c)},eventOrder:d}}}),IT=e=>({...e,toCached:()=>IT(e.toCached()),bindFuture:t=>IT(e.bind((e=>e.fold((e=>SS(rn.error(e))),(e=>t(e)))))),bindResult:t=>IT(e.map((e=>e.bind(t)))),mapResult:t=>IT(e.map((e=>e.map(t)))),mapError:t=>IT(e.map((e=>e.mapError(t)))),foldResult:(t,o)=>e.map((e=>e.fold(t,o))),withTimeout:(t,o)=>IT(wS((n=>{let s=!1;const r=setTimeout((()=>{s=!0,n(rn.error(o()))}),t);e.get((e=>{s||(clearTimeout(r),n(e))}))})))}),FT=e=>IT(wS(e)),RT=(e,t,o=[],n,s,r)=>{const a=t.fold((()=>({})),(e=>({action:e}))),i={buttonBehaviours:Tl([_x((()=>!e.enabled||r.isDisabled())),Ox(),pk.config({}),th("button press",[Ur("click"),Ur("mousedown")])].concat(o)),eventOrder:{click:["button press","alloy.base.behaviour"],mousedown:["button press","alloy.base.behaviour"]},...a},l=bn(i,{dom:n});return bn(l,{components:s})},NT=(e,t,o,n=[])=>{const s={tag:"button",classes:["tox-tbtn"],attributes:e.tooltip.map((e=>({"aria-label":o.translate(e),title:o.translate(e)}))).getOr({})},r=e.icon.map((e=>C_(e,o.icons))),a=Fx([r]);return RT(e,t,n,s,a,o)},VT=e=>{switch(e){case"primary":return["tox-button"];case"toolbar":return["tox-tbtn"];default:return["tox-button","tox-button--secondary"]}},zT=(e,t,o,n=[],s=[])=>{const r=o.translate(e.text),a=e.icon.map((e=>C_(e,o.icons))),i=[a.getOrThunk((()=>ri(r)))],l=e.buttonType.getOr(e.primary||e.borderless?"primary":"secondary"),c=[...VT(l),...a.isSome()?["tox-button--icon"]:[],...e.borderless?["tox-button--naked"]:[],...s];return RT(e,t,n,{tag:"button",classes:c,attributes:{title:r}},i,o)},LT=(e,t,o,n=[],s=[])=>{const r=zT(e,A.some(t),o,n,s);return qh.sketch(r)},HT=(e,t)=>o=>{"custom"===t?Rr(o,kk,{name:e,value:{}}):"submit"===t?Fr(o,Ck):"cancel"===t?Fr(o,Sk):console.error("Unknown button type: ",t)},PT=(e,t,o)=>{if(((e,t)=>"menu"===t)(0,t)){const t=()=>r,n=e,s={...e,type:"menubutton",search:A.none(),onSetup:t=>(t.setEnabled(e.enabled),b),fetch:uT(n.items,t,o)},r=Xh(dT(s,"tox-tbtn",o,A.none()));return r.asSpec()}if(((e,t)=>"custom"===t||"cancel"===t||"submit"===t)(0,t)){const n=HT(e.name,t),s={...e,borderless:!1};return LT(s,n,o.shared.providers,[])}if(((e,t)=>"togglebutton"===t)(0,t))return((e,t)=>{var o,n;const s=e.icon.map((e=>O_(e,t.icons))).map(Xh),r=e.buttonType.getOr(e.primary?"primary":"secondary"),a={...e,name:null!==(o=e.name)&&void 0!==o?o:"",primary:"primary"===r,tooltip:A.from(e.tooltip),enabled:null!==(n=e.enabled)&&void 0!==n&&n,borderless:!1},i=a.tooltip.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),l=VT(null!=r?r:"secondary"),c=e.icon.isSome()&&e.text.isSome(),d={tag:"button",classes:[...l.concat(e.icon.isSome()?["tox-button--icon"]:[]),...e.active?["tox-button--enabled"]:[],...c?["tox-button--icon-and-text"]:[]],attributes:i},u=t.translate(e.text.getOr("")),m=ri(u),g=[...Fx([s.map((e=>e.asSpec()))]),...e.text.isSome()?[m]:[]],p=RT(a,A.some((o=>{Rr(o,kk,{name:e.name,value:{setIcon:e=>{s.map((n=>n.getOpt(o).each((o=>{eh.set(o,[O_(e,t.icons)])}))))}}})})),[],d,g,t);return qh.sketch(p)})(e,o.shared.providers);throw console.error("Unknown footer button type: ",t),new Error("Unknown footer button type")},UT={type:"separator"},WT=e=>({type:"menuitem",value:e.url,text:e.title,meta:{attach:e.attach},onAction:b}),jT=(e,t)=>({type:"menuitem",value:t,text:e,meta:{attach:void 0},onAction:b}),GT=(e,t)=>(e=>L(e,WT))(((e,t)=>U(t,(t=>t.type===e)))(e,t)),$T=e=>GT("header",e.targets),qT=e=>GT("anchor",e.targets),YT=e=>A.from(e.anchorTop).map((e=>jT("<top>",e))).toArray(),XT=e=>A.from(e.anchorBottom).map((e=>jT("<bottom>",e))).toArray(),KT=(e,t)=>{const o=e.toLowerCase();return U(t,(e=>{var t;const n=void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.text,s=null!==(t=e.value)&&void 0!==t?t:"";return Te(n.toLowerCase(),o)||Te(s.toLowerCase(),o)}))},JT=ca("aria-invalid"),ZT=(e,t)=>{e.dom.checked=t},QT=e=>e.dom.checked,eE=e=>(t,o,n,s)=>be(o,"name").fold((()=>e(o,s,A.none())),(r=>t.field(r,e(o,s,be(n,r))))),tE={bar:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-bar","tox-form__controls-h-stack"]},components:L(e.items,t.interpreter)}))(e,t.shared))),collection:eE(((e,t,o)=>Ak(e,t.shared.providers,o))),alertbanner:eE(((e,t)=>((e,t)=>{const o=Qf(e.icon,t.icons);return ik.sketch({dom:{tag:"div",attributes:{role:"alert"},classes:["tox-notification","tox-notification--in",`tox-notification--${e.level}`]},components:[{dom:{tag:"div",classes:["tox-notification__icon"],innerHtml:e.url?void 0:o},components:e.url?[qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--naked","tox-button--icon"],innerHtml:o,attributes:{title:t.translate(e.iconTooltip)}},action:t=>Rr(t,kk,{name:"alert-banner",value:e.url}),buttonBehaviours:Tl([eb()])})]:void 0},{dom:{tag:"div",classes:["tox-notification__body"],innerHtml:t.translate(e.text)}}]})})(e,t.shared.providers))),input:eE(((e,t,o)=>((e,t,o)=>$_({name:e.name,multiline:!1,label:e.label,inputMode:e.inputMode,placeholder:e.placeholder,flex:!1,disabled:!e.enabled,classname:"tox-textfield",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),textarea:eE(((e,t,o)=>((e,t,o)=>$_({name:e.name,multiline:!0,label:e.label,inputMode:A.none(),placeholder:e.placeholder,flex:!0,disabled:!e.enabled,classname:"tox-textarea",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),label:eE(((e,t)=>((e,t)=>{const o="tox-label";return{dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"label",classes:[o,..."center"===e.align?[`${o}--center`]:[],..."end"===e.align?[`${o}--end`]:[]]},components:[ri(t.providers.translate(e.label))]},...L(e.items,t.interpreter)],behaviours:Tl([HO(),eh.config({}),(n=A.none(),GO(n,ta,oa)),Gp.config({mode:"acyclic"})])};var n})(e,t.shared))),iframe:(TA=(e,t,o)=>((e,t,o)=>{const n="tox-dialog__iframe",s=e.transparent?[]:[`${n}--opaque`],r=e.border?["tox-navobj-bordered"]:[],a={...e.label.map((e=>({title:e}))).getOr({}),...o.map((e=>({srcdoc:e}))).getOr({}),...e.sandboxed?{sandbox:"allow-scripts allow-same-origin"}:{}},i=((e,t)=>{const o=As(e.getOr(""));return{getValue:e=>o.get(),setValue:(e,n)=>{if(o.get()!==n){const o=e.element,s=()=>Ct(o,"srcdoc",n);t?v_.fold(x(b_),(e=>e.throttle))(o,n,s):s()}o.set(n)}}})(o,e.streamContent),l=e.label.map((e=>yk(e,t))),c=uk.parts.field({factory:{sketch:e=>e_(A.from(r),{uid:e.uid,dom:{tag:"iframe",attributes:a,classes:[n,...s]},behaviours:Tl([pk.config({}),ah.config({}),jO(o,i.getValue,i.setValue),Il.config({channels:{[c_]:{onReceive:(e,t)=>{t.newFocus.each((t=>{at(e.element).each((o=>{(Qe(e.element,t)?Wa:Ga)(o,"tox-navobj-bordered-focus")}))}))}}}})])})}});return fk(l,c,["tox-form__group--stretched"],[])})(e,t.shared.providers,o),(e,t,o,n)=>{const s=bn(t,{source:"dynamic"});return eE(TA)(e,s,o,n)}),button:eE(((e,t)=>((e,t)=>{const o=HT(e.name,"custom");return n=A.none(),s=uk.parts.field({factory:qh,...zT(e,A.some(o),t,[$O(""),HO()])}),fk(n,s,[],[]);var n,s})(e,t.shared.providers))),checkbox:eE(((e,t,o)=>((e,t,o)=>{const n=e=>(e.element.dom.click(),A.some(!0)),s=uk.parts.field({factory:{sketch:w},dom:{tag:"input",classes:["tox-checkbox__input"],attributes:{type:"checkbox"}},behaviours:Tl([HO(),Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{at(e.element).each((e=>Wa(e,"tox-checkbox--disabled")))},onEnabled:e=>{at(e.element).each((e=>Ga(e,"tox-checkbox--disabled")))}}),pk.config({}),ah.config({}),GO(o,QT,ZT),Gp.config({mode:"special",onEnter:n,onSpace:n,stopSpaceKeyup:!0}),th("checkbox-events",[Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])])}),r=uk.parts.label({dom:{tag:"span",classes:["tox-checkbox__label"]},components:[ri(t.translate(e.label))],behaviours:Tl([Hk.config({})])}),a=e=>ob("checked"===e?"selected":"unselected",{tag:"span",classes:["tox-icon","tox-checkbox-icon__"+e]},t.icons),i=Xh({dom:{tag:"div",classes:["tox-checkbox__icons"]},components:[a("checked"),a("unchecked")]});return uk.sketch({dom:{tag:"label",classes:["tox-checkbox"]},components:[s,i.asSpec(),r],fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox()])})})(e,t.shared.providers,o))),colorinput:eE(((e,t,o)=>((e,t,o,n)=>{const s=uk.parts.field({factory:Hv,inputClasses:["tox-textfield"],data:n,onSetValue:e=>Lk.run(e).get(b),inputBehaviours:Tl([Lm.config({disabled:t.providers.isDisabled}),Ox(),pk.config({}),Lk.config({invalidClass:"tox-textbox-field-invalid",getRoot:e=>at(e.element),notify:{onValid:e=>{const t=vu.getValue(e);Rr(e,Pk,{color:t})}},validator:{validateOnLoad:!1,validate:e=>{const t=vu.getValue(e);if(0===t.length)return SS(rn.value(!0));{const e=Ne("span");Bt(e,"background-color",t);const o=Vt(e,"background-color").fold((()=>rn.error("blah")),(e=>rn.value(t)));return SS(o)}}}})]),selectOnFocus:!1}),r=e.label.map((e=>yk(e,t.providers))),a=(e,t)=>{Rr(e,Uk,{value:t})},i=Xh(((e,t)=>NS.sketch({dom:e.dom,components:e.components,toggleClass:"mce-active",dropdownBehaviours:Tl([_x(t.providers.isDisabled),Ox(),Hk.config({}),pk.config({})]),layouts:e.layouts,sandboxClasses:["tox-dialog__popups"],lazySink:t.getSink,fetch:o=>wS((t=>e.fetch(t))).map((n=>A.from(jS(bn(nS(ca("menu-value"),n,(t=>{e.onItemAction(o,t)}),e.columns,e.presets,bv.CLOSE_ON_EXECUTE,T,t.providers),{movement:rS(e.columns,e.presets)}))))),parts:{menu:Rv(0,0,e.presets)}}))({dom:{tag:"span",attributes:{"aria-label":t.providers.translate("Color swatch")}},layouts:{onRtl:()=>[cl,ll,gl],onLtr:()=>[ll,cl,gl]},components:[],fetch:Xw(o.getColors(e.storageKey),e.storageKey,o.hasCustomColors()),columns:o.getColorCols(e.storageKey),presets:"color",onItemAction:(t,n)=>{i.getOpt(t).each((t=>{"custom"===n?o.colorPicker((o=>{o.fold((()=>Fr(t,Wk)),(o=>{a(t,o),Ew(e.storageKey,o)}))}),"#ffffff"):a(t,"remove"===n?"":n)}))}},t));return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:r.toArray().concat([{dom:{tag:"div",classes:["tox-color-input"]},components:[s,i.asSpec()]}]),fieldBehaviours:Tl([th("form-field-events",[Wr(Pk,((t,o)=>{i.getOpt(t).each((e=>{Bt(e.element,"background-color",o.event.color)})),Rr(t,xk,{name:e.name})})),Wr(Uk,((e,t)=>{uk.getField(e).each((o=>{vu.setValue(o,t.event.value),Om.getCurrent(e).each(ah.focus)}))})),Wr(Wk,((e,t)=>{uk.getField(e).each((t=>{Om.getCurrent(e).each(ah.focus)}))}))])])})})(e,t.shared,t.colorinput,o))),colorpicker:eE(((e,t,o)=>((e,t,o)=>{const n=e=>"tox-"+e,s=LO((e=>t=>r(t)?e.translate(qO[t]):e.translate(t))(t),n),a=Xh(s.sketch({dom:{tag:"div",classes:[n("color-picker-container")],attributes:{role:"presentation"}},onValidHex:e=>{Rr(e,kk,{name:"hex-valid",value:!0})},onInvalidHex:e=>{Rr(e,kk,{name:"hex-valid",value:!1})}}));return{dom:{tag:"div"},components:[a.asSpec()],behaviours:Tl([jO(o,(e=>{const t=a.get(e);return Om.getCurrent(t).bind((e=>vu.getValue(e).hex)).map((e=>"#"+_e(e,"#"))).getOr("")}),((e,t)=>{const o=A.from(/^#([a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?)/.exec(t)).bind((e=>te(e,1))),n=a.get(e);Om.getCurrent(n).fold((()=>{console.log("Can not find form")}),(e=>{vu.setValue(e,{hex:o.getOr("")}),IO.getField(e,"hex").each((e=>{Fr(e,Qs())}))}))})),HO()])}})(0,t.shared.providers,o))),dropzone:eE(((e,t,o)=>((e,t,o)=>{const n=(e,t)=>{t.stop()},s=e=>(t,o)=>{H(e,(e=>{e(t,o)}))},r=(e,t)=>{var o;if(!Lm.isDisabled(e)){const n=t.event.raw;i(e,null===(o=n.dataTransfer)||void 0===o?void 0:o.files)}},a=(e,t)=>{const o=t.event.raw.target;i(e,o.files)},i=(o,n)=>{n&&(vu.setValue(o,((e,t)=>{const o=XO.explode(t.getOption("images_file_types"));return U(se(e),(e=>N(o,(t=>Ae(e.name.toLowerCase(),`.${t.toLowerCase()}`)))))})(n,t)),Rr(o,xk,{name:e.name}))},l=Xh({dom:{tag:"input",attributes:{type:"file",accept:"image/*"},styles:{display:"none"}},behaviours:Tl([th("input-file-events",[Yr(tr()),Yr(pr())])])}),c=e.label.map((e=>yk(e,t))),d=uk.parts.field({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-dropzone-container"]},behaviours:Tl([$O(o.getOr([])),HO(),Lm.config({}),ph.config({toggleClass:"dragenter",toggleOnExecute:!1}),th("dropzone-events",[Wr("dragenter",s([n,ph.toggle])),Wr("dragleave",s([n,ph.toggle])),Wr("dragover",n),Wr("drop",s([n,r])),Wr(er(),a)])]),components:[{dom:{tag:"div",classes:["tox-dropzone"],styles:{}},components:[{dom:{tag:"p"},components:[ri(t.translate("Drop an image here"))]},qh.sketch({dom:{tag:"button",styles:{position:"relative"},classes:["tox-button","tox-button--secondary"]},components:[ri(t.translate("Browse for an image")),l.asSpec()],action:e=>{l.get(e).element.dom.click()},buttonBehaviours:Tl([pk.config({}),_x(t.isDisabled),Ox()])})]}]})}});return fk(c,d,["tox-form__group--stretched"],[])})(e,t.shared.providers,o))),grid:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-form__grid",`tox-form__grid--${e.columns}col`]},components:L(e.items,t.interpreter)}))(e,t.shared))),listbox:eE(((e,t,o)=>((e,t,o)=>{const n=t.shared.providers,s=o.bind((t=>V_(e.items,t))).orThunk((()=>oe(e.items).filter(F_))),r=e.label.map((e=>yk(e,n))),a=uk.parts.field({dom:{},factory:{sketch:o=>A_({uid:o.uid,text:s.map((e=>e.text)),icon:A.none(),tooltip:e.label,role:A.none(),fetch:(o,n)=>{const s=N_(o,e.name,e.items,vu.getValue(o));n(I_(s,bv.CLOSE_ON_EXECUTE,t,{isHorizontalMenu:!1,search:A.none()}))},onSetup:x(b),getApi:x({}),columns:1,presets:"normal",classes:[],dropdownBehaviours:[pk.config({}),jO(s.map((e=>e.value)),(e=>_t(e.element,R_)),((t,o)=>{V_(e.items,o).each((e=>{Ct(t.element,R_,e.value),Rr(t,T_,{text:e.text})}))}))]},"tox-listbox",t.shared)}}),i={dom:{tag:"div",classes:["tox-listboxfield"]},components:[a]};return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([r.toArray(),[i]]),fieldBehaviours:Tl([Lm.config({disabled:x(!e.enabled),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}})])})})(e,t,o))),selectbox:eE(((e,t,o)=>((e,t,o)=>{const n=L(e.items,(e=>({text:t.translate(e.text),value:e.value}))),s=e.label.map((e=>yk(e,t))),r=uk.parts.field({dom:{},...o.map((e=>({data:e}))).getOr({}),selectAttributes:{size:e.size},options:n,factory:z_,selectBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),pk.config({}),th("selectbox-change",[Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])])}),a=e.size>1?A.none():A.some(ob("chevron-down",{tag:"div",classes:["tox-selectfield__icon-js"]},t.icons)),i={dom:{tag:"div",classes:["tox-selectfield"]},components:q([[r],a.toArray()])};return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([s.toArray(),[i]]),fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}}),Ox()])})})(e,t.shared.providers,o))),sizeinput:eE(((e,t)=>((e,t)=>{let o=G_;const n=ca("ratio-event"),s=e=>ob(e,{tag:"span",classes:["tox-icon","tox-lock-icon__"+e]},t.icons),r=U_.parts.lock({dom:{tag:"button",classes:["tox-lock","tox-button","tox-button--naked","tox-button--icon"],attributes:{title:t.translate(e.label.getOr("Constrain proportions"))}},components:[s("lock"),s("unlock")],buttonBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox(),pk.config({})])}),a=e=>({dom:{tag:"div",classes:["tox-form__group"]},components:e}),i=o=>uk.parts.field({factory:Hv,inputClasses:["tox-textfield"],inputBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox(),pk.config({}),th("size-input-events",[Wr(Xs(),((e,t)=>{Rr(e,n,{isField1:o})})),Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])]),selectOnFocus:!1}),l=e=>({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e))]}),c=U_.parts.field1(a([uk.parts.label(l("Width")),i(!0)])),d=U_.parts.field2(a([uk.parts.label(l("Height")),i(!1)]));return U_.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:[c,d,a([l("\xa0"),r])]}],field1Name:"width",field2Name:"height",locked:!0,markers:{lockClass:"tox-locked"},onLockedChange:(e,t,n)=>{W_(vu.getValue(e)).each((e=>{o(e).each((e=>{vu.setValue(t,(e=>{const t={"":0,px:0,pt:1,mm:1,pc:2,ex:2,em:2,ch:2,rem:2,cm:3,in:4,"%":4};let o=e.value.toFixed((n=e.unit)in t?t[n]:1);var n;return-1!==o.indexOf(".")&&(o=o.replace(/\.?0*$/,"")),o+e.unit})(e))}))}))},coupledFieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{U_.getField1(e).bind(uk.getField).each(Lm.disable),U_.getField2(e).bind(uk.getField).each(Lm.disable),U_.getLock(e).each(Lm.disable)},onEnabled:e=>{U_.getField1(e).bind(uk.getField).each(Lm.enable),U_.getField2(e).bind(uk.getField).each(Lm.enable),U_.getLock(e).each(Lm.enable)}}),Ox(),th("size-input-events2",[Wr(n,((e,t)=>{const n=t.event.isField1,s=n?U_.getField1(e):U_.getField2(e),r=n?U_.getField2(e):U_.getField1(e),a=s.map(vu.getValue).getOr(""),i=r.map(vu.getValue).getOr("");o=((e,t)=>{const o=W_(e).toOptional(),n=W_(t).toOptional();return Se(o,n,((e,t)=>j_(e,t.unit).map((e=>t.value/e)).map((e=>{return o=e,n=t.unit,e=>j_(e,n).map((e=>({value:e*o,unit:n})));var o,n})).getOr(G_))).getOr(G_)})(a,i)}))])])})})(e,t.shared.providers))),slider:eE(((e,t,o)=>((e,t,o)=>{const n=OO.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e.label))]}),s=OO.parts.spectrum({dom:{tag:"div",classes:["tox-slider__rail"],attributes:{role:"presentation"}}}),r=OO.parts.thumb({dom:{tag:"div",classes:["tox-slider__handle"],attributes:{role:"presentation"}}});return OO.sketch({dom:{tag:"div",classes:["tox-slider"],attributes:{role:"presentation"}},model:{mode:"x",minX:e.min,maxX:e.max,getInitialValue:x(o.getOrThunk((()=>(Math.abs(e.max)-Math.abs(e.min))/2)))},components:[n,s,r],sliderBehaviours:Tl([HO(),ah.config({})]),onChoose:(t,o,n)=>{Rr(t,xk,{name:e.name,value:n})}})})(e,t.shared.providers,o))),urlinput:eE(((e,t,o)=>((e,t,o,n)=>{const s=t.shared.providers,r=t=>{const n=vu.getValue(t);o.addToHistory(n.value,e.filetype)},a={...n.map((e=>({initialData:e}))).getOr({}),dismissOnBlur:!0,inputClasses:["tox-textfield"],sandboxClasses:["tox-dialog__popups"],inputAttributes:{"aria-errormessage":JT,type:"url"},minChars:0,responseTime:0,fetch:n=>{const s=((e,t,o)=>{var n,s;const r=vu.getValue(t),a=null!==(s=null===(n=null==r?void 0:r.meta)||void 0===n?void 0:n.text)&&void 0!==s?s:r.value;return o.getLinkInformation().fold((()=>[]),(t=>{const n=KT(a,(e=>L(e,(e=>jT(e,e))))(o.getHistory(e)));return"file"===e?(s=[n,KT(a,$T(t)),KT(a,q([YT(t),qT(t),XT(t)]))],j(s,((e,t)=>0===e.length||0===t.length?e.concat(t):e.concat(UT,t)),[])):n;var s}))})(e.filetype,n,o),r=I_(s,bv.BUBBLE_TO_SANDBOX,t,{isHorizontalMenu:!1,search:A.none()});return SS(r)},getHotspot:e=>g.getOpt(e),onSetValue:(e,t)=>{e.hasConfigured(Lk)&&Lk.run(e).get(b)},typeaheadBehaviours:Tl([...o.getValidationHandler().map((t=>Lk.config({getRoot:e=>at(e.element),invalidClass:"tox-control-wrap--status-invalid",notify:{onInvalid:(e,t)=>{c.getOpt(e).each((e=>{Ct(e.element,"title",s.translate(t))}))}},validator:{validate:o=>{const n=vu.getValue(o);return FT((o=>{t({type:e.filetype,url:n.value},(e=>{if("invalid"===e.status){const t=rn.error(e.message);o(t)}else{const t=rn.value(e.message);o(t)}}))}))},validateOnLoad:!1}}))).toArray(),Lm.config({disabled:()=>!e.enabled||s.isDisabled()}),pk.config({}),th("urlinput-events",[Wr(Qs(),(t=>{const o=Ka(t.element),n=o.trim();n!==o&&Ja(t.element,n),"file"===e.filetype&&Rr(t,xk,{name:e.name})})),Wr(er(),(t=>{Rr(t,xk,{name:e.name}),r(t)})),Wr(dr(),(t=>{Rr(t,xk,{name:e.name}),r(t)}))])]),eventOrder:{[Qs()]:["streaming","urlinput-events","invalidating"]},model:{getDisplayText:e=>e.value,selectsOver:!1,populateFromBrowse:!1},markers:{openClass:"tox-textfield--popup-open"},lazySink:t.shared.getSink,parts:{menu:Rv(0,0,"normal")},onExecute:(e,t,o)=>{Rr(t,Ck,{})},onItemExecute:(t,o,n,s)=>{r(t),Rr(t,xk,{name:e.name})}},i=uk.parts.field({...a,factory:BT}),l=e.label.map((e=>yk(e,s))),c=Xh(((e,t,o=e,n=e)=>ob(o,{tag:"div",classes:["tox-icon","tox-control-wrap__status-icon-"+e],attributes:{title:s.translate(n),"aria-live":"polite",...t.fold((()=>({})),(e=>({id:e})))}},s.icons))("invalid",A.some(JT),"warning")),d=Xh({dom:{tag:"div",classes:["tox-control-wrap__status-icon-wrap"]},components:[c.asSpec()]}),u=o.getUrlPicker(e.filetype),m=ca("browser.url.event"),g=Xh({dom:{tag:"div",classes:["tox-control-wrap"]},components:[i,d.asSpec()],behaviours:Tl([Lm.config({disabled:()=>!e.enabled||s.isDisabled()})])}),p=Xh(LT({name:e.name,icon:A.some("browse"),text:e.picker_text.or(e.label).getOr(""),enabled:e.enabled,primary:!1,buttonType:A.none(),borderless:!0},(e=>Fr(e,m)),s,[],["tox-browse-url"]));return uk.sketch({dom:vk([]),components:l.toArray().concat([{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:q([[g.asSpec()],u.map((()=>p.asSpec())).toArray()])}]),fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||s.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable),p.getOpt(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable),p.getOpt(e).each(Lm.enable)}}),Ox(),th("url-input-events",[Wr(m,(t=>{Om.getCurrent(t).each((o=>{const n=vu.getValue(o),s={fieldname:e.name,...n};u.each((n=>{n(s).get((n=>{vu.setValue(o,n),Rr(t,xk,{name:e.name})}))}))}))}))])])})})(e,t,t.urlinput,o))),customeditor:eE((e=>{const t=nc(),o=Xh({dom:{tag:e.tag}}),n=nc();return{dom:{tag:"div",classes:["tox-custom-editor"]},behaviours:Tl([th("custom-editor-events",[Jr((s=>{o.getOpt(s).each((o=>{((e=>ve(e,"init"))(e)?e.init(o.element.dom):YO.load(e.scriptId,e.scriptUrl).then((t=>t(o.element.dom,e.settings)))).then((e=>{n.on((t=>{e.setValue(t)})),n.clear(),t.set(e)}))}))}))]),jO(A.none(),(()=>t.get().fold((()=>n.get().getOr("")),(e=>e.getValue()))),((e,o)=>{t.get().fold((()=>n.set(o)),(e=>e.setValue(o)))})),HO()]),components:[o.asSpec()]}})),htmlpanel:eE((e=>"presentation"===e.presets?ik.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html}}):ik.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html,attributes:{role:"document"}},containerBehaviours:Tl([pk.config({}),ah.config({})])}))),imagepreview:eE(((e,t,o)=>((e,t)=>{const o=As(t.getOr({url:""})),n=Xh({dom:{tag:"img",classes:["tox-imagepreview__image"],attributes:t.map((e=>({src:e.url}))).getOr({})}}),s=Xh({dom:{tag:"div",classes:["tox-imagepreview__container"],attributes:{role:"presentation"}},components:[n.asSpec()]}),r={};e.height.each((e=>r.height=e));const a=t.map((e=>({url:e.url,zoom:A.from(e.zoom),cachedWidth:A.from(e.cachedWidth),cachedHeight:A.from(e.cachedHeight)})));return{dom:{tag:"div",classes:["tox-imagepreview"],styles:r,attributes:{role:"presentation"}},components:[s.asSpec()],behaviours:Tl([HO(),jO(a,(()=>o.get()),((e,t)=>{const r={url:t.url};t.zoom.each((e=>r.zoom=e)),t.cachedWidth.each((e=>r.cachedWidth=e)),t.cachedHeight.each((e=>r.cachedHeight=e)),o.set(r);const a=()=>{const{cachedWidth:t,cachedHeight:o,zoom:n}=r;if(!u(t)&&!u(o)){if(u(n)){const n=((e,t,o)=>{const n=Zt(e),s=jt(e);return Math.min(n/t,s/o,1)})(e.element,t,o);r.zoom=n}const a=((e,t,o,n,s)=>{const r=o*s,a=n*s,i=Math.max(0,e/2-r/2),l=Math.max(0,t/2-a/2);return{left:i.toString()+"px",top:l.toString()+"px",width:r.toString()+"px",height:a.toString()+"px"}})(Zt(e.element),jt(e.element),t,o,r.zoom);s.getOpt(e).each((e=>{It(e.element,a)}))}};n.getOpt(e).each((o=>{const n=o.element;var s;t.url!==_t(n,"src")&&(Ct(n,"src",t.url),Ga(e.element,"tox-imagepreview__loaded")),a(),(s=n,new Promise(((e,t)=>{const o=()=>{r(),e(s)},n=[rc(s,"load",o),rc(s,"error",(()=>{r(),t("Unable to load data from image: "+s.dom.src)}))],r=()=>H(n,(e=>e.unbind()));s.dom.complete&&o()}))).then((t=>{e.getSystem().isConnected()&&(Wa(e.element,"tox-imagepreview__loaded"),r.cachedWidth=t.dom.naturalWidth,r.cachedHeight=t.dom.naturalHeight,a())}))}))}))])}})(e,o))),table:eE(((e,t)=>((e,t)=>{const o=e=>({dom:{tag:"td",innerHtml:t.translate(e)}});return{dom:{tag:"table",classes:["tox-dialog__table"]},components:[(s=e.header,{dom:{tag:"thead"},components:[{dom:{tag:"tr"},components:L(s,(e=>({dom:{tag:"th",innerHtml:t.translate(e)}})))}]}),(n=e.cells,{dom:{tag:"tbody"},components:L(n,(e=>({dom:{tag:"tr"},components:L(e,o)})))})],behaviours:Tl([pk.config({}),ah.config({})])};var n,s})(e,t.shared.providers))),tree:eE(((e,t)=>((e,t)=>{const o=e.onLeafAction.getOr(b),n=e.onToggleExpand.getOr(b),s=e.defaultExpandedIds,r=As(s),a=As(e.defaultSelectedId),i=ca("tree-id"),l=(n,s)=>e.items.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:n,onLeafAction:o,visible:!0,treeId:i,backstage:t}):yT({directory:e,selectedId:n,onLeafAction:o,expandedIds:s,labelTabstopping:!0,treeId:i,backstage:t})));return{dom:{tag:"div",classes:["tox-tree"],attributes:{role:"tree"}},components:l(a.get(),r.get()),behaviours:Tl([Gp.config({mode:"flow",selector:".tox-tree--leaf__label--visible, .tox-tree--directory__label--visible",cycles:!1}),th(xT,[Wr("expand-tree-node",((e,t)=>{const{expanded:o,node:s}=t.event;r.set(o?[...r.get(),s]:r.get().filter((e=>e!==s))),n(r.get(),{expanded:o,node:s})}))]),Il.config({channels:{[`update-active-item-${i}`]:{onReceive:(e,t)=>{a.set(A.some(t.value)),eh.set(e,l(A.some(t.value),r.get()))}}}}),eh.config({})])}})(e,t))),panel:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:e.classes},components:L(e.items,t.shared.interpreter)}))(e,t)))},oE={field:(e,t)=>t,record:x([])},nE=(e,t,o,n)=>{const s=bn(n,{shared:{interpreter:t=>sE(e,t,o,s)}});return sE(e,t,o,s)},sE=(e,t,o,n)=>be(tE,t.type).fold((()=>(console.error(`Unknown factory type "${t.type}", defaulting to container: `,t),t)),(s=>s(e,t,o,n))),rE=(e,t,o)=>sE(oE,e,t,o),aE="layout-inset",iE=e=>e.x,lE=(e,t)=>e.x+e.width/2-t.width/2,cE=(e,t)=>e.x+e.width-t.width,dE=e=>e.y,uE=(e,t)=>e.y+e.height-t.height,mE=(e,t)=>e.y+e.height/2-t.height/2,gE=(e,t,o)=>Ui(cE(e,t),uE(e,t),o.insetSouthwest(),qi(),"southwest",el(e,{right:0,bottom:3}),aE),pE=(e,t,o)=>Ui(iE(e),uE(e,t),o.insetSoutheast(),$i(),"southeast",el(e,{left:1,bottom:3}),aE),hE=(e,t,o)=>Ui(cE(e,t),dE(e),o.insetNorthwest(),Gi(),"northwest",el(e,{right:0,top:2}),aE),fE=(e,t,o)=>Ui(iE(e),dE(e),o.insetNortheast(),ji(),"northeast",el(e,{left:1,top:2}),aE),bE=(e,t,o)=>Ui(lE(e,t),dE(e),o.insetNorth(),Yi(),"north",el(e,{top:2}),aE),vE=(e,t,o)=>Ui(lE(e,t),uE(e,t),o.insetSouth(),Xi(),"south",el(e,{bottom:3}),aE),yE=(e,t,o)=>Ui(cE(e,t),mE(e,t),o.insetEast(),Ji(),"east",el(e,{right:0}),aE),xE=(e,t,o)=>Ui(iE(e),mE(e,t),o.insetWest(),Ki(),"west",el(e,{left:1}),aE),wE=e=>{switch(e){case"north":return bE;case"northeast":return fE;case"northwest":return hE;case"south":return vE;case"southeast":return pE;case"southwest":return gE;case"east":return yE;case"west":return xE}},SE=(e,t,o,n,s)=>Zl(n).map(wE).getOr(bE)(e,t,o,n,s),kE=e=>{switch(e){case"north":return vE;case"northeast":return pE;case"northwest":return gE;case"south":return bE;case"southeast":return fE;case"southwest":return hE;case"east":return xE;case"west":return yE}},CE=(e,t,o,n,s)=>Zl(n).map(kE).getOr(bE)(e,t,o,n,s),OE={valignCentre:[],alignCentre:[],alignLeft:[],alignRight:[],right:[],left:[],bottom:[],top:[]},_E=(e,t,o)=>{const n={maxHeightFunction:gc()};return()=>o()?{type:"node",root:bt(ft(e())),node:A.from(e()),bubble:bc(12,12,OE),layouts:{onRtl:()=>[fE],onLtr:()=>[hE]},overrides:n}:{type:"hotspot",hotspot:t(),bubble:bc(-12,12,OE),layouts:{onRtl:()=>[ll,cl,gl],onLtr:()=>[cl,ll,gl]},overrides:n}},TE=(e,t,o,n)=>{const s={maxHeightFunction:gc()};return()=>n()?{type:"node",root:bt(ft(t())),node:A.from(t()),bubble:bc(12,12,OE),layouts:{onRtl:()=>[bE],onLtr:()=>[bE]},overrides:s}:e?{type:"node",root:bt(ft(t())),node:A.from(t()),bubble:bc(0,-Gt(t()),OE),layouts:{onRtl:()=>[ml],onLtr:()=>[ml]},overrides:s}:{type:"hotspot",hotspot:o(),bubble:bc(0,0,OE),layouts:{onRtl:()=>[ml],onLtr:()=>[ml]},overrides:s}},EE=(e,t,o)=>()=>o()?{type:"node",root:bt(ft(e())),node:A.from(e()),layouts:{onRtl:()=>[bE],onLtr:()=>[bE]}}:{type:"hotspot",hotspot:t(),layouts:{onRtl:()=>[gl],onLtr:()=>[gl]}},AE=(e,t)=>()=>({type:"selection",root:t(),getSelection:()=>{const t=e.selection.getRng(),o=e.model.table.getSelectedCells();if(o.length>1){const e=o[0],t=o[o.length-1],n={firstCell:ze(e),lastCell:ze(t)};return A.some(n)}return A.some(jc.range(ze(t.startContainer),t.startOffset,ze(t.endContainer),t.endOffset))}}),ME=e=>t=>({type:"node",root:e(),node:t}),DE=(e,t,o,n)=>{const s=iv(e),r=()=>ze(e.getBody()),a=()=>ze(e.getContentAreaContainer()),i=()=>s||!n();return{inlineDialog:_E(a,t,i),inlineBottomDialog:TE(e.inline,a,o,i),banner:EE(a,t,i),cursor:AE(e,r),node:ME(r)}},BE=e=>(t,o)=>{oS(e)(t,o)},IE=e=>()=>Uw(e),FE=e=>t=>zw(e,t),RE=e=>t=>Pw(e,t),NE=e=>()=>Pb(e),VE=e=>ye(e,"items"),zE=e=>ye(e,"format"),LE=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",format:"bold"},{title:"Italic",format:"italic"},{title:"Underline",format:"underline"},{title:"Strikethrough",format:"strikethrough"},{title:"Superscript",format:"superscript"},{title:"Subscript",format:"subscript"},{title:"Code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Align",items:[{title:"Left",format:"alignleft"},{title:"Center",format:"aligncenter"},{title:"Right",format:"alignright"},{title:"Justify",format:"alignjustify"}]}],HE=e=>j(e,((e,t)=>{if(ve(t,"items")){const o=HE(t.items);return{customFormats:e.customFormats.concat(o.customFormats),formats:e.formats.concat([{title:t.title,items:o.formats}])}}if(ve(t,"inline")||(e=>ve(e,"block"))(t)||(e=>ve(e,"selector"))(t)){const o=`custom-${r(t.name)?t.name:t.title.toLowerCase()}`;return{customFormats:e.customFormats.concat([{name:o,format:t}]),formats:e.formats.concat([{title:t.title,format:o,icon:t.icon}])}}return{...e,formats:e.formats.concat(t)}}),{customFormats:[],formats:[]}),PE=e=>xb(e).map((t=>{const o=((e,t)=>{const o=HE(t),n=t=>{H(t,(t=>{e.formatter.has(t.name)||e.formatter.register(t.name,t.format)}))};return e.formatter?n(o.customFormats):e.on("init",(()=>{n(o.customFormats)})),o.formats})(e,t);return wb(e)?LE.concat(o):o})).getOr(LE),UE=(e,t,o)=>({...e,type:"formatter",isSelected:t(e.format),getStylePreview:o(e.format)}),WE=(e,t,o,n)=>{const s=t=>L(t,(t=>VE(t)?(e=>{const t=s(e.items);return{...e,type:"submenu",getStyleItems:x(t)}})(t):zE(t)?(e=>UE(e,o,n))(t):(e=>{const t=ae(e);return 1===t.length&&R(t,"title")})(t)?{...t,type:"separator"}:(t=>{const s=r(t.name)?t.name:ca(t.title),a=`custom-${s}`,i={...t,type:"formatter",format:a,isSelected:o(a),getStylePreview:n(a)};return e.formatter.register(s,i),i})(t)));return s(t)},jE=XO.trim,GE=e=>t=>{if((e=>g(e)&&1===e.nodeType)(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},$E=GE("true"),qE=GE("false"),YE=(e,t,o,n,s)=>({type:e,title:t,url:o,level:n,attach:s}),XE=e=>e.innerText||e.textContent,KE=e=>(e=>e&&"A"===e.nodeName&&void 0!==(e.id||e.name))(e)&&ZE(e),JE=e=>e&&/^(H[1-6])$/.test(e.nodeName),ZE=e=>(e=>{let t=e;for(;t=t.parentNode;){const e=t.contentEditable;if(e&&"inherit"!==e)return $E(t)}return!1})(e)&&!qE(e),QE=e=>JE(e)&&ZE(e),eA=e=>{var t;const o=(e=>e.id?e.id:ca("h"))(e);return YE("header",null!==(t=XE(e))&&void 0!==t?t:"","#"+o,(e=>JE(e)?parseInt(e.nodeName.substr(1),10):0)(e),(()=>{e.id=o}))},tA=e=>{const t=e.id||e.name,o=XE(e);return YE("anchor",o||"#"+t,"#"+t,0,b)},oA=e=>jE(e.title).length>0,nA=e=>{const t=(e=>{const t=L(Zc(ze(e),"h1,h2,h3,h4,h5,h6,a:not([href])"),(e=>e.dom));return t})(e);return U((e=>L(U(e,QE),eA))(t).concat((e=>L(U(e,KE),tA))(t)),oA)},sA="tinymce-url-history",rA=e=>r(e)&&/^https?/.test(e),aA=e=>a(e)&&he(e,(e=>{return!(l(t=e)&&t.length<=5&&X(t,rA));var t})).isNone(),iA=()=>{const e=Ow.getItem(sA);if(null===e)return{};let t;try{t=JSON.parse(e)}catch(e){if(e instanceof SyntaxError)return console.log("Local storage "+sA+" was not valid JSON",e),{};throw e}return aA(t)?t:(console.log("Local storage "+sA+" was not valid format",t),{})},lA=e=>{const t=iA();return be(t,e).getOr([])},cA=(e,t)=>{if(!rA(e))return;const o=iA(),n=be(o,t).getOr([]),s=U(n,(t=>t!==e));o[t]=[e].concat(s).slice(0,5),(e=>{if(!aA(e))throw new Error("Bad format for history:\n"+JSON.stringify(e));Ow.setItem(sA,JSON.stringify(e))})(o)},dA=e=>!!e,uA=e=>ce(XO.makeMap(e,/[, ]/),dA),mA=e=>A.from(Fb(e)),gA=e=>A.from(e).filter(r).getOrUndefined(),pA=e=>({getHistory:lA,addToHistory:cA,getLinkInformation:()=>(e=>zb(e)?A.some({targets:nA(e.getBody()),anchorTop:gA(Lb(e)),anchorBottom:gA(Hb(e))}):A.none())(e),getValidationHandler:()=>(e=>A.from(Rb(e)))(e),getUrlPicker:t=>((e,t)=>((e,t)=>{const o=(e=>{const t=A.from(Vb(e)).filter(dA).map(uA);return mA(e).fold(T,(e=>t.fold(E,(e=>ae(e).length>0&&e))))})(e);return d(o)?o?mA(e):A.none():o[t]?mA(e):A.none()})(e,t).map((o=>n=>wS((s=>{const i={filetype:t,fieldname:n.fieldname,...A.from(n.meta).getOr({})};o.call(e,((e,t)=>{if(!r(e))throw new Error("Expected value to be string");if(void 0!==t&&!a(t))throw new Error("Expected meta to be a object");s({value:e,meta:t})}),n.value,i)})))))(e,t)}),hA=pm,fA=Ju,bA=x([xs("shell",!1),ns("makeItem"),xs("setupItem",b),Su("listBehaviours",[eh])]),vA=Yu({name:"items",overrides:()=>({behaviours:Tl([eh.config({})])})}),yA=x([vA]),xA=wm({name:x("CustomList")(),configFields:bA(),partFields:yA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[eh.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:wu(e.listBehaviours,s.behaviours),apis:{setItems:(t,o)=>{var n;(n=t,e.shell?A.some(n):am(n,e,"items")).fold((()=>{throw console.error("Custom List was defined to not be a shell, but no item container was specified in components"),new Error("Custom List was defined to not be a shell, but no item container was specified in components")}),(n=>{const s=eh.contents(n),r=o.length,a=r-s.length,i=a>0?V(a,(()=>e.makeItem())):[],l=s.slice(r);H(l,(e=>eh.remove(n,e))),H(i,(e=>eh.append(n,e)));const c=eh.contents(n);H(c,((n,s)=>{e.setupItem(t,n,o[s],s)}))}))}}}},apis:{setItems:(e,t,o)=>{e.setItems(t,o)}}}),wA=x([ns("dom"),xs("shell",!0),yu("toolbarBehaviours",[eh])]),SA=x([Yu({name:"groups",overrides:()=>({behaviours:Tl([eh.config({})])})})]),kA=wm({name:"Toolbar",configFields:wA(),partFields:SA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[eh.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:wu(e.toolbarBehaviours,s.behaviours),apis:{setGroups:(t,o)=>{var n;(n=t,e.shell?A.some(n):am(n,e,"groups")).fold((()=>{throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")}),(e=>{eh.set(e,o)}))},refresh:b},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)}}}),CA=b,OA=T,_A=x([]);var TA,EA=Object.freeze({__proto__:null,setup:CA,isDocked:OA,getBehaviours:_A});const AA=e=>(xe(Vt(e,"position"),"fixed")?A.none():it(e)).orThunk((()=>{const t=Ne("span");return rt(e).bind((e=>{Lo(e,t);const o=it(t);return Uo(t),o}))})),MA=e=>AA(e).map(Xt).getOrThunk((()=>qt(0,0))),DA=(e,t)=>{const o=e.element;Wa(o,t.transitionClass),Ga(o,t.fadeOutClass),Wa(o,t.fadeInClass),t.onShow(e)},BA=(e,t)=>{const o=e.element;Wa(o,t.transitionClass),Ga(o,t.fadeInClass),Wa(o,t.fadeOutClass),t.onHide(e)},IA=(e,t)=>e.y>=t.y,FA=(e,t)=>e.bottom<=t.bottom,RA=(e,t,o)=>({location:"top",leftX:t,topY:o.bounds.y-e.y}),NA=(e,t,o)=>({location:"bottom",leftX:t,bottomY:e.bottom-o.bounds.bottom}),VA=e=>e.box.x-e.win.x,zA=(e,t,o)=>o.getInitialPos().map((o=>{const n=((e,t)=>{const o=t.optScrollEnv.fold(x(e.bounds.y),(t=>t.scrollElmTop+(e.bounds.y-t.currentScrollTop)));return qt(e.bounds.x,o)})(o,t);return{box:Jo(n.left,n.top,Zt(e),jt(e)),location:o.location}})),LA=(e,t,o,n,s)=>{const r=((e,t)=>{const o=t.optScrollEnv.fold(x(e.y),(t=>e.y+t.currentScrollTop-t.scrollElmTop));return qt(e.x,o)})(t,o),a=Jo(r.left,r.top,t.width,t.height);n.setInitialPos({style:zt(e),position:Rt(e,"position")||"static",bounds:a,location:s.location})},HA=(e,t,o)=>o.getInitialPos().bind((n=>{var s;switch(o.clearInitialPos(),n.position){case"static":return A.some({morph:"static"});case"absolute":const o=AA(e).getOr(wt()),r=Zo(o),a=null!==(s=o.dom.scrollTop)&&void 0!==s?s:0;return A.some({morph:"absolute",positionCss:Pl("absolute",be(n.style,"left").map((e=>t.x-r.x)),be(n.style,"top").map((e=>t.y-r.y+a)),be(n.style,"right").map((e=>r.right-t.right)),be(n.style,"bottom").map((e=>r.bottom-t.bottom)))});default:return A.none()}})),PA=e=>{switch(e.location){case"top":return A.some({morph:"fixed",positionCss:Pl("fixed",A.some(e.leftX),A.some(e.topY),A.none(),A.none())});case"bottom":return A.some({morph:"fixed",positionCss:Pl("fixed",A.some(e.leftX),A.none(),A.none(),A.some(e.bottomY))});default:return A.none()}},UA=(e,t,o)=>{const n=e.element;return xe(Vt(n,"position"),"fixed")?((e,t,o)=>((e,t,o)=>zA(e,t,o).filter((({box:e})=>((e,t,o)=>X(e,(e=>{switch(e){case"bottom":return FA(t,o.bounds);case"top":return IA(t,o.bounds)}})))(o.getModes(),e,t))).bind((({box:t})=>HA(e,t,o))))(e,t,o).orThunk((()=>t.optScrollEnv.bind((n=>zA(e,t,o))).bind((({box:e,location:o})=>{const n=tn(),s=VA({win:n,box:e}),r="top"===o?RA(n,s,t):NA(n,s,t);return PA(r)})))))(n,t,o):((e,t,o)=>{const n=Zo(e),s=tn(),r=((e,t,o)=>{const n=t.win,s=t.box,r=VA(t);return re(e,(e=>{switch(e){case"bottom":return FA(s,o.bounds)?A.none():A.some(NA(n,r,o));case"top":return IA(s,o.bounds)?A.none():A.some(RA(n,r,o));default:return A.none()}})).getOr({location:"no-dock"})})(o.getModes(),{win:s,box:n},t);return"top"===r.location||"bottom"===r.location?(LA(e,n,t,o,r),PA(r)):A.none()})(n,t,o)},WA=(e,t,o)=>{o.setDocked(!1),H(["left","right","top","bottom","position"],(t=>Ht(e.element,t))),t.onUndocked(e)},jA=(e,t,o,n)=>{const s="fixed"===n.position;o.setDocked(s),Ul(e.element,n),(s?t.onDocked:t.onUndocked)(e)},GA=(e,t,o,n,s=!1)=>{t.contextual.each((t=>{t.lazyContext(e).each((r=>{const a=((e,t)=>e.y<t.bottom&&e.bottom>t.y)(r,n.bounds);a!==o.isVisible()&&(o.setVisible(a),s&&!a?(qa(e.element,[t.fadeOutClass]),t.onHide(e)):(a?DA:BA)(e,t))}))}))},$A=(e,t,o,n,s)=>{GA(e,t,o,n,!0),jA(e,t,o,s.positionCss)},qA=(e,t,o)=>{e.getSystem().isConnected()&&((e,t,o)=>{const n=t.lazyViewport(e);GA(e,t,o,n),UA(e,n,o).each((s=>{((e,t,o,n,s)=>{switch(s.morph){case"static":return WA(e,t,o);case"absolute":return jA(e,t,o,s.positionCss);case"fixed":$A(e,t,o,n,s)}})(e,t,o,n,s)}))})(e,t,o)},YA=(e,t,o)=>{o.isDocked()&&((e,t,o)=>{const n=e.element;o.setDocked(!1);const s=t.lazyViewport(e);((e,t,o)=>{const n=e.element;return zA(n,t,o).bind((({box:e})=>HA(n,e,o)))})(e,s,o).each((n=>{switch(n.morph){case"static":WA(e,t,o);break;case"absolute":jA(e,t,o,n.positionCss)}})),o.setVisible(!0),t.contextual.each((t=>{Ya(n,[t.fadeInClass,t.fadeOutClass,t.transitionClass]),t.onShow(e)})),qA(e,t,o)})(e,t,o)},XA=e=>(t,o,n)=>{const s=o.lazyViewport(t);((e,t,o,n)=>{const s=Zo(e),r=tn(),a=n(r,VA({win:r,box:s}),t);return"bottom"===a.location||"top"===a.location?(((e,t,o,n,s)=>{n.getInitialPos().fold((()=>LA(e,t,o,n,s)),(()=>b))})(e,s,t,o,a),PA(a)):A.none()})(t.element,s,n,e).each((e=>{$A(t,o,n,s,e)}))},KA=XA(RA),JA=XA(NA);var ZA=Object.freeze({__proto__:null,refresh:qA,reset:YA,isDocked:(e,t,o)=>o.isDocked(),getModes:(e,t,o)=>o.getModes(),setModes:(e,t,o,n)=>o.setModes(n),forceDockToTop:KA,forceDockToBottom:JA}),QA=Object.freeze({__proto__:null,events:(e,t)=>Hr([Kr(nr(),((o,n)=>{e.contextual.each((e=>{$a(o.element,e.transitionClass)&&(Ya(o.element,[e.transitionClass,e.fadeInClass]),(t.isVisible()?e.onShown:e.onHidden)(o)),n.stop()}))})),Wr(wr(),((o,n)=>{qA(o,e,t)})),Wr(Ar(),((o,n)=>{qA(o,e,t)})),Wr(Sr(),((o,n)=>{YA(o,e,t)}))])}),eM=[ys("contextual",[as("fadeInClass"),as("fadeOutClass"),as("transitionClass"),ls("lazyContext"),Ri("onShow"),Ri("onShown"),Ri("onHide"),Ri("onHidden")]),_s("lazyViewport",(()=>({bounds:tn(),optScrollEnv:A.none()}))),Ts("modes",["top","bottom"],Hn),Ri("onDocked"),Ri("onUndocked")];const tM=Al({fields:eM,name:"docking",active:QA,apis:ZA,state:Object.freeze({__proto__:null,init:e=>{const t=As(!1),o=As(!0),n=nc(),s=As(e.modes);return Ta({isDocked:t.get,setDocked:t.set,getInitialPos:n.get,setInitialPos:n.set,clearInitialPos:n.clear,isVisible:o.get,setVisible:o.set,getModes:s.get,setModes:s.set,readState:()=>`docked:  ${t.get()}, visible: ${o.get()}, modes: ${s.get().join(",")}`})}})}),oM=x(ca("toolbar-height-change")),nM={fadeInClass:"tox-editor-dock-fadein",fadeOutClass:"tox-editor-dock-fadeout",transitionClass:"tox-editor-dock-transition"},sM="tox-tinymce--toolbar-sticky-on",rM="tox-tinymce--toolbar-sticky-off",aM=(e,t)=>R(tM.getModes(e),t),iM=e=>{const t=e.element;at(t).each((o=>{const n="padding-"+tM.getModes(e)[0];if(tM.isDocked(e)){const e=Zt(o);Bt(t,"width",e+"px"),Bt(o,n,(e=>Gt(e)+(parseInt(Rt(e,"margin-top"),10)||0)+(parseInt(Rt(e,"margin-bottom"),10)||0))(t)+"px")}else Ht(t,"width"),Ht(o,n)}))},lM=(e,t)=>{t?(Ga(e,nM.fadeOutClass),qa(e,[nM.transitionClass,nM.fadeInClass])):(Ga(e,nM.fadeInClass),qa(e,[nM.fadeOutClass,nM.transitionClass]))},cM=(e,t)=>{const o=ze(e.getContainer());t?(Wa(o,sM),Ga(o,rM)):(Wa(o,rM),Ga(o,sM))},dM=(e,t)=>{const o=nc(),n=t.getSink,s=e=>{n().each((t=>e(t.element)))},r=t=>{e.inline||iM(t),cM(e,tM.isDocked(t)),t.getSystem().broadcastOn([eu()],{}),n().each((e=>e.getSystem().broadcastOn([eu()],{})))},a=e.inline?[]:[Il.config({channels:{[oM()]:{onReceive:iM}}})];return[ah.config({}),tM.config({contextual:{lazyContext:t=>{const o=Gt(t.element),n=e.inline?e.getContentAreaContainer():e.getContainer();return A.from(n).map((n=>{const s=Zo(ze(n));return XS(e,t.element).fold((()=>{const e=s.height-o,n=s.y+(aM(t,"top")?0:o);return Jo(s.x,n,s.width,e)}),(e=>{const n=en(s,KS(e)),r=aM(t,"top")?n.y:n.y+o;return Jo(n.x,r,n.width,n.height-o)}))}))},onShow:()=>{s((e=>lM(e,!0)))},onShown:e=>{s((e=>Ya(e,[nM.transitionClass,nM.fadeInClass]))),o.get().each((t=>{((e,t)=>{const o=tt(t);zl(o).filter((e=>!Qe(t,e))).filter((t=>Qe(t,ze(o.dom.body))||et(e,t))).each((()=>Rl(t)))})(e.element,t),o.clear()}))},onHide:e=>{((e,t)=>Ll(e).orThunk((()=>t().toOptional().bind((e=>Ll(e.element))))))(e.element,n).fold(o.clear,o.set),s((e=>lM(e,!1)))},onHidden:()=>{s((e=>Ya(e,[nM.transitionClass])))},...nM},lazyViewport:t=>XS(e,t.element).fold((()=>{const o=tn(),n=Db(e),s=o.y+(aM(t,"top")?n:0),r=o.height-(aM(t,"bottom")?n:0);return{bounds:Jo(o.x,s,o.width,r),optScrollEnv:A.none()}}),(e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))),modes:[t.header.getDockingMode()],onDocked:r,onUndocked:r}),...a]};var uM=Object.freeze({__proto__:null,setup:(e,t,o)=>{e.inline||(t.header.isPositionedAtTop()||e.on("ResizeEditor",(()=>{o().each(tM.reset)})),e.on("ResizeWindow ResizeEditor",(()=>{o().each(iM)})),e.on("SkinLoaded",(()=>{o().each((e=>{tM.isDocked(e)?tM.reset(e):tM.refresh(e)}))})),e.on("FullscreenStateChanged",(()=>{o().each(tM.reset)}))),e.on("AfterScrollIntoView",(e=>{o().each((t=>{tM.refresh(t);const o=t.element;zg(o)&&((e,t)=>{const o=tt(t),n=st(t).dom.innerHeight,s=Wo(o),r=ze(e.elm),a=Qo(r),i=jt(r),l=a.y,c=l+i,d=Xt(t),u=jt(t),m=d.top,g=m+u,p=Math.abs(m-s.top)<2,h=Math.abs(g-(s.top+n))<2;if(p&&l<g)jo(s.left,l-u,o);else if(h&&c>m){const e=l-n+i+u;jo(s.left,e,o)}})(e,o)}))})),e.on("PostRender",(()=>{cM(e,!1)}))},isDocked:e=>e().map(tM.isDocked).getOr(!1),getBehaviours:dM});const mM=Bn([sy,ss("items",Fn([Nn([ry,us("items",Hn)]),Hn]))].concat(Fy)),gM=[hs("text"),hs("tooltip"),hs("icon"),ws("search",!1,Fn([Pn,Bn([hs("placeholder")])],(e=>d(e)?e?A.some({placeholder:A.none()}):A.none():A.some(e)))),ls("fetch"),_s("onSetup",(()=>b))],pM=Bn([sy,...gM]),hM=e=>Yn("menubutton",pM,e),fM=Bn([sy,yy,vy,by,Sy,uy,hy,Cs("presets","normal",["normal","color","listpreview"]),Ty(1),gy,py]);var bM=xm({factory:(e,t)=>{const o={focus:Gp.focusIn,setMenus:(e,o)=>{const n=L(o,(e=>{const o={type:"menubutton",text:e.text,fetch:t=>{t(e.getItems())}},n=hM(o).mapError((e=>Jn(e))).getOrDie();return dT(n,"tox-mbtn",t.backstage,A.some("menuitem"))}));eh.set(e,n)}};return{uid:e.uid,dom:e.dom,components:[],behaviours:Tl([eh.config({}),th("menubar-events",[Jr((t=>{e.onSetup(t)})),Wr(Ys(),((e,t)=>{vi(e.element,".tox-mbtn--active").each((o=>{yi(t.event.target,".tox-mbtn").each((t=>{Qe(o,t)||e.getSystem().getByDom(o).each((o=>{e.getSystem().getByDom(t).each((e=>{NS.expand(e),NS.close(o),ah.focus(e)}))}))}))}))})),Wr(Tr(),((e,t)=>{t.event.prevFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((o=>{t.event.newFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((e=>{NS.isOpen(o)&&(NS.expand(e),NS.close(o))}))}))}))]),Gp.config({mode:"flow",selector:".tox-mbtn",onEscape:t=>(e.onEscape(t),A.some(!0))}),pk.config({})]),apis:o,domModification:{attributes:{role:"menubar"}}}},name:"silver.Menubar",configFields:[ns("dom"),ns("uid"),ns("onEscape"),ns("backstage"),xs("onSetup",b)],apis:{focus:(e,t)=>{e.focus(t)},setMenus:(e,t,o)=>{e.setMenus(t,o)}}});const vM="container",yM=[yu("slotBehaviours",[])],xM=e=>"<alloy.field."+e+">",wM=(e,t)=>{const o=t=>dm(e),n=(t,o)=>(n,s)=>am(n,e,s).map((e=>t(e,s))).getOr(o),s=(e,t)=>"true"!==_t(e.element,"aria-hidden"),r=n(s,!1),a=n(((e,t)=>{if(s(e)){const o=e.element;Bt(o,"display","none"),Ct(o,"aria-hidden","true"),Rr(e,Er(),{name:t,visible:!1})}})),i=(e=>(t,o)=>{H(o,(o=>e(t,o)))})(a),l=n(((e,t)=>{if(!s(e)){const o=e.element;Ht(o,"display"),At(o,"aria-hidden"),Rr(e,Er(),{name:t,visible:!0})}})),c={getSlotNames:o,getSlot:(t,o)=>am(t,e,o),isShowing:r,hideSlot:a,hideAllSlots:e=>i(e,o()),showSlot:l};return{uid:e.uid,dom:e.dom,components:t,behaviours:xu(e.slotBehaviours),apis:c}},SM=ce({getSlotNames:(e,t)=>e.getSlotNames(t),getSlot:(e,t,o)=>e.getSlot(t,o),isShowing:(e,t,o)=>e.isShowing(t,o),hideSlot:(e,t,o)=>e.hideSlot(t,o),hideAllSlots:(e,t)=>e.hideAllSlots(t),showSlot:(e,t,o)=>e.showSlot(t,o)},(e=>Oa(e))),kM={...SM,sketch:e=>{const t=(()=>{const e=[];return{slot:(t,o)=>(e.push(t),tm(vM,xM(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=L(n,(e=>$u({name:e,pname:xM(e)})));return fm(vM,yM,s,wM,o)}},CM=Bn([vy,yy,_s("onShow",b),_s("onHide",b),hy]),OM=e=>({element:()=>e.element.dom}),_M=(e,t)=>{const o=L(ae(t),(e=>{const o=t[e],n=Xn((e=>Yn("sidebar",CM,e))(o));return{name:e,getApi:OM,onSetup:n.onSetup,onShow:n.onShow,onHide:n.onHide}}));return L(o,(t=>{const n=As(b);return e.slot(t.name,{dom:{tag:"div",classes:["tox-sidebar__pane"]},behaviours:ux([Mx(t,n),Dx(t,n),Wr(Er(),((e,t)=>{const n=t.event,s=G(o,(e=>e.name===n.name));s.each((t=>{(n.visible?t.onShow:t.onHide)(t.getApi(e))}))}))])})}))},TM=e=>kM.sketch((t=>({dom:{tag:"div",classes:["tox-sidebar__pane-container"]},components:_M(t,e),slotBehaviours:ux([Jr((e=>kM.hideAllSlots(e)))])}))),EM=(e,t)=>{Ct(e,"role",t)},AM=e=>Om.getCurrent(e).bind((e=>lT.isGrowing(e)||lT.hasGrown(e)?Om.getCurrent(e).bind((e=>G(kM.getSlotNames(e),(t=>kM.isShowing(e,t))))):A.none())),MM=ca("FixSizeEvent"),DM=ca("AutoSizeEvent");var BM=Object.freeze({__proto__:null,block:(e,t,o,n)=>{Ct(e.element,"aria-busy",!0);const s=t.getRoot(e).getOr(e),r=Tl([Gp.config({mode:"special",onTab:()=>A.some(!0),onShiftTab:()=>A.some(!0)}),ah.config({})]),a=n(s,r),i=s.getSystem().build(a);eh.append(s,di(i)),i.hasConfigured(Gp)&&t.focus&&Gp.focusIn(i),o.isBlocked()||t.onBlock(e),o.blockWith((()=>eh.remove(s,i)))},unblock:(e,t,o)=>{At(e.element,"aria-busy"),o.isBlocked()&&t.onUnblock(e),o.clear()},isBlocked:(e,t,o)=>o.isBlocked()}),IM=[_s("getRoot",A.none),Os("focus",!0),Ri("onBlock"),Ri("onUnblock")];const FM=Al({fields:IM,name:"blocking",apis:BM,state:Object.freeze({__proto__:null,init:()=>{const e=tc((e=>e.destroy()));return Ta({readState:e.isSet,blockWith:t=>{e.set({destroy:t})},clear:e.clear,isBlocked:e.isSet})}})}),RM=e=>Om.getCurrent(e).each((e=>Rl(e.element,!0))),NM=(e,t,o)=>{const n=As(!1),s=nc(),r=o=>{var s;n.get()&&(!(e=>"focusin"===e.type)(s=o)||!(s.composed?oe(s.composedPath()):A.from(s.target)).map(ze).filter($e).exists((e=>$a(e,"mce-pastebin"))))&&(o.preventDefault(),RM(t()),e.editorManager.setActive(e))};e.inline||e.on("PreInit",(()=>{e.dom.bind(e.getWin(),"focusin",r),e.on("BeforeExecCommand",(e=>{"mcefocus"===e.command.toLowerCase()&&!0!==e.value&&r(e)}))}));const a=s=>{s!==n.get()&&(n.set(s),((e,t,o,n)=>{const s=t.element;if(((e,t)=>{const o="tabindex",n=`data-mce-${o}`;A.from(e.iframeElement).map(ze).each((e=>{t?(Tt(e,o).each((t=>Ct(e,n,t))),Ct(e,o,-1)):(At(e,o),Tt(e,n).each((t=>{Ct(e,o,t),At(e,n)})))}))})(e,o),o)FM.block(t,(e=>(t,o)=>({dom:{tag:"div",attributes:{"aria-label":e.translate("Loading..."),tabindex:"0"},classes:["tox-throbber__busy-spinner"]},components:[{dom:Yh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}))(n)),Ht(s,"display"),At(s,"aria-hidden"),e.hasFocus()&&RM(t);else{const o=Om.getCurrent(t).exists((e=>Vl(e.element)));FM.unblock(t),Bt(s,"display","none"),Ct(s,"aria-hidden","true"),o&&e.focus()}})(e,t(),s,o.providers),((e,t)=>{e.dispatch("AfterProgressState",{state:t})})(e,s))};e.on("ProgressState",(t=>{if(s.on(clearTimeout),h(t.time)){const o=$h.setEditorTimeout(e,(()=>a(t.state)),t.time);s.set(o)}else a(t.state),s.clear()}))},VM=(e,t,o)=>({within:e,extra:t,withinWidth:o}),zM=(e,t,o)=>{const n=j(e,((e,t)=>((e,t)=>{const n=o(e);return A.some({element:e,start:t,finish:t+n,width:n})})(t,e.len).fold(x(e),(t=>({len:t.finish,list:e.list.concat([t])})))),{len:0,list:[]}).list,s=U(n,(e=>e.finish<=t)),r=W(s,((e,t)=>e+t.width),0);return{within:s,extra:n.slice(s.length),withinWidth:r}},LM=e=>L(e,(e=>e.element)),HM=(e,t)=>{const o=L(t,(e=>di(e)));kA.setGroups(e,o)},PM=(e,t,o)=>{const n=t.builtGroups.get();if(0===n.length)return;const s=im(e,t,"primary"),r=fS.getCoupled(e,"overflowGroup");Bt(s.element,"visibility","hidden");const a=n.concat([r]),i=re(a,(e=>Ll(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()))));o([]),HM(s,a);const l=((e,t,o,n)=>{const s=((e,t,o)=>{const n=zM(t,e,o);return 0===n.extra.length?A.some(n):A.none()})(e,t,o).getOrThunk((()=>zM(t,e-o(n),o))),r=s.within,a=s.extra,i=s.withinWidth;return 1===a.length&&a[0].width<=o(n)?((e,t,o)=>{const n=LM(e.concat(t));return VM(n,[],o)})(r,a,i):a.length>=1?((e,t,o,n)=>{const s=LM(e).concat([o]);return VM(s,LM(t),n)})(r,a,n,i):((e,t,o)=>VM(LM(e),[],o))(r,0,i)})(Zt(s.element),t.builtGroups.get(),(e=>Zt(e.element)),r);0===l.extra.length?(eh.remove(s,r),o([])):(HM(s,l.within),o(l.extra)),Ht(s.element,"visibility"),Pt(s.element),i.each(ah.focus)},UM=x([yu("splitToolbarBehaviours",[fS]),ts("builtGroups",(()=>As([])))]),WM=x([Ii(["overflowToggledClass"]),bs("getOverflowBounds"),ns("lazySink"),ts("overflowGroups",(()=>As([]))),Ri("onOpened"),Ri("onClosed")].concat(UM())),jM=x([$u({factory:kA,schema:wA(),name:"primary"}),qu({schema:wA(),name:"overflow"}),qu({name:"overflow-button"}),qu({name:"overflow-group"})]),GM=x(((e,t)=>{((e,t)=>{const o=Jt.max(e,t,["margin-left","border-left-width","padding-left","padding-right","border-right-width","margin-right"]);Bt(e,"max-width",o+"px")})(e,Math.floor(t))})),$M=x([Ii(["toggledClass"]),ns("lazySink"),ls("fetch"),bs("getBounds"),ys("fireDismissalEventInstead",[xs("event",Or())]),Oc(),Ri("onToggled")]),qM=x([qu({name:"button",overrides:e=>({dom:{attributes:{"aria-haspopup":"true"}},buttonBehaviours:Tl([ph.config({toggleClass:e.markers.toggledClass,aria:{mode:"expanded"},toggleOnExecute:!1,onToggled:e.onToggled})])})}),qu({factory:kA,schema:wA(),name:"toolbar",overrides:e=>({toolbarBehaviours:Tl([Gp.config({mode:"cyclic",onEscape:t=>(am(t,e,"button").each(ah.focus),A.none())})])})})]),YM=nc(),XM=(e,t)=>{const o=fS.getCoupled(e,"toolbarSandbox");Zd.isOpen(o)?Zd.close(o):Zd.open(o,t.toolbar())},KM=(e,t,o,n)=>{const s=o.getBounds.map((e=>e())),r=o.lazySink(e).getOrDie();_d.positionWithinBounds(r,t,{anchor:{type:"hotspot",hotspot:e,layouts:n,overrides:{maxWidthFunction:GM()}}},s)},JM=(e,t,o,n,s)=>{kA.setGroups(t,s),KM(e,t,o,n),ph.on(e)},ZM=wm({name:"FloatingToolbarButton",factory:(e,t,o,n)=>({...qh.sketch({...n.button(),action:e=>{XM(e,n)},buttonBehaviours:ku({dump:n.button().buttonBehaviours},[fS.config({others:{toolbarSandbox:t=>((e,t,o)=>{const n=wi();return{dom:{tag:"div",attributes:{id:n.id}},behaviours:Tl([Gp.config({mode:"special",onEscape:e=>(Zd.close(e),A.some(!0))}),Zd.config({onOpen:(s,r)=>{const a=YM.get().getOr(!1);o.fetch().get((s=>{JM(e,r,o,t.layouts,s),n.link(e.element),a||Gp.focusIn(r)}))},onClose:()=>{ph.off(e),YM.get().getOr(!1)||ah.focus(e),n.unlink(e.element)},isPartOf:(t,o,n)=>Si(o,n)||Si(e,n),getAttachPoint:()=>o.lazySink(e).getOrDie()}),Il.config({channels:{...nu({isExtraPart:T,...o.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...ru({doReposition:()=>{Zd.getState(fS.getCoupled(e,"toolbarSandbox")).each((n=>{KM(e,n,o,t.layouts)}))}})}})])}})(t,o,e)}})])}),apis:{setGroups:(t,n)=>{Zd.getState(fS.getCoupled(t,"toolbarSandbox")).each((s=>{JM(t,s,e,o.layouts,n)}))},reposition:t=>{Zd.getState(fS.getCoupled(t,"toolbarSandbox")).each((n=>{KM(t,n,e,o.layouts)}))},toggle:e=>{XM(e,n)},toggleWithoutFocusing:e=>{((e,t)=>{YM.set(!0),XM(e,t),YM.clear()})(e,n)},getToolbar:e=>Zd.getState(fS.getCoupled(e,"toolbarSandbox")),isOpen:e=>Zd.isOpen(fS.getCoupled(e,"toolbarSandbox"))}}),configFields:$M(),partFields:qM(),apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggleWithoutFocusing(t)},getToolbar:(e,t)=>e.getToolbar(t),isOpen:(e,t)=>e.isOpen(t)}}),QM=x([ns("items"),Ii(["itemSelector"]),yu("tgroupBehaviours",[Gp])]),eD=x([Xu({name:"items",unit:"item"})]),tD=wm({name:"ToolbarGroup",configFields:QM(),partFields:eD(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.tgroupBehaviours,[Gp.config({mode:"flow",selector:e.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}})}),oD=e=>L(e,(e=>di(e))),nD=(e,t,o)=>{PM(e,o,(n=>{o.overflowGroups.set(n),t.getOpt(e).each((e=>{ZM.setGroups(e,oD(n))}))}))},sD=wm({name:"SplitFloatingToolbar",configFields:WM(),partFields:jM(),factory:(e,t,o,n)=>{const s=Xh(ZM.sketch({fetch:()=>wS((t=>{t(oD(e.overflowGroups.get()))})),layouts:{onLtr:()=>[cl,ll],onRtl:()=>[ll,cl],onBottomLtr:()=>[ul,dl],onBottomRtl:()=>[dl,ul]},getBounds:o.getOverflowBounds,lazySink:e.lazySink,fireDismissalEventInstead:{},markers:{toggledClass:e.markers.overflowToggledClass},parts:{button:n["overflow-button"](),toolbar:n.overflow()},onToggled:(t,o)=>e[o?"onOpened":"onClosed"](t)}));return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.splitToolbarBehaviours,[fS.config({others:{overflowGroup:()=>tD.sketch({...n["overflow-group"](),items:[s.asSpec()]})}})]),apis:{setGroups:(t,o)=>{e.builtGroups.set(L(o,t.getSystem().build)),nD(t,s,e)},refresh:t=>nD(t,s,e),toggle:e=>{s.getOpt(e).each((e=>{ZM.toggle(e)}))},toggleWithoutFocusing:e=>{s.getOpt(e).each(ZM.toggleWithoutFocusing)},isOpen:e=>s.getOpt(e).map(ZM.isOpen).getOr(!1),reposition:e=>{s.getOpt(e).each((e=>{ZM.reposition(e)}))},getOverflow:e=>s.getOpt(e).bind(ZM.getToolbar)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t),getOverflow:(e,t)=>e.getOverflow(t)}}),rD=x([Ii(["closedClass","openClass","shrinkingClass","growingClass","overflowToggledClass"]),Ri("onOpened"),Ri("onClosed")].concat(UM())),aD=x([$u({factory:kA,schema:wA(),name:"primary"}),$u({factory:kA,schema:wA(),name:"overflow",overrides:e=>({toolbarBehaviours:Tl([lT.config({dimension:{property:"height"},closedClass:e.markers.closedClass,openClass:e.markers.openClass,shrinkingClass:e.markers.shrinkingClass,growingClass:e.markers.growingClass,onShrunk:t=>{am(t,e,"overflow-button").each((e=>{ph.off(e),ah.focus(e)})),e.onClosed(t)},onGrown:t=>{Gp.focusIn(t),e.onOpened(t)},onStartGrow:t=>{am(t,e,"overflow-button").each(ph.on)}}),Gp.config({mode:"acyclic",onEscape:t=>(am(t,e,"overflow-button").each(ah.focus),A.some(!0))})])})}),qu({name:"overflow-button",overrides:e=>({buttonBehaviours:Tl([ph.config({toggleClass:e.markers.overflowToggledClass,aria:{mode:"pressed"},toggleOnExecute:!1})])})}),qu({name:"overflow-group"})]),iD=(e,t)=>{am(e,t,"overflow-button").bind((()=>am(e,t,"overflow"))).each((o=>{lD(e,t),lT.toggleGrow(o)}))},lD=(e,t)=>{am(e,t,"overflow").each((o=>{PM(e,t,(e=>{const t=L(e,(e=>di(e)));kA.setGroups(o,t)})),am(e,t,"overflow-button").each((e=>{lT.hasGrown(o)&&ph.on(e)})),lT.refresh(o)}))},cD=wm({name:"SplitSlidingToolbar",configFields:rD(),partFields:aD(),factory:(e,t,o,n)=>{const s="alloy.toolbar.toggle";return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.splitToolbarBehaviours,[fS.config({others:{overflowGroup:e=>tD.sketch({...n["overflow-group"](),items:[qh.sketch({...n["overflow-button"](),action:t=>{Fr(e,s)}})]})}}),th("toolbar-toggle-events",[Wr(s,(t=>{iD(t,e)}))])]),apis:{setGroups:(t,o)=>{((t,o)=>{const n=L(o,t.getSystem().build);e.builtGroups.set(n)})(t,o),lD(t,e)},refresh:t=>lD(t,e),toggle:t=>iD(t,e),isOpen:t=>((e,t)=>am(e,t,"overflow").map(lT.hasGrown).getOr(!1))(t,e)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},toggle:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t)}}),dD=e=>{const t=e.title.fold((()=>({})),(e=>({attributes:{title:e}})));return{dom:{tag:"div",classes:["tox-toolbar__group"],...t},components:[tD.parts.items({})],items:e.items,markers:{itemSelector:"*:not(.tox-split-button) > .tox-tbtn:not([disabled]), .tox-split-button:not([disabled]), .tox-toolbar-nav-js:not([disabled]), .tox-number-input:not([disabled])"},tgroupBehaviours:Tl([pk.config({}),ah.config({})])}},uD=e=>tD.sketch(dD(e)),mD=(e,t)=>{const o=Jr((t=>{const o=L(e.initGroups,uD);kA.setGroups(t,o)}));return Tl([Ex(e.providers.isDisabled),Ox(),Gp.config({mode:t,onEscape:e.onEscape,selector:".tox-toolbar__group"}),th("toolbar-events",[o])])},gD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return{uid:e.uid,dom:{tag:"div",classes:["tox-toolbar-overlord"]},parts:{"overflow-group":dD({title:A.none(),items:[]}),"overflow-button":NT({name:"more",icon:A.some("more-drawer"),enabled:!0,tooltip:A.some("Reveal or hide additional toolbar items"),primary:!1,buttonType:A.none(),borderless:!1},A.none(),e.providers)},splitToolbarBehaviours:mD(e,t)}},pD=e=>{const t=gD(e),o=sD.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}});return sD.sketch({...t,lazySink:e.getSink,getOverflowBounds:()=>{const t=e.moreDrawerData.lazyHeader().element,o=Qo(t),n=nt(t),s=Qo(n),r=Math.max(n.dom.scrollHeight,s.height);return Jo(o.x+4,s.y,o.width-8,r)},parts:{...t.parts,overflow:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:e.attributes}}},components:[o],markers:{overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>e.onToggled(t,!0),onClosed:t=>e.onToggled(t,!1)})},hD=e=>{const t=cD.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}}),o=cD.parts.overflow({dom:{tag:"div",classes:["tox-toolbar__overflow"]}}),n=gD(e);return cD.sketch({...n,components:[t,o],markers:{openClass:"tox-toolbar__overflow--open",closedClass:"tox-toolbar__overflow--closed",growingClass:"tox-toolbar__overflow--growing",shrinkingClass:"tox-toolbar__overflow--shrinking",overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>{t.getSystem().broadcastOn([oM()],{type:"opened"}),e.onToggled(t,!0)},onClosed:t=>{t.getSystem().broadcastOn([oM()],{type:"closed"}),e.onToggled(t,!1)}})},fD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return kA.sketch({uid:e.uid,dom:{tag:"div",classes:["tox-toolbar"].concat(e.type===rb.scrolling?["tox-toolbar--scrolling"]:[])},components:[kA.parts.groups({})],toolbarBehaviours:mD(e,t)})},bD=[by,vy,hs("tooltip"),Cs("buttonType","secondary",["primary","secondary"]),Os("borderless",!1),ls("onAction")],vD={button:[...bD,iy,is("type",["button"])],togglebutton:[...bD,Os("active",!1),is("type",["togglebutton"])]},yD=[is("type",["group"]),Ts("buttons",[],Zn("type",vD))],xD=Zn("type",{...vD,group:yD}),wD=Bn([Ts("buttons",[],xD),ls("onShow"),ls("onHide")]),SD=(e,t)=>((e,t)=>{var o,n;const s="togglebutton"===e.type,r=e.icon.map((e=>O_(e,t.icons))).map(Xh),a={...e,name:s?e.text.getOr(e.icon.getOr("")):null!==(o=e.text)&&void 0!==o?o:e.icon.getOr(""),primary:"primary"===e.buttonType,buttonType:A.from(e.buttonType),tooltip:e.tooltip,icon:e.icon,enabled:!0,borderless:e.borderless},i=VT(null!==(n=e.buttonType)&&void 0!==n?n:"secondary"),l=s?e.text.map(t.translate):A.some(t.translate(e.text)),c=l.map(ri),d=a.tooltip.or(l).map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),u=r.map((e=>e.asSpec())),m=Fx([u,c]),g=e.icon.isSome()&&c.isSome(),p={tag:"button",classes:i.concat(...e.icon.isSome()&&!g?["tox-button--icon"]:[]).concat(...g?["tox-button--icon-and-text"]:[]).concat(...e.borderless?["tox-button--naked"]:[]).concat(..."togglebutton"===e.type&&e.active?["tox-button--enabled"]:[]),attributes:d},h=RT(a,A.some((o=>{const n=e=>{r.map((n=>n.getOpt(o).each((o=>{eh.set(o,[O_(e,t.icons)])}))))};return s?e.onAction({setIcon:n,setActive:e=>{const t=o.element;e?(Wa(t,"tox-button--enabled"),Ct(t,"aria-pressed",!0)):(Ga(t,"tox-button--enabled"),At(t,"aria-pressed"))},isActive:()=>$a(o.element,"tox-button--enabled")}):"button"===e.type?e.onAction({setIcon:n}):void 0})),[],p,m,t);return qh.sketch(h)})(e,t),kD=Bo().deviceType,CD=kD.isPhone(),OD=kD.isTablet();var _D=wm({name:"silver.View",configFields:[ns("viewConfig")],partFields:[Yu({factory:{sketch:e=>{let t=!1;const o=L(e.buttons,(o=>"group"===o.type?(t=!0,((e,t)=>({dom:{tag:"div",classes:["tox-view__toolbar__group"]},components:L(e.buttons,(e=>SD(e,t)))}))(o,e.providers)):SD(o,e.providers)));return{uid:e.uid,dom:{tag:"div",classes:[t?"tox-view__toolbar":"tox-view__header",...CD||OD?["tox-view--mobile","tox-view--scrolling"]:[]]},behaviours:Tl([ah.config({}),Gp.config({mode:"flow",selector:"button, .tox-button",focusInside:vg.OnEnterOrSpaceMode})]),components:t?o:[ik.sketch({dom:{tag:"div",classes:["tox-view__header-start"]},components:[]}),ik.sketch({dom:{tag:"div",classes:["tox-view__header-end"]},components:o})]}}},schema:[ns("buttons"),ns("providers")],name:"header"}),Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-view__pane"]}})},schema:[],name:"pane"})],factory:(e,t,o,n)=>{const s={getPane:t=>hA.getPart(t,e,"pane"),getOnShow:t=>e.viewConfig.onShow,getOnHide:t=>e.viewConfig.onHide};return{uid:e.uid,dom:e.dom,components:t,apis:s}},apis:{getPane:(e,t)=>e.getPane(t),getOnShow:(e,t)=>e.getOnShow(t),getOnHide:(e,t)=>e.getOnHide(t)}});const TD=(e,t,o)=>pe(t,((t,n)=>{const s=Xn(Yn("view",wD,t));return e.slot(n,_D.sketch({dom:{tag:"div",classes:["tox-view"]},viewConfig:s,components:[...s.buttons.length>0?[_D.parts.header({buttons:s.buttons,providers:o})]:[],_D.parts.pane({})]}))})),ED=(e,t)=>kM.sketch((o=>({dom:{tag:"div",classes:["tox-view-wrap__slot-container"]},components:TD(o,e,t),slotBehaviours:ux([Jr((e=>kM.hideAllSlots(e)))])}))),AD=e=>G(kM.getSlotNames(e),(t=>kM.isShowing(e,t))),MD=(e,t,o)=>{kM.getSlot(e,t).each((e=>{_D.getPane(e).each((t=>{var n;o(e)((n=t.element.dom,{getContainer:x(n)}))}))}))};var DD=xm({factory:(e,t)=>{const o={setViews:(e,o)=>{eh.set(e,[ED(o,t.backstage.shared.providers)])},whichView:e=>Om.getCurrent(e).bind(AD),toggleView:(e,t,o,n)=>Om.getCurrent(e).exists((s=>{const r=AD(s),a=r.exists((e=>n===e)),i=kM.getSlot(s,n).isSome();return i&&(kM.hideAllSlots(s),a?((e=>{const t=e.element;Bt(t,"display","none"),Ct(t,"aria-hidden","true")})(e),t()):(o(),(e=>{const t=e.element;Ht(t,"display"),At(t,"aria-hidden")})(e),kM.showSlot(s,n),((e,t)=>{MD(e,t,_D.getOnShow)})(s,n)),r.each((e=>((e,t)=>MD(e,t,_D.getOnHide))(s,e)))),i}))};return{uid:e.uid,dom:{tag:"div",classes:["tox-view-wrap"],attributes:{"aria-hidden":"true"},styles:{display:"none"}},components:[],behaviours:Tl([eh.config({}),Om.config({find:e=>{const t=eh.contents(e);return oe(t)}})]),apis:o}},name:"silver.ViewWrapper",configFields:[ns("backstage")],apis:{setViews:(e,t,o)=>e.setViews(t,o),toggleView:(e,t,o,n,s)=>e.toggleView(t,o,n,s),whichView:(e,t)=>e.whichView(t)}});const BD=fA.optional({factory:bM,name:"menubar",schema:[ns("backstage")]}),ID=fA.optional({factory:{sketch:e=>xA.sketch({uid:e.uid,dom:e.dom,listBehaviours:Tl([Gp.config({mode:"acyclic",selector:".tox-toolbar"})]),makeItem:()=>fD({type:e.type,uid:ca("multiple-toolbar-item"),cyclicKeying:!1,initGroups:[],providers:e.providers,onEscape:()=>(e.onEscape(),A.some(!0))}),setupItem:(e,t,o,n)=>{kA.setGroups(t,o)},shell:!0})},name:"multiple-toolbar",schema:[ns("dom"),ns("onEscape")]}),FD=fA.optional({factory:{sketch:e=>{const t=(e=>e.type===rb.sliding?hD:e.type===rb.floating?pD:fD)(e);return t({type:e.type,uid:e.uid,onEscape:()=>(e.onEscape(),A.some(!0)),onToggled:(t,o)=>e.onToolbarToggled(o),cyclicKeying:!1,initGroups:[],getSink:e.getSink,providers:e.providers,moreDrawerData:{lazyToolbar:e.lazyToolbar,lazyMoreButton:e.lazyMoreButton,lazyHeader:e.lazyHeader},attributes:e.attributes})}},name:"toolbar",schema:[ns("dom"),ns("onEscape"),ns("getSink")]}),RD=fA.optional({factory:{sketch:e=>{const t=e.editor,o=e.sticky?dM:_A;return{uid:e.uid,dom:e.dom,components:e.components,behaviours:Tl(o(t,e.sharedBackstage))}}},name:"header",schema:[ns("dom")]}),ND=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:e.dom,components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/tinymce-self-hosted-premium-features/?utm_campaign=self_hosted_upgrade_promo&utm_source=tiny&utm_medium=referral",rel:"noopener",target:"_blank","aria-hidden":"true"},classes:["tox-promotion-link"],innerHtml:"\u26a1\ufe0fUpgrade"}}]})},name:"promotion",schema:[ns("dom")]}),VD=fA.optional({name:"socket",schema:[ns("dom")]}),zD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-sidebar"],attributes:{role:"presentation"}},components:[{dom:{tag:"div",classes:["tox-sidebar__slider"]},components:[],behaviours:Tl([pk.config({}),ah.config({}),lT.config({dimension:{property:"width"},closedClass:"tox-sidebar--sliding-closed",openClass:"tox-sidebar--sliding-open",shrinkingClass:"tox-sidebar--sliding-shrinking",growingClass:"tox-sidebar--sliding-growing",onShrunk:e=>{Om.getCurrent(e).each(kM.hideAllSlots),Fr(e,DM)},onGrown:e=>{Fr(e,DM)},onStartGrow:e=>{Rr(e,MM,{width:Vt(e.element,"width").getOr("")})},onStartShrink:e=>{Rr(e,MM,{width:Zt(e.element)+"px"})}}),eh.config({}),Om.config({find:e=>{const t=eh.contents(e);return oe(t)}})])}],behaviours:Tl([PO(0),th("sidebar-sliding-events",[Wr(MM,((e,t)=>{Bt(e.element,"width",t.event.width)})),Wr(DM,((e,t)=>{Ht(e.element,"width")}))])])})},name:"sidebar",schema:[ns("dom")]}),LD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",attributes:{"aria-hidden":"true"},classes:["tox-throbber"],styles:{display:"none"}},behaviours:Tl([eh.config({}),FM.config({focus:!1}),Om.config({find:e=>oe(e.components())})]),components:[]})},name:"throbber",schema:[ns("dom")]}),HD=fA.optional({factory:DD,name:"viewWrapper",schema:[ns("backstage")]}),PD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-editor-container"]},components:e.components})},name:"editorContainer",schema:[]});var UD=wm({name:"OuterContainer",factory:(e,t,o)=>{let n=!1;const s={getSocket:t=>hA.getPart(t,e,"socket"),setSidebar:(t,o,n)=>{hA.getPart(t,e,"sidebar").each((e=>((e,t,o)=>{Om.getCurrent(e).each((n=>{eh.set(n,[TM(t)]);const s=null==o?void 0:o.toLowerCase();r(s)&&ve(t,s)&&Om.getCurrent(n).each((t=>{kM.showSlot(t,s),lT.immediateGrow(n),Ht(n.element,"width"),EM(e.element,"region")}))}))})(e,o,n)))},toggleSidebar:(t,o)=>{hA.getPart(t,e,"sidebar").each((e=>((e,t)=>{Om.getCurrent(e).each((o=>{Om.getCurrent(o).each((n=>{lT.hasGrown(o)?kM.isShowing(n,t)?(lT.shrink(o),EM(e.element,"presentation")):(kM.hideAllSlots(n),kM.showSlot(n,t),EM(e.element,"region")):(kM.hideAllSlots(n),kM.showSlot(n,t),lT.grow(o),EM(e.element,"region"))}))}))})(e,o)))},whichSidebar:t=>hA.getPart(t,e,"sidebar").bind(AM).getOrNull(),getHeader:t=>hA.getPart(t,e,"header"),getToolbar:t=>hA.getPart(t,e,"toolbar"),setToolbar:(t,o)=>{hA.getPart(t,e,"toolbar").each((e=>{const t=L(o,uD);e.getApis().setGroups(e,t)}))},setToolbars:(t,o)=>{hA.getPart(t,e,"multiple-toolbar").each((e=>{const t=L(o,(e=>L(e,uD)));xA.setItems(e,t)}))},refreshToolbar:t=>{hA.getPart(t,e,"toolbar").each((e=>e.getApis().refresh(e)))},toggleToolbarDrawer:t=>{hA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggle,(t=>t(e)))}))},toggleToolbarDrawerWithoutFocusing:t=>{hA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggleWithoutFocusing,(t=>t(e)))}))},isToolbarDrawerToggled:t=>hA.getPart(t,e,"toolbar").bind((e=>A.from(e.getApis().isOpen).map((t=>t(e))))).getOr(!1),getThrobber:t=>hA.getPart(t,e,"throbber"),focusToolbar:t=>{hA.getPart(t,e,"toolbar").orThunk((()=>hA.getPart(t,e,"multiple-toolbar"))).each((e=>{Gp.focusIn(e)}))},setMenubar:(t,o)=>{hA.getPart(t,e,"menubar").each((e=>{bM.setMenus(e,o)}))},focusMenubar:t=>{hA.getPart(t,e,"menubar").each((e=>{bM.focus(e)}))},setViews:(t,o)=>{hA.getPart(t,e,"viewWrapper").each((e=>{DD.setViews(e,o)}))},toggleView:(t,o)=>hA.getPart(t,e,"viewWrapper").exists((e=>DD.toggleView(e,(()=>s.showMainView(t)),(()=>s.hideMainView(t)),o))),whichView:t=>hA.getPart(t,e,"viewWrapper").bind(DD.whichView).getOrNull(),hideMainView:t=>{n=s.isToolbarDrawerToggled(t),n&&s.toggleToolbarDrawer(t),hA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Bt(t,"display","none"),Ct(t,"aria-hidden","true")}))},showMainView:t=>{n&&s.toggleToolbarDrawer(t),hA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Ht(t,"display"),At(t,"aria-hidden")}))}};return{uid:e.uid,dom:e.dom,components:t,apis:s,behaviours:e.behaviours}},configFields:[ns("dom"),ns("behaviours")],partFields:[RD,BD,FD,ID,VD,zD,ND,LD,HD,PD],apis:{getSocket:(e,t)=>e.getSocket(t),setSidebar:(e,t,o,n)=>{e.setSidebar(t,o,n)},toggleSidebar:(e,t,o)=>{e.toggleSidebar(t,o)},whichSidebar:(e,t)=>e.whichSidebar(t),getHeader:(e,t)=>e.getHeader(t),getToolbar:(e,t)=>e.getToolbar(t),setToolbar:(e,t,o)=>{e.setToolbar(t,o)},setToolbars:(e,t,o)=>{e.setToolbars(t,o)},refreshToolbar:(e,t)=>e.refreshToolbar(t),toggleToolbarDrawer:(e,t)=>{e.toggleToolbarDrawer(t)},toggleToolbarDrawerWithoutFocusing:(e,t)=>{e.toggleToolbarDrawerWithoutFocusing(t)},isToolbarDrawerToggled:(e,t)=>e.isToolbarDrawerToggled(t),getThrobber:(e,t)=>e.getThrobber(t),setMenubar:(e,t,o)=>{e.setMenubar(t,o)},focusMenubar:(e,t)=>{e.focusMenubar(t)},focusToolbar:(e,t)=>{e.focusToolbar(t)},setViews:(e,t,o)=>{e.setViews(t,o)},toggleView:(e,t,o)=>e.toggleView(t,o),whichView:(e,t)=>e.whichView(t)}});const WD={file:{title:"File",items:"newdocument restoredraft | preview | export print | deleteallconversations"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall | searchreplace"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen | showcomments"},insert:{title:"Insert",items:"image link media addcomment pageembed template inserttemplate codesample inserttable accordion | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents footnotes | mergetags | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | styles blocks fontfamily fontsize align lineheight | forecolor backcolor | language | removeformat"},tools:{title:"Tools",items:"aidialog aishortcuts | spellchecker spellcheckerlanguage | autocorrect capitalization | a11ycheck code typography wordcount addtemplate"},table:{title:"Table",items:"inserttable | cell row column | advtablesort | tableprops deletetable"},help:{title:"Help",items:"help"}},jD=e=>e.split(" "),GD=(e,t)=>{const o={...WD,...t.menus},n=ae(t.menus).length>0,s=void 0===t.menubar||!0===t.menubar?jD("file edit view insert format tools table help"):jD(!1===t.menubar?"":t.menubar),a=U(s,(e=>{const o=ve(WD,e);return n?o||be(t.menus,e).exists((e=>ve(e,"items"))):o})),i=L(a,(n=>{const s=o[n];return((e,t,o)=>{const n=Cb(o).split(/[ ,]/);return{text:e.title,getItems:()=>Y(e.items,(e=>{const o=e.toLowerCase();return 0===o.trim().length||N(n,(e=>e===o))?[]:"separator"===o||"|"===o?[{type:"separator"}]:t.menuItems[o]?[t.menuItems[o]]:[]}))}})({title:s.title,items:jD(s.items)},t,e)}));return U(i,(e=>e.getItems().length>0&&N(e.getItems(),(e=>r(e)||"separator"!==e.type))))},$D=(e,t,o)=>(e.on("remove",(()=>o.unload(t))),o.load(t)),qD=(e,t,o,n)=>(e.on("remove",(()=>n.unloadRawCss(t))),n.loadRawCss(t,o)),YD=async(e,t)=>{const o="ui/"+ev(e).getOr("default")+"/skin.css",n=tinymce.Resource.get(o);return r(n)?Promise.resolve(qD(e,o,n,e.ui.styleSheetLoader)):$D(e,t+"/skin.min.css",e.ui.styleSheetLoader)},XD=async(e,t)=>{var o;if(o=ze(e.getElement()),vt(o).isSome()){const o="ui/"+ev(e).getOr("default")+"/skin.shadowdom.css",n=tinymce.Resource.get(o);return r(n)?(qD(e,o,n,ib.DOM.styleSheetLoader),Promise.resolve()):$D(e,t+"/skin.shadowdom.min.css",ib.DOM.styleSheetLoader)}},KD=(e,t)=>(async(e,t)=>{ev(t).fold((()=>{const o=Qb(t);o&&t.contentCSS.push(o+(e?"/content.inline":"/content")+".min.css")}),(o=>{const n="ui/"+o+(e?"/content.inline":"/content")+".css",s=tinymce.Resource.get(n);if(r(s))qD(t,n,s,t.ui.styleSheetLoader);else{const o=Qb(t);o&&t.contentCSS.push(o+(e?"/content.inline":"/content")+".min.css")}}));const o=Qb(t);if(!Jb(t)&&r(o))return Promise.all([YD(t,o),XD(t,o)]).then()})(e,t).then((e=>{const t=()=>{e._skinLoaded=!0,(e=>{e.dispatch("SkinLoaded")})(e)};return()=>{e.initialized?t():e.on("init",t)}})(t),((e,t)=>()=>((e,t)=>{e.dispatch("SkinLoadError",t)})(e,{message:"Skin could not be loaded"}))(t)),JD=k(KD,!1),ZD=k(KD,!0),QD=(e,t,o)=>e.translate([t,e.translate(o)]),eB=(e,t)=>{const o=(o,s,r,a)=>{const i=e.shared.providers.translate(o.title);if("separator"===o.type)return A.some({type:"separator",text:i});if("submenu"===o.type){const e=Y(o.getStyleItems(),(e=>n(e,s,a)));return 0===s&&e.length<=0?A.none():A.some({type:"nestedmenuitem",text:i,enabled:e.length>0,getSubmenuItems:()=>Y(o.getStyleItems(),(e=>n(e,s,a)))})}return A.some({type:"togglemenuitem",text:i,icon:o.icon,active:o.isSelected(a),enabled:!r,onAction:t.onAction(o),...o.getStylePreview().fold((()=>({})),(e=>({meta:{style:e}})))})},n=(e,n,s)=>{const r="formatter"===e.type&&t.isInvalid(e);return 0===n?r?[]:o(e,n,!1,s).toArray():o(e,n,r,s).toArray()},s=e=>{const o=t.getCurrentValue(),s=t.shouldHide?0:1;return Y(e,(e=>n(e,s,o)))};return{validateItems:s,getFetch:(e,t)=>(o,n)=>{const r=t(),a=s(r);n(I_(a,bv.CLOSE_ON_EXECUTE,e,{isHorizontalMenu:!1,search:A.none()}))}}},tB=(e,t,o)=>{const n=o.dataset,s="basic"===n.type?()=>L(n.data,(e=>UE(e,o.isSelectedFor,o.getPreviewFor))):n.getData;return{items:eB(t,o),getStyleItems:s}},oB=(e,t,o,n,s)=>{const{items:r,getStyleItems:a}=tB(0,t,o);return A_({text:o.icon.isSome()?A.none():o.text,icon:o.icon,tooltip:A.from(o.tooltip),role:A.none(),fetch:r.getFetch(t,a),onSetup:t=>{const r=o=>t.setTooltip(QD(e,n,o.value));return e.on(s,r),yw(Sw(e,"NodeChange",(t=>{const n=t.getComponent();o.updateText(n),Lm.set(t.getComponent(),!e.selection.isEditable())}))(t),(()=>e.off(s,r)))},getApi:e=>({getComponent:x(e),setTooltip:o=>{const n=t.shared.providers.translate(o);Ot(e.element,{"aria-label":n,title:n})}}),columns:1,presets:"normal",classes:o.icon.isSome()?[]:["bespoke"],dropdownBehaviours:[]},"tox-tbtn",t.shared)};var nB;!function(e){e[e.SemiColon=0]="SemiColon",e[e.Space=1]="Space"}(nB||(nB={}));const sB=(e,t,o)=>{const n=(s=((e,t)=>t===nB.SemiColon?e.replace(/;$/,"").split(";"):e.split(" "))(e.options.get(t),o),L(s,(e=>{let t=e,o=e;const n=e.split("=");return n.length>1&&(t=n[0],o=n[1]),{title:t,format:o}})));var s;return{type:"basic",data:n}},rB="Alignment {0}",aB="left",iB=[{title:"Left",icon:"align-left",format:"alignleft",command:"JustifyLeft"},{title:"Center",icon:"align-center",format:"aligncenter",command:"JustifyCenter"},{title:"Right",icon:"align-right",format:"alignright",command:"JustifyRight"},{title:"Justify",icon:"align-justify",format:"alignjustify",command:"JustifyFull"}],lB=e=>{const t={type:"basic",data:iB};return{tooltip:QD(e,rB,aB),text:A.none(),icon:A.some("align-left"),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:e=>A.none,onAction:t=>()=>G(iB,(e=>e.format===t.format)).each((t=>e.execCommand(t.command))),updateText:t=>{const o=G(iB,(t=>e.formatter.match(t.format))).fold(x(aB),(e=>e.title.toLowerCase()));Rr(t,E_,{icon:`align-${o}`}),((e,t)=>{e.dispatch("AlignTextUpdate",t)})(e,{value:o})},dataset:t,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},cB=(e,t)=>{const o=t(),n=L(o,(e=>e.format));return A.from(e.formatter.closest(n)).bind((e=>G(o,(t=>t.format===e)))).orThunk((()=>Ce(e.formatter.match("p"),{title:"Paragraph",format:"p"})))},dB="Block {0}",uB="Paragraph",mB=e=>{const t=sB(e,"block_formats",nB.SemiColon);return{tooltip:QD(e,dB,uB),text:A.some(uB),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:kw(e),updateText:o=>{const n=cB(e,(()=>t.data)).fold(x(uB),(e=>e.title));Rr(o,T_,{text:n}),((e,t)=>{e.dispatch("BlocksTextUpdate",t)})(e,{value:n})},dataset:t,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},gB="Font {0}",pB="System Font",hB=["-apple-system","Segoe UI","Roboto","Helvetica Neue","sans-serif"],fB=e=>{const t=e.split(/\s*,\s*/);return L(t,(e=>e.replace(/^['"]+|['"]+$/g,"")))},bB=(e,t)=>t.length>0&&X(t,(t=>e.indexOf(t.toLowerCase())>-1)),vB=e=>{const t=()=>{const t=e=>e?fB(e)[0]:"",n=e.queryCommandValue("FontName"),s=o.data,r=n?n.toLowerCase():"",a=Kb(e),i=G(s,(e=>{const o=e.format;return o.toLowerCase()===r||t(o).toLowerCase()===t(r).toLowerCase()})).orThunk((()=>Ce(((e,t)=>{if(0===e.indexOf("-apple-system")||t.length>0){const o=fB(e.toLowerCase());return bB(o,hB)||bB(o,t)}return!1})(r,a),{title:pB,format:r})));return{matchOpt:i,font:n}},o=sB(e,"font_family_formats",nB.SemiColon);return{tooltip:QD(e,gB,pB),text:A.some(pB),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getCurrentValue:()=>{const{matchOpt:e}=t();return e},getPreviewFor:e=>()=>A.some({tag:"div",styles:-1===e.indexOf("dings")?{"font-family":e}:{}}),onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontName",!1,t.format)}))},updateText:o=>{const{matchOpt:n,font:s}=t(),r=n.fold(x(s),(e=>e.title));Rr(o,T_,{text:r}),((e,t)=>{e.dispatch("FontFamilyTextUpdate",t)})(e,{value:r})},dataset:o,shouldHide:!1,isInvalid:T}},yB={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},xB=(()=>{const e="[0-9]+",t="[eE][+-]?"+e,o=e=>`(?:${e})?`,n=["Infinity",e+"\\."+o(e)+o(t),"\\."+e+o(t),e+o(t)].join("|");return new RegExp(`^([+-]?(?:${n}))(.*)$`)})(),wB=(e,t)=>A.from(xB.exec(e)).bind((e=>{const o=Number(e[1]),n=e[2];return((e,t)=>N(t,(t=>N(yB[t],(t=>e===t)))))(n,t)?A.some({value:o,unit:n}):A.none()})),SB={tab:x(9),escape:x(27),enter:x(13),backspace:x(8),delete:x(46),left:x(37),up:x(38),right:x(39),down:x(40),space:x(32),home:x(36),end:x(35),pageUp:x(33),pageDown:x(34)},kB="Font size {0}",CB="12pt",OB={"8pt":"1","10pt":"2","12pt":"3","14pt":"4","18pt":"5","24pt":"6","36pt":"7"},_B={"xx-small":"7pt","x-small":"8pt",small:"10pt",medium:"12pt",large:"14pt","x-large":"18pt","xx-large":"24pt"},TB=(e,t)=>/[0-9.]+px$/.test(e)?((e,t)=>{const o=Math.pow(10,t);return Math.round(e*o)/o})(72*parseInt(e,10)/96,t||0)+"pt":be(_B,e).getOr(e),EB=e=>be(OB,e).getOr(""),AB=e=>{const t=()=>{let t=A.none();const o=n.data,s=e.queryCommandValue("FontSize");if(s)for(let e=3;t.isNone()&&e>=0;e--){const n=TB(s,e),r=EB(n);t=G(o,(e=>e.format===s||e.format===n||e.format===r))}return{matchOpt:t,size:s}},o=x(A.none),n=sB(e,"font_size_formats",nB.Space);return{tooltip:QD(e,kB,CB),text:A.some(CB),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getPreviewFor:o,getCurrentValue:()=>{const{matchOpt:e}=t();return e},onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontSize",!1,t.format)}))},updateText:o=>{const{matchOpt:n,size:s}=t(),r=n.fold(x(s),(e=>e.title));Rr(o,T_,{text:r}),((e,t)=>{e.dispatch("FontSizeTextUpdate",t)})(e,{value:r})},dataset:n,shouldHide:!1,isInvalid:T}},MB="Format {0}",DB=(e,t)=>{const o="Paragraph";return{tooltip:QD(e,MB,o),text:A.some(o),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:kw(e),updateText:t=>{const n=e=>VE(e)?Y(e.items,n):zE(e)?[{title:e.title,format:e.format}]:[],s=Y(PE(e),n),r=cB(e,x(s)).fold(x(o),(e=>e.title));Rr(t,T_,{text:r}),((e,t)=>{e.dispatch("StylesTextUpdate",t)})(e,{value:r})},shouldHide:Sb(e),isInvalid:t=>!e.formatter.canApply(t.format),dataset:t}},BB=x([ns("toggleClass"),ns("fetch"),Vi("onExecute"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),Oc(),Vi("onItemExecute"),ms("lazySink"),ns("dom"),Ri("onOpen"),yu("splitDropdownBehaviours",[fS,Gp,ah]),xs("matchWidth",!1),xs("useMinWidth",!1),xs("eventOrder",{}),ms("role")].concat(IS())),IB=$u({factory:qh,schema:[ns("dom")],name:"arrow",defaults:()=>({buttonBehaviours:Tl([ah.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each(Nr)},buttonBehaviours:Tl([ph.config({toggleOnExecute:!1,toggleClass:e.toggleClass})])})}),FB=$u({factory:qh,schema:[ns("dom")],name:"button",defaults:()=>({buttonBehaviours:Tl([ah.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each((o=>{e.onExecute(o,t)}))}})}),RB=x([IB,FB,Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[ns("text")],name:"aria-descriptor"}),qu({schema:[Bi()],name:"menu",defaults:e=>({onExecute:(t,o)=>{t.getSystem().getByUid(e.uid).each((n=>{e.onItemExecute(n,t,o)}))}})}),CS()]),NB=wm({name:"SplitDropdown",configFields:BB(),partFields:RB(),factory:(e,t,o,n)=>{const s=e=>{Om.getCurrent(e).each((e=>{Xm.highlightFirst(e),Gp.focusIn(e)}))},r=t=>{ES(e,w,t,n,s,Uh.HighlightMenuAndItem).get(b)},a=t=>{const o=im(t,e,"button");return Nr(o),A.some(!0)},i={...Hr([Jr(((t,o)=>{am(t,e,"aria-descriptor").each((e=>{const o=ca("aria");Ct(e.element,"id",o),Ct(t.element,"aria-describedby",o)}))}))]),...fh(A.some(r))},l={repositionMenus:e=>{ph.isOn(e)&&BS(e)}};return{uid:e.uid,dom:e.dom,components:t,apis:l,eventOrder:{...e.eventOrder,[mr()]:["disabling","toggling","alloy.base.behaviour"]},events:i,behaviours:wu(e.splitDropdownBehaviours,[fS.config({others:{sandbox:t=>{const o=im(t,e,"arrow");return DS(e,t,{onOpen:()=>{ph.on(o),ph.on(t)},onClose:()=>{ph.off(o),ph.off(t)}})}}}),Gp.config({mode:"special",onSpace:a,onEnter:a,onDown:e=>(r(e),A.some(!0))}),ah.config({}),ph.config({toggleOnExecute:!1,aria:{mode:"expanded"}})]),domModification:{attributes:{role:e.role.getOr("button"),"aria-haspopup":!0}}}},apis:{repositionMenus:(e,t)=>e.repositionMenus(t)}}),VB=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setText:t=>Rr(e,T_,{text:t}),setIcon:t=>Rr(e,E_,{icon:t})}),zB=e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setText:t=>Rr(e,T_,{text:t}),setIcon:t=>Rr(e,E_,{icon:t})}),LB=(e,t)=>e.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),HB=ca("focus-button"),PB=(e,t,o,n,s)=>{const r=t.map((e=>Xh(__(e,"tox-tbtn",s)))),a=e.map((e=>Xh(O_(e,s.icons))));return{dom:{tag:"button",classes:["tox-tbtn"].concat(t.isSome()?["tox-tbtn--select"]:[]),attributes:LB(o,s)},components:Fx([a.map((e=>e.asSpec())),r.map((e=>e.asSpec()))]),eventOrder:{[js()]:["focusing","alloy.base.behaviour",x_],[kr()]:[x_,"toolbar-group-button-events"]},buttonBehaviours:Tl([Ex(s.isDisabled),Ox(),th(x_,[Jr(((e,t)=>S_(e))),Wr(T_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[ri(s.translate(t.event.text))])}))})),Wr(E_,((e,t)=>{a.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[O_(t.event.icon,s.icons)])}))})),Wr(js(),((e,t)=>{t.event.prevent(),Fr(e,HB)}))])].concat(n.getOr([])))}},UB=(e,t,o)=>{var n;const s=As(b),r=PB(e.icon,e.text,e.tooltip,A.none(),o);return qh.sketch({dom:r.dom,components:r.components,eventOrder:w_,buttonBehaviours:{...Tl([th("toolbar-button-events",[(a={onAction:e.onAction,getApi:t.getApi},ea(((e,t)=>{Ax(a,e)((t=>{Rr(e,y_,{buttonApi:t}),a.onAction(t)}))}))),Mx(t,s),Dx(t,s)]),Ex((()=>!e.enabled||o.isDisabled())),Ox()].concat(t.toolbarButtonBehaviours)),[x_]:null===(n=r.buttonBehaviours)||void 0===n?void 0:n[x_]}});var a},WB=(e,t,o)=>UB(e,{toolbarButtonBehaviours:o.length>0?[th("toolbarButtonWith",o)]:[],getApi:VB,onSetup:e.onSetup},t),jB=(e,t,o)=>UB(e,{toolbarButtonBehaviours:[eh.config({}),ph.config({toggleClass:"tox-tbtn--enabled",aria:{mode:"pressed"},toggleOnExecute:!1})].concat(o.length>0?[th("toolbarToggleButtonWith",o)]:[]),getApi:zB,onSetup:e.onSetup},t),GB=(e,t,o)=>n=>wS((e=>t.fetch(e))).map((s=>A.from(jS(bn(nS(ca("menu-value"),s,(o=>{t.onItemAction(e(n),o)}),t.columns,t.presets,bv.CLOSE_ON_EXECUTE,t.select.getOr(T),o),{movement:rS(t.columns,t.presets),menuBehaviours:ux("auto"!==t.columns?[]:[Jr(((e,o)=>{dx(e,4,Av(t.presets)).each((({numRows:t,numColumns:o})=>{Gp.setGridSize(e,t,o)}))}))])}))))),$B=[{name:"history",items:["undo","redo"]},{name:"ai",items:["aidialog","aishortcuts"]},{name:"styles",items:["styles"]},{name:"formatting",items:["bold","italic"]},{name:"alignment",items:["alignleft","aligncenter","alignright","alignjustify"]},{name:"indentation",items:["outdent","indent"]},{name:"permanent pen",items:["permanentpen"]},{name:"comments",items:["addcomment"]}],qB=(e,t)=>(o,n,s)=>{const r=e(o).mapError((e=>Jn(e))).getOrDie();return t(r,n,s)},YB={button:qB(Ny,((e,t)=>{return o=e,n=t.shared.providers,WB(o,n,[]);var o,n})),togglebutton:qB(Ly,((e,t)=>{return o=e,n=t.shared.providers,jB(o,n,[]);var o,n})),menubutton:qB(hM,((e,t)=>dT(e,"tox-tbtn",t,A.none(),!1))),splitbutton:qB((e=>Yn("SplitButton",fM,e)),((e,t)=>((e,t)=>{const o=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setIconFill:(t,o)=>{vi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{Ct(e,"fill",o)}))},setActive:t=>{Ct(e.element,"aria-pressed",t),vi(e.element,"span").each((o=>{e.getSystem().getByDom(o).each((e=>ph.set(e,t)))}))},isActive:()=>vi(e.element,"span").exists((t=>e.getSystem().getByDom(t).exists(ph.isOn))),setText:t=>vi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Rr(e,T_,{text:t}))))),setIcon:t=>vi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Rr(e,E_,{icon:t}))))),setTooltip:o=>{const n=t.providers.translate(o);Ot(e.element,{"aria-label":n,title:n})}}),n=As(b),s={getApi:o,onSetup:e.onSetup};return NB.sketch({dom:{tag:"div",classes:["tox-split-button"],attributes:{"aria-pressed":!1,...LB(e.tooltip,t.providers)}},onExecute:t=>{const n=o(t);n.isEnabled()&&e.onAction(n)},onItemExecute:(e,t,o)=>{},splitDropdownBehaviours:Tl([Tx(t.providers.isDisabled),Ox(),th("split-dropdown-events",[Jr(((e,t)=>S_(e))),Wr(HB,ah.focus),Mx(s,n),Dx(s,n)]),Hk.config({})]),eventOrder:{[kr()]:["alloy.base.behaviour","split-dropdown-events"]},toggleClass:"tox-tbtn--enabled",lazySink:t.getSink,fetch:GB(o,e,t.providers),parts:{menu:Rv(0,e.columns,e.presets)},components:[NB.parts.button(PB(e.icon,e.text,A.none(),A.some([ph.config({toggleClass:"tox-tbtn--enabled",toggleOnExecute:!1})]),t.providers)),NB.parts.arrow({dom:{tag:"button",classes:["tox-tbtn","tox-split-button__chevron"],innerHtml:Qf("chevron-down",t.providers.icons)},buttonBehaviours:Tl([Tx(t.providers.isDisabled),Ox(),eb()])}),NB.parts["aria-descriptor"]({text:t.providers.translate("To open the popup, press Shift+Enter")})]})})(e,t.shared))),grouptoolbarbutton:qB((e=>Yn("GroupToolbarButton",mM,e)),((e,t,o)=>{const n=o.ui.registry.getAll().buttons,s={[kc]:t.shared.header.isPositionedAtTop()?Sc.TopToBottom:Sc.BottomToTop};if(Ob(o)===rb.floating)return((e,t,o,n)=>{const s=t.shared,r=As(b),a={toolbarButtonBehaviours:[],getApi:VB,onSetup:e.onSetup},i=[th("toolbar-group-button-events",[Mx(a,r),Dx(a,r)])];return ZM.sketch({lazySink:s.getSink,fetch:()=>wS((t=>{t(L(o(e.items),uD))})),markers:{toggledClass:"tox-tbtn--enabled"},parts:{button:PB(e.icon,e.text,e.tooltip,A.some(i),s.providers),toolbar:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:n}}}})})(e,t,(e=>KB(o,{buttons:n,toolbar:e,allowToolbarGroups:!1},t,A.none())),s);throw new Error("Toolbar groups are only supported when using floating toolbar mode")}))},XB={styles:(e,t)=>{const o={type:"advanced",...t.styles};return oB(e,t,DB(e,o),MB,"StylesTextUpdate")},fontsize:(e,t)=>oB(e,t,AB(e),kB,"FontSizeTextUpdate"),fontsizeinput:(e,t)=>((e,t,o)=>{let n=A.none();const s=Sw(e,"NodeChange SwitchMode",(t=>{const s=t.getComponent();n=A.some(s),o.updateInputValue(s),Lm.set(s,!e.selection.isEditable())})),r=e=>({getComponent:x(e)}),a=As(b),i=ca("custom-number-input-events"),l=(e,t,s)=>{const r=n.map((e=>vu.getValue(e))).getOr(""),a=o.getNewValue(r,e),i=r.length-`${a}`.length,l=n.map((e=>e.element.dom.selectionStart-i)),c=n.map((e=>e.element.dom.selectionEnd-i));o.onAction(a,s),n.each((e=>{vu.setValue(e,a),t&&(l.each((t=>e.element.dom.selectionStart=t)),c.each((t=>e.element.dom.selectionEnd=t)))}))},c=(e,t)=>l(((e,t)=>e-t),e,t),d=(e,t)=>l(((e,t)=>e+t),e,t),u=e=>at(e.element).fold(A.none,(e=>(Rl(e),A.some(!0)))),m=e=>Vl(e.element)?(dt(e.element).each((e=>Rl(e))),A.some(!0)):A.none(),g=(o,n,s,a)=>{const i=As(b),l=t.shared.providers.translate(s),c=ca("altExecuting"),d=Sw(e,"NodeChange SwitchMode",(t=>{Lm.set(t.getComponent(),!e.selection.isEditable())})),u=e=>{Lm.isDisabled(e)||o(!0)};return qh.sketch({dom:{tag:"button",attributes:{title:l,"aria-label":l},classes:a.concat(n)},components:[C_(n,t.shared.providers.icons)],buttonBehaviours:Tl([Lm.config({}),th(c,[Mx({onSetup:d,getApi:r},i),Dx({getApi:r},i),Wr(Js(),((e,t)=>{t.event.raw.keyCode!==SB.space()&&t.event.raw.keyCode!==SB.enter()||Lm.isDisabled(e)||o(!1)})),Wr(tr(),u),Wr(Us(),u)])]),eventOrder:{[Js()]:[c,"keying"],[tr()]:[c,"alloy.base.behaviour"],[Us()]:[c,"alloy.base.behaviour"]}})},p=Xh(g((e=>c(!1,e)),"minus","Decrease font size",[])),h=Xh(g((e=>d(!1,e)),"plus","Increase font size",[])),f=Xh({dom:{tag:"div",classes:["tox-input-wrapper"]},components:[Hv.sketch({inputBehaviours:Tl([Lm.config({}),th(i,[Mx({onSetup:s,getApi:r},a),Dx({getApi:r},a)]),th("input-update-display-text",[Wr(T_,((e,t)=>{vu.setValue(e,t.event.text)})),Wr(Ks(),(e=>{o.onAction(vu.getValue(e))})),Wr(er(),(e=>{o.onAction(vu.getValue(e))}))]),Gp.config({mode:"special",onEnter:e=>(l(w,!0,!0),A.some(!0)),onEscape:u,onUp:e=>(d(!0,!1),A.some(!0)),onDown:e=>(c(!0,!1),A.some(!0)),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})],behaviours:Tl([ah.config({}),Gp.config({mode:"special",onEnter:m,onSpace:m,onEscape:u}),th("input-wrapper-events",[Wr(Ys(),(e=>{H([p,h],(t=>{const o=ze(t.get(e).element.dom);Vl(o)&&Nl(o)}))}))])])});return{dom:{tag:"div",classes:["tox-number-input"]},components:[p.asSpec(),f.asSpec(),h.asSpec()],behaviours:Tl([ah.config({}),Gp.config({mode:"flow",focusInside:vg.OnEnterOrSpaceMode,cycles:!1,selector:"button, .tox-input-wrapper",onEscape:e=>Vl(e.element)?A.none():(Rl(e.element),A.some(!0))})])}})(e,t,(e=>{const t=()=>e.queryCommandValue("FontSize");return{updateInputValue:e=>Rr(e,T_,{text:t()}),onAction:(t,o)=>e.execCommand("FontSize",!1,t,{skip_focus:!o}),getNewValue:(o,n)=>{wB(o,["unsupportedLength","empty"]);const s=t(),r=wB(o,["unsupportedLength","empty"]).or(wB(s,["unsupportedLength","empty"])),a=r.map((e=>e.value)).getOr(16),i=Nb(e),l=r.map((e=>e.unit)).filter((e=>""!==e)).getOr(i),c=n(a,(e=>{var t;return null!==(t={em:{step:.1},cm:{step:.1},in:{step:.1},pc:{step:.1},ch:{step:.1},rem:{step:.1}}[e])&&void 0!==t?t:{step:1}})(l).step),d=`${(e=>e>=0)(c)?c:a}${l}`;return d!==s&&((e,t)=>{e.dispatch("FontSizeInputTextUpdate",t)})(e,{value:d}),d}}})(e)),fontfamily:(e,t)=>oB(e,t,vB(e),gB,"FontFamilyTextUpdate"),blocks:(e,t)=>oB(e,t,mB(e),dB,"BlocksTextUpdate"),align:(e,t)=>oB(e,t,lB(e),rB,"AlignTextUpdate")},KB=(e,t,o,n)=>{const s=(e=>{const t=e.toolbar,o=e.buttons;return!1===t?[]:void 0===t||!0===t?(e=>{const t=L($B,(t=>{const o=U(t.items,(t=>ve(e,t)||ve(XB,t)));return{name:t.name,items:o}}));return U(t,(e=>e.items.length>0))})(o):r(t)?(e=>{const t=e.split("|");return L(t,(e=>({items:e.trim().split(" ")})))})(t):(e=>f(e,(e=>ve(e,"name")&&ve(e,"items"))))(t)?t:(console.error("Toolbar type should be string, string[], boolean or ToolbarGroup[]"),[])})(t),a=L(s,(s=>{const r=Y(s.items,(s=>0===s.trim().length?[]:((e,t,o,n,s,r)=>be(t,o.toLowerCase()).orThunk((()=>r.bind((e=>re(e,(e=>be(t,e+o.toLowerCase()))))))).fold((()=>be(XB,o.toLowerCase()).map((t=>t(e,s)))),(t=>"grouptoolbarbutton"!==t.type||n?((e,t,o)=>be(YB,e.type).fold((()=>(console.error("skipping button defined by",e),A.none())),(n=>A.some(n(e,t,o)))))(t,s,e):(console.warn(`Ignoring the '${o}' toolbar button. Group toolbar buttons are only supported when using floating toolbar mode and cannot be nested.`),A.none()))))(e,t.buttons,s,t.allowToolbarGroups,o,n).toArray()));return{title:A.from(e.translate(s.name)),items:r}}));return U(a,(e=>e.items.length>0))},JB=(e,t,o,n)=>{const s=t.mainUi.outerContainer,a=o.toolbar,i=o.buttons;if(f(a,r)){const t=a.map((t=>{const s={toolbar:t,buttons:i,allowToolbarGroups:o.allowToolbarGroups};return KB(e,s,n,A.none())}));UD.setToolbars(s,t)}else UD.setToolbar(s,KB(e,o,n,A.none()))},ZB=Bo(),QB=ZB.os.isiOS()&&ZB.os.version.major<=12;var eI=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=t,i=As(0),l=r.outerContainer;JD(e);const d=ze(s.targetNode),u=bt(ft(d));Ld(d,r.mothership),((e,t,o)=>{uv(e)&&Ld(o.mainUi.mothership.element,o.popupUi.mothership),zd(t,o.dialogUi.mothership)})(e,u,t),e.on("SkinLoaded",(()=>{UD.setSidebar(l,o.sidebar,qb(e)),JB(e,t,o,n),i.set(e.getWin().innerWidth),UD.setMenubar(l,GD(e,o)),UD.setViews(l,o.views),((e,t)=>{const{uiMotherships:o}=t,n=e.dom;let s=e.getWin();const r=e.getDoc().documentElement,a=As(qt(s.innerWidth,s.innerHeight)),i=As(qt(r.offsetWidth,r.offsetHeight)),l=()=>{const t=a.get();t.left===s.innerWidth&&t.top===s.innerHeight||(a.set(qt(s.innerWidth,s.innerHeight)),fw(e))},c=()=>{const t=e.getDoc().documentElement,o=i.get();o.left===t.offsetWidth&&o.top===t.offsetHeight||(i.set(qt(t.offsetWidth,t.offsetHeight)),fw(e))},d=t=>{((e,t)=>{e.dispatch("ScrollContent",t)})(e,t)};n.bind(s,"resize",l),n.bind(s,"scroll",d);const u=ac(ze(e.getBody()),"load",c);e.on("hide",(()=>{H(o,(e=>{Bt(e.element,"display","none")}))})),e.on("show",(()=>{H(o,(e=>{Ht(e.element,"display")}))})),e.on("NodeChange",c),e.on("remove",(()=>{u.unbind(),n.unbind(s,"resize",l),n.unbind(s,"scroll",d),s=null}))})(e,t)}));const m=UD.getSocket(l).getOrDie("Could not find expected socket element");if(QB){It(m.element,{overflow:"scroll","-webkit-overflow-scrolling":"touch"});const t=((e,t)=>{let o=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null)},throttle:(...t)=>{c(o)&&(o=setTimeout((()=>{o=null,e.apply(null,t)}),20))}}})((()=>{e.dispatch("ScrollContent")})),o=rc(m.element,"scroll",t.throttle);e.on("remove",o.unbind)}Cx(e,t),e.addCommand("ToggleSidebar",((t,o)=>{UD.toggleSidebar(l,o),e.dispatch("ToggleSidebar")})),e.addQueryValueHandler("ToggleSidebar",(()=>{var e;return null!==(e=UD.whichSidebar(l))&&void 0!==e?e:""})),e.addCommand("ToggleView",((t,o)=>{if(UD.toggleView(l,o)){const t=l.element;r.mothership.broadcastOn([Qd()],{target:t}),H(a,(e=>{e.broadcastOn([Qd()],{target:t})})),c(UD.whichView(l))&&(e.focus(),e.nodeChanged(),UD.refreshToolbar(l))}})),e.addQueryValueHandler("ToggleView",(()=>{var e;return null!==(e=UD.whichView(l))&&void 0!==e?e:""}));const g=Ob(e);g!==rb.sliding&&g!==rb.floating||e.on("ResizeWindow ResizeEditor ResizeContent",(()=>{const o=e.getWin().innerWidth;o!==i.get()&&(UD.refreshToolbar(t.mainUi.outerContainer),i.set(o))}));const p={setEnabled:e=>{kx(t,!e)},isEnabled:()=>!Lm.isDisabled(l)};return{iframeContainer:m.element.dom,editorContainer:l.element.dom,api:p}}});const tI=e=>/^[0-9\.]+(|px)$/i.test(""+e)?A.some(parseInt(""+e,10)):A.none(),oI=e=>h(e)?e+"px":e,nI=(e,t,o)=>{const n=t.filter((t=>e<t)),s=o.filter((t=>e>t));return n.or(s).getOr(e)},sI=e=>{const t=hb(e),o=fb(e),n=vb(e);return tI(t).map((e=>nI(e,o,n)))},{ToolbarLocation:rI,ToolbarMode:aI}=gv,iI=(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=o,i=ib.DOM,l=iv(e),c=dv(e),d=vb(e).or(sI(e)),u=n.shared.header,m=u.isPositionedAtTop,g=Ob(e),p=g===aI.sliding||g===aI.floating,h=As(!1),f=()=>h.get()&&!e.removed,b=e=>p?e.fold(x(0),(e=>e.components().length>1?jt(e.components()[1].element):0)):0,v=()=>{H(a,(e=>{e.broadcastOn([eu()],{})}))},y=o=>{if(!f())return;l||s.on((e=>{const o=d.getOrThunk((()=>{const e=tI(Rt(wt(),"margin-left")).getOr(0);return Zt(wt())-Xt(t).left+e}));Bt(e.element,"max-width",o+"px")}));const n=l?A.none():(()=>{if(l)return A.none();if(Xt(r.outerContainer.element).left+Qt(r.outerContainer.element)>=window.innerWidth-40||Vt(r.outerContainer.element,"width").isSome()){Bt(r.outerContainer.element,"position","absolute"),Bt(r.outerContainer.element,"left","0px"),Ht(r.outerContainer.element,"width");const e=Qt(r.outerContainer.element);return A.some(e)}return A.none()})();p&&UD.refreshToolbar(r.outerContainer),l||(o=>{s.on((n=>{const s=UD.getToolbar(r.outerContainer),a=b(s),i=Zo(t),{top:l,left:c}=((e,t)=>uv(e)?AA(t):A.none())(e,r.outerContainer.element).fold((()=>({top:m()?Math.max(i.y-jt(n.element)+a,0):i.bottom,left:i.x})),(e=>{var t;const o=Zo(e),s=null!==(t=e.dom.scrollTop)&&void 0!==t?t:0,r=Qe(e,wt()),l=r?Math.max(i.y-jt(n.element)+a,0):i.y-o.y+s-jt(n.element)+a;return{top:m()?l:i.bottom,left:r?i.x:i.x-o.x}})),d={position:"absolute",left:Math.round(c)+"px",top:Math.round(l)+"px"},u=o.map((e=>{const t=Wo(),o=window.innerWidth-(c-t.left);return{width:Math.max(Math.min(e,o),150)+"px"}})).getOr({});It(r.outerContainer.element,{...d,...u})}))})(n),c&&s.on(o),v()},w=()=>!(l||!c||!f())&&s.get().exists((o=>{const n=u.getDockingMode(),a=(o=>{switch(Tb(e)){case rI.auto:const e=UD.getToolbar(r.outerContainer),n=b(e),s=jt(o.element)-n,a=Zo(t);if(a.y>s)return"top";{const e=nt(t),o=Math.max(e.dom.scrollHeight,jt(e));return a.bottom<o-s||tn().bottom<a.bottom-s?"bottom":"top"}case rI.bottom:return"bottom";case rI.top:default:return"top"}})(o);return a!==n&&(i=a,s.on((e=>{tM.setModes(e,[i]),u.setDockingMode(i);const t=m()?Sc.TopToBottom:Sc.BottomToTop;Ct(e.element,kc,t)})),!0);var i}));return{isVisible:f,isPositionedAtTop:m,show:()=>{h.set(!0),Bt(r.outerContainer.element,"display","flex"),i.addClass(e.getBody(),"mce-edit-focus"),H(a,(e=>{Ht(e.element,"display")})),w(),uv(e)?y((e=>tM.isDocked(e)?tM.reset(e):tM.refresh(e))):y(tM.refresh)},hide:()=>{h.set(!1),Bt(r.outerContainer.element,"display","none"),i.removeClass(e.getBody(),"mce-edit-focus"),H(a,(e=>{Bt(e.element,"display","none")}))},update:y,updateMode:()=>{w()&&y(tM.reset)},repositionPopups:v}},lI=(e,t)=>{const o=Zo(e);return{pos:t?o.y:o.bottom,bounds:o}};var cI=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r}=t,a=nc(),i=ze(s.targetNode),l=iI(e,i,t,n,a),c=Mb(e);ZD(e);const d=()=>{if(a.isSet())return void l.show();a.set(UD.getHeader(r.outerContainer).getOrDie());const s=lv(e);uv(e)?(Ld(i,r.mothership),Ld(i,t.popupUi.mothership)):zd(s,r.mothership),zd(s,t.dialogUi.mothership),JB(e,t,o,n),UD.setMenubar(r.outerContainer,GD(e,o)),l.show(),((e,t,o,n)=>{const s=As(lI(t,o.isPositionedAtTop())),r=n=>{const{pos:r,bounds:a}=lI(t,o.isPositionedAtTop()),{pos:i,bounds:l}=s.get(),c=a.height!==l.height||a.width!==l.width;s.set({pos:r,bounds:a}),c&&fw(e,n),o.isVisible()&&(i!==r?o.update(tM.reset):c&&(o.updateMode(),o.repositionPopups()))};n||(e.on("activate",o.show),e.on("deactivate",o.hide)),e.on("SkinLoaded ResizeWindow",(()=>o.update(tM.reset))),e.on("NodeChange keydown",(e=>{requestAnimationFrame((()=>r(e)))}));let a=0;const i=KO((()=>o.update(tM.refresh)),33);e.on("ScrollWindow",(()=>{const e=Wo().left;e!==a&&(a=e,i.throttle()),o.updateMode()})),uv(e)&&e.on("ElementScroll",(e=>{o.update(tM.refresh)}));const l=oc();l.set(ac(ze(e.getBody()),"load",(e=>r(e.raw)))),e.on("remove",(()=>{l.clear()}))})(e,i,l,c),e.nodeChanged()};e.on("show",d),e.on("hide",l.hide),c||(e.on("focus",d),e.on("blur",l.hide)),e.on("init",(()=>{(e.hasFocus()||c)&&d()})),Cx(e,t);const u={show:d,hide:l.hide,setEnabled:e=>{kx(t,!e)},isEnabled:()=>!Lm.isDisabled(r.outerContainer)};return{editorContainer:r.outerContainer.element.dom,api:u}}});const dI="contexttoolbar-hide",uI=(e,t)=>Wr(y_,((o,n)=>{const s=(e=>({hide:()=>Fr(e,fr()),getValue:()=>vu.getValue(e)}))(e.get(o));t.onAction(s,n.event.buttonApi)})),mI=(e,t)=>{const o=e.label.fold((()=>({})),(e=>({"aria-label":e}))),n=Xh(Hv.sketch({inputClasses:["tox-toolbar-textfield","tox-toolbar-nav-js"],data:e.initValue(),inputAttributes:o,selectOnFocus:!0,inputBehaviours:Tl([Gp.config({mode:"special",onEnter:e=>s.findPrimary(e).map((e=>(Nr(e),!0))),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})),s=((e,t,o)=>{const n=L(t,(t=>Xh(((e,t,o)=>(e=>"contextformtogglebutton"===e.type)(t)?((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Ly({...s,type:"togglebutton",onAction:b}));return jB(r,o,[uI(e,t)])})(e,t,o):((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Ny({...s,type:"button",onAction:b}));return WB(r,o,[uI(e,t)])})(e,t,o))(e,t,o))));return{asSpecs:()=>L(n,(e=>e.asSpec())),findPrimary:e=>re(t,((t,o)=>t.primary?A.from(n[o]).bind((t=>t.getOpt(e))).filter(C(Lm.isDisabled)):A.none()))}})(n,e.commands,t);return[{title:A.none(),items:[n.asSpec()]},{title:A.none(),items:s.asSpecs()}]},gI=(e,t,o)=>t.bottom-e.y>=o&&e.bottom-t.y>=o,pI=e=>{const t=(e=>{const t=e.getBoundingClientRect();if(t.height<=0&&t.width<=0){const o=mt(ze(e.startContainer),e.startOffset).element;return(qe(o)?rt(o):A.some(o)).filter($e).map((e=>e.dom.getBoundingClientRect())).getOr(t)}return t})(e.selection.getRng());if(e.inline){const e=Wo();return Jo(e.left+t.left,e.top+t.top,t.width,t.height)}{const o=Qo(ze(e.getBody()));return Jo(o.x+t.left,o.y+t.top,t.width,t.height)}},hI=(e,t,o,n=0)=>{const s=$o(window),r=Zo(ze(e.getContentAreaContainer())),a=Zb(e)||ov(e)||sv(e),{x:i,width:l}=((e,t,o)=>{const n=Math.max(e.x+o,t.x);return{x:n,width:Math.min(e.right-o,t.right)-n}})(r,s,n);if(e.inline&&!a)return Jo(i,s.y,l,s.height);{const a=t.header.isPositionedAtTop(),{y:c,bottom:d}=((e,t,o,n,s,r)=>{const a=ze(e.getContainer()),i=vi(a,".tox-editor-header").getOr(a),l=Zo(i),c=l.y>=t.bottom,d=n&&!c;if(e.inline&&d)return{y:Math.max(l.bottom+r,o.y),bottom:o.bottom};if(e.inline&&!d)return{y:o.y,bottom:Math.min(l.y-r,o.bottom)};const u="line"===s?Zo(a):t;return d?{y:Math.max(l.bottom+r,o.y),bottom:Math.min(u.bottom-r,o.bottom)}:{y:Math.max(u.y+r,o.y),bottom:Math.min(l.y-r,o.bottom)}})(e,r,s,a,o,n);return Jo(i,c,l,d-c)}},fI={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"],inset:["tox-pop--inset"]},bI={maxHeightFunction:gc(),maxWidthFunction:GM()},vI=e=>"node"===e,yI=(e,t,o,n,s)=>{const r=pI(e),a=n.lastElement().exists((e=>Qe(o,e)));return((e,t)=>{const o=e.selection.getRng(),n=mt(ze(o.startContainer),o.startOffset);return o.startContainer===o.endContainer&&o.startOffset===o.endOffset-1&&Qe(n.element,t)})(e,o)?a?SE:bE:a?((e,o,s)=>{const a=Vt(e,"position");Bt(e,"position",o);const i=gI(r,Zo(t),-20)&&!n.isReposition()?CE:SE;return a.each((t=>Bt(e,"position",t))),i})(t,n.getMode()):("fixed"===n.getMode()?s.y+Wo().top:s.y)+(jt(t)+12)<=r.y?bE:vE},xI=(e,t,o,n)=>{const s=t=>(n,s,r,a,i)=>({...yI(e,a,t,o,i)({...n,y:i.y,height:i.height},s,r,a,i),alwaysFit:!0}),r=e=>vI(n)?[s(e)]:[];return t?{onLtr:e=>[gl,ll,cl,dl,ul,ml].concat(r(e)),onRtl:e=>[gl,cl,ll,ul,dl,ml].concat(r(e))}:{onLtr:e=>[ml,gl,dl,ll,ul,cl].concat(r(e)),onRtl:e=>[ml,gl,ul,cl,dl,ll].concat(r(e))}},wI=(e,t)=>{const o=U(t,(t=>t.predicate(e.dom))),{pass:n,fail:s}=P(o,(e=>"contexttoolbar"===e.type));return{contextToolbars:n,contextForms:s}},SI=(e,t)=>{const o={},n=[],s=[],r={},a={},i=ae(e);return H(i,(i=>{const l=e[i];"contextform"===l.type?((e,i)=>{const l=Xn(Yn("ContextForm",$y,i));o[e]=l,l.launch.map((o=>{r["form:"+e]={...i.launch,type:"contextformtogglebutton"===o.type?"togglebutton":"button",onAction:()=>{t(l)}}})),"editor"===l.scope?s.push(l):n.push(l),a[e]=l})(i,l):"contexttoolbar"===l.type&&((e,t)=>{var o;(o=t,Yn("ContextToolbar",qy,o)).each((o=>{"editor"===t.scope?s.push(o):n.push(o),a[e]=o}))})(i,l)})),{forms:o,inNodeScope:n,inEditorScope:s,lookupTable:a,formNavigators:r}},kI=ca("forward-slide"),CI=ca("backward-slide"),OI=ca("change-slide-event"),_I="tox-pop--resizing",TI="tox-pop--transition",EI=(e,t,o,n)=>{const s=n.backstage,r=s.shared,a=Bo().deviceType.isTouch,i=nc(),l=nc(),c=nc(),d=ci((e=>{const t=As([]);return Gh.sketch({dom:{tag:"div",classes:["tox-pop"]},fireDismissalEventInstead:{event:"doNotDismissYet"},onShow:e=>{t.set([]),Gh.getContent(e).each((e=>{Ht(e.element,"visibility")})),Ga(e.element,_I),Ht(e.element,"width")},inlineBehaviours:Tl([th("context-toolbar-events",[Kr(nr(),((e,t)=>{"width"===t.event.raw.propertyName&&(Ga(e.element,_I),Ht(e.element,"width"))})),Wr(OI,((e,t)=>{const o=e.element;Ht(o,"width");const n=Zt(o);Gh.setContent(e,t.event.contents),Wa(o,_I);const s=Zt(o);Bt(o,"width",n+"px"),Gh.getContent(e).each((e=>{t.event.focus.bind((e=>(Rl(e),Ll(o)))).orThunk((()=>(Gp.focusIn(e),zl(ft(o)))))})),setTimeout((()=>{Bt(e.element,"width",s+"px")}),0)})),Wr(kI,((e,o)=>{Gh.getContent(e).each((o=>{t.set(t.get().concat([{bar:o,focus:zl(ft(e.element))}]))})),Rr(e,OI,{contents:o.event.forwardContents,focus:A.none()})})),Wr(CI,((e,o)=>{ne(t.get()).each((o=>{t.set(t.get().slice(0,t.get().length-1)),Rr(e,OI,{contents:di(o.bar),focus:o.focus})}))}))]),Gp.config({mode:"special",onEscape:o=>ne(t.get()).fold((()=>e.onEscape()),(e=>(Fr(o,CI),A.some(!0))))})]),lazySink:()=>rn.value(e.sink)})})({sink:o,onEscape:()=>(e.focus(),A.some(!0))})),u=()=>{const t=c.get().getOr("node"),o=vI(t)?1:0;return hI(e,r,t,o)},m=()=>!(e.removed||a()&&s.isContextMenuOpen()),g=()=>{if(m()){const t=u(),o=xe(c.get(),"node")?((e,t)=>t.filter((e=>xt(e)&&Ge(e))).map(Qo).getOrThunk((()=>pI(e))))(e,i.get()):pI(e);return t.height<=0||!gI(o,t,.01)}return!0},p=()=>{i.clear(),l.clear(),c.clear(),Gh.hide(d)},h=()=>{if(Gh.isOpen(d)){const e=d.element;Ht(e,"display"),g()?Bt(e,"display","none"):(l.set(0),Gh.reposition(d))}},f=t=>({dom:{tag:"div",classes:["tox-pop__dialog"]},components:[t],behaviours:Tl([Gp.config({mode:"acyclic"}),th("pop-dialog-wrap-events",[Jr((t=>{e.shortcuts.add("ctrl+F9","focus statusbar",(()=>Gp.focusIn(t)))})),Zr((t=>{e.shortcuts.remove("ctrl+F9")}))])])}),v=eo((()=>SI(t,(e=>{const t=y([e]);Rr(d,kI,{forwardContents:f(t)})})))),y=t=>{const{buttons:o}=e.ui.registry.getAll(),s={...o,...v().formNavigators},a=Ob(e)===rb.scrolling?rb.scrolling:rb.default,i=q(L(t,(t=>"contexttoolbar"===t.type?((t,o)=>KB(e,{buttons:t,toolbar:o.items,allowToolbarGroups:!1},n.backstage,A.some(["form:"])))(s,t):((e,t)=>mI(e,t))(t,r.providers))));return fD({type:a,uid:ca("context-toolbar"),initGroups:i,onEscape:A.none,cyclicKeying:!0,providers:r.providers})},x=(t,n)=>{if(S.cancel(),!m())return;const s=y(t),p=t[0].position,h=((t,n)=>{const s="node"===t?r.anchors.node(n):r.anchors.cursor(),c=((e,t,o,n)=>"line"===t?{bubble:bc(12,0,fI),layouts:{onLtr:()=>[pl],onRtl:()=>[hl]},overrides:bI}:{bubble:bc(0,12,fI,1/12),layouts:xI(e,o,n,t),overrides:bI})(e,t,a(),{lastElement:i.get,isReposition:()=>xe(l.get(),0),getMode:()=>_d.getMode(o)});return bn(s,c)})(p,n);c.set(p),l.set(1);const b=d.element;Ht(b,"display"),(e=>xe(Se(e,i.get(),Qe),!0))(n)||(Ga(b,TI),_d.reset(o,d)),Gh.showWithinBounds(d,f(s),{anchor:h,transition:{classes:[TI],mode:"placement"}},(()=>A.some(u()))),n.fold(i.clear,i.set),g()&&Bt(b,"display","none")};let w=!1;const S=KO((()=>{!e.hasFocus()||e.removed||w||($a(d.element,TI)?S.throttle():((e,t)=>{const o=ze(t.getBody()),n=e=>Qe(e,o),s=ze(t.selection.getNode());return(e=>!n(e)&&!et(o,e))(s)?A.none():((e,t,o)=>{const n=wI(e,t);if(n.contextForms.length>0)return A.some({elem:e,toolbars:[n.contextForms[0]]});{const t=wI(e,o);if(t.contextForms.length>0)return A.some({elem:e,toolbars:[t.contextForms[0]]});if(n.contextToolbars.length>0||t.contextToolbars.length>0){const o=(e=>{if(e.length<=1)return e;{const t=t=>N(e,(e=>e.position===t)),o=t=>U(e,(e=>e.position===t)),n=t("selection"),s=t("node");if(n||s){if(s&&n){const e=o("node"),t=L(o("selection"),(e=>({...e,position:"node"})));return e.concat(t)}return o(n?"selection":"node")}return o("line")}})(n.contextToolbars.concat(t.contextToolbars));return A.some({elem:e,toolbars:o})}return A.none()}})(s,e.inNodeScope,e.inEditorScope).orThunk((()=>((e,t,o)=>e(t)?A.none():Fs(t,(e=>{if($e(e)){const{contextToolbars:t,contextForms:n}=wI(e,o.inNodeScope),s=n.length>0?n:(e=>{if(e.length<=1)return e;{const t=t=>G(e,(e=>e.position===t));return t("selection").orThunk((()=>t("node"))).orThunk((()=>t("line"))).map((e=>e.position)).fold((()=>[]),(t=>U(e,(e=>e.position===t))))}})(t);return s.length>0?A.some({elem:e,toolbars:s}):A.none()}return A.none()}),e))(n,s,e)))})(v(),e).fold(p,(e=>{x(e.toolbars,A.some(e.elem))})))}),17);e.on("init",(()=>{e.on("remove",p),e.on("ScrollContent ScrollWindow ObjectResized ResizeEditor longpress",h),e.on("click keyup focus SetContent",S.throttle),e.on(dI,p),e.on("contexttoolbar-show",(t=>{const o=v();be(o.lookupTable,t.toolbarKey).each((o=>{x([o],Ce(t.target!==e,t.target)),Gh.getContent(d).each(Gp.focusIn)}))})),e.on("focusout",(t=>{$h.setEditorTimeout(e,(()=>{Ll(o.element).isNone()&&Ll(d.element).isNone()&&p()}),0)})),e.on("SwitchMode",(()=>{e.mode.isReadOnly()&&p()})),e.on("AfterProgressState",(t=>{t.state?p():e.hasFocus()&&S.throttle()})),e.on("dragstart",(()=>{w=!0})),e.on("dragend drop",(()=>{w=!1})),e.on("NodeChange",(e=>{Ll(d.element).fold(S.throttle,b)}))}))},AI=(e,t)=>{const o=()=>{const o=t.getOptions(e),n=t.getCurrent(e).map(t.hash),s=nc();return L(o,(o=>({type:"togglemenuitem",text:t.display(o),onSetup:r=>{const a=e=>{e&&(s.on((e=>e.setActive(!1))),s.set(r)),r.setActive(e)};a(xe(n,t.hash(o)));const i=t.watcher(e,o,a);return()=>{s.clear(),i()}},onAction:()=>t.setCurrent(e,o)})))};e.ui.registry.addMenuButton(t.name,{tooltip:t.text,icon:t.icon,fetch:e=>e(o()),onSetup:t.onToolbarSetup}),e.ui.registry.addNestedMenuItem(t.name,{type:"nestedmenuitem",text:t.text,getSubmenuItems:o,onSetup:t.onMenuSetup})},MI=e=>{AI(e,(e=>({name:"lineheight",text:"Line height",icon:"line-height",getOptions:tv,hash:e=>((e,t)=>wB(e,["fixed","relative","empty"]).map((({value:e,unit:t})=>e+t)))(e).getOr(e),display:w,watcher:(e,t,o)=>e.formatter.formatChanged("lineheight",o,!1,{value:t}).unbind,getCurrent:e=>A.from(e.queryCommandValue("LineHeight")),setCurrent:(e,t)=>e.execCommand("LineHeight",!1,t),onToolbarSetup:xw(e),onMenuSetup:xw(e)}))(e)),(e=>A.from(kb(e)).map((t=>({name:"language",text:"Language",icon:"language",getOptions:x(t),hash:e=>u(e.customCode)?e.code:`${e.code}/${e.customCode}`,display:e=>e.title,watcher:(e,t,o)=>{var n;return e.formatter.formatChanged("lang",o,!1,{value:t.code,customValue:null!==(n=t.customCode)&&void 0!==n?n:null}).unbind},getCurrent:e=>{const t=ze(e.selection.getNode());return Rs(t,(e=>A.some(e).filter($e).bind((e=>Tt(e,"lang").map((t=>({code:t,customCode:Tt(e,"data-mce-lang").getOrUndefined(),title:""})))))))},setCurrent:(e,t)=>e.execCommand("Lang",!1,t),onToolbarSetup:t=>{const o=oc();return t.setActive(e.formatter.match("lang",{},void 0,!0)),o.set(e.formatter.formatChanged("lang",t.setActive,!0)),yw(o.clear,xw(e)(t))},onMenuSetup:xw(e)}))))(e).each((t=>AI(e,t)))},DI=e=>Sw(e,"NodeChange",(t=>{t.setEnabled(e.queryCommandState("outdent")&&e.selection.isEditable())})),BI=(e,t)=>o=>{o.setActive(t.get());const n=e=>{t.set(e.state),o.setActive(e.state)};return e.on("PastePlainTextToggle",n),yw((()=>e.off("PastePlainTextToggle",n)),xw(e)(o))},II=(e,t)=>()=>{e.execCommand("mceToggleFormat",!1,t)},FI=e=>{(e=>{(e=>{XO.each([{name:"bold",text:"Bold",icon:"bold"},{name:"italic",text:"Italic",icon:"italic"},{name:"underline",text:"Underline",icon:"underline"},{name:"strikethrough",text:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",icon:"superscript"}],((t,o)=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:ww(e,t.name),onAction:II(e,t.name)})}));for(let t=1;t<=6;t++){const o="h"+t;e.ui.registry.addToggleButton(o,{text:o.toUpperCase(),tooltip:"Heading "+t,onSetup:ww(e,o),onAction:II(e,o)})}})(e),(e=>{XO.each([{name:"copy",text:"Copy",action:"Copy",icon:"copy"},{name:"help",text:"Help",action:"mceHelp",icon:"help"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all"},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"print",text:"Print",action:"mcePrint",icon:"print"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.action)})})),XO.each([{name:"cut",text:"Cut",action:"Cut",icon:"cut"},{name:"paste",text:"Paste",action:"Paste",icon:"paste"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"remove",text:"Remove",action:"Delete",icon:"remove"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:xw(e),onAction:Cw(e,t.action)})}))})(e),(e=>{XO.each([{name:"blockquote",text:"Blockquote",action:"mceBlockQuote",icon:"quote"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.action),onSetup:ww(e,t.name)})}))})(e)})(e),(e=>{XO.each([{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"copy",text:"Copy",action:"Copy",icon:"copy",shortcut:"Meta+C"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all",shortcut:"Meta+A"},{name:"print",text:"Print...",action:"mcePrint",icon:"print",shortcut:"Meta+P"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onAction:Cw(e,t.action)})})),XO.each([{name:"bold",text:"Bold",action:"Bold",icon:"bold",shortcut:"Meta+B"},{name:"italic",text:"Italic",action:"Italic",icon:"italic",shortcut:"Meta+I"},{name:"underline",text:"Underline",action:"Underline",icon:"underline",shortcut:"Meta+U"},{name:"strikethrough",text:"Strikethrough",action:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",action:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",action:"Superscript",icon:"superscript"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"cut",text:"Cut",action:"Cut",icon:"cut",shortcut:"Meta+X"},{name:"paste",text:"Paste",action:"Paste",icon:"paste",shortcut:"Meta+V"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onSetup:xw(e),onAction:Cw(e,t.action)})})),e.ui.registry.addMenuItem("codeformat",{text:"Code",icon:"sourcecode",onSetup:xw(e),onAction:II(e,"code")})})(e)},RI=(e,t)=>Sw(e,"Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",(o=>{o.setEnabled(!e.mode.isReadOnly()&&e.undoManager[t]())})),NI=e=>Sw(e,"VisualAid",(t=>{t.setActive(e.hasVisual)})),VI=(e,t)=>{(e=>{H([{name:"alignleft",text:"Align left",cmd:"JustifyLeft",icon:"align-left"},{name:"aligncenter",text:"Align center",cmd:"JustifyCenter",icon:"align-center"},{name:"alignright",text:"Align right",cmd:"JustifyRight",icon:"align-right"},{name:"alignjustify",text:"Justify",cmd:"JustifyFull",icon:"align-justify"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.cmd),onSetup:ww(e,t.name)})})),e.ui.registry.addButton("alignnone",{tooltip:"No alignment",icon:"align-none",onSetup:xw(e),onAction:Cw(e,"JustifyNone")})})(e),FI(e),((e,t)=>{((e,t)=>{const o=tB(0,t,lB(e));e.ui.registry.addNestedMenuItem("align",{text:t.shared.providers.translate("Align"),onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,vB(e));e.ui.registry.addNestedMenuItem("fontfamily",{text:t.shared.providers.translate("Fonts"),onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o={type:"advanced",...t.styles},n=tB(0,t,DB(e,o));e.ui.registry.addNestedMenuItem("styles",{text:"Formats",onSetup:xw(e),getSubmenuItems:()=>n.items.validateItems(n.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,mB(e));e.ui.registry.addNestedMenuItem("blocks",{text:"Blocks",onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,AB(e));e.ui.registry.addNestedMenuItem("fontsize",{text:"Font sizes",onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t)})(e,t),(e=>{(e=>{e.ui.registry.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onSetup:RI(e,"hasUndo"),onAction:Cw(e,"undo")}),e.ui.registry.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onSetup:RI(e,"hasRedo"),onAction:Cw(e,"redo")})})(e),(e=>{e.ui.registry.addButton("undo",{tooltip:"Undo",icon:"undo",enabled:!1,onSetup:RI(e,"hasUndo"),onAction:Cw(e,"undo")}),e.ui.registry.addButton("redo",{tooltip:"Redo",icon:"redo",enabled:!1,onSetup:RI(e,"hasRedo"),onAction:Cw(e,"redo")})})(e)})(e),(e=>{(e=>{e.addCommand("mceApplyTextcolor",((t,o)=>{((e,t,o)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.apply(t,{value:o}),e.nodeChanged()}))})(e,t,o)})),e.addCommand("mceRemoveTextcolor",(t=>{((e,t)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.remove(t,{value:null},void 0,!0),e.nodeChanged()}))})(e,t)}))})(e);const t=Ww(e),o=jw(e),n=As(t),s=As(o);eS(e,"forecolor","forecolor",n),eS(e,"backcolor","hilitecolor",s),tS(e,"forecolor","forecolor","Text color",n),tS(e,"backcolor","hilitecolor","Background color",s)})(e),(e=>{(e=>{e.ui.registry.addButton("visualaid",{tooltip:"Visual aids",text:"Visual aids",onAction:Cw(e,"mceToggleVisualAid")})})(e),(e=>{e.ui.registry.addToggleMenuItem("visualaid",{text:"Visual aids",onSetup:NI(e),onAction:Cw(e,"mceToggleVisualAid")})})(e)})(e),(e=>{(e=>{e.ui.registry.addButton("outdent",{tooltip:"Decrease indent",icon:"outdent",onSetup:DI(e),onAction:Cw(e,"outdent")}),e.ui.registry.addButton("indent",{tooltip:"Increase indent",icon:"indent",onSetup:xw(e),onAction:Cw(e,"indent")})})(e)})(e),MI(e),(e=>{const t=As($b(e)),o=()=>e.execCommand("mceTogglePlainTextPaste");e.ui.registry.addToggleButton("pastetext",{active:!1,icon:"paste-text",tooltip:"Paste as text",onAction:o,onSetup:BI(e,t)}),e.ui.registry.addToggleMenuItem("pastetext",{text:"Paste as text",icon:"paste-text",onAction:o,onSetup:BI(e,t)})})(e)},zI=e=>r(e)?e.split(/[ ,]/):e,LI=e=>t=>t.options.get(e),HI=LI("contextmenu_never_use_native"),PI=LI("contextmenu_avoid_overlap"),UI=e=>{const t=e.ui.registry.getAll().contextMenus,o=e.options.get("contextmenu");return e.options.isSet("contextmenu")?o:U(o,(e=>ve(t,e)))},WI=(e,t)=>({type:"makeshift",x:e,y:t}),jI=e=>"longpress"===e.type||0===e.type.indexOf("touch"),GI=(e,t)=>"contextmenu"===t.type||"longpress"===t.type?e.inline?(e=>{if(jI(e)){const t=e.touches[0];return WI(t.pageX,t.pageY)}return WI(e.pageX,e.pageY)})(t):((e,t)=>{const o=ib.DOM.getPos(e);return((e,t,o)=>WI(e.x+t,e.y+o))(t,o.x,o.y)})(e.getContentAreaContainer(),(e=>{if(jI(e)){const t=e.touches[0];return WI(t.clientX,t.clientY)}return WI(e.clientX,e.clientY)})(t)):$I(e),$I=e=>({type:"selection",root:ze(e.selection.getNode())}),qI=(e,t,o)=>{switch(o){case"node":return(e=>({type:"node",node:A.some(ze(e.selection.getNode())),root:ze(e.getBody())}))(e);case"point":return GI(e,t);case"selection":return $I(e)}},YI=(e,t,o,n,s,r)=>{const a=o(),i=qI(e,t,r);I_(a,bv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!1,search:A.none()}).map((e=>{t.preventDefault(),Gh.showMenuAt(s,{anchor:i},{menu:{markers:Bv("normal")},data:e})}))},XI={onLtr:()=>[gl,ll,cl,dl,ul,ml,bE,vE,fE,pE,hE,gE],onRtl:()=>[gl,cl,ll,ul,dl,ml,bE,vE,hE,gE,fE,pE]},KI={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},JI=(e,t,o,n,s,r)=>{const a=Bo(),i=a.os.isiOS(),l=a.os.isMacOS(),c=a.os.isAndroid(),d=a.deviceType.isTouch(),u=()=>{const a=o();((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>{const n=qI(e,t,o);return{bubble:bc(0,"point"===o?12:0,KI),layouts:XI,overrides:{maxWidthFunction:GM(),maxHeightFunction:gc()},...n}})(e,t,r);I_(o,bv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!0,search:A.none()}).map((o=>{t.preventDefault();const l=a?Uh.HighlightMenuAndItem:Uh.HighlightNone;Gh.showMenuWithinBounds(s,{anchor:i},{menu:{markers:Bv("normal"),highlightOnOpen:l},data:o,type:"horizontal"},(()=>A.some(hI(e,n.shared,"node"===r?"node":"selection")))),e.dispatch(dI)}))})(e,t,a,n,s,r,!(c||i||l&&d))};if((l||i)&&"node"!==r){const o=()=>{(e=>{const t=e.selection.getRng(),o=()=>{$h.setEditorTimeout(e,(()=>{e.selection.setRng(t)}),10),r()};e.once("touchend",o);const n=e=>{e.preventDefault(),e.stopImmediatePropagation()};e.on("mousedown",n,!0);const s=()=>r();e.once("longpresscancel",s);const r=()=>{e.off("touchend",o),e.off("longpresscancel",s),e.off("mousedown",n)}})(e),u()};((e,t)=>{const o=e.selection;if(o.isCollapsed()||t.touches.length<1)return!1;{const n=t.touches[0],s=o.getRng();return td(e.getWin(),jc.domRange(s)).exists((e=>e.left<=n.clientX&&e.right>=n.clientX&&e.top<=n.clientY&&e.bottom>=n.clientY))}})(e,t)?o():(e.once("selectionchange",o),e.once("touchend",(()=>e.off("selectionchange",o))))}else u()},ZI=e=>r(e)?"|"===e:"separator"===e.type,QI={type:"separator"},eF=e=>{const t=e=>({text:e.text,icon:e.icon,enabled:e.enabled,shortcut:e.shortcut});if(r(e))return e;switch(e.type){case"separator":return QI;case"submenu":return{type:"nestedmenuitem",...t(e),getSubmenuItems:()=>{const t=e.getSubmenuItems();return r(t)?t:L(t,eF)}};default:const o=e;return{type:"menuitem",...t(o),onAction:v(o.onAction)}}},tF=(e,t)=>{if(0===t.length)return e;const o=ne(e).filter((e=>!ZI(e))).fold((()=>[]),(e=>[QI]));return e.concat(o).concat(t).concat([QI])},oF=(e,t)=>!(e=>"longpress"===e.type||ve(e,"touches"))(t)&&(2!==t.button||t.target===e.getBody()&&""===t.pointerType),nF=(e,t)=>oF(e,t)?e.selection.getStart(!0):t.target,sF=(e,t,o)=>{const n=Bo().deviceType.isTouch,s=ci(Gh.sketch({dom:{tag:"div"},lazySink:t,onEscape:()=>e.focus(),onShow:()=>o.setContextMenuState(!0),onHide:()=>o.setContextMenuState(!1),fireDismissalEventInstead:{},inlineBehaviours:Tl([th("dismissContextMenu",[Wr(Or(),((t,o)=>{Zd.close(t),e.focus()}))])])})),a=()=>Gh.hide(s),i=t=>{if(HI(e)&&t.preventDefault(),((e,t)=>t.ctrlKey&&!HI(e))(e,t)||(e=>0===UI(e).length)(e))return;const a=((e,t)=>{const o=PI(e),n=oF(e,t)?"selection":"point";if(De(o)){const s=nF(e,t);return JS(ze(s),o)?"node":n}return n})(e,t);(n()?JI:YI)(e,t,(()=>{const o=nF(e,t),n=e.ui.registry.getAll(),s=UI(e);return((e,t,o)=>{const n=j(t,((t,n)=>be(e,n.toLowerCase()).map((e=>{const n=e.update(o);if(r(n)&&De(Me(n)))return tF(t,n.split(" "));if(l(n)&&n.length>0){const e=L(n,eF);return tF(t,e)}return t})).getOrThunk((()=>t.concat([n])))),[]);return n.length>0&&ZI(n[n.length-1])&&n.pop(),n})(n.contextMenus,s,o)}),o,s,a)};e.on("init",(()=>{const t="ResizeEditor ScrollContent ScrollWindow longpresscancel"+(n()?"":" ResizeWindow");e.on(t,a),e.on("longpress contextmenu",i)}))},rF=Ms([{offset:["x","y"]},{absolute:["x","y"]},{fixed:["x","y"]}]),aF=e=>t=>t.translate(-e.left,-e.top),iF=e=>t=>t.translate(e.left,e.top),lF=e=>(t,o)=>j(e,((e,t)=>t(e)),qt(t,o)),cF=(e,t,o)=>e.fold(lF([iF(o),aF(t)]),lF([aF(t)]),lF([])),dF=(e,t,o)=>e.fold(lF([iF(o)]),lF([]),lF([iF(t)])),uF=(e,t,o)=>e.fold(lF([]),lF([aF(o)]),lF([iF(t),aF(o)])),mF=(e,t,o)=>{const n=e.fold(((e,t)=>({position:A.some("absolute"),left:A.some(e+"px"),top:A.some(t+"px")})),((e,t)=>({position:A.some("absolute"),left:A.some(e-o.left+"px"),top:A.some(t-o.top+"px")})),((e,t)=>({position:A.some("fixed"),left:A.some(e+"px"),top:A.some(t+"px")})));return{right:A.none(),bottom:A.none(),...n}},gF=(e,t,o,n)=>{const s=(e,s)=>(r,a)=>{const i=e(t,o,n);return s(r.getOr(i.left),a.getOr(i.top))};return e.fold(s(uF,pF),s(dF,hF),s(cF,fF))},pF=rF.offset,hF=rF.absolute,fF=rF.fixed,bF=(e,t)=>{const o=_t(e,t);return u(o)?NaN:parseInt(o,10)},vF=(e,t,o,n,s,r)=>{const a=((e,t,o,n)=>((e,t)=>{const o=e.element,n=bF(o,t.leftAttr),s=bF(o,t.topAttr);return isNaN(n)||isNaN(s)?A.none():A.some(qt(n,s))})(e,t).fold((()=>o),(e=>fF(e.left+n.left,e.top+n.top))))(e,t,o,n),i=t.mustSnap?xF(e,t,a,s,r):wF(e,t,a,s,r),l=cF(a,s,r);return((e,t,o)=>{const n=e.element;Ct(n,t.leftAttr,o.left+"px"),Ct(n,t.topAttr,o.top+"px")})(e,t,l),i.fold((()=>({coord:fF(l.left,l.top),extra:A.none()})),(e=>({coord:e.output,extra:e.extra})))},yF=(e,t,o,n)=>re(e,(e=>{const s=e.sensor,r=((e,t,o,n,s,r)=>{const a=dF(e,s,r),i=dF(t,s,r);return Math.abs(a.left-i.left)<=o&&Math.abs(a.top-i.top)<=n})(t,s,e.range.left,e.range.top,o,n);return r?A.some({output:gF(e.output,t,o,n),extra:e.extra}):A.none()})),xF=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return yF(r,o,n,s).orThunk((()=>{const e=j(r,((e,t)=>{const r=t.sensor,a=((e,t,o,n,s,r)=>{const a=dF(e,s,r),i=dF(t,s,r),l=Math.abs(a.left-i.left),c=Math.abs(a.top-i.top);return qt(l,c)})(o,r,t.range.left,t.range.top,n,s);return e.deltas.fold((()=>({deltas:A.some(a),snap:A.some(t)})),(o=>(a.left+a.top)/2<=(o.left+o.top)/2?{deltas:A.some(a),snap:A.some(t)}:e))}),{deltas:A.none(),snap:A.none()});return e.snap.map((e=>({output:gF(e.output,o,n,s),extra:e.extra})))}))},wF=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return yF(r,o,n,s)};var SF=Object.freeze({__proto__:null,snapTo:(e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const t=tt(e.element),o=Wo(t),r=MA(s),a=((e,t,o)=>({coord:gF(e.output,e.output,t,o),extra:e.extra}))(n,o,r),i=mF(a.coord,0,r);Ft(s,i)}}});const kF="data-initial-z-index",CF=(e,t)=>{e.getSystem().addToGui(t),(e=>{rt(e.element).filter($e).each((t=>{Vt(t,"z-index").each((e=>{Ct(t,kF,e)})),Bt(t,"z-index",Rt(e.element,"z-index"))}))})(t)},OF=e=>{(e=>{rt(e.element).filter($e).each((e=>{Tt(e,kF).fold((()=>Ht(e,"z-index")),(t=>Bt(e,"z-index",t))),At(e,kF)}))})(e),e.getSystem().removeFromGui(e)},_F=(e,t,o)=>e.getSystem().build(ik.sketch({dom:{styles:{left:"0px",top:"0px",width:"100%",height:"100%",position:"fixed","z-index":"1000000000000000"},classes:[t]},events:o}));var TF=ys("snaps",[ns("getSnapPoints"),Ri("onSensor"),ns("leftAttr"),ns("topAttr"),xs("lazyViewport",tn),xs("mustSnap",!1)]);const EF=[xs("useFixed",T),ns("blockerClass"),xs("getTarget",w),xs("onDrag",b),xs("repositionTarget",!0),xs("onDrop",b),_s("getBounds",tn),TF],AF=e=>{return(t=Vt(e,"left"),o=Vt(e,"top"),n=Vt(e,"position"),t.isSome()&&o.isSome()&&n.isSome()?A.some(((e,t,o)=>("fixed"===o?fF:pF)(parseInt(e,10),parseInt(t,10)))(t.getOrDie(),o.getOrDie(),n.getOrDie())):A.none()).getOrThunk((()=>{const t=Xt(e);return hF(t.left,t.top)}));var t,o,n},MF=(e,t)=>({bounds:e.getBounds(),height:Gt(t.element),width:Qt(t.element)}),DF=(e,t,o,n,s)=>{const r=o.update(n,s),a=o.getStartData().getOrThunk((()=>MF(t,e)));r.each((o=>{((e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const r=tt(e.element),a=Wo(r),i=MA(s),l=AF(s),c=((e,t,o,n,s,r,a)=>((e,t,o,n,s)=>{const r=s.bounds,a=dF(t,o,n),i=Qi(a.left,r.x,r.x+r.width-s.width),l=Qi(a.top,r.y,r.y+r.height-s.height),c=hF(i,l);return t.fold((()=>{const e=uF(c,o,n);return pF(e.left,e.top)}),x(c),(()=>{const e=cF(c,o,n);return fF(e.left,e.top)}))})(0,t.fold((()=>{const e=(t=o,a=r.left,i=r.top,t.fold(((e,t)=>pF(e+a,t+i)),((e,t)=>hF(e+a,t+i)),((e,t)=>fF(e+a,t+i))));var t,a,i;const l=cF(e,n,s);return fF(l.left,l.top)}),(t=>{const a=vF(e,t,o,r,n,s);return a.extra.each((o=>{t.onSensor(e,o)})),a.coord})),n,s,a))(e,t.snaps,l,a,i,n,o),d=mF(c,0,i);Ft(s,d)}t.onDrag(e,s,n)})(e,t,a,o)}))},BF=(e,t,o,n)=>{t.each(OF),o.snaps.each((t=>{((e,t)=>{((e,t)=>{const o=e.element;At(o,t.leftAttr),At(o,t.topAttr)})(e,t)})(e,t)}));const s=o.getTarget(e.element);n.reset(),o.onDrop(e,s)},IF=e=>(t,o)=>{const n=e=>{o.setStartData(MF(t,e))};return Hr([Wr(wr(),(e=>{o.getStartData().each((()=>n(e)))})),...e(t,o,n)])};var FF=Object.freeze({__proto__:null,getData:e=>A.from(qt(e.x,e.y)),getDelta:(e,t)=>qt(t.left-e.left,t.top-e.top)});const RF=(e,t,o)=>[Wr(js(),((n,s)=>{if(0!==s.event.raw.button)return;s.stop();const r=()=>BF(n,A.some(l),e,t),a=ZS(r,200),i={drop:r,delayDrop:a.schedule,forceDrop:r,move:o=>{a.cancel(),DF(n,e,t,FF,o)}},l=_F(n,e.blockerClass,(e=>Hr([Wr(js(),e.forceDrop),Wr(qs(),e.drop),Wr(Gs(),((t,o)=>{e.move(o.event)})),Wr($s(),e.delayDrop)]))(i));o(n),CF(n,l)}))],NF=[...EF,Li("dragger",{handlers:IF(RF)})];var VF=Object.freeze({__proto__:null,getData:e=>{const t=e.raw.touches;return 1===t.length?(e=>{const t=e[0];return A.some(qt(t.clientX,t.clientY))})(t):A.none()},getDelta:(e,t)=>qt(t.left-e.left,t.top-e.top)});const zF=(e,t,o)=>{const n=nc(),s=o=>{BF(o,n.get(),e,t),n.clear()};return[Wr(Hs(),((r,a)=>{a.stop();const i=()=>s(r),l={drop:i,delayDrop:b,forceDrop:i,move:o=>{DF(r,e,t,VF,o)}},c=_F(r,e.blockerClass,(e=>Hr([Wr(Hs(),e.forceDrop),Wr(Us(),e.drop),Wr(Ws(),e.drop),Wr(Ps(),((t,o)=>{e.move(o.event)}))]))(l));n.set(c),o(r),CF(r,c)})),Wr(Ps(),((o,n)=>{n.stop(),DF(o,e,t,VF,n.event)})),Wr(Us(),((e,t)=>{t.stop(),s(e)})),Wr(Ws(),s)]},LF=NF,HF=[...EF,Li("dragger",{handlers:IF(zF)})],PF=[...EF,Li("dragger",{handlers:IF(((e,t,o)=>[...RF(e,t,o),...zF(e,t,o)]))})];var UF=Object.freeze({__proto__:null,mouse:LF,touch:HF,mouseOrTouch:PF}),WF=Object.freeze({__proto__:null,init:()=>{let e=A.none(),t=A.none();const o=x({});return Ta({readState:o,reset:()=>{e=A.none(),t=A.none()},update:(t,o)=>t.getData(o).bind((o=>((t,o)=>{const n=e.map((e=>t.getDelta(e,o)));return e=A.some(o),n})(t,o))),getStartData:()=>t,setStartData:e=>{t=A.some(e)}})}});const jF=Dl({branchKey:"mode",branches:UF,name:"dragging",active:{events:(e,t)=>e.dragger.handlers(e,t)},extra:{snap:e=>({sensor:e.sensor,range:e.range,output:e.output,extra:A.from(e.extra)})},state:WF,apis:SF}),GF=(e,t,o,n,s,r)=>e.fold((()=>jF.snap({sensor:hF(o-20,n-20),range:qt(s,r),output:hF(A.some(o),A.some(n)),extra:{td:t}})),(e=>{const s=o-20,r=n-20,a=e.element.dom.getBoundingClientRect();return jF.snap({sensor:hF(s,r),range:qt(40,40),output:hF(A.some(o-a.width/2),A.some(n-a.height/2)),extra:{td:t}})})),$F=(e,t,o)=>({getSnapPoints:e,leftAttr:"data-drag-left",topAttr:"data-drag-top",onSensor:(e,n)=>{const s=n.td;((e,t)=>e.exists((e=>Qe(e,t))))(t.get(),s)||(t.set(s),o(s))},mustSnap:!0}),qF=e=>Xh(qh.sketch({dom:{tag:"div",classes:["tox-selector"]},buttonBehaviours:Tl([jF.config({mode:"mouseOrTouch",blockerClass:"blocker",snaps:e}),Hk.config({})]),eventOrder:{mousedown:["dragging","alloy.base.behaviour"],touchstart:["dragging","alloy.base.behaviour"]}})),YF=(e,t)=>{const o=As([]),n=As([]),s=As(!1),r=nc(),a=nc(),i=e=>{const o=Qo(e);return GF(u.getOpt(t),e,o.x,o.y,o.width,o.height)},l=e=>{const o=Qo(e);return GF(m.getOpt(t),e,o.right,o.bottom,o.width,o.height)},c=$F((()=>L(o.get(),(e=>i(e)))),r,(t=>{a.get().each((o=>{e.dispatch("TableSelectorChange",{start:t,finish:o})}))})),d=$F((()=>L(n.get(),(e=>l(e)))),a,(t=>{r.get().each((o=>{e.dispatch("TableSelectorChange",{start:o,finish:t})}))})),u=qF(c),m=qF(d),g=ci(u.asSpec()),p=ci(m.asSpec()),h=(t,o,n,s)=>{const r=n(o);jF.snapTo(t,r),((t,o,n,r)=>{const a=o.dom.getBoundingClientRect();Ht(t.element,"display");const i=st(ze(e.getBody())).dom.innerHeight,l=a[s]<0,c=((e,t)=>e[s]>t)(a,i);(l||c)&&Bt(t.element,"display","none")})(t,o)},f=e=>h(g,e,i,"top"),b=e=>h(p,e,l,"bottom");Bo().deviceType.isTouch()&&(e.on("TableSelectionChange",(e=>{s.get()||(Id(t,g),Id(t,p),s.set(!0)),r.set(e.start),a.set(e.finish),e.otherCells.each((t=>{o.set(t.upOrLeftCells),n.set(t.downOrRightCells),f(e.start),b(e.finish)}))})),e.on("ResizeEditor ResizeWindow ScrollContent",(()=>{r.get().each(f),a.get().each(b)})),e.on("TableSelectionClear",(()=>{s.get()&&(Nd(g),Nd(p),s.set(!1)),r.clear(),a.clear()})))},XF=(e,t,o)=>{var n;const s=null!==(n=t.delimiter)&&void 0!==n?n:"\u203a";return{dom:{tag:"div",classes:["tox-statusbar__path"],attributes:{role:"navigation"}},behaviours:Tl([Gp.config({mode:"flow",selector:"div[role=button]"}),Lm.config({disabled:o.isDisabled}),Ox(),pk.config({}),eh.config({}),th("elementPathEvents",[Jr(((t,n)=>{e.shortcuts.add("alt+F11","focus statusbar elementpath",(()=>Gp.focusIn(t))),e.on("NodeChange",(n=>{const r=(t=>{const o=[];let n=t.length;for(;n-- >0;){const r=t[n];if(1===r.nodeType&&"BR"!==(s=r).nodeName&&!s.getAttribute("data-mce-bogus")&&"bookmark"!==s.getAttribute("data-mce-type")){const t=vw(e,r);if(t.isDefaultPrevented()||o.push({name:t.name,element:r}),t.isPropagationStopped())break}}var s;return o})(n.parents),a=r.length>0?j(r,((t,n,r)=>{const a=((t,n,s)=>qh.sketch({dom:{tag:"div",classes:["tox-statusbar__path-item"],attributes:{"data-index":s,"aria-level":s+1}},components:[ri(t)],action:t=>{e.focus(),e.selection.select(n),e.nodeChanged()},buttonBehaviours:Tl([_x(o.isDisabled),Ox()])}))(n.name,n.element,r);return 0===r?t.concat([a]):t.concat([{dom:{tag:"div",classes:["tox-statusbar__path-divider"],attributes:{"aria-hidden":!0}},components:[ri(` ${s} `)]},a])}),[]):[];eh.set(t,a)}))}))])]),components:[]}};var KF;!function(e){e[e.None=0]="None",e[e.Both=1]="Both",e[e.Vertical=2]="Vertical"}(KF||(KF={}));const JF=(e,t,o)=>{const n=ze(e.getContainer()),s=((e,t,o,n,s)=>{const r={height:nI(n+t.top,bb(e),yb(e))};return o===KF.Both&&(r.width=nI(s+t.left,fb(e),vb(e))),r})(e,t,o,jt(n),Zt(n));le(s,((e,t)=>{h(e)&&Bt(n,t,oI(e))})),(e=>{e.dispatch("ResizeEditor")})(e)},ZF=(e,t,o,n)=>{const s=qt(20*o,20*n);return JF(e,s,t),A.some(!0)},QF=(e,t)=>{const o=()=>{const o=[],n=Xb(e),s=Wb(e),r=jb(e)||e.hasPlugin("wordcount");return s&&o.push(XF(e,{},t)),n&&o.push((()=>{const e=Vx("Alt+0");return{dom:{tag:"div",classes:["tox-statusbar__help-text"]},components:[ri(qf.translate(["Press {0} for help",e]))]}})()),r&&o.push((()=>{const o=[];return e.hasPlugin("wordcount")&&o.push(((e,t)=>{const o=(e,o,n)=>eh.set(e,[ri(t.translate(["{0} "+n,o[n]]))]);return qh.sketch({dom:{tag:"button",classes:["tox-statusbar__wordcount"]},components:[],buttonBehaviours:Tl([_x(t.isDisabled),Ox(),pk.config({}),eh.config({}),vu.config({store:{mode:"memory",initialValue:{mode:"words",count:{words:0,characters:0}}}}),th("wordcount-events",[ea((e=>{const t=vu.getValue(e),n="words"===t.mode?"characters":"words";vu.setValue(e,{mode:n,count:t.count}),o(e,t.count,n)})),Jr((t=>{e.on("wordCountUpdate",(e=>{const{mode:n}=vu.getValue(t);vu.setValue(t,{mode:n,count:e.wordCount}),o(t,e.wordCount,n)}))}))])]),eventOrder:{[mr()]:["disabling","alloy.base.behaviour","wordcount-events"]}})})(e,t)),jb(e)&&o.push({dom:{tag:"span",classes:["tox-statusbar__branding"]},components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/powered-by-tiny?utm_campaign=poweredby&utm_source=tiny&utm_medium=referral&utm_content=v6",rel:"noopener",target:"_blank","aria-label":qf.translate(["Powered by {0}","Tiny"])},innerHtml:'<svg width="50px" height="16px" viewBox="0 0 50 16" xmlns="http://www.w3.org/2000/svg">\n  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.143 0c2.608.015 5.186 2.178 5.186 5.331 0 0 .077 3.812-.084 4.87-.361 2.41-2.164 4.074-4.65 4.496-1.453.284-2.523.49-3.212.623-.373.071-.634.122-.785.152-.184.038-.997.145-1.35.145-2.732 0-5.21-2.04-5.248-5.33 0 0 0-3.514.03-4.442.093-2.4 1.758-4.342 4.926-4.963 0 0 3.875-.752 4.036-.782.368-.07.775-.1 1.15-.1Zm1.826 2.8L5.83 3.989v2.393l-2.455.475v5.968l6.137-1.189V9.243l2.456-.476V2.8ZM5.83 6.382l3.682-.713v3.574l-3.682.713V6.382Zm27.173-1.64-.084-1.066h-2.226v9.132h2.456V7.743c-.008-1.151.998-2.064 2.149-2.072 1.15-.008 1.987.92 1.995 2.072v5.065h2.455V7.359c-.015-2.18-1.657-3.929-3.837-3.913a3.993 3.993 0 0 0-2.908 1.296Zm-6.3-4.266L29.16 0v2.387l-2.456.475V.476Zm0 3.2v9.132h2.456V3.676h-2.456Zm18.179 11.787L49.11 3.676H46.58l-1.612 4.527-.46 1.382-.384-1.382-1.611-4.527H39.98l3.3 9.132L42.15 16l2.732-.537ZM22.867 9.738c0 .752.568 1.075.921 1.075.353 0 .668-.047.998-.154l.537 1.765c-.23.154-.92.537-2.225.537-1.305 0-2.655-.997-2.686-2.686a136.877 136.877 0 0 1 0-4.374H18.8V3.676h1.612v-1.98l2.455-.476v2.456h2.302V5.9h-2.302v3.837Z"/>\n</svg>\n'.trim()},behaviours:Tl([ah.config({})])}]}),{dom:{tag:"div",classes:["tox-statusbar__right-container"]},components:o}})()),o.length>0?[{dom:{tag:"div",classes:["tox-statusbar__text-container",...(()=>{const e="tox-statusbar__text-container--flex-start",t="tox-statusbar__text-container--flex-end";if(n){const o="tox-statusbar__text-container-3-cols";return r||s?r&&!s?[o,t]:[o,e]:[o,"tox-statusbar__text-container--space-around"]}return[r&&!s?t:e]})()]},components:o}]:[]};return{dom:{tag:"div",classes:["tox-statusbar"]},components:(()=>{const n=o(),s=((e,t)=>{const o=(e=>{const t=Gb(e);return!1===t?KF.None:"both"===t?KF.Both:KF.Vertical})(e);if(o===KF.None)return A.none();const n=o===KF.Both?"Press the arrow keys to resize the editor.":"Press the Up and Down arrow keys to resize the editor.";return A.some(ob("resize-handle",{tag:"div",classes:["tox-statusbar__resize-handle"],attributes:{title:t.translate("Resize"),"aria-label":t.translate(n)},behaviours:[jF.config({mode:"mouse",repositionTarget:!1,onDrag:(t,n,s)=>JF(e,s,o),blockerClass:"tox-blocker"}),Gp.config({mode:"special",onLeft:()=>ZF(e,o,-1,0),onRight:()=>ZF(e,o,1,0),onUp:()=>ZF(e,o,0,-1),onDown:()=>ZF(e,o,0,1)}),pk.config({}),ah.config({})]},t.icons))})(e,t);return n.concat(s.toArray())})()}},eR=(e,t)=>t.get().getOrDie(`UI for ${e} has not been rendered`),tR=(e,t)=>{const o=e.inline,n=o?cI:eI,s=dv(e)?uM:EA,r=(()=>{const e=nc(),t=nc(),o=nc();return{dialogUi:e,popupUi:t,mainUi:o,getUiMotherships:()=>{const o=e.get().map((e=>e.mothership)),n=t.get().map((e=>e.mothership));return o.fold((()=>n.toArray()),(e=>n.fold((()=>[e]),(t=>Qe(e.element,t.element)?[e]:[e,t]))))},lazyGetInOuterOrDie:(e,t)=>()=>o.get().bind((e=>t(e.outerContainer))).getOrDie(`Could not find ${e} element in OuterContainer`)}})(),a=nc(),i=nc(),l=nc(),c=Bo().deviceType.isTouch()?["tox-platform-touch"]:[],d=rv(e),u=Ob(e),m=Xh({dom:{tag:"div",classes:["tox-anchorbar"]}}),g=Xh({dom:{tag:"div",classes:["tox-bottom-anchorbar"]}}),p=()=>r.mainUi.get().map((e=>e.outerContainer)).bind(UD.getHeader),h=r.lazyGetInOuterOrDie("anchor bar",m.getOpt),f=r.lazyGetInOuterOrDie("bottom anchor bar",g.getOpt),b=r.lazyGetInOuterOrDie("toolbar",UD.getToolbar),v=r.lazyGetInOuterOrDie("throbber",UD.getThrobber),y=((e,t,o,n)=>{const s=As(!1),r=(e=>{const t=As(rv(e)?"bottom":"top");return{isPositionedAtTop:()=>"top"===t.get(),getDockingMode:t.get,setDockingMode:t.set}})(t),a={icons:()=>t.ui.registry.getAll().icons,menuItems:()=>t.ui.registry.getAll().menuItems,translate:qf.translate,isDisabled:()=>t.mode.isReadOnly()||!t.ui.isEnabled(),getOption:t.options.get},i=pA(t),l=(e=>{const t=t=>()=>e.formatter.match(t),o=t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},n=As([]),s=As([]),r=As(!1);return e.on("PreInit",(s=>{const r=PE(e),a=WE(e,r,t,o);n.set(a)})),e.on("addStyleModifications",(n=>{const a=WE(e,n.items,t,o);s.set(a),r.set(n.replace)})),{getData:()=>{const e=r.get()?[]:n.get(),t=s.get();return e.concat(t)}}})(t),c=(e=>({colorPicker:BE(e),hasCustomColors:IE(e),getColors:FE(e),getColorCols:RE(e)}))(t),d=(e=>({isDraggableModal:NE(e)}))(t),u={shared:{providers:a,anchors:DE(t,o,n,r.isPositionedAtTop),header:r},urlinput:i,styles:l,colorinput:c,dialog:d,isContextMenuOpen:()=>s.get(),setContextMenuState:e=>s.set(e)},m={...u,shared:{...u.shared,interpreter:e=>rE(e,{},m),getSink:e.popup}},g={...u,shared:{...u.shared,interpreter:e=>rE(e,{},g),getSink:e.dialog}};return{popup:m,dialog:g}})({popup:()=>rn.fromOption(r.popupUi.get().map((e=>e.sink)),"(popup) UI has not been rendered"),dialog:()=>rn.fromOption(r.dialogUi.get().map((e=>e.sink)),"UI has not been rendered")},e,h,f),x=()=>{const t=(()=>{const t={attributes:{[kc]:d?Sc.BottomToTop:Sc.TopToBottom}},o=UD.parts.menubar({dom:{tag:"div",classes:["tox-menubar"]},backstage:y.popup,onEscape:()=>{e.focus()}}),n=UD.parts.toolbar({dom:{tag:"div",classes:["tox-toolbar"]},getSink:y.popup.shared.getSink,providers:y.popup.shared.providers,onEscape:()=>{e.focus()},onToolbarToggled:t=>{((e,t)=>{e.dispatch("ToggleToolbarDrawer",{state:t})})(e,t)},type:u,lazyToolbar:b,lazyHeader:()=>p().getOrDie("Could not find header element"),...t}),s=UD.parts["multiple-toolbar"]({dom:{tag:"div",classes:["tox-toolbar-overlord"]},providers:y.popup.shared.providers,onEscape:()=>{e.focus()},type:u}),r=sv(e),a=ov(e),i=Zb(e),l=Yb(e),c=UD.parts.promotion({dom:{tag:"div",classes:["tox-promotion"]}}),g=r||a||i,h=l?[c,o]:[o];return UD.parts.header({dom:{tag:"div",classes:["tox-editor-header"].concat(g?[]:["tox-editor-header--empty"]),...t},components:q([i?h:[],r?[s]:a?[n]:[],iv(e)?[]:[m.asSpec()]]),sticky:dv(e),editor:e,sharedBackstage:y.popup.shared})})(),n={dom:{tag:"div",classes:["tox-sidebar-wrap"]},components:[UD.parts.socket({dom:{tag:"div",classes:["tox-edit-area"]}}),UD.parts.sidebar({dom:{tag:"div",classes:["tox-sidebar"]}})]},s=UD.parts.throbber({dom:{tag:"div",classes:["tox-throbber"]},backstage:y.popup}),r=UD.parts.viewWrapper({backstage:y.popup}),i=Ub(e)&&!o?A.some(QF(e,y.popup.shared.providers)):A.none(),l=q([d?[]:[t],o?[]:[n],d?[t]:[]]),h=UD.parts.editorContainer({components:q([l,o?[]:[g.asSpec(),...i.toArray()]])}),f=cv(e),v={role:"application",...qf.isRtl()?{dir:"rtl"}:{},...f?{"aria-hidden":"true"}:{}},x=ci(UD.sketch({dom:{tag:"div",classes:["tox","tox-tinymce"].concat(o?["tox-tinymce-inline"]:[]).concat(d?["tox-tinymce--toolbar-bottom"]:[]).concat(c),styles:{visibility:"hidden",...f?{opacity:"0",border:"0"}:{}},attributes:v},components:[h,...o?[]:[r],s],behaviours:Tl([Ox(),Lm.config({disableClass:"tox-tinymce--disabled"}),Gp.config({mode:"cyclic",selector:".tox-menubar, .tox-toolbar, .tox-toolbar__primary, .tox-toolbar__overflow--open, .tox-sidebar__overflow--open, .tox-statusbar__path, .tox-statusbar__wordcount, .tox-statusbar__branding a, .tox-statusbar__resize-handle"})])})),w=lk(x);return a.set(w),{mothership:w,outerContainer:x}},w=t=>{const o=oI((e=>{const t=(e=>{const t=pb(e),o=bb(e),n=yb(e);return tI(t).map((e=>nI(e,o,n)))})(e);return t.getOr(pb(e))})(e)),n=oI((e=>sI(e).getOr(hb(e)))(e));return e.inline||(Lt("div","width",n)&&Bt(t.element,"width",n),Lt("div","height",o)?Bt(t.element,"height",o):Bt(t.element,"height","400px")),o};return{popups:{backstage:y.popup,getMothership:()=>eR("popups",l)},dialogs:{backstage:y.dialog,getMothership:()=>eR("dialogs",i)},renderUI:()=>{const o=x(),a=(()=>{const t=lv(e),o=Qe(wt(),t)&&"grid"===Rt(t,"display"),n={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-tinymce-aux"].concat(c),attributes:{...qf.isRtl()?{dir:"rtl"}:{}}},behaviours:Tl([_d.config({useFixed:()=>s.isDocked(p)})])},r={dom:{styles:{width:document.body.clientWidth+"px"}},events:Hr([Wr(Sr(),(e=>{Bt(e.element,"width",document.body.clientWidth+"px")}))])},a=ci(bn(n,o?r:{})),l=lk(a);return i.set(l),{sink:a,mothership:l}})(),d=uv(e)?(()=>{const e={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-silver-popup-sink","tox-tinymce-aux"].concat(c),attributes:{...qf.isRtl()?{dir:"rtl"}:{}}},behaviours:Tl([_d.config({useFixed:()=>s.isDocked(p),getBounds:()=>t.getPopupSinkBounds()})])},o=ci(e),n=lk(o);return l.set(n),{sink:o,mothership:n}})():(e=>(l.set(e.mothership),e))(a);r.dialogUi.set(a),r.popupUi.set(d),r.mainUi.set(o);return(t=>{const{mainUi:o,popupUi:r,uiMotherships:a}=t;ce(_b(e),((t,o)=>{e.ui.registry.addGroupToolbarButton(o,t)}));const{buttons:i,menuItems:l,contextToolbars:c,sidebars:d,views:m}=e.ui.registry.getAll(),g=nv(e),h={menuItems:l,menus:mv(e),menubar:Bb(e),toolbar:g.getOrThunk((()=>Ib(e))),allowToolbarGroups:u===rb.floating,buttons:i,sidebar:d,views:m};var f;f=o.outerContainer,e.addShortcut("alt+F9","focus menubar",(()=>{UD.focusMenubar(f)})),e.addShortcut("alt+F10","focus toolbar",(()=>{UD.focusToolbar(f)})),e.addCommand("ToggleToolbarDrawer",((e,t)=>{(null==t?void 0:t.skipFocus)?UD.toggleToolbarDrawerWithoutFocusing(f):UD.toggleToolbarDrawer(f)})),e.addQueryStateHandler("ToggleToolbarDrawer",(()=>UD.isToolbarDrawerToggled(f))),((e,t,o)=>{const n=(e,n)=>{H([t,...o],(t=>{t.broadcastEvent(e,n)}))},s=(e,n)=>{H([t,...o],(t=>{t.broadcastOn([e],n)}))},r=e=>s(Qd(),{target:e.target}),a=qo(),i=rc(a,"touchstart",r),l=rc(a,"touchmove",(e=>n(yr(),e))),c=rc(a,"touchend",(e=>n(xr(),e))),d=rc(a,"mousedown",r),u=rc(a,"mouseup",(e=>{0===e.raw.button&&s(tu(),{target:e.target})})),m=e=>s(Qd(),{target:ze(e.target)}),g=e=>{0===e.button&&s(tu(),{target:ze(e.target)})},p=()=>{H(e.editorManager.get(),(t=>{e!==t&&t.dispatch("DismissPopups",{relatedTarget:e})}))},h=e=>n(wr(),ic(e)),f=e=>{s(eu(),{}),n(Sr(),ic(e))},b=ft(ze(e.getElement())),v=ac(b,"scroll",(o=>{requestAnimationFrame((()=>{if(null!=e.getContainer()){const s=XS(e,t.element).map((e=>[e.element,...e.others])).getOr([]);N(s,(e=>Qe(e,o.target)))&&(e.dispatch("ElementScroll",{target:o.target.dom}),n(Ar(),o))}}))})),y=()=>s(eu(),{}),x=t=>{t.state&&s(Qd(),{target:ze(e.getContainer())})},w=e=>{s(Qd(),{target:ze(e.relatedTarget.getContainer())})};e.on("PostRender",(()=>{e.on("click",m),e.on("tap",m),e.on("mouseup",g),e.on("mousedown",p),e.on("ScrollWindow",h),e.on("ResizeWindow",f),e.on("ResizeEditor",y),e.on("AfterProgressState",x),e.on("DismissPopups",w)})),e.on("remove",(()=>{e.off("click",m),e.off("tap",m),e.off("mouseup",g),e.off("mousedown",p),e.off("ScrollWindow",h),e.off("ResizeWindow",f),e.off("ResizeEditor",y),e.off("AfterProgressState",x),e.off("DismissPopups",w),d.unbind(),i.unbind(),l.unbind(),c.unbind(),u.unbind(),v.unbind()})),e.on("detach",(()=>{H([t,...o],Pd),H([t,...o],(e=>e.destroy()))}))})(e,o.mothership,a),s.setup(e,y.popup.shared,p),VI(e,y.popup),sF(e,y.popup.shared.getSink,y.popup),(e=>{const{sidebars:t}=e.ui.registry.getAll();H(ae(t),(o=>{const n=t[o],s=()=>xe(A.from(e.queryCommandValue("ToggleSidebar")),o);e.ui.registry.addToggleButton(o,{icon:n.icon,tooltip:n.tooltip,onAction:t=>{e.execCommand("ToggleSidebar",!1,o),t.setActive(s())},onSetup:t=>{t.setActive(s());const o=()=>t.setActive(s());return e.on("ToggleSidebar",o),()=>{e.off("ToggleSidebar",o)}}})}))})(e),NM(e,v,y.popup.shared),EI(e,c,r.sink,{backstage:y.popup}),YF(e,r.sink);const b={targetNode:e.getElement(),height:w(o.outerContainer)};return n.render(e,t,h,y.popup,b)})({popupUi:d,dialogUi:a,mainUi:o,uiMotherships:r.getUiMotherships()})}}},oR=x([ns("lazySink"),ms("dragBlockClass"),_s("getBounds",tn),xs("useTabstopAt",E),xs("firstTabstop",0),xs("eventOrder",{}),yu("modalBehaviours",[Gp]),Ni("onExecute"),zi("onEscape")]),nR={sketch:w},sR=x([Yu({name:"draghandle",overrides:(e,t)=>({behaviours:Tl([jF.config({mode:"mouse",getTarget:e=>fi(e,'[role="dialog"]').getOr(e),blockerClass:e.dragBlockClass.getOrDie(new Error("The drag blocker class was not specified for a dialog with a drag handle: \n"+JSON.stringify(t,null,2)).message),getBounds:e.getDragBounds})])})}),$u({schema:[ns("dom")],name:"title"}),$u({factory:nR,schema:[ns("dom")],name:"close"}),$u({factory:nR,schema:[ns("dom")],name:"body"}),Yu({factory:nR,schema:[ns("dom")],name:"footer"}),qu({factory:{sketch:(e,t)=>({...e,dom:t.dom,components:t.components})},schema:[xs("dom",{tag:"div",styles:{position:"fixed",left:"0px",top:"0px",right:"0px",bottom:"0px"}}),xs("components",[])],name:"blocker"})]),rR=wm({name:"ModalDialog",configFields:oR(),partFields:sR(),factory:(e,t,o,n)=>{const s=nc(),r=ca("modal-events"),a={...e.eventOrder,[kr()]:[r].concat(e.eventOrder["alloy.system.attached"]||[])};return{uid:e.uid,dom:e.dom,components:t,apis:{show:t=>{s.set(t);const o=e.lazySink(t).getOrDie(),r=n.blocker(),a=o.getSystem().build({...r,components:r.components.concat([di(t)]),behaviours:Tl([ah.config({}),th("dialog-blocker-events",[Kr(Xs(),(()=>{FM.isBlocked(t)||Gp.focusIn(t)}))])])});Id(o,a),Gp.focusIn(t)},hide:e=>{s.clear(),rt(e.element).each((t=>{e.getSystem().getByDom(t).each((e=>{Nd(e)}))}))},getBody:t=>im(t,e,"body"),getFooter:t=>am(t,e,"footer"),setIdle:e=>{FM.unblock(e)},setBusy:(e,t)=>{FM.block(e,t)}},eventOrder:a,domModification:{attributes:{role:"dialog","aria-modal":"true"}},behaviours:wu(e.modalBehaviours,[eh.config({}),Gp.config({mode:"cyclic",onEnter:e.onExecute,onEscape:e.onEscape,useTabstopAt:e.useTabstopAt,firstTabstop:e.firstTabstop}),FM.config({getRoot:s.get}),th(r,[Jr((t=>{((e,t)=>{const o=Tt(e,"id").fold((()=>{const e=ca("dialog-label");return Ct(t,"id",e),e}),w);Ct(e,"aria-labelledby",o)})(t.element,im(t,e,"title").element)}))])])}},apis:{show:(e,t)=>{e.show(t)},hide:(e,t)=>{e.hide(t)},getBody:(e,t)=>e.getBody(t),getFooter:(e,t)=>e.getFooter(t),setBusy:(e,t,o)=>{e.setBusy(t,o)},setIdle:(e,t)=>{e.setIdle(t)}}}),aR=Bn([sy,ry].concat(ex)),iR=Pn,lR=[Dy("button"),vy,Cs("align","end",["start","end"]),_y,Oy,fs("buttonType",["primary","secondary"])],cR=[...lR,iy],dR=[is("type",["submit","cancel","custom"]),...cR],uR=[is("type",["menu"]),by,yy,vy,us("items",aR),...lR],mR=[...lR,is("type",["togglebutton"]),as("tooltip"),vy,by,Os("active",!1)],gR=Zn("type",{submit:dR,cancel:dR,custom:dR,menu:uR,togglebutton:mR}),pR=[sy,iy,is("level",["info","warn","error","success"]),cy,xs("url","")],hR=Bn(pR),fR=[sy,iy,Oy,Dy("button"),vy,Cy,fs("buttonType",["primary","secondary","toolbar"]),_y],bR=Bn(fR),vR=[sy,ry],yR=vR.concat([xy]),xR=vR.concat([ay,Oy]),wR=Bn(xR),SR=Pn,kR=yR.concat([Ty("auto")]),CR=Bn(kR),OR=Nn([dy,iy,cy]),_R=yR.concat([ks("storageKey","default")]),TR=Bn(_R),ER=Hn,AR=Bn(yR),MR=Hn,DR=vR.concat([ks("tag","textarea"),as("scriptId"),as("scriptUrl"),ws("settings",void 0,jn)]),BR=vR.concat([ks("tag","textarea"),ls("init")]),IR=$n((e=>Yn("customeditor.old",Dn(BR),e).orThunk((()=>Yn("customeditor.new",Dn(DR),e))))),FR=Hn,RR=Bn(yR),NR=In(_n),VR=e=>[sy,rs("columns"),e],zR=[sy,as("html"),Cs("presets","presentation",["presentation","document"])],LR=Bn(zR),HR=yR.concat([Os("border",!1),Os("sandboxed",!0),Os("streamContent",!1),Os("transparent",!0)]),PR=Bn(HR),UR=Hn,WR=Bn(vR.concat([hs("height")])),jR=Bn([as("url"),ps("zoom"),ps("cachedWidth"),ps("cachedHeight")]),GR=yR.concat([hs("inputMode"),hs("placeholder"),Os("maximized",!1),Oy]),$R=Bn(GR),qR=Hn,YR=e=>[sy,ay,e,Cs("align","start",["start","center","end"])],XR=[iy,dy],KR=[iy,us("items",Qn(0,(()=>JR)))],JR=Fn([Bn(XR),Bn(KR)]),ZR=yR.concat([us("items",JR),Oy]),QR=Bn(ZR),eN=Hn,tN=yR.concat([ds("items",[iy,dy]),Ss("size",1),Oy]),oN=Bn(tN),nN=Hn,sN=yR.concat([Os("constrain",!0),Oy]),rN=Bn(sN),aN=Bn([as("width"),as("height")]),iN=vR.concat([ay,Ss("min",0),Ss("max",0)]),lN=Bn(iN),cN=Ln,dN=[sy,us("header",Hn),us("cells",In(Hn))],uN=Bn(dN),mN=yR.concat([hs("placeholder"),Os("maximized",!1),Oy]),gN=Bn(mN),pN=Hn,hN=[is("type",["directory","leaf"]),ly,as("id"),gs("menu",pM)],fN=Bn(hN),bN=hN.concat([us("children",Qn(0,(()=>Gn("type",{directory:vN,leaf:fN}))))]),vN=Bn(bN),yN=Gn("type",{directory:vN,leaf:fN}),xN=[sy,us("items",yN),bs("onLeafAction"),bs("onToggleExpand"),Ts("defaultExpandedIds",[],Hn),hs("defaultSelectedId")],wN=Bn(xN),SN=yR.concat([Cs("filetype","file",["image","media","file"]),Oy,hs("picker_text")]),kN=Bn(SN),CN=Bn([dy,Ey]),ON=e=>es("items","items",{tag:"required",process:{}},In($n((t=>Yn(`Checking item of ${e}`,_N,t).fold((e=>rn.error(Jn(e))),(e=>rn.value(e))))))),_N=An((()=>{return Gn("type",{alertbanner:hR,bar:Bn((e=ON("bar"),[sy,e])),button:bR,checkbox:wR,colorinput:TR,colorpicker:AR,dropzone:RR,grid:Bn(VR(ON("grid"))),iframe:PR,input:$R,listbox:QR,selectbox:oN,sizeinput:rN,slider:lN,textarea:gN,urlinput:kN,customeditor:IR,htmlpanel:LR,imagepreview:WR,collection:CR,label:Bn(YR(ON("label"))),table:uN,tree:wN,panel:EN});var e})),TN=[sy,xs("classes",[]),us("items",_N)],EN=Bn(TN),AN=[Dy("tab"),ly,us("items",_N)],MN=[sy,ds("tabs",AN)],DN=Bn(MN),BN=cR,IN=gR,FN=Bn([as("title"),ss("body",Gn("type",{panel:EN,tabpanel:DN})),ks("size","normal"),Ts("buttons",[],IN),xs("initialData",{}),_s("onAction",b),_s("onChange",b),_s("onSubmit",b),_s("onClose",b),_s("onCancel",b),_s("onTabChange",b)]),RN=Bn([is("type",["cancel","custom"]),...BN]),NN=Bn([as("title"),as("url"),ps("height"),ps("width"),vs("buttons",RN),_s("onAction",b),_s("onCancel",b),_s("onClose",b),_s("onMessage",b)]),VN=e=>a(e)?[e].concat(Y(fe(e),VN)):l(e)?Y(e,VN):[],zN=e=>r(e.type)&&r(e.name),LN={checkbox:SR,colorinput:ER,colorpicker:MR,dropzone:NR,input:qR,iframe:UR,imagepreview:jR,selectbox:nN,sizeinput:aN,slider:cN,listbox:eN,size:aN,textarea:pN,urlinput:CN,customeditor:FR,collection:OR,togglemenuitem:iR},HN=e=>{const t=(e=>U(VN(e),zN))(e),o=Y(t,(e=>(e=>A.from(LN[e.type]))(e).fold((()=>[]),(t=>[ss(e.name,t)]))));return Bn(o)},PN=e=>{var t;return{internalDialog:Xn(Yn("dialog",FN,e)),dataValidator:HN(e),initialData:null!==(t=e.initialData)&&void 0!==t?t:{}}},UN={open:(e,t)=>{const o=PN(t);return e(o.internalDialog,o.initialData,o.dataValidator)},openUrl:(e,t)=>e(Xn(Yn("dialog",NN,t))),redial:e=>PN(e)};var WN=Object.freeze({__proto__:null,events:(e,t)=>{const o=(o,n)=>{e.updateState.each((e=>{const s=e(o,n);t.set(s)})),e.renderComponents.each((s=>{const r=s(n,t.get());(e.reuseDom?qp:$p)(o,r)}))};return Hr([Wr(ur(),((t,n)=>{const s=n;if(!s.universal){const n=e.channel;R(s.channels,n)&&o(t,s.data)}})),Jr(((t,n)=>{e.initialData.each((e=>{o(t,e)}))}))])}}),jN=Object.freeze({__proto__:null,getState:(e,t,o)=>o}),GN=[ns("channel"),ms("renderComponents"),ms("updateState"),ms("initialData"),Os("reuseDom",!0)];const $N=Al({fields:GN,name:"reflecting",active:WN,apis:jN,state:Object.freeze({__proto__:null,init:()=>{const e=As(A.none());return{readState:()=>e.get().getOr("none"),get:e.get,set:e.set,clear:()=>e.set(A.none())}}})}),qN=e=>{const t=[],o={};return le(e,((e,n)=>{e.fold((()=>{t.push(n)}),(e=>{o[n]=e}))})),t.length>0?rn.error(t):rn.value(o)},YN=(e,t,o)=>{const n=Xh(IO.sketch((n=>({dom:{tag:"div",classes:["tox-form"].concat(e.classes)},components:L(e.items,(e=>nE(n,e,t,o)))}))));return{dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[n.asSpec()]}],behaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)}),(s=n,Om.config({find:s.getOpt})),WO(n,{postprocess:e=>qN(e).fold((e=>(console.error(e),{})),w)}),th("dialog-body-panel",[Wr(Xs(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:A.some(t.event.target)})}))])])};var s},XN=xm({name:"TabButton",configFields:[xs("uid",void 0),ns("value"),es("dom","dom",wn((()=>({attributes:{role:"tab",id:ca("aria"),"aria-selected":"false"}}))),Vn()),ms("action"),xs("domModification",{}),yu("tabButtonBehaviours",[ah,Gp,vu]),ns("view")],factory:(e,t)=>({uid:e.uid,dom:e.dom,components:e.components,events:fh(e.action),behaviours:wu(e.tabButtonBehaviours,[ah.config({}),Gp.config({mode:"execution",useSpace:!0,useEnter:!0}),vu.config({store:{mode:"memory",initialValue:e.value}})]),domModification:e.domModification})}),KN=x([ns("tabs"),ns("dom"),xs("clickToDismiss",!1),yu("tabbarBehaviours",[Xm,Gp]),Ii(["tabClass","selectedClass"])]),JN=Xu({factory:XN,name:"tabs",unit:"tab",overrides:e=>{const t=(e,t)=>{Xm.dehighlight(e,t),Rr(e,Dr(),{tabbar:e,button:t})},o=(e,t)=>{Xm.highlight(e,t),Rr(e,Mr(),{tabbar:e,button:t})};return{action:n=>{const s=n.getSystem().getByUid(e.uid).getOrDie(),r=Xm.isHighlighted(s,n);(r&&e.clickToDismiss?t:r?b:o)(s,n)},domModification:{classes:[e.markers.tabClass]}}}}),ZN=x([JN]),QN=wm({name:"Tabbar",configFields:KN(),partFields:ZN(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,"debug.sketcher":"Tabbar",domModification:{attributes:{role:"tablist"}},behaviours:wu(e.tabbarBehaviours,[Xm.config({highlightClass:e.markers.selectedClass,itemClass:e.markers.tabClass,onHighlight:(e,t)=>{Ct(t.element,"aria-selected","true")},onDehighlight:(e,t)=>{Ct(t.element,"aria-selected","false")}}),Gp.config({mode:"flow",getInitial:e=>Xm.getHighlighted(e).map((e=>e.element)),selector:"."+e.markers.tabClass,executeOnMove:!0})])})}),eV=xm({name:"Tabview",configFields:[yu("tabviewBehaviours",[eh])],factory:(e,t)=>({uid:e.uid,dom:e.dom,behaviours:wu(e.tabviewBehaviours,[eh.config({})]),domModification:{attributes:{role:"tabpanel"}}})}),tV=x([xs("selectFirst",!0),Ri("onChangeTab"),Ri("onDismissTab"),xs("tabs",[]),yu("tabSectionBehaviours",[])]),oV=$u({factory:QN,schema:[ns("dom"),cs("markers",[ns("tabClass"),ns("selectedClass")])],name:"tabbar",defaults:e=>({tabs:e.tabs})}),nV=$u({factory:eV,name:"tabview"}),sV=x([oV,nV]),rV=wm({name:"TabSection",configFields:tV(),partFields:sV(),factory:(e,t,o,n)=>{const s=(t,o)=>{am(t,e,"tabbar").each((e=>{o(e).each(Nr)}))};return{uid:e.uid,dom:e.dom,components:t,behaviours:xu(e.tabSectionBehaviours),events:Hr(q([e.selectFirst?[Jr(((e,t)=>{s(e,Xm.getFirst)}))]:[],[Wr(Mr(),((t,o)=>{(t=>{const o=vu.getValue(t);am(t,e,"tabview").each((n=>{G(e.tabs,(e=>e.value===o)).each((o=>{const s=o.view();Tt(t.element,"id").each((e=>{Ct(n.element,"aria-labelledby",e)})),eh.set(n,s),e.onChangeTab(n,t,s)}))}))})(o.event.button)})),Wr(Dr(),((t,o)=>{const n=o.event.button;e.onDismissTab(t,n)}))]])),apis:{getViewItems:t=>am(t,e,"tabview").map((e=>eh.contents(e))).getOr([]),showTab:(e,t)=>{s(e,(e=>{const o=Xm.getCandidates(e);return G(o,(e=>vu.getValue(e)===t)).filter((t=>!Xm.isHighlighted(e,t)))}))}}}},apis:{getViewItems:(e,t)=>e.getViewItems(t),showTab:(e,t,o)=>{e.showTab(t,o)}}}),aV=(e,t)=>{Bt(e,"height",t+"px"),Bt(e,"flex-basis",t+"px")},iV=(e,t,o)=>{fi(e,'[role="dialog"]').each((e=>{vi(e,'[role="tablist"]').each((n=>{o.get().map((o=>(Bt(t,"height","0"),Bt(t,"flex-basis","0"),Math.min(o,((e,t,o)=>{const n=nt(e).dom,s=fi(e,".tox-dialog-wrap").getOr(e);let r;r="fixed"===Rt(s,"position")?Math.max(n.clientHeight,window.innerHeight):Math.max(n.offsetHeight,n.scrollHeight);const a=jt(t),i=t.dom.offsetLeft>=o.dom.offsetLeft+Zt(o)?Math.max(jt(o),a):a,l=parseInt(Rt(e,"margin-top"),10)||0,c=parseInt(Rt(e,"margin-bottom"),10)||0;return r-(jt(e)+l+c-i)})(e,t,n))))).each((e=>{aV(t,e)}))}))}))},lV=e=>vi(e,'[role="tabpanel"]'),cV="send-data-to-section",dV="send-data-to-view",uV=(e,t,o)=>{const n=As({}),s=e=>{const t=vu.getValue(e),o=qN(t).getOr({}),s=n.get(),r=bn(s,o);n.set(r)},r=e=>{const t=n.get();vu.setValue(e,t)},a=As(null),i=L(e.tabs,(e=>({value:e.name,dom:{tag:"div",classes:["tox-dialog__body-nav-item"]},components:[ri(o.shared.providers.translate(e.title))],view:()=>[IO.sketch((n=>({dom:{tag:"div",classes:["tox-form"]},components:L(e.items,(e=>nE(n,e,t,o))),formBehaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)}),th("TabView.form.events",[Jr(r),Zr(s)]),Il.config({channels:Bs([{key:cV,value:{onReceive:s}},{key:dV,value:{onReceive:r}}])})])})))]}))),l=(e=>{const t=nc(),o=[Jr((o=>{const n=o.element;lV(n).each((s=>{Bt(s,"visibility","hidden"),o.getSystem().getByDom(s).toOptional().each((o=>{const n=((e,t,o)=>L(e,((n,s)=>{eh.set(o,e[s].view());const r=t.dom.getBoundingClientRect();return eh.set(o,[]),r.height})))(e,s,o),r=(e=>oe(ee(e,((e,t)=>e>t?-1:e<t?1:0))))(n);r.fold(t.clear,t.set)})),iV(n,s,t),Ht(s,"visibility"),((e,t)=>{oe(e).each((e=>rV.showTab(t,e.value)))})(e,o),requestAnimationFrame((()=>{iV(n,s,t)}))}))})),Wr(Sr(),(e=>{const o=e.element;lV(o).each((e=>{iV(o,e,t)}))})),Wr(Ek,((e,o)=>{const n=e.element;lV(n).each((e=>{const o=zl(ft(e));Bt(e,"visibility","hidden");const s=Vt(e,"height").map((e=>parseInt(e,10)));Ht(e,"height"),Ht(e,"flex-basis");const r=e.dom.getBoundingClientRect().height;s.forall((e=>r>e))?(t.set(r),iV(n,e,t)):s.each((t=>{aV(e,t)})),Ht(e,"visibility"),o.each(Rl)}))}))];return{extraEvents:o,selectFirst:!1}})(i);return rV.sketch({dom:{tag:"div",classes:["tox-dialog__body"]},onChangeTab:(e,t,o)=>{const n=vu.getValue(t);Rr(e,Tk,{name:n,oldName:a.get()}),a.set(n)},tabs:i,components:[rV.parts.tabbar({dom:{tag:"div",classes:["tox-dialog__body-nav"]},components:[QN.parts.tabs({})],markers:{tabClass:"tox-tab",selectedClass:"tox-dialog__body-nav-item--active"},tabbarBehaviours:Tl([pk.config({})])}),rV.parts.tabview({dom:{tag:"div",classes:["tox-dialog__body-content"]}})],selectFirst:l.selectFirst,tabSectionBehaviours:Tl([th("tabpanel",l.extraEvents),Gp.config({mode:"acyclic"}),Om.config({find:e=>oe(rV.getViewItems(e))}),jO(A.none(),(e=>(e.getSystem().broadcastOn([cV],{}),n.get())),((e,t)=>{n.set(t),e.getSystem().broadcastOn([dV],{})}))])})},mV=(e,t,o,n,s)=>({dom:{tag:"div",classes:["tox-dialog__content-js"],attributes:{...o.map((e=>({id:e}))).getOr({}),...s?{"aria-live":"polite"}:{}}},components:[],behaviours:Tl([PO(0),$N.config({channel:`${a_}-${t}`,updateState:(e,t)=>A.some({isTabPanel:()=>"tabpanel"===t.body.type}),renderComponents:e=>{const t=e.body;return"tabpanel"===t.type?[uV(t,e.initialData,n)]:[YN(t,e.initialData,n)]},initialData:e})])}),gV=cb.deviceType.isTouch(),pV=(e,t)=>({dom:{tag:"div",styles:{display:"none"},classes:["tox-dialog__header"]},components:[e,t]}),hV=(e,t)=>rR.parts.close(qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":t.translate("Close")}},action:e,buttonBehaviours:Tl([pk.config({})])})),fV=()=>rR.parts.title({dom:{tag:"div",classes:["tox-dialog__title"],innerHtml:"",styles:{display:"none"}}}),bV=(e,t)=>rR.parts.body({dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[{dom:Yh(`<p>${$f(t.translate(e))}</p>`)}]}]}),vV=e=>rR.parts.footer({dom:{tag:"div",classes:["tox-dialog__footer"]},components:e}),yV=(e,t)=>[ik.sketch({dom:{tag:"div",classes:["tox-dialog__footer-start"]},components:e}),ik.sketch({dom:{tag:"div",classes:["tox-dialog__footer-end"]},components:t})],xV=e=>{const t="tox-dialog",o=t+"-wrap",n=o+"__backdrop",s=t+"__disable-scroll";return rR.sketch({lazySink:e.lazySink,onEscape:t=>(e.onEscape(t),A.some(!0)),useTabstopAt:e=>!n_(e),firstTabstop:e.firstTabstop,dom:{tag:"div",classes:[t].concat(e.extraClasses),styles:{position:"relative",...e.extraStyles}},components:[e.header,e.body,...e.footer.toArray()],parts:{blocker:{dom:Yh(`<div class="${o}"></div>`),components:[{dom:{tag:"div",classes:gV?[n,n+"--opaque"]:[n]}}]}},dragBlockClass:o,modalBehaviours:Tl([ah.config({}),th("dialog-events",e.dialogEvents.concat([Kr(Xs(),((e,t)=>{FM.isBlocked(e)||Gp.focusIn(e)})),Wr(Tr(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:t.event.newFocus})}))])),th("scroll-lock",[Jr((()=>{Wa(wt(),s)})),Zr((()=>{Ga(wt(),s)}))]),...e.extraBehaviours]),eventOrder:{[mr()]:["dialog-events"],[kr()]:["scroll-lock","dialog-events","alloy.base.behaviour"],[Cr()]:["alloy.base.behaviour","dialog-events","scroll-lock"],...e.eventOrder}})},wV=e=>qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":e.translate("Close"),title:e.translate("Close")}},buttonBehaviours:Tl([pk.config({})]),components:[ob("close",{tag:"span",classes:["tox-icon"]},e.icons)],action:e=>{Fr(e,Sk)}}),SV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__title"],attributes:{...o.map((e=>({id:e}))).getOr({})}},components:[],behaviours:Tl([$N.config({channel:`${r_}-${t}`,initialData:e,renderComponents:e=>[ri(n.translate(e.title))]})])}),kV=()=>({dom:Yh('<div class="tox-dialog__draghandle"></div>')}),CV=(e,t,o)=>((e,t,o)=>{const n=rR.parts.title(SV(e,t,A.none(),o)),s=rR.parts.draghandle(kV()),r=rR.parts.close(wV(o)),a=[n].concat(e.draggable?[s]:[]).concat([r]);return ik.sketch({dom:Yh('<div class="tox-dialog__header"></div>'),components:a})})({title:o.shared.providers.translate(e),draggable:o.dialog.isDraggableModal()},t,o.shared.providers),OV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__busy-spinner"],attributes:{"aria-label":o.translate(e)},styles:{left:"0px",right:"0px",bottom:"0px",top:`${n.getOr(0)}px`,position:"absolute"}},behaviours:t,components:[{dom:Yh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}),_V=(e,t,o)=>({onClose:()=>o.closeWindow(),onBlock:o=>{const n=vi(e().element,".tox-dialog__header").map((e=>jt(e)));rR.setBusy(e(),((e,s)=>OV(o.message,s,t,n)))},onUnblock:()=>{rR.setIdle(e())}}),TV="tox-dialog--fullscreen",EV="tox-dialog--width-lg",AV="tox-dialog--width-md",MV=e=>{switch(e){case"large":return A.some(EV);case"medium":return A.some(AV);default:return A.none()}},DV=(e,t)=>{const o=ze(t.element.dom);$a(o,TV)||(Ya(o,[EV,AV]),MV(e).each((e=>Wa(o,e))))},BV=(e,t)=>{const o=ze(e.element.dom),n=Xa(o),s=G(n,(e=>e===EV||e===AV)).or(MV(t));((e,t)=>{H(t,(t=>{((e,t)=>{const o=La(e)?e.dom.classList.toggle(t):((e,t)=>R(Ha(e),t)?Ua(e,t):Pa(e,t))(e,t);ja(e)})(e,t)}))})(o,[TV,...s.toArray()])},IV=(e,t,o)=>ci(xV({...e,firstTabstop:1,lazySink:o.shared.getSink,extraBehaviours:[$O({}),...e.extraBehaviours],onEscape:e=>{Fr(e,Sk)},dialogEvents:t,eventOrder:{[ur()]:[$N.name(),Il.name()],[kr()]:["scroll-lock",$N.name(),"messages","dialog-events","alloy.base.behaviour"],[Cr()]:["alloy.base.behaviour","dialog-events","messages",$N.name(),"scroll-lock"]}})),FV=(e,t={})=>L(e,(e=>"menu"===e.type?(e=>{const o=L(e.items,(e=>{const o=be(t,e.name).getOr(As(!1));return{...e,storage:o}}));return{...e,items:o}})(e):e)),RV=e=>j(e,((e,t)=>"menu"===t.type?j(t.items,((e,t)=>(e[t.name]=t.storage,e)),e):e),{}),NV=(e,t)=>[qr(Xs(),o_),e(wk,((e,o,n,s)=>{zl(ft(s.element)).fold(b,Nl),t.onClose(),o.onClose()})),e(Sk,((e,t,o,n)=>{t.onCancel(e),Fr(n,wk)})),Wr(_k,((e,o)=>t.onUnblock())),Wr(Ok,((e,o)=>t.onBlock(o.event)))],VV=(e,t,o)=>{const n=(t,o)=>Wr(t,((t,n)=>{s(t,((s,r)=>{o(e(),s,n.event,t)}))})),s=(e,t)=>{$N.getState(e).get().each((o=>{t(o.internalDialog,e)}))};return[...NV(n,t),n(Ck,((e,t)=>t.onSubmit(e))),n(xk,((e,t,o)=>{t.onChange(e,{name:o.name})})),n(kk,((e,t,n,s)=>{const r=()=>s.getSystem().isConnected()?Gp.focusIn(s):void 0,a=e=>Et(e,"disabled")||Tt(e,"aria-disabled").exists((e=>"true"===e)),i=ft(s.element),l=zl(i);t.onAction(e,{name:n.name,value:n.value}),zl(i).fold(r,(e=>{a(e)||l.exists((t=>et(e,t)&&a(t)))?r():o().toOptional().filter((t=>!et(t.element,e))).each(r)}))})),n(Tk,((e,t,o)=>{t.onTabChange(e,{newTabName:o.name,oldTabName:o.oldName})})),Zr((t=>{const o=e();vu.setValue(t,o.getData())}))]},zV=(e,t)=>{const o=t.map((e=>e.footerButtons)).getOr([]),n=P(o,(e=>"start"===e.align)),s=(e,t)=>ik.sketch({dom:{tag:"div",classes:[`tox-dialog__footer-${e}`]},components:L(t,(e=>e.memento.asSpec()))});return[s("start",n.pass),s("end",n.fail)]},LV=(e,t,o)=>({dom:Yh('<div class="tox-dialog__footer"></div>'),components:[],behaviours:Tl([$N.config({channel:`${i_}-${t}`,initialData:e,updateState:(e,t)=>{const n=L(t.buttons,(e=>{const t=Xh(((e,t)=>PT(e,e.type,t))(e,o));return{name:e.name,align:e.align,memento:t}}));return A.some({lookupByName:t=>((e,t,o)=>G(t,(e=>e.name===o)).bind((t=>t.memento.getOpt(e))))(e,n,t),footerButtons:n})},renderComponents:zV})])}),HV=(e,t,o)=>rR.parts.footer(LV(e,t,o)),PV=(e,t)=>{if(e.getRoot().getSystem().isConnected()){const o=Om.getCurrent(e.getFormWrapper()).getOr(e.getFormWrapper());return IO.getField(o,t).orThunk((()=>{const o=e.getFooter().bind((e=>$N.getState(e).get()));return o.bind((e=>e.lookupByName(t)))}))}return A.none()},UV=(e,t,o)=>{const n=t=>{const o=e.getRoot();o.getSystem().isConnected()&&t(o)},s={getData:()=>{const t=e.getRoot(),n=t.getSystem().isConnected()?e.getFormWrapper():t;return{...vu.getValue(n),...ce(o,(e=>e.get()))}},setData:t=>{n((n=>{const r=s.getData(),a=bn(r,t),i=((e,t)=>{const o=e.getRoot();return $N.getState(o).get().map((e=>Xn(Yn("data",e.dataValidator,t)))).getOr(t)})(e,a),l=e.getFormWrapper();vu.setValue(l,i),le(o,((e,t)=>{ve(a,t)&&e.set(a[t])}))}))},setEnabled:(t,o)=>{PV(e,t).each(o?Lm.enable:Lm.disable)},focus:t=>{PV(e,t).each(ah.focus)},block:e=>{if(!r(e))throw new Error("The dialogInstanceAPI.block function should be passed a blocking message of type string as an argument");n((t=>{Rr(t,Ok,{message:e})}))},unblock:()=>{n((e=>{Fr(e,_k)}))},showTab:t=>{n((o=>{const n=e.getBody();$N.getState(n).get().exists((e=>e.isTabPanel()))&&Om.getCurrent(n).each((e=>{rV.showTab(e,t)}))}))},redial:r=>{n((n=>{const a=e.getId(),i=t(r),l=FV(i.internalDialog.buttons,o);n.getSystem().broadcastOn([`${s_}-${a}`],i),n.getSystem().broadcastOn([`${r_}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${a_}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${i_}-${a}`],{...i.internalDialog,buttons:l}),s.setData(i.initialData)}))},close:()=>{n((e=>{Fr(e,wk)}))},toggleFullscreen:e.toggleFullscreen};return s},WV=(e,t,o,n=!1,s)=>{const r=ca("dialog"),a=ca("dialog-label"),i=ca("dialog-content"),l=e.internalDialog,c=As(l.size),d=MV(c.get()).toArray(),u=Xh(((e,t,o,n)=>ik.sketch({dom:Yh('<div class="tox-dialog__header"></div>'),components:[SV(e,t,A.some(o),n),kV(),wV(n)],containerBehaviours:Tl([jF.config({mode:"mouse",blockerClass:"blocker",getTarget:e=>yi(e,'[role="dialog"]').getOrDie(),snaps:{getSnapPoints:()=>[],leftAttr:"data-drag-left",topAttr:"data-drag-top"}})])}))({title:l.title,draggable:!0},r,a,o.shared.providers)),m=Xh(((e,t,o,n,s)=>mV(e,t,A.some(o),n,s))({body:l.body,initialData:l.initialData},r,i,o,n)),g=FV(l.buttons),p=RV(g),h=Ce(0!==g.length,Xh(((e,t,o)=>LV(e,t,o))({buttons:g},r,o))),f=VV((()=>v),{onBlock:e=>{FM.block(b,((t,n)=>{const s=u.getOpt(b).map((e=>jt(e.element)));return OV(e.message,n,o.shared.providers,s)}))},onUnblock:()=>{FM.unblock(b)},onClose:()=>t.closeWindow()},o.shared.getSink),b=ci({dom:{tag:"div",classes:["tox-dialog","tox-dialog-inline",...d],attributes:{role:"dialog","aria-labelledby":a}},eventOrder:{[ur()]:[$N.name(),Il.name()],[mr()]:["execute-on-form"],[kr()]:["reflecting","execute-on-form"]},behaviours:Tl([Gp.config({mode:"cyclic",onEscape:e=>(Fr(e,wk),A.some(!0)),useTabstopAt:e=>!n_(e)&&("button"!==We(e)||"disabled"!==_t(e,"disabled")),firstTabstop:1}),$N.config({channel:`${s_}-${r}`,updateState:(e,t)=>(c.set(t.internalDialog.size),DV(t.internalDialog.size,e),s(),A.some(t)),initialData:e}),ah.config({}),th("execute-on-form",f.concat([Kr(Xs(),((e,t)=>{Gp.focusIn(e)})),Wr(Tr(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:t.event.newFocus})}))])),FM.config({getRoot:()=>A.some(b)}),eh.config({}),$O({})]),components:[u.asSpec(),m.asSpec(),...h.map((e=>e.asSpec())).toArray()]}),v=UV({getId:x(r),getRoot:x(b),getFooter:()=>h.map((e=>e.get(b))),getBody:()=>m.get(b),getFormWrapper:()=>{const e=m.get(b);return Om.getCurrent(e).getOr(e)},toggleFullscreen:()=>{BV(b,c.get())}},t.redial,p);return{dialog:b,instanceApi:v}};var jV=tinymce.util.Tools.resolve("tinymce.util.URI");const GV=["insertContent","setContent","execCommand","close","block","unblock"],$V=e=>a(e)&&-1!==GV.indexOf(e.mceAction),qV=(e,t,o,n)=>{const s=ca("dialog"),i=CV(e.title,s,n),l=(e=>{const t={dom:{tag:"div",classes:["tox-dialog__content-js"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-iframe"]},components:[e_(A.none(),{dom:{tag:"iframe",attributes:{src:e.url}},behaviours:Tl([pk.config({}),ah.config({})])})]}],behaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)})])};return rR.parts.body(t)})(e),c=e.buttons.bind((e=>0===e.length?A.none():A.some(HV({buttons:e},s,n)))),u=((e,t)=>{const o=(e,t)=>Wr(e,((e,o)=>{n(e,((n,s)=>{t(x,n,o.event,e)}))})),n=(e,t)=>{$N.getState(e).get().each((o=>{t(o,e)}))};return[...NV(o,t),o(kk,((e,t,o)=>{t.onAction(e,{name:o.name})}))]})(0,_V((()=>y),n.shared.providers,t)),m={...e.height.fold((()=>({})),(e=>({height:e+"px","max-height":e+"px"}))),...e.width.fold((()=>({})),(e=>({width:e+"px","max-width":e+"px"})))},p=e.width.isNone()&&e.height.isNone()?["tox-dialog--width-lg"]:[],h=new jV(e.url,{base_uri:new jV(window.location.href)}),f=`${h.protocol}://${h.host}${h.port?":"+h.port:""}`,b=oc(),v=[$N.config({channel:`${s_}-${s}`,updateState:(e,t)=>A.some(t),initialData:e}),th("messages",[Jr((()=>{const t=rc(ze(window),"message",(t=>{if(h.isSameOrigin(new jV(t.raw.origin))){const n=t.raw.data;$V(n)?((e,t,o)=>{switch(o.mceAction){case"insertContent":e.insertContent(o.content);break;case"setContent":e.setContent(o.content);break;case"execCommand":const n=!!d(o.ui)&&o.ui;e.execCommand(o.cmd,n,o.value);break;case"close":t.close();break;case"block":t.block(o.message);break;case"unblock":t.unblock()}})(o,x,n):(e=>!$V(e)&&a(e)&&ve(e,"mceAction"))(n)&&e.onMessage(x,n)}}));b.set(t)})),Zr(b.clear)]),Il.config({channels:{[l_]:{onReceive:(e,t)=>{vi(e.element,"iframe").each((e=>{const o=e.dom.contentWindow;g(o)&&o.postMessage(t,f)}))}}}})],y=IV({id:s,header:i,body:l,footer:c,extraClasses:p,extraBehaviours:v,extraStyles:m},u,n),x=(e=>{const t=t=>{e.getSystem().isConnected()&&t(e)};return{block:e=>{if(!r(e))throw new Error("The urlDialogInstanceAPI.block function should be passed a blocking message of type string as an argument");t((t=>{Rr(t,Ok,{message:e})}))},unblock:()=>{t((e=>{Fr(e,_k)}))},close:()=>{t((e=>{Fr(e,wk)}))},sendMessage:e=>{t((t=>{t.getSystem().broadcastOn([l_],e)}))}}})(y);return{dialog:y,instanceApi:x}},YV=(e,t)=>Xn(Yn("data",t,e)),XV=e=>JS(e,".tox-alert-dialog")||JS(e,".tox-confirm-dialog"),KV=(e,t,o)=>t&&o?[]:[tM.config({contextual:{lazyContext:()=>A.some(Zo(ze(e.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top"],lazyViewport:t=>XS(e,t.element).map((e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:tn(),optScrollEnv:A.none()})))})],JV=e=>{const t=e.editor,o=dv(t),n=(e=>{const t=e.shared;return{open:(o,n)=>{const s=()=>{rR.hide(l),n()},r=Xh(PT({name:"close-alert",text:"OK",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"cancel",e)),a=fV(),i=hV(s,t.providers),l=ci(xV({lazySink:()=>t.getSink(),header:pV(a,i),body:bV(o,t.providers),footer:A.some(vV(yV([],[r.asSpec()]))),onEscape:s,extraClasses:["tox-alert-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Wr(Sk,s)],eventOrder:{}}));rR.show(l);const c=r.get(l);ah.focus(c)}}})(e.backstages.dialog),s=(e=>{const t=e.shared;return{open:(o,n)=>{const s=e=>{rR.hide(c),n(e)},r=Xh(PT({name:"yes",text:"Yes",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"submit",e)),a=PT({name:"no",text:"No",primary:!1,buttonType:A.some("secondary"),align:"end",enabled:!0,icon:A.none()},"cancel",e),i=fV(),l=hV((()=>s(!1)),t.providers),c=ci(xV({lazySink:()=>t.getSink(),header:pV(i,l),body:bV(o,t.providers),footer:A.some(vV(yV([],[a,r.asSpec()]))),onEscape:()=>s(!1),extraClasses:["tox-confirm-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Wr(Sk,(()=>s(!1))),Wr(Ck,(()=>s(!0)))],eventOrder:{}}));rR.show(c);const d=r.get(c);ah.focus(d)}}})(e.backstages.dialog),r=(t,o)=>UN.open(((t,n,s)=>{const r=n,a=((e,t,o)=>{const n=ca("dialog"),s=e.internalDialog,r=CV(s.title,n,o),a=As(s.size),i=MV(a.get()).toArray(),l=((e,t,o)=>{const n=mV(e,t,A.none(),o,!1);return rR.parts.body(n)})({body:s.body,initialData:s.initialData},n,o),c=FV(s.buttons),d=RV(c),u=Ce(0!==c.length,HV({buttons:c},n,o)),m=VV((()=>f),_V((()=>p),o.shared.providers,t),o.shared.getSink),g={id:n,header:r,body:l,footer:u,extraClasses:i,extraBehaviours:[$N.config({channel:`${s_}-${n}`,updateState:(e,t)=>(a.set(t.internalDialog.size),DV(t.internalDialog.size,e),A.some(t)),initialData:e})],extraStyles:{}},p=IV(g,m,o),h={getId:x(n),getRoot:x(p),getBody:()=>rR.getBody(p),getFooter:()=>rR.getFooter(p),getFormWrapper:()=>{const e=rR.getBody(p);return Om.getCurrent(e).getOr(e)},toggleFullscreen:()=>{BV(p,a.get())}},f=UV(h,t.redial,d);return{dialog:p,instanceApi:f}})({dataValidator:s,initialData:r,internalDialog:t},{redial:UN.redial,closeWindow:()=>{rR.hide(a.dialog),o(a.instanceApi)}},e.backstages.dialog);return rR.show(a.dialog),a.instanceApi.setData(r),a.instanceApi}),t),a=(n,s,r,a)=>UN.open(((n,i,l)=>{const c=YV(i,l),d=nc(),u=e.backstages.popup.shared.header.isPositionedAtTop(),m=()=>d.on((e=>{Gh.reposition(e),o&&u||tM.refresh(e)})),g=WV({dataValidator:l,initialData:c,internalDialog:n},{redial:UN.redial,closeWindow:()=>{d.on(Gh.hide),t.off("ResizeEditor",m),d.clear(),r(g.instanceApi)}},e.backstages.popup,a.ariaAttrs,m),p=ci(Gh.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:a.persistent?{event:"doNotDismissYet"}:{},...u?{}:{fireRepositionEventInstead:{}},inlineBehaviours:Tl([th("window-manager-inline-events",[Wr(Or(),((e,t)=>{Fr(g.dialog,Sk)}))]),...KV(t,o,u)]),isExtraPart:(e,t)=>XV(t)}));return d.set(p),Gh.showWithinBounds(p,di(g.dialog),{anchor:s},(()=>{const e=t.inline?wt():ze(t.getContainer()),o=Zo(e);return A.some(o)})),o&&u||(tM.refresh(p),t.on("ResizeEditor",m)),g.instanceApi.setData(c),Gp.focusIn(g.dialog),g.instanceApi}),n),i=(o,n,s,r)=>UN.open(((o,a,i)=>{const l=YV(a,i),c=nc(),d=e.backstages.popup.shared.header.isPositionedAtTop(),u=()=>c.on((e=>{Gh.reposition(e),tM.refresh(e)})),m=WV({dataValidator:i,initialData:l,internalDialog:o},{redial:UN.redial,closeWindow:()=>{c.on(Gh.hide),t.off("ResizeEditor ScrollWindow ElementScroll",u),c.clear(),s(m.instanceApi)}},e.backstages.popup,r.ariaAttrs,u),g=ci(Gh.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:r.persistent?{event:"doNotDismissYet"}:{},...d?{}:{fireRepositionEventInstead:{}},inlineBehaviours:Tl([th("window-manager-inline-events",[Wr(Or(),((e,t)=>{Fr(m.dialog,Sk)}))]),tM.config({contextual:{lazyContext:()=>A.some(Zo(ze(t.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top","bottom"],lazyViewport:e=>XS(t,e.element).map((e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:tn(),optScrollEnv:A.none()})))})]),isExtraPart:(e,t)=>XV(t)}));return c.set(g),Gh.showWithinBounds(g,di(m.dialog),{anchor:n},(()=>e.backstages.popup.shared.getSink().toOptional().bind((e=>{const o=XS(t,e.element).map((e=>KS(e))).getOr(tn()),n=Zo(ze(t.getContentAreaContainer())),s=en(n,o);return A.some(Jo(s.x,s.y,s.width,s.height-15))})))),tM.refresh(g),t.on("ResizeEditor ScrollWindow ElementScroll ResizeWindow",u),m.instanceApi.setData(l),Gp.focusIn(m.dialog),m.instanceApi}),o);return{open:(t,o,n)=>{if(!u(o)){if("toolbar"===o.inline)return a(t,e.backstages.popup.shared.anchors.inlineDialog(),n,o);if("bottom"===o.inline)return i(t,e.backstages.popup.shared.anchors.inlineBottomDialog(),n,o);if("cursor"===o.inline)return a(t,e.backstages.popup.shared.anchors.cursor(),n,o)}return r(t,n)},openUrl:(o,n)=>((o,n)=>UN.openUrl((o=>{const s=qV(o,{closeWindow:()=>{rR.hide(s.dialog),n(s.instanceApi)}},t,e.backstages.dialog);return rR.show(s.dialog),s.instanceApi}),o))(o,n),alert:(e,t)=>{n.open(e,t)},close:e=>{e.close()},confirm:(e,t)=>{s.open(e,t)}}};on.add("silver",(e=>{(e=>{mb(e),(e=>{const t=e.options.register,o=e=>f(e,r)?{value:Rw(e),valid:!0}:{valid:!1,message:"Must be an array of strings."},n=e=>h(e)&&e>0?{value:e,valid:!0}:{valid:!1,message:"Must be a positive number."};t("color_map",{processor:o,default:["#BFEDD2","Light Green","#FBEEB8","Light Yellow","#F8CAC6","Light Red","#ECCAFA","Light Purple","#C2E0F4","Light Blue","#2DC26B","Green","#F1C40F","Yellow","#E03E2D","Red","#B96AD9","Purple","#3598DB","Blue","#169179","Dark Turquoise","#E67E23","Orange","#BA372A","Dark Red","#843FA1","Dark Purple","#236FA1","Dark Blue","#ECF0F1","Light Gray","#CED4D9","Medium Gray","#95A5A6","Gray","#7E8C8D","Dark Gray","#34495E","Navy Blue","#000000","Black","#ffffff","White"]}),t("color_map_background",{processor:o}),t("color_map_foreground",{processor:o}),t("color_cols",{processor:n,default:Lw(e)}),t("color_cols_foreground",{processor:n,default:Hw(e,Iw)}),t("color_cols_background",{processor:n,default:Hw(e,Fw)}),t("custom_colors",{processor:"boolean",default:!0}),t("color_default_foreground",{processor:"string",default:Vw}),t("color_default_background",{processor:"string",default:Vw})})(e),(e=>{const t=e.options.register;t("contextmenu_avoid_overlap",{processor:"string",default:""}),t("contextmenu_never_use_native",{processor:"boolean",default:!1}),t("contextmenu",{processor:e=>!1===e?{value:[],valid:!0}:r(e)||f(e,r)?{value:zI(e),valid:!0}:{valid:!1,message:"Must be false or a string."},default:"link linkchecker image editimage table spellchecker configurepermanentpen"})})(e)})(e);let t=()=>tn();const{dialogs:o,popups:n,renderUI:s}=tR(e,{getPopupSinkBounds:()=>t()});GS(e,n.backstage.shared);const a=JV({editor:e,backstages:{popup:n.backstage,dialog:o.backstage}});return{renderUI:()=>{const o=s();return XS(e,n.getMothership().element).each((e=>{t=()=>KS(e)})),o},getWindowManagerImpl:x(a),getNotificationManagerImpl:()=>((e,t,o)=>{const n=t.backstage.shared,s=()=>{const t=Zo(ze(e.getContentAreaContainer())),o=tn(),n=Qi(o.x,t.x,t.right),s=Qi(o.y,t.y,t.bottom),r=Math.max(t.right,o.right),a=Math.max(t.bottom,o.bottom);return A.some(Jo(n,s,r-n,a-s))};return{open:(t,r)=>{const a=()=>{r(),Gh.hide(l)},i=ci(sb.sketch({text:t.text,level:R(["success","error","warning","warn","info"],t.type)?t.type:void 0,progress:!0===t.progressBar,icon:t.icon,closeButton:t.closeButton,onAction:a,iconProvider:n.providers.icons,translationProvider:n.providers.translate})),l=ci(Gh.sketch({dom:{tag:"div",classes:["tox-notifications-container"]},lazySink:n.getSink,fireDismissalEventInstead:{},...n.header.isPositionedAtTop()?{}:{fireRepositionEventInstead:{}}}));o.add(l),h(t.timeout)&&t.timeout>0&&$h.setEditorTimeout(e,(()=>{a()}),t.timeout);const c={close:a,reposition:()=>{const t=di(i),o={maxHeightFunction:gc()},r=e.notificationManager.getNotifications();if(r[0]===c){const e={...n.anchors.banner(),overrides:o};Gh.showWithinBounds(l,t,{anchor:e},s)}else F(r,c).each((e=>{const n=r[e-1].getEl(),a={type:"node",root:wt(),node:A.some(ze(n)),overrides:o,layouts:{onRtl:()=>[gl],onLtr:()=>[gl]}};Gh.showWithinBounds(l,t,{anchor:a},s)}))},text:e=>{sb.updateText(i,e)},settings:t,getEl:()=>i.element.dom,progressBar:{value:e=>{sb.updateProgress(i,e)}}};return c},close:e=>{e.close()},getArgs:e=>e.settings}})(e,{backstage:n.backstage},n.getMothership())}}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/tinymce.d.ts b/public/libs/tinymce/tinymce.d.ts
index c2db8964bb3..d68dc5746a5 100644
--- a/public/libs/tinymce/tinymce.d.ts
+++ b/public/libs/tinymce/tinymce.d.ts
@@ -149,6 +149,7 @@ interface ElementSettings {
     void_elements?: string;
     whitespace_elements?: string;
     transparent_elements?: string;
+    wrap_block_elements?: string;
 }
 interface SchemaSettings extends ElementSettings {
     custom_elements?: string;
@@ -220,6 +221,9 @@ interface Schema {
     getSpecialElements: () => SchemaRegExpMap;
     isValidChild: (name: string, child: string) => boolean;
     isValid: (name: string, attr?: string) => boolean;
+    isBlock: (name: string) => boolean;
+    isInline: (name: string) => boolean;
+    isWrapper: (name: string) => boolean;
     getCustomElements: () => SchemaMap;
     addValidElements: (validElements: string) => void;
     setValidElements: (validElements: string) => void;
@@ -776,6 +780,7 @@ interface NestedMenuItemSpec extends CommonMenuItemSpec {
     onSetup?: (api: NestedMenuItemInstanceApi) => (api: NestedMenuItemInstanceApi) => void;
 }
 interface NestedMenuItemInstanceApi extends CommonMenuItemInstanceApi {
+    setTooltip: (tooltip: string) => void;
     setIconFill: (id: string, value: string) => void;
 }
 type MenuButtonItemTypes = NestedMenuItemContents;
@@ -831,6 +836,7 @@ interface ToolbarSplitButtonInstanceApi {
     setIconFill: (id: string, value: string) => void;
     isActive: () => boolean;
     setActive: (state: boolean) => void;
+    setTooltip: (tooltip: string) => void;
     setText: (text: string) => void;
     setIcon: (icon: string) => void;
 }
@@ -876,6 +882,7 @@ interface UrlInputSpec extends FormComponentWithLabelSpec {
     type: 'urlinput';
     filetype?: 'image' | 'media' | 'file';
     enabled?: boolean;
+    picker_text?: string;
 }
 interface UrlInputData {
     value: string;
@@ -1368,6 +1375,7 @@ interface DomParserSettings {
     allow_unsafe_link_target?: boolean;
     blob_cache?: BlobCache;
     convert_fonts_to_spans?: boolean;
+    convert_unsafe_embeds?: boolean;
     document?: Document;
     fix_list_elements?: boolean;
     font_size_legacy_values?: string;
@@ -1378,6 +1386,7 @@ interface DomParserSettings {
     preserve_cdata?: boolean;
     remove_trailing_brs?: boolean;
     root_name?: string;
+    sandbox_iframes?: boolean;
     sanitize?: boolean;
     validate?: boolean;
 }
@@ -1398,8 +1407,10 @@ interface StyleSheetLoaderSettings {
 }
 interface StyleSheetLoader {
     load: (url: string) => Promise<void>;
+    loadRawCss: (key: string, css: string) => void;
     loadAll: (urls: string[]) => Promise<string[]>;
     unload: (url: string) => void;
+    unloadRawCss: (key: string) => void;
     unloadAll: (urls: string[]) => void;
     _setReferrerPolicy: (referrerPolicy: ReferrerPolicy) => void;
     _setContentCssCors: (contentCssCors: boolean) => void;
@@ -1582,6 +1593,8 @@ interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     };
     'resize': UIEvent;
     'scroll': UIEvent;
+    'input': InputEvent;
+    'beforeinput': InputEvent;
     'detach': {};
     'remove': {};
     'init': {};
@@ -1784,6 +1797,7 @@ interface ToolbarGroup {
 }
 type ToolbarMode = 'floating' | 'sliding' | 'scrolling' | 'wrap';
 type ToolbarLocation = 'top' | 'bottom' | 'auto';
+type ForceHexColor = 'always' | 'rgb_only' | 'off';
 interface BaseEditorOptions {
     a11y_advanced_options?: boolean;
     add_form_submit_trigger?: boolean;
@@ -1824,11 +1838,13 @@ interface BaseEditorOptions {
     contextmenu?: string | string[] | false;
     contextmenu_never_use_native?: boolean;
     convert_fonts_to_spans?: boolean;
+    convert_unsafe_embeds?: boolean;
     convert_urls?: boolean;
     custom_colors?: boolean;
     custom_elements?: string;
     custom_ui_selector?: string;
     custom_undo_redo_levels?: number;
+    default_font_stack?: string[];
     deprecation_warnings?: boolean;
     directionality?: 'ltr' | 'rtl';
     doctype?: string;
@@ -1857,6 +1873,7 @@ interface BaseEditorOptions {
     font_size_style_values?: string;
     font_size_formats?: string;
     font_size_input_default_unit?: string;
+    force_hex_color?: ForceHexColor;
     forced_root_block?: string;
     forced_root_block_attrs?: Record<string, string>;
     formats?: Formats;
@@ -1936,6 +1953,7 @@ interface BaseEditorOptions {
     resize?: boolean | 'both';
     resize_img_proportional?: boolean;
     root_name?: string;
+    sandbox_iframes?: boolean;
     schema?: SchemaType;
     selector?: string;
     setup?: SetupCallback;
@@ -2019,7 +2037,9 @@ interface EditorOptions extends NormalizedEditorOptions {
     color_default_foreground: string;
     content_css: string[];
     contextmenu: string[];
+    convert_unsafe_embeds: boolean;
     custom_colors: boolean;
+    default_font_stack: string[];
     document_base_url: string;
     init_content_sync: boolean;
     draggable_modal: boolean;
@@ -2034,6 +2054,7 @@ interface EditorOptions extends NormalizedEditorOptions {
     font_size_style_values: string;
     forced_root_block: string;
     forced_root_block_attrs: Record<string, string>;
+    force_hex_color: ForceHexColor;
     format_noneditable_selector: string;
     height: number | string;
     highlight_on_focus: boolean;
@@ -2067,6 +2088,7 @@ interface EditorOptions extends NormalizedEditorOptions {
     promotion: boolean;
     readonly: boolean;
     removed_menuitems: string;
+    sandbox_iframes: boolean;
     toolbar: boolean | string | string[] | Array<ToolbarGroup>;
     toolbar_groups: Record<string, GroupToolbarButtonSpec>;
     toolbar_location: ToolbarLocation;
@@ -2088,6 +2110,7 @@ interface StylesSettings {
     allow_svg_data_urls?: boolean;
     url_converter?: URLConverter;
     url_converter_scope?: any;
+    force_hex_color?: ForceHexColor;
 }
 interface Styles {
     parse: (css: string | undefined) => Record<string, string>;
@@ -2148,6 +2171,7 @@ interface DOMUtilsSettings {
     onSetAttrib: (event: SetAttribEvent) => void;
     contentCssCors: boolean;
     referrerPolicy: ReferrerPolicy;
+    force_hex_color: ForceHexColor;
 }
 type Target = Node | Window;
 type RunArguments<T extends Node = Node> = string | T | Array<string | T> | null;
@@ -3030,6 +3054,8 @@ interface IconManager {
 interface Resource {
     load: <T = any>(id: string, url: string) => Promise<T>;
     add: (id: string, data: any) => void;
+    has: (id: string) => boolean;
+    get: (id: string) => any;
     unload: (id: string) => void;
 }
 type TextPatterns_d_Pattern = Pattern;
diff --git a/public/libs/tinymce/tinymce.min.js b/public/libs/tinymce/tinymce.min.js
index 7d3ed3a7c2d..9807eab2c8f 100644
--- a/public/libs/tinymce/tinymce.min.js
+++ b/public/libs/tinymce/tinymce.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.7.2 (2023-10-25)
+ * TinyMCE version 6.8.3 (2024-02-08)
  */
-!function(){"use strict";var e=function(e){if(null===e)return"null";if(void 0===e)return"undefined";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t},t=function(e){return{eq:e}},n=t((function(e,t){return e===t})),o=function(e){return t((function(t,n){if(t.length!==n.length)return!1;for(var o=t.length,r=0;r<o;r++)if(!e.eq(t[r],n[r]))return!1;return!0}))},r=function(e){return t((function(r,s){var a=Object.keys(r),i=Object.keys(s);if(!function(e,n){return function(e,n){return t((function(t,o){return e.eq(n(t),n(o))}))}(o(e),(function(e){return function(e,t){return Array.prototype.slice.call(e).sort(t)}(e,n)}))}(n).eq(a,i))return!1;for(var l=a.length,d=0;d<l;d++){var c=a[d];if(!e.eq(r[c],s[c]))return!1}return!0}))},s=t((function(t,n){if(t===n)return!0;var a=e(t);return a===e(n)&&(function(e){return-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(e)}(a)?t===n:"array"===a?o(s).eq(t,n):"object"===a&&r(s).eq(t,n))}));const a=Object.getPrototypeOf,i=(e,t,n)=>{var o;return!!n(e,t.prototype)||(null===(o=e.constructor)||void 0===o?void 0:o.name)===t.name},l=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&i(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,d=e=>t=>typeof t===e,c=e=>t=>e===t,u=(e,t)=>f(e)&&i(e,t,((e,t)=>a(e)===t)),m=l("string"),f=l("object"),g=e=>u(e,Object),p=l("array"),h=c(null),b=d("boolean"),v=c(void 0),y=e=>null==e,C=e=>!y(e),w=d("function"),x=d("number"),k=(e,t)=>{if(p(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},E=()=>{},S=(e,t)=>(...n)=>e(t.apply(null,n)),_=(e,t)=>n=>e(t(n)),N=e=>()=>e,R=e=>e,A=(e,t)=>e===t;function O(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}const T=e=>t=>!e(t),B=e=>()=>{throw new Error(e)},D=e=>e(),P=e=>{e()},L=N(!1),M=N(!0);class I{constructor(e,t){this.tag=e,this.value=t}static some(e){return new I(!0,e)}static none(){return I.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?I.some(e(this.value)):I.none()}bind(e){return this.tag?e(this.value):I.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:I.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return C(e)?I.some(e):I.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}I.singletonNone=new I(!1);const F=Array.prototype.slice,U=Array.prototype.indexOf,z=Array.prototype.push,j=(e,t)=>U.call(e,t),H=(e,t)=>j(e,t)>-1,$=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},q=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},V=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},W=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},K=(e,t)=>{const n=[],o=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?n:o).push(s)}return{pass:n,fail:o}},G=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},Y=(e,t,n)=>(W(e,((e,o)=>{n=t(n,e,o)})),n),X=(e,t,n)=>(V(e,((e,o)=>{n=t(n,e,o)})),n),Q=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return I.some(r);if(n(r,o))break}return I.none()},J=(e,t)=>Q(e,t,L),Z=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return I.some(n);return I.none()},ee=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!p(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);z.apply(t,e[n])}return t},te=(e,t)=>ee(q(e,t)),ne=(e,t)=>{for(let n=0,o=e.length;n<o;++n)if(!0!==t(e[n],n))return!1;return!0},oe=e=>{const t=F.call(e,0);return t.reverse(),t},re=(e,t)=>G(e,(e=>!H(t,e))),se=(e,t)=>{const n={};for(let o=0,r=e.length;o<r;o++){const r=e[o];n[String(r)]=t(r,o)}return n},ae=(e,t)=>{const n=F.call(e,0);return n.sort(t),n},ie=(e,t)=>t>=0&&t<e.length?I.some(e[t]):I.none(),le=e=>ie(e,0),de=e=>ie(e,e.length-1),ce=w(Array.from)?Array.from:e=>F.call(e),ue=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return I.none()},me=Object.keys,fe=Object.hasOwnProperty,ge=(e,t)=>{const n=me(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},pe=(e,t)=>he(e,((e,n)=>({k:n,v:t(e,n)}))),he=(e,t)=>{const n={};return ge(e,((e,o)=>{const r=t(e,o);n[r.k]=r.v})),n},be=e=>(t,n)=>{e[n]=t},ve=(e,t,n,o)=>{ge(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))},ye=(e,t)=>{const n={};return ve(e,t,be(n),E),n},Ce=(e,t)=>{const n=[];return ge(e,((e,o)=>{n.push(t(e,o))})),n},we=e=>Ce(e,R),xe=(e,t)=>ke(e,t)?I.from(e[t]):I.none(),ke=(e,t)=>fe.call(e,t),Ee=(e,t)=>ke(e,t)&&void 0!==e[t]&&null!==e[t],Se=e=>{const t={};return V(e,(e=>{t[e]={}})),me(t)},_e=e=>void 0!==e.length,Ne=Array.isArray,Re=(e,t,n)=>{if(!e)return!1;if(n=n||e,_e(e)){for(let o=0,r=e.length;o<r;o++)if(!1===t.call(n,e[o],o,e))return!1}else for(const o in e)if(ke(e,o)&&!1===t.call(n,e[o],o,e))return!1;return!0},Ae=(e,t)=>{const n=[];return Re(e,((o,r)=>{n.push(t(o,r,e))})),n},Oe=(e,t)=>{const n=[];return Re(e,((o,r)=>{t&&!t(o,r,e)||n.push(o)})),n},Te=(e,t,n,o)=>{let r=v(n)?e[0]:n;for(let n=0;n<e.length;n++)r=t.call(o,r,e[n],n);return r},Be=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++)if(t.call(n,e[o],o,e))return o;return-1},De=e=>e[e.length-1],Pe=e=>{let t,n=!1;return(...o)=>(n||(n=!0,t=e.apply(null,o)),t)},Le=()=>Me(0,0),Me=(e,t)=>({major:e,minor:t}),Ie={nu:Me,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?Le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const o=e[n];if(o.test(t))return o}})(e,t);if(!n)return{major:0,minor:0};const o=e=>Number(t.replace(n,"$"+e));return Me(o(1),o(2))})(e,n)},unknown:Le},Fe=(e,t)=>{const n=String(t).toLowerCase();return J(e,(e=>e.search(n)))},Ue=(e,t,n)=>""===t||e.length>=t.length&&e.substr(n,n+t.length)===t,ze=(e,t)=>He(e,t)?((e,t)=>e.substring(t))(e,t.length):e,je=(e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!v(o)||r+t.length<=o)},He=(e,t)=>Ue(e,t,0),$e=(e,t)=>Ue(e,t,e.length-t.length),qe=e=>t=>t.replace(e,""),Ve=qe(/^\s+|\s+$/g),We=qe(/^\s+/g),Ke=qe(/\s+$/g),Ge=e=>e.length>0,Ye=e=>!Ge(e),Xe=(e,t=10)=>{const n=parseInt(e,t);return isNaN(n)?I.none():I.some(n)},Qe=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Je=e=>t=>je(t,e),Ze=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>je(e,"edge/")&&je(e,"chrome")&&je(e,"safari")&&je(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Qe],search:e=>je(e,"chrome")&&!je(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>je(e,"msie")||je(e,"trident")},{name:"Opera",versionRegexes:[Qe,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Je("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Je("firefox")},{name:"Safari",versionRegexes:[Qe,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(je(e,"safari")||je(e,"mobile/"))&&je(e,"applewebkit")}],et=[{name:"Windows",search:Je("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>je(e,"iphone")||je(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Je("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:Je("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Je("linux"),versionRegexes:[]},{name:"Solaris",search:Je("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Je("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Je("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],tt={browsers:N(Ze),oses:N(et)},nt="Edge",ot="Chromium",rt="Opera",st="Firefox",at="Safari",it=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isEdge:o(nt),isChromium:o(ot),isIE:o("IE"),isOpera:o(rt),isFirefox:o(st),isSafari:o(at)}},lt=()=>it({current:void 0,version:Ie.unknown()}),dt=it,ct=(N(nt),N(ot),N("IE"),N(rt),N(st),N(at),"Windows"),ut="Android",mt="Linux",ft="macOS",gt="Solaris",pt="FreeBSD",ht="ChromeOS",bt=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isWindows:o(ct),isiOS:o("iOS"),isAndroid:o(ut),isMacOS:o(ft),isLinux:o(mt),isSolaris:o(gt),isFreeBSD:o(pt),isChromeOS:o(ht)}},vt=()=>bt({current:void 0,version:Ie.unknown()}),yt=bt,Ct=(N(ct),N("iOS"),N(ut),N(mt),N(ft),N(gt),N(pt),N(ht),e=>window.matchMedia(e).matches);let wt=Pe((()=>((e,t,n)=>{const o=tt.browsers(),r=tt.oses(),s=t.bind((e=>((e,t)=>ue(t.brands,(t=>{const n=t.brand.toLowerCase();return J(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:Ie.nu(parseInt(t.version,10),0)})))})))(o,e))).orThunk((()=>((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e))).fold(lt,dt),a=((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e).fold(vt,yt),i=((e,t,n,o)=>{const r=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!r,a=e.isiOS()||e.isAndroid(),i=a||o("(pointer:coarse)"),l=r||!s&&a&&o("(min-device-width:768px)"),d=s||a&&!l,c=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),u=!d&&!l&&!c;return{isiPad:N(r),isiPhone:N(s),isTablet:N(l),isPhone:N(d),isTouch:N(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:N(c),isDesktop:N(u)}})(a,s,e,n);return{browser:s,os:a,deviceType:i}})(navigator.userAgent,I.from(navigator.userAgentData),Ct)));const xt=()=>wt(),kt=navigator.userAgent,Et=xt(),St=Et.browser,_t=Et.os,Nt=Et.deviceType,Rt=-1!==kt.indexOf("Windows Phone"),At={transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",documentMode:St.isIE()?document.documentMode||7:10,cacheSuffix:null,container:null,canHaveCSP:!St.isIE(),windowsPhone:Rt,browser:{current:St.current,version:St.version,isChromium:St.isChromium,isEdge:St.isEdge,isFirefox:St.isFirefox,isIE:St.isIE,isOpera:St.isOpera,isSafari:St.isSafari},os:{current:_t.current,version:_t.version,isAndroid:_t.isAndroid,isChromeOS:_t.isChromeOS,isFreeBSD:_t.isFreeBSD,isiOS:_t.isiOS,isLinux:_t.isLinux,isMacOS:_t.isMacOS,isSolaris:_t.isSolaris,isWindows:_t.isWindows},deviceType:{isDesktop:Nt.isDesktop,isiPad:Nt.isiPad,isiPhone:Nt.isiPhone,isPhone:Nt.isPhone,isTablet:Nt.isTablet,isTouch:Nt.isTouch,isWebView:Nt.isWebView}},Ot=/^\s*|\s*$/g,Tt=e=>y(e)?"":(""+e).replace(Ot,""),Bt=function(e,t,n,o){o=o||this,e&&(n&&(e=e[n]),Re(e,((e,r)=>!1!==t.call(o,e,r,n)&&(Bt(e,t,n,o),!0))))},Dt={trim:Tt,isArray:Ne,is:(e,t)=>t?!("array"!==t||!Ne(e))||typeof e===t:void 0!==e,toArray:e=>{if(Ne(e))return e;{const t=[];for(let n=0,o=e.length;n<o;n++)t[n]=e[n];return t}},makeMap:(e,t,n={})=>{const o=m(e)?e.split(t||","):e||[];let r=o.length;for(;r--;)n[o[r]]={};return n},each:Re,map:Ae,grep:Oe,inArray:(e,t)=>{if(e)for(let n=0,o=e.length;n<o;n++)if(e[n]===t)return n;return-1},hasOwn:ke,extend:(e,...t)=>{for(let n=0;n<t.length;n++){const o=t[n];for(const t in o)if(ke(o,t)){const n=o[t];void 0!==n&&(e[t]=n)}}return e},walk:Bt,resolve:(e,t=window)=>{const n=e.split(".");for(let e=0,o=n.length;e<o&&(t=t[n[e]]);e++);return t},explode:(e,t)=>p(e)?e:""===e?[]:Ae(e.split(t||","),Tt),_addCacheSuffix:e=>{const t=At.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Pt=(e,t,n=A)=>e.exists((e=>n(e,t))),Lt=(e,t,n=A)=>Mt(e,t,n).getOr(e.isNone()&&t.isNone()),Mt=(e,t,n)=>e.isSome()&&t.isSome()?I.some(n(e.getOrDie(),t.getOrDie())):I.none(),It=(e,t)=>e?I.some(t):I.none(),Ft="undefined"!=typeof window?window:Function("return this;")(),Ut=(e,t)=>((e,t)=>{let n=null!=t?t:Ft;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),zt=Object.getPrototypeOf,jt=e=>{const t=Ut("ownerDocument.defaultView",e);return f(e)&&((e=>((e,t)=>{const n=((e,t)=>Ut(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(zt(e).constructor.name))},Ht=e=>e.dom.nodeName.toLowerCase(),$t=e=>e.dom.nodeType,qt=e=>t=>$t(t)===e,Vt=e=>Wt(e)&&jt(e.dom),Wt=qt(1),Kt=qt(3),Gt=qt(9),Yt=qt(11),Xt=e=>t=>Wt(t)&&Ht(t)===e,Qt=(e,t,n)=>{if(!(m(n)||b(n)||x(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},Jt=(e,t,n)=>{Qt(e.dom,t,n)},Zt=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{Qt(n,t,e)}))},en=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},tn=(e,t)=>I.from(en(e,t)),nn=(e,t)=>{const n=e.dom;return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},on=(e,t)=>{e.dom.removeAttribute(t)},rn=e=>X(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),sn=(e,t)=>{const n=en(e,t);return void 0===n||""===n?[]:n.split(" ")},an=e=>void 0!==e.dom.classList,ln=e=>sn(e,"class"),dn=(e,t)=>((e,t,n)=>{const o=sn(e,t).concat([n]);return Jt(e,t,o.join(" ")),!0})(e,"class",t),cn=(e,t)=>((e,t,n)=>{const o=G(sn(e,t),(e=>e!==n));return o.length>0?Jt(e,t,o.join(" ")):on(e,t),!1})(e,"class",t),un=(e,t)=>{an(e)?e.dom.classList.add(t):dn(e,t)},mn=e=>{0===(an(e)?e.dom.classList:ln(e)).length&&on(e,"class")},fn=(e,t)=>{an(e)?e.dom.classList.remove(t):cn(e,t),mn(e)},gn=(e,t)=>an(e)&&e.dom.classList.contains(t),pn=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},hn=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return pn(n.childNodes[0])},bn=(e,t)=>{const n=(t||document).createElement(e);return pn(n)},vn=(e,t)=>{const n=(t||document).createTextNode(e);return pn(n)},yn=pn,Cn=(e,t,n)=>I.from(e.dom.elementFromPoint(t,n)).map(pn),wn=(e,t)=>{const n=[],o=e=>(n.push(e),t(e));let r=t(e);do{r=r.bind(o)}while(r.isSome());return n},xn=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},kn=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,En=(e,t)=>e.dom===t.dom,Sn=(e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)},_n=e=>yn(e.dom.ownerDocument),Nn=e=>Gt(e)?e:_n(e),Rn=e=>yn(Nn(e).dom.defaultView),An=e=>I.from(e.dom.parentNode).map(yn),On=e=>I.from(e.dom.parentElement).map(yn),Tn=(e,t)=>{const n=w(t)?t:L;let o=e.dom;const r=[];for(;null!==o.parentNode&&void 0!==o.parentNode;){const e=o.parentNode,t=yn(e);if(r.push(t),!0===n(t))break;o=e}return r},Bn=e=>I.from(e.dom.previousSibling).map(yn),Dn=e=>I.from(e.dom.nextSibling).map(yn),Pn=e=>oe(wn(e,Bn)),Ln=e=>wn(e,Dn),Mn=e=>q(e.dom.childNodes,yn),In=(e,t)=>{const n=e.dom.childNodes;return I.from(n[t]).map(yn)},Fn=e=>In(e,0),Un=e=>In(e,e.dom.childNodes.length-1),zn=e=>e.dom.childNodes.length,jn=e=>Yt(e)&&C(e.dom.host),Hn=w(Element.prototype.attachShadow)&&w(Node.prototype.getRootNode),$n=N(Hn),qn=Hn?e=>yn(e.dom.getRootNode()):Nn,Vn=e=>jn(e)?e:(e=>{const t=e.dom.head;if(null==t)throw new Error("Head is not available yet");return yn(t)})(Nn(e)),Wn=e=>yn(e.dom.host),Kn=e=>{if($n()&&C(e.target)){const t=yn(e.target);if(Wt(t)&&Gn(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return le(t)}}return I.from(e.target)},Gn=e=>C(e.dom.shadowRoot),Yn=e=>{const t=Kt(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=qn(e);return jn(t)?I.some(t):I.none()})(yn(t)).fold((()=>n.body.contains(t)),_(Yn,Wn))};var Xn=(e,t,n,o,r)=>e(n,o)?I.some(n):w(r)&&r(n)?I.none():t(n,o,r);const Qn=(e,t,n)=>{let o=e.dom;const r=w(n)?n:L;for(;o.parentNode;){o=o.parentNode;const e=yn(o);if(t(e))return I.some(e);if(r(e))break}return I.none()},Jn=(e,t,n)=>Xn(((e,t)=>t(e)),Qn,e,t,n),Zn=(e,t,n)=>Qn(e,(e=>xn(e,t)),n),eo=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return kn(n)?I.none():I.from(n.querySelector(e)).map(yn)})(t,e),to=(e,t,n)=>Xn(((e,t)=>xn(e,t)),Zn,e,t,n),no=(e,t=!1)=>{return Yn(e)?e.dom.isContentEditable:(n=e,to(n,"[contenteditable]")).fold(N(t),(e=>"true"===oo(e)));var n},oo=e=>e.dom.contentEditable,ro=e=>void 0!==e.style&&w(e.style.getPropertyValue),so=(e,t,n)=>{if(!m(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);ro(e)&&e.style.setProperty(t,n)},ao=(e,t,n)=>{const o=e.dom;so(o,t,n)},io=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{so(n,t,e)}))},lo=(e,t)=>{const n=e.dom,o=window.getComputedStyle(n).getPropertyValue(t);return""!==o||Yn(e)?o:co(n,t)},co=(e,t)=>ro(e)?e.style.getPropertyValue(t):"",uo=(e,t)=>{const n=e.dom,o=co(n,t);return I.from(o).filter((e=>e.length>0))},mo=e=>{const t={},n=e.dom;if(ro(n))for(let e=0;e<n.style.length;e++){const o=n.style.item(e);t[o]=n.style[o]}return t},fo=(e,t)=>{((e,t)=>{ro(e)&&e.style.removeProperty(t)})(e.dom,t),Pt(tn(e,"style").map(Ve),"")&&on(e,"style")},go=(e,t)=>{An(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},po=(e,t)=>{Dn(e).fold((()=>{An(e).each((e=>{bo(e,t)}))}),(e=>{go(e,t)}))},ho=(e,t)=>{Fn(e).fold((()=>{bo(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))},bo=(e,t)=>{e.dom.appendChild(t.dom)},vo=(e,t)=>{go(e,t),bo(t,e)},yo=(e,t)=>{V(t,(t=>{bo(e,t)}))},Co=e=>{e.dom.textContent="",V(Mn(e),(e=>{wo(e)}))},wo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},xo=e=>{const t=Mn(e);var n,o;t.length>0&&(n=e,V(o=t,((e,t)=>{const r=0===t?n:o[t-1];po(r,e)}))),wo(e)},ko=e=>q(e,yn),Eo=e=>e.dom.innerHTML,So=(e,t)=>{const n=_n(e).dom,o=yn(n.createDocumentFragment()),r=((e,t)=>{const n=(t||document).createElement("div");return n.innerHTML=e,Mn(yn(n))})(t,n);yo(o,r),Co(e),bo(e,o)},_o=(e,t,n,o)=>((e,t,n,o,r)=>{const s=((e,t)=>n=>{e(n)&&t((e=>{const t=yn(Kn(e).getOr(e.target)),n=()=>e.stopPropagation(),o=()=>e.preventDefault(),r=S(o,n);return((e,t,n,o,r,s,a)=>({target:e,x:t,y:n,stop:o,prevent:r,kill:s,raw:a}))(t,e.clientX,e.clientY,n,o,r,e)})(n))})(n,o);return e.dom.addEventListener(t,s,false),{unbind:O(No,e,t,s,false)}})(e,t,n,o),No=(e,t,n,o)=>{e.dom.removeEventListener(t,n,o)},Ro=(e,t)=>({left:e,top:t,translate:(n,o)=>Ro(e+n,t+o)}),Ao=Ro,Oo=(e,t)=>void 0!==e?e:void 0!==t?t:0,To=e=>{const t=e.dom,n=t.ownerDocument.body;return n===t?Ao(n.offsetLeft,n.offsetTop):Yn(e)?(e=>{const t=e.getBoundingClientRect();return Ao(t.left,t.top)})(t):Ao(0,0)},Bo=e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,o=t.body.scrollTop||t.documentElement.scrollTop;return Ao(n,o)},Do=(e,t,n)=>{const o=(void 0!==n?n.dom:document).defaultView;o&&o.scrollTo(e,t)},Po=(e,t)=>{xt().browser.isSafari()&&w(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)},Lo=(e,t,n,o)=>({x:e,y:t,width:n,height:o,right:e+n,bottom:t+o}),Mo=e=>{const t=void 0===e?window:e,n=t.document,o=Bo(yn(n));return(e=>{const t=void 0===e?window:e;return xt().browser.isFirefox()?I.none():I.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,r=e.clientHeight;return Lo(o.left,o.top,n,r)}),(e=>Lo(Math.max(e.pageLeft,o.left),Math.max(e.pageTop,o.top),e.width,e.height)))},Io=(e,t)=>{let n=[];return V(Mn(e),(e=>{t(e)&&(n=n.concat([e])),n=n.concat(Io(e,t))})),n},Fo=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return kn(n)?[]:q(n.querySelectorAll(e),yn)})(t,e),Uo=(e,t,n)=>Zn(e,t,n).isSome();class zo{constructor(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}current(){return this.node}next(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node}prev(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node}prev2(e){return this.node=this.findPreviousNode(this.node,e),this.node}findSibling(e,t,n,o){if(e){if(!o&&e[t])return e[t];if(e!==this.rootNode){let t=e[n];if(t)return t;for(let o=e.parentNode;o&&o!==this.rootNode;o=o.parentNode)if(t=o[n],t)return t}}}findPreviousNode(e,t){if(e){const n=e.previousSibling;if(this.rootNode&&n===this.rootNode)return;if(n){if(!t)for(let e=n.lastChild;e;e=e.lastChild)if(!e.lastChild)return e;return n}const o=e.parentNode;if(o&&o!==this.rootNode)return o}}}const jo=e=>t=>!!t&&t.nodeType===e,Ho=e=>!!e&&!Object.getPrototypeOf(e),$o=jo(1),qo=e=>{const t=e.toLowerCase();return e=>C(e)&&e.nodeName.toLowerCase()===t},Vo=e=>{const t=e.map((e=>e.toLowerCase()));return e=>{if(e&&e.nodeName){const n=e.nodeName.toLowerCase();return H(t,n)}return!1}},Wo=(e,t)=>{const n=t.toLowerCase().split(" ");return t=>{if($o(t)){const o=t.ownerDocument.defaultView;if(o)for(let r=0;r<n.length;r++){const s=o.getComputedStyle(t,null);if((s?s.getPropertyValue(e):null)===n[r])return!0}}return!1}},Ko=e=>t=>$o(t)&&t.hasAttribute(e),Go=e=>$o(e)&&e.hasAttribute("data-mce-bogus"),Yo=e=>$o(e)&&"TABLE"===e.tagName,Xo=e=>t=>{if($o(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},Qo=Vo(["textarea","input"]),Jo=jo(3),Zo=jo(4),er=jo(7),tr=jo(8),nr=jo(9),or=jo(11),rr=qo("br"),sr=qo("img"),ar=Xo("true"),ir=Xo("false"),lr=Vo(["td","th"]),dr=Vo(["td","th","caption"]),cr=Vo(["video","audio","object","embed"]),ur=qo("li"),mr=qo("details"),fr=qo("summary"),gr="\ufeff",pr="\xa0",hr=e=>e===gr,br=((e,t)=>{const n=t=>e(t)?I.from(t.dom.nodeValue):I.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(Kt),vr=e=>br.get(e),yr=e=>br.getOption(e),Cr=["pre"].concat(["h1","h2","h3","h4","h5","h6"]),wr=e=>{let t;return n=>(t=t||se(e,M),ke(t,Ht(n)))},xr=wr(["article","aside","details","div","dt","figcaption","footer","form","fieldset","header","hgroup","html","main","nav","section","summary","body","p","dl","multicol","dd","figure","address","center","blockquote","h1","h2","h3","h4","h5","h6","listing","xmp","pre","plaintext","menu","dir","ul","ol","li","hr","table","tbody","thead","tfoot","th","tr","td","caption"]),kr=e=>Wt(e)&&!xr(e),Er=e=>Wt(e)&&"br"===Ht(e),Sr=wr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),_r=wr(["ul","ol","dl"]),Nr=wr(["li","dd","dt"]),Rr=wr(["thead","tbody","tfoot"]),Ar=wr(["td","th"]),Or=wr(["pre","script","textarea","style"]),Tr=wr(Cr),Br=e=>Tr(e)||kr(e),Dr=()=>{const e=bn("br");return Jt(e,"data-mce-bogus","1"),e},Pr=e=>{Co(e),bo(e,Dr())},Lr=e=>{Un(e).each((t=>{Bn(t).each((n=>{xr(e)&&Er(t)&&xr(n)&&wo(t)}))}))},Mr=gr,Ir=hr,Fr=e=>e.replace(/\uFEFF/g,""),Ur=$o,zr=Jo,jr=e=>(zr(e)&&(e=e.parentNode),Ur(e)&&e.hasAttribute("data-mce-caret")),Hr=e=>zr(e)&&Ir(e.data),$r=e=>jr(e)||Hr(e),qr=e=>e.firstChild!==e.lastChild||!rr(e.firstChild),Vr=e=>{const t=e.container();return!!Jo(t)&&(t.data.charAt(e.offset())===Mr||e.isAtStart()&&Hr(t.previousSibling))},Wr=e=>{const t=e.container();return!!Jo(t)&&(t.data.charAt(e.offset()-1)===Mr||e.isAtEnd()&&Hr(t.nextSibling))},Kr=e=>zr(e)&&e.data[0]===Mr,Gr=e=>zr(e)&&e.data[e.data.length-1]===Mr,Yr=e=>e&&e.hasAttribute("data-mce-caret")?((e=>{var t;const n=e.getElementsByTagName("br"),o=n[n.length-1];Go(o)&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o))})(e),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("data-mce-style"),e.removeAttribute("_moz_abspos"),e):null,Xr=e=>jr(e.startContainer),Qr=ar,Jr=ir,Zr=rr,es=Jo,ts=Vo(["script","style","textarea"]),ns=Vo(["img","input","textarea","hr","iframe","video","audio","object","embed"]),os=Vo(["table"]),rs=$r,ss=e=>!rs(e)&&(es(e)?!ts(e.parentNode):ns(e)||Zr(e)||os(e)||as(e)),as=e=>!(e=>$o(e)&&"true"===e.getAttribute("unselectable"))(e)&&Jr(e),is=(e,t)=>ss(e)&&((e,t)=>{for(let n=e.parentNode;n&&n!==t;n=n.parentNode){if(as(n))return!1;if(Qr(n))return!0}return!0})(e,t),ls=/^[ \t\r\n]*$/,ds=e=>ls.test(e),cs=e=>{for(const t of e)if(!hr(t))return!1;return!0},us=e=>"\n"===e||"\r"===e,ms=(e,t=4,n=!0,o=!0)=>{const r=((e,t)=>t<=0?"":new Array(t+1).join(" "))(0,t),s=e.replace(/\t/g,r),a=X(s,((e,t)=>(e=>-1!==" \f\t\v".indexOf(e))(t)||t===pr?e.pcIsSpace||""===e.str&&n||e.str.length===s.length-1&&o||((e,t)=>t<e.length&&t>=0&&us(e[t]))(s,e.str.length+1)?{pcIsSpace:!1,str:e.str+pr}:{pcIsSpace:!0,str:e.str+" "}:{pcIsSpace:us(t),str:e.str+t}),{pcIsSpace:!1,str:""});return a.str},fs=(e,t)=>ss(e)&&!((e,t)=>Jo(e)&&ds(e.data)&&!((e,t)=>{const n=yn(t),o=yn(e);return Uo(o,"pre,code",O(En,n))})(e,t))(e,t)||(e=>$o(e)&&"A"===e.nodeName&&!e.hasAttribute("href")&&(e.hasAttribute("name")||e.hasAttribute("id")))(e)||gs(e),gs=Ko("data-mce-bookmark"),ps=Ko("data-mce-bogus"),hs=("data-mce-bogus","all",e=>$o(e)&&"all"===e.getAttribute("data-mce-bogus"));const bs=(e,t=!0)=>((e,t)=>{let n=0;if(fs(e,e))return!1;{let o=e.firstChild;if(!o)return!0;const r=new zo(o,e);do{if(t){if(hs(o)){o=r.next(!0);continue}if(ps(o)){o=r.next();continue}}if(rr(o))n++,o=r.next();else{if(fs(o,e))return!1;o=r.next()}}while(o);return n<=1}})(e.dom,t),vs="data-mce-block",ys=e=>(e=>G(me(e),(e=>!/[A-Z]/.test(e))))(e).join(","),Cs=(e,t)=>C(t.querySelector(e))?(t.setAttribute(vs,"true"),"inline-boundary"===t.getAttribute("data-mce-selected")&&t.removeAttribute("data-mce-selected"),!0):(t.removeAttribute(vs),!1),ws=(e,t)=>{const n=ys(e.getTransparentElements()),o=ys(e.getBlockElements());return G(t.querySelectorAll(n),(e=>Cs(o,e)))},xs=(e,t)=>{var n;const o=t?"lastChild":"firstChild";for(let t=e[o];t;t=t[o])if(bs(yn(t)))return void(null===(n=t.parentNode)||void 0===n||n.removeChild(t))},ks=(e,t,n)=>{const o=e.getBlockElements(),r=yn(t),s=e=>Ht(e)in o,a=e=>En(e,r);V(ko(n),(t=>{Qn(t,s,a).each((n=>{const o=((t,o)=>G(Mn(t),(t=>s(t)&&!e.isValidChild(Ht(n),Ht(t)))))(t);if(o.length>0){const t=On(n);V(o,(e=>{Qn(e,s,a).each((t=>{((e,t)=>{const n=document.createRange(),o=e.parentNode;if(o){n.setStartBefore(e),n.setEndBefore(t);const r=n.extractContents();xs(r,!0),n.setStartAfter(t),n.setEndAfter(e);const s=n.extractContents();xs(s,!1),bs(yn(r))||o.insertBefore(r,e),bs(yn(t))||o.insertBefore(t,e),bs(yn(s))||o.insertBefore(s,e),o.removeChild(e)}})(t.dom,e.dom)}))})),t.each((t=>ws(e,t.dom)))}}))}))},Es=(e,t)=>{const n=ws(e,t);ks(e,t,n),((e,t,n)=>{V([...n,...As(e,t)?[t]:[]],(t=>V(Fo(yn(t),t.nodeName.toLowerCase()),(t=>{Os(e,t.dom)&&xo(t)}))))})(e,t,n)},Ss=(e,t)=>{if(Rs(e,t)){const n=ys(e.getBlockElements());Cs(n,t)}},_s=e=>e.hasAttribute(vs),Ns=(e,t)=>ke(e.getTransparentElements(),t),Rs=(e,t)=>$o(t)&&Ns(e,t.nodeName),As=(e,t)=>Rs(e,t)&&_s(t),Os=(e,t)=>Rs(e,t)&&!_s(t),Ts=(e,t)=>1===t.type&&Ns(e,t.name)&&m(t.attr(vs)),Bs=xt().browser,Ds=e=>J(e,Wt),Ps=(e,t)=>e.children&&H(e.children,t),Ls=(e,t={})=>{let n=0;const o={},r=yn(e),s=Nn(r),a=e=>new Promise(((a,i)=>{let l;const d=Dt._addCacheSuffix(e),c=(e=>xe(o,e).getOrThunk((()=>({id:"mce-u"+n++,passed:[],failed:[],count:0}))))(d);o[d]=c,c.count++;const u=(e,t)=>{V(e,P),c.status=t,c.passed=[],c.failed=[],l&&(l.onload=null,l.onerror=null,l=null)},m=()=>u(c.passed,2),f=()=>u(c.failed,3);if(a&&c.passed.push(a),i&&c.failed.push(i),1===c.status)return;if(2===c.status)return void m();if(3===c.status)return void f();c.status=1;const g=bn("link",s.dom);var p;Zt(g,{rel:"stylesheet",type:"text/css",id:c.id}),t.contentCssCors&&Jt(g,"crossOrigin","anonymous"),t.referrerPolicy&&Jt(g,"referrerpolicy",t.referrerPolicy),l=g.dom,l.onload=m,l.onerror=f,p=g,bo(Vn(r),p),Jt(g,"href",d)})),i=e=>{const t=Dt._addCacheSuffix(e);xe(o,t).each((e=>{0==--e.count&&(delete o[t],(e=>{const t=Vn(r);eo(t,"#"+e).each(wo)})(e.id))}))};return{load:a,loadAll:e=>Promise.allSettled(q(e,(e=>a(e).then(N(e))))).then((e=>{const t=K(e,(e=>"fulfilled"===e.status));return t.fail.length>0?Promise.reject(q(t.fail,(e=>e.reason))):q(t.pass,(e=>e.value))})),unload:i,unloadAll:e=>{V(e,(e=>{i(e)}))},_setReferrerPolicy:e=>{t.referrerPolicy=e},_setContentCssCors:e=>{t.contentCssCors=e}}},Ms=(()=>{const e=new WeakMap;return{forElement:(t,n)=>{const o=qn(t).dom;return I.from(e.get(o)).getOrThunk((()=>{const t=Ls(o,n);return e.set(o,t),t}))}}})(),Is=(e,t)=>C(e)&&(fs(e,t)||kr(yn(e))),Fs=e=>(e=>"span"===e.nodeName.toLowerCase())(e)&&"bookmark"===e.getAttribute("data-mce-type"),Us=(e,t,n)=>{var o;const r=n||t;if($o(t)&&Fs(t))return t;const s=t.childNodes;for(let t=s.length-1;t>=0;t--)Us(e,s[t],r);if($o(t)){const e=t.childNodes;1===e.length&&Fs(e[0])&&(null===(o=t.parentNode)||void 0===o||o.insertBefore(e[0],t))}return(e=>or(e)||nr(e))(t)||fs(t,r)||(e=>!!$o(e)&&e.childNodes.length>0)(t)||((e,t)=>Jo(e)&&e.data.length>0&&((e,t)=>{const n=new zo(e,t).prev(!1),o=new zo(e,t).next(!1),r=v(n)||Is(n,t),s=v(o)||Is(o,t);return r&&s})(e,t))(t,r)||e.remove(t),t},zs=Dt.makeMap,js=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Hs=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,$s=/[<>&\"\']/g,qs=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Vs={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},Ws={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},Ks={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},Gs=(e,t)=>{const n={};if(e){const o=e.split(",");t=t||10;for(let e=0;e<o.length;e+=2){const r=String.fromCharCode(parseInt(o[e],t));if(!Ws[r]){const t="&"+o[e+1]+";";n[r]=t,n[t]=r}}return n}},Ys=Gs("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),Xs=(e,t)=>e.replace(t?js:Hs,(e=>Ws[e]||e)),Qs=(e,t)=>e.replace(t?js:Hs,(e=>e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":Ws[e]||"&#"+e.charCodeAt(0)+";")),Js=(e,t,n)=>{const o=n||Ys;return e.replace(t?js:Hs,(e=>Ws[e]||o[e]||e))},Zs={encodeRaw:Xs,encodeAllRaw:e=>(""+e).replace($s,(e=>Ws[e]||e)),encodeNumeric:Qs,encodeNamed:Js,getEncodeFunc:(e,t)=>{const n=Gs(t)||Ys,o=zs(e.replace(/\+/g,","));return o.named&&o.numeric?(e,t)=>e.replace(t?js:Hs,(e=>void 0!==Ws[e]?Ws[e]:void 0!==n[e]?n[e]:e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";")):o.named?t?(e,t)=>Js(e,t,n):Js:o.numeric?Qs:Xs},decode:e=>e.replace(qs,((e,t)=>t?(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))>65535?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Vs[t]||String.fromCharCode(t):Ks[e]||Ys[e]||(e=>{const t=bn("div").dom;return t.innerHTML=e,t.textContent||t.innerText||e})(e)))},ea=(e,t)=>(e=Dt.trim(e))?e.split(t||" "):[],ta=e=>new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$"),na={},oa=Dt.makeMap,ra=Dt.each,sa=Dt.extend,aa=Dt.explode,ia=(e,t={})=>{const n=oa(e," ",oa(e.toUpperCase()," "));return sa(n,t)},la=e=>ia("td th li dt dd figcaption caption details summary",e.getTextBlockElements()),da=(e,t)=>{if(e){const n={};return m(e)&&(e={"*":e}),ra(e,((e,o)=>{n[o]=n[o.toUpperCase()]="map"===t?oa(e,/[, ]/):aa(e,/[, ]/)})),n}},ca=(e={})=>{var t;const n={},o={};let r=[];const s={},a={},i=(t,n,o)=>{const r=e[t];if(r)return oa(r,/[, ]/,oa(r.toUpperCase(),/[, ]/));{let e=na[t];return e||(e=ia(n,o),na[t]=e),e}},l=null!==(t=e.schema)&&void 0!==t?t:"html5",d=(e=>{const{globalAttributes:t,phrasingContent:n,flowContent:o}=(e=>{let t,n,o,r;return t="id accesskey class dir lang style tabindex title role",n="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",o="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(t+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",n+=" article aside details dialog figure main header footer hgroup section nav a ins del canvas map",o+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!==e&&(t+=" xml:lang",o=[o,"acronym applet basefont big font strike tt"].join(" "),n=[n,"center dir isindex noframes"].join(" "),r=[n,o].join(" ")),r=r||[n,o].join(" "),{globalAttributes:t,blockContent:n,phrasingContent:o,flowContent:r}})(e),r={},s=(e,n="",o="")=>{const s=ea(o),a=ea(e);let i=a.length;for(;i--;){const e=ea([t,n].join(" "));r[a[i]]={attributes:se(e,N({})),attributesOrder:e,children:se(s,N({}))}}},a=(e,t)=>{const n=ea(e),o=ea(t);let s=n.length;for(;s--;){const e=r[n[s]];for(let t=0,n=o.length;t<n;t++)e.attributes[o[t]]={},e.attributesOrder.push(o[t])}};return"html5-strict"!==e&&(V(ea("acronym applet basefont big font strike tt"),(e=>{s(e,"",n)})),V(ea("center dir isindex noframes"),(e=>{s(e,"",o)}))),s("html","manifest","head body"),s("head","","base command link meta noscript script style title"),s("title hr noscript br"),s("base","href target"),s("link","href rel media hreflang type sizes hreflang"),s("meta","name http-equiv content charset"),s("style","media type scoped"),s("script","src async defer type charset"),s("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",o),s("dd div","",o),s("address dt caption","","html4"===e?n:o),s("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),s("blockquote","cite",o),s("ol","reversed start type","li"),s("ul","","li"),s("li","value",o),s("dl","","dt dd"),s("a","href target rel media hreflang type","html4"===e?n:o),s("q","cite",n),s("ins del","cite datetime",o),s("img","src sizes srcset alt usemap ismap width height"),s("iframe","src name width height",o),s("embed","src type width height"),s("object","data type typemustmatch name usemap form width height",[o,"param"].join(" ")),s("param","name value"),s("map","name",[o,"area"].join(" ")),s("area","alt coords shape href target rel media hreflang type"),s("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),s("colgroup","span","col"),s("col","span"),s("tbody thead tfoot","","tr"),s("tr","","td th"),s("td","colspan rowspan headers",o),s("th","colspan rowspan headers scope abbr",o),s("form","accept-charset action autocomplete enctype method name novalidate target",o),s("fieldset","disabled form name",[o,"legend"].join(" ")),s("label","form for",n),s("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),s("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?o:n),s("select","disabled form multiple name required size","option optgroup"),s("optgroup","disabled label","option"),s("option","disabled label selected value"),s("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),s("menu","type label",[o,"li"].join(" ")),s("noscript","",o),"html4"!==e&&(s("wbr"),s("ruby","",[n,"rt rp"].join(" ")),s("figcaption","",o),s("mark rt rp summary bdi","",n),s("canvas","width height",o),s("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[o,"track source"].join(" ")),s("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[o,"track source"].join(" ")),s("picture","","img source"),s("source","src srcset type media sizes"),s("track","kind src srclang label default"),s("datalist","",[n,"option"].join(" ")),s("article section nav aside main header footer","",o),s("hgroup","","h1 h2 h3 h4 h5 h6"),s("figure","",[o,"figcaption"].join(" ")),s("time","datetime",n),s("dialog","open",o),s("command","type label icon disabled checked radiogroup command"),s("output","for form name",n),s("progress","value max",n),s("meter","value min max low high optimum",n),s("details","open",[o,"summary"].join(" ")),s("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!==e&&(a("script","language xml:space"),a("style","xml:space"),a("object","declare classid code codebase codetype archive standby align border hspace vspace"),a("embed","align name hspace vspace"),a("param","valuetype type"),a("a","charset name rev shape coords"),a("br","clear"),a("applet","codebase archive code object alt name width height align hspace vspace"),a("img","name longdesc align border hspace vspace"),a("iframe","longdesc frameborder marginwidth marginheight scrolling align"),a("font basefont","size color face"),a("input","usemap align"),a("select"),a("textarea"),a("h1 h2 h3 h4 h5 h6 div p legend caption","align"),a("ul","type compact"),a("li","type"),a("ol dl menu dir","compact"),a("pre","width xml:space"),a("hr","align noshade size width"),a("isindex","prompt"),a("table","summary width frame rules cellspacing cellpadding align bgcolor"),a("col","width align char charoff valign"),a("colgroup","width align char charoff valign"),a("thead","align char charoff valign"),a("tr","align char charoff valign bgcolor"),a("th","axis align char charoff valign nowrap bgcolor width height"),a("form","accept"),a("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),a("tfoot","align char charoff valign"),a("tbody","align char charoff valign"),a("area","nohref"),a("body","background bgcolor text link vlink alink")),"html4"!==e&&(a("input button select textarea","autofocus"),a("input textarea","placeholder"),a("a","download"),a("link script img","crossorigin"),a("img","loading"),a("iframe","sandbox seamless allow allowfullscreen loading")),"html4"!==e&&V([r.video,r.audio],(e=>{delete e.children.audio,delete e.children.video})),V(ea("a form meter progress dfn"),(e=>{r[e]&&delete r[e].children[e]})),delete r.caption.children.table,delete r.script,r})(l);!1===e.verify_html&&(e.valid_elements="*[*]");const c=da(e.valid_styles),u=da(e.invalid_styles,"map"),m=da(e.valid_classes,"map"),f=i("whitespace_elements","pre script noscript style textarea video audio iframe object code"),g=i("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),p=i("void_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),h=i("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls allowfullscreen"),b="td th iframe video audio object script code",v=i("non_empty_elements",b+" pre",p),y=i("move_caret_before_on_enter_elements",b+" table",p),C=i("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),w=i("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary",C),x=i("text_inline_elements","span strong b em i font s strike u var cite dfn code mark q sup sub samp"),k=i("transparent_elements","a ins del canvas map");ra("script noscript iframe noframes noembed title style textarea xmp plaintext".split(" "),(e=>{a[e]=new RegExp("</"+e+"[^>]*>","gi")}));const E=e=>{const t=I.from(n["@"]),o=/[*?+]/;V(((e,t)=>{const n=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/;return te(ea(t,","),(t=>{const o=n.exec(t);if(o){const t=o[1],n=o[2],r=o[3],s=o[4],a=o[5],i={attributes:{},attributesOrder:[]};if(e.each((e=>((e,t)=>{ge(e.attributes,((e,n)=>{t.attributes[n]=e})),t.attributesOrder.push(...e.attributesOrder)})(e,i))),"#"===t?i.paddEmpty=!0:"-"===t&&(i.removeEmpty=!0),"!"===s&&(i.removeEmptyAttrs=!0),a&&((e,t)=>{const n=/^([!\-])?(\w+[\\:]:\w+|[^=~<]+)?(?:([=~<])(.*))?$/,o=/[*?+]/,{attributes:r,attributesOrder:s}=t;V(ea(e,"|"),(e=>{const a=n.exec(e);if(a){const e={},n=a[1],i=a[2].replace(/[\\:]:/g,":"),l=a[3],d=a[4];if("!"===n&&(t.attributesRequired=t.attributesRequired||[],t.attributesRequired.push(i),e.required=!0),"-"===n)return delete r[i],void s.splice(Dt.inArray(s,i),1);if(l&&("="===l?(t.attributesDefault=t.attributesDefault||[],t.attributesDefault.push({name:i,value:d}),e.defaultValue=d):"~"===l?(t.attributesForced=t.attributesForced||[],t.attributesForced.push({name:i,value:d}),e.forcedValue=d):"<"===l&&(e.validValues=Dt.makeMap(d,"?"))),o.test(i)){const n=e;t.attributePatterns=t.attributePatterns||[],n.pattern=ta(i),t.attributePatterns.push(n)}else r[i]||s.push(i),r[i]=e}}))})(a,i),r&&(i.outputName=n),"@"===n){if(!e.isNone())return[];e=I.some(i)}return[r?{name:n,element:i,aliasName:r}:{name:n,element:i}]}return[]}))})(t,null!=e?e:""),(({name:e,element:t,aliasName:s})=>{if(s&&(n[s]=t),o.test(e)){const n=t;n.pattern=ta(e),r.push(n)}else n[e]=t}))},S=e=>{r=[],V(me(n),(e=>{delete n[e]})),E(e)},_=e=>{delete na.text_block_elements,delete na.block_elements,V((e=>{const t=/^(~)?(.+)$/;return te(ea(e,","),(e=>{const n=t.exec(e);if(n){const e="~"===n[1];return[{inline:e,cloneName:e?"span":"div",name:n[2]}]}return[]}))})(null!=e?e:""),(({inline:e,name:t,cloneName:r})=>{if(o[t]=o[r],s[t]=r,v[t.toUpperCase()]={},v[t]={},e||(w[t.toUpperCase()]={},w[t]={}),!n[t]){let e=n[r];e=sa({},e),delete e.removeEmptyAttrs,delete e.removeEmpty,n[t]=e}ge(o,((e,n)=>{e[r]&&(o[n]=e=sa({},o[n]),e[t]=e[r])}))}))},R=e=>{V((e=>{const t=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;return te(ea(e,","),(e=>{const n=t.exec(e);if(n){const e=n[1],t=e?(e=>"-"===e?"remove":"add")(e):"replace";return[{operation:t,name:n[2],validChildren:ea(n[3],"|")}]}return[]}))})(null!=e?e:""),(({operation:e,name:t,validChildren:n})=>{const r="replace"===e?{"#comment":{}}:o[t];V(n,(t=>{"remove"===e?delete r[t]:r[t]={}})),o[t]=r}))},A=e=>{const t=n[e];if(t)return t;let o=r.length;for(;o--;){const t=r[o];if(t.pattern.test(e))return t}};e.valid_elements?(S(e.valid_elements),ra(d,((e,t)=>{o[t]=e.children}))):(ra(d,((e,t)=>{n[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},o[t]=e.children})),ra(ea("strong/b em/i"),(e=>{const t=ea(e,"/");n[t[1]].outputName=t[0]})),ra(x,((t,o)=>{n[o]&&(e.padd_empty_block_inline_children&&(n[o].paddInEmptyBlock=!0),n[o].removeEmpty=!0)})),ra(ea("ol ul blockquote a table tbody"),(e=>{n[e]&&(n[e].removeEmpty=!0)})),ra(ea("p h1 h2 h3 h4 h5 h6 th td pre div address caption li summary"),(e=>{n[e]&&(n[e].paddEmpty=!0)})),ra(ea("span"),(e=>{n[e].removeEmptyAttrs=!0}))),_(e.custom_elements),R(e.valid_children),E(e.extended_valid_elements),R("+ol[ul|ol],+ul[ul|ol]"),ra({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},((e,t)=>{n[t]&&(n[t].parentsRequired=ea(e))})),e.invalid_elements&&ra(aa(e.invalid_elements),(e=>{n[e]&&delete n[e]})),A("span")||E("span[!data-mce-type|*]");const O=N(c),T=N(u),B=N(m),D=N(h),P=N(w),L=N(C),M=N(x),F=N(Object.seal(p)),U=N(g),z=N(v),j=N(y),H=N(f),$=N(k),q=N(Object.seal(a)),W=N(s);return{type:l,children:o,elements:n,getValidStyles:O,getValidClasses:B,getBlockElements:P,getInvalidStyles:T,getVoidElements:F,getTextBlockElements:L,getTextInlineElements:M,getBoolAttrs:D,getElementRule:A,getSelfClosingElements:U,getNonEmptyElements:z,getMoveCaretBeforeOnEnterElements:j,getWhitespaceElements:H,getTransparentElements:$,getSpecialElements:q,isValidChild:(e,t)=>{const n=o[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:(e,t)=>{const n=A(e);if(n){if(!t)return!0;{if(n.attributes[t])return!0;const e=n.attributePatterns;if(e){let n=e.length;for(;n--;)if(e[n].pattern.test(t))return!0}}}return!1},getCustomElements:W,addValidElements:E,setValidElements:S,addCustomElements:_,addValidChildren:R}},ua=(e={},t)=>{const n=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,r=/\s+$/,s={};let a,i;const l=gr;t&&(a=t.getValidStyles(),i=t.getInvalidStyles());const d="\\\" \\' \\; \\: ; : \ufeff".split(" ");for(let e=0;e<d.length;e++)s[d[e]]=l+e,s[l+e]=d[e];const c={parse:t=>{const a={};let i=!1;const d=e.url_converter,u=e.url_converter_scope||c,m=(e,t,n)=>{const o=a[e+"-top"+t];if(!o)return;const r=a[e+"-right"+t];if(!r)return;const s=a[e+"-bottom"+t];if(!s)return;const i=a[e+"-left"+t];if(!i)return;const l=[o,r,s,i];let d=l.length-1;for(;d--&&l[d]===l[d+1];);d>-1&&n||(a[e+t]=-1===d?l[0]:l.join(" "),delete a[e+"-top"+t],delete a[e+"-right"+t],delete a[e+"-bottom"+t],delete a[e+"-left"+t])},f=e=>{const t=a[e];if(!t)return;const n=t.indexOf(",")>-1?[t]:t.split(" ");let o=n.length;for(;o--;)if(n[o]!==n[0])return!1;return a[e]=n[0],!0},g=e=>(i=!0,s[e]),p=(e,t)=>(i&&(e=e.replace(/\uFEFF[0-9]/g,(e=>s[e]))),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e),h=e=>String.fromCharCode(parseInt(e.slice(1),16)),b=e=>e.replace(/\\[0-9a-f]+/gi,h),v=(t,n,o,r,s,a)=>{if(s=s||a)return"'"+(s=p(s)).replace(/\'/g,"\\'")+"'";if(n=p(n||o||r||""),!e.allow_script_urls){const t=n.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(t))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(t))return""}return d&&(n=d.call(u,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"};if(t){let s;for(t=(t=t.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,g).replace(/\"[^\"]+\"|\'[^\']+\'/g,(e=>e.replace(/[;:]/g,g)));s=o.exec(t);){o.lastIndex=s.index+s[0].length;let t=s[1].replace(r,"").toLowerCase(),d=s[2].replace(r,"");if(t&&d){if(t=b(t),d=b(d),-1!==t.indexOf(l)||-1!==t.indexOf('"'))continue;if(!e.allow_script_urls&&("behavior"===t||/expression\s*\(|\/\*|\*\//.test(d)))continue;"font-weight"===t&&"700"===d?d="bold":"color"!==t&&"background-color"!==t||(d=d.toLowerCase()),d=d.replace(n,v),a[t]=i?p(d,!0):d}}m("border","",!0),m("border","-width"),m("border","-color"),m("border","-style"),m("padding",""),m("margin",""),"border",C="border-style",w="border-color",f(y="border-width")&&f(C)&&f(w)&&(a.border=a[y]+" "+a[C]+" "+a[w],delete a[y],delete a[C],delete a[w]),"medium none"===a.border&&delete a.border,"none"===a["border-image"]&&delete a["border-image"]}var y,C,w;return a},serialize:(e,t)=>{let n="";const o=(t,o)=>{const r=o[t];if(r)for(let t=0,o=r.length;t<o;t++){const o=r[t],s=e[o];s&&(n+=(n.length>0?" ":"")+o+": "+s+";")}};return t&&a?(o("*",a),o(t,a)):ge(e,((e,o)=>{e&&((e,t)=>{if(!i||!t)return!0;let n=i["*"];return!(n&&n[e]||(n=i[t],n&&n[e]))})(o,t)&&(n+=(n.length>0?" ":"")+o+": "+e+";")})),n}};return c},ma={keyLocation:!0,layerX:!0,layerY:!0,returnValue:!0,webkitMovementX:!0,webkitMovementY:!0,keyIdentifier:!0,mozPressure:!0},fa=(e,t)=>{const n=null!=t?t:{};for(const t in e)ke(ma,t)||(n[t]=e[t]);return C(e.composedPath)&&(n.composedPath=()=>e.composedPath()),C(e.getModifierState)&&(n.getModifierState=t=>e.getModifierState(t)),n},ga=(e,t,n,o)=>{var r;const s=fa(t,o);return s.type=e,y(s.target)&&(s.target=null!==(r=s.srcElement)&&void 0!==r?r:n),(e=>y(e.preventDefault)||(e=>e instanceof Event||w(e.initEvent))(e))(t)&&(s.preventDefault=()=>{s.defaultPrevented=!0,s.isDefaultPrevented=M,w(t.preventDefault)&&t.preventDefault()},s.stopPropagation=()=>{s.cancelBubble=!0,s.isPropagationStopped=M,w(t.stopPropagation)&&t.stopPropagation()},s.stopImmediatePropagation=()=>{s.isImmediatePropagationStopped=M,s.stopPropagation()},(e=>e.isDefaultPrevented===M||e.isDefaultPrevented===L)(s)||(s.isDefaultPrevented=!0===s.defaultPrevented?M:L,s.isPropagationStopped=!0===s.cancelBubble?M:L,s.isImmediatePropagationStopped=L)),s},pa=/^(?:mouse|contextmenu)|click/,ha=(e,t,n,o)=>{e.addEventListener(t,n,o||!1)},ba=(e,t,n,o)=>{e.removeEventListener(t,n,o||!1)},va=(e,t)=>{const n=ga(e.type,e,document,t);if((e=>C(e)&&pa.test(e.type))(e)&&v(e.pageX)&&!v(e.clientX)){const t=n.target.ownerDocument||document,o=t.documentElement,r=t.body,s=n;s.pageX=e.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),s.pageY=e.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)}return n},ya=(e,t,n)=>{const o=e.document,r={type:"ready"};if(n.domLoaded)return void t(r);const s=()=>{ba(e,"DOMContentLoaded",s),ba(e,"load",s),n.domLoaded||(n.domLoaded=!0,t(r)),e=null};"complete"===o.readyState||"interactive"===o.readyState&&o.body?s():ha(e,"DOMContentLoaded",s),n.domLoaded||ha(e,"load",s)};class Ca{constructor(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}bind(e,t,n,o){const r=this;let s;const a=window,i=e=>{r.executeHandlers(va(e||a.event),l)};if(!e||Jo(e)||tr(e))return n;let l;e[r.expando]?l=e[r.expando]:(l=r.count++,e[r.expando]=l,r.events[l]={}),o=o||e;const d=t.split(" ");let c=d.length;for(;c--;){let t=d[c],u=i,m=!1,f=!1;"DOMContentLoaded"===t&&(t="ready"),r.domLoaded&&"ready"===t&&"complete"===e.readyState?n.call(o,va({type:t})):(r.hasFocusIn||"focusin"!==t&&"focusout"!==t||(m=!0,f="focusin"===t?"focus":"blur",u=e=>{const t=va(e||a.event);t.type="focus"===t.type?"focusin":"focusout",r.executeHandlers(t,l)}),s=r.events[l][t],s?"ready"===t&&r.domLoaded?n(va({type:t})):s.push({func:n,scope:o}):(r.events[l][t]=s=[{func:n,scope:o}],s.fakeName=f,s.capture=m,s.nativeHandler=u,"ready"===t?ya(e,u,r):ha(e,f||t,u,m)))}return e=s=null,n}unbind(e,t,n){if(!e||Jo(e)||tr(e))return this;const o=e[this.expando];if(o){let r=this.events[o];if(t){const o=t.split(" ");let s=o.length;for(;s--;){const t=o[s],a=r[t];if(a){if(n){let e=a.length;for(;e--;)if(a[e].func===n){const n=a.nativeHandler,o=a.fakeName,s=a.capture,i=a.slice(0,e).concat(a.slice(e+1));i.nativeHandler=n,i.fakeName=o,i.capture=s,r[t]=i}}n&&0!==a.length||(delete r[t],ba(e,a.fakeName||t,a.nativeHandler,a.capture))}}}else ge(r,((t,n)=>{ba(e,t.fakeName||n,t.nativeHandler,t.capture)})),r={};for(const e in r)if(ke(r,e))return this;delete this.events[o];try{delete e[this.expando]}catch(t){e[this.expando]=null}}return this}fire(e,t,n){return this.dispatch(e,t,n)}dispatch(e,t,n){if(!e||Jo(e)||tr(e))return this;const o=va({type:t,target:e},n);do{const t=e[this.expando];t&&this.executeHandlers(o,t),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow}while(e&&!o.isPropagationStopped());return this}clean(e){if(!e||Jo(e)||tr(e))return this;if(e[this.expando]&&this.unbind(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName){this.unbind(e);const t=e.getElementsByTagName("*");let n=t.length;for(;n--;)(e=t[n])[this.expando]&&this.unbind(e)}return this}destroy(){this.events={}}cancel(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}executeHandlers(e,t){const n=this.events[t],o=n&&n[e.type];if(o)for(let t=0,n=o.length;t<n;t++){const n=o[t];if(n&&!1===n.func.call(n.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}}}Ca.Event=new Ca;const wa=Dt.each,xa=Dt.grep,ka="data-mce-style",Ea=Dt.makeMap("fill-opacity font-weight line-height opacity orphans widows z-index zoom"," "),Sa=(e,t,n)=>{y(n)||""===n?on(e,t):Jt(e,t,n)},_a=e=>e.replace(/[A-Z]/g,(e=>"-"+e.toLowerCase())),Na=(e,t)=>{let n=0;if(e)for(let o=e.nodeType,r=e.previousSibling;r;r=r.previousSibling){const e=r.nodeType;(!t||!Jo(r)||e!==o&&r.data.length)&&(n++,o=e)}return n},Ra=(e,t)=>{const n=en(t,"style"),o=e.serialize(e.parse(n),Ht(t));Sa(t,ka,o)},Aa=(e,t,n)=>{const o=_a(t);y(n)||""===n?fo(e,o):ao(e,o,((e,t)=>x(e)?ke(Ea,t)?e+"":e+"px":e)(n,o))},Oa=(e,t={})=>{const n={},o=window,r={};let s=0;const a=Ms.forElement(yn(e),{contentCssCors:t.contentCssCors,referrerPolicy:t.referrerPolicy}),i=[],l=t.schema?t.schema:ca({}),d=ua({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),c=t.ownEvents?new Ca:Ca.Event,u=l.getBlockElements(),f=t=>t&&e&&m(t)?e.getElementById(t):t,g=e=>{const t=f(e);return C(t)?yn(t):null},h=(e,t,n="")=>{let o;const r=g(e);if(C(r)&&Wt(r)){const e=Y[t];o=e&&e.get?e.get(r.dom,t):en(r,t)}return C(o)?o:n},b=e=>{const t=f(e);return y(t)?[]:t.attributes},v=(e,n,o)=>{T(e,(e=>{if($o(e)){const r=yn(e),s=""===o?null:o,a=en(r,n),i=Y[n];i&&i.set?i.set(r.dom,s,n):Sa(r,n,s),a!==s&&t.onSetAttrib&&t.onSetAttrib({attrElm:r.dom,attrName:n,attrValue:s})}}))},x=()=>t.root_element||e.body,k=(t,n)=>((e,t,n)=>{let o=0,r=0;const s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===lo(yn(e),"position")){const n=t.getBoundingClientRect();return o=n.left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,r=n.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop,{x:o,y:r}}let a=t;for(;a&&a!==n&&a.nodeType&&!Ps(a,n);){const e=a;o+=e.offsetLeft||0,r+=e.offsetTop||0,a=e.offsetParent}for(a=t.parentNode;a&&a!==n&&a.nodeType&&!Ps(a,n);)o-=a.scrollLeft||0,r-=a.scrollTop||0,a=a.parentNode;r+=(e=>Bs.isFirefox()&&"table"===Ht(e)?Ds(Mn(e)).filter((e=>"caption"===Ht(e))).bind((e=>Ds(Ln(e)).map((t=>{const n=t.dom.offsetTop,o=e.dom.offsetTop,r=e.dom.offsetHeight;return n<=o?-r:0})))).getOr(0):0)(yn(t))}return{x:o,y:r}})(e.body,f(t),n),S=(e,t,n)=>{const o=f(e);if(!y(o)&&$o(o))return n?lo(yn(o),_a(t)):("float"===(t=t.replace(/-(\D)/g,((e,t)=>t.toUpperCase())))&&(t="cssFloat"),o.style?o.style[t]:void 0)},_=e=>{const t=f(e);if(!t)return{w:0,h:0};let n=S(t,"width"),o=S(t,"height");return n&&-1!==n.indexOf("px")||(n="0"),o&&-1!==o.indexOf("px")||(o="0"),{w:parseInt(n,10)||t.offsetWidth||t.clientWidth,h:parseInt(o,10)||t.offsetHeight||t.clientHeight}},R=(e,t)=>{if(!e)return!1;const n=p(e)?e:[e];return $(n,(e=>xn(yn(e),t)))},A=(e,t,n,o)=>{const r=[];let s=f(e);o=void 0===o;const a=n||("BODY"!==x().nodeName?x().parentNode:null);if(m(t))if("*"===t)t=$o;else{const e=t;t=t=>R(t,e)}for(;s&&!(s===a||y(s.nodeType)||nr(s)||or(s));){if(!t||t(s)){if(!o)return[s];r.push(s)}s=s.parentNode}return o?r:null},O=(e,t,n)=>{let o=t;if(e){m(t)&&(o=e=>R(e,t));for(let t=e[n];t;t=t[n])if(w(o)&&o(t))return t}return null},T=function(e,t,n){const o=null!=n?n:this;if(p(e)){const n=[];return wa(e,((e,r)=>{const s=f(e);s&&n.push(t.call(o,s,r))})),n}{const n=f(e);return!!n&&t.call(o,n)}},B=(e,t)=>{T(e,(e=>{ge(t,((t,n)=>{v(e,n,t)}))}))},D=(e,t)=>{T(e,(e=>{const n=yn(e);So(n,t)}))},P=(t,n,o,r,s)=>T(t,(t=>{const a=m(n)?e.createElement(n):n;return C(o)&&B(a,o),r&&(!m(r)&&r.nodeType?a.appendChild(r):m(r)&&D(a,r)),s?a:t.appendChild(a)})),L=(t,n,o)=>P(e.createElement(t),t,n,o,!0),M=Zs.encodeAllRaw,I=(e,t)=>T(e,(e=>{const n=yn(e);return t&&V(Mn(n),(e=>{Kt(e)&&0===e.dom.length?wo(e):go(n,e)})),wo(n),n.dom})),F=(e,t,n)=>{T(e,(e=>{if($o(e)){const o=yn(e),r=t.split(" ");V(r,(e=>{C(n)?(n?un:fn)(o,e):((e,t)=>{const n=an(e)?e.dom.classList.toggle(t):((e,t)=>H(ln(e),t)?cn(e,t):dn(e,t))(e,t);mn(e)})(o,e)}))}}))},U=(e,t,n)=>T(t,(o=>{var r;const s=p(t)?e.cloneNode(!0):e;return n&&wa(xa(o.childNodes),(e=>{s.appendChild(e)})),null===(r=o.parentNode)||void 0===r||r.replaceChild(s,o),o})),z=e=>{if($o(e)){const t="a"===e.nodeName.toLowerCase()&&!h(e,"href")&&h(e,"id");if(h(e,"name")||h(e,"data-mce-bookmark")||t)return!0}return!1},j=()=>e.createRange(),q=(n,r,s,a)=>{if(p(n)){let e=n.length;const t=[];for(;e--;)t[e]=q(n[e],r,s,a);return t}return!t.collect||n!==e&&n!==o||i.push([n,r,s,a]),c.bind(n,r,s,a||G)},W=(t,n,r)=>{if(p(t)){let e=t.length;const o=[];for(;e--;)o[e]=W(t[e],n,r);return o}if(i.length>0&&(t===e||t===o)){let e=i.length;for(;e--;){const[o,s,a]=i[e];t!==o||n&&n!==s||r&&r!==a||c.unbind(o,s,a)}}return c.unbind(t,n,r)},K=e=>{if(e&&$o(e)){const t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},G={doc:e,settings:t,win:o,files:r,stdMode:!0,boxModel:!0,styleSheetLoader:a,boundEvents:i,styles:d,schema:l,events:c,isBlock:e=>m(e)?ke(u,e):$o(e)&&(ke(u,e.nodeName)||As(l,e)),root:null,clone:(e,t)=>e.cloneNode(t),getRoot:x,getViewPort:e=>{const t=Mo(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:e=>{const t=f(e),n=k(t),o=_(t);return{x:n.x,y:n.y,w:o.w,h:o.h}},getSize:_,getParent:(e,t,n)=>{const o=A(e,t,n,!1);return o&&o.length>0?o[0]:null},getParents:A,get:f,getNext:(e,t)=>O(e,t,"nextSibling"),getPrev:(e,t)=>O(e,t,"previousSibling"),select:(n,o)=>{var r,s;const a=null!==(s=null!==(r=f(o))&&void 0!==r?r:t.root_element)&&void 0!==s?s:e;return w(a.querySelectorAll)?ce(a.querySelectorAll(n)):[]},is:R,add:P,create:L,createHTML:(e,t,n="")=>{let o="<"+e;for(const e in t)Ee(t,e)&&(o+=" "+e+'="'+M(t[e])+'"');return Ye(n)&&ke(l.getVoidElements(),e)?o+" />":o+">"+n+"</"+e+">"},createFragment:t=>{const n=e.createElement("div"),o=e.createDocumentFragment();let r;for(o.appendChild(n),t&&(n.innerHTML=t);r=n.firstChild;)o.appendChild(r);return o.removeChild(n),o},remove:I,setStyle:(e,n,o)=>{T(e,(e=>{const r=yn(e);Aa(r,n,o),t.update_styles&&Ra(d,r)}))},getStyle:S,setStyles:(e,n)=>{T(e,(e=>{const o=yn(e);ge(n,((e,t)=>{Aa(o,t,e)})),t.update_styles&&Ra(d,o)}))},removeAllAttribs:e=>T(e,(e=>{const t=e.attributes;for(let n=t.length-1;n>=0;n--)e.removeAttributeNode(t.item(n))})),setAttrib:v,setAttribs:B,getAttrib:h,getPos:k,parseStyle:e=>d.parse(e),serializeStyle:(e,t)=>d.serialize(e,t),addStyle:t=>{if(G!==Oa.DOM&&e===document){if(n[t])return;n[t]=!0}let o=e.getElementById("mceDefaultStyles");if(!o){o=e.createElement("style"),o.id="mceDefaultStyles",o.type="text/css";const t=e.head;t.firstChild?t.insertBefore(o,t.firstChild):t.appendChild(o)}o.styleSheet?o.styleSheet.cssText+=t:o.appendChild(e.createTextNode(t))},loadCSS:e=>{e||(e=""),V(e.split(","),(e=>{r[e]=!0,a.load(e).catch(E)}))},addClass:(e,t)=>{F(e,t,!0)},removeClass:(e,t)=>{F(e,t,!1)},hasClass:(e,t)=>{const n=g(e),o=t.split(" ");return C(n)&&ne(o,(e=>gn(n,e)))},toggleClass:F,show:e=>{T(e,(e=>fo(yn(e),"display")))},hide:e=>{T(e,(e=>ao(yn(e),"display","none")))},isHidden:e=>{const t=g(e);return C(t)&&Pt(uo(t,"display"),"none")},uniqueId:e=>(e||"mce_")+s++,setHTML:D,getOuterHTML:e=>{const t=g(e);return C(t)?$o(t.dom)?t.dom.outerHTML:(e=>{const t=bn("div"),n=yn(e.dom.cloneNode(!0));return bo(t,n),Eo(t)})(t):""},setOuterHTML:(e,t)=>{T(e,(e=>{$o(e)&&(e.outerHTML=t)}))},decode:Zs.decode,encode:M,insertAfter:(e,t)=>{const n=f(t);return T(e,(e=>{const t=null==n?void 0:n.parentNode,o=null==n?void 0:n.nextSibling;return t&&(o?t.insertBefore(e,o):t.appendChild(e)),e}))},replace:U,rename:(e,t)=>{if(e.nodeName!==t.toUpperCase()){const n=L(t);return wa(b(e),(t=>{v(n,t.nodeName,h(e,t.nodeName))})),U(n,e,!0),n}return e},findCommonAncestor:(e,t)=>{let n=e;for(;n;){let e=t;for(;e&&n!==e;)e=e.parentNode;if(n===e)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},run:T,getAttribs:b,isEmpty:(e,t,n)=>{let o=0;if(z(e))return!1;const r=e.firstChild;if(r){const s=new zo(r,e),a=l?l.getWhitespaceElements():{},i=t||(l?l.getNonEmptyElements():null);let d=r;do{if($o(d)){const e=d.getAttribute("data-mce-bogus");if(e){d=s.next("all"===e);continue}const t=d.nodeName.toLowerCase();if(i&&i[t]){if("br"===t){o++,d=s.next();continue}return!1}if(z(d))return!1}if(tr(d))return!1;if(Jo(d)&&!ds(d.data)&&(!(null==n?void 0:n.includeZwsp)||!cs(d.data)))return!1;if(Jo(d)&&d.parentNode&&a[d.parentNode.nodeName]&&ds(d.data))return!1;d=s.next()}while(d)}return o<=1},createRng:j,nodeIndex:Na,split:(e,t,n)=>{let o,r,s=j();if(e&&t&&e.parentNode&&t.parentNode){const a=e.parentNode;return s.setStart(a,Na(e)),s.setEnd(t.parentNode,Na(t)),o=s.extractContents(),s=j(),s.setStart(t.parentNode,Na(t)+1),s.setEnd(a,Na(e)+1),r=s.extractContents(),a.insertBefore(Us(G,o),e),n?a.insertBefore(n,e):a.insertBefore(t,e),a.insertBefore(Us(G,r),e),I(e),n||t}},bind:q,unbind:W,fire:(e,t,n)=>c.dispatch(e,t,n),dispatch:(e,t,n)=>c.dispatch(e,t,n),getContentEditable:K,getContentEditableParent:e=>{const t=x();let n=null;for(let o=e;o&&o!==t&&(n=K(o),null===n);o=o.parentNode);return n},isEditable:e=>{if(C(e)){const t=$o(e)?e:e.parentElement;return C(t)&&no(yn(t))}return!1},destroy:()=>{if(i.length>0){let e=i.length;for(;e--;){const[t,n,o]=i[e];c.unbind(t,n,o)}}ge(r,((e,t)=>{a.unload(t),delete r[t]}))},isChildOf:(e,t)=>e===t||t.contains(e),dumpRng:e=>"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},Y=((e,t,n)=>{const o=t.keep_values,r={set:(e,o,r)=>{const s=yn(e);w(t.url_converter)&&C(o)&&(o=t.url_converter.call(t.url_converter_scope||n(),String(o),r,e)),Sa(s,"data-mce-"+r,o),Sa(s,r,o)},get:(e,t)=>{const n=yn(e);return en(n,"data-mce-"+t)||en(n,t)}},s={style:{set:(t,n)=>{const r=yn(t);o&&Sa(r,ka,n),on(r,"style"),m(n)&&io(r,e.parse(n))},get:t=>{const n=yn(t),o=en(n,ka)||en(n,"style");return e.serialize(e.parse(o),Ht(n))}}};return o&&(s.href=s.src=r),s})(d,t,N(G));return G};Oa.DOM=Oa(document),Oa.nodeIndex=Na;const Ta=Oa.DOM;class Ba{constructor(e={}){this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=!1,this.settings=e}_setReferrerPolicy(e){this.settings.referrerPolicy=e}loadScript(e){return new Promise(((t,n)=>{const o=Ta;let r;const s=()=>{o.remove(a),r&&(r.onerror=r.onload=r=null)},a=o.uniqueId();r=document.createElement("script"),r.id=a,r.type="text/javascript",r.src=Dt._addCacheSuffix(e),this.settings.referrerPolicy&&o.setAttrib(r,"referrerpolicy",this.settings.referrerPolicy),r.onload=()=>{s(),t()},r.onerror=()=>{s(),n("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(r)}))}isDone(e){return 2===this.states[e]}markDone(e){this.states[e]=2}add(e){const t=this;return t.queue.push(e),void 0===t.states[e]&&(t.states[e]=0),new Promise(((n,o)=>{t.scriptLoadedCallbacks[e]||(t.scriptLoadedCallbacks[e]=[]),t.scriptLoadedCallbacks[e].push({resolve:n,reject:o})}))}load(e){return this.add(e)}remove(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]}loadQueue(){const e=this.queue;return this.queue=[],this.loadScripts(e)}loadScripts(e){const t=this,n=(e,n)=>{xe(t.scriptLoadedCallbacks,n).each((t=>{V(t,(t=>t[e](n)))})),delete t.scriptLoadedCallbacks[n]},o=e=>{const t=G(e,(e=>"rejected"===e.status));return t.length>0?Promise.reject(te(t,(({reason:e})=>p(e)?e:[e]))):Promise.resolve()},r=e=>Promise.allSettled(q(e,(e=>2===t.states[e]?(n("resolve",e),Promise.resolve()):3===t.states[e]?(n("reject",e),Promise.reject(e)):(t.states[e]=1,t.loadScript(e).then((()=>{t.states[e]=2,n("resolve",e);const s=t.queue;return s.length>0?(t.queue=[],r(s).then(o)):Promise.resolve()}),(()=>(t.states[e]=3,n("reject",e),Promise.reject(e)))))))),s=e=>(t.loading=!0,r(e).then((e=>{t.loading=!1;const n=t.queueLoadedCallbacks.shift();return I.from(n).each(P),o(e)}))),a=Se(e);return t.loading?new Promise(((e,n)=>{t.queueLoadedCallbacks.push((()=>{s(a).then(e,n)}))})):s(a)}}Ba.ScriptLoader=new Ba;const Da=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},Pa={},La=Da("en"),Ma=()=>xe(Pa,La.get()),Ia={getData:()=>pe(Pa,(e=>({...e}))),setCode:e=>{e&&La.set(e)},getCode:()=>La.get(),add:(e,t)=>{let n=Pa[e];n||(Pa[e]=n={});const o=q(me(t),(e=>e.toLowerCase()));ge(t,((e,r)=>{const s=r.toLowerCase();s!==r&&((e,t)=>{const n=e.indexOf(t);return-1!==n&&e.indexOf(t,n+1)>n})(o,s)?(ke(t,s)||(n[s]=e),n[r]=e):n[s]=e}))},translate:e=>{const t=Ma().getOr({}),n=e=>w(e)?Object.prototype.toString.call(e):o(e)?"":""+e,o=e=>""===e||null==e,r=e=>{const o=n(e);return ke(t,o)?n(t[o]):xe(t,o.toLowerCase()).map(n).getOr(o)},s=e=>e.replace(/{context:\w+}$/,"");if(o(e))return"";if(f(a=e)&&ke(a,"raw"))return n(e.raw);var a;if((e=>p(e)&&e.length>1)(e)){const t=e.slice(1);return s(r(e[0]).replace(/\{([0-9]+)\}/g,((e,o)=>ke(t,o)?n(t[o]):e)))}return s(r(e))},isRtl:()=>Ma().bind((e=>xe(e,"_dir"))).exists((e=>"rtl"===e)),hasCode:e=>ke(Pa,e)},Fa=()=>{const e=[],t={},n={},o=[],r=(e,t)=>{const n=G(o,(n=>n.name===e&&n.state===t));V(n,(e=>e.resolve()))},s=e=>ke(t,e),a=(e,n)=>{const o=Ia.getCode();!o||n&&-1===(","+(n||"")+",").indexOf(","+o+",")||Ba.ScriptLoader.add(t[e]+"/langs/"+o+".js")},i=(e,t="added")=>"added"===t&&(e=>ke(n,e))(e)||"loaded"===t&&s(e)?Promise.resolve():new Promise((n=>{o.push({name:e,state:t,resolve:n})}));return{items:e,urls:t,lookup:n,get:e=>{if(n[e])return n[e].instance},requireLangPack:(e,t)=>{!1!==Fa.languageLoad&&(s(e)?a(e,t):i(e,"loaded").then((()=>a(e,t))))},add:(t,o)=>(e.push(o),n[t]={instance:o},r(t,"added"),o),remove:e=>{delete t[e],delete n[e]},createUrl:(e,t)=>m(t)?m(e)?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}:t,load:(e,o)=>{if(t[e])return Promise.resolve();let s=m(o)?o:o.prefix+o.resource+o.suffix;0!==s.indexOf("/")&&-1===s.indexOf("://")&&(s=Fa.baseURL+"/"+s),t[e]=s.substring(0,s.lastIndexOf("/"));const a=()=>(r(e,"loaded"),Promise.resolve());return n[e]?a():Ba.ScriptLoader.add(s).then(a)},waitFor:i}};Fa.languageLoad=!0,Fa.baseURL="",Fa.PluginManager=Fa(),Fa.ThemeManager=Fa(),Fa.ModelManager=Fa();const Ua=e=>{const t=Da(I.none()),n=()=>t.get().each((e=>clearInterval(e)));return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:o=>{n(),t.set(I.some(setInterval(o,e)))}}},za=()=>{const e=(e=>{const t=Da(I.none()),n=()=>t.get().each(e);return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{n(),t.set(I.some(e))}}})(E);return{...e,on:t=>e.get().each(t)}},ja=(e,t)=>{let n=null;return{cancel:()=>{h(n)||(clearTimeout(n),n=null)},throttle:(...o)=>{h(n)&&(n=setTimeout((()=>{n=null,e.apply(null,o)}),t))}}},Ha=(e,t)=>{let n=null;const o=()=>{h(n)||(clearTimeout(n),n=null)};return{cancel:o,throttle:(...r)=>{o(),n=setTimeout((()=>{n=null,e.apply(null,r)}),t)}}},$a=N("mce-annotation"),qa=N("data-mce-annotation"),Va=N("data-mce-annotation-uid"),Wa=N("data-mce-annotation-active"),Ka=N("data-mce-annotation-classes"),Ga=N("data-mce-annotation-attrs"),Ya=e=>t=>En(t,e),Xa=(e,t)=>{const n=e.selection.getRng(),o=yn(n.startContainer),r=yn(e.getBody()),s=t.fold((()=>"."+$a()),(e=>`[${qa()}="${e}"]`)),a=In(o,n.startOffset).getOr(o);return to(a,s,Ya(r)).bind((t=>tn(t,`${Va()}`).bind((n=>tn(t,`${qa()}`).map((t=>{const o=Ja(e,n);return{uid:n,name:t,elements:o}}))))))},Qa=(e,t)=>nn(e,"data-mce-bogus")||Uo(e,'[data-mce-bogus="all"]',Ya(t)),Ja=(e,t)=>{const n=yn(e.getBody()),o=Fo(n,`[${Va()}="${t}"]`);return G(o,(e=>!Qa(e,n)))},Za=(e,t)=>{const n=yn(e.getBody()),o=Fo(n,`[${qa()}="${t}"]`),r={};return V(o,(e=>{if(!Qa(e,n)){const t=en(e,Va()),n=xe(r,t).getOr([]);r[t]=n.concat([e])}})),r};let ei=0;const ti=e=>{const t=(new Date).getTime(),n=Math.floor(1e9*Math.random());return ei++,e+"_"+n+ei+String(t)},ni=(e,t)=>yn(e.dom.cloneNode(t)),oi=e=>ni(e,!1),ri=e=>ni(e,!0),si=(e,t,n=L)=>{const o=new zo(e,t),r=e=>{let t;do{t=o[e]()}while(t&&!Jo(t)&&!n(t));return I.from(t).filter(Jo)};return{current:()=>I.from(o.current()).filter(Jo),next:()=>r("next"),prev:()=>r("prev"),prev2:()=>r("prev2")}},ai=(e,t)=>{const n=t||(t=>e.isBlock(t)||rr(t)||ir(t)),o=(e,t,n,r)=>{if(Jo(e)){const n=r(e,t,e.data);if(-1!==n)return I.some({container:e,offset:n})}return n().bind((e=>o(e.container,e.offset,n,r)))};return{backwards:(t,r,s,a)=>{const i=si(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.prev().map((e=>({container:e,offset:e.length})))),s).getOrNull()},forwards:(t,r,s,a)=>{const i=si(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.next().map((e=>({container:e,offset:0})))),s).getOrNull()}}},ii=Math.round,li=e=>e?{left:ii(e.left),top:ii(e.top),bottom:ii(e.bottom),right:ii(e.right),width:ii(e.width),height:ii(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0},di=(e,t)=>(e=li(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e),ci=(e,t,n)=>e>=0&&e<=Math.min(t.height,n.height)/2,ui=(e,t)=>{const n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&ci(t.top-e.bottom,e,t)},mi=(e,t)=>e.top>t.bottom||!(e.bottom<t.top)&&ci(t.bottom-e.top,e,t),fi=(e,t,n)=>{const o=Math.max(Math.min(t,e.left+e.width),e.left),r=Math.max(Math.min(n,e.top+e.height),e.top);return Math.sqrt((t-o)*(t-o)+(n-r)*(n-r))},gi=e=>{const t=e.startContainer,n=e.startOffset;return t===e.endContainer&&t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},pi=(e,t)=>{if($o(e)&&e.hasChildNodes()){const n=e.childNodes,o=((e,t,n)=>Math.min(Math.max(e,0),n))(t,0,n.length-1);return n[o]}return e},hi=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),bi=e=>m(e)&&e.charCodeAt(0)>=768&&hi.test(e),vi=$o,yi=ss,Ci=Wo("display","block table"),wi=Wo("float","left right"),xi=((...e)=>t=>{for(let n=0;n<e.length;n++)if(!e[n](t))return!1;return!0})(vi,yi,T(wi)),ki=T(Wo("white-space","pre pre-line pre-wrap")),Ei=Jo,Si=rr,_i=Oa.nodeIndex,Ni=(e,t)=>t<0&&$o(e)&&e.hasChildNodes()?void 0:pi(e,t),Ri=e=>e?e.createRange():Oa.DOM.createRng(),Ai=e=>m(e)&&/[\r\n\t ]/.test(e),Oi=e=>!!e.setStart&&!!e.setEnd,Ti=e=>{const t=e.startContainer,n=e.startOffset;if(Ai(e.toString())&&ki(t.parentNode)&&Jo(t)){const e=t.data;if(Ai(e[n-1])||Ai(e[n+1]))return!0}return!1},Bi=e=>0===e.left&&0===e.right&&0===e.top&&0===e.bottom,Di=e=>{var t;let n;const o=e.getClientRects();return n=o.length>0?li(o[0]):li(e.getBoundingClientRect()),!Oi(e)&&Si(e)&&Bi(n)?(e=>{const t=e.ownerDocument,n=Ri(t),o=t.createTextNode(pr),r=e.parentNode;r.insertBefore(o,e),n.setStart(o,0),n.setEnd(o,1);const s=li(n.getBoundingClientRect());return r.removeChild(o),s})(e):Bi(n)&&Oi(e)&&null!==(t=(e=>{const t=e.startContainer,n=e.endContainer,o=e.startOffset,r=e.endOffset;if(t===n&&Jo(n)&&0===o&&1===r){const t=e.cloneRange();return t.setEndAfter(n),Di(t)}return null})(e))&&void 0!==t?t:n},Pi=(e,t)=>{const n=di(e,t);return n.width=1,n.right=n.left+1,n},Li=(e,t,n)=>{const o=()=>(n||(n=(e=>{const t=[],n=e=>{var n,o;0!==e.height&&(t.length>0&&(n=e,o=t[t.length-1],n.left===o.left&&n.top===o.top&&n.bottom===o.bottom&&n.right===o.right)||t.push(e))},o=(e,t)=>{const o=Ri(e.ownerDocument);if(t<e.data.length){if(bi(e.data[t]))return;if(bi(e.data[t-1])&&(o.setStart(e,t),o.setEnd(e,t+1),!Ti(o)))return void n(Pi(Di(o),!1))}t>0&&(o.setStart(e,t-1),o.setEnd(e,t),Ti(o)||n(Pi(Di(o),!1))),t<e.data.length&&(o.setStart(e,t),o.setEnd(e,t+1),Ti(o)||n(Pi(Di(o),!0)))},r=e.container(),s=e.offset();if(Ei(r))return o(r,s),t;if(vi(r))if(e.isAtEnd()){const e=Ni(r,s);Ei(e)&&o(e,e.data.length),xi(e)&&!Si(e)&&n(Pi(Di(e),!1))}else{const a=Ni(r,s);if(Ei(a)&&o(a,0),xi(a)&&e.isAtEnd())return n(Pi(Di(a),!1)),t;const i=Ni(e.container(),e.offset()-1);xi(i)&&!Si(i)&&(Ci(i)||Ci(a)||!xi(a))&&n(Pi(Di(i),!1)),xi(a)&&n(Pi(Di(a),!0))}return t})(Li(e,t))),n);return{container:N(e),offset:N(t),toRange:()=>{const n=Ri(e.ownerDocument);return n.setStart(e,t),n.setEnd(e,t),n},getClientRects:o,isVisible:()=>o().length>0,isAtStart:()=>(Ei(e),0===t),isAtEnd:()=>Ei(e)?t>=e.data.length:t>=e.childNodes.length,isEqual:n=>n&&e===n.container()&&t===n.offset(),getNode:n=>Ni(e,n?t-1:t)}};Li.fromRangeStart=e=>Li(e.startContainer,e.startOffset),Li.fromRangeEnd=e=>Li(e.endContainer,e.endOffset),Li.after=e=>Li(e.parentNode,_i(e)+1),Li.before=e=>Li(e.parentNode,_i(e)),Li.isAbove=(e,t)=>Mt(le(t.getClientRects()),de(e.getClientRects()),ui).getOr(!1),Li.isBelow=(e,t)=>Mt(de(t.getClientRects()),le(e.getClientRects()),mi).getOr(!1),Li.isAtStart=e=>!!e&&e.isAtStart(),Li.isAtEnd=e=>!!e&&e.isAtEnd(),Li.isTextPosition=e=>!!e&&Jo(e.container()),Li.isElementPosition=e=>!Li.isTextPosition(e);const Mi=(e,t)=>{Jo(t)&&0===t.data.length&&e.remove(t)},Ii=(e,t,n)=>{or(n)?((e,t,n)=>{const o=I.from(n.firstChild),r=I.from(n.lastChild);t.insertNode(n),o.each((t=>Mi(e,t.previousSibling))),r.each((t=>Mi(e,t.nextSibling)))})(e,t,n):((e,t,n)=>{t.insertNode(n),Mi(e,n.previousSibling),Mi(e,n.nextSibling)})(e,t,n)},Fi=Jo,Ui=Go,zi=Oa.nodeIndex,ji=e=>{const t=e.parentNode;return Ui(t)?ji(t):t},Hi=e=>e?Te(e.childNodes,((e,t)=>(Ui(t)&&"BR"!==t.nodeName?e=e.concat(Hi(t)):e.push(t),e)),[]):[],$i=e=>t=>e===t,qi=e=>(Fi(e)?"text()":e.nodeName.toLowerCase())+"["+(e=>{let t,n;t=Hi(ji(e)),n=Be(t,$i(e),e),t=t.slice(0,n+1);const o=Te(t,((e,n,o)=>(Fi(n)&&Fi(t[o-1])&&e++,e)),0);return t=Oe(t,Vo([e.nodeName])),n=Be(t,$i(e),e),n-o})(e)+"]",Vi=(e,t)=>{let n,o=[],r=t.container(),s=t.offset();if(Fi(r))n=((e,t)=>{let n=e;for(;(n=n.previousSibling)&&Fi(n);)t+=n.data.length;return t})(r,s);else{const e=r.childNodes;s>=e.length?(n="after",s=e.length-1):n="before",r=e[s]}o.push(qi(r));let a=((e,t,n)=>{const o=[];for(let n=t.parentNode;n&&n!==e;n=n.parentNode)o.push(n);return o})(e,r);return a=Oe(a,T(Go)),o=o.concat(Ae(a,(e=>qi(e)))),o.reverse().join("/")+","+n},Wi=(e,t)=>{if(!t)return null;const n=t.split(","),o=n[0].split("/"),r=n.length>1?n[1]:"before",s=Te(o,((e,t)=>{const n=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return n?("text()"===n[1]&&(n[1]="#text"),((e,t,n)=>{let o=Hi(e);return o=Oe(o,((e,t)=>!Fi(e)||!Fi(o[t-1]))),o=Oe(o,Vo([t])),o[n]})(e,n[1],parseInt(n[2],10))):null}),e);if(!s)return null;if(!Fi(s)&&s.parentNode){let e;return e="after"===r?zi(s)+1:zi(s),Li(s.parentNode,e)}return((e,t)=>{let n=e,o=0;for(;Fi(n);){const r=n.data.length;if(t>=o&&t<=o+r){e=n,t-=o;break}if(!Fi(n.nextSibling)){e=n,t=r;break}o+=r,n=n.nextSibling}return Fi(e)&&t>e.data.length&&(t=e.data.length),Li(e,t)})(s,parseInt(r,10))},Ki=ir,Gi=(e,t,n,o,r)=>{const s=r?o.startContainer:o.endContainer;let a=r?o.startOffset:o.endOffset;const i=[],l=e.getRoot();if(Jo(s))i.push(n?((e,t,n)=>{let o=e(t.data.slice(0,n)).length;for(let n=t.previousSibling;n&&Jo(n);n=n.previousSibling)o+=e(n.data).length;return o})(t,s,a):a);else{let t=0;const o=s.childNodes;a>=o.length&&o.length&&(t=1,a=Math.max(0,o.length-1)),i.push(e.nodeIndex(o[a],n)+t)}for(let t=s;t&&t!==l;t=t.parentNode)i.push(e.nodeIndex(t,n));return i},Yi=(e,t,n)=>{let o=0;return Dt.each(e.select(t),(e=>"all"===e.getAttribute("data-mce-bogus")?void 0:e!==n&&void o++)),o},Xi=(e,t)=>{let n=t?e.startContainer:e.endContainer,o=t?e.startOffset:e.endOffset;if($o(n)&&"TR"===n.nodeName){const r=n.childNodes;n=r[Math.min(t?o:o-1,r.length-1)],n&&(o=t?0:n.childNodes.length,t?e.setStart(n,o):e.setEnd(n,o))}},Qi=e=>(Xi(e,!0),Xi(e,!1),e),Ji=(e,t)=>{if($o(e)&&(e=pi(e,t),Ki(e)))return e;if($r(e)){Jo(e)&&jr(e)&&(e=e.parentNode);let t=e.previousSibling;if(Ki(t))return t;if(t=e.nextSibling,Ki(t))return t}},Zi=(e,t,n)=>{const o=n.getNode(),r=n.getRng();if("IMG"===o.nodeName||Ki(o)){const e=o.nodeName;return{name:e,index:Yi(n.dom,e,o)}}const s=(e=>Ji(e.startContainer,e.startOffset)||Ji(e.endContainer,e.endOffset))(r);if(s){const e=s.tagName;return{name:e,index:Yi(n.dom,e,s)}}return((e,t,n,o)=>{const r=t.dom,s=Gi(r,e,n,o,!0),a=t.isForward(),i=Xr(o)?{isFakeCaret:!0}:{};return t.isCollapsed()?{start:s,forward:a,...i}:{start:s,end:Gi(r,e,n,o,!1),forward:a,...i}})(e,n,t,r)},el=(e,t,n)=>{const o={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",o,"&#xFEFF;"):e.create("span",o)},tl=(e,t)=>{const n=e.dom;let o=e.getRng();const r=n.uniqueId(),s=e.isCollapsed(),a=e.getNode(),i=a.nodeName,l=e.isForward();if("IMG"===i)return{name:i,index:Yi(n,i,a)};const d=Qi(o.cloneRange());if(!s){d.collapse(!1);const e=el(n,r+"_end",t);Ii(n,d,e)}o=Qi(o),o.collapse(!0);const c=el(n,r+"_start",t);return Ii(n,o,c),e.moveToBookmark({id:r,keep:!0,forward:l}),{id:r,forward:l}},nl=O(Zi,R,!0),ol=e=>{const t=t=>t(e),n=N(e),o=()=>r,r={tag:!0,inner:e,fold:(t,n)=>n(e),isValue:M,isError:L,map:t=>sl.value(t(e)),mapError:o,bind:t,exists:t,forall:t,getOr:n,or:o,getOrThunk:n,orThunk:o,getOrDie:n,each:t=>{t(e)},toOptional:()=>I.some(e)};return r},rl=e=>{const t=()=>n,n={tag:!1,inner:e,fold:(t,n)=>t(e),isValue:L,isError:M,map:t,mapError:t=>sl.error(t(e)),bind:t,exists:L,forall:M,getOr:R,or:R,getOrThunk:D,orThunk:D,getOrDie:B(String(e)),each:E,toOptional:I.none};return n},sl={value:ol,error:rl,fromOption:(e,t)=>e.fold((()=>rl(t)),ol)},al=e=>{if(!p(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],n={};return V(e,((o,r)=>{const s=me(o);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],i=o[a];if(void 0!==n[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!p(i))throw new Error("case arguments must be an array");t.push(a),n[a]=(...n)=>{const o=n.length;if(o!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+o);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,n)},match:e=>{const o=me(e);if(t.length!==o.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+o.join(","));if(!ne(t,(e=>H(o,e))))throw new Error("Not all branches were specified when using match. Specified: "+o.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,n)},log:e=>{console.log(e,{constructors:t,constructor:a,params:n})}}}})),n};al([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const il=e=>"inline-command"===e.type||"inline-format"===e.type,ll=e=>"block-command"===e.type||"block-format"===e.type,dl=e=>{const t=t=>sl.error({message:t,pattern:e}),n=(n,o,r)=>{if(void 0!==e.format){let r;if(p(e.format)){if(!ne(e.format,m))return t(n+" pattern has non-string items in the `format` array");r=e.format}else{if(!m(e.format))return t(n+" pattern has non-string `format` parameter");r=[e.format]}return sl.value(o(r))}return void 0!==e.cmd?m(e.cmd)?sl.value(r(e.cmd,e.value)):t(n+" pattern has non-string `cmd` parameter"):t(n+" pattern is missing both `format` and `cmd` parameters")};if(!f(e))return t("Raw pattern is not an object");if(!m(e.start))return t("Raw pattern is missing `start` parameter");if(void 0!==e.end){if(!m(e.end))return t("Inline pattern has non-string `end` parameter");if(0===e.start.length&&0===e.end.length)return t("Inline pattern has empty `start` and `end` parameters");let o=e.start,r=e.end;return 0===r.length&&(r=o,o=""),n("Inline",(e=>({type:"inline-format",start:o,end:r,format:e})),((e,t)=>({type:"inline-command",start:o,end:r,cmd:e,value:t})))}return void 0!==e.replacement?m(e.replacement)?0===e.start.length?t("Replacement pattern has empty `start` parameter"):sl.value({type:"inline-command",start:"",end:e.start,cmd:"mceInsertContent",value:e.replacement}):t("Replacement pattern has non-string `replacement` parameter"):0===e.start.length?t("Block pattern has empty `start` parameter"):n("Block",(t=>({type:"block-format",start:e.start,format:t[0]})),((t,n)=>({type:"block-command",start:e.start,cmd:t,value:n})))},cl=e=>G(e,ll),ul=e=>G(e,il),ml=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{n.push(e)}))})),{errors:t,values:n}})(q(e,dl));return V(t.errors,(e=>console.error(e.message,e.pattern))),t.values},fl=xt().deviceType,gl=fl.isTouch(),pl=Oa.DOM,hl=e=>u(e,RegExp),bl=e=>t=>t.options.get(e),vl=e=>m(e)||f(e),yl=(e,t="")=>n=>{const o=m(n);if(o){if(-1!==n.indexOf("=")){const r=(e=>{const t=e.indexOf("=")>0?e.split(/[;,](?![^=;,]*(?:[;,]|$))/):e.split(",");return X(t,((e,t)=>{const n=t.split("="),o=n[0],r=n.length>1?n[1]:o;return e[Ve(o)]=Ve(r),e}),{})})(n);return{value:xe(r,e.id).getOr(t),valid:o}}return{value:n,valid:o}}return{valid:!1,message:"Must be a string."}},Cl=bl("iframe_attrs"),wl=bl("doctype"),xl=bl("document_base_url"),kl=bl("body_id"),El=bl("body_class"),Sl=bl("content_security_policy"),_l=bl("br_in_pre"),Nl=bl("forced_root_block"),Rl=bl("forced_root_block_attrs"),Al=bl("newline_behavior"),Ol=bl("br_newline_selector"),Tl=bl("no_newline_selector"),Bl=bl("keep_styles"),Dl=bl("end_container_on_empty_block"),Pl=bl("automatic_uploads"),Ll=bl("images_reuse_filename"),Ml=bl("images_replace_blob_uris"),Il=bl("icons"),Fl=bl("icons_url"),Ul=bl("images_upload_url"),zl=bl("images_upload_base_path"),jl=bl("images_upload_credentials"),Hl=bl("images_upload_handler"),$l=bl("content_css_cors"),ql=bl("referrer_policy"),Vl=bl("language"),Wl=bl("language_url"),Kl=bl("indent_use_margin"),Gl=bl("indentation"),Yl=bl("content_css"),Xl=bl("content_style"),Ql=bl("font_css"),Jl=bl("directionality"),Zl=bl("inline_boundaries_selector"),ed=bl("object_resizing"),td=bl("resize_img_proportional"),nd=bl("placeholder"),od=bl("event_root"),rd=bl("service_message"),sd=bl("theme"),ad=bl("theme_url"),id=bl("model"),ld=bl("model_url"),dd=bl("inline_boundaries"),cd=bl("formats"),ud=bl("preview_styles"),md=bl("format_empty_lines"),fd=bl("format_noneditable_selector"),gd=bl("custom_ui_selector"),pd=bl("inline"),hd=bl("hidden_input"),bd=bl("submit_patch"),vd=bl("add_form_submit_trigger"),yd=bl("add_unload_trigger"),Cd=bl("custom_undo_redo_levels"),wd=bl("disable_nodechange"),xd=bl("readonly"),kd=bl("editable_root"),Ed=bl("content_css_cors"),Sd=bl("plugins"),_d=bl("external_plugins"),Nd=bl("block_unsupported_drop"),Rd=bl("visual"),Ad=bl("visual_table_class"),Od=bl("visual_anchor_class"),Td=bl("iframe_aria_text"),Bd=bl("setup"),Dd=bl("init_instance_callback"),Pd=bl("urlconverter_callback"),Ld=bl("auto_focus"),Md=bl("browser_spellcheck"),Id=bl("protect"),Fd=bl("paste_block_drop"),Ud=bl("paste_data_images"),zd=bl("paste_preprocess"),jd=bl("paste_postprocess"),Hd=bl("newdocument_content"),$d=bl("paste_webkit_styles"),qd=bl("paste_remove_styles_if_webkit"),Vd=bl("paste_merge_formats"),Wd=bl("smart_paste"),Kd=bl("paste_as_text"),Gd=bl("paste_tab_spaces"),Yd=bl("allow_html_data_urls"),Xd=bl("text_patterns"),Qd=bl("text_patterns_lookup"),Jd=bl("noneditable_class"),Zd=bl("editable_class"),ec=bl("noneditable_regexp"),tc=bl("preserve_cdata"),nc=bl("highlight_on_focus"),oc=bl("xss_sanitization"),rc=bl("init_content_sync"),sc=e=>Dt.explode(e.options.get("images_file_types")),ac=bl("table_tab_navigation"),ic=bl("details_initial_state"),lc=bl("details_serialized_state"),dc=$o,cc=Jo,uc=e=>{const t=e.parentNode;t&&t.removeChild(e)},mc=e=>{const t=Fr(e);return{count:e.length-t.length,text:t}},fc=e=>{let t;for(;-1!==(t=e.data.lastIndexOf(Mr));)e.deleteData(t,1)},gc=(e,t)=>(hc(e),t),pc=(e,t)=>Li.isTextPosition(t)?((e,t)=>cc(e)&&t.container()===e?((e,t)=>{const n=mc(e.data.substr(0,t.offset())),o=mc(e.data.substr(t.offset()));return(n.text+o.text).length>0?(fc(e),Li(e,t.offset()-n.count)):t})(e,t):gc(e,t))(e,t):((e,t)=>t.container()===e.parentNode?((e,t)=>{const n=t.container(),o=((e,t)=>{const n=j(e,t);return-1===n?I.none():I.some(n)})(ce(n.childNodes),e).map((e=>e<t.offset()?Li(n,t.offset()-1):t)).getOr(t);return hc(e),o})(e,t):gc(e,t))(e,t),hc=e=>{dc(e)&&$r(e)&&(qr(e)?e.removeAttribute("data-mce-caret"):uc(e)),cc(e)&&(fc(e),0===e.data.length&&uc(e))},bc=ir,vc=cr,yc=lr,Cc=(e,t,n)=>{const o=di(t.getBoundingClientRect(),n);let r,s;if("BODY"===e.tagName){const t=e.ownerDocument.documentElement;r=e.scrollLeft||t.scrollLeft,s=e.scrollTop||t.scrollTop}else{const t=e.getBoundingClientRect();r=e.scrollLeft-t.left,s=e.scrollTop-t.top}o.left+=r,o.right+=r,o.top+=s,o.bottom+=s,o.width=1;let a=t.offsetWidth-t.clientWidth;return a>0&&(n&&(a*=-1),o.left+=a,o.right+=a),o},wc=(e,t,n,o)=>{const r=za();let s,a;const i=Nl(e),l=e.dom,d=()=>{(e=>{var t,n;const o=Fo(yn(e),"*[contentEditable=false],video,audio,embed,object");for(let e=0;e<o.length;e++){const r=o[e].dom;let s=r.previousSibling;if(Gr(s)){const e=s.data;1===e.length?null===(t=s.parentNode)||void 0===t||t.removeChild(s):s.deleteData(e.length-1,1)}s=r.nextSibling,Kr(s)&&(1===s.data.length?null===(n=s.parentNode)||void 0===n||n.removeChild(s):s.deleteData(0,1))}})(t),a&&(hc(a),a=null),r.on((e=>{l.remove(e.caret),r.clear()})),s&&(clearInterval(s),s=void 0)};return{show:(e,c)=>{let u;if(d(),yc(c))return null;if(!n(c))return a=((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Mr),r=e.parentNode;if(t){const t=e.previousSibling;if(zr(t)){if($r(t))return t;if(Gr(t))return t.splitText(t.data.length-1)}null==r||r.insertBefore(o,e)}else{const t=e.nextSibling;if(zr(t)){if($r(t))return t;if(Kr(t))return t.splitText(1),t}e.nextSibling?null==r||r.insertBefore(o,e.nextSibling):null==r||r.appendChild(o)}return o})(c,e),u=c.ownerDocument.createRange(),kc(a.nextSibling)?(u.setStart(a,0),u.setEnd(a,0)):(u.setStart(a,1),u.setEnd(a,1)),u;{const n=((e,t,n)=>{var o;const r=(null!==(o=t.ownerDocument)&&void 0!==o?o:document).createElement(e);r.setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(Dr().dom);const s=t.parentNode;return n?null==s||s.insertBefore(r,t):t.nextSibling?null==s||s.insertBefore(r,t.nextSibling):null==s||s.appendChild(r),r})(i,c,e),d=Cc(t,c,e);l.setStyle(n,"top",d.top),a=n;const m=l.create("div",{class:"mce-visual-caret","data-mce-bogus":"all"});l.setStyles(m,{...d}),l.add(t,m),r.set({caret:m,element:c,before:e}),e&&l.addClass(m,"mce-visual-caret-before"),s=setInterval((()=>{r.on((e=>{o()?l.toggleClass(e.caret,"mce-visual-caret-hidden"):l.addClass(e.caret,"mce-visual-caret-hidden")}))}),500),u=c.ownerDocument.createRange(),u.setStart(n,0),u.setEnd(n,0)}return u},hide:d,getCss:()=>".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}",reposition:()=>{r.on((e=>{const n=Cc(t,e.element,e.before);l.setStyles(e.caret,{...n})}))},destroy:()=>clearInterval(s)}},xc=()=>At.browser.isFirefox(),kc=e=>bc(e)||vc(e),Ec=e=>(kc(e)||Yo(e)&&xc())&&On(yn(e)).exists(no),Sc=ar,_c=ir,Nc=cr,Rc=Wo("display","block table table-cell table-caption list-item"),Ac=$r,Oc=jr,Tc=$o,Bc=Jo,Dc=ss,Pc=e=>e>0,Lc=e=>e<0,Mc=(e,t)=>{let n;for(;n=e(t);)if(!Oc(n))return n;return null},Ic=(e,t,n,o,r)=>{const s=new zo(e,o),a=_c(e)||Oc(e);let i;if(Lc(t)){if(a&&(i=Mc(s.prev.bind(s),!0),n(i)))return i;for(;i=Mc(s.prev.bind(s),r);)if(n(i))return i}if(Pc(t)){if(a&&(i=Mc(s.next.bind(s),!0),n(i)))return i;for(;i=Mc(s.next.bind(s),r);)if(n(i))return i}return null},Fc=(e,t)=>{for(;e&&e!==t;){if(Rc(e))return e;e=e.parentNode}return null},Uc=(e,t,n)=>Fc(e.container(),n)===Fc(t.container(),n),zc=(e,t)=>{if(!t)return I.none();const n=t.container(),o=t.offset();return Tc(n)?I.from(n.childNodes[o+e]):I.none()},jc=(e,t)=>{var n;const o=(null!==(n=t.ownerDocument)&&void 0!==n?n:document).createRange();return e?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),o},Hc=(e,t,n)=>Fc(t,e)===Fc(n,e),$c=(e,t,n)=>{const o=e?"previousSibling":"nextSibling";let r=n;for(;r&&r!==t;){let e=r[o];if(e&&Ac(e)&&(e=e[o]),_c(e)||Nc(e)){if(Hc(t,e,r))return e;break}if(Dc(e))break;r=r.parentNode}return null},qc=O(jc,!0),Vc=O(jc,!1),Wc=(e,t,n)=>{let o;const r=O($c,!0,t),s=O($c,!1,t),a=n.startContainer,i=n.startOffset;if(jr(a)){const e=Bc(a)?a.parentNode:a,t=e.getAttribute("data-mce-caret");if("before"===t&&(o=e.nextSibling,Ec(o)))return qc(o);if("after"===t&&(o=e.previousSibling,Ec(o)))return Vc(o)}if(!n.collapsed)return n;if(Jo(a)){if(Ac(a)){if(1===e){if(o=s(a),o)return qc(o);if(o=r(a),o)return Vc(o)}if(-1===e){if(o=r(a),o)return Vc(o);if(o=s(a),o)return qc(o)}return n}if(Gr(a)&&i>=a.data.length-1)return 1===e&&(o=s(a),o)?qc(o):n;if(Kr(a)&&i<=1)return-1===e&&(o=r(a),o)?Vc(o):n;if(i===a.data.length)return o=s(a),o?qc(o):n;if(0===i)return o=r(a),o?Vc(o):n}return n},Kc=(e,t)=>zc(e?0:-1,t).filter(_c),Gc=(e,t,n)=>{const o=Wc(e,t,n);return-1===e?Li.fromRangeStart(o):Li.fromRangeEnd(o)},Yc=e=>I.from(e.getNode()).map(yn),Xc=(e,t)=>{let n=t;for(;n=e(n);)if(n.isVisible())return n;return n},Qc=(e,t)=>{const n=Uc(e,t);return!(n||!rr(e.getNode()))||n};var Jc;!function(e){e[e.Backwards=-1]="Backwards",e[e.Forwards=1]="Forwards"}(Jc||(Jc={}));const Zc=ir,eu=Jo,tu=$o,nu=rr,ou=ss,ru=e=>ns(e)||(e=>!!as(e)&&!X(ce(e.getElementsByTagName("*")),((e,t)=>e||Qr(t)),!1))(e),su=is,au=(e,t)=>e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null,iu=(e,t)=>{if(Pc(e)){if(ou(t.previousSibling)&&!eu(t.previousSibling))return Li.before(t);if(eu(t))return Li(t,0)}if(Lc(e)){if(ou(t.nextSibling)&&!eu(t.nextSibling))return Li.after(t);if(eu(t))return Li(t,t.data.length)}return Lc(e)?nu(t)?Li.before(t):Li.after(t):Li.before(t)},lu=(e,t,n)=>{let o,r,s,a;if(!tu(n)||!t)return null;if(t.isEqual(Li.after(n))&&n.lastChild){if(a=Li.after(n.lastChild),Lc(e)&&ou(n.lastChild)&&tu(n.lastChild))return nu(n.lastChild)?Li.before(n.lastChild):a}else a=t;const i=a.container();let l=a.offset();if(eu(i)){if(Lc(e)&&l>0)return Li(i,--l);if(Pc(e)&&l<i.length)return Li(i,++l);o=i}else{if(Lc(e)&&l>0&&(r=au(i,l-1),ou(r)))return!ru(r)&&(s=Ic(r,e,su,r),s)?eu(s)?Li(s,s.data.length):Li.after(s):eu(r)?Li(r,r.data.length):Li.before(r);if(Pc(e)&&l<i.childNodes.length&&(r=au(i,l),ou(r)))return nu(r)?((e,t)=>{const n=t.nextSibling;return n&&ou(n)?eu(n)?Li(n,0):Li.before(n):lu(Jc.Forwards,Li.after(t),e)})(n,r):!ru(r)&&(s=Ic(r,e,su,r),s)?eu(s)?Li(s,0):Li.before(s):eu(r)?Li(r,0):Li.after(r);o=r||a.getNode()}if(o&&(Pc(e)&&a.isAtEnd()||Lc(e)&&a.isAtStart())&&(o=Ic(o,e,M,n,!0),su(o,n)))return iu(e,o);r=o?Ic(o,e,su,n):o;const d=De(G(((e,t)=>{const n=[];let o=e;for(;o&&o!==t;)n.push(o),o=o.parentNode;return n})(i,n),Zc));return!d||r&&d.contains(r)?r?iu(e,r):null:(a=Pc(e)?Li.after(d):Li.before(d),a)},du=e=>({next:t=>lu(Jc.Forwards,t,e),prev:t=>lu(Jc.Backwards,t,e)}),cu=e=>Li.isTextPosition(e)?0===e.offset():ss(e.getNode()),uu=e=>{if(Li.isTextPosition(e)){const t=e.container();return e.offset()===t.data.length}return ss(e.getNode(!0))},mu=(e,t)=>!Li.isTextPosition(e)&&!Li.isTextPosition(t)&&e.getNode()===t.getNode(!0),fu=(e,t,n)=>{const o=du(t);return I.from(e?o.next(n):o.prev(n))},gu=(e,t,n)=>fu(e,t,n).bind((o=>Uc(n,o,t)&&((e,t,n)=>{return e?!mu(t,n)&&(o=t,!(!Li.isTextPosition(o)&&rr(o.getNode())))&&uu(t)&&cu(n):!mu(n,t)&&cu(t)&&uu(n);var o})(e,n,o)?fu(e,t,o):I.some(o))),pu=(e,t,n,o)=>gu(e,t,n).bind((n=>o(n)?pu(e,t,n,o):I.some(n))),hu=(e,t)=>{const n=e?t.firstChild:t.lastChild;return Jo(n)?I.some(Li(n,e?0:n.data.length)):n?ss(n)?I.some(e?Li.before(n):rr(o=n)?Li.before(o):Li.after(o)):((e,t,n)=>{const o=e?Li.before(n):Li.after(n);return fu(e,t,o)})(e,t,n):I.none();var o},bu=O(fu,!0),vu=O(fu,!1),yu=O(hu,!0),Cu=O(hu,!1),wu="_mce_caret",xu=e=>$o(e)&&e.id===wu,ku=(e,t)=>{let n=t;for(;n&&n!==e;){if(xu(n))return n;n=n.parentNode}return null},Eu=e=>ke(e,"name"),Su=e=>Dt.isArray(e.start),_u=e=>!(!Eu(e)&&b(e.forward))||e.forward,Nu=(e,t)=>($o(t)&&e.isBlock(t)&&!t.innerHTML&&(t.innerHTML='<br data-mce-bogus="1" />'),t),Ru=(e,t)=>Cu(e).fold(L,(e=>(t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0))),Au=(e,t,n)=>!(!(e=>!e.hasChildNodes())(t)||!ku(e,t)||(((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Mr);e.appendChild(o),t.setStart(o,0),t.setEnd(o,0)})(t,n),0)),Ou=(e,t,n,o)=>{const r=n[t?"start":"end"],s=e.getRoot();if(r){let e=s,n=r[0];for(let t=r.length-1;e&&t>=1;t--){const n=e.childNodes;if(Au(s,e,o))return!0;if(r[t]>n.length-1)return!!Au(s,e,o)||Ru(e,o);e=n[r[t]]}Jo(e)&&(n=Math.min(r[0],e.data.length)),$o(e)&&(n=Math.min(r[0],e.childNodes.length)),t?o.setStart(e,n):o.setEnd(e,n)}return!0},Tu=e=>Jo(e)&&e.data.length>0,Bu=(e,t,n)=>{const o=e.get(n.id+"_"+t),r=null==o?void 0:o.parentNode,s=n.keep;if(o&&r){let a,i;if("start"===t?s?o.hasChildNodes()?(a=o.firstChild,i=1):Tu(o.nextSibling)?(a=o.nextSibling,i=0):Tu(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)+1):(a=r,i=e.nodeIndex(o)):s?o.hasChildNodes()?(a=o.firstChild,i=1):Tu(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)):(a=r,i=e.nodeIndex(o)),!s){const r=o.previousSibling,s=o.nextSibling;let l;for(Dt.each(Dt.grep(o.childNodes),(e=>{Jo(e)&&(e.data=e.data.replace(/\uFEFF/g,""))}));l=e.get(n.id+"_"+t);)e.remove(l,!0);if(Jo(s)&&Jo(r)&&!At.browser.isOpera()){const t=r.data.length;r.appendData(s.data),e.remove(s),a=r,i=t}}return I.some(Li(a,i))}return I.none()},Du=(e,t,n)=>((e,t,n=!1)=>2===t?Zi(Fr,n,e):3===t?(e=>{const t=e.getRng();return{start:Vi(e.dom.getRoot(),Li.fromRangeStart(t)),end:Vi(e.dom.getRoot(),Li.fromRangeEnd(t)),forward:e.isForward()}})(e):t?(e=>({rng:e.getRng(),forward:e.isForward()}))(e):tl(e,!1))(e,t,n),Pu=(e,t)=>{((e,t)=>{const n=e.dom;if(t){if(Su(t))return((e,t)=>{const n=e.createRng();return Ou(e,!0,t,n)&&Ou(e,!1,t,n)?I.some({range:n,forward:_u(t)}):I.none()})(n,t);if((e=>m(e.start))(t))return((e,t)=>{const n=I.from(Wi(e.getRoot(),t.start)),o=I.from(Wi(e.getRoot(),t.end));return Mt(n,o,((n,o)=>{const r=e.createRng();return r.setStart(n.container(),n.offset()),r.setEnd(o.container(),o.offset()),{range:r,forward:_u(t)}}))})(n,t);if((e=>ke(e,"id"))(t))return((e,t)=>{const n=Bu(e,"start",t),o=Bu(e,"end",t);return Mt(n,o.or(n),((n,o)=>{const r=e.createRng();return r.setStart(Nu(e,n.container()),n.offset()),r.setEnd(Nu(e,o.container()),o.offset()),{range:r,forward:_u(t)}}))})(n,t);if(Eu(t))return((e,t)=>I.from(e.select(t.name)[t.index]).map((t=>{const n=e.createRng();return n.selectNode(t),{range:n,forward:!0}})))(n,t);if((e=>ke(e,"rng"))(t))return I.some({range:t.rng,forward:_u(t)})}return I.none()})(e,t).each((({range:t,forward:n})=>{e.setRng(t,n)}))},Lu=e=>$o(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type"),Mu=(Iu=pr,e=>Iu===e);var Iu;const Fu=e=>""!==e&&-1!==" \f\n\r\t\v".indexOf(e),Uu=e=>!Fu(e)&&!Mu(e)&&!hr(e),zu=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},ju=e=>(e=>{return{value:(t=e,ze(t,"#").toUpperCase())};var t})(zu(e.red)+zu(e.green)+zu(e.blue)),Hu=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,$u=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,qu=(e,t,n,o)=>({red:e,green:t,blue:n,alpha:o}),Vu=(e,t,n,o)=>{const r=parseInt(e,10),s=parseInt(t,10),a=parseInt(n,10),i=parseFloat(o);return qu(r,s,a,i)},Wu=e=>(e=>{if("transparent"===e)return I.some(qu(0,0,0,0));const t=Hu.exec(e);if(null!==t)return I.some(Vu(t[1],t[2],t[3],"1"));const n=$u.exec(e);return null!==n?I.some(Vu(n[1],n[2],n[3],n[4])):I.none()})(e).map(ju).map((e=>"#"+e.value)).getOr(e),Ku=e=>{const t=[];if(e)for(let n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},Gu=(e,t)=>{const n=Fo(t,"td[data-mce-selected],th[data-mce-selected]");return n.length>0?n:(e=>G((e=>te(e,(e=>{const t=gi(e);return t?[yn(t)]:[]})))(e),Ar))(e)},Yu=e=>Gu(Ku(e.selection.getSel()),yn(e.getBody())),Xu=(e,t)=>Zn(e,"table",t),Qu=e=>Fn(e).fold(N([e]),(t=>[e].concat(Qu(t)))),Ju=e=>Un(e).fold(N([e]),(t=>"br"===Ht(t)?Bn(t).map((t=>[e].concat(Ju(t)))).getOr([]):[e].concat(Ju(t)))),Zu=(e,t)=>Mt((e=>{const t=e.startContainer,n=e.startOffset;return Jo(t)?0===n?I.some(yn(t)):I.none():I.from(t.childNodes[n]).map(yn)})(t),(e=>{const t=e.endContainer,n=e.endOffset;return Jo(t)?n===t.data.length?I.some(yn(t)):I.none():I.from(t.childNodes[n-1]).map(yn)})(t),((t,n)=>{const o=J(Qu(e),O(En,t)),r=J(Ju(e),O(En,n));return o.isSome()&&r.isSome()})).getOr(!1),em=(e,t,n,o)=>{const r=n,s=new zo(n,r),a=ye(e.schema.getMoveCaretBeforeOnEnterElements(),((e,t)=>!H(["td","th","table"],t.toLowerCase())));let i=n;do{if(Jo(i)&&0!==Dt.trim(i.data).length)return void(o?t.setStart(i,0):t.setEnd(i,i.data.length));if(a[i.nodeName])return void(o?t.setStartBefore(i):"BR"===i.nodeName?t.setEndBefore(i):t.setEndAfter(i))}while(i=o?s.next():s.prev());"BODY"===r.nodeName&&(o?t.setStart(r,0):t.setEnd(r,r.childNodes.length))},tm=e=>{const t=e.selection.getSel();return C(t)&&t.rangeCount>0},nm=(e,t)=>{const n=Yu(e);n.length>0?V(n,(n=>{const o=n.dom,r=e.dom.createRng();r.setStartBefore(o),r.setEndAfter(o),t(r,!0)})):t(e.selection.getRng(),!1)},om=(e,t,n)=>{const o=tl(e,t);n(o),e.moveToBookmark(o)},rm=e=>x(null==e?void 0:e.nodeType),sm=e=>$o(e)&&!Lu(e)&&!xu(e)&&!Go(e),am=e=>!0===e.isContentEditable,im=(e,t,n)=>{const{selection:o,dom:r}=e,s=o.getNode(),a=ir(s);om(o,!0,(()=>{t()})),a&&ir(s)&&r.isChildOf(s,e.getBody())?e.selection.select(s):n(o.getStart())&&lm(r,o)},lm=(e,t)=>{var n,o;const r=t.getRng(),{startContainer:s,startOffset:a}=r;if(!((e,t)=>{if(sm(t)&&!/^(TD|TH)$/.test(t.nodeName)){const n=e.getAttrib(t,"data-mce-selected"),o=parseInt(n,10);return!isNaN(o)&&o>0}return!1})(e,t.getNode())&&$o(s)){const i=s.childNodes,l=e.getRoot();let d;if(a<i.length){const t=i[a];d=new zo(t,null!==(n=e.getParent(t,e.isBlock))&&void 0!==n?n:l)}else{const t=i[i.length-1];d=new zo(t,null!==(o=e.getParent(t,e.isBlock))&&void 0!==o?o:l),d.next(!0)}for(let n=d.current();n;n=d.next()){if("false"===e.getContentEditable(n))return;if(Jo(n)&&!mm(n))return r.setStart(n,0),void t.setRng(r)}}},dm=(e,t,n)=>{if(e){const o=t?"nextSibling":"previousSibling";for(e=n?e:e[o];e;e=e[o])if($o(e)||!mm(e))return e}},cm=(e,t)=>!!e.getTextBlockElements()[t.nodeName.toLowerCase()]||As(e,t),um=(e,t,n)=>e.schema.isValidChild(t,n),mm=(e,t=!1)=>{if(C(e)&&Jo(e)){const n=t?e.data.replace(/ /g,"\xa0"):e.data;return ds(n)}return!1},fm=(e,t)=>{const n=e.dom;return sm(t)&&"false"===n.getContentEditable(t)&&((e,t)=>{const n="[data-mce-cef-wrappable]",o=fd(e),r=Ye(o)?n:`${n},${o}`;return xn(yn(t),r)})(e,t)&&0===n.select('[contenteditable="true"]',t).length},gm=(e,t)=>w(e)?e(t):(C(t)&&(e=e.replace(/%(\w+)/g,((e,n)=>t[n]||e))),e),pm=(e,t)=>(t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()),hm=(e,t)=>{if(y(e))return null;{let n=String(e);return"color"!==t&&"backgroundColor"!==t||(n=Wu(n)),"fontWeight"===t&&700===e&&(n="bold"),"fontFamily"===t&&(n=n.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),n}},bm=(e,t,n)=>{const o=e.getStyle(t,n);return hm(o,n)},vm=(e,t)=>{let n;return e.getParent(t,(t=>!!$o(t)&&(n=e.getStyle(t,"text-decoration"),!!n&&"none"!==n))),n},ym=(e,t,n)=>e.getParents(t,n,e.getRoot()),Cm=(e,t,n)=>{const o=e.formatter.get(t);return C(o)&&$(o,n)},wm=e=>Ee(e,"block"),xm=e=>Ee(e,"selector"),km=e=>Ee(e,"inline"),Em=e=>xm(e)&&!1!==e.expand&&!km(e),Sm=Lu,_m=ym,Nm=mm,Rm=cm,Am=(e,t)=>{let n=t;for(;n;){if($o(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Om=(e,t,n,o)=>{const r=t.data;if(e){for(let e=n;e>0;e--)if(o(r.charAt(e-1)))return e}else for(let e=n;e<r.length;e++)if(o(r.charAt(e)))return e;return-1},Tm=(e,t,n)=>Om(e,t,n,(e=>Mu(e)||Fu(e))),Bm=(e,t,n)=>Om(e,t,n,Uu),Dm=(e,t,n,o,r,s)=>{let a;const i=e.getParent(n,e.isBlock)||t,l=(t,n,o)=>{const s=ai(e),l=r?s.backwards:s.forwards;return I.from(l(t,n,((e,t)=>Sm(e.parentNode)?-1:(a=e,o(r,e,t))),i))};return l(n,o,Tm).bind((e=>s?l(e.container,e.offset+(r?-1:0),Bm):I.some(e))).orThunk((()=>a?I.some({container:a,offset:r?0:a.length}):I.none()))},Pm=(e,t,n,o,r)=>{const s=o[r];Jo(o)&&Ye(o.data)&&s&&(o=s);const a=_m(e,o);for(let o=0;o<a.length;o++)for(let r=0;r<t.length;r++){const s=t[r];if((!C(s.collapsed)||s.collapsed===n.collapsed)&&xm(s)&&e.is(a[o],s.selector))return a[o]}return o},Lm=(e,t,n,o)=>{var r;let s=n;const a=e.getRoot(),i=t[0];if(wm(i)&&(s=i.wrapper?null:e.getParent(n,i.block,a)),!s){const t=null!==(r=e.getParent(n,"LI,TD,TH"))&&void 0!==r?r:a;s=e.getParent(Jo(n)?n.parentNode:n,(t=>t!==a&&Rm(e.schema,t)),t)}if(s&&wm(i)&&i.wrapper&&(s=_m(e,s,"ul,ol").reverse()[0]||s),!s)for(s=n;s&&s[o]&&!e.isBlock(s[o])&&(s=s[o],!pm(s,"br")););return s||n},Mm=(e,t,n,o)=>{const r=n.parentNode;return!C(n[o])&&(!(r!==t&&!y(r)&&!e.isBlock(r))||Mm(e,t,r,o))},Im=(e,t,n,o,r)=>{let s=n;const a=r?"previousSibling":"nextSibling",i=e.getRoot();if(Jo(n)&&!Nm(n)&&(r?o>0:o<n.data.length))return n;for(;s;){if(!t[0].block_expand&&e.isBlock(s))return s;for(let t=s[a];t;t=t[a]){const n=Jo(t)&&!Mm(e,i,t,a);if(!Sm(t)&&(!rr(l=t)||!l.getAttribute("data-mce-bogus")||l.nextSibling)&&!Nm(t,n))return s}if(s===i||s.parentNode===i){n=s;break}s=s.parentNode}var l;return n},Fm=e=>Sm(e.parentNode)||Sm(e),Um=(e,t,n,o=!1)=>{let{startContainer:r,startOffset:s,endContainer:a,endOffset:i}=t;const l=n[0];return $o(r)&&r.hasChildNodes()&&(r=pi(r,s),Jo(r)&&(s=0)),$o(a)&&a.hasChildNodes()&&(a=pi(a,t.collapsed?i:i-1),Jo(a)&&(i=a.data.length)),r=Am(e,r),a=Am(e,a),Fm(r)&&(r=Sm(r)?r:r.parentNode,r=t.collapsed?r.previousSibling||r:r.nextSibling||r,Jo(r)&&(s=t.collapsed?r.length:0)),Fm(a)&&(a=Sm(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,Jo(a)&&(i=t.collapsed?0:a.length)),t.collapsed&&(Dm(e,e.getRoot(),r,s,!0,o).each((({container:e,offset:t})=>{r=e,s=t})),Dm(e,e.getRoot(),a,i,!1,o).each((({container:e,offset:t})=>{a=e,i=t}))),(km(l)||l.block_expand)&&(km(l)&&Jo(r)&&0!==s||(r=Im(e,n,r,s,!0)),km(l)&&Jo(a)&&i!==a.data.length||(a=Im(e,n,a,i,!1))),Em(l)&&(r=Pm(e,n,t,r,"previousSibling"),a=Pm(e,n,t,a,"nextSibling")),(wm(l)||xm(l))&&(r=Lm(e,n,r,"previousSibling"),a=Lm(e,n,a,"nextSibling"),wm(l)&&(e.isBlock(r)||(r=Im(e,n,r,s,!0)),e.isBlock(a)||(a=Im(e,n,a,i,!1)))),$o(r)&&r.parentNode&&(s=e.nodeIndex(r),r=r.parentNode),$o(a)&&a.parentNode&&(i=e.nodeIndex(a)+1,a=a.parentNode),{startContainer:r,startOffset:s,endContainer:a,endOffset:i}},zm=(e,t,n)=>{var o;const r=t.startOffset,s=pi(t.startContainer,r),a=t.endOffset,i=pi(t.endContainer,a-1),l=e=>{const t=e[0];Jo(t)&&t===s&&r>=t.data.length&&e.splice(0,1);const n=e[e.length-1];return 0===a&&e.length>0&&n===i&&Jo(n)&&e.splice(e.length-1,1),e},d=(e,t,n)=>{const o=[];for(;e&&e!==n;e=e[t])o.push(e);return o},c=(t,n)=>e.getParent(t,(e=>e.parentNode===n),n),u=(e,t,o)=>{const r=o?"nextSibling":"previousSibling";for(let s=e,a=s.parentNode;s&&s!==t;s=a){a=s.parentNode;const t=d(s===e?s:s[r],r);t.length&&(o||t.reverse(),n(l(t)))}};if(s===i)return n(l([s]));const m=null!==(o=e.findCommonAncestor(s,i))&&void 0!==o?o:e.getRoot();if(e.isChildOf(s,i))return u(s,m,!0);if(e.isChildOf(i,s))return u(i,m);const f=c(s,m)||s,g=c(i,m)||i;u(s,f,!0);const p=d(f===s?f:f.nextSibling,"nextSibling",g===i?g.nextSibling:g);p.length&&n(l(p)),u(i,g)},jm=['pre[class*=language-][contenteditable="false"]',"figure.image","div[data-ephox-embed-iri]","div.tiny-pageembed","div.mce-toc","div[data-mce-toc]"],Hm=(e,t,n,o,r,s)=>{const{uid:a=t,...i}=n;un(e,$a()),Jt(e,`${Va()}`,a),Jt(e,`${qa()}`,o);const{attributes:l={},classes:d=[]}=r(a,i);if(Zt(e,l),((e,t)=>{V(t,(t=>{un(e,t)}))})(e,d),s){d.length>0&&Jt(e,`${Ka()}`,d.join(","));const t=me(l);t.length>0&&Jt(e,`${Ga()}`,t.join(","))}},$m=(e,t,n,o,r)=>{const s=bn("span",e);return Hm(s,t,n,o,r,!1),s},qm=(e,t,n,o,r,s)=>{const a=[],i=$m(e.getDoc(),n,s,o,r),l=za(),d=()=>{l.clear()},c=e=>{V(e,u)},u=t=>{switch(((e,t,n,o)=>An(t).fold((()=>"skipping"),(r=>"br"===o||(e=>Kt(e)&&vr(e)===Mr)(t)?"valid":(e=>Wt(e)&&gn(e,$a()))(t)?"existing":xu(t.dom)?"caret":$(jm,(e=>xn(t,e)))?"valid-block":um(e,n,o)&&um(e,Ht(r),n)?"valid":"invalid-child")))(e,t,"span",Ht(t))){case"invalid-child":{d();const e=Mn(t);c(e),d();break}case"valid-block":d(),Hm(t,n,s,o,r,!0);break;case"valid":{const e=l.get().getOrThunk((()=>{const e=oi(i);return a.push(e),l.set(e),e}));vo(t,e);break}}};return zm(e.dom,t,(e=>{d(),(e=>{const t=q(e,yn);c(t)})(e)})),a},Vm=e=>{const t=(()=>{const e={};return{register:(t,n)=>{e[t]={name:t,settings:n}},lookup:t=>xe(e,t).map((e=>e.settings)),getNames:()=>me(e)}})();((e,t)=>{const n=qa(),o=e=>I.from(e.attr(n)).bind(t.lookup),r=e=>{var t,n;e.attr(Va(),null),e.attr(qa(),null),e.attr(Wa(),null);const o=I.from(e.attr(Ga())).map((e=>e.split(","))).getOr([]),r=I.from(e.attr(Ka())).map((e=>e.split(","))).getOr([]);V(o,(t=>e.attr(t,null)));const s=null!==(n=null===(t=e.attr("class"))||void 0===t?void 0:t.split(" "))&&void 0!==n?n:[],a=re(s,[$a()].concat(r));e.attr("class",a.length>0?a.join(" "):null),e.attr(Ka(),null),e.attr(Ga(),null)};e.serializer.addTempAttr(Wa()),e.serializer.addAttributeFilter(n,(e=>{for(const t of e)o(t).each((e=>{!1===e.persistent&&("span"===t.name?t.unwrap():r(t))}))}))})(e,t);const n=((e,t)=>{const n=Da({}),o=()=>({listeners:[],previous:za()}),r=(e,t)=>{s(e,(e=>(t(e),e)))},s=(e,t)=>{const r=n.get(),s=t(xe(r,e).getOrThunk(o));r[e]=s,n.set(r)},a=(t,n)=>{V(Ja(e,t),(e=>{n?Jt(e,Wa(),"true"):on(e,Wa())}))},i=Ha((()=>{const n=ae(t.getNames());V(n,(t=>{s(t,(n=>{const o=n.previous.get();return Xa(e,I.some(t)).fold((()=>{o.each((e=>{(e=>{r(e,(t=>{V(t.listeners,(t=>t(!1,e)))}))})(t),n.previous.clear(),a(e,!1)}))}),(({uid:e,name:t,elements:s})=>{Pt(o,e)||(o.each((e=>a(e,!1))),((e,t,n)=>{r(e,(o=>{V(o.listeners,(o=>o(!0,e,{uid:t,nodes:q(n,(e=>e.dom))})))}))})(t,e,s),n.previous.set(e),a(e,!0))})),{previous:n.previous,listeners:n.listeners}}))}))}),30);return e.on("remove",(()=>{i.cancel()})),e.on("NodeChange",(()=>{i.throttle()})),{addListener:(e,t)=>{s(e,(e=>({previous:e.previous,listeners:e.listeners.concat([t])})))}}})(e,t),o=Xt("span"),r=e=>{V(e,(e=>{o(e)?xo(e):(e=>{fn(e,$a()),on(e,`${Va()}`),on(e,`${qa()}`),on(e,`${Wa()}`);const t=tn(e,`${Ga()}`).map((e=>e.split(","))).getOr([]),n=tn(e,`${Ka()}`).map((e=>e.split(","))).getOr([]);var o;V(t,(t=>on(e,t))),o=e,V(n,(e=>{fn(o,e)})),on(e,`${Ka()}`),on(e,`${Ga()}`)})(e)}))};return{register:(e,n)=>{t.register(e,n)},annotate:(n,o)=>{t.lookup(n).each((t=>{((e,t,n,o)=>{e.undoManager.transact((()=>{const r=e.selection,s=r.getRng(),a=Yu(e).length>0,i=ti("mce-annotation");if(s.collapsed&&!a&&((e,t)=>{const n=Um(e.dom,t,[{inline:"span"}]);t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)})(e,s),r.getRng().collapsed&&!a){const s=$m(e.getDoc(),i,o,t,n.decorate);So(s,pr),r.getRng().insertNode(s.dom),r.select(s.dom)}else om(r,!1,(()=>{nm(e,(r=>{qm(e,r,i,t,n.decorate,o)}))}))}))})(e,n,t,o)}))},annotationChanged:(e,t)=>{n.addListener(e,t)},remove:t=>{Xa(e,I.some(t)).each((({elements:t})=>{const n=e.selection.getBookmark();r(t),e.selection.moveToBookmark(n)}))},removeAll:t=>{const n=e.selection.getBookmark();ge(Za(e,t),((e,t)=>{r(e)})),e.selection.moveToBookmark(n)},getAll:t=>{const n=Za(e,t);return pe(n,(e=>q(e,(e=>e.dom))))}}},Wm=e=>({getBookmark:O(Du,e),moveToBookmark:O(Pu,e)});Wm.isBookmarkNode=Lu;const Km=(e,t,n)=>!n.collapsed&&$(n.getClientRects(),(n=>((e,t,n)=>t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom)(n,e,t))),Gm=(e,t,n)=>{e.dispatch(t,n)},Ym=(e,t,n,o)=>{e.dispatch("FormatApply",{format:t,node:n,vars:o})},Xm=(e,t,n,o)=>{e.dispatch("FormatRemove",{format:t,node:n,vars:o})},Qm=(e,t)=>e.dispatch("SetContent",t),Jm=(e,t)=>e.dispatch("GetContent",t),Zm=(e,t)=>e.dispatch("PastePlainTextToggle",{state:t}),ef={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,modifierPressed:e=>e.shiftKey||e.ctrlKey||e.altKey||ef.metaKeyPressed(e),metaKeyPressed:e=>At.os.isMacOS()||At.os.isiOS()?e.metaKey:e.ctrlKey&&!e.altKey},tf="data-mce-selected",nf=Math.abs,of=Math.round,rf={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},sf=(e,t)=>{const n=t.dom,o=t.getDoc(),r=document,s=t.getBody();let a,i,l,d,c,u,m,f,g,p,h,b,v,y,w;const x=e=>C(e)&&(sr(e)||n.is(e,"figure.image")),k=e=>cr(e)||n.hasClass(e,"mce-preview-object"),E=e=>{const n=e.target;((e,t)=>{if((e=>"longpress"===e.type||0===e.type.indexOf("touch"))(e)){const n=e.touches[0];return x(e.target)&&!Km(n.clientX,n.clientY,t)}return x(e.target)&&!Km(e.clientX,e.clientY,t)})(e,t.selection.getRng())&&!e.isDefaultPrevented()&&t.selection.select(n)},S=e=>n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?[e,e.firstElementChild]:n.is(e,"figure.image")?[e.querySelector("img")]:[e],_=e=>{const o=ed(t);return!!o&&"false"!==e.getAttribute("data-mce-resize")&&e!==t.getBody()&&(n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?xn(yn(e.firstElementChild),o):xn(yn(e),o))},N=(e,o,r)=>{if(C(r)){const s=S(e);V(s,(e=>{e.style[o]||!t.schema.isValid(e.nodeName.toLowerCase(),o)?n.setStyle(e,o,r):n.setAttrib(e,o,""+r)}))}},R=(e,t,n)=>{N(e,"width",t),N(e,"height",n)},A=e=>{let o,r,c,C,E;o=e.screenX-u,r=e.screenY-m,b=o*d[2]+f,v=r*d[3]+g,b=b<5?5:b,v=v<5?5:v,c=(x(a)||k(a))&&!1!==td(t)?!ef.modifierPressed(e):ef.modifierPressed(e),c&&(nf(o)>nf(r)?(v=of(b*p),b=of(v/p)):(b=of(v/p),v=of(b*p))),R(i,b,v),C=d.startPos.x+o,E=d.startPos.y+r,C=C>0?C:0,E=E>0?E:0,n.setStyles(l,{left:C,top:E,display:"block"}),l.innerHTML=b+" &times; "+v,d[2]<0&&i.clientWidth<=b&&n.setStyle(i,"left",void 0+(f-b)),d[3]<0&&i.clientHeight<=v&&n.setStyle(i,"top",void 0+(g-v)),o=s.scrollWidth-y,r=s.scrollHeight-w,o+r!==0&&n.setStyles(l,{left:C-o,top:E-r}),h||(((e,t,n,o,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:n,height:o,origin:r})})(t,a,f,g,"corner-"+d.name),h=!0)},O=()=>{const e=h;h=!1,e&&(N(a,"width",b),N(a,"height",v)),n.unbind(o,"mousemove",A),n.unbind(o,"mouseup",O),r!==o&&(n.unbind(r,"mousemove",A),n.unbind(r,"mouseup",O)),n.remove(i),n.remove(l),n.remove(c),T(a),e&&(((e,t,n,o,r)=>{e.dispatch("ObjectResized",{target:t,width:n,height:o,origin:r})})(t,a,b,v,"corner-"+d.name),n.setAttrib(a,"style",n.getAttrib(a,"style"))),t.nodeChanged()},T=e=>{M();const h=n.getPos(e,s),C=h.x,x=h.y,E=e.getBoundingClientRect(),N=E.width||E.right-E.left,T=E.height||E.bottom-E.top;a!==e&&(D(),a=e,b=v=0);const B=t.dispatch("ObjectSelected",{target:e});_(e)&&!B.isDefaultPrevented()?ge(rf,((e,t)=>{let h=n.get("mceResizeHandle"+t);h&&n.remove(h),h=n.add(s,"div",{id:"mceResizeHandle"+t,"data-mce-bogus":"all",class:"mce-resizehandle",unselectable:!0,style:"cursor:"+t+"-resize; margin:0; padding:0"}),n.bind(h,"mousedown",(h=>{h.stopImmediatePropagation(),h.preventDefault(),(h=>{const b=S(a)[0];var v;u=h.screenX,m=h.screenY,f=b.clientWidth,g=b.clientHeight,p=g/f,d=e,d.name=t,d.startPos={x:N*e[0]+C,y:T*e[1]+x},y=s.scrollWidth,w=s.scrollHeight,c=n.add(s,"div",{class:"mce-resize-backdrop","data-mce-bogus":"all"}),n.setStyles(c,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),i=k(v=a)?n.create("img",{src:At.transparentSrc}):v.cloneNode(!0),n.addClass(i,"mce-clonedresizable"),n.setAttrib(i,"data-mce-bogus","all"),i.contentEditable="false",n.setStyles(i,{left:C,top:x,margin:0}),R(i,N,T),i.removeAttribute(tf),s.appendChild(i),n.bind(o,"mousemove",A),n.bind(o,"mouseup",O),r!==o&&(n.bind(r,"mousemove",A),n.bind(r,"mouseup",O)),l=n.add(s,"div",{class:"mce-resize-helper","data-mce-bogus":"all"},f+" &times; "+g)})(h)})),e.elm=h,n.setStyles(h,{left:N*e[0]+C-h.offsetWidth/2,top:T*e[1]+x-h.offsetHeight/2})})):D(!1)},B=ja(T,0),D=(e=!0)=>{B.cancel(),M(),a&&e&&a.removeAttribute(tf),ge(rf,((e,t)=>{const o=n.get("mceResizeHandle"+t);o&&(n.unbind(o),n.remove(o))}))},P=(e,t)=>n.isChildOf(e,t),L=o=>{if(h||t.removed||t.composing)return;const r="mousedown"===o.type?o.target:e.getNode(),a=to(yn(r),"table,img,figure.image,hr,video,span.mce-preview-object,details").map((e=>e.dom)).filter((e=>n.isEditable(e.parentElement))).getOrUndefined(),i=C(a)?n.getAttrib(a,tf,"1"):"1";if(V(n.select(`img[${tf}],hr[${tf}]`),(e=>{e.removeAttribute(tf)})),C(a)&&P(a,s)&&t.hasFocus()){I();const t=e.getStart(!0);if(P(t,a)&&P(e.getEnd(!0),a))return n.setAttrib(a,tf,i),void B.throttle(a)}D()},M=()=>{ge(rf,(e=>{e.elm&&(n.unbind(e.elm),delete e.elm)}))},I=()=>{try{t.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}};return t.on("init",(()=>{I(),t.on("NodeChange ResizeEditor ResizeWindow ResizeContent drop",L),t.on("keyup compositionend",(e=>{a&&"TABLE"===a.nodeName&&L(e)})),t.on("hide blur",D),t.on("contextmenu longpress",E,!0)})),t.on("remove",M),{isResizable:_,showResizeRect:T,hideResizeRect:D,updateResizeRect:L,destroy:()=>{B.cancel(),a=i=c=null}}},af=(e,t,n)=>{const o=e.document.createRange();var r;return r=o,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,n)=>{e.setEnd(t.dom,n)}),(t=>{e.setEndAfter(t.dom)}))})(o,n),o},lf=(e,t,n,o,r)=>{const s=e.document.createRange();return s.setStart(t.dom,n),s.setEnd(o.dom,r),s},df=al([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),cf=(e,t,n)=>t(yn(n.startContainer),n.startOffset,yn(n.endContainer),n.endOffset);df.ltr,df.rtl;const uf=(e,t,n,o)=>({start:e,soffset:t,finish:n,foffset:o}),mf=document.caretPositionFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(o,t,n)).bind((t=>{if(null===t.offsetNode)return I.none();const n=e.dom.createRange();return n.setStart(t.offsetNode,t.offset),n.collapse(),I.some(n)}))}:document.caretRangeFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(o,t,n))}:I.none,ff=al([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),gf={before:ff.before,on:ff.on,after:ff.after,cata:(e,t,n,o)=>e.fold(t,n,o),getStart:e=>e.fold(R,R,R)},pf=al([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),hf={domRange:pf.domRange,relative:pf.relative,exact:pf.exact,exactFromRange:e=>pf.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>yn(e.startContainer),relative:(e,t)=>gf.getStart(e),exact:(e,t,n,o)=>e}))(e);return Rn(t)},range:uf},bf=(e,t)=>{const n=Ht(e);return"input"===n?gf.after(e):H(["br","img"],n)?0===t?gf.before(e):gf.after(e):gf.on(e,t)},vf=(e,t)=>{const n=e.fold(gf.before,bf,gf.after),o=t.fold(gf.before,bf,gf.after);return hf.relative(n,o)},yf=(e,t,n,o)=>{const r=bf(e,t),s=bf(n,o);return hf.relative(r,s)},Cf=(e,t)=>{const n=(t||document).createDocumentFragment();return V(e,(e=>{n.appendChild(e.dom)})),yn(n)},wf=e=>{const t=hf.getWin(e).dom,n=(e,n,o,r)=>lf(t,e,n,o,r),o=(e=>e.match({domRange:e=>{const t=yn(e.startContainer),n=yn(e.endContainer);return yf(t,e.startOffset,n,e.endOffset)},relative:vf,exact:yf}))(e);return((e,t)=>{const n=((e,t)=>t.match({domRange:e=>({ltr:N(e),rtl:I.none}),relative:(t,n)=>({ltr:Pe((()=>af(e,t,n))),rtl:Pe((()=>I.some(af(e,n,t))))}),exact:(t,n,o,r)=>({ltr:Pe((()=>lf(e,t,n,o,r))),rtl:Pe((()=>I.some(lf(e,o,r,t,n))))})}))(e,t);return((e,t)=>{const n=t.ltr();return n.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>df.rtl(yn(e.endContainer),e.endOffset,yn(e.startContainer),e.startOffset))).getOrThunk((()=>cf(0,df.ltr,n))):cf(0,df.ltr,n)})(0,n)})(t,o).match({ltr:n,rtl:n})},xf=(e,t,n)=>((e,t,n)=>((e,t,n)=>{const o=yn(e.document);return mf(o,t,n).map((e=>uf(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset)))})(e,t,n))(Rn(yn(n)).dom,e,t).map((e=>{const t=n.createRange();return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),t})).getOrUndefined(),kf=(e,t)=>C(e)&&C(t)&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset,Ef=(e,t,n)=>null!==((e,t,n)=>{let o=e;for(;o&&o!==t;){if(n(o))return o;o=o.parentNode}return null})(e,t,n),Sf=(e,t,n)=>Ef(e,t,(e=>e.nodeName===n)),_f=(e,t)=>$r(e)&&!Ef(e,t,xu),Nf=(e,t,n)=>{const o=t.parentNode;if(o){const r=new zo(t,e.getParent(o,e.isBlock)||e.getRoot());let s;for(;s=r[n?"prev":"next"]();)if(rr(s))return!0}return!1},Rf=(e,t,n,o,r)=>{const s=e.getRoot(),a=e.schema.getNonEmptyElements(),i=r.parentNode;let l,d;if(!i)return I.none();const c=e.getParent(i,e.isBlock)||s;if(o&&rr(r)&&t&&e.isEmpty(c))return I.some(Li(i,e.nodeIndex(r)));const u=new zo(r,c);for(;d=u[o?"prev":"next"]();){if("false"===e.getContentEditableParent(d)||_f(d,s))return I.none();if(Jo(d)&&d.data.length>0)return Sf(d,s,"A")?I.none():I.some(Li(d,o?d.data.length:0));if(e.isBlock(d)||a[d.nodeName.toLowerCase()])return I.none();l=d}return tr(l)?I.none():n&&l?I.some(Li(l,0)):I.none()},Af=(e,t,n,o)=>{const r=e.getRoot();let s,a=!1,i=n?o.startContainer:o.endContainer,l=n?o.startOffset:o.endOffset;const d=$o(i)&&l===i.childNodes.length,c=e.schema.getNonEmptyElements();let u=n;if($r(i))return I.none();if($o(i)&&l>i.childNodes.length-1&&(u=!1),nr(i)&&(i=r,l=0),i===r){if(u&&(s=i.childNodes[l>0?l-1:0],s)){if($r(s))return I.none();if(c[s.nodeName]||Yo(s))return I.none()}if(i.hasChildNodes()){if(l=Math.min(!u&&l>0?l-1:l,i.childNodes.length-1),i=i.childNodes[l],l=Jo(i)&&d?i.data.length:0,!t&&i===r.lastChild&&Yo(i))return I.none();if(((e,t)=>{let n=t;for(;n&&n!==e;){if(ir(n))return!0;n=n.parentNode}return!1})(r,i)||$r(i))return I.none();if(i.hasChildNodes()&&!Yo(i)){s=i;const t=new zo(i,r);do{if(ir(s)||$r(s)){a=!1;break}if(Jo(s)&&s.data.length>0){l=u?0:s.data.length,i=s,a=!0;break}if(c[s.nodeName.toLowerCase()]&&!dr(s)){l=e.nodeIndex(s),i=s.parentNode,u||l++,a=!0;break}}while(s=u?t.next():t.prev())}}}return t&&(Jo(i)&&0===l&&Rf(e,d,t,!0,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),$o(i)&&(s=i.childNodes[l],s||(s=i.childNodes[l-1]),!s||!rr(s)||((e,t)=>{var n;return"A"===(null===(n=e.previousSibling)||void 0===n?void 0:n.nodeName)})(s)||Nf(e,s,!1)||Nf(e,s,!0)||Rf(e,d,t,!0,s).each((e=>{i=e.container(),l=e.offset(),a=!0})))),u&&!t&&Jo(i)&&l===i.data.length&&Rf(e,d,t,!1,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),a&&i?I.some(Li(i,l)):I.none()},Of=(e,t)=>{const n=t.collapsed,o=t.cloneRange(),r=Li.fromRangeStart(t);return Af(e,n,!0,o).each((e=>{n&&Li.isAbove(r,e)||o.setStart(e.container(),e.offset())})),n||Af(e,n,!1,o).each((e=>{o.setEnd(e.container(),e.offset())})),n&&o.collapse(!0),kf(t,o)?I.none():I.some(o)},Tf=(e,t)=>e.splitText(t),Bf=e=>{let t=e.startContainer,n=e.startOffset,o=e.endContainer,r=e.endOffset;if(t===o&&Jo(t)){if(n>0&&n<t.data.length)if(o=Tf(t,n),t=o.previousSibling,r>n){r-=n;const e=Tf(o,r).previousSibling;t=o=e,r=e.data.length,n=0}else r=0}else if(Jo(t)&&n>0&&n<t.data.length&&(t=Tf(t,n),n=0),Jo(o)&&r>0&&r<o.data.length){const e=Tf(o,r).previousSibling;o=e,r=e.data.length}return{startContainer:t,startOffset:n,endContainer:o,endOffset:r}},Df=e=>({walk:(t,n)=>zm(e,t,n),split:Bf,expand:(t,n={type:"word"})=>{if("word"===n.type){const n=Um(e,t,[{inline:"span"}]),o=e.createRng();return o.setStart(n.startContainer,n.startOffset),o.setEnd(n.endContainer,n.endOffset),o}return t},normalize:t=>Of(e,t).fold(L,(e=>(t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0)))});Df.compareRanges=kf,Df.getCaretRangeFromPoint=xf,Df.getSelectedNode=gi,Df.getNode=pi;const Pf=((e,t)=>{const n=t=>{const n=(e=>{const t=e.dom;return Yn(e)?t.getBoundingClientRect().height:t.offsetHeight})(t);if(n<=0||null===n){const n=lo(t,e);return parseFloat(n)||0}return n},o=(e,t)=>X(t,((t,n)=>{const o=lo(e,n),r=void 0===o?0:parseInt(o,10);return isNaN(r)?t:t+r}),0);return{set:(t,n)=>{if(!x(n)&&!n.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+n);const o=t.dom;ro(o)&&(o.style[e]=n+"px")},get:n,getOuter:n,aggregate:o,max:(e,t,n)=>{const r=o(e,n);return t>r?t-r:0}}})("height"),Lf=()=>yn(document),Mf=(e,t)=>e.view(t).fold(N([]),(t=>{const n=e.owner(t),o=Mf(e,n);return[t].concat(o)}));var If=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?I.none():I.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(yn)},owner:e=>Nn(e)});const Ff=e=>"textarea"===Ht(e),Uf=(e,t)=>{const n=(e=>{const t=e.dom.ownerDocument,n=t.body,o=t.defaultView,r=t.documentElement;if(n===e.dom)return Ao(n.offsetLeft,n.offsetTop);const s=Oo(null==o?void 0:o.pageYOffset,r.scrollTop),a=Oo(null==o?void 0:o.pageXOffset,r.scrollLeft),i=Oo(r.clientTop,n.clientTop),l=Oo(r.clientLeft,n.clientLeft);return To(e).translate(a-l,s-i)})(e),o=(e=>Pf.get(e))(e);return{element:e,bottom:n.top+o,height:o,pos:n,cleanup:t}},zf=(e,t,n,o)=>{qf(e,((r,s)=>Hf(e,t,n,o)),n)},jf=(e,t,n,o,r)=>{const s={elm:o.element.dom,alignToTop:r};((e,t)=>e.dispatch("ScrollIntoView",t).isDefaultPrevented())(e,s)||(n(e,t,Bo(t).top,o,r),((e,t)=>{e.dispatch("AfterScrollIntoView",t)})(e,s))},Hf=(e,t,n,o)=>{const r=yn(e.getBody()),s=yn(e.getDoc());r.dom.offsetWidth;const a=((e,t)=>{const n=((e,t)=>{const n=Mn(e);if(0===n.length||Ff(e))return{element:e,offset:t};if(t<n.length&&!Ff(n[t]))return{element:n[t],offset:0};{const o=n[n.length-1];return Ff(o)?{element:e,offset:t}:"img"===Ht(o)?{element:o,offset:1}:Kt(o)?{element:o,offset:vr(o).length}:{element:o,offset:Mn(o).length}}})(e,t),o=hn('<span data-mce-bogus="all" style="display: inline-block;">\ufeff</span>');return go(n.element,o),Uf(o,(()=>wo(o)))})(yn(n.startContainer),n.startOffset);jf(e,s,t,a,o),a.cleanup()},$f=(e,t,n,o)=>{const r=yn(e.getDoc());jf(e,r,n,(e=>Uf(yn(e),E))(t),o)},qf=(e,t,n)=>{const o=n.startContainer,r=n.startOffset,s=n.endContainer,a=n.endOffset;t(yn(o),yn(s));const i=e.dom.createRng();i.setStart(o,r),i.setEnd(s,a),e.selection.setRng(n)},Vf=(e,t,n,o,r)=>{const s=t.pos;if(o)Do(s.left,s.top,r);else{const o=s.top-n+t.height;Do(-e.getBody().getBoundingClientRect().left,o,r)}},Wf=(e,t,n,o,r,s)=>{const a=o+n,i=r.pos.top,l=r.bottom,d=l-i>=o;i<n?Vf(e,r,o,!1!==s,t):i>a?Vf(e,r,o,d?!1!==s:!0===s,t):l>a&&!d&&Vf(e,r,o,!0===s,t)},Kf=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Wf(e,t,n,s,o,r)},Gf=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Wf(e,t,n,s,o,r);const a=(e=>{const t=Lf(),n=Bo(t),o=((e,t)=>{const n=t.owner(e);return Mf(t,n)})(e,If),r=To(e),s=Y(o,((e,t)=>{const n=To(t);return{left:e.left+n.left,top:e.top+n.top}}),{left:0,top:0});return Ao(s.left+r.left+n.left,s.top+r.top+n.top)})(o.element),i=Mo(window);a.top<i.y?Po(o.element,!1!==r):a.top>i.bottom&&Po(o.element,!0===r)},Yf=(e,t,n)=>zf(e,Kf,t,n),Xf=(e,t,n)=>$f(e,t,Kf,n),Qf=(e,t,n)=>zf(e,Gf,t,n),Jf=(e,t,n)=>$f(e,t,Gf,n),Zf=(e,t,n)=>{(e.inline?Yf:Qf)(e,t,n)},eg=e=>e.dom.focus(),tg=e=>{const t=qn(e).dom;return e.dom===t.activeElement},ng=(e=Lf())=>I.from(e.dom.activeElement).map(yn),og=(e,t)=>{const n=Kt(t)?vr(t).length:Mn(t).length+1;return e>n?n:e<0?0:e},rg=e=>hf.range(e.start,og(e.soffset,e.start),e.finish,og(e.foffset,e.finish)),sg=(e,t)=>!Ho(t.dom)&&(Sn(e,t)||En(e,t)),ag=e=>t=>sg(e,t.start)&&sg(e,t.finish),ig=e=>hf.range(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset),lg=e=>{const t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),I.some(t)}catch(e){return I.none()}},dg=e=>{const t=(e=>e.inline||At.browser.isFirefox())(e)?(n=yn(e.getBody()),(e=>{const t=e.getSelection();return(t&&0!==t.rangeCount?I.from(t.getRangeAt(0)):I.none()).map(ig)})(Rn(n).dom).filter(ag(n))):I.none();var n;e.bookmark=t.isSome()?t:e.bookmark},cg=e=>(e.bookmark?e.bookmark:I.none()).bind((t=>{return n=yn(e.getBody()),o=t,I.from(o).filter(ag(n)).map(rg);var n,o})).bind(lg),ug={isEditorUIElement:e=>{const t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},mg={setEditorTimeout:(e,t,n)=>((e,t)=>(x(t)||(t=0),setTimeout(e,t)))((()=>{e.removed||t()}),n),setEditorInterval:(e,t,n)=>{const o=((e,t)=>(x(t)||(t=0),setInterval(e,t)))((()=>{e.removed?clearInterval(o):t()}),n);return o}};let fg;const gg=Oa.DOM,pg=e=>{const t=e.classList;return void 0!==t&&(t.contains("tox-edit-area")||t.contains("tox-edit-area__iframe")||t.contains("mce-content-body"))},hg=(e,t)=>{const n=gd(e),o=gg.getParent(t,(t=>(e=>$o(e)&&ug.isEditorUIElement(e))(t)||!!n&&e.dom.is(t,n)));return null!==o},bg=e=>{try{const t=qn(yn(e.getElement()));return ng(t).fold((()=>document.body),(e=>e.dom))}catch(e){return document.body}},vg=(e,t)=>{const n=t.editor;(e=>{const t=ja((()=>{dg(e)}),0);e.on("init",(()=>{e.inline&&((e,t)=>{const n=()=>{t.throttle()};Oa.DOM.bind(document,"mouseup",n),e.on("remove",(()=>{Oa.DOM.unbind(document,"mouseup",n)}))})(e,t),((e,t)=>{((e,t)=>{e.on("mouseup touchend",(e=>{t.throttle()}))})(e,t),e.on("keyup NodeChange AfterSetSelectionRange",(t=>{(e=>"nodechange"===e.type&&e.selectionChange)(t)||dg(e)}))})(e,t)})),e.on("remove",(()=>{t.cancel()}))})(n);const o=(e,t)=>{nc(e)&&!0!==e.inline&&t(yn(e.getContainer()),"tox-edit-focus")};n.on("focusin",(()=>{const t=e.focusedEditor;pg(bg(n))&&o(n,un),t!==n&&(t&&t.dispatch("blur",{focusedEditor:n}),e.setActive(n),e.focusedEditor=n,n.dispatch("focus",{blurredEditor:t}),n.focus(!0))})),n.on("focusout",(()=>{mg.setEditorTimeout(n,(()=>{const t=e.focusedEditor;pg(bg(n))&&t===n||o(n,fn),hg(n,bg(n))||t!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null)}))})),fg||(fg=t=>{const n=e.activeEditor;n&&Kn(t).each((t=>{const o=t;o.ownerDocument===document&&(o===document.body||hg(n,o)||e.focusedEditor!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null))}))},gg.bind(document,"focusin",fg))},yg=(e,t)=>{e.focusedEditor===t.editor&&(e.focusedEditor=null),!e.activeEditor&&fg&&(gg.unbind(document,"focusin",fg),fg=null)},Cg=(e,t)=>{((e,t)=>(e=>e.collapsed?I.from(pi(e.startContainer,e.startOffset)).map(yn):I.none())(t).bind((t=>Rr(t)?I.some(t):Sn(e,t)?I.none():I.some(e))))(yn(e.getBody()),t).bind((e=>yu(e.dom))).fold((()=>{e.selection.normalize()}),(t=>e.selection.setRng(t.toRange())))},wg=e=>{if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},xg=e=>e.inline?(e=>{const t=e.getBody();return t&&(n=yn(t),tg(n)||(o=n,ng(qn(o)).filter((e=>o.dom.contains(e.dom)))).isSome());var n,o})(e):(e=>C(e.iframeElement)&&tg(yn(e.iframeElement)))(e),kg=e=>e.editorManager.setActive(e),Eg=(e,t,n,o,r)=>{const s=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return I.from(s).map(yn).map((e=>o&&t.collapsed?e:In(e,r(e,a)).getOr(e))).bind((e=>Wt(e)?I.some(e):An(e).filter(Wt))).map((e=>e.dom)).getOr(e)},Sg=(e,t,n=!1)=>Eg(e,t,!0,n,((e,t)=>Math.min(zn(e),t))),_g=(e,t,n=!1)=>Eg(e,t,!1,n,((e,t)=>t>0?t-1:t)),Ng=(e,t)=>{const n=e;for(;e&&Jo(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Rg=(e,t)=>q(t,(t=>{const n=e.dispatch("GetSelectionRange",{range:t});return n.range!==t?n.range:t})),Ag=["img","br"],Og=e=>{const t=yr(e).filter((e=>0!==e.trim().length||e.indexOf(pr)>-1)).isSome();return t||H(Ag,Ht(e))||(e=>Vt(e)&&"false"===en(e,"contenteditable"))(e)},Tg="[data-mce-autocompleter]",Bg=(e,t)=>{if(Dg(yn(e.getBody())).isNone()){const o=hn('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());bo(o,yn(t.extractContents())),t.insertNode(o.dom),An(o).each((e=>e.dom.normalize())),(n=o,((e,t)=>{const n=e=>{const o=Mn(e);for(let e=o.length-1;e>=0;e--){const r=o[e];if(t(r))return I.some(r);const s=n(r);if(s.isSome())return s}return I.none()};return n(e)})(n,Og)).map((t=>{e.selection.setCursorLocation(t.dom,(e=>"img"===Ht(e)?1:yr(e).fold((()=>Mn(e).length),(e=>e.length)))(t))}))}var n},Dg=e=>eo(e,Tg),Pg={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},Lg=(e,t,n)=>{const o=n?"lastChild":"firstChild",r=n?"prev":"next";if(e[o])return e[o];if(e!==t){let n=e[r];if(n)return n;for(let o=e.parent;o&&o!==t;o=o.parent)if(n=o[r],n)return n}},Mg=e=>{var t;const n=null!==(t=e.value)&&void 0!==t?t:"";if(!ds(n))return!1;const o=e.parent;return!o||"span"===o.name&&!o.attr("style")||!/^[ ]+$/.test(n)},Ig=e=>{const t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t};class Fg{static create(e,t){const n=new Fg(e,Pg[e]||1);return t&&ge(t,((e,t)=>{n.attr(t,e)})),n}constructor(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}replace(e){const t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t}attr(e,t){const n=this;if(!m(e))return C(e)&&ge(e,((e,t)=>{n.attr(t,e)})),n;const o=n.attributes;if(o){if(void 0!==t){if(null===t){if(e in o.map){delete o.map[e];let t=o.length;for(;t--;)if(o[t].name===e)return o.splice(t,1),n}return n}if(e in o.map){let n=o.length;for(;n--;)if(o[n].name===e){o[n].value=t;break}}else o.push({name:e,value:t});return o.map[e]=t,n}return o.map[e]}}clone(){const e=this,t=new Fg(e.name,e.type),n=e.attributes;if(n){const e=[];e.map={};for(let t=0,o=n.length;t<o;t++){const o=n[t];"id"!==o.name&&(e[e.length]={name:o.name,value:o.value},e.map[o.name]=o.value)}t.attributes=e}return t.value=e.value,t}wrap(e){const t=this;return t.parent&&(t.parent.insert(e,t),e.append(t)),t}unwrap(){const e=this;for(let t=e.firstChild;t;){const n=t.next;e.insert(t,e,!0),t=n}e.remove()}remove(){const e=this,t=e.parent,n=e.next,o=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):o&&(o.next=n),t.lastChild===e?(t.lastChild=o,o&&(o.next=null)):n&&(n.prev=o),e.parent=e.next=e.prev=null),e}append(e){const t=this;e.parent&&e.remove();const n=t.lastChild;return n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e}insert(e,t,n){e.parent&&e.remove();const o=t.parent||this;return n?(t===o.firstChild?o.firstChild=e:t.prev&&(t.prev.next=e),e.prev=t.prev,e.next=t,t.prev=e):(t===o.lastChild?o.lastChild=e:t.next&&(t.next.prev=e),e.next=t.next,e.prev=t,t.next=e),e.parent=o,e}getAll(e){const t=this,n=[];for(let o=t.firstChild;o;o=Lg(o,t))o.name===e&&n.push(o);return n}children(){const e=[];for(let t=this.firstChild;t;t=t.next)e.push(t);return e}empty(){const e=this;if(e.firstChild){const t=[];for(let n=e.firstChild;n;n=Lg(n,e))t.push(n);let n=t.length;for(;n--;){const e=t[n];e.parent=e.firstChild=e.lastChild=e.next=e.prev=null}}return e.firstChild=e.lastChild=null,e}isEmpty(e,t={},n){var o;const r=this;let s=r.firstChild;if(Ig(r))return!1;if(s)do{if(1===s.type){if(s.attr("data-mce-bogus"))continue;if(e[s.name])return!1;if(Ig(s))return!1}if(8===s.type)return!1;if(3===s.type&&!Mg(s))return!1;if(3===s.type&&s.parent&&t[s.parent.name]&&ds(null!==(o=s.value)&&void 0!==o?o:""))return!1;if(n&&n(s))return!1}while(s=Lg(s,r));return!0}walk(e){return Lg(this,null,e)}}const Ug=e=>(0===e.length?"":`${q(e,(e=>`[${e}]`)).join(",")},`)+'[data-mce-bogus="all"]',zg=e=>document.createTreeWalker(e,NodeFilter.SHOW_COMMENT,null),jg=(e,t)=>null!==e.querySelector(Ug(t)),Hg=(e,t)=>{V(((e,t)=>e.querySelectorAll(Ug(t)))(e,t),(e=>{const n=yn(e);"all"===en(n,"data-mce-bogus")?wo(n):V(t,(e=>{nn(n,e)&&on(n,e)}))}))},$g=e=>e.cloneNode(!0),qg=(e,t)=>{let n=e;return(e=>null!==zg(e).nextNode())(e)?(n=$g(e),(e=>{const t=zg(e);let n=t.nextNode();for(;null!==n;){const e=t.currentNode;n=t.nextNode(),m(e.nodeValue)&&e.nodeValue.includes(Mr)&&wo(yn(e))}})(n),jg(n,t)&&Hg(n,t)):jg(e,t)&&(n=$g(e),Hg(n,t)),n},Vg=e=>{const t=Fo(e,"[data-mce-bogus]");V(t,(e=>{"all"===en(e,"data-mce-bogus")?wo(e):Er(e)?(go(e,vn(gr)),wo(e)):xo(e)}))},Wg=e=>{const t=Fo(e,"input");V(t,(e=>{on(e,"name")}))},Kg=(e,t,n)=>{let o;return o="raw"===t.format?Dt.trim(Fr(qg(n,e.serializer.getTempAttrs()).innerHTML)):"text"===t.format?((e,t)=>{const n=e.getDoc(),o=qn(yn(e.getBody())),r=bn("div",n);Jt(r,"data-mce-bogus","all"),io(r,{position:"fixed",left:"-9999999px",top:"0"}),So(r,t.innerHTML),Vg(r),Wg(r);const s=(e=>jn(e)?e:yn(Nn(e).dom.body))(o);bo(s,r);const a=Fr(r.dom.innerText);return wo(r),a})(e,n):"tree"===t.format?e.serializer.serialize(n,t):((e,t)=>{const n=Nl(e),o=new RegExp(`^(<${n}[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/${n}>[\r\n]*|<br \\/>[\r\n]*)$`);return t.replace(o,"")})(e,e.serializer.serialize(n,t)),"text"!==t.format&&!Or(yn(n))&&m(o)?Dt.trim(o):o},Gg=Dt.makeMap,Yg=e=>{const t=[],n=(e=e||{}).indent,o=Gg(e.indent_before||""),r=Gg(e.indent_after||""),s=Zs.getEncodeFunc(e.entity_encoding||"raw",e.entities),a="xhtml"!==e.element_format;return{start:(e,i,l)=>{if(n&&o[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}if(t.push("<",e),i)for(let e=0,n=i.length;e<n;e++){const n=i[e];t.push(" ",n.name,'="',s(n.value,!0),'"')}if(t[t.length]=!l||a?">":" />",l&&n&&r[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}},end:e=>{let o;t.push("</",e,">"),n&&r[e]&&t.length>0&&(o=t[t.length-1],o.length>0&&"\n"!==o&&t.push("\n"))},text:(e,n)=>{e.length>0&&(t[t.length]=n?e:s(e))},cdata:e=>{t.push("<![CDATA[",e,"]]>")},comment:e=>{t.push("\x3c!--",e,"--\x3e")},pi:(e,o)=>{o?t.push("<?",e," ",s(o),"?>"):t.push("<?",e,"?>"),n&&t.push("\n")},doctype:e=>{t.push("<!DOCTYPE",e,">",n?"\n":"")},reset:()=>{t.length=0},getContent:()=>t.join("").replace(/\n$/,"")}},Xg=(e={},t=ca())=>{const n=Yg(e);return e.validate=!("validate"in e)||e.validate,{serialize:o=>{const r=e.validate,s={3:e=>{var t;n.text(null!==(t=e.value)&&void 0!==t?t:"",e.raw)},8:e=>{var t;n.comment(null!==(t=e.value)&&void 0!==t?t:"")},7:e=>{n.pi(e.name,e.value)},10:e=>{var t;n.doctype(null!==(t=e.value)&&void 0!==t?t:"")},4:e=>{var t;n.cdata(null!==(t=e.value)&&void 0!==t?t:"")},11:e=>{let t=e;if(t=t.firstChild)do{a(t)}while(t=t.next)}};n.reset();const a=e=>{var o;const i=s[e.type];if(i)i(e);else{const s=e.name,i=s in t.getVoidElements();let l=e.attributes;if(r&&l&&l.length>1){const n=[];n.map={};const o=t.getElementRule(e.name);if(o){for(let e=0,t=o.attributesOrder.length;e<t;e++){const t=o.attributesOrder[e];if(t in l.map){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}for(let e=0,t=l.length;e<t;e++){const t=l[e].name;if(!(t in n.map)){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}l=n}}if(n.start(s,l,i),!i){let t=e.firstChild;if(t){"pre"!==s&&"textarea"!==s||3!==t.type||"\n"!==(null===(o=t.value)||void 0===o?void 0:o[0])||n.text("\n",!0);do{a(t)}while(t=t.next)}n.end(s)}}};return 1!==o.type||e.inner?3===o.type?s[3](o):s[11](o):a(o),n.getContent()}}},Qg=new Set;V(["margin","margin-left","margin-right","margin-top","margin-bottom","padding","padding-left","padding-right","padding-top","padding-bottom","border","border-width","border-style","border-color","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","float","position","left","right","top","bottom","z-index","display","transform","width","max-width","min-width","height","max-height","min-height","overflow","overflow-x","overflow-y","text-overflow","vertical-align","transition","transition-delay","transition-duration","transition-property","transition-timing-function"],(e=>{Qg.add(e)}));const Jg=["font","text-decoration","text-emphasis"],Zg=(e,t)=>me(e.parseStyle(e.getAttrib(t,"style"))),ep=(e,t,n)=>{const o=Zg(e,t),r=Zg(e,n),s=o=>{var r,s;const a=null!==(r=e.getStyle(t,o))&&void 0!==r?r:"",i=null!==(s=e.getStyle(n,o))&&void 0!==s?s:"";return Ge(a)&&Ge(i)&&a!==i};return $(o,(e=>{const t=t=>$(t,(t=>t===e));if(!t(r)&&t(Jg)){const e=G(r,(e=>$(Jg,(t=>He(e,t)))));return $(e,s)}return s(e)}))},tp=(e,t,n)=>I.from(n.container()).filter(Jo).exists((o=>{const r=e?0:-1;return t(o.data.charAt(n.offset()+r))})),np=O(tp,!0,Fu),op=O(tp,!1,Fu),rp=e=>{const t=e.container();return Jo(t)&&(0===t.data.length||Ir(t.data)&&Wm.isBookmarkNode(t.parentNode))},sp=(e,t)=>n=>zc(e?0:-1,n).filter(t).isSome(),ap=e=>sr(e)&&"block"===lo(yn(e),"display"),ip=e=>ir(e)&&!(e=>$o(e)&&"all"===e.getAttribute("data-mce-bogus"))(e),lp=sp(!0,ap),dp=sp(!1,ap),cp=sp(!0,cr),up=sp(!1,cr),mp=sp(!0,Yo),fp=sp(!1,Yo),gp=sp(!0,ip),pp=sp(!1,ip),hp=(e,t)=>((e,t,n)=>Sn(t,e)?Tn(e,(e=>n(e)||En(e,t))).slice(0,-1):[])(e,t,L),bp=(e,t)=>[e].concat(hp(e,t)),vp=(e,t,n)=>pu(e,t,n,rp),yp=(e,t)=>J(bp(yn(t.container()),e),xr),Cp=(e,t,n)=>vp(e,t.dom,n).forall((e=>yp(t,n).fold((()=>!Uc(e,n,t.dom)),(o=>!Uc(e,n,t.dom)&&Sn(o,yn(e.container())))))),wp=(e,t,n)=>yp(t,n).fold((()=>vp(e,t.dom,n).forall((e=>!Uc(e,n,t.dom)))),(t=>vp(e,t.dom,n).isNone())),xp=O(wp,!1),kp=O(wp,!0),Ep=O(Cp,!1),Sp=O(Cp,!0),_p=e=>Yc(e).exists(Er),Np=(e,t,n)=>{const o=G(bp(yn(n.container()),t),xr),r=le(o).getOr(t);return fu(e,r.dom,n).filter(_p)},Rp=(e,t)=>Yc(t).exists(Er)||Np(!0,e,t).isSome(),Ap=(e,t)=>(e=>I.from(e.getNode(!0)).map(yn))(t).exists(Er)||Np(!1,e,t).isSome(),Op=O(Np,!1),Tp=O(Np,!0),Bp=e=>Li.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd(),Dp=(e,t)=>{const n=G(bp(yn(t.container()),e),xr);return le(n).getOr(e)},Pp=(e,t)=>Bp(t)?op(t):op(t)||vu(Dp(e,t).dom,t).exists(op),Lp=(e,t)=>Bp(t)?np(t):np(t)||bu(Dp(e,t).dom,t).exists(np),Mp=e=>Yc(e).bind((e=>Jn(e,Wt))).exists((e=>(e=>H(["pre","pre-wrap"],e))(lo(e,"white-space")))),Ip=(e,t)=>n=>{return o=new zo(n,e)[t](),C(o)&&ir(o)&&Rc(o);var o},Fp=(e,t)=>!Mp(t)&&(((e,t)=>((e,t)=>vu(e.dom,t).isNone())(e,t)||((e,t)=>bu(e.dom,t).isNone())(e,t)||xp(e,t)||kp(e,t)||Ap(e,t)||Rp(e,t))(e,t)||Pp(e,t)||Lp(e,t)),Up=(e,t)=>!Mp(t)&&(xp(e,t)||Ep(e,t)||Ap(e,t)||Pp(e,t)||((e,t)=>{const n=vu(e.dom,t).getOr(t),o=Ip(e.dom,"prev");return t.isAtStart()&&(o(t.container())||o(n.container()))})(e,t)),zp=(e,t)=>!Mp(t)&&(kp(e,t)||Sp(e,t)||Rp(e,t)||Lp(e,t)||((e,t)=>{const n=bu(e.dom,t).getOr(t),o=Ip(e.dom,"next");return t.isAtEnd()&&(o(t.container())||o(n.container()))})(e,t)),jp=(e,t)=>Up(e,t)||zp(e,(e=>{const t=e.container(),n=e.offset();return Jo(t)&&n<t.data.length?Li(t,n+1):e})(t)),Hp=(e,t)=>Mu(e.charAt(t)),$p=(e,t)=>Fu(e.charAt(t)),qp=(e,t,n)=>{const o=t.data,r=Li(t,0);return n||!Hp(o,0)||jp(e,r)?!!(n&&$p(o,0)&&Up(e,r))&&(t.data=pr+o.slice(1),!0):(t.data=" "+o.slice(1),!0)},Vp=(e,t,n)=>{const o=t.data,r=Li(t,o.length-1);return n||!Hp(o,o.length-1)||jp(e,r)?!!(n&&$p(o,o.length-1)&&zp(e,r))&&(t.data=o.slice(0,-1)+pr,!0):(t.data=o.slice(0,-1)+" ",!0)},Wp=(e,t)=>{const n=t.container();if(!Jo(n))return I.none();if((e=>{const t=e.container();return Jo(t)&&je(t.data,pr)})(t)){const o=qp(e,n,!1)||(e=>{const t=e.data,n=(e=>{const t=e.split("");return q(t,((e,n)=>Mu(e)&&n>0&&n<t.length-1&&Uu(t[n-1])&&Uu(t[n+1])?" ":e)).join("")})(t);return n!==t&&(e.data=n,!0)})(n)||Vp(e,n,!1);return It(o,t)}if(jp(e,t)){const o=qp(e,n,!0)||Vp(e,n,!0);return It(o,t)}return I.none()},Kp=(e,t,n)=>{if(0===n)return;const o=yn(e),r=Qn(o,xr).getOr(o),s=e.data.slice(t,t+n),a=t+n>=e.data.length&&zp(r,Li(e,e.data.length)),i=0===t&&Up(r,Li(e,0));e.replaceData(t,n,ms(s,4,i,a))},Gp=(e,t)=>{const n=e.data.slice(t),o=n.length-We(n).length;Kp(e,t,o)},Yp=(e,t)=>{const n=e.data.slice(0,t),o=n.length-Ke(n).length;Kp(e,t-o,o)},Xp=(e,t,n,o=!0)=>{const r=Ke(e.data).length,s=o?e:t,a=o?t:e;return o?s.appendData(a.data):s.insertData(0,a.data),wo(yn(a)),n&&Gp(s,r),s},Qp=(e,t)=>((e,t)=>{const n=e.container(),o=e.offset();return!Li.isTextPosition(e)&&n===t.parentNode&&o>Li.before(t).offset()})(t,e)?Li(t.container(),t.offset()-1):t,Jp=e=>{return ss(e.previousSibling)?I.some((t=e.previousSibling,Jo(t)?Li(t,t.data.length):Li.after(t))):e.previousSibling?Cu(e.previousSibling):I.none();var t},Zp=e=>{return ss(e.nextSibling)?I.some((t=e.nextSibling,Jo(t)?Li(t,0):Li.before(t))):e.nextSibling?yu(e.nextSibling):I.none();var t},eh=(e,t,n)=>((e,t,n)=>e?((e,t)=>Zp(t).orThunk((()=>Jp(t))).orThunk((()=>((e,t)=>bu(e,Li.after(t)).orThunk((()=>vu(e,Li.before(t)))))(e,t))))(t,n):((e,t)=>Jp(t).orThunk((()=>Zp(t))).orThunk((()=>((e,t)=>I.from(t.previousSibling?t.previousSibling:t.parentNode).bind((t=>vu(e,Li.before(t)))).orThunk((()=>bu(e,Li.after(t)))))(e,t))))(t,n))(e,t,n).map(O(Qp,n)),th=(e,t,n)=>{n.fold((()=>{e.focus()}),(n=>{e.selection.setRng(n.toRange(),t)}))},nh=(e,t)=>t&&ke(e.schema.getBlockElements(),Ht(t)),oh=e=>{if(bs(e)){const t=hn('<br data-mce-bogus="1">');return Co(e),bo(e,t),I.some(Li.before(t.dom))}return I.none()},rh=(e,t,n,o=!0)=>{const r=eh(t,e.getBody(),n.dom),s=Qn(n,O(nh,e),(a=e.getBody(),e=>e.dom===a));var a;const i=((e,t,n)=>{const o=Bn(e).filter(Kt),r=Dn(e).filter(Kt);return wo(e),(s=o,a=r,i=t,l=(e,t,o)=>{const r=e.dom,s=t.dom,a=r.data.length;return Xp(r,s,n),o.container()===s?Li(r,a):o},s.isSome()&&a.isSome()&&i.isSome()?I.some(l(s.getOrDie(),a.getOrDie(),i.getOrDie())):I.none()).orThunk((()=>(n&&(o.each((e=>Yp(e.dom,e.dom.length))),r.each((e=>Gp(e.dom,0)))),t)));var s,a,i,l})(n,r,((e,t)=>ke(e.schema.getTextInlineElements(),Ht(t)))(e,n));e.dom.isEmpty(e.getBody())?(e.setContent(""),e.selection.setCursorLocation()):s.bind(oh).fold((()=>{o&&th(e,t,i)}),(n=>{o&&th(e,t,I.some(n))}))},sh=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,ah=(e,t)=>xn(yn(t),Zl(e))&&!As(e.schema,t)&&e.dom.isEditable(t),ih=e=>{var t;return"rtl"===Oa.DOM.getStyle(e,"direction",!0)||(e=>sh.test(e))(null!==(t=e.textContent)&&void 0!==t?t:"")},lh=(e,t,n)=>{const o=((e,t,n)=>G(Oa.DOM.getParents(n.container(),"*",t),e))(e,t,n);return I.from(o[o.length-1])},dh=(e,t)=>{const n=t.container(),o=t.offset();return e?Hr(n)?Jo(n.nextSibling)?Li(n.nextSibling,0):Li.after(n):Vr(t)?Li(n,o+1):t:Hr(n)?Jo(n.previousSibling)?Li(n.previousSibling,n.previousSibling.data.length):Li.before(n):Wr(t)?Li(n,o-1):t},ch=O(dh,!0),uh=O(dh,!1),mh=(e,t)=>{const n=e=>e.stopImmediatePropagation();e.on("beforeinput input",n,!0),e.getDoc().execCommand(t),e.off("beforeinput input",n)},fh=e=>mh(e,"Delete"),gh=e=>Sr(e)||Nr(e),ph=(e,t)=>Sn(e,t)?Jn(t,gh,(e=>t=>Pt(An(t),e,En))(e)):I.none(),hh=(e,t=!0)=>{e.dom.isEmpty(e.getBody())&&e.setContent("",{no_selection:!t})},bh=(e,t,n)=>Mt(yu(n),Cu(n),((o,r)=>{const s=dh(!0,o),a=dh(!1,r),i=dh(!1,t);return e?bu(n,i).exists((e=>e.isEqual(a)&&t.isEqual(s))):vu(n,i).exists((e=>e.isEqual(s)&&t.isEqual(a)))})).getOr(!0),vh=e=>{var t;return(8===$t(t=e)||"#comment"===Ht(t)?Bn(e):Un(e)).bind(vh).orThunk((()=>I.some(e)))},yh=(e,t,n,o=!0)=>{var r;t.deleteContents();const s=vh(n).getOr(n),a=yn(null!==(r=e.dom.getParent(s.dom,e.dom.isBlock))&&void 0!==r?r:n.dom);if(a.dom===e.getBody()?hh(e,o):bs(a)&&(Pr(a),o&&e.selection.setCursorLocation(a.dom,0)),!En(n,a)){const e=Pt(An(a),n)?[]:An(i=a).map(Mn).map((e=>G(e,(e=>!En(i,e))))).getOr([]);V(e.concat(Mn(n)),(e=>{En(e,a)||Sn(e,a)||!bs(e)||wo(e)}))}var i},Ch=e=>Fo(e,"td,th"),wh=(e,t)=>({start:e,end:t}),xh=al([{singleCellTable:["rng","cell"]},{fullTable:["table"]},{partialTable:["cells","outsideDetails"]},{multiTable:["startTableCells","endTableCells","betweenRng"]}]),kh=(e,t)=>to(yn(e),"td,th",t),Eh=e=>!En(e.start,e.end),Sh=(e,t)=>Xu(e.start,t).bind((n=>Xu(e.end,t).bind((e=>It(En(n,e),n))))),_h=e=>t=>Sh(t,e).map((e=>((e,t,n)=>({rng:e,table:t,cells:n}))(t,e,Ch(e)))),Nh=(e,t,n,o)=>{if(n.collapsed||!e.forall(Eh))return I.none();if(t.isSameTable){const t=e.bind(_h(o));return I.some({start:t,end:t})}{const e=kh(n.startContainer,o),t=kh(n.endContainer,o),r=e.bind((e=>t=>Xu(t,e).bind((e=>de(Ch(e)).map((e=>wh(t,e))))))(o)).bind(_h(o)),s=t.bind((e=>t=>Xu(t,e).bind((e=>le(Ch(e)).map((e=>wh(e,t))))))(o)).bind(_h(o));return I.some({start:r,end:s})}},Rh=(e,t)=>Z(e,(e=>En(e,t))),Ah=e=>Mt(Rh(e.cells,e.rng.start),Rh(e.cells,e.rng.end),((t,n)=>e.cells.slice(t,n+1))),Oh=(e,t)=>{const{startTable:n,endTable:o}=t,r=e.cloneRange();return n.each((e=>r.setStartAfter(e.dom))),o.each((e=>r.setEndBefore(e.dom))),r},Th=(e,t)=>{const n=(e=>t=>En(e,t))(e),o=((e,t)=>{const n=kh(e.startContainer,t),o=kh(e.endContainer,t);return Mt(n,o,wh)})(t,n),r=((e,t)=>{const n=e=>Xu(yn(e),t),o=n(e.startContainer),r=n(e.endContainer),s=o.isSome(),a=r.isSome(),i=Mt(o,r,En).getOr(!1);return{startTable:o,endTable:r,isStartInTable:s,isEndInTable:a,isSameTable:i,isMultiTable:!i&&s&&a}})(t,n);return((e,t,n)=>e.exists((e=>((e,t)=>!Eh(e)&&Sh(e,t).exists((e=>{const t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})))(e,n)&&Zu(e.start,t))))(o,t,n)?o.map((e=>xh.singleCellTable(t,e.start))):r.isMultiTable?((e,t,n,o)=>Nh(e,t,n,o).bind((({start:e,end:o})=>{const r=e.bind(Ah).getOr([]),s=o.bind(Ah).getOr([]);if(r.length>0&&s.length>0){const e=Oh(n,t);return I.some(xh.multiTable(r,s,e))}return I.none()})))(o,r,t,n):((e,t,n,o)=>Nh(e,t,n,o).bind((({start:e,end:t})=>e.or(t))).bind((e=>{const{isSameTable:o}=t,r=Ah(e).getOr([]);if(o&&e.cells.length===r.length)return I.some(xh.fullTable(e.table));if(r.length>0){if(o)return I.some(xh.partialTable(r,I.none()));{const e=Oh(n,t);return I.some(xh.partialTable(r,I.some({...t,rng:e})))}}return I.none()})))(o,r,t,n)},Bh=e=>V(e,(e=>{on(e,"contenteditable"),Pr(e)})),Dh=(e,t,n,o)=>{const r=n.cloneRange();o?(r.setStart(n.startContainer,n.startOffset),r.setEndAfter(t.dom.lastChild)):(r.setStartBefore(t.dom.firstChild),r.setEnd(n.endContainer,n.endOffset)),Ih(e,r,t,!1).each((e=>e()))},Ph=e=>{const t=Yu(e),n=yn(e.selection.getNode());lr(n.dom)&&bs(n)?e.selection.setCursorLocation(n.dom,0):e.selection.collapse(!0),t.length>1&&$(t,(e=>En(e,n)))&&Jt(n,"data-mce-selected","1")},Lh=(e,t,n)=>I.some((()=>{const o=e.selection.getRng(),r=n.bind((({rng:n,isStartInTable:r})=>{const s=((e,t)=>I.from(e.dom.getParent(t,e.dom.isBlock)).map(yn))(e,r?n.endContainer:n.startContainer);n.deleteContents(),((e,t,n)=>{n.each((n=>{t?wo(n):(Pr(n),e.selection.setCursorLocation(n.dom,0))}))})(e,r,s.filter(bs));const a=r?t[0]:t[t.length-1];return Dh(e,a,o,r),bs(a)?I.none():I.some(r?t.slice(1):t.slice(0,-1))})).getOr(t);Bh(r),Ph(e)})),Mh=(e,t,n,o)=>I.some((()=>{const r=e.selection.getRng(),s=t[0],a=n[n.length-1];Dh(e,s,r,!0),Dh(e,a,r,!1);const i=bs(s)?t:t.slice(1),l=bs(a)?n:n.slice(0,-1);Bh(i.concat(l)),o.deleteContents(),Ph(e)})),Ih=(e,t,n,o=!0)=>I.some((()=>{yh(e,t,n,o)})),Fh=(e,t)=>I.some((()=>rh(e,!1,t))),Uh=(e,t)=>J(bp(t,e),Ar),zh=(e,t)=>J(bp(t,e),Xt("caption")),jh=(e,t)=>I.some((()=>{Pr(t),e.selection.setCursorLocation(t.dom,0)})),Hh=(e,t)=>e?mp(t):fp(t),$h=(e,t,n)=>{const o=yn(e.getBody());return zh(o,n).fold((()=>((e,t,n,o)=>{const r=Li.fromRangeStart(e.selection.getRng());return Uh(n,o).bind((o=>bs(o)?jh(e,o):((e,t,n,o,r)=>gu(n,e.getBody(),r).bind((e=>Uh(t,yn(e.getNode())).bind((e=>En(e,o)?I.none():I.some(E))))))(e,n,t,o,r)))})(e,t,o,n).orThunk((()=>It(((e,t)=>{const n=Li.fromRangeStart(e.selection.getRng());return Hh(t,n)||fu(t,e.getBody(),n).exists((e=>Hh(t,e)))})(e,t),E)))),(n=>((e,t,n,o)=>{const r=Li.fromRangeStart(e.selection.getRng());return bs(o)?jh(e,o):((e,t,n,o,r)=>gu(n,e.getBody(),r).fold((()=>I.some(E)),(s=>((e,t,n,o)=>yu(e.dom).bind((r=>Cu(e.dom).map((e=>t?n.isEqual(r)&&o.isEqual(e):n.isEqual(e)&&o.isEqual(r))))).getOr(!0))(o,n,r,s)?((e,t)=>jh(e,t))(e,o):((e,t,n)=>zh(e,yn(n.getNode())).fold((()=>I.some(E)),(e=>It(!En(e,t),E))))(t,o,s))))(e,n,t,o,r)})(e,t,o,n)))},qh=(e,t)=>{const n=yn(e.selection.getStart(!0)),o=Yu(e);return e.selection.isCollapsed()&&0===o.length?$h(e,t,n):((e,t,n)=>{const o=yn(e.getBody()),r=e.selection.getRng();return 0!==n.length?Lh(e,n,I.none()):((e,t,n,o)=>zh(t,o).fold((()=>((e,t,n)=>Th(t,n).bind((t=>t.fold(O(Ih,e),O(Fh,e),O(Lh,e),O(Mh,e)))))(e,t,n)),(t=>((e,t)=>jh(e,t))(e,t))))(e,o,r,t)})(e,n,o)},Vh=(e,t)=>{let n=t;for(;n&&n!==e;){if(ar(n)||ir(n))return n;n=n.parentNode}return null},Wh=["data-ephox-","data-mce-","data-alloy-","data-snooker-","_"],Kh=Dt.each,Gh=e=>{const t=e.dom,n=new Set(e.serializer.getTempAttrs()),o=e=>$(Wh,(t=>He(e,t)))||n.has(e);return{compare:(e,n)=>{if(e.nodeName!==n.nodeName||e.nodeType!==n.nodeType)return!1;const r=e=>{const n={};return Kh(t.getAttribs(e),(r=>{const s=r.nodeName.toLowerCase();"style"===s||o(s)||(n[s]=t.getAttrib(e,s))})),n},s=(e,t)=>{for(const n in e)if(ke(e,n)){const o=t[n];if(v(o))return!1;if(e[n]!==o)return!1;delete t[n]}for(const e in t)if(ke(t,e))return!1;return!0};if($o(e)&&$o(n)){if(!s(r(e),r(n)))return!1;if(!s(t.parseStyle(t.getAttrib(e,"style")),t.parseStyle(t.getAttrib(n,"style"))))return!1}return!Lu(e)&&!Lu(n)},isAttributeInternal:o}},Yh=(e,t,n,o)=>{const r=n.name;for(let t=0,s=e.length;t<s;t++){const s=e[t];if(s.name===r){const e=o.nodes[r];e?e.nodes.push(n):o.nodes[r]={filter:s,nodes:[n]}}}if(n.attributes)for(let e=0,r=t.length;e<r;e++){const r=t[e],s=r.name;if(s in n.attributes.map){const e=o.attributes[s];e?e.nodes.push(n):o.attributes[s]={filter:r,nodes:[n]}}}},Xh=(e,t)=>{const n=(e,n)=>{ge(e,(e=>{const o=ce(e.nodes);V(e.filter.callbacks,(r=>{for(let t=o.length-1;t>=0;t--){const r=o[t];(n?void 0!==r.attr(e.filter.name):r.name===e.filter.name)&&!y(r.parent)||o.splice(t,1)}o.length>0&&r(o,e.filter.name,t)}))}))};n(e.nodes,!1),n(e.attributes,!0)},Qh=(e,t,n,o={})=>{const r=((e,t,n)=>{const o={nodes:{},attributes:{}};return n.firstChild&&((n,r)=>{let s=n;for(;s=s.walk();)Yh(e,t,s,o)})(n),o})(e,t,n);Xh(r,o)},Jh=(e,t,n,o)=>{if((e.pad_empty_with_br||t.insert)&&n(o)){const e=new Fg("br",1);t.insert&&e.attr("data-mce-bogus","1"),o.empty().append(e)}else o.empty().append(new Fg("#text",3)).value=pr},Zh=(e,t)=>{const n=null==e?void 0:e.firstChild;return C(n)&&n===e.lastChild&&n.name===t},eb=(e,t,n,o)=>o.isEmpty(t,n,(t=>((e,t)=>{const n=e.getElementRule(t.name);return!0===(null==n?void 0:n.paddEmpty)})(e,t))),tb=e=>{let t;for(let n=e;n;n=n.parent){const e=n.attr("contenteditable");if("false"===e)break;"true"===e&&(t=n)}return I.from(t)},nb=(e,t,n=e.parent)=>{if(t.getSpecialElements()[e.name])e.empty().remove();else{const o=e.children();for(const e of o)n&&!t.isValidChild(n.name,e.name)&&nb(e,t,n);e.unwrap()}},ob=(e,t,n,o=E)=>{const r=t.getTextBlockElements(),s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=Dt.makeMap("tr,td,th,tbody,thead,tfoot,table,summary"),l=new Set,d=e=>e!==n&&!i[e.name];for(let n=0;n<e.length;n++){const i=e[n];let c,u,m;if(!i.parent||l.has(i))continue;if(r[i.name]&&"li"===i.parent.name){let e=i.next;for(;e&&r[e.name];)e.name="li",l.add(e),i.parent.insert(e,i.parent),e=e.next;i.unwrap();continue}const f=[i];for(c=i.parent;c&&!t.isValidChild(c.name,i.name)&&d(c);c=c.parent)f.push(c);if(c&&f.length>1)if(t.isValidChild(c.name,i.name)){f.reverse(),u=f[0].clone(),o(u);let e=u;for(let n=0;n<f.length-1;n++){t.isValidChild(e.name,f[n].name)&&n>0?(m=f[n].clone(),o(m),e.append(m)):m=e;for(let e=f[n].firstChild;e&&e!==f[n+1];){const t=e.next;m.append(e),e=t}e=m}eb(t,s,a,u)?c.insert(i,f[0],!0):(c.insert(u,f[0],!0),c.insert(i,u)),c=f[0],(eb(t,s,a,c)||Zh(c,"br"))&&c.empty().remove()}else nb(i,t);else if(i.parent){if("li"===i.name){let e=i.prev;if(e&&("ul"===e.name||"ol"===e.name)){e.append(i);continue}if(e=i.next,e&&("ul"===e.name||"ol"===e.name)&&e.firstChild){e.insert(i,e.firstChild,!0);continue}const t=new Fg("ul",1);o(t),i.wrap(t);continue}if(t.isValidChild(i.parent.name,"div")&&t.isValidChild("div",i.name)){const e=new Fg("div",1);o(e),i.wrap(e)}else nb(i,t)}}},rb=(e,t,n=t.parent)=>!(!n||!e.children[t.name]||e.isValidChild(n.name,t.name))||!(!n||"a"!==t.name||!((e,t)=>{let n=e;for(;n;){if("a"===n.name)return!0;n=n.parent}return!1})(n)),sb=e=>e.collapsed?e:(e=>{const t=Li.fromRangeStart(e),n=Li.fromRangeEnd(e),o=e.commonAncestorContainer;return fu(!1,o,n).map((r=>!Uc(t,n,o)&&Uc(t,r,o)?((e,t,n,o)=>{const r=document.createRange();return r.setStart(e,t),r.setEnd(n,o),r})(t.container(),t.offset(),r.container(),r.offset()):e)).getOr(e)})(e),ab=(e,t)=>{let n=t.firstChild,o=t.lastChild;return n&&"meta"===n.name&&(n=n.next),o&&"mce_marker"===o.attr("id")&&(o=o.prev),((e,t)=>{const n=e.getNonEmptyElements();return C(t)&&(t.isEmpty(n)||((e,t)=>e.getBlockElements()[t.name]&&(e=>C(e.firstChild)&&e.firstChild===e.lastChild)(t)&&(e=>"br"===e.name||e.value===pr)(t.firstChild))(e,t))})(e,o)&&(o=null==o?void 0:o.prev),!(!n||n!==o||"ul"!==n.name&&"ol"!==n.name)},ib=e=>{return e.length>0&&(!(n=e[e.length-1]).firstChild||C(null==(t=n)?void 0:t.firstChild)&&t.firstChild===t.lastChild&&(e=>e.data===pr||rr(e))(t.firstChild))?e.slice(0,-1):e;var t,n},lb=(e,t)=>{const n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},db=(e,t)=>{const n=Li.after(e),o=du(t).prev(n);return o?o.toRange():null},cb=(e,t,n,o)=>{const r=((e,t,n)=>{const o=t.serialize(n);return(e=>{var t,n;const o=e.firstChild,r=e.lastChild;return o&&"META"===o.nodeName&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o)),r&&"mce_marker"===r.id&&(null===(n=r.parentNode)||void 0===n||n.removeChild(r)),e})(e.createFragment(o))})(t,e,o),s=lb(t,n.startContainer),a=ib((i=r.firstChild,G(null!==(l=null==i?void 0:i.childNodes)&&void 0!==l?l:[],(e=>"LI"===e.nodeName))));var i,l;const d=t.getRoot(),c=e=>{const o=Li.fromRangeStart(n),r=du(t.getRoot()),a=1===e?r.prev(o):r.next(o),i=null==a?void 0:a.getNode();return!i||lb(t,i)!==s};return s?c(1)?((e,t,n)=>{const o=e.parentNode;return o&&Dt.each(t,(t=>{o.insertBefore(t,e)})),((e,t)=>{const n=Li.before(e),o=du(t).next(n);return o?o.toRange():null})(e,n)})(s,a,d):c(2)?((e,t,n,o)=>(o.insertAfter(t.reverse(),e),db(t[0],n)))(s,a,d,t):((e,t,n,o)=>{const r=((e,t)=>{const n=t.cloneRange(),o=t.cloneRange();return n.setStartBefore(e),o.setEndAfter(e),[n.cloneContents(),o.cloneContents()]})(e,o),s=e.parentNode;return s&&(s.insertBefore(r[0],e),Dt.each(t,(t=>{s.insertBefore(t,e)})),s.insertBefore(r[1],e),s.removeChild(e)),db(t[t.length-1],n)})(s,a,d,n):null},ub=["pre"],mb=lr,fb=(e,t,n)=>{var o,r;const s=e.selection,a=e.dom,i=e.parser,l=n.merge,d=Xg({validate:!0},e.schema),c='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>';-1===t.indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,c);let u=s.getRng();const m=u.startContainer,f=e.getBody();m===f&&s.isCollapsed()&&a.isBlock(f.firstChild)&&((e,t)=>C(t)&&!e.schema.getVoidElements()[t.nodeName])(e,f.firstChild)&&a.isEmpty(f.firstChild)&&(u=a.createRng(),u.setStart(f.firstChild,0),u.setEnd(f.firstChild,0),s.setRng(u)),s.isCollapsed()||(e=>{const t=e.dom,n=sb(e.selection.getRng());e.selection.setRng(n);const o=t.getParent(n.startContainer,mb);((e,t,n)=>!!C(n)&&n===e.getParent(t.endContainer,mb)&&Zu(yn(n),t))(t,n,o)?Ih(e,n,yn(o)):n.startContainer===n.endContainer&&n.endOffset-n.startOffset==1&&Jo(n.startContainer.childNodes[n.startOffset])?n.deleteContents():e.getDoc().execCommand("Delete",!1)})(e);const g=s.getNode(),p={context:g.nodeName.toLowerCase(),data:n.data,insert:!0},h=i.parse(t,p);if(!0===n.paste&&ab(e.schema,h)&&((e,t)=>!!lb(e,t))(a,g))return u=cb(d,a,s.getRng(),h),u&&s.setRng(u),t;!0===n.paste&&((e,t,n,o)=>{var r;const s=t.firstChild,a=t.lastChild,i=s===("bookmark"===a.attr("data-mce-type")?a.prev:a),l=H(ub,s.name);if(i&&l){const t="false"!==s.attr("contenteditable"),a=(null===(r=e.getParent(n,e.isBlock))||void 0===r?void 0:r.nodeName.toLowerCase())===s.name,i=I.from(Vh(o,n)).forall(ar);return t&&a&&i}return!1})(a,h,g,e.getBody())&&(null===(o=h.firstChild)||void 0===o||o.unwrap()),(e=>{let t=e;for(;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")})(h);let b=h.lastChild;if(b&&"mce_marker"===b.attr("id")){const t=b;for(b=b.prev;b;b=b.walk(!0))if(3===b.type||!a.isBlock(b.name)){b.parent&&e.schema.isValidChild(b.parent.name,"span")&&b.parent.insert(t,b,"br"===b.name);break}}if(e._selectionOverrides.showBlockCaretContainer(g),p.invalid){e.selection.setContent(c);let n,o=s.getNode();const l=e.getBody();for(nr(o)?o=n=l:n=o;n&&n!==l;)o=n,n=n.parentNode;t=o===l?l.innerHTML:a.getOuterHTML(o);const u=i.parse(t),m=(e=>{for(let t=e;t;t=t.walk())if("mce_marker"===t.attr("id"))return I.some(t);return I.none()})(u),f=m.bind(tb).getOr(u);m.each((e=>e.replace(h)));const g=h.children(),p=null!==(r=h.parent)&&void 0!==r?r:u;h.unwrap();const b=G(g,(t=>rb(e.schema,t,p)));ob(b,e.schema,f),Qh(i.getNodeFilters(),i.getAttributeFilters(),u),t=d.serialize(u),o===l?a.setHTML(l,t):a.setOuterHTML(o,t)}else t=d.serialize(h),((e,t,n)=>{var o;if("all"===n.getAttribute("data-mce-bogus"))null===(o=n.parentNode)||void 0===o||o.insertBefore(e.dom.createFragment(t),n);else{const o=n.firstChild,r=n.lastChild;!o||o===r&&"BR"===o.nodeName?e.dom.setHTML(n,t):e.selection.setContent(t,{no_events:!0})}})(e,t,g);var v;return((e,t)=>{const n=e.schema.getTextInlineElements(),o=e.dom;if(t){const t=e.getBody(),r=Gh(e);Dt.each(o.select("*[data-mce-fragment]"),(e=>{if(C(n[e.nodeName.toLowerCase()])&&((e,t)=>ne(Zg(e,t),(e=>!(e=>Qg.has(e))(e))))(o,e))for(let n=e.parentElement;C(n)&&n!==t&&!ep(o,e,n);n=n.parentElement)if(r.compare(n,e)){o.remove(e,!0);break}}))}})(e,l),((e,t)=>{var n,o,r;let s;const a=e.dom,i=e.selection;if(!t)return;i.scrollIntoView(t);const l=Vh(e.getBody(),t);if(l&&"false"===a.getContentEditable(l))return a.remove(t),void i.select(l);let d=a.createRng();const c=t.previousSibling;if(Jo(c)){d.setStart(c,null!==(o=null===(n=c.nodeValue)||void 0===n?void 0:n.length)&&void 0!==o?o:0);const e=t.nextSibling;Jo(e)&&(c.appendData(e.data),null===(r=e.parentNode)||void 0===r||r.removeChild(e))}else d.setStartBefore(t),d.setEndBefore(t);const u=a.getParent(t,a.isBlock);if(a.remove(t),u&&a.isEmpty(u)){const t=mb(u);Co(yn(u)),d.setStart(u,0),d.setEnd(u,0),t||(e=>!!e.getAttribute("data-mce-fragment"))(u)||!(s=(t=>{let n=Li.fromRangeStart(t);return n=du(e.getBody()).next(n),null==n?void 0:n.toRange()})(d))?a.add(u,a.create("br",t?{}:{"data-mce-bogus":"1"})):(d=s,a.remove(u))}i.setRng(d)})(e,a.get("mce_marker")),v=e.getBody(),Dt.each(v.getElementsByTagName("*"),(e=>{e.removeAttribute("data-mce-fragment")})),((e,t)=>{I.from(e.getParent(t,"td,th")).map(yn).each(Lr)})(a,s.getStart()),((e,t,n)=>{const o=Tn(yn(n),(e=>En(e,yn(t))));ie(o,o.length-2).filter(Wt).fold((()=>Es(e,t)),(t=>Es(e,t.dom)))})(e.schema,e.getBody(),s.getStart()),t},gb=e=>e instanceof Fg,pb=(e,t,n)=>{e.dom.setHTML(e.getBody(),t),!0!==n&&(e=>{xg(e)&&yu(e.getBody()).each((t=>{const n=t.getNode(),o=Yo(n)?yu(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e)},hb=(e,t)=>((e,t)=>{const n=e.dom;return n.parentNode?((e,t)=>J(e.dom.childNodes,(e=>t(yn(e)))).map(yn))(yn(n.parentNode),(n=>!En(e,n)&&t(n))):I.none()})(e,t).isSome(),bb=e=>w(e)?e:L,vb=(e,t,n)=>{const o=t(e),r=bb(n);return o.orThunk((()=>r(e)?I.none():((e,t,n)=>{let o=e.dom;const r=bb(n);for(;o.parentNode;){o=o.parentNode;const e=yn(o),n=t(e);if(n.isSome())return n;if(r(e))break}return I.none()})(e,t,r)))},yb=pm,Cb=(e,t,n)=>{const o=e.formatter.get(n);if(o)for(let n=0;n<o.length;n++){const r=o[n];if(xm(r)&&!1===r.inherit&&e.dom.is(t,r.selector))return!0}return!1},wb=(e,t,n,o,r)=>{const s=e.dom.getRoot();if(t===s)return!1;const a=e.dom.getParent(t,(t=>!!Cb(e,t,n)||t.parentNode===s||!!Eb(e,t,n,o,!0)));return!!Eb(e,a,n,o,r)},xb=(e,t,n)=>!(!km(n)||!yb(t,n.inline))||!(!wm(n)||!yb(t,n.block))||!!xm(n)&&$o(t)&&e.is(t,n.selector),kb=(e,t,n,o,r,s)=>{const a=n[o],i="attributes"===o;if(w(n.onmatch))return n.onmatch(t,n,o);if(a)if(_e(a)){for(let n=0;n<a.length;n++)if(i?e.getAttrib(t,a[n]):bm(e,t,a[n]))return!0}else for(const o in a)if(ke(a,o)){const l=i?e.getAttrib(t,o):bm(e,t,o),d=gm(a[o],s),c=y(l)||Ye(l);if(c&&y(d))continue;if(r&&c&&!n.exact)return!1;if((!r||n.exact)&&!yb(l,hm(d,o)))return!1}return!0},Eb=(e,t,n,o,r)=>{const s=e.formatter.get(n),a=e.dom;if(s&&$o(t))for(let n=0;n<s.length;n++){const i=s[n];if(xb(e.dom,t,i)&&kb(a,t,i,"attributes",r,o)&&kb(a,t,i,"styles",r,o)){const n=i.classes;if(n)for(let r=0;r<n.length;r++)if(!e.dom.hasClass(t,gm(n[r],o)))return;return i}}},Sb=(e,t,n,o,r)=>{if(o)return wb(e,o,t,n,r);if(o=e.selection.getNode(),wb(e,o,t,n,r))return!0;const s=e.selection.getStart();return!(s===o||!wb(e,s,t,n,r))},_b=Mr,Nb=e=>(e=>{const t=[];let n=e;for(;n;){if(Jo(n)&&n.data!==_b||n.childNodes.length>1)return[];$o(n)&&t.push(n),n=n.firstChild}return t})(e).length>0,Rb=e=>{if(e){const t=new zo(e,e);for(let e=t.current();e;e=t.next())if(Jo(e))return e}return null},Ab=e=>{const t=bn("span");return Zt(t,{id:wu,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&bo(t,vn(_b)),t},Ob=(e,t,n=!0)=>{const o=e.dom,r=e.selection;if(Nb(t))rh(e,!1,yn(t),n);else{const e=r.getRng(),n=o.getParent(t,o.isBlock),s=e.startContainer,a=e.startOffset,i=e.endContainer,l=e.endOffset,d=(e=>{const t=Rb(e);return t&&t.data.charAt(0)===_b&&t.deleteData(0,1),t})(t);o.remove(t,!0),s===d&&a>0&&e.setStart(d,a-1),i===d&&l>0&&e.setEnd(d,l-1),n&&o.isEmpty(n)&&Pr(yn(n)),r.setRng(e)}},Tb=(e,t,n=!0)=>{const o=e.dom,r=e.selection;if(t)Ob(e,t,n);else if(!(t=ku(e.getBody(),r.getStart())))for(;t=o.get(wu);)Ob(e,t,n)},Bb=(e,t)=>(e.appendChild(t),t),Db=(e,t)=>{var n;const o=Y(e,((e,t)=>Bb(e,t.cloneNode(!1))),t),r=null!==(n=o.ownerDocument)&&void 0!==n?n:document;return Bb(o,r.createTextNode(_b))},Pb=(e,t,n,o)=>{const a=e.dom,i=e.selection;let l=!1;const d=e.formatter.get(t);if(!d)return;const c=i.getRng(),u=c.startContainer,m=c.startOffset;let f=u;Jo(u)&&(m!==u.data.length&&(l=!0),f=f.parentNode);const g=[];let h;for(;f;){if(Eb(e,f,t,n,o)){h=f;break}f.nextSibling&&(l=!0),g.push(f),f=f.parentNode}if(h)if(l){const r=i.getBookmark();c.collapse(!0);let s=Um(a,c,d,!0);s=Bf(s),e.formatter.remove(t,n,s,o),i.moveToBookmark(r)}else{const l=ku(e.getBody(),h),d=Ab(!1).dom;((e,t,n)=>{var o,r;const s=e.dom,a=s.getParent(n,O(cm,e.schema));a&&s.isEmpty(a)?null===(o=n.parentNode)||void 0===o||o.replaceChild(t,n):((e=>{const t=Fo(e,"br"),n=G((e=>{const t=[];let n=e.dom;for(;n;)t.push(yn(n)),n=n.lastChild;return t})(e).slice(-1),Er);t.length===n.length&&V(n,wo)})(yn(n)),s.isEmpty(n)?null===(r=n.parentNode)||void 0===r||r.replaceChild(t,n):s.insertAfter(t,n))})(e,d,null!=l?l:h);const c=((e,t,n,o,a,i)=>{const l=e.formatter,d=e.dom,c=G(me(l.get()),(e=>e!==o&&!je(e,"removeformat"))),u=((e,t,n)=>X(n,((n,o)=>{const r=((e,t)=>Cm(e,t,(e=>{const t=e=>w(e)||e.length>1&&"%"===e.charAt(0);return $(["styles","attributes"],(n=>xe(e,n).exists((e=>{const n=p(e)?e:we(e);return $(n,t)}))))})))(e,o);return e.formatter.matchNode(t,o,{},r)?n.concat([o]):n}),[]))(e,n,c);if(G(u,(t=>!((e,t,n)=>{const o=["inline","block","selector","attributes","styles","classes"],a=e=>ye(e,((e,t)=>$(o,(e=>e===t))));return Cm(e,t,(t=>{const o=a(t);return Cm(e,n,(e=>{const t=a(e);return((e,t,n=s)=>r(n).eq(e,t))(o,t)}))}))})(e,t,o))).length>0){const e=n.cloneNode(!1);return d.add(t,e),l.remove(o,a,e,i),d.remove(e),I.some(e)}return I.none()})(e,d,h,t,n,o),u=Db(g.concat(c.toArray()),d);l&&Ob(e,l,!1),i.setCursorLocation(u,1),a.isEmpty(h)&&a.remove(h)}},Lb=e=>{const t=Ab(!1),n=Db(e,t.dom);return{caretContainer:t,caretPosition:Li(n,0)}},Mb=(e,t)=>{const{caretContainer:n,caretPosition:o}=Lb(t);return go(yn(e),n),wo(yn(e)),o},Ib=(e,t)=>{const n=e.schema.getTextInlineElements();return ke(n,Ht(t))&&!xu(t.dom)&&!Go(t.dom)},Fb=e=>xu(e.dom)&&Nb(e.dom),Ub={},zb=Vo(["pre"]);((e,t)=>{Ub[e]||(Ub[e]=[]),Ub[e].push((e=>{if(!e.selection.getRng().collapsed){const t=e.selection.getSelectedBlocks(),n=G(G(t,zb),(e=>t=>{const n=t.previousSibling;return zb(n)&&H(e,n)})(t));V(n,(e=>{((e,t)=>{const n=yn(t),o=Nn(n).dom;wo(n),yo(yn(e),[bn("br",o),bn("br",o),...Mn(n)])})(e.previousSibling,e)}))}}))})("pre");const jb=["fontWeight","fontStyle","color","fontSize","fontFamily"],Hb=(e,t)=>{const n=e.get(t);return p(n)?J(n,(e=>km(e)&&"span"===e.inline&&(e=>f(e.styles)&&$(me(e.styles),(e=>H(jb,e))))(e))):I.none()},$b=(e,t)=>vu(t,Li.fromRangeStart(e)).isNone(),qb=(e,t)=>!1===bu(t,Li.fromRangeEnd(e)).exists((e=>!rr(e.getNode())||bu(t,e).isSome())),Vb=e=>t=>ur(t)&&e.isEditable(t),Wb=e=>G(e.getSelectedBlocks(),Vb(e.dom)),Kb=Dt.each,Gb=e=>$o(e)&&!Lu(e)&&!xu(e)&&!Go(e),Yb=(e,t)=>{for(let n=e;n;n=n[t]){if(Jo(n)&&Ge(n.data))return e;if($o(n)&&!Lu(n))return n}return e},Xb=(e,t,n)=>{const o=Gh(e),r=$o(t)&&am(t),s=$o(n)&&am(n);if(r&&s){const r=Yb(t,"previousSibling"),s=Yb(n,"nextSibling");if(o.compare(r,s)){for(let e=r.nextSibling;e&&e!==s;){const t=e;e=e.nextSibling,r.appendChild(t)}return e.dom.remove(s),Dt.each(Dt.grep(s.childNodes),(e=>{r.appendChild(e)})),r}}return n},Qb=(e,t,n,o)=>{var r;if(o&&!1!==t.merge_siblings){const t=null!==(r=Xb(e,dm(o),o))&&void 0!==r?r:o;Xb(e,t,dm(t,!0))}},Jb=(e,t,n)=>{Kb(e.childNodes,(e=>{Gb(e)&&(t(e)&&n(e),e.hasChildNodes()&&Jb(e,t,n))}))},Zb=(e,t)=>n=>!(!n||!bm(e,n,t)),ev=(e,t,n)=>o=>{e.setStyle(o,t,n),""===o.getAttribute("style")&&o.removeAttribute("style"),((e,t)=>{"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)})(e,o)},tv=al([{keep:[]},{rename:["name"]},{removed:[]}]),nv=/^(src|href|style)$/,ov=Dt.each,rv=pm,sv=(e,t,n)=>e.isChildOf(t,n)&&t!==n&&!e.isBlock(n),av=(e,t,n)=>{let o=t[n?"startContainer":"endContainer"],r=t[n?"startOffset":"endOffset"];if($o(o)){const e=o.childNodes.length-1;!n&&r&&r--,o=o.childNodes[r>e?e:r]}return Jo(o)&&n&&r>=o.data.length&&(o=new zo(o,e.getBody()).next()||o),Jo(o)&&!n&&0===r&&(o=new zo(o,e.getBody()).prev()||o),o},iv=(e,t)=>{const n=t?"firstChild":"lastChild",o=e[n];return(e=>/^(TR|TH|TD)$/.test(e.nodeName))(e)&&o?"TR"===e.nodeName&&o[n]||o:e},lv=(e,t,n,o)=>{var r;const s=e.create(n,o);return null===(r=t.parentNode)||void 0===r||r.insertBefore(s,t),s.appendChild(t),s},dv=(e,t,n,o,r)=>{const s=yn(t),a=yn(e.create(o,r)),i=n?Ln(s):Pn(s);return yo(a,i),n?(go(s,a),ho(a,s)):(po(s,a),bo(a,s)),a.dom},cv=(e,t,n)=>{const o=t.parentNode;let r;const s=e.dom,a=Nl(e);wm(n)&&o===s.getRoot()&&(n.list_block&&rv(t,n.list_block)||V(ce(t.childNodes),(t=>{um(e,a,t.nodeName.toLowerCase())?r?r.appendChild(t):(r=lv(s,t,a),s.setAttribs(r,Rl(e))):r=null}))),(e=>xm(e)&&km(e)&&Pt(xe(e,"mixed"),!0))(n)&&!rv(n.inline,t)||s.remove(t,!0)},uv=(e,t,n)=>x(e)?{name:t,value:null}:{name:e,value:gm(t,n)},mv=(e,t)=>{""===e.getAttrib(t,"style")&&(t.removeAttribute("style"),t.removeAttribute("data-mce-style"))},fv=(e,t,n,o,r)=>{let s=!1;ov(n.styles,((a,i)=>{const{name:l,value:d}=uv(i,a,o),c=hm(d,l);(n.remove_similar||h(d)||!$o(r)||rv(bm(e,r,l),c))&&e.setStyle(t,l,""),s=!0})),s&&mv(e,t)},gv=(e,t,n,o,r)=>{const s=e.dom,a=Gh(e),i=e.schema;if(km(t)&&Ns(i,t.inline)&&As(i,o)&&o.parentElement===e.getBody())return cv(e,o,t),tv.removed();if(!t.ceFalseOverride&&o&&"false"===s.getContentEditableParent(o))return tv.keep();if(o&&!xb(s,o,t)&&!((e,t)=>t.links&&"A"===e.nodeName)(o,t))return tv.keep();const l=o,d=t.preserve_attributes;if(km(t)&&"all"===t.remove&&p(d)){const e=G(s.getAttribs(l),(e=>H(d,e.name.toLowerCase())));if(s.removeAllAttribs(l),V(e,(e=>s.setAttrib(l,e.name,e.value))),e.length>0)return tv.rename("span")}if("all"!==t.remove){fv(s,l,t,n,r),ov(t.attributes,((e,o)=>{const{name:a,value:i}=uv(o,e,n);if(t.remove_similar||h(i)||!$o(r)||rv(s.getAttrib(r,a),i)){if("class"===a){const e=s.getAttrib(l,a);if(e){let t="";if(V(e.split(/\s+/),(e=>{/mce\-\w+/.test(e)&&(t+=(t?" ":"")+e)})),t)return void s.setAttrib(l,a,t)}}if(nv.test(a)&&l.removeAttribute("data-mce-"+a),"style"===a&&Vo(["li"])(l)&&"none"===s.getStyle(l,"list-style-type"))return l.removeAttribute(a),void s.setStyle(l,"list-style-type","none");"class"===a&&l.removeAttribute("className"),l.removeAttribute(a)}})),ov(t.classes,(e=>{e=gm(e,n),$o(r)&&!s.hasClass(r,e)||s.removeClass(l,e)}));const e=s.getAttribs(l);for(let t=0;t<e.length;t++){const n=e[t].nodeName;if(!a.isAttributeInternal(n))return tv.keep()}}return"none"!==t.remove?(cv(e,l,t),tv.removed()):tv.keep()},pv=(e,t,n,o)=>gv(e,t,n,o,o).fold(N(o),(t=>(e.dom.createFragment().appendChild(o),e.dom.rename(o,t))),N(null)),hv=(e,t,n,o,r)=>{(o||e.selection.isEditable())&&((e,t,n,o,r)=>{const s=e.formatter.get(t),a=s[0],i=e.dom,l=e.selection,d=o=>{const i=((e,t,n,o,r)=>{let s;return t.parentNode&&V(ym(e.dom,t.parentNode).reverse(),(t=>{if(!s&&$o(t)&&"_start"!==t.id&&"_end"!==t.id){const a=Eb(e,t,n,o,r);a&&!1!==a.split&&(s=t)}})),s})(e,o,t,n,r);return((e,t,n,o,r,s,a,i)=>{var l,d;let c,u;const m=e.dom;if(n){const s=n.parentNode;for(let n=o.parentNode;n&&n!==s;n=n.parentNode){let o=m.clone(n,!1);for(let n=0;n<t.length&&(o=pv(e,t[n],i,o),null!==o);n++);o&&(c&&o.appendChild(c),u||(u=o),c=o)}a.mixed&&m.isBlock(n)||(o=null!==(l=m.split(n,o))&&void 0!==l?l:o),c&&u&&(null===(d=r.parentNode)||void 0===d||d.insertBefore(c,r),u.appendChild(r),km(a)&&Qb(e,a,0,c))}return o})(e,s,i,o,o,0,a,n)},c=t=>$(s,(o=>bv(e,o,n,t,t))),u=t=>{const n=ce(t.childNodes),o=c(t)||$(s,(e=>xb(i,t,e))),r=t.parentNode;if(!o&&C(r)&&Em(a)&&c(r),a.deep&&n.length)for(let e=0;e<n.length;e++)u(n[e]);V(["underline","line-through","overline"],(n=>{$o(t)&&e.dom.getStyle(t,"text-decoration")===n&&t.parentNode&&vm(i,t.parentNode)===n&&bv(e,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:n}},void 0,t)}))},m=e=>{const t=i.get(e?"_start":"_end");if(t){let n=t[e?"firstChild":"lastChild"];return(e=>Lu(e)&&$o(e)&&("_start"===e.id||"_end"===e.id))(n)&&(n=n[e?"firstChild":"lastChild"]),Jo(n)&&0===n.data.length&&(n=e?t.previousSibling||t.nextSibling:t.nextSibling||t.previousSibling),i.remove(t,!0),n}return null},f=t=>{let n,o,r=Um(i,t,s,t.collapsed);if(a.split){if(r=Bf(r),n=av(e,r,!0),o=av(e,r),n!==o){if(n=iv(n,!0),o=iv(o,!1),sv(i,n,o)){const e=I.from(n.firstChild).getOr(n);return d(dv(i,e,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void m(!0)}if(sv(i,o,n)){const e=I.from(o.lastChild).getOr(o);return d(dv(i,e,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void m(!1)}n=lv(i,n,"span",{id:"_start","data-mce-type":"bookmark"}),o=lv(i,o,"span",{id:"_end","data-mce-type":"bookmark"});const e=i.createRng();e.setStartAfter(n),e.setEndBefore(o),zm(i,e,(e=>{V(e,(e=>{Lu(e)||Lu(e.parentNode)||d(e)}))})),d(n),d(o),n=m(!0),o=m()}else n=o=d(n);r.startContainer=n.parentNode?n.parentNode:n,r.startOffset=i.nodeIndex(n),r.endContainer=o.parentNode?o.parentNode:o,r.endOffset=i.nodeIndex(o)+1}zm(i,r,(e=>{V(e,u)}))};if(o){if(rm(o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(e)}else f(o);Xm(e,t,o,n)}else l.isCollapsed()&&km(a)&&!Yu(e).length?Pb(e,t,n,r):(im(e,(()=>nm(e,f)),(o=>km(a)&&Sb(e,t,n,o))),e.nodeChanged()),((e,t,n)=>{"removeformat"===t?V(Wb(e.selection),(t=>{V(jb,(n=>e.dom.setStyle(t,n,""))),mv(e.dom,t)})):Hb(e.formatter,t).each((t=>{V(Wb(e.selection),(o=>fv(e.dom,o,t,n,null)))}))})(e,t,n),Xm(e,t,o,n)})(e,t,n,o,r)},bv=(e,t,n,o,r)=>gv(e,t,n,o,r).fold(L,(t=>(e.dom.rename(o,t),!0)),M),vv=Dt.each,yv=Dt.each,Cv=(e,t,n,o)=>{if(yv(n.styles,((n,r)=>{e.setStyle(t,r,gm(n,o))})),n.styles){const n=e.getAttrib(t,"style");n&&e.setAttrib(t,"data-mce-style",n)}},wv=(e,t,n,o)=>{const r=e.formatter.get(t),s=r[0],a=!o&&e.selection.isCollapsed(),i=e.dom,l=e.selection,d=(e,t=s)=>{w(t.onformat)&&t.onformat(e,t,n,o),Cv(i,e,t,n),yv(t.attributes,((t,o)=>{i.setAttrib(e,o,gm(t,n))})),yv(t.classes,(t=>{const o=gm(t,n);i.hasClass(e,o)||i.addClass(e,o)}))},c=(e,t)=>{let n=!1;return yv(e,(e=>!(!xm(e)||("false"!==i.getContentEditable(t)||e.ceFalseOverride)&&(!C(e.collapsed)||e.collapsed===a)&&i.is(t,e.selector)&&!xu(t)&&(d(t,e),n=!0,1)))),n},u=e=>{if(m(e)){const t=i.create(e);return d(t),t}return null},f=(o,a,i)=>{const l=[];let m=!0;const f=s.inline||s.block,g=u(f);zm(o,a,(a=>{let u;const p=a=>{let h=!1,b=m,v=!1;const y=a.parentNode,w=y.nodeName.toLowerCase(),x=o.getContentEditable(a);C(x)&&(b=m,m="true"===x,h=!0,v=fm(e,a));const k=m&&!h;if(rr(a)&&!((e,t,n,o)=>{if(md(e)&&km(t)&&n.parentNode){const t=la(e.schema),r=hb(yn(n),(e=>xu(e.dom)));return Ee(t,o)&&bs(yn(n.parentNode),!1)&&!r}return!1})(e,s,a,w))return u=null,void(wm(s)&&o.remove(a));if((o=>(e=>wm(e)&&!0===e.wrapper)(s)&&Eb(e,o,t,n))(a))u=null;else{if(((t,n,o)=>{const r=(e=>wm(e)&&!0!==e.wrapper)(s)&&cm(e.schema,t)&&um(e,n,f);return o&&r})(a,w,k)){const e=o.rename(a,f);return d(e),l.push(e),void(u=null)}if(xm(s)){let e=c(r,a);if(!e&&C(y)&&Em(s)&&(e=c(r,y)),!km(s)||e)return void(u=null)}C(g)&&((t,n,r,a)=>{const l=t.nodeName.toLowerCase(),d=um(e,f,l)&&um(e,n,f),c=!i&&Jo(t)&&Ir(t.data),u=xu(t),m=!km(s)||!o.isBlock(t);return(r||a)&&d&&!c&&!u&&m})(a,w,k,v)?(u||(u=o.clone(g,!1),y.insertBefore(u,a),l.push(u)),v&&h&&(m=b),u.appendChild(a)):(u=null,V(ce(a.childNodes),p),h&&(m=b),u=null)}};V(a,p)})),!0===s.links&&V(l,(e=>{const t=e=>{"A"===e.nodeName&&d(e,s),V(ce(e.childNodes),t)};t(e)})),V(l,(a=>{const i=(e=>{let t=0;return V(e.childNodes,(e=>{(e=>C(e)&&Jo(e)&&0===e.length)(e)||Lu(e)||t++})),t})(a);!(l.length>1)&&o.isBlock(a)||0!==i?(km(s)||wm(s)&&s.wrapper)&&(s.exact||1!==i||(a=(e=>{const t=J(e.childNodes,sm).filter((e=>"false"!==o.getContentEditable(e)&&xb(o,e,s)));return t.map((t=>{const n=o.clone(t,!1);return d(n),o.replace(n,e,!0),o.remove(t,!0),n})).getOr(e)})(a)),((e,t,n,o)=>{vv(t,(t=>{km(t)&&vv(e.dom.select(t.inline,o),(o=>{Gb(o)&&bv(e,t,n,o,t.exact?o:null)})),((e,t,n)=>{if(t.clear_child_styles){const o=t.links?"*:not(a)":"*";Kb(e.select(o,n),(n=>{Gb(n)&&am(n)&&Kb(t.styles,((t,o)=>{e.setStyle(n,o,"")}))}))}})(e.dom,t,o)}))})(e,r,n,a),((e,t,n,o,r)=>{const s=r.parentNode;Eb(e,s,n,o)&&bv(e,t,o,r)||t.merge_with_parents&&s&&e.dom.getParent(s,(s=>!!Eb(e,s,n,o)&&(bv(e,t,o,r),!0)))})(e,s,t,n,a),((e,t,n,o)=>{if(t.styles&&t.styles.backgroundColor){const r=Zb(e,"fontSize");Jb(o,(e=>r(e)&&am(e)),ev(e,"backgroundColor",gm(t.styles.backgroundColor,n)))}})(o,s,n,a),((e,t,n,o)=>{const r=t=>{if($o(t)&&$o(t.parentNode)&&am(t)){const n=vm(e,t.parentNode);e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null)}};t.styles&&(t.styles.color||t.styles.textDecoration)&&(Dt.walk(o,r,"childNodes"),r(o))})(o,s,0,a),((e,t,n,o)=>{if(km(t)&&("sub"===t.inline||"sup"===t.inline)){const n=Zb(e,"fontSize");Jb(o,(e=>n(e)&&am(e)),ev(e,"fontSize",""));const r=G(e.select("sup"===t.inline?"sub":"sup",o),am);e.remove(r,!0)}})(o,s,0,a),Qb(e,s,0,a)):o.remove(a,!0)}))},g=rm(o)?o:l.getNode();if("false"===i.getContentEditable(g)&&!fm(e,g))return c(r,o=g),void Ym(e,t,o,n);if(s){if(o)if(rm(o)){if(!c(r,o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(i,Um(i,e,r),!0)}}else f(i,o,!0);else a&&km(s)&&!Yu(e).length?((e,t,n)=>{let o;const r=e.selection,s=e.formatter.get(t);if(!s)return;const a=r.getRng();let i=a.startOffset;const l=a.startContainer.nodeValue;o=ku(e.getBody(),r.getStart());const d=/[^\s\u00a0\u00ad\u200b\ufeff]/;if(l&&i>0&&i<l.length&&d.test(l.charAt(i))&&d.test(l.charAt(i-1))){const o=r.getBookmark();a.collapse(!0);let i=Um(e.dom,a,s);i=Bf(i),e.formatter.apply(t,n,i),r.moveToBookmark(o)}else{let s=o?Rb(o):null;o&&(null==s?void 0:s.data)===_b||(c=e.getDoc(),u=Ab(!0).dom,o=c.importNode(u,!0),s=o.firstChild,a.insertNode(o),i=1),e.formatter.apply(t,n,o),r.setCursorLocation(s,i)}var c,u})(e,t,n):(l.setRng(sb(l.getRng())),im(e,(()=>{nm(e,((e,t)=>{const n=t?e:Um(i,e,r);f(i,n,!1)}))}),M),e.nodeChanged()),Hb(e.formatter,t).each((t=>{V((e=>G((e=>{const t=e.getSelectedBlocks(),n=e.getRng();if(e.isCollapsed())return[];if(1===t.length)return $b(n,t[0])&&qb(n,t[0])?t:[];{const e=le(t).filter((e=>$b(n,e))).toArray(),o=de(t).filter((e=>qb(n,e))).toArray(),r=t.slice(1,-1);return e.concat(r).concat(o)}})(e),Vb(e.dom)))(e.selection),(e=>Cv(i,e,t,n)))}));((e,t)=>{ke(Ub,e)&&V(Ub[e],(e=>{e(t)}))})(t,e)}Ym(e,t,o,n)},xv=(e,t,n,o)=>{(o||e.selection.isEditable())&&wv(e,t,n,o)},kv=e=>ke(e,"vars"),Ev=e=>e.selection.getStart(),Sv=(e,t,n,o,r)=>Q(t,(t=>{const s=e.formatter.matchNode(t,n,null!=r?r:{},o);return!v(s)}),(t=>!!Cb(e,t,n)||!o&&C(e.formatter.matchNode(t,n,r,!0)))),_v=(e,t)=>{const n=null!=t?t:Ev(e);return G(ym(e.dom,n),(e=>$o(e)&&!Go(e)))},Nv=(e,t,n)=>{const o=_v(e,t);ge(n,((n,r)=>{const s=n=>{const s=Sv(e,o,r,n.similar,kv(n)?n.vars:void 0),a=s.isSome();if(n.state.get()!==a){n.state.set(a);const e=s.getOr(t);kv(n)?n.callback(a,{node:e,format:r,parents:o}):V(n.callbacks,(t=>t(a,{node:e,format:r,parents:o})))}};V([n.withSimilar,n.withoutSimilar],s),V(n.withVars,s)}))},Rv=Dt.explode,Av=()=>{const e={};return{addFilter:(t,n)=>{V(Rv(t),(t=>{ke(e,t)||(e[t]={name:t,callbacks:[]}),e[t].callbacks.push(n)}))},getFilters:()=>we(e),removeFilter:(t,n)=>{V(Rv(t),(t=>{if(ke(e,t))if(C(n)){const o=e[t],r=G(o.callbacks,(e=>e!==n));r.length>0?o.callbacks=r:delete e[t]}else delete e[t]}))}}},Ov=(e,t,n)=>{var o;const r=ua();t.convert_fonts_to_spans&&((e,t,n)=>{e.addNodeFilter("font",(e=>{V(e,(e=>{const o=t.parse(e.attr("style")),r=e.attr("color"),s=e.attr("face"),a=e.attr("size");r&&(o.color=r),s&&(o["font-family"]=s),a&&Xe(a).each((e=>{o["font-size"]=n[e-1]})),e.name="span",e.attr("style",t.serialize(o)),((e,t)=>{V(["color","face","size"],(t=>{e.attr(t,null)}))})(e)}))}))})(e,r,Dt.explode(null!==(o=t.font_size_legacy_values)&&void 0!==o?o:"")),((e,t,n)=>{e.addNodeFilter("strike",(e=>{const o="html4"!==t.type;V(e,(e=>{if(o)e.name="s";else{const t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))}}))}))})(e,n,r)},Tv=(e,t,n)=>{t.addNodeFilter("br",((t,o,r)=>{const s=Dt.extend({},n.getBlockElements()),a=n.getNonEmptyElements(),i=n.getWhitespaceElements();s.body=1;const l=e=>e.name in s||Ts(n,e);for(let o=0,d=t.length;o<d;o++){let d=t[o],c=d.parent;if(c&&l(c)&&d===c.lastChild){let t=d.prev;for(;t;){const e=t.name;if("span"!==e||"bookmark"!==t.attr("data-mce-type")){"br"===e&&(d=null);break}t=t.prev}if(d&&(d.remove(),eb(n,a,i,c))){const t=n.getElementRule(c.name);t&&(t.removeEmpty?c.remove():t.paddEmpty&&Jh(e,r,l,c))}}else{let e=d;for(;c&&c.firstChild===e&&c.lastChild===e&&(e=c,!s[c.name]);)c=c.parent;if(e===c){const e=new Fg("#text",3);e.value=pr,d.replace(e)}}}}))},Bv=e=>{const[t,...n]=e.split(","),o=n.join(","),r=/data:([^/]+\/[^;]+)(;.+)?/.exec(t);if(r){const e=";base64"===r[2],t=e?(e=>{const t=/([a-z0-9+\/=\s]+)/i.exec(e);return t?t[1]:""})(o):decodeURIComponent(o);return I.some({type:r[1],data:t,base64Encoded:e})}return I.none()},Dv=(e,t,n=!0)=>{let o=t;if(n)try{o=atob(t)}catch(e){return I.none()}const r=new Uint8Array(o.length);for(let e=0;e<r.length;e++)r[e]=o.charCodeAt(e);return I.some(new Blob([r],{type:e}))},Pv=e=>new Promise(((t,n)=>{const o=new FileReader;o.onloadend=()=>{t(o.result)},o.onerror=()=>{var e;n(null===(e=o.error)||void 0===e?void 0:e.message)},o.readAsDataURL(e)}));let Lv=0;const Mv=(e,t,n)=>Bv(e).bind((({data:e,type:o,base64Encoded:r})=>{if(t&&!r)return I.none();{const t=r?e:btoa(e);return n(t,o)}})),Iv=(e,t,n)=>{const o=e.create("blobid"+Lv++,t,n);return e.add(o),o},Fv=(e,t,n=!1)=>Mv(t,n,((t,n)=>I.from(e.getByData(t,n)).orThunk((()=>Dv(n,t).map((n=>Iv(e,n,t))))))),Uv=(e,t)=>{const n=e.schema;t.remove_trailing_brs&&Tv(t,e,n),e.addAttributeFilter("href",(e=>{let n=e.length;const o=e=>{const t=e?Dt.trim(e):"";return/\b(noopener)\b/g.test(t)?t:(e=>e.split(" ").filter((e=>e.length>0)).concat(["noopener"]).sort().join(" "))(t)};if(!t.allow_unsafe_link_target)for(;n--;){const t=e[n];"a"===t.name&&"_blank"===t.attr("target")&&t.attr("rel",o(t.attr("rel")))}})),t.allow_html_in_named_anchor||e.addAttributeFilter("id,name",(e=>{let t,n,o,r,s=e.length;for(;s--;)if(r=e[s],"a"===r.name&&r.firstChild&&!r.attr("href"))for(o=r.parent,t=r.lastChild;t&&o;)n=t.prev,o.insert(t,r),t=n})),t.fix_list_elements&&e.addNodeFilter("ul,ol",(e=>{let t,n,o=e.length;for(;o--;)if(t=e[o],n=t.parent,n&&("ul"===n.name||"ol"===n.name))if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{const e=new Fg("li",1);e.attr("style","list-style-type: none"),t.wrap(e)}}));const o=n.getValidClasses();t.validate&&o&&e.addAttributeFilter("class",(e=>{var t;let n=e.length;for(;n--;){const r=e[n],s=null!==(t=r.attr("class"))&&void 0!==t?t:"",a=Dt.explode(s," ");let i="";for(let e=0;e<a.length;e++){const t=a[e];let n=!1,s=o["*"];s&&s[t]&&(n=!0),s=o[r.name],!n&&s&&s[t]&&(n=!0),n&&(i&&(i+=" "),i+=t)}i.length||(i=null),r.attr("class",i)}})),((e,t)=>{const{blob_cache:n}=t;if(n){const t=e=>{const t=e.attr("src");(e=>e.attr("src")===At.transparentSrc||C(e.attr("data-mce-placeholder")))(e)||(e=>C(e.attr("data-mce-bogus")))(e)||y(t)||Fv(n,t,!0).each((t=>{e.attr("src",t.blobUri())}))};e.addAttributeFilter("src",(e=>V(e,t)))}})(e,t)};function zv(e){return zv="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},zv(e)}function jv(e,t){return jv=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e},jv(e,t)}function Hv(e,t,n){return Hv=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}()?Reflect.construct:function(e,t,n){var o=[null];o.push.apply(o,t);var r=new(Function.bind.apply(e,o));return n&&jv(r,n.prototype),r},Hv.apply(null,arguments)}function $v(e){return function(e){if(Array.isArray(e))return qv(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(e){if("string"==typeof e)return qv(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?qv(e,t):void 0}}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function qv(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}var Vv=Object.hasOwnProperty,Wv=Object.setPrototypeOf,Kv=Object.isFrozen,Gv=Object.getPrototypeOf,Yv=Object.getOwnPropertyDescriptor,Xv=Object.freeze,Qv=Object.seal,Jv=Object.create,Zv="undefined"!=typeof Reflect&&Reflect,ey=Zv.apply,ty=Zv.construct;ey||(ey=function(e,t,n){return e.apply(t,n)}),Xv||(Xv=function(e){return e}),Qv||(Qv=function(e){return e}),ty||(ty=function(e,t){return Hv(e,$v(t))});var ny,oy=fy(Array.prototype.forEach),ry=fy(Array.prototype.pop),sy=fy(Array.prototype.push),ay=fy(String.prototype.toLowerCase),iy=fy(String.prototype.match),ly=fy(String.prototype.replace),dy=fy(String.prototype.indexOf),cy=fy(String.prototype.trim),uy=fy(RegExp.prototype.test),my=(ny=TypeError,function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];return ty(ny,t)});function fy(e){return function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return ey(e,t,o)}}function gy(e,t){Wv&&Wv(e,null);for(var n=t.length;n--;){var o=t[n];if("string"==typeof o){var r=ay(o);r!==o&&(Kv(t)||(t[n]=r),o=r)}e[o]=!0}return e}function py(e){var t,n=Jv(null);for(t in e)ey(Vv,e,[t])&&(n[t]=e[t]);return n}function hy(e,t){for(;null!==e;){var n=Yv(e,t);if(n){if(n.get)return fy(n.get);if("function"==typeof n.value)return fy(n.value)}e=Gv(e)}return function(e){return console.warn("fallback value for",e),null}}var by=Xv(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),vy=Xv(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),yy=Xv(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),Cy=Xv(["animate","color-profile","cursor","discard","fedropshadow","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),wy=Xv(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover"]),xy=Xv(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),ky=Xv(["#text"]),Ey=Xv(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),Sy=Xv(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),_y=Xv(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),Ny=Xv(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Ry=Qv(/\{\{[\w\W]*|[\w\W]*\}\}/gm),Ay=Qv(/<%[\w\W]*|[\w\W]*%>/gm),Oy=Qv(/^data-[\-\w.\u00B7-\uFFFF]/),Ty=Qv(/^aria-[\-\w]+$/),By=Qv(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Dy=Qv(/^(?:\w+script|data):/i),Py=Qv(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Ly=Qv(/^html$/i),My=function(){return"undefined"==typeof window?null:window},Iy=function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:My(),n=function(t){return e(t)};if(n.version="2.3.8",n.removed=[],!t||!t.document||9!==t.document.nodeType)return n.isSupported=!1,n;var o=t.document,r=t.document,s=t.DocumentFragment,a=t.HTMLTemplateElement,i=t.Node,l=t.Element,d=t.NodeFilter,c=t.NamedNodeMap,u=void 0===c?t.NamedNodeMap||t.MozNamedAttrMap:c,m=t.HTMLFormElement,f=t.DOMParser,g=t.trustedTypes,p=l.prototype,h=hy(p,"cloneNode"),b=hy(p,"nextSibling"),v=hy(p,"childNodes"),y=hy(p,"parentNode");if("function"==typeof a){var C=r.createElement("template");C.content&&C.content.ownerDocument&&(r=C.content.ownerDocument)}var w=function(e,t){if("object"!==zv(e)||"function"!=typeof e.createPolicy)return null;var n=null,o="data-tt-policy-suffix";t.currentScript&&t.currentScript.hasAttribute(o)&&(n=t.currentScript.getAttribute(o));var r="dompurify"+(n?"#"+n:"");try{return e.createPolicy(r,{createHTML:function(e){return e}})}catch(e){return console.warn("TrustedTypes policy "+r+" could not be created."),null}}(g,o),x=w?w.createHTML(""):"",k=r,E=k.implementation,S=k.createNodeIterator,_=k.createDocumentFragment,N=k.getElementsByTagName,R=o.importNode,A={};try{A=py(r).documentMode?r.documentMode:{}}catch(e){}var O={};n.isSupported="function"==typeof y&&E&&void 0!==E.createHTMLDocument&&9!==A;var T,B,D=Ry,P=Ay,L=Oy,M=Ty,I=Dy,F=Py,U=By,z=null,j=gy({},[].concat($v(by),$v(vy),$v(yy),$v(wy),$v(ky))),H=null,$=gy({},[].concat($v(Ey),$v(Sy),$v(_y),$v(Ny))),q=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),V=null,W=null,K=!0,G=!0,Y=!1,X=!1,Q=!1,J=!1,Z=!1,ee=!1,te=!1,ne=!1,oe=!0,re=!0,se=!1,ae={},ie=null,le=gy({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),de=null,ce=gy({},["audio","video","img","source","image","track"]),ue=null,me=gy({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),fe="http://www.w3.org/1998/Math/MathML",ge="http://www.w3.org/2000/svg",pe="http://www.w3.org/1999/xhtml",he=pe,be=!1,ve=["application/xhtml+xml","text/html"],ye=null,Ce=r.createElement("form"),we=function(e){return e instanceof RegExp||e instanceof Function},xe=function(e){ye&&ye===e||(e&&"object"===zv(e)||(e={}),e=py(e),z="ALLOWED_TAGS"in e?gy({},e.ALLOWED_TAGS):j,H="ALLOWED_ATTR"in e?gy({},e.ALLOWED_ATTR):$,ue="ADD_URI_SAFE_ATTR"in e?gy(py(me),e.ADD_URI_SAFE_ATTR):me,de="ADD_DATA_URI_TAGS"in e?gy(py(ce),e.ADD_DATA_URI_TAGS):ce,ie="FORBID_CONTENTS"in e?gy({},e.FORBID_CONTENTS):le,V="FORBID_TAGS"in e?gy({},e.FORBID_TAGS):{},W="FORBID_ATTR"in e?gy({},e.FORBID_ATTR):{},ae="USE_PROFILES"in e&&e.USE_PROFILES,K=!1!==e.ALLOW_ARIA_ATTR,G=!1!==e.ALLOW_DATA_ATTR,Y=e.ALLOW_UNKNOWN_PROTOCOLS||!1,X=e.SAFE_FOR_TEMPLATES||!1,Q=e.WHOLE_DOCUMENT||!1,ee=e.RETURN_DOM||!1,te=e.RETURN_DOM_FRAGMENT||!1,ne=e.RETURN_TRUSTED_TYPE||!1,Z=e.FORCE_BODY||!1,oe=!1!==e.SANITIZE_DOM,re=!1!==e.KEEP_CONTENT,se=e.IN_PLACE||!1,U=e.ALLOWED_URI_REGEXP||U,he=e.NAMESPACE||pe,e.CUSTOM_ELEMENT_HANDLING&&we(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(q.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&we(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(q.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(q.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),T=T=-1===ve.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,B="application/xhtml+xml"===T?function(e){return e}:ay,X&&(G=!1),te&&(ee=!0),ae&&(z=gy({},$v(ky)),H=[],!0===ae.html&&(gy(z,by),gy(H,Ey)),!0===ae.svg&&(gy(z,vy),gy(H,Sy),gy(H,Ny)),!0===ae.svgFilters&&(gy(z,yy),gy(H,Sy),gy(H,Ny)),!0===ae.mathMl&&(gy(z,wy),gy(H,_y),gy(H,Ny))),e.ADD_TAGS&&(z===j&&(z=py(z)),gy(z,e.ADD_TAGS)),e.ADD_ATTR&&(H===$&&(H=py(H)),gy(H,e.ADD_ATTR)),e.ADD_URI_SAFE_ATTR&&gy(ue,e.ADD_URI_SAFE_ATTR),e.FORBID_CONTENTS&&(ie===le&&(ie=py(ie)),gy(ie,e.FORBID_CONTENTS)),re&&(z["#text"]=!0),Q&&gy(z,["html","head","body"]),z.table&&(gy(z,["tbody"]),delete V.tbody),Xv&&Xv(e),ye=e)},ke=gy({},["mi","mo","mn","ms","mtext"]),Ee=gy({},["foreignobject","desc","title","annotation-xml"]),Se=gy({},["title","style","font","a","script"]),_e=gy({},vy);gy(_e,yy),gy(_e,Cy);var Ne=gy({},wy);gy(Ne,xy);var Re=function(e){sy(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){try{e.outerHTML=x}catch(t){e.remove()}}},Ae=function(e,t){try{sy(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){sy(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!H[e])if(ee||te)try{Re(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Oe=function(e){var t,n;if(Z)e="<remove></remove>"+e;else{var o=iy(e,/^[\r\n\t ]+/);n=o&&o[0]}"application/xhtml+xml"===T&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");var s=w?w.createHTML(e):e;if(he===pe)try{t=(new f).parseFromString(s,T)}catch(e){}if(!t||!t.documentElement){t=E.createDocument(he,"template",null);try{t.documentElement.innerHTML=be?"":s}catch(e){}}var a=t.body||t.documentElement;return e&&n&&a.insertBefore(r.createTextNode(n),a.childNodes[0]||null),he===pe?N.call(t,Q?"html":"body")[0]:Q?t.documentElement:a},Te=function(e){return S.call(e.ownerDocument||e,e,d.SHOW_ELEMENT|d.SHOW_COMMENT|d.SHOW_TEXT,null,!1)},Be=function(e){return"object"===zv(i)?e instanceof i:e&&"object"===zv(e)&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},De=function(e,t,o){O[e]&&oy(O[e],(function(e){e.call(n,t,o,ye)}))},Pe=function(e){var t,o;if(De("beforeSanitizeElements",e,null),(o=e)instanceof m&&("string"!=typeof o.nodeName||"string"!=typeof o.textContent||"function"!=typeof o.removeChild||!(o.attributes instanceof u)||"function"!=typeof o.removeAttribute||"function"!=typeof o.setAttribute||"string"!=typeof o.namespaceURI||"function"!=typeof o.insertBefore))return Re(e),!0;if(uy(/[\u0080-\uFFFF]/,e.nodeName))return Re(e),!0;var r=B(e.nodeName);if(De("uponSanitizeElement",e,{tagName:r,allowedTags:z}),e.hasChildNodes()&&!Be(e.firstElementChild)&&(!Be(e.content)||!Be(e.content.firstElementChild))&&uy(/<[/\w]/g,e.innerHTML)&&uy(/<[/\w]/g,e.textContent))return Re(e),!0;if("select"===r&&uy(/<template/i,e.innerHTML))return Re(e),!0;if(!z[r]||V[r]){if(!V[r]&&Me(r)){if(q.tagNameCheck instanceof RegExp&&uy(q.tagNameCheck,r))return!1;if(q.tagNameCheck instanceof Function&&q.tagNameCheck(r))return!1}if(re&&!ie[r]){var s=y(e)||e.parentNode,a=v(e)||e.childNodes;if(a&&s)for(var i=a.length-1;i>=0;--i)s.insertBefore(h(a[i],!0),b(e))}return Re(e),!0}return e instanceof l&&!function(e){var t=y(e);t&&t.tagName||(t={namespaceURI:pe,tagName:"template"});var n=ay(e.tagName),o=ay(t.tagName);return e.namespaceURI===ge?t.namespaceURI===pe?"svg"===n:t.namespaceURI===fe?"svg"===n&&("annotation-xml"===o||ke[o]):Boolean(_e[n]):e.namespaceURI===fe?t.namespaceURI===pe?"math"===n:t.namespaceURI===ge?"math"===n&&Ee[o]:Boolean(Ne[n]):e.namespaceURI===pe&&!(t.namespaceURI===ge&&!Ee[o])&&!(t.namespaceURI===fe&&!ke[o])&&!Ne[n]&&(Se[n]||!_e[n])}(e)?(Re(e),!0):"noscript"!==r&&"noembed"!==r||!uy(/<\/no(script|embed)/i,e.innerHTML)?(X&&3===e.nodeType&&(t=e.textContent,t=ly(t,D," "),t=ly(t,P," "),e.textContent!==t&&(sy(n.removed,{element:e.cloneNode()}),e.textContent=t)),De("afterSanitizeElements",e,null),!1):(Re(e),!0)},Le=function(e,t,n){if(oe&&("id"===t||"name"===t)&&(n in r||n in Ce))return!1;if(G&&!W[t]&&uy(L,t));else if(K&&uy(M,t));else if(!H[t]||W[t]){if(!(Me(e)&&(q.tagNameCheck instanceof RegExp&&uy(q.tagNameCheck,e)||q.tagNameCheck instanceof Function&&q.tagNameCheck(e))&&(q.attributeNameCheck instanceof RegExp&&uy(q.attributeNameCheck,t)||q.attributeNameCheck instanceof Function&&q.attributeNameCheck(t))||"is"===t&&q.allowCustomizedBuiltInElements&&(q.tagNameCheck instanceof RegExp&&uy(q.tagNameCheck,n)||q.tagNameCheck instanceof Function&&q.tagNameCheck(n))))return!1}else if(ue[t]);else if(uy(U,ly(n,F,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==dy(n,"data:")||!de[e])if(Y&&!uy(I,ly(n,F,"")));else if(n)return!1;return!0},Me=function(e){return e.indexOf("-")>0},Ie=function(e){var t,n,o,r;De("beforeSanitizeAttributes",e,null);var s=e.attributes;if(s){var a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:H};for(r=s.length;r--;){var i=t=s[r],l=i.name,d=i.namespaceURI;n="value"===l?t.value:cy(t.value),o=B(l);var c=n;if(a.attrName=o,a.attrValue=n,a.keepAttr=!0,a.forceKeepAttr=void 0,De("uponSanitizeAttribute",e,a),n=a.attrValue,!a.forceKeepAttr)if(a.keepAttr)if(uy(/\/>/i,n))Ae(l,e);else{X&&(n=ly(n,D," "),n=ly(n,P," "));var u=B(e.nodeName);if(Le(u,o,n)){if(n!==c)try{d?e.setAttributeNS(d,l,n):e.setAttribute(l,n)}catch(t){Ae(l,e)}}else Ae(l,e)}else Ae(l,e)}De("afterSanitizeAttributes",e,null)}},Fe=function e(t){var n,o=Te(t);for(De("beforeSanitizeShadowDOM",t,null);n=o.nextNode();)De("uponSanitizeShadowNode",n,null),Pe(n)||(n.content instanceof s&&e(n.content),Ie(n));De("afterSanitizeShadowDOM",t,null)};return n.sanitize=function(e,r){var a,l,d,c,u;if((be=!e)&&(e="\x3c!--\x3e"),"string"!=typeof e&&!Be(e)){if("function"!=typeof e.toString)throw my("toString is not a function");if("string"!=typeof(e=e.toString()))throw my("dirty is not a string, aborting")}if(!n.isSupported){if("object"===zv(t.toStaticHTML)||"function"==typeof t.toStaticHTML){if("string"==typeof e)return t.toStaticHTML(e);if(Be(e))return t.toStaticHTML(e.outerHTML)}return e}if(J||xe(r),n.removed=[],"string"==typeof e&&(se=!1),se){if(e.nodeName){var m=B(e.nodeName);if(!z[m]||V[m])throw my("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof i)1===(l=(a=Oe("\x3c!----\x3e")).ownerDocument.importNode(e,!0)).nodeType&&"BODY"===l.nodeName||"HTML"===l.nodeName?a=l:a.appendChild(l);else{if(!ee&&!X&&!Q&&-1===e.indexOf("<"))return w&&ne?w.createHTML(e):e;if(!(a=Oe(e)))return ee?null:ne?x:""}a&&Z&&Re(a.firstChild);for(var f=Te(se?e:a);d=f.nextNode();)3===d.nodeType&&d===c||Pe(d)||(d.content instanceof s&&Fe(d.content),Ie(d),c=d);if(c=null,se)return e;if(ee){if(te)for(u=_.call(a.ownerDocument);a.firstChild;)u.appendChild(a.firstChild);else u=a;return H.shadowroot&&(u=R.call(o,u,!0)),u}var g=Q?a.outerHTML:a.innerHTML;return Q&&z["!doctype"]&&a.ownerDocument&&a.ownerDocument.doctype&&a.ownerDocument.doctype.name&&uy(Ly,a.ownerDocument.doctype.name)&&(g="<!DOCTYPE "+a.ownerDocument.doctype.name+">\n"+g),X&&(g=ly(g,D," "),g=ly(g,P," ")),w&&ne?w.createHTML(g):g},n.setConfig=function(e){xe(e),J=!0},n.clearConfig=function(){ye=null,J=!1},n.isValidAttribute=function(e,t,n){ye||xe({});var o=B(e),r=B(t);return Le(o,r,n)},n.addHook=function(e,t){"function"==typeof t&&(O[e]=O[e]||[],sy(O[e],t))},n.removeHook=function(e){if(O[e])return ry(O[e])},n.removeHooks=function(e){O[e]&&(O[e]=[])},n.removeAllHooks=function(){O={}},n}();const Fy=Dt.each,Uy=Dt.trim,zy=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],jy={ftp:21,http:80,https:443,mailto:25},Hy=["img","video"],$y=(e,t,n)=>{const o=(e=>{try{return decodeURIComponent(e)}catch(t){return unescape(e)}})(t).replace(/\s/g,"");return!e.allow_script_urls&&(!!/((java|vb)script|mhtml):/i.test(o)||!e.allow_html_data_urls&&(/^data:image\//i.test(o)?((e,t)=>C(e)?!e:!C(t)||!H(Hy,t))(e.allow_svg_data_urls,n)&&/^data:image\/svg\+xml/i.test(o):/^data:/i.test(o)))};class qy{static parseDataUri(e){let t;const n=decodeURIComponent(e).split(","),o=/data:([^;]+)/.exec(n[0]);return o&&(t=o[1]),{type:t,data:n[1]}}static isDomSafe(e,t,n={}){if(n.allow_script_urls)return!0;{const o=Zs.decode(e).replace(/[\s\u0000-\u001F]+/g,"");return!$y(n,o,t)}}static getDocumentBaseUrl(e){var t;let n;return n=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?null!==(t=e.href)&&void 0!==t?t:"":e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/")),n}constructor(e,t={}){this.path="",this.directory="",e=Uy(e),this.settings=t;const n=t.base_uri,o=this;if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(o.source=e);const r=0===e.indexOf("//");if(0!==e.indexOf("/")||r||(e=(n&&n.protocol||"http")+"://mce_host"+e),!/^[\w\-]*:?\/\//.test(e)){const t=n?n.path:new qy(document.location.href).directory;if(""===(null==n?void 0:n.protocol))e="//mce_host"+o.toAbsPath(t,e);else{const r=/([^#?]*)([#?]?.*)/.exec(e);r&&(e=(n&&n.protocol||"http")+"://mce_host"+o.toAbsPath(t,r[1])+r[2])}}e=e.replace(/@@/g,"(mce_at)");const s=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);s&&Fy(zy,((e,t)=>{let n=s[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n})),n&&(o.protocol||(o.protocol=n.protocol),o.userInfo||(o.userInfo=n.userInfo),o.port||"mce_host"!==o.host||(o.port=n.port),o.host&&"mce_host"!==o.host||(o.host=n.host),o.source=""),r&&(o.protocol="")}setPath(e){const t=/^(.*?)\/?(\w+)?$/.exec(e);t&&(this.path=t[0],this.directory=t[1],this.file=t[2]),this.source="",this.getURI()}toRelative(e){if("./"===e)return e;const t=new qy(e,{base_uri:this});if("mce_host"!==t.host&&this.host!==t.host&&t.host||this.port!==t.port||this.protocol!==t.protocol&&""!==t.protocol)return t.getURI();const n=this.getURI(),o=t.getURI();if(n===o||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===o)return n;let r=this.toRelPath(this.path,t.path);return t.query&&(r+="?"+t.query),t.anchor&&(r+="#"+t.anchor),r}toAbsolute(e,t){const n=new qy(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))}isSameOrigin(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;const t=this.protocol?jy[this.protocol]:null;if(t&&(this.port||t)==(e.port||t))return!0}return!1}toRelPath(e,t){let n,o,r=0,s="";const a=e.substring(0,e.lastIndexOf("/")).split("/"),i=t.split("/");if(a.length>=i.length)for(n=0,o=a.length;n<o;n++)if(n>=i.length||a[n]!==i[n]){r=n+1;break}if(a.length<i.length)for(n=0,o=i.length;n<o;n++)if(n>=a.length||a[n]!==i[n]){r=n+1;break}if(1===r)return t;for(n=0,o=a.length-(r-1);n<o;n++)s+="../";for(n=r-1,o=i.length;n<o;n++)s+=n!==r-1?"/"+i[n]:i[n];return s}toAbsPath(e,t){let n=0;const o=/\/$/.test(t)?"/":"",r=e.split("/"),s=t.split("/"),a=[];Fy(r,(e=>{e&&a.push(e)}));const i=[];for(let e=s.length-1;e>=0;e--)0!==s[e].length&&"."!==s[e]&&(".."!==s[e]?n>0?n--:i.push(s[e]):n++);const l=a.length-n;let d;return d=l<=0?oe(i).join("/"):a.slice(0,l).join("/")+"/"+oe(i).join("/"),0!==d.indexOf("/")&&(d="/"+d),o&&d.lastIndexOf("/")!==d.length-1&&(d+=o),d}getURI(e=!1){let t;return this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source}}const Vy=Dt.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),Wy="data-mce-type";let Ky=0;const Gy=(e,t,n,o)=>{var r,s,a,i;const l=t.validate,d=n.getSpecialElements();8===e.nodeType&&!t.allow_conditional_comments&&/^\[if/i.test(null!==(r=e.nodeValue)&&void 0!==r?r:"")&&(e.nodeValue=" "+e.nodeValue);const c=null!==(s=null==o?void 0:o.tagName)&&void 0!==s?s:e.nodeName.toLowerCase();if(1!==e.nodeType||"body"===c)return;const u=yn(e),f=nn(u,Wy),g=en(u,"data-mce-bogus");if(!f&&m(g))return void("all"===g?wo(u):xo(u));const p=n.getElementRule(c);if(!l||p){if(C(o)&&(o.allowedTags[c]=!0),l&&p&&!f){if(V(null!==(a=p.attributesForced)&&void 0!==a?a:[],(e=>{Jt(u,e.name,"{$uid}"===e.value?"mce_"+Ky++:e.value)})),V(null!==(i=p.attributesDefault)&&void 0!==i?i:[],(e=>{nn(u,e.name)||Jt(u,e.name,"{$uid}"===e.value?"mce_"+Ky++:e.value)})),p.attributesRequired&&!$(p.attributesRequired,(e=>nn(u,e))))return void xo(u);if(p.removeEmptyAttrs&&(e=>{const t=e.dom.attributes;return null==t||0===t.length})(u))return void xo(u);p.outputName&&p.outputName!==c&&((e,t)=>{const n=((e,t)=>{const n=bn(t),o=rn(e);return Zt(n,o),n})(e,t);po(e,n);const o=Mn(e);yo(n,o),wo(e)})(u,p.outputName)}}else ke(d,c)?wo(u):xo(u)},Yy=(e,t,n,o,r)=>!(o in Vy&&$y(e,r,n))&&(!e.validate||t.isValid(n,o)||He(o,"data-")||He(o,"aria-")),Xy=(e,t)=>e.hasAttribute(Wy)&&("id"===t||"class"===t||"style"===t),Qy=(e,t)=>e in t.getBoolAttrs(),Jy=(e,t,n)=>{const{attributes:o}=e;for(let r=o.length-1;r>=0;r--){const s=o[r],a=s.name,i=s.value;Yy(t,n,e.tagName.toLowerCase(),a,i)||Xy(e,a)?Qy(a,n)&&e.setAttribute(a,a):e.removeAttribute(a)}},Zy=(e,t)=>{const n=Iy();return n.addHook("uponSanitizeElement",((n,o)=>{Gy(n,e,t,o)})),n.addHook("uponSanitizeAttribute",((n,o)=>{const r=n.tagName.toLowerCase(),{attrName:s,attrValue:a}=o;o.keepAttr=Yy(e,t,r,s,a),o.keepAttr?(o.allowedAttributes[s]=!0,Qy(s,t)&&(o.attrValue=s),e.allow_svg_data_urls&&He(a,"data:image/svg+xml")&&(o.forceKeepAttr=!0)):Xy(n,s)&&(o.forceKeepAttr=!0)})),n},eC=Dt.makeMap,tC=Dt.extend,nC=(e,t,n)=>{const o=e.name,r=o in n&&"title"!==o&&"textarea"!==o,s=t.childNodes;for(let t=0,o=s.length;t<o;t++){const o=s[t],a=new Fg(o.nodeName.toLowerCase(),o.nodeType);if($o(o)){const e=o.attributes;for(let t=0,n=e.length;t<n;t++){const n=e[t];a.attr(n.name,n.value)}}else Jo(o)?(a.value=o.data,r&&(a.raw=!0)):(tr(o)||Zo(o)||er(o))&&(a.value=o.data);nC(a,o,n),e.append(a)}},oC=(e={},t=ca())=>{const n=Av(),o=Av(),r={validate:!0,root_name:"body",sanitize:!0,...e},s=new DOMParser,a=((e,t)=>{if(e.sanitize){const n=Zy(e,t);return(t,o)=>{n.sanitize(t,((e,t)=>{const n={IN_PLACE:!0,ALLOW_UNKNOWN_PROTOCOLS:!0,ALLOWED_TAGS:["#comment","#cdata-section","body"],ALLOWED_ATTR:[]};return n.PARSER_MEDIA_TYPE=t,e.allow_script_urls?n.ALLOWED_URI_REGEXP=/.*/:e.allow_html_data_urls&&(n.ALLOWED_URI_REGEXP=/^(?!(\w+script|mhtml):)/i),n})(e,o)),n.removed=[]}}return(n,o)=>{const r=document.createNodeIterator(n,NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_COMMENT|NodeFilter.SHOW_TEXT);let s;for(;s=r.nextNode();)Gy(s,e,t),$o(s)&&Jy(s,e,t)}})(r,t),i=n.addFilter,l=n.getFilters,d=n.removeFilter,c=o.addFilter,u=o.getFilters,f=o.removeFilter,g=(e,n)=>{const o=m(n.attr(Wy)),r=1===n.type&&!ke(e,n.name)&&!Ts(t,n);return 3===n.type||r&&!o},p={schema:t,addAttributeFilter:c,getAttributeFilters:u,removeAttributeFilter:f,addNodeFilter:i,getNodeFilters:l,removeNodeFilter:d,parse:(e,n={})=>{var o;const i=r.validate,d=null!==(o=n.context)&&void 0!==o?o:r.root_name,c=((e,n,o="html")=>{const r="xhtml"===o?"application/xhtml+xml":"text/html",i=ke(t.getSpecialElements(),n.toLowerCase()),l=i?`<${n}>${e}</${n}>`:e,d="xhtml"===o?`<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>${l}</body></html>`:`<body>${l}</body>`,c=s.parseFromString(d,r).body;return a(c,r),i?c.firstChild:c})(e,d,n.format);Es(t,c);const m=new Fg(d,11);nC(m,c,t.getSpecialElements()),c.innerHTML="";const[f,p]=((e,t,n,o)=>{const r=n.validate,s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=tC(eC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),l=la(t),d=/[ \t\r\n]+/g,c=/^[ \t\r\n]+/,u=/[ \t\r\n]+$/,m=e=>{let t=e.parent;for(;C(t);){if(t.name in a)return!0;t=t.parent}return!1},f=e=>e.name in i||Ts(t,e),g=(t,n)=>{const r=n?t.prev:t.next;return!C(r)&&!y(t.parent)&&f(t.parent)&&(t.parent!==e||!0===o.isRootContent)};return[e=>{var t;if(3===e.type&&!m(e)){let n=null!==(t=e.value)&&void 0!==t?t:"";n=n.replace(d," "),(((e,t)=>C(e)&&(t(e)||"br"===e.name))(e.prev,f)||g(e,!0))&&(n=n.replace(c,"")),0===n.length?e.remove():e.value=n}},e=>{var i;if(1===e.type){const i=t.getElementRule(e.name);if(r&&i){const r=eb(t,s,a,e);i.paddInEmptyBlock&&r&&(e=>{let n=e;for(;C(n);){if(n.name in l)return eb(t,s,a,n);n=n.parent}return!1})(e)?Jh(n,o,f,e):i.removeEmpty&&r?f(e)?e.remove():e.unwrap():i.paddEmpty&&(r||(e=>{var t;return Zh(e,"#text")&&(null===(t=null==e?void 0:e.firstChild)||void 0===t?void 0:t.value)===pr})(e))&&Jh(n,o,f,e)}}else if(3===e.type&&!m(e)){let t=null!==(i=e.value)&&void 0!==i?i:"";(e.next&&f(e.next)||g(e,!1))&&(t=t.replace(u,"")),0===t.length?e.remove():e.value=t}}]})(m,t,r,n),h=[],b=i?e=>((e,n)=>{rb(t,e)&&n.push(e)})(e,h):E,v={nodes:{},attributes:{}},w=e=>Yh(l(),u(),e,v);if(((e,t,n)=>{const o=[];for(let n=e,r=n;n;r=n,n=n.walk()){const s=n;V(t,(e=>e(s))),y(s.parent)&&s!==e?n=r:o.push(s)}for(let e=o.length-1;e>=0;e--){const t=o[e];V(n,(e=>e(t)))}})(m,[f,w],[p,b]),h.reverse(),i&&h.length>0)if(n.context){const{pass:e,fail:o}=K(h,(e=>e.parent===m));ob(o,t,m,w),n.invalid=e.length>0}else ob(h,t,m,w);const x=((e,t)=>{var n;const o=null!==(n=t.forced_root_block)&&void 0!==n?n:e.forced_root_block;return!1===o?"":!0===o?"p":o})(r,n);return x&&("body"===m.name||n.isRootContent)&&((e,n)=>{const o=tC(eC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),s=/^[ \t\r\n]+/,a=/[ \t\r\n]+$/;let i=e.firstChild,l=null;const d=e=>{var t,n;e&&(i=e.firstChild,i&&3===i.type&&(i.value=null===(t=i.value)||void 0===t?void 0:t.replace(s,"")),i=e.lastChild,i&&3===i.type&&(i.value=null===(n=i.value)||void 0===n?void 0:n.replace(a,"")))};if(t.isValidChild(e.name,n.toLowerCase())){for(;i;){const t=i.next;g(o,i)?(l||(l=new Fg(n,1),l.attr(r.forced_root_block_attrs),e.insert(l,i)),l.append(i)):(d(l),l=null),i=t}d(l)}})(m,x),n.invalid||Xh(v,n),m}};return Uv(p,r),((e,t,n)=>{t.inline_styles&&Ov(e,t,n)})(p,r,t),p},rC=(e,t,n)=>{const o=(e=>gb(e)?Xg({validate:!1}).serialize(e):e)(e),r=t(o);if(r.isDefaultPrevented())return r;if(gb(e)){if(r.content!==o){const t=oC({validate:!1,forced_root_block:!1,sanitize:n}).parse(r.content,{context:e.name});return{...r,content:t}}return{...r,content:e}}return r},sC=(e,t)=>{if(t.no_events)return sl.value(t);{const n=((e,t)=>e.dispatch("BeforeGetContent",t))(e,t);return n.isDefaultPrevented()?sl.error(Jm(e,{content:"",...n}).content):sl.value(n)}},aC=(e,t,n)=>{if(n.no_events)return t;{const o=rC(t,(t=>Jm(e,{...n,content:t})),oc(e));return o.content}},iC=(e,t)=>{if(t.no_events)return sl.value(t);{const n=rC(t.content,(n=>((e,t)=>e.dispatch("BeforeSetContent",t))(e,{...t,content:n})),oc(e));return n.isDefaultPrevented()?(Qm(e,n),sl.error(void 0)):sl.value(n)}},lC=(e,t,n)=>{n.no_events||Qm(e,{...n,content:t})},dC=(e,t,n)=>({element:e,width:t,rows:n}),cC=(e,t)=>({element:e,cells:t}),uC=(e,t)=>({x:e,y:t}),mC=(e,t)=>tn(e,t).bind(Xe).getOr(1),fC=(e,t,n)=>{const o=e.rows;return!!(o[n]?o[n].cells:[])[t]},gC=e=>X(e,((e,t)=>t.cells.length>e?t.cells.length:e),0),pC=(e,t)=>{const n=e.rows;for(let e=0;e<n.length;e++){const o=n[e].cells;for(let n=0;n<o.length;n++)if(En(o[n],t))return I.some(uC(n,e))}return I.none()},hC=(e,t,n,o,r)=>{const s=[],a=e.rows;for(let e=n;e<=r;e++){const n=a[e].cells,r=t<o?n.slice(t,o+1):n.slice(o,t+1);s.push(cC(a[e].element,r))}return s},bC=e=>((e,t)=>{const n=oi(e.element),o=bn("tbody");return yo(o,t),bo(n,o),n})(e,(e=>q(e.rows,(e=>{const t=q(e.cells,(e=>{const t=ri(e);return on(t,"colspan"),on(t,"rowspan"),t})),n=oi(e.element);return yo(n,t),n})))(e)),vC=(e,t)=>{const n=yn(t.commonAncestorContainer),o=bp(n,e),r=G(o,Br),s=((e,t)=>J(e,(e=>"li"===Ht(e)&&Zu(e,t))).fold(N([]),(t=>(e=>J(e,(e=>"ul"===Ht(e)||"ol"===Ht(e))))(e).map((e=>{const t=bn(Ht(e)),n=ye(mo(e),((e,t)=>He(t,"list-style")));return io(t,n),[bn("li"),t]})).getOr([]))))(o,t),a=r.concat(s.length?s:(e=>Nr(e)?An(e).filter(_r).fold(N([]),(t=>[e,t])):_r(e)?[e]:[])(n));return q(a,oi)},yC=()=>Cf([]),CC=(e,t)=>((e,t)=>Zn(t,"table",O(En,e)))(e,t[0]).bind((e=>{const n=t[0],o=t[t.length-1],r=(e=>{const t=dC(oi(e),0,[]);return V(Fo(e,"tr"),((e,n)=>{V(Fo(e,"td,th"),((o,r)=>{((e,t,n,o,r)=>{const s=mC(r,"rowspan"),a=mC(r,"colspan"),i=e.rows;for(let e=n;e<n+s;e++){i[e]||(i[e]=cC(ri(o),[]));for(let o=t;o<t+a;o++)i[e].cells[o]=e===n&&o===t?r:oi(r)}})(t,((e,t,n)=>{for(;fC(e,t,n);)t++;return t})(t,r,n),n,e,o)}))})),dC(t.element,gC(t.rows),t.rows)})(e);return((e,t,n)=>pC(e,t).bind((t=>pC(e,n).map((n=>((e,t,n)=>{const o=t.x,r=t.y,s=n.x,a=n.y,i=r<a?hC(e,o,r,s,a):hC(e,o,a,s,r);return dC(e.element,gC(i),i)})(e,t,n))))))(r,n,o).map((e=>Cf([bC(e)])))})).getOrThunk(yC),wC=(e,t)=>{const n=Gu(t,e);return n.length>0?CC(e,n):((e,t)=>t.length>0&&t[0].collapsed?yC():((e,t)=>((e,t)=>{const n=X(t,((e,t)=>(bo(t,e),t)),e);return t.length>0?Cf([n]):n})(yn(t.cloneContents()),vC(e,t)))(e,t[0]))(e,t)},xC=(e,t)=>t>=0&&t<e.length&&Fu(e.charAt(t)),kC=e=>Fr(e.innerText),EC=e=>$o(e)?e.outerHTML:Jo(e)?Zs.encodeRaw(e.data,!1):tr(e)?"\x3c!--"+e.data+"--\x3e":"",SC=(e,t)=>(((e,t)=>{let n=0;V(e,(e=>{0===e[0]?n++:1===e[0]?(((e,t,n)=>{const o=(e=>{let t;const n=document.createElement("div"),o=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)o.appendChild(t);return o})(t);if(e.hasChildNodes()&&n<e.childNodes.length){const t=e.childNodes[n];e.insertBefore(o,t)}else e.appendChild(o)})(t,e[1],n),n++):2===e[0]&&((e,t)=>{if(e.hasChildNodes()&&t<e.childNodes.length){const n=e.childNodes[t];e.removeChild(n)}})(t,n)}))})(((e,t)=>{const n=e.length+t.length+2,o=new Array(n),r=new Array(n),s=(n,o,r,a,l)=>{const d=i(n,o,r,a);if(null===d||d.start===o&&d.diag===o-a||d.end===n&&d.diag===n-r){let s=n,i=r;for(;s<o||i<a;)s<o&&i<a&&e[s]===t[i]?(l.push([0,e[s]]),++s,++i):o-n>a-r?(l.push([2,e[s]]),++s):(l.push([1,t[i]]),++i)}else{s(n,d.start,r,d.start-d.diag,l);for(let t=d.start;t<d.end;++t)l.push([0,e[t]]);s(d.end,o,d.end-d.diag,a,l)}},a=(n,o,r,s)=>{let a=n;for(;a-o<s&&a<r&&e[a]===t[a-o];)++a;return((e,t,n)=>({start:e,end:t,diag:n}))(n,a,o)},i=(n,s,i,l)=>{const d=s-n,c=l-i;if(0===d||0===c)return null;const u=d-c,m=c+d,f=(m%2==0?m:m+1)/2;let g,p,h,b,v;for(o[1+f]=n,r[1+f]=s+1,g=0;g<=f;++g){for(p=-g;p<=g;p+=2){for(h=p+f,p===-g||p!==g&&o[h-1]<o[h+1]?o[h]=o[h+1]:o[h]=o[h-1]+1,b=o[h],v=b-n+i-p;b<s&&v<l&&e[b]===t[v];)o[h]=++b,++v;if(u%2!=0&&u-g<=p&&p<=u+g&&r[h-u]<=o[h])return a(r[h-u],p+n-i,s,l)}for(p=u-g;p<=u+g;p+=2){for(h=p+f-u,p===u-g||p!==u+g&&r[h+1]<=r[h-1]?r[h]=r[h+1]-1:r[h]=r[h-1],b=r[h]-1,v=b-n+i-p;b>=n&&v>=i&&e[b]===t[v];)r[h]=b--,v--;if(u%2==0&&-g<=p&&p<=g&&r[h]<=o[h+u])return a(r[h],p+n-i,s,l)}}return null},l=[];return s(0,e.length,0,t.length,l),l})(q(ce(t.childNodes),EC),e),t),t),_C=Pe((()=>document.implementation.createHTMLDocument("undo"))),NC=e=>{const t=e.serializer.getTempAttrs(),n=qg(e.getBody(),t);return(e=>null!==e.querySelector("iframe"))(n)?{type:"fragmented",fragments:G(q(ce(n.childNodes),S(Fr,EC)),(e=>e.length>0)),content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:Fr(n.innerHTML),bookmark:null,beforeBookmark:null}},RC=(e,t,n)=>{const o=n?t.beforeBookmark:t.bookmark;"fragmented"===t.type?SC(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw",no_selection:!C(o)||!Su(o)||!o.isFakeCaret}),o&&(e.selection.moveToBookmark(o),e.selection.scrollIntoView())},AC=e=>"fragmented"===e.type?e.fragments.join(""):e.content,OC=e=>{const t=bn("body",_C());return So(t,AC(e)),V(Fo(t,"*[data-mce-bogus]"),xo),Eo(t)},TC=(e,t)=>!(!e||!t)&&(!!((e,t)=>AC(e)===AC(t))(e,t)||((e,t)=>OC(e)===OC(t))(e,t)),BC=e=>0===e.get(),DC=(e,t,n)=>{BC(n)&&(e.typing=t)},PC=(e,t)=>{e.typing&&(DC(e,!1,t),e.add())},LC=e=>({init:{bindEvents:E},undoManager:{beforeChange:(t,n)=>((e,t,n)=>{BC(t)&&n.set(nl(e.selection))})(e,t,n),add:(t,n,o,r,s,a)=>((e,t,n,o,r,s,a)=>{const i=NC(e),l=Dt.extend(s||{},i);if(!BC(o)||e.removed)return null;const d=t.data[n.get()];if(e.dispatch("BeforeAddUndo",{level:l,lastLevel:d,originalEvent:a}).isDefaultPrevented())return null;if(d&&TC(d,l))return null;t.data[n.get()]&&r.get().each((e=>{t.data[n.get()].beforeBookmark=e}));const c=Cd(e);if(c&&t.data.length>c){for(let e=0;e<t.data.length-1;e++)t.data[e]=t.data[e+1];t.data.length--,n.set(t.data.length)}l.bookmark=nl(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(l),n.set(t.data.length-1);const u={level:l,lastLevel:d,originalEvent:a};return n.get()>0?(e.setDirty(!0),e.dispatch("AddUndo",u),e.dispatch("change",u)):e.dispatch("AddUndo",u),l})(e,t,n,o,r,s,a),undo:(t,n,o)=>((e,t,n,o)=>{let r;return t.typing&&(t.add(),t.typing=!1,DC(t,!1,n)),o.get()>0&&(o.set(o.get()-1),r=t.data[o.get()],RC(e,r,!0),e.setDirty(!0),e.dispatch("Undo",{level:r})),r})(e,t,n,o),redo:(t,n)=>((e,t,n)=>{let o;return t.get()<n.length-1&&(t.set(t.get()+1),o=n[t.get()],RC(e,o,!1),e.setDirty(!0),e.dispatch("Redo",{level:o})),o})(e,t,n),clear:(t,n)=>((e,t,n)=>{t.data=[],n.set(0),t.typing=!1,e.dispatch("ClearUndos")})(e,t,n),reset:e=>(e=>{e.clear(),e.add()})(e),hasUndo:(t,n)=>((e,t,n)=>n.get()>0||t.typing&&t.data[0]&&!TC(NC(e),t.data[0]))(e,t,n),hasRedo:(e,t)=>((e,t)=>t.get()<e.data.length-1&&!e.typing)(e,t),transact:(e,t,n)=>((e,t,n)=>(PC(e,t),e.beforeChange(),e.ignore(n),e.add()))(e,t,n),ignore:(e,t)=>((e,t)=>{try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}})(e,t),extra:(t,n,o,r)=>((e,t,n,o,r)=>{if(t.transact(o)){const o=t.data[n.get()].bookmark,s=t.data[n.get()-1];RC(e,s,!0),t.transact(r)&&(t.data[n.get()-1].beforeBookmark=o)}})(e,t,n,o,r)},formatter:{match:(t,n,o,r)=>Sb(e,t,n,o,r),matchAll:(t,n)=>((e,t,n)=>{const o=[],r={},s=e.selection.getStart();return e.dom.getParent(s,(s=>{for(let a=0;a<t.length;a++){const i=t[a];!r[i]&&Eb(e,s,i,n)&&(r[i]=!0,o.push(i))}}),e.dom.getRoot()),o})(e,t,n),matchNode:(t,n,o,r)=>Eb(e,t,n,o,r),canApply:t=>((e,t)=>{const n=e.formatter.get(t),o=e.dom;if(n&&e.selection.isEditable()){const t=e.selection.getStart(),r=ym(o,t);for(let e=n.length-1;e>=0;e--){const t=n[e];if(!xm(t))return!0;for(let e=r.length-1;e>=0;e--)if(o.is(r[e],t.selector))return!0}}return!1})(e,t),closest:t=>((e,t)=>{const n=t=>En(t,yn(e.getBody()));return I.from(e.selection.getStart(!0)).bind((o=>vb(yn(o),(n=>ue(t,(t=>((t,n)=>Eb(e,t.dom,n)?I.some(n):I.none())(n,t)))),n))).getOrNull()})(e,t),apply:(t,n,o)=>xv(e,t,n,o),remove:(t,n,o,r)=>hv(e,t,n,o,r),toggle:(t,n,o)=>((e,t,n,o)=>{const r=e.formatter.get(t);r&&(!Sb(e,t,n,o)||"toggle"in r[0]&&!r[0].toggle?xv(e,t,n,o):hv(e,t,n,o))})(e,t,n,o),formatChanged:(t,n,o,r,s)=>((e,t,n,o,r,s)=>(((e,t,n,o,r,s)=>{const a=t.get();V(n.split(","),(t=>{const n=xe(a,t).getOrThunk((()=>{const e={withSimilar:{state:Da(!1),similar:!0,callbacks:[]},withoutSimilar:{state:Da(!1),similar:!1,callbacks:[]},withVars:[]};return a[t]=e,e})),i=()=>{const n=_v(e);return Sv(e,n,t,r,s).isSome()};if(v(s)){const e=r?n.withSimilar:n.withoutSimilar;e.callbacks.push(o),1===e.callbacks.length&&e.state.set(i())}else n.withVars.push({state:Da(i()),similar:r,vars:s,callback:o})})),t.set(a)})(e,t,n,o,r,s),{unbind:()=>((e,t,n)=>{const o=e.get();V(t.split(","),(e=>xe(o,e).each((t=>{o[e]={withSimilar:{...t.withSimilar,callbacks:G(t.withSimilar.callbacks,(e=>e!==n))},withoutSimilar:{...t.withoutSimilar,callbacks:G(t.withoutSimilar.callbacks,(e=>e!==n))},withVars:G(t.withVars,(e=>e.callback!==n))}})))),e.set(o)})(t,n,o)}))(e,t,n,o,r,s)},editor:{getContent:t=>((e,t)=>I.from(e.getBody()).fold(N("tree"===t.format?new Fg("body",11):""),(n=>Kg(e,t,n))))(e,t),setContent:(t,n)=>((e,t,n)=>I.from(e.getBody()).map((o=>gb(t)?((e,t,n,o)=>{Qh(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);const r=Xg({validate:!1},e.schema).serialize(n),s=Or(yn(t))?r:Dt.trim(r);return pb(e,s,o.no_selection),{content:n,html:s}})(e,o,t,n):((e,t,n,o)=>{if(0===n.length||/^\s+$/.test(n)){const r='<br data-mce-bogus="1">';"TABLE"===t.nodeName?n="<tr><td>"+r+"</td></tr>":/^(UL|OL)$/.test(t.nodeName)&&(n="<li>"+r+"</li>");const s=Nl(e);return e.schema.isValidChild(t.nodeName.toLowerCase(),s.toLowerCase())?(n=r,n=e.dom.createHTML(s,Rl(e),n)):n||(n=r),pb(e,n,o.no_selection),{content:n,html:n}}{"raw"!==o.format&&(n=Xg({validate:!1},e.schema).serialize(e.parser.parse(n,{isRootContent:!0,insert:!0})));const r=Or(yn(t))?n:Dt.trim(n);return pb(e,r,o.no_selection),{content:r,html:r}}})(e,o,t,n))).getOr({content:t,html:gb(n.content)?"":n.content}))(e,t,n),insertContent:(t,n)=>fb(e,t,n),addVisual:t=>((e,t)=>{const n=e.dom,o=C(t)?t:e.getBody();V(n.select("table,a",o),(t=>{switch(t.nodeName){case"TABLE":const o=Ad(e),r=n.getAttrib(t,"border");r&&"0"!==r||!e.hasVisual?n.removeClass(t,o):n.addClass(t,o);break;case"A":if(!n.getAttrib(t,"href")){const o=n.getAttrib(t,"name")||t.id,r=Od(e);o&&e.hasVisual?n.addClass(t,r):n.removeClass(t,r)}}})),e.dispatch("VisualAid",{element:t,hasVisual:e.hasVisual})})(e,t)},selection:{getContent:(t,n)=>((e,t,n={})=>{const o=((e,t)=>({...e,format:t,get:!0,selection:!0,getInner:!0}))(n,t);return sC(e,o).fold(R,(t=>{const n=((e,t)=>{if("text"===t.format)return(e=>I.from(e.selection.getRng()).map((t=>{var n;const o=I.from(e.dom.getParent(t.commonAncestorContainer,e.dom.isBlock)),r=e.getBody(),s=(e=>e.map((e=>e.nodeName)).getOr("div").toLowerCase())(o),a=yn(t.cloneContents());Vg(a),Wg(a);const i=e.dom.add(r,s,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},a.dom),l=kC(i),d=Fr(null!==(n=i.textContent)&&void 0!==n?n:"");if(e.dom.remove(i),xC(d,0)||xC(d,d.length-1)){const e=o.getOr(r),t=kC(e),n=t.indexOf(l);return-1===n?l:(xC(t,n-1)?" ":"")+l+(xC(t,n+l.length)?" ":"")}return l})).getOr(""))(e);{const n=((e,t)=>{const n=e.selection.getRng(),o=e.dom.create("body"),r=e.selection.getSel(),s=Rg(e,Ku(r)),a=t.contextual?wC(yn(e.getBody()),s).dom:n.cloneContents();return a&&o.appendChild(a),e.selection.serializer.serialize(o,t)})(e,t);return"tree"===t.format?n:e.selection.isCollapsed()?"":n}})(e,t);return aC(e,n,t)}))})(e,t,n)},autocompleter:{addDecoration:t=>Bg(e,t),removeDecoration:()=>((e,t)=>Dg(t).each((t=>{const n=e.selection.getBookmark();xo(t),e.selection.moveToBookmark(n)})))(e,yn(e.getBody()))},raw:{getModel:()=>I.none()}}),MC=e=>ke(e.plugins,"rtc"),IC=e=>e.rtcInstance?e.rtcInstance:LC(e),FC=e=>{const t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")},UC=e=>FC(e).init.bindEvents(),zC=e=>0===e.dom.length?(wo(e),I.none()):I.some(e),jC=(e,t,n,o)=>{e.bind((e=>((o?Yp:Gp)(e.dom,o?e.dom.length:0),t.filter(Kt).map((t=>((e,t,n,o)=>{const r=e.dom,s=t.dom,a=o?r.length:s.length;o?(Xp(r,s,!1,!o),n.setStart(s,a)):(Xp(s,r,!1,!o),n.setEnd(s,a))})(e,t,n,o)))))).orThunk((()=>{const e=((e,t)=>e.filter((e=>Wm.isBookmarkNode(e.dom))).bind(t?Dn:Bn))(t,o).or(t).filter(Kt);return e.map((e=>((e,t)=>{An(e).each((n=>{const o=e.dom;t&&Up(n,Li(o,0))?Gp(o,0):!t&&zp(n,Li(o,o.length))&&Yp(o,o.length)}))})(e,o)))}))},HC=(e,t,n)=>{if(ke(e,t)){const o=G(e[t],(e=>e!==n));0===o.length?delete e[t]:e[t]=o}};const $C=e=>!(!e||!e.ownerDocument)&&Sn(yn(e.ownerDocument),yn(e)),qC=(e,t,n,o)=>{let r,s;const{selectorChangedWithUnbind:a}=((e,t)=>{let n,o;const r=(t,n)=>J(n,(n=>e.is(n,t))),s=t=>e.getParents(t,void 0,e.getRoot());return{selectorChangedWithUnbind:(e,a)=>(n||(n={},o={},t.on("NodeChange",(e=>{const t=e.element,a=s(t),i={};ge(n,((e,t)=>{r(t,a).each((n=>{o[t]||(V(e,(e=>{e(!0,{node:n,selector:t,parents:a})})),o[t]=e),i[t]=e}))})),ge(o,((e,n)=>{i[n]||(delete o[n],V(e,(e=>{e(!1,{node:t,selector:n,parents:a})})))}))}))),n[e]||(n[e]=[]),n[e].push(a),r(e,s(t.selection.getStart())).each((()=>{o[e]=n[e]})),{unbind:()=>{HC(n,e,a),HC(o,e,a)}})}})(e,o),i=(e,t)=>((e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,selection:!0,content:t}))(n,t);iC(e,o).each((t=>{const n=((e,t)=>{if("raw"!==t.format){const n=e.selection.getRng(),o=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),r=o?{context:o.nodeName.toLowerCase()}:{},s=e.parser.parse(t.content,{forced_root_block:!1,...r,...t});return Xg({validate:!1},e.schema).serialize(s)}return t.content})(e,t),o=e.selection.getRng();((e,t)=>{const n=I.from(t.firstChild).map(yn),o=I.from(t.lastChild).map(yn);e.deleteContents(),e.insertNode(t);const r=n.bind(Bn).filter(Kt).bind(zC),s=o.bind(Dn).filter(Kt).bind(zC);jC(r,n,e,!0),jC(s,o,e,!1),e.collapse(!1)})(o,o.createContextualFragment(n)),e.selection.setRng(o),Zf(e,o),lC(e,n,t)}))})(o,e,t),l=e=>{const t=c();t.collapse(!!e),u(t)},d=()=>t.getSelection?t.getSelection():t.document.selection,c=()=>{let n;const a=(e,t,n)=>{try{return t.compareBoundaryPoints(e,n)}catch(e){return-1}},i=t.document;if(C(o.bookmark)&&!xg(o)){const e=cg(o);if(e.isSome())return e.map((e=>Rg(o,[e])[0])).getOr(i.createRange())}try{const e=d();e&&!Ho(e.anchorNode)&&(n=e.rangeCount>0?e.getRangeAt(0):i.createRange(),n=Rg(o,[n])[0])}catch(e){}if(n||(n=i.createRange()),nr(n.startContainer)&&n.collapsed){const t=e.getRoot();n.setStart(t,0),n.setEnd(t,0)}return r&&s&&(0===a(n.START_TO_START,n,r)&&0===a(n.END_TO_END,n,r)?n=s:(r=null,s=null)),n},u=(e,t)=>{if(!(e=>!!e&&$C(e.startContainer)&&$C(e.endContainer))(e))return;const n=d();if(e=o.dispatch("SetSelectionRange",{range:e,forward:t}).range,n){s=e;try{n.removeAllRanges(),n.addRange(e)}catch(e){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),r=n.rangeCount>0?n.getRangeAt(0):null}if(!e.collapsed&&e.startContainer===e.endContainer&&(null==n?void 0:n.setBaseAndExtent)&&e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()){const t=e.startContainer.childNodes[e.startOffset];t&&"IMG"===t.nodeName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(t,0,t,1))}o.dispatch("AfterSetSelectionRange",{range:e,forward:t})},m=()=>{const t=d(),n=null==t?void 0:t.anchorNode,o=null==t?void 0:t.focusNode;if(!t||!n||!o||Ho(n)||Ho(o))return!0;const r=e.createRng(),s=e.createRng();try{r.setStart(n,t.anchorOffset),r.collapse(!0),s.setStart(o,t.focusOffset),s.collapse(!0)}catch(e){return!0}return r.compareBoundaryPoints(r.START_TO_START,s)<=0},f={dom:e,win:t,serializer:n,editor:o,expand:(t={type:"word"})=>u(Df(e).expand(c(),t)),collapse:l,setCursorLocation:(t,n)=>{const r=e.createRng();C(t)&&C(n)?(r.setStart(t,n),r.setEnd(t,n),u(r),l(!1)):(em(e,r,o.getBody(),!0),u(r))},getContent:e=>((e,t={})=>((e,t,n)=>FC(e).selection.getContent(t,n))(e,t.format?t.format:"html",t))(o,e),setContent:i,getBookmark:(e,t)=>g.getBookmark(e,t),moveToBookmark:e=>g.moveToBookmark(e),select:(t,n)=>(((e,t,n)=>I.from(t).bind((t=>I.from(t.parentNode).map((o=>{const r=e.nodeIndex(t),s=e.createRng();return s.setStart(o,r),s.setEnd(o,r+1),n&&(em(e,s,t,!0),em(e,s,t,!1)),s})))))(e,t,n).each(u),t),isCollapsed:()=>{const e=c(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isEditable:()=>{const t=c(),n=o.getBody().querySelectorAll('[data-mce-selected="1"]');return n.length>0?ne(n,(t=>e.isEditable(t.parentElement))):t.startContainer===t.endContainer?e.isEditable(t.startContainer):e.isEditable(t.startContainer)&&e.isEditable(t.endContainer)},isForward:m,setNode:t=>(i(e.getOuterHTML(t)),t),getNode:()=>((e,t)=>{if(!t)return e;let n=t.startContainer,o=t.endContainer;const r=t.startOffset,s=t.endOffset;let a=t.commonAncestorContainer;t.collapsed||(n===o&&s-r<2&&n.hasChildNodes()&&(a=n.childNodes[r]),Jo(n)&&Jo(o)&&(n=n.length===r?Ng(n.nextSibling,!0):n.parentNode,o=0===s?Ng(o.previousSibling,!1):o.parentNode,n&&n===o&&(a=n)));const i=Jo(a)?a.parentNode:a;return $o(i)?i:e})(o.getBody(),c()),getSel:d,setRng:u,getRng:c,getStart:e=>Sg(o.getBody(),c(),e),getEnd:e=>_g(o.getBody(),c(),e),getSelectedBlocks:(t,n)=>((e,t,n,o)=>{const r=[],s=e.getRoot(),a=e.getParent(n||Sg(s,t,t.collapsed),e.isBlock),i=e.getParent(o||_g(s,t,t.collapsed),e.isBlock);if(a&&a!==s&&r.push(a),a&&i&&a!==i){let t;const n=new zo(a,s);for(;(t=n.next())&&t!==i;)e.isBlock(t)&&r.push(t)}return i&&a!==i&&i!==s&&r.push(i),r})(e,c(),t,n),normalize:()=>{const t=c(),n=d();if(!(Ku(n).length>1)&&tm(o)){const n=Of(e,t);return n.each((e=>{u(e,m())})),n.getOr(t)}return t},selectorChanged:(e,t)=>(a(e,t),f),selectorChangedWithUnbind:a,getScrollContainer:()=>{let t,n=e.getRoot();for(;n&&"BODY"!==n.nodeName;){if(n.scrollHeight>n.clientHeight){t=n;break}n=n.parentNode}return t},scrollIntoView:(e,t)=>{C(e)?((e,t,n)=>{(e.inline?Xf:Jf)(e,t,n)})(o,e,t):Zf(o,c(),t)},placeCaretAt:(e,t)=>u(xf(e,t,o.getDoc())),getBoundingClientRect:()=>{const e=c();return e.collapsed?Li.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:()=>{t=r=s=null,p.destroy()}},g=Wm(f),p=sf(f,o);return f.bookmarkManager=g,f.controlSelection=p,f},VC=(e,t,n)=>{-1===Dt.inArray(t,n)&&(e.addAttributeFilter(n,((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.push(n))},WC=(e,t)=>{const n=["data-mce-selected"],o={entity_encoding:"named",remove_trailing_brs:!0,pad_empty_with_br:!1,...e},r=t&&t.dom?t.dom:Oa.DOM,s=t&&t.schema?t.schema:ca(o),a=oC(o,s);return((e,t,n)=>{e.addAttributeFilter("data-mce-tabindex",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];o.attr("tabindex",o.attr("data-mce-tabindex")),o.attr(t,null)}})),e.addAttributeFilter("src,href,style",((e,o)=>{const r="data-mce-"+o,s=t.url_converter,a=t.url_converter_scope;let i=e.length;for(;i--;){const t=e[i];let l=t.attr(r);void 0!==l?(t.attr(o,l.length>0?l:null),t.attr(r,null)):(l=t.attr(o),"style"===o?l=n.serializeStyle(n.parseStyle(l),t.name):s&&(l=s.call(a,l,o,t.name)),t.attr(o,l.length>0?l:null))}})),e.addAttributeFilter("class",(e=>{let t=e.length;for(;t--;){const n=e[t];let o=n.attr("class");o&&(o=o.replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",o.length>0?o:null))}})),e.addAttributeFilter("data-mce-type",((e,t,n)=>{let o=e.length;for(;o--;){const t=e[o];if("bookmark"===t.attr("data-mce-type")&&!n.cleanup){const e=I.from(t.firstChild).exists((e=>{var t;return!Ir(null!==(t=e.value)&&void 0!==t?t:"")}));e?t.unwrap():t.remove()}}})),e.addNodeFilter("noscript",(e=>{var t;let n=e.length;for(;n--;){const o=e[n].firstChild;o&&(o.value=Zs.decode(null!==(t=o.value)&&void 0!==t?t:""))}})),e.addNodeFilter("script,style",((e,n)=>{var o;const r=e=>e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"");let s=e.length;for(;s--;){const a=e[s],i=a.firstChild,l=null!==(o=null==i?void 0:i.value)&&void 0!==o?o:"";if("script"===n){const e=a.attr("type");e&&a.attr("type","mce-no/type"===e?null:e.replace(/^mce\-/,"")),"xhtml"===t.element_format&&i&&l.length>0&&(i.value="// <![CDATA[\n"+r(l)+"\n// ]]>")}else"xhtml"===t.element_format&&i&&l.length>0&&(i.value="\x3c!--\n"+r(l)+"\n--\x3e")}})),e.addNodeFilter("#comment",(e=>{let o=e.length;for(;o--;){const r=e[o],s=r.value;t.preserve_cdata&&0===(null==s?void 0:s.indexOf("[CDATA["))?(r.name="#cdata",r.type=4,r.value=n.decode(s.replace(/^\[CDATA\[|\]\]$/g,""))):0===(null==s?void 0:s.indexOf("mce:protected "))&&(r.name="#text",r.type=3,r.raw=!0,r.value=unescape(s).substr(14))}})),e.addNodeFilter("xml:namespace,input",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];7===o.type?o.remove():1===o.type&&("input"!==t||o.attr("type")||o.attr("type","text"))}})),e.addAttributeFilter("data-mce-type",(t=>{V(t,(t=>{"format-caret"===t.attr("data-mce-type")&&(t.isEmpty(e.schema.getNonEmptyElements())?t.remove():t.unwrap())}))})),e.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-block,data-mce-type,data-mce-resize,data-mce-placeholder",((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.remove_trailing_brs&&Tv(t,e,e.schema)})(a,o,r),{schema:s,addNodeFilter:a.addNodeFilter,addAttributeFilter:a.addAttributeFilter,serialize:(e,n={})=>{const i={format:"html",...n},l=((e,t,n)=>((e,t)=>C(e)&&e.hasEventListeners("PreProcess")&&!t.no_events)(e,n)?((e,t,n)=>{let o;const r=e.dom;let s=t.cloneNode(!0);const a=document.implementation;if(a.createHTMLDocument){const e=a.createHTMLDocument("");Dt.each("BODY"===s.nodeName?s.childNodes:[s],(t=>{e.body.appendChild(e.importNode(t,!0))})),s="BODY"!==s.nodeName?e.body.firstChild:e.body,o=r.doc,r.doc=e}return((e,t)=>{e.dispatch("PreProcess",t)})(e,{...n,node:s}),o&&(r.doc=o),s})(e,t,n):t)(t,e,i),d=((e,t,n)=>{const o=Fr(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||Or(yn(t))?o:Dt.trim(o)})(r,l,i),c=((e,t,n)=>{const o=n.selection?{forced_root_block:!1,...n}:n,r=e.parse(t,o);return(e=>{const t=e=>"br"===(null==e?void 0:e.name),n=e.lastChild;if(t(n)){const e=n.prev;t(e)&&(n.remove(),e.remove())}})(r),r})(a,d,i);return"tree"===i.format?c:((e,t,n,o,r)=>{const s=((e,t,n)=>Xg(e,t).serialize(n))(t,n,o);return((e,t,n)=>{if(!t.no_events&&e){const o=((e,t)=>e.dispatch("PostProcess",t))(e,{...t,content:n});return o.content}return n})(e,r,s)})(t,o,s,c,i)},addRules:s.addValidElements,setRules:s.setValidElements,addTempAttr:O(VC,a,n),getTempAttrs:N(n),getNodeFilters:a.getNodeFilters,getAttributeFilters:a.getAttributeFilters,removeNodeFilter:a.removeNodeFilter,removeAttributeFilter:a.removeAttributeFilter}},KC=(e,t)=>{const n=WC(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters,removeNodeFilter:n.removeNodeFilter,removeAttributeFilter:n.removeAttributeFilter}},GC=(e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,content:t}))(n,t);return iC(e,o).map((t=>{const n=((e,t,n)=>IC(e).editor.setContent(t,n))(e,t.content,t);return lC(e,n.html,t),n.content})).getOr(t)},YC="autoresize_on_init,content_editable_state,padd_empty_with_br,block_elements,boolean_attributes,editor_deselector,editor_selector,elements,file_browser_callback_types,filepicker_validator_handler,force_hex_style_colors,force_p_newlines,gecko_spellcheck,images_dataimg_filter,media_scripts,mode,move_caret_before_on_enter_elements,non_empty_elements,self_closing_elements,short_ended_elements,special,spellchecker_select_languages,spellchecker_whitelist,tab_focus,tabfocus_elements,table_responsive_width,text_block_elements,text_inline_elements,toolbar_drawer,types,validate,whitespace_elements,paste_enable_default_filters,paste_filter_drop,paste_word_valid_elements,paste_retain_style_properties,paste_convert_word_fake_lists".split(","),XC="template_cdate_classes,template_mdate_classes,template_selected_content_classes,template_preview_replace_values,template_replace_values,templates,template_cdate_format,template_mdate_format".split(","),QC="bbcode,colorpicker,contextmenu,fullpage,legacyoutput,spellchecker,textcolor".split(","),JC=[{name:"template",replacedWith:"Advanced Template"},{name:"rtc"}],ZC=(e,t)=>{const n=G(t,(t=>ke(e,t)));return ae(n)},ew=e=>{const t=ZC(e,YC),n=e.forced_root_block;return!1!==n&&""!==n||t.push("forced_root_block (false only)"),ae(t)},tw=e=>ZC(e,XC),nw=(e,t)=>{const n=Dt.makeMap(e.plugins," "),o=G(t,(e=>ke(n,e)));return ae(o)},ow=e=>nw(e,QC),rw=e=>nw(e,JC.map((e=>e.name))),sw=e=>J(JC,(t=>t.name===e)).fold((()=>e),(t=>t.replacedWith?`${e}, replaced by ${t.replacedWith}`:e)),aw=Oa.DOM,iw=e=>I.from(e).each((e=>e.destroy())),lw=(()=>{const e={};return{add:(t,n)=>{e[t]=n},get:t=>e[t]?e[t]:{icons:{}},has:t=>ke(e,t)}})(),dw=Fa.ModelManager,cw=(e,t)=>t.dom[e],uw=(e,t)=>parseInt(lo(t,e),10),mw=O(cw,"clientWidth"),fw=O(cw,"clientHeight"),gw=O(uw,"margin-top"),pw=O(uw,"margin-left"),hw=e=>{const t=[],n=()=>{const t=e.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a NotificationManager implementation.")};return{open:e,close:e,getArgs:e}})()},o=()=>I.from(t[0]),r=()=>{V(t,(e=>{e.reposition()}))},s=e=>{Z(t,(t=>t===e)).each((e=>{t.splice(e,1)}))},a=(a,i=!0)=>e.removed||!(e=>{return(t=e.inline?e.getBody():e.getContentAreaContainer(),I.from(t).map(yn)).map(Yn).getOr(!1);var t})(e)?{}:(i&&e.dispatch("BeforeOpenNotification",{notification:a}),J(t,(e=>{return t=n().getArgs(e),o=a,!(t.type!==o.type||t.text!==o.text||t.progressBar||t.timeout||o.progressBar||o.timeout);var t,o})).getOrThunk((()=>{e.editorManager.setActive(e);const i=n().open(a,(()=>{s(i),r(),o().fold((()=>e.focus()),(e=>eg(yn(e.getEl()))))}));return(e=>{t.push(e)})(i),r(),e.dispatch("OpenNotification",{notification:{...i}}),i}))),i=N(t);return(e=>{e.on("SkinLoaded",(()=>{const t=rd(e);t&&a({text:t,type:"warning",timeout:0},!1),r()})),e.on("show ResizeEditor ResizeWindow NodeChange",(()=>{requestAnimationFrame(r)})),e.on("remove",(()=>{V(t.slice(),(e=>{n().close(e)}))}))})(e),{open:a,close:()=>{o().each((e=>{n().close(e),s(e),r()}))},getNotifications:i}},bw=Fa.PluginManager,vw=Fa.ThemeManager,yw=e=>{let t=[];const n=()=>{const t=e.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a WindowManager implementation.")};return{open:e,openUrl:e,alert:e,confirm:e,close:e}})()},o=(e,t)=>(...n)=>t?t.apply(e,n):void 0,r=n=>{(t=>{e.dispatch("CloseWindow",{dialog:t})})(n),t=G(t,(e=>e!==n)),0===t.length&&e.focus()},s=n=>{e.editorManager.setActive(e),dg(e),e.ui.show();const o=n();return(n=>{t.push(n),(t=>{e.dispatch("OpenWindow",{dialog:t})})(n)})(o),o};return e.on("remove",(()=>{V(t,(e=>{n().close(e)}))})),{open:(e,t)=>s((()=>n().open(e,t,r))),openUrl:e=>s((()=>n().openUrl(e,r))),alert:(e,t,r)=>{const s=n();s.alert(e,o(r||s,t))},confirm:(e,t,r)=>{const s=n();s.confirm(e,o(r||s,t))},close:()=>{I.from(t[t.length-1]).each((e=>{n().close(e),r(e)}))}}},Cw=(e,t)=>{e.notificationManager.open({type:"error",text:t})},ww=(e,t)=>{e._skinLoaded?Cw(e,t):e.on("SkinLoaded",(()=>{Cw(e,t)}))},xw=(e,t,n)=>{Gm(e,t,{message:n}),console.error(n)},kw=(e,t,n)=>n?`Failed to load ${e}: ${n} from url ${t}`:`Failed to load ${e} url: ${t}`,Ew=(e,...t)=>{const n=window.console;n&&(n.error?n.error(e,...t):n.log(e,...t))},Sw=(e,t)=>{const n=e.editorManager.baseURL+"/skins/content",o=`content${e.editorManager.suffix}.css`;return q(t,(t=>(e=>/^[a-z0-9\-]+$/i.test(e))(t)&&!e.inline?`${n}/${t}/${o}`:e.documentBaseURI.toAbsolute(t)))},_w=(e,t)=>{const n={};return{findAll:(o,r=M)=>{const s=G((e=>e?ce(e.getElementsByTagName("img")):[])(o),(t=>{const n=t.src;return!t.hasAttribute("data-mce-bogus")&&!t.hasAttribute("data-mce-placeholder")&&!(!n||n===At.transparentSrc)&&(He(n,"blob:")?!e.isUploaded(n)&&r(t):!!He(n,"data:")&&r(t))})),a=q(s,(e=>{const o=e.src;if(ke(n,o))return n[o].then((t=>m(t)?t:{image:e,blobInfo:t.blobInfo}));{const r=((e,t)=>{const n=()=>Promise.reject("Invalid data URI");if(He(t,"blob:")){const s=e.getByUri(t);return C(s)?Promise.resolve(s):(o=t,He(o,"blob:")?(e=>fetch(e).then((e=>e.ok?e.blob():Promise.reject())).catch((()=>Promise.reject({message:`Cannot convert ${e} to Blob. Resource might not exist or is inaccessible.`,uriType:"blob"}))))(o):He(o,"data:")?(r=o,new Promise(((e,t)=>{Bv(r).bind((({type:e,data:t,base64Encoded:n})=>Dv(e,t,n))).fold((()=>t("Invalid data URI")),e)}))):Promise.reject("Unknown URI format")).then((t=>Pv(t).then((o=>Mv(o,!1,(n=>I.some(Iv(e,t,n)))).getOrThunk(n)))))}var o,r;return He(t,"data:")?Fv(e,t).fold(n,(e=>Promise.resolve(e))):Promise.reject("Unknown image data format")})(t,o).then((t=>(delete n[o],{image:e,blobInfo:t}))).catch((e=>(delete n[o],e)));return n[o]=r,r}}));return Promise.all(a)}}},Nw=()=>{let e={};const t=(e,t)=>({status:e,resultUri:t}),n=t=>t in e;return{hasBlobUri:n,getResultUri:t=>{const n=e[t];return n?n.resultUri:null},isPending:t=>!!n(t)&&1===e[t].status,isUploaded:t=>!!n(t)&&2===e[t].status,markPending:n=>{e[n]=t(1,null)},markUploaded:(n,o)=>{e[n]=t(2,o)},removeFailed:t=>{delete e[t]},destroy:()=>{e={}}}};let Rw=0;const Aw=(e,t)=>{const n={},o=(e,n)=>new Promise(((o,r)=>{const s=new XMLHttpRequest;s.open("POST",t.url),s.withCredentials=t.credentials,s.upload.onprogress=e=>{n(e.loaded/e.total*100)},s.onerror=()=>{r("Image upload failed due to a XHR Transport error. Code: "+s.status)},s.onload=()=>{if(s.status<200||s.status>=300)return void r("HTTP Error: "+s.status);const e=JSON.parse(s.responseText);var n,a;e&&m(e.location)?o((n=t.basePath,a=e.location,n?n.replace(/\/$/,"")+"/"+a.replace(/^\//,""):a)):r("Invalid JSON: "+s.responseText)};const a=new FormData;a.append("file",e.blob(),e.filename()),s.send(a)})),r=w(t.handler)?t.handler:o,s=(e,t)=>({url:t,blobInfo:e,status:!0}),a=(e,t)=>({url:"",blobInfo:e,status:!1,error:t}),i=(e,t)=>{Dt.each(n[e],(e=>{e(t)})),delete n[e]};return{upload:(l,d)=>t.url||r!==o?((t,o)=>(t=Dt.grep(t,(t=>!e.isUploaded(t.blobUri()))),Promise.all(Dt.map(t,(t=>e.isPending(t.blobUri())?(e=>{const t=e.blobUri();return new Promise((e=>{n[t]=n[t]||[],n[t].push(e)}))})(t):((t,n,o)=>(e.markPending(t.blobUri()),new Promise((r=>{let l,d;try{const c=()=>{l&&(l.close(),d=E)},u=n=>{c(),e.markUploaded(t.blobUri(),n),i(t.blobUri(),s(t,n)),r(s(t,n))},f=n=>{c(),e.removeFailed(t.blobUri()),i(t.blobUri(),a(t,n)),r(a(t,n))};d=e=>{e<0||e>100||I.from(l).orThunk((()=>I.from(o).map(D))).each((t=>{l=t,t.progressBar.value(e)}))},n(t,d).then(u,(e=>{f(m(e)?{message:e}:e)}))}catch(e){r(a(t,e))}}))))(t,r,o))))))(l,d):new Promise((e=>{e([])}))}},Ow=e=>()=>e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0}),Tw=(e,t)=>Aw(t,{url:Ul(e),basePath:zl(e),credentials:jl(e),handler:Hl(e)}),Bw=e=>{const t=(()=>{let e=[];const t=e=>{if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");const t=e.id||"blobid"+Rw+++(()=>{const e=()=>Math.round(4294967295*Math.random()).toString(36);return"s"+(new Date).getTime().toString(36)+e()+e()+e()})(),n=e.name||t,o=e.blob;var r;return{id:N(t),name:N(n),filename:N(e.filename||n+"."+(r=o.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.toLowerCase()]||"dat")),blob:N(o),base64:N(e.base64),blobUri:N(e.blobUri||URL.createObjectURL(o)),uri:N(e.uri)}},n=t=>J(e,t).getOrUndefined(),o=e=>n((t=>t.id()===e));return{create:(e,n,o,r,s)=>{if(m(e))return t({id:e,name:r,filename:s,blob:n,base64:o});if(f(e))return t(e);throw new Error("Unknown input type")},add:t=>{o(t.id())||e.push(t)},get:o,getByUri:e=>n((t=>t.blobUri()===e)),getByData:(e,t)=>n((n=>n.base64()===e&&n.blob().type===t)),findFirst:n,removeByUri:t=>{e=G(e,(e=>e.blobUri()!==t||(URL.revokeObjectURL(e.blobUri()),!1)))},destroy:()=>{V(e,(e=>{URL.revokeObjectURL(e.blobUri())})),e=[]}}})();let n,o;const r=Nw(),s=[],a=t=>n=>e.selection?t(n):[],i=(e,t,n)=>{let o=0;do{o=e.indexOf(t,o),-1!==o&&(e=e.substring(0,o)+n+e.substr(o+t.length),o+=n.length-t.length+1)}while(-1!==o);return e},l=(e,t,n)=>{const o=`src="${n}"${n===At.transparentSrc?' data-mce-placeholder="1"':""}`;return e=i(e,`src="${t}"`,o),i(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},d=(t,n)=>{V(e.undoManager.data,(e=>{"fragmented"===e.type?e.fragments=q(e.fragments,(e=>l(e,t,n))):e.content=l(e.content,t,n)}))},c=()=>(n||(n=Tw(e,r)),p().then(a((o=>{const r=q(o,(e=>e.blobInfo));return n.upload(r,Ow(e)).then(a((n=>{const r=[];let s=!1;const a=q(n,((n,a)=>{const{blobInfo:i,image:l}=o[a];let c=!1;return n.status&&Ml(e)?(n.url&&!je(l.src,n.url)&&(s=!0),t.removeByUri(l.src),MC(e)||((t,n)=>{const o=e.convertURL(n,"src");var r;d(t.src,n),Zt(yn(t),{src:Ll(e)?(r=n,r+(-1===r.indexOf("?")?"?":"&")+(new Date).getTime()):n,"data-mce-src":o})})(l,n.url)):n.error&&(n.error.remove&&(d(l.src,At.transparentSrc),r.push(l),c=!0),((e,t)=>{ww(e,Ia.translate(["Failed to upload image: {0}",t]))})(e,n.error.message)),{element:l,status:n.status,uploadUri:n.url,blobInfo:i,removed:c}}));return r.length>0&&!MC(e)?e.undoManager.transact((()=>{V(ko(r),(n=>{const o=An(n);wo(n),o.each((e=>t=>{((e,t)=>e.dom.isEmpty(t.dom)&&C(e.schema.getTextBlockElements()[Ht(t)]))(e,t)&&bo(t,hn('<br data-mce-bogus="1" />'))})(e)),t.removeByUri(n.dom.src)}))})):s&&e.undoManager.dispatchChange(),a})))})))),u=()=>Pl(e)?c():Promise.resolve([]),g=e=>ne(s,(t=>t(e))),p=()=>(o||(o=_w(r,t)),o.findAll(e.getBody(),g).then(a((t=>{const n=G(t,(t=>m(t)?(ww(e,t),!1):"blob"!==t.uriType));return MC(e)||V(n,(e=>{d(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")})),n})))),h=n=>n.replace(/src="(blob:[^"]+)"/g,((n,o)=>{const s=r.getResultUri(o);if(s)return'src="'+s+'"';let a=t.getByUri(o);return a||(a=X(e.editorManager.get(),((e,t)=>e||t.editorUpload&&t.editorUpload.blobCache.getByUri(o)),void 0)),a?'src="data:'+a.blob().type+";base64,"+a.base64()+'"':n}));return e.on("SetContent",(()=>{Pl(e)?u():p()})),e.on("RawSaveContent",(e=>{e.content=h(e.content)})),e.on("GetContent",(e=>{e.source_view||"raw"===e.format||"tree"===e.format||(e.content=h(e.content))})),e.on("PostRender",(()=>{e.parser.addNodeFilter("img",(e=>{V(e,(e=>{const n=e.attr("src");if(!n||t.getByUri(n))return;const o=r.getResultUri(n);o&&e.attr("src",o)}))}))})),{blobCache:t,addFilter:e=>{s.push(e)},uploadImages:c,uploadImagesAuto:u,scanForImages:p,destroy:()=>{t.destroy(),r.destroy(),o=n=null}}},Dw={remove_similar:!0,inherit:!1},Pw={selector:"td,th",...Dw},Lw={tablecellbackgroundcolor:{styles:{backgroundColor:"%value"},...Pw},tablecellverticalalign:{styles:{"vertical-align":"%value"},...Pw},tablecellbordercolor:{styles:{borderColor:"%value"},...Pw},tablecellclass:{classes:["%value"],...Pw},tableclass:{selector:"table",classes:["%value"],...Dw},tablecellborderstyle:{styles:{borderStyle:"%value"},...Pw},tablecellborderwidth:{styles:{borderWidth:"%value"},...Pw}},Mw=N(Lw),Iw=Dt.each,Fw=Oa.DOM,Uw=e=>C(e)&&f(e),zw=(e,t)=>{const n=t&&t.schema||ca({}),o=e=>{const t=m(e)?{name:e,classes:[],attrs:{}}:e,n=Fw.create(t.name);return((e,t)=>{t.classes.length>0&&Fw.addClass(e,t.classes.join(" ")),Fw.setAttribs(e,t.attrs)})(n,t),n},r=(e,t,s)=>{let a;const i=t[0],l=Uw(i)?i.name:void 0,d=((e,t)=>{const o=n.getElementRule(e.nodeName.toLowerCase()),r=null==o?void 0:o.parentsRequired;return!(!r||!r.length)&&(t&&H(r,t)?t:r[0])})(e,l);if(d)l===d?(a=i,t=t.slice(1)):a=d;else if(i)a=i,t=t.slice(1);else if(!s)return e;const c=a?o(a):Fw.create("div");c.appendChild(e),s&&Dt.each(s,(t=>{const n=o(t);c.insertBefore(n,e)}));const u=Uw(a)?a.siblings:void 0;return r(c,t,u)},s=Fw.create("div");if(e.length>0){const t=e[0],n=o(t),a=Uw(t)?t.siblings:void 0;s.appendChild(r(n,e.slice(1),a))}return s},jw=e=>{let t="div";const n={name:t,classes:[],attrs:{},selector:e=Dt.trim(e)};return"*"!==e&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,((e,t,o,r,s)=>{switch(t){case"#":n.attrs.id=o;break;case".":n.classes.push(o);break;case":":-1!==Dt.inArray("checked disabled enabled read-only required".split(" "),o)&&(n.attrs[o]=o)}if("["===r){const e=s.match(/([\w\-]+)(?:\=\"([^\"]+))?/);e&&(n.attrs[e[1]]=e[2])}return""}))),n.name=t||"div",n},Hw=(e,t)=>{let n="",o=ud(e);if(""===o)return"";const r=e=>m(e)?e.replace(/%(\w+)/g,""):"",s=(t,n)=>Fw.getStyle(null!=n?n:e.getBody(),t,!0);if(m(t)){const n=e.formatter.get(t);if(!n)return"";t=n[0]}if("preview"in t){const e=t.preview;if(!1===e)return"";o=e||o}let a,i=t.block||t.inline||"span";const l=(d=t.selector,m(d)?(d=(d=d.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Dt.map(d.split(/(?:>|\s+(?![^\[\]]+\]))/),(e=>{const t=Dt.map(e.split(/(?:~\+|~|\+)/),jw),n=t.pop();return t.length&&(n.siblings=t),n})).reverse()):[]);var d;l.length>0?(l[0].name||(l[0].name=i),i=t.selector,a=zw(l,e)):a=zw([i],e);const c=Fw.select(i,a)[0]||a.firstChild;Iw(t.styles,((e,t)=>{const n=r(e);n&&Fw.setStyle(c,t,n)})),Iw(t.attributes,((e,t)=>{const n=r(e);n&&Fw.setAttrib(c,t,n)})),Iw(t.classes,(e=>{const t=r(e);Fw.hasClass(c,t)||Fw.addClass(c,t)})),e.dispatch("PreviewFormats"),Fw.setStyles(a,{position:"absolute",left:-65535}),e.getBody().appendChild(a);const u=s("fontSize"),f=/px$/.test(u)?parseInt(u,10):0;return Iw(o.split(" "),(e=>{let t=s(e,c);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=s(e),"#ffffff"===Wu(t).toLowerCase())||"color"===e&&"#000000"===Wu(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===f)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*f+"px"}"border"===e&&t&&(n+="padding:0 2px;"),n+=e+":"+t+";"}})),e.dispatch("AfterPreviewFormats"),Fw.remove(a),n},$w=e=>{const t=(e=>{const t={},n=(e,o)=>{e&&(m(e)?(p(o)||(o=[o]),V(o,(e=>{v(e.deep)&&(e.deep=!xm(e)),v(e.split)&&(e.split=!xm(e)||km(e)),v(e.remove)&&xm(e)&&!km(e)&&(e.remove="none"),xm(e)&&km(e)&&(e.mixed=!0,e.block_expand=!0),m(e.classes)&&(e.classes=e.classes.split(/\s+/))})),t[e]=o):ge(e,((e,t)=>{n(t,e)})))};return n((e=>{const t=e.dom,n=e.schema.type,o={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"left"},inherit:!1,preview:!1},{selector:"img,audio,video",collapsed:!1,styles:{float:"left"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginLeft:"0px",marginRight:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"},{selector:".mce-preview-object",ceFalseOverride:!0,styles:{display:"table",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{marginLeft:"auto",marginRight:"auto"},preview:!1}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{float:"right"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginRight:"0px",marginLeft:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"right"},preview:!1}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"justify"},inherit:!1,preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:(()=>{const e={inline:"span",styles:{textDecoration:"line-through"},exact:!0},t={inline:"strike",remove:"all",preserve_attributes:["class","style"]},o={inline:"s",remove:"all",preserve_attributes:["class","style"]};return"html4"!==n?[o,e,t]:[e,o,t]})(),forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{class:"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:(e,t,n)=>$o(e)&&e.hasAttribute("href"),onformat:(e,n,o)=>{Dt.each(o,((n,o)=>{t.setAttrib(e,o,n)}))}},lang:{inline:"span",clear_child_styles:!0,remove_similar:!0,attributes:{lang:"%value","data-mce-lang":e=>{var t;return null!==(t=null==e?void 0:e.customValue)&&void 0!==t?t:null}}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins,small",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Dt.each("p h1 h2 h3 h4 h5 h6 div address pre dt dd samp".split(/\s/),(e=>{o[e]={block:e,remove:"all"}})),o})(e)),n(Mw()),n(cd(e)),{get:e=>C(e)?t[e]:t,has:e=>ke(t,e),register:n,unregister:e=>(e&&t[e]&&delete t[e],t)}})(e),n=Da({});return(e=>{e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(let t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])})(e),(e=>{e.on("mouseup keydown",(t=>{var n;((e,t,n)=>{const o=e.selection,r=e.getBody();Tb(e,null,n),8!==t&&46!==t||!o.isCollapsed()||o.getStart().innerHTML!==_b||Tb(e,ku(r,o.getStart())),37!==t&&39!==t||Tb(e,ku(r,o.getStart()))})(e,t.keyCode,(n=e.selection.getRng().endContainer,Jo(n)&&$e(n.data,pr)))}))})(e),MC(e)||((e,t)=>{e.set({}),t.on("NodeChange",(n=>{Nv(t,n.element,e.get())})),t.on("FormatApply FormatRemove",(n=>{const o=I.from(n.node).map((e=>rm(e)?e:e.startContainer)).bind((e=>$o(e)?I.some(e):I.from(e.parentElement))).getOrThunk((()=>Ev(t)));Nv(t,o,e.get())}))})(n,e),{get:t.get,has:t.has,register:t.register,unregister:t.unregister,apply:(t,n,o)=>{((e,t,n,o)=>{FC(e).formatter.apply(t,n,o)})(e,t,n,o)},remove:(t,n,o,r)=>{((e,t,n,o,r)=>{FC(e).formatter.remove(t,n,o,r)})(e,t,n,o,r)},toggle:(t,n,o)=>{((e,t,n,o)=>{FC(e).formatter.toggle(t,n,o)})(e,t,n,o)},match:(t,n,o,r)=>((e,t,n,o,r)=>FC(e).formatter.match(t,n,o,r))(e,t,n,o,r),closest:t=>((e,t)=>FC(e).formatter.closest(t))(e,t),matchAll:(t,n)=>((e,t,n)=>FC(e).formatter.matchAll(t,n))(e,t,n),matchNode:(t,n,o,r)=>((e,t,n,o,r)=>FC(e).formatter.matchNode(t,n,o,r))(e,t,n,o,r),canApply:t=>((e,t)=>FC(e).formatter.canApply(t))(e,t),formatChanged:(t,o,r,s)=>((e,t,n,o,r,s)=>FC(e).formatter.formatChanged(t,n,o,r,s))(e,n,t,o,r,s),getCssText:O(Hw,e)}},qw=e=>{switch(e.toLowerCase()){case"undo":case"redo":case"mcefocus":return!0;default:return!1}},Vw=e=>{const t=za(),n=Da(0),o=Da(0),r={data:[],typing:!1,beforeChange:()=>{((e,t,n)=>{FC(e).undoManager.beforeChange(t,n)})(e,n,t)},add:(s,a)=>((e,t,n,o,r,s,a)=>FC(e).undoManager.add(t,n,o,r,s,a))(e,r,o,n,t,s,a),dispatchChange:()=>{e.setDirty(!0);const t=NC(e);t.bookmark=nl(e.selection),e.dispatch("change",{level:t,lastLevel:ie(r.data,o.get()).getOrUndefined()})},undo:()=>((e,t,n,o)=>FC(e).undoManager.undo(t,n,o))(e,r,n,o),redo:()=>((e,t,n)=>FC(e).undoManager.redo(t,n))(e,o,r.data),clear:()=>{((e,t,n)=>{FC(e).undoManager.clear(t,n)})(e,r,o)},reset:()=>{((e,t)=>{FC(e).undoManager.reset(t)})(e,r)},hasUndo:()=>((e,t,n)=>FC(e).undoManager.hasUndo(t,n))(e,r,o),hasRedo:()=>((e,t,n)=>FC(e).undoManager.hasRedo(t,n))(e,r,o),transact:t=>((e,t,n,o)=>FC(e).undoManager.transact(t,n,o))(e,r,n,t),ignore:t=>{((e,t,n)=>{FC(e).undoManager.ignore(t,n)})(e,n,t)},extra:(t,n)=>{((e,t,n,o,r)=>{FC(e).undoManager.extra(t,n,o,r)})(e,r,o,t,n)}};return MC(e)||((e,t,n)=>{const o=Da(!1),r=e=>{DC(t,!1,n),t.add({},e)};e.on("init",(()=>{t.add()})),e.on("BeforeExecCommand",(e=>{const o=e.command;qw(o)||(PC(t,n),t.beforeChange())})),e.on("ExecCommand",(e=>{const t=e.command;qw(t)||r(e)})),e.on("ObjectResizeStart cut",(()=>{t.beforeChange()})),e.on("SaveContent ObjectResized blur",r),e.on("dragend",r),e.on("keyup",(n=>{const s=n.keyCode;if(n.isDefaultPrevented())return;const a=At.os.isMacOS()&&"Meta"===n.key;(s>=33&&s<=36||s>=37&&s<=40||45===s||n.ctrlKey||a)&&(r(),e.nodeChanged()),46!==s&&8!==s||e.nodeChanged(),o.get()&&t.typing&&!TC(NC(e),t.data[0])&&(e.isDirty()||e.setDirty(!0),e.dispatch("TypingUndo"),o.set(!1),e.nodeChanged())})),e.on("keydown",(e=>{const s=e.keyCode;if(e.isDefaultPrevented())return;if(s>=33&&s<=36||s>=37&&s<=40||45===s)return void(t.typing&&r(e));const a=e.ctrlKey&&!e.altKey||e.metaKey;if((s<16||s>20)&&224!==s&&91!==s&&!t.typing&&!a)return t.beforeChange(),DC(t,!0,n),t.add({},e),void o.set(!0);(At.os.isMacOS()?e.metaKey:e.ctrlKey&&!e.altKey)&&t.beforeChange()})),e.on("mousedown",(e=>{t.typing&&r(e)})),e.on("input",(e=>{var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data||(e=>"insertFromPaste"===e.inputType||"insertFromDrop"===e.inputType)(e))&&r(e)})),e.on("AddUndo Undo Redo ClearUndos",(t=>{t.isDefaultPrevented()||e.nodeChanged()}))})(e,r,n),(e=>{e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo")})(e),r},Ww=[9,27,ef.HOME,ef.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,ef.DOWN,ef.UP,ef.LEFT,ef.RIGHT].concat(At.browser.isFirefox()?[224]:[]),Kw="data-mce-placeholder",Gw=e=>"keydown"===e.type||"keyup"===e.type,Yw=e=>{const t=e.keyCode;return t===ef.BACKSPACE||t===ef.DELETE},Xw=(e,t)=>({from:e,to:t}),Qw=(e,t)=>{const n=yn(e),o=yn(t.container());return ph(n,o).map((e=>((e,t)=>({block:e,position:t}))(e,t)))},Jw=(e,t)=>Jn(t,(e=>Ar(e)||ar(e.dom)),(t=>En(t,e))).filter(Wt).getOr(e),Zw=e=>{const t=(e=>{const t=Mn(e);return Z(t,xr).fold(N(t),(e=>t.slice(0,e)))})(e);return V(t,wo),t},ex=(e,t)=>{const n=bp(t,e);return J(n.reverse(),(e=>bs(e))).each(wo)},tx=(e,t,n,o)=>{if(bs(n))return Pr(n),yu(n.dom);0===G(Pn(o),(e=>!bs(e))).length&&bs(t)&&go(o,bn("br"));const r=vu(n.dom,Li.before(o.dom));return V(Zw(t),(e=>{go(o,e)})),ex(e,t),r},nx=(e,t,n)=>{if(bs(n)){if(bs(t)){const e=e=>{const t=(e,n)=>Fn(e).fold((()=>n),(e=>kr(e)?t(e,n.concat(oi(e))):n));return t(e,[])},o=Y(e(n),((e,t)=>(vo(e,t),t)),Dr());Co(t),bo(t,o)}return wo(n),yu(t.dom)}const o=Cu(n.dom);return V(Zw(t),(e=>{bo(n,e)})),ex(e,t),o},ox=(e,t)=>{hu(e,t.dom).bind((e=>I.from(e.getNode()))).map(yn).filter(Er).each(wo)},rx=(e,t,n)=>(ox(!0,t),ox(!1,n),((e,t)=>Sn(t,e)?((e,t)=>{const n=bp(t,e);return I.from(n[n.length-1])})(t,e):I.none())(t,n).fold(O(nx,e,t,n),O(tx,e,t,n))),sx=(e,t,n,o)=>t?rx(e,o,n):rx(e,n,o),ax=(e,t)=>{const n=yn(e.getBody()),o=((e,t,n)=>n.collapsed?((e,t,n)=>{const o=Qw(e,Li.fromRangeStart(n)),r=o.bind((n=>fu(t,e,n.position).bind((n=>Qw(e,n).map((n=>((e,t,n)=>rr(n.position.getNode())&&!bs(n.block)?hu(!1,n.block.dom).bind((o=>o.isEqual(n.position)?fu(t,e,o).bind((t=>Qw(e,t))):I.some(n))).getOr(n):n)(e,t,n)))))));return Mt(o,r,Xw).filter((t=>(e=>!En(e.from.block,e.to.block))(t)&&((e,t)=>{const n=yn(e);return En(Jw(n,t.from.block),Jw(n,t.to.block))})(e,t)&&(e=>!1===ir(e.from.block.dom)&&!1===ir(e.to.block.dom))(t)&&(e=>{const t=e=>Sr(e)||_s(e.dom);return t(e.from.block)&&t(e.to.block)})(t)))})(e,t,n):I.none())(n.dom,t,e.selection.getRng()).map((o=>()=>{sx(n,t,o.from.block,o.to.block).each((t=>{e.selection.setRng(t.toRange())}))}));return o},ix=(e,t)=>{const n=yn(t),o=O(En,e);return Qn(n,Ar,o).isSome()},lx=e=>{const t=yn(e.getBody());return((e,t)=>{const n=vu(e.dom,Li.fromRangeStart(t)).isNone(),o=bu(e.dom,Li.fromRangeEnd(t)).isNone();return!((e,t)=>ix(e,t.startContainer)||ix(e,t.endContainer))(e,t)&&n&&o})(t,e.selection.getRng())?(e=>I.some((()=>{e.setContent(""),e.selection.setCursorLocation()})))(e):((e,t)=>{const n=t.getRng();return Mt(ph(e,yn(n.startContainer)),ph(e,yn(n.endContainer)),((o,r)=>En(o,r)?I.none():I.some((()=>{n.deleteContents(),sx(e,!0,o,r).each((e=>{t.setRng(e.toRange())}))})))).getOr(I.none())})(t,e.selection)},dx=(e,t)=>e.selection.isCollapsed()?I.none():lx(e),cx=(e,t,n,o,r)=>I.from(t._selectionOverrides.showCaret(e,n,o,r)),ux=(e,t)=>e.dispatch("BeforeObjectSelected",{target:t}).isDefaultPrevented()?I.none():I.some((e=>{const t=e.ownerDocument.createRange();return t.selectNode(e),t})(t)),mx=(e,t,n)=>t.collapsed?((e,t,n)=>{const o=Wc(1,e.getBody(),t),r=Li.fromRangeStart(o),s=r.getNode();if(kc(s))return cx(1,e,s,!r.isAtEnd(),!1);const a=r.getNode(!0);if(kc(a))return cx(1,e,a,!1,!1);const i=Vh(e.dom.getRoot(),r.getNode());return kc(i)?cx(1,e,i,!1,n):I.none()})(e,t,n).getOr(t):t,fx=e=>gp(e)||cp(e),gx=e=>pp(e)||up(e),px=(e,t,n,o,r,s)=>{cx(o,e,s.getNode(!r),r,!0).each((n=>{if(t.collapsed){const e=t.cloneRange();r?e.setEnd(n.startContainer,n.startOffset):e.setStart(n.endContainer,n.endOffset),e.deleteContents()}else t.deleteContents();e.selection.setRng(n)})),((e,t)=>{Jo(t)&&0===t.data.length&&e.remove(t)})(e.dom,n)},hx=(e,t)=>((e,t)=>{const n=e.selection.getRng();if(!Jo(n.commonAncestorContainer))return I.none();const o=t?Jc.Forwards:Jc.Backwards,r=du(e.getBody()),s=O(Xc,t?r.next:r.prev),a=t?fx:gx,i=Gc(o,e.getBody(),n),l=s(i),d=l?dh(t,l):l;if(!d||!Qc(i,d))return I.none();if(a(d))return I.some((()=>px(e,n,i.getNode(),o,t,d)));const c=s(d);return c&&a(c)&&Qc(d,c)?I.some((()=>px(e,n,i.getNode(),o,t,c))):I.none()})(e,t),bx=(e,t)=>{const n=e.getBody();return t?yu(n).filter(gp):Cu(n).filter(pp)},vx=e=>{const t=e.selection.getRng();return!t.collapsed&&(bx(e,!0).exists((e=>e.isEqual(Li.fromRangeStart(t))))||bx(e,!1).exists((e=>e.isEqual(Li.fromRangeEnd(t)))))},yx=al([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Cx=(e,t,n)=>fu(t,e,n).bind((o=>{return r=o.getNode(),C(r)&&(Ar(yn(r))||Nr(yn(r)))||((e,t,n,o)=>{const r=t=>kr(yn(t))&&!Uc(n,o,e);return Kc(!t,n).fold((()=>Kc(t,o).fold(L,r)),r)})(e,t,n,o)?I.none():t&&ir(o.getNode())||!t&&ir(o.getNode(!0))?((e,t,n,o)=>{const r=o.getNode(!t);return ph(yn(e),yn(n.getNode())).map((e=>bs(e)?yx.remove(e.dom):yx.moveToElement(r))).orThunk((()=>I.some(yx.moveToElement(r))))})(e,t,n,o):t&&pp(n)||!t&&gp(n)?I.some(yx.moveToPosition(o)):I.none();var r})),wx=(e,t)=>I.from(Vh(e.getBody(),t)),xx=(e,t)=>{const n=e.selection.getNode();return wx(e,n).filter(ir).fold((()=>((e,t,n)=>{const o=Wc(t?1:-1,e,n),r=Li.fromRangeStart(o),s=yn(e);return!t&&pp(r)?I.some(yx.remove(r.getNode(!0))):t&&gp(r)?I.some(yx.remove(r.getNode())):!t&&gp(r)&&Ap(s,r)?Op(s,r).map((e=>yx.remove(e.getNode()))):t&&pp(r)&&Rp(s,r)?Tp(s,r).map((e=>yx.remove(e.getNode()))):((e,t,n)=>((e,t)=>{const n=t.getNode(!e),o=e?"after":"before";return $o(n)&&n.getAttribute("data-mce-caret")===o})(t,n)?((e,t)=>y(t)?I.none():e&&ir(t.nextSibling)?I.some(yx.moveToElement(t.nextSibling)):!e&&ir(t.previousSibling)?I.some(yx.moveToElement(t.previousSibling)):I.none())(t,n.getNode(!t)).orThunk((()=>Cx(e,t,n))):Cx(e,t,n).bind((t=>((e,t,n)=>n.fold((e=>I.some(yx.remove(e))),(e=>I.some(yx.moveToElement(e))),(n=>Uc(t,n,e)?I.none():I.some(yx.moveToPosition(n)))))(e,n,t))))(e,t,r)})(e.getBody(),t,e.selection.getRng()).map((n=>()=>n.fold(((e,t)=>n=>(e._selectionOverrides.hideFakeCaret(),rh(e,t,yn(n)),!0))(e,t),((e,t)=>n=>{const o=t?Li.before(n):Li.after(n);return e.selection.setRng(o.toRange()),!0})(e,t),(e=>t=>(e.selection.setRng(t.toRange()),!0))(e))))),(()=>I.some(E)))},kx=e=>{const t=e.dom,n=e.selection,o=Vh(e.getBody(),n.getNode());if(ar(o)&&t.isBlock(o)&&t.isEmpty(o)){const e=t.create("br",{"data-mce-bogus":"1"});t.setHTML(o,""),o.appendChild(e),n.setRng(Li.before(e).toRange())}return!0},Ex=(e,t)=>e.selection.isCollapsed()?xx(e,t):((e,t)=>{const n=e.selection.getNode();return ir(n)&&!lr(n)?wx(e,n.parentNode).filter(ir).fold((()=>I.some((()=>{var n;n=yn(e.getBody()),V(Fo(n,".mce-offscreen-selection"),wo),rh(e,t,yn(e.selection.getNode())),hh(e)}))),(()=>I.some(E))):vx(e)?I.some((()=>{yh(e,e.selection.getRng(),yn(e.getBody()))})):I.none()})(e,t),Sx=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=Li.fromRangeStart(e.selection.getRng());return fu(t,e.getBody(),n).filter((e=>t?lp(e):dp(e))).bind((e=>zc(t?0:-1,e))).map((t=>()=>e.selection.select(t)))})(e,t):I.none(),_x=Jo,Nx=e=>_x(e)&&e.data[0]===Mr,Rx=e=>_x(e)&&e.data[e.data.length-1]===Mr,Ax=e=>{var t;return(null!==(t=e.ownerDocument)&&void 0!==t?t:document).createTextNode(Mr)},Ox=(e,t)=>e?(e=>{var t;if(_x(e.previousSibling))return Rx(e.previousSibling)||e.previousSibling.appendData(Mr),e.previousSibling;if(_x(e))return Nx(e)||e.insertData(0,Mr),e;{const n=Ax(e);return null===(t=e.parentNode)||void 0===t||t.insertBefore(n,e),n}})(t):(e=>{var t,n;if(_x(e.nextSibling))return Nx(e.nextSibling)||e.nextSibling.insertData(0,Mr),e.nextSibling;if(_x(e))return Rx(e)||e.appendData(Mr),e;{const o=Ax(e);return e.nextSibling?null===(t=e.parentNode)||void 0===t||t.insertBefore(o,e.nextSibling):null===(n=e.parentNode)||void 0===n||n.appendChild(o),o}})(t),Tx=O(Ox,!0),Bx=O(Ox,!1),Dx=(e,t)=>Jo(e.container())?Ox(t,e.container()):Ox(t,e.getNode()),Px=(e,t)=>{const n=t.get();return n&&e.container()===n&&Hr(n)},Lx=(e,t)=>t.fold((t=>{hc(e.get());const n=Tx(t);return e.set(n),I.some(Li(n,n.length-1))}),(t=>yu(t).map((t=>{if(Px(t,e)){const t=e.get();return Li(t,1)}{hc(e.get());const n=Dx(t,!0);return e.set(n),Li(n,1)}}))),(t=>Cu(t).map((t=>{if(Px(t,e)){const t=e.get();return Li(t,t.length-1)}{hc(e.get());const n=Dx(t,!1);return e.set(n),Li(n,n.length-1)}}))),(t=>{hc(e.get());const n=Bx(t);return e.set(n),I.some(Li(n,1))})),Mx=(e,t)=>{for(let n=0;n<e.length;n++){const o=e[n].apply(null,t);if(o.isSome())return o}return I.none()},Ix=al([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Fx=(e,t)=>Fc(t,e)||e,Ux=(e,t,n)=>{const o=ch(n),r=Fx(t,o.container());return lh(e,r,o).fold((()=>bu(r,o).bind(O(lh,e,r)).map((e=>Ix.before(e)))),I.none)},zx=(e,t)=>null===ku(e,t),jx=(e,t,n)=>lh(e,t,n).filter(O(zx,t)),Hx=(e,t,n)=>{const o=uh(n);return jx(e,t,o).bind((e=>vu(e,o).isNone()?I.some(Ix.start(e)):I.none()))},$x=(e,t,n)=>{const o=ch(n);return jx(e,t,o).bind((e=>bu(e,o).isNone()?I.some(Ix.end(e)):I.none()))},qx=(e,t,n)=>{const o=uh(n),r=Fx(t,o.container());return lh(e,r,o).fold((()=>vu(r,o).bind(O(lh,e,r)).map((e=>Ix.after(e)))),I.none)},Vx=e=>!ih(Kx(e)),Wx=(e,t,n)=>Mx([Ux,Hx,$x,qx],[e,t,n]).filter(Vx),Kx=e=>e.fold(R,R,R,R),Gx=e=>e.fold(N("before"),N("start"),N("end"),N("after")),Yx=e=>e.fold(Ix.before,Ix.before,Ix.after,Ix.after),Xx=e=>e.fold(Ix.start,Ix.start,Ix.end,Ix.end),Qx=(e,t,n,o,r,s)=>Mt(lh(t,n,o),lh(t,n,r),((t,o)=>t!==o&&((e,t,n)=>{const o=Fc(t,e),r=Fc(n,e);return C(o)&&o===r})(n,t,o)?Ix.after(e?t:o):s)).getOr(s),Jx=(e,t)=>e.fold(M,(e=>{return o=t,!(Gx(n=e)===Gx(o)&&Kx(n)===Kx(o));var n,o})),Zx=(e,t)=>e?t.fold(S(I.some,Ix.start),I.none,S(I.some,Ix.after),I.none):t.fold(I.none,S(I.some,Ix.before),I.none,S(I.some,Ix.end)),ek=(e,t,n)=>{const o=e?1:-1;return t.setRng(Li(n.container(),n.offset()+o).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0};var tk;!function(e){e[e.Br=0]="Br",e[e.Block=1]="Block",e[e.Wrap=2]="Wrap",e[e.Eol=3]="Eol"}(tk||(tk={}));const nk=(e,t)=>e===Jc.Backwards?oe(t):t,ok=(e,t,n)=>e===Jc.Forwards?t.next(n):t.prev(n),rk=(e,t,n,o)=>rr(o.getNode(t===Jc.Forwards))?tk.Br:!1===Uc(n,o)?tk.Block:tk.Wrap,sk=(e,t,n,o)=>{const r=du(n);let s=o;const a=[];for(;s;){const n=ok(t,r,s);if(!n)break;if(rr(n.getNode(!1)))return t===Jc.Forwards?{positions:nk(t,a).concat([n]),breakType:tk.Br,breakAt:I.some(n)}:{positions:nk(t,a),breakType:tk.Br,breakAt:I.some(n)};if(n.isVisible()){if(e(s,n)){const e=rk(0,t,s,n);return{positions:nk(t,a),breakType:e,breakAt:I.some(n)}}a.push(n),s=n}else s=n}return{positions:nk(t,a),breakType:tk.Eol,breakAt:I.none()}},ak=(e,t,n,o)=>t(n,o).breakAt.map((o=>{const r=t(n,o).positions;return e===Jc.Backwards?r.concat(o):[o].concat(r)})).getOr([]),ik=(e,t)=>X(e,((e,n)=>e.fold((()=>I.some(n)),(o=>Mt(le(o.getClientRects()),le(n.getClientRects()),((e,r)=>{const s=Math.abs(t-e.left);return Math.abs(t-r.left)<=s?n:o})).or(e)))),I.none()),lk=(e,t)=>le(t.getClientRects()).bind((t=>ik(e,t.left))),dk=O(sk,Li.isAbove,-1),ck=O(sk,Li.isBelow,1),uk=O(ak,-1,dk),mk=O(ak,1,ck),fk=(e,t)=>dk(e,t).breakAt.isNone(),gk=(e,t)=>ck(e,t).breakAt.isNone(),pk=(e,t)=>lk(uk(e,t),t),hk=(e,t)=>lk(mk(e,t),t),bk=ir,vk=(e,t)=>Math.abs(e.left-t),yk=(e,t)=>Math.abs(e.right-t),Ck=(e,t)=>Te(e,((e,n)=>{const o=Math.min(vk(e,t),yk(e,t)),r=Math.min(vk(n,t),yk(n,t));return r===o&&Ee(n,"node")&&bk(n.node)||r<o?n:e})),wk=e=>{const t=t=>q(t,(t=>{const n=li(t);return n.node=e,n}));if($o(e))return t(e.getClientRects());if(Jo(e)){const n=e.ownerDocument.createRange();return n.setStart(e,0),n.setEnd(e,e.data.length),t(n.getClientRects())}return[]},xk=e=>te(e,wk);var kk;!function(e){e[e.Up=-1]="Up",e[e.Down=1]="Down"}(kk||(kk={}));const Ek=(e,t,n,o,r,s)=>{let a=0;const i=[],l=o=>{let s=xk([o]);-1===e&&(s=s.reverse());for(let e=0;e<s.length;e++){const o=s[e];if(!n(o,d)){if(i.length>0&&t(o,De(i))&&a++,o.line=a,r(o))return!0;i.push(o)}}return!1},d=De(s.getClientRects());if(!d)return i;const c=s.getNode();return c&&(l(c),((e,t,n,o)=>{let r=o;for(;r=Ic(r,e,is,t);)if(n(r))return})(e,o,l,c)),i},Sk=O(Ek,kk.Up,ui,mi),_k=O(Ek,kk.Down,mi,ui),Nk=e=>De(e.getClientRects()),Rk=e=>t=>((e,t)=>t.line>e)(e,t),Ak=e=>t=>((e,t)=>t.line===e)(e,t),Ok=(e,t)=>{e.selection.setRng(t),Zf(e,e.selection.getRng())},Tk=(e,t,n)=>I.some(mx(e,t,n)),Bk=(e,t,n,o,r,s)=>{const a=t===Jc.Forwards,i=du(e.getBody()),l=O(Xc,a?i.next:i.prev),d=a?o:r;if(!n.collapsed){const o=gi(n);if(s(o))return cx(t,e,o,t===Jc.Backwards,!1);if(vx(e)){const e=n.cloneRange();return e.collapse(t===Jc.Backwards),I.from(e)}}const c=Gc(t,e.getBody(),n);if(d(c))return ux(e,c.getNode(!a));let u=l(c);const m=Xr(n);if(!u)return m?I.some(n):I.none();if(u=dh(a,u),d(u))return cx(t,e,u.getNode(!a),a,!1);const f=l(u);return f&&d(f)&&Qc(u,f)?cx(t,e,f.getNode(!a),a,!1):m?Tk(e,u.toRange(),!1):I.none()},Dk=(e,t,n,o,r,s)=>{const a=Gc(t,e.getBody(),n),i=De(a.getClientRects()),l=t===kk.Down,d=e.getBody();if(!i)return I.none();if(vx(e)){const e=l?Li.fromRangeEnd(n):Li.fromRangeStart(n);return(l?hk:pk)(d,e).orThunk((()=>I.from(e))).map((e=>e.toRange()))}const c=(l?_k:Sk)(d,Rk(1),a),u=G(c,Ak(1)),m=i.left,f=Ck(u,m);if(f&&s(f.node)){const n=Math.abs(m-f.left),o=Math.abs(m-f.right);return cx(t,e,f.node,n<o,!1)}let g;if(g=o(a)?a.getNode():r(a)?a.getNode(!0):gi(n),g){const n=((e,t,n,o)=>{const r=du(t);let s,a,i,l;const d=[];let c=0;1===e?(s=r.next,a=mi,i=ui,l=Li.after(o)):(s=r.prev,a=ui,i=mi,l=Li.before(o));const u=Nk(l);do{if(!l.isVisible())continue;const e=Nk(l);if(i(e,u))continue;d.length>0&&a(e,De(d))&&c++;const t=li(e);if(t.position=l,t.line=c,n(t))return d;d.push(t)}while(l=s(l));return d})(t,d,Rk(1),g);let o=Ck(G(n,Ak(1)),m);if(o)return Tk(e,o.position.toRange(),!1);if(o=De(G(n,Ak(0))),o)return Tk(e,o.position.toRange(),!1)}return 0===u.length?Pk(e,l).filter(l?r:o).map((t=>mx(e,t.toRange(),!1))):I.none()},Pk=(e,t)=>{const n=e.selection.getRng(),o=t?Li.fromRangeEnd(n):Li.fromRangeStart(n),r=(s=o.container(),a=e.getBody(),Qn(yn(s),(e=>Sc(e.dom)),(e=>e.dom===a)).map((e=>e.dom)).getOr(a));var s,a;if(t){const e=ck(r,o);return de(e.positions)}{const e=dk(r,o);return le(e.positions)}},Lk=(e,t,n)=>Pk(e,t).filter(n).exists((t=>(e.selection.setRng(t.toRange()),!0))),Mk=(e,t)=>{const n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},Ik=(e,t)=>{e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},Fk=(e,t,n)=>Lx(t,n).map((t=>(Mk(e,t),n))),Uk=(e,t,n)=>{const o=e.getBody(),r=((e,t,n)=>{const o=Li.fromRangeStart(e);if(e.collapsed)return o;{const r=Li.fromRangeEnd(e);return n?vu(t,r).getOr(r):bu(t,o).getOr(o)}})(e.selection.getRng(),o,n);return((e,t,n,o)=>{const r=dh(e,o),s=Wx(t,n,r);return Wx(t,n,r).bind(O(Zx,e)).orThunk((()=>((e,t,n,o,r)=>{const s=dh(e,r);return fu(e,n,s).map(O(dh,e)).fold((()=>o.map(Yx)),(r=>Wx(t,n,r).map(O(Qx,e,t,n,s,r)).filter(O(Jx,o)))).filter(Vx)})(e,t,n,s,o)))})(n,O(ah,e),o,r).bind((n=>Fk(e,t,n)))},zk=(e,t,n)=>!!dd(e)&&Uk(e,t,n).isSome(),jk=(e,t,n)=>!!dd(t)&&((e,t)=>{const n=t.selection.getRng(),o=e?Li.fromRangeEnd(n):Li.fromRangeStart(n);return!!(e=>w(e.selection.getSel().modify))(t)&&(e&&Vr(o)?ek(!0,t.selection,o):!(e||!Wr(o))&&ek(!1,t.selection,o))})(e,t),Hk=e=>{const t=Da(null),n=O(ah,e);return e.on("NodeChange",(o=>{dd(e)&&(((e,t,n)=>{const o=q(Fo(yn(t.getRoot()),'*[data-mce-selected="inline-boundary"]'),(e=>e.dom)),r=G(o,e),s=G(n,e);V(re(r,s),O(Ik,!1)),V(re(s,r),O(Ik,!0))})(n,e.dom,o.parents),((e,t)=>{const n=t.get();if(e.selection.isCollapsed()&&!e.composing&&n){const o=Li.fromRangeStart(e.selection.getRng());Li.isTextPosition(o)&&!(e=>Vr(e)||Wr(e))(o)&&(Mk(e,pc(n,o)),t.set(null))}})(e,t),((e,t,n,o)=>{if(t.selection.isCollapsed()){const r=G(o,e);V(r,(o=>{const r=Li.fromRangeStart(t.selection.getRng());Wx(e,t.getBody(),r).bind((e=>Fk(t,n,e)))}))}})(n,e,t,o.parents))})),t},$k=O(jk,!0),qk=O(jk,!1),Vk=(e,t,n)=>{if(dd(e)){const o=Pk(e,t).getOrThunk((()=>{const n=e.selection.getRng();return t?Li.fromRangeEnd(n):Li.fromRangeStart(n)}));return Wx(O(ah,e),e.getBody(),o).exists((t=>{const o=Yx(t);return Lx(n,o).exists((t=>(Mk(e,t),!0)))}))}return!1},Wk=(e,t)=>n=>Lx(t,n).map((t=>()=>Mk(e,t))),Kk=(e,t,n,o)=>{const r=e.getBody(),s=O(ah,e);e.undoManager.ignore((()=>{e.selection.setRng(((e,t)=>{const n=document.createRange();return n.setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n})(n,o)),fh(e),Wx(s,r,Li.fromRangeStart(e.selection.getRng())).map(Xx).bind(Wk(e,t)).each(P)})),e.nodeChanged()},Gk=(e,t,n)=>{if(e.selection.isCollapsed()&&dd(e)){const o=Li.fromRangeStart(e.selection.getRng());return((e,t,n,o)=>{const r=((e,t)=>Fc(t,e)||e)(e.getBody(),o.container()),s=O(ah,e),a=Wx(s,r,o);return a.bind((e=>n?e.fold(N(I.some(Xx(e))),I.none,N(I.some(Yx(e))),I.none):e.fold(I.none,N(I.some(Yx(e))),I.none,N(I.some(Xx(e)))))).map(Wk(e,t)).getOrThunk((()=>{const i=gu(n,r,o),l=i.bind((e=>Wx(s,r,e)));return Mt(a,l,(()=>lh(s,r,o).bind((t=>(e=>Mt(yu(e),Cu(e),((t,n)=>{const o=dh(!0,t),r=dh(!1,n);return bu(e,o).forall((e=>e.isEqual(r)))})).getOr(!0))(t)?I.some((()=>{rh(e,n,yn(t))})):I.none())))).getOrThunk((()=>l.bind((()=>i.map((r=>()=>{n?Kk(e,t,o,r):Kk(e,t,r,o)}))))))}))})(e,t,n,o)}return I.none()},Yk=(e,t)=>{const n=yn(e.getBody()),o=yn(e.selection.getStart()),r=bp(o,n);return Z(r,t).fold(N(r),(e=>r.slice(0,e)))},Xk=e=>1===zn(e),Qk=(e,t)=>{const n=O(Ib,e);return te(t,(e=>n(e)?[e.dom]:[]))},Jk=e=>{const t=(e=>Yk(e,xr))(e);return Qk(e,t)},Zk=(e,t)=>{const n=G((e=>Yk(e,(e=>xr(e)||(e=>zn(e)>1)(e))))(e),Xk);return de(n).bind((o=>{const r=Li.fromRangeStart(e.selection.getRng());return bh(t,r,o.dom)&&!Fb(o)?I.some((()=>((e,t,n,o)=>{const r=Qk(t,o);if(0===r.length)rh(t,e,n);else{const e=Mb(n.dom,r);t.selection.setRng(e.toRange())}})(t,e,o,n))):I.none()}))},eE=(e,t)=>{const n=e.selection.getStart(),o=((e,t)=>{const n=t.parentElement;return rr(t)&&!h(n)&&e.dom.isEmpty(n)})(e,n)||Fb(yn(n))?Mb(n,t):((e,t)=>{const{caretContainer:n,caretPosition:o}=Lb(t);return e.insertNode(n.dom),o})(e.selection.getRng(),t);e.selection.setRng(o.toRange())},tE=e=>Jo(e.startContainer),nE=e=>{const t=e.selection.getRng();return(e=>0===e.startOffset&&tE(e))(t)&&((e,t)=>{const n=t.startContainer.parentElement;return!h(n)&&Ib(e,yn(n))})(e,t)&&(e=>(e=>(e=>{const t=e.startContainer.parentNode,n=e.endContainer.parentNode;return!h(t)&&!h(n)&&t.isEqualNode(n)})(e)&&(e=>{const t=e.endContainer;return e.endOffset===(Jo(t)?t.length:t.childNodes.length)})(e))(e)||(e=>!e.endContainer.isEqualNode(e.commonAncestorContainer))(e))(t)},oE=(e,t)=>e.selection.isCollapsed()?Zk(e,t):(e=>{if(nE(e)){const t=Jk(e);return I.some((()=>{fh(e),((e,t)=>{const n=re(t,Jk(e));n.length>0&&eE(e,n)})(e,t)}))}return I.none()})(e),rE=e=>((e,t,n)=>Qn(e,(e=>xu(e.dom)),n).isSome())(e,0,xr),sE=e=>((e=>{const t=e.selection.getRng();return t.collapsed&&(tE(t)||e.dom.isEmpty(t.startContainer))&&!(e=>rE(yn(e.selection.getStart())))(e)})(e)&&eE(e,[]),!0),aE=(e,t,n)=>C(n)?I.some((()=>{e._selectionOverrides.hideFakeCaret(),rh(e,t,yn(n))})):I.none(),iE=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=t?cp:up,o=t?Jc.Forwards:Jc.Backwards,r=Gc(o,e.getBody(),e.selection.getRng());return n(r)?aE(e,t,r.getNode(!t)):I.from(dh(t,r)).filter((e=>n(e)&&Qc(r,e))).bind((n=>aE(e,t,n.getNode(!t))))})(e,t):((e,t)=>{const n=e.selection.getNode();return cr(n)?aE(e,t,n):I.none()})(e,t),lE=e=>Xe(null!=e?e:"").getOr(0),dE=(e,t)=>(e||"table"===Ht(t)?"margin":"padding")+("rtl"===lo(t,"direction")?"-right":"-left"),cE=e=>{const t=mE(e);return!e.mode.isReadOnly()&&(t.length>1||((e,t)=>ne(t,(t=>{const n=dE(Kl(e),t),o=uo(t,n).map(lE).getOr(0);return"false"!==e.dom.getContentEditable(t.dom)&&o>0})))(e,t))},uE=e=>_r(e)||Nr(e),mE=e=>G(ko(e.selection.getSelectedBlocks()),(e=>!uE(e)&&!(e=>An(e).exists(uE))(e)&&Jn(e,(e=>ar(e.dom)||ir(e.dom))).exists((e=>ar(e.dom))))),fE=(e,t)=>{var n,o;const{dom:r}=e,s=Gl(e),a=null!==(o=null===(n=/[a-z%]+$/i.exec(s))||void 0===n?void 0:n[0])&&void 0!==o?o:"px",i=lE(s),l=Kl(e);V(mE(e),(e=>{((e,t,n,o,r,s)=>{const a=dE(n,yn(s)),i=lE(e.getStyle(s,a));if("outdent"===t){const t=Math.max(0,i-o);e.setStyle(s,a,t?t+r:"")}else{const t=i+o+r;e.setStyle(s,a,t)}})(r,t,l,i,a,e.dom)}))},gE=e=>fE(e,"outdent"),pE=e=>{if(e.selection.isCollapsed()&&cE(e)){const t=e.dom,n=e.selection.getRng(),o=Li.fromRangeStart(n),r=t.getParent(n.startContainer,t.isBlock);if(null!==r&&xp(yn(r),o))return I.some((()=>gE(e)))}return I.none()},hE=(e,t,n)=>ue([pE,Ex,hx,(e,n)=>Gk(e,t,n),ax,qh,Sx,iE,dx,oE],(t=>t(e,n))).filter((t=>e.selection.isEditable())),bE=(e,t)=>{e.addCommand("delete",(()=>{((e,t)=>{hE(e,t,!1).fold((()=>{fh(e),hh(e)}),P)})(e,t)})),e.addCommand("forwardDelete",(()=>{((e,t)=>{hE(e,t,!0).fold((()=>(e=>mh(e,"ForwardDelete"))(e)),P)})(e,t)}))},vE=e=>void 0===e.touches||1!==e.touches.length?I.none():I.some(e.touches[0]),yE=(e,t)=>ke(e,t.nodeName),CE=(e,t)=>!!Jo(t)||!!$o(t)&&!yE(e.getBlockElements(),t)&&!Lu(t)&&!As(e,t),wE=(e,t)=>{if(Jo(t)){if(0===t.data.length)return!0;if(/^\s+$/.test(t.data)&&(!t.nextSibling||yE(e,t.nextSibling)))return!0}return!1},xE=e=>e.dom.create(Nl(e),Rl(e)),kE=e=>{const t=e.dom,n=e.selection,o=e.schema,r=o.getBlockElements(),s=n.getStart(),a=e.getBody();let i,l,d=!1;const c=Nl(e);if(!s||!$o(s))return;const u=a.nodeName.toLowerCase();if(!o.isValidChild(u,c.toLowerCase())||((e,t,n)=>$(hp(yn(n),yn(t)),(t=>yE(e,t.dom))))(r,a,s))return;const m=n.getRng(),{startContainer:f,startOffset:g,endContainer:p,endOffset:h}=m,b=xg(e);let v=a.firstChild;for(;v;)if($o(v)&&Ss(o,v),CE(o,v)){if(wE(r,v)){l=v,v=v.nextSibling,t.remove(l);continue}i||(i=xE(e),a.insertBefore(i,v),d=!0),l=v,v=v.nextSibling,i.appendChild(l)}else i=null,v=v.nextSibling;d&&b&&(m.setStart(f,g),m.setEnd(p,h),n.setRng(m),e.nodeChanged())},EE=(e,t,n)=>{const o=yn(xE(e)),r=Dr();bo(o,r),n(t,o);const s=document.createRange();return s.setStartBefore(r.dom),s.setEndBefore(r.dom),s},SE=e=>t=>-1!==(" "+t.attr("class")+" ").indexOf(e),_E=(e,t,n)=>function(o){const r=arguments,s=r[r.length-2],a=s>0?t.charAt(s-1):"";if('"'===a)return o;if(">"===a){const e=t.lastIndexOf("<",s);if(-1!==e&&-1!==t.substring(e,s).indexOf('contenteditable="false"'))return o}return'<span class="'+n+'" data-mce-content="'+e.dom.encode(r[0])+'">'+e.dom.encode("string"==typeof r[1]?r[1]:r[0])+"</span>"},NE=(e,t)=>{t.hasAttribute("data-mce-caret")&&(Yr(t),e.selection.setRng(e.selection.getRng()),e.selection.scrollIntoView(t))},RE=(e,t)=>{const n=(e=>eo(yn(e.getBody()),"*[data-mce-caret]").map((e=>e.dom)).getOrNull())(e);if(n)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void NE(e,n)):void(qr(n)&&(NE(e,n),e.undoManager.add()))},AE=ir,OE=(e,t,n)=>{const o=du(e.getBody()),r=O(Xc,1===t?o.next:o.prev);if(n.collapsed){const o=e.dom.getParent(n.startContainer,"PRE");if(!o)return;if(!r(Li.fromRangeStart(n))){const n=yn((e=>{const t=e.dom.create(Nl(e));return t.innerHTML='<br data-mce-bogus="1">',t})(e));1===t?po(yn(o),n):go(yn(o),n),e.selection.select(n.dom,!0),e.selection.collapse()}}},TE=(e,t)=>((e,t)=>{const n=t?Jc.Forwards:Jc.Backwards,o=e.selection.getRng();return((e,t,n)=>Bk(t,e,n,gp,pp,AE))(n,e,o).orThunk((()=>(OE(e,n,o),I.none())))})(e,((e,t)=>{const n=t?e.getEnd(!0):e.getStart(!0);return ih(n)?!t:t})(e.selection,t)).exists((t=>(Ok(e,t),!0))),BE=(e,t)=>((e,t)=>{const n=t?1:-1,o=e.selection.getRng();return((e,t,n)=>Dk(t,e,n,(e=>gp(e)||mp(e)),(e=>pp(e)||fp(e)),AE))(n,e,o).orThunk((()=>(OE(e,n,o),I.none())))})(e,t).exists((t=>(Ok(e,t),!0))),DE=(e,t)=>Lk(e,t,t?pp:gp),PE=(e,t)=>bx(e,!t).map((n=>{const o=n.toRange(),r=e.selection.getRng();return t?o.setStart(r.startContainer,r.startOffset):o.setEnd(r.endContainer,r.endOffset),o})).exists((t=>(Ok(e,t),!0))),LE=e=>H(["figcaption"],Ht(e)),ME=(e,t)=>!!e.selection.isCollapsed()&&((e,t)=>{const n=yn(e.getBody()),o=Li.fromRangeStart(e.selection.getRng());return((e,t)=>{const n=O(En,t);return Jn(yn(e.container()),xr,n).filter(LE)})(o,n).exists((()=>{if(((e,t,n)=>t?gk(e.dom,n):fk(e.dom,n))(n,t,o)){const o=EE(e,n,t?bo:ho);return e.selection.setRng(o),!0}return!1}))})(e,t),IE=(e,t)=>((e,t)=>t?I.from(e.dom.getParent(e.selection.getNode(),"details")).map((t=>((e,t)=>{const n=e.selection.getRng(),o=Li.fromRangeStart(n);return!(e.getBody().lastChild!==t||!gk(t,o)||(e.execCommand("InsertNewBlockAfter"),0))})(e,t))).getOr(!1):I.from(e.dom.getParent(e.selection.getNode(),"summary")).bind((t=>I.from(e.dom.getParent(t,"details")).map((n=>((e,t,n)=>{const o=e.selection.getRng(),r=Li.fromRangeStart(o);return!(e.getBody().firstChild!==t||!fk(n,r)||(e.execCommand("InsertNewBlockBefore"),0))})(e,n,t))))).getOr(!1))(e,t),FE={shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0},UE=(e,t)=>t.keyCode===e.keyCode&&t.shiftKey===e.shiftKey&&t.altKey===e.altKey&&t.ctrlKey===e.ctrlKey&&t.metaKey===e.metaKey,zE=(e,...t)=>()=>e.apply(null,t),jE=(e,t)=>J(((e,t)=>te((e=>q(e,(e=>({...FE,...e}))))(e),(e=>UE(e,t)?[e]:[])))(e,t),(e=>e.action())),HE=(e,t)=>ue(((e,t)=>te((e=>q(e,(e=>({...FE,...e}))))(e),(e=>UE(e,t)?[e]:[])))(e,t),(e=>e.action())),$E=(e,t)=>{const n=t?Jc.Forwards:Jc.Backwards,o=e.selection.getRng();return Bk(e,n,o,cp,up,cr).exists((t=>(Ok(e,t),!0)))},qE=(e,t)=>{const n=t?1:-1,o=e.selection.getRng();return Dk(e,n,o,cp,up,cr).exists((t=>(Ok(e,t),!0)))},VE=(e,t)=>Lk(e,t,t?up:cp),WE=al([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),KE={...WE,none:e=>WE.none(e)},GE=(e,t,n)=>te(Mn(e),(e=>xn(e,t)?n(e)?[e]:[]:GE(e,t,n))),YE=(e,t)=>to(e,"table",t),XE=(e,t,n,o,r=M)=>{const s=1===o;if(!s&&n<=0)return KE.first(e[0]);if(s&&n>=e.length-1)return KE.last(e[e.length-1]);{const s=n+o,a=e[s];return r(a)?KE.middle(t,a):XE(e,t,s,o,r)}},QE=(e,t)=>YE(e,t).bind((t=>{const n=GE(t,"th,td",M);return Z(n,(t=>En(e,t))).map((e=>({index:e,all:n})))})),JE=(e,t,n,o,r)=>{const s=Fo(yn(n),"td,th,caption").map((e=>e.dom)),a=G(((e,t)=>te(t,(t=>{const n=((e,t)=>({left:e.left-t,top:e.top-t,right:e.right+-2,bottom:e.bottom+-2,width:e.width+t,height:e.height+t}))(li(t.getBoundingClientRect()),-1);return[{x:n.left,y:e(n),cell:t},{x:n.right,y:e(n),cell:t}]})))(e,s),(e=>t(e,r)));return((e,t,n)=>X(e,((e,o)=>e.fold((()=>I.some(o)),(e=>{const r=Math.sqrt(Math.abs(e.x-t)+Math.abs(e.y-n)),s=Math.sqrt(Math.abs(o.x-t)+Math.abs(o.y-n));return I.some(s<r?o:e)}))),I.none()))(a,o,r).map((e=>e.cell))},ZE=O(JE,(e=>e.bottom),((e,t)=>e.y<t)),eS=O(JE,(e=>e.top),((e,t)=>e.y>t)),tS=(e,t,n)=>{const o=e(t,n);return(e=>e.breakType===tk.Wrap&&0===e.positions.length)(o)||!rr(n.getNode())&&(e=>e.breakType===tk.Br&&1===e.positions.length)(o)?!((e,t,n)=>n.breakAt.exists((n=>e(t,n).breakAt.isSome())))(e,t,o):o.breakAt.isNone()},nS=O(tS,dk),oS=O(tS,ck),rS=(e,t,n,o)=>{const r=e.selection.getRng(),s=t?1:-1;return!(!xc()||!((e,t,n)=>{const o=Li.fromRangeStart(t);return hu(!e,n).exists((e=>e.isEqual(o)))})(t,r,n)||(cx(s,e,n,!t,!1).each((t=>{Ok(e,t)})),0))},sS=(e,t,n)=>{const o=((e,t)=>{const n=t.getNode(e);return Yo(n)?I.some(n):I.none()})(!!t,n),r=!1===t;o.fold((()=>Ok(e,n.toRange())),(o=>hu(r,e.getBody()).filter((e=>e.isEqual(n))).fold((()=>Ok(e,n.toRange())),(n=>((e,t,n)=>{t.undoManager.transact((()=>{const o=e?po:go,r=EE(t,yn(n),o);Ok(t,r)}))})(t,e,o)))))},aS=(e,t,n,o)=>{const r=e.selection.getRng(),s=Li.fromRangeStart(r),a=e.getBody();if(!t&&nS(o,s)){const o=((e,t,n)=>((e,t)=>le(t.getClientRects()).bind((t=>ZE(e,t.left,t.top))).bind((e=>{return lk(Cu(n=e).map((e=>dk(n,e).positions.concat(e))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>ik(uk(e,Li.before(t)),n.left))))).getOr(Li.before(t)))(a,n,s);return sS(e,t,o),!0}if(t&&oS(o,s)){const o=((e,t,n)=>((e,t)=>de(t.getClientRects()).bind((t=>eS(e,t.left,t.top))).bind((e=>{return lk(yu(n=e).map((e=>[e].concat(ck(n,e).positions))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>ik(mk(e,Li.after(t)),n.left))))).getOr(Li.after(t)))(a,n,s);return sS(e,t,o),!0}return!1},iS=(e,t,n)=>I.from(e.dom.getParent(e.selection.getNode(),"td,th")).bind((o=>I.from(e.dom.getParent(o,"table")).map((r=>n(e,t,r,o))))).getOr(!1),lS=(e,t)=>iS(e,t,rS),dS=(e,t)=>iS(e,t,aS),cS=(e,t,n)=>n.fold(I.none,I.none,((e,t)=>{return(n=t,((e,t)=>{const n=e=>{for(let o=0;o<e.childNodes.length;o++){const r=yn(e.childNodes[o]);if(t(r))return I.some(r);const s=n(e.childNodes[o]);if(s.isSome())return s}return I.none()};return n(e.dom)})(n,Og)).map((e=>(e=>{const t=hf.exact(e,0,e,0);return wf(t)})(e)));var n}),(n=>(e.execCommand("mceTableInsertRowAfter"),uS(e,t,n)))),uS=(e,t,n)=>{return cS(e,t,(r=no,QE(o=n,void 0).fold((()=>KE.none(o)),(e=>XE(e.all,o,e.index,1,r)))));var o,r},mS=(e,t,n)=>{return cS(e,t,(r=no,QE(o=n,void 0).fold((()=>KE.none()),(e=>XE(e.all,o,e.index,-1,r)))));var o,r},fS=(e,t)=>{const n=["table","li","dl"],o=yn(e.getBody()),r=e=>{const t=Ht(e);return En(e,o)||H(n,t)},s=e.selection.getRng();return((e,t)=>((e,t,n=L)=>n(t)?I.none():H(e,Ht(t))?I.some(t):Zn(t,e.join(","),(e=>xn(e,"table")||n(e))))(["td","th"],e,t))(yn(t?s.endContainer:s.startContainer),r).map((n=>(YE(n,r).each((t=>{e.model.table.clearSelectedCells(t.dom)})),e.selection.collapse(!t),(t?uS:mS)(e,r,n).each((t=>{e.selection.setRng(t)})),!0))).getOr(!1)},gS=(e,t)=>({container:e,offset:t}),pS=Oa.DOM,hS=e=>t=>e===t?-1:0,bS=(e,t,n)=>{if(Jo(e)&&t>=0)return I.some(gS(e,t));{const o=ai(pS);return I.from(o.backwards(e,t,hS(e),n)).map((e=>gS(e.container,e.container.data.length)))}},vS=(e,t,n)=>{if(!Jo(e))return I.none();const o=e.data;if(t>=0&&t<=o.length)return I.some(gS(e,t));{const o=ai(pS);return I.from(o.backwards(e,t,hS(e),n)).bind((e=>{const o=e.container.data;return vS(e.container,t+o.length,n)}))}},yS=(e,t,n)=>{if(!Jo(e))return I.none();const o=e.data;if(t<=o.length)return I.some(gS(e,t));{const r=ai(pS);return I.from(r.forwards(e,t,hS(e),n)).bind((e=>yS(e.container,t-o.length,n)))}},CS=(e,t,n,o,r)=>{const s=ai(e,(e=>t=>e.isBlock(t)||H(["BR","IMG","HR","INPUT"],t.nodeName)||"false"===e.getContentEditable(t))(e));return I.from(s.backwards(t,n,o,r))},wS=e=>Fr(e.toString().replace(/\u00A0/g," ")),xS=e=>""!==e&&-1!==" \xa0\f\n\r\t\v".indexOf(e),kS=(e,t)=>e.substring(t.length),ES=(e,t,n,o=0)=>{return(r=yn(t.startContainer),to(r,Tg)).fold((()=>((e,t,n,o=0)=>{if(!(r=t).collapsed||!Jo(r.startContainer))return I.none();var r;const s={text:"",offset:0},a=e.getParent(t.startContainer,e.isBlock)||e.getRoot();return CS(e,t.startContainer,t.startOffset,((e,t,o)=>(s.text=o+s.text,s.offset+=t,((e,t,n)=>{let o;const r=n.charAt(0);for(o=t-1;o>=0;o--){const s=e.charAt(o);if(xS(s))return I.none();if(r===s&&je(e,n,o,t))break}return I.some(o)})(s.text,s.offset,n).getOr(t))),a).bind((e=>{const r=t.cloneRange();if(r.setStart(e.container,e.offset),r.setEnd(t.endContainer,t.endOffset),r.collapsed)return I.none();const s=wS(r);return 0!==s.lastIndexOf(n)||kS(s,n).length<o?I.none():I.some({text:kS(s,n),range:r,trigger:n})}))})(e,t,n,o)),(t=>{const o=e.createRng();o.selectNode(t.dom);const r=wS(o);return I.some({range:o,text:kS(r,n),trigger:n})}));var r},SS=e=>{if((e=>3===e.nodeType)(e))return gS(e,e.data.length);{const t=e.childNodes;return t.length>0?SS(t[t.length-1]):gS(e,t.length)}},_S=(e,t)=>{const n=e.childNodes;return n.length>0&&t<n.length?_S(n[t],0):n.length>0&&(e=>1===e.nodeType)(e)&&n.length===t?SS(n[n.length-1]):gS(e,t)},NS=(e,t,n,o={})=>{var r;const s=t(),a=null!==(r=e.selection.getRng().startContainer.nodeValue)&&void 0!==r?r:"",i=G(s.lookupByTrigger(n.trigger),(t=>n.text.length>=t.minChars&&t.matches.getOrThunk((()=>(e=>t=>{const n=_S(t.startContainer,t.startOffset);return!((e,t)=>{var n;const o=null!==(n=e.getParent(t.container,e.isBlock))&&void 0!==n?n:e.getRoot();return CS(e,t.container,t.offset,((e,t)=>0===t?-1:t),o).filter((e=>{const t=e.container.data.charAt(e.offset-1);return!xS(t)})).isSome()})(e,n)})(e.dom)))(n.range,a,n.text)));if(0===i.length)return I.none();const l=Promise.all(q(i,(e=>e.fetch(n.text,e.maxResults,o).then((t=>({matchText:n.text,items:t,columns:e.columns,onAction:e.onAction,highlightOn:e.highlightOn}))))));return I.some({lookupData:l,context:n})};var RS;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}(RS||(RS={}));const AS=(e,t,n)=>e.stype===RS.Error?t(e.serror):n(e.svalue),OS=e=>({stype:RS.Value,svalue:e}),TS=e=>({stype:RS.Error,serror:e}),BS=AS,DS=e=>f(e)&&me(e).length>100?" removed due to size":JSON.stringify(e,null,2),PS=(e,t)=>TS([{path:e,getErrorInfo:t}]),LS=(e,t)=>({extract:(n,o)=>xe(o,e).fold((()=>((e,t)=>PS(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(n,e)),(e=>((e,t,n,o)=>xe(n,o).fold((()=>((e,t,n)=>PS(e,(()=>'The chosen schema: "'+n+'" did not exist in branches: '+DS(t))))(e,n,o)),(n=>n.extract(e.concat(["branch: "+o]),t))))(n,o,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+me(t)}),MS=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const n={};for(let o=0;o<t.length;o++){const r=t[o];for(const t in r)ke(r,t)&&(n[t]=e(n[t],r[t]))}return n},IS=MS(((e,t)=>g(e)&&g(t)?IS(e,t):t)),FS=(MS(((e,t)=>t)),e=>({tag:"defaultedThunk",process:N(e)})),US=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{AS(e,(e=>n.push(e)),(e=>t.push(e)))})),{values:t,errors:n}})(e);return t.errors.length>0?(n=t.errors,S(TS,ee)(n)):OS(t.values);var n},zS=(e,t,n)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return n(e.newKey,e.instantiator)}},jS=e=>({extract:(t,n)=>{return o=e(n),r=e=>((e,t)=>PS(e,N(t)))(t,e),o.stype===RS.Error?r(o.serror):o;var o,r},toString:N("val")}),HS=jS(OS),$S=(e,t,n,o)=>o(xe(e,t).getOrThunk((()=>n(e)))),qS=(e,t,n,o,r)=>{const s=e=>r.extract(t.concat([o]),e),a=e=>e.fold((()=>OS(I.none())),(e=>{const n=r.extract(t.concat([o]),e);return s=n,a=I.some,s.stype===RS.Value?{stype:RS.Value,svalue:a(s.svalue)}:s;var s,a}));switch(e.tag){case"required":return((e,t,n,o)=>xe(t,n).fold((()=>((e,t,n)=>PS(e,(()=>'Could not find valid *required* value for "'+t+'" in '+DS(n))))(e,n,t)),o))(t,n,o,s);case"defaultedThunk":return $S(n,o,e.process,s);case"option":return((e,t,n)=>n(xe(e,t)))(n,o,a);case"defaultedOptionThunk":return((e,t,n,o)=>o(xe(e,t).map((t=>!0===t?n(e):t))))(n,o,e.process,a);case"mergeWithThunk":return $S(n,o,N({}),(t=>{const o=IS(e.process(n),t);return s(o)}))}},VS=e=>({extract:(t,n)=>((e,t,n)=>{const o={},r=[];for(const s of n)zS(s,((n,s,a,i)=>{const l=qS(a,e,t,n,i);BS(l,(e=>{r.push(...e)}),(e=>{o[s]=e}))}),((e,n)=>{o[e]=n(t)}));return r.length>0?TS(r):OS(o)})(t,n,e),toString:()=>{const t=q(e,(e=>zS(e,((e,t,n,o)=>e+" -> "+o.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),WS=e=>({extract:(t,n)=>{const o=q(n,((n,o)=>e.extract(t.concat(["["+o+"]"]),n)));return US(o)},toString:()=>"array("+e.toString()+")"}),KS=(e,t,n)=>{return o=((e,t,n)=>((e,t)=>e.stype===RS.Error?{stype:RS.Error,serror:t(e.serror)}:e)(t.extract([e],n),(e=>({input:n,errors:e}))))(e,t,n),AS(o,sl.error,sl.value);var o},GS=(e,t)=>LS(e,pe(t,VS)),YS=N(HS),XS=(e,t)=>jS((n=>{const o=typeof n;return e(n)?OS(n):TS(`Expected type: ${t} but got: ${o}`)})),QS=XS(x,"number"),JS=XS(m,"string"),ZS=XS(b,"boolean"),e_=XS(w,"function"),t_=(e,t,n,o)=>({tag:"field",key:e,newKey:t,presence:n,prop:o}),n_=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),o_=(e,t)=>t_(e,e,{tag:"required",process:{}},t),r_=e=>o_(e,JS),s_=e=>o_(e,e_),a_=(e,t)=>t_(e,e,{tag:"option",process:{}},t),i_=e=>a_(e,JS),l_=(e,t,n)=>t_(e,e,FS(t),n),d_=(e,t)=>l_(e,t,QS),c_=(e,t,n)=>l_(e,t,(e=>{return t=t=>H(e,t)?sl.value(t):sl.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`),jS((e=>t(e).fold(TS,OS)));var t})(n)),u_=(e,t)=>l_(e,t,ZS),m_=(e,t)=>l_(e,t,e_),f_=r_("type"),g_=s_("fetch"),p_=s_("onAction"),h_=m_("onSetup",(()=>E)),b_=i_("text"),v_=i_("icon"),y_=i_("tooltip"),C_=i_("label"),w_=u_("active",!1),x_=u_("enabled",!0),k_=u_("primary",!1),E_=e=>((e,t)=>l_("type",t,JS))(0,e),S_=VS([f_,r_("trigger"),d_("minChars",1),(1,((e,t)=>t_(e,e,FS(1),YS()))("columns")),d_("maxResults",10),("matches",a_("matches",e_)),g_,p_,(__=JS,l_("highlightOn",[],WS(__)))]);var __;const N_=[x_,y_,v_,b_,h_],R_=[w_].concat(N_),A_=[m_("predicate",L),c_("scope","node",["node","editor"]),c_("position","selection",["node","selection","line"])],O_=N_.concat([E_("contextformbutton"),k_,p_,n_("original",R)]),T_=R_.concat([E_("contextformbutton"),k_,p_,n_("original",R)]),B_=N_.concat([E_("contextformbutton")]),D_=R_.concat([E_("contextformtogglebutton")]),P_=GS("type",{contextformbutton:O_,contextformtogglebutton:T_});VS([E_("contextform"),m_("initValue",N("")),C_,((e,t)=>t_(e,e,{tag:"required",process:{}},WS(t)))("commands",P_),a_("launch",GS("type",{contextformbutton:B_,contextformtogglebutton:D_}))].concat(A_));const L_=e=>{const t=e.ui.registry.getAll().popups,n=pe(t,(e=>{return(t=e,KS("Autocompleter",S_,{trigger:t.ch,...t})).fold((e=>{throw new Error("Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:N("... (only showing first ten failures)")}]):e;return q(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})((t=e).errors).join("\n")+"\n\nInput object: "+DS(t.input));var t}),R);var t})),o=Se(Ce(n,(e=>e.trigger))),r=we(n);return{dataset:n,triggers:o,lookupByTrigger:e=>G(r,(t=>t.trigger===e))}},M_=e=>{const t=za(),n=Da(!1),o=t.isSet,r=()=>{o()&&((e=>{FC(e).autocompleter.removeDecoration()})(e),(e=>{e.dispatch("AutocompleterEnd")})(e),n.set(!1),t.clear())},s=Pe((()=>L_(e))),a=a=>{(n=>t.get().map((t=>ES(e.dom,e.selection.getRng(),t.trigger).bind((t=>NS(e,s,t,n))))).getOrThunk((()=>((e,t)=>{const n=t(),o=e.selection.getRng();return((e,t,n)=>ue(n.triggers,(n=>ES(e,t,n))))(e.dom,o,n).bind((n=>NS(e,t,n)))})(e,s))))(a).fold(r,(s=>{(n=>{o()||(((e,t)=>{FC(e).autocompleter.addDecoration(t)})(e,n.range),t.set({trigger:n.trigger,matchLength:n.text.length}))})(s.context),s.lookupData.then((o=>{t.get().map((a=>{const i=s.context;a.trigger===i.trigger&&(i.text.length-a.matchLength>=10?r():(t.set({...a,matchLength:i.text.length}),n.get()?((e,t)=>{e.dispatch("AutocompleterUpdate",t)})(e,{lookupData:o}):(n.set(!0),((e,t)=>{e.dispatch("AutocompleterStart",t)})(e,{lookupData:o}))))}))}))}))};e.addCommand("mceAutocompleterReload",((e,t)=>{const n=f(t)?t.fetchOptions:{};a(n)})),e.addCommand("mceAutocompleterClose",r),((e,t)=>{const n=Ha(t.load,50);e.on("keypress compositionend",(e=>{27!==e.which&&n.throttle()})),e.on("keydown",(e=>{const o=e.which;8===o?n.throttle():27===o&&t.cancelIfNecessary()})),e.on("remove",n.cancel)})(e,{cancelIfNecessary:r,load:a})},I_=xt().browser.isSafari(),F_=e=>Pr(yn(e)),U_=(e,t)=>{var n;return 0===e.startOffset&&e.endOffset===(null===(n=t.textContent)||void 0===n?void 0:n.length)},z_=(e,t)=>I.from(e.getParent(t.container(),"details")),j_=(e,t)=>z_(e,t).isSome(),H_=(e,t)=>{const n=t.getNode();v(n)||e.selection.setCursorLocation(n,t.offset())},$_=(e,t,n)=>{const o=e.dom.getParent(t.container(),"details");if(o&&!o.open){const t=e.dom.select("summary",o)[0];t&&(n?yu(t):Cu(t)).each((t=>H_(e,t)))}else H_(e,t)},q_=(e,t,n)=>{const{dom:o,selection:r}=e,s=e.getBody();if("character"===n){const n=Li.fromRangeStart(r.getRng()),a=o.getParent(n.container(),o.isBlock),i=z_(o,n),l=a&&o.isEmpty(a),d=h(null==a?void 0:a.previousSibling),c=h(null==a?void 0:a.nextSibling);return!!(l&&(t?c:d)&&gu(!t,s,n).exists((e=>j_(o,e)&&!Lt(i,z_(o,e)))))||gu(t,s,n).fold(L,(n=>{const r=z_(o,n);if(j_(o,n)&&!Lt(i,r)){if(t||$_(e,n,!1),a&&l){if(t&&d)return!0;if(!t&&c)return!0;$_(e,n,t),e.dom.remove(a)}return!0}return!1}))}return!1},V_=(e,t,n,o)=>{const r=e.selection.getRng(),s=Li.fromRangeStart(r),a=e.getBody();return"selection"===o?((e,t)=>{const n=t.startSummary.exists((t=>t.contains(e.startContainer))),o=t.startSummary.exists((t=>t.contains(e.endContainer))),r=t.startDetails.forall((e=>t.endDetails.forall((t=>e!==t))));return(n||o)&&!(n&&o)||r})(r,t):n?((e,t)=>t.startSummary.exists((t=>((e,t)=>Cu(t).exists((n=>rr(n.getNode())&&vu(t,n).exists((t=>t.isEqual(e)))||n.isEqual(e))))(e,t))))(s,t)||((e,t,n)=>n.startDetails.exists((n=>bu(e,t).forall((e=>!n.contains(e.container()))))))(a,s,t):((e,t)=>t.startSummary.exists((t=>((e,t)=>yu(t).exists((t=>t.isEqual(e))))(e,t))))(s,t)||((e,t)=>t.startDetails.exists((n=>vu(n,e).forall((n=>t.startSummary.exists((t=>!t.contains(e.container())&&t.contains(n.container()))))))))(s,t)},W_=(e,t,n)=>((e,t,n)=>((e,t)=>{const n=I.from(e.getParent(t.startContainer,"details")),o=I.from(e.getParent(t.endContainer,"details"));if(n.isSome()||o.isSome()){const t=n.bind((t=>I.from(e.select("summary",t)[0])));return I.some({startSummary:t,startDetails:n,endDetails:o})}return I.none()})(e.dom,e.selection.getRng()).fold((()=>q_(e,t,n)),(o=>V_(e,o,t,n)||q_(e,t,n))))(e,t,n)||I_&&((e,t,n)=>{const o=e.selection,r=o.getNode(),s=o.getRng(),a=Li.fromRangeStart(s);return!!fr(r)&&("selection"===n&&U_(s,r)||bh(t,a,r)?F_(r):e.undoManager.transact((()=>{const s=o.getSel();let{anchorNode:a,anchorOffset:i,focusNode:l,focusOffset:d}=null!=s?s:{};const c=()=>{C(a)&&C(i)&&C(l)&&C(d)&&(null==s||s.setBaseAndExtent(a,i,l,d))},u=(e,t)=>{V(e.childNodes,(e=>{rm(e)&&t.appendChild(e)}))},m=e.dom.create("span",{"data-mce-bogus":"1"});u(r,m),r.appendChild(m),c(),"word"!==n&&"line"!==n||null==s||s.modify("extend",t?"right":"left",n),!o.isCollapsed()&&U_(o.getRng(),m)?F_(r):(e.execCommand(t?"ForwardDelete":"Delete"),a=null==s?void 0:s.anchorNode,i=null==s?void 0:s.anchorOffset,l=null==s?void 0:s.focusNode,d=null==s?void 0:s.focusOffset,u(m,r),c()),e.dom.remove(m)})),!0)})(e,t,n)?I.some(E):I.none(),K_=e=>(t,n,o={})=>{const r=t.getBody(),s={bubbles:!0,composed:!0,data:null,isComposing:!1,detail:0,view:null,target:r,currentTarget:r,eventPhase:Event.AT_TARGET,originalTarget:r,explicitOriginalTarget:r,isTrusted:!1,srcElement:r,cancelable:!1,preventDefault:E,inputType:n},a=fa(new InputEvent(e));return t.dispatch(e,{...a,...s,...o})},G_=K_("input"),Y_=K_("beforeinput"),X_=xt(),Q_=X_.os,J_=Q_.isMacOS()||Q_.isiOS(),Z_=X_.browser.isFirefox(),eN=(e,t)=>{const n=e.dom,o=e.schema.getMoveCaretBeforeOnEnterElements();if(!t)return;if(/^(LI|DT|DD)$/.test(t.nodeName)){const e=(e=>{for(;e;){if($o(e)||Jo(e)&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}return null})(t.firstChild);e&&/^(UL|OL|DL)$/.test(e.nodeName)&&t.insertBefore(n.doc.createTextNode(pr),t.firstChild)}const r=n.createRng();if(t.normalize(),t.hasChildNodes()){const e=new zo(t,t);let n,s=t;for(;n=e.current();){if(Jo(n)){r.setStart(n,0),r.setEnd(n,0);break}if(o[n.nodeName.toLowerCase()]){r.setStartBefore(n),r.setEndBefore(n);break}s=n,n=e.next()}n||(r.setStart(s,0),r.setEnd(s,0))}else rr(t)?t.nextSibling&&n.isBlock(t.nextSibling)?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)):(r.setStart(t,0),r.setEnd(t,0));e.selection.setRng(r),Zf(e,r)},tN=(e,t)=>{const n=e.getRoot();let o,r=t;for(;r!==n&&r&&"false"!==e.getContentEditable(r);){if("true"===e.getContentEditable(r)){o=r;break}r=r.parentNode}return r!==n?o:n},nN=e=>I.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock)),oN=e=>{e.innerHTML='<br data-mce-bogus="1">'},rN=(e,t)=>{Nl(e).toLowerCase()===t.tagName.toLowerCase()&&((e,t,n)=>{const o=e.dom;I.from(n.style).map(o.parseStyle).each((e=>{const n={...mo(yn(t)),...e};o.setStyles(t,n)}));const r=I.from(n.class).map((e=>e.split(/\s+/))),s=I.from(t.className).map((e=>G(e.split(/\s+/),(e=>""!==e))));Mt(r,s,((e,n)=>{const r=G(n,(t=>!H(e,t))),s=[...e,...r];o.setAttrib(t,"class",s.join(" "))}));const a=["style","class"],i=ye(n,((e,t)=>!H(a,t)));o.setAttribs(t,i)})(e,t,Rl(e))},sN=(e,t,n,o,r=!0,s)=>{const a=e.dom,i=e.schema,l=Nl(e),d=n?n.nodeName.toUpperCase():"";let c=t;const u=i.getTextInlineElements();let m;m=s||"TABLE"===d||"HR"===d?a.create(s||l):n.cloneNode(!1);let f=m;if(r){do{if(u[c.nodeName]){if(xu(c)||Lu(c))continue;const e=c.cloneNode(!1);a.setAttrib(e,"id",""),m.hasChildNodes()?(e.appendChild(m.firstChild),m.appendChild(e)):(f=e,m.appendChild(e))}}while((c=c.parentNode)&&c!==o)}else a.setAttrib(m,"style",null),a.setAttrib(m,"class",null);return rN(e,m),oN(f),m},aN=(e,t)=>{const n=null==e?void 0:e.parentNode;return C(n)&&n.nodeName===t},iN=e=>C(e)&&/^(OL|UL|LI)$/.test(e.nodeName),lN=e=>{const t=e.parentNode;return C(n=t)&&/^(LI|DT|DD)$/.test(n.nodeName)?t:e;var n},dN=(e,t,n)=>{let o=e[n?"firstChild":"lastChild"];for(;o&&!$o(o);)o=o[n?"nextSibling":"previousSibling"];return o===t},cN=(e,t)=>t&&"A"===t.nodeName&&e.isEmpty(t),uN=(e,t)=>e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t,mN=(e,t)=>C(t)&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&e.isEditable(t.parentNode)&&"false"!==e.getContentEditable(t),fN=(e,t,n)=>Jo(t)?e?1===n&&t.data.charAt(n-1)===Mr?0:n:n===t.data.length-1&&t.data.charAt(n)===Mr?t.data.length:n:n,gN={insert:(e,t)=>{let n,o,r,s,a=!1;const i=e.dom,l=e.schema.getNonEmptyElements(),d=e.selection.getRng(),c=Nl(e),u=yn(d.startContainer),f=In(u,d.startOffset),g=f.exists((e=>Vt(e)&&!no(e))),p=d.collapsed&&g,b=t=>sN(e,n,S,E,Bl(e),t),v=e=>{const t=fN(e,n,o);if(Jo(n)&&(e?t>0:t<n.data.length))return!1;if(n.parentNode===S&&a&&!e)return!0;if(e&&$o(n)&&n===S.firstChild)return!0;if(uN(n,"TABLE")||uN(n,"HR"))return a&&!e||!a&&e;const r=new zo(n,S);let s;for(Jo(n)&&(e&&0===t?r.prev():e||t!==n.data.length||r.next());s=r.current();){if($o(s)){if(!s.getAttribute("data-mce-bogus")){const e=s.nodeName.toLowerCase();if(l[e]&&"br"!==e)return!1}}else if(Jo(s)&&!ds(s.data))return!1;e?r.prev():r.next()}return!0},w=()=>{let t;return t=/^(H[1-6]|PRE|FIGURE)$/.test(r)&&"HGROUP"!==_?b(c):b(),((e,t)=>{const n=Dl(e);return!y(t)&&(m(n)?H(Dt.explode(n),t.nodeName.toLowerCase()):n)})(e,s)&&mN(i,s)&&i.isEmpty(S,void 0,{includeZwsp:!0})?t=i.split(s,S):i.insertAfter(t,S),eN(e,t),t};Of(i,d).each((e=>{d.setStart(e.startContainer,e.startOffset),d.setEnd(e.endContainer,e.endOffset)})),n=d.startContainer,o=d.startOffset;const x=!(!t||!t.shiftKey),k=!(!t||!t.ctrlKey);$o(n)&&n.hasChildNodes()&&!p&&(a=o>n.childNodes.length-1,n=n.childNodes[Math.min(o,n.childNodes.length-1)]||n,o=a&&Jo(n)?n.data.length:0);const E=tN(i,n);if(!E||((e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return null!==n&&"false"===e.dom.getContentEditableParent(n)})(e,n))return;x||(n=((e,t,n,o,r)=>{var s,a;const i=e.dom,l=null!==(s=tN(i,o))&&void 0!==s?s:i.getRoot();let d=i.getParent(o,i.isBlock);if(!d||!mN(i,d)){if(d=d||l,!d.hasChildNodes()){const o=i.create(t);return rN(e,o),d.appendChild(o),n.setStart(o,0),n.setEnd(o,0),o}let s,c=o;for(;c&&c.parentNode!==d;)c=c.parentNode;for(;c&&!i.isBlock(c);)s=c,c=c.previousSibling;const u=null===(a=null==s?void 0:s.parentElement)||void 0===a?void 0:a.nodeName;if(s&&u&&e.schema.isValidChild(u,t.toLowerCase())){const a=s.parentNode,l=i.create(t);for(rN(e,l),a.insertBefore(l,s),c=s;c&&!i.isBlock(c);){const e=c.nextSibling;l.appendChild(c),c=e}n.setStart(o,r),n.setEnd(o,r)}}return o})(e,c,d,n,o));let S=i.getParent(n,i.isBlock)||i.getRoot();s=C(null==S?void 0:S.parentNode)?i.getParent(S.parentNode,i.isBlock):null,r=S?S.nodeName.toUpperCase():"";const _=s?s.nodeName.toUpperCase():"";if("LI"!==_||k||(S=s,s=s.parentNode,r=_),$o(s)&&((e,t,n)=>!t&&n.nodeName.toLowerCase()===Nl(e)&&e.dom.isEmpty(n)&&((t,n,o)=>{let r=n;for(;r&&r!==t&&h(r.nextSibling);){const t=r.parentElement;if(!t||(s=t,!ke(e.schema.getTextBlockElements(),s.nodeName.toLowerCase())))return mr(t);r=t}var s;return!1})(e.getBody(),n))(e,x,S))return((e,t,n)=>{var o,r,s;const a=t(Nl(e)),i=((e,t)=>e.dom.getParent(t,mr))(e,n);i&&(e.dom.insertAfter(a,i),eN(e,a),(null!==(s=null===(r=null===(o=n.parentElement)||void 0===o?void 0:o.childNodes)||void 0===r?void 0:r.length)&&void 0!==s?s:0)>1&&e.dom.remove(n))})(e,b,S);if(/^(LI|DT|DD)$/.test(r)&&$o(s)&&i.isEmpty(S))return void((e,t,n,o,r)=>{const s=e.dom,a=e.selection.getRng(),i=n.parentNode;if(n===e.getBody()||!i)return;var l;iN(l=n)&&iN(l.parentNode)&&(r="LI");let d=t(r);if(dN(n,o,!0)&&dN(n,o,!1))if(aN(n,"LI")){const e=lN(n);s.insertAfter(d,e),(e=>{var t;return(null===(t=e.parentNode)||void 0===t?void 0:t.firstChild)===e})(n)?s.remove(e):s.remove(n)}else s.replace(d,n);else if(dN(n,o,!0))aN(n,"LI")?(s.insertAfter(d,lN(n)),d.appendChild(s.doc.createTextNode(" ")),d.appendChild(n)):i.insertBefore(d,n),s.remove(o);else if(dN(n,o,!1))s.insertAfter(d,lN(n)),s.remove(o);else{n=lN(n);const e=a.cloneRange();e.setStartAfter(o),e.setEndAfter(n);const t=e.extractContents();"LI"===r&&((e,t)=>e.firstChild&&"LI"===e.firstChild.nodeName)(t)?(d=t.firstChild,s.insertAfter(t,n)):(s.insertAfter(t,n),s.insertAfter(d,n)),s.remove(o)}eN(e,d)})(e,b,s,S,c);if(!(p||S!==e.getBody()&&mN(i,S)))return;const N=S.parentNode;let R;if(p)R=b(c),f.fold((()=>{bo(u,yn(R))}),(e=>{go(e,yn(R))})),e.selection.setCursorLocation(R,0);else if(jr(S))R=Yr(S),i.isEmpty(S)&&oN(S),rN(e,R),eN(e,R);else if(v(!1))R=w();else if(v(!0)&&N){R=N.insertBefore(b(),S);const t=yn(d.startContainer).dom.hasChildNodes()&&d.collapsed;eN(e,uN(S,"HR")||t?R:S)}else{const t=(e=>{const t=e.cloneRange();return t.setStart(e.startContainer,fN(!0,e.startContainer,e.startOffset)),t.setEnd(e.endContainer,fN(!1,e.endContainer,e.endOffset)),t})(d).cloneRange();t.setEndAfter(S);const n=t.extractContents();(e=>{V(Io(yn(e),Kt),(e=>{const t=e.dom;t.nodeValue=Fr(t.data)}))})(n),(e=>{let t=e;do{Jo(t)&&(t.data=t.data.replace(/^[\r\n]+/,"")),t=t.firstChild}while(t)})(n),R=n.firstChild,i.insertAfter(n,S),((e,t,n)=>{var o;const r=[];if(!n)return;let s=n;for(;s=s.firstChild;){if(e.isBlock(s))return;$o(s)&&!t[s.nodeName.toLowerCase()]&&r.push(s)}let a=r.length;for(;a--;)s=r[a],(!s.hasChildNodes()||s.firstChild===s.lastChild&&""===(null===(o=s.firstChild)||void 0===o?void 0:o.nodeValue)||cN(e,s))&&e.remove(s)})(i,l,R),((e,t)=>{t.normalize();const n=t.lastChild;(!n||$o(n)&&/^(left|right)$/gi.test(e.getStyle(n,"float",!0)))&&e.add(t,"br")})(i,S),i.isEmpty(S)&&oN(S),R.normalize(),i.isEmpty(R)?(i.remove(R),w()):(rN(e,R),eN(e,R))}i.setAttrib(R,"id",""),e.dispatch("NewBlock",{newBlock:R})},fakeEventName:"insertParagraph"},pN=(e,t,n)=>{const o=e.dom.createRng();n?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),e.selection.setRng(o),Zf(e,o)},hN=(e,t)=>{const n=bn("br");go(yn(t),n),e.undoManager.add()},bN=(e,t)=>{vN(e.getBody(),t)||po(yn(t),bn("br"));const n=bn("br");po(yn(t),n),pN(e,n.dom,!1),e.undoManager.add()},vN=(e,t)=>{return n=Li.after(t),!!rr(n.getNode())||bu(e,Li.after(t)).map((e=>rr(e.getNode()))).getOr(!1);var n},yN=e=>e&&"A"===e.nodeName&&"href"in e,CN=e=>e.fold(L,yN,yN,L),wN=(e,t)=>{t.fold(E,O(hN,e),O(bN,e),E)},xN={insert:(e,t)=>{const n=(e=>{const t=O(ah,e),n=Li.fromRangeStart(e.selection.getRng());return Wx(t,e.getBody(),n).filter(CN)})(e);n.isSome()?n.each(O(wN,e)):((e,t)=>{const n=e.selection,o=e.dom,r=n.getRng();let s,a=!1;Of(o,r).each((e=>{r.setStart(e.startContainer,e.startOffset),r.setEnd(e.endContainer,e.endOffset)}));let i=r.startOffset,l=r.startContainer;if($o(l)&&l.hasChildNodes()){const e=i>l.childNodes.length-1;l=l.childNodes[Math.min(i,l.childNodes.length-1)]||l,i=e&&Jo(l)?l.data.length:0}let d=o.getParent(l,o.isBlock);const c=d&&d.parentNode?o.getParent(d.parentNode,o.isBlock):null,u=c?c.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==u||m||(d=c),Jo(l)&&i>=l.data.length&&(((e,t,n)=>{const o=new zo(t,n);let r;const s=e.getNonEmptyElements();for(;r=o.next();)if(s[r.nodeName.toLowerCase()]||Jo(r)&&r.length>0)return!0;return!1})(e.schema,l,d||o.getRoot())||(s=o.create("br"),r.insertNode(s),r.setStartAfter(s),r.setEndAfter(s),a=!0)),s=o.create("br"),Ii(o,r,s),pN(e,s,a),e.undoManager.add()})(e,t)},fakeEventName:"insertLineBreak"},kN=(e,t)=>nN(e).filter((e=>t.length>0&&xn(yn(e),t))).isSome(),EN=al([{br:[]},{block:[]},{none:[]}]),SN=(e,t)=>(e=>kN(e,Tl(e)))(e),_N=e=>(t,n)=>(e=>nN(e).filter((e=>Nr(yn(e)))).isSome())(t)===e,NN=(e,t)=>(n,o)=>{const r=(e=>nN(e).fold(N(""),(e=>e.nodeName.toUpperCase())))(n)===e.toUpperCase();return r===t},RN=e=>{const t=tN(e.dom,e.selection.getStart());return y(t)},AN=e=>NN("pre",e),ON=e=>(t,n)=>_l(t)===e,TN=(e,t)=>(e=>kN(e,Ol(e)))(e),BN=(e,t)=>t,DN=e=>{const t=Nl(e),n=tN(e.dom,e.selection.getStart());return C(n)&&e.schema.isValidChild(n.nodeName,t)},PN=e=>{const t=e.selection.getRng(),n=yn(t.startContainer),o=In(n,t.startOffset).map((e=>Vt(e)&&!no(e)));return t.collapsed&&o.getOr(!0)},LN=(e,t)=>(n,o)=>X(e,((e,t)=>e&&t(n,o)),!0)?I.some(t):I.none(),MN=(e,t,n)=>{t.selection.isCollapsed()||(e=>{e.execCommand("delete")})(t),C(n)&&Y_(t,e.fakeEventName).isDefaultPrevented()||(e.insert(t,n),C(n)&&G_(t,e.fakeEventName))},IN=(e,t)=>{const n=()=>MN(xN,e,t),o=()=>MN(gN,e,t),r=((e,t)=>Mx([LN([SN],EN.none()),LN([AN(!0),RN],EN.none()),LN([NN("summary",!0)],EN.br()),LN([AN(!0),ON(!1),BN],EN.br()),LN([AN(!0),ON(!1)],EN.block()),LN([AN(!0),ON(!0),BN],EN.block()),LN([AN(!0),ON(!0)],EN.br()),LN([_N(!0),BN],EN.br()),LN([_N(!0)],EN.block()),LN([TN],EN.br()),LN([BN],EN.br()),LN([DN],EN.block()),LN([PN],EN.block())],[e,!(!t||!t.shiftKey)]).getOr(EN.none()))(e,t);switch(Al(e)){case"linebreak":r.fold(n,n,E);break;case"block":r.fold(o,o,E);break;case"invert":r.fold(o,n,E);break;default:r.fold(n,o,E)}},FN=xt(),UN=FN.os.isiOS()&&FN.browser.isSafari(),zN=(e,t)=>{var n;t.isDefaultPrevented()||(t.preventDefault(),(n=e.undoManager).typing&&(n.typing=!1,n.add()),e.undoManager.transact((()=>{IN(e,t)})))},jN=xt(),HN=e=>e.stopImmediatePropagation(),$N=e=>e.keyCode===ef.PAGE_UP||e.keyCode===ef.PAGE_DOWN,qN=(e,t,n)=>{n&&!e.get()?t.on("NodeChange",HN,!0):!n&&e.get()&&t.off("NodeChange",HN),e.set(n)},VN=(e,t)=>{const n=t.container(),o=t.offset();return Jo(n)?(n.insertData(o,e),I.some(Li(n,o+e.length))):Yc(t).map((n=>{const o=vn(e);return t.isAtEnd()?po(n,o):go(n,o),Li(o.dom,e.length)}))},WN=O(VN,pr),KN=O(VN," "),GN=e=>t=>{e.selection.setRng(t.toRange()),e.nodeChanged()},YN=e=>{const t=Li.fromRangeStart(e.selection.getRng()),n=yn(e.getBody());if(e.selection.isCollapsed()){const o=O(ah,e),r=Li.fromRangeStart(e.selection.getRng());return Wx(o,e.getBody(),r).bind((e=>t=>t.fold((t=>vu(e.dom,Li.before(t))),(e=>yu(e)),(e=>Cu(e)),(t=>bu(e.dom,Li.after(t)))))(n)).map((o=>()=>((e,t)=>n=>Fp(e,n)?WN(t):KN(t))(n,t)(o).each(GN(e))))}return I.none()},XN=e=>{return It(At.browser.isFirefox()&&e.selection.isEditable()&&(t=e.dom,n=e.selection.getRng().startContainer,t.isEditable(t.getParent(n,"summary"))),(()=>{const t=yn(e.getBody());e.selection.isCollapsed()||e.getDoc().execCommand("Delete"),((e,t)=>Fp(e,t)?WN(t):KN(t))(t,Li.fromRangeStart(e.selection.getRng())).each(GN(e))}));var t,n},QN=e=>ac(e)?[{keyCode:ef.TAB,action:zE(fS,e,!0)},{keyCode:ef.TAB,shiftKey:!0,action:zE(fS,e,!1)}]:[],JN=e=>{if(e.addShortcut("Meta+P","","mcePrint"),M_(e),MC(e))return Da(null);{const t=Hk(e);return(e=>{e.on("keyup compositionstart",O(RE,e))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();jE([{keyCode:ef.RIGHT,action:zE(TE,e,!0)},{keyCode:ef.LEFT,action:zE(TE,e,!1)},{keyCode:ef.UP,action:zE(BE,e,!1)},{keyCode:ef.DOWN,action:zE(BE,e,!0)},...o?[{keyCode:ef.UP,action:zE(PE,e,!1),metaKey:!0,shiftKey:!0},{keyCode:ef.DOWN,action:zE(PE,e,!0),metaKey:!0,shiftKey:!0}]:[],{keyCode:ef.RIGHT,action:zE(lS,e,!0)},{keyCode:ef.LEFT,action:zE(lS,e,!1)},{keyCode:ef.UP,action:zE(dS,e,!1)},{keyCode:ef.DOWN,action:zE(dS,e,!0)},{keyCode:ef.UP,action:zE(dS,e,!1)},{keyCode:ef.UP,action:zE(IE,e,!1)},{keyCode:ef.DOWN,action:zE(IE,e,!0)},{keyCode:ef.RIGHT,action:zE($E,e,!0)},{keyCode:ef.LEFT,action:zE($E,e,!1)},{keyCode:ef.UP,action:zE(qE,e,!1)},{keyCode:ef.DOWN,action:zE(qE,e,!0)},{keyCode:ef.RIGHT,action:zE(zk,e,t,!0)},{keyCode:ef.LEFT,action:zE(zk,e,t,!1)},{keyCode:ef.RIGHT,ctrlKey:!o,altKey:o,action:zE($k,e,t)},{keyCode:ef.LEFT,ctrlKey:!o,altKey:o,action:zE(qk,e,t)},{keyCode:ef.UP,action:zE(ME,e,!1)},{keyCode:ef.DOWN,action:zE(ME,e,!0)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{let n=!1;e.on("keydown",(o=>{n=o.keyCode===ef.BACKSPACE,o.isDefaultPrevented()||((e,t,n)=>{const o=n.keyCode===ef.BACKSPACE?"deleteContentBackward":"deleteContentForward",r=e.selection.isCollapsed(),s=r?"character":"selection",a=e=>r?e?"word":"line":"selection";HE([{keyCode:ef.BACKSPACE,action:zE(pE,e)},{keyCode:ef.BACKSPACE,action:zE(Ex,e,!1)},{keyCode:ef.DELETE,action:zE(Ex,e,!0)},{keyCode:ef.BACKSPACE,action:zE(hx,e,!1)},{keyCode:ef.DELETE,action:zE(hx,e,!0)},{keyCode:ef.BACKSPACE,action:zE(Gk,e,t,!1)},{keyCode:ef.DELETE,action:zE(Gk,e,t,!0)},{keyCode:ef.BACKSPACE,action:zE(qh,e,!1)},{keyCode:ef.DELETE,action:zE(qh,e,!0)},{keyCode:ef.BACKSPACE,action:zE(W_,e,!1,s)},{keyCode:ef.DELETE,action:zE(W_,e,!0,s)},...J_?[{keyCode:ef.BACKSPACE,altKey:!0,action:zE(W_,e,!1,a(!0))},{keyCode:ef.DELETE,altKey:!0,action:zE(W_,e,!0,a(!0))},{keyCode:ef.BACKSPACE,metaKey:!0,action:zE(W_,e,!1,a(!1))}]:[{keyCode:ef.BACKSPACE,ctrlKey:!0,action:zE(W_,e,!1,a(!0))},{keyCode:ef.DELETE,ctrlKey:!0,action:zE(W_,e,!0,a(!0))}],{keyCode:ef.BACKSPACE,action:zE(Sx,e,!1)},{keyCode:ef.DELETE,action:zE(Sx,e,!0)},{keyCode:ef.BACKSPACE,action:zE(iE,e,!1)},{keyCode:ef.DELETE,action:zE(iE,e,!0)},{keyCode:ef.BACKSPACE,action:zE(dx,e,!1)},{keyCode:ef.DELETE,action:zE(dx,e,!0)},{keyCode:ef.BACKSPACE,action:zE(ax,e,!1)},{keyCode:ef.DELETE,action:zE(ax,e,!0)},{keyCode:ef.BACKSPACE,action:zE(oE,e,!1)},{keyCode:ef.DELETE,action:zE(oE,e,!0)}],n).filter((t=>e.selection.isEditable())).each((t=>{n.preventDefault(),Y_(e,o).isDefaultPrevented()||(t(),G_(e,o))}))})(e,t,o)})),e.on("keyup",(t=>{t.isDefaultPrevented()||((e,t,n)=>{jE([{keyCode:ef.BACKSPACE,action:zE(kx,e)},{keyCode:ef.DELETE,action:zE(kx,e)},...J_?[{keyCode:ef.BACKSPACE,altKey:!0,action:zE(sE,e)},{keyCode:ef.DELETE,altKey:!0,action:zE(sE,e)},...n?[{keyCode:Z_?224:91,action:zE(sE,e)}]:[]]:[{keyCode:ef.BACKSPACE,ctrlKey:!0,action:zE(sE,e)},{keyCode:ef.DELETE,ctrlKey:!0,action:zE(sE,e)}]],t)})(e,t,n),n=!1}))})(e,t),(e=>{let t=I.none();e.on("keydown",(n=>{n.keyCode===ef.ENTER&&(UN&&(e=>{if(!e.collapsed)return!1;const t=e.startContainer;if(Jo(t)){const n=/^[\uAC00-\uD7AF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uD7B0-\uD7FF]$/,o=t.data.charAt(e.startOffset-1);return n.test(o)}return!1})(e.selection.getRng())?(e=>{t=I.some(e.selection.getBookmark()),e.undoManager.add()})(e):zN(e,n))})),e.on("keyup",(n=>{n.keyCode===ef.ENTER&&t.each((()=>((e,n)=>{e.undoManager.undo(),t.fold(E,(t=>e.selection.moveToBookmark(t))),zN(e,n),t=I.none()})(e,n)))}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{HE([{keyCode:ef.SPACEBAR,action:zE(YN,e)},{keyCode:ef.SPACEBAR,action:zE(XN,e)}],t).each((n=>{t.preventDefault(),Y_(e,"insertText",{data:" "}).isDefaultPrevented()||(n(),G_(e,"insertText",{data:" "}))}))})(e,t)}))})(e),(e=>{e.on("input",(t=>{t.isComposing||(e=>{const t=yn(e.getBody());e.selection.isCollapsed()&&Wp(t,Li.fromRangeStart(e.selection.getRng())).each((t=>{e.selection.setRng(t.toRange())}))})(e)}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{jE([...QN(e)],t).each((e=>{t.preventDefault()}))})(e,t)}))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();jE([{keyCode:ef.END,action:zE(DE,e,!0)},{keyCode:ef.HOME,action:zE(DE,e,!1)},...o?[]:[{keyCode:ef.HOME,action:zE(PE,e,!1),ctrlKey:!0,shiftKey:!0},{keyCode:ef.END,action:zE(PE,e,!0),ctrlKey:!0,shiftKey:!0}],{keyCode:ef.END,action:zE(VE,e,!0)},{keyCode:ef.HOME,action:zE(VE,e,!1)},{keyCode:ef.END,action:zE(Vk,e,!0,t)},{keyCode:ef.HOME,action:zE(Vk,e,!1,t)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{if(jN.os.isMacOS())return;const n=Da(!1);e.on("keydown",(t=>{$N(t)&&qN(n,e,!0)})),e.on("keyup",(o=>{o.isDefaultPrevented()||((e,t,n)=>{jE([{keyCode:ef.PAGE_UP,action:zE(Vk,e,!1,t)},{keyCode:ef.PAGE_DOWN,action:zE(Vk,e,!0,t)}],n)})(e,t,o),$N(o)&&n.get()&&(qN(n,e,!1),e.nodeChanged())}))})(e,t),t}};class ZN{constructor(e){let t;this.lastPath=[],this.editor=e;const n=this;"onselectionchange"in e.getDoc()||e.on("NodeChange click mouseup keyup focus",(n=>{const o=e.selection.getRng(),r={startContainer:o.startContainer,startOffset:o.startOffset,endContainer:o.endContainer,endOffset:o.endOffset};"nodechange"!==n.type&&kf(r,t)||e.dispatch("SelectionChange"),t=r})),e.on("contextmenu",(()=>{e.dispatch("SelectionChange")})),e.on("SelectionChange",(()=>{const t=e.selection.getStart(!0);t&&tm(e)&&!n.isSameElementPath(t)&&e.dom.isChildOf(t,e.getBody())&&e.nodeChanged({selectionChange:!0})})),e.on("mouseup",(t=>{!t.isDefaultPrevented()&&tm(e)&&("IMG"===e.selection.getNode().nodeName?mg.setEditorTimeout(e,(()=>{e.nodeChanged()})):e.nodeChanged())}))}nodeChanged(e={}){const t=this.editor.selection;let n;if(this.editor.initialized&&t&&!wd(this.editor)&&!this.editor.mode.isReadOnly()){const o=this.editor.getBody();n=t.getStart(!0)||o,n.ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(n,o)||(n=o);const r=[];this.editor.dom.getParent(n,(e=>e===o||(r.push(e),!1))),this.editor.dispatch("NodeChange",{...e,element:n,parents:r})}}isSameElementPath(e){let t;const n=this.editor,o=oe(n.dom.getParents(e,M,n.getBody()));if(o.length===this.lastPath.length){for(t=o.length;t>=0&&o[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=o,!0}return this.lastPath=o,!1}}const eR=ti("image"),tR=ti("event"),nR=e=>t=>{t[tR]=e},oR=nR(0),rR=nR(2),sR=nR(1),aR=(0,e=>{const t=e;return I.from(t[tR]).exists((e=>0===e))});const iR=ti("mode"),lR=e=>t=>{t[iR]=e},dR=(e,t)=>lR(t)(e),cR=lR(0),uR=lR(2),mR=lR(1),fR=e=>t=>{const n=t;return I.from(n[iR]).exists((t=>t===e))},gR=fR(0),pR=fR(1),hR=["none","copy","link","move"],bR=["none","copy","copyLink","copyMove","link","linkMove","move","all","uninitialized"],vR=()=>{const e=new window.DataTransfer;let t="move",n="all";const o={get dropEffect(){return t},set dropEffect(e){H(hR,e)&&(t=e)},get effectAllowed(){return n},set effectAllowed(e){aR(o)&&H(bR,e)&&(n=e)},get items(){return((e,t)=>({...t,get length(){return t.length},add:(n,o)=>{if(gR(e)){if(!m(n))return t.add(n);if(!v(o))return t.add(n,o)}return null},remove:n=>{gR(e)&&t.remove(n)},clear:()=>{gR(e)&&t.clear()}}))(o,e.items)},get files(){return pR(o)?Object.freeze({length:0,item:e=>null}):e.files},get types(){return e.types},setDragImage:(t,n,r)=>{var s;gR(o)&&(s={image:t,x:n,y:r},o[eR]=s,e.setDragImage(t,n,r))},getData:t=>pR(o)?"":e.getData(t),setData:(t,n)=>{gR(o)&&e.setData(t,n)},clearData:t=>{gR(o)&&e.clearData(t)}};return cR(o),o},yR=(e,t)=>e.setData("text/html",t),CR="x-tinymce/html",wR=N(CR),xR="\x3c!-- "+CR+" --\x3e",kR=e=>xR+e,ER=e=>-1!==e.indexOf(xR),SR="%MCEPASTEBIN%",_R=e=>e.dom.get("mcepastebin"),NR=e=>C(e)&&"mcepastebin"===e.id,RR=e=>e===SR,AR=(e,t)=>(Dt.each(t,(t=>{e=u(t,RegExp)?e.replace(t,""):e.replace(t[0],t[1])})),e),OR=e=>AR(e,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,(e,t,n)=>t||n?pr:" "],/<br class="Apple-interchange-newline">/g,/<br>$/i]),TR=(e,t)=>({content:e,cancelled:t}),BR=(e,t)=>(e.insertContent(t,{merge:Vd(e),paste:!0}),!0),DR=e=>/^https?:\/\/[\w\-\/+=.,!;:&%@^~(){}?#]+$/i.test(e),PR=(e,t,n)=>!(e.selection.isCollapsed()||!DR(t))&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.execCommand("mceInsertLink",!1,t)})),!0))(e,t,n),LR=(e,t,n)=>!!((e,t)=>DR(t)&&$(sc(e),(e=>$e(t.toLowerCase(),`.${e.toLowerCase()}`))))(e,t)&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.insertContent('<img src="'+t+'">')})),!0))(e,t,n),MR=(e=>{let t=0;return()=>"mceclip"+t++})(),IR=e=>{const t=vR();return yR(t,e),uR(t),t},FR=(e,t,n,o,r)=>{const s=((e,t,n)=>((e,t,n)=>{const o=((e,t,n)=>e.dispatch("PastePreProcess",{content:t,internal:n}))(e,t,n),r=((e,t)=>{const n=oC({sanitize:oc(e)},e.schema);n.addNodeFilter("meta",(e=>{Dt.each(e,(e=>{e.remove()}))}));const o=n.parse(t,{forced_root_block:!1,isRootContent:!0});return Xg({validate:!0},e.schema).serialize(o)})(e,o.content);return e.hasEventListeners("PastePostProcess")&&!o.isDefaultPrevented()?((e,t,n)=>{const o=e.dom.create("div",{style:"display:none"},t),r=((e,t,n)=>e.dispatch("PastePostProcess",{node:t,internal:n}))(e,o,n);return TR(r.node.innerHTML,r.isDefaultPrevented())})(e,r,n):TR(r,o.isDefaultPrevented())})(e,t,n))(e,t,n);if(!s.cancelled){const t=s.content,n=()=>((e,t,n)=>{n||!Wd(e)?BR(e,t):((e,t)=>{Dt.each([PR,LR,BR],(n=>!n(e,t,BR)))})(e,t)})(e,t,o);r?Y_(e,"insertFromPaste",{dataTransfer:IR(t)}).isDefaultPrevented()||(n(),G_(e,"insertFromPaste")):n()}},UR=(e,t,n,o)=>{const r=n||ER(t);FR(e,(e=>e.replace(xR,""))(t),r,!1,o)},zR=(e,t,n)=>{const o=e.dom.encode(t).replace(/\r\n/g,"\n"),r=((e,t,n)=>{const o=e.split(/\n\n/),r=((e,t)=>{let n="<"+e;const o=Ce(t,((e,t)=>t+'="'+Zs.encodeAllRaw(e)+'"'));return o.length&&(n+=" "+o.join(" ")),n+">"})(t,n),s="</"+t+">",a=q(o,(e=>e.split(/\n/).join("<br />")));return 1===a.length?a[0]:q(a,(e=>r+e+s)).join("")})(ms(o,Gd(e)),Nl(e),Rl(e));FR(e,r,!1,!0,n)},jR=e=>{const t={};if(e&&e.types)for(let n=0;n<e.types.length;n++){const o=e.types[n];try{t[o]=e.getData(o)}catch(e){t[o]=""}}return t},HR=(e,t)=>t in e&&e[t].length>0,$R=e=>HR(e,"text/html")||HR(e,"text/plain"),qR=(e,t,n)=>{const o="paste"===t.type?t.clipboardData:t.dataTransfer;var r;if(Ud(e)&&o){const s=((e,t)=>{const n=t.items?te(ce(t.items),(e=>"file"===e.kind?[e.getAsFile()]:[])):[],o=t.files?ce(t.files):[];return G(n.length>0?n:o,(e=>{const t=sc(e);return e=>He(e.type,"image/")&&$(t,(t=>(e=>{const t=e.toLowerCase(),n={jpg:"jpeg",jpe:"jpeg",jfi:"jpeg",jif:"jpeg",jfif:"jpeg",pjpeg:"jpeg",pjp:"jpeg",svg:"svg+xml"};return Dt.hasOwn(n,t)?"image/"+n[t]:"image/"+t})(t)===e.type))})(e))})(e,o);if(s.length>0)return t.preventDefault(),(r=s,Promise.all(q(r,(e=>Pv(e).then((t=>({file:e,uri:t}))))))).then((t=>{n&&e.selection.setRng(n),V(t,(t=>{((e,t)=>{Bv(t.uri).each((({data:n,type:o,base64Encoded:r})=>{const s=r?n:btoa(n),a=t.file,i=e.editorUpload.blobCache,l=i.getByData(s,o),d=null!=l?l:((e,t,n,o)=>{const r=MR(),s=Ll(e)&&C(n.name),a=s?((e,t)=>{const n=t.match(/([\s\S]+?)(?:\.[a-z0-9.]+)$/i);return C(n)?e.dom.encode(n[1]):void 0})(e,n.name):r,i=s?n.name:void 0,l=t.create(r,n,o,a,i);return t.add(l),l})(e,i,a,s);UR(e,`<img src="${d.blobUri()}">`,!1,!0)}))})(e,t)}))})),!0}return!1},VR=(e,t,n,o,r)=>{let s=OR(n);const a=HR(t,wR())||ER(n),i=!a&&(e=>!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(e))(s),l=DR(s);(RR(s)||!s.length||i&&!l)&&(o=!0),(o||l)&&(s=HR(t,"text/plain")&&i?t["text/plain"]:(e=>{const t=ca(),n=oC({},t);let o="";const r=t.getVoidElements(),s=Dt.makeMap("script noscript style textarea video audio iframe object"," "),a=t.getBlockElements(),i=e=>{const n=e.name,l=e;if("br"!==n){if("wbr"!==n)if(r[n]&&(o+=" "),s[n])o+=" ";else{if(3===e.type&&(o+=e.value),!(e.name in t.getVoidElements())){let t=e.firstChild;if(t)do{i(t)}while(t=t.next)}a[n]&&l.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"};return e=AR(e,[/<!\[[^\]]+\]>/g]),i(n.parse(e)),o})(s)),RR(s)||(o?zR(e,s,r):UR(e,s,a,r))},WR=(e,t,n)=>{((e,t,n)=>{let o;e.on("keydown",(e=>{(e=>ef.metaKeyPressed(e)&&86===e.keyCode||e.shiftKey&&45===e.keyCode)(e)&&!e.isDefaultPrevented()&&(o=e.shiftKey&&86===e.keyCode)})),e.on("paste",(r=>{if(r.isDefaultPrevented()||(e=>{var t,n;return At.os.isAndroid()&&0===(null===(n=null===(t=e.clipboardData)||void 0===t?void 0:t.items)||void 0===n?void 0:n.length)})(r))return;const s="text"===n.get()||o;o=!1;const a=jR(r.clipboardData);!$R(a)&&qR(e,r,t.getLastRng()||e.selection.getRng())||(HR(a,"text/html")?(r.preventDefault(),VR(e,a,a["text/html"],s,!0)):HR(a,"text/plain")&&HR(a,"text/uri-list")?(r.preventDefault(),VR(e,a,a["text/plain"],s,!0)):(t.create(),mg.setEditorTimeout(e,(()=>{const n=t.getHtml();t.remove(),VR(e,a,n,s,!1)}),0)))}))})(e,t,n),(e=>{const t=e=>He(e,"webkit-fake-url"),n=e=>He(e,"data:");e.parser.addNodeFilter("img",((o,r,s)=>{if(!Ud(e)&&(e=>{var t;return!0===(null===(t=e.data)||void 0===t?void 0:t.paste)})(s))for(const r of o){const o=r.attr("src");m(o)&&!r.attr("data-mce-object")&&o!==At.transparentSrc&&(t(o)||!Yd(e)&&n(o))&&r.remove()}}))})(e)},KR=(e,t,n,o)=>{((e,t,n)=>{if(!e)return!1;try{return e.clearData(),e.setData("text/html",t),e.setData("text/plain",n),e.setData(wR(),t),!0}catch(e){return!1}})(e.clipboardData,t.html,t.text)?(e.preventDefault(),o()):n(t.html,o)},GR=e=>(t,n)=>{const{dom:o,selection:r}=e,s=o.create("div",{contenteditable:"false","data-mce-bogus":"all"}),a=o.create("div",{contenteditable:"true"},t);o.setStyles(s,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),s.appendChild(a),o.add(e.getBody(),s);const i=r.getRng();a.focus();const l=o.createRng();l.selectNodeContents(a),r.setRng(l),mg.setEditorTimeout(e,(()=>{r.setRng(i),o.remove(s),n()}),0)},YR=e=>({html:kR(e.selection.getContent({contextual:!0})),text:e.selection.getContent({format:"text"})}),XR=e=>!e.selection.isCollapsed()||(e=>!!e.dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody()))(e),QR=(e,t)=>{var n,o;return Df.getCaretRangeFromPoint(null!==(n=t.clientX)&&void 0!==n?n:0,null!==(o=t.clientY)&&void 0!==o?o:0,e.getDoc())},JR=(e,t)=>{e.focus(),t&&e.selection.setRng(t)},ZR=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,eA=e=>Dt.trim(e).replace(ZR,Wu).toLowerCase(),tA=(e,t,n)=>{const o=$d(e);if(n||"all"===o||!qd(e))return t;const r=o?o.split(/[, ]/):[];if(r&&"none"!==o){const n=e.dom,o=e.selection.getNode();t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,((e,t,s,a)=>{const i=n.parseStyle(n.decode(s)),l={};for(let e=0;e<r.length;e++){const t=i[r[e]];let s=t,a=n.getStyle(o,r[e],!0);/color/.test(r[e])&&(s=eA(s),a=eA(a)),a!==s&&(l[r[e]]=t)}const d=n.serializeStyle(l,"span");return d?t+' style="'+d+'"'+a:t+a}))}else t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return t=t.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,((e,t,n,o)=>t+' style="'+n+'"'+o)),t},nA=e=>{const t=Da(!1),n=Da(Kd(e)?"text":"html"),o=(e=>{const t=Da(null);return{create:()=>((e,t)=>{const{dom:n,selection:o}=e,r=e.getBody();t.set(o.getRng());const s=n.add(e.getBody(),"div",{id:"mcepastebin",class:"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},SR);At.browser.isFirefox()&&n.setStyle(s,"left","rtl"===n.getStyle(r,"direction",!0)?65535:-65535),n.bind(s,"beforedeactivate focusin focusout",(e=>{e.stopPropagation()})),s.focus(),o.select(s,!0)})(e,t),remove:()=>((e,t)=>{const n=e.dom;if(_R(e)){let o;const r=t.get();for(;o=_R(e);)n.remove(o),n.unbind(o);r&&e.selection.setRng(r)}t.set(null)})(e,t),getEl:()=>_R(e),getHtml:()=>(e=>{const t=e.dom,n=(e,n)=>{e.appendChild(n),t.remove(n,!0)},[o,...r]=G(e.getBody().childNodes,NR);V(r,(e=>{n(o,e)}));const s=t.select("div[id=mcepastebin]",o);for(let e=s.length-1;e>=0;e--){const r=t.create("div");o.insertBefore(r,s[e]),n(r,s[e])}return o?o.innerHTML:""})(e),getLastRng:t.get}})(e);(e=>{(At.browser.isChromium()||At.browser.isSafari())&&((e,t)=>{e.on("PastePreProcess",(n=>{n.content=t(e,n.content,n.internal)}))})(e,tA)})(e),((e,t)=>{e.addCommand("mceTogglePlainTextPaste",(()=>{((e,t)=>{"text"===t.get()?(t.set("html"),Zm(e,!1)):(t.set("text"),Zm(e,!0)),e.focus()})(e,t)})),e.addCommand("mceInsertClipboardContent",((t,n)=>{n.html&&UR(e,n.html,n.internal,!1),n.text&&zR(e,n.text,!1)}))})(e,n),(e=>{const t=t=>n=>{t(e,n)},n=zd(e);w(n)&&e.on("PastePreProcess",t(n));const o=jd(e);w(o)&&e.on("PastePostProcess",t(o))})(e),e.on("PreInit",(()=>{(e=>{e.on("cut",(e=>t=>{!t.isDefaultPrevented()&&XR(e)&&KR(t,YR(e),GR(e),(()=>{if(At.browser.isChromium()||At.browser.isFirefox()){const t=e.selection.getRng();mg.setEditorTimeout(e,(()=>{e.selection.setRng(t),e.execCommand("Delete")}),0)}else e.execCommand("Delete")}))})(e)),e.on("copy",(e=>t=>{!t.isDefaultPrevented()&&XR(e)&&KR(t,YR(e),GR(e),E)})(e))})(e),((e,t)=>{Fd(e)&&e.on("dragend dragover draggesture dragdrop drop drag",(e=>{e.preventDefault(),e.stopPropagation()})),Ud(e)||e.on("drop",(e=>{const t=e.dataTransfer;t&&(e=>$(e.files,(e=>/^image\//.test(e.type))))(t)&&e.preventDefault()})),e.on("drop",(n=>{if(n.isDefaultPrevented())return;const o=QR(e,n);if(y(o))return;const r=jR(n.dataTransfer),s=HR(r,wR());if((!$R(r)||(e=>{const t=e["text/plain"];return!!t&&0===t.indexOf("file://")})(r))&&qR(e,n,o))return;const a=r[wR()],i=a||r["text/html"]||r["text/plain"],l=((e,t,n,o)=>{const r=e.getParent(n,(e=>As(t,e)));if(!h(e.getParent(n,"summary")))return!0;if(r&&ke(o,"text/html")){const e=(new DOMParser).parseFromString(o["text/html"],"text/html").body;return!h(e.querySelector(r.nodeName.toLowerCase()))}return!1})(e.dom,e.schema,o.startContainer,r),d=t.get();d&&!l||i&&(n.preventDefault(),mg.setEditorTimeout(e,(()=>{e.undoManager.transact((()=>{(a||d&&l)&&e.execCommand("Delete"),JR(e,o);const t=OR(i);r["text/html"]?UR(e,t,s,!0):zR(e,t,!0)}))})))})),e.on("dragstart",(e=>{t.set(!0)})),e.on("dragover dragend",(n=>{Ud(e)&&!t.get()&&(n.preventDefault(),JR(e,QR(e,n))),"dragend"===n.type&&t.set(!1)})),(e=>{e.on("input",(t=>{const n=e=>h(e.querySelector("summary"));if("deleteByDrag"===t.inputType){const t=G(e.dom.select("details"),n);V(t,(t=>{rr(t.firstChild)&&t.firstChild.remove();const n=e.dom.create("summary");n.appendChild(Dr().dom),t.prepend(n)}))}}))})(e)})(e,t),WR(e,o,n)}))},oA=rr,rA=Jo,sA=e=>ir(e.dom),aA=e=>t=>En(yn(e),t),iA=(e,t)=>Jn(yn(e),sA,aA(t)),lA=(e,t,n)=>{const o=new zo(e,t),r=n?o.next.bind(o):o.prev.bind(o);let s=e;for(let t=n?e:r();t&&!oA(t);t=r())ss(t)&&(s=t);return s},dA=e=>{const t=((e,t)=>{const n=Li.fromRangeStart(e).getNode(),o=((e,t)=>Jn(yn(e),(e=>(e=>ar(e.dom))(e)||xr(e)),aA(t)).getOr(yn(t)).dom)(n,t),r=lA(n,o,!1),s=lA(n,o,!0),a=document.createRange();return iA(r,o).fold((()=>{rA(r)?a.setStart(r,0):a.setStartBefore(r)}),(e=>a.setStartBefore(e.dom))),iA(s,o).fold((()=>{rA(s)?a.setEnd(s,s.data.length):a.setEndAfter(s)}),(e=>a.setEndAfter(e.dom))),a})(e.selection.getRng(),e.getBody());e.selection.setRng(sb(t))};var cA;!function(e){e.Before="before",e.After="after"}(cA||(cA={}));const uA=(e,t)=>Math.abs(e.left-t),mA=(e,t)=>Math.abs(e.right-t),fA=(e,t)=>(e=>X(e,((e,t)=>e.fold((()=>I.some(t)),(e=>{const n=Math.min(t.left,e.left),o=Math.min(t.top,e.top),r=Math.max(t.right,e.right),s=Math.max(t.bottom,e.bottom);return I.some({top:o,right:r,bottom:s,left:n,width:r-n,height:s-o})}))),I.none()))(G(e,(e=>{return(n=t)>=(o=e).top&&n<=o.bottom;var n,o}))).fold((()=>[[],e]),(t=>{const{pass:n,fail:o}=K(e,(e=>((e,t)=>{const n=((e,t)=>Math.max(0,Math.min(e.bottom,t.bottom)-Math.max(e.top,t.top)))(e,t)/Math.min(e.height,t.height);return((e,t)=>e.top<t.bottom&&e.bottom>t.top)(e,t)&&n>.5})(e,t)));return[n,o]})),gA=(e,t,n)=>t>e.left&&t<e.right?0:Math.min(Math.abs(e.left-t),Math.abs(e.right-t)),pA=(e,t,n)=>{const o=e=>ss(e.node)?I.some(e):$o(e.node)?pA(ce(e.node.childNodes),t,n):I.none(),r=(e,r)=>{const s=ae(e,((e,o)=>r(e,t,n)-r(o,t,n)));return((e,r)=>{if(e.length>=2){const s=o(e[0]).getOr(e[0]),a=o(e[1]).getOr(e[1]);if(Math.abs(r(s,t,n)-r(a,t,n))<2){if(Jo(s.node))return I.some(s);if(Jo(a.node))return I.some(a)}}return I.none()})(s,r).orThunk((()=>ue(s,o)))},[s,a]=fA(xk(e),n),{pass:i,fail:l}=K(a,(e=>e.top<n));return r(s,gA).orThunk((()=>r(l,fi))).orThunk((()=>r(i,fi)))},hA=(e,t,n)=>((e,t,n)=>{const o=yn(e),r=Nn(o),s=Cn(r,t,n).filter((e=>Sn(o,e))).getOr(o);return((e,t,n,o)=>{const r=(t,s)=>{const a=G(t.dom.childNodes,T((e=>$o(e)&&e.classList.contains("mce-drag-container"))));return s.fold((()=>pA(a,n,o)),(e=>{const t=G(a,(t=>t!==e.dom));return pA(t,n,o)})).orThunk((()=>(En(t,e)?I.none():On(t)).bind((e=>r(e,I.some(t))))))};return r(t,I.none())})(o,s,t,n)})(e,t,n).filter((e=>Ec(e.node))).map((e=>((e,t)=>({node:e.node,position:uA(e,t)<mA(e,t)?cA.Before:cA.After}))(e,t))),bA=e=>{var t,n;const o=e.getBoundingClientRect(),r=e.ownerDocument,s=r.documentElement,a=r.defaultView;return{top:o.top+(null!==(t=null==a?void 0:a.scrollY)&&void 0!==t?t:0)-s.clientTop,left:o.left+(null!==(n=null==a?void 0:a.scrollX)&&void 0!==n?n:0)-s.clientLeft}},vA=e=>({target:e,srcElement:e}),yA=(e,t,n,o)=>{const r=((e,t)=>{const n=(e=>{const t=vR(),n=(e=>{const t=e;return I.from(t[iR])})(e);return uR(e),oR(t),t.dropEffect=e.dropEffect,t.effectAllowed=e.effectAllowed,(e=>{const t=e;return I.from(t[eR])})(e).each((e=>t.setDragImage(e.image,e.x,e.y))),V(e.types,(n=>{"Files"!==n&&t.setData(n,e.getData(n))})),V(e.files,(e=>t.items.add(e))),(e=>{const t=e;return I.from(t[tR])})(e).each((e=>{((e,t)=>{nR(t)(e)})(t,e)})),n.each((n=>{dR(e,n),dR(t,n)})),t})(e);return"dragstart"===t?(oR(n),cR(n)):"drop"===t?(rR(n),uR(n)):(sR(n),mR(n)),n})(n,e);return v(o)?((e,t,n)=>{const o=B("Function not supported on simulated event.");return{bubbles:!0,cancelBubble:!1,cancelable:!0,composed:!1,currentTarget:null,defaultPrevented:!1,eventPhase:0,isTrusted:!0,returnValue:!1,timeStamp:0,type:e,composedPath:o,initEvent:o,preventDefault:E,stopImmediatePropagation:E,stopPropagation:E,AT_TARGET:window.Event.AT_TARGET,BUBBLING_PHASE:window.Event.BUBBLING_PHASE,CAPTURING_PHASE:window.Event.CAPTURING_PHASE,NONE:window.Event.NONE,altKey:!1,button:0,buttons:0,clientX:0,clientY:0,ctrlKey:!1,metaKey:!1,movementX:0,movementY:0,offsetX:0,offsetY:0,pageX:0,pageY:0,relatedTarget:null,screenX:0,screenY:0,shiftKey:!1,x:0,y:0,detail:0,view:null,which:0,initUIEvent:o,initMouseEvent:o,getModifierState:o,dataTransfer:n,...vA(t)}})(e,t,r):((e,t,n,o)=>({...t,dataTransfer:o,type:e,...vA(n)}))(e,o,t,r)},CA=ir,wA=((...e)=>t=>{for(let n=0;n<e.length;n++)if(e[n](t))return!0;return!1})(CA,ar),xA=(e,t,n,o)=>{const r=e.dom,s=t.cloneNode(!0);r.setStyles(s,{width:n,height:o}),r.setAttrib(s,"data-mce-selected",null);const a=r.create("div",{class:"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return r.setStyles(a,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:o}),r.setStyles(s,{margin:0,boxSizing:"border-box"}),a.appendChild(s),a},kA=(e,t)=>n=>()=>{const o="left"===e?n.scrollX:n.scrollY;n.scroll({[e]:o+t,behavior:"smooth"})},EA=kA("left",-32),SA=kA("left",32),_A=kA("top",-32),NA=kA("top",32),RA=e=>{e&&e.parentNode&&e.parentNode.removeChild(e)},AA=(e,t,n,o,r)=>{"dragstart"===t&&yR(o,e.dom.getOuterHTML(n));const s=yA(t,n,o,r);return e.dispatch(t,s)},OA=(e,t)=>{const n=ja(((e,n)=>((e,t,n)=>{e._selectionOverrides.hideFakeCaret(),hA(e.getBody(),t,n).fold((()=>e.selection.placeCaretAt(t,n)),(o=>{const r=e._selectionOverrides.showCaret(1,o.node,o.position===cA.Before,!1);r?e.selection.setRng(r):e.selection.placeCaretAt(t,n)}))})(t,e,n)),0);t.on("remove",n.cancel);const o=e;return r=>e.on((e=>{const s=Math.max(Math.abs(r.screenX-e.screenX),Math.abs(r.screenY-e.screenY));if(!e.dragging&&s>10){const n=AA(t,"dragstart",e.element,e.dataTransfer,r);if(C(n.dataTransfer)&&(e.dataTransfer=n.dataTransfer),n.isDefaultPrevented())return;e.dragging=!0,t.focus()}if(e.dragging){const s=r.currentTarget===t.getDoc().documentElement,l=((e,t)=>({pageX:t.pageX-e.relX,pageY:t.pageY+5}))(e,((e,t)=>{return n=(e=>e.inline?bA(e.getBody()):{left:0,top:0})(e),o=(e=>{const t=e.getBody();return e.inline?{left:t.scrollLeft,top:t.scrollTop}:{left:0,top:0}})(e),r=((e,t)=>{if(t.target.ownerDocument!==e.getDoc()){const n=bA(e.getContentAreaContainer()),o=(e=>{const t=e.getBody(),n=e.getDoc().documentElement,o={left:t.scrollLeft,top:t.scrollTop},r={left:t.scrollLeft||n.scrollLeft,top:t.scrollTop||n.scrollTop};return e.inline?o:r})(e);return{left:t.pageX-n.left+o.left,top:t.pageY-n.top+o.top}}return{left:t.pageX,top:t.pageY}})(e,t),{pageX:r.left-n.left+o.left,pageY:r.top-n.top+o.top};var n,o,r})(t,r));a=e.ghost,i=t.getBody(),a.parentNode!==i&&i.appendChild(a),((e,t,n,o,r,s,a,i,l,d,c,u)=>{let m=0,f=0;e.style.left=t.pageX+"px",e.style.top=t.pageY+"px",t.pageX+n>r&&(m=t.pageX+n-r),t.pageY+o>s&&(f=t.pageY+o-s),e.style.width=n-m+"px",e.style.height=o-f+"px";const g=l.clientHeight,p=l.clientWidth,h=a+l.getBoundingClientRect().top,b=i+l.getBoundingClientRect().left;c.on((e=>{e.intervalId.clear(),e.dragging&&u&&(a+8>=g?e.intervalId.set(NA(d)):a-8<=0?e.intervalId.set(_A(d)):i+8>=p?e.intervalId.set(SA(d)):i-8<=0?e.intervalId.set(EA(d)):h+16>=window.innerHeight?e.intervalId.set(NA(window)):h-16<=0?e.intervalId.set(_A(window)):b+16>=window.innerWidth?e.intervalId.set(SA(window)):b-16<=0&&e.intervalId.set(EA(window)))}))})(e.ghost,l,e.width,e.height,e.maxX,e.maxY,r.clientY,r.clientX,t.getContentAreaContainer(),t.getWin(),o,s),n.throttle(r.clientX,r.clientY)}var a,i}))},TA=(e,t,n)=>{e.on((e=>{e.intervalId.clear(),e.dragging&&n.fold((()=>AA(t,"dragend",e.element,e.dataTransfer)),(n=>AA(t,"dragend",e.element,e.dataTransfer,n)))})),BA(e)},BA=e=>{e.on((e=>{e.intervalId.clear(),RA(e.ghost)})),e.clear()},DA=e=>{const t=za(),n=Oa.DOM,o=document,r=((e,t)=>n=>{if((e=>0===e.button)(n)){const o=J(t.dom.getParents(n.target),wA).getOr(null);if(C(o)&&((e,t,n)=>CA(n)&&n!==t&&e.isEditable(n.parentElement))(t.dom,t.getBody(),o)){const r=t.dom.getPos(o),s=t.getBody(),a=t.getDoc().documentElement;e.set({element:o,dataTransfer:vR(),dragging:!1,screenX:n.screenX,screenY:n.screenY,maxX:(t.inline?s.scrollWidth:a.offsetWidth)-2,maxY:(t.inline?s.scrollHeight:a.offsetHeight)-2,relX:n.pageX-r.x,relY:n.pageY-r.y,width:o.offsetWidth,height:o.offsetHeight,ghost:xA(t,o,o.offsetWidth,o.offsetHeight),intervalId:Ua(100)})}}})(t,e),s=OA(t,e),a=((e,t)=>n=>{e.on((e=>{var o;if(e.intervalId.clear(),e.dragging){if(((e,t,n)=>!y(t)&&t!==n&&!e.dom.isChildOf(t,n)&&e.dom.isEditable(t))(t,(e=>{const t=e.getSel();if(C(t)){const e=t.getRangeAt(0).startContainer;return Jo(e)?e.parentNode:e}return null})(t.selection),e.element)){const r=null!==(o=t.getDoc().elementFromPoint(n.clientX,n.clientY))&&void 0!==o?o:t.getBody();AA(t,"drop",r,e.dataTransfer,n).isDefaultPrevented()||t.undoManager.transact((()=>{((e,t)=>{const n=e.getParent(t.parentNode,e.isBlock);RA(t),n&&n!==e.getRoot()&&e.isEmpty(n)&&Pr(yn(n))})(t.dom,e.element),(e=>{const t=e.getData("text/html");return""===t?I.none():I.some(t)})(e.dataTransfer).each((e=>t.insertContent(e))),t._selectionOverrides.hideFakeCaret()}))}AA(t,"dragend",t.getBody(),e.dataTransfer,n)}})),BA(e)})(t,e),i=((e,t)=>n=>TA(e,t,I.some(n)))(t,e);e.on("mousedown",r),e.on("mousemove",s),e.on("mouseup",a),n.bind(o,"mousemove",s),n.bind(o,"mouseup",i),e.on("remove",(()=>{n.unbind(o,"mousemove",s),n.unbind(o,"mouseup",i)})),e.on("keydown",(n=>{n.keyCode===ef.ESC&&TA(t,e,I.none())}))},PA=ir,LA=(e,t)=>Vh(e.getBody(),t),MA=e=>{const t=e.selection,n=e.dom,o=e.getBody(),r=wc(e,o,n.isBlock,(()=>xg(e))),s="sel-"+n.uniqueId(),a="data-mce-selected";let i;const l=e=>e!==o&&(PA(e)||cr(e))&&n.isChildOf(e,o)&&n.isEditable(e.parentNode),d=(n,o,s,a=!0)=>e.dispatch("ShowCaret",{target:o,direction:n,before:s}).isDefaultPrevented()?null:(a&&t.scrollIntoView(o,-1===n),r.show(s,o)),c=e=>$r(e)||Kr(e)||Gr(e),u=e=>c(e.startContainer)||c(e.endContainer),m=t=>{const o=e.schema.getVoidElements(),r=n.createRng(),s=t.startContainer,a=t.startOffset,i=t.endContainer,l=t.endOffset;return ke(o,s.nodeName.toLowerCase())?0===a?r.setStartBefore(s):r.setStartAfter(s):r.setStart(s,a),ke(o,i.nodeName.toLowerCase())?0===l?r.setEndBefore(i):r.setEndAfter(i):r.setEnd(i,l),r},f=(r,c)=>{if(!r)return null;if(r.collapsed){if(!u(r)){const e=c?1:-1,t=Gc(e,o,r),s=t.getNode(!c);if(C(s)){if(Ec(s))return d(e,s,!!c&&!t.isAtEnd(),!1);if(Hr(s)&&ir(s.nextSibling)){const e=n.createRng();return e.setStart(s,0),e.setEnd(s,0),e}}const a=t.getNode(c);if(C(a)){if(Ec(a))return d(e,a,!c&&!t.isAtEnd(),!1);if(Hr(a)&&ir(a.previousSibling)){const e=n.createRng();return e.setStart(a,1),e.setEnd(a,1),e}}}return null}let m=r.startContainer,f=r.startOffset;const g=r.endOffset;if(Jo(m)&&0===f&&PA(m.parentNode)&&(m=m.parentNode,f=n.nodeIndex(m),m=m.parentNode),!$o(m))return null;if(g===f+1&&m===r.endContainer){const o=m.childNodes[f];if(l(o))return(o=>{const r=o.cloneNode(!0),l=e.dispatch("ObjectSelected",{target:o,targetClone:r});if(l.isDefaultPrevented())return null;const d=((o,r)=>{const a=yn(e.getBody()),i=e.getDoc(),l=eo(a,"#"+s).getOrThunk((()=>{const e=hn('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>',i);return Jt(e,"id",s),bo(a,e),e})),d=n.createRng();Co(l),yo(l,[vn(pr,i),yn(r),vn(pr,i)]),d.setStart(l.dom.firstChild,1),d.setEnd(l.dom.lastChild,0),io(l,{top:n.getPos(o,e.getBody()).y+"px"}),eg(l);const c=t.getSel();return c&&(c.removeAllRanges(),c.addRange(d)),d})(o,l.targetClone),c=yn(o);return V(Fo(yn(e.getBody()),`*[${a}]`),(e=>{En(c,e)||on(e,a)})),n.getAttrib(o,a)||o.setAttribute(a,"1"),i=o,p(),d})(o)}return null},g=()=>{i&&i.removeAttribute(a),eo(yn(e.getBody()),"#"+s).each(wo),i=null},p=()=>{r.hide()};return MC(e)||(e.on("click",(t=>{n.isEditable(t.target)||(t.preventDefault(),e.focus())})),e.on("blur NewBlock",g),e.on("ResizeWindow FullscreenStateChanged",r.reposition),e.on("tap",(t=>{const n=t.target,o=LA(e,n);PA(o)?(t.preventDefault(),ux(e,o).each(f)):l(n)&&ux(e,n).each(f)}),!0),e.on("mousedown",(r=>{const s=r.target;if(s!==o&&"HTML"!==s.nodeName&&!n.isChildOf(s,o))return;if(!((e,t,n)=>{const o=yn(e.getBody()),r=e.inline?o:yn(Nn(o).dom.documentElement),s=((e,t,n,o)=>{const r=(e=>e.dom.getBoundingClientRect())(t);return{x:n-(e?r.left+t.dom.clientLeft+pw(t):0),y:o-(e?r.top+t.dom.clientTop+gw(t):0)}})(e.inline,r,t,n);return((e,t,n)=>{const o=mw(e),r=fw(e);return t>=0&&n>=0&&t<=o&&n<=r})(r,s.x,s.y)})(e,r.clientX,r.clientY))return;g(),p();const a=LA(e,s);PA(a)?(r.preventDefault(),ux(e,a).each(f)):hA(o,r.clientX,r.clientY).each((n=>{var o;r.preventDefault(),(o=d(1,n.node,n.position===cA.Before,!1))&&t.setRng(o),$o(a)?a.focus():e.getBody().focus()}))})),e.on("keypress",(e=>{ef.modifierPressed(e)||PA(t.getNode())&&e.preventDefault()})),e.on("GetSelectionRange",(e=>{let t=e.range;if(i){if(!i.parentNode)return void(i=null);t=t.cloneRange(),t.selectNode(i),e.range=t}})),e.on("SetSelectionRange",(e=>{e.range=m(e.range);const t=f(e.range,e.forward);t&&(e.range=t)})),e.on("AfterSetSelectionRange",(e=>{const t=e.range,o=t.startContainer.parentElement;var r;u(t)||$o(r=o)&&"mcepastebin"===r.id||p(),(e=>C(e)&&n.hasClass(e,"mce-offscreen-selection"))(o)||g()})),(e=>{DA(e),Nd(e)&&(e=>{const t=t=>{if(!t.isDefaultPrevented()){const n=t.dataTransfer;n&&(H(n.types,"Files")||n.files.length>0)&&(t.preventDefault(),"drop"===t.type&&ww(e,"Dropped file type is not supported"))}},n=n=>{hg(e,n.target)&&t(n)},o=()=>{const o=Oa.DOM,r=e.dom,s=document,a=e.inline?e.getBody():e.getDoc(),i=["drop","dragover"];V(i,(e=>{o.bind(s,e,n),r.bind(a,e,t)})),e.on("remove",(()=>{V(i,(e=>{o.unbind(s,e,n),r.unbind(a,e,t)}))}))};e.on("init",(()=>{mg.setEditorTimeout(e,o,0)}))})(e)})(e),(e=>{const t=ja((()=>{if(!e.removed&&e.getBody().contains(document.activeElement)){const t=e.selection.getRng();if(t.collapsed){const n=mx(e,t,!1);e.selection.setRng(n)}}}),0);e.on("focus",(()=>{t.throttle()})),e.on("blur",(()=>{t.cancel()}))})(e),(e=>{e.on("init",(()=>{e.on("focusin",(t=>{const n=t.target;if(cr(n)){const t=Vh(e.getBody(),n),o=ir(t)?t:n;e.selection.getNode()!==o&&ux(e,o).each((t=>e.selection.setRng(t)))}}))}))})(e)),{showCaret:d,showBlockCaretContainer:e=>{e.hasAttribute("data-mce-caret")&&(Yr(e),t.scrollIntoView(e))},hideFakeCaret:p,destroy:()=>{r.destroy(),i=null}}},IA=(e,t)=>{let n=t;for(let t=e.previousSibling;Jo(t);t=t.previousSibling)n+=t.data.length;return n},FA=(e,t,n,o,r)=>{if(Jo(n)&&(o<0||o>n.data.length))return[];const s=r&&Jo(n)?[IA(n,o)]:[o];let a=n;for(;a!==t&&a.parentNode;)s.push(e.nodeIndex(a,r)),a=a.parentNode;return a===t?s.reverse():[]},UA=(e,t,n,o,r,s,a=!1)=>({start:FA(e,t,n,o,a),end:FA(e,t,r,s,a)}),zA=(e,t)=>{const n=t.slice(),o=n.pop();return x(o)?X(n,((e,t)=>e.bind((e=>I.from(e.childNodes[t])))),I.some(e)).bind((e=>Jo(e)&&(o<0||o>e.data.length)?I.none():I.some({node:e,offset:o}))):I.none()},jA=(e,t)=>zA(e,t.start).bind((({node:n,offset:o})=>zA(e,t.end).map((({node:e,offset:t})=>{const r=document.createRange();return r.setStart(n,o),r.setEnd(e,t),r})))),HA=(e,t,n)=>{if(t&&e.isEmpty(t)&&!n(t)){const o=t.parentNode;e.remove(t,Jo(t.firstChild)&&ds(t.firstChild.data)),HA(e,o,n)}},$A=(e,t,n,o=!0)=>{const r=t.startContainer.parentNode,s=t.endContainer.parentNode;t.deleteContents(),o&&!n(t.startContainer)&&(Jo(t.startContainer)&&0===t.startContainer.data.length&&e.remove(t.startContainer),Jo(t.endContainer)&&0===t.endContainer.data.length&&e.remove(t.endContainer),HA(e,r,n),r!==s&&HA(e,s,n))},qA=(e,t)=>I.from(e.dom.getParent(t.startContainer,e.dom.isBlock)),VA=(e,t,n)=>{const o=e.dynamicPatternsLookup({text:n,block:t});return{...e,blockPatterns:cl(o).concat(e.blockPatterns),inlinePatterns:ul(o).concat(e.inlinePatterns)}},WA=(e,t,n,o)=>{const r=e.createRng();return r.setStart(t,0),r.setEnd(n,o),r.toString()},KA=(e,t,n)=>{((e,t,n)=>{if(Jo(e)&&0>=e.length)return I.some(gS(e,0));{const t=ai(pS);return I.from(t.forwards(e,0,hS(e),n)).map((e=>gS(e.container,0)))}})(t,0,t).each((o=>{const r=o.container;yS(r,n.start.length,t).each((n=>{const o=e.createRng();o.setStart(r,0),o.setEnd(n.container,n.offset),$A(e,o,(e=>e===t))}));const s=yn(r),a=vr(s);/^\s[^\s]/.test(a)&&((e,t)=>{br.set(e,t)})(s,a.slice(1))}))},GA=(e,t)=>e.create("span",{"data-mce-type":"bookmark",id:t}),YA=(e,t)=>{const n=e.createRng();return n.setStartAfter(t.start),n.setEndBefore(t.end),n},XA=(e,t,n)=>{const o=jA(e.getRoot(),n).getOrDie("Unable to resolve path range"),r=o.startContainer,s=o.endContainer,a=0===o.endOffset?s:s.splitText(o.endOffset),i=0===o.startOffset?r:r.splitText(o.startOffset),l=i.parentNode;return{prefix:t,end:a.parentNode.insertBefore(GA(e,t+"-end"),a),start:l.insertBefore(GA(e,t+"-start"),i)}},QA=(e,t,n)=>{HA(e,e.get(t.prefix+"-end"),n),HA(e,e.get(t.prefix+"-start"),n)},JA=e=>0===e.start.length,ZA=(e,t,n,o)=>{const r=t.start;var s;return CS(e,o.container,o.offset,(s=r,(e,t)=>{const n=e.data.substring(0,t),o=n.lastIndexOf(s.charAt(s.length-1)),r=n.lastIndexOf(s);return-1!==r?r+s.length:-1!==o?o+1:-1}),n).bind((o=>{var s,a;const i=null!==(a=null===(s=n.textContent)||void 0===s?void 0:s.indexOf(r))&&void 0!==a?a:-1;if(-1!==i&&o.offset>=i+r.length){const t=e.createRng();return t.setStart(o.container,o.offset-r.length),t.setEnd(o.container,o.offset),I.some(t)}{const s=o.offset-r.length;return vS(o.container,s,n).map((t=>{const n=e.createRng();return n.setStart(t.container,t.offset),n.setEnd(o.container,o.offset),n})).filter((e=>e.toString()===r)).orThunk((()=>ZA(e,t,n,gS(o.container,0))))}}))},eO=(e,t,n,o)=>{const r=e.dom,s=r.getRoot(),a=n.pattern,i=n.position.container,l=n.position.offset;return vS(i,l-n.pattern.end.length,t).bind((d=>{const c=UA(r,s,d.container,d.offset,i,l,o);if(JA(a))return I.some({matches:[{pattern:a,startRng:c,endRng:c}],position:d});{const i=tO(e,n.remainingPatterns,d.container,d.offset,t,o),l=i.getOr({matches:[],position:d}),u=l.position,m=((e,t,n,o,r,s=!1)=>{if(0===t.start.length&&!s){const t=e.createRng();return t.setStart(n,o),t.setEnd(n,o),I.some(t)}return bS(n,o,r).bind((n=>ZA(e,t,r,n).bind((e=>{var t;if(s){if(e.endContainer===n.container&&e.endOffset===n.offset)return I.none();if(0===n.offset&&(null===(t=e.endContainer.textContent)||void 0===t?void 0:t.length)===e.endOffset)return I.none()}return I.some(e)}))))})(r,a,u.container,u.offset,t,i.isNone());return m.map((e=>{const t=((e,t,n,o=!1)=>UA(e,t,n.startContainer,n.startOffset,n.endContainer,n.endOffset,o))(r,s,e,o);return{matches:l.matches.concat([{pattern:a,startRng:t,endRng:c}]),position:gS(e.startContainer,e.startOffset)}}))}}))},tO=(e,t,n,o,r,s)=>{const a=e.dom;return bS(n,o,a.getRoot()).bind((i=>{const l=WA(a,r,n,o);for(let a=0;a<t.length;a++){const d=t[a];if(!$e(l,d.end))continue;const c=t.slice();c.splice(a,1);const u=eO(e,r,{pattern:d,remainingPatterns:c,position:i},s);if(u.isNone()&&o>0)return tO(e,t,n,o-1,r,s);if(u.isSome())return u}return I.none()}))},nO=(e,t,n)=>{e.selection.setRng(n),"inline-format"===t.type?V(t.format,(t=>{e.formatter.apply(t)})):e.execCommand(t.cmd,!1,t.value)},oO=(e,t,n,o,r,s)=>{var a;return((e,t)=>{const n=ne(e,(e=>$(t,(t=>e.pattern.start===t.pattern.start&&e.pattern.end===t.pattern.end))));return e.length===t.length?n?e:t:e.length>t.length?e:t})(tO(e,r.inlinePatterns,n,o,t,s).fold((()=>[]),(e=>e.matches)),tO(e,(a=r.inlinePatterns,ae(a,((e,t)=>t.end.length-e.end.length))),n,o,t,s).fold((()=>[]),(e=>e.matches)))},rO=(e,t)=>{if(0===t.length)return;const n=e.dom,o=e.selection.getBookmark(),r=((e,t)=>{const n=ti("mce_textpattern"),o=Y(t,((t,o)=>{const r=XA(e,n+`_end${t.length}`,o.endRng);return t.concat([{...o,endMarker:r}])}),[]);return Y(o,((t,r)=>{const s=o.length-t.length-1,a=JA(r.pattern)?r.endMarker:XA(e,n+`_start${s}`,r.startRng);return t.concat([{...r,startMarker:a}])}),[])})(n,t);V(r,(t=>{const o=n.getParent(t.startMarker.start,n.isBlock),r=e=>e===o;JA(t.pattern)?((e,t,n,o)=>{const r=YA(e.dom,n);$A(e.dom,r,o),nO(e,t,r)})(e,t.pattern,t.endMarker,r):((e,t,n,o,r)=>{const s=e.dom,a=YA(s,o),i=YA(s,n);$A(s,i,r),$A(s,a,r);const l={prefix:n.prefix,start:n.end,end:o.start},d=YA(s,l);nO(e,t,d)})(e,t.pattern,t.startMarker,t.endMarker,r),QA(n,t.endMarker,r),QA(n,t.startMarker,r)})),e.selection.moveToBookmark(o)},sO=(e,t)=>{const n=e.selection.getRng();return qA(e,n).map((o=>{var r;const s=Math.max(0,n.startOffset),a=VA(t,o,null!==(r=o.textContent)&&void 0!==r?r:""),i=oO(e,o,n.startContainer,s,a,!0),l=((e,t,n,o)=>{var r;const s=e.dom,a=Nl(e);if(!s.is(t,a))return[];const i=null!==(r=t.textContent)&&void 0!==r?r:"";return((e,t)=>{const n=(e=>ae(e,((e,t)=>t.start.length-e.start.length)))(e),o=t.replace(pr," ");return J(n,(e=>0===t.indexOf(e.start)||0===o.indexOf(e.start)))})(n.blockPatterns,i).map((e=>Dt.trim(i).length===e.start.length?[]:[{pattern:e,range:UA(s,s.getRoot(),t,0,t,0,true)}])).getOr([])})(e,o,a);return(l.length>0||i.length>0)&&(e.undoManager.add(),e.undoManager.extra((()=>{e.execCommand("mceInsertNewLine")}),(()=>{e.insertContent(gr),rO(e,i),((e,t)=>{if(0===t.length)return;const n=e.selection.getBookmark();V(t,(t=>((e,t)=>{const n=e.dom,o=t.pattern,r=jA(n.getRoot(),t.range).getOrDie("Unable to resolve path range");return qA(e,r).each((t=>{"block-format"===o.type?((e,t)=>{const n=t.get(e);return p(n)&&le(n).exists((e=>ke(e,"block")))})(o.format,e.formatter)&&e.undoManager.transact((()=>{KA(e.dom,t,o),e.formatter.apply(o.format)})):"block-command"===o.type&&e.undoManager.transact((()=>{KA(e.dom,t,o),e.execCommand(o.cmd,!1,o.value)}))})),!0})(e,t))),e.selection.moveToBookmark(n)})(e,l);const t=e.selection.getRng(),n=bS(t.startContainer,t.startOffset,e.dom.getRoot());e.execCommand("mceInsertNewLine"),n.each((t=>{const n=t.container;n.data.charAt(t.offset-1)===gr&&(n.deleteData(t.offset-1,1),HA(e.dom,n.parentNode,(t=>t===e.dom.getRoot())))}))})),!0)})).getOr(!1)},aO=(e,t,n)=>{for(let o=0;o<e.length;o++)if(n(e[o],t))return!0;return!1},iO=e=>{const t=Dt.each,n=ef.BACKSPACE,o=ef.DELETE,r=e.dom,s=e.selection,a=e.parser,i=At.browser,l=i.isFirefox(),d=i.isChromium()||i.isSafari(),c=At.deviceType.isiPhone()||At.deviceType.isiPad(),u=At.os.isMacOS()||At.os.isiOS(),f=(t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},g=e=>e.isDefaultPrevented(),p=()=>{e.shortcuts.add("meta+a",null,"SelectAll")},h=()=>{e.inline||r.bind(e.getDoc(),"mousedown mouseup",(t=>{let n;if(t.target===e.getDoc().documentElement)if(n=s.getRng(),e.getBody().focus(),"mousedown"===t.type){if($r(n.startContainer))return;s.placeCaretAt(t.clientX,t.clientY)}else s.setRng(n)}))},b=()=>{Range.prototype.getClientRects||e.on("mousedown",(t=>{if(!g(t)&&"HTML"===t.target.nodeName){const t=e.getBody();t.blur(),mg.setEditorTimeout(e,(()=>{t.focus()}))}}))},v=()=>{const t=Od(e);e.on("click",(n=>{const o=n.target;/^(IMG|HR)$/.test(o.nodeName)&&r.isEditable(o.parentNode)&&(n.preventDefault(),e.selection.select(o),e.nodeChanged()),"A"===o.nodeName&&r.hasClass(o,t)&&0===o.childNodes.length&&r.isEditable(o.parentNode)&&(n.preventDefault(),s.select(o))}))},y=()=>{e.on("keydown",(e=>{if(!g(e)&&e.keyCode===n&&s.isCollapsed()&&0===s.getRng().startOffset){const t=s.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}return!0}))},C=()=>{xd(e)||e.on("BeforeExecCommand mousedown",(()=>{f("StyleWithCSS",!1),f("enableInlineTableEditing",!1),ed(e)||f("enableObjectResizing",!1)}))},w=()=>{e.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")},x=()=>{e.inline||e.on("keydown",(()=>{document.activeElement===document.body&&e.getWin().focus()}))},k=()=>{e.inline||(e.contentStyles.push("body {min-height: 150px}"),e.on("click",(t=>{let n;"HTML"===t.target.nodeName&&(n=e.selection.getRng(),e.getBody().focus(),e.selection.setRng(n),e.selection.normalize(),e.nodeChanged())})))},S=()=>{u&&e.on("keydown",(t=>{!ef.metaKeyPressed(t)||t.shiftKey||37!==t.keyCode&&39!==t.keyCode||(t.preventDefault(),e.selection.getSel().modify("move",37===t.keyCode?"backward":"forward","lineboundary"))}))},_=()=>{e.on("click",(e=>{let t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)})),e.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")},N=()=>{e.on("init",(()=>{e.dom.bind(e.getBody(),"submit",(e=>{e.preventDefault()}))}))},R=E;return MC(e)?(d&&(h(),v(),N(),p(),c&&(x(),k(),_())),l&&(b(),C(),w(),S())):(e.on("keydown",(t=>{if(g(t)||t.keyCode!==ef.BACKSPACE)return;let n=s.getRng();const o=n.startContainer,a=n.startOffset,i=r.getRoot();let l=o;if(n.collapsed&&0===a){for(;l.parentNode&&l.parentNode.firstChild===l&&l.parentNode!==i;)l=l.parentNode;"BLOCKQUOTE"===l.nodeName&&(e.formatter.toggle("blockquote",void 0,l),n=r.createRng(),n.setStart(o,0),n.setEnd(o,0),s.setRng(n))}})),(()=>{const t=e=>{const t=r.create("body"),n=e.cloneContents();return t.appendChild(n),s.serializer.serialize(t,{format:"html"})};e.on("keydown",(s=>{const a=s.keyCode;if(!g(s)&&(a===o||a===n)&&e.selection.isEditable()){const n=e.selection.isCollapsed(),o=e.getBody();if(n&&(!r.isEmpty(o)||(e=>{const t=yn(e);return $(Fo(t,'[contenteditable="true"]'),(e=>On(e).exists((e=>!no(e)))))})(o)))return;if(!n&&!(n=>{const o=t(n),s=r.createRng();return s.selectNode(e.getBody()),o===t(s)})(e.selection.getRng()))return;s.preventDefault(),e.setContent(""),o.firstChild&&r.isBlock(o.firstChild)?e.selection.setCursorLocation(o.firstChild,0):e.selection.setCursorLocation(o,0),e.nodeChanged()}}))})(),At.windowsPhone||e.on("keyup focusin mouseup",(t=>{ef.modifierPressed(t)||(e=>{const t=e.getBody(),n=e.selection.getRng();return n.startContainer===n.endContainer&&n.startContainer===t&&0===n.startOffset&&n.endOffset===t.childNodes.length})(e)||s.normalize()}),!0),d&&(h(),v(),e.on("init",(()=>{f("DefaultParagraphSeparator",Nl(e))})),N(),y(),a.addNodeFilter("br",(e=>{let t=e.length;for(;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()})),c?(x(),k(),_()):p()),l&&(e.on("keydown",(t=>{if(!g(t)&&t.keyCode===n){if(!e.getBody().getElementsByTagName("hr").length)return;if(s.isCollapsed()&&0===s.getRng().startOffset){const e=s.getNode(),n=e.previousSibling;if("HR"===e.nodeName)return r.remove(e),void t.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(r.remove(n),t.preventDefault())}}})),b(),(()=>{const n=()=>{const n=r.getAttribs(s.getStart().cloneNode(!1));return()=>{const o=s.getStart();o!==e.getBody()&&(r.setAttrib(o,"style",null),t(n,(e=>{o.setAttributeNode(e.cloneNode(!0))})))}},o=()=>!s.isCollapsed()&&r.getParent(s.getStart(),r.isBlock)!==r.getParent(s.getEnd(),r.isBlock);e.on("keypress",(t=>{let r;return!(!(g(t)||8!==t.keyCode&&46!==t.keyCode)&&o()&&(r=n(),e.getDoc().execCommand("delete",!1),r(),t.preventDefault(),1))})),r.bind(e.getDoc(),"cut",(t=>{if(!g(t)&&o()){const t=n();mg.setEditorTimeout(e,(()=>{t()}))}}))})(),C(),e.on("SetContent ExecCommand",(e=>{"setcontent"!==e.type&&"mceInsertLink"!==e.command||t(r.select("a:not([data-mce-block])"),(e=>{var t;let n=e.parentNode;const o=r.getRoot();if((null==n?void 0:n.lastChild)===e){for(;n&&!r.isBlock(n);){if((null===(t=n.parentNode)||void 0===t?void 0:t.lastChild)!==n||n===o)return;n=n.parentNode}r.add(n,"br",{"data-mce-bogus":1})}}))})),w(),S(),y(),e.on("drop",(t=>{var n;const o=null===(n=t.dataTransfer)||void 0===n?void 0:n.getData("text/html");m(o)&&/^<img[^>]*>$/.test(o)&&e.dispatch("dragend",new window.DragEvent("dragend",t))})))),{refreshContentEditable:R,isHidden:()=>{if(!l||e.removed)return!1;const t=e.selection.getSel();return!t||!t.rangeCount||0===t.rangeCount}}},lO=Oa.DOM,dO=e=>e.inline?e.getElement().nodeName.toLowerCase():void 0,cO=e=>ye(e,(e=>!1===v(e))),uO=e=>{const t=e.options.get,n=e.editorUpload.blobCache;return cO({allow_conditional_comments:t("allow_conditional_comments"),allow_html_data_urls:t("allow_html_data_urls"),allow_svg_data_urls:t("allow_svg_data_urls"),allow_html_in_named_anchor:t("allow_html_in_named_anchor"),allow_script_urls:t("allow_script_urls"),allow_unsafe_link_target:t("allow_unsafe_link_target"),convert_fonts_to_spans:t("convert_fonts_to_spans"),fix_list_elements:t("fix_list_elements"),font_size_legacy_values:t("font_size_legacy_values"),forced_root_block:t("forced_root_block"),forced_root_block_attrs:t("forced_root_block_attrs"),preserve_cdata:t("preserve_cdata"),inline_styles:t("inline_styles"),root_name:dO(e),sanitize:t("xss_sanitization"),validate:!0,blob_cache:n,document:e.getDoc()})},mO=e=>{const t=e.options.get;return cO({custom_elements:t("custom_elements"),extended_valid_elements:t("extended_valid_elements"),invalid_elements:t("invalid_elements"),invalid_styles:t("invalid_styles"),schema:t("schema"),valid_children:t("valid_children"),valid_classes:t("valid_classes"),valid_elements:t("valid_elements"),valid_styles:t("valid_styles"),verify_html:t("verify_html"),padd_empty_block_inline_children:t("format_empty_lines")})},fO=e=>e.inline?e.ui.styleSheetLoader:e.dom.styleSheetLoader,gO=e=>{const t=fO(e),n=Ql(e),o=e.contentCSS,r=()=>{t.unloadAll(o),e.inline||e.ui.styleSheetLoader.unloadAll(n)},s=()=>{e.removed?r():e.on("remove",r)};if(e.contentStyles.length>0){let t="";Dt.each(e.contentStyles,(e=>{t+=e+"\r\n"})),e.dom.addStyle(t)}const a=Promise.all(((e,t,n)=>{const o=[fO(e).loadAll(t)];return e.inline?o:o.concat([e.ui.styleSheetLoader.loadAll(n)])})(e,o,n)).then(s).catch(s),i=Xl(e);return i&&((e,t)=>{const n=yn(e.getBody()),o=Vn(qn(n)),r=bn("style");Jt(r,"type","text/css"),bo(r,vn(t)),bo(o,r),e.on("remove",(()=>{wo(r)}))})(e,i),a},pO=e=>{!0!==e.removed&&((e=>{MC(e)||e.load({initial:!0,format:"html"}),e.startContent=e.getContent({format:"raw"})})(e),(e=>{e.bindPendingEventDelegates(),e.initialized=!0,(e=>{e.dispatch("Init")})(e),e.focus(!0),(e=>{const t=e.dom.getRoot();e.inline||tm(e)&&e.selection.getStart(!0)!==t||yu(t).each((t=>{const n=t.getNode(),o=Yo(n)?yu(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e),e.nodeChanged({initial:!0});const t=Dd(e);w(t)&&t.call(e,e),(e=>{const t=Ld(e);t&&mg.setEditorTimeout(e,(()=>{let n;n=!0===t?e:e.editorManager.get(t),n&&!n.destroyed&&(n.focus(),n.selection.scrollIntoView())}),100)})(e)})(e))},hO=e=>{const t=e.getElement();let n=e.getDoc();e.inline&&(lO.addClass(t,"mce-content-body"),e.contentDocument=n=document,e.contentWindow=window,e.bodyElement=t,e.contentAreaContainer=t);const o=e.getBody();o.disabled=!0,e.readonly=xd(e),e._editableRoot=kd(e),!e.readonly&&e.hasEditableRoot()&&(e.inline&&"static"===lO.getStyle(o,"position",!0)&&(o.style.position="relative"),o.contentEditable="true"),o.disabled=!1,e.editorUpload=Bw(e),e.schema=ca(mO(e)),e.dom=Oa(n,{keep_values:!0,url_converter:e.convertURL,url_converter_scope:e,update_styles:!0,root_element:e.inline?e.getBody():null,collect:e.inline,schema:e.schema,contentCssCors:$l(e),referrerPolicy:ql(e),onSetAttrib:t=>{e.dispatch("SetAttrib",t)}}),e.parser=(e=>{const t=oC(uO(e),e.schema);return t.addAttributeFilter("src,href,style,tabindex",((t,n)=>{const o=e.dom,r="data-mce-"+n;let s=t.length;for(;s--;){const a=t[s];let i=a.attr(n);if(i&&!a.attr(r)){if(0===i.indexOf("data:")||0===i.indexOf("blob:"))continue;"style"===n?(i=o.serializeStyle(o.parseStyle(i),a.name),i.length||(i=null),a.attr(r,i),a.attr(n,i)):"tabindex"===n?(a.attr(r,i),a.attr(n,null)):a.attr(r,e.convertURL(i,n,a.name))}}})),t.addNodeFilter("script",(e=>{let t=e.length;for(;t--;){const n=e[t],o=n.attr("type")||"no/type";0!==o.indexOf("mce-")&&n.attr("type","mce-"+o)}})),tc(e)&&t.addNodeFilter("#cdata",(t=>{var n;let o=t.length;for(;o--;){const r=t[o];r.type=8,r.name="#comment",r.value="[CDATA["+e.dom.encode(null!==(n=r.value)&&void 0!==n?n:"")+"]]"}})),t.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",(t=>{let n=t.length;const o=e.schema.getNonEmptyElements();for(;n--;){const e=t[n];e.isEmpty(o)&&0===e.getAll("br").length&&e.append(new Fg("br",1))}})),t})(e),e.serializer=KC((e=>{const t=e.options.get;return{...uO(e),...mO(e),...cO({remove_trailing_brs:t("remove_trailing_brs"),pad_empty_with_br:t("pad_empty_with_br"),url_converter:t("url_converter"),url_converter_scope:t("url_converter_scope"),element_format:t("element_format"),entities:t("entities"),entity_encoding:t("entity_encoding"),indent:t("indent"),indent_after:t("indent_after"),indent_before:t("indent_before")})}})(e),e),e.selection=qC(e.dom,e.getWin(),e.serializer,e),e.annotator=Vm(e),e.formatter=$w(e),e.undoManager=Vw(e),e._nodeChangeDispatcher=new ZN(e),e._selectionOverrides=MA(e),(e=>{const t=za(),n=Da(!1),o=Ha((t=>{e.dispatch("longpress",{...t,type:"longpress"}),n.set(!0)}),400);e.on("touchstart",(e=>{vE(e).each((r=>{o.cancel();const s={x:r.clientX,y:r.clientY,target:e.target};o.throttle(e),n.set(!1),t.set(s)}))}),!0),e.on("touchmove",(r=>{o.cancel(),vE(r).each((o=>{t.on((r=>{((e,t)=>{const n=Math.abs(e.clientX-t.x),o=Math.abs(e.clientY-t.y);return n>5||o>5})(o,r)&&(t.clear(),n.set(!1),e.dispatch("longpresscancel"))}))}))}),!0),e.on("touchend touchcancel",(r=>{o.cancel(),"touchcancel"!==r.type&&t.get().filter((e=>e.target.isEqualNode(r.target))).each((()=>{n.get()?r.preventDefault():e.dispatch("tap",{...r,type:"tap"})}))}),!0)})(e),(e=>{(e=>{e.on("click",(t=>{e.dom.getParent(t.target,"details")&&t.preventDefault()}))})(e),(e=>{e.parser.addNodeFilter("details",(t=>{const n=ic(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))})),e.serializer.addNodeFilter("details",(t=>{const n=lc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))}))})(e)})(e),(e=>{const t="contenteditable",n=" "+Dt.trim(Zd(e))+" ",o=" "+Dt.trim(Jd(e))+" ",r=SE(n),s=SE(o),a=ec(e);a.length>0&&e.on("BeforeSetContent",(t=>{((e,t,n)=>{let o=t.length,r=n.content;if("raw"!==n.format){for(;o--;)r=r.replace(t[o],_E(e,r,Jd(e)));n.content=r}})(e,a,t)})),e.parser.addAttributeFilter("class",(e=>{let n=e.length;for(;n--;){const o=e[n];r(o)?o.attr(t,"true"):s(o)&&o.attr(t,"false")}})),e.serializer.addAttributeFilter(t,(e=>{let n=e.length;for(;n--;){const o=e[n];(r(o)||s(o))&&(a.length>0&&o.attr("data-mce-content")?(o.name="#text",o.type=3,o.raw=!0,o.value=o.attr("data-mce-content")):o.attr(t,null))}}))})(e),MC(e)||((e=>{e.on("mousedown",(t=>{t.detail>=3&&(t.preventDefault(),dA(e))}))})(e),(e=>{(e=>{const t=[",",".",";",":","!","?"],n=[32],o=()=>{return t=Xd(e),n=Qd(e),{inlinePatterns:ul(t),blockPatterns:cl(t),dynamicPatternsLookup:n};var t,n},r=()=>(e=>e.options.isSet("text_patterns_lookup"))(e);e.on("keydown",(t=>{if(13===t.keyCode&&!ef.modifierPressed(t)&&e.selection.isCollapsed()){const n=o();(n.inlinePatterns.length>0||n.blockPatterns.length>0||r())&&sO(e,n)&&t.preventDefault()}}),!0);const s=()=>{if(e.selection.isCollapsed()){const t=o();(t.inlinePatterns.length>0||r())&&((e,t)=>{const n=e.selection.getRng();qA(e,n).map((o=>{const r=Math.max(0,n.startOffset-1),s=WA(e.dom,o,n.startContainer,r),a=VA(t,o,s),i=oO(e,o,n.startContainer,r,a,!1);i.length>0&&e.undoManager.transact((()=>{rO(e,i)}))}))})(e,t)}};e.on("keyup",(e=>{aO(n,e,((e,t)=>e===t.keyCode&&!ef.modifierPressed(t)))&&s()})),e.on("keypress",(n=>{aO(t,n,((e,t)=>e.charCodeAt(0)===t.charCode))&&mg.setEditorTimeout(e,s)}))})(e)})(e));const r=JN(e);bE(e,r),(e=>{e.on("NodeChange",O(kE,e))})(e),(e=>{var t;const n=e.dom,o=Nl(e),r=null!==(t=nd(e))&&void 0!==t?t:"",s=(t,a)=>{if((e=>{if(Gw(e)){const t=e.keyCode;return!Yw(e)&&(ef.metaKeyPressed(e)||e.altKey||t>=112&&t<=123||H(Ww,t))}return!1})(t))return;const i=e.getBody(),l=!(e=>Gw(e)&&!(Yw(e)||"keyup"===e.type&&229===e.keyCode))(t)&&((e,t,n)=>{if(bs(yn(t),!1)){const o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&n===o.nodeName.toLowerCase()}return!1})(n,i,o);(""!==n.getAttrib(i,Kw)!==l||a)&&(n.setAttrib(i,Kw,l?r:null),n.setAttrib(i,"aria-placeholder",l?r:null),((e,t)=>{e.dispatch("PlaceholderToggle",{state:t})})(e,l),e.on(l?"keydown":"keyup",s),e.off(l?"keyup":"keydown",s))};Ge(r)&&e.on("init",(t=>{s(t,!0),e.on("change SetContent ExecCommand",s),e.on("paste",(t=>mg.setEditorTimeout(e,(()=>s(t)))))}))})(e),nA(e);const s=(e=>{const t=e;return(e=>xe(e.plugins,"rtc").bind((e=>I.from(e.setup))))(e).fold((()=>(t.rtcInstance=LC(e),I.none())),(e=>(t.rtcInstance=(()=>{const e=N(null),t=N("");return{init:{bindEvents:E},undoManager:{beforeChange:E,add:e,undo:e,redo:e,clear:E,reset:E,hasUndo:L,hasRedo:L,transact:e,ignore:E,extra:E},formatter:{match:L,matchAll:N([]),matchNode:N(void 0),canApply:L,closest:t,apply:E,remove:E,toggle:E,formatChanged:N({unbind:E})},editor:{getContent:t,setContent:N({content:"",html:""}),insertContent:N(""),addVisual:E},selection:{getContent:t},autocompleter:{addDecoration:E,removeDecoration:E},raw:{getModel:N(I.none())}}})(),I.some((()=>e().then((e=>(t.rtcInstance=(e=>{const t=e=>f(e)?e:{},{init:n,undoManager:o,formatter:r,editor:s,selection:a,autocompleter:i,raw:l}=e;return{init:{bindEvents:n.bindEvents},undoManager:{beforeChange:o.beforeChange,add:o.add,undo:o.undo,redo:o.redo,clear:o.clear,reset:o.reset,hasUndo:o.hasUndo,hasRedo:o.hasRedo,transact:(e,t,n)=>o.transact(n),ignore:(e,t)=>o.ignore(t),extra:(e,t,n,r)=>o.extra(n,r)},formatter:{match:(e,n,o,s)=>r.match(e,t(n),s),matchAll:r.matchAll,matchNode:r.matchNode,canApply:e=>r.canApply(e),closest:e=>r.closest(e),apply:(e,n,o)=>r.apply(e,t(n)),remove:(e,n,o,s)=>r.remove(e,t(n)),toggle:(e,n,o)=>r.toggle(e,t(n)),formatChanged:(e,t,n,o,s)=>r.formatChanged(t,n,o,s)},editor:{getContent:e=>s.getContent(e),setContent:(e,t)=>({content:s.setContent(e,t),html:""}),insertContent:(e,t)=>(s.insertContent(e),""),addVisual:s.addVisual},selection:{getContent:(e,t)=>a.getContent(t)},autocompleter:{addDecoration:i.addDecoration,removeDecoration:i.removeDecoration},raw:{getModel:()=>I.some(l.getRawModel())}}})(e),e.rtc.isRemote))))))))})(e);(e=>{const t=e.getDoc(),n=e.getBody();(e=>{e.dispatch("PreInit")})(e),Md(e)||(t.body.spellcheck=!1,lO.setAttrib(n,"spellcheck","false")),e.quirks=iO(e),(e=>{e.dispatch("PostRender")})(e);const o=Jl(e);void 0!==o&&(n.dir=o);const r=Id(e);r&&e.on("BeforeSetContent",(e=>{Dt.each(r,(t=>{e.content=e.content.replace(t,(e=>"\x3c!--mce:protected "+escape(e)+"--\x3e"))}))})),e.on("SetContent",(()=>{e.addVisual(e.getBody())})),e.on("compositionstart compositionend",(t=>{e.composing="compositionstart"===t.type}))})(e),s.fold((()=>{const t=(e=>{let t=!1;const n=setTimeout((()=>{t||e.setProgressState(!0)}),500);return()=>{clearTimeout(n),t=!0,e.setProgressState(!1)}})(e);gO(e).then((()=>{pO(e),t()}))}),(t=>{e.setProgressState(!0),gO(e).then((()=>{t().then((t=>{e.setProgressState(!1),pO(e),UC(e)}),(t=>{e.notificationManager.open({type:"error",text:String(t)}),pO(e),UC(e)}))}))}))},bO=M,vO=Oa.DOM,yO=Oa.DOM,CO=(e,t)=>({editorContainer:e,iframeContainer:t,api:{}}),wO=e=>{const t=e.getElement();return e.inline?CO(null):(e=>{const t=yO.create("div");return yO.insertAfter(t,e),CO(t,t)})(t)},xO=async e=>{e.dispatch("ScriptsLoaded"),(e=>{const t=Dt.trim(Il(e)),n=e.ui.registry.getAll().icons,o={...lw.get("default").icons,...lw.get(t).icons};ge(o,((t,o)=>{ke(n,o)||e.ui.registry.addIcon(o,t)}))})(e),(e=>{const t=sd(e);if(m(t)){const n=vw.get(t);e.theme=n(e,vw.urls[t])||{},w(e.theme.init)&&e.theme.init(e,vw.urls[t]||e.documentBaseUrl.replace(/\/$/,""))}else e.theme={}})(e),(e=>{const t=id(e),n=dw.get(t);e.model=n(e,dw.urls[t])})(e),(e=>{const t=[];V(Sd(e),(n=>{((e,t,n)=>{const o=bw.get(n),r=bw.urls[n]||e.documentBaseUrl.replace(/\/$/,"");if(n=Dt.trim(n),o&&-1===Dt.inArray(t,n)){if(e.plugins[n])return;try{const s=o(e,r)||{};e.plugins[n]=s,w(s.init)&&(s.init(e,r),t.push(n))}catch(t){((e,t,n)=>{const o=Ia.translate(["Failed to initialize plugin: {0}",t]);Gm(e,"PluginLoadError",{message:o}),Ew(o,n),ww(e,o)})(e,n,t)}}})(e,t,(e=>e.replace(/^\-/,""))(n))}))})(e);const t=await(e=>{const t=e.getElement();return e.orgDisplay=t.style.display,m(sd(e))?(e=>{const t=e.theme.renderUI;return t?t():wO(e)})(e):w(sd(e))?(e=>{const t=e.getElement(),n=sd(e)(e,t);return n.editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||e.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||e.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:t.offsetHeight,n})(e):wO(e)})(e);((e,t)=>{const n={show:I.from(t.show).getOr(E),hide:I.from(t.hide).getOr(E),isEnabled:I.from(t.isEnabled).getOr(M),setEnabled:n=>{e.mode.isReadOnly()||I.from(t.setEnabled).each((e=>e(n)))}};e.ui={...e.ui,...n}})(e,I.from(t.api).getOr({})),e.editorContainer=t.editorContainer,(e=>{e.contentCSS=e.contentCSS.concat((e=>Sw(e,Yl(e)))(e),(e=>Sw(e,Ql(e)))(e))})(e),e.inline?hO(e):((e,t)=>{((e,t)=>{const n=e.translate("Rich Text Area"),o=tn(yn(e.getElement()),"tabindex").bind(Xe),r=((e,t,n,o)=>{const r=bn("iframe");return o.each((e=>Jt(r,"tabindex",e))),Zt(r,n),Zt(r,{id:e+"_ifr",frameBorder:"0",allowTransparency:"true",title:t}),un(r,"tox-edit-area__iframe"),r})(e.id,n,Cl(e),o).dom;r.onload=()=>{r.onload=null,e.dispatch("load")},e.contentAreaContainer=t.iframeContainer,e.iframeElement=r,e.iframeHTML=(e=>{let t=wl(e)+"<html><head>";xl(e)!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';const n=kl(e),o=El(e),r=e.translate(Td(e));return Sl(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+Sl(e)+'" />'),t+=`</head><body id="${n}" class="mce-content-body ${o}" data-id="${e.id}" aria-label="${r}"><br></body></html>`,t})(e),vO.add(t.iframeContainer,r)})(e,t),t.editorContainer&&(t.editorContainer.style.display=e.orgDisplay,e.hidden=vO.isHidden(t.editorContainer)),e.getElement().style.display="none",vO.setAttrib(e.id,"aria-hidden","true"),e.getElement().style.visibility=e.orgVisibility,(e=>{const t=e.iframeElement,n=()=>{e.contentDocument=t.contentDocument,hO(e)};if(rc(e)||At.browser.isFirefox()){const t=e.getDoc();t.open(),t.write(e.iframeHTML),t.close(),n()}else{const r=(o=yn(t),_o(o,"load",bO,(()=>{r.unbind(),n()})));t.srcdoc=e.iframeHTML}var o})(e)})(e,{editorContainer:t.editorContainer,iframeContainer:t.iframeContainer})},kO=Oa.DOM,EO=e=>"-"===e.charAt(0),SO=(e,t,n)=>I.from(t).filter((e=>Ge(e)&&!lw.has(e))).map((t=>({url:`${e.editorManager.baseURL}/icons/${t}/icons${n}.js`,name:I.some(t)}))),_O=(e,t)=>{const n=Ba.ScriptLoader,o=()=>{!e.removed&&(e=>{const t=sd(e);return!m(t)||C(vw.get(t))})(e)&&(e=>{const t=id(e);return C(dw.get(t))})(e)&&xO(e)};((e,t)=>{const n=sd(e);if(m(n)&&!EO(n)&&!ke(vw.urls,n)){const o=ad(e),r=o?e.documentBaseURI.toAbsolute(o):`themes/${n}/theme${t}.js`;vw.load(n,r).catch((()=>{((e,t,n)=>{xw(e,"ThemeLoadError",kw("theme",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=id(e);if("plugin"!==n&&!ke(dw.urls,n)){const o=ld(e),r=m(o)?e.documentBaseURI.toAbsolute(o):`models/${n}/model${t}.js`;dw.load(n,r).catch((()=>{((e,t,n)=>{xw(e,"ModelLoadError",kw("model",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=Vl(t),o=Wl(t);if(!Ia.hasCode(n)&&"en"!==n){const r=Ge(o)?o:`${t.editorManager.baseURL}/langs/${n}.js`;e.add(r).catch((()=>{((e,t,n)=>{xw(e,"LanguageLoadError",kw("language",t,n))})(t,r,n)}))}})(n,e),((e,t,n)=>{const o=SO(t,"default",n),r=(e=>I.from(Fl(e)).filter(Ge).map((e=>({url:e,name:I.none()}))))(t).orThunk((()=>SO(t,Il(t),"")));V((e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t})([o,r]),(n=>{e.add(n.url).catch((()=>{((e,t,n)=>{xw(e,"IconsLoadError",kw("icons",t,n))})(t,n.url,n.name.getOrUndefined())}))}))})(n,e,t),((e,t)=>{const n=(t,n)=>{bw.load(t,n).catch((()=>{((e,t,n)=>{xw(e,"PluginLoadError",kw("plugin",t,n))})(e,n,t)}))};ge(_d(e),((t,o)=>{n(o,t),e.options.set("plugins",Sd(e).concat(o))})),V(Sd(e),(e=>{!(e=Dt.trim(e))||bw.urls[e]||EO(e)||n(e,`plugins/${e}/plugin${t}.js`)}))})(e,t),n.loadQueue().then(o,o)},NO=xt().deviceType,RO=NO.isPhone(),AO=NO.isTablet(),OO=e=>{if(y(e))return[];{const t=p(e)?e:e.split(/[ ,]/),n=q(t,Ve);return G(n,Ge)}},TO=(e,t)=>{const n=((t,n)=>{const o={},r={};return ve(t,((t,n)=>H(e,n)),be(o),be(r)),{t:o,f:r}})(t);return o=n.t,r=n.f,{sections:N(o),options:N(r)};var o,r},BO=(e,t)=>ke(e.sections(),t),DO=(e,t)=>({table_grid:!1,object_resizing:!1,resize:!1,toolbar_mode:xe(e,"toolbar_mode").getOr("scrolling"),toolbar_sticky:!1,...t?{menubar:!1}:{}}),PO=(e,t)=>{var n;const o=null!==(n=t.external_plugins)&&void 0!==n?n:{};return e&&e.external_plugins?Dt.extend({},e.external_plugins,o):o},LO=(e,t,n,o,r)=>{var s;const a=e?{mobile:DO(null!==(s=r.mobile)&&void 0!==s?s:{},t)}:{},i=TO(["mobile"],IS(a,r)),l=Dt.extend(n,o,i.options(),((e,t)=>e&&BO(t,"mobile"))(e,i)?((e,t,n={})=>{const o=e.sections(),r=xe(o,t).getOr({});return Dt.extend({},n,r)})(i,"mobile"):{},{external_plugins:PO(o,i.options())});return((e,t,n,o)=>{const r=OO(n.forced_plugins),s=OO(o.plugins),a=((e,t)=>BO(e,t)?e.sections()[t]:{})(t,"mobile"),i=((e,t,n,o)=>e&&BO(t,"mobile")?o:n)(e,t,s,a.plugins?OO(a.plugins):s),l=((e,t)=>[...OO(e),...OO(t)])(r,i);return Dt.extend(o,{forced_plugins:r,plugins:l})})(e,i,o,l)},MO=e=>{(e=>{const t=t=>()=>{V("left,center,right,justify".split(","),(n=>{t!==n&&e.formatter.remove("align"+n)})),"none"!==t&&((t,n)=>{e.formatter.toggle(t,void 0),e.nodeChanged()})("align"+t)};e.editorCommands.addCommands({JustifyLeft:t("left"),JustifyCenter:t("center"),JustifyRight:t("right"),JustifyFull:t("justify"),JustifyNone:t("none")})})(e),(e=>{const t=t=>()=>{const n=e.selection,o=n.isCollapsed()?[e.dom.getParent(n.getNode(),e.dom.isBlock)]:n.getSelectedBlocks();return $(o,(n=>C(e.formatter.matchNode(n,t))))};e.editorCommands.addCommands({JustifyLeft:t("alignleft"),JustifyCenter:t("aligncenter"),JustifyRight:t("alignright"),JustifyFull:t("alignjustify")},"state")})(e)},IO=(e,t)=>{const n=e.selection,o=e.dom;return/^ | $/.test(t)?((e,t,n)=>{const o=yn(e.getRoot());return n=Up(o,Li.fromRangeStart(t))?n.replace(/^ /,"&nbsp;"):n.replace(/^&nbsp;/," "),zp(o,Li.fromRangeEnd(t))?n.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):n.replace(/&nbsp;(<br( \/)?>)?$/," ")})(o,n.getRng(),t):t},FO=(e,t)=>{if(e.selection.isEditable()){const{content:n,details:o}=(e=>{if("string"!=typeof e){const t=Dt.extend({paste:e.paste,data:{paste:e.paste}},e);return{content:e.content,details:t}}return{content:e,details:{}}})(t);iC(e,{...o,content:IO(e,n),format:"html",set:!1,selection:!0}).each((t=>{const n=((e,t,n)=>IC(e).editor.insertContent(t,n))(e,t.content,o);lC(e,n,t),e.addVisual()}))}},UO={"font-size":"size","font-family":"face"},zO=Xt("font"),jO=e=>(t,n)=>I.from(n).map(yn).filter(Wt).bind((n=>((e,t,n)=>vb(yn(n),(t=>(t=>uo(t,e).orThunk((()=>zO(t)?xe(UO,e).bind((e=>tn(t,e))):I.none())))(t)),(e=>En(yn(t),e))))(e,t,n.dom).or(((e,t)=>I.from(Oa.DOM.getStyle(t,e,!0)))(e,n.dom)))).getOr(""),HO=jO("font-size"),$O=S((e=>e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")),jO("font-family")),qO=e=>yu(e.getBody()).bind((e=>{const t=e.container();return I.from(Jo(t)?t.parentNode:t)})),VO=(e,t)=>((e,t)=>(e=>I.from(e.selection.getRng()).bind((t=>{const n=e.getBody();return t.startContainer===n&&0===t.startOffset?I.none():I.from(e.selection.getStart(!0))})))(e).orThunk(O(qO,e)).map(yn).filter(Wt).bind(t))(e,_(I.some,t)),WO=(e,t)=>{if(/^[0-9.]+$/.test(t)){const n=parseInt(t,10);if(n>=1&&n<=7){const o=(e=>Dt.explode(e.options.get("font_size_style_values")))(e),r=(e=>Dt.explode(e.options.get("font_size_classes")))(e);return r.length>0?r[n-1]||t:o[n-1]||t}return t}return t},KO=e=>{const t=e.split(/\s*,\s*/);return q(t,(e=>-1===e.indexOf(" ")||He(e,'"')||He(e,"'")?e:`'${e}'`)).join(",")},GO=(e,t)=>{const n=e.dom,o=e.selection.getRng(),r=t?e.selection.getStart():e.selection.getEnd(),s=t?o.startContainer:o.endContainer,a=tN(n,s);if(!a||!a.isContentEditable)return;const i=t?go:po,l=Nl(e);((e,t,n,o)=>{const r=e.dom,s=e=>r.isBlock(e)&&e.parentElement===n,a=s(t)?t:r.getParent(o,s,n);return I.from(a).map(yn)})(e,r,a,s).each((t=>{const n=sN(e,s,t.dom,a,!1,l);i(t,yn(n)),e.selection.setCursorLocation(n,0),e.dispatch("NewBlock",{newBlock:n}),G_(e,"insertParagraph")}))},YO=e=>{MO(e),(e=>{e.editorCommands.addCommands({"Cut,Copy,Paste":t=>{const n=e.getDoc();let o;try{n.execCommand(t)}catch(e){o=!0}if("paste"!==t||n.queryCommandEnabled(t)||(o=!0),o||!n.queryCommandSupported(t)){let t=e.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");(At.os.isMacOS()||At.os.isiOS())&&(t=t.replace(/Ctrl\+/g,"\u2318+")),e.notificationManager.open({text:t,type:"error"})}}})})(e),(e=>{e.editorCommands.addCommands({mceAddUndoLevel:()=>{e.undoManager.add()},mceEndUndoLevel:()=>{e.undoManager.add()},Undo:()=>{e.undoManager.undo()},Redo:()=>{e.undoManager.redo()}})})(e),(e=>{e.editorCommands.addCommands({mceSelectNodeDepth:(t,n,o)=>{let r=0;e.dom.getParent(e.selection.getNode(),(t=>!$o(t)||r++!==o||(e.selection.select(t),!1)),e.getBody())},mceSelectNode:(t,n,o)=>{e.selection.select(o)},selectAll:()=>{const t=e.dom.getParent(e.selection.getStart(),ar);if(t){const n=e.dom.createRng();n.selectNodeContents(t),e.selection.setRng(n)}}})})(e),(e=>{e.editorCommands.addCommands({mceCleanup:()=>{const t=e.selection.getBookmark();e.setContent(e.getContent()),e.selection.moveToBookmark(t)},insertImage:(t,n,o)=>{FO(e,e.dom.createHTML("img",{src:o}))},insertHorizontalRule:()=>{e.execCommand("mceInsertContent",!1,"<hr>")},insertText:(t,n,o)=>{FO(e,e.dom.encode(o))},insertHTML:(t,n,o)=>{FO(e,o)},mceInsertContent:(t,n,o)=>{FO(e,o)},mceSetContent:(t,n,o)=>{e.setContent(o)},mceReplaceContent:(t,n,o)=>{e.execCommand("mceInsertContent",!1,o.replace(/\{\$selection\}/g,e.selection.getContent({format:"text"})))},mceNewDocument:()=>{e.setContent(Hd(e))}})})(e),(e=>{const t=(t,n,o)=>{const r=m(o)?{href:o}:o,s=e.dom.getParent(e.selection.getNode(),"a");f(r)&&m(r.href)&&(r.href=r.href.replace(/ /g,"%20"),s&&r.href||e.formatter.remove("link"),r.href&&e.formatter.apply("link",r,s))};e.editorCommands.addCommands({unlink:()=>{if(e.selection.isEditable()){if(e.selection.isCollapsed()){const t=e.dom.getParent(e.selection.getStart(),"a");return void(t&&e.dom.remove(t,!0))}e.formatter.remove("link")}},mceInsertLink:t,createLink:t})})(e),(e=>{e.editorCommands.addCommands({Indent:()=>{(e=>{fE(e,"indent")})(e)},Outdent:()=>{gE(e)}}),e.editorCommands.addCommands({Outdent:()=>cE(e)},"state")})(e),(e=>{e.editorCommands.addCommands({InsertNewBlockBefore:()=>{(e=>{GO(e,!0)})(e)},InsertNewBlockAfter:()=>{(e=>{GO(e,!1)})(e)}})})(e),(e=>{e.editorCommands.addCommands({insertParagraph:()=>{MN(gN,e)},mceInsertNewLine:(t,n,o)=>{IN(e,o)},InsertLineBreak:(t,n,o)=>{MN(xN,e)}})})(e),(e=>{(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{e.getDoc().execCommand(t);const n=e.dom.getParent(e.selection.getNode(),"ol,ul");if(n){const t=n.parentNode;if(t&&/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)){const o=e.selection.getBookmark();e.dom.split(t,n),e.selection.moveToBookmark(o)}}}})})(e),(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{const n=e.dom.getParent(e.selection.getNode(),"ul,ol");return n&&("insertunorderedlist"===t&&"UL"===n.tagName||"insertorderedlist"===t&&"OL"===n.tagName)}},"state")})(e)})(e),(e=>{(e=>{const t=(t,n)=>{e.formatter.toggle(t,n),e.nodeChanged()};e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>{t(e)},"ForeColor,HiliteColor":(e,n,o)=>{t(e,{value:o})},BackColor:(e,n,o)=>{t("hilitecolor",{value:o})},FontName:(t,n,o)=>{((e,t)=>{const n=WO(e,t);e.formatter.toggle("fontname",{value:KO(n)}),e.nodeChanged()})(e,o)},FontSize:(t,n,o)=>{((e,t)=>{e.formatter.toggle("fontsize",{value:WO(e,t)}),e.nodeChanged()})(e,o)},LineHeight:(t,n,o)=>{((e,t)=>{e.formatter.toggle("lineheight",{value:String(t)}),e.nodeChanged()})(e,o)},Lang:(e,n,o)=>{var r;t(e,{value:o.code,customValue:null!==(r=o.customCode)&&void 0!==r?r:null})},RemoveFormat:t=>{e.formatter.remove(t)},mceBlockQuote:()=>{t("blockquote")},FormatBlock:(e,n,o)=>{t(m(o)?o:"p")},mceToggleFormat:(e,n,o)=>{t(o)}})})(e),(e=>{const t=t=>e.formatter.match(t);e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>t(e),mceBlockQuote:()=>t("blockquote")},"state"),e.editorCommands.addQueryValueHandler("FontName",(()=>(e=>VO(e,(t=>$O(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("FontSize",(()=>(e=>VO(e,(t=>HO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("LineHeight",(()=>(e=>VO(e,(t=>{const n=yn(e.getBody()),o=vb(t,(e=>uo(e,"line-height")),O(En,n));return o.getOrThunk((()=>{const e=parseFloat(lo(t,"line-height")),n=parseFloat(lo(t,"font-size"));return String(e/n)}))})).getOr(""))(e)))})(e)})(e),(e=>{e.editorCommands.addCommands({mceRemoveNode:(t,n,o)=>{const r=null!=o?o:e.selection.getNode();if(r!==e.getBody()){const t=e.selection.getBookmark();e.dom.remove(r,!0),e.selection.moveToBookmark(t)}},mcePrint:()=>{e.getWin().print()},mceFocus:(t,n,o)=>{((e,t)=>{e.removed||(t?kg(e):(e=>{const t=e.selection,n=e.getBody();let o=t.getRng();e.quirks.refreshContentEditable(),C(e.bookmark)&&!xg(e)&&cg(e).each((t=>{e.selection.setRng(t),o=t}));const r=((e,t)=>e.dom.getParent(t,(t=>"true"===e.dom.getContentEditable(t))))(e,t.getNode());if(r&&e.dom.isChildOf(r,n))return wg(r),Cg(e,o),void kg(e);e.inline||(At.browser.isOpera()||wg(n),e.getWin().focus()),(At.browser.isFirefox()||e.inline)&&(wg(n),Cg(e,o)),kg(e)})(e))})(e,!0===o)},mceToggleVisualAid:()=>{e.hasVisual=!e.hasVisual,e.addVisual()}})})(e)},XO=["toggleview"],QO=e=>H(XO,e.toLowerCase());class JO{constructor(e){this.commands={state:{},exec:{},value:{}},this.editor=e}execCommand(e,t=!1,n,o){const r=this.editor,s=e.toLowerCase(),a=null==o?void 0:o.skip_focus;if(r.removed)return!1;if("mcefocus"!==s&&(/^(mceAddUndoLevel|mceEndUndoLevel)$/i.test(s)||a?(e=>{cg(e).each((t=>e.selection.setRng(t)))})(r):r.focus()),r.dispatch("BeforeExecCommand",{command:e,ui:t,value:n}).isDefaultPrevented())return!1;const i=this.commands.exec[s];return!!w(i)&&(i(s,t,n),r.dispatch("ExecCommand",{command:e,ui:t,value:n}),!0)}queryCommandState(e){if(!QO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return!1;const t=e.toLowerCase(),n=this.commands.state[t];return!!w(n)&&n(t)}queryCommandValue(e){if(!QO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return"";const t=e.toLowerCase(),n=this.commands.value[t];return w(n)?n(t):""}addCommands(e,t="exec"){const n=this.commands;ge(e,((e,o)=>{V(o.toLowerCase().split(","),(o=>{n[t][o]=e}))}))}addCommand(e,t,n){const o=e.toLowerCase();this.commands.exec[o]=(e,o,r)=>t.call(null!=n?n:this.editor,o,r)}queryCommandSupported(e){const t=e.toLowerCase();return!!this.commands.exec[t]}addQueryStateHandler(e,t,n){this.commands.state[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}addQueryValueHandler(e,t,n){this.commands.value[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}}const ZO="data-mce-contenteditable",eT=(e,t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},tT=(e,t)=>{e.dom.contentEditable=t?"true":"false"},nT=(e,t)=>{const n=yn(e.getBody());((e,t,n)=>{gn(e,t)&&!n?fn(e,t):n&&un(e,t)})(n,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),(e=>{I.from(e.selection.getNode()).each((e=>{e.removeAttribute("data-mce-selected")}))})(e),e.readonly=!0,tT(n,!1),V(Fo(n,'*[contenteditable="true"]'),(e=>{Jt(e,ZO,"true"),tT(e,!1)}))):(e.readonly=!1,e.hasEditableRoot()&&tT(n,!0),V(Fo(n,`*[${ZO}="true"]`),(e=>{on(e,ZO),tT(e,!0)})),eT(e,"StyleWithCSS",!1),eT(e,"enableInlineTableEditing",!1),eT(e,"enableObjectResizing",!1),(e=>xg(e)||(e=>{const t=qn(yn(e.getElement()));return ng(t).filter((t=>!pg(t.dom)&&hg(e,t.dom))).isSome()})(e))(e)&&e.focus(),(e=>{e.selection.setRng(e.selection.getRng())})(e),e.nodeChanged())},oT=e=>e.readonly,rT=e=>{e.parser.addAttributeFilter("contenteditable",(t=>{oT(e)&&V(t,(e=>{e.attr(ZO,e.attr("contenteditable")),e.attr("contenteditable","false")}))})),e.serializer.addAttributeFilter(ZO,(t=>{oT(e)&&V(t,(e=>{e.attr("contenteditable",e.attr(ZO))}))})),e.serializer.addTempAttr(ZO)},sT=["copy"],aT=Dt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," ");class iT{static isNative(e){return!!aT[e.toLowerCase()]}constructor(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||L}fire(e,t){return this.dispatch(e,t)}dispatch(e,t){const n=e.toLowerCase(),o=ga(n,null!=t?t:{},this.scope);this.settings.beforeFire&&this.settings.beforeFire(o);const r=this.bindings[n];if(r)for(let e=0,t=r.length;e<t;e++){const t=r[e];if(!t.removed){if(t.once&&this.off(n,t.func),o.isImmediatePropagationStopped())return o;if(!1===t.func.call(this.scope,o))return o.preventDefault(),o}}return o}on(e,t,n,o){if(!1===t&&(t=L),t){const r={func:t,removed:!1};o&&Dt.extend(r,o);const s=e.toLowerCase().split(" ");let a=s.length;for(;a--;){const e=s[a];let t=this.bindings[e];t||(t=[],this.toggleEvent(e,!0)),t=n?[r,...t]:[...t,r],this.bindings[e]=t}}return this}off(e,t){if(e){const n=e.toLowerCase().split(" ");let o=n.length;for(;o--;){const r=n[o];let s=this.bindings[r];if(!r)return ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1),delete this.bindings[t]})),this;if(s){if(t){const e=K(s,(e=>e.func===t));s=e.fail,this.bindings[r]=s,V(e.pass,(e=>{e.removed=!0}))}else s.length=0;s.length||(this.toggleEvent(e,!1),delete this.bindings[r])}}}else ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1)})),this.bindings={};return this}once(e,t,n){return this.on(e,t,n,{once:!0})}has(e){e=e.toLowerCase();const t=this.bindings[e];return!(!t||0===t.length)}}const lT=e=>(e._eventDispatcher||(e._eventDispatcher=new iT({scope:e,toggleEvent:(t,n)=>{iT.isNative(t)&&e.toggleNativeEvent&&e.toggleNativeEvent(t,n)}})),e._eventDispatcher),dT={fire(e,t,n){return this.dispatch(e,t,n)},dispatch(e,t,n){const o=this;if(o.removed&&"remove"!==e&&"detach"!==e)return ga(e.toLowerCase(),null!=t?t:{},o);const r=lT(o).dispatch(e,t);if(!1!==n&&o.parent){let t=o.parent();for(;t&&!r.isPropagationStopped();)t.dispatch(e,r,!1),t=t.parent?t.parent():void 0}return r},on(e,t,n){return lT(this).on(e,t,n)},off(e,t){return lT(this).off(e,t)},once(e,t){return lT(this).once(e,t)},hasEventListeners(e){return lT(this).has(e)}},cT=Oa.DOM;let uT;const mT=(e,t)=>{if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^(?:mouse|touch|click|contextmenu|drop|dragover|dragend)/.test(t))return e.getDoc().documentElement;const n=od(e);return n?(e.eventRoot||(e.eventRoot=cT.select(n)[0]),e.eventRoot):e.getBody()},fT=(e,t,n)=>{(e=>!e.hidden&&!oT(e))(e)?e.dispatch(t,n):oT(e)&&((e,t)=>{if((e=>"click"===e.type)(t)&&!ef.metaKeyPressed(t)){const n=yn(t.target);((e,t)=>to(t,"a",(t=>En(t,yn(e.getBody())))).bind((e=>tn(e,"href"))))(e,n).each((n=>{if(t.preventDefault(),/^#/.test(n)){const t=e.dom.select(`${n},[name="${ze(n,"#")}"]`);t.length&&e.selection.scrollIntoView(t[0],!0)}else window.open(n,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))}else(e=>H(sT,e.type))(t)&&e.dispatch(t.type,t)})(e,n)},gT=(e,t)=>{if(e.delegates||(e.delegates={}),e.delegates[t]||e.removed)return;const n=mT(e,t);if(od(e)){if(uT||(uT={},e.editorManager.on("removeEditor",(()=>{e.editorManager.activeEditor||uT&&(ge(uT,((t,n)=>{e.dom.unbind(mT(e,n))})),uT=null)}))),uT[t])return;const o=n=>{const o=n.target,r=e.editorManager.get();let s=r.length;for(;s--;){const e=r[s].getBody();(e===o||cT.isChildOf(o,e))&&fT(r[s],t,n)}};uT[t]=o,cT.bind(n,t,o)}else{const o=n=>{fT(e,t,n)};cT.bind(n,t,o),e.delegates[t]=o}},pT={...dT,bindPendingEventDelegates(){const e=this;Dt.each(e._pendingNativeEvents,(t=>{gT(e,t)}))},toggleNativeEvent(e,t){const n=this;"focus"!==e&&"blur"!==e&&(n.removed||(t?n.initialized?gT(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&n.delegates&&(n.dom.unbind(mT(n,e),e,n.delegates[e]),delete n.delegates[e])))},unbindAllNativeEvents(){const e=this,t=e.getBody(),n=e.dom;e.delegates&&(ge(e.delegates,((t,n)=>{e.dom.unbind(mT(e,n),n,t)})),delete e.delegates),!e.inline&&t&&n&&(t.onload=null,n.unbind(e.getWin()),n.unbind(e.getDoc())),n&&(n.unbind(t),n.unbind(e.getContainer()))}},hT=e=>m(e)?{value:e.split(/[ ,]/),valid:!0}:k(e,m)?{value:e,valid:!0}:{valid:!1,message:"The value must be a string[] or a comma/space separated string."},bT=(e,t)=>e+(Ye(t.message)?"":`. ${t.message}`),vT=e=>e.valid,yT=(e,t,n="")=>{const o=t(e);return b(o)?o?{value:e,valid:!0}:{valid:!1,message:n}:o},CT=["design","readonly"],wT=(e,t,n,o)=>{const r=n[t.get()],s=n[o];try{s.activate()}catch(e){return void console.error(`problem while activating editor mode ${o}:`,e)}r.deactivate(),r.editorReadOnly!==s.editorReadOnly&&nT(e,s.editorReadOnly),t.set(o),((e,t)=>{e.dispatch("SwitchMode",{mode:t})})(e,o)},xT=Dt.each,kT=Dt.explode,ET={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},ST=Dt.makeMap("alt,ctrl,shift,meta,access"),_T=e=>{const t={},n=At.os.isMacOS()||At.os.isiOS();xT(kT(e.toLowerCase(),"+"),(e=>{(e=>e in ST)(e)?t[e]=!0:/^[0-9]{2,}$/.test(e)?t.keyCode=parseInt(e,10):(t.charCode=e.charCodeAt(0),t.keyCode=ET[e]||e.toUpperCase().charCodeAt(0))}));const o=[t.keyCode];let r;for(r in ST)t[r]?o.push(r):t[r]=!1;return t.id=o.join(","),t.access&&(t.alt=!0,n?t.ctrl=!0:t.shift=!0),t.meta&&(n?t.meta=!0:(t.ctrl=!0,t.meta=!1)),t};class NT{constructor(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;const t=this;e.on("keyup keypress keydown",(e=>{!t.hasModifier(e)&&!t.isFunctionKey(e)||e.isDefaultPrevented()||(xT(t.shortcuts,(n=>{t.matchShortcut(e,n)&&(t.pendingPatterns=n.subpatterns.slice(0),"keydown"===e.type&&t.executeShortcutAction(n))})),t.matchShortcut(e,t.pendingPatterns[0])&&(1===t.pendingPatterns.length&&"keydown"===e.type&&t.executeShortcutAction(t.pendingPatterns[0]),t.pendingPatterns.shift()))}))}add(e,t,n,o){const r=this,s=r.normalizeCommandFunc(n);return xT(kT(Dt.trim(e)),(e=>{const n=r.createShortcut(e,t,s,o);r.shortcuts[n.id]=n})),!0}remove(e){const t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)}normalizeCommandFunc(e){const t=this,n=e;return"string"==typeof n?()=>{t.editor.execCommand(n,!1,null)}:Dt.isArray(n)?()=>{t.editor.execCommand(n[0],n[1],n[2])}:n}createShortcut(e,t,n,o){const r=Dt.map(kT(e,">"),_T);return r[r.length-1]=Dt.extend(r[r.length-1],{func:n,scope:o||this.editor}),Dt.extend(r[0],{desc:this.editor.translate(t),subpatterns:r.slice(1)})}hasModifier(e){return e.altKey||e.ctrlKey||e.metaKey}isFunctionKey(e){return"keydown"===e.type&&e.keyCode>=112&&e.keyCode<=123}matchShortcut(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)}executeShortcutAction(e){return e.func?e.func.call(e.scope):null}}const RT=()=>{const e=(()=>{const e={},t={},n={},o={},r={},s={},a={},i={},l=(e,t)=>(n,o)=>{e[n.toLowerCase()]={...o,type:t}};return{addButton:l(e,"button"),addGroupToolbarButton:l(e,"grouptoolbarbutton"),addToggleButton:l(e,"togglebutton"),addMenuButton:l(e,"menubutton"),addSplitButton:l(e,"splitbutton"),addMenuItem:l(t,"menuitem"),addNestedMenuItem:l(t,"nestedmenuitem"),addToggleMenuItem:l(t,"togglemenuitem"),addAutocompleter:l(n,"autocompleter"),addContextMenu:l(r,"contextmenu"),addContextToolbar:l(s,"contexttoolbar"),addContextForm:l(s,"contextform"),addSidebar:l(a,"sidebar"),addView:l(i,"views"),addIcon:(e,t)=>o[e.toLowerCase()]=t,getAll:()=>({buttons:e,menuItems:t,icons:o,popups:n,contextMenus:r,contextToolbars:s,sidebars:a,views:i})}})();return{addAutocompleter:e.addAutocompleter,addButton:e.addButton,addContextForm:e.addContextForm,addContextMenu:e.addContextMenu,addContextToolbar:e.addContextToolbar,addIcon:e.addIcon,addMenuButton:e.addMenuButton,addMenuItem:e.addMenuItem,addNestedMenuItem:e.addNestedMenuItem,addSidebar:e.addSidebar,addSplitButton:e.addSplitButton,addToggleButton:e.addToggleButton,addGroupToolbarButton:e.addGroupToolbarButton,addToggleMenuItem:e.addToggleMenuItem,addView:e.addView,getAll:e.getAll}},AT=Oa.DOM,OT=Dt.extend,TT=Dt.each;class BT{constructor(e,t,n){this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.composing=!1,this.destroyed=!1,this.hasHiddenInput=!1,this.iframeElement=null,this.initialized=!1,this.readonly=!1,this.removed=!1,this.startContent="",this._pendingNativeEvents=[],this._skinLoaded=!1,this._editableRoot=!0,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,OT(this,pT);const o=this;this.id=e,this.hidden=!1;const r=((e,t)=>LO(RO||AO,RO,t,e,t))(n.defaultOptions,t);this.options=((e,t)=>{const n={},o={},r=(e,t,n)=>{const r=yT(t,n);return vT(r)?(o[e]=r.value,!0):(console.warn(bT(`Invalid value passed for the ${e} option`,r)),!1)},s=e=>ke(n,e);return{register:(e,s)=>{const a=(e=>m(e.processor))(s)?(e=>{const t=(()=>{switch(e){case"array":return p;case"boolean":return b;case"function":return w;case"number":return x;case"object":return f;case"string":return m;case"string[]":return hT;case"object[]":return e=>k(e,f);case"regexp":return e=>u(e,RegExp);default:return M}})();return n=>yT(n,t,`The value must be a ${e}.`)})(s.processor):s.processor,i=((e,t,n)=>{if(!v(t)){const o=yT(t,n);if(vT(o))return o.value;console.error(bT(`Invalid default value passed for the "${e}" option`,o))}})(e,s.default,a);n[e]={...s,default:i,processor:a},xe(o,e).orThunk((()=>xe(t,e))).each((t=>r(e,t,a)))},isRegistered:s,get:e=>xe(o,e).orThunk((()=>xe(n,e).map((e=>e.default)))).getOrUndefined(),set:(e,t)=>{if(s(e)){const o=n[e];return o.immutable?(console.error(`"${e}" is an immutable option and cannot be updated`),!1):r(e,t,o.processor)}return console.warn(`"${e}" is not a registered option. Ensure the option has been registered before setting a value.`),!1},unset:e=>{const t=s(e);return t&&delete o[e],t},isSet:e=>ke(o,e)}})(0,r),(e=>{const t=e.options.register;t("id",{processor:"string",default:e.id}),t("selector",{processor:"string"}),t("target",{processor:"object"}),t("suffix",{processor:"string"}),t("cache_suffix",{processor:"string"}),t("base_url",{processor:"string"}),t("referrer_policy",{processor:"string",default:""}),t("language_load",{processor:"boolean",default:!0}),t("inline",{processor:"boolean",default:!1}),t("iframe_attrs",{processor:"object",default:{}}),t("doctype",{processor:"string",default:"<!DOCTYPE html>"}),t("document_base_url",{processor:"string",default:e.documentBaseUrl}),t("body_id",{processor:yl(e,"tinymce"),default:"tinymce"}),t("body_class",{processor:yl(e),default:""}),t("content_security_policy",{processor:"string",default:""}),t("br_in_pre",{processor:"boolean",default:!0}),t("forced_root_block",{processor:e=>{const t=m(e)&&Ge(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be a non-empty string."}},default:"p"}),t("forced_root_block_attrs",{processor:"object",default:{}}),t("newline_behavior",{processor:e=>{const t=H(["block","linebreak","invert","default"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: block, linebreak, invert or default."}},default:"default"}),t("br_newline_selector",{processor:"string",default:".mce-toc h2,figcaption,caption"}),t("no_newline_selector",{processor:"string",default:""}),t("keep_styles",{processor:"boolean",default:!0}),t("end_container_on_empty_block",{processor:e=>b(e)||m(e)?{valid:!0,value:e}:{valid:!1,message:"Must be boolean or a string"},default:"blockquote"}),t("font_size_style_values",{processor:"string",default:"xx-small,x-small,small,medium,large,x-large,xx-large"}),t("font_size_legacy_values",{processor:"string",default:"xx-small,small,medium,large,x-large,xx-large,300%"}),t("font_size_classes",{processor:"string",default:""}),t("automatic_uploads",{processor:"boolean",default:!0}),t("images_reuse_filename",{processor:"boolean",default:!1}),t("images_replace_blob_uris",{processor:"boolean",default:!0}),t("icons",{processor:"string",default:""}),t("icons_url",{processor:"string",default:""}),t("images_upload_url",{processor:"string",default:""}),t("images_upload_base_path",{processor:"string",default:""}),t("images_upload_credentials",{processor:"boolean",default:!1}),t("images_upload_handler",{processor:"function"}),t("language",{processor:"string",default:"en"}),t("language_url",{processor:"string",default:""}),t("entity_encoding",{processor:"string",default:"named"}),t("indent",{processor:"boolean",default:!0}),t("indent_before",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_after",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_use_margin",{processor:"boolean",default:!1}),t("indentation",{processor:"string",default:"40px"}),t("content_css",{processor:e=>{const t=!1===e||m(e)||k(e,m);return t?m(e)?{value:q(e.split(","),Ve),valid:t}:p(e)?{value:e,valid:t}:!1===e?{value:[],valid:t}:{value:e,valid:t}:{valid:!1,message:"Must be false, a string or an array of strings."}},default:pd(e)?[]:["default"]}),t("content_style",{processor:"string"}),t("content_css_cors",{processor:"boolean",default:!1}),t("font_css",{processor:e=>{const t=m(e)||k(e,m);return t?{value:p(e)?e:q(e.split(","),Ve),valid:t}:{valid:!1,message:"Must be a string or an array of strings."}},default:[]}),t("inline_boundaries",{processor:"boolean",default:!0}),t("inline_boundaries_selector",{processor:"string",default:"a[href],code,span.mce-annotation"}),t("object_resizing",{processor:e=>{const t=b(e)||m(e);return t?!1===e||fl.isiPhone()||fl.isiPad()?{value:"",valid:t}:{value:!0===e?"table,img,figure.image,div,video,iframe":e,valid:t}:{valid:!1,message:"Must be boolean or a string"}},default:!gl}),t("resize_img_proportional",{processor:"boolean",default:!0}),t("event_root",{processor:"object"}),t("service_message",{processor:"string"}),t("theme",{processor:e=>!1===e||m(e)||w(e),default:"silver"}),t("theme_url",{processor:"string"}),t("formats",{processor:"object"}),t("format_empty_lines",{processor:"boolean",default:!1}),t("format_noneditable_selector",{processor:"string",default:""}),t("preview_styles",{processor:e=>{const t=!1===e||m(e);return t?{value:!1===e?"":e,valid:t}:{valid:!1,message:"Must be false or a string"}},default:"font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"}),t("custom_ui_selector",{processor:"string",default:""}),t("hidden_input",{processor:"boolean",default:!0}),t("submit_patch",{processor:"boolean",default:!0}),t("encoding",{processor:"string"}),t("add_form_submit_trigger",{processor:"boolean",default:!0}),t("add_unload_trigger",{processor:"boolean",default:!0}),t("custom_undo_redo_levels",{processor:"number",default:0}),t("disable_nodechange",{processor:"boolean",default:!1}),t("readonly",{processor:"boolean",default:!1}),t("editable_root",{processor:"boolean",default:!0}),t("plugins",{processor:"string[]",default:[]}),t("external_plugins",{processor:"object"}),t("forced_plugins",{processor:"string[]"}),t("model",{processor:"string",default:e.hasPlugin("rtc")?"plugin":"dom"}),t("model_url",{processor:"string"}),t("block_unsupported_drop",{processor:"boolean",default:!0}),t("visual",{processor:"boolean",default:!0}),t("visual_table_class",{processor:"string",default:"mce-item-table"}),t("visual_anchor_class",{processor:"string",default:"mce-item-anchor"}),t("iframe_aria_text",{processor:"string",default:"Rich Text Area. Press ALT-0 for help."}),t("setup",{processor:"function"}),t("init_instance_callback",{processor:"function"}),t("url_converter",{processor:"function",default:e.convertURL}),t("url_converter_scope",{processor:"object",default:e}),t("urlconverter_callback",{processor:"function"}),t("allow_conditional_comments",{processor:"boolean",default:!1}),t("allow_html_data_urls",{processor:"boolean",default:!1}),t("allow_svg_data_urls",{processor:"boolean"}),t("allow_html_in_named_anchor",{processor:"boolean",default:!1}),t("allow_script_urls",{processor:"boolean",default:!1}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("convert_fonts_to_spans",{processor:"boolean",default:!0,deprecated:!0}),t("fix_list_elements",{processor:"boolean",default:!1}),t("preserve_cdata",{processor:"boolean",default:!1}),t("remove_trailing_brs",{processor:"boolean",default:!0}),t("pad_empty_with_br",{processor:"boolean",default:!1}),t("inline_styles",{processor:"boolean",default:!0,deprecated:!0}),t("element_format",{processor:"string",default:"html"}),t("entities",{processor:"string"}),t("schema",{processor:"string",default:"html5"}),t("convert_urls",{processor:"boolean",default:!0}),t("relative_urls",{processor:"boolean",default:!0}),t("remove_script_host",{processor:"boolean",default:!0}),t("custom_elements",{processor:"string"}),t("extended_valid_elements",{processor:"string"}),t("invalid_elements",{processor:"string"}),t("invalid_styles",{processor:vl}),t("valid_children",{processor:"string"}),t("valid_classes",{processor:vl}),t("valid_elements",{processor:"string"}),t("valid_styles",{processor:vl}),t("verify_html",{processor:"boolean",default:!0}),t("auto_focus",{processor:e=>m(e)||!0===e}),t("browser_spellcheck",{processor:"boolean",default:!1}),t("protect",{processor:"array"}),t("images_file_types",{processor:"string",default:"jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp"}),t("deprecation_warnings",{processor:"boolean",default:!0}),t("a11y_advanced_options",{processor:"boolean",default:!1}),t("api_key",{processor:"string"}),t("paste_block_drop",{processor:"boolean",default:!1}),t("paste_data_images",{processor:"boolean",default:!0}),t("paste_preprocess",{processor:"function"}),t("paste_postprocess",{processor:"function"}),t("paste_webkit_styles",{processor:"string",default:"none"}),t("paste_remove_styles_if_webkit",{processor:"boolean",default:!0}),t("paste_merge_formats",{processor:"boolean",default:!0}),t("smart_paste",{processor:"boolean",default:!0}),t("paste_as_text",{processor:"boolean",default:!1}),t("paste_tab_spaces",{processor:"number",default:4}),t("text_patterns",{processor:e=>k(e,f)||!1===e?{value:ml(!1===e?[]:e),valid:!0}:{valid:!1,message:"Must be an array of objects or false."},default:[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}]}),t("text_patterns_lookup",{processor:e=>{return w(e)?{value:(t=e,e=>{const n=t(e);return ml(n)}),valid:!0}:{valid:!1,message:"Must be a single function"};var t},default:e=>[]}),t("noneditable_class",{processor:"string",default:"mceNonEditable"}),t("editable_class",{processor:"string",default:"mceEditable"}),t("noneditable_regexp",{processor:e=>k(e,hl)?{value:e,valid:!0}:hl(e)?{value:[e],valid:!0}:{valid:!1,message:"Must be a RegExp or an array of RegExp."},default:[]}),t("table_tab_navigation",{processor:"boolean",default:!0}),t("highlight_on_focus",{processor:"boolean",default:!1}),t("xss_sanitization",{processor:"boolean",default:!0}),t("details_initial_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("details_serialized_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("init_content_sync",{processor:"boolean",default:!1}),t("newdocument_content",{processor:"string",default:""}),e.on("ScriptsLoaded",(()=>{t("directionality",{processor:"string",default:Ia.isRtl()?"rtl":void 0}),t("placeholder",{processor:"string",default:pl.getAttrib(e.getElement(),"placeholder")})}))})(o);const s=this.options.get;s("deprecation_warnings")&&((e,t)=>{((e,t)=>{const n=ew(e),o=ow(t),r=o.length>0,s=n.length>0,a="mobile"===t.theme;if(r||s||a){const e="\n- ",t=a?`\n\nThemes:${e}mobile`:"",i=r?`\n\nPlugins:${e}${o.join(e)}`:"",l=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled and have been removed in TinyMCE 6.0. These features will no longer work and should be removed from the TinyMCE configuration. See https://www.tiny.cloud/docs/tinymce/6/migration-from-5x/ for more information."+t+i+l)}})(e,t),((e,t)=>{const n=tw(e),o=rw(t),r=o.length>0,s=n.length>0;if(r||s){const e="\n- ",t=r?`\n\nPlugins:${e}${o.map(sw).join(e)}`:"",a=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled but will be removed soon."+t+a)}})(e,t)})(t,r);const a=s("suffix");a&&(n.suffix=a),this.suffix=n.suffix;const i=s("base_url");i&&n._setBaseUrl(i),this.baseUri=n.baseURI;const l=ql(o);l&&(Ba.ScriptLoader._setReferrerPolicy(l),Oa.DOM.styleSheetLoader._setReferrerPolicy(l));const d=Ed(o);C(d)&&Oa.DOM.styleSheetLoader._setContentCssCors(d),Fa.languageLoad=s("language_load"),Fa.baseURL=n.baseURL,this.setDirty(!1),this.documentBaseURI=new qy(xl(o),{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=pd(o),this.hasVisual=Rd(o),this.shortcuts=new NT(this),this.editorCommands=new JO(this),YO(this);const c=s("cache_suffix");c&&(At.cacheSuffix=c.replace(/^[\?\&]+/,"")),this.ui={registry:RT(),styleSheetLoader:void 0,show:E,hide:E,setEnabled:E,isEnabled:M},this.mode=(e=>{const t=Da("design"),n=Da({design:{activate:E,deactivate:E,editorReadOnly:!1},readonly:{activate:E,deactivate:E,editorReadOnly:!0}});return(e=>{e.serializer?rT(e):e.on("PreInit",(()=>{rT(e)}))})(e),(e=>{e.on("ShowCaret",(t=>{oT(e)&&t.preventDefault()})),e.on("ObjectSelected",(t=>{oT(e)&&t.preventDefault()}))})(e),{isReadOnly:()=>oT(e),set:o=>((e,t,n,o)=>{if(o!==n.get()){if(!ke(t,o))throw new Error(`Editor mode '${o}' is invalid`);e.initialized?wT(e,n,t,o):e.on("init",(()=>wT(e,n,t,o)))}})(e,n.get(),t,o),get:()=>t.get(),register:(e,t)=>{n.set(((e,t,n)=>{if(H(CT,t))throw new Error(`Cannot override default mode ${t}`);return{...e,[t]:{...n,deactivate:()=>{try{n.deactivate()}catch(e){console.error(`problem while deactivating editor mode ${t}:`,e)}}}}})(n.get(),e,t))}}})(o),n.dispatch("SetupEditor",{editor:this});const g=Bd(o);w(g)&&g.call(o,o)}render(){(e=>{const t=e.id;Ia.setCode(Vl(e));const n=()=>{kO.unbind(window,"ready",n),e.render()};if(!Ca.Event.domLoaded)return void kO.bind(window,"ready",n);if(!e.getElement())return;const o=yn(e.getElement()),r=rn(o);e.on("remove",(()=>{W(o.dom.attributes,(e=>on(o,e.name))),Zt(o,r)})),e.ui.styleSheetLoader=((e,t)=>Ms.forElement(e,{contentCssCors:Ed(t),referrerPolicy:ql(t)}))(o,e),pd(e)?e.inline=!0:(e.orgVisibility=e.getElement().style.visibility,e.getElement().style.visibility="hidden");const s=e.getElement().form||kO.getParent(t,"form");s&&(e.formElement=s,hd(e)&&!Qo(e.getElement())&&(kO.insertAfter(kO.create("input",{type:"hidden",name:t}),t),e.hasHiddenInput=!0),e.formEventDelegate=t=>{e.dispatch(t.type,t)},kO.bind(s,"submit reset",e.formEventDelegate),e.on("reset",(()=>{e.resetContent()})),!bd(e)||s.submit.nodeType||s.submit.length||s._mceOldSubmit||(s._mceOldSubmit=s.submit,s.submit=()=>(e.editorManager.triggerSave(),e.setDirty(!1),s._mceOldSubmit(s)))),e.windowManager=yw(e),e.notificationManager=hw(e),(e=>"xml"===e.options.get("encoding"))(e)&&e.on("GetContent",(e=>{e.save&&(e.content=kO.encode(e.content))})),vd(e)&&e.on("submit",(()=>{e.initialized&&e.save()})),yd(e)&&(e._beforeUnload=()=>{!e.initialized||e.destroyed||e.isHidden()||e.save({format:"raw",no_events:!0,set_dirty:!1})},e.editorManager.on("BeforeUnload",e._beforeUnload)),e.editorManager.add(e),_O(e,e.suffix)})(this)}focus(e){this.execCommand("mceFocus",!1,e)}hasFocus(){return xg(this)}translate(e){return Ia.translate(e)}getParam(e,t,n){const o=this.options;return o.isRegistered(e)||(C(n)?o.register(e,{processor:n,default:t}):o.register(e,{processor:M,default:t})),o.isSet(e)||v(t)?o.get(e):t}hasPlugin(e,t){return!(!H(Sd(this),e)||t&&void 0===bw.get(e))}nodeChanged(e){this._nodeChangeDispatcher.nodeChanged(e)}addCommand(e,t,n){this.editorCommands.addCommand(e,t,n)}addQueryStateHandler(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)}addQueryValueHandler(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)}addShortcut(e,t,n,o){this.shortcuts.add(e,t,n,o)}execCommand(e,t,n,o){return this.editorCommands.execCommand(e,t,n,o)}queryCommandState(e){return this.editorCommands.queryCommandState(e)}queryCommandValue(e){return this.editorCommands.queryCommandValue(e)}queryCommandSupported(e){return this.editorCommands.queryCommandSupported(e)}show(){const e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable="true":(AT.show(e.getContainer()),AT.hide(e.id)),e.load(),e.dispatch("show"))}hide(){const e=this;e.hidden||(e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(AT.hide(e.getContainer()),AT.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.dispatch("hide"))}isHidden(){return this.hidden}setProgressState(e,t){this.dispatch("ProgressState",{state:e,time:t})}load(e={}){const t=this,n=t.getElement();if(t.removed)return"";if(n){const o={...e,load:!0},r=Qo(n)?n.value:n.innerHTML,s=t.setContent(r,o);return o.no_events||t.dispatch("LoadContent",{...o,element:n}),s}return""}save(e={}){const t=this;let n=t.getElement();if(!n||!t.initialized||t.removed)return"";const o={...e,save:!0,element:n};let r=t.getContent(o);const s={...o,content:r};if(s.no_events||t.dispatch("SaveContent",s),"raw"===s.format&&t.dispatch("RawSaveContent",s),r=s.content,Qo(n))n.value=r;else{!e.is_removing&&t.inline||(n.innerHTML=r);const o=AT.getParent(t.id,"form");o&&TT(o.elements,(e=>e.name!==t.id||(e.value=r,!1)))}return s.element=o.element=n=null,!1!==s.set_dirty&&t.setDirty(!1),r}setContent(e,t){return GC(this,e,t)}getContent(e){return((e,t={})=>{const n=((e,t)=>({...e,format:t,get:!0,getInner:!0}))(t,t.format?t.format:"html");return sC(e,n).fold(R,(t=>{const n=((e,t)=>IC(e).editor.getContent(t))(e,t);return aC(e,n,t)}))})(this,e)}insertContent(e,t){t&&(e=OT({content:e},t)),this.execCommand("mceInsertContent",!1,e)}resetContent(e){void 0===e?GC(this,this.startContent,{format:"raw"}):GC(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()}isDirty(){return!this.isNotDirty}setDirty(e){const t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.dispatch("dirty")}getContainer(){const e=this;return e.container||(e.container=e.editorContainer||AT.get(e.id+"_parent")),e.container}getContentAreaContainer(){return this.contentAreaContainer}getElement(){return this.targetElm||(this.targetElm=AT.get(this.id)),this.targetElm}getWin(){const e=this;if(!e.contentWindow){const t=e.iframeElement;t&&(e.contentWindow=t.contentWindow)}return e.contentWindow}getDoc(){const e=this;if(!e.contentDocument){const t=e.getWin();t&&(e.contentDocument=t.document)}return e.contentDocument}getBody(){var e,t;const n=this.getDoc();return null!==(t=null!==(e=this.bodyElement)&&void 0!==e?e:null==n?void 0:n.body)&&void 0!==t?t:null}convertURL(e,t,n){const o=this,r=o.options.get,s=Pd(o);return w(s)?s.call(o,e,n,!0,t):!r("convert_urls")||"link"===n||f(n)&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length?e:r("relative_urls")?o.documentBaseURI.toRelative(e):e=o.documentBaseURI.toAbsolute(e,r("remove_script_host"))}addVisual(e){((e,t)=>{((e,t)=>{FC(e).editor.addVisual(t)})(e,t)})(this,e)}setEditableRoot(e){((e,t)=>{e._editableRoot!==t&&(e._editableRoot=t,e.readonly||(e.getBody().contentEditable=String(e.hasEditableRoot()),e.nodeChanged()),((e,t)=>{e.dispatch("EditableRootStateChange",{state:t})})(e,t))})(this,e)}hasEditableRoot(){return this._editableRoot}remove(){(e=>{if(!e.removed){const{_selectionOverrides:t,editorUpload:n}=e,o=e.getBody(),r=e.getElement();o&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&C(null==r?void 0:r.nextSibling)&&aw.remove(r.nextSibling),(e=>{e.dispatch("remove")})(e),e.editorManager.remove(e),!e.inline&&o&&(e=>{aw.setStyle(e.id,"display",e.orgDisplay)})(e),(e=>{e.dispatch("detach")})(e),aw.remove(e.getContainer()),iw(t),iw(n),e.destroy()}})(this)}destroy(e){((e,t)=>{const{selection:n,dom:o}=e;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),iw(n),iw(o)),(e=>{const t=e.formElement;t&&(t._mceOldSubmit&&(t.submit=t._mceOldSubmit,delete t._mceOldSubmit),aw.unbind(t,"submit reset",e.formEventDelegate))})(e),(e=>{const t=e;t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null;const n=e.selection;if(n){const e=n.dom;t.selection=n.win=n.dom=e.doc=null}})(e),e.destroyed=!0):e.remove())})(this,e)}uploadImages(){return this.editorUpload.uploadImages()}_scanForImages(){return this.editorUpload.scanForImages()}}const DT=Oa.DOM,PT=Dt.each;let LT,MT=!1,IT=[];const FT=e=>{const t=e.type;PT(HT.get(),(n=>{switch(t){case"scroll":n.dispatch("ScrollWindow",e);break;case"resize":n.dispatch("ResizeWindow",e)}}))},UT=e=>{if(e!==MT){const t=Oa.DOM;e?(t.bind(window,"resize",FT),t.bind(window,"scroll",FT)):(t.unbind(window,"resize",FT),t.unbind(window,"scroll",FT)),MT=e}},zT=e=>{const t=IT;return IT=G(IT,(t=>e!==t)),HT.activeEditor===e&&(HT.activeEditor=IT.length>0?IT[0]:null),HT.focusedEditor===e&&(HT.focusedEditor=null),t.length!==IT.length},jT="CSS1Compat"!==document.compatMode,HT={...dT,baseURI:null,baseURL:null,defaultOptions:{},documentBaseURL:null,suffix:null,majorVersion:"6",minorVersion:"7.2",releaseDate:"2023-10-25",i18n:Ia,activeEditor:null,focusedEditor:null,setup(){const e=this;let t="",n="",o=qy.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(o)&&(o=o.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(o)||(o+="/"));const r=window.tinymce||window.tinyMCEPreInit;if(r)t=r.base||r.baseURL,n=r.suffix;else{const e=document.getElementsByTagName("script");for(let o=0;o<e.length;o++){const r=e[o].src||"";if(""===r)continue;const s=r.substring(r.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(r)){-1!==s.indexOf(".min")&&(n=".min"),t=r.substring(0,r.lastIndexOf("/"));break}}if(!t&&document.currentScript){const e=document.currentScript.src;-1!==e.indexOf(".min")&&(n=".min"),t=e.substring(0,e.lastIndexOf("/"))}}var s;e.baseURL=new qy(o).toAbsolute(t),e.documentBaseURL=o,e.baseURI=new qy(e.baseURL),e.suffix=n,(s=e).on("AddEditor",O(vg,s)),s.on("RemoveEditor",O(yg,s))},overrideDefaults(e){const t=e.base_url;t&&this._setBaseUrl(t);const n=e.suffix;n&&(this.suffix=n),this.defaultOptions=e;const o=e.plugin_base_urls;void 0!==o&&ge(o,((e,t)=>{Fa.PluginManager.urls[t]=e}))},init(e){const t=this;let n;const o=Dt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," ");let r=e=>{n=e};const s=()=>{let n=0;const a=[];let i;DT.unbind(window,"ready",s),(n=>{const o=e.onpageload;o&&o.apply(t,[])})(),i=((e,t)=>{const n=[],o=w(t)?e=>$(n,(n=>t(n,e))):e=>H(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n})((e=>At.browser.isIE()||At.browser.isEdge()?(Ew("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tiny.cloud/docs/tinymce/6/support/#supportedwebbrowsers"),[]):jT?(Ew("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[]):m(e.selector)?DT.select(e.selector):C(e.target)?[e.target]:[])(e)),Dt.each(i,(e=>{var n;(n=t.get(e.id))&&n.initialized&&!(n.getContainer()||n.getBody()).parentNode&&(zT(n),n.unbindAllNativeEvents(),n.destroy(!0),n.removed=!0)})),i=Dt.grep(i,(e=>!t.get(e.id))),0===i.length?r([]):PT(i,(s=>{((e,t)=>e.inline&&t.tagName.toLowerCase()in o)(e,s)?Ew("Could not initialize inline editor on invalid inline target element",s):((e,o,s)=>{const l=new BT(e,o,t);a.push(l),l.on("init",(()=>{++n===i.length&&r(a)})),l.targetElm=l.targetElm||s,l.render()})((e=>{let t=e.id;return t||(t=xe(e,"name").filter((e=>!DT.get(e))).getOrThunk(DT.uniqueId),e.setAttribute("id",t)),t})(s),e,s)}))};return DT.bind(window,"ready",s),new Promise((e=>{n?e(n):r=t=>{e(t)}}))},get(e){return 0===arguments.length?IT.slice(0):m(e)?J(IT,(t=>t.id===e)).getOr(null):x(e)&&IT[e]?IT[e]:null},add(e){const t=this,n=t.get(e.id);return n===e||(null===n&&IT.push(e),UT(!0),t.activeEditor=e,t.dispatch("AddEditor",{editor:e}),LT||(LT=e=>{const n=t.dispatch("BeforeUnload");if(n.returnValue)return e.preventDefault(),e.returnValue=n.returnValue,n.returnValue},window.addEventListener("beforeunload",LT))),e},createEditor(e,t){return this.add(new BT(e,t,this))},remove(e){const t=this;let n;if(e){if(!m(e))return n=e,h(t.get(n.id))?null:(zT(n)&&t.dispatch("RemoveEditor",{editor:n}),0===IT.length&&window.removeEventListener("beforeunload",LT),n.remove(),UT(IT.length>0),n);PT(DT.select(e),(e=>{n=t.get(e.id),n&&t.remove(n)}))}else for(let e=IT.length-1;e>=0;e--)t.remove(IT[e])},execCommand(e,t,n){var o;const r=this,s=f(n)?null!==(o=n.id)&&void 0!==o?o:n.index:n;switch(e){case"mceAddEditor":if(!r.get(s)){const e=n.options;new BT(s,e,r).render()}return!0;case"mceRemoveEditor":{const e=r.get(s);return e&&e.remove(),!0}case"mceToggleEditor":{const e=r.get(s);return e?(e.isHidden()?e.show():e.hide(),!0):(r.execCommand("mceAddEditor",!1,n),!0)}}return!!r.activeEditor&&r.activeEditor.execCommand(e,t,n)},triggerSave:()=>{PT(IT,(e=>{e.save()}))},addI18n:(e,t)=>{Ia.add(e,t)},translate:e=>Ia.translate(e),setActive(e){const t=this.activeEditor;this.activeEditor!==e&&(t&&t.dispatch("deactivate",{relatedTarget:e}),e.dispatch("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl(e){this.baseURL=new qy(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new qy(this.baseURL)}};HT.setup();const $T=(()=>{const e=za();return{FakeClipboardItem:e=>({items:e,types:me(e),getType:t=>xe(e,t).getOrUndefined()}),write:t=>{e.set(t)},read:()=>e.get().getOrUndefined(),clear:e.clear}})(),qT=Math.min,VT=Math.max,WT=Math.round,KT=(e,t,n)=>{let o=t.x,r=t.y;const s=e.w,a=e.h,i=t.w,l=t.h,d=(n||"").split("");return"b"===d[0]&&(r+=l),"r"===d[1]&&(o+=i),"c"===d[0]&&(r+=WT(l/2)),"c"===d[1]&&(o+=WT(i/2)),"b"===d[3]&&(r-=a),"r"===d[4]&&(o-=s),"c"===d[3]&&(r-=WT(a/2)),"c"===d[4]&&(o-=WT(s/2)),GT(o,r,s,a)},GT=(e,t,n,o)=>({x:e,y:t,w:n,h:o}),YT={inflate:(e,t,n)=>GT(e.x-t,e.y-n,e.w+2*t,e.h+2*n),relativePosition:KT,findBestRelativePosition:(e,t,n,o)=>{for(let r=0;r<o.length;r++){const s=KT(e,t,o[r]);if(s.x>=n.x&&s.x+s.w<=n.w+n.x&&s.y>=n.y&&s.y+s.h<=n.h+n.y)return o[r]}return null},intersect:(e,t)=>{const n=VT(e.x,t.x),o=VT(e.y,t.y),r=qT(e.x+e.w,t.x+t.w),s=qT(e.y+e.h,t.y+t.h);return r-n<0||s-o<0?null:GT(n,o,r-n,s-o)},clamp:(e,t,n)=>{let o=e.x,r=e.y,s=e.x+e.w,a=e.y+e.h;const i=t.x+t.w,l=t.y+t.h,d=VT(0,t.x-o),c=VT(0,t.y-r),u=VT(0,s-i),m=VT(0,a-l);return o+=d,r+=c,n&&(s+=d,a+=c,o-=u,r-=m),s-=u,a-=m,GT(o,r,s-o,a-r)},create:GT,fromClientRect:e=>GT(e.left,e.top,e.width,e.height)},XT=(()=>{const e={},t={};return{load:(n,o)=>{const r=`Script at URL "${o}" failed to load`,s=`Script at URL "${o}" did not call \`tinymce.Resource.add('${n}', data)\` within 1 second`;if(void 0!==e[n])return e[n];{const a=new Promise(((e,a)=>{const i=((e,t,n=1e3)=>{let o=!1,r=null;const s=e=>(...t)=>{o||(o=!0,null!==r&&(clearTimeout(r),r=null),e.apply(null,t))},a=s(e),i=s(t);return{start:(...e)=>{o||null!==r||(r=setTimeout((()=>i.apply(null,e)),n))},resolve:a,reject:i}})(e,a);t[n]=i.resolve,Ba.ScriptLoader.loadScript(o).then((()=>i.start(s)),(()=>i.reject(r)))}));return e[n]=a,a}},add:(n,o)=>{void 0!==t[n]&&(t[n](o),delete t[n]),e[n]=Promise.resolve(o)},unload:t=>{delete e[t]}}})();let QT;try{const e="__storage_test__";QT=window.localStorage,QT.setItem(e,e),QT.removeItem(e)}catch(e){QT=(()=>{let e={},t=[];const n={getItem:t=>e[t]||null,setItem:(n,o)=>{t.push(n),e[n]=String(o)},key:e=>t[e],removeItem:n=>{t=t.filter((e=>e===n)),delete e[n]},clear:()=>{t=[],e={}},length:0};return Object.defineProperty(n,"length",{get:()=>t.length,configurable:!1,enumerable:!1}),n})()}const JT={geom:{Rect:YT},util:{Delay:mg,Tools:Dt,VK:ef,URI:qy,EventDispatcher:iT,Observable:dT,I18n:Ia,LocalStorage:QT,ImageUploader:e=>{const t=Nw(),n=Tw(e,t);return{upload:(t,o=!0)=>n.upload(t,o?Ow(e):void 0)}}},dom:{EventUtils:Ca,TreeWalker:zo,TextSeeker:ai,DOMUtils:Oa,ScriptLoader:Ba,RangeUtils:Df,Serializer:KC,StyleSheetLoader:Ls,ControlSelection:sf,BookmarkManager:Wm,Selection:qC,Event:Ca.Event},html:{Styles:ua,Entities:Zs,Node:Fg,Schema:ca,DomParser:oC,Writer:Yg,Serializer:Xg},Env:At,AddOnManager:Fa,Annotator:Vm,Formatter:$w,UndoManager:Vw,EditorCommands:JO,WindowManager:yw,NotificationManager:hw,EditorObservable:pT,Shortcuts:NT,Editor:BT,FocusManager:ug,EditorManager:HT,DOM:Oa.DOM,ScriptLoader:Ba.ScriptLoader,PluginManager:bw,ThemeManager:vw,ModelManager:dw,IconManager:lw,Resource:XT,FakeClipboard:$T,trim:Dt.trim,isArray:Dt.isArray,is:Dt.is,toArray:Dt.toArray,makeMap:Dt.makeMap,each:Dt.each,map:Dt.map,grep:Dt.grep,inArray:Dt.inArray,extend:Dt.extend,walk:Dt.walk,resolve:Dt.resolve,explode:Dt.explode,_addCacheSuffix:Dt._addCacheSuffix},ZT=Dt.extend(HT,JT);(e=>{window.tinymce=e,window.tinyMCE=e})(ZT),(e=>{if("object"==typeof module)try{module.exports=e}catch(e){}})(ZT)}();
\ No newline at end of file
+!function(){"use strict";var e=function(e){if(null===e)return"null";if(void 0===e)return"undefined";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t},t=function(e){return{eq:e}},n=t((function(e,t){return e===t})),o=function(e){return t((function(t,n){if(t.length!==n.length)return!1;for(var o=t.length,r=0;r<o;r++)if(!e.eq(t[r],n[r]))return!1;return!0}))},r=function(e){return t((function(r,s){var a=Object.keys(r),i=Object.keys(s);if(!function(e,n){return function(e,n){return t((function(t,o){return e.eq(n(t),n(o))}))}(o(e),(function(e){return function(e,t){return Array.prototype.slice.call(e).sort(t)}(e,n)}))}(n).eq(a,i))return!1;for(var l=a.length,d=0;d<l;d++){var c=a[d];if(!e.eq(r[c],s[c]))return!1}return!0}))},s=t((function(t,n){if(t===n)return!0;var a=e(t);return a===e(n)&&(function(e){return-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(e)}(a)?t===n:"array"===a?o(s).eq(t,n):"object"===a&&r(s).eq(t,n))}));const a=Object.getPrototypeOf,i=(e,t,n)=>{var o;return!!n(e,t.prototype)||(null===(o=e.constructor)||void 0===o?void 0:o.name)===t.name},l=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&i(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,d=e=>t=>typeof t===e,c=e=>t=>e===t,u=(e,t)=>f(e)&&i(e,t,((e,t)=>a(e)===t)),m=l("string"),f=l("object"),g=e=>u(e,Object),p=l("array"),h=c(null),b=d("boolean"),v=c(void 0),y=e=>null==e,C=e=>!y(e),w=d("function"),x=d("number"),E=(e,t)=>{if(p(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},_=()=>{},k=(e,t)=>(...n)=>e(t.apply(null,n)),S=(e,t)=>n=>e(t(n)),N=e=>()=>e,R=e=>e,A=(e,t)=>e===t;function T(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}const O=e=>t=>!e(t),B=e=>()=>{throw new Error(e)},P=e=>e(),D=e=>{e()},L=N(!1),M=N(!0);class I{constructor(e,t){this.tag=e,this.value=t}static some(e){return new I(!0,e)}static none(){return I.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?I.some(e(this.value)):I.none()}bind(e){return this.tag?e(this.value):I.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:I.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return C(e)?I.some(e):I.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}I.singletonNone=new I(!1);const F=Array.prototype.slice,U=Array.prototype.indexOf,z=Array.prototype.push,j=(e,t)=>U.call(e,t),H=(e,t)=>j(e,t)>-1,$=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},q=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},V=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},W=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},K=(e,t)=>{const n=[],o=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?n:o).push(s)}return{pass:n,fail:o}},Y=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},G=(e,t,n)=>(W(e,((e,o)=>{n=t(n,e,o)})),n),X=(e,t,n)=>(V(e,((e,o)=>{n=t(n,e,o)})),n),Q=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return I.some(r);if(n(r,o))break}return I.none()},J=(e,t)=>Q(e,t,L),Z=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return I.some(n);return I.none()},ee=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!p(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);z.apply(t,e[n])}return t},te=(e,t)=>ee(q(e,t)),ne=(e,t)=>{for(let n=0,o=e.length;n<o;++n)if(!0!==t(e[n],n))return!1;return!0},oe=e=>{const t=F.call(e,0);return t.reverse(),t},re=(e,t)=>Y(e,(e=>!H(t,e))),se=(e,t)=>{const n={};for(let o=0,r=e.length;o<r;o++){const r=e[o];n[String(r)]=t(r,o)}return n},ae=(e,t)=>{const n=F.call(e,0);return n.sort(t),n},ie=(e,t)=>t>=0&&t<e.length?I.some(e[t]):I.none(),le=e=>ie(e,0),de=e=>ie(e,e.length-1),ce=w(Array.from)?Array.from:e=>F.call(e),ue=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return I.none()},me=Object.keys,fe=Object.hasOwnProperty,ge=(e,t)=>{const n=me(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},pe=(e,t)=>he(e,((e,n)=>({k:n,v:t(e,n)}))),he=(e,t)=>{const n={};return ge(e,((e,o)=>{const r=t(e,o);n[r.k]=r.v})),n},be=e=>(t,n)=>{e[n]=t},ve=(e,t,n,o)=>{ge(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))},ye=(e,t)=>{const n={};return ve(e,t,be(n),_),n},Ce=(e,t)=>{const n=[];return ge(e,((e,o)=>{n.push(t(e,o))})),n},we=e=>Ce(e,R),xe=(e,t)=>Ee(e,t)?I.from(e[t]):I.none(),Ee=(e,t)=>fe.call(e,t),_e=(e,t)=>Ee(e,t)&&void 0!==e[t]&&null!==e[t],ke=e=>{const t={};return V(e,(e=>{t[e]={}})),me(t)},Se=e=>void 0!==e.length,Ne=Array.isArray,Re=(e,t,n)=>{if(!e)return!1;if(n=n||e,Se(e)){for(let o=0,r=e.length;o<r;o++)if(!1===t.call(n,e[o],o,e))return!1}else for(const o in e)if(Ee(e,o)&&!1===t.call(n,e[o],o,e))return!1;return!0},Ae=(e,t)=>{const n=[];return Re(e,((o,r)=>{n.push(t(o,r,e))})),n},Te=(e,t)=>{const n=[];return Re(e,((o,r)=>{t&&!t(o,r,e)||n.push(o)})),n},Oe=(e,t,n,o)=>{let r=v(n)?e[0]:n;for(let n=0;n<e.length;n++)r=t.call(o,r,e[n],n);return r},Be=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++)if(t.call(n,e[o],o,e))return o;return-1},Pe=e=>e[e.length-1],De=e=>{let t,n=!1;return(...o)=>(n||(n=!0,t=e.apply(null,o)),t)},Le=()=>Me(0,0),Me=(e,t)=>({major:e,minor:t}),Ie={nu:Me,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?Le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const o=e[n];if(o.test(t))return o}})(e,t);if(!n)return{major:0,minor:0};const o=e=>Number(t.replace(n,"$"+e));return Me(o(1),o(2))})(e,n)},unknown:Le},Fe=(e,t)=>{const n=String(t).toLowerCase();return J(e,(e=>e.search(n)))},Ue=(e,t,n)=>""===t||e.length>=t.length&&e.substr(n,n+t.length)===t,ze=(e,t)=>He(e,t)?((e,t)=>e.substring(t))(e,t.length):e,je=(e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!v(o)||r+t.length<=o)},He=(e,t)=>Ue(e,t,0),$e=(e,t)=>Ue(e,t,e.length-t.length),qe=e=>t=>t.replace(e,""),Ve=qe(/^\s+|\s+$/g),We=qe(/^\s+/g),Ke=qe(/\s+$/g),Ye=e=>e.length>0,Ge=e=>!Ye(e),Xe=(e,t=10)=>{const n=parseInt(e,t);return isNaN(n)?I.none():I.some(n)},Qe=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Je=e=>t=>je(t,e),Ze=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>je(e,"edge/")&&je(e,"chrome")&&je(e,"safari")&&je(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Qe],search:e=>je(e,"chrome")&&!je(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>je(e,"msie")||je(e,"trident")},{name:"Opera",versionRegexes:[Qe,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Je("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Je("firefox")},{name:"Safari",versionRegexes:[Qe,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(je(e,"safari")||je(e,"mobile/"))&&je(e,"applewebkit")}],et=[{name:"Windows",search:Je("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>je(e,"iphone")||je(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Je("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:Je("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Je("linux"),versionRegexes:[]},{name:"Solaris",search:Je("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Je("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Je("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],tt={browsers:N(Ze),oses:N(et)},nt="Edge",ot="Chromium",rt="Opera",st="Firefox",at="Safari",it=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isEdge:o(nt),isChromium:o(ot),isIE:o("IE"),isOpera:o(rt),isFirefox:o(st),isSafari:o(at)}},lt=()=>it({current:void 0,version:Ie.unknown()}),dt=it,ct=(N(nt),N(ot),N("IE"),N(rt),N(st),N(at),"Windows"),ut="Android",mt="Linux",ft="macOS",gt="Solaris",pt="FreeBSD",ht="ChromeOS",bt=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isWindows:o(ct),isiOS:o("iOS"),isAndroid:o(ut),isMacOS:o(ft),isLinux:o(mt),isSolaris:o(gt),isFreeBSD:o(pt),isChromeOS:o(ht)}},vt=()=>bt({current:void 0,version:Ie.unknown()}),yt=bt,Ct=(N(ct),N("iOS"),N(ut),N(mt),N(ft),N(gt),N(pt),N(ht),e=>window.matchMedia(e).matches);let wt=De((()=>((e,t,n)=>{const o=tt.browsers(),r=tt.oses(),s=t.bind((e=>((e,t)=>ue(t.brands,(t=>{const n=t.brand.toLowerCase();return J(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:Ie.nu(parseInt(t.version,10),0)})))})))(o,e))).orThunk((()=>((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e))).fold(lt,dt),a=((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e).fold(vt,yt),i=((e,t,n,o)=>{const r=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!r,a=e.isiOS()||e.isAndroid(),i=a||o("(pointer:coarse)"),l=r||!s&&a&&o("(min-device-width:768px)"),d=s||a&&!l,c=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),u=!d&&!l&&!c;return{isiPad:N(r),isiPhone:N(s),isTablet:N(l),isPhone:N(d),isTouch:N(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:N(c),isDesktop:N(u)}})(a,s,e,n);return{browser:s,os:a,deviceType:i}})(navigator.userAgent,I.from(navigator.userAgentData),Ct)));const xt=()=>wt(),Et=navigator.userAgent,_t=xt(),kt=_t.browser,St=_t.os,Nt=_t.deviceType,Rt=-1!==Et.indexOf("Windows Phone"),At={transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",documentMode:kt.isIE()?document.documentMode||7:10,cacheSuffix:null,container:null,canHaveCSP:!kt.isIE(),windowsPhone:Rt,browser:{current:kt.current,version:kt.version,isChromium:kt.isChromium,isEdge:kt.isEdge,isFirefox:kt.isFirefox,isIE:kt.isIE,isOpera:kt.isOpera,isSafari:kt.isSafari},os:{current:St.current,version:St.version,isAndroid:St.isAndroid,isChromeOS:St.isChromeOS,isFreeBSD:St.isFreeBSD,isiOS:St.isiOS,isLinux:St.isLinux,isMacOS:St.isMacOS,isSolaris:St.isSolaris,isWindows:St.isWindows},deviceType:{isDesktop:Nt.isDesktop,isiPad:Nt.isiPad,isiPhone:Nt.isiPhone,isPhone:Nt.isPhone,isTablet:Nt.isTablet,isTouch:Nt.isTouch,isWebView:Nt.isWebView}},Tt=/^\s*|\s*$/g,Ot=e=>y(e)?"":(""+e).replace(Tt,""),Bt=function(e,t,n,o){o=o||this,e&&(n&&(e=e[n]),Re(e,((e,r)=>!1!==t.call(o,e,r,n)&&(Bt(e,t,n,o),!0))))},Pt={trim:Ot,isArray:Ne,is:(e,t)=>t?!("array"!==t||!Ne(e))||typeof e===t:void 0!==e,toArray:e=>{if(Ne(e))return e;{const t=[];for(let n=0,o=e.length;n<o;n++)t[n]=e[n];return t}},makeMap:(e,t,n={})=>{const o=m(e)?e.split(t||","):e||[];let r=o.length;for(;r--;)n[o[r]]={};return n},each:Re,map:Ae,grep:Te,inArray:(e,t)=>{if(e)for(let n=0,o=e.length;n<o;n++)if(e[n]===t)return n;return-1},hasOwn:Ee,extend:(e,...t)=>{for(let n=0;n<t.length;n++){const o=t[n];for(const t in o)if(Ee(o,t)){const n=o[t];void 0!==n&&(e[t]=n)}}return e},walk:Bt,resolve:(e,t=window)=>{const n=e.split(".");for(let e=0,o=n.length;e<o&&(t=t[n[e]]);e++);return t},explode:(e,t)=>p(e)?e:""===e?[]:Ae(e.split(t||","),Ot),_addCacheSuffix:e=>{const t=At.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Dt=(e,t,n=A)=>e.exists((e=>n(e,t))),Lt=(e,t,n=A)=>Mt(e,t,n).getOr(e.isNone()&&t.isNone()),Mt=(e,t,n)=>e.isSome()&&t.isSome()?I.some(n(e.getOrDie(),t.getOrDie())):I.none(),It=(e,t)=>e?I.some(t):I.none(),Ft="undefined"!=typeof window?window:Function("return this;")(),Ut=(e,t)=>((e,t)=>{let n=null!=t?t:Ft;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),zt=Object.getPrototypeOf,jt=e=>{const t=Ut("ownerDocument.defaultView",e);return f(e)&&((e=>((e,t)=>{const n=((e,t)=>Ut(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(zt(e).constructor.name))},Ht=e=>e.dom.nodeName.toLowerCase(),$t=e=>e.dom.nodeType,qt=e=>t=>$t(t)===e,Vt=e=>Wt(e)&&jt(e.dom),Wt=qt(1),Kt=qt(3),Yt=qt(9),Gt=qt(11),Xt=e=>t=>Wt(t)&&Ht(t)===e,Qt=(e,t,n)=>{if(!(m(n)||b(n)||x(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},Jt=(e,t,n)=>{Qt(e.dom,t,n)},Zt=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{Qt(n,t,e)}))},en=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},tn=(e,t)=>I.from(en(e,t)),nn=(e,t)=>{const n=e.dom;return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},on=(e,t)=>{e.dom.removeAttribute(t)},rn=e=>X(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),sn=(e,t)=>{const n=en(e,t);return void 0===n||""===n?[]:n.split(" ")},an=e=>void 0!==e.dom.classList,ln=e=>sn(e,"class"),dn=(e,t)=>((e,t,n)=>{const o=sn(e,t).concat([n]);return Jt(e,t,o.join(" ")),!0})(e,"class",t),cn=(e,t)=>((e,t,n)=>{const o=Y(sn(e,t),(e=>e!==n));return o.length>0?Jt(e,t,o.join(" ")):on(e,t),!1})(e,"class",t),un=(e,t)=>{an(e)?e.dom.classList.add(t):dn(e,t)},mn=e=>{0===(an(e)?e.dom.classList:ln(e)).length&&on(e,"class")},fn=(e,t)=>{an(e)?e.dom.classList.remove(t):cn(e,t),mn(e)},gn=(e,t)=>an(e)&&e.dom.classList.contains(t),pn=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},hn=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return pn(n.childNodes[0])},bn=(e,t)=>{const n=(t||document).createElement(e);return pn(n)},vn=(e,t)=>{const n=(t||document).createTextNode(e);return pn(n)},yn=pn,Cn=(e,t,n)=>I.from(e.dom.elementFromPoint(t,n)).map(pn),wn=(e,t)=>{const n=[],o=e=>(n.push(e),t(e));let r=t(e);do{r=r.bind(o)}while(r.isSome());return n},xn=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},En=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,_n=(e,t)=>e.dom===t.dom,kn=(e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)},Sn=e=>yn(e.dom.ownerDocument),Nn=e=>Yt(e)?e:Sn(e),Rn=e=>yn(Nn(e).dom.defaultView),An=e=>I.from(e.dom.parentNode).map(yn),Tn=e=>I.from(e.dom.parentElement).map(yn),On=(e,t)=>{const n=w(t)?t:L;let o=e.dom;const r=[];for(;null!==o.parentNode&&void 0!==o.parentNode;){const e=o.parentNode,t=yn(e);if(r.push(t),!0===n(t))break;o=e}return r},Bn=e=>I.from(e.dom.previousSibling).map(yn),Pn=e=>I.from(e.dom.nextSibling).map(yn),Dn=e=>oe(wn(e,Bn)),Ln=e=>wn(e,Pn),Mn=e=>q(e.dom.childNodes,yn),In=(e,t)=>{const n=e.dom.childNodes;return I.from(n[t]).map(yn)},Fn=e=>In(e,0),Un=e=>In(e,e.dom.childNodes.length-1),zn=e=>e.dom.childNodes.length,jn=e=>Gt(e)&&C(e.dom.host),Hn=w(Element.prototype.attachShadow)&&w(Node.prototype.getRootNode),$n=N(Hn),qn=Hn?e=>yn(e.dom.getRootNode()):Nn,Vn=e=>jn(e)?e:(e=>{const t=e.dom.head;if(null==t)throw new Error("Head is not available yet");return yn(t)})(Nn(e)),Wn=e=>yn(e.dom.host),Kn=e=>{if($n()&&C(e.target)){const t=yn(e.target);if(Wt(t)&&Yn(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return le(t)}}return I.from(e.target)},Yn=e=>C(e.dom.shadowRoot),Gn=e=>{const t=Kt(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=qn(e);return jn(t)?I.some(t):I.none()})(yn(t)).fold((()=>n.body.contains(t)),S(Gn,Wn))};var Xn=(e,t,n,o,r)=>e(n,o)?I.some(n):w(r)&&r(n)?I.none():t(n,o,r);const Qn=(e,t,n)=>{let o=e.dom;const r=w(n)?n:L;for(;o.parentNode;){o=o.parentNode;const e=yn(o);if(t(e))return I.some(e);if(r(e))break}return I.none()},Jn=(e,t,n)=>Xn(((e,t)=>t(e)),Qn,e,t,n),Zn=(e,t)=>{const n=e=>{for(let o=0;o<e.childNodes.length;o++){const r=yn(e.childNodes[o]);if(t(r))return I.some(r);const s=n(e.childNodes[o]);if(s.isSome())return s}return I.none()};return n(e.dom)},eo=(e,t,n)=>Qn(e,(e=>xn(e,t)),n),to=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?I.none():I.from(n.querySelector(e)).map(yn)})(t,e),no=(e,t,n)=>Xn(((e,t)=>xn(e,t)),eo,e,t,n),oo=(e,t=!1)=>{return Gn(e)?e.dom.isContentEditable:(n=e,no(n,"[contenteditable]")).fold(N(t),(e=>"true"===ro(e)));var n},ro=e=>e.dom.contentEditable,so=e=>void 0!==e.style&&w(e.style.getPropertyValue),ao=(e,t,n)=>{if(!m(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);so(e)&&e.style.setProperty(t,n)},io=(e,t,n)=>{const o=e.dom;ao(o,t,n)},lo=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{ao(n,t,e)}))},co=(e,t)=>{const n=e.dom,o=window.getComputedStyle(n).getPropertyValue(t);return""!==o||Gn(e)?o:uo(n,t)},uo=(e,t)=>so(e)?e.style.getPropertyValue(t):"",mo=(e,t)=>{const n=e.dom,o=uo(n,t);return I.from(o).filter((e=>e.length>0))},fo=e=>{const t={},n=e.dom;if(so(n))for(let e=0;e<n.style.length;e++){const o=n.style.item(e);t[o]=n.style[o]}return t},go=(e,t)=>{((e,t)=>{so(e)&&e.style.removeProperty(t)})(e.dom,t),Dt(tn(e,"style").map(Ve),"")&&on(e,"style")},po=(e,t)=>{An(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},ho=(e,t)=>{Pn(e).fold((()=>{An(e).each((e=>{vo(e,t)}))}),(e=>{po(e,t)}))},bo=(e,t)=>{Fn(e).fold((()=>{vo(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))},vo=(e,t)=>{e.dom.appendChild(t.dom)},yo=(e,t)=>{po(e,t),vo(t,e)},Co=(e,t)=>{V(t,(t=>{vo(e,t)}))},wo=e=>{e.dom.textContent="",V(Mn(e),(e=>{xo(e)}))},xo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Eo=e=>{const t=Mn(e);var n,o;t.length>0&&(n=e,V(o=t,((e,t)=>{const r=0===t?n:o[t-1];ho(r,e)}))),xo(e)},_o=e=>q(e,yn),ko=e=>e.dom.innerHTML,So=(e,t)=>{const n=Sn(e).dom,o=yn(n.createDocumentFragment()),r=((e,t)=>{const n=(t||document).createElement("div");return n.innerHTML=e,Mn(yn(n))})(t,n);Co(o,r),wo(e),vo(e,o)},No=(e,t,n,o)=>((e,t,n,o,r)=>{const s=((e,t)=>n=>{e(n)&&t((e=>{const t=yn(Kn(e).getOr(e.target)),n=()=>e.stopPropagation(),o=()=>e.preventDefault(),r=k(o,n);return((e,t,n,o,r,s,a)=>({target:e,x:t,y:n,stop:o,prevent:r,kill:s,raw:a}))(t,e.clientX,e.clientY,n,o,r,e)})(n))})(n,o);return e.dom.addEventListener(t,s,false),{unbind:T(Ro,e,t,s,false)}})(e,t,n,o),Ro=(e,t,n,o)=>{e.dom.removeEventListener(t,n,o)},Ao=(e,t)=>({left:e,top:t,translate:(n,o)=>Ao(e+n,t+o)}),To=Ao,Oo=(e,t)=>void 0!==e?e:void 0!==t?t:0,Bo=e=>{const t=e.dom,n=t.ownerDocument.body;return n===t?To(n.offsetLeft,n.offsetTop):Gn(e)?(e=>{const t=e.getBoundingClientRect();return To(t.left,t.top)})(t):To(0,0)},Po=e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,o=t.body.scrollTop||t.documentElement.scrollTop;return To(n,o)},Do=(e,t,n)=>{const o=(void 0!==n?n.dom:document).defaultView;o&&o.scrollTo(e,t)},Lo=(e,t)=>{xt().browser.isSafari()&&w(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)},Mo=(e,t,n,o)=>({x:e,y:t,width:n,height:o,right:e+n,bottom:t+o}),Io=e=>{const t=void 0===e?window:e,n=t.document,o=Po(yn(n));return(e=>{const t=void 0===e?window:e;return xt().browser.isFirefox()?I.none():I.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,r=e.clientHeight;return Mo(o.left,o.top,n,r)}),(e=>Mo(Math.max(e.pageLeft,o.left),Math.max(e.pageTop,o.top),e.width,e.height)))},Fo=(e,t)=>{let n=[];return V(Mn(e),(e=>{t(e)&&(n=n.concat([e])),n=n.concat(Fo(e,t))})),n},Uo=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?[]:q(n.querySelectorAll(e),yn)})(t,e),zo=(e,t,n)=>eo(e,t,n).isSome();class jo{constructor(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}current(){return this.node}next(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node}prev(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node}prev2(e){return this.node=this.findPreviousNode(this.node,e),this.node}findSibling(e,t,n,o){if(e){if(!o&&e[t])return e[t];if(e!==this.rootNode){let t=e[n];if(t)return t;for(let o=e.parentNode;o&&o!==this.rootNode;o=o.parentNode)if(t=o[n],t)return t}}}findPreviousNode(e,t){if(e){const n=e.previousSibling;if(this.rootNode&&n===this.rootNode)return;if(n){if(!t)for(let e=n.lastChild;e;e=e.lastChild)if(!e.lastChild)return e;return n}const o=e.parentNode;if(o&&o!==this.rootNode)return o}}}const Ho=e=>t=>!!t&&t.nodeType===e,$o=e=>!!e&&!Object.getPrototypeOf(e),qo=Ho(1),Vo=e=>qo(e)&&Vt(yn(e)),Wo=e=>{const t=e.toLowerCase();return e=>C(e)&&e.nodeName.toLowerCase()===t},Ko=e=>{const t=e.map((e=>e.toLowerCase()));return e=>{if(e&&e.nodeName){const n=e.nodeName.toLowerCase();return H(t,n)}return!1}},Yo=(e,t)=>{const n=t.toLowerCase().split(" ");return t=>{if(qo(t)){const o=t.ownerDocument.defaultView;if(o)for(let r=0;r<n.length;r++){const s=o.getComputedStyle(t,null);if((s?s.getPropertyValue(e):null)===n[r])return!0}}return!1}},Go=e=>t=>qo(t)&&t.hasAttribute(e),Xo=e=>qo(e)&&e.hasAttribute("data-mce-bogus"),Qo=e=>qo(e)&&"TABLE"===e.tagName,Jo=e=>t=>{if(Vo(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},Zo=Ko(["textarea","input"]),er=Ho(3),tr=Ho(4),nr=Ho(7),or=Ho(8),rr=Ho(9),sr=Ho(11),ar=Wo("br"),ir=Wo("img"),lr=Jo("true"),dr=Jo("false"),cr=Ko(["td","th"]),ur=Ko(["td","th","caption"]),mr=Ko(["video","audio","object","embed"]),fr=Wo("li"),gr=Wo("details"),pr=Wo("summary"),hr="\ufeff",br="\xa0",vr=e=>e===hr,yr=((e,t)=>{const n=t=>e(t)?I.from(t.dom.nodeValue):I.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(Kt),Cr=e=>yr.get(e),wr=e=>yr.getOption(e),xr=e=>{let t;return n=>(t=t||se(e,M),Ee(t,Ht(n)))},Er=e=>Wt(e)&&"br"===Ht(e),_r=xr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),kr=xr(["ul","ol","dl"]),Sr=xr(["li","dd","dt"]),Nr=xr(["thead","tbody","tfoot"]),Rr=xr(["td","th"]),Ar=xr(["pre","script","textarea","style"]),Tr=()=>{const e=bn("br");return Jt(e,"data-mce-bogus","1"),e},Or=e=>{wo(e),vo(e,Tr())},Br=hr,Pr=vr,Dr=e=>e.replace(/\uFEFF/g,""),Lr=qo,Mr=er,Ir=e=>(Mr(e)&&(e=e.parentNode),Lr(e)&&e.hasAttribute("data-mce-caret")),Fr=e=>Mr(e)&&Pr(e.data),Ur=e=>Ir(e)||Fr(e),zr=e=>e.firstChild!==e.lastChild||!ar(e.firstChild),jr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset())===Br||e.isAtStart()&&Fr(t.previousSibling))},Hr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset()-1)===Br||e.isAtEnd()&&Fr(t.nextSibling))},$r=e=>Mr(e)&&e.data[0]===Br,qr=e=>Mr(e)&&e.data[e.data.length-1]===Br,Vr=e=>e&&e.hasAttribute("data-mce-caret")?((e=>{var t;const n=e.getElementsByTagName("br"),o=n[n.length-1];Xo(o)&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o))})(e),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("data-mce-style"),e.removeAttribute("_moz_abspos"),e):null,Wr=e=>Ir(e.startContainer),Kr=lr,Yr=dr,Gr=ar,Xr=er,Qr=Ko(["script","style","textarea"]),Jr=Ko(["img","input","textarea","hr","iframe","video","audio","object","embed"]),Zr=Ko(["table"]),es=Ur,ts=e=>!es(e)&&(Xr(e)?!Qr(e.parentNode):Jr(e)||Gr(e)||Zr(e)||ns(e)),ns=e=>!(e=>qo(e)&&"true"===e.getAttribute("unselectable"))(e)&&Yr(e),os=(e,t)=>ts(e)&&((e,t)=>{for(let n=e.parentNode;n&&n!==t;n=n.parentNode){if(ns(n))return!1;if(Kr(n))return!0}return!0})(e,t),rs=/^[ \t\r\n]*$/,ss=e=>rs.test(e),as=e=>{for(const t of e)if(!vr(t))return!1;return!0},is=e=>"\n"===e||"\r"===e,ls=(e,t=4,n=!0,o=!0)=>{const r=((e,t)=>t<=0?"":new Array(t+1).join(" "))(0,t),s=e.replace(/\t/g,r),a=X(s,((e,t)=>(e=>-1!==" \f\t\v".indexOf(e))(t)||t===br?e.pcIsSpace||""===e.str&&n||e.str.length===s.length-1&&o||((e,t)=>t<e.length&&t>=0&&is(e[t]))(s,e.str.length+1)?{pcIsSpace:!1,str:e.str+br}:{pcIsSpace:!0,str:e.str+" "}:{pcIsSpace:is(t),str:e.str+t}),{pcIsSpace:!1,str:""});return a.str},ds=(e,t)=>ts(e)&&!((e,t)=>er(e)&&ss(e.data)&&!((e,t)=>{const n=yn(t),o=yn(e);return zo(o,"pre,code",T(_n,n))})(e,t))(e,t)||(e=>qo(e)&&"A"===e.nodeName&&!e.hasAttribute("href")&&(e.hasAttribute("name")||e.hasAttribute("id")))(e)||cs(e),cs=Go("data-mce-bookmark"),us=Go("data-mce-bogus"),ms=("data-mce-bogus","all",e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"));const fs=e=>Tn(yn(e)).exists((e=>!oo(e))),gs=(e,t=!0)=>((e,t)=>{let n=0;if(ds(e,e))return!1;{let o=e.firstChild;if(!o)return!0;const r=new jo(o,e);do{if(t){if(ms(o)){o=r.next(!0);continue}if(us(o)){o=r.next();continue}}if(lr(o)&&fs(o))return!1;if(ar(o))n++,o=r.next();else{if(ds(o,e))return!1;o=r.next()}}while(o);return n<=1}})(e.dom,t),ps=e=>"svg"===e.toLowerCase(),hs=e=>ps(e.nodeName),bs=e=>"svg"===(null==e?void 0:e.nodeName)?"svg":"html",vs=["svg"],ys="data-mce-block",Cs=e=>q((e=>Y(me(e),(e=>!/[A-Z]/.test(e))))(e),(e=>`${e}:`+q(vs,(t=>`not(${t} ${e})`)).join(":"))).join(","),ws=(e,t)=>C(t.querySelector(e))?(t.setAttribute(ys,"true"),"inline-boundary"===t.getAttribute("data-mce-selected")&&t.removeAttribute("data-mce-selected"),!0):(t.removeAttribute(ys),!1),xs=(e,t)=>{const n=Cs(e.getTransparentElements()),o=Cs(e.getBlockElements());return Y(t.querySelectorAll(n),(e=>ws(o,e)))},Es=(e,t)=>{var n;const o=t?"lastChild":"firstChild";for(let t=e[o];t;t=t[o])if(gs(yn(t)))return void(null===(n=t.parentNode)||void 0===n||n.removeChild(t))},_s=(e,t,n)=>{const o=e.getBlockElements(),r=yn(t),s=e=>Ht(e)in o,a=e=>_n(e,r);V(_o(n),(t=>{Qn(t,s,a).each((n=>{const o=((t,o)=>Y(Mn(t),(t=>s(t)&&!e.isValidChild(Ht(n),Ht(t)))))(t);if(o.length>0){const t=Tn(n);V(o,(e=>{Qn(e,s,a).each((t=>{((e,t)=>{const n=document.createRange(),o=e.parentNode;if(o){n.setStartBefore(e),n.setEndBefore(t);const r=n.extractContents();Es(r,!0),n.setStartAfter(t),n.setEndAfter(e);const s=n.extractContents();Es(s,!1),gs(yn(r))||o.insertBefore(r,e),gs(yn(t))||o.insertBefore(t,e),gs(yn(s))||o.insertBefore(s,e),o.removeChild(e)}})(t.dom,e.dom)}))})),t.each((t=>xs(e,t.dom)))}}))}))},ks=(e,t)=>{const n=xs(e,t);_s(e,t,n),((e,t,n)=>{V([...n,...Ts(e,t)?[t]:[]],(t=>V(Uo(yn(t),t.nodeName.toLowerCase()),(t=>{Os(e,t.dom)&&Eo(t)}))))})(e,t,n)},Ss=(e,t)=>{if(As(e,t)){const n=Cs(e.getBlockElements());ws(n,t)}},Ns=e=>e.hasAttribute(ys),Rs=(e,t)=>Ee(e.getTransparentElements(),t),As=(e,t)=>qo(t)&&Rs(e,t.nodeName),Ts=(e,t)=>As(e,t)&&Ns(t),Os=(e,t)=>As(e,t)&&!Ns(t),Bs=(e,t)=>1===t.type&&Rs(e,t.name)&&m(t.attr(ys)),Ps=xt().browser,Ds=e=>J(e,Wt),Ls=(e,t)=>e.children&&H(e.children,t),Ms=(e,t={})=>{let n=0;const o={},r=yn(e),s=Nn(r),a=e=>{vo(Vn(r),e)},i=e=>{const t=Vn(r);to(t,"#"+e).each(xo)},l=e=>xe(o,e).getOrThunk((()=>({id:"mce-u"+n++,passed:[],failed:[],count:0}))),d=e=>new Promise(((n,r)=>{let i;const d=Pt._addCacheSuffix(e),c=l(d);o[d]=c,c.count++;const u=(e,t)=>{V(e,D),c.status=t,c.passed=[],c.failed=[],i&&(i.onload=null,i.onerror=null,i=null)},m=()=>u(c.passed,2),f=()=>u(c.failed,3);if(n&&c.passed.push(n),r&&c.failed.push(r),1===c.status)return;if(2===c.status)return void m();if(3===c.status)return void f();c.status=1;const g=bn("link",s.dom);Zt(g,{rel:"stylesheet",type:"text/css",id:c.id}),t.contentCssCors&&Jt(g,"crossOrigin","anonymous"),t.referrerPolicy&&Jt(g,"referrerpolicy",t.referrerPolicy),i=g.dom,i.onload=m,i.onerror=f,a(g),Jt(g,"href",d)})),c=e=>{const t=Pt._addCacheSuffix(e);xe(o,t).each((e=>{0==--e.count&&(delete o[t],i(e.id))}))};return{load:d,loadRawCss:(e,t)=>{const n=l(e);o[e]=n,n.count++;const r=bn("style",s.dom);Zt(r,{rel:"stylesheet",type:"text/css",id:n.id}),r.dom.innerHTML=t,a(r)},loadAll:e=>Promise.allSettled(q(e,(e=>d(e).then(N(e))))).then((e=>{const t=K(e,(e=>"fulfilled"===e.status));return t.fail.length>0?Promise.reject(q(t.fail,(e=>e.reason))):q(t.pass,(e=>e.value))})),unload:c,unloadRawCss:e=>{xe(o,e).each((t=>{0==--t.count&&(delete o[e],i(t.id))}))},unloadAll:e=>{V(e,(e=>{c(e)}))},_setReferrerPolicy:e=>{t.referrerPolicy=e},_setContentCssCors:e=>{t.contentCssCors=e}}},Is=(()=>{const e=new WeakMap;return{forElement:(t,n)=>{const o=qn(t).dom;return I.from(e.get(o)).getOrThunk((()=>{const t=Ms(o,n);return e.set(o,t),t}))}}})(),Fs=(e,t,n)=>C(e)&&(ds(e,t)||n.isInline(e.nodeName.toLowerCase())),Us=e=>(e=>"span"===e.nodeName.toLowerCase())(e)&&"bookmark"===e.getAttribute("data-mce-type"),zs=(e,t,n,o)=>{var r;const s=o||t;if(qo(t)&&Us(t))return t;const a=t.childNodes;for(let t=a.length-1;t>=0;t--)zs(e,a[t],n,s);if(qo(t)){const e=t.childNodes;1===e.length&&Us(e[0])&&(null===(r=t.parentNode)||void 0===r||r.insertBefore(e[0],t))}return(e=>sr(e)||rr(e))(t)||ds(t,s)||(e=>!!qo(e)&&e.childNodes.length>0)(t)||((e,t,n)=>er(e)&&e.data.length>0&&((e,t,n)=>{const o=new jo(e,t).prev(!1),r=new jo(e,t).next(!1),s=v(o)||Fs(o,t,n),a=v(r)||Fs(r,t,n);return s&&a})(e,t,n))(t,s,n)||e.remove(t),t},js=Pt.makeMap,Hs=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,$s=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,qs=/[<>&\"\']/g,Vs=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Ws={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},Ks={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},Ys={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},Gs=(e,t)=>{const n={};if(e){const o=e.split(",");t=t||10;for(let e=0;e<o.length;e+=2){const r=String.fromCharCode(parseInt(o[e],t));if(!Ks[r]){const t="&"+o[e+1]+";";n[r]=t,n[t]=r}}return n}},Xs=Gs("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),Qs=(e,t)=>e.replace(t?Hs:$s,(e=>Ks[e]||e)),Js=(e,t)=>e.replace(t?Hs:$s,(e=>e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":Ks[e]||"&#"+e.charCodeAt(0)+";")),Zs=(e,t,n)=>{const o=n||Xs;return e.replace(t?Hs:$s,(e=>Ks[e]||o[e]||e))},ea={encodeRaw:Qs,encodeAllRaw:e=>(""+e).replace(qs,(e=>Ks[e]||e)),encodeNumeric:Js,encodeNamed:Zs,getEncodeFunc:(e,t)=>{const n=Gs(t)||Xs,o=js(e.replace(/\+/g,","));return o.named&&o.numeric?(e,t)=>e.replace(t?Hs:$s,(e=>void 0!==Ks[e]?Ks[e]:void 0!==n[e]?n[e]:e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";")):o.named?t?(e,t)=>Zs(e,t,n):Zs:o.numeric?Js:Qs},decode:e=>e.replace(Vs,((e,t)=>t?(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))>65535?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Ws[t]||String.fromCharCode(t):Ys[e]||Xs[e]||(e=>{const t=bn("div").dom;return t.innerHTML=e,t.textContent||t.innerText||e})(e)))},ta=(e,t)=>(e=Pt.trim(e))?e.split(t||" "):[],na=e=>new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$"),oa={},ra=Pt.makeMap,sa=Pt.each,aa=Pt.extend,ia=Pt.explode,la=(e,t={})=>{const n=ra(e," ",ra(e.toUpperCase()," "));return aa(n,t)},da=e=>la("td th li dt dd figcaption caption details summary",e.getTextBlockElements()),ca=(e,t)=>{if(e){const n={};return m(e)&&(e={"*":e}),sa(e,((e,o)=>{n[o]=n[o.toUpperCase()]="map"===t?ra(e,/[, ]/):ia(e,/[, ]/)})),n}},ua=(e={})=>{var t;const n={},o={};let r=[];const s={},a={},i=(t,n,o)=>{const r=e[t];if(r)return ra(r,/[, ]/,ra(r.toUpperCase(),/[, ]/));{let e=oa[t];return e||(e=la(n,o),oa[t]=e),e}},l=null!==(t=e.schema)&&void 0!==t?t:"html5",d=(e=>{const{globalAttributes:t,phrasingContent:n,flowContent:o}=(e=>{let t,n,o;t="id accesskey class dir lang style tabindex title role",n="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",o="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(t+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",n+=" article aside details dialog figure main header footer hgroup section nav a ins del canvas map",o+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen svg"),"html5-strict"!==e&&(t+=" xml:lang",o=[o,"acronym applet basefont big font strike tt"].join(" "),n=[n,"center dir isindex noframes"].join(" "));const r=[n,o].join(" ");return{globalAttributes:t,blockContent:n,phrasingContent:o,flowContent:r}})(e),r={},s=(e,t,n)=>{r[e]={attributes:se(t,N({})),attributesOrder:t,children:se(n,N({}))}},a=(e,n="",o="")=>{const r=ta(o),a=ta(e);let i=a.length;const l=ta([t,n].join(" "));for(;i--;)s(a[i],l.slice(),r)},i=(e,t)=>{const n=ta(e),o=ta(t);let s=n.length;for(;s--;){const e=r[n[s]];for(let t=0,n=o.length;t<n;t++)e.attributes[o[t]]={},e.attributesOrder.push(o[t])}};return"html5-strict"!==e&&(V(ta("acronym applet basefont big font strike tt"),(e=>{a(e,"",n)})),V(ta("center dir isindex noframes"),(e=>{a(e,"",o)}))),a("html","manifest","head body"),a("head","","base command link meta noscript script style title"),a("title hr noscript br"),a("base","href target"),a("link","href rel media hreflang type sizes hreflang"),a("meta","name http-equiv content charset"),a("style","media type scoped"),a("script","src async defer type charset"),a("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",o),a("dd div","",o),a("address dt caption","","html4"===e?n:o),a("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),a("blockquote","cite",o),a("ol","reversed start type","li"),a("ul","","li"),a("li","value",o),a("dl","","dt dd"),a("a","href target rel media hreflang type","html4"===e?n:o),a("q","cite",n),a("ins del","cite datetime",o),a("img","src sizes srcset alt usemap ismap width height"),a("iframe","src name width height",o),a("embed","src type width height"),a("object","data type typemustmatch name usemap form width height",[o,"param"].join(" ")),a("param","name value"),a("map","name",[o,"area"].join(" ")),a("area","alt coords shape href target rel media hreflang type"),a("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),a("colgroup","span","col"),a("col","span"),a("tbody thead tfoot","","tr"),a("tr","","td th"),a("td","colspan rowspan headers",o),a("th","colspan rowspan headers scope abbr",o),a("form","accept-charset action autocomplete enctype method name novalidate target",o),a("fieldset","disabled form name",[o,"legend"].join(" ")),a("label","form for",n),a("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),a("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?o:n),a("select","disabled form multiple name required size","option optgroup"),a("optgroup","disabled label","option"),a("option","disabled label selected value"),a("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),a("menu","type label",[o,"li"].join(" ")),a("noscript","",o),"html4"!==e&&(a("wbr"),a("ruby","",[n,"rt rp"].join(" ")),a("figcaption","",o),a("mark rt rp bdi","",n),a("summary","",[n,"h1 h2 h3 h4 h5 h6"].join(" ")),a("canvas","width height",o),a("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[o,"track source"].join(" ")),a("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[o,"track source"].join(" ")),a("picture","","img source"),a("source","src srcset type media sizes"),a("track","kind src srclang label default"),a("datalist","",[n,"option"].join(" ")),a("article section nav aside main header footer","",o),a("hgroup","","h1 h2 h3 h4 h5 h6"),a("figure","",[o,"figcaption"].join(" ")),a("time","datetime",n),a("dialog","open",o),a("command","type label icon disabled checked radiogroup command"),a("output","for form name",n),a("progress","value max",n),a("meter","value min max low high optimum",n),a("details","open",[o,"summary"].join(" ")),a("keygen","autofocus challenge disabled form keytype name"),s("svg","id tabindex lang xml:space class style x y width height viewBox preserveAspectRatio zoomAndPan transform".split(" "),[])),"html5-strict"!==e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid code codebase codetype archive standby align border hspace vspace"),i("embed","align name hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!==e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("img","loading"),i("iframe","sandbox seamless allow allowfullscreen loading")),"html4"!==e&&V([r.video,r.audio],(e=>{delete e.children.audio,delete e.children.video})),V(ta("a form meter progress dfn"),(e=>{r[e]&&delete r[e].children[e]})),delete r.caption.children.table,delete r.script,r})(l);!1===e.verify_html&&(e.valid_elements="*[*]");const c=ca(e.valid_styles),u=ca(e.invalid_styles,"map"),m=ca(e.valid_classes,"map"),f=i("whitespace_elements","pre script noscript style textarea video audio iframe object code"),g=i("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),p=i("void_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),h=i("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls allowfullscreen"),b="td th iframe video audio object script code",v=i("non_empty_elements",b+" pre svg",p),y=i("move_caret_before_on_enter_elements",b+" table",p),C="h1 h2 h3 h4 h5 h6",w=i("text_block_elements",C+" p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),x=i("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary html body multicol listing",w),E=i("text_inline_elements","span strong b em i font s strike u var cite dfn code mark q sup sub samp"),_=i("transparent_elements","a ins del canvas map"),k=i("wrap_block_elements","pre "+C);sa("script noscript iframe noframes noembed title style textarea xmp plaintext".split(" "),(e=>{a[e]=new RegExp("</"+e+"[^>]*>","gi")}));const S=e=>{const t=I.from(n["@"]),o=/[*?+]/;V(((e,t)=>{const n=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/;return te(ta(t,","),(t=>{const o=n.exec(t);if(o){const t=o[1],n=o[2],r=o[3],s=o[4],a=o[5],i={attributes:{},attributesOrder:[]};if(e.each((e=>((e,t)=>{ge(e.attributes,((e,n)=>{t.attributes[n]=e})),t.attributesOrder.push(...e.attributesOrder)})(e,i))),"#"===t?i.paddEmpty=!0:"-"===t&&(i.removeEmpty=!0),"!"===s&&(i.removeEmptyAttrs=!0),a&&((e,t)=>{const n=/^([!\-])?(\w+[\\:]:\w+|[^=~<]+)?(?:([=~<])(.*))?$/,o=/[*?+]/,{attributes:r,attributesOrder:s}=t;V(ta(e,"|"),(e=>{const a=n.exec(e);if(a){const e={},n=a[1],i=a[2].replace(/[\\:]:/g,":"),l=a[3],d=a[4];if("!"===n&&(t.attributesRequired=t.attributesRequired||[],t.attributesRequired.push(i),e.required=!0),"-"===n)return delete r[i],void s.splice(Pt.inArray(s,i),1);if(l&&("="===l?(t.attributesDefault=t.attributesDefault||[],t.attributesDefault.push({name:i,value:d}),e.defaultValue=d):"~"===l?(t.attributesForced=t.attributesForced||[],t.attributesForced.push({name:i,value:d}),e.forcedValue=d):"<"===l&&(e.validValues=Pt.makeMap(d,"?"))),o.test(i)){const n=e;t.attributePatterns=t.attributePatterns||[],n.pattern=na(i),t.attributePatterns.push(n)}else r[i]||s.push(i),r[i]=e}}))})(a,i),r&&(i.outputName=n),"@"===n){if(!e.isNone())return[];e=I.some(i)}return[r?{name:n,element:i,aliasName:r}:{name:n,element:i}]}return[]}))})(t,null!=e?e:""),(({name:e,element:t,aliasName:s})=>{if(s&&(n[s]=t),o.test(e)){const n=t;n.pattern=na(e),r.push(n)}else n[e]=t}))},R=e=>{r=[],V(me(n),(e=>{delete n[e]})),S(e)},A=e=>{delete oa.text_block_elements,delete oa.block_elements,V((e=>{const t=/^(~)?(.+)$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e="~"===n[1];return[{inline:e,cloneName:e?"span":"div",name:n[2]}]}return[]}))})(null!=e?e:""),(({inline:e,name:t,cloneName:r})=>{if(o[t]=o[r],s[t]=r,v[t.toUpperCase()]={},v[t]={},e||(x[t.toUpperCase()]={},x[t]={}),!n[t]){let e=n[r];e=aa({},e),delete e.removeEmptyAttrs,delete e.removeEmpty,n[t]=e}ge(o,((e,n)=>{e[r]&&(o[n]=e=aa({},o[n]),e[t]=e[r])}))}))},T=e=>{V((e=>{const t=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e=n[1],t=e?(e=>"-"===e?"remove":"add")(e):"replace";return[{operation:t,name:n[2],validChildren:ta(n[3],"|")}]}return[]}))})(null!=e?e:""),(({operation:e,name:t,validChildren:n})=>{const r="replace"===e?{"#comment":{}}:o[t];V(n,(t=>{"remove"===e?delete r[t]:r[t]={}})),o[t]=r}))},O=e=>{const t=n[e];if(t)return t;let o=r.length;for(;o--;){const t=r[o];if(t.pattern.test(e))return t}};e.valid_elements?(R(e.valid_elements),sa(d,((e,t)=>{o[t]=e.children}))):(sa(d,((e,t)=>{n[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},o[t]=e.children})),sa(ta("strong/b em/i"),(e=>{const t=ta(e,"/");n[t[1]].outputName=t[0]})),sa(E,((t,o)=>{n[o]&&(e.padd_empty_block_inline_children&&(n[o].paddInEmptyBlock=!0),n[o].removeEmpty=!0)})),sa(ta("ol ul blockquote a table tbody"),(e=>{n[e]&&(n[e].removeEmpty=!0)})),sa(ta("p h1 h2 h3 h4 h5 h6 th td pre div address caption li summary"),(e=>{n[e]&&(n[e].paddEmpty=!0)})),sa(ta("span"),(e=>{n[e].removeEmptyAttrs=!0}))),delete n.svg,A(e.custom_elements),T(e.valid_children),S(e.extended_valid_elements),T("+ol[ul|ol],+ul[ul|ol]"),sa({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},((e,t)=>{n[t]&&(n[t].parentsRequired=ta(e))})),e.invalid_elements&&sa(ia(e.invalid_elements),(e=>{n[e]&&delete n[e]})),O("span")||S("span[!data-mce-type|*]");const B=N(c),P=N(u),D=N(m),L=N(h),M=N(x),F=N(w),U=N(E),z=N(Object.seal(p)),j=N(g),H=N(v),$=N(y),q=N(f),W=N(_),K=N(k),Y=N(Object.seal(a)),G=(e,t)=>{const n=O(e);if(n){if(!t)return!0;{if(n.attributes[t])return!0;const e=n.attributePatterns;if(e){let n=e.length;for(;n--;)if(e[n].pattern.test(t))return!0}}}return!1},X=e=>Ee(M(),e),Q=e=>!He(e,"#")&&G(e)&&!X(e),J=N(s);return{type:l,children:o,elements:n,getValidStyles:B,getValidClasses:D,getBlockElements:M,getInvalidStyles:P,getVoidElements:z,getTextBlockElements:F,getTextInlineElements:U,getBoolAttrs:L,getElementRule:O,getSelfClosingElements:j,getNonEmptyElements:H,getMoveCaretBeforeOnEnterElements:$,getWhitespaceElements:q,getTransparentElements:W,getSpecialElements:Y,isValidChild:(e,t)=>{const n=o[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:G,isBlock:X,isInline:Q,isWrapper:e=>Ee(K(),e)||Q(e),getCustomElements:J,addValidElements:S,setValidElements:R,addCustomElements:A,addValidChildren:T}},ma=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},fa=e=>(e=>{return{value:(t=e,ze(t,"#").toUpperCase())};var t})(ma(e.red)+ma(e.green)+ma(e.blue)),ga=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,pa=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,ha=(e,t,n,o)=>({red:e,green:t,blue:n,alpha:o}),ba=(e,t,n,o)=>{const r=parseInt(e,10),s=parseInt(t,10),a=parseInt(n,10),i=parseFloat(o);return ha(r,s,a,i)},va=e=>{if("transparent"===e)return I.some(ha(0,0,0,0));const t=ga.exec(e);if(null!==t)return I.some(ba(t[1],t[2],t[3],"1"));const n=pa.exec(e);return null!==n?I.some(ba(n[1],n[2],n[3],n[4])):I.none()},ya=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,Ca=e=>va(e).map(fa).map((e=>"#"+e.value)).getOr(e),wa=(e={},t)=>{const n=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,r=/\s+$/,s={};let a,i;const l=hr;t&&(a=t.getValidStyles(),i=t.getInvalidStyles());const d="\\\" \\' \\; \\: ; : \ufeff".split(" ");for(let e=0;e<d.length;e++)s[d[e]]=l+e,s[l+e]=d[e];const c={parse:t=>{const a={};let i=!1;const d=e.url_converter,u=e.url_converter_scope||c,f=(e,t,n)=>{const o=a[e+"-top"+t];if(!o)return;const r=a[e+"-right"+t];if(!r)return;const s=a[e+"-bottom"+t];if(!s)return;const i=a[e+"-left"+t];if(!i)return;const l=[o,r,s,i];let d=l.length-1;for(;d--&&l[d]===l[d+1];);d>-1&&n||(a[e+t]=-1===d?l[0]:l.join(" "),delete a[e+"-top"+t],delete a[e+"-right"+t],delete a[e+"-bottom"+t],delete a[e+"-left"+t])},g=e=>{const t=a[e];if(!t)return;const n=t.indexOf(",")>-1?[t]:t.split(" ");let o=n.length;for(;o--;)if(n[o]!==n[0])return!1;return a[e]=n[0],!0},p=e=>(i=!0,s[e]),h=(e,t)=>(i&&(e=e.replace(/\uFEFF[0-9]/g,(e=>s[e]))),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e),b=e=>String.fromCharCode(parseInt(e.slice(1),16)),v=e=>e.replace(/\\[0-9a-f]+/gi,b),y=(t,n,o,r,s,a)=>{if(s=s||a)return"'"+(s=h(s)).replace(/\'/g,"\\'")+"'";if(n=h(n||o||r||""),!e.allow_script_urls){const t=n.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(t))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(t))return""}return d&&(n=d.call(u,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"};if(t){let s;for(t=(t=t.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,p).replace(/\"[^\"]+\"|\'[^\']+\'/g,(e=>e.replace(/[;:]/g,p)));s=o.exec(t);){o.lastIndex=s.index+s[0].length;let t=s[1].replace(r,"").toLowerCase(),d=s[2].replace(r,"");if(t&&d){if(t=v(t),d=v(d),-1!==t.indexOf(l)||-1!==t.indexOf('"'))continue;if(!e.allow_script_urls&&("behavior"===t||/expression\s*\(|\/\*|\*\//.test(d)))continue;"font-weight"===t&&"700"===d?d="bold":"color"!==t&&"background-color"!==t||(d=d.toLowerCase()),m(e.force_hex_color)&&"off"!==e.force_hex_color&&va(d).each((t=>{"always"!==e.force_hex_color&&1!==t.alpha||(d=Ca(ya(t)))})),d=d.replace(n,y),a[t]=i?h(d,!0):d}}f("border","",!0),f("border","-width"),f("border","-color"),f("border","-style"),f("padding",""),f("margin",""),"border",w="border-style",x="border-color",g(C="border-width")&&g(w)&&g(x)&&(a.border=a[C]+" "+a[w]+" "+a[x],delete a[C],delete a[w],delete a[x]),"medium none"===a.border&&delete a.border,"none"===a["border-image"]&&delete a["border-image"]}var C,w,x;return a},serialize:(e,t)=>{let n="";const o=(t,o)=>{const r=o[t];if(r)for(let t=0,o=r.length;t<o;t++){const o=r[t],s=e[o];s&&(n+=(n.length>0?" ":"")+o+": "+s+";")}};return t&&a?(o("*",a),o(t,a)):ge(e,((e,o)=>{e&&((e,t)=>{if(!i||!t)return!0;let n=i["*"];return!(n&&n[e]||(n=i[t],n&&n[e]))})(o,t)&&(n+=(n.length>0?" ":"")+o+": "+e+";")})),n}};return c},xa={keyLocation:!0,layerX:!0,layerY:!0,returnValue:!0,webkitMovementX:!0,webkitMovementY:!0,keyIdentifier:!0,mozPressure:!0},Ea=(e,t)=>{const n=null!=t?t:{};for(const t in e)Ee(xa,t)||(n[t]=e[t]);return C(e.composedPath)&&(n.composedPath=()=>e.composedPath()),C(e.getModifierState)&&(n.getModifierState=t=>e.getModifierState(t)),C(e.getTargetRanges)&&(n.getTargetRanges=()=>e.getTargetRanges()),n},_a=(e,t,n,o)=>{var r;const s=Ea(t,o);return s.type=e,y(s.target)&&(s.target=null!==(r=s.srcElement)&&void 0!==r?r:n),(e=>y(e.preventDefault)||(e=>e instanceof Event||w(e.initEvent))(e))(t)&&(s.preventDefault=()=>{s.defaultPrevented=!0,s.isDefaultPrevented=M,w(t.preventDefault)&&t.preventDefault()},s.stopPropagation=()=>{s.cancelBubble=!0,s.isPropagationStopped=M,w(t.stopPropagation)&&t.stopPropagation()},s.stopImmediatePropagation=()=>{s.isImmediatePropagationStopped=M,s.stopPropagation()},(e=>e.isDefaultPrevented===M||e.isDefaultPrevented===L)(s)||(s.isDefaultPrevented=!0===s.defaultPrevented?M:L,s.isPropagationStopped=!0===s.cancelBubble?M:L,s.isImmediatePropagationStopped=L)),s},ka=/^(?:mouse|contextmenu)|click/,Sa=(e,t,n,o)=>{e.addEventListener(t,n,o||!1)},Na=(e,t,n,o)=>{e.removeEventListener(t,n,o||!1)},Ra=(e,t)=>{const n=_a(e.type,e,document,t);if((e=>C(e)&&ka.test(e.type))(e)&&v(e.pageX)&&!v(e.clientX)){const t=n.target.ownerDocument||document,o=t.documentElement,r=t.body,s=n;s.pageX=e.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),s.pageY=e.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)}return n},Aa=(e,t,n)=>{const o=e.document,r={type:"ready"};if(n.domLoaded)return void t(r);const s=()=>{Na(e,"DOMContentLoaded",s),Na(e,"load",s),n.domLoaded||(n.domLoaded=!0,t(r)),e=null};"complete"===o.readyState||"interactive"===o.readyState&&o.body?s():Sa(e,"DOMContentLoaded",s),n.domLoaded||Sa(e,"load",s)};class Ta{constructor(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}bind(e,t,n,o){const r=this;let s;const a=window,i=e=>{r.executeHandlers(Ra(e||a.event),l)};if(!e||er(e)||or(e))return n;let l;e[r.expando]?l=e[r.expando]:(l=r.count++,e[r.expando]=l,r.events[l]={}),o=o||e;const d=t.split(" ");let c=d.length;for(;c--;){let t=d[c],u=i,m=!1,f=!1;"DOMContentLoaded"===t&&(t="ready"),r.domLoaded&&"ready"===t&&"complete"===e.readyState?n.call(o,Ra({type:t})):(r.hasFocusIn||"focusin"!==t&&"focusout"!==t||(m=!0,f="focusin"===t?"focus":"blur",u=e=>{const t=Ra(e||a.event);t.type="focus"===t.type?"focusin":"focusout",r.executeHandlers(t,l)}),s=r.events[l][t],s?"ready"===t&&r.domLoaded?n(Ra({type:t})):s.push({func:n,scope:o}):(r.events[l][t]=s=[{func:n,scope:o}],s.fakeName=f,s.capture=m,s.nativeHandler=u,"ready"===t?Aa(e,u,r):Sa(e,f||t,u,m)))}return e=s=null,n}unbind(e,t,n){if(!e||er(e)||or(e))return this;const o=e[this.expando];if(o){let r=this.events[o];if(t){const o=t.split(" ");let s=o.length;for(;s--;){const t=o[s],a=r[t];if(a){if(n){let e=a.length;for(;e--;)if(a[e].func===n){const n=a.nativeHandler,o=a.fakeName,s=a.capture,i=a.slice(0,e).concat(a.slice(e+1));i.nativeHandler=n,i.fakeName=o,i.capture=s,r[t]=i}}n&&0!==a.length||(delete r[t],Na(e,a.fakeName||t,a.nativeHandler,a.capture))}}}else ge(r,((t,n)=>{Na(e,t.fakeName||n,t.nativeHandler,t.capture)})),r={};for(const e in r)if(Ee(r,e))return this;delete this.events[o];try{delete e[this.expando]}catch(t){e[this.expando]=null}}return this}fire(e,t,n){return this.dispatch(e,t,n)}dispatch(e,t,n){if(!e||er(e)||or(e))return this;const o=Ra({type:t,target:e},n);do{const t=e[this.expando];t&&this.executeHandlers(o,t),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow}while(e&&!o.isPropagationStopped());return this}clean(e){if(!e||er(e)||or(e))return this;if(e[this.expando]&&this.unbind(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName){this.unbind(e);const t=e.getElementsByTagName("*");let n=t.length;for(;n--;)(e=t[n])[this.expando]&&this.unbind(e)}return this}destroy(){this.events={}}cancel(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}executeHandlers(e,t){const n=this.events[t],o=n&&n[e.type];if(o)for(let t=0,n=o.length;t<n;t++){const n=o[t];if(n&&!1===n.func.call(n.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}}}Ta.Event=new Ta;const Oa=Pt.each,Ba=Pt.grep,Pa="data-mce-style",Da=Pt.makeMap("fill-opacity font-weight line-height opacity orphans widows z-index zoom"," "),La=(e,t,n)=>{y(n)||""===n?on(e,t):Jt(e,t,n)},Ma=e=>e.replace(/[A-Z]/g,(e=>"-"+e.toLowerCase())),Ia=(e,t)=>{let n=0;if(e)for(let o=e.nodeType,r=e.previousSibling;r;r=r.previousSibling){const e=r.nodeType;(!t||!er(r)||e!==o&&r.data.length)&&(n++,o=e)}return n},Fa=(e,t)=>{const n=en(t,"style"),o=e.serialize(e.parse(n),Ht(t));La(t,Pa,o)},Ua=(e,t,n)=>{const o=Ma(t);y(n)||""===n?go(e,o):io(e,o,((e,t)=>x(e)?Ee(Da,t)?e+"":e+"px":e)(n,o))},za=(e,t={})=>{const n={},o=window,r={};let s=0;const a=Is.forElement(yn(e),{contentCssCors:t.contentCssCors,referrerPolicy:t.referrerPolicy}),i=[],l=t.schema?t.schema:ua({}),d=wa({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope,force_hex_color:t.force_hex_color},t.schema),c=t.ownEvents?new Ta:Ta.Event,u=l.getBlockElements(),f=t=>t&&e&&m(t)?e.getElementById(t):t,g=e=>{const t=f(e);return C(t)?yn(t):null},h=(e,t,n="")=>{let o;const r=g(e);if(C(r)&&Wt(r)){const e=G[t];o=e&&e.get?e.get(r.dom,t):en(r,t)}return C(o)?o:n},b=e=>{const t=f(e);return y(t)?[]:t.attributes},v=(e,n,o)=>{O(e,(e=>{if(qo(e)){const r=yn(e),s=""===o?null:o,a=en(r,n),i=G[n];i&&i.set?i.set(r.dom,s,n):La(r,n,s),a!==s&&t.onSetAttrib&&t.onSetAttrib({attrElm:r.dom,attrName:n,attrValue:s})}}))},x=()=>t.root_element||e.body,E=(t,n)=>((e,t,n)=>{let o=0,r=0;const s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===co(yn(e),"position")){const n=t.getBoundingClientRect();return o=n.left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,r=n.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop,{x:o,y:r}}let a=t;for(;a&&a!==n&&a.nodeType&&!Ls(a,n);){const e=a;o+=e.offsetLeft||0,r+=e.offsetTop||0,a=e.offsetParent}for(a=t.parentNode;a&&a!==n&&a.nodeType&&!Ls(a,n);)o-=a.scrollLeft||0,r-=a.scrollTop||0,a=a.parentNode;r+=(e=>Ps.isFirefox()&&"table"===Ht(e)?Ds(Mn(e)).filter((e=>"caption"===Ht(e))).bind((e=>Ds(Ln(e)).map((t=>{const n=t.dom.offsetTop,o=e.dom.offsetTop,r=e.dom.offsetHeight;return n<=o?-r:0})))).getOr(0):0)(yn(t))}return{x:o,y:r}})(e.body,f(t),n),k=(e,t,n)=>{const o=f(e);var r;if(!y(o)&&(Vo(o)||qo(r=o)&&"http://www.w3.org/2000/svg"===r.namespaceURI))return n?co(yn(o),Ma(t)):("float"===(t=t.replace(/-(\D)/g,((e,t)=>t.toUpperCase())))&&(t="cssFloat"),o.style?o.style[t]:void 0)},S=e=>{const t=f(e);if(!t)return{w:0,h:0};let n=k(t,"width"),o=k(t,"height");return n&&-1!==n.indexOf("px")||(n="0"),o&&-1!==o.indexOf("px")||(o="0"),{w:parseInt(n,10)||t.offsetWidth||t.clientWidth,h:parseInt(o,10)||t.offsetHeight||t.clientHeight}},R=(e,t)=>{if(!e)return!1;const n=p(e)?e:[e];return $(n,(e=>xn(yn(e),t)))},A=(e,t,n,o)=>{const r=[];let s=f(e);o=void 0===o;const a=n||("BODY"!==x().nodeName?x().parentNode:null);if(m(t))if("*"===t)t=qo;else{const e=t;t=t=>R(t,e)}for(;s&&!(s===a||y(s.nodeType)||rr(s)||sr(s));){if(!t||t(s)){if(!o)return[s];r.push(s)}s=s.parentNode}return o?r:null},T=(e,t,n)=>{let o=t;if(e){m(t)&&(o=e=>R(e,t));for(let t=e[n];t;t=t[n])if(w(o)&&o(t))return t}return null},O=function(e,t,n){const o=null!=n?n:this;if(p(e)){const n=[];return Oa(e,((e,r)=>{const s=f(e);s&&n.push(t.call(o,s,r))})),n}{const n=f(e);return!!n&&t.call(o,n)}},B=(e,t)=>{O(e,(e=>{ge(t,((t,n)=>{v(e,n,t)}))}))},P=(e,t)=>{O(e,(e=>{const n=yn(e);So(n,t)}))},D=(t,n,o,r,s)=>O(t,(t=>{const a=m(n)?e.createElement(n):n;return C(o)&&B(a,o),r&&(!m(r)&&r.nodeType?a.appendChild(r):m(r)&&P(a,r)),s?a:t.appendChild(a)})),L=(t,n,o)=>D(e.createElement(t),t,n,o,!0),M=ea.encodeAllRaw,I=(e,t)=>O(e,(e=>{const n=yn(e);return t&&V(Mn(n),(e=>{Kt(e)&&0===e.dom.length?xo(e):po(n,e)})),xo(n),n.dom})),F=(e,t,n)=>{O(e,(e=>{if(qo(e)){const o=yn(e),r=t.split(" ");V(r,(e=>{C(n)?(n?un:fn)(o,e):((e,t)=>{const n=an(e)?e.dom.classList.toggle(t):((e,t)=>H(ln(e),t)?cn(e,t):dn(e,t))(e,t);mn(e)})(o,e)}))}}))},U=(e,t,n)=>O(t,(o=>{var r;const s=p(t)?e.cloneNode(!0):e;return n&&Oa(Ba(o.childNodes),(e=>{s.appendChild(e)})),null===(r=o.parentNode)||void 0===r||r.replaceChild(s,o),o})),z=e=>{if(qo(e)){const t="a"===e.nodeName.toLowerCase()&&!h(e,"href")&&h(e,"id");if(h(e,"name")||h(e,"data-mce-bookmark")||t)return!0}return!1},j=()=>e.createRange(),q=(n,r,s,a)=>{if(p(n)){let e=n.length;const t=[];for(;e--;)t[e]=q(n[e],r,s,a);return t}return!t.collect||n!==e&&n!==o||i.push([n,r,s,a]),c.bind(n,r,s,a||Y)},W=(t,n,r)=>{if(p(t)){let e=t.length;const o=[];for(;e--;)o[e]=W(t[e],n,r);return o}if(i.length>0&&(t===e||t===o)){let e=i.length;for(;e--;){const[o,s,a]=i[e];t!==o||n&&n!==s||r&&r!==a||c.unbind(o,s,a)}}return c.unbind(t,n,r)},K=e=>{if(e&&Vo(e)){const t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},Y={doc:e,settings:t,win:o,files:r,stdMode:!0,boxModel:!0,styleSheetLoader:a,boundEvents:i,styles:d,schema:l,events:c,isBlock:e=>m(e)?Ee(u,e):qo(e)&&(Ee(u,e.nodeName)||Ts(l,e)),root:null,clone:(e,t)=>e.cloneNode(t),getRoot:x,getViewPort:e=>{const t=Io(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:e=>{const t=f(e),n=E(t),o=S(t);return{x:n.x,y:n.y,w:o.w,h:o.h}},getSize:S,getParent:(e,t,n)=>{const o=A(e,t,n,!1);return o&&o.length>0?o[0]:null},getParents:A,get:f,getNext:(e,t)=>T(e,t,"nextSibling"),getPrev:(e,t)=>T(e,t,"previousSibling"),select:(n,o)=>{var r,s;const a=null!==(s=null!==(r=f(o))&&void 0!==r?r:t.root_element)&&void 0!==s?s:e;return w(a.querySelectorAll)?ce(a.querySelectorAll(n)):[]},is:R,add:D,create:L,createHTML:(e,t,n="")=>{let o="<"+e;for(const e in t)_e(t,e)&&(o+=" "+e+'="'+M(t[e])+'"');return Ge(n)&&Ee(l.getVoidElements(),e)?o+" />":o+">"+n+"</"+e+">"},createFragment:t=>{const n=e.createElement("div"),o=e.createDocumentFragment();let r;for(o.appendChild(n),t&&(n.innerHTML=t);r=n.firstChild;)o.appendChild(r);return o.removeChild(n),o},remove:I,setStyle:(e,n,o)=>{O(e,(e=>{const r=yn(e);Ua(r,n,o),t.update_styles&&Fa(d,r)}))},getStyle:k,setStyles:(e,n)=>{O(e,(e=>{const o=yn(e);ge(n,((e,t)=>{Ua(o,t,e)})),t.update_styles&&Fa(d,o)}))},removeAllAttribs:e=>O(e,(e=>{const t=e.attributes;for(let n=t.length-1;n>=0;n--)e.removeAttributeNode(t.item(n))})),setAttrib:v,setAttribs:B,getAttrib:h,getPos:E,parseStyle:e=>d.parse(e),serializeStyle:(e,t)=>d.serialize(e,t),addStyle:t=>{if(Y!==za.DOM&&e===document){if(n[t])return;n[t]=!0}let o=e.getElementById("mceDefaultStyles");if(!o){o=e.createElement("style"),o.id="mceDefaultStyles",o.type="text/css";const t=e.head;t.firstChild?t.insertBefore(o,t.firstChild):t.appendChild(o)}o.styleSheet?o.styleSheet.cssText+=t:o.appendChild(e.createTextNode(t))},loadCSS:e=>{e||(e=""),V(e.split(","),(e=>{r[e]=!0,a.load(e).catch(_)}))},addClass:(e,t)=>{F(e,t,!0)},removeClass:(e,t)=>{F(e,t,!1)},hasClass:(e,t)=>{const n=g(e),o=t.split(" ");return C(n)&&ne(o,(e=>gn(n,e)))},toggleClass:F,show:e=>{O(e,(e=>go(yn(e),"display")))},hide:e=>{O(e,(e=>io(yn(e),"display","none")))},isHidden:e=>{const t=g(e);return C(t)&&Dt(mo(t,"display"),"none")},uniqueId:e=>(e||"mce_")+s++,setHTML:P,getOuterHTML:e=>{const t=g(e);return C(t)?qo(t.dom)?t.dom.outerHTML:(e=>{const t=bn("div"),n=yn(e.dom.cloneNode(!0));return vo(t,n),ko(t)})(t):""},setOuterHTML:(e,t)=>{O(e,(e=>{qo(e)&&(e.outerHTML=t)}))},decode:ea.decode,encode:M,insertAfter:(e,t)=>{const n=f(t);return O(e,(e=>{const t=null==n?void 0:n.parentNode,o=null==n?void 0:n.nextSibling;return t&&(o?t.insertBefore(e,o):t.appendChild(e)),e}))},replace:U,rename:(e,t)=>{if(e.nodeName!==t.toUpperCase()){const n=L(t);return Oa(b(e),(t=>{v(n,t.nodeName,h(e,t.nodeName))})),U(n,e,!0),n}return e},findCommonAncestor:(e,t)=>{let n=e;for(;n;){let e=t;for(;e&&n!==e;)e=e.parentNode;if(n===e)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},run:O,getAttribs:b,isEmpty:(e,t,n)=>{let o=0;if(z(e))return!1;const r=e.firstChild;if(r){const s=new jo(r,e),a=l?l.getWhitespaceElements():{},i=t||(l?l.getNonEmptyElements():null);let d=r;do{if(qo(d)){const e=d.getAttribute("data-mce-bogus");if(e){d=s.next("all"===e);continue}const t=d.nodeName.toLowerCase();if(i&&i[t]){if("br"===t){o++,d=s.next();continue}return!1}if(z(d))return!1}if(or(d))return!1;if(er(d)&&!ss(d.data)&&(!(null==n?void 0:n.includeZwsp)||!as(d.data)))return!1;if(er(d)&&d.parentNode&&a[d.parentNode.nodeName]&&ss(d.data))return!1;d=s.next()}while(d)}return o<=1},createRng:j,nodeIndex:Ia,split:(e,t,n)=>{let o,r,s=j();if(e&&t&&e.parentNode&&t.parentNode){const a=e.parentNode;return s.setStart(a,Ia(e)),s.setEnd(t.parentNode,Ia(t)),o=s.extractContents(),s=j(),s.setStart(t.parentNode,Ia(t)+1),s.setEnd(a,Ia(e)+1),r=s.extractContents(),a.insertBefore(zs(Y,o,l),e),n?a.insertBefore(n,e):a.insertBefore(t,e),a.insertBefore(zs(Y,r,l),e),I(e),n||t}},bind:q,unbind:W,fire:(e,t,n)=>c.dispatch(e,t,n),dispatch:(e,t,n)=>c.dispatch(e,t,n),getContentEditable:K,getContentEditableParent:e=>{const t=x();let n=null;for(let o=e;o&&o!==t&&(n=K(o),null===n);o=o.parentNode);return n},isEditable:e=>{if(C(e)){const t=qo(e)?e:e.parentElement;return C(t)&&Vo(t)&&oo(yn(t))}return!1},destroy:()=>{if(i.length>0){let e=i.length;for(;e--;){const[t,n,o]=i[e];c.unbind(t,n,o)}}ge(r,((e,t)=>{a.unload(t),delete r[t]}))},isChildOf:(e,t)=>e===t||t.contains(e),dumpRng:e=>"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},G=((e,t,n)=>{const o=t.keep_values,r={set:(e,o,r)=>{const s=yn(e);w(t.url_converter)&&C(o)&&(o=t.url_converter.call(t.url_converter_scope||n(),String(o),r,e)),La(s,"data-mce-"+r,o),La(s,r,o)},get:(e,t)=>{const n=yn(e);return en(n,"data-mce-"+t)||en(n,t)}},s={style:{set:(t,n)=>{const r=yn(t);o&&La(r,Pa,n),on(r,"style"),m(n)&&lo(r,e.parse(n))},get:t=>{const n=yn(t),o=en(n,Pa)||en(n,"style");return e.serialize(e.parse(o),Ht(n))}}};return o&&(s.href=s.src=r),s})(d,t,N(Y));return Y};za.DOM=za(document),za.nodeIndex=Ia;const ja=za.DOM;class Ha{constructor(e={}){this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=!1,this.settings=e}_setReferrerPolicy(e){this.settings.referrerPolicy=e}loadScript(e){return new Promise(((t,n)=>{const o=ja;let r;const s=()=>{o.remove(a),r&&(r.onerror=r.onload=r=null)},a=o.uniqueId();r=document.createElement("script"),r.id=a,r.type="text/javascript",r.src=Pt._addCacheSuffix(e),this.settings.referrerPolicy&&o.setAttrib(r,"referrerpolicy",this.settings.referrerPolicy),r.onload=()=>{s(),t()},r.onerror=()=>{s(),n("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(r)}))}isDone(e){return 2===this.states[e]}markDone(e){this.states[e]=2}add(e){const t=this;return t.queue.push(e),void 0===t.states[e]&&(t.states[e]=0),new Promise(((n,o)=>{t.scriptLoadedCallbacks[e]||(t.scriptLoadedCallbacks[e]=[]),t.scriptLoadedCallbacks[e].push({resolve:n,reject:o})}))}load(e){return this.add(e)}remove(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]}loadQueue(){const e=this.queue;return this.queue=[],this.loadScripts(e)}loadScripts(e){const t=this,n=(e,n)=>{xe(t.scriptLoadedCallbacks,n).each((t=>{V(t,(t=>t[e](n)))})),delete t.scriptLoadedCallbacks[n]},o=e=>{const t=Y(e,(e=>"rejected"===e.status));return t.length>0?Promise.reject(te(t,(({reason:e})=>p(e)?e:[e]))):Promise.resolve()},r=e=>Promise.allSettled(q(e,(e=>2===t.states[e]?(n("resolve",e),Promise.resolve()):3===t.states[e]?(n("reject",e),Promise.reject(e)):(t.states[e]=1,t.loadScript(e).then((()=>{t.states[e]=2,n("resolve",e);const s=t.queue;return s.length>0?(t.queue=[],r(s).then(o)):Promise.resolve()}),(()=>(t.states[e]=3,n("reject",e),Promise.reject(e)))))))),s=e=>(t.loading=!0,r(e).then((e=>{t.loading=!1;const n=t.queueLoadedCallbacks.shift();return I.from(n).each(D),o(e)}))),a=ke(e);return t.loading?new Promise(((e,n)=>{t.queueLoadedCallbacks.push((()=>{s(a).then(e,n)}))})):s(a)}}Ha.ScriptLoader=new Ha;const $a=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},qa={},Va=$a("en"),Wa=()=>xe(qa,Va.get()),Ka={getData:()=>pe(qa,(e=>({...e}))),setCode:e=>{e&&Va.set(e)},getCode:()=>Va.get(),add:(e,t)=>{let n=qa[e];n||(qa[e]=n={});const o=q(me(t),(e=>e.toLowerCase()));ge(t,((e,r)=>{const s=r.toLowerCase();s!==r&&((e,t)=>{const n=e.indexOf(t);return-1!==n&&e.indexOf(t,n+1)>n})(o,s)?(Ee(t,s)||(n[s]=e),n[r]=e):n[s]=e}))},translate:e=>{const t=Wa().getOr({}),n=e=>w(e)?Object.prototype.toString.call(e):o(e)?"":""+e,o=e=>""===e||null==e,r=e=>{const o=n(e);return Ee(t,o)?n(t[o]):xe(t,o.toLowerCase()).map(n).getOr(o)},s=e=>e.replace(/{context:\w+}$/,"");if(o(e))return"";if(f(a=e)&&Ee(a,"raw"))return n(e.raw);var a;if((e=>p(e)&&e.length>1)(e)){const t=e.slice(1);return s(r(e[0]).replace(/\{([0-9]+)\}/g,((e,o)=>Ee(t,o)?n(t[o]):e)))}return s(r(e))},isRtl:()=>Wa().bind((e=>xe(e,"_dir"))).exists((e=>"rtl"===e)),hasCode:e=>Ee(qa,e)},Ya=()=>{const e=[],t={},n={},o=[],r=(e,t)=>{const n=Y(o,(n=>n.name===e&&n.state===t));V(n,(e=>e.resolve()))},s=e=>Ee(t,e),a=(e,n)=>{const o=Ka.getCode();!o||n&&-1===(","+(n||"")+",").indexOf(","+o+",")||Ha.ScriptLoader.add(t[e]+"/langs/"+o+".js")},i=(e,t="added")=>"added"===t&&(e=>Ee(n,e))(e)||"loaded"===t&&s(e)?Promise.resolve():new Promise((n=>{o.push({name:e,state:t,resolve:n})}));return{items:e,urls:t,lookup:n,get:e=>{if(n[e])return n[e].instance},requireLangPack:(e,t)=>{!1!==Ya.languageLoad&&(s(e)?a(e,t):i(e,"loaded").then((()=>a(e,t))))},add:(t,o)=>(e.push(o),n[t]={instance:o},r(t,"added"),o),remove:e=>{delete t[e],delete n[e]},createUrl:(e,t)=>m(t)?m(e)?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}:t,load:(e,o)=>{if(t[e])return Promise.resolve();let s=m(o)?o:o.prefix+o.resource+o.suffix;0!==s.indexOf("/")&&-1===s.indexOf("://")&&(s=Ya.baseURL+"/"+s),t[e]=s.substring(0,s.lastIndexOf("/"));const a=()=>(r(e,"loaded"),Promise.resolve());return n[e]?a():Ha.ScriptLoader.add(s).then(a)},waitFor:i}};Ya.languageLoad=!0,Ya.baseURL="",Ya.PluginManager=Ya(),Ya.ThemeManager=Ya(),Ya.ModelManager=Ya();const Ga=e=>{const t=$a(I.none()),n=()=>t.get().each((e=>clearInterval(e)));return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:o=>{n(),t.set(I.some(setInterval(o,e)))}}},Xa=()=>{const e=(e=>{const t=$a(I.none()),n=()=>t.get().each(e);return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{n(),t.set(I.some(e))}}})(_);return{...e,on:t=>e.get().each(t)}},Qa=(e,t)=>{let n=null;return{cancel:()=>{h(n)||(clearTimeout(n),n=null)},throttle:(...o)=>{h(n)&&(n=setTimeout((()=>{n=null,e.apply(null,o)}),t))}}},Ja=(e,t)=>{let n=null;const o=()=>{h(n)||(clearTimeout(n),n=null)};return{cancel:o,throttle:(...r)=>{o(),n=setTimeout((()=>{n=null,e.apply(null,r)}),t)}}},Za=N("mce-annotation"),ei=N("data-mce-annotation"),ti=N("data-mce-annotation-uid"),ni=N("data-mce-annotation-active"),oi=N("data-mce-annotation-classes"),ri=N("data-mce-annotation-attrs"),si=e=>t=>_n(t,e),ai=(e,t)=>{const n=e.selection.getRng(),o=yn(n.startContainer),r=yn(e.getBody()),s=t.fold((()=>"."+Za()),(e=>`[${ei()}="${e}"]`)),a=In(o,n.startOffset).getOr(o);return no(a,s,si(r)).bind((t=>tn(t,`${ti()}`).bind((n=>tn(t,`${ei()}`).map((t=>{const o=li(e,n);return{uid:n,name:t,elements:o}}))))))},ii=(e,t)=>nn(e,"data-mce-bogus")||zo(e,'[data-mce-bogus="all"]',si(t)),li=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ti()}="${t}"]`);return Y(o,(e=>!ii(e,n)))},di=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ei()}="${t}"]`),r={};return V(o,(e=>{if(!ii(e,n)){const t=en(e,ti()),n=xe(r,t).getOr([]);r[t]=n.concat([e])}})),r};let ci=0;const ui=e=>{const t=(new Date).getTime(),n=Math.floor(1e9*Math.random());return ci++,e+"_"+n+ci+String(t)},mi=(e,t)=>yn(e.dom.cloneNode(t)),fi=e=>mi(e,!1),gi=e=>mi(e,!0),pi=(e,t,n=L)=>{const o=new jo(e,t),r=e=>{let t;do{t=o[e]()}while(t&&!er(t)&&!n(t));return I.from(t).filter(er)};return{current:()=>I.from(o.current()).filter(er),next:()=>r("next"),prev:()=>r("prev"),prev2:()=>r("prev2")}},hi=(e,t)=>{const n=t||(t=>e.isBlock(t)||ar(t)||dr(t)),o=(e,t,n,r)=>{if(er(e)){const n=r(e,t,e.data);if(-1!==n)return I.some({container:e,offset:n})}return n().bind((e=>o(e.container,e.offset,n,r)))};return{backwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.prev().map((e=>({container:e,offset:e.length})))),s).getOrNull()},forwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.next().map((e=>({container:e,offset:0})))),s).getOrNull()}}},bi=Math.round,vi=e=>e?{left:bi(e.left),top:bi(e.top),bottom:bi(e.bottom),right:bi(e.right),width:bi(e.width),height:bi(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0},yi=(e,t)=>(e=vi(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e),Ci=(e,t,n)=>e>=0&&e<=Math.min(t.height,n.height)/2,wi=(e,t)=>{const n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&Ci(t.top-e.bottom,e,t)},xi=(e,t)=>e.top>t.bottom||!(e.bottom<t.top)&&Ci(t.bottom-e.top,e,t),Ei=(e,t,n)=>{const o=Math.max(Math.min(t,e.left+e.width),e.left),r=Math.max(Math.min(n,e.top+e.height),e.top);return Math.sqrt((t-o)*(t-o)+(n-r)*(n-r))},_i=e=>{const t=e.startContainer,n=e.startOffset;return t===e.endContainer&&t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},ki=(e,t)=>{if(qo(e)&&e.hasChildNodes()){const n=e.childNodes,o=((e,t,n)=>Math.min(Math.max(e,0),n))(t,0,n.length-1);return n[o]}return e},Si=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),Ni=e=>m(e)&&e.charCodeAt(0)>=768&&Si.test(e),Ri=qo,Ai=ts,Ti=Yo("display","block table"),Oi=Yo("float","left right"),Bi=((...e)=>t=>{for(let n=0;n<e.length;n++)if(!e[n](t))return!1;return!0})(Ri,Ai,O(Oi)),Pi=O(Yo("white-space","pre pre-line pre-wrap")),Di=er,Li=ar,Mi=za.nodeIndex,Ii=(e,t)=>t<0&&qo(e)&&e.hasChildNodes()?void 0:ki(e,t),Fi=e=>e?e.createRange():za.DOM.createRng(),Ui=e=>m(e)&&/[\r\n\t ]/.test(e),zi=e=>!!e.setStart&&!!e.setEnd,ji=e=>{const t=e.startContainer,n=e.startOffset;if(Ui(e.toString())&&Pi(t.parentNode)&&er(t)){const e=t.data;if(Ui(e[n-1])||Ui(e[n+1]))return!0}return!1},Hi=e=>0===e.left&&0===e.right&&0===e.top&&0===e.bottom,$i=e=>{var t;let n;const o=e.getClientRects();return n=o.length>0?vi(o[0]):vi(e.getBoundingClientRect()),!zi(e)&&Li(e)&&Hi(n)?(e=>{const t=e.ownerDocument,n=Fi(t),o=t.createTextNode(br),r=e.parentNode;r.insertBefore(o,e),n.setStart(o,0),n.setEnd(o,1);const s=vi(n.getBoundingClientRect());return r.removeChild(o),s})(e):Hi(n)&&zi(e)&&null!==(t=(e=>{const t=e.startContainer,n=e.endContainer,o=e.startOffset,r=e.endOffset;if(t===n&&er(n)&&0===o&&1===r){const t=e.cloneRange();return t.setEndAfter(n),$i(t)}return null})(e))&&void 0!==t?t:n},qi=(e,t)=>{const n=yi(e,t);return n.width=1,n.right=n.left+1,n},Vi=(e,t,n)=>{const o=()=>(n||(n=(e=>{const t=[],n=e=>{var n,o;0!==e.height&&(t.length>0&&(n=e,o=t[t.length-1],n.left===o.left&&n.top===o.top&&n.bottom===o.bottom&&n.right===o.right)||t.push(e))},o=(e,t)=>{const o=Fi(e.ownerDocument);if(t<e.data.length){if(Ni(e.data[t]))return;if(Ni(e.data[t-1])&&(o.setStart(e,t),o.setEnd(e,t+1),!ji(o)))return void n(qi($i(o),!1))}t>0&&(o.setStart(e,t-1),o.setEnd(e,t),ji(o)||n(qi($i(o),!1))),t<e.data.length&&(o.setStart(e,t),o.setEnd(e,t+1),ji(o)||n(qi($i(o),!0)))},r=e.container(),s=e.offset();if(Di(r))return o(r,s),t;if(Ri(r))if(e.isAtEnd()){const e=Ii(r,s);Di(e)&&o(e,e.data.length),Bi(e)&&!Li(e)&&n(qi($i(e),!1))}else{const a=Ii(r,s);if(Di(a)&&o(a,0),Bi(a)&&e.isAtEnd())return n(qi($i(a),!1)),t;const i=Ii(e.container(),e.offset()-1);Bi(i)&&!Li(i)&&(Ti(i)||Ti(a)||!Bi(a))&&n(qi($i(i),!1)),Bi(a)&&n(qi($i(a),!0))}return t})(Vi(e,t))),n);return{container:N(e),offset:N(t),toRange:()=>{const n=Fi(e.ownerDocument);return n.setStart(e,t),n.setEnd(e,t),n},getClientRects:o,isVisible:()=>o().length>0,isAtStart:()=>(Di(e),0===t),isAtEnd:()=>Di(e)?t>=e.data.length:t>=e.childNodes.length,isEqual:n=>n&&e===n.container()&&t===n.offset(),getNode:n=>Ii(e,n?t-1:t)}};Vi.fromRangeStart=e=>Vi(e.startContainer,e.startOffset),Vi.fromRangeEnd=e=>Vi(e.endContainer,e.endOffset),Vi.after=e=>Vi(e.parentNode,Mi(e)+1),Vi.before=e=>Vi(e.parentNode,Mi(e)),Vi.isAbove=(e,t)=>Mt(le(t.getClientRects()),de(e.getClientRects()),wi).getOr(!1),Vi.isBelow=(e,t)=>Mt(de(t.getClientRects()),le(e.getClientRects()),xi).getOr(!1),Vi.isAtStart=e=>!!e&&e.isAtStart(),Vi.isAtEnd=e=>!!e&&e.isAtEnd(),Vi.isTextPosition=e=>!!e&&er(e.container()),Vi.isElementPosition=e=>!Vi.isTextPosition(e);const Wi=(e,t)=>{er(t)&&0===t.data.length&&e.remove(t)},Ki=(e,t,n)=>{sr(n)?((e,t,n)=>{const o=I.from(n.firstChild),r=I.from(n.lastChild);t.insertNode(n),o.each((t=>Wi(e,t.previousSibling))),r.each((t=>Wi(e,t.nextSibling)))})(e,t,n):((e,t,n)=>{t.insertNode(n),Wi(e,n.previousSibling),Wi(e,n.nextSibling)})(e,t,n)},Yi=er,Gi=Xo,Xi=za.nodeIndex,Qi=e=>{const t=e.parentNode;return Gi(t)?Qi(t):t},Ji=e=>e?Oe(e.childNodes,((e,t)=>(Gi(t)&&"BR"!==t.nodeName?e=e.concat(Ji(t)):e.push(t),e)),[]):[],Zi=e=>t=>e===t,el=e=>(Yi(e)?"text()":e.nodeName.toLowerCase())+"["+(e=>{let t,n;t=Ji(Qi(e)),n=Be(t,Zi(e),e),t=t.slice(0,n+1);const o=Oe(t,((e,n,o)=>(Yi(n)&&Yi(t[o-1])&&e++,e)),0);return t=Te(t,Ko([e.nodeName])),n=Be(t,Zi(e),e),n-o})(e)+"]",tl=(e,t)=>{let n,o=[],r=t.container(),s=t.offset();if(Yi(r))n=((e,t)=>{let n=e;for(;(n=n.previousSibling)&&Yi(n);)t+=n.data.length;return t})(r,s);else{const e=r.childNodes;s>=e.length?(n="after",s=e.length-1):n="before",r=e[s]}o.push(el(r));let a=((e,t,n)=>{const o=[];for(let n=t.parentNode;n&&n!==e;n=n.parentNode)o.push(n);return o})(e,r);return a=Te(a,O(Xo)),o=o.concat(Ae(a,(e=>el(e)))),o.reverse().join("/")+","+n},nl=(e,t)=>{if(!t)return null;const n=t.split(","),o=n[0].split("/"),r=n.length>1?n[1]:"before",s=Oe(o,((e,t)=>{const n=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return n?("text()"===n[1]&&(n[1]="#text"),((e,t,n)=>{let o=Ji(e);return o=Te(o,((e,t)=>!Yi(e)||!Yi(o[t-1]))),o=Te(o,Ko([t])),o[n]})(e,n[1],parseInt(n[2],10))):null}),e);if(!s)return null;if(!Yi(s)&&s.parentNode){let e;return e="after"===r?Xi(s)+1:Xi(s),Vi(s.parentNode,e)}return((e,t)=>{let n=e,o=0;for(;Yi(n);){const r=n.data.length;if(t>=o&&t<=o+r){e=n,t-=o;break}if(!Yi(n.nextSibling)){e=n,t=r;break}o+=r,n=n.nextSibling}return Yi(e)&&t>e.data.length&&(t=e.data.length),Vi(e,t)})(s,parseInt(r,10))},ol=dr,rl=(e,t,n,o,r)=>{const s=r?o.startContainer:o.endContainer;let a=r?o.startOffset:o.endOffset;const i=[],l=e.getRoot();if(er(s))i.push(n?((e,t,n)=>{let o=e(t.data.slice(0,n)).length;for(let n=t.previousSibling;n&&er(n);n=n.previousSibling)o+=e(n.data).length;return o})(t,s,a):a);else{let t=0;const o=s.childNodes;a>=o.length&&o.length&&(t=1,a=Math.max(0,o.length-1)),i.push(e.nodeIndex(o[a],n)+t)}for(let t=s;t&&t!==l;t=t.parentNode)i.push(e.nodeIndex(t,n));return i},sl=(e,t,n)=>{let o=0;return Pt.each(e.select(t),(e=>"all"===e.getAttribute("data-mce-bogus")?void 0:e!==n&&void o++)),o},al=(e,t)=>{let n=t?e.startContainer:e.endContainer,o=t?e.startOffset:e.endOffset;if(qo(n)&&"TR"===n.nodeName){const r=n.childNodes;n=r[Math.min(t?o:o-1,r.length-1)],n&&(o=t?0:n.childNodes.length,t?e.setStart(n,o):e.setEnd(n,o))}},il=e=>(al(e,!0),al(e,!1),e),ll=(e,t)=>{if(qo(e)&&(e=ki(e,t),ol(e)))return e;if(Ur(e)){er(e)&&Ir(e)&&(e=e.parentNode);let t=e.previousSibling;if(ol(t))return t;if(t=e.nextSibling,ol(t))return t}},dl=(e,t,n)=>{const o=n.getNode(),r=n.getRng();if("IMG"===o.nodeName||ol(o)){const e=o.nodeName;return{name:e,index:sl(n.dom,e,o)}}const s=(e=>ll(e.startContainer,e.startOffset)||ll(e.endContainer,e.endOffset))(r);if(s){const e=s.tagName;return{name:e,index:sl(n.dom,e,s)}}return((e,t,n,o)=>{const r=t.dom,s=rl(r,e,n,o,!0),a=t.isForward(),i=Wr(o)?{isFakeCaret:!0}:{};return t.isCollapsed()?{start:s,forward:a,...i}:{start:s,end:rl(r,e,n,o,!1),forward:a,...i}})(e,n,t,r)},cl=(e,t,n)=>{const o={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",o,"&#xFEFF;"):e.create("span",o)},ul=(e,t)=>{const n=e.dom;let o=e.getRng();const r=n.uniqueId(),s=e.isCollapsed(),a=e.getNode(),i=a.nodeName,l=e.isForward();if("IMG"===i)return{name:i,index:sl(n,i,a)};const d=il(o.cloneRange());if(!s){d.collapse(!1);const e=cl(n,r+"_end",t);Ki(n,d,e)}o=il(o),o.collapse(!0);const c=cl(n,r+"_start",t);return Ki(n,o,c),e.moveToBookmark({id:r,keep:!0,forward:l}),{id:r,forward:l}},ml=T(dl,R,!0),fl=e=>{const t=t=>t(e),n=N(e),o=()=>r,r={tag:!0,inner:e,fold:(t,n)=>n(e),isValue:M,isError:L,map:t=>pl.value(t(e)),mapError:o,bind:t,exists:t,forall:t,getOr:n,or:o,getOrThunk:n,orThunk:o,getOrDie:n,each:t=>{t(e)},toOptional:()=>I.some(e)};return r},gl=e=>{const t=()=>n,n={tag:!1,inner:e,fold:(t,n)=>t(e),isValue:L,isError:M,map:t,mapError:t=>pl.error(t(e)),bind:t,exists:L,forall:M,getOr:R,or:R,getOrThunk:P,orThunk:P,getOrDie:B(String(e)),each:_,toOptional:I.none};return n},pl={value:fl,error:gl,fromOption:(e,t)=>e.fold((()=>gl(t)),fl)},hl=e=>{if(!p(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],n={};return V(e,((o,r)=>{const s=me(o);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],i=o[a];if(void 0!==n[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!p(i))throw new Error("case arguments must be an array");t.push(a),n[a]=(...n)=>{const o=n.length;if(o!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+o);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,n)},match:e=>{const o=me(e);if(t.length!==o.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+o.join(","));if(!ne(t,(e=>H(o,e))))throw new Error("Not all branches were specified when using match. Specified: "+o.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,n)},log:e=>{console.log(e,{constructors:t,constructor:a,params:n})}}}})),n};hl([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const bl=e=>"inline-command"===e.type||"inline-format"===e.type,vl=e=>"block-command"===e.type||"block-format"===e.type,yl=e=>{const t=t=>pl.error({message:t,pattern:e}),n=(n,o,r)=>{if(void 0!==e.format){let r;if(p(e.format)){if(!ne(e.format,m))return t(n+" pattern has non-string items in the `format` array");r=e.format}else{if(!m(e.format))return t(n+" pattern has non-string `format` parameter");r=[e.format]}return pl.value(o(r))}return void 0!==e.cmd?m(e.cmd)?pl.value(r(e.cmd,e.value)):t(n+" pattern has non-string `cmd` parameter"):t(n+" pattern is missing both `format` and `cmd` parameters")};if(!f(e))return t("Raw pattern is not an object");if(!m(e.start))return t("Raw pattern is missing `start` parameter");if(void 0!==e.end){if(!m(e.end))return t("Inline pattern has non-string `end` parameter");if(0===e.start.length&&0===e.end.length)return t("Inline pattern has empty `start` and `end` parameters");let o=e.start,r=e.end;return 0===r.length&&(r=o,o=""),n("Inline",(e=>({type:"inline-format",start:o,end:r,format:e})),((e,t)=>({type:"inline-command",start:o,end:r,cmd:e,value:t})))}return void 0!==e.replacement?m(e.replacement)?0===e.start.length?t("Replacement pattern has empty `start` parameter"):pl.value({type:"inline-command",start:"",end:e.start,cmd:"mceInsertContent",value:e.replacement}):t("Replacement pattern has non-string `replacement` parameter"):0===e.start.length?t("Block pattern has empty `start` parameter"):n("Block",(t=>({type:"block-format",start:e.start,format:t[0]})),((t,n)=>({type:"block-command",start:e.start,cmd:t,value:n})))},Cl=e=>Y(e,vl),wl=e=>Y(e,bl),xl=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{n.push(e)}))})),{errors:t,values:n}})(q(e,yl));return V(t.errors,(e=>console.error(e.message,e.pattern))),t.values},El=xt().deviceType,_l=El.isTouch(),kl=za.DOM,Sl=e=>u(e,RegExp),Nl=e=>t=>t.options.get(e),Rl=e=>m(e)||f(e),Al=(e,t="")=>n=>{const o=m(n);if(o){if(-1!==n.indexOf("=")){const r=(e=>{const t=e.indexOf("=")>0?e.split(/[;,](?![^=;,]*(?:[;,]|$))/):e.split(",");return X(t,((e,t)=>{const n=t.split("="),o=n[0],r=n.length>1?n[1]:o;return e[Ve(o)]=Ve(r),e}),{})})(n);return{value:xe(r,e.id).getOr(t),valid:o}}return{value:n,valid:o}}return{valid:!1,message:"Must be a string."}},Tl=Nl("iframe_attrs"),Ol=Nl("doctype"),Bl=Nl("document_base_url"),Pl=Nl("body_id"),Dl=Nl("body_class"),Ll=Nl("content_security_policy"),Ml=Nl("br_in_pre"),Il=Nl("forced_root_block"),Fl=Nl("forced_root_block_attrs"),Ul=Nl("newline_behavior"),zl=Nl("br_newline_selector"),jl=Nl("no_newline_selector"),Hl=Nl("keep_styles"),$l=Nl("end_container_on_empty_block"),ql=Nl("automatic_uploads"),Vl=Nl("images_reuse_filename"),Wl=Nl("images_replace_blob_uris"),Kl=Nl("icons"),Yl=Nl("icons_url"),Gl=Nl("images_upload_url"),Xl=Nl("images_upload_base_path"),Ql=Nl("images_upload_credentials"),Jl=Nl("images_upload_handler"),Zl=Nl("content_css_cors"),ed=Nl("referrer_policy"),td=Nl("language"),nd=Nl("language_url"),od=Nl("indent_use_margin"),rd=Nl("indentation"),sd=Nl("content_css"),ad=Nl("content_style"),id=Nl("font_css"),ld=Nl("directionality"),dd=Nl("inline_boundaries_selector"),cd=Nl("object_resizing"),ud=Nl("resize_img_proportional"),md=Nl("placeholder"),fd=Nl("event_root"),gd=Nl("service_message"),pd=Nl("theme"),hd=Nl("theme_url"),bd=Nl("model"),vd=Nl("model_url"),yd=Nl("inline_boundaries"),Cd=Nl("formats"),wd=Nl("preview_styles"),xd=Nl("format_empty_lines"),Ed=Nl("format_noneditable_selector"),_d=Nl("custom_ui_selector"),kd=Nl("inline"),Sd=Nl("hidden_input"),Nd=Nl("submit_patch"),Rd=Nl("add_form_submit_trigger"),Ad=Nl("add_unload_trigger"),Td=Nl("custom_undo_redo_levels"),Od=Nl("disable_nodechange"),Bd=Nl("readonly"),Pd=Nl("editable_root"),Dd=Nl("content_css_cors"),Ld=Nl("plugins"),Md=Nl("external_plugins"),Id=Nl("block_unsupported_drop"),Fd=Nl("visual"),Ud=Nl("visual_table_class"),zd=Nl("visual_anchor_class"),jd=Nl("iframe_aria_text"),Hd=Nl("setup"),$d=Nl("init_instance_callback"),qd=Nl("urlconverter_callback"),Vd=Nl("auto_focus"),Wd=Nl("browser_spellcheck"),Kd=Nl("protect"),Yd=Nl("paste_block_drop"),Gd=Nl("paste_data_images"),Xd=Nl("paste_preprocess"),Qd=Nl("paste_postprocess"),Jd=Nl("newdocument_content"),Zd=Nl("paste_webkit_styles"),ec=Nl("paste_remove_styles_if_webkit"),tc=Nl("paste_merge_formats"),nc=Nl("smart_paste"),oc=Nl("paste_as_text"),rc=Nl("paste_tab_spaces"),sc=Nl("allow_html_data_urls"),ac=Nl("text_patterns"),ic=Nl("text_patterns_lookup"),lc=Nl("noneditable_class"),dc=Nl("editable_class"),cc=Nl("noneditable_regexp"),uc=Nl("preserve_cdata"),mc=Nl("highlight_on_focus"),fc=Nl("xss_sanitization"),gc=Nl("init_content_sync"),pc=e=>Pt.explode(e.options.get("images_file_types")),hc=Nl("table_tab_navigation"),bc=Nl("details_initial_state"),vc=Nl("details_serialized_state"),yc=Nl("force_hex_color"),Cc=Nl("sandbox_iframes"),wc=qo,xc=er,Ec=e=>{const t=e.parentNode;t&&t.removeChild(e)},_c=e=>{const t=Dr(e);return{count:e.length-t.length,text:t}},kc=e=>{let t;for(;-1!==(t=e.data.lastIndexOf(Br));)e.deleteData(t,1)},Sc=(e,t)=>(Rc(e),t),Nc=(e,t)=>Vi.isTextPosition(t)?((e,t)=>xc(e)&&t.container()===e?((e,t)=>{const n=_c(e.data.substr(0,t.offset())),o=_c(e.data.substr(t.offset()));return(n.text+o.text).length>0?(kc(e),Vi(e,t.offset()-n.count)):t})(e,t):Sc(e,t))(e,t):((e,t)=>t.container()===e.parentNode?((e,t)=>{const n=t.container(),o=((e,t)=>{const n=j(e,t);return-1===n?I.none():I.some(n)})(ce(n.childNodes),e).map((e=>e<t.offset()?Vi(n,t.offset()-1):t)).getOr(t);return Rc(e),o})(e,t):Sc(e,t))(e,t),Rc=e=>{wc(e)&&Ur(e)&&(zr(e)?e.removeAttribute("data-mce-caret"):Ec(e)),xc(e)&&(kc(e),0===e.data.length&&Ec(e))},Ac=dr,Tc=mr,Oc=cr,Bc=(e,t,n)=>{const o=yi(t.getBoundingClientRect(),n);let r,s;if("BODY"===e.tagName){const t=e.ownerDocument.documentElement;r=e.scrollLeft||t.scrollLeft,s=e.scrollTop||t.scrollTop}else{const t=e.getBoundingClientRect();r=e.scrollLeft-t.left,s=e.scrollTop-t.top}o.left+=r,o.right+=r,o.top+=s,o.bottom+=s,o.width=1;let a=t.offsetWidth-t.clientWidth;return a>0&&(n&&(a*=-1),o.left+=a,o.right+=a),o},Pc=(e,t,n,o)=>{const r=Xa();let s,a;const i=Il(e),l=e.dom,d=()=>{(e=>{var t,n;const o=Uo(yn(e),"*[contentEditable=false],video,audio,embed,object");for(let e=0;e<o.length;e++){const r=o[e].dom;let s=r.previousSibling;if(qr(s)){const e=s.data;1===e.length?null===(t=s.parentNode)||void 0===t||t.removeChild(s):s.deleteData(e.length-1,1)}s=r.nextSibling,$r(s)&&(1===s.data.length?null===(n=s.parentNode)||void 0===n||n.removeChild(s):s.deleteData(0,1))}})(t),a&&(Rc(a),a=null),r.on((e=>{l.remove(e.caret),r.clear()})),s&&(clearInterval(s),s=void 0)};return{show:(e,c)=>{let u;if(d(),Oc(c))return null;if(!n(c))return a=((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br),r=e.parentNode;if(t){const t=e.previousSibling;if(Mr(t)){if(Ur(t))return t;if(qr(t))return t.splitText(t.data.length-1)}null==r||r.insertBefore(o,e)}else{const t=e.nextSibling;if(Mr(t)){if(Ur(t))return t;if($r(t))return t.splitText(1),t}e.nextSibling?null==r||r.insertBefore(o,e.nextSibling):null==r||r.appendChild(o)}return o})(c,e),u=c.ownerDocument.createRange(),Lc(a.nextSibling)?(u.setStart(a,0),u.setEnd(a,0)):(u.setStart(a,1),u.setEnd(a,1)),u;{const n=((e,t,n)=>{var o;const r=(null!==(o=t.ownerDocument)&&void 0!==o?o:document).createElement(e);r.setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(Tr().dom);const s=t.parentNode;return n?null==s||s.insertBefore(r,t):t.nextSibling?null==s||s.insertBefore(r,t.nextSibling):null==s||s.appendChild(r),r})(i,c,e),d=Bc(t,c,e);l.setStyle(n,"top",d.top),a=n;const m=l.create("div",{class:"mce-visual-caret","data-mce-bogus":"all"});l.setStyles(m,{...d}),l.add(t,m),r.set({caret:m,element:c,before:e}),e&&l.addClass(m,"mce-visual-caret-before"),s=setInterval((()=>{r.on((e=>{o()?l.toggleClass(e.caret,"mce-visual-caret-hidden"):l.addClass(e.caret,"mce-visual-caret-hidden")}))}),500),u=c.ownerDocument.createRange(),u.setStart(n,0),u.setEnd(n,0)}return u},hide:d,getCss:()=>".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}",reposition:()=>{r.on((e=>{const n=Bc(t,e.element,e.before);l.setStyles(e.caret,{...n})}))},destroy:()=>clearInterval(s)}},Dc=()=>At.browser.isFirefox(),Lc=e=>Ac(e)||Tc(e),Mc=e=>(Lc(e)||Qo(e)&&Dc())&&Tn(yn(e)).exists(oo),Ic=lr,Fc=dr,Uc=mr,zc=Yo("display","block table table-cell table-caption list-item"),jc=Ur,Hc=Ir,$c=qo,qc=er,Vc=ts,Wc=e=>e>0,Kc=e=>e<0,Yc=(e,t)=>{let n;for(;n=e(t);)if(!Hc(n))return n;return null},Gc=(e,t,n,o,r)=>{const s=new jo(e,o),a=Fc(e)||Hc(e);let i;if(Kc(t)){if(a&&(i=Yc(s.prev.bind(s),!0),n(i)))return i;for(;i=Yc(s.prev.bind(s),r);)if(n(i))return i}if(Wc(t)){if(a&&(i=Yc(s.next.bind(s),!0),n(i)))return i;for(;i=Yc(s.next.bind(s),r);)if(n(i))return i}return null},Xc=(e,t)=>{for(;e&&e!==t;){if(zc(e))return e;e=e.parentNode}return null},Qc=(e,t,n)=>Xc(e.container(),n)===Xc(t.container(),n),Jc=(e,t)=>{if(!t)return I.none();const n=t.container(),o=t.offset();return $c(n)?I.from(n.childNodes[o+e]):I.none()},Zc=(e,t)=>{var n;const o=(null!==(n=t.ownerDocument)&&void 0!==n?n:document).createRange();return e?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),o},eu=(e,t,n)=>Xc(t,e)===Xc(n,e),tu=(e,t,n)=>{const o=e?"previousSibling":"nextSibling";let r=n;for(;r&&r!==t;){let e=r[o];if(e&&jc(e)&&(e=e[o]),Fc(e)||Uc(e)){if(eu(t,e,r))return e;break}if(Vc(e))break;r=r.parentNode}return null},nu=T(Zc,!0),ou=T(Zc,!1),ru=(e,t,n)=>{let o;const r=T(tu,!0,t),s=T(tu,!1,t),a=n.startContainer,i=n.startOffset;if(Ir(a)){const e=qc(a)?a.parentNode:a,t=e.getAttribute("data-mce-caret");if("before"===t&&(o=e.nextSibling,Mc(o)))return nu(o);if("after"===t&&(o=e.previousSibling,Mc(o)))return ou(o)}if(!n.collapsed)return n;if(er(a)){if(jc(a)){if(1===e){if(o=s(a),o)return nu(o);if(o=r(a),o)return ou(o)}if(-1===e){if(o=r(a),o)return ou(o);if(o=s(a),o)return nu(o)}return n}if(qr(a)&&i>=a.data.length-1)return 1===e&&(o=s(a),o)?nu(o):n;if($r(a)&&i<=1)return-1===e&&(o=r(a),o)?ou(o):n;if(i===a.data.length)return o=s(a),o?nu(o):n;if(0===i)return o=r(a),o?ou(o):n}return n},su=(e,t)=>Jc(e?0:-1,t).filter(Fc),au=(e,t,n)=>{const o=ru(e,t,n);return-1===e?Vi.fromRangeStart(o):Vi.fromRangeEnd(o)},iu=e=>I.from(e.getNode()).map(yn),lu=(e,t)=>{let n=t;for(;n=e(n);)if(n.isVisible())return n;return n},du=(e,t)=>{const n=Qc(e,t);return!(n||!ar(e.getNode()))||n};var cu;!function(e){e[e.Backwards=-1]="Backwards",e[e.Forwards=1]="Forwards"}(cu||(cu={}));const uu=dr,mu=er,fu=qo,gu=ar,pu=ts,hu=e=>Jr(e)||(e=>!!ns(e)&&!X(ce(e.getElementsByTagName("*")),((e,t)=>e||Kr(t)),!1))(e),bu=os,vu=(e,t)=>e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null,yu=(e,t)=>{if(Wc(e)){if(pu(t.previousSibling)&&!mu(t.previousSibling))return Vi.before(t);if(mu(t))return Vi(t,0)}if(Kc(e)){if(pu(t.nextSibling)&&!mu(t.nextSibling))return Vi.after(t);if(mu(t))return Vi(t,t.data.length)}return Kc(e)?gu(t)?Vi.before(t):Vi.after(t):Vi.before(t)},Cu=(e,t,n)=>{let o,r,s,a;if(!fu(n)||!t)return null;if(t.isEqual(Vi.after(n))&&n.lastChild){if(a=Vi.after(n.lastChild),Kc(e)&&pu(n.lastChild)&&fu(n.lastChild))return gu(n.lastChild)?Vi.before(n.lastChild):a}else a=t;const i=a.container();let l=a.offset();if(mu(i)){if(Kc(e)&&l>0)return Vi(i,--l);if(Wc(e)&&l<i.length)return Vi(i,++l);o=i}else{if(Kc(e)&&l>0&&(r=vu(i,l-1),pu(r)))return!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,s.data.length):Vi.after(s):mu(r)?Vi(r,r.data.length):Vi.before(r);if(Wc(e)&&l<i.childNodes.length&&(r=vu(i,l),pu(r)))return gu(r)?((e,t)=>{const n=t.nextSibling;return n&&pu(n)?mu(n)?Vi(n,0):Vi.before(n):Cu(cu.Forwards,Vi.after(t),e)})(n,r):!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,0):Vi.before(s):mu(r)?Vi(r,0):Vi.after(r);o=r||a.getNode()}if(o&&(Wc(e)&&a.isAtEnd()||Kc(e)&&a.isAtStart())&&(o=Gc(o,e,M,n,!0),bu(o,n)))return yu(e,o);r=o?Gc(o,e,bu,n):o;const d=Pe(Y(((e,t)=>{const n=[];let o=e;for(;o&&o!==t;)n.push(o),o=o.parentNode;return n})(i,n),uu));return!d||r&&d.contains(r)?r?yu(e,r):null:(a=Wc(e)?Vi.after(d):Vi.before(d),a)},wu=e=>({next:t=>Cu(cu.Forwards,t,e),prev:t=>Cu(cu.Backwards,t,e)}),xu=e=>Vi.isTextPosition(e)?0===e.offset():ts(e.getNode()),Eu=e=>{if(Vi.isTextPosition(e)){const t=e.container();return e.offset()===t.data.length}return ts(e.getNode(!0))},_u=(e,t)=>!Vi.isTextPosition(e)&&!Vi.isTextPosition(t)&&e.getNode()===t.getNode(!0),ku=(e,t,n)=>{const o=wu(t);return I.from(e?o.next(n):o.prev(n))},Su=(e,t,n)=>ku(e,t,n).bind((o=>Qc(n,o,t)&&((e,t,n)=>{return e?!_u(t,n)&&(o=t,!(!Vi.isTextPosition(o)&&ar(o.getNode())))&&Eu(t)&&xu(n):!_u(n,t)&&xu(t)&&Eu(n);var o})(e,n,o)?ku(e,t,o):I.some(o))),Nu=(e,t,n,o)=>Su(e,t,n).bind((n=>o(n)?Nu(e,t,n,o):I.some(n))),Ru=(e,t)=>{const n=e?t.firstChild:t.lastChild;return er(n)?I.some(Vi(n,e?0:n.data.length)):n?ts(n)?I.some(e?Vi.before(n):ar(o=n)?Vi.before(o):Vi.after(o)):((e,t,n)=>{const o=e?Vi.before(n):Vi.after(n);return ku(e,t,o)})(e,t,n):I.none();var o},Au=T(ku,!0),Tu=T(ku,!1),Ou=T(Ru,!0),Bu=T(Ru,!1),Pu="_mce_caret",Du=e=>qo(e)&&e.id===Pu,Lu=(e,t)=>{let n=t;for(;n&&n!==e;){if(Du(n))return n;n=n.parentNode}return null},Mu=e=>Ee(e,"name"),Iu=e=>Pt.isArray(e.start),Fu=e=>!(!Mu(e)&&b(e.forward))||e.forward,Uu=(e,t)=>(qo(t)&&e.isBlock(t)&&!t.innerHTML&&(t.innerHTML='<br data-mce-bogus="1" />'),t),zu=(e,t)=>Bu(e).fold(L,(e=>(t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0))),ju=(e,t,n)=>!(!(e=>!e.hasChildNodes())(t)||!Lu(e,t)||(((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br);e.appendChild(o),t.setStart(o,0),t.setEnd(o,0)})(t,n),0)),Hu=(e,t,n,o)=>{const r=n[t?"start":"end"],s=e.getRoot();if(r){let e=s,n=r[0];for(let t=r.length-1;e&&t>=1;t--){const n=e.childNodes;if(ju(s,e,o))return!0;if(r[t]>n.length-1)return!!ju(s,e,o)||zu(e,o);e=n[r[t]]}er(e)&&(n=Math.min(r[0],e.data.length)),qo(e)&&(n=Math.min(r[0],e.childNodes.length)),t?o.setStart(e,n):o.setEnd(e,n)}return!0},$u=e=>er(e)&&e.data.length>0,qu=(e,t,n)=>{const o=e.get(n.id+"_"+t),r=null==o?void 0:o.parentNode,s=n.keep;if(o&&r){let a,i;if("start"===t?s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.nextSibling)?(a=o.nextSibling,i=0):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)+1):(a=r,i=e.nodeIndex(o)):s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)):(a=r,i=e.nodeIndex(o)),!s){const r=o.previousSibling,s=o.nextSibling;let l;for(Pt.each(Pt.grep(o.childNodes),(e=>{er(e)&&(e.data=e.data.replace(/\uFEFF/g,""))}));l=e.get(n.id+"_"+t);)e.remove(l,!0);if(er(s)&&er(r)&&!At.browser.isOpera()){const t=r.data.length;r.appendData(s.data),e.remove(s),a=r,i=t}}return I.some(Vi(a,i))}return I.none()},Vu=(e,t,n)=>((e,t,n=!1)=>2===t?dl(Dr,n,e):3===t?(e=>{const t=e.getRng();return{start:tl(e.dom.getRoot(),Vi.fromRangeStart(t)),end:tl(e.dom.getRoot(),Vi.fromRangeEnd(t)),forward:e.isForward()}})(e):t?(e=>({rng:e.getRng(),forward:e.isForward()}))(e):ul(e,!1))(e,t,n),Wu=(e,t)=>{((e,t)=>{const n=e.dom;if(t){if(Iu(t))return((e,t)=>{const n=e.createRng();return Hu(e,!0,t,n)&&Hu(e,!1,t,n)?I.some({range:n,forward:Fu(t)}):I.none()})(n,t);if((e=>m(e.start))(t))return((e,t)=>{const n=I.from(nl(e.getRoot(),t.start)),o=I.from(nl(e.getRoot(),t.end));return Mt(n,o,((n,o)=>{const r=e.createRng();return r.setStart(n.container(),n.offset()),r.setEnd(o.container(),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if((e=>Ee(e,"id"))(t))return((e,t)=>{const n=qu(e,"start",t),o=qu(e,"end",t);return Mt(n,o.or(n),((n,o)=>{const r=e.createRng();return r.setStart(Uu(e,n.container()),n.offset()),r.setEnd(Uu(e,o.container()),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if(Mu(t))return((e,t)=>I.from(e.select(t.name)[t.index]).map((t=>{const n=e.createRng();return n.selectNode(t),{range:n,forward:!0}})))(n,t);if((e=>Ee(e,"rng"))(t))return I.some({range:t.rng,forward:Fu(t)})}return I.none()})(e,t).each((({range:t,forward:n})=>{e.setRng(t,n)}))},Ku=e=>qo(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type"),Yu=(Gu=br,e=>Gu===e);var Gu;const Xu=e=>""!==e&&-1!==" \f\n\r\t\v".indexOf(e),Qu=e=>!Xu(e)&&!Yu(e)&&!vr(e),Ju=e=>{const t=[];if(e)for(let n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},Zu=(e,t)=>{const n=Uo(t,"td[data-mce-selected],th[data-mce-selected]");return n.length>0?n:(e=>Y((e=>te(e,(e=>{const t=_i(e);return t?[yn(t)]:[]})))(e),Rr))(e)},em=e=>Zu(Ju(e.selection.getSel()),yn(e.getBody())),tm=(e,t)=>eo(e,"table",t),nm=e=>Fn(e).fold(N([e]),(t=>[e].concat(nm(t)))),om=e=>Un(e).fold(N([e]),(t=>"br"===Ht(t)?Bn(t).map((t=>[e].concat(om(t)))).getOr([]):[e].concat(om(t)))),rm=(e,t)=>Mt((e=>{const t=e.startContainer,n=e.startOffset;return er(t)?0===n?I.some(yn(t)):I.none():I.from(t.childNodes[n]).map(yn)})(t),(e=>{const t=e.endContainer,n=e.endOffset;return er(t)?n===t.data.length?I.some(yn(t)):I.none():I.from(t.childNodes[n-1]).map(yn)})(t),((t,n)=>{const o=J(nm(e),T(_n,t)),r=J(om(e),T(_n,n));return o.isSome()&&r.isSome()})).getOr(!1),sm=(e,t,n,o)=>{const r=n,s=new jo(n,r),a=ye(e.schema.getMoveCaretBeforeOnEnterElements(),((e,t)=>!H(["td","th","table"],t.toLowerCase())));let i=n;do{if(er(i)&&0!==Pt.trim(i.data).length)return void(o?t.setStart(i,0):t.setEnd(i,i.data.length));if(a[i.nodeName])return void(o?t.setStartBefore(i):"BR"===i.nodeName?t.setEndBefore(i):t.setEndAfter(i))}while(i=o?s.next():s.prev());"BODY"===r.nodeName&&(o?t.setStart(r,0):t.setEnd(r,r.childNodes.length))},am=e=>{const t=e.selection.getSel();return C(t)&&t.rangeCount>0},im=(e,t)=>{const n=em(e);n.length>0?V(n,(n=>{const o=n.dom,r=e.dom.createRng();r.setStartBefore(o),r.setEndAfter(o),t(r,!0)})):t(e.selection.getRng(),!1)},lm=(e,t,n)=>{const o=ul(e,t);n(o),e.moveToBookmark(o)},dm=e=>x(null==e?void 0:e.nodeType),cm=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),um=(e,t,n)=>{const{selection:o,dom:r}=e,s=o.getNode(),a=dr(s);lm(o,!0,(()=>{t()})),a&&dr(s)&&r.isChildOf(s,e.getBody())?e.selection.select(s):n(o.getStart())&&mm(r,o)},mm=(e,t)=>{var n,o;const r=t.getRng(),{startContainer:s,startOffset:a}=r;if(!((e,t)=>{if(cm(t)&&!/^(TD|TH)$/.test(t.nodeName)){const n=e.getAttrib(t,"data-mce-selected"),o=parseInt(n,10);return!isNaN(o)&&o>0}return!1})(e,t.getNode())&&qo(s)){const i=s.childNodes,l=e.getRoot();let d;if(a<i.length){const t=i[a];d=new jo(t,null!==(n=e.getParent(t,e.isBlock))&&void 0!==n?n:l)}else{const t=i[i.length-1];d=new jo(t,null!==(o=e.getParent(t,e.isBlock))&&void 0!==o?o:l),d.next(!0)}for(let n=d.current();n;n=d.next()){if("false"===e.getContentEditable(n))return;if(er(n)&&!hm(n))return r.setStart(n,0),void t.setRng(r)}}},fm=(e,t,n)=>{if(e){const o=t?"nextSibling":"previousSibling";for(e=n?e:e[o];e;e=e[o])if(qo(e)||!hm(e))return e}},gm=(e,t)=>!!e.getTextBlockElements()[t.nodeName.toLowerCase()]||Ts(e,t),pm=(e,t,n)=>e.schema.isValidChild(t,n),hm=(e,t=!1)=>{if(C(e)&&er(e)){const n=t?e.data.replace(/ /g,"\xa0"):e.data;return ss(n)}return!1},bm=(e,t)=>{const n=e.dom;return cm(t)&&"false"===n.getContentEditable(t)&&((e,t)=>{const n="[data-mce-cef-wrappable]",o=Ed(e),r=Ge(o)?n:`${n},${o}`;return xn(yn(t),r)})(e,t)&&0===n.select('[contenteditable="true"]',t).length},vm=(e,t)=>w(e)?e(t):(C(t)&&(e=e.replace(/%(\w+)/g,((e,n)=>t[n]||e))),e),ym=(e,t)=>(t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()),Cm=(e,t)=>{if(y(e))return null;{let n=String(e);return"color"!==t&&"backgroundColor"!==t||(n=Ca(n)),"fontWeight"===t&&700===e&&(n="bold"),"fontFamily"===t&&(n=n.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),n}},wm=(e,t,n)=>{const o=e.getStyle(t,n);return Cm(o,n)},xm=(e,t)=>{let n;return e.getParent(t,(t=>!!qo(t)&&(n=e.getStyle(t,"text-decoration"),!!n&&"none"!==n))),n},Em=(e,t,n)=>e.getParents(t,n,e.getRoot()),_m=(e,t,n)=>{const o=e.formatter.get(t);return C(o)&&$(o,n)},km=e=>_e(e,"block"),Sm=e=>_e(e,"selector"),Nm=e=>_e(e,"inline"),Rm=e=>Sm(e)&&!1!==e.expand&&!Nm(e),Am=e=>(e=>{const t=[];let n=e;for(;n;){if(er(n)&&n.data!==Br||n.childNodes.length>1)return[];qo(n)&&t.push(n),n=n.firstChild}return t})(e).length>0,Tm=e=>Du(e.dom)&&Am(e.dom),Om=Ku,Bm=Em,Pm=hm,Dm=gm,Lm=(e,t)=>{let n=t;for(;n;){if(qo(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Mm=(e,t,n,o)=>{const r=t.data;if(e){for(let e=n;e>0;e--)if(o(r.charAt(e-1)))return e}else for(let e=n;e<r.length;e++)if(o(r.charAt(e)))return e;return-1},Im=(e,t,n)=>Mm(e,t,n,(e=>Yu(e)||Xu(e))),Fm=(e,t,n)=>Mm(e,t,n,Qu),Um=(e,t,n,o,r,s)=>{let a;const i=e.getParent(n,e.isBlock)||t,l=(t,n,o)=>{const s=hi(e),l=r?s.backwards:s.forwards;return I.from(l(t,n,((e,t)=>Om(e.parentNode)?-1:(a=e,o(r,e,t))),i))};return l(n,o,Im).bind((e=>s?l(e.container,e.offset+(r?-1:0),Fm):I.some(e))).orThunk((()=>a?I.some({container:a,offset:r?0:a.length}):I.none()))},zm=(e,t,n,o,r)=>{const s=o[r];er(o)&&Ge(o.data)&&s&&(o=s);const a=Bm(e,o);for(let o=0;o<a.length;o++)for(let r=0;r<t.length;r++){const s=t[r];if((!C(s.collapsed)||s.collapsed===n.collapsed)&&Sm(s)&&e.is(a[o],s.selector))return a[o]}return o},jm=(e,t,n,o)=>{var r;let s=n;const a=e.getRoot(),i=t[0];if(km(i)&&(s=i.wrapper?null:e.getParent(n,i.block,a)),!s){const t=null!==(r=e.getParent(n,"LI,TD,TH,SUMMARY"))&&void 0!==r?r:a;s=e.getParent(er(n)?n.parentNode:n,(t=>t!==a&&Dm(e.schema,t)),t)}if(s&&km(i)&&i.wrapper&&(s=Bm(e,s,"ul,ol").reverse()[0]||s),!s)for(s=n;s&&s[o]&&!e.isBlock(s[o])&&(s=s[o],!ym(s,"br")););return s||n},Hm=(e,t,n,o)=>{const r=n.parentNode;return!C(n[o])&&(!(r!==t&&!y(r)&&!e.isBlock(r))||Hm(e,t,r,o))},$m=(e,t,n,o,r)=>{let s=n;const a=r?"previousSibling":"nextSibling",i=e.getRoot();if(er(n)&&!Pm(n)&&(r?o>0:o<n.data.length))return n;for(;s;){if(!t[0].block_expand&&e.isBlock(s))return s;for(let t=s[a];t;t=t[a]){const n=er(t)&&!Hm(e,i,t,a);if(!Om(t)&&(!ar(l=t)||!l.getAttribute("data-mce-bogus")||l.nextSibling)&&!Pm(t,n))return s}if(s===i||s.parentNode===i){n=s;break}s=s.parentNode}var l;return n},qm=e=>Om(e.parentNode)||Om(e),Vm=(e,t,n,o=!1)=>{let{startContainer:r,startOffset:s,endContainer:a,endOffset:i}=t;const l=n[0];return qo(r)&&r.hasChildNodes()&&(r=ki(r,s),er(r)&&(s=0)),qo(a)&&a.hasChildNodes()&&(a=ki(a,t.collapsed?i:i-1),er(a)&&(i=a.data.length)),r=Lm(e,r),a=Lm(e,a),qm(r)&&(r=Om(r)?r:r.parentNode,r=t.collapsed?r.previousSibling||r:r.nextSibling||r,er(r)&&(s=t.collapsed?r.length:0)),qm(a)&&(a=Om(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,er(a)&&(i=t.collapsed?0:a.length)),t.collapsed&&(Um(e,e.getRoot(),r,s,!0,o).each((({container:e,offset:t})=>{r=e,s=t})),Um(e,e.getRoot(),a,i,!1,o).each((({container:e,offset:t})=>{a=e,i=t}))),(Nm(l)||l.block_expand)&&(Nm(l)&&er(r)&&0!==s||(r=$m(e,n,r,s,!0)),Nm(l)&&er(a)&&i!==a.data.length||(a=$m(e,n,a,i,!1))),Rm(l)&&(r=zm(e,n,t,r,"previousSibling"),a=zm(e,n,t,a,"nextSibling")),(km(l)||Sm(l))&&(r=jm(e,n,r,"previousSibling"),a=jm(e,n,a,"nextSibling"),km(l)&&(e.isBlock(r)||(r=$m(e,n,r,s,!0)),e.isBlock(a)||(a=$m(e,n,a,i,!1)))),qo(r)&&r.parentNode&&(s=e.nodeIndex(r),r=r.parentNode),qo(a)&&a.parentNode&&(i=e.nodeIndex(a)+1,a=a.parentNode),{startContainer:r,startOffset:s,endContainer:a,endOffset:i}},Wm=(e,t,n)=>{var o;const r=t.startOffset,s=ki(t.startContainer,r),a=t.endOffset,i=ki(t.endContainer,a-1),l=e=>{const t=e[0];er(t)&&t===s&&r>=t.data.length&&e.splice(0,1);const n=e[e.length-1];return 0===a&&e.length>0&&n===i&&er(n)&&e.splice(e.length-1,1),e},d=(e,t,n)=>{const o=[];for(;e&&e!==n;e=e[t])o.push(e);return o},c=(t,n)=>e.getParent(t,(e=>e.parentNode===n),n),u=(e,t,o)=>{const r=o?"nextSibling":"previousSibling";for(let s=e,a=s.parentNode;s&&s!==t;s=a){a=s.parentNode;const t=d(s===e?s:s[r],r);t.length&&(o||t.reverse(),n(l(t)))}};if(s===i)return n(l([s]));const m=null!==(o=e.findCommonAncestor(s,i))&&void 0!==o?o:e.getRoot();if(e.isChildOf(s,i))return u(s,m,!0);if(e.isChildOf(i,s))return u(i,m);const f=c(s,m)||s,g=c(i,m)||i;u(s,f,!0);const p=d(f===s?f:f.nextSibling,"nextSibling",g===i?g.nextSibling:g);p.length&&n(l(p)),u(i,g)},Km=['pre[class*=language-][contenteditable="false"]',"figure.image","div[data-ephox-embed-iri]","div.tiny-pageembed","div.mce-toc","div[data-mce-toc]"],Ym=(e,t,n,o,r,s)=>{const{uid:a=t,...i}=n;un(e,Za()),Jt(e,`${ti()}`,a),Jt(e,`${ei()}`,o);const{attributes:l={},classes:d=[]}=r(a,i);if(Zt(e,l),((e,t)=>{V(t,(t=>{un(e,t)}))})(e,d),s){d.length>0&&Jt(e,`${oi()}`,d.join(","));const t=me(l);t.length>0&&Jt(e,`${ri()}`,t.join(","))}},Gm=(e,t,n,o,r)=>{const s=bn("span",e);return Ym(s,t,n,o,r,!1),s},Xm=(e,t,n,o,r,s)=>{const a=[],i=Gm(e.getDoc(),n,s,o,r),l=Xa(),d=()=>{l.clear()},c=e=>{V(e,u)},u=t=>{switch(((e,t,n,o)=>An(t).fold((()=>"skipping"),(r=>"br"===o||(e=>Kt(e)&&Cr(e)===Br)(t)?"valid":(e=>Wt(e)&&gn(e,Za()))(t)?"existing":Du(t.dom)?"caret":$(Km,(e=>xn(t,e)))?"valid-block":pm(e,n,o)&&pm(e,Ht(r),n)?"valid":"invalid-child")))(e,t,"span",Ht(t))){case"invalid-child":{d();const e=Mn(t);c(e),d();break}case"valid-block":d(),Ym(t,n,s,o,r,!0);break;case"valid":{const e=l.get().getOrThunk((()=>{const e=fi(i);return a.push(e),l.set(e),e}));yo(t,e);break}}};return Wm(e.dom,t,(e=>{d(),(e=>{const t=q(e,yn);c(t)})(e)})),a},Qm=e=>{const t=(()=>{const e={};return{register:(t,n)=>{e[t]={name:t,settings:n}},lookup:t=>xe(e,t).map((e=>e.settings)),getNames:()=>me(e)}})();((e,t)=>{const n=ei(),o=e=>I.from(e.attr(n)).bind(t.lookup),r=e=>{var t,n;e.attr(ti(),null),e.attr(ei(),null),e.attr(ni(),null);const o=I.from(e.attr(ri())).map((e=>e.split(","))).getOr([]),r=I.from(e.attr(oi())).map((e=>e.split(","))).getOr([]);V(o,(t=>e.attr(t,null)));const s=null!==(n=null===(t=e.attr("class"))||void 0===t?void 0:t.split(" "))&&void 0!==n?n:[],a=re(s,[Za()].concat(r));e.attr("class",a.length>0?a.join(" "):null),e.attr(oi(),null),e.attr(ri(),null)};e.serializer.addTempAttr(ni()),e.serializer.addAttributeFilter(n,(e=>{for(const t of e)o(t).each((e=>{!1===e.persistent&&("span"===t.name?t.unwrap():r(t))}))}))})(e,t);const n=((e,t)=>{const n=$a({}),o=()=>({listeners:[],previous:Xa()}),r=(e,t)=>{s(e,(e=>(t(e),e)))},s=(e,t)=>{const r=n.get(),s=t(xe(r,e).getOrThunk(o));r[e]=s,n.set(r)},a=(t,n)=>{V(li(e,t),(e=>{n?Jt(e,ni(),"true"):on(e,ni())}))},i=Ja((()=>{const n=ae(t.getNames());V(n,(t=>{s(t,(n=>{const o=n.previous.get();return ai(e,I.some(t)).fold((()=>{o.each((e=>{(e=>{r(e,(t=>{V(t.listeners,(t=>t(!1,e)))}))})(t),n.previous.clear(),a(e,!1)}))}),(({uid:e,name:t,elements:s})=>{Dt(o,e)||(o.each((e=>a(e,!1))),((e,t,n)=>{r(e,(o=>{V(o.listeners,(o=>o(!0,e,{uid:t,nodes:q(n,(e=>e.dom))})))}))})(t,e,s),n.previous.set(e),a(e,!0))})),{previous:n.previous,listeners:n.listeners}}))}))}),30);return e.on("remove",(()=>{i.cancel()})),e.on("NodeChange",(()=>{i.throttle()})),{addListener:(e,t)=>{s(e,(e=>({previous:e.previous,listeners:e.listeners.concat([t])})))}}})(e,t),o=Xt("span"),r=e=>{V(e,(e=>{o(e)?Eo(e):(e=>{fn(e,Za()),on(e,`${ti()}`),on(e,`${ei()}`),on(e,`${ni()}`);const t=tn(e,`${ri()}`).map((e=>e.split(","))).getOr([]),n=tn(e,`${oi()}`).map((e=>e.split(","))).getOr([]);var o;V(t,(t=>on(e,t))),o=e,V(n,(e=>{fn(o,e)})),on(e,`${oi()}`),on(e,`${ri()}`)})(e)}))};return{register:(e,n)=>{t.register(e,n)},annotate:(n,o)=>{t.lookup(n).each((t=>{((e,t,n,o)=>{e.undoManager.transact((()=>{const r=e.selection,s=r.getRng(),a=em(e).length>0,i=ui("mce-annotation");if(s.collapsed&&!a&&((e,t)=>{const n=Vm(e.dom,t,[{inline:"span"}]);t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)})(e,s),r.getRng().collapsed&&!a){const s=Gm(e.getDoc(),i,o,t,n.decorate);So(s,br),r.getRng().insertNode(s.dom),r.select(s.dom)}else lm(r,!1,(()=>{im(e,(r=>{Xm(e,r,i,t,n.decorate,o)}))}))}))})(e,n,t,o)}))},annotationChanged:(e,t)=>{n.addListener(e,t)},remove:t=>{ai(e,I.some(t)).each((({elements:t})=>{const n=e.selection.getBookmark();r(t),e.selection.moveToBookmark(n)}))},removeAll:t=>{const n=e.selection.getBookmark();ge(di(e,t),((e,t)=>{r(e)})),e.selection.moveToBookmark(n)},getAll:t=>{const n=di(e,t);return pe(n,(e=>q(e,(e=>e.dom))))}}},Jm=e=>({getBookmark:T(Vu,e),moveToBookmark:T(Wu,e)});Jm.isBookmarkNode=Ku;const Zm=(e,t,n)=>!n.collapsed&&$(n.getClientRects(),(n=>((e,t,n)=>t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom)(n,e,t))),ef=(e,t,n)=>{e.dispatch(t,n)},tf=(e,t,n,o)=>{e.dispatch("FormatApply",{format:t,node:n,vars:o})},nf=(e,t,n,o)=>{e.dispatch("FormatRemove",{format:t,node:n,vars:o})},of=(e,t)=>e.dispatch("SetContent",t),rf=(e,t)=>e.dispatch("GetContent",t),sf=(e,t)=>e.dispatch("PastePlainTextToggle",{state:t}),af={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,modifierPressed:e=>e.shiftKey||e.ctrlKey||e.altKey||af.metaKeyPressed(e),metaKeyPressed:e=>At.os.isMacOS()||At.os.isiOS()?e.metaKey:e.ctrlKey&&!e.altKey},lf="data-mce-selected",df=Math.abs,cf=Math.round,uf={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},mf=(e,t)=>{const n=t.dom,o=t.getDoc(),r=document,s=t.getBody();let a,i,l,d,c,u,m,f,g,p,h,b,v,y,w;const x=e=>C(e)&&(ir(e)||n.is(e,"figure.image")),E=e=>mr(e)||n.hasClass(e,"mce-preview-object"),_=e=>{const n=e.target;((e,t)=>{if((e=>"longpress"===e.type||0===e.type.indexOf("touch"))(e)){const n=e.touches[0];return x(e.target)&&!Zm(n.clientX,n.clientY,t)}return x(e.target)&&!Zm(e.clientX,e.clientY,t)})(e,t.selection.getRng())&&!e.isDefaultPrevented()&&t.selection.select(n)},k=e=>n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?[e,e.firstElementChild]:n.is(e,"figure.image")?[e.querySelector("img")]:[e],S=e=>{const o=cd(t);return!!o&&"false"!==e.getAttribute("data-mce-resize")&&e!==t.getBody()&&(n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?xn(yn(e.firstElementChild),o):xn(yn(e),o))},N=(e,o,r)=>{if(C(r)){const s=k(e);V(s,(e=>{e.style[o]||!t.schema.isValid(e.nodeName.toLowerCase(),o)?n.setStyle(e,o,r):n.setAttrib(e,o,""+r)}))}},R=(e,t,n)=>{N(e,"width",t),N(e,"height",n)},A=e=>{let o,r,c,C,_;o=e.screenX-u,r=e.screenY-m,b=o*d[2]+f,v=r*d[3]+g,b=b<5?5:b,v=v<5?5:v,c=(x(a)||E(a))&&!1!==ud(t)?!af.modifierPressed(e):af.modifierPressed(e),c&&(df(o)>df(r)?(v=cf(b*p),b=cf(v/p)):(b=cf(v/p),v=cf(b*p))),R(i,b,v),C=d.startPos.x+o,_=d.startPos.y+r,C=C>0?C:0,_=_>0?_:0,n.setStyles(l,{left:C,top:_,display:"block"}),l.innerHTML=b+" &times; "+v,d[2]<0&&i.clientWidth<=b&&n.setStyle(i,"left",void 0+(f-b)),d[3]<0&&i.clientHeight<=v&&n.setStyle(i,"top",void 0+(g-v)),o=s.scrollWidth-y,r=s.scrollHeight-w,o+r!==0&&n.setStyles(l,{left:C-o,top:_-r}),h||(((e,t,n,o,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:n,height:o,origin:r})})(t,a,f,g,"corner-"+d.name),h=!0)},T=()=>{const e=h;h=!1,e&&(N(a,"width",b),N(a,"height",v)),n.unbind(o,"mousemove",A),n.unbind(o,"mouseup",T),r!==o&&(n.unbind(r,"mousemove",A),n.unbind(r,"mouseup",T)),n.remove(i),n.remove(l),n.remove(c),O(a),e&&(((e,t,n,o,r)=>{e.dispatch("ObjectResized",{target:t,width:n,height:o,origin:r})})(t,a,b,v,"corner-"+d.name),n.setAttrib(a,"style",n.getAttrib(a,"style"))),t.nodeChanged()},O=e=>{M();const h=n.getPos(e,s),C=h.x,x=h.y,_=e.getBoundingClientRect(),N=_.width||_.right-_.left,O=_.height||_.bottom-_.top;a!==e&&(P(),a=e,b=v=0);const B=t.dispatch("ObjectSelected",{target:e});S(e)&&!B.isDefaultPrevented()?ge(uf,((e,t)=>{let h=n.get("mceResizeHandle"+t);h&&n.remove(h),h=n.add(s,"div",{id:"mceResizeHandle"+t,"data-mce-bogus":"all",class:"mce-resizehandle",unselectable:!0,style:"cursor:"+t+"-resize; margin:0; padding:0"}),n.bind(h,"mousedown",(h=>{h.stopImmediatePropagation(),h.preventDefault(),(h=>{const b=k(a)[0];var v;u=h.screenX,m=h.screenY,f=b.clientWidth,g=b.clientHeight,p=g/f,d=e,d.name=t,d.startPos={x:N*e[0]+C,y:O*e[1]+x},y=s.scrollWidth,w=s.scrollHeight,c=n.add(s,"div",{class:"mce-resize-backdrop","data-mce-bogus":"all"}),n.setStyles(c,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),i=E(v=a)?n.create("img",{src:At.transparentSrc}):v.cloneNode(!0),n.addClass(i,"mce-clonedresizable"),n.setAttrib(i,"data-mce-bogus","all"),i.contentEditable="false",n.setStyles(i,{left:C,top:x,margin:0}),R(i,N,O),i.removeAttribute(lf),s.appendChild(i),n.bind(o,"mousemove",A),n.bind(o,"mouseup",T),r!==o&&(n.bind(r,"mousemove",A),n.bind(r,"mouseup",T)),l=n.add(s,"div",{class:"mce-resize-helper","data-mce-bogus":"all"},f+" &times; "+g)})(h)})),e.elm=h,n.setStyles(h,{left:N*e[0]+C-h.offsetWidth/2,top:O*e[1]+x-h.offsetHeight/2})})):P(!1)},B=Qa(O,0),P=(e=!0)=>{B.cancel(),M(),a&&e&&a.removeAttribute(lf),ge(uf,((e,t)=>{const o=n.get("mceResizeHandle"+t);o&&(n.unbind(o),n.remove(o))}))},D=(e,t)=>n.isChildOf(e,t),L=o=>{if(h||t.removed||t.composing)return;const r="mousedown"===o.type?o.target:e.getNode(),a=no(yn(r),"table,img,figure.image,hr,video,span.mce-preview-object,details").map((e=>e.dom)).filter((e=>n.isEditable(e.parentElement)||"IMG"===e.nodeName&&n.isEditable(e))).getOrUndefined(),i=C(a)?n.getAttrib(a,lf,"1"):"1";if(V(n.select(`img[${lf}],hr[${lf}]`),(e=>{e.removeAttribute(lf)})),C(a)&&D(a,s)&&t.hasFocus()){I();const t=e.getStart(!0);if(D(t,a)&&D(e.getEnd(!0),a))return n.setAttrib(a,lf,i),void B.throttle(a)}P()},M=()=>{ge(uf,(e=>{e.elm&&(n.unbind(e.elm),delete e.elm)}))},I=()=>{try{t.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}};return t.on("init",(()=>{I(),t.on("NodeChange ResizeEditor ResizeWindow ResizeContent drop",L),t.on("keyup compositionend",(e=>{a&&"TABLE"===a.nodeName&&L(e)})),t.on("hide blur",P),t.on("contextmenu longpress",_,!0)})),t.on("remove",M),{isResizable:S,showResizeRect:O,hideResizeRect:P,updateResizeRect:L,destroy:()=>{B.cancel(),a=i=c=null}}},ff=(e,t,n)=>{const o=e.document.createRange();var r;return r=o,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,n)=>{e.setEnd(t.dom,n)}),(t=>{e.setEndAfter(t.dom)}))})(o,n),o},gf=(e,t,n,o,r)=>{const s=e.document.createRange();return s.setStart(t.dom,n),s.setEnd(o.dom,r),s},pf=hl([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),hf=(e,t,n)=>t(yn(n.startContainer),n.startOffset,yn(n.endContainer),n.endOffset);pf.ltr,pf.rtl;const bf=(e,t,n,o)=>({start:e,soffset:t,finish:n,foffset:o}),vf=document.caretPositionFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(o,t,n)).bind((t=>{if(null===t.offsetNode)return I.none();const n=e.dom.createRange();return n.setStart(t.offsetNode,t.offset),n.collapse(),I.some(n)}))}:document.caretRangeFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(o,t,n))}:I.none,yf=hl([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Cf={before:yf.before,on:yf.on,after:yf.after,cata:(e,t,n,o)=>e.fold(t,n,o),getStart:e=>e.fold(R,R,R)},wf=hl([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),xf={domRange:wf.domRange,relative:wf.relative,exact:wf.exact,exactFromRange:e=>wf.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>yn(e.startContainer),relative:(e,t)=>Cf.getStart(e),exact:(e,t,n,o)=>e}))(e);return Rn(t)},range:bf},Ef=(e,t)=>{const n=Ht(e);return"input"===n?Cf.after(e):H(["br","img"],n)?0===t?Cf.before(e):Cf.after(e):Cf.on(e,t)},_f=(e,t)=>{const n=e.fold(Cf.before,Ef,Cf.after),o=t.fold(Cf.before,Ef,Cf.after);return xf.relative(n,o)},kf=(e,t,n,o)=>{const r=Ef(e,t),s=Ef(n,o);return xf.relative(r,s)},Sf=(e,t)=>{const n=(t||document).createDocumentFragment();return V(e,(e=>{n.appendChild(e.dom)})),yn(n)},Nf=e=>{const t=xf.getWin(e).dom,n=(e,n,o,r)=>gf(t,e,n,o,r),o=(e=>e.match({domRange:e=>{const t=yn(e.startContainer),n=yn(e.endContainer);return kf(t,e.startOffset,n,e.endOffset)},relative:_f,exact:kf}))(e);return((e,t)=>{const n=((e,t)=>t.match({domRange:e=>({ltr:N(e),rtl:I.none}),relative:(t,n)=>({ltr:De((()=>ff(e,t,n))),rtl:De((()=>I.some(ff(e,n,t))))}),exact:(t,n,o,r)=>({ltr:De((()=>gf(e,t,n,o,r))),rtl:De((()=>I.some(gf(e,o,r,t,n))))})}))(e,t);return((e,t)=>{const n=t.ltr();return n.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>pf.rtl(yn(e.endContainer),e.endOffset,yn(e.startContainer),e.startOffset))).getOrThunk((()=>hf(0,pf.ltr,n))):hf(0,pf.ltr,n)})(0,n)})(t,o).match({ltr:n,rtl:n})},Rf=(e,t,n)=>((e,t,n)=>((e,t,n)=>{const o=yn(e.document);return vf(o,t,n).map((e=>bf(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset)))})(e,t,n))(Rn(yn(n)).dom,e,t).map((e=>{const t=n.createRange();return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),t})).getOrUndefined(),Af=(e,t)=>C(e)&&C(t)&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset,Tf=(e,t,n)=>null!==((e,t,n)=>{let o=e;for(;o&&o!==t;){if(n(o))return o;o=o.parentNode}return null})(e,t,n),Of=(e,t,n)=>Tf(e,t,(e=>e.nodeName===n)),Bf=(e,t)=>Ur(e)&&!Tf(e,t,Du),Pf=(e,t,n)=>{const o=t.parentNode;if(o){const r=new jo(t,e.getParent(o,e.isBlock)||e.getRoot());let s;for(;s=r[n?"prev":"next"]();)if(ar(s))return!0}return!1},Df=(e,t,n,o,r)=>{const s=e.getRoot(),a=e.schema.getNonEmptyElements(),i=r.parentNode;let l,d;if(!i)return I.none();const c=e.getParent(i,e.isBlock)||s;if(o&&ar(r)&&t&&e.isEmpty(c))return I.some(Vi(i,e.nodeIndex(r)));const u=new jo(r,c);for(;d=u[o?"prev":"next"]();){if("false"===e.getContentEditableParent(d)||Bf(d,s))return I.none();if(er(d)&&d.data.length>0)return Of(d,s,"A")?I.none():I.some(Vi(d,o?d.data.length:0));if(e.isBlock(d)||a[d.nodeName.toLowerCase()])return I.none();l=d}return or(l)?I.none():n&&l?I.some(Vi(l,0)):I.none()},Lf=(e,t,n,o)=>{const r=e.getRoot();let s,a=!1,i=n?o.startContainer:o.endContainer,l=n?o.startOffset:o.endOffset;const d=qo(i)&&l===i.childNodes.length,c=e.schema.getNonEmptyElements();let u=n;if(Ur(i))return I.none();if(qo(i)&&l>i.childNodes.length-1&&(u=!1),rr(i)&&(i=r,l=0),i===r){if(u&&(s=i.childNodes[l>0?l-1:0],s)){if(Ur(s))return I.none();if(c[s.nodeName]||Qo(s))return I.none()}if(i.hasChildNodes()){if(l=Math.min(!u&&l>0?l-1:l,i.childNodes.length-1),i=i.childNodes[l],l=er(i)&&d?i.data.length:0,!t&&i===r.lastChild&&Qo(i))return I.none();if(((e,t)=>{let n=t;for(;n&&n!==e;){if(dr(n))return!0;n=n.parentNode}return!1})(r,i)||Ur(i))return I.none();if(gr(i))return I.none();if(i.hasChildNodes()&&!Qo(i)){s=i;const t=new jo(i,r);do{if(dr(s)||Ur(s)){a=!1;break}if(er(s)&&s.data.length>0){l=u?0:s.data.length,i=s,a=!0;break}if(c[s.nodeName.toLowerCase()]&&!ur(s)){l=e.nodeIndex(s),i=s.parentNode,u||l++,a=!0;break}}while(s=u?t.next():t.prev())}}}return t&&(er(i)&&0===l&&Df(e,d,t,!0,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),qo(i)&&(s=i.childNodes[l],s||(s=i.childNodes[l-1]),!s||!ar(s)||((e,t)=>{var n;return"A"===(null===(n=e.previousSibling)||void 0===n?void 0:n.nodeName)})(s)||Pf(e,s,!1)||Pf(e,s,!0)||Df(e,d,t,!0,s).each((e=>{i=e.container(),l=e.offset(),a=!0})))),u&&!t&&er(i)&&l===i.data.length&&Df(e,d,t,!1,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),a&&i?I.some(Vi(i,l)):I.none()},Mf=(e,t)=>{const n=t.collapsed,o=t.cloneRange(),r=Vi.fromRangeStart(t);return Lf(e,n,!0,o).each((e=>{n&&Vi.isAbove(r,e)||o.setStart(e.container(),e.offset())})),n||Lf(e,n,!1,o).each((e=>{o.setEnd(e.container(),e.offset())})),n&&o.collapse(!0),Af(t,o)?I.none():I.some(o)},If=(e,t)=>e.splitText(t),Ff=e=>{let t=e.startContainer,n=e.startOffset,o=e.endContainer,r=e.endOffset;if(t===o&&er(t)){if(n>0&&n<t.data.length)if(o=If(t,n),t=o.previousSibling,r>n){r-=n;const e=If(o,r).previousSibling;t=o=e,r=e.data.length,n=0}else r=0}else if(er(t)&&n>0&&n<t.data.length&&(t=If(t,n),n=0),er(o)&&r>0&&r<o.data.length){const e=If(o,r).previousSibling;o=e,r=e.data.length}return{startContainer:t,startOffset:n,endContainer:o,endOffset:r}},Uf=e=>({walk:(t,n)=>Wm(e,t,n),split:Ff,expand:(t,n={type:"word"})=>{if("word"===n.type){const n=Vm(e,t,[{inline:"span"}]),o=e.createRng();return o.setStart(n.startContainer,n.startOffset),o.setEnd(n.endContainer,n.endOffset),o}return t},normalize:t=>Mf(e,t).fold(L,(e=>(t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0)))});Uf.compareRanges=Af,Uf.getCaretRangeFromPoint=Rf,Uf.getSelectedNode=_i,Uf.getNode=ki;const zf=((e,t)=>{const n=t=>{const n=(e=>{const t=e.dom;return Gn(e)?t.getBoundingClientRect().height:t.offsetHeight})(t);if(n<=0||null===n){const n=co(t,e);return parseFloat(n)||0}return n},o=(e,t)=>X(t,((t,n)=>{const o=co(e,n),r=void 0===o?0:parseInt(o,10);return isNaN(r)?t:t+r}),0);return{set:(t,n)=>{if(!x(n)&&!n.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+n);const o=t.dom;so(o)&&(o.style[e]=n+"px")},get:n,getOuter:n,aggregate:o,max:(e,t,n)=>{const r=o(e,n);return t>r?t-r:0}}})("height"),jf=()=>yn(document),Hf=(e,t)=>e.view(t).fold(N([]),(t=>{const n=e.owner(t),o=Hf(e,n);return[t].concat(o)}));var $f=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?I.none():I.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(yn)},owner:e=>Nn(e)});const qf=e=>"textarea"===Ht(e),Vf=(e,t)=>{const n=(e=>{const t=e.dom.ownerDocument,n=t.body,o=t.defaultView,r=t.documentElement;if(n===e.dom)return To(n.offsetLeft,n.offsetTop);const s=Oo(null==o?void 0:o.pageYOffset,r.scrollTop),a=Oo(null==o?void 0:o.pageXOffset,r.scrollLeft),i=Oo(r.clientTop,n.clientTop),l=Oo(r.clientLeft,n.clientLeft);return Bo(e).translate(a-l,s-i)})(e),o=(e=>zf.get(e))(e);return{element:e,bottom:n.top+o,height:o,pos:n,cleanup:t}},Wf=(e,t,n,o)=>{Xf(e,((r,s)=>Yf(e,t,n,o)),n)},Kf=(e,t,n,o,r)=>{const s={elm:o.element.dom,alignToTop:r};((e,t)=>e.dispatch("ScrollIntoView",t).isDefaultPrevented())(e,s)||(n(e,t,Po(t).top,o,r),((e,t)=>{e.dispatch("AfterScrollIntoView",t)})(e,s))},Yf=(e,t,n,o)=>{const r=yn(e.getBody()),s=yn(e.getDoc());r.dom.offsetWidth;const a=((e,t)=>{const n=((e,t)=>{const n=Mn(e);if(0===n.length||qf(e))return{element:e,offset:t};if(t<n.length&&!qf(n[t]))return{element:n[t],offset:0};{const o=n[n.length-1];return qf(o)?{element:e,offset:t}:"img"===Ht(o)?{element:o,offset:1}:Kt(o)?{element:o,offset:Cr(o).length}:{element:o,offset:Mn(o).length}}})(e,t),o=hn('<span data-mce-bogus="all" style="display: inline-block;">\ufeff</span>');return po(n.element,o),Vf(o,(()=>xo(o)))})(yn(n.startContainer),n.startOffset);Kf(e,s,t,a,o),a.cleanup()},Gf=(e,t,n,o)=>{const r=yn(e.getDoc());Kf(e,r,n,(e=>Vf(yn(e),_))(t),o)},Xf=(e,t,n)=>{const o=n.startContainer,r=n.startOffset,s=n.endContainer,a=n.endOffset;t(yn(o),yn(s));const i=e.dom.createRng();i.setStart(o,r),i.setEnd(s,a),e.selection.setRng(n)},Qf=(e,t,n,o,r)=>{const s=t.pos;if(o)Do(s.left,s.top,r);else{const o=s.top-n+t.height;Do(-e.getBody().getBoundingClientRect().left,o,r)}},Jf=(e,t,n,o,r,s)=>{const a=o+n,i=r.pos.top,l=r.bottom,d=l-i>=o;i<n?Qf(e,r,o,!1!==s,t):i>a?Qf(e,r,o,d?!1!==s:!0===s,t):l>a&&!d&&Qf(e,r,o,!0===s,t)},Zf=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r)},eg=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r);const a=(e=>{const t=jf(),n=Po(t),o=((e,t)=>{const n=t.owner(e);return Hf(t,n)})(e,$f),r=Bo(e),s=G(o,((e,t)=>{const n=Bo(t);return{left:e.left+n.left,top:e.top+n.top}}),{left:0,top:0});return To(s.left+r.left+n.left,s.top+r.top+n.top)})(o.element),i=Io(window);a.top<i.y?Lo(o.element,!1!==r):a.top>i.bottom&&Lo(o.element,!0===r)},tg=(e,t,n)=>Wf(e,Zf,t,n),ng=(e,t,n)=>Gf(e,t,Zf,n),og=(e,t,n)=>Wf(e,eg,t,n),rg=(e,t,n)=>Gf(e,t,eg,n),sg=(e,t,n)=>{(e.inline?tg:og)(e,t,n)},ag=(e,t=!1)=>e.dom.focus({preventScroll:t}),ig=e=>{const t=qn(e).dom;return e.dom===t.activeElement},lg=(e=jf())=>I.from(e.dom.activeElement).map(yn),dg=(e,t)=>{const n=Kt(t)?Cr(t).length:Mn(t).length+1;return e>n?n:e<0?0:e},cg=e=>xf.range(e.start,dg(e.soffset,e.start),e.finish,dg(e.foffset,e.finish)),ug=(e,t)=>!$o(t.dom)&&(kn(e,t)||_n(e,t)),mg=e=>t=>ug(e,t.start)&&ug(e,t.finish),fg=e=>xf.range(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset),gg=e=>{const t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),I.some(t)}catch(e){return I.none()}},pg=e=>{const t=(e=>e.inline||At.browser.isFirefox())(e)?(n=yn(e.getBody()),(e=>{const t=e.getSelection();return(t&&0!==t.rangeCount?I.from(t.getRangeAt(0)):I.none()).map(fg)})(Rn(n).dom).filter(mg(n))):I.none();var n;e.bookmark=t.isSome()?t:e.bookmark},hg=e=>(e.bookmark?e.bookmark:I.none()).bind((t=>{return n=yn(e.getBody()),o=t,I.from(o).filter(mg(n)).map(cg);var n,o})).bind(gg),bg={isEditorUIElement:e=>{const t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},vg={setEditorTimeout:(e,t,n)=>((e,t)=>(x(t)||(t=0),setTimeout(e,t)))((()=>{e.removed||t()}),n),setEditorInterval:(e,t,n)=>{const o=((e,t)=>(x(t)||(t=0),setInterval(e,t)))((()=>{e.removed?clearInterval(o):t()}),n);return o}};let yg;const Cg=za.DOM,wg=e=>{const t=e.classList;return void 0!==t&&(t.contains("tox-edit-area")||t.contains("tox-edit-area__iframe")||t.contains("mce-content-body"))},xg=(e,t)=>{const n=_d(e),o=Cg.getParent(t,(t=>(e=>qo(e)&&bg.isEditorUIElement(e))(t)||!!n&&e.dom.is(t,n)));return null!==o},Eg=e=>{try{const t=qn(yn(e.getElement()));return lg(t).fold((()=>document.body),(e=>e.dom))}catch(e){return document.body}},_g=(e,t)=>{const n=t.editor;(e=>{const t=Qa((()=>{pg(e)}),0);e.on("init",(()=>{e.inline&&((e,t)=>{const n=()=>{t.throttle()};za.DOM.bind(document,"mouseup",n),e.on("remove",(()=>{za.DOM.unbind(document,"mouseup",n)}))})(e,t),((e,t)=>{((e,t)=>{e.on("mouseup touchend",(e=>{t.throttle()}))})(e,t),e.on("keyup NodeChange AfterSetSelectionRange",(t=>{(e=>"nodechange"===e.type&&e.selectionChange)(t)||pg(e)}))})(e,t)})),e.on("remove",(()=>{t.cancel()}))})(n);const o=(e,t)=>{mc(e)&&!0!==e.inline&&t(yn(e.getContainer()),"tox-edit-focus")};n.on("focusin",(()=>{const t=e.focusedEditor;wg(Eg(n))&&o(n,un),t!==n&&(t&&t.dispatch("blur",{focusedEditor:n}),e.setActive(n),e.focusedEditor=n,n.dispatch("focus",{blurredEditor:t}),n.focus(!0))})),n.on("focusout",(()=>{vg.setEditorTimeout(n,(()=>{const t=e.focusedEditor;wg(Eg(n))&&t===n||o(n,fn),xg(n,Eg(n))||t!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null)}))})),yg||(yg=t=>{const n=e.activeEditor;n&&Kn(t).each((t=>{const o=t;o.ownerDocument===document&&(o===document.body||xg(n,o)||e.focusedEditor!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null))}))},Cg.bind(document,"focusin",yg))},kg=(e,t)=>{e.focusedEditor===t.editor&&(e.focusedEditor=null),!e.activeEditor&&yg&&(Cg.unbind(document,"focusin",yg),yg=null)},Sg=(e,t)=>{((e,t)=>(e=>e.collapsed?I.from(ki(e.startContainer,e.startOffset)).map(yn):I.none())(t).bind((t=>Nr(t)?I.some(t):kn(e,t)?I.none():I.some(e))))(yn(e.getBody()),t).bind((e=>Ou(e.dom))).fold((()=>{e.selection.normalize()}),(t=>e.selection.setRng(t.toRange())))},Ng=e=>{if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},Rg=e=>e.inline?(e=>{const t=e.getBody();return t&&(n=yn(t),ig(n)||(o=n,lg(qn(o)).filter((e=>o.dom.contains(e.dom)))).isSome());var n,o})(e):(e=>C(e.iframeElement)&&ig(yn(e.iframeElement)))(e),Ag=e=>Rg(e)||(e=>{const t=qn(yn(e.getElement()));return lg(t).filter((t=>!wg(t.dom)&&xg(e,t.dom))).isSome()})(e),Tg=e=>e.editorManager.setActive(e),Og=(e,t)=>t.collapsed?e.isEditable(t.startContainer):e.isEditable(t.startContainer)&&e.isEditable(t.endContainer),Bg=(e,t,n,o,r)=>{const s=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return I.from(s).map(yn).map((e=>o&&t.collapsed?e:In(e,r(e,a)).getOr(e))).bind((e=>Wt(e)?I.some(e):An(e).filter(Wt))).map((e=>e.dom)).getOr(e)},Pg=(e,t,n=!1)=>Bg(e,t,!0,n,((e,t)=>Math.min(zn(e),t))),Dg=(e,t,n=!1)=>Bg(e,t,!1,n,((e,t)=>t>0?t-1:t)),Lg=(e,t)=>{const n=e;for(;e&&er(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Mg=(e,t)=>q(t,(t=>{const n=e.dispatch("GetSelectionRange",{range:t});return n.range!==t?n.range:t})),Ig=["img","br"],Fg=e=>{const t=wr(e).filter((e=>0!==e.trim().length||e.indexOf(br)>-1)).isSome();return t||H(Ig,Ht(e))||(e=>Vt(e)&&"false"===en(e,"contenteditable"))(e)},Ug="[data-mce-autocompleter]",zg=(e,t)=>{if(jg(yn(e.getBody())).isNone()){const o=hn('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());vo(o,yn(t.extractContents())),t.insertNode(o.dom),An(o).each((e=>e.dom.normalize())),(n=o,((e,t)=>{const n=e=>{const o=Mn(e);for(let e=o.length-1;e>=0;e--){const r=o[e];if(t(r))return I.some(r);const s=n(r);if(s.isSome())return s}return I.none()};return n(e)})(n,Fg)).map((t=>{e.selection.setCursorLocation(t.dom,(e=>"img"===Ht(e)?1:wr(e).fold((()=>Mn(e).length),(e=>e.length)))(t))}))}var n},jg=e=>to(e,Ug),Hg={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},$g=(e,t,n)=>{const o=n?"lastChild":"firstChild",r=n?"prev":"next";if(e[o])return e[o];if(e!==t){let n=e[r];if(n)return n;for(let o=e.parent;o&&o!==t;o=o.parent)if(n=o[r],n)return n}},qg=e=>{var t;const n=null!==(t=e.value)&&void 0!==t?t:"";if(!ss(n))return!1;const o=e.parent;return!o||"span"===o.name&&!o.attr("style")||!/^[ ]+$/.test(n)},Vg=e=>{const t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t};class Wg{static create(e,t){const n=new Wg(e,Hg[e]||1);return t&&ge(t,((e,t)=>{n.attr(t,e)})),n}constructor(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}replace(e){const t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t}attr(e,t){const n=this;if(!m(e))return C(e)&&ge(e,((e,t)=>{n.attr(t,e)})),n;const o=n.attributes;if(o){if(void 0!==t){if(null===t){if(e in o.map){delete o.map[e];let t=o.length;for(;t--;)if(o[t].name===e)return o.splice(t,1),n}return n}if(e in o.map){let n=o.length;for(;n--;)if(o[n].name===e){o[n].value=t;break}}else o.push({name:e,value:t});return o.map[e]=t,n}return o.map[e]}}clone(){const e=this,t=new Wg(e.name,e.type),n=e.attributes;if(n){const e=[];e.map={};for(let t=0,o=n.length;t<o;t++){const o=n[t];"id"!==o.name&&(e[e.length]={name:o.name,value:o.value},e.map[o.name]=o.value)}t.attributes=e}return t.value=e.value,t}wrap(e){const t=this;return t.parent&&(t.parent.insert(e,t),e.append(t)),t}unwrap(){const e=this;for(let t=e.firstChild;t;){const n=t.next;e.insert(t,e,!0),t=n}e.remove()}remove(){const e=this,t=e.parent,n=e.next,o=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):o&&(o.next=n),t.lastChild===e?(t.lastChild=o,o&&(o.next=null)):n&&(n.prev=o),e.parent=e.next=e.prev=null),e}append(e){const t=this;e.parent&&e.remove();const n=t.lastChild;return n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e}insert(e,t,n){e.parent&&e.remove();const o=t.parent||this;return n?(t===o.firstChild?o.firstChild=e:t.prev&&(t.prev.next=e),e.prev=t.prev,e.next=t,t.prev=e):(t===o.lastChild?o.lastChild=e:t.next&&(t.next.prev=e),e.next=t.next,e.prev=t,t.next=e),e.parent=o,e}getAll(e){const t=this,n=[];for(let o=t.firstChild;o;o=$g(o,t))o.name===e&&n.push(o);return n}children(){const e=[];for(let t=this.firstChild;t;t=t.next)e.push(t);return e}empty(){const e=this;if(e.firstChild){const t=[];for(let n=e.firstChild;n;n=$g(n,e))t.push(n);let n=t.length;for(;n--;){const e=t[n];e.parent=e.firstChild=e.lastChild=e.next=e.prev=null}}return e.firstChild=e.lastChild=null,e}isEmpty(e,t={},n){var o;const r=this;let s=r.firstChild;if(Vg(r))return!1;if(s)do{if(1===s.type){if(s.attr("data-mce-bogus"))continue;if(e[s.name])return!1;if(Vg(s))return!1}if(8===s.type)return!1;if(3===s.type&&!qg(s))return!1;if(3===s.type&&s.parent&&t[s.parent.name]&&ss(null!==(o=s.value)&&void 0!==o?o:""))return!1;if(n&&n(s))return!1}while(s=$g(s,r));return!0}walk(e){return $g(this,null,e)}}const Kg=Pt.makeMap("NOSCRIPT STYLE SCRIPT XMP IFRAME NOEMBED NOFRAMES PLAINTEXT"," "),Yg=e=>m(e.nodeValue)&&e.nodeValue.includes(Br),Gg=e=>(0===e.length?"":`${q(e,(e=>`[${e}]`)).join(",")},`)+'[data-mce-bogus="all"]',Xg=e=>document.createTreeWalker(e,NodeFilter.SHOW_COMMENT,(e=>Yg(e)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP)),Qg=e=>document.createTreeWalker(e,NodeFilter.SHOW_TEXT,(e=>{if(Yg(e)){const t=e.parentNode;return t&&Ee(Kg,t.nodeName)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP}return NodeFilter.FILTER_SKIP})),Jg=e=>null!==Xg(e).nextNode(),Zg=e=>null!==Qg(e).nextNode(),ep=(e,t)=>null!==t.querySelector(Gg(e)),tp=(e,t)=>{V(((e,t)=>t.querySelectorAll(Gg(e)))(e,t),(t=>{const n=yn(t);"all"===en(n,"data-mce-bogus")?xo(n):V(e,(e=>{nn(n,e)&&on(n,e)}))}))},np=e=>{let t=e.nextNode();for(;null!==t;)t.nodeValue=null,t=e.nextNode()},op=k(np,Xg),rp=k(np,Qg),sp=(e,t)=>{const n=[{condition:T(ep,t),action:T(tp,t)},{condition:Jg,action:op},{condition:Zg,action:rp}];let o=e,r=!1;return V(n,(({condition:t,action:n})=>{t(o)&&(r||(o=e.cloneNode(!0),r=!0),n(o))})),o},ap=e=>{const t=Uo(e,"[data-mce-bogus]");V(t,(e=>{"all"===en(e,"data-mce-bogus")?xo(e):Er(e)?(po(e,vn(hr)),xo(e)):Eo(e)}))},ip=e=>{const t=Uo(e,"input");V(t,(e=>{on(e,"name")}))},lp=(e,t,n)=>{let o;return o="raw"===t.format?Pt.trim(Dr(sp(n,e.serializer.getTempAttrs()).innerHTML)):"text"===t.format?((e,t)=>{const n=e.getDoc(),o=qn(yn(e.getBody())),r=bn("div",n);Jt(r,"data-mce-bogus","all"),lo(r,{position:"fixed",left:"-9999999px",top:"0"}),So(r,t.innerHTML),ap(r),ip(r);const s=(e=>jn(e)?e:yn(Nn(e).dom.body))(o);vo(s,r);const a=Dr(r.dom.innerText);return xo(r),a})(e,n):"tree"===t.format?e.serializer.serialize(n,t):((e,t)=>{const n=Il(e),o=new RegExp(`^(<${n}[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/${n}>[\r\n]*|<br \\/>[\r\n]*)$`);return t.replace(o,"")})(e,e.serializer.serialize(n,t)),"text"!==t.format&&!Ar(yn(n))&&m(o)?Pt.trim(o):o},dp=Pt.makeMap,cp=e=>{const t=[],n=(e=e||{}).indent,o=dp(e.indent_before||""),r=dp(e.indent_after||""),s=ea.getEncodeFunc(e.entity_encoding||"raw",e.entities),a="xhtml"!==e.element_format;return{start:(e,i,l)=>{if(n&&o[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}if(t.push("<",e),i)for(let e=0,n=i.length;e<n;e++){const n=i[e];t.push(" ",n.name,'="',s(n.value,!0),'"')}if(t[t.length]=!l||a?">":" />",l&&n&&r[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}},end:e=>{let o;t.push("</",e,">"),n&&r[e]&&t.length>0&&(o=t[t.length-1],o.length>0&&"\n"!==o&&t.push("\n"))},text:(e,n)=>{e.length>0&&(t[t.length]=n?e:s(e))},cdata:e=>{t.push("<![CDATA[",e,"]]>")},comment:e=>{t.push("\x3c!--",e,"--\x3e")},pi:(e,o)=>{o?t.push("<?",e," ",s(o),"?>"):t.push("<?",e,"?>"),n&&t.push("\n")},doctype:e=>{t.push("<!DOCTYPE",e,">",n?"\n":"")},reset:()=>{t.length=0},getContent:()=>t.join("").replace(/\n$/,"")}},up=(e={},t=ua())=>{const n=cp(e);return e.validate=!("validate"in e)||e.validate,{serialize:o=>{const r=e.validate,s={3:e=>{var t;n.text(null!==(t=e.value)&&void 0!==t?t:"",e.raw)},8:e=>{var t;n.comment(null!==(t=e.value)&&void 0!==t?t:"")},7:e=>{n.pi(e.name,e.value)},10:e=>{var t;n.doctype(null!==(t=e.value)&&void 0!==t?t:"")},4:e=>{var t;n.cdata(null!==(t=e.value)&&void 0!==t?t:"")},11:e=>{let t=e;if(t=t.firstChild)do{a(t)}while(t=t.next)}};n.reset();const a=e=>{var o;const i=s[e.type];if(i)i(e);else{const s=e.name,i=s in t.getVoidElements();let l=e.attributes;if(r&&l&&l.length>1){const n=[];n.map={};const o=t.getElementRule(e.name);if(o){for(let e=0,t=o.attributesOrder.length;e<t;e++){const t=o.attributesOrder[e];if(t in l.map){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}for(let e=0,t=l.length;e<t;e++){const t=l[e].name;if(!(t in n.map)){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}l=n}}if(n.start(s,l,i),ps(s))m(e.value)&&n.text(e.value,!0),n.end(s);else if(!i){let t=e.firstChild;if(t){"pre"!==s&&"textarea"!==s||3!==t.type||"\n"!==(null===(o=t.value)||void 0===o?void 0:o[0])||n.text("\n",!0);do{a(t)}while(t=t.next)}n.end(s)}}};return 1!==o.type||e.inner?3===o.type?s[3](o):s[11](o):a(o),n.getContent()}}},mp=new Set;V(["margin","margin-left","margin-right","margin-top","margin-bottom","padding","padding-left","padding-right","padding-top","padding-bottom","border","border-width","border-style","border-color","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","float","position","left","right","top","bottom","z-index","display","transform","width","max-width","min-width","height","max-height","min-height","overflow","overflow-x","overflow-y","text-overflow","vertical-align","transition","transition-delay","transition-duration","transition-property","transition-timing-function"],(e=>{mp.add(e)}));const fp=["font","text-decoration","text-emphasis"],gp=(e,t)=>me(e.parseStyle(e.getAttrib(t,"style"))),pp=(e,t,n)=>{const o=gp(e,t),r=gp(e,n),s=o=>{var r,s;const a=null!==(r=e.getStyle(t,o))&&void 0!==r?r:"",i=null!==(s=e.getStyle(n,o))&&void 0!==s?s:"";return Ye(a)&&Ye(i)&&a!==i};return $(o,(e=>{const t=t=>$(t,(t=>t===e));if(!t(r)&&t(fp)){const e=Y(r,(e=>$(fp,(t=>He(e,t)))));return $(e,s)}return s(e)}))},hp=(e,t,n)=>I.from(n.container()).filter(er).exists((o=>{const r=e?0:-1;return t(o.data.charAt(n.offset()+r))})),bp=T(hp,!0,Xu),vp=T(hp,!1,Xu),yp=e=>{const t=e.container();return er(t)&&(0===t.data.length||Pr(t.data)&&Jm.isBookmarkNode(t.parentNode))},Cp=(e,t)=>n=>Jc(e?0:-1,n).filter(t).isSome(),wp=e=>ir(e)&&"block"===co(yn(e),"display"),xp=e=>dr(e)&&!(e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"))(e),Ep=Cp(!0,wp),_p=Cp(!1,wp),kp=Cp(!0,mr),Sp=Cp(!1,mr),Np=Cp(!0,Qo),Rp=Cp(!1,Qo),Ap=Cp(!0,xp),Tp=Cp(!1,xp),Op=(e,t)=>((e,t,n)=>kn(t,e)?On(e,(e=>n(e)||_n(e,t))).slice(0,-1):[])(e,t,L),Bp=(e,t)=>[e].concat(Op(e,t)),Pp=(e,t,n)=>Nu(e,t,n,yp),Dp=(e,t,n)=>J(Bp(yn(t.container()),e),(e=>t=>e.isBlock(Ht(t)))(n)),Lp=(e,t,n,o)=>Pp(e,t.dom,n).forall((e=>Dp(t,n,o).fold((()=>!Qc(e,n,t.dom)),(o=>!Qc(e,n,t.dom)&&kn(o,yn(e.container())))))),Mp=(e,t,n,o)=>Dp(t,n,o).fold((()=>Pp(e,t.dom,n).forall((e=>!Qc(e,n,t.dom)))),(t=>Pp(e,t.dom,n).isNone())),Ip=T(Mp,!1),Fp=T(Mp,!0),Up=T(Lp,!1),zp=T(Lp,!0),jp=e=>iu(e).exists(Er),Hp=(e,t,n,o)=>{const r=Y(Bp(yn(n.container()),t),(e=>o.isBlock(Ht(e)))),s=le(r).getOr(t);return ku(e,s.dom,n).filter(jp)},$p=(e,t,n)=>iu(t).exists(Er)||Hp(!0,e,t,n).isSome(),qp=(e,t,n)=>(e=>I.from(e.getNode(!0)).map(yn))(t).exists(Er)||Hp(!1,e,t,n).isSome(),Vp=T(Hp,!1),Wp=T(Hp,!0),Kp=e=>Vi.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd(),Yp=(e,t,n)=>{const o=Y(Bp(yn(t.container()),e),(e=>n.isBlock(Ht(e))));return le(o).getOr(e)},Gp=(e,t,n)=>Kp(t)?vp(t):vp(t)||Tu(Yp(e,t,n).dom,t).exists(vp),Xp=(e,t,n)=>Kp(t)?bp(t):bp(t)||Au(Yp(e,t,n).dom,t).exists(bp),Qp=e=>iu(e).bind((e=>Jn(e,Wt))).exists((e=>(e=>H(["pre","pre-wrap"],e))(co(e,"white-space")))),Jp=(e,t)=>n=>{return o=new jo(n,e)[t](),C(o)&&dr(o)&&zc(o);var o},Zp=(e,t,n)=>!Qp(t)&&(((e,t,n)=>((e,t)=>Tu(e.dom,t).isNone())(e,t)||((e,t)=>Au(e.dom,t).isNone())(e,t)||Ip(e,t,n)||Fp(e,t,n)||qp(e,t,n)||$p(e,t,n))(e,t,n)||Gp(e,t,n)||Xp(e,t,n)),eh=(e,t,n)=>!Qp(t)&&(Ip(e,t,n)||Up(e,t,n)||qp(e,t,n)||Gp(e,t,n)||((e,t)=>{const n=Tu(e.dom,t).getOr(t),o=Jp(e.dom,"prev");return t.isAtStart()&&(o(t.container())||o(n.container()))})(e,t)),th=(e,t,n)=>!Qp(t)&&(Fp(e,t,n)||zp(e,t,n)||$p(e,t,n)||Xp(e,t,n)||((e,t)=>{const n=Au(e.dom,t).getOr(t),o=Jp(e.dom,"next");return t.isAtEnd()&&(o(t.container())||o(n.container()))})(e,t)),nh=(e,t,n)=>eh(e,t,n)||th(e,(e=>{const t=e.container(),n=e.offset();return er(t)&&n<t.data.length?Vi(t,n+1):e})(t),n),oh=(e,t)=>Yu(e.charAt(t)),rh=(e,t)=>Xu(e.charAt(t)),sh=(e,t,n,o)=>{const r=t.data,s=Vi(t,0);return n||!oh(r,0)||nh(e,s,o)?!!(n&&rh(r,0)&&eh(e,s,o))&&(t.data=br+r.slice(1),!0):(t.data=" "+r.slice(1),!0)},ah=(e,t,n,o)=>{const r=t.data,s=Vi(t,r.length-1);return n||!oh(r,r.length-1)||nh(e,s,o)?!!(n&&rh(r,r.length-1)&&th(e,s,o))&&(t.data=r.slice(0,-1)+br,!0):(t.data=r.slice(0,-1)+" ",!0)},ih=(e,t,n)=>{const o=t.container();if(!er(o))return I.none();if((e=>{const t=e.container();return er(t)&&je(t.data,br)})(t)){const r=sh(e,o,!1,n)||(e=>{const t=e.data,n=(e=>{const t=e.split("");return q(t,((e,n)=>Yu(e)&&n>0&&n<t.length-1&&Qu(t[n-1])&&Qu(t[n+1])?" ":e)).join("")})(t);return n!==t&&(e.data=n,!0)})(o)||ah(e,o,!1,n);return It(r,t)}if(nh(e,t,n)){const r=sh(e,o,!0,n)||ah(e,o,!0,n);return It(r,t)}return I.none()},lh=(e,t,n,o)=>{if(0===n)return;const r=yn(e),s=Qn(r,(e=>o.isBlock(Ht(e)))).getOr(r),a=e.data.slice(t,t+n),i=t+n>=e.data.length&&th(s,Vi(e,e.data.length),o),l=0===t&&eh(s,Vi(e,0),o);e.replaceData(t,n,ls(a,4,l,i))},dh=(e,t,n)=>{const o=e.data.slice(t),r=o.length-We(o).length;lh(e,t,r,n)},ch=(e,t,n)=>{const o=e.data.slice(0,t),r=o.length-Ke(o).length;lh(e,t-r,r,n)},uh=(e,t,n,o,r=!0)=>{const s=Ke(e.data).length,a=r?e:t,i=r?t:e;return r?a.appendData(i.data):a.insertData(0,i.data),xo(yn(i)),o&&dh(a,s,n),a},mh=(e,t)=>((e,t)=>{const n=e.container(),o=e.offset();return!Vi.isTextPosition(e)&&n===t.parentNode&&o>Vi.before(t).offset()})(t,e)?Vi(t.container(),t.offset()-1):t,fh=e=>{return ts(e.previousSibling)?I.some((t=e.previousSibling,er(t)?Vi(t,t.data.length):Vi.after(t))):e.previousSibling?Bu(e.previousSibling):I.none();var t},gh=e=>{return ts(e.nextSibling)?I.some((t=e.nextSibling,er(t)?Vi(t,0):Vi.before(t))):e.nextSibling?Ou(e.nextSibling):I.none();var t},ph=(e,t,n)=>((e,t,n)=>e?((e,t)=>gh(t).orThunk((()=>fh(t))).orThunk((()=>((e,t)=>Au(e,Vi.after(t)).orThunk((()=>Tu(e,Vi.before(t)))))(e,t))))(t,n):((e,t)=>fh(t).orThunk((()=>gh(t))).orThunk((()=>((e,t)=>I.from(t.previousSibling?t.previousSibling:t.parentNode).bind((t=>Tu(e,Vi.before(t)))).orThunk((()=>Au(e,Vi.after(t)))))(e,t))))(t,n))(e,t,n).map(T(mh,n)),hh=(e,t,n)=>{n.fold((()=>{e.focus()}),(n=>{e.selection.setRng(n.toRange(),t)}))},bh=(e,t)=>t&&Ee(e.schema.getBlockElements(),Ht(t)),vh=(e,t,n,o=!0,r=!1)=>{const s=ph(t,e.getBody(),n.dom),a=Qn(n,T(bh,e),(i=e.getBody(),e=>e.dom===i));var i;const l=((e,t,n,o)=>{const r=Bn(e).filter(Kt),s=Pn(e).filter(Kt);return xo(e),(a=r,i=s,l=t,d=(e,t,r)=>{const s=e.dom,a=t.dom,i=s.data.length;return uh(s,a,n,o),r.container()===a?Vi(s,i):r},a.isSome()&&i.isSome()&&l.isSome()?I.some(d(a.getOrDie(),i.getOrDie(),l.getOrDie())):I.none()).orThunk((()=>(o&&(r.each((e=>ch(e.dom,e.dom.length,n))),s.each((e=>dh(e.dom,0,n)))),t)));var a,i,l,d})(n,s,e.schema,((e,t)=>Ee(e.schema.getTextInlineElements(),Ht(t)))(e,n));e.dom.isEmpty(e.getBody())?(e.setContent(""),e.selection.setCursorLocation()):a.bind((e=>((e,t)=>{if(gs(e)){const n=hn('<br data-mce-bogus="1">');return t?V(Mn(e),(e=>{Tm(e)||xo(e)})):wo(e),vo(e,n),I.some(Vi.before(n.dom))}return I.none()})(e,r))).fold((()=>{o&&hh(e,t,l)}),(n=>{o&&hh(e,t,I.some(n))}))},yh=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,Ch=(e,t)=>xn(yn(t),dd(e))&&!Ts(e.schema,t)&&e.dom.isEditable(t),wh=e=>{var t;return"rtl"===za.DOM.getStyle(e,"direction",!0)||(e=>yh.test(e))(null!==(t=e.textContent)&&void 0!==t?t:"")},xh=(e,t,n)=>{const o=((e,t,n)=>Y(za.DOM.getParents(n.container(),"*",t),e))(e,t,n);return I.from(o[o.length-1])},Eh=(e,t)=>{const n=t.container(),o=t.offset();return e?Fr(n)?er(n.nextSibling)?Vi(n.nextSibling,0):Vi.after(n):jr(t)?Vi(n,o+1):t:Fr(n)?er(n.previousSibling)?Vi(n.previousSibling,n.previousSibling.data.length):Vi.before(n):Hr(t)?Vi(n,o-1):t},_h=T(Eh,!0),kh=T(Eh,!1),Sh=(e,t)=>{const n=e=>e.stopImmediatePropagation();e.on("beforeinput input",n,!0),e.getDoc().execCommand(t),e.off("beforeinput input",n)},Nh=e=>Sh(e,"Delete"),Rh=e=>_r(e)||Sr(e),Ah=(e,t)=>kn(e,t)?Jn(t,Rh,(e=>t=>Dt(An(t),e,_n))(e)):I.none(),Th=(e,t=!0)=>{e.dom.isEmpty(e.getBody())&&e.setContent("",{no_selection:!t})},Oh=(e,t,n)=>Mt(Ou(n),Bu(n),((o,r)=>{const s=Eh(!0,o),a=Eh(!1,r),i=Eh(!1,t);return e?Au(n,i).exists((e=>e.isEqual(a)&&t.isEqual(s))):Tu(n,i).exists((e=>e.isEqual(s)&&t.isEqual(a)))})).getOr(!0),Bh=e=>{var t;return(8===$t(t=e)||"#comment"===Ht(t)?Bn(e):Un(e)).bind(Bh).orThunk((()=>I.some(e)))},Ph=(e,t,n,o=!0)=>{var r;t.deleteContents();const s=Bh(n).getOr(n),a=yn(null!==(r=e.dom.getParent(s.dom,e.dom.isBlock))&&void 0!==r?r:n.dom);if(a.dom===e.getBody()?Th(e,o):gs(a)&&(Or(a),o&&e.selection.setCursorLocation(a.dom,0)),!_n(n,a)){const e=Dt(An(a),n)?[]:An(i=a).map(Mn).map((e=>Y(e,(e=>!_n(i,e))))).getOr([]);V(e.concat(Mn(n)),(e=>{_n(e,a)||kn(e,a)||!gs(e)||xo(e)}))}var i},Dh=(e,t)=>((e,t)=>{const n=e.dom;return n.parentNode?((e,t)=>J(e.dom.childNodes,(e=>t(yn(e)))).map(yn))(yn(n.parentNode),(n=>!_n(e,n)&&t(n))):I.none()})(e,t).isSome(),Lh=(e,t)=>Zn(e,t).isSome(),Mh=e=>Uo(e,"td,th"),Ih=(e,t)=>tm(yn(e),t),Fh=(e,t)=>({start:e,end:t}),Uh=hl([{singleCellTable:["rng","cell"]},{fullTable:["table"]},{partialTable:["cells","outsideDetails"]},{multiTable:["startTableCells","endTableCells","betweenRng"]}]),zh=(e,t)=>no(yn(e),"td,th",t),jh=e=>!_n(e.start,e.end),Hh=(e,t)=>tm(e.start,t).bind((n=>tm(e.end,t).bind((e=>It(_n(n,e),n))))),$h=e=>t=>Hh(t,e).map((e=>((e,t,n)=>({rng:e,table:t,cells:n}))(t,e,Mh(e)))),qh=(e,t,n,o)=>{if(n.collapsed||!e.forall(jh))return I.none();if(t.isSameTable){const t=e.bind($h(o));return I.some({start:t,end:t})}{const e=zh(n.startContainer,o),t=zh(n.endContainer,o),r=e.bind((e=>t=>tm(t,e).bind((e=>de(Mh(e)).map((e=>Fh(t,e))))))(o)).bind($h(o)),s=t.bind((e=>t=>tm(t,e).bind((e=>le(Mh(e)).map((e=>Fh(e,t))))))(o)).bind($h(o));return I.some({start:r,end:s})}},Vh=(e,t)=>Z(e,(e=>_n(e,t))),Wh=e=>Mt(Vh(e.cells,e.rng.start),Vh(e.cells,e.rng.end),((t,n)=>e.cells.slice(t,n+1))),Kh=(e,t)=>{const{startTable:n,endTable:o}=t,r=e.cloneRange();return n.each((e=>r.setStartAfter(e.dom))),o.each((e=>r.setEndBefore(e.dom))),r},Yh=(e,t)=>{const n=(e=>t=>_n(e,t))(e),o=((e,t)=>{const n=zh(e.startContainer,t),o=zh(e.endContainer,t);return Mt(n,o,Fh)})(t,n),r=((e,t)=>{const n=Ih(e.startContainer,t),o=Ih(e.endContainer,t),r=n.isSome(),s=o.isSome(),a=Mt(n,o,_n).getOr(!1);return(e=>Mt(e.startTable,e.endTable,((t,n)=>{const o=Lh(t,(e=>_n(e,n))),r=Lh(n,(e=>_n(e,t)));return o||r?{...e,startTable:o?I.none():e.startTable,endTable:r?I.none():e.endTable,isSameTable:!1,isMultiTable:!1}:e})).getOr(e))({startTable:n,endTable:o,isStartInTable:r,isEndInTable:s,isSameTable:a,isMultiTable:!a&&r&&s})})(t,n);return((e,t,n)=>e.exists((e=>((e,t)=>!jh(e)&&Hh(e,t).exists((e=>{const t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})))(e,n)&&rm(e.start,t))))(o,t,n)?o.map((e=>Uh.singleCellTable(t,e.start))):r.isMultiTable?((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:o})=>{const r=e.bind(Wh).getOr([]),s=o.bind(Wh).getOr([]);if(r.length>0&&s.length>0){const e=Kh(n,t);return I.some(Uh.multiTable(r,s,e))}return I.none()})))(o,r,t,n):((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:t})=>e.or(t))).bind((e=>{const{isSameTable:o}=t,r=Wh(e).getOr([]);if(o&&e.cells.length===r.length)return I.some(Uh.fullTable(e.table));if(r.length>0){if(o)return I.some(Uh.partialTable(r,I.none()));{const e=Kh(n,t);return I.some(Uh.partialTable(r,I.some({...t,rng:e})))}}return I.none()})))(o,r,t,n)},Gh=e=>V(e,(e=>{on(e,"contenteditable"),Or(e)})),Xh=(e,t,n,o)=>{const r=n.cloneRange();o?(r.setStart(n.startContainer,n.startOffset),r.setEndAfter(t.dom.lastChild)):(r.setStartBefore(t.dom.firstChild),r.setEnd(n.endContainer,n.endOffset)),eb(e,r,t,!1).each((e=>e()))},Qh=e=>{const t=em(e),n=yn(e.selection.getNode());cr(n.dom)&&gs(n)?e.selection.setCursorLocation(n.dom,0):e.selection.collapse(!0),t.length>1&&$(t,(e=>_n(e,n)))&&Jt(n,"data-mce-selected","1")},Jh=(e,t,n)=>I.some((()=>{const o=e.selection.getRng(),r=n.bind((({rng:n,isStartInTable:r})=>{const s=((e,t)=>I.from(e.dom.getParent(t,e.dom.isBlock)).map(yn))(e,r?n.endContainer:n.startContainer);n.deleteContents(),((e,t,n)=>{n.each((n=>{t?xo(n):(Or(n),e.selection.setCursorLocation(n.dom,0))}))})(e,r,s.filter(gs));const a=r?t[0]:t[t.length-1];return Xh(e,a,o,r),gs(a)?I.none():I.some(r?t.slice(1):t.slice(0,-1))})).getOr(t);Gh(r),Qh(e)})),Zh=(e,t,n,o)=>I.some((()=>{const r=e.selection.getRng(),s=t[0],a=n[n.length-1];Xh(e,s,r,!0),Xh(e,a,r,!1);const i=gs(s)?t:t.slice(1),l=gs(a)?n:n.slice(0,-1);Gh(i.concat(l)),o.deleteContents(),Qh(e)})),eb=(e,t,n,o=!0)=>I.some((()=>{Ph(e,t,n,o)})),tb=(e,t)=>I.some((()=>vh(e,!1,t))),nb=(e,t)=>J(Bp(t,e),Rr),ob=(e,t)=>J(Bp(t,e),Xt("caption")),rb=(e,t)=>I.some((()=>{Or(t),e.selection.setCursorLocation(t.dom,0)})),sb=(e,t)=>e?Np(t):Rp(t),ab=(e,t,n)=>{const o=yn(e.getBody());return ob(o,n).fold((()=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return nb(n,o).bind((o=>gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).bind((e=>nb(t,yn(e.getNode())).bind((e=>_n(e,o)?I.none():I.some(_))))))(e,n,t,o,r)))})(e,t,o,n).orThunk((()=>It(((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return sb(t,n)||ku(t,e.getBody(),n).exists((e=>sb(t,e)))})(e,t),_)))),(n=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).fold((()=>I.some(_)),(s=>((e,t,n,o)=>Ou(e.dom).bind((r=>Bu(e.dom).map((e=>t?n.isEqual(r)&&o.isEqual(e):n.isEqual(e)&&o.isEqual(r))))).getOr(!0))(o,n,r,s)?((e,t)=>rb(e,t))(e,o):((e,t,n)=>ob(e,yn(n.getNode())).fold((()=>I.some(_)),(e=>It(!_n(e,t),_))))(t,o,s))))(e,n,t,o,r)})(e,t,o,n)))},ib=(e,t)=>{const n=yn(e.selection.getStart(!0)),o=em(e);return e.selection.isCollapsed()&&0===o.length?ab(e,t,n):((e,t,n)=>{const o=yn(e.getBody()),r=e.selection.getRng();return 0!==n.length?Jh(e,n,I.none()):((e,t,n,o)=>ob(t,o).fold((()=>((e,t,n)=>Yh(t,n).bind((t=>t.fold(T(eb,e),T(tb,e),T(Jh,e),T(Zh,e)))))(e,t,n)),(t=>((e,t)=>rb(e,t))(e,t))))(e,o,r,t)})(e,n,o)},lb=(e,t)=>{let n=t;for(;n&&n!==e;){if(lr(n)||dr(n))return n;n=n.parentNode}return null},db=["data-ephox-","data-mce-","data-alloy-","data-snooker-","_"],cb=Pt.each,ub=e=>{const t=e.dom,n=new Set(e.serializer.getTempAttrs()),o=e=>$(db,(t=>He(e,t)))||n.has(e);return{compare:(e,n)=>{if(e.nodeName!==n.nodeName||e.nodeType!==n.nodeType)return!1;const r=e=>{const n={};return cb(t.getAttribs(e),(r=>{const s=r.nodeName.toLowerCase();"style"===s||o(s)||(n[s]=t.getAttrib(e,s))})),n},s=(e,t)=>{for(const n in e)if(Ee(e,n)){const o=t[n];if(v(o))return!1;if(e[n]!==o)return!1;delete t[n]}for(const e in t)if(Ee(t,e))return!1;return!0};if(qo(e)&&qo(n)){if(!s(r(e),r(n)))return!1;if(!s(t.parseStyle(t.getAttrib(e,"style")),t.parseStyle(t.getAttrib(n,"style"))))return!1}return!Ku(e)&&!Ku(n)},isAttributeInternal:o}},mb=e=>["h1","h2","h3","h4","h5","h6"].includes(e.name),fb=(e,t,n,o)=>{const r=n.name;for(let t=0,s=e.length;t<s;t++){const s=e[t];if(s.name===r){const e=o.nodes[r];e?e.nodes.push(n):o.nodes[r]={filter:s,nodes:[n]}}}if(n.attributes)for(let e=0,r=t.length;e<r;e++){const r=t[e],s=r.name;if(s in n.attributes.map){const e=o.attributes[s];e?e.nodes.push(n):o.attributes[s]={filter:r,nodes:[n]}}}},gb=(e,t)=>{const n=(e,n)=>{ge(e,(e=>{const o=ce(e.nodes);V(e.filter.callbacks,(r=>{for(let t=o.length-1;t>=0;t--){const r=o[t];(n?void 0!==r.attr(e.filter.name):r.name===e.filter.name)&&!y(r.parent)||o.splice(t,1)}o.length>0&&r(o,e.filter.name,t)}))}))};n(e.nodes,!1),n(e.attributes,!0)},pb=(e,t,n,o={})=>{const r=((e,t,n)=>{const o={nodes:{},attributes:{}};return n.firstChild&&((n,r)=>{let s=n;for(;s=s.walk();)fb(e,t,s,o)})(n),o})(e,t,n);gb(r,o)},hb=(e,t,n,o)=>{if((e.pad_empty_with_br||t.insert)&&n(o)){const e=new Wg("br",1);t.insert&&e.attr("data-mce-bogus","1"),o.empty().append(e)}else o.empty().append(new Wg("#text",3)).value=br},bb=(e,t)=>{const n=null==e?void 0:e.firstChild;return C(n)&&n===e.lastChild&&n.name===t},vb=(e,t,n,o)=>o.isEmpty(t,n,(t=>((e,t)=>{const n=e.getElementRule(t.name);return!0===(null==n?void 0:n.paddEmpty)})(e,t))),yb=e=>{let t;for(let n=e;n;n=n.parent){const e=n.attr("contenteditable");if("false"===e)break;"true"===e&&(t=n)}return I.from(t)},Cb=(e,t,n=e.parent)=>{if(t.getSpecialElements()[e.name])e.empty().remove();else{const o=e.children();for(const e of o)n&&!t.isValidChild(n.name,e.name)&&Cb(e,t,n);e.unwrap()}},wb=(e,t,n,o=_)=>{const r=t.getTextBlockElements(),s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=Pt.makeMap("tr,td,th,tbody,thead,tfoot,table,summary"),l=new Set,d=e=>e!==n&&!i[e.name];for(let n=0;n<e.length;n++){const i=e[n];let c,u,m;if(!i.parent||l.has(i))continue;if(r[i.name]&&"li"===i.parent.name){let e=i.next;for(;e&&r[e.name];)e.name="li",l.add(e),i.parent.insert(e,i.parent),e=e.next;i.unwrap();continue}const f=[i];for(c=i.parent;c&&!t.isValidChild(c.name,i.name)&&d(c);c=c.parent)f.push(c);if(c&&f.length>1)if(xb(t,i,c))Cb(i,t);else{f.reverse(),u=f[0].clone(),o(u);let e=u;for(let n=0;n<f.length-1;n++){t.isValidChild(e.name,f[n].name)&&n>0?(m=f[n].clone(),o(m),e.append(m)):m=e;for(let e=f[n].firstChild;e&&e!==f[n+1];){const t=e.next;m.append(e),e=t}e=m}vb(t,s,a,u)?c.insert(i,f[0],!0):(c.insert(u,f[0],!0),c.insert(i,u)),c=f[0],(vb(t,s,a,c)||bb(c,"br"))&&c.empty().remove()}else if(i.parent){if("li"===i.name){let e=i.prev;if(e&&("ul"===e.name||"ol"===e.name)){e.append(i);continue}if(e=i.next,e&&("ul"===e.name||"ol"===e.name)&&e.firstChild){e.insert(i,e.firstChild,!0);continue}const t=new Wg("ul",1);o(t),i.wrap(t);continue}if(t.isValidChild(i.parent.name,"div")&&t.isValidChild("div",i.name)){const e=new Wg("div",1);o(e),i.wrap(e)}else Cb(i,t)}}},xb=(e,t,n=t.parent)=>!(!n||(!e.children[t.name]||e.isValidChild(n.name,t.name))&&("a"!==t.name||!((e,t)=>{let n=e;for(;n;){if("a"===n.name)return!0;n=n.parent}return!1})(n))&&(!(e=>"summary"===e.name)(n)||!mb(t)||(null==n?void 0:n.firstChild)===t&&(null==n?void 0:n.lastChild)===t)),Eb=e=>e.collapsed?e:(e=>{const t=Vi.fromRangeStart(e),n=Vi.fromRangeEnd(e),o=e.commonAncestorContainer;return ku(!1,o,n).map((r=>!Qc(t,n,o)&&Qc(t,r,o)?((e,t,n,o)=>{const r=document.createRange();return r.setStart(e,t),r.setEnd(n,o),r})(t.container(),t.offset(),r.container(),r.offset()):e)).getOr(e)})(e),_b=(e,t)=>{let n=t.firstChild,o=t.lastChild;return n&&"meta"===n.name&&(n=n.next),o&&"mce_marker"===o.attr("id")&&(o=o.prev),((e,t)=>{const n=e.getNonEmptyElements();return C(t)&&(t.isEmpty(n)||((e,t)=>e.getBlockElements()[t.name]&&(e=>C(e.firstChild)&&e.firstChild===e.lastChild)(t)&&(e=>"br"===e.name||e.value===br)(t.firstChild))(e,t))})(e,o)&&(o=null==o?void 0:o.prev),!(!n||n!==o||"ul"!==n.name&&"ol"!==n.name)},kb=e=>{return e.length>0&&(!(n=e[e.length-1]).firstChild||C(null==(t=n)?void 0:t.firstChild)&&t.firstChild===t.lastChild&&(e=>e.data===br||ar(e))(t.firstChild))?e.slice(0,-1):e;var t,n},Sb=(e,t)=>{const n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Nb=(e,t)=>{const n=Vi.after(e),o=wu(t).prev(n);return o?o.toRange():null},Rb=(e,t,n,o)=>{const r=((e,t,n)=>{const o=t.serialize(n);return(e=>{var t,n;const o=e.firstChild,r=e.lastChild;return o&&"META"===o.nodeName&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o)),r&&"mce_marker"===r.id&&(null===(n=r.parentNode)||void 0===n||n.removeChild(r)),e})(e.createFragment(o))})(t,e,o),s=Sb(t,n.startContainer),a=kb((i=r.firstChild,Y(null!==(l=null==i?void 0:i.childNodes)&&void 0!==l?l:[],(e=>"LI"===e.nodeName))));var i,l;const d=t.getRoot(),c=e=>{const o=Vi.fromRangeStart(n),r=wu(t.getRoot()),a=1===e?r.prev(o):r.next(o),i=null==a?void 0:a.getNode();return!i||Sb(t,i)!==s};return s?c(1)?((e,t,n)=>{const o=e.parentNode;return o&&Pt.each(t,(t=>{o.insertBefore(t,e)})),((e,t)=>{const n=Vi.before(e),o=wu(t).next(n);return o?o.toRange():null})(e,n)})(s,a,d):c(2)?((e,t,n,o)=>(o.insertAfter(t.reverse(),e),Nb(t[0],n)))(s,a,d,t):((e,t,n,o)=>{const r=((e,t)=>{const n=t.cloneRange(),o=t.cloneRange();return n.setStartBefore(e),o.setEndAfter(e),[n.cloneContents(),o.cloneContents()]})(e,o),s=e.parentNode;return s&&(s.insertBefore(r[0],e),Pt.each(t,(t=>{s.insertBefore(t,e)})),s.insertBefore(r[1],e),s.removeChild(e)),Nb(t[t.length-1],n)})(s,a,d,n):null},Ab=["pre"],Tb=cr,Ob=(e,t,n)=>{var o,r;const s=e.selection,a=e.dom,i=e.parser,l=n.merge,d=up({validate:!0},e.schema),c='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>';n.preserve_zwsp||(t=Dr(t)),-1===t.indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,c);let u=s.getRng();const m=u.startContainer,f=e.getBody();m===f&&s.isCollapsed()&&a.isBlock(f.firstChild)&&((e,t)=>C(t)&&!e.schema.getVoidElements()[t.nodeName])(e,f.firstChild)&&a.isEmpty(f.firstChild)&&(u=a.createRng(),u.setStart(f.firstChild,0),u.setEnd(f.firstChild,0),s.setRng(u)),s.isCollapsed()||(e=>{const t=e.dom,n=Eb(e.selection.getRng());e.selection.setRng(n);const o=t.getParent(n.startContainer,Tb);((e,t,n)=>!!C(n)&&n===e.getParent(t.endContainer,Tb)&&rm(yn(n),t))(t,n,o)?eb(e,n,yn(o)):n.startContainer===n.endContainer&&n.endOffset-n.startOffset==1&&er(n.startContainer.childNodes[n.startOffset])?n.deleteContents():e.getDoc().execCommand("Delete",!1)})(e);const g=s.getNode(),p={context:g.nodeName.toLowerCase(),data:n.data,insert:!0},h=i.parse(t,p);if(!0===n.paste&&_b(e.schema,h)&&((e,t)=>!!Sb(e,t))(a,g))return u=Rb(d,a,s.getRng(),h),u&&s.setRng(u),t;!0===n.paste&&((e,t,n,o)=>{var r;const s=t.firstChild,a=t.lastChild,i=s===("bookmark"===a.attr("data-mce-type")?a.prev:a),l=H(Ab,s.name);if(i&&l){const t="false"!==s.attr("contenteditable"),a=(null===(r=e.getParent(n,e.isBlock))||void 0===r?void 0:r.nodeName.toLowerCase())===s.name,i=I.from(lb(o,n)).forall(lr);return t&&a&&i}return!1})(a,h,g,e.getBody())&&(null===(o=h.firstChild)||void 0===o||o.unwrap()),(e=>{let t=e;for(;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")})(h);let b=h.lastChild;if(b&&"mce_marker"===b.attr("id")){const t=b;for(b=b.prev;b;b=b.walk(!0))if(3===b.type||!a.isBlock(b.name)){b.parent&&e.schema.isValidChild(b.parent.name,"span")&&b.parent.insert(t,b,"br"===b.name);break}}if(e._selectionOverrides.showBlockCaretContainer(g),p.invalid||((e,t,n)=>{var o;return $(n.children(),mb)&&"SUMMARY"===(null===(o=e.getParent(t,e.isBlock))||void 0===o?void 0:o.nodeName)})(a,g,h)){e.selection.setContent(c);let n,o=s.getNode();const l=e.getBody();for(rr(o)?o=n=l:n=o;n&&n!==l;)o=n,n=n.parentNode;t=o===l?l.innerHTML:a.getOuterHTML(o);const u=i.parse(t),m=(e=>{for(let t=e;t;t=t.walk())if("mce_marker"===t.attr("id"))return I.some(t);return I.none()})(u),f=m.bind(yb).getOr(u);m.each((e=>e.replace(h)));const g=h.children(),p=null!==(r=h.parent)&&void 0!==r?r:u;h.unwrap();const b=Y(g,(t=>xb(e.schema,t,p)));wb(b,e.schema,f),pb(i.getNodeFilters(),i.getAttributeFilters(),u),t=d.serialize(u),o===l?a.setHTML(l,t):a.setOuterHTML(o,t)}else t=d.serialize(h),((e,t,n)=>{var o;if("all"===n.getAttribute("data-mce-bogus"))null===(o=n.parentNode)||void 0===o||o.insertBefore(e.dom.createFragment(t),n);else{const o=n.firstChild,r=n.lastChild;!o||o===r&&"BR"===o.nodeName?e.dom.setHTML(n,t):e.selection.setContent(t,{no_events:!0})}})(e,t,g);var v;return((e,t)=>{const n=e.schema.getTextInlineElements(),o=e.dom;if(t){const t=e.getBody(),r=ub(e);Pt.each(o.select("*[data-mce-fragment]"),(e=>{if(C(n[e.nodeName.toLowerCase()])&&((e,t)=>ne(gp(e,t),(e=>!(e=>mp.has(e))(e))))(o,e))for(let n=e.parentElement;C(n)&&n!==t&&!pp(o,e,n);n=n.parentElement)if(r.compare(n,e)){o.remove(e,!0);break}}))}})(e,l),((e,t)=>{var n,o,r;let s;const a=e.dom,i=e.selection;if(!t)return;i.scrollIntoView(t);const l=lb(e.getBody(),t);if(l&&"false"===a.getContentEditable(l))return a.remove(t),void i.select(l);let d=a.createRng();const c=t.previousSibling;if(er(c)){d.setStart(c,null!==(o=null===(n=c.nodeValue)||void 0===n?void 0:n.length)&&void 0!==o?o:0);const e=t.nextSibling;er(e)&&(c.appendData(e.data),null===(r=e.parentNode)||void 0===r||r.removeChild(e))}else d.setStartBefore(t),d.setEndBefore(t);const u=a.getParent(t,a.isBlock);if(a.remove(t),u&&a.isEmpty(u)){const t=Tb(u);wo(yn(u)),d.setStart(u,0),d.setEnd(u,0),t||(e=>!!e.getAttribute("data-mce-fragment"))(u)||!(s=(t=>{let n=Vi.fromRangeStart(t);return n=wu(e.getBody()).next(n),null==n?void 0:n.toRange()})(d))?a.add(u,a.create("br",t?{}:{"data-mce-bogus":"1"})):(d=s,a.remove(u))}i.setRng(d)})(e,a.get("mce_marker")),v=e.getBody(),Pt.each(v.getElementsByTagName("*"),(e=>{e.removeAttribute("data-mce-fragment")})),((e,t,n)=>{I.from(e.getParent(t,"td,th")).map(yn).each((e=>((e,t)=>{Un(e).each((n=>{Bn(n).each((o=>{t.isBlock(Ht(e))&&Er(n)&&t.isBlock(Ht(o))&&xo(n)}))}))})(e,n)))})(a,s.getStart(),e.schema),((e,t,n)=>{const o=On(yn(n),(e=>_n(e,yn(t))));ie(o,o.length-2).filter(Wt).fold((()=>ks(e,t)),(t=>ks(e,t.dom)))})(e.schema,e.getBody(),s.getStart()),t},Bb=e=>e instanceof Wg,Pb=(e,t,n)=>{e.dom.setHTML(e.getBody(),t),!0!==n&&(e=>{Rg(e)&&Ou(e.getBody()).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e)},Db=e=>w(e)?e:L,Lb=(e,t,n)=>{const o=t(e),r=Db(n);return o.orThunk((()=>r(e)?I.none():((e,t,n)=>{let o=e.dom;const r=Db(n);for(;o.parentNode;){o=o.parentNode;const e=yn(o),n=t(e);if(n.isSome())return n;if(r(e))break}return I.none()})(e,t,r)))},Mb=ym,Ib=(e,t,n)=>{const o=e.formatter.get(n);if(o)for(let n=0;n<o.length;n++){const r=o[n];if(Sm(r)&&!1===r.inherit&&e.dom.is(t,r.selector))return!0}return!1},Fb=(e,t,n,o,r)=>{const s=e.dom.getRoot();if(t===s)return!1;const a=e.dom.getParent(t,(t=>!!Ib(e,t,n)||t.parentNode===s||!!jb(e,t,n,o,!0)));return!!jb(e,a,n,o,r)},Ub=(e,t,n)=>!(!Nm(n)||!Mb(t,n.inline))||!(!km(n)||!Mb(t,n.block))||!!Sm(n)&&qo(t)&&e.is(t,n.selector),zb=(e,t,n,o,r,s)=>{const a=n[o],i="attributes"===o;if(w(n.onmatch))return n.onmatch(t,n,o);if(a)if(Se(a)){for(let n=0;n<a.length;n++)if(i?e.getAttrib(t,a[n]):wm(e,t,a[n]))return!0}else for(const o in a)if(Ee(a,o)){const l=i?e.getAttrib(t,o):wm(e,t,o),d=vm(a[o],s),c=y(l)||Ge(l);if(c&&y(d))continue;if(r&&c&&!n.exact)return!1;if((!r||n.exact)&&!Mb(l,Cm(d,o)))return!1}return!0},jb=(e,t,n,o,r)=>{const s=e.formatter.get(n),a=e.dom;if(s&&qo(t))for(let n=0;n<s.length;n++){const i=s[n];if(Ub(e.dom,t,i)&&zb(a,t,i,"attributes",r,o)&&zb(a,t,i,"styles",r,o)){const n=i.classes;if(n)for(let r=0;r<n.length;r++)if(!e.dom.hasClass(t,vm(n[r],o)))return;return i}}},Hb=(e,t,n,o,r)=>{if(o)return Fb(e,o,t,n,r);if(o=e.selection.getNode(),Fb(e,o,t,n,r))return!0;const s=e.selection.getStart();return!(s===o||!Fb(e,s,t,n,r))},$b=Br,qb=e=>{if(e){const t=new jo(e,e);for(let e=t.current();e;e=t.next())if(er(e))return e}return null},Vb=e=>{const t=bn("span");return Zt(t,{id:Pu,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&vo(t,vn($b)),t},Wb=(e,t,n)=>{const o=e.dom,r=e.selection;if(Am(t))vh(e,!1,yn(t),n,!0);else{const e=r.getRng(),n=o.getParent(t,o.isBlock),s=e.startContainer,a=e.startOffset,i=e.endContainer,l=e.endOffset,d=(e=>{const t=qb(e);return t&&t.data.charAt(0)===$b&&t.deleteData(0,1),t})(t);o.remove(t,!0),s===d&&a>0&&e.setStart(d,a-1),i===d&&l>0&&e.setEnd(d,l-1),n&&o.isEmpty(n)&&Or(yn(n)),r.setRng(e)}},Kb=(e,t,n)=>{const o=e.dom,r=e.selection;if(t)Wb(e,t,n);else if(!(t=Lu(e.getBody(),r.getStart())))for(;t=o.get(Pu);)Wb(e,t,n)},Yb=(e,t)=>(e.appendChild(t),t),Gb=(e,t)=>{var n;const o=G(e,((e,t)=>Yb(e,t.cloneNode(!1))),t),r=null!==(n=o.ownerDocument)&&void 0!==n?n:document;return Yb(o,r.createTextNode($b))},Xb=(e,t,n,o)=>{const a=e.dom,i=e.selection;let l=!1;const d=e.formatter.get(t);if(!d)return;const c=i.getRng(),u=c.startContainer,m=c.startOffset;let f=u;er(u)&&(m!==u.data.length&&(l=!0),f=f.parentNode);const g=[];let h;for(;f;){if(jb(e,f,t,n,o)){h=f;break}f.nextSibling&&(l=!0),g.push(f),f=f.parentNode}if(h)if(l){const r=i.getBookmark();c.collapse(!0);let s=Vm(a,c,d,!0);s=Ff(s),e.formatter.remove(t,n,s,o),i.moveToBookmark(r)}else{const l=Lu(e.getBody(),h),d=C(l)?a.getParents(h.parentNode,M,l):[],c=Vb(!1).dom;((e,t,n)=>{var o,r;const s=e.dom,a=s.getParent(n,T(gm,e.schema));a&&s.isEmpty(a)?null===(o=n.parentNode)||void 0===o||o.replaceChild(t,n):((e=>{const t=Uo(e,"br"),n=Y((e=>{const t=[];let n=e.dom;for(;n;)t.push(yn(n)),n=n.lastChild;return t})(e).slice(-1),Er);t.length===n.length&&V(n,xo)})(yn(n)),s.isEmpty(n)?null===(r=n.parentNode)||void 0===r||r.replaceChild(t,n):s.insertAfter(t,n))})(e,c,null!=l?l:h);const u=((e,t,n,o,a,i)=>{const l=e.formatter,d=e.dom,c=Y(me(l.get()),(e=>e!==o&&!je(e,"removeformat"))),u=((e,t,n)=>X(n,((n,o)=>{const r=((e,t)=>_m(e,t,(e=>{const t=e=>w(e)||e.length>1&&"%"===e.charAt(0);return $(["styles","attributes"],(n=>xe(e,n).exists((e=>{const n=p(e)?e:we(e);return $(n,t)}))))})))(e,o);return e.formatter.matchNode(t,o,{},r)?n.concat([o]):n}),[]))(e,n,c);if(Y(u,(t=>!((e,t,n)=>{const o=["inline","block","selector","attributes","styles","classes"],a=e=>ye(e,((e,t)=>$(o,(e=>e===t))));return _m(e,t,(t=>{const o=a(t);return _m(e,n,(e=>{const t=a(e);return((e,t,n=s)=>r(n).eq(e,t))(o,t)}))}))})(e,t,o))).length>0){const e=n.cloneNode(!1);return d.add(t,e),l.remove(o,a,e,i),d.remove(e),I.some(e)}return I.none()})(e,c,h,t,n,o),m=Gb([...g,...u.toArray(),...d],c);l&&Wb(e,l,C(l)),i.setCursorLocation(m,1),a.isEmpty(h)&&a.remove(h)}},Qb=e=>{const t=Vb(!1),n=Gb(e,t.dom);return{caretContainer:t,caretPosition:Vi(n,0)}},Jb=(e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return po(yn(e),n),xo(yn(e)),o},Zb=(e,t)=>{if(Du(t.dom))return!1;const n=e.schema.getTextInlineElements();return Ee(n,Ht(t))&&!Du(t.dom)&&!Xo(t.dom)},ev={},tv=Ko(["pre"]);((e,t)=>{ev[e]||(ev[e]=[]),ev[e].push((e=>{if(!e.selection.getRng().collapsed){const t=e.selection.getSelectedBlocks(),n=Y(Y(t,tv),(e=>t=>{const n=t.previousSibling;return tv(n)&&H(e,n)})(t));V(n,(e=>{((e,t)=>{const n=yn(t),o=Nn(n).dom;xo(n),Co(yn(e),[bn("br",o),bn("br",o),...Mn(n)])})(e.previousSibling,e)}))}}))})("pre");const nv=["fontWeight","fontStyle","color","fontSize","fontFamily"],ov=(e,t)=>{const n=e.get(t);return p(n)?J(n,(e=>Nm(e)&&"span"===e.inline&&(e=>f(e.styles)&&$(me(e.styles),(e=>H(nv,e))))(e))):I.none()},rv=(e,t)=>Tu(t,Vi.fromRangeStart(e)).isNone(),sv=(e,t)=>!1===Au(t,Vi.fromRangeEnd(e)).exists((e=>!ar(e.getNode())||Au(t,e).isSome())),av=e=>t=>fr(t)&&e.isEditable(t),iv=e=>Y(e.getSelectedBlocks(),av(e.dom)),lv=Pt.each,dv=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),cv=(e,t)=>{for(let n=e;n;n=n[t]){if(er(n)&&Ye(n.data))return e;if(qo(n)&&!Ku(n))return n}return e},uv=(e,t,n)=>{const o=ub(e),r=Vo(t)&&e.dom.isEditable(t),s=Vo(n)&&e.dom.isEditable(n);if(r&&s){const r=cv(t,"previousSibling"),s=cv(n,"nextSibling");if(o.compare(r,s)){for(let e=r.nextSibling;e&&e!==s;){const t=e;e=e.nextSibling,r.appendChild(t)}return e.dom.remove(s),Pt.each(Pt.grep(s.childNodes),(e=>{r.appendChild(e)})),r}}return n},mv=(e,t,n,o)=>{var r;if(o&&!1!==t.merge_siblings){const t=null!==(r=uv(e,fm(o),o))&&void 0!==r?r:o;uv(e,t,fm(t,!0))}},fv=(e,t,n)=>{lv(e.childNodes,(e=>{dv(e)&&(t(e)&&n(e),e.hasChildNodes()&&fv(e,t,n))}))},gv=(e,t)=>n=>!(!n||!wm(e,n,t)),pv=(e,t,n)=>o=>{e.setStyle(o,t,n),""===o.getAttribute("style")&&o.removeAttribute("style"),((e,t)=>{"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)})(e,o)},hv=hl([{keep:[]},{rename:["name"]},{removed:[]}]),bv=/^(src|href|style)$/,vv=Pt.each,yv=ym,Cv=(e,t,n)=>e.isChildOf(t,n)&&t!==n&&!e.isBlock(n),wv=(e,t,n)=>{let o=t[n?"startContainer":"endContainer"],r=t[n?"startOffset":"endOffset"];if(qo(o)){const e=o.childNodes.length-1;!n&&r&&r--,o=o.childNodes[r>e?e:r]}return er(o)&&n&&r>=o.data.length&&(o=new jo(o,e.getBody()).next()||o),er(o)&&!n&&0===r&&(o=new jo(o,e.getBody()).prev()||o),o},xv=(e,t)=>{const n=t?"firstChild":"lastChild",o=e[n];return(e=>/^(TR|TH|TD)$/.test(e.nodeName))(e)&&o?"TR"===e.nodeName&&o[n]||o:e},Ev=(e,t,n,o)=>{var r;const s=e.create(n,o);return null===(r=t.parentNode)||void 0===r||r.insertBefore(s,t),s.appendChild(t),s},_v=(e,t,n,o,r)=>{const s=yn(t),a=yn(e.create(o,r)),i=n?Ln(s):Dn(s);return Co(a,i),n?(po(s,a),bo(a,s)):(ho(s,a),vo(a,s)),a.dom},kv=(e,t,n)=>{const o=t.parentNode;let r;const s=e.dom,a=Il(e);km(n)&&o===s.getRoot()&&(n.list_block&&yv(t,n.list_block)||V(ce(t.childNodes),(t=>{pm(e,a,t.nodeName.toLowerCase())?r?r.appendChild(t):(r=Ev(s,t,a),s.setAttribs(r,Fl(e))):r=null}))),(e=>Sm(e)&&Nm(e)&&Dt(xe(e,"mixed"),!0))(n)&&!yv(n.inline,t)||s.remove(t,!0)},Sv=(e,t,n)=>x(e)?{name:t,value:null}:{name:e,value:vm(t,n)},Nv=(e,t)=>{""===e.getAttrib(t,"style")&&(t.removeAttribute("style"),t.removeAttribute("data-mce-style"))},Rv=(e,t,n,o,r)=>{let s=!1;vv(n.styles,((a,i)=>{const{name:l,value:d}=Sv(i,a,o),c=Cm(d,l);(n.remove_similar||h(d)||!qo(r)||yv(wm(e,r,l),c))&&e.setStyle(t,l,""),s=!0})),s&&Nv(e,t)},Av=(e,t,n,o,r)=>{const s=e.dom,a=ub(e),i=e.schema;if(Nm(t)&&Rs(i,t.inline)&&Ts(i,o)&&o.parentElement===e.getBody())return kv(e,o,t),hv.removed();if(!t.ceFalseOverride&&o&&"false"===s.getContentEditableParent(o))return hv.keep();if(o&&!Ub(s,o,t)&&!((e,t)=>t.links&&"A"===e.nodeName)(o,t))return hv.keep();const l=o,d=t.preserve_attributes;if(Nm(t)&&"all"===t.remove&&p(d)){const e=Y(s.getAttribs(l),(e=>H(d,e.name.toLowerCase())));if(s.removeAllAttribs(l),V(e,(e=>s.setAttrib(l,e.name,e.value))),e.length>0)return hv.rename("span")}if("all"!==t.remove){Rv(s,l,t,n,r),vv(t.attributes,((e,o)=>{const{name:a,value:i}=Sv(o,e,n);if(t.remove_similar||h(i)||!qo(r)||yv(s.getAttrib(r,a),i)){if("class"===a){const e=s.getAttrib(l,a);if(e){let t="";if(V(e.split(/\s+/),(e=>{/mce\-\w+/.test(e)&&(t+=(t?" ":"")+e)})),t)return void s.setAttrib(l,a,t)}}if(bv.test(a)&&l.removeAttribute("data-mce-"+a),"style"===a&&Ko(["li"])(l)&&"none"===s.getStyle(l,"list-style-type"))return l.removeAttribute(a),void s.setStyle(l,"list-style-type","none");"class"===a&&l.removeAttribute("className"),l.removeAttribute(a)}})),vv(t.classes,(e=>{e=vm(e,n),qo(r)&&!s.hasClass(r,e)||s.removeClass(l,e)}));const e=s.getAttribs(l);for(let t=0;t<e.length;t++){const n=e[t].nodeName;if(!a.isAttributeInternal(n))return hv.keep()}}return"none"!==t.remove?(kv(e,l,t),hv.removed()):hv.keep()},Tv=(e,t,n,o)=>Av(e,t,n,o,o).fold(N(o),(t=>(e.dom.createFragment().appendChild(o),e.dom.rename(o,t))),N(null)),Ov=(e,t,n,o,r)=>{(o||e.selection.isEditable())&&((e,t,n,o,r)=>{const s=e.formatter.get(t),a=s[0],i=e.dom,l=e.selection,d=o=>{const i=((e,t,n,o,r)=>{let s;return t.parentNode&&V(Em(e.dom,t.parentNode).reverse(),(t=>{if(!s&&qo(t)&&"_start"!==t.id&&"_end"!==t.id){const a=jb(e,t,n,o,r);a&&!1!==a.split&&(s=t)}})),s})(e,o,t,n,r);return((e,t,n,o,r,s,a,i)=>{var l,d;let c,u;const m=e.dom;if(n){const s=n.parentNode;for(let n=o.parentNode;n&&n!==s;n=n.parentNode){let o=m.clone(n,!1);for(let n=0;n<t.length&&(o=Tv(e,t[n],i,o),null!==o);n++);o&&(c&&o.appendChild(c),u||(u=o),c=o)}a.mixed&&m.isBlock(n)||(o=null!==(l=m.split(n,o))&&void 0!==l?l:o),c&&u&&(null===(d=r.parentNode)||void 0===d||d.insertBefore(c,r),u.appendChild(r),Nm(a)&&mv(e,a,0,c))}return o})(e,s,i,o,o,0,a,n)},c=t=>$(s,(o=>Bv(e,o,n,t,t))),u=t=>{const n=ce(t.childNodes),o=c(t)||$(s,(e=>Ub(i,t,e))),r=t.parentNode;if(!o&&C(r)&&Rm(a)&&c(r),a.deep&&n.length)for(let e=0;e<n.length;e++)u(n[e]);V(["underline","line-through","overline"],(n=>{qo(t)&&e.dom.getStyle(t,"text-decoration")===n&&t.parentNode&&xm(i,t.parentNode)===n&&Bv(e,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:n}},void 0,t)}))},m=e=>{const t=i.get(e?"_start":"_end");if(t){let n=t[e?"firstChild":"lastChild"];return(e=>Ku(e)&&qo(e)&&("_start"===e.id||"_end"===e.id))(n)&&(n=n[e?"firstChild":"lastChild"]),er(n)&&0===n.data.length&&(n=e?t.previousSibling||t.nextSibling:t.nextSibling||t.previousSibling),i.remove(t,!0),n}return null},f=t=>{let n,o,r=Vm(i,t,s,t.collapsed);if(a.split){if(r=Ff(r),n=wv(e,r,!0),o=wv(e,r),n!==o){if(n=xv(n,!0),o=xv(o,!1),Cv(i,n,o)){const e=I.from(n.firstChild).getOr(n);return d(_v(i,e,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void m(!0)}if(Cv(i,o,n)){const e=I.from(o.lastChild).getOr(o);return d(_v(i,e,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void m(!1)}n=Ev(i,n,"span",{id:"_start","data-mce-type":"bookmark"}),o=Ev(i,o,"span",{id:"_end","data-mce-type":"bookmark"});const e=i.createRng();e.setStartAfter(n),e.setEndBefore(o),Wm(i,e,(e=>{V(e,(e=>{Ku(e)||Ku(e.parentNode)||d(e)}))})),d(n),d(o),n=m(!0),o=m()}else n=o=d(n);r.startContainer=n.parentNode?n.parentNode:n,r.startOffset=i.nodeIndex(n),r.endContainer=o.parentNode?o.parentNode:o,r.endOffset=i.nodeIndex(o)+1}Wm(i,r,(e=>{V(e,u)}))};if(o){if(dm(o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(e)}else f(o);nf(e,t,o,n)}else l.isCollapsed()&&Nm(a)&&!em(e).length?Xb(e,t,n,r):(um(e,(()=>im(e,f)),(o=>Nm(a)&&Hb(e,t,n,o))),e.nodeChanged()),((e,t,n)=>{"removeformat"===t?V(iv(e.selection),(t=>{V(nv,(n=>e.dom.setStyle(t,n,""))),Nv(e.dom,t)})):ov(e.formatter,t).each((t=>{V(iv(e.selection),(o=>Rv(e.dom,o,t,n,null)))}))})(e,t,n),nf(e,t,o,n)})(e,t,n,o,r)},Bv=(e,t,n,o,r)=>Av(e,t,n,o,r).fold(L,(t=>(e.dom.rename(o,t),!0)),M),Pv=Pt.each,Dv=Pt.each,Lv=(e,t,n,o)=>{if(Dv(n.styles,((n,r)=>{e.setStyle(t,r,vm(n,o))})),n.styles){const n=e.getAttrib(t,"style");n&&e.setAttrib(t,"data-mce-style",n)}},Mv=(e,t,n,o)=>{const r=e.formatter.get(t),s=r[0],a=!o&&e.selection.isCollapsed(),i=e.dom,l=e.selection,d=(e,t=s)=>{w(t.onformat)&&t.onformat(e,t,n,o),Lv(i,e,t,n),Dv(t.attributes,((t,o)=>{i.setAttrib(e,o,vm(t,n))})),Dv(t.classes,(t=>{const o=vm(t,n);i.hasClass(e,o)||i.addClass(e,o)}))},c=(e,t)=>{let n=!1;return Dv(e,(e=>!(!Sm(e)||("false"!==i.getContentEditable(t)||e.ceFalseOverride)&&(!C(e.collapsed)||e.collapsed===a)&&i.is(t,e.selector)&&!Du(t)&&(d(t,e),n=!0,1)))),n},u=e=>{if(m(e)){const t=i.create(e);return d(t),t}return null},f=(o,a,i)=>{const l=[];let m=!0;const f=s.inline||s.block,g=u(f);Wm(o,a,(a=>{let u;const p=a=>{let h=!1,b=m,v=!1;const y=a.parentNode,w=y.nodeName.toLowerCase(),x=o.getContentEditable(a);C(x)&&(b=m,m="true"===x,h=!0,v=bm(e,a));const E=m&&!h;if(ar(a)&&!((e,t,n,o)=>{if(xd(e)&&Nm(t)&&n.parentNode){const t=da(e.schema),r=Dh(yn(n),(e=>Du(e.dom)));return _e(t,o)&&gs(yn(n.parentNode),!1)&&!r}return!1})(e,s,a,w))return u=null,void(km(s)&&o.remove(a));if((o=>(e=>km(e)&&!0===e.wrapper)(s)&&jb(e,o,t,n))(a))u=null;else{if(((t,n,o)=>{const r=(e=>km(e)&&!0!==e.wrapper)(s)&&gm(e.schema,t)&&pm(e,n,f);return o&&r})(a,w,E)){const e=o.rename(a,f);return d(e),l.push(e),void(u=null)}if(Sm(s)){let e=c(r,a);if(!e&&C(y)&&Rm(s)&&(e=c(r,y)),!Nm(s)||e)return void(u=null)}C(g)&&((t,n,r,a)=>{const l=t.nodeName.toLowerCase(),d=pm(e,f,l)&&pm(e,n,f),c=!i&&er(t)&&Pr(t.data),u=Du(t),m=!Nm(s)||!o.isBlock(t);return(r||a)&&d&&!c&&!u&&m})(a,w,E,v)?(u||(u=o.clone(g,!1),y.insertBefore(u,a),l.push(u)),v&&h&&(m=b),u.appendChild(a)):(u=null,V(ce(a.childNodes),p),h&&(m=b),u=null)}};V(a,p)})),!0===s.links&&V(l,(e=>{const t=e=>{"A"===e.nodeName&&d(e,s),V(ce(e.childNodes),t)};t(e)})),V(l,(a=>{const i=(e=>{let t=0;return V(e.childNodes,(e=>{(e=>C(e)&&er(e)&&0===e.length)(e)||Ku(e)||t++})),t})(a);!(l.length>1)&&o.isBlock(a)||0!==i?(Nm(s)||km(s)&&s.wrapper)&&(s.exact||1!==i||(a=(e=>{const t=J(e.childNodes,cm).filter((e=>"false"!==o.getContentEditable(e)&&Ub(o,e,s)));return t.map((t=>{const n=o.clone(t,!1);return d(n),o.replace(n,e,!0),o.remove(t,!0),n})).getOr(e)})(a)),((e,t,n,o)=>{Pv(t,(t=>{Nm(t)&&Pv(e.dom.select(t.inline,o),(o=>{dv(o)&&Bv(e,t,n,o,t.exact?o:null)})),((e,t,n)=>{if(t.clear_child_styles){const o=t.links?"*:not(a)":"*";lv(e.select(o,n),(n=>{dv(n)&&e.isEditable(n)&&lv(t.styles,((t,o)=>{e.setStyle(n,o,"")}))}))}})(e.dom,t,o)}))})(e,r,n,a),((e,t,n,o,r)=>{const s=r.parentNode;jb(e,s,n,o)&&Bv(e,t,o,r)||t.merge_with_parents&&s&&e.dom.getParent(s,(s=>!!jb(e,s,n,o)&&(Bv(e,t,o,r),!0)))})(e,s,t,n,a),((e,t,n,o)=>{if(t.styles&&t.styles.backgroundColor){const r=gv(e,"fontSize");fv(o,(t=>r(t)&&e.isEditable(t)),pv(e,"backgroundColor",vm(t.styles.backgroundColor,n)))}})(o,s,n,a),((e,t,n,o)=>{const r=t=>{if(Vo(t)&&qo(t.parentNode)&&e.isEditable(t)){const n=xm(e,t.parentNode);e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null)}};t.styles&&(t.styles.color||t.styles.textDecoration)&&(Pt.walk(o,r,"childNodes"),r(o))})(o,s,0,a),((e,t,n,o)=>{if(Nm(t)&&("sub"===t.inline||"sup"===t.inline)){const n=gv(e,"fontSize");fv(o,(t=>n(t)&&e.isEditable(t)),pv(e,"fontSize",""));const r=Y(e.select("sup"===t.inline?"sub":"sup",o),e.isEditable);e.remove(r,!0)}})(o,s,0,a),mv(e,s,0,a)):o.remove(a,!0)}))},g=dm(o)?o:l.getNode();if("false"===i.getContentEditable(g)&&!bm(e,g))return c(r,o=g),void tf(e,t,o,n);if(s){if(o)if(dm(o)){if(!c(r,o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(i,Vm(i,e,r),!0)}}else f(i,o,!0);else a&&Nm(s)&&!em(e).length?((e,t,n)=>{let o;const r=e.selection,s=e.formatter.get(t);if(!s)return;const a=r.getRng();let i=a.startOffset;const l=a.startContainer.nodeValue;o=Lu(e.getBody(),r.getStart());const d=/[^\s\u00a0\u00ad\u200b\ufeff]/;if(l&&i>0&&i<l.length&&d.test(l.charAt(i))&&d.test(l.charAt(i-1))){const o=r.getBookmark();a.collapse(!0);let i=Vm(e.dom,a,s);i=Ff(i),e.formatter.apply(t,n,i),r.moveToBookmark(o)}else{let s=o?qb(o):null;o&&(null==s?void 0:s.data)===$b||(c=e.getDoc(),u=Vb(!0).dom,o=c.importNode(u,!0),s=o.firstChild,a.insertNode(o),i=1),e.formatter.apply(t,n,o),r.setCursorLocation(s,i)}var c,u})(e,t,n):(l.setRng(Eb(l.getRng())),um(e,(()=>{im(e,((e,t)=>{const n=t?e:Vm(i,e,r);f(i,n,!1)}))}),M),e.nodeChanged()),ov(e.formatter,t).each((t=>{V((e=>Y((e=>{const t=e.getSelectedBlocks(),n=e.getRng();if(e.isCollapsed())return[];if(1===t.length)return rv(n,t[0])&&sv(n,t[0])?t:[];{const e=le(t).filter((e=>rv(n,e))).toArray(),o=de(t).filter((e=>sv(n,e))).toArray(),r=t.slice(1,-1);return e.concat(r).concat(o)}})(e),av(e.dom)))(e.selection),(e=>Lv(i,e,t,n)))}));((e,t)=>{Ee(ev,e)&&V(ev[e],(e=>{e(t)}))})(t,e)}tf(e,t,o,n)},Iv=(e,t,n,o)=>{(o||e.selection.isEditable())&&Mv(e,t,n,o)},Fv=e=>Ee(e,"vars"),Uv=e=>e.selection.getStart(),zv=(e,t,n,o,r)=>Q(t,(t=>{const s=e.formatter.matchNode(t,n,null!=r?r:{},o);return!v(s)}),(t=>!!Ib(e,t,n)||!o&&C(e.formatter.matchNode(t,n,r,!0)))),jv=(e,t)=>{const n=null!=t?t:Uv(e);return Y(Em(e.dom,n),(e=>qo(e)&&!Xo(e)))},Hv=(e,t,n)=>{const o=jv(e,t);ge(n,((n,r)=>{const s=n=>{const s=zv(e,o,r,n.similar,Fv(n)?n.vars:void 0),a=s.isSome();if(n.state.get()!==a){n.state.set(a);const e=s.getOr(t);Fv(n)?n.callback(a,{node:e,format:r,parents:o}):V(n.callbacks,(t=>t(a,{node:e,format:r,parents:o})))}};V([n.withSimilar,n.withoutSimilar],s),V(n.withVars,s)}))},$v=Pt.explode,qv=()=>{const e={};return{addFilter:(t,n)=>{V($v(t),(t=>{Ee(e,t)||(e[t]={name:t,callbacks:[]}),e[t].callbacks.push(n)}))},getFilters:()=>we(e),removeFilter:(t,n)=>{V($v(t),(t=>{if(Ee(e,t))if(C(n)){const o=e[t],r=Y(o.callbacks,(e=>e!==n));r.length>0?o.callbacks=r:delete e[t]}else delete e[t]}))}}},Vv=(e,t,n)=>{var o;const r=wa();t.convert_fonts_to_spans&&((e,t,n)=>{e.addNodeFilter("font",(e=>{V(e,(e=>{const o=t.parse(e.attr("style")),r=e.attr("color"),s=e.attr("face"),a=e.attr("size");r&&(o.color=r),s&&(o["font-family"]=s),a&&Xe(a).each((e=>{o["font-size"]=n[e-1]})),e.name="span",e.attr("style",t.serialize(o)),((e,t)=>{V(["color","face","size"],(t=>{e.attr(t,null)}))})(e)}))}))})(e,r,Pt.explode(null!==(o=t.font_size_legacy_values)&&void 0!==o?o:"")),((e,t,n)=>{e.addNodeFilter("strike",(e=>{const o="html4"!==t.type;V(e,(e=>{if(o)e.name="s";else{const t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))}}))}))})(e,n,r)},Wv=(e,t,n)=>{t.addNodeFilter("br",((t,o,r)=>{const s=Pt.extend({},n.getBlockElements()),a=n.getNonEmptyElements(),i=n.getWhitespaceElements();s.body=1;const l=e=>e.name in s||Bs(n,e);for(let o=0,d=t.length;o<d;o++){let d=t[o],c=d.parent;if(c&&l(c)&&d===c.lastChild){let t=d.prev;for(;t;){const e=t.name;if("span"!==e||"bookmark"!==t.attr("data-mce-type")){"br"===e&&(d=null);break}t=t.prev}if(d&&(d.remove(),vb(n,a,i,c))){const t=n.getElementRule(c.name);t&&(t.removeEmpty?c.remove():t.paddEmpty&&hb(e,r,l,c))}}else{let e=d;for(;c&&c.firstChild===e&&c.lastChild===e&&(e=c,!s[c.name]);)c=c.parent;if(e===c){const e=new Wg("#text",3);e.value=br,d.replace(e)}}}}))},Kv=e=>{const[t,...n]=e.split(","),o=n.join(","),r=/data:([^/]+\/[^;]+)(;.+)?/.exec(t);if(r){const e=";base64"===r[2],t=e?(e=>{const t=/([a-z0-9+\/=\s]+)/i.exec(e);return t?t[1]:""})(o):decodeURIComponent(o);return I.some({type:r[1],data:t,base64Encoded:e})}return I.none()},Yv=(e,t,n=!0)=>{let o=t;if(n)try{o=atob(t)}catch(e){return I.none()}const r=new Uint8Array(o.length);for(let e=0;e<r.length;e++)r[e]=o.charCodeAt(e);return I.some(new Blob([r],{type:e}))},Gv=e=>new Promise(((t,n)=>{const o=new FileReader;o.onloadend=()=>{t(o.result)},o.onerror=()=>{var e;n(null===(e=o.error)||void 0===e?void 0:e.message)},o.readAsDataURL(e)}));let Xv=0;const Qv=(e,t,n)=>Kv(e).bind((({data:e,type:o,base64Encoded:r})=>{if(t&&!r)return I.none();{const t=r?e:btoa(e);return n(t,o)}})),Jv=(e,t,n)=>{const o=e.create("blobid"+Xv++,t,n);return e.add(o),o},Zv=(e,t,n=!1)=>Qv(t,n,((t,n)=>I.from(e.getByData(t,n)).orThunk((()=>Yv(n,t).map((n=>Jv(e,n,t))))))),ey=(e,t)=>He(e,`${t}/`),ty=(e,t)=>{const n=e.schema;t.remove_trailing_brs&&Wv(t,e,n),e.addAttributeFilter("href",(e=>{let n=e.length;const o=e=>{const t=e?Pt.trim(e):"";return/\b(noopener)\b/g.test(t)?t:(e=>e.split(" ").filter((e=>e.length>0)).concat(["noopener"]).sort().join(" "))(t)};if(!t.allow_unsafe_link_target)for(;n--;){const t=e[n];"a"===t.name&&"_blank"===t.attr("target")&&t.attr("rel",o(t.attr("rel")))}})),t.allow_html_in_named_anchor||e.addAttributeFilter("id,name",(e=>{let t,n,o,r,s=e.length;for(;s--;)if(r=e[s],"a"===r.name&&r.firstChild&&!r.attr("href"))for(o=r.parent,t=r.lastChild;t&&o;)n=t.prev,o.insert(t,r),t=n})),t.fix_list_elements&&e.addNodeFilter("ul,ol",(e=>{let t,n,o=e.length;for(;o--;)if(t=e[o],n=t.parent,n&&("ul"===n.name||"ol"===n.name))if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{const e=new Wg("li",1);e.attr("style","list-style-type: none"),t.wrap(e)}}));const o=n.getValidClasses();t.validate&&o&&e.addAttributeFilter("class",(e=>{var t;let n=e.length;for(;n--;){const r=e[n],s=null!==(t=r.attr("class"))&&void 0!==t?t:"",a=Pt.explode(s," ");let i="";for(let e=0;e<a.length;e++){const t=a[e];let n=!1,s=o["*"];s&&s[t]&&(n=!0),s=o[r.name],!n&&s&&s[t]&&(n=!0),n&&(i&&(i+=" "),i+=t)}i.length||(i=null),r.attr("class",i)}})),((e,t)=>{const{blob_cache:n}=t;if(n){const t=e=>{const t=e.attr("src");(e=>e.attr("src")===At.transparentSrc||C(e.attr("data-mce-placeholder")))(e)||(e=>C(e.attr("data-mce-bogus")))(e)||y(t)||Zv(n,t,!0).each((t=>{e.attr("src",t.blobUri())}))};e.addAttributeFilter("src",(e=>V(e,t)))}})(e,t),t.convert_unsafe_embeds&&e.addNodeFilter("object,embed",(e=>V(e,(e=>{e.replace(((e,t,n,o,r)=>{let s;s=v(e)?"iframe":ey(e,"image")?"img":ey(e,"video")?"video":ey(e,"audio")?"audio":"iframe";const a=new Wg(s,1);return a.attr("audio"===s?{src:t}:{src:t,width:n,height:o}),"audio"!==s&&"video"!==s||a.attr("controls",""),"iframe"===s&&r&&a.attr("sandbox",""),a})(e.attr("type"),"object"===e.name?e.attr("data"):e.attr("src"),e.attr("width"),e.attr("height"),t.sandbox_iframes))})))),t.sandbox_iframes&&e.addNodeFilter("iframe",(e=>V(e,(e=>e.attr("sandbox","")))))},{entries:ny,setPrototypeOf:oy,isFrozen:ry,getPrototypeOf:sy,getOwnPropertyDescriptor:ay}=Object;let{freeze:iy,seal:ly,create:dy}=Object,{apply:cy,construct:uy}="undefined"!=typeof Reflect&&Reflect;cy||(cy=function(e,t,n){return e.apply(t,n)}),iy||(iy=function(e){return e}),ly||(ly=function(e){return e}),uy||(uy=function(e,t){return new e(...t)});const my=_y(Array.prototype.forEach),fy=_y(Array.prototype.pop),gy=_y(Array.prototype.push),py=_y(String.prototype.toLowerCase),hy=_y(String.prototype.toString),by=_y(String.prototype.match),vy=_y(String.prototype.replace),yy=_y(String.prototype.indexOf),Cy=_y(String.prototype.trim),wy=_y(RegExp.prototype.test),xy=(Ey=TypeError,function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];return uy(Ey,t)});var Ey;function _y(e){return function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return cy(e,t,o)}}function ky(e,t,n){var o;n=null!==(o=n)&&void 0!==o?o:py,oy&&oy(e,null);let r=t.length;for(;r--;){let o=t[r];if("string"==typeof o){const e=n(o);e!==o&&(ry(t)||(t[r]=e),o=e)}e[o]=!0}return e}function Sy(e){const t=dy(null);for(const[n,o]of ny(e))t[n]=o;return t}function Ny(e,t){for(;null!==e;){const n=ay(e,t);if(n){if(n.get)return _y(n.get);if("function"==typeof n.value)return _y(n.value)}e=sy(e)}return function(e){return console.warn("fallback value for",e),null}}const Ry=iy(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Ay=iy(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),Ty=iy(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),Oy=iy(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),By=iy(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),Py=iy(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Dy=iy(["#text"]),Ly=iy(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),My=iy(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Iy=iy(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),Fy=iy(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Uy=ly(/\{\{[\w\W]*|[\w\W]*\}\}/gm),zy=ly(/<%[\w\W]*|[\w\W]*%>/gm),jy=ly(/\${[\w\W]*}/gm),Hy=ly(/^data-[\-\w.\u00B7-\uFFFF]/),$y=ly(/^aria-[\-\w]+$/),qy=ly(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Vy=ly(/^(?:\w+script|data):/i),Wy=ly(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Ky=ly(/^html$/i);var Yy=Object.freeze({__proto__:null,MUSTACHE_EXPR:Uy,ERB_EXPR:zy,TMPLIT_EXPR:jy,DATA_ATTR:Hy,ARIA_ATTR:$y,IS_ALLOWED_URI:qy,IS_SCRIPT_OR_DATA:Vy,ATTR_WHITESPACE:Wy,DOCTYPE_NAME:Ky});const Gy=()=>"undefined"==typeof window?null:window;var Xy=function e(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Gy();const n=t=>e(t);if(n.version="3.0.5",n.removed=[],!t||!t.document||9!==t.document.nodeType)return n.isSupported=!1,n;const o=t.document,r=o.currentScript;let{document:s}=t;const{DocumentFragment:a,HTMLTemplateElement:i,Node:l,Element:d,NodeFilter:c,NamedNodeMap:u=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:m,DOMParser:f,trustedTypes:g}=t,p=d.prototype,h=Ny(p,"cloneNode"),b=Ny(p,"nextSibling"),v=Ny(p,"childNodes"),y=Ny(p,"parentNode");if("function"==typeof i){const e=s.createElement("template");e.content&&e.content.ownerDocument&&(s=e.content.ownerDocument)}let C,w="";const{implementation:x,createNodeIterator:E,createDocumentFragment:_,getElementsByTagName:k}=s,{importNode:S}=o;let N={};n.isSupported="function"==typeof ny&&"function"==typeof y&&x&&void 0!==x.createHTMLDocument;const{MUSTACHE_EXPR:R,ERB_EXPR:A,TMPLIT_EXPR:T,DATA_ATTR:O,ARIA_ATTR:B,IS_SCRIPT_OR_DATA:P,ATTR_WHITESPACE:D}=Yy;let{IS_ALLOWED_URI:L}=Yy,M=null;const I=ky({},[...Ry,...Ay,...Ty,...By,...Dy]);let F=null;const U=ky({},[...Ly,...My,...Iy,...Fy]);let z=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),j=null,H=null,$=!0,q=!0,V=!1,W=!0,K=!1,Y=!1,G=!1,X=!1,Q=!1,J=!1,Z=!1,ee=!0,te=!1,ne=!0,oe=!1,re={},se=null;const ae=ky({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]);let ie=null;const le=ky({},["audio","video","img","source","image","track"]);let de=null;const ce=ky({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ue="http://www.w3.org/1998/Math/MathML",me="http://www.w3.org/2000/svg",fe="http://www.w3.org/1999/xhtml";let ge=fe,pe=!1,he=null;const be=ky({},[ue,me,fe],hy);let ve;const ye=["application/xhtml+xml","text/html"];let Ce,we=null;const xe=s.createElement("form"),Ee=function(e){return e instanceof RegExp||e instanceof Function},_e=function(e){if(!we||we!==e){if(e&&"object"==typeof e||(e={}),e=Sy(e),ve=ve=-1===ye.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,Ce="application/xhtml+xml"===ve?hy:py,M="ALLOWED_TAGS"in e?ky({},e.ALLOWED_TAGS,Ce):I,F="ALLOWED_ATTR"in e?ky({},e.ALLOWED_ATTR,Ce):U,he="ALLOWED_NAMESPACES"in e?ky({},e.ALLOWED_NAMESPACES,hy):be,de="ADD_URI_SAFE_ATTR"in e?ky(Sy(ce),e.ADD_URI_SAFE_ATTR,Ce):ce,ie="ADD_DATA_URI_TAGS"in e?ky(Sy(le),e.ADD_DATA_URI_TAGS,Ce):le,se="FORBID_CONTENTS"in e?ky({},e.FORBID_CONTENTS,Ce):ae,j="FORBID_TAGS"in e?ky({},e.FORBID_TAGS,Ce):{},H="FORBID_ATTR"in e?ky({},e.FORBID_ATTR,Ce):{},re="USE_PROFILES"in e&&e.USE_PROFILES,$=!1!==e.ALLOW_ARIA_ATTR,q=!1!==e.ALLOW_DATA_ATTR,V=e.ALLOW_UNKNOWN_PROTOCOLS||!1,W=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,K=e.SAFE_FOR_TEMPLATES||!1,Y=e.WHOLE_DOCUMENT||!1,Q=e.RETURN_DOM||!1,J=e.RETURN_DOM_FRAGMENT||!1,Z=e.RETURN_TRUSTED_TYPE||!1,X=e.FORCE_BODY||!1,ee=!1!==e.SANITIZE_DOM,te=e.SANITIZE_NAMED_PROPS||!1,ne=!1!==e.KEEP_CONTENT,oe=e.IN_PLACE||!1,L=e.ALLOWED_URI_REGEXP||qy,ge=e.NAMESPACE||fe,z=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(z.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(z.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(z.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),K&&(q=!1),J&&(Q=!0),re&&(M=ky({},[...Dy]),F=[],!0===re.html&&(ky(M,Ry),ky(F,Ly)),!0===re.svg&&(ky(M,Ay),ky(F,My),ky(F,Fy)),!0===re.svgFilters&&(ky(M,Ty),ky(F,My),ky(F,Fy)),!0===re.mathMl&&(ky(M,By),ky(F,Iy),ky(F,Fy))),e.ADD_TAGS&&(M===I&&(M=Sy(M)),ky(M,e.ADD_TAGS,Ce)),e.ADD_ATTR&&(F===U&&(F=Sy(F)),ky(F,e.ADD_ATTR,Ce)),e.ADD_URI_SAFE_ATTR&&ky(de,e.ADD_URI_SAFE_ATTR,Ce),e.FORBID_CONTENTS&&(se===ae&&(se=Sy(se)),ky(se,e.FORBID_CONTENTS,Ce)),ne&&(M["#text"]=!0),Y&&ky(M,["html","head","body"]),M.table&&(ky(M,["tbody"]),delete j.tbody),e.TRUSTED_TYPES_POLICY){if("function"!=typeof e.TRUSTED_TYPES_POLICY.createHTML)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if("function"!=typeof e.TRUSTED_TYPES_POLICY.createScriptURL)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');C=e.TRUSTED_TYPES_POLICY,w=C.createHTML("")}else void 0===C&&(C=function(e,t){if("object"!=typeof e||"function"!=typeof e.createPolicy)return null;let n=null;const o="data-tt-policy-suffix";t&&t.hasAttribute(o)&&(n=t.getAttribute(o));const r="dompurify"+(n?"#"+n:"");try{return e.createPolicy(r,{createHTML:e=>e,createScriptURL:e=>e})}catch(e){return console.warn("TrustedTypes policy "+r+" could not be created."),null}}(g,r)),null!==C&&"string"==typeof w&&(w=C.createHTML(""));iy&&iy(e),we=e}},ke=ky({},["mi","mo","mn","ms","mtext"]),Se=ky({},["foreignobject","desc","title","annotation-xml"]),Ne=ky({},["title","style","font","a","script"]),Re=ky({},Ay);ky(Re,Ty),ky(Re,Oy);const Ae=ky({},By);ky(Ae,Py);const Te=function(e){gy(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){e.remove()}},Oe=function(e,t){try{gy(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){gy(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!F[e])if(Q||J)try{Te(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Be=function(e){let t,n;if(X)e="<remove></remove>"+e;else{const t=by(e,/^[\r\n\t ]+/);n=t&&t[0]}"application/xhtml+xml"===ve&&ge===fe&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");const o=C?C.createHTML(e):e;if(ge===fe)try{t=(new f).parseFromString(o,ve)}catch(e){}if(!t||!t.documentElement){t=x.createDocument(ge,"template",null);try{t.documentElement.innerHTML=pe?w:o}catch(e){}}const r=t.body||t.documentElement;return e&&n&&r.insertBefore(s.createTextNode(n),r.childNodes[0]||null),ge===fe?k.call(t,Y?"html":"body")[0]:Y?t.documentElement:r},Pe=function(e){return E.call(e.ownerDocument||e,e,c.SHOW_ELEMENT|c.SHOW_COMMENT|c.SHOW_TEXT,null,!1)},De=function(e){return"object"==typeof l?e instanceof l:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Le=function(e,t,o){N[e]&&my(N[e],(e=>{e.call(n,t,o,we)}))},Me=function(e){let t;if(Le("beforeSanitizeElements",e,null),(o=e)instanceof m&&("string"!=typeof o.nodeName||"string"!=typeof o.textContent||"function"!=typeof o.removeChild||!(o.attributes instanceof u)||"function"!=typeof o.removeAttribute||"function"!=typeof o.setAttribute||"string"!=typeof o.namespaceURI||"function"!=typeof o.insertBefore||"function"!=typeof o.hasChildNodes))return Te(e),!0;var o;const r=Ce(e.nodeName);if(Le("uponSanitizeElement",e,{tagName:r,allowedTags:M}),e.hasChildNodes()&&!De(e.firstElementChild)&&(!De(e.content)||!De(e.content.firstElementChild))&&wy(/<[/\w]/g,e.innerHTML)&&wy(/<[/\w]/g,e.textContent))return Te(e),!0;if(!M[r]||j[r]){if(!j[r]&&Fe(r)){if(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,r))return!1;if(z.tagNameCheck instanceof Function&&z.tagNameCheck(r))return!1}if(ne&&!se[r]){const t=y(e)||e.parentNode,n=v(e)||e.childNodes;if(n&&t)for(let o=n.length-1;o>=0;--o)t.insertBefore(h(n[o],!0),b(e))}return Te(e),!0}return e instanceof d&&!function(e){let t=y(e);t&&t.tagName||(t={namespaceURI:ge,tagName:"template"});const n=py(e.tagName),o=py(t.tagName);return!!he[e.namespaceURI]&&(e.namespaceURI===me?t.namespaceURI===fe?"svg"===n:t.namespaceURI===ue?"svg"===n&&("annotation-xml"===o||ke[o]):Boolean(Re[n]):e.namespaceURI===ue?t.namespaceURI===fe?"math"===n:t.namespaceURI===me?"math"===n&&Se[o]:Boolean(Ae[n]):e.namespaceURI===fe?!(t.namespaceURI===me&&!Se[o])&&!(t.namespaceURI===ue&&!ke[o])&&!Ae[n]&&(Ne[n]||!Re[n]):!("application/xhtml+xml"!==ve||!he[e.namespaceURI]))}(e)?(Te(e),!0):"noscript"!==r&&"noembed"!==r&&"noframes"!==r||!wy(/<\/no(script|embed|frames)/i,e.innerHTML)?(K&&3===e.nodeType&&(t=e.textContent,t=vy(t,R," "),t=vy(t,A," "),t=vy(t,T," "),e.textContent!==t&&(gy(n.removed,{element:e.cloneNode()}),e.textContent=t)),Le("afterSanitizeElements",e,null),!1):(Te(e),!0)},Ie=function(e,t,n){if(ee&&("id"===t||"name"===t)&&(n in s||n in xe))return!1;if(q&&!H[t]&&wy(O,t));else if($&&wy(B,t));else if(!F[t]||H[t]){if(!(Fe(e)&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,e)||z.tagNameCheck instanceof Function&&z.tagNameCheck(e))&&(z.attributeNameCheck instanceof RegExp&&wy(z.attributeNameCheck,t)||z.attributeNameCheck instanceof Function&&z.attributeNameCheck(t))||"is"===t&&z.allowCustomizedBuiltInElements&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,n)||z.tagNameCheck instanceof Function&&z.tagNameCheck(n))))return!1}else if(de[t]);else if(wy(L,vy(n,D,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==yy(n,"data:")||!ie[e])if(V&&!wy(P,vy(n,D,"")));else if(n)return!1;return!0},Fe=function(e){return e.indexOf("-")>0},Ue=function(e){let t,n,o,r;Le("beforeSanitizeAttributes",e,null);const{attributes:s}=e;if(!s)return;const a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:F};for(r=s.length;r--;){t=s[r];const{name:i,namespaceURI:l}=t;n="value"===i?t.value:Cy(t.value);const d=n;if(o=Ce(i),a.attrName=o,a.attrValue=n,a.keepAttr=!0,a.forceKeepAttr=void 0,Le("uponSanitizeAttribute",e,a),n=a.attrValue,a.forceKeepAttr)continue;if(!a.keepAttr){Oe(i,e);continue}if(!W&&wy(/\/>/i,n)){Oe(i,e);continue}K&&(n=vy(n,R," "),n=vy(n,A," "),n=vy(n,T," "));const c=Ce(e.nodeName);if(Ie(c,o,n)){if(!te||"id"!==o&&"name"!==o||(Oe(i,e),n="user-content-"+n),C&&"object"==typeof g&&"function"==typeof g.getAttributeType)if(l);else switch(g.getAttributeType(c,o)){case"TrustedHTML":n=C.createHTML(n);break;case"TrustedScriptURL":n=C.createScriptURL(n)}if(n!==d)try{l?e.setAttributeNS(l,i,n):e.setAttribute(i,n)}catch(t){Oe(i,e)}}else Oe(i,e)}Le("afterSanitizeAttributes",e,null)},ze=function e(t){let n;const o=Pe(t);for(Le("beforeSanitizeShadowDOM",t,null);n=o.nextNode();)Le("uponSanitizeShadowNode",n,null),Me(n)||(n.content instanceof a&&e(n.content),Ue(n));Le("afterSanitizeShadowDOM",t,null)};return n.sanitize=function(e){let t,r,s,i,d=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(pe=!e,pe&&(e="\x3c!--\x3e"),"string"!=typeof e&&!De(e)){if("function"!=typeof e.toString)throw xy("toString is not a function");if("string"!=typeof(e=e.toString()))throw xy("dirty is not a string, aborting")}if(!n.isSupported)return e;if(G||_e(d),n.removed=[],"string"==typeof e&&(oe=!1),oe){if(e.nodeName){const t=Ce(e.nodeName);if(!M[t]||j[t])throw xy("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof l)t=Be("\x3c!----\x3e"),r=t.ownerDocument.importNode(e,!0),1===r.nodeType&&"BODY"===r.nodeName||"HTML"===r.nodeName?t=r:t.appendChild(r);else{if(!Q&&!K&&!Y&&-1===e.indexOf("<"))return C&&Z?C.createHTML(e):e;if(t=Be(e),!t)return Q?null:Z?w:""}t&&X&&Te(t.firstChild);const c=Pe(oe?e:t);for(;s=c.nextNode();)Me(s)||(s.content instanceof a&&ze(s.content),Ue(s));if(oe)return e;if(Q){if(J)for(i=_.call(t.ownerDocument);t.firstChild;)i.appendChild(t.firstChild);else i=t;return(F.shadowroot||F.shadowrootmode)&&(i=S.call(o,i,!0)),i}let u=Y?t.outerHTML:t.innerHTML;return Y&&M["!doctype"]&&t.ownerDocument&&t.ownerDocument.doctype&&t.ownerDocument.doctype.name&&wy(Ky,t.ownerDocument.doctype.name)&&(u="<!DOCTYPE "+t.ownerDocument.doctype.name+">\n"+u),K&&(u=vy(u,R," "),u=vy(u,A," "),u=vy(u,T," ")),C&&Z?C.createHTML(u):u},n.setConfig=function(e){_e(e),G=!0},n.clearConfig=function(){we=null,G=!1},n.isValidAttribute=function(e,t,n){we||_e({});const o=Ce(e),r=Ce(t);return Ie(o,r,n)},n.addHook=function(e,t){"function"==typeof t&&(N[e]=N[e]||[],gy(N[e],t))},n.removeHook=function(e){if(N[e])return fy(N[e])},n.removeHooks=function(e){N[e]&&(N[e]=[])},n.removeAllHooks=function(){N={}},n}();const Qy=Pt.each,Jy=Pt.trim,Zy=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],eC={ftp:21,http:80,https:443,mailto:25},tC=["img","video"],nC=(e,t,n)=>{const o=(e=>{try{return decodeURIComponent(e)}catch(t){return unescape(e)}})(t).replace(/\s/g,"");return!e.allow_script_urls&&(!!/((java|vb)script|mhtml):/i.test(o)||!e.allow_html_data_urls&&(/^data:image\//i.test(o)?((e,t)=>C(e)?!e:!C(t)||!H(tC,t))(e.allow_svg_data_urls,n)&&/^data:image\/svg\+xml/i.test(o):/^data:/i.test(o)))};class oC{static parseDataUri(e){let t;const n=decodeURIComponent(e).split(","),o=/data:([^;]+)/.exec(n[0]);return o&&(t=o[1]),{type:t,data:n[1]}}static isDomSafe(e,t,n={}){if(n.allow_script_urls)return!0;{const o=ea.decode(e).replace(/[\s\u0000-\u001F]+/g,"");return!nC(n,o,t)}}static getDocumentBaseUrl(e){var t;let n;return n=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?null!==(t=e.href)&&void 0!==t?t:"":e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/")),n}constructor(e,t={}){this.path="",this.directory="",e=Jy(e),this.settings=t;const n=t.base_uri,o=this;if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(o.source=e);const r=0===e.indexOf("//");if(0!==e.indexOf("/")||r||(e=(n&&n.protocol||"http")+"://mce_host"+e),!/^[\w\-]*:?\/\//.test(e)){const t=n?n.path:new oC(document.location.href).directory;if(""===(null==n?void 0:n.protocol))e="//mce_host"+o.toAbsPath(t,e);else{const r=/([^#?]*)([#?]?.*)/.exec(e);r&&(e=(n&&n.protocol||"http")+"://mce_host"+o.toAbsPath(t,r[1])+r[2])}}e=e.replace(/@@/g,"(mce_at)");const s=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);s&&Qy(Zy,((e,t)=>{let n=s[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n})),n&&(o.protocol||(o.protocol=n.protocol),o.userInfo||(o.userInfo=n.userInfo),o.port||"mce_host"!==o.host||(o.port=n.port),o.host&&"mce_host"!==o.host||(o.host=n.host),o.source=""),r&&(o.protocol="")}setPath(e){const t=/^(.*?)\/?(\w+)?$/.exec(e);t&&(this.path=t[0],this.directory=t[1],this.file=t[2]),this.source="",this.getURI()}toRelative(e){if("./"===e)return e;const t=new oC(e,{base_uri:this});if("mce_host"!==t.host&&this.host!==t.host&&t.host||this.port!==t.port||this.protocol!==t.protocol&&""!==t.protocol)return t.getURI();const n=this.getURI(),o=t.getURI();if(n===o||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===o)return n;let r=this.toRelPath(this.path,t.path);return t.query&&(r+="?"+t.query),t.anchor&&(r+="#"+t.anchor),r}toAbsolute(e,t){const n=new oC(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))}isSameOrigin(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;const t=this.protocol?eC[this.protocol]:null;if(t&&(this.port||t)==(e.port||t))return!0}return!1}toRelPath(e,t){let n,o,r=0,s="";const a=e.substring(0,e.lastIndexOf("/")).split("/"),i=t.split("/");if(a.length>=i.length)for(n=0,o=a.length;n<o;n++)if(n>=i.length||a[n]!==i[n]){r=n+1;break}if(a.length<i.length)for(n=0,o=i.length;n<o;n++)if(n>=a.length||a[n]!==i[n]){r=n+1;break}if(1===r)return t;for(n=0,o=a.length-(r-1);n<o;n++)s+="../";for(n=r-1,o=i.length;n<o;n++)s+=n!==r-1?"/"+i[n]:i[n];return s}toAbsPath(e,t){let n=0;const o=/\/$/.test(t)?"/":"",r=e.split("/"),s=t.split("/"),a=[];Qy(r,(e=>{e&&a.push(e)}));const i=[];for(let e=s.length-1;e>=0;e--)0!==s[e].length&&"."!==s[e]&&(".."!==s[e]?n>0?n--:i.push(s[e]):n++);const l=a.length-n;let d;return d=l<=0?oe(i).join("/"):a.slice(0,l).join("/")+"/"+oe(i).join("/"),0!==d.indexOf("/")&&(d="/"+d),o&&d.lastIndexOf("/")!==d.length-1&&(d+=o),d}getURI(e=!1){let t;return this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source}}const rC=Pt.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),sC="data-mce-type";let aC=0;const iC=(e,t,n,o,r)=>{var s,a,i,l;const d=t.validate,c=n.getSpecialElements();8===e.nodeType&&!t.allow_conditional_comments&&/^\[if/i.test(null!==(s=e.nodeValue)&&void 0!==s?s:"")&&(e.nodeValue=" "+e.nodeValue);const u=null!==(a=null==r?void 0:r.tagName)&&void 0!==a?a:e.nodeName.toLowerCase();if("html"!==o&&n.isValid(o))return void(C(r)&&(r.allowedTags[u]=!0));if(1!==e.nodeType||"body"===u)return;const f=yn(e),g=nn(f,sC),p=en(f,"data-mce-bogus");if(!g&&m(p))return void("all"===p?xo(f):Eo(f));const h=n.getElementRule(u);if(!d||h){if(C(r)&&(r.allowedTags[u]=!0),d&&h&&!g){if(V(null!==(i=h.attributesForced)&&void 0!==i?i:[],(e=>{Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),V(null!==(l=h.attributesDefault)&&void 0!==l?l:[],(e=>{nn(f,e.name)||Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),h.attributesRequired&&!$(h.attributesRequired,(e=>nn(f,e))))return void Eo(f);if(h.removeEmptyAttrs&&(e=>{const t=e.dom.attributes;return null==t||0===t.length})(f))return void Eo(f);h.outputName&&h.outputName!==u&&((e,t)=>{const n=((e,t)=>{const n=bn(t),o=rn(e);return Zt(n,o),n})(e,t);ho(e,n);const o=Mn(e);Co(n,o),xo(e)})(f,h.outputName)}}else Ee(c,u)?xo(f):Eo(f)},lC=(e,t,n,o,r,s)=>"html"!==n&&!ps(o)||!(r in rC&&nC(e,s,o))&&(!e.validate||t.isValid(o,r)||He(r,"data-")||He(r,"aria-")),dC=(e,t)=>e.hasAttribute(sC)&&("id"===t||"class"===t||"style"===t),cC=(e,t)=>e in t.getBoolAttrs(),uC=(e,t,n,o)=>{const{attributes:r}=e;for(let s=r.length-1;s>=0;s--){const a=r[s],i=a.name,l=a.value;lC(t,n,o,e.tagName.toLowerCase(),i,l)||dC(e,i)?cC(i,n)&&e.setAttribute(i,i):e.removeAttribute(i)}},mC=(e,t,n)=>{const o=Xy();return o.addHook("uponSanitizeElement",((o,r)=>{iC(o,e,t,n.track(o),r)})),o.addHook("uponSanitizeAttribute",((o,r)=>{((e,t,n,o,r)=>{const s=e.tagName.toLowerCase(),{attrName:a,attrValue:i}=r;r.keepAttr=lC(t,n,o,s,a,i),r.keepAttr?(r.allowedAttributes[a]=!0,cC(a,n)&&(r.attrValue=a),t.allow_svg_data_urls&&He(i,"data:image/svg+xml")&&(r.forceKeepAttr=!0)):dC(e,a)&&(r.forceKeepAttr=!0)})(o,e,t,n.current(),r)})),o},fC=e=>{const t=["type","href","role","arcrole","title","show","actuate","label","from","to"].map((e=>`xlink:${e}`)),n={IN_PLACE:!0,USE_PROFILES:{html:!0,svg:!0,svgFilters:!0},ALLOWED_ATTR:t};return Xy().sanitize(e,n),e.innerHTML},gC=Pt.makeMap,pC=Pt.extend,hC=(e,t,n,o)=>{const r=e.name,s=r in n&&"title"!==r&&"textarea"!==r,a=t.childNodes;for(let t=0,r=a.length;t<r;t++){const r=a[t],i=new Wg(r.nodeName.toLowerCase(),r.nodeType);if(qo(r)){const e=r.attributes;for(let t=0,n=e.length;t<n;t++){const n=e[t];i.attr(n.name,n.value)}ps(i.name)&&(o(r),i.value=r.innerHTML)}else er(r)?(i.value=r.data,s&&(i.raw=!0)):(or(r)||tr(r)||nr(r))&&(i.value=r.data);ps(i.name)||hC(i,r,n,o),e.append(i)}},bC=(e={},t=ua())=>{const n=qv(),o=qv(),r={validate:!0,root_name:"body",sanitize:!0,...e},s=new DOMParser,a=((e,t)=>{const n=(()=>{let e=[];const t=()=>e[e.length-1];return{track:n=>{hs(n)&&e.push(n);let o=t();return o&&!o.contains(n)&&(e.pop(),o=t()),bs(o)},current:()=>bs(t()),reset:()=>{e=[]}}})();if(e.sanitize){const o=mC(e,t,n),r=(t,r)=>{o.sanitize(t,((e,t)=>{const n={IN_PLACE:!0,ALLOW_UNKNOWN_PROTOCOLS:!0,ALLOWED_TAGS:["#comment","#cdata-section","body"],ALLOWED_ATTR:[]};return n.PARSER_MEDIA_TYPE=t,e.allow_script_urls?n.ALLOWED_URI_REGEXP=/.*/:e.allow_html_data_urls&&(n.ALLOWED_URI_REGEXP=/^(?!(\w+script|mhtml):)/i),n})(e,r)),o.removed=[],n.reset()};return{sanitizeHtmlElement:r,sanitizeNamespaceElement:fC}}return{sanitizeHtmlElement:(o,r)=>{const s=document.createNodeIterator(o,NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_COMMENT|NodeFilter.SHOW_TEXT);let a;for(;a=s.nextNode();){const o=n.track(a);iC(a,e,t,o),qo(a)&&uC(a,e,t,o)}n.reset()},sanitizeNamespaceElement:_}})(r,t),i=n.addFilter,l=n.getFilters,d=n.removeFilter,c=o.addFilter,u=o.getFilters,f=o.removeFilter,g=(e,n)=>{const o=m(n.attr(sC)),r=1===n.type&&!Ee(e,n.name)&&!Bs(t,n)&&!ps(n.name);return 3===n.type||r&&!o},p={schema:t,addAttributeFilter:c,getAttributeFilters:u,removeAttributeFilter:f,addNodeFilter:i,getNodeFilters:l,removeNodeFilter:d,parse:(e,n={})=>{var o;const i=r.validate,d=null!==(o=n.context)&&void 0!==o?o:r.root_name,c=((e,n,o="html")=>{const r="xhtml"===o?"application/xhtml+xml":"text/html",i=Ee(t.getSpecialElements(),n.toLowerCase()),l=i?`<${n}>${e}</${n}>`:e,d="xhtml"===o?`<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>${l}</body></html>`:`<body>${l}</body>`,c=s.parseFromString(d,r).body;return a.sanitizeHtmlElement(c,r),i?c.firstChild:c})(e,d,n.format);ks(t,c);const m=new Wg(d,11);hC(m,c,t.getSpecialElements(),a.sanitizeNamespaceElement),c.innerHTML="";const[f,p]=((e,t,n,o)=>{const r=n.validate,s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),l=da(t),d=/[ \t\r\n]+/g,c=/^[ \t\r\n]+/,u=/[ \t\r\n]+$/,m=e=>{let t=e.parent;for(;C(t);){if(t.name in a)return!0;t=t.parent}return!1},f=n=>n.name in i||Bs(t,n)||ps(n.name)&&n.parent===e,g=(t,n)=>{const r=n?t.prev:t.next;return!C(r)&&!y(t.parent)&&f(t.parent)&&(t.parent!==e||!0===o.isRootContent)};return[e=>{var t;if(3===e.type&&!m(e)){let n=null!==(t=e.value)&&void 0!==t?t:"";n=n.replace(d," "),(((e,t)=>C(e)&&(t(e)||"br"===e.name))(e.prev,f)||g(e,!0))&&(n=n.replace(c,"")),0===n.length?e.remove():e.value=n}},e=>{var i;if(1===e.type){const i=t.getElementRule(e.name);if(r&&i){const r=vb(t,s,a,e);i.paddInEmptyBlock&&r&&(e=>{let n=e;for(;C(n);){if(n.name in l)return vb(t,s,a,n);n=n.parent}return!1})(e)?hb(n,o,f,e):i.removeEmpty&&r?f(e)?e.remove():e.unwrap():i.paddEmpty&&(r||(e=>{var t;return bb(e,"#text")&&(null===(t=null==e?void 0:e.firstChild)||void 0===t?void 0:t.value)===br})(e))&&hb(n,o,f,e)}}else if(3===e.type&&!m(e)){let t=null!==(i=e.value)&&void 0!==i?i:"";(e.next&&f(e.next)||g(e,!1))&&(t=t.replace(u,"")),0===t.length?e.remove():e.value=t}}]})(m,t,r,n),h=[],b=i?e=>((e,n)=>{xb(t,e)&&n.push(e)})(e,h):_,v={nodes:{},attributes:{}},w=e=>fb(l(),u(),e,v);if(((e,t,n)=>{const o=[];for(let n=e,r=n;n;r=n,n=n.walk()){const s=n;V(t,(e=>e(s))),y(s.parent)&&s!==e?n=r:o.push(s)}for(let e=o.length-1;e>=0;e--){const t=o[e];V(n,(e=>e(t)))}})(m,[f,w],[p,b]),h.reverse(),i&&h.length>0)if(n.context){const{pass:e,fail:o}=K(h,(e=>e.parent===m));wb(o,t,m,w),n.invalid=e.length>0}else wb(h,t,m,w);const x=((e,t)=>{var n;const o=null!==(n=t.forced_root_block)&&void 0!==n?n:e.forced_root_block;return!1===o?"":!0===o?"p":o})(r,n);return x&&("body"===m.name||n.isRootContent)&&((e,n)=>{const o=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),s=/^[ \t\r\n]+/,a=/[ \t\r\n]+$/;let i=e.firstChild,l=null;const d=e=>{var t,n;e&&(i=e.firstChild,i&&3===i.type&&(i.value=null===(t=i.value)||void 0===t?void 0:t.replace(s,"")),i=e.lastChild,i&&3===i.type&&(i.value=null===(n=i.value)||void 0===n?void 0:n.replace(a,"")))};if(t.isValidChild(e.name,n.toLowerCase())){for(;i;){const t=i.next;g(o,i)?(l||(l=new Wg(n,1),l.attr(r.forced_root_block_attrs),e.insert(l,i)),l.append(i)):(d(l),l=null),i=t}d(l)}})(m,x),n.invalid||gb(v,n),m}};return ty(p,r),((e,t,n)=>{t.inline_styles&&Vv(e,t,n)})(p,r,t),p},vC=(e,t,n)=>{const o=(e=>Bb(e)?up({validate:!1}).serialize(e):e)(e),r=t(o);if(r.isDefaultPrevented())return r;if(Bb(e)){if(r.content!==o){const t=bC({validate:!1,forced_root_block:!1,...n}).parse(r.content,{context:e.name});return{...r,content:t}}return{...r,content:e}}return r},yC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=((e,t)=>e.dispatch("BeforeGetContent",t))(e,t);return n.isDefaultPrevented()?pl.error(rf(e,{content:"",...n}).content):pl.value(n)}},CC=(e,t,n)=>{if(n.no_events)return t;{const o=vC(t,(t=>rf(e,{...n,content:t})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return o.content}},wC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=vC(t.content,(n=>((e,t)=>e.dispatch("BeforeSetContent",t))(e,{...t,content:n})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return n.isDefaultPrevented()?(of(e,n),pl.error(void 0)):pl.value(n)}},xC=(e,t,n)=>{n.no_events||of(e,{...n,content:t})},EC=(e,t,n)=>({element:e,width:t,rows:n}),_C=(e,t)=>({element:e,cells:t}),kC=(e,t)=>({x:e,y:t}),SC=(e,t)=>tn(e,t).bind(Xe).getOr(1),NC=(e,t,n)=>{const o=e.rows;return!!(o[n]?o[n].cells:[])[t]},RC=e=>X(e,((e,t)=>t.cells.length>e?t.cells.length:e),0),AC=(e,t)=>{const n=e.rows;for(let e=0;e<n.length;e++){const o=n[e].cells;for(let n=0;n<o.length;n++)if(_n(o[n],t))return I.some(kC(n,e))}return I.none()},TC=(e,t,n,o,r)=>{const s=[],a=e.rows;for(let e=n;e<=r;e++){const n=a[e].cells,r=t<o?n.slice(t,o+1):n.slice(o,t+1);s.push(_C(a[e].element,r))}return s},OC=e=>((e,t)=>{const n=fi(e.element),o=bn("tbody");return Co(o,t),vo(n,o),n})(e,(e=>q(e.rows,(e=>{const t=q(e.cells,(e=>{const t=gi(e);return on(t,"colspan"),on(t,"rowspan"),t})),n=fi(e.element);return Co(n,t),n})))(e)),BC=(e,t,n)=>{const o=yn(t.commonAncestorContainer),r=Bp(o,e),s=Y(r,(e=>n.isWrapper(Ht(e)))),a=((e,t)=>J(e,(e=>"li"===Ht(e)&&rm(e,t))).fold(N([]),(t=>(e=>J(e,(e=>"ul"===Ht(e)||"ol"===Ht(e))))(e).map((e=>{const t=bn(Ht(e)),n=ye(fo(e),((e,t)=>He(t,"list-style")));return lo(t,n),[bn("li"),t]})).getOr([]))))(r,t),i=s.concat(a.length?a:(e=>Sr(e)?An(e).filter(kr).fold(N([]),(t=>[e,t])):kr(e)?[e]:[])(o));return q(i,fi)},PC=()=>Sf([]),DC=(e,t)=>((e,t)=>eo(t,"table",T(_n,e)))(e,t[0]).bind((e=>{const n=t[0],o=t[t.length-1],r=(e=>{const t=EC(fi(e),0,[]);return V(Uo(e,"tr"),((e,n)=>{V(Uo(e,"td,th"),((o,r)=>{((e,t,n,o,r)=>{const s=SC(r,"rowspan"),a=SC(r,"colspan"),i=e.rows;for(let e=n;e<n+s;e++){i[e]||(i[e]=_C(gi(o),[]));for(let o=t;o<t+a;o++)i[e].cells[o]=e===n&&o===t?r:fi(r)}})(t,((e,t,n)=>{for(;NC(e,t,n);)t++;return t})(t,r,n),n,e,o)}))})),EC(t.element,RC(t.rows),t.rows)})(e);return((e,t,n)=>AC(e,t).bind((t=>AC(e,n).map((n=>((e,t,n)=>{const o=t.x,r=t.y,s=n.x,a=n.y,i=r<a?TC(e,o,r,s,a):TC(e,o,a,s,r);return EC(e.element,RC(i),i)})(e,t,n))))))(r,n,o).map((e=>Sf([OC(e)])))})).getOrThunk(PC),LC=(e,t,n)=>{const o=Zu(t,e);return o.length>0?DC(e,o):((e,t,n)=>t.length>0&&t[0].collapsed?PC():((e,t,n)=>((e,t)=>{const n=X(t,((e,t)=>(vo(t,e),t)),e);return t.length>0?Sf([n]):n})(yn(t.cloneContents()),BC(e,t,n)))(e,t[0],n))(e,t,n)},MC=(e,t)=>t>=0&&t<e.length&&Xu(e.charAt(t)),IC=e=>Dr(e.innerText),FC=e=>qo(e)?e.outerHTML:er(e)?ea.encodeRaw(e.data,!1):or(e)?"\x3c!--"+e.data+"--\x3e":"",UC=(e,t)=>(((e,t)=>{let n=0;V(e,(e=>{0===e[0]?n++:1===e[0]?(((e,t,n)=>{const o=(e=>{let t;const n=document.createElement("div"),o=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)o.appendChild(t);return o})(t);if(e.hasChildNodes()&&n<e.childNodes.length){const t=e.childNodes[n];e.insertBefore(o,t)}else e.appendChild(o)})(t,e[1],n),n++):2===e[0]&&((e,t)=>{if(e.hasChildNodes()&&t<e.childNodes.length){const n=e.childNodes[t];e.removeChild(n)}})(t,n)}))})(((e,t)=>{const n=e.length+t.length+2,o=new Array(n),r=new Array(n),s=(n,o,r,a,l)=>{const d=i(n,o,r,a);if(null===d||d.start===o&&d.diag===o-a||d.end===n&&d.diag===n-r){let s=n,i=r;for(;s<o||i<a;)s<o&&i<a&&e[s]===t[i]?(l.push([0,e[s]]),++s,++i):o-n>a-r?(l.push([2,e[s]]),++s):(l.push([1,t[i]]),++i)}else{s(n,d.start,r,d.start-d.diag,l);for(let t=d.start;t<d.end;++t)l.push([0,e[t]]);s(d.end,o,d.end-d.diag,a,l)}},a=(n,o,r,s)=>{let a=n;for(;a-o<s&&a<r&&e[a]===t[a-o];)++a;return((e,t,n)=>({start:e,end:t,diag:n}))(n,a,o)},i=(n,s,i,l)=>{const d=s-n,c=l-i;if(0===d||0===c)return null;const u=d-c,m=c+d,f=(m%2==0?m:m+1)/2;let g,p,h,b,v;for(o[1+f]=n,r[1+f]=s+1,g=0;g<=f;++g){for(p=-g;p<=g;p+=2){for(h=p+f,p===-g||p!==g&&o[h-1]<o[h+1]?o[h]=o[h+1]:o[h]=o[h-1]+1,b=o[h],v=b-n+i-p;b<s&&v<l&&e[b]===t[v];)o[h]=++b,++v;if(u%2!=0&&u-g<=p&&p<=u+g&&r[h-u]<=o[h])return a(r[h-u],p+n-i,s,l)}for(p=u-g;p<=u+g;p+=2){for(h=p+f-u,p===u-g||p!==u+g&&r[h+1]<=r[h-1]?r[h]=r[h+1]-1:r[h]=r[h-1],b=r[h]-1,v=b-n+i-p;b>=n&&v>=i&&e[b]===t[v];)r[h]=b--,v--;if(u%2==0&&-g<=p&&p<=g&&r[h]<=o[h+u])return a(r[h],p+n-i,s,l)}}return null},l=[];return s(0,e.length,0,t.length,l),l})(q(ce(t.childNodes),FC),e),t),t),zC=De((()=>document.implementation.createHTMLDocument("undo"))),jC=e=>{const t=e.serializer.getTempAttrs(),n=sp(e.getBody(),t);return(e=>null!==e.querySelector("iframe"))(n)?{type:"fragmented",fragments:Y(q(ce(n.childNodes),k(Dr,FC)),(e=>e.length>0)),content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:Dr(n.innerHTML),bookmark:null,beforeBookmark:null}},HC=(e,t,n)=>{const o=n?t.beforeBookmark:t.bookmark;"fragmented"===t.type?UC(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw",no_selection:!C(o)||!Iu(o)||!o.isFakeCaret}),o&&(e.selection.moveToBookmark(o),e.selection.scrollIntoView())},$C=e=>"fragmented"===e.type?e.fragments.join(""):e.content,qC=e=>{const t=bn("body",zC());return So(t,$C(e)),V(Uo(t,"*[data-mce-bogus]"),Eo),ko(t)},VC=(e,t)=>!(!e||!t)&&(!!((e,t)=>$C(e)===$C(t))(e,t)||((e,t)=>qC(e)===qC(t))(e,t)),WC=e=>0===e.get(),KC=(e,t,n)=>{WC(n)&&(e.typing=t)},YC=(e,t)=>{e.typing&&(KC(e,!1,t),e.add())},GC=e=>({init:{bindEvents:_},undoManager:{beforeChange:(t,n)=>((e,t,n)=>{WC(t)&&n.set(ml(e.selection))})(e,t,n),add:(t,n,o,r,s,a)=>((e,t,n,o,r,s,a)=>{const i=jC(e),l=Pt.extend(s||{},i);if(!WC(o)||e.removed)return null;const d=t.data[n.get()];if(e.dispatch("BeforeAddUndo",{level:l,lastLevel:d,originalEvent:a}).isDefaultPrevented())return null;if(d&&VC(d,l))return null;t.data[n.get()]&&r.get().each((e=>{t.data[n.get()].beforeBookmark=e}));const c=Td(e);if(c&&t.data.length>c){for(let e=0;e<t.data.length-1;e++)t.data[e]=t.data[e+1];t.data.length--,n.set(t.data.length)}l.bookmark=ml(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(l),n.set(t.data.length-1);const u={level:l,lastLevel:d,originalEvent:a};return n.get()>0?(e.setDirty(!0),e.dispatch("AddUndo",u),e.dispatch("change",u)):e.dispatch("AddUndo",u),l})(e,t,n,o,r,s,a),undo:(t,n,o)=>((e,t,n,o)=>{let r;return t.typing&&(t.add(),t.typing=!1,KC(t,!1,n)),o.get()>0&&(o.set(o.get()-1),r=t.data[o.get()],HC(e,r,!0),e.setDirty(!0),e.dispatch("Undo",{level:r})),r})(e,t,n,o),redo:(t,n)=>((e,t,n)=>{let o;return t.get()<n.length-1&&(t.set(t.get()+1),o=n[t.get()],HC(e,o,!1),e.setDirty(!0),e.dispatch("Redo",{level:o})),o})(e,t,n),clear:(t,n)=>((e,t,n)=>{t.data=[],n.set(0),t.typing=!1,e.dispatch("ClearUndos")})(e,t,n),reset:e=>(e=>{e.clear(),e.add()})(e),hasUndo:(t,n)=>((e,t,n)=>n.get()>0||t.typing&&t.data[0]&&!VC(jC(e),t.data[0]))(e,t,n),hasRedo:(e,t)=>((e,t)=>t.get()<e.data.length-1&&!e.typing)(e,t),transact:(e,t,n)=>((e,t,n)=>(YC(e,t),e.beforeChange(),e.ignore(n),e.add()))(e,t,n),ignore:(e,t)=>((e,t)=>{try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}})(e,t),extra:(t,n,o,r)=>((e,t,n,o,r)=>{if(t.transact(o)){const o=t.data[n.get()].bookmark,s=t.data[n.get()-1];HC(e,s,!0),t.transact(r)&&(t.data[n.get()-1].beforeBookmark=o)}})(e,t,n,o,r)},formatter:{match:(t,n,o,r)=>Hb(e,t,n,o,r),matchAll:(t,n)=>((e,t,n)=>{const o=[],r={},s=e.selection.getStart();return e.dom.getParent(s,(s=>{for(let a=0;a<t.length;a++){const i=t[a];!r[i]&&jb(e,s,i,n)&&(r[i]=!0,o.push(i))}}),e.dom.getRoot()),o})(e,t,n),matchNode:(t,n,o,r)=>jb(e,t,n,o,r),canApply:t=>((e,t)=>{const n=e.formatter.get(t),o=e.dom;if(n&&e.selection.isEditable()){const t=e.selection.getStart(),r=Em(o,t);for(let e=n.length-1;e>=0;e--){const t=n[e];if(!Sm(t))return!0;for(let e=r.length-1;e>=0;e--)if(o.is(r[e],t.selector))return!0}}return!1})(e,t),closest:t=>((e,t)=>{const n=t=>_n(t,yn(e.getBody()));return I.from(e.selection.getStart(!0)).bind((o=>Lb(yn(o),(n=>ue(t,(t=>((t,n)=>jb(e,t.dom,n)?I.some(n):I.none())(n,t)))),n))).getOrNull()})(e,t),apply:(t,n,o)=>Iv(e,t,n,o),remove:(t,n,o,r)=>Ov(e,t,n,o,r),toggle:(t,n,o)=>((e,t,n,o)=>{const r=e.formatter.get(t);r&&(!Hb(e,t,n,o)||"toggle"in r[0]&&!r[0].toggle?Iv(e,t,n,o):Ov(e,t,n,o))})(e,t,n,o),formatChanged:(t,n,o,r,s)=>((e,t,n,o,r,s)=>(((e,t,n,o,r,s)=>{const a=t.get();V(n.split(","),(t=>{const n=xe(a,t).getOrThunk((()=>{const e={withSimilar:{state:$a(!1),similar:!0,callbacks:[]},withoutSimilar:{state:$a(!1),similar:!1,callbacks:[]},withVars:[]};return a[t]=e,e})),i=()=>{const n=jv(e);return zv(e,n,t,r,s).isSome()};if(v(s)){const e=r?n.withSimilar:n.withoutSimilar;e.callbacks.push(o),1===e.callbacks.length&&e.state.set(i())}else n.withVars.push({state:$a(i()),similar:r,vars:s,callback:o})})),t.set(a)})(e,t,n,o,r,s),{unbind:()=>((e,t,n)=>{const o=e.get();V(t.split(","),(e=>xe(o,e).each((t=>{o[e]={withSimilar:{...t.withSimilar,callbacks:Y(t.withSimilar.callbacks,(e=>e!==n))},withoutSimilar:{...t.withoutSimilar,callbacks:Y(t.withoutSimilar.callbacks,(e=>e!==n))},withVars:Y(t.withVars,(e=>e.callback!==n))}})))),e.set(o)})(t,n,o)}))(e,t,n,o,r,s)},editor:{getContent:t=>((e,t)=>I.from(e.getBody()).fold(N("tree"===t.format?new Wg("body",11):""),(n=>lp(e,t,n))))(e,t),setContent:(t,n)=>((e,t,n)=>I.from(e.getBody()).map((o=>Bb(t)?((e,t,n,o)=>{pb(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);const r=up({validate:!1},e.schema).serialize(n),s=Dr(Ar(yn(t))?r:Pt.trim(r));return Pb(e,s,o.no_selection),{content:n,html:s}})(e,o,t,n):((e,t,n,o)=>{if(0===(n=Dr(n)).length||/^\s+$/.test(n)){const r='<br data-mce-bogus="1">';"TABLE"===t.nodeName?n="<tr><td>"+r+"</td></tr>":/^(UL|OL)$/.test(t.nodeName)&&(n="<li>"+r+"</li>");const s=Il(e);return e.schema.isValidChild(t.nodeName.toLowerCase(),s.toLowerCase())?(n=r,n=e.dom.createHTML(s,Fl(e),n)):n||(n=r),Pb(e,n,o.no_selection),{content:n,html:n}}{"raw"!==o.format&&(n=up({validate:!1},e.schema).serialize(e.parser.parse(n,{isRootContent:!0,insert:!0})));const r=Ar(yn(t))?n:Pt.trim(n);return Pb(e,r,o.no_selection),{content:r,html:r}}})(e,o,t,n))).getOr({content:t,html:Bb(n.content)?"":n.content}))(e,t,n),insertContent:(t,n)=>Ob(e,t,n),addVisual:t=>((e,t)=>{const n=e.dom,o=C(t)?t:e.getBody();V(n.select("table,a",o),(t=>{switch(t.nodeName){case"TABLE":const o=Ud(e),r=n.getAttrib(t,"border");r&&"0"!==r||!e.hasVisual?n.removeClass(t,o):n.addClass(t,o);break;case"A":if(!n.getAttrib(t,"href")){const o=n.getAttrib(t,"name")||t.id,r=zd(e);o&&e.hasVisual?n.addClass(t,r):n.removeClass(t,r)}}})),e.dispatch("VisualAid",{element:t,hasVisual:e.hasVisual})})(e,t)},selection:{getContent:(t,n)=>((e,t,n={})=>{const o=((e,t)=>({...e,format:t,get:!0,selection:!0,getInner:!0}))(n,t);return yC(e,o).fold(R,(t=>{const n=((e,t)=>{if("text"===t.format)return(e=>I.from(e.selection.getRng()).map((t=>{var n;const o=I.from(e.dom.getParent(t.commonAncestorContainer,e.dom.isBlock)),r=e.getBody(),s=(e=>e.map((e=>e.nodeName)).getOr("div").toLowerCase())(o),a=yn(t.cloneContents());ap(a),ip(a);const i=e.dom.add(r,s,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},a.dom),l=IC(i),d=Dr(null!==(n=i.textContent)&&void 0!==n?n:"");if(e.dom.remove(i),MC(d,0)||MC(d,d.length-1)){const e=o.getOr(r),t=IC(e),n=t.indexOf(l);return-1===n?l:(MC(t,n-1)?" ":"")+l+(MC(t,n+l.length)?" ":"")}return l})).getOr(""))(e);{const n=((e,t)=>{const n=e.selection.getRng(),o=e.dom.create("body"),r=e.selection.getSel(),s=Mg(e,Ju(r)),a=t.contextual?LC(yn(e.getBody()),s,e.schema).dom:n.cloneContents();return a&&o.appendChild(a),e.selection.serializer.serialize(o,t)})(e,t);return"tree"===t.format?n:e.selection.isCollapsed()?"":n}})(e,t);return CC(e,n,t)}))})(e,t,n)},autocompleter:{addDecoration:t=>zg(e,t),removeDecoration:()=>((e,t)=>jg(t).each((t=>{const n=e.selection.getBookmark();Eo(t),e.selection.moveToBookmark(n)})))(e,yn(e.getBody()))},raw:{getModel:()=>I.none()}}),XC=e=>Ee(e.plugins,"rtc"),QC=e=>e.rtcInstance?e.rtcInstance:GC(e),JC=e=>{const t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")},ZC=e=>JC(e).init.bindEvents(),ew=e=>0===e.dom.length?(xo(e),I.none()):I.some(e),tw=(e,t,n,o,r)=>{e.bind((e=>((o?ch:dh)(e.dom,o?e.dom.length:0,r),t.filter(Kt).map((t=>((e,t,n,o,r)=>{const s=e.dom,a=t.dom,i=o?s.length:a.length;o?(uh(s,a,r,!1,!o),n.setStart(a,i)):(uh(a,s,r,!1,!o),n.setEnd(a,i))})(e,t,n,o,r)))))).orThunk((()=>{const e=((e,t)=>e.filter((e=>Jm.isBookmarkNode(e.dom))).bind(t?Pn:Bn))(t,o).or(t).filter(Kt);return e.map((e=>((e,t,n)=>{An(e).each((o=>{const r=e.dom;t&&eh(o,Vi(r,0),n)?dh(r,0,n):!t&&th(o,Vi(r,r.length),n)&&ch(r,r.length,n)}))})(e,o,r)))}))},nw=(e,t,n)=>{if(Ee(e,t)){const o=Y(e[t],(e=>e!==n));0===o.length?delete e[t]:e[t]=o}};const ow=e=>!(!e||!e.ownerDocument)&&kn(yn(e.ownerDocument),yn(e)),rw=(e,t,n,o)=>{let r,s;const{selectorChangedWithUnbind:a}=((e,t)=>{let n,o;const r=(t,n)=>J(n,(n=>e.is(n,t))),s=t=>e.getParents(t,void 0,e.getRoot());return{selectorChangedWithUnbind:(e,a)=>(n||(n={},o={},t.on("NodeChange",(e=>{const t=e.element,a=s(t),i={};ge(n,((e,t)=>{r(t,a).each((n=>{o[t]||(V(e,(e=>{e(!0,{node:n,selector:t,parents:a})})),o[t]=e),i[t]=e}))})),ge(o,((e,n)=>{i[n]||(delete o[n],V(e,(e=>{e(!1,{node:t,selector:n,parents:a})})))}))}))),n[e]||(n[e]=[]),n[e].push(a),r(e,s(t.selection.getStart())).each((()=>{o[e]=n[e]})),{unbind:()=>{nw(n,e,a),nw(o,e,a)}})}})(e,o),i=(e,t)=>((e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,selection:!0,content:t}))(n,t);wC(e,o).each((t=>{const n=((e,t)=>{if("raw"!==t.format){const n=e.selection.getRng(),o=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),r=o?{context:o.nodeName.toLowerCase()}:{},s=e.parser.parse(t.content,{forced_root_block:!1,...r,...t});return up({validate:!1},e.schema).serialize(s)}return t.content})(e,t),o=e.selection.getRng();((e,t,n)=>{const o=I.from(t.firstChild).map(yn),r=I.from(t.lastChild).map(yn);e.deleteContents(),e.insertNode(t);const s=o.bind(Bn).filter(Kt).bind(ew),a=r.bind(Pn).filter(Kt).bind(ew);tw(s,o,e,!0,n),tw(a,r,e,!1,n),e.collapse(!1)})(o,o.createContextualFragment(n),e.schema),e.selection.setRng(o),sg(e,o),xC(e,n,t)}))})(o,e,t),l=e=>{const t=c();t.collapse(!!e),u(t)},d=()=>t.getSelection?t.getSelection():t.document.selection,c=()=>{let n;const a=(e,t,n)=>{try{return t.compareBoundaryPoints(e,n)}catch(e){return-1}},i=t.document;if(C(o.bookmark)&&!Rg(o)){const e=hg(o);if(e.isSome())return e.map((e=>Mg(o,[e])[0])).getOr(i.createRange())}try{const e=d();e&&!$o(e.anchorNode)&&(n=e.rangeCount>0?e.getRangeAt(0):i.createRange(),n=Mg(o,[n])[0])}catch(e){}if(n||(n=i.createRange()),rr(n.startContainer)&&n.collapsed){const t=e.getRoot();n.setStart(t,0),n.setEnd(t,0)}return r&&s&&(0===a(n.START_TO_START,n,r)&&0===a(n.END_TO_END,n,r)?n=s:(r=null,s=null)),n},u=(e,t)=>{if(!(e=>!!e&&ow(e.startContainer)&&ow(e.endContainer))(e))return;const n=d();if(e=o.dispatch("SetSelectionRange",{range:e,forward:t}).range,n){s=e;try{n.removeAllRanges(),n.addRange(e)}catch(e){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),r=n.rangeCount>0?n.getRangeAt(0):null}if(!e.collapsed&&e.startContainer===e.endContainer&&(null==n?void 0:n.setBaseAndExtent)&&e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()){const t=e.startContainer.childNodes[e.startOffset];t&&"IMG"===t.nodeName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(t,0,t,1))}o.dispatch("AfterSetSelectionRange",{range:e,forward:t})},m=()=>{const t=d(),n=null==t?void 0:t.anchorNode,o=null==t?void 0:t.focusNode;if(!t||!n||!o||$o(n)||$o(o))return!0;const r=e.createRng(),s=e.createRng();try{r.setStart(n,t.anchorOffset),r.collapse(!0),s.setStart(o,t.focusOffset),s.collapse(!0)}catch(e){return!0}return r.compareBoundaryPoints(r.START_TO_START,s)<=0},f={dom:e,win:t,serializer:n,editor:o,expand:(t={type:"word"})=>u(Uf(e).expand(c(),t)),collapse:l,setCursorLocation:(t,n)=>{const r=e.createRng();C(t)&&C(n)?(r.setStart(t,n),r.setEnd(t,n),u(r),l(!1)):(sm(e,r,o.getBody(),!0),u(r))},getContent:e=>((e,t={})=>((e,t,n)=>JC(e).selection.getContent(t,n))(e,t.format?t.format:"html",t))(o,e),setContent:i,getBookmark:(e,t)=>g.getBookmark(e,t),moveToBookmark:e=>g.moveToBookmark(e),select:(t,n)=>(((e,t,n)=>I.from(t).bind((t=>I.from(t.parentNode).map((o=>{const r=e.nodeIndex(t),s=e.createRng();return s.setStart(o,r),s.setEnd(o,r+1),n&&(sm(e,s,t,!0),sm(e,s,t,!1)),s})))))(e,t,n).each(u),t),isCollapsed:()=>{const e=c(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isEditable:()=>{const t=c(),n=o.getBody().querySelectorAll('[data-mce-selected="1"]');return n.length>0?ne(n,(t=>e.isEditable(t.parentElement))):Og(e,t)},isForward:m,setNode:t=>(i(e.getOuterHTML(t)),t),getNode:()=>((e,t)=>{if(!t)return e;let n=t.startContainer,o=t.endContainer;const r=t.startOffset,s=t.endOffset;let a=t.commonAncestorContainer;t.collapsed||(n===o&&s-r<2&&n.hasChildNodes()&&(a=n.childNodes[r]),er(n)&&er(o)&&(n=n.length===r?Lg(n.nextSibling,!0):n.parentNode,o=0===s?Lg(o.previousSibling,!1):o.parentNode,n&&n===o&&(a=n)));const i=er(a)?a.parentNode:a;return Vo(i)?i:e})(o.getBody(),c()),getSel:d,setRng:u,getRng:c,getStart:e=>Pg(o.getBody(),c(),e),getEnd:e=>Dg(o.getBody(),c(),e),getSelectedBlocks:(t,n)=>((e,t,n,o)=>{const r=[],s=e.getRoot(),a=e.getParent(n||Pg(s,t,t.collapsed),e.isBlock),i=e.getParent(o||Dg(s,t,t.collapsed),e.isBlock);if(a&&a!==s&&r.push(a),a&&i&&a!==i){let t;const n=new jo(a,s);for(;(t=n.next())&&t!==i;)e.isBlock(t)&&r.push(t)}return i&&a!==i&&i!==s&&r.push(i),r})(e,c(),t,n),normalize:()=>{const t=c(),n=d();if(!(Ju(n).length>1)&&am(o)){const n=Mf(e,t);return n.each((e=>{u(e,m())})),n.getOr(t)}return t},selectorChanged:(e,t)=>(a(e,t),f),selectorChangedWithUnbind:a,getScrollContainer:()=>{let t,n=e.getRoot();for(;n&&"BODY"!==n.nodeName;){if(n.scrollHeight>n.clientHeight){t=n;break}n=n.parentNode}return t},scrollIntoView:(e,t)=>{C(e)?((e,t,n)=>{(e.inline?ng:rg)(e,t,n)})(o,e,t):sg(o,c(),t)},placeCaretAt:(e,t)=>u(Rf(e,t,o.getDoc())),getBoundingClientRect:()=>{const e=c();return e.collapsed?Vi.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:()=>{t=r=s=null,p.destroy()}},g=Jm(f),p=mf(f,o);return f.bookmarkManager=g,f.controlSelection=p,f},sw=(e,t,n)=>{-1===Pt.inArray(t,n)&&(e.addAttributeFilter(n,((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.push(n))},aw=(e,t)=>{const n=["data-mce-selected"],o={entity_encoding:"named",remove_trailing_brs:!0,pad_empty_with_br:!1,...e},r=t&&t.dom?t.dom:za.DOM,s=t&&t.schema?t.schema:ua(o),a=bC(o,s);return((e,t,n)=>{e.addAttributeFilter("data-mce-tabindex",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];o.attr("tabindex",o.attr("data-mce-tabindex")),o.attr(t,null)}})),e.addAttributeFilter("src,href,style",((e,o)=>{const r="data-mce-"+o,s=t.url_converter,a=t.url_converter_scope;let i=e.length;for(;i--;){const t=e[i];let l=t.attr(r);void 0!==l?(t.attr(o,l.length>0?l:null),t.attr(r,null)):(l=t.attr(o),"style"===o?l=n.serializeStyle(n.parseStyle(l),t.name):s&&(l=s.call(a,l,o,t.name)),t.attr(o,l.length>0?l:null))}})),e.addAttributeFilter("class",(e=>{let t=e.length;for(;t--;){const n=e[t];let o=n.attr("class");o&&(o=o.replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",o.length>0?o:null))}})),e.addAttributeFilter("data-mce-type",((e,t,n)=>{let o=e.length;for(;o--;){const t=e[o];if("bookmark"===t.attr("data-mce-type")&&!n.cleanup){const e=I.from(t.firstChild).exists((e=>{var t;return!Pr(null!==(t=e.value)&&void 0!==t?t:"")}));e?t.unwrap():t.remove()}}})),e.addNodeFilter("noscript",(e=>{var t;let n=e.length;for(;n--;){const o=e[n].firstChild;o&&(o.value=ea.decode(null!==(t=o.value)&&void 0!==t?t:""))}})),e.addNodeFilter("script,style",((e,n)=>{var o;const r=e=>e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"");let s=e.length;for(;s--;){const a=e[s],i=a.firstChild,l=null!==(o=null==i?void 0:i.value)&&void 0!==o?o:"";if("script"===n){const e=a.attr("type");e&&a.attr("type","mce-no/type"===e?null:e.replace(/^mce\-/,"")),"xhtml"===t.element_format&&i&&l.length>0&&(i.value="// <![CDATA[\n"+r(l)+"\n// ]]>")}else"xhtml"===t.element_format&&i&&l.length>0&&(i.value="\x3c!--\n"+r(l)+"\n--\x3e")}})),e.addNodeFilter("#comment",(e=>{let o=e.length;for(;o--;){const r=e[o],s=r.value;t.preserve_cdata&&0===(null==s?void 0:s.indexOf("[CDATA["))?(r.name="#cdata",r.type=4,r.value=n.decode(s.replace(/^\[CDATA\[|\]\]$/g,""))):0===(null==s?void 0:s.indexOf("mce:protected "))&&(r.name="#text",r.type=3,r.raw=!0,r.value=unescape(s).substr(14))}})),e.addNodeFilter("xml:namespace,input",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];7===o.type?o.remove():1===o.type&&("input"!==t||o.attr("type")||o.attr("type","text"))}})),e.addAttributeFilter("data-mce-type",(t=>{V(t,(t=>{"format-caret"===t.attr("data-mce-type")&&(t.isEmpty(e.schema.getNonEmptyElements())?t.remove():t.unwrap())}))})),e.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-block,data-mce-type,data-mce-resize,data-mce-placeholder",((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.remove_trailing_brs&&Wv(t,e,e.schema)})(a,o,r),{schema:s,addNodeFilter:a.addNodeFilter,addAttributeFilter:a.addAttributeFilter,serialize:(e,n={})=>{const i={format:"html",...n},l=((e,t,n)=>((e,t)=>C(e)&&e.hasEventListeners("PreProcess")&&!t.no_events)(e,n)?((e,t,n)=>{let o;const r=e.dom;let s=t.cloneNode(!0);const a=document.implementation;if(a.createHTMLDocument){const e=a.createHTMLDocument("");Pt.each("BODY"===s.nodeName?s.childNodes:[s],(t=>{e.body.appendChild(e.importNode(t,!0))})),s="BODY"!==s.nodeName?e.body.firstChild:e.body,o=r.doc,r.doc=e}return((e,t)=>{e.dispatch("PreProcess",t)})(e,{...n,node:s}),o&&(r.doc=o),s})(e,t,n):t)(t,e,i),d=((e,t,n)=>{const o=Dr(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||Ar(yn(t))?o:Pt.trim(o)})(r,l,i),c=((e,t,n)=>{const o=n.selection?{forced_root_block:!1,...n}:n,r=e.parse(t,o);return(e=>{const t=e=>"br"===(null==e?void 0:e.name),n=e.lastChild;if(t(n)){const e=n.prev;t(e)&&(n.remove(),e.remove())}})(r),r})(a,d,i);return"tree"===i.format?c:((e,t,n,o,r)=>{const s=((e,t,n)=>up(e,t).serialize(n))(t,n,o);return((e,t,n)=>{if(!t.no_events&&e){const o=((e,t)=>e.dispatch("PostProcess",t))(e,{...t,content:n});return o.content}return n})(e,r,s)})(t,o,s,c,i)},addRules:s.addValidElements,setRules:s.setValidElements,addTempAttr:T(sw,a,n),getTempAttrs:N(n),getNodeFilters:a.getNodeFilters,getAttributeFilters:a.getAttributeFilters,removeNodeFilter:a.removeNodeFilter,removeAttributeFilter:a.removeAttributeFilter}},iw=(e,t)=>{const n=aw(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters,removeNodeFilter:n.removeNodeFilter,removeAttributeFilter:n.removeAttributeFilter}},lw=(e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,content:t}))(n,t);return wC(e,o).map((t=>{const n=((e,t,n)=>QC(e).editor.setContent(t,n))(e,t.content,t);return xC(e,n.html,t),n.content})).getOr(t)},dw="autoresize_on_init,content_editable_state,padd_empty_with_br,block_elements,boolean_attributes,editor_deselector,editor_selector,elements,file_browser_callback_types,filepicker_validator_handler,force_hex_style_colors,force_p_newlines,gecko_spellcheck,images_dataimg_filter,media_scripts,mode,move_caret_before_on_enter_elements,non_empty_elements,self_closing_elements,short_ended_elements,special,spellchecker_select_languages,spellchecker_whitelist,tab_focus,tabfocus_elements,table_responsive_width,text_block_elements,text_inline_elements,toolbar_drawer,types,validate,whitespace_elements,paste_enable_default_filters,paste_filter_drop,paste_word_valid_elements,paste_retain_style_properties,paste_convert_word_fake_lists".split(","),cw="template_cdate_classes,template_mdate_classes,template_selected_content_classes,template_preview_replace_values,template_replace_values,templates,template_cdate_format,template_mdate_format".split(","),uw="bbcode,colorpicker,contextmenu,fullpage,legacyoutput,spellchecker,textcolor".split(","),mw=[{name:"template",replacedWith:"Advanced Template"},{name:"rtc"}],fw=(e,t)=>{const n=Y(t,(t=>Ee(e,t)));return ae(n)},gw=e=>{const t=fw(e,dw),n=e.forced_root_block;return!1!==n&&""!==n||t.push("forced_root_block (false only)"),ae(t)},pw=e=>fw(e,cw),hw=(e,t)=>{const n=Pt.makeMap(e.plugins," "),o=Y(t,(e=>Ee(n,e)));return ae(o)},bw=e=>hw(e,uw),vw=e=>hw(e,mw.map((e=>e.name))),yw=e=>J(mw,(t=>t.name===e)).fold((()=>e),(t=>t.replacedWith?`${e}, replaced by ${t.replacedWith}`:e)),Cw=za.DOM,ww=e=>I.from(e).each((e=>e.destroy())),xw=(()=>{const e={};return{add:(t,n)=>{e[t]=n},get:t=>e[t]?e[t]:{icons:{}},has:t=>Ee(e,t)}})(),Ew=Ya.ModelManager,_w=(e,t)=>t.dom[e],kw=(e,t)=>parseInt(co(t,e),10),Sw=T(_w,"clientWidth"),Nw=T(_w,"clientHeight"),Rw=T(kw,"margin-top"),Aw=T(kw,"margin-left"),Tw=e=>{const t=[],n=()=>{const t=e.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a NotificationManager implementation.")};return{open:e,close:e,getArgs:e}})()},o=()=>I.from(t[0]),r=()=>{V(t,(e=>{e.reposition()}))},s=e=>{Z(t,(t=>t===e)).each((e=>{t.splice(e,1)}))},a=(a,i=!0)=>e.removed||!(e=>{return(t=e.inline?e.getBody():e.getContentAreaContainer(),I.from(t).map(yn)).map(Gn).getOr(!1);var t})(e)?{}:(i&&e.dispatch("BeforeOpenNotification",{notification:a}),J(t,(e=>{return t=n().getArgs(e),o=a,!(t.type!==o.type||t.text!==o.text||t.progressBar||t.timeout||o.progressBar||o.timeout);var t,o})).getOrThunk((()=>{e.editorManager.setActive(e);const i=n().open(a,(()=>{s(i),r(),Ag(e)&&o().fold((()=>e.focus()),(e=>ag(yn(e.getEl()))))}));return(e=>{t.push(e)})(i),r(),e.dispatch("OpenNotification",{notification:{...i}}),i}))),i=N(t);return(e=>{e.on("SkinLoaded",(()=>{const t=gd(e);t&&a({text:t,type:"warning",timeout:0},!1),r()})),e.on("show ResizeEditor ResizeWindow NodeChange",(()=>{requestAnimationFrame(r)})),e.on("remove",(()=>{V(t.slice(),(e=>{n().close(e)}))}))})(e),{open:a,close:()=>{o().each((e=>{n().close(e),s(e),r()}))},getNotifications:i}},Ow=Ya.PluginManager,Bw=Ya.ThemeManager,Pw=e=>{let t=[];const n=()=>{const t=e.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a WindowManager implementation.")};return{open:e,openUrl:e,alert:e,confirm:e,close:e}})()},o=(e,t)=>(...n)=>t?t.apply(e,n):void 0,r=n=>{(t=>{e.dispatch("CloseWindow",{dialog:t})})(n),t=Y(t,(e=>e!==n)),0===t.length&&e.focus()},s=n=>{e.editorManager.setActive(e),pg(e),e.ui.show();const o=n();return(n=>{t.push(n),(t=>{e.dispatch("OpenWindow",{dialog:t})})(n)})(o),o};return e.on("remove",(()=>{V(t,(e=>{n().close(e)}))})),{open:(e,t)=>s((()=>n().open(e,t,r))),openUrl:e=>s((()=>n().openUrl(e,r))),alert:(e,t,r)=>{const s=n();s.alert(e,o(r||s,t))},confirm:(e,t,r)=>{const s=n();s.confirm(e,o(r||s,t))},close:()=>{I.from(t[t.length-1]).each((e=>{n().close(e),r(e)}))}}},Dw=(e,t)=>{e.notificationManager.open({type:"error",text:t})},Lw=(e,t)=>{e._skinLoaded?Dw(e,t):e.on("SkinLoaded",(()=>{Dw(e,t)}))},Mw=(e,t,n)=>{ef(e,t,{message:n}),console.error(n)},Iw=(e,t,n)=>n?`Failed to load ${e}: ${n} from url ${t}`:`Failed to load ${e} url: ${t}`,Fw=(e,...t)=>{const n=window.console;n&&(n.error?n.error(e,...t):n.log(e,...t))},Uw=e=>"content/"+e+"/content.css",zw=(e,t)=>{const n=e.editorManager.baseURL+"/skins/content",o=`content${e.editorManager.suffix}.css`;return q(t,(t=>(e=>tinymce.Resource.has(Uw(e)))(t)?t:(e=>/^[a-z0-9\-]+$/i.test(e))(t)&&!e.inline?`${n}/${t}/${o}`:e.documentBaseURI.toAbsolute(t)))},jw=(e,t)=>{const n={};return{findAll:(o,r=M)=>{const s=Y((e=>e?ce(e.getElementsByTagName("img")):[])(o),(t=>{const n=t.src;return!t.hasAttribute("data-mce-bogus")&&!t.hasAttribute("data-mce-placeholder")&&!(!n||n===At.transparentSrc)&&(He(n,"blob:")?!e.isUploaded(n)&&r(t):!!He(n,"data:")&&r(t))})),a=q(s,(e=>{const o=e.src;if(Ee(n,o))return n[o].then((t=>m(t)?t:{image:e,blobInfo:t.blobInfo}));{const r=((e,t)=>{const n=()=>Promise.reject("Invalid data URI");if(He(t,"blob:")){const s=e.getByUri(t);return C(s)?Promise.resolve(s):(o=t,He(o,"blob:")?(e=>fetch(e).then((e=>e.ok?e.blob():Promise.reject())).catch((()=>Promise.reject({message:`Cannot convert ${e} to Blob. Resource might not exist or is inaccessible.`,uriType:"blob"}))))(o):He(o,"data:")?(r=o,new Promise(((e,t)=>{Kv(r).bind((({type:e,data:t,base64Encoded:n})=>Yv(e,t,n))).fold((()=>t("Invalid data URI")),e)}))):Promise.reject("Unknown URI format")).then((t=>Gv(t).then((o=>Qv(o,!1,(n=>I.some(Jv(e,t,n)))).getOrThunk(n)))))}var o,r;return He(t,"data:")?Zv(e,t).fold(n,(e=>Promise.resolve(e))):Promise.reject("Unknown image data format")})(t,o).then((t=>(delete n[o],{image:e,blobInfo:t}))).catch((e=>(delete n[o],e)));return n[o]=r,r}}));return Promise.all(a)}}},Hw=()=>{let e={};const t=(e,t)=>({status:e,resultUri:t}),n=t=>t in e;return{hasBlobUri:n,getResultUri:t=>{const n=e[t];return n?n.resultUri:null},isPending:t=>!!n(t)&&1===e[t].status,isUploaded:t=>!!n(t)&&2===e[t].status,markPending:n=>{e[n]=t(1,null)},markUploaded:(n,o)=>{e[n]=t(2,o)},removeFailed:t=>{delete e[t]},destroy:()=>{e={}}}};let $w=0;const qw=(e,t)=>{const n={},o=(e,n)=>new Promise(((o,r)=>{const s=new XMLHttpRequest;s.open("POST",t.url),s.withCredentials=t.credentials,s.upload.onprogress=e=>{n(e.loaded/e.total*100)},s.onerror=()=>{r("Image upload failed due to a XHR Transport error. Code: "+s.status)},s.onload=()=>{if(s.status<200||s.status>=300)return void r("HTTP Error: "+s.status);const e=JSON.parse(s.responseText);var n,a;e&&m(e.location)?o((n=t.basePath,a=e.location,n?n.replace(/\/$/,"")+"/"+a.replace(/^\//,""):a)):r("Invalid JSON: "+s.responseText)};const a=new FormData;a.append("file",e.blob(),e.filename()),s.send(a)})),r=w(t.handler)?t.handler:o,s=(e,t)=>({url:t,blobInfo:e,status:!0}),a=(e,t)=>({url:"",blobInfo:e,status:!1,error:t}),i=(e,t)=>{Pt.each(n[e],(e=>{e(t)})),delete n[e]};return{upload:(l,d)=>t.url||r!==o?((t,o)=>(t=Pt.grep(t,(t=>!e.isUploaded(t.blobUri()))),Promise.all(Pt.map(t,(t=>e.isPending(t.blobUri())?(e=>{const t=e.blobUri();return new Promise((e=>{n[t]=n[t]||[],n[t].push(e)}))})(t):((t,n,o)=>(e.markPending(t.blobUri()),new Promise((r=>{let l,d;try{const c=()=>{l&&(l.close(),d=_)},u=n=>{c(),e.markUploaded(t.blobUri(),n),i(t.blobUri(),s(t,n)),r(s(t,n))},f=n=>{c(),e.removeFailed(t.blobUri()),i(t.blobUri(),a(t,n)),r(a(t,n))};d=e=>{e<0||e>100||I.from(l).orThunk((()=>I.from(o).map(P))).each((t=>{l=t,t.progressBar.value(e)}))},n(t,d).then(u,(e=>{f(m(e)?{message:e}:e)}))}catch(e){r(a(t,e))}}))))(t,r,o))))))(l,d):new Promise((e=>{e([])}))}},Vw=e=>()=>e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0}),Ww=(e,t)=>qw(t,{url:Gl(e),basePath:Xl(e),credentials:Ql(e),handler:Jl(e)}),Kw=e=>{const t=(()=>{let e=[];const t=e=>{if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");const t=e.id||"blobid"+$w+++(()=>{const e=()=>Math.round(4294967295*Math.random()).toString(36);return"s"+(new Date).getTime().toString(36)+e()+e()+e()})(),n=e.name||t,o=e.blob;var r;return{id:N(t),name:N(n),filename:N(e.filename||n+"."+(r=o.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.toLowerCase()]||"dat")),blob:N(o),base64:N(e.base64),blobUri:N(e.blobUri||URL.createObjectURL(o)),uri:N(e.uri)}},n=t=>J(e,t).getOrUndefined(),o=e=>n((t=>t.id()===e));return{create:(e,n,o,r,s)=>{if(m(e))return t({id:e,name:r,filename:s,blob:n,base64:o});if(f(e))return t(e);throw new Error("Unknown input type")},add:t=>{o(t.id())||e.push(t)},get:o,getByUri:e=>n((t=>t.blobUri()===e)),getByData:(e,t)=>n((n=>n.base64()===e&&n.blob().type===t)),findFirst:n,removeByUri:t=>{e=Y(e,(e=>e.blobUri()!==t||(URL.revokeObjectURL(e.blobUri()),!1)))},destroy:()=>{V(e,(e=>{URL.revokeObjectURL(e.blobUri())})),e=[]}}})();let n,o;const r=Hw(),s=[],a=t=>n=>e.selection?t(n):[],i=(e,t,n)=>{let o=0;do{o=e.indexOf(t,o),-1!==o&&(e=e.substring(0,o)+n+e.substr(o+t.length),o+=n.length-t.length+1)}while(-1!==o);return e},l=(e,t,n)=>{const o=`src="${n}"${n===At.transparentSrc?' data-mce-placeholder="1"':""}`;return e=i(e,`src="${t}"`,o),i(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},d=(t,n)=>{V(e.undoManager.data,(e=>{"fragmented"===e.type?e.fragments=q(e.fragments,(e=>l(e,t,n))):e.content=l(e.content,t,n)}))},c=()=>(n||(n=Ww(e,r)),p().then(a((o=>{const r=q(o,(e=>e.blobInfo));return n.upload(r,Vw(e)).then(a((n=>{const r=[];let s=!1;const a=q(n,((n,a)=>{const{blobInfo:i,image:l}=o[a];let c=!1;return n.status&&Wl(e)?(n.url&&!je(l.src,n.url)&&(s=!0),t.removeByUri(l.src),XC(e)||((t,n)=>{const o=e.convertURL(n,"src");var r;d(t.src,n),Zt(yn(t),{src:Vl(e)?(r=n,r+(-1===r.indexOf("?")?"?":"&")+(new Date).getTime()):n,"data-mce-src":o})})(l,n.url)):n.error&&(n.error.remove&&(d(l.src,At.transparentSrc),r.push(l),c=!0),((e,t)=>{Lw(e,Ka.translate(["Failed to upload image: {0}",t]))})(e,n.error.message)),{element:l,status:n.status,uploadUri:n.url,blobInfo:i,removed:c}}));return r.length>0&&!XC(e)?e.undoManager.transact((()=>{V(_o(r),(n=>{const o=An(n);xo(n),o.each((e=>t=>{((e,t)=>e.dom.isEmpty(t.dom)&&C(e.schema.getTextBlockElements()[Ht(t)]))(e,t)&&vo(t,hn('<br data-mce-bogus="1" />'))})(e)),t.removeByUri(n.dom.src)}))})):s&&e.undoManager.dispatchChange(),a})))})))),u=()=>ql(e)?c():Promise.resolve([]),g=e=>ne(s,(t=>t(e))),p=()=>(o||(o=jw(r,t)),o.findAll(e.getBody(),g).then(a((t=>{const n=Y(t,(t=>m(t)?(Lw(e,t),!1):"blob"!==t.uriType));return XC(e)||V(n,(e=>{d(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")})),n})))),h=n=>n.replace(/src="(blob:[^"]+)"/g,((n,o)=>{const s=r.getResultUri(o);if(s)return'src="'+s+'"';let a=t.getByUri(o);return a||(a=X(e.editorManager.get(),((e,t)=>e||t.editorUpload&&t.editorUpload.blobCache.getByUri(o)),void 0)),a?'src="data:'+a.blob().type+";base64,"+a.base64()+'"':n}));return e.on("SetContent",(()=>{ql(e)?u():p()})),e.on("RawSaveContent",(e=>{e.content=h(e.content)})),e.on("GetContent",(e=>{e.source_view||"raw"===e.format||"tree"===e.format||(e.content=h(e.content))})),e.on("PostRender",(()=>{e.parser.addNodeFilter("img",(e=>{V(e,(e=>{const n=e.attr("src");if(!n||t.getByUri(n))return;const o=r.getResultUri(n);o&&e.attr("src",o)}))}))})),{blobCache:t,addFilter:e=>{s.push(e)},uploadImages:c,uploadImagesAuto:u,scanForImages:p,destroy:()=>{t.destroy(),r.destroy(),o=n=null}}},Yw={remove_similar:!0,inherit:!1},Gw={selector:"td,th",...Yw},Xw={tablecellbackgroundcolor:{styles:{backgroundColor:"%value"},...Gw},tablecellverticalalign:{styles:{"vertical-align":"%value"},...Gw},tablecellbordercolor:{styles:{borderColor:"%value"},...Gw},tablecellclass:{classes:["%value"],...Gw},tableclass:{selector:"table",classes:["%value"],...Yw},tablecellborderstyle:{styles:{borderStyle:"%value"},...Gw},tablecellborderwidth:{styles:{borderWidth:"%value"},...Gw}},Qw=N(Xw),Jw=Pt.each,Zw=za.DOM,ex=e=>C(e)&&f(e),tx=(e,t)=>{const n=t&&t.schema||ua({}),o=e=>{const t=m(e)?{name:e,classes:[],attrs:{}}:e,n=Zw.create(t.name);return((e,t)=>{t.classes.length>0&&Zw.addClass(e,t.classes.join(" ")),Zw.setAttribs(e,t.attrs)})(n,t),n},r=(e,t,s)=>{let a;const i=t[0],l=ex(i)?i.name:void 0,d=((e,t)=>{const o=n.getElementRule(e.nodeName.toLowerCase()),r=null==o?void 0:o.parentsRequired;return!(!r||!r.length)&&(t&&H(r,t)?t:r[0])})(e,l);if(d)l===d?(a=i,t=t.slice(1)):a=d;else if(i)a=i,t=t.slice(1);else if(!s)return e;const c=a?o(a):Zw.create("div");c.appendChild(e),s&&Pt.each(s,(t=>{const n=o(t);c.insertBefore(n,e)}));const u=ex(a)?a.siblings:void 0;return r(c,t,u)},s=Zw.create("div");if(e.length>0){const t=e[0],n=o(t),a=ex(t)?t.siblings:void 0;s.appendChild(r(n,e.slice(1),a))}return s},nx=e=>{let t="div";const n={name:t,classes:[],attrs:{},selector:e=Pt.trim(e)};return"*"!==e&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,((e,t,o,r,s)=>{switch(t){case"#":n.attrs.id=o;break;case".":n.classes.push(o);break;case":":-1!==Pt.inArray("checked disabled enabled read-only required".split(" "),o)&&(n.attrs[o]=o)}if("["===r){const e=s.match(/([\w\-]+)(?:\=\"([^\"]+))?/);e&&(n.attrs[e[1]]=e[2])}return""}))),n.name=t||"div",n},ox=(e,t)=>{let n="",o=wd(e);if(""===o)return"";const r=e=>m(e)?e.replace(/%(\w+)/g,""):"",s=(t,n)=>Zw.getStyle(null!=n?n:e.getBody(),t,!0);if(m(t)){const n=e.formatter.get(t);if(!n)return"";t=n[0]}if("preview"in t){const e=t.preview;if(!1===e)return"";o=e||o}let a,i=t.block||t.inline||"span";const l=(d=t.selector,m(d)?(d=(d=d.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Pt.map(d.split(/(?:>|\s+(?![^\[\]]+\]))/),(e=>{const t=Pt.map(e.split(/(?:~\+|~|\+)/),nx),n=t.pop();return t.length&&(n.siblings=t),n})).reverse()):[]);var d;l.length>0?(l[0].name||(l[0].name=i),i=t.selector,a=tx(l,e)):a=tx([i],e);const c=Zw.select(i,a)[0]||a.firstChild;Jw(t.styles,((e,t)=>{const n=r(e);n&&Zw.setStyle(c,t,n)})),Jw(t.attributes,((e,t)=>{const n=r(e);n&&Zw.setAttrib(c,t,n)})),Jw(t.classes,(e=>{const t=r(e);Zw.hasClass(c,t)||Zw.addClass(c,t)})),e.dispatch("PreviewFormats"),Zw.setStyles(a,{position:"absolute",left:-65535}),e.getBody().appendChild(a);const u=s("fontSize"),f=/px$/.test(u)?parseInt(u,10):0;return Jw(o.split(" "),(e=>{let t=s(e,c);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=s(e),"#ffffff"===Ca(t).toLowerCase())||"color"===e&&"#000000"===Ca(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===f)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*f+"px"}"border"===e&&t&&(n+="padding:0 2px;"),n+=e+":"+t+";"}})),e.dispatch("AfterPreviewFormats"),Zw.remove(a),n},rx=e=>{const t=(e=>{const t={},n=(e,o)=>{e&&(m(e)?(p(o)||(o=[o]),V(o,(e=>{v(e.deep)&&(e.deep=!Sm(e)),v(e.split)&&(e.split=!Sm(e)||Nm(e)),v(e.remove)&&Sm(e)&&!Nm(e)&&(e.remove="none"),Sm(e)&&Nm(e)&&(e.mixed=!0,e.block_expand=!0),m(e.classes)&&(e.classes=e.classes.split(/\s+/))})),t[e]=o):ge(e,((e,t)=>{n(t,e)})))};return n((e=>{const t=e.dom,n=e.schema.type,o={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"left"},inherit:!1,preview:!1},{selector:"img,audio,video",collapsed:!1,styles:{float:"left"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginLeft:"0px",marginRight:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"},{selector:".mce-preview-object",ceFalseOverride:!0,styles:{display:"table",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{marginLeft:"auto",marginRight:"auto"},preview:!1}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{float:"right"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginRight:"0px",marginLeft:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"right"},preview:!1}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"justify"},inherit:!1,preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:(()=>{const e={inline:"span",styles:{textDecoration:"line-through"},exact:!0},t={inline:"strike",remove:"all",preserve_attributes:["class","style"]},o={inline:"s",remove:"all",preserve_attributes:["class","style"]};return"html4"!==n?[o,e,t]:[e,o,t]})(),forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{class:"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:(e,t,n)=>qo(e)&&e.hasAttribute("href"),onformat:(e,n,o)=>{Pt.each(o,((n,o)=>{t.setAttrib(e,o,n)}))}},lang:{inline:"span",clear_child_styles:!0,remove_similar:!0,attributes:{lang:"%value","data-mce-lang":e=>{var t;return null!==(t=null==e?void 0:e.customValue)&&void 0!==t?t:null}}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins,small",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Pt.each("p h1 h2 h3 h4 h5 h6 div address pre dt dd samp".split(/\s/),(e=>{o[e]={block:e,remove:"all"}})),o})(e)),n(Qw()),n(Cd(e)),{get:e=>C(e)?t[e]:t,has:e=>Ee(t,e),register:n,unregister:e=>(e&&t[e]&&delete t[e],t)}})(e),n=$a({});return(e=>{e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(let t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])})(e),(e=>{e.on("mouseup keydown",(t=>{var n;((e,t,n)=>{const o=e.selection,r=e.getBody();Kb(e,null,n),8!==t&&46!==t||!o.isCollapsed()||o.getStart().innerHTML!==$b||Kb(e,Lu(r,o.getStart()),!0),37!==t&&39!==t||Kb(e,Lu(r,o.getStart()),!0)})(e,t.keyCode,(n=e.selection.getRng().endContainer,er(n)&&$e(n.data,br)))}))})(e),XC(e)||((e,t)=>{e.set({}),t.on("NodeChange",(n=>{Hv(t,n.element,e.get())})),t.on("FormatApply FormatRemove",(n=>{const o=I.from(n.node).map((e=>dm(e)?e:e.startContainer)).bind((e=>qo(e)?I.some(e):I.from(e.parentElement))).getOrThunk((()=>Uv(t)));Hv(t,o,e.get())}))})(n,e),{get:t.get,has:t.has,register:t.register,unregister:t.unregister,apply:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.apply(t,n,o)})(e,t,n,o)},remove:(t,n,o,r)=>{((e,t,n,o,r)=>{JC(e).formatter.remove(t,n,o,r)})(e,t,n,o,r)},toggle:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.toggle(t,n,o)})(e,t,n,o)},match:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.match(t,n,o,r))(e,t,n,o,r),closest:t=>((e,t)=>JC(e).formatter.closest(t))(e,t),matchAll:(t,n)=>((e,t,n)=>JC(e).formatter.matchAll(t,n))(e,t,n),matchNode:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.matchNode(t,n,o,r))(e,t,n,o,r),canApply:t=>((e,t)=>JC(e).formatter.canApply(t))(e,t),formatChanged:(t,o,r,s)=>((e,t,n,o,r,s)=>JC(e).formatter.formatChanged(t,n,o,r,s))(e,n,t,o,r,s),getCssText:T(ox,e)}},sx=e=>{switch(e.toLowerCase()){case"undo":case"redo":case"mcefocus":return!0;default:return!1}},ax=e=>{const t=Xa(),n=$a(0),o=$a(0),r={data:[],typing:!1,beforeChange:()=>{((e,t,n)=>{JC(e).undoManager.beforeChange(t,n)})(e,n,t)},add:(s,a)=>((e,t,n,o,r,s,a)=>JC(e).undoManager.add(t,n,o,r,s,a))(e,r,o,n,t,s,a),dispatchChange:()=>{e.setDirty(!0);const t=jC(e);t.bookmark=ml(e.selection),e.dispatch("change",{level:t,lastLevel:ie(r.data,o.get()).getOrUndefined()})},undo:()=>((e,t,n,o)=>JC(e).undoManager.undo(t,n,o))(e,r,n,o),redo:()=>((e,t,n)=>JC(e).undoManager.redo(t,n))(e,o,r.data),clear:()=>{((e,t,n)=>{JC(e).undoManager.clear(t,n)})(e,r,o)},reset:()=>{((e,t)=>{JC(e).undoManager.reset(t)})(e,r)},hasUndo:()=>((e,t,n)=>JC(e).undoManager.hasUndo(t,n))(e,r,o),hasRedo:()=>((e,t,n)=>JC(e).undoManager.hasRedo(t,n))(e,r,o),transact:t=>((e,t,n,o)=>JC(e).undoManager.transact(t,n,o))(e,r,n,t),ignore:t=>{((e,t,n)=>{JC(e).undoManager.ignore(t,n)})(e,n,t)},extra:(t,n)=>{((e,t,n,o,r)=>{JC(e).undoManager.extra(t,n,o,r)})(e,r,o,t,n)}};return XC(e)||((e,t,n)=>{const o=$a(!1),r=e=>{KC(t,!1,n),t.add({},e)};e.on("init",(()=>{t.add()})),e.on("BeforeExecCommand",(e=>{const o=e.command;sx(o)||(YC(t,n),t.beforeChange())})),e.on("ExecCommand",(e=>{const t=e.command;sx(t)||r(e)})),e.on("ObjectResizeStart cut",(()=>{t.beforeChange()})),e.on("SaveContent ObjectResized blur",r),e.on("dragend",r),e.on("keyup",(n=>{const s=n.keyCode;if(n.isDefaultPrevented())return;const a=At.os.isMacOS()&&"Meta"===n.key;(s>=33&&s<=36||s>=37&&s<=40||45===s||n.ctrlKey||a)&&(r(),e.nodeChanged()),46!==s&&8!==s||e.nodeChanged(),o.get()&&t.typing&&!VC(jC(e),t.data[0])&&(e.isDirty()||e.setDirty(!0),e.dispatch("TypingUndo"),o.set(!1),e.nodeChanged())})),e.on("keydown",(e=>{const s=e.keyCode;if(e.isDefaultPrevented())return;if(s>=33&&s<=36||s>=37&&s<=40||45===s)return void(t.typing&&r(e));const a=e.ctrlKey&&!e.altKey||e.metaKey;if((s<16||s>20)&&224!==s&&91!==s&&!t.typing&&!a)return t.beforeChange(),KC(t,!0,n),t.add({},e),void o.set(!0);(At.os.isMacOS()?e.metaKey:e.ctrlKey&&!e.altKey)&&t.beforeChange()})),e.on("mousedown",(e=>{t.typing&&r(e)})),e.on("input",(e=>{var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data||(e=>"insertFromPaste"===e.inputType||"insertFromDrop"===e.inputType)(e))&&r(e)})),e.on("AddUndo Undo Redo ClearUndos",(t=>{t.isDefaultPrevented()||e.nodeChanged()}))})(e,r,n),(e=>{e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo")})(e),r},ix=[9,27,af.HOME,af.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,af.DOWN,af.UP,af.LEFT,af.RIGHT].concat(At.browser.isFirefox()?[224]:[]),lx="data-mce-placeholder",dx=e=>"keydown"===e.type||"keyup"===e.type,cx=e=>{const t=e.keyCode;return t===af.BACKSPACE||t===af.DELETE},ux=(e,t)=>({from:e,to:t}),mx=(e,t)=>{const n=yn(e),o=yn(t.container());return Ah(n,o).map((e=>((e,t)=>({block:e,position:t}))(e,t)))},fx=(e,t)=>Jn(t,(e=>Rr(e)||lr(e.dom)),(t=>_n(t,e))).filter(Wt).getOr(e),gx=(e,t)=>{const n=((e,t)=>{const n=Mn(e);return Z(n,(e=>t.isBlock(Ht(e)))).fold(N(n),(e=>n.slice(0,e)))})(e,t);return V(n,xo),n},px=(e,t)=>{const n=Bp(t,e);return J(n.reverse(),(e=>gs(e))).each(xo)},hx=(e,t,n,o,r)=>{if(gs(n))return Or(n),Ou(n.dom);0===Y(Dn(r),(e=>!gs(e))).length&&gs(t)&&po(r,bn("br"));const s=Tu(n.dom,Vi.before(r.dom));return V(gx(t,o),(e=>{po(r,e)})),px(e,t),s},bx=(e,t,n,o)=>{if(gs(n)){if(gs(t)){const e=e=>{const t=(e,n)=>Fn(e).fold((()=>n),(e=>((e,t)=>e.isInline(Ht(t)))(o,e)?t(e,n.concat(fi(e))):n));return t(e,[])},r=G(e(n),((e,t)=>(yo(e,t),t)),Tr());wo(t),vo(t,r)}return xo(n),Ou(t.dom)}const r=Bu(n.dom);return V(gx(t,o),(e=>{vo(n,e)})),px(e,t),r},vx=(e,t)=>{Ru(e,t.dom).bind((e=>I.from(e.getNode()))).map(yn).filter(Er).each(xo)},yx=(e,t,n,o)=>(vx(!0,t),vx(!1,n),((e,t)=>kn(t,e)?((e,t)=>{const n=Bp(t,e);return I.from(n[n.length-1])})(t,e):I.none())(t,n).fold(T(bx,e,t,n,o),T(hx,e,t,n,o))),Cx=(e,t,n,o,r)=>t?yx(e,o,n,r):yx(e,n,o,r),wx=(e,t)=>{const n=yn(e.getBody()),o=((e,t,n)=>n.collapsed?((e,t,n)=>{const o=mx(e,Vi.fromRangeStart(n)),r=o.bind((n=>ku(t,e,n.position).bind((n=>mx(e,n).map((n=>((e,t,n)=>ar(n.position.getNode())&&!gs(n.block)?Ru(!1,n.block.dom).bind((o=>o.isEqual(n.position)?ku(t,e,o).bind((t=>mx(e,t))):I.some(n))).getOr(n):n)(e,t,n)))))));return Mt(o,r,ux).filter((t=>(e=>!_n(e.from.block,e.to.block))(t)&&((e,t)=>{const n=yn(e);return _n(fx(n,t.from.block),fx(n,t.to.block))})(e,t)&&(e=>!1===dr(e.from.block.dom)&&!1===dr(e.to.block.dom))(t)&&(e=>{const t=e=>_r(e)||Ns(e.dom);return t(e.from.block)&&t(e.to.block)})(t)))})(e,t,n):I.none())(n.dom,t,e.selection.getRng()).map((o=>()=>{Cx(n,t,o.from.block,o.to.block,e.schema).each((t=>{e.selection.setRng(t.toRange())}))}));return o},xx=(e,t)=>{const n=yn(t),o=T(_n,e);return Qn(n,Rr,o).isSome()},Ex=e=>{const t=yn(e.getBody());return((e,t)=>{const n=Tu(e.dom,Vi.fromRangeStart(t)).isNone(),o=Au(e.dom,Vi.fromRangeEnd(t)).isNone();return!((e,t)=>xx(e,t.startContainer)||xx(e,t.endContainer))(e,t)&&n&&o})(t,e.selection.getRng())?(e=>I.some((()=>{e.setContent(""),e.selection.setCursorLocation()})))(e):((e,t,n)=>{const o=t.getRng();return Mt(Ah(e,yn(o.startContainer)),Ah(e,yn(o.endContainer)),((r,s)=>_n(r,s)?I.none():I.some((()=>{o.deleteContents(),Cx(e,!0,r,s,n).each((e=>{t.setRng(e.toRange())}))})))).getOr(I.none())})(t,e.selection,e.schema)},_x=(e,t)=>e.selection.isCollapsed()?I.none():Ex(e),kx=(e,t,n,o,r)=>I.from(t._selectionOverrides.showCaret(e,n,o,r)),Sx=(e,t)=>e.dispatch("BeforeObjectSelected",{target:t}).isDefaultPrevented()?I.none():I.some((e=>{const t=e.ownerDocument.createRange();return t.selectNode(e),t})(t)),Nx=(e,t,n)=>t.collapsed?((e,t,n)=>{const o=ru(1,e.getBody(),t),r=Vi.fromRangeStart(o),s=r.getNode();if(Lc(s))return kx(1,e,s,!r.isAtEnd(),!1);const a=r.getNode(!0);if(Lc(a))return kx(1,e,a,!1,!1);const i=lb(e.dom.getRoot(),r.getNode());return Lc(i)?kx(1,e,i,!1,n):I.none()})(e,t,n).getOr(t):t,Rx=e=>Ap(e)||kp(e),Ax=e=>Tp(e)||Sp(e),Tx=(e,t,n,o,r,s)=>{kx(o,e,s.getNode(!r),r,!0).each((n=>{if(t.collapsed){const e=t.cloneRange();r?e.setEnd(n.startContainer,n.startOffset):e.setStart(n.endContainer,n.endOffset),e.deleteContents()}else t.deleteContents();e.selection.setRng(n)})),((e,t)=>{er(t)&&0===t.data.length&&e.remove(t)})(e.dom,n)},Ox=(e,t)=>((e,t)=>{const n=e.selection.getRng();if(!er(n.commonAncestorContainer))return I.none();const o=t?cu.Forwards:cu.Backwards,r=wu(e.getBody()),s=T(lu,t?r.next:r.prev),a=t?Rx:Ax,i=au(o,e.getBody(),n),l=s(i),d=l?Eh(t,l):l;if(!d||!du(i,d))return I.none();if(a(d))return I.some((()=>Tx(e,n,i.getNode(),o,t,d)));const c=s(d);return c&&a(c)&&du(d,c)?I.some((()=>Tx(e,n,i.getNode(),o,t,c))):I.none()})(e,t),Bx=(e,t)=>{const n=e.getBody();return t?Ou(n).filter(Ap):Bu(n).filter(Tp)},Px=e=>{const t=e.selection.getRng();return!t.collapsed&&(Bx(e,!0).exists((e=>e.isEqual(Vi.fromRangeStart(t))))||Bx(e,!1).exists((e=>e.isEqual(Vi.fromRangeEnd(t)))))},Dx=hl([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Lx=(e,t,n,o)=>ku(t,e,n).bind((r=>{return s=r.getNode(),C(s)&&(Rr(yn(s))||Sr(yn(s)))||((e,t,n,o,r)=>{const s=t=>r.isInline(t.nodeName.toLowerCase())&&!Qc(n,o,e);return su(!t,n).fold((()=>su(t,o).fold(L,s)),s)})(e,t,n,r,o)?I.none():t&&dr(r.getNode())||!t&&dr(r.getNode(!0))?((e,t,n,o)=>{const r=o.getNode(!t);return Ah(yn(e),yn(n.getNode())).map((e=>gs(e)?Dx.remove(e.dom):Dx.moveToElement(r))).orThunk((()=>I.some(Dx.moveToElement(r))))})(e,t,n,r):t&&Tp(n)||!t&&Ap(n)?I.some(Dx.moveToPosition(r)):I.none();var s})),Mx=(e,t)=>I.from(lb(e.getBody(),t)),Ix=(e,t)=>{const n=e.selection.getNode();return Mx(e,n).filter(dr).fold((()=>((e,t,n,o)=>{const r=ru(t?1:-1,e,n),s=Vi.fromRangeStart(r),a=yn(e);return!t&&Tp(s)?I.some(Dx.remove(s.getNode(!0))):t&&Ap(s)?I.some(Dx.remove(s.getNode())):!t&&Ap(s)&&qp(a,s,o)?Vp(a,s,o).map((e=>Dx.remove(e.getNode()))):t&&Tp(s)&&$p(a,s,o)?Wp(a,s,o).map((e=>Dx.remove(e.getNode()))):((e,t,n,o)=>((e,t)=>{const n=t.getNode(!e),o=e?"after":"before";return qo(n)&&n.getAttribute("data-mce-caret")===o})(t,n)?((e,t)=>y(t)?I.none():e&&dr(t.nextSibling)?I.some(Dx.moveToElement(t.nextSibling)):!e&&dr(t.previousSibling)?I.some(Dx.moveToElement(t.previousSibling)):I.none())(t,n.getNode(!t)).orThunk((()=>Lx(e,t,n,o))):Lx(e,t,n,o).bind((t=>((e,t,n)=>n.fold((e=>I.some(Dx.remove(e))),(e=>I.some(Dx.moveToElement(e))),(n=>Qc(t,n,e)?I.none():I.some(Dx.moveToPosition(n)))))(e,n,t))))(e,t,s,o)})(e.getBody(),t,e.selection.getRng(),e.schema).map((n=>()=>n.fold(((e,t)=>n=>(e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n)),!0))(e,t),((e,t)=>n=>{const o=t?Vi.before(n):Vi.after(n);return e.selection.setRng(o.toRange()),!0})(e,t),(e=>t=>(e.selection.setRng(t.toRange()),!0))(e))))),(()=>I.some(_)))},Fx=e=>{const t=e.dom,n=e.selection,o=lb(e.getBody(),n.getNode());if(lr(o)&&t.isBlock(o)&&t.isEmpty(o)){const e=t.create("br",{"data-mce-bogus":"1"});t.setHTML(o,""),o.appendChild(e),n.setRng(Vi.before(e).toRange())}return!0},Ux=(e,t)=>e.selection.isCollapsed()?Ix(e,t):((e,t)=>{const n=e.selection.getNode();return dr(n)&&!cr(n)?Mx(e,n.parentNode).filter(dr).fold((()=>I.some((()=>{var n;n=yn(e.getBody()),V(Uo(n,".mce-offscreen-selection"),xo),vh(e,t,yn(e.selection.getNode())),Th(e)}))),(()=>I.some(_))):Px(e)?I.some((()=>{Ph(e,e.selection.getRng(),yn(e.getBody()))})):I.none()})(e,t),zx=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return ku(t,e.getBody(),n).filter((e=>t?Ep(e):_p(e))).bind((e=>Jc(t?0:-1,e))).map((t=>()=>e.selection.select(t)))})(e,t):I.none(),jx=er,Hx=e=>jx(e)&&e.data[0]===Br,$x=e=>jx(e)&&e.data[e.data.length-1]===Br,qx=e=>{var t;return(null!==(t=e.ownerDocument)&&void 0!==t?t:document).createTextNode(Br)},Vx=(e,t)=>e?(e=>{var t;if(jx(e.previousSibling))return $x(e.previousSibling)||e.previousSibling.appendData(Br),e.previousSibling;if(jx(e))return Hx(e)||e.insertData(0,Br),e;{const n=qx(e);return null===(t=e.parentNode)||void 0===t||t.insertBefore(n,e),n}})(t):(e=>{var t,n;if(jx(e.nextSibling))return Hx(e.nextSibling)||e.nextSibling.insertData(0,Br),e.nextSibling;if(jx(e))return $x(e)||e.appendData(Br),e;{const o=qx(e);return e.nextSibling?null===(t=e.parentNode)||void 0===t||t.insertBefore(o,e.nextSibling):null===(n=e.parentNode)||void 0===n||n.appendChild(o),o}})(t),Wx=T(Vx,!0),Kx=T(Vx,!1),Yx=(e,t)=>er(e.container())?Vx(t,e.container()):Vx(t,e.getNode()),Gx=(e,t)=>{const n=t.get();return n&&e.container()===n&&Fr(n)},Xx=(e,t)=>t.fold((t=>{Rc(e.get());const n=Wx(t);return e.set(n),I.some(Vi(n,n.length-1))}),(t=>Ou(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,1)}{Rc(e.get());const n=Yx(t,!0);return e.set(n),Vi(n,1)}}))),(t=>Bu(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,t.length-1)}{Rc(e.get());const n=Yx(t,!1);return e.set(n),Vi(n,n.length-1)}}))),(t=>{Rc(e.get());const n=Kx(t);return e.set(n),I.some(Vi(n,1))})),Qx=(e,t)=>{for(let n=0;n<e.length;n++){const o=e[n].apply(null,t);if(o.isSome())return o}return I.none()},Jx=hl([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Zx=(e,t)=>Xc(t,e)||e,eE=(e,t,n)=>{const o=_h(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Au(r,o).bind(T(xh,e,r)).map((e=>Jx.before(e)))),I.none)},tE=(e,t)=>null===Lu(e,t),nE=(e,t,n)=>xh(e,t,n).filter(T(tE,t)),oE=(e,t,n)=>{const o=kh(n);return nE(e,t,o).bind((e=>Tu(e,o).isNone()?I.some(Jx.start(e)):I.none()))},rE=(e,t,n)=>{const o=_h(n);return nE(e,t,o).bind((e=>Au(e,o).isNone()?I.some(Jx.end(e)):I.none()))},sE=(e,t,n)=>{const o=kh(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Tu(r,o).bind(T(xh,e,r)).map((e=>Jx.after(e)))),I.none)},aE=e=>!wh(lE(e)),iE=(e,t,n)=>Qx([eE,oE,rE,sE],[e,t,n]).filter(aE),lE=e=>e.fold(R,R,R,R),dE=e=>e.fold(N("before"),N("start"),N("end"),N("after")),cE=e=>e.fold(Jx.before,Jx.before,Jx.after,Jx.after),uE=e=>e.fold(Jx.start,Jx.start,Jx.end,Jx.end),mE=(e,t,n,o,r,s)=>Mt(xh(t,n,o),xh(t,n,r),((t,o)=>t!==o&&((e,t,n)=>{const o=Xc(t,e),r=Xc(n,e);return C(o)&&o===r})(n,t,o)?Jx.after(e?t:o):s)).getOr(s),fE=(e,t)=>e.fold(M,(e=>{return o=t,!(dE(n=e)===dE(o)&&lE(n)===lE(o));var n,o})),gE=(e,t)=>e?t.fold(k(I.some,Jx.start),I.none,k(I.some,Jx.after),I.none):t.fold(I.none,k(I.some,Jx.before),I.none,k(I.some,Jx.end)),pE=(e,t,n)=>{const o=e?1:-1;return t.setRng(Vi(n.container(),n.offset()+o).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0};var hE;!function(e){e[e.Br=0]="Br",e[e.Block=1]="Block",e[e.Wrap=2]="Wrap",e[e.Eol=3]="Eol"}(hE||(hE={}));const bE=(e,t)=>e===cu.Backwards?oe(t):t,vE=(e,t,n)=>e===cu.Forwards?t.next(n):t.prev(n),yE=(e,t,n,o)=>ar(o.getNode(t===cu.Forwards))?hE.Br:!1===Qc(n,o)?hE.Block:hE.Wrap,CE=(e,t,n,o)=>{const r=wu(n);let s=o;const a=[];for(;s;){const n=vE(t,r,s);if(!n)break;if(ar(n.getNode(!1)))return t===cu.Forwards?{positions:bE(t,a).concat([n]),breakType:hE.Br,breakAt:I.some(n)}:{positions:bE(t,a),breakType:hE.Br,breakAt:I.some(n)};if(n.isVisible()){if(e(s,n)){const e=yE(0,t,s,n);return{positions:bE(t,a),breakType:e,breakAt:I.some(n)}}a.push(n),s=n}else s=n}return{positions:bE(t,a),breakType:hE.Eol,breakAt:I.none()}},wE=(e,t,n,o)=>t(n,o).breakAt.map((o=>{const r=t(n,o).positions;return e===cu.Backwards?r.concat(o):[o].concat(r)})).getOr([]),xE=(e,t)=>X(e,((e,n)=>e.fold((()=>I.some(n)),(o=>Mt(le(o.getClientRects()),le(n.getClientRects()),((e,r)=>{const s=Math.abs(t-e.left);return Math.abs(t-r.left)<=s?n:o})).or(e)))),I.none()),EE=(e,t)=>le(t.getClientRects()).bind((t=>xE(e,t.left))),_E=T(CE,Vi.isAbove,-1),kE=T(CE,Vi.isBelow,1),SE=T(wE,-1,_E),NE=T(wE,1,kE),RE=(e,t)=>_E(e,t).breakAt.isNone(),AE=(e,t)=>kE(e,t).breakAt.isNone(),TE=(e,t)=>EE(SE(e,t),t),OE=(e,t)=>EE(NE(e,t),t),BE=dr,PE=(e,t)=>Math.abs(e.left-t),DE=(e,t)=>Math.abs(e.right-t),LE=(e,t)=>Oe(e,((e,n)=>{const o=Math.min(PE(e,t),DE(e,t)),r=Math.min(PE(n,t),DE(n,t));return r===o&&_e(n,"node")&&BE(n.node)||r<o?n:e})),ME=e=>{const t=t=>q(t,(t=>{const n=vi(t);return n.node=e,n}));if(qo(e))return t(e.getClientRects());if(er(e)){const n=e.ownerDocument.createRange();return n.setStart(e,0),n.setEnd(e,e.data.length),t(n.getClientRects())}return[]},IE=e=>te(e,ME);var FE;!function(e){e[e.Up=-1]="Up",e[e.Down=1]="Down"}(FE||(FE={}));const UE=(e,t,n,o,r,s)=>{let a=0;const i=[],l=o=>{let s=IE([o]);-1===e&&(s=s.reverse());for(let e=0;e<s.length;e++){const o=s[e];if(!n(o,d)){if(i.length>0&&t(o,Pe(i))&&a++,o.line=a,r(o))return!0;i.push(o)}}return!1},d=Pe(s.getClientRects());if(!d)return i;const c=s.getNode();return c&&(l(c),((e,t,n,o)=>{let r=o;for(;r=Gc(r,e,os,t);)if(n(r))return})(e,o,l,c)),i},zE=T(UE,FE.Up,wi,xi),jE=T(UE,FE.Down,xi,wi),HE=e=>Pe(e.getClientRects()),$E=e=>t=>((e,t)=>t.line>e)(e,t),qE=e=>t=>((e,t)=>t.line===e)(e,t),VE=(e,t)=>{e.selection.setRng(t),sg(e,e.selection.getRng())},WE=(e,t,n)=>I.some(Nx(e,t,n)),KE=(e,t,n,o,r,s)=>{const a=t===cu.Forwards,i=wu(e.getBody()),l=T(lu,a?i.next:i.prev),d=a?o:r;if(!n.collapsed){const o=_i(n);if(s(o))return kx(t,e,o,t===cu.Backwards,!1);if(Px(e)){const e=n.cloneRange();return e.collapse(t===cu.Backwards),I.from(e)}}const c=au(t,e.getBody(),n);if(d(c))return Sx(e,c.getNode(!a));let u=l(c);const m=Wr(n);if(!u)return m?I.some(n):I.none();if(u=Eh(a,u),d(u))return kx(t,e,u.getNode(!a),a,!1);const f=l(u);return f&&d(f)&&du(u,f)?kx(t,e,f.getNode(!a),a,!1):m?WE(e,u.toRange(),!1):I.none()},YE=(e,t,n,o,r,s)=>{const a=au(t,e.getBody(),n),i=Pe(a.getClientRects()),l=t===FE.Down,d=e.getBody();if(!i)return I.none();if(Px(e)){const e=l?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return(l?OE:TE)(d,e).orThunk((()=>I.from(e))).map((e=>e.toRange()))}const c=(l?jE:zE)(d,$E(1),a),u=Y(c,qE(1)),m=i.left,f=LE(u,m);if(f&&s(f.node)){const n=Math.abs(m-f.left),o=Math.abs(m-f.right);return kx(t,e,f.node,n<o,!1)}let g;if(g=o(a)?a.getNode():r(a)?a.getNode(!0):_i(n),g){const n=((e,t,n,o)=>{const r=wu(t);let s,a,i,l;const d=[];let c=0;1===e?(s=r.next,a=xi,i=wi,l=Vi.after(o)):(s=r.prev,a=wi,i=xi,l=Vi.before(o));const u=HE(l);do{if(!l.isVisible())continue;const e=HE(l);if(i(e,u))continue;d.length>0&&a(e,Pe(d))&&c++;const t=vi(e);if(t.position=l,t.line=c,n(t))return d;d.push(t)}while(l=s(l));return d})(t,d,$E(1),g);let o=LE(Y(n,qE(1)),m);if(o)return WE(e,o.position.toRange(),!1);if(o=Pe(Y(n,qE(0))),o)return WE(e,o.position.toRange(),!1)}return 0===u.length?GE(e,l).filter(l?r:o).map((t=>Nx(e,t.toRange(),!1))):I.none()},GE=(e,t)=>{const n=e.selection.getRng(),o=t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n),r=(s=o.container(),a=e.getBody(),Qn(yn(s),(e=>Ic(e.dom)),(e=>e.dom===a)).map((e=>e.dom)).getOr(a));var s,a;if(t){const e=kE(r,o);return de(e.positions)}{const e=_E(r,o);return le(e.positions)}},XE=(e,t,n)=>GE(e,t).filter(n).exists((t=>(e.selection.setRng(t.toRange()),!0))),QE=(e,t)=>{const n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},JE=(e,t)=>{e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},ZE=(e,t,n)=>Xx(t,n).map((t=>(QE(e,t),n))),e_=(e,t,n)=>{const o=e.getBody(),r=((e,t,n)=>{const o=Vi.fromRangeStart(e);if(e.collapsed)return o;{const r=Vi.fromRangeEnd(e);return n?Tu(t,r).getOr(r):Au(t,o).getOr(o)}})(e.selection.getRng(),o,n);return((e,t,n,o)=>{const r=Eh(e,o),s=iE(t,n,r);return iE(t,n,r).bind(T(gE,e)).orThunk((()=>((e,t,n,o,r)=>{const s=Eh(e,r);return ku(e,n,s).map(T(Eh,e)).fold((()=>o.map(cE)),(r=>iE(t,n,r).map(T(mE,e,t,n,s,r)).filter(T(fE,o)))).filter(aE)})(e,t,n,s,o)))})(n,T(Ch,e),o,r).bind((n=>ZE(e,t,n)))},t_=(e,t,n)=>!!yd(e)&&e_(e,t,n).isSome(),n_=(e,t,n)=>!!yd(t)&&((e,t)=>{const n=t.selection.getRng(),o=e?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return!!(e=>w(e.selection.getSel().modify))(t)&&(e&&jr(o)?pE(!0,t.selection,o):!(e||!Hr(o))&&pE(!1,t.selection,o))})(e,t),o_=e=>{const t=$a(null),n=T(Ch,e);return e.on("NodeChange",(o=>{yd(e)&&(((e,t,n)=>{const o=q(Uo(yn(t.getRoot()),'*[data-mce-selected="inline-boundary"]'),(e=>e.dom)),r=Y(o,e),s=Y(n,e);V(re(r,s),T(JE,!1)),V(re(s,r),T(JE,!0))})(n,e.dom,o.parents),((e,t)=>{const n=t.get();if(e.selection.isCollapsed()&&!e.composing&&n){const o=Vi.fromRangeStart(e.selection.getRng());Vi.isTextPosition(o)&&!(e=>jr(e)||Hr(e))(o)&&(QE(e,Nc(n,o)),t.set(null))}})(e,t),((e,t,n,o)=>{if(t.selection.isCollapsed()){const r=Y(o,e);V(r,(o=>{const r=Vi.fromRangeStart(t.selection.getRng());iE(e,t.getBody(),r).bind((e=>ZE(t,n,e)))}))}})(n,e,t,o.parents))})),t},r_=T(n_,!0),s_=T(n_,!1),a_=(e,t,n)=>{if(yd(e)){const o=GE(e,t).getOrThunk((()=>{const n=e.selection.getRng();return t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n)}));return iE(T(Ch,e),e.getBody(),o).exists((t=>{const o=cE(t);return Xx(n,o).exists((t=>(QE(e,t),!0)))}))}return!1},i_=(e,t)=>n=>Xx(t,n).map((t=>()=>QE(e,t))),l_=(e,t,n,o)=>{const r=e.getBody(),s=T(Ch,e);e.undoManager.ignore((()=>{e.selection.setRng(((e,t)=>{const n=document.createRange();return n.setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n})(n,o)),Nh(e),iE(s,r,Vi.fromRangeStart(e.selection.getRng())).map(uE).bind(i_(e,t)).each(D)})),e.nodeChanged()},d_=(e,t,n)=>{if(e.selection.isCollapsed()&&yd(e)){const o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n,o)=>{const r=((e,t)=>Xc(t,e)||e)(e.getBody(),o.container()),s=T(Ch,e),a=iE(s,r,o);return a.bind((e=>n?e.fold(N(I.some(uE(e))),I.none,N(I.some(cE(e))),I.none):e.fold(I.none,N(I.some(cE(e))),I.none,N(I.some(uE(e)))))).map(i_(e,t)).getOrThunk((()=>{const i=Su(n,r,o),l=i.bind((e=>iE(s,r,e)));return Mt(a,l,(()=>xh(s,r,o).bind((t=>(e=>Mt(Ou(e),Bu(e),((t,n)=>{const o=Eh(!0,t),r=Eh(!1,n);return Au(e,o).forall((e=>e.isEqual(r)))})).getOr(!0))(t)?I.some((()=>{vh(e,n,yn(t))})):I.none())))).getOrThunk((()=>l.bind((()=>i.map((r=>()=>{n?l_(e,t,o,r):l_(e,t,r,o)}))))))}))})(e,t,n,o)}return I.none()},c_=(e,t)=>{const n=yn(e.getBody()),o=yn(e.selection.getStart()),r=Bp(o,n);return Z(r,t).fold(N(r),(e=>r.slice(0,e)))},u_=e=>1===zn(e),m_=(e,t)=>{const n=T(Zb,e);return te(t,(e=>n(e)?[e.dom]:[]))},f_=e=>{const t=(e=>c_(e,(t=>e.schema.isBlock(Ht(t)))))(e);return m_(e,t)},g_=(e,t)=>{const n=Y((e=>c_(e,(t=>e.schema.isBlock(Ht(t))||(e=>zn(e)>1)(t))))(e),u_);return de(n).bind((o=>{const r=Vi.fromRangeStart(e.selection.getRng());return Oh(t,r,o.dom)&&!Tm(o)?I.some((()=>((e,t,n,o)=>{const r=m_(t,o);if(0===r.length)vh(t,e,n);else{const e=Jb(n.dom,r);t.selection.setRng(e.toRange())}})(t,e,o,n))):I.none()}))},p_=(e,t)=>{const n=e.selection.getStart(),o=((e,t)=>{const n=t.parentElement;return ar(t)&&!h(n)&&e.dom.isEmpty(n)})(e,n)||Tm(yn(n))?Jb(n,t):((e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return e.insertNode(n.dom),o})(e.selection.getRng(),t);e.selection.setRng(o.toRange())},h_=e=>er(e.startContainer),b_=e=>{const t=e.selection.getRng();return(e=>0===e.startOffset&&h_(e))(t)&&((e,t)=>{const n=t.startContainer.parentElement;return!h(n)&&Zb(e,yn(n))})(e,t)&&(e=>(e=>(e=>{const t=e.startContainer.parentNode,n=e.endContainer.parentNode;return!h(t)&&!h(n)&&t.isEqualNode(n)})(e)&&(e=>{const t=e.endContainer;return e.endOffset===(er(t)?t.length:t.childNodes.length)})(e))(e)||(e=>!e.endContainer.isEqualNode(e.commonAncestorContainer))(e))(t)},v_=(e,t)=>e.selection.isCollapsed()?g_(e,t):(e=>{if(b_(e)){const t=f_(e);return I.some((()=>{Nh(e),((e,t)=>{const n=re(t,f_(e));n.length>0&&p_(e,n)})(e,t)}))}return I.none()})(e),y_=(e,t)=>Qn(e,(e=>Du(e.dom)),(e=>t.isBlock(Ht(e)))).isSome(),C_=e=>((e=>{const t=e.selection.getRng();return t.collapsed&&(h_(t)||e.dom.isEmpty(t.startContainer))&&!(e=>y_(yn(e.selection.getStart()),e.schema))(e)})(e)&&p_(e,[]),!0),w_=(e,t,n)=>C(n)?I.some((()=>{e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n))})):I.none(),x_=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=t?kp:Sp,o=t?cu.Forwards:cu.Backwards,r=au(o,e.getBody(),e.selection.getRng());return n(r)?w_(e,t,r.getNode(!t)):I.from(Eh(t,r)).filter((e=>n(e)&&du(r,e))).bind((n=>w_(e,t,n.getNode(!t))))})(e,t):((e,t)=>{const n=e.selection.getNode();return mr(n)?w_(e,t,n):I.none()})(e,t),E_=e=>Xe(null!=e?e:"").getOr(0),__=(e,t)=>(e||"table"===Ht(t)?"margin":"padding")+("rtl"===co(t,"direction")?"-right":"-left"),k_=e=>{const t=N_(e);return!e.mode.isReadOnly()&&(t.length>1||((e,t)=>ne(t,(t=>{const n=__(od(e),t),o=mo(t,n).map(E_).getOr(0);return"false"!==e.dom.getContentEditable(t.dom)&&o>0})))(e,t))},S_=e=>kr(e)||Sr(e),N_=e=>Y(_o(e.selection.getSelectedBlocks()),(e=>!S_(e)&&!(e=>An(e).exists(S_))(e)&&Jn(e,(e=>lr(e.dom)||dr(e.dom))).exists((e=>lr(e.dom))))),R_=(e,t)=>{var n,o;const{dom:r}=e,s=rd(e),a=null!==(o=null===(n=/[a-z%]+$/i.exec(s))||void 0===n?void 0:n[0])&&void 0!==o?o:"px",i=E_(s),l=od(e);V(N_(e),(e=>{((e,t,n,o,r,s)=>{const a=__(n,yn(s)),i=E_(e.getStyle(s,a));if("outdent"===t){const t=Math.max(0,i-o);e.setStyle(s,a,t?t+r:"")}else{const t=i+o+r;e.setStyle(s,a,t)}})(r,t,l,i,a,e.dom)}))},A_=e=>R_(e,"outdent"),T_=e=>{if(e.selection.isCollapsed()&&k_(e)){const t=e.dom,n=e.selection.getRng(),o=Vi.fromRangeStart(n),r=t.getParent(n.startContainer,t.isBlock);if(null!==r&&Ip(yn(r),o,e.schema))return I.some((()=>A_(e)))}return I.none()},O_=(e,t,n)=>ue([T_,Ux,Ox,(e,n)=>d_(e,t,n),wx,ib,zx,x_,_x,v_],(t=>t(e,n))).filter((t=>e.selection.isEditable())),B_=(e,t)=>{e.addCommand("delete",(()=>{((e,t)=>{O_(e,t,!1).fold((()=>{e.selection.isEditable()&&(Nh(e),Th(e))}),D)})(e,t)})),e.addCommand("forwardDelete",(()=>{((e,t)=>{O_(e,t,!0).fold((()=>{e.selection.isEditable()&&(e=>{Sh(e,"ForwardDelete")})(e)}),D)})(e,t)}))},P_=e=>void 0===e.touches||1!==e.touches.length?I.none():I.some(e.touches[0]),D_=(e,t)=>Ee(e,t.nodeName),L_=(e,t)=>!!er(t)||!!qo(t)&&!(D_(e.getBlockElements(),t)||Ku(t)||Ts(e,t)||hs(t)),M_=(e,t)=>{if(er(t)){if(0===t.data.length)return!0;if(/^\s+$/.test(t.data))return!t.nextSibling||D_(e,t.nextSibling)||hs(t.nextSibling)}return!1},I_=e=>e.dom.create(Il(e),Fl(e)),F_=e=>{const t=e.dom,n=e.selection,o=e.schema,r=o.getBlockElements(),s=n.getStart(),a=e.getBody();let i,l,d=!1;const c=Il(e);if(!s||!qo(s))return;const u=a.nodeName.toLowerCase();if(!o.isValidChild(u,c.toLowerCase())||((e,t,n)=>$(Op(yn(n),yn(t)),(t=>D_(e,t.dom))))(r,a,s))return;const m=n.getRng(),{startContainer:f,startOffset:g,endContainer:p,endOffset:h}=m,b=Rg(e);let v=a.firstChild;for(;v;)if(qo(v)&&Ss(o,v),L_(o,v)){if(M_(r,v)){l=v,v=v.nextSibling,t.remove(l);continue}i||(i=I_(e),a.insertBefore(i,v),d=!0),l=v,v=v.nextSibling,i.appendChild(l)}else i=null,v=v.nextSibling;d&&b&&(m.setStart(f,g),m.setEnd(p,h),n.setRng(m),e.nodeChanged())},U_=(e,t,n)=>{const o=yn(I_(e)),r=Tr();vo(o,r),n(t,o);const s=document.createRange();return s.setStartBefore(r.dom),s.setEndBefore(r.dom),s},z_=e=>t=>-1!==(" "+t.attr("class")+" ").indexOf(e),j_=(e,t,n)=>function(o){const r=arguments,s=r[r.length-2],a=s>0?t.charAt(s-1):"";if('"'===a)return o;if(">"===a){const e=t.lastIndexOf("<",s);if(-1!==e&&-1!==t.substring(e,s).indexOf('contenteditable="false"'))return o}return'<span class="'+n+'" data-mce-content="'+e.dom.encode(r[0])+'">'+e.dom.encode("string"==typeof r[1]?r[1]:r[0])+"</span>"},H_=(e,t)=>{t.hasAttribute("data-mce-caret")&&(Vr(t),e.selection.setRng(e.selection.getRng()),e.selection.scrollIntoView(t))},$_=(e,t)=>{const n=(e=>to(yn(e.getBody()),"*[data-mce-caret]").map((e=>e.dom)).getOrNull())(e);if(n)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void H_(e,n)):void(zr(n)&&(H_(e,n),e.undoManager.add()))},q_=dr,V_=(e,t,n)=>{const o=wu(e.getBody()),r=T(lu,1===t?o.next:o.prev);if(n.collapsed){const o=e.dom.getParent(n.startContainer,"PRE");if(!o)return;if(!r(Vi.fromRangeStart(n))){const n=yn((e=>{const t=e.dom.create(Il(e));return t.innerHTML='<br data-mce-bogus="1">',t})(e));1===t?ho(yn(o),n):po(yn(o),n),e.selection.select(n.dom,!0),e.selection.collapse()}}},W_=(e,t)=>((e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return((e,t,n)=>KE(t,e,n,Ap,Tp,q_))(n,e,o).orThunk((()=>(V_(e,n,o),I.none())))})(e,((e,t)=>{const n=t?e.getEnd(!0):e.getStart(!0);return wh(n)?!t:t})(e.selection,t)).exists((t=>(VE(e,t),!0))),K_=(e,t)=>((e,t)=>{const n=t?1:-1,o=e.selection.getRng();return((e,t,n)=>YE(t,e,n,(e=>Ap(e)||Np(e)),(e=>Tp(e)||Rp(e)),q_))(n,e,o).orThunk((()=>(V_(e,n,o),I.none())))})(e,t).exists((t=>(VE(e,t),!0))),Y_=(e,t)=>XE(e,t,t?Tp:Ap),G_=(e,t)=>Bx(e,!t).map((n=>{const o=n.toRange(),r=e.selection.getRng();return t?o.setStart(r.startContainer,r.startOffset):o.setEnd(r.endContainer,r.endOffset),o})).exists((t=>(VE(e,t),!0))),X_=e=>H(["figcaption"],Ht(e)),Q_=(e,t)=>!!e.selection.isCollapsed()&&((e,t)=>{const n=yn(e.getBody()),o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n)=>{const o=T(_n,t);return Jn(yn(e.container()),(e=>n.isBlock(Ht(e))),o).filter(X_)})(o,n,e.schema).exists((()=>{if(((e,t,n)=>t?AE(e.dom,n):RE(e.dom,n))(n,t,o)){const o=U_(e,n,t?vo:bo);return e.selection.setRng(o),!0}return!1}))})(e,t),J_=(e,t)=>((e,t)=>t?I.from(e.dom.getParent(e.selection.getNode(),"details")).map((t=>((e,t)=>{const n=e.selection.getRng(),o=Vi.fromRangeStart(n);return!(e.getBody().lastChild!==t||!AE(t,o)||(e.execCommand("InsertNewBlockAfter"),0))})(e,t))).getOr(!1):I.from(e.dom.getParent(e.selection.getNode(),"summary")).bind((t=>I.from(e.dom.getParent(t,"details")).map((n=>((e,t,n)=>{const o=e.selection.getRng(),r=Vi.fromRangeStart(o);return!(e.getBody().firstChild!==t||!RE(n,r)||(e.execCommand("InsertNewBlockBefore"),0))})(e,n,t))))).getOr(!1))(e,t),Z_={shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0},ek=(e,t)=>t.keyCode===e.keyCode&&t.shiftKey===e.shiftKey&&t.altKey===e.altKey&&t.ctrlKey===e.ctrlKey&&t.metaKey===e.metaKey,tk=(e,...t)=>()=>e.apply(null,t),nk=(e,t)=>J(((e,t)=>te((e=>q(e,(e=>({...Z_,...e}))))(e),(e=>ek(e,t)?[e]:[])))(e,t),(e=>e.action())),ok=(e,t)=>ue(((e,t)=>te((e=>q(e,(e=>({...Z_,...e}))))(e),(e=>ek(e,t)?[e]:[])))(e,t),(e=>e.action())),rk=(e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return KE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},sk=(e,t)=>{const n=t?1:-1,o=e.selection.getRng();return YE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},ak=(e,t)=>XE(e,t,t?Sp:kp),ik=hl([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),lk={...ik,none:e=>ik.none(e)},dk=(e,t,n)=>te(Mn(e),(e=>xn(e,t)?n(e)?[e]:[]:dk(e,t,n))),ck=(e,t)=>no(e,"table",t),uk=(e,t,n,o,r=M)=>{const s=1===o;if(!s&&n<=0)return lk.first(e[0]);if(s&&n>=e.length-1)return lk.last(e[e.length-1]);{const s=n+o,a=e[s];return r(a)?lk.middle(t,a):uk(e,t,s,o,r)}},mk=(e,t)=>ck(e,t).bind((t=>{const n=dk(t,"th,td",M);return Z(n,(t=>_n(e,t))).map((e=>({index:e,all:n})))})),fk=(e,t,n,o,r)=>{const s=Uo(yn(n),"td,th,caption").map((e=>e.dom)),a=Y(((e,t)=>te(t,(t=>{const n=((e,t)=>({left:e.left-t,top:e.top-t,right:e.right+-2,bottom:e.bottom+-2,width:e.width+t,height:e.height+t}))(vi(t.getBoundingClientRect()),-1);return[{x:n.left,y:e(n),cell:t},{x:n.right,y:e(n),cell:t}]})))(e,s),(e=>t(e,r)));return((e,t,n)=>X(e,((e,o)=>e.fold((()=>I.some(o)),(e=>{const r=Math.sqrt(Math.abs(e.x-t)+Math.abs(e.y-n)),s=Math.sqrt(Math.abs(o.x-t)+Math.abs(o.y-n));return I.some(s<r?o:e)}))),I.none()))(a,o,r).map((e=>e.cell))},gk=T(fk,(e=>e.bottom),((e,t)=>e.y<t)),pk=T(fk,(e=>e.top),((e,t)=>e.y>t)),hk=(e,t,n)=>{const o=e(t,n);return(e=>e.breakType===hE.Wrap&&0===e.positions.length)(o)||!ar(n.getNode())&&(e=>e.breakType===hE.Br&&1===e.positions.length)(o)?!((e,t,n)=>n.breakAt.exists((n=>e(t,n).breakAt.isSome())))(e,t,o):o.breakAt.isNone()},bk=T(hk,_E),vk=T(hk,kE),yk=(e,t,n,o)=>{const r=e.selection.getRng(),s=t?1:-1;return!(!Dc()||!((e,t,n)=>{const o=Vi.fromRangeStart(t);return Ru(!e,n).exists((e=>e.isEqual(o)))})(t,r,n)||(kx(s,e,n,!t,!1).each((t=>{VE(e,t)})),0))},Ck=(e,t,n)=>{const o=((e,t)=>{const n=t.getNode(e);return Qo(n)?I.some(n):I.none()})(!!t,n),r=!1===t;o.fold((()=>VE(e,n.toRange())),(o=>Ru(r,e.getBody()).filter((e=>e.isEqual(n))).fold((()=>VE(e,n.toRange())),(n=>((e,t,n)=>{t.undoManager.transact((()=>{const o=e?ho:po,r=U_(t,yn(n),o);VE(t,r)}))})(t,e,o)))))},wk=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();if(!t&&bk(o,s)){const o=((e,t,n)=>((e,t)=>le(t.getClientRects()).bind((t=>gk(e,t.left,t.top))).bind((e=>{return EE(Bu(n=e).map((e=>_E(n,e).positions.concat(e))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(SE(e,Vi.before(t)),n.left))))).getOr(Vi.before(t)))(a,n,s);return Ck(e,t,o),!0}if(t&&vk(o,s)){const o=((e,t,n)=>((e,t)=>de(t.getClientRects()).bind((t=>pk(e,t.left,t.top))).bind((e=>{return EE(Ou(n=e).map((e=>[e].concat(kE(n,e).positions))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(NE(e,Vi.after(t)),n.left))))).getOr(Vi.after(t)))(a,n,s);return Ck(e,t,o),!0}return!1},xk=(e,t,n)=>I.from(e.dom.getParent(e.selection.getNode(),"td,th")).bind((o=>I.from(e.dom.getParent(o,"table")).map((r=>n(e,t,r,o))))).getOr(!1),Ek=(e,t)=>xk(e,t,yk),_k=(e,t)=>xk(e,t,wk),kk=(e,t,n)=>n.fold(I.none,I.none,((e,t)=>{return(n=t,Zn(n,Fg)).map((e=>(e=>{const t=xf.exact(e,0,e,0);return Nf(t)})(e)));var n}),(n=>(e.execCommand("mceTableInsertRowAfter"),Sk(e,t,n)))),Sk=(e,t,n)=>{return kk(e,t,(r=oo,mk(o=n,void 0).fold((()=>lk.none(o)),(e=>uk(e.all,o,e.index,1,r)))));var o,r},Nk=(e,t,n)=>{return kk(e,t,(r=oo,mk(o=n,void 0).fold((()=>lk.none()),(e=>uk(e.all,o,e.index,-1,r)))));var o,r},Rk=(e,t)=>{const n=["table","li","dl"],o=yn(e.getBody()),r=e=>{const t=Ht(e);return _n(e,o)||H(n,t)},s=e.selection.getRng();return((e,t)=>((e,t,n=L)=>n(t)?I.none():H(e,Ht(t))?I.some(t):eo(t,e.join(","),(e=>xn(e,"table")||n(e))))(["td","th"],e,t))(yn(t?s.endContainer:s.startContainer),r).map((n=>(ck(n,r).each((t=>{e.model.table.clearSelectedCells(t.dom)})),e.selection.collapse(!t),(t?Sk:Nk)(e,r,n).each((t=>{e.selection.setRng(t)})),!0))).getOr(!1)},Ak=(e,t)=>({container:e,offset:t}),Tk=za.DOM,Ok=e=>t=>e===t?-1:0,Bk=(e,t,n)=>{if(er(e)&&t>=0)return I.some(Ak(e,t));{const o=hi(Tk);return I.from(o.backwards(e,t,Ok(e),n)).map((e=>Ak(e.container,e.container.data.length)))}},Pk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t>=0&&t<=o.length)return I.some(Ak(e,t));{const o=hi(Tk);return I.from(o.backwards(e,t,Ok(e),n)).bind((e=>{const o=e.container.data;return Pk(e.container,t+o.length,n)}))}},Dk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t<=o.length)return I.some(Ak(e,t));{const r=hi(Tk);return I.from(r.forwards(e,t,Ok(e),n)).bind((e=>Dk(e.container,t-o.length,n)))}},Lk=(e,t,n,o,r)=>{const s=hi(e,(e=>t=>e.isBlock(t)||H(["BR","IMG","HR","INPUT"],t.nodeName)||"false"===e.getContentEditable(t))(e));return I.from(s.backwards(t,n,o,r))},Mk=e=>Dr(e.toString().replace(/\u00A0/g," ")),Ik=e=>""!==e&&-1!==" \xa0\f\n\r\t\v".indexOf(e),Fk=(e,t)=>e.substring(t.length),Uk=(e,t,n,o=0)=>{return(r=yn(t.startContainer),no(r,Ug)).fold((()=>((e,t,n,o=0)=>{if(!(r=t).collapsed||!er(r.startContainer))return I.none();var r;const s={text:"",offset:0},a=e.getParent(t.startContainer,e.isBlock)||e.getRoot();return Lk(e,t.startContainer,t.startOffset,((e,t,o)=>(s.text=o+s.text,s.offset+=t,((e,t,n)=>{let o;const r=n.charAt(0);for(o=t-1;o>=0;o--){const s=e.charAt(o);if(Ik(s))return I.none();if(r===s&&je(e,n,o,t))break}return I.some(o)})(s.text,s.offset,n).getOr(t))),a).bind((e=>{const r=t.cloneRange();if(r.setStart(e.container,e.offset),r.setEnd(t.endContainer,t.endOffset),r.collapsed)return I.none();const s=Mk(r);return 0!==s.lastIndexOf(n)||Fk(s,n).length<o?I.none():I.some({text:Fk(s,n),range:r,trigger:n})}))})(e,t,n,o)),(t=>{const o=e.createRng();o.selectNode(t.dom);const r=Mk(o);return I.some({range:o,text:Fk(r,n),trigger:n})}));var r},zk=e=>{if((e=>3===e.nodeType)(e))return Ak(e,e.data.length);{const t=e.childNodes;return t.length>0?zk(t[t.length-1]):Ak(e,t.length)}},jk=(e,t)=>{const n=e.childNodes;return n.length>0&&t<n.length?jk(n[t],0):n.length>0&&(e=>1===e.nodeType)(e)&&n.length===t?zk(n[n.length-1]):Ak(e,t)},Hk=(e,t,n,o={})=>{var r;const s=t(),a=null!==(r=e.selection.getRng().startContainer.nodeValue)&&void 0!==r?r:"",i=Y(s.lookupByTrigger(n.trigger),(t=>n.text.length>=t.minChars&&t.matches.getOrThunk((()=>(e=>t=>{const n=jk(t.startContainer,t.startOffset);return!((e,t)=>{var n;const o=null!==(n=e.getParent(t.container,e.isBlock))&&void 0!==n?n:e.getRoot();return Lk(e,t.container,t.offset,((e,t)=>0===t?-1:t),o).filter((e=>{const t=e.container.data.charAt(e.offset-1);return!Ik(t)})).isSome()})(e,n)})(e.dom)))(n.range,a,n.text)));if(0===i.length)return I.none();const l=Promise.all(q(i,(e=>e.fetch(n.text,e.maxResults,o).then((t=>({matchText:n.text,items:t,columns:e.columns,onAction:e.onAction,highlightOn:e.highlightOn}))))));return I.some({lookupData:l,context:n})};var $k;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}($k||($k={}));const qk=(e,t,n)=>e.stype===$k.Error?t(e.serror):n(e.svalue),Vk=e=>({stype:$k.Value,svalue:e}),Wk=e=>({stype:$k.Error,serror:e}),Kk=qk,Yk=e=>f(e)&&me(e).length>100?" removed due to size":JSON.stringify(e,null,2),Gk=(e,t)=>Wk([{path:e,getErrorInfo:t}]),Xk=(e,t)=>({extract:(n,o)=>xe(o,e).fold((()=>((e,t)=>Gk(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(n,e)),(e=>((e,t,n,o)=>xe(n,o).fold((()=>((e,t,n)=>Gk(e,(()=>'The chosen schema: "'+n+'" did not exist in branches: '+Yk(t))))(e,n,o)),(n=>n.extract(e.concat(["branch: "+o]),t))))(n,o,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+me(t)}),Qk=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const n={};for(let o=0;o<t.length;o++){const r=t[o];for(const t in r)Ee(r,t)&&(n[t]=e(n[t],r[t]))}return n},Jk=Qk(((e,t)=>g(e)&&g(t)?Jk(e,t):t)),Zk=(Qk(((e,t)=>t)),e=>({tag:"defaultedThunk",process:N(e)})),eS=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{qk(e,(e=>n.push(e)),(e=>t.push(e)))})),{values:t,errors:n}})(e);return t.errors.length>0?(n=t.errors,k(Wk,ee)(n)):Vk(t.values);var n},tS=(e,t,n)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return n(e.newKey,e.instantiator)}},nS=e=>({extract:(t,n)=>{return o=e(n),r=e=>((e,t)=>Gk(e,N(t)))(t,e),o.stype===$k.Error?r(o.serror):o;var o,r},toString:N("val")}),oS=nS(Vk),rS=(e,t,n,o)=>o(xe(e,t).getOrThunk((()=>n(e)))),sS=(e,t,n,o,r)=>{const s=e=>r.extract(t.concat([o]),e),a=e=>e.fold((()=>Vk(I.none())),(e=>{const n=r.extract(t.concat([o]),e);return s=n,a=I.some,s.stype===$k.Value?{stype:$k.Value,svalue:a(s.svalue)}:s;var s,a}));switch(e.tag){case"required":return((e,t,n,o)=>xe(t,n).fold((()=>((e,t,n)=>Gk(e,(()=>'Could not find valid *required* value for "'+t+'" in '+Yk(n))))(e,n,t)),o))(t,n,o,s);case"defaultedThunk":return rS(n,o,e.process,s);case"option":return((e,t,n)=>n(xe(e,t)))(n,o,a);case"defaultedOptionThunk":return((e,t,n,o)=>o(xe(e,t).map((t=>!0===t?n(e):t))))(n,o,e.process,a);case"mergeWithThunk":return rS(n,o,N({}),(t=>{const o=Jk(e.process(n),t);return s(o)}))}},aS=e=>({extract:(t,n)=>((e,t,n)=>{const o={},r=[];for(const s of n)tS(s,((n,s,a,i)=>{const l=sS(a,e,t,n,i);Kk(l,(e=>{r.push(...e)}),(e=>{o[s]=e}))}),((e,n)=>{o[e]=n(t)}));return r.length>0?Wk(r):Vk(o)})(t,n,e),toString:()=>{const t=q(e,(e=>tS(e,((e,t,n,o)=>e+" -> "+o.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),iS=e=>({extract:(t,n)=>{const o=q(n,((n,o)=>e.extract(t.concat(["["+o+"]"]),n)));return eS(o)},toString:()=>"array("+e.toString()+")"}),lS=(e,t,n)=>{return o=((e,t,n)=>((e,t)=>e.stype===$k.Error?{stype:$k.Error,serror:t(e.serror)}:e)(t.extract([e],n),(e=>({input:n,errors:e}))))(e,t,n),qk(o,pl.error,pl.value);var o},dS=(e,t)=>Xk(e,pe(t,aS)),cS=N(oS),uS=(e,t)=>nS((n=>{const o=typeof n;return e(n)?Vk(n):Wk(`Expected type: ${t} but got: ${o}`)})),mS=uS(x,"number"),fS=uS(m,"string"),gS=uS(b,"boolean"),pS=uS(w,"function"),hS=(e,t,n,o)=>({tag:"field",key:e,newKey:t,presence:n,prop:o}),bS=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),vS=(e,t)=>hS(e,e,{tag:"required",process:{}},t),yS=e=>vS(e,fS),CS=e=>vS(e,pS),wS=(e,t)=>hS(e,e,{tag:"option",process:{}},t),xS=e=>wS(e,fS),ES=(e,t,n)=>hS(e,e,Zk(t),n),_S=(e,t)=>ES(e,t,mS),kS=(e,t,n)=>ES(e,t,(e=>{return t=t=>H(e,t)?pl.value(t):pl.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`),nS((e=>t(e).fold(Wk,Vk)));var t})(n)),SS=(e,t)=>ES(e,t,gS),NS=(e,t)=>ES(e,t,pS),RS=yS("type"),AS=CS("fetch"),TS=CS("onAction"),OS=NS("onSetup",(()=>_)),BS=xS("text"),PS=xS("icon"),DS=xS("tooltip"),LS=xS("label"),MS=SS("active",!1),IS=SS("enabled",!0),FS=SS("primary",!1),US=e=>((e,t)=>ES("type",t,fS))(0,e),zS=aS([RS,yS("trigger"),_S("minChars",1),(1,((e,t)=>hS(e,e,Zk(1),cS()))("columns")),_S("maxResults",10),("matches",wS("matches",pS)),AS,TS,(jS=fS,ES("highlightOn",[],iS(jS)))]);var jS;const HS=[IS,DS,PS,BS,OS],$S=[MS].concat(HS),qS=[NS("predicate",L),kS("scope","node",["node","editor"]),kS("position","selection",["node","selection","line"])],VS=HS.concat([US("contextformbutton"),FS,TS,bS("original",R)]),WS=$S.concat([US("contextformbutton"),FS,TS,bS("original",R)]),KS=HS.concat([US("contextformbutton")]),YS=$S.concat([US("contextformtogglebutton")]),GS=dS("type",{contextformbutton:VS,contextformtogglebutton:WS});aS([US("contextform"),NS("initValue",N("")),LS,((e,t)=>hS(e,e,{tag:"required",process:{}},iS(t)))("commands",GS),wS("launch",dS("type",{contextformbutton:KS,contextformtogglebutton:YS}))].concat(qS));const XS=e=>{const t=e.ui.registry.getAll().popups,n=pe(t,(e=>{return(t=e,lS("Autocompleter",zS,{trigger:t.ch,...t})).fold((e=>{throw new Error("Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:N("... (only showing first ten failures)")}]):e;return q(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})((t=e).errors).join("\n")+"\n\nInput object: "+Yk(t.input));var t}),R);var t})),o=ke(Ce(n,(e=>e.trigger))),r=we(n);return{dataset:n,triggers:o,lookupByTrigger:e=>Y(r,(t=>t.trigger===e))}},QS=e=>{const t=Xa(),n=$a(!1),o=t.isSet,r=()=>{o()&&((e=>{JC(e).autocompleter.removeDecoration()})(e),(e=>{e.dispatch("AutocompleterEnd")})(e),n.set(!1),t.clear())},s=De((()=>XS(e))),a=a=>{(n=>t.get().map((t=>Uk(e.dom,e.selection.getRng(),t.trigger).bind((t=>Hk(e,s,t,n))))).getOrThunk((()=>((e,t)=>{const n=t(),o=e.selection.getRng();return((e,t,n)=>ue(n.triggers,(n=>Uk(e,t,n))))(e.dom,o,n).bind((n=>Hk(e,t,n)))})(e,s))))(a).fold(r,(s=>{(n=>{o()||(((e,t)=>{JC(e).autocompleter.addDecoration(t)})(e,n.range),t.set({trigger:n.trigger,matchLength:n.text.length}))})(s.context),s.lookupData.then((o=>{t.get().map((a=>{const i=s.context;a.trigger===i.trigger&&(i.text.length-a.matchLength>=10?r():(t.set({...a,matchLength:i.text.length}),n.get()?((e,t)=>{e.dispatch("AutocompleterUpdate",t)})(e,{lookupData:o}):(n.set(!0),((e,t)=>{e.dispatch("AutocompleterStart",t)})(e,{lookupData:o}))))}))}))}))};e.addCommand("mceAutocompleterReload",((e,t)=>{const n=f(t)?t.fetchOptions:{};a(n)})),e.addCommand("mceAutocompleterClose",r),((e,t)=>{const n=Ja(t.load,50);e.on("keypress compositionend",(e=>{27!==e.which&&n.throttle()})),e.on("keydown",(e=>{const o=e.which;8===o?n.throttle():27===o&&t.cancelIfNecessary()})),e.on("remove",n.cancel)})(e,{cancelIfNecessary:r,load:a})},JS=xt().browser.isSafari(),ZS=e=>Or(yn(e)),eN=(e,t)=>{var n;return 0===e.startOffset&&e.endOffset===(null===(n=t.textContent)||void 0===n?void 0:n.length)},tN=(e,t)=>I.from(e.getParent(t.container(),"details")),nN=(e,t)=>tN(e,t).isSome(),oN=(e,t)=>{const n=t.getNode();v(n)||e.selection.setCursorLocation(n,t.offset())},rN=(e,t,n)=>{const o=e.dom.getParent(t.container(),"details");if(o&&!o.open){const t=e.dom.select("summary",o)[0];t&&(n?Ou(t):Bu(t)).each((t=>oN(e,t)))}else oN(e,t)},sN=(e,t,n)=>{const{dom:o,selection:r}=e,s=e.getBody();if("character"===n){const n=Vi.fromRangeStart(r.getRng()),a=o.getParent(n.container(),o.isBlock),i=tN(o,n),l=a&&o.isEmpty(a),d=h(null==a?void 0:a.previousSibling),c=h(null==a?void 0:a.nextSibling);return!!(l&&(t?c:d)&&Su(!t,s,n).exists((e=>nN(o,e)&&!Lt(i,tN(o,e)))))||Su(t,s,n).fold(L,(n=>{const r=tN(o,n);if(nN(o,n)&&!Lt(i,r)){if(t||rN(e,n,!1),a&&l){if(t&&d)return!0;if(!t&&c)return!0;rN(e,n,t),e.dom.remove(a)}return!0}return!1}))}return!1},aN=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();return"selection"===o?((e,t)=>{const n=t.startSummary.exists((t=>t.contains(e.startContainer))),o=t.startSummary.exists((t=>t.contains(e.endContainer))),r=t.startDetails.forall((e=>t.endDetails.forall((t=>e!==t))));return(n||o)&&!(n&&o)||r})(r,t):n?((e,t)=>t.startSummary.exists((t=>((e,t)=>Bu(t).exists((n=>ar(n.getNode())&&Tu(t,n).exists((t=>t.isEqual(e)))||n.isEqual(e))))(e,t))))(s,t)||((e,t,n)=>n.startDetails.exists((n=>Au(e,t).forall((e=>!n.contains(e.container()))))))(a,s,t):((e,t)=>t.startSummary.exists((t=>((e,t)=>Ou(t).exists((t=>t.isEqual(e))))(e,t))))(s,t)||((e,t)=>t.startDetails.exists((n=>Tu(n,e).forall((n=>t.startSummary.exists((t=>!t.contains(e.container())&&t.contains(n.container()))))))))(s,t)},iN=(e,t,n)=>((e,t,n)=>((e,t)=>{const n=I.from(e.getParent(t.startContainer,"details")),o=I.from(e.getParent(t.endContainer,"details"));if(n.isSome()||o.isSome()){const t=n.bind((t=>I.from(e.select("summary",t)[0])));return I.some({startSummary:t,startDetails:n,endDetails:o})}return I.none()})(e.dom,e.selection.getRng()).fold((()=>sN(e,t,n)),(o=>aN(e,o,t,n)||sN(e,t,n))))(e,t,n)||JS&&((e,t,n)=>{const o=e.selection,r=o.getNode(),s=o.getRng(),a=Vi.fromRangeStart(s);return!!pr(r)&&("selection"===n&&eN(s,r)||Oh(t,a,r)?ZS(r):e.undoManager.transact((()=>{const s=o.getSel();let{anchorNode:a,anchorOffset:i,focusNode:l,focusOffset:d}=null!=s?s:{};const c=()=>{C(a)&&C(i)&&C(l)&&C(d)&&(null==s||s.setBaseAndExtent(a,i,l,d))},u=(e,t)=>{V(e.childNodes,(e=>{dm(e)&&t.appendChild(e)}))},m=e.dom.create("span",{"data-mce-bogus":"1"});u(r,m),r.appendChild(m),c(),"word"!==n&&"line"!==n||null==s||s.modify("extend",t?"right":"left",n),!o.isCollapsed()&&eN(o.getRng(),m)?ZS(r):(e.execCommand(t?"ForwardDelete":"Delete"),a=null==s?void 0:s.anchorNode,i=null==s?void 0:s.anchorOffset,l=null==s?void 0:s.focusNode,d=null==s?void 0:s.focusOffset,u(m,r),c()),e.dom.remove(m)})),!0)})(e,t,n)?I.some(_):I.none(),lN=e=>(t,n,o={})=>{const r=t.getBody(),s={bubbles:!0,composed:!0,data:null,isComposing:!1,detail:0,view:null,target:r,currentTarget:r,eventPhase:Event.AT_TARGET,originalTarget:r,explicitOriginalTarget:r,isTrusted:!1,srcElement:r,cancelable:!1,preventDefault:_,inputType:n},a=Ea(new InputEvent(e));return t.dispatch(e,{...a,...s,...o})},dN=lN("input"),cN=lN("beforeinput"),uN=xt(),mN=uN.os,fN=mN.isMacOS()||mN.isiOS(),gN=uN.browser.isFirefox(),pN=(e,t)=>{const n=e.dom,o=e.schema.getMoveCaretBeforeOnEnterElements();if(!t)return;if(/^(LI|DT|DD)$/.test(t.nodeName)){const e=(e=>{for(;e;){if(qo(e)||er(e)&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}return null})(t.firstChild);e&&/^(UL|OL|DL)$/.test(e.nodeName)&&t.insertBefore(n.doc.createTextNode(br),t.firstChild)}const r=n.createRng();if(t.normalize(),t.hasChildNodes()){const e=new jo(t,t);let n,s=t;for(;n=e.current();){if(er(n)){r.setStart(n,0),r.setEnd(n,0);break}if(o[n.nodeName.toLowerCase()]){r.setStartBefore(n),r.setEndBefore(n);break}s=n,n=e.next()}n||(r.setStart(s,0),r.setEnd(s,0))}else ar(t)?t.nextSibling&&n.isBlock(t.nextSibling)?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)):(r.setStart(t,0),r.setEnd(t,0));e.selection.setRng(r),sg(e,r)},hN=(e,t)=>{const n=e.getRoot();let o,r=t;for(;r!==n&&r&&"false"!==e.getContentEditable(r);){if("true"===e.getContentEditable(r)){o=r;break}r=r.parentNode}return r!==n?o:n},bN=e=>I.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock)),vN=e=>{e.innerHTML='<br data-mce-bogus="1">'},yN=(e,t)=>{Il(e).toLowerCase()===t.tagName.toLowerCase()&&((e,t,n)=>{const o=e.dom;I.from(n.style).map(o.parseStyle).each((e=>{const n={...fo(yn(t)),...e};o.setStyles(t,n)}));const r=I.from(n.class).map((e=>e.split(/\s+/))),s=I.from(t.className).map((e=>Y(e.split(/\s+/),(e=>""!==e))));Mt(r,s,((e,n)=>{const r=Y(n,(t=>!H(e,t))),s=[...e,...r];o.setAttrib(t,"class",s.join(" "))}));const a=["style","class"],i=ye(n,((e,t)=>!H(a,t)));o.setAttribs(t,i)})(e,t,Fl(e))},CN=(e,t,n,o,r=!0,s,a)=>{const i=e.dom,l=e.schema,d=Il(e),c=n?n.nodeName.toUpperCase():"";let u=t;const m=l.getTextInlineElements();let f;f=s||"TABLE"===c||"HR"===c?i.create(s||d,a||{}):n.cloneNode(!1);let g=f;if(r){do{if(m[u.nodeName]){if(Du(u)||Ku(u))continue;const e=u.cloneNode(!1);i.setAttrib(e,"id",""),f.hasChildNodes()?(e.appendChild(f.firstChild),f.appendChild(e)):(g=e,f.appendChild(e))}}while((u=u.parentNode)&&u!==o)}else i.setAttrib(f,"style",null),i.setAttrib(f,"class",null);return yN(e,f),vN(g),f},wN=(e,t)=>{const n=null==e?void 0:e.parentNode;return C(n)&&n.nodeName===t},xN=e=>C(e)&&/^(OL|UL|LI)$/.test(e.nodeName),EN=e=>C(e)&&/^(LI|DT|DD)$/.test(e.nodeName),_N=e=>{const t=e.parentNode;return EN(t)?t:e},kN=(e,t,n)=>{let o=e[n?"firstChild":"lastChild"];for(;o&&!qo(o);)o=o[n?"nextSibling":"previousSibling"];return o===t},SN=e=>X(Ce(fo(yn(e)),((e,t)=>`${t}: ${e};`)),((e,t)=>e+t),""),NN=(e,t)=>t&&"A"===t.nodeName&&e.isEmpty(t),RN=(e,t)=>e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t,AN=(e,t)=>C(t)&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&e.isEditable(t.parentNode)&&"false"!==e.getContentEditable(t),TN=(e,t,n)=>er(t)?e?1===n&&t.data.charAt(n-1)===Br?0:n:n===t.data.length-1&&t.data.charAt(n)===Br?t.data.length:n:n,ON={insert:(e,t)=>{let n,o,r,s,a=!1;const i=e.dom,l=e.schema.getNonEmptyElements(),d=e.selection.getRng(),c=Il(e),u=yn(d.startContainer),f=In(u,d.startOffset),g=f.exists((e=>Vt(e)&&!oo(e))),p=d.collapsed&&g,b=(t,o)=>CN(e,n,k,_,Hl(e),t,o),v=e=>{const t=TN(e,n,o);if(er(n)&&(e?t>0:t<n.data.length))return!1;if(n.parentNode===k&&a&&!e)return!0;if(e&&qo(n)&&n===k.firstChild)return!0;if(RN(n,"TABLE")||RN(n,"HR"))return a&&!e||!a&&e;const r=new jo(n,k);let s;for(er(n)&&(e&&0===t?r.prev():e||t!==n.data.length||r.next());s=r.current();){if(qo(s)){if(!s.getAttribute("data-mce-bogus")){const e=s.nodeName.toLowerCase();if(l[e]&&"br"!==e)return!1}}else if(er(s)&&!ss(s.data))return!1;e?r.prev():r.next()}return!0},w=()=>{let t;return t=/^(H[1-6]|PRE|FIGURE)$/.test(r)&&"HGROUP"!==S?b(c):b(),((e,t)=>{const n=$l(e);return!y(t)&&(m(n)?H(Pt.explode(n),t.nodeName.toLowerCase()):n)})(e,s)&&AN(i,s)&&i.isEmpty(k,void 0,{includeZwsp:!0})?t=i.split(s,k):i.insertAfter(t,k),pN(e,t),t};Mf(i,d).each((e=>{d.setStart(e.startContainer,e.startOffset),d.setEnd(e.endContainer,e.endOffset)})),n=d.startContainer,o=d.startOffset;const x=!(!t||!t.shiftKey),E=!(!t||!t.ctrlKey);qo(n)&&n.hasChildNodes()&&!p&&(a=o>n.childNodes.length-1,n=n.childNodes[Math.min(o,n.childNodes.length-1)]||n,o=a&&er(n)?n.data.length:0);const _=hN(i,n);if(!_||((e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return null!==n&&"false"===e.dom.getContentEditableParent(n)})(e,n))return;x||(n=((e,t,n,o,r)=>{var s,a;const i=e.dom,l=null!==(s=hN(i,o))&&void 0!==s?s:i.getRoot();let d=i.getParent(o,i.isBlock);if(!d||!AN(i,d)){if(d=d||l,!d.hasChildNodes()){const o=i.create(t);return yN(e,o),d.appendChild(o),n.setStart(o,0),n.setEnd(o,0),o}let s,c=o;for(;c&&c.parentNode!==d;)c=c.parentNode;for(;c&&!i.isBlock(c);)s=c,c=c.previousSibling;const u=null===(a=null==s?void 0:s.parentElement)||void 0===a?void 0:a.nodeName;if(s&&u&&e.schema.isValidChild(u,t.toLowerCase())){const a=s.parentNode,l=i.create(t);for(yN(e,l),a.insertBefore(l,s),c=s;c&&!i.isBlock(c);){const e=c.nextSibling;l.appendChild(c),c=e}n.setStart(o,r),n.setEnd(o,r)}}return o})(e,c,d,n,o));let k=i.getParent(n,i.isBlock)||i.getRoot();s=C(null==k?void 0:k.parentNode)?i.getParent(k.parentNode,i.isBlock):null,r=k?k.nodeName.toUpperCase():"";const S=s?s.nodeName.toUpperCase():"";if("LI"!==S||E||(k=s,s=s.parentNode,r=S),qo(s)&&((e,t,n)=>!t&&n.nodeName.toLowerCase()===Il(e)&&e.dom.isEmpty(n)&&((t,n,o)=>{let r=n;for(;r&&r!==t&&h(r.nextSibling);){const t=r.parentElement;if(!t||(s=t,!Ee(e.schema.getTextBlockElements(),s.nodeName.toLowerCase())))return gr(t);r=t}var s;return!1})(e.getBody(),n))(e,x,k))return((e,t,n)=>{var o,r,s;const a=t(Il(e)),i=((e,t)=>e.dom.getParent(t,gr))(e,n);i&&(e.dom.insertAfter(a,i),pN(e,a),(null!==(s=null===(r=null===(o=n.parentElement)||void 0===o?void 0:o.childNodes)||void 0===r?void 0:r.length)&&void 0!==s?s:0)>1&&e.dom.remove(n))})(e,b,k);if(/^(LI|DT|DD)$/.test(r)&&qo(s)&&i.isEmpty(k))return void((e,t,n,o,r)=>{const s=e.dom,a=e.selection.getRng(),i=n.parentNode;if(n===e.getBody()||!i)return;var l;xN(l=n)&&xN(l.parentNode)&&(r="LI");const d=EN(o)?SN(o):void 0;let c=EN(o)&&d?t(r,{style:SN(o)}):t(r);if(kN(n,o,!0)&&kN(n,o,!1))if(wN(n,"LI")){const e=_N(n);s.insertAfter(c,e),(e=>{var t;return(null===(t=e.parentNode)||void 0===t?void 0:t.firstChild)===e})(n)?s.remove(e):s.remove(n)}else s.replace(c,n);else if(kN(n,o,!0))wN(n,"LI")?(s.insertAfter(c,_N(n)),c.appendChild(s.doc.createTextNode(" ")),c.appendChild(n)):i.insertBefore(c,n),s.remove(o);else if(kN(n,o,!1))s.insertAfter(c,_N(n)),s.remove(o);else{n=_N(n);const e=a.cloneRange();e.setStartAfter(o),e.setEndAfter(n);const t=e.extractContents();if("LI"===r&&((e,t)=>e.firstChild&&"LI"===e.firstChild.nodeName)(t)){const e=Y(q(c.children,yn),O(Xt("br")));c=t.firstChild,s.insertAfter(t,n),V(e,(e=>bo(yn(c),e))),d&&c.setAttribute("style",d)}else s.insertAfter(t,n),s.insertAfter(c,n);s.remove(o)}pN(e,c)})(e,b,s,k,c);if(!(p||k!==e.getBody()&&AN(i,k)))return;const N=k.parentNode;let R;if(p)R=b(c),f.fold((()=>{vo(u,yn(R))}),(e=>{po(e,yn(R))})),e.selection.setCursorLocation(R,0);else if(Ir(k))R=Vr(k),i.isEmpty(k)&&vN(k),yN(e,R),pN(e,R);else if(v(!1))R=w();else if(v(!0)&&N){R=N.insertBefore(b(),k);const t=yn(d.startContainer).dom.hasChildNodes()&&d.collapsed;pN(e,RN(k,"HR")||t?R:k)}else{const t=(e=>{const t=e.cloneRange();return t.setStart(e.startContainer,TN(!0,e.startContainer,e.startOffset)),t.setEnd(e.endContainer,TN(!1,e.endContainer,e.endOffset)),t})(d).cloneRange();t.setEndAfter(k);const n=t.extractContents();(e=>{V(Fo(yn(e),Kt),(e=>{const t=e.dom;t.nodeValue=Dr(t.data)}))})(n),(e=>{let t=e;do{er(t)&&(t.data=t.data.replace(/^[\r\n]+/,"")),t=t.firstChild}while(t)})(n),R=n.firstChild,i.insertAfter(n,k),((e,t,n)=>{var o;const r=[];if(!n)return;let s=n;for(;s=s.firstChild;){if(e.isBlock(s))return;qo(s)&&!t[s.nodeName.toLowerCase()]&&r.push(s)}let a=r.length;for(;a--;)s=r[a],(!s.hasChildNodes()||s.firstChild===s.lastChild&&""===(null===(o=s.firstChild)||void 0===o?void 0:o.nodeValue)||NN(e,s))&&e.remove(s)})(i,l,R),((e,t)=>{t.normalize();const n=t.lastChild;(!n||qo(n)&&/^(left|right)$/gi.test(e.getStyle(n,"float",!0)))&&e.add(t,"br")})(i,k),i.isEmpty(k)&&vN(k),R.normalize(),i.isEmpty(R)?(i.remove(R),w()):(yN(e,R),pN(e,R))}i.setAttrib(R,"id",""),e.dispatch("NewBlock",{newBlock:R})},fakeEventName:"insertParagraph"},BN=(e,t,n)=>{const o=e.dom.createRng();n?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),e.selection.setRng(o),sg(e,o)},PN=(e,t)=>{const n=bn("br");po(yn(t),n),e.undoManager.add()},DN=(e,t)=>{LN(e.getBody(),t)||ho(yn(t),bn("br"));const n=bn("br");ho(yn(t),n),BN(e,n.dom,!1),e.undoManager.add()},LN=(e,t)=>{return n=Vi.after(t),!!ar(n.getNode())||Au(e,Vi.after(t)).map((e=>ar(e.getNode()))).getOr(!1);var n},MN=e=>e&&"A"===e.nodeName&&"href"in e,IN=e=>e.fold(L,MN,MN,L),FN=(e,t)=>{t.fold(_,T(PN,e),T(DN,e),_)},UN={insert:(e,t)=>{const n=(e=>{const t=T(Ch,e),n=Vi.fromRangeStart(e.selection.getRng());return iE(t,e.getBody(),n).filter(IN)})(e);n.isSome()?n.each(T(FN,e)):((e,t)=>{const n=e.selection,o=e.dom,r=n.getRng();let s,a=!1;Mf(o,r).each((e=>{r.setStart(e.startContainer,e.startOffset),r.setEnd(e.endContainer,e.endOffset)}));let i=r.startOffset,l=r.startContainer;if(qo(l)&&l.hasChildNodes()){const e=i>l.childNodes.length-1;l=l.childNodes[Math.min(i,l.childNodes.length-1)]||l,i=e&&er(l)?l.data.length:0}let d=o.getParent(l,o.isBlock);const c=d&&d.parentNode?o.getParent(d.parentNode,o.isBlock):null,u=c?c.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==u||m||(d=c),er(l)&&i>=l.data.length&&(((e,t,n)=>{const o=new jo(t,n);let r;const s=e.getNonEmptyElements();for(;r=o.next();)if(s[r.nodeName.toLowerCase()]||er(r)&&r.length>0)return!0;return!1})(e.schema,l,d||o.getRoot())||(s=o.create("br"),r.insertNode(s),r.setStartAfter(s),r.setEndAfter(s),a=!0)),s=o.create("br"),Ki(o,r,s),BN(e,s,a),e.undoManager.add()})(e,t)},fakeEventName:"insertLineBreak"},zN=(e,t)=>bN(e).filter((e=>t.length>0&&xn(yn(e),t))).isSome(),jN=hl([{br:[]},{block:[]},{none:[]}]),HN=(e,t)=>(e=>zN(e,jl(e)))(e),$N=e=>(t,n)=>(e=>bN(e).filter((e=>Sr(yn(e)))).isSome())(t)===e,qN=(e,t)=>(n,o)=>{const r=(e=>bN(e).fold(N(""),(e=>e.nodeName.toUpperCase())))(n)===e.toUpperCase();return r===t},VN=e=>{const t=hN(e.dom,e.selection.getStart());return y(t)},WN=e=>qN("pre",e),KN=e=>(t,n)=>Ml(t)===e,YN=(e,t)=>(e=>zN(e,zl(e)))(e),GN=(e,t)=>t,XN=e=>{const t=Il(e),n=hN(e.dom,e.selection.getStart());return C(n)&&e.schema.isValidChild(n.nodeName,t)},QN=e=>{const t=e.selection.getRng(),n=yn(t.startContainer),o=In(n,t.startOffset).map((e=>Vt(e)&&!oo(e)));return t.collapsed&&o.getOr(!0)},JN=(e,t)=>(n,o)=>X(e,((e,t)=>e&&t(n,o)),!0)?I.some(t):I.none(),ZN=(e,t,n)=>{t.selection.isCollapsed()||(e=>{e.execCommand("delete")})(t),C(n)&&cN(t,e.fakeEventName).isDefaultPrevented()||(e.insert(t,n),C(n)&&dN(t,e.fakeEventName))},eR=(e,t)=>{const n=()=>ZN(UN,e,t),o=()=>ZN(ON,e,t),r=((e,t)=>Qx([JN([HN],jN.none()),JN([WN(!0),VN],jN.none()),JN([qN("summary",!0)],jN.br()),JN([WN(!0),KN(!1),GN],jN.br()),JN([WN(!0),KN(!1)],jN.block()),JN([WN(!0),KN(!0),GN],jN.block()),JN([WN(!0),KN(!0)],jN.br()),JN([$N(!0),GN],jN.br()),JN([$N(!0)],jN.block()),JN([YN],jN.br()),JN([GN],jN.br()),JN([XN],jN.block()),JN([QN],jN.block())],[e,!(!t||!t.shiftKey)]).getOr(jN.none()))(e,t);switch(Ul(e)){case"linebreak":r.fold(n,n,_);break;case"block":r.fold(o,o,_);break;case"invert":r.fold(o,n,_);break;default:r.fold(n,o,_)}},tR=xt(),nR=tR.os.isiOS()&&tR.browser.isSafari(),oR=(e,t)=>{var n;t.isDefaultPrevented()||(t.preventDefault(),(n=e.undoManager).typing&&(n.typing=!1,n.add()),e.undoManager.transact((()=>{eR(e,t)})))},rR=xt(),sR=e=>e.stopImmediatePropagation(),aR=e=>e.keyCode===af.PAGE_UP||e.keyCode===af.PAGE_DOWN,iR=(e,t,n)=>{n&&!e.get()?t.on("NodeChange",sR,!0):!n&&e.get()&&t.off("NodeChange",sR),e.set(n)},lR=(e,t)=>{const n=t.container(),o=t.offset();return er(n)?(n.insertData(o,e),I.some(Vi(n,o+e.length))):iu(t).map((n=>{const o=vn(e);return t.isAtEnd()?ho(n,o):po(n,o),Vi(o.dom,e.length)}))},dR=T(lR,br),cR=T(lR," "),uR=e=>t=>{e.selection.setRng(t.toRange()),e.nodeChanged()},mR=e=>{const t=Vi.fromRangeStart(e.selection.getRng()),n=yn(e.getBody());if(e.selection.isCollapsed()){const o=T(Ch,e),r=Vi.fromRangeStart(e.selection.getRng());return iE(o,e.getBody(),r).bind((e=>t=>t.fold((t=>Tu(e.dom,Vi.before(t))),(e=>Ou(e)),(e=>Bu(e)),(t=>Au(e.dom,Vi.after(t)))))(n)).map((o=>()=>((e,t,n)=>o=>Zp(e,o,n)?dR(t):cR(t))(n,t,e.schema)(o).each(uR(e))))}return I.none()},fR=e=>{return It(At.browser.isFirefox()&&e.selection.isEditable()&&(t=e.dom,n=e.selection.getRng().startContainer,t.isEditable(t.getParent(n,"summary"))),(()=>{const t=yn(e.getBody());e.selection.isCollapsed()||e.getDoc().execCommand("Delete"),((e,t,n)=>Zp(e,t,n)?dR(t):cR(t))(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each(uR(e))}));var t,n},gR=e=>hc(e)?[{keyCode:af.TAB,action:tk(Rk,e,!0)},{keyCode:af.TAB,shiftKey:!0,action:tk(Rk,e,!1)}]:[],pR=e=>{if(e.addShortcut("Meta+P","","mcePrint"),QS(e),XC(e))return $a(null);{const t=o_(e);return(e=>{e.on("beforeinput",(t=>{e.selection.isEditable()&&!$(t.getTargetRanges(),(t=>!Og(e.dom,t)))||t.preventDefault()}))})(e),(e=>{e.on("keyup compositionstart",T($_,e))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();nk([{keyCode:af.RIGHT,action:tk(W_,e,!0)},{keyCode:af.LEFT,action:tk(W_,e,!1)},{keyCode:af.UP,action:tk(K_,e,!1)},{keyCode:af.DOWN,action:tk(K_,e,!0)},...o?[{keyCode:af.UP,action:tk(G_,e,!1),metaKey:!0,shiftKey:!0},{keyCode:af.DOWN,action:tk(G_,e,!0),metaKey:!0,shiftKey:!0}]:[],{keyCode:af.RIGHT,action:tk(Ek,e,!0)},{keyCode:af.LEFT,action:tk(Ek,e,!1)},{keyCode:af.UP,action:tk(_k,e,!1)},{keyCode:af.DOWN,action:tk(_k,e,!0)},{keyCode:af.UP,action:tk(_k,e,!1)},{keyCode:af.UP,action:tk(J_,e,!1)},{keyCode:af.DOWN,action:tk(J_,e,!0)},{keyCode:af.RIGHT,action:tk(rk,e,!0)},{keyCode:af.LEFT,action:tk(rk,e,!1)},{keyCode:af.UP,action:tk(sk,e,!1)},{keyCode:af.DOWN,action:tk(sk,e,!0)},{keyCode:af.RIGHT,action:tk(t_,e,t,!0)},{keyCode:af.LEFT,action:tk(t_,e,t,!1)},{keyCode:af.RIGHT,ctrlKey:!o,altKey:o,action:tk(r_,e,t)},{keyCode:af.LEFT,ctrlKey:!o,altKey:o,action:tk(s_,e,t)},{keyCode:af.UP,action:tk(Q_,e,!1)},{keyCode:af.DOWN,action:tk(Q_,e,!0)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{let n=!1;e.on("keydown",(o=>{n=o.keyCode===af.BACKSPACE,o.isDefaultPrevented()||((e,t,n)=>{const o=n.keyCode===af.BACKSPACE?"deleteContentBackward":"deleteContentForward",r=e.selection.isCollapsed(),s=r?"character":"selection",a=e=>r?e?"word":"line":"selection";ok([{keyCode:af.BACKSPACE,action:tk(T_,e)},{keyCode:af.BACKSPACE,action:tk(Ux,e,!1)},{keyCode:af.DELETE,action:tk(Ux,e,!0)},{keyCode:af.BACKSPACE,action:tk(Ox,e,!1)},{keyCode:af.DELETE,action:tk(Ox,e,!0)},{keyCode:af.BACKSPACE,action:tk(d_,e,t,!1)},{keyCode:af.DELETE,action:tk(d_,e,t,!0)},{keyCode:af.BACKSPACE,action:tk(ib,e,!1)},{keyCode:af.DELETE,action:tk(ib,e,!0)},{keyCode:af.BACKSPACE,action:tk(iN,e,!1,s)},{keyCode:af.DELETE,action:tk(iN,e,!0,s)},...fN?[{keyCode:af.BACKSPACE,altKey:!0,action:tk(iN,e,!1,a(!0))},{keyCode:af.DELETE,altKey:!0,action:tk(iN,e,!0,a(!0))},{keyCode:af.BACKSPACE,metaKey:!0,action:tk(iN,e,!1,a(!1))}]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:tk(iN,e,!1,a(!0))},{keyCode:af.DELETE,ctrlKey:!0,action:tk(iN,e,!0,a(!0))}],{keyCode:af.BACKSPACE,action:tk(zx,e,!1)},{keyCode:af.DELETE,action:tk(zx,e,!0)},{keyCode:af.BACKSPACE,action:tk(x_,e,!1)},{keyCode:af.DELETE,action:tk(x_,e,!0)},{keyCode:af.BACKSPACE,action:tk(_x,e,!1)},{keyCode:af.DELETE,action:tk(_x,e,!0)},{keyCode:af.BACKSPACE,action:tk(wx,e,!1)},{keyCode:af.DELETE,action:tk(wx,e,!0)},{keyCode:af.BACKSPACE,action:tk(v_,e,!1)},{keyCode:af.DELETE,action:tk(v_,e,!0)}],n).filter((t=>e.selection.isEditable())).each((t=>{n.preventDefault(),cN(e,o).isDefaultPrevented()||(t(),dN(e,o))}))})(e,t,o)})),e.on("keyup",(t=>{t.isDefaultPrevented()||((e,t,n)=>{nk([{keyCode:af.BACKSPACE,action:tk(Fx,e)},{keyCode:af.DELETE,action:tk(Fx,e)},...fN?[{keyCode:af.BACKSPACE,altKey:!0,action:tk(C_,e)},{keyCode:af.DELETE,altKey:!0,action:tk(C_,e)},...n?[{keyCode:gN?224:91,action:tk(C_,e)}]:[]]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:tk(C_,e)},{keyCode:af.DELETE,ctrlKey:!0,action:tk(C_,e)}]],t)})(e,t,n),n=!1}))})(e,t),(e=>{let t=I.none();e.on("keydown",(n=>{n.keyCode===af.ENTER&&(nR&&(e=>{if(!e.collapsed)return!1;const t=e.startContainer;if(er(t)){const n=/^[\uAC00-\uD7AF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uD7B0-\uD7FF]$/,o=t.data.charAt(e.startOffset-1);return n.test(o)}return!1})(e.selection.getRng())?(e=>{t=I.some(e.selection.getBookmark()),e.undoManager.add()})(e):oR(e,n))})),e.on("keyup",(n=>{n.keyCode===af.ENTER&&t.each((()=>((e,n)=>{e.undoManager.undo(),t.fold(_,(t=>e.selection.moveToBookmark(t))),oR(e,n),t=I.none()})(e,n)))}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{ok([{keyCode:af.SPACEBAR,action:tk(mR,e)},{keyCode:af.SPACEBAR,action:tk(fR,e)}],t).each((n=>{t.preventDefault(),cN(e,"insertText",{data:" "}).isDefaultPrevented()||(n(),dN(e,"insertText",{data:" "}))}))})(e,t)}))})(e),(e=>{e.on("input",(t=>{t.isComposing||(e=>{const t=yn(e.getBody());e.selection.isCollapsed()&&ih(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each((t=>{e.selection.setRng(t.toRange())}))})(e)}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{nk([...gR(e)],t).each((e=>{t.preventDefault()}))})(e,t)}))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();nk([{keyCode:af.END,action:tk(Y_,e,!0)},{keyCode:af.HOME,action:tk(Y_,e,!1)},...o?[]:[{keyCode:af.HOME,action:tk(G_,e,!1),ctrlKey:!0,shiftKey:!0},{keyCode:af.END,action:tk(G_,e,!0),ctrlKey:!0,shiftKey:!0}],{keyCode:af.END,action:tk(ak,e,!0)},{keyCode:af.HOME,action:tk(ak,e,!1)},{keyCode:af.END,action:tk(a_,e,!0,t)},{keyCode:af.HOME,action:tk(a_,e,!1,t)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{if(rR.os.isMacOS())return;const n=$a(!1);e.on("keydown",(t=>{aR(t)&&iR(n,e,!0)})),e.on("keyup",(o=>{o.isDefaultPrevented()||((e,t,n)=>{nk([{keyCode:af.PAGE_UP,action:tk(a_,e,!1,t)},{keyCode:af.PAGE_DOWN,action:tk(a_,e,!0,t)}],n)})(e,t,o),aR(o)&&n.get()&&(iR(n,e,!1),e.nodeChanged())}))})(e,t),t}};class hR{constructor(e){let t;this.lastPath=[],this.editor=e;const n=this;"onselectionchange"in e.getDoc()||e.on("NodeChange click mouseup keyup focus",(n=>{const o=e.selection.getRng(),r={startContainer:o.startContainer,startOffset:o.startOffset,endContainer:o.endContainer,endOffset:o.endOffset};"nodechange"!==n.type&&Af(r,t)||e.dispatch("SelectionChange"),t=r})),e.on("contextmenu",(()=>{e.dispatch("SelectionChange")})),e.on("SelectionChange",(()=>{const t=e.selection.getStart(!0);t&&am(e)&&!n.isSameElementPath(t)&&e.dom.isChildOf(t,e.getBody())&&e.nodeChanged({selectionChange:!0})})),e.on("mouseup",(t=>{!t.isDefaultPrevented()&&am(e)&&("IMG"===e.selection.getNode().nodeName?vg.setEditorTimeout(e,(()=>{e.nodeChanged()})):e.nodeChanged())}))}nodeChanged(e={}){const t=this.editor.selection;let n;if(this.editor.initialized&&t&&!Od(this.editor)&&!this.editor.mode.isReadOnly()){const o=this.editor.getBody();n=t.getStart(!0)||o,n.ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(n,o)||(n=o);const r=[];this.editor.dom.getParent(n,(e=>e===o||(r.push(e),!1))),this.editor.dispatch("NodeChange",{...e,element:n,parents:r})}}isSameElementPath(e){let t;const n=this.editor,o=oe(n.dom.getParents(e,M,n.getBody()));if(o.length===this.lastPath.length){for(t=o.length;t>=0&&o[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=o,!0}return this.lastPath=o,!1}}const bR=ui("image"),vR=ui("event"),yR=e=>t=>{t[vR]=e},CR=yR(0),wR=yR(2),xR=yR(1),ER=(0,e=>{const t=e;return I.from(t[vR]).exists((e=>0===e))});const _R=ui("mode"),kR=e=>t=>{t[_R]=e},SR=(e,t)=>kR(t)(e),NR=kR(0),RR=kR(2),AR=kR(1),TR=e=>t=>{const n=t;return I.from(n[_R]).exists((t=>t===e))},OR=TR(0),BR=TR(1),PR=["none","copy","link","move"],DR=["none","copy","copyLink","copyMove","link","linkMove","move","all","uninitialized"],LR=()=>{const e=new window.DataTransfer;let t="move",n="all";const o={get dropEffect(){return t},set dropEffect(e){H(PR,e)&&(t=e)},get effectAllowed(){return n},set effectAllowed(e){ER(o)&&H(DR,e)&&(n=e)},get items(){return((e,t)=>({...t,get length(){return t.length},add:(n,o)=>{if(OR(e)){if(!m(n))return t.add(n);if(!v(o))return t.add(n,o)}return null},remove:n=>{OR(e)&&t.remove(n)},clear:()=>{OR(e)&&t.clear()}}))(o,e.items)},get files(){return BR(o)?Object.freeze({length:0,item:e=>null}):e.files},get types(){return e.types},setDragImage:(t,n,r)=>{var s;OR(o)&&(s={image:t,x:n,y:r},o[bR]=s,e.setDragImage(t,n,r))},getData:t=>BR(o)?"":e.getData(t),setData:(t,n)=>{OR(o)&&e.setData(t,n)},clearData:t=>{OR(o)&&e.clearData(t)}};return NR(o),o},MR=(e,t)=>e.setData("text/html",t),IR="x-tinymce/html",FR=N(IR),UR="\x3c!-- "+IR+" --\x3e",zR=e=>UR+e,jR=e=>-1!==e.indexOf(UR),HR="%MCEPASTEBIN%",$R=e=>e.dom.get("mcepastebin"),qR=e=>C(e)&&"mcepastebin"===e.id,VR=e=>e===HR,WR=(e,t)=>(Pt.each(t,(t=>{e=u(t,RegExp)?e.replace(t,""):e.replace(t[0],t[1])})),e),KR=e=>WR(e,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,(e,t,n)=>t||n?br:" "],/<br class="Apple-interchange-newline">/g,/<br>$/i]),YR=(e,t)=>({content:e,cancelled:t}),GR=(e,t)=>(e.insertContent(t,{merge:tc(e),paste:!0}),!0),XR=e=>/^https?:\/\/[\w\-\/+=.,!;:&%@^~(){}?#]+$/i.test(e),QR=(e,t,n)=>!(e.selection.isCollapsed()||!XR(t))&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.execCommand("mceInsertLink",!1,t)})),!0))(e,t,n),JR=(e,t,n)=>!!((e,t)=>XR(t)&&$(pc(e),(e=>$e(t.toLowerCase(),`.${e.toLowerCase()}`))))(e,t)&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.insertContent('<img src="'+t+'">')})),!0))(e,t,n),ZR=(e=>{let t=0;return()=>"mceclip"+t++})(),eA=e=>{const t=LR();return MR(t,e),RR(t),t},tA=(e,t,n,o,r)=>{const s=((e,t,n)=>((e,t,n)=>{const o=((e,t,n)=>e.dispatch("PastePreProcess",{content:t,internal:n}))(e,t,n),r=((e,t)=>{const n=bC({sanitize:fc(e),sandbox_iframes:Cc(e)},e.schema);n.addNodeFilter("meta",(e=>{Pt.each(e,(e=>{e.remove()}))}));const o=n.parse(t,{forced_root_block:!1,isRootContent:!0});return up({validate:!0},e.schema).serialize(o)})(e,o.content);return e.hasEventListeners("PastePostProcess")&&!o.isDefaultPrevented()?((e,t,n)=>{const o=e.dom.create("div",{style:"display:none"},t),r=((e,t,n)=>e.dispatch("PastePostProcess",{node:t,internal:n}))(e,o,n);return YR(r.node.innerHTML,r.isDefaultPrevented())})(e,r,n):YR(r,o.isDefaultPrevented())})(e,t,n))(e,t,n);if(!s.cancelled){const t=s.content,n=()=>((e,t,n)=>{n||!nc(e)?GR(e,t):((e,t)=>{Pt.each([QR,JR,GR],(n=>!n(e,t,GR)))})(e,t)})(e,t,o);r?cN(e,"insertFromPaste",{dataTransfer:eA(t)}).isDefaultPrevented()||(n(),dN(e,"insertFromPaste")):n()}},nA=(e,t,n,o)=>{const r=n||jR(t);tA(e,(e=>e.replace(UR,""))(t),r,!1,o)},oA=(e,t,n)=>{const o=e.dom.encode(t).replace(/\r\n/g,"\n"),r=((e,t,n)=>{const o=e.split(/\n\n/),r=((e,t)=>{let n="<"+e;const o=Ce(t,((e,t)=>t+'="'+ea.encodeAllRaw(e)+'"'));return o.length&&(n+=" "+o.join(" ")),n+">"})(t,n),s="</"+t+">",a=q(o,(e=>e.split(/\n/).join("<br />")));return 1===a.length?a[0]:q(a,(e=>r+e+s)).join("")})(ls(o,rc(e)),Il(e),Fl(e));tA(e,r,!1,!0,n)},rA=e=>{const t={};if(e&&e.types)for(let n=0;n<e.types.length;n++){const o=e.types[n];try{t[o]=e.getData(o)}catch(e){t[o]=""}}return t},sA=(e,t)=>t in e&&e[t].length>0,aA=e=>sA(e,"text/html")||sA(e,"text/plain"),iA=(e,t,n)=>{const o="paste"===t.type?t.clipboardData:t.dataTransfer;var r;if(Gd(e)&&o){const s=((e,t)=>{const n=t.items?te(ce(t.items),(e=>"file"===e.kind?[e.getAsFile()]:[])):[],o=t.files?ce(t.files):[];return Y(n.length>0?n:o,(e=>{const t=pc(e);return e=>He(e.type,"image/")&&$(t,(t=>(e=>{const t=e.toLowerCase(),n={jpg:"jpeg",jpe:"jpeg",jfi:"jpeg",jif:"jpeg",jfif:"jpeg",pjpeg:"jpeg",pjp:"jpeg",svg:"svg+xml"};return Pt.hasOwn(n,t)?"image/"+n[t]:"image/"+t})(t)===e.type))})(e))})(e,o);if(s.length>0)return t.preventDefault(),(r=s,Promise.all(q(r,(e=>Gv(e).then((t=>({file:e,uri:t}))))))).then((t=>{n&&e.selection.setRng(n),V(t,(t=>{((e,t)=>{Kv(t.uri).each((({data:n,type:o,base64Encoded:r})=>{const s=r?n:btoa(n),a=t.file,i=e.editorUpload.blobCache,l=i.getByData(s,o),d=null!=l?l:((e,t,n,o)=>{const r=ZR(),s=Vl(e)&&C(n.name),a=s?((e,t)=>{const n=t.match(/([\s\S]+?)(?:\.[a-z0-9.]+)$/i);return C(n)?e.dom.encode(n[1]):void 0})(e,n.name):r,i=s?n.name:void 0,l=t.create(r,n,o,a,i);return t.add(l),l})(e,i,a,s);nA(e,`<img src="${d.blobUri()}">`,!1,!0)}))})(e,t)}))})),!0}return!1},lA=(e,t,n,o,r)=>{let s=KR(n);const a=sA(t,FR())||jR(n),i=!a&&(e=>!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(e))(s),l=XR(s);(VR(s)||!s.length||i&&!l)&&(o=!0),(o||l)&&(s=sA(t,"text/plain")&&i?t["text/plain"]:(e=>{const t=ua(),n=bC({},t);let o="";const r=t.getVoidElements(),s=Pt.makeMap("script noscript style textarea video audio iframe object"," "),a=t.getBlockElements(),i=e=>{const n=e.name,l=e;if("br"!==n){if("wbr"!==n)if(r[n]&&(o+=" "),s[n])o+=" ";else{if(3===e.type&&(o+=e.value),!(e.name in t.getVoidElements())){let t=e.firstChild;if(t)do{i(t)}while(t=t.next)}a[n]&&l.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"};return e=WR(e,[/<!\[[^\]]+\]>/g]),i(n.parse(e)),o})(s)),VR(s)||(o?oA(e,s,r):nA(e,s,a,r))},dA=(e,t,n)=>{((e,t,n)=>{let o;e.on("keydown",(e=>{(e=>af.metaKeyPressed(e)&&86===e.keyCode||e.shiftKey&&45===e.keyCode)(e)&&!e.isDefaultPrevented()&&(o=e.shiftKey&&86===e.keyCode)})),e.on("paste",(r=>{if(r.isDefaultPrevented()||(e=>{var t,n;return At.os.isAndroid()&&0===(null===(n=null===(t=e.clipboardData)||void 0===t?void 0:t.items)||void 0===n?void 0:n.length)})(r))return;const s="text"===n.get()||o;o=!1;const a=rA(r.clipboardData);!aA(a)&&iA(e,r,t.getLastRng()||e.selection.getRng())||(sA(a,"text/html")?(r.preventDefault(),lA(e,a,a["text/html"],s,!0)):sA(a,"text/plain")&&sA(a,"text/uri-list")?(r.preventDefault(),lA(e,a,a["text/plain"],s,!0)):(t.create(),vg.setEditorTimeout(e,(()=>{const n=t.getHtml();t.remove(),lA(e,a,n,s,!1)}),0)))}))})(e,t,n),(e=>{const t=e=>He(e,"webkit-fake-url"),n=e=>He(e,"data:");e.parser.addNodeFilter("img",((o,r,s)=>{if(!Gd(e)&&(e=>{var t;return!0===(null===(t=e.data)||void 0===t?void 0:t.paste)})(s))for(const r of o){const o=r.attr("src");m(o)&&!r.attr("data-mce-object")&&o!==At.transparentSrc&&(t(o)||!sc(e)&&n(o))&&r.remove()}}))})(e)},cA=(e,t,n,o)=>{((e,t,n)=>{if(!e)return!1;try{return e.clearData(),e.setData("text/html",t),e.setData("text/plain",n),e.setData(FR(),t),!0}catch(e){return!1}})(e.clipboardData,t.html,t.text)?(e.preventDefault(),o()):n(t.html,o)},uA=e=>(t,n)=>{const{dom:o,selection:r}=e,s=o.create("div",{contenteditable:"false","data-mce-bogus":"all"}),a=o.create("div",{contenteditable:"true"},t);o.setStyles(s,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),s.appendChild(a),o.add(e.getBody(),s);const i=r.getRng();a.focus();const l=o.createRng();l.selectNodeContents(a),r.setRng(l),vg.setEditorTimeout(e,(()=>{r.setRng(i),o.remove(s),n()}),0)},mA=e=>({html:zR(e.selection.getContent({contextual:!0})),text:e.selection.getContent({format:"text"})}),fA=e=>!e.selection.isCollapsed()||(e=>!!e.dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody()))(e),gA=(e,t)=>{var n,o;return Uf.getCaretRangeFromPoint(null!==(n=t.clientX)&&void 0!==n?n:0,null!==(o=t.clientY)&&void 0!==o?o:0,e.getDoc())},pA=(e,t)=>{e.focus(),t&&e.selection.setRng(t)},hA=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,bA=e=>Pt.trim(e).replace(hA,Ca).toLowerCase(),vA=(e,t,n)=>{const o=Zd(e);if(n||"all"===o||!ec(e))return t;const r=o?o.split(/[, ]/):[];if(r&&"none"!==o){const n=e.dom,o=e.selection.getNode();t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,((e,t,s,a)=>{const i=n.parseStyle(n.decode(s)),l={};for(let e=0;e<r.length;e++){const t=i[r[e]];let s=t,a=n.getStyle(o,r[e],!0);/color/.test(r[e])&&(s=bA(s),a=bA(a)),a!==s&&(l[r[e]]=t)}const d=n.serializeStyle(l,"span");return d?t+' style="'+d+'"'+a:t+a}))}else t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return t=t.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,((e,t,n,o)=>t+' style="'+n+'"'+o)),t},yA=e=>{const t=$a(!1),n=$a(oc(e)?"text":"html"),o=(e=>{const t=$a(null);return{create:()=>((e,t)=>{const{dom:n,selection:o}=e,r=e.getBody();t.set(o.getRng());const s=n.add(e.getBody(),"div",{id:"mcepastebin",class:"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},HR);At.browser.isFirefox()&&n.setStyle(s,"left","rtl"===n.getStyle(r,"direction",!0)?65535:-65535),n.bind(s,"beforedeactivate focusin focusout",(e=>{e.stopPropagation()})),s.focus(),o.select(s,!0)})(e,t),remove:()=>((e,t)=>{const n=e.dom;if($R(e)){let o;const r=t.get();for(;o=$R(e);)n.remove(o),n.unbind(o);r&&e.selection.setRng(r)}t.set(null)})(e,t),getEl:()=>$R(e),getHtml:()=>(e=>{const t=e.dom,n=(e,n)=>{e.appendChild(n),t.remove(n,!0)},[o,...r]=Y(e.getBody().childNodes,qR);V(r,(e=>{n(o,e)}));const s=t.select("div[id=mcepastebin]",o);for(let e=s.length-1;e>=0;e--){const r=t.create("div");o.insertBefore(r,s[e]),n(r,s[e])}return o?o.innerHTML:""})(e),getLastRng:t.get}})(e);(e=>{(At.browser.isChromium()||At.browser.isSafari())&&((e,t)=>{e.on("PastePreProcess",(n=>{n.content=t(e,n.content,n.internal)}))})(e,vA)})(e),((e,t)=>{e.addCommand("mceTogglePlainTextPaste",(()=>{((e,t)=>{"text"===t.get()?(t.set("html"),sf(e,!1)):(t.set("text"),sf(e,!0)),e.focus()})(e,t)})),e.addCommand("mceInsertClipboardContent",((t,n)=>{n.html&&nA(e,n.html,n.internal,!1),n.text&&oA(e,n.text,!1)}))})(e,n),(e=>{const t=t=>n=>{t(e,n)},n=Xd(e);w(n)&&e.on("PastePreProcess",t(n));const o=Qd(e);w(o)&&e.on("PastePostProcess",t(o))})(e),e.on("PreInit",(()=>{(e=>{e.on("cut",(e=>t=>{!t.isDefaultPrevented()&&fA(e)&&e.selection.isEditable()&&cA(t,mA(e),uA(e),(()=>{if(At.browser.isChromium()||At.browser.isFirefox()){const t=e.selection.getRng();vg.setEditorTimeout(e,(()=>{e.selection.setRng(t),e.execCommand("Delete")}),0)}else e.execCommand("Delete")}))})(e)),e.on("copy",(e=>t=>{!t.isDefaultPrevented()&&fA(e)&&cA(t,mA(e),uA(e),_)})(e))})(e),((e,t)=>{Yd(e)&&e.on("dragend dragover draggesture dragdrop drop drag",(e=>{e.preventDefault(),e.stopPropagation()})),Gd(e)||e.on("drop",(e=>{const t=e.dataTransfer;t&&(e=>$(e.files,(e=>/^image\//.test(e.type))))(t)&&e.preventDefault()})),e.on("drop",(n=>{if(n.isDefaultPrevented())return;const o=gA(e,n);if(y(o))return;const r=rA(n.dataTransfer),s=sA(r,FR());if((!aA(r)||(e=>{const t=e["text/plain"];return!!t&&0===t.indexOf("file://")})(r))&&iA(e,n,o))return;const a=r[FR()],i=a||r["text/html"]||r["text/plain"],l=((e,t,n,o)=>{const r=e.getParent(n,(e=>Ts(t,e)));if(!h(e.getParent(n,"summary")))return!0;if(r&&Ee(o,"text/html")){const e=(new DOMParser).parseFromString(o["text/html"],"text/html").body;return!h(e.querySelector(r.nodeName.toLowerCase()))}return!1})(e.dom,e.schema,o.startContainer,r),d=t.get();d&&!l||i&&(n.preventDefault(),vg.setEditorTimeout(e,(()=>{e.undoManager.transact((()=>{(a||d&&l)&&e.execCommand("Delete"),pA(e,o);const t=KR(i);r["text/html"]?nA(e,t,s,!0):oA(e,t,!0)}))})))})),e.on("dragstart",(e=>{t.set(!0)})),e.on("dragover dragend",(n=>{Gd(e)&&!t.get()&&(n.preventDefault(),pA(e,gA(e,n))),"dragend"===n.type&&t.set(!1)})),(e=>{e.on("input",(t=>{const n=e=>h(e.querySelector("summary"));if("deleteByDrag"===t.inputType){const t=Y(e.dom.select("details"),n);V(t,(t=>{ar(t.firstChild)&&t.firstChild.remove();const n=e.dom.create("summary");n.appendChild(Tr().dom),t.prepend(n)}))}}))})(e)})(e,t),dA(e,o,n)}))},CA=ar,wA=er,xA=e=>dr(e.dom),EA=e=>t=>_n(yn(e),t),_A=(e,t)=>Jn(yn(e),xA,EA(t)),kA=(e,t,n)=>{const o=new jo(e,t),r=n?o.next.bind(o):o.prev.bind(o);let s=e;for(let t=n?e:r();t&&!CA(t);t=r())ts(t)&&(s=t);return s},SA=e=>{const t=((e,t,n)=>{const o=Vi.fromRangeStart(e).getNode(),r=((e,t,n)=>Jn(yn(e),(e=>(e=>lr(e.dom))(e)||n.isBlock(Ht(e))),EA(t)).getOr(yn(t)).dom)(o,t,n),s=kA(o,r,!1),a=kA(o,r,!0),i=document.createRange();return _A(s,r).fold((()=>{wA(s)?i.setStart(s,0):i.setStartBefore(s)}),(e=>i.setStartBefore(e.dom))),_A(a,r).fold((()=>{wA(a)?i.setEnd(a,a.data.length):i.setEndAfter(a)}),(e=>i.setEndAfter(e.dom))),i})(e.selection.getRng(),e.getBody(),e.schema);e.selection.setRng(Eb(t))};var NA;!function(e){e.Before="before",e.After="after"}(NA||(NA={}));const RA=(e,t)=>Math.abs(e.left-t),AA=(e,t)=>Math.abs(e.right-t),TA=(e,t)=>(e=>X(e,((e,t)=>e.fold((()=>I.some(t)),(e=>{const n=Math.min(t.left,e.left),o=Math.min(t.top,e.top),r=Math.max(t.right,e.right),s=Math.max(t.bottom,e.bottom);return I.some({top:o,right:r,bottom:s,left:n,width:r-n,height:s-o})}))),I.none()))(Y(e,(e=>{return(n=t)>=(o=e).top&&n<=o.bottom;var n,o}))).fold((()=>[[],e]),(t=>{const{pass:n,fail:o}=K(e,(e=>((e,t)=>{const n=((e,t)=>Math.max(0,Math.min(e.bottom,t.bottom)-Math.max(e.top,t.top)))(e,t)/Math.min(e.height,t.height);return((e,t)=>e.top<t.bottom&&e.bottom>t.top)(e,t)&&n>.5})(e,t)));return[n,o]})),OA=(e,t,n)=>t>e.left&&t<e.right?0:Math.min(Math.abs(e.left-t),Math.abs(e.right-t)),BA=(e,t,n,o)=>{const r=e=>ts(e.node)?I.some(e):qo(e.node)?BA(ce(e.node.childNodes),t,n,!1):I.none(),s=(e,s)=>{const a=ae(e,((e,o)=>s(e,t,n)-s(o,t,n)));return ue(a,r).map((e=>o&&!er(e.node)&&a.length>1?((e,o,s)=>r(o).filter((o=>Math.abs(s(e,t,n)-s(o,t,n))<2&&er(o.node))))(e,a[1],s).getOr(e):e))},[a,i]=TA(IE(e),n),{pass:l,fail:d}=K(i,(e=>e.top<n));return s(a,OA).orThunk((()=>s(d,Ei))).orThunk((()=>s(l,Ei)))},PA=(e,t,n)=>((e,t,n)=>{const o=yn(e),r=Nn(o),s=Cn(r,t,n).filter((e=>kn(o,e))).getOr(o);return((e,t,n,o)=>{const r=(t,s)=>{const a=Y(t.dom.childNodes,O((e=>qo(e)&&e.classList.contains("mce-drag-container"))));return s.fold((()=>BA(a,n,o,!0)),(e=>{const t=Y(a,(t=>t!==e.dom));return BA(t,n,o,!0)})).orThunk((()=>(_n(t,e)?I.none():Tn(t)).bind((e=>r(e,I.some(t))))))};return r(t,I.none())})(o,s,t,n)})(e,t,n).filter((e=>Mc(e.node))).map((e=>((e,t)=>({node:e.node,position:RA(e,t)<AA(e,t)?NA.Before:NA.After}))(e,t))),DA=e=>{var t,n;const o=e.getBoundingClientRect(),r=e.ownerDocument,s=r.documentElement,a=r.defaultView;return{top:o.top+(null!==(t=null==a?void 0:a.scrollY)&&void 0!==t?t:0)-s.clientTop,left:o.left+(null!==(n=null==a?void 0:a.scrollX)&&void 0!==n?n:0)-s.clientLeft}},LA=e=>({target:e,srcElement:e}),MA=(e,t,n,o)=>{const r=((e,t)=>{const n=(e=>{const t=LR(),n=(e=>{const t=e;return I.from(t[_R])})(e);return RR(e),CR(t),t.dropEffect=e.dropEffect,t.effectAllowed=e.effectAllowed,(e=>{const t=e;return I.from(t[bR])})(e).each((e=>t.setDragImage(e.image,e.x,e.y))),V(e.types,(n=>{"Files"!==n&&t.setData(n,e.getData(n))})),V(e.files,(e=>t.items.add(e))),(e=>{const t=e;return I.from(t[vR])})(e).each((e=>{((e,t)=>{yR(t)(e)})(t,e)})),n.each((n=>{SR(e,n),SR(t,n)})),t})(e);return"dragstart"===t?(CR(n),NR(n)):"drop"===t?(wR(n),RR(n)):(xR(n),AR(n)),n})(n,e);return v(o)?((e,t,n)=>{const o=B("Function not supported on simulated event.");return{bubbles:!0,cancelBubble:!1,cancelable:!0,composed:!1,currentTarget:null,defaultPrevented:!1,eventPhase:0,isTrusted:!0,returnValue:!1,timeStamp:0,type:e,composedPath:o,initEvent:o,preventDefault:_,stopImmediatePropagation:_,stopPropagation:_,AT_TARGET:window.Event.AT_TARGET,BUBBLING_PHASE:window.Event.BUBBLING_PHASE,CAPTURING_PHASE:window.Event.CAPTURING_PHASE,NONE:window.Event.NONE,altKey:!1,button:0,buttons:0,clientX:0,clientY:0,ctrlKey:!1,metaKey:!1,movementX:0,movementY:0,offsetX:0,offsetY:0,pageX:0,pageY:0,relatedTarget:null,screenX:0,screenY:0,shiftKey:!1,x:0,y:0,detail:0,view:null,which:0,initUIEvent:o,initMouseEvent:o,getModifierState:o,dataTransfer:n,...LA(t)}})(e,t,r):((e,t,n,o)=>({...t,dataTransfer:o,type:e,...LA(n)}))(e,o,t,r)},IA=dr,FA=((...e)=>t=>{for(let n=0;n<e.length;n++)if(e[n](t))return!0;return!1})(IA,lr),UA=(e,t,n,o)=>{const r=e.dom,s=t.cloneNode(!0);r.setStyles(s,{width:n,height:o}),r.setAttrib(s,"data-mce-selected",null);const a=r.create("div",{class:"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return r.setStyles(a,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:o}),r.setStyles(s,{margin:0,boxSizing:"border-box"}),a.appendChild(s),a},zA=(e,t)=>n=>()=>{const o="left"===e?n.scrollX:n.scrollY;n.scroll({[e]:o+t,behavior:"smooth"})},jA=zA("left",-32),HA=zA("left",32),$A=zA("top",-32),qA=zA("top",32),VA=e=>{e&&e.parentNode&&e.parentNode.removeChild(e)},WA=(e,t,n,o,r)=>{"dragstart"===t&&MR(o,e.dom.getOuterHTML(n));const s=MA(t,n,o,r);return e.dispatch(t,s)},KA=(e,t)=>{const n=Qa(((e,n)=>((e,t,n)=>{e._selectionOverrides.hideFakeCaret(),PA(e.getBody(),t,n).fold((()=>e.selection.placeCaretAt(t,n)),(o=>{const r=e._selectionOverrides.showCaret(1,o.node,o.position===NA.Before,!1);r?e.selection.setRng(r):e.selection.placeCaretAt(t,n)}))})(t,e,n)),0);t.on("remove",n.cancel);const o=e;return r=>e.on((e=>{const s=Math.max(Math.abs(r.screenX-e.screenX),Math.abs(r.screenY-e.screenY));if(!e.dragging&&s>10){const n=WA(t,"dragstart",e.element,e.dataTransfer,r);if(C(n.dataTransfer)&&(e.dataTransfer=n.dataTransfer),n.isDefaultPrevented())return;e.dragging=!0,t.focus()}if(e.dragging){const s=r.currentTarget===t.getDoc().documentElement,l=((e,t)=>({pageX:t.pageX-e.relX,pageY:t.pageY+5}))(e,((e,t)=>{return n=(e=>e.inline?DA(e.getBody()):{left:0,top:0})(e),o=(e=>{const t=e.getBody();return e.inline?{left:t.scrollLeft,top:t.scrollTop}:{left:0,top:0}})(e),r=((e,t)=>{if(t.target.ownerDocument!==e.getDoc()){const n=DA(e.getContentAreaContainer()),o=(e=>{const t=e.getBody(),n=e.getDoc().documentElement,o={left:t.scrollLeft,top:t.scrollTop},r={left:t.scrollLeft||n.scrollLeft,top:t.scrollTop||n.scrollTop};return e.inline?o:r})(e);return{left:t.pageX-n.left+o.left,top:t.pageY-n.top+o.top}}return{left:t.pageX,top:t.pageY}})(e,t),{pageX:r.left-n.left+o.left,pageY:r.top-n.top+o.top};var n,o,r})(t,r));a=e.ghost,i=t.getBody(),a.parentNode!==i&&i.appendChild(a),((e,t,n,o,r,s,a,i,l,d,c,u)=>{let m=0,f=0;e.style.left=t.pageX+"px",e.style.top=t.pageY+"px",t.pageX+n>r&&(m=t.pageX+n-r),t.pageY+o>s&&(f=t.pageY+o-s),e.style.width=n-m+"px",e.style.height=o-f+"px";const g=l.clientHeight,p=l.clientWidth,h=a+l.getBoundingClientRect().top,b=i+l.getBoundingClientRect().left;c.on((e=>{e.intervalId.clear(),e.dragging&&u&&(a+8>=g?e.intervalId.set(qA(d)):a-8<=0?e.intervalId.set($A(d)):i+8>=p?e.intervalId.set(HA(d)):i-8<=0?e.intervalId.set(jA(d)):h+16>=window.innerHeight?e.intervalId.set(qA(window)):h-16<=0?e.intervalId.set($A(window)):b+16>=window.innerWidth?e.intervalId.set(HA(window)):b-16<=0&&e.intervalId.set(jA(window)))}))})(e.ghost,l,e.width,e.height,e.maxX,e.maxY,r.clientY,r.clientX,t.getContentAreaContainer(),t.getWin(),o,s),n.throttle(r.clientX,r.clientY)}var a,i}))},YA=(e,t,n)=>{e.on((e=>{e.intervalId.clear(),e.dragging&&n.fold((()=>WA(t,"dragend",e.element,e.dataTransfer)),(n=>WA(t,"dragend",e.element,e.dataTransfer,n)))})),GA(e)},GA=e=>{e.on((e=>{e.intervalId.clear(),VA(e.ghost)})),e.clear()},XA=e=>{const t=Xa(),n=za.DOM,o=document,r=((e,t)=>n=>{if((e=>0===e.button)(n)){const o=J(t.dom.getParents(n.target),FA).getOr(null);if(C(o)&&((e,t,n)=>IA(n)&&n!==t&&e.isEditable(n.parentElement))(t.dom,t.getBody(),o)){const r=t.dom.getPos(o),s=t.getBody(),a=t.getDoc().documentElement;e.set({element:o,dataTransfer:LR(),dragging:!1,screenX:n.screenX,screenY:n.screenY,maxX:(t.inline?s.scrollWidth:a.offsetWidth)-2,maxY:(t.inline?s.scrollHeight:a.offsetHeight)-2,relX:n.pageX-r.x,relY:n.pageY-r.y,width:o.offsetWidth,height:o.offsetHeight,ghost:UA(t,o,o.offsetWidth,o.offsetHeight),intervalId:Ga(100)})}}})(t,e),s=KA(t,e),a=((e,t)=>n=>{e.on((e=>{var o;if(e.intervalId.clear(),e.dragging){if(((e,t,n)=>!y(t)&&t!==n&&!e.dom.isChildOf(t,n)&&e.dom.isEditable(t))(t,(e=>{const t=e.getSel();if(C(t)){const e=t.getRangeAt(0).startContainer;return er(e)?e.parentNode:e}return null})(t.selection),e.element)){const r=null!==(o=t.getDoc().elementFromPoint(n.clientX,n.clientY))&&void 0!==o?o:t.getBody();WA(t,"drop",r,e.dataTransfer,n).isDefaultPrevented()||t.undoManager.transact((()=>{((e,t)=>{const n=e.getParent(t.parentNode,e.isBlock);VA(t),n&&n!==e.getRoot()&&e.isEmpty(n)&&Or(yn(n))})(t.dom,e.element),(e=>{const t=e.getData("text/html");return""===t?I.none():I.some(t)})(e.dataTransfer).each((e=>t.insertContent(e))),t._selectionOverrides.hideFakeCaret()}))}WA(t,"dragend",t.getBody(),e.dataTransfer,n)}})),GA(e)})(t,e),i=((e,t)=>n=>YA(e,t,I.some(n)))(t,e);e.on("mousedown",r),e.on("mousemove",s),e.on("mouseup",a),n.bind(o,"mousemove",s),n.bind(o,"mouseup",i),e.on("remove",(()=>{n.unbind(o,"mousemove",s),n.unbind(o,"mouseup",i)})),e.on("keydown",(n=>{n.keyCode===af.ESC&&YA(t,e,I.none())}))},QA=dr,JA=(e,t)=>lb(e.getBody(),t),ZA=e=>{const t=e.selection,n=e.dom,o=e.getBody(),r=Pc(e,o,n.isBlock,(()=>Rg(e))),s="sel-"+n.uniqueId(),a="data-mce-selected";let i;const l=e=>e!==o&&(QA(e)||mr(e))&&n.isChildOf(e,o)&&n.isEditable(e.parentNode),d=(n,o,s,a=!0)=>e.dispatch("ShowCaret",{target:o,direction:n,before:s}).isDefaultPrevented()?null:(a&&t.scrollIntoView(o,-1===n),r.show(s,o)),c=e=>Ur(e)||$r(e)||qr(e),u=e=>c(e.startContainer)||c(e.endContainer),m=t=>{const o=e.schema.getVoidElements(),r=n.createRng(),s=t.startContainer,a=t.startOffset,i=t.endContainer,l=t.endOffset;return Ee(o,s.nodeName.toLowerCase())?0===a?r.setStartBefore(s):r.setStartAfter(s):r.setStart(s,a),Ee(o,i.nodeName.toLowerCase())?0===l?r.setEndBefore(i):r.setEndAfter(i):r.setEnd(i,l),r},f=(r,c)=>{if(!r)return null;if(r.collapsed){if(!u(r)){const e=c?1:-1,t=au(e,o,r),s=t.getNode(!c);if(C(s)){if(Mc(s))return d(e,s,!!c&&!t.isAtEnd(),!1);if(Fr(s)&&dr(s.nextSibling)){const e=n.createRng();return e.setStart(s,0),e.setEnd(s,0),e}}const a=t.getNode(c);if(C(a)){if(Mc(a))return d(e,a,!c&&!t.isAtEnd(),!1);if(Fr(a)&&dr(a.previousSibling)){const e=n.createRng();return e.setStart(a,1),e.setEnd(a,1),e}}}return null}let m=r.startContainer,f=r.startOffset;const g=r.endOffset;if(er(m)&&0===f&&QA(m.parentNode)&&(m=m.parentNode,f=n.nodeIndex(m),m=m.parentNode),!qo(m))return null;if(g===f+1&&m===r.endContainer){const o=m.childNodes[f];if(l(o))return(o=>{const r=o.cloneNode(!0),l=e.dispatch("ObjectSelected",{target:o,targetClone:r});if(l.isDefaultPrevented())return null;const d=((o,r)=>{const a=yn(e.getBody()),i=e.getDoc(),l=to(a,"#"+s).getOrThunk((()=>{const e=hn('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>',i);return Jt(e,"id",s),vo(a,e),e})),d=n.createRng();wo(l),Co(l,[vn(br,i),yn(r),vn(br,i)]),d.setStart(l.dom.firstChild,1),d.setEnd(l.dom.lastChild,0),lo(l,{top:n.getPos(o,e.getBody()).y+"px"}),ag(l);const c=t.getSel();return c&&(c.removeAllRanges(),c.addRange(d)),d})(o,l.targetClone),c=yn(o);return V(Uo(yn(e.getBody()),`*[${a}]`),(e=>{_n(c,e)||on(e,a)})),n.getAttrib(o,a)||o.setAttribute(a,"1"),i=o,p(),d})(o)}return null},g=()=>{i&&i.removeAttribute(a),to(yn(e.getBody()),"#"+s).each(xo),i=null},p=()=>{r.hide()};return XC(e)||(e.on("click",(t=>{n.isEditable(t.target)||(t.preventDefault(),e.focus())})),e.on("blur NewBlock",g),e.on("ResizeWindow FullscreenStateChanged",r.reposition),e.on("tap",(t=>{const n=t.target,o=JA(e,n);QA(o)?(t.preventDefault(),Sx(e,o).each(f)):l(n)&&Sx(e,n).each(f)}),!0),e.on("mousedown",(r=>{const s=r.target;if(s!==o&&"HTML"!==s.nodeName&&!n.isChildOf(s,o))return;if(!((e,t,n)=>{const o=yn(e.getBody()),r=e.inline?o:yn(Nn(o).dom.documentElement),s=((e,t,n,o)=>{const r=(e=>e.dom.getBoundingClientRect())(t);return{x:n-(e?r.left+t.dom.clientLeft+Aw(t):0),y:o-(e?r.top+t.dom.clientTop+Rw(t):0)}})(e.inline,r,t,n);return((e,t,n)=>{const o=Sw(e),r=Nw(e);return t>=0&&n>=0&&t<=o&&n<=r})(r,s.x,s.y)})(e,r.clientX,r.clientY))return;g(),p();const a=JA(e,s);QA(a)?(r.preventDefault(),Sx(e,a).each(f)):PA(o,r.clientX,r.clientY).each((n=>{var o;r.preventDefault(),(o=d(1,n.node,n.position===NA.Before,!1))&&t.setRng(o),Vo(a)?a.focus():e.getBody().focus()}))})),e.on("keypress",(e=>{af.modifierPressed(e)||QA(t.getNode())&&e.preventDefault()})),e.on("GetSelectionRange",(e=>{let t=e.range;if(i){if(!i.parentNode)return void(i=null);t=t.cloneRange(),t.selectNode(i),e.range=t}})),e.on("SetSelectionRange",(e=>{e.range=m(e.range);const t=f(e.range,e.forward);t&&(e.range=t)})),e.on("AfterSetSelectionRange",(e=>{const t=e.range,o=t.startContainer.parentElement;var r;u(t)||qo(r=o)&&"mcepastebin"===r.id||p(),(e=>C(e)&&n.hasClass(e,"mce-offscreen-selection"))(o)||g()})),(e=>{XA(e),Id(e)&&(e=>{const t=t=>{if(!t.isDefaultPrevented()){const n=t.dataTransfer;n&&(H(n.types,"Files")||n.files.length>0)&&(t.preventDefault(),"drop"===t.type&&Lw(e,"Dropped file type is not supported"))}},n=n=>{xg(e,n.target)&&t(n)},o=()=>{const o=za.DOM,r=e.dom,s=document,a=e.inline?e.getBody():e.getDoc(),i=["drop","dragover"];V(i,(e=>{o.bind(s,e,n),r.bind(a,e,t)})),e.on("remove",(()=>{V(i,(e=>{o.unbind(s,e,n),r.unbind(a,e,t)}))}))};e.on("init",(()=>{vg.setEditorTimeout(e,o,0)}))})(e)})(e),(e=>{const t=Qa((()=>{if(!e.removed&&e.getBody().contains(document.activeElement)){const t=e.selection.getRng();if(t.collapsed){const n=Nx(e,t,!1);e.selection.setRng(n)}}}),0);e.on("focus",(()=>{t.throttle()})),e.on("blur",(()=>{t.cancel()}))})(e),(e=>{e.on("init",(()=>{e.on("focusin",(t=>{const n=t.target;if(mr(n)){const t=lb(e.getBody(),n),o=dr(t)?t:n;e.selection.getNode()!==o&&Sx(e,o).each((t=>e.selection.setRng(t)))}}))}))})(e)),{showCaret:d,showBlockCaretContainer:e=>{e.hasAttribute("data-mce-caret")&&(Vr(e),t.scrollIntoView(e))},hideFakeCaret:p,destroy:()=>{r.destroy(),i=null}}},eT=(e,t)=>{let n=t;for(let t=e.previousSibling;er(t);t=t.previousSibling)n+=t.data.length;return n},tT=(e,t,n,o,r)=>{if(er(n)&&(o<0||o>n.data.length))return[];const s=r&&er(n)?[eT(n,o)]:[o];let a=n;for(;a!==t&&a.parentNode;)s.push(e.nodeIndex(a,r)),a=a.parentNode;return a===t?s.reverse():[]},nT=(e,t,n,o,r,s,a=!1)=>({start:tT(e,t,n,o,a),end:tT(e,t,r,s,a)}),oT=(e,t)=>{const n=t.slice(),o=n.pop();return x(o)?X(n,((e,t)=>e.bind((e=>I.from(e.childNodes[t])))),I.some(e)).bind((e=>er(e)&&(o<0||o>e.data.length)?I.none():I.some({node:e,offset:o}))):I.none()},rT=(e,t)=>oT(e,t.start).bind((({node:n,offset:o})=>oT(e,t.end).map((({node:e,offset:t})=>{const r=document.createRange();return r.setStart(n,o),r.setEnd(e,t),r})))),sT=(e,t,n)=>{if(t&&e.isEmpty(t)&&!n(t)){const o=t.parentNode;e.remove(t,er(t.firstChild)&&ss(t.firstChild.data)),sT(e,o,n)}},aT=(e,t,n,o=!0)=>{const r=t.startContainer.parentNode,s=t.endContainer.parentNode;t.deleteContents(),o&&!n(t.startContainer)&&(er(t.startContainer)&&0===t.startContainer.data.length&&e.remove(t.startContainer),er(t.endContainer)&&0===t.endContainer.data.length&&e.remove(t.endContainer),sT(e,r,n),r!==s&&sT(e,s,n))},iT=(e,t)=>I.from(e.dom.getParent(t.startContainer,e.dom.isBlock)),lT=(e,t,n)=>{const o=e.dynamicPatternsLookup({text:n,block:t});return{...e,blockPatterns:Cl(o).concat(e.blockPatterns),inlinePatterns:wl(o).concat(e.inlinePatterns)}},dT=(e,t,n,o)=>{const r=e.createRng();return r.setStart(t,0),r.setEnd(n,o),r.toString()},cT=(e,t,n)=>{((e,t,n)=>{if(er(e)&&0>=e.length)return I.some(Ak(e,0));{const t=hi(Tk);return I.from(t.forwards(e,0,Ok(e),n)).map((e=>Ak(e.container,0)))}})(t,0,t).each((o=>{const r=o.container;Dk(r,n.start.length,t).each((n=>{const o=e.createRng();o.setStart(r,0),o.setEnd(n.container,n.offset),aT(e,o,(e=>e===t))}));const s=yn(r),a=Cr(s);/^\s[^\s]/.test(a)&&((e,t)=>{yr.set(e,t)})(s,a.slice(1))}))},uT=(e,t)=>e.create("span",{"data-mce-type":"bookmark",id:t}),mT=(e,t)=>{const n=e.createRng();return n.setStartAfter(t.start),n.setEndBefore(t.end),n},fT=(e,t,n)=>{const o=rT(e.getRoot(),n).getOrDie("Unable to resolve path range"),r=o.startContainer,s=o.endContainer,a=0===o.endOffset?s:s.splitText(o.endOffset),i=0===o.startOffset?r:r.splitText(o.startOffset),l=i.parentNode;return{prefix:t,end:a.parentNode.insertBefore(uT(e,t+"-end"),a),start:l.insertBefore(uT(e,t+"-start"),i)}},gT=(e,t,n)=>{sT(e,e.get(t.prefix+"-end"),n),sT(e,e.get(t.prefix+"-start"),n)},pT=e=>0===e.start.length,hT=(e,t,n,o)=>{const r=t.start;var s;return Lk(e,o.container,o.offset,(s=r,(e,t)=>{const n=e.data.substring(0,t),o=n.lastIndexOf(s.charAt(s.length-1)),r=n.lastIndexOf(s);return-1!==r?r+s.length:-1!==o?o+1:-1}),n).bind((o=>{var s,a;const i=null!==(a=null===(s=n.textContent)||void 0===s?void 0:s.indexOf(r))&&void 0!==a?a:-1;if(-1!==i&&o.offset>=i+r.length){const t=e.createRng();return t.setStart(o.container,o.offset-r.length),t.setEnd(o.container,o.offset),I.some(t)}{const s=o.offset-r.length;return Pk(o.container,s,n).map((t=>{const n=e.createRng();return n.setStart(t.container,t.offset),n.setEnd(o.container,o.offset),n})).filter((e=>e.toString()===r)).orThunk((()=>hT(e,t,n,Ak(o.container,0))))}}))},bT=(e,t,n,o)=>{const r=e.dom,s=r.getRoot(),a=n.pattern,i=n.position.container,l=n.position.offset;return Pk(i,l-n.pattern.end.length,t).bind((d=>{const c=nT(r,s,d.container,d.offset,i,l,o);if(pT(a))return I.some({matches:[{pattern:a,startRng:c,endRng:c}],position:d});{const i=vT(e,n.remainingPatterns,d.container,d.offset,t,o),l=i.getOr({matches:[],position:d}),u=l.position,m=((e,t,n,o,r,s=!1)=>{if(0===t.start.length&&!s){const t=e.createRng();return t.setStart(n,o),t.setEnd(n,o),I.some(t)}return Bk(n,o,r).bind((n=>hT(e,t,r,n).bind((e=>{var t;if(s){if(e.endContainer===n.container&&e.endOffset===n.offset)return I.none();if(0===n.offset&&(null===(t=e.endContainer.textContent)||void 0===t?void 0:t.length)===e.endOffset)return I.none()}return I.some(e)}))))})(r,a,u.container,u.offset,t,i.isNone());return m.map((e=>{const t=((e,t,n,o=!1)=>nT(e,t,n.startContainer,n.startOffset,n.endContainer,n.endOffset,o))(r,s,e,o);return{matches:l.matches.concat([{pattern:a,startRng:t,endRng:c}]),position:Ak(e.startContainer,e.startOffset)}}))}}))},vT=(e,t,n,o,r,s)=>{const a=e.dom;return Bk(n,o,a.getRoot()).bind((i=>{const l=dT(a,r,n,o);for(let a=0;a<t.length;a++){const d=t[a];if(!$e(l,d.end))continue;const c=t.slice();c.splice(a,1);const u=bT(e,r,{pattern:d,remainingPatterns:c,position:i},s);if(u.isNone()&&o>0)return vT(e,t,n,o-1,r,s);if(u.isSome())return u}return I.none()}))},yT=(e,t,n)=>{e.selection.setRng(n),"inline-format"===t.type?V(t.format,(t=>{e.formatter.apply(t)})):e.execCommand(t.cmd,!1,t.value)},CT=(e,t,n,o,r,s)=>{var a;return((e,t)=>{const n=ne(e,(e=>$(t,(t=>e.pattern.start===t.pattern.start&&e.pattern.end===t.pattern.end))));return e.length===t.length?n?e:t:e.length>t.length?e:t})(vT(e,r.inlinePatterns,n,o,t,s).fold((()=>[]),(e=>e.matches)),vT(e,(a=r.inlinePatterns,ae(a,((e,t)=>t.end.length-e.end.length))),n,o,t,s).fold((()=>[]),(e=>e.matches)))},wT=(e,t)=>{if(0===t.length)return;const n=e.dom,o=e.selection.getBookmark(),r=((e,t)=>{const n=ui("mce_textpattern"),o=G(t,((t,o)=>{const r=fT(e,n+`_end${t.length}`,o.endRng);return t.concat([{...o,endMarker:r}])}),[]);return G(o,((t,r)=>{const s=o.length-t.length-1,a=pT(r.pattern)?r.endMarker:fT(e,n+`_start${s}`,r.startRng);return t.concat([{...r,startMarker:a}])}),[])})(n,t);V(r,(t=>{const o=n.getParent(t.startMarker.start,n.isBlock),r=e=>e===o;pT(t.pattern)?((e,t,n,o)=>{const r=mT(e.dom,n);aT(e.dom,r,o),yT(e,t,r)})(e,t.pattern,t.endMarker,r):((e,t,n,o,r)=>{const s=e.dom,a=mT(s,o),i=mT(s,n);aT(s,i,r),aT(s,a,r);const l={prefix:n.prefix,start:n.end,end:o.start},d=mT(s,l);yT(e,t,d)})(e,t.pattern,t.startMarker,t.endMarker,r),gT(n,t.endMarker,r),gT(n,t.startMarker,r)})),e.selection.moveToBookmark(o)},xT=(e,t)=>{const n=e.selection.getRng();return iT(e,n).map((o=>{var r;const s=Math.max(0,n.startOffset),a=lT(t,o,null!==(r=o.textContent)&&void 0!==r?r:""),i=CT(e,o,n.startContainer,s,a,!0),l=((e,t,n,o)=>{var r;const s=e.dom,a=Il(e);if(!s.is(t,a))return[];const i=null!==(r=t.textContent)&&void 0!==r?r:"";return((e,t)=>{const n=(e=>ae(e,((e,t)=>t.start.length-e.start.length)))(e),o=t.replace(br," ");return J(n,(e=>0===t.indexOf(e.start)||0===o.indexOf(e.start)))})(n.blockPatterns,i).map((e=>Pt.trim(i).length===e.start.length?[]:[{pattern:e,range:nT(s,s.getRoot(),t,0,t,0,true)}])).getOr([])})(e,o,a);return(l.length>0||i.length>0)&&(e.undoManager.add(),e.undoManager.extra((()=>{e.execCommand("mceInsertNewLine")}),(()=>{(e=>{e.insertContent(Br,{preserve_zwsp:!0})})(e),wT(e,i),((e,t)=>{if(0===t.length)return;const n=e.selection.getBookmark();V(t,(t=>((e,t)=>{const n=e.dom,o=t.pattern,r=rT(n.getRoot(),t.range).getOrDie("Unable to resolve path range");return iT(e,r).each((t=>{"block-format"===o.type?((e,t)=>{const n=t.get(e);return p(n)&&le(n).exists((e=>Ee(e,"block")))})(o.format,e.formatter)&&e.undoManager.transact((()=>{cT(e.dom,t,o),e.formatter.apply(o.format)})):"block-command"===o.type&&e.undoManager.transact((()=>{cT(e.dom,t,o),e.execCommand(o.cmd,!1,o.value)}))})),!0})(e,t))),e.selection.moveToBookmark(n)})(e,l);const t=e.selection.getRng(),n=Bk(t.startContainer,t.startOffset,e.dom.getRoot());e.execCommand("mceInsertNewLine"),n.each((t=>{const n=t.container;n.data.charAt(t.offset-1)===hr&&(n.deleteData(t.offset-1,1),sT(e.dom,n.parentNode,(t=>t===e.dom.getRoot())))}))})),!0)})).getOr(!1)},ET=(e,t,n)=>{for(let o=0;o<e.length;o++)if(n(e[o],t))return!0;return!1},_T=e=>{const t=Pt.each,n=af.BACKSPACE,o=af.DELETE,r=e.dom,s=e.selection,a=e.parser,i=At.browser,l=i.isFirefox(),d=i.isChromium()||i.isSafari(),c=At.deviceType.isiPhone()||At.deviceType.isiPad(),u=At.os.isMacOS()||At.os.isiOS(),f=(t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},g=e=>e.isDefaultPrevented(),p=()=>{e.shortcuts.add("meta+a",null,"SelectAll")},h=()=>{e.inline||r.bind(e.getDoc(),"mousedown mouseup",(t=>{let n;if(t.target===e.getDoc().documentElement)if(n=s.getRng(),e.getBody().focus(),"mousedown"===t.type){if(Ur(n.startContainer))return;s.placeCaretAt(t.clientX,t.clientY)}else s.setRng(n)}))},b=()=>{Range.prototype.getClientRects||e.on("mousedown",(t=>{if(!g(t)&&"HTML"===t.target.nodeName){const t=e.getBody();t.blur(),vg.setEditorTimeout(e,(()=>{t.focus()}))}}))},v=()=>{const t=zd(e);e.on("click",(n=>{const o=n.target;/^(IMG|HR)$/.test(o.nodeName)&&r.isEditable(o)&&(n.preventDefault(),e.selection.select(o),e.nodeChanged()),"A"===o.nodeName&&r.hasClass(o,t)&&0===o.childNodes.length&&r.isEditable(o.parentNode)&&(n.preventDefault(),s.select(o))}))},y=()=>{e.on("keydown",(e=>{if(!g(e)&&e.keyCode===n&&s.isCollapsed()&&0===s.getRng().startOffset){const t=s.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}return!0}))},C=()=>{Bd(e)||e.on("BeforeExecCommand mousedown",(()=>{f("StyleWithCSS",!1),f("enableInlineTableEditing",!1),cd(e)||f("enableObjectResizing",!1)}))},w=()=>{e.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")},x=()=>{e.inline||e.on("keydown",(()=>{document.activeElement===document.body&&e.getWin().focus()}))},E=()=>{e.inline||(e.contentStyles.push("body {min-height: 150px}"),e.on("click",(t=>{let n;"HTML"===t.target.nodeName&&(n=e.selection.getRng(),e.getBody().focus(),e.selection.setRng(n),e.selection.normalize(),e.nodeChanged())})))},k=()=>{u&&e.on("keydown",(t=>{!af.metaKeyPressed(t)||t.shiftKey||37!==t.keyCode&&39!==t.keyCode||(t.preventDefault(),e.selection.getSel().modify("move",37===t.keyCode?"backward":"forward","lineboundary"))}))},S=()=>{e.on("click",(e=>{let t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)})),e.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")},N=()=>{e.on("init",(()=>{e.dom.bind(e.getBody(),"submit",(e=>{e.preventDefault()}))}))},R=_;return XC(e)?(d&&(h(),v(),N(),p(),c&&(x(),E(),S())),l&&(b(),C(),w(),k())):(e.on("keydown",(t=>{if(g(t)||t.keyCode!==af.BACKSPACE)return;let n=s.getRng();const o=n.startContainer,a=n.startOffset,i=r.getRoot();let l=o;if(n.collapsed&&0===a){for(;l.parentNode&&l.parentNode.firstChild===l&&l.parentNode!==i;)l=l.parentNode;"BLOCKQUOTE"===l.nodeName&&(e.formatter.toggle("blockquote",void 0,l),n=r.createRng(),n.setStart(o,0),n.setEnd(o,0),s.setRng(n))}})),(()=>{const t=e=>{const t=r.create("body"),n=e.cloneContents();return t.appendChild(n),s.serializer.serialize(t,{format:"html"})};e.on("keydown",(s=>{const a=s.keyCode;if(!g(s)&&(a===o||a===n)&&e.selection.isEditable()){const n=e.selection.isCollapsed(),o=e.getBody();if(n&&!gs(yn(o)))return;if(!n&&!(n=>{const o=t(n),s=r.createRng();return s.selectNode(e.getBody()),o===t(s)})(e.selection.getRng()))return;s.preventDefault(),e.setContent(""),o.firstChild&&r.isBlock(o.firstChild)?e.selection.setCursorLocation(o.firstChild,0):e.selection.setCursorLocation(o,0),e.nodeChanged()}}))})(),At.windowsPhone||e.on("keyup focusin mouseup",(t=>{af.modifierPressed(t)||(e=>{const t=e.getBody(),n=e.selection.getRng();return n.startContainer===n.endContainer&&n.startContainer===t&&0===n.startOffset&&n.endOffset===t.childNodes.length})(e)||s.normalize()}),!0),d&&(h(),v(),e.on("init",(()=>{f("DefaultParagraphSeparator",Il(e))})),N(),y(),a.addNodeFilter("br",(e=>{let t=e.length;for(;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()})),c?(x(),E(),S()):p()),l&&(e.on("keydown",(t=>{if(!g(t)&&t.keyCode===n){if(!e.getBody().getElementsByTagName("hr").length)return;if(s.isCollapsed()&&0===s.getRng().startOffset){const e=s.getNode(),n=e.previousSibling;if("HR"===e.nodeName)return r.remove(e),void t.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(r.remove(n),t.preventDefault())}}})),b(),(()=>{const n=()=>{const n=r.getAttribs(s.getStart().cloneNode(!1));return()=>{const o=s.getStart();o!==e.getBody()&&(r.setAttrib(o,"style",null),t(n,(e=>{o.setAttributeNode(e.cloneNode(!0))})))}},o=()=>!s.isCollapsed()&&r.getParent(s.getStart(),r.isBlock)!==r.getParent(s.getEnd(),r.isBlock);e.on("keypress",(t=>{let r;return!(!(g(t)||8!==t.keyCode&&46!==t.keyCode)&&o()&&(r=n(),e.getDoc().execCommand("delete",!1),r(),t.preventDefault(),1))})),r.bind(e.getDoc(),"cut",(t=>{if(!g(t)&&o()){const t=n();vg.setEditorTimeout(e,(()=>{t()}))}}))})(),C(),e.on("SetContent ExecCommand",(e=>{"setcontent"!==e.type&&"mceInsertLink"!==e.command||t(r.select("a:not([data-mce-block])"),(e=>{var t;let n=e.parentNode;const o=r.getRoot();if((null==n?void 0:n.lastChild)===e){for(;n&&!r.isBlock(n);){if((null===(t=n.parentNode)||void 0===t?void 0:t.lastChild)!==n||n===o)return;n=n.parentNode}r.add(n,"br",{"data-mce-bogus":1})}}))})),w(),k(),y(),e.on("drop",(t=>{var n;const o=null===(n=t.dataTransfer)||void 0===n?void 0:n.getData("text/html");m(o)&&/^<img[^>]*>$/.test(o)&&e.dispatch("dragend",new window.DragEvent("dragend",t))})))),{refreshContentEditable:R,isHidden:()=>{if(!l||e.removed)return!1;const t=e.selection.getSel();return!t||!t.rangeCount||0===t.rangeCount}}},kT=za.DOM,ST=e=>e.inline?e.getElement().nodeName.toLowerCase():void 0,NT=e=>ye(e,(e=>!1===v(e))),RT=e=>{const t=e.options.get,n=e.editorUpload.blobCache;return NT({allow_conditional_comments:t("allow_conditional_comments"),allow_html_data_urls:t("allow_html_data_urls"),allow_svg_data_urls:t("allow_svg_data_urls"),allow_html_in_named_anchor:t("allow_html_in_named_anchor"),allow_script_urls:t("allow_script_urls"),allow_unsafe_link_target:t("allow_unsafe_link_target"),convert_unsafe_embeds:t("convert_unsafe_embeds"),convert_fonts_to_spans:t("convert_fonts_to_spans"),fix_list_elements:t("fix_list_elements"),font_size_legacy_values:t("font_size_legacy_values"),forced_root_block:t("forced_root_block"),forced_root_block_attrs:t("forced_root_block_attrs"),preserve_cdata:t("preserve_cdata"),inline_styles:t("inline_styles"),root_name:ST(e),sandbox_iframes:t("sandbox_iframes"),sanitize:t("xss_sanitization"),validate:!0,blob_cache:n,document:e.getDoc()})},AT=e=>{const t=e.options.get;return NT({custom_elements:t("custom_elements"),extended_valid_elements:t("extended_valid_elements"),invalid_elements:t("invalid_elements"),invalid_styles:t("invalid_styles"),schema:t("schema"),valid_children:t("valid_children"),valid_classes:t("valid_classes"),valid_elements:t("valid_elements"),valid_styles:t("valid_styles"),verify_html:t("verify_html"),padd_empty_block_inline_children:t("format_empty_lines")})},TT=e=>e.inline?e.ui.styleSheetLoader:e.dom.styleSheetLoader,OT=e=>{const t=TT(e),n=id(e),o=e.contentCSS,r=()=>{t.unloadAll(o),e.inline||e.ui.styleSheetLoader.unloadAll(n)},s=()=>{e.removed?r():e.on("remove",r)};if(e.contentStyles.length>0){let t="";Pt.each(e.contentStyles,(e=>{t+=e+"\r\n"})),e.dom.addStyle(t)}const a=Promise.all(((e,t,n)=>{const{pass:o,fail:r}=K(t,(e=>tinymce.Resource.has(Uw(e)))),s=o.map((t=>{const n=tinymce.Resource.get(Uw(t));return m(n)?Promise.resolve(TT(e).loadRawCss(t,n)):Promise.resolve()})),a=[...s,TT(e).loadAll(r)];return e.inline?a:a.concat([e.ui.styleSheetLoader.loadAll(n)])})(e,o,n)).then(s).catch(s),i=ad(e);return i&&((e,t)=>{const n=yn(e.getBody()),o=Vn(qn(n)),r=bn("style");Jt(r,"type","text/css"),vo(r,vn(t)),vo(o,r),e.on("remove",(()=>{xo(r)}))})(e,i),a},BT=e=>{!0!==e.removed&&((e=>{XC(e)||e.load({initial:!0,format:"html"}),e.startContent=e.getContent({format:"raw"})})(e),(e=>{e.bindPendingEventDelegates(),e.initialized=!0,(e=>{e.dispatch("Init")})(e),e.focus(!0),(e=>{const t=e.dom.getRoot();e.inline||am(e)&&e.selection.getStart(!0)!==t||Ou(t).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e),e.nodeChanged({initial:!0});const t=$d(e);w(t)&&t.call(e,e),(e=>{const t=Vd(e);t&&vg.setEditorTimeout(e,(()=>{let n;n=!0===t?e:e.editorManager.get(t),n&&!n.destroyed&&(n.focus(),n.selection.scrollIntoView())}),100)})(e)})(e))},PT=e=>{const t=e.getElement();let n=e.getDoc();e.inline&&(kT.addClass(t,"mce-content-body"),e.contentDocument=n=document,e.contentWindow=window,e.bodyElement=t,e.contentAreaContainer=t);const o=e.getBody();o.disabled=!0,e.readonly=Bd(e),e._editableRoot=Pd(e),!e.readonly&&e.hasEditableRoot()&&(e.inline&&"static"===kT.getStyle(o,"position",!0)&&(o.style.position="relative"),o.contentEditable="true"),o.disabled=!1,e.editorUpload=Kw(e),e.schema=ua(AT(e)),e.dom=za(n,{keep_values:!0,url_converter:e.convertURL,url_converter_scope:e,update_styles:!0,root_element:e.inline?e.getBody():null,collect:e.inline,schema:e.schema,contentCssCors:Zl(e),referrerPolicy:ed(e),onSetAttrib:t=>{e.dispatch("SetAttrib",t)},force_hex_color:yc(e)}),e.parser=(e=>{const t=bC(RT(e),e.schema);return t.addAttributeFilter("src,href,style,tabindex",((t,n)=>{const o=e.dom,r="data-mce-"+n;let s=t.length;for(;s--;){const a=t[s];let i=a.attr(n);if(i&&!a.attr(r)){if(0===i.indexOf("data:")||0===i.indexOf("blob:"))continue;"style"===n?(i=o.serializeStyle(o.parseStyle(i),a.name),i.length||(i=null),a.attr(r,i),a.attr(n,i)):"tabindex"===n?(a.attr(r,i),a.attr(n,null)):a.attr(r,e.convertURL(i,n,a.name))}}})),t.addNodeFilter("script",(e=>{let t=e.length;for(;t--;){const n=e[t],o=n.attr("type")||"no/type";0!==o.indexOf("mce-")&&n.attr("type","mce-"+o)}})),uc(e)&&t.addNodeFilter("#cdata",(t=>{var n;let o=t.length;for(;o--;){const r=t[o];r.type=8,r.name="#comment",r.value="[CDATA["+e.dom.encode(null!==(n=r.value)&&void 0!==n?n:"")+"]]"}})),t.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",(t=>{let n=t.length;const o=e.schema.getNonEmptyElements();for(;n--;){const e=t[n];e.isEmpty(o)&&0===e.getAll("br").length&&e.append(new Wg("br",1))}})),t})(e),e.serializer=iw((e=>{const t=e.options.get;return{...RT(e),...AT(e),...NT({remove_trailing_brs:t("remove_trailing_brs"),pad_empty_with_br:t("pad_empty_with_br"),url_converter:t("url_converter"),url_converter_scope:t("url_converter_scope"),element_format:t("element_format"),entities:t("entities"),entity_encoding:t("entity_encoding"),indent:t("indent"),indent_after:t("indent_after"),indent_before:t("indent_before")})}})(e),e),e.selection=rw(e.dom,e.getWin(),e.serializer,e),e.annotator=Qm(e),e.formatter=rx(e),e.undoManager=ax(e),e._nodeChangeDispatcher=new hR(e),e._selectionOverrides=ZA(e),(e=>{const t=Xa(),n=$a(!1),o=Ja((t=>{e.dispatch("longpress",{...t,type:"longpress"}),n.set(!0)}),400);e.on("touchstart",(e=>{P_(e).each((r=>{o.cancel();const s={x:r.clientX,y:r.clientY,target:e.target};o.throttle(e),n.set(!1),t.set(s)}))}),!0),e.on("touchmove",(r=>{o.cancel(),P_(r).each((o=>{t.on((r=>{((e,t)=>{const n=Math.abs(e.clientX-t.x),o=Math.abs(e.clientY-t.y);return n>5||o>5})(o,r)&&(t.clear(),n.set(!1),e.dispatch("longpresscancel"))}))}))}),!0),e.on("touchend touchcancel",(r=>{o.cancel(),"touchcancel"!==r.type&&t.get().filter((e=>e.target.isEqualNode(r.target))).each((()=>{n.get()?r.preventDefault():e.dispatch("tap",{...r,type:"tap"})}))}),!0)})(e),(e=>{(e=>{e.on("click",(t=>{e.dom.getParent(t.target,"details")&&t.preventDefault()}))})(e),(e=>{e.parser.addNodeFilter("details",(t=>{const n=bc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))})),e.serializer.addNodeFilter("details",(t=>{const n=vc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))}))})(e)})(e),(e=>{const t="contenteditable",n=" "+Pt.trim(dc(e))+" ",o=" "+Pt.trim(lc(e))+" ",r=z_(n),s=z_(o),a=cc(e);a.length>0&&e.on("BeforeSetContent",(t=>{((e,t,n)=>{let o=t.length,r=n.content;if("raw"!==n.format){for(;o--;)r=r.replace(t[o],j_(e,r,lc(e)));n.content=r}})(e,a,t)})),e.parser.addAttributeFilter("class",(e=>{let n=e.length;for(;n--;){const o=e[n];r(o)?o.attr(t,"true"):s(o)&&o.attr(t,"false")}})),e.serializer.addAttributeFilter(t,(e=>{let n=e.length;for(;n--;){const o=e[n];(r(o)||s(o))&&(a.length>0&&o.attr("data-mce-content")?(o.name="#text",o.type=3,o.raw=!0,o.value=o.attr("data-mce-content")):o.attr(t,null))}}))})(e),XC(e)||((e=>{e.on("mousedown",(t=>{t.detail>=3&&(t.preventDefault(),SA(e))}))})(e),(e=>{(e=>{const t=[",",".",";",":","!","?"],n=[32],o=()=>{return t=ac(e),n=ic(e),{inlinePatterns:wl(t),blockPatterns:Cl(t),dynamicPatternsLookup:n};var t,n},r=()=>(e=>e.options.isSet("text_patterns_lookup"))(e);e.on("keydown",(t=>{if(13===t.keyCode&&!af.modifierPressed(t)&&e.selection.isCollapsed()){const n=o();(n.inlinePatterns.length>0||n.blockPatterns.length>0||r())&&xT(e,n)&&t.preventDefault()}}),!0);const s=()=>{if(e.selection.isCollapsed()){const t=o();(t.inlinePatterns.length>0||r())&&((e,t)=>{const n=e.selection.getRng();iT(e,n).map((o=>{const r=Math.max(0,n.startOffset-1),s=dT(e.dom,o,n.startContainer,r),a=lT(t,o,s),i=CT(e,o,n.startContainer,r,a,!1);i.length>0&&e.undoManager.transact((()=>{wT(e,i)}))}))})(e,t)}};e.on("keyup",(e=>{ET(n,e,((e,t)=>e===t.keyCode&&!af.modifierPressed(t)))&&s()})),e.on("keypress",(n=>{ET(t,n,((e,t)=>e.charCodeAt(0)===t.charCode))&&vg.setEditorTimeout(e,s)}))})(e)})(e));const r=pR(e);B_(e,r),(e=>{e.on("NodeChange",T(F_,e))})(e),(e=>{var t;const n=e.dom,o=Il(e),r=null!==(t=md(e))&&void 0!==t?t:"",s=(t,a)=>{if((e=>{if(dx(e)){const t=e.keyCode;return!cx(e)&&(af.metaKeyPressed(e)||e.altKey||t>=112&&t<=123||H(ix,t))}return!1})(t))return;const i=e.getBody(),l=!(e=>dx(e)&&!(cx(e)||"keyup"===e.type&&229===e.keyCode))(t)&&((e,t,n)=>{if(gs(yn(t),!1)){const o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&n===o.nodeName.toLowerCase()}return!1})(n,i,o);(""!==n.getAttrib(i,lx)!==l||a)&&(n.setAttrib(i,lx,l?r:null),n.setAttrib(i,"aria-placeholder",l?r:null),((e,t)=>{e.dispatch("PlaceholderToggle",{state:t})})(e,l),e.on(l?"keydown":"keyup",s),e.off(l?"keyup":"keydown",s))};Ye(r)&&e.on("init",(t=>{s(t,!0),e.on("change SetContent ExecCommand",s),e.on("paste",(t=>vg.setEditorTimeout(e,(()=>s(t)))))}))})(e),yA(e);const s=(e=>{const t=e;return(e=>xe(e.plugins,"rtc").bind((e=>I.from(e.setup))))(e).fold((()=>(t.rtcInstance=GC(e),I.none())),(e=>(t.rtcInstance=(()=>{const e=N(null),t=N("");return{init:{bindEvents:_},undoManager:{beforeChange:_,add:e,undo:e,redo:e,clear:_,reset:_,hasUndo:L,hasRedo:L,transact:e,ignore:_,extra:_},formatter:{match:L,matchAll:N([]),matchNode:N(void 0),canApply:L,closest:t,apply:_,remove:_,toggle:_,formatChanged:N({unbind:_})},editor:{getContent:t,setContent:N({content:"",html:""}),insertContent:N(""),addVisual:_},selection:{getContent:t},autocompleter:{addDecoration:_,removeDecoration:_},raw:{getModel:N(I.none())}}})(),I.some((()=>e().then((e=>(t.rtcInstance=(e=>{const t=e=>f(e)?e:{},{init:n,undoManager:o,formatter:r,editor:s,selection:a,autocompleter:i,raw:l}=e;return{init:{bindEvents:n.bindEvents},undoManager:{beforeChange:o.beforeChange,add:o.add,undo:o.undo,redo:o.redo,clear:o.clear,reset:o.reset,hasUndo:o.hasUndo,hasRedo:o.hasRedo,transact:(e,t,n)=>o.transact(n),ignore:(e,t)=>o.ignore(t),extra:(e,t,n,r)=>o.extra(n,r)},formatter:{match:(e,n,o,s)=>r.match(e,t(n),s),matchAll:r.matchAll,matchNode:r.matchNode,canApply:e=>r.canApply(e),closest:e=>r.closest(e),apply:(e,n,o)=>r.apply(e,t(n)),remove:(e,n,o,s)=>r.remove(e,t(n)),toggle:(e,n,o)=>r.toggle(e,t(n)),formatChanged:(e,t,n,o,s)=>r.formatChanged(t,n,o,s)},editor:{getContent:e=>s.getContent(e),setContent:(e,t)=>({content:s.setContent(e,t),html:""}),insertContent:(e,t)=>(s.insertContent(e),""),addVisual:s.addVisual},selection:{getContent:(e,t)=>a.getContent(t)},autocompleter:{addDecoration:i.addDecoration,removeDecoration:i.removeDecoration},raw:{getModel:()=>I.some(l.getRawModel())}}})(e),e.rtc.isRemote))))))))})(e);(e=>{const t=e.getDoc(),n=e.getBody();(e=>{e.dispatch("PreInit")})(e),Wd(e)||(t.body.spellcheck=!1,kT.setAttrib(n,"spellcheck","false")),e.quirks=_T(e),(e=>{e.dispatch("PostRender")})(e);const o=ld(e);void 0!==o&&(n.dir=o);const r=Kd(e);r&&e.on("BeforeSetContent",(e=>{Pt.each(r,(t=>{e.content=e.content.replace(t,(e=>"\x3c!--mce:protected "+escape(e)+"--\x3e"))}))})),e.on("SetContent",(()=>{e.addVisual(e.getBody())})),e.on("compositionstart compositionend",(t=>{e.composing="compositionstart"===t.type}))})(e),s.fold((()=>{const t=(e=>{let t=!1;const n=setTimeout((()=>{t||e.setProgressState(!0)}),500);return()=>{clearTimeout(n),t=!0,e.setProgressState(!1)}})(e);OT(e).then((()=>{BT(e),t()}))}),(t=>{e.setProgressState(!0),OT(e).then((()=>{t().then((t=>{e.setProgressState(!1),BT(e),ZC(e)}),(t=>{e.notificationManager.open({type:"error",text:String(t)}),BT(e),ZC(e)}))}))}))},DT=M,LT=za.DOM,MT=za.DOM,IT=(e,t)=>({editorContainer:e,iframeContainer:t,api:{}}),FT=e=>{const t=e.getElement();return e.inline?IT(null):(e=>{const t=MT.create("div");return MT.insertAfter(t,e),IT(t,t)})(t)},UT=async e=>{e.dispatch("ScriptsLoaded"),(e=>{const t=Pt.trim(Kl(e)),n=e.ui.registry.getAll().icons,o={...xw.get("default").icons,...xw.get(t).icons};ge(o,((t,o)=>{Ee(n,o)||e.ui.registry.addIcon(o,t)}))})(e),(e=>{const t=pd(e);if(m(t)){const n=Bw.get(t);e.theme=n(e,Bw.urls[t])||{},w(e.theme.init)&&e.theme.init(e,Bw.urls[t]||e.documentBaseUrl.replace(/\/$/,""))}else e.theme={}})(e),(e=>{const t=bd(e),n=Ew.get(t);e.model=n(e,Ew.urls[t])})(e),(e=>{const t=[];V(Ld(e),(n=>{((e,t,n)=>{const o=Ow.get(n),r=Ow.urls[n]||e.documentBaseUrl.replace(/\/$/,"");if(n=Pt.trim(n),o&&-1===Pt.inArray(t,n)){if(e.plugins[n])return;try{const s=o(e,r)||{};e.plugins[n]=s,w(s.init)&&(s.init(e,r),t.push(n))}catch(t){((e,t,n)=>{const o=Ka.translate(["Failed to initialize plugin: {0}",t]);ef(e,"PluginLoadError",{message:o}),Fw(o,n),Lw(e,o)})(e,n,t)}}})(e,t,(e=>e.replace(/^\-/,""))(n))}))})(e);const t=await(e=>{const t=e.getElement();return e.orgDisplay=t.style.display,m(pd(e))?(e=>{const t=e.theme.renderUI;return t?t():FT(e)})(e):w(pd(e))?(e=>{const t=e.getElement(),n=pd(e)(e,t);return n.editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||e.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||e.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:t.offsetHeight,n})(e):FT(e)})(e);((e,t)=>{const n={show:I.from(t.show).getOr(_),hide:I.from(t.hide).getOr(_),isEnabled:I.from(t.isEnabled).getOr(M),setEnabled:n=>{e.mode.isReadOnly()||I.from(t.setEnabled).each((e=>e(n)))}};e.ui={...e.ui,...n}})(e,I.from(t.api).getOr({})),e.editorContainer=t.editorContainer,(e=>{e.contentCSS=e.contentCSS.concat((e=>zw(e,sd(e)))(e),(e=>zw(e,id(e)))(e))})(e),e.inline?PT(e):((e,t)=>{((e,t)=>{const n=e.translate("Rich Text Area"),o=tn(yn(e.getElement()),"tabindex").bind(Xe),r=((e,t,n,o)=>{const r=bn("iframe");return o.each((e=>Jt(r,"tabindex",e))),Zt(r,n),Zt(r,{id:e+"_ifr",frameBorder:"0",allowTransparency:"true",title:t}),un(r,"tox-edit-area__iframe"),r})(e.id,n,Tl(e),o).dom;r.onload=()=>{r.onload=null,e.dispatch("load")},e.contentAreaContainer=t.iframeContainer,e.iframeElement=r,e.iframeHTML=(e=>{let t=Ol(e)+"<html><head>";Bl(e)!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';const n=Pl(e),o=Dl(e),r=e.translate(jd(e));return Ll(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+Ll(e)+'" />'),t+=`</head><body id="${n}" class="mce-content-body ${o}" data-id="${e.id}" aria-label="${r}"><br></body></html>`,t})(e),LT.add(t.iframeContainer,r)})(e,t),t.editorContainer&&(t.editorContainer.style.display=e.orgDisplay,e.hidden=LT.isHidden(t.editorContainer)),e.getElement().style.display="none",LT.setAttrib(e.id,"aria-hidden","true"),e.getElement().style.visibility=e.orgVisibility,(e=>{const t=e.iframeElement,n=()=>{e.contentDocument=t.contentDocument,PT(e)};if(gc(e)||At.browser.isFirefox()){const t=e.getDoc();t.open(),t.write(e.iframeHTML),t.close(),n()}else{const r=(o=yn(t),No(o,"load",DT,(()=>{r.unbind(),n()})));t.srcdoc=e.iframeHTML}var o})(e)})(e,{editorContainer:t.editorContainer,iframeContainer:t.iframeContainer})},zT=za.DOM,jT=e=>"-"===e.charAt(0),HT=(e,t,n)=>I.from(t).filter((e=>Ye(e)&&!xw.has(e))).map((t=>({url:`${e.editorManager.baseURL}/icons/${t}/icons${n}.js`,name:I.some(t)}))),$T=(e,t)=>{const n=Ha.ScriptLoader,o=()=>{!e.removed&&(e=>{const t=pd(e);return!m(t)||C(Bw.get(t))})(e)&&(e=>{const t=bd(e);return C(Ew.get(t))})(e)&&UT(e)};((e,t)=>{const n=pd(e);if(m(n)&&!jT(n)&&!Ee(Bw.urls,n)){const o=hd(e),r=o?e.documentBaseURI.toAbsolute(o):`themes/${n}/theme${t}.js`;Bw.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ThemeLoadError",Iw("theme",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=bd(e);if("plugin"!==n&&!Ee(Ew.urls,n)){const o=vd(e),r=m(o)?e.documentBaseURI.toAbsolute(o):`models/${n}/model${t}.js`;Ew.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ModelLoadError",Iw("model",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=td(t),o=nd(t);if(!Ka.hasCode(n)&&"en"!==n){const r=Ye(o)?o:`${t.editorManager.baseURL}/langs/${n}.js`;e.add(r).catch((()=>{((e,t,n)=>{Mw(e,"LanguageLoadError",Iw("language",t,n))})(t,r,n)}))}})(n,e),((e,t,n)=>{const o=HT(t,"default",n),r=(e=>I.from(Yl(e)).filter(Ye).map((e=>({url:e,name:I.none()}))))(t).orThunk((()=>HT(t,Kl(t),"")));V((e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t})([o,r]),(n=>{e.add(n.url).catch((()=>{((e,t,n)=>{Mw(e,"IconsLoadError",Iw("icons",t,n))})(t,n.url,n.name.getOrUndefined())}))}))})(n,e,t),((e,t)=>{const n=(t,n)=>{Ow.load(t,n).catch((()=>{((e,t,n)=>{Mw(e,"PluginLoadError",Iw("plugin",t,n))})(e,n,t)}))};ge(Md(e),((t,o)=>{n(o,t),e.options.set("plugins",Ld(e).concat(o))})),V(Ld(e),(e=>{!(e=Pt.trim(e))||Ow.urls[e]||jT(e)||n(e,`plugins/${e}/plugin${t}.js`)}))})(e,t),n.loadQueue().then(o,o)},qT=xt().deviceType,VT=qT.isPhone(),WT=qT.isTablet(),KT=e=>{if(y(e))return[];{const t=p(e)?e:e.split(/[ ,]/),n=q(t,Ve);return Y(n,Ye)}},YT=(e,t)=>{const n=((t,n)=>{const o={},r={};return ve(t,((t,n)=>H(e,n)),be(o),be(r)),{t:o,f:r}})(t);return o=n.t,r=n.f,{sections:N(o),options:N(r)};var o,r},GT=(e,t)=>Ee(e.sections(),t),XT=(e,t)=>({table_grid:!1,object_resizing:!1,resize:!1,toolbar_mode:xe(e,"toolbar_mode").getOr("scrolling"),toolbar_sticky:!1,...t?{menubar:!1}:{}}),QT=(e,t)=>{var n;const o=null!==(n=t.external_plugins)&&void 0!==n?n:{};return e&&e.external_plugins?Pt.extend({},e.external_plugins,o):o},JT=(e,t,n,o,r)=>{var s;const a=e?{mobile:XT(null!==(s=r.mobile)&&void 0!==s?s:{},t)}:{},i=YT(["mobile"],Jk(a,r)),l=Pt.extend(n,o,i.options(),((e,t)=>e&&GT(t,"mobile"))(e,i)?((e,t,n={})=>{const o=e.sections(),r=xe(o,t).getOr({});return Pt.extend({},n,r)})(i,"mobile"):{},{external_plugins:QT(o,i.options())});return((e,t,n,o)=>{const r=KT(n.forced_plugins),s=KT(o.plugins),a=((e,t)=>GT(e,t)?e.sections()[t]:{})(t,"mobile"),i=((e,t,n,o)=>e&&GT(t,"mobile")?o:n)(e,t,s,a.plugins?KT(a.plugins):s),l=((e,t)=>[...KT(e),...KT(t)])(r,i);return Pt.extend(o,{forced_plugins:r,plugins:l})})(e,i,o,l)},ZT=e=>{(e=>{const t=t=>()=>{V("left,center,right,justify".split(","),(n=>{t!==n&&e.formatter.remove("align"+n)})),"none"!==t&&((t,n)=>{e.formatter.toggle(t,void 0),e.nodeChanged()})("align"+t)};e.editorCommands.addCommands({JustifyLeft:t("left"),JustifyCenter:t("center"),JustifyRight:t("right"),JustifyFull:t("justify"),JustifyNone:t("none")})})(e),(e=>{const t=t=>()=>{const n=e.selection,o=n.isCollapsed()?[e.dom.getParent(n.getNode(),e.dom.isBlock)]:n.getSelectedBlocks();return $(o,(n=>C(e.formatter.matchNode(n,t))))};e.editorCommands.addCommands({JustifyLeft:t("alignleft"),JustifyCenter:t("aligncenter"),JustifyRight:t("alignright"),JustifyFull:t("alignjustify")},"state")})(e)},eO=(e,t)=>{const n=e.selection,o=e.dom;return/^ | $/.test(t)?((e,t,n,o)=>{const r=yn(e.getRoot());return n=eh(r,Vi.fromRangeStart(t),o)?n.replace(/^ /,"&nbsp;"):n.replace(/^&nbsp;/," "),th(r,Vi.fromRangeEnd(t),o)?n.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):n.replace(/&nbsp;(<br( \/)?>)?$/," ")})(o,n.getRng(),t,e.schema):t},tO=(e,t)=>{if(e.selection.isEditable()){const{content:n,details:o}=(e=>{if("string"!=typeof e){const t=Pt.extend({paste:e.paste,data:{paste:e.paste}},e);return{content:e.content,details:t}}return{content:e,details:{}}})(t);wC(e,{...o,content:eO(e,n),format:"html",set:!1,selection:!0}).each((t=>{const n=((e,t,n)=>QC(e).editor.insertContent(t,n))(e,t.content,o);xC(e,n,t),e.addVisual()}))}},nO={"font-size":"size","font-family":"face"},oO=Xt("font"),rO=e=>(t,n)=>I.from(n).map(yn).filter(Wt).bind((n=>((e,t,n)=>Lb(yn(n),(t=>(t=>mo(t,e).orThunk((()=>oO(t)?xe(nO,e).bind((e=>tn(t,e))):I.none())))(t)),(e=>_n(yn(t),e))))(e,t,n.dom).or(((e,t)=>I.from(za.DOM.getStyle(t,e,!0)))(e,n.dom)))).getOr(""),sO=rO("font-size"),aO=k((e=>e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")),rO("font-family")),iO=e=>Ou(e.getBody()).bind((e=>{const t=e.container();return I.from(er(t)?t.parentNode:t)})),lO=(e,t)=>((e,t)=>(e=>I.from(e.selection.getRng()).bind((t=>{const n=e.getBody();return t.startContainer===n&&0===t.startOffset?I.none():I.from(e.selection.getStart(!0))})))(e).orThunk(T(iO,e)).map(yn).filter(Wt).bind(t))(e,S(I.some,t)),dO=(e,t)=>{if(/^[0-9.]+$/.test(t)){const n=parseInt(t,10);if(n>=1&&n<=7){const o=(e=>Pt.explode(e.options.get("font_size_style_values")))(e),r=(e=>Pt.explode(e.options.get("font_size_classes")))(e);return r.length>0?r[n-1]||t:o[n-1]||t}return t}return t},cO=e=>{const t=e.split(/\s*,\s*/);return q(t,(e=>-1===e.indexOf(" ")||He(e,'"')||He(e,"'")?e:`'${e}'`)).join(",")},uO=(e,t)=>{const n=e.dom,o=e.selection.getRng(),r=t?e.selection.getStart():e.selection.getEnd(),s=t?o.startContainer:o.endContainer,a=hN(n,s);if(!a||!a.isContentEditable)return;const i=t?po:ho,l=Il(e);((e,t,n,o)=>{const r=e.dom,s=e=>r.isBlock(e)&&e.parentElement===n,a=s(t)?t:r.getParent(o,s,n);return I.from(a).map(yn)})(e,r,a,s).each((t=>{const n=CN(e,s,t.dom,a,!1,l);i(t,yn(n)),e.selection.setCursorLocation(n,0),e.dispatch("NewBlock",{newBlock:n}),dN(e,"insertParagraph")}))},mO=e=>{ZT(e),(e=>{e.editorCommands.addCommands({"Cut,Copy,Paste":t=>{const n=e.getDoc();let o;try{n.execCommand(t)}catch(e){o=!0}if("paste"!==t||n.queryCommandEnabled(t)||(o=!0),o||!n.queryCommandSupported(t)){let t=e.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");(At.os.isMacOS()||At.os.isiOS())&&(t=t.replace(/Ctrl\+/g,"\u2318+")),e.notificationManager.open({text:t,type:"error"})}}})})(e),(e=>{e.editorCommands.addCommands({mceAddUndoLevel:()=>{e.undoManager.add()},mceEndUndoLevel:()=>{e.undoManager.add()},Undo:()=>{e.undoManager.undo()},Redo:()=>{e.undoManager.redo()}})})(e),(e=>{e.editorCommands.addCommands({mceSelectNodeDepth:(t,n,o)=>{let r=0;e.dom.getParent(e.selection.getNode(),(t=>!qo(t)||r++!==o||(e.selection.select(t),!1)),e.getBody())},mceSelectNode:(t,n,o)=>{e.selection.select(o)},selectAll:()=>{const t=e.dom.getParent(e.selection.getStart(),lr);if(t){const n=e.dom.createRng();n.selectNodeContents(t),e.selection.setRng(n)}}})})(e),(e=>{e.editorCommands.addCommands({mceCleanup:()=>{const t=e.selection.getBookmark();e.setContent(e.getContent()),e.selection.moveToBookmark(t)},insertImage:(t,n,o)=>{tO(e,e.dom.createHTML("img",{src:o}))},insertHorizontalRule:()=>{e.execCommand("mceInsertContent",!1,"<hr>")},insertText:(t,n,o)=>{tO(e,e.dom.encode(o))},insertHTML:(t,n,o)=>{tO(e,o)},mceInsertContent:(t,n,o)=>{tO(e,o)},mceSetContent:(t,n,o)=>{e.setContent(o)},mceReplaceContent:(t,n,o)=>{e.execCommand("mceInsertContent",!1,o.replace(/\{\$selection\}/g,e.selection.getContent({format:"text"})))},mceNewDocument:()=>{e.setContent(Jd(e))}})})(e),(e=>{const t=(t,n,o)=>{const r=m(o)?{href:o}:o,s=e.dom.getParent(e.selection.getNode(),"a");f(r)&&m(r.href)&&(r.href=r.href.replace(/ /g,"%20"),s&&r.href||e.formatter.remove("link"),r.href&&e.formatter.apply("link",r,s))};e.editorCommands.addCommands({unlink:()=>{if(e.selection.isEditable()){if(e.selection.isCollapsed()){const t=e.dom.getParent(e.selection.getStart(),"a");return void(t&&e.dom.remove(t,!0))}e.formatter.remove("link")}},mceInsertLink:t,createLink:t})})(e),(e=>{e.editorCommands.addCommands({Indent:()=>{(e=>{R_(e,"indent")})(e)},Outdent:()=>{A_(e)}}),e.editorCommands.addCommands({Outdent:()=>k_(e)},"state")})(e),(e=>{e.editorCommands.addCommands({InsertNewBlockBefore:()=>{(e=>{uO(e,!0)})(e)},InsertNewBlockAfter:()=>{(e=>{uO(e,!1)})(e)}})})(e),(e=>{e.editorCommands.addCommands({insertParagraph:()=>{ZN(ON,e)},mceInsertNewLine:(t,n,o)=>{eR(e,o)},InsertLineBreak:(t,n,o)=>{ZN(UN,e)}})})(e),(e=>{(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{e.getDoc().execCommand(t);const n=e.dom.getParent(e.selection.getNode(),"ol,ul");if(n){const t=n.parentNode;if(t&&/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)){const o=e.selection.getBookmark();e.dom.split(t,n),e.selection.moveToBookmark(o)}}}})})(e),(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{const n=e.dom.getParent(e.selection.getNode(),"ul,ol");return n&&("insertunorderedlist"===t&&"UL"===n.tagName||"insertorderedlist"===t&&"OL"===n.tagName)}},"state")})(e)})(e),(e=>{(e=>{const t=(t,n)=>{e.formatter.toggle(t,n),e.nodeChanged()};e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>{t(e)},"ForeColor,HiliteColor":(e,n,o)=>{t(e,{value:o})},BackColor:(e,n,o)=>{t("hilitecolor",{value:o})},FontName:(t,n,o)=>{((e,t)=>{const n=dO(e,t);e.formatter.toggle("fontname",{value:cO(n)}),e.nodeChanged()})(e,o)},FontSize:(t,n,o)=>{((e,t)=>{e.formatter.toggle("fontsize",{value:dO(e,t)}),e.nodeChanged()})(e,o)},LineHeight:(t,n,o)=>{((e,t)=>{e.formatter.toggle("lineheight",{value:String(t)}),e.nodeChanged()})(e,o)},Lang:(e,n,o)=>{var r;t(e,{value:o.code,customValue:null!==(r=o.customCode)&&void 0!==r?r:null})},RemoveFormat:t=>{e.formatter.remove(t)},mceBlockQuote:()=>{t("blockquote")},FormatBlock:(e,n,o)=>{t(m(o)?o:"p")},mceToggleFormat:(e,n,o)=>{t(o)}})})(e),(e=>{const t=t=>e.formatter.match(t);e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>t(e),mceBlockQuote:()=>t("blockquote")},"state"),e.editorCommands.addQueryValueHandler("FontName",(()=>(e=>lO(e,(t=>aO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("FontSize",(()=>(e=>lO(e,(t=>sO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("LineHeight",(()=>(e=>lO(e,(t=>{const n=yn(e.getBody()),o=Lb(t,(e=>mo(e,"line-height")),T(_n,n));return o.getOrThunk((()=>{const e=parseFloat(co(t,"line-height")),n=parseFloat(co(t,"font-size"));return String(e/n)}))})).getOr(""))(e)))})(e)})(e),(e=>{e.editorCommands.addCommands({mceRemoveNode:(t,n,o)=>{const r=null!=o?o:e.selection.getNode();if(r!==e.getBody()){const t=e.selection.getBookmark();e.dom.remove(r,!0),e.selection.moveToBookmark(t)}},mcePrint:()=>{e.getWin().print()},mceFocus:(t,n,o)=>{((e,t)=>{e.removed||(t?Tg(e):(e=>{const t=e.selection,n=e.getBody();let o=t.getRng();e.quirks.refreshContentEditable(),C(e.bookmark)&&!Rg(e)&&hg(e).each((t=>{e.selection.setRng(t),o=t}));const r=((e,t)=>e.dom.getParent(t,(t=>"true"===e.dom.getContentEditable(t))))(e,t.getNode());if(r&&e.dom.isChildOf(r,n))return Ng(r),Sg(e,o),void Tg(e);e.inline||(At.browser.isOpera()||Ng(n),e.getWin().focus()),(At.browser.isFirefox()||e.inline)&&(Ng(n),Sg(e,o)),Tg(e)})(e))})(e,!0===o)},mceToggleVisualAid:()=>{e.hasVisual=!e.hasVisual,e.addVisual()}})})(e)},fO=["toggleview"],gO=e=>H(fO,e.toLowerCase());class pO{constructor(e){this.commands={state:{},exec:{},value:{}},this.editor=e}execCommand(e,t=!1,n,o){const r=this.editor,s=e.toLowerCase(),a=null==o?void 0:o.skip_focus;if(r.removed)return!1;if("mcefocus"!==s&&(/^(mceAddUndoLevel|mceEndUndoLevel)$/i.test(s)||a?(e=>{hg(e).each((t=>e.selection.setRng(t)))})(r):r.focus()),r.dispatch("BeforeExecCommand",{command:e,ui:t,value:n}).isDefaultPrevented())return!1;const i=this.commands.exec[s];return!!w(i)&&(i(s,t,n),r.dispatch("ExecCommand",{command:e,ui:t,value:n}),!0)}queryCommandState(e){if(!gO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return!1;const t=e.toLowerCase(),n=this.commands.state[t];return!!w(n)&&n(t)}queryCommandValue(e){if(!gO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return"";const t=e.toLowerCase(),n=this.commands.value[t];return w(n)?n(t):""}addCommands(e,t="exec"){const n=this.commands;ge(e,((e,o)=>{V(o.toLowerCase().split(","),(o=>{n[t][o]=e}))}))}addCommand(e,t,n){const o=e.toLowerCase();this.commands.exec[o]=(e,o,r)=>t.call(null!=n?n:this.editor,o,r)}queryCommandSupported(e){const t=e.toLowerCase();return!!this.commands.exec[t]}addQueryStateHandler(e,t,n){this.commands.state[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}addQueryValueHandler(e,t,n){this.commands.value[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}}const hO="data-mce-contenteditable",bO=(e,t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},vO=(e,t)=>{e.dom.contentEditable=t?"true":"false"},yO=e=>e.readonly,CO=e=>{e.parser.addAttributeFilter("contenteditable",(t=>{yO(e)&&V(t,(e=>{e.attr(hO,e.attr("contenteditable")),e.attr("contenteditable","false")}))})),e.serializer.addAttributeFilter(hO,(t=>{yO(e)&&V(t,(e=>{e.attr("contenteditable",e.attr(hO))}))})),e.serializer.addTempAttr(hO)},wO=["copy"],xO=Pt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," ");class EO{static isNative(e){return!!xO[e.toLowerCase()]}constructor(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||L}fire(e,t){return this.dispatch(e,t)}dispatch(e,t){const n=e.toLowerCase(),o=_a(n,null!=t?t:{},this.scope);this.settings.beforeFire&&this.settings.beforeFire(o);const r=this.bindings[n];if(r)for(let e=0,t=r.length;e<t;e++){const t=r[e];if(!t.removed){if(t.once&&this.off(n,t.func),o.isImmediatePropagationStopped())return o;if(!1===t.func.call(this.scope,o))return o.preventDefault(),o}}return o}on(e,t,n,o){if(!1===t&&(t=L),t){const r={func:t,removed:!1};o&&Pt.extend(r,o);const s=e.toLowerCase().split(" ");let a=s.length;for(;a--;){const e=s[a];let t=this.bindings[e];t||(t=[],this.toggleEvent(e,!0)),t=n?[r,...t]:[...t,r],this.bindings[e]=t}}return this}off(e,t){if(e){const n=e.toLowerCase().split(" ");let o=n.length;for(;o--;){const r=n[o];let s=this.bindings[r];if(!r)return ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1),delete this.bindings[t]})),this;if(s){if(t){const e=K(s,(e=>e.func===t));s=e.fail,this.bindings[r]=s,V(e.pass,(e=>{e.removed=!0}))}else s.length=0;s.length||(this.toggleEvent(e,!1),delete this.bindings[r])}}}else ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1)})),this.bindings={};return this}once(e,t,n){return this.on(e,t,n,{once:!0})}has(e){e=e.toLowerCase();const t=this.bindings[e];return!(!t||0===t.length)}}const _O=e=>(e._eventDispatcher||(e._eventDispatcher=new EO({scope:e,toggleEvent:(t,n)=>{EO.isNative(t)&&e.toggleNativeEvent&&e.toggleNativeEvent(t,n)}})),e._eventDispatcher),kO={fire(e,t,n){return this.dispatch(e,t,n)},dispatch(e,t,n){const o=this;if(o.removed&&"remove"!==e&&"detach"!==e)return _a(e.toLowerCase(),null!=t?t:{},o);const r=_O(o).dispatch(e,t);if(!1!==n&&o.parent){let t=o.parent();for(;t&&!r.isPropagationStopped();)t.dispatch(e,r,!1),t=t.parent?t.parent():void 0}return r},on(e,t,n){return _O(this).on(e,t,n)},off(e,t){return _O(this).off(e,t)},once(e,t){return _O(this).once(e,t)},hasEventListeners(e){return _O(this).has(e)}},SO=za.DOM;let NO;const RO=(e,t)=>{if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^(?:mouse|touch|click|contextmenu|drop|dragover|dragend)/.test(t))return e.getDoc().documentElement;const n=fd(e);return n?(e.eventRoot||(e.eventRoot=SO.select(n)[0]),e.eventRoot):e.getBody()},AO=(e,t,n)=>{(e=>!e.hidden&&!yO(e))(e)?e.dispatch(t,n):yO(e)&&((e,t)=>{if((e=>"click"===e.type)(t)&&!af.metaKeyPressed(t)){const n=yn(t.target);((e,t)=>no(t,"a",(t=>_n(t,yn(e.getBody())))).bind((e=>tn(e,"href"))))(e,n).each((n=>{if(t.preventDefault(),/^#/.test(n)){const t=e.dom.select(`${n},[name="${ze(n,"#")}"]`);t.length&&e.selection.scrollIntoView(t[0],!0)}else window.open(n,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))}else(e=>H(wO,e.type))(t)&&e.dispatch(t.type,t)})(e,n)},TO=(e,t)=>{if(e.delegates||(e.delegates={}),e.delegates[t]||e.removed)return;const n=RO(e,t);if(fd(e)){if(NO||(NO={},e.editorManager.on("removeEditor",(()=>{e.editorManager.activeEditor||NO&&(ge(NO,((t,n)=>{e.dom.unbind(RO(e,n))})),NO=null)}))),NO[t])return;const o=n=>{const o=n.target,r=e.editorManager.get();let s=r.length;for(;s--;){const e=r[s].getBody();(e===o||SO.isChildOf(o,e))&&AO(r[s],t,n)}};NO[t]=o,SO.bind(n,t,o)}else{const o=n=>{AO(e,t,n)};SO.bind(n,t,o),e.delegates[t]=o}},OO={...kO,bindPendingEventDelegates(){const e=this;Pt.each(e._pendingNativeEvents,(t=>{TO(e,t)}))},toggleNativeEvent(e,t){const n=this;"focus"!==e&&"blur"!==e&&(n.removed||(t?n.initialized?TO(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&n.delegates&&(n.dom.unbind(RO(n,e),e,n.delegates[e]),delete n.delegates[e])))},unbindAllNativeEvents(){const e=this,t=e.getBody(),n=e.dom;e.delegates&&(ge(e.delegates,((t,n)=>{e.dom.unbind(RO(e,n),n,t)})),delete e.delegates),!e.inline&&t&&n&&(t.onload=null,n.unbind(e.getWin()),n.unbind(e.getDoc())),n&&(n.unbind(t),n.unbind(e.getContainer()))}},BO=e=>m(e)?{value:e.split(/[ ,]/),valid:!0}:E(e,m)?{value:e,valid:!0}:{valid:!1,message:"The value must be a string[] or a comma/space separated string."},PO=(e,t)=>e+(Ge(t.message)?"":`. ${t.message}`),DO=e=>e.valid,LO=(e,t,n="")=>{const o=t(e);return b(o)?o?{value:e,valid:!0}:{valid:!1,message:n}:o},MO=["design","readonly"],IO=(e,t,n,o)=>{const r=n[t.get()],s=n[o];try{s.activate()}catch(e){return void console.error(`problem while activating editor mode ${o}:`,e)}r.deactivate(),r.editorReadOnly!==s.editorReadOnly&&((e,t)=>{const n=yn(e.getBody());((e,t,n)=>{gn(e,t)&&!n?fn(e,t):n&&un(e,t)})(n,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),(e=>{I.from(e.selection.getNode()).each((e=>{e.removeAttribute("data-mce-selected")}))})(e),e.readonly=!0,vO(n,!1),V(Uo(n,'*[contenteditable="true"]'),(e=>{Jt(e,hO,"true"),vO(e,!1)}))):(e.readonly=!1,e.hasEditableRoot()&&vO(n,!0),V(Uo(n,`*[${hO}="true"]`),(e=>{on(e,hO),vO(e,!0)})),bO(e,"StyleWithCSS",!1),bO(e,"enableInlineTableEditing",!1),bO(e,"enableObjectResizing",!1),Ag(e)&&e.focus(),(e=>{e.selection.setRng(e.selection.getRng())})(e),e.nodeChanged())})(e,s.editorReadOnly),t.set(o),((e,t)=>{e.dispatch("SwitchMode",{mode:t})})(e,o)},FO=Pt.each,UO=Pt.explode,zO={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},jO=Pt.makeMap("alt,ctrl,shift,meta,access"),HO=e=>{const t={},n=At.os.isMacOS()||At.os.isiOS();FO(UO(e.toLowerCase(),"+"),(e=>{(e=>e in jO)(e)?t[e]=!0:/^[0-9]{2,}$/.test(e)?t.keyCode=parseInt(e,10):(t.charCode=e.charCodeAt(0),t.keyCode=zO[e]||e.toUpperCase().charCodeAt(0))}));const o=[t.keyCode];let r;for(r in jO)t[r]?o.push(r):t[r]=!1;return t.id=o.join(","),t.access&&(t.alt=!0,n?t.ctrl=!0:t.shift=!0),t.meta&&(n?t.meta=!0:(t.ctrl=!0,t.meta=!1)),t};class $O{constructor(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;const t=this;e.on("keyup keypress keydown",(e=>{!t.hasModifier(e)&&!t.isFunctionKey(e)||e.isDefaultPrevented()||(FO(t.shortcuts,(n=>{t.matchShortcut(e,n)&&(t.pendingPatterns=n.subpatterns.slice(0),"keydown"===e.type&&t.executeShortcutAction(n))})),t.matchShortcut(e,t.pendingPatterns[0])&&(1===t.pendingPatterns.length&&"keydown"===e.type&&t.executeShortcutAction(t.pendingPatterns[0]),t.pendingPatterns.shift()))}))}add(e,t,n,o){const r=this,s=r.normalizeCommandFunc(n);return FO(UO(Pt.trim(e)),(e=>{const n=r.createShortcut(e,t,s,o);r.shortcuts[n.id]=n})),!0}remove(e){const t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)}normalizeCommandFunc(e){const t=this,n=e;return"string"==typeof n?()=>{t.editor.execCommand(n,!1,null)}:Pt.isArray(n)?()=>{t.editor.execCommand(n[0],n[1],n[2])}:n}createShortcut(e,t,n,o){const r=Pt.map(UO(e,">"),HO);return r[r.length-1]=Pt.extend(r[r.length-1],{func:n,scope:o||this.editor}),Pt.extend(r[0],{desc:this.editor.translate(t),subpatterns:r.slice(1)})}hasModifier(e){return e.altKey||e.ctrlKey||e.metaKey}isFunctionKey(e){return"keydown"===e.type&&e.keyCode>=112&&e.keyCode<=123}matchShortcut(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)}executeShortcutAction(e){return e.func?e.func.call(e.scope):null}}const qO=()=>{const e=(()=>{const e={},t={},n={},o={},r={},s={},a={},i={},l=(e,t)=>(n,o)=>{e[n.toLowerCase()]={...o,type:t}};return{addButton:l(e,"button"),addGroupToolbarButton:l(e,"grouptoolbarbutton"),addToggleButton:l(e,"togglebutton"),addMenuButton:l(e,"menubutton"),addSplitButton:l(e,"splitbutton"),addMenuItem:l(t,"menuitem"),addNestedMenuItem:l(t,"nestedmenuitem"),addToggleMenuItem:l(t,"togglemenuitem"),addAutocompleter:l(n,"autocompleter"),addContextMenu:l(r,"contextmenu"),addContextToolbar:l(s,"contexttoolbar"),addContextForm:l(s,"contextform"),addSidebar:l(a,"sidebar"),addView:l(i,"views"),addIcon:(e,t)=>o[e.toLowerCase()]=t,getAll:()=>({buttons:e,menuItems:t,icons:o,popups:n,contextMenus:r,contextToolbars:s,sidebars:a,views:i})}})();return{addAutocompleter:e.addAutocompleter,addButton:e.addButton,addContextForm:e.addContextForm,addContextMenu:e.addContextMenu,addContextToolbar:e.addContextToolbar,addIcon:e.addIcon,addMenuButton:e.addMenuButton,addMenuItem:e.addMenuItem,addNestedMenuItem:e.addNestedMenuItem,addSidebar:e.addSidebar,addSplitButton:e.addSplitButton,addToggleButton:e.addToggleButton,addGroupToolbarButton:e.addGroupToolbarButton,addToggleMenuItem:e.addToggleMenuItem,addView:e.addView,getAll:e.getAll}},VO=za.DOM,WO=Pt.extend,KO=Pt.each;class YO{constructor(e,t,n){this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.composing=!1,this.destroyed=!1,this.hasHiddenInput=!1,this.iframeElement=null,this.initialized=!1,this.readonly=!1,this.removed=!1,this.startContent="",this._pendingNativeEvents=[],this._skinLoaded=!1,this._editableRoot=!0,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,WO(this,OO);const o=this;this.id=e,this.hidden=!1;const r=((e,t)=>JT(VT||WT,VT,t,e,t))(n.defaultOptions,t);this.options=((e,t)=>{const n={},o={},r=(e,t,n)=>{const r=LO(t,n);return DO(r)?(o[e]=r.value,!0):(console.warn(PO(`Invalid value passed for the ${e} option`,r)),!1)},s=e=>Ee(n,e);return{register:(e,s)=>{const a=(e=>m(e.processor))(s)?(e=>{const t=(()=>{switch(e){case"array":return p;case"boolean":return b;case"function":return w;case"number":return x;case"object":return f;case"string":return m;case"string[]":return BO;case"object[]":return e=>E(e,f);case"regexp":return e=>u(e,RegExp);default:return M}})();return n=>LO(n,t,`The value must be a ${e}.`)})(s.processor):s.processor,i=((e,t,n)=>{if(!v(t)){const o=LO(t,n);if(DO(o))return o.value;console.error(PO(`Invalid default value passed for the "${e}" option`,o))}})(e,s.default,a);n[e]={...s,default:i,processor:a},xe(o,e).orThunk((()=>xe(t,e))).each((t=>r(e,t,a)))},isRegistered:s,get:e=>xe(o,e).orThunk((()=>xe(n,e).map((e=>e.default)))).getOrUndefined(),set:(e,t)=>{if(s(e)){const o=n[e];return o.immutable?(console.error(`"${e}" is an immutable option and cannot be updated`),!1):r(e,t,o.processor)}return console.warn(`"${e}" is not a registered option. Ensure the option has been registered before setting a value.`),!1},unset:e=>{const t=s(e);return t&&delete o[e],t},isSet:e=>Ee(o,e)}})(0,r),(e=>{const t=e.options.register;t("id",{processor:"string",default:e.id}),t("selector",{processor:"string"}),t("target",{processor:"object"}),t("suffix",{processor:"string"}),t("cache_suffix",{processor:"string"}),t("base_url",{processor:"string"}),t("referrer_policy",{processor:"string",default:""}),t("language_load",{processor:"boolean",default:!0}),t("inline",{processor:"boolean",default:!1}),t("iframe_attrs",{processor:"object",default:{}}),t("doctype",{processor:"string",default:"<!DOCTYPE html>"}),t("document_base_url",{processor:"string",default:e.documentBaseUrl}),t("body_id",{processor:Al(e,"tinymce"),default:"tinymce"}),t("body_class",{processor:Al(e),default:""}),t("content_security_policy",{processor:"string",default:""}),t("br_in_pre",{processor:"boolean",default:!0}),t("forced_root_block",{processor:e=>{const t=m(e)&&Ye(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be a non-empty string."}},default:"p"}),t("forced_root_block_attrs",{processor:"object",default:{}}),t("newline_behavior",{processor:e=>{const t=H(["block","linebreak","invert","default"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: block, linebreak, invert or default."}},default:"default"}),t("br_newline_selector",{processor:"string",default:".mce-toc h2,figcaption,caption"}),t("no_newline_selector",{processor:"string",default:""}),t("keep_styles",{processor:"boolean",default:!0}),t("end_container_on_empty_block",{processor:e=>b(e)||m(e)?{valid:!0,value:e}:{valid:!1,message:"Must be boolean or a string"},default:"blockquote"}),t("font_size_style_values",{processor:"string",default:"xx-small,x-small,small,medium,large,x-large,xx-large"}),t("font_size_legacy_values",{processor:"string",default:"xx-small,small,medium,large,x-large,xx-large,300%"}),t("font_size_classes",{processor:"string",default:""}),t("automatic_uploads",{processor:"boolean",default:!0}),t("images_reuse_filename",{processor:"boolean",default:!1}),t("images_replace_blob_uris",{processor:"boolean",default:!0}),t("icons",{processor:"string",default:""}),t("icons_url",{processor:"string",default:""}),t("images_upload_url",{processor:"string",default:""}),t("images_upload_base_path",{processor:"string",default:""}),t("images_upload_credentials",{processor:"boolean",default:!1}),t("images_upload_handler",{processor:"function"}),t("language",{processor:"string",default:"en"}),t("language_url",{processor:"string",default:""}),t("entity_encoding",{processor:"string",default:"named"}),t("indent",{processor:"boolean",default:!0}),t("indent_before",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_after",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_use_margin",{processor:"boolean",default:!1}),t("indentation",{processor:"string",default:"40px"}),t("content_css",{processor:e=>{const t=!1===e||m(e)||E(e,m);return t?m(e)?{value:q(e.split(","),Ve),valid:t}:p(e)?{value:e,valid:t}:!1===e?{value:[],valid:t}:{value:e,valid:t}:{valid:!1,message:"Must be false, a string or an array of strings."}},default:kd(e)?[]:["default"]}),t("content_style",{processor:"string"}),t("content_css_cors",{processor:"boolean",default:!1}),t("font_css",{processor:e=>{const t=m(e)||E(e,m);return t?{value:p(e)?e:q(e.split(","),Ve),valid:t}:{valid:!1,message:"Must be a string or an array of strings."}},default:[]}),t("inline_boundaries",{processor:"boolean",default:!0}),t("inline_boundaries_selector",{processor:"string",default:"a[href],code,span.mce-annotation"}),t("object_resizing",{processor:e=>{const t=b(e)||m(e);return t?!1===e||El.isiPhone()||El.isiPad()?{value:"",valid:t}:{value:!0===e?"table,img,figure.image,div,video,iframe":e,valid:t}:{valid:!1,message:"Must be boolean or a string"}},default:!_l}),t("resize_img_proportional",{processor:"boolean",default:!0}),t("event_root",{processor:"object"}),t("service_message",{processor:"string"}),t("theme",{processor:e=>!1===e||m(e)||w(e),default:"silver"}),t("theme_url",{processor:"string"}),t("formats",{processor:"object"}),t("format_empty_lines",{processor:"boolean",default:!1}),t("format_noneditable_selector",{processor:"string",default:""}),t("preview_styles",{processor:e=>{const t=!1===e||m(e);return t?{value:!1===e?"":e,valid:t}:{valid:!1,message:"Must be false or a string"}},default:"font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"}),t("custom_ui_selector",{processor:"string",default:""}),t("hidden_input",{processor:"boolean",default:!0}),t("submit_patch",{processor:"boolean",default:!0}),t("encoding",{processor:"string"}),t("add_form_submit_trigger",{processor:"boolean",default:!0}),t("add_unload_trigger",{processor:"boolean",default:!0}),t("custom_undo_redo_levels",{processor:"number",default:0}),t("disable_nodechange",{processor:"boolean",default:!1}),t("readonly",{processor:"boolean",default:!1}),t("editable_root",{processor:"boolean",default:!0}),t("plugins",{processor:"string[]",default:[]}),t("external_plugins",{processor:"object"}),t("forced_plugins",{processor:"string[]"}),t("model",{processor:"string",default:e.hasPlugin("rtc")?"plugin":"dom"}),t("model_url",{processor:"string"}),t("block_unsupported_drop",{processor:"boolean",default:!0}),t("visual",{processor:"boolean",default:!0}),t("visual_table_class",{processor:"string",default:"mce-item-table"}),t("visual_anchor_class",{processor:"string",default:"mce-item-anchor"}),t("iframe_aria_text",{processor:"string",default:"Rich Text Area. Press ALT-0 for help."}),t("setup",{processor:"function"}),t("init_instance_callback",{processor:"function"}),t("url_converter",{processor:"function",default:e.convertURL}),t("url_converter_scope",{processor:"object",default:e}),t("urlconverter_callback",{processor:"function"}),t("allow_conditional_comments",{processor:"boolean",default:!1}),t("allow_html_data_urls",{processor:"boolean",default:!1}),t("allow_svg_data_urls",{processor:"boolean"}),t("allow_html_in_named_anchor",{processor:"boolean",default:!1}),t("allow_script_urls",{processor:"boolean",default:!1}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("convert_fonts_to_spans",{processor:"boolean",default:!0,deprecated:!0}),t("fix_list_elements",{processor:"boolean",default:!1}),t("preserve_cdata",{processor:"boolean",default:!1}),t("remove_trailing_brs",{processor:"boolean",default:!0}),t("pad_empty_with_br",{processor:"boolean",default:!1}),t("inline_styles",{processor:"boolean",default:!0,deprecated:!0}),t("element_format",{processor:"string",default:"html"}),t("entities",{processor:"string"}),t("schema",{processor:"string",default:"html5"}),t("convert_urls",{processor:"boolean",default:!0}),t("relative_urls",{processor:"boolean",default:!0}),t("remove_script_host",{processor:"boolean",default:!0}),t("custom_elements",{processor:"string"}),t("extended_valid_elements",{processor:"string"}),t("invalid_elements",{processor:"string"}),t("invalid_styles",{processor:Rl}),t("valid_children",{processor:"string"}),t("valid_classes",{processor:Rl}),t("valid_elements",{processor:"string"}),t("valid_styles",{processor:Rl}),t("verify_html",{processor:"boolean",default:!0}),t("auto_focus",{processor:e=>m(e)||!0===e}),t("browser_spellcheck",{processor:"boolean",default:!1}),t("protect",{processor:"array"}),t("images_file_types",{processor:"string",default:"jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp"}),t("deprecation_warnings",{processor:"boolean",default:!0}),t("a11y_advanced_options",{processor:"boolean",default:!1}),t("api_key",{processor:"string"}),t("paste_block_drop",{processor:"boolean",default:!1}),t("paste_data_images",{processor:"boolean",default:!0}),t("paste_preprocess",{processor:"function"}),t("paste_postprocess",{processor:"function"}),t("paste_webkit_styles",{processor:"string",default:"none"}),t("paste_remove_styles_if_webkit",{processor:"boolean",default:!0}),t("paste_merge_formats",{processor:"boolean",default:!0}),t("smart_paste",{processor:"boolean",default:!0}),t("paste_as_text",{processor:"boolean",default:!1}),t("paste_tab_spaces",{processor:"number",default:4}),t("text_patterns",{processor:e=>E(e,f)||!1===e?{value:xl(!1===e?[]:e),valid:!0}:{valid:!1,message:"Must be an array of objects or false."},default:[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}]}),t("text_patterns_lookup",{processor:e=>{return w(e)?{value:(t=e,e=>{const n=t(e);return xl(n)}),valid:!0}:{valid:!1,message:"Must be a single function"};var t},default:e=>[]}),t("noneditable_class",{processor:"string",default:"mceNonEditable"}),t("editable_class",{processor:"string",default:"mceEditable"}),t("noneditable_regexp",{processor:e=>E(e,Sl)?{value:e,valid:!0}:Sl(e)?{value:[e],valid:!0}:{valid:!1,message:"Must be a RegExp or an array of RegExp."},default:[]}),t("table_tab_navigation",{processor:"boolean",default:!0}),t("highlight_on_focus",{processor:"boolean",default:!1}),t("xss_sanitization",{processor:"boolean",default:!0}),t("details_initial_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("details_serialized_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("init_content_sync",{processor:"boolean",default:!1}),t("newdocument_content",{processor:"string",default:""}),t("force_hex_color",{processor:e=>{const t=["always","rgb_only","off"],n=H(t,e);return n?{value:e,valid:n}:{valid:!1,message:`Must be one of: ${t.join(", ")}.`}},default:"off"}),t("sandbox_iframes",{processor:"boolean",default:!1}),t("convert_unsafe_embeds",{processor:"boolean",default:!1}),e.on("ScriptsLoaded",(()=>{t("directionality",{processor:"string",default:Ka.isRtl()?"rtl":void 0}),t("placeholder",{processor:"string",default:kl.getAttrib(e.getElement(),"placeholder")})}))})(o);const s=this.options.get;s("deprecation_warnings")&&((e,t)=>{((e,t)=>{const n=gw(e),o=bw(t),r=o.length>0,s=n.length>0,a="mobile"===t.theme;if(r||s||a){const e="\n- ",t=a?`\n\nThemes:${e}mobile`:"",i=r?`\n\nPlugins:${e}${o.join(e)}`:"",l=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled and have been removed in TinyMCE 6.0. These features will no longer work and should be removed from the TinyMCE configuration. See https://www.tiny.cloud/docs/tinymce/6/migration-from-5x/ for more information."+t+i+l)}})(e,t),((e,t)=>{const n=pw(e),o=vw(t),r=o.length>0,s=n.length>0;if(r||s){const e="\n- ",t=r?`\n\nPlugins:${e}${o.map(yw).join(e)}`:"",a=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled but will be removed soon."+t+a)}})(e,t)})(t,r);const a=s("suffix");a&&(n.suffix=a),this.suffix=n.suffix;const i=s("base_url");i&&n._setBaseUrl(i),this.baseUri=n.baseURI;const l=ed(o);l&&(Ha.ScriptLoader._setReferrerPolicy(l),za.DOM.styleSheetLoader._setReferrerPolicy(l));const d=Dd(o);C(d)&&za.DOM.styleSheetLoader._setContentCssCors(d),Ya.languageLoad=s("language_load"),Ya.baseURL=n.baseURL,this.setDirty(!1),this.documentBaseURI=new oC(Bl(o),{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=kd(o),this.hasVisual=Fd(o),this.shortcuts=new $O(this),this.editorCommands=new pO(this),mO(this);const c=s("cache_suffix");c&&(At.cacheSuffix=c.replace(/^[\?\&]+/,"")),this.ui={registry:qO(),styleSheetLoader:void 0,show:_,hide:_,setEnabled:_,isEnabled:M},this.mode=(e=>{const t=$a("design"),n=$a({design:{activate:_,deactivate:_,editorReadOnly:!1},readonly:{activate:_,deactivate:_,editorReadOnly:!0}});return(e=>{e.serializer?CO(e):e.on("PreInit",(()=>{CO(e)}))})(e),(e=>{e.on("ShowCaret",(t=>{yO(e)&&t.preventDefault()})),e.on("ObjectSelected",(t=>{yO(e)&&t.preventDefault()}))})(e),{isReadOnly:()=>yO(e),set:o=>((e,t,n,o)=>{if(o!==n.get()){if(!Ee(t,o))throw new Error(`Editor mode '${o}' is invalid`);e.initialized?IO(e,n,t,o):e.on("init",(()=>IO(e,n,t,o)))}})(e,n.get(),t,o),get:()=>t.get(),register:(e,t)=>{n.set(((e,t,n)=>{if(H(MO,t))throw new Error(`Cannot override default mode ${t}`);return{...e,[t]:{...n,deactivate:()=>{try{n.deactivate()}catch(e){console.error(`problem while deactivating editor mode ${t}:`,e)}}}}})(n.get(),e,t))}}})(o),n.dispatch("SetupEditor",{editor:this});const g=Hd(o);w(g)&&g.call(o,o)}render(){(e=>{const t=e.id;Ka.setCode(td(e));const n=()=>{zT.unbind(window,"ready",n),e.render()};if(!Ta.Event.domLoaded)return void zT.bind(window,"ready",n);if(!e.getElement())return;const o=yn(e.getElement()),r=rn(o);e.on("remove",(()=>{W(o.dom.attributes,(e=>on(o,e.name))),Zt(o,r)})),e.ui.styleSheetLoader=((e,t)=>Is.forElement(e,{contentCssCors:Dd(t),referrerPolicy:ed(t)}))(o,e),kd(e)?e.inline=!0:(e.orgVisibility=e.getElement().style.visibility,e.getElement().style.visibility="hidden");const s=e.getElement().form||zT.getParent(t,"form");s&&(e.formElement=s,Sd(e)&&!Zo(e.getElement())&&(zT.insertAfter(zT.create("input",{type:"hidden",name:t}),t),e.hasHiddenInput=!0),e.formEventDelegate=t=>{e.dispatch(t.type,t)},zT.bind(s,"submit reset",e.formEventDelegate),e.on("reset",(()=>{e.resetContent()})),!Nd(e)||s.submit.nodeType||s.submit.length||s._mceOldSubmit||(s._mceOldSubmit=s.submit,s.submit=()=>(e.editorManager.triggerSave(),e.setDirty(!1),s._mceOldSubmit(s)))),e.windowManager=Pw(e),e.notificationManager=Tw(e),(e=>"xml"===e.options.get("encoding"))(e)&&e.on("GetContent",(e=>{e.save&&(e.content=zT.encode(e.content))})),Rd(e)&&e.on("submit",(()=>{e.initialized&&e.save()})),Ad(e)&&(e._beforeUnload=()=>{!e.initialized||e.destroyed||e.isHidden()||e.save({format:"raw",no_events:!0,set_dirty:!1})},e.editorManager.on("BeforeUnload",e._beforeUnload)),e.editorManager.add(e),$T(e,e.suffix)})(this)}focus(e){this.execCommand("mceFocus",!1,e)}hasFocus(){return Rg(this)}translate(e){return Ka.translate(e)}getParam(e,t,n){const o=this.options;return o.isRegistered(e)||(C(n)?o.register(e,{processor:n,default:t}):o.register(e,{processor:M,default:t})),o.isSet(e)||v(t)?o.get(e):t}hasPlugin(e,t){return!(!H(Ld(this),e)||t&&void 0===Ow.get(e))}nodeChanged(e){this._nodeChangeDispatcher.nodeChanged(e)}addCommand(e,t,n){this.editorCommands.addCommand(e,t,n)}addQueryStateHandler(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)}addQueryValueHandler(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)}addShortcut(e,t,n,o){this.shortcuts.add(e,t,n,o)}execCommand(e,t,n,o){return this.editorCommands.execCommand(e,t,n,o)}queryCommandState(e){return this.editorCommands.queryCommandState(e)}queryCommandValue(e){return this.editorCommands.queryCommandValue(e)}queryCommandSupported(e){return this.editorCommands.queryCommandSupported(e)}show(){const e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable="true":(VO.show(e.getContainer()),VO.hide(e.id)),e.load(),e.dispatch("show"))}hide(){const e=this;e.hidden||(e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(VO.hide(e.getContainer()),VO.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.dispatch("hide"))}isHidden(){return this.hidden}setProgressState(e,t){this.dispatch("ProgressState",{state:e,time:t})}load(e={}){const t=this,n=t.getElement();if(t.removed)return"";if(n){const o={...e,load:!0},r=Zo(n)?n.value:n.innerHTML,s=t.setContent(r,o);return o.no_events||t.dispatch("LoadContent",{...o,element:n}),s}return""}save(e={}){const t=this;let n=t.getElement();if(!n||!t.initialized||t.removed)return"";const o={...e,save:!0,element:n};let r=t.getContent(o);const s={...o,content:r};if(s.no_events||t.dispatch("SaveContent",s),"raw"===s.format&&t.dispatch("RawSaveContent",s),r=s.content,Zo(n))n.value=r;else{!e.is_removing&&t.inline||(n.innerHTML=r);const o=VO.getParent(t.id,"form");o&&KO(o.elements,(e=>e.name!==t.id||(e.value=r,!1)))}return s.element=o.element=n=null,!1!==s.set_dirty&&t.setDirty(!1),r}setContent(e,t){return lw(this,e,t)}getContent(e){return((e,t={})=>{const n=((e,t)=>({...e,format:t,get:!0,getInner:!0}))(t,t.format?t.format:"html");return yC(e,n).fold(R,(t=>{const n=((e,t)=>QC(e).editor.getContent(t))(e,t);return CC(e,n,t)}))})(this,e)}insertContent(e,t){t&&(e=WO({content:e},t)),this.execCommand("mceInsertContent",!1,e)}resetContent(e){void 0===e?lw(this,this.startContent,{format:"raw"}):lw(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()}isDirty(){return!this.isNotDirty}setDirty(e){const t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.dispatch("dirty")}getContainer(){const e=this;return e.container||(e.container=e.editorContainer||VO.get(e.id+"_parent")),e.container}getContentAreaContainer(){return this.contentAreaContainer}getElement(){return this.targetElm||(this.targetElm=VO.get(this.id)),this.targetElm}getWin(){const e=this;if(!e.contentWindow){const t=e.iframeElement;t&&(e.contentWindow=t.contentWindow)}return e.contentWindow}getDoc(){const e=this;if(!e.contentDocument){const t=e.getWin();t&&(e.contentDocument=t.document)}return e.contentDocument}getBody(){var e,t;const n=this.getDoc();return null!==(t=null!==(e=this.bodyElement)&&void 0!==e?e:null==n?void 0:n.body)&&void 0!==t?t:null}convertURL(e,t,n){const o=this,r=o.options.get,s=qd(o);if(w(s))return s.call(o,e,n,!0,t);if(!r("convert_urls")||"link"===n||f(n)&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length)return e;const a=new oC(e);return"http"!==a.protocol&&"https"!==a.protocol&&""!==a.protocol?e:r("relative_urls")?o.documentBaseURI.toRelative(e):e=o.documentBaseURI.toAbsolute(e,r("remove_script_host"))}addVisual(e){((e,t)=>{((e,t)=>{JC(e).editor.addVisual(t)})(e,t)})(this,e)}setEditableRoot(e){((e,t)=>{e._editableRoot!==t&&(e._editableRoot=t,e.readonly||(e.getBody().contentEditable=String(e.hasEditableRoot()),e.nodeChanged()),((e,t)=>{e.dispatch("EditableRootStateChange",{state:t})})(e,t))})(this,e)}hasEditableRoot(){return this._editableRoot}remove(){(e=>{if(!e.removed){const{_selectionOverrides:t,editorUpload:n}=e,o=e.getBody(),r=e.getElement();o&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&C(null==r?void 0:r.nextSibling)&&Cw.remove(r.nextSibling),(e=>{e.dispatch("remove")})(e),e.editorManager.remove(e),!e.inline&&o&&(e=>{Cw.setStyle(e.id,"display",e.orgDisplay)})(e),(e=>{e.dispatch("detach")})(e),Cw.remove(e.getContainer()),ww(t),ww(n),e.destroy()}})(this)}destroy(e){((e,t)=>{const{selection:n,dom:o}=e;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),ww(n),ww(o)),(e=>{const t=e.formElement;t&&(t._mceOldSubmit&&(t.submit=t._mceOldSubmit,delete t._mceOldSubmit),Cw.unbind(t,"submit reset",e.formEventDelegate))})(e),(e=>{const t=e;t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null;const n=e.selection;if(n){const e=n.dom;t.selection=n.win=n.dom=e.doc=null}})(e),e.destroyed=!0):e.remove())})(this,e)}uploadImages(){return this.editorUpload.uploadImages()}_scanForImages(){return this.editorUpload.scanForImages()}}const GO=za.DOM,XO=Pt.each;let QO,JO=!1,ZO=[];const eB=e=>{const t=e.type;XO(rB.get(),(n=>{switch(t){case"scroll":n.dispatch("ScrollWindow",e);break;case"resize":n.dispatch("ResizeWindow",e)}}))},tB=e=>{if(e!==JO){const t=za.DOM;e?(t.bind(window,"resize",eB),t.bind(window,"scroll",eB)):(t.unbind(window,"resize",eB),t.unbind(window,"scroll",eB)),JO=e}},nB=e=>{const t=ZO;return ZO=Y(ZO,(t=>e!==t)),rB.activeEditor===e&&(rB.activeEditor=ZO.length>0?ZO[0]:null),rB.focusedEditor===e&&(rB.focusedEditor=null),t.length!==ZO.length},oB="CSS1Compat"!==document.compatMode,rB={...kO,baseURI:null,baseURL:null,defaultOptions:{},documentBaseURL:null,suffix:null,majorVersion:"6",minorVersion:"8.3",releaseDate:"2024-02-08",i18n:Ka,activeEditor:null,focusedEditor:null,setup(){const e=this;let t="",n="",o=oC.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(o)&&(o=o.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(o)||(o+="/"));const r=window.tinymce||window.tinyMCEPreInit;if(r)t=r.base||r.baseURL,n=r.suffix;else{const e=document.getElementsByTagName("script");for(let o=0;o<e.length;o++){const r=e[o].src||"";if(""===r)continue;const s=r.substring(r.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(r)){-1!==s.indexOf(".min")&&(n=".min"),t=r.substring(0,r.lastIndexOf("/"));break}}if(!t&&document.currentScript){const e=document.currentScript.src;-1!==e.indexOf(".min")&&(n=".min"),t=e.substring(0,e.lastIndexOf("/"))}}var s;e.baseURL=new oC(o).toAbsolute(t),e.documentBaseURL=o,e.baseURI=new oC(e.baseURL),e.suffix=n,(s=e).on("AddEditor",T(_g,s)),s.on("RemoveEditor",T(kg,s))},overrideDefaults(e){const t=e.base_url;t&&this._setBaseUrl(t);const n=e.suffix;n&&(this.suffix=n),this.defaultOptions=e;const o=e.plugin_base_urls;void 0!==o&&ge(o,((e,t)=>{Ya.PluginManager.urls[t]=e}))},init(e){const t=this;let n;const o=Pt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," ");let r=e=>{n=e};const s=()=>{let n=0;const a=[];let i;GO.unbind(window,"ready",s),(n=>{const o=e.onpageload;o&&o.apply(t,[])})(),i=((e,t)=>{const n=[],o=w(t)?e=>$(n,(n=>t(n,e))):e=>H(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n})((e=>At.browser.isIE()||At.browser.isEdge()?(Fw("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tiny.cloud/docs/tinymce/6/support/#supportedwebbrowsers"),[]):oB?(Fw("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[]):m(e.selector)?GO.select(e.selector):C(e.target)?[e.target]:[])(e)),Pt.each(i,(e=>{var n;(n=t.get(e.id))&&n.initialized&&!(n.getContainer()||n.getBody()).parentNode&&(nB(n),n.unbindAllNativeEvents(),n.destroy(!0),n.removed=!0)})),i=Pt.grep(i,(e=>!t.get(e.id))),0===i.length?r([]):XO(i,(s=>{((e,t)=>e.inline&&t.tagName.toLowerCase()in o)(e,s)?Fw("Could not initialize inline editor on invalid inline target element",s):((e,o,s)=>{const l=new YO(e,o,t);a.push(l),l.on("init",(()=>{++n===i.length&&r(a)})),l.targetElm=l.targetElm||s,l.render()})((e=>{let t=e.id;return t||(t=xe(e,"name").filter((e=>!GO.get(e))).getOrThunk(GO.uniqueId),e.setAttribute("id",t)),t})(s),e,s)}))};return GO.bind(window,"ready",s),new Promise((e=>{n?e(n):r=t=>{e(t)}}))},get(e){return 0===arguments.length?ZO.slice(0):m(e)?J(ZO,(t=>t.id===e)).getOr(null):x(e)&&ZO[e]?ZO[e]:null},add(e){const t=this,n=t.get(e.id);return n===e||(null===n&&ZO.push(e),tB(!0),t.activeEditor=e,t.dispatch("AddEditor",{editor:e}),QO||(QO=e=>{const n=t.dispatch("BeforeUnload");if(n.returnValue)return e.preventDefault(),e.returnValue=n.returnValue,n.returnValue},window.addEventListener("beforeunload",QO))),e},createEditor(e,t){return this.add(new YO(e,t,this))},remove(e){const t=this;let n;if(e){if(!m(e))return n=e,h(t.get(n.id))?null:(nB(n)&&t.dispatch("RemoveEditor",{editor:n}),0===ZO.length&&window.removeEventListener("beforeunload",QO),n.remove(),tB(ZO.length>0),n);XO(GO.select(e),(e=>{n=t.get(e.id),n&&t.remove(n)}))}else for(let e=ZO.length-1;e>=0;e--)t.remove(ZO[e])},execCommand(e,t,n){var o;const r=this,s=f(n)?null!==(o=n.id)&&void 0!==o?o:n.index:n;switch(e){case"mceAddEditor":if(!r.get(s)){const e=n.options;new YO(s,e,r).render()}return!0;case"mceRemoveEditor":{const e=r.get(s);return e&&e.remove(),!0}case"mceToggleEditor":{const e=r.get(s);return e?(e.isHidden()?e.show():e.hide(),!0):(r.execCommand("mceAddEditor",!1,n),!0)}}return!!r.activeEditor&&r.activeEditor.execCommand(e,t,n)},triggerSave:()=>{XO(ZO,(e=>{e.save()}))},addI18n:(e,t)=>{Ka.add(e,t)},translate:e=>Ka.translate(e),setActive(e){const t=this.activeEditor;this.activeEditor!==e&&(t&&t.dispatch("deactivate",{relatedTarget:e}),e.dispatch("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl(e){this.baseURL=new oC(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new oC(this.baseURL)}};rB.setup();const sB=(()=>{const e=Xa();return{FakeClipboardItem:e=>({items:e,types:me(e),getType:t=>xe(e,t).getOrUndefined()}),write:t=>{e.set(t)},read:()=>e.get().getOrUndefined(),clear:e.clear}})(),aB=Math.min,iB=Math.max,lB=Math.round,dB=(e,t,n)=>{let o=t.x,r=t.y;const s=e.w,a=e.h,i=t.w,l=t.h,d=(n||"").split("");return"b"===d[0]&&(r+=l),"r"===d[1]&&(o+=i),"c"===d[0]&&(r+=lB(l/2)),"c"===d[1]&&(o+=lB(i/2)),"b"===d[3]&&(r-=a),"r"===d[4]&&(o-=s),"c"===d[3]&&(r-=lB(a/2)),"c"===d[4]&&(o-=lB(s/2)),cB(o,r,s,a)},cB=(e,t,n,o)=>({x:e,y:t,w:n,h:o}),uB={inflate:(e,t,n)=>cB(e.x-t,e.y-n,e.w+2*t,e.h+2*n),relativePosition:dB,findBestRelativePosition:(e,t,n,o)=>{for(let r=0;r<o.length;r++){const s=dB(e,t,o[r]);if(s.x>=n.x&&s.x+s.w<=n.w+n.x&&s.y>=n.y&&s.y+s.h<=n.h+n.y)return o[r]}return null},intersect:(e,t)=>{const n=iB(e.x,t.x),o=iB(e.y,t.y),r=aB(e.x+e.w,t.x+t.w),s=aB(e.y+e.h,t.y+t.h);return r-n<0||s-o<0?null:cB(n,o,r-n,s-o)},clamp:(e,t,n)=>{let o=e.x,r=e.y,s=e.x+e.w,a=e.y+e.h;const i=t.x+t.w,l=t.y+t.h,d=iB(0,t.x-o),c=iB(0,t.y-r),u=iB(0,s-i),m=iB(0,a-l);return o+=d,r+=c,n&&(s+=d,a+=c,o-=u,r-=m),s-=u,a-=m,cB(o,r,s-o,a-r)},create:cB,fromClientRect:e=>cB(e.left,e.top,e.width,e.height)},mB=(()=>{const e={},t={},n={};return{load:(n,o)=>{const r=`Script at URL "${o}" failed to load`,s=`Script at URL "${o}" did not call \`tinymce.Resource.add('${n}', data)\` within 1 second`;if(void 0!==e[n])return e[n];{const a=new Promise(((e,a)=>{const i=((e,t,n=1e3)=>{let o=!1,r=null;const s=e=>(...t)=>{o||(o=!0,null!==r&&(clearTimeout(r),r=null),e.apply(null,t))},a=s(e),i=s(t);return{start:(...e)=>{o||null!==r||(r=setTimeout((()=>i.apply(null,e)),n))},resolve:a,reject:i}})(e,a);t[n]=i.resolve,Ha.ScriptLoader.loadScript(o).then((()=>i.start(s)),(()=>i.reject(r)))}));return e[n]=a,a}},add:(o,r)=>{void 0!==t[o]&&(t[o](r),delete t[o]),e[o]=Promise.resolve(r),n[o]=r},has:e=>e in n,get:e=>n[e],unload:t=>{delete e[t]}}})();let fB;try{const e="__storage_test__";fB=window.localStorage,fB.setItem(e,e),fB.removeItem(e)}catch(e){fB=(()=>{let e={},t=[];const n={getItem:t=>e[t]||null,setItem:(n,o)=>{t.push(n),e[n]=String(o)},key:e=>t[e],removeItem:n=>{t=t.filter((e=>e===n)),delete e[n]},clear:()=>{t=[],e={}},length:0};return Object.defineProperty(n,"length",{get:()=>t.length,configurable:!1,enumerable:!1}),n})()}const gB={geom:{Rect:uB},util:{Delay:vg,Tools:Pt,VK:af,URI:oC,EventDispatcher:EO,Observable:kO,I18n:Ka,LocalStorage:fB,ImageUploader:e=>{const t=Hw(),n=Ww(e,t);return{upload:(t,o=!0)=>n.upload(t,o?Vw(e):void 0)}}},dom:{EventUtils:Ta,TreeWalker:jo,TextSeeker:hi,DOMUtils:za,ScriptLoader:Ha,RangeUtils:Uf,Serializer:iw,StyleSheetLoader:Ms,ControlSelection:mf,BookmarkManager:Jm,Selection:rw,Event:Ta.Event},html:{Styles:wa,Entities:ea,Node:Wg,Schema:ua,DomParser:bC,Writer:cp,Serializer:up},Env:At,AddOnManager:Ya,Annotator:Qm,Formatter:rx,UndoManager:ax,EditorCommands:pO,WindowManager:Pw,NotificationManager:Tw,EditorObservable:OO,Shortcuts:$O,Editor:YO,FocusManager:bg,EditorManager:rB,DOM:za.DOM,ScriptLoader:Ha.ScriptLoader,PluginManager:Ow,ThemeManager:Bw,ModelManager:Ew,IconManager:xw,Resource:mB,FakeClipboard:sB,trim:Pt.trim,isArray:Pt.isArray,is:Pt.is,toArray:Pt.toArray,makeMap:Pt.makeMap,each:Pt.each,map:Pt.map,grep:Pt.grep,inArray:Pt.inArray,extend:Pt.extend,walk:Pt.walk,resolve:Pt.resolve,explode:Pt.explode,_addCacheSuffix:Pt._addCacheSuffix},pB=Pt.extend(rB,gB);(e=>{window.tinymce=e,window.tinyMCE=e})(pB),(e=>{if("object"==typeof module)try{module.exports=e}catch(e){}})(pB)}();
\ No newline at end of file

From 3fdee6a93befe6a5b41d0073dbf42b5ed3b158a2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 15 Feb 2024 14:40:27 +0000
Subject: [PATCH 042/666] Tables: Updated selection style to avoid scroll
 overflow

Fixes #4844
---
 resources/sass/_tinymce.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index b6a2156df19..7e443ff5a6b 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -110,6 +110,16 @@ body.page-content.mce-content-body  {
   float: none !important;
 }
 
+.page-content.mce-content-body td[data-mce-selected]::after,
+.page-content.mce-content-body th[data-mce-selected]::after {
+  top: 1px;
+  left: 1px;
+  bottom: 1px;
+  right: 1px;
+  outline: 1px dashed #1a85ff;
+  outline-offset: 0;
+}
+
 /**
  * Dark Mode Overrides
  */

From c53c9f68666457365f9294fe944b8491c242ec65 Mon Sep 17 00:00:00 2001
From: Mattic <50807277+ImMattic@users.noreply.github.com>
Date: Thu, 15 Feb 2024 09:22:35 -0600
Subject: [PATCH 043/666] Turned off autocomplete for TOTP codes

Small QOL change to turn off autocomplete when entering TOTP codes since they're one time use only.
---
 resources/views/mfa/parts/verify-totp.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/mfa/parts/verify-totp.blade.php b/resources/views/mfa/parts/verify-totp.blade.php
index a52d9b652a6..b779465ab4d 100644
--- a/resources/views/mfa/parts/verify-totp.blade.php
+++ b/resources/views/mfa/parts/verify-totp.blade.php
@@ -2,7 +2,7 @@
 
 <p class="small mb-m">{{ trans('auth.mfa_verify_totp_desc') }}</p>
 
-<form action="{{ url('/mfa/totp/verify') }}" method="post">
+<form action="{{ url('/mfa/totp/verify') }}" method="post" autocomplete="off">
     {{ csrf_field() }}
     <input type="text"
            name="code"

From ed0718d3f7e5735832cb8ed326803cc9749cf58c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 15 Feb 2024 16:29:37 +0000
Subject: [PATCH 044/666] Tables: Added fix to ensure proper clear formatting
 on cell selections

---
 resources/js/wysiwyg/config.js |  3 ++-
 resources/js/wysiwyg/fixes.js  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index fa2df9c1172..1c770f26fb4 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -13,7 +13,7 @@ import {getPlugin as getImagemanagerPlugin} from './plugins-imagemanager';
 import {getPlugin as getAboutPlugin} from './plugins-about';
 import {getPlugin as getDetailsPlugin} from './plugins-details';
 import {getPlugin as getTasklistPlugin} from './plugins-tasklist';
-import {handleEmbedAlignmentChanges} from './fixes';
+import {handleClearFormattingOnTableCells, handleEmbedAlignmentChanges} from './fixes';
 
 const styleFormats = [
     {title: 'Large Header', format: 'h2', preview: 'color: blue;'},
@@ -191,6 +191,7 @@ function getSetupCallback(options) {
         });
 
         handleEmbedAlignmentChanges(editor);
+        handleClearFormattingOnTableCells(editor);
 
         // Custom handler hook
         window.$events.emitPublic(options.containerElement, 'editor-tinymce::setup', {editor});
diff --git a/resources/js/wysiwyg/fixes.js b/resources/js/wysiwyg/fixes.js
index 46984b45e3d..e51c373d94f 100644
--- a/resources/js/wysiwyg/fixes.js
+++ b/resources/js/wysiwyg/fixes.js
@@ -53,3 +53,34 @@ export function handleEmbedAlignmentChanges(editor) {
         }
     });
 }
+
+/**
+ * TinyMCE does not seem to do a great job on clearing styles in complex
+ * scenarios (like copied word content) when a range of table cells
+ * are selected. This tracks the selected table cells, and watches
+ * for clear formatting events, so some manual cleanup can be performed.
+ *
+ * The events used don't seem to be advertised by TinyMCE.
+ * Found at https://github.com/tinymce/tinymce/blob/6.8.3/modules/tinymce/src/models/dom/main/ts/table/api/Events.ts
+ * @param {Editor} editor
+ */
+export function handleClearFormattingOnTableCells(editor) {
+    /** @var {HTMLTableCellElement[]} * */
+    let selectedCells = [];
+
+    editor.on('TableSelectionChange', event => {
+        selectedCells = (event.cells || []).map(cell => cell.dom);
+    });
+    editor.on('TableSelectionClear', () => {
+        selectedCells = [];
+    });
+
+    const attrsToRemove = ['class', 'style', 'width', 'height'];
+    editor.on('FormatRemove', () => {
+        for (const cell of selectedCells) {
+            for (const attr of attrsToRemove) {
+                cell.removeAttribute(attr);
+            }
+        }
+    });
+}

From 8688ad99b6c867033233cbfc0b5de975a4b51417 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 16 Feb 2024 14:38:30 +0000
Subject: [PATCH 045/666] Tables: Added menu items to clear formatting and
 sizes

---
 lang/en/editor.php                            |  2 +
 resources/js/wysiwyg/config.js                |  3 +
 .../js/wysiwyg/plugins-table-additions.js     | 73 +++++++++++++++++++
 resources/js/wysiwyg/toolbars.js              |  2 +-
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 resources/js/wysiwyg/plugins-table-additions.js

diff --git a/lang/en/editor.php b/lang/en/editor.php
index 670c1c5e1ac..bf0ea4656d3 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -81,6 +81,8 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 1c770f26fb4..30dc6969db0 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -12,6 +12,7 @@ import {getPlugin as getCustomhrPlugin} from './plugins-customhr';
 import {getPlugin as getImagemanagerPlugin} from './plugins-imagemanager';
 import {getPlugin as getAboutPlugin} from './plugins-about';
 import {getPlugin as getDetailsPlugin} from './plugins-details';
+import {getPlugin as getTableAdditionsPlugin} from './plugins-table-additions';
 import {getPlugin as getTasklistPlugin} from './plugins-tasklist';
 import {handleClearFormattingOnTableCells, handleEmbedAlignmentChanges} from './fixes';
 
@@ -124,6 +125,7 @@ function gatherPlugins(options) {
         'about',
         'details',
         'tasklist',
+        'tableadditions',
         options.textDirection === 'rtl' ? 'directionality' : '',
     ];
 
@@ -133,6 +135,7 @@ function gatherPlugins(options) {
     window.tinymce.PluginManager.add('about', getAboutPlugin());
     window.tinymce.PluginManager.add('details', getDetailsPlugin());
     window.tinymce.PluginManager.add('tasklist', getTasklistPlugin());
+    window.tinymce.PluginManager.add('tableadditions', getTableAdditionsPlugin());
 
     if (options.drawioUrl) {
         window.tinymce.PluginManager.add('drawio', getDrawioPlugin(options));
diff --git a/resources/js/wysiwyg/plugins-table-additions.js b/resources/js/wysiwyg/plugins-table-additions.js
new file mode 100644
index 00000000000..fcb774af123
--- /dev/null
+++ b/resources/js/wysiwyg/plugins-table-additions.js
@@ -0,0 +1,73 @@
+/**
+ * @param {Editor} editor
+ */
+function register(editor) {
+    editor.ui.registry.addIcon('tableclearformatting', '<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 24 24"><path d="M15.53088 4.64727v-.82364c0-.453-.37063-.82363-.82363-.82363H4.82363C4.37063 3 4 3.37064 4 3.82363v3.29454c0 .453.37064.82364.82363.82364h9.88362c.453 0 .82363-.37064.82363-.82364v-.82363h.82364v3.29454H8.11817v7.4127c0 .453.37064.82364.82364.82364h1.64727c.453 0 .82363-.37064.82363-.82364v-5.76544h6.58907V4.64727Z"/><path d="m18.42672 19.51563-1.54687-1.54688-1.54688 1.54688c-.26751.2675-.70124.2675-.96875 0-.26751-.26752-.26751-.70124 0-.96876L15.9111 17l-1.54688-1.54688c-.26751-.2675-.26751-.70123 0-.96875.26751-.2675.70124-.2675.96875 0l1.54688 1.54688 1.54687-1.54688c.26751-.2675.70124-.2675.96875 0 .26751.26752.26751.70124 0 .96875L17.8486 17l1.54687 1.54688c.26751.2675.26751.70123 0 .96874-.26751.26752-.70124.26752-.96875 0z"/></svg>');
+    editor.addCommand('tableclearformatting', () => {
+        const table = editor.dom.getParent(editor.selection.getStart(), 'table');
+        if (!table) {
+            return;
+        }
+
+        const attrsToRemove = ['class', 'style', 'width', 'height'];
+        const styled = [table, ...table.querySelectorAll(attrsToRemove.map(a => `[${a}]`).join(','))];
+        for (const elem of styled) {
+            for (const attr of attrsToRemove) {
+                elem.removeAttribute(attr);
+            }
+        }
+    });
+
+    editor.addCommand('tableclearsizes', () => {
+        const table = editor.dom.getParent(editor.selection.getStart(), 'table');
+        if (!table) {
+            return;
+        }
+
+        const targets = [table, ...table.querySelectorAll('tr,td,th,tbody,thead,tfoot,th>*,td>*')];
+        for (const elem of targets) {
+            elem.removeAttribute('width');
+            elem.removeAttribute('height');
+            elem.style.height = null;
+            elem.style.width = null;
+        }
+    });
+
+    const onPreInit = () => {
+        const exitingButtons = editor.ui.registry.getAll().buttons;
+
+        editor.ui.registry.addMenuButton('customtable', {
+            ...exitingButtons.table,
+            fetch: callback => callback('inserttable | cell row column | advtablesort | tableprops tableclearformatting tableclearsizes deletetable'),
+        });
+
+        editor.ui.registry.addMenuItem('tableclearformatting', {
+            icon: 'tableclearformatting',
+            text: 'Clear table formatting',
+            onSetup: exitingButtons.tableprops.onSetup,
+            onAction() {
+                editor.execCommand('tableclearformatting');
+            },
+        });
+
+        editor.ui.registry.addMenuItem('tableclearsizes', {
+            icon: 'resize',
+            text: 'Resize to contents',
+            onSetup: exitingButtons.tableprops.onSetup,
+            onAction() {
+                editor.execCommand('tableclearsizes');
+            },
+        });
+
+        editor.off('PreInit', onPreInit);
+    };
+
+    editor.on('PreInit', onPreInit);
+}
+
+/**
+ * @return {register}
+ */
+export function getPlugin() {
+    return register;
+}
diff --git a/resources/js/wysiwyg/toolbars.js b/resources/js/wysiwyg/toolbars.js
index 4663ad132e1..bd1ff1b6d94 100644
--- a/resources/js/wysiwyg/toolbars.js
+++ b/resources/js/wysiwyg/toolbars.js
@@ -12,7 +12,7 @@ export function getPrimaryToolbar(options) {
         'alignleft aligncenter alignright alignjustify',
         'bullist numlist listoverflow',
         textDirPlugins,
-        'link table imagemanager-insert insertoverflow',
+        'link customtable imagemanager-insert insertoverflow',
         'code about fullscreen',
     ];
 

From 8f1d8cef9e71a324b599f012622d7be8f8e1f09a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 17 Feb 2024 16:28:13 +0000
Subject: [PATCH 046/666] Tables: Added dynamic table header toggle

Shows in table context toolbar when in the first row.
---
 lang/en/editor.php                            |  1 +
 .../js/wysiwyg/plugins-table-additions.js     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lang/en/editor.php b/lang/en/editor.php
index bf0ea4656d3..de9aa0ece10 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -83,6 +83,7 @@
     'delete_table' => 'Delete table',
     'table_clear_formatting' => 'Clear table formatting',
     'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/resources/js/wysiwyg/plugins-table-additions.js b/resources/js/wysiwyg/plugins-table-additions.js
index fcb774af123..a1cf842477a 100644
--- a/resources/js/wysiwyg/plugins-table-additions.js
+++ b/resources/js/wysiwyg/plugins-table-additions.js
@@ -3,6 +3,25 @@
  */
 function register(editor) {
     editor.ui.registry.addIcon('tableclearformatting', '<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 24 24"><path d="M15.53088 4.64727v-.82364c0-.453-.37063-.82363-.82363-.82363H4.82363C4.37063 3 4 3.37064 4 3.82363v3.29454c0 .453.37064.82364.82363.82364h9.88362c.453 0 .82363-.37064.82363-.82364v-.82363h.82364v3.29454H8.11817v7.4127c0 .453.37064.82364.82364.82364h1.64727c.453 0 .82363-.37064.82363-.82364v-5.76544h6.58907V4.64727Z"/><path d="m18.42672 19.51563-1.54687-1.54688-1.54688 1.54688c-.26751.2675-.70124.2675-.96875 0-.26751-.26752-.26751-.70124 0-.96876L15.9111 17l-1.54688-1.54688c-.26751-.2675-.26751-.70123 0-.96875.26751-.2675.70124-.2675.96875 0l1.54688 1.54688 1.54687-1.54688c.26751-.2675.70124-.2675.96875 0 .26751.26752.26751.70124 0 .96875L17.8486 17l1.54687 1.54688c.26751.2675.26751.70123 0 .96874-.26751.26752-.70124.26752-.96875 0z"/></svg>');
+
+    const tableFirstRowContextSpec = {
+        items: ' | tablerowheader',
+        predicate(elem) {
+            const isTable = elem.nodeName.toLowerCase() === 'table';
+            const selectionNode = editor.selection.getNode();
+            const parentTable = selectionNode.closest('table');
+            if (!isTable || !parentTable) {
+                return false;
+            }
+
+            const firstRow = parentTable.querySelector('tr');
+            return firstRow.contains(selectionNode);
+        },
+        position: 'node',
+        scope: 'node',
+    };
+    editor.ui.registry.addContextToolbar('customtabletoolbarfirstrow', tableFirstRowContextSpec);
+
     editor.addCommand('tableclearformatting', () => {
         const table = editor.dom.getParent(editor.selection.getStart(), 'table');
         if (!table) {

From 999d41a7f5455f4c7f9f175b5718d82ee529df2b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 18 Feb 2024 17:55:56 +0000
Subject: [PATCH 047/666] WYSIWYG: Updated code handling to respect direction

Specifically supports "dir" attribute being on top level "pre" element,
and handles application/switching of this within the editor.

For #4809
---
 resources/js/code/index.mjs               |  7 ++++++-
 resources/js/wysiwyg/plugin-codeeditor.js | 12 ++++++++++++
 resources/sass/_codemirror.scss           |  4 ++--
 resources/sass/_text.scss                 |  6 +++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/resources/js/code/index.mjs b/resources/js/code/index.mjs
index ada4529db54..d92a9ba26ca 100644
--- a/resources/js/code/index.mjs
+++ b/resources/js/code/index.mjs
@@ -1,4 +1,4 @@
-import {EditorView, keymap} from '@codemirror/view';
+import {EditorView, keymap, Direction} from '@codemirror/view';
 
 import {copyTextToClipboard} from '../services/clipboard';
 import {viewerExtensions, editorExtensions} from './setups';
@@ -55,6 +55,11 @@ function highlightElem(elem) {
     const wrapper = document.createElement('div');
     elem.parentNode.insertBefore(wrapper, elem);
 
+    const direction = innerCodeElem.getAttribute('dir') || elem.getAttribute('dir') || '';
+    if (direction) {
+        wrapper.setAttribute('dir', direction);
+    }
+
     const ev = createView('content-code-block', {
         parent: wrapper,
         doc: content,
diff --git a/resources/js/wysiwyg/plugin-codeeditor.js b/resources/js/wysiwyg/plugin-codeeditor.js
index 2fe2ac26a6b..f86760214e1 100644
--- a/resources/js/wysiwyg/plugin-codeeditor.js
+++ b/resources/js/wysiwyg/plugin-codeeditor.js
@@ -205,6 +205,11 @@ function register(editor) {
                     contenteditable: 'false',
                 });
 
+                const direction = el.attr('dir');
+                if (direction) {
+                    wrapper.attr('dir', direction);
+                }
+
                 const spans = el.getAll('span');
                 for (const span of spans) {
                     span.unwrap();
@@ -222,6 +227,13 @@ function register(editor) {
 
         editor.serializer.addNodeFilter('code-block', elms => {
             for (const el of elms) {
+                const direction = el.attr('dir');
+                if (direction && el.firstChild) {
+                    el.firstChild.attr('dir', direction);
+                } else if (el.firstChild) {
+                    el.firstChild.attr('dir', null);
+                }
+
                 el.unwrap();
             }
         });
diff --git a/resources/sass/_codemirror.scss b/resources/sass/_codemirror.scss
index c4b0e2e8958..c79671d7646 100644
--- a/resources/sass/_codemirror.scss
+++ b/resources/sass/_codemirror.scss
@@ -34,10 +34,10 @@
   align-items: center;
   justify-content: center;
   top: -1px;
-  right: -1px;
+  inset-inline-end: -1px;
   background-color: #EEE;
   border: 1px solid #DDD;
-  border-radius: 0 4px 0 0;
+  border-start-end-radius: 4px;
   @include lightDark(background-color, #eee, #333);
   @include lightDark(border-color, #ddd, #444);
   @include lightDark(color, #444, #888);
diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index a3e6f09ac53..9f367984ad5 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -182,7 +182,7 @@ pre {
   @include lightDark(background-color, #FFF, #2B2B2B);
   @include lightDark(border-color, #DDD, #111);
   border-radius: 4px;
-  padding-left: 26px;
+  padding-inline-start: 26px;
   position: relative;
   padding-top: 3px;
   padding-bottom: 3px;
@@ -192,10 +192,10 @@ pre {
     position: absolute;
     top: 0;
     width: 22.4px;
-    left: 0;
+    inset-inline-start: 0;
     height: 100%;
     @include lightDark(background-color, #f5f5f5, #313335);
-    @include lightDark(border-right, 1px solid #DDD, none);
+    @include lightDark(border-inline-end, 1px solid #DDD, none);
   }
 }
 

From 16327cf40cbc98d549a222d48c844eb8b3bc7bdc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 19 Feb 2024 20:26:04 +0000
Subject: [PATCH 048/666] Cover images: Updated description wording to better
 detail size

To make it clearer that the advised size may not be fixed.
For #4748
---
 lang/en/common.php          | 2 +-
 resources/js/code/index.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/common.php b/lang/en/common.php
index 27037babec0..266174eed9d 100644
--- a/lang/en/common.php
+++ b/lang/en/common.php
@@ -20,7 +20,7 @@
     'description' => 'Description',
     'role' => 'Role',
     'cover_image' => 'Cover image',
-    'cover_image_description' => 'This image should be approx 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Actions',
diff --git a/resources/js/code/index.mjs b/resources/js/code/index.mjs
index d92a9ba26ca..d252f8f4101 100644
--- a/resources/js/code/index.mjs
+++ b/resources/js/code/index.mjs
@@ -1,4 +1,4 @@
-import {EditorView, keymap, Direction} from '@codemirror/view';
+import {EditorView, keymap} from '@codemirror/view';
 
 import {copyTextToClipboard} from '../services/clipboard';
 import {viewerExtensions, editorExtensions} from './setups';

From c290d01adbbdeeb68c4b0d791fe919a02432d457 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Feb 2024 14:15:22 +0000
Subject: [PATCH 049/666] WYSIWYG: Improved a range of text direction/alignment
 scenarios

- Removes 'span' from being a valid part of alignment formats so it's
  not used to align contents, since it's going to mostly be an inline
  format, wheras you'd really want alignment on the parent block.
- Adds direction cleaning to all direction change events, to remove
  direction styles and child direction controls which may complicate
  matters and cause direction changes not to show.
- Makes text direction controls work with table cell range selections,
  which TinyMCE does not consider by default, via manual handling.

For #4843
---
 resources/js/wysiwyg/config.js | 15 +++++---
 resources/js/wysiwyg/fixes.js  | 67 +++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 30dc6969db0..e5a780d18e9 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -14,7 +14,11 @@ import {getPlugin as getAboutPlugin} from './plugins-about';
 import {getPlugin as getDetailsPlugin} from './plugins-details';
 import {getPlugin as getTableAdditionsPlugin} from './plugins-table-additions';
 import {getPlugin as getTasklistPlugin} from './plugins-tasklist';
-import {handleClearFormattingOnTableCells, handleEmbedAlignmentChanges} from './fixes';
+import {
+    handleTableCellRangeEvents,
+    handleEmbedAlignmentChanges,
+    handleTextDirectionCleaning,
+} from './fixes';
 
 const styleFormats = [
     {title: 'Large Header', format: 'h2', preview: 'color: blue;'},
@@ -37,9 +41,9 @@ const styleFormats = [
 ];
 
 const formats = {
-    alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video,span', classes: 'align-left'},
-    aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video,span', classes: 'align-center'},
-    alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video,span', classes: 'align-right'},
+    alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-left'},
+    aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-center'},
+    alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-right'},
     calloutsuccess: {block: 'p', exact: true, attributes: {class: 'callout success'}},
     calloutinfo: {block: 'p', exact: true, attributes: {class: 'callout info'}},
     calloutwarning: {block: 'p', exact: true, attributes: {class: 'callout warning'}},
@@ -194,7 +198,8 @@ function getSetupCallback(options) {
         });
 
         handleEmbedAlignmentChanges(editor);
-        handleClearFormattingOnTableCells(editor);
+        handleTableCellRangeEvents(editor);
+        handleTextDirectionCleaning(editor);
 
         // Custom handler hook
         window.$events.emitPublic(options.containerElement, 'editor-tinymce::setup', {editor});
diff --git a/resources/js/wysiwyg/fixes.js b/resources/js/wysiwyg/fixes.js
index e51c373d94f..7f87d4378c6 100644
--- a/resources/js/wysiwyg/fixes.js
+++ b/resources/js/wysiwyg/fixes.js
@@ -55,16 +55,30 @@ export function handleEmbedAlignmentChanges(editor) {
 }
 
 /**
- * TinyMCE does not seem to do a great job on clearing styles in complex
- * scenarios (like copied word content) when a range of table cells
- * are selected. This tracks the selected table cells, and watches
- * for clear formatting events, so some manual cleanup can be performed.
- *
+ * Cleans up the direction property for an element.
+ * Removes all inline direction control from child elements.
+ * Removes non "dir" attribute direction control from provided element.
+ * @param {HTMLElement} element
+ */
+function cleanElementDirection(element) {
+    const directionChildren = element.querySelectorAll('[dir],[style*="direction"],[style*="text-align"]');
+    for (const child of directionChildren) {
+        child.removeAttribute('dir');
+        child.style.direction = null;
+        child.style.textAlign = null;
+    }
+    element.style.direction = null;
+    element.style.textAlign = null;
+}
+
+/**
+ * This tracks table cell range selection, so we can apply custom handling where
+ * required to actions applied to such selections.
  * The events used don't seem to be advertised by TinyMCE.
  * Found at https://github.com/tinymce/tinymce/blob/6.8.3/modules/tinymce/src/models/dom/main/ts/table/api/Events.ts
  * @param {Editor} editor
  */
-export function handleClearFormattingOnTableCells(editor) {
+export function handleTableCellRangeEvents(editor) {
     /** @var {HTMLTableCellElement[]} * */
     let selectedCells = [];
 
@@ -75,6 +89,10 @@ export function handleClearFormattingOnTableCells(editor) {
         selectedCells = [];
     });
 
+    // TinyMCE does not seem to do a great job on clearing styles in complex
+    // scenarios (like copied word content) when a range of table cells
+    // are selected. Here we watch for clear formatting events, so some manual
+    // cleanup can be performed.
     const attrsToRemove = ['class', 'style', 'width', 'height'];
     editor.on('FormatRemove', () => {
         for (const cell of selectedCells) {
@@ -83,4 +101,41 @@ export function handleClearFormattingOnTableCells(editor) {
             }
         }
     });
+
+    // TinyMCE does not apply direction events to table cell range selections
+    // so here we hastily patch in that ability by setting the direction ourselves
+    // when a direction event is fired.
+    editor.on('ExecCommand', event => {
+        const command = event.command;
+        if (command !== 'mceDirectionLTR' && command !== 'mceDirectionRTL') {
+            return;
+        }
+
+        const dir = command === 'mceDirectionLTR' ? 'ltr' : 'rtl';
+        for (const cell of selectedCells) {
+            cell.setAttribute('dir', dir);
+            cleanElementDirection(cell);
+        }
+    });
+}
+
+/**
+ * Direction control might not work if there are other unexpected direction-handling styles
+ * or attributes involved nearby. This watches for direction change events to clean
+ * up direction controls, removing non-dir-attr direction controls, while removing
+ * directions from child elements that may be involved.
+ * @param {Editor} editor
+ */
+export function handleTextDirectionCleaning(editor) {
+    editor.on('ExecCommand', event => {
+        const command = event.command;
+        if (command !== 'mceDirectionLTR' && command !== 'mceDirectionRTL') {
+            return;
+        }
+
+        const blocks = editor.selection.getSelectedBlocks();
+        for (const block of blocks) {
+            cleanElementDirection(block);
+        }
+    });
 }

From bbb41e8b5cc5c6e33cb27ef1b69092cf7a0f70ba Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Feb 2024 18:03:32 +0000
Subject: [PATCH 050/666] Breadcrumbs: Fixed bad dropdown menu placement at
 small sizes

For #4824
---
 resources/sass/_components.scss                       | 6 ++----
 resources/views/entities/breadcrumb-listing.blade.php | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 150f78e1202..ae899357c98 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -906,11 +906,9 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   }
 }
 
-@include smaller-than($m) {
+@include smaller-than($l) {
   .dropdown-search-dropdown {
-    position: fixed;
-    right: auto;
-    left: $-m;
+    inset-inline: $-m auto;
   }
   .dropdown-search-dropdown .dropdown-search-list {
     max-height: 240px;
diff --git a/resources/views/entities/breadcrumb-listing.blade.php b/resources/views/entities/breadcrumb-listing.blade.php
index 1efe3ba34ca..4f751a93f21 100644
--- a/resources/views/entities/breadcrumb-listing.blade.php
+++ b/resources/views/entities/breadcrumb-listing.blade.php
@@ -1,7 +1,7 @@
-<div class="dropdown-search" components="dropdown dropdown-search"
+<div components="dropdown dropdown-search"
      option:dropdown-search:url="/search/entity/siblings?entity_type={{$entity->getType()}}&entity_id={{ $entity->id }}"
      option:dropdown-search:local-search-selector=".entity-list-item"
->
+     class="dropdown-search">
     <div class="dropdown-search-toggle-breadcrumb" refs="dropdown@toggle"
          aria-haspopup="true" aria-expanded="false" tabindex="0">
         <div class="separator">@icon('chevron-right')</div>

From be3423a16ef497089134d70c10f919f4c59c1cd6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Feb 2024 18:21:59 +0000
Subject: [PATCH 051/666] Deps: Updated npm & composer deps

Avoided updating markdown-it package to 14 for now since it would cause
bundle size to inflate. Don't think ESBuild is properly tree shaking
"entities" sub package which inflates size.
(Copied this message from december deps update).
---
 composer.lock     | 402 ++++++++++----------
 package-lock.json | 944 ++++++++++++++++++++++++++--------------------
 package.json      |   2 +-
 3 files changed, 720 insertions(+), 628 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3bea1a66a26..99f496a1156 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.296.8",
+            "version": "3.300.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f84fe470709e5ab9515649a1a0891e279693d1b3"
+                "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f84fe470709e5ab9515649a1a0891e279693d1b3",
-                "reference": "f84fe470709e5ab9515649a1a0891e279693d1b3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14",
+                "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.296.8"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.0"
             },
-            "time": "2024-01-23T20:32:59+00:00"
+            "time": "2024-02-19T19:08:33+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -708,16 +708,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.7.3",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "ce594cbc39a4866c544f1a970d285ff0548221ad"
+                "reference": "a19a1d05ca211f41089dffcc387733a6875196cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/ce594cbc39a4866c544f1a970d285ff0548221ad",
-                "reference": "ce594cbc39a4866c544f1a970d285ff0548221ad",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb",
+                "reference": "a19a1d05ca211f41089dffcc387733a6875196cb",
                 "shasum": ""
             },
             "require": {
@@ -733,9 +733,9 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.56",
+                "phpstan/phpstan": "1.10.57",
                 "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.15",
+                "phpunit/phpunit": "9.6.16",
                 "psalm/plugin-phpunit": "0.18.4",
                 "slevomat/coding-standard": "8.13.1",
                 "squizlabs/php_codesniffer": "3.8.1",
@@ -801,7 +801,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.7.3"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.2"
             },
             "funding": [
                 {
@@ -817,20 +817,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-21T07:53:09+00:00"
+            "time": "2024-02-12T18:36:36+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
-                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
                 "shasum": ""
             },
             "require": {
@@ -862,9 +862,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
             },
-            "time": "2023-09-27T20:04:15+00:00"
+            "time": "2024-01-30T19:34:25+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -960,16 +960,16 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.9",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65",
-                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                 "shasum": ""
             },
             "require": {
@@ -1031,7 +1031,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.9"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
             },
             "funding": [
                 {
@@ -1047,20 +1047,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-15T18:05:13+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
                 "shasum": ""
             },
             "require": {
@@ -1068,11 +1068,11 @@
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^10",
+                "doctrine/coding-standard": "^9 || ^12",
                 "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^4.11 || ^5.0"
+                "vimeo/psalm": "^4.11 || ^5.21"
             },
             "type": "library",
             "autoload": {
@@ -1109,7 +1109,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/2.1.0"
+                "source": "https://github.com/doctrine/lexer/tree/2.1.1"
             },
             "funding": [
                 {
@@ -1125,7 +1125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-14T08:49:07+00:00"
+            "time": "2024-02-05T11:35:39+00:00"
         },
         {
             "name": "dompdf/dompdf",
@@ -2279,16 +2279,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.11.0",
+            "version": "v5.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10"
+                "reference": "7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10",
-                "reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/7dae1b072573809f32ab6dcf4aebb57c8b3e8acf",
+                "reference": "7dae1b072573809f32ab6dcf4aebb57c8b3e8acf",
                 "shasum": ""
             },
             "require": {
@@ -2345,7 +2345,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2023-12-02T18:22:36+00:00"
+            "time": "2024-02-16T08:58:20+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2415,16 +2415,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.1",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5"
+                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
-                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
                 "shasum": ""
             },
             "require": {
@@ -2437,7 +2437,7 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.0",
+                "commonmark/cmark": "0.30.3",
                 "commonmark/commonmark.js": "0.30.0",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
@@ -2447,10 +2447,10 @@
                 "michelf/php-markdown": "^1.4 || ^2.0",
                 "nyholm/psr7": "^1.5",
                 "phpstan/phpstan": "^1.8.2",
-                "phpunit/phpunit": "^9.5.21",
+                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -2517,7 +2517,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-30T16:55:00+00:00"
+            "time": "2024-02-02T11:59:32+00:00"
         },
         {
             "name": "league/config",
@@ -2603,16 +2603,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.23.0",
+            "version": "3.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"
+                "reference": "b25a361508c407563b34fac6f64a8a17a8819675"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc",
-                "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675",
+                "reference": "b25a361508c407563b34fac6f64a8a17a8819675",
                 "shasum": ""
             },
             "require": {
@@ -2632,7 +2632,7 @@
             "require-dev": {
                 "async-aws/s3": "^1.5 || ^2.0",
                 "async-aws/simple-s3": "^1.1 || ^2.0",
-                "aws/aws-sdk-php": "^3.220.0",
+                "aws/aws-sdk-php": "^3.295.10",
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
@@ -2643,7 +2643,7 @@
                 "phpseclib/phpseclib": "^3.0.34",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
-                "sabre/dav": "^4.3.1"
+                "sabre/dav": "^4.6.0"
             },
             "type": "library",
             "autoload": {
@@ -2677,7 +2677,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.23.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.24.0"
             },
             "funding": [
                 {
@@ -2689,24 +2689,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-04T10:16:17+00:00"
+            "time": "2024-02-04T12:10:17+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.22.0",
+            "version": "3.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8"
+                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8",
-                "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
+                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-sdk-php": "^3.220.0",
+                "aws/aws-sdk-php": "^3.295.10",
                 "league/flysystem": "^3.10.0",
                 "league/mime-type-detection": "^1.0.0",
                 "php": "^8.0.2"
@@ -2742,8 +2742,7 @@
                 "storage"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.22.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0"
             },
             "funding": [
                 {
@@ -2755,20 +2754,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-18T14:03:37+00:00"
+            "time": "2024-01-26T18:43:21+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.23.0",
+            "version": "3.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "5cf046ba5f059460e86a997c504dd781a39a109b"
+                "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b",
-                "reference": "5cf046ba5f059460e86a997c504dd781a39a109b",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00",
+                "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00",
                 "shasum": ""
             },
             "require": {
@@ -2803,7 +2802,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem-local/issues",
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.1"
             },
             "funding": [
                 {
@@ -2815,7 +2814,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-04T10:14:46+00:00"
+            "time": "2024-01-26T18:25:23+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -2908,16 +2907,16 @@
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.14.0",
+            "version": "1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e"
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
                 "shasum": ""
             },
             "require": {
@@ -2948,7 +2947,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
             },
             "funding": [
                 {
@@ -2960,7 +2959,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-17T14:13:20+00:00"
+            "time": "2024-01-28T23:22:08+00:00"
         },
         {
             "name": "league/oauth1-client",
@@ -3345,16 +3344,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.2",
+            "version": "2.72.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130"
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130",
-                "reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
                 "shasum": ""
             },
             "require": {
@@ -3448,7 +3447,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-19T00:21:53+00:00"
+            "time": "2024-01-25T10:35:09+00:00"
         },
         {
             "name": "nette/schema",
@@ -3917,16 +3916,16 @@
         },
         {
             "name": "phenx/php-font-lib",
-            "version": "0.5.5",
+            "version": "0.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8"
+                "reference": "a1681e9793040740a405ac5b189275059e2a9863"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/671df0f3516252011aa94f9e8e3b3b66199339f8",
-                "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
+                "reference": "a1681e9793040740a405ac5b189275059e2a9863",
                 "shasum": ""
             },
             "require": {
@@ -3955,22 +3954,22 @@
             "homepage": "https://github.com/PhenX/php-font-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.5"
+                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6"
             },
-            "time": "2024-01-07T18:13:29+00:00"
+            "time": "2024-01-29T14:45:26+00:00"
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.5.1",
+            "version": "0.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456"
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa",
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa",
                 "shasum": ""
             },
             "require": {
@@ -4001,9 +4000,9 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2"
             },
-            "time": "2023-12-11T20:56:08+00:00"
+            "time": "2024-02-07T12:49:40+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -5113,16 +5112,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.4.0",
+            "version": "v8.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+                "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
                 "shasum": ""
             },
             "require": {
@@ -5130,13 +5129,17 @@
                 "php": ">=5.6.20"
             },
             "require-dev": {
-                "codacy/coverage": "^1.4",
-                "phpunit/phpunit": "^4.8.36"
+                "phpunit/phpunit": "^5.7.27"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Sabberworm\\CSS\\": "src/"
@@ -5149,6 +5152,14 @@
             "authors": [
                 {
                     "name": "Raphael Schweikert"
+                },
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake.github@qzdesign.co.uk"
                 }
             ],
             "description": "Parser for CSS Files written in PHP",
@@ -5159,10 +5170,10 @@
                 "stylesheet"
             ],
             "support": {
-                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
-                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+                "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
             },
-            "time": "2021-12-11T13:40:54+00:00"
+            "time": "2024-02-15T16:41:13+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5257,26 +5268,26 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.4.0",
+            "version": "v4.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "df5e45b53d918ec3d689f014d98a6c838b98ed96"
+                "reference": "a67f194f0f4c4c7616c549afc697b78df9658d44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/df5e45b53d918ec3d689f014d98a6c838b98ed96",
-                "reference": "df5e45b53d918ec3d689f014d98a6c838b98ed96",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/a67f194f0f4c4c7616c549afc697b78df9658d44",
+                "reference": "a67f194f0f4c4c7616c549afc697b78df9658d44",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-                "laravel/socialite": "~5.0",
+                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0",
+                "laravel/socialite": "^5.2",
                 "php": "^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.2",
-                "phpunit/phpunit": "^6.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
@@ -5327,7 +5338,7 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2023-08-27T23:46:34+00:00"
+            "time": "2024-02-17T08:58:03+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
@@ -6381,16 +6392,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                 "shasum": ""
             },
             "require": {
@@ -6404,9 +6415,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6443,7 +6451,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6459,20 +6467,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                 "shasum": ""
             },
             "require": {
@@ -6483,9 +6491,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6524,7 +6529,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6540,20 +6545,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                 "shasum": ""
             },
             "require": {
@@ -6566,9 +6571,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6611,7 +6613,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6627,20 +6629,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:30:37+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -6651,9 +6653,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6695,7 +6694,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6711,20 +6710,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                 "shasum": ""
             },
             "require": {
@@ -6738,9 +6737,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6778,7 +6774,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6794,20 +6790,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                 "shasum": ""
             },
             "require": {
@@ -6815,9 +6811,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6854,7 +6847,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6870,20 +6863,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                 "shasum": ""
             },
             "require": {
@@ -6891,9 +6884,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -6937,7 +6927,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -6953,20 +6943,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
                 "shasum": ""
             },
             "require": {
@@ -6974,9 +6964,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -7016,7 +7003,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -7032,20 +7019,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e"
+                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e",
-                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
                 "shasum": ""
             },
             "require": {
@@ -7059,9 +7046,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -7098,7 +7082,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -7114,7 +7098,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/process",
@@ -8363,16 +8347,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.8.1",
+            "version": "v2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "b7cc6a29c457a7d4f3de90466392ae9ad3e17022"
+                "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/b7cc6a29c457a7d4f3de90466392ae9ad3e17022",
-                "reference": "b7cc6a29c457a7d4f3de90466392ae9ad3e17022",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/35fa9cbe1895e76215bbe74571a344f2705fbe01",
+                "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01",
                 "shasum": ""
             },
             "require": {
@@ -8440,7 +8424,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.8.1"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.0"
             },
             "funding": [
                 {
@@ -8460,7 +8444,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-01-08T09:11:17+00:00"
+            "time": "2024-02-13T11:49:22+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8893,16 +8877,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.56",
+            "version": "1.10.59",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "27816a01aea996191ee14d010f325434c0ee76fa"
+                "reference": "e607609388d3a6d418a50a49f7940e8086798281"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa",
-                "reference": "27816a01aea996191ee14d010f325434c0ee76fa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
+                "reference": "e607609388d3a6d418a50a49f7940e8086798281",
                 "shasum": ""
             },
             "require": {
@@ -8951,7 +8935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-15T10:43:00+00:00"
+            "time": "2024-02-20T13:59:13+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10341,16 +10325,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.1",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
                 "shasum": ""
             },
             "require": {
@@ -10417,7 +10401,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-01-11T20:47:48+00:00"
+            "time": "2024-02-16T15:06:51+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
diff --git a/package-lock.json b/package-lock.json
index 99dbf1da8ac..1349113784b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
       "devDependencies": {
         "@lezer/generator": "^1.5.1",
         "chokidar-cli": "^3.0",
-        "esbuild": "^0.19",
+        "esbuild": "^0.20",
         "eslint": "^8.55.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.0",
@@ -51,9 +51,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.10.2.tgz",
-      "integrity": "sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz",
+      "integrity": "sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -68,12 +68,12 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.2.tgz",
-      "integrity": "sha512-tjoi4MCWDNxgIpoLZ7+tezdS9OEB6pkiDKhfKx9ReJ/XBcs2G2RXIu+/FxXBlWsPTsz6C9q/r4gjzrsxpcnqCQ==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz",
+      "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.2.0",
+        "@codemirror/state": "^6.4.0",
         "@codemirror/view": "^6.0.0",
         "@lezer/common": "^1.1.0"
       }
@@ -91,9 +91,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.7.tgz",
-      "integrity": "sha512-y9hWSSO41XlcL4uYwWyk0lEgTHcelWWfRuqmvcAmxfCs0HNWZdriWo/EU43S63SxEZpc1Hd50Itw7ktfQvfkUg==",
+      "version": "6.4.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz",
+      "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -107,9 +107,9 @@
       }
     },
     "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz",
-      "integrity": "sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
+      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.6.0",
@@ -130,16 +130,16 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.3.tgz",
-      "integrity": "sha512-wCewRLWpdefWi7uVkHIDiE8+45Fe4buvMDZkihqEom5uRUQrl76Zb13emjeK3W+8pcRgRfAmwelURBbxNEKCIg==",
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.4.tgz",
+      "integrity": "sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
         "@codemirror/lang-html": "^6.0.0",
         "@codemirror/language": "^6.3.0",
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0",
+        "@lezer/common": "^1.2.1",
         "@lezer/markdown": "^1.0.0"
       }
     },
@@ -168,12 +168,12 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.9.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.3.tgz",
-      "integrity": "sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz",
+      "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
         "@lezer/common": "^1.1.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0",
@@ -189,9 +189,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz",
-      "integrity": "sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz",
+      "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -199,9 +199,9 @@
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.4.tgz",
-      "integrity": "sha512-YoTrvjv9e8EbPs58opjZKyJ3ewFrVSUzQ/4WXlULQLSDDr1nGPJ67mMXFNNVYwdFhybzhrzrtqgHmtpJwIF+8g==",
+      "version": "6.5.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -209,9 +209,9 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.3.3.tgz",
-      "integrity": "sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
     },
     "node_modules/@codemirror/theme-one-dark": {
       "version": "6.1.2",
@@ -225,19 +225,35 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.22.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.2.tgz",
-      "integrity": "sha512-cJp64cPXm7QfSBWEXK+76+hsZCGHupUgy8JAbSzMG6Lr0rfK73c1CaWITVW6hZVkOnAFxJTxd0PIuynNbzxYPw==",
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.24.1.tgz",
+      "integrity": "sha512-sBfP4rniPBRQzNakwuQEqjEuiJDWJyF2kqLLqij4WXRoVwPPJfjx966Eq3F7+OPQxDtMt/Q9MWLoZLWjeveBlg==",
       "dependencies": {
-        "@codemirror/state": "^6.1.4",
+        "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
+      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz",
-      "integrity": "sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
+      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
       "cpu": [
         "arm"
       ],
@@ -251,9 +267,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz",
-      "integrity": "sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
+      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
       "cpu": [
         "arm64"
       ],
@@ -267,9 +283,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz",
-      "integrity": "sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
+      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
       "cpu": [
         "x64"
       ],
@@ -283,9 +299,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz",
-      "integrity": "sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
+      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
       "cpu": [
         "arm64"
       ],
@@ -299,9 +315,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz",
-      "integrity": "sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
+      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
       "cpu": [
         "x64"
       ],
@@ -315,9 +331,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz",
-      "integrity": "sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
+      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
       "cpu": [
         "arm64"
       ],
@@ -331,9 +347,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz",
-      "integrity": "sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
+      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
       "cpu": [
         "x64"
       ],
@@ -347,9 +363,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz",
-      "integrity": "sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
+      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
       "cpu": [
         "arm"
       ],
@@ -363,9 +379,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz",
-      "integrity": "sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
+      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
       "cpu": [
         "arm64"
       ],
@@ -379,9 +395,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz",
-      "integrity": "sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
+      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
       "cpu": [
         "ia32"
       ],
@@ -395,9 +411,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz",
-      "integrity": "sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
+      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
       "cpu": [
         "loong64"
       ],
@@ -411,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz",
-      "integrity": "sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
+      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
       "cpu": [
         "mips64el"
       ],
@@ -427,9 +443,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz",
-      "integrity": "sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
+      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
       "cpu": [
         "ppc64"
       ],
@@ -443,9 +459,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz",
-      "integrity": "sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
+      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
       "cpu": [
         "riscv64"
       ],
@@ -459,9 +475,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz",
-      "integrity": "sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
+      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
       "cpu": [
         "s390x"
       ],
@@ -475,9 +491,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz",
-      "integrity": "sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
       "cpu": [
         "x64"
       ],
@@ -491,9 +507,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
       "cpu": [
         "x64"
       ],
@@ -507,9 +523,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz",
-      "integrity": "sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
       "cpu": [
         "x64"
       ],
@@ -523,9 +539,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz",
-      "integrity": "sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
+      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
       "cpu": [
         "x64"
       ],
@@ -539,9 +555,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz",
-      "integrity": "sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
+      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
       "cpu": [
         "arm64"
       ],
@@ -555,9 +571,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz",
-      "integrity": "sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
+      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
       "cpu": [
         "ia32"
       ],
@@ -571,9 +587,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz",
-      "integrity": "sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
+      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
       "cpu": [
         "x64"
       ],
@@ -602,9 +618,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
-      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -634,22 +650,22 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
       "engines": {
@@ -670,32 +686,33 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
     "node_modules/@lezer/common": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.1.0.tgz",
-      "integrity": "sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
+      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz",
-      "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
+      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.5.1.tgz",
-      "integrity": "sha512-vodJv2JPwsFsiBBHE463yBhvUI9TmhIu5duF/8MH304xNS6FyWH/vTyG61pjhERm5f+VBP94co0eiN+afWcvXw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.6.0.tgz",
+      "integrity": "sha512-mDwFNchv4jBEoZBaZbr5GlKR7BM6W/ZanTOZN6p4avuzcmYHTZ0nIbwtBqvXoeBrqmFSvL2zHL5TX9FWkXKc2w==",
       "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.0.2",
+        "@lezer/common": "^1.1.0",
         "@lezer/lr": "^1.3.0"
       },
       "bin": {
@@ -711,64 +728,68 @@
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.6.tgz",
-      "integrity": "sha512-Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.8.tgz",
+      "integrity": "sha512-EXseJ3pUzWxE6XQBQdqWHZqqlGQRSuNMBcLb6mZWS2J2v+QZhOObD+3ZIKIcm59ntTzyor4LqFTb72iJc3k23Q==",
       "dependencies": {
-        "@lezer/common": "^1.0.0",
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.8.tgz",
-      "integrity": "sha512-QRmw/5xrcyRLyWr3JT3KCzn2XZr5NYNqQMGsqnYy+FghbQn9DZPuj6JDkE6uSXvfMLpdapu8KBIaeoJFaR4QVw==",
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz",
+      "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
         "@lezer/lr": "^1.3.0"
       }
     },
     "node_modules/@lezer/json": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.1.tgz",
-      "integrity": "sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
+      "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.3.13",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.13.tgz",
-      "integrity": "sha512-RLAbau/4uSzKgIKj96mI5WUtG1qtiR0Frn0Ei9zhPj8YOkHM+1Bb8SgdVvmR/aWJCFIzjo2KFnDiRZ75Xf5NdQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz",
+      "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.1.0.tgz",
-      "integrity": "sha512-JYOI6Lkqbl83semCANkO3CKbKc0pONwinyagBufWBm+k4yhIcqfCF8B8fpEpvJLmIy7CAfwiq7dQ/PzUZA340g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.2.0.tgz",
+      "integrity": "sha512-d7MwsfAukZJo1GpPrcPGa3MxaFFOqNp0gbqF+3F7pTeNDOgeJN1muXzx1XXDPt+Ac+/voCzsH7qXqnn+xReG/g==",
       "dependencies": {
         "@lezer/common": "^1.0.0",
         "@lezer/highlight": "^1.0.0"
       }
     },
     "node_modules/@lezer/php": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.1.tgz",
-      "integrity": "sha512-aqdCQJOXJ66De22vzdwnuC502hIaG9EnPK2rSi+ebXyUd+j7GAX1mRjWZOVOmf3GST1YUfUCu6WXDiEgDGOVwA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.2.tgz",
+      "integrity": "sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.1.0"
       }
     },
     "node_modules/@lezer/xml": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz",
-      "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.4.tgz",
+      "integrity": "sha512-WmXKb5eX8+rRfZYSNRR5TPee/ZoDgBdVS/rj1VCJGDKa5gNldIctQYibCoFVyNhvZsyL/8nHbZJZPM4gnXN2Vw==",
       "dependencies": {
+        "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
@@ -836,9 +857,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -915,13 +936,16 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -946,17 +970,36 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+    "node_modules/array.prototype.filter": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
+      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
         "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
+      "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1002,17 +1045,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
         "is-shared-array-buffer": "^1.0.2"
       },
       "engines": {
@@ -1023,10 +1067,13 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -1072,14 +1119,19 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1120,16 +1172,10 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -1142,6 +1188,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -1292,17 +1341,20 @@
       "dev": true
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-properties": {
@@ -1361,50 +1413,52 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
-      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
+      "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.2",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
+        "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "hasown": "^2.0.1",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.0",
+        "safe-regex-test": "^1.0.3",
         "string.prototype.trim": "^1.2.8",
         "string.prototype.trimend": "^1.0.7",
         "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
+        "typed-array-buffer": "^1.0.1",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1413,27 +1467,54 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "node_modules/es-to-primitive": {
@@ -1454,9 +1535,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz",
-      "integrity": "sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
+      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1466,28 +1547,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.19.5",
-        "@esbuild/android-arm64": "0.19.5",
-        "@esbuild/android-x64": "0.19.5",
-        "@esbuild/darwin-arm64": "0.19.5",
-        "@esbuild/darwin-x64": "0.19.5",
-        "@esbuild/freebsd-arm64": "0.19.5",
-        "@esbuild/freebsd-x64": "0.19.5",
-        "@esbuild/linux-arm": "0.19.5",
-        "@esbuild/linux-arm64": "0.19.5",
-        "@esbuild/linux-ia32": "0.19.5",
-        "@esbuild/linux-loong64": "0.19.5",
-        "@esbuild/linux-mips64el": "0.19.5",
-        "@esbuild/linux-ppc64": "0.19.5",
-        "@esbuild/linux-riscv64": "0.19.5",
-        "@esbuild/linux-s390x": "0.19.5",
-        "@esbuild/linux-x64": "0.19.5",
-        "@esbuild/netbsd-x64": "0.19.5",
-        "@esbuild/openbsd-x64": "0.19.5",
-        "@esbuild/sunos-x64": "0.19.5",
-        "@esbuild/win32-arm64": "0.19.5",
-        "@esbuild/win32-ia32": "0.19.5",
-        "@esbuild/win32-x64": "0.19.5"
+        "@esbuild/aix-ppc64": "0.20.1",
+        "@esbuild/android-arm": "0.20.1",
+        "@esbuild/android-arm64": "0.20.1",
+        "@esbuild/android-x64": "0.20.1",
+        "@esbuild/darwin-arm64": "0.20.1",
+        "@esbuild/darwin-x64": "0.20.1",
+        "@esbuild/freebsd-arm64": "0.20.1",
+        "@esbuild/freebsd-x64": "0.20.1",
+        "@esbuild/linux-arm": "0.20.1",
+        "@esbuild/linux-arm64": "0.20.1",
+        "@esbuild/linux-ia32": "0.20.1",
+        "@esbuild/linux-loong64": "0.20.1",
+        "@esbuild/linux-mips64el": "0.20.1",
+        "@esbuild/linux-ppc64": "0.20.1",
+        "@esbuild/linux-riscv64": "0.20.1",
+        "@esbuild/linux-s390x": "0.20.1",
+        "@esbuild/linux-x64": "0.20.1",
+        "@esbuild/netbsd-x64": "0.20.1",
+        "@esbuild/openbsd-x64": "0.20.1",
+        "@esbuild/sunos-x64": "0.20.1",
+        "@esbuild/win32-arm64": "0.20.1",
+        "@esbuild/win32-ia32": "0.20.1",
+        "@esbuild/win32-x64": "0.20.1"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -1503,15 +1585,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "version": "8.56.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.55.0",
+        "@eslint/js": "8.56.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1623,9 +1705,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz",
-      "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.7",
@@ -1644,7 +1726,7 @@
         "object.groupby": "^1.0.1",
         "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -1792,9 +1874,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1841,9 +1923,9 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
-      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
@@ -1851,13 +1933,13 @@
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.0.tgz",
+      "integrity": "sha512-noqGuLw158+DuD9UPRKHpJ2hGxpFyDlYYrfM0mWt4XhT4n0lwzTLh70Tkdyy4kyTmyTT9Bv7bWAJqw7cgkEXDg==",
       "dev": true
     },
     "node_modules/for-each": {
@@ -1935,28 +2017,33 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1998,9 +2085,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2051,15 +2138,6 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -2079,21 +2157,21 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -2115,12 +2193,12 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2130,9 +2208,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -2153,18 +2231,18 @@
       "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
-      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
+      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -2209,13 +2287,13 @@
       "dev": true
     },
     "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
       "engines": {
@@ -2223,14 +2301,16 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2352,9 +2432,9 @@
       }
     },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -2455,12 +2535,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2928,13 +3008,13 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
         "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
@@ -2977,15 +3057,16 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
-      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
+      "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1"
+        "array.prototype.filter": "^1.0.3",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.0.0"
       }
     },
     "node_modules/object.values": {
@@ -3179,6 +3260,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -3244,14 +3334,15 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3350,13 +3441,13 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
+      "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
+        "call-bind": "^1.0.5",
+        "get-intrinsic": "^1.2.2",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -3368,23 +3459,26 @@
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/sass": {
-      "version": "1.69.5",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
-      "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+      "version": "1.71.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz",
+      "integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3414,29 +3508,32 @@
       "dev": true
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3473,31 +3570,35 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
+      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/snabbdom": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.5.1.tgz",
-      "integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.2.tgz",
+      "integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==",
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=12.17.0"
       }
     },
     "node_modules/sortablejs": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.1.tgz",
-      "integrity": "sha512-P5Cjvb0UG1ZVNiDPj/n4V+DinttXG6K8n7vM/HQf0C25K3YKQTQY6fsr/sEGsJGpQ9exmPxluHxKBc0mLKU1lQ=="
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
+      "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
     },
     "node_modules/source-map-js": {
       "version": "1.0.2",
@@ -3519,9 +3620,9 @@
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
       "dev": true
     },
     "node_modules/spdx-expression-parse": {
@@ -3535,9 +3636,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
       "dev": true
     },
     "node_modules/string-width": {
@@ -3718,9 +3819,9 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
@@ -3754,14 +3855,14 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3786,16 +3887,17 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3805,14 +3907,20 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz",
+      "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3900,16 +4008,16 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
+      "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
+        "available-typed-arrays": "^1.0.6",
+        "call-bind": "^1.0.5",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index ca5f6907156..0ec36c129ec 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
     "chokidar-cli": "^3.0",
-    "esbuild": "^0.19",
+    "esbuild": "^0.20",
     "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",

From 055bbf17de2a0a2f6fb28596937a8652013b792a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 21 Feb 2024 15:30:29 +0000
Subject: [PATCH 052/666] Theme System: Added AUTH_PRE_REGISTER logical event

Included tests to cover.
Manually tested on standard and social (GitHub) auth.
For #4833
---
 app/Access/RegistrationService.php | 27 ++++++++++----------
 app/Theming/ThemeEvents.php        | 41 ++++++++++++++++++++++--------
 lang/en/errors.php                 |  2 +-
 tests/ThemeTest.php                | 37 +++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/app/Access/RegistrationService.php b/app/Access/RegistrationService.php
index 1e40a98445c..68992fbc65c 100644
--- a/app/Access/RegistrationService.php
+++ b/app/Access/RegistrationService.php
@@ -14,20 +14,14 @@
 
 class RegistrationService
 {
-    protected $userRepo;
-    protected $emailConfirmationService;
-
-    /**
-     * RegistrationService constructor.
-     */
-    public function __construct(UserRepo $userRepo, EmailConfirmationService $emailConfirmationService)
-    {
-        $this->userRepo = $userRepo;
-        $this->emailConfirmationService = $emailConfirmationService;
+    public function __construct(
+        protected UserRepo $userRepo,
+        protected EmailConfirmationService $emailConfirmationService,
+    ) {
     }
 
     /**
-     * Check whether or not registrations are allowed in the app settings.
+     * Check if registrations are allowed in the app settings.
      *
      * @throws UserRegistrationException
      */
@@ -84,6 +78,7 @@ public function findOrRegister(string $name, string $email, string $externalId):
     public function registerUser(array $userData, ?SocialAccount $socialAccount = null, bool $emailConfirmed = false): User
     {
         $userEmail = $userData['email'];
+        $authSystem = $socialAccount ? $socialAccount->driver : auth()->getDefaultDriver();
 
         // Email restriction
         $this->ensureEmailDomainAllowed($userEmail);
@@ -94,6 +89,12 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
             throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $userEmail]), '/login');
         }
 
+        /** @var ?bool $shouldRegister */
+        $shouldRegister = Theme::dispatch(ThemeEvents::AUTH_PRE_REGISTER, $authSystem, $userData);
+        if ($shouldRegister === false) {
+            throw new UserRegistrationException(trans('errors.auth_pre_register_theme_prevention'), '/login');
+        }
+
         // Create the user
         $newUser = $this->userRepo->createWithoutActivity($userData, $emailConfirmed);
         $newUser->attachDefaultRole();
@@ -104,7 +105,7 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
         }
 
         Activity::add(ActivityType::AUTH_REGISTER, $socialAccount ?? $newUser);
-        Theme::dispatch(ThemeEvents::AUTH_REGISTER, $socialAccount ? $socialAccount->driver : auth()->getDefaultDriver(), $newUser);
+        Theme::dispatch(ThemeEvents::AUTH_REGISTER, $authSystem, $newUser);
 
         // Start email confirmation flow if required
         if ($this->emailConfirmationService->confirmationRequired() && !$emailConfirmed) {
@@ -138,7 +139,7 @@ protected function ensureEmailDomainAllowed(string $userEmail): void
         }
 
         $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict));
-        $userEmailDomain = $domain = mb_substr(mb_strrchr($userEmail, '@'), 1);
+        $userEmailDomain = mb_substr(mb_strrchr($userEmail, '@'), 1);
         if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
             $redirect = $this->registrationAllowed() ? '/register' : '/login';
 
diff --git a/app/Theming/ThemeEvents.php b/app/Theming/ThemeEvents.php
index ff9e86e16f1..2d4900c962c 100644
--- a/app/Theming/ThemeEvents.php
+++ b/app/Theming/ThemeEvents.php
@@ -23,7 +23,7 @@ class ThemeEvents
      * The provided $detail can be a string or a loggable type of model. You should check
      * the type before making use of this parameter.
      *
-     * @param string                                $type
+     * @param string $type
      * @param string|\BookStack\Activity\Models\Loggable $detail
      */
     const ACTIVITY_LOGGED = 'activity_logged';
@@ -42,18 +42,37 @@ class ThemeEvents
      * system as a standard app user. This includes a user becoming logged in
      * after registration. This is not emitted upon API usage.
      *
-     * @param string               $authSystem
+     * @param string $authSystem
      * @param \BookStack\Users\Models\User $user
      */
     const AUTH_LOGIN = 'auth_login';
 
+    /**
+     * Auth pre-register event.
+     * Runs right before a new user account is registered in the system by any authentication
+     * system as a standard app user including auto-registration systems used by LDAP,
+     * SAML, OIDC and social systems. It only includes self-registrations,
+     * not accounts created by others in the UI or via the REST API.
+     * It runs after any other normal validation steps.
+     * Any account/email confirmation occurs post-registration.
+     * The provided $userData contains the main details that would be used to create
+     * the account, and may depend on authentication method.
+     * If false is returned from the event, registration will be prevented and the user
+     * will be returned to the login page.
+     *
+     * @param string $authSystem
+     * @param array $userData
+     * @returns bool|null
+     */
+    const AUTH_PRE_REGISTER = 'auth_pre_register';
+
     /**
      * Auth register event.
      * Runs right after a user is newly registered to the application by any authentication
      * system as a standard app user. This includes auto-registration systems used
-     * by LDAP, SAML and social systems. It only includes self-registrations.
+     * by LDAP, SAML, OIDC and social systems. It only includes self-registrations.
      *
-     * @param string               $authSystem
+     * @param string $authSystem
      * @param \BookStack\Users\Models\User $user
      */
     const AUTH_REGISTER = 'auth_register';
@@ -91,8 +110,8 @@ class ThemeEvents
      *
      * @param string $tagReference
      * @param string $replacementHTML
-     * @param \BookStack\Entities\Models\Page   $currentPage
-     * @param ?\BookStack\Entities\Models\Page  $referencedPage
+     * @param \BookStack\Entities\Models\Page $currentPage
+     * @param ?\BookStack\Entities\Models\Page $referencedPage
      */
     const PAGE_INCLUDE_PARSE = 'page_include_parse';
 
@@ -133,7 +152,7 @@ class ThemeEvents
      * Provides both the original request and the currently resolved response.
      * Return values, if provided, will be used as a new response to use.
      *
-     * @param \Illuminate\Http\Request                                                       $request
+     * @param \Illuminate\Http\Request $request
      * @param \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\BinaryFileResponse $response
      * @returns \Illuminate\Http\Response|null
      */
@@ -149,11 +168,11 @@ class ThemeEvents
      * If the listener returns a non-null value, that will be used as the POST data instead
      * of the system default.
      *
-     * @param string                                     $event
-     * @param \BookStack\Activity\Models\Webhook         $webhook
+     * @param string $event
+     * @param \BookStack\Activity\Models\Webhook $webhook
      * @param string|\BookStack\Activity\Models\Loggable $detail
-     * @param \BookStack\Users\Models\User               $initiator
-     * @param int                                        $initiatedTime
+     * @param \BookStack\Users\Models\User $initiator
+     * @param int $initiatedTime
      * @returns array|null
      */
     const WEBHOOK_CALL_BEFORE = 'webhook_call_before';
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 607b6ea833a..8773a78cbf7 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
     'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
     'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
     'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'No action defined',
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index a7a46521a6e..8e12b88d85c 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -178,6 +178,43 @@ public function test_event_auth_register_standard()
         $this->assertInstanceOf(User::class, $args[1]);
     }
 
+    public function test_event_auth_pre_register()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $user = User::factory()->make();
+        $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals('standard', $args[0]);
+        $this->assertEquals([
+            'email' => $user->email,
+            'name' => $user->name,
+            'password' => 'password',
+        ], $args[1]);
+        $this->assertDatabaseHas('users', ['email' => $user->email]);
+    }
+
+    public function test_event_auth_pre_register_with_false_return_blocks_registration()
+    {
+        $callback = function () {
+            return false;
+        };
+        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $user = User::factory()->make();
+        $resp = $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('User account could not be registered for the provided details');
+        $this->assertDatabaseMissing('users', ['email' => $user->email]);
+    }
+
     public function test_event_webhook_call_before()
     {
         $args = [];

From a75d5b8bc17f5d1352ae5db7804df10f26ff751b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 22 Feb 2024 11:22:08 +0000
Subject: [PATCH 053/666] Sessions: Prevent image urls being part of session
 URL history

To prevent them being considered for redirects.
Includes test to cover.
For #4863
---
 app/Http/Kernel.php                          |  2 +-
 app/Http/Middleware/StartSessionExtended.php | 34 ++++++++++++++++++++
 tests/Uploads/ImageTest.php                  | 23 +++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Middleware/StartSessionExtended.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 1b96ff3db66..d23f56a2cf9 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -28,7 +28,7 @@ class Kernel extends HttpKernel
             \BookStack\Http\Middleware\ApplyCspRules::class,
             \BookStack\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+            \BookStack\Http\Middleware\StartSessionExtended::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \BookStack\Http\Middleware\VerifyCsrfToken::class,
             \BookStack\Http\Middleware\CheckEmailConfirmed::class,
diff --git a/app/Http/Middleware/StartSessionExtended.php b/app/Http/Middleware/StartSessionExtended.php
new file mode 100644
index 00000000000..26cd250ac34
--- /dev/null
+++ b/app/Http/Middleware/StartSessionExtended.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace BookStack\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Illuminate\Session\Middleware\StartSession as Middleware;
+
+/**
+ * An extended version of the default Laravel "StartSession" middleware
+ * with customizations applied as required:
+ *
+ * - Adds filtering for the request URLs stored in session history.
+ */
+class StartSessionExtended extends Middleware
+{
+    protected static array $pathPrefixesExcludedFromHistory = [
+        'uploads/images/'
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    protected function storeCurrentUrl(Request $request, $session): void
+    {
+        $requestPath = strtolower($request->path());
+        foreach (static::$pathPrefixesExcludedFromHistory as $excludedPath) {
+            if (str_starts_with($requestPath, $excludedPath)) {
+                return;
+            }
+        }
+
+        parent::storeCurrentUrl($request, $session);
+    }
+}
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index af249951f30..d24b6202b37 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -383,6 +383,29 @@ public function test_system_images_remain_public_with_local_secure()
         }
     }
 
+    public function test_secure_images_not_tracked_in_session_history()
+    {
+        config()->set('filesystems.images', 'local_secure');
+        $this->asEditor();
+        $page = $this->entities->page();
+        $result = $this->files->uploadGalleryImageToPage($this, $page);
+        $expectedPath = storage_path($result['path']);
+        $this->assertFileExists($expectedPath);
+
+        $this->get('/books');
+        $this->assertEquals(url('/books'), session()->previousUrl());
+
+        $resp = $this->get($result['path']);
+        $resp->assertOk();
+        $resp->assertHeader('Content-Type', 'image/png');
+
+        $this->assertEquals(url('/books'), session()->previousUrl());
+
+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }
+    }
+
     public function test_system_images_remain_public_with_local_secure_restricted()
     {
         config()->set('filesystems.images', 'local_secure_restricted');

From 4ccfde6d02f24080d00a7ae591f8af3b17154071 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 28 Feb 2024 12:19:36 +0000
Subject: [PATCH 054/666] Updated translations with latest Crowdin changes
 (#4803)

---
 lang/ar/activities.php          |   6 +-
 lang/ar/common.php              |   2 +-
 lang/ar/editor.php              |   3 +
 lang/ar/entities.php            |   8 +-
 lang/ar/errors.php              |   2 +-
 lang/ar/settings.php            |   2 +-
 lang/bg/activities.php          |   6 +-
 lang/bg/common.php              |   2 +-
 lang/bg/editor.php              |   3 +
 lang/bg/entities.php            |   8 +-
 lang/bg/errors.php              |   2 +-
 lang/bg/settings.php            |   2 +-
 lang/bs/activities.php          |   6 +-
 lang/bs/common.php              |   2 +-
 lang/bs/editor.php              |   3 +
 lang/bs/entities.php            |   8 +-
 lang/bs/errors.php              |   2 +-
 lang/bs/settings.php            |   2 +-
 lang/ca/activities.php          |   6 +-
 lang/ca/common.php              |   2 +-
 lang/ca/editor.php              |   3 +
 lang/ca/entities.php            |   8 +-
 lang/ca/errors.php              |   2 +-
 lang/ca/settings.php            |   2 +-
 lang/cs/activities.php          |   6 +-
 lang/cs/common.php              |   2 +-
 lang/cs/editor.php              |   3 +
 lang/cs/entities.php            |   8 +-
 lang/cs/errors.php              |   2 +-
 lang/cs/settings.php            |   2 +-
 lang/cy/activities.php          |   6 +-
 lang/cy/common.php              |   2 +-
 lang/cy/editor.php              |   3 +
 lang/cy/entities.php            |   8 +-
 lang/cy/errors.php              |   2 +-
 lang/cy/settings.php            |   2 +-
 lang/da/activities.php          |   6 +-
 lang/da/common.php              |   2 +-
 lang/da/editor.php              |   3 +
 lang/da/entities.php            |   8 +-
 lang/da/errors.php              |   2 +-
 lang/da/settings.php            |   2 +-
 lang/de/activities.php          |   6 +-
 lang/de/common.php              |   2 +-
 lang/de/editor.php              |   3 +
 lang/de/entities.php            |   8 +-
 lang/de/errors.php              |   2 +-
 lang/de/settings.php            |   2 +-
 lang/de_informal/activities.php |   6 +-
 lang/de_informal/common.php     |   2 +-
 lang/de_informal/editor.php     |   3 +
 lang/de_informal/entities.php   |   8 +-
 lang/de_informal/errors.php     |   2 +-
 lang/de_informal/settings.php   |   2 +-
 lang/el/activities.php          |   6 +-
 lang/el/common.php              |   2 +-
 lang/el/editor.php              |   3 +
 lang/el/entities.php            |   8 +-
 lang/el/errors.php              |   2 +-
 lang/el/settings.php            |   2 +-
 lang/es/activities.php          |   6 +-
 lang/es/common.php              |   2 +-
 lang/es/editor.php              |   3 +
 lang/es/entities.php            |   8 +-
 lang/es/errors.php              |   2 +-
 lang/es_AR/activities.php       |   2 +-
 lang/es_AR/common.php           |   2 +-
 lang/es_AR/editor.php           |   3 +
 lang/es_AR/entities.php         |   8 +-
 lang/es_AR/errors.php           |   2 +-
 lang/es_AR/settings.php         |   2 +-
 lang/et/activities.php          |   6 +-
 lang/et/common.php              |   2 +-
 lang/et/editor.php              |   3 +
 lang/et/entities.php            |   8 +-
 lang/et/errors.php              |   2 +-
 lang/et/settings.php            |   2 +-
 lang/eu/activities.php          |   6 +-
 lang/eu/common.php              |   2 +-
 lang/eu/editor.php              |   3 +
 lang/eu/entities.php            |   8 +-
 lang/eu/errors.php              |   2 +-
 lang/eu/settings.php            |   2 +-
 lang/fa/activities.php          |   2 +-
 lang/fa/common.php              |   2 +-
 lang/fa/components.php          |   2 +-
 lang/fa/editor.php              |   3 +
 lang/fa/entities.php            |  12 +-
 lang/fa/errors.php              |   4 +-
 lang/fa/settings.php            |   2 +-
 lang/fi/activities.php          |   6 +-
 lang/fi/common.php              |   2 +-
 lang/fi/editor.php              |   3 +
 lang/fi/entities.php            |   8 +-
 lang/fi/errors.php              |   2 +-
 lang/fi/settings.php            |   2 +-
 lang/fr/activities.php          |   6 +-
 lang/fr/common.php              |   2 +-
 lang/fr/editor.php              |   3 +
 lang/fr/entities.php            |   8 +-
 lang/fr/errors.php              |   2 +-
 lang/fr/settings.php            |   2 +-
 lang/he/activities.php          |   6 +-
 lang/he/common.php              |   2 +-
 lang/he/editor.php              |   3 +
 lang/he/entities.php            |   8 +-
 lang/he/errors.php              |   2 +-
 lang/he/settings.php            |   2 +-
 lang/hr/activities.php          |   6 +-
 lang/hr/common.php              |   2 +-
 lang/hr/editor.php              |   3 +
 lang/hr/entities.php            |   8 +-
 lang/hr/errors.php              |   2 +-
 lang/hr/settings.php            |   2 +-
 lang/hu/activities.php          | 126 ++++-----
 lang/hu/auth.php                |  58 ++---
 lang/hu/common.php              |  10 +-
 lang/hu/components.php          |  26 +-
 lang/hu/editor.php              |  67 ++---
 lang/hu/entities.php            | 230 ++++++++---------
 lang/hu/errors.php              |  28 +-
 lang/hu/notifications.php       |  34 +--
 lang/hu/preferences.php         |  76 +++---
 lang/hu/settings.php            | 142 +++++------
 lang/hu/validation.php          |  36 +--
 lang/id/activities.php          |   6 +-
 lang/id/common.php              |   2 +-
 lang/id/editor.php              |   3 +
 lang/id/entities.php            |   8 +-
 lang/id/errors.php              |   2 +-
 lang/id/settings.php            |   2 +-
 lang/it/activities.php          |   6 +-
 lang/it/common.php              |   2 +-
 lang/it/editor.php              |   3 +
 lang/it/entities.php            |  10 +-
 lang/it/errors.php              |   2 +-
 lang/it/settings.php            |   4 +-
 lang/ja/common.php              |   2 +-
 lang/ja/editor.php              |   3 +
 lang/ja/entities.php            |   8 +-
 lang/ja/errors.php              |   2 +-
 lang/ja/settings.php            |   2 +-
 lang/ka/activities.php          |   6 +-
 lang/ka/common.php              |   2 +-
 lang/ka/editor.php              |   3 +
 lang/ka/entities.php            |   8 +-
 lang/ka/errors.php              |   2 +-
 lang/ka/settings.php            |   2 +-
 lang/ko/activities.php          |   6 +-
 lang/ko/common.php              |   2 +-
 lang/ko/editor.php              |   3 +
 lang/ko/entities.php            |   8 +-
 lang/ko/errors.php              |   2 +-
 lang/ko/settings.php            |   2 +-
 lang/lt/activities.php          |   6 +-
 lang/lt/common.php              |   2 +-
 lang/lt/editor.php              |   3 +
 lang/lt/entities.php            |   8 +-
 lang/lt/errors.php              |   2 +-
 lang/lt/settings.php            |   2 +-
 lang/lv/activities.php          |  12 +-
 lang/lv/common.php              |   2 +-
 lang/lv/editor.php              |   3 +
 lang/lv/entities.php            |  24 +-
 lang/lv/errors.php              |   2 +-
 lang/lv/preferences.php         |   6 +-
 lang/lv/settings.php            |  30 +--
 lang/nb/activities.php          |   6 +-
 lang/nb/common.php              |   2 +-
 lang/nb/editor.php              |   3 +
 lang/nb/entities.php            |  12 +-
 lang/nb/errors.php              |   2 +-
 lang/nb/notifications.php       |   2 +-
 lang/nb/settings.php            |   2 +-
 lang/nl/activities.php          |   6 +-
 lang/nl/auth.php                |  12 +-
 lang/nl/common.php              |   2 +-
 lang/nl/editor.php              |   3 +
 lang/nl/entities.php            |   8 +-
 lang/nl/errors.php              |   2 +-
 lang/nl/settings.php            |   2 +-
 lang/nn/activities.php          |   6 +-
 lang/nn/common.php              |   2 +-
 lang/nn/editor.php              |   3 +
 lang/nn/entities.php            |   8 +-
 lang/nn/errors.php              |   2 +-
 lang/nn/settings.php            |   2 +-
 lang/pl/activities.php          |   6 +-
 lang/pl/common.php              |   2 +-
 lang/pl/editor.php              |   3 +
 lang/pl/entities.php            |   8 +-
 lang/pl/errors.php              |   2 +-
 lang/pl/settings.php            |   2 +-
 lang/pt/activities.php          |   6 +-
 lang/pt/common.php              |   2 +-
 lang/pt/editor.php              |   3 +
 lang/pt/entities.php            |   8 +-
 lang/pt/errors.php              |   2 +-
 lang/pt/preferences.php         |  12 +-
 lang/pt/settings.php            |   2 +-
 lang/pt_BR/activities.php       |   6 +-
 lang/pt_BR/common.php           |   2 +-
 lang/pt_BR/editor.php           |   3 +
 lang/pt_BR/entities.php         |  54 ++--
 lang/pt_BR/errors.php           |   2 +-
 lang/pt_BR/notifications.php    |   2 +-
 lang/pt_BR/settings.php         |   2 +-
 lang/ro/activities.php          |   6 +-
 lang/ro/common.php              |   2 +-
 lang/ro/editor.php              |   3 +
 lang/ro/entities.php            |   8 +-
 lang/ro/errors.php              |   2 +-
 lang/ro/settings.php            |   2 +-
 lang/ru/activities.php          |   6 +-
 lang/ru/common.php              |   4 +-
 lang/ru/editor.php              |   3 +
 lang/ru/entities.php            |   8 +-
 lang/ru/errors.php              |   2 +-
 lang/ru/preferences.php         |  48 ++--
 lang/ru/settings.php            |   8 +-
 lang/sk/activities.php          |   6 +-
 lang/sk/common.php              |   2 +-
 lang/sk/editor.php              |   3 +
 lang/sk/entities.php            |   8 +-
 lang/sk/errors.php              |   2 +-
 lang/sk/settings.php            |   2 +-
 lang/sl/activities.php          | 140 +++++-----
 lang/sl/common.php              |   2 +-
 lang/sl/editor.php              |   3 +
 lang/sl/entities.php            |   8 +-
 lang/sl/errors.php              |   2 +-
 lang/sl/settings.php            |   2 +-
 lang/sq/activities.php          |   6 +-
 lang/sq/auth.php                |  22 +-
 lang/sq/common.php              |   2 +-
 lang/sq/editor.php              |   3 +
 lang/sq/entities.php            |   8 +-
 lang/sq/errors.php              |   2 +-
 lang/sq/settings.php            |   2 +-
 lang/sr/activities.php          | 124 +++++++++
 lang/sr/auth.php                | 117 +++++++++
 lang/sr/common.php              | 110 ++++++++
 lang/sr/components.php          |  46 ++++
 lang/sr/editor.php              | 177 +++++++++++++
 lang/sr/entities.php            | 437 ++++++++++++++++++++++++++++++++
 lang/sr/errors.php              | 119 +++++++++
 lang/sr/notifications.php       |  27 ++
 lang/sr/pagination.php          |  12 +
 lang/sr/passwords.php           |  15 ++
 lang/sr/preferences.php         |  51 ++++
 lang/sr/settings.php            | 329 ++++++++++++++++++++++++
 lang/sr/validation.php          | 117 +++++++++
 lang/sv/activities.php          |   6 +-
 lang/sv/common.php              |   2 +-
 lang/sv/editor.php              |   3 +
 lang/sv/entities.php            |   8 +-
 lang/sv/errors.php              |   2 +-
 lang/sv/settings.php            |   2 +-
 lang/tr/activities.php          |   6 +-
 lang/tr/common.php              |   2 +-
 lang/tr/editor.php              |   3 +
 lang/tr/entities.php            |   8 +-
 lang/tr/errors.php              |   2 +-
 lang/tr/settings.php            |   2 +-
 lang/uk/activities.php          |   6 +-
 lang/uk/common.php              |   2 +-
 lang/uk/editor.php              |   3 +
 lang/uk/entities.php            |   8 +-
 lang/uk/errors.php              |   2 +-
 lang/uk/settings.php            |   2 +-
 lang/uz/activities.php          |   6 +-
 lang/uz/common.php              |   2 +-
 lang/uz/editor.php              |   3 +
 lang/uz/entities.php            |   8 +-
 lang/uz/errors.php              |   2 +-
 lang/uz/settings.php            |   2 +-
 lang/vi/activities.php          |   6 +-
 lang/vi/common.php              |   2 +-
 lang/vi/editor.php              |   3 +
 lang/vi/entities.php            |   8 +-
 lang/vi/errors.php              |   2 +-
 lang/vi/settings.php            |   2 +-
 lang/zh_CN/activities.php       |   4 +-
 lang/zh_CN/common.php           |   2 +-
 lang/zh_CN/editor.php           |   3 +
 lang/zh_CN/entities.php         |   8 +-
 lang/zh_CN/errors.php           |   2 +-
 lang/zh_TW/activities.php       |   6 +-
 lang/zh_TW/common.php           |   2 +-
 lang/zh_TW/editor.php           |   3 +
 lang/zh_TW/entities.php         |   8 +-
 lang/zh_TW/errors.php           |   2 +-
 lang/zh_TW/settings.php         |   2 +-
 293 files changed, 2840 insertions(+), 1024 deletions(-)
 create mode 100644 lang/sr/activities.php
 create mode 100644 lang/sr/auth.php
 create mode 100644 lang/sr/common.php
 create mode 100644 lang/sr/components.php
 create mode 100644 lang/sr/editor.php
 create mode 100644 lang/sr/entities.php
 create mode 100644 lang/sr/errors.php
 create mode 100644 lang/sr/notifications.php
 create mode 100644 lang/sr/pagination.php
 create mode 100644 lang/sr/passwords.php
 create mode 100644 lang/sr/preferences.php
 create mode 100644 lang/sr/settings.php
 create mode 100644 lang/sr/validation.php

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index 51f814d3db3..134dce4cd98 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'تم إزالة المستخدم بنجاح',
 
     // API Tokens
-    'api_token_create' => 'تم إنشاء رمز api',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'تم إنشاء رمز الـ API بنجاح',
-    'api_token_update' => 'تم تحديث رمز api',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'تم تحديث رمز الـ API بنجاح',
-    'api_token_delete' => 'رمز api المحذوف',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'تم حذف رمز الـ API بنجاح',
 
     // Roles
diff --git a/lang/ar/common.php b/lang/ar/common.php
index 5a391cd6d4b..740b1fbbb94 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -20,7 +20,7 @@
     'description' => 'الوصف',
     'role' => 'الدور',
     'cover_image' => 'صورة الغلاف',
-    'cover_image_description' => 'الصورة يجب أن تكون مقاربة لحجم 440×250 بكسل.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'إجراءات',
diff --git a/lang/ar/editor.php b/lang/ar/editor.php
index d951f62a125..6fb6e3d1153 100644
--- a/lang/ar/editor.php
+++ b/lang/ar/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 30ad7845423..6cf92ace31f 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'ملف PDF',
     'export_text' => 'ملف نص عادي',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'الأذونات',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'تعديل كتاب :bookName',
     'books_form_book_name' => 'اسم الكتاب',
     'books_save' => 'حفظ الكتاب',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'أذونات الكتاب',
     'books_permissions_updated' => 'تم تحديث أذونات الكتاب',
     'books_empty_contents' => 'لم يتم إنشاء أي صفحات أو فصول لهذا الكتاب.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'حذف المسودة',
     'pages_delete_success' => 'تم حذف الصفحة',
     'pages_delete_draft_success' => 'تم حذف المسودة',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'تأكيد حذف الصفحة؟',
     'pages_delete_draft_confirm' => 'تأكيد حذف المسودة؟',
     'pages_editing_named' => ':pageName قيد التعديل',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index 70bcf2137d0..e1d968a03a7 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'يوجد مستخدم ببيانات مختلفة مسجل بالنظام للبريد الإلكتروني :email.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'تم تأكيد البريد الإلكتروني من قبل, الرجاء محاولة تسجيل الدخول.',
     'email_confirmation_invalid' => 'رابط التأكيد غير صحيح أو قد تم استخدامه من قبل, الرجاء محاولة التسجيل من جديد.',
     'email_confirmation_expired' => 'صلاحية رابط التأكيد انتهت, تم إرسال رسالة تأكيد جديدة لعنوان البريد الإلكتروني.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'لم يتم التعرف على الطلب من نظام التوثيق الخارجي من خلال عملية تبدأ بهذا التطبيق. العودة بعد تسجيل الدخول يمكن أن يسبب هذه المشكلة.',
     'saml_fail_authed' => 'تسجيل الدخول باستخدام :system فشل، النظام لم يوفر التفويض الناجح',
     'oidc_already_logged_in' => 'تم تسجيل الدخول مسبقاً',
-    'oidc_user_not_registered' => 'المستخدم :name غير مسجل و لايمكن التسجيل بشكل اتوماتيكي',
     'oidc_no_email_address' => 'تعذر العثور على عنوان بريد إلكتروني، لهذا المستخدم، في البيانات المقدمة من نظام المصادقة الخارجي',
     'oidc_fail_authed' => 'تسجيل الدخول باستخدام :system فشل، النظام لم يوفر التفويض الناجح',
     'social_no_action_defined' => 'لم يتم تعريف أي إجراء',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index ca0f2fdb3d0..287e6a16606 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'سلة المحذوفات فارغة حاليًا',
     'recycle_bin_empty' => 'إفراغ سلة المحذوفات',
     'recycle_bin_empty_confirm' => 'سيؤدي هذا إلى إتلاف جميع العناصر الموجودة في سلة المحذوفات بشكل دائم بما في ذلك المحتوى الموجود داخل كل عنصر. هل أنت متأكد من أنك تريد إفراغ سلة المحذوفات؟',
-    'recycle_bin_destroy_confirm' => 'سيؤدي هذا الإجراء إلى حذف هذا العنصر نهائيًا ، إلى جانب أي عناصر فرعية مدرجة أدناه ، من النظام ولن تتمكن من استعادة هذا المحتوى. هل أنت متأكد من أنك تريد حذف هذا العنصر نهائيًا؟',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'العناصر المراد تدميرها',
     'recycle_bin_restore_list' => 'العناصر المراد استرجاعها',
     'recycle_bin_restore_confirm' => 'سيعيد هذا الإجراء العنصر المحذوف ، بما في ذلك أي عناصر فرعية ، إلى موقعه الأصلي. إذا تم حذف الموقع الأصلي منذ ذلك الحين ، وهو الآن في سلة المحذوفات ، فسيلزم أيضًا استعادة العنصر الأصلي.',
diff --git a/lang/bg/activities.php b/lang/bg/activities.php
index 2c58883aa21..e1e43a0d267 100644
--- a/lang/bg/activities.php
+++ b/lang/bg/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Потребителят е премахнат успешно',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/bg/common.php b/lang/bg/common.php
index 5fa91b2e871..96d36422d57 100644
--- a/lang/bg/common.php
+++ b/lang/bg/common.php
@@ -20,7 +20,7 @@
     'description' => 'Описание',
     'role' => 'Роля',
     'cover_image' => 'Образ на корицата',
-    'cover_image_description' => 'Образът трябва да е горе-долу 440х250 пиксела.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Действия',
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index f677afa631e..5f6fa1a6a7a 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Свойства на таблицата',
     'table_properties_title' => 'Свойства на таблица',
     'delete_table' => 'Изтриване на таблица',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Вмъкни реда преди',
     'insert_row_after' => 'Вмъкни реда след',
     'delete_row' => 'Изтриване на ред',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index fb57bf1bca0..eb0a05f5832 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Обикновен текстов файл',
     'export_md' => 'Markdown файл',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Права',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Редактирай книга :bookName',
     'books_form_book_name' => 'Име на книга',
     'books_save' => 'Запази книга',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Настройки за достъп до книгата',
     'books_permissions_updated' => 'Настройките за достъп до книгата бяха обновени',
     'books_empty_contents' => 'Няма създадени страници или глави към тази книга.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Изтрий чернова',
     'pages_delete_success' => 'Страницата е изтрита',
     'pages_delete_draft_success' => 'Черновата на страницата бе изтрита',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Сигурни ли сте, че искате да изтриете тази страница?',
     'pages_delete_draft_confirm' => 'Сигурни ли сте, че искате да изтриете тази чернова?',
     'pages_editing_named' => 'Редактиране на страница :pageName',
diff --git a/lang/bg/errors.php b/lang/bg/errors.php
index fbc042a055e..6b9d8a20c41 100644
--- a/lang/bg/errors.php
+++ b/lang/bg/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Потребител с емайл :email вече съществува но с други данни.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Емейлът вече беше потвърден. Моля опитрайте да влезете.',
     'email_confirmation_invalid' => 'Този код за достъп не е валиден или вече е бил използван, Моля опитай да се регистрираш отново.',
     'email_confirmation_expired' => 'Кодът за потвърждение изтече, нов емейл за потвърждение беше изпратен.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Заявката от външната система не е разпознат от процеса започнат от това приложение. Връщането назад след влизане може да породи този проблем.',
     'saml_fail_authed' => 'Влизането чрез :system не беше успешно, системата не успя да удостовери потребителя',
     'oidc_already_logged_in' => 'Вече си вписан',
-    'oidc_user_not_registered' => 'Потребителят :name не е регистриран, а автоматичната регистрация е изключена',
     'oidc_no_email_address' => 'Не можах да намеря имейл адрес за този потребител в данните, предоставени от външната удостоверителна система',
     'oidc_fail_authed' => 'Вписването чрез :system не беше успешно, тъй като системата не предостави успешна оторизация',
     'social_no_action_defined' => 'Действието не беше дефинирано',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index f4654135b5a..bf0c8b3bc75 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Кошчето е празно',
     'recycle_bin_empty' => 'Изпразни кочшето',
     'recycle_bin_empty_confirm' => 'Това ще унищожи завинаги всички обекти в кошчето, включително съдържанието във всеки обект. Сигурен/на ли си, че искаш да изпразниш кошчето?',
-    'recycle_bin_destroy_confirm' => 'Това действие завинаги ще изтрие от системата този обект, както и всички негови поделементи, и няма да можеш да го възстановиш. Сигурен/на ли си, че искаш да изтриеш този обект завинаги?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Обекти за унищожение',
     'recycle_bin_restore_list' => 'Обекти за възстановяване',
     'recycle_bin_restore_confirm' => 'Това действие ще възстанови изтрития обект, както и всички негови поделементи, в оригиналното им местоположение. Ако оригиналното им местоположение също е изтрито и сега се намира в кошчето, то също ще трябва да бъде възстановено.',
diff --git a/lang/bs/activities.php b/lang/bs/activities.php
index bd157743612..ee538c23a47 100644
--- a/lang/bs/activities.php
+++ b/lang/bs/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'User successfully removed',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/bs/common.php b/lang/bs/common.php
index dcf6248a0ce..aca83898d51 100644
--- a/lang/bs/common.php
+++ b/lang/bs/common.php
@@ -20,7 +20,7 @@
     'description' => 'Opis',
     'role' => 'Uloga',
     'cover_image' => 'Naslovna slika',
-    'cover_image_description' => 'Ova slika treba biti približno 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Akcije',
diff --git a/lang/bs/editor.php b/lang/bs/editor.php
index 670c1c5e1ac..de9aa0ece10 100644
--- a/lang/bs/editor.php
+++ b/lang/bs/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index a8a49fe1c56..7e484b60ce2 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF fajl',
     'export_text' => 'Plain Text fajl',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Dozvole',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Uredi knjigu :bookName',
     'books_form_book_name' => 'Naziv knjige',
     'books_save' => 'Spremi knjigu',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Dozvole knjige',
     'books_permissions_updated' => 'Dozvole knjige su ažurirane',
     'books_empty_contents' => 'Za ovu knjigu nisu napravljene ni stranice ni poglavlja.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Are you sure you want to delete this page?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',
diff --git a/lang/bs/errors.php b/lang/bs/errors.php
index 4f3d61066ed..bcf60a323e7 100644
--- a/lang/bs/errors.php
+++ b/lang/bs/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Korisnik sa e-mailom :email već postoji ali sa različitim podacima.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-mail je već potvrđen, pokušajte se prijaviti.',
     'email_confirmation_invalid' => 'Ovaj token za potvrdu nije ispravan ili je već iskorišten, molimo vas pokušajte se registrovati ponovno.',
     'email_confirmation_expired' => 'Ovaj token za potvrdu je istekao, novi e-mail za potvrdu je poslan.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Proces, koji je pokrenula ova aplikacija, nije prepoznao zahtjev od eksternog sistema za autentifikaciju. Navigacija nazad nakon prijave može uzrokovati ovaj problem.',
     'saml_fail_authed' => 'Prijava koristeći :system nije uspjela, sistem nije obezbijedio uspješnu autorizaciju',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'Nema definisane akcije',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index 03e9bf462e2..7b7f5d2a2e3 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
     'recycle_bin_empty' => 'Empty Recycle Bin',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index fb9071174bd..a3116ef0d63 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Usuari suprimit correctament',
 
     // API Tokens
-    'api_token_create' => 'ha creat un testimoni d’API',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Testimoni d’API creat correctament',
-    'api_token_update' => 'ha actualitzat un testimoni d’API',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Testimoni d’API actualitzat correctament',
-    'api_token_delete' => 'ha suprimit un testumoni d’API',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Testimoni d’API suprimit correctament',
 
     // Roles
diff --git a/lang/ca/common.php b/lang/ca/common.php
index 1798c82b716..f6a825b69fe 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descripció',
     'role' => 'Rol',
     'cover_image' => 'Imatge de portada',
-    'cover_image_description' => 'Aquesta imatge hauria de fer aproximadament 440x250 px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Accions',
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index eaef6402fb4..abfa771a80f 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propietats de la taula',
     'table_properties_title' => 'Propietats de la taula',
     'delete_table' => 'Suprimeix la taula',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insereix una fila abans',
     'insert_row_after' => 'Insereix una fila després',
     'delete_row' => 'Suprimeix la fila',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index 53b766b4259..ba8f574edd1 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Fitxer PDF',
     'export_text' => 'Fitxer de text sense format',
     'export_md' => 'Fitxer Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edita el llibre :bookName',
     'books_form_book_name' => 'Nom del llibre',
     'books_save' => 'Desa el llibre',
-    'books_default_template' => 'Plantilla de pàgina per defecte',
-    'books_default_template_explain' => 'Assigneu una plantilla de pàgina que s’utilitzarà com a contingut per defecte de totes les pàgines noves d’aquest llibre. Tingueu en compte que només es farà servir si qui crea la pàgina té accés de visualització a la plantilla de pàgina elegida.',
-    'books_default_template_select' => 'Seleccioneu una plantilla de pàgina',
     'books_permissions' => 'Permisos del llibre',
     'books_permissions_updated' => 'S’han actualitzat els permisos del llibre',
     'books_empty_contents' => 'No hi ha cap pàgina ni cap capítol creat en aquest llibre.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Suprimeix l’esborrany de pàgina',
     'pages_delete_success' => 'S’ha suprimit la pàgina',
     'pages_delete_draft_success' => 'S’ha suprimit l’esborrany de pàgina',
-    'pages_delete_warning_template' => 'Aquesta pàgina es fa servir com a plantilla de pàgina per defecte en algun llibre. Quan l’hàgiu suprimida, aquests llibres ja no tindran assignada cap plantilla de pàgina per defecte.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Segur que voleu suprimir aquesta pàgina?',
     'pages_delete_draft_confirm' => 'Segur que voleu suprimir aquest esborrany de pàgina?',
     'pages_editing_named' => 'Esteu editant :pageName',
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 22ecb2b0eba..46943fdb1f3 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ja hi ha un usuari amb l’adreça electrònica :email però amb credencials diferents.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'L’adreça electrònica ja està confirmada. Proveu d’iniciar la sessió.',
     'email_confirmation_invalid' => 'Aquest testimoni de confirmació no és vàlid o ja s’ha utilitzat. Proveu de tornar-vos a registrar.',
     'email_confirmation_expired' => 'El testimoni de confirmació ha caducat. S’ha enviat un nou correu electrònic de confirmació.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'La petició del sistema d’autenticació extern no és reconeguda per un procés iniciat per aquesta aplicació. Aquest problema podria ser causat per navegar endarrere després d’iniciar la sessió.',
     'saml_fail_authed' => 'L’inici de sessió fent servir :system ha fallat, el sistema no ha proporcionat una autorització satisfactòria',
     'oidc_already_logged_in' => 'Ja teniu una sessió iniciada',
-    'oidc_user_not_registered' => 'L’usuari :name no està registrat i els registres automàtics estan desactivats',
     'oidc_no_email_address' => 'No s’ha pogut trobar cap adreça electrònica per a aquest usuari en les dades proporcionades pel sistema d’autenticació extern',
     'oidc_fail_authed' => 'L’inici de sessió fent servir :system ha fallat, el sistema no ha proporcionat una autorització satisfactòria',
     'social_no_action_defined' => 'No hi ha cap acció definida',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 0305a5c232d..d39174c9bbe 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'La paperera de reciclatge és buida',
     'recycle_bin_empty' => 'Buida la paperera de reciclatge',
     'recycle_bin_empty_confirm' => 'Se suprimiran de manera permanent tots els elements de la paperera de reciclatge, incloent-hi el contingut dins de cada element. Segur que voleu buidar la paperera de reciclatge?',
-    'recycle_bin_destroy_confirm' => 'Aquesta acció suprimirà del sistema de manera permanent aquest element, juntament amb tots els elements fills que es llisten a sota, i no podreu restaurar aquest contingut. Segur que voleu suprimir de manera permanent aquest element?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elements que es destruiran',
     'recycle_bin_restore_list' => 'Elements que es restauraran',
     'recycle_bin_restore_confirm' => 'Aquesta acció restaurarà l’element suprimit, incloent-hi tots els elements fills, a la seva ubicació original. Si la ubicació original ha estat suprimida, i ara és a la paperera de reciclatge, caldrà que també en restaureu l’element pare.',
diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index 18d537f6463..4fcc9dacef2 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Uživatel byl úspěšně odstraněn',
 
     // API Tokens
-    'api_token_create' => 'vytvořil api token',
+    'api_token_create' => 'API token byl vytvořen',
     'api_token_create_notification' => 'API token úspěšně vytvořen',
-    'api_token_update' => 'aktualizoval api token',
+    'api_token_update' => 'API token byl aktualizován',
     'api_token_update_notification' => 'API token úspěšně aktualizován',
-    'api_token_delete' => 'odstranil api token',
+    'api_token_delete' => 'API token byl odstraněn',
     'api_token_delete_notification' => 'API token úspěšně odstraněn',
 
     // Roles
diff --git a/lang/cs/common.php b/lang/cs/common.php
index 506f5328130..08ac067ff3f 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -20,7 +20,7 @@
     'description' => 'Popis',
     'role' => 'Role',
     'cover_image' => 'Obrázek obálky',
-    'cover_image_description' => 'Obrázek by měl být přibližně 440×250px.',
+    'cover_image_description' => 'Tento obrázek by měl mít rozměry přibližně 440x250px, ačkoli bude podle potřeby zmenšen a oříznut, aby se vešel do uživatelského rozhraní, takže se skutečné rozměry budou lišit.',
 
     // Actions
     'actions' => 'Akce',
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index 5e16ad947c0..f4c442af8b7 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Vlastnosti tabulky',
     'table_properties_title' => 'Vlastnosti tabulky',
     'delete_table' => 'Smazat tabulku',
+    'table_clear_formatting' => 'Vymazat formátování tabulky',
+    'resize_to_contents' => 'Změnit velikost podle obsahu',
+    'row_header' => 'Záhlaví řádku',
     'insert_row_before' => 'Vložit řádek před',
     'insert_row_after' => 'Vložit řádek za',
     'delete_row' => 'Smazat řádek',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 4471c4b3787..3d402081063 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF dokument',
     'export_text' => 'Textový soubor',
     'export_md' => 'Markdown',
+    'default_template' => 'Výchozí šablona stránky',
+    'default_template_explain' => 'Přiřadit šablonu stránky, která bude použita jako výchozí obsah pro všechny nové stránky v této knize. Mějte na paměti, že šablona bude použita pouze v případě, že tvůrce stránek bude mít přístup k těmto vybraným stránkám šablony.',
+    'default_template_select' => 'Vyberte šablonu stránky',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnění',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Upravit knihu :bookName',
     'books_form_book_name' => 'Název knihy',
     'books_save' => 'Uložit knihu',
-    'books_default_template' => 'Výchozí šablona stránky',
-    'books_default_template_explain' => 'Přiřadit šablonu stránky, která bude použita jako výchozí obsah pro všechny nové stránky v této knize. Mějte na paměti, že šablona bude použita pouze v případě, že tvůrce stránek bude mít přístup k těmto vybraným stránkám šablony.',
-    'books_default_template_select' => 'Vyberte šablonu stránky',
     'books_permissions' => 'Oprávnění knihy',
     'books_permissions_updated' => 'Oprávnění knihy byla aktualizována',
     'books_empty_contents' => 'Pro tuto knihu nebyly vytvořeny žádné stránky ani kapitoly.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Odstranit koncept stránky',
     'pages_delete_success' => 'Stránka odstraněna',
     'pages_delete_draft_success' => 'Koncept stránky odstraněn',
-    'pages_delete_warning_template' => 'Tato stránka je aktivní výchozí šablona. Tyto knihy již nebudou mít výchozí šablonu stránky přiřazenou po odstranění této stránky.',
+    'pages_delete_warning_template' => 'Tato stránka je aktivní výchozí šablona pro nějakou knihu či kapitolu. Tyto knihy nebo kapitoly již nebudou mít výchozí šablonu stránky přiřazenou po odstranění této stránky.',
     'pages_delete_confirm' => 'Opravdu chcete odstranit tuto stránku?',
     'pages_delete_draft_confirm' => 'Opravdu chcete odstranit tento koncept stránky?',
     'pages_editing_named' => 'Úpravy stránky :pageName',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index 5d2cab6908a..2ee281c3eee 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Uživatel s emailem :email již existuje ale s jinými přihlašovacími údaji.',
+    'auth_pre_register_theme_prevention' => 'Zadané údaje nedovolují zaregistrovat uživatelský účet',
     'email_already_confirmed' => 'Emailová adresa již byla potvrzena. Zkuste se přihlásit.',
     'email_confirmation_invalid' => 'Tento potvrzovací odkaz již neplatí nebo už byl použit. Zkuste prosím registraci znovu.',
     'email_confirmation_expired' => 'Tento potvrzovací odkaz již neplatí, byl Vám odeslán nový potvrzovací e-mail.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Požadavek z externího ověřovacího systému nebyl rozpoznám procesem, který tato aplikace spustila. Tento problém může způsobit stisknutí tlačítka Zpět po přihlášení.',
     'saml_fail_authed' => 'Přihlášení pomocí :system selhalo, systém neposkytl úspěšnou autorizaci',
     'oidc_already_logged_in' => 'Již jste přihlášeni',
-    'oidc_user_not_registered' => 'Uživatel :name není registrován a automatická registrace je zakázána',
     'oidc_no_email_address' => 'Nelze najít e-mailovou adresu pro tohoto uživatele v datech poskytnutých externím přihlašovacím systémem',
     'oidc_fail_authed' => 'Přihlášení pomocí :system selhalo, systém neposkytl úspěšnou autorizaci',
     'social_no_action_defined' => 'Nebyla zvolena žádá akce',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 9542debe79a..75331834e13 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Koš je nyní prázdný',
     'recycle_bin_empty' => 'Vysypat Koš',
     'recycle_bin_empty_confirm' => 'Toto trvale odstraní všechny položky v Koši včetně obsahu vloženého v každé položce. Opravdu chcete vysypat Koš?',
-    'recycle_bin_destroy_confirm' => 'Tato akce trvale odstraní ze systému tuto položku spolu s veškerým vloženým obsahem a tento obsah nebudete moci obnovit. Opravdu chcete tuto položku trvale odstranit?',
+    'recycle_bin_destroy_confirm' => 'Tato akce trvale odstraní tuto položku ze systému spolu se všemi položkami uvedenými níže a nebudete je moci obnovit. Opravdu chcete tuto položku trvale odstranit?',
     'recycle_bin_destroy_list' => 'Položky k trvalému odstranění',
     'recycle_bin_restore_list' => 'Položky k obnovení',
     'recycle_bin_restore_confirm' => 'Tato akce obnoví odstraněnou položku včetně veškerého vloženého obsahu do původního umístění. Pokud bylo původní umístění od té doby odstraněno a nyní je v Koši, bude také nutné obnovit nadřazenou položku.',
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index b3301d757b8..b757707d13b 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Tynnwyd y defnyddiwr yn llwyddiannus',
 
     // API Tokens
-    'api_token_create' => 'creodd tocyn api',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Tocyn API wedi\'i greu\'n llwyddiannus',
-    'api_token_update' => 'diweddarodd docyn api',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Tocyn API wedi\'i ddiweddaru\'n llwyddiannus',
-    'api_token_delete' => 'dileodd docyn api',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Tocyn API wedi\'i ddileu\'n llwyddiannus',
 
     // Roles
diff --git a/lang/cy/common.php b/lang/cy/common.php
index e359e8ba361..7297e78db53 100644
--- a/lang/cy/common.php
+++ b/lang/cy/common.php
@@ -20,7 +20,7 @@
     'description' => 'Disgrifiad',
     'role' => 'Role',
     'cover_image' => 'Cover image',
-    'cover_image_description' => 'This image should be approx 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Gweithredoedd',
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index 5ad569a8ed4..473759feb2d 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index f1f915544d1..9e620b24ed1 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edit Book :bookName',
     'books_form_book_name' => 'Book Name',
     'books_save' => 'Save Book',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Book Permissions',
     'books_permissions_updated' => 'Book Permissions Updated',
     'books_empty_contents' => 'No pages or chapters have been created for this book.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Are you sure you want to delete this page?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index a85f74fd569..a2c8fada5a7 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Mae defnyddiwr gyda\'r e-bost :email eisoes yn bodoli ond gyda nodweddion gwahanol.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-bost eisoes wedi\'i gadarnhau, Ceisiwch fewngofnodi.',
     'email_confirmation_invalid' => 'Nid yw\'r tocyn cadarnhau hwn yn ddilys neu mae eisoes wedi\'i ddefnyddio. Ceisiwch gofrestru eto.',
     'email_confirmation_expired' => 'Mae\'r tocyn cadarnhad wedi dod i ben, Mae e-bost cadarnhau newydd wedi\'i anfon.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Nid yw\'r cais o\'r system ddilysu allanol yn cael ei gydnabod gan broses a ddechreuwyd gan y cais hwn. Gallai llywio yn ôl ar ôl mewngofnodi achosi\'r broblem hon.',
     'saml_fail_authed' => 'Wedi methu mewngofnodi gan ddefnyddio :system, ni roddodd y system awdurdodiad llwyddiannus',
     'oidc_already_logged_in' => 'Wedi mewngofnodi yn barod',
-    'oidc_user_not_registered' => 'Nid yw\'r defnyddiwr :name wedi\'i gofrestru ac mae cofrestriad awtomatig wedi\'i analluogi',
     'oidc_no_email_address' => 'Methu dod o hyd i gyfeiriad e-bost, ar gyfer y defnyddiwr hwn, yn y data a ddarparwyd gan y system ddilysu allanol',
     'oidc_fail_authed' => 'Wedi methu mewngofnodi gan ddefnyddio :system, ni roddodd y system awdurdodiad llwyddiannus',
     'social_no_action_defined' => 'Dim gweithred wedi\'i diffinio',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index 03e9bf462e2..7b7f5d2a2e3 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
     'recycle_bin_empty' => 'Empty Recycle Bin',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/da/activities.php b/lang/da/activities.php
index 48d159e8e60..7478e18bff4 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Brugeren blev fjernet',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/da/common.php b/lang/da/common.php
index 8c3aa24a79f..5b4c0e822a5 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beskrivelse',
     'role' => 'Rolle',
     'cover_image' => 'Coverbillede',
-    'cover_image_description' => 'Dette billede skal være omtrent 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Handlinger',
diff --git a/lang/da/editor.php b/lang/da/editor.php
index 38638ba86b5..bf45899a8cc 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabelegenskaber',
     'table_properties_title' => 'Tabelegenskaber',
     'delete_table' => 'Slet tabel',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Indsæt række før',
     'insert_row_after' => 'Indsæt række efter',
     'delete_row' => 'Slet række',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index 88945019c98..c952f147b8b 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Almindelig tekstfil',
     'export_md' => 'Markdown Fil',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Rettigheder',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Rediger bog :bookName',
     'books_form_book_name' => 'Bognavn',
     'books_save' => 'Gem bog',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Bogtilladelser',
     'books_permissions_updated' => 'Bogtilladelser opdateret',
     'books_empty_contents' => 'Ingen sider eller kapitler er blevet oprettet i denne bog.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Slet kladdeside',
     'pages_delete_success' => 'Side slettet',
     'pages_delete_draft_success' => 'Kladdeside slettet',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Er du sikker på, du vil slette denne side?',
     'pages_delete_draft_confirm' => 'Er du sikker på at du vil slette denne kladdesidde?',
     'pages_editing_named' => 'Redigerer :pageName',
diff --git a/lang/da/errors.php b/lang/da/errors.php
index 162a7476343..bc27a90232f 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En bruger med email :email eksistere allerede, men med andre legitimationsoplysninger.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email er allerede bekræftet. Prøv at logge ind.',
     'email_confirmation_invalid' => 'Denne bekræftelsestoken er ikke gyldig eller er allerede blevet brugt. Prøv at registrere dig igen.',
     'email_confirmation_expired' => 'Bekræftelsestoken er udløbet. En ny bekræftelsesmail er blevet sendt.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Anmodningen fra det eksterne godkendelsessystem genkendes ikke af en proces, der er startet af denne applikation. Navigering tilbage efter et login kan forårsage dette problem.',
     'saml_fail_authed' => 'Login ved hjælp af :system failed, systemet har ikke givet tilladelse',
     'oidc_already_logged_in' => 'Allerede logget ind',
-    'oidc_user_not_registered' => 'Brugeren :name er ikke registreret, og automatisk registrering er slået fra',
     'oidc_no_email_address' => 'Kunne ikke finde en e-mailadresse for denne bruger i de data, der leveres af det eksterne godkendelsessystem',
     'oidc_fail_authed' => 'Login ved hjælp af :system fejlede, systemet har ikke givet tilladelse',
     'social_no_action_defined' => 'Ingen handling er defineret',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index 13ef813c6e4..b777ea14a29 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Papirkurven er tom',
     'recycle_bin_empty' => 'Tøm papirkurv',
     'recycle_bin_empty_confirm' => 'Dette vil permanent slette alle elementer i papirkurven, inkluderet hvert elements indhold. Er du sikker på, at du vil tømme papirkurven?',
-    'recycle_bin_destroy_confirm' => 'Denne handling sletter dette element permanent, sammen med elementerne anført nedenfor, fra systemet. Du vil ikke være i stand til at gendanne dette indhold. Er du sikker på, at du vil slette dette element permanent?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elementer der skal slettes',
     'recycle_bin_restore_list' => 'Elementer der skal gendannes',
     'recycle_bin_restore_confirm' => 'Denne handling vil gendanne det slettede element, herunder alle underelementer, til deres oprindelige placering. Hvis den oprindelige placering siden er blevet slettet, og nu er i papirkurven, vil det overordnede element også skulle gendannes.',
diff --git a/lang/de/activities.php b/lang/de/activities.php
index b2fb996f114..dd8a6ecf1f7 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
 
     // API Tokens
-    'api_token_create' => 'hat API-Token erzeugt:',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-Token erfolgreich erstellt',
-    'api_token_update' => 'hat API-Token aktualisiert:',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-Token erfolgreich aktualisiert',
-    'api_token_delete' => 'hat API-Token gelöscht:',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-Token erfolgreich gelöscht',
 
     // Roles
diff --git a/lang/de/common.php b/lang/de/common.php
index 5934e1e7194..eebecc13c03 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'cover_image' => 'Titelbild',
-    'cover_image_description' => 'Das Bild sollte eine Auflösung von ca. 440x250px haben.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Aktionen',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index 230dc29f6df..aba76c2d595 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabelleneigenschaften',
     'table_properties_title' => 'Tabelleneigenschaften',
     'delete_table' => 'Tabelle löschen',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Zeile davor einfügen',
     'insert_row_after' => 'Zeile danach einfügen',
     'delete_row' => 'Zeile löschen',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 0b46b41f398..fd926b3a975 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-Datei',
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
+    'default_template' => 'Standard Seitenvorlage',
+    'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
+    'default_template_select' => 'Wählen Sie eine Seitenvorlage',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Buch ":bookName" bearbeiten',
     'books_form_book_name' => 'Name des Buches',
     'books_save' => 'Buch speichern',
-    'books_default_template' => 'Standard Seitentemplate',
-    'books_default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle neuen Seiten in diesem Buch verwendet wird. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller einer Seite Zugriff auf die ausgewählte Template-Seite hat.',
-    'books_default_template_select' => 'Template-Seite auswählen',
     'books_permissions' => 'Buch-Berechtigungen',
     'books_permissions_updated' => 'Buch-Berechtigungen aktualisiert',
     'books_empty_contents' => 'Es sind noch keine Seiten oder Kapitel zu diesem Buch hinzugefügt worden.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Seitenentwurf löschen',
     'pages_delete_success' => 'Seite gelöscht',
     'pages_delete_draft_success' => 'Seitenentwurf gelöscht',
-    'pages_delete_warning_template' => 'Diese Seite wird aktiv als Standardvorlage für Seiten in diesem Buch verwendet. Diese Bücher haben nach dem Löschen dieser Seite keine Standardvorlage mehr zugewiesen.',
+    'pages_delete_warning_template' => 'Diese Seite wird aktiv als Standardvorlage für Bücher oder Kapitel verwendet. In diesen Büchern oder Kapiteln wird nach dem Löschen dieser Seite keine Standardvorlage mehr zugewiesen sein.',
     'pages_delete_confirm' => 'Sind Sie sicher, dass Sie diese Seite löschen möchen?',
     'pages_delete_draft_confirm' => 'Sind Sie sicher, dass Sie diesen Seitenentwurf löschen möchten?',
     'pages_editing_named' => 'Seite ":pageName" bearbeiten',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 2fd34c00d21..08332295202 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ein Benutzer mit der E-Mail-Adresse :email ist bereits mit anderen Anmeldedaten registriert.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Die E-Mail-Adresse ist bereits bestätigt. Bitte melden Sie sich an.',
     'email_confirmation_invalid' => 'Der Bestätigungslink ist nicht gültig oder wurde bereits verwendet. Bitte registrieren Sie sich erneut.',
     'email_confirmation_expired' => 'Der Bestätigungslink ist abgelaufen. Es wurde eine neue Bestätigungs-E-Mail gesendet.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Die Anfrage vom externen Authentifizierungssystem wird von einem von dieser Anwendung gestarteten Prozess nicht erkannt. Das Zurückgehen nach einer Anmeldung könnte dieses Problem verursachen.',
     'saml_fail_authed' => 'Anmeldung mit :system fehlgeschlagen, System konnte keine erfolgreiche Autorisierung bereitstellen',
     'oidc_already_logged_in' => 'Bereits angemeldet',
-    'oidc_user_not_registered' => 'Der Benutzer :name ist nicht registriert und die automatische Registrierung ist deaktiviert',
     'oidc_no_email_address' => 'Es konnte keine E-Mail-Adresse für diesen Benutzer in den vom externen Authentifizierungssystem zur Verfügung gestellten Daten gefunden werden',
     'oidc_fail_authed' => 'Anmeldung mit :system fehlgeschlagen, System konnte keine erfolgreiche Autorisierung bereitstellen',
     'social_no_action_defined' => 'Es ist keine Aktion definiert',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 8769a825344..eab0bb15352 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -110,7 +110,7 @@
     'recycle_bin_contents_empty' => 'Der Papierkorb ist derzeit leer',
     'recycle_bin_empty' => 'Papierkorb leeren',
     'recycle_bin_empty_confirm' => 'Dies wird alle Gegenstände im Papierkorb dauerhaft entfernen, einschließlich der Inhalte, die darin enthalten sind. Sind Sie sicher, dass Sie den Papierkorb leeren möchten?',
-    'recycle_bin_destroy_confirm' => 'Diese Aktion wird dieses Element zusammen mit allen unten aufgeführten Unterelementen dauerhaft aus dem System löschen und Sie werden nicht in der Lage sein, diesen Inhalt wiederherzustellen. Sind Sie sicher, dass Sie dieses Element endgültig löschen möchten?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Zu löschende Elemente',
     'recycle_bin_restore_list' => 'Zu wiederherzustellende Elemente',
     'recycle_bin_restore_confirm' => 'Mit dieser Aktion wird das gelöschte Element einschließlich aller untergeordneten Elemente an seinen ursprünglichen Ort wiederherstellen. Wenn der ursprüngliche Ort gelöscht wurde und sich nun im Papierkorb befindet, muss auch das übergeordnete Element wiederhergestellt werden.',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index a176a75f75d..a24297f3149 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
 
     // API Tokens
-    'api_token_create' => 'hat API-Token erzeugt:',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-Token erfolgreich erstellt',
-    'api_token_update' => 'hat API-Token aktualisiert:',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-Token erfolgreich aktualisiert',
-    'api_token_delete' => 'hat API-Token gelöscht:',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-Token erfolgreich gelöscht',
 
     // Roles
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index 9014f4b2f3e..c8e1c576dee 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'cover_image' => 'Titelbild',
-    'cover_image_description' => 'Das Bild sollte eine Auflösung von 440x250px haben.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Aktionen',
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 314961088ed..65fdacb49ed 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabelleneigenschaften',
     'table_properties_title' => 'Tabelleneigenschaften',
     'delete_table' => 'Tabelle löschen',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Zeile oberhalb einfügen',
     'insert_row_after' => 'Zeile unterhalb einfügen',
     'delete_row' => 'Zeile löschen',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 43842a55d16..9ed27c9d183 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-Datei',
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
+    'default_template' => 'Standard Seitenvorlage',
+    'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
+    'default_template_select' => 'Wähle eine Seitenvorlage',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Buch ":bookName" bearbeiten',
     'books_form_book_name' => 'Name des Buches',
     'books_save' => 'Buch speichern',
-    'books_default_template' => 'Standard Seitentemplate',
-    'books_default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle neuen Seiten in diesem Buch verwendet wird. Beachte, dass dies nur dann verwendet wird, wenn der Ersteller einer Seite Zugriff auf die ausgewählte Template-Seite hat.',
-    'books_default_template_select' => 'Template-Seite auswählen',
     'books_permissions' => 'Buch-Berechtigungen',
     'books_permissions_updated' => 'Buch-Berechtigungen aktualisiert',
     'books_empty_contents' => 'Es sind noch keine Seiten oder Kapitel zu diesem Buch hinzugefügt worden.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Seitenentwurf löschen',
     'pages_delete_success' => 'Seite gelöscht',
     'pages_delete_draft_success' => 'Seitenentwurf gelöscht',
-    'pages_delete_warning_template' => 'Diese Seite wird aktiv als Standardvorlage für Seiten in diesem Buch verwendet. Diese Bücher haben nach dem Löschen dieser Seite keine Standardvorlage mehr zugewiesen.',
+    'pages_delete_warning_template' => 'Diese Seite wird aktiv als Standardvorlage für Bücher oder Kapitel verwendet. In diesen Büchern oder Kapiteln wird nach dem Löschen dieser Seite keine Standardvorlage mehr zugewiesen sein.',
     'pages_delete_confirm' => 'Bist du sicher, dass du diese Seite löschen möchtest?',
     'pages_delete_draft_confirm' => 'Bist du sicher, dass du diesen Seitenentwurf löschen möchtest?',
     'pages_editing_named' => 'Seite ":pageName" bearbeiten',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index ad7a36d23d9..b527d3f7a0e 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ein Benutzer mit der E-Mail-Adresse :email ist bereits mit anderen Anmeldedaten registriert.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Die E-Mail-Adresse ist bereits bestätigt. Bitte melde dich an.',
     'email_confirmation_invalid' => 'Der Bestätigungslink ist nicht gültig oder wurde bereits verwendet. Bitte registriere dich erneut.',
     'email_confirmation_expired' => 'Der Bestätigungslink ist abgelaufen. Es wurde eine neue Bestätigungs-E-Mail gesendet.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Die Anfrage vom externen Authentifizierungssystem wird von einem von dieser Anwendung gestarteten Prozess nicht erkannt. Das Zurückblättern nach einem Login könnte dieses Problem verursachen.',
     'saml_fail_authed' => 'Anmeldung mit :system fehlgeschlagen, System konnte keine erfolgreiche Autorisierung bereitstellen',
     'oidc_already_logged_in' => 'Bereits angemeldet',
-    'oidc_user_not_registered' => 'Der Benutzer :name ist nicht registriert und die automatische Registrierung ist deaktiviert',
     'oidc_no_email_address' => 'Es konnte keine E-Mail-Adresse für diesen Benutzer in den vom externen Authentifizierungssystem bereitgestellten Daten gefunden werden',
     'oidc_fail_authed' => 'Anmeldung mit :system fehlgeschlagen, System hat keine erfolgreiche Autorisierung geliefert',
     'social_no_action_defined' => 'Es ist keine Aktion definiert',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 5cd8982404d..7bb48bdd138 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -110,7 +110,7 @@
     'recycle_bin_contents_empty' => 'Der Papierkorb ist derzeit leer',
     'recycle_bin_empty' => 'Papierkorb leeren',
     'recycle_bin_empty_confirm' => 'Dies wird alle Einträge im Papierkorb dauerhaft entfernen, einschließlich der Inhalte, die darin enthalten sind. Bist du sicher, dass du den Papierkorb leeren möchtest?',
-    'recycle_bin_destroy_confirm' => 'Diese Aktion wird diesen Eintrag zusammen mit allen unten aufgeführten Untereinträgen dauerhaft aus dem System löschen und du wirst nicht in der Lage sein, diesen Inhalt wiederherzustellen. Bist du sicher, dass du diesen Eintrag endgültig löschen möchtest?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Zu löschende Einträge',
     'recycle_bin_restore_list' => 'Wiederherzustellende Einträge',
     'recycle_bin_restore_confirm' => 'Mit dieser Aktion wird der gelöschte Eintrag einschließlich aller untergeordneten Einträge an seinem ursprünglichen Ort wiederhergestellt. Wenn der ursprüngliche Ort gelöscht wurde und sich nun im Papierkorb befindet, muss auch der übergeordnete Eintrag wiederhergestellt werden.',
diff --git a/lang/el/activities.php b/lang/el/activities.php
index 3bb66da8b1e..50bd7bb2ebe 100644
--- a/lang/el/activities.php
+++ b/lang/el/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Ο Χρήστης αφαιρέθηκε επιτυχώς',
 
     // API Tokens
-    'api_token_create' => 'δημιουργήθηκε κωδικός API',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'O κωδικός API δημιουργήθηκε με επιτυχία',
-    'api_token_update' => 'κωδικός API ενημερώθηκε',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'κωδικός API ενημερώθηκε με επιτυχία',
-    'api_token_delete' => 'διαγραμμένο api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Το διακριτικό API διαγράφηκε με επιτυχία',
 
     // Roles
diff --git a/lang/el/common.php b/lang/el/common.php
index c9d38d5fd14..a644bc4a1ce 100644
--- a/lang/el/common.php
+++ b/lang/el/common.php
@@ -20,7 +20,7 @@
     'description' => 'Περιγραφή',
     'role' => 'Ρόλος',
     'cover_image' => 'Εικόνα εξώφυλλου',
-    'cover_image_description' => 'Αυτή η εικόνα πρέπει να είναι περίπου 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Ενέργειες',
diff --git a/lang/el/editor.php b/lang/el/editor.php
index c011a5ac8fb..0d801e82182 100644
--- a/lang/el/editor.php
+++ b/lang/el/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Ιδιότητες πίνακα',
     'table_properties_title' => 'Ιδιότητες πίνακα',
     'delete_table' => 'Διαγραφή πίνακα',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Εισαγωγή γραμμής πάνω',
     'insert_row_after' => 'Εισαγωγή γραμμής κάτω',
     'delete_row' => 'Διαγραφή γραμμής',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index 8aabdda0aa1..2170d69cf47 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Αρχείο PDF',
     'export_text' => 'Αρχείο Απλού κειμένου',
     'export_md' => 'Αρχείο Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Δικαιώματα',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Επεξεργασία Βιβλίου :bookname',
     'books_form_book_name' => 'Όνομα Βιβλίου',
     'books_save' => 'Αποθήκευση Βιβλίου',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Άδειες Βιβλίου',
     'books_permissions_updated' => 'Τα Δικαιώματα Βιβλίου Ενημερώθηκαν',
     'books_empty_contents' => 'Δεν έχουν δημιουργηθεί σελίδες ή κεφάλαια για αυτό το βιβλίο.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Διαγραφή Προσχέδιας Σελίδας',
     'pages_delete_success' => 'Η σελίδα διαγράφηκε',
     'pages_delete_draft_success' => 'Η προσχέδια (πρόχειρη) σελίδα διαγράφηκε',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή τη σελίδα;',
     'pages_delete_draft_confirm' => 'Θέλετε σίγουρα να διαγράψετε την προσχέδια σελίδα;',
     'pages_editing_named' => 'Επεξεργασία Σελίδας :pageName',
diff --git a/lang/el/errors.php b/lang/el/errors.php
index efb20b1b660..93b8dd45a02 100644
--- a/lang/el/errors.php
+++ b/lang/el/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ένας χρήστης με email :email υπάρχει ήδη αλλά με διαφορετικά διαπιστευτήρια.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Το email έχει ήδη επιβεβαιωθεί, Δοκιμάστε να συνδεθείτε.',
     'email_confirmation_invalid' => 'Αυτό το διακριτικό επιβεβαίωσης δεν είναι έγκυρο ή έχει ήδη χρησιμοποιηθεί, Παρακαλώ δοκιμάστε να εγγραφείτε ξανά.',
     'email_confirmation_expired' => 'Το διακριτικό επιβεβαίωσης έχει λήξει, έχει σταλεί ένα νέο email επιβεβαίωσης.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Το αίτημα από το εξωτερικό σύστημα ελέγχου ταυτότητας δεν αναγνωρίζεται από μια διαδικασία που ξεκίνησε από αυτή την εφαρμογή. Η πλοήγηση πίσω μετά από μια σύνδεση θα μπορούσε να προκαλέσει αυτό το ζήτημα.',
     'saml_fail_authed' => 'Η σύνδεση με τη χρήση :system απέτυχε, το σύστημα δεν παρείχε επιτυχή εξουσιοδότηση',
     'oidc_already_logged_in' => 'Ήδη συνδεδεμένος',
-    'oidc_user_not_registered' => 'Ο χρήστης :name δεν είναι εγγεγραμμένος και η αυτόματη εγγραφή είναι απενεργοποιημένη',
     'oidc_no_email_address' => 'Δεν ήταν δυνατή η εύρεση μιας διεύθυνσης ηλεκτρονικού ταχυδρομείου, για αυτόν τον χρήστη, στα δεδομένα που παρέχονται από το εξωτερικό σύστημα ελέγχου ταυτότητας',
     'oidc_fail_authed' => 'Η σύνδεση με τη χρήση :system απέτυχε, το σύστημα δεν παρείχε επιτυχή εξουσιοδότηση',
     'social_no_action_defined' => 'Καμία ενέργεια δεν ορίστηκε',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 0c3497e64ef..43a27b13b65 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Ο κάδος ανακύκλωσης είναι επί του παρόντος άδειος',
     'recycle_bin_empty' => 'Αδειάστε τον Κάδο Ανακύκλωσης',
     'recycle_bin_empty_confirm' => 'Αυτό θα καταστρέψει οριστικά όλα τα αντικείμενα στον κάδο ανακύκλωσης, συμπεριλαμβανομένου του περιεχομένου που περιέχεται σε κάθε αντικείμενο. Είστε βέβαιοι ότι θέλετε να αδειάσετε τον κάδο ανακύκλωσης;',
-    'recycle_bin_destroy_confirm' => 'Αυτή η ενέργεια θα διαγράψει οριστικά από το σύστημα αυτό το στοιχείο μαζί με τυχόν θυγατρικά, που αναφέρονται παρακάτω. Μετά την επιβεβαίωση της διαγραφής δεν θα μπορείτε να επαναφέρετε αυτό το περιεχόμενο. Είστε βέβαιοι ότι θέλετε να διαγράψετε οριστικά αυτό το στοιχείο;',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Αντικείμενα για καταστροφή',
     'recycle_bin_restore_list' => 'Αντικείμενα για επαναφορά',
     'recycle_bin_restore_confirm' => 'Αυτή η ενέργεια θα επαναφέρει το διαγραμμένο στοιχείο, συμπεριλαμβανομένων τυχόν θυγατρικών στοιχείων, στην αρχική τους θέση. Εάν η αρχική τοποθεσία έχει από τότε διαγραφεί και βρίσκεται τώρα στον κάδο ανακύκλωσης, θα πρέπει επίσης να αποκατασταθεί και το γονικό στοιχείο.',
diff --git a/lang/es/activities.php b/lang/es/activities.php
index a8325821227..bd1e0dbd02e 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Usuario eliminado correctamente',
 
     // API Tokens
-    'api_token_create' => 'token de api creado',
+    'api_token_create' => 'token de API creado',
     'api_token_create_notification' => 'Token API creado correctamente',
-    'api_token_update' => 'token de api actualizado',
+    'api_token_update' => 'token de API actualizado',
     'api_token_update_notification' => 'Token API actualizado correctamente',
-    'api_token_delete' => 'token de api borrado',
+    'api_token_delete' => 'token de API borrado',
     'api_token_delete_notification' => 'Token API borrado correctamente',
 
     // Roles
diff --git a/lang/es/common.php b/lang/es/common.php
index 6295c598713..c0a1a75a751 100644
--- a/lang/es/common.php
+++ b/lang/es/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descripción',
     'role' => 'Rol',
     'cover_image' => 'Imagen de portada',
-    'cover_image_description' => 'Esta imagen debe ser aproximadamente de 440x250px.',
+    'cover_image_description' => 'Esta imagen debe ser de aproximadamente 440x250px aunque será escalada y recortada para adaptarse a la interfaz de usuario en diferentes escenarios según sea necesario, por lo que las dimensiones en pantalla diferirán.',
 
     // Actions
     'actions' => 'Acciones',
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 1284cad6187..1f9f663fa63 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propiedades de tabla',
     'table_properties_title' => 'Propiedades de Tabla',
     'delete_table' => 'Eliminar tabla',
+    'table_clear_formatting' => 'Limpiar formato de tabla',
+    'resize_to_contents' => 'Redimensionar al contenido',
+    'row_header' => 'Fila de cabecera',
     'insert_row_before' => 'Insertar fila arriba',
     'insert_row_after' => 'Insertar fila abajo',
     'delete_row' => 'Eliminar fila',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 82cf3e69217..d77323486ed 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Archivo PDF',
     'export_text' => 'Archivo de texto',
     'export_md' => 'Archivo Markdown',
+    'default_template' => 'Plantilla de página por defecto',
+    'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la plantilla de página elegida.',
+    'default_template_select' => 'Seleccione una página de plantilla',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editar Libro :bookName',
     'books_form_book_name' => 'Nombre de libro',
     'books_save' => 'Guardar libro',
-    'books_default_template' => 'Plantilla de página por defecto',
-    'books_default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas nuevas de este libro. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la página elegida.',
-    'books_default_template_select' => 'Seleccione una página de plantilla',
     'books_permissions' => 'Permisos del libro',
     'books_permissions_updated' => 'Permisos del libro actualizados',
     'books_empty_contents' => 'Ninguna página o capítulo ha sido creada para este libro.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Borrar borrador de página',
     'pages_delete_success' => 'Página borrada',
     'pages_delete_draft_success' => 'Borrador de página borrado',
-    'pages_delete_warning_template' => 'Esta página está en uso como plantilla de página predeterminada del libro. Estos libros ya no tendrán una plantilla de página predeterminada asignada después de eliminar esta página.',
+    'pages_delete_warning_template' => 'Esta página está en uso como plantilla de página predeterminada de libro o capítulo. Estos libros o capítulos ya no tendrán una plantilla de página predeterminada asignada después de eliminar esta página.',
     'pages_delete_confirm' => '¿Está seguro de borrar esta página?',
     'pages_delete_draft_confirm' => '¿Está seguro de que desea borrar este borrador de página?',
     'pages_editing_named' => 'Editando página :pageName',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index 9fb7afba469..1bf7db13247 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un usuario con el correo electrónico :email ya existe pero con credenciales diferentes.',
+    'auth_pre_register_theme_prevention' => 'La cuenta de usuario no pudo ser registrada con los detalles proporcionados',
     'email_already_confirmed' => 'El correo electrónico ya ha sido confirmado, intente acceder a la aplicación.',
     'email_confirmation_invalid' => 'Este token de confirmación no es válido o ya ha sido usado, intente registrar uno nuevamente.',
     'email_confirmation_expired' => 'El token de confirmación ha expirado, un nuevo email de confirmacón ha sido enviado.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'La solicitud del sistema de autenticación externo no está reconocida por un proceso iniciado por esta aplicación. Navegar hacia atrás después de un inicio de sesión podría causar este problema.',
     'saml_fail_authed' => 'El inicio de sesión con :system falló, el sistema no proporcionó una autorización correcta',
     'oidc_already_logged_in' => 'Ya tenías la sesión iniciada',
-    'oidc_user_not_registered' => 'El usuario :name no está registrado y el registro automático está deshabilitado',
     'oidc_no_email_address' => 'No se pudo encontrar una dirección de correo electrónico, para este usuario, en los datos proporcionados por el sistema de autenticación externo',
     'oidc_fail_authed' => 'El inicio de sesión con :system falló, el sistema no proporcionó una autorización correcta',
     'social_no_action_defined' => 'Acción no definida',
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index 760652e48da..41c26d2c4bd 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -97,7 +97,7 @@
     'api_token_create_notification' => 'Token de API creado correctamente',
     'api_token_update' => 'token de API actualizado',
     'api_token_update_notification' => 'Token de API actualizado correctamente',
-    'api_token_delete' => 'token de API eliminado',
+    'api_token_delete' => 'token de API borrado',
     'api_token_delete_notification' => 'Token de API eliminado correctamente',
 
     // Roles
diff --git a/lang/es_AR/common.php b/lang/es_AR/common.php
index bc95a4fcfcb..73a2664043f 100644
--- a/lang/es_AR/common.php
+++ b/lang/es_AR/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descripción',
     'role' => 'Rol',
     'cover_image' => 'Imagen de cubierta',
-    'cover_image_description' => 'Esta imagen debe ser de 440x250px aproximadamente.',
+    'cover_image_description' => 'Esta imagen debe ser de aproximadamente 440x250px aunque será escalada y recortada para adaptarse a la interfaz de usuario en diferentes escenarios según sea necesario, por lo que las dimensiones en pantalla diferirán.',
 
     // Actions
     'actions' => 'Acciones',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index df453f2f771..52563e4bc8e 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propiedades de tabla',
     'table_properties_title' => 'Propiedades de Tabla',
     'delete_table' => 'Eliminar tabla',
+    'table_clear_formatting' => 'Limpiar formato de tabla',
+    'resize_to_contents' => 'Redimensionar al contenido',
+    'row_header' => 'Fila de cabecera',
     'insert_row_before' => 'Insertar fila arriba',
     'insert_row_after' => 'Insertar fila abajo',
     'delete_row' => 'Eliminar fila',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index 3afb54bcda0..253feae042e 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Archivo PDF',
     'export_text' => 'Archivo de texto plano',
     'export_md' => 'Archivo Markdown',
+    'default_template' => 'Plantilla de página por defecto',
+    'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la plantilla de página elegida.',
+    'default_template_select' => 'Seleccione una página de plantilla',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editar Libro :bookName',
     'books_form_book_name' => 'Nombre de libro',
     'books_save' => 'Guardar libro',
-    'books_default_template' => 'Plantilla de página por defecto',
-    'books_default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas nuevas de este libro. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la página elegida.',
-    'books_default_template_select' => 'Seleccione una página de plantilla',
     'books_permissions' => 'permisos de libro',
     'books_permissions_updated' => 'Permisos de libro actualizados',
     'books_empty_contents' => 'Ninguna página o capítulo ha sido creada para este libro.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Borrar borrador de página',
     'pages_delete_success' => 'Página borrada',
     'pages_delete_draft_success' => 'Borrador de página borrado',
-    'pages_delete_warning_template' => 'Esta página está en uso como plantilla de página predeterminada del libro. Estos libros ya no tendrán una plantilla de página predeterminada asignada después de eliminar esta página.',
+    'pages_delete_warning_template' => 'Esta página está en uso como plantilla de página predeterminada de libro o capítulo. Estos libros o capítulos ya no tendrán una plantilla de página predeterminada asignada después de eliminar esta página.',
     'pages_delete_confirm' => '¿Está seguro de borrar esta página?',
     'pages_delete_draft_confirm' => 'Está seguro de que desea borrar este borrador de página?',
     'pages_editing_named' => 'Editando página :pageName',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index e784b5092b2..922bcd1dbe0 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un usuario con el email :email ya existe pero con credenciales diferentes.',
+    'auth_pre_register_theme_prevention' => 'La cuenta de usuario no pudo ser registrada con los detalles proporcionados',
     'email_already_confirmed' => 'El email ya ha sido confirmado, Intente loguearse en la aplicación.',
     'email_confirmation_invalid' => 'Este token de confirmación no e válido o ya ha sido usado,Intente registrar uno nuevamente.',
     'email_confirmation_expired' => 'El token de confirmación ha expirado, Un nuevo email de confirmacón ha sido enviado.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'La solicitud del sistema de autenticación externo no está reconocida por un proceso iniciado por esta aplicación. Navegar hacia atrás después de un inicio de sesión podría causar este problema.',
     'saml_fail_authed' => 'El inicio de sesión con :system falló, el sistema no proporcionó una autorización correcta',
     'oidc_already_logged_in' => 'Ya está conectado',
-    'oidc_user_not_registered' => 'El usuario :name no está registrado y el registro automático está deshabilitado',
     'oidc_no_email_address' => 'No se pudo encontrar una dirección de correo electrónico para este usuario en los datos proporcionados por el sistema de autenticación externo',
     'oidc_fail_authed' => 'El inicio de sesión con :system falló, el sistema no proporcionó una autorización correcta',
     'social_no_action_defined' => 'Acción no definida',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 7c1cba813d4..344a9c87bc5 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'La papelera de reciclaje está vacía',
     'recycle_bin_empty' => 'Vaciar Papelera de reciclaje',
     'recycle_bin_empty_confirm' => 'Esto destruirá permanentemente todos los elementos de la papelera de reciclaje, incluyendo el contenido existente en cada elemento. ¿Está seguro de que desea vaciar la papelera de reciclaje?',
-    'recycle_bin_destroy_confirm' => 'Esta acción eliminará permanentemente este elemento del sistema, junto con los elementos secundarios listados a continuación, y no podrá restaurar este contenido. ¿Está seguro de que desea eliminar permanentemente este elemento?',
+    'recycle_bin_destroy_confirm' => 'Esta acción eliminará permanentemente este elemento del sistema, junto con los elementos secundarios listados a continuación, y no podrá restaurar este contenido de nuevo. ¿Está seguro de que desea eliminar permanentemente este elemento?',
     'recycle_bin_destroy_list' => 'Elementos a destruir',
     'recycle_bin_restore_list' => 'Elementos a restaurar',
     'recycle_bin_restore_confirm' => 'Esta acción restaurará el elemento eliminado, incluyendo cualquier elemento secundario, a su ubicación original. Si la ubicación original ha sido eliminada, y ahora está en la papelera de reciclaje, el elemento padre también tendrá que ser restaurado.',
diff --git a/lang/et/activities.php b/lang/et/activities.php
index 46812551023..a8c339030bc 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Kasutaja on kustutatud',
 
     // API Tokens
-    'api_token_create' => 'lisas API tunnuse',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API tunnus on lisatud',
-    'api_token_update' => 'muutis API tunnust',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API tunnus on muudetud',
-    'api_token_delete' => 'kustutas API tunnuse',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API tunnus on kustutatud',
 
     // Roles
diff --git a/lang/et/common.php b/lang/et/common.php
index 465a1a40508..9dfcf7de812 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -20,7 +20,7 @@
     'description' => 'Kirjeldus',
     'role' => 'Roll',
     'cover_image' => 'Kaanepilt',
-    'cover_image_description' => 'See pilt peaks olema umbes 440x250 pikslit.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Tegevused',
diff --git a/lang/et/editor.php b/lang/et/editor.php
index fecff9af9fe..832cd8d4aca 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabeli omadused',
     'table_properties_title' => 'Tabeli omadused',
     'delete_table' => 'Kustuta tabel',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Sisesta rida enne',
     'insert_row_after' => 'Sisesta rida pärast',
     'delete_row' => 'Kustuta rida',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index cd9606c636a..1a62e2c6a9c 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF fail',
     'export_text' => 'Tekstifail',
     'export_md' => 'Markdown fail',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Muuda raamatut :bookName',
     'books_form_book_name' => 'Raamatu pealkiri',
     'books_save' => 'Salvesta raamat',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Raamatu õigused',
     'books_permissions_updated' => 'Raamatu õigused muudetud',
     'books_empty_contents' => 'Ühtegi lehte ega peatükki pole lisatud.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Kustuta mustand',
     'pages_delete_success' => 'Leht kustutatud',
     'pages_delete_draft_success' => 'Mustand kustutatud',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Kas oled kindel, et soovid selle lehe kustutada?',
     'pages_delete_draft_confirm' => 'Kas oled kindel, et soovid selle mustandi kustutada?',
     'pages_editing_named' => 'Lehe :pageName muutmine',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 56e8c9cd6de..9868227269f 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'See e-posti aadress on juba seotud teise kasutajaga.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-posti aadress on juba kinnitatud. Proovi sisse logida.',
     'email_confirmation_invalid' => 'Kinnituslink ei ole kehtiv või on seda juba kasutatud. Proovi uuesti registreeruda.',
     'email_confirmation_expired' => 'Kinnituslink on aegunud. Sulle saadeti aadressi kinnitamiseks uus e-kiri.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Välisest autentimissüsteemist tulnud päringut ei algatatud sellest rakendusest. Seda viga võib põhjustada pärast sisselogimist tagasi liikumine.',
     'saml_fail_authed' => 'Sisenemine :system kaudu ebaõnnestus, süsteem ei andnud volitust',
     'oidc_already_logged_in' => 'Juba sisse logitud',
-    'oidc_user_not_registered' => 'Kasutaja :name ei ole registreeritud ning automaatne registreerimine on keelatud',
     'oidc_no_email_address' => 'Selle kasutaja e-posti aadressi ei õnnestunud välisest autentimissüsteemist leida',
     'oidc_fail_authed' => 'Sisenemine :system kaudu ebaõnnestus, süsteem ei andnud volitust',
     'social_no_action_defined' => 'Tegevus on defineerimata',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 01822ed81d9..3eefefe563d 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Prügikast on hetkel tühi',
     'recycle_bin_empty' => 'Tühjenda prügikast',
     'recycle_bin_empty_confirm' => 'See kustutab lõplikult kõik objektid prügikastis, kaasa arvatud nende sisu. Kas oled kindel, et soovid prügikasti tühjendada?',
-    'recycle_bin_destroy_confirm' => 'See kustutab lõplikult valitud objekti koos loetletud alamobjektidega, ja seda sisu ei ole enam võimalik taastada. Kas oled kindel, et soovid selle objekti kustutada?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Kustutatavad objektid',
     'recycle_bin_restore_list' => 'Taastatavad objektid',
     'recycle_bin_restore_confirm' => 'See taastab valitud objekti koos kõigi alamobjektidega nende algsesse asukohta. Kui see asukoht on ka vahepeal kustutatud ja on nüüd prügikastis, tuleb ka see taastada.',
diff --git a/lang/eu/activities.php b/lang/eu/activities.php
index 2e9f586a838..15e11c47618 100644
--- a/lang/eu/activities.php
+++ b/lang/eu/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Erabiltzailea egoki ezabatua',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/eu/common.php b/lang/eu/common.php
index e2de6ae9f81..694a210d496 100644
--- a/lang/eu/common.php
+++ b/lang/eu/common.php
@@ -20,7 +20,7 @@
     'description' => 'Deskribapena',
     'role' => 'Rola',
     'cover_image' => 'Azaleko irudia',
-    'cover_image_description' => 'Irudiaren tamaina 440x250px antzekoa izan beharko litzake.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Ekintzak',
diff --git a/lang/eu/editor.php b/lang/eu/editor.php
index 6972b991eb2..161cb3b27a4 100644
--- a/lang/eu/editor.php
+++ b/lang/eu/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Taularen propietateak',
     'table_properties_title' => 'Taularen propietateak',
     'delete_table' => 'Ezabatu taula',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index d3582283f4f..b0abcb80846 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF fitxategia',
     'export_text' => 'Testu lauko fitxategiak',
     'export_md' => 'Markdown fitxategia',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Baimenak',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editatu :bookName liburua',
     'books_form_book_name' => 'Liburu izena',
     'books_save' => 'Gorde Liburua',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Liburu baimenak',
     'books_permissions_updated' => 'Liburu baimenak eguneratuta',
     'books_empty_contents' => 'Ez da orri edo kapitulurik sortu liburu honentzat.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Orria ezabatua',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ziur al zaude orri hau ezabatu nahi duzula?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',
diff --git a/lang/eu/errors.php b/lang/eu/errors.php
index 2244e0142cd..61d50d8b1d5 100644
--- a/lang/eu/errors.php
+++ b/lang/eu/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':email kontuakin erabiltzaile bat badago, baina kredentzial ezberdinekin.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email kontua berretsita dago, saiatu saioa hasten.',
     'email_confirmation_invalid' => 'Berrezpen token hau ez da baliozkoa eta iada erabiltzen da, mesedez, saiatu berriz erregistroa burutzen.',
     'email_confirmation_expired' => 'Berrezpen tokena iraungi da, berrezpen email berri bnat bidali da.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Kanpoko egiazkotasun-sistemaren eskaria ez du onartzen aplikazio honek abiarazitako prozesu batek. Loginean atzera egitea izan daiteke arrazoia.',
     'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'oidc_already_logged_in' => 'Dagoeneko saioa hasita',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'No action defined',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 0e6fa244419..441e53bd58f 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Zakarrontzia hutsik dago',
     'recycle_bin_empty' => 'Hustu Zakarrontzia',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Ezabatuko diren elementuak',
     'recycle_bin_restore_list' => 'Berrezarriko diren elementuak',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index 7b536bf2dc5..adc38024978 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -93,7 +93,7 @@
     'user_delete_notification' => 'کاربر با موفقیت حذف شد',
 
     // API Tokens
-    'api_token_create' => 'توکن api ایجاد شده',
+    'api_token_create' => 'ایجاد توکن API',
     'api_token_create_notification' => 'توکن api با موفقیت ایجاد شد',
     'api_token_update' => 'توکن api بروز شده',
     'api_token_update_notification' => 'توکن API با موفقیت بروزرسانی شد',
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 1f1fa688393..97f808f2ab3 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -20,7 +20,7 @@
     'description' => 'توضیحات',
     'role' => 'نقش',
     'cover_image' => 'تصویر روی جلد',
-    'cover_image_description' => 'سایز تصویر باید 440x250 باشد.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'عملیات',
diff --git a/lang/fa/components.php b/lang/fa/components.php
index 90681d3b66e..576a50ccac2 100644
--- a/lang/fa/components.php
+++ b/lang/fa/components.php
@@ -18,7 +18,7 @@
     'image_search_hint' => 'جستجو بر اساس نام تصویر',
     'image_uploaded' => 'بارگذاری شده :uploadedDate',
     'image_uploaded_by' => 'بارگذاری شده توسط:userName',
-    'image_uploaded_to' => 'بارگذاری شده در صفحه:pageLink',
+    'image_uploaded_to' => 'بارگذاری شده در صفحه :pageLink',
     'image_updated' => 'به‌روزرسانی شده در:updateDate',
     'image_load_more' => 'بارگذاری بیشتر',
     'image_image_name' => 'نام تصویر',
diff --git a/lang/fa/editor.php b/lang/fa/editor.php
index 3e0be53b85f..89d163de0eb 100644
--- a/lang/fa/editor.php
+++ b/lang/fa/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'تنظیمات جدول',
     'table_properties_title' => 'تنظیمات جدول',
     'delete_table' => 'حذف جدول',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'افزودن سطر به قبل',
     'insert_row_after' => 'افزودن سطر به بعد',
     'delete_row' => 'حذف سطر',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index bbdbe5b6afa..38443cf339f 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'به روزرسانی شده :timeLength',
     'meta_updated_name' => 'به روزرسانی شده :timeLength توسط :user',
     'meta_owned_name' => 'متعلق به :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'در 1 صفحه به آن ارجاع داده شده|در :count صفحه به آن ارجاع داده شده',
     'entity_select' => 'انتخاب موجودیت',
     'entity_select_lack_permission' => 'شما مجوزهای لازم برای انتخاب این مورد را ندارید',
     'images' => 'عکس‌ها',
@@ -39,6 +39,9 @@
     'export_pdf' => 'فایل PDF',
     'export_text' => 'پرونده متنی ساده',
     'export_md' => 'راهنما مارک‌دون',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'مجوزها',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'ویرایش کتاب:bookName',
     'books_form_book_name' => 'نام کتاب',
     'books_save' => 'ذخیره کتاب',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'مجوزهای کتاب',
     'books_permissions_updated' => 'مجوزهای کتاب به روز شد',
     'books_empty_contents' => 'هیچ صفحه یا فصلی برای این کتاب ایجاد نشده است.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'حذف صفحه پیش نویس',
     'pages_delete_success' => 'صفحه حذف شد',
     'pages_delete_draft_success' => 'صفحه پیش نویس حذف شد',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه را حذف کنید؟',
     'pages_delete_draft_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه پیش نویس را حذف کنید؟',
     'pages_editing_named' => 'ویرایش صفحه :pageName',
@@ -409,7 +409,7 @@
     // References
     'references' => 'مراجع',
     'references_none' => 'هیچ رفرنسی برای این قلم یافت نشد.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'در زیر تمام صفحات شناخته شده در سیستم که به این مورد پیوند دارند، نشان داده شده است.',
 
     // Watch Options
     'watch' => 'نظارت',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 6632246dab0..97c631edcab 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'کاربری با ایمیل :email از قبل وجود دارد اما دارای اطلاعات متفاوتی می باشد.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'ایمیل قبلا تایید شده است، وارد سیستم شوید.',
     'email_confirmation_invalid' => 'این کلمه عبور معتبر نمی باشد و یا قبلا استفاده شده است، لطفا دوباره ثبت نام نمایید.',
     'email_confirmation_expired' => 'کلمه عبور منقضی شده است، یک ایمیل تایید جدید ارسال شد.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'درخواست از سیستم احراز هویت خارجی توسط فرایندی که توسط این نرم افزار آغاز شده است شناخته نمی شود. بازگشت به سیستم پس از ورود به سیستم می تواند باعث این مسئله شود.',
     'saml_fail_authed' => 'ورود به سیستم :system انجام نشد، سیستم مجوز موفقیت آمیز ارائه نکرد',
     'oidc_already_logged_in' => 'قبلا وارد شده اید',
-    'oidc_user_not_registered' => 'کاربر :name ثبت نشده و ثبت نام خودکار غیرفعال است',
     'oidc_no_email_address' => 'آدرس ایمیلی برای این کاربر در داده های ارائه شده توسط سیستم احراز هویت خارجی یافت نشد',
     'oidc_fail_authed' => 'ورود به سیستم با استفاده از :system انجام نشد، سیستم مجوز موفقیت آمیز ارائه نکرد',
     'social_no_action_defined' => 'عملی تعریف نشده است',
@@ -52,7 +52,7 @@
     'image_upload_replace_type' => 'جایگزینی فایل تصویری باید از یک نوع باشد',
     'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
     'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'به دلیل محدودیت منابع سیستم، تصاویر کوچک گالری ایجاد نشد.',
     'drawing_data_not_found' => 'داده های طرح قابل بارگذاری نیستند. ممکن است فایل طرح دیگر وجود نداشته باشد یا شما به آن دسترسی نداشته باشید.',
 
     // Attachments
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index c48f4d8e92b..4df6e99a0b8 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'سطل بازیافت در حال حاضر خالی است',
     'recycle_bin_empty' => 'سطل آشغال خالی',
     'recycle_bin_empty_confirm' => 'این کار همه اقلام موجود در سطل بازیافت از جمله محتوای موجود در هر مورد را برای همیشه از بین می برد. آیا مطمئن هستید که می خواهید سطل بازیافت را خالی کنید؟',
-    'recycle_bin_destroy_confirm' => 'این اقدام این مورد را به همراه هر عنصر فرعی فهرست شده در زیر برای همیشه از سیستم حذف می کند و شما نمی توانید این محتوا را بازیابی کنید. آیا مطمئن هستید که می خواهید این مورد را برای همیشه حذف کنید؟',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'مواردی که باید نابود شوند',
     'recycle_bin_restore_list' => 'مواردی که باید بازیابی شوند',
     'recycle_bin_restore_confirm' => 'این اقدام، مورد حذف شده، از جمله هر عنصر فرزند، را به مکان اصلی خود باز می گرداند. اگر مکان اصلی از آن زمان حذف شده باشد، و اکنون در سطل بازیافت است، مورد اصلی نیز باید بازیابی شود.',
diff --git a/lang/fi/activities.php b/lang/fi/activities.php
index 6bb267c707c..878ef5edd3c 100644
--- a/lang/fi/activities.php
+++ b/lang/fi/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Käyttäjä poistettiin onnistuneesti',
 
     // API Tokens
-    'api_token_create' => 'loi API-tunnisteen',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-tunniste luotiin onnistuneesti',
-    'api_token_update' => 'päivitti API-tunnisteen',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-tunniste päivitettiin onnistuneesti',
-    'api_token_delete' => 'poisti API-tunnisteen',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-tunniste poistettiin onnistuneesti',
 
     // Roles
diff --git a/lang/fi/common.php b/lang/fi/common.php
index 76c5cc41f21..6a61f2bb867 100644
--- a/lang/fi/common.php
+++ b/lang/fi/common.php
@@ -20,7 +20,7 @@
     'description' => 'Kuvaus',
     'role' => 'Rooli',
     'cover_image' => 'Kansikuva',
-    'cover_image_description' => 'Kuvan tulee olla noin 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Toiminnot',
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index 7954aa6035f..fa5538c9e0a 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Taulukon ominaisuudet',
     'table_properties_title' => 'Taulukon ominaisuudet',
     'delete_table' => 'Poista taulukko',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Lisää rivi ennen',
     'insert_row_after' => 'Lisää rivi jälkeen',
     'delete_row' => 'Poista rivi',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index dc43388a325..54dfe9a5929 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-tiedosto',
     'export_text' => 'Tekstitiedosto',
     'export_md' => 'Markdown-tiedosto',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Käyttöoikeudet',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Muokkaa kirjaa :bookName',
     'books_form_book_name' => 'Kirjan nimi',
     'books_save' => 'Tallenna kirja',
-    'books_default_template' => 'Oletusmallipohja',
-    'books_default_template_explain' => 'Määritä mallipohja, jota käytetään oletuksena kaikille tämän kirjan uusille sivuille. Muista, että mallipohjaa käytetään vain, jos sivun luojalla on katseluoikeudet valittuun mallipohjaan.',
-    'books_default_template_select' => 'Valitse mallipohja',
     'books_permissions' => 'Kirjan käyttöoikeudet',
     'books_permissions_updated' => 'Kirjan käyttöoikeudet päivitetty',
     'books_empty_contents' => 'Tähän kirjaan ei ole luotu sivuja tai lukuja.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Poista luonnos',
     'pages_delete_success' => 'Sivu poistettu',
     'pages_delete_draft_success' => 'Luonnos poistettu',
-    'pages_delete_warning_template' => 'Tätä sivua käytetään oletusmallipohjana. Näillä kirjoilla ei ole enää oletusmallipohjaa, jos tämä sivu poistetaan.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Oletko varma, että haluat poistaa tämän sivun?',
     'pages_delete_draft_confirm' => 'Haluatko varmasti poistaa tämän luonnoksen?',
     'pages_editing_named' => 'Muokataan sivua :pageName',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index 082cac2427d..ec348f0f223 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Sähköpostiosoite :email on jo käytössä toisessa käyttäjätunnuksessa.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Sähköposti on jo vahvistettu, yritä kirjautua sisään.',
     'email_confirmation_invalid' => 'Tämä vahvistuslinkki ei ole voimassa tai sitä on jo käytetty, yritä rekisteröityä uudelleen.',
     'email_confirmation_expired' => 'Vahvistuslinkki on vanhentunut, uusi vahvistussähköposti on lähetetty.',
@@ -24,7 +25,6 @@
 Sovellus ei tunnista ulkoisen todennuspalvelun pyyntöä. Ongelman voi aiheuttaa siirtyminen selaimessa takaisin edelliseen näkymään kirjautumisen jälkeen.',
     'saml_fail_authed' => 'Sisäänkirjautuminen :system käyttäen epäonnistui, järjestelmä ei antanut valtuutusta',
     'oidc_already_logged_in' => 'Olet jo kirjautunut sisään',
-    'oidc_user_not_registered' => 'Käyttäjää :nimi ei ole rekisteröity ja automaattinen rekisteröinti on pois käytöstä',
     'oidc_no_email_address' => 'Ulkoisen todennuspalvelun antamista tiedoista ei löytynyt tämän käyttäjän sähköpostiosoitetta',
     'oidc_fail_authed' => 'Sisäänkirjautuminen :system käyttäen epäonnistui, järjestelmä ei antanut valtuutusta',
     'social_no_action_defined' => 'Ei määriteltyä toimenpidettä',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index 03517b6e5bc..eceb41d1f49 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Roskakori on tällä hetkellä tyhjä',
     'recycle_bin_empty' => 'Tyhjennä roskakori',
     'recycle_bin_empty_confirm' => 'Tämä tuhoaa pysyvästi kaikki kohteet roskakorissa, mukaan lukien kunkin kohteen sisältämän sisällön. Haluatko varmasti tyhjentää roskakorin?',
-    'recycle_bin_destroy_confirm' => 'Tämä toiminto poistaa tämän kohteen ja kaikki alla luetellut sisältyvät kohteet pysyvästi järjestelmästä, etkä voi enää palauttaa tätä sisältöä. Haluatko varmasti poistaa tämän kohteen pysyvästi?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Poistettavat kohteet',
     'recycle_bin_restore_list' => 'Palautettavat kohteet',
     'recycle_bin_restore_confirm' => 'Tämä toiminto palauttaa poistetun kohteen, mukaan lukien kaikki siihen sisältyvät kohteet, alkuperäiseen sijaintiinsa. Jos alkuperäinen sijainti on sittemmin poistettu ja on nyt roskakorissa, myös sitä koskeva kohde on palautettava.',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 8edbab4b89c..3efb28f8a48 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Utilisateur supprimé avec succès',
 
     // API Tokens
-    'api_token_create' => 'jeton d\'api créé',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Jeton d\'API créé avec succès',
-    'api_token_update' => 'jeton d\'api mis à jour',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Jeton d\'API mis à jour avec succès',
-    'api_token_delete' => 'jeton d\'api supprimé',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Jeton d\'API supprimé avec succès',
 
     // Roles
diff --git a/lang/fr/common.php b/lang/fr/common.php
index 2f54ed7fe15..0651b4d440a 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -20,7 +20,7 @@
     'description' => 'Description',
     'role' => 'Rôle',
     'cover_image' => 'Image de couverture',
-    'cover_image_description' => 'Cette image doit faire environ 440x250 px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Actions',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 78c4157e817..81f97fe75b4 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propriétés du tableau',
     'table_properties_title' => 'Propriétés du tableau',
     'delete_table' => 'Supprimer le tableau',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insérer une ligne avant',
     'insert_row_after' => 'Insérer une ligne après',
     'delete_row' => 'Supprimer ligne',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 32351548b0c..f65cfc0d4cb 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Fichier PDF',
     'export_text' => 'Document texte',
     'export_md' => 'Fichiers Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Autorisations',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Modifier le livre :bookName',
     'books_form_book_name' => 'Nom du livre',
     'books_save' => 'Enregistrer le livre',
-    'books_default_template' => 'Modèle de page par défaut',
-    'books_default_template_explain' => 'Sélectionnez un modèle de page qui sera utilisé comme contenu par défaut pour les nouvelles pages créées dans ce livre. Gardez à l\'esprit que le modèle ne sera utilisé que si le créateur de la page a accès au modèle sélectionné.',
-    'books_default_template_select' => 'Sélectionnez un modèle de page',
     'books_permissions' => 'Permissions du livre',
     'books_permissions_updated' => 'Permissions du livre mises à jour',
     'books_empty_contents' => 'Aucune page ou chapitre n\'a été ajouté à ce livre.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Supprimer le brouillon',
     'pages_delete_success' => 'Page supprimée',
     'pages_delete_draft_success' => 'Brouillon supprimé',
-    'pages_delete_warning_template' => 'Cette page est utilisée comme modèle de page par défaut dans un livre. Ces livres n\'utiliseront plus ce modèle après la suppression de cette page.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer cette page ?',
     'pages_delete_draft_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer ce brouillon ?',
     'pages_editing_named' => 'Modification de la page :pageName',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 2e4cfa21626..0465a936cce 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un utilisateur avec l\'adresse :email existe déjà.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Cet e-mail a déjà été validé, vous pouvez vous connecter.',
     'email_confirmation_invalid' => 'Cette confirmation est invalide. Veuillez essayer de vous inscrire à nouveau.',
     'email_confirmation_expired' => 'Le jeton de confirmation est périmé. Un nouvel e-mail vous a été envoyé.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'La requête du système d\'authentification externe n\'est pas reconnue par un processus démarré par cette application. Naviguer après une connexion peut causer ce problème.',
     'saml_fail_authed' => 'Connexion avec :system échouée, le système n\'a pas fourni l\'autorisation réussie',
     'oidc_already_logged_in' => 'Déjà connecté',
-    'oidc_user_not_registered' => 'L\'utilisateur :name n\'est pas enregistré et l\'enregistrement automatique est désactivé',
     'oidc_no_email_address' => 'Impossible de trouver une adresse e-mail pour cet utilisateur, dans les données fournies par le système d\'authentification externe',
     'oidc_fail_authed' => 'La connexion en utilisant :system a échoué, le système n\'a pas fourni d\'autorisation avec succès',
     'social_no_action_defined' => 'Pas d\'action définie',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 928fed4b351..e48eeeb3771 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'La corbeille est vide',
     'recycle_bin_empty' => 'Vider la corbeille',
     'recycle_bin_empty_confirm' => 'Cela détruira définitivement tous les éléments de la corbeille, y compris le contenu de chaque élément. Êtes-vous sûr de vouloir vider la corbeille ?',
-    'recycle_bin_destroy_confirm' => 'Cette action supprimera définitivement cet élément du système ainsi que tous les éléments enfants listés ci-dessous et vous ne pourrez plus restaurer ce contenu. Êtes-vous sûr de vouloir supprimer définitivement cet élément ?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Éléments à détruire',
     'recycle_bin_restore_list' => 'Éléments à restaurer',
     'recycle_bin_restore_confirm' => 'Cette action restaurera l\'élément supprimé, y compris tous les éléments enfants, à leur emplacement d\'origine. Si l\'emplacement d\'origine a été supprimé depuis et est maintenant dans la corbeille, l\'élément parent devra également être restauré.',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 1a21e4b0475..d8fb69d61e6 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'משתמש הוסר בהצלחה',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/he/common.php b/lang/he/common.php
index dafafe6ed18..b02e11c6b47 100644
--- a/lang/he/common.php
+++ b/lang/he/common.php
@@ -20,7 +20,7 @@
     'description' => 'תיאור',
     'role' => 'תפקיד',
     'cover_image' => 'תמונת נושא',
-    'cover_image_description' => 'התמונה צריכה להיות בסביבות 440x250px',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'פעולות',
diff --git a/lang/he/editor.php b/lang/he/editor.php
index 86594f6b5be..e37862a4bff 100644
--- a/lang/he/editor.php
+++ b/lang/he/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 113af659b9b..057af04d539 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'קובץ PDF',
     'export_text' => 'טקסט רגיל',
     'export_md' => 'קובץ Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'הרשאות',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'עריכת ספר :bookName',
     'books_form_book_name' => 'שם הספר',
     'books_save' => 'שמור ספר',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'הרשאות ספר',
     'books_permissions_updated' => 'הרשאות הספר עודכנו',
     'books_empty_contents' => 'לא נוצרו פרקים או דפים עבור ספר זה',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'מחק טיוטת דף',
     'pages_delete_success' => 'הדף נמחק',
     'pages_delete_draft_success' => 'טיוטת דף נמחקה',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'האם ברצונך למחוק דף זה?',
     'pages_delete_draft_confirm' => 'האם ברצונך למחוק את טיוטת הדף הזה?',
     'pages_editing_named' => 'עריכת דף :pageName',
diff --git a/lang/he/errors.php b/lang/he/errors.php
index 4de4d88c51e..c8246279838 100644
--- a/lang/he/errors.php
+++ b/lang/he/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'משתמש עם המייל :email כבר קיים אך עם פרטי הזדהות שונים',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'המייל כבר אומת, אנא נסה להתחבר',
     'email_confirmation_invalid' => 'מפתח האימות אינו תקין או שכבר נעשה בו שימוש, אנא נסה להרשם שנית',
     'email_confirmation_expired' => 'מפתח האימות פג-תוקף, מייל אימות חדש נשלח שוב.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
     'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'oidc_already_logged_in' => 'כבר מחובר',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'לא הוגדרה פעולה',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index ead74732ced..e16fdb299d6 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'סל המיחזור כרגע ריק',
     'recycle_bin_empty' => 'רוקן את סל המיחזור',
     'recycle_bin_empty_confirm' => 'פעולה זו תשמיד לצמיתות את כל הפריטים בסל המיחזור, לרבות התוכן בכל פריט. אתם בטוחים שאתם מעוניינים לרוקן את סל המיחזור?',
-    'recycle_bin_destroy_confirm' => 'פעולה זו תמחק מהמערכת לצמיתות פריט זה, יחד עם כל פריטי-הבן ברשימה להלן, ולא תוכלו לאחזר תוכל זה. אתם בטוחים שברצונכם למחוק לצמיתות פריט זה?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'פריטים שיושמדו',
     'recycle_bin_restore_list' => 'פריטים שיאוחזרו',
     'recycle_bin_restore_confirm' => 'פעולה זו תאחזר את הפריט שנמחק, לרבות רכיבי-הבן שלו, למיקומו המקורי. אם המיקום המקורי נמחק מאז, וכעת נמצא בסל המיחזור, יש לאחזר גם את פריט-האב.',
diff --git a/lang/hr/activities.php b/lang/hr/activities.php
index 541f67646b6..284121b2dd7 100644
--- a/lang/hr/activities.php
+++ b/lang/hr/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Korisnik je uspješno uklonjen',
 
     // API Tokens
-    'api_token_create' => 'kreirani API token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token uspješno kreiran',
-    'api_token_update' => 'ažurirani API token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token uspješno ažuriran',
-    'api_token_delete' => 'obrisan API token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token uspješno izbrisan',
 
     // Roles
diff --git a/lang/hr/common.php b/lang/hr/common.php
index e9ee02c86f8..495966db6ac 100644
--- a/lang/hr/common.php
+++ b/lang/hr/common.php
@@ -20,7 +20,7 @@
     'description' => 'Opis',
     'role' => 'Uloga',
     'cover_image' => 'Naslovna slika',
-    'cover_image_description' => 'Slika treba biti približno 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Aktivnost',
diff --git a/lang/hr/editor.php b/lang/hr/editor.php
index a5372c87d3d..f3fb21ad4e9 100644
--- a/lang/hr/editor.php
+++ b/lang/hr/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Svojstva tablice',
     'table_properties_title' => 'Svojstva Tablice',
     'delete_table' => 'Obriši tablicu',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Umetni redak prije',
     'insert_row_after' => 'Umetni redak poslije',
     'delete_row' => 'Izbriši red',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 6a69a0d92b8..eede312c495 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF Datoteka',
     'export_text' => 'Text File',
     'export_md' => 'Markdown Datoteka',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Dopuštenja',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Uredi knjigu :bookName',
     'books_form_book_name' => 'Ime knjige',
     'books_save' => 'Spremi knjigu',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Dopuštenja za knjigu',
     'books_permissions_updated' => 'Ažurirana dopuštenja za knjigu',
     'books_empty_contents' => 'U ovoj knjizi još nema stranica ni poglavlja.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Izbriši nacrt stranice',
     'pages_delete_success' => 'Izbrisana stranica',
     'pages_delete_draft_success' => 'Izbrisan nacrt stranice',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Jeste li sigurni da želite izbrisati stranicu?',
     'pages_delete_draft_confirm' => 'Jeste li sigurni da želite izbrisati nacrt stranice?',
     'pages_editing_named' => 'Uređivanje stranice :pageName',
diff --git a/lang/hr/errors.php b/lang/hr/errors.php
index 608c05e293e..5be97feb98a 100644
--- a/lang/hr/errors.php
+++ b/lang/hr/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Korisnik s mailom :email već postoji, ali s drugom vjerodajnicom.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email je već potvrđen, pokušajte se logirati.',
     'email_confirmation_invalid' => 'Ova vjerodajnica nije valjana ili je već bila korištena. Pokušajte se ponovno registrirati.',
     'email_confirmation_expired' => 'Ova vjerodajnica je istekla. Poslan je novi email za pristup.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Sustav za autentifikaciju nije prepoznat. Ovaj problem možda je nastao zbog vraćanja nakon prijave.',
     'saml_fail_authed' => 'Prijava pomoću :system nije uspjela zbog neuspješne autorizacije',
     'oidc_already_logged_in' => 'Već ste prijavljeni',
-    'oidc_user_not_registered' => 'Korisnik :name nije registriran i automatska registracija je onemogućena',
     'oidc_no_email_address' => 'Nije moguće pronaći adresu e-pošte za ovog korisnika u podacima koje pruža vanjski sustav za autentifikaciju',
     'oidc_fail_authed' => 'Prijavljivanje putem :system nije uspjelo. Sustav nije uspješno odobrio autorizaciju',
     'social_no_action_defined' => 'Nije definirana nijedna radnja',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index 6040489ac39..42c033a29e8 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Recycle Bin je prazan',
     'recycle_bin_empty' => 'Isprazni Recycle Bin',
     'recycle_bin_empty_confirm' => 'Ovo će trajno obrisati sve stavke u Recycle Bin i sadržaje povezane s njima. Jeste li sigurni da želite isprazniti Recycle Bin?',
-    'recycle_bin_destroy_confirm' => 'Ovom radnjom ćete trajno izbrisati ovu stavku i nećete je više moći vratiti. Želite li je trajno izbrisati?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Stavke koje treba izbrisati',
     'recycle_bin_restore_list' => 'Stavke koje treba vratiti',
     'recycle_bin_restore_confirm' => 'Ova radnja vraća izbrisane stavke i njene podređene elemente na prvobitnu lokaciju. Ako je nadređena stavka izbrisana i nju treba vratiti.',
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index a6db776415c..74c4bbd79df 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -6,117 +6,117 @@
 return [
 
     // Pages
-    'page_create'                 => 'létrehozta az oldalt:',
+    'page_create'                 => 'létrehozta az oldalt',
     'page_create_notification'    => 'Oldal sikeresen létrehozva',
-    'page_update'                 => 'frissítette az oldalt:',
+    'page_update'                 => 'frissítette az oldalt',
     'page_update_notification'    => 'Oldal sikeresen frissítve',
-    'page_delete'                 => 'törölte az oldalt:',
+    'page_delete'                 => 'törölte az oldalt',
     'page_delete_notification'    => 'Oldal sikeresen törölve',
-    'page_restore'                => 'visszaállította az oldalt:',
+    'page_restore'                => 'visszaállította az oldalt',
     'page_restore_notification'   => 'Oldal sikeresen visszaállítva',
-    'page_move'                   => 'áthelyezte az oldalt:',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move'                   => 'áthelyezte az oldalt',
+    'page_move_notification'      => 'Oldal sikeresen áthelyezve',
 
     // Chapters
-    'chapter_create'              => 'létrehozta a fejezetet:',
+    'chapter_create'              => 'létrehozta a fejezetet',
     'chapter_create_notification' => 'Fejezet sikeresen létrehozva',
-    'chapter_update'              => 'frissítette a fejezetet:',
+    'chapter_update'              => 'frissítette a fejezetet',
     'chapter_update_notification' => 'Fejezet sikeresen frissítve',
-    'chapter_delete'              => 'törölte a fejezetet:',
+    'chapter_delete'              => 'törölte a fejezetet',
     'chapter_delete_notification' => 'Fejezet sikeresen törölve',
-    'chapter_move'                => 'áthelyezte a fejezetet:',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move'                => 'áthelyezte a fejezetet',
+    'chapter_move_notification' => 'Fejezet sikeresen áthelyezve',
 
     // Books
-    'book_create'                 => 'létrehozott egy könyvet:',
+    'book_create'                 => 'létrehozott egy könyvet',
     'book_create_notification'    => 'Könyv sikeresen létrehozva',
-    'book_create_from_chapter'              => 'converted chapter to book',
-    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
-    'book_update'                 => 'frissítette a könyvet:',
+    'book_create_from_chapter'              => 'fejezet könyvvé alakítva',
+    'book_create_from_chapter_notification' => 'Fejezet sikeresen könyvvé lett alakítva',
+    'book_update'                 => 'frissítette a könyvet',
     'book_update_notification'    => 'Könyv sikeresen frissítve',
-    'book_delete'                 => 'törölte a könyvet:',
+    'book_delete'                 => 'törölte a könyvet',
     'book_delete_notification'    => 'Könyv sikeresen törölve',
-    'book_sort'                   => 'átrendezte a könyvet:',
+    'book_sort'                   => 'átrendezte a könyvet',
     'book_sort_notification'      => 'Könyv sikeresen újrarendezve',
 
     // Bookshelves
-    'bookshelf_create'            => 'created shelf',
+    'bookshelf_create'            => 'létrehozta a polcot',
     'bookshelf_create_notification'    => 'Könyvespolc sikeresen létrehozva',
-    'bookshelf_create_from_book'    => 'converted book to shelf',
-    'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
-    'bookshelf_update'                 => 'updated shelf',
-    'bookshelf_update_notification'    => 'Shelf successfully updated',
-    'bookshelf_delete'                 => 'deleted shelf',
-    'bookshelf_delete_notification'    => 'Shelf successfully deleted',
+    'bookshelf_create_from_book'    => 'könyvet polccá alakított',
+    'bookshelf_create_from_book_notification'    => 'Könyv sikeresen polccá lett alakítva',
+    'bookshelf_update'                 => 'polcot frissített',
+    'bookshelf_update_notification'    => 'Polc sikeresen frissítve',
+    'bookshelf_delete'                 => 'polcot törölt',
+    'bookshelf_delete_notification'    => 'Polc sikeresen törölve',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'visszaállította a változatot',
+    'revision_delete' => 'törölte a változatot',
+    'revision_delete_notification' => 'Változat sikeresen törölve',
 
     // Favourites
-    'favourite_add_notification' => '":name" has been added to your favourites',
-    'favourite_remove_notification' => '":name" has been removed from your favourites',
+    'favourite_add_notification' => '":name" hozzáadva a kedvencekhez',
+    'favourite_remove_notification' => '":name" törölve a kedvencek közül',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'A megfigyelési beállítások sikeresen frissültek',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
-    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
-    'mfa_remove_method' => 'removed MFA method',
-    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+    'auth_login' => 'bejelentkezve',
+    'auth_register' => 'új felhasználóként regisztrált',
+    'auth_password_reset_request' => 'jelszó visszaállítást kért',
+    'auth_password_reset_update' => 'felhasználói jelszó visszaállítás',
+    'mfa_setup_method' => 'MFA módszert állított be',
+    'mfa_setup_method_notification' => 'Többfaktoros azonosítás sikeresen beállítva',
+    'mfa_remove_method' => 'MFA módszert törölt',
+    'mfa_remove_method_notification' => 'Többfaktoros azonosítás sikeresen törölve',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
-    'maintenance_action_run' => 'ran maintenance action',
+    'settings_update' => 'frissítette a beállításokat',
+    'settings_update_notification' => 'Beállítások sikeresen frissítve',
+    'maintenance_action_run' => 'karbantartási műveletet futtatott',
 
     // Webhooks
-    'webhook_create' => 'created webhook',
+    'webhook_create' => 'webhookot hozott létre',
     'webhook_create_notification' => 'Webhook sikeresen létrehozva',
-    'webhook_update' => 'updated webhook',
+    'webhook_update' => 'webhookot frissített',
     'webhook_update_notification' => 'Webhook sikeresen frissítve',
-    'webhook_delete' => 'deleted webhook',
-    'webhook_delete_notification' => 'Webhook successfully deleted',
+    'webhook_delete' => 'webhookot törölt',
+    'webhook_delete_notification' => 'Webhook sikeresen törölve',
 
     // Users
     'user_create' => 'felhasználó létrehozása',
     'user_create_notification' => 'Felhasználó sikeresen létrehozva',
     'user_update' => 'felhasználó módosítása',
     'user_update_notification' => 'Felhasználó sikeresen frissítve',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'felhasználót törölt',
     'user_delete_notification' => 'Felhasználó sikeresen eltávolítva',
 
     // API Tokens
-    'api_token_create' => 'created api token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'created API token',
+    'api_token_create_notification' => 'API token sikeresen létrehozva',
+    'api_token_update' => 'updated API token',
+    'api_token_update_notification' => 'API token sikeresen frissítve',
+    'api_token_delete' => 'deleted API token',
+    'api_token_delete_notification' => 'API token sikeresen törölve',
 
     // Roles
-    'role_create' => 'created role',
-    'role_create_notification' => 'Role successfully created',
-    'role_update' => 'updated role',
-    'role_update_notification' => 'Role successfully updated',
-    'role_delete' => 'deleted role',
-    'role_delete_notification' => 'Role successfully deleted',
+    'role_create' => 'szerepkört hozott létre',
+    'role_create_notification' => 'Szerepkör sikeresen létrehozva',
+    'role_update' => 'frissített szerepkör',
+    'role_update_notification' => 'Szerepkör sikeresen frissítve',
+    'role_delete' => 'törölt szerepkör',
+    'role_delete_notification' => 'Szerepkör sikeresen törölve',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'lomtár kiürítve',
+    'recycle_bin_restore' => 'lomtárból visszaállítva',
+    'recycle_bin_destroy' => 'lomtárból törölve',
 
     // Comments
     'commented_on'                => 'megjegyzést fűzött hozzá:',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
+    'comment_create'              => 'hozzáadott hozzászólás',
+    'comment_update'              => 'frissített hozzászólás',
     'comment_delete'              => 'megjegyzés törlése',
 
     // Other
diff --git a/lang/hu/auth.php b/lang/hu/auth.php
index f7c30551fd9..22c7aedbcf5 100644
--- a/lang/hu/auth.php
+++ b/lang/hu/auth.php
@@ -24,10 +24,10 @@
     'password_hint' => 'Legalább 8 karakter hosszú legyen',
     'forgot_password' => 'Elfelejtett jelszó?',
     'remember_me' => 'Emlékezzen rám',
-    'ldap_email_hint' => 'A fiókhoz használt email cím megadása.',
+    'ldap_email_hint' => 'Adjon meg egy e-mail címet amelyet a felhasználói fiókhoz szeretne használni.',
     'create_account' => 'Fiók létrehozása',
-    'already_have_account' => 'Korábban volt beállítva fiók?',
-    'dont_have_account' => 'Még nincs beállítva fiók?',
+    'already_have_account' => 'Rendelkezik már felhasználói fiókkal?',
+    'dont_have_account' => 'Még nincs felhasználói fiókja?',
     'social_login' => 'Közösségi bejelentkezés',
     'social_registration' => 'Közösségi regisztráció',
     'social_registration_text' => 'Regisztráció és bejelentkezés másik szolgáltatással.',
@@ -39,15 +39,15 @@
     'register_success' => 'Köszönjük a regisztrációt! A regisztráció és a bejelentkezés megtörtént.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Attempting Login',
-    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
-    'auto_init_start_link' => 'Proceed with authentication',
+    'auto_init_starting' => 'Bejelentkezési kísérlet',
+    'auto_init_starting_desc' => 'Kapcsolatba lépünk az azonosítási rendszereddel, hogy elkezdjük a bejelentkezési folyamatot. Ha 5 másodperc után sem történik előrelépés, próbálkozhatsz az alábbi linkre kattintva.',
+    'auto_init_start_link' => 'Folytatás azonosítással',
 
     // Password Reset
     'reset_password' => 'Jelszó visszaállítása',
     'reset_password_send_instructions' => 'Meg kell adni az email címet amire egy jelszó visszaállító hivatkozás lesz elküldve.',
     'reset_password_send_button' => 'Visszaállító hivatkozás elküldése',
-    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
+    'reset_password_sent' => 'A jelszó-visszaállító linket e-mailben fogjuk elküldeni a(z) :email címre, ha beállításra került a rendszerben.',
     'reset_password_success' => 'A jelszó sikeresen visszaállítva.',
     'email_reset_subject' => ':appName jelszó visszaállítása',
     'email_reset_text' => 'Ezt az emailt azért küldtük mert egy jelszó visszaállításra vonatkozó kérést kaptunk ebből a fiókból.',
@@ -59,10 +59,10 @@
     'email_confirm_text' => 'Az email címet a lenti gombra kattintva lehet megerősíteni:',
     'email_confirm_action' => 'Email megerősítése',
     'email_confirm_send_error' => 'Az email megerősítés kötelező, de a rendszer nem tudta elküldeni az emailt. Fel kell venni a kapcsolatot az adminisztrátorral és meg kell győződni róla, hogy az email beállítások megfelelőek.',
-    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
+    'email_confirm_success' => 'Az e-mail címed sikeresen meg lett erősítve, most már be tudsz jelentkezni az e-mail címed használatával.',
     'email_confirm_resent' => 'Megerősítő email újraküldve. Ellenőrizni kell a bejövő üzeneteket.',
-    'email_confirm_thanks' => 'Thanks for confirming!',
-    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+    'email_confirm_thanks' => 'Köszönjük a megerősítést!',
+    'email_confirm_thanks_desc' => 'Kérlek, várj egy pillanatot, amíg a megerősítésedet kezeljük. Ha nem kerülsz átirányításra 3 másodperc után, kattints a "Folytatás" linkre az alábbiakban a továbbhaladáshoz.',
 
     'email_not_confirmed' => 'Az email cím nincs megerősítve',
     'email_not_confirmed_text' => 'Az email cím még nincs megerősítve.',
@@ -78,18 +78,18 @@
     'user_invite_page_welcome' => ':appName üdvözöl!',
     'user_invite_page_text' => 'A fiók véglegesítéséhez és a hozzáféréshez be kell állítani egy jelszót ami :appName weboldalon lesz használva a bejelentkezéshez.',
     'user_invite_page_confirm_button' => 'Jelszó megerősítése',
-    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+    'user_invite_success_login' => 'Jelszó beállítva. Most már be tudsz jelentkezni a beállított jelszóval a következő rendszerbe: :appName!',
 
     // Multi-factor Authentication
-    'mfa_setup' => 'Setup Multi-Factor Authentication',
-    'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'mfa_setup_configured' => 'Already configured',
-    'mfa_setup_reconfigure' => 'Reconfigure',
-    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
+    'mfa_setup' => 'Többlépcsős azonosítás beállítása',
+    'mfa_setup_desc' => 'Állítsa be a többlépcsős azonosítást egy extra biztonsági rétegként a felhasználói fiókjához.',
+    'mfa_setup_configured' => 'Már beállítva',
+    'mfa_setup_reconfigure' => 'Újrakonfigurálás',
+    'mfa_setup_remove_confirmation' => 'Biztosan ki szeretné kapcsolni a többlépcsős azonosítást?',
     'mfa_setup_action' => 'Beállítások',
     'mfa_backup_codes_usage_limit_warning' => 'Kevesebb, mint 5 visszaállítási kódja maradt. Kérem, hogy generáljon új kódokat, hogy csökkentse a rendszerből való kizárásának esélyét.',
     'mfa_option_totp_title' => 'Mobilalkalmazás',
-    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Visszaállítási kulcsok',
     'mfa_option_backup_codes_desc' => 'Biztonságosan tárolja el az egyszer használatos visszaállítási kódjait, amiket a későbbiekben fel tud majd használni bejelentkezése során.',
     'mfa_gen_confirm_and_enable' => 'Jóváhagyás és engedélyezés',
@@ -98,20 +98,20 @@
     'mfa_gen_backup_codes_download' => 'Kódok letöltése',
     'mfa_gen_backup_codes_usage_warning' => 'A kódok egyszerhasználatosak',
     'mfa_gen_totp_title' => 'Mobilalkalmazás beállítása',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
-    'mfa_gen_totp_verify_setup' => 'Verify Setup',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
-    'mfa_verify_no_methods' => 'No Methods Configured',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
-    'mfa_verify_use_totp' => 'Verify using a mobile app',
+    'mfa_gen_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Szkenneld be az alábbi QR-kódot az általad használt azonosító alkalmazásoddal, hogy használhasd az alkalmazást.',
+    'mfa_gen_totp_verify_setup' => 'Beállítások ellenőrzése',
+    'mfa_gen_totp_verify_setup_desc' => 'Ellenőrizd, hogy minden működik, azzal hogy beírod a kapott kódot amit az authentikátor alkalmazás generált az alábbi beviteli mezőbe:',
+    'mfa_gen_totp_provide_code_here' => 'Add meg az alkalmazás által generált kódot ide',
+    'mfa_verify_access' => 'Hozzáférés ellenőrzése',
+    'mfa_verify_access_desc' => 'Felhasználói fiókja megköveteli, hogy erősítse meg személyazonosságát egy további ellenőrzési szinttel, mielőtt hozzáférést kapna. A folytatáshoz használja az egyik konfigurált módszert.',
+    'mfa_verify_no_methods' => 'Nincs konfigurálva MFA',
+    'mfa_verify_no_methods_desc' => 'Nem található többlépcsős hitelesítési módszer a fiókjához. A hozzáféréshez legalább egy módszert be kell állítania.',
+    'mfa_verify_use_totp' => 'Ellenőrzés mobil alkalmazás használatával',
     'mfa_verify_use_backup_codes' => 'Ellenőrzés visszaállítási kóddal',
     'mfa_verify_backup_code' => 'Visszaállítási kód',
     'mfa_verify_backup_code_desc' => 'Adjon meg egy még fel nem használt visszaállítási kódot:',
     'mfa_verify_backup_code_enter_here' => 'Írd be a tartalék kódot',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_verify_totp_desc' => 'Írja be alább a mobilalkalmazásával generált kódot:',
+    'mfa_setup_login_notification' => 'Többfaktoros hitelesítés konfigurálva. Kérjük, most jelentkezzen be újra a konfigurált módszerrel.',
 ];
diff --git a/lang/hu/common.php b/lang/hu/common.php
index 295fa959b45..a79ee00e5f6 100644
--- a/lang/hu/common.php
+++ b/lang/hu/common.php
@@ -20,7 +20,7 @@
     'description' => 'Leírás',
     'role' => 'Szerepkör',
     'cover_image' => 'Borítókép',
-    'cover_image_description' => 'A kép méretének kb. 440x250px-nek kell lennie.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Műveletek',
@@ -42,7 +42,7 @@
     'remove' => 'Eltávolítás',
     'add' => 'Hozzáadás',
     'configure' => 'Beállítás',
-    'manage' => 'Manage',
+    'manage' => 'Kezelés',
     'fullscreen' => 'Teljes képernyő',
     'favourite' => 'Kedvencekhez ad',
     'unfavourite' => 'Kedvencekből eltávolít',
@@ -85,7 +85,7 @@
 
     // Header
     'homepage' => 'Kezdőlap',
-    'header_menu_expand' => 'Expand Header Menu',
+    'header_menu_expand' => 'Menü megnyitása',
     'profile_menu' => 'Profil menü',
     'view_profile' => 'Profil megtekintése',
     'edit_profile' => 'Profil szerkesztése',
@@ -95,9 +95,9 @@
 
     // Layout tabs
     'tab_info' => 'Információ',
-    'tab_info_label' => 'Tab: Show Secondary Information',
+    'tab_info_label' => 'Tab: Másodlagos információk megjelenítése',
     'tab_content' => 'Tartalom',
-    'tab_content_label' => 'Tab: Show Primary Content',
+    'tab_content_label' => 'Tab: Elsődleges információk megjelenítése',
 
     // Email Content
     'email_action_help' => 'Probléma esetén a lenti ":actionText" gombra kell kattintani, majd ki kell másolni a lenti webcímet és be kell illeszteni egy böngészőbe:',
diff --git a/lang/hu/components.php b/lang/hu/components.php
index 26cd89010db..ef440e54084 100644
--- a/lang/hu/components.php
+++ b/lang/hu/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'Kép kiválasztása',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'Képek listája',
+    'image_details' => 'A kép részletei',
+    'image_upload' => 'Kép feltöltése',
+    'image_intro' => 'Itt választhatsz ki és kezelhetsz olyan képeket, amelyeket korábban feltöltöttek a rendszerbe.',
+    'image_intro_upload' => 'Húzz ide egy új képfájlt az új kép feltöltéséhez, vagy használd a fenti "Kép feltöltése" gombot.',
     'image_all' => 'Összes',
     'image_all_title' => 'Összes kép megtekintése',
     'image_book_title' => 'A könyv feltöltött képek megtekintése',
     'image_page_title' => 'Az oldalra feltöltött képek megtekintése',
     'image_search_hint' => 'Keresés kép neve alapján',
     'image_uploaded' => 'Feltöltve ekkor: :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'Feltöltötte :userName',
+    'image_uploaded_to' => 'Feltöltve ide: :pageLink',
+    'image_updated' => 'Frissítve ekkor: :updateDate',
     'image_load_more' => 'Több betöltése',
     'image_image_name' => 'Kép neve',
     'image_delete_used' => 'Ez a kép a lenti oldalakon van használatban.',
     'image_delete_confirm_text' => 'Biztosan törölhető ez a kép?',
     'image_select_image' => 'Kép kiválasztása',
     'image_dropzone' => 'Képek feltöltése ejtéssel vagy kattintással',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'Húzza a képeket ide a feltöltéshez',
     'images_deleted' => 'Képek törölve',
     'image_preview' => 'Kép előnézete',
     'image_upload_success' => 'Kép sikeresen feltöltve',
     'image_update_success' => 'Kép részletei sikeresen frissítve',
     'image_delete_success' => 'Kép sikeresen törölve',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'Kép cseréje',
+    'image_replace_success' => 'Képfájl sikeresen frissítve',
+    'image_rebuild_thumbs' => 'Méret variációk újragenerálása',
+    'image_rebuild_thumbs_success' => 'Kép méret változatok sikeresen újra lettek generálva!',
 
     // Code Editor
     'code_editor' => 'Kód szerkesztése',
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index 7c0da37bf7f..16b5846c00c 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -53,10 +53,10 @@
     'align_left' => 'Balra igazítás',
     'align_center' => 'Középre igazítás',
     'align_right' => 'Jobbra igazítás',
-    'align_justify' => 'Justify',
+    'align_justify' => 'Sorkizárt',
     'list_bullet' => 'Felsorolásjeles lista',
     'list_numbered' => 'Számozott lista',
-    'list_task' => 'Task list',
+    'list_task' => 'Feladatlista',
     'indent_increase' => 'Behúzás növelése',
     'indent_decrease' => 'Behúzás csökkentése',
     'table' => 'Táblázat',
@@ -81,6 +81,9 @@
     'table_properties' => 'Táblázat tulajdonságai',
     'table_properties_title' => 'Táblázat Tulajdonságai',
     'delete_table' => 'Táblázat törlése',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Sor beszúrása elé',
     'insert_row_after' => 'Sor beszúrása mögé',
     'delete_row' => 'Sor törlése',
@@ -94,10 +97,10 @@
     'cell_properties_title' => 'Cella Tulajdonságai',
     'cell_type' => 'Cella típusa',
     'cell_type_cell' => 'Cella',
-    'cell_scope' => 'Scope',
+    'cell_scope' => 'Hatáskör',
     'cell_type_header' => 'Címsor cella',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
+    'merge_cells' => 'Cellák egyesítése',
+    'split_cell' => 'Cellák szétválasztása',
     'table_row_group' => 'Sorcsoport',
     'table_column_group' => 'Oszlopcsoport',
     'horizontal_align' => 'Vízszintes elrendezés',
@@ -120,54 +123,54 @@
     'copy_column' => 'Oszlop másolása',
     'paste_column_before' => 'Oszlop beszúrása elé',
     'paste_column_after' => 'Oszlop beszúrása utána',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
+    'cell_padding' => 'Cellatávolság',
+    'cell_spacing' => 'Cellatávolság',
     'caption' => 'Felirat',
     'show_caption' => 'Képaláírás mutatása',
     'constrain' => 'Arányok megőrzése',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
+    'cell_border_solid' => 'Folyamatos',
+    'cell_border_dotted' => 'Pontozott',
+    'cell_border_dashed' => 'Szaggatott',
+    'cell_border_double' => 'Dupla',
+    'cell_border_groove' => 'Horony',
+    'cell_border_ridge' => 'Domború',
+    'cell_border_inset' => 'Behúzott',
     'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'cell_border_none' => 'Egyik sem',
+    'cell_border_hidden' => 'Rejtett',
 
     // Images, links, details/summary & embed
     'source' => 'Forrás',
     'alt_desc' => 'Alternatív leírás',
     'embed' => 'Beágyazás',
-    'paste_embed' => 'Paste your embed code below:',
+    'paste_embed' => 'Illeszd be a beágyazási kódot ide:',
     'url' => 'URL',
     'text_to_display' => 'Megjelenő szöveg',
     'title' => 'Cím',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
+    'open_link' => 'Hivatkozás megnyitása',
+    'open_link_in' => 'Hivatkozás megnyitása...',
     'open_link_current' => 'Aktuális ablak',
     'open_link_new' => 'Új ablak',
-    'remove_link' => 'Remove link',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
+    'remove_link' => 'Hivatkozás eltávolítása',
+    'insert_collapsible' => 'Illeszd be az összecsukható blokkot',
+    'collapsible_unwrap' => 'Kicsomagol',
     'edit_label' => 'Címke szerkesztése',
     'toggle_open_closed' => 'Nyitott/zárt váltása',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'collapsible_edit' => 'Összecsukható blokk szerkesztése',
+    'toggle_label' => 'Címke ki-be kapcsolása',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'about' => 'A szerkesztőről',
+    'about_title' => 'A WYSIWYG szerkesztőről',
+    'editor_license' => 'Szerkesztő Licensz és Copyright információi',
+    'editor_tiny_license' => 'Ez a szerkesztő az MIT licenc alatt szolgáltatott :tinyLink segítségével készült.',
+    'editor_tiny_license_link' => 'A TinyMCE szerzői jogi és licencinformációi itt találhatók.',
     'save_continue' => 'Mentés és Folytatás',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
+    'callouts_cycle' => '(Folyamatos lenyomva tartással válassza ki a típusok közötti váltást)',
+    'link_selector' => 'Tartalom hivatkozása',
     'shortcuts' => 'Gyorsbillentyűk',
     'shortcut' => 'Gyorsbillentyű',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'shortcuts_intro' => 'Az alábbi gyorsbillentyűk érhetők el a szerkesztőben:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
     'description' => 'Leírás',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 339a8d1000e..a63eb998278 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -23,9 +23,9 @@
     'meta_updated' => 'Frissítve :timeLength',
     'meta_updated_name' => ':user frissítette :timeLength',
     'meta_owned_name' => ':user tulajdona',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Hivatkozva a következő által: :count |Hivatkozva a következő által: :count',
     'entity_select' => 'Entitás kiválasztása',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'entity_select_lack_permission' => 'Nincs meg a szükséges jogosultságod ennek az elemnek a kiválasztásához',
     'images' => 'Képek',
     'my_recent_drafts' => 'Legutóbbi vázlataim',
     'my_recently_viewed' => 'Általam legutóbb megtekintett',
@@ -39,18 +39,21 @@
     'export_pdf' => 'PDF fájl',
     'export_text' => 'Egyszerű szövegfájl',
     'export_md' => 'Markdown jegyzetek',
+    'default_template' => 'Alapértelmezett oldalsablon',
+    'default_template_explain' => 'Rendeljen hozzá egy oldalsablont, amely alapértelmezett tartalomként lesz használva az ezen az elemen belül létrehozott összes oldalon. Ne feledje, hogy ezt csak akkor használja, ha az oldal készítője megtekintési hozzáféréssel rendelkezik a kiválasztott sablonoldalhoz.',
+    'default_template_select' => 'Válasszon ki egy oldalsablont',
 
     // Permissions and restrictions
     'permissions' => 'Jogosultságok',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_desc' => 'Itt állítsa be az engedélyeket a felhasználói szerepkörök által biztosított alapértelmezett engedélyek felülbírálásához.',
+    'permissions_book_cascade' => 'A könyvekre beállított engedélyek automatikusan az alárendelt fejezetekhez és oldalakhoz kapcsolódnak, kivéve, ha saját engedélyekkel rendelkeznek.',
+    'permissions_chapter_cascade' => 'A fejezetekre beállított engedélyek automatikusan az alárendelt oldalakra lépnek át, hacsak nem rendelkeznek saját engedélyekkel.',
     'permissions_save' => 'Jogosultságok mentése',
     'permissions_owner' => 'Tulajdonos',
-    'permissions_role_everyone_else' => 'Everyone Else',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions_role_everyone_else' => 'Mindenki más',
+    'permissions_role_everyone_else_desc' => 'Állítson be engedélyeket az összes, kifejezetten nem felülírt szerepkörhöz.',
+    'permissions_role_override' => 'A szerepkör engedélyeinek felülbírálása',
+    'permissions_inherit_defaults' => 'Alapértelmezett értékek öröklése',
 
     // Search
     'search_results' => 'Keresési eredmények',
@@ -93,24 +96,24 @@
     'shelves_save' => 'Polc mentése',
     'shelves_books' => 'Könyvek ezen a polcon',
     'shelves_add_books' => 'Könyvek hozzáadása ehhez a polchoz',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_drag_books' => 'Könyveket áthúzással lehet elhelyezni ezen a polcon',
     'shelves_empty_contents' => 'Ehhez a polchoz nincsenek könyvek rendelve',
     'shelves_edit_and_assign' => 'Polc szerkesztése könyvek hozzárendeléséhez',
-    'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
-    'shelves_delete_named' => 'Delete Shelf :name',
-    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_edit_named' => ':name polc szerkesztése',
+    'shelves_edit' => 'Polc szerkesztése',
+    'shelves_delete' => 'Polc törlése',
+    'shelves_delete_named' => ':name polc törlése',
+    'shelves_delete_explain' => "':name'. nevű polc ezzel le lesz törölve. A benne található könyvek nem lesznek törölve.",
+    'shelves_delete_confirmation' => 'Biztosan törölhető ez a polc?',
+    'shelves_permissions' => 'Polc jogosultság',
+    'shelves_permissions_updated' => 'Polc jogosultságok frissítve',
+    'shelves_permissions_active' => 'Polc jogosultságok aktívak',
+    'shelves_permissions_cascade_warning' => 'A polcokhoz kapcsolódó jogosultságok nem kapcsolódnak automatikusan a tárolt könyvekhez. Ennek az az oka, hogy egy könyv több polcon is létezhet. Az engedélyek azonban lemásolhatók a gyermekkönyvekbe az alábbi lehetőség segítségével.',
+    'shelves_permissions_create' => 'A polclétrehozási jogosultságok csak az alárendelt könyvekbe való másoláshoz használhatók az alábbi művelettel. Nem szabályozzák a könyvek létrehozásának lehetőségét.',
     'shelves_copy_permissions_to_books' => 'Jogosultság másolása könyvekre',
     'shelves_copy_permissions' => 'Jogosultság másolása',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => 'Ezzel a polc jelenlegi engedélybeállításait alkalmazza a benne található összes könyvre. Az aktiválás előtt győződjön meg arról, hogy a polc engedélyeinek módosításait elmentette.',
+    'shelves_copy_permission_success' => 'Könyvespolc jogosultságok átmásolva :count könyvre',
 
     // Books
     'book' => 'Könyv',
@@ -132,9 +135,6 @@
     'books_edit_named' => ':bookName könyv szerkesztése',
     'books_form_book_name' => 'Könyv neve',
     'books_save' => 'Könyv mentése',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Könyv jogosultságok',
     'books_permissions_updated' => 'Könyv jogosultságok frissítve',
     'books_empty_contents' => 'Ehhez a könyvhöz nincsenek oldalak vagy fejezetek létrehozva.',
@@ -145,7 +145,7 @@
     'books_search_this' => 'Keresés ebben a könyvben',
     'books_navigation' => 'Könyv navigáció',
     'books_sort' => 'Könyv tartalmak rendezése',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Mozgassa át a fejezeteket és oldalakat a könyvben, hogy átszervezze a tartalmát. Más könyvek is hozzáadhatók, ami lehetővé teszi a fejezetek és oldalak könnyű mozgatását a könyvek között.',
     'books_sort_named' => ':bookName könyv rendezése',
     'books_sort_name' => 'Rendezés név szerint',
     'books_sort_created' => 'Rendezés létrehozás dátuma szerint',
@@ -154,17 +154,17 @@
     'books_sort_chapters_last' => 'Fejezetek hátul',
     'books_sort_show_other' => 'Egyéb könyvek mutatása',
     'books_sort_save' => 'Új elrendezés mentése',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_sort_show_other_desc' => 'Adjon hozzá más könyveket, hogy bevonja őket a rendezési műveletbe, és lehetővé tegye a könyvek közötti egyszerű átszervezést.',
+    'books_sort_move_up' => 'Mozgatás fel',
+    'books_sort_move_down' => 'Mozgatás le',
+    'books_sort_move_prev_book' => 'Mozgatás az előző könyvbe',
+    'books_sort_move_next_book' => 'Mozgatás a következő könyvbe',
+    'books_sort_move_prev_chapter' => 'Mozgatás az előző fejezetbe',
+    'books_sort_move_next_chapter' => 'Mozgatás a következő fejezetbe',
+    'books_sort_move_book_start' => 'Mozgatás a könyv elejére',
+    'books_sort_move_book_end' => 'Mozgatás a könyv végére',
+    'books_sort_move_before_chapter' => 'Morgazás a fejezet elé',
+    'books_sort_move_after_chapter' => 'Mozgatás a fejezet után',
     'books_copy' => 'Könyv másolása',
     'books_copy_success' => 'Könyv sikeresen lemásolva',
 
@@ -191,7 +191,7 @@
     'chapters_permissions_active' => 'Fejezet jogosultságok aktívak',
     'chapters_permissions_success' => 'Fejezet jogosultságok frissítve',
     'chapters_search_this' => 'Keresés ebben a fejezetben',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter_sort_book' => 'Könyv rendezése',
 
     // Pages
     'page' => 'Oldal',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Vázlat oldal törlése',
     'pages_delete_success' => 'Oldal törölve',
     'pages_delete_draft_success' => 'Vázlat oldal törölve',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Ez az oldal aktívan használatban van könyv vagy fejezet alapértelmezett oldalsablonjaként. Ezekhez a könyvekhez vagy fejezetekhez a továbbiakban nem lesz alapértelmezett oldalsablon hozzárendelve az oldal törlése után.',
     'pages_delete_confirm' => 'Biztosan törölhető ez az oldal?',
     'pages_delete_draft_confirm' => 'Biztosan törölhető ez a vázlatoldal?',
     'pages_editing_named' => ':pageName oldal szerkesztése',
@@ -218,21 +218,21 @@
     'pages_editing_page' => 'Oldal szerkesztése',
     'pages_edit_draft_save_at' => 'Vázlat elmentve:',
     'pages_edit_delete_draft' => 'Vázlat törlése',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'Biztos benne, hogy törölni kívánja az oldalmódosítások piszkozatát? Az utolsó teljes mentés óta végrehajtott összes módosítása elvész, és a szerkesztő frissül a legfrissebb, nem vázlatos mentési állapottal.',
     'pages_edit_discard_draft' => 'Vázlat elvetése',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_markdown' => 'Váltás Markdown szerkesztőre',
+    'pages_edit_switch_to_markdown_clean' => '(Tisztított tartalom)',
+    'pages_edit_switch_to_markdown_stable' => '(Stabil tartalom)',
+    'pages_edit_switch_to_wysiwyg' => 'Váltás a WYSIWYG szerkesztőre',
     'pages_edit_set_changelog' => 'Változásnapló beállítása',
     'pages_edit_enter_changelog_desc' => 'A végrehajtott módosítások rövid leírása',
     'pages_edit_enter_changelog' => 'Változásnapló megadása',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_title' => 'Szerkesztőváltás',
+    'pages_editor_switch_are_you_sure' => 'Biztosan módosítani szeretné ennek az oldalnak a szerkesztőjét?',
+    'pages_editor_switch_consider_following' => 'A szerkesztők módosításakor vegye figyelembe a következőket:',
+    'pages_editor_switch_consideration_a' => 'Mentés után az új szerkesztő opciót minden jövőbeli szerkesztő használni fogja, beleértve azokat is, amelyek esetleg nem tudják maguk módosítani a szerkesztő típusát.',
+    'pages_editor_switch_consideration_b' => 'Ez bizonyos körülmények között a részletek és a szintaxis elvesztéséhez vezethet.',
+    'pages_editor_switch_consideration_c' => 'A legutóbbi mentés óta végrehajtott címke- vagy változásnapló-módosítások nem maradnak fenn a módosítás során.',
     'pages_save' => 'Oldal mentése',
     'pages_title' => 'Oldal címe',
     'pages_name' => 'Oldal neve',
@@ -241,10 +241,10 @@
     'pages_md_insert_image' => 'Kép beillesztése',
     'pages_md_insert_link' => 'Entitás hivatkozás beillesztése',
     'pages_md_insert_drawing' => 'Rajz beillesztése',
-    'pages_md_show_preview' => 'Show preview',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_md_show_preview' => 'Előnézet megjelenítése',
+    'pages_md_sync_scroll' => 'Előnézet pozíció szinkronizálása',
+    'pages_drawing_unsaved' => 'Nem mentett rajz található',
+    'pages_drawing_unsaved_confirm' => 'A rendszer nem mentett rajzadatokat talált egy korábbi sikertelen rajzmentési kísérletből. Szeretné visszaállítani és folytatni a nem mentett rajz szerkesztését?',
     'pages_not_in_chapter' => 'Az oldal nincs fejezetben',
     'pages_move' => 'Oldal áthelyezése',
     'pages_copy' => 'Oldal másolása',
@@ -254,17 +254,17 @@
     'pages_permissions_success' => 'Oldal jogosultságok frissítve',
     'pages_revision' => 'Változat',
     'pages_revisions' => 'Oldal változatai',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => 'Az alábbiakban az oldal összes korábbi verziója látható. Visszatekinthet, összehasonlíthatja és visszaállíthatja a régi oldalverziókat, ha az engedélyek lehetővé teszik. Előfordulhat, hogy az oldal teljes előzménye itt nem jelenik meg teljes mértékben, mivel a rendszerkonfigurációtól függően a régi változatok automatikusan törlődnek.',
     'pages_revisions_named' => ':pageName oldal változatai',
     'pages_revision_named' => ':pageName oldal változata',
-    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revision_restored_from' => 'Visszaállítva innen: #:id; :summary',
     'pages_revisions_created_by' => 'Létrehozta:',
     'pages_revisions_date' => 'Változat dátuma',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => 'Változat száma',
     'pages_revisions_numbered' => 'Változat #:id',
     'pages_revisions_numbered_changes' => '#:id változat módosításai',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_editor' => 'Szerkesztő típusa',
     'pages_revisions_changelog' => 'Változásnapló',
     'pages_revisions_changes' => 'Módosítások',
     'pages_revisions_current' => 'Aktuális verzió',
@@ -272,20 +272,20 @@
     'pages_revisions_restore' => 'Visszaállítás',
     'pages_revisions_none' => 'Ennek az oldalnak nincsenek változatai',
     'pages_copy_link' => 'Hivatkozás másolása',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_edit_content_link' => 'Ugrás a szakaszhoz a szerkesztőben',
+    'pages_pointer_enter_mode' => 'Lépjen be a szakaszválasztó módba',
+    'pages_pointer_label' => 'Oldalszakasz beállításai',
+    'pages_pointer_permalink' => 'Oldalszakasz állandó hivatkozás',
     'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_pointer_toggle_link' => 'Permalink mód, Nyomja meg az include tag megjelenítéséhez',
+    'pages_pointer_toggle_include' => 'Include tag mód, Nyomja meg az permalink megjelenítéséhez',
     'pages_permissions_active' => 'Oldal jogosultságok aktívak',
     'pages_initial_revision' => 'Kezdeti közzététel',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_references_update_revision' => 'A belső hivatkozások automatikus frissítése',
     'pages_initial_name' => 'Új oldal',
     'pages_editing_draft_notification' => 'A jelenleg szerkesztett vázlat legutóbb ekkor volt elmentve: :timeDiff.',
     'pages_draft_edited_notification' => 'Ezt az oldalt azóta már frissítették. Javasolt ennek a vázlatnak az elvetése.',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_page_changed_since_creation' => 'Ez az oldal a vázlat létrehozása óta frissült. Javasoljuk, hogy dobja el ezt a piszkozatot, vagy ügyeljen arra, hogy ne írja felül az oldal módosításait.',
     'pages_draft_edit_active' => [
         'start_a' => ':count felhasználók kezdte el szerkeszteni ezt az oldalt',
         'start_b' => ':userName elkezdte szerkeszteni ezt az oldalt',
@@ -293,26 +293,26 @@
         'time_b' => 'az utolsó :minCount percben',
         'message' => ':start :time. Ügyeljen arra, hogy ne írjuk felül egymás frissítéseit!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => 'Vázlat elvetve! A szerkesztő frissítve lesz az oldal aktuális tartalmával',
+    'pages_draft_deleted' => 'Vázlat elvetve! A szerkesztő frissítve lesz az oldal aktuális tartalmával',
     'pages_specific' => 'Egy bizonyos oldal',
     'pages_is_template' => 'Oldalsablon',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Oldalsáv ki/be',
     'page_tags' => 'Oldal címkék',
     'chapter_tags' => 'Fejezet címkék',
     'book_tags' => 'Könyv címkék',
     'shelf_tags' => 'Polc címkék',
     'tag' => 'Címke',
     'tags' =>  'Címkék',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => 'A címkék a rendszeren belüli tartalomra alkalmazhatók a kategorizálás rugalmas formája alkalmazása érdekében. A címkéknek kulcsuk és értékük is lehetnek, de az érték nem kötelező. Alkalmazása után a tartalom lekérdezhető a címkenév és érték használatával.',
     'tag_name' =>  'Címkenév',
     'tag_value' => 'Címke érték (nem kötelező)',
     'tags_explain' => "Címkék hozzáadása a tartalom jobb kategorizálásához.\nA mélyebb szervezettség megvalósításához hozzá lehet rendelni egy értéket a címkéhez.",
     'tags_add' => 'Másik címke hozzáadása',
     'tags_remove' => 'Címke eltávolítása',
-    'tags_usages' => 'Total tag usages',
+    'tags_usages' => 'Összes címkehasználat',
     'tags_assigned_pages' => 'Oldalakhoz Rendelt',
     'tags_assigned_chapters' => 'Fejezetekhez rendelt',
     'tags_assigned_books' => 'Könyvekhez Rendelt',
@@ -321,16 +321,16 @@
     'tags_all_values' => 'Összes érték',
     'tags_view_tags' => 'Címke megtekintése',
     'tags_view_existing_tags' => 'Címkék megtekintése',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'tags_list_empty_hint' => 'A címkék hozzárendelhetők az oldalszerkesztő oldalsávján keresztül, vagy egy könyv, fejezet vagy polc adatainak szerkesztése közben.',
     'attachments' => 'Csatolmányok',
     'attachments_explain' => 'Az oldalon megjelenő fájlok feltöltése vagy hivatkozások csatolása. Az oldal oldalsávjában fognak megjelenni.',
     'attachments_explain_instant_save' => 'Az itt történt módosítások azonnal el lesznek mentve.',
     'attachments_upload' => 'Fájlfeltöltés',
     'attachments_link' => 'Hivatkozás csatolása',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => 'Alternatív megoldásként a fájlt ide húzva is fel lehet tölteni mellékletként.',
     'attachments_set_link' => 'Hivatkozás beállítása',
     'attachments_delete' => 'Biztosan törölhető ez a melléklet?',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'Húzza a file(oka)t ide a feltöltéshez',
     'attachments_no_files' => 'Nincsenek fájlok feltöltve',
     'attachments_explain_link' => 'Fájl feltöltése helyett hozzá lehet kapcsolni egy hivatkozást. Ez egy hivatkozás lesz egy másik oldalra vagy egy fájlra a felhőben.',
     'attachments_link_name' => 'Hivatkozás neve',
@@ -373,13 +373,13 @@
     'comment_new' => 'Új megjegyzés',
     'comment_created' => 'megjegyzést fűzött hozzá :createDiff',
     'comment_updated' => 'Frissítve :updateDiff :username által',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => 'Frissített',
     'comment_deleted_success' => 'Megjegyzés törölve',
     'comment_created_success' => 'Megjegyzés hozzáadva',
     'comment_updated_success' => 'Megjegyzés frissítve',
     'comment_delete_confirm' => 'Biztosan törölhető ez a megjegyzés?',
     'comment_in_reply_to' => 'Válasz erre: :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_editor_explain' => 'Itt vannak az ezen az oldalon lévő megjegyzések. Megjegyzések hozzáadhatók és kezelhetők a mentett oldal megtekintésekor.',
 
     // Revision
     'revision_delete_confirm' => 'Biztosan törölhető ez a változat?',
@@ -388,50 +388,50 @@
 
     // Copy view
     'copy_consider' => 'Kérem, fontolja meg az alábbiakat, amikor tartalmat kíván másolni.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_permissions' => 'Az egyéni engedélybeállítások nem kerülnek másolásra.',
     'copy_consider_owner' => 'Minden lemásolt tartalomnak Ön lesz a tulajdonosa.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_images' => 'Az oldalképfájlok nem duplikálódnak, és az eredeti képek megőrzik kapcsolatukat az eredetileg feltöltött oldallal.',
+    'copy_consider_attachments' => 'Az oldal mellékletei nem kerülnek másolásra.',
     'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => 'Átalakítás polccá',
+    'convert_to_shelf_contents_desc' => 'Ezt a könyvet új polccá alakíthatja, azonos tartalommal. A könyvben található fejezetek új könyvekké lesznek átalakítva. Ha ez a könyv tartalmaz olyan oldalakat, amelyek nem szerepelnek egy fejezetben, akkor a könyv átnevezzük és tartalmaz ilyen oldalakat, és ez a könyv az új polc részévé válik.',
+    'convert_to_shelf_permissions_desc' => 'A könyvhöz beállított engedélyek át lesznek másolva az új polcra és az összes olyan új alárendelt könyvre, amelyek nem rendelkeznek saját engedélyekkel. Vegye figyelembe, hogy a polcokon lévő engedélyek nem kapcsolódnak automatikusan a tartalomhoz, ahogy a könyvek esetében.',
+    'convert_book' => 'Könyv átalakítása',
+    'convert_book_confirm' => 'Biztosan konvertálni szeretné ezt a könyvet?',
+    'convert_undo_warning' => 'Ezt nem lehet olyan könnyen visszavonni.',
+    'convert_to_book' => 'Átalakítás könyvvé',
+    'convert_to_book_desc' => 'Ezt a fejezetet új, azonos tartalmú könyvvé alakíthatja. Az ebben a fejezetben beállított engedélyek átmásolódnak az új könyvbe, de a szülőkönyvből származó örökölt engedélyek nem kerülnek másolásra, ami a hozzáférés-szabályozás megváltozásához vezethet.',
+    'convert_chapter' => 'Fejezet átalakítása',
+    'convert_chapter_confirm' => 'Biztosan át szeretnéd alakítani ezt a fejezetet?',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'Értékelések',
+    'references_none' => 'Nincsenek nyomon követett hivatkozások erre az elemre.',
+    'references_to_desc' => 'Az alábbiakban felsoroljuk az összes ismert tartalmat a rendszerben, amely erre az elemre hivatkozik.',
 
     // Watch Options
-    'watch' => 'Watch',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch' => 'Megfigyelés',
+    'watch_title_default' => 'Alapértelmezett beállítások',
+    'watch_desc_default' => 'Állítsa vissza a megfigyelést az alapértelmezett értesítési beállításokra.',
+    'watch_title_ignore' => 'Mellőzés',
+    'watch_desc_ignore' => 'Figyelmen kívül hagyja az összes értesítést, beleértve a felhasználói szintű beállításokból származó értesítéseket is.',
+    'watch_title_new' => 'Új oldalak',
+    'watch_desc_new' => 'Értesítés, ha új oldal jön létre ezen az elemen belül.',
+    'watch_title_updates' => 'Minden oldal frissítése',
+    'watch_desc_updates' => 'Értesítés minden új oldalról és oldalváltozásról.',
+    'watch_desc_updates_page' => 'Értesítsen minden oldalváltozásról.',
+    'watch_title_comments' => 'Minden oldal frissítése és megjegyzése',
+    'watch_desc_comments' => 'Értesítés minden új oldalról, oldalváltozásról és új megjegyzésről.',
+    'watch_desc_comments_page' => 'Értesítés az oldal változásairól és az új megjegyzésekről.',
+    'watch_change_default' => 'Az alapértelmezett értesítési beállítások módosítása',
+    'watch_detail_ignore' => 'Az értesítések figyelmen kívül hagyása',
+    'watch_detail_new' => 'Új oldalak figyelése',
+    'watch_detail_updates' => 'Új oldalak és frissítések figyelése',
+    'watch_detail_comments' => 'Új oldalak, frissítések és megjegyzések figyelése',
+    'watch_detail_parent_book' => 'Megfigyelés szülőkönyvből',
+    'watch_detail_parent_book_ignore' => 'Figyelmen kívül hagyás a szülőkönyvön keresztül',
+    'watch_detail_parent_chapter' => 'Megfigyelés szülő fejezetből',
+    'watch_detail_parent_chapter_ignore' => 'Figyelmen kívül hagyás a szülő fejezeten keresztül',
 ];
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index e51ef633f43..0183cd1924d 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':email címmel már létezik felhasználó, de más hitelesítő adatokkal.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Az email cím már meg van erősítve, meg lehet próbálni a bejelentkezést.',
     'email_confirmation_invalid' => 'A megerősítő vezérjel nem érvényes vagy használva volt. Meg kell próbálni újraregisztrálni.',
     'email_confirmation_expired' => 'A megerősítő vezérjel lejárt. Egy új megerősítő email lett elküldve.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'A külső hitelesítő rendszerből érkező kérést nem ismerte fel az alkalmazás által indított folyamat. Bejelentkezés után az előző oldalra történő visszalépés okozhatja ezt a hibát.',
     'saml_fail_authed' => 'Bejelentkezés :system használatával sikertelen, a rendszer nem biztosított sikeres hitelesítést',
     'oidc_already_logged_in' => 'Már bejelentkezett',
-    'oidc_user_not_registered' => ':name felhasználó nincs regisztrálva és az automatikus regisztráció le van tiltva',
     'oidc_no_email_address' => 'Ehhez a felhasználóhoz nem található email cím a külső hitelesítő rendszer által átadott adatokban',
     'oidc_fail_authed' => 'Bejelentkezés :system használatával sikertelen, a rendszer nem biztosított sikeres hitelesítést',
     'social_no_action_defined' => 'Nincs művelet meghatározva',
@@ -43,30 +43,30 @@
     'cannot_get_image_from_url' => 'Nem lehet lekérni a képet innen: :url',
     'cannot_create_thumbs' => 'A kiszolgáló nem tud létrehozni bélyegképeket. Ellenőrizni kell, hogy telepítve van-a a GD PHP kiterjesztés.',
     'server_upload_limit' => 'A kiszolgáló nem engedélyez ilyen méretű feltöltéseket. Kisebb fájlmérettel kell próbálkozni.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'A szerver nem tudja fogadni a megadott adatmennyiséget. Próbálkozz újra kevesebb adattal vagy egy kisebb fájllal.',
     'uploaded'  => 'A kiszolgáló nem engedélyez ilyen méretű feltöltéseket. Kisebb fájlmérettel kell próbálkozni.',
 
     // Drawing & Images
     'image_upload_error' => 'Hiba történt a kép feltöltése közben',
     'image_upload_type_error' => 'A feltöltött kép típusa érvénytelen',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_replace_type' => 'A cserélt képnek azonos típusúnak kell lennie',
+    'image_upload_memory_limit' => 'A rendszererőforrás-korlátok miatt nem sikerült kezelni a képfeltöltést és/vagy az indexképek létrehozását.',
+    'image_thumbnail_memory_limit' => 'A rendszererőforrás-korlátok miatt nem sikerült létrehozni a képméret-változatokat.',
+    'image_gallery_thumbnail_memory_limit' => 'A rendszererőforrás-korlátok miatt nem sikerült létrehozni a galéria bélyegképét.',
+    'drawing_data_not_found' => 'A rajzadatokat nem sikerült betölteni. Előfordulhat, hogy a rajzfájl már nem létezik, vagy nem rendelkezik hozzáférési engedéllyel.',
 
     // Attachments
     'attachment_not_found' => 'Csatolmány nem található',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Hiba történt a melléklet feltöltésekor',
 
     // Pages
     'page_draft_autosave_fail' => 'Nem sikerült a vázlat mentése. Mentés előtt meg kell róla győződni, hogy van internetkapcsolat',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Nem sikerült törölni az oldalvázlatot és lekérni az aktuális oldal mentett tartalmat',
     'page_custom_home_deletion' => 'Nem lehet oldalt törölni ha kezdőlapnak van beállítva',
 
     // Entities
     'entity_not_found' => 'Entitás nem található',
-    'bookshelf_not_found' => 'Shelf not found',
+    'bookshelf_not_found' => 'Polc nem található',
     'book_not_found' => 'Könyv nem található',
     'page_not_found' => 'Oldal nem található',
     'chapter_not_found' => 'Fejezet nem található',
@@ -94,10 +94,10 @@
     // Error pages
     '404_page_not_found' => 'Oldal nem található',
     'sorry_page_not_found' => 'Sajnáljuk, a keresett oldal nem található.',
-    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
+    'sorry_page_not_found_permission_warning' => 'Ha arra számított, hogy ez az oldal létezik, előfordulhat, hogy nincs engedélye a megtekintésére.',
     'image_not_found' => 'A kép nem található',
     'image_not_found_subtitle' => 'Sajnáljuk, a keresett kép nem található.',
-    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
+    'image_not_found_details' => 'Ha arra számított, hogy ez a kép létezik, akkor előfordulhat, hogy törölték.',
     'return_home' => 'Vissza a kezdőlapra',
     'error_occurred' => 'Hiba örtént',
     'app_down' => ':appName jelenleg nem üzemel',
@@ -107,7 +107,7 @@
     'api_no_authorization_found' => 'A kérésben nem található hitelesítési vezérjel',
     'api_bad_authorization_format' => 'A kérésben hitelesítési vezérjel található de a formátuma érvénytelennek tűnik',
     'api_user_token_not_found' => 'A megadott hitelesítési vezérjelhez nem található egyező API vezérjel',
-    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
+    'api_incorrect_token_secret' => 'Az API tokenhez használt secret helytelen',
     'api_user_no_api_permission' => 'A használt API vezérjel tulajdonosának nincs jogosultsága API hívások végrehajtásához',
     'api_user_token_expired' => 'A használt hitelesítési vezérjel lejárt',
 
@@ -115,5 +115,5 @@
     'maintenance_test_email_failure' => 'Hiba történt egy teszt email küldésekor:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'Az URL nem egyezik a konfigurált és engedélyezett SSR-állomásokkal',
 ];
diff --git a/lang/hu/notifications.php b/lang/hu/notifications.php
index 1afd23f1dc4..c8cae9143c3 100644
--- a/lang/hu/notifications.php
+++ b/lang/hu/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Új megjegyzés ezen az oldalon: :pageName',
+    'new_comment_intro' => 'Egy felhasználó hozzászólt egy oldalon itt: :appName:',
+    'new_page_subject' => 'Új oldal: :pageName',
+    'new_page_intro' => 'Az új oldal létrehozása sikeres volt itt: :appName:',
+    'updated_page_subject' => 'Frissített oldal: :pageName',
+    'updated_page_intro' => 'Az oldal frissítése sikeres volt itt: :appName:',
+    'updated_page_debounce' => 'Az értesítések tömegének elkerülése érdekében egy ideig nem kap értesítést az oldal további szerkesztéseiről ugyanaz a szerkesztő.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Oldal neve:',
+    'detail_page_path' => 'Oldal helye:',
+    'detail_commenter' => 'Hozzászóló:',
+    'detail_comment' => 'Megjegyzés:',
+    'detail_created_by' => 'Készítette:',
+    'detail_updated_by' => 'Frissítette:',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => 'Hozzászólás megtekintése',
+    'action_view_page' => 'Oldal megtekintése',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Ezt az értesítést azért küldtük, mert a :link lefedi ezt a tevékenységtípust ehhez az elemhez.',
+    'footer_reason_link' => 'értesítési beállításait',
 ];
diff --git a/lang/hu/preferences.php b/lang/hu/preferences.php
index 2b88f9671ff..65f6088eca5 100644
--- a/lang/hu/preferences.php
+++ b/lang/hu/preferences.php
@@ -5,47 +5,47 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Fiókom',
 
-    'shortcuts' => 'Shortcuts',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts' => 'Gyorsbillentyűk',
+    'shortcuts_interface' => 'UI parancsikon beállításai',
+    'shortcuts_toggle_desc' => 'Itt engedélyezheti vagy letilthatja a navigációhoz és műveletekhez használt billentyűparancsokat.',
+    'shortcuts_customize_desc' => 'Csak nyomja meg a kívánt billentyűkombinációt, miután kiválasztotta a parancsikon bevitelét.',
+    'shortcuts_toggle_label' => 'A billentyűparancsok engedélyezve',
+    'shortcuts_section_navigation' => 'Navigáció',
+    'shortcuts_section_actions' => 'Gyakori műveletek',
+    'shortcuts_save' => 'Gyorsbillentyűk mentése',
+    'shortcuts_overlay_desc' => 'Megjegyzés: Amikor a gyorsbillentyűk engedélyezve vannak, egy segítő átfedés érhető el azzal, hogy a "?" billentyűt megnyomva kiemeli az aktuálisan látható képernyőn elérhető gyorsbillentyűket a műveletekhez.',
+    'shortcuts_update_success' => 'A gyorsbillentyű-beállítások frissítve lettek!',
+    'shortcuts_overview_desc' => 'Kezelheted a billentyűparancsokat, amelyeket használhatsz a rendszerfelhasználói felület navigálásához.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications' => 'Értesítési beállítások',
+    'notifications_desc' => 'Állítsd be az e-mail értesítéseket, amelyeket akkor kapsz, ha bizonyos tevékenység történik a rendszeren belül.',
+    'notifications_opt_own_page_changes' => 'Értesítsen változásokról az általam tulajdonolt oldalakon',
+    'notifications_opt_own_page_comments' => 'Értesítés a hozzászólásokról az általam tulajdonolt oldalakon',
+    'notifications_opt_comment_replies' => 'Értesítsen válaszokról a hozzászólásaimra',
+    'notifications_save' => 'Beállítások mentése',
+    'notifications_update_success' => 'Az értesítési beállítások frissítve lettek!',
+    'notifications_watched' => 'Megfigyelt és figyelmen kívül hagyott elemek',
+    'notifications_watched_desc' => ' Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keress a figyelési lehetőségeket az oldalsávban.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'Hozzáférés és Biztonság',
+    'auth_change_password' => 'Jelszó módosítása',
+    'auth_change_password_desc' => 'Változtasd meg az alkalmazásba történő bejelentkezéshez használt jelszavadat. Ennek legalább 8 karakter hosszúnak kell lennie.',
+    'auth_change_password_success' => 'A jelszó frissítve lett!',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => 'Felhasználó részletei',
+    'profile_desc' => 'A kommunikációhoz és a rendszer személyre szabásához használt adatokon kívül kezelheti fiókja adatait, amelyek más felhasználók számára jelennek meg.',
+    'profile_view_public' => 'Nyilvános profil megtekintése',
+    'profile_name_desc' => 'Állítsa be a megjelenített nevét, amely látható lesz a rendszer többi felhasználója számára az Ön által végzett tevékenység és a saját tartalom révén.',
+    'profile_email_desc' => 'Ezt az e-mail címet értesítésekre fogjuk használni, valamint az érvényben lévő beállítások függvényében hitelesítéshez is.',
+    'profile_email_no_permission' => 'Sajnos nincs jogosultságod az e-mail cím megváltoztatására. Ha szeretnéd ezt megváltoztatni, kérj meg egy adminisztrátort, hogy ezt megtegye helyetted.',
+    'profile_avatar_desc' => 'Válassz egy képet, amelyet a rendszerben használnál a neved mellett. Ideális esetben a kép négyzet alakú és körülbelül 256px szélességű és magasságú legyen.',
+    'profile_admin_options' => 'Adminisztrátori beállítások',
+    'profile_admin_options_desc' => 'További adminisztrátori szintű lehetőségek, például a szerepkörök hozzárendelésének kezelése, megtalálhatóak a felhasználói fiókod beállításai között az "Beállítások > Felhasználók" területen az alkalmazásban.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'Felhasználói fiók törlése',
+    'delete_my_account' => 'Törlöm a felhasználói fiókomat',
+    'delete_my_account_desc' => 'Ez véglegesen törölni fogja a felhasználói fiókodat a rendszerből. Nem lesz lehetőséged visszaállítani ezt a fiókot, vagy visszavonni ezt a műveletet. A létrehozott tartalmak, például az oldalak és feltöltött képek megmaradnak.',
+    'delete_my_account_warning' => 'Biztosan törölni szeretnéd a fiókodat?',
 ];
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index 333b82574f1..a7a3d0f19fe 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -27,19 +27,19 @@
     'app_secure_images_toggle' => 'Magasabb biztonságú képfeltöltés engedélyezése',
     'app_secure_images_desc' => 'Teljesítmény optimalizálási okokból minden kép nyilvános. Ez a beállítás egy véletlenszerű, nehezen kitalálható karakterláncot illeszt a képek útvonalának elejére. Meg kell győződni róla, hogy a könnyű hozzáférés megakadályozása érdekében a könyvtár indexek nincsenek engedélyezve.',
     'app_default_editor' => 'Alapértelmezett  oldal szerkesztő',
-    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_default_editor_desc' => 'Válassza ki, hogy alapértelmezés szerint melyik szerkesztőt szeretné használni az új oldalak szerkesztésekor. Ezt felülírhatja oldalszintű szinten, amennyiben az engedélyek lehetővé teszik.',
     'app_custom_html' => 'Egyéni HTML fejléc tartalom',
     'app_custom_html_desc' => 'Az itt hozzáadott bármilyen tartalom be lesz illesztve minden oldal <head> szekciójának aljára. Ez hasznos a stílusok felülírásához van analitikai kódok hozzáadásához.',
     'app_custom_html_disabled_notice' => 'Az egyéni HTML fejléc tartalom le van tiltva ezen a beállítási oldalon, hogy az esetleg hibásan megadott módosításokat vissza lehessen állítani.',
     'app_logo' => 'Alkalmazás logó',
-    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_logo_desc' => 'Ez az alkalmazás fejléc sávjában van használva többek között. Ennek a képnek 86 képpont magasnak kell lennie. A nagy képek át lesznek méretezve.',
     'app_icon' => 'Alkalmazás ikon',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_icon_desc' => 'Ez az ikon a böngésző fülekhez és a gyorsikonokhoz használatos. Ez egy 256 képpont négyzet alakú PNG képnek kell lennie.',
     'app_homepage' => 'Alkalmazás kezdőlapja',
     'app_homepage_desc' => 'A kezdőlapon az alapértelmezés szerinti nézet helyett megjelenő nézet kiválasztása. A kiválasztott oldalakon figyelmen kívül lesznek hagyva az oldal engedélyek.',
     'app_homepage_select' => 'Egy oldal kiválasztása',
     'app_footer_links' => 'Lábléc linkek',
-    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
+    'app_footer_links_desc' => 'Adj hozzá linkeket a weboldal láblécéhez. Ezek a legtöbb oldalon megjelennek, beleértve azokat is, amelyekhez nincs szükség bejelentkezésre. Használhatsz egy "trans::<key>" címkét a rendszer által definiált fordítások használatához. Például: A "trans::common.privacy_policy" használata a lefordított szöveget ("Adatvédelmi Irányelvek") adja vissza, és a "trans::common.terms_of_service" a "Szolgáltatási feltételek" lefordított szöveget adja eredményül.',
     'app_footer_links_label' => 'Link címke',
     'app_footer_links_url' => 'Link URL',
     'app_footer_links_add' => 'Lábléc hivatkozás hozzáadása',
@@ -49,11 +49,11 @@
 
     // Color settings
     'color_scheme' => 'Alkalmazás színséma',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'color_scheme_desc' => 'Állítsd be a színeket az alkalmazás felhasználói felületén. A színeket külön-külön lehet konfigurálni a sötét és a világos módokhoz, hogy a legjobban illeszkedjenek a témához, és biztosítsák az olvashatóságot.',
+    'ui_colors_desc' => 'Állítsa be az alkalmazás elsődleges színét és alapértelmezett hivatkozási színét. Az elsődleges színt főként a fejléc szalaghirdetéséhez, a gombokhoz és a felület díszítéséhez használják. Az alapértelmezett hivatkozásszín a szöveges hivatkozásokhoz és műveletekhez használatos, mind az írott tartalomban, mind az alkalmazás felületén.',
     'app_color' => 'Elsődleges szín',
     'link_color' => 'Alapértelmezett link szín',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'content_colors_desc' => 'Beállítja az elemek színét az oldalszervezési hierarchiában. Az olvashatóság szempontjából javasolt az alapértelmezés szerinti színhez hasonló fényerősséget választani.',
     'bookshelf_color' => 'Polc színe',
     'book_color' => 'Könyv színe',
     'chapter_color' => 'Fejezet színe',
@@ -78,7 +78,7 @@
     'maint' => 'Karbantartás',
     'maint_image_cleanup' => 'Képek tisztítása',
     'maint_image_cleanup_desc' => 'Végigolvassa az oldalakat és a tartalmak változatait, hogy leellenőrizze jelenleg mely képek és rajzok vannak használatban, és mely képek szerepelnek többször. A futtatása előtt feltétlen készíteni kell egy teljes adatbázis és lemezkép mentést.',
-    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_delete_images_only_in_revisions' => 'Törölje azokat a képeket is, amelyek csak a régi oldalverziókban léteznek',
     'maint_image_cleanup_run' => 'Tisztítás futtatása',
     'maint_image_cleanup_warning' => ':count potenciálisan nem használt képet találtam. Biztosan törölhetőek ezek a képek?',
     'maint_image_cleanup_success' => ':count potenciálisan nem használt kép megtalálva és törölve!',
@@ -90,16 +90,16 @@
     'maint_send_test_email_mail_subject' => 'Teszt e-mail',
     'maint_send_test_email_mail_greeting' => 'Az email kézbesítés működőképesnek tűnik!',
     'maint_send_test_email_mail_text' => 'Gratulálunk! Mivel ez az email figyelmeztetés megérkezett az email beállítások megfelelőek.',
-    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_desc' => 'A törölt polcok, könyvek, fejezetek és oldalak a lomtárba kerülnek, így visszaállíthatók vagy véglegesen törölhetők. A rendszer konfigurációtól függően egy idő után a lomtárban lévő régebbi elemek automatikusan eltávolíthatók.',
     'maint_recycle_bin_open' => 'Lomtár megnyitása',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint_regen_references' => 'Referenciák újragenerálása',
+    'maint_regen_references_desc' => 'Ez a művelet újraépíti az adatbázison belüli elemek közötti hivatkozási indexet. Ez általában automatikusan történik, de ez a művelet hasznos lehet régi vagy nem hivatalos módszerekkel hozzáadott tartalom indexeléséhez.',
+    'maint_regen_references_success' => 'A referenciaindex újragenerálásra került!',
+    'maint_timeout_command_note' => 'Megjegyzés: Ennek a műveletnek a futtatása időbe telhet, ami bizonyos webes környezetekben időtúllépési problémákhoz vezethet. Alternatív megoldásként ezt a műveletet terminálparancs segítségével is végrehajthatja.',
 
     // Recycle Bin
     'recycle_bin' => 'Lomtár',
-    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_desc' => 'Itt visszaállíthatja a törölt elemeket, vagy dönthet úgy, hogy véglegesen eltávolítja őket a rendszerből. Ez a lista nem szűrhető, ellentétben a rendszer hasonló tevékenységlistáival, ahol engedélyszűrőket alkalmaznak.',
     'recycle_bin_deleted_item' => 'Törölt elem',
     'recycle_bin_deleted_parent' => 'Szülő',
     'recycle_bin_deleted_by' => 'Törölte',
@@ -108,26 +108,26 @@
     'recycle_bin_restore' => 'Visszaállítás',
     'recycle_bin_contents_empty' => 'A lomtár jelenleg üres',
     'recycle_bin_empty' => 'Lomtár kiürítése',
-    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_empty_confirm' => 'Ezzel véglegesen megsemmisíti a lomtárban lévő összes elemet, beleértve az egyes tételekben található tartalmat is. Biztos benne, hogy ki akarja üríteni a lomtárat?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Megsemmisítendő elemek',
     'recycle_bin_restore_list' => 'Visszaállítandó elemek',
-    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
-    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_confirm' => 'Ez a művelet visszaállítja a törölt elemet, beleértve az utódelemeket is, az eredeti helyükre. Ha az eredeti helyet azóta törölték, és most a lomtárban van, akkor a szülőelemet is vissza kell állítani.',
+    'recycle_bin_restore_deleted_parent' => 'Ennek az elemnek a szülője is törölve lett. Ezek mindaddig törölve maradnak, amíg az adott szülőt is vissza nem állítják.',
     'recycle_bin_restore_parent' => 'Szűlő visszaállítása',
-    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
-    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+    'recycle_bin_destroy_notification' => 'Összesen :count elemet törölt a lomtárból.',
+    'recycle_bin_restore_notification' => 'Összesen :count elemet helyreállítottak a lomtárból.',
 
     // Audit Log
     'audit' => 'Audit napló',
-    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_desc' => 'Ez a napló a rendszerben nyomon követett tevékenységek listáját jeleníti meg. Ez a lista nem szűrhető, ellentétben a rendszer hasonló tevékenységlistáival, ahol engedélyszűrőket alkalmaznak.',
     'audit_event_filter' => 'Eseményszűrő',
     'audit_event_filter_no_filter' => 'Nincs szűrő',
     'audit_deleted_item' => 'Törölt elem',
     'audit_deleted_item_name' => 'Név: :name',
     'audit_table_user' => 'Felhasználó',
     'audit_table_event' => 'Esemény',
-    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_related' => 'Kapcsolódó elem vagy részlet',
     'audit_table_ip' => 'IP Cím',
     'audit_table_date' => 'Tevékenység időpontja',
     'audit_date_from' => 'Kezdő dátum',
@@ -136,11 +136,11 @@
     // Role Settings
     'roles' => 'Szerepkörök',
     'role_user_roles' => 'Felhasználói szerepkörök',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_index_desc' => 'A szerepkörök a felhasználók csoportosítására és rendszerengedélyek biztosítására szolgálnak tagjaiknak. Ha egy felhasználó több szerepkör tagja, a megadott jogosultságok halmozódnak, és a felhasználó örökli az összes képességet.',
+    'roles_x_users_assigned' => ':count hozzárendelt felhasználó|:count hozzárendelt felhasználó',
+    'roles_x_permissions_provided' => ':count jogosultság|:count jogosultság',
     'roles_assigned_users' => 'Hozzárendelt felhasználók',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_permissions_provided' => 'Megadott jogosultságok',
     'role_create' => 'Új szerepkör létrehozása',
     'role_delete' => 'Szerepkör törlése',
     'role_delete_confirm' => 'Ez törölni fogja \':roleName\' szerepkört.',
@@ -162,13 +162,13 @@
     'role_access_api' => 'Hozzáférés a rendszer API-hoz',
     'role_manage_settings' => 'Alkalmazás beállításainak kezelése',
     'role_export_content' => 'Tartalom exportálása',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_editor_change' => 'Oldalszerkesztő módosítása',
+    'role_notifications' => 'Értesítések fogadása és kezelése',
     'role_asset' => 'Eszköz jogosultságok',
-    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'roles_system_warning' => 'Ne feledje, hogy a fenti három engedély bármelyikéhez való hozzáférés lehetővé teszi a felhasználó számára, hogy módosítsa saját vagy a rendszerben mások jogosultságait. Csak megbízható felhasználókhoz rendeljen szerepeket ezekkel az engedélyekkel.',
     'role_asset_desc' => 'Ezek a jogosultságok vezérlik az alapértelmezés szerinti hozzáférést a rendszerben található eszközökhöz. A könyvek, fejezetek és oldalak jogosultságai felülírják ezeket a jogosultságokat.',
     'role_asset_admins' => 'Az adminisztrátorok automatikusan hozzáférést kapnak minden tartalomhoz, de ezek a beállítások megjeleníthetnek vagy elrejthetnek felhasználói felület beállításokat.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => 'Ez a képkezelőn belüli láthatóságra vonatkozik. A feltöltött képfájlok tényleges elérése a rendszerkép tárolási beállításától függ.',
     'role_all' => 'Összes',
     'role_own' => 'Saját',
     'role_controlled_by_asset' => 'Az általuk feltöltött eszköz által ellenőrzött',
@@ -178,7 +178,7 @@
 
     // Users
     'users' => 'Felhasználók',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'Egyéni felhasználói fiókok létrehozása és kezelése a rendszeren belül. A felhasználói fiókok a bejelentkezéshez, valamint a tartalom és tevékenység hozzárendeléséhez használatosak. A hozzáférési engedélyek elsősorban szerepalapúak, de a felhasználói tartalmak tulajdonlása – többek között – befolyásolhatja az engedélyeket és a hozzáférést.',
     'user_profile' => 'Felhasználói profil',
     'users_add_new' => 'Új felhasználó hozzáadása',
     'users_search' => 'Felhasználók keresése',
@@ -189,19 +189,19 @@
     'users_role' => 'Felhasználói szerepkörök',
     'users_role_desc' => 'A felhasználó melyik szerepkörhöz lesz rendelve. Ha a felhasználó több szerepkörhöz van rendelve, akkor ezeknek a szerepköröknek a jogosultságai összeadódnak, és a a felhasználó a hozzárendelt szerepkörök minden képességét megkapja.',
     'users_password' => 'Felhasználó jelszava',
-    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_password_desc' => 'Az alkalmazásba bejelentkezéshez használható jelszó beállítása. Legalább 8 karakter hosszúnak kell lennie.',
     'users_send_invite_text' => 'Lehetséges egy meghívó emailt küldeni ennek a felhasználónak ami lehetővé teszi, hogy beállíthassa a saját jelszavát. Máskülönben a jelszót az erre jogosult felhasználónak kell beállítania.',
     'users_send_invite_option' => 'Felhasználó meghívó levél küldése',
     'users_external_auth_id' => 'Külső hitelesítés azonosítója',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Ha külső hitelesítési rendszer van használatban (például SAML2, OIDC vagy LDAP), ez az az azonosító, amely a BookStack felhasználót a hitelesítési rendszerfiókhoz kapcsolja. Ha az alapértelmezett e-mail alapú hitelesítést használja, figyelmen kívül hagyhatja ezt a mezőt.',
+    'users_password_warning' => 'Csak akkor töltse ki az alábbi mezőt, ha módosítani szeretné ennek a felhasználónak a jelszavát.',
     'users_system_public' => 'Ez a felhasználó bármelyik, a példányt megtekintő felhasználót képviseli. Nem lehet vele bejelentkezni de automatikusan hozzá lesz rendelve.',
     'users_delete' => 'Felhasználó törlése',
     'users_delete_named' => ':userName felhasználó törlése',
     'users_delete_warning' => '\':userName\' felhasználó teljesen törölve lesz a rendszerből.',
     'users_delete_confirm' => 'Biztosan törölhető ez a felhasználó?',
     'users_migrate_ownership' => 'Tulajdonjog átruházása',
-    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_migrate_ownership_desc' => 'Válasszon itt egy felhasználót, ha azt szeretné, hogy egy másik felhasználó legyen a tulajdonosa az összes, jelenleg a felhasználó tulajdonában lévő elemnek.',
     'users_none_selected' => 'Nincs felhasználó kiválasztva',
     'users_edit' => 'Felhasználó szerkesztése',
     'users_edit_profile' => 'Profil szerkesztése',
@@ -210,37 +210,37 @@
     'users_preferred_language' => 'Előnyben részesített nyelv',
     'users_preferred_language_desc' => 'Ez a beállítás megváltoztatja az alkalmazás felhasználói felületén használt nyelvet. Nincs hatása a felhasználók által létrehozott tartalomra.',
     'users_social_accounts' => 'Közösségi fiókok',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Tekintse meg a felhasználó csatlakoztatott közösségi fiókjainak állapotát. A közösségi fiókok az elsődleges hitelesítési rendszer mellett használhatók a rendszerhez való hozzáféréshez.',
     'users_social_accounts_info' => 'Itt lehet egyéb fiókokat hozzákapcsolni a gyorsabb és könnyebb bejelentkezés érdekében. Itt olyan fiókot lehet lecsatlakoztatni, melynek korábban nem volt engedélyezett hozzáférése. Visszavonja a hozzáférést a csatlakoztatott szociális fiók profilbeállításaiból.',
     'users_social_connect' => 'Fiók csatlakoztatása',
     'users_social_disconnect' => 'Fiók lecsatlakoztatása',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Csatlakozva',
+    'users_social_status_disconnected' => 'Lecsatlakozva',
     'users_social_connected' => ':socialAccount fiók sikeresen csatlakoztatva a profilhoz.',
     'users_social_disconnected' => ':socialAccount fiók sikeresen lecsatlakoztatva a profilról.',
     'users_api_tokens' => 'API vezérjelek',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'A BookStack REST API-val történő hitelesítéshez használt hozzáférési token létrehozása és kezelése. Az API engedélyeit azon a felhasználón keresztül kezelik, akihez a token tartozik.',
     'users_api_tokens_none' => 'Ehhez a felhasználóhoz nincsenek létrehozva API vezérjelek',
     'users_api_tokens_create' => 'Vezérjel létrehozása',
     'users_api_tokens_expires' => 'Lejárat',
     'users_api_tokens_docs' => 'API dokumentáció',
     'users_mfa' => 'Többfaktoros hitelesítés',
-    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
-    'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_desc' => 'Állítsa be a többlépcsős azonosítást egy extra biztonsági rétegként a felhasználói fiókjához.',
+    'users_mfa_x_methods' => ':count metódus konfigurálva|:count metódus konfigurálva',
+    'users_mfa_configure' => 'Módszer beállítása',
 
     // API Tokens
     'user_api_token_create' => 'API vezérjel létrehozása',
     'user_api_token_name' => 'Név',
-    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_name_desc' => 'Adjon a tokennek egy olvasható nevet, hogy a jövőben emlékeztessen a tervezett céljára.',
     'user_api_token_expiry' => 'Lejárati dátum',
     'user_api_token_expiry_desc' => 'Dátum megadása ameddig a vezérjel érvényes. Ez után a dátum után az ezzel a vezérjellel történő kérések nem fognak működni. Üresen hagyva a lejárati idő 100 évre lesz beállítva.',
-    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token_create_secret_message' => 'Közvetlenül a token létrehozása után egy „Token ID” és „Token Secret” generálódik és jelenik meg. A Secret csak egyszer jelenik meg, ezért a folytatás előtt másolja át az értéket egy biztonságos helyre.',
     'user_api_token' => 'API vezérjel',
     'user_api_token_id' => 'Vezérjel azonosító',
     'user_api_token_id_desc' => 'Ez egy nem szerkeszthető, a rendszer által létrehozott azonosító ehhez a vezérjelhez amire API kérésekben lehet szükség.',
     'user_api_token_secret' => 'Vezérjel titkos kódja',
-    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_secret_desc' => 'Ez egy rendszer által generált "secret" ehhez a tokenhez, amelyet meg kell adni az API-kérésekben. Ez csak most jelenik meg, ezért másolja ezt az értéket egy biztonságos helyre.',
     'user_api_token_created' => 'Vezérjel létrehozva :timeAgo',
     'user_api_token_updated' => 'Vezérjel frissítve :timeAgo',
     'user_api_token_delete' => 'Vezérjel törlése',
@@ -249,32 +249,32 @@
 
     // Webhooks
     'webhooks' => 'Webhook-ok',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
-    'webhooks_create' => 'Create New Webhook',
-    'webhooks_none_created' => 'No webhooks have yet been created.',
-    'webhooks_edit' => 'Edit Webhook',
-    'webhooks_save' => 'Save Webhook',
-    'webhooks_details' => 'Webhook Details',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
-    'webhooks_events_all' => 'All system events',
-    'webhooks_name' => 'Webhook Name',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
-    'webhook_events_table_header' => 'Events',
-    'webhooks_delete' => 'Delete Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
-    'webhooks_format_example' => 'Webhook Format Example',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
-    'webhooks_status' => 'Webhook Status',
-    'webhooks_last_called' => 'Last Called:',
-    'webhooks_last_errored' => 'Last Errored:',
-    'webhooks_last_error_message' => 'Last Error Message:',
+    'webhooks_index_desc' => 'A webhookok segítségével adatokat küldhetünk külső URL-ekre, amikor bizonyos műveletek és események történnek a rendszeren belül, ami lehetővé teszi az eseményalapú integrációt külső platformokkal, például üzenetküldő vagy értesítési rendszerekkel.',
+    'webhooks_x_trigger_events' => ':count kiváltó esemény|:count kiváltó esemény',
+    'webhooks_create' => 'Új webhook létrehozása',
+    'webhooks_none_created' => 'Még nincs létrehozva egy webhook sem.',
+    'webhooks_edit' => 'Webhook szerkesztése',
+    'webhooks_save' => 'Webhook mentése',
+    'webhooks_details' => 'Webhook részletei',
+    'webhooks_details_desc' => 'Adjon meg egy felhasználóbarát nevet és egy POST-végpontot a webhook-adatok elküldésének helyeként.',
+    'webhooks_events' => 'Webhook események',
+    'webhooks_events_desc' => 'Jelölje ki az összes eseményt, amely kiváltja a webhook meghívását.',
+    'webhooks_events_warning' => 'Ne feledje, hogy ezek az események az összes kiválasztott eseménynél aktiválódnak, még akkor is, ha egyéni engedélyeket alkalmaznak. Győződjön meg arról, hogy a webhook használata nem tesz közzé bizalmas tartalmat.',
+    'webhooks_events_all' => 'Minden rendszeresemény',
+    'webhooks_name' => 'Webhook neve',
+    'webhooks_timeout' => 'Webhook kérés időtúllépése (másodperc)',
+    'webhooks_endpoint' => 'Webhook végpont',
+    'webhooks_active' => 'Webhook aktív',
+    'webhook_events_table_header' => 'Események',
+    'webhooks_delete' => 'Webhook törlése',
+    'webhooks_delete_warning' => 'Ezzel a \':webhookName\' nevű webhookot teljesen törli a rendszerből.',
+    'webhooks_delete_confirm' => 'Biztosan törli ezt a webhookot?',
+    'webhooks_format_example' => 'Webhook formátum példa',
+    'webhooks_format_example_desc' => 'A Webhook-adatok POST-kérésként kerülnek elküldésre a konfigurált végponthoz JSON-ként az alábbi formátumban. A "related_item" és az "url" tulajdonság nem kötelező, és az aktivált esemény típusától függ.',
+    'webhooks_status' => 'Webhook állapota',
+    'webhooks_last_called' => 'Utolsó hívás:',
+    'webhooks_last_errored' => 'Utolsó hiba:',
+    'webhooks_last_error_message' => 'Utolsó hibaüzenet:',
 
 
     //! If editing translations files directly please ignore this in all
diff --git a/lang/hu/validation.php b/lang/hu/validation.php
index db6d24f8a2c..863e39d530d 100644
--- a/lang/hu/validation.php
+++ b/lang/hu/validation.php
@@ -15,7 +15,7 @@
     'alpha_dash'           => ':attribute csak betűket, számokat és kötőjeleket tartalmazhat.',
     'alpha_num'            => ':attribute csak betűket és számokat tartalmazhat.',
     'array'                => ':attribute tömb kell legyen.',
-    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'backup_codes'         => 'A megadott kód érvénytelen, vagy már felhasználták.',
     'before'               => ':attribute dátumnak :date előttinek kell lennie.',
     'between'              => [
         'numeric' => ':attribute értékének :min és :max között kell lennie.',
@@ -32,7 +32,7 @@
     'digits_between'       => ':attribute hosszának :min és :max számjegy között kell lennie.',
     'email'                => ':attribute érvényes email cím kell legyen.',
     'ends_with' => ':attribute attribútumnak a következők egyikével kell végződnie: :values',
-    'file'                 => 'The :attribute must be provided as a valid file.',
+    'file'                 => 'A(z) :attribute érvényes fájlnak kell lennie.',
     'filled'               => ':attribute mező kötelező.',
     'gt'                   => [
         'numeric' => ':attribute nagyobb kell, hogy legyen, mint :value.',
@@ -42,9 +42,9 @@
     ],
     'gte'                  => [
         'numeric' => ':attribute attribútumnak :value értéknél nagyobbnak vagy vele egyenlőnek kell lennie.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'file'    => 'A(z) :attribute mérete nem lehet kevesebb, mint :value kilobájt.',
+        'string'  => 'A(z) :attribute nagyobbnak, vagy egyenlőnek kell lennie, mint a :value karakter.',
+        'array'   => 'A(z) :attribute rendelkezzen :value vagy több elemmel.',
     ],
     'exists'               => 'A kiválasztott :attribute érvénytelen.',
     'image'                => ':attribute kép kell legyen.',
@@ -52,20 +52,20 @@
     'in'                   => 'A kiválasztott :attribute érvénytelen.',
     'integer'              => ':attribute egész szám kell legyen.',
     'ip'                   => ':attribute érvényes IP cím kell legyen.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
+    'ipv4'                 => 'A(z) :attribute érvényes IPv4 címnek kell lennie.',
+    'ipv6'                 => 'A(z) :attribute érvényes IPv6 címnek kell lennie.',
+    'json'                 => 'A(z) :attribute érvényes JSON stringnek kell lennie.',
     'lt'                   => [
-        'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'numeric' => 'A(z) :attribute kisebb kell, hogy legyen, mint :value.',
+        'file'    => 'A(z) :attribute kevesebbnek kell lennie, mint :value kilobájt.',
+        'string'  => 'A(z) :attribute rövidebb kell, hogy legyen, mint :value karakter.',
+        'array'   => 'A(z) :attribute kevesebb, mint :value elemet kell, hogy tartalmazzon.',
     ],
     'lte'                  => [
-        'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'numeric' => 'A(z) :attribute kisebb vagy egyenlő kell, hogy legyen, mint :value.',
+        'file'    => 'A(z) :attribute mérete nem lehet több, mint :value kilobájt.',
+        'string'  => 'A(z) :attribute hossza nem lehet több, mint :value karakter.',
+        'array'   => 'A(z) :attribute legfeljebb :value elemet kell, hogy tartalmazzon.',
     ],
     'max'                  => [
         'numeric' => ':attribute nem lehet nagyobb mint :max.',
@@ -91,7 +91,7 @@
     'required_without'     => ':attribute mező kötelező ha :values nincs beállítva.',
     'required_without_all' => ':attribute mező kötelező ha egyik :values sincs beállítva.',
     'same'                 => ':attribute és :other értékének egyeznie kell.',
-    'safe_url'             => 'The provided link may not be safe.',
+    'safe_url'             => 'Előfordulhat, hogy a megadott link nem biztonságos.',
     'size'                 => [
         'numeric' => ':attribute :size méretű kell legyen.',
         'file'    => ':attribute :size kilobájt méretű kell legyen.',
@@ -100,7 +100,7 @@
     ],
     'string'               => ':attribute karaktersorozatnak kell legyen.',
     'timezone'             => ':attribute érvényes zóna kell legyen.',
-    'totp'                 => 'The provided code is not valid or has expired.',
+    'totp'                 => 'A megadott kód érvénytelen vagy lejárt.',
     'unique'               => ':attribute már elkészült.',
     'url'                  => ':attribute formátuma érvénytelen.',
     'uploaded'             => 'A fájlt nem lehet feltölteni. A kiszolgáló nem fogad el ilyen méretű fájlokat.',
diff --git a/lang/id/activities.php b/lang/id/activities.php
index 3337fcdd85c..b8b8bbe87c8 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Pengguna berhasil dihapus',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/id/common.php b/lang/id/common.php
index efb72dc4dd8..a7f21589fd1 100644
--- a/lang/id/common.php
+++ b/lang/id/common.php
@@ -20,7 +20,7 @@
     'description' => 'Deskripsi',
     'role' => 'Peran',
     'cover_image' => 'Sampul gambar',
-    'cover_image_description' => 'Gambar ini harus berukuran kira-kira 440x250 piksel.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Tindakan',
diff --git a/lang/id/editor.php b/lang/id/editor.php
index 18d85733fa7..73a374a1dc2 100644
--- a/lang/id/editor.php
+++ b/lang/id/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 0c7c7a9ef44..091f54e000b 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Dokumen PDF',
     'export_text' => 'Dokumen Teks Biasa',
     'export_md' => 'File Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Izin',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Sunting Buku :bookName',
     'books_form_book_name' => 'Nama Buku',
     'books_save' => 'Simpan Buku',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Izin Buku',
     'books_permissions_updated' => 'Izin Buku Diperbarui',
     'books_empty_contents' => 'Tidak ada halaman atau bab yang telah dibuat untuk buku ini.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Hapus Halaman Draf',
     'pages_delete_success' => 'Halaman dihapus',
     'pages_delete_draft_success' => 'Halaman draf dihapus',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Anda yakin ingin menghapus halaman ini?',
     'pages_delete_draft_confirm' => 'Anda yakin ingin menghapus halaman draf ini?',
     'pages_editing_named' => 'Menyunting Halaman :pageName',
diff --git a/lang/id/errors.php b/lang/id/errors.php
index 7ed7f2e1196..64ac146397e 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Pengguna dengan email :email sudah ada tetapi dengan kredensial berbeda.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email telah dikonfirmasi, Coba masuk.',
     'email_confirmation_invalid' => 'Token konfirmasi ini tidak valid atau telah digunakan, Silakan coba mendaftar lagi.',
     'email_confirmation_expired' => 'Token konfirmasi telah kedaluwarsa, Email konfirmasi baru telah dikirim.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Permintaan dari sistem otentikasi eksternal tidak dikenali oleh sebuah proses yang dimulai oleh aplikasi ini. Menavigasi kembali setelah masuk dapat menyebabkan masalah ini.',
     'saml_fail_authed' => 'Masuk menggunakan :system gagal, sistem tidak memberikan otorisasi yang berhasil',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'Tidak ada tindakan yang ditentukan',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 515d4bd9520..54013362816 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Hapus Secara Permanen',
     'recycle_bin_empty' => 'Kosongkan Tempat Sampah',
     'recycle_bin_empty_confirm' => 'Ini akan menghancurkan secara permanen semua item di tempat sampah termasuk konten yang ada di dalam setiap item. Anda yakin ingin mengosongkan tempat sampah?',
-    'recycle_bin_destroy_confirm' => 'Tindakan ini akan menghapus item ini secara permanen, bersama dengan elemen turunan apa pun yang tercantum di bawah, dari sistem dan Anda tidak akan dapat memulihkan konten ini. Anda yakin ingin menghapus item ini secara permanen?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Item yang akan Dihancurkan',
     'recycle_bin_restore_list' => 'Item yang akan Dipulihkan',
     'recycle_bin_restore_confirm' => 'Tindakan ini akan memulihkan item yang dihapus, termasuk semua elemen anak, ke lokasi aslinya. Jika lokasi asli telah dihapus, dan sekarang berada di keranjang sampah, item induk juga perlu dipulihkan.',
diff --git a/lang/it/activities.php b/lang/it/activities.php
index ba07709c082..518ffb26961 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Utente rimosso con successo',
 
     // API Tokens
-    'api_token_create' => 'token api creato',
+    'api_token_create' => 'token API creato',
     'api_token_create_notification' => 'Token API creato con successo',
-    'api_token_update' => 'token api aggiornato',
+    'api_token_update' => 'token API aggiornato',
     'api_token_update_notification' => 'Token API aggiornato correttamente',
-    'api_token_delete' => 'token api eliminato',
+    'api_token_delete' => 'token API eliminato',
     'api_token_delete_notification' => 'Token API eliminato con successo',
 
     // Roles
diff --git a/lang/it/common.php b/lang/it/common.php
index 4501c606cbb..b886ac35c0b 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descrizione',
     'role' => 'Ruolo',
     'cover_image' => 'Immagine di copertina',
-    'cover_image_description' => 'Questa immagine dovrebbe essere approssimativamente 440x250px.',
+    'cover_image_description' => 'L\'immagine dovrebbe essere di circa 440x250px, anche se verrà ridimensionata e ritagliata in modo flessibile per adattarsi all\'interfaccia utente in diversi scenari, quindi le dimensioni effettive per la visualizzazione saranno diverse.',
 
     // Actions
     'actions' => 'Azioni',
diff --git a/lang/it/editor.php b/lang/it/editor.php
index 6d3af834347..dc05fcb4314 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Proprietà della tabella',
     'table_properties_title' => 'Proprietà della tabella',
     'delete_table' => 'Elimina tabella',
+    'table_clear_formatting' => 'Cancella formattazione tabella',
+    'resize_to_contents' => 'Ridimensiona al contenuto',
+    'row_header' => 'Intestazione riga',
     'insert_row_before' => 'Inserisci riga sopra',
     'insert_row_after' => 'Inserisci riga sotto',
     'delete_row' => 'Elimina riga',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 383cb4e7c2d..4c49dae5e16 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'File PDF',
     'export_text' => 'File di testo',
     'export_md' => 'File Markdown',
+    'default_template' => 'Modello Di Pagina Predefinito',
+    'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tenere presente che questo verrà utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
+    'default_template_select' => 'Seleziona una pagina modello',
 
     // Permissions and restrictions
     'permissions' => 'Permessi',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Modifica il libro :bookName',
     'books_form_book_name' => 'Nome Libro',
     'books_save' => 'Salva Libro',
-    'books_default_template' => 'Pagina template predefinita',
-    'books_default_template_explain' => 'Assegnare una pagina template che verrà utilizzata come contenuto predefinito per tutte le nuove pagine di questo libro. Tenete presente che questa sarà usata solo se il creatore della pagina ha accesso di visualizzazione alla pagina template scelta.',
-    'books_default_template_select' => 'Selezionare una pagina template',
     'books_permissions' => 'Permessi Libro',
     'books_permissions_updated' => 'Permessi del libro aggiornati',
     'books_empty_contents' => 'Non ci sono pagine o capitoli per questo libro.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Elimina Bozza Pagina',
     'pages_delete_success' => 'Pagina eliminata',
     'pages_delete_draft_success' => 'Bozza di una pagina eliminata',
-    'pages_delete_warning_template' => 'Questa pagina è in uso come pagina template predefinita di un libro. Dopo l\'eliminazione di questa pagina, a questi libri non verrà più assegnato una pagina template predefinita.',
+    'pages_delete_warning_template' => 'Questa pagina è in uso attivo come modello di pagina predefinito del libro o del capitolo. Questi libri o capitoli non avranno più un modello di pagina predefinito assegnato dopo che questa pagina è stata eliminata.',
     'pages_delete_confirm' => 'Sei sicuro di voler eliminare questa pagina?',
     'pages_delete_draft_confirm' => 'Sei sicuro di voler eliminare la bozza di questa pagina?',
     'pages_editing_named' => 'Modifica :pageName',
@@ -348,7 +348,7 @@
     'attachments_file_uploaded' => 'File caricato correttamente',
     'attachments_file_updated' => 'File aggiornato correttamente',
     'attachments_link_attached' => 'Link allegato correttamente alla pagina',
-    'templates' => 'Template',
+    'templates' => 'Modello',
     'templates_set_as_template' => 'La pagina è un template',
     'templates_explain_set_as_template' => 'Puoi impostare questa pagina come template in modo che il suo contenuto sia utilizzato quando si creano altre pagine. Gli altri utenti potranno utilizzare questo template se avranno i permessi di visualizzazione per questa pagina.',
     'templates_replace_content' => 'Rimpiazza contenuto della pagina',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index 6ec9c36a011..ea24eeeab29 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un utente con la mail :email esiste già ma con credenziali differenti.',
+    'auth_pre_register_theme_prevention' => 'Non è stato possibile registrare l\'account utente coi dettagli forniti',
     'email_already_confirmed' => 'La mail è già stata confermata, esegui il login.',
     'email_confirmation_invalid' => 'Questo token di conferma non è valido o già stato utilizzato, registrati nuovamente.',
     'email_confirmation_expired' => 'Il token di conferma è scaduto, è stata inviata una nuova mail di conferma.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'La richiesta dal sistema di autenticazione esterno non è riconosciuta da un processo iniziato da questa applicazione. Tornare indietro dopo un login potrebbe causare questo problema.',
     'saml_fail_authed' => 'Accesso con :system non riuscito, il sistema non ha fornito l\'autorizzazione corretta',
     'oidc_already_logged_in' => 'Hai già effettuato il login',
-    'oidc_user_not_registered' => 'L\'utente :name non è registrato e la registrazione automatica è disabilitata',
     'oidc_no_email_address' => 'Impossibile trovare un indirizzo email, per questo utente, nei dati forniti dal sistema di autenticazione esterno',
     'oidc_fail_authed' => 'Accesso con :system non riuscito, il sistema non ha fornito l\'autorizzazione',
     'social_no_action_defined' => 'Nessuna azione definita',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 9ddde05b494..a6e5537be0a 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Al momento il cestino è vuoto',
     'recycle_bin_empty' => 'Svuota Cestino',
     'recycle_bin_empty_confirm' => 'Questa operazione cancellerà definitivamente tutti gli elementi presenti nel cestino, inclusi i contenuti relativi a ciascun elemento. Sei sicuro di voler svuotare il cestino?',
-    'recycle_bin_destroy_confirm' => 'Questa operazione eliminerà permanentemente questo elemento (insieme a tutti i relativi elementi elencati qui sotto) dal sistema e non sarà più possibile recuperarlo. Sei sicuro di voler eliminare permanentemente questo elemento?',
+    'recycle_bin_destroy_confirm' => 'Questa azione eliminerà definitivamente questo elemento dal sistema, insieme a qualsiasi elemento figlio elencato di seguito, e non sarai in grado di ripristinare questo contenuto. Sei sicuro di voler eliminare definitivamente questo elemento?',
     'recycle_bin_destroy_list' => 'Elementi da Eliminare definitivamente',
     'recycle_bin_restore_list' => 'Elementi da Ripristinare',
     'recycle_bin_restore_confirm' => 'Questa azione ripristinerà l\'elemento eliminato, compresi gli elementi figli, nella loro posizione originale. Se la posizione originale è stata eliminata, ed è ora nel cestino, anche l\'elemento padre dovrà essere ripristinato.',
@@ -158,7 +158,7 @@
     'role_manage_roles' => 'Gestire ruoli e permessi di essi',
     'role_manage_entity_permissions' => 'Gestire tutti i permessi di libri, capitoli e pagine',
     'role_manage_own_entity_permissions' => 'Gestire i permessi sui propri libri, capitoli e pagine',
-    'role_manage_page_templates' => 'Gestisci template pagine',
+    'role_manage_page_templates' => 'Gestisci modelli di pagina',
     'role_access_api' => 'API sistema d\'accesso',
     'role_manage_settings' => 'Gestire impostazioni app',
     'role_export_content' => 'Esporta contenuto',
diff --git a/lang/ja/common.php b/lang/ja/common.php
index 5810d306d55..0d10e3cc9c6 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -20,7 +20,7 @@
     'description' => '概要',
     'role' => '権限',
     'cover_image' => 'カバー画像',
-    'cover_image_description' => 'この画像はおよそ440x250pxの大きさが必要です。',
+    'cover_image_description' => 'この画像はおよそ440x250pxであるべきですが、必要に応じてさまざまなシナリオでユーザー・インターフェースに合うように柔軟に拡大・縮小されるため、実際の表示寸法は異なります。',
 
     // Actions
     'actions' => '実行',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index b47d638b4a9..7cf189d6ee8 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => '表の詳細設定',
     'table_properties_title' => '表の詳細設定',
     'delete_table' => '表の削除',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => '上側に行を挿入',
     'insert_row_after' => '下側に行を挿入',
     'delete_row' => '行の削除',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 0b39c2c27e8..bffcd410594 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF',
     'export_text' => 'テキストファイル',
     'export_md' => 'Markdown',
+    'default_template' => 'デフォルトページテンプレート',
+    'default_template_explain' => 'このアイテム内に新しいページを作成する際にデフォルトコンテンツとして使用されるページテンプレートを割り当てます。これはページ作成者が選択したテンプレートページへのアクセス権を持つ場合にのみ使用されることに注意してください。',
+    'default_template_select' => 'テンプレートページを選択',
 
     // Permissions and restrictions
     'permissions' => '権限',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'ブック「:bookName」を編集',
     'books_form_book_name' => 'ブック名',
     'books_save' => 'ブックを保存',
-    'books_default_template' => 'デフォルトページテンプレート',
-    'books_default_template_explain' => 'このブックに新しいページを作成する際にデフォルトコンテンツとして使用されるページテンプレートを割り当てます。 これはページ作成者が選択したテンプレートページへのアクセス権を持つ場合にのみ使用されることに注意してください。',
-    'books_default_template_select' => 'テンプレートページを選択',
     'books_permissions' => 'ブックの権限',
     'books_permissions_updated' => 'ブックの権限を更新しました',
     'books_empty_contents' => 'まだページまたはチャプターが作成されていません。',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'ページの下書きを削除',
     'pages_delete_success' => 'ページを削除しました',
     'pages_delete_draft_success' => 'ページの下書きを削除しました',
-    'pages_delete_warning_template' => 'このページは現在ブックのデフォルトページテンプレートとして使用されています。 このページが削除されると、それらのブックでデフォルトのページテンプレートが割り当てられなくなります。',
+    'pages_delete_warning_template' => 'このページは現在、ブックまたはチャプタのデフォルトページテンプレートとして使用されています。このページが削除されると、それらのアイテムでデフォルトのページテンプレートが割り当てられなくなります。',
     'pages_delete_confirm' => 'このページを削除してもよろしいですか？',
     'pages_delete_draft_confirm' => 'このページの下書きを削除してもよろしいですか？',
     'pages_editing_named' => 'ページ :pageName を編集',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index 26de050e4d3..7ca14a1087f 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':emailを持つユーザは既に存在しますが、資格情報が異なります。',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Eメールは既に確認済みです。ログインしてください。',
     'email_confirmation_invalid' => 'この確認トークンは無効か、または既に使用済みです。登録を再試行してください。',
     'email_confirmation_expired' => '確認トークンは有効期限切れです。確認メールを再送しました。',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => '外部認証システムからの要求がアプリケーションによって開始されたプロセスによって認識されません。ログイン後に戻るとこの問題が発生する可能性があります。',
     'saml_fail_authed' => ':systemを利用したログインに失敗しました。システムは正常な認証を提供しませんでした。',
     'oidc_already_logged_in' => '既にログインしています',
-    'oidc_user_not_registered' => 'ユーザー :name は登録されておらず、自動登録は無効になっています',
     'oidc_no_email_address' => '外部認証システムから提供されたデータに、このユーザーのメールアドレスが見つかりませんでした',
     'oidc_fail_authed' => ':systemを利用したログインに失敗しました。システムは正常な認証を提供しませんでした。',
     'social_no_action_defined' => 'アクションが定義されていません',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 1ef109d7909..c88fa106a0b 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'ごみ箱は現在空です',
     'recycle_bin_empty' => 'ごみ箱を空にする',
     'recycle_bin_empty_confirm' => 'ごみ箱のすべてのアイテムが、各アイテムに含まれるコンテンツも含めて完全に削除されます。本当にごみ箱を空にしますか？',
-    'recycle_bin_destroy_confirm' => 'この操作により、このアイテムと以下にリストされている子要素がシステムから完全に削除され、このコンテンツを復元できなくなります。このアイテムを完全に削除してもよろしいですか？',
+    'recycle_bin_destroy_confirm' => 'この操作を行うと、子要素を含めた以下のリストに示すアイテムがシステムから完全に削除され、このコンテンツを復元できなくなります。このアイテムを完全に削除してもよろしいですか？',
     'recycle_bin_destroy_list' => '削除されるアイテム',
     'recycle_bin_restore_list' => '復元されるアイテム',
     'recycle_bin_restore_confirm' => 'この操作により、すべての子要素を含む削除されたアイテムが元の場所に復元されます。元の場所が削除されてごみ箱に入っている場合は、親アイテムも復元する必要があります。',
diff --git a/lang/ka/activities.php b/lang/ka/activities.php
index d5b55c03dcb..092398ef0e1 100644
--- a/lang/ka/activities.php
+++ b/lang/ka/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'User successfully removed',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/ka/common.php b/lang/ka/common.php
index 27037babec0..266174eed9d 100644
--- a/lang/ka/common.php
+++ b/lang/ka/common.php
@@ -20,7 +20,7 @@
     'description' => 'Description',
     'role' => 'Role',
     'cover_image' => 'Cover image',
-    'cover_image_description' => 'This image should be approx 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Actions',
diff --git a/lang/ka/editor.php b/lang/ka/editor.php
index 670c1c5e1ac..de9aa0ece10 100644
--- a/lang/ka/editor.php
+++ b/lang/ka/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index f1f915544d1..9e620b24ed1 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edit Book :bookName',
     'books_form_book_name' => 'Book Name',
     'books_save' => 'Save Book',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Book Permissions',
     'books_permissions_updated' => 'Book Permissions Updated',
     'books_empty_contents' => 'No pages or chapters have been created for this book.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Are you sure you want to delete this page?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',
diff --git a/lang/ka/errors.php b/lang/ka/errors.php
index 607b6ea833a..8773a78cbf7 100644
--- a/lang/ka/errors.php
+++ b/lang/ka/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
     'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
     'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
     'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'No action defined',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index 03e9bf462e2..7b7f5d2a2e3 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
     'recycle_bin_empty' => 'Empty Recycle Bin',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index 4cb03f90cc9..aceac7d8756 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => '사용자가 삭제되었습니다',
 
     // API Tokens
-    'api_token_create' => 'aPI 토큰 생성',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API 토큰이 성공적으로 생성되었습니다.',
-    'api_token_update' => '업데이트된 API 토큰',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API 토큰이 성공적으로 업데이트되었습니다.',
-    'api_token_delete' => '삭제된 API 토큰',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API 토큰이 성공적으로 삭제되었습니다.',
 
     // Roles
diff --git a/lang/ko/common.php b/lang/ko/common.php
index 794fdc6cd3c..95974dad4f4 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -20,7 +20,7 @@
     'description' => '설명',
     'role' => '권한',
     'cover_image' => '대표 이미지',
-    'cover_image_description' => '이미지 크기는 440x250px 내외입니다.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => '활동',
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index 7959bc81dc0..0c9a5cfed09 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => '테이블 속성',
     'table_properties_title' => '테이블 속성',
     'delete_table' => '테이블 삭제',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => '앞에 행 추가',
     'insert_row_after' => '뒤에 행 추가',
     'delete_row' => '행 삭제',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 934d7201e2b..09037fac396 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF 파일',
     'export_text' => '일반 텍스트 파일',
     'export_md' => '마크다운 파일',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => '권한',
@@ -132,9 +135,6 @@
     'books_edit_named' => ':bookName(을)를 바꿉니다.',
     'books_form_book_name' => '책 이름',
     'books_save' => '저장',
-    'books_default_template' => '기본 페이지 템플릿',
-    'books_default_template_explain' => '이 책에 있는 모든 새 페이지의 기본 콘텐츠로 사용할 페이지 템플릿을 지정합니다. 페이지 작성자에게 선택한 템플릿 페이지에 대한 보기 액세스 권한이 있는 경우에만 이 템플릿이 사용된다는 점에 유의하세요.',
-    'books_default_template_select' => '템플릿 페이지 선택',
     'books_permissions' => '책 권한',
     'books_permissions_updated' => '권한 저장함',
     'books_empty_contents' => '이 책에 챕터나 문서가 없습니다.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => '초안 문서 삭제하기',
     'pages_delete_success' => '문서 지움',
     'pages_delete_draft_success' => '초안 문서 지움',
-    'pages_delete_warning_template' => '이 페이지는 책의 기본 페이지 템플릿으로 사용 중입니다. 이 페이지가 삭제된 후에는 이러한 책에 더 이상 기본 페이지 템플릿이 할당되지 않습니다.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => '이 문서를 지울 건가요?',
     'pages_delete_draft_confirm' => '이 초안을 지울 건가요?',
     'pages_editing_named' => ':pageName 수정',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index 0ab6789cc0c..4e076c00790 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => '이메일 :email 이 이미 존재하지만 다른 자격 증명을 가진 사용자입니다.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => '이메일이 이미 확인되었으니 로그인해 보세요.',
     'email_confirmation_invalid' => '이 확인 토큰이 유효하지 않거나 이미 사용되었습니다. 다시 등록해 주세요.',
     'email_confirmation_expired' => '확인 토큰이 만료되었습니다. 새 확인 이메일이 전송되었습니다.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => '이 애플리케이션에서 시작한 프로세스에서 외부 인증 시스템의 요청을 인식하지 못합니다. 로그인 후 다시 이동하면 이 문제가 발생할 수 있습니다.',
     'saml_fail_authed' => ':system 을 사용하여 로그인, 시스템이 성공적인 인증을 제공하지 않음',
     'oidc_already_logged_in' => '이미 로그인했습니다.',
-    'oidc_user_not_registered' => '사용자 :name 이 등록되지 않았으며 자동 등록이 비활성화되었습니다.',
     'oidc_no_email_address' => '외부 인증 시스템에서 제공한 데이터에서 이 사용자의 이메일 주소를 찾을 수 없습니다.',
     'oidc_fail_authed' => ':system 을 사용하여 로그인, 시스템이 성공적인 인증을 제공하지 않음',
     'social_no_action_defined' => '정의된 동작 없음',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index fe6dd4c7e25..70a15a5af68 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => '휴지통이 비었습니다.',
     'recycle_bin_empty' => '비우기',
     'recycle_bin_empty_confirm' => '휴지통을 비울 건가요?',
-    'recycle_bin_destroy_confirm' => '아래 자식 항목들이 함께 영구적으로 삭제됩니다. 영구 삭제할 건가요?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => '영구 삭제함',
     'recycle_bin_restore_list' => '복원함',
     'recycle_bin_restore_confirm' => '원래 위치로 복원합니다. 원래 위치의 부모 항목이 지워졌을 경우 부모 항목도 복원해야 합니다.',
diff --git a/lang/lt/activities.php b/lang/lt/activities.php
index 42322ffbc85..9a240d83cae 100644
--- a/lang/lt/activities.php
+++ b/lang/lt/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'User successfully removed',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/lt/common.php b/lang/lt/common.php
index 8ef5b5d8abd..b4fd096d3d2 100644
--- a/lang/lt/common.php
+++ b/lang/lt/common.php
@@ -20,7 +20,7 @@
     'description' => 'Apibūdinimas',
     'role' => 'Vaidmuo',
     'cover_image' => 'Viršelio nuotrauka',
-    'cover_image_description' => 'Ši nuotrauka turi būti maždaug 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Veiksmai',
diff --git a/lang/lt/editor.php b/lang/lt/editor.php
index 670c1c5e1ac..de9aa0ece10 100644
--- a/lang/lt/editor.php
+++ b/lang/lt/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 9880ebb7999..4db2ce2fab8 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF failas',
     'export_text' => 'Paprastas failo tekstas',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Leidimai',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Redaguoti knygą :bookName',
     'books_form_book_name' => 'Knygos pavadinimas',
     'books_save' => 'Išsaugoti knygą',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Knygos leidimas',
     'books_permissions_updated' => 'Knygos leidimas atnaujintas',
     'books_empty_contents' => 'Jokių puslapių ar skyrių nebuvo skurta šiai knygai',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Ištrinti juodraščio puslapį',
     'pages_delete_success' => 'Puslapis ištrintas',
     'pages_delete_draft_success' => 'Juodraščio puslapis ištrintas',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ar esate tikri, kad norite ištrinti šį puslapį?',
     'pages_delete_draft_confirm' => 'Ar esate tikri, kad norite ištrinti šį juodraščio puslapį?',
     'pages_editing_named' => 'Redaguojamas puslapis :pageName',
diff --git a/lang/lt/errors.php b/lang/lt/errors.php
index 0e14b6517de..cde76b056e0 100644
--- a/lang/lt/errors.php
+++ b/lang/lt/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Naudotojo elektroninis paštas :email jau egzistuoja, bet su kitokiais įgaliojimais.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Elektroninis paštas jau buvo patvirtintas, pabandykite prisijungti.',
     'email_confirmation_invalid' => 'Šis patvirtinimo prieigos raktas negalioja arba jau buvo panaudotas, prašome bandykite vėl registruotis.',
     'email_confirmation_expired' => 'Šis patvirtinimo prieigos raktas baigė galioti, naujas patvirtinimo laiškas jau išsiųstas elektroniniu paštu.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Prašymas iš išorinės autentifikavimo sistemos nėra atpažintas proceso, kurį pradėjo ši programa. Naršymas po prisijungimo gali sukelti šią problemą.',
     'saml_fail_authed' => 'Prisijungimas, naudojant :system nepavyko, sistema nepateikė sėkmingo leidimo.',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'Neapibrėžtas joks veiksmas',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index 000e018c6ae..db985e9aa2c 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Šiukšliadėžė šiuo metu yra tuščia',
     'recycle_bin_empty' => 'Ištuštinti šiukšliadėžę',
     'recycle_bin_empty_confirm' => 'Tai visam laikui sunaikins visus elementus, esančius šiukšliadėžėje, įskaitant kiekvieno elemento turinį. Ar esate tikri, jog norite ištuštinti šiukšliadėžę?',
-    'recycle_bin_destroy_confirm' => 'Šis veiksmas visam laikui ištrins šį elementą iš sistemos kartu su bet kuriais elementais įvardintais žemiau ir jūs nebegalėsite atkurti jo bei jo turinio. Ar esate tikri, jog norite visam laikui ištrinti šį elementą?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elementai panaikinimui',
     'recycle_bin_restore_list' => 'Elementai atkūrimui',
     'recycle_bin_restore_confirm' => 'Šis veiksmas atkurs ištrintą elementą ir perkels jį atgal į jo originalią vietą. Jei originali vieta buvo ištrinta ir šiuo metu yra šiukšliadėžėje, ji taip pat turės būti atkurta.',
diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index 742288c98dc..b28295639e2 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -59,11 +59,11 @@
     'favourite_remove_notification' => '":name" ir izņemts no jūsu favorītiem',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Skatīšanas uzstādījumi veiksmīgi atjaunināti',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
+    'auth_login' => 'pieteicies',
+    'auth_register' => 'reģistrējies kā jauns lietotājs',
     'auth_password_reset_request' => 'pieprasīja lietotāja paroles atiestatīšanu',
     'auth_password_reset_update' => 'atiestatīja lietotāja paroli',
     'mfa_setup_method' => 'uzstādīja MFA metodi',
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Lietotājs veiksmīgi dzēsts',
 
     // API Tokens
-    'api_token_create' => 'izveidoja API žetonu',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API žetons veiksmīgi izveidots',
-    'api_token_update' => 'atjaunoja API žetonu',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API žetons veiksmīgi atjaunināts',
-    'api_token_delete' => 'dzēsa API žetonu',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API žetons veiksmīgi dzēsts',
 
     // Roles
diff --git a/lang/lv/common.php b/lang/lv/common.php
index 01abea4f388..dcee2878223 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -20,7 +20,7 @@
     'description' => 'Apraksts',
     'role' => 'Loma',
     'cover_image' => 'Vāka attēls',
-    'cover_image_description' => 'Šim attēlam būtu jābūt aptuveni 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Darbības',
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index 9a9026b228d..4a5747e9e28 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabulas īpašības',
     'table_properties_title' => 'Tabulas īpašības',
     'delete_table' => 'Dzēst tabulu',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Ievietot rindu augstāk',
     'insert_row_after' => 'Ievietot rindu zemāk',
     'delete_row' => 'Dzēst rindu',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 96d6b706a15..6db02da6a8c 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Atjaunināts :timeLength',
     'meta_updated_name' => ':user atjauninājis pirms :timeLength',
     'meta_owned_name' => 'Īpašnieks :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Atsauce :count vienumā|Atsauce :count vienumos',
     'entity_select' => 'Izvēlēties vienumu',
     'entity_select_lack_permission' => 'Jums nav nepieciešamās piekļuves tiesības, lai izvēlētu šo vienumu',
     'images' => 'Attēli',
@@ -39,17 +39,20 @@
     'export_pdf' => 'PDF fails',
     'export_text' => 'Vienkāršs teksta fails',
     'export_md' => 'Markdown fails',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Atļaujas',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_desc' => 'Uzstādīt tiesības šeit, lai aizvietotu noklusētās tiesības no lietotāju lomām.',
+    'permissions_book_cascade' => 'Piekļuves tiesības, kas uzstādītas grāmatām, automātiski tiks piešķirtas pakārtotajām nodaļām un lapām, ja vien tām nav atsevišķi norādītas savas piekļuves tiesības.',
     'permissions_chapter_cascade' => 'Piekļuves tiesības, kas uzstādītas nodaļām, automātiski tiks piešķirtas pakārtotajām lapām, ja vien tām nav atsevišķi norādītas savas piekļuves tiesības.',
     'permissions_save' => 'Saglabāt atļaujas',
     'permissions_owner' => 'Īpašnieks',
     'permissions_role_everyone_else' => 'Visi pārējie',
     'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
+    'permissions_role_override' => 'Aizvietot lomas tiesības',
     'permissions_inherit_defaults' => 'Mantot noklusētās vērtības',
 
     // Search
@@ -106,7 +109,7 @@
     'shelves_permissions_updated' => 'Plaukta atļaujas atjauninātas',
     'shelves_permissions_active' => 'Plaukta atļaujas ir aktīvas',
     'shelves_permissions_cascade_warning' => 'Plauktu piekļuves tiesības netiek automātiski piešķirtas tajā esošajām grāmatām. Tas ir tāpēc, ka grāmata var vienlaicīgi atrasties vairākos plauktos. Tomēr piekļuves tiesības var nokopēt uz plauktam pievienotajām grāmatām, izmantojot zemāk atrodamo opciju.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_permissions_create' => 'Plaukta veidošanas tiesības tiek izmantotas tikai, lai kopētu tiesības uz pakārtotajām grāmatām, izmantojot zemāk esošo darbību. Tās nekontrolē iespēju izveidot jaunas grāmatas.',
     'shelves_copy_permissions_to_books' => 'Kopēt grāmatplaukta atļaujas uz grāmatām',
     'shelves_copy_permissions' => 'Kopēt atļaujas',
     'shelves_copy_permissions_explain' => 'Pašreizējās plaukta piekļuves tiesības tiks piemērotas visām tajā esošajām grāmatām. Pirms ieslēgšanas pārliecinieties, ka visas izmaiņas plaukta piekļuves tiesības ir saglabātas.',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Labot grāmatu :bookName',
     'books_form_book_name' => 'Grāmatas nosaukums',
     'books_save' => 'Saglabāt grāmatu',
-    'books_default_template' => 'Noklusētā lapas sagatave',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Grāmatas atļaujas',
     'books_permissions_updated' => 'Grāmatas atļaujas atjauninātas',
     'books_empty_contents' => 'Lapas vai nodaļas vēl nav izveidotas šai grāmatai.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Dzēst melnrakstu',
     'pages_delete_success' => 'Lapa ir dzēsta',
     'pages_delete_draft_success' => 'Melnraksts ir dzēsts',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Vai esat pārliecināts, ka vēlaties dzēst šo lapu?',
     'pages_delete_draft_confirm' => 'Vai esat pārliecināts, ka vēlaties dzēst šo melnrakstu?',
     'pages_editing_named' => 'Rediģē lapu :pageName',
@@ -218,7 +218,7 @@
     'pages_editing_page' => 'Labo lapu',
     'pages_edit_draft_save_at' => 'Melnraksts saglabāts ',
     'pages_edit_delete_draft' => 'Dzēst melnrakstu',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'Vai tiešām vēlaties dzēst savas uzmetuma izmaiņas? Visas jūsu izmaiņas kopš pēdējās saglabāšanas pazudīs un redaktors tiks atjaunos ar pēdējo saglabātu lapas saturu.',
     'pages_edit_discard_draft' => 'Atmest malnrakstu',
     'pages_edit_switch_to_markdown' => 'Pārslēgties uz Markdown redaktoru',
     'pages_edit_switch_to_markdown_clean' => '(Iztīrītais saturs)',
@@ -243,7 +243,7 @@
     'pages_md_insert_drawing' => 'Ievietot zīmējumu',
     'pages_md_show_preview' => 'Rādīt priekšskatu',
     'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved' => 'Atrasts nesaglabāts attēls',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Lapa nav nodaļā',
     'pages_move' => 'Pārvietot lapu',
@@ -413,7 +413,7 @@
 
     // Watch Options
     'watch' => 'Vērot',
-    'watch_title_default' => 'Default Preferences',
+    'watch_title_default' => 'Noklusētie uzstādījumi',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignorēt',
     'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 2a5777a0a7f..27b77b6311a 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Lietotājs ar epastu :email bet ar citiem piekļuves datiem jau eksistē.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Epasts jau ir apstiprināts, mēģini ielogoties.',
     'email_confirmation_invalid' => 'Šis apstiprinājuma žetons nav derīgs vai jau ir izmantots. Lūdzu, mēģiniet reģistrēties vēlreiz.',
     'email_confirmation_expired' => 'Apstiprinājuma žetona derīguma termiņš ir beidzies. Ir nosūtīts jauns apstiprinājuma e-pasts.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Ārējās autentifikācijas sistēmas pieprasījums neatpazīst procesu, kuru sākusi šī lietojumprogramma. Pārvietojoties atpakaļ pēc pieteikšanās var rasties šāda problēma.',
     'saml_fail_authed' => 'Piekļuve ar :system neizdevās, sistēma nepieļāva veiksmīgu autorizāciju',
     'oidc_already_logged_in' => 'Jau esat ielogojies',
-    'oidc_user_not_registered' => 'Lietotājs :name nav reģistrēts un automātiska reģistrācija ir izslēgta',
     'oidc_no_email_address' => 'Ārējās autentifikācijas sistēmas sniegtajos datos nevarēja atrast šī lietotāja e-pasta adresi',
     'oidc_fail_authed' => 'Piekļuve ar :system neizdevās, sistēma nepieļāva veiksmīgu autorizāciju',
     'social_no_action_defined' => 'Darbības nav definētas',
diff --git a/lang/lv/preferences.php b/lang/lv/preferences.php
index b45a063343b..ac820f61e25 100644
--- a/lang/lv/preferences.php
+++ b/lang/lv/preferences.php
@@ -41,11 +41,11 @@
     'profile_email_desc' => 'Šis epasts tiks izmantots paziņojumiem un sistēmas piekļuvei, atkarībā no sistēmā uzstādītās autentifikācijas metodes.',
     'profile_email_no_permission' => 'Diemžēl jums nav tiesību mainīt savu epasta adresi. Ja vēlaties to mainīt, jums jāsazinās ar administratoru, lai tas nomaina šo adresi.',
     'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile_admin_options' => 'Administratora iestatījumi',
+    'profile_admin_options_desc' => 'Papildus administratora iestatījumus, kā piemēram, lomu piešķiršanu, var atrast jūsu lietotāja kontā ejot uz "Uzstādījumu > Lietotāji".',
 
     'delete_account' => 'Dzēst kontu',
     'delete_my_account' => 'Izdzēst manu kontu',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
+    'delete_my_account_desc' => 'Šī darbība pilnībā izdzēsīs jūsu lietotāja kontu no sistēmas. Jūs vairs nevarēsiet piekļūt kontam, atcelt šo darbību vai atjaunot kontu. Jūsu izveidotais saturs, piemēram, izveidotās lapas un augšupielādētie attēli, tiks saglabāts.',
     'delete_my_account_warning' => 'Vai tiešām vēlaties dzēst savu kontu?',
 ];
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index 5c07cfc1d18..53c764ed64f 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Miskaste ir tukša',
     'recycle_bin_empty' => 'Iztīrīt miskasti',
     'recycle_bin_empty_confirm' => 'Šī darbība pilnībā dzēsīs visas vienības miskastē, ieskaitot saturu, kas ievietots katrā no šīm vienībām. Vai tiešām vēlaties dzēst visu miskastes saturu?',
-    'recycle_bin_destroy_confirm' => 'Šī darbība pilnībā izdzēsis šo vienību kopā ar tai pakārtotajiem elementiem no sistēmas, un jūs nevarēsiet šo saturu atjaunot. Vai tiešām vēlaties pilnībā izdzēst šo vienību?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Dzēšamās vienības',
     'recycle_bin_restore_list' => 'Atjaunojamās vienības',
     'recycle_bin_restore_confirm' => 'Šī darbība atjaunos dzēsto vienību, tai skaitā visus tai pakārtotos elementus, uz tās sākotnējo atrašanās vietu. Ja sākotnējā atrašanās vieta ir izdzēsta un atrodas miskastē, būs nepieciešams atjaunot arī to.',
@@ -136,11 +136,11 @@
     // Role Settings
     'roles' => 'Grupas',
     'role_user_roles' => 'Lietotāju grupas',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_index_desc' => 'Lomas tiek izmantotas, lai sagrupētu lietotājus un piešķirtu piekļuves tiesības to dalībniekiem. Kad lietotājs ir vairāku lomu dalībnieks, piešķirtās tiesības tiks summētas un lietotājam būs visas tiesības.',
+    'roles_x_users_assigned' => ':count lietotājam piešķirts|:count lietotājiem piešķirts',
+    'roles_x_permissions_provided' => ':count tiesības|:count tiesības',
+    'roles_assigned_users' => 'Pievienotie lietotāji',
+    'roles_permissions_provided' => 'Piešķirtās tiesības',
     'role_create' => 'Izveidot jaunu grupu',
     'role_delete' => 'Dzēst grupu',
     'role_delete_confirm' => 'Loma \':roleName\' tiks dzēsta.',
@@ -163,12 +163,12 @@
     'role_manage_settings' => 'Pārvaldīt iestatījumus',
     'role_export_content' => 'Eksportēt saturu',
     'role_editor_change' => 'Mainīt lapu redaktoru',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => 'Saņemt un pārvaldīt paziņojumus',
     'role_asset' => 'Resursa piekļuves tiesības',
     'roles_system_warning' => 'Jebkuras no trīs augstāk redzamajām atļaujām dod iespēju lietotājam mainīt savas un citu lietotāju sistēmas atļaujas. Pievieno šīs grupu atļaujas tikai tiem lietotājiem, kuriem uzticies.',
     'role_asset_desc' => 'Šīs piekļuves tiesības kontrolē noklusēto piekļuvi sistēmas resursiem. Grāmatām, nodaļām un lapām norādītās tiesības būs pārākas par šīm.',
     'role_asset_admins' => 'Administratoriem automātiski ir piekļuve visam saturam, bet šie uzstādījumi var noslēpt vai parādīt lietotāja saskarnes iespējas.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => 'Šis ir saistīts ar redzamību attēlu pārvaldniekā. Faktiskā piekļuve augšupielādēto attēlu failiem būs atkarīga no sistēmas attēlu glabātuves uzstādījuma.',
     'role_all' => 'Visi',
     'role_own' => 'Savi',
     'role_controlled_by_asset' => 'Kontrolē resurss, uz ko tie ir augšupielādēti',
@@ -178,7 +178,7 @@
 
     // Users
     'users' => 'Lietotāji',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'Izveidot un pārvaldīt atsevišķus lietotāju kontus sistēmā. Lietotāju konti tiek izmantoti piekļuvei un satura un aktivitāšu piesaistei. Piekļuves tiesības ir pamatā balstītas uz lomām, bet lietotāju veidotā satura piederība, cita starpā, arī var ietekmēt piekļuvi un tiesības.',
     'user_profile' => 'Lietotāja profils',
     'users_add_new' => 'Pievienot jaunu lietotāju',
     'users_search' => 'Meklēt lietotājus',
@@ -193,8 +193,8 @@
     'users_send_invite_text' => 'Jūs varat izvēlētes vai nosūtīt šim lietotājam uzaicinājuma epastu, kas ļauj tam uzstādīt savu paroli pašam, vai arī varat uzstādīt paroli tagad.',
     'users_send_invite_option' => 'Nosūtīt lietotāja uzaicinājuma epastu',
     'users_external_auth_id' => 'Ārējais autentifikācijas ID',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Kad tiek izmantota ārēja autentifikācijas sistēma (piemēram, SAML2, OIDC vai LDAP), šis ir identifikators (ID), kas sasaista šo BookStack lietotāja kontu ar autentifikācijas sistēmas kontu. Jūs varat ignorēt šo lauku, ja izmantojat noklusēto autentifikāciju ar epasta adresi.',
+    'users_password_warning' => 'Aizpildiet tikai tad, ja vēlaties mainīt paroli šim lietotājam.',
     'users_system_public' => 'Šis lietotājs apzīmē visus viesus, kas apmeklēs jūsu lapu. To nevar izmantot lapas piekļuvei un tas tiek norādīts automātiski.',
     'users_delete' => 'Dzēst lietotāju',
     'users_delete_named' => 'Dzēst lietotāju :userName',
@@ -210,7 +210,7 @@
     'users_preferred_language' => 'Vēlamā valoda',
     'users_preferred_language_desc' => 'Šis uzstādījums nomainīs valodu, kas izmantota aplikācijas lietotāja saskarnē. Tas neietekmēs neko no lietotāju radītā satura.',
     'users_social_accounts' => 'Sociālie konti',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Skatīt piesaistīto sociālo kontu statusu šim lietotājam. Sociālos kontus var izmantot piekļuvei papildus primārajai autentifikācijas sistēmai.',
     'users_social_accounts_info' => 'Te jūs varat pieslēgt citus kontus ātrākai un ērtākai piekļuvei. Konta atvienošana no šejienes neatceļ šai aplikācijai dotās tiesības šī konta piekļuvei. Atvienojtiet piekļuvi arī no jūsu profila uzstādījumiem pievienotajā sociālajā kontā.',
     'users_social_connect' => 'Pievienot kontu',
     'users_social_disconnect' => 'Atvienot kontu',
@@ -219,7 +219,7 @@
     'users_social_connected' => ':socialAccount konts veiksmīgi pieslēgts jūsu profilam.',
     'users_social_disconnected' => ':socialAccount konts veiksmīgi atslēgts no jūsu profila.',
     'users_api_tokens' => 'API žetoni',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'Izveidot un pārvaldīt piekļuves žetonus, lai autentificētos ar BookStack REST API. API tiesības ir tās pašas, kas lietotāja kontam, kam pieder šis žetons.',
     'users_api_tokens_none' => 'Šim lietotājam nav izveidotu API žetonu',
     'users_api_tokens_create' => 'Izveidot žetonu',
     'users_api_tokens_expires' => 'Derīguma termiņš',
@@ -249,8 +249,8 @@
 
     // Webhooks
     'webhooks' => 'Webhook',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_index_desc' => 'Webhook ir veids, kā nosūtīt datus ārējām adresēm (URL) pie noteiktām darbībām vai notikumiem sistēmā. Tas ļauj īstenot uz notikumiem balstītu integrāciju ar ārējām platformām, kā piemēram, apziņošanas sistēmām.',
+    'webhooks_x_trigger_events' => ':count notikums|:count notikumi',
     'webhooks_create' => 'Izveidot jaunu webhook',
     'webhooks_none_created' => 'Nav izveidots neviens webhook.',
     'webhooks_edit' => 'Labot webhook',
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index c49a09c26dc..c153ba06591 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -94,11 +94,11 @@
     'user_delete_notification' => 'Brukeren ble fjernet',
 
     // API Tokens
-    'api_token_create' => 'opprettet api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-token er opprettet',
-    'api_token_update' => 'oppdatert api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-token oppdatert',
-    'api_token_delete' => 'slettet api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-token ble slettet',
 
     // Roles
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 92950250f4c..1e90386095d 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beskrivelse',
     'role' => 'Rolle',
     'cover_image' => 'Forside',
-    'cover_image_description' => 'Bildet bør være ca. 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Handlinger',
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index 2f3b22d8bd2..3605f472530 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabellegenskaper',
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Slett tabell',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Sett inn rad før',
     'insert_row_after' => 'Sett inn rad etter',
     'delete_row' => 'Slett rad',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index b843fcc0d1b..e15bb073dc6 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Oppdatert :timeLength',
     'meta_updated_name' => 'Oppdatert :timeLength av :user',
     'meta_owned_name' => 'Eies av :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Sitert på :count side|Sitert på :count sider',
     'entity_select' => 'Velg entitet',
     'entity_select_lack_permission' => 'Du har ikke tilgang til å velge dette elementet',
     'images' => 'Bilder',
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF Fil',
     'export_text' => 'Tekstfil',
     'export_md' => 'Markdownfil',
+    'default_template' => 'Standard sidemal',
+    'default_template_explain' => 'Tildel en sidemal som vil bli brukt som standardinnhold for alle nye sider i denne boken. Husk dette vil kun bli brukt hvis sideskaperen har tilgang til den valgte malsiden.',
+    'default_template_select' => 'Velg en malside',
 
     // Permissions and restrictions
     'permissions' => 'Tilganger',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Endre boken :bookName',
     'books_form_book_name' => 'Boktittel',
     'books_save' => 'Lagre bok',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Boktilganger',
     'books_permissions_updated' => 'Boktilganger oppdatert',
     'books_empty_contents' => 'Ingen sider eller kapitler finnes i denne boken.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Slett utkastet',
     'pages_delete_success' => 'Siden er slettet',
     'pages_delete_draft_success' => 'Sideutkastet ble slettet',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Denne siden er i aktiv bruk som en bok eller kapittelstandard sidemal. Disse bøkene eller kapitlene vil ikke lenger ha en standardmal som er tilordnet etter at denne siden er slettet.',
     'pages_delete_confirm' => 'Er du sikker på at du vil slette siden?',
     'pages_delete_draft_confirm' => 'Er du sikker på at du vil slette utkastet?',
     'pages_editing_named' => 'Redigerer :pageName (side)',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Referanser',
     'references_none' => 'Det er ingen sporede referanser til dette elementet.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Nedenfor vises alle de kjente sidene i systemet som lenker til denne oppføringen.',
 
     // Watch Options
     'watch' => 'Overvåk',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index c167fd49a83..80cbd1f8e4a 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En konto med :email finnes allerede, men har andre detaljer.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-posten er allerede bekreftet, du kan forsøke å logge inn.',
     'email_confirmation_invalid' => 'Denne bekreftelseskoden er allerede benyttet eller utgått. Prøv å registrere på nytt.',
     'email_confirmation_expired' => 'Bekreftelseskoden er allerede utgått, en ny e-post er sendt.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Forespørselen fra det eksterne autentiseringssystemet gjenkjennes ikke av en prosess som startes av dette programmet. Å navigere tilbake etter pålogging kan forårsake dette problemet.',
     'saml_fail_authed' => 'Innlogging gjennom :system feilet. Fikk ikke kontakt med autentiseringstjeneren.',
     'oidc_already_logged_in' => 'Allerede logget inn',
-    'oidc_user_not_registered' => 'Brukeren :name er ikke registrert og automatisk registrering er deaktivert',
     'oidc_no_email_address' => 'Finner ikke en e-postadresse, for denne brukeren, i dataene som leveres av det eksterne autentiseringssystemet',
     'oidc_fail_authed' => 'Innlogging ved hjelp av :system feilet, systemet ga ikke vellykket godkjenning',
     'social_no_action_defined' => 'Ingen handlinger er definert',
diff --git a/lang/nb/notifications.php b/lang/nb/notifications.php
index 0d4bc266f11..bb46e09dbe8 100644
--- a/lang/nb/notifications.php
+++ b/lang/nb/notifications.php
@@ -13,7 +13,7 @@
     'updated_page_debounce' => 'For å forhindre mange varslinger, vil du ikke få nye varslinger for endringer på denne siden fra samme forfatter.',
 
     'detail_page_name' => 'Sidenavn:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Side bane:',
     'detail_commenter' => 'Kommentar fra:',
     'detail_comment' => 'Kommentar:',
     'detail_created_by' => 'Opprettet av:',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index 5d038c4f78d..4942eddd108 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Papirkurven er for øyeblikket tom',
     'recycle_bin_empty' => 'Tøm papirkurven',
     'recycle_bin_empty_confirm' => 'Dette vil slette alle elementene i papirkurven permanent. Dette inkluderer innhold i hvert element. Er du sikker på at du vil tømme papirkurven?',
-    'recycle_bin_destroy_confirm' => 'Denne handlingen vil permanent slette dette elementet og alle dets underelementer fra systemet, som beskrevet nedenfor. Du vil ikke kunne gjenopprette dette innholdet med mindre du har en tidligere sikkerhetskopi av databasen. Er du sikker på at du vil fortsette?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elementer som skal slettes',
     'recycle_bin_restore_list' => 'Elementer som skal gjenopprettes',
     'recycle_bin_restore_confirm' => 'Denne handlingen vil hente opp elementet fra papirkurven, inkludert underliggende innhold, til sin opprinnelige sted. Om den opprinnelige plassen har blitt slettet i mellomtiden og nå befinner seg i papirkurven, vil også dette bli hentet opp igjen.',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 261583cc3a9..d5e23abd286 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Gebruiker succesvol verwijderd',
 
     // API Tokens
-    'api_token_create' => 'maakte api token aan',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-token met succes aangemaakt',
-    'api_token_update' => 'werkte api token bij',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-token met succes bijgewerkt',
-    'api_token_delete' => 'verwijderde api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-token met succes verwijderd',
 
     // Roles
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index 1b974647ade..e0d6cfe0604 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -46,7 +46,7 @@
     // Password Reset
     'reset_password' => 'Wachtwoord herstellen',
     'reset_password_send_instructions' => 'Geef je e-mailadres op en er wordt een link gestuurd om je wachtwoord te herstellen.',
-    'reset_password_send_button' => 'Link sturen',
+    'reset_password_send_button' => 'Stuur Herstel Link',
     'reset_password_sent' => 'Een link om het wachtwoord te resetten zal verstuurd worden naar :email als dat e-mailadres in het systeem gevonden is.',
     'reset_password_success' => 'Je wachtwoord is succesvol hersteld.',
     'email_reset_subject' => 'Herstel je wachtwoord van :appName',
@@ -59,7 +59,7 @@
     'email_confirm_text' => 'Bevestig je e-mailadres door op onderstaande knop te drukken:',
     'email_confirm_action' => 'Bevestig je e-mail',
     'email_confirm_send_error' => 'Een e-mailbevestiging is vereist, maar het systeem kon de e-mail niet verzenden. Neem contact op met de beheerder.',
-    'email_confirm_success' => 'Uw e-mailadres is bevestigd! U zou nu moeten kunnen inloggen met dit e-mailadres.',
+    'email_confirm_success' => 'Uw e-mailadres is bevestigd! U moet nu kunnen inloggen met dit e-mailadres.',
     'email_confirm_resent' => 'Bevestigingsmail opnieuw verzonden, controleer je inbox.',
     'email_confirm_thanks' => 'Bedankt voor de bevestiging!',
     'email_confirm_thanks_desc' => 'Wacht even terwijl uw bevestiging wordt behandeld. Als u na 3 seconden niet wordt doorverwezen, drukt u op de onderstaande link "Doorgaan" om verder te gaan.',
@@ -78,7 +78,7 @@
     'user_invite_page_welcome' => 'Welkom bij :appName!',
     'user_invite_page_text' => 'Om je account af te ronden en toegang te krijgen moet je een wachtwoord instellen dat gebruikt wordt om in te loggen op :appName bij toekomstige bezoeken.',
     'user_invite_page_confirm_button' => 'Bevestig wachtwoord',
-    'user_invite_success_login' => 'Wachtwoord ingesteld, u zou nu moeten kunnen inloggen met uw ingestelde wachtwoord om toegang te krijgen tot :appName!',
+    'user_invite_success_login' => 'Wachtwoord ingesteld, u moet nu kunnen inloggen met uw ingestelde wachtwoord en toegang krijgen tot :appName!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'Multi-factor authenticatie instellen',
@@ -93,8 +93,8 @@
     'mfa_option_backup_codes_title' => 'Back-up Codes',
     'mfa_option_backup_codes_desc' => 'Bewaar veilig een set eenmalige back-upcodes die u kunt invoeren om uw identiteit te verifiëren.',
     'mfa_gen_confirm_and_enable' => 'Bevestigen en inschakelen',
-    'mfa_gen_backup_codes_title' => 'Reservekopiecodes instellen',
-    'mfa_gen_backup_codes_desc' => 'De onderstaande lijst met codes opslaan op een veilige plaats. Bij de toegang tot het systeem kun je een van de codes gebruiken als tweede verificatiemechanisme.',
+    'mfa_gen_backup_codes_title' => 'Back-up codes instellen',
+    'mfa_gen_backup_codes_desc' => 'Bewaar de onderstaande lijst met codes op een veilige plaats. Bij toegang tot het systeem kun je een van de codes gebruiken als tweede verificatiemechanisme.',
     'mfa_gen_backup_codes_download' => 'Download Codes',
     'mfa_gen_backup_codes_usage_warning' => 'Elke code kan slechts eenmaal gebruikt worden',
     'mfa_gen_totp_title' => 'Mobiele app installatie',
@@ -105,7 +105,7 @@
     'mfa_gen_totp_provide_code_here' => 'Geef uw app gegenereerde code hier',
     'mfa_verify_access' => 'Verifieer toegang',
     'mfa_verify_access_desc' => 'Uw gebruikersaccount vereist dat u uw identiteit bevestigt via een extra verificatieniveau voordat u toegang krijgt. Verifieer met een van de door u geconfigureerde methoden om verder te gaan.',
-    'mfa_verify_no_methods' => 'Geen methoden geconfigureerd',
+    'mfa_verify_no_methods' => 'Geen methode geconfigureerd',
     'mfa_verify_no_methods_desc' => 'Er konden geen meervoudige verificatie methoden voor uw account gevonden worden. Je zult minstens één methode moeten instellen voordat u toegang krijgt.',
     'mfa_verify_use_totp' => 'Verifieer met een mobiele app',
     'mfa_verify_use_backup_codes' => 'Verifieer met een back-up code',
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 898fd10a556..709e91887f9 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschrijving',
     'role' => 'Rol',
     'cover_image' => 'Omslagfoto',
-    'cover_image_description' => 'Deze afbeelding moet ongeveer 440x250px zijn.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Acties',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index 6a3852a0764..fae202903d4 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabeleigenschappen',
     'table_properties_title' => 'Tabeleigenschappen',
     'delete_table' => 'Verwijder tabel',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Rij boven invoegen',
     'insert_row_after' => 'Rij onder invoegen',
     'delete_row' => 'Rij verwijderen',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index ee13185f697..9363deb89bc 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF bestand',
     'export_text' => 'Normaal tekstbestand',
     'export_md' => 'Markdown bestand',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Bewerk boek :bookName',
     'books_form_book_name' => 'Boek naam',
     'books_save' => 'Boek opslaan',
-    'books_default_template' => 'Standaard Paginasjabloon',
-    'books_default_template_explain' => 'Wijs een paginasjabloon toe die zal worden gebruikt als de standaardinhoud voor alle nieuwe pagina\'s in dit boek. Bedenk wel dat dit sjabloon alleen gebruikt wordt als de paginamaker machtiging heeft om die te bekijken.',
-    'books_default_template_select' => 'Selecteer een sjabloonpagina',
     'books_permissions' => 'Boek machtigingen',
     'books_permissions_updated' => 'Boek Machtigingen Bijgewerkt',
     'books_empty_contents' => 'Er zijn nog geen hoofdstukken en pagina\'s voor dit boek gemaakt.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Verwijder concept pagina',
     'pages_delete_success' => 'Pagina verwijderd',
     'pages_delete_draft_success' => 'Concept verwijderd',
-    'pages_delete_warning_template' => 'Deze pagina is actief in gebruik als standaard paginasjabloon. Deze boeken zullen geen standaard paginasjabloon meer hebben als deze pagina verwijderd is.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Weet je zeker dat je deze pagina wilt verwijderen?',
     'pages_delete_draft_confirm' => 'Weet je zeker dat je dit concept wilt verwijderen?',
     'pages_editing_named' => 'Pagina :pageName aan het bewerken',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 3fa1d94f7e1..659c9a1a4b6 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Er bestaat al een gebruiker met het e-mailadres :email, maar met andere inloggegevens.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Het e-mailadres is al bevestigd, probeer in te loggen.',
     'email_confirmation_invalid' => 'Deze bevestigingstoken is niet geldig of al gebruikt, probeer opnieuw te registreren.',
     'email_confirmation_expired' => 'Het bevestigingstoken is verlopen, Er is een nieuwe bevestigingsmail verzonden.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Het verzoek van het externe authenticatiesysteem wordt niet herkend door een proces dat door deze applicatie wordt gestart. Terugkeren na inloggen kan dit probleem veroorzaken.',
     'saml_fail_authed' => 'Inloggen met :system mislukt, het systeem gaf geen succesvolle autorisatie',
     'oidc_already_logged_in' => 'Reeds ingelogd',
-    'oidc_user_not_registered' => 'De gebruiker :name is niet geregistreerd en automatische registratie is uitgeschakeld',
     'oidc_no_email_address' => 'In de gegevens van het externe verificatiesysteem kon voor deze gebruiker geen e-mailadres gevonden worden',
     'oidc_fail_authed' => 'Inloggen met :system mislukt, systeem heeft geen succesvolle autorisatie gegeven',
     'social_no_action_defined' => 'Geen actie gedefinieerd',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 014153e536c..779501d9039 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'De prullenbak is momenteel leeg',
     'recycle_bin_empty' => 'Prullenbak legen',
     'recycle_bin_empty_confirm' => 'Dit zal permanent alle items in de prullenbak vernietigen, inclusief de inhoud die in elk item zit. Weet u zeker dat u de prullenbak wilt legen?',
-    'recycle_bin_destroy_confirm' => 'Deze actie zal dit item permanent uit het systeem verwijderen, samen met alle onderliggende elementen, en u kunt deze inhoud niet herstellen. Weet u zeker dat u dit item permanent wil verwijderen?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Te vernietigen items',
     'recycle_bin_restore_list' => 'Items te herstellen',
     'recycle_bin_restore_confirm' => 'Deze actie herstelt het verwijderde item, inclusief alle onderliggende elementen, op hun oorspronkelijke locatie. Als de oorspronkelijke locatie sindsdien is verwijderd en zich nu in de prullenbak bevindt, zal ook het bovenliggende item moeten worden hersteld.',
diff --git a/lang/nn/activities.php b/lang/nn/activities.php
index dfb7043c40f..36b7d847b44 100644
--- a/lang/nn/activities.php
+++ b/lang/nn/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Brukaren vart fjerna',
 
     // API Tokens
-    'api_token_create' => 'oppretta api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API-token er oppretta',
-    'api_token_update' => 'oppdatert api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API-token oppdatert',
-    'api_token_delete' => 'sletta api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-token vart sletta',
 
     // Roles
diff --git a/lang/nn/common.php b/lang/nn/common.php
index 74b39efa2bb..6155c9b6e70 100644
--- a/lang/nn/common.php
+++ b/lang/nn/common.php
@@ -20,7 +20,7 @@
     'description' => 'Skildring',
     'role' => 'Rolle',
     'cover_image' => 'Framside',
-    'cover_image_description' => 'Bilete bør vere ca. 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Handlingar',
diff --git a/lang/nn/editor.php b/lang/nn/editor.php
index 4eef9d28aa8..7998bfadbf2 100644
--- a/lang/nn/editor.php
+++ b/lang/nn/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabellegenskaper',
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Slett tabell',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Sett inn rad før',
     'insert_row_after' => 'Sett inn rad etter',
     'delete_row' => 'Slett rad',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 21ab84310b2..12764034828 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Tekstfil',
     'export_md' => 'Markdownfil',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Tilgongar',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Endre boken :bookName',
     'books_form_book_name' => 'Boktittel',
     'books_save' => 'Lagre bok',
-    'books_default_template' => 'Standard sidemal',
-    'books_default_template_explain' => 'Tildel ein sidemal som vil bli brukt som standardinnhold for alle nye sider i denne boka. Hugs at dette berre vil bli brukt om sideskaperen har tilgang til den valgte malsida.',
-    'books_default_template_select' => 'Velg ei malside',
     'books_permissions' => 'Boktilganger',
     'books_permissions_updated' => 'Boktilganger oppdatert',
     'books_empty_contents' => 'Ingen sider eller kapittel finst i denne boka.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Slett utkastet',
     'pages_delete_success' => 'Siden er slettet',
     'pages_delete_draft_success' => 'Sideutkastet vart sletta',
-    'pages_delete_warning_template' => 'Denne siden er i aktiv bruk som en standard sidemal for bok. Desse bøkene vil ikkje lenger ha ein standard sidemal som er tilordnet etter at denne sida vert sletta.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Er du sikker på at du vil slette siden?',
     'pages_delete_draft_confirm' => 'Er du sikker på at du vil slette utkastet?',
     'pages_editing_named' => 'Redigerer :pageName (side)',
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index e9087bac407..2d9f58b7164 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En konto med :email finnes allerede, men har andre detaljer.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-posten er allerede bekreftet, du kan forsøke å logge inn.',
     'email_confirmation_invalid' => 'Denne bekreftelseskoden er allerede benyttet eller utgått. Prøv å registrere på nytt.',
     'email_confirmation_expired' => 'Bekreftelseskoden er allerede utgått, en ny e-post er sendt.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Forespørselen fra det eksterne autentiseringssystemet gjenkjennes ikke av en prosess som startes av dette programmet. Å navigere tilbake etter pålogging kan forårsake dette problemet.',
     'saml_fail_authed' => 'Innlogging gjennom :system feilet. Fikk ikke kontakt med autentiseringstjeneren.',
     'oidc_already_logged_in' => 'Allerede logget inn',
-    'oidc_user_not_registered' => 'Brukeren :name er ikkje registrert og automatisk registrering er deaktivert',
     'oidc_no_email_address' => 'Finner ikke en e-postadresse, for denne brukeren, i dataene som leveres av det eksterne autentiseringssystemet',
     'oidc_fail_authed' => 'Innlogging ved hjelp av :system feilet, systemet ga ikke vellykket godkjenning',
     'social_no_action_defined' => 'Ingen handlinger er definert',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index f269c35bcac..ba8586ce2ed 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Papirkurven er for øyeblikket tom',
     'recycle_bin_empty' => 'Tøm papirkurven',
     'recycle_bin_empty_confirm' => 'Dette vil slette alle elementene i papirkurven permanent. Dette inkluderer innhold i hvert element. Er du sikker på at du vil tømme papirkurven?',
-    'recycle_bin_destroy_confirm' => 'Denne handlinga vil permanent slette dette elementet og alle dets underelementer frå systemet, som skildra nedanfor. Du vil ikkje kunne gjenopprette dette innholdet, med mindre du har ein tidligere tryggleiksskopi av databasen. Er du sikker på at du vil fortsette?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elementer som skal slettes',
     'recycle_bin_restore_list' => 'Elementer som skal gjenopprettes',
     'recycle_bin_restore_confirm' => 'Denne handlingen vil hente opp elementet fra papirkurven, inkludert underliggende innhold, til sin opprinnelige sted. Om den opprinnelige plassen har blitt slettet i mellomtiden og nå befinner seg i papirkurven, vil også dette bli hentet opp igjen.',
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index 8b35621defb..fffb5499e0a 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Użytkownik pomyślnie usunięty',
 
     // API Tokens
-    'api_token_create' => 'utworzył token api',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Token API został poprawnie utworzony',
-    'api_token_update' => 'zaktualizował token api',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Token API został pomyślnie zaktualizowany',
-    'api_token_delete' => 'usunął token api',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Token API został pomyślnie usunięty',
 
     // Roles
diff --git a/lang/pl/common.php b/lang/pl/common.php
index 13939f0e06d..2c176ff944f 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -20,7 +20,7 @@
     'description' => 'Opis',
     'role' => 'Rola',
     'cover_image' => 'Okładka',
-    'cover_image_description' => 'Ten obraz powinien posiadać wymiary około 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Akcje',
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index 9b19e266768..ca18521c250 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Właściwości tabeli',
     'table_properties_title' => 'Właściwości Tabeli',
     'delete_table' => 'Usuń tabelę',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Wstaw wiersz przed',
     'insert_row_after' => 'Wstaw wiersz za',
     'delete_row' => 'Usuń wiersz',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 6d1bb4348e6..b178f680f04 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Plik PDF',
     'export_text' => 'Plik tekstowy',
     'export_md' => 'Pliki Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Uprawnienia',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edytuj książkę :bookName',
     'books_form_book_name' => 'Nazwa książki',
     'books_save' => 'Zapisz książkę',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Uprawnienia książki',
     'books_permissions_updated' => 'Zaktualizowano uprawnienia książki',
     'books_empty_contents' => 'Brak stron lub rozdziałów w tej książce.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Usuń wersje roboczą',
     'pages_delete_success' => 'Strona usunięta pomyślnie',
     'pages_delete_draft_success' => 'Werjsa robocza usunięta pomyślnie',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Czy na pewno chcesz usunąć tę stronę?',
     'pages_delete_draft_confirm' => 'Czy na pewno chcesz usunąć wersje roboczą strony?',
     'pages_editing_named' => 'Edytowanie strony :pageName',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index d4ba103e84d..eb7435424b4 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Użytkownik o adresie :email już istnieje, ale używa innych poświadczeń.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-mail został potwierdzony, spróbuj się zalogować.',
     'email_confirmation_invalid' => 'Ten token jest nieprawidłowy lub został już wykorzystany. Spróbuj zarejestrować się ponownie.',
     'email_confirmation_expired' => 'Ten token potwierdzający wygasł. Wysłaliśmy Ci kolejny.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Żądanie z zewnętrznego systemu uwierzytelniania nie zostało rozpoznane przez proces rozpoczęty przez tę aplikację. Cofnięcie po zalogowaniu mogło spowodować ten problem.',
     'saml_fail_authed' => 'Logowanie przy użyciu :system nie powiodło się, system nie mógł pomyślnie ukończyć uwierzytelniania',
     'oidc_already_logged_in' => 'Już zalogowany',
-    'oidc_user_not_registered' => 'Użytkownik :name nie jest zarejestrowany, a automatyczna rejestracja jest wyłączona',
     'oidc_no_email_address' => 'Nie można odnaleźć adresu email dla tego użytkownika w danych dostarczonych przez zewnętrzny system uwierzytelniania',
     'oidc_fail_authed' => 'Logowanie przy użyciu :system nie powiodło się, system nie mógł pomyślnie ukończyć uwierzytelniania',
     'social_no_action_defined' => 'Brak zdefiniowanej akcji',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 4d0bc9f7a2a..295bb5dd935 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Kosz jest pusty',
     'recycle_bin_empty' => 'Opróżnij kosz',
     'recycle_bin_empty_confirm' => 'To na stałe zniszczy wszystkie przedmioty w koszu, w tym zawartość w każdym elemencie. Czy na pewno chcesz opróżnić kosz?',
-    'recycle_bin_destroy_confirm' => 'Ta akcja trwale usunie ten element, wraz z elementami podrzędnymi wymienionymi poniżej, z systemu i nie będziesz w stanie przywrócić tej zawartości. Czy na pewno chcesz trwale usunąć ten element?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elementy do usunięcia',
     'recycle_bin_restore_list' => 'Elementy do przywrócenia',
     'recycle_bin_restore_confirm' => 'Ta akcja przywróci usunięty element, w tym elementy podrzędne, do ich oryginalnej lokalizacji. Jeśli oryginalna lokalizacja została od tego czasu usunięta, a teraz znajduje się w koszu, element nadrzędny będzie również musiał zostać przywrócony.',
diff --git a/lang/pt/activities.php b/lang/pt/activities.php
index d12d640cb0b..089613b8f59 100644
--- a/lang/pt/activities.php
+++ b/lang/pt/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Utilizador removido com sucesso',
 
     // API Tokens
-    'api_token_create' => 'api token criado',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token criado com sucesso',
-    'api_token_update' => 'api token atualizado',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token atualizado com sucesso',
-    'api_token_delete' => 'api token eliminado',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token atualizado com sucesso',
 
     // Roles
diff --git a/lang/pt/common.php b/lang/pt/common.php
index 586ac191150..089cfea3b08 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descrição',
     'role' => 'Cargo',
     'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'Esta imagem deve ter aproximadamente 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Ações',
diff --git a/lang/pt/editor.php b/lang/pt/editor.php
index f7bc6c894cd..c3c4975a7ee 100644
--- a/lang/pt/editor.php
+++ b/lang/pt/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propriedades da tabela',
     'table_properties_title' => 'Propriedades da Tabela',
     'delete_table' => 'Eliminar tabela',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Inserir linha antes',
     'insert_row_after' => 'Inserir linha depois',
     'delete_row' => 'Eliminar linha',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index b2171ba64fe..4e2f8824ad3 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo Texto',
     'export_md' => 'Ficheiro Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editar Livro :bookName',
     'books_form_book_name' => 'Nome do Livro',
     'books_save' => 'Guardar Livro',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Permissões do Livro',
     'books_permissions_updated' => 'Permissões do Livro Atualizadas',
     'books_empty_contents' => 'Nenhuma página ou capítulo foram criados para este livro.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Eliminar Rascunho de Página',
     'pages_delete_success' => 'Página eliminada',
     'pages_delete_draft_success' => 'Rascunho de página eliminado',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Tem certeza que deseja eliminar a página?',
     'pages_delete_draft_confirm' => 'Tem certeza que deseja eliminar o rascunho de página?',
     'pages_editing_named' => 'A Editar a Página :pageName',
diff --git a/lang/pt/errors.php b/lang/pt/errors.php
index 34613872ef5..67d7bbecfc9 100644
--- a/lang/pt/errors.php
+++ b/lang/pt/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Um utilizador com o endereço de e-mail :email já existe mas com credenciais diferentes.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-mail já foi confirmado. Tente iniciar sessão.',
     'email_confirmation_invalid' => 'Este token de confirmação não é válido ou já foi utilizado. Por favor, tente registar-se novamente.',
     'email_confirmation_expired' => 'O token de confirmação já expirou. Um novo e-mail foi enviado.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'A requisição do sistema de autenticação externa não foi reconhecia por um processo iniciado por esta aplicação. Navegar para o caminho anterior após o inicio de sessão pode provocar este problema.',
     'saml_fail_authed' => 'Inicio de sessão com :system falhou. O sistema não forneceu uma autorização bem sucedida',
     'oidc_already_logged_in' => 'Sessão já iniciada',
-    'oidc_user_not_registered' => 'O utilizador :name não está registado e o registo automático está desativado',
     'oidc_no_email_address' => 'Não foi possível encontrar um endereço de e-mail para este utilizador nos dados providenciados pelo sistema de autenticação externo',
     'oidc_fail_authed' => 'Inicio de sessão com :system falhou. O sistema não forneceu uma autorização bem sucedida',
     'social_no_action_defined' => 'Nenhuma ação definida',
diff --git a/lang/pt/preferences.php b/lang/pt/preferences.php
index ae7e2cc4318..1d6ec7d4ccd 100644
--- a/lang/pt/preferences.php
+++ b/lang/pt/preferences.php
@@ -17,14 +17,14 @@
     'shortcuts_save' => 'Salvar Atalhos',
     'shortcuts_overlay_desc' => 'Nota: Quando os atalhos estão ativados, um balão de ajuda ficará disponível pressionando "?" destacando os atalhos disponíveis para ações atualmente visíveis na tela.',
     'shortcuts_update_success' => 'As suas preferências de atalhos foram guardadas!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_overview_desc' => 'Gerir atalhos do teclado que podem ser usados para navegar pela interface do utilizador.',
 
     'notifications' => 'Preferências das Notificações',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
+    'notifications_desc' => 'Controlar as notificações via correio eletrónico quando certas atividades são executadas pelo sistema.',
+    'notifications_opt_own_page_changes' => 'Notificar quando páginas que possuo sofrem alterações',
+    'notifications_opt_own_page_comments' => 'Notificar quando comentam páginas que possuo',
+    'notifications_opt_comment_replies' => 'Notificar respostas aos meus comentários',
+    'notifications_save' => 'Guardar preferências',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
     'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index 94da707f389..eb637d8bd4f 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'A reciclagem está atualmente vazia',
     'recycle_bin_empty' => 'Esvaziar Reciclagem',
     'recycle_bin_empty_confirm' => 'Isto irá destruir permanentemente todos os itens na reciclagem inclusive o conteúdo de cada item. Tem certeza de que a deseja esvaziar?',
-    'recycle_bin_destroy_confirm' => 'Esta ação irá excluir permanentemente do sistema este item junto com todos os elementos filhos listados abaixo. Não poderá restaurar este conteúdo. Tem certeza de que deseja excluir permanentemente este item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Itens a serem Destruídos',
     'recycle_bin_restore_list' => 'Itens a serem Restaurados',
     'recycle_bin_restore_confirm' => 'Esta ação irá restaurar o item excluído, inclusive quaisquer elementos filhos, para o seu local original. Se a localização original tiver, entretanto, sido eliminada e estiver agora na reciclagem, o item pai também precisará de ser restaurado.',
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 650782b1db8..93b4d91e6fd 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Usuário removido com sucesso',
 
     // API Tokens
-    'api_token_create' => 'token de api criado',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Token de API criado com sucesso',
-    'api_token_update' => 'token de API atualizado',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Token de API atualizado com sucesso',
-    'api_token_delete' => 'token de api excluído',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Token de API excluído com sucesso',
 
     // Roles
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 5e3f7611407..3bc23623b4b 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descrição',
     'role' => 'Cargo',
     'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'Esta imagem deve ser aproximadamente 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Ações',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index 71e284475b6..d89117885ca 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Propriedades da tabela',
     'table_properties_title' => 'Propriedades da Tabela',
     'delete_table' => 'Excluir Tabela',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Inserir linha antes',
     'insert_row_after' => 'Inserir linha depois',
     'delete_row' => 'Excluir linha',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 6e32f280170..f4c43a415f0 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Atualizado :timeLength',
     'meta_updated_name' => 'Atualizado :timeLength por :user',
     'meta_owned_name' => 'De :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Referenciado no item :count|Referenciado nos items :count',
     'entity_select' => 'Seleção de Entidade',
     'entity_select_lack_permission' => 'Você não tem as permissões necessárias para selecionar este item',
     'images' => 'Imagens',
@@ -39,6 +39,9 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo Texto',
     'export_md' => 'Arquivos para remarcar',
+    'default_template' => 'Modelo de página padrão',
+    'default_template_explain' => 'Atribuir o modelo de página que sera usado como padrão para todas as páginas criadas neste livro. Tenha em mente que isto será usado apenas se o criador da página tiver acesso de visualização ao modelo de página escolhido.',
+    'default_template_select' => 'Selecione o modelo de página',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -80,31 +83,31 @@
     'search_update' => 'Refazer Pesquisa',
 
     // Shelves
-    'shelf' => 'Prateleira',
-    'shelves' => 'Prateleiras',
-    'x_shelves' => ':count Prateleira|:count Prateleiras',
-    'shelves_empty' => 'Nenhuma prateleira foi criada',
-    'shelves_create' => 'Criar Nova Prateleira',
-    'shelves_popular' => 'Prateleiras Populares',
-    'shelves_new' => 'Prateleiras Novas',
-    'shelves_new_action' => 'Nova Prateleira',
-    'shelves_popular_empty' => 'As prateleiras mais populares aparecerão aqui.',
-    'shelves_new_empty' => 'As prateleiras criadas mais recentemente aparecerão aqui.',
-    'shelves_save' => 'Salvar Prateleira',
-    'shelves_books' => 'Livros nesta prateleira',
-    'shelves_add_books' => 'Adicionar livros a esta prateleira',
+    'shelf' => 'Estante',
+    'shelves' => 'Estantes',
+    'x_shelves' => ':count Estante|:count Estantes',
+    'shelves_empty' => 'Nenhuma estante foi criada',
+    'shelves_create' => 'Criar Nova Estante',
+    'shelves_popular' => 'Estantes Populares',
+    'shelves_new' => 'Novas Estantes',
+    'shelves_new_action' => 'Nova Estante',
+    'shelves_popular_empty' => 'As estantes mais populares serão exibidas aqui.',
+    'shelves_new_empty' => 'As estantes mais recentes serão exibidas aqui.',
+    'shelves_save' => 'Salvar Estante',
+    'shelves_books' => 'Livros nesta estante',
+    'shelves_add_books' => 'Adicionar livros a esta estante',
     'shelves_drag_books' => 'Arraste os livros abaixo para adicioná-los a esta estante',
-    'shelves_empty_contents' => 'Esta prateleira não possui livros atribuídos a ela',
-    'shelves_edit_and_assign' => 'Editar prateleira para atribuir livros',
+    'shelves_empty_contents' => 'Esta estante não possui livros atribuídos a ela',
+    'shelves_edit_and_assign' => 'Editar estante para atribuir livros',
     'shelves_edit_named' => 'Editar estante :name',
-    'shelves_edit' => 'Editar prateleira',
-    'shelves_delete' => 'Excluir prateleira',
+    'shelves_edit' => 'Editar estante',
+    'shelves_delete' => 'Excluir estante',
     'shelves_delete_named' => 'Excluir estante :name',
     'shelves_delete_explain' => "Isso excluirá a estante com o nome ':name'. Os livros contidos não serão excluídos.",
-    'shelves_delete_confirmation' => 'Tem certeza de que deseja excluir esta prateleira?',
-    'shelves_permissions' => 'Permissões de prateleira',
-    'shelves_permissions_updated' => 'Permissões de prateleira atualizadas',
-    'shelves_permissions_active' => 'Permissões de prateleira ativas',
+    'shelves_delete_confirmation' => 'Tem certeza de que deseja excluir esta estante de livros?',
+    'shelves_permissions' => 'Permissões da Estante',
+    'shelves_permissions_updated' => 'Permissões da estante atualizadas',
+    'shelves_permissions_active' => 'Permissões da estante ativada',
     'shelves_permissions_cascade_warning' => 'As permissões nas prateleiras não são automaticamente em cascata para os livros contidos. Isso ocorre porque um livro pode existir em várias prateleiras. No entanto, as permissões podem ser copiadas para livros filhos usando a opção encontrada abaixo.',
     'shelves_permissions_create' => 'As permissões de criação de prateleira são usadas apenas para copiar livros filhos usando a ação abaixo. Eles não controlam a capacidade de criar livros.',
     'shelves_copy_permissions_to_books' => 'Copiar Permissões para Livros',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editar Livro :bookName',
     'books_form_book_name' => 'Nome do Livro',
     'books_save' => 'Salvar Livro',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Permissões do Livro',
     'books_permissions_updated' => 'Permissões do Livro Atualizadas',
     'books_empty_contents' => 'Nenhuma página ou capítulo foram criados para este livro.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Excluir Rascunho de Página',
     'pages_delete_success' => 'Página excluída',
     'pages_delete_draft_success' => 'Rascunho de página excluído',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Está página atualmente esta atribuída como modelo de página padrão para algum livro ou capítulo. Estes livros ou capítulos não terão mais um modelo de página padrão atribuídos após essa página ser deletada.',
     'pages_delete_confirm' => 'Tem certeza que deseja excluir a página?',
     'pages_delete_draft_confirm' => 'Tem certeza que deseja excluir o rascunho de página?',
     'pages_editing_named' => 'Editando a Página :pageName',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Referências',
     'references_none' => 'Não há referências rastreadas para este item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Abaixo estão todas as páginas conhecidas no sistema que estão vinculadas a este item.',
 
     // Watch Options
     'watch' => 'Acompanhar',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index 93ed24a5973..ca050686768 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Um usuário com o e-mail :email já existe mas com credenciais diferentes.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-mail já foi confirmado. Tente efetuar o login.',
     'email_confirmation_invalid' => 'Esse token de confirmação não é válido ou já foi utilizado. Por favor, tente cadastrar-se novamente.',
     'email_confirmation_expired' => 'O token de confirmação já expirou. Um novo e-mail foi enviado.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'A requisição do sistema de autenticação externa não foi reconhecia por um processo iniciado por esta aplicação. Após o login, navegar para o caminho anterior pode causar um problema.',
     'saml_fail_authed' => 'Login utilizando :system falhou. Sistema não forneceu autorização bem sucedida',
     'oidc_already_logged_in' => 'Já está logado',
-    'oidc_user_not_registered' => 'O usuário :name não está registrado e o registro automático está desativado',
     'oidc_no_email_address' => 'Não foi possível encontrar um endereço de e-mail para este usuário, nos dados fornecidos pelo sistema de autenticação externa',
     'oidc_fail_authed' => 'Login usando :system falhou, o sistema não forneceu autorização com sucesso',
     'social_no_action_defined' => 'Nenhuma ação definida',
diff --git a/lang/pt_BR/notifications.php b/lang/pt_BR/notifications.php
index e8fc217adc7..6397b20e5fe 100644
--- a/lang/pt_BR/notifications.php
+++ b/lang/pt_BR/notifications.php
@@ -13,7 +13,7 @@
     'updated_page_debounce' => 'Para prevenir notificações em massa, por enquanto notificações não serão enviadas para você para próximas edições nessa página pelo mesmo editor.',
 
     'detail_page_name' => 'Nome da Página:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Caminho da Página:',
     'detail_commenter' => 'Comentador:',
     'detail_comment' => 'Comentário:',
     'detail_created_by' => 'Criado por: ',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 3502a0e92aa..cd30b9e208a 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'A lixeira está vazia',
     'recycle_bin_empty' => 'Esvaziar Lixeira',
     'recycle_bin_empty_confirm' => 'Isso irá destruir permanentemente todos os itens na lixeira inclusive o conteúdo de cada item. Tem certeza de que quer esvaziar a lixeira?',
-    'recycle_bin_destroy_confirm' => 'Esta ação irá excluir permanentemente do sistema este item junto com todos os elementos filhos listados abaixo. Você não poderá restaurar esse conteúdo. Tem certeza de que deseja excluir permanentemente este item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Itens a serem Destruídos',
     'recycle_bin_restore_list' => 'Itens a serem restaurados',
     'recycle_bin_restore_confirm' => 'Esta ação irá restaurar o item excluído, inclusive quaisquer elementos filhos, para seu local original. Se a localização original tiver, entretanto, sido eliminada e estiver agora na lixeira, o item pai também precisará ser restaurado.',
diff --git a/lang/ro/activities.php b/lang/ro/activities.php
index 4caafab05bc..d076b91e82a 100644
--- a/lang/ro/activities.php
+++ b/lang/ro/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Utilizator eliminat cu succes',
 
     // API Tokens
-    'api_token_create' => 'token api creat',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Token API creat cu succes',
-    'api_token_update' => 'token api actualizat',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Token API actualizat cu succes',
-    'api_token_delete' => 'token api șters',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Token API șters cu succes',
 
     // Roles
diff --git a/lang/ro/common.php b/lang/ro/common.php
index 1bc23dc1883..767f10955b7 100644
--- a/lang/ro/common.php
+++ b/lang/ro/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descriere',
     'role' => 'Rol',
     'cover_image' => 'Imagine copertă',
-    'cover_image_description' => 'Această imagine ar trebui să aibă aproximativ 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Acțiuni',
diff --git a/lang/ro/editor.php b/lang/ro/editor.php
index e882494eed5..65208957b37 100644
--- a/lang/ro/editor.php
+++ b/lang/ro/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Proprietăți tabel',
     'table_properties_title' => 'Proprietăți tabel',
     'delete_table' => 'Șterge tabel',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Inserează rând după',
     'insert_row_after' => 'Inserează rând înainte',
     'delete_row' => 'Șterge rând',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index c203df4377b..6faf3043526 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Fișier PDF',
     'export_text' => 'Fișier text simplu',
     'export_md' => 'Fișier Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permisiuni',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Editează cartea :bookName',
     'books_form_book_name' => 'Nume carte',
     'books_save' => 'Salvează cartea',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Permisiuni carte',
     'books_permissions_updated' => 'Permisiuni carte actualizate',
     'books_empty_contents' => 'Nu au fost create pagini sau capitole pentru această carte.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Șterge ciorna',
     'pages_delete_success' => 'Pagină ștearsă',
     'pages_delete_draft_success' => 'Pagină ciornă ștearsă',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ești sigur că dorești să ștergi acestă pagină?',
     'pages_delete_draft_confirm' => 'Ești sigur că vrei să ștergi această pagină schiță?',
     'pages_editing_named' => 'Editare pagină :pageNume',
diff --git a/lang/ro/errors.php b/lang/ro/errors.php
index b1ce69cfd91..a1ac0e04a9f 100644
--- a/lang/ro/errors.php
+++ b/lang/ro/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un utilizator cu adresa de e-mail :email există deja, dar cu acreditări diferite.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-mailul a fost deja confirmat, încearcă să te conectezi.',
     'email_confirmation_invalid' => 'Acest token de confirmare nu este valid sau a fost deja folosit, încercă să te înregistrezi din nou.',
     'email_confirmation_expired' => 'Token-ul de confirmare a expirat, a fost trimis un nou e-mail de confirmare.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Solicitarea de la sistemul extern de autentificare nu este recunoscută de un proces inițiat de această aplicație. Navigarea înapoi după o autentificare ar putea cauza această problemă.',
     'saml_fail_authed' => 'Autentificarea folosind :system a eșuat, sistemul nu a furnizat autorizare cu succes',
     'oidc_already_logged_in' => 'Deja conectat',
-    'oidc_user_not_registered' => 'Utilizatorul :name nu este înregistrat și înregistrarea automată este dezactivată',
     'oidc_no_email_address' => 'Nu s-a putut găsi o adresă de e-mail, pentru acest utilizator, în datele furnizate de sistemul extern de autentificare',
     'oidc_fail_authed' => 'Autentificarea folosind :system a eșuat, sistemul nu a furnizat autorizare cu succes',
     'social_no_action_defined' => 'Nicio acțiune definită',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index 062d402bcda..508ab595a81 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Coșul de gunoi este în prezent gol',
     'recycle_bin_empty' => 'Golește coșul de gunoi',
     'recycle_bin_empty_confirm' => 'Aceasta va distruge definitiv toate elementele din coșul de gunoi, inclusiv conținutul conținut din fiecare element. Ești sigur că vrei să golești coșul de gunoi?',
-    'recycle_bin_destroy_confirm' => 'Această acțiune va șterge permanent acest element din sistem, împreună cu orice elemente copil enumerat mai jos, și nu vei putea restaura acest conținut. Ești sigur că vrei să ștergi definitiv acest element?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Elemente de distrus',
     'recycle_bin_restore_list' => 'Elemente care vor fi restaurate',
     'recycle_bin_restore_confirm' => 'Această acțiune va restaura elementul șters, inclusiv orice elemente copii, la locația lor originală. În cazul în care locația originală a fost de atunci ștearsă și acum este în coșul de reciclare, elementul părinte va trebui, de asemenea, să fie restaurat.',
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index d1a4926399d..1c4fd5da124 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Пользователь успешно удален',
 
     // API Tokens
-    'api_token_create' => 'создал api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API токен успешно создан',
-    'api_token_update' => 'обновил api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API токен успешно обновлен',
-    'api_token_delete' => 'удалил api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API токен успешно удален',
 
     // Roles
diff --git a/lang/ru/common.php b/lang/ru/common.php
index aaffe250c73..b2af5fdef60 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -20,7 +20,7 @@
     'description' => 'Описание',
     'role' => 'Роль',
     'cover_image' => 'Обложка',
-    'cover_image_description' => 'Изображение должно быть размером около 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Действия',
@@ -52,7 +52,7 @@
     'filter_clear' => 'Сбросить фильтр',
     'download' => 'Загрузить',
     'open_in_tab' => 'Открыть во вкладке',
-    'open' => 'Open',
+    'open' => 'Открыть',
 
     // Sort Options
     'sort_options' => 'Параметры сортировки',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index cc26f75dca0..756925f581f 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Свойства таблицы',
     'table_properties_title' => 'Свойства таблицы',
     'delete_table' => 'Удалить таблицу',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Вставить строку выше',
     'insert_row_after' => 'Вставить строку ниже',
     'delete_row' => 'Удалить строку',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index a0891244553..deafa2e85b2 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовый файл',
     'export_md' => 'Файл Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Разрешения',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Редактировать книгу :bookName',
     'books_form_book_name' => 'Название книги',
     'books_save' => 'Сохранить книгу',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Разрешения на книгу',
     'books_permissions_updated' => 'Разрешения на книгу обновлены',
     'books_empty_contents' => 'Для этой книги нет страниц или разделов.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Удалить черновик',
     'pages_delete_success' => 'Страница удалена',
     'pages_delete_draft_success' => 'Черновик удален',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Вы действительно хотите удалить эту страницу?',
     'pages_delete_draft_confirm' => 'Вы действительно хотите удалить этот черновик?',
     'pages_editing_named' => 'Редактирование страницы :pageName',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index 2b18494e7fe..0ff14e9f5b3 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Пользователь с электронной почтой :email уже существует, но с другими учетными данными.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Адрес электронной почты уже был подтвержден, попробуйте войти в систему.',
     'email_confirmation_invalid' => 'Этот токен подтверждения недействителен или уже используется. Повторите попытку регистрации.',
     'email_confirmation_expired' => 'Истек срок действия токена. Отправлено новое письмо с подтверждением.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Запрос от внешней системы аутентификации не распознается процессом, запущенным этим приложением. Переход назад после входа в систему может вызвать эту проблему.',
     'saml_fail_authed' => 'Вход с помощью :system не удался, система не предоставила успешную авторизацию',
     'oidc_already_logged_in' => 'Вход в систему уже произведен',
-    'oidc_user_not_registered' => 'Пользователь :name не зарегистрирован и автоматическая регистрация отключена',
     'oidc_no_email_address' => 'Не удалось найти email этого пользователя в данных, предоставленных внешней системой аутентификации',
     'oidc_fail_authed' => 'Вход в систему с помощью :system не удался, система не обеспечила успешную авторизацию',
     'social_no_action_defined' => 'Действие не определено',
diff --git a/lang/ru/preferences.php b/lang/ru/preferences.php
index 126aa6f1aed..1cfd1c24bc0 100644
--- a/lang/ru/preferences.php
+++ b/lang/ru/preferences.php
@@ -5,7 +5,7 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Моя учетная запись',
 
     'shortcuts' => 'Горячие клавиши',
     'shortcuts_interface' => 'UI Shortcut Preferences',
@@ -17,35 +17,35 @@
     'shortcuts_save' => 'Сохранить горячие клавиши',
     'shortcuts_overlay_desc' => 'Примечание: Когда горячие клавиши включены, вспомогательное наложение доступно через нажатие "?", которая будет подсвечивать доступные горячие клавиши для действий, видимых в настоящее время на экране.',
     'shortcuts_update_success' => 'Настройки горячих клавиш были обновлены!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_overview_desc' => 'Управление клавишами быстрого доступа, которые можно использовать для навигации по системному интерфейсу.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
+    'notifications' => 'Настройки уведомлений',
+    'notifications_desc' => 'Управляйте полученными по электронной почте уведомлениями при выполнении определенных действий в системе.',
+    'notifications_opt_own_page_changes' => 'Уведомлять об изменениях в собственных страницах',
+    'notifications_opt_own_page_comments' => 'Уведомлять о комментариях на собственных страницах',
+    'notifications_opt_comment_replies' => 'Уведомлять об ответах на мои комментарии',
+    'notifications_save' => 'Сохранить настройки',
+    'notifications_update_success' => 'Настройки уведомлений были обновлены!',
     'notifications_watched' => 'Watched & Ignored Items',
     'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'Доступ и безопасность',
+    'auth_change_password' => 'Изменить пароль',
+    'auth_change_password_desc' => 'Установите пароль для входа в приложение. Длина пароля должна быть не менее 8 символов.',
+    'auth_change_password_success' => 'Пароль был обновлен!',
 
-    'profile' => 'Profile Details',
+    'profile' => 'Детали профиля',
     'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
+    'profile_view_public' => 'Просмотреть публичный профиль',
     'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile_email_desc' => 'Этот адрес электронной почты будет использоваться для уведомлений и, в зависимости от активной системы аутентификации, для доступа к системе.',
+    'profile_email_no_permission' => 'К сожалению, у вас нет разрешения на изменение адреса электронной почты. Если вам действительно необходимо его изменить, нужно попросить администратора сделать это.',
+    'profile_avatar_desc' => 'Выберите изображение, которое будет использоваться для представления себя другим в системе. По возможности это изображение должно быть квадратным и около 256 пикселей по ширине и высоте.',
+    'profile_admin_options' => 'Административные параметры',
+    'profile_admin_options_desc' => 'Дополнительные параметры уровня администратора, такие как управление назначением ролей, могут быть найдены для вашей учетной записи в области "Настройки > Пользователи".',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'Удалить аккаунт',
+    'delete_my_account' => 'Удалить мой аккаунт',
+    'delete_my_account_desc' => 'Это полностью удалит вашу учетную запись из системы. Вы не сможете отменить это действие или восстановить эту учетную запись. Созданный вами контент, такой как созданные страницы и загруженные изображения, останется без изменений.',
+    'delete_my_account_warning' => 'Вы уверены, что хотите удалить свой аккаунт?',
 ];
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index ef11be4bd62..e78b2869fb5 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'На данный момент корзина пуста',
     'recycle_bin_empty' => 'Очистить корзину',
     'recycle_bin_empty_confirm' => 'Это действие навсегда уничтожит все элементы в корзине, включая содержимое, содержащееся в каждом элементе. Вы уверены, что хотите очистить корзину?',
-    'recycle_bin_destroy_confirm' => 'Это действие удалит этот элемент навсегда вместе с любыми дочерними элементами, перечисленными ниже, и вы не сможете восстановить этот контент. Вы уверены, что хотите навсегда удалить этот элемент?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Элементы для удаления',
     'recycle_bin_restore_list' => 'Элементы для восстановления',
     'recycle_bin_restore_confirm' => 'Это действие восстановит удаленный элемент, включая дочерние, в исходное место. Если исходное место было удалено и теперь находится в корзине, родительский элемент также необходимо будет восстановить.',
@@ -193,8 +193,8 @@
     'users_send_invite_text' => 'Вы можете отправить этому пользователю письмо с приглашением, которое позволит ему установить пароль самостоятельно или задайте пароль сами.',
     'users_send_invite_option' => 'Отправить пользователю письмо с приглашением',
     'users_external_auth_id' => 'Внешний ID аутентификации',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Когда используется внешняя система аутентификации (например, SAML2, OIDC или LDAP), этот идентификатор будет использоваться для связывания пользователя BookStack с учетной записью системы аутентификации. Вы можете игнорировать это поле, если используете стандартную аутентификацию по электронной почте.',
+    'users_password_warning' => 'Заполните поля ниже только если вы хотите изменить пароль.',
     'users_system_public' => 'Этот пользователь представляет любых гостевых пользователей, которые посещают ваше приложение. Он не может использоваться для входа в систему и назначается автоматически.',
     'users_delete' => 'Удалить пользователя',
     'users_delete_named' => 'Удалить пользователя :userName',
@@ -210,7 +210,7 @@
     'users_preferred_language' => 'Предпочитаемый язык',
     'users_preferred_language_desc' => 'Этот параметр изменит язык интерфейса приложения. Это не влияет на созданный пользователем контент.',
     'users_social_accounts' => 'Аккаунты социальных сетей',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Просмотр статуса подключенных социальных учетных записей для этого пользователя. Учетные записи социальных сетей могут использоваться в дополнение к системе первичной аутентификации для доступа к системе.',
     'users_social_accounts_info' => 'Здесь вы можете подключить другие учетные записи для более быстрого и легкого входа в систему. Отключение учетной записи здесь не возможно. Отмените доступ к настройкам вашего профиля в подключенном социальном аккаунте.',
     'users_social_connect' => 'Подключить аккаунт',
     'users_social_disconnect' => 'Отключить аккаунт',
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index 9750afa1784..2422ea7f6ef 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Používateľ úspešne zmazaný',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/sk/common.php b/lang/sk/common.php
index 898e08fdb53..e2ef66af5e9 100644
--- a/lang/sk/common.php
+++ b/lang/sk/common.php
@@ -20,7 +20,7 @@
     'description' => 'Popis',
     'role' => 'Rola',
     'cover_image' => 'Obal knihy',
-    'cover_image_description' => 'Tento obrázok by mal byť približne 300 x 170 pixelov.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Akcie',
diff --git a/lang/sk/editor.php b/lang/sk/editor.php
index 61ac9ca9e23..ec7f24d657e 100644
--- a/lang/sk/editor.php
+++ b/lang/sk/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Vlastnosti tabuľky',
     'table_properties_title' => 'Vlastnosti tabuľky',
     'delete_table' => 'Vymazať tabuľku',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Vložiť riadok pred',
     'insert_row_after' => 'Vložiť riadok za',
     'delete_row' => 'Vymazať riadok',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 0d74c691aa8..2842c90968b 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF súbor',
     'export_text' => 'Súbor s čistým textom',
     'export_md' => 'Súbor Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnenia',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Upraviť knihu :bookName',
     'books_form_book_name' => 'Názov knihy',
     'books_save' => 'Uložiť knihu',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Oprávnenia knihy',
     'books_permissions_updated' => 'Oprávnenia knihy aktualizované',
     'books_empty_contents' => 'Pre túto knihu neboli vytvorené žiadne stránky alebo kapitoly.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Zmazať koncept',
     'pages_delete_success' => 'Stránka zmazaná',
     'pages_delete_draft_success' => 'Koncept stránky zmazaný',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ste si istý, že chcete zmazať túto stránku?',
     'pages_delete_draft_confirm' => 'Ste si istý, že chcete zmazať tento koncept stránky?',
     'pages_editing_named' => 'Upraviť stránku :pageName',
diff --git a/lang/sk/errors.php b/lang/sk/errors.php
index 06f396f1788..e09f5f04ed0 100644
--- a/lang/sk/errors.php
+++ b/lang/sk/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Používateľ s emailom :email už existuje, ale s inými údajmi.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email bol už overený, skúste sa prihlásiť.',
     'email_confirmation_invalid' => 'Tento potvrdzujúci token nie je platný alebo už bol použitý, skúste sa prosím registrovať znova.',
     'email_confirmation_expired' => 'Potvrdzujúci token expiroval, bol odoslaný nový potvrdzujúci email.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Požiadavka z externého autentifikačného systému nie je rozpoznaná procesom spusteným touto aplikáciou. Tento problém môže spôsobiť navigácia späť po prihlásení.',
     'saml_fail_authed' => 'Prihlásenie pomocou :system zlyhalo, systém neposkytol úspešnú autorizáciu',
     'oidc_already_logged_in' => 'Používateľ sa už prihlásil',
-    'oidc_user_not_registered' => 'Používateľ :name nie je zaregistrovaný a automatická registrácia je zakázaná',
     'oidc_no_email_address' => 'V údajoch poskytnutých externým overovacím systémom sa nepodarilo nájsť e-mailovú adresu tohto používateľa',
     'oidc_fail_authed' => 'Prihlásenie pomocou :system zlyhalo, systém neposkytol úspešnú autorizáciu',
     'social_no_action_defined' => 'Nebola definovaná žiadna akcia',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index 0192066defa..b6beb5e6a9a 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Kôš je aktuálne prázdny',
     'recycle_bin_empty' => 'Vyprázdniť Kôš',
     'recycle_bin_empty_confirm' => 'Tým sa natrvalo odstránia všetky položky v koši vrátane obsahu obsiahnutého v každej položke. Naozaj chcete vyprázdniť kôš?',
-    'recycle_bin_destroy_confirm' => 'Táto akcia natrvalo odstráni túto položku spolu so všetkými podriadenými prvkami uvedenými nižšie zo systému a tento obsah nebudete môcť obnoviť. Naozaj chcete natrvalo odstrániť túto položku?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Položky, ktoré budú odstránené',
     'recycle_bin_restore_list' => 'Položky, ktoré budú obnovené',
     'recycle_bin_restore_confirm' => 'Táto akcia obnoví odstránenú položku vrátane všetkých podradených prvkov na ich pôvodné miesto. Ak bolo pôvodné umiestnenie medzitým odstránené a teraz je v koši, bude potrebné obnoviť aj nadradenú položku.',
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index 2db01288820..e82b174c930 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -7,117 +7,117 @@
 
     // Pages
     'page_create'                 => 'ustvarjena stran',
-    'page_create_notification'    => 'Page successfully created',
+    'page_create_notification'    => 'Stran uspešno ustvarjena',
     'page_update'                 => 'posodobljena stran',
-    'page_update_notification'    => 'Page successfully updated',
+    'page_update_notification'    => 'Stran uspešno posodobljena',
     'page_delete'                 => 'izbrisana stran',
-    'page_delete_notification'    => 'Page successfully deleted',
+    'page_delete_notification'    => 'Stran uspešno izbrisana',
     'page_restore'                => 'obnovljena stran',
-    'page_restore_notification'   => 'Page successfully restored',
+    'page_restore_notification'   => 'Stran uspešno obnovljena',
     'page_move'                   => 'premaknjena stran',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'Stran uspešno premaknjena',
 
     // Chapters
     'chapter_create'              => 'ustvarjeno poglavje',
-    'chapter_create_notification' => 'Chapter successfully created',
+    'chapter_create_notification' => 'Poglavje uspešno ustvarjeno',
     'chapter_update'              => 'posodobljeno poglavje',
-    'chapter_update_notification' => 'Chapter successfully updated',
+    'chapter_update_notification' => 'Poglavje uspešno posodobljeno',
     'chapter_delete'              => 'izbrisano poglavje',
-    'chapter_delete_notification' => 'Chapter successfully deleted',
+    'chapter_delete_notification' => 'Poglavje uspešno izbrisano',
     'chapter_move'                => 'premaknjeno poglavje',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'Poglavje uspešno premaknjeno',
 
     // Books
     'book_create'                 => 'knjiga ustvarjena',
-    'book_create_notification'    => 'Book successfully created',
-    'book_create_from_chapter'              => 'converted chapter to book',
-    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
+    'book_create_notification'    => 'Knjiga uspešno ustvarjena',
+    'book_create_from_chapter'              => 'poglavje pretvorjeno v knjigo',
+    'book_create_from_chapter_notification' => 'Poglavje uspešno pretvorjeno v knjigo',
     'book_update'                 => 'knjiga posodobljena',
-    'book_update_notification'    => 'Book successfully updated',
+    'book_update_notification'    => 'Knjiga uspešno posodobljena',
     'book_delete'                 => 'izbrisana knjiga',
-    'book_delete_notification'    => 'Book successfully deleted',
+    'book_delete_notification'    => 'Knjiga uspešno izbrisana',
     'book_sort'                   => 'razvrščena knjiga',
-    'book_sort_notification'      => 'Book successfully re-sorted',
+    'book_sort_notification'      => 'Knjiga uspešno razvrščena',
 
     // Bookshelves
-    'bookshelf_create'            => 'created shelf',
-    'bookshelf_create_notification'    => 'Shelf successfully created',
-    'bookshelf_create_from_book'    => 'converted book to shelf',
-    'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
-    'bookshelf_update'                 => 'updated shelf',
-    'bookshelf_update_notification'    => 'Shelf successfully updated',
-    'bookshelf_delete'                 => 'deleted shelf',
-    'bookshelf_delete_notification'    => 'Shelf successfully deleted',
+    'bookshelf_create'            => 'knjižna polica ustvarjena',
+    'bookshelf_create_notification'    => 'Knjižna polica uspešno ustvarjena',
+    'bookshelf_create_from_book'    => 'knjiga pretvorjena v knjižno polico',
+    'bookshelf_create_from_book_notification'    => 'Knjiga uspešno pretvorjena v knjižno polico',
+    'bookshelf_update'                 => 'knjižna polica posodobljena',
+    'bookshelf_update_notification'    => 'Knjižna polica uspešno posodobljena',
+    'bookshelf_delete'                 => 'knjižna polica izbrisana',
+    'bookshelf_delete_notification'    => 'Knjižna polica uspešno izbrisana',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'obnovljena različica',
+    'revision_delete' => 'izbrisana različica',
+    'revision_delete_notification' => 'Različica uspešno izbrisana',
 
     // Favourites
-    'favourite_add_notification' => '":name" has been added to your favourites',
-    'favourite_remove_notification' => '":name" has been removed from your favourites',
+    'favourite_add_notification' => '":name" dodan med priljubljene',
+    'favourite_remove_notification' => '":name" odstranjen iz priljubljenih',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Nastavitve opazovanja uspešno posodobljene',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
-    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
-    'mfa_remove_method' => 'removed MFA method',
-    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+    'auth_login' => 'prijavljen',
+    'auth_register' => 'registriran kot nov uporabnik',
+    'auth_password_reset_request' => 'zahteva ponastavitev uporabniškega gesla',
+    'auth_password_reset_update' => 'ponastavitev uporabniškega gesla',
+    'mfa_setup_method' => 'nastavljena metoda MFA',
+    'mfa_setup_method_notification' => 'Večfaktorska avtentikacija (MFA) uspešno nastavljena',
+    'mfa_remove_method' => 'odstranjena metoda MFA',
+    'mfa_remove_method_notification' => 'Večfaktorska avtentikacija (MFA) uspešno odstranjena',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
-    'maintenance_action_run' => 'ran maintenance action',
+    'settings_update' => 'posodobitev nastavitev',
+    'settings_update_notification' => 'Nastavitve uspešno posodobljene',
+    'maintenance_action_run' => 'zagnano vzdrževanje',
 
     // Webhooks
-    'webhook_create' => 'created webhook',
-    'webhook_create_notification' => 'Webhook successfully created',
-    'webhook_update' => 'updated webhook',
-    'webhook_update_notification' => 'Webhook successfully updated',
-    'webhook_delete' => 'deleted webhook',
-    'webhook_delete_notification' => 'Webhook successfully deleted',
+    'webhook_create' => 'ustvarjen webhook',
+    'webhook_create_notification' => 'Webhook uspešno ustvarjen',
+    'webhook_update' => 'posodobljen webhook',
+    'webhook_update_notification' => 'Webhook uspešno posodobljen',
+    'webhook_delete' => 'izbrisan webhook',
+    'webhook_delete_notification' => 'Webhook uspešno izbrisan',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
-    'user_update_notification' => 'User successfully updated',
-    'user_delete' => 'deleted user',
-    'user_delete_notification' => 'User successfully removed',
+    'user_create' => 'ustvarjen uporabnik',
+    'user_create_notification' => 'Uporabnik uspešno ustvarjen',
+    'user_update' => 'posodobljen uporabnik',
+    'user_update_notification' => 'Uporabnik uspešno posodobljen',
+    'user_delete' => 'uporabnik izbrisan',
+    'user_delete_notification' => 'Uporabnik uspešno izbrisan',
 
     // API Tokens
-    'api_token_create' => 'created api token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'created API token',
+    'api_token_create_notification' => 'Žeton API uspešno ustvarjen',
+    'api_token_update' => 'updated API token',
+    'api_token_update_notification' => 'Žeton API uspešno posodobljen',
+    'api_token_delete' => 'deleted API token',
+    'api_token_delete_notification' => 'Žeton API uspešno izbrisan',
 
     // Roles
-    'role_create' => 'created role',
-    'role_create_notification' => 'Role successfully created',
-    'role_update' => 'updated role',
-    'role_update_notification' => 'Role successfully updated',
-    'role_delete' => 'deleted role',
-    'role_delete_notification' => 'Role successfully deleted',
+    'role_create' => 'ustvarjena vloga',
+    'role_create_notification' => 'Vloga uspešno ustvarjena',
+    'role_update' => 'posodobljena vloga',
+    'role_update_notification' => 'Vloga uspešno posodobljena',
+    'role_delete' => 'izbrisana vloga',
+    'role_delete_notification' => 'Vloga uspešno izbrisana',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'izpraznjen koš',
+    'recycle_bin_restore' => 'obnovljeno iz koša',
+    'recycle_bin_destroy' => 'odstranjeno iz koša',
 
     // Comments
     'commented_on'                => 'komentar na',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'dodan komentar',
+    'comment_update'              => 'posodobljen komentar',
+    'comment_delete'              => 'izbrisan komentar',
 
     // Other
     'permissions_update'          => 'pravice so posodobljene',
diff --git a/lang/sl/common.php b/lang/sl/common.php
index 62d8eb033d5..f48b7f53337 100644
--- a/lang/sl/common.php
+++ b/lang/sl/common.php
@@ -20,7 +20,7 @@
     'description' => 'Opis',
     'role' => 'Vloga',
     'cover_image' => 'Naslovna slika',
-    'cover_image_description' => 'Slika naj bo velika približno 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Dejanja',
diff --git a/lang/sl/editor.php b/lang/sl/editor.php
index 670c1c5e1ac..de9aa0ece10 100644
--- a/lang/sl/editor.php
+++ b/lang/sl/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index 591dd009e9b..69e4e27e8dd 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF datoteka (.pdf)',
     'export_text' => 'Navadna besedilna datoteka',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Dovoljenja',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Uredi knjigo :bookName',
     'books_form_book_name' => 'Ime knjige',
     'books_save' => 'Shrani knjigo',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Dovoljenja knjige',
     'books_permissions_updated' => 'Posodobljena dovoljenja knjige',
     'books_empty_contents' => 'V tej knjigi ni bila ustvarjena še nobena stran ali poglavje.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Izbriši osnutek strani',
     'pages_delete_success' => 'Stran izbirsana',
     'pages_delete_draft_success' => 'Osnutek strani izbrisan',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ste prepričani, da želite izbrisati to stran?',
     'pages_delete_draft_confirm' => 'Ali ste prepričani, da želite izbrisati ta osnutek?',
     'pages_editing_named' => 'Urejanje strani :pageName',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index 51c34132b8d..1dacb6716a7 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Uporabnik z e-pošto :email že obstaja, vendar z drugačnimi poverilnicami.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-naslov je že bil potrjen, poskusite se prijaviti.',
     'email_confirmation_invalid' => 'Ta potrditveni žeton ni veljaven ali je že bil uporabljen. Poizkusite znova.',
     'email_confirmation_expired' => 'Potrditveni žeton je potekel. Nova potrditvena e-pošta je bila poslana.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Zahteva iz zunanjega sistema za preverjanje pristnosti ni prepoznana s strani procesa zagnanega s strani te aplikacije. Pomik nazaj po prijavi je lahko vzrok teh težav.',
     'saml_fail_authed' => 'Prijava z uporabo :system ni uspela, sistem ni zagotovil uspešne avtorizacije',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'Akcija ni določena',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 9b543040d87..272f1b11407 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Koš je prazen',
     'recycle_bin_empty' => 'Izprazni koš',
     'recycle_bin_empty_confirm' => 'S tem boste trajno uničili vse predmete v košu, vključno z vsebino vsakega predmeta. Ali ste prepričani, da želite izprazniti koš?',
-    'recycle_bin_destroy_confirm' => 'S tem dejanjem boste ta element skupaj s spodaj navedenimi podrejenimi elementi trajno izbrisali iz sistema in te vsebine ne boste mogli obnoviti. Ali ste prepričani, da želite trajno izbrisati ta element?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Predmeti, ki naj bodo trajno izbrisani',
     'recycle_bin_restore_list' => 'Predmeti, ki naj bodo obnovljeni',
     'recycle_bin_restore_confirm' => 'S tem dejanjem boste izbrisani element, vključno z vsemi podrejenimi elementi, obnovili na prvotno mesto. Če je bilo prvotno mesto od takrat izbrisano in je zdaj v košu, bo treba obnoviti tudi nadrejeni element.',
diff --git a/lang/sq/activities.php b/lang/sq/activities.php
index 1c7a10310c1..b3590c9bf83 100644
--- a/lang/sq/activities.php
+++ b/lang/sq/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Përdoruesi u fshi me sukses',
 
     // API Tokens
-    'api_token_create' => 'krijoi token api',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'Token API u krijua me sukses',
-    'api_token_update' => 'përditësoi token api',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Token API u përditësua me sukses',
-    'api_token_delete' => 'fshiu token api',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'Token API u fshi me sukses',
 
     // Roles
diff --git a/lang/sq/auth.php b/lang/sq/auth.php
index 08af155e88f..344ef767e16 100644
--- a/lang/sq/auth.php
+++ b/lang/sq/auth.php
@@ -28,8 +28,8 @@
     'create_account' => 'Krijo një llogari',
     'already_have_account' => 'Keni një llogari?',
     'dont_have_account' => 'Nuk keni akoma llogari?',
-    'social_login' => 'Social Login',
-    'social_registration' => 'Social Registration',
+    'social_login' => 'Kyçu me rrjete sociale',
+    'social_registration' => 'Regjistrohu me rrjete sociale',
     'social_registration_text' => 'Regjistrohu dhe logohu duhet përdorur një shërbim tjetër.',
 
     'register_thanks' => 'Faleminderit që u regjistruat!',
@@ -39,17 +39,17 @@
     'register_success' => 'Faleminderit që u regjistruar! Ju tani jeni të regjistruar dhe të loguar.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Attempting Login',
-    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
-    'auto_init_start_link' => 'Proceed with authentication',
+    'auto_init_starting' => 'Përpjekje për t\'u kyçur',
+    'auto_init_starting_desc' => 'Jemi duke kontaktuar sistemin e verifikimit për të filluar proçesin e kyçjes. Nëse nuk ka progres për 5 sekonda, klikoni linkun më poshtë.',
+    'auto_init_start_link' => 'Vazhdoni me verifikimin',
 
     // Password Reset
-    'reset_password' => 'Reset Password',
-    'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
-    'reset_password_send_button' => 'Send Reset Link',
-    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
-    'reset_password_success' => 'Your password has been successfully reset.',
-    'email_reset_subject' => 'Reset your :appName password',
+    'reset_password' => 'Rivendosni fjalëkalimin',
+    'reset_password_send_instructions' => 'Shkruani email-in tuaj më poshtë dhe do të merrni një link në email për të rikthyer fjalëkalimin.',
+    'reset_password_send_button' => 'Dërgo linkun e rikthimit të fjalëkalimit',
+    'reset_password_sent' => 'Një link për rikthimin e fjalëkalimit do ju dërgohet në :email nëse adresa e email-it ndodhet në sistem.',
+    'reset_password_success' => 'Fjalëkalimi juaj u rikthye me sukses.',
+    'email_reset_subject' => 'Rikthe fjalëkalimin për :appName',
     'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
     'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
 
diff --git a/lang/sq/common.php b/lang/sq/common.php
index 27037babec0..266174eed9d 100644
--- a/lang/sq/common.php
+++ b/lang/sq/common.php
@@ -20,7 +20,7 @@
     'description' => 'Description',
     'role' => 'Role',
     'cover_image' => 'Cover image',
-    'cover_image_description' => 'This image should be approx 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Actions',
diff --git a/lang/sq/editor.php b/lang/sq/editor.php
index 670c1c5e1ac..de9aa0ece10 100644
--- a/lang/sq/editor.php
+++ b/lang/sq/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Table properties',
     'table_properties_title' => 'Table Properties',
     'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Insert row before',
     'insert_row_after' => 'Insert row after',
     'delete_row' => 'Delete row',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index f1f915544d1..9e620b24ed1 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Edit Book :bookName',
     'books_form_book_name' => 'Book Name',
     'books_save' => 'Save Book',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Book Permissions',
     'books_permissions_updated' => 'Book Permissions Updated',
     'books_empty_contents' => 'No pages or chapters have been created for this book.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
     'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Are you sure you want to delete this page?',
     'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
     'pages_editing_named' => 'Editing Page :pageName',
diff --git a/lang/sq/errors.php b/lang/sq/errors.php
index 607b6ea833a..8773a78cbf7 100644
--- a/lang/sq/errors.php
+++ b/lang/sq/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
     'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
     'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
     'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'oidc_already_logged_in' => 'Already logged in',
-    'oidc_user_not_registered' => 'The user :name is not registered and automatic registration is disabled',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'No action defined',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index 03e9bf462e2..7b7f5d2a2e3 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
     'recycle_bin_empty' => 'Empty Recycle Bin',
     'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item, along with any child elements listed below, from the system and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/sr/activities.php b/lang/sr/activities.php
new file mode 100644
index 00000000000..0313555c205
--- /dev/null
+++ b/lang/sr/activities.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'креирана страница',
+    'page_create_notification'    => 'Страница је успешно креирана',
+    'page_update'                 => 'ажурирана страница',
+    'page_update_notification'    => 'Страница је успешно ажурирана',
+    'page_delete'                 => 'обрисана страница',
+    'page_delete_notification'    => 'Страница је успешно обрисана',
+    'page_restore'                => 'обновљена страна',
+    'page_restore_notification'   => 'Страница је успешно обновљена',
+    'page_move'                   => 'премештена страна',
+    'page_move_notification'      => 'Страница је успешно померена',
+
+    // Chapters
+    'chapter_create'              => 'креирано поглавље',
+    'chapter_create_notification' => 'Поглавље је успешно креирано',
+    'chapter_update'              => 'ажурирано поглавље',
+    'chapter_update_notification' => 'Поглавље је успешно обновљено',
+    'chapter_delete'              => 'обрисано поглавље',
+    'chapter_delete_notification' => 'Поглавље је успешно обрисано',
+    'chapter_move'                => 'премештено поглавље',
+    'chapter_move_notification' => 'Поглавље успешно премештено',
+
+    // Books
+    'book_create'                 => 'креирана књига',
+    'book_create_notification'    => 'Књига је успешно креирана',
+    'book_create_from_chapter'              => 'конвертовано поглавље у књигу',
+    'book_create_from_chapter_notification' => 'Поглавље успешно конвертовано у књигу',
+    'book_update'                 => 'књига је ажурирана',
+    'book_update_notification'    => 'Књига је успешно ажурирана',
+    'book_delete'                 => 'књига је обрисана',
+    'book_delete_notification'    => 'Књига је успешно обрисана',
+    'book_sort'                   => 'сортирана књига',
+    'book_sort_notification'      => 'Књига је успешно поновно сортирана',
+
+    // Bookshelves
+    'bookshelf_create'            => 'креирана полица',
+    'bookshelf_create_notification'    => 'Полица је успешно креирана',
+    'bookshelf_create_from_book'    => 'конвертована је књига у полицу',
+    'bookshelf_create_from_book_notification'    => 'Књига је успешно конвертована у полицу',
+    'bookshelf_update'                 => 'ажурирана полица',
+    'bookshelf_update_notification'    => 'Полица је успешно ажурирана',
+    'bookshelf_delete'                 => 'обрисана је полица',
+    'bookshelf_delete_notification'    => 'Полица је успешно обрисана',
+
+    // Revisions
+    'revision_restore' => 'повраћена ревизија',
+    'revision_delete' => 'обрисана ревизија',
+    'revision_delete_notification' => 'Ревизија је успешно обрисана',
+
+    // Favourites
+    'favourite_add_notification' => '":name" је додато као ваше омиљено',
+    'favourite_remove_notification' => '":name" је уклоњено као ваше омиљено',
+
+    // Watching
+    'watch_update_level_notification' => 'Подешавање праћених предмета је успешно ажурирано',
+
+    // Auth
+    'auth_login' => 'пријављени',
+    'auth_register' => 'регистрован као нови корисник',
+    'auth_password_reset_request' => 'захтевано ресетовање корисничке лозинке',
+    'auth_password_reset_update' => 'ресетуј корисничку лозинку',
+    'mfa_setup_method' => 'конфигурисан МФА метод',
+    'mfa_setup_method_notification' => 'Вишефакторска метода је успешно конфигурисана',
+    'mfa_remove_method' => 'уклоњен МФА метод',
+    'mfa_remove_method_notification' => 'Вишефакторска метода је успешно уклоњена',
+
+    // Settings
+    'settings_update' => 'ажурирана подешавања',
+    'settings_update_notification' => 'Подешавања су успешно ажурирана',
+    'maintenance_action_run' => 'покренуо акцију одржавања',
+
+    // Webhooks
+    'webhook_create' => 'креиран вебхоок',
+    'webhook_create_notification' => 'Вебхоок је успешно креиран',
+    'webhook_update' => 'ажуриран вебхоок',
+    'webhook_update_notification' => 'Вебхоок је успешно ажуриран',
+    'webhook_delete' => 'обрисан вебхоок',
+    'webhook_delete_notification' => 'Вебхоок је успешно обрисан',
+
+    // Users
+    'user_create' => 'креирао корисника',
+    'user_create_notification' => 'Корисник је успешно креиран',
+    'user_update' => 'ажуриран корисник',
+    'user_update_notification' => 'Корисник је успешно ажуриран',
+    'user_delete' => 'избрисан корисника',
+    'user_delete_notification' => 'Корисник је успешно уклоњен',
+
+    // API Tokens
+    'api_token_create' => 'created API token',
+    'api_token_create_notification' => 'АПИ токен је успешно креиран',
+    'api_token_update' => 'updated API token',
+    'api_token_update_notification' => 'АПИ токен је успешно ажуриран',
+    'api_token_delete' => 'deleted API token',
+    'api_token_delete_notification' => 'АПИ токен је успешно избрисан',
+
+    // Roles
+    'role_create' => 'створена улога',
+    'role_create_notification' => 'Улога је успешно направљена',
+    'role_update' => 'ажурирана улога',
+    'role_update_notification' => 'Улога је успешно ажурирана',
+    'role_delete' => 'обрисана улога',
+    'role_delete_notification' => 'Улога је успешно избрисана',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'испражњена корпа за отпатке',
+    'recycle_bin_restore' => 'враћен из корпе за отпатке',
+    'recycle_bin_destroy' => 'уклоњен из корпе за отпатке',
+
+    // Comments
+    'commented_on'                => 'коментарисао',
+    'comment_create'              => 'додао/ла коментар',
+    'comment_update'              => 'ажуриран коментар',
+    'comment_delete'              => 'обрисан коментар',
+
+    // Other
+    'permissions_update'          => 'ажуриране дозволе',
+];
diff --git a/lang/sr/auth.php b/lang/sr/auth.php
new file mode 100644
index 00000000000..6b80496c4d8
--- /dev/null
+++ b/lang/sr/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'Ови акредитиви се не поклапају са нашом евиденцијом.',
+    'throttle' => 'Превише покушаја пријаве. Покушајте поново за :seconds секунди.',
+
+    // Login & Register
+    'sign_up' => 'Региструј се',
+    'log_in' => 'Пријави се',
+    'log_in_with' => 'Пријавите се са :socialDriver',
+    'sign_up_with' => 'Пријавите се са :socialDriver',
+    'logout' => 'Одјави се',
+
+    'name' => 'Име',
+    'username' => 'Корисничко име',
+    'email' => 'Е-пошта',
+    'password' => 'Лозинка',
+    'password_confirm' => 'Потврди лозинку',
+    'password_hint' => 'Мора да има најмање 8 знакова',
+    'forgot_password' => 'Заборавили сте лозинку?',
+    'remember_me' => 'Запамти ме',
+    'ldap_email_hint' => 'Унесите адресу е-поште коју ћете користити за овај налог.',
+    'create_account' => 'Направи налог',
+    'already_have_account' => 'Већ имате налог?',
+    'dont_have_account' => 'Немате налог?',
+    'social_login' => 'Пријава путем друштвених мрежа',
+    'social_registration' => 'Регистрација путем друштвених мрежа',
+    'social_registration_text' => 'Региструјте се и пријавите користећи другу услугу.',
+
+    'register_thanks' => 'Хвала на регистрацији!',
+    'register_confirm' => 'Проверите своју е-пошту и кликните на дугме за потврду да бисте приступили :appName.',
+    'registrations_disabled' => 'Регистрације су тренутно онемогућене',
+    'registration_email_domain_invalid' => 'Тај домен е-поште нема приступ овој апликацији',
+    'register_success' => 'Хвала што сте се пријавили! Сада сте регистровани и пријављени.',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'Покушај пријаве',
+    'auto_init_starting_desc' => 'Контактирамо ваш систем за аутентификацију да бисмо започели процес пријављивања. Ако нема напретка након 5 секунди, можете покушати да кликнете на везу испод.',
+    'auto_init_start_link' => 'Наставите са аутентификацијом',
+
+    // Password Reset
+    'reset_password' => 'Ресетуј лозинку',
+    'reset_password_send_instructions' => 'Унесите своју адресу е-поште испод и биће вам послата порука е-поште са везом за ресетовање лозинке.',
+    'reset_password_send_button' => 'Пошаљи везу за ресетовање',
+    'reset_password_sent' => 'Веза за ресетовање лозинке ће бити послата на :email ако се та адреса е-поште пронађе у систему.',
+    'reset_password_success' => 'Ваша лозинка је успешно ресетована.',
+    'email_reset_subject' => 'Ресетујте лозинку за :appName',
+    'email_reset_text' => 'Примили сте ову е-пошту јер смо примили захтев за ресетовање лозинке за ваш налог.',
+    'email_reset_not_requested' => 'Ако нисте захтевали ресетовање лозинке, нису потребне додатне радње.',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'Потврдите своју е-пошту на :appName',
+    'email_confirm_greeting' => 'Хвала што сте се придружили :appName!',
+    'email_confirm_text' => 'Молимо потврдите своју адресу е-поште кликом на дугме испод:',
+    'email_confirm_action' => 'Потврдите е-пошту',
+    'email_confirm_send_error' => 'Потребна је потврда е-поште, али систем није могао да пошаље е-пошту. Контактирајте администратора да бисте се уверили да је е-пошта исправно подешена.',
+    'email_confirm_success' => 'Ваша е-пошта је потврђена! Сада би требало да будете у могућности да се пријавите користећи ову адресу е-поште.',
+    'email_confirm_resent' => 'Потврда е-поште је поново послата, проверите пријемно сандуче.',
+    'email_confirm_thanks' => 'Хвала на потврди!',
+    'email_confirm_thanks_desc' => 'Сачекајте тренутак док се обради ваша потврда. Ако не будете преусмерени након 3 секунде, притисните доњу везу „Настави“ да бисте наставили.',
+
+    'email_not_confirmed' => 'Адреса е-поште није потврђена',
+    'email_not_confirmed_text' => 'Ваша адреса е-поште још није потврђена.',
+    'email_not_confirmed_click_link' => 'Кликните на везу у е-поруци која је послата убрзо након што сте се регистровали.',
+    'email_not_confirmed_resend' => 'Ако не можете да пронађете е-пошту, можете поново да пошаљете е-поруку за потврду тако што ћете послати образац испод.',
+    'email_not_confirmed_resend_button' => 'Пошаљи поново мејл за потврду',
+
+    // User Invite
+    'user_invite_email_subject' => 'Позвани сте да се придружите :appName!',
+    'user_invite_email_greeting' => 'За вас је креиран налог на :appName.',
+    'user_invite_email_text' => 'Кликните на дугме испод да бисте поставили лозинку за налог и добили приступ:',
+    'user_invite_email_action' => 'Подесите лозинку за налог',
+    'user_invite_page_welcome' => 'Добродошли у :appName!',
+    'user_invite_page_text' => 'Да бисте завршили креирање налога и добили приступ, потребно је да поставите лозинку која ће се користити за пријаву на :appName приликом будућих посета.',
+    'user_invite_page_confirm_button' => 'Потврди лозинку',
+    'user_invite_success_login' => 'Лозинка је постављена, сада би требало да будете у могућности да се пријавите користећи постављену лозинку за приступ :appName!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'Подешавање вишефакторске аутентификације',
+    'mfa_setup_desc' => 'Подесите вишефакторску аутентификацију као додатни ниво безбедности за ваш кориснички налог.',
+    'mfa_setup_configured' => 'Већ конфигурисано',
+    'mfa_setup_reconfigure' => 'Поново конфигуришите',
+    'mfa_setup_remove_confirmation' => 'Да ли сте сигурни да желите да уклоните овај метод вишефакторске аутентификације?',
+    'mfa_setup_action' => 'Подешавање',
+    'mfa_backup_codes_usage_limit_warning' => 'Преостало вам је мање од 5 резервних кодова. Генеришите и сачувајте нови сет пре него што вам понестане кодова како бисте спречили да останете без налога.',
+    'mfa_option_totp_title' => 'Aplikacije za mobilne uređaje',
+    'mfa_option_totp_desc' => 'Да бисте користили вишефакторску аутентификацију, биће вам потребна мобилна апликација која подржава ТОТП, као што јеGoogle Authenticator, Authy или Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Резервни кодови',
+    'mfa_option_backup_codes_desc' => 'Безбедно чувајте скуп резервних кодова за једнократну употребу које можете да унесете да бисте потврдили свој идентитет.',
+    'mfa_gen_confirm_and_enable' => 'Потврдите и омогућите',
+    'mfa_gen_backup_codes_title' => 'Подешавање резервних кодова',
+    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_download' => 'Преузми кодове',
+    'mfa_gen_backup_codes_usage_warning' => 'Сваки код се може искористити једном',
+    'mfa_gen_totp_title' => 'Подешавање мобилне апликације',
+    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_verify_setup' => 'Верификуј подешавања',
+    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
+    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_verify_access' => 'Верификуј приступ',
+    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_no_methods' => 'Методе нису конфигурисане',
+    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_use_totp' => 'Верификација путем мобилне апликације',
+    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
+    'mfa_verify_backup_code' => 'Резервни код',
+    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_enter_here' => 'Унеси резервни код овде',
+    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
+    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+];
diff --git a/lang/sr/common.php b/lang/sr/common.php
new file mode 100644
index 00000000000..3ef27e2962e
--- /dev/null
+++ b/lang/sr/common.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'Поништи',
+    'close' => 'Затвори',
+    'confirm' => 'Потврди',
+    'back' => 'Назад',
+    'save' => 'Сачувај',
+    'continue' => 'Настави',
+    'select' => 'Изабери',
+    'toggle_all' => 'Сакриј/Прикажи све',
+    'more' => 'Више',
+
+    // Form Labels
+    'name' => 'Назив',
+    'description' => 'Опис',
+    'role' => 'Улога',
+    'cover_image' => 'Насловна слика',
+    'cover_image_description' => 'Ова слика би требало да буде приближно 440к250px иако ће бити флексибилно скалирана и исечена како би одговарала корисничком интерфејсу у различитим сценаријима по потреби, тако да ће се стварне димензије приказа разликовати.',
+
+    // Actions
+    'actions' => 'Радње',
+    'view' => 'Преглед',
+    'view_all' => 'Прикажи све',
+    'new' => 'Ново',
+    'create' => 'Креирај',
+    'update' => 'Ажурирање',
+    'edit' => 'Уреди',
+    'sort' => 'Разврстај',
+    'move' => 'Премести',
+    'copy' => 'Умножи',
+    'reply' => 'Одговор',
+    'delete' => 'Обриши',
+    'delete_confirm' => 'Потврди брисање',
+    'search' => 'Претражи',
+    'search_clear' => 'Обриши претрагу',
+    'reset' => 'Ресетуј',
+    'remove' => 'Уклони',
+    'add' => 'Додај',
+    'configure' => 'Конфигуриши',
+    'manage' => 'Управљај',
+    'fullscreen' => 'Преко целог екрана',
+    'favourite' => 'Омиљено',
+    'unfavourite' => 'Уклони из "Омиљено"',
+    'next' => 'Даље',
+    'previous' => 'Претходно',
+    'filter_active' => 'Активни филтер:',
+    'filter_clear' => 'Уклони филтер',
+    'download' => 'Преузимања',
+    'open_in_tab' => 'Отвори у картици',
+    'open' => 'Отвори',
+
+    // Sort Options
+    'sort_options' => 'Опције сортирања',
+    'sort_direction_toggle' => 'Пребацивање смера сортирања',
+    'sort_ascending' => 'Поређај растуће',
+    'sort_descending' => 'Поређај опадајуће',
+    'sort_name' => 'Назив',
+    'sort_default' => 'Подразумевано',
+    'sort_created_at' => 'Датум креирања',
+    'sort_updated_at' => 'Датум ажурирања',
+
+    // Misc
+    'deleted_user' => 'Избрисан корисник',
+    'no_activity' => 'Нема активности за приказ',
+    'no_items' => 'Нема доступних ставки',
+    'back_to_top' => 'Назад на врх',
+    'skip_to_main_content' => 'Пређи на главни садржај',
+    'toggle_details' => 'Пребаци приказ детаља',
+    'toggle_thumbnails' => 'Пребаци минијатуре',
+    'details' => 'Детаљи',
+    'grid_view' => 'Приказ мреже',
+    'list_view' => 'Приказ листе',
+    'default' => 'Подразумевано',
+    'breadcrumb' => 'Навигација',
+    'status' => 'Стање',
+    'status_active' => 'Активан',
+    'status_inactive' => 'Неактивно',
+    'never' => 'Никад',
+    'none' => 'Ништа',
+
+    // Header
+    'homepage' => 'Почетна страна',
+    'header_menu_expand' => 'Проширите мени заглавља',
+    'profile_menu' => 'Мени профила',
+    'view_profile' => 'Погледај Профил',
+    'edit_profile' => 'Измени профил',
+    'dark_mode' => 'Тамни режим',
+    'light_mode' => 'Светли режим',
+    'global_search' => 'Глобална претрага',
+
+    // Layout tabs
+    'tab_info' => 'Информације',
+    'tab_info_label' => 'Картица: Прикажи секундарне информације',
+    'tab_content' => 'Садржај',
+    'tab_content_label' => 'Картица: Прикажи примарни садржај',
+
+    // Email Content
+    'email_action_help' => 'Ако имате проблема да кликнете на дугме ":actionText" копирајте и налепите УРЛ доле у свој веб прегледач:',
+    'email_rights' => 'Сва права задржана',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'Правила о приватности',
+    'terms_of_service' => 'Услови коришћења',
+];
diff --git a/lang/sr/components.php b/lang/sr/components.php
new file mode 100644
index 00000000000..2a78d819bf9
--- /dev/null
+++ b/lang/sr/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'Изаберите слику',
+    'image_list' => 'Листа слика',
+    'image_details' => 'Детаљи слике',
+    'image_upload' => 'Додај слику',
+    'image_intro' => 'Овде можете изабрати и управљати сликама које су претходно отпремљене у систем.',
+    'image_intro_upload' => 'Отпремите нову слику тако што ћете превући датотеку слике у овај прозор или помоћу дугмета „Отпреми слику“ изнад.',
+    'image_all' => 'Све',
+    'image_all_title' => 'Прикажи све слике',
+    'image_book_title' => 'Погледајте слике отпремљене уз ову књигу',
+    'image_page_title' => 'Погледајте слике отпремљене на ову страницу',
+    'image_search_hint' => 'Претражите по имену слике',
+    'image_uploaded' => 'Отпремљено :uploadedDate',
+    'image_uploaded_by' => 'Поставио :userName',
+    'image_uploaded_to' => 'Отпремљено на :pageLink',
+    'image_updated' => 'Ажурирано :updateDate',
+    'image_load_more' => 'Учитај још',
+    'image_image_name' => 'Назив слике',
+    'image_delete_used' => 'Ова слика се користи на страницама испод.',
+    'image_delete_confirm_text' => 'Да ли си сигуран да желиш да избришеш ову слику?',
+    'image_select_image' => 'Изабери слику',
+    'image_dropzone' => 'Испустите слике или кликните овде да их отпремите',
+    'image_dropzone_drop' => 'Испустите слике да их отпремите',
+    'images_deleted' => 'Слике су избрисане',
+    'image_preview' => 'Слике су избрисане',
+    'image_upload_success' => 'Слика је успешно отпремљена',
+    'image_update_success' => 'Детаљи слике су успешно ажурирани',
+    'image_delete_success' => 'Слика је успешно избрисана',
+    'image_replace' => 'Замени слику',
+    'image_replace_success' => 'Датотека слике је успешно ажурирана',
+    'image_rebuild_thumbs' => 'Регенеришите варијације величине',
+    'image_rebuild_thumbs_success' => 'Варијације величине слике су успешно обновљене!',
+
+    // Code Editor
+    'code_editor' => 'Уреди код',
+    'code_language' => 'Језик кода',
+    'code_content' => 'Садржај кода',
+    'code_session_history' => 'Историја сесије',
+    'code_save' => 'Сачувај код',
+];
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
new file mode 100644
index 00000000000..8b73645e121
--- /dev/null
+++ b/lang/sr/editor.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'Опште',
+    'advanced' => 'Напредно',
+    'none' => 'Ништа',
+    'cancel' => 'Поништи',
+    'save' => 'Сачувај',
+    'close' => 'Затвори',
+    'undo' => 'Опозови',
+    'redo' => 'Понови',
+    'left' => 'Лево',
+    'center' => 'Центар',
+    'right' => 'Десно',
+    'top' => 'Врх',
+    'middle' => 'Средина',
+    'bottom' => 'Дно',
+    'width' => 'Ширина',
+    'height' => 'Висина',
+    'More' => 'Више',
+    'select' => 'Изабери...',
+
+    // Toolbar
+    'formats' => 'Формати',
+    'header_large' => 'Large Header',
+    'header_medium' => 'Medium Header',
+    'header_small' => 'Small Header',
+    'header_tiny' => 'Tiny Header',
+    'paragraph' => 'Параграф',
+    'blockquote' => 'Blockquote',
+    'inline_code' => 'Inline code',
+    'callouts' => 'Callouts',
+    'callout_information' => 'Информација',
+    'callout_success' => 'Успешно',
+    'callout_warning' => 'Упозорење',
+    'callout_danger' => 'Опасност',
+    'bold' => 'Bold',
+    'italic' => 'Italic',
+    'underline' => 'Underline',
+    'strikethrough' => 'Strikethrough',
+    'superscript' => 'Superscript',
+    'subscript' => 'Subscript',
+    'text_color' => 'Text color',
+    'custom_color' => 'Custom color',
+    'remove_color' => 'Remove color',
+    'background_color' => 'Background color',
+    'align_left' => 'Поравнај лево',
+    'align_center' => 'Поравнај по средини',
+    'align_right' => 'Поравнај деcно',
+    'align_justify' => 'Justify',
+    'list_bullet' => 'Листа ставки',
+    'list_numbered' => 'Нумерисана листа',
+    'list_task' => 'Листа задатака',
+    'indent_increase' => 'Повећај увлачење',
+    'indent_decrease' => 'Умањи увлачење',
+    'table' => 'Table',
+    'insert_image' => 'Insert image',
+    'insert_image_title' => 'Insert/Edit Image',
+    'insert_link' => 'Insert/edit link',
+    'insert_link_title' => 'Insert/Edit Link',
+    'insert_horizontal_line' => 'Insert horizontal line',
+    'insert_code_block' => 'Insert code block',
+    'edit_code_block' => 'Edit code block',
+    'insert_drawing' => 'Insert/edit drawing',
+    'drawing_manager' => 'Drawing manager',
+    'insert_media' => 'Insert/edit media',
+    'insert_media_title' => 'Insert/Edit Media',
+    'clear_formatting' => 'Clear formatting',
+    'source_code' => 'Source code',
+    'source_code_title' => 'Source Code',
+    'fullscreen' => 'Fullscreen',
+    'image_options' => 'Image options',
+
+    // Tables
+    'table_properties' => 'Table properties',
+    'table_properties_title' => 'Table Properties',
+    'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
+    'insert_row_before' => 'Insert row before',
+    'insert_row_after' => 'Insert row after',
+    'delete_row' => 'Delete row',
+    'insert_column_before' => 'Insert column before',
+    'insert_column_after' => 'Insert column after',
+    'delete_column' => 'Delete column',
+    'table_cell' => 'Ћелија',
+    'table_row' => 'Ред',
+    'table_column' => 'Колона',
+    'cell_properties' => 'Својства ћелије',
+    'cell_properties_title' => 'Cell Properties',
+    'cell_type' => 'Тип ћелије',
+    'cell_type_cell' => 'Ћелија',
+    'cell_scope' => 'Обим',
+    'cell_type_header' => 'Header cell',
+    'merge_cells' => 'Обједини ћелије',
+    'split_cell' => 'Подели ћелију',
+    'table_row_group' => 'Row Group',
+    'table_column_group' => 'Column Group',
+    'horizontal_align' => 'Horizontal align',
+    'vertical_align' => 'Vertical align',
+    'border_width' => 'Border width',
+    'border_style' => 'Border style',
+    'border_color' => 'Border color',
+    'row_properties' => 'Row properties',
+    'row_properties_title' => 'Row Properties',
+    'cut_row' => 'Cut row',
+    'copy_row' => 'Copy row',
+    'paste_row_before' => 'Paste row before',
+    'paste_row_after' => 'Paste row after',
+    'row_type' => 'Row type',
+    'row_type_header' => 'Header',
+    'row_type_body' => 'Body',
+    'row_type_footer' => 'Footer',
+    'alignment' => 'Alignment',
+    'cut_column' => 'Cut column',
+    'copy_column' => 'Copy column',
+    'paste_column_before' => 'Paste column before',
+    'paste_column_after' => 'Paste column after',
+    'cell_padding' => 'Cell padding',
+    'cell_spacing' => 'Cell spacing',
+    'caption' => 'Caption',
+    'show_caption' => 'Show caption',
+    'constrain' => 'Constrain proportions',
+    'cell_border_solid' => 'Solid',
+    'cell_border_dotted' => 'Dotted',
+    'cell_border_dashed' => 'Dashed',
+    'cell_border_double' => 'Double',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'None',
+    'cell_border_hidden' => 'Hidden',
+
+    // Images, links, details/summary & embed
+    'source' => 'Source',
+    'alt_desc' => 'Alternative description',
+    'embed' => 'Embed',
+    'paste_embed' => 'Paste your embed code below:',
+    'url' => 'URL',
+    'text_to_display' => 'Text to display',
+    'title' => 'Title',
+    'open_link' => 'Open link',
+    'open_link_in' => 'Open link in...',
+    'open_link_current' => 'Current window',
+    'open_link_new' => 'New window',
+    'remove_link' => 'Remove link',
+    'insert_collapsible' => 'Insert collapsible block',
+    'collapsible_unwrap' => 'Unwrap',
+    'edit_label' => 'Edit label',
+    'toggle_open_closed' => 'Toggle open/closed',
+    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_label' => 'Toggle label',
+
+    // About view
+    'about' => 'About the editor',
+    'about_title' => 'About the WYSIWYG Editor',
+    'editor_license' => 'Editor License & Copyright',
+    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
+    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'save_continue' => 'Save Page & Continue',
+    'callouts_cycle' => '(Keep pressing to toggle through types)',
+    'link_selector' => 'Link to content',
+    'shortcuts' => 'Shortcuts',
+    'shortcut' => 'Shortcut',
+    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'Description',
+];
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
new file mode 100644
index 00000000000..9e620b24ed1
--- /dev/null
+++ b/lang/sr/entities.php
@@ -0,0 +1,437 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'Recently Created',
+    'recently_created_pages' => 'Recently Created Pages',
+    'recently_updated_pages' => 'Recently Updated Pages',
+    'recently_created_chapters' => 'Recently Created Chapters',
+    'recently_created_books' => 'Recently Created Books',
+    'recently_created_shelves' => 'Recently Created Shelves',
+    'recently_update' => 'Recently Updated',
+    'recently_viewed' => 'Recently Viewed',
+    'recent_activity' => 'Recent Activity',
+    'create_now' => 'Create one now',
+    'revisions' => 'Revisions',
+    'meta_revision' => 'Revision #:revisionCount',
+    'meta_created' => 'Created :timeLength',
+    'meta_created_name' => 'Created :timeLength by :user',
+    'meta_updated' => 'Updated :timeLength',
+    'meta_updated_name' => 'Updated :timeLength by :user',
+    'meta_owned_name' => 'Owned by :user',
+    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'entity_select' => 'Entity Select',
+    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'images' => 'Images',
+    'my_recent_drafts' => 'My Recent Drafts',
+    'my_recently_viewed' => 'My Recently Viewed',
+    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
+    'my_favourites' => 'My Favourites',
+    'no_pages_viewed' => 'You have not viewed any pages',
+    'no_pages_recently_created' => 'No pages have been recently created',
+    'no_pages_recently_updated' => 'No pages have been recently updated',
+    'export' => 'Export',
+    'export_html' => 'Contained Web File',
+    'export_pdf' => 'PDF File',
+    'export_text' => 'Plain Text File',
+    'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
+
+    // Permissions and restrictions
+    'permissions' => 'Permissions',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_save' => 'Save Permissions',
+    'permissions_owner' => 'Owner',
+    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Override permissions for role',
+    'permissions_inherit_defaults' => 'Inherit defaults',
+
+    // Search
+    'search_results' => 'Search Results',
+    'search_total_results_found' => ':count result found|:count total results found',
+    'search_clear' => 'Clear Search',
+    'search_no_pages' => 'No pages matched this search',
+    'search_for_term' => 'Search for :term',
+    'search_more' => 'More Results',
+    'search_advanced' => 'Advanced Search',
+    'search_terms' => 'Search Terms',
+    'search_content_type' => 'Content Type',
+    'search_exact_matches' => 'Exact Matches',
+    'search_tags' => 'Tag Searches',
+    'search_options' => 'Options',
+    'search_viewed_by_me' => 'Viewed by me',
+    'search_not_viewed_by_me' => 'Not viewed by me',
+    'search_permissions_set' => 'Permissions set',
+    'search_created_by_me' => 'Created by me',
+    'search_updated_by_me' => 'Updated by me',
+    'search_owned_by_me' => 'Owned by me',
+    'search_date_options' => 'Date Options',
+    'search_updated_before' => 'Updated before',
+    'search_updated_after' => 'Updated after',
+    'search_created_before' => 'Created before',
+    'search_created_after' => 'Created after',
+    'search_set_date' => 'Set Date',
+    'search_update' => 'Update Search',
+
+    // Shelves
+    'shelf' => 'Shelf',
+    'shelves' => 'Shelves',
+    'x_shelves' => ':count Shelf|:count Shelves',
+    'shelves_empty' => 'No shelves have been created',
+    'shelves_create' => 'Create New Shelf',
+    'shelves_popular' => 'Popular Shelves',
+    'shelves_new' => 'New Shelves',
+    'shelves_new_action' => 'New Shelf',
+    'shelves_popular_empty' => 'The most popular shelves will appear here.',
+    'shelves_new_empty' => 'The most recently created shelves will appear here.',
+    'shelves_save' => 'Save Shelf',
+    'shelves_books' => 'Books on this shelf',
+    'shelves_add_books' => 'Add books to this shelf',
+    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_empty_contents' => 'This shelf has no books assigned to it',
+    'shelves_edit_and_assign' => 'Edit shelf to assign books',
+    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit' => 'Edit Shelf',
+    'shelves_delete' => 'Delete Shelf',
+    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
+    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
+    'shelves_permissions' => 'Shelf Permissions',
+    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
+    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
+    'shelves_copy_permissions' => 'Copy Permissions',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+
+    // Books
+    'book' => 'Book',
+    'books' => 'Books',
+    'x_books' => ':count Book|:count Books',
+    'books_empty' => 'No books have been created',
+    'books_popular' => 'Popular Books',
+    'books_recent' => 'Recent Books',
+    'books_new' => 'New Books',
+    'books_new_action' => 'New Book',
+    'books_popular_empty' => 'The most popular books will appear here.',
+    'books_new_empty' => 'The most recently created books will appear here.',
+    'books_create' => 'Create New Book',
+    'books_delete' => 'Delete Book',
+    'books_delete_named' => 'Delete Book :bookName',
+    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
+    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
+    'books_edit' => 'Edit Book',
+    'books_edit_named' => 'Edit Book :bookName',
+    'books_form_book_name' => 'Book Name',
+    'books_save' => 'Save Book',
+    'books_permissions' => 'Book Permissions',
+    'books_permissions_updated' => 'Book Permissions Updated',
+    'books_empty_contents' => 'No pages or chapters have been created for this book.',
+    'books_empty_create_page' => 'Create a new page',
+    'books_empty_sort_current_book' => 'Sort the current book',
+    'books_empty_add_chapter' => 'Add a chapter',
+    'books_permissions_active' => 'Book Permissions Active',
+    'books_search_this' => 'Search this book',
+    'books_navigation' => 'Book Navigation',
+    'books_sort' => 'Sort Book Contents',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_named' => 'Sort Book :bookName',
+    'books_sort_name' => 'Sort by Name',
+    'books_sort_created' => 'Sort by Created Date',
+    'books_sort_updated' => 'Sort by Updated Date',
+    'books_sort_chapters_first' => 'Chapters First',
+    'books_sort_chapters_last' => 'Chapters Last',
+    'books_sort_show_other' => 'Show Other Books',
+    'books_sort_save' => 'Save New Order',
+    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_move_up' => 'Move Up',
+    'books_sort_move_down' => 'Move Down',
+    'books_sort_move_prev_book' => 'Move to Previous Book',
+    'books_sort_move_next_book' => 'Move to Next Book',
+    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
+    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
+    'books_sort_move_book_start' => 'Move to Start of Book',
+    'books_sort_move_book_end' => 'Move to End of Book',
+    'books_sort_move_before_chapter' => 'Move to Before Chapter',
+    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_copy' => 'Copy Book',
+    'books_copy_success' => 'Book successfully copied',
+
+    // Chapters
+    'chapter' => 'Chapter',
+    'chapters' => 'Chapters',
+    'x_chapters' => ':count Chapter|:count Chapters',
+    'chapters_popular' => 'Popular Chapters',
+    'chapters_new' => 'New Chapter',
+    'chapters_create' => 'Create New Chapter',
+    'chapters_delete' => 'Delete Chapter',
+    'chapters_delete_named' => 'Delete Chapter :chapterName',
+    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
+    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
+    'chapters_edit' => 'Edit Chapter',
+    'chapters_edit_named' => 'Edit Chapter :chapterName',
+    'chapters_save' => 'Save Chapter',
+    'chapters_move' => 'Move Chapter',
+    'chapters_move_named' => 'Move Chapter :chapterName',
+    'chapters_copy' => 'Copy Chapter',
+    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_permissions' => 'Chapter Permissions',
+    'chapters_empty' => 'No pages are currently in this chapter.',
+    'chapters_permissions_active' => 'Chapter Permissions Active',
+    'chapters_permissions_success' => 'Chapter Permissions Updated',
+    'chapters_search_this' => 'Search this chapter',
+    'chapter_sort_book' => 'Sort Book',
+
+    // Pages
+    'page' => 'Page',
+    'pages' => 'Pages',
+    'x_pages' => ':count Page|:count Pages',
+    'pages_popular' => 'Popular Pages',
+    'pages_new' => 'New Page',
+    'pages_attachments' => 'Attachments',
+    'pages_navigation' => 'Page Navigation',
+    'pages_delete' => 'Delete Page',
+    'pages_delete_named' => 'Delete Page :pageName',
+    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
+    'pages_delete_draft' => 'Delete Draft Page',
+    'pages_delete_success' => 'Page deleted',
+    'pages_delete_draft_success' => 'Draft page deleted',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
+    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
+    'pages_editing_named' => 'Editing Page :pageName',
+    'pages_edit_draft_options' => 'Draft Options',
+    'pages_edit_save_draft' => 'Save Draft',
+    'pages_edit_draft' => 'Edit Page Draft',
+    'pages_editing_draft' => 'Editing Draft',
+    'pages_editing_page' => 'Editing Page',
+    'pages_edit_draft_save_at' => 'Draft saved at ',
+    'pages_edit_delete_draft' => 'Delete Draft',
+    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_discard_draft' => 'Discard Draft',
+    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
+    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
+    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_set_changelog' => 'Set Changelog',
+    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
+    'pages_edit_enter_changelog' => 'Enter Changelog',
+    'pages_editor_switch_title' => 'Switch Editor',
+    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
+    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_save' => 'Save Page',
+    'pages_title' => 'Page Title',
+    'pages_name' => 'Page Name',
+    'pages_md_editor' => 'Editor',
+    'pages_md_preview' => 'Preview',
+    'pages_md_insert_image' => 'Insert Image',
+    'pages_md_insert_link' => 'Insert Entity Link',
+    'pages_md_insert_drawing' => 'Insert Drawing',
+    'pages_md_show_preview' => 'Show preview',
+    'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_not_in_chapter' => 'Page is not in a chapter',
+    'pages_move' => 'Move Page',
+    'pages_copy' => 'Copy Page',
+    'pages_copy_desination' => 'Copy Destination',
+    'pages_copy_success' => 'Page successfully copied',
+    'pages_permissions' => 'Page Permissions',
+    'pages_permissions_success' => 'Page permissions updated',
+    'pages_revision' => 'Revision',
+    'pages_revisions' => 'Page Revisions',
+    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_named' => 'Page Revisions for :pageName',
+    'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revisions_created_by' => 'Created By',
+    'pages_revisions_date' => 'Revision Date',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_numbered' => 'Revision #:id',
+    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
+    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_changelog' => 'Changelog',
+    'pages_revisions_changes' => 'Changes',
+    'pages_revisions_current' => 'Current Version',
+    'pages_revisions_preview' => 'Preview',
+    'pages_revisions_restore' => 'Restore',
+    'pages_revisions_none' => 'This page has no revisions',
+    'pages_copy_link' => 'Copy Link',
+    'pages_edit_content_link' => 'Jump to section in editor',
+    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_label' => 'Page Section Options',
+    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
+    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_permissions_active' => 'Page Permissions Active',
+    'pages_initial_revision' => 'Initial publish',
+    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_initial_name' => 'New Page',
+    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
+    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
+    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count users have started editing this page',
+        'start_b' => ':userName has started editing this page',
+        'time_a' => 'since the page was last updated',
+        'time_b' => 'in the last :minCount minutes',
+        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+    ],
+    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
+    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_specific' => 'Specific Page',
+    'pages_is_template' => 'Page Template',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'Toggle Sidebar',
+    'page_tags' => 'Page Tags',
+    'chapter_tags' => 'Chapter Tags',
+    'book_tags' => 'Book Tags',
+    'shelf_tags' => 'Shelf Tags',
+    'tag' => 'Tag',
+    'tags' =>  'Tags',
+    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tag_name' =>  'Tag Name',
+    'tag_value' => 'Tag Value (Optional)',
+    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
+    'tags_add' => 'Add another tag',
+    'tags_remove' => 'Remove this tag',
+    'tags_usages' => 'Total tag usages',
+    'tags_assigned_pages' => 'Assigned to Pages',
+    'tags_assigned_chapters' => 'Assigned to Chapters',
+    'tags_assigned_books' => 'Assigned to Books',
+    'tags_assigned_shelves' => 'Assigned to Shelves',
+    'tags_x_unique_values' => ':count unique values',
+    'tags_all_values' => 'All values',
+    'tags_view_tags' => 'View Tags',
+    'tags_view_existing_tags' => 'View existing tags',
+    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'attachments' => 'Attachments',
+    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
+    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
+    'attachments_upload' => 'Upload File',
+    'attachments_link' => 'Attach Link',
+    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_set_link' => 'Set Link',
+    'attachments_delete' => 'Are you sure you want to delete this attachment?',
+    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_no_files' => 'No files have been uploaded',
+    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
+    'attachments_link_name' => 'Link Name',
+    'attachment_link' => 'Attachment link',
+    'attachments_link_url' => 'Link to file',
+    'attachments_link_url_hint' => 'Url of site or file',
+    'attach' => 'Attach',
+    'attachments_insert_link' => 'Add Attachment Link to Page',
+    'attachments_edit_file' => 'Edit File',
+    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
+    'attachments_order_updated' => 'Attachment order updated',
+    'attachments_updated_success' => 'Attachment details updated',
+    'attachments_deleted' => 'Attachment deleted',
+    'attachments_file_uploaded' => 'File successfully uploaded',
+    'attachments_file_updated' => 'File successfully updated',
+    'attachments_link_attached' => 'Link successfully attached to page',
+    'templates' => 'Templates',
+    'templates_set_as_template' => 'Page is a template',
+    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
+    'templates_replace_content' => 'Replace page content',
+    'templates_append_content' => 'Append to page content',
+    'templates_prepend_content' => 'Prepend to page content',
+
+    // Profile View
+    'profile_user_for_x' => 'User for :time',
+    'profile_created_content' => 'Created Content',
+    'profile_not_created_pages' => ':userName has not created any pages',
+    'profile_not_created_chapters' => ':userName has not created any chapters',
+    'profile_not_created_books' => ':userName has not created any books',
+    'profile_not_created_shelves' => ':userName has not created any shelves',
+
+    // Comments
+    'comment' => 'Comment',
+    'comments' => 'Comments',
+    'comment_add' => 'Add Comment',
+    'comment_placeholder' => 'Leave a comment here',
+    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_save' => 'Save Comment',
+    'comment_new' => 'New Comment',
+    'comment_created' => 'commented :createDiff',
+    'comment_updated' => 'Updated :updateDiff by :username',
+    'comment_updated_indicator' => 'Updated',
+    'comment_deleted_success' => 'Comment deleted',
+    'comment_created_success' => 'Comment added',
+    'comment_updated_success' => 'Comment updated',
+    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
+    'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+
+    // Revision
+    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
+    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
+    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+
+    // Copy view
+    'copy_consider' => 'Please consider the below when copying content.',
+    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_owner' => 'You will become the owner of all copied content.',
+    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
+    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+
+    // Conversions
+    'convert_to_shelf' => 'Convert to Shelf',
+    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
+    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_book' => 'Convert Book',
+    'convert_book_confirm' => 'Are you sure you want to convert this book?',
+    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_to_book' => 'Convert to Book',
+    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_chapter' => 'Convert Chapter',
+    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+
+    // References
+    'references' => 'References',
+    'references_none' => 'There are no tracked references to this item.',
+    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+
+    // Watch Options
+    'watch' => 'Watch',
+    'watch_title_default' => 'Default Preferences',
+    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_title_ignore' => 'Ignore',
+    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_new' => 'New Pages',
+    'watch_desc_new' => 'Notify when any new page is created within this item.',
+    'watch_title_updates' => 'All Page Updates',
+    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
+    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
+    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
+    'watch_change_default' => 'Change default notification preferences',
+    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_updates' => 'Watching new pages and updates',
+    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
+    'watch_detail_parent_chapter' => 'Watching via parent chapter',
+    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+];
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
new file mode 100644
index 00000000000..5f109dc4e9f
--- /dev/null
+++ b/lang/sr/errors.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'You do not have permission to access the requested page.',
+    'permissionJson' => 'You do not have permission to perform the requested action.',
+
+    // Auth
+    'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
+    'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
+    'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
+    'email_confirmation_awaiting' => 'The email address for the account in use needs to be confirmed',
+    'ldap_fail_anonymous' => 'LDAP access failed using anonymous bind',
+    'ldap_fail_authed' => 'LDAP access failed using given dn & password details',
+    'ldap_extension_not_installed' => 'LDAP PHP extension not installed',
+    'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
+    'saml_already_logged_in' => 'Already logged in',
+    'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
+    'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'oidc_already_logged_in' => 'Already logged in',
+    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'social_no_action_defined' => 'No action defined',
+    'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
+    'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',
+    'social_account_email_in_use' => 'The email :email is already in use. If you already have an account you can connect your :socialAccount account from your profile settings.',
+    'social_account_existing' => 'This :socialAccount is already attached to your profile.',
+    'social_account_already_used_existing' => 'This :socialAccount account is already used by another user.',
+    'social_account_not_used' => 'This :socialAccount account is not linked to any users. Please attach it in your profile settings. ',
+    'social_account_register_instructions' => 'If you do not yet have an account, You can register an account using the :socialAccount option.',
+    'social_driver_not_found' => 'Social driver not found',
+    'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
+    'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+
+    // System
+    'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
+    'cannot_get_image_from_url' => 'Cannot get image from :url',
+    'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
+    'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
+    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
+
+    // Drawing & Images
+    'image_upload_error' => 'An error occurred uploading the image',
+    'image_upload_type_error' => 'The image type being uploaded is invalid',
+    'image_upload_replace_type' => 'Image file replacements must be of the same type',
+    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
+    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+
+    // Attachments
+    'attachment_not_found' => 'Attachment not found',
+    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+
+    // Pages
+    'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
+    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
+
+    // Entities
+    'entity_not_found' => 'Entity not found',
+    'bookshelf_not_found' => 'Shelf not found',
+    'book_not_found' => 'Књига није пронађена',
+    'page_not_found' => 'Страница није пронађена',
+    'chapter_not_found' => 'Поглавље није пронађено',
+    'selected_book_not_found' => 'Одабрана књига није пронађена',
+    'selected_book_chapter_not_found' => 'The selected Book or Chapter was not found',
+    'guests_cannot_save_drafts' => 'Гости не могу сачувати нацрте',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'Не можете обрисати јединог администратора',
+    'users_cannot_delete_guest' => 'Не можете обрисати госта',
+
+    // Roles
+    'role_cannot_be_edited' => 'Ова улога се не може мењати',
+    'role_system_cannot_be_deleted' => 'Ово је системска улога и не може се мењати',
+    'role_registration_default_cannot_delete' => 'This role cannot be deleted while set as the default registration role',
+    'role_cannot_remove_only_admin' => 'This user is the only user assigned to the administrator role. Assign the administrator role to another user before attempting to remove it here.',
+
+    // Comments
+    'comment_list' => 'An error occurred while fetching the comments.',
+    'cannot_add_comment_to_draft' => 'You cannot add comments to a draft.',
+    'comment_add' => 'An error occurred while adding / updating the comment.',
+    'comment_delete' => 'An error occurred while deleting the comment.',
+    'empty_comment' => 'Cannot add an empty comment.',
+
+    // Error pages
+    '404_page_not_found' => 'Page Not Found',
+    'sorry_page_not_found' => 'Sorry, The page you were looking for could not be found.',
+    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
+    'image_not_found' => 'Image Not Found',
+    'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
+    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
+    'return_home' => 'Return to home',
+    'error_occurred' => 'Догодила се грешка',
+    'app_down' => ':appName is down right now',
+    'back_soon' => 'It will be back up soon.',
+
+    // API errors
+    'api_no_authorization_found' => 'No authorization token found on the request',
+    'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
+    'api_user_token_not_found' => 'No matching API token was found for the provided authorization token',
+    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
+    'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
+    'api_user_token_expired' => 'The authorization token used has expired',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+];
diff --git a/lang/sr/notifications.php b/lang/sr/notifications.php
new file mode 100644
index 00000000000..6aa3f2abbaa
--- /dev/null
+++ b/lang/sr/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'Нови коментар на станици: :pageName',
+    'new_comment_intro' => 'Корисник је коментарисао на страници у :appName:',
+    'new_page_subject' => 'Нова страница: :pageName',
+    'new_page_intro' => 'Нова страница је креирана у :appName:',
+    'updated_page_subject' => 'Ажурирана страница: :pageName',
+    'updated_page_intro' => 'Страница је ажурирана у :appName:',
+    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+
+    'detail_page_name' => 'Назив странице:',
+    'detail_page_path' => 'Путања странице:',
+    'detail_commenter' => 'Commenter:',
+    'detail_comment' => 'Коментар:',
+    'detail_created_by' => 'Креирао/ла:',
+    'detail_updated_by' => 'Отпремио/ла:',
+
+    'action_view_comment' => 'Погледај коментар',
+    'action_view_page' => 'Погледај страницу',
+
+    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason_link' => 'your notification preferences',
+];
diff --git a/lang/sr/pagination.php b/lang/sr/pagination.php
new file mode 100644
index 00000000000..85bd12fc319
--- /dev/null
+++ b/lang/sr/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];
diff --git a/lang/sr/passwords.php b/lang/sr/passwords.php
new file mode 100644
index 00000000000..b408f3c2fda
--- /dev/null
+++ b/lang/sr/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'Passwords must be at least eight characters and match the confirmation.',
+    'user' => "We can't find a user with that e-mail address.",
+    'token' => 'The password reset token is invalid for this email address.',
+    'sent' => 'We have e-mailed your password reset link!',
+    'reset' => 'Your password has been reset!',
+
+];
diff --git a/lang/sr/preferences.php b/lang/sr/preferences.php
new file mode 100644
index 00000000000..2b88f9671ff
--- /dev/null
+++ b/lang/sr/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'My Account',
+
+    'shortcuts' => 'Shortcuts',
+    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
+    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
+    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
+    'shortcuts_section_navigation' => 'Navigation',
+    'shortcuts_section_actions' => 'Common Actions',
+    'shortcuts_save' => 'Save Shortcuts',
+    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
+    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
+    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+
+    'notifications' => 'Notification Preferences',
+    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
+    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
+    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
+    'notifications_save' => 'Save Preferences',
+    'notifications_update_success' => 'Notification preferences have been updated!',
+    'notifications_watched' => 'Watched & Ignored Items',
+    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+
+    'auth' => 'Access & Security',
+    'auth_change_password' => 'Change Password',
+    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
+    'auth_change_password_success' => 'Password has been updated!',
+
+    'profile' => 'Profile Details',
+    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_view_public' => 'View Public Profile',
+    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
+    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
+    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
+    'profile_admin_options' => 'Administrator Options',
+    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+
+    'delete_account' => 'Delete Account',
+    'delete_my_account' => 'Delete My Account',
+    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
+    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+];
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
new file mode 100644
index 00000000000..5d02cc89ab5
--- /dev/null
+++ b/lang/sr/settings.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'Подешавања',
+    'settings_save' => 'Сачувај подешавања',
+    'system_version' => 'Верзија система',
+    'categories' => 'Категорије',
+
+    // App Settings
+    'app_customization' => 'Прилгођавање',
+    'app_features_security' => 'Својства и сигурност',
+    'app_name' => 'Назив апликације',
+    'app_name_desc' => 'Ово име се приказује у заглављу и у свим системским порукама е-поште.',
+    'app_name_header' => 'Прикажи назив у заглављу',
+    'app_public_access' => 'Javni pristup',
+    'app_public_access_desc' => 'Омогућавање ове опције ће омогућити посетиоцима, који нису пријављени, да приступе садржају у вашој Боокстак инстанци.',
+    'app_public_access_desc_guest' => 'Приступ за јавне посетиоце може се контролисати преко корисника „Гост“.',
+    'app_public_access_toggle' => 'Дозволи јавни приступ',
+    'app_public_viewing' => 'Дозволити јавно гледање?',
+    'app_secure_images' => 'Веће безбедност отпремања слика',
+    'app_secure_images_toggle' => 'Омогућите већу безбедност отпремања слика',
+    'app_secure_images_desc' => 'Из разлога перформанси, све слике су јавне. Ова опција додаје насумичан низ који је тешко погодити испред Урл-ова слике. Уверите се да индекси директоријума нису омогућени да бисте спречили лак приступ.',
+    'app_default_editor' => 'Подразумевани уређивач страница',
+    'app_default_editor_desc' => 'Изаберите који уређивач ће се подразумевано користити приликом уређивања нових страница. Ово се може заменити на нивоу странице где дозволе дозвољавају.',
+    'app_custom_html' => 'Прилагођени ХТМЛ садржај заглавља',
+    'app_custom_html_desc' => 'Сваки садржај који је додат овде биће уметнут у дно <head> одељка сваке странице. Ово је згодно за надјачавање стилова или додавање кода за анализу.',
+    'app_custom_html_disabled_notice' => 'Прилагођени садржај заглавља ХТМЛ-а је онемогућен на овој страници са подешавањима како би се осигурало да се све неоправдане промене могу поништити.',
+    'app_logo' => 'Логотип апликације',
+    'app_logo_desc' => 'Ово се користи у траци заглавља апликације, између осталих области. Висина ове слике треба да буде 86 пиксела. Велике слике ће бити смањене.',
+    'app_icon' => 'Икона апликације',
+    'app_icon_desc' => 'Ова икона се користи за картице претраживача и иконе пречица. Ово би требало да буде квадратна ПНГ слика величине 256 пиксела.',
+    'app_homepage' => 'Почетна страница апликације',
+    'app_homepage_desc' => 'Изаберите приказ који ће се приказати на почетној страници уместо подразумеваног приказа. Дозволе за страницу се занемарују за изабране странице.',
+    'app_homepage_select' => 'Изаберите страницу',
+    'app_footer_links' => 'Везе у подножју',
+    'app_footer_links_desc' => 'Додајте везе које ће се приказати у подножју сајта. Они ће бити приказани на дну већине страница, укључујући и оне које не захтевају пријаву. Можете користити ознаку "trans::<key>" да бисте користили системски дефинисане преводе. На пример: Коришћење "trans::common.privacy_policy"ће обезбедити преведени текст „Политика приватности“, а "trans::common.terms_of_service" ће обезбедити преведени текст „Услови коришћења услуге“.',
+    'app_footer_links_label' => 'Ознака линка',
+    'app_footer_links_url' => 'УРЛ линка',
+    'app_footer_links_add' => 'Додај везу у подножју',
+    'app_disable_comments' => 'Онемогући коментаре',
+    'app_disable_comments_toggle' => 'Онемогући коментаре',
+    'app_disable_comments_desc' => 'Онемогућава коментаре на свим страницама у апликацији. <br> Постојећи коментари нису приказани.',
+
+    // Color settings
+    'color_scheme' => 'Шема боја апликације',
+    'color_scheme_desc' => 'Подесите боје које ће се користити у корисничком интерфејсу апликације. Боје се могу засебно конфигурисати за тамне и светле режиме како би најбоље одговарале теми и осигурале читљивост.',
+    'ui_colors_desc' => 'Подесите примарну боју апликације и подразумевану боју везе. Примарна боја се углавном користи за банер заглавља, дугмад и декорацију интерфејса. Подразумевана боја везе се користи за везе и радње засноване на тексту, како унутар писаног садржаја, тако и у интерфејсу апликације.',
+    'app_color' => 'Примарна боја',
+    'link_color' => 'Подразумевана боја везе',
+    'content_colors_desc' => 'Подесите боје за све елементе у хијерархији организације страница. За читљивост се препоручује одабир боја сличне осветљености као и подразумеване боје.',
+    'bookshelf_color' => 'Боја полице',
+    'book_color' => 'Боја књиге',
+    'chapter_color' => 'Боја поглавља',
+    'page_color' => 'Боја странице',
+    'page_draft_color' => 'Боја нацрта странице',
+
+    // Registration Settings
+    'reg_settings' => 'Регистрација',
+    'reg_enable' => 'Дозволи регистрацију',
+    'reg_enable_toggle' => 'Омогући регистрацију',
+    'reg_enable_desc' => 'Када је регистрација омогућена, корисник ће моћи да се пријави као корисник апликације. Након регистрације добијају јединствену, подразумевану корисничку улогу.',
+    'reg_default_role' => 'Подразумевана корисничка улога након регистрације',
+    'reg_enable_external_warning' => 'Горња опција се занемарује док је активна екстерна ЛДАП или САМЛ аутентификација. Кориснички налози за непостојеће чланове биће аутоматски креирани ако је аутентификација, против спољашњег система који се користи, успешна.',
+    'reg_email_confirmation' => 'Потврђивање е-поште',
+    'reg_email_confirmation_toggle' => 'Захтевајте потврду е-поштом',
+    'reg_confirm_email_desc' => 'Ако се користи ограничење домена, биће потребна потврда путем е-поште и ова опција ће бити занемарена.',
+    'reg_confirm_restrict_domain' => 'Ограничени домени',
+    'reg_confirm_restrict_domain_desc' => 'Унесите листу домена е-поште одвојене зарезима на које желите да ограничите регистрацију. Корисницима ће бити послата е-порука да потврде своју адресу пре него што им буде дозвољено да комуницирају са апликацијом. <br> Имајте на уму да ће корисници моћи да промене своје адресе е-поште након успешне регистрације.',
+    'reg_confirm_restrict_domain_placeholder' => 'Нема постављених ограничења',
+
+    // Maintenance settings
+    'maint' => 'Одржавање',
+    'maint_image_cleanup' => 'Чишћење слика',
+    'maint_image_cleanup_desc' => 'Скенира садржај странице и ревидира садржај да би проверио које слике и цртежи су тренутно у употреби и које су слике сувишне. Уверите се да сте направили пуну базу података и резервну копију слике пре него што ово покренете.',
+    'maint_delete_images_only_in_revisions' => 'Такође избришите слике које постоје само у старим ревизијама странице',
+    'maint_image_cleanup_run' => 'Покрени чишћење',
+    'maint_image_cleanup_warning' => ':count пронађене су потенцијално неискоришћене слике. Да ли сте сигурни да желите да избришете ове слике?',
+    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
+    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
+    'maint_send_test_email' => 'Send a Test Email',
+    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
+    'maint_send_test_email_run' => 'Send test email',
+    'maint_send_test_email_success' => 'Email sent to :address',
+    'maint_send_test_email_mail_subject' => 'Test Email',
+    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
+    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
+    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_open' => 'Open Recycle Bin',
+    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
+    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+
+    // Recycle Bin
+    'recycle_bin' => 'Recycle Bin',
+    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_deleted_item' => 'Deleted Item',
+    'recycle_bin_deleted_parent' => 'Parent',
+    'recycle_bin_deleted_by' => 'Deleted By',
+    'recycle_bin_deleted_at' => 'Deletion Time',
+    'recycle_bin_permanently_delete' => 'Permanently Delete',
+    'recycle_bin_restore' => 'Restore',
+    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
+    'recycle_bin_empty' => 'Empty Recycle Bin',
+    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_list' => 'Items to be Destroyed',
+    'recycle_bin_restore_list' => 'Items to be Restored',
+    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
+    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_parent' => 'Restore Parent',
+    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
+    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+
+    // Audit Log
+    'audit' => 'Audit Log',
+    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_event_filter' => 'Event Filter',
+    'audit_event_filter_no_filter' => 'No Filter',
+    'audit_deleted_item' => 'Избрисана ставка',
+    'audit_deleted_item_name' => 'Name: :name',
+    'audit_table_user' => 'Корисник',
+    'audit_table_event' => 'Догађај',
+    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_ip' => 'ИП адреса',
+    'audit_table_date' => 'Датум активности',
+    'audit_date_from' => 'Date Range From',
+    'audit_date_to' => 'Date Range To',
+
+    // Role Settings
+    'roles' => 'Улоге',
+    'role_user_roles' => 'User Roles',
+    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_assigned_users' => 'Assigned Users',
+    'roles_permissions_provided' => 'Provided Permissions',
+    'role_create' => 'Create New Role',
+    'role_delete' => 'Delete Role',
+    'role_delete_confirm' => 'Ово ће избрисати улогу са именом \':roleName\'.',
+    'role_delete_users_assigned' => 'Ова улога има :userCount корисника који су јој додељени. Ако желите да мигрирате кориснике са ове улоге, изаберите нову улогу испод.',
+    'role_delete_no_migration' => "Немојте мигрирати кориснике",
+    'role_delete_sure' => 'Да ли сте сигурни да желите да избришете ову улогу?',
+    'role_edit' => 'Уреди улогу',
+    'role_details' => 'Детаљи улоге',
+    'role_name' => 'Назив улоге',
+    'role_desc' => 'Кратак опис улоге',
+    'role_mfa_enforced' => 'Захтева вишефакторску аутентификацију',
+    'role_external_auth_id' => 'External Authentication IDs',
+    'role_system' => 'System Permissions',
+    'role_manage_users' => 'Manage users',
+    'role_manage_roles' => 'Manage roles & role permissions',
+    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
+    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
+    'role_manage_page_templates' => 'Manage page templates',
+    'role_access_api' => 'Access system API',
+    'role_manage_settings' => 'Manage app settings',
+    'role_export_content' => 'Export content',
+    'role_editor_change' => 'Change page editor',
+    'role_notifications' => 'Receive & manage notifications',
+    'role_asset' => 'Asset Permissions',
+    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
+    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
+    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_all' => 'All',
+    'role_own' => 'Own',
+    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_save' => 'Save Role',
+    'role_users' => 'Users in this role',
+    'role_users_none' => 'No users are currently assigned to this role',
+
+    // Users
+    'users' => 'Users',
+    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'user_profile' => 'User Profile',
+    'users_add_new' => 'Add New User',
+    'users_search' => 'Search Users',
+    'users_latest_activity' => 'Latest Activity',
+    'users_details' => 'User Details',
+    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
+    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
+    'users_role' => 'User Roles',
+    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
+    'users_password' => 'User Password',
+    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
+    'users_send_invite_option' => 'Send user invite email',
+    'users_external_auth_id' => 'External Authentication ID',
+    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_delete' => 'Delete User',
+    'users_delete_named' => 'Delete user :userName',
+    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
+    'users_delete_confirm' => 'Are you sure you want to delete this user?',
+    'users_migrate_ownership' => 'Migrate Ownership',
+    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_none_selected' => 'No user selected',
+    'users_edit' => 'Edit User',
+    'users_edit_profile' => 'Edit Profile',
+    'users_avatar' => 'User Avatar',
+    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
+    'users_preferred_language' => 'Preferred Language',
+    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
+    'users_social_accounts' => 'Social Accounts',
+    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
+    'users_social_connect' => 'Connect Account',
+    'users_social_disconnect' => 'Disconnect Account',
+    'users_social_status_connected' => 'Connected',
+    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
+    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
+    'users_api_tokens' => 'API Tokens',
+    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_none' => 'No API tokens have been created for this user',
+    'users_api_tokens_create' => 'Create Token',
+    'users_api_tokens_expires' => 'Expires',
+    'users_api_tokens_docs' => 'API Documentation',
+    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_configure' => 'Configure Methods',
+
+    // API Tokens
+    'user_api_token_create' => 'Create API Token',
+    'user_api_token_name' => 'Name',
+    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_expiry' => 'Expiry Date',
+    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
+    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token' => 'API Token',
+    'user_api_token_id' => 'Token ID',
+    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
+    'user_api_token_secret' => 'Token Secret',
+    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_created' => 'Token created :timeAgo',
+    'user_api_token_updated' => 'Token updated :timeAgo',
+    'user_api_token_delete' => 'Delete Token',
+    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
+    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
+    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_create' => 'Create New Webhook',
+    'webhooks_none_created' => 'No webhooks have yet been created.',
+    'webhooks_edit' => 'Edit Webhook',
+    'webhooks_save' => 'Save Webhook',
+    'webhooks_details' => 'Webhook Details',
+    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_events' => 'Webhook Events',
+    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
+    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_events_all' => 'All system events',
+    'webhooks_name' => 'Webhook Name',
+    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
+    'webhooks_endpoint' => 'Webhook Endpoint',
+    'webhooks_active' => 'Webhook Active',
+    'webhook_events_table_header' => 'Events',
+    'webhooks_delete' => 'Delete Webhook',
+    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
+    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
+    'webhooks_format_example' => 'Webhook Format Example',
+    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_status' => 'Webhook Status',
+    'webhooks_last_called' => 'Last Called:',
+    'webhooks_last_errored' => 'Last Errored:',
+    'webhooks_last_error_message' => 'Last Error Message:',
+
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/sr/validation.php b/lang/sr/validation.php
new file mode 100644
index 00000000000..2a676c7c4cc
--- /dev/null
+++ b/lang/sr/validation.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values',
+    'file'                 => 'The :attribute must be provided as a valid file.',
+    'filled'               => 'The :attribute field is required.',
+    'gt'                   => [
+        'numeric' => 'The :attribute must be greater than :value.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
+    ],
+    'gte'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
+    ],
+    'exists'               => 'The selected :attribute is invalid.',
+    'image'                => 'The :attribute must be an image.',
+    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
+    ],
+    'lte'                  => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
+    ],
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'safe_url'             => 'The provided link may not be safe.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'totp'                 => 'The provided code is not valid or has expired.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'Password confirmation required',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index d90a5f08262..11b9a9efe58 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Användaren har tagits bort',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/sv/common.php b/lang/sv/common.php
index 33437eaa90e..70e9d2500a0 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beskrivning',
     'role' => 'Roll',
     'cover_image' => 'Omslagsbild',
-    'cover_image_description' => 'Bilden bör vara cirka 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Åtgärder',
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index b1ed182dc58..54d55052b36 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tabellegenskaper',
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Ta bort tabell',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Infoga rad före',
     'insert_row_after' => 'Infoga rad efter',
     'delete_row' => 'Ta bort rad',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 5ff5cfe203c..79aa46365df 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Textfil',
     'export_md' => 'Markdown-fil',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Rättigheter',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Redigera bok :bookName',
     'books_form_book_name' => 'Bokens namn',
     'books_save' => 'Spara bok',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Rättigheter för boken',
     'books_permissions_updated' => 'Bokens rättigheter har uppdaterats',
     'books_empty_contents' => 'Det finns inga sidor eller kapitel i den här boken.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Ta bort utkast',
     'pages_delete_success' => 'Sidan har tagits bort',
     'pages_delete_draft_success' => 'Utkastet har tagits bort',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Är du säker på att du vill ta bort den här sidan?',
     'pages_delete_draft_confirm' => 'Är du säker på att du vill ta bort det här utkastet?',
     'pages_editing_named' => 'Redigerar sida :pageName',
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index e24e5480733..7f44ee713e8 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En användare med adressen :email finns redan.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-posten har redan bekräftats, prova att logga in.',
     'email_confirmation_invalid' => 'Denna bekräftelsekod är inte giltig eller har redan använts. Vänligen prova att registrera dig på nytt.',
     'email_confirmation_expired' => 'Denna bekräftelsekod har gått ut. Vi har skickat dig en ny.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'En begäran från det externa autentiseringssystemet känns inte igen av en process som startats av denna applikation. Att navigera bakåt efter en inloggning kan orsaka detta problem.',
     'saml_fail_authed' => 'Inloggning med :system misslyckades, systemet godkände inte auktoriseringen',
     'oidc_already_logged_in' => 'Redan inloggad',
-    'oidc_user_not_registered' => 'Användaren :name är inte registrerad och automatisk registrering är inaktiverad',
     'oidc_no_email_address' => 'Kunde inte hitta en e-postadress för den här användaren i den data som tillhandahölls av det externa autentiseringssystemet',
     'oidc_fail_authed' => 'Inloggning med :system misslyckades, systemet presenterade inte en godkänd auktorisering',
     'social_no_action_defined' => 'Ingen åtgärd definierad',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 830680b65d8..30b09997747 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Papperskorgen är för närvarande tom',
     'recycle_bin_empty' => 'Töm papperskorgen',
     'recycle_bin_empty_confirm' => 'Detta kommer permanent att förstöra alla objekt i papperskorgen inklusive innehåll som finns i varje objekt. Är du säker du vill tömma papperskorgen?',
-    'recycle_bin_destroy_confirm' => 'Denna åtgärd kommer att permanent ta bort detta objekt, tillsammans med alla underordnade element som anges nedan, från systemet och du kommer inte att kunna återställa detta innehåll. Är du säker på att du vill ta bort objektet permanent?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Objekt som ska förstöras',
     'recycle_bin_restore_list' => 'Objekt som ska återställas',
     'recycle_bin_restore_confirm' => 'Denna åtgärd kommer att återställa det raderade objektet, inklusive alla underordnade element, till deras ursprungliga plats. Om den ursprungliga platsen har tagits bort sedan dess, och är nu i papperskorgen, kommer det överordnade objektet också att behöva återställas.',
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index 6a0c6ec5da2..c2a40c50a6a 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Kullanıcı başarıyla silindi',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API anahtarı başarıyla oluşturuldu',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API anahtarı başarıyla güncellendi',
-    'api_token_delete' => 'silinen sayfa tokenı',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API anahtarı başarıyla silindi',
 
     // Roles
diff --git a/lang/tr/common.php b/lang/tr/common.php
index 3c592a3f23a..e7a161b6e60 100644
--- a/lang/tr/common.php
+++ b/lang/tr/common.php
@@ -20,7 +20,7 @@
     'description' => 'Açıklama',
     'role' => 'Rol',
     'cover_image' => 'Kapak resmi',
-    'cover_image_description' => 'Bu görsel yaklaşık 440x250px boyutlarında olmalıdır.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'İşlemler',
diff --git a/lang/tr/editor.php b/lang/tr/editor.php
index 6bdb315d6e8..585d6ec0516 100644
--- a/lang/tr/editor.php
+++ b/lang/tr/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Tablo özellikleri',
     'table_properties_title' => 'Tablo Özellikleri',
     'delete_table' => 'Tabloyu sil',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Üste satır ekle',
     'insert_row_after' => 'Alta satır ekle',
     'delete_row' => 'Satırı sil',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index 9cc6774eab4..95c4b7b9406 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF Dosyası',
     'export_text' => 'Düz Metin Dosyası',
     'export_md' => 'Markdown Dosyası',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'İzinler',
@@ -132,9 +135,6 @@
     'books_edit_named' => ':bookName Kitabını Düzenle',
     'books_form_book_name' => 'Kitap Adı',
     'books_save' => 'Kitabı Kaydet',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Kitap İzinleri',
     'books_permissions_updated' => 'Kitap İzinleri Güncellendi',
     'books_empty_contents' => 'Bu kitaba ait sayfa veya bölüm oluşturulmamış.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Sayfa Taslağını Sil',
     'pages_delete_success' => 'Sayfa silindi',
     'pages_delete_draft_success' => 'Sayfa taslağı silindi',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Bu sayfayı silmek istediğinize emin misiniz?',
     'pages_delete_draft_confirm' => 'Bu sayfa taslağını silmek istediğinize emin misiniz?',
     'pages_editing_named' => ':pageName Sayfası Düzenleniyor',
diff --git a/lang/tr/errors.php b/lang/tr/errors.php
index 587ba9b4c2e..3e6138c7b41 100644
--- a/lang/tr/errors.php
+++ b/lang/tr/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':email e-posta adresine sahip bir kullanıcı zaten var.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'E-posta adresi zaten doğrulanmış, giriş yapmayı deneyin.',
     'email_confirmation_invalid' => 'Bu doğrulama kodu ya geçersiz ya da daha önce kullanılmış, lütfen tekrar kaydolmayı deneyin.',
     'email_confirmation_expired' => 'Doğrulama kodunun süresi doldu, yeni bir doğrulama kodu e-posta adresine gönderildi.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Harici doğrulama sistemi tarafından sağlanan bir veri talebi, bu uygulama tarafından başlatılan bir işlem tarafından tanınamadı. Giriş yaptıktan sonra geri dönmek bu soruna yol açmış olabilir.',
     'saml_fail_authed' => ':system kullanarak giriş yapma başarısız oldu; sistem, başarılı bir kimlik doğrulama sağlayamadı',
     'oidc_already_logged_in' => 'Zaten oturum açılmış',
-    'oidc_user_not_registered' => ':name adlı kullanıcı kayıtlı değil ve otomatik kaydolma devre dışı bırakılmış',
     'oidc_no_email_address' => 'Harici kimlik doğrulama sisteminden gelen veriler, bu kullanıcının e-posta adresini içermiyor',
     'oidc_fail_authed' => ':system kullanarak giriş yapma başarısız oldu; sistem, başarılı bir kimlik doğrulama sağlayamadı',
     'social_no_action_defined' => 'Herhangi bir eylem tanımlanmamış',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index ce312f1c38b..6daca434ee8 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Geri dönüşüm kutusu boş',
     'recycle_bin_empty' => 'Geri Dönüşüm Kutusunu Boşalt',
     'recycle_bin_empty_confirm' => 'Bu işlem, her bir öğenin içinde bulunan içerik de dahil olmak üzere geri dönüşüm kutusundaki tüm öğeleri kalıcı olarak imha edecektir. Geri dönüşüm kutusunu boşaltmak istediğinizden emin misiniz?',
-    'recycle_bin_destroy_confirm' => 'Bu işlem, bu öğeyi kalıcı olarak ve aşağıda listelenen alt öğelerle birlikte sistemden silecek ve bu içeriği geri yükleyemeyeceksiniz. Bu öğeyi kalıcı olarak silmek istediğinizden emin misiniz?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Kalıcı Olarak Silinecek Öğeler',
     'recycle_bin_restore_list' => 'Geri Yüklenecek Öğeler',
     'recycle_bin_restore_confirm' => 'Bu eylem, tüm alt öğeler dahil olmak üzere silinen öğeyi orijinal konumlarına geri yükleyecektir. Orijinal konum o zamandan beri silinmişse ve şimdi geri dönüşüm kutusunda bulunuyorsa, üst öğenin de geri yüklenmesi gerekecektir.',
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index 1ab0eca61a8..f7d6d284c87 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Користувача успішно видалено',
 
     // API Tokens
-    'api_token_create' => 'створений APi токен',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API токен успішно створений',
-    'api_token_update' => 'оновлено API токен',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'Токен API успішно оновлено',
-    'api_token_delete' => 'видалено API токен',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API-токен успішно видалено',
 
     // Roles
diff --git a/lang/uk/common.php b/lang/uk/common.php
index 7d79b53f260..c173e81d2a6 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -20,7 +20,7 @@
     'description' => 'Опис',
     'role' => 'Роль',
     'cover_image' => 'Обкладинка',
-    'cover_image_description' => 'Це зображення має бути приблизно 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Дії',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index 412ff49cfc1..fb0d420b798 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Властивості таблиці',
     'table_properties_title' => 'Властивості таблиці',
     'delete_table' => 'Видалити таблицю',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Вставити рядок перед',
     'insert_row_after' => 'Вставити рядок після',
     'delete_row' => 'Видалити рядок',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 3e657cf1f5d..c26848d75d8 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовий файл',
     'export_md' => 'Файл розмітки',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Редагувати книгу :bookName',
     'books_form_book_name' => 'Назва книги',
     'books_save' => 'Зберегти книгу',
-    'books_default_template' => 'Типовий шаблон сторінки',
-    'books_default_template_explain' => 'Призначити шаблон сторінки, який буде використовуватися як типовий вміст для всіх нових сторінок цієї книги. Майте на увазі, що це буде використано лише в тому випадку, якщо творець сторінки має доступ до обраної сторінки шаблону.',
-    'books_default_template_select' => 'Виберіть сторінку шаблону',
     'books_permissions' => 'Дозволи на книгу',
     'books_permissions_updated' => 'Дозволи на книгу оновлено',
     'books_empty_contents' => 'Для цієї книги не створено жодної сторінки або розділів.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Видалити чернетку',
     'pages_delete_success' => 'Сторінка видалена',
     'pages_delete_draft_success' => 'Чернетка видалена',
-    'pages_delete_warning_template' => 'Ця сторінка використовується як шаблон сторінки за промовчанням. У цих книгах немає стандартного шаблону сторінки, призначеного після видалення цієї сторінки.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Ви впевнені, що хочете видалити цю сторінку?',
     'pages_delete_draft_confirm' => 'Ви впевнені, що хочете видалити цю чернетку?',
     'pages_editing_named' => 'Редагування сторінки :pageName',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 533d3a1e2b5..ece86cf89f9 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Користувач з електронною адресою: електронна адреса вже існує, але з іншими обліковими даними.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Електронна пошта вже підтверджена, спробуйте увійти.',
     'email_confirmation_invalid' => 'Цей токен підтвердження недійсний або вже був використаний, будь ласка, спробуйте знову зареєструватися.',
     'email_confirmation_expired' => 'Термін дії токена підтвердження минув, новий електронний лист підтвердження був відправлений.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Запит із зовнішньої системи аутентифікації не розпізнається процесом, розпочатим цим додатком. Повернення назад після входу могла спричинити цю проблему.',
     'saml_fail_authed' => 'Вхід із використанням «:system» не вдався, система не здійснила успішну авторизацію',
     'oidc_already_logged_in' => 'Вже ввійшли в систему',
-    'oidc_user_not_registered' => 'Користувач :name не зареєстровано і автоматична реєстрація відключена',
     'oidc_no_email_address' => 'Не вдалося знайти адресу електронної пошти для цього користувача у даних, наданих зовнішньою системою автентифікації',
     'oidc_fail_authed' => 'Увійти за допомогою :system не вдалося, система не надала успішної авторизації',
     'social_no_action_defined' => 'Жодних дій не визначено',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index bd1a20ec8ab..3aaed0ef461 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Зараз кошик порожній',
     'recycle_bin_empty' => 'Очистити кошик',
     'recycle_bin_empty_confirm' => 'Це назавжди знищить усі елементи в кошику, включаючи вміст кожного елементу. Ви впевнені, що хочете очистити кошик?',
-    'recycle_bin_destroy_confirm' => 'Ця дія назавжди видалить цей об\'єкт із системи, а також усі дочірні об\'єкти вказані нижче, і ви не зможете відновити його. Ви впевнені, що хочете назавжди видалити цей об\'єкт?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Елементи для знищення',
     'recycle_bin_restore_list' => 'Елементи для відновлення',
     'recycle_bin_restore_confirm' => 'Ця дія відновить видалений елемент у початкове місце, включаючи всі дочірні елементи. Якщо вихідне розташування відтоді було видалено, і знаходиться у кошику, батьківський елемент також потрібно буде відновити.',
diff --git a/lang/uz/activities.php b/lang/uz/activities.php
index d90317749a4..0cbfd264a02 100644
--- a/lang/uz/activities.php
+++ b/lang/uz/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Foydalanuvchi muvaffaqiyatli olib tashlandi',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/uz/common.php b/lang/uz/common.php
index 5e01378da7f..01b682f8000 100644
--- a/lang/uz/common.php
+++ b/lang/uz/common.php
@@ -20,7 +20,7 @@
     'description' => 'Tavsif',
     'role' => 'Rol',
     'cover_image' => 'Muqova rasmi',
-    'cover_image_description' => 'Bu rasm taxminan 440x250px boʻlishi kerak.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Harakatlar',
diff --git a/lang/uz/editor.php b/lang/uz/editor.php
index 2ec35045739..f3aa4f5cdf9 100644
--- a/lang/uz/editor.php
+++ b/lang/uz/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Jadval xususiyatlari',
     'table_properties_title' => 'Jadval xususiyatlari',
     'delete_table' => 'Jadvalni o‘chirish',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Oldinga qator kiritish',
     'insert_row_after' => 'Keyingi qatorni kiritish',
     'delete_row' => 'Qatorni o‘chirish',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index 0effadf46eb..3f5eb6de920 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF holatida',
     'export_text' => 'Oddiy matn holatida',
     'export_md' => 'Markdown fayli holatida',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Huquqlar',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Kitobni tahrirlash: kitob nomi',
     'books_form_book_name' => 'Kitob nomi',
     'books_save' => 'Kitobni saqlash',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Kitob ruxsatnomalari',
     'books_permissions_updated' => 'Kitob ruxsatnomalari yangilandi',
     'books_empty_contents' => 'Ushbu kitob uchun hech qanday sahifa yoki bob yaratilmagan.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Qoralama sahifani oʻchirish',
     'pages_delete_success' => 'Sahifa oʻchirildi',
     'pages_delete_draft_success' => 'Qoralama sahifa oʻchirildi',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Haqiqatan ham bu sahifani oʻchirib tashlamoqchimisiz?',
     'pages_delete_draft_confirm' => 'Haqiqatan ham bu qoralama sahifani oʻchirib tashlamoqchimisiz?',
     'pages_editing_named' => 'Sahifani tahrirlash :pageName',
diff --git a/lang/uz/errors.php b/lang/uz/errors.php
index e37ca8bbe25..cbd4d630c26 100644
--- a/lang/uz/errors.php
+++ b/lang/uz/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'E-pochta manzili boʻlgan foydalanuvchi allaqachon mavjud, ammo hisob ma\'lumotlari boshqacha.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Elektron pochta allaqachon tasdiqlangan, tizimga kiring.',
     'email_confirmation_invalid' => 'Bu tasdiqlovchi token yaroqsiz yoki allaqachon ishlatilgan. Iltimos, qayta roʻyxatdan oʻtishga urinib koʻring.',
     'email_confirmation_expired' => 'Tasdiqlash belgisi muddati tugadi, yangi tasdiqlovchi elektron pochta xabari yuborildi.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Tashqi autentifikatsiya tizimidagi so‘rov ushbu ilova tomonidan boshlangan jarayon tomonidan tan olinmaydi. Kirishdan keyin orqaga qaytish bu muammoga olib kelishi mumkin.',
     'saml_fail_authed' => ':tizim yordamida tizimga kirish amalga oshmadi, tizim muvaffaqiyatli avtorizatsiyani taqdim etmadi',
     'oidc_already_logged_in' => 'Allaqachon tizimga kirgan',
-    'oidc_user_not_registered' => 'Foydalanuvchi :name roʻyxatdan oʻtmagan va avtomatik roʻyxatdan oʻtish oʻchirilgan',
     'oidc_no_email_address' => 'Tashqi autentifikatsiya tizimi tomonidan taqdim etilgan maʼlumotlarda ushbu foydalanuvchi uchun elektron pochta manzili topilmadi',
     'oidc_fail_authed' => ':tizim yordamida tizimga kirish amalga oshmadi, tizim muvaffaqiyatli avtorizatsiyani taqdim etmadi',
     'social_no_action_defined' => 'Hech qanday harakat belgilanmagan',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index f0c23e44525..07bbb248565 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Qayta ishlash qutisi hozir bo\'sh',
     'recycle_bin_empty' => 'Chiqindi qutisini bo\'shatish',
     'recycle_bin_empty_confirm' => 'Bu axlat qutisidagi barcha narsalarni, shu jumladan har bir element ichidagi kontentni butunlay yo\'q qiladi. Chiqindi qutisini bo\'shatishga ishonchingiz komilmi?',
-    'recycle_bin_destroy_confirm' => 'Bu amal ushbu elementni va quyida sanab o‘tilgan har qanday yordamchi elementlarni tizimdan butunlay o‘chirib tashlaydi va siz ushbu kontentni qayta tiklay olmaysiz. Haqiqatan ham bu elementni butunlay oʻchirib tashlamoqchimisiz?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Yo\'q qilinishi kerak bo\'lgan narsalar',
     'recycle_bin_restore_list' => 'Qayta tiklanadigan narsalar',
     'recycle_bin_restore_confirm' => 'Bu amal oʻchirilgan elementni, shu jumladan har qanday yordamchi elementlarni asl joyiga tiklaydi. Agar asl joy o\'chirilgan bo\'lsa va hozir axlat qutisida bo\'lsa, asosiy element ham tiklanishi kerak bo\'ladi.',
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index 17259f1e20d..fda4899b368 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Người dùng đã được xóa thành công',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/vi/common.php b/lang/vi/common.php
index 5215e8ab855..d514fc74e73 100644
--- a/lang/vi/common.php
+++ b/lang/vi/common.php
@@ -20,7 +20,7 @@
     'description' => 'Mô tả',
     'role' => 'Vai trò',
     'cover_image' => 'Ảnh bìa',
-    'cover_image_description' => 'Ảnh nên có kích thước 440x250px.',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => 'Hành động',
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index d1eebd0b3e1..76203c2d231 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => 'Thuộc tính bảng',
     'table_properties_title' => 'Thuộc tính bảng',
     'delete_table' => 'Xóa bảng',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => 'Chèn thêm hàng ở trên',
     'insert_row_after' => 'Chèn thêm hàng ở dưới',
     'delete_row' => 'Xóa hàng',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 5740a348351..6d8cb13b0cd 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'Tệp PDF',
     'export_text' => 'Tệp văn bản thuần túy',
     'export_md' => 'Tệp Markdown',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => 'Quyền',
@@ -132,9 +135,6 @@
     'books_edit_named' => 'Sửa sách :bookName',
     'books_form_book_name' => 'Tên sách',
     'books_save' => 'Lưu sách',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => 'Các quyền của cuốn sách',
     'books_permissions_updated' => 'Các quyền của cuốn sách đã được cập nhật',
     'books_empty_contents' => 'Không có trang hay chương nào được tạo cho cuốn sách này.',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Xóa Trang Nháp',
     'pages_delete_success' => 'Đã xóa Trang',
     'pages_delete_draft_success' => 'Đã xóa trang Nháp',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => 'Bạn có chắc chắn muốn xóa trang này?',
     'pages_delete_draft_confirm' => 'Bạn có chắc chắn muốn xóa trang nháp này?',
     'pages_editing_named' => 'Đang chỉnh sửa Trang :pageName',
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index 1b69b581850..47170b10bfa 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Đã có người sử dụng email :email nhưng với thông tin định danh khác.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email đã được xác nhận trước đó, Đang đăng nhập.',
     'email_confirmation_invalid' => 'Token xác nhận này không hợp lệ hoặc đã được sử dụng trước đó, Xin hãy thử đăng ký lại.',
     'email_confirmation_expired' => 'Token xác nhận đã hết hạn, Một email xác nhận mới đã được gửi.',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => 'Yêu cầu từ hệ thống xác thực bên ngoài không được nhận diện bởi quy trình chạy cho ứng dụng này. Điều hướng trở lại sau khi đăng nhập có thể đã gây ra vấn đề này.',
     'saml_fail_authed' => 'Đăng nhập sử dụng :system thất bại, hệ thống không cung cấp được sự xác thực thành công',
     'oidc_already_logged_in' => 'Đã đăng nhập',
-    'oidc_user_not_registered' => 'Người dùng :name chưa được đăng ký và tự động đăng ký đang bị tắt',
     'oidc_no_email_address' => 'Không tìm thấy địa chỉ email cho người dùng này, trong dữ liệu được cung cấp bới hệ thống xác thực ngoài',
     'oidc_fail_authed' => 'Đăng nhập sử dụng :system thất bại, hệ thống không cung cấp được sự xác thực thành công',
     'social_no_action_defined' => 'Không có hành động được xác định',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 929f1f7b225..3ffb37fd3f7 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Thùng rác hiện đang trống',
     'recycle_bin_empty' => 'Dọn dẹp Thùng Rác',
     'recycle_bin_empty_confirm' => 'Thao tác này sẽ hủy vĩnh viễn tất cả các mục trong thùng rác bao gồm cả nội dung có trong mỗi mục. Bạn có chắc chắn muốn làm trống thùng rác?',
-    'recycle_bin_destroy_confirm' => 'Hành động này sẽ xóa vĩnh viễn mục này, cùng với bất kỳ phần tử con nào được liệt kê bên dưới, khỏi hệ thống và bạn sẽ không thể khôi phục nội dung này. Bạn có chắc chắn muốn xóa vĩnh viễn mặt hàng này không?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => 'Items to be Destroyed',
     'recycle_bin_restore_list' => 'Items to be Restored',
     'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
diff --git a/lang/zh_CN/activities.php b/lang/zh_CN/activities.php
index 1d7272eec79..54c93b0efea 100644
--- a/lang/zh_CN/activities.php
+++ b/lang/zh_CN/activities.php
@@ -93,9 +93,9 @@
     'user_delete_notification' => '成功移除用户',
 
     // API Tokens
-    'api_token_create' => 'API 令牌已创建',
+    'api_token_create' => '已创建 API 令牌',
     'api_token_create_notification' => '成功创建 API 令牌',
-    'api_token_update' => 'API 令牌已更新',
+    'api_token_update' => '已更新 API 令牌',
     'api_token_update_notification' => 'API 令牌更新成功',
     'api_token_delete' => '已删除 API 令牌',
     'api_token_delete_notification' => 'API 令牌删除成功',
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index 833d3476254..05c0c0b9135 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -20,7 +20,7 @@
     'description' => '概要',
     'role' => '角色',
     'cover_image' => '封面图片',
-    'cover_image_description' => '此图像大小应约为 440x250 像素。',
+    'cover_image_description' => '此图像的大小应约为 440 x 250 像素，但会根据需要灵活缩放和裁剪以适应不同场景下的用户界面，因此实际显示尺寸会有所不同。',
 
     // Actions
     'actions' => '操作',
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index db65cb216b0..1a07362a553 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => '表格属性',
     'table_properties_title' => '表格属性',
     'delete_table' => '删除表格',
+    'table_clear_formatting' => '清除表格格式',
+    'resize_to_contents' => '根据内容调整大小',
+    'row_header' => '行头',
     'insert_row_before' => '在上方插入行',
     'insert_row_after' => '在下方插入行',
     'delete_row' => '删除行',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index e12f6051afb..f6a93c8811c 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF文件',
     'export_text' => '纯文本文件',
     'export_md' => 'Markdown 文件',
+    'default_template' => '默认页面模板',
+    'default_template_explain' => '指定一个页面模板，该模板将作为此项目中所有页面的默认内容。请注意，仅当页面创建者具有对所选页面模板的查看访问权限时，此功能才会生效。',
+    'default_template_select' => '选择模板页面',
 
     // Permissions and restrictions
     'permissions' => '权限',
@@ -132,9 +135,6 @@
     'books_edit_named' => '编辑图书「:bookName」',
     'books_form_book_name' => '书名',
     'books_save' => '保存图书',
-    'books_default_template' => '默认页面模板',
-    'books_default_template_explain' => '指定一个页面模板，该模板将用作本书中所有新页面的默认内容。请注意，仅当页面创建者具有对所选页面模板的查看访问权限时，此功能才会生效。',
-    'books_default_template_select' => '选择模板页面',
     'books_permissions' => '图书权限',
     'books_permissions_updated' => '图书权限已更新',
     'books_empty_contents' => '本书目前没有页面或章节。',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => '删除草稿页面',
     'pages_delete_success' => '页面已删除',
     'pages_delete_draft_success' => '草稿页面已删除',
-    'pages_delete_warning_template' => '此页面是当前的书籍默认页面模板。删除此页面后，将不再为这些书籍分配默认页面模板。',
+    'pages_delete_warning_template' => '此页面是当前书籍或章节的默认页面模板。删除此页面后，这些书籍或章节的默认页面模板将被取消。',
     'pages_delete_confirm' => '您确定要删除此页面吗？',
     'pages_delete_draft_confirm' => '您确定要删除此草稿页面吗？',
     'pages_editing_named' => '正在编辑页面“:pageName”',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index 3dbf3c4904c..3627c88d848 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Email为 :email 的用户已经存在，但具有不同的凭据。',
+    'auth_pre_register_theme_prevention' => '无法根据所提供的信息注册帐户',
     'email_already_confirmed' => 'Email已被确认，请尝试登录。',
     'email_confirmation_invalid' => '此确认令牌无效或已被使用，请重新注册。',
     'email_confirmation_expired' => '确认令牌已过期，已发送新的确认电子邮件。',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => '来自外部身份验证系统的请求没有被本应用程序认证，在登录后返回上一页可能会导致此问题。',
     'saml_fail_authed' => '使用 :system 登录失败，登录系统未返回成功登录授权信息。',
     'oidc_already_logged_in' => '您已经登陆了',
-    'oidc_user_not_registered' => '用户 :name 尚未注册，自助注册功能已被禁用',
     'oidc_no_email_address' => '无法找到有效的 Email 地址，此用户数据由外部身份验证系统托管',
     'oidc_fail_authed' => '使用 :system 登录失败，登录系统未返回成功登录授权信息',
     'social_no_action_defined' => '没有定义行为',
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index afbaa12fca2..597131e771d 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => '使用者移除成功',
 
     // API Tokens
-    'api_token_create' => 'created api token',
+    'api_token_create' => 'created API token',
     'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated api token',
+    'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted api token',
+    'api_token_delete' => 'deleted API token',
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 53b2a531037..72f5969b852 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -20,7 +20,7 @@
     'description' => '描述',
     'role' => '角色',
     'cover_image' => '封面圖片',
-    'cover_image_description' => '此圖片大小應約為 440x250px。',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
     // Actions
     'actions' => '動作',
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index 4189e39dd0d..cd023cd61c9 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -81,6 +81,9 @@
     'table_properties' => '表格屬性',
     'table_properties_title' => '表格屬性',
     'delete_table' => '刪除表格',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
     'insert_row_before' => '插入上方列',
     'insert_row_after' => '插入下方列',
     'delete_row' => '刪除列',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index a7eb9b151d3..3eb77f03010 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -39,6 +39,9 @@
     'export_pdf' => 'PDF 檔案',
     'export_text' => '純文字檔案',
     'export_md' => 'Markdown 檔案',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
 
     // Permissions and restrictions
     'permissions' => '權限',
@@ -132,9 +135,6 @@
     'books_edit_named' => '編輯書本「:bookName」',
     'books_form_book_name' => '書本名稱',
     'books_save' => '儲存書本',
-    'books_default_template' => 'Default Page Template',
-    'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.',
-    'books_default_template_select' => 'Select a template page',
     'books_permissions' => '書本權限',
     'books_permissions_updated' => '書本權限已更新',
     'books_empty_contents' => '本書目前沒有頁面或章節。',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => '刪除草稿頁面',
     'pages_delete_success' => '頁面已刪除',
     'pages_delete_draft_success' => '草稿頁面已刪除',
-    'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
     'pages_delete_confirm' => '您確定要刪除此頁面嗎？',
     'pages_delete_draft_confirm' => '您確定要刪除此草稿頁面嗎？',
     'pages_editing_named' => '正在編輯頁面 :pageName',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 044377a754d..4345d16136c 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -10,6 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => '電子郵件為 :email 已存在，但帳號密碼不同。',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => '已確認電子郵件，請嘗試登入。',
     'email_confirmation_invalid' => '這個確認權杖無效或已被使用，請嘗試重新註冊。',
     'email_confirmation_expired' => '這個確認權杖無效或已被使用，已傳送新的確認電子郵件。',
@@ -23,7 +24,6 @@
     'saml_invalid_response_id' => '此應用程式啟動的處理程序無法識別來自外部認證系統的請求。登入後回上一頁可能會造成此問題。',
     'saml_fail_authed' => '使用 :system 登入失敗，系統未提供成功的授權',
     'oidc_already_logged_in' => '已登入',
-    'oidc_user_not_registered' => '使用者 :name 未註冊，並已停用自動註冊',
     'oidc_no_email_address' => '在外部認證系統提供的資料中找不到該使用者的電子郵件地址',
     'oidc_fail_authed' => '使用 :system 登入失敗，系統未提供成功的授權',
     'social_no_action_defined' => '未定義動作',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index c3c86177026..df7b0821be1 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => '回收桶目前是空的',
     'recycle_bin_empty' => '清空回收桶',
     'recycle_bin_empty_confirm' => '這將會永久破壞回收桶中的所有項目，包括每個項目中包含的內容。您確定您想要清空回收桶嗎？',
-    'recycle_bin_destroy_confirm' => '此動作將會從系統中永久移除此項目以及下方列出的所有下層元素，您將無法還原此內容。您確定您想要永久刪除此項目嗎？',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
     'recycle_bin_destroy_list' => '要被銷毀的項目',
     'recycle_bin_restore_list' => '要被還原的項目',
     'recycle_bin_restore_confirm' => '此動作將會還原已被刪除的項目（包含任何下層元素）到其原始位置。如果原始位置已被刪除，且目前位於垃圾桶裡，那麼上層項目也需要被還原。',

From 2009d4d6a8e996d6221a3d0fc6feac153a57346b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 Feb 2024 12:29:09 +0000
Subject: [PATCH 055/666] Translations: Updated translator attribution, added
 serbian to locales

---
 .github/translators.txt           | 15 ++++++++++++++-
 app/Translation/LocaleManager.php |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 950c9d69598..991ac633c4d 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -374,7 +374,7 @@ balmag :: Hungarian
 Antti-Jussi Nygård (ajnyga) :: Finnish
 Eduard Ereza Martínez (Ereza) :: Catalan
 Jabir Lang (amar.almrad) :: Arabic
-Jaroslav Koblizek (foretix) :: Czech; French
+Jaroslav Kobližek (foretix) :: Czech; French
 Wiktor Adamczyk (adamczyk.wiktor) :: Polish
 Abdulmajeed Alshuaibi (4Majeed) :: Arabic
 NotSmartZakk :: Czech
@@ -393,3 +393,16 @@ TheGatesDev (thegatesdev) :: Dutch
 Irdi (irdiOL) :: Albanian
 KateBarber :: Welsh
 Twister (theuncles75) :: Hebrew
+algernon19 :: Hungarian
+Ivan Krstic (ikrstic) :: Serbian (Cyrillic)
+Show :: Russian
+xBahamut :: Portuguese, Brazilian
+Pavle Knežević (pavleknezzevic) :: Serbian (Cyrillic)
+Vanja Cvelbar (b100w11) :: Slovenian
+simonpct :: French
+Honza Nagy (honza.nagy) :: Czech
+asd20752 :: Norwegian Bokmal
+Jan Picka (polipones) :: Czech
+diogoalex991 :: Portuguese
+Ehsan Sadeghi (ehsansadeghi) :: Persian
+ka_picit :: Danish
diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index ce97426b9b4..e087dd9fa5e 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -58,6 +58,7 @@ class LocaleManager
         'sk'          => 'sk_SK',
         'sl'          => 'sl_SI',
         'sq'          => 'sq_AL',
+        'sr'          => 'sr_RS',
         'sv'          => 'sv_SE',
         'tr'          => 'tr_TR',
         'uk'          => 'uk_UA',

From f5f96f84e7061dc2356510760c200ccae415fee5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 Feb 2024 13:07:34 +0000
Subject: [PATCH 056/666] 404: Fixed entity list issue with entity with
 non-visible parent

Adds our mixed entity list loader to popular queries for more efficient
loading.
---
 app/Entities/Queries/QueryPopular.php | 26 +++++++-----------------
 tests/ErrorTest.php                   | 29 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index b2ca565eb05..2b46ebfbcf9 100644
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -4,10 +4,8 @@
 
 use BookStack\Activity\Models\View;
 use BookStack\Entities\EntityProvider;
-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
@@ -16,10 +14,11 @@ class QueryPopular
     public function __construct(
         protected PermissionApplicator $permissions,
         protected EntityProvider $entityProvider,
+        protected MixedEntityListLoader $listLoader,
     ) {
     }
 
-    public function run(int $count, int $page, array $filterModels = null)
+    public function run(int $count, int $page, array $filterModels = null): Collection
     {
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
@@ -31,24 +30,13 @@ public function run(int $count, int $page, array $filterModels = null)
             $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 
-        $entities = $query->with('viewable')
+        $views = $query
             ->skip($count * ($page - 1))
             ->take($count)
-            ->get()
-            ->pluck('viewable')
-            ->filter();
+            ->get();
 
-        $this->loadBooksForChildren($entities);
+        $this->listLoader->loadIntoRelations($views->all(), 'viewable', false);
 
-        return $entities;
-    }
-
-    protected function loadBooksForChildren(Collection $entities): void
-    {
-        $bookChildren = $entities->filter(fn(Entity $entity) => $entity instanceof BookChild);
-        $eloquent = (new \Illuminate\Database\Eloquent\Collection($bookChildren));
-        $eloquent->load(['book' => function (BelongsTo $query) {
-            $query->scopes('visible');
-        }]);
+        return $views->pluck('viewable')->filter();
     }
 }
diff --git a/tests/ErrorTest.php b/tests/ErrorTest.php
index 0d2ef808c48..642945d4388 100644
--- a/tests/ErrorTest.php
+++ b/tests/ErrorTest.php
@@ -23,6 +23,35 @@ public function test_404_page_does_not_show_login()
         $notFound->assertSeeText('tester');
     }
 
+    public function test_404_page_does_not_non_visible_content()
+    {
+        $editor = $this->users->editor();
+        $book = $this->entities->book();
+
+        $this->actingAs($editor)->get($book->getUrl())->assertOk();
+
+        $this->permissions->disableEntityInheritedPermissions($book);
+
+        $this->actingAs($editor)->get($book->getUrl())->assertNotFound();
+    }
+
+    public function test_404_page_shows_visible_content_within_non_visible_parent()
+    {
+        $editor = $this->users->editor();
+        $book = $this->entities->book();
+        $page = $book->pages()->first();
+
+        $this->actingAs($editor)->get($page->getUrl())->assertOk();
+
+        $this->permissions->disableEntityInheritedPermissions($book);
+        $this->permissions->addEntityPermission($page, ['view'], $editor->roles()->first());
+
+        $resp = $this->actingAs($editor)->get($book->getUrl());
+        $resp->assertNotFound();
+        $resp->assertSee($page->name);
+        $resp->assertDontSee($book->name);
+    }
+
     public function test_item_not_found_does_not_get_logged_to_file()
     {
         $this->actingAs($this->users->viewer());

From 8e01345f1494f37d462ad35fb6723c8051f9d752 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 Feb 2024 13:20:24 +0000
Subject: [PATCH 057/666] Entity popular queriy: Loaded parents for selector
 breadcrumbs

---
 app/Entities/Queries/QueryPopular.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index 2b46ebfbcf9..85f88a1d19c 100644
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -35,7 +35,7 @@ public function run(int $count, int $page, array $filterModels = null): Collecti
             ->take($count)
             ->get();
 
-        $this->listLoader->loadIntoRelations($views->all(), 'viewable', false);
+        $this->listLoader->loadIntoRelations($views->all(), 'viewable', true);
 
         return $views->pluck('viewable')->filter();
     }

From 5a5f0b8de95b95827d7ee83c3057429e4afa7836 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Mar 2024 15:07:51 +0000
Subject: [PATCH 058/666] Page Display: Fixed highlighting for elements in
 nested details

For #4878
---
 resources/js/services/util.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/js/services/util.js b/resources/js/services/util.js
index 59affff8814..942456d9ded 100644
--- a/resources/js/services/util.js
+++ b/resources/js/services/util.js
@@ -31,9 +31,12 @@ export function debounce(func, waitMs, immediate) {
 export function scrollAndHighlightElement(element) {
     if (!element) return;
 
-    const parentDetails = element.closest('details');
-    if (parentDetails && !parentDetails.open) {
-        parentDetails.open = true;
+    let parent = element;
+    while (parent.parentElement) {
+        parent = parent.parentElement;
+        if (parent.nodeName === 'DETAILS' && !parent.open) {
+            parent.open = true;
+        }
     }
 
     element.scrollIntoView({behavior: 'smooth'});

From b7d4bd5bcef09ff20d08626f943d707c1e0f175e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Mar 2024 15:24:44 +0000
Subject: [PATCH 059/666] Breadcrumbs: Set book/shelf lists to use name
 ordering

Previously in database order (id) which is not predictable
nor parsable for users.
For #4876
---
 app/Entities/Tools/SiblingFetcher.php |  4 +--
 tests/Entity/EntitySearchTest.php     | 36 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/Entities/Tools/SiblingFetcher.php b/app/Entities/Tools/SiblingFetcher.php
index 34d0fc6b07e..156209fd23e 100644
--- a/app/Entities/Tools/SiblingFetcher.php
+++ b/app/Entities/Tools/SiblingFetcher.php
@@ -43,13 +43,13 @@ public function fetch(string $entityType, int $entityId): Collection
             if ($contextShelf) {
                 $entities = $contextShelf->visibleBooks()->get();
             } else {
-                $entities = $this->queries->books->visibleForList()->get();
+                $entities = $this->queries->books->visibleForList()->orderBy('name', 'asc')->get();
             }
         }
 
         // Shelf
         if ($entity instanceof Bookshelf) {
-            $entities = $this->queries->shelves->visibleForList()->get();
+            $entities = $this->queries->shelves->visibleForList()->orderBy('name', 'asc')->get();
         }
 
         return $entities;
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index dcc06204446..4b032bfc331 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -356,6 +356,42 @@ public function test_sibling_search_for_shelves()
         }
     }
 
+    public function test_sibling_search_for_books_provides_results_in_alphabetical_order()
+    {
+        $contextBook = $this->entities->book();
+        $searchBook = $this->entities->book();
+
+        $searchBook->name = 'Zebras';
+        $searchBook->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
+        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
+
+        $searchBook->name = 'AAAAAAArdvarks';
+        $searchBook->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
+        $this->withHtml($search)->assertElementContains('a:first-child', 'AAAAAAArdvarks');
+    }
+
+    public function test_sibling_search_for_shelves_provides_results_in_alphabetical_order()
+    {
+        $contextShelf = $this->entities->shelf();
+        $searchShelf = $this->entities->shelf();
+
+        $searchShelf->name = 'Zebras';
+        $searchShelf->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
+        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
+
+        $searchShelf->name = 'AAAAAAArdvarks';
+        $searchShelf->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
+        $this->withHtml($search)->assertElementContains('a:first-child', 'AAAAAAArdvarks');
+    }
+
     public function test_search_works_on_updated_page_content()
     {
         $page = $this->entities->page();

From 77f125208ed281912bb6ae9d57abe7b4b26df4c6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Mar 2024 15:52:09 +0000
Subject: [PATCH 060/666] Page nav: Fixed nbsp being represented as nothing

Now represented in page nav using a normal space to avoid complete
removal of space.
Added test to cover.
For #4836
---
 app/Entities/Tools/PageContent.php |  2 +-
 tests/Entity/PageContentTest.php   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 4f68b828fc5..d2f5de65c3e 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -379,7 +379,7 @@ public function getNavigation(string $htmlContent): array
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {
         $tree = collect($nodeList)->map(function (DOMElement $header) {
-            $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
+            $text = trim(str_replace("\xc2\xa0", ' ', $header->nodeValue));
             $text = mb_substr($text, 0, 100);
 
             return [
diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 28897c14d2f..23a38b5735b 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -469,6 +469,20 @@ public function test_get_page_nav_shifts_headers_if_only_smaller_ones_are_used()
         ], $navMap[2]);
     }
 
+    public function test_get_page_nav_respects_non_breaking_spaces()
+    {
+        $content = '<h1 id="testa">Hello&nbsp;There</h1>';
+        $pageContent = new PageContent(new Page(['html' => $content]));
+        $navMap = $pageContent->getNavigation($content);
+
+        $this->assertEquals([
+            'nodeName' => 'h1',
+            'link'     => '#testa',
+            'text'     => 'Hello There',
+            'level'    => 1,
+        ], $navMap[0]);
+    }
+
     public function test_page_text_decodes_html_entities()
     {
         $page = $this->entities->page();

From bc24a1360f8a1f7e3be3656de9392a0802328d90 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 10 Mar 2024 18:24:42 +0000
Subject: [PATCH 061/666] TOTP: Added one-time-code autofill

During review of #4849
Tested on Firefox & Chromium desktop.
---
 resources/views/mfa/parts/verify-totp.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/mfa/parts/verify-totp.blade.php b/resources/views/mfa/parts/verify-totp.blade.php
index b779465ab4d..78d0fa64d94 100644
--- a/resources/views/mfa/parts/verify-totp.blade.php
+++ b/resources/views/mfa/parts/verify-totp.blade.php
@@ -6,6 +6,7 @@
     {{ csrf_field() }}
     <input type="text"
            name="code"
+           autocomplete="one-time-code"
            autofocus
            placeholder="{{ trans('auth.mfa_gen_totp_provide_code_here') }}"
            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">

From d5a689366c7ceca8f7949caf0d919bb13fb56499 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 10 Mar 2024 18:31:01 +0000
Subject: [PATCH 062/666] MFA: Copied autocomplete changes from totp to backup
 codes

Also added tests to cover.
Related to #4849
---
 .../mfa/parts/verify-backup_codes.blade.php    |  3 ++-
 tests/Auth/MfaVerificationTest.php             | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/resources/views/mfa/parts/verify-backup_codes.blade.php b/resources/views/mfa/parts/verify-backup_codes.blade.php
index 0e5b8208642..3e28f71c6db 100644
--- a/resources/views/mfa/parts/verify-backup_codes.blade.php
+++ b/resources/views/mfa/parts/verify-backup_codes.blade.php
@@ -2,10 +2,11 @@
 
 <p class="small mb-m">{{ trans('auth.mfa_verify_backup_code_desc') }}</p>
 
-<form action="{{ url('/mfa/backup_codes/verify') }}" method="post">
+<form action="{{ url('/mfa/backup_codes/verify') }}" method="post" autocomplete="off">
     {{ csrf_field() }}
     <input type="text"
            name="code"
+           autocomplete="one-time-code"
            placeholder="{{ trans('auth.mfa_verify_backup_code_enter_here') }}"
            class="input-fill-width {{ $errors->has('code') ? 'neg' : '' }}">
     @if($errors->has('code'))
diff --git a/tests/Auth/MfaVerificationTest.php b/tests/Auth/MfaVerificationTest.php
index 2fa272e331c..76c59bc748b 100644
--- a/tests/Auth/MfaVerificationTest.php
+++ b/tests/Auth/MfaVerificationTest.php
@@ -57,6 +57,15 @@ public function test_totp_verification_fails_on_missing_invalid_code()
         $this->assertNull(auth()->user());
     }
 
+    public function test_totp_form_has_autofill_configured()
+    {
+        [$user, $secret, $loginResp] = $this->startTotpLogin();
+        $html = $this->withHtml($this->get('/mfa/verify'));
+
+        $html->assertElementExists('form[autocomplete="off"][action$="/verify"]');
+        $html->assertElementExists('input[autocomplete="one-time-code"][name="code"]');
+    }
+
     public function test_backup_code_verification()
     {
         [$user, $codes, $loginResp] = $this->startBackupCodeLogin();
@@ -138,6 +147,15 @@ public function test_backup_code_verification_shows_warning_when_limited_codes_r
         $resp->assertSeeText('You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.');
     }
 
+    public function test_backup_code_form_has_autofill_configured()
+    {
+        [$user, $codes, $loginResp] = $this->startBackupCodeLogin();
+        $html = $this->withHtml($this->get('/mfa/verify'));
+
+        $html->assertElementExists('form[autocomplete="off"][action$="/verify"]');
+        $html->assertElementExists('input[autocomplete="one-time-code"][name="code"]');
+    }
+
     public function test_both_mfa_options_available_if_set_on_profile()
     {
         $user = $this->users->editor();

From 3619f79ca6c9fc547ef2630a681599591ba25b3a Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sun, 10 Mar 2024 18:36:12 +0000
Subject: [PATCH 063/666] Updated translations with latest Crowdin changes
 (#4877)

---
 lang/cs/common.php              |   2 +-
 lang/cs/notifications.php       |  12 ++--
 lang/de/activities.php          |  38 +++++-----
 lang/de/auth.php                |   2 +-
 lang/de/common.php              |   2 +-
 lang/de/editor.php              |   6 +-
 lang/de/errors.php              |   2 +-
 lang/de/settings.php            |   2 +-
 lang/de_informal/activities.php |   6 +-
 lang/de_informal/common.php     |   2 +-
 lang/de_informal/editor.php     |   6 +-
 lang/de_informal/errors.php     |   2 +-
 lang/de_informal/settings.php   |   2 +-
 lang/fi/activities.php          |   6 +-
 lang/fi/common.php              |   2 +-
 lang/fi/editor.php              |   6 +-
 lang/fr/activities.php          |   6 +-
 lang/fr/common.php              |   2 +-
 lang/fr/editor.php              |   6 +-
 lang/fr/entities.php            |   8 +--
 lang/fr/errors.php              |   2 +-
 lang/fr/settings.php            |   2 +-
 lang/ja/editor.php              |   6 +-
 lang/ja/errors.php              |   2 +-
 lang/nb/activities.php          |   6 +-
 lang/nb/common.php              |   2 +-
 lang/nb/editor.php              |   6 +-
 lang/nb/errors.php              |   2 +-
 lang/nb/settings.php            |   2 +-
 lang/nl/activities.php          |  10 +--
 lang/nl/auth.php                |   4 +-
 lang/nl/common.php              |   2 +-
 lang/nl/editor.php              |   6 +-
 lang/nl/entities.php            |  36 +++++-----
 lang/nl/errors.php              |   2 +-
 lang/nl/settings.php            |   2 +-
 lang/sr/activities.php          |   6 +-
 lang/sr/auth.php                |  22 +++---
 lang/sr/editor.php              | 120 ++++++++++++++++----------------
 39 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/lang/cs/common.php b/lang/cs/common.php
index 08ac067ff3f..20e03090fe2 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -68,7 +68,7 @@
     'deleted_user' => 'Odstraněný uživatel',
     'no_activity' => 'Žádná aktivita k zobrazení',
     'no_items' => 'Žádné položky k dispozici',
-    'back_to_top' => 'Zpět na začátek',
+    'back_to_top' => 'Zpět nahoru',
     'skip_to_main_content' => 'Přeskočit na hlavní obsah',
     'toggle_details' => 'Přepnout podrobnosti',
     'toggle_thumbnails' => 'Přepnout náhledy',
diff --git a/lang/cs/notifications.php b/lang/cs/notifications.php
index b16eb34291e..8314a0d8f38 100644
--- a/lang/cs/notifications.php
+++ b/lang/cs/notifications.php
@@ -5,23 +5,23 @@
 return [
 
     'new_comment_subject' => 'Nový komentář na stránce: :pageName',
-    'new_comment_intro' => 'Uživatel okomentoval stránku v :appName:',
+    'new_comment_intro' => 'Uživatel(ka) okomentoval(a) stránku v :appName:',
     'new_page_subject' => 'New page: :pageName',
     'new_page_intro' => 'Nová stránka byla vytvořena v :appName:',
     'updated_page_subject' => 'Aktualizovaná stránka: :pageName',
     'updated_page_intro' => 'Stránka byla aktualizována v :appName:',
-    'updated_page_debounce' => 'Aby se zabránilo hromadnému zasílání upozornění, na nějakou dobu nebudete posílat oznámení o dalších úpravách této stránky stejným editorem.',
+    'updated_page_debounce' => 'Po nějakou dobu neobdržíte další oznámení o aktualizaci této stránky stejným editorem, aby se omezil počet stejných zaslaných upozornění.',
 
     'detail_page_name' => 'Název stránky:',
-    'detail_page_path' => 'Cesta ke stránce:',
-    'detail_commenter' => 'Komentoval:',
+    'detail_page_path' => 'Umístěný v:',
+    'detail_commenter' => 'Komentoval(a):',
     'detail_comment' => 'Komentář:',
-    'detail_created_by' => 'Vytvořil:',
+    'detail_created_by' => 'Vytvořil(a):',
     'detail_updated_by' => 'Aktualizoval(a):',
 
     'action_view_comment' => 'Zobrazit komentář',
     'action_view_page' => 'Zobrazit stránku',
 
-    'footer_reason' => 'Toto oznámení vám bylo zasláno, protože :link pokrývá tento typ aktivity pro tuto položku.',
+    'footer_reason' => 'Dle :link Vám bylo pro tento typ aktivity zasláno toto upozornění.',
     'footer_reason_link' => 'nastavení upozornění',
 ];
diff --git a/lang/de/activities.php b/lang/de/activities.php
index dd8a6ecf1f7..5099209475e 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -10,11 +10,11 @@
     'page_create_notification'    => 'Seite erfolgreich erstellt',
     'page_update'                 => 'aktualisierte Seite',
     'page_update_notification'    => 'Seite erfolgreich aktualisiert',
-    'page_delete'                 => 'hat die Seite gelöscht',
+    'page_delete'                 => 'löschte Seite',
     'page_delete_notification'    => 'Seite erfolgreich gelöscht',
-    'page_restore'                => 'hat die Seite wiederhergestellt',
+    'page_restore'                => 'wiederherstellte Seite',
     'page_restore_notification'   => 'Seite erfolgreich wiederhergestellt',
-    'page_move'                   => 'Seite verschoben',
+    'page_move'                   => 'verschob Seite',
     'page_move_notification'      => 'Seite erfolgreich verschoben',
 
     // Chapters
@@ -37,20 +37,20 @@
     'book_delete'                 => 'löschte Buch',
     'book_delete_notification'    => 'Buch erfolgreich gelöscht',
     'book_sort'                   => 'sortierte Buch',
-    'book_sort_notification'      => 'Das Buch wurde erfolgreich umsortiert',
+    'book_sort_notification'      => 'Buch wurde erfolgreich umsortiert',
 
     // Bookshelves
     'bookshelf_create'            => 'erstellte Regal',
     'bookshelf_create_notification'    => 'Regal erfolgreich erstellt',
     'bookshelf_create_from_book'    => 'konvertierte Buch zu Regal',
-    'bookshelf_create_from_book_notification'    => 'Buch erfolgreich in ein Regal konvertiert',
+    'bookshelf_create_from_book_notification'    => 'Buch erfolgreich in Regal konvertiert',
     'bookshelf_update'                 => 'aktualisierte Regal',
     'bookshelf_update_notification'    => 'Regal erfolgreich aktualisiert',
     'bookshelf_delete'                 => 'löschte Regal',
     'bookshelf_delete_notification'    => 'Regal erfolgreich gelöscht',
 
     // Revisions
-    'revision_restore' => 'stellte Revision wieder her:',
+    'revision_restore' => 'widerherstellte Revision',
     'revision_delete' => 'löschte Revision',
     'revision_delete_notification' => 'Revision erfolgreich gelöscht',
 
@@ -62,25 +62,25 @@
     'watch_update_level_notification' => 'Beobachtungseinstellungen erfolgreich aktualisiert',
 
     // Auth
-    'auth_login' => 'hat sich eingeloggt',
-    'auth_register' => 'hat sich als neuer Benutzer registriert',
-    'auth_password_reset_request' => 'hat eine Rücksetzung des Benutzerpassworts beantragt',
-    'auth_password_reset_update' => 'hat Benutzerpasswort zurückgesetzt',
-    'mfa_setup_method' => 'hat MFA-Methode konfiguriert',
+    'auth_login' => 'loggte sich ein',
+    'auth_register' => 'registrierte sich als neuer User',
+    'auth_password_reset_request' => 'forderte Rücksetzung des Benutzerpassworts an',
+    'auth_password_reset_update' => 'setzte Benutzerpasswort zurück',
+    'mfa_setup_method' => 'konfigurierte MFA-Methode',
     'mfa_setup_method_notification' => 'Multi-Faktor-Methode erfolgreich konfiguriert',
-    'mfa_remove_method' => 'hat MFA-Methode entfernt',
+    'mfa_remove_method' => 'entfernte MFA-Methode',
     'mfa_remove_method_notification' => 'Multi-Faktor-Methode erfolgreich entfernt',
 
     // Settings
-    'settings_update' => 'hat Einstellungen aktualisiert',
+    'settings_update' => 'aktualisierte Einstellungen',
     'settings_update_notification' => 'Einstellungen erfolgreich aktualisiert',
-    'maintenance_action_run' => 'hat Wartungsarbeiten ausgeführt',
+    'maintenance_action_run' => 'führte Wartungsaktion aus',
 
     // Webhooks
     'webhook_create' => 'erstellte Webhook',
-    'webhook_create_notification' => 'Webhook wurde erfolgreich eingerichtet',
+    'webhook_create_notification' => 'Webhook erfolgreich erstellt',
     'webhook_update' => 'aktualisierte Webhook',
-    'webhook_update_notification' => 'Webhook wurde erfolgreich aktualisiert',
+    'webhook_update_notification' => 'Webhook erfolgreich aktualisiert',
     'webhook_delete' => 'löschte Webhook',
     'webhook_delete_notification' => 'Webhook erfolgreich gelöscht',
 
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'API-Token erstellt',
     'api_token_create_notification' => 'API-Token erfolgreich erstellt',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'API-Token aktualisiert',
     'api_token_update_notification' => 'API-Token erfolgreich aktualisiert',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'API-Token gelöscht',
     'api_token_delete_notification' => 'API-Token erfolgreich gelöscht',
 
     // Roles
diff --git a/lang/de/auth.php b/lang/de/auth.php
index 505ae0dd5d9..aa9dcfd8e1a 100644
--- a/lang/de/auth.php
+++ b/lang/de/auth.php
@@ -40,7 +40,7 @@
 
     // Login auto-initiation
     'auto_init_starting' => 'Anmeldeversuche',
-    'auto_init_starting_desc' => 'Wir verbinden und mit Ihrem Authentifizierungssystem um den Anmeldeprozess zu starten. Sollte es nach 5 Sekunden nicht weitergehen, klicken Sie bitte auf den unten stehenden Link.',
+    'auto_init_starting_desc' => 'Wir verbinden uns mit Ihrem Authentifizierungssystem, um den Anmeldeprozess zu starten. Sollte es nach 5 Sekunden nicht weitergehen, klicken Sie bitte auf den unten stehenden Link.',
     'auto_init_start_link' => 'Mit Authentifizierung fortfahren',
 
     // Password Reset
diff --git a/lang/de/common.php b/lang/de/common.php
index eebecc13c03..1e18deb7797 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'cover_image' => 'Titelbild',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Dieses Bild sollte ungefähr 440x250px groß sein, obwohl es flexibel skaliert und beschnitten wird, um in verschiedenen Szenarien in die Benutzeroberfläche zu passen, sodass die tatsächlichen Abmessungen für die Anzeige abweichen können.',
 
     // Actions
     'actions' => 'Aktionen',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index aba76c2d595..e6b2400692a 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabelleneigenschaften',
     'table_properties_title' => 'Tabelleneigenschaften',
     'delete_table' => 'Tabelle löschen',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Tabellenformatierung löschen',
+    'resize_to_contents' => 'Größe an Inhalt anpassen',
+    'row_header' => 'Zeilenkopf',
     'insert_row_before' => 'Zeile davor einfügen',
     'insert_row_after' => 'Zeile danach einfügen',
     'delete_row' => 'Zeile löschen',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 08332295202..8cfddacd8a6 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ein Benutzer mit der E-Mail-Adresse :email ist bereits mit anderen Anmeldedaten registriert.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Benutzerkonto konnte für die angegebenen Details nicht registriert werden',
     'email_already_confirmed' => 'Die E-Mail-Adresse ist bereits bestätigt. Bitte melden Sie sich an.',
     'email_confirmation_invalid' => 'Der Bestätigungslink ist nicht gültig oder wurde bereits verwendet. Bitte registrieren Sie sich erneut.',
     'email_confirmation_expired' => 'Der Bestätigungslink ist abgelaufen. Es wurde eine neue Bestätigungs-E-Mail gesendet.',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index eab0bb15352..f25576e2788 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -110,7 +110,7 @@
     'recycle_bin_contents_empty' => 'Der Papierkorb ist derzeit leer',
     'recycle_bin_empty' => 'Papierkorb leeren',
     'recycle_bin_empty_confirm' => 'Dies wird alle Gegenstände im Papierkorb dauerhaft entfernen, einschließlich der Inhalte, die darin enthalten sind. Sind Sie sicher, dass Sie den Papierkorb leeren möchten?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Diese Aktion löscht dieses Element dauerhaft aus dem System, zusammen mit allen unten aufgeführten untergeordneten Elementen, und es ist nicht möglich, diesen Inhalt wiederherzustellen. Sind Sie sicher, dass Sie dieses Element dauerhaft löschen möchten?',
     'recycle_bin_destroy_list' => 'Zu löschende Elemente',
     'recycle_bin_restore_list' => 'Zu wiederherzustellende Elemente',
     'recycle_bin_restore_confirm' => 'Mit dieser Aktion wird das gelöschte Element einschließlich aller untergeordneten Elemente an seinen ursprünglichen Ort wiederherstellen. Wenn der ursprüngliche Ort gelöscht wurde und sich nun im Papierkorb befindet, muss auch das übergeordnete Element wiederhergestellt werden.',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index a24297f3149..6783b42a5f1 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'API Token wurde erstellt',
     'api_token_create_notification' => 'API-Token erfolgreich erstellt',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'API Token wurde aktualisiert',
     'api_token_update_notification' => 'API-Token erfolgreich aktualisiert',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'API Token gelöscht',
     'api_token_delete_notification' => 'API-Token erfolgreich gelöscht',
 
     // Roles
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index c8e1c576dee..3d5a4d1e324 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschreibung',
     'role' => 'Rolle',
     'cover_image' => 'Titelbild',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Dieses Bild sollte ungefähr 440 x 250 Pixel groß sein, kann jedoch je nach Bedarf flexibel skaliert und zugeschnitten werden, um es an die Benutzeroberfläche in verschiedenen Szenarien anzupassen, sodass die tatsächlichen Abmessungen für die Anzeige abweichen können.',
 
     // Actions
     'actions' => 'Aktionen',
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 65fdacb49ed..1956715d189 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabelleneigenschaften',
     'table_properties_title' => 'Tabelleneigenschaften',
     'delete_table' => 'Tabelle löschen',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Tabellenformatierung entfernen',
+    'resize_to_contents' => 'Größe an Inhalt anpassen',
+    'row_header' => 'Zeilenüberschrift',
     'insert_row_before' => 'Zeile oberhalb einfügen',
     'insert_row_after' => 'Zeile unterhalb einfügen',
     'delete_row' => 'Zeile löschen',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index b527d3f7a0e..f40b3e1484e 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Ein Benutzer mit der E-Mail-Adresse :email ist bereits mit anderen Anmeldedaten registriert.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Das Benutzerkonto kann mit den bereitgestellten Informationen nicht erstellen werden',
     'email_already_confirmed' => 'Die E-Mail-Adresse ist bereits bestätigt. Bitte melde dich an.',
     'email_confirmation_invalid' => 'Der Bestätigungslink ist nicht gültig oder wurde bereits verwendet. Bitte registriere dich erneut.',
     'email_confirmation_expired' => 'Der Bestätigungslink ist abgelaufen. Es wurde eine neue Bestätigungs-E-Mail gesendet.',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 7bb48bdd138..ea65bef5525 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -110,7 +110,7 @@
     'recycle_bin_contents_empty' => 'Der Papierkorb ist derzeit leer',
     'recycle_bin_empty' => 'Papierkorb leeren',
     'recycle_bin_empty_confirm' => 'Dies wird alle Einträge im Papierkorb dauerhaft entfernen, einschließlich der Inhalte, die darin enthalten sind. Bist du sicher, dass du den Papierkorb leeren möchtest?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Dieser Schritt löscht permanent das Element, gemeinsam mit allen untergeordneten Elementen, aus dem System. Dieser Schritt kann nicht rückgängig gemacht werden. Sind Sie sicher, dass Sie eine dauerhafte Löschung durchführen wollen?',
     'recycle_bin_destroy_list' => 'Zu löschende Einträge',
     'recycle_bin_restore_list' => 'Wiederherzustellende Einträge',
     'recycle_bin_restore_confirm' => 'Mit dieser Aktion wird der gelöschte Eintrag einschließlich aller untergeordneten Einträge an seinem ursprünglichen Ort wiederhergestellt. Wenn der ursprüngliche Ort gelöscht wurde und sich nun im Papierkorb befindet, muss auch der übergeordnete Eintrag wiederhergestellt werden.',
diff --git a/lang/fi/activities.php b/lang/fi/activities.php
index 878ef5edd3c..6bb267c707c 100644
--- a/lang/fi/activities.php
+++ b/lang/fi/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Käyttäjä poistettiin onnistuneesti',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'loi API-tunnisteen',
     'api_token_create_notification' => 'API-tunniste luotiin onnistuneesti',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'päivitti API-tunnisteen',
     'api_token_update_notification' => 'API-tunniste päivitettiin onnistuneesti',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'poisti API-tunnisteen',
     'api_token_delete_notification' => 'API-tunniste poistettiin onnistuneesti',
 
     // Roles
diff --git a/lang/fi/common.php b/lang/fi/common.php
index 6a61f2bb867..b94b82aae1b 100644
--- a/lang/fi/common.php
+++ b/lang/fi/common.php
@@ -20,7 +20,7 @@
     'description' => 'Kuvaus',
     'role' => 'Rooli',
     'cover_image' => 'Kansikuva',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Kuvan tulee olla noin 440x250 pikselin kokoinen. Kuvan koko ja rajaus voi vaihdella käyttötilanteesta riippuen.',
 
     // Actions
     'actions' => 'Toiminnot',
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index fa5538c9e0a..34150e64781 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Taulukon ominaisuudet',
     'table_properties_title' => 'Taulukon ominaisuudet',
     'delete_table' => 'Poista taulukko',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Poista taulukon muotoilut',
+    'resize_to_contents' => 'Sovita koko sisältöön',
+    'row_header' => 'Rivin otsikko',
     'insert_row_before' => 'Lisää rivi ennen',
     'insert_row_after' => 'Lisää rivi jälkeen',
     'delete_row' => 'Poista rivi',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 3efb28f8a48..7acf5931a28 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Utilisateur supprimé avec succès',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'a créé un jeton API',
     'api_token_create_notification' => 'Jeton d\'API créé avec succès',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'a mis à jour un jeton API',
     'api_token_update_notification' => 'Jeton d\'API mis à jour avec succès',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'a supprimé un jeton API',
     'api_token_delete_notification' => 'Jeton d\'API supprimé avec succès',
 
     // Roles
diff --git a/lang/fr/common.php b/lang/fr/common.php
index 0651b4d440a..e8fb2e92784 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -20,7 +20,7 @@
     'description' => 'Description',
     'role' => 'Rôle',
     'cover_image' => 'Image de couverture',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Cette image doit faire environ 440x250px. Elle sera mise à l\'échelle et recadrée automatiquement pour s\'adapter à l\'interface utilisateur, si nécessaire, à différents emplacements.',
 
     // Actions
     'actions' => 'Actions',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 81f97fe75b4..558dda4c63d 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Propriétés du tableau',
     'table_properties_title' => 'Propriétés du tableau',
     'delete_table' => 'Supprimer le tableau',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Effacer toute la mise en forme',
+    'resize_to_contents' => 'Redimensionner au contenu',
+    'row_header' => 'En-tête de ligne',
     'insert_row_before' => 'Insérer une ligne avant',
     'insert_row_after' => 'Insérer une ligne après',
     'delete_row' => 'Supprimer ligne',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index f65cfc0d4cb..d6b054fe83e 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -39,9 +39,9 @@
     'export_pdf' => 'Fichier PDF',
     'export_text' => 'Document texte',
     'export_md' => 'Fichiers Markdown',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Modèle de page par défaut',
+    'default_template_explain' => 'Sélectionnez un modèle de page qui sera utilisé comme contenu par défaut pour les nouvelles pages créées dans cet élément. Gardez à l\'esprit que le modèle ne sera utilisé que si le créateur de la page a accès au modèle sélectionné.',
+    'default_template_select' => 'Sélectionnez un modèle de page',
 
     // Permissions and restrictions
     'permissions' => 'Autorisations',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Supprimer le brouillon',
     'pages_delete_success' => 'Page supprimée',
     'pages_delete_draft_success' => 'Brouillon supprimé',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Cette page actuellement utilisée comme modèle de page par défaut de livre ou de chapitre. Ces livres ou chapitres n\'auront plus de modèle de page par défaut assigné après la suppression de cette page.',
     'pages_delete_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer cette page ?',
     'pages_delete_draft_confirm' => 'Êtes-vous sûr(e) de vouloir supprimer ce brouillon ?',
     'pages_editing_named' => 'Modification de la page :pageName',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 0465a936cce..c71ef501d33 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Un utilisateur avec l\'adresse :email existe déjà.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Le compte utilisateur n\'a pas pu être enregistré avec les informations fournies',
     'email_already_confirmed' => 'Cet e-mail a déjà été validé, vous pouvez vous connecter.',
     'email_confirmation_invalid' => 'Cette confirmation est invalide. Veuillez essayer de vous inscrire à nouveau.',
     'email_confirmation_expired' => 'Le jeton de confirmation est périmé. Un nouvel e-mail vous a été envoyé.',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index e48eeeb3771..928fed4b351 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'La corbeille est vide',
     'recycle_bin_empty' => 'Vider la corbeille',
     'recycle_bin_empty_confirm' => 'Cela détruira définitivement tous les éléments de la corbeille, y compris le contenu de chaque élément. Êtes-vous sûr de vouloir vider la corbeille ?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Cette action supprimera définitivement cet élément du système ainsi que tous les éléments enfants listés ci-dessous et vous ne pourrez plus restaurer ce contenu. Êtes-vous sûr de vouloir supprimer définitivement cet élément ?',
     'recycle_bin_destroy_list' => 'Éléments à détruire',
     'recycle_bin_restore_list' => 'Éléments à restaurer',
     'recycle_bin_restore_confirm' => 'Cette action restaurera l\'élément supprimé, y compris tous les éléments enfants, à leur emplacement d\'origine. Si l\'emplacement d\'origine a été supprimé depuis et est maintenant dans la corbeille, l\'élément parent devra également être restauré.',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 7cf189d6ee8..22162796c0b 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => '表の詳細設定',
     'table_properties_title' => '表の詳細設定',
     'delete_table' => '表の削除',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => '表の書式をクリア',
+    'resize_to_contents' => '内容に合わせてリサイズ',
+    'row_header' => 'ヘッダー行',
     'insert_row_before' => '上側に行を挿入',
     'insert_row_after' => '下側に行を挿入',
     'delete_row' => '行の削除',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index 7ca14a1087f..a754f61c0c5 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':emailを持つユーザは既に存在しますが、資格情報が異なります。',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => '指定された内容によるユーザーアカウントの登録はできません。',
     'email_already_confirmed' => 'Eメールは既に確認済みです。ログインしてください。',
     'email_confirmation_invalid' => 'この確認トークンは無効か、または既に使用済みです。登録を再試行してください。',
     'email_confirmation_expired' => '確認トークンは有効期限切れです。確認メールを再送しました。',
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index c153ba06591..04ab09c8477 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -94,11 +94,11 @@
     'user_delete_notification' => 'Brukeren ble fjernet',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'opprettet API-nøkkel',
     'api_token_create_notification' => 'API-token er opprettet',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'oppdaterte API-nøkkel',
     'api_token_update_notification' => 'API-token oppdatert',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'slettet API-nøkkel',
     'api_token_delete_notification' => 'API-token ble slettet',
 
     // Roles
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 1e90386095d..64edee2f8c2 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beskrivelse',
     'role' => 'Rolle',
     'cover_image' => 'Forside',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Dette bildet bør være omtrent 440x250px selv om det vil bli fleksibelt skalert og beskjært slik at brukergrensesnittet passer til forskjellige scenarier ved behov. Dette betyr at de faktiske dimensjonene for visning varierer.',
 
     // Actions
     'actions' => 'Handlinger',
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index 3605f472530..759f1803625 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabellegenskaper',
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Slett tabell',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Fjern tabellformatering',
+    'resize_to_contents' => 'Endre størrelsen til innhold',
+    'row_header' => 'Radoverskrift',
     'insert_row_before' => 'Sett inn rad før',
     'insert_row_after' => 'Sett inn rad etter',
     'delete_row' => 'Slett rad',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 80cbd1f8e4a..1e776be800f 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En konto med :email finnes allerede, men har andre detaljer.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Brukerkonto kunne ikke bli registrert for de angitte opplysningene',
     'email_already_confirmed' => 'E-posten er allerede bekreftet, du kan forsøke å logge inn.',
     'email_confirmation_invalid' => 'Denne bekreftelseskoden er allerede benyttet eller utgått. Prøv å registrere på nytt.',
     'email_confirmation_expired' => 'Bekreftelseskoden er allerede utgått, en ny e-post er sendt.',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index 4942eddd108..f1f2adbe83a 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Papirkurven er for øyeblikket tom',
     'recycle_bin_empty' => 'Tøm papirkurven',
     'recycle_bin_empty_confirm' => 'Dette vil slette alle elementene i papirkurven permanent. Dette inkluderer innhold i hvert element. Er du sikker på at du vil tømme papirkurven?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Denne handlingen vil slette dette elementet permanent fra systemet, sammen med alle underelementer listet nedenfor, og du vil ikke kunne gjenopprette dette innholdet. Er du sikker på at du vil slette dette permanent?',
     'recycle_bin_destroy_list' => 'Elementer som skal slettes',
     'recycle_bin_restore_list' => 'Elementer som skal gjenopprettes',
     'recycle_bin_restore_confirm' => 'Denne handlingen vil hente opp elementet fra papirkurven, inkludert underliggende innhold, til sin opprinnelige sted. Om den opprinnelige plassen har blitt slettet i mellomtiden og nå befinner seg i papirkurven, vil også dette bli hentet opp igjen.',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index d5e23abd286..1223dcf34d4 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -66,9 +66,9 @@
     'auth_register' => 'registreerde als nieuwe gebruiker',
     'auth_password_reset_request' => 'vraagde een nieuw gebruikerswachtwoord aan',
     'auth_password_reset_update' => 'stelde gebruikerswachtwoord opnieuw in',
-    'mfa_setup_method' => 'stelde MFA-methode in',
+    'mfa_setup_method' => 'heeft zijn meervoudige verificatie methode ingesteld',
     'mfa_setup_method_notification' => 'Meervoudige verificatie methode succesvol geconfigureerd',
-    'mfa_remove_method' => 'verwijderde MFA-methode',
+    'mfa_remove_method' => 'heeft zijn meervoudige verificatie methode verwijderd',
     'mfa_remove_method_notification' => 'Meervoudige verificatie methode is succesvol verwijderd',
 
     // Settings
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Gebruiker succesvol verwijderd',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'API-token aangemaakt',
     'api_token_create_notification' => 'API-token met succes aangemaakt',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'geüpdatet API-token',
     'api_token_update_notification' => 'API-token met succes bijgewerkt',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'verwijderd API-token',
     'api_token_delete_notification' => 'API-token met succes verwijderd',
 
     // Roles
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index e0d6cfe0604..e81d31ccb4d 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -59,7 +59,7 @@
     'email_confirm_text' => 'Bevestig je e-mailadres door op onderstaande knop te drukken:',
     'email_confirm_action' => 'Bevestig je e-mail',
     'email_confirm_send_error' => 'Een e-mailbevestiging is vereist, maar het systeem kon de e-mail niet verzenden. Neem contact op met de beheerder.',
-    'email_confirm_success' => 'Uw e-mailadres is bevestigd! U moet nu kunnen inloggen met dit e-mailadres.',
+    'email_confirm_success' => 'Uw e-mailadres is bevestigd! U zou nu moeten kunnen inloggen met dit e-mailadres.',
     'email_confirm_resent' => 'Bevestigingsmail opnieuw verzonden, controleer je inbox.',
     'email_confirm_thanks' => 'Bedankt voor de bevestiging!',
     'email_confirm_thanks_desc' => 'Wacht even terwijl uw bevestiging wordt behandeld. Als u na 3 seconden niet wordt doorverwezen, drukt u op de onderstaande link "Doorgaan" om verder te gaan.',
@@ -78,7 +78,7 @@
     'user_invite_page_welcome' => 'Welkom bij :appName!',
     'user_invite_page_text' => 'Om je account af te ronden en toegang te krijgen moet je een wachtwoord instellen dat gebruikt wordt om in te loggen op :appName bij toekomstige bezoeken.',
     'user_invite_page_confirm_button' => 'Bevestig wachtwoord',
-    'user_invite_success_login' => 'Wachtwoord ingesteld, u moet nu kunnen inloggen met uw ingestelde wachtwoord en toegang krijgen tot :appName!',
+    'user_invite_success_login' => 'Wachtwoord ingesteld, u zou nu moeten kunnen inloggen met uw ingestelde wachtwoord om toegang te krijgen tot :appName!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'Multi-factor authenticatie instellen',
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 709e91887f9..210033298c0 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -20,7 +20,7 @@
     'description' => 'Beschrijving',
     'role' => 'Rol',
     'cover_image' => 'Omslagfoto',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Deze afbeelding moet ongeveer 440x250 pixels zijn, hoewel deze flexibel zal worden geschaald en bijgesneden naargelang dit nodig is in de verschillende scenario\'s van de gebruikersinterface. De daadwerkelijk gebruikte afmetingen voor weergave zullen dan verschillen.',
 
     // Actions
     'actions' => 'Acties',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index fae202903d4..4c20c8ea215 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabeleigenschappen',
     'table_properties_title' => 'Tabeleigenschappen',
     'delete_table' => 'Verwijder tabel',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Tabel opmaak wissen',
+    'resize_to_contents' => 'Formaat aanpassen naar inhoud',
+    'row_header' => 'Koptekst rij',
     'insert_row_before' => 'Rij boven invoegen',
     'insert_row_after' => 'Rij onder invoegen',
     'delete_row' => 'Rij verwijderen',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 9363deb89bc..8236a6a8e63 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -6,12 +6,12 @@
 return [
 
     // Shared
-    'recently_created' => 'Recent gemaakt',
-    'recently_created_pages' => 'Recent gemaakte pagina\'s',
+    'recently_created' => 'Recent Aangemaakt',
+    'recently_created_pages' => 'Recent Aangemaakte Pagina\'s',
     'recently_updated_pages' => 'Recent bijgewerkte pagina\'s',
-    'recently_created_chapters' => 'Recent gemaakte hoofdstukken',
-    'recently_created_books' => 'Recent gemaakte boeken',
-    'recently_created_shelves' => 'Recent gemaakte boekenplanken',
+    'recently_created_chapters' => 'Recent Aangemaakte Hoofdstukken',
+    'recently_created_books' => 'Recent Aangemaakte Boeken',
+    'recently_created_shelves' => 'Recent Aangemaakte Boekenplanken',
     'recently_update' => 'Recent bijgewerkt',
     'recently_viewed' => 'Recent bekeken',
     'recent_activity' => 'Recente activiteit',
@@ -39,15 +39,15 @@
     'export_pdf' => 'PDF bestand',
     'export_text' => 'Normaal tekstbestand',
     'export_md' => 'Markdown bestand',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Standaard Paginasjabloon',
+    'default_template_explain' => 'Ken een paginasjabloon toe die zal worden gebruikt als de standaardinhoud voor alle pagina\'s die binnen dit item worden aangemaakt. Houd er rekening mee dat dit alleen zal worden gebruikt als de paginamaker leesrechten heeft voor de gekozen sjabloonpagina.',
+    'default_template_select' => 'Selecteer een sjabloonpagina',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
     'permissions_desc' => 'Stel hier machtigingen in om de standaardmachtigingen van gebruikersrollen te overschrijven.',
-    'permissions_book_cascade' => 'Machtigingen voor boeken worden automatisch doorgegeven aan hoofdstukken en pagina\'s, behalve als deze hun eigen machtigingen hebben.',
-    'permissions_chapter_cascade' => 'Machtigingen ingesteld op hoofdstukken zullen automatisch worden doorgegeven aan onderliggende pagina\'s, behalve als deze hun eigen machtigingen hebben.',
+    'permissions_book_cascade' => 'Machtigingen voor boeken worden automatisch doorgegeven aan hoofdstukken en pagina\'s, tenzij deze hun eigen machtigingen hebben.',
+    'permissions_chapter_cascade' => 'Machtigingen ingesteld op hoofdstukken zullen automatisch worden doorgegeven aan onderliggende pagina\'s, tenzij deze hun eigen machtigingen hebben.',
     'permissions_save' => 'Machtigingen opslaan',
     'permissions_owner' => 'Eigenaar',
     'permissions_role_everyone_else' => 'De rest',
@@ -109,7 +109,7 @@
     'shelves_permissions_updated' => 'Boekenplank Machtigingen Bijgewerkt',
     'shelves_permissions_active' => 'Machtigingen op Boekenplank Actief',
     'shelves_permissions_cascade_warning' => 'De ingestelde machtigingen op deze boekenplank worden niet automatisch toegepast op de boeken van deze boekenplank. Dit is omdat een boek toegekend kan worden op meerdere boekenplanken. De machtigingen van deze boekenplank kunnen echter wel gekopieerd worden naar de boeken van deze boekenplank via de optie hieronder.',
-    'shelves_permissions_create' => '\'Maak boekenplank\' machtigingen worden enkel gebruikt om machtigingen te kopiëren naar boeken binnenin een boekenplank door gebruik te maken van onderstaande actie. Deze machtigingen beheren het maken van boeken niet.',
+    'shelves_permissions_create' => '\'Maak boekenplank\' machtigingen worden enkel gebruikt om machtigingen te kopiëren naar boeken binnenin een boekenplank door gebruik te maken van onderstaande actie. Deze machtigingen laten niet toe om een nieuw boek aan te maken.',
     'shelves_copy_permissions_to_books' => 'Kopieer Machtigingen naar Boeken',
     'shelves_copy_permissions' => 'Kopieer Machtigingen',
     'shelves_copy_permissions_explain' => 'Met deze actie worden de machtigingen van deze boekenplank gekopieerd naar alle boeken van deze boekenplank. Voor je deze actie uitvoert, moet je ervoor zorgen dat alle wijzigingen in de machtigingen van deze boekenplank zijn opgeslagen.',
@@ -119,7 +119,7 @@
     'book' => 'Boek',
     'books' => 'Boeken',
     'x_books' => ':count Boek|:count Boeken',
-    'books_empty' => 'Geen boeken gemaakt',
+    'books_empty' => 'Er zijn geen boeken aangemaakt',
     'books_popular' => 'Populaire boeken',
     'books_recent' => 'Recente boeken',
     'books_new' => 'Nieuwe boeken',
@@ -145,7 +145,7 @@
     'books_search_this' => 'Zoeken in dit boek',
     'books_navigation' => 'Boek navigatie',
     'books_sort' => 'Inhoud van het boek sorteren',
-    'books_sort_desc' => 'Verplaats hoofdstukken en pagina\'s binnen een boek om ze te organiseren. Andere boeken kunnen worden toegevoegd, zodat hoofdstukken en pagina\'s gemakkelijk tussen boeken kunnen worden verplaatst.',
+    'books_sort_desc' => 'Verplaats hoofdstukken en pagina\'s binnen een boek om de inhoud te reorganiseren. Andere boeken kunnen worden toegevoegd, waardoor het eenvoudig wordt om hoofdstukken en pagina\'s tussen boeken te verplaatsen.',
     'books_sort_named' => 'Sorteer boek :bookName',
     'books_sort_name' => 'Sorteren op naam',
     'books_sort_created' => 'Sorteren op datum van aanmaken',
@@ -187,7 +187,7 @@
     'chapters_copy' => 'Kopieer Hoofdstuk',
     'chapters_copy_success' => 'Hoofdstuk succesvol gekopieerd',
     'chapters_permissions' => 'Hoofdstuk Machtigingen',
-    'chapters_empty' => 'Dit hoofdstuk heeft op dit moment geen pagina\'s.',
+    'chapters_empty' => 'Er zijn geen pagina\'s in dit hoofdstuk aangemaakt.',
     'chapters_permissions_active' => 'Hoofdstuk Machtigingen Actief',
     'chapters_permissions_success' => 'Hoofdstuk Machtigingen Bijgewerkt',
     'chapters_search_this' => 'Zoek in dit hoofdstuk',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Verwijder concept pagina',
     'pages_delete_success' => 'Pagina verwijderd',
     'pages_delete_draft_success' => 'Concept verwijderd',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Deze pagina wordt actief gebruikt als standaardsjabloon voor een boek of hoofdstuk. Nadat deze pagina is verwijderd, zullen deze boeken of hoofdstukken geen standaardsjabloon meer toegewezen hebben.',
     'pages_delete_confirm' => 'Weet je zeker dat je deze pagina wilt verwijderen?',
     'pages_delete_draft_confirm' => 'Weet je zeker dat je dit concept wilt verwijderen?',
     'pages_editing_named' => 'Pagina :pageName aan het bewerken',
@@ -231,8 +231,8 @@
     'pages_editor_switch_are_you_sure' => 'Weet u zeker dat u de bewerker voor deze pagina wilt wijzigen?',
     'pages_editor_switch_consider_following' => 'Houd rekening met het volgende als u van bewerker verandert:',
     'pages_editor_switch_consideration_a' => 'Eenmaal opgeslagen, zal de nieuwe bewerker keuze gebruikt worden door alle toekomstige gebruikers, ook diegene die zelf niet van bewerker type kunnen veranderen.',
-    'pages_editor_switch_consideration_b' => 'Dit kan mogelijk tot een verlies van detail en syntaxis leiden in bepaalde omstandigheden.',
-    'pages_editor_switch_consideration_c' => 'De veranderingen aan Labels of aan het logboek, sinds de laatste keer opslaan, zullen niet behouden blijven met deze wijziging.',
+    'pages_editor_switch_consideration_b' => 'Dit kan mogelijks tot een verlies van detail en syntax leiden in bepaalde omstandigheden.',
+    'pages_editor_switch_consideration_c' => 'De veranderingen aan Labels of aan het wijzigingslogboek, sinds de laatste keer opslaan, zullen niet behouden blijven met deze wijziging.',
     'pages_save' => 'Pagina opslaan',
     'pages_title' => 'Pagina titel',
     'pages_name' => 'Pagina naam',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Verwijzingen',
     'references_none' => 'Er zijn geen verwijzingen naar dit item bijgehouden.',
-    'references_to_desc' => 'Hieronder is alle inhoud in het systeem dat naar dit item linkt vermeld.',
+    'references_to_desc' => 'Hieronder staat alle bekende inhoud in het systeem die gekoppeld is aan dit item.',
 
     // Watch Options
     'watch' => 'Volg',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 659c9a1a4b6..ba39e0a697c 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Er bestaat al een gebruiker met het e-mailadres :email, maar met andere inloggegevens.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Het gebruikersaccount kon niet worden geregistreerd met de opgegeven informatie',
     'email_already_confirmed' => 'Het e-mailadres is al bevestigd, probeer in te loggen.',
     'email_confirmation_invalid' => 'Deze bevestigingstoken is niet geldig of al gebruikt, probeer opnieuw te registreren.',
     'email_confirmation_expired' => 'Het bevestigingstoken is verlopen, Er is een nieuwe bevestigingsmail verzonden.',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 779501d9039..340d1d899d9 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'De prullenbak is momenteel leeg',
     'recycle_bin_empty' => 'Prullenbak legen',
     'recycle_bin_empty_confirm' => 'Dit zal permanent alle items in de prullenbak vernietigen, inclusief de inhoud die in elk item zit. Weet u zeker dat u de prullenbak wilt legen?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Deze actie zal dit item permanent verwijderen uit het systeem, samen met onderstaande onderliggende elementen, en u zal deze inhoud niet kunnen herstellen. Bent u zeker dat u dit item permanent wilt verwijderen?',
     'recycle_bin_destroy_list' => 'Te vernietigen items',
     'recycle_bin_restore_list' => 'Items te herstellen',
     'recycle_bin_restore_confirm' => 'Deze actie herstelt het verwijderde item, inclusief alle onderliggende elementen, op hun oorspronkelijke locatie. Als de oorspronkelijke locatie sindsdien is verwijderd en zich nu in de prullenbak bevindt, zal ook het bovenliggende item moeten worden hersteld.',
diff --git a/lang/sr/activities.php b/lang/sr/activities.php
index 0313555c205..4077c07454d 100644
--- a/lang/sr/activities.php
+++ b/lang/sr/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Корисник је успешно уклоњен',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'креирао апи токен',
     'api_token_create_notification' => 'АПИ токен је успешно креиран',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'ажуриран апи токен',
     'api_token_update_notification' => 'АПИ токен је успешно ажуриран',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'обрисан апи токен',
     'api_token_delete_notification' => 'АПИ токен је успешно избрисан',
 
     // Roles
diff --git a/lang/sr/auth.php b/lang/sr/auth.php
index 6b80496c4d8..aae292a3073 100644
--- a/lang/sr/auth.php
+++ b/lang/sr/auth.php
@@ -94,24 +94,24 @@
     'mfa_option_backup_codes_desc' => 'Безбедно чувајте скуп резервних кодова за једнократну употребу које можете да унесете да бисте потврдили свој идентитет.',
     'mfa_gen_confirm_and_enable' => 'Потврдите и омогућите',
     'mfa_gen_backup_codes_title' => 'Подешавање резервних кодова',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_desc' => 'Чувајте доњу листу кодова на безбедном месту. Када приступате систему, моћи ћете да користите један од кодова као други механизам за аутентификацију.',
     'mfa_gen_backup_codes_download' => 'Преузми кодове',
     'mfa_gen_backup_codes_usage_warning' => 'Сваки код се може искористити једном',
     'mfa_gen_totp_title' => 'Подешавање мобилне апликације',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_desc' => 'Да бисте користили вишефакторску аутентификацију, биће вам потребна мобилна апликација која подржава ТОТП, као што је Google Authenticator, Authy или Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Скенирајте QR код у наставку помоћу жељене апликације за аутентификацију да бисте започели.',
     'mfa_gen_totp_verify_setup' => 'Верификуј подешавања',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_gen_totp_verify_setup_desc' => 'Проверите да ли све функционише тако што ћете унети код, генерисан у вашој апликацији за потврду идентитета, у поље за унос испод:',
+    'mfa_gen_totp_provide_code_here' => 'Овде унесите код који је генерисао апликација',
     'mfa_verify_access' => 'Верификуј приступ',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_access_desc' => 'Ваш кориснички налог захтева да потврдите свој идентитет путем додатног нивоа верификације пре него што вам се одобри приступ. Потврдите коришћењем једног од конфигурисаних метода да бисте наставили.',
     'mfa_verify_no_methods' => 'Методе нису конфигурисане',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_no_methods_desc' => 'Нису пронађене методе вишефакторске аутентификације за ваш налог. Мораћете да подесите најмање један метод пре него што добијете приступ.',
     'mfa_verify_use_totp' => 'Верификација путем мобилне апликације',
-    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
+    'mfa_verify_use_backup_codes' => 'Проверите помоћу резервног кода',
     'mfa_verify_backup_code' => 'Резервни код',
-    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_desc' => 'Унесите један од преосталих резервних кодова у наставку:',
     'mfa_verify_backup_code_enter_here' => 'Унеси резервни код овде',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_verify_totp_desc' => 'Унесите код, генерисан помоћу ваше мобилне апликације, у наставку:',
+    'mfa_setup_login_notification' => 'Вишефакторска метода је конфигурисана, сада се поново пријавите користећи конфигурисани метод.',
 ];
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index 8b73645e121..ad670af981e 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -28,80 +28,80 @@
 
     // Toolbar
     'formats' => 'Формати',
-    'header_large' => 'Large Header',
-    'header_medium' => 'Medium Header',
-    'header_small' => 'Small Header',
-    'header_tiny' => 'Tiny Header',
+    'header_large' => 'Велико заглавље',
+    'header_medium' => 'Средње заглавље',
+    'header_small' => 'Мало заглавље',
+    'header_tiny' => 'Малено заглавље',
     'paragraph' => 'Параграф',
-    'blockquote' => 'Blockquote',
-    'inline_code' => 'Inline code',
-    'callouts' => 'Callouts',
+    'blockquote' => 'Цитат',
+    'inline_code' => 'Уграђени код',
+    'callouts' => 'Облачићи',
     'callout_information' => 'Информација',
     'callout_success' => 'Успешно',
     'callout_warning' => 'Упозорење',
     'callout_danger' => 'Опасност',
-    'bold' => 'Bold',
-    'italic' => 'Italic',
-    'underline' => 'Underline',
-    'strikethrough' => 'Strikethrough',
-    'superscript' => 'Superscript',
-    'subscript' => 'Subscript',
-    'text_color' => 'Text color',
-    'custom_color' => 'Custom color',
-    'remove_color' => 'Remove color',
-    'background_color' => 'Background color',
+    'bold' => 'Подебљано',
+    'italic' => 'Курзив',
+    'underline' => 'Подвучено',
+    'strikethrough' => 'Прецртано',
+    'superscript' => 'Надскрипт',
+    'subscript' => 'Субкрипт',
+    'text_color' => 'Боја текста',
+    'custom_color' => 'Боја текста',
+    'remove_color' => 'Уклоните боју',
+    'background_color' => 'Боја позадине',
     'align_left' => 'Поравнај лево',
     'align_center' => 'Поравнај по средини',
     'align_right' => 'Поравнај деcно',
-    'align_justify' => 'Justify',
+    'align_justify' => 'Поравнај',
     'list_bullet' => 'Листа ставки',
     'list_numbered' => 'Нумерисана листа',
     'list_task' => 'Листа задатака',
     'indent_increase' => 'Повећај увлачење',
     'indent_decrease' => 'Умањи увлачење',
-    'table' => 'Table',
-    'insert_image' => 'Insert image',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Insert code block',
-    'edit_code_block' => 'Edit code block',
-    'insert_drawing' => 'Insert/edit drawing',
-    'drawing_manager' => 'Drawing manager',
-    'insert_media' => 'Insert/edit media',
-    'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'table' => 'Tabela',
+    'insert_image' => 'Уметни слику',
+    'insert_image_title' => 'Убаци/уреди слику',
+    'insert_link' => 'Убаци/измени везу',
+    'insert_link_title' => 'Убаци/измени везу',
+    'insert_horizontal_line' => 'Уметни водоравну линију',
+    'insert_code_block' => 'Убаците блок кода',
+    'edit_code_block' => 'Уредите блок кода',
+    'insert_drawing' => 'Уметните/уредите цртеж',
+    'drawing_manager' => 'Менаџер цртежа',
+    'insert_media' => 'Убаците/уредите медиј',
+    'insert_media_title' => 'Уметање/уређивање медија',
+    'clear_formatting' => 'Обриши форматирање',
+    'source_code' => 'Изворни код',
+    'source_code_title' => 'Изворни код',
+    'fullscreen' => 'Преко целог екрана',
+    'image_options' => 'Подешавање слика',
 
     // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
+    'table_properties' => 'Својства табеле',
+    'table_properties_title' => 'Својства табеле',
+    'delete_table' => 'Обриши табелу',
+    'table_clear_formatting' => 'Обриши форматирање табеле',
+    'resize_to_contents' => 'Промени величину садржају',
+    'row_header' => 'Заглавље реда',
+    'insert_row_before' => 'Уметни ред испред',
+    'insert_row_after' => 'Уметните ред после',
+    'delete_row' => 'Обриши ред',
+    'insert_column_before' => 'Уметни колону испред',
+    'insert_column_after' => 'Уметни колону после',
+    'delete_column' => 'Обриши колону',
     'table_cell' => 'Ћелија',
     'table_row' => 'Ред',
     'table_column' => 'Колона',
     'cell_properties' => 'Својства ћелије',
-    'cell_properties_title' => 'Cell Properties',
+    'cell_properties_title' => 'Својства ћелије',
     'cell_type' => 'Тип ћелије',
     'cell_type_cell' => 'Ћелија',
     'cell_scope' => 'Обим',
-    'cell_type_header' => 'Header cell',
+    'cell_type_header' => 'Заглавље ћелије',
     'merge_cells' => 'Обједини ћелије',
     'split_cell' => 'Подели ћелију',
-    'table_row_group' => 'Row Group',
+    'table_row_group' => 'Група редова',
     'table_column_group' => 'Column Group',
     'horizontal_align' => 'Horizontal align',
     'vertical_align' => 'Vertical align',
@@ -154,18 +154,18 @@
     'remove_link' => 'Remove link',
     'insert_collapsible' => 'Insert collapsible block',
     'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'edit_label' => 'Уреди ознаку',
+    'toggle_open_closed' => 'Отварање/затварање',
+    'collapsible_edit' => 'Уредите склопиви блок',
+    'toggle_label' => 'Укључите ознаку',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
+    'about' => 'О уређивачу',
+    'about_title' => 'О уређивачу WYSIWYG',
+    'editor_license' => 'Уредничка лиценца и ауторска права',
+    'editor_tiny_license' => 'Овај уређивач је направљен помоћу :tinyLink који је обезбеђен под МИТ лиценцом.',
+    'editor_tiny_license_link' => 'Детаље о ауторским правима и лиценци за ТиниМЦЕ можете пронаћи овде.',
+    'save_continue' => 'Сачувај страницу и настави',
     'callouts_cycle' => '(Keep pressing to toggle through types)',
     'link_selector' => 'Link to content',
     'shortcuts' => 'Shortcuts',

From 0d3de4045921676ffd35dbada4f9180ad2396874 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 10 Mar 2024 18:45:32 +0000
Subject: [PATCH 064/666] Updated translator attribution before release
 v24.02.1

---
 .github/translators.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index 991ac633c4d..f44042cd582 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -406,3 +406,7 @@ Jan Picka (polipones) :: Czech
 diogoalex991 :: Portuguese
 Ehsan Sadeghi (ehsansadeghi) :: Persian
 ka_picit :: Danish
+cracrayol :: French
+CapuaSC :: Dutch
+Guardian75 :: German Informal
+mr-kanister :: German

From 2ed931aeed9c6d633c391fff01637e68e35b75a2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 12 Mar 2024 11:29:51 +0000
Subject: [PATCH 065/666] Updated minimum PHP version from 8.0 to 8.1

For #4893
---
 .github/workflows/test-migrations.yml |   2 +-
 .github/workflows/test-php.yml        |   2 +-
 composer.json                         |   4 +-
 composer.lock                         | 952 +++++++++++++-------------
 phpstan.neon.dist                     |   2 +-
 5 files changed, 478 insertions(+), 484 deletions(-)

diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 63f52a29506..9b13787f7ae 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3']
     steps:
       - uses: actions/checkout@v1
 
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 89ebf0deceb..53087a82fc7 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v1
 
diff --git a/composer.json b/composer.json
index 85bb3cbaebd..74fbcf8f228 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -99,7 +99,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.0.2"
+            "php": "8.1.0"
         }
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index e1033b5b26a..1b58e55ac19 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7c64775f79832d552a2ef40e11f79c40",
+    "content-hash": "54d735153e12b120d9dd41ab847e3032",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.300.6",
+            "version": "3.300.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3"
+                "reference": "0cd194438b84588615121a93d0bc46bf55ca678b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/957ccef631684d612d01ced2fa3b0506f2ec78c3",
-                "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0cd194438b84588615121a93d0bc46bf55ca678b",
+                "reference": "0cd194438b84588615121a93d0bc46bf55ca678b",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.15"
             },
-            "time": "2024-02-27T19:05:27+00:00"
+            "time": "2024-03-11T18:33:13+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -211,27 +211,27 @@
         },
         {
             "name": "barryvdh/laravel-dompdf",
-            "version": "v2.0.1",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6"
+                "reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/9843d2be423670fb434f4c978b3c0f4dd92c87a6",
-                "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/c8b8a8490e5f7348cf99054821fb248f103e7d24",
+                "reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24",
                 "shasum": ""
             },
             "require": {
-                "dompdf/dompdf": "^2.0.1",
-                "illuminate/support": "^6|^7|^8|^9|^10",
+                "dompdf/dompdf": "^2.0.3",
+                "illuminate/support": "^6|^7|^8|^9|^10|^11",
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "nunomaduro/larastan": "^1|^2",
-                "orchestra/testbench": "^4|^5|^6|^7|^8",
-                "phpro/grumphp": "^1",
+                "larastan/larastan": "^1.0|^2.7.0",
+                "orchestra/testbench": "^4|^5|^6|^7|^8|^9",
+                "phpro/grumphp": "^1 || ^2.5",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
@@ -272,7 +272,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
-                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.1"
+                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.0"
             },
             "funding": [
                 {
@@ -284,30 +284,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-12T15:12:49+00:00"
+            "time": "2024-03-04T08:18:20+00:00"
         },
         {
             "name": "barryvdh/laravel-snappy",
-            "version": "v1.0.2",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-snappy.git",
-                "reference": "940eec2d99b89cbc9bea2f493cf068382962a485"
+                "reference": "716dcb6db24de4ce8e6ae5941cfab152af337ea0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/940eec2d99b89cbc9bea2f493cf068382962a485",
-                "reference": "940eec2d99b89cbc9bea2f493cf068382962a485",
+                "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/716dcb6db24de4ce8e6ae5941cfab152af337ea0",
+                "reference": "716dcb6db24de4ce8e6ae5941cfab152af337ea0",
                 "shasum": ""
             },
             "require": {
-                "illuminate/filesystem": "^9|^10",
-                "illuminate/support": "^9|^10",
-                "knplabs/knp-snappy": "^1.4",
+                "illuminate/filesystem": "^9|^10|^11.0",
+                "illuminate/support": "^9|^10|^11.0",
+                "knplabs/knp-snappy": "^1.4.4",
                 "php": ">=7.2"
             },
             "require-dev": {
-                "orchestra/testbench": "^7|^8"
+                "orchestra/testbench": "^7|^8|^9.0"
             },
             "type": "library",
             "extra": {
@@ -350,7 +350,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-snappy/issues",
-                "source": "https://github.com/barryvdh/laravel-snappy/tree/v1.0.2"
+                "source": "https://github.com/barryvdh/laravel-snappy/tree/v1.0.3"
             },
             "funding": [
                 {
@@ -362,7 +362,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-07T10:38:54+00:00"
+            "time": "2024-03-09T19:20:39+00:00"
         },
         {
             "name": "brick/math",
@@ -708,16 +708,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.2",
+            "version": "3.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "a19a1d05ca211f41089dffcc387733a6875196cb"
+                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb",
-                "reference": "a19a1d05ca211f41089dffcc387733a6875196cb",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c",
+                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c",
                 "shasum": ""
             },
             "require": {
@@ -733,12 +733,12 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.57",
+                "phpstan/phpstan": "1.10.58",
                 "phpstan/phpstan-strict-rules": "^1.5",
                 "phpunit/phpunit": "9.6.16",
                 "psalm/plugin-phpunit": "0.18.4",
                 "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.8.1",
+                "squizlabs/php_codesniffer": "3.9.0",
                 "symfony/cache": "^5.4|^6.0|^7.0",
                 "symfony/console": "^4.4|^5.4|^6.0|^7.0",
                 "vimeo/psalm": "4.30.0"
@@ -801,7 +801,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.2"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.3"
             },
             "funding": [
                 {
@@ -817,7 +817,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-12T18:36:36+00:00"
+            "time": "2024-03-03T15:55:06+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -868,30 +868,29 @@
         },
         {
             "name": "doctrine/event-manager",
-            "version": "1.2.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520"
+                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520",
-                "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^0.5.3 || ^1",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "conflict": {
                 "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^10",
-                "phpstan/phpstan": "~1.4.10 || ^1.8.8",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.24"
+                "doctrine/coding-standard": "^10",
+                "phpstan/phpstan": "^1.8.8",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^4.28"
             },
             "type": "library",
             "autoload": {
@@ -940,7 +939,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/1.2.0"
+                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
             },
             "funding": [
                 {
@@ -956,7 +955,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-12T20:51:15+00:00"
+            "time": "2022-10-12T20:59:15+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1051,28 +1050,27 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "2.1.1",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
-                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^1.0",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^12",
-                "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.5",
                 "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^4.11 || ^5.21"
+                "vimeo/psalm": "^5.21"
             },
             "type": "library",
             "autoload": {
@@ -1109,7 +1107,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/2.1.1"
+                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
             },
             "funding": [
                 {
@@ -1125,7 +1123,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-05T11:35:39+00:00"
+            "time": "2024-02-05T11:56:58+00:00"
         },
         {
             "name": "dompdf/dompdf",
@@ -1252,26 +1250,26 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "3.2.6",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
-                "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "^1.2|^2",
-                "php": ">=7.2",
-                "symfony/polyfill-intl-idn": "^1.15"
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "php": ">=8.1",
+                "symfony/polyfill-intl-idn": "^1.26"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.8|^9.3.3",
-                "vimeo/psalm": "^4"
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -1279,7 +1277,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "autoload": {
@@ -1307,7 +1305,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/3.2.6"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
             },
             "funding": [
                 {
@@ -1315,7 +1313,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-01T07:04:22+00:00"
+            "time": "2023-10-06T06:47:41+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1947,36 +1945,29 @@
         },
         {
             "name": "knplabs/knp-snappy",
-            "version": "v1.4.4",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
-                "reference": "3db13fe45d12a7bccb2b83f622e5a90f7e40b111"
+                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/3db13fe45d12a7bccb2b83f622e5a90f7e40b111",
-                "reference": "3db13fe45d12a7bccb2b83f622e5a90f7e40b111",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/98468898b50c09f26d56d905b79b0f52a2215da6",
+                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "psr/log": "^1.0||^2.0||^3.0",
-                "symfony/process": "~3.4||~4.3||~5.0||~6.0"
+                "php": ">=8.1",
+                "psr/log": "^2.0||^3.0",
+                "symfony/process": "^5.0||^6.0||^7.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.16||^3.0",
+                "friendsofphp/php-cs-fixer": "^3.0",
                 "pedrotroller/php-cs-custom-fixer": "^2.19",
                 "phpstan/phpstan": "^1.0.0",
                 "phpstan/phpstan-phpunit": "^1.0.0",
-                "phpunit/phpunit": "~7.4||~8.5"
-            },
-            "suggest": {
-                "h4cc/wkhtmltoimage-amd64": "Provides wkhtmltoimage-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency",
-                "h4cc/wkhtmltoimage-i386": "Provides wkhtmltoimage-i386 binary for Linux-compatible machines, use version `~0.12` as dependency",
-                "h4cc/wkhtmltopdf-amd64": "Provides wkhtmltopdf-amd64 binary for Linux-compatible machines, use version `~0.12` as dependency",
-                "h4cc/wkhtmltopdf-i386": "Provides wkhtmltopdf-i386 binary for Linux-compatible machines, use version `~0.12` as dependency",
-                "wemersonjanuario/wkhtmltopdf-windows": "Provides wkhtmltopdf executable for Windows, use version `~0.12` as dependency"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -2015,9 +2006,9 @@
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/snappy/issues",
-                "source": "https://github.com/KnpLabs/snappy/tree/v1.4.4"
+                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.0"
             },
-            "time": "2023-09-13T12:18:19+00:00"
+            "time": "2023-12-18T09:12:11+00:00"
         },
         {
             "name": "laravel/framework",
@@ -2603,16 +2594,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.24.0",
+            "version": "3.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "b25a361508c407563b34fac6f64a8a17a8819675"
+                "reference": "4c44347133618cccd9b3df1729647a1577b4ad99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675",
-                "reference": "b25a361508c407563b34fac6f64a8a17a8819675",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4c44347133618cccd9b3df1729647a1577b4ad99",
+                "reference": "4c44347133618cccd9b3df1729647a1577b4ad99",
                 "shasum": ""
             },
             "require": {
@@ -2640,7 +2631,7 @@
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
                 "microsoft/azure-storage-blob": "^1.1",
-                "phpseclib/phpseclib": "^3.0.34",
+                "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
                 "sabre/dav": "^4.6.0"
@@ -2677,7 +2668,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.24.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.25.0"
             },
             "funding": [
                 {
@@ -2689,7 +2680,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-04T12:10:17+00:00"
+            "time": "2024-03-09T17:06:45+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -3451,31 +3442,31 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.2.5",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a"
+                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a",
-                "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a",
+                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
                 "shasum": ""
             },
             "require": {
-                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
-                "php": "7.1 - 8.3"
+                "nette/utils": "^4.0",
+                "php": "8.1 - 8.3"
             },
             "require-dev": {
-                "nette/tester": "^2.3 || ^2.4",
+                "nette/tester": "^2.4",
                 "phpstan/phpstan-nette": "^1.0",
-                "tracy/tracy": "^2.7"
+                "tracy/tracy": "^2.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -3507,9 +3498,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.2.5"
+                "source": "https://github.com/nette/schema/tree/v1.3.0"
             },
-            "time": "2023-10-05T20:37:59+00:00"
+            "time": "2023-12-11T11:54:22+00:00"
         },
         {
             "name": "nette/utils",
@@ -3599,16 +3590,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.1",
+            "version": "v5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69"
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
                 "shasum": ""
             },
             "require": {
@@ -3651,9 +3642,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
             },
-            "time": "2024-02-21T19:24:10+00:00"
+            "time": "2024-03-05T20:51:40+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -4081,16 +4072,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.36",
+            "version": "3.0.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b"
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b",
-                "reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
                 "shasum": ""
             },
             "require": {
@@ -4171,7 +4162,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.36"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37"
             },
             "funding": [
                 {
@@ -4187,7 +4178,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-26T05:13:14+00:00"
+            "time": "2024-03-03T02:14:58+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -4888,21 +4879,20 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "1.3.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4"
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4",
-                "reference": "ad7475d1c9e70b190ecffc58f2d989416af339b4",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0",
-                "symfony/polyfill-php81": "^1.23"
+                "php": "^8.1"
             },
             "require-dev": {
                 "captainhook/plugin-composer": "^5.3",
@@ -4962,7 +4952,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/1.3.0"
+                "source": "https://github.com/ramsey/collection/tree/2.0.0"
             },
             "funding": [
                 {
@@ -4974,7 +4964,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-27T19:12:24+00:00"
+            "time": "2022-12-31T21:50:55+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -5605,23 +5595,24 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed"
+                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c3ebc83d031b71c39da318ca8b7a07ecc67507ed",
-                "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
+                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<5.4",
@@ -5635,18 +5626,16 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5675,12 +5664,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.0.19"
+                "source": "https://github.com/symfony/console/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -5696,24 +5685,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-22T20:27:10+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.0.19",
+            "version": "v6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f1d00bddb83a4cb2138564b2150001cb6ce272b1"
+                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f1d00bddb83a4cb2138564b2150001cb6ce272b1",
-                "reference": "f1d00bddb83a4cb2138564b2150001cb6ce272b1",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
+                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -5745,7 +5734,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.0.19"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.3"
             },
             "funding": [
                 {
@@ -5761,29 +5750,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.2",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
-                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5812,7 +5801,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -5828,31 +5817,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c7df52182f43a68522756ac31a532dd5b1e6db67"
+                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c7df52182f43a68522756ac31a532dd5b1e6db67",
-                "reference": "c7df52182f43a68522756ac31a532dd5b1e6db67",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a",
+                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/deprecation-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/serializer": "^5.4|^6.0"
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/serializer": "^5.4|^6.0|^7.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -5883,7 +5876,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.0.19"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -5899,28 +5892,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-22T20:27:10+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.0.19",
+            "version": "v6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "2eaf8e63bc5b8cefabd4a800157f0d0c094f677a"
+                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2eaf8e63bc5b8cefabd4a800157f0d0c094f677a",
-                "reference": "2eaf8e63bc5b8cefabd4a800157f0d0c094f677a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
+                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/event-dispatcher-contracts": "^2|^3"
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
@@ -5928,17 +5922,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5966,7 +5956,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.0.19"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3"
             },
             "funding": [
                 {
@@ -5982,33 +5972,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.2",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
-                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6045,7 +6032,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -6061,24 +6048,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.0.19",
+            "version": "v6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "5cc9cac6586fc0c28cd173780ca696e419fefa11"
+                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/5cc9cac6586fc0c28cd173780ca696e419fefa11",
-                "reference": "5cc9cac6586fc0c28cd173780ca696e419fefa11",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
+                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6106,7 +6096,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.0.19"
+                "source": "https://github.com/symfony/finder/tree/v6.4.0"
             },
             "funding": [
                 {
@@ -6122,38 +6112,40 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:44:14+00:00"
+            "time": "2023-10-31T17:30:12+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.0.20",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e16b2676a4b3b1fa12378a20b29c364feda2a8d6"
+                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e16b2676a4b3b1fa12378a20b29c364feda2a8d6",
-                "reference": "e16b2676a4b3b1fa12378a20b29c364feda2a8d6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304",
+                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-mbstring": "~1.1"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php83": "^1.27"
             },
-            "require-dev": {
-                "predis/predis": "~1.0",
-                "symfony/cache": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
-                "symfony/mime": "^5.4|^6.0",
-                "symfony/rate-limiter": "^5.2|^6.0"
+            "conflict": {
+                "symfony/cache": "<6.3"
             },
-            "suggest": {
-                "symfony/mime": "To use the file extension guesser"
+            "require-dev": {
+                "doctrine/dbal": "^2.13.1|^3|^4",
+                "predis/predis": "^1.1|^2.0",
+                "symfony/cache": "^6.3|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
+                "symfony/mime": "^5.4|^6.0|^7.0",
+                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6181,7 +6173,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.0.20"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -6197,44 +6189,48 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-30T15:41:07+00:00"
+            "time": "2024-02-08T15:01:18+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.0.20",
+            "version": "v6.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6dc70833fd0ef5e861e17c7854c12d7d86679349"
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6dc70833fd0ef5e861e17c7854c12d7d86679349",
-                "reference": "6dc70833fd0ef5e861e17c7854c12d7d86679349",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "symfony/browser-kit": "<5.4",
                 "symfony/cache": "<5.4",
-                "symfony/config": "<5.4",
+                "symfony/config": "<6.1",
                 "symfony/console": "<5.4",
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/doctrine-bridge": "<5.4",
                 "symfony/form": "<5.4",
                 "symfony/http-client": "<5.4",
+                "symfony/http-client-contracts": "<2.5",
                 "symfony/mailer": "<5.4",
                 "symfony/messenger": "<5.4",
                 "symfony/translation": "<5.4",
+                "symfony/translation-contracts": "<2.5",
                 "symfony/twig-bridge": "<5.4",
-                "symfony/validator": "<5.4",
+                "symfony/validator": "<6.4",
+                "symfony/var-dumper": "<6.3",
                 "twig/twig": "<2.13"
             },
             "provide": {
@@ -6242,28 +6238,28 @@
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/css-selector": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/dom-crawler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/http-client-contracts": "^1.1|^2|^3",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/routing": "^5.4|^6.0",
-                "symfony/stopwatch": "^5.4|^6.0",
-                "symfony/translation": "^5.4|^6.0",
-                "symfony/translation-contracts": "^1.1|^2|^3",
+                "symfony/browser-kit": "^5.4|^6.0|^7.0",
+                "symfony/clock": "^6.2|^7.0",
+                "symfony/config": "^6.1|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client-contracts": "^2.5|^3",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
+                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/serializer": "^6.4.4|^7.0.4",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/translation-contracts": "^2.5|^3",
+                "symfony/uid": "^5.4|^6.0|^7.0",
+                "symfony/validator": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.2|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "suggest": {
-                "symfony/browser-kit": "",
-                "symfony/config": "",
-                "symfony/console": "",
-                "symfony/dependency-injection": ""
-            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -6290,7 +6286,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.0.20"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
             },
             "funding": [
                 {
@@ -6306,24 +6302,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-01T08:22:55+00:00"
+            "time": "2024-03-04T21:00:47+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.0.19",
+            "version": "v6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "d7052547a0070cbeadd474e172b527a00d657301"
+                "reference": "5017e0a9398c77090b7694be46f20eb796262a34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/d7052547a0070cbeadd474e172b527a00d657301",
-                "reference": "d7052547a0070cbeadd474e172b527a00d657301",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34",
+                "reference": "5017e0a9398c77090b7694be46f20eb796262a34",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -6332,15 +6329,16 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/mailer": "<5.4",
-                "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
+                "symfony/serializer": "<6.3.2"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
+                "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/property-access": "^5.4|^6.0",
-                "symfony/property-info": "^5.4|^6.0",
-                "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/property-access": "^5.4|^6.0|^7.0",
+                "symfony/property-info": "^5.4|^6.0|^7.0",
+                "symfony/serializer": "^6.3.2|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6372,7 +6370,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.0.19"
+                "source": "https://github.com/symfony/mime/tree/v6.4.3"
             },
             "funding": [
                 {
@@ -6388,7 +6386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-11T11:50:03+00:00"
+            "time": "2024-01-30T08:32:12+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6946,21 +6944,22 @@
             "time": "2024-01-29T20:11:03+00:00"
         },
         {
-            "name": "symfony/polyfill-php81",
+            "name": "symfony/polyfill-php83",
             "version": "v1.29.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
-                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.1",
+                "symfony/polyfill-php80": "^1.14"
             },
             "type": "library",
             "extra": {
@@ -6974,7 +6973,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
+                    "Symfony\\Polyfill\\Php83\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -6994,7 +6993,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -7003,7 +7002,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -7102,20 +7101,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "2114fd60f26a296cc403a7939ab91478475a33d4"
+                "reference": "710e27879e9be3395de2b98da3f52a946039f297"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/2114fd60f26a296cc403a7939ab91478475a33d4",
-                "reference": "2114fd60f26a296cc403a7939ab91478475a33d4",
+                "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297",
+                "reference": "710e27879e9be3395de2b98da3f52a946039f297",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -7143,7 +7142,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.0.19"
+                "source": "https://github.com/symfony/process/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -7159,45 +7158,40 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-20T12:31:00+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.0.19",
+            "version": "v6.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e56ca9b41c1ec447193474cd86ad7c0b547755ac"
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e56ca9b41c1ec447193474cd86ad7c0b547755ac",
-                "reference": "e56ca9b41c1ec447193474cd86ad7c0b547755ac",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "doctrine/annotations": "<1.12",
-                "symfony/config": "<5.4",
+                "symfony/config": "<6.2",
                 "symfony/dependency-injection": "<5.4",
                 "symfony/yaml": "<5.4"
             },
             "require-dev": {
                 "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/yaml": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/config": "For using the all-in-one router or any loader",
-                "symfony/expression-language": "For using expression matching",
-                "symfony/http-foundation": "For using a Symfony Request object",
-                "symfony/yaml": "For using the YAML loader"
+                "symfony/config": "^6.2|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7231,7 +7225,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.0.19"
+                "source": "https://github.com/symfony/routing/tree/v6.4.5"
             },
             "funding": [
                 {
@@ -7247,36 +7241,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-27T12:33:30+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.0.2",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
-                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "psr/container": "^2.0"
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7286,7 +7277,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Service\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -7313,7 +7307,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
             },
             "funding": [
                 {
@@ -7329,37 +7323,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:58+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
+                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
-                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7398,7 +7393,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.19"
+                "source": "https://github.com/symfony/string/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -7414,32 +7409,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-01T13:16:41+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f"
+                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f",
-                "reference": "9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e",
+                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^2.3|^3.0"
+                "symfony/translation-contracts": "^2.5|^3.0"
             },
             "conflict": {
                 "symfony/config": "<5.4",
                 "symfony/console": "<5.4",
                 "symfony/dependency-injection": "<5.4",
+                "symfony/http-client-contracts": "<2.5",
                 "symfony/http-kernel": "<5.4",
+                "symfony/service-contracts": "<2.5",
                 "symfony/twig-bundle": "<5.4",
                 "symfony/yaml": "<5.4"
             },
@@ -7447,22 +7445,19 @@
                 "symfony/translation-implementation": "2.3|3.0"
             },
             "require-dev": {
+                "nikic/php-parser": "^4.18|^5.0",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/intl": "^5.4|^6.0",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client-contracts": "^2.5|^3.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^5.4|^6.0|^7.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/service-contracts": "^1.1.2|^2|^3",
-                "symfony/yaml": "^5.4|^6.0"
-            },
-            "suggest": {
-                "psr/log-implementation": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
+                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7493,7 +7488,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.0.19"
+                "source": "https://github.com/symfony/translation/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -7509,32 +7504,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-02-20T13:16:58+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.0.2",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282"
+                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282",
-                "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
+                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
-            },
-            "suggest": {
-                "symfony/translation-implementation": ""
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7544,7 +7536,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Translation\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -7571,7 +7566,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
             },
             "funding": [
                 {
@@ -7587,28 +7582,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T17:10:44+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.0.19",
+            "version": "v6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "6499e28b0ac9f2aa3151e11845bdb5cd21e6bb9d"
+                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/6499e28b0ac9f2aa3151e11845bdb5cd21e6bb9d",
-                "reference": "6499e28b0ac9f2aa3151e11845bdb5cd21e6bb9d",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
+                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0"
+                "symfony/console": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7645,7 +7640,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.0.19"
+                "source": "https://github.com/symfony/uid/tree/v6.4.3"
             },
             "funding": [
                 {
@@ -7661,42 +7656,39 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:36:10+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "eb980457fa6899840fe1687e8627a03a7d8a3d52"
+                "reference": "b439823f04c98b84d4366c79507e9da6230944b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eb980457fa6899840fe1687e8627a03a7d8a3d52",
-                "reference": "eb980457fa6899840fe1687e8627a03a7d8a3d52",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1",
+                "reference": "b439823f04c98b84d4366c79507e9da6230944b1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "phpunit/phpunit": "<5.4.3",
                 "symfony/console": "<5.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/uid": "^5.4|^6.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^6.3|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^5.4|^6.0|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
-            "suggest": {
-                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-                "ext-intl": "To show region name in time zone dump",
-                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-            },
             "bin": [
                 "Resources/bin/var-dump-server"
             ],
@@ -7733,7 +7725,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.0.19"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -7749,7 +7741,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:44:14+00:00"
+            "time": "2024-02-15T11:23:52+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8024,30 +8016,30 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.5.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
-                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^11",
+                "doctrine/coding-standard": "^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.16 || ^1",
-                "phpstan/phpstan": "^1.4",
-                "phpstan/phpstan-phpunit": "^1",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.30 || ^5.4"
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
             },
             "type": "library",
             "autoload": {
@@ -8074,7 +8066,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
             },
             "funding": [
                 {
@@ -8090,7 +8082,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-30T00:15:36+00:00"
+            "time": "2022-12-30T00:23:10+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -8354,16 +8346,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.1",
+            "version": "v2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc"
+                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/467113c58d110ad617cf9e07ff49b0948d1c03cc",
-                "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/a79b46b96060504b400890674b83f66aa7f5db6d",
+                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d",
                 "shasum": ""
             },
             "require": {
@@ -8380,6 +8372,7 @@
                 "phpstan/phpstan": "^1.10.50"
             },
             "require-dev": {
+                "doctrine/coding-standard": "^12.0",
                 "nikic/php-parser": "^4.17.1",
                 "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.0",
                 "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.0",
@@ -8431,7 +8424,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.1"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.2"
             },
             "funding": [
                 {
@@ -8451,7 +8444,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-02-26T14:10:20+00:00"
+            "time": "2024-02-27T03:16:03+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8685,20 +8678,21 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -8739,9 +8733,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -8884,16 +8884,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.59",
+            "version": "1.10.60",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e607609388d3a6d418a50a49f7940e8086798281"
+                "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
-                "reference": "e607609388d3a6d418a50a49f7940e8086798281",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/95dcea7d6c628a3f2f56d091d8a0219485a86bbe",
+                "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe",
                 "shasum": ""
             },
             "require": {
@@ -8942,20 +8942,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T13:59:13+00:00"
+            "time": "2024-03-07T13:30:19+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.30",
+            "version": "9.2.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089"
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089",
-                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
                 "shasum": ""
             },
             "require": {
@@ -9012,7 +9012,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
             },
             "funding": [
                 {
@@ -9020,7 +9020,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:47:57+00:00"
+            "time": "2024-03-02T06:37:42+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9368,16 +9368,16 @@
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -9412,7 +9412,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -9420,7 +9420,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -9666,16 +9666,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -9720,7 +9720,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -9728,7 +9728,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -9795,16 +9795,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
@@ -9860,7 +9860,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -9868,20 +9868,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.6",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
@@ -9924,7 +9924,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -9932,7 +9932,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:26:13+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -10468,32 +10468,26 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.0.19",
+            "version": "v6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "622578ff158318b1b49d95068bd6b66c713601e9"
+                "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/622578ff158318b1b49d95068bd6b66c713601e9",
-                "reference": "622578ff158318b1b49d95068bd6b66c713601e9",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531",
+                "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "masterminds/html5": "^2.6",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
-            "conflict": {
-                "masterminds/html5": "<2.6"
-            },
             "require-dev": {
-                "masterminds/html5": "^2.6",
-                "symfony/css-selector": "^5.4|^6.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
+                "symfony/css-selector": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10521,7 +10515,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.0.19"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.4"
             },
             "funding": [
                 {
@@ -10537,20 +10531,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-20T17:44:14+00:00"
+            "time": "2024-02-07T09:17:57+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -10579,7 +10573,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -10587,7 +10581,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-20T00:12:19+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
@@ -10598,7 +10592,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.0.2",
+        "php": "^8.1.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -10609,7 +10603,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.0.2"
+        "php": "8.1.0"
     },
     "plugin-api-version": "2.3.0"
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 5fec36c2f08..15a519e20f6 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,7 @@ parameters:
     # The level 8 is the highest level
     level: 1
 
-    phpVersion: 80002
+    phpVersion: 80200
 
     bootstrapFiles:
       - bootstrap/phpstan.php

From 07761524af8277699d75fca09f35341420a6c619 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 12 Mar 2024 12:08:26 +0000
Subject: [PATCH 066/666] Dev: Fixed flaky OIDC test, updated dev version

---
 tests/Auth/OidcTest.php | 10 ++++++++--
 version                 |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 345d1dc780b..228c75e9ead 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -594,10 +594,16 @@ public function test_logout_redirect_contains_id_token_hint_if_existing()
     {
         config()->set(['oidc.end_session_endpoint' => 'https://example.com/logout']);
 
-        $this->runLogin();
+        // Fix times so our token is predictable
+        $claimOverrides = [
+            'iat' => time(),
+            'exp' => time() + 720,
+            'auth_time' => time()
+        ];
+        $this->runLogin($claimOverrides);
 
         $resp = $this->asEditor()->post('/oidc/logout');
-        $query = 'id_token_hint=' . urlencode(OidcJwtHelper::idToken()) .  '&post_logout_redirect_uri=' . urlencode(url('/'));
+        $query = 'id_token_hint=' . urlencode(OidcJwtHelper::idToken($claimOverrides)) .  '&post_logout_redirect_uri=' . urlencode(url('/'));
         $resp->assertRedirect('https://example.com/logout?' . $query);
     }
 
diff --git a/version b/version
index 05edb56ccca..522220af0c3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v23.09-dev
+v24.03-dev

From 70479df5dccc2910fa5a0e6821b304fdd989bd38 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.pw>
Date: Tue, 12 Mar 2024 14:04:33 +0100
Subject: [PATCH 067/666] Dockerfile: Don't cache 50MB of lists and use a
 single layer, make it pretty

---
 dev/docker/Dockerfile | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 349e315d2e3..fe497e9e63e 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -3,23 +3,32 @@ FROM php:8.1-apache
 ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
 
-# Install additional dependacnies and configure apache
-RUN apt-get update -y \
-    && apt-get install -y git zip unzip libpng-dev libldap2-dev libzip-dev wait-for-it \
-    && docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" \
-    && docker-php-ext-install pdo_mysql gd ldap zip \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
-    && a2enmod rewrite \
-    && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
-    && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+RUN <<EOR
+# Install additional dependencies
+apt-get update
+apt-get install -y \
+	git \
+	zip \
+	unzip \
+	libpng-dev \
+	libldap2-dev \
+	libzip-dev \
+	wait-for-it
+rm -rf /var/lib/apt/lists/*
+
+# Configure apache
+docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)"
+docker-php-ext-install pdo_mysql gd ldap zip
+pecl install xdebug
+docker-php-ext-enable xdebug
+a2enmod rewrite
+sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
 
 # Install composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php composer-setup.php \
-    && mv composer.phar /usr/bin/composer \
-    && php -r "unlink('composer-setup.php');"
+curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # Use the default production configuration and update it as required
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
-    && sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
+mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
+EOR

From 794671ef32f8f67ebe30b9575bea0fa0e74d644b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 16 Mar 2024 15:12:14 +0000
Subject: [PATCH 068/666] Framework: Upgrade from Laravel 9 to 10

Following Laravel guidance and GitHub diff.
Not yet in tested state with app-specific changes made.
---
 app/App/Providers/AppServiceProvider.php      |  30 +-
 app/App/Providers/AuthServiceProvider.php     |   8 +-
 app/App/Providers/EventServiceProvider.php    |   8 +-
 app/App/Providers/RouteServiceProvider.php    |  16 +-
 app/App/Providers/ThemeServiceProvider.php    |   8 +-
 .../Providers/TranslationServiceProvider.php  |   8 +-
 .../Providers/ViewTweaksServiceProvider.php   |   4 +-
 app/Config/app.php                            |  45 +--
 app/Config/cache.php                          |   3 +-
 app/Config/hashing.php                        |   3 +-
 app/Config/logging.php                        |   8 +
 app/Config/queue.php                          |   6 +
 app/Config/session.php                        |   7 +
 app/Http/Kernel.php                           |   4 +-
 .../Middleware/RedirectIfAuthenticated.php    |   9 +-
 app/Http/Middleware/ThrottleApiRequests.php   |   2 +-
 app/Http/Middleware/TrustHosts.php            |   4 +-
 composer.json                                 |   4 +-
 composer.lock                                 | 293 +++++++++++-------
 tests/CreatesApplication.php                  |   5 +-
 20 files changed, 252 insertions(+), 223 deletions(-)

diff --git a/app/App/Providers/AppServiceProvider.php b/app/App/Providers/AppServiceProvider.php
index 0f4dc55dd2f..9012a07ebf4 100644
--- a/app/App/Providers/AppServiceProvider.php
+++ b/app/App/Providers/AppServiceProvider.php
@@ -25,7 +25,7 @@ class AppServiceProvider extends ServiceProvider
      * Custom container bindings to register.
      * @var string[]
      */
-    public $bindings = [
+    public array $bindings = [
         ExceptionRenderer::class => BookStackExceptionHandlerPage::class,
     ];
 
@@ -33,7 +33,7 @@ class AppServiceProvider extends ServiceProvider
      * Custom singleton bindings to register.
      * @var string[]
      */
-    public $singletons = [
+    public array $singletons = [
         'activity' => ActivityLogger::class,
         SettingService::class => SettingService::class,
         SocialDriverManager::class => SocialDriverManager::class,
@@ -41,12 +41,20 @@ class AppServiceProvider extends ServiceProvider
         HttpRequestService::class => HttpRequestService::class,
     ];
 
+    /**
+     * Register any application services.
+     */
+    public function register(): void
+    {
+        $this->app->singleton(PermissionApplicator::class, function ($app) {
+            return new PermissionApplicator(null);
+        });
+    }
+
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         // Set root URL
         $appUrl = config('app.url');
@@ -67,16 +75,4 @@ public function boot()
             'page'      => Page::class,
         ]);
     }
-
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->singleton(PermissionApplicator::class, function ($app) {
-            return new PermissionApplicator(null);
-        });
-    }
 }
diff --git a/app/App/Providers/AuthServiceProvider.php b/app/App/Providers/AuthServiceProvider.php
index 26d1803107d..23c33907965 100644
--- a/app/App/Providers/AuthServiceProvider.php
+++ b/app/App/Providers/AuthServiceProvider.php
@@ -18,10 +18,8 @@ class AuthServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap the application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         // Password Configuration
         // Changes here must be reflected in ApiDocsGenerate@getValidationAsString.
@@ -58,10 +56,8 @@ public function boot()
 
     /**
      * Register the application services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         Auth::provider('external-users', function ($app, array $config) {
             return new ExternalBaseUserProvider($config['model']);
diff --git a/app/App/Providers/EventServiceProvider.php b/app/App/Providers/EventServiceProvider.php
index 4ec9facdfd7..4cd527ba4a4 100644
--- a/app/App/Providers/EventServiceProvider.php
+++ b/app/App/Providers/EventServiceProvider.php
@@ -29,20 +29,16 @@ class EventServiceProvider extends ServiceProvider
 
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
     }
 
     /**
      * Determine if events and listeners should be automatically discovered.
-     *
-     * @return bool
      */
-    public function shouldDiscoverEvents()
+    public function shouldDiscoverEvents(): bool
     {
         return false;
     }
diff --git a/app/App/Providers/RouteServiceProvider.php b/app/App/Providers/RouteServiceProvider.php
index abd5562449b..3a155920eb4 100644
--- a/app/App/Providers/RouteServiceProvider.php
+++ b/app/App/Providers/RouteServiceProvider.php
@@ -24,10 +24,8 @@ class RouteServiceProvider extends ServiceProvider
 
     /**
      * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         $this->configureRateLimiting();
 
@@ -41,10 +39,8 @@ public function boot()
      * Define the "web" routes for the application.
      *
      * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
      */
-    protected function mapWebRoutes()
+    protected function mapWebRoutes(): void
     {
         Route::group([
             'middleware' => 'web',
@@ -65,10 +61,8 @@ protected function mapWebRoutes()
      * Define the "api" routes for the application.
      *
      * These routes are typically stateless.
-     *
-     * @return void
      */
-    protected function mapApiRoutes()
+    protected function mapApiRoutes(): void
     {
         Route::group([
             'middleware' => 'api',
@@ -81,10 +75,8 @@ protected function mapApiRoutes()
 
     /**
      * Configure the rate limiters for the application.
-     *
-     * @return void
      */
-    protected function configureRateLimiting()
+    protected function configureRateLimiting(): void
     {
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
diff --git a/app/App/Providers/ThemeServiceProvider.php b/app/App/Providers/ThemeServiceProvider.php
index 4c657d91232..2cf581d3863 100644
--- a/app/App/Providers/ThemeServiceProvider.php
+++ b/app/App/Providers/ThemeServiceProvider.php
@@ -10,10 +10,8 @@ class ThemeServiceProvider extends ServiceProvider
 {
     /**
      * Register services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         // Register the ThemeService as a singleton
         $this->app->singleton(ThemeService::class, fn ($app) => new ThemeService());
@@ -21,10 +19,8 @@ public function register()
 
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         // Boot up the theme system
         $themeService = $this->app->make(ThemeService::class);
diff --git a/app/App/Providers/TranslationServiceProvider.php b/app/App/Providers/TranslationServiceProvider.php
index c1752f38e3e..b838129a601 100644
--- a/app/App/Providers/TranslationServiceProvider.php
+++ b/app/App/Providers/TranslationServiceProvider.php
@@ -11,10 +11,8 @@ class TranslationServiceProvider extends BaseProvider
 {
     /**
      * Register the service provider.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->registerLoader();
 
@@ -41,10 +39,8 @@ public function register()
     /**
      * Register the translation line loader.
      * Overrides the default register action from Laravel so a custom loader can be used.
-     *
-     * @return void
      */
-    protected function registerLoader()
+    protected function registerLoader(): void
     {
         $this->app->singleton('translation.loader', function ($app) {
             return new FileLoader($app['files'], $app['path.lang']);
diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 10593ac8bf8..7115dcb5114 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -12,10 +12,8 @@ class ViewTweaksServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         // Set paginator to use bootstrap-style pagination
         Paginator::useBootstrap();
diff --git a/app/Config/app.php b/app/Config/app.php
index fc913eb8fee..dda787f3f99 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -9,6 +9,7 @@
  */
 
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\ServiceProvider;
 
 return [
 
@@ -113,46 +114,22 @@
     ],
 
     // Application Service Providers
-    'providers' => [
-
-        // Laravel Framework Service Providers...
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
+    'providers' => ServiceProvider::defaultProviders()->merge([
         // Third party service providers
         Barryvdh\DomPDF\ServiceProvider::class,
         Barryvdh\Snappy\ServiceProvider::class,
         SocialiteProviders\Manager\ServiceProvider::class,
 
         // BookStack custom service providers
-        \BookStack\App\Providers\ThemeServiceProvider::class,
-        \BookStack\App\Providers\AppServiceProvider::class,
-        \BookStack\App\Providers\AuthServiceProvider::class,
-        \BookStack\App\Providers\EventServiceProvider::class,
-        \BookStack\App\Providers\RouteServiceProvider::class,
-        \BookStack\App\Providers\TranslationServiceProvider::class,
-        \BookStack\App\Providers\ValidationRuleServiceProvider::class,
-        \BookStack\App\Providers\ViewTweaksServiceProvider::class,
-    ],
+        BookStack\App\Providers\ThemeServiceProvider::class,
+        BookStack\App\Providers\AppServiceProvider::class,
+        BookStack\App\Providers\AuthServiceProvider::class,
+        BookStack\App\Providers\EventServiceProvider::class,
+        BookStack\App\Providers\RouteServiceProvider::class,
+        BookStack\App\Providers\TranslationServiceProvider::class,
+        BookStack\App\Providers\ValidationRuleServiceProvider::class,
+        BookStack\App\Providers\ViewTweaksServiceProvider::class,
+    ])->toArray(),
 
     // Class Aliases
     // This array of class aliases to be registered on application start.
diff --git a/app/Config/cache.php b/app/Config/cache.php
index d1d47ab16c2..2ba16059a17 100644
--- a/app/Config/cache.php
+++ b/app/Config/cache.php
@@ -53,7 +53,8 @@
 
         'file' => [
             'driver' => 'file',
-            'path'   => storage_path('framework/cache'),
+            'path'   => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
diff --git a/app/Config/hashing.php b/app/Config/hashing.php
index 585ee094ccb..91d0db16b9e 100644
--- a/app/Config/hashing.php
+++ b/app/Config/hashing.php
@@ -21,7 +21,8 @@
     // passwords are hashed using the Bcrypt algorithm. This will allow you
     // to control the amount of time it takes to hash the given password.
     'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 10),
+        'rounds' => env('BCRYPT_ROUNDS', 12),
+        'verify' => true,
     ],
 
     // Argon Options
diff --git a/app/Config/logging.php b/app/Config/logging.php
index d49cd727d12..f5cbd5ffc01 100644
--- a/app/Config/logging.php
+++ b/app/Config/logging.php
@@ -4,6 +4,7 @@
 use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
 
 /**
  * Logging configuration options.
@@ -49,6 +50,7 @@
             'path'   => storage_path('logs/laravel.log'),
             'level'  => 'debug',
             'days'   => 14,
+            'replace_placeholders' => true,
         ],
 
         'daily' => [
@@ -56,6 +58,7 @@
             'path'   => storage_path('logs/laravel.log'),
             'level'  => 'debug',
             'days'   => 7,
+            'replace_placeholders' => true,
         ],
 
         'stderr' => [
@@ -65,16 +68,20 @@
             'with'    => [
                 'stream' => 'php://stderr',
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
             'level'  => 'debug',
+            'facility' => LOG_USER,
+            'replace_placeholders' => true,
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
             'level'  => 'debug',
+            'replace_placeholders' => true,
         ],
 
         // Custom errorlog implementation that logs out a plain,
@@ -88,6 +95,7 @@
             'formatter_with' => [
                 'format' => '%message%',
             ],
+            'replace_placeholders' => true,
         ],
 
         'null' => [
diff --git a/app/Config/queue.php b/app/Config/queue.php
index a14799f354d..795a7932545 100644
--- a/app/Config/queue.php
+++ b/app/Config/queue.php
@@ -40,6 +40,12 @@
 
     ],
 
+    // Job batching
+    'batching' => [
+        'database' => 'mysql',
+        'table' => 'job_batches',
+    ],
+
     // Failed queue job logging
     'failed' => [
         'driver'   => 'database-uuids',
diff --git a/app/Config/session.php b/app/Config/session.php
index a00d7580712..f2ec2509fc8 100644
--- a/app/Config/session.php
+++ b/app/Config/session.php
@@ -85,4 +85,11 @@
     // do not enable this as other CSRF protection services are in place.
     // Options: lax, strict, none
     'same_site' => 'lax',
+
+
+    // Partitioned Cookies
+    // Setting this value to true will tie the cookie to the top-level site for
+    // a cross-site context. Partitioned cookies are accepted by the browser
+    // when flagged "secure" and the Same-Site attribute is set to "none".
+    'partitioned' => false,
 ];
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d23f56a2cf9..30714e2ac59 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -45,11 +45,11 @@ class Kernel extends HttpKernel
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'can'        => \BookStack\Http\Middleware\CheckUserHasPermission::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 069973a95b7..745f7196df3 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -6,19 +6,16 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
 
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     * @param string|null              ...$guards
-     *
-     * @return mixed
+     * @param Closure(Request): (Response) $next
      */
-    public function handle(Request $request, Closure $next, ...$guards)
+    public function handle(Request $request, Closure $next, string ...$guards): Response
     {
         $guards = empty($guards) ? [null] : $guards;
 
diff --git a/app/Http/Middleware/ThrottleApiRequests.php b/app/Http/Middleware/ThrottleApiRequests.php
index c63d0c6033d..cef2d3906ef 100644
--- a/app/Http/Middleware/ThrottleApiRequests.php
+++ b/app/Http/Middleware/ThrottleApiRequests.php
@@ -9,7 +9,7 @@ class ThrottleApiRequests extends Middleware
     /**
      * Resolve the number of attempts if the user is authenticated or not.
      */
-    protected function resolveMaxAttempts($request, $maxAttempts)
+    protected function resolveMaxAttempts($request, $maxAttempts): int
     {
         return (int) config('api.requests_per_minute');
     }
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
index 7bd89ee51de..c13d631fed9 100644
--- a/app/Http/Middleware/TrustHosts.php
+++ b/app/Http/Middleware/TrustHosts.php
@@ -9,9 +9,9 @@ class TrustHosts extends Middleware
     /**
      * Get the host patterns that should be trusted.
      *
-     * @return array
+     * @return array<int, string|null>
      */
-    public function hosts()
+    public function hosts(): array
     {
         return [
             $this->allSubdomainsOfApplicationUrl(),
diff --git a/composer.json b/composer.json
index 74fbcf8f228..f58c2c9dd18 100644
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,9 @@
         "doctrine/dbal": "^3.5",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^2.7",
-        "laravel/framework": "^9.0",
+        "laravel/framework": "^10.10",
         "laravel/socialite": "^5.10",
-        "laravel/tinker": "^2.6",
+        "laravel/tinker": "^2.8",
         "league/commonmark": "^2.3",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/html-to-markdown": "^5.0.0",
diff --git a/composer.lock b/composer.lock
index 1b58e55ac19..0edbd79bdeb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "54d735153e12b120d9dd41ab847e3032",
+    "content-hash": "df0a9795e5dd228d680cabf1f34d3aa6",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.300.15",
+            "version": "3.301.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0cd194438b84588615121a93d0bc46bf55ca678b"
+                "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0cd194438b84588615121a93d0bc46bf55ca678b",
-                "reference": "0cd194438b84588615121a93d0bc46bf55ca678b",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a910d2b35e7087337cdf3569dc9b6ce232aafba",
+                "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.15"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.301.1"
             },
-            "time": "2024-03-11T18:33:13+00:00"
+            "time": "2024-03-15T18:14:42+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -211,16 +211,16 @@
         },
         {
             "name": "barryvdh/laravel-dompdf",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24"
+                "reference": "cb37868365f9b937039d316727a1fced1e87b31c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/c8b8a8490e5f7348cf99054821fb248f103e7d24",
-                "reference": "c8b8a8490e5f7348cf99054821fb248f103e7d24",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
+                "reference": "cb37868365f9b937039d316727a1fced1e87b31c",
                 "shasum": ""
             },
             "require": {
@@ -272,7 +272,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
-                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.0"
+                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
             },
             "funding": [
                 {
@@ -284,7 +284,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-04T08:18:20+00:00"
+            "time": "2024-03-15T12:48:39+00:00"
         },
         {
             "name": "barryvdh/laravel-snappy",
@@ -2012,20 +2012,21 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.52.16",
+            "version": "v10.48.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "082345d76fc6a55b649572efe10b11b03e279d24"
+                "reference": "5791c052b41c6b593556adc687076bfbdd13c501"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/082345d76fc6a55b649572efe10b11b03e279d24",
-                "reference": "082345d76fc6a55b649572efe10b11b03e279d24",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/5791c052b41c6b593556adc687076bfbdd13c501",
+                "reference": "5791c052b41c6b593556adc687076bfbdd13c501",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11",
+                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
+                "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
                 "dragonmantank/cron-expression": "^3.3.2",
                 "egulias/email-validator": "^3.2.1|^4.0",
@@ -2038,33 +2039,38 @@
                 "ext-tokenizer": "*",
                 "fruitcake/php-cors": "^1.2",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/serializable-closure": "^1.2.2",
+                "laravel/prompts": "^0.1.9",
+                "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
-                "monolog/monolog": "^2.0",
-                "nesbot/carbon": "^2.62.1",
+                "monolog/monolog": "^3.0",
+                "nesbot/carbon": "^2.67",
                 "nunomaduro/termwind": "^1.13",
-                "php": "^8.0.2",
+                "php": "^8.1",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^6.0.9",
-                "symfony/error-handler": "^6.0",
-                "symfony/finder": "^6.0",
-                "symfony/http-foundation": "^6.0",
-                "symfony/http-kernel": "^6.0",
-                "symfony/mailer": "^6.0",
-                "symfony/mime": "^6.0",
-                "symfony/process": "^6.0",
-                "symfony/routing": "^6.0",
-                "symfony/uid": "^6.0",
-                "symfony/var-dumper": "^6.0",
+                "symfony/console": "^6.2",
+                "symfony/error-handler": "^6.2",
+                "symfony/finder": "^6.2",
+                "symfony/http-foundation": "^6.4",
+                "symfony/http-kernel": "^6.2",
+                "symfony/mailer": "^6.2",
+                "symfony/mime": "^6.2",
+                "symfony/process": "^6.2",
+                "symfony/routing": "^6.2",
+                "symfony/uid": "^6.2",
+                "symfony/var-dumper": "^6.2",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
                 "vlucas/phpdotenv": "^5.4.1",
                 "voku/portable-ascii": "^2.0"
             },
             "conflict": {
+                "carbonphp/carbon-doctrine-types": ">=3.0",
+                "doctrine/dbal": ">=4.0",
+                "mockery/mockery": "1.6.8",
+                "phpunit/phpunit": ">=11.0.0",
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
@@ -2095,6 +2101,7 @@
                 "illuminate/notifications": "self.version",
                 "illuminate/pagination": "self.version",
                 "illuminate/pipeline": "self.version",
+                "illuminate/process": "self.version",
                 "illuminate/queue": "self.version",
                 "illuminate/redis": "self.version",
                 "illuminate/routing": "self.version",
@@ -2108,7 +2115,7 @@
             "require-dev": {
                 "ably/ably-php": "^1.0",
                 "aws/aws-sdk-php": "^3.235.5",
-                "doctrine/dbal": "^2.13.3|^3.1.4",
+                "doctrine/dbal": "^3.5.1",
                 "ext-gmp": "*",
                 "fakerphp/faker": "^1.21",
                 "guzzlehttp/guzzle": "^7.5",
@@ -2118,20 +2125,21 @@
                 "league/flysystem-read-only": "^3.3",
                 "league/flysystem-sftp-v3": "^3.0",
                 "mockery/mockery": "^1.5.1",
-                "orchestra/testbench-core": "^7.24",
+                "nyholm/psr7": "^1.2",
+                "orchestra/testbench-core": "^8.18",
                 "pda/pheanstalk": "^4.0",
-                "phpstan/phpdoc-parser": "^1.15",
                 "phpstan/phpstan": "^1.4.7",
-                "phpunit/phpunit": "^9.5.8",
-                "predis/predis": "^1.1.9|^2.0.2",
-                "symfony/cache": "^6.0",
-                "symfony/http-client": "^6.0"
+                "phpunit/phpunit": "^10.0.7",
+                "predis/predis": "^2.0.2",
+                "symfony/cache": "^6.2",
+                "symfony/http-client": "^6.2.4",
+                "symfony/psr-http-message-bridge": "^2.0"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
                 "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
                 "brianium/paratest": "Required to run tests in parallel (^6.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
+                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -2153,27 +2161,28 @@
                 "mockery/mockery": "Required to use mocking (^1.5.1).",
                 "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
-                "predis/predis": "Required to use the predis connector (^1.1.9|^2.0.2).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
+                "predis/predis": "Required to use the predis connector (^2.0.2).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
                 "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.x-dev"
+                    "dev-master": "10.x-dev"
                 }
             },
             "autoload": {
                 "files": [
                     "src/Illuminate/Collections/helpers.php",
                     "src/Illuminate/Events/functions.php",
+                    "src/Illuminate/Filesystem/functions.php",
                     "src/Illuminate/Foundation/helpers.php",
                     "src/Illuminate/Support/helpers.php"
                 ],
@@ -2206,7 +2215,64 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-10-03T13:02:30+00:00"
+            "time": "2024-03-15T10:17:07+00:00"
+        },
+        {
+            "name": "laravel/prompts",
+            "version": "v0.1.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/prompts.git",
+                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "illuminate/collections": "^10.0|^11.0",
+                "php": "^8.1",
+                "symfony/console": "^6.2|^7.0"
+            },
+            "conflict": {
+                "illuminate/console": ">=10.17.0 <10.25.0",
+                "laravel/framework": ">=10.17.0 <10.25.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.5",
+                "pestphp/pest": "^2.3",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-mockery": "^1.1"
+            },
+            "suggest": {
+                "ext-pcntl": "Required for the spinner to be animated."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Laravel\\Prompts\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/prompts/issues",
+                "source": "https://github.com/laravel/prompts/tree/v0.1.16"
+            },
+            "time": "2024-02-21T19:25:27+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2594,16 +2660,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.25.0",
+            "version": "3.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "4c44347133618cccd9b3df1729647a1577b4ad99"
+                "reference": "abbd664eb4381102c559d358420989f835208f18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4c44347133618cccd9b3df1729647a1577b4ad99",
-                "reference": "4c44347133618cccd9b3df1729647a1577b4ad99",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/abbd664eb4381102c559d358420989f835208f18",
+                "reference": "abbd664eb4381102c559d358420989f835208f18",
                 "shasum": ""
             },
             "require": {
@@ -2668,7 +2734,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.25.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.25.1"
             },
             "funding": [
                 {
@@ -2680,20 +2746,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-09T17:06:45+00:00"
+            "time": "2024-03-16T12:53:19+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.24.0",
+            "version": "3.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"
+                "reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
-                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
+                "reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
                 "shasum": ""
             },
             "require": {
@@ -2733,7 +2799,7 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.25.1"
             },
             "funding": [
                 {
@@ -2745,20 +2811,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-01-26T18:43:21+00:00"
+            "time": "2024-03-15T19:58:44+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.23.1",
+            "version": "3.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00"
+                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00",
-                "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92",
+                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92",
                 "shasum": ""
             },
             "require": {
@@ -2792,8 +2858,7 @@
                 "local"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/flysystem-local/issues",
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.1"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1"
             },
             "funding": [
                 {
@@ -2805,7 +2870,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-01-26T18:25:23+00:00"
+            "time": "2024-03-15T19:58:44+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -3167,42 +3232,41 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.9.2",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
+                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
+                "php": ">=8.1",
+                "psr/log": "^2.0 || ^3.0"
             },
             "provide": {
-                "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
+                "psr/log-implementation": "3.0.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+                "aws/aws-sdk-php": "^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "elasticsearch/elasticsearch": "^7 || ^8",
                 "ext-json": "*",
-                "graylog2/gelf-php": "^1.4.2 || ^2@dev",
-                "guzzlehttp/guzzle": "^7.4",
+                "graylog2/gelf-php": "^1.4.2 || ^2.0",
+                "guzzlehttp/guzzle": "^7.4.5",
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5.14",
-                "predis/predis": "^1.1 || ^2.0",
-                "rollbar/rollbar": "^1.3 || ^2 || ^3",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.4",
+                "phpunit/phpunit": "^10.1",
+                "predis/predis": "^1.1 || ^2",
                 "ruflin/elastica": "^7",
-                "swiftmailer/swiftmailer": "^5.3|^6.0",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -3225,7 +3289,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -3253,7 +3317,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
+                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
             },
             "funding": [
                 {
@@ -3265,7 +3329,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:25:26+00:00"
+            "time": "2023-10-27T15:32:31+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -3951,16 +4015,16 @@
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.5.2",
+            "version": "0.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa"
+                "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa",
-                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/0e46722c154726a5f9ac218197ccc28adba16fcf",
+                "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf",
                 "shasum": ""
             },
             "require": {
@@ -3979,7 +4043,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-3.0"
+                "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
@@ -3991,9 +4055,9 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.3"
             },
-            "time": "2024-02-07T12:49:40+00:00"
+            "time": "2024-02-23T20:39:24+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -4756,16 +4820,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.0",
+            "version": "v0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d"
+                "reference": "39621c73e0754328252f032c6997b983afc50431"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d",
-                "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/39621c73e0754328252f032c6997b983afc50431",
+                "reference": "39621c73e0754328252f032c6997b983afc50431",
                 "shasum": ""
             },
             "require": {
@@ -4829,9 +4893,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.0"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.1"
             },
-            "time": "2023-12-20T15:28:09+00:00"
+            "time": "2024-03-15T03:22:57+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -8448,7 +8512,7 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.7",
+            "version": "1.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
@@ -8884,16 +8948,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.60",
+            "version": "1.10.62",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe"
+                "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/95dcea7d6c628a3f2f56d091d8a0219485a86bbe",
-                "reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9",
+                "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9",
                 "shasum": ""
             },
             "require": {
@@ -8942,7 +9006,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-07T13:30:19+00:00"
+            "time": "2024-03-13T12:27:20+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10168,16 +10232,16 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -10189,7 +10253,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -10210,8 +10274,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -10219,7 +10282,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index b1cefbb6584..3258d05bc92 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -3,15 +3,14 @@
 namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Foundation\Application;
 
 trait CreatesApplication
 {
     /**
      * Creates the application.
-     *
-     * @return \Illuminate\Foundation\Application
      */
-    public function createApplication()
+    public function createApplication(): Application
     {
         $app = require __DIR__ . '/../bootstrap/app.php';
         $app->make(Kernel::class)->bootstrap();

From d6b77179856420b21a4d428d070b7d784c90b468 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 16 Mar 2024 15:26:34 +0000
Subject: [PATCH 069/666] Framework: Fixed issues breaking tests

For #4903
---
 app/Translation/FileLoader.php   | 12 +++++++++---
 tests/Auth/ResetPasswordTest.php |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Translation/FileLoader.php b/app/Translation/FileLoader.php
index de112404618..1fec4d18bb1 100644
--- a/app/Translation/FileLoader.php
+++ b/app/Translation/FileLoader.php
@@ -8,16 +8,22 @@ class FileLoader extends BaseLoader
 {
     /**
      * Load the messages for the given locale.
+     *
      * Extends Laravel's translation FileLoader to look in multiple directories
      * so that we can load in translation overrides from the theme file if wanted.
      *
+     * Note: As of using Laravel 10, this may now be redundant since Laravel's
+     * file loader supports multiple paths. This needs further testing though
+     * to confirm if Laravel works how we expect, since we specifically need
+     * the theme folder to be able to partially override core lang files.
+     *
      * @param string      $locale
      * @param string      $group
      * @param string|null $namespace
      *
      * @return array
      */
-    public function load($locale, $group, $namespace = null)
+    public function load($locale, $group, $namespace = null): array
     {
         if ($group === '*' && $namespace === '*') {
             return $this->loadJsonPaths($locale);
@@ -25,8 +31,8 @@ public function load($locale, $group, $namespace = null)
 
         if (is_null($namespace) || $namespace === '*') {
             $themePath = theme_path('lang');
-            $themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
-            $originalTranslations = $this->loadPath($this->path, $locale, $group);
+            $themeTranslations = $themePath ? $this->loadPaths([$themePath], $locale, $group) : [];
+            $originalTranslations = $this->loadPaths($this->paths, $locale, $group);
 
             return array_merge($originalTranslations, $themeTranslations);
         }
diff --git a/tests/Auth/ResetPasswordTest.php b/tests/Auth/ResetPasswordTest.php
index e60ac5643ac..d2af17b9cfb 100644
--- a/tests/Auth/ResetPasswordTest.php
+++ b/tests/Auth/ResetPasswordTest.php
@@ -95,7 +95,7 @@ public function test_reset_request_is_throttled()
         $resp = $this->followingRedirects()->post('/password/email', [
             'email' => $editor->email,
         ]);
-        Notification::assertTimesSent(1, ResetPasswordNotification::class);
+        Notification::assertSentTimes(ResetPasswordNotification::class, 1);
         $resp->assertSee('A password reset link will be sent to ' . $editor->email . ' if that email address is found in the system.');
     }
 }

From 45d52f27ae578e00b8d45d6848ffcefede6015d6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 17 Mar 2024 15:29:09 +0000
Subject: [PATCH 070/666] Migrations: Updated with type hints instead of php
 doc

Also updated code to properly import used facades.
For #4903
---
 .../2014_10_12_000000_create_users_table.php  | 15 +++++----
 ...12_100000_create_password_resets_table.php |  9 ++----
 .../2015_07_12_114933_create_books_table.php  |  9 ++----
 .../2015_07_12_190027_create_pages_table.php  |  9 ++----
 .../2015_07_13_172121_create_images_table.php |  9 ++----
 ...015_07_27_172342_create_chapters_table.php |  9 ++----
 ...015_08_08_200447_add_users_to_entities.php |  9 ++----
 ..._09_093534_create_page_revisions_table.php |  9 ++----
 ...5_08_16_142133_create_activities_table.php |  9 ++----
 ...08_29_105422_add_roles_and_permissions.php | 31 +++++++++----------
 ...015_08_30_125859_create_settings_table.php |  9 ++----
 .../2015_08_31_175240_add_search_indexes.php  |  7 ++---
 ...04_165821_create_social_accounts_table.php |  9 ++----
 ...05_164707_add_email_confirmation_table.php |  9 ++----
 .../2015_11_21_145609_create_views_table.php  |  9 ++----
 .../2015_11_26_221857_add_entity_indexes.php  |  9 ++----
 .../2015_12_05_145049_fulltext_weighting.php  |  7 ++---
 ...15_12_07_195238_add_image_upload_types.php |  9 ++----
 .../2015_12_09_195748_add_user_avatars.php    |  9 ++----
 ...1_11_210908_add_external_auth_to_users.php |  9 ++----
 ...016_02_25_184030_add_slug_to_revisions.php |  9 ++----
 ...27_120329_update_permissions_and_roles.php | 26 +++++++---------
 ...2_28_084200_add_entity_access_controls.php |  9 ++----
 ...6_03_09_203143_add_page_revision_types.php |  9 ++----
 .../2016_03_13_082138_add_page_drafts.php     |  9 ++----
 ...2016_03_25_123157_add_markdown_support.php |  9 ++----
 ...9_100730_add_view_permissions_to_roles.php | 14 ++++-----
 ..._192649_create_joint_permissions_table.php | 15 +++++----
 .../2016_05_06_185215_create_tags_table.php   |  9 ++----
 ...7_181521_add_summary_to_page_revisions.php |  9 ++----
 .../2016_09_29_101449_remove_hidden_roles.php | 14 ++++-----
 ..._10_09_142037_create_attachments_table.php | 14 ++++-----
 .../2017_01_21_163556_create_cache_table.php  |  8 ++---
 ...017_01_21_163602_create_sessions_table.php |  8 ++---
 ...03_19_091553_create_search_index_table.php |  8 ++---
 .../2017_04_20_185112_add_revision_counts.php |  9 ++----
 ...02_152834_update_db_encoding_to_ut8mb4.php |  4 ---
 ...017_08_01_130541_create_comments_table.php | 14 ++++-----
 ...7_08_29_102650_add_cover_image_display.php |  8 ++---
 ...07_15_173514_add_role_external_auth_id.php |  8 ++---
 ..._08_04_115700_create_bookshelves_table.php | 13 +++-----
 ...2019_07_07_112515_add_template_support.php |  9 ++----
 ...19_08_17_140214_add_user_invites_table.php |  8 ++---
 .../2019_12_29_120917_add_api_auth.php        |  9 ++----
 ...08_04_111754_drop_joint_permissions_id.php |  8 ++---
 ...20_08_04_131052_remove_role_name_field.php |  8 ++---
 ...2020_09_19_094251_add_activity_indexes.php |  8 ++---
 ...0_09_27_210059_add_entity_soft_deletes.php |  8 ++---
 ...20_09_27_210528_create_deletions_table.php |  8 ++---
 ...11_07_232321_simplify_activities_table.php |  8 ++---
 ..._173528_add_owned_by_field_to_entities.php |  8 ++---
 ..._01_30_225441_add_settings_type_column.php |  8 ++---
 .../2021_03_08_215138_add_user_slug.php       |  9 ++----
 ...1_05_15_173110_create_favourites_table.php |  8 ++---
 ...1_06_30_173111_create_mfa_values_table.php |  8 ++---
 ...085038_add_mfa_enforced_to_roles_table.php |  8 ++---
 ...8_28_161743_add_export_role_permission.php |  8 ++---
 ..._09_26_044614_add_activities_ip_column.php |  8 ++---
 ...021_11_26_070438_add_index_for_user_ip.php |  8 ++---
 ...021_12_07_111343_create_webhooks_table.php |  8 ++---
 .../2021_12_13_152024_create_jobs_table.php   |  8 ++---
 ..._12_13_152120_create_failed_jobs_table.php |  8 ++---
 ...041_add_webhooks_timeout_error_columns.php |  8 ++---
 ...add_editor_change_field_and_permission.php |  8 ++---
 ..._04_25_140741_update_polymorphic_types.php |  8 ++---
 ...7_16_170051_drop_joint_permission_type.php |  8 ++---
 ...2_08_17_092941_create_references_table.php |  8 ++---
 ..._02_082910_fix_shelf_cover_image_types.php |  8 ++---
 ...91406_flatten_entity_permissions_table.php |  8 ++---
 ...08_104202_drop_entity_restricted_field.php |  8 ++---
 ...625_refactor_joint_permissions_storage.php |  8 ++---
 ...1230_copy_color_settings_for_dark_mode.php |  8 ++---
 ...93655_increase_attachments_path_length.php |  8 ++---
 ...3_200227_add_updated_at_index_to_pages.php |  8 ++---
 ...1823_remove_guest_user_secondary_roles.php |  6 +---
 ...ve_bookshelf_create_entity_permissions.php |  4 ---
 ...receive_notifications_role_permissions.php |  9 ++----
 ...2023_07_31_104430_create_watches_table.php |  8 ++---
 .../2023_08_21_174248_increase_cache_size.php |  8 ++---
 ...2_104541_add_default_template_to_books.php |  8 ++---
 ...40913_add_description_html_to_entities.php |  8 ++---
 ...04542_add_default_template_to_chapters.php |  8 ++---
 ...4_02_04_141358_add_views_updated_index.php |  8 ++---
 83 files changed, 241 insertions(+), 523 deletions(-)

diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 61b73b7f29c..638394df609 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -1,16 +1,17 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
@@ -26,17 +27,15 @@ public function up()
             'name'       => 'Admin',
             'email'      => 'admin@admin.com',
             'password'   => bcrypt('password'),
-            'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
-            'updated_at' => \Carbon\Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'updated_at' => Carbon::now()->toDateTimeString(),
         ]);
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('users');
     }
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index f29aff42b8e..f53370009c6 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('password_resets', function (Blueprint $table) {
             $table->string('email')->index();
@@ -21,10 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('password_resets');
     }
diff --git a/database/migrations/2015_07_12_114933_create_books_table.php b/database/migrations/2015_07_12_114933_create_books_table.php
index 95916945871..98d0433650d 100644
--- a/database/migrations/2015_07_12_114933_create_books_table.php
+++ b/database/migrations/2015_07_12_114933_create_books_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('books', function (Blueprint $table) {
             $table->increments('id');
@@ -23,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('books');
     }
diff --git a/database/migrations/2015_07_12_190027_create_pages_table.php b/database/migrations/2015_07_12_190027_create_pages_table.php
index d9b266813ba..8ef5fc97120 100644
--- a/database/migrations/2015_07_12_190027_create_pages_table.php
+++ b/database/migrations/2015_07_12_190027_create_pages_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('pages', function (Blueprint $table) {
             $table->increments('id');
@@ -27,10 +26,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('pages');
     }
diff --git a/database/migrations/2015_07_13_172121_create_images_table.php b/database/migrations/2015_07_13_172121_create_images_table.php
index 8814d079e36..ae57fc80da0 100644
--- a/database/migrations/2015_07_13_172121_create_images_table.php
+++ b/database/migrations/2015_07_13_172121_create_images_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('images', function (Blueprint $table) {
             $table->increments('id');
@@ -22,10 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('images');
     }
diff --git a/database/migrations/2015_07_27_172342_create_chapters_table.php b/database/migrations/2015_07_27_172342_create_chapters_table.php
index bfccd6fac5a..fca92429c3d 100644
--- a/database/migrations/2015_07_27_172342_create_chapters_table.php
+++ b/database/migrations/2015_07_27_172342_create_chapters_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('chapters', function (Blueprint $table) {
             $table->increments('id');
@@ -25,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('chapters');
     }
diff --git a/database/migrations/2015_08_08_200447_add_users_to_entities.php b/database/migrations/2015_08_08_200447_add_users_to_entities.php
index 8acfd360ae5..51dfafc6aa7 100644
--- a/database/migrations/2015_08_08_200447_add_users_to_entities.php
+++ b/database/migrations/2015_08_08_200447_add_users_to_entities.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->integer('created_by');
@@ -32,10 +31,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropColumn('created_by');
diff --git a/database/migrations/2015_08_09_093534_create_page_revisions_table.php b/database/migrations/2015_08_09_093534_create_page_revisions_table.php
index b8264fd29e6..af9104edcd3 100644
--- a/database/migrations/2015_08_09_093534_create_page_revisions_table.php
+++ b/database/migrations/2015_08_09_093534_create_page_revisions_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('page_revisions', function (Blueprint $table) {
             $table->increments('id');
@@ -25,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('page_revisions');
     }
diff --git a/database/migrations/2015_08_16_142133_create_activities_table.php b/database/migrations/2015_08_16_142133_create_activities_table.php
index 742a4a40dd1..316d52ced9f 100644
--- a/database/migrations/2015_08_16_142133_create_activities_table.php
+++ b/database/migrations/2015_08_16_142133_create_activities_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('activities', function (Blueprint $table) {
             $table->increments('id');
@@ -26,10 +25,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('activities');
     }
diff --git a/database/migrations/2015_08_29_105422_add_roles_and_permissions.php b/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
index 517cfaf439d..a2a8ae9d69f 100644
--- a/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
+++ b/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
@@ -10,17 +10,18 @@
  * @url https://github.com/Zizaco/entrust
  */
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Create table for storing roles
         Schema::create('roles', function (Blueprint $table) {
@@ -71,22 +72,22 @@ public function up()
             'name'         => 'admin',
             'display_name' => 'Admin',
             'description'  => 'Administrator of the whole application',
-            'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-            'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
         ]);
         $editorId = DB::table('roles')->insertGetId([
             'name'         => 'editor',
             'display_name' => 'Editor',
             'description'  => 'User can edit Books, Chapters & Pages',
-            'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-            'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
         ]);
         $viewerId = DB::table('roles')->insertGetId([
             'name'         => 'viewer',
             'display_name' => 'Viewer',
             'description'  => 'User can view books & their content behind authentication',
-            'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-            'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
         ]);
 
         // Create default CRUD permissions and allocate to admins and editors
@@ -97,8 +98,8 @@ public function up()
                 $newPermId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower($op),
                     'display_name' => $op . ' ' . $entity . 's',
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     ['permission_id' => $newPermId, 'role_id' => $adminId],
@@ -115,8 +116,8 @@ public function up()
                 $newPermId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower($op),
                     'display_name' => $op . ' ' . $entity,
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     'permission_id' => $newPermId,
@@ -138,10 +139,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('permission_role');
         Schema::drop('permissions');
diff --git a/database/migrations/2015_08_30_125859_create_settings_table.php b/database/migrations/2015_08_30_125859_create_settings_table.php
index 45c9c08b32d..d1273bf099d 100644
--- a/database/migrations/2015_08_30_125859_create_settings_table.php
+++ b/database/migrations/2015_08_30_125859_create_settings_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('settings', function (Blueprint $table) {
             $table->string('setting_key')->primary()->indexed();
@@ -21,10 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('settings');
     }
diff --git a/database/migrations/2015_08_31_175240_add_search_indexes.php b/database/migrations/2015_08_31_175240_add_search_indexes.php
index 6097fd13edd..4e0421e9e95 100644
--- a/database/migrations/2015_08_31_175240_add_search_indexes.php
+++ b/database/migrations/2015_08_31_175240_add_search_indexes.php
@@ -2,13 +2,12 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up()
     {
@@ -23,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
         $pages = $sm->listTableDetails('pages');
diff --git a/database/migrations/2015_09_04_165821_create_social_accounts_table.php b/database/migrations/2015_09_04_165821_create_social_accounts_table.php
index bea90113628..7a9b1a49655 100644
--- a/database/migrations/2015_09_04_165821_create_social_accounts_table.php
+++ b/database/migrations/2015_09_04_165821_create_social_accounts_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('social_accounts', function (Blueprint $table) {
             $table->increments('id');
@@ -24,10 +23,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('social_accounts');
     }
diff --git a/database/migrations/2015_09_05_164707_add_email_confirmation_table.php b/database/migrations/2015_09_05_164707_add_email_confirmation_table.php
index a28a5728edb..9e58493c79c 100644
--- a/database/migrations/2015_09_05_164707_add_email_confirmation_table.php
+++ b/database/migrations/2015_09_05_164707_add_email_confirmation_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->boolean('email_confirmed')->default(true);
@@ -26,10 +25,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('email_confirmed');
diff --git a/database/migrations/2015_11_21_145609_create_views_table.php b/database/migrations/2015_11_21_145609_create_views_table.php
index bb8c373d889..00ccc7ac317 100644
--- a/database/migrations/2015_11_21_145609_create_views_table.php
+++ b/database/migrations/2015_11_21_145609_create_views_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('views', function (Blueprint $table) {
             $table->increments('id');
@@ -24,10 +23,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('views');
     }
diff --git a/database/migrations/2015_11_26_221857_add_entity_indexes.php b/database/migrations/2015_11_26_221857_add_entity_indexes.php
index 3203eb8a7fd..3f18824477d 100644
--- a/database/migrations/2015_11_26_221857_add_entity_indexes.php
+++ b/database/migrations/2015_11_26_221857_add_entity_indexes.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->index('slug');
@@ -48,10 +47,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->dropIndex('books_slug_index');
diff --git a/database/migrations/2015_12_05_145049_fulltext_weighting.php b/database/migrations/2015_12_05_145049_fulltext_weighting.php
index a18508c4561..7f9d2373c5c 100644
--- a/database/migrations/2015_12_05_145049_fulltext_weighting.php
+++ b/database/migrations/2015_12_05_145049_fulltext_weighting.php
@@ -2,13 +2,12 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up()
     {
@@ -23,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
         $pages = $sm->listTableDetails('pages');
diff --git a/database/migrations/2015_12_07_195238_add_image_upload_types.php b/database/migrations/2015_12_07_195238_add_image_upload_types.php
index c9f9675c713..ce6e5d6b61a 100644
--- a/database/migrations/2015_12_07_195238_add_image_upload_types.php
+++ b/database/migrations/2015_12_07_195238_add_image_upload_types.php
@@ -3,15 +3,14 @@
 use BookStack\Uploads\Image;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('images', function (Blueprint $table) {
             $table->string('path', 400);
@@ -27,10 +26,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('images', function (Blueprint $table) {
             $table->dropColumn('type');
diff --git a/database/migrations/2015_12_09_195748_add_user_avatars.php b/database/migrations/2015_12_09_195748_add_user_avatars.php
index 950526ddc58..dd8bcf0b49e 100644
--- a/database/migrations/2015_12_09_195748_add_user_avatars.php
+++ b/database/migrations/2015_12_09_195748_add_user_avatars.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->integer('image_id')->default(0);
@@ -19,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('image_id');
diff --git a/database/migrations/2016_01_11_210908_add_external_auth_to_users.php b/database/migrations/2016_01_11_210908_add_external_auth_to_users.php
index ff889d867df..413a8a29d95 100644
--- a/database/migrations/2016_01_11_210908_add_external_auth_to_users.php
+++ b/database/migrations/2016_01_11_210908_add_external_auth_to_users.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->string('external_auth_id')->index();
@@ -19,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('external_auth_id');
diff --git a/database/migrations/2016_02_25_184030_add_slug_to_revisions.php b/database/migrations/2016_02_25_184030_add_slug_to_revisions.php
index a083e10b580..86a08f2c8ab 100644
--- a/database/migrations/2016_02_25_184030_add_slug_to_revisions.php
+++ b/database/migrations/2016_02_25_184030_add_slug_to_revisions.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('page_revisions', function (Blueprint $table) {
             $table->string('slug');
@@ -22,10 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('page_revisions', function (Blueprint $table) {
             $table->dropColumn('slug');
diff --git a/database/migrations/2016_02_27_120329_update_permissions_and_roles.php b/database/migrations/2016_02_27_120329_update_permissions_and_roles.php
index dd62301d6f3..c0d86086d92 100644
--- a/database/migrations/2016_02_27_120329_update_permissions_and_roles.php
+++ b/database/migrations/2016_02_27_120329_update_permissions_and_roles.php
@@ -1,15 +1,15 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Get roles with permissions we need to change
         $adminRoleId = DB::table('roles')->where('name', '=', 'admin')->first()->id;
@@ -30,8 +30,8 @@ public function up()
             $permissionId = DB::table('permissions')->insertGetId([
                 'name'         => $name,
                 'display_name' => $displayName,
-                'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                'created_at'   => Carbon::now()->toDateTimeString(),
+                'updated_at'   => Carbon::now()->toDateTimeString(),
             ]);
             DB::table('permission_role')->insert([
                 'role_id'       => $adminRoleId,
@@ -47,8 +47,8 @@ public function up()
                 $permissionId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
                     'display_name' => $op . ' ' . $entity . 's',
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     'role_id'       => $adminRoleId,
@@ -66,10 +66,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Get roles with permissions we need to change
         $adminRoleId = DB::table('roles')->where('name', '=', 'admin')->first()->id;
@@ -85,8 +83,8 @@ public function down()
                 $permissionId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower($op),
                     'display_name' => $op . ' ' . $entity . 's',
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     'role_id'       => $adminRoleId,
@@ -103,8 +101,8 @@ public function down()
                 $permissionId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower($op),
                     'display_name' => $op . ' ' . $entity,
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     'role_id'       => $adminRoleId,
diff --git a/database/migrations/2016_02_28_084200_add_entity_access_controls.php b/database/migrations/2016_02_28_084200_add_entity_access_controls.php
index 7a796e728d2..cf8ba5f3027 100644
--- a/database/migrations/2016_02_28_084200_add_entity_access_controls.php
+++ b/database/migrations/2016_02_28_084200_add_entity_access_controls.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('images', function (Blueprint $table) {
             $table->integer('uploaded_to')->default(0);
@@ -46,10 +45,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('images', function (Blueprint $table) {
             $table->dropColumn('uploaded_to');
diff --git a/database/migrations/2016_03_09_203143_add_page_revision_types.php b/database/migrations/2016_03_09_203143_add_page_revision_types.php
index 2fc63043724..566f2fdeb1f 100644
--- a/database/migrations/2016_03_09_203143_add_page_revision_types.php
+++ b/database/migrations/2016_03_09_203143_add_page_revision_types.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('page_revisions', function (Blueprint $table) {
             $table->string('type')->default('version');
@@ -20,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('page_revisions', function (Blueprint $table) {
             $table->dropColumn('type');
diff --git a/database/migrations/2016_03_13_082138_add_page_drafts.php b/database/migrations/2016_03_13_082138_add_page_drafts.php
index ce597963215..a8690513f67 100644
--- a/database/migrations/2016_03_13_082138_add_page_drafts.php
+++ b/database/migrations/2016_03_13_082138_add_page_drafts.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->boolean('draft')->default(false);
@@ -20,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropColumn('draft');
diff --git a/database/migrations/2016_03_25_123157_add_markdown_support.php b/database/migrations/2016_03_25_123157_add_markdown_support.php
index a89fc273d78..f0b42b645e9 100644
--- a/database/migrations/2016_03_25_123157_add_markdown_support.php
+++ b/database/migrations/2016_03_25_123157_add_markdown_support.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->longText('markdown')->default('');
@@ -23,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropColumn('markdown');
diff --git a/database/migrations/2016_04_09_100730_add_view_permissions_to_roles.php b/database/migrations/2016_04_09_100730_add_view_permissions_to_roles.php
index 411c240074c..481ac785f28 100644
--- a/database/migrations/2016_04_09_100730_add_view_permissions_to_roles.php
+++ b/database/migrations/2016_04_09_100730_add_view_permissions_to_roles.php
@@ -1,15 +1,15 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $currentRoles = DB::table('roles')->get();
 
@@ -21,8 +21,8 @@ public function up()
                 $permId = DB::table('permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
                     'display_name' => $op . ' ' . $entity . 's',
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 // Assign view permission to all current roles
                 foreach ($currentRoles as $role) {
@@ -37,10 +37,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Delete the new view permission
         $entities = ['Book', 'Page', 'Chapter'];
diff --git a/database/migrations/2016_04_20_192649_create_joint_permissions_table.php b/database/migrations/2016_04_20_192649_create_joint_permissions_table.php
index 745e156bc20..ba9f615e47e 100644
--- a/database/migrations/2016_04_20_192649_create_joint_permissions_table.php
+++ b/database/migrations/2016_04_20_192649_create_joint_permissions_table.php
@@ -1,17 +1,18 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('joint_permissions', function (Blueprint $table) {
             $table->increments('id');
@@ -48,8 +49,8 @@ public function up()
             'description'  => 'The role given to public visitors if allowed',
             'system_name'  => 'public',
             'hidden'       => true,
-            'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-            'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
         ];
 
         // Ensure unique name
@@ -79,10 +80,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('joint_permissions');
 
diff --git a/database/migrations/2016_05_06_185215_create_tags_table.php b/database/migrations/2016_05_06_185215_create_tags_table.php
index b065a052f68..1be9a389f1c 100644
--- a/database/migrations/2016_05_06_185215_create_tags_table.php
+++ b/database/migrations/2016_05_06_185215_create_tags_table.php
@@ -2,15 +2,14 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('tags', function (Blueprint $table) {
             $table->increments('id');
@@ -30,10 +29,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('tags');
     }
diff --git a/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php b/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php
index 03942b17a39..562e6415f36 100644
--- a/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php
+++ b/database/migrations/2016_07_07_181521_add_summary_to_page_revisions.php
@@ -1,15 +1,14 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('page_revisions', function ($table) {
             $table->string('summary')->nullable();
@@ -18,10 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('page_revisions', function ($table) {
             $table->dropColumn('summary');
diff --git a/database/migrations/2016_09_29_101449_remove_hidden_roles.php b/database/migrations/2016_09_29_101449_remove_hidden_roles.php
index 2f729673ffa..fa0a5fe9270 100644
--- a/database/migrations/2016_09_29_101449_remove_hidden_roles.php
+++ b/database/migrations/2016_09_29_101449_remove_hidden_roles.php
@@ -1,17 +1,17 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Remove the hidden property from roles
         Schema::table('roles', function (Blueprint $table) {
@@ -29,8 +29,8 @@ public function up()
             'name'            => 'Guest',
             'system_name'     => 'public',
             'email_confirmed' => true,
-            'created_at'      => \Carbon\Carbon::now(),
-            'updated_at'      => \Carbon\Carbon::now(),
+            'created_at'      => Carbon::now(),
+            'updated_at'      => Carbon::now(),
         ]);
 
         // Get the public role
@@ -45,10 +45,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->boolean('hidden')->default(false);
diff --git a/database/migrations/2016_10_09_142037_create_attachments_table.php b/database/migrations/2016_10_09_142037_create_attachments_table.php
index 41db5723d0a..278051c8be1 100644
--- a/database/migrations/2016_10_09_142037_create_attachments_table.php
+++ b/database/migrations/2016_10_09_142037_create_attachments_table.php
@@ -1,17 +1,17 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('attachments', function (Blueprint $table) {
             $table->increments('id');
@@ -40,8 +40,8 @@ public function up()
             $permissionId = DB::table('role_permissions')->insertGetId([
                 'name'         => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
                 'display_name' => $op . ' ' . $entity . 's',
-                'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                'created_at'   => Carbon::now()->toDateTimeString(),
+                'updated_at'   => Carbon::now()->toDateTimeString(),
             ]);
             DB::table('permission_role')->insert([
                 'role_id'       => $adminRoleId,
@@ -52,10 +52,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('attachments');
 
diff --git a/database/migrations/2017_01_21_163556_create_cache_table.php b/database/migrations/2017_01_21_163556_create_cache_table.php
index abff912f20a..7c07c0cb8be 100644
--- a/database/migrations/2017_01_21_163556_create_cache_table.php
+++ b/database/migrations/2017_01_21_163556_create_cache_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('cache', function (Blueprint $table) {
             $table->string('key')->unique();
@@ -22,10 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('cache');
     }
diff --git a/database/migrations/2017_01_21_163602_create_sessions_table.php b/database/migrations/2017_01_21_163602_create_sessions_table.php
index c32838a8cc9..3f52752c234 100644
--- a/database/migrations/2017_01_21_163602_create_sessions_table.php
+++ b/database/migrations/2017_01_21_163602_create_sessions_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('sessions', function (Blueprint $table) {
             $table->string('id')->unique();
@@ -25,10 +23,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('sessions');
     }
diff --git a/database/migrations/2017_03_19_091553_create_search_index_table.php b/database/migrations/2017_03_19_091553_create_search_index_table.php
index 03a63392afd..72be3ccbe0c 100644
--- a/database/migrations/2017_03_19_091553_create_search_index_table.php
+++ b/database/migrations/2017_03_19_091553_create_search_index_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('search_terms', function (Blueprint $table) {
             $table->increments('id');
@@ -55,10 +53,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // This was removed for v0.24 since these indexes are removed anyway
         // and will cause issues for db engines that don't support such indexes.
diff --git a/database/migrations/2017_04_20_185112_add_revision_counts.php b/database/migrations/2017_04_20_185112_add_revision_counts.php
index 891ff8e0a1d..182d95c7597 100644
--- a/database/migrations/2017_04_20_185112_add_revision_counts.php
+++ b/database/migrations/2017_04_20_185112_add_revision_counts.php
@@ -2,16 +2,15 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->integer('revision_count');
@@ -29,10 +28,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropColumn('revision_count');
diff --git a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php
index 7805be700bd..178cb584f9a 100644
--- a/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php
+++ b/database/migrations/2017_07_02_152834_update_db_encoding_to_ut8mb4.php
@@ -6,8 +6,6 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up()
     {
@@ -18,8 +16,6 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down()
     {
diff --git a/database/migrations/2017_08_01_130541_create_comments_table.php b/database/migrations/2017_08_01_130541_create_comments_table.php
index f654ebf6596..d1478547616 100644
--- a/database/migrations/2017_08_01_130541_create_comments_table.php
+++ b/database/migrations/2017_08_01_130541_create_comments_table.php
@@ -1,17 +1,17 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('comments', function (Blueprint $table) {
             $table->increments('id')->unsigned();
@@ -37,8 +37,8 @@ public function up()
                 $permissionId = DB::table('role_permissions')->insertGetId([
                     'name'         => strtolower($entity) . '-' . strtolower(str_replace(' ', '-', $op)),
                     'display_name' => $op . ' ' . $entity . 's',
-                    'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                    'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                    'created_at'   => Carbon::now()->toDateTimeString(),
+                    'updated_at'   => Carbon::now()->toDateTimeString(),
                 ]);
                 DB::table('permission_role')->insert([
                     'role_id'       => $adminRoleId,
@@ -50,10 +50,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('comments');
         // Delete comment role permissions
diff --git a/database/migrations/2017_08_29_102650_add_cover_image_display.php b/database/migrations/2017_08_29_102650_add_cover_image_display.php
index 5ba3145f2b0..0f7b7d82a9a 100644
--- a/database/migrations/2017_08_29_102650_add_cover_image_display.php
+++ b/database/migrations/2017_08_29_102650_add_cover_image_display.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->integer('image_id')->nullable()->default(null);
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->dropColumn('image_id');
diff --git a/database/migrations/2018_07_15_173514_add_role_external_auth_id.php b/database/migrations/2018_07_15_173514_add_role_external_auth_id.php
index eb2bf91fc83..58694765655 100644
--- a/database/migrations/2018_07_15_173514_add_role_external_auth_id.php
+++ b/database/migrations/2018_07_15_173514_add_role_external_auth_id.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->string('external_auth_id', 180)->default('');
@@ -21,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->dropColumn('external_auth_id');
diff --git a/database/migrations/2018_08_04_115700_create_bookshelves_table.php b/database/migrations/2018_08_04_115700_create_bookshelves_table.php
index bd3478bc7c8..54ccfb6baea 100644
--- a/database/migrations/2018_08_04_115700_create_bookshelves_table.php
+++ b/database/migrations/2018_08_04_115700_create_bookshelves_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
@@ -9,10 +10,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
 
         // Convert the existing entity tables to InnoDB.
@@ -83,8 +82,8 @@ public function up()
             $permId = DB::table('role_permissions')->insertGetId([
                 'name'         => 'bookshelf-' . $dbOpName,
                 'display_name' => $op . ' ' . 'BookShelves',
-                'created_at'   => \Carbon\Carbon::now()->toDateTimeString(),
-                'updated_at'   => \Carbon\Carbon::now()->toDateTimeString(),
+                'created_at'   => Carbon::now()->toDateTimeString(),
+                'updated_at'   => Carbon::now()->toDateTimeString(),
             ]);
 
             $rowsToInsert = $roleIdsWithBookPermission->filter(function ($roleId) {
@@ -103,10 +102,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Drop created permissions
         $ops = ['bookshelf-create-all', 'bookshelf-create-own', 'bookshelf-delete-all', 'bookshelf-delete-own', 'bookshelf-update-all', 'bookshelf-update-own', 'bookshelf-view-all', 'bookshelf-view-own'];
diff --git a/database/migrations/2019_07_07_112515_add_template_support.php b/database/migrations/2019_07_07_112515_add_template_support.php
index 423e02827f5..cabde549e83 100644
--- a/database/migrations/2019_07_07_112515_add_template_support.php
+++ b/database/migrations/2019_07_07_112515_add_template_support.php
@@ -3,16 +3,15 @@
 use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->boolean('template')->default(false);
@@ -35,10 +34,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropColumn('template');
diff --git a/database/migrations/2019_08_17_140214_add_user_invites_table.php b/database/migrations/2019_08_17_140214_add_user_invites_table.php
index ce88a28949b..1ab4c72f8aa 100644
--- a/database/migrations/2019_08_17_140214_add_user_invites_table.php
+++ b/database/migrations/2019_08_17_140214_add_user_invites_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('user_invites', function (Blueprint $table) {
             $table->increments('id');
@@ -23,10 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('user_invites');
     }
diff --git a/database/migrations/2019_12_29_120917_add_api_auth.php b/database/migrations/2019_12_29_120917_add_api_auth.php
index 2cf970a8aee..99ce8d27c49 100644
--- a/database/migrations/2019_12_29_120917_add_api_auth.php
+++ b/database/migrations/2019_12_29_120917_add_api_auth.php
@@ -3,16 +3,15 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
 
         // Add API tokens table
@@ -42,10 +41,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Remove API tokens table
         Schema::dropIfExists('api_tokens');
diff --git a/database/migrations/2020_08_04_111754_drop_joint_permissions_id.php b/database/migrations/2020_08_04_111754_drop_joint_permissions_id.php
index 902d3c227b6..882001cad5a 100644
--- a/database/migrations/2020_08_04_111754_drop_joint_permissions_id.php
+++ b/database/migrations/2020_08_04_111754_drop_joint_permissions_id.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('joint_permissions', function (Blueprint $table) {
             $table->dropColumn('id');
@@ -21,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('joint_permissions', function (Blueprint $table) {
             $table->dropPrimary(['role_id', 'entity_type', 'entity_id', 'action']);
diff --git a/database/migrations/2020_08_04_131052_remove_role_name_field.php b/database/migrations/2020_08_04_131052_remove_role_name_field.php
index cd9f64697c7..10800e11fa4 100644
--- a/database/migrations/2020_08_04_131052_remove_role_name_field.php
+++ b/database/migrations/2020_08_04_131052_remove_role_name_field.php
@@ -9,10 +9,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->dropColumn('name');
@@ -21,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->string('name')->index();
diff --git a/database/migrations/2020_09_19_094251_add_activity_indexes.php b/database/migrations/2020_09_19_094251_add_activity_indexes.php
index f7f35b62b9a..ca1afb1daa9 100644
--- a/database/migrations/2020_09_19_094251_add_activity_indexes.php
+++ b/database/migrations/2020_09_19_094251_add_activity_indexes.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->index('key');
@@ -21,10 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->dropIndex('activities_key_index');
diff --git a/database/migrations/2020_09_27_210059_add_entity_soft_deletes.php b/database/migrations/2020_09_27_210059_add_entity_soft_deletes.php
index 9cc12acdce3..bc6c3f18f59 100644
--- a/database/migrations/2020_09_27_210059_add_entity_soft_deletes.php
+++ b/database/migrations/2020_09_27_210059_add_entity_soft_deletes.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('bookshelves', function (Blueprint $table) {
             $table->softDeletes();
@@ -29,10 +27,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('bookshelves', function (Blueprint $table) {
             $table->dropSoftDeletes();
diff --git a/database/migrations/2020_09_27_210528_create_deletions_table.php b/database/migrations/2020_09_27_210528_create_deletions_table.php
index 3b1098175e9..96c6c0b0dee 100644
--- a/database/migrations/2020_09_27_210528_create_deletions_table.php
+++ b/database/migrations/2020_09_27_210528_create_deletions_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('deletions', function (Blueprint $table) {
             $table->increments('id');
@@ -28,10 +26,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('deletions');
     }
diff --git a/database/migrations/2020_11_07_232321_simplify_activities_table.php b/database/migrations/2020_11_07_232321_simplify_activities_table.php
index 6ebe3fad015..c128a3235f7 100644
--- a/database/migrations/2020_11_07_232321_simplify_activities_table.php
+++ b/database/migrations/2020_11_07_232321_simplify_activities_table.php
@@ -9,10 +9,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->renameColumn('key', 'type');
@@ -32,10 +30,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         DB::table('activities')
             ->whereNull('entity_id')
diff --git a/database/migrations/2020_12_30_173528_add_owned_by_field_to_entities.php b/database/migrations/2020_12_30_173528_add_owned_by_field_to_entities.php
index d9fab7f02dd..965a061d834 100644
--- a/database/migrations/2020_12_30_173528_add_owned_by_field_to_entities.php
+++ b/database/migrations/2020_12_30_173528_add_owned_by_field_to_entities.php
@@ -9,10 +9,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $tables = ['pages', 'books', 'chapters', 'bookshelves'];
         foreach ($tables as $table) {
@@ -30,10 +28,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $tables = ['pages', 'books', 'chapters', 'bookshelves'];
         foreach ($tables as $table) {
diff --git a/database/migrations/2021_01_30_225441_add_settings_type_column.php b/database/migrations/2021_01_30_225441_add_settings_type_column.php
index 5d83d15f19a..367b93a89c8 100644
--- a/database/migrations/2021_01_30_225441_add_settings_type_column.php
+++ b/database/migrations/2021_01_30_225441_add_settings_type_column.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('settings', function (Blueprint $table) {
             $table->string('type', 50)->default('string');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('settings', function (Blueprint $table) {
             $table->dropColumn('type');
diff --git a/database/migrations/2021_03_08_215138_add_user_slug.php b/database/migrations/2021_03_08_215138_add_user_slug.php
index c0e1313a714..af01d667251 100644
--- a/database/migrations/2021_03_08_215138_add_user_slug.php
+++ b/database/migrations/2021_03_08_215138_add_user_slug.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 
@@ -9,10 +10,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->string('slug', 180);
@@ -38,10 +37,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('slug');
diff --git a/database/migrations/2021_05_15_173110_create_favourites_table.php b/database/migrations/2021_05_15_173110_create_favourites_table.php
index cdd7f4f6485..73fa1b24be5 100644
--- a/database/migrations/2021_05_15_173110_create_favourites_table.php
+++ b/database/migrations/2021_05_15_173110_create_favourites_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('favourites', function (Blueprint $table) {
             $table->increments('id');
@@ -26,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('favourites');
     }
diff --git a/database/migrations/2021_06_30_173111_create_mfa_values_table.php b/database/migrations/2021_06_30_173111_create_mfa_values_table.php
index d145bf4ae9a..ea45b8ce124 100644
--- a/database/migrations/2021_06_30_173111_create_mfa_values_table.php
+++ b/database/migrations/2021_06_30_173111_create_mfa_values_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('mfa_values', function (Blueprint $table) {
             $table->increments('id');
@@ -24,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('mfa_values');
     }
diff --git a/database/migrations/2021_07_03_085038_add_mfa_enforced_to_roles_table.php b/database/migrations/2021_07_03_085038_add_mfa_enforced_to_roles_table.php
index 8a180f08854..b8f8b1cff21 100644
--- a/database/migrations/2021_07_03_085038_add_mfa_enforced_to_roles_table.php
+++ b/database/migrations/2021_07_03_085038_add_mfa_enforced_to_roles_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->boolean('mfa_enforced');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('roles', function (Blueprint $table) {
             $table->dropColumn('mfa_enforced');
diff --git a/database/migrations/2021_08_28_161743_add_export_role_permission.php b/database/migrations/2021_08_28_161743_add_export_role_permission.php
index 3bacab20b4e..21f45aa0691 100644
--- a/database/migrations/2021_08_28_161743_add_export_role_permission.php
+++ b/database/migrations/2021_08_28_161743_add_export_role_permission.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Create new templates-manage permission and assign to admin role
         $roles = DB::table('roles')->get('id');
@@ -34,10 +32,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Remove content-export permission
         $contentExportPermission = DB::table('role_permissions')
diff --git a/database/migrations/2021_09_26_044614_add_activities_ip_column.php b/database/migrations/2021_09_26_044614_add_activities_ip_column.php
index 5f8a9500276..6c21f4b2629 100644
--- a/database/migrations/2021_09_26_044614_add_activities_ip_column.php
+++ b/database/migrations/2021_09_26_044614_add_activities_ip_column.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->string('ip', 45)->after('user_id');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->dropColumn('ip');
diff --git a/database/migrations/2021_11_26_070438_add_index_for_user_ip.php b/database/migrations/2021_11_26_070438_add_index_for_user_ip.php
index 564e68a6de0..9a0171bde11 100644
--- a/database/migrations/2021_11_26_070438_add_index_for_user_ip.php
+++ b/database/migrations/2021_11_26_070438_add_index_for_user_ip.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->index('ip', 'activities_ip_index');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('activities', function (Blueprint $table) {
             $table->dropIndex('activities_ip_index');
diff --git a/database/migrations/2021_12_07_111343_create_webhooks_table.php b/database/migrations/2021_12_07_111343_create_webhooks_table.php
index 15d4851d68f..69be2273db0 100644
--- a/database/migrations/2021_12_07_111343_create_webhooks_table.php
+++ b/database/migrations/2021_12_07_111343_create_webhooks_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('webhooks', function (Blueprint $table) {
             $table->increments('id');
@@ -37,10 +35,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('webhooks');
         Schema::dropIfExists('webhook_tracked_events');
diff --git a/database/migrations/2021_12_13_152024_create_jobs_table.php b/database/migrations/2021_12_13_152024_create_jobs_table.php
index a786a891006..6098d9b123f 100644
--- a/database/migrations/2021_12_13_152024_create_jobs_table.php
+++ b/database/migrations/2021_12_13_152024_create_jobs_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -26,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('jobs');
     }
diff --git a/database/migrations/2021_12_13_152120_create_failed_jobs_table.php b/database/migrations/2021_12_13_152120_create_failed_jobs_table.php
index 17191986b47..249da8171ac 100644
--- a/database/migrations/2021_12_13_152120_create_failed_jobs_table.php
+++ b/database/migrations/2021_12_13_152120_create_failed_jobs_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
             $table->id();
@@ -26,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('failed_jobs');
     }
diff --git a/database/migrations/2022_01_03_154041_add_webhooks_timeout_error_columns.php b/database/migrations/2022_01_03_154041_add_webhooks_timeout_error_columns.php
index cb26fa26aea..968568d3362 100644
--- a/database/migrations/2022_01_03_154041_add_webhooks_timeout_error_columns.php
+++ b/database/migrations/2022_01_03_154041_add_webhooks_timeout_error_columns.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('webhooks', function (Blueprint $table) {
             $table->unsignedInteger('timeout')->default(3);
@@ -23,10 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('webhooks', function (Blueprint $table) {
             $table->dropColumn('timeout');
diff --git a/database/migrations/2022_04_17_101741_add_editor_change_field_and_permission.php b/database/migrations/2022_04_17_101741_add_editor_change_field_and_permission.php
index 17ed0fba064..568e2651264 100644
--- a/database/migrations/2022_04_17_101741_add_editor_change_field_and_permission.php
+++ b/database/migrations/2022_04_17_101741_add_editor_change_field_and_permission.php
@@ -10,10 +10,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Add the new 'editor' column to the pages table
         Schema::table('pages', function (Blueprint $table) {
@@ -46,10 +44,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Drop the new column from the pages table
         Schema::table('pages', function (Blueprint $table) {
diff --git a/database/migrations/2022_04_25_140741_update_polymorphic_types.php b/database/migrations/2022_04_25_140741_update_polymorphic_types.php
index 2ec45e7d188..00e1e0688fc 100644
--- a/database/migrations/2022_04_25_140741_update_polymorphic_types.php
+++ b/database/migrations/2022_04_25_140741_update_polymorphic_types.php
@@ -32,10 +32,8 @@
 
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         foreach ($this->columnsByTable as $table => $column) {
             foreach ($this->changeMap as $oldVal => $newVal) {
@@ -48,10 +46,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         foreach ($this->columnsByTable as $table => $column) {
             foreach ($this->changeMap as $oldVal => $newVal) {
diff --git a/database/migrations/2022_07_16_170051_drop_joint_permission_type.php b/database/migrations/2022_07_16_170051_drop_joint_permission_type.php
index ac52af2a6d6..a05290e8ae8 100644
--- a/database/migrations/2022_07_16_170051_drop_joint_permission_type.php
+++ b/database/migrations/2022_07_16_170051_drop_joint_permission_type.php
@@ -9,10 +9,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         DB::table('joint_permissions')
             ->where('action', '!=', 'view')
@@ -27,10 +25,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('joint_permissions', function (Blueprint $table) {
             $table->string('action');
diff --git a/database/migrations/2022_08_17_092941_create_references_table.php b/database/migrations/2022_08_17_092941_create_references_table.php
index 4b688c43e88..e2580289d5e 100644
--- a/database/migrations/2022_08_17_092941_create_references_table.php
+++ b/database/migrations/2022_08_17_092941_create_references_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('references', function (Blueprint $table) {
             $table->id();
@@ -24,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('references');
     }
diff --git a/database/migrations/2022_09_02_082910_fix_shelf_cover_image_types.php b/database/migrations/2022_09_02_082910_fix_shelf_cover_image_types.php
index b8c23671dc1..aecb4bca397 100644
--- a/database/migrations/2022_09_02_082910_fix_shelf_cover_image_types.php
+++ b/database/migrations/2022_09_02_082910_fix_shelf_cover_image_types.php
@@ -7,10 +7,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // This updates the 'type' field for images, uploaded as shelf cover images,
         // to be cover_bookshelf instead of cover_book.
@@ -32,10 +30,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         DB::table('images')
             ->where('type', '=', 'cover_bookshelf')
diff --git a/database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php b/database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
index f1072102f87..a086796e9f1 100644
--- a/database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
+++ b/database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
@@ -10,10 +10,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Remove entries for non-existing roles (Caused by previous lack of deletion handling)
         $roleIds = DB::table('roles')->pluck('id');
@@ -63,10 +61,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Create old table structure for entity_permissions
         Schema::create('old_entity_permissions', function (Blueprint $table) {
diff --git a/database/migrations/2022_10_08_104202_drop_entity_restricted_field.php b/database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
index b2987674d61..8e45d9ea51f 100644
--- a/database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
+++ b/database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
@@ -11,10 +11,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Remove entity-permissions on non-restricted entities
         $deleteInactiveEntityPermissions = function (string $table, string $morphClass) {
@@ -61,10 +59,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         // Create restricted columns
         $createRestrictedColumn = fn(Blueprint $table) => $table->boolean('restricted')->index()->default(0);
diff --git a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
index 53994c52b57..0e25c1d6052 100644
--- a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
+++ b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
@@ -10,10 +10,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Truncate before schema changes to avoid performance issues
         // since we'll need to rebuild anyway.
@@ -34,10 +32,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         DB::table('joint_permissions')->truncate();
 
diff --git a/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php b/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php
index 5187dabf470..6f137eca705 100644
--- a/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php
+++ b/database/migrations/2023_01_28_141230_copy_color_settings_for_dark_mode.php
@@ -7,10 +7,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $colorSettings = [
             'app-color',
@@ -45,10 +43,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $colorSettings = [
             'app-color-dark',
diff --git a/database/migrations/2023_02_20_093655_increase_attachments_path_length.php b/database/migrations/2023_02_20_093655_increase_attachments_path_length.php
index f7cb64ce648..b2a81d49e13 100644
--- a/database/migrations/2023_02_20_093655_increase_attachments_path_length.php
+++ b/database/migrations/2023_02_20_093655_increase_attachments_path_length.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('attachments', function (Blueprint $table) {
             $table->text('path')->change();
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('attachments', function (Blueprint $table) {
             $table->string('path')->change();
diff --git a/database/migrations/2023_02_23_200227_add_updated_at_index_to_pages.php b/database/migrations/2023_02_23_200227_add_updated_at_index_to_pages.php
index 115bbb0c011..c3dc3fb0aa7 100644
--- a/database/migrations/2023_02_23_200227_add_updated_at_index_to_pages.php
+++ b/database/migrations/2023_02_23_200227_add_updated_at_index_to_pages.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->index('updated_at', 'pages_updated_at_index');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('pages', function (Blueprint $table) {
             $table->dropIndex('pages_updated_at_index');
diff --git a/database/migrations/2023_06_10_071823_remove_guest_user_secondary_roles.php b/database/migrations/2023_06_10_071823_remove_guest_user_secondary_roles.php
index 8d04efdd953..05f6be4a1c9 100644
--- a/database/migrations/2023_06_10_071823_remove_guest_user_secondary_roles.php
+++ b/database/migrations/2023_06_10_071823_remove_guest_user_secondary_roles.php
@@ -7,10 +7,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $guestUserId = DB::table('users')
             ->where('system_name', '=', 'public')
@@ -36,8 +34,6 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down()
     {
diff --git a/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php b/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php
index b5dcaee751c..540491d3b38 100644
--- a/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php
+++ b/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php
@@ -7,8 +7,6 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up()
     {
@@ -20,8 +18,6 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down()
     {
diff --git a/database/migrations/2023_07_25_124945_add_receive_notifications_role_permissions.php b/database/migrations/2023_07_25_124945_add_receive_notifications_role_permissions.php
index 4872e421e64..79e45a762fd 100644
--- a/database/migrations/2023_07_25_124945_add_receive_notifications_role_permissions.php
+++ b/database/migrations/2023_07_25_124945_add_receive_notifications_role_permissions.php
@@ -2,15 +2,14 @@
 
 use Carbon\Carbon;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         // Create new receive-notifications permission and assign to admin role
         $permissionId = DB::table('role_permissions')->insertGetId([
@@ -29,10 +28,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $permission = DB::table('role_permissions')
             ->where('name', '=', 'receive-notifications')
diff --git a/database/migrations/2023_07_31_104430_create_watches_table.php b/database/migrations/2023_07_31_104430_create_watches_table.php
index e2a5c20d07d..cf2c7f1051b 100644
--- a/database/migrations/2023_07_31_104430_create_watches_table.php
+++ b/database/migrations/2023_07_31_104430_create_watches_table.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('watches', function (Blueprint $table) {
             $table->increments('id');
@@ -27,10 +25,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('watches');
     }
diff --git a/database/migrations/2023_08_21_174248_increase_cache_size.php b/database/migrations/2023_08_21_174248_increase_cache_size.php
index 865472c2e5d..bca7f9fc3de 100644
--- a/database/migrations/2023_08_21_174248_increase_cache_size.php
+++ b/database/migrations/2023_08_21_174248_increase_cache_size.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('cache', function (Blueprint $table) {
             $table->mediumText('value')->change();
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('cache', function (Blueprint $table) {
             $table->text('value')->change();
diff --git a/database/migrations/2023_12_02_104541_add_default_template_to_books.php b/database/migrations/2023_12_02_104541_add_default_template_to_books.php
index c23bebc2e63..bfc480a2e22 100644
--- a/database/migrations/2023_12_02_104541_add_default_template_to_books.php
+++ b/database/migrations/2023_12_02_104541_add_default_template_to_books.php
@@ -8,10 +8,8 @@ class AddDefaultTemplateToBooks extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->integer('default_template_id')->nullable()->default(null);
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('books', function (Blueprint $table) {
             $table->dropColumn('default_template_id');
diff --git a/database/migrations/2023_12_17_140913_add_description_html_to_entities.php b/database/migrations/2023_12_17_140913_add_description_html_to_entities.php
index 68c52e81be5..781197e601d 100644
--- a/database/migrations/2023_12_17_140913_add_description_html_to_entities.php
+++ b/database/migrations/2023_12_17_140913_add_description_html_to_entities.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         $addColumn = fn(Blueprint $table) => $table->text('description_html');
 
@@ -22,10 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         $removeColumn = fn(Blueprint $table) => $table->removeColumn('description_html');
 
diff --git a/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
index b3a103a0173..77df82272a7 100644
--- a/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
+++ b/database/migrations/2024_01_01_104542_add_default_template_to_chapters.php
@@ -8,10 +8,8 @@ class AddDefaultTemplateToChapters extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('chapters', function (Blueprint $table) {
             $table->integer('default_template_id')->nullable()->default(null);
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('chapters', function (Blueprint $table) {
             $table->dropColumn('default_template_id');
diff --git a/database/migrations/2024_02_04_141358_add_views_updated_index.php b/database/migrations/2024_02_04_141358_add_views_updated_index.php
index a643b3a1e0e..bc753867873 100644
--- a/database/migrations/2024_02_04_141358_add_views_updated_index.php
+++ b/database/migrations/2024_02_04_141358_add_views_updated_index.php
@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('views', function (Blueprint $table) {
             $table->index(['updated_at'], 'views_updated_at_index');
@@ -20,10 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('views', function (Blueprint $table) {
             $table->dropIndex('views_updated_at_index');

From 3250fc732c74ae09566a48da2739c3f5e450665f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 17 Mar 2024 15:41:11 +0000
Subject: [PATCH 071/666] Testing: Updated PHPUnit from 9 to 10

For #4903
---
 composer.json |   6 +-
 composer.lock | 669 +++++++++++++++++++++-----------------------------
 phpunit.xml   |  15 +-
 3 files changed, 289 insertions(+), 401 deletions(-)

diff --git a/composer.json b/composer.json
index f58c2c9dd18..7a39c41b2cc 100644
--- a/composer.json
+++ b/composer.json
@@ -45,11 +45,11 @@
         "fakerphp/faker": "^1.21",
         "itsgoingd/clockwork": "^5.1",
         "mockery/mockery": "^1.5",
-        "nunomaduro/collision": "^6.4",
+        "nunomaduro/collision": "^7.0",
         "larastan/larastan": "^2.7",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.0",
         "squizlabs/php_codesniffer": "^3.7",
-        "ssddanbrown/asserthtml": "^2.0"
+        "ssddanbrown/asserthtml": "^3.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 0edbd79bdeb..9738b9117b0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "df0a9795e5dd228d680cabf1f34d3aa6",
+    "content-hash": "5c83a032875be7a7edcfd5a18264ac7d",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -4820,16 +4820,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.1",
+            "version": "v0.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "39621c73e0754328252f032c6997b983afc50431"
+                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/39621c73e0754328252f032c6997b983afc50431",
-                "reference": "39621c73e0754328252f032c6997b983afc50431",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d",
+                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d",
                 "shasum": ""
             },
             "require": {
@@ -4893,9 +4893,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.1"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.2"
             },
-            "time": "2024-03-15T03:22:57+00:00"
+            "time": "2024-03-17T01:53:00+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -8078,76 +8078,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-30T00:23:10+00:00"
-        },
         {
             "name": "fakerphp/faker",
             "version": "v1.23.1",
@@ -8654,38 +8584,43 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v6.4.0",
+            "version": "v7.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015"
+                "reference": "49ec67fa7b002712da8526678abd651c09f375b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2",
+                "reference": "49ec67fa7b002712da8526678abd651c09f375b2",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.14.5",
-                "php": "^8.0.0",
-                "symfony/console": "^6.0.2"
+                "filp/whoops": "^2.15.3",
+                "nunomaduro/termwind": "^1.15.1",
+                "php": "^8.1.0",
+                "symfony/console": "^6.3.4"
+            },
+            "conflict": {
+                "laravel/framework": ">=11.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^6.4.1",
-                "laravel/framework": "^9.26.1",
-                "laravel/pint": "^1.1.1",
-                "nunomaduro/larastan": "^1.0.3",
-                "nunomaduro/mock-final-classes": "^1.1.0",
-                "orchestra/testbench": "^7.7",
-                "phpunit/phpunit": "^9.5.23",
-                "spatie/ignition": "^1.4.1"
+                "brianium/paratest": "^7.3.0",
+                "laravel/framework": "^10.28.0",
+                "laravel/pint": "^1.13.3",
+                "laravel/sail": "^1.25.0",
+                "laravel/sanctum": "^3.3.1",
+                "laravel/tinker": "^2.8.2",
+                "nunomaduro/larastan": "^2.6.4",
+                "orchestra/testbench-core": "^8.13.0",
+                "pestphp/pest": "^2.23.2",
+                "phpunit/phpunit": "^10.4.1",
+                "sebastian/environment": "^6.0.1",
+                "spatie/laravel-ignition": "^2.3.1"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-develop": "6.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
@@ -8693,6 +8628,9 @@
                 }
             },
             "autoload": {
+                "files": [
+                    "./src/Adapters/Phpunit/Autoload.php"
+                ],
                 "psr-4": {
                     "NunoMaduro\\Collision\\": "src/"
                 }
@@ -8738,7 +8676,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-01-03T12:54:54+00:00"
+            "time": "2023-10-11T15:45:01+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -9010,16 +8948,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.31",
+            "version": "10.1.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
                 "shasum": ""
             },
             "require": {
@@ -9027,18 +8965,18 @@
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "sebastian/code-unit-reverse-lookup": "^3.0",
+                "sebastian/complexity": "^3.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/lines-of-code": "^2.0",
+                "sebastian/version": "^4.0",
                 "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -9047,7 +8985,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "10.1-dev"
                 }
             },
             "autoload": {
@@ -9076,7 +9014,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
             },
             "funding": [
                 {
@@ -9084,32 +9022,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:37:42+00:00"
+            "time": "2024-03-12T15:33:41+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9136,7 +9074,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -9144,28 +9083,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -9173,7 +9112,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9199,7 +9138,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
             "funding": [
                 {
@@ -9207,32 +9146,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9258,7 +9197,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -9266,32 +9206,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9317,7 +9257,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
             "funding": [
                 {
@@ -9325,24 +9265,23 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.17",
+            "version": "10.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd"
+                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd",
-                "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
+                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
@@ -9352,27 +9291,26 @@
                 "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.28",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
-                "sebastian/version": "^3.0.2"
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.5",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-invoker": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "phpunit/php-timer": "^6.0",
+                "sebastian/cli-parser": "^2.0",
+                "sebastian/code-unit": "^2.0",
+                "sebastian/comparator": "^5.0",
+                "sebastian/diff": "^5.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/exporter": "^5.1",
+                "sebastian/global-state": "^6.0.1",
+                "sebastian/object-enumerator": "^5.0",
+                "sebastian/recursion-context": "^5.0",
+                "sebastian/type": "^4.0",
+                "sebastian/version": "^4.0"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -9380,7 +9318,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.6-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
@@ -9412,7 +9350,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13"
             },
             "funding": [
                 {
@@ -9428,32 +9366,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-23T13:14:51+00:00"
+            "time": "2024-03-12T15:37:41+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.2",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -9476,7 +9414,8 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
             "funding": [
                 {
@@ -9484,32 +9423,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:27:43+00:00"
+            "time": "2024-03-02T07:12:49+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -9532,7 +9471,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
             },
             "funding": [
                 {
@@ -9540,32 +9479,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2023-02-03T06:58:43+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9587,7 +9526,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
             "funding": [
                 {
@@ -9595,34 +9534,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:30:19+00:00"
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -9661,7 +9602,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
             },
             "funding": [
                 {
@@ -9669,33 +9611,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2023-08-14T13:18:12+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.3",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.2-dev"
                 }
             },
             "autoload": {
@@ -9718,7 +9660,8 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
             "funding": [
                 {
@@ -9726,33 +9669,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:19:30+00:00"
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.6",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9784,7 +9727,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -9792,27 +9736,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:30:58+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.5",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -9820,7 +9764,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9839,7 +9783,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -9847,7 +9791,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1"
             },
             "funding": [
                 {
@@ -9855,34 +9800,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:03:51+00:00"
+            "time": "2023-04-11T05:39:26+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.6",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9924,7 +9869,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
             },
             "funding": [
                 {
@@ -9932,38 +9878,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:33:00+00:00"
+            "time": "2024-03-02T07:17:12+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.7",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
-                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9982,13 +9925,14 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -9996,33 +9940,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:35:11+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.4",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -10045,7 +9989,8 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -10053,34 +9998,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-22T06:20:34+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -10102,7 +10047,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
             },
             "funding": [
                 {
@@ -10110,32 +10055,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:12:34+00:00"
+            "time": "2023-02-03T07:08:32+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -10157,7 +10102,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
             },
             "funding": [
                 {
@@ -10165,32 +10110,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:14:26+00:00"
+            "time": "2023-02-03T07:06:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.5",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -10220,7 +10165,7 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
             },
             "funding": [
                 {
@@ -10228,86 +10173,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:07:39+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-14T16:00:52+00:00"
+            "time": "2023-02-03T07:05:40+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -10330,7 +10221,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -10338,29 +10229,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:13:03+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -10383,7 +10274,7 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
             "funding": [
                 {
@@ -10391,7 +10282,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -10475,28 +10366,28 @@
         },
         {
             "name": "ssddanbrown/asserthtml",
-            "version": "v2.0.0",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ssddanbrown/asserthtml.git",
-                "reference": "6baf3ef2087f5928ae34f0d41db27aefcdf60414"
+                "reference": "a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/asserthtml/zipball/6baf3ef2087f5928ae34f0d41db27aefcdf60414",
-                "reference": "6baf3ef2087f5928ae34f0d41db27aefcdf60414",
+                "url": "https://api.github.com/repos/ssddanbrown/asserthtml/zipball/a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d",
+                "reference": "a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
-                "php": ">=7.4",
-                "phpunit/phpunit": "^9.0",
-                "symfony/css-selector": "^5.0|^6.0",
-                "symfony/dom-crawler": "^5.0|^6.0"
+                "php": ">=8.1",
+                "phpunit/phpunit": "^10.0",
+                "symfony/css-selector": "^6.0",
+                "symfony/dom-crawler": "^6.0"
             },
             "require-dev": {
-                "vimeo/psalm": "^4.10"
+                "phpstan/phpstan": "^1.10"
             },
             "type": "library",
             "autoload": {
@@ -10511,7 +10402,7 @@
             "authors": [
                 {
                     "name": "Dan Brown",
-                    "email": "ssddanbrown@googlemail.com",
+                    "homepage": "https://danb.me",
                     "role": "Developer"
                 }
             ],
@@ -10519,7 +10410,7 @@
             "homepage": "https://github.com/ssddanbrown/asserthtml",
             "support": {
                 "issues": "https://github.com/ssddanbrown/asserthtml/issues",
-                "source": "https://github.com/ssddanbrown/asserthtml/tree/v2.0.0"
+                "source": "https://github.com/ssddanbrown/asserthtml/tree/v3.0.0"
             },
             "funding": [
                 {
@@ -10527,7 +10418,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-01T16:48:08+00:00"
+            "time": "2023-05-11T14:26:12+00:00"
         },
         {
             "name": "symfony/dom-crawler",
diff --git a/phpunit.xml b/phpunit.xml
index 183e456378c..a9e97f0c78a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true">
-  <coverage>
-    <include>
-      <directory suffix=".php">app/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
   <testsuites>
     <testsuite name="Application Test Suite">
       <directory>./tests/</directory>
@@ -62,4 +54,9 @@
     <server name="APP_DEFAULT_DARK_MODE" value="false"/>
     <server name="IP_ADDRESS_PRECISION" value="4"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">app/</directory>
+    </include>
+  </source>
 </phpunit>

From 2345fd46777828cd81919f4e230a1d74ab835add Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 17 Mar 2024 16:03:12 +0000
Subject: [PATCH 072/666] Deps: Updated intervention library from 2 to 3

Major version change, required some changes to API
For #4903
---
 app/Uploads/ImageResizer.php |  27 +++++---
 composer.json                |   2 +-
 composer.lock                | 116 +++++++++++++++++++++++++----------
 3 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index 4dc1b0b9922..d09177fff5c 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -6,8 +6,12 @@
 use Exception;
 use GuzzleHttp\Psr7\Utils;
 use Illuminate\Support\Facades\Cache;
-use Intervention\Image\Gd\Driver;
-use Intervention\Image\Image as InterventionImage;
+use Intervention\Image\Decoders\BinaryImageDecoder;
+use Intervention\Image\Drivers\Gd\Driver;
+use Intervention\Image\Encoders\AutoEncoder;
+use Intervention\Image\Encoders\PngEncoder;
+use Intervention\Image\Interfaces\ImageInterface as InterventionImage;
+use Intervention\Image\ImageManager;
 
 class ImageResizer
 {
@@ -124,15 +128,17 @@ public function resizeImageData(
         $this->orientImageToOriginalExif($thumb, $imageData);
 
         if ($keepRatio) {
-            $thumb->resize($width, $height, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            });
+            $thumb->scaleDown($width, $height);
         } else {
-            $thumb->fit($width, $height);
+            $thumb->cover($width, $height);
         }
 
-        $thumbData = (string) $thumb->encode($format);
+        $encoder = match ($format) {
+            'png' => new PngEncoder(),
+            default => new AutoEncoder(),
+        };
+
+        $thumbData = (string) $thumb->encode($encoder);
 
         // Use original image data if we're keeping the ratio
         // and the resizing does not save any space.
@@ -150,8 +156,9 @@ public function resizeImageData(
      */
     protected function interventionFromImageData(string $imageData): InterventionImage
     {
-        $driver = new Driver();
-        return $driver->decoder->initFromBinary($imageData);
+        $manager = new ImageManager(new Driver());
+
+        return $manager->read($imageData, BinaryImageDecoder::class);
     }
 
     /**
diff --git a/composer.json b/composer.json
index 7a39c41b2cc..2dce05d38a0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "barryvdh/laravel-snappy": "^1.0",
         "doctrine/dbal": "^3.5",
         "guzzlehttp/guzzle": "^7.4",
-        "intervention/image": "^2.7",
+        "intervention/image": "^3.5",
         "laravel/framework": "^10.10",
         "laravel/socialite": "^5.10",
         "laravel/tinker": "^2.8",
diff --git a/composer.lock b/composer.lock
index 9738b9117b0..be9190b1c92 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c83a032875be7a7edcfd5a18264ac7d",
+    "content-hash": "e05f9f4344c239682f6a9fbab0f87cf0",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -1859,51 +1859,103 @@
             ],
             "time": "2023-12-03T19:50:20+00:00"
         },
+        {
+            "name": "intervention/gif",
+            "version": "4.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Intervention/gif.git",
+                "reference": "c2b07d1f69709e196c8b4ced423449a7e0f3b925"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/c2b07d1f69709e196c8b4ced423449a7e0f3b925",
+                "reference": "c2b07d1f69709e196c8b4ced423449a7e0f3b925",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1",
+                "phpunit/phpunit": "^9",
+                "slevomat/coding-standard": "~8.0",
+                "squizlabs/php_codesniffer": "^3.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Intervention\\Gif\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Oliver Vogel",
+                    "email": "oliver@intervention.io",
+                    "homepage": "https://intervention.io/"
+                }
+            ],
+            "description": "Native PHP GIF Encoder/Decoder",
+            "homepage": "https://github.com/intervention/gif",
+            "keywords": [
+                "animation",
+                "gd",
+                "gif",
+                "image"
+            ],
+            "support": {
+                "issues": "https://github.com/Intervention/gif/issues",
+                "source": "https://github.com/Intervention/gif/tree/4.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/interventionio",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/Intervention",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-02-18T15:36:58+00:00"
+        },
         {
             "name": "intervention/image",
-            "version": "2.7.2",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "04be355f8d6734c826045d02a1079ad658322dad"
+                "reference": "408d3655c7705339e8c79731ea7efb51546cfa10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad",
-                "reference": "04be355f8d6734c826045d02a1079ad658322dad",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/408d3655c7705339e8c79731ea7efb51546cfa10",
+                "reference": "408d3655c7705339e8c79731ea7efb51546cfa10",
                 "shasum": ""
             },
             "require": {
-                "ext-fileinfo": "*",
-                "guzzlehttp/psr7": "~1.1 || ^2.0",
-                "php": ">=5.4.0"
+                "ext-mbstring": "*",
+                "intervention/gif": "^4.0.1",
+                "php": "^8.1"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.2",
-                "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15"
+                "mockery/mockery": "^1.6",
+                "phpstan/phpstan": "^1",
+                "phpunit/phpunit": "^10.0",
+                "slevomat/coding-standard": "~8.0",
+                "squizlabs/php_codesniffer": "^3.8"
             },
             "suggest": {
-                "ext-gd": "to use GD library based image processing.",
-                "ext-imagick": "to use Imagick based image processing.",
-                "intervention/imagecache": "Caching extension for the Intervention Image library"
+                "ext-exif": "Recommended to be able to read EXIF data properly."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Intervention\\Image\\ImageServiceProvider"
-                    ],
-                    "aliases": {
-                        "Image": "Intervention\\Image\\Facades\\Image"
-                    }
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Intervention\\Image\\": "src/Intervention/Image"
+                    "Intervention\\Image\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1917,19 +1969,19 @@
                     "homepage": "https://intervention.io/"
                 }
             ],
-            "description": "Image handling and manipulation library with support for Laravel integration",
-            "homepage": "http://image.intervention.io/",
+            "description": "PHP image manipulation",
+            "homepage": "https://image.intervention.io/",
             "keywords": [
                 "gd",
                 "image",
                 "imagick",
-                "laravel",
+                "resize",
                 "thumbnail",
                 "watermark"
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/2.7.2"
+                "source": "https://github.com/Intervention/image/tree/3.5.0"
             },
             "funding": [
                 {
@@ -1941,7 +1993,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-05-21T17:30:32+00:00"
+            "time": "2024-03-13T16:26:15+00:00"
         },
         {
             "name": "knplabs/knp-snappy",

From b4b84f81a0f5a85cf0a37a870d46d02c9ca84c98 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 17 Mar 2024 16:32:59 +0000
Subject: [PATCH 073/666] Deps: Updated custom symfony/mailer package

Done during #4903 work
---
 composer.json             |  2 +-
 composer.lock             | 35 ++++++++++++++++++++---------------
 tests/Unit/ConfigTest.php |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 2dce05d38a0..79246b7acb5 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
         "ssddanbrown/htmldiff": "^1.0.2",
-        "ssddanbrown/symfony-mailer": "6.0.x-dev"
+        "ssddanbrown/symfony-mailer": "6.4.x-dev"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
diff --git a/composer.lock b/composer.lock
index be9190b1c92..24c2215dd5f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e05f9f4344c239682f6a9fbab0f87cf0",
+    "content-hash": "ccfc07d0ecc580962915a0457f0466a7",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5643,38 +5643,43 @@
         },
         {
             "name": "ssddanbrown/symfony-mailer",
-            "version": "6.0.x-dev",
+            "version": "6.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ssddanbrown/symfony-mailer.git",
-                "reference": "2219dcdc5f58e4f382ce8f1e6942d16982aa3012"
+                "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/2219dcdc5f58e4f382ce8f1e6942d16982aa3012",
-                "reference": "2219dcdc5f58e4f382ce8f1e6942d16982aa3012",
+                "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/0497d6eb2734fe22b9550f88ae6526611c9df7ae",
+                "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae",
                 "shasum": ""
             },
             "require": {
                 "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.0.2",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/mime": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3"
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/mime": "^6.2|^7.0",
+                "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/http-kernel": "<5.4"
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<5.4",
+                "symfony/messenger": "<6.2",
+                "symfony/mime": "<6.2",
+                "symfony/twig-bridge": "<6.2.1"
             },
             "replace": {
                 "symfony/mailer": "^6.0"
             },
             "require-dev": {
-                "symfony/http-client-contracts": "^1.1|^2|^3",
-                "symfony/messenger": "^5.4|^6.0"
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^6.2|^7.0",
+                "symfony/twig-bridge": "^6.2|^7.0"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -5705,9 +5710,9 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/ssddanbrown/symfony-mailer/tree/6.0"
+                "source": "https://github.com/ssddanbrown/symfony-mailer/tree/6.4"
             },
-            "time": "2023-07-04T14:10:33+00:00"
+            "time": "2024-03-17T16:25:21+00:00"
         },
         {
             "name": "symfony/console",
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 2de32c1b8c8..aedcb75aa19 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -132,7 +132,7 @@ public function test_non_null_mail_encryption_options_enforce_smtp_scheme()
     public function test_smtp_scheme_and_certain_port_forces_tls_usage()
     {
         $isMailTlsRequired = function () {
-            /** @var \BookStack\App\Mail\EsmtpTransport $transport */
+            /** @var EsmtpTransport $transport */
             $transport = Mail::mailer('smtp')->getSymfonyTransport();
             Mail::purge('smtp');
             return $transport->getTlsRequirement();

From 28d6292278b9ce2ab728e62a2b622a0beee62c1c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 17 Mar 2024 16:52:19 +0000
Subject: [PATCH 074/666] Framework: Addressed deprecations

---
 app/Access/Controllers/MfaTotpController.php  | 17 ++++++----
 app/Access/Mfa/TotpValidationRule.php         | 34 +++++++------------
 .../2015_08_31_175240_add_search_indexes.php  |  6 ++--
 .../2015_12_05_145049_fulltext_weighting.php  |  6 ++--
 ...03_19_091553_create_search_index_table.php |  6 ++--
 5 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/app/Access/Controllers/MfaTotpController.php b/app/Access/Controllers/MfaTotpController.php
index f60644b84cc..5202fedc04f 100644
--- a/app/Access/Controllers/MfaTotpController.php
+++ b/app/Access/Controllers/MfaTotpController.php
@@ -19,20 +19,25 @@ class MfaTotpController extends Controller
 
     protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-totp-secret';
 
+    public function __construct(
+        protected TotpService $totp
+    ) {
+    }
+
     /**
      * Show a view that generates and displays a TOTP QR code.
      */
-    public function generate(TotpService $totp)
+    public function generate()
     {
         if (session()->has(static::SETUP_SECRET_SESSION_KEY)) {
             $totpSecret = decrypt(session()->get(static::SETUP_SECRET_SESSION_KEY));
         } else {
-            $totpSecret = $totp->generateSecret();
+            $totpSecret = $this->totp->generateSecret();
             session()->put(static::SETUP_SECRET_SESSION_KEY, encrypt($totpSecret));
         }
 
-        $qrCodeUrl = $totp->generateUrl($totpSecret, $this->currentOrLastAttemptedUser());
-        $svg = $totp->generateQrCodeSvg($qrCodeUrl);
+        $qrCodeUrl = $this->totp->generateUrl($totpSecret, $this->currentOrLastAttemptedUser());
+        $svg = $this->totp->generateQrCodeSvg($qrCodeUrl);
 
         $this->setPageTitle(trans('auth.mfa_gen_totp_title'));
 
@@ -56,7 +61,7 @@ public function confirm(Request $request)
             'code' => [
                 'required',
                 'max:12', 'min:4',
-                new TotpValidationRule($totpSecret),
+                new TotpValidationRule($totpSecret, $this->totp),
             ],
         ]);
 
@@ -87,7 +92,7 @@ public function verify(Request $request, LoginService $loginService, MfaSession
             'code' => [
                 'required',
                 'max:12', 'min:4',
-                new TotpValidationRule($totpSecret),
+                new TotpValidationRule($totpSecret, $this->totp),
             ],
         ]);
 
diff --git a/app/Access/Mfa/TotpValidationRule.php b/app/Access/Mfa/TotpValidationRule.php
index c38bde90b75..63b575f198b 100644
--- a/app/Access/Mfa/TotpValidationRule.php
+++ b/app/Access/Mfa/TotpValidationRule.php
@@ -2,36 +2,26 @@
 
 namespace BookStack\Access\Mfa;
 
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 
-class TotpValidationRule implements Rule
+class TotpValidationRule implements ValidationRule
 {
-    protected $secret;
-    protected $totpService;
-
     /**
      * Create a new rule instance.
      * Takes the TOTP secret that must be system provided, not user provided.
      */
-    public function __construct(string $secret)
-    {
-        $this->secret = $secret;
-        $this->totpService = app()->make(TotpService::class);
+    public function __construct(
+        protected string $secret,
+        protected TotpService $totpService,
+    ) {
     }
 
-    /**
-     * Determine if the validation rule passes.
-     */
-    public function passes($attribute, $value)
-    {
-        return $this->totpService->verifyCode($value, $this->secret);
-    }
-
-    /**
-     * Get the validation error message.
-     */
-    public function message()
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return trans('validation.totp');
+        $passes = $this->totpService->verifyCode($value, $this->secret);
+        if (!$passes) {
+            $fail(trans('validation.totp'));
+        }
     }
 }
diff --git a/database/migrations/2015_08_31_175240_add_search_indexes.php b/database/migrations/2015_08_31_175240_add_search_indexes.php
index 4e0421e9e95..3382b2d5495 100644
--- a/database/migrations/2015_08_31_175240_add_search_indexes.php
+++ b/database/migrations/2015_08_31_175240_add_search_indexes.php
@@ -26,9 +26,9 @@ public function up()
     public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->listTableDetails('pages');
-        $books = $sm->listTableDetails('books');
-        $chapters = $sm->listTableDetails('chapters');
+        $pages = $sm->introspectTable('pages');
+        $books = $sm->introspectTable('books');
+        $chapters = $sm->introspectTable('chapters');
 
         if ($pages->hasIndex('search')) {
             Schema::table('pages', function (Blueprint $table) {
diff --git a/database/migrations/2015_12_05_145049_fulltext_weighting.php b/database/migrations/2015_12_05_145049_fulltext_weighting.php
index 7f9d2373c5c..33163e85446 100644
--- a/database/migrations/2015_12_05_145049_fulltext_weighting.php
+++ b/database/migrations/2015_12_05_145049_fulltext_weighting.php
@@ -26,9 +26,9 @@ public function up()
     public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->listTableDetails('pages');
-        $books = $sm->listTableDetails('books');
-        $chapters = $sm->listTableDetails('chapters');
+        $pages = $sm->introspectTable('pages');
+        $books = $sm->introspectTable('books');
+        $chapters = $sm->introspectTable('chapters');
 
         if ($pages->hasIndex('name_search')) {
             Schema::table('pages', function (Blueprint $table) {
diff --git a/database/migrations/2017_03_19_091553_create_search_index_table.php b/database/migrations/2017_03_19_091553_create_search_index_table.php
index 72be3ccbe0c..71f93fa2d62 100644
--- a/database/migrations/2017_03_19_091553_create_search_index_table.php
+++ b/database/migrations/2017_03_19_091553_create_search_index_table.php
@@ -25,9 +25,9 @@ public function up(): void
         });
 
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->listTableDetails('pages');
-        $books = $sm->listTableDetails('books');
-        $chapters = $sm->listTableDetails('chapters');
+        $pages = $sm->introspectTable('pages');
+        $books = $sm->introspectTable('books');
+        $chapters = $sm->introspectTable('chapters');
 
         if ($pages->hasIndex('search')) {
             Schema::table('pages', function (Blueprint $table) {

From fa5395a02bb81dbb0f600860aca51e14be98cc13 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 18 Mar 2024 14:24:14 +0000
Subject: [PATCH 075/666] Meta: Updated workflows, licence and readme

- Updated license year
- Updated some readme wording, removed lapsed sponsor, Removed twitter
  link, added link to alt github source
- Update cache action for GH workflows since GH was complaining
---
 .github/workflows/analyse-php.yml     |  6 +++---
 .github/workflows/test-migrations.yml |  2 +-
 .github/workflows/test-php.yml        |  2 +-
 LICENSE                               |  2 +-
 readme.md                             | 14 ++++----------
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/analyse-php.yml b/.github/workflows/analyse-php.yml
index 4ddf519328c..dbeaf94724a 100644
--- a/.github/workflows/analyse-php.yml
+++ b/.github/workflows/analyse-php.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.1
+        php-version: 8.3
         extensions: gd, mbstring, json, curl, xml, mysql, ldap
 
     - name: Get Composer Cache Directory
@@ -27,10 +27,10 @@ jobs:
         echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-8.1
+        key: ${{ runner.os }}-composer-8.3
         restore-keys: ${{ runner.os }}-composer-
 
     - name: Install composer dependencies
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 9b13787f7ae..10cfbe17204 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -32,7 +32,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 53087a82fc7..269f326320a 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -32,7 +32,7 @@ jobs:
         echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ matrix.php }}
diff --git a/LICENSE b/LICENSE
index 7727542f4ae..5ed2edf8585 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2023, Dan Brown and the BookStack Project contributors.
+Copyright (c) 2015-2024, Dan Brown and the BookStack Project contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/readme.md b/readme.md
index a32e2293138..5457ddfb557 100644
--- a/readme.md
+++ b/readme.md
@@ -7,10 +7,10 @@
 [![Lint Status](https://github.com/BookStackApp/BookStack/workflows/lint-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/5551731994dd22fa1f4f/maintainability)](https://codeclimate.com/github/BookStackApp/BookStack/maintainability)
 
+[![Alternate Source](https://img.shields.io/static/v1?label=Alt+Source&message=Git&color=ef391a&logo=git)](https://source.bookstackapp.com/)
 [![Repo Stats](https://img.shields.io/static/v1?label=GitHub+project&message=stats&color=f27e3f)](https://gh-stats.bookstackapp.com/)
 [![Discord](https://img.shields.io/static/v1?label=Discord&message=chat&color=738adb&logo=discord)](https://discord.gg/ztkBqR2)
 [![Mastodon](https://img.shields.io/static/v1?label=Mastodon&message=@bookstack&color=595aff&logo=mastodon)](https://fosstodon.org/@bookstack)
-[![X - Formerly Twitter](https://img.shields.io/static/v1?label=Follow&message=@bookstack_app&color=1d9bf0&logo=x)](https://x.com/bookstack_app)
 
 [![PeerTube](https://img.shields.io/static/v1?label=PeerTube&message=bookstack@foss.video&color=f2690d&logo=peertube)](https://foss.video/c/bookstack)
 [![YouTube](https://img.shields.io/static/v1?label=YouTube&message=bookstackapp&color=ff0000&logo=youtube)](https://www.youtube.com/bookstackapp)
@@ -29,12 +29,14 @@ A platform for storing and organising information and documentation. Details for
 
 ## 📚 Project Definition
 
-BookStack is an opinionated wiki system that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
+BookStack is an opinionated documentation platform that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
 
 BookStack is not designed as an extensible platform to be used for purposes that differ to the statement above.
 
 In regard to development philosophy, BookStack has a relaxed, open & positive approach. At the end of the day this is free software developed and maintained by people donating their own free time.
 
+You can read more about the project and its origins in [our FAQ here](https://www.bookstackapp.com/about/project-faq/).
+
 ## 🌟 Project Sponsors
 
 Shown below are our bronze, silver and gold project sponsors.
@@ -43,14 +45,6 @@ Big thanks to these companies for supporting the project.
 
 [Project donation details](https://www.bookstackapp.com/donate/) - [GitHub Sponsors Page](https://github.com/sponsors/ssddanbrown) - [Ko-fi Page](https://ko-fi.com/ssddanbrown)
 
-#### Gold Sponsor
-
-<table><tbody><tr>
-<td align="center"><a href="https://www.federated.computer/bookstack/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/federated-computer.png" alt="Diagrams.net">
-</a></td>
-</tr></tbody></table>
-
 #### Bronze Sponsors
 
 <table><tbody><tr>

From c221a00e1ed2a01a66072f3f6a270464e12bab3c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 19 Mar 2024 10:30:26 +0000
Subject: [PATCH 076/666] Migrations: Added prefix support to schema inspection

---
 .../migrations/2015_08_31_175240_add_search_indexes.php   | 8 +++++---
 .../migrations/2015_12_05_145049_fulltext_weighting.php   | 8 +++++---
 .../2017_03_19_091553_create_search_index_table.php       | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/database/migrations/2015_08_31_175240_add_search_indexes.php b/database/migrations/2015_08_31_175240_add_search_indexes.php
index 3382b2d5495..4d58d940959 100644
--- a/database/migrations/2015_08_31_175240_add_search_indexes.php
+++ b/database/migrations/2015_08_31_175240_add_search_indexes.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -26,9 +27,10 @@ public function up()
     public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->introspectTable('pages');
-        $books = $sm->introspectTable('books');
-        $chapters = $sm->introspectTable('chapters');
+        $prefix = DB::getTablePrefix();
+        $pages = $sm->introspectTable($prefix . 'pages');
+        $books = $sm->introspectTable($prefix . 'books');
+        $chapters = $sm->introspectTable($prefix . 'chapters');
 
         if ($pages->hasIndex('search')) {
             Schema::table('pages', function (Blueprint $table) {
diff --git a/database/migrations/2015_12_05_145049_fulltext_weighting.php b/database/migrations/2015_12_05_145049_fulltext_weighting.php
index 33163e85446..b20c04520cb 100644
--- a/database/migrations/2015_12_05_145049_fulltext_weighting.php
+++ b/database/migrations/2015_12_05_145049_fulltext_weighting.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -26,9 +27,10 @@ public function up()
     public function down(): void
     {
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->introspectTable('pages');
-        $books = $sm->introspectTable('books');
-        $chapters = $sm->introspectTable('chapters');
+        $prefix = DB::getTablePrefix();
+        $pages = $sm->introspectTable($prefix . 'pages');
+        $books = $sm->introspectTable($prefix . 'books');
+        $chapters = $sm->introspectTable($prefix . 'chapters');
 
         if ($pages->hasIndex('name_search')) {
             Schema::table('pages', function (Blueprint $table) {
diff --git a/database/migrations/2017_03_19_091553_create_search_index_table.php b/database/migrations/2017_03_19_091553_create_search_index_table.php
index 71f93fa2d62..56281741e3c 100644
--- a/database/migrations/2017_03_19_091553_create_search_index_table.php
+++ b/database/migrations/2017_03_19_091553_create_search_index_table.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -25,9 +26,10 @@ public function up(): void
         });
 
         $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $pages = $sm->introspectTable('pages');
-        $books = $sm->introspectTable('books');
-        $chapters = $sm->introspectTable('chapters');
+        $prefix = DB::getTablePrefix();
+        $pages = $sm->introspectTable($prefix . 'pages');
+        $books = $sm->introspectTable($prefix . 'books');
+        $chapters = $sm->introspectTable($prefix . 'chapters');
 
         if ($pages->hasIndex('search')) {
             Schema::table('pages', function (Blueprint $table) {

From f7893598865abe24df04c3fc60e22429818709e3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 22 Mar 2024 14:44:23 +0000
Subject: [PATCH 077/666] Licensing: Added script to build PHP library
 licensing information

---
 dev/licensing/gen-php-licenses         |  96 +++
 dev/licensing/php-library-licenses.txt | 796 +++++++++++++++++++++++++
 2 files changed, 892 insertions(+)
 create mode 100644 dev/licensing/gen-php-licenses
 create mode 100644 dev/licensing/php-library-licenses.txt

diff --git a/dev/licensing/gen-php-licenses b/dev/licensing/gen-php-licenses
new file mode 100644
index 00000000000..0c922e281d8
--- /dev/null
+++ b/dev/licensing/gen-php-licenses
@@ -0,0 +1,96 @@
+#!/usr/bin/env php
+<?php
+
+// This script reads the project composer.lock file to generate
+// clear license details for our PHP dependencies.
+
+$rootPath = dirname(__DIR__, 2);
+$outputPath = "{$rootPath}/dev/licensing/php-library-licenses.txt";
+$composerLock = json_decode(file_get_contents($rootPath . "/composer.lock"));
+$outputSeparator = "\n-----------\n";
+$warnings = [];
+
+$packages = $composerLock->packages;
+$packageOutput = array_map(packageToOutput(...), $packages);
+
+$licenseInfo =  implode($outputSeparator, $packageOutput) . "\n";
+file_put_contents($outputPath, $licenseInfo);
+
+echo "License information written to {$outputPath}\n";
+echo implode("\n", $warnings);
+
+function packageToOutput(stdClass $package) : string {
+    $output = ["{$package->name}"];
+
+    $licenses = is_array($package->license) ? $package->license : [$package->license];
+    $output[] = "License: " . implode(' ', $licenses);
+
+    $licenseFile = findLicenseFile($package->name);
+    if ($licenseFile) {
+        $output[] = "License File: {$licenseFile}";
+        $copyright = findCopyright($licenseFile);
+        if ($copyright) {
+            $output[] = "Copyright: {$copyright}";
+        } else {
+            warn("Package {$package->name} has no copyright found in its license");
+        }
+    }
+
+    $source = $package->source->url;
+    if ($source) {
+        $output[] = "Source: {$source}";
+    }
+
+    $link = $package->homepage ?? $package->source->url ?? '';
+    if ($link) {
+        $output[] = "Link: {$link}";
+    }
+
+    return implode("\n", $output);
+}
+
+function findLicenseFile(string $packageName): string {
+    global $rootPath;
+    $licenseNameOptions = ['license', 'LICENSE', 'license.*', 'LICENSE.*'];
+
+    $packagePath = "vendor/{$packageName}";
+    $filePath = "{$rootPath}/{$packagePath}";
+
+    $foundLicenses = [];
+    foreach ($licenseNameOptions as $option) {
+        $search = glob("{$filePath}/$option");
+        array_push($foundLicenses, ...$search);
+    }
+
+    if (count($foundLicenses) > 1) {
+        warn("Package {$packagePath} has more than one license file found");
+    }
+
+    if (count($foundLicenses) > 0) {
+        $fileName = basename($foundLicenses[0]);
+        return "{$packagePath}/{$fileName}";
+    }
+
+    warn("Package {$packageName} has no license files found");
+    return '';
+}
+
+function findCopyright(string $licenseFile): string {
+    $fileContents = file_get_contents($licenseFile);
+    $pattern = '/^.*?copyright (\(c\)|\d{4})[\s\S]*?(\n\n|\.\n)/mi';
+    $matches = [];
+    preg_match($pattern, $fileContents, $matches);
+    $copyright = trim($matches[0] ?? '');
+
+    $emailPattern = '/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i';
+    return preg_replace_callback($emailPattern, obfuscateEmail(...), $copyright);
+}
+
+function obfuscateEmail(array $matches): string {
+    return preg_replace('/[^@.]/', '*', $matches[1]);
+}
+
+function warn(string $text): void {
+    global $warnings;
+    $warnings[] = "WARN:" . $text;
+}
\ No newline at end of file
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
new file mode 100644
index 00000000000..2e78ab84518
--- /dev/null
+++ b/dev/licensing/php-library-licenses.txt
@@ -0,0 +1,796 @@
+aws/aws-crt-php
+License: Apache-2.0
+License File: vendor/aws/aws-crt-php/LICENSE
+Source: https://github.com/awslabs/aws-crt-php.git
+Link: https://github.com/awslabs/aws-crt-php
+-----------
+aws/aws-sdk-php
+License: Apache-2.0
+License File: vendor/aws/aws-sdk-php/LICENSE
+Source: https://github.com/aws/aws-sdk-php.git
+Link: http://aws.amazon.com/sdkforphp
+-----------
+bacon/bacon-qr-code
+License: BSD-2-Clause
+License File: vendor/bacon/bacon-qr-code/LICENSE
+Copyright: Copyright (c) 2017, Ben Scholzen 'DASPRiD'
+All rights reserved.
+Source: https://github.com/Bacon/BaconQrCode.git
+Link: https://github.com/Bacon/BaconQrCode
+-----------
+barryvdh/laravel-dompdf
+License: MIT
+License File: vendor/barryvdh/laravel-dompdf/LICENSE
+Copyright: Copyright (c) 2021 barryvdh
+Source: https://github.com/barryvdh/laravel-dompdf.git
+Link: https://github.com/barryvdh/laravel-dompdf.git
+-----------
+barryvdh/laravel-snappy
+License: MIT
+License File: vendor/barryvdh/laravel-snappy/LICENSE
+Copyright: Copyright (c) 2018
+Source: https://github.com/barryvdh/laravel-snappy.git
+Link: https://github.com/barryvdh/laravel-snappy.git
+-----------
+brick/math
+License: MIT
+License File: vendor/brick/math/LICENSE
+Copyright: Copyright (c) 2013-present Benjamin Morel
+Source: https://github.com/brick/math.git
+Link: https://github.com/brick/math.git
+-----------
+carbonphp/carbon-doctrine-types
+License: MIT
+License File: vendor/carbonphp/carbon-doctrine-types/LICENSE
+Copyright: Copyright (c) 2023 Carbon
+Source: https://github.com/CarbonPHP/carbon-doctrine-types.git
+Link: https://github.com/CarbonPHP/carbon-doctrine-types.git
+-----------
+dasprid/enum
+License: BSD-2-Clause
+License File: vendor/dasprid/enum/LICENSE
+Copyright: Copyright (c) 2017, Ben Scholzen 'DASPRiD'
+All rights reserved.
+Source: https://github.com/DASPRiD/Enum.git
+Link: https://github.com/DASPRiD/Enum.git
+-----------
+dflydev/dot-access-data
+License: MIT
+License File: vendor/dflydev/dot-access-data/LICENSE
+Copyright: Copyright (c) 2012 Dragonfly Development Inc.
+Source: https://github.com/dflydev/dflydev-dot-access-data.git
+Link: https://github.com/dflydev/dflydev-dot-access-data
+-----------
+doctrine/cache
+License: MIT
+License File: vendor/doctrine/cache/LICENSE
+Copyright: Copyright (c) 2006-2015 Doctrine Project
+Source: https://github.com/doctrine/cache.git
+Link: https://www.doctrine-project.org/projects/cache.html
+-----------
+doctrine/dbal
+License: MIT
+License File: vendor/doctrine/dbal/LICENSE
+Copyright: Copyright (c) 2006-2018 Doctrine Project
+Source: https://github.com/doctrine/dbal.git
+Link: https://www.doctrine-project.org/projects/dbal.html
+-----------
+doctrine/deprecations
+License: MIT
+License File: vendor/doctrine/deprecations/LICENSE
+Copyright: Copyright (c) 2020-2021 Doctrine Project
+Source: https://github.com/doctrine/deprecations.git
+Link: https://www.doctrine-project.org/
+-----------
+doctrine/event-manager
+License: MIT
+License File: vendor/doctrine/event-manager/LICENSE
+Copyright: Copyright (c) 2006-2015 Doctrine Project
+Source: https://github.com/doctrine/event-manager.git
+Link: https://www.doctrine-project.org/projects/event-manager.html
+-----------
+doctrine/inflector
+License: MIT
+License File: vendor/doctrine/inflector/LICENSE
+Copyright: Copyright (c) 2006-2015 Doctrine Project
+Source: https://github.com/doctrine/inflector.git
+Link: https://www.doctrine-project.org/projects/inflector.html
+-----------
+doctrine/lexer
+License: MIT
+License File: vendor/doctrine/lexer/LICENSE
+Copyright: Copyright (c) 2006-2018 Doctrine Project
+Source: https://github.com/doctrine/lexer.git
+Link: https://www.doctrine-project.org/projects/lexer.html
+-----------
+dompdf/dompdf
+License: LGPL-2.1
+License File: vendor/dompdf/dompdf/LICENSE.LGPL
+Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+Source: https://github.com/dompdf/dompdf.git
+Link: https://github.com/dompdf/dompdf
+-----------
+dragonmantank/cron-expression
+License: MIT
+License File: vendor/dragonmantank/cron-expression/LICENSE
+Copyright: Copyright (c) 2011 Michael Dowling <*********@*****.***>, 2016 Chris Tankersley <*****@***********.***>, and contributors
+Source: https://github.com/dragonmantank/cron-expression.git
+Link: https://github.com/dragonmantank/cron-expression.git
+-----------
+egulias/email-validator
+License: MIT
+License File: vendor/egulias/email-validator/LICENSE
+Copyright: Copyright (c) 2013-2023 Eduardo Gulias Davis
+Source: https://github.com/egulias/EmailValidator.git
+Link: https://github.com/egulias/EmailValidator
+-----------
+fruitcake/php-cors
+License: MIT
+License File: vendor/fruitcake/php-cors/LICENSE
+Copyright: Copyright (c) 2013-2017 Alexander <***.*****@*****.***>
+Copyright (c) 2017-2022 Barryvdh <********@*****.***>
+Source: https://github.com/fruitcake/php-cors.git
+Link: https://github.com/fruitcake/php-cors
+-----------
+graham-campbell/result-type
+License: MIT
+License File: vendor/graham-campbell/result-type/LICENSE
+Copyright: Copyright (c) 2020-2023 Graham Campbell <*****@**********.**.**>
+Source: https://github.com/GrahamCampbell/Result-Type.git
+Link: https://github.com/GrahamCampbell/Result-Type.git
+-----------
+guzzlehttp/guzzle
+License: MIT
+License File: vendor/guzzlehttp/guzzle/LICENSE
+Copyright: Copyright (c) 2011 Michael Dowling <*********@*****.***>
+Copyright (c) 2012 Jeremy Lindblom <**********@*****.***>
+Copyright (c) 2014 Graham Campbell <*****@**********.**.**>
+Copyright (c) 2015 Márk Sági-Kazár <****.*********@*****.***>
+Copyright (c) 2015 Tobias Schultze <*********@**********.**>
+Copyright (c) 2016 Tobias Nyholm <******.******@*****.***>
+Copyright (c) 2016 George Mponos <*******@*****.***>
+Source: https://github.com/guzzle/guzzle.git
+Link: https://github.com/guzzle/guzzle.git
+-----------
+guzzlehttp/promises
+License: MIT
+License File: vendor/guzzlehttp/promises/LICENSE
+Copyright: Copyright (c) 2015 Michael Dowling <*********@*****.***>
+Copyright (c) 2015 Graham Campbell <*****@**********.**.**>
+Copyright (c) 2017 Tobias Schultze <*********@**********.**>
+Copyright (c) 2020 Tobias Nyholm <******.******@*****.***>
+Source: https://github.com/guzzle/promises.git
+Link: https://github.com/guzzle/promises.git
+-----------
+guzzlehttp/psr7
+License: MIT
+License File: vendor/guzzlehttp/psr7/LICENSE
+Copyright: Copyright (c) 2015 Michael Dowling <*********@*****.***>
+Copyright (c) 2015 Márk Sági-Kazár <****.*********@*****.***>
+Copyright (c) 2015 Graham Campbell <*****@**********.**.**>
+Copyright (c) 2016 Tobias Schultze <*********@**********.**>
+Copyright (c) 2016 George Mponos <*******@*****.***>
+Copyright (c) 2018 Tobias Nyholm <******.******@*****.***>
+Source: https://github.com/guzzle/psr7.git
+Link: https://github.com/guzzle/psr7.git
+-----------
+guzzlehttp/uri-template
+License: MIT
+License File: vendor/guzzlehttp/uri-template/LICENSE
+Copyright: Copyright (c) 2014 Michael Dowling <*********@*****.***>
+Copyright (c) 2020 George Mponos <*******@*****.***>
+Copyright (c) 2020 Graham Campbell <*****@**********.**.**>
+Source: https://github.com/guzzle/uri-template.git
+Link: https://github.com/guzzle/uri-template.git
+-----------
+intervention/gif
+License: MIT
+License File: vendor/intervention/gif/LICENSE
+Copyright: Copyright (c) 2020 Oliver Vogel
+Source: https://github.com/Intervention/gif.git
+Link: https://github.com/intervention/gif
+-----------
+intervention/image
+License: MIT
+License File: vendor/intervention/image/LICENSE
+Copyright: Copyright (c) 2013-2024 Oliver Vogel
+Source: https://github.com/Intervention/image.git
+Link: https://image.intervention.io/
+-----------
+knplabs/knp-snappy
+License: MIT
+License File: vendor/knplabs/knp-snappy/LICENSE
+Copyright: Copyright (c) 2010 Matthieu Bontemps
+Source: https://github.com/KnpLabs/snappy.git
+Link: http://github.com/KnpLabs/snappy
+-----------
+laravel/framework
+License: MIT
+License File: vendor/laravel/framework/LICENSE.md
+Copyright: Copyright (c) Taylor Otwell
+Source: https://github.com/laravel/framework.git
+Link: https://laravel.com
+-----------
+laravel/prompts
+License: MIT
+License File: vendor/laravel/prompts/LICENSE.md
+Copyright: Copyright (c) Taylor Otwell
+Source: https://github.com/laravel/prompts.git
+Link: https://github.com/laravel/prompts.git
+-----------
+laravel/serializable-closure
+License: MIT
+License File: vendor/laravel/serializable-closure/LICENSE.md
+Copyright: Copyright (c) Taylor Otwell
+Source: https://github.com/laravel/serializable-closure.git
+Link: https://github.com/laravel/serializable-closure.git
+-----------
+laravel/socialite
+License: MIT
+License File: vendor/laravel/socialite/LICENSE.md
+Copyright: Copyright (c) Taylor Otwell
+Source: https://github.com/laravel/socialite.git
+Link: https://laravel.com
+-----------
+laravel/tinker
+License: MIT
+License File: vendor/laravel/tinker/LICENSE.md
+Copyright: Copyright (c) Taylor Otwell
+Source: https://github.com/laravel/tinker.git
+Link: https://github.com/laravel/tinker.git
+-----------
+league/commonmark
+License: BSD-3-Clause
+License File: vendor/league/commonmark/LICENSE
+Copyright: Copyright (c) 2014-2022, Colin O'Dell. All rights reserved. Some code based on commonmark.js (copyright 2014-2018, John MacFarlane) and commonmark-java (copyright 2015-2016, Atlassian Pty Ltd)
+Source: https://github.com/thephpleague/commonmark.git
+Link: https://commonmark.thephpleague.com
+-----------
+league/config
+License: BSD-3-Clause
+License File: vendor/league/config/LICENSE.md
+Copyright: Copyright (c) 2022, Colin O'Dell. All rights reserved.
+Source: https://github.com/thephpleague/config.git
+Link: https://config.thephpleague.com
+-----------
+league/flysystem
+License: MIT
+License File: vendor/league/flysystem/LICENSE
+Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Source: https://github.com/thephpleague/flysystem.git
+Link: https://github.com/thephpleague/flysystem.git
+-----------
+league/flysystem-aws-s3-v3
+License: MIT
+License File: vendor/league/flysystem-aws-s3-v3/LICENSE
+Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Source: https://github.com/thephpleague/flysystem-aws-s3-v3.git
+Link: https://github.com/thephpleague/flysystem-aws-s3-v3.git
+-----------
+league/flysystem-local
+License: MIT
+License File: vendor/league/flysystem-local/LICENSE
+Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Source: https://github.com/thephpleague/flysystem-local.git
+Link: https://github.com/thephpleague/flysystem-local.git
+-----------
+league/html-to-markdown
+License: MIT
+License File: vendor/league/html-to-markdown/LICENSE
+Copyright: Copyright (c) 2015 Colin O'Dell; Originally created by Nick Cernis
+Source: https://github.com/thephpleague/html-to-markdown.git
+Link: https://github.com/thephpleague/html-to-markdown
+-----------
+league/mime-type-detection
+License: MIT
+License File: vendor/league/mime-type-detection/LICENSE
+Copyright: Copyright (c) 2013-2023 Frank de Jonge
+Source: https://github.com/thephpleague/mime-type-detection.git
+Link: https://github.com/thephpleague/mime-type-detection.git
+-----------
+league/oauth1-client
+License: MIT
+License File: vendor/league/oauth1-client/LICENSE
+Copyright: Copyright (c) 2013 Ben Corlett <**********@**.***>
+Source: https://github.com/thephpleague/oauth1-client.git
+Link: https://github.com/thephpleague/oauth1-client.git
+-----------
+league/oauth2-client
+License: MIT
+License File: vendor/league/oauth2-client/LICENSE
+Copyright: Copyright (c) 2013-2020 Alex Bilbie <*****@**********.***>
+Source: https://github.com/thephpleague/oauth2-client.git
+Link: https://github.com/thephpleague/oauth2-client.git
+-----------
+masterminds/html5
+License: MIT
+License File: vendor/masterminds/html5/LICENSE.txt
+Copyright: Copyright (c) 2013 The Authors of HTML5-PHP
+Source: https://github.com/Masterminds/html5-php.git
+Link: http://masterminds.github.io/html5-php
+-----------
+monolog/monolog
+License: MIT
+License File: vendor/monolog/monolog/LICENSE
+Copyright: Copyright (c) 2011-2020 Jordi Boggiano
+Source: https://github.com/Seldaek/monolog.git
+Link: https://github.com/Seldaek/monolog
+-----------
+mtdowling/jmespath.php
+License: MIT
+License File: vendor/mtdowling/jmespath.php/LICENSE
+Copyright: Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling
+Source: https://github.com/jmespath/jmespath.php.git
+Link: https://github.com/jmespath/jmespath.php.git
+-----------
+nesbot/carbon
+License: MIT
+License File: vendor/nesbot/carbon/LICENSE
+Copyright: Copyright (C) Brian Nesbitt
+Source: https://github.com/briannesbitt/Carbon.git
+Link: https://carbon.nesbot.com
+-----------
+nette/schema
+License: BSD-3-Clause GPL-2.0-only GPL-3.0-only
+License File: vendor/nette/schema/license.md
+Copyright: Copyright (c) 2004, 2014 David Grudl (https://davidgrudl.com)
+All rights reserved.
+Source: https://github.com/nette/schema.git
+Link: https://nette.org
+-----------
+nette/utils
+License: BSD-3-Clause GPL-2.0-only GPL-3.0-only
+License File: vendor/nette/utils/license.md
+Copyright: Copyright (c) 2004, 2014 David Grudl (https://davidgrudl.com)
+All rights reserved.
+Source: https://github.com/nette/utils.git
+Link: https://nette.org
+-----------
+nikic/php-parser
+License: BSD-3-Clause
+License File: vendor/nikic/php-parser/LICENSE
+Copyright: Copyright (c) 2011, Nikita Popov
+All rights reserved.
+Source: https://github.com/nikic/PHP-Parser.git
+Link: https://github.com/nikic/PHP-Parser.git
+-----------
+nunomaduro/termwind
+License: MIT
+License File: vendor/nunomaduro/termwind/LICENSE.md
+Copyright: Copyright (c) Nuno Maduro <***********@*****.***>
+Source: https://github.com/nunomaduro/termwind.git
+Link: https://github.com/nunomaduro/termwind.git
+-----------
+onelogin/php-saml
+License: MIT
+License File: vendor/onelogin/php-saml/LICENSE
+Copyright: Copyright (c) 2010-2016 OneLogin, Inc.
+Source: https://github.com/onelogin/php-saml.git
+Link: https://developers.onelogin.com/saml/php
+-----------
+paragonie/constant_time_encoding
+License: MIT
+License File: vendor/paragonie/constant_time_encoding/LICENSE.txt
+Copyright: Copyright (c) 2016 - 2022 Paragon Initiative Enterprises
+Source: https://github.com/paragonie/constant_time_encoding.git
+Link: https://github.com/paragonie/constant_time_encoding.git
+-----------
+paragonie/random_compat
+License: MIT
+License File: vendor/paragonie/random_compat/LICENSE
+Copyright: Copyright (c) 2015 Paragon Initiative Enterprises
+Source: https://github.com/paragonie/random_compat.git
+Link: https://github.com/paragonie/random_compat.git
+-----------
+phenx/php-font-lib
+License: LGPL-2.1-or-later
+License File: vendor/phenx/php-font-lib/LICENSE
+Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+Source: https://github.com/dompdf/php-font-lib.git
+Link: https://github.com/PhenX/php-font-lib
+-----------
+phenx/php-svg-lib
+License: LGPL-3.0-or-later
+License File: vendor/phenx/php-svg-lib/LICENSE
+Copyright: Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+Source: https://github.com/dompdf/php-svg-lib.git
+Link: https://github.com/PhenX/php-svg-lib
+-----------
+phpoption/phpoption
+License: Apache-2.0
+License File: vendor/phpoption/phpoption/LICENSE
+Source: https://github.com/schmittjoh/php-option.git
+Link: https://github.com/schmittjoh/php-option.git
+-----------
+phpseclib/phpseclib
+License: MIT
+License File: vendor/phpseclib/phpseclib/LICENSE
+Copyright: Copyright (c) 2011-2019 TerraFrost and other contributors
+Source: https://github.com/phpseclib/phpseclib.git
+Link: http://phpseclib.sourceforge.net
+-----------
+pragmarx/google2fa
+License: MIT
+License File: vendor/pragmarx/google2fa/LICENSE.md
+Copyright: Copyright 2014-2018 Phil, Antonio Carlos Ribeiro and All Contributors
+Source: https://github.com/antonioribeiro/google2fa.git
+Link: https://github.com/antonioribeiro/google2fa.git
+-----------
+predis/predis
+License: MIT
+License File: vendor/predis/predis/LICENSE
+Copyright: Copyright (c) 2009-2020 Daniele Alessandri (original work)
+Copyright (c) 2021-2023 Till Krüss (modified work)
+Source: https://github.com/predis/predis.git
+Link: http://github.com/predis/predis
+-----------
+psr/cache
+License: MIT
+License File: vendor/psr/cache/LICENSE.txt
+Copyright: Copyright (c) 2015 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/cache.git
+Link: https://github.com/php-fig/cache.git
+-----------
+psr/clock
+License: MIT
+License File: vendor/psr/clock/LICENSE
+Copyright: Copyright (c) 2017 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/clock.git
+Link: https://github.com/php-fig/clock
+-----------
+psr/container
+License: MIT
+License File: vendor/psr/container/LICENSE
+Copyright: Copyright (c) 2013-2016 container-interop
+Copyright (c) 2016 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/container.git
+Link: https://github.com/php-fig/container
+-----------
+psr/event-dispatcher
+License: MIT
+License File: vendor/psr/event-dispatcher/LICENSE
+Copyright: Copyright (c) 2018 PHP-FIG
+Source: https://github.com/php-fig/event-dispatcher.git
+Link: https://github.com/php-fig/event-dispatcher.git
+-----------
+psr/http-client
+License: MIT
+License File: vendor/psr/http-client/LICENSE
+Copyright: Copyright (c) 2017 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/http-client.git
+Link: https://github.com/php-fig/http-client
+-----------
+psr/http-factory
+License: MIT
+License File: vendor/psr/http-factory/LICENSE
+Copyright: Copyright (c) 2018 PHP-FIG
+Source: https://github.com/php-fig/http-factory.git
+Link: https://github.com/php-fig/http-factory.git
+-----------
+psr/http-message
+License: MIT
+License File: vendor/psr/http-message/LICENSE
+Copyright: Copyright (c) 2014 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/http-message.git
+Link: https://github.com/php-fig/http-message
+-----------
+psr/log
+License: MIT
+License File: vendor/psr/log/LICENSE
+Copyright: Copyright (c) 2012 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/log.git
+Link: https://github.com/php-fig/log
+-----------
+psr/simple-cache
+License: MIT
+License File: vendor/psr/simple-cache/LICENSE.md
+Copyright: Copyright (c) 2016 PHP Framework Interoperability Group
+Source: https://github.com/php-fig/simple-cache.git
+Link: https://github.com/php-fig/simple-cache.git
+-----------
+psy/psysh
+License: MIT
+License File: vendor/psy/psysh/LICENSE
+Copyright: Copyright (c) 2012-2023 Justin Hileman
+Source: https://github.com/bobthecow/psysh.git
+Link: http://psysh.org
+-----------
+ralouphie/getallheaders
+License: MIT
+License File: vendor/ralouphie/getallheaders/LICENSE
+Copyright: Copyright (c) 2014 Ralph Khattar
+Source: https://github.com/ralouphie/getallheaders.git
+Link: https://github.com/ralouphie/getallheaders.git
+-----------
+ramsey/collection
+License: MIT
+License File: vendor/ramsey/collection/LICENSE
+Copyright: Copyright (c) 2015-2022 Ben Ramsey <***@*********.***>
+Source: https://github.com/ramsey/collection.git
+Link: https://github.com/ramsey/collection.git
+-----------
+ramsey/uuid
+License: MIT
+License File: vendor/ramsey/uuid/LICENSE
+Copyright: Copyright (c) 2012-2023 Ben Ramsey <***@*********.***>
+Source: https://github.com/ramsey/uuid.git
+Link: https://github.com/ramsey/uuid.git
+-----------
+robrichards/xmlseclibs
+License: BSD-3-Clause
+License File: vendor/robrichards/xmlseclibs/LICENSE
+Copyright: Copyright (c) 2007-2019, Robert Richards <*********@*********.***>.
+Source: https://github.com/robrichards/xmlseclibs.git
+Link: https://github.com/robrichards/xmlseclibs
+-----------
+sabberworm/php-css-parser
+License: MIT
+License File: vendor/sabberworm/php-css-parser/LICENSE
+Copyright: Copyright (c) 2011 Raphael Schweikert, https://www.sabberworm.com/
+Source: https://github.com/MyIntervals/PHP-CSS-Parser.git
+Link: https://www.sabberworm.com/blog/2010/6/10/php-css-parser
+-----------
+socialiteproviders/discord
+License: MIT
+Source: https://github.com/SocialiteProviders/Discord.git
+Link: https://github.com/SocialiteProviders/Discord.git
+-----------
+socialiteproviders/gitlab
+License: MIT
+Source: https://github.com/SocialiteProviders/GitLab.git
+Link: https://github.com/SocialiteProviders/GitLab.git
+-----------
+socialiteproviders/manager
+License: MIT
+License File: vendor/socialiteproviders/manager/LICENSE
+Copyright: Copyright (c) 2015 Andy Wendt
+Source: https://github.com/SocialiteProviders/Manager.git
+Link: https://socialiteproviders.com
+-----------
+socialiteproviders/microsoft-azure
+License: MIT
+Source: https://github.com/SocialiteProviders/Microsoft-Azure.git
+Link: https://github.com/SocialiteProviders/Microsoft-Azure.git
+-----------
+socialiteproviders/okta
+License: MIT
+Source: https://github.com/SocialiteProviders/Okta.git
+Link: https://github.com/SocialiteProviders/Okta.git
+-----------
+socialiteproviders/twitch
+License: MIT
+Source: https://github.com/SocialiteProviders/Twitch.git
+Link: https://github.com/SocialiteProviders/Twitch.git
+-----------
+ssddanbrown/htmldiff
+License: MIT
+License File: vendor/ssddanbrown/htmldiff/license.md
+Copyright: Copyright (c) 2020 Nathan Herald, Rohland de Charmoy, Dan Brown
+Source: https://github.com/ssddanbrown/HtmlDiff.git
+Link: https://github.com/ssddanbrown/htmldiff
+-----------
+ssddanbrown/symfony-mailer
+License: MIT
+License File: vendor/ssddanbrown/symfony-mailer/LICENSE
+Copyright: Copyright (c) 2019-present Fabien Potencier
+Source: https://github.com/ssddanbrown/symfony-mailer.git
+Link: https://symfony.com
+-----------
+symfony/console
+License: MIT
+License File: vendor/symfony/console/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/console.git
+Link: https://symfony.com
+-----------
+symfony/css-selector
+License: MIT
+License File: vendor/symfony/css-selector/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/css-selector.git
+Link: https://symfony.com
+-----------
+symfony/deprecation-contracts
+License: MIT
+License File: vendor/symfony/deprecation-contracts/LICENSE
+Copyright: Copyright (c) 2020-present Fabien Potencier
+Source: https://github.com/symfony/deprecation-contracts.git
+Link: https://symfony.com
+-----------
+symfony/error-handler
+License: MIT
+License File: vendor/symfony/error-handler/LICENSE
+Copyright: Copyright (c) 2019-present Fabien Potencier
+Source: https://github.com/symfony/error-handler.git
+Link: https://symfony.com
+-----------
+symfony/event-dispatcher
+License: MIT
+License File: vendor/symfony/event-dispatcher/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/event-dispatcher.git
+Link: https://symfony.com
+-----------
+symfony/event-dispatcher-contracts
+License: MIT
+License File: vendor/symfony/event-dispatcher-contracts/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier
+Source: https://github.com/symfony/event-dispatcher-contracts.git
+Link: https://symfony.com
+-----------
+symfony/finder
+License: MIT
+License File: vendor/symfony/finder/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/finder.git
+Link: https://symfony.com
+-----------
+symfony/http-foundation
+License: MIT
+License File: vendor/symfony/http-foundation/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/http-foundation.git
+Link: https://symfony.com
+-----------
+symfony/http-kernel
+License: MIT
+License File: vendor/symfony/http-kernel/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/http-kernel.git
+Link: https://symfony.com
+-----------
+symfony/mime
+License: MIT
+License File: vendor/symfony/mime/LICENSE
+Copyright: Copyright (c) 2010-present Fabien Potencier
+Source: https://github.com/symfony/mime.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-ctype
+License: MIT
+License File: vendor/symfony/polyfill-ctype/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-ctype.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-intl-grapheme
+License: MIT
+License File: vendor/symfony/polyfill-intl-grapheme/LICENSE
+Copyright: Copyright (c) 2015-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-intl-grapheme.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-intl-idn
+License: MIT
+License File: vendor/symfony/polyfill-intl-idn/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier and Trevor Rowbotham <******.*********@**.**>
+Source: https://github.com/symfony/polyfill-intl-idn.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-intl-normalizer
+License: MIT
+License File: vendor/symfony/polyfill-intl-normalizer/LICENSE
+Copyright: Copyright (c) 2015-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-intl-normalizer.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-mbstring
+License: MIT
+License File: vendor/symfony/polyfill-mbstring/LICENSE
+Copyright: Copyright (c) 2015-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-mbstring.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-php72
+License: MIT
+License File: vendor/symfony/polyfill-php72/LICENSE
+Copyright: Copyright (c) 2015-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-php72.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-php80
+License: MIT
+License File: vendor/symfony/polyfill-php80/LICENSE
+Copyright: Copyright (c) 2020-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-php80.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-php83
+License: MIT
+License File: vendor/symfony/polyfill-php83/LICENSE
+Copyright: Copyright (c) 2022-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-php83.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-uuid
+License: MIT
+License File: vendor/symfony/polyfill-uuid/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-uuid.git
+Link: https://symfony.com
+-----------
+symfony/process
+License: MIT
+License File: vendor/symfony/process/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/process.git
+Link: https://symfony.com
+-----------
+symfony/routing
+License: MIT
+License File: vendor/symfony/routing/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/routing.git
+Link: https://symfony.com
+-----------
+symfony/service-contracts
+License: MIT
+License File: vendor/symfony/service-contracts/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier
+Source: https://github.com/symfony/service-contracts.git
+Link: https://symfony.com
+-----------
+symfony/string
+License: MIT
+License File: vendor/symfony/string/LICENSE
+Copyright: Copyright (c) 2019-present Fabien Potencier
+Source: https://github.com/symfony/string.git
+Link: https://symfony.com
+-----------
+symfony/translation
+License: MIT
+License File: vendor/symfony/translation/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/translation.git
+Link: https://symfony.com
+-----------
+symfony/translation-contracts
+License: MIT
+License File: vendor/symfony/translation-contracts/LICENSE
+Copyright: Copyright (c) 2018-present Fabien Potencier
+Source: https://github.com/symfony/translation-contracts.git
+Link: https://symfony.com
+-----------
+symfony/uid
+License: MIT
+License File: vendor/symfony/uid/LICENSE
+Copyright: Copyright (c) 2020-present Fabien Potencier
+Source: https://github.com/symfony/uid.git
+Link: https://symfony.com
+-----------
+symfony/var-dumper
+License: MIT
+License File: vendor/symfony/var-dumper/LICENSE
+Copyright: Copyright (c) 2014-present Fabien Potencier
+Source: https://github.com/symfony/var-dumper.git
+Link: https://symfony.com
+-----------
+tijsverkoyen/css-to-inline-styles
+License: BSD-3-Clause
+License File: vendor/tijsverkoyen/css-to-inline-styles/LICENSE.md
+Copyright: Copyright (c) Tijs Verkoyen. All rights reserved.
+Source: https://github.com/tijsverkoyen/CssToInlineStyles.git
+Link: https://github.com/tijsverkoyen/CssToInlineStyles
+-----------
+vlucas/phpdotenv
+License: BSD-3-Clause
+License File: vendor/vlucas/phpdotenv/LICENSE
+Copyright: Copyright (c) 2014, Graham Campbell.
+Source: https://github.com/vlucas/phpdotenv.git
+Link: https://github.com/vlucas/phpdotenv.git
+-----------
+voku/portable-ascii
+License: MIT
+License File: vendor/voku/portable-ascii/LICENSE.txt
+Copyright: Copyright (C) 2019 Lars Moelleken
+Source: https://github.com/voku/portable-ascii.git
+Link: https://github.com/voku/portable-ascii
+-----------
+webmozart/assert
+License: MIT
+License File: vendor/webmozart/assert/LICENSE
+Copyright: Copyright (c) 2014 Bernhard Schussek
+Source: https://github.com/webmozarts/assert.git
+Link: https://github.com/webmozarts/assert.git

From 55a2a6db88bee277ed0cf43720428199f8d6ffc1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 23 Mar 2024 15:19:58 +0000
Subject: [PATCH 078/666] Licensing: Added script to gen info for JS packages

---
 dev/licensing/gen-js-licenses         |  121 ++
 dev/licensing/gen-licenses-shared.php |    4 +
 dev/licensing/js-library-licenses.txt | 1978 +++++++++++++++++++++++++
 3 files changed, 2103 insertions(+)
 create mode 100644 dev/licensing/gen-js-licenses
 create mode 100644 dev/licensing/gen-licenses-shared.php
 create mode 100644 dev/licensing/js-library-licenses.txt

diff --git a/dev/licensing/gen-js-licenses b/dev/licensing/gen-js-licenses
new file mode 100644
index 00000000000..6c44791aa27
--- /dev/null
+++ b/dev/licensing/gen-js-licenses
@@ -0,0 +1,121 @@
+#!/usr/bin/env php
+<?php
+
+// This script reads the project composer.lock file to generate
+// clear license details for our PHP dependencies.
+
+$rootPath = dirname(__DIR__, 2);
+$outputPath = "{$rootPath}/dev/licensing/js-library-licenses.txt";
+$outputSeparator = "\n-----------\n";
+$warnings = [];
+
+$packages = [
+    ...glob("{$rootPath}/node_modules/*/package.json"),
+    ...glob("{$rootPath}/node_modules/@*/*/package.json"),
+];
+
+$packageOutput = array_map(packageToOutput(...), $packages);
+
+$licenseInfo = implode($outputSeparator, $packageOutput) . "\n";
+file_put_contents($outputPath, $licenseInfo);
+
+echo "License information written to {$outputPath}\n";
+echo implode("\n", $warnings);
+
+function dd(mixed $data): never {
+    print_r($data);
+    exit(0);
+}
+
+function packageToOutput(string $packagePath): string
+{
+    global $rootPath;
+    $package = json_decode(file_get_contents($packagePath));
+    $output = ["{$package->name}"];
+
+    $license = $package->license ?? '';
+    if ($license) {
+        $output[] = "License: {$license}";
+    } else {
+        warn("Package {$package->name}: No license found");
+    }
+
+    $licenseFile = findLicenseFile($package->name, $packagePath);
+    if ($licenseFile) {
+        $relLicenseFile = str_replace("{$rootPath}/", '', $licenseFile);
+        $output[] = "License File: {$relLicenseFile}";
+        $copyright = findCopyright($licenseFile);
+        if ($copyright) {
+            $output[] = "Copyright: {$copyright}";
+        } else {
+            warn("Package {$package->name}: no copyright found in its license");
+        }
+    }
+
+    $source = $package->repository->url ?? $package->repository ?? '';
+    if ($source) {
+        $output[] = "Source: {$source}";
+    }
+
+    $link = $package->homepage ?? $source;
+    if ($link) {
+        $output[] = "Link: {$link}";
+    }
+
+    return implode("\n", $output);
+}
+
+function findLicenseFile(string $packageName, string $packagePath): string
+{
+    $licenseNameOptions = [
+        'license', 'LICENSE', 'License',
+        'license.*', 'LICENSE.*', 'License.*',
+        'license-*.*', 'LICENSE-*.*', 'License-*.*',
+    ];
+    $packageDir = dirname($packagePath);
+
+    $foundLicenses = [];
+    foreach ($licenseNameOptions as $option) {
+        $search = glob("{$packageDir}/$option");
+        array_push($foundLicenses, ...$search);
+    }
+
+    if (count($foundLicenses) > 1) {
+        warn("Package {$packageName}: more than one license file found");
+    }
+
+    if (count($foundLicenses) > 0) {
+        $fileName = basename($foundLicenses[0]);
+        return "{$packageDir}/{$fileName}";
+    }
+
+    warn("Package {$packageName}: no license files found");
+    return '';
+}
+
+function findCopyright(string $licenseFile): string
+{
+    $fileContents = file_get_contents($licenseFile);
+    $pattern = '/^.*?copyright (\(c\)|\d{4})[\s\S]*?(\n\n|\.\n)/mi';
+    $matches = [];
+    preg_match($pattern, $fileContents, $matches);
+    $copyright = trim($matches[0] ?? '');
+
+    if (str_contains($copyright, 'i.e.')) {
+        return '';
+    }
+
+    $emailPattern = '/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i';
+    return preg_replace_callback($emailPattern, obfuscateEmail(...), $copyright);
+}
+
+function obfuscateEmail(array $matches): string
+{
+    return preg_replace('/[^@.]/', '*', $matches[1]);
+}
+
+function warn(string $text): void
+{
+    global $warnings;
+    $warnings[] = "WARN:" . $text;
+}
\ No newline at end of file
diff --git a/dev/licensing/gen-licenses-shared.php b/dev/licensing/gen-licenses-shared.php
new file mode 100644
index 00000000000..265c209cafb
--- /dev/null
+++ b/dev/licensing/gen-licenses-shared.php
@@ -0,0 +1,4 @@
+<?php
+
+declare(strict_types=1);
+
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
new file mode 100644
index 00000000000..56dc1ff7544
--- /dev/null
+++ b/dev/licensing/js-library-licenses.txt
@@ -0,0 +1,1978 @@
+acorn-jsx
+License: MIT
+License File: node_modules/acorn-jsx/LICENSE
+Copyright: Copyright (C) 2012-2017 by Ingvar Stepanyan
+Source: https://github.com/acornjs/acorn-jsx
+Link: https://github.com/acornjs/acorn-jsx
+-----------
+acorn
+License: MIT
+License File: node_modules/acorn/LICENSE
+Copyright: Copyright (C) 2012-2022 by various contributors (see AUTHORS)
+Source: https://github.com/acornjs/acorn.git
+Link: https://github.com/acornjs/acorn
+-----------
+ajv
+License: MIT
+License File: node_modules/ajv/LICENSE
+Copyright: Copyright (c) 2015-2017 Evgeny Poberezkin
+Source: https://github.com/ajv-validator/ajv.git
+Link: https://github.com/ajv-validator/ajv
+-----------
+ansi-regex
+License: MIT
+License File: node_modules/ansi-regex/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/ansi-regex
+Link: chalk/ansi-regex
+-----------
+ansi-styles
+License: MIT
+License File: node_modules/ansi-styles/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/ansi-styles
+Link: chalk/ansi-styles
+-----------
+anymatch
+License: ISC
+License File: node_modules/anymatch/LICENSE
+Copyright: Copyright (c) 2019 Elan Shanker, Paul Miller (https://paulmillr.com)
+Source: https://github.com/micromatch/anymatch
+Link: https://github.com/micromatch/anymatch
+-----------
+argparse
+License: Python-2.0
+License File: node_modules/argparse/LICENSE
+Source: nodeca/argparse
+Link: nodeca/argparse
+-----------
+array-buffer-byte-length
+License: MIT
+License File: node_modules/array-buffer-byte-length/LICENSE
+Copyright: Copyright (c) 2023 Inspect JS
+Source: git+https://github.com/inspect-js/array-buffer-byte-length.git
+Link: https://github.com/inspect-js/array-buffer-byte-length#readme
+-----------
+array-includes
+License: MIT
+License File: node_modules/array-includes/LICENSE
+Copyright: Copyright (C) 2015 Jordan Harband
+Source: git://github.com/es-shims/array-includes.git
+Link: git://github.com/es-shims/array-includes.git
+-----------
+array.prototype.filter
+License: MIT
+License File: node_modules/array.prototype.filter/LICENSE
+Copyright: Copyright (c) 2021 Jordan Harband
+Source: git+https://github.com/es-shims/Array.prototype.filter.git
+Link: https://github.com/es-shims/Array.prototype.filter#readme
+-----------
+array.prototype.findlastindex
+License: MIT
+License File: node_modules/array.prototype.findlastindex/LICENSE
+Copyright: Copyright (c) 2021 ECMAScript Shims
+Source: git+https://github.com/es-shims/Array.prototype.findLastIndex.git
+Link: https://github.com/es-shims/Array.prototype.findLastIndex#readme
+-----------
+array.prototype.flat
+License: MIT
+License File: node_modules/array.prototype.flat/LICENSE
+Copyright: Copyright (c) 2017 ECMAScript Shims
+Source: git://github.com/es-shims/Array.prototype.flat.git
+Link: git://github.com/es-shims/Array.prototype.flat.git
+-----------
+array.prototype.flatmap
+License: MIT
+License File: node_modules/array.prototype.flatmap/LICENSE
+Copyright: Copyright (c) 2017 ECMAScript Shims
+Source: git://github.com/es-shims/Array.prototype.flatMap.git
+Link: git://github.com/es-shims/Array.prototype.flatMap.git
+-----------
+arraybuffer.prototype.slice
+License: MIT
+License File: node_modules/arraybuffer.prototype.slice/LICENSE
+Copyright: Copyright (c) 2023 ECMAScript Shims
+Source: git+https://github.com/es-shims/ArrayBuffer.prototype.slice.git
+Link: https://github.com/es-shims/ArrayBuffer.prototype.slice#readme
+-----------
+available-typed-arrays
+License: MIT
+License File: node_modules/available-typed-arrays/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/available-typed-arrays.git
+Link: https://github.com/inspect-js/available-typed-arrays#readme
+-----------
+balanced-match
+License: MIT
+License File: node_modules/balanced-match/LICENSE.md
+Copyright: Copyright (c) 2013 Julian Gruber &lt;******@************.***&gt;
+Source: git://github.com/juliangruber/balanced-match.git
+Link: https://github.com/juliangruber/balanced-match
+-----------
+binary-extensions
+License: MIT
+License File: node_modules/binary-extensions/license
+Copyright: Copyright (c) 2019 Sindre Sorhus <************@*****.***> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+Source: sindresorhus/binary-extensions
+Link: sindresorhus/binary-extensions
+-----------
+brace-expansion
+License: MIT
+License File: node_modules/brace-expansion/LICENSE
+Copyright: Copyright (c) 2013 Julian Gruber <******@************.***>
+Source: git://github.com/juliangruber/brace-expansion.git
+Link: https://github.com/juliangruber/brace-expansion
+-----------
+braces
+License: MIT
+License File: node_modules/braces/LICENSE
+Copyright: Copyright (c) 2014-2018, Jon Schlinkert.
+Source: micromatch/braces
+Link: https://github.com/micromatch/braces
+-----------
+call-bind
+License: MIT
+License File: node_modules/call-bind/LICENSE
+Copyright: Copyright (c) 2020 Jordan Harband
+Source: git+https://github.com/ljharb/call-bind.git
+Link: https://github.com/ljharb/call-bind#readme
+-----------
+callsites
+License: MIT
+License File: node_modules/callsites/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/callsites
+Link: sindresorhus/callsites
+-----------
+camelcase
+License: MIT
+License File: node_modules/camelcase/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/camelcase
+Link: sindresorhus/camelcase
+-----------
+chalk
+License: MIT
+License File: node_modules/chalk/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/chalk
+Link: chalk/chalk
+-----------
+chokidar-cli
+License: MIT
+License File: node_modules/chokidar-cli/LICENSE
+Copyright: Copyright (c) 2015 Kimmo Brunfeldt
+Source: https://github.com/open-npm-tools/chokidar-cli.git
+Link: https://github.com/open-npm-tools/chokidar-cli
+-----------
+chokidar
+License: MIT
+License File: node_modules/chokidar/LICENSE
+Copyright: Copyright (c) 2012-2019 Paul Miller (https://paulmillr.com), Elan Shanker
+Source: git+https://github.com/paulmillr/chokidar.git
+Link: https://github.com/paulmillr/chokidar
+-----------
+cliui
+License: ISC
+License File: node_modules/cliui/LICENSE.txt
+Copyright: Copyright (c) 2015, Contributors
+Source: http://github.com/yargs/cliui.git
+Link: http://github.com/yargs/cliui.git
+-----------
+codemirror
+License: MIT
+License File: node_modules/codemirror/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Source: https://github.com/codemirror/basic-setup.git
+Link: https://github.com/codemirror/basic-setup.git
+-----------
+color-convert
+License: MIT
+License File: node_modules/color-convert/LICENSE
+Copyright: Copyright (c) 2011-2016 Heather Arthur <**********@*****.***>
+Source: Qix-/color-convert
+Link: Qix-/color-convert
+-----------
+color-name
+License: MIT
+License File: node_modules/color-name/LICENSE
+Source: git@github.com:colorjs/color-name.git
+Link: https://github.com/colorjs/color-name
+-----------
+concat-map
+License: MIT
+License File: node_modules/concat-map/LICENSE
+Source: git://github.com/substack/node-concat-map.git
+Link: git://github.com/substack/node-concat-map.git
+-----------
+confusing-browser-globals
+License: MIT
+License File: node_modules/confusing-browser-globals/LICENSE
+Copyright: Copyright (c) 2013-present, Facebook, Inc.
+Source: https://github.com/facebook/create-react-app.git
+Link: https://github.com/facebook/create-react-app.git
+-----------
+crelt
+License: MIT
+License File: node_modules/crelt/LICENSE
+Copyright: Copyright (C) 2020 by Marijn Haverbeke <******@*********.******>
+Source: git+https://github.com/marijnh/crelt.git
+Link: https://github.com/marijnh/crelt#readme
+-----------
+cross-spawn
+License: MIT
+License File: node_modules/cross-spawn/LICENSE
+Copyright: Copyright (c) 2018 Made With MOXY Lda <*****@****.******>
+Source: git@github.com:moxystudio/node-cross-spawn.git
+Link: https://github.com/moxystudio/node-cross-spawn
+-----------
+debug
+License: MIT
+License File: node_modules/debug/LICENSE
+Copyright: Copyright (c) 2014-2017 TJ Holowaychuk <**@************.**>
+Copyright (c) 2018-2021 Josh Junon
+Source: git://github.com/debug-js/debug.git
+Link: git://github.com/debug-js/debug.git
+-----------
+decamelize
+License: MIT
+License File: node_modules/decamelize/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/decamelize
+Link: sindresorhus/decamelize
+-----------
+deep-is
+License: MIT
+License File: node_modules/deep-is/LICENSE
+Copyright: Copyright (c) 2012, 2013 Thorsten Lorenz <********@***.**>
+Copyright (c) 2012 James Halliday <****@********.***>
+Copyright (c) 2009 Thomas Robinson <280north.com>
+Source: http://github.com/thlorenz/deep-is.git
+Link: http://github.com/thlorenz/deep-is.git
+-----------
+define-data-property
+License: MIT
+License File: node_modules/define-data-property/LICENSE
+Copyright: Copyright (c) 2023 Jordan Harband
+Source: git+https://github.com/ljharb/define-data-property.git
+Link: https://github.com/ljharb/define-data-property#readme
+-----------
+define-properties
+License: MIT
+License File: node_modules/define-properties/LICENSE
+Copyright: Copyright (C) 2015 Jordan Harband
+Source: git://github.com/ljharb/define-properties.git
+Link: git://github.com/ljharb/define-properties.git
+-----------
+doctrine
+License: Apache-2.0
+License File: node_modules/doctrine/LICENSE
+Source: eslint/doctrine
+Link: https://github.com/eslint/doctrine
+-----------
+emoji-regex
+License: MIT
+License File: node_modules/emoji-regex/LICENSE-MIT.txt
+Source: https://github.com/mathiasbynens/emoji-regex.git
+Link: https://mths.be/emoji-regex
+-----------
+entities
+License: BSD-2-Clause
+License File: node_modules/entities/LICENSE
+Copyright: Copyright (c) Felix Böhm
+All rights reserved.
+Source: git://github.com/fb55/entities.git
+Link: git://github.com/fb55/entities.git
+-----------
+error-ex
+License: MIT
+License File: node_modules/error-ex/LICENSE
+Copyright: Copyright (c) 2015 JD Ballard
+Source: qix-/node-error-ex
+Link: qix-/node-error-ex
+-----------
+es-abstract
+License: MIT
+License File: node_modules/es-abstract/LICENSE
+Copyright: Copyright (C) 2015 Jordan Harband
+Source: git://github.com/ljharb/es-abstract.git
+Link: git://github.com/ljharb/es-abstract.git
+-----------
+es-array-method-boxes-properly
+License: MIT
+License File: node_modules/es-array-method-boxes-properly/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/es-array-method-boxes-properly.git
+Link: https://github.com/ljharb/es-array-method-boxes-properly#readme
+-----------
+es-define-property
+License: MIT
+License File: node_modules/es-define-property/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/es-define-property.git
+Link: https://github.com/ljharb/es-define-property#readme
+-----------
+es-errors
+License: MIT
+License File: node_modules/es-errors/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/es-errors.git
+Link: https://github.com/ljharb/es-errors#readme
+-----------
+es-set-tostringtag
+License: MIT
+License File: node_modules/es-set-tostringtag/LICENSE
+Copyright: Copyright (c) 2022 ECMAScript Shims
+Source: git+https://github.com/es-shims/es-set-tostringtag.git
+Link: https://github.com/es-shims/es-set-tostringtag#readme
+-----------
+es-shim-unscopables
+License: MIT
+License File: node_modules/es-shim-unscopables/LICENSE
+Copyright: Copyright (c) 2022 Jordan Harband
+Source: git+https://github.com/ljharb/es-shim-unscopables.git
+Link: https://github.com/ljharb/es-shim-unscopables#readme
+-----------
+es-to-primitive
+License: MIT
+License File: node_modules/es-to-primitive/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/ljharb/es-to-primitive.git
+Link: git://github.com/ljharb/es-to-primitive.git
+-----------
+esbuild
+License: MIT
+License File: node_modules/esbuild/LICENSE.md
+Copyright: Copyright (c) 2020 Evan Wallace
+Source: git+https://github.com/evanw/esbuild.git
+Link: git+https://github.com/evanw/esbuild.git
+-----------
+escape-string-regexp
+License: MIT
+License File: node_modules/escape-string-regexp/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/escape-string-regexp
+Link: sindresorhus/escape-string-regexp
+-----------
+eslint-config-airbnb-base
+License: MIT
+License File: node_modules/eslint-config-airbnb-base/LICENSE.md
+Copyright: Copyright (c) 2012 Airbnb
+Source: https://github.com/airbnb/javascript
+Link: https://github.com/airbnb/javascript
+-----------
+eslint-import-resolver-node
+License: MIT
+License File: node_modules/eslint-import-resolver-node/LICENSE
+Copyright: Copyright (c) 2015 Ben Mosher
+Source: https://github.com/import-js/eslint-plugin-import
+Link: https://github.com/import-js/eslint-plugin-import
+-----------
+eslint-module-utils
+License: MIT
+License File: node_modules/eslint-module-utils/LICENSE
+Copyright: Copyright (c) 2015 Ben Mosher
+Source: git+https://github.com/import-js/eslint-plugin-import.git
+Link: https://github.com/import-js/eslint-plugin-import#readme
+-----------
+eslint-plugin-import
+License: MIT
+License File: node_modules/eslint-plugin-import/LICENSE
+Copyright: Copyright (c) 2015 Ben Mosher
+Source: https://github.com/import-js/eslint-plugin-import
+Link: https://github.com/import-js/eslint-plugin-import
+-----------
+eslint-scope
+License: BSD-2-Clause
+License File: node_modules/eslint-scope/LICENSE
+Copyright: Copyright (C) 2012-2013 Yusuke Suzuki (twitter: @Constellation) and other contributors.
+Source: eslint/eslint-scope
+Link: http://github.com/eslint/eslint-scope
+-----------
+eslint-visitor-keys
+License: Apache-2.0
+License File: node_modules/eslint-visitor-keys/LICENSE
+Source: eslint/eslint-visitor-keys
+Link: https://github.com/eslint/eslint-visitor-keys#readme
+-----------
+eslint
+License: MIT
+License File: node_modules/eslint/LICENSE
+Source: eslint/eslint
+Link: https://eslint.org
+-----------
+espree
+License: BSD-2-Clause
+License File: node_modules/espree/LICENSE
+Copyright: Copyright (c) Open JS Foundation
+All rights reserved.
+Source: eslint/espree
+Link: https://github.com/eslint/espree
+-----------
+esquery
+License: BSD-3-Clause
+License File: node_modules/esquery/license.txt
+Copyright: Copyright (c) 2013, Joel Feenstra
+All rights reserved.
+Source: https://github.com/estools/esquery.git
+Link: https://github.com/estools/esquery/
+-----------
+esrecurse
+License: BSD-2-Clause
+Source: https://github.com/estools/esrecurse.git
+Link: https://github.com/estools/esrecurse
+-----------
+estraverse
+License: BSD-2-Clause
+License File: node_modules/estraverse/LICENSE.BSD
+Source: http://github.com/estools/estraverse.git
+Link: https://github.com/estools/estraverse
+-----------
+esutils
+License: BSD-2-Clause
+License File: node_modules/esutils/LICENSE.BSD
+Source: http://github.com/estools/esutils.git
+Link: https://github.com/estools/esutils
+-----------
+fast-deep-equal
+License: MIT
+License File: node_modules/fast-deep-equal/LICENSE
+Copyright: Copyright (c) 2017 Evgeny Poberezkin
+Source: git+https://github.com/epoberezkin/fast-deep-equal.git
+Link: https://github.com/epoberezkin/fast-deep-equal#readme
+-----------
+fast-json-stable-stringify
+License: MIT
+License File: node_modules/fast-json-stable-stringify/LICENSE
+Copyright: Copyright (c) 2017 Evgeny Poberezkin
+Copyright (c) 2013 James Halliday
+Source: git://github.com/epoberezkin/fast-json-stable-stringify.git
+Link: https://github.com/epoberezkin/fast-json-stable-stringify
+-----------
+fast-levenshtein
+License: MIT
+License File: node_modules/fast-levenshtein/LICENSE.md
+Copyright: Copyright (c) 2013 [Ramesh Nair](http://www.hiddentao.com/)
+Source: https://github.com/hiddentao/fast-levenshtein.git
+Link: https://github.com/hiddentao/fast-levenshtein.git
+-----------
+fastq
+License: ISC
+License File: node_modules/fastq/LICENSE
+Copyright: Copyright (c) 2015-2020, Matteo Collina <******.*******@*****.***>
+Source: git+https://github.com/mcollina/fastq.git
+Link: https://github.com/mcollina/fastq#readme
+-----------
+file-entry-cache
+License: MIT
+License File: node_modules/file-entry-cache/LICENSE
+Copyright: Copyright (c) 2015 Roy Riojas
+Source: royriojas/file-entry-cache
+Link: royriojas/file-entry-cache
+-----------
+fill-range
+License: MIT
+License File: node_modules/fill-range/LICENSE
+Copyright: Copyright (c) 2014-present, Jon Schlinkert.
+Source: jonschlinkert/fill-range
+Link: https://github.com/jonschlinkert/fill-range
+-----------
+find-up
+License: MIT
+License File: node_modules/find-up/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/find-up
+Link: sindresorhus/find-up
+-----------
+flat-cache
+License: MIT
+License File: node_modules/flat-cache/LICENSE
+Copyright: Copyright (c) Roy Riojas and Jared Wray
+Source: jaredwray/flat-cache
+Link: jaredwray/flat-cache
+-----------
+flatted
+License: ISC
+License File: node_modules/flatted/LICENSE
+Copyright: Copyright (c) 2018-2020, Andrea Giammarchi, @WebReflection
+Source: git+https://github.com/WebReflection/flatted.git
+Link: https://github.com/WebReflection/flatted#readme
+-----------
+for-each
+License: MIT
+License File: node_modules/for-each/LICENSE
+Copyright: Copyright (c) 2012 Raynos.
+Source: git://github.com/Raynos/for-each.git
+Link: https://github.com/Raynos/for-each
+-----------
+fs.realpath
+License: ISC
+License File: node_modules/fs.realpath/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git+https://github.com/isaacs/fs.realpath.git
+Link: git+https://github.com/isaacs/fs.realpath.git
+-----------
+function-bind
+License: MIT
+License File: node_modules/function-bind/LICENSE
+Copyright: Copyright (c) 2013 Raynos.
+Source: https://github.com/Raynos/function-bind.git
+Link: https://github.com/Raynos/function-bind
+-----------
+function.prototype.name
+License: MIT
+License File: node_modules/function.prototype.name/LICENSE
+Copyright: Copyright (c) 2016 Jordan Harband
+Source: git://github.com/es-shims/Function.prototype.name.git
+Link: git://github.com/es-shims/Function.prototype.name.git
+-----------
+functions-have-names
+License: MIT
+License File: node_modules/functions-have-names/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/inspect-js/functions-have-names.git
+Link: https://github.com/inspect-js/functions-have-names#readme
+-----------
+get-caller-file
+License: ISC
+License File: node_modules/get-caller-file/LICENSE.md
+Copyright: Copyright 2018 Stefan Penner
+Source: git+https://github.com/stefanpenner/get-caller-file.git
+Link: https://github.com/stefanpenner/get-caller-file#readme
+-----------
+get-intrinsic
+License: MIT
+License File: node_modules/get-intrinsic/LICENSE
+Copyright: Copyright (c) 2020 Jordan Harband
+Source: git+https://github.com/ljharb/get-intrinsic.git
+Link: https://github.com/ljharb/get-intrinsic#readme
+-----------
+get-symbol-description
+License: MIT
+License File: node_modules/get-symbol-description/LICENSE
+Copyright: Copyright (c) 2021 Inspect JS
+Source: git+https://github.com/inspect-js/get-symbol-description.git
+Link: https://github.com/inspect-js/get-symbol-description#readme
+-----------
+glob-parent
+License: ISC
+License File: node_modules/glob-parent/LICENSE
+Copyright: Copyright (c) 2015, 2019 Elan Shanker
+Source: gulpjs/glob-parent
+Link: gulpjs/glob-parent
+-----------
+glob
+License: ISC
+License File: node_modules/glob/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/node-glob.git
+Link: git://github.com/isaacs/node-glob.git
+-----------
+globals
+License: MIT
+License File: node_modules/globals/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/globals
+Link: sindresorhus/globals
+-----------
+globalthis
+License: MIT
+License File: node_modules/globalthis/LICENSE
+Copyright: Copyright (c) 2016 Jordan Harband
+Source: git://github.com/ljharb/System.global.git
+Link: git://github.com/ljharb/System.global.git
+-----------
+gopd
+License: MIT
+License File: node_modules/gopd/LICENSE
+Copyright: Copyright (c) 2022 Jordan Harband
+Source: git+https://github.com/ljharb/gopd.git
+Link: https://github.com/ljharb/gopd#readme
+-----------
+graceful-fs
+License: ISC
+License File: node_modules/graceful-fs/LICENSE
+Copyright: Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
+Source: https://github.com/isaacs/node-graceful-fs
+Link: https://github.com/isaacs/node-graceful-fs
+-----------
+graphemer
+License: MIT
+License File: node_modules/graphemer/LICENSE
+Copyright: Copyright 2020 Filament (Anomalous Technologies Limited)
+Source: https://github.com/flmnt/graphemer.git
+Link: https://github.com/flmnt/graphemer
+-----------
+has-bigints
+License: MIT
+License File: node_modules/has-bigints/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/has-bigints.git
+Link: https://github.com/ljharb/has-bigints#readme
+-----------
+has-flag
+License: MIT
+License File: node_modules/has-flag/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/has-flag
+Link: sindresorhus/has-flag
+-----------
+has-property-descriptors
+License: MIT
+License File: node_modules/has-property-descriptors/LICENSE
+Copyright: Copyright (c) 2022 Inspect JS
+Source: git+https://github.com/inspect-js/has-property-descriptors.git
+Link: https://github.com/inspect-js/has-property-descriptors#readme
+-----------
+has-proto
+License: MIT
+License File: node_modules/has-proto/LICENSE
+Copyright: Copyright (c) 2022 Inspect JS
+Source: git+https://github.com/inspect-js/has-proto.git
+Link: https://github.com/inspect-js/has-proto#readme
+-----------
+has-symbols
+License: MIT
+License File: node_modules/has-symbols/LICENSE
+Copyright: Copyright (c) 2016 Jordan Harband
+Source: git://github.com/inspect-js/has-symbols.git
+Link: https://github.com/ljharb/has-symbols#readme
+-----------
+has-tostringtag
+License: MIT
+License File: node_modules/has-tostringtag/LICENSE
+Copyright: Copyright (c) 2021 Inspect JS
+Source: git+https://github.com/inspect-js/has-tostringtag.git
+Link: https://github.com/inspect-js/has-tostringtag#readme
+-----------
+hasown
+License: MIT
+License File: node_modules/hasown/LICENSE
+Copyright: Copyright (c) Jordan Harband and contributors
+Source: git+https://github.com/inspect-js/hasOwn.git
+Link: https://github.com/inspect-js/hasOwn#readme
+-----------
+hosted-git-info
+License: ISC
+License File: node_modules/hosted-git-info/LICENSE
+Copyright: Copyright (c) 2015, Rebecca Turner
+Source: git+https://github.com/npm/hosted-git-info.git
+Link: https://github.com/npm/hosted-git-info
+-----------
+idb-keyval
+License: Apache-2.0
+Source: git+https://github.com/jakearchibald/idb-keyval.git
+Link: https://github.com/jakearchibald/idb-keyval#readme
+-----------
+ignore
+License: MIT
+Source: git@github.com:kaelzhang/node-ignore.git
+Link: git@github.com:kaelzhang/node-ignore.git
+-----------
+immutable
+License: MIT
+License File: node_modules/immutable/LICENSE
+Copyright: Copyright (c) 2014-present, Lee Byron and other contributors.
+Source: git://github.com/immutable-js/immutable-js.git
+Link: https://immutable-js.com
+-----------
+import-fresh
+License: MIT
+License File: node_modules/import-fresh/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/import-fresh
+Link: sindresorhus/import-fresh
+-----------
+imurmurhash
+License: MIT
+Source: https://github.com/jensyt/imurmurhash-js
+Link: https://github.com/jensyt/imurmurhash-js
+-----------
+inflight
+License: ISC
+License File: node_modules/inflight/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter
+Source: https://github.com/npm/inflight.git
+Link: https://github.com/isaacs/inflight
+-----------
+inherits
+License: ISC
+License File: node_modules/inherits/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter
+Source: git://github.com/isaacs/inherits
+Link: git://github.com/isaacs/inherits
+-----------
+internal-slot
+License: MIT
+License File: node_modules/internal-slot/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/internal-slot.git
+Link: https://github.com/ljharb/internal-slot#readme
+-----------
+is-array-buffer
+License: MIT
+License File: node_modules/is-array-buffer/LICENSE
+Copyright: Copyright (c) 2015 Chen Gengyuan, Inspect JS
+Source: git+https://github.com/inspect-js/is-array-buffer.git
+Link: https://github.com/inspect-js/is-array-buffer#readme
+-----------
+is-arrayish
+License: MIT
+License File: node_modules/is-arrayish/LICENSE
+Copyright: Copyright (c) 2015 JD Ballard
+Source: https://github.com/qix-/node-is-arrayish.git
+Link: https://github.com/qix-/node-is-arrayish.git
+-----------
+is-bigint
+License: MIT
+License File: node_modules/is-bigint/LICENSE
+Copyright: Copyright (c) 2018 Jordan Harband
+Source: git+https://github.com/inspect-js/is-bigint.git
+Link: https://github.com/inspect-js/is-bigint#readme
+-----------
+is-binary-path
+License: MIT
+License File: node_modules/is-binary-path/license
+Copyright: Copyright (c) 2019 Sindre Sorhus <************@*****.***> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+Source: sindresorhus/is-binary-path
+Link: sindresorhus/is-binary-path
+-----------
+is-boolean-object
+License: MIT
+License File: node_modules/is-boolean-object/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-boolean-object.git
+Link: git://github.com/inspect-js/is-boolean-object.git
+-----------
+is-callable
+License: MIT
+License File: node_modules/is-callable/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-callable.git
+Link: git://github.com/inspect-js/is-callable.git
+-----------
+is-core-module
+License: MIT
+License File: node_modules/is-core-module/LICENSE
+Copyright: Copyright (c) 2014 Dave Justice
+Source: git+https://github.com/inspect-js/is-core-module.git
+Link: https://github.com/inspect-js/is-core-module
+-----------
+is-date-object
+License: MIT
+License File: node_modules/is-date-object/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-date-object.git
+Link: git://github.com/inspect-js/is-date-object.git
+-----------
+is-extglob
+License: MIT
+License File: node_modules/is-extglob/LICENSE
+Copyright: Copyright (c) 2014-2016, Jon Schlinkert
+Source: jonschlinkert/is-extglob
+Link: https://github.com/jonschlinkert/is-extglob
+-----------
+is-fullwidth-code-point
+License: MIT
+License File: node_modules/is-fullwidth-code-point/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/is-fullwidth-code-point
+Link: sindresorhus/is-fullwidth-code-point
+-----------
+is-glob
+License: MIT
+License File: node_modules/is-glob/LICENSE
+Copyright: Copyright (c) 2014-2017, Jon Schlinkert.
+Source: micromatch/is-glob
+Link: https://github.com/micromatch/is-glob
+-----------
+is-negative-zero
+License: MIT
+License File: node_modules/is-negative-zero/LICENSE
+Copyright: Copyright (c) 2014 Jordan Harband
+Source: git://github.com/inspect-js/is-negative-zero.git
+Link: https://github.com/inspect-js/is-negative-zero
+-----------
+is-number-object
+License: MIT
+License File: node_modules/is-number-object/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-number-object.git
+Link: https://github.com/inspect-js/is-number-object#readme
+-----------
+is-number
+License: MIT
+License File: node_modules/is-number/LICENSE
+Copyright: Copyright (c) 2014-present, Jon Schlinkert.
+Source: jonschlinkert/is-number
+Link: https://github.com/jonschlinkert/is-number
+-----------
+is-path-inside
+License: MIT
+License File: node_modules/is-path-inside/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/is-path-inside
+Link: sindresorhus/is-path-inside
+-----------
+is-regex
+License: MIT
+License File: node_modules/is-regex/LICENSE
+Copyright: Copyright (c) 2014 Jordan Harband
+Source: git://github.com/inspect-js/is-regex.git
+Link: https://github.com/inspect-js/is-regex
+-----------
+is-shared-array-buffer
+License: MIT
+License File: node_modules/is-shared-array-buffer/LICENSE
+Copyright: Copyright (c) 2021 Inspect JS
+Source: git+https://github.com/inspect-js/is-shared-array-buffer.git
+Link: https://github.com/inspect-js/is-shared-array-buffer#readme
+-----------
+is-string
+License: MIT
+License File: node_modules/is-string/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/ljharb/is-string.git
+Link: git://github.com/ljharb/is-string.git
+-----------
+is-symbol
+License: MIT
+License File: node_modules/is-symbol/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-symbol.git
+Link: git://github.com/inspect-js/is-symbol.git
+-----------
+is-typed-array
+License: MIT
+License File: node_modules/is-typed-array/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/is-typed-array.git
+Link: git://github.com/inspect-js/is-typed-array.git
+-----------
+is-weakref
+License: MIT
+License File: node_modules/is-weakref/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/is-weakref.git
+Link: https://github.com/inspect-js/is-weakref#readme
+-----------
+isarray
+License: MIT
+License File: node_modules/isarray/LICENSE
+Copyright: Copyright (c) 2013 Julian Gruber <******@************.***>
+Source: git://github.com/juliangruber/isarray.git
+Link: https://github.com/juliangruber/isarray
+-----------
+isexe
+License: ISC
+License File: node_modules/isexe/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git+https://github.com/isaacs/isexe.git
+Link: https://github.com/isaacs/isexe#readme
+-----------
+js-yaml
+License: MIT
+License File: node_modules/js-yaml/LICENSE
+Copyright: Copyright (C) 2011-2015 by Vitaly Puzrin
+Source: nodeca/js-yaml
+Link: nodeca/js-yaml
+-----------
+json-buffer
+License: MIT
+License File: node_modules/json-buffer/LICENSE
+Copyright: Copyright (c) 2013 Dominic Tarr
+Source: git://github.com/dominictarr/json-buffer.git
+Link: https://github.com/dominictarr/json-buffer
+-----------
+json-parse-better-errors
+License: MIT
+License File: node_modules/json-parse-better-errors/LICENSE.md
+Copyright: Copyright 2017 Kat Marchán
+Source: https://github.com/zkat/json-parse-better-errors
+Link: https://github.com/zkat/json-parse-better-errors
+-----------
+json-schema-traverse
+License: MIT
+License File: node_modules/json-schema-traverse/LICENSE
+Copyright: Copyright (c) 2017 Evgeny Poberezkin
+Source: git+https://github.com/epoberezkin/json-schema-traverse.git
+Link: https://github.com/epoberezkin/json-schema-traverse#readme
+-----------
+json-stable-stringify-without-jsonify
+License: MIT
+License File: node_modules/json-stable-stringify-without-jsonify/LICENSE
+Source: git://github.com/samn/json-stable-stringify.git
+Link: https://github.com/samn/json-stable-stringify
+-----------
+json5
+License: MIT
+License File: node_modules/json5/LICENSE.md
+Copyright: Copyright (c) 2012-2018 Aseem Kishore, and [others].
+Source: git+https://github.com/json5/json5.git
+Link: http://json5.org/
+-----------
+keyv
+License: MIT
+Source: git+https://github.com/jaredwray/keyv.git
+Link: https://github.com/jaredwray/keyv
+-----------
+levn
+License: MIT
+License File: node_modules/levn/LICENSE
+Copyright: Copyright (c) George Zahariev
+Source: git://github.com/gkz/levn.git
+Link: https://github.com/gkz/levn
+-----------
+linkify-it
+License: MIT
+License File: node_modules/linkify-it/LICENSE
+Copyright: Copyright (c) 2015 Vitaly Puzrin.
+Source: markdown-it/linkify-it
+Link: markdown-it/linkify-it
+-----------
+livereload-js
+License: MIT
+License File: node_modules/livereload-js/LICENSE
+Copyright: Copyright (c) 2010-2012 Andrey Tarantsov
+Source: git://github.com/livereload/livereload-js.git
+Link: https://github.com/livereload/livereload-js
+-----------
+livereload
+License: MIT
+License File: node_modules/livereload/LICENSE
+Copyright: Copyright (c) 2010 Joshua Peek
+Source: http://github.com/napcs/node-livereload.git
+Link: http://github.com/napcs/node-livereload.git
+-----------
+load-json-file
+License: MIT
+License File: node_modules/load-json-file/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/load-json-file
+Link: sindresorhus/load-json-file
+-----------
+locate-path
+License: MIT
+License File: node_modules/locate-path/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/locate-path
+Link: sindresorhus/locate-path
+-----------
+lodash.debounce
+License: MIT
+License File: node_modules/lodash.debounce/LICENSE
+Source: lodash/lodash
+Link: https://lodash.com/
+-----------
+lodash.merge
+License: MIT
+License File: node_modules/lodash.merge/LICENSE
+Source: lodash/lodash
+Link: https://lodash.com/
+-----------
+lodash.throttle
+License: MIT
+License File: node_modules/lodash.throttle/LICENSE
+Source: lodash/lodash
+Link: https://lodash.com/
+-----------
+markdown-it-task-lists
+License: ISC
+License File: node_modules/markdown-it-task-lists/LICENSE
+Copyright: Copyright (c) 2016, Revin Guillen
+Source: git@github.com:revin/markdown-it-task-lists.git
+Link: https://github.com/revin/markdown-it-task-lists#readme
+-----------
+markdown-it
+License: MIT
+License File: node_modules/markdown-it/LICENSE
+Copyright: Copyright (c) 2014 Vitaly Puzrin, Alex Kocharin.
+Source: markdown-it/markdown-it
+Link: markdown-it/markdown-it
+-----------
+mdurl
+License: MIT
+License File: node_modules/mdurl/LICENSE
+Copyright: Copyright (c) 2015 Vitaly Puzrin, Alex Kocharin.
+Source: markdown-it/mdurl
+Link: markdown-it/mdurl
+-----------
+memorystream
+License File: node_modules/memorystream/LICENSE
+Copyright: Copyright (C) 2011 Dmitry Nizovtsev
+Source: https://github.com/JSBizon/node-memorystream.git
+Link: https://github.com/JSBizon/node-memorystream
+-----------
+minimatch
+License: ISC
+License File: node_modules/minimatch/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/minimatch.git
+Link: git://github.com/isaacs/minimatch.git
+-----------
+minimist
+License: MIT
+License File: node_modules/minimist/LICENSE
+Source: git://github.com/minimistjs/minimist.git
+Link: https://github.com/minimistjs/minimist
+-----------
+ms
+License: MIT
+License File: node_modules/ms/license.md
+Copyright: Copyright (c) 2016 Zeit, Inc.
+Source: zeit/ms
+Link: zeit/ms
+-----------
+natural-compare
+License: MIT
+Source: git://github.com/litejs/natural-compare-lite.git
+Link: git://github.com/litejs/natural-compare-lite.git
+-----------
+nice-try
+License: MIT
+License File: node_modules/nice-try/LICENSE
+Copyright: Copyright (c) 2018 Tobias Reich
+Source: https://github.com/electerious/nice-try.git
+Link: https://github.com/electerious/nice-try
+-----------
+normalize-package-data
+License: BSD-2-Clause
+License File: node_modules/normalize-package-data/LICENSE
+Copyright: Copyright (c) Meryn Stol ("Author")
+All rights reserved.
+Source: git://github.com/npm/normalize-package-data.git
+Link: git://github.com/npm/normalize-package-data.git
+-----------
+normalize-path
+License: MIT
+License File: node_modules/normalize-path/LICENSE
+Copyright: Copyright (c) 2014-2018, Jon Schlinkert.
+Source: jonschlinkert/normalize-path
+Link: https://github.com/jonschlinkert/normalize-path
+-----------
+npm-run-all
+License: MIT
+License File: node_modules/npm-run-all/LICENSE
+Copyright: Copyright (c) 2015 Toru Nagashima
+Source: mysticatea/npm-run-all
+Link: https://github.com/mysticatea/npm-run-all
+-----------
+object-inspect
+License: MIT
+License File: node_modules/object-inspect/LICENSE
+Copyright: Copyright (c) 2013 James Halliday
+Source: git://github.com/inspect-js/object-inspect.git
+Link: https://github.com/inspect-js/object-inspect
+-----------
+object-keys
+License: MIT
+License File: node_modules/object-keys/LICENSE
+Copyright: Copyright (C) 2013 Jordan Harband
+Source: git://github.com/ljharb/object-keys.git
+Link: git://github.com/ljharb/object-keys.git
+-----------
+object.assign
+License: MIT
+License File: node_modules/object.assign/LICENSE
+Copyright: Copyright (c) 2014 Jordan Harband
+Source: git://github.com/ljharb/object.assign.git
+Link: git://github.com/ljharb/object.assign.git
+-----------
+object.entries
+License: MIT
+License File: node_modules/object.entries/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/es-shims/Object.entries.git
+Link: git://github.com/es-shims/Object.entries.git
+-----------
+object.fromentries
+License: MIT
+License File: node_modules/object.fromentries/LICENSE
+Copyright: Copyright (c) 2018 Jordan Harband
+Source: git://github.com/es-shims/Object.fromEntries.git
+Link: git://github.com/es-shims/Object.fromEntries.git
+-----------
+object.groupby
+License: MIT
+License File: node_modules/object.groupby/LICENSE
+Copyright: Copyright (c) 2023 ECMAScript Shims
+Source: git+https://github.com/es-shims/Object.groupBy.git
+Link: https://github.com/es-shims/Object.groupBy#readme
+-----------
+object.values
+License: MIT
+License File: node_modules/object.values/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/es-shims/Object.values.git
+Link: git://github.com/es-shims/Object.values.git
+-----------
+once
+License: ISC
+License File: node_modules/once/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/once
+Link: git://github.com/isaacs/once
+-----------
+optionator
+License: MIT
+License File: node_modules/optionator/LICENSE
+Copyright: Copyright (c) George Zahariev
+Source: git://github.com/gkz/optionator.git
+Link: https://github.com/gkz/optionator
+-----------
+opts
+License: BSD-2-Clause
+License File: node_modules/opts/LICENSE.txt
+Copyright: Copyright (c) 2010, Joey Mazzarelli
+All rights reserved.
+Source: github:khtdr/opts
+Link: http://khtdr.com/opts
+-----------
+p-limit
+License: MIT
+License File: node_modules/p-limit/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/p-limit
+Link: sindresorhus/p-limit
+-----------
+p-locate
+License: MIT
+License File: node_modules/p-locate/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/p-locate
+Link: sindresorhus/p-locate
+-----------
+p-try
+License: MIT
+License File: node_modules/p-try/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/p-try
+Link: sindresorhus/p-try
+-----------
+parent-module
+License: MIT
+License File: node_modules/parent-module/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/parent-module
+Link: sindresorhus/parent-module
+-----------
+parse-json
+License: MIT
+License File: node_modules/parse-json/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/parse-json
+Link: sindresorhus/parse-json
+-----------
+path-exists
+License: MIT
+License File: node_modules/path-exists/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/path-exists
+Link: sindresorhus/path-exists
+-----------
+path-is-absolute
+License: MIT
+License File: node_modules/path-is-absolute/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/path-is-absolute
+Link: sindresorhus/path-is-absolute
+-----------
+path-key
+License: MIT
+License File: node_modules/path-key/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/path-key
+Link: sindresorhus/path-key
+-----------
+path-parse
+License: MIT
+License File: node_modules/path-parse/LICENSE
+Copyright: Copyright (c) 2015 Javier Blanco
+Source: https://github.com/jbgutierrez/path-parse.git
+Link: https://github.com/jbgutierrez/path-parse#readme
+-----------
+path-type
+License: MIT
+License File: node_modules/path-type/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/path-type
+Link: sindresorhus/path-type
+-----------
+picomatch
+License: MIT
+License File: node_modules/picomatch/LICENSE
+Copyright: Copyright (c) 2017-present, Jon Schlinkert.
+Source: micromatch/picomatch
+Link: https://github.com/micromatch/picomatch
+-----------
+pidtree
+License: MIT
+License File: node_modules/pidtree/license
+Copyright: Copyright (c) 2018 Simone Primarosa
+Source: github:simonepri/pidtree
+Link: http://github.com/simonepri/pidtree#readme
+-----------
+pify
+License: MIT
+License File: node_modules/pify/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/pify
+Link: sindresorhus/pify
+-----------
+possible-typed-array-names
+License: MIT
+License File: node_modules/possible-typed-array-names/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/possible-typed-array-names.git
+Link: https://github.com/ljharb/possible-typed-array-names#readme
+-----------
+prelude-ls
+License: MIT
+License File: node_modules/prelude-ls/LICENSE
+Copyright: Copyright (c) George Zahariev
+Source: git://github.com/gkz/prelude-ls.git
+Link: http://preludels.com
+-----------
+punycode
+License: MIT
+License File: node_modules/punycode/LICENSE-MIT.txt
+Source: https://github.com/mathiasbynens/punycode.js.git
+Link: https://mths.be/punycode
+-----------
+queue-microtask
+License: MIT
+License File: node_modules/queue-microtask/LICENSE
+Copyright: Copyright (c) Feross Aboukhadijeh
+Source: git://github.com/feross/queue-microtask.git
+Link: https://github.com/feross/queue-microtask
+-----------
+read-pkg
+License: MIT
+License File: node_modules/read-pkg/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/read-pkg
+Link: sindresorhus/read-pkg
+-----------
+readdirp
+License: MIT
+License File: node_modules/readdirp/LICENSE
+Copyright: Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmillr.com)
+Source: git://github.com/paulmillr/readdirp.git
+Link: https://github.com/paulmillr/readdirp
+-----------
+regexp.prototype.flags
+License: MIT
+License File: node_modules/regexp.prototype.flags/LICENSE
+Copyright: Copyright (C) 2014 Jordan Harband
+Source: git://github.com/es-shims/RegExp.prototype.flags.git
+Link: git://github.com/es-shims/RegExp.prototype.flags.git
+-----------
+require-directory
+License: MIT
+License File: node_modules/require-directory/LICENSE
+Copyright: Copyright (c) 2011 Troy Goode <*********@*****.***>
+Source: git://github.com/troygoode/node-require-directory.git
+Link: https://github.com/troygoode/node-require-directory/
+-----------
+require-main-filename
+License: ISC
+License File: node_modules/require-main-filename/LICENSE.txt
+Copyright: Copyright (c) 2016, Contributors
+Source: git+ssh://git@github.com/yargs/require-main-filename.git
+Link: https://github.com/yargs/require-main-filename#readme
+-----------
+resolve-from
+License: MIT
+License File: node_modules/resolve-from/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/resolve-from
+Link: sindresorhus/resolve-from
+-----------
+resolve
+License: MIT
+License File: node_modules/resolve/LICENSE
+Copyright: Copyright (c) 2012 James Halliday
+Source: git://github.com/browserify/resolve.git
+Link: git://github.com/browserify/resolve.git
+-----------
+reusify
+License: MIT
+License File: node_modules/reusify/LICENSE
+Copyright: Copyright (c) 2015 Matteo Collina
+Source: git+https://github.com/mcollina/reusify.git
+Link: https://github.com/mcollina/reusify#readme
+-----------
+rimraf
+License: ISC
+License File: node_modules/rimraf/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/rimraf.git
+Link: git://github.com/isaacs/rimraf.git
+-----------
+run-parallel
+License: MIT
+License File: node_modules/run-parallel/LICENSE
+Copyright: Copyright (c) Feross Aboukhadijeh
+Source: git://github.com/feross/run-parallel.git
+Link: https://github.com/feross/run-parallel
+-----------
+safe-array-concat
+License: MIT
+License File: node_modules/safe-array-concat/LICENSE
+Copyright: Copyright (c) 2023 Jordan Harband
+Source: git+https://github.com/ljharb/safe-array-concat.git
+Link: https://github.com/ljharb/safe-array-concat#readme
+-----------
+safe-regex-test
+License: MIT
+License File: node_modules/safe-regex-test/LICENSE
+Copyright: Copyright (c) 2022 Jordan Harband
+Source: git+https://github.com/ljharb/safe-regex-test.git
+Link: https://github.com/ljharb/safe-regex-test#readme
+-----------
+sass
+License: MIT
+License File: node_modules/sass/LICENSE
+Copyright: Copyright (c) 2016, Google Inc.
+Source: https://github.com/sass/dart-sass
+Link: https://github.com/sass/dart-sass
+-----------
+semver
+License: ISC
+License File: node_modules/semver/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: https://github.com/npm/node-semver.git
+Link: https://github.com/npm/node-semver.git
+-----------
+set-blocking
+License: ISC
+License File: node_modules/set-blocking/LICENSE.txt
+Copyright: Copyright (c) 2016, Contributors
+Source: git+https://github.com/yargs/set-blocking.git
+Link: https://github.com/yargs/set-blocking#readme
+-----------
+set-function-length
+License: MIT
+License File: node_modules/set-function-length/LICENSE
+Copyright: Copyright (c) Jordan Harband and contributors
+Source: git+https://github.com/ljharb/set-function-length.git
+Link: https://github.com/ljharb/set-function-length#readme
+-----------
+set-function-name
+License: MIT
+License File: node_modules/set-function-name/LICENSE
+Copyright: Copyright (c) Jordan Harband and contributors
+Source: git+https://github.com/ljharb/set-function-name.git
+Link: https://github.com/ljharb/set-function-name#readme
+-----------
+shebang-command
+License: MIT
+License File: node_modules/shebang-command/license
+Copyright: Copyright (c) Kevin Mårtensson <***************@*****.***> (github.com/kevva)
+Source: kevva/shebang-command
+Link: kevva/shebang-command
+-----------
+shebang-regex
+License: MIT
+License File: node_modules/shebang-regex/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/shebang-regex
+Link: sindresorhus/shebang-regex
+-----------
+shell-quote
+License: MIT
+License File: node_modules/shell-quote/LICENSE
+Copyright: Copyright (c) 2013 James Halliday (****@********.***)
+Source: http://github.com/ljharb/shell-quote.git
+Link: https://github.com/ljharb/shell-quote
+-----------
+side-channel
+License: MIT
+License File: node_modules/side-channel/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/side-channel.git
+Link: https://github.com/ljharb/side-channel#readme
+-----------
+snabbdom
+License: MIT
+License File: node_modules/snabbdom/LICENSE
+Copyright: Copyright (c) 2015 Simon Friis Vindum
+Source: git+https://github.com/snabbdom/snabbdom.git
+Link: https://github.com/snabbdom/snabbdom#readme
+-----------
+sortablejs
+License: MIT
+License File: node_modules/sortablejs/LICENSE
+Source: git://github.com/SortableJS/Sortable.git
+Link: git://github.com/SortableJS/Sortable.git
+-----------
+source-map-js
+License: BSD-3-Clause
+License File: node_modules/source-map-js/LICENSE
+Copyright: Copyright (c) 2009-2011, Mozilla Foundation and contributors
+All rights reserved.
+Source: 7rulnik/source-map-js
+Link: https://github.com/7rulnik/source-map-js
+-----------
+spdx-correct
+License: Apache-2.0
+License File: node_modules/spdx-correct/LICENSE
+Source: jslicense/spdx-correct.js
+Link: jslicense/spdx-correct.js
+-----------
+spdx-exceptions
+License: CC-BY-3.0
+Source: kemitchell/spdx-exceptions.json
+Link: kemitchell/spdx-exceptions.json
+-----------
+spdx-expression-parse
+License: MIT
+License File: node_modules/spdx-expression-parse/LICENSE
+Copyright: Copyright (c) 2015 Kyle E. Mitchell & other authors listed in AUTHORS
+Source: jslicense/spdx-expression-parse.js
+Link: jslicense/spdx-expression-parse.js
+-----------
+spdx-license-ids
+License: CC0-1.0
+Source: jslicense/spdx-license-ids
+Link: jslicense/spdx-license-ids
+-----------
+string-width
+License: MIT
+License File: node_modules/string-width/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/string-width
+Link: sindresorhus/string-width
+-----------
+string.prototype.padend
+License: MIT
+License File: node_modules/string.prototype.padend/LICENSE
+Copyright: Copyright (c) 2015 EcmaScript Shims
+Source: git://github.com/es-shims/String.prototype.padEnd.git
+Link: git://github.com/es-shims/String.prototype.padEnd.git
+-----------
+string.prototype.trim
+License: MIT
+License File: node_modules/string.prototype.trim/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/es-shims/String.prototype.trim.git
+Link: git://github.com/es-shims/String.prototype.trim.git
+-----------
+string.prototype.trimend
+License: MIT
+License File: node_modules/string.prototype.trimend/LICENSE
+Copyright: Copyright (c) 2017 Khaled Al-Ansari
+Source: git://github.com/es-shims/String.prototype.trimEnd.git
+Link: git://github.com/es-shims/String.prototype.trimEnd.git
+-----------
+string.prototype.trimstart
+License: MIT
+License File: node_modules/string.prototype.trimstart/LICENSE
+Copyright: Copyright (c) 2017 Khaled Al-Ansari
+Source: git://github.com/es-shims/String.prototype.trimStart.git
+Link: git://github.com/es-shims/String.prototype.trimStart.git
+-----------
+strip-ansi
+License: MIT
+License File: node_modules/strip-ansi/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/strip-ansi
+Link: chalk/strip-ansi
+-----------
+strip-bom
+License: MIT
+License File: node_modules/strip-bom/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/strip-bom
+Link: sindresorhus/strip-bom
+-----------
+strip-json-comments
+License: MIT
+License File: node_modules/strip-json-comments/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/strip-json-comments
+Link: sindresorhus/strip-json-comments
+-----------
+style-mod
+License: MIT
+License File: node_modules/style-mod/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: git+https://github.com/marijnh/style-mod.git
+Link: git+https://github.com/marijnh/style-mod.git
+-----------
+supports-color
+License: MIT
+License File: node_modules/supports-color/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/supports-color
+Link: chalk/supports-color
+-----------
+supports-preserve-symlinks-flag
+License: MIT
+License File: node_modules/supports-preserve-symlinks-flag/LICENSE
+Copyright: Copyright (c) 2022 Inspect JS
+Source: git+https://github.com/inspect-js/node-supports-preserve-symlinks-flag.git
+Link: https://github.com/inspect-js/node-supports-preserve-symlinks-flag#readme
+-----------
+text-table
+License: MIT
+License File: node_modules/text-table/LICENSE
+Source: git://github.com/substack/text-table.git
+Link: https://github.com/substack/text-table
+-----------
+to-regex-range
+License: MIT
+License File: node_modules/to-regex-range/LICENSE
+Copyright: Copyright (c) 2015-present, Jon Schlinkert.
+Source: micromatch/to-regex-range
+Link: https://github.com/micromatch/to-regex-range
+-----------
+tsconfig-paths
+License: MIT
+License File: node_modules/tsconfig-paths/LICENSE
+Copyright: Copyright (c) 2016 Jonas Kello
+Source: https://github.com/dividab/tsconfig-paths
+Link: https://github.com/dividab/tsconfig-paths
+-----------
+type-check
+License: MIT
+License File: node_modules/type-check/LICENSE
+Copyright: Copyright (c) George Zahariev
+Source: git://github.com/gkz/type-check.git
+Link: https://github.com/gkz/type-check
+-----------
+type-fest
+License: (MIT OR CC0-1.0)
+License File: node_modules/type-fest/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https:/sindresorhus.com)
+Source: sindresorhus/type-fest
+Link: sindresorhus/type-fest
+-----------
+typed-array-buffer
+License: MIT
+License File: node_modules/typed-array-buffer/LICENSE
+Copyright: Copyright (c) 2023 Jordan Harband
+Source: git+https://github.com/ljharb/typed-array-buffer.git
+Link: https://github.com/ljharb/typed-array-buffer#readme
+-----------
+typed-array-byte-length
+License: MIT
+License File: node_modules/typed-array-byte-length/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/typed-array-byte-length.git
+Link: https://github.com/inspect-js/typed-array-byte-length#readme
+-----------
+typed-array-byte-offset
+License: MIT
+License File: node_modules/typed-array-byte-offset/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/typed-array-byte-offset.git
+Link: https://github.com/inspect-js/typed-array-byte-offset#readme
+-----------
+typed-array-length
+License: MIT
+License File: node_modules/typed-array-length/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/typed-array-length.git
+Link: https://github.com/inspect-js/typed-array-length#readme
+-----------
+uc.micro
+License: MIT
+License File: node_modules/uc.micro/LICENSE.txt
+Source: markdown-it/uc.micro
+Link: markdown-it/uc.micro
+-----------
+unbox-primitive
+License: MIT
+License File: node_modules/unbox-primitive/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/unbox-primitive.git
+Link: https://github.com/ljharb/unbox-primitive#readme
+-----------
+uri-js
+License: BSD-2-Clause
+License File: node_modules/uri-js/LICENSE
+Copyright: Copyright 2011 Gary Court. All rights reserved.
+Source: http://github.com/garycourt/uri-js
+Link: https://github.com/garycourt/uri-js
+-----------
+validate-npm-package-license
+License: Apache-2.0
+License File: node_modules/validate-npm-package-license/LICENSE
+Source: kemitchell/validate-npm-package-license.js
+Link: kemitchell/validate-npm-package-license.js
+-----------
+w3c-keyname
+License: MIT
+License File: node_modules/w3c-keyname/LICENSE
+Copyright: Copyright (C) 2016 by Marijn Haverbeke <******@*********.******> and others
+Source: git+https://github.com/marijnh/w3c-keyname.git
+Link: https://github.com/marijnh/w3c-keyname#readme
+-----------
+which-boxed-primitive
+License: MIT
+License File: node_modules/which-boxed-primitive/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/inspect-js/which-boxed-primitive.git
+Link: https://github.com/inspect-js/which-boxed-primitive#readme
+-----------
+which-module
+License: ISC
+License File: node_modules/which-module/LICENSE
+Copyright: Copyright (c) 2016, Contributors
+Source: git+https://github.com/nexdrew/which-module.git
+Link: https://github.com/nexdrew/which-module#readme
+-----------
+which-typed-array
+License: MIT
+License File: node_modules/which-typed-array/LICENSE
+Copyright: Copyright (c) 2015 Jordan Harband
+Source: git://github.com/inspect-js/which-typed-array.git
+Link: git://github.com/inspect-js/which-typed-array.git
+-----------
+which
+License: ISC
+License File: node_modules/which/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/node-which.git
+Link: git://github.com/isaacs/node-which.git
+-----------
+wrap-ansi
+License: MIT
+License File: node_modules/wrap-ansi/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/wrap-ansi
+Link: chalk/wrap-ansi
+-----------
+wrappy
+License: ISC
+License File: node_modules/wrappy/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: https://github.com/npm/wrappy
+Link: https://github.com/npm/wrappy
+-----------
+ws
+License: MIT
+License File: node_modules/ws/LICENSE
+Copyright: Copyright (c) 2011 Einar Otto Stangvik <*******@*****.***>
+Source: websockets/ws
+Link: https://github.com/websockets/ws
+-----------
+y18n
+License: ISC
+License File: node_modules/y18n/LICENSE
+Copyright: Copyright (c) 2015, Contributors
+Source: git@github.com:yargs/y18n.git
+Link: https://github.com/yargs/y18n
+-----------
+yargs-parser
+License: ISC
+License File: node_modules/yargs-parser/LICENSE.txt
+Copyright: Copyright (c) 2016, Contributors
+Source: git@github.com:yargs/yargs-parser.git
+Link: git@github.com:yargs/yargs-parser.git
+-----------
+yargs
+License: MIT
+License File: node_modules/yargs/LICENSE
+Copyright: Copyright 2010 James Halliday (****@********.***)
+Modified work Copyright 2014 Contributors (***@*****.***)
+Source: https://github.com/yargs/yargs.git
+Link: https://yargs.js.org/
+-----------
+yocto-queue
+License: MIT
+License File: node_modules/yocto-queue/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/yocto-queue
+Link: sindresorhus/yocto-queue
+-----------
+@aashutoshrathi/word-wrap
+License: MIT
+License File: node_modules/@aashutoshrathi/word-wrap/LICENSE
+Copyright: Copyright (c) 2014-2016, Jon Schlinkert
+Source: git+https://github.com/aashutoshrathi/word-wrap.git
+Link: https://github.com/aashutoshrathi/word-wrap
+-----------
+@codemirror/autocomplete
+License: MIT
+License File: node_modules/@codemirror/autocomplete/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/autocomplete.git
+Link: https://github.com/codemirror/autocomplete.git
+-----------
+@codemirror/commands
+License: MIT
+License File: node_modules/@codemirror/commands/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/commands.git
+Link: https://github.com/codemirror/commands.git
+-----------
+@codemirror/lang-css
+License: MIT
+License File: node_modules/@codemirror/lang-css/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/lang-css.git
+Link: https://github.com/codemirror/lang-css.git
+-----------
+@codemirror/lang-html
+License: MIT
+License File: node_modules/@codemirror/lang-html/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/lang-html.git
+Link: https://github.com/codemirror/lang-html.git
+-----------
+@codemirror/lang-javascript
+License: MIT
+License File: node_modules/@codemirror/lang-javascript/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/lang-javascript.git
+Link: https://github.com/codemirror/lang-javascript.git
+-----------
+@codemirror/lang-json
+License: MIT
+License File: node_modules/@codemirror/lang-json/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Source: https://github.com/codemirror/lang-json.git
+Link: https://github.com/codemirror/lang-json.git
+-----------
+@codemirror/lang-markdown
+License: MIT
+License File: node_modules/@codemirror/lang-markdown/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/lang-markdown.git
+Link: https://github.com/codemirror/lang-markdown.git
+-----------
+@codemirror/lang-php
+License: MIT
+License File: node_modules/@codemirror/lang-php/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Source: https://github.com/codemirror/lang-php.git
+Link: https://github.com/codemirror/lang-php.git
+-----------
+@codemirror/lang-xml
+License: MIT
+License File: node_modules/@codemirror/lang-xml/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Source: https://github.com/codemirror/lang-xml.git
+Link: https://github.com/codemirror/lang-xml.git
+-----------
+@codemirror/language
+License: MIT
+License File: node_modules/@codemirror/language/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/language.git
+Link: https://github.com/codemirror/language.git
+-----------
+@codemirror/legacy-modes
+License: MIT
+License File: node_modules/@codemirror/legacy-modes/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/legacy-modes.git
+Link: https://github.com/codemirror/legacy-modes.git
+-----------
+@codemirror/lint
+License: MIT
+License File: node_modules/@codemirror/lint/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/lint.git
+Link: https://github.com/codemirror/lint.git
+-----------
+@codemirror/search
+License: MIT
+License File: node_modules/@codemirror/search/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/search.git
+Link: https://github.com/codemirror/search.git
+-----------
+@codemirror/state
+License: MIT
+License File: node_modules/@codemirror/state/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/state.git
+Link: https://github.com/codemirror/state.git
+-----------
+@codemirror/theme-one-dark
+License: MIT
+License File: node_modules/@codemirror/theme-one-dark/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/theme-one-dark.git
+Link: https://github.com/codemirror/theme-one-dark.git
+-----------
+@codemirror/view
+License: MIT
+License File: node_modules/@codemirror/view/LICENSE
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/codemirror/view.git
+Link: https://github.com/codemirror/view.git
+-----------
+@esbuild/linux-x64
+License: MIT
+Source: git+https://github.com/evanw/esbuild.git
+Link: git+https://github.com/evanw/esbuild.git
+-----------
+@eslint-community/eslint-utils
+License: MIT
+License File: node_modules/@eslint-community/eslint-utils/LICENSE
+Copyright: Copyright (c) 2018 Toru Nagashima
+Source: https://github.com/eslint-community/eslint-utils
+Link: https://github.com/eslint-community/eslint-utils#readme
+-----------
+@eslint-community/regexpp
+License: MIT
+License File: node_modules/@eslint-community/regexpp/LICENSE
+Copyright: Copyright (c) 2018 Toru Nagashima
+Source: https://github.com/eslint-community/regexpp
+Link: https://github.com/eslint-community/regexpp#readme
+-----------
+@eslint/eslintrc
+License: MIT
+License File: node_modules/@eslint/eslintrc/LICENSE
+Source: eslint/eslintrc
+Link: https://github.com/eslint/eslintrc#readme
+-----------
+@eslint/js
+License: MIT
+License File: node_modules/@eslint/js/LICENSE
+Source: https://github.com/eslint/eslint.git
+Link: https://eslint.org
+-----------
+@humanwhocodes/config-array
+License: Apache-2.0
+License File: node_modules/@humanwhocodes/config-array/LICENSE
+Source: git+https://github.com/humanwhocodes/config-array.git
+Link: https://github.com/humanwhocodes/config-array#readme
+-----------
+@humanwhocodes/module-importer
+License: Apache-2.0
+License File: node_modules/@humanwhocodes/module-importer/LICENSE
+Source: git+https://github.com/humanwhocodes/module-importer.git
+Link: git+https://github.com/humanwhocodes/module-importer.git
+-----------
+@humanwhocodes/object-schema
+License: BSD-3-Clause
+License File: node_modules/@humanwhocodes/object-schema/LICENSE
+Copyright: Copyright (c) 2019, Human Who Codes
+All rights reserved.
+Source: git+https://github.com/humanwhocodes/object-schema.git
+Link: https://github.com/humanwhocodes/object-schema#readme
+-----------
+@lezer/common
+License: MIT
+License File: node_modules/@lezer/common/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/common.git
+Link: https://github.com/lezer-parser/common.git
+-----------
+@lezer/css
+License: MIT
+License File: node_modules/@lezer/css/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/css.git
+Link: https://github.com/lezer-parser/css.git
+-----------
+@lezer/generator
+License: MIT
+License File: node_modules/@lezer/generator/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/generator.git
+Link: https://github.com/lezer-parser/generator.git
+-----------
+@lezer/highlight
+License: MIT
+License File: node_modules/@lezer/highlight/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/highlight.git
+Link: https://github.com/lezer-parser/highlight.git
+-----------
+@lezer/html
+License: MIT
+License File: node_modules/@lezer/html/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/html.git
+Link: https://github.com/lezer-parser/html.git
+-----------
+@lezer/javascript
+License: MIT
+License File: node_modules/@lezer/javascript/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/javascript.git
+Link: https://github.com/lezer-parser/javascript.git
+-----------
+@lezer/json
+License: MIT
+License File: node_modules/@lezer/json/LICENSE
+Copyright: Copyright (C) 2020 by Marijn Haverbeke <******@*********.******>, Arun Srinivasan <*******@*****.***>, and others
+Source: https://github.com/lezer-parser/json.git
+Link: https://github.com/lezer-parser/json.git
+-----------
+@lezer/lr
+License: MIT
+License File: node_modules/@lezer/lr/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/lr.git
+Link: https://github.com/lezer-parser/lr.git
+-----------
+@lezer/markdown
+License: MIT
+License File: node_modules/@lezer/markdown/LICENSE
+Copyright: Copyright (C) 2020 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/markdown.git
+Link: https://github.com/lezer-parser/markdown.git
+-----------
+@lezer/php
+License: MIT
+License File: node_modules/@lezer/php/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/php.git
+Link: https://github.com/lezer-parser/php.git
+-----------
+@lezer/xml
+License: MIT
+License File: node_modules/@lezer/xml/LICENSE
+Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/lezer-parser/xml.git
+Link: https://github.com/lezer-parser/xml.git
+-----------
+@nodelib/fs.scandir
+License: MIT
+License File: node_modules/@nodelib/fs.scandir/LICENSE
+Copyright: Copyright (c) Denis Malinochkin
+Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
+Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
+-----------
+@nodelib/fs.stat
+License: MIT
+License File: node_modules/@nodelib/fs.stat/LICENSE
+Copyright: Copyright (c) Denis Malinochkin
+Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
+Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
+-----------
+@nodelib/fs.walk
+License: MIT
+License File: node_modules/@nodelib/fs.walk/LICENSE
+Copyright: Copyright (c) Denis Malinochkin
+Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
+Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
+-----------
+@ssddanbrown/codemirror-lang-smarty
+License: MIT
+License File: node_modules/@ssddanbrown/codemirror-lang-smarty/LICENSE
+Copyright: Copyright (C) 2023 by Dan Brown, Marijn Haverbeke and others
+-----------
+@ssddanbrown/codemirror-lang-twig
+License: MIT
+License File: node_modules/@ssddanbrown/codemirror-lang-twig/LICENSE
+Copyright: Copyright (C) 2023 by Dan Brown, Marijn Haverbeke and others
+-----------
+@types/json5
+License: MIT
+Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
+-----------
+@ungap/structured-clone
+License: ISC
+License File: node_modules/@ungap/structured-clone/LICENSE
+Copyright: Copyright (c) 2021, Andrea Giammarchi, @WebReflection
+Source: git+https://github.com/ungap/structured-clone.git
+Link: https://github.com/ungap/structured-clone#readme

From ed956a4cf00473f3b2ba135dbeacff65bc9602b0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 23 Mar 2024 15:33:05 +0000
Subject: [PATCH 079/666] Licensing: Updated license gen scripts to share logic

---
 dev/licensing/gen-js-licenses         | 66 ++-------------------------
 dev/licensing/gen-licenses-shared.php | 62 +++++++++++++++++++++++++
 dev/licensing/gen-php-licenses        | 61 ++++---------------------
 phpstan.neon.dist                     |  1 +
 4 files changed, 77 insertions(+), 113 deletions(-)

diff --git a/dev/licensing/gen-js-licenses b/dev/licensing/gen-js-licenses
index 6c44791aa27..dfb2f6651b0 100644
--- a/dev/licensing/gen-js-licenses
+++ b/dev/licensing/gen-js-licenses
@@ -4,10 +4,12 @@
 // This script reads the project composer.lock file to generate
 // clear license details for our PHP dependencies.
 
+declare(strict_types=1);
+require "gen-licenses-shared.php";
+
 $rootPath = dirname(__DIR__, 2);
 $outputPath = "{$rootPath}/dev/licensing/js-library-licenses.txt";
 $outputSeparator = "\n-----------\n";
-$warnings = [];
 
 $packages = [
     ...glob("{$rootPath}/node_modules/*/package.json"),
@@ -20,12 +22,7 @@ $licenseInfo = implode($outputSeparator, $packageOutput) . "\n";
 file_put_contents($outputPath, $licenseInfo);
 
 echo "License information written to {$outputPath}\n";
-echo implode("\n", $warnings);
-
-function dd(mixed $data): never {
-    print_r($data);
-    exit(0);
-}
+echo implode("\n", getWarnings());
 
 function packageToOutput(string $packagePath): string
 {
@@ -64,58 +61,3 @@ function packageToOutput(string $packagePath): string
 
     return implode("\n", $output);
 }
-
-function findLicenseFile(string $packageName, string $packagePath): string
-{
-    $licenseNameOptions = [
-        'license', 'LICENSE', 'License',
-        'license.*', 'LICENSE.*', 'License.*',
-        'license-*.*', 'LICENSE-*.*', 'License-*.*',
-    ];
-    $packageDir = dirname($packagePath);
-
-    $foundLicenses = [];
-    foreach ($licenseNameOptions as $option) {
-        $search = glob("{$packageDir}/$option");
-        array_push($foundLicenses, ...$search);
-    }
-
-    if (count($foundLicenses) > 1) {
-        warn("Package {$packageName}: more than one license file found");
-    }
-
-    if (count($foundLicenses) > 0) {
-        $fileName = basename($foundLicenses[0]);
-        return "{$packageDir}/{$fileName}";
-    }
-
-    warn("Package {$packageName}: no license files found");
-    return '';
-}
-
-function findCopyright(string $licenseFile): string
-{
-    $fileContents = file_get_contents($licenseFile);
-    $pattern = '/^.*?copyright (\(c\)|\d{4})[\s\S]*?(\n\n|\.\n)/mi';
-    $matches = [];
-    preg_match($pattern, $fileContents, $matches);
-    $copyright = trim($matches[0] ?? '');
-
-    if (str_contains($copyright, 'i.e.')) {
-        return '';
-    }
-
-    $emailPattern = '/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i';
-    return preg_replace_callback($emailPattern, obfuscateEmail(...), $copyright);
-}
-
-function obfuscateEmail(array $matches): string
-{
-    return preg_replace('/[^@.]/', '*', $matches[1]);
-}
-
-function warn(string $text): void
-{
-    global $warnings;
-    $warnings[] = "WARN:" . $text;
-}
\ No newline at end of file
diff --git a/dev/licensing/gen-licenses-shared.php b/dev/licensing/gen-licenses-shared.php
index 265c209cafb..a8ad350f22d 100644
--- a/dev/licensing/gen-licenses-shared.php
+++ b/dev/licensing/gen-licenses-shared.php
@@ -2,3 +2,65 @@
 
 declare(strict_types=1);
 
+$warnings = [];
+
+function findLicenseFile(string $packageName, string $packagePath): string
+{
+    $licenseNameOptions = [
+        'license', 'LICENSE', 'License',
+        'license.*', 'LICENSE.*', 'License.*',
+        'license-*.*', 'LICENSE-*.*', 'License-*.*',
+    ];
+    $packageDir = dirname($packagePath);
+
+    $foundLicenses = [];
+    foreach ($licenseNameOptions as $option) {
+        $search = glob("{$packageDir}/$option");
+        array_push($foundLicenses, ...$search);
+    }
+
+    if (count($foundLicenses) > 1) {
+        warn("Package {$packageName}: more than one license file found");
+    }
+
+    if (count($foundLicenses) > 0) {
+        $fileName = basename($foundLicenses[0]);
+        return "{$packageDir}/{$fileName}";
+    }
+
+    warn("Package {$packageName}: no license files found");
+    return '';
+}
+
+function findCopyright(string $licenseFile): string
+{
+    $fileContents = file_get_contents($licenseFile);
+    $pattern = '/^.*?copyright (\(c\)|\d{4})[\s\S]*?(\n\n|\.\n)/mi';
+    $matches = [];
+    preg_match($pattern, $fileContents, $matches);
+    $copyright = trim($matches[0] ?? '');
+
+    if (str_contains($copyright, 'i.e.')) {
+        return '';
+    }
+
+    $emailPattern = '/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i';
+    return preg_replace_callback($emailPattern, obfuscateEmail(...), $copyright);
+}
+
+function obfuscateEmail(array $matches): string
+{
+    return preg_replace('/[^@.]/', '*', $matches[1]);
+}
+
+function warn(string $text): void
+{
+    global $warnings;
+    $warnings[] = "WARN:" . $text;
+}
+
+function getWarnings(): array
+{
+    global $warnings;
+    return $warnings;
+}
diff --git a/dev/licensing/gen-php-licenses b/dev/licensing/gen-php-licenses
index 0c922e281d8..ed5a21c5aa9 100644
--- a/dev/licensing/gen-php-licenses
+++ b/dev/licensing/gen-php-licenses
@@ -4,11 +4,13 @@
 // This script reads the project composer.lock file to generate
 // clear license details for our PHP dependencies.
 
+declare(strict_types=1);
+require "gen-licenses-shared.php";
+
 $rootPath = dirname(__DIR__, 2);
 $outputPath = "{$rootPath}/dev/licensing/php-library-licenses.txt";
 $composerLock = json_decode(file_get_contents($rootPath . "/composer.lock"));
 $outputSeparator = "\n-----------\n";
-$warnings = [];
 
 $packages = $composerLock->packages;
 $packageOutput = array_map(packageToOutput(...), $packages);
@@ -17,22 +19,25 @@ $licenseInfo =  implode($outputSeparator, $packageOutput) . "\n";
 file_put_contents($outputPath, $licenseInfo);
 
 echo "License information written to {$outputPath}\n";
-echo implode("\n", $warnings);
+echo implode("\n", getWarnings());
 
 function packageToOutput(stdClass $package) : string {
+    global $rootPath;
     $output = ["{$package->name}"];
 
     $licenses = is_array($package->license) ? $package->license : [$package->license];
     $output[] = "License: " . implode(' ', $licenses);
 
-    $licenseFile = findLicenseFile($package->name);
+    $packagePath = "{$rootPath}/vendor/{$package->name}/package.json";
+    $licenseFile = findLicenseFile($package->name, $packagePath);
     if ($licenseFile) {
-        $output[] = "License File: {$licenseFile}";
+        $relLicenseFile = str_replace("{$rootPath}/", '', $licenseFile);
+        $output[] = "License File: {$relLicenseFile}";
         $copyright = findCopyright($licenseFile);
         if ($copyright) {
             $output[] = "Copyright: {$copyright}";
         } else {
-            warn("Package {$package->name} has no copyright found in its license");
+            warn("Package {$package->name}: no copyright found in its license");
         }
     }
 
@@ -47,50 +52,4 @@ function packageToOutput(stdClass $package) : string {
     }
 
     return implode("\n", $output);
-}
-
-function findLicenseFile(string $packageName): string {
-    global $rootPath;
-    $licenseNameOptions = ['license', 'LICENSE', 'license.*', 'LICENSE.*'];
-
-    $packagePath = "vendor/{$packageName}";
-    $filePath = "{$rootPath}/{$packagePath}";
-
-    $foundLicenses = [];
-    foreach ($licenseNameOptions as $option) {
-        $search = glob("{$filePath}/$option");
-        array_push($foundLicenses, ...$search);
-    }
-
-    if (count($foundLicenses) > 1) {
-        warn("Package {$packagePath} has more than one license file found");
-    }
-
-    if (count($foundLicenses) > 0) {
-        $fileName = basename($foundLicenses[0]);
-        return "{$packagePath}/{$fileName}";
-    }
-
-    warn("Package {$packageName} has no license files found");
-    return '';
-}
-
-function findCopyright(string $licenseFile): string {
-    $fileContents = file_get_contents($licenseFile);
-    $pattern = '/^.*?copyright (\(c\)|\d{4})[\s\S]*?(\n\n|\.\n)/mi';
-    $matches = [];
-    preg_match($pattern, $fileContents, $matches);
-    $copyright = trim($matches[0] ?? '');
-
-    $emailPattern = '/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i';
-    return preg_replace_callback($emailPattern, obfuscateEmail(...), $copyright);
-}
-
-function obfuscateEmail(array $matches): string {
-    return preg_replace('/[^@.]/', '*', $matches[1]);
-}
-
-function warn(string $text): void {
-    global $warnings;
-    $warnings[] = "WARN:" . $text;
 }
\ No newline at end of file
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 15a519e20f6..bcf4e5aa208 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -19,5 +19,6 @@ parameters:
 
     excludePaths:
         - ./Config/**/*.php
+        - ./dev/**/*.php
 
     checkMissingIterableValueType: false
\ No newline at end of file

From 5f306a11e73a5eface6884374320227123219446 Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.pw>
Date: Sat, 23 Mar 2024 16:33:11 +0100
Subject: [PATCH 080/666] 15KB lossless optimization via oxipng(PNG) and
 svgo(SVG)

---
 public/book_default_cover.png          | Bin 5672 -> 3448 bytes
 public/icon-128.png                    | Bin 3538 -> 2976 bytes
 public/icon-180.png                    | Bin 6167 -> 5769 bytes
 public/icon-32.png                     | Bin 1338 -> 753 bytes
 public/icon-64.png                     | Bin 1951 -> 1374 bytes
 public/icon.ico                        | Bin 10933 -> 10619 bytes
 public/icon.png                        | Bin 6900 -> 6350 bytes
 public/loading_error.png               | Bin 2096 -> 1201 bytes
 public/logo.png                        | Bin 5415 -> 3302 bytes
 public/user_avatar.png                 | Bin 7405 -> 3423 bytes
 resources/icons/add-circle.svg         |   5 +----
 resources/icons/attach.svg             |   5 +----
 resources/icons/auth/discord.svg       |   2 +-
 resources/icons/auth/github.svg        |   2 +-
 resources/icons/auth/gitlab.svg        |   2 +-
 resources/icons/auth/google.svg        |   2 +-
 resources/icons/auth/okta.svg          |   2 +-
 resources/icons/auth/slack.svg         |   2 +-
 resources/icons/auth/twitch.svg        |   2 +-
 resources/icons/auth/twitter.svg       |   2 +-
 resources/icons/back.svg               |   5 +----
 resources/icons/book.svg               |   5 +----
 resources/icons/books.svg              |   2 +-
 resources/icons/bookshelf.svg          |   2 +-
 resources/icons/cancel.svg             |   5 +----
 resources/icons/caret-down.svg         |   5 +----
 resources/icons/caret-left-circle.svg  |   2 +-
 resources/icons/caret-right-circle.svg |   5 +----
 resources/icons/chapter.svg            |   5 +----
 resources/icons/check-circle.svg       |   5 +----
 resources/icons/check.svg              |   2 +-
 resources/icons/chevron-up.svg         |   5 +----
 resources/icons/close.svg              |   5 +----
 resources/icons/comment.svg            |   5 +----
 resources/icons/copy.svg               |   4 +---
 resources/icons/danger.svg             |   5 +----
 resources/icons/dark-mode.svg          |   2 +-
 resources/icons/delete.svg             |   5 +----
 resources/icons/download.svg           |   2 +-
 resources/icons/drawing.svg            |   5 +----
 resources/icons/edit.svg               |   5 +----
 resources/icons/expand-text.svg        |   5 +----
 resources/icons/export.svg             |   5 +----
 resources/icons/file.svg               |   2 +-
 resources/icons/folder.svg             |   5 +----
 resources/icons/fullscreen.svg         |   2 +-
 resources/icons/grid.svg               |   5 +----
 resources/icons/grip.svg               |   5 +----
 resources/icons/groups.svg             |   2 +-
 resources/icons/history.svg            |   5 +----
 resources/icons/image.svg              |   2 +-
 resources/icons/images.svg             |   5 +----
 resources/icons/include.svg            |   5 +----
 resources/icons/info-filled.svg        |   4 +---
 resources/icons/info.svg               |   5 +----
 resources/icons/leaderboard.svg        |   2 +-
 resources/icons/light-mode.svg         |   2 +-
 resources/icons/link.svg               |   4 +---
 resources/icons/list.svg               |   5 +----
 resources/icons/lock-open.svg          |   5 +----
 resources/icons/lock.svg               |  10 +---------
 resources/icons/login.svg              |   5 +----
 resources/icons/logout.svg             |   2 +-
 resources/icons/more.svg               |   5 +----
 resources/icons/new-user.svg           |   5 +----
 resources/icons/notifications.svg      |   2 +-
 resources/icons/oidc.svg               |   5 +----
 resources/icons/open-book.svg          |  10 +---------
 resources/icons/page.svg               |   5 +----
 resources/icons/palette.svg            |   2 +-
 resources/icons/permission.svg         |   5 +----
 resources/icons/popular.svg            |   4 +---
 resources/icons/reference.svg          |   4 +---
 resources/icons/reply.svg              |   5 +----
 resources/icons/role.svg               |   5 +----
 resources/icons/saml2.svg              |   5 +----
 resources/icons/save.svg               |   5 +----
 resources/icons/search.svg             |   5 +----
 resources/icons/security.svg           |   2 +-
 resources/icons/settings.svg           |   5 +----
 resources/icons/shortcuts.svg          |   2 +-
 resources/icons/sort.svg               |   5 +----
 resources/icons/spanner.svg            |   5 +----
 resources/icons/star-circle.svg        |   4 +---
 resources/icons/star-outline.svg       |   2 +-
 resources/icons/star.svg               |   6 +-----
 resources/icons/swap-vertical.svg      |   5 +----
 resources/icons/tag.svg                |   2 +-
 resources/icons/template.svg           |   2 +-
 resources/icons/time.svg               |   6 +-----
 resources/icons/upload.svg             |   2 +-
 resources/icons/user-preferences.svg   |   2 +-
 resources/icons/user.svg               |   5 +----
 resources/icons/users-add.svg          |   5 +----
 resources/icons/users.svg              |   5 +----
 resources/icons/warning.svg            |   5 +----
 resources/icons/watch-ignore.svg       |   2 +-
 resources/icons/watch.svg              |   4 +---
 resources/icons/webhooks.svg           |   2 +-
 99 files changed, 89 insertions(+), 265 deletions(-)

diff --git a/public/book_default_cover.png b/public/book_default_cover.png
index 7b6c9953e91d59d03a295e49786889317a3e9ca1..bf73b67a35f09b99c76724e48a17c0f6d96928d6 100644
GIT binary patch
delta 3380
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

literal 5672
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

diff --git a/public/icon-128.png b/public/icon-128.png
index 46cc2811b5e7f6162e87b8e4e0cf3785f57a922c..333c1e9640ae2d775674f716ba31fe77c6e8b135 100644
GIT binary patch
delta 2953
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

delta 3518
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

diff --git a/public/icon-180.png b/public/icon-180.png
index 6533a05b3ec340befe94aa2fb3774ff705d1856d..7627b523c89c13ee9deda03779473c34dcfa9e41 100644
GIT binary patch
literal 5769
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
Hu0mjff>4)J

literal 6167
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

diff --git a/public/icon-32.png b/public/icon-32.png
index 7307ed8f1e88f1e5ade85925d8aedee40d771f64..de94f373da2948976bb6212daf66c2f2a54389f4 100644
GIT binary patch
delta 713
zcmV;)0yh1+3h@PyBa=e|6@LKaP)t-s0C52P|NH6i`H;Eb(c|x7qSxl__AHFh4TsQq
ztKHq~^T*rmQ=8TE`1|+!{=C!dyVB~Y%I3P!={1qoMV8e_nAjhU*D;UNFpkom#O54~
z*52;)gt6V#=k#u=+2HT>g|gn$<?+(w@Q1YFlDy*)h|!U{;mO_bRDYb-W2D({s@i0w
z+G3;FE{)N$%<8$&=rfSi>+<{Z_xeVc*2dcGr^)5#?)RI);uML}7mC!J!sC;@<n;Oc
zRh`$$-tpAt^VaC~>hb#Z`u&~5<Qj|B=<oPMmDIl0?#SHlz0~bOl+*F{_}`)>*Z=?k
z0d!JMQvg8b*k%9#0e_}RL_t(|+MSc>Qo=wGgtG=FO*mBW0wW<{z%xP3fd?KO9?AQ^
zkC|Pt5RoeFKNQtdvtN2<w0|hAthLMD<waZkYKvkCD40bOt8KFY40}gs*bB=m{Hxf-
zzDHdEyMY-jH+k^;aF5A50E}&l2WUPmmWan8fF@1tI&`Ymz<<)GV)1dMJUO{MW-@ZB
zBE7rCmx>nVx@bFTW{;`~Rw>z{4kAsA3RtDdI0_A91(k8MZQzG2GuQ>(`v<Lzq)Pgd
zJ<J_7!IAb-O_YFq&S@^#eP4!EDw+jmX!A$4?6+4axpCxO0)`jG17=87ERAp)?m@QY
zc|j+?228?{wtq3NO+M@vO79$5ma+`XvV#{*B(v9mbH|jWJArL+rWq+S%z01vrv?~d
zRBr$^pL9qD>oB;1oZ~(imo^h%phyoqW@v;mv%W`NH%tF?fpmihxx;+a0`C%02f#^B
zkv^+Y%0H)$jN{zkwiE-n3B>nZ>CjffF?GrBGwJp6wmvcacyeZ{>S%c(UsTuW>^<?z
v#$$L3B%75rH-kn!U3+yFiS>6Y{(kG9VAnXXK3j(800000NkvXXu0mjfOrV3o

delta 1300
zcmV+v1?&3p1-c55BYy(=P)t-s0C4~fhtL3v(h-Q!0FBiYiP9H})D(@-8jIB&jMf*9
z(I1W18j#W~jL;mB(=LtCAClBCj?y8M)-jLMBb3)OkkloW*fo*XCzjbZlGiws*ff>X
zIh5Hpmef0y+Cr4mH<;B#mDD+z)<u@pI-1x<m)1O+*+`h!J%60qNtxL{o!d&9+DDw#
zOPkwGoZLyC)>E6+N}tzMoYqUA*j1g^OrhFVp4nHQ+D@X|SfJZaqufxW-CCjCQKjBn
zqTOMl*Ic9CSf$uvqu5!d*<+;HTBq7%rP^Gm+-0WRU8&t>r`=wv-e;)ZU#s6~so!9%
z;BKkeYO3IGs(;#Nt=ns?;c%<lXs+CGtlV;~-g&FtY_Z^TuitdA;C!y&b+O@gvf_8M
z<9xH-gt6UywBCiX-hQ>;hO^**w&91g;efZ|h_&K@xZ{bo<AS;5inrv1y5)<w<%PTE
ziM!yCx!{bt=7zlIioD^Gy5Wnx;*z}MjK1WPz2uF*<$sjE<&MDSmA~eX!RMC1=a9na
zn8E0q!Qz#}<B`PanZoIu!sC|2<dVheox|jp#^s*G=9tIlpT*~y$mpQP=$gstp~vZ)
z%Ic%Y>ZHl*r^)4|%Iv7h=Bdl)rp)cC%;~Gn>axu0tk3JS&Fihu?6l78uF>ta&+V_$
z?y1!7wtvv>xzOmb)9<>`>9o`7vefXq((1L;>a*4IywmKq)$6^~?YGwLxYzE!*6z93
z@4wgYy4mo-*zmjC@xs~hyxj7`+VaNQ?7iLd#M|@0-R;NQ?Y`dh!QSr3-0#BQ@X6iq
z!{G7C-to)d^334##^UqG<Mhqq^vLA(&g1pb<A3kZ<o43!@X+P>)8+Bh=JVC(^w#M0
z*Xj1z>i62~_~7dJ-R$$>>-pR5`Qq&R-0u3`?)2vE_TcaJ=kE96@b~EN_~P;S>G1jE
z^7-oV`sDNa>+<{M^!w)Z{Ot7n?e+cd_W$wr`11Gq^Z5Jp`TX_z{rCI+`27F*{{Q;_
z|0MkX`~Uy{il{xc00001bW%=J06^y0W&i*H0b)x>L;#2d9Y~QO7k>fFNkl<ZILnn&
zJ!rx}6wXJmC=yB$=@^QXu2S5EQaXojuED|GK}uJLf;b14%pw$|&^3clq@zf*OO{@O
zh;&N*8E)viJ8i{Up>Ihp-<Nma``&w+_Wy`i2jRJUd^O~M!n~IUN<ok9r|_Tz6#C;^
zq@DR5{G+ZT<FXon3x6;0c9SgHS?G7nJpqgst0!QMwkiCzKtEb+5;jp~ol}UYPWbla
zDvHb>6gLNBpcwJP5x%2mf4^Q0{g~io$HcxcA6W&F#+RkNaIz6O28gg~L@nbtZU^24
zpx-aFIm`~L?!bk?*n+UMA8VYvEe?EZ3(mHsS@|B-MjD2qsDE<!e71)5dgLBcg>FP<
z5g}H#q@0P9hD<B^MP{|>YtmV2(+$^r3d_j9NXx8|G|LXXna0iaZNQBmNNUatg;_<R
zlr(JgUWx~$HJqrK0#4hqHqv0fd*_gS%m@u-)}@>YrS!xV8d8q*EK8H1ll#|ON~fZc
zIiZi0g*|;n?qvg)eWmnGwNf6geQC#yA=0usy`KL}l$w<adlXI8Ym6p~lz#3`n^50K
z-Uf;t?GEHjWu2_=<9|#%3N%?}cXeQAkZQ&Ux6Wq#@ZR$O@A?-MA=~<yR9{X20000<
KMNUMnLSTYQN-rM(

diff --git a/public/icon-64.png b/public/icon-64.png
index 854d80faacb4ddcbbef17a357a5e7c3ca6ed69b9..8642b24eba3e1549f05609932a0743f55f5a5214 100644
GIT binary patch
delta 1339
zcmV-B1;qNF58eupBa=e|6@LK{P)t-s0C52P|NHUw_@~L`ER4|R?e_Hf{9&Tk%HHwG
z-SAeP*<z#EW2D*9<L?xS(hY~u5s1-wtKHq~^Y{DyZmHSR<?$Da)R4L0=kE6~j?$^i
z=P{4dk-FjN@Axy2)UwR#^Z5H!o!7|R?^mDNIFs19(C9*x)9Ug1n}5OLAC1?Y!{naC
z=AXsqv(4)@k=E((`SSPrQ=8Ss+U$g}-Qe%__4@t0(&|K&)Vk5>w9f3P%H}SO(Nvt)
z$J_0}*zmvC?})YHhqU2_v*3lY-h8g$aI4#7rP|Wu@YLq>%ir=vmest|>_(T?z0~bU
znApD7?(6dVoWkRjzJKK$jMkF8<CDGQ8jID{=k#x?+Scgx*Xj0RjQe{40004WQchC<
zK<3zH000B#Nkl<Zc-qxh?N-`A5bccwv@L8%02M`oZTYa(fC#qQR;w*m#IIsO`~DBo
z-HgdBXpVrtyuTpl%w*@@J2RVCF9QIc7w%qO0kenWTS=5Z#D9Sq<L$I1BofJ43IQtB
zno!6sF2Mz+4Ucb@g^x@YZoa%>08<q|pP=yGxr6nR{LwvY0h1TsObLb9oIyk=bnMBf
z0E`VPK6PwLA_ju6R&+5z9YCwyrHD64CPEAr3s_oQnR_AyfaF_>*lo8$B7}82M15~x
z{<^qyfarLbKYytB+O^>mL1-K}&UWKISLQbmS^Qi~5H<mr!}+{Qu`kbkcdMA>YVcUN
zb8sO7q_>l{X*hT-QimqIn}ErH&pPlRKAW+G4l7ryqS`ruTig=kXl##43d!(5Jit46
z4i-w{AyQ4fNr8HPMLdE*fo(K`#5`ICw5Dx{$I-m$i+_hGe{M;&lL+Gf(Mu*pt$Kx>
zqm(!Wg?oPoVhUJ4ZBpA$0K|*$#WX0b!#O9lDS<K7`?rcNt1S}%?K<pVlQJ+^^`zQ4
zLD;or0wX33K`wt1R(c3GR6FKRC{+6Lxh-9=EF!_yW3{d34h+vffjZd@pDYT?dv)BU
zEzL&lu7A%#@1C1DerH4kXe_hZYENW4qymlu)3Z7{cr1r%*Zx#s9_9iWv!yYAjDtqd
z!fX0XjLq${4`k}KfY)mS=5dN6c`W}7ivRiz&i963AJqR8P*~;SRF7~ljb)=+(`+=%
zgiM+;fo-kvLz=^_wwlBI_j5U9($ikHwW&5PPJifFY^9VEcq2wuQ%$RnWjDVTHl$>d
zPQb(jMSoJ`*pgObN|cQpx#@K#_m)q|NDBQ>8in3j3k!=jj8B0m`}%?tC3)n729b!g
zAiP)R$Y{b#Tl9jm4wq1=_Ibh4j3*iGjBd}fZa~=KL71&`GP2-EHueGW7j32Pc?+jH
zlYeX+pMxgx$1S=;>nwai3ywXx&P=Lq9E!dYBy7cUTPpX4ZKO1<1r0gEWMTp218T05
zPFS(@&IhVEp<J~aBs(%u(L6~PH}V0scTackbxh^u!;CTc*8^xJxGU_xk1@S}@&?SK
zRKVn!&Scu=rH122`MWrGG(ln?naT033V)A>Y@3`<$P_QQJ9H-VE)ccU<+6(te;N{}
zK9fA!5P7X2{;sa+Wjy|PLPXqcz~yq+@D}}%V`3ujMj_!m0omFt4W7K*@eJOQTXd{A
zJbArjstWKf{VmG&1SY%S@+GV=(jb`picM&&j&9M(0I*@hEouX^d}i>N0%rNpAuyD`
x#DQ5qwP;jh_K!Vk+F1d(*=K*T;zfLz{|6f_(sA))NsRyi002ovPDHLkV1lc(!6pCz

delta 1918
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
Ef}C<na{vGU

diff --git a/public/icon.ico b/public/icon.ico
index 41655ccba55f8dd5f250471eb2e8928b21a85992..e4752690c711ba2aea5d32663ae6408bd6602e3c 100644
GIT binary patch
delta 10565
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
T4e(z863T*%07D3&lY1&UpKu#}

delta 10909
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

diff --git a/public/icon.png b/public/icon.png
index b9f0125a856efffe6b8c8c0660810cff9b6636a6..939b97e4ff06b2571170a03a0b41adc57b7b6006 100644
GIT binary patch
literal 6350
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
QFaQ7m07*qoM6N<$f+#NRF8}}l

literal 6900
zcmV<Q8Vlu#P)<h;3K|Lk000e1NJLTq00961009690{{R3YphsQ0008|P)t-s0C4~f
zhtL3v(h-Q!0FBiYiP9H})D(@-8jIB&jMf*9(I1W18j#W~jL;mB(=LtCAClBCj?y8M
z)-jLMBb3)OkkloW*fo*XCzjbZlGiws*ff>XIh5Hpmef0y+Cr4mH<;B#mDD+z)<u@p
zI-1x<m)1O+*+`h!J)GJ}nb|*`+e(_+N1WA5o7+vC+)19+Q=8RFpVw5J)=Qw+Rh`#N
zq1slS*;k+1PNLgbpxaNQ+)$+5TA|!grQTbj-C?5FT%+DtrPyMl*jc98W2D(yr`lwt
z+FYpIWv1L+soiF$-CnBRXQ<v^tKVs<-(alZZmHR7s^D*`+GnlXYpmgLtJ`R<+;Obj
za;@HZtKDp|;B&9vbg<xjuHbdC;dZj(ceCSsv)zQT-F>v)g|gm$wcm!b;D5H^hqU2<
zx8jJk;(@s1iMHc{x#Wts<b=BAi@4>5yXJ|z;E=iCjJoEAyyuF%;gP!Gi@oBKyyJ|%
z<dePRjlboTzU7X<=9RzZkHP1bz~_*{=$OIio5A9h!{d>}>6yamoWkRl#N?92>Yc;n
zm&WCu#O9dC=by#rnaJp%#^{>K>7mEzo672=$m*oY>!-=(rONE6%I2xd=cdf<s?6!D
z&g!zv>a5S}v(4+R(CoC%?5@%6wa@LZ((b9$?zYhGxzOmb)9<>`>9o`7vefXq((1L;
z>a*4IywmKq)$6^~?YGwLxYzE!*6z93@4wgYy4mo-*zmjC@xs~hyxj7`+VaNQ?7iLd
z#M|@0-R;NQ?Y`dh!QSr3-0#BQ@X6iq!{G7C-to)d^334##^UqG<Mhqq^vLA(&g1pb
z<L}Sp_R{3=(B=5k<?+<!^VR3{*68)u>Gs*`_uA|D;Oh9@?DOI4`P=RJ;_Um}?)u*D
z^ycmM;P3V4?)TyF_vr8V;_>+D@cHBN`Reid<n#LL^84lV`{woh?DYKY_5JVm|MB+t
z^7s1l`1|zv{Pp_%_xt|%{Qvp>|N8&`{Qvv^|Nn}pJ+%M;00DGTPE!Ct=GbNc0004E
zOGiWihy@);00009a7bBm001Cy001Cy0qf8I3jhEYhDk(0RCwC$U2jZOS(dl@=A~Z+
zuqf$J9XhT7K45g541c1D(o9C}h?xw%xN+ld9JJdo>BuOp&PH3KwsBg`!WTP>qgk>n
z%Vc+n-EO0X2xzyu8UpOHjE1BFlOZq|BW3kM*Ozyb`Y;q#!a4W-JMYyisG_)ENHkS-
z&$;)Ud(Q9tTeWIst*n)`vR2m0T3N}o!jYBc<fktS!eFI4{b|U8uzICA`RT+0NVDSS
zX~zLTFn?Z^Sv#6uEP&)sp2%{!nD6RL`p5yKG}P>4uE=7Wx|H-_0TTZ1Em86#OR9dB
z4srl*|FeCv3og&G@#W3}B>bnmE@82}rs?G@2avXz=6vQ-FIIYI*{T9a7r$4kMSf(-
z)kAz)vH+4lyzecS{_>uBvHVm4BtLk5HFFs)R^VS|)-ihe+6#@zpA~}PW#%Bj<L|GO
zjLByky7=;Pks$e_wXzBM@8E|p^;rPP4>b5pZoeCPMSSFLDAiej%>MRGCge-Idja`V
zjXr7Tlhn2fknry|6aF9F3PE<QkFZNVl)_j6B!8^dV?w^KA;2|sC0lbjkeV!jS9iL}
zO!#Fa{A0ClXce@lpd6r=|Mmtm;jiomr##d24io-6<*Z|5_g0%deT8k{h?TA%tJ&o~
zI+;pxfSuk96Y^J|f5oAjAZx3LYbk@7VZ<xnO!)T=1M(+N>#~cLb*6+WK*E2&+=P6#
zwHuH>bKQ_#(!LbH%&^mICj14>;N@33x0tYN)=^G!%nS+t=^PWM*L!-BTVU7RXVxaO
zD!{^DU?%+gk?{Y+YUUy=wyu*WsgHyZucuqhgulE;f$UmKBH!gcImwgMOGHlZ0W;yx
zgTl|BmP;h^r9HzuNgZWm_nJDr87H9dk9{PQ$Y({j!KFzm(-1v<9Ytn#ZxwjWxH-G#
zouz3QP(9M0JnsR#{R35IPVf4gQ21|cBntn55%4P$_3l|mc_cYl0FQsPF3Sw@Y6vcD
zTj{GL3jfa@flCvN`j*Vs_<HGCfZ*=NcgzqkbZR5e={2;MTA;mjr<l#(ruHSq%rM+t
zZ0htr;a1ocqcZ0lRGEVxLX|1)da{(4015wYv!|~J9+%R-fhPR&L1Zr-$rLZu!I7o9
z1d#mkI%|m6P$lu{+YV9D(6x7&mReboh%&N!ujQKAy}uek=jfr4zpfS9OFd<8>F9`#
zMR$~u@ITmWX7^U~acKAE(S+Z71|lVX17}ID8eUvg0B^s)#!UG0TOi`~U<*<B_d?+h
zT<{ux%yV)PF*D@!p7)qIy_u(8LZ^2>?d501ccJjNnVFXn_hM#oSb&}0LW_u(mv;Me
zuL8xUJlRS46f3{C2&w?*cvYAQe<{TAW^NSHZoj8~6aq^JXfH;D+e3-I1PJlkZ?-XZ
z9Ktuszt`>CRa)SaCB_V)zv@A7X<nYoW-jVt-ct!x1(5t#gpHLULp97fSAKXsIX3*?
z|JB@3tK$T+%`hY!YAK+TuZ9_&WdRcYR?5b%aGi|s2rov;HSMLQX>j~~?@KPLODcVs
z7_0zAdbg1_c0rc`k=3u3Aa~saAb*1BEUD2(zw;cxkzS%!Dhe4fAXKb!mIh&j@T!lw
z>@DWK5_DD-K=P;Q8)KgYX79S*HQ=>^^ui#pa(km)@}r*DR}QKIjChq;*ci*(f2N_i
z{k#90nEL;aqJ$AQcq{lOmVFUAOV6q$SA2_A_9+f=06D!jHa7d{NwVkN4LkN7J^xRw
z_x^WeJO<?W7erjHfk?^tu?$!IORjYUGsB2iyc?TiMovN0g`at&1f*^E6%Zk8dXKrB
zSj^WLcXA0ryskR5F&Ar{+ZR6=OAkO1!aJo7{mNX<VSJbw68>Ao&TXtN%77LY(bx#_
zdiJ60a&k$#2kc)0RNGMH<i^%V&t*7kR``*#q%I+ddwGsP>)5W-d&1-BrsSv+nBK7E
zDT)xTV=m_x%k8ki0POVUIlM7;Gy2Va5b^4*NCf#VmeUZj%m5_(56hk3*r%d(#791o
z6G6U9{>Vm2qBW=2mJ(1f`BRs35_9}pd#$GvAmRT!F&mRdk&KxmUiQcrd}9&=u<$2l
zW3yZP1|nXSQbK+MrQlE*0FVEEh2%=qI=UeI2NERwC<P}NAThua+#S~{QetrTC0}B0
zf5m+T#VvaX41iZ9a5<YLkbal^RpfY-wt~cvp9kZ~e5g`lU8W4cc5hKa$)8<0&4EyF
zVuat7fkH}?^|Mx-WXgar=9nwti+OVrB>a0JA{M$aCu3#|fX6@isoRyhi*15MXY+AO
zV+J6^tI5YwnEZE|X2M#5I3ori;lERs!sH7@XD|?FzyNssgVk~hlP}brptz+j0}$L@
z?@49hFM&m8O7~Wz$aNTi3i?gcJd&Dx-_`HAfeWX}03`gK#i=a(a_tz5TV7DPa9Rwo
zRNIi;$6pD7KTY#e%>d+$pYf*h?azlHB|flI%Zd{jfW7g;R3<;?LV!@7jv0W2|LM+@
z7XBJw_ww&`Q_m3t!nX2HlJfXVAHe*(Tl(ecIt-Y+l+t!DLcDmtQKmj*0QgK}MhYK4
zM!ZZ?&$Ssa>-g@KQdRgN;uQ`ym{@T-42YB}r=<78${#A4B?JTps4`W4mvVYQC^{P^
z#4S|};LvUSb!s6XStnrf?aPxCMW$jvFASXX!OGN81ybd6JE`YAm;t;_+6e=*iGpVn
z@brBJxBZwHw{#zT@rD7hGhZJG8-fNc{MF?($<G4jYY5tK;iUKHBZO}lFqt#=b(f}K
zMZ&>kHwv?AN34{mzu{UD2ok(uz>plfP;F2ZJV|P|fK}qUlLBJV*~KZ8Ark%DHIJ6=
zfbru*g=w82e<MtN<lS3|btkyKbe;j<EPNanr3S7fB{aZt8m6J$TSF~6>s7?)aP;rj
zFiCSw1H{rtK2APWAb$c7uW;}pEpEy3f3K*+<I%tW%JB6<h3Wm}$#n@>1wy<!XkyAT
z&cYXiV+Q<Q_ztNWS{I7rSyAzjzZMpq@xdyZ&4wd{GuQj{MIfdMj!l4{d3h`|Nyzt}
z26k_Fw2oMBT?|`|DEBrmn8MM&w>3&o^H8yd(<z%ag})l5c@Q)8SuSi#$%pnyE|CE}
zTK9-;zM~{nn2>Ej#e>vL{fr}H(A7KUMb1$4?|}C4%CJ`x4>m2SDq#7r6p|18ocQ#i
z#>_J}qWx(^28?<2MD94mnZ{4Kmx=`}1GQP2tfMI<Rt7K4LIZ1&0U@8h(#2rIo~3b=
zC0KDvj$1Nc(+t;aU@bC$mm2)`md8+oc5PhzOTbECn<d^uj9a>Y4KGdLEHG+CK!hJM
z)V(#ZD?_MZkukH`a}3#WdUyT-MF>%6Iu#=HFU;8Vz5+{_{`9NGd=lM<;W<v7rIiq{
z!vBDmrcZEe)sUE3yPqQDDEC(^)+LZWfW?EMmVBD<XI}w!Z+Ju%AyhFSm}BmKqxKyw
zi-MU6#e?^^6P?}~<k2>&Wmb&}Z>0cfu<^&#xrD0%w&n{cdBZhS#Opr1H0@eiTNN1L
zS4bPW1UKYQa3B?d7krY)aD;e;`O{sR!mW-B^^)FqwjOo7O=Kuts_eBPa?FbmuaQG<
z>wLS40ij<K+jyb$lTcfJVpzb6ZlU_2ZA7Q{BZznzbf(jY4Jr>e(`d=6h0jvZtZRxr
zr}ql<L`R9`>8u<An#%3<`a9DMj)t13t^9rmD^L86CsfJ%q2WcXo3|7p)X5K+JWRwF
z%8+T=<!DMBD}Bms)XjTNzJMz8Gvf%MUU-}jen1p9)YLfC<XBQA%e#)El*ICM8MURH
zF~#uo!{bUj(ZWFuTKL2fXVPl%OrbF{;)S3a^N!3$`2jr8Ky2*yS2rMhKJ;Pyj<Q^h
z+KYafM|FCG1|!={81N<v_R>yk$5MzkD0fTZlLNLHwpmg-h;{SsI@o4u{1~YtGZO)k
zBHY%S+T2tA8+2sx6j#g&KLjtH6U)=3D&#C(Cw64^_G1S0%PwhKubps%_cMf49krWW
z;zqrNqsS%U=YN7iI1fsR*4*A_I55JS<|eqnx?(=lKx}k|F|+4?ZATSIuvcC<)chVX
z(hHH2Fty~8l`Ks2e8YghjcF4U6&(GT8ghhjYULZt5oNX!&KKpq#8904$)BJ}dNGHp
zGGY1rLV`&2e>dH>wG}ibce=q+g|)zTYTdk40SjW3b|Tx|wPUD!KKkeT1yESpGYFlq
ze_l&%bRDn}uAXBaMj0*=1<#(+mUi?B<@2!+Tej}A@`BjLL%_@)Zzb;NeQ5WFT8XN6
zH3|~g>&Ofl@a%1ToL8s04HR}4!ptb8_N)lDiB%r$AU?jR5PYhU=q#;)DNsfXh?thJ
zF|BfsntX<nmd=^Y)WAtuWF?LY!9zF69hqSgT;LUAz;LG8xj+%M=6tFuKxu0SBr4(+
z4iMAwSbob7sDU-HDeHEW2H9TFg&5%1kn_ynSaB~GFtb|-Gt<30vu~$j!v*u4okAT3
z-zEkLkb)YhSSX*5r3tRl`c&=>1Tg#^6*EJQa;v68!}3sJ6E!tg-sd-(L8fc>UU&_;
z76CmZ%z)5Z9q;5Z!aayjZN{fiMZY?$c9gy6p`=Vuo!*jfxycMNZLYzYtufe3V1RCH
z6m_-=hsfX*0yT#B%HlbK|DCz!vthxJ-zHYv1G&~y!nE9B{`dOM&V@-EZ9Q>QV-Dx*
zu`*Q9-$~3naUYqm(~<dI;V2|+Jb+(g1_}hJ-F{n`*}S97-a`fbk#rr>w;?corkPmT
zm|2gw2GTo3K;(gBXmz89w{1NYGlPS`#%d$uMl$Nh;e8^Or?V0iA?z-vf)x-dn7+P_
z=_5kp#`Z35a`&2QdKEOo)Bc|-c`w@0HL{-(v|*UCGK3S}#rTp65-T?OHr(TMgc_+R
z?S?wkZ?GfXuaN7;P)<B?1{qHB6ZNn<L*%0QaiXXo88bsM4uc)(S`|1wpumpGe04U{
z6cz53E$&76x{!$4z+&cwbRD9L`3*|*pw1veLs^xUJZ27yhw?}e%mge>JWqUz3h|iS
zS?h2ek$1m^X&$4*#2lPd!3Q+0adm=39nlzpV;jhhGVEqT?i7jBJjgT1vXRQv<C;1&
z)|W+N?~m`GgtbzOm>C~AMAe@NDe15^gDjv6&Z!x&kVI*AoO>`3PmSKpH8r04!e;~V
zS{S@-wzr=>G)<1tV?e~dqPnC<;KMY2oT$(?HFo?X5%J2gQV6ccHN%oG&FC<>jqj{I
z8$|Xj@m4dk`-Wza5z}IGK1W<LF8b3epQrm+$js{6;$Zvha@6{ejCdVDV~85okjv+V
z=y*4E?ol;zly5kcGpA~ONW}?zt>H^X<@3}6p-kMS@PreIGVU`F@p?&Y<R{D^8z!hs
z6$2DR3laZY*MgIB;!P01Q)J17;GWM=`TPkA*Hq5X0mQ>+)SLHHbn`mmN}pxx@6hm6
z5x<69`=Oa8i&BqRF~TZP6N+{_XnQzlKa)N(ebhz+YaxQsL)2hz*G{R+=CIQrq$bMv
z@atnUeKzY5E(9mO$GMHDvdy|_KHonf9{U3)=RVnC{SrvK>=c5#vT9)zlWfIoxEWG~
z$4j+sDXInf{v%|8T1*gN8*jp2y-!Swm8wwE?u~paHo3rng}4CQ`jlu*8+dM0RuTl5
zuK~6`^izeuqyv@DlfAMLt=efA8IqAd6{JtX4%#X?mp_5mIB+4G8YF<_^L}y}QNK8B
zDE0-J$f&*o$F`19{nw&f<~W4vLpuj;rFk5NX&!+Kt8F1Opplvo9v6_P{tBv4A|&eH
zOzjw!j|!Uxs48c>9c<3!y`VL4OglfoHWmq^g5kht#<0KlJVXn}>ZpiUn;ovn`-e5>
z3h3nrxa1?Ke4dI%`;5_OeW#ZicFaEg3YO24@p--ZqcQGhI~R`-O3rn(GoC(5E(FKP
zF#)QEF1W5cU@8`*$<=;oP;25&>Pu6N<3Ab@uoyG?1yT67bwjSTZz3kM9vjymEEC&8
zfu5r=Xd_Vu$0WlO^+Hh%9)-%sYKalTLR&Z?j?(J%(&oE#@xOYM!h4#y*R?1r{S38f
z6biwKv*hrIlv%D3?exuN!-u2)e%e5-U9**!P>S*ry5?n^ZGHfiIJJQ_QkfPqHO$9P
zs~Rb3sDf{`X))WfU!9r4d^bWiB805$TU)t0zadN=j`b3ATc(9@Y0txm^5kKexsSrk
zvsY(`0wr9+JyfUnIc2C8Ei~voKV?S%h3vFLLnwcYs8T(j{u%P|3^iY`gEo0Q_PzT|
zEq#QUQ4?iw$vKpy@2C;NpAXr=34IOI)PYiZos?AHx&1rz2>*!MzRk}y(gVnd*DahJ
zV<TtRY@Af=u_jzBjF|-*iMg#lF-MtR2<~eP+CjWNcw%LuUhLZ|NQU@1l-+!Y?7oET
zjBLxQ8^Pl@iRJTc76+?p^^?>8c2uW8#>_sL$NczXI^w0+Xc+0cJY{vDVhqu)u~VrM
zqF1U!69h&NQsI>jRJ%h*yll^tR31~Kf-q5r2dOnKYpw?POFF;?z3M+wtG6opY|YeN
zxMsOFvUbB{7}J|iY|n}3f|Bd^@>^_9RfdX&Xq){6)ww;~;$(j<Noa#WE+d+<J5m{y
z&l7vJN!8dsS?gH&JT3>LJH5kkj1|YD1&RKdrygZ+o?7h$3ue#pg)PLZQwiIrUz{)Z
zWiB}zHEi8XA)g};Hs;ybh`p)u_!f*FA?D2C&}?U%i88pzK%qvZJoV!|Zt_*Cpvp!l
zfX`fuqvfR7Fp?_#d!IQ&zG~1Qu_DKF92J+Huv<RwIRg=|KU0%qO5zoMgK2Y3_PW>X
zk>eG9@{|w3Ac>oN)x1G+{~}aA-?hnd`8=Kr`jl#t)=hAS$roABN9|zsG3sD-)zWMR
zVJ@ium*hxqBFGm9uQ}Yq%)m{GDG_34E>_U$`0dx3H-DNKvB#L%Q(_^wm>ff_!dUb9
zYo0LjRq3--M|t}r=)kuU?hf13j^=`Hqo&3B6HC7MB;Kb2m?*jArP<^*oUTL133onG
z5>38J6;Q9H?=ni1F?>c)x{lUdP=cr>kbY4WoTc{mKsAnix;guJD6m2e65tUj2_@fd
zCOt0M(rGz~({=a&wH9>0e=*4yTkZ9f#NE;Q&7=8SI2Uy6Ff~H>n1>gaeo+-P#oN<-
zZoRc1mCsX6?)REQi%-5N2h_HKtgI6S!2zf%l+#jM&}AN<<V!-n$bx}i5LLlm)P<!f
zhM5V;xa1Kj9}X=Y`6|q;ggDj)74MH7i`*StQa@Tpo7ccfJCyKJ(l1;Ba{8>$EMc!3
zrR$i^1)cY|zntbvOuh;;t0RMz@Uchb^Bu&J3^ea&>BtvYpbXF(-)NW5lN&}p=Sf1o
zN)-^Jf~aNA8@rd<mZ|8j5>6ia1r`J^6Rr1k|B1`zl?0@DEDa0j{u@ZsS9*zvmm5V0
zlZ1THI(}p|Y)wZOP><K-Az$q%Qxg}yh!m=sw%D6@DqBL~WTjtpluuC|`Ac`tQDKG8
zr+5;RZ@c82T0UPhob2R_Phz)&Gbtt1`Y>6^7g_LwQ!^=9VQW$gzrGy2B&M*MSxr+s
zWyn{lf~t5E1ma8cNCH)GXG2`&^TnM?IMwJESTNmSd(;NYg}!s@kT0@;T5_&R4-i^@
zr`Uq3;K^?5Idd{91W!5gMeF#M#RLId2%eJk3zy(~E1fhVBT{(ElP|J>n&21dWk0q&
z$XCJVq(O8zj+Wx&i&jCKsq4oIzE;A^iGJY{m^3zE*%yP$jeIMPvRvcm%aD9g4(@Gb
zI*3=dvOLKbS)kdb5l0A@9sMfIOh^zA8a6FM@{LtNY9L-tV`lU7Oj-G3C7cfQiw;7x
z%^l9HUf$%ZR6(7ac}`C9G$LPQ!C>9<bR%Do10GI4`d6vDwx${Rnk-nAb}P-v#~fId
urYp_KkFj9Y%34_~Yh|shm9?^xX8i?ke|NVE;n`yV0000<MNUMnLSTYSvIiUh

diff --git a/public/loading_error.png b/public/loading_error.png
index 4f588fbe1e8fb4cd09f5bf1138897a7ae9a1254c..7030b89e97d1ef734ec41a9caf8190a3fbda50b7 100644
GIT binary patch
delta 1118
zcmdlWu#t0uL_H%j0|SHeW*IXE2F8L+XXk*-<YWehid$1JT6!=$iX8j+U#&~2Yk`=O
zShR~a^P|?KZi*a&PCXM=v{pZ9dZYG6?Zy(39A+`O-au~Y>|EU(R>uzv8@Fr<+A?v&
zI{_2Njt8sj_RKUtQ^P#ZE6n)Kv_OM1O`@D^Pa<ku^QzqzHP_1}1YLadC&xl&QD*HO
zCB{2Hjz<1jzw1lO+C~*-<EVRDJL1@vnQ>J<j9uXGt-b4YaKe!y{TILDzFeIZ-x7SN
zLSWmXiI&%E8|GwfxRs!rE4facVSe6>U9Tg~?ke!SaYD>AOO<ghXK|(Hmqy1Xoedrm
zl2er=H;H_he9+~Xn$rY_`pG{TkJQXi(uy?7IB{n3VF$-E%KsjeZ!0UR;bB;5%&^wK
z@3R?8?(G0w>vPW+J`U+W@S8(Ct=2BQ@n!jkX|HYXGnV8Zx|zCn`MU!@#lF}-5%p#~
zz+ExPv%<D<oyC_p=i{qRyiK3`*t%nyLJ4d2Z-Y5a@3yMF&&xmacD?QWpS6q})`yEG
zN~&!*JNYo9e?0?RfKQ0)yLa!(%ge8y`T3cFfoZO%i(^Q|t+zK%=QcY?xF$w>B+eAl
zIJ$JE-=!{ZPtM4y#y{>F2h)omdYmbHmo+J-^T%f1&pW<A!JIP@(Q)ou&sRNPVHP->
zKg&F;zxmeOTi+emo;Y9kI_k;Jc<C;kLu_+4FsA1mNUb+(Y(D#N6$_u)gBD(kbY{KH
zf{D!MZZ@3G;R{zS*q|wsbHGx%U}i6ebipyUn6%;@N(WSdT6`ZQ2wU9f*uW@$6R5Ra
zn+a%~dd>k(kWv?jyzve#kkJXJ!KTD-Z9B+!JAU>-nVWIRYZE_o<eUyTs&L?MJ#$RA
zV?*`-Z4xXyzMH<|X;{4N?{Ras-&=ng8QxgG_6(0xZgsvJke|Cj=33U|%A$*Zg!E>=
zD&g2vwKiwB!k?K{D+&$u<g)&}-ZLeDnQ2A<Gv78+a6LkCUb44o-T#CA8;{*B+Y(i%
ze$Mnk0yiqw3tzAMXG->g-Z<?WMZ7y!?)lc>oBdY&>+}Z-=U(Se+yC{gyvqNGU+s7H
z8~tPbvcCBD*@O9}b&o&YUT{C;uh?7jKhKW0+xPsr_>AAH{>?AvJ(XVd4}^K<ulw=j
z`0^k-!|b`welEGVe1YA<uP-<HZ=1dR-9CX2sjd1!H7AR+7@wXtjKA|U=;NJ3m#1&s
zr}0ho+e+5m`u}T<4{lfU%P-+M_iVO-%Z&zOv-^3U&T6-3--wW&bJqMXFp|`BcI|yR
zdnw=bEfcLRX6G9TCo=opNU^?a{#@2;-Ny$B1!neF6iz*3*Q={}-0sMCy(YlaVz&Gu
x!NkeTcGh|&J9hrnC~jFhU+6m|iOo5y&oy25SfABd17JbI;OXk;vd$@?2>|GO6v+Sp

literal 2096
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
SEB_>a96+2nQFLY_iv0(S!8H~D

diff --git a/public/logo.png b/public/logo.png
index 585f8895b4f26c872ac9369bd4229811e725b252..b4b80fd88215021b782d36447a872e8c873827aa 100644
GIT binary patch
delta 3271
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
FV1hVPHL(By

delta 5400
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

diff --git a/public/user_avatar.png b/public/user_avatar.png
index 26440a9cc7a91301b59732edcf22d81211d701e6..3ec064006a33ad7202bc919cdb07bebbcf9203bf 100644
GIT binary patch
literal 3423
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

literal 7405
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

diff --git a/resources/icons/add-circle.svg b/resources/icons/add-circle.svg
index efa0a03ae41..af125af43f3 100644
--- a/resources/icons/add-circle.svg
+++ b/resources/icons/add-circle.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4zm-1-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"/></svg>
\ No newline at end of file
diff --git a/resources/icons/attach.svg b/resources/icons/attach.svg
index 49c9d57a8d3..7b666f8c414 100644
--- a/resources/icons/attach.svg
+++ b/resources/icons/attach.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M2 12.5C2 9.46 4.46 7 7.5 7H18c2.21 0 4 1.79 4 4s-1.79 4-4 4H9.5C8.12 15 7 13.88 7 12.5S8.12 10 9.5 10H17v2H9.41c-.55 0-.55 1 0 1H18c1.1 0 2-.9 2-2s-.9-2-2-2H7.5C5.57 9 4 10.57 4 12.5S5.57 16 7.5 16H17v2H7.5C4.46 18 2 15.54 2 12.5z"/>
-    <path d="M0 0h24v24H0V0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2 12.5C2 9.46 4.46 7 7.5 7H18c2.21 0 4 1.79 4 4s-1.79 4-4 4H9.5a2.5 2.5 0 0 1 0-5H17v2H9.41c-.55 0-.55 1 0 1H18c1.1 0 2-.9 2-2s-.9-2-2-2H7.5C5.57 9 4 10.57 4 12.5S5.57 16 7.5 16H17v2H7.5C4.46 18 2 15.54 2 12.5"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/discord.svg b/resources/icons/auth/discord.svg
index 7fbbeb79250..2d3d277afda 100644
--- a/resources/icons/auth/discord.svg
+++ b/resources/icons/auth/discord.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><path fill="#7289DA" d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path fill="#7289DA" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><path fill="#7289DA" d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1m36.5 0c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1"/><path fill="#7289DA" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6m-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/github.svg b/resources/icons/auth/github.svg
index ae6dc6f7f7c..a341e8d4d47 100644
--- a/resources/icons/auth/github.svg
+++ b/resources/icons/auth/github.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="#333333" fill-rule="evenodd" d="M31.9.693c-17.672 0-32 14.327-32 32 0 14.14 9.17 26.132 21.886 30.365 1.6.293 2.184-.695 2.184-1.544 0-.758-.028-2.77-.043-5.44-8.9 1.932-10.78-4.292-10.78-4.292-1.455-3.695-3.553-4.68-3.553-4.68-2.905-1.985.22-1.946.22-1.946 3.212.228 4.9 3.3 4.9 3.3 2.856 4.888 7.492 3.476 9.315 2.66.29-2.07 1.11-3.48 2.03-4.28-7.11-.807-14.58-3.554-14.58-15.816 0-3.493 1.243-6.35 3.29-8.586-.33-.81-1.428-4.063.313-8.47 0 0 2.687-.86 8.8 3.28 2.552-.708 5.29-1.063 8.01-1.075 2.718.01 5.457.36 8.01 1.07 6.11-4.14 8.793-3.28 8.793-3.28 1.747 4.403.65 7.66.32 8.47 2.05 2.233 3.29 5.09 3.29 8.582 0 12.293-7.483 15-14.61 15.79 1.15.99 2.17 2.94 2.17 5.926 0 4.277-.04 7.73-.04 8.777 0 .857.578 1.853 2.2 1.54 12.71-4.235 21.87-16.22 21.87-30.355 0-17.674-14.326-32-32-32"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="#333" fill-rule="evenodd" d="M31.9.693c-17.672 0-32 14.327-32 32 0 14.14 9.17 26.132 21.886 30.365 1.6.293 2.184-.695 2.184-1.544 0-.758-.028-2.77-.043-5.44-8.9 1.932-10.78-4.292-10.78-4.292-1.455-3.695-3.553-4.68-3.553-4.68-2.905-1.985.22-1.946.22-1.946 3.212.228 4.9 3.3 4.9 3.3 2.856 4.888 7.492 3.476 9.315 2.66.29-2.07 1.11-3.48 2.03-4.28-7.11-.807-14.58-3.554-14.58-15.816 0-3.493 1.243-6.35 3.29-8.586-.33-.81-1.428-4.063.313-8.47 0 0 2.687-.86 8.8 3.28 2.552-.708 5.29-1.063 8.01-1.075 2.718.01 5.457.36 8.01 1.07 6.11-4.14 8.793-3.28 8.793-3.28 1.747 4.403.65 7.66.32 8.47 2.05 2.233 3.29 5.09 3.29 8.582 0 12.293-7.483 15-14.61 15.79 1.15.99 2.17 2.94 2.17 5.926 0 4.277-.04 7.73-.04 8.777 0 .857.578 1.853 2.2 1.54 12.71-4.235 21.87-16.22 21.87-30.355 0-17.674-14.326-32-32-32"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/gitlab.svg b/resources/icons/auth/gitlab.svg
index fa1e92a5654..6e7d1c5f4a8 100644
--- a/resources/icons/auth/gitlab.svg
+++ b/resources/icons/auth/gitlab.svg
@@ -1 +1 @@
-<svg viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g id="Group"><path id="Fill-4" d="M32.134,64.345l11.785,-39.372l-23.569,0l11.784,39.372Z" style="fill:#e24329;"/><path id="Fill-8" d="M32.134,64.345l-11.784,-39.372l-16.515,0l28.299,39.372Z" style="fill:#fc6d26;"/><path id="Fill-12" d="M3.835,24.973l-3.581,11.965c-0.327,1.091 0.031,2.287 0.886,2.961l30.994,24.446l-28.299,-39.372Z" style="fill:#fca326;"/><path id="Fill-16" d="M3.835,24.973l16.515,0l-7.097,-23.713c-0.366,-1.22 -1.956,-1.22 -2.321,0l-7.097,23.713Z" style="fill:#e24329;"/><path id="Fill-18" d="M32.134,64.345l11.785,-39.372l16.515,0l-28.3,39.372Z" style="fill:#fc6d26;"/><path id="Fill-20" d="M60.434,24.973l3.581,11.965c0.326,1.091 -0.031,2.287 -0.886,2.961l-30.995,24.446l28.3,-39.372Z" style="fill:#fca326;"/><path id="Fill-22" d="M60.434,24.973l-16.515,0l7.097,-23.713c0.365,-1.22 1.955,-1.22 2.32,0l7.098,23.713Z" style="fill:#e24329;"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421" viewBox="0 0 64 64"><path d="m32.134 64.345 11.785-39.372H20.35z" style="fill:#e24329"/><path d="M32.134 64.345 20.35 24.973H3.835z" style="fill:#fc6d26"/><path d="M3.835 24.973.254 36.938c-.327 1.091.031 2.287.886 2.961l30.994 24.446z" style="fill:#fca326"/><path d="M3.835 24.973H20.35L13.253 1.26c-.366-1.22-1.956-1.22-2.321 0z" style="fill:#e24329"/><path d="m32.134 64.345 11.785-39.372h16.515z" style="fill:#fc6d26"/><path d="m60.434 24.973 3.581 11.965c.326 1.091-.031 2.287-.886 2.961L32.134 64.345z" style="fill:#fca326"/><path d="M60.434 24.973H43.919L51.016 1.26c.365-1.22 1.955-1.22 2.32 0z" style="fill:#e24329"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/google.svg b/resources/icons/auth/google.svg
index 34ed1603b28..0e416d49373 100644
--- a/resources/icons/auth/google.svg
+++ b/resources/icons/auth/google.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g fill="none" fill-rule="evenodd"><path fill="#4285f4" d="M62.735 32.712c0-2.27-.204-4.45-.582-6.545H32.015v12.378h17.222c-.742 4-2.997 7.39-6.386 9.658v8.03h10.344c6.05-5.57 9.542-13.775 9.542-23.52z"/><path fill="#34a853" d="M32.015 63.985c8.64 0 15.883-2.865 21.178-7.753l-10.342-8.03c-2.863 1.92-6.53 3.056-10.834 3.056-8.335 0-15.39-5.63-17.906-13.193H3.417v8.29c5.266 10.46 16.088 17.63 28.597 17.63z"/><path fill="#fbbc05" d="M14.11 38.065c-.64-1.92-1.004-3.97-1.004-6.08s.363-4.16 1.003-6.08v-8.29H3.416C1.25 21.935.015 26.82.015 31.985c0 5.163 1.236 10.05 3.403 14.37l10.69-8.29z"/><path fill="#ea4335" d="M32.015 12.712c4.698 0 8.916 1.615 12.233 4.786l9.178-9.178C47.884 3.156 40.64-.015 32.016-.015c-12.51 0-23.332 7.17-28.598 17.63l10.69 8.29c2.518-7.563 9.572-13.193 17.907-13.193z"/><path d="M.015-.015h64v64h-64v-64z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g fill="none" fill-rule="evenodd"><path fill="#4285f4" d="M62.735 32.712c0-2.27-.204-4.45-.582-6.545H32.015v12.378h17.222c-.742 4-2.997 7.39-6.386 9.658v8.03h10.344c6.05-5.57 9.542-13.775 9.542-23.52z"/><path fill="#34a853" d="M32.015 63.985c8.64 0 15.883-2.865 21.178-7.753l-10.342-8.03c-2.863 1.92-6.53 3.056-10.834 3.056-8.335 0-15.39-5.63-17.906-13.193H3.417v8.29c5.266 10.46 16.088 17.63 28.597 17.63z"/><path fill="#fbbc05" d="M14.11 38.065c-.64-1.92-1.004-3.97-1.004-6.08s.363-4.16 1.003-6.08v-8.29H3.416a32 32 0 0 0-3.401 14.37c0 5.163 1.236 10.05 3.403 14.37l10.69-8.29z"/><path fill="#ea4335" d="M32.015 12.712c4.698 0 8.916 1.615 12.233 4.786l9.178-9.178C47.884 3.156 40.64-.015 32.016-.015c-12.51 0-23.332 7.17-28.598 17.63l10.69 8.29c2.518-7.563 9.572-13.193 17.907-13.193"/><path d="M.015-.015h64v64h-64z"/></g></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/okta.svg b/resources/icons/auth/okta.svg
index b5f3b1d3f92..5bf8d86d4c5 100644
--- a/resources/icons/auth/okta.svg
+++ b/resources/icons/auth/okta.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M12 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12 12 12 0 0 0 12-12A12 12 0 0 0 12 0zm-.035 5.537a6.427 6.427 0 0 1 6.428 6.428 6.427 6.427 0 0 1-6.428 6.428 6.427 6.427 0 0 1-6.428-6.428 6.427 6.427 0 0 1 6.428-6.428z" fill="#007dc1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" clip-rule="evenodd" viewBox="0 0 24 24"><path fill="#007dc1" d="M12 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12 12 12 0 0 0 12-12A12 12 0 0 0 12 0m-.035 5.537a6.427 6.427 0 0 1 6.428 6.428 6.427 6.427 0 0 1-6.428 6.428 6.427 6.427 0 0 1-6.428-6.428 6.427 6.427 0 0 1 6.428-6.428"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/slack.svg b/resources/icons/auth/slack.svg
index 98e5a32f5fc..a4ca4a084f4 100644
--- a/resources/icons/auth/slack.svg
+++ b/resources/icons/auth/slack.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.8 122.8"><style type="text/css">.st0{fill:#E01E5A;} .st1{fill:#36C5F0;} .st2{fill:#2EB67D;} .st3{fill:#ECB22E;}</style><g transform="translate(-73.6,-73.6)"><path class="st0" d="m99.4 151.2c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9 5.8-12.9 12.9-12.9h12.9z"/><path class="st0" d="m105.9 151.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9z"/><path class="st1" d="m118.8 99.4c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9 12.9 5.8 12.9 12.9v12.9z"/><path class="st1" d="m118.8 105.9c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9h-32.3c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9z"/><path class="st2" d="m170.6 118.8c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9h-12.9z"/><path class="st2" d="m164.1 118.8c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9v-32.3c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9z"/><path class="st3" d="m151.2 170.6c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9v-12.9z"/><path class="st3" d="m151.2 164.1c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.8 122.8"><path d="M25.8 77.6c0 7.1-5.8 12.9-12.9 12.9S0 84.7 0 77.6s5.8-12.9 12.9-12.9h12.9zm6.5 0c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9z" style="fill:#e01e5a"/><path d="M45.2 25.8c-7.1 0-12.9-5.8-12.9-12.9S38.1 0 45.2 0s12.9 5.8 12.9 12.9v12.9zm0 6.5c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H12.9C5.8 58.1 0 52.3 0 45.2s5.8-12.9 12.9-12.9z" style="fill:#36c5f0"/><path d="M97 45.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9H97zm-6.5 0c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V12.9C64.7 5.8 70.5 0 77.6 0s12.9 5.8 12.9 12.9z" style="fill:#2eb67d"/><path d="M77.6 97c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9V97zm0-6.5c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9z" style="fill:#ecb22e"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/twitch.svg b/resources/icons/auth/twitch.svg
index 5dbc76bb9b6..2736ccfa885 100644
--- a/resources/icons/auth/twitch.svg
+++ b/resources/icons/auth/twitch.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 134"><defs><style>.cls-1{fill:#6441a4;fill-rule:evenodd;}</style></defs><title>Glitch</title><path fill="#6441a4" class="cls-1" d="M89,77l-9,23v94h32v17h18l17-17h26l35-35V77H89Zm107,76-20,20H144l-17,17V173H100V89h96v64Zm-20-41v35H164V112h12Zm-32,0v35H132V112h12Z" transform="translate(-80 -77)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 128 134"><path d="m89 77-9 23v94h32v17h18l17-17h26l35-35V77zm107 76-20 20h-32l-17 17v-17h-27V89h96zm-20-41v35h-12v-35zm-32 0v35h-12v-35z" style="fill:#6441a4;fill-rule:evenodd" transform="translate(-80 -77)"/></svg>
\ No newline at end of file
diff --git a/resources/icons/auth/twitter.svg b/resources/icons/auth/twitter.svg
index fa4d59efd58..e926b370d51 100644
--- a/resources/icons/auth/twitter.svg
+++ b/resources/icons/auth/twitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="#00aced" d="M64 12.145c-2.355 1.045-4.886 1.75-7.54 2.068 2.71-1.625 4.79-4.198 5.772-7.265-2.538 1.505-5.347 2.598-8.338 3.187-2.395-2.552-5.808-4.147-9.584-4.147-7.252 0-13.13 5.88-13.13 13.13 0 1.03.115 2.032.34 2.993-10.914-.543-20.59-5.77-27.065-13.714-1.13 1.94-1.777 4.195-1.777 6.6 0 4.556 2.317 8.575 5.84 10.93-2.15-.068-4.176-.66-5.946-1.642v.166c0 6.36 4.525 11.667 10.53 12.874-1.1.3-2.26.46-3.458.46-.846 0-1.67-.08-2.47-.234 1.67 5.215 6.52 9.012 12.265 9.117-4.498 3.522-10.16 5.62-16.31 5.62-1.06 0-2.107-.06-3.13-.183C5.81 55.827 12.71 58 20.124 58c24.15 0 37.358-20.008 37.358-37.36 0-.568-.013-1.134-.038-1.698 2.566-1.85 4.792-4.163 6.552-6.797"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="#00aced" d="M64 12.145a26.3 26.3 0 0 1-7.54 2.068 13.18 13.18 0 0 0 5.772-7.265 26.3 26.3 0 0 1-8.338 3.187 13.1 13.1 0 0 0-9.584-4.147c-7.252 0-13.13 5.88-13.13 13.13 0 1.03.115 2.032.34 2.993-10.914-.543-20.59-5.77-27.065-13.714a13.07 13.07 0 0 0-1.777 6.6c0 4.556 2.317 8.575 5.84 10.93a13.1 13.1 0 0 1-5.946-1.642v.166c0 6.36 4.525 11.667 10.53 12.874-1.1.3-2.26.46-3.458.46q-1.27-.002-2.47-.234c1.67 5.215 6.52 9.012 12.265 9.117a26.36 26.36 0 0 1-16.31 5.62c-1.06 0-2.107-.06-3.13-.183A37.2 37.2 0 0 0 20.124 58c24.15 0 37.358-20.008 37.358-37.36q0-.852-.038-1.698a26.6 26.6 0 0 0 6.552-6.797"/></svg>
\ No newline at end of file
diff --git a/resources/icons/back.svg b/resources/icons/back.svg
index 22aa9d24a02..9b3ab40d5a8 100644
--- a/resources/icons/back.svg
+++ b/resources/icons/back.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/book.svg b/resources/icons/book.svg
index ce6cd5d9486..2f451bec969 100644
--- a/resources/icons/book.svg
+++ b/resources/icons/book.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 4h5v8l-2.5-1.5L6 12V4z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2M6 4h5v8l-2.5-1.5L6 12z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/books.svg b/resources/icons/books.svg
index a485a01dad2..70a9e23f5fe 100644
--- a/resources/icons/books.svg
+++ b/resources/icons/books.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M19.252 1.708H8.663a1.77 1.77 0 0 0-1.765 1.764v14.12c0 .97.794 1.764 1.765 1.764h10.59a1.77 1.77 0 0 0 1.764-1.765V3.472a1.77 1.77 0 0 0-1.765-1.764zM8.663 3.472h4.412v7.06L10.87 9.208l-2.206 1.324z"/><path d="M30.61 3.203h24v24h-24z" fill="none"/><path d="M2.966 6.61v14c0 1.1.9 2 2 2h14v-2h-14v-14z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M19.252 1.708H8.663a1.77 1.77 0 0 0-1.765 1.764v14.12c0 .97.794 1.764 1.765 1.764h10.59a1.77 1.77 0 0 0 1.764-1.765V3.472a1.77 1.77 0 0 0-1.765-1.764M8.663 3.472h4.412v7.06L10.87 9.208l-2.206 1.324z"/><path fill="none" d="M30.61 3.203h24v24h-24z"/><path d="M2.966 6.61v14c0 1.1.9 2 2 2h14v-2h-14v-14z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/bookshelf.svg b/resources/icons/bookshelf.svg
index f1e45eaf996..c6377d8d1e8 100644
--- a/resources/icons/bookshelf.svg
+++ b/resources/icons/bookshelf.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M1.088 2.566h17.42v17.42H1.088z" fill="none"/><path d="M4 20.058h15.892V22H4z"/><path d="M2.902 1.477h17.42v17.42H2.903z" fill="none"/><g><path d="M6.658 3.643V18h-2.38V3.643zM11.326 3.643V18H8.947V3.643zM14.722 3.856l5.613 13.214-2.19.93-5.613-13.214z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path fill="none" d="M1.088 2.566h17.42v17.42H1.088z"/><path d="M4 20.058h15.892V22H4z"/><path fill="none" d="M2.902 1.477h17.42v17.42H2.903z"/><path d="M6.658 3.643V18h-2.38V3.643zm4.668 0V18H8.947V3.643zm3.396.213 5.613 13.214-2.19.93-5.613-13.214z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/cancel.svg b/resources/icons/cancel.svg
index a35f16d7586..6ea45e3eb6d 100644
--- a/resources/icons/cancel.svg
+++ b/resources/icons/cancel.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2m5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/caret-down.svg b/resources/icons/caret-down.svg
index 000f5896302..bf988ca9f4e 100644
--- a/resources/icons/caret-down.svg
+++ b/resources/icons/caret-down.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M7 10l5 5 5-5z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m7 10 5 5 5-5z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/caret-left-circle.svg b/resources/icons/caret-left-circle.svg
index a92e0630d5c..49da4c24ac7 100644
--- a/resources/icons/caret-left-circle.svg
+++ b/resources/icons/caret-left-circle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 22c5.52 0 10-4.48 10-10S17.52 2 12 2 2 6.48 2 12s4.48 10 10 10zm2-14.5v9L8 12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22c5.52 0 10-4.48 10-10S17.52 2 12 2 2 6.48 2 12s4.48 10 10 10m2-14.5v9L8 12z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/caret-right-circle.svg b/resources/icons/caret-right-circle.svg
index bcf16cf662d..1cd435deaca 100644
--- a/resources/icons/caret-right-circle.svg
+++ b/resources/icons/caret-right-circle.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 14.5v-9l6 4.5z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/chapter.svg b/resources/icons/chapter.svg
index 199917db779..e5d83be5cfd 100644
--- a/resources/icons/chapter.svg
+++ b/resources/icons/chapter.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-1 9H9V9h10v2zm-4 4H9v-2h6v2zm4-8H9V5h10v2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M4 6H2v14c0 1.1.9 2 2 2h14v-2H4zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2m-1 9H9V9h10zm-4 4H9v-2h6zm4-8H9V5h10z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/check-circle.svg b/resources/icons/check-circle.svg
index 669a748725d..ad1e0bbd93b 100644
--- a/resources/icons/check-circle.svg
+++ b/resources/icons/check-circle.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/check.svg b/resources/icons/check.svg
index 93607ef7e91..134fd657cc7 100644
--- a/resources/icons/check.svg
+++ b/resources/icons/check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.86 4.118l-9.733 9.609-3.951-3.995-2.98 2.966 6.93 7.184L21.805 7.217z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m18.86 4.118-9.733 9.609-3.951-3.995-2.98 2.966 6.93 7.184L21.805 7.217z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/chevron-up.svg b/resources/icons/chevron-up.svg
index 37335dd03f5..8d308dbff81 100644
--- a/resources/icons/chevron-up.svg
+++ b/resources/icons/chevron-up.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7.41 15.41 12 10.83l4.59 4.58L18 14l-6-6-6 6z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/close.svg b/resources/icons/close.svg
index a0da9e6778c..c2ef4651081 100644
--- a/resources/icons/close.svg
+++ b/resources/icons/close.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/comment.svg b/resources/icons/comment.svg
index 09e95080365..3c4762b2e21 100644
--- a/resources/icons/comment.svg
+++ b/resources/icons/comment.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4-.01-18zM18 14H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4zM18 14H6v-2h12zm0-3H6V9h12zm0-3H6V6h12z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/copy.svg b/resources/icons/copy.svg
index 3a52e2314a6..2e1820f0f0f 100644
--- a/resources/icons/copy.svg
+++ b/resources/icons/copy.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2m0 16H8V7h11z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/danger.svg b/resources/icons/danger.svg
index 5265957a2a8..6aabc9609b8 100644
--- a/resources/icons/danger.svg
+++ b/resources/icons/danger.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-.72 0-1.3-.58-1.3-1.3 0-.72.58-1.3 1.3-1.3.72 0 1.3.58 1.3 1.3 0 .72-.58 1.3-1.3 1.3zm1-4.3h-2V7h2v6z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27zM12 17.3c-.72 0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3.58 1.3 1.3-.58 1.3-1.3 1.3m1-4.3h-2V7h2z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/dark-mode.svg b/resources/icons/dark-mode.svg
index 8b00d72a539..d905dccc829 100644
--- a/resources/icons/dark-mode.svg
+++ b/resources/icons/dark-mode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10 2c-1.82 0-3.53.5-5 1.35C7.99 5.08 10 8.3 10 12s-2.01 6.92-5 8.65C6.47 21.5 8.18 22 10 22c5.52 0 10-4.48 10-10S15.52 2 10 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10 2c-1.82 0-3.53.5-5 1.35C7.99 5.08 10 8.3 10 12s-2.01 6.92-5 8.65C6.47 21.5 8.18 22 10 22c5.52 0 10-4.48 10-10S15.52 2 10 2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/delete.svg b/resources/icons/delete.svg
index fdaba0111e2..cb008996996 100644
--- a/resources/icons/delete.svg
+++ b/resources/icons/delete.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zM19 4h-3.5l-1-1h-5l-1 1H5v2h14z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/download.svg b/resources/icons/download.svg
index 6299571d6b5..4b0a289dae4 100644
--- a/resources/icons/download.svg
+++ b/resources/icons/download.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.59 9H15V4c0-.55-.45-1-1-1h-4c-.55 0-1 .45-1 1v5H7.41c-.89 0-1.34 1.08-.71 1.71l4.59 4.59c.39.39 1.02.39 1.41 0l4.59-4.59c.63-.63.19-1.71-.7-1.71zM5 19c0 .55.45 1 1 1h12c.55 0 1-.45 1-1s-.45-1-1-1H6c-.55 0-1 .45-1 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.59 9H15V4c0-.55-.45-1-1-1h-4c-.55 0-1 .45-1 1v5H7.41c-.89 0-1.34 1.08-.71 1.71l4.59 4.59c.39.39 1.02.39 1.41 0l4.59-4.59c.63-.63.19-1.71-.7-1.71M5 19c0 .55.45 1 1 1h12c.55 0 1-.45 1-1s-.45-1-1-1H6c-.55 0-1 .45-1 1"/></svg>
\ No newline at end of file
diff --git a/resources/icons/drawing.svg b/resources/icons/drawing.svg
index c07f992715f..7ebe067a69a 100644
--- a/resources/icons/drawing.svg
+++ b/resources/icons/drawing.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-    <path d="M23 7V1h-6v2H7V1H1v6h2v10H1v6h6v-2h10v2h6v-6h-2V7h2zM3 3h2v2H3V3zm2 18H3v-2h2v2zm12-2H7v-2H5V7h2V5h10v2h2v10h-2v2zm4 2h-2v-2h2v2zM19 5V3h2v2h-2zm-5.27 9h-3.49l-.73 2H7.89l3.4-9h1.4l3.41 9h-1.63l-.74-2zm-3.04-1.26h2.61L12 8.91l-1.31 3.83z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M23 7V1h-6v2H7V1H1v6h2v10H1v6h6v-2h10v2h6v-6h-2V7zM3 3h2v2H3zm2 18H3v-2h2zm12-2H7v-2H5V7h2V5h10v2h2v10h-2zm4 2h-2v-2h2zM19 5V3h2v2zm-5.27 9h-3.49l-.73 2H7.89l3.4-9h1.4l3.41 9h-1.63zm-3.04-1.26h2.61L12 8.91z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/edit.svg b/resources/icons/edit.svg
index d4be98b38ff..9c184a0f467 100644
--- a/resources/icons/edit.svg
+++ b/resources/icons/edit.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/expand-text.svg b/resources/icons/expand-text.svg
index 9cc7bc16832..18bf54f2256 100644
--- a/resources/icons/expand-text.svg
+++ b/resources/icons/expand-text.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 19h6v-2H4v2zM20 5H4v2h16V5zm-3 6H4v2h13.25c1.1 0 2 .9 2 2s-.9 2-2 2H15v-2l-3 3 3 3v-2h2c2.21 0 4-1.79 4-4s-1.79-4-4-4z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 19h6v-2H4zM20 5H4v2h16zm-3 6H4v2h13.25c1.1 0 2 .9 2 2s-.9 2-2 2H15v-2l-3 3 3 3v-2h2c2.21 0 4-1.79 4-4s-1.79-4-4-4"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/export.svg b/resources/icons/export.svg
index 97e217fd06d..a02220929d1 100644
--- a/resources/icons/export.svg
+++ b/resources/icons/export.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/file.svg b/resources/icons/file.svg
index 2e87f2ca635..9d65579bebf 100644
--- a/resources/icons/file.svg
+++ b/resources/icons/file.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M6 2c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6H6zm7 7V3.5L18.5 9H13z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6 2c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm7 7V3.5L18.5 9z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/folder.svg b/resources/icons/folder.svg
index cc56c6fad98..f2cb814ff5f 100644
--- a/resources/icons/folder.svg
+++ b/resources/icons/folder.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/fullscreen.svg b/resources/icons/fullscreen.svg
index d00b574ff9c..2691715e629 100644
--- a/resources/icons/fullscreen.svg
+++ b/resources/icons/fullscreen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7zm-2-4h2V7h3V5H5zm12 7h-3v2h5v-5h-2zM14 5v2h3v3h2V5z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/grid.svg b/resources/icons/grid.svg
index b94b8852a09..d6929e11a8a 100644
--- a/resources/icons/grid.svg
+++ b/resources/icons/grid.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 11h5V5H4v6zm0 7h5v-6H4v6zm6 0h5v-6h-5v6zm6 0h5v-6h-5v6zm-6-7h5V5h-5v6zm6-6v6h5V5h-5z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 11h5V5H4zm0 7h5v-6H4zm6 0h5v-6h-5zm6 0h5v-6h-5zm-6-7h5V5h-5zm6-6v6h5V5z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/grip.svg b/resources/icons/grip.svg
index 7bf189232e6..86eb0804947 100644
--- a/resources/icons/grip.svg
+++ b/resources/icons/grip.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 18h18v-2H3zm0-5h18v-2H3zm0-7v2h18V6z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/groups.svg b/resources/icons/groups.svg
index c99a6b5037b..474237a0fe3 100644
--- a/resources/icons/groups.svg
+++ b/resources/icons/groups.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px"><g><path d="M12,12.75c1.63,0,3.07,0.39,4.24,0.9c1.08,0.48,1.76,1.56,1.76,2.73L18,17c0,0.55-0.45,1-1,1H7c-0.55,0-1-0.45-1-1l0-0.61 c0-1.18,0.68-2.26,1.76-2.73C8.93,13.14,10.37,12.75,12,12.75z M4,13c1.1,0,2-0.9,2-2c0-1.1-0.9-2-2-2s-2,0.9-2,2 C2,12.1,2.9,13,4,13z M5.13,14.1C4.76,14.04,4.39,14,4,14c-0.99,0-1.93,0.21-2.78,0.58C0.48,14.9,0,15.62,0,16.43L0,17 c0,0.55,0.45,1,1,1l3.5,0v-1.61C4.5,15.56,4.73,14.78,5.13,14.1z M20,13c1.1,0,2-0.9,2-2c0-1.1-0.9-2-2-2s-2,0.9-2,2 C18,12.1,18.9,13,20,13z M24,16.43c0-0.81-0.48-1.53-1.22-1.85C21.93,14.21,20.99,14,20,14c-0.39,0-0.76,0.04-1.13,0.1 c0.4,0.68,0.63,1.46,0.63,2.29V18l3.5,0c0.55,0,1-0.45,1-1L24,16.43z M12,6c1.66,0,3,1.34,3,3c0,1.66-1.34,3-3,3s-3-1.34-3-3 C9,7.34,10.34,6,12,6z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 24 24"><path d="M12 12.75c1.63 0 3.07.39 4.24.9 1.08.48 1.76 1.56 1.76 2.73V17c0 .55-.45 1-1 1H7c-.55 0-1-.45-1-1v-.61c0-1.18.68-2.26 1.76-2.73 1.17-.52 2.61-.91 4.24-.91M4 13c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m1.13 1.1c-.37-.06-.74-.1-1.13-.1-.99 0-1.93.21-2.78.58A2.01 2.01 0 0 0 0 16.43V17c0 .55.45 1 1 1h3.5v-1.61c0-.83.23-1.61.63-2.29M20 13c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m4 3.43c0-.81-.48-1.53-1.22-1.85A6.95 6.95 0 0 0 20 14c-.39 0-.76.04-1.13.1.4.68.63 1.46.63 2.29V18H23c.55 0 1-.45 1-1zM12 6c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3"/></svg>
\ No newline at end of file
diff --git a/resources/icons/history.svg b/resources/icons/history.svg
index ba6c4177e62..3f5d475b885 100644
--- a/resources/icons/history.svg
+++ b/resources/icons/history.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M13 3a9 9 0 0 0-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42A8.95 8.95 0 0 0 13 21a9 9 0 0 0 0-18m-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/image.svg b/resources/icons/image.svg
index fcb5e8e8540..55454fd756a 100644
--- a/resources/icons/image.svg
+++ b/resources/icons/image.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 5v14H5V5zm0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2m-4.86 8.86-3 3.87L9 13.14 6 17h12z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/images.svg b/resources/icons/images.svg
index 4dd3cf4e6a5..9966f477276 100644
--- a/resources/icons/images.svg
+++ b/resources/icons/images.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M22 16V4c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2zm-11-4l2.03 2.71L16 11l4 5H8l3-4zM2 6v14c0 1.1.9 2 2 2h14v-2H4V6H2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M22 16V4c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2m-11-4 2.03 2.71L16 11l4 5H8zM2 6v14c0 1.1.9 2 2 2h14v-2H4V6z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/include.svg b/resources/icons/include.svg
index 48d2f0f5b6c..30a2c495be0 100644
--- a/resources/icons/include.svg
+++ b/resources/icons/include.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 .5h24v24H0z" fill="none"/>
-    <path d="M12 16.5l4-4h-3v-9h-2v9H8l4 4zm9-13h-6v1.99h6v14.03H3V5.49h6V3.5H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2v-14c0-1.1-.9-2-2-2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 .5h24v24H0z"/><path d="m12 16.5 4-4h-3v-9h-2v9H8zm9-13h-6v1.99h6v14.03H3V5.49h6V3.5H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2v-14c0-1.1-.9-2-2-2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/info-filled.svg b/resources/icons/info-filled.svg
index 0597dbdf2a0..20b8f3b4284 100644
--- a/resources/icons/info-filled.svg
+++ b/resources/icons/info-filled.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-6h2zm0-8h-2V7h2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/info.svg b/resources/icons/info.svg
index 1a24e012d30..4082f2cde18 100644
--- a/resources/icons/info.svg
+++ b/resources/icons/info.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 9h2V7h-2v2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11 17h2v-6h-2zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8M11 9h2V7h-2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/leaderboard.svg b/resources/icons/leaderboard.svg
index 9083330dc98..1231490a27e 100644
--- a/resources/icons/leaderboard.svg
+++ b/resources/icons/leaderboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" viewBox="0 0 24 24" fill="#000000"><g><path d="M7.5,21H2V9h5.5V21z M14.75,3h-5.5v18h5.5V3z M22,11h-5.5v10H22V11z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7.5 21H2V9h5.5zm7.25-18h-5.5v18h5.5zM22 11h-5.5v10H22z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/light-mode.svg b/resources/icons/light-mode.svg
index cf2961d2e2f..6ee1f2c93b5 100644
--- a/resources/icons/light-mode.svg
+++ b/resources/icons/light-mode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 15.31L23.31 12 20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69zM12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6 6 2.69 6 6-2.69 6-6 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 15.31 23.31 12 20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20zM12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6 6 2.69 6 6-2.69 6-6 6"/></svg>
\ No newline at end of file
diff --git a/resources/icons/link.svg b/resources/icons/link.svg
index 3e8be1ce7da..10117bc1e34 100644
--- a/resources/icons/link.svg
+++ b/resources/icons/link.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1M8 13h8v-2H8zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/list.svg b/resources/icons/list.svg
index 3cfcee9e437..5dadaf1fa2e 100644
--- a/resources/icons/list.svg
+++ b/resources/icons/list.svg
@@ -1,4 +1 @@
-<svg  viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 14h4v-4H4v4zm0 5h4v-4H4v4zM4 9h4V5H4v4zm5 5h12v-4H9v4zm0 5h12v-4H9v4zM9 5v4h12V5H9z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 14h4v-4H4zm0 5h4v-4H4zM4 9h4V5H4zm5 5h12v-4H9zm0 5h12v-4H9zM9 5v4h12V5z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/lock-open.svg b/resources/icons/lock-open.svg
index 20ff5b6861c..6855dd56318 100644
--- a/resources/icons/lock-open.svg
+++ b/resources/icons/lock-open.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2m0 12H6V10h12z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/lock.svg b/resources/icons/lock.svg
index 594763f589c..cf10b4e57a4 100644
--- a/resources/icons/lock.svg
+++ b/resources/icons/lock.svg
@@ -1,9 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <path d="M0 0h24v24H0V0z" id="a"/>
-    </defs>
-    <clipPath id="b">
-        <use overflow="visible" xlink:href="#a"/>
-    </clipPath>
-    <path clip-path="url(#b)" d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zM8.9 6c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1v2H8.9V6zM18 20H6V10h12v10z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"><defs><path id="a" d="M0 0h24v24H0z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2M8.9 6c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1v2H8.9zM18 20H6V10h12z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/resources/icons/login.svg b/resources/icons/login.svg
index b122b44a25c..f6601cfdcd0 100644
--- a/resources/icons/login.svg
+++ b/resources/icons/login.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M21 3.01H3c-1.1 0-2 .9-2 2V9h2V4.99h18v14.03H3V15H1v4.01c0 1.1.9 1.98 2 1.98h18c1.1 0 2-.88 2-1.98v-14c0-1.11-.9-2-2-2zM11 16l4-4-4-4v3H1v2h10v3z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M21 3.01H3c-1.1 0-2 .9-2 2V9h2V4.99h18v14.03H3V15H1v4.01c0 1.1.9 1.98 2 1.98h18c1.1 0 2-.88 2-1.98v-14a2 2 0 0 0-2-2M11 16l4-4-4-4v3H1v2h10z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/logout.svg b/resources/icons/logout.svg
index b113f5a3aa5..b6d20b45089 100644
--- a/resources/icons/logout.svg
+++ b/resources/icons/logout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M14.29 8.207l1.41-1.41 5 5-5 5-1.41-1.41 2.58-2.59H7.2v-2h9.67zM5 3h14a2 2 0 0 1 2 2v4h-2V5H5v14h14v-4h2v4a2 2 0 0 1-2 2H5c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="m14.29 8.207 1.41-1.41 5 5-5 5-1.41-1.41 2.58-2.59H7.2v-2h9.67zM5 3h14a2 2 0 0 1 2 2v4h-2V5H5v14h14v-4h2v4a2 2 0 0 1-2 2H5c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/more.svg b/resources/icons/more.svg
index 53ffb655480..5dc0c7cfbe2 100644
--- a/resources/icons/more.svg
+++ b/resources/icons/more.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/new-user.svg b/resources/icons/new-user.svg
index b58fcd548af..76b450a8406 100644
--- a/resources/icons/new-user.svg
+++ b/resources/icons/new-user.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4m-9-2V7H4v3H1v2h3v3h2v-3h3v-2zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4"/></svg>
\ No newline at end of file
diff --git a/resources/icons/notifications.svg b/resources/icons/notifications.svg
index 52786954db4..54bd7456c54 100644
--- a/resources/icons/notifications.svg
+++ b/resources/icons/notifications.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 22c1.1 0 2-.9 2-2h-4a2 2 0 0 0 2 2m6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/oidc.svg b/resources/icons/oidc.svg
index a9a2994a7a8..66a10efaff9 100644
--- a/resources/icons/oidc.svg
+++ b/resources/icons/oidc.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12.65 10A5.99 5.99 0 0 0 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6a5.99 5.99 0 0 0 5.65-4H17v4h4v-4h2v-4zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/open-book.svg b/resources/icons/open-book.svg
index 5987d14e53b..2e2f24da476 100644
--- a/resources/icons/open-book.svg
+++ b/resources/icons/open-book.svg
@@ -1,9 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <path d="M0 0h24v24H0V0z" id="a"/>
-    </defs>
-    <clipPath id="b">
-        <use overflow="visible" xlink:href="#a"/>
-    </clipPath>
-    <path clip-path="url(#b)" d="M21 5c-1.11-.35-2.33-.5-3.5-.5-1.95 0-4.05.4-5.5 1.5-1.45-1.1-3.55-1.5-5.5-1.5S2.45 4.9 1 6v14.65c0 .25.25.5.5.5.1 0 .15-.05.25-.05C3.1 20.45 5.05 20 6.5 20c1.95 0 4.05.4 5.5 1.5 1.35-.85 3.8-1.5 5.5-1.5 1.65 0 3.35.3 4.75 1.05.1.05.15.05.25.05.25 0 .5-.25.5-.5V6c-.6-.45-1.25-.75-2-1zm0 13.5c-1.1-.35-2.3-.5-3.5-.5-1.7 0-4.15.65-5.5 1.5V8c1.35-.85 3.8-1.5 5.5-1.5 1.2 0 2.4.15 3.5.5v11.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"><defs><path id="a" d="M0 0h24v24H0z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path d="M21 5c-1.11-.35-2.33-.5-3.5-.5-1.95 0-4.05.4-5.5 1.5-1.45-1.1-3.55-1.5-5.5-1.5S2.45 4.9 1 6v14.65c0 .25.25.5.5.5.1 0 .15-.05.25-.05C3.1 20.45 5.05 20 6.5 20c1.95 0 4.05.4 5.5 1.5 1.35-.85 3.8-1.5 5.5-1.5 1.65 0 3.35.3 4.75 1.05.1.05.15.05.25.05.25 0 .5-.25.5-.5V6c-.6-.45-1.25-.75-2-1m0 13.5c-1.1-.35-2.3-.5-3.5-.5-1.7 0-4.15.65-5.5 1.5V8c1.35-.85 3.8-1.5 5.5-1.5 1.2 0 2.4.15 3.5.5z" clip-path="url(#b)"/></svg>
\ No newline at end of file
diff --git a/resources/icons/page.svg b/resources/icons/page.svg
index 1df12d85d0e..ab3985c735c 100644
--- a/resources/icons/page.svg
+++ b/resources/icons/page.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8zm2 16H8v-2h8zm0-4H8v-2h8zm-3-5V3.5L18.5 9z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/palette.svg b/resources/icons/palette.svg
index 11438630272..903fa51d88f 100644
--- a/resources/icons/palette.svg
+++ b/resources/icons/palette.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,2C6.49,2,2,6.49,2,12s4.49,10,10,10c1.38,0,2.5-1.12,2.5-2.5c0-0.61-0.23-1.2-0.64-1.67c-0.08-0.1-0.13-0.21-0.13-0.33 c0-0.28,0.22-0.5,0.5-0.5H16c3.31,0,6-2.69,6-6C22,6.04,17.51,2,12,2z M17.5,13c-0.83,0-1.5-0.67-1.5-1.5c0-0.83,0.67-1.5,1.5-1.5 s1.5,0.67,1.5,1.5C19,12.33,18.33,13,17.5,13z M14.5,9C13.67,9,13,8.33,13,7.5C13,6.67,13.67,6,14.5,6S16,6.67,16,7.5 C16,8.33,15.33,9,14.5,9z M5,11.5C5,10.67,5.67,10,6.5,10S8,10.67,8,11.5C8,12.33,7.33,13,6.5,13S5,12.33,5,11.5z M11,7.5 C11,8.33,10.33,9,9.5,9S8,8.33,8,7.5C8,6.67,8.67,6,9.5,6S11,6.67,11,7.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 2C6.49 2 2 6.49 2 12s4.49 10 10 10a2.5 2.5 0 0 0 2.5-2.5c0-.61-.23-1.2-.64-1.67a.53.53 0 0 1-.13-.33c0-.28.22-.5.5-.5H16c3.31 0 6-2.69 6-6 0-4.96-4.49-9-10-9m5.5 11c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5m-3-4c-.83 0-1.5-.67-1.5-1.5S13.67 6 14.5 6s1.5.67 1.5 1.5S15.33 9 14.5 9M5 11.5c0-.83.67-1.5 1.5-1.5s1.5.67 1.5 1.5S7.33 13 6.5 13 5 12.33 5 11.5m6-4c0 .83-.67 1.5-1.5 1.5S8 8.33 8 7.5 8.67 6 9.5 6s1.5.67 1.5 1.5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/permission.svg b/resources/icons/permission.svg
index a9a2994a7a8..66a10efaff9 100644
--- a/resources/icons/permission.svg
+++ b/resources/icons/permission.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12.65 10A5.99 5.99 0 0 0 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6a5.99 5.99 0 0 0 5.65-4H17v4h4v-4h2v-4zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/popular.svg b/resources/icons/popular.svg
index 2ac44f151d7..84f4c180bcd 100644
--- a/resources/icons/popular.svg
+++ b/resources/icons/popular.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67M11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8"/></svg>
\ No newline at end of file
diff --git a/resources/icons/reference.svg b/resources/icons/reference.svg
index 560ec5f374d..b83dcafd1b8 100644
--- a/resources/icons/reference.svg
+++ b/resources/icons/reference.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <path d="m24 44.15c-0.4 0-0.79167-0.06667-1.175-0.2-0.38333-0.13333-0.70833-0.33333-0.975-0.6l-17.2-17.2c-0.26667-0.26667-0.46667-0.59167-0.6-0.975s-0.2-0.775-0.2-1.175 0.066667-0.79167 0.2-1.175c0.13333-0.38333 0.33333-0.70833 0.6-0.975l17.2-17.2c0.26667-0.26667 0.59167-0.46667 0.975-0.6s0.775-0.2 1.175-0.2 0.79167 0.066667 1.175 0.2c0.38333 0.13333 0.70833 0.33333 0.975 0.6l17.2 17.2c0.26667 0.26667 0.46667 0.59167 0.6 0.975s0.2 0.775 0.2 1.175-0.06667 0.79167-0.2 1.175c-0.13333 0.38333-0.33333 0.70833-0.6 0.975l-17.2 17.2c-0.26667 0.26667-0.59167 0.46667-0.975 0.6s-0.775 0.2-1.175 0.2zm4.05-18.65-5.15 5.15c-0.3 0.3-0.44167 0.65-0.425 1.05 0.01667 0.4 0.175 0.75 0.475 1.05s0.65833 0.45 1.075 0.45 0.775-0.15 1.075-0.45l7.7-7.7c0.3-0.3 0.45-0.65 0.45-1.05s-0.15-0.75-0.45-1.05l-7.75-7.75c-0.3-0.3-0.65-0.45-1.05-0.45s-0.75 0.15-1.05 0.45-0.45 0.65833-0.45 1.075 0.15 0.775 0.45 1.075l5.1 5.15h-12.4c-0.43333 0-0.79167 0.14167-1.075 0.425s-0.425 0.64167-0.425 1.075 0.14167 0.79167 0.425 1.075 0.64167 0.425 1.075 0.425z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24 44.15q-.6 0-1.175-.2a2.5 2.5 0 0 1-.975-.6l-17.2-17.2q-.4-.4-.6-.975c-.2-.575-.2-.775-.2-1.175s.067-.792.2-1.175q.2-.574.6-.975l17.2-17.2q.4-.4.975-.6c.575-.2.775-.2 1.175-.2s.792.067 1.175.2q.575.2.975.6l17.2 17.2q.4.4.6.975c.2.575.2.775.2 1.175s-.067.792-.2 1.175a2.5 2.5 0 0 1-.6.975l-17.2 17.2q-.4.4-.975.6c-.575.2-.775.2-1.175.2m4.05-18.65-5.15 5.15q-.45.45-.425 1.05t.475 1.05c.45.45.658.45 1.075.45s.775-.15 1.075-.45l7.7-7.7q.45-.45.45-1.05c0-.6-.15-.75-.45-1.05l-7.75-7.75q-.45-.45-1.05-.45c-.6 0-.75.15-1.05.45s-.45.658-.45 1.075.15.775.45 1.075l5.1 5.15h-12.4q-.65 0-1.075.425c-.425.425-.425.642-.425 1.075s.142.792.425 1.075.642.425 1.075.425z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/reply.svg b/resources/icons/reply.svg
index a50ddad7ae9..ab7119c97d5 100644
--- a/resources/icons/reply.svg
+++ b/resources/icons/reply.svg
@@ -1,4 +1 @@
-<svg  viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M7 8V5l-7 7 7 7v-3l-4-4 4-4zm6 1V5l-7 7 7 7v-4.1c5 0 8.5 1.6 11 5.1-1-5-4-10-11-11z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 8V5l-7 7 7 7v-3l-4-4zm6 1V5l-7 7 7 7v-4.1c5 0 8.5 1.6 11 5.1-1-5-4-10-11-11"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/role.svg b/resources/icons/role.svg
index e7cad506dd1..5a274a8d01c 100644
--- a/resources/icons/role.svg
+++ b/resources/icons/role.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5s-3 1.34-3 3 1.34 3 3 3m-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5 5 6.34 5 8s1.34 3 3 3m0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5m8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/saml2.svg b/resources/icons/saml2.svg
index a9a2994a7a8..66a10efaff9 100644
--- a/resources/icons/saml2.svg
+++ b/resources/icons/saml2.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12.65 10A5.99 5.99 0 0 0 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6a5.99 5.99 0 0 0 5.65-4H17v4h4v-4h2v-4zM7 14c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/save.svg b/resources/icons/save.svg
index e8acc659411..7be214ab6f4 100644
--- a/resources/icons/save.svg
+++ b/resources/icons/save.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm3-10H5V5h10v4z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M17 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V7zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3m3-10H5V5h10z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/search.svg b/resources/icons/search.svg
index 490937044cf..c19bbf001f4 100644
--- a/resources/icons/search.svg
+++ b/resources/icons/search.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27A6.47 6.47 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/security.svg b/resources/icons/security.svg
index 4fc0d20b97c..0febc830133 100644
--- a/resources/icons/security.svg
+++ b/resources/icons/security.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2m-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2m3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/settings.svg b/resources/icons/settings.svg
index dc2d75f0eae..b9b62e6432b 100644
--- a/resources/icons/settings.svg
+++ b/resources/icons/settings.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65A.49.49 0 0 0 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/shortcuts.svg b/resources/icons/shortcuts.svg
index 8d23aac2bd5..f3736f536ef 100644
--- a/resources/icons/shortcuts.svg
+++ b/resources/icons/shortcuts.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 5H4c-1.1 0-1.99.9-1.99 2L2 17c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm-9 3h2v2h-2V8zm0 3h2v2h-2v-2zM8 8h2v2H8V8zm0 3h2v2H8v-2zm-1 2H5v-2h2v2zm0-3H5V8h2v2zm8 7H9c-.55 0-1-.45-1-1s.45-1 1-1h6c.55 0 1 .45 1 1s-.45 1-1 1zm1-4h-2v-2h2v2zm0-3h-2V8h2v2zm3 3h-2v-2h2v2zm0-3h-2V8h2v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 5H4c-1.1 0-1.99.9-1.99 2L2 17c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2m-9 3h2v2h-2zm0 3h2v2h-2zM8 8h2v2H8zm0 3h2v2H8zm-1 2H5v-2h2zm0-3H5V8h2zm8 7H9c-.55 0-1-.45-1-1s.45-1 1-1h6c.55 0 1 .45 1 1s-.45 1-1 1m1-4h-2v-2h2zm0-3h-2V8h2zm3 3h-2v-2h2zm0-3h-2V8h2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/sort.svg b/resources/icons/sort.svg
index 9a2e98f646b..fa935ffcf02 100644
--- a/resources/icons/sort.svg
+++ b/resources/icons/sort.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3 18h6v-2H3v2zM3 6v2h18V6H3zm0 7h12v-2H3v2z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3 18h6v-2H3zM3 6v2h18V6zm0 7h12v-2H3z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/spanner.svg b/resources/icons/spanner.svg
index 8ab25a247de..d3eefb67d3c 100644
--- a/resources/icons/spanner.svg
+++ b/resources/icons/spanner.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path clip-rule="evenodd" fill="none" d="M0 0h24v24H0z"/>
-    <path d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" clip-rule="evenodd"/><path d="m22.7 19-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4"/></svg>
\ No newline at end of file
diff --git a/resources/icons/star-circle.svg b/resources/icons/star-circle.svg
index a7667e48f1a..cd50c44b515 100644
--- a/resources/icons/star-circle.svg
+++ b/resources/icons/star-circle.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm4.24 16L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23L16.23 18z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2m4.24 16L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/star-outline.svg b/resources/icons/star-outline.svg
index 4e83ab42bde..ff50719b374 100644
--- a/resources/icons/star-outline.svg
+++ b/resources/icons/star-outline.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71 4.04 4.38.38-3.32 2.88 1 4.28L12 15.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m22 9.24-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71 4.04 4.38.38-3.32 2.88 1 4.28z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/star.svg b/resources/icons/star.svg
index c7686389d17..60ffbf26608 100644
--- a/resources/icons/star.svg
+++ b/resources/icons/star.svg
@@ -1,5 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 17.27 18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/swap-vertical.svg b/resources/icons/swap-vertical.svg
index 35a362c0b45..d5166c082f7 100644
--- a/resources/icons/swap-vertical.svg
+++ b/resources/icons/swap-vertical.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M16 17.01V10h-2v7.01h-3L15 21l4-3.99h-3zM9 3L5 6.99h3V14h2V6.99h3L9 3z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16 17.01V10h-2v7.01h-3L15 21l4-3.99zM9 3 5 6.99h3V14h2V6.99h3z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/tag.svg b/resources/icons/tag.svg
index 1d92d2b1849..6e976dfd572 100644
--- a/resources/icons/tag.svg
+++ b/resources/icons/tag.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" viewBox="0 0 24 24"><path d="M21.41,11.41l-8.83-8.83C12.21,2.21,11.7,2,11.17,2H4C2.9,2,2,2.9,2,4v7.17c0,0.53,0.21,1.04,0.59,1.41l8.83,8.83 c0.78,0.78,2.05,0.78,2.83,0l7.17-7.17C22.2,13.46,22.2,12.2,21.41,11.41z M6.5,8C5.67,8,5,7.33,5,6.5S5.67,5,6.5,5S8,5.67,8,6.5 S7.33,8,6.5,8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m21.41 11.41-8.83-8.83c-.37-.37-.88-.58-1.41-.58H4c-1.1 0-2 .9-2 2v7.17c0 .53.21 1.04.59 1.41l8.83 8.83c.78.78 2.05.78 2.83 0l7.17-7.17c.78-.78.78-2.04-.01-2.83M6.5 8C5.67 8 5 7.33 5 6.5S5.67 5 6.5 5 8 5.67 8 6.5 7.33 8 6.5 8"/></svg>
\ No newline at end of file
diff --git a/resources/icons/template.svg b/resources/icons/template.svg
index 7c142124fbe..faee3c27558 100644
--- a/resources/icons/template.svg
+++ b/resources/icons/template.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 4h7V2H4c-1.1 0-2 .9-2 2v7h2zm16-2h-7v2h7v7h2V4c0-1.1-.9-2-2-2zm0 18h-7v2h7c1.1 0 2-.9 2-2v-7h-2zM4 13H2v7c0 1.1.9 2 2 2h7v-2H4zM16.475 15.356h-8.95v-2.237h8.95zm0-4.475h-8.95V8.644h8.95z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 4h7V2H4c-1.1 0-2 .9-2 2v7h2zm16-2h-7v2h7v7h2V4c0-1.1-.9-2-2-2m0 18h-7v2h7c1.1 0 2-.9 2-2v-7h-2zM4 13H2v7c0 1.1.9 2 2 2h7v-2H4zm12.475 2.356h-8.95v-2.237h8.95zm0-4.475h-8.95V8.644h8.95z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/time.svg b/resources/icons/time.svg
index 2b6e2820ef8..42cf02e4cd8 100644
--- a/resources/icons/time.svg
+++ b/resources/icons/time.svg
@@ -1,5 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8"/><path fill="none" d="M0 0h24v24H0z"/><path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/upload.svg b/resources/icons/upload.svg
index c9b0346a171..2c1318be253 100644
--- a/resources/icons/upload.svg
+++ b/resources/icons/upload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.59 14H15v5c0 .55-.45 1-1 1h-4c-.55 0-1-.45-1-1v-5H7.41c-.89 0-1.34-1.08-.71-1.71l4.59-4.59a.996.996 0 0 1 1.41 0l4.59 4.59c.63.63.19 1.71-.7 1.71ZM5 4c0-.55.45-1 1-1h12c.55 0 1 .45 1 1s-.45 1-1 1H6c-.55 0-1-.45-1-1Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.59 14H15v5c0 .55-.45 1-1 1h-4c-.55 0-1-.45-1-1v-5H7.41c-.89 0-1.34-1.08-.71-1.71l4.59-4.59a.996.996 0 0 1 1.41 0l4.59 4.59c.63.63.19 1.71-.7 1.71M5 4c0-.55.45-1 1-1h12c.55 0 1 .45 1 1s-.45 1-1 1H6c-.55 0-1-.45-1-1"/></svg>
\ No newline at end of file
diff --git a/resources/icons/user-preferences.svg b/resources/icons/user-preferences.svg
index 5ae1773ca30..6d1dc2259d3 100644
--- a/resources/icons/user-preferences.svg
+++ b/resources/icons/user-preferences.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 24 24"><g><g><circle cx="10" cy="8" r="4"/><path d="M10.67,13.02C10.45,13.01,10.23,13,10,13c-2.42,0-4.68,0.67-6.61,1.82C2.51,15.34,2,16.32,2,17.35V20h9.26 C10.47,18.87,10,17.49,10,16C10,14.93,10.25,13.93,10.67,13.02z"/><path d="M20.75,16c0-0.22-0.03-0.42-0.06-0.63l1.14-1.01l-1-1.73l-1.45,0.49c-0.32-0.27-0.68-0.48-1.08-0.63L18,11h-2l-0.3,1.49 c-0.4,0.15-0.76,0.36-1.08,0.63l-1.45-0.49l-1,1.73l1.14,1.01c-0.03,0.21-0.06,0.41-0.06,0.63s0.03,0.42,0.06,0.63l-1.14,1.01 l1,1.73l1.45-0.49c0.32,0.27,0.68,0.48,1.08,0.63L16,21h2l0.3-1.49c0.4-0.15,0.76-0.36,1.08-0.63l1.45,0.49l1-1.73l-1.14-1.01 C20.72,16.42,20.75,16.22,20.75,16z M17,18c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S18.1,18,17,18z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><circle cx="10" cy="8" r="4"/><path d="M10.67 13.02c-.22-.01-.44-.02-.67-.02-2.42 0-4.68.67-6.61 1.82-.88.52-1.39 1.5-1.39 2.53V20h9.26a6.96 6.96 0 0 1-.59-6.98M20.75 16c0-.22-.03-.42-.06-.63l1.14-1.01-1-1.73-1.45.49q-.48-.405-1.08-.63L18 11h-2l-.3 1.49q-.6.225-1.08.63l-1.45-.49-1 1.73 1.14 1.01c-.03.21-.06.41-.06.63s.03.42.06.63l-1.14 1.01 1 1.73 1.45-.49q.48.405 1.08.63L16 21h2l.3-1.49q.6-.225 1.08-.63l1.45.49 1-1.73-1.14-1.01c.03-.21.06-.41.06-.63M17 18c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2"/></svg>
\ No newline at end of file
diff --git a/resources/icons/user.svg b/resources/icons/user.svg
index bdfbc5096c8..1e9c998bf02 100644
--- a/resources/icons/user.svg
+++ b/resources/icons/user.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4m0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/users-add.svg b/resources/icons/users-add.svg
index ea568f2ff4d..c09ad550a5b 100644
--- a/resources/icons/users-add.svg
+++ b/resources/icons/users-add.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M8 10H5V7H3v3H0v2h3v3h2v-3h3zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14m-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5s-3 1.34-3 3 1.34 3 3 3m6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84M13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3"/></svg>
\ No newline at end of file
diff --git a/resources/icons/users.svg b/resources/icons/users.svg
index e7cad506dd1..5a274a8d01c 100644
--- a/resources/icons/users.svg
+++ b/resources/icons/users.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5s-3 1.34-3 3 1.34 3 3 3m-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5 5 6.34 5 8s1.34 3 3 3m0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5m8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/warning.svg b/resources/icons/warning.svg
index b1d1ad02cb0..b8e8ba40467 100644
--- a/resources/icons/warning.svg
+++ b/resources/icons/warning.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" fill="#b6531c" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="#b6531c" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M1 21h22L12 2zm12-3h-2v-2h2zm0-4h-2v-4h2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/watch-ignore.svg b/resources/icons/watch-ignore.svg
index 2c6ffc24a40..4363a712798 100644
--- a/resources/icons/watch-ignore.svg
+++ b/resources/icons/watch-ignore.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7zM2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3 2 4.27zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2zm4.31-.78l3.15 3.15.02-.16c0-1.66-1.34-3-3-3l-.17.01z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7M2 4.27l2.28 2.28.46.46A11.8 11.8 0 0 0 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2m4.31-.78 3.15 3.15.02-.16c0-1.66-1.34-3-3-3z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/watch.svg b/resources/icons/watch.svg
index 0be661912d7..71fc7fe8c6f 100644
--- a/resources/icons/watch.svg
+++ b/resources/icons/watch.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5M12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5m0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3"/></svg>
\ No newline at end of file
diff --git a/resources/icons/webhooks.svg b/resources/icons/webhooks.svg
index fff08141344..8f97cd436b4 100644
--- a/resources/icons/webhooks.svg
+++ b/resources/icons/webhooks.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10,15l5.88,0c0.27-0.31,0.67-0.5,1.12-0.5c0.83,0,1.5,0.67,1.5,1.5c0,0.83-0.67,1.5-1.5,1.5c-0.44,0-0.84-0.19-1.12-0.5 l-3.98,0c-0.46,2.28-2.48,4-4.9,4c-2.76,0-5-2.24-5-5c0-2.42,1.72-4.44,4-4.9l0,2.07C4.84,13.58,4,14.7,4,16c0,1.65,1.35,3,3,3 s3-1.35,3-3V15z M12.5,4c1.65,0,3,1.35,3,3h2c0-2.76-2.24-5-5-5l0,0c-2.76,0-5,2.24-5,5c0,1.43,0.6,2.71,1.55,3.62l-2.35,3.9 C6.02,14.66,5.5,15.27,5.5,16c0,0.83,0.67,1.5,1.5,1.5s1.5-0.67,1.5-1.5c0-0.16-0.02-0.31-0.07-0.45l3.38-5.63 C10.49,9.61,9.5,8.42,9.5,7C9.5,5.35,10.85,4,12.5,4z M17,13c-0.64,0-1.23,0.2-1.72,0.54l-3.05-5.07C11.53,8.35,11,7.74,11,7 c0-0.83,0.67-1.5,1.5-1.5S14,6.17,14,7c0,0.15-0.02,0.29-0.06,0.43l2.19,3.65C16.41,11.03,16.7,11,17,11l0,0c2.76,0,5,2.24,5,5 c0,2.76-2.24,5-5,5c-1.85,0-3.47-1.01-4.33-2.5l2.67,0C15.82,18.82,16.39,19,17,19c1.65,0,3-1.35,3-3S18.65,13,17,13z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10 15h5.88c.27-.31.67-.5 1.12-.5.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5c-.44 0-.84-.19-1.12-.5H11.9A5 5 0 1 1 6 11.1v2.07c-1.16.41-2 1.53-2 2.83 0 1.65 1.35 3 3 3s3-1.35 3-3zm2.5-11c1.65 0 3 1.35 3 3h2c0-2.76-2.24-5-5-5a5.002 5.002 0 0 0-3.45 8.62l-2.35 3.9c-.68.14-1.2.75-1.2 1.48 0 .83.67 1.5 1.5 1.5a1.498 1.498 0 0 0 1.43-1.95l3.38-5.63A3 3 0 0 1 9.5 7c0-1.65 1.35-3 3-3m4.5 9c-.64 0-1.23.2-1.72.54l-3.05-5.07C11.53 8.35 11 7.74 11 7c0-.83.67-1.5 1.5-1.5S14 6.17 14 7c0 .15-.02.29-.06.43l2.19 3.65c.28-.05.57-.08.87-.08 2.76 0 5 2.24 5 5s-2.24 5-5 5a5 5 0 0 1-4.33-2.5h2.67c.48.32 1.05.5 1.66.5 1.65 0 3-1.35 3-3s-1.35-3-3-3"/></svg>
\ No newline at end of file

From 0c524c7c8f272acd4ae429f04f8678e2f8c7ba4b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 23 Mar 2024 16:31:13 +0000
Subject: [PATCH 081/666] Licensing: Added licenses app view

Extracted many methods to a new "MetaController" in the process.
---
 app/App/HomeController.php              | 45 -----------------
 app/App/MetaController.php              | 67 +++++++++++++++++++++++++
 resources/views/help/licenses.blade.php | 64 +++++++++++++++++++++++
 routes/web.php                          | 10 ++--
 4 files changed, 137 insertions(+), 49 deletions(-)
 create mode 100644 app/App/MetaController.php
 create mode 100644 resources/views/help/licenses.blade.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 116f5c8a4bc..0585e0af5cc 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -9,7 +9,6 @@
 use BookStack\Entities\Queries\QueryTopFavourites;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
-use BookStack\Uploads\FaviconHandler;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
@@ -112,48 +111,4 @@ public function index(
 
         return view('home.default', $commonData);
     }
-
-    /**
-     * Show the view for /robots.txt.
-     */
-    public function robots()
-    {
-        $sitePublic = setting('app-public', false);
-        $allowRobots = config('app.allow_robots');
-
-        if ($allowRobots === null) {
-            $allowRobots = $sitePublic;
-        }
-
-        return response()
-            ->view('misc.robots', ['allowRobots' => $allowRobots])
-            ->header('Content-Type', 'text/plain');
-    }
-
-    /**
-     * Show the route for 404 responses.
-     */
-    public function notFound()
-    {
-        return response()->view('errors.404', [], 404);
-    }
-
-    /**
-     * Serve the application favicon.
-     * Ensures a 'favicon.ico' file exists at the web root location (if writable) to be served
-     * directly by the webserver in the future.
-     */
-    public function favicon(FaviconHandler $favicons)
-    {
-        $exists = $favicons->restoreOriginalIfNotExists();
-        return response()->file($exists ? $favicons->getPath() : $favicons->getOriginalPath());
-    }
-
-    /**
-     * Serve a PWA application manifest.
-     */
-    public function pwaManifest(PwaManifestBuilder $manifestBuilder)
-    {
-        return response()->json($manifestBuilder->build());
-    }
 }
diff --git a/app/App/MetaController.php b/app/App/MetaController.php
new file mode 100644
index 00000000000..3d3a8d2c841
--- /dev/null
+++ b/app/App/MetaController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace BookStack\App;
+
+use BookStack\Http\Controller;
+use BookStack\Uploads\FaviconHandler;
+
+class MetaController extends Controller
+{
+    /**
+     * Show the view for /robots.txt.
+     */
+    public function robots()
+    {
+        $sitePublic = setting('app-public', false);
+        $allowRobots = config('app.allow_robots');
+
+        if ($allowRobots === null) {
+            $allowRobots = $sitePublic;
+        }
+
+        return response()
+            ->view('misc.robots', ['allowRobots' => $allowRobots])
+            ->header('Content-Type', 'text/plain');
+    }
+
+    /**
+     * Show the route for 404 responses.
+     */
+    public function notFound()
+    {
+        return response()->view('errors.404', [], 404);
+    }
+
+    /**
+     * Serve the application favicon.
+     * Ensures a 'favicon.ico' file exists at the web root location (if writable) to be served
+     * directly by the webserver in the future.
+     */
+    public function favicon(FaviconHandler $favicons)
+    {
+        $exists = $favicons->restoreOriginalIfNotExists();
+        return response()->file($exists ? $favicons->getPath() : $favicons->getOriginalPath());
+    }
+
+    /**
+     * Serve a PWA application manifest.
+     */
+    public function pwaManifest(PwaManifestBuilder $manifestBuilder)
+    {
+        return response()->json($manifestBuilder->build());
+    }
+
+    /**
+     * Show license information for the application.
+     */
+    public function licenses()
+    {
+        $this->setPageTitle('Licenses');
+
+        return view('help.licenses', [
+            'license' => file_get_contents(base_path('LICENSE')),
+            'phpLibData' => file_get_contents(base_path('dev/licensing/php-library-licenses.txt')),
+            'jsLibData' => file_get_contents(base_path('dev/licensing/js-library-licenses.txt')),
+        ]);
+    }
+}
diff --git a/resources/views/help/licenses.blade.php b/resources/views/help/licenses.blade.php
new file mode 100644
index 00000000000..a87d9e958b2
--- /dev/null
+++ b/resources/views/help/licenses.blade.php
@@ -0,0 +1,64 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container small">
+
+        <div class="my-l">&nbsp;</div>
+
+        <div class="card content-wrap auto-height">
+            <h1 class="list-heading">Licenses</h1>
+
+            <p>
+                This page details license information for BookStack in addition to the projects & libraries that are used within BookStack.
+                Many projects listed may only be used in a development context.
+            </p>
+
+            <ul>
+                <li><a href="#bookstack-license">BookStack License</a></li>
+                <li><a href="#php-lib-licenses">PHP Library Licenses</a></li>
+                <li><a href="#js-lib-licenses">JavaScript Library Licenses</a></li>
+                <li><a href="#js-lib-licenses">Other Licenses</a></li>
+            </ul>
+        </div>
+
+        <div id="bookstack-license" class="card content-wrap auto-height">
+            <h3 class="list-heading">BookStack License</h3>
+            <div style="white-space: pre-wrap;" class="mb-m">{{ $license }}</div>
+            <p>BookStack® is a UK registered trade mark of Daniel Brown. </p>
+        </div>
+
+        <div id="php-lib-licenses" class="card content-wrap auto-height">
+            <h3 class="list-heading">PHP Library Licenses</h3>
+            <div style="white-space: pre-wrap;">{{ $phpLibData }}</div>
+        </div>
+
+        <div id="js-lib-licenses" class="card content-wrap auto-height">
+            <h3 class="list-heading">JavaScript Library Licenses</h3>
+            <div style="white-space: pre-wrap;">{{ $jsLibData }}</div>
+        </div>
+
+        <div id="other-licenses" class="card content-wrap auto-height">
+            <h3 class="list-heading">Other Licenses</h3>
+            <div style="white-space: pre-line;">BookStack makes heavy use of PHP:
+                License: PHP License, version 3.01
+                License File: https://www.php.net/license/3_01.txt
+                Copyright: Copyright (c) 1999 - 2019 The PHP Group. All rights reserved.
+                Link: https://www.php.net/
+                -----------
+                BookStack uses Icons from Google Material Icons:
+                License: Apache License Version 2.0
+                License File: https://github.com/google/material-design-icons/blob/master/LICENSE
+                Copyright: Copyright 2020 Google LLC
+                Link: https://github.com/google/material-design-icons
+                -----------
+                BookStack is distributed with TinyMCE:
+                License: MIT
+                License File: https://github.com/tinymce/tinymce/blob/release/6.7/LICENSE.TXT
+                Copyright: Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
+                Link: https://github.com/tinymce/tinymce
+            </div>
+        </div>
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 4620cd08bc3..03595288f92 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,6 +5,7 @@
 use BookStack\Api\ApiDocsController;
 use BookStack\Api\UserApiTokenController;
 use BookStack\App\HomeController;
+use BookStack\App\MetaController;
 use BookStack\Entities\Controllers as EntityControllers;
 use BookStack\Http\Middleware\VerifyCsrfToken;
 use BookStack\Permissions\PermissionsController;
@@ -18,9 +19,10 @@
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 
 Route::get('/status', [SettingControllers\StatusController::class, 'show']);
-Route::get('/robots.txt', [HomeController::class, 'robots']);
-Route::get('/favicon.ico', [HomeController::class, 'favicon']);
-Route::get('/manifest.json', [HomeController::class, 'pwaManifest']);
+Route::get('/robots.txt', [MetaController::class, 'robots']);
+Route::get('/favicon.ico', [MetaController::class, 'favicon']);
+Route::get('/manifest.json', [MetaController::class, 'pwaManifest']);
+Route::get('/licenses', [MetaController::class, 'licenses']);
 
 // Authenticated routes...
 Route::middleware('auth')->group(function () {
@@ -350,4 +352,4 @@
 // Metadata routes
 Route::view('/help/wysiwyg', 'help.wysiwyg');
 
-Route::fallback([HomeController::class, 'notFound'])->name('fallback');
+Route::fallback([MetaController::class, 'notFound'])->name('fallback');

From a2fd80954bfd0b2a98d54b9ad2c68628cd1e2b1c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 23 Mar 2024 22:04:18 +0000
Subject: [PATCH 082/666] Licensing: Added links and tests for new licenses
 endpoint

For #4907
---
 app/App/MetaController.php                |  2 +-
 dev/build/esbuild.js                      |  4 ++++
 lang/en/settings.php                      |  8 ++++++++
 readme.md                                 |  2 ++
 resources/views/help/licenses.blade.php   | 23 ++++++++++------------
 resources/views/settings/layout.blade.php |  4 +++-
 tests/LicensesTest.php                    | 24 +++++++++++++++++++++++
 7 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 tests/LicensesTest.php

diff --git a/app/App/MetaController.php b/app/App/MetaController.php
index 3d3a8d2c841..1515b4f7eda 100644
--- a/app/App/MetaController.php
+++ b/app/App/MetaController.php
@@ -56,7 +56,7 @@ public function pwaManifest(PwaManifestBuilder $manifestBuilder)
      */
     public function licenses()
     {
-        $this->setPageTitle('Licenses');
+        $this->setPageTitle(trans('settings.licenses'));
 
         return view('help.licenses', [
             'license' => file_get_contents(base_path('LICENSE')),
diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index c47727c2c4e..53fbf0189f0 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -30,6 +30,10 @@ esbuild.build({
     format: 'esm',
     minify: isProd,
     logLevel: 'info',
+    banner: {
+        js: '// See the "/licenses" URI for full package license details',
+        css: '/* See the "/licenses" URI for full package license details */',
+    },
 }).then(result => {
     fs.writeFileSync('esbuild-meta.json', JSON.stringify(result.metafile));
 }).catch(() => process.exit(1));
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 7b7f5d2a2e3..f4c84092c6f 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/readme.md b/readme.md
index 5457ddfb557..17e1a05f659 100644
--- a/readme.md
+++ b/readme.md
@@ -158,3 +158,5 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan) - _[MIT](https://github.com/phpstan/phpstan/blob/master/LICENSE) and [MIT](https://github.com/nunomaduro/larastan/blob/master/LICENSE.md)_
 * [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) - _[BSD 3-Clause](https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt)_
 * [JakeArchibald/IDB-Keyval](https://github.com/jakearchibald/idb-keyval) - _[Apache-2.0](https://github.com/jakearchibald/idb-keyval/blob/main/LICENCE)_
+
+For a detailed breakdown of the JavaScript & PHP projects imported & used via NPM & composer package managers, along with their licenses, please see the [dev/licensing/js-library-licenses.txt](dev/licensing/js-library-licenses.txt) and [dev/licensing/php-library-licenses.txt](dev/licensing/php-library-licenses.txt) files. 
\ No newline at end of file
diff --git a/resources/views/help/licenses.blade.php b/resources/views/help/licenses.blade.php
index a87d9e958b2..1eb293523b6 100644
--- a/resources/views/help/licenses.blade.php
+++ b/resources/views/help/licenses.blade.php
@@ -7,39 +7,36 @@
         <div class="my-l">&nbsp;</div>
 
         <div class="card content-wrap auto-height">
-            <h1 class="list-heading">Licenses</h1>
 
-            <p>
-                This page details license information for BookStack in addition to the projects & libraries that are used within BookStack.
-                Many projects listed may only be used in a development context.
-            </p>
+            <h1 class="list-heading">{{ trans('settings.licenses') }}</h1>
+            <p>{{ trans('settings.licenses_desc') }}</p>
 
             <ul>
-                <li><a href="#bookstack-license">BookStack License</a></li>
-                <li><a href="#php-lib-licenses">PHP Library Licenses</a></li>
-                <li><a href="#js-lib-licenses">JavaScript Library Licenses</a></li>
-                <li><a href="#js-lib-licenses">Other Licenses</a></li>
+                <li><a href="#bookstack-license">{{ trans('settings.licenses_bookstack') }}</a></li>
+                <li><a href="#php-lib-licenses">{{ trans('settings.licenses_php') }}</a></li>
+                <li><a href="#js-lib-licenses">{{ trans('settings.licenses_js') }}</a></li>
+                <li><a href="#other-licenses">{{ trans('settings.licenses_other') }}</a></li>
             </ul>
         </div>
 
         <div id="bookstack-license" class="card content-wrap auto-height">
-            <h3 class="list-heading">BookStack License</h3>
+            <h3 class="list-heading">{{ trans('settings.licenses_bookstack') }}</h3>
             <div style="white-space: pre-wrap;" class="mb-m">{{ $license }}</div>
             <p>BookStack® is a UK registered trade mark of Daniel Brown. </p>
         </div>
 
         <div id="php-lib-licenses" class="card content-wrap auto-height">
-            <h3 class="list-heading">PHP Library Licenses</h3>
+            <h3 class="list-heading">{{ trans('settings.licenses_php') }}</h3>
             <div style="white-space: pre-wrap;">{{ $phpLibData }}</div>
         </div>
 
         <div id="js-lib-licenses" class="card content-wrap auto-height">
-            <h3 class="list-heading">JavaScript Library Licenses</h3>
+            <h3 class="list-heading">{{ trans('settings.licenses_js') }}</h3>
             <div style="white-space: pre-wrap;">{{ $jsLibData }}</div>
         </div>
 
         <div id="other-licenses" class="card content-wrap auto-height">
-            <h3 class="list-heading">Other Licenses</h3>
+            <h3 class="list-heading">{{ trans('settings.licenses_other') }}</h3>
             <div style="white-space: pre-line;">BookStack makes heavy use of PHP:
                 License: PHP License, version 3.01
                 License File: https://www.php.net/license/3_01.txt
diff --git a/resources/views/settings/layout.blade.php b/resources/views/settings/layout.blade.php
index 94a8f7725d9..a59b58d535c 100644
--- a/resources/views/settings/layout.blade.php
+++ b/resources/views/settings/layout.blade.php
@@ -18,8 +18,10 @@
                 <h5 class="mt-xl">{{ trans('settings.system_version') }}</h5>
                 <div class="py-xs">
                     <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
-                        BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+                        BookStack @if(!str_starts_with($version, 'v')) version @endif {{ $version }}
                     </a>
+                    <br>
+                    <a target="_blank" href="{{ url('/licenses') }}" class="text-muted">{{ trans('settings.license_details') }}</a>
                 </div>
             </div>
 
diff --git a/tests/LicensesTest.php b/tests/LicensesTest.php
new file mode 100644
index 00000000000..a7fb803c087
--- /dev/null
+++ b/tests/LicensesTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests;
+
+class LicensesTest extends TestCase
+{
+    public function test_licenses_endpoint()
+    {
+        $resp = $this->get('/licenses');
+        $resp->assertOk();
+        $resp->assertSee('Licenses');
+        $resp->assertSee('PHP Library Licenses');
+        $resp->assertSee('Dan Brown and the BookStack Project contributors');
+        $resp->assertSee('doctrine/dbal');
+        $resp->assertSee('@codemirror/lang-html');
+    }
+
+    public function test_licenses_linked_to_from_settings()
+    {
+        $resp = $this->asAdmin()->get('/settings/features');
+        $html = $this->withHtml($resp);
+        $html->assertLinkExists(url('/licenses'), 'License Details');
+    }
+}

From 3345680f7d7e2a7b199d2a2fd607c769f4c2a672 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 24 Mar 2024 11:58:31 +0000
Subject: [PATCH 083/666] Licensing: Added license gen as composer command

---
 composer.json                  | 4 ++++
 dev/licensing/gen-js-licenses  | 2 +-
 dev/licensing/gen-php-licenses | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 79246b7acb5..b22c7b44de9 100644
--- a/composer.json
+++ b/composer.json
@@ -72,6 +72,10 @@
         "lint": "phpcs",
         "test": "phpunit",
         "t-reset": "@php artisan test --recreate-databases",
+        "build-licenses": [
+            "@php ./dev/licensing/gen-js-licenses",
+            "@php ./dev/licensing/gen-php-licenses"
+        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
diff --git a/dev/licensing/gen-js-licenses b/dev/licensing/gen-js-licenses
index dfb2f6651b0..191a16f302f 100644
--- a/dev/licensing/gen-js-licenses
+++ b/dev/licensing/gen-js-licenses
@@ -22,7 +22,7 @@ $licenseInfo = implode($outputSeparator, $packageOutput) . "\n";
 file_put_contents($outputPath, $licenseInfo);
 
 echo "License information written to {$outputPath}\n";
-echo implode("\n", getWarnings());
+echo implode("\n", getWarnings()) . "\n";
 
 function packageToOutput(string $packagePath): string
 {
diff --git a/dev/licensing/gen-php-licenses b/dev/licensing/gen-php-licenses
index ed5a21c5aa9..79f4c2ff696 100644
--- a/dev/licensing/gen-php-licenses
+++ b/dev/licensing/gen-php-licenses
@@ -19,7 +19,7 @@ $licenseInfo =  implode($outputSeparator, $packageOutput) . "\n";
 file_put_contents($outputPath, $licenseInfo);
 
 echo "License information written to {$outputPath}\n";
-echo implode("\n", getWarnings());
+echo implode("\n", getWarnings()) . "\n";
 
 function packageToOutput(stdClass $package) : string {
     global $rootPath;

From 76c71662683afff885ac086d259752336f855e1f Mon Sep 17 00:00:00 2001
From: Martin Rys <martin@rys.pw>
Date: Tue, 26 Mar 2024 12:31:54 +0100
Subject: [PATCH 084/666] Use zopfli for oxipng for extra 3KB~

---
 public/book_default_cover.png | Bin 3448 -> 3232 bytes
 public/icon-128.png           | Bin 2976 -> 2965 bytes
 public/icon-180.png           | Bin 5769 -> 5744 bytes
 public/icon-32.png            | Bin 753 -> 746 bytes
 public/icon-64.png            | Bin 1374 -> 1367 bytes
 public/icon.ico               | Bin 10619 -> 10614 bytes
 public/loading.gif            | Bin 11098 -> 8986 bytes
 public/loading_error.png      | Bin 1201 -> 1156 bytes
 public/logo.png               | Bin 3302 -> 3256 bytes
 public/user_avatar.png        | Bin 3423 -> 3180 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/book_default_cover.png b/public/book_default_cover.png
index bf73b67a35f09b99c76724e48a17c0f6d96928d6..6d088d8b82caf77c94e42ac7f1bd81815c445ed1 100644
GIT binary patch
delta 3128
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
S;wvTq0000<MNUMnLSTaC^6#er

delta 3339
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
Pp8o<^<FM7}D{=n=Fc)pl

diff --git a/public/icon-128.png b/public/icon-128.png
index 333c1e9640ae2d775674f716ba31fe77c6e8b135..f271e849d204dfbde01d1abfa8e33602106c700a 100644
GIT binary patch
delta 2529
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

delta 2540
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
C>FY57

diff --git a/public/icon-180.png b/public/icon-180.png
index 7627b523c89c13ee9deda03779473c34dcfa9e41..4d4ceac3486bb74f282bd644e8dd675bc45681eb 100644
GIT binary patch
delta 5133
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

delta 5145
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
Hu0mjft0Lw(

diff --git a/public/icon-32.png b/public/icon-32.png
index de94f373da2948976bb6212daf66c2f2a54389f4..deac72d893e629e949f67f682ee7e543e5f07ebe 100644
GIT binary patch
delta 690
zcmV;j0!{t#1?mNmM1S}D{`LC(^!fbr`1|tr`tkPo>+<{R@%riT`RMQX=kE9B?e^gB
z_1^CE-R$$$==Ig-^wj3_)8+Bf<nYns@5<is$=&eC-0#QR?Z(>dzSi!&)a|^}?7PzH
zy3y&m(CD(v>Zr=*r^)4>#O9sD<eb9eo5A9fz2uU-<B_`Ikbk-0hqU2^vfhNT-Fd6s
zZ>rjEso7+u+GC{IVx!n$qSsZO*HoO=Q=8RDnAk>_)<u@pM3vM+l+!hl)-#aQF^|(Q
zj?ylT(JYM6AC1=>jMf^9)fbA?6p7Lih|vv)(BmYbWdHyG0d!JMQvg8b*k%9#0iQ`k
zK~#9!ol^yt<$o{?>u0LFpP8ANnMwD*&&J6x&!}AKIeN0A{Q(a1m$WT^7==uq(x&(f
z=z8O1`k3~1fl1Wg!>MTdfOl5!*yX7KV4m<M-WIXuwz$_RzXy&5s@~8Kyp)(C699ek
z7$r0*y8)x=F}++|VNAjB7!NpxmBLZE;tBB%9x)099e;whWY_oz>kPG^YbHw<AK_Bg
zi$@57xvUqCc!!QRF$eB7t7gMGOU*a*B<$~lBaJ#V(+n7ggZ&ruHYdZH#l2nj5E=t$
z8_5+E?o~a10FHTGge3$H70bEkDV`w9a=*}|+y=N5Et>mLyG|Kx%wimwNLhx}F%mA#
zw0>9(7=Hx4Qo2kS9nO@U3J;Hdr~KFe$D&?31DhN*Aw6{dB^Ho<+=1;<dJWu^(|w*j
zoQpEEt(b(nNPqakshb<QWPj8K&k~9BfoW7Z^{H0Mk6}>8F*tHrssdOfOs{99MVU3n
z)S%p!o!Z|{8@n%GdS0d0-wvcpRrNfqXZmE~F)O(O>$LfcJ%e+}@#U`Tkm>7v%k(et
YAE4-m0sWU(GXMYp07*qoM6N<$f@uJRA^-pY

delta 697
zcmV;q0!IDn1@Q%tM1Se<`H;Eb(c|x7qSxl__AHFh4TsQqtKHq~^T*rmQ=8TE`1|+!
z{=C!dyVB~Y%I3P!={1qoMV8e_nAjhU*D;UNFpkom#O54~*52;)gt6V#=k#u=+2HT>
zg|gn$<?+(w@Q1YFlDy*)h|!U{;mO_bRGijhq}gw(+GM5LVt=F9E{)N$%<8$&=rfSi
z>+<{Z_xeVc*2dcGr^)5#?)RI);uML}7mC!J!sC;@<n;OcRh`$$-tpAt^VaC~>hb#Z
z`u&~5<Qj|B=<oPMmDIl0?#SHlz0~bOl+*F{_}`)>*Z=?k0d!JMQvg8b*k%9#0j5br
zK~#9!os;QO!hb*zgtG=FO*mBW0wW<{z%xP3fd?KO9?AQ^kC|Pt5RoeFKNQtdvtN2<
zw0|hAthLMD<waZkYKvkCD40bOt8KFY40}gs*bB=m{Hxf-zDHdEyMY-jH+k^;aF5A5
z0E}&l2WUPmmWan8fF@1tI&`Ymz|yB;@o}X*Ik`M$GJkTaBE7rCmx>nVx@bFTW{;`~
zRw>z{4kAsA3RtDdI0_A91(k8MZQzG2GuQ>(`v<Lzq)PgdJ<J_7!IAb-O_YFq&S@^#
zeP4!EDw+jmX!A$4?6+4axpCxO0)`jG17=87ERAp)?m@QYc|j+?228?{wlS|wKI|4s
z?;Kf{vVRQAvV#{*B(v9mbH|jWJArL+rWq+S%z01vrv?~dRBr$^pL9qD>oB;1oZ~(i
zmo^h%phyoqW@v;mv%W`NH%tF?fpmihxx;+a0`C%02f#^Bkv^+Y%0H)$jN{zkwiE-n
z3B>nZ>CjffF?GrBGwJp6wlV#9a%QUPXn7%DR5I7;>^<?z#$$L3B%75rH-kn!U3+yF
fiS>6Y{(kG9VAnXXK3j(800000NkvXXu0mjfZry#8

diff --git a/public/icon-64.png b/public/icon-64.png
index 8642b24eba3e1549f05609932a0743f55f5a5214..afe4b766dbac3b5142c89294af8f7325d82b4ef1 100644
GIT binary patch
delta 1027
zcmV+e1pNEn3fBs-V*!8PNkl<Zc-qxh)nY3<47{_UViYd7o8EImg>X`4W~TrDkYmTY
zT5lMhIxj^j*33w<|N9*PFj~0z_yi0ej{PL1{`!F-<0Ih^2?VBxDFjGovLun1nS}`q
z8t&gnQ3J6!%=uK#00t_4ETF>g?xR>uif?Xit3dz7mxCnX^%#GO2#JeGe^dZQP8A<K
z^$8+ANMU)!L?3kk)!L1Un4ETqppTg)%+4%$dZYj_J*6V*wJH-qp|4LAc6P;g506ox
zOT6z`6`y@Jm<XccVKiDQTDf9ZK*!=eUQ*Zq;QJh#mnn9|xxc?8lTI~g7al!)ARFP*
zbi`*wF+ss2AM$^17L&|p0ceSj$3mndl*nd~xwwS6vPsP-mfVs;F#JI+_#gQw#*@^F
zU|DZcpfJBcZSb+gHgY2{hN=OrX^Yez<+oRAMQW=m)SiYN|HB{B7qXcrR8E3)4Hce$
z|DXX7I*V9p%LIUb<qr*l<SL@~LTyf94D|V%D<-Qg699j;0wU-AGVrmO7iuR+p&k(l
z46iT*ySzv7;ZK;Xwzn~%kbV`vj|dmcQ7=gAvD%?>1xCJc0(r7GK3PZ1?G*6MYD*i{
zZW<iiS={(>6{B|GvFxZV_eA`{QsLA#J*(pek7ZUn`;vz5C}GPOPqz5O4K;$sCzwgW
zm}l4Vfk=P7Z1ehTz;_xXhBKDW?Be(K5j`l9<AcJ>5|$R7;;K9miN~^$$!a$Gj4_iw
zksuOU=3lBgEa*)UX+LhIn902MVVfIr<Kogf7F#JO1<old>auC|v24ySb3+Oy)d@6W
z6uj$l9EYUUBqeO4sMz#6lRI<Q%19EgERDpSSb~4!GeVSgTa;aW!BJ8i`LL)+M3@x*
zNOQzA;e{>k?6Qt##e#cv7Mz;#O2$Y`x99DRP1w;PXS=v`EjX4<C1CzKS?T7!ifb2>
zY@7xMWt~6CTg6&u{2R64*psUcld>B>=~W8Ct(d9_<t7~)NlmkML%Ns@j6?ZAHP__@
zS1f<L^H)_IkglrR$xeJoYo1gWH{k<r?>pVS&t92VJB*vj_q?^0U@kcRTl4DuGcRm(
z6117TRZOytz&q`<Eq@R9QB4r<8Z+6lRgrgwY)x}M#a13%-N8)Gn?R?fE|#5N@uwkh
zt(fG|hW6JA=I`k_OAN&%Plyh88*sUL*YJB5Jx(~pbi5le;XDD^+PXC8eYxWqyeYS+
zyEyc`UOH4QA^)hhDBBb0^McEluq9W6V4y3uKylH%Mf(Hb7?!ta1Q_a>!D9*-@}VP;
x+V%s(Kegnj#_*3lZrY&$m~jB3K6rlv{s9{;(s8!wO-29!002ovPDHLkV1m13?@s^#

delta 1035
zcmV+m1oZpY3f>B^V*!8WNkl<Zc-qxh?N-`A5bccwv@L8%02M`oZTYa(fC#qQR;w*m
z#IIsO`~DBo-HgdBXpVrtyuTpl%w*@@J2RVCF9QIc7w%qO0kenWTS=5Z#DN*(?X)E%
z63JN#0V>s+P{=JV!3Cxbk8hTRk4zSBzPw=oQx!j-pzz+ggY|!s{LwvY0h1TsObLb9
zoIyk=bnMBf0E`VPK6PwLA_ju6R&+5z9YCwyrHD64CPEAr3s_oQnR_AyfaF_>*lo8$
zB7}82M15~x{<^qyfarLbKdAWHwc!&%XdF1scH=%*<~I;o{9H^BHUXH!`MgT8FVB5<
ztC-|!@L0HWa3OyJq_>l{X*hT-QimqIn}ErH&pPlRKAW+G4l7ryqS`ruTig=kXl##4
z3d!(5Jit464i-w{AyQ4fNr8HPMLdE*fo(K`#5`ICw5Dx{$I-m$i-#zGZb`M12;%?I
zOD09FdWD^%lsE;2dw&OF3RpjFQrk}e#Eb96G$^gZIVXR$DS<K7`?rcNt1S}%?K<pV
zlQJ+^^`zQ4LD;or0wX33K`wt1R(c3GR6FKRC{+6Lxh-9=EF!_yW3{d34h+vffjZd@
zpDYT?dv)BUEzL&luFpa5o|`y+XG8>OEVJ5bPh>l!0*(XIvpPC>EQe~>{#0Nd<^mbB
zr7?eugGPVQ!fX0XjLq${4`k}KfY)mS=5dN6c`W}7ivRiz&i963AJqR8P*~;SRF7~l
zjb)=+(`+=%giM+;fo-kvLz=^_wwlBI_j5U9($ikHwW&5PPUu){rIZqQBSuzJO{<S(
zH@_A(q-2s#z{CVae^TSvl2&6%l#Lv@>2)UemQR1lNDBQ>8in3j3k!=jj8B0m`}%?t
zC3)n729b!gAiP)R$Y{b#Tl9jm4wq1=_Ibh4j3*iGjBd}fZa~=KL71&`GP2-EHueGW
z7j32Pc?+jHlWZKHgC_CEExJSNEPO%>jy<`~OsZ}iioOygY{hb0D))wMq%^Gs4LQPO
zVgY~T18T05PFS(@&IhVEp<J~aBs(%u(L6~PH}V0scTackbxh^u!;CTc*8^xJxGU_x
zk1@S}@&?SKRKVn!&Scu=rH122`MWrGG(ln?naT033Xg|uo19O`6fd|tbSCpI5Vh3h
zvWpXc8WN{IlRVlGd95J+uCD22JpOn>MBIOEz~yq+@D}}%V`3ujMj_!m0omFt4W7K*
z@eJOQTXd{AJbArjstWKf{VmG&1SY%S@+GV=(jb`picM&&j&9M(0I*@hEouX^d}i>N
z0%rNpA(X$wfmuJbXjEhNk3DMISpm4&XMeHcMSPh52OBNYaq(kGjQ{`u07*qoM6Lru
FV1gz?@5lfE

diff --git a/public/icon.ico b/public/icon.ico
index e4752690c711ba2aea5d32663ae6408bd6602e3c..2581b9b335f6be741db4e9eba6b957a08208aaf8 100644
GIT binary patch
delta 10553
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
HlR+su{oe+`

delta 10558
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
Mi~vIjp_4o*IxEl_*Z=?k

diff --git a/public/loading.gif b/public/loading.gif
index 5bcdebec3069f64d0be4edc0879a67641c0d9ae4..9efe6b216cdba6687bc2c9c3e5ad3acc3d0fbdb3 100644
GIT binary patch
delta 7886
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
I9p2CW4|ATjfdBvi

literal 11098
zcmbW-c~FygyEpJV`<(^2fh2?wAPIX27#1zKH7kpvMMM?_OaKJ|6%Y{=H3?yn9a%-d
zprD9=5jWi0u!?9EcdMv?C{%qEt+uvR`rb&(>C@+&Ii8n4V8$7ok>TU_dtKMh)7!(%
zUB&}=Km!1vb8e|RUv`hY6CWI`zwvVP?Z?Pdqn72jO0T}W_3GV;NAE(~MqO(MOZ#8m
zdj8J8b@0UfcX|CUuRMR}(>mCE|J}RaJ|=xT%B>w_?7o%P`|`@OcRo#n&39gMs|KsD
zz8rk@@%*EA^Y;&`dS7-wdnaxhtiSW}<<B4E&W>7E-3mE1>bigM<K)M*&QV7Bt?C;u
z2j6}?Kl1L6KmGu|_=EKaajC?Axk%tEadzaP5b!s$eno?L_$znnFPZvh0@z7yWxN-c
z9<lr8rG&V-`>x(zcig>2eXsdgo0`tKKQSPaIprRFWxd%!*+@@F=y9fTrR*(lgHB{w
zvq+>Ji6VPMGL{h?vs#?ZA#pM?g~%M6SzC#ECS^jpGM!MK#m)hDhWN*cC^jWV*qsM;
zZIW#ggv};}LS{ONWpGepmcw1Y&T!v)iV4Yx!%eh5DZ)^5nCC;cuLnC(7*EPQp*aZZ
zj+1k!)=m@z`+Xn=RYG#~u(v{afjk3+1fV)DymB}~>r?WT5zR-7jX-7Qa`GajtWGsZ
zc$*1o0M<8#hC0|JleZmOMJ_GhZT#MKDVDZAp!D*Mg1|{E*}?G?5HDL(On~N^x!zMB
znyt%`>PlGb$Py&lt?k~*+eKKi(CLI%0=A!k(~s`t^&k%tFypn&@?w_K+uhnRL=)Su
z5=Ib`=_ZV4Rl{9(!D~mf?aE!fW8vf>zPc^9zx=Mj4(1B(6(Y}#Il-$su}-fFw-L~u
zJsFE-gfNSiY@4IJ)f;f`(L<T@v&Ur#dq+se-7<A!kJhYeo!`p1SYW=l(k%Gcdm9RR
z)z-L}9vsB1jyMcVrhl-QE8zPAEQJF&AtSr#d3A05@Zxohpx^9Uq)xz|C;Xig%b4cd
z$0-0(@xna=t9WTAt%dBz$HbeX>>ySe^HMY}Z|4i|_zI<Y5V#8kMF%RdpN`ptkcdL9
z0zmX?lv@dM--tPGnORuUhYLXf33<h4d2V2{x??vzL{PhPr@%R~c)VwYAa~~iyrR&_
zQf>}fTU%#tf0=Mbs9NjTr$F}Dt`+7gAKF?h{bBHsw%`sZe+=%dK4Vrfr$D|B02eL;
zFq01(tkh2Df83W9e&y-vVDirwZ4J_?IkmMfWIxqs-fNCGuj{q7-S_qL^}7m`reR~>
z>`Xe_lu-|zw|!w~4eg4e3I3bk?Tmi_hUrclo&gLSgWZyM-<mc&0~po|!=48GCta8{
zOt<#m=)(SC+oXb9(}rQ*uwhv5G-Lm^(P_XldgmV;gfV})VeBM-&y>wIyMQB`rfgDP
z#DmRKHpA;yw%*rh40rKzLuOUly2;H(MhG2*5YG6k;Z<VABCE6nAq8B-C8Xl)ltO!5
zD`P9W*mMJ~MI~0eZd;iiNp6fx7uz!`xz@2Y`F?UMZdrrr9s~j}YKb-5&xvo4(7Bbm
z(sg+kaT?tO`{P1eqi$}!^En|}&SCELuut*8(hW@qW-YSVa##0Xz0TO3a{6QXAk72K
z02zjlMD}dR<z~H(8g(2kS8FvYeM4|%{LsLN#EnIB3`+B>!+^2E5X}d^OyHd*nF|eF
zEJPtl(g5{9cmb4!AkX2|^8m|98-&A3@o3ckgD#*|a+OM7cF>RvS$fou`(HuPtTs7%
zAxQl>y4F7@XahOOE{qkLzpV|4LKqr7QPX&G?R_rgD%x;jR^{rbYe?ec;zs3gSJqKA
zG*ovi;$q|<W&?XlSWj!sn9+}#gAuB}9eS#0C_HK14IS)xxmv1>x(kJ*>taVv{0r+8
zPU64mOxURRT~tL?^Cr=o>IG}Su*tlM+1&%L=k9Ag@|p=cDz~ran&v33zvyh{75%WO
z)sG4^&f?Ym4v}d=8v~#~VkY+aPZiMB9~EQY8=jZSw|Q0@2zNZ+B^9g?t0(rQ5onkK
zDuvOd1VQ8gfcCf&iLFB?6yFtWPn-`3R-5vQWC+u(2NeK`6IhFL(iND+nq3(|V1CVD
zUL~dpo~(`vJdx2+9OyqJQ$3FN1u$mh_5jQuPO14>?u26PTC<`Q9fhQOEV#Ts^&qgv
zK1D6Z61;dd={289tkLxInoI<AXFLzsTde6NtlfQ>f!}-heFefWiCVF{3eQ1RHwWAF
z5{?|ZQ)cmpJ0~5Tp$um3YyQ5o5lOhxrcBGkifZMLrFflGGp|La>Z%{SAJ&(B8-FB(
z|J>LE`p@Y3A9+rPD{K>XN-nqs3x)F)wh5D*&R3WxEODAA4C)`@I+Lt$%ECNhq$D`V
z|CX{dLSgv+t$!k&&R19{tn~|p!qNGeXH-p3XZ#e;JM1Ck$tj-7gfr~GmY`^6b!E?@
zZb_$VmvQc8C&yEBh)~_`u$_;Ec2peBQXa9zndppMN3(R?Aa+2jaEPo3Zzj{(P8{Qi
zkcv$?<;I(n4VkI<jUi$6LI+y;?j|wTxy5;wD8~P|3$mPJdd7oS!?ckdTYt^59KG3L
zkBi;;)FhX>okG2G>OPOVo_0tcc8_uH)-(#*#0DLRO;_nXGviPXOXkm~*{TPjMJ-od
zcZvFX>fGpTGafsBC>?G5f%GHO0yRf!GWlcY0CT_C0&8HYsnm+Hcn&0?%tjpMT|yTF
zK2M|#lRdZ>3m2|KJOP&Ka3iDRcJJ@*$J-lnDL03$iS?F6vUM^bvu8t7WaWHc;dn9C
zbY<1{-6QgBd~A(>(cva(+qp}vKRz@uTAcBn9JShetWG2An)iC;08f7GN$*_yNk+SK
zf-@0vj(x=Kj72u;@kJ-A7iS>BL(4^KwOT-+Wy-b{Em>KXfv}E$F{jvt^7wH|EOzpN
zGG*dPFh}kEOm^m^ZpQEXpYUZJw_331R&f!RpZ%IJ|J{<}VfN)0!3=d!f=rT4WNXb1
z5BxNyQa8QggB`Uy5k^Uvk&;yWc`<S861NE-G^2e>$2LX^Uw@5}H*ZC<Dbr2GB=uJN
z<`Dk%W=jW-+;Tz@S`s}bkPCg{;hIH`2TAny)5u+tBr9Nv<kpt!6o*J=y{8usumBL1
zn~)pwE7O-?7E*$iOGfa+oyDZ+vdkn=>1n?*mlF`BlA?+q6<=(Co+dhgClI8KP`o9u
z<k4*<KrP!mP`U90Pg`srpQ=I_`p#K_@kg??)wf5V-j=-0_|dTP1S8%OP2Z3)R=6(u
zmqi60NcoSUKeTjR<Cp3Rv|9|=Q3c<`pUvqz!0TIiG1k`F5dD9EIh~tuuE93p`a4s6
zVVE$bX`8Uq8JqtVo$w$2)p}u%aO;J;FKlxrH{ooZQ8`0$Iyd1e46B5@@0UmC3`}gv
zrOz<S@YkKEI_-5~^k#4hCfHNiLs1as%(XPQ=H{UG6%Mmbr$-w)SRlBjshjLKlgPS~
zkhlyNGM8%s7DhNGlS#JX7>Df{SfvFwcT>&gWaHFr4m(`z9ZI+k<(sg(c13Gq)goPG
z$+<&f<785bFeGdT)!;Ze^AvSgRpR*qp_39}LG`4bvPDLf<M*&0+xPVa+R~0AJ+dAi
z6tngqt7}-hoPOV62{!q6cVwf$U|L7TE<xr-QGBZWUbiq$|L39;UJ72Fe#mXtj0tEh
zMq-Oyw4r@Ke>fv=D?@c+`Kwzjs)JrVFX09_Nif(oXY~1=9@NDGJ9<cZTPHuyhu2d%
z-WPtml45pWf3Iw~Gb6H_3s{!RUfww#7}ywkj@sf}LLJG>eX*3EeJ<tA+W2`9-C3xe
zs{v|tC!)(o$L{6kdHYpQE*34HzlK>VTvL~O9XsHwbcwoHJxiUfs5r6b+@5P@A1~8~
zvpO~R`cKXFY+Zlm#IMiqxV$WtKML18`d$aqBS#!<bM2|H?YM)5sQdva{R2eq6*@C>
zdJrUV=)iYr;R5Rso!L6eY!P+JB#>!YNl^;Vo!mWG=mth0I^+{KbeP}hlb$+vc(3t!
zhbCB5L*GM=nu*#ZI=3_%|66@W2>4Skz5_tBvw=<vWEvEPH}9F)YxQj1$Wpvsqq>7)
z7S9x+*<QSBSiSQ+DgCB@mv**oHarfo`IZV$zfX&Z4|zH!PTrzY2+^L_hp!-ga^e*m
z-kTm@T<qz=zm9e01q1jErn~X@)Q~+^68rhg&U{W#)(z~%YD=5lHfxHk3rwm{b}p~d
zimidQ$%%*(=TfHC^25A|zI`hVWB|@*(bfRts1GVDwMQKAsPJ59l;wevgZ*9zPpbOR
z5fM*|KsVMJ{C~lORl<q+zYeAU49&l4Eo^fdCM<NO)=rP6GdyAGF#o?dTUh89j;3&-
zt(q#d>zelPH^Yg!w1R1%-#!KNWHwj$8Rqw-2he7H>m9!6ca^pc%G`2aE9Y3E1KJGK
z-x0AnR8JC;3`c+&kC74K<R9iEa*SEM1ItsInQzKj?oVHztG`9)sITNvN;Y9bLla%A
zV%MAV3VEjwi0QFMa;uva7m%AA+o+*o``ZVO&<jB{)$@B#4l=3)U(UMkNFO`oO5F$Y
z=&SD3dBpfH&S8bRRC;VIvdu7`e;%9=cFtcM<{E7xe9_fu?dYQ|vKC{q3}*4Z<x5pm
z*IBHEs)RRCPEIjv5tLT!BvM*X&C=?T8%o`A#+%B6d~ak=5)4B*w_un+Zy91FGC?NI
zY!G({HCz@;(QIp8fH}@&rI$&c|BTtjq&5eOzQ575;Br6G`!sbZ><x8)Yv{Sx_t@>)
z(;FWH=HsjoL)PnHG|s?2ETr>CWSu^fI6IE|Ca1eXFH*Ot`&HiAeIj4%xw}VKYuj%%
zeH-J|8ha-$!tfXnSDM)t9)b>=y$AzB$4F&w42IY6XePVOy|N@dn!@>>+ks+6CzjAy
z(_I~0XMG&P?as{t(rpdKuX_l4*l+a^5V_R`=TwEgu+nf*r}Pc-mpD91#aAJWgKQon
zeoE?4EI2NMMPbAP-6Rv&0RWQ`9j{0MyQ$Yp0j$s4&U8Q{&%`h-v7Hobo>Ye7)gSA`
zyl+SrBS}S-0*Pt1R)`{|4k$BFx9*g)m_<QaA@!ZD5a$zcPe4TUQIWfVc%F)2m(4^L
ziMYH-l*O%RFO;S3fJezf<)wav4k;Cg3)0H1)^ObLR{DDF(Zk5Kv%N<MlEwjmxVn5)
zh}ZEs!wym+wfx|at!HfXIeEO%15(LQLwSnpfb}x+2I<<k)Ri%{ao@D_ko#lW=3XSB
zsx^7Rf-jge;UN<qHQ`;+bdiNq6LvM7ku!@TI6MEbD4L4TnH5p(;B<?HD=bWLYRLTe
z3JXt|aG=7wqQ5VSrYkI*nqQujQ){5V?SQN+v`JG%whTb(PtBPLWpc~8Fw3CvcESVQ
z+4|Py^R758TZA#PHzjo6rjA?)NE9W7!cn<-yOXZ}ikt|Ce0+k?K4$fH>o7V#TA9Aw
zpSC_5N-kTD$1C=UFrlHfPUW%dkLH)Q2x+m0vMbAC!f1*1g-(>vFh*JbAx2mj#k1Gb
z8W~jx=9}KMrwtwG>xZsnG3ewrQRj*?$4x^WU$<5qYNZp*2y~Bsb=?fH8iF*J2)LST
z%Qq8B*4GwC`?e25Yb63(3MZVYIclMxdUBX?VynGs3d4;P-R`HASXg@`)d4ToPz|}O
zn^h%iB$EiEeA0FUtskn#$yTwwi7%I{B7!*sCL-U8+a<kiF&E}u-hV7F>}bdf{;9a&
z@W90(L6^&0l+Kpk$%5FEVt|_RQ(OBHAR1W(0XOT9EJi&#hk#zMD5`HJwiV8UHZ+`C
z|KN1!$(U!q-H!Fpgos3nwJSPrHL~eixBLbrhWN|Y7&$^cCpUnuJHD2s+n=M4iXm=f
zCix)9XEz_n25ww>19irxGlBQJ$ka<^u^MBMD196dqQMm3#R?vU$-K6q?gIo3nK$2*
z4k2SBXHmiUC$di)EFRzP)$S1cYXOkgI3O@YGKvIPob8Aly!0>tjW*%&YxEHp<O2X`
zq8`2<OAT43Me3~`xW+<SK6?aF;xBgKn`RFwAZwBqK%vlLE!x;eqn(@X@2NvDS564{
zl<`JkVVU}a6kT^lD$n9s0tX66MZQIV9{N{pu8ofTDRRB*VPOTPMJvqV(spHFgXlwH
z1@pFgt5C9q<4Q+L8jzkv-EhXbG~E`8#9E!YQ6FP+{$^zDtQE{P2U?OePn43;_Jg$&
z*A#8!epZ)NW5dtyv<1-zIoL{K(cCW?EdS}T|0RqOZn4u-<;+M4&y#R-g;%yPx9R2z
zPoC5J+P`CjEzi`}>6I-Ujj%+R`Ajat0H-m+Jil<5oR&EK8SbwYQ!%-^zFhv<W2tr+
zs)s!~mBm}SO?ezTL0I+Kqx-Z+tLp3nGahxOJkHXY^2nX?Xa{?=3^ShgXtX|C_wOEO
z{pHc<Pme~4c7?MHLc>g8k0xPZ2CzrV&mI{!?Tn^8>R!phAQyW~ab$!#yn;E3?&dqZ
z$nUz@iZ}T<+xxoOP#=H(!;kiFa|SDPWPYHE%?eLntjlh!%4%kQw*XTh@LtwimyTs;
z6oJ<z2V4b~_cr4@5*90{u)=WitkKCzvWa|qCyHm)Q?)Yf`O4pxD{mh1-E-C1<75-0
zYshIH=wI;ycNh<5o6egfQWyX?nnHgsv&%9x9qP}2z(U?XnexDK$$+Bual5`-bR)k#
zUWWB^hiFdWP7%Fpql%d<ne&={!&Tm{0STLCA6D-x4bB1VdT?}V<qmd7Cn{j2pBrD0
zl93UBM>c{J0K0r6DaO!Iw!sGhaf)7>u`X8;P?>=~@kQ>$4&1pFFR{hy--tLX!bXQT
zTJwQ=eRsKU>$%g#%^`sdsi3<<u6xi*%oDr}!;bd7S=)_NA(%pNOST3eu)zT|n!|{f
z6LR7P6v@o_ngSe3tC4l%i7GdMZqR)C5e4JR97f>d5FL0M@>f|~xFpRG(&ED#1;}O$
z6{76@wAZ7;8=(<2?Sn-}0Xq%KMC&i|0-{+d8YY3r>Z&gkg=qHUop<c+#IYQuLX*XB
z`_@=do1+!Wg4{GiXftL!RO0yVm;!JA^H*dPYrlH9CT3|V5@D|dqR2G0Mhm>E{~=<n
zL1T)1|5=d7PxmO2k69S`s+CLY^m7y?4LQY~i21d9nrKiZA8~je8u7o6lrtn@H8Zyq
zxVg@Zlz(6M{QaErkLEgaNP*2xb=Ln($=W|t@;__q7k1XaNdCEsJybdLnPfQ}ktbl1
z#~S3e3#Uka=q5bSTLDMp*V7~&_7N=a{98mie~w6AJ|RKq0F$%{V-P+^Bz-y}34}i*
z()llv^gl_`6RGg%7#d~<lQatpySS>*nV_$aF2v`XUv!`kA8@{uKW&l;yy7CW%n1yq
zGaF!*Hg(%P>|Y_x+&n!LSuyF1BzCwW&|;^=jR%ewbY!n{I4C;?9n45y3~?IIdOnkb
zIRGi1|Dj&8C;B==Q|b&ffTF~uwz(e4(aB;enuJcep0ljNg<E_^3Uo$M=bIZ?ZbvSu
z$V1XwVtRI8ue^J7)v9dM#Q|P<2z_7a^1X9}IW6>seKqs8c!QArgmNJFmzIDmy#p&C
zi2XXOEA!LJ+f3(3qXquq)e?bw%gX+o%{{X%zQRUrJN|9X)%!Wz;DY6+o0djVu<M+t
zVWfLQNfrpCq2IM%H3*Yj-4?GT+6JUYOrafHqouOYB!Nv>5}$dYtKP=OLnXb6#9+3E
zuT0@NeZnYpXL<SmE>CtRP*Gt?rI-f3r_SwbTbL8)!Ih6$?fl0$V&w!~WS%E4F*o<}
zG(|FK%an=wTs}#Ji_>%<jIPp$<!D5^T+YV$^FndfG!~qb8W|cv-=F~usZ8mUY_G_n
z&Vo0L-2jd<@D<wAlRN=nOnf1hyAdN^i;;ChBcSmI%W{S>^NfHX3mO<LF;%o%pqtiB
z$TRic^^GFz`0gr{V;*E9XlN)J#Uf4&H<WA$c&j9``lD{+Rxad^)k@DgH4uq}a7B&D
ze1IWZ{j)n7Ek8S;*zmRBEU+$n<@2m+i=lftSYmv%xUn$J7E#lr6Kr?rSip#~B=yeR
zOcVkQ9ASJ(hn=~Vz&fW+n~$cpuTwx_ub-E(GwpR|+XDyVl+M4`*s7@-3n%ULr4u#^
zd;Op0N_g!9=O@f`dbFG=vtO8>GdrKdmCWhUa_9~8d9-Xu`3&?!JK4;mKdT8e)Y+%E
z$*0~2kl#t`d#}um2@6OPkr^ofN8%W(w^Ix&-Jo*LwlLnD?^J3RW<tQK#E!&l`iAW$
z)oIHKg!BU<LN;KM7P@)^Hq?Jxn~Nhg8$%Z6`4{$u?TH|ligYcqX+p(WA-J2+yJ|pa
zjzSqco|R47?`UOgY!!G{&vX?Q&QC)l7K@IQvr?j}v~`_1UIyMydE99I{Tap-UUs&0
zVkD4`u6rI?Bp&EPk$<IS4#`=0MBK_+(@h%d3Zq=1pFfzYV1bFM5Yo%1J%Y*87LLv-
zeRn62gw!OziL@0+>j50`r{W^Y;mbJG<67TntxR!~n@3LStHSi+q%NBMq4vF)jMMQ?
z+BOSLw}!H;xTFEi=~<7B;#|6oeNw!Ym~2CP?D=F1&pCRQpxb%5<mu&d;{y-J+j7yI
z_wz|Sr?al>zSlaZ{i^v*M7rxU*qgsNIq%`wYvXMXb$a+N!7-l8?n#HWf!w@>c_$r)
z<e6hOjck%`Lsu?H*Tia=oWqOPUM$Y`n)sNiLLH0K8*S7I0ua=G&mfsB{nD!-zsjVE
zhx(H&sx<2%f%efxPSE?9gvJ>6$xCN9r4DE5zgZB7SXA#HuSLwdCXI&wf68Wd;s@&C
z9~hoetRPUxVilSb7lbe*S8F=(mRI=*giaq5iT=s<jk!5Nw^*2GQrlpGorU(@4H;(-
z$U(GQ!vh*Su1`iI^M36t>42DBrJpoUf!&;sch&%_&t6x65&gW#rIyh@$W21$;Mel>
zeC#?=C)Zpb%;d~(A0@8;b~vIi^Tx0cSoz2ghmCt>rvettk(b05nfVHeQ|ID!Fbi{}
z<~&{hco{uxB}a@ySMzK(##;BUTBYNfI@S`A#9MP9=}RJXM(ETg_OnWu4{Q)l&Y5NG
zbaKLS|Lv4H{R*LWY6m-=pVK4e-%lj)a5;U%g!#iAcA6v{nDB7<e?4N(6x*3rYm)CV
zwUu2;zyp<2t@hZcdamvLiFlXbxKrlOaUrg8bF31Io#WG76WD>@oB2UHATlsfm}H*J
zk!%B2O9(o}=@}vmb4OhaVe2{|c587lwp3(?s?a5=X65Y@+94G>tRwaIj^-7h$f~A5
zh^+%t>yKI|o14Y8#Mzm&86}cWicBqaD;dHo!lGi6?P9xILL`X<jxw_y=?BQPH#8~S
zKtWRvJ1i2}En-`P^Pzk&1Apd<Yl7iA%<LUHmaajvNI73YMCLV#M>@XVPJrTElMueP
zIg&Y~Ahk@PMR37oZgp$!+heXpvS`Wm=t)qIhVi(^*S)+DzEaxRZv9DqIoILsCA(r5
z10`g>*R4yNC_wrZ0WCc32|R|1;ziybA*~L!{g`us2Q6(4wY59AY~aW*4i6IKDB>9@
z5|fT1`7#&A4Zq6xs>tH^dCa42=Wzw1by!P*98c2c=j!Gojz1*oyKgENe~`bpo2}=%
z@WRNF^$$z}x-XqOy=CKf!APR{meX#f277agt;+TbG6<WyZao-4w6_x}VP65UiOuhI
z^?bCgJZIAF?~U&K#$uYC$|2s#Wt2(%)-8Lf(esby+h+Xc@Ttc4@mEjr#SdexA>T(B
zYBN;h#wzm^c+ag_)~#r>3hYO5I?xkxe-ECk{%ot}_}%)1MgW=S5eLb0r~^M?k>U%!
z-`FzC!?lD-hG3A&Y-~gt&MD9$aA+t|$sPJYdkh&TH42f=`b7ZI>B3tQ6C&Rg6bY1G
ziekK_yO<a7=^_>9SD;x$2xyZ&vuCNCy`7-*jr&z-hWpr@UtE3FG&@UXea4GpMe@B8
zzVvoY2KoLlYV)#zs6Dp^?*a80@?Yec4c)(v?fJRU?rtSR8pEjbXe;U{IdZj3fKAWQ
z|B{7l)jwYtz~T4zg)EG7dfuEGE&qBV1g9p9>c5U9cV5oa+Nn(a_hvi&$N&!AX`laX
zt^M+;b0#&BSNNY_7?j(dpik9Wrwl?UozjwG%iDu~@QM&O8sfMw;aFR=EB5f2swJ+?
z0FajG;$W!5)zO!PuvoS-kpoArC`xyMl6Ba6Vv4OjOX*b#peu@**<4PbFfX>;0aeOw
zZFI59&Wb)7T2OA&kkBr2tTHUx=buKwlrj??PK(WGSvrSY^0Y!kDap+9rYD`lLEaLA
zRVb_rh3V{!lbMl95graO%2WwIju%l^Vq=(f)wM1j;R|lIL-Q+XT_9+PTH=!p_=0E>
z$TjtrDG<1C=+=qqXtA~jzt%@SG}NSQ=jw%=Oqr0eC()R%=NWh_fM;3-?uO3D-J4_A
zaO`}`c!Y~JNK5wvYP<vjeBClMLmMr8pvHa8>h`MBU4+qP>dGlMN79jc>rc|8%FFym
z;qtvF8hMrRn68}{eO6t$cN=9uWiKxO$kt@)Rk}n?j*ZC2uBq)&OMgsa`x20IcLoga
zd9TndzlmJ1V3{@@DB09yw%+JC@`}^KW-C>DO8D7)6I__CRnHRt9m`HaMJ%De6NUF=
z#Yd)+XoTQ|ZPm>7NaA8a`4&N^B=by=pX=-v#AFcxx_|tS0_K<>%Bg-$)lQH3RPBye
zc9QJv9*}kS(pA5{>zF4=Ic<)Iz^5HV`n3>Gw2DkvrobNmBqr$_kN?uSNzY)QgJ`1)
zQX!V~0L$cD$}j?H3VErp^Vxhp%^_M^j}44GP07_m+RF2aN6R{irpyVY;D;se6!v(p
zah7{T+C(_cX595bx!(QvhO6bq6Uah)j~j-VXo5`s4T0AvAu^JD8<3|@_=c&iKGZWg
zX8yl+5``y=0&0$yf(_w}pk4e~i7|%@&<9O9IyisbV3qo7#N4L3i-KWmL{LrBVSQj}
z-{8UppUR&%n~&I<wXUp(y1wrDKc(jM;5n6-pQ|nG5vDXfe$F7Bj?bBb`;T`9Gf4m3
z(Ejxd=pXlz=?(2aj+$S7&YU@!RF#J(PNimGdWY{+uXUO&b@DN4Nofo=b?v<@C(Q9^
zR3^OHe?N{aW8a<Er?=det!uI)(Q$J!Z&U2*3`ZK<B|RgNY2r{}E{-8_QGt;zN;V}?
zl9g<NP`g&=iyR%;#pLFLLT|E(j+Ll&y^yhA7n5*WVr+62r`|@|Cp01{T{xMiMA*u+
z4J~<EgJQNR*3+m|2q7$y_gvBBN`hSrjYFf!u%-tLJREsk9w0+^Dbg)n*Uy!X`ILZM
zbcPnIM96b71he^#NbCg`lML|>Wr?#uv4L%SpL2x14rh*8H-so9W&|<iXD2!llb3TX
zd=Ijq<<E#ZuQcsU-jgv2#e8pCk#A{)yF1;(%~bAjIMayX&gjzmp|k3jv4<@7^vKnu
zxMTJ5c<#O1XH$CG?`=~YeSF^aXM!2&IZ8<~wqyoW2gQZyFkzuwW>30NrAzFq%s`O}
zvrm-X$^<%y28WiFfbsVe#z0MkXCtsmF2m<+8cPlhOwYqO^8uWG2zJ4D+e=<!eA?ZI
z#(W(IFRWoYl8xxnYJToh;i%qV;o$t?y0pOMQ21pYH2DphW(IZJKr4K5FlyPX0pG9l
zfe&vx<N$7H&xjJydFhmVsb?CWpJoPn0e-@E=|k%|0{QA_{a!h*20}9dCdrwslp=@E
z6g^5ZiY_vbcBTnxvngrgNKj*Z7p-&;FHw@78^hN{3OPu;^|w$(4b~@YI5f_!BV0~G
zrUl9TjO5rV;Wx?PBIN$!6N9wc_d#{#%zG+}Xdj?l8NKD9+p4M`#9G9TPsX<VII_oa
z>l#XV(dv0A#(b0L_h*XC)xz_}Rb^Wd_*KY5>Rmd!^`Wh~#BC#4ODc$IO$`TcN!B)0
f6M0qnhX+0#kKWc|Fs!V1>WwikOD%w-bKd_0e6@DQ

diff --git a/public/loading_error.png b/public/loading_error.png
index 7030b89e97d1ef734ec41a9caf8190a3fbda50b7..e50039352e2f3cc890bff78feef5039d464c1d0a 100644
GIT binary patch
delta 1056
zcmV+*1mF9y34{rdB!6XTLqkw$V`BgSc-oZFGr(109LMqRb8fbc>m|D_+cplaZEk7I
zwmH`r$83*HE!mxVGGF|r&tv>S*%j6!sTw^Y5=|$kjv8v6J!h`9_9F!KXa@9C^;CSw
z<jLdtZ(iO+09@-P_o8}fXn0aO2rDpHk0;Y076bir>A3VJpnrw#R}B!yfUe2U7X)!z
z_G@4LSlTCzf^>5F)M22s0Ia@Wto>r$pNxRg7jPPpr~%6CuQsI1(vfgR2LJ@nz!RM@
zP4)vF7{wSSFc~Wv83Ke!(~SU8tfZLAD2D!LeLK0H$z;$76F|qxaAHJI<$91c`15a5
z-afqn5DkVx&3}ic`OF2i*TRQYrulBSX@1xPmiurj`g4737Yuv>mQ_FdoI9cMQaFC@
zXP>qaPON}7cj9VN1;7F*UN1a72o2{z^UF|gp8U5T<Ltc!)5|da0&Ly_ZXY!Mv=|)z
z=0FZNd}?6f2LL<6a*_8`toHx_010qNS#tmYE+YT{E|aVQQ-6C&L_t(|+U(Q;W&=SK
zfZ<eW0X;&FlA|>@=~Z%+9HD?<WsCN+!Ty5^U><l$ekSuRdzdq4&YU@O=FIu$yszdy
z%0AZBjI!gFod?-z%PxcLbIY!SY~AL&tCxrD*4gVrwhY+<F4zhVTfhZd!C?!yU<){G
z0T*lqhb`cOt$*OK1zfNd9JYW<wuZyjaM%j2*}yfMNw$Cswt~YJaLLwi*cuL7!!;YY
zW;4asaLop;*}yeh!(nT<Vgna!0T*nh*%}U8!!;YYW@|WX4cBbonhjjAeF^@SV1sNq
z@3P&UZMp2SEpB4D?y}vuSioWP?P}SDbB1ST0Vng1Pk-Ce*%^#wKf`R<&+Z<YB{Iu0
z%vLhDJk%qkdK`lMdR-3*;%9ke4s&>9{<^C~1_DfE;M9?Ub9Q9l+@vxRTp|M}jtrcm
zBLn9mm7%~E88~c_fx{LVIBb!D!xkAhY>|P(78y8f`<d_Ge9X+-7F%YkH*sg+utf$A
zTV&v{MSlhkTV&v{jk3k3$iQKX%wX#b9Ja{7ot~39^l4Z4Y0nM_00v?Z2Ksj$3nw5*
z==LoH7zm74J{Ej>|B>LggrD4>j6Xns&afO{)xhF{H3&=9S2QeqJRf?D@U-Ef#IuV>
z+%16{47V$8e%wmAF>{;erqL}Z8d|i+Xtve5OMei6Sb-r0Baa3sjAIz?Fe+m3#2AaA
z7$dd@c8vcB6A(=x=s;|O5Jr#=03yIm0Iy(h4%Qsg5%dFuh(HqYCc{!09D-cL!U&lW
zSt9^PoX&7w2Is|r*AQN6ctt{m3)DAI2Fc*OsPfv&OEj<Kyx{Y?(91`tGNBlCt+m!#
aYZV0wmo3J6{S6EN0000<MNUMnLSTaFiR&8x

delta 1090
zcmZqS+{igWrM@83**PFHIhlc>;?~rQmLANGBF8@dSL;&hS|Fw*7VV<V{HS%Qn<9sx
zQ_qAIt<_JO-l)A%yRk$hhgnRnH;`L8J6AV{)$s$v#x0wIwoKgcPQb*m<H72>Ju}VE
z)G*KU3NwB)EzsahlPD+KlZYDEylS^a&2kAr7vKEJv5;AmSzCWciSf>lqmh5s@A}fR
zwo!%IIO?9(jyU#ZW?YpIV;A^)Ywvm;oN%N_|HZGkFIQ*9w*()m5ZJb8qUH74hB;Xq
zZYAjEO0H99n4dRe*XxM0y9zvSoDeh3Qe~XWSzPJ)rO~lTXM=}?<WwceO(GvAA9OjU
z<}|@!@=wMiH8Yg7B8@Um)SsDr*un9P^1lb=+scY+co<e1GpzOR`)tONdpkha`rPw{
zk3;$o{N@l(tF;Snd|Ccs+H2eUj3xPpZl>;C{_em}u`l*dM7<dga92$7tgvldXYnP@
z`S_|6Z`0>Kw(gjwP{LaM+h9)9yRB;P^YYKUU2l8;XDy@k;i8F>Y8%cnFfedVp2iqg
zKiAX6F{I+w+nc9zn;j%v6Qey6X9{T?T{_e6QkS<UXJl35A9sy|>BSE{&Xm2&niSLd
zV>9pP9bcee&Y6hlIQOmRtDdhg3!KfLWuDdFd~5El?~ZFvoUeNw^<-zfbeGN{wmBOZ
z({m1_nl(0`eYlE+&+I`9uSGhu-e$qXdggOC8&2o&g{u~9(3HtJU@2WNvzJ4<;22v>
zTJa901FAqhz7G<FEpBvdU=+Uz)Z4Dj1T;=P=Kv>2sS8Bjc!w6q?1a-`Q{uO_9pt+m
zKl`A}&A8;Xi61(0P6r%SIPjM_rrWWh`u{cwmL1<s-|;jo-uActxH;SJtv`(nZ>(Q?
zhQ}$lI^PY*&)pz%Eo*XR(ZxSPdb3}ZaBQkto3mTt&&;Y7g@$@^S$|&dnG(RvG$VkS
zZyR|yFWK9)?*GC5jrGUwmTieDR6l3>Ab}ed>xHk^{WB%|KyRG(jUwJ1EBAbB@XdZJ
z{&o5Tg>$d-r|tjxR$k?Q#IN={`;Gpwepz4q`|QDd)4Io>ZZEhW@>lGw`JZRU+wFV)
zTztmwRsZIf^PWnt2f{q_*Zp{Me0h+aVfNf-KbKrwUcbO@;n$ZN{kP3t{%)VZhtyX6
zpqi7#S&UCl8^+)H8T9eaq07@Z?$h|D`fVlaZvFqY#s{~n`Q?}JoO?Fgz~x4RvDy8+
zPiM8;vu{L5&pB)U7Z^$EIlK10oV}Fq`j&~-7PIq>gcF(lZlqY>HGeL<?&E`m0yFz7
z3a6g2>($jfZg=D}zg`nyYB5`WkznFvW;<)Wk{vt$Y81DuoiFqqlEmhm)#sY7d#umu
StN}31GI+ZBxvX<aXaWHKstPIq

diff --git a/public/logo.png b/public/logo.png
index b4b80fd88215021b782d36447a872e8c873827aa..f58b0d57b21e3e918fc17034eff3849a47d280a5 100644
GIT binary patch
delta 3212
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

delta 3258
zcmV;r3`O&}8Ri*~On-$*L_t(|+U=WrbX3(9#`k^AknjjE5eP+mgBDbzuxzU$6e|{K
zE0h+r1<?fMk<6WhhoF{%E%j03s^X)HEfl4QTF_EJD{4{jNd-hv5D_W{kOV?PGMSnC
z>s@Ef>Pj>BkPse8*Yfu#>vHqmbNAi*+xwi6ulbrLfor&SB!3hMxz_)c<Vm&&CZ-s9
zj%&F_lb0Md^TJ|?lxHP|^8;FlbTjiquF;fN*>vrnIwI9=<5%%F02anC^L*(OLlMh0
znxJ^sj5;^k;=^~DM*>nD=6CcFi5RZ!I<D2EB)jI+koeG(LUvJ`byeL&F*WR3uGuss
zTT`tLrU+f*w|}yZbXGEv(?sY_w#X2BisL$sEZw!H*jFhDjN(Po*}|=K7V$z%;tiH_
zwfIbP3jA1aymhwkvBZa~Sj1jxvzIwsB0k<Io~Imu&v`7a{_R(e8*<H)pEbhMZ1G8+
z!9sSE&U5sknFts10yQ7W<8$u;+KbFJ-LM-znUbx7(0}EINO2}EAL3D)^^Bs0NJU%j
zVFy9HpBN}|qY*XTlT(gdEA?`Pp=_jz+Qb;cDI%EUv5jhiILP$sb~S?SM2CwTb{+Ad
zD}RNwbx!c?>P!rk2wz3V^PDC=oW<KbMjLfs$8}Da(@?jT_uDXsL!|Q}my1tvXC5a`
z5DDH+UVkG#e1m%_0bmbP{tyzGX!z3Y<1JcA#vsh_0LcjspybdJ7c`PfnWP>&T=jGI
zQ<FXP#}N@DsyyTIvPaIfmWbD!zO14)adz<lj>y3l4B$P2NV1njv=$+Y{;VX3Khu*8
zksIv-+cl0kHy7F?Z4sQ3^SuRlq_d1(qF^x3uz!yA-e$_FNh!~9vG{Ni3yA?9K^*q(
zFX@IQGR7`!cy@7(0xMrR4Z4v}h33_}WDv%|kQC2_SO6(1c%NUSKEPZmsf%K7Ofp-1
z3PVxTH5!nc^Hr45k#W3%p7*(r8Mx#yGCq{SoFkGL4vKe}L3<^60&h@XR`B!EERj>p
zsDE`-k?vYi`x;AxX8e%9Q9nH5#3<((k;=Y!e97IMqw467d4;1RmUuF8B^fF)hU;5S
z>;hYS7|28H;b_?_LTB#aN8-cxm`fQA;az%Sh`8bUgoZQC6dz9Y9%U;H;Q&{N;D}Uq
zXCB*W7>gK6oBFP^bGIcz26_C8hEmO35r0~GdEQ4fjLnS0mz-$BD8hA0o~hQ^yNNX%
z<X9-?5niF3hEPT!=ZX(GY~*!X94RzH(``{s!&^-m$4)gK4ZvIcSx0OUdh-gEz<XNR
zu2bOLX{tmwhhiF!H4I4@BITVZVjn2pp+#_i63#coCzi`@8jos*ks(5uTuK16vVWBc
z4T)g$EncRv@TlO=B1-ZltVN-ht&FJna0aVrEUH+-#UeQLU=dz=?oO9&<(OD>5TThj
zlRYFjxm2=+ABYc~$Rn6_>9WHjoXN|4Kha9$@CD50b50fsHZU7s5?#2S4Vv)T=1n7%
zYe-EZAuN6hRCx1Z7m5#qSi)gWJbzzsA7?Aaa}BQ%%$GbtPf^sC?GORQRwAe*pUC4i
z;+#0XVhL)*!*?j6N>g%{GhBQ)$FtI9+l+@49&4Dov89N2HWA+C#PBRXBTIzyxsOi>
zX0>-iqMZn5b1w_XOqXqPH8qJRU-HySa3Qlf$noXlST3DJXhj|y2xb@4=zk_s<uHyn
zfeq=OWJnDYYqOI-(O;y>iVx!PR0DPF?BEVA5+BC0k}^$Z`E9JP_%Mv6l<V@gB?j3X
zpf(A1vB0xMl3B?sS<A6A*Xu<{gmb-rvR@lM-}Ev?%DV6zUmdaBTx-#qC7J~F2{~R!
zq~z4tgkviE>#7FEnybd4h<{?OQ5`{R6+ScAN3xD8ImyDHD-RM(1#fxRitI4RW=?|=
z<94n?S$%IdpHZy|jogE$Bn%P8v7PF=i~E1uOZu^%VB$PQ`_xDJ&QY49M`<fQT+D|g
z31&VWQ!}cx+@&e*(Xa?T_zlg}Ea?_)`?QDYbP%89^=u_U-BhxIet+V_H(5v(!Mws1
zs67ZCK*y70$p4ZbBE%fvV+LWWnbSNDYS!i7RYUhR6CZx1uF+G?&Q$Z;hS{3HNU)P!
z@xdla1wkY!Cl^O*lOHCNzk}k5c&~jS5iVl|`v~Tb^rNK+r?ZT&G?KSdBtCTD$C}sf
zv6H!U5-Dq)9H{A7J%5T>yt|8tmx&QEYOi+l8a}&(S#(cLt=}R>5Qn&*3&e*3tV$bT
z?&cBBQch!FYB{`s(*86(MHU-e&ePg%@>$g6wycjgJuOJ`95QPC*Nu#%llX8in>Eg)
zgfXe<w96)9peXVF$siF-F62(FoHg7aKJjytGdQ66D&FyOQh(#S@l^5wErYC7A&MGn
zvowC4=U>VN+|6c!S;<Xw67jk+iw`)+i;NRPHLkbu0l~bAOMB%s3bezFx4A8Oy2zo9
zjAxB50ft5R7U{&9Pk-_8`Xv`oP7pDcrYwG6#?VoO=82oNa<(&zF5<&z?O1I;chO6E
z(4ol{Bta+JR)5|4p1>IVm^t1>A{!h=^SmZp_HsXJtBw#OSOl7@9_D*$5r!~7AT&JS
zAoEj0{VRBwFYBn1xfTw?*hVlLl6R?+o6Sh=tKY)?M0lDn3Fa9F(n5vLU)Z7D$r(aB
z5!&*H8d~(S3oY@X7xz%9$*-?5LVP%lUuzO$j56&2d4DWzM5<aalPv`Ec~wp_TV<bH
z*n|gl%XUOIWidpgJTq|#Piec6zw>Ps2p98v>PrceI758M<vl7j(R_PqY&J$azWXRB
zli1#Ps<>NxaJYugH1#URBL}iX2-BM#)Xh>(#T2Q&fLDoWL*qOw5l-PH4&f2RYn&w#
zF>9BbjDM7E{g6@054YxaN(tsu#$&6;n|MU&Yq(N;_IKhzZTM`84<Bx+T6(9pCV#?c
zT8ZSDZm4#-Y0f_&#hZyf;^Vbpq1G;Kr7xy>yy=>PGFUxY1`{}>oqoI6s_5kMh1QDA
zB1=?6xK@xSSx!x6(gj;Nla1P!`$+1V9=ut@gMTL}Wx-`?+k`%vT^f%vmZ_2x<|3AB
zUH%HxprOEY(@$8bAPI9%?Jt{2s!cT*%g5UN^4TdTJ%Y9BnhF-tTZHi59xNu9a$e#x
zb?5VVNaOmdc$*>OGs|*q%`SW-jL8tv*?j0yvP7N@@gT(-le&)|(OQX^$$HeEBAe-;
zk$<zDo5Y9CjHOcJ9=9<|6qAp%iS0V-Ho-i^0Gf-?ho`iqWC?>~EkzOQ${03i^3Z1P
z^;)U1*+^Dt%hto3Cvv_q*{b6hm}?9*X~m;jk5H5v5nRo3O{7;OAFu99Ha}#wwljK&
z9^%9Id4WWrktp>Rq0+%jJ5nPww6Y_%2!E$Ci}l(yn84{Ob4<|=9zJ84=Czl5%aX%W
zz3QEs7P^9!sPO4y7Fe!b&z-S6bs@dEU7L(vW+Is?b41xn{aM9z2il4x&f_jN5zJb0
z=qfV6bgii6nn!gI;Brd@yZRFENo`NFl>Vt6{9&r7o1GN!4H0ZFhxhO_Q`cFXC4W9Q
zJHBM2A!it@^G%UtTZU<~=`J3pmk3!5W?>y&`>zl8PL0G~&^V14zvogMk?ZuUTsINJ
zHK&9`Flf(DG*K95H@_1f+ErY^M>?Zg-kl7!v9f~w+8(AKEkt@)lbz#m>NRTLWQ$<Y
zo+8RMxpi}Dn9zl3X>MX8L&;KuhJRc63Qyx~ZdO**m}p0j=P4a^?mEP|JfSTeYw0V3
z!<jXVY$-P!Xjf_|qq<G&Y4YiSDH2i9e7sLmW=0IP>I2wAFme8rY%V^0n~lI<=qx^*
zshwMUtfhkrNXrdtB_I27u865@(NuO4OfmViRyn;3rs~M&qT@{!TI$Hh34cBa?K)9M
zd}z;O#PBq2*C1>RLQK~9^aKaU#ZY$)=_DWTaB*gvse`wxHL~C_M(~y<Fm|z^EL)jS
z%XLoTN%@EsbtYIMgc!@~B&k1#Sj?s3bB7(V8sX5hYtOJn<?Cb-Tc{6*S;s9RKE~vb
z+j!@+Bi3C?y7wK5_>?2FhJPt^6EV#@EZ24oX*^WovTjq-8N`$5DCM`Px$Q5Vrt%vE
z!?g;n(@j+eN3$wz6nuzzs6J<yS*S^LjVIkKa8iTZ(bOEVJ<TB6iS)M$?I!s98fCnk
zTa<KqP(&rLgB&`D%FPi?*=`!bji`OSt?KA^8A*3cF(#!B>o;+tW;4WTV_;y3+-OJb
sXcLsIKR+Ligk8rqzy7J^*E9kC1O0#Q?JX5&(EtDd07*qoM6N<$f<u8bL;wH)

diff --git a/public/user_avatar.png b/public/user_avatar.png
index 3ec064006a33ad7202bc919cdb07bebbcf9203bf..b906805d0148124b98fee08d8cd0ff079e87c847 100644
GIT binary patch
delta 2292
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
ATmS$7

delta 2501
zcmV;$2|D)d7~dMOMgwjN14%?dRCwC#-A!+lRTziy`A;iFU5kyaC>uAe3uM8fHO5#Z
zwD>}mt<Zr0F8Y#CY&AlJ71jtUzSKk_5!+&47`0+eESf;1ol!z0meS$|YBjc<&rstB
zASm=c=bk>-?-NY!YckJyX3m@^1(PuhCX+x67k>Z%0Kl@KRFafPnps?<%wTG9F11Rj
zt}E{@{_A=LZ-r%OswX$FF|C_OS5)SDdYRHPa&7vlI^9}db=B1=rnMYwZs<tsKTEgg
zN|{-4>)%kP|E;>Ap2-!f+5HD}n^r&gB=ajmtu4*E1I_18Gs7bDQ)OCrD7)zdb1Wjy
zR)1<q93XqKD7~a5v!#)F7J;dStd>x=>Tzc3TxLbNmRRj@hPirH+93n4{LEzC+FH{s
z6ZzaY)AgyfO=db@WxgJDy(vSx_b_31X8)A2mG3ZRU*<Yx?x9xZ?8%i01yDQ4r2V)$
zsUW&PV%A=4P%vXm+l4}l0y<t`;_+o}D1WFbzLbqFb4GzRQ9ZK4jDp+2CwyFM6~O{?
zce8G14W9_d6v;tmAIoofMbiB-(~o2CgrXT@gLD+LhZNDnB@~F@FGY2R0^xNjvRyO?
z?c#1lwu&88fsKzSy3Vb12&zU7<meDme_jsc*$*F3rcEw%@Pk`8E9AtFv<PLYR)0=R
zT%$%H+vLXY)Ci+AD>vr*=@G;wIWj<x5Z;h0mnjm!-E!quirD*H&K#wQxdAzIgeKNb
zX5~zlO*Gb8<j&tzu~kwocbYk^z}7A~#2=V#waK9m>0+s0F0paSQjJ`CjWUMn<kEeV
zv9noDv2V&wgPi(>HfBcT)IQo+nSV;lsWi`XvobBW_EX2m4Y~Dts)(dhMP!kemN>nA
za;uMvx{V$=_62?Hj*{X|Jz1WXW1Hw>Vxt_pP9F;;X*rgirI3MV<Qo5PvT&Eg@;zxD
zk!!;gGEgShzM+tTBf13+6I_1YmTTWq$iQm3wvIvuK9g$?P{_cjTzi5-27k`VwQ>p>
zI4sxhr;vfPTuZZE3gF`%Eabo~8*buWx%M3kIRlHlJWh&qW;=xptdwg_6k-zv*L1Gw
zL?=4YiH_p@v%{AZvQQz%syURvgm`hulapg(^fB?C9Q&F+CQf-ie&iH=Y*fpwHPkUu
zCAW@K$H+0c^$B&1^rq!hmVZmSnRYpKfi`Ax+@<pf7dIMdW2c%MHXiN3r+Wg_%cYBy
zv2;NWeLxpe2j$TFbV=R=c1!4D>%814ql&R}^Kxc>jw;q3<<!9BIU#2*)5P9(x$-<k
z0yrvHo})+zTX=R$@-)uNjqZASgs~tu)>0#o-XS^h7TctP8I}`Ww0{UDvrjI(P@qLP
zUrow^JiDZV%CTW4dB)onUE4Sv!rJ??B0Jkkh0yjWvL9#=-XDr;h5`}H-lK@taj;Mn
zr-u~H=wr-3j={Vlnf#vV$MPbJxC9zg6fZIPn06|H7UmvRVZDOe#@HjvG%2th8Kxdv
zVL?Hyr?~@#G6l4gpMTJO7-QX@K%X8~5cz3l?Z@Dd0vP3cI9JY%$lRfm%=sVo?&T$_
zFpT5)`B_9OYa>{UZfd2WwU+4OfV601iI9~MQIrWYBQDIG8M~=1(x_F7ZdP8RW?D#@
zhPY9i#EpR)4O~Ud?1DC7Z_z$7=bV}M$oKOn{2n-$m*;&RyMH9B<*^ZF57_7IIeF+E
z$L&_?Z<S|WH;}KLX5OddiG^u;Anny~Ode>Zzuju5Ctk>9<2N~kv)y1gB^RYL+)?y{
z;pcM8Kn3^D{o-&yu88)MrH}NECX}W0X68ou&DSr*%0lrTnw<S8*%8$mm6r68pI^0I
zYS(`&oMnEy&q#fk4HanB5>wN|WVRkW>$u!Lpnn=DY<$2^`Fb)qG+VKp&|f5iho*<J
zD>#ejEtPy+-`*!l*A{=KouY!BpYNLAzH1W`UICL~0~~)056rW&Hfhor)BMtT=&TrH
zo(7%q21y&7Q%>z2N&AesKS9ygfk$R(S(-R=w9HwJt{>*pUP)@C=>F4Zu1I4wN;_*)
zWd8WJ!n?o^>RKXIfnb5$aUq)NjI(3aUNbF`*hpzgu1jp63wOqoBy5@Ek#MM6o=OMH
zJ2$eH&klcsm9e>T<;eL^I8smM`P4P`cJz&MZpW?tH@Zka4`$-AXt(mFI~2ah2VO4K
zeVm_4Deo4J?5<?Rc22aE1e#@yo@gviO+0nrVD(j5r>XoltNT3CUlQn%r52*GS5(Mt
zTes|z<%;H6$m^nwRW<U3i<wG}Z`^P_vrRs-wD^C7nq{Z9YEr(_l;JtQW+zVmYUh4h
ztgPYyj{nYu7E#$M0uu@?D*H2#R^~)A6_IYD(3xs`L4+8vk!TZXlf)1+fvbq7O<FpT
zp#_1I3l*~nYSSVjw1Og-nfn_0OOQF^-1}SxJm-8qFX8!e;5p}aI5(wC-MC{~zuwKf
zy=H$tWvsR5<q;Ko^3nKE%HHV06H0b#Wc#*Mh&Q)e?%kN)yDt@FbbL<JWgPk7Xe!M7
z-2=KVt-brjRHRoYX4GBOv5B>*SgVK4WG?p57gMQdQ@5{I`2r6Q52fNgI5?|xgXGy~
z->mlECU5;PRpZ1aS1SLsdtIu^*hD8P_xXR>RGke+qGqSpq$+LQ61DnrcxS5A^@Ed9
zrGb}H#a3Mt^*Qugs@yNLQJM4SQuUs@B5JaKLGr)cu|BGC^;LTR<M=?-p|iK8_P<(#
z?Wn-JS4#a~_il{hojIWMh0c8zg}Y^5<^Ox@WR$EkDDh$z+EJ`ux9YpNC-+C8et3Ug
z-KA{U7)3gLO53G9z9kBD&pKr<<-oxx&fIZbFKujB6y~7q`Lb5eMNz)LLDS`}Jro6*
zd{)tJY&#ak=zOAQckb#$DZW*+TaQH{KGw2(??(}y9+k3tQ`1p^_A^TM;*Cz^?=~HK
z^J!%7>#t<&&3C&Zci*VktEVD!KWcy2yPqO!BaUAi_<1C9cC&&_oQ#akn4vdvsvY@y
zN55tsiF~~vUo&STTd%3t)R|a8tyn?7dq%0cPuJOJ#Wpq8i9EfhU30HQp2nqX?%K%H
zb<#DrDzY?tSi0s8Z;l+DSFRrqM2>a{*N;t+qeq47$NiC`J;L?lzR1y?!qr*#`+h>W
zehfv9UKg$(J0nM)2<*$z$dPXSi51f_#k^dJj_8Pv=!lN!h%P#!BRZlZI-(;wq9Zz@
zBRZlZI-(;wq9eNKh>qxpj_8Pv=!lN!h>qxpj_8OElQ9e?lW+qC7u4eqz_yoOaL9}w
P00000NkvXXu0mjfQl0Po


From 06ef95dc5fc4635379698cf73bd36d4b370aab69 Mon Sep 17 00:00:00 2001
From: Matt Moore <matthew.moore@jameshall.co.uk>
Date: Tue, 26 Mar 2024 16:30:04 +0000
Subject: [PATCH 085/666] Change to allow override of CA CERT for LDAPS

Using the env LDAP_TLS_CACERTFILE to set a file to use to override
the CA CERT used to verify LDAPS connections. This is to make this
process easier for docker use.
---
 app/Access/LdapService.php | 6 ++++++
 app/Config/services.php    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 9d266763531..56e7aba04f7 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -209,6 +209,12 @@ protected function getConnection()
             $this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
         }
 
+        // Specify CA Cert file for LDAP.
+        // This option works globally and must be set before a connection is created.
+        if ($this->config['tls_cacertfile']) {
+            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTFILE, $this->config['tls_cacertfile']);
+        }
+
         $ldapHost = $this->parseServerString($this->config['server']);
         $ldapConnection = $this->ldap->connect($ldapHost);
 
diff --git a/app/Config/services.php b/app/Config/services.php
index a035f105695..a407b5dc876 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -133,6 +133,7 @@
         'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
         'remove_from_groups'     => env('LDAP_REMOVE_FROM_GROUPS', false),
         'tls_insecure'           => env('LDAP_TLS_INSECURE', false),
+        'tls_cacertfile'   	     => env('LDAP_TLS_CACERTFILE', false),
         'start_tls'              => env('LDAP_START_TLS', false),
         'thumbnail_attribute'    => env('LDAP_THUMBNAIL_ATTRIBUTE', null),
     ],

From 18269f2c6036b346d100fd2b82dab600f4ba362f Mon Sep 17 00:00:00 2001
From: Matt Moore <matthew.moore@jameshall.co.uk>
Date: Wed, 27 Mar 2024 13:17:25 +0000
Subject: [PATCH 086/666] Add LDAP_TLS_CACERTFILE to example env file

---
 .env.example.complete | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example.complete b/.env.example.complete
index e8520a24cae..3f1a8ab9476 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -219,6 +219,7 @@ LDAP_USER_FILTER=false
 LDAP_VERSION=false
 LDAP_START_TLS=false
 LDAP_TLS_INSECURE=false
+LDAP_TLS_CACERTFILE=false
 LDAP_ID_ATTRIBUTE=uid
 LDAP_EMAIL_ATTRIBUTE=mail
 LDAP_DISPLAY_NAME_ATTRIBUTE=cn

From 58f6219cb3cf937fef59d03d4420de1ba64df436 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 31 Mar 2024 14:33:08 +0100
Subject: [PATCH 087/666] Code: Fixed highlighting issues when no code language
 set

For #4917
---
 resources/js/code/index.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/js/code/index.mjs b/resources/js/code/index.mjs
index d252f8f4101..ab31e3f74e4 100644
--- a/resources/js/code/index.mjs
+++ b/resources/js/code/index.mjs
@@ -48,14 +48,16 @@ function highlightElem(elem) {
     const content = elem.textContent.trimEnd();
 
     let langName = '';
+    let innerCodeDirection = '';
     if (innerCodeElem !== null) {
         langName = innerCodeElem.className.replace('language-', '');
+        innerCodeDirection = innerCodeElem.getAttribute('dir');
     }
 
     const wrapper = document.createElement('div');
     elem.parentNode.insertBefore(wrapper, elem);
 
-    const direction = innerCodeElem.getAttribute('dir') || elem.getAttribute('dir') || '';
+    const direction = innerCodeDirection || elem.getAttribute('dir') || '';
     if (direction) {
         wrapper.setAttribute('dir', direction);
     }

From a33dbcb04a7c64bb5198bd6a7cc421f50e0cc541 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 1 Apr 2024 17:08:53 +0100
Subject: [PATCH 088/666] References: Fixed references count/list recycle bin
 interaction

Count and reference list would get references then attempt to load
entities, which could fail to load if in the recycle bin.
This updates the queries to effectively ignore references for items we
can't see (in recycle bin).
Added test to cover.

For #4918
---
 app/References/ReferenceFetcher.php |  3 ++-
 tests/References/ReferencesTest.php | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.php
index 655ea7c09eb..1c9664f45a9 100644
--- a/app/References/ReferenceFetcher.php
+++ b/app/References/ReferenceFetcher.php
@@ -41,7 +41,8 @@ protected function queryReferencesToEntity(Entity $entity): Builder
     {
         $baseQuery = Reference::query()
             ->where('to_type', '=', $entity->getMorphClass())
-            ->where('to_id', '=', $entity->id);
+            ->where('to_id', '=', $entity->id)
+            ->whereHas('from');
 
         return $this->permissions->restrictEntityRelationQuery(
             $baseQuery,
diff --git a/tests/References/ReferencesTest.php b/tests/References/ReferencesTest.php
index 715f7143534..f8698d02885 100644
--- a/tests/References/ReferencesTest.php
+++ b/tests/References/ReferencesTest.php
@@ -271,7 +271,31 @@ public function test_description_links_from_book_chapter_shelf_updated_on_url_ch
         }
     }
 
-    protected function createReference(Model $from, Model $to)
+    public function test_reference_from_deleted_item_does_not_count_or_show_in_references_page()
+    {
+        $page = $this->entities->page();
+        $referencingPageA = $this->entities->page();
+        $referencingPageB = $this->entities->page();
+
+        $this->asEditor();
+        $this->createReference($referencingPageA, $page);
+        $this->createReference($referencingPageB, $page);
+
+        $resp = $this->get($page->getUrl());
+        $resp->assertSee('Referenced by 2 items');
+
+        $this->delete($referencingPageA->getUrl());
+
+        $resp = $this->get($page->getUrl());
+        $resp->assertSee('Referenced by 1 item');
+
+        $resp = $this->get($page->getUrl('/references'));
+        $resp->assertOk();
+        $resp->assertSee($referencingPageB->getUrl());
+        $resp->assertDontSee($referencingPageA->getUrl());
+    }
+
+    protected function createReference(Model $from, Model $to): void
     {
         (new Reference())->forceFill([
             'from_type' => $from->getMorphClass(),

From 19f78dbe6c1198a0b7072340d1422efaf0cd8bd0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 3 Apr 2024 16:46:53 +0100
Subject: [PATCH 089/666] WYSIWYG descriptions: Allowed anchor target attrs

Allowed since this is a control in the editor UI, but would previously
be stripped by editor config & server-side filtering.
For #4925
---
 app/Util/HtmlDescriptionFilter.php | 2 +-
 resources/js/wysiwyg/config.js     | 2 +-
 tests/Entity/BookTest.php          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Util/HtmlDescriptionFilter.php b/app/Util/HtmlDescriptionFilter.php
index 7287586d16f..cb091b869f8 100644
--- a/app/Util/HtmlDescriptionFilter.php
+++ b/app/Util/HtmlDescriptionFilter.php
@@ -20,7 +20,7 @@ class HtmlDescriptionFilter
      */
     protected static array $allowedAttrsByElements = [
         'p' => [],
-        'a' => ['href', 'title'],
+        'a' => ['href', 'title', 'target'],
         'ol' => [],
         'ul' => [],
         'li' => [],
diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index e5a780d18e9..1666aa50066 100644
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -348,7 +348,7 @@ export function buildForInput(options) {
         toolbar: 'bold italic link bullist numlist',
         content_style: getContentStyle(options),
         file_picker_types: 'file',
-        valid_elements: 'p,a[href|title],ol,ul,li,strong,em,br',
+        valid_elements: 'p,a[href|title|target],ol,ul,li,strong,em,br',
         file_picker_callback: filePickerCallback,
         init_instance_callback(editor) {
             addCustomHeadContent(editor.getDoc());
diff --git a/tests/Entity/BookTest.php b/tests/Entity/BookTest.php
index 04dff293fac..51bf65d10bb 100644
--- a/tests/Entity/BookTest.php
+++ b/tests/Entity/BookTest.php
@@ -266,8 +266,8 @@ public function test_description_limited_to_specific_html()
     {
         $book = $this->entities->book();
 
-        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" data-a="b">a</a><section>Hello</section></p>';
-        $expected = '<p>Content<a href="#cat">a</a></p>';
+        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" target="_blank" data-a="b">a</a><section>Hello</section></p>';
+        $expected = '<p>Content<a href="#cat" target="_blank">a</a></p>';
 
         $this->asEditor()->put($book->getUrl(), [
             'name' => $book->name,

From b9e2d33ed40d8bc154d7609ee68349e5958a5601 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 5 Apr 2024 15:06:08 +0100
Subject: [PATCH 090/666] Page Content: Aligned max-width across viewer and
 editors

For #4916
---
 resources/sass/_forms.scss   | 5 +++--
 resources/sass/_tinymce.scss | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 8c277c2b501..e480531fc52 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -128,8 +128,9 @@
   body {
     display: block;
     background-color: #fff;
-    padding-inline-start: 16px;
-    padding-inline-end: 16px;
+    padding-inline-start: 12px;
+    padding-inline-end: 12px;
+    max-width: 864px;
   }
   [drawio-diagram]:hover {
     outline: 2px solid var(--color-primary);
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 7e443ff5a6b..132c3ce7f72 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -21,6 +21,7 @@
   padding-block-end: 1rem;
   outline: 0;
   display: block;
+  max-width: calc(870px);
 }
 
 .wysiwyg-input.mce-content-body {

From 3e23f456fe1280749060654357b2e8a12e65f899 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 5 Apr 2024 15:18:58 +0100
Subject: [PATCH 091/666] CSS: Removed redundant calc

---
 resources/sass/_tinymce.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 132c3ce7f72..29843e4246f 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -21,7 +21,7 @@
   padding-block-end: 1rem;
   outline: 0;
   display: block;
-  max-width: calc(870px);
+  max-width: 870px;
 }
 
 .wysiwyg-input.mce-content-body {

From f5e6f9574da1202d66de482280a0d952fd3ed524 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 8 Apr 2024 14:41:51 +0100
Subject: [PATCH 092/666] JS Build: Split markdown to own file, updated
 packages

Markdown-related code was growing, representing half of app.js main
bundle code while only being needed in one view/scenario.
This extracts markdown related code to its own built file.
Related to #4858
---
 dev/build/esbuild.js                          |   1 +
 package-lock.json                             | 725 ++++++++++--------
 package.json                                  |   3 +-
 resources/js/components/markdown-editor.js    |  25 +-
 .../js/markdown/{editor.js => index.mjs}      |   0
 5 files changed, 419 insertions(+), 335 deletions(-)
 rename resources/js/markdown/{editor.js => index.mjs} (100%)

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index 53fbf0189f0..c5b3c9ef3a3 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -13,6 +13,7 @@ const entryPoints = {
     app: path.join(__dirname, '../../resources/js/app.js'),
     code: path.join(__dirname, '../../resources/js/code/index.mjs'),
     'legacy-modes': path.join(__dirname, '../../resources/js/code/legacy-modes.mjs'),
+    markdown: path.join(__dirname, '../../resources/js/markdown/index.mjs'),
 };
 
 // Locate our output directory
diff --git a/package-lock.json b/package-lock.json
index 1349113784b..63b0d2478e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
-        "markdown-it": "^13.0.2",
+        "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.5.1",
         "sortablejs": "^1.15.1"
@@ -37,7 +37,6 @@
         "eslint-plugin-import": "^2.29.0",
         "livereload": "^0.9.3",
         "npm-run-all": "^4.1.5",
-        "punycode": "^2.3.1",
         "sass": "^1.69.5"
       }
     },
@@ -51,9 +50,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz",
-      "integrity": "sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
+      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -156,13 +155,14 @@
       }
     },
     "node_modules/@codemirror/lang-xml": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.0.2.tgz",
-      "integrity": "sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
+      "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.4.0",
         "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
         "@lezer/common": "^1.0.0",
         "@lezer/xml": "^1.0.0"
       }
@@ -181,9 +181,9 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.3.3.tgz",
-      "integrity": "sha512-X0Z48odJ0KIoh/HY8Ltz75/4tDYc9msQf1E/2trlxFaFFhgjpVHjZ/BCXe1Lk7s4Gd67LL/CeEEHNI+xHOiESg==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.0.tgz",
+      "integrity": "sha512-5m/K+1A6gYR0e+h/dEde7LoGimMjRtWXZFg4Lo70cc8HzjSdHe3fLwjWMR0VRl5KFT1SxalSap7uMgPKF28wBA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
@@ -225,9 +225,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.24.1.tgz",
-      "integrity": "sha512-sBfP4rniPBRQzNakwuQEqjEuiJDWJyF2kqLLqij4WXRoVwPPJfjx966Eq3F7+OPQxDtMt/Q9MWLoZLWjeveBlg==",
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.1.tgz",
+      "integrity": "sha512-wLw0t3R9AwOSQThdZ5Onw8QQtem5asE7+bPlnzc57eubPqiuJKIzwjMZ+C42vQett+iva+J8VgFV4RYWDBh5FA==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -235,9 +235,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
       "cpu": [
         "ppc64"
       ],
@@ -251,9 +251,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
       "cpu": [
         "arm"
       ],
@@ -267,9 +267,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
       "cpu": [
         "arm64"
       ],
@@ -283,9 +283,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
       "cpu": [
         "x64"
       ],
@@ -299,9 +299,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
       "cpu": [
         "arm64"
       ],
@@ -315,9 +315,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
       "cpu": [
         "x64"
       ],
@@ -331,9 +331,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
       "cpu": [
         "arm64"
       ],
@@ -347,9 +347,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
       "cpu": [
         "x64"
       ],
@@ -363,9 +363,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
       "cpu": [
         "arm"
       ],
@@ -379,9 +379,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
-      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
       "cpu": [
         "arm64"
       ],
@@ -395,9 +395,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
       "cpu": [
         "ia32"
       ],
@@ -411,9 +411,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
       "cpu": [
         "loong64"
       ],
@@ -427,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
       "cpu": [
         "mips64el"
       ],
@@ -443,9 +443,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
       "cpu": [
         "ppc64"
       ],
@@ -459,9 +459,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
       "cpu": [
         "riscv64"
       ],
@@ -475,9 +475,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
       "cpu": [
         "s390x"
       ],
@@ -491,9 +491,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
       "cpu": [
         "x64"
       ],
@@ -507,9 +507,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
       "cpu": [
         "x64"
       ],
@@ -523,9 +523,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
       "cpu": [
         "x64"
       ],
@@ -539,9 +539,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
       "cpu": [
         "x64"
       ],
@@ -555,9 +555,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
       "cpu": [
         "arm64"
       ],
@@ -571,9 +571,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
       "cpu": [
         "ia32"
       ],
@@ -587,9 +587,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
       "cpu": [
         "x64"
       ],
@@ -650,9 +650,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -686,9 +686,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "dev": true
     },
     "node_modules/@lezer/common": {
@@ -707,9 +707,9 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.6.0.tgz",
-      "integrity": "sha512-mDwFNchv4jBEoZBaZbr5GlKR7BM6W/ZanTOZN6p4avuzcmYHTZ0nIbwtBqvXoeBrqmFSvL2zHL5TX9FWkXKc2w==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.0.tgz",
+      "integrity": "sha512-IJ16tx3biLKlCXUzcK4v8S10AVa2BSM2rB12rtAL6f1hL2TS/HQQlGCoWRvanlL2J4mCYEEIv9uG7n4kVMkVDA==",
       "dev": true,
       "dependencies": {
         "@lezer/common": "^1.1.0",
@@ -728,9 +728,9 @@
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.8.tgz",
-      "integrity": "sha512-EXseJ3pUzWxE6XQBQdqWHZqqlGQRSuNMBcLb6mZWS2J2v+QZhOObD+3ZIKIcm59ntTzyor4LqFTb72iJc3k23Q==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz",
+      "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -738,9 +738,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz",
-      "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==",
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.14.tgz",
+      "integrity": "sha512-GEdUyspTRgc5dwIGebUk+f3BekvqEWVIYsIuAC3pA8e8wcikGwBZRWRa450L0s8noGWuULwnmi4yjxTnYz9PpA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -766,9 +766,9 @@
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.2.0.tgz",
-      "integrity": "sha512-d7MwsfAukZJo1GpPrcPGa3MxaFFOqNp0gbqF+3F7pTeNDOgeJN1muXzx1XXDPt+Ac+/voCzsH7qXqnn+xReG/g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.0.tgz",
+      "integrity": "sha512-ErbEQ15eowmJUyT095e9NJc3BI9yZ894fjSDtHftD0InkfUBGgnKSU6dvan9jqsZuNHg2+ag/1oyDRxNsENupQ==",
       "dependencies": {
         "@lezer/common": "^1.0.0",
         "@lezer/highlight": "^1.0.0"
@@ -785,9 +785,9 @@
       }
     },
     "node_modules/@lezer/xml": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.4.tgz",
-      "integrity": "sha512-WmXKb5eX8+rRfZYSNRR5TPee/ZoDgBdVS/rj1VCJGDKa5gNldIctQYibCoFVyNhvZsyL/8nHbZJZPM4gnXN2Vw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.5.tgz",
+      "integrity": "sha512-VFouqOzmUWfIg+tfmpcdV33ewtK+NSwd4ngSe1aG7HFb4BN0ExyY1b8msp+ndFrnlG4V4iC8yXacjFtrwERnaw==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -952,34 +952,16 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.filter": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
-      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-array-method-boxes-properly": "^1.0.0",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -990,15 +972,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
-      "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
+        "es-abstract": "^1.23.2",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
         "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
@@ -1088,12 +1071,15 @@
       "dev": true
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/brace-expansion": {
@@ -1308,6 +1294,57 @@
         "node": ">= 8"
       }
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -1393,9 +1430,9 @@
       "dev": true
     },
     "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "engines": {
         "node": ">=0.12"
       },
@@ -1413,18 +1450,22 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
-      "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
         "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.6",
+        "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.2",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
         "get-intrinsic": "^1.2.4",
@@ -1432,15 +1473,16 @@
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.1",
+        "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
-        "hasown": "^2.0.1",
+        "hasown": "^2.0.2",
         "internal-slot": "^1.0.7",
         "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
         "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
@@ -1448,17 +1490,17 @@
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.5",
         "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.0",
+        "safe-array-concat": "^1.1.2",
         "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.1",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.15"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1467,12 +1509,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
     "node_modules/es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
@@ -1494,15 +1530,27 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1535,9 +1583,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
-      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1547,29 +1595,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.1",
-        "@esbuild/android-arm": "0.20.1",
-        "@esbuild/android-arm64": "0.20.1",
-        "@esbuild/android-x64": "0.20.1",
-        "@esbuild/darwin-arm64": "0.20.1",
-        "@esbuild/darwin-x64": "0.20.1",
-        "@esbuild/freebsd-arm64": "0.20.1",
-        "@esbuild/freebsd-x64": "0.20.1",
-        "@esbuild/linux-arm": "0.20.1",
-        "@esbuild/linux-arm64": "0.20.1",
-        "@esbuild/linux-ia32": "0.20.1",
-        "@esbuild/linux-loong64": "0.20.1",
-        "@esbuild/linux-mips64el": "0.20.1",
-        "@esbuild/linux-ppc64": "0.20.1",
-        "@esbuild/linux-riscv64": "0.20.1",
-        "@esbuild/linux-s390x": "0.20.1",
-        "@esbuild/linux-x64": "0.20.1",
-        "@esbuild/netbsd-x64": "0.20.1",
-        "@esbuild/openbsd-x64": "0.20.1",
-        "@esbuild/sunos-x64": "0.20.1",
-        "@esbuild/win32-arm64": "0.20.1",
-        "@esbuild/win32-ia32": "0.20.1",
-        "@esbuild/win32-x64": "0.20.1"
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -1585,16 +1633,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -1679,9 +1727,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -1937,9 +1985,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.0.tgz",
-      "integrity": "sha512-noqGuLw158+DuD9UPRKHpJ2hGxpFyDlYYrfM0mWt4XhT4n0lwzTLh70Tkdyy4kyTmyTT9Bv7bWAJqw7cgkEXDg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
     "node_modules/for-each": {
@@ -2208,9 +2256,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -2386,6 +2434,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-date-object": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
@@ -2493,12 +2556,15 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2644,11 +2710,11 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
-      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/livereload": {
@@ -2724,18 +2790,19 @@
       "dev": true
     },
     "node_modules/markdown-it": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
-      "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~3.0.1",
-        "linkify-it": "^4.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
       },
       "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/markdown-it-task-lists": {
@@ -2744,9 +2811,9 @@
       "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="
     },
     "node_modules/memorystream": {
       "version": "0.3.1",
@@ -3026,28 +3093,29 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
-      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3057,27 +3125,28 @@
       }
     },
     "node_modules/object.groupby": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
-      "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
       "dependencies": {
-        "array.prototype.filter": "^1.0.3",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.0.0"
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3287,6 +3356,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -3441,13 +3518,13 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
-      "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -3476,9 +3553,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.71.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz",
-      "integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==",
+      "version": "1.74.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
+      "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3508,17 +3585,17 @@
       "dev": true
     },
     "node_modules/set-function-length": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
-      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.1.2",
+        "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.3",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3570,12 +3647,12 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
-      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
         "object-inspect": "^1.13.1"
@@ -3601,9 +3678,9 @@
       "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -3677,14 +3754,15 @@
       }
     },
     "node_modules/string.prototype.padend": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.5.tgz",
-      "integrity": "sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
+      "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3694,14 +3772,15 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3711,28 +3790,31 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3772,9 +3854,9 @@
       }
     },
     "node_modules/style-mod": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
-      "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
@@ -3869,15 +3951,16 @@
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3907,9 +3990,9 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz",
-      "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
@@ -3927,9 +4010,9 @@
       }
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
@@ -4008,16 +4091,16 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
-      "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.6",
-        "call-bind": "^1.0.5",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.1"
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/package.json b/package.json
index 0ec36c129ec..ba2de38ba3c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "eslint-plugin-import": "^2.29.0",
     "livereload": "^0.9.3",
     "npm-run-all": "^4.1.5",
-    "punycode": "^2.3.1",
     "sass": "^1.69.5"
   },
   "dependencies": {
@@ -47,7 +46,7 @@
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
-    "markdown-it": "^13.0.2",
+    "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.5.1",
     "sortablejs": "^1.15.1"
diff --git a/resources/js/components/markdown-editor.js b/resources/js/components/markdown-editor.js
index fa06807a5c8..cd928de9f16 100644
--- a/resources/js/components/markdown-editor.js
+++ b/resources/js/components/markdown-editor.js
@@ -1,5 +1,4 @@
 import {Component} from './component';
-import {init as initEditor} from '../markdown/editor';
 
 export class MarkdownEditor extends Component {
 
@@ -20,17 +19,19 @@ export class MarkdownEditor extends Component {
         const settingInputs = settingContainer.querySelectorAll('input[type="checkbox"]');
 
         this.editor = null;
-        initEditor({
-            pageId: this.pageId,
-            container: this.elem,
-            displayEl: this.display,
-            inputEl: this.input,
-            drawioUrl: this.getDrawioUrl(),
-            settingInputs: Array.from(settingInputs),
-            text: {
-                serverUploadLimit: this.serverUploadLimitText,
-                imageUploadError: this.imageUploadErrorText,
-            },
+        window.importVersioned('markdown').then(markdown => {
+            return markdown.init({
+                pageId: this.pageId,
+                container: this.elem,
+                displayEl: this.display,
+                inputEl: this.input,
+                drawioUrl: this.getDrawioUrl(),
+                settingInputs: Array.from(settingInputs),
+                text: {
+                    serverUploadLimit: this.serverUploadLimitText,
+                    imageUploadError: this.imageUploadErrorText,
+                },
+            });
         }).then(editor => {
             this.editor = editor;
             this.setupListeners();
diff --git a/resources/js/markdown/editor.js b/resources/js/markdown/index.mjs
similarity index 100%
rename from resources/js/markdown/editor.js
rename to resources/js/markdown/index.mjs

From 0f6cb9ed840a61fe211321ae0d2d0cd0bafadfbd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 13 Apr 2024 15:48:39 +0100
Subject: [PATCH 093/666] Content styles: Made links underlined for visibility

Inline with A11y recommendations where color may not be reliable on its
own.
Tested various content link scenarios across chrome, safari & FF.
For #4939
---
 resources/sass/_content.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index bde52bb774e..f844993644c 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -113,6 +113,10 @@
   video {
     max-width: 100%;
   }
+
+  a {
+    text-decoration: underline;
+  }
 }
 
 /**

From f05ec4cc26c3381a3bc8ea49f371b89bcf38140b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 15 Apr 2024 18:44:59 +0100
Subject: [PATCH 094/666] Tags: Stopped recycle bin tags being counted on index

For #4892
Added test to cover.
---
 app/Activity/TagRepo.php         |  3 ++-
 tests/Entity/TagTest.php         | 20 +++++++++++++++++++-
 tests/Helpers/EntityProvider.php | 23 +++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/Activity/TagRepo.php b/app/Activity/TagRepo.php
index 4f2dbed5936..82c26b00e28 100644
--- a/app/Activity/TagRepo.php
+++ b/app/Activity/TagRepo.php
@@ -38,7 +38,8 @@ public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilt
                 DB::raw('SUM(IF(entity_type = \'book\', 1, 0)) as book_count'),
                 DB::raw('SUM(IF(entity_type = \'bookshelf\', 1, 0)) as shelf_count'),
             ])
-            ->orderBy($sort, $listOptions->getOrder());
+            ->orderBy($sort, $listOptions->getOrder())
+            ->whereHas('entity');
 
         if ($nameFilter) {
             $query->where('name', '=', $nameFilter);
diff --git a/tests/Entity/TagTest.php b/tests/Entity/TagTest.php
index c1240e95538..729f9390358 100644
--- a/tests/Entity/TagTest.php
+++ b/tests/Entity/TagTest.php
@@ -9,7 +9,7 @@
 
 class TagTest extends TestCase
 {
-    protected $defaultTagCount = 20;
+    protected int $defaultTagCount = 20;
 
     /**
      * Get an instance of a page that has many tags.
@@ -193,6 +193,24 @@ public function test_tag_index_shows_message_on_no_results()
         $resp->assertSee('Tags can be assigned via the page editor sidebar');
     }
 
+    public function test_tag_index_does_not_include_tags_on_recycle_bin_items()
+    {
+        $page = $this->entities->page();
+        $page->tags()->create(['name' => 'DeleteRecord', 'value' => 'itemToDeleteTest']);
+
+        $resp = $this->asEditor()->get('/tags');
+        $resp->assertSee('DeleteRecord');
+        $resp = $this->asEditor()->get('/tags?name=DeleteRecord');
+        $resp->assertSee('itemToDeleteTest');
+
+        $this->entities->sendToRecycleBin($page);
+
+        $resp = $this->asEditor()->get('/tags');
+        $resp->assertDontSee('DeleteRecord');
+        $resp = $this->asEditor()->get('/tags?name=DeleteRecord');
+        $resp->assertDontSee('itemToDeleteTest');
+    }
+
     public function test_tag_classes_visible_on_entities()
     {
         $this->asEditor();
diff --git a/tests/Helpers/EntityProvider.php b/tests/Helpers/EntityProvider.php
index 98206342145..1897abefa28 100644
--- a/tests/Helpers/EntityProvider.php
+++ b/tests/Helpers/EntityProvider.php
@@ -207,6 +207,29 @@ public function newDraftPage(array $input = ['name' => 'test page', 'html' => 'M
         return $draftPage;
     }
 
+    /**
+     * Send an entity to the recycle bin.
+     */
+    public function sendToRecycleBin(Entity $entity)
+    {
+        $trash = app()->make(TrashCan::class);
+
+        if ($entity instanceof Page) {
+            $trash->softDestroyPage($entity);
+        } elseif ($entity instanceof Chapter) {
+            $trash->softDestroyChapter($entity);
+        } elseif ($entity instanceof Book) {
+            $trash->softDestroyBook($entity);
+        } elseif ($entity instanceof Bookshelf) {
+            $trash->softDestroyBookshelf($entity);
+        }
+
+        $entity->refresh();
+        if (is_null($entity->deleted_at)) {
+            throw new \Exception("Could not send entity type [{$entity->getMorphClass()}] to the recycle bin");
+        }
+    }
+
     /**
      * Fully destroy the given entity from the system, bypassing the recycle bin
      * stage. Still runs through main app deletion logic.

From 80ac66e0a665d23f05685753318b56b2307ce6f2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 16 Apr 2024 14:44:17 +0100
Subject: [PATCH 095/666] Code Editor: Added scala to language list

For #4953
---
 resources/views/pages/parts/code-editor.blade.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index 8700a4ccb76..688fe67ef67 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -24,9 +24,10 @@ class="popup-background code-editor">
                         @php
                             $languages = [
                                 'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI',
-                                'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'MSSQL', 'MySQL', 'Nginx', 'OCaml',
-                                'Octave', 'Pascal', 'Perl', 'PHP', 'PL/SQL', 'PostgreSQL', 'Powershell', 'Python', 'Ruby', 'Rust', 'Scheme', 'Shell', 'Smarty',
-                                 'SQL', 'SQLite', 'Swift', 'Twig', 'TypeScript', 'VBScript', 'VB.NET', 'XML', 'YAML',
+                                'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'MSSQL', 'MySQL',
+                                'Nginx', 'OCaml', 'Octave', 'Pascal', 'Perl', 'PHP', 'PL/SQL', 'PostgreSQL', 'Powershell', 'Python',
+                                'Ruby', 'Rust', 'Scala', 'Scheme', 'Shell', 'Smarty', 'SQL', 'SQLite', 'Swift',
+                                'Twig', 'TypeScript', 'VBScript', 'VB.NET', 'XML', 'YAML',
                             ];
                         @endphp
 

From d640411adb4d828cffefd1248407eb93db2eaee2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 16 Apr 2024 15:19:51 +0100
Subject: [PATCH 096/666] OIDC: Cleaned up provider settings, added extra
 validation

- Added endpoint validation to ensure HTTPS as per spec
- Added some missing types
- Removed redirectUri from OidcProviderSettings since it's not a
  provider-based setting, but a setting for the oauth client, so
  extracted that back to service.
---
 app/Access/Oidc/OidcProviderSettings.php | 19 +++++++++++++------
 app/Access/Oidc/OidcService.php          |  6 ++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Access/Oidc/OidcProviderSettings.php b/app/Access/Oidc/OidcProviderSettings.php
index 49ccab6f0de..616bf1012c1 100644
--- a/app/Access/Oidc/OidcProviderSettings.php
+++ b/app/Access/Oidc/OidcProviderSettings.php
@@ -18,7 +18,6 @@ class OidcProviderSettings
     public string $issuer;
     public string $clientId;
     public string $clientSecret;
-    public ?string $redirectUri;
     public ?string $authorizationEndpoint;
     public ?string $tokenEndpoint;
     public ?string $endSessionEndpoint;
@@ -38,7 +37,7 @@ public function __construct(array $settings)
     /**
      * Apply an array of settings to populate setting properties within this class.
      */
-    protected function applySettingsFromArray(array $settingsArray)
+    protected function applySettingsFromArray(array $settingsArray): void
     {
         foreach ($settingsArray as $key => $value) {
             if (property_exists($this, $key)) {
@@ -52,7 +51,7 @@ protected function applySettingsFromArray(array $settingsArray)
      *
      * @throws InvalidArgumentException
      */
-    protected function validateInitial()
+    protected function validateInitial(): void
     {
         $required = ['clientId', 'clientSecret', 'redirectUri', 'issuer'];
         foreach ($required as $prop) {
@@ -74,12 +73,20 @@ protected function validateInitial()
     public function validate(): void
     {
         $this->validateInitial();
+
         $required = ['keys', 'tokenEndpoint', 'authorizationEndpoint'];
         foreach ($required as $prop) {
             if (empty($this->$prop)) {
                 throw new InvalidArgumentException("Missing required configuration \"{$prop}\" value");
             }
         }
+
+        $endpointProperties = ['tokenEndpoint', 'authorizationEndpoint', 'userinfoEndpoint'];
+        foreach ($endpointProperties as $prop) {
+            if (is_string($this->$prop) && !str_starts_with($this->$prop, 'https://')) {
+                throw new InvalidArgumentException("Endpoint value for \"{$prop}\" must start with https://");
+            }
+        }
     }
 
     /**
@@ -87,7 +94,7 @@ public function validate(): void
      *
      * @throws OidcIssuerDiscoveryException
      */
-    public function discoverFromIssuer(ClientInterface $httpClient, Repository $cache, int $cacheMinutes)
+    public function discoverFromIssuer(ClientInterface $httpClient, Repository $cache, int $cacheMinutes): void
     {
         try {
             $cacheKey = 'oidc-discovery::' . $this->issuer;
@@ -180,9 +187,9 @@ protected function loadKeysFromUri(string $uri, ClientInterface $httpClient): ar
     /**
      * Get the settings needed by an OAuth provider, as a key=>value array.
      */
-    public function arrayForProvider(): array
+    public function arrayForOAuthProvider(): array
     {
-        $settingKeys = ['clientId', 'clientSecret', 'redirectUri', 'authorizationEndpoint', 'tokenEndpoint', 'userinfoEndpoint'];
+        $settingKeys = ['clientId', 'clientSecret', 'authorizationEndpoint', 'tokenEndpoint', 'userinfoEndpoint'];
         $settings = [];
         foreach ($settingKeys as $setting) {
             $settings[$setting] = $this->$setting;
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 467e3141770..00ac2b6dc98 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -91,7 +91,6 @@ protected function getProviderSettings(): OidcProviderSettings
             'issuer'                => $config['issuer'],
             'clientId'              => $config['client_id'],
             'clientSecret'          => $config['client_secret'],
-            'redirectUri'           => url('/oidc/callback'),
             'authorizationEndpoint' => $config['authorization_endpoint'],
             'tokenEndpoint'         => $config['token_endpoint'],
             'endSessionEndpoint'    => is_string($config['end_session_endpoint']) ? $config['end_session_endpoint'] : null,
@@ -130,7 +129,10 @@ protected function getProviderSettings(): OidcProviderSettings
      */
     protected function getProvider(OidcProviderSettings $settings): OidcOAuthProvider
     {
-        $provider = new OidcOAuthProvider($settings->arrayForProvider(), [
+        $provider = new OidcOAuthProvider([
+            ...$settings->arrayForOAuthProvider(),
+            'redirectUri' => url('/oidc/callback'),
+        ], [
             'httpClient'     => $this->http->buildClient(5),
             'optionProvider' => new HttpBasicAuthOptionProvider(),
         ]);

From 9183e7f2fed7c06c538e5e7258467fe0508538ca Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 16 Apr 2024 15:52:55 +0100
Subject: [PATCH 097/666] OIDC Userinfo: Labelled changes to be made during
 review

---
 app/Access/Oidc/OidcService.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 00ac2b6dc98..a7f31e56bf1 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -241,14 +241,23 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
 
         session()->put("oidc_id_token", $idTokenText);
 
+        // TODO - This should not affect id token validation
+        // TODO - Should only call if we're missing properties
         if (!empty($settings->userinfoEndpoint)) {
             $provider = $this->getProvider($settings);
             $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
             $response = $provider->getParsedResponse($request);
+            // TODO - Ensure response content-type is "application/json" before using in this way (5.3.2)
+            // TODO - The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token; if they do not match, the UserInfo Response values MUST NOT be used. (5.3.2)
+            // TODO - Response validation (5.3.4)
+               // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
+               // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
+               // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
             $claims = $idToken->getAllClaims();
             foreach ($response as $key => $value) {
                 $claims[$key] = $value;
             }
+            // TODO - Should maybe remain separate from IdToken completely
             $idToken->replaceClaims($claims);
         }
 

From a71c8c60b7b6dc0bc20938029b14a86ab9cc95cd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 16 Apr 2024 18:10:32 +0100
Subject: [PATCH 098/666] OIDC: Extracted user detail handling to own
 OidcUserDetails class

Allows a proper defined object instead of an array an extracts related
logic out of OidcService.
Updated userinfo to only be called if we're missing details.
---
 app/Access/Oidc/OidcService.php     | 123 +++++++---------------------
 app/Access/Oidc/OidcUserDetails.php |  83 +++++++++++++++++++
 2 files changed, 114 insertions(+), 92 deletions(-)
 create mode 100644 app/Access/Oidc/OidcUserDetails.php

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index a7f31e56bf1..5a73484c1ee 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -12,7 +12,6 @@
 use BookStack\Http\HttpRequestService;
 use BookStack\Theming\ThemeEvents;
 use BookStack\Users\Models\User;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
@@ -159,69 +158,6 @@ protected function getAdditionalScopes(): array
         return array_filter($scopeArr);
     }
 
-    /**
-     * Calculate the display name.
-     */
-    protected function getUserDisplayName(OidcIdToken $token, string $defaultValue): string
-    {
-        $displayNameAttrString = $this->config()['display_name_claims'] ?? '';
-        $displayNameAttrs = explode('|', $displayNameAttrString);
-
-        $displayName = [];
-        foreach ($displayNameAttrs as $dnAttr) {
-            $dnComponent = $token->getClaim($dnAttr) ?? '';
-            if ($dnComponent !== '') {
-                $displayName[] = $dnComponent;
-            }
-        }
-
-        if (count($displayName) == 0) {
-            $displayName[] = $defaultValue;
-        }
-
-        return implode(' ', $displayName);
-    }
-
-    /**
-     * Extract the assigned groups from the id token.
-     *
-     * @return string[]
-     */
-    protected function getUserGroups(OidcIdToken $token): array
-    {
-        $groupsAttr = $this->config()['groups_claim'];
-        if (empty($groupsAttr)) {
-            return [];
-        }
-
-        $groupsList = Arr::get($token->getAllClaims(), $groupsAttr);
-        if (!is_array($groupsList)) {
-            return [];
-        }
-
-        return array_values(array_filter($groupsList, function ($val) {
-            return is_string($val);
-        }));
-    }
-
-    /**
-     * Extract the details of a user from an ID token.
-     *
-     * @return array{name: string, email: string, external_id: string, groups: string[]}
-     */
-    protected function getUserDetails(OidcIdToken $token): array
-    {
-        $idClaim = $this->config()['external_id_claim'];
-        $id = $token->getClaim($idClaim);
-
-        return [
-            'external_id' => $id,
-            'email'       => $token->getClaim('email'),
-            'name'        => $this->getUserDisplayName($token, $id),
-            'groups'      => $this->getUserGroups($token),
-        ];
-    }
-
     /**
      * Processes a received access token for a user. Login the user when
      * they exist, optionally registering them automatically.
@@ -241,26 +177,6 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
 
         session()->put("oidc_id_token", $idTokenText);
 
-        // TODO - This should not affect id token validation
-        // TODO - Should only call if we're missing properties
-        if (!empty($settings->userinfoEndpoint)) {
-            $provider = $this->getProvider($settings);
-            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
-            $response = $provider->getParsedResponse($request);
-            // TODO - Ensure response content-type is "application/json" before using in this way (5.3.2)
-            // TODO - The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token; if they do not match, the UserInfo Response values MUST NOT be used. (5.3.2)
-            // TODO - Response validation (5.3.4)
-               // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
-               // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
-               // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
-            $claims = $idToken->getAllClaims();
-            foreach ($response as $key => $value) {
-                $claims[$key] = $value;
-            }
-            // TODO - Should maybe remain separate from IdToken completely
-            $idToken->replaceClaims($claims);
-        }
-
         $returnClaims = Theme::dispatch(ThemeEvents::OIDC_ID_TOKEN_PRE_VALIDATE, $idToken->getAllClaims(), [
             'access_token' => $accessToken->getToken(),
             'expires_in' => $accessToken->getExpires(),
@@ -281,31 +197,54 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
             throw new OidcException("ID token validate failed with error: {$exception->getMessage()}");
         }
 
-        $userDetails = $this->getUserDetails($idToken);
-        $isLoggedIn = auth()->check();
+        $userDetails = OidcUserDetails::fromToken(
+            $idToken,
+            $this->config()['external_id_claim'],
+            $this->config()['display_name_claims'] ?? '',
+            $this->config()['groups_claim'] ?? ''
+        );
 
-        if (empty($userDetails['email'])) {
+        // TODO - This should not affect id token validation
+        if (!$userDetails->isFullyPopulated($this->shouldSyncGroups()) && !empty($settings->userinfoEndpoint)) {
+            $provider = $this->getProvider($settings);
+            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
+            $response = $provider->getParsedResponse($request);
+            // TODO - Ensure response content-type is "application/json" before using in this way (5.3.2)
+            // TODO - The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token; if they do not match, the UserInfo Response values MUST NOT be used. (5.3.2)
+            // TODO - Response validation (5.3.4)
+            // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
+            // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
+            // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
+            $claims = $idToken->getAllClaims();
+            foreach ($response as $key => $value) {
+                $claims[$key] = $value;
+            }
+            // TODO - Should maybe remain separate from IdToken completely
+            $idToken->replaceClaims($claims);
+        }
+
+        if (empty($userDetails->email)) {
             throw new OidcException(trans('errors.oidc_no_email_address'));
         }
 
+        $isLoggedIn = auth()->check();
         if ($isLoggedIn) {
             throw new OidcException(trans('errors.oidc_already_logged_in'));
         }
 
         try {
             $user = $this->registrationService->findOrRegister(
-                $userDetails['name'],
-                $userDetails['email'],
-                $userDetails['external_id']
+                $userDetails->name,
+                $userDetails->email,
+                $userDetails->externalId
             );
         } catch (UserRegistrationException $exception) {
             throw new OidcException($exception->getMessage());
         }
 
         if ($this->shouldSyncGroups()) {
-            $groups = $userDetails['groups'];
             $detachExisting = $this->config()['remove_from_groups'];
-            $this->groupService->syncUserWithFoundGroups($user, $groups, $detachExisting);
+            $this->groupService->syncUserWithFoundGroups($user, $userDetails->groups ?? [], $detachExisting);
         }
 
         $this->loginService->login($user, 'oidc');
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
new file mode 100644
index 00000000000..1fb40ddc23e
--- /dev/null
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace BookStack\Access\Oidc;
+
+use Illuminate\Support\Arr;
+
+class OidcUserDetails
+{
+    public function __construct(
+        public ?string $externalId = null,
+        public ?string $email = null,
+        public ?string $name = null,
+        public ?array $groups = null,
+    ) {
+    }
+
+    /**
+     * Check if the user details are fully populated for our usage.
+     */
+    public function isFullyPopulated(bool $groupSyncActive): bool
+    {
+        $hasEmpty = empty($this->externalId)
+            || empty($this->email)
+            || empty($this->name)
+            || ($groupSyncActive && empty($this->groups));
+
+        return !$hasEmpty;
+    }
+
+    /**
+     * Populate user details from OidcIdToken data.
+     */
+    public static function fromToken(
+        OidcIdToken $token,
+        string $idClaim,
+        string $displayNameClaims,
+        string $groupsClaim,
+    ): static {
+        $id = $token->getClaim($idClaim);
+
+        return new self(
+            externalId: $id,
+            email: $token->getClaim('email'),
+            name: static::getUserDisplayName($displayNameClaims, $token, $id),
+            groups: static::getUserGroups($groupsClaim, $token),
+        );
+    }
+
+    protected static function getUserDisplayName(string $displayNameClaims, OidcIdToken $token, string $defaultValue): string
+    {
+        $displayNameClaimParts = explode('|', $displayNameClaims);
+
+        $displayName = [];
+        foreach ($displayNameClaimParts as $claim) {
+            $component = $token->getClaim(trim($claim)) ?? '';
+            if ($component !== '') {
+                $displayName[] = $component;
+            }
+        }
+
+        if (count($displayName) === 0) {
+            $displayName[] = $defaultValue;
+        }
+
+        return implode(' ', $displayName);
+    }
+
+    protected static function getUserGroups(string $groupsClaim, OidcIdToken $token): array
+    {
+        if (empty($groupsClaim)) {
+            return [];
+        }
+
+        $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
+        if (!is_array($groupsList)) {
+            return [];
+        }
+
+        return array_values(array_filter($groupsList, function ($val) {
+            return is_string($val);
+        }));
+    }
+}

From 7d7cd32ca72397b635f7be597ad467ca27cffe6e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Apr 2024 18:23:58 +0100
Subject: [PATCH 099/666] OIDC Userinfo: Added userinfo data validation,
 seperated from id token

Wrapped userinfo response in its own class for additional handling and
validation.
Updated userdetails to take abstract claim data, to be populated by
either userinfo data or id token data.
---
 app/Access/Oidc/OidcIdToken.php          |  6 +--
 app/Access/Oidc/OidcService.php          | 64 ++++++++++++++----------
 app/Access/Oidc/OidcUserDetails.php      | 22 ++++----
 app/Access/Oidc/OidcUserinfoResponse.php | 54 ++++++++++++++++++++
 app/Access/Oidc/ProvidesClaims.php       | 17 +++++++
 5 files changed, 119 insertions(+), 44 deletions(-)
 create mode 100644 app/Access/Oidc/OidcUserinfoResponse.php
 create mode 100644 app/Access/Oidc/ProvidesClaims.php

diff --git a/app/Access/Oidc/OidcIdToken.php b/app/Access/Oidc/OidcIdToken.php
index 5a395022a4e..b1da998a525 100644
--- a/app/Access/Oidc/OidcIdToken.php
+++ b/app/Access/Oidc/OidcIdToken.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Access\Oidc;
 
-class OidcIdToken
+class OidcIdToken implements ProvidesClaims
 {
     protected array $header;
     protected array $payload;
@@ -71,10 +71,8 @@ public function validate(string $clientId): bool
     /**
      * Fetch a specific claim from this token.
      * Returns null if it is null or does not exist.
-     *
-     * @return mixed|null
      */
-    public function getClaim(string $claim)
+    public function getClaim(string $claim): mixed
     {
         return $this->payload[$claim] ?? null;
     }
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 5a73484c1ee..fba6dc9a8f3 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -194,35 +194,10 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
         try {
             $idToken->validate($settings->clientId);
         } catch (OidcInvalidTokenException $exception) {
-            throw new OidcException("ID token validate failed with error: {$exception->getMessage()}");
-        }
-
-        $userDetails = OidcUserDetails::fromToken(
-            $idToken,
-            $this->config()['external_id_claim'],
-            $this->config()['display_name_claims'] ?? '',
-            $this->config()['groups_claim'] ?? ''
-        );
-
-        // TODO - This should not affect id token validation
-        if (!$userDetails->isFullyPopulated($this->shouldSyncGroups()) && !empty($settings->userinfoEndpoint)) {
-            $provider = $this->getProvider($settings);
-            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
-            $response = $provider->getParsedResponse($request);
-            // TODO - Ensure response content-type is "application/json" before using in this way (5.3.2)
-            // TODO - The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token; if they do not match, the UserInfo Response values MUST NOT be used. (5.3.2)
-            // TODO - Response validation (5.3.4)
-            // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
-            // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
-            // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
-            $claims = $idToken->getAllClaims();
-            foreach ($response as $key => $value) {
-                $claims[$key] = $value;
-            }
-            // TODO - Should maybe remain separate from IdToken completely
-            $idToken->replaceClaims($claims);
+            throw new OidcException("ID token validation failed with error: {$exception->getMessage()}");
         }
 
+        $userDetails = $this->getUserDetailsFromToken($idToken, $accessToken, $settings);
         if (empty($userDetails->email)) {
             throw new OidcException(trans('errors.oidc_no_email_address'));
         }
@@ -252,6 +227,41 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
         return $user;
     }
 
+    /**
+     * @throws OidcException
+     */
+    protected function getUserDetailsFromToken(OidcIdToken $idToken, OidcAccessToken $accessToken, OidcProviderSettings $settings): OidcUserDetails
+    {
+        $userDetails = new OidcUserDetails();
+        $userDetails->populate(
+            $idToken,
+            $this->config()['external_id_claim'],
+            $this->config()['display_name_claims'] ?? '',
+            $this->config()['groups_claim'] ?? ''
+        );
+
+        if (!$userDetails->isFullyPopulated($this->shouldSyncGroups()) && !empty($settings->userinfoEndpoint)) {
+            $provider = $this->getProvider($settings);
+            $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
+            $response = new OidcUserinfoResponse($provider->getResponse($request));
+
+            try {
+                $response->validate($idToken->getClaim('sub'));
+            } catch (OidcInvalidTokenException $exception) {
+                throw new OidcException("Userinfo endpoint response validation failed with error: {$exception->getMessage()}");
+            }
+
+            $userDetails->populate(
+                $response,
+                $this->config()['external_id_claim'],
+                $this->config()['display_name_claims'] ?? '',
+                $this->config()['groups_claim'] ?? ''
+            );
+        }
+
+        return $userDetails;
+    }
+
     /**
      * Get the OIDC config from the application.
      */
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 1fb40ddc23e..172bc9ceb44 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -30,23 +30,19 @@ public function isFullyPopulated(bool $groupSyncActive): bool
     /**
      * Populate user details from OidcIdToken data.
      */
-    public static function fromToken(
-        OidcIdToken $token,
+    public function populate(
+        ProvidesClaims $claims,
         string $idClaim,
         string $displayNameClaims,
         string $groupsClaim,
-    ): static {
-        $id = $token->getClaim($idClaim);
-
-        return new self(
-            externalId: $id,
-            email: $token->getClaim('email'),
-            name: static::getUserDisplayName($displayNameClaims, $token, $id),
-            groups: static::getUserGroups($groupsClaim, $token),
-        );
+    ): void {
+        $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
+        $this->email = $claims->getClaim('email') ?? $this->email;
+        $this->name = static::getUserDisplayName($displayNameClaims, $claims, $this->externalId) ?? $this->name;
+        $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
     }
 
-    protected static function getUserDisplayName(string $displayNameClaims, OidcIdToken $token, string $defaultValue): string
+    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token, string $defaultValue): string
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
@@ -65,7 +61,7 @@ protected static function getUserDisplayName(string $displayNameClaims, OidcIdTo
         return implode(' ', $displayName);
     }
 
-    protected static function getUserGroups(string $groupsClaim, OidcIdToken $token): array
+    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): array
     {
         if (empty($groupsClaim)) {
             return [];
diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
new file mode 100644
index 00000000000..7c7760434b0
--- /dev/null
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace BookStack\Access\Oidc;
+
+use Psr\Http\Message\ResponseInterface;
+
+class OidcUserinfoResponse implements ProvidesClaims
+{
+    protected array $claims = [];
+
+    public function __construct(ResponseInterface $response)
+    {
+        if ($response->getHeader('Content-Type')[0] === 'application/json') {
+            $this->claims = json_decode($response->getBody()->getContents(), true);
+        }
+
+        // TODO - Support JWTs
+        // TODO - Response validation (5.3.4):
+            // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
+            // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
+            // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
+    }
+
+    /**
+     * @throws OidcInvalidTokenException
+     */
+    public function validate(string $idTokenSub): bool
+    {
+        $sub = $this->getClaim('sub');
+
+        // Spec: v1.0 5.3.2: The sub (subject) Claim MUST always be returned in the UserInfo Response.
+        if (!is_string($sub) || empty($sub)) {
+            throw new OidcInvalidTokenException("No valid subject value found in userinfo data");
+        }
+
+        // Spec: v1.0 5.3.2: The sub Claim in the UserInfo Response MUST be verified to exactly match the sub Claim in the ID Token;
+        // if they do not match, the UserInfo Response values MUST NOT be used.
+        if ($idTokenSub !== $sub) {
+            throw new OidcInvalidTokenException("Subject value provided in the userinfo endpoint does not match the provided ID token value");
+        }
+
+        return true;
+    }
+
+    public function getClaim(string $claim): mixed
+    {
+        return $this->claims[$claim] ?? null;
+    }
+
+    public function getAllClaims(): array
+    {
+        return $this->claims;
+    }
+}
diff --git a/app/Access/Oidc/ProvidesClaims.php b/app/Access/Oidc/ProvidesClaims.php
new file mode 100644
index 00000000000..a3cf5165510
--- /dev/null
+++ b/app/Access/Oidc/ProvidesClaims.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace BookStack\Access\Oidc;
+
+interface ProvidesClaims
+{
+    /**
+     * Fetch a specific claim.
+     * Returns null if it is null or does not exist.
+     */
+    public function getClaim(string $claim): mixed;
+
+    /**
+     * Get all contained claims.
+     */
+    public function getAllClaims(): array;
+}

From fa543bbd4d4af333bd719fa75651841b1907d733 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Apr 2024 23:24:57 +0100
Subject: [PATCH 100/666] OIDC Userinfo: Started writing tests to cover
 userinfo calling

---
 app/Access/Oidc/OidcProviderSettings.php |   2 +-
 app/Access/Oidc/OidcService.php          |   3 +
 app/Access/Oidc/OidcUserDetails.php      |  10 +-
 tests/Auth/OidcTest.php                  | 142 +++++++++++++++++------
 4 files changed, 111 insertions(+), 46 deletions(-)

diff --git a/app/Access/Oidc/OidcProviderSettings.php b/app/Access/Oidc/OidcProviderSettings.php
index 616bf1012c1..71c3b573421 100644
--- a/app/Access/Oidc/OidcProviderSettings.php
+++ b/app/Access/Oidc/OidcProviderSettings.php
@@ -53,7 +53,7 @@ protected function applySettingsFromArray(array $settingsArray): void
      */
     protected function validateInitial(): void
     {
-        $required = ['clientId', 'clientSecret', 'redirectUri', 'issuer'];
+        $required = ['clientId', 'clientSecret', 'issuer'];
         foreach ($required as $prop) {
             if (empty($this->$prop)) {
                 throw new InvalidArgumentException("Missing required configuration \"{$prop}\" value");
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index fba6dc9a8f3..6d024ae32e4 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -201,6 +201,9 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
         if (empty($userDetails->email)) {
             throw new OidcException(trans('errors.oidc_no_email_address'));
         }
+        if (empty($userDetails->name)) {
+            $userDetails->name = $userDetails->externalId;
+        }
 
         $isLoggedIn = auth()->check();
         if ($isLoggedIn) {
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 172bc9ceb44..bccc49ee4d8 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -28,7 +28,7 @@ public function isFullyPopulated(bool $groupSyncActive): bool
     }
 
     /**
-     * Populate user details from OidcIdToken data.
+     * Populate user details from the given claim data.
      */
     public function populate(
         ProvidesClaims $claims,
@@ -38,11 +38,11 @@ public function populate(
     ): void {
         $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
         $this->email = $claims->getClaim('email') ?? $this->email;
-        $this->name = static::getUserDisplayName($displayNameClaims, $claims, $this->externalId) ?? $this->name;
+        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
     }
 
-    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token, string $defaultValue): string
+    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
@@ -54,10 +54,6 @@ protected static function getUserDisplayName(string $displayNameClaims, Provides
             }
         }
 
-        if (count($displayName) === 0) {
-            $displayName[] = $defaultValue;
-        }
-
         return implode(' ', $displayName);
     }
 
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 6617229838f..9ed3fa7b9a7 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -37,6 +37,7 @@ protected function setUp(): void
             'oidc.issuer'                 => OidcJwtHelper::defaultIssuer(),
             'oidc.authorization_endpoint' => 'https://oidc.local/auth',
             'oidc.token_endpoint'         => 'https://oidc.local/token',
+            'oidc.userinfo_endpoint'      => 'https://oidc.local/userinfo',
             'oidc.discover'               => false,
             'oidc.dump_user_details'      => false,
             'oidc.additional_scopes'      => '',
@@ -208,6 +209,8 @@ public function test_dump_user_details_option_outputs_as_expected()
 
     public function test_auth_fails_if_no_email_exists_in_user_data()
     {
+        config()->set('oidc.userinfo_endpoint', null);
+
         $this->runLogin([
             'email' => '',
             'sub'   => 'benny505',
@@ -270,10 +273,38 @@ public function test_auth_login_with_invalid_token_fails()
         ]);
         $resp = $this->followRedirects($resp);
 
-        $resp->assertSeeText('ID token validate failed with error: Missing token subject value');
+        $resp->assertSeeText('ID token validation failed with error: Missing token subject value');
         $this->assertFalse(auth()->check());
     }
 
+    public function test_auth_fails_if_endpoints_start_with_https()
+    {
+        $endpointConfigKeys = [
+            'oidc.token_endpoint' => 'tokenEndpoint',
+            'oidc.authorization_endpoint' => 'authorizationEndpoint',
+            'oidc.userinfo_endpoint' => 'userinfoEndpoint',
+        ];
+
+        foreach ($endpointConfigKeys as $endpointConfigKey => $endpointName) {
+            $logger = $this->withTestLogger();
+            $original = config()->get($endpointConfigKey);
+            $new = str_replace('https://', 'http://', $original);
+            config()->set($endpointConfigKey, $new);
+
+            $this->withoutExceptionHandling();
+            $err = null;
+            try {
+                $resp = $this->runLogin();
+                $resp->assertRedirect('/login');
+            } catch (\Exception $exception) {
+                $err = $exception;
+            }
+            $this->assertEquals("Endpoint value for \"{$endpointName}\" must start with https://", $err->getMessage());
+
+            config()->set($endpointConfigKey, $original);
+        }
+    }
+
     public function test_auth_login_with_autodiscovery()
     {
         $this->withAutodiscovery();
@@ -689,57 +720,92 @@ public function test_pkce_used_on_authorize_and_access()
         $this->assertEquals($pkceCode, $bodyParams['code_verifier']);
     }
 
-    protected function withAutodiscovery()
+    public function test_userinfo_endpoint_used_if_missing_claims_in_id_token()
+    {
+        config()->set('oidc.display_name_claims', 'first_name|last_name');
+        $this->post('/oidc/login');
+        $state = session()->get('oidc_state');
+
+        $client = $this->mockHttpClient([
+            $this->getMockAuthorizationResponse(['name' => null]),
+            new Response(200, [
+                'Content-Type'  => 'application/json',
+            ], json_encode([
+                'sub' => OidcJwtHelper::defaultPayload()['sub'],
+                'first_name' => 'Barry',
+                'last_name' => 'Userinfo',
+            ]))
+        ]);
+
+        $resp = $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
+        $resp->assertRedirect('/');
+        $this->assertEquals(2, $client->requestCount());
+
+        $userinfoRequest = $client->requestAt(1);
+        $this->assertEquals('GET', $userinfoRequest->getMethod());
+        $this->assertEquals('https://oidc.local/userinfo', (string) $userinfoRequest->getUri());
+
+        $this->assertEquals('Barry Userinfo', user()->name);
+    }
+
+    public function test_userinfo_endpoint_fetch_with_different_sub_throws_error()
+    {
+        $userinfoResponseData = ['sub' => 'dcba4321'];
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/json'], json_encode($userinfoResponseData));
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: Subject value provided in the userinfo endpoint does not match the provided ID token value');
+    }
+
+    public function test_userinfo_endpoint_fetch_returning_no_sub_throws_error()
+    {
+        $userinfoResponseData = ['name' => 'testing'];
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/json'], json_encode($userinfoResponseData));
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: No valid subject value found in userinfo data');
+    }
+
+    public function test_userinfo_endpoint_fetch_can_parsed_nested_groups()
+    {
+        config()->set([
+            'oidc.user_to_groups'     => true,
+            'oidc.groups_claim'       => 'my.nested.groups.attr',
+            'oidc.remove_from_groups' => false,
+        ]);
+
+        $roleA = Role::factory()->create(['display_name' => 'Ducks']);
+        $userinfoResponseData = [
+            'sub' => OidcJwtHelper::defaultPayload()['sub'],
+            'my' => ['nested' => ['groups' => ['attr' => ['Ducks', 'Donkeys']]]]
+        ];
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/json'], json_encode($userinfoResponseData));
+        $resp = $this->runLogin(['groups' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/');
+
+        $user = User::where('email', OidcJwtHelper::defaultPayload()['email'])->first();
+        $this->assertTrue($user->hasRole($roleA->id));
+    }
+
+    protected function withAutodiscovery(): void
     {
         config()->set([
             'oidc.issuer'                 => OidcJwtHelper::defaultIssuer(),
             'oidc.discover'               => true,
             'oidc.authorization_endpoint' => null,
             'oidc.token_endpoint'         => null,
+            'oidc.userinfo_endpoint'      => null,
             'oidc.jwt_public_key'         => null,
         ]);
     }
 
-    protected function runLogin($claimOverrides = []): TestResponse
+    protected function runLogin($claimOverrides = [], $additionalHttpResponses = []): TestResponse
     {
-        // These two variables should perhaps be arguments instead of
-        // assuming that they're tied to whether discovery is enabled,
-        // but that's how the tests are written for now.
-        $claimsInIdToken = !config('oidc.discover');
-        $tokenEndpoint = config('oidc.discover')
-                       ? OidcJwtHelper::defaultIssuer() . '/oidc/token'
-                       : 'https://oidc.local/token';
-
         $this->post('/oidc/login');
         $state = session()->get('oidc_state');
+        $this->mockHttpClient([$this->getMockAuthorizationResponse($claimOverrides), ...$additionalHttpResponses]);
 
-        $providerResponses = [$this->getMockAuthorizationResponse($claimsInIdToken ? $claimOverrides : [])];
-        if (!$claimsInIdToken) {
-            $providerResponses[] = new Response(200, [
-                'Content-Type'  => 'application/json',
-                'Cache-Control' => 'no-cache, no-store',
-                'Pragma'        => 'no-cache',
-            ], json_encode($claimOverrides));
-        }
-
-        $transactions = $this->mockHttpClient($providerResponses);
-
-        $response = $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
-
-        if (auth()->check()) {
-            $this->assertEquals($claimsInIdToken ? 1 : 2, $transactions->requestCount());
-            $tokenRequest = $transactions->requestAt(0);
-            $this->assertEquals($tokenEndpoint, (string) $tokenRequest->getUri());
-            $this->assertEquals('POST', $tokenRequest->getMethod());
-            if (!$claimsInIdToken) {
-                $userinfoRequest = $transactions->requestAt(1);
-                $this->assertEquals(OidcJwtHelper::defaultIssuer() . '/oidc/userinfo', (string) $userinfoRequest->getUri());
-                $this->assertEquals('GET', $userinfoRequest->getMethod());
-                $this->assertEquals('Bearer abc123', $userinfoRequest->getHeader('Authorization')[0]);
-            }
-        }
-
-        return $response;
+        return $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
     }
 
     protected function getAutoDiscoveryResponse($responseOverrides = []): Response

From 1b1cb18839d813ba112617d6c99daece07b080d3 Mon Sep 17 00:00:00 2001
From: nesges <thomas@nesges.eu>
Date: Fri, 19 Apr 2024 09:18:34 +0200
Subject: [PATCH 101/666] fixed mislabeling of name input

---
 resources/views/auth/register.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d345b037aaa..40b69ce6015 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -14,7 +14,7 @@
                 {!! csrf_field() !!}
 
                 <div class="form-group">
-                    <label for="email">{{ trans('auth.name') }}</label>
+                    <label for="name">{{ trans('auth.name') }}</label>
                     @include('form.text', ['name' => 'name'])
                 </div>
 

From 31272e60b6f4685ec7a0378553ff57860cd5e387 Mon Sep 17 00:00:00 2001
From: nesges <thomas@nesges.eu>
Date: Fri, 19 Apr 2024 09:35:09 +0200
Subject: [PATCH 102/666] add ambrosia-container to registration form as
 honeypot for bots: new form field "username" must not be filled

---
 app/Access/Controllers/RegisterController.php |  1 +
 resources/sass/_forms.scss                    | 11 +++++++++++
 resources/views/auth/register.blade.php       |  5 +++++
 3 files changed, 17 insertions(+)

diff --git a/app/Access/Controllers/RegisterController.php b/app/Access/Controllers/RegisterController.php
index 13b97f03c96..25b0a30366a 100644
--- a/app/Access/Controllers/RegisterController.php
+++ b/app/Access/Controllers/RegisterController.php
@@ -87,6 +87,7 @@ protected function validator(array $data): ValidatorContract
             'name'     => ['required', 'min:2', 'max:100'],
             'email'    => ['required', 'email', 'max:255', 'unique:users'],
             'password' => ['required', Password::default()],
+            'username' => ['prohibited'], // this is a honeypot for bots that must not be filled in
         ]);
     }
 }
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index e480531fc52..fc0eb49bd45 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -389,6 +389,17 @@ input[type=color] {
   }
 }
 
+.form-group.ambrosia-container, .form-group.ambrosia-container * {
+    position:absolute;
+    height:0px !important;
+    width:0px !important;
+    margin:0 !important;
+    padding:0 !important;
+    background:transparent !important;
+    color:transparent !important;
+    border:none !important;
+}
+
 .title-input input[type="text"] {
   display: block;
   width: 100%;
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 40b69ce6015..c271bb34bec 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -13,6 +13,11 @@
             <form action="{{ url("/register") }}" method="POST" class="mt-l stretch-inputs">
                 {!! csrf_field() !!}
 
+                <div class="form-group ambrosia-container">
+                    <label for="name">{{ trans('auth.name') }}</label>
+                    @include('form.text', ['name' => 'username'])
+                </div>
+
                 <div class="form-group">
                     <label for="name">{{ trans('auth.name') }}</label>
                     @include('form.text', ['name' => 'name'])

From b18cee3dc4cec028ff9efa69dab960649bb38425 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 19 Apr 2024 14:12:27 +0100
Subject: [PATCH 103/666] OIDC Userinfo: Added JWT signed response support

Not yet tested, nor checked all response validations.
---
 app/Access/Oidc/OidcIdToken.php          | 144 +------------------
 app/Access/Oidc/OidcJwtWithClaims.php    | 174 +++++++++++++++++++++++
 app/Access/Oidc/OidcService.php          |   6 +-
 app/Access/Oidc/OidcUserinfoResponse.php |  16 ++-
 4 files changed, 196 insertions(+), 144 deletions(-)
 create mode 100644 app/Access/Oidc/OidcJwtWithClaims.php

diff --git a/app/Access/Oidc/OidcIdToken.php b/app/Access/Oidc/OidcIdToken.php
index b1da998a525..f3fad0e1eeb 100644
--- a/app/Access/Oidc/OidcIdToken.php
+++ b/app/Access/Oidc/OidcIdToken.php
@@ -2,58 +2,8 @@
 
 namespace BookStack\Access\Oidc;
 
-class OidcIdToken implements ProvidesClaims
+class OidcIdToken extends OidcJwtWithClaims implements ProvidesClaims
 {
-    protected array $header;
-    protected array $payload;
-    protected string $signature;
-    protected string $issuer;
-    protected array $tokenParts = [];
-
-    /**
-     * @var array[]|string[]
-     */
-    protected array $keys;
-
-    public function __construct(string $token, string $issuer, array $keys)
-    {
-        $this->keys = $keys;
-        $this->issuer = $issuer;
-        $this->parse($token);
-    }
-
-    /**
-     * Parse the token content into its components.
-     */
-    protected function parse(string $token): void
-    {
-        $this->tokenParts = explode('.', $token);
-        $this->header = $this->parseEncodedTokenPart($this->tokenParts[0]);
-        $this->payload = $this->parseEncodedTokenPart($this->tokenParts[1] ?? '');
-        $this->signature = $this->base64UrlDecode($this->tokenParts[2] ?? '') ?: '';
-    }
-
-    /**
-     * Parse a Base64-JSON encoded token part.
-     * Returns the data as a key-value array or empty array upon error.
-     */
-    protected function parseEncodedTokenPart(string $part): array
-    {
-        $json = $this->base64UrlDecode($part) ?: '{}';
-        $decoded = json_decode($json, true);
-
-        return is_array($decoded) ? $decoded : [];
-    }
-
-    /**
-     * Base64URL decode. Needs some character conversions to be compatible
-     * with PHP's default base64 handling.
-     */
-    protected function base64UrlDecode(string $encoded): string
-    {
-        return base64_decode(strtr($encoded, '-_', '+/'));
-    }
-
     /**
      * Validate all possible parts of the id token.
      *
@@ -61,89 +11,12 @@ protected function base64UrlDecode(string $encoded): string
      */
     public function validate(string $clientId): bool
     {
-        $this->validateTokenStructure();
-        $this->validateTokenSignature();
+        parent::validateCommonClaims();
         $this->validateTokenClaims($clientId);
 
         return true;
     }
 
-    /**
-     * Fetch a specific claim from this token.
-     * Returns null if it is null or does not exist.
-     */
-    public function getClaim(string $claim): mixed
-    {
-        return $this->payload[$claim] ?? null;
-    }
-
-    /**
-     * Get all returned claims within the token.
-     */
-    public function getAllClaims(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * Replace the existing claim data of this token with that provided.
-     */
-    public function replaceClaims(array $claims): void
-    {
-        $this->payload = $claims;
-    }
-
-    /**
-     * Validate the structure of the given token and ensure we have the required pieces.
-     * As per https://datatracker.ietf.org/doc/html/rfc7519#section-7.2.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    protected function validateTokenStructure(): void
-    {
-        foreach (['header', 'payload'] as $prop) {
-            if (empty($this->$prop) || !is_array($this->$prop)) {
-                throw new OidcInvalidTokenException("Could not parse out a valid {$prop} within the provided token");
-            }
-        }
-
-        if (empty($this->signature) || !is_string($this->signature)) {
-            throw new OidcInvalidTokenException('Could not parse out a valid signature within the provided token');
-        }
-    }
-
-    /**
-     * Validate the signature of the given token and ensure it validates against the provided key.
-     *
-     * @throws OidcInvalidTokenException
-     */
-    protected function validateTokenSignature(): void
-    {
-        if ($this->header['alg'] !== 'RS256') {
-            throw new OidcInvalidTokenException("Only RS256 signature validation is supported. Token reports using {$this->header['alg']}");
-        }
-
-        $parsedKeys = array_map(function ($key) {
-            try {
-                return new OidcJwtSigningKey($key);
-            } catch (OidcInvalidKeyException $e) {
-                throw new OidcInvalidTokenException('Failed to read signing key with error: ' . $e->getMessage());
-            }
-        }, $this->keys);
-
-        $parsedKeys = array_filter($parsedKeys);
-
-        $contentToSign = $this->tokenParts[0] . '.' . $this->tokenParts[1];
-        /** @var OidcJwtSigningKey $parsedKey */
-        foreach ($parsedKeys as $parsedKey) {
-            if ($parsedKey->verify($contentToSign, $this->signature)) {
-                return;
-            }
-        }
-
-        throw new OidcInvalidTokenException('Token signature could not be validated using the provided keys');
-    }
-
     /**
      * Validate the claims of the token.
      * As per https://openid.net/specs/openid-connect-basic-1_0.html#IDTokenValidation.
@@ -154,27 +27,18 @@ protected function validateTokenClaims(string $clientId): void
     {
         // 1. The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery)
         // MUST exactly match the value of the iss (issuer) Claim.
-        if (empty($this->payload['iss']) || $this->issuer !== $this->payload['iss']) {
-            throw new OidcInvalidTokenException('Missing or non-matching token issuer value');
-        }
+        // Already done in parent.
 
         // 2. The Client MUST validate that the aud (audience) Claim contains its client_id value registered
         // at the Issuer identified by the iss (issuer) Claim as an audience. The ID Token MUST be rejected
         // if the ID Token does not list the Client as a valid audience, or if it contains additional
         // audiences not trusted by the Client.
-        if (empty($this->payload['aud'])) {
-            throw new OidcInvalidTokenException('Missing token audience value');
-        }
-
+        // Partially done in parent.
         $aud = is_string($this->payload['aud']) ? [$this->payload['aud']] : $this->payload['aud'];
         if (count($aud) !== 1) {
             throw new OidcInvalidTokenException('Token audience value has ' . count($aud) . ' values, Expected 1');
         }
 
-        if ($aud[0] !== $clientId) {
-            throw new OidcInvalidTokenException('Token audience value did not match the expected client_id');
-        }
-
         // 3. If the ID Token contains multiple audiences, the Client SHOULD verify that an azp Claim is present.
         // NOTE: Addressed by enforcing a count of 1 above.
 
diff --git a/app/Access/Oidc/OidcJwtWithClaims.php b/app/Access/Oidc/OidcJwtWithClaims.php
new file mode 100644
index 00000000000..cc13936ab65
--- /dev/null
+++ b/app/Access/Oidc/OidcJwtWithClaims.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace BookStack\Access\Oidc;
+
+class OidcJwtWithClaims implements ProvidesClaims
+{
+    protected array $header;
+    protected array $payload;
+    protected string $signature;
+    protected string $issuer;
+    protected array $tokenParts = [];
+
+    /**
+     * @var array[]|string[]
+     */
+    protected array $keys;
+
+    public function __construct(string $token, string $issuer, array $keys)
+    {
+        $this->keys = $keys;
+        $this->issuer = $issuer;
+        $this->parse($token);
+    }
+
+    /**
+     * Parse the token content into its components.
+     */
+    protected function parse(string $token): void
+    {
+        $this->tokenParts = explode('.', $token);
+        $this->header = $this->parseEncodedTokenPart($this->tokenParts[0]);
+        $this->payload = $this->parseEncodedTokenPart($this->tokenParts[1] ?? '');
+        $this->signature = $this->base64UrlDecode($this->tokenParts[2] ?? '') ?: '';
+    }
+
+    /**
+     * Parse a Base64-JSON encoded token part.
+     * Returns the data as a key-value array or empty array upon error.
+     */
+    protected function parseEncodedTokenPart(string $part): array
+    {
+        $json = $this->base64UrlDecode($part) ?: '{}';
+        $decoded = json_decode($json, true);
+
+        return is_array($decoded) ? $decoded : [];
+    }
+
+    /**
+     * Base64URL decode. Needs some character conversions to be compatible
+     * with PHP's default base64 handling.
+     */
+    protected function base64UrlDecode(string $encoded): string
+    {
+        return base64_decode(strtr($encoded, '-_', '+/'));
+    }
+
+    /**
+     * Validate common parts of OIDC JWT tokens.
+     *
+     * @throws OidcInvalidTokenException
+     */
+    protected function validateCommonTokenDetails(): bool
+    {
+        $this->validateTokenStructure();
+        $this->validateTokenSignature();
+        $this->validateCommonClaims();
+
+        return true;
+    }
+
+    /**
+     * Fetch a specific claim from this token.
+     * Returns null if it is null or does not exist.
+     */
+    public function getClaim(string $claim): mixed
+    {
+        return $this->payload[$claim] ?? null;
+    }
+
+    /**
+     * Get all returned claims within the token.
+     */
+    public function getAllClaims(): array
+    {
+        return $this->payload;
+    }
+
+    /**
+     * Replace the existing claim data of this token with that provided.
+     */
+    public function replaceClaims(array $claims): void
+    {
+        $this->payload = $claims;
+    }
+
+    /**
+     * Validate the structure of the given token and ensure we have the required pieces.
+     * As per https://datatracker.ietf.org/doc/html/rfc7519#section-7.2.
+     *
+     * @throws OidcInvalidTokenException
+     */
+    protected function validateTokenStructure(): void
+    {
+        foreach (['header', 'payload'] as $prop) {
+            if (empty($this->$prop) || !is_array($this->$prop)) {
+                throw new OidcInvalidTokenException("Could not parse out a valid {$prop} within the provided token");
+            }
+        }
+
+        if (empty($this->signature) || !is_string($this->signature)) {
+            throw new OidcInvalidTokenException('Could not parse out a valid signature within the provided token');
+        }
+    }
+
+    /**
+     * Validate the signature of the given token and ensure it validates against the provided key.
+     *
+     * @throws OidcInvalidTokenException
+     */
+    protected function validateTokenSignature(): void
+    {
+        if ($this->header['alg'] !== 'RS256') {
+            throw new OidcInvalidTokenException("Only RS256 signature validation is supported. Token reports using {$this->header['alg']}");
+        }
+
+        $parsedKeys = array_map(function ($key) {
+            try {
+                return new OidcJwtSigningKey($key);
+            } catch (OidcInvalidKeyException $e) {
+                throw new OidcInvalidTokenException('Failed to read signing key with error: ' . $e->getMessage());
+            }
+        }, $this->keys);
+
+        $parsedKeys = array_filter($parsedKeys);
+
+        $contentToSign = $this->tokenParts[0] . '.' . $this->tokenParts[1];
+        /** @var OidcJwtSigningKey $parsedKey */
+        foreach ($parsedKeys as $parsedKey) {
+            if ($parsedKey->verify($contentToSign, $this->signature)) {
+                return;
+            }
+        }
+
+        throw new OidcInvalidTokenException('Token signature could not be validated using the provided keys');
+    }
+
+    /**
+     * Validate common claims for OIDC JWT tokens.
+     * As per https://openid.net/specs/openid-connect-basic-1_0.html#IDTokenValidation
+     * and https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse
+     *
+     * @throws OidcInvalidTokenException
+     */
+    public function validateCommonClaims(): void
+    {
+        // 1. The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery)
+        // MUST exactly match the value of the iss (issuer) Claim.
+        if (empty($this->payload['iss']) || $this->issuer !== $this->payload['iss']) {
+            throw new OidcInvalidTokenException('Missing or non-matching token issuer value');
+        }
+
+        // 2. The Client MUST validate that the aud (audience) Claim contains its client_id value registered
+        // at the Issuer identified by the iss (issuer) Claim as an audience. The ID Token MUST be rejected
+        // if the ID Token does not list the Client as a valid audience.
+        if (empty($this->payload['aud'])) {
+            throw new OidcInvalidTokenException('Missing token audience value');
+        }
+
+        $aud = is_string($this->payload['aud']) ? [$this->payload['aud']] : $this->payload['aud'];
+        if (!in_array($this->payload['aud'], $aud, true)) {
+            throw new OidcInvalidTokenException('Token audience value did not match the expected client_id');
+        }
+    }
+}
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 6d024ae32e4..6bb326e4bdc 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -246,7 +246,11 @@ protected function getUserDetailsFromToken(OidcIdToken $idToken, OidcAccessToken
         if (!$userDetails->isFullyPopulated($this->shouldSyncGroups()) && !empty($settings->userinfoEndpoint)) {
             $provider = $this->getProvider($settings);
             $request = $provider->getAuthenticatedRequest('GET', $settings->userinfoEndpoint, $accessToken->getToken());
-            $response = new OidcUserinfoResponse($provider->getResponse($request));
+            $response = new OidcUserinfoResponse(
+                $provider->getResponse($request),
+                $settings->issuer,
+                $settings->keys,
+            );
 
             try {
                 $response->validate($idToken->getClaim('sub'));
diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
index 7c7760434b0..bb6c2454ad2 100644
--- a/app/Access/Oidc/OidcUserinfoResponse.php
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -7,14 +7,20 @@
 class OidcUserinfoResponse implements ProvidesClaims
 {
     protected array $claims = [];
+    protected ?OidcJwtWithClaims $jwt = null;
 
-    public function __construct(ResponseInterface $response)
+    public function __construct(ResponseInterface $response, string $issuer, array $keys)
     {
-        if ($response->getHeader('Content-Type')[0] === 'application/json') {
+        $contentType = $response->getHeader('Content-Type')[0];
+        if ($contentType === 'application/json') {
             $this->claims = json_decode($response->getBody()->getContents(), true);
         }
 
-        // TODO - Support JWTs
+        if ($contentType === 'application/jwt') {
+            $this->jwt = new OidcJwtWithClaims($response->getBody()->getContents(), $issuer, $keys);
+            $this->claims = $this->jwt->getAllClaims();
+        }
+
         // TODO - Response validation (5.3.4):
             // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
             // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
@@ -26,6 +32,10 @@ public function __construct(ResponseInterface $response)
      */
     public function validate(string $idTokenSub): bool
     {
+        if (!is_null($this->jwt)) {
+            $this->jwt->validateCommonClaims();
+        }
+
         $sub = $this->getClaim('sub');
 
         // Spec: v1.0 5.3.2: The sub (subject) Claim MUST always be returned in the UserInfo Response.

From 0958909cd999be772c045aada5bc426dffb0a0b1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 19 Apr 2024 15:05:00 +0100
Subject: [PATCH 104/666] OIDC Userinfo: Added additional tests to cover jwks
 usage

---
 app/Access/Oidc/OidcJwtWithClaims.php    |  4 +-
 app/Access/Oidc/OidcUserinfoResponse.php | 15 +++---
 tests/Auth/OidcTest.php                  | 62 ++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/app/Access/Oidc/OidcJwtWithClaims.php b/app/Access/Oidc/OidcJwtWithClaims.php
index cc13936ab65..393ac5f0e25 100644
--- a/app/Access/Oidc/OidcJwtWithClaims.php
+++ b/app/Access/Oidc/OidcJwtWithClaims.php
@@ -59,7 +59,7 @@ protected function base64UrlDecode(string $encoded): string
      *
      * @throws OidcInvalidTokenException
      */
-    protected function validateCommonTokenDetails(): bool
+    public function validateCommonTokenDetails(): bool
     {
         $this->validateTokenStructure();
         $this->validateTokenSignature();
@@ -151,7 +151,7 @@ protected function validateTokenSignature(): void
      *
      * @throws OidcInvalidTokenException
      */
-    public function validateCommonClaims(): void
+    protected function validateCommonClaims(): void
     {
         // 1. The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery)
         // MUST exactly match the value of the iss (issuer) Claim.
diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
index bb6c2454ad2..0026d2f0aed 100644
--- a/app/Access/Oidc/OidcUserinfoResponse.php
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -20,11 +20,6 @@ public function __construct(ResponseInterface $response, string $issuer, array $
             $this->jwt = new OidcJwtWithClaims($response->getBody()->getContents(), $issuer, $keys);
             $this->claims = $this->jwt->getAllClaims();
         }
-
-        // TODO - Response validation (5.3.4):
-            // TODO - Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
-            // TODO - If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
-            // TODO - If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
     }
 
     /**
@@ -33,7 +28,7 @@ public function __construct(ResponseInterface $response, string $issuer, array $
     public function validate(string $idTokenSub): bool
     {
         if (!is_null($this->jwt)) {
-            $this->jwt->validateCommonClaims();
+            $this->jwt->validateCommonTokenDetails();
         }
 
         $sub = $this->getClaim('sub');
@@ -49,6 +44,14 @@ public function validate(string $idTokenSub): bool
             throw new OidcInvalidTokenException("Subject value provided in the userinfo endpoint does not match the provided ID token value");
         }
 
+        // Spec v1.0 5.3.4 Defines the following:
+        // Verify that the OP that responded was the intended OP through a TLS server certificate check, per RFC 6125 [RFC6125].
+          // This is effectively done as part of the HTTP request we're making through CURLOPT_SSL_VERIFYHOST on the request.
+        // If the Client has provided a userinfo_encrypted_response_alg parameter during Registration, decrypt the UserInfo Response using the keys specified during Registration.
+          // We don't currently support JWT encryption for OIDC
+        // If the response was signed, the Client SHOULD validate the signature according to JWS [JWS].
+          // This is done as part of the validateCommonClaims above.
+
         return true;
     }
 
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 9ed3fa7b9a7..9bde71c80ef 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -787,6 +787,68 @@ public function test_userinfo_endpoint_fetch_can_parsed_nested_groups()
         $this->assertTrue($user->hasRole($roleA->id));
     }
 
+    public function test_userinfo_endpoint_jwks_response_handled()
+    {
+        $userinfoResponseData = OidcJwtHelper::idToken(['name' => 'Barry Jwks']);
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/jwt'], $userinfoResponseData);
+
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/');
+
+        $user = User::where('email', OidcJwtHelper::defaultPayload()['email'])->first();
+        $this->assertEquals('Barry Jwks', $user->name);
+    }
+
+    public function test_userinfo_endpoint_jwks_response_returning_no_sub_throws()
+    {
+        $userinfoResponseData = OidcJwtHelper::idToken(['sub' => null]);
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/jwt'], $userinfoResponseData);
+
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: No valid subject value found in userinfo data');
+    }
+
+    public function test_userinfo_endpoint_jwks_response_returning_non_matching_sub_throws()
+    {
+        $userinfoResponseData = OidcJwtHelper::idToken(['sub' => 'zzz123']);
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/jwt'], $userinfoResponseData);
+
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: Subject value provided in the userinfo endpoint does not match the provided ID token value');
+    }
+
+    public function test_userinfo_endpoint_jwks_response_with_invalid_signature_throws()
+    {
+        $userinfoResponseData = OidcJwtHelper::idToken();
+        $exploded = explode('.', $userinfoResponseData);
+        $exploded[2] = base64_encode(base64_decode($exploded[2]) . 'ABC');
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/jwt'], implode('.', $exploded));
+
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: Token signature could not be validated using the provided keys');
+    }
+
+    public function test_userinfo_endpoint_jwks_response_with_invalid_signature_alg_throws()
+    {
+        $userinfoResponseData = OidcJwtHelper::idToken([], ['alg' => 'ZZ512']);
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/jwt'], $userinfoResponseData);
+
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: Only RS256 signature validation is supported. Token reports using ZZ512');
+    }
+
+    public function test_userinfo_endpoint_response_with_invalid_content_type_throws()
+    {
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'application/beans'], json_encode(OidcJwtHelper::defaultPayload()));
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Userinfo endpoint response validation failed with error: No valid subject value found in userinfo data');
+    }
+
     protected function withAutodiscovery(): void
     {
         config()->set([

From 8b14a701a4792ecc0f8dc500d78e5810597eb4ac Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 19 Apr 2024 16:43:51 +0100
Subject: [PATCH 105/666] OIDC Userinfo: Fixed issues with validation logic
 from changes

Also updated test to suit validation changes
---
 app/Access/Oidc/OidcIdToken.php          | 2 +-
 app/Access/Oidc/OidcJwtWithClaims.php    | 8 ++++----
 app/Access/Oidc/OidcService.php          | 2 +-
 app/Access/Oidc/OidcUserinfoResponse.php | 4 ++--
 tests/Unit/OidcIdTokenTest.php           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Access/Oidc/OidcIdToken.php b/app/Access/Oidc/OidcIdToken.php
index f3fad0e1eeb..68a8aa61168 100644
--- a/app/Access/Oidc/OidcIdToken.php
+++ b/app/Access/Oidc/OidcIdToken.php
@@ -11,7 +11,7 @@ class OidcIdToken extends OidcJwtWithClaims implements ProvidesClaims
      */
     public function validate(string $clientId): bool
     {
-        parent::validateCommonClaims();
+        parent::validateCommonTokenDetails($clientId);
         $this->validateTokenClaims($clientId);
 
         return true;
diff --git a/app/Access/Oidc/OidcJwtWithClaims.php b/app/Access/Oidc/OidcJwtWithClaims.php
index 393ac5f0e25..06c04d81eb7 100644
--- a/app/Access/Oidc/OidcJwtWithClaims.php
+++ b/app/Access/Oidc/OidcJwtWithClaims.php
@@ -59,11 +59,11 @@ protected function base64UrlDecode(string $encoded): string
      *
      * @throws OidcInvalidTokenException
      */
-    public function validateCommonTokenDetails(): bool
+    public function validateCommonTokenDetails(string $clientId): bool
     {
         $this->validateTokenStructure();
         $this->validateTokenSignature();
-        $this->validateCommonClaims();
+        $this->validateCommonClaims($clientId);
 
         return true;
     }
@@ -151,7 +151,7 @@ protected function validateTokenSignature(): void
      *
      * @throws OidcInvalidTokenException
      */
-    protected function validateCommonClaims(): void
+    protected function validateCommonClaims(string $clientId): void
     {
         // 1. The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery)
         // MUST exactly match the value of the iss (issuer) Claim.
@@ -167,7 +167,7 @@ protected function validateCommonClaims(): void
         }
 
         $aud = is_string($this->payload['aud']) ? [$this->payload['aud']] : $this->payload['aud'];
-        if (!in_array($this->payload['aud'], $aud, true)) {
+        if (!in_array($clientId, $aud, true)) {
             throw new OidcInvalidTokenException('Token audience value did not match the expected client_id');
         }
     }
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 6bb326e4bdc..7c1760649b5 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -253,7 +253,7 @@ protected function getUserDetailsFromToken(OidcIdToken $idToken, OidcAccessToken
             );
 
             try {
-                $response->validate($idToken->getClaim('sub'));
+                $response->validate($idToken->getClaim('sub'), $settings->clientId);
             } catch (OidcInvalidTokenException $exception) {
                 throw new OidcException("Userinfo endpoint response validation failed with error: {$exception->getMessage()}");
             }
diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
index 0026d2f0aed..9aded654e31 100644
--- a/app/Access/Oidc/OidcUserinfoResponse.php
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -25,10 +25,10 @@ public function __construct(ResponseInterface $response, string $issuer, array $
     /**
      * @throws OidcInvalidTokenException
      */
-    public function validate(string $idTokenSub): bool
+    public function validate(string $idTokenSub, string $clientId): bool
     {
         if (!is_null($this->jwt)) {
-            $this->jwt->validateCommonTokenDetails();
+            $this->jwt->validateCommonTokenDetails($clientId);
         }
 
         $sub = $this->getClaim('sub');
diff --git a/tests/Unit/OidcIdTokenTest.php b/tests/Unit/OidcIdTokenTest.php
index 6302f84c75f..73932326694 100644
--- a/tests/Unit/OidcIdTokenTest.php
+++ b/tests/Unit/OidcIdTokenTest.php
@@ -113,7 +113,7 @@ public function test_token_claim_error_cases()
             // 2. aud claim present
             ['Missing token audience value', ['aud' => null]],
             // 2. aud claim validates all values against those expected (Only expect single)
-            ['Token audience value has 2 values, Expected 1', ['aud' => ['abc', 'def']]],
+            ['Token audience value has 2 values, Expected 1', ['aud' => ['xxyyzz.aaa.bbccdd.123', 'def']]],
             // 2. aud claim matches client id
             ['Token audience value did not match the expected client_id', ['aud' => 'xxyyzz.aaa.bbccdd.456']],
             // 4. azp claim matches client id if present

From 16399b63be640fbe934ada9da1e8cc4f36b2c8d7 Mon Sep 17 00:00:00 2001
From: nesges <thomas@nesges.eu>
Date: Sun, 21 Apr 2024 16:08:28 +0200
Subject: [PATCH 106/666] better accessibility for honepot formfield

---
 resources/sass/_forms.scss              | 11 +++++++----
 resources/views/auth/register.blade.php |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index fc0eb49bd45..e7ee8c285b0 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -390,14 +390,17 @@ input[type=color] {
 }
 
 .form-group.ambrosia-container, .form-group.ambrosia-container * {
-    position:absolute;
-    height:0px !important;
-    width:0px !important;
-    margin:0 !important;
+    position:absolute !important;
+    height:1px !important;
+    width:1px !important;
+    margin:-1px !important;
     padding:0 !important;
     background:transparent !important;
     color:transparent !important;
     border:none !important;
+    overflow: hidden !important;
+    clip: rect(0,0,0,0) !important;
+	white-space: nowrap !important;
 }
 
 .title-input input[type="text"] {
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index c271bb34bec..f9f4e8cb3d5 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -13,7 +13,7 @@
             <form action="{{ url("/register") }}" method="POST" class="mt-l stretch-inputs">
                 {!! csrf_field() !!}
 
-                <div class="form-group ambrosia-container">
+                <div class="form-group ambrosia-container" aria-hidden="true">
                     <label for="name">{{ trans('auth.name') }}</label>
                     @include('form.text', ['name' => 'username'])
                 </div>

From 0d2a268be09ed1ec55e90f2bd085d6e5034d0660 Mon Sep 17 00:00:00 2001
From: nesges <thomas@nesges.eu>
Date: Sun, 21 Apr 2024 17:44:01 +0200
Subject: [PATCH 107/666] whitespace only

---
 resources/sass/_forms.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index e7ee8c285b0..e6d062ce876 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -400,7 +400,7 @@ input[type=color] {
     border:none !important;
     overflow: hidden !important;
     clip: rect(0,0,0,0) !important;
-	white-space: nowrap !important;
+    white-space: nowrap !important;
 }
 
 .title-input input[type="text"] {
@@ -552,4 +552,4 @@ input.shortcut-input {
   width: auto;
   max-width: 120px;
   height: auto;
-}
\ No newline at end of file
+}

From bb6670d395180f8a81bcbfd92da1896fcfb18d34 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 22 Apr 2024 16:40:42 +0100
Subject: [PATCH 108/666] PDF: Started new command option, merged options,
 simplified dompdf

- Updated DOMPDF to direcly use library instead of depending on barry
wrapper.
- Merged existing export options file into single exports file.
- Defined option for new command option.

Related to #4732
---
 .env.example.complete                  |   8 ++
 app/Config/app.php                     |   1 -
 app/Config/{dompdf.php => exports.php} |  53 +++++++++----
 app/Config/snappy.php                  |  34 --------
 app/Entities/Tools/PdfGenerator.php    |  56 +++++++++++--
 composer.json                          |   2 +-
 composer.lock                          | 105 ++++---------------------
 readme.md                              |   1 -
 8 files changed, 110 insertions(+), 150 deletions(-)
 rename app/Config/{dompdf.php => exports.php} (88%)
 delete mode 100644 app/Config/snappy.php

diff --git a/.env.example.complete b/.env.example.complete
index 1242968182a..b4beb60cc0e 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -325,6 +325,14 @@ FILE_UPLOAD_SIZE_LIMIT=50
 # Can be 'a4' or 'letter'.
 EXPORT_PAGE_SIZE=a4
 
+# Export PDF Command
+# Set a command which can be used to convert a HTML file into a PDF file.
+# When false this will not be used.
+# String values represent the command to be called for conversion.
+# Supports '{input_html_path}' and '{output_pdf_path}' placeholder values.
+# Example: EXPORT_PDF_COMMAND="/scripts/convert.sh {input_html_path} {output_pdf_path}"
+EXPORT_PDF_COMMAND=false
+
 # Set path to wkhtmltopdf binary for PDF generation.
 # Can be 'false' or a path path like: '/home/bins/wkhtmltopdf'
 # When false, BookStack will attempt to find a wkhtmltopdf in the application
diff --git a/app/Config/app.php b/app/Config/app.php
index dda787f3f99..67f31159f60 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -116,7 +116,6 @@
     // Application Service Providers
     'providers' => ServiceProvider::defaultProviders()->merge([
         // Third party service providers
-        Barryvdh\DomPDF\ServiceProvider::class,
         Barryvdh\Snappy\ServiceProvider::class,
         SocialiteProviders\Manager\ServiceProvider::class,
 
diff --git a/app/Config/dompdf.php b/app/Config/exports.php
similarity index 88%
rename from app/Config/dompdf.php
rename to app/Config/exports.php
index 09dd91bcc3c..63cc2419d3b 100644
--- a/app/Config/dompdf.php
+++ b/app/Config/exports.php
@@ -1,23 +1,56 @@
 <?php
 
 /**
- * DOMPDF configuration options.
+ * Export configuration options.
  *
  * Changes to these config files are not supported by BookStack and may break upon updates.
  * Configuration should be altered via the `.env` file or environment variables.
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 
+$snappyPaperSizeMap = [
+    'a4'     => 'A4',
+    'letter' => 'Letter',
+];
+
 $dompdfPaperSizeMap = [
     'a4'     => 'a4',
     'letter' => 'letter',
 ];
 
+$exportPageSize = env('EXPORT_PAGE_SIZE', 'a4');
+
 return [
 
-    'show_warnings' => false,   // Throw an Exception on warnings from dompdf
+    // Set a command which can be used to convert a HTML file into a PDF file.
+    // When false this will not be used.
+    // String values represent the command to be called for conversion.
+    // Supports '{input_html_path}' and '{output_pdf_path}' placeholder values.
+    // Example: EXPORT_PDF_COMMAND="/scripts/convert.sh {input_html_path} {output_pdf_path}"
+    'pdf_command' => env('EXPORT_PDF_COMMAND', false),
+
+    // 2024-04: Snappy/WKHTMLtoPDF now considered deprecated in regard to BookStack support.
+    'snappy' => [
+        'pdf' => [
+            'enabled' => true,
+            'binary'  => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false),
+            'timeout' => false,
+            'options' => [
+                'outline'   => true,
+                'page-size' => $snappyPaperSizeMap[$exportPageSize] ?? 'A4',
+            ],
+            'env'     => [],
+        ],
+        'image' => [
+            'enabled' => false,
+            'binary'  => '/usr/local/bin/wkhtmltoimage',
+            'timeout' => false,
+            'options' => [],
+            'env'     => [],
+        ],
+    ],
 
-    'options'       => [
+    'dompdf' => [
         /**
          * The location of the DOMPDF font directory.
          *
@@ -101,7 +134,7 @@
         /**
          * Whether to enable font subsetting or not.
          */
-        'enable_fontsubsetting' => false,
+        'enable_font_subsetting' => false,
 
         /**
          * The PDF rendering backend to use.
@@ -165,7 +198,7 @@
          *
          * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
          */
-        'default_paper_size' => $dompdfPaperSizeMap[env('EXPORT_PAGE_SIZE', 'a4')] ?? 'a4',
+        'default_paper_size' => $dompdfPaperSizeMap[$exportPageSize] ?? 'a4',
 
         /**
          * The default paper orientation.
@@ -268,15 +301,6 @@
          */
         'font_height_ratio' => 1.1,
 
-        /**
-         * Enable CSS float.
-         *
-         * Allows people to disabled CSS float support
-         *
-         * @var bool
-         */
-        'enable_css_float' => true,
-
         /**
          * Use the HTML5 Lib parser.
          *
@@ -286,5 +310,4 @@
          */
         'enable_html5_parser' => true,
     ],
-
 ];
diff --git a/app/Config/snappy.php b/app/Config/snappy.php
deleted file mode 100644
index a87ce805f92..00000000000
--- a/app/Config/snappy.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * SnappyPDF configuration options.
- *
- * Changes to these config files are not supported by BookStack and may break upon updates.
- * Configuration should be altered via the `.env` file or environment variables.
- * Do not edit this file unless you're happy to maintain any changes yourself.
- */
-
-$snappyPaperSizeMap = [
-    'a4'     => 'A4',
-    'letter' => 'Letter',
-];
-
-return [
-    'pdf' => [
-        'enabled' => true,
-        'binary'  => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false),
-        'timeout' => false,
-        'options' => [
-            'outline'   => true,
-            'page-size' => $snappyPaperSizeMap[env('EXPORT_PAGE_SIZE', 'a4')] ?? 'A4',
-        ],
-        'env'     => [],
-    ],
-    'image' => [
-        'enabled' => false,
-        'binary'  => '/usr/local/bin/wkhtmltoimage',
-        'timeout' => false,
-        'options' => [],
-        'env'     => [],
-    ],
-];
diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Entities/Tools/PdfGenerator.php
index d0c9158a91c..7502c10ff43 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Entities/Tools/PdfGenerator.php
@@ -2,27 +2,32 @@
 
 namespace BookStack\Entities\Tools;
 
-use Barryvdh\DomPDF\Facade\Pdf as DomPDF;
 use Barryvdh\Snappy\Facades\SnappyPdf;
+use Dompdf\Dompdf;
 
 class PdfGenerator
 {
     const ENGINE_DOMPDF = 'dompdf';
     const ENGINE_WKHTML = 'wkhtml';
+    const ENGINE_COMMAND = 'command';
 
     /**
      * Generate PDF content from the given HTML content.
      */
     public function fromHtml(string $html): string
     {
-        if ($this->getActiveEngine() === self::ENGINE_WKHTML) {
+        $engine = $this->getActiveEngine();
+
+        if ($engine === self::ENGINE_WKHTML) {
             $pdf = SnappyPDF::loadHTML($html);
             $pdf->setOption('print-media-type', true);
-        } else {
-            $pdf = DomPDF::loadHTML($html);
+            return $pdf->output();
+        } else if ($engine === self::ENGINE_COMMAND) {
+            // TODO - Support PDF command
+            return '';
         }
 
-        return $pdf->output();
+        return $this->renderUsingDomPdf($html);
     }
 
     /**
@@ -31,8 +36,45 @@ public function fromHtml(string $html): string
      */
     public function getActiveEngine(): string
     {
-        $useWKHTML = config('snappy.pdf.binary') !== false && config('app.allow_untrusted_server_fetching') === true;
+        $wkhtmlBinaryPath = config('snappy.pdf.binary');
+        if (file_exists(base_path('wkhtmltopdf'))) {
+            $wkhtmlBinaryPath = base_path('wkhtmltopdf');
+        }
+
+        if (is_string($wkhtmlBinaryPath) && config('app.allow_untrusted_server_fetching') === true) {
+            return self::ENGINE_WKHTML;
+        }
+
+        return self::ENGINE_DOMPDF;
+    }
+
+    protected function renderUsingDomPdf(string $html): string
+    {
+        $options = config('exports.dompdf');
+        $domPdf = new Dompdf($options);
+        $domPdf->setBasePath(base_path('public'));
 
-        return $useWKHTML ? self::ENGINE_WKHTML : self::ENGINE_DOMPDF;
+        $domPdf->loadHTML($this->convertEntities($html));
+        $domPdf->render();
+
+        return (string) $domPdf->output();
+    }
+
+    /**
+     * Taken from https://github.com/barryvdh/laravel-dompdf/blob/v2.1.1/src/PDF.php
+     * Copyright (c) 2021 barryvdh, MIT License
+     * https://github.com/barryvdh/laravel-dompdf/blob/v2.1.1/LICENSE
+     */
+    protected function convertEntities(string $subject): string
+    {
+        $entities = [
+            '€' => '&euro;',
+            '£' => '&pound;',
+        ];
+
+        foreach ($entities as $search => $replace) {
+            $subject = str_replace($search, $replace, $subject);
+        }
+        return $subject;
     }
 }
diff --git a/composer.json b/composer.json
index b22c7b44de9..94f64ec7245 100644
--- a/composer.json
+++ b/composer.json
@@ -17,9 +17,9 @@
         "ext-mbstring": "*",
         "ext-xml": "*",
         "bacon/bacon-qr-code": "^2.0",
-        "barryvdh/laravel-dompdf": "^2.0",
         "barryvdh/laravel-snappy": "^1.0",
         "doctrine/dbal": "^3.5",
+        "dompdf/dompdf": "^2.0",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "laravel/framework": "^10.10",
diff --git a/composer.lock b/composer.lock
index 24c2215dd5f..657a5a7fb78 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ccfc07d0ecc580962915a0457f0466a7",
+    "content-hash": "c0c5a3169cb23d9ab8e34324202d4c37",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -209,83 +209,6 @@
             },
             "time": "2022-12-07T17:46:57+00:00"
         },
-        {
-            "name": "barryvdh/laravel-dompdf",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "cb37868365f9b937039d316727a1fced1e87b31c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
-                "reference": "cb37868365f9b937039d316727a1fced1e87b31c",
-                "shasum": ""
-            },
-            "require": {
-                "dompdf/dompdf": "^2.0.3",
-                "illuminate/support": "^6|^7|^8|^9|^10|^11",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "larastan/larastan": "^1.0|^2.7.0",
-                "orchestra/testbench": "^4|^5|^6|^7|^8|^9",
-                "phpro/grumphp": "^1 || ^2.5",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Barryvdh\\DomPDF\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf",
-                        "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\DomPDF\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "A DOMPDF Wrapper for Laravel",
-            "keywords": [
-                "dompdf",
-                "laravel",
-                "pdf"
-            ],
-            "support": {
-                "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
-                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-15T12:48:39+00:00"
-        },
         {
             "name": "barryvdh/laravel-snappy",
             "version": "v1.0.3",
@@ -1127,16 +1050,16 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.4",
+            "version": "v2.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "093f2d9739cec57428e39ddadedfd4f3ae862c0f"
+                "reference": "ab0123052b42ad0867348f25df8c228f1ece8f14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/093f2d9739cec57428e39ddadedfd4f3ae862c0f",
-                "reference": "093f2d9739cec57428e39ddadedfd4f3ae862c0f",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/ab0123052b42ad0867348f25df8c228f1ece8f14",
+                "reference": "ab0123052b42ad0867348f25df8c228f1ece8f14",
                 "shasum": ""
             },
             "require": {
@@ -1144,7 +1067,7 @@
                 "ext-mbstring": "*",
                 "masterminds/html5": "^2.0",
                 "phenx/php-font-lib": ">=0.5.4 <1.0.0",
-                "phenx/php-svg-lib": ">=0.3.3 <1.0.0",
+                "phenx/php-svg-lib": ">=0.5.2 <1.0.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
@@ -1183,9 +1106,9 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.4"
+                "source": "https://github.com/dompdf/dompdf/tree/v2.0.7"
             },
-            "time": "2023-12-12T20:19:39+00:00"
+            "time": "2024-04-15T12:40:33+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -4067,16 +3990,16 @@
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.5.3",
+            "version": "0.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf"
+                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/0e46722c154726a5f9ac218197ccc28adba16fcf",
-                "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/46b25da81613a9cf43c83b2a8c2c1bdab27df691",
+                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691",
                 "shasum": ""
             },
             "require": {
@@ -4107,9 +4030,9 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.3"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.4"
             },
-            "time": "2024-02-23T20:39:24+00:00"
+            "time": "2024-04-08T12:52:34+00:00"
         },
         {
             "name": "phpoption/phpoption",
diff --git a/readme.md b/readme.md
index 17e1a05f659..5adcc06bbcc 100644
--- a/readme.md
+++ b/readme.md
@@ -142,7 +142,6 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [Google Material Icons](https://github.com/google/material-design-icons) - _[Apache-2.0](https://github.com/google/material-design-icons/blob/master/LICENSE)_
 * [markdown-it](https://github.com/markdown-it/markdown-it) and [markdown-it-task-lists](https://github.com/revin/markdown-it-task-lists) - _[MIT](https://github.com/markdown-it/markdown-it/blob/master/LICENSE) and [ISC](https://github.com/revin/markdown-it-task-lists/blob/master/LICENSE)_
 * [Dompdf](https://github.com/dompdf/dompdf) - _[LGPL v2.1](https://github.com/dompdf/dompdf/blob/master/LICENSE.LGPL)_
-* [BarryVD/Dompdf](https://github.com/barryvdh/laravel-dompdf) - _[MIT](https://github.com/barryvdh/laravel-dompdf/blob/master/LICENSE)_
 * [BarryVD/Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy) - _[MIT](https://github.com/barryvdh/laravel-snappy/blob/master/LICENSE)_
 * [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) - _[LGPL v3.0](https://github.com/wkhtmltopdf/wkhtmltopdf/blob/master/LICENSE)_
 * [diagrams.net](https://github.com/jgraph/drawio) - _[Embedded Version Terms](https://www.diagrams.net/trust/) / [Source Project - Apache-2.0](https://github.com/jgraph/drawio/blob/dev/LICENSE)_

From 40200856af366f735283da4cc1b28519ddb3586b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 24 Apr 2024 15:13:44 +0100
Subject: [PATCH 109/666] PDF: Removed barryvdh snappy to use snappy direct

Also simplifies config format, and updates snappy implmentation to use
the new config file.
Not yet tested.
---
 app/Config/app.php                  |  1 -
 app/Config/exports.php              | 21 ++------
 app/Entities/Tools/PdfGenerator.php | 30 +++++++----
 composer.json                       |  2 +-
 composer.lock                       | 80 +----------------------------
 readme.md                           |  2 +-
 6 files changed, 28 insertions(+), 108 deletions(-)

diff --git a/app/Config/app.php b/app/Config/app.php
index 67f31159f60..b96d0bdb788 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -116,7 +116,6 @@
     // Application Service Providers
     'providers' => ServiceProvider::defaultProviders()->merge([
         // Third party service providers
-        Barryvdh\Snappy\ServiceProvider::class,
         SocialiteProviders\Manager\ServiceProvider::class,
 
         // BookStack custom service providers
diff --git a/app/Config/exports.php b/app/Config/exports.php
index 63cc2419d3b..88dc08cba35 100644
--- a/app/Config/exports.php
+++ b/app/Config/exports.php
@@ -31,22 +31,11 @@
 
     // 2024-04: Snappy/WKHTMLtoPDF now considered deprecated in regard to BookStack support.
     'snappy' => [
-        'pdf' => [
-            'enabled' => true,
-            'binary'  => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false),
-            'timeout' => false,
-            'options' => [
-                'outline'   => true,
-                'page-size' => $snappyPaperSizeMap[$exportPageSize] ?? 'A4',
-            ],
-            'env'     => [],
-        ],
-        'image' => [
-            'enabled' => false,
-            'binary'  => '/usr/local/bin/wkhtmltoimage',
-            'timeout' => false,
-            'options' => [],
-            'env'     => [],
+        'pdf_binary' => env('WKHTMLTOPDF', false),
+        'options' => [
+            'print-media-type' => true,
+            'outline'   => true,
+            'page-size' => $snappyPaperSizeMap[$exportPageSize] ?? 'A4',
         ],
     ],
 
diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Entities/Tools/PdfGenerator.php
index 7502c10ff43..e187b9ab2c4 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Entities/Tools/PdfGenerator.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Tools;
 
-use Barryvdh\Snappy\Facades\SnappyPdf;
+use Knp\Snappy\Pdf as SnappyPdf;
 use Dompdf\Dompdf;
 
 class PdfGenerator
@@ -19,9 +19,7 @@ public function fromHtml(string $html): string
         $engine = $this->getActiveEngine();
 
         if ($engine === self::ENGINE_WKHTML) {
-            $pdf = SnappyPDF::loadHTML($html);
-            $pdf->setOption('print-media-type', true);
-            return $pdf->output();
+            return $this->renderUsingWkhtml($html);
         } else if ($engine === self::ENGINE_COMMAND) {
             // TODO - Support PDF command
             return '';
@@ -36,18 +34,23 @@ public function fromHtml(string $html): string
      */
     public function getActiveEngine(): string
     {
-        $wkhtmlBinaryPath = config('snappy.pdf.binary');
-        if (file_exists(base_path('wkhtmltopdf'))) {
-            $wkhtmlBinaryPath = base_path('wkhtmltopdf');
-        }
-
-        if (is_string($wkhtmlBinaryPath) && config('app.allow_untrusted_server_fetching') === true) {
+        if ($this->getWkhtmlBinaryPath() && config('app.allow_untrusted_server_fetching') === true) {
             return self::ENGINE_WKHTML;
         }
 
         return self::ENGINE_DOMPDF;
     }
 
+    protected function getWkhtmlBinaryPath(): string
+    {
+        $wkhtmlBinaryPath = config('exports.snappy.pdf_binary');
+        if (file_exists(base_path('wkhtmltopdf'))) {
+            $wkhtmlBinaryPath = base_path('wkhtmltopdf');
+        }
+
+        return $wkhtmlBinaryPath ?: '';
+    }
+
     protected function renderUsingDomPdf(string $html): string
     {
         $options = config('exports.dompdf');
@@ -60,6 +63,13 @@ protected function renderUsingDomPdf(string $html): string
         return (string) $domPdf->output();
     }
 
+    protected function renderUsingWkhtml(string $html): string
+    {
+        $snappy = new SnappyPdf($this->getWkhtmlBinaryPath());
+        $options = config('exports.snappy.options');
+        return $snappy->getOutputFromHtml($html, $options);
+    }
+
     /**
      * Taken from https://github.com/barryvdh/laravel-dompdf/blob/v2.1.1/src/PDF.php
      * Copyright (c) 2021 barryvdh, MIT License
diff --git a/composer.json b/composer.json
index 94f64ec7245..b90ab224eaa 100644
--- a/composer.json
+++ b/composer.json
@@ -17,11 +17,11 @@
         "ext-mbstring": "*",
         "ext-xml": "*",
         "bacon/bacon-qr-code": "^2.0",
-        "barryvdh/laravel-snappy": "^1.0",
         "doctrine/dbal": "^3.5",
         "dompdf/dompdf": "^2.0",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
+        "knplabs/knp-snappy": "^1.5",
         "laravel/framework": "^10.10",
         "laravel/socialite": "^5.10",
         "laravel/tinker": "^2.8",
diff --git a/composer.lock b/composer.lock
index 657a5a7fb78..ad5648d6bc3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c0c5a3169cb23d9ab8e34324202d4c37",
+    "content-hash": "97259e40ffe5518cfcdf1e32eacbb175",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -209,84 +209,6 @@
             },
             "time": "2022-12-07T17:46:57+00:00"
         },
-        {
-            "name": "barryvdh/laravel-snappy",
-            "version": "v1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/barryvdh/laravel-snappy.git",
-                "reference": "716dcb6db24de4ce8e6ae5941cfab152af337ea0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/716dcb6db24de4ce8e6ae5941cfab152af337ea0",
-                "reference": "716dcb6db24de4ce8e6ae5941cfab152af337ea0",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/filesystem": "^9|^10|^11.0",
-                "illuminate/support": "^9|^10|^11.0",
-                "knplabs/knp-snappy": "^1.4.4",
-                "php": ">=7.2"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^7|^8|^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Barryvdh\\Snappy\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "PDF": "Barryvdh\\Snappy\\Facades\\SnappyPdf",
-                        "SnappyImage": "Barryvdh\\Snappy\\Facades\\SnappyImage"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\Snappy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Snappy PDF/Image for Laravel",
-            "keywords": [
-                "image",
-                "laravel",
-                "pdf",
-                "snappy",
-                "wkhtmltoimage",
-                "wkhtmltopdf"
-            ],
-            "support": {
-                "issues": "https://github.com/barryvdh/laravel-snappy/issues",
-                "source": "https://github.com/barryvdh/laravel-snappy/tree/v1.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://fruitcake.nl",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-09T19:20:39+00:00"
-        },
         {
             "name": "brick/math",
             "version": "0.11.0",
diff --git a/readme.md b/readme.md
index 5adcc06bbcc..c46e1641f19 100644
--- a/readme.md
+++ b/readme.md
@@ -142,7 +142,7 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [Google Material Icons](https://github.com/google/material-design-icons) - _[Apache-2.0](https://github.com/google/material-design-icons/blob/master/LICENSE)_
 * [markdown-it](https://github.com/markdown-it/markdown-it) and [markdown-it-task-lists](https://github.com/revin/markdown-it-task-lists) - _[MIT](https://github.com/markdown-it/markdown-it/blob/master/LICENSE) and [ISC](https://github.com/revin/markdown-it-task-lists/blob/master/LICENSE)_
 * [Dompdf](https://github.com/dompdf/dompdf) - _[LGPL v2.1](https://github.com/dompdf/dompdf/blob/master/LICENSE.LGPL)_
-* [BarryVD/Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy) - _[MIT](https://github.com/barryvdh/laravel-snappy/blob/master/LICENSE)_
+* [KnpLabs/snappy](https://github.com/KnpLabs/snappy) - _[MIT](https://github.com/KnpLabs/snappy/blob/master/LICENSE)_
 * [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) - _[LGPL v3.0](https://github.com/wkhtmltopdf/wkhtmltopdf/blob/master/LICENSE)_
 * [diagrams.net](https://github.com/jgraph/drawio) - _[Embedded Version Terms](https://www.diagrams.net/trust/) / [Source Project - Apache-2.0](https://github.com/jgraph/drawio/blob/dev/LICENSE)_
 * [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) - _[MIT](https://github.com/onelogin/php-saml/blob/master/LICENSE)_

From 1c7128c2cb08271aa456951f6d6b4ce930df5cb5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 24 Apr 2024 16:09:53 +0100
Subject: [PATCH 110/666] PDF: Added implmentation of command PDF option

Tested quickly manually but not yet covered by PHPUnit tests.
---
 app/Entities/Tools/PdfGenerator.php   | 62 ++++++++++++++++++++++-----
 app/Exceptions/PdfExportException.php |  7 +++
 phpunit.xml                           |  1 +
 3 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 app/Exceptions/PdfExportException.php

diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Entities/Tools/PdfGenerator.php
index e187b9ab2c4..4f23ad334ec 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Entities/Tools/PdfGenerator.php
@@ -2,8 +2,10 @@
 
 namespace BookStack\Entities\Tools;
 
+use BookStack\Exceptions\PdfExportException;
 use Knp\Snappy\Pdf as SnappyPdf;
 use Dompdf\Dompdf;
+use Symfony\Component\Process\Process;
 
 class PdfGenerator
 {
@@ -13,19 +15,15 @@ class PdfGenerator
 
     /**
      * Generate PDF content from the given HTML content.
+     * @throws PdfExportException
      */
     public function fromHtml(string $html): string
     {
-        $engine = $this->getActiveEngine();
-
-        if ($engine === self::ENGINE_WKHTML) {
-            return $this->renderUsingWkhtml($html);
-        } else if ($engine === self::ENGINE_COMMAND) {
-            // TODO - Support PDF command
-            return '';
-        }
-
-        return $this->renderUsingDomPdf($html);
+        return match ($this->getActiveEngine()) {
+            self::ENGINE_COMMAND => $this->renderUsingCommand($html),
+            self::ENGINE_WKHTML => $this->renderUsingWkhtml($html),
+            default => $this->renderUsingDomPdf($html)
+        };
     }
 
     /**
@@ -34,6 +32,10 @@ public function fromHtml(string $html): string
      */
     public function getActiveEngine(): string
     {
+        if (config('exports.pdf_command')) {
+            return self::ENGINE_COMMAND;
+        }
+
         if ($this->getWkhtmlBinaryPath() && config('app.allow_untrusted_server_fetching') === true) {
             return self::ENGINE_WKHTML;
         }
@@ -63,6 +65,46 @@ protected function renderUsingDomPdf(string $html): string
         return (string) $domPdf->output();
     }
 
+    /**
+     * @throws PdfExportException
+     */
+    protected function renderUsingCommand(string $html): string
+    {
+        $command = config('exports.pdf_command');
+        $inputHtml = tempnam(sys_get_temp_dir(), 'bs-pdfgen-html-');
+        $outputPdf = tempnam(sys_get_temp_dir(), 'bs-pdfgen-output-');
+
+        $replacementsByPlaceholder = [
+            '{input_html_path}' => $inputHtml,
+            '{output_html_path}' => $outputPdf,
+        ];
+
+        foreach ($replacementsByPlaceholder as $placeholder => $replacement) {
+            $command = str_replace($placeholder, escapeshellarg($replacement), $command);
+        }
+
+        file_put_contents($inputHtml, $html);
+
+        $process = Process::fromShellCommandline($command);
+        $process->setTimeout(15);
+        $process->run();
+
+        if (!$process->isSuccessful()) {
+            throw new PdfExportException("PDF Export via command failed with exit code {$process->getExitCode()}, stdout: {$process->getOutput()}, stderr: {$process->getErrorOutput()}");
+        }
+
+        $pdfContents = file_get_contents($outputPdf);
+        unlink($outputPdf);
+
+        if ($pdfContents === false) {
+            throw new PdfExportException("PDF Export via command failed, unable to read PDF output file");
+        } else if (empty($pdfContents)) {
+            throw new PdfExportException("PDF Export via command failed, PDF output file is empty");
+        }
+
+        return $pdfContents;
+    }
+
     protected function renderUsingWkhtml(string $html): string
     {
         $snappy = new SnappyPdf($this->getWkhtmlBinaryPath());
diff --git a/app/Exceptions/PdfExportException.php b/app/Exceptions/PdfExportException.php
new file mode 100644
index 00000000000..beeda814f83
--- /dev/null
+++ b/app/Exceptions/PdfExportException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class PdfExportException extends \Exception
+{
+}
diff --git a/phpunit.xml b/phpunit.xml
index a9e97f0c78a..21f17685b5b 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -51,6 +51,7 @@
     <server name="LOG_FAILED_LOGIN_MESSAGE" value=""/>
     <server name="LOG_FAILED_LOGIN_CHANNEL" value="testing"/>
     <server name="WKHTMLTOPDF" value="false"/>
+    <server name="EXPORT_PDF_COMMAND" value="false"/>
     <server name="APP_DEFAULT_DARK_MODE" value="false"/>
     <server name="IP_ADDRESS_PRECISION" value="4"/>
   </php>

From 5860e1e2ce1dbcdc86370200fa1301d9ee98d674 Mon Sep 17 00:00:00 2001
From: Zero <john.royer@gmail.com>
Date: Thu, 25 Apr 2024 13:35:36 +0800
Subject: [PATCH 111/666] remove space at the beginning of description

---
 lang/en/preferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',

From f0dd33c1b47a1ae26c58e0d32ef824d2635efeb0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 26 Apr 2024 15:39:40 +0100
Subject: [PATCH 112/666] PDF: Added tests for pdf command, fixed old tests for
 changes

---
 app/Entities/Tools/PdfGenerator.php |  2 +-
 tests/Entity/ExportTest.php         | 39 +++++++++++++++++++++++++++--
 tests/Unit/ConfigTest.php           | 16 ++++++------
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Entities/Tools/PdfGenerator.php
index 4f23ad334ec..7c6dfaa6e8b 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Entities/Tools/PdfGenerator.php
@@ -76,7 +76,7 @@ protected function renderUsingCommand(string $html): string
 
         $replacementsByPlaceholder = [
             '{input_html_path}' => $inputHtml,
-            '{output_html_path}' => $outputPdf,
+            '{output_pdf_path}' => $outputPdf,
         ];
 
         foreach ($replacementsByPlaceholder as $placeholder => $replacement) {
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index eedcb672c99..040f69013a5 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -6,8 +6,8 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PdfGenerator;
+use BookStack\Exceptions\PdfExportException;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class ExportTest extends TestCase
@@ -483,7 +483,7 @@ public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true()
     {
         $page = $this->entities->page();
 
-        config()->set('snappy.pdf.binary', '/abc123');
+        config()->set('exports.snappy.pdf_binary', '/abc123');
         config()->set('app.allow_untrusted_server_fetching', false);
 
         $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
@@ -494,6 +494,41 @@ public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true()
         $resp->assertStatus(500); // Bad response indicates wkhtml usage
     }
 
+    public function test_pdf_command_option_used_if_set()
+    {
+        $page = $this->entities->page();
+        $command = 'cp {input_html_path} {output_pdf_path}';
+        config()->set('exports.pdf_command', $command);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $download = $resp->getContent();
+
+        $this->assertStringContainsString(e($page->name), $download);
+        $this->assertStringContainsString('<html lang=', $download);
+    }
+
+    public function test_pdf_command_option_errors_if_output_path_not_written_to()
+    {
+        $page = $this->entities->page();
+        $command = 'echo "hi"';
+        config()->set('exports.pdf_command', $command);
+
+        $this->assertThrows(function () use ($page) {
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+        }, PdfExportException::class);
+    }
+
+    public function test_pdf_command_option_errors_if_command_returns_error_status()
+    {
+        $page = $this->entities->page();
+        $command = 'exit 1';
+        config()->set('exports.pdf_command', $command);
+
+        $this->assertThrows(function () use ($page) {
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+        }, PdfExportException::class);
+    }
+
     public function test_html_exports_contain_csp_meta_tag()
     {
         $entities = [
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index aedcb75aa19..d5c74392ffc 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -80,22 +80,22 @@ public function test_saml2_idp_authn_context_string_parsed_as_space_separated_ar
 
     public function test_dompdf_remote_fetching_controlled_by_allow_untrusted_server_fetching_false()
     {
-        $this->checkEnvConfigResult('ALLOW_UNTRUSTED_SERVER_FETCHING', 'false', 'dompdf.options.enable_remote', false);
-        $this->checkEnvConfigResult('ALLOW_UNTRUSTED_SERVER_FETCHING', 'true', 'dompdf.options.enable_remote', true);
+        $this->checkEnvConfigResult('ALLOW_UNTRUSTED_SERVER_FETCHING', 'false', 'exports.dompdf.enable_remote', false);
+        $this->checkEnvConfigResult('ALLOW_UNTRUSTED_SERVER_FETCHING', 'true', 'exports.dompdf.enable_remote', true);
     }
 
     public function test_dompdf_paper_size_options_are_limited()
     {
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'cat', 'dompdf.options.default_paper_size', 'a4');
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'letter', 'dompdf.options.default_paper_size', 'letter');
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'dompdf.options.default_paper_size', 'a4');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'cat', 'exports.dompdf.default_paper_size', 'a4');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'letter', 'exports.dompdf.default_paper_size', 'letter');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'exports.dompdf.default_paper_size', 'a4');
     }
 
     public function test_snappy_paper_size_options_are_limited()
     {
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'cat', 'snappy.pdf.options.page-size', 'A4');
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'letter', 'snappy.pdf.options.page-size', 'Letter');
-        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'snappy.pdf.options.page-size', 'A4');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'cat', 'exports.snappy.options.page-size', 'A4');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'letter', 'exports.snappy.options.page-size', 'Letter');
+        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'exports.snappy.options.page-size', 'A4');
     }
 
     public function test_sendmail_command_is_configurable()

From 6b681961e503aa12893218db1ed9e6154c1b750c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 28 Apr 2024 12:29:57 +0100
Subject: [PATCH 113/666] LDAP: Updated default user filter placeholder format

To not conflict with env variables, and to align with placeholders used
for PDF gen command.
Added test to cover, including old format supported for
back-compatibility.
For #4967
---
 .env.example.complete      |  2 +-
 app/Access/LdapService.php |  9 +++++++--
 app/Config/services.php    |  2 +-
 tests/Auth/LdapTest.php    | 34 +++++++++++++++++++++++++++++++++-
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.env.example.complete b/.env.example.complete
index b4beb60cc0e..e3b2185cc29 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -215,7 +215,7 @@ LDAP_SERVER=false
 LDAP_BASE_DN=false
 LDAP_DN=false
 LDAP_PASS=false
-LDAP_USER_FILTER=false
+LDAP_USER_FILTER="(&(uid={user}))"
 LDAP_VERSION=false
 LDAP_START_TLS=false
 LDAP_TLS_INSECURE=false
diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 9d266763531..67f3d6f54c6 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -249,13 +249,18 @@ protected function parseServerString(string $serverString): string
 
     /**
      * Build a filter string by injecting common variables.
+     * Both "${var}" and "{var}" style placeholders are supported.
+     * Dollar based are old format but supported for compatibility.
      */
     protected function buildFilter(string $filterString, array $attrs): string
     {
         $newAttrs = [];
         foreach ($attrs as $key => $attrText) {
-            $newKey = '${' . $key . '}';
-            $newAttrs[$newKey] = $this->ldap->escape($attrText);
+            $escapedText = $this->ldap->escape($attrText);
+            $oldVarKey = '${' . $key . '}';
+            $newVarKey = '{' . $key . '}';
+            $newAttrs[$oldVarKey] = $escapedText;
+            $newAttrs[$newVarKey] = $escapedText;
         }
 
         return strtr($filterString, $newAttrs);
diff --git a/app/Config/services.php b/app/Config/services.php
index a035f105695..da07de13e9c 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -123,7 +123,7 @@
         'dn'                     => env('LDAP_DN', false),
         'pass'                   => env('LDAP_PASS', false),
         'base_dn'                => env('LDAP_BASE_DN', false),
-        'user_filter'            => env('LDAP_USER_FILTER', '(&(uid=${user}))'),
+        'user_filter'            => env('LDAP_USER_FILTER', '(&(uid={user}))'),
         'version'                => env('LDAP_VERSION', false),
         'id_attribute'           => env('LDAP_ID_ATTRIBUTE', 'uid'),
         'email_attribute'        => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 34900ce6f70..cb5fc5a8725 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
             'services.ldap.id_attribute'           => 'uid',
             'services.ldap.user_to_groups'         => false,
             'services.ldap.version'                => '3',
-            'services.ldap.user_filter'            => '(&(uid=${user}))',
+            'services.ldap.user_filter'            => '(&(uid={user}))',
             'services.ldap.follow_referrals'       => false,
             'services.ldap.tls_insecure'           => false,
             'services.ldap.thumbnail_attribute'    => null,
@@ -178,6 +178,38 @@ public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properl
         $this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => 'cooluser456']);
     }
 
+    public function test_user_filter_default_placeholder_format()
+    {
+        config()->set('services.ldap.user_filter', '(&(uid={user}))');
+        $this->mockUser->name = 'barryldapuser';
+        $expectedFilter = '(&(uid=\62\61\72\72\79\6c\64\61\70\75\73\65\72))';
+
+        $this->commonLdapMocks(1, 1, 1, 1, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')
+            ->once()
+            ->with($this->resourceId, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
+            ->andReturn(['count' => 0, 0 => []]);
+
+        $resp = $this->mockUserLogin();
+        $resp->assertRedirect('/login');
+    }
+
+    public function test_user_filter_old_placeholder_format()
+    {
+        config()->set('services.ldap.user_filter', '(&(username=${user}))');
+        $this->mockUser->name = 'barryldapuser';
+        $expectedFilter = '(&(username=\62\61\72\72\79\6c\64\61\70\75\73\65\72))';
+
+        $this->commonLdapMocks(1, 1, 1, 1, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')
+            ->once()
+            ->with($this->resourceId, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
+            ->andReturn(['count' => 0, 0 => []]);
+
+        $resp = $this->mockUserLogin();
+        $resp->assertRedirect('/login');
+    }
+
     public function test_initial_incorrect_credentials()
     {
         $this->commonLdapMocks(1, 1, 1, 0, 1);

From 06bb55184c3ae84c64f370d2adb37786ac804c58 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 29 Apr 2024 17:44:56 +0100
Subject: [PATCH 114/666] WYSIWYG: Fixed unexpected clearing of table cell
 styles

Fixes custom table cell clear-format handling since it was being called
on many format removals, not just the clear-formatting action.
This updates the code to specifically run on the RemoveFormat action
which is triggered by the clear formatting button.
Fixes #4964
---
 resources/js/wysiwyg/fixes.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/js/wysiwyg/fixes.js b/resources/js/wysiwyg/fixes.js
index 7f87d4378c6..61cace66052 100644
--- a/resources/js/wysiwyg/fixes.js
+++ b/resources/js/wysiwyg/fixes.js
@@ -29,12 +29,13 @@ export function handleEmbedAlignmentChanges(editor) {
 
     editor.on('FormatApply', event => {
         const isAlignment = event.format.startsWith('align');
-        if (!event.node || !event.node.matches('.mce-preview-object')) {
+        const isElement = event.node instanceof editor.dom.doc.defaultView.HTMLElement;
+        if (!isElement || !isAlignment || !event.node.matches('.mce-preview-object')) {
             return;
         }
 
         const realTarget = event.node.querySelector('iframe, video');
-        if (isAlignment && realTarget) {
+        if (realTarget) {
             const className = (editor.formatter.get(event.format)[0]?.classes || [])[0];
             const toAdd = !realTarget.classList.contains(className);
 
@@ -94,10 +95,12 @@ export function handleTableCellRangeEvents(editor) {
     // are selected. Here we watch for clear formatting events, so some manual
     // cleanup can be performed.
     const attrsToRemove = ['class', 'style', 'width', 'height'];
-    editor.on('FormatRemove', () => {
-        for (const cell of selectedCells) {
-            for (const attr of attrsToRemove) {
-                cell.removeAttribute(attr);
+    editor.on('ExecCommand', event => {
+        if (event.command === 'RemoveFormat') {
+            for (const cell of selectedCells) {
+                for (const attr of attrsToRemove) {
+                    cell.removeAttribute(attr);
+                }
             }
         }
     });

From 493d8027cd99656cdbeb92c01da99b5baa485a09 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 29 Apr 2024 19:21:13 +0100
Subject: [PATCH 115/666] Attachments: Fixed drag into editor in Chrome

Seemed to be chrome specific from testing.
Required editors to have preventDefault called on dragover.
Tested in Chrome, FF, & Safari.
Tested in both editors, and re-tested text/image drop to ensure still
works.

Fixed #4975
---
 resources/js/markdown/codemirror.js         |  4 ++++
 resources/js/wysiwyg/drop-paste-handling.js | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/resources/js/markdown/codemirror.js b/resources/js/markdown/codemirror.js
index 9d54c19d754..2ea944865c1 100644
--- a/resources/js/markdown/codemirror.js
+++ b/resources/js/markdown/codemirror.js
@@ -44,6 +44,10 @@ export async function init(editor) {
                 editor.actions.insertClipboardImages(clipboardImages, event.pageX, event.pageY);
             }
         },
+        // Handle dragover event to allow as drop-target in chrome
+        dragover: event => {
+            event.preventDefault();
+        },
         // Handle image paste
         paste: event => {
             const clipboard = new Clipboard(event.clipboardData || event.dataTransfer);
diff --git a/resources/js/wysiwyg/drop-paste-handling.js b/resources/js/wysiwyg/drop-paste-handling.js
index 9668692c81d..172ad970f0d 100644
--- a/resources/js/wysiwyg/drop-paste-handling.js
+++ b/resources/js/wysiwyg/drop-paste-handling.js
@@ -149,11 +149,26 @@ function drop(editor, options, event) {
     wrap = null;
 }
 
+/**
+ * @param {Editor} editor
+ * @param {DragEvent} event
+ */
+function dragOver(editor, event) {
+    // This custom handling essentially emulates the default TinyMCE behaviour while allowing us
+    // to specifically call preventDefault on the event to allow the drop of custom elements.
+    event.preventDefault();
+    editor.focus();
+    const rangeUtils = window.tinymce.dom.RangeUtils;
+    const range = rangeUtils.getCaretRangeFromPoint(event.clientX ?? 0, event.clientY ?? 0, editor.getDoc());
+    editor.selection.setRng(range);
+}
+
 /**
  * @param {Editor} editor
  * @param {WysiwygConfigOptions} options
  */
 export function listenForDragAndPaste(editor, options) {
+    editor.on('dragover', event => dragOver(editor, event));
     editor.on('dragstart', () => dragStart(editor));
     editor.on('drop', event => drop(editor, options, event));
     editor.on('paste', event => paste(editor, options, event));

From f95fb640aff2526e7f822d741be92f04fc52b584 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 1 May 2024 17:20:45 +0100
Subject: [PATCH 116/666] WYSWIYG: Improved use of object tags to embed content

- Prevented image toolbars showing for objects embeds due to tinymce
  image placeholder, and added media toolbar.
- Fixed height of object embed placeholder being forced to auto
  when in the editor, allowing height attributed to be properly
  reflected as it would on normal page view.

Closes #4974
---
 resources/js/wysiwyg/toolbars.js | 17 ++++++++++++++++-
 resources/sass/_content.scss     | 14 ++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/resources/js/wysiwyg/toolbars.js b/resources/js/wysiwyg/toolbars.js
index bd1ff1b6d94..897aa9f06ef 100644
--- a/resources/js/wysiwyg/toolbars.js
+++ b/resources/js/wysiwyg/toolbars.js
@@ -60,7 +60,7 @@ function registerLinkContextToolbar(editor) {
 function registerImageContextToolbar(editor) {
     editor.ui.registry.addContextToolbar('imagecontexttoolbar', {
         predicate(node) {
-            return node.closest('img') !== null;
+            return node.closest('img') !== null && !node.hasAttribute('data-mce-object');
         },
         position: 'node',
         scope: 'node',
@@ -68,6 +68,20 @@ function registerImageContextToolbar(editor) {
     });
 }
 
+/**
+ * @param {Editor} editor
+ */
+function registerObjectContextToolbar(editor) {
+    editor.ui.registry.addContextToolbar('objectcontexttoolbar', {
+        predicate(node) {
+            return node.closest('img') !== null && node.hasAttribute('data-mce-object');
+        },
+        position: 'node',
+        scope: 'node',
+        items: 'media',
+    });
+}
+
 /**
  * @param {Editor} editor
  */
@@ -75,4 +89,5 @@ export function registerAdditionalToolbars(editor) {
     registerPrimaryToolbarGroups(editor);
     registerLinkContextToolbar(editor);
     registerImageContextToolbar(editor);
+    registerObjectContextToolbar(editor);
 }
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index f844993644c..3aa4ac653d9 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -32,10 +32,6 @@
     margin-left: auto;
     margin-right: auto;
   }
-  img {
-    max-width: 100%;
-    height:auto;
-  }
   h1, h2, h3, h4, h5, h6, pre {
     clear: left;
   }
@@ -119,6 +115,16 @@
   }
 }
 
+// This is seperated out so we can target it out-of-editor by default
+// and use advanced (:not) syntax, not supported by things like PDF gen,
+// to target in-editor scenarios to handle edge-case of TinyMCE using an
+// image for data placeholders where we'd want height attributes to take effect.
+body .page-content img,
+.page-content img:not([data-mce-object]) {
+  max-width: 100%;
+  height:auto;
+}
+
 /**
  * Callouts
  */

From 4c1c3155940bd0020117d3bd60772fc3b2759fea Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 2 May 2024 15:20:51 +0100
Subject: [PATCH 117/666] WYSWIYG: Fixed misaligned table cell p line height

Removes an editor-specific line-height which was overriding cell
paragraph line height, causing mis-aligned style compared to viewing.
Checked a range of styles and looked at history, could not see original
purpose of the line-height removed here.
Closes #4960
---
 resources/sass/_tinymce.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 29843e4246f..95294cdf2c0 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -46,11 +46,6 @@
   display: block;
 }
 
-// In editor line height override
-.page-content.mce-content-body p {
-  line-height: 1.6;
-}
-
 // Pad out bottom of editor
 body.page-content.mce-content-body  {
   padding-bottom: 5rem;

From 8087123f2e1823d6584844a540bf4639c55f4fad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 2 May 2024 22:56:51 +0100
Subject: [PATCH 118/666] LDAP: Review, testing and update of LDAP TLS CA cert
 control

Review of #4913
Added testing to cover option.
Updated option so it can be used for a CA directory, or a CA file.
Updated option name to be somewhat abstracted from original underling
PHP option.

Tested against Jumpcloud.
Testing took hours due to instability which was due to these settings
sticking and being unstable on change until php process restart.
Also due to little documentation for these options.
X_TLS_CACERTDIR option needs cert files to be named via specific hashes
which can be achieved via c_rehash utility.

This also adds detail on STARTTLS failure, which took a long time to
discover due to little detail out there for deeper PHP LDAP debugging.
---
 .env.example.complete      |  2 +-
 app/Access/LdapService.php | 42 ++++++++++++++++++++++++++++++++++----
 app/Config/services.php    |  2 +-
 tests/Auth/LdapTest.php    | 32 +++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/.env.example.complete b/.env.example.complete
index 3f1a8ab9476..cfc96819276 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -219,7 +219,7 @@ LDAP_USER_FILTER=false
 LDAP_VERSION=false
 LDAP_START_TLS=false
 LDAP_TLS_INSECURE=false
-LDAP_TLS_CACERTFILE=false
+LDAP_TLS_CA_CERT=false
 LDAP_ID_ATTRIBUTE=uid
 LDAP_EMAIL_ATTRIBUTE=mail
 LDAP_DISPLAY_NAME_ATTRIBUTE=cn
diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 56e7aba04f7..e0d7f2615b3 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -209,10 +209,10 @@ protected function getConnection()
             $this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
         }
 
-        // Specify CA Cert file for LDAP.
+        // Configure any user-provided CA cert files for LDAP.
         // This option works globally and must be set before a connection is created.
-        if ($this->config['tls_cacertfile']) {
-            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTFILE, $this->config['tls_cacertfile']);
+        if ($this->config['tls_ca_cert']) {
+            $this->configureTlsCaCerts($this->config['tls_ca_cert']);
         }
 
         $ldapHost = $this->parseServerString($this->config['server']);
@@ -229,7 +229,14 @@ protected function getConnection()
 
         // Start and verify TLS if it's enabled
         if ($this->config['start_tls']) {
-            $started = $this->ldap->startTls($ldapConnection);
+            try {
+                $started = $this->ldap->startTls($ldapConnection);
+            } catch (\Exception $exception) {
+                $error = $exception->getMessage() . ' :: ' . ldap_error($ldapConnection);
+                ldap_get_option($ldapConnection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detail);
+                Log::info("LDAP STARTTLS failure: {$error} {$detail}");
+                throw new LdapException('Could not start TLS connection. Further details in the application log.');
+            }
             if (!$started) {
                 throw new LdapException('Could not start TLS connection');
             }
@@ -240,6 +247,33 @@ protected function getConnection()
         return $this->ldapConnection;
     }
 
+    /**
+     * Configure TLS CA certs globally for ldap use.
+     * This will detect if the given path is a directory or file, and set the relevant
+     * LDAP TLS options appropriately otherwise throw an exception if no file/folder found.
+     *
+     * Note: When using a folder, certificates are expected to be correctly named by hash
+     * which can be done via the c_rehash utility.
+     *
+     * @throws LdapException
+     */
+    protected function configureTlsCaCerts(string $caCertPath): void
+    {
+        $errMessage = "Provided path [{$caCertPath}] for LDAP TLS CA certs could not be resolved to an existing location";
+        $path = realpath($caCertPath);
+        if ($path === false) {
+            throw new LdapException($errMessage);
+        }
+
+        if (is_dir($path)) {
+            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTDIR, $path);
+        } else if (is_file($path)) {
+            $this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTFILE, $path);
+        } else {
+            throw new LdapException($errMessage);
+        }
+    }
+
     /**
      * Parse an LDAP server string and return the host suitable for a connection.
      * Is flexible to formats such as 'ldap.example.com:8069' or 'ldaps://ldap.example.com'.
diff --git a/app/Config/services.php b/app/Config/services.php
index a407b5dc876..f93ca44f6e7 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -133,7 +133,7 @@
         'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
         'remove_from_groups'     => env('LDAP_REMOVE_FROM_GROUPS', false),
         'tls_insecure'           => env('LDAP_TLS_INSECURE', false),
-        'tls_cacertfile'   	     => env('LDAP_TLS_CACERTFILE', false),
+        'tls_ca_cert'            => env('LDAP_TLS_CA_CERT', false),
         'start_tls'              => env('LDAP_START_TLS', false),
         'thumbnail_attribute'    => env('LDAP_THUMBNAIL_ATTRIBUTE', null),
     ],
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 34900ce6f70..717167729f6 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Access\Ldap;
 use BookStack\Access\LdapService;
+use BookStack\Exceptions\LdapException;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Illuminate\Testing\TestResponse;
@@ -35,6 +36,7 @@ protected function setUp(): void
             'services.ldap.user_filter'            => '(&(uid=${user}))',
             'services.ldap.follow_referrals'       => false,
             'services.ldap.tls_insecure'           => false,
+            'services.ldap.tls_ca_cert'            => false,
             'services.ldap.thumbnail_attribute'    => null,
         ]);
         $this->mockLdap = $this->mock(Ldap::class);
@@ -767,4 +769,34 @@ public function test_thumbnail_attribute_used_as_user_avatar_if_configured()
         $this->assertNotNull($user->avatar);
         $this->assertEquals('8c90748342f19b195b9c6b4eff742ded', md5_file(public_path($user->avatar->path)));
     }
+
+    public function test_tls_ca_cert_option_throws_if_set_to_invalid_location()
+    {
+        $path = 'non_found_' . time();
+        config()->set(['services.ldap.tls_ca_cert' => $path]);
+
+        $this->commonLdapMocks(0, 0, 0, 0, 0);
+
+        $this->assertThrows(function () {
+            $this->withoutExceptionHandling()->mockUserLogin();
+        }, LdapException::class, "Provided path [{$path}] for LDAP TLS CA certs could not be resolved to an existing location");
+    }
+
+    public function test_tls_ca_cert_option_used_if_set_to_a_folder()
+    {
+        $path = $this->files->testFilePath('');
+        config()->set(['services.ldap.tls_ca_cert' => $path]);
+
+        $this->mockLdap->shouldReceive('setOption')->once()->with(null, LDAP_OPT_X_TLS_CACERTDIR, rtrim($path, '/'))->andReturn(true);
+        $this->runFailedAuthLogin();
+    }
+
+    public function test_tls_ca_cert_option_used_if_set_to_a_file()
+    {
+        $path = $this->files->testFilePath('test-file.txt');
+        config()->set(['services.ldap.tls_ca_cert' => $path]);
+
+        $this->mockLdap->shouldReceive('setOption')->once()->with(null, LDAP_OPT_X_TLS_CACERTFILE, $path)->andReturn(true);
+        $this->runFailedAuthLogin();
+    }
 }

From f9e087330b5d90ed5ec23ac0725cfeccd1eb7cb5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 3 May 2024 13:35:30 +0100
Subject: [PATCH 119/666] WYSIWYG: Added text direction support for code editor
 popup

Editor popup will now reflect the direction of the opened code block.
This also updates in-editor codemirror instances to correcly reflect/use
the direction if set on the inner code elem.

This also defaults new code blocks, when in RTL languages, to be started
in LTR, which can then be changed via in-editor direction controls if
needed. This is on the assumption that most code will be LTR (could not
find much examples of RTL code use).

Fixes #4943
---
 resources/js/code/index.mjs               | 21 ++++++++++++++++++---
 resources/js/components/code-editor.js    | 12 +++++++++++-
 resources/js/wysiwyg/plugin-codeeditor.js | 19 +++++++++++++------
 resources/sass/_components.scss           |  2 +-
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/resources/js/code/index.mjs b/resources/js/code/index.mjs
index ab31e3f74e4..d2ea12a4c93 100644
--- a/resources/js/code/index.mjs
+++ b/resources/js/code/index.mjs
@@ -38,6 +38,23 @@ function addCopyIcon(editorView) {
     });
 }
 
+/**
+ * @param {HTMLElement} codeElem
+ * @returns {String}
+ */
+function getDirectionFromCodeBlock(codeElem) {
+    let dir = '';
+    const innerCodeElem = codeElem.querySelector('code');
+
+    if (innerCodeElem && innerCodeElem.hasAttribute('dir')) {
+        dir = innerCodeElem.getAttribute('dir');
+    } else if (codeElem.hasAttribute('dir')) {
+        dir = codeElem.getAttribute('dir');
+    }
+
+    return dir;
+}
+
 /**
  * Add code highlighting to a single element.
  * @param {HTMLElement} elem
@@ -48,16 +65,14 @@ function highlightElem(elem) {
     const content = elem.textContent.trimEnd();
 
     let langName = '';
-    let innerCodeDirection = '';
     if (innerCodeElem !== null) {
         langName = innerCodeElem.className.replace('language-', '');
-        innerCodeDirection = innerCodeElem.getAttribute('dir');
     }
 
     const wrapper = document.createElement('div');
     elem.parentNode.insertBefore(wrapper, elem);
 
-    const direction = innerCodeDirection || elem.getAttribute('dir') || '';
+    const direction = getDirectionFromCodeBlock(elem);
     if (direction) {
         wrapper.setAttribute('dir', direction);
     }
diff --git a/resources/js/components/code-editor.js b/resources/js/components/code-editor.js
index 1c68c2048d2..091c3483f4d 100644
--- a/resources/js/components/code-editor.js
+++ b/resources/js/components/code-editor.js
@@ -129,7 +129,7 @@ export class CodeEditor extends Component {
         this.hide();
     }
 
-    async open(code, language, saveCallback, cancelCallback) {
+    async open(code, language, direction, saveCallback, cancelCallback) {
         this.languageInput.value = language;
         this.saveCallback = saveCallback;
         this.cancelCallback = cancelCallback;
@@ -137,6 +137,7 @@ export class CodeEditor extends Component {
         await this.show();
         this.languageInputChange(language);
         this.editor.setContent(code);
+        this.setDirection(direction);
     }
 
     async show() {
@@ -156,6 +157,15 @@ export class CodeEditor extends Component {
         });
     }
 
+    setDirection(direction) {
+        const target = this.editorInput.parentElement;
+        if (direction) {
+            target.setAttribute('dir', direction);
+        } else {
+            target.removeAttribute('dir');
+        }
+    }
+
     hide() {
         this.getPopup().hide();
         this.addHistory();
diff --git a/resources/js/wysiwyg/plugin-codeeditor.js b/resources/js/wysiwyg/plugin-codeeditor.js
index f86760214e1..c01a7eca029 100644
--- a/resources/js/wysiwyg/plugin-codeeditor.js
+++ b/resources/js/wysiwyg/plugin-codeeditor.js
@@ -6,13 +6,14 @@ function elemIsCodeBlock(elem) {
  * @param {Editor} editor
  * @param {String} code
  * @param {String} language
+ * @param {String} direction
  * @param {function(string, string)} callback (Receives (code: string,language: string)
  */
-function showPopup(editor, code, language, callback) {
+function showPopup(editor, code, language, direction, callback) {
     /** @var {CodeEditor} codeEditor * */
     const codeEditor = window.$components.first('code-editor');
     const bookMark = editor.selection.getBookmark();
-    codeEditor.open(code, language, (newCode, newLang) => {
+    codeEditor.open(code, language, direction, (newCode, newLang) => {
         callback(newCode, newLang);
         editor.focus();
         editor.selection.moveToBookmark(bookMark);
@@ -27,7 +28,8 @@ function showPopup(editor, code, language, callback) {
  * @param {CodeBlockElement} codeBlock
  */
 function showPopupForCodeBlock(editor, codeBlock) {
-    showPopup(editor, codeBlock.getContent(), codeBlock.getLanguage(), (newCode, newLang) => {
+    const direction = codeBlock.getAttribute('dir') || '';
+    showPopup(editor, codeBlock.getContent(), codeBlock.getLanguage(), direction, (newCode, newLang) => {
         codeBlock.setContent(newCode, newLang);
     });
 }
@@ -179,13 +181,17 @@ function register(editor) {
             showPopupForCodeBlock(editor, selectedNode);
         } else {
             const textContent = editor.selection.getContent({format: 'text'});
-            showPopup(editor, textContent, '', (newCode, newLang) => {
+            const direction = document.dir === 'rtl' ? 'ltr' : '';
+            showPopup(editor, textContent, '', direction, (newCode, newLang) => {
                 const pre = doc.createElement('pre');
                 const code = doc.createElement('code');
                 code.classList.add(`language-${newLang}`);
                 code.innerText = newCode;
-                pre.append(code);
+                if (direction) {
+                    pre.setAttribute('dir', direction);
+                }
 
+                pre.append(code);
                 editor.insertContent(pre.outerHTML);
             });
         }
@@ -205,7 +211,8 @@ function register(editor) {
                     contenteditable: 'false',
                 });
 
-                const direction = el.attr('dir');
+                const childCodeBlock = el.children().filter(child => child.name === 'code')[0] || null;
+                const direction = el.attr('dir') || (childCodeBlock && childCodeBlock.attr('dir')) || '';
                 if (direction) {
                     wrapper.attr('dir', direction);
                 }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index ae899357c98..fc4ddeba4ae 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -182,7 +182,7 @@
   flex: 0;
   .popup-title {
     color: #FFF;
-    margin-right: auto;
+    margin-inline-end: auto;
     padding: 8px $-m;
   }
   &.flex-container-row {

From 5c28bcf8651474ffd7f15831e3de705aae5a7ef8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 4 May 2024 13:59:41 +0100
Subject: [PATCH 120/666] Registration: Reviewed added simple honeypot, added
 testing

Also cleaned up old RegistrationController syntax.
Review of #4970
---
 app/Access/Controllers/RegisterController.php | 20 +++++--------------
 resources/views/auth/register.blade.php       |  3 ++-
 tests/Auth/RegistrationTest.php               | 19 ++++++++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/Access/Controllers/RegisterController.php b/app/Access/Controllers/RegisterController.php
index 25b0a30366a..e9812aa5d06 100644
--- a/app/Access/Controllers/RegisterController.php
+++ b/app/Access/Controllers/RegisterController.php
@@ -15,24 +15,13 @@
 
 class RegisterController extends Controller
 {
-    protected SocialDriverManager $socialDriverManager;
-    protected RegistrationService $registrationService;
-    protected LoginService $loginService;
-
-    /**
-     * Create a new controller instance.
-     */
     public function __construct(
-        SocialDriverManager $socialDriverManager,
-        RegistrationService $registrationService,
-        LoginService $loginService
+        protected SocialDriverManager $socialDriverManager,
+        protected RegistrationService $registrationService,
+        protected LoginService $loginService
     ) {
         $this->middleware('guest');
         $this->middleware('guard:standard');
-
-        $this->socialDriverManager = $socialDriverManager;
-        $this->registrationService = $registrationService;
-        $this->loginService = $loginService;
     }
 
     /**
@@ -87,7 +76,8 @@ protected function validator(array $data): ValidatorContract
             'name'     => ['required', 'min:2', 'max:100'],
             'email'    => ['required', 'email', 'max:255', 'unique:users'],
             'password' => ['required', Password::default()],
-            'username' => ['prohibited'], // this is a honeypot for bots that must not be filled in
+            // Basic honey for bots that must not be filled in
+            'username' => ['prohibited'],
         ]);
     }
 }
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index f9f4e8cb3d5..1ea712e1d0a 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -13,8 +13,9 @@
             <form action="{{ url("/register") }}" method="POST" class="mt-l stretch-inputs">
                 {!! csrf_field() !!}
 
+                {{-- Simple honeypot field --}}
                 <div class="form-group ambrosia-container" aria-hidden="true">
-                    <label for="name">{{ trans('auth.name') }}</label>
+                    <label for="username">{{ trans('auth.name') }}</label>
                     @include('form.text', ['name' => 'username'])
                 </div>
 
diff --git a/tests/Auth/RegistrationTest.php b/tests/Auth/RegistrationTest.php
index ff1a9d66b11..60ae17573eb 100644
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -184,4 +184,23 @@ public function test_registration_validation()
         $resp->assertSee('The email must be a valid email address.');
         $resp->assertSee('The password must be at least 8 characters.');
     }
+
+    public function test_registration_simple_honeypot_active()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $resp = $this->get('/register');
+        $this->withHtml($resp)->assertElementExists('form input[name="username"]');
+
+        $resp = $this->post('/register', [
+            'name' => 'Barry',
+            'email' => 'barrybot@example.com',
+            'password' => 'barryIsTheBestBot',
+            'username' => 'MyUsername'
+        ]);
+        $resp->assertRedirect('/register');
+
+        $resp = $this->followRedirects($resp);
+        $this->withHtml($resp)->assertElementExists('form input[name="username"].text-neg');
+    }
 }

From 3946158e8821308f89ee12811f053527eedc23c2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 4 May 2024 16:28:18 +0100
Subject: [PATCH 121/666] API: Added audit log list endpoint

Not yested covered with testing.
Changes database columns for more presentable names and for future use
to connect additional model types.
For #4316
---
 app/Activity/ActivityQueries.php              | 10 +--
 .../Controllers/AuditLogApiController.php     | 28 +++++++
 .../Controllers/AuditLogController.php        |  2 +-
 app/Activity/Models/Activity.php              | 24 +++---
 app/Activity/Tools/ActivityLogger.php         | 10 +--
 app/Console/Commands/ClearActivityCommand.php |  2 +-
 app/Entities/Models/Entity.php                |  2 +-
 ...54409_rename_activity_relation_columns.php | 30 +++++++
 dev/api/responses/audit-log-list.json         | 80 +++++++++++++++++++
 routes/api.php                                |  3 +
 10 files changed, 165 insertions(+), 26 deletions(-)
 create mode 100644 app/Activity/Controllers/AuditLogApiController.php
 create mode 100644 database/migrations/2024_05_04_154409_rename_activity_relation_columns.php
 create mode 100644 dev/api/responses/audit-log-list.json

diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index dae0791b1cd..9de70f022a3 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -27,14 +27,14 @@ public function __construct(
     public function latest(int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
             ->with(['user'])
             ->skip($count * $page)
             ->take($count)
             ->get();
 
-        $this->listLoader->loadIntoRelations($activityList->all(), 'entity', false);
+        $this->listLoader->loadIntoRelations($activityList->all(), 'loggable', false);
 
         return $this->filterSimilar($activityList);
     }
@@ -59,8 +59,8 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
         $query->where(function (Builder $query) use ($queryIds) {
             foreach ($queryIds as $morphClass => $idArr) {
                 $query->orWhere(function (Builder $innerQuery) use ($morphClass, $idArr) {
-                    $innerQuery->where('entity_type', '=', $morphClass)
-                        ->whereIn('entity_id', $idArr);
+                    $innerQuery->where('loggable_type', '=', $morphClass)
+                        ->whereIn('loggable_id', $idArr);
                 });
             }
         });
@@ -82,7 +82,7 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
         $activityList = $this->permissions
-            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)
diff --git a/app/Activity/Controllers/AuditLogApiController.php b/app/Activity/Controllers/AuditLogApiController.php
new file mode 100644
index 00000000000..650d17446d5
--- /dev/null
+++ b/app/Activity/Controllers/AuditLogApiController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\Activity\Controllers;
+
+use BookStack\Activity\Models\Activity;
+use BookStack\Http\ApiController;
+
+class AuditLogApiController extends ApiController
+{
+    /**
+     * Get a listing of audit log events in the system.
+     * The loggable relation fields currently only relates to core
+     * content types (page, book, bookshelf, chapter) but this may be
+     * used more in the future across other types.
+     * Requires permission to manage both users and system settings.
+     */
+    public function list()
+    {
+        $this->checkPermission('settings-manage');
+        $this->checkPermission('users-manage');
+
+        $query = Activity::query()->with(['user']);
+
+        return $this->apiListingResponse($query, [
+            'id', 'type', 'detail', 'user_id', 'loggable_id', 'loggable_type', 'ip', 'created_at',
+        ]);
+    }
+}
diff --git a/app/Activity/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.php
index c3910a26b4c..641106d7f45 100644
--- a/app/Activity/Controllers/AuditLogController.php
+++ b/app/Activity/Controllers/AuditLogController.php
@@ -32,7 +32,7 @@ public function index(Request $request)
 
         $query = Activity::query()
             ->with([
-                'entity' => fn ($query) => $query->withTrashed(),
+                'loggable' => fn ($query) => $query->withTrashed(),
                 'user',
             ])
             ->orderBy($listOptions->getSort(), $listOptions->getOrder());
diff --git a/app/Activity/Models/Activity.php b/app/Activity/Models/Activity.php
index 5fad9f1d3a2..ebe5d66d6cc 100644
--- a/app/Activity/Models/Activity.php
+++ b/app/Activity/Models/Activity.php
@@ -17,24 +17,22 @@
  * @property User   $user
  * @property Entity $entity
  * @property string $detail
- * @property string $entity_type
- * @property int    $entity_id
+ * @property string $loggable_type
+ * @property int    $loggable_id
  * @property int    $user_id
  * @property Carbon $created_at
- * @property Carbon $updated_at
  */
 class Activity extends Model
 {
     /**
-     * Get the entity for this activity.
+     * Get the loggable model related to this activity.
+     * Currently only used for entities (previously entity_[id/type] columns).
+     * Could be used for others but will need an audit of uses where assumed
+     * to be entities.
      */
-    public function entity(): MorphTo
+    public function loggable(): MorphTo
     {
-        if ($this->entity_type === '') {
-            $this->entity_type = null;
-        }
-
-        return $this->morphTo('entity');
+        return $this->morphTo('loggable');
     }
 
     /**
@@ -47,8 +45,8 @@ public function user(): BelongsTo
 
     public function jointPermissions(): HasMany
     {
-        return $this->hasMany(JointPermission::class, 'entity_id', 'entity_id')
-            ->whereColumn('activities.entity_type', '=', 'joint_permissions.entity_type');
+        return $this->hasMany(JointPermission::class, 'entity_id', 'loggable_id')
+            ->whereColumn('activities.loggable_type', '=', 'joint_permissions.entity_type');
     }
 
     /**
@@ -74,6 +72,6 @@ public function isForEntity(): bool
      */
     public function isSimilarTo(self $activityB): bool
     {
-        return [$this->type, $this->entity_type, $this->entity_id] === [$activityB->type, $activityB->entity_type, $activityB->entity_id];
+        return [$this->type, $this->loggable_type, $this->loggable_id] === [$activityB->type, $activityB->loggable_type, $activityB->loggable_id];
     }
 }
diff --git a/app/Activity/Tools/ActivityLogger.php b/app/Activity/Tools/ActivityLogger.php
index adda36c1b81..415d1108494 100644
--- a/app/Activity/Tools/ActivityLogger.php
+++ b/app/Activity/Tools/ActivityLogger.php
@@ -32,8 +32,8 @@ public function add(string $type, string|Loggable $detail = ''): void
         $activity->detail = $detailToStore;
 
         if ($detail instanceof Entity) {
-            $activity->entity_id = $detail->id;
-            $activity->entity_type = $detail->getMorphClass();
+            $activity->loggable_id = $detail->id;
+            $activity->loggable_type = $detail->getMorphClass();
         }
 
         $activity->save();
@@ -64,9 +64,9 @@ protected function newActivityForUser(string $type): Activity
     public function removeEntity(Entity $entity): void
     {
         $entity->activity()->update([
-            'detail'       => $entity->name,
-            'entity_id'    => null,
-            'entity_type'  => null,
+            'detail'         => $entity->name,
+            'loggable_id'    => null,
+            'loggable_type'  => null,
         ]);
     }
 
diff --git a/app/Console/Commands/ClearActivityCommand.php b/app/Console/Commands/ClearActivityCommand.php
index 54085c12be3..6ec2e1a2aaa 100644
--- a/app/Console/Commands/ClearActivityCommand.php
+++ b/app/Console/Commands/ClearActivityCommand.php
@@ -19,7 +19,7 @@ class ClearActivityCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Clear user activity from the system';
+    protected $description = 'Clear user (audit-log) activity from the system';
 
     /**
      * Execute the console command.
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index f07d372c3e9..0de83c93869 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -137,7 +137,7 @@ public function matchesOrContains(self $entity): bool
      */
     public function activity(): MorphMany
     {
-        return $this->morphMany(Activity::class, 'entity')
+        return $this->morphMany(Activity::class, 'loggable')
             ->orderBy('created_at', 'desc');
     }
 
diff --git a/database/migrations/2024_05_04_154409_rename_activity_relation_columns.php b/database/migrations/2024_05_04_154409_rename_activity_relation_columns.php
new file mode 100644
index 00000000000..ee3358d7321
--- /dev/null
+++ b/database/migrations/2024_05_04_154409_rename_activity_relation_columns.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            $table->renameColumn('entity_id', 'loggable_id');
+            $table->renameColumn('entity_type', 'loggable_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            $table->renameColumn('loggable_id', 'entity_id');
+            $table->renameColumn('loggable_type', 'entity_type');
+        });
+    }
+};
diff --git a/dev/api/responses/audit-log-list.json b/dev/api/responses/audit-log-list.json
new file mode 100644
index 00000000000..15a25e10689
--- /dev/null
+++ b/dev/api/responses/audit-log-list.json
@@ -0,0 +1,80 @@
+{
+  "data": [
+    {
+      "id": 1,
+      "type": "bookshelf_create",
+      "detail": "",
+      "user_id": 1,
+      "loggable_id": 1,
+      "loggable_type": "bookshelf",
+      "ip": "124.4.x.x",
+      "created_at": "2021-09-29T12:32:02.000000Z",
+      "user": {
+        "id": 1,
+        "name": "Admins",
+        "slug": "admins"
+      }
+    },
+    {
+      "id": 2,
+      "type": "auth_login",
+      "detail": "standard; (1) Admin",
+      "user_id": 1,
+      "loggable_id": null,
+      "loggable_type": null,
+      "ip": "127.0.x.x",
+      "created_at": "2021-09-29T12:32:04.000000Z",
+      "user": {
+        "id": 1,
+        "name": "Admins",
+        "slug": "admins"
+      }
+    },
+    {
+      "id": 3,
+      "type": "bookshelf_update",
+      "detail": "",
+      "user_id": 1,
+      "loggable_id": 1,
+      "loggable_type": "bookshelf",
+      "ip": "127.0.x.x",
+      "created_at": "2021-09-29T12:32:07.000000Z",
+      "user": {
+        "id": 1,
+        "name": "Admins",
+        "slug": "admins"
+      }
+    },
+    {
+      "id": 4,
+      "type": "page_create",
+      "detail": "",
+      "user_id": 1,
+      "loggable_id": 1,
+      "loggable_type": "page",
+      "ip": "127.0.x.x",
+      "created_at": "2021-09-29T12:32:13.000000Z",
+      "user": {
+        "id": 1,
+        "name": "Admins",
+        "slug": "admins"
+      }
+    },
+    {
+      "id": 5,
+      "type": "page_update",
+      "detail": "",
+      "user_id": 1,
+      "loggable_id": 1,
+      "loggable_type": "page",
+      "ip": "127.0.x.x",
+      "created_at": "2021-09-29T12:37:27.000000Z",
+      "user": {
+        "id": 1,
+        "name": "Admins",
+        "slug": "admins"
+      }
+    }
+  ],
+  "total": 6088
+}
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 04c94a9664d..c0919d3247b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -6,6 +6,7 @@
  * Controllers all end with "ApiController"
  */
 
+use BookStack\Activity\Controllers\AuditLogApiController;
 use BookStack\Api\ApiDocsController;
 use BookStack\Entities\Controllers as EntityControllers;
 use BookStack\Permissions\ContentPermissionApiController;
@@ -89,3 +90,5 @@
 
 Route::get('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'read']);
 Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
+
+Route::get('audit-log', [AuditLogApiController::class, 'list']);

From 67df127c2618d1d2bb9bc250e86ad0753f278769 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 5 May 2024 15:44:58 +0100
Subject: [PATCH 122/666] API: Added to, and updated, testing to cover audit
 log additions

---
 app/Activity/ActivityQueries.php              |  2 +-
 app/Activity/Models/Activity.php              |  2 +-
 .../views/common/activity-item.blade.php      |  8 +--
 tests/Activity/AuditLogApiTest.php            | 60 +++++++++++++++++++
 tests/{Actions => Activity}/AuditLogTest.php  |  8 +--
 .../{Actions => Activity}/WebhookCallTest.php |  2 +-
 .../WebhookFormatTesting.php                  |  2 +-
 .../WebhookManagementTest.php                 |  2 +-
 tests/Commands/ClearActivityCommandTest.php   |  2 +-
 tests/Settings/RecycleBinTest.php             | 12 ++--
 tests/TestCase.php                            |  4 +-
 tests/User/UserProfileTest.php                |  2 +-
 12 files changed, 83 insertions(+), 23 deletions(-)
 create mode 100644 tests/Activity/AuditLogApiTest.php
 rename tests/{Actions => Activity}/AuditLogTest.php (98%)
 rename tests/{Actions => Activity}/WebhookCallTest.php (99%)
 rename tests/{Actions => Activity}/WebhookFormatTesting.php (98%)
 rename tests/{Actions => Activity}/WebhookManagementTest.php (99%)

diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index 9de70f022a3..86326fb80af 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -66,7 +66,7 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
         });
 
         $activity = $query->orderBy('created_at', 'desc')
-            ->with(['entity' => function (Relation $query) {
+            ->with(['loggable' => function (Relation $query) {
                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))
diff --git a/app/Activity/Models/Activity.php b/app/Activity/Models/Activity.php
index ebe5d66d6cc..ac9fec5178b 100644
--- a/app/Activity/Models/Activity.php
+++ b/app/Activity/Models/Activity.php
@@ -15,7 +15,7 @@
 /**
  * @property string $type
  * @property User   $user
- * @property Entity $entity
+ * @property Entity $loggable
  * @property string $detail
  * @property string $loggable_type
  * @property int    $loggable_id
diff --git a/resources/views/common/activity-item.blade.php b/resources/views/common/activity-item.blade.php
index 89d44b15231..1c970084f6a 100644
--- a/resources/views/common/activity-item.blade.php
+++ b/resources/views/common/activity-item.blade.php
@@ -16,12 +16,12 @@
 
     {{ $activity->getText() }}
 
-    @if($activity->entity && is_null($activity->entity->deleted_at))
-        <a href="{{ $activity->entity->getUrl() }}">{{ $activity->entity->name }}</a>
+    @if($activity->loggable && is_null($activity->loggable->deleted_at))
+        <a href="{{ $activity->loggable->getUrl() }}">{{ $activity->loggable->name }}</a>
     @endif
 
-    @if($activity->entity && !is_null($activity->entity->deleted_at))
-        "{{ $activity->entity->name }}"
+    @if($activity->loggable && !is_null($activity->loggable->deleted_at))
+        "{{ $activity->loggable->name }}"
     @endif
 
     <br>
diff --git a/tests/Activity/AuditLogApiTest.php b/tests/Activity/AuditLogApiTest.php
new file mode 100644
index 00000000000..75cc364f895
--- /dev/null
+++ b/tests/Activity/AuditLogApiTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Activity;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Facades\Activity;
+use Tests\Api\TestsApi;
+use Tests\TestCase;
+
+class AuditLogApiTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_user_and_settings_manage_permissions_needed()
+    {
+        $editor = $this->users->editor();
+
+        $assertPermissionErrorOnCall = function () use ($editor) {
+            $resp = $this->actingAsForApi($editor)->getJson('/api/audit-log');
+            $resp->assertStatus(403);
+            $resp->assertJson($this->permissionErrorResponse());
+        };
+
+        $assertPermissionErrorOnCall();
+        $this->permissions->grantUserRolePermissions($editor, ['users-manage']);
+        $assertPermissionErrorOnCall();
+        $this->permissions->removeUserRolePermissions($editor, ['users-manage']);
+        $this->permissions->grantUserRolePermissions($editor, ['settings-manage']);
+        $assertPermissionErrorOnCall();
+
+        $this->permissions->grantUserRolePermissions($editor, ['settings-manage', 'users-manage']);
+        $resp = $this->actingAsForApi($editor)->getJson('/api/audit-log');
+        $resp->assertOk();
+    }
+
+    public function test_index_endpoint_returns_expected_data()
+    {
+        $page = $this->entities->page();
+        $admin = $this->users->admin();
+        $this->actingAsForApi($admin);
+        Activity::add(ActivityType::PAGE_UPDATE, $page);
+
+        $resp = $this->get("/api/audit-log?filter[loggable_id]={$page->id}");
+        $resp->assertJson(['data' => [
+            [
+                'type' => 'page_update',
+                'detail' => "({$page->id}) {$page->name}",
+                'user_id' => $admin->id,
+                'loggable_id' => $page->id,
+                'loggable_type' => 'page',
+                'ip' => '127.0.0.1',
+                'user' => [
+                    'id' => $admin->id,
+                    'name' => $admin->name,
+                    'slug' => $admin->slug,
+                ],
+            ]
+        ]]);
+    }
+}
diff --git a/tests/Actions/AuditLogTest.php b/tests/Activity/AuditLogTest.php
similarity index 98%
rename from tests/Actions/AuditLogTest.php
rename to tests/Activity/AuditLogTest.php
index 5e355ca096b..350cd92871b 100644
--- a/tests/Actions/AuditLogTest.php
+++ b/tests/Activity/AuditLogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Actions;
+namespace Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Activity;
@@ -156,7 +156,7 @@ public function test_ip_address_logged_and_visible()
             'type'      => ActivityType::PAGE_UPDATE,
             'ip'        => '192.123.45.1',
             'user_id'   => $editor->id,
-            'entity_id' => $page->id,
+            'loggable_id' => $page->id,
         ]);
 
         $resp = $this->asAdmin()->get('/settings/audit');
@@ -207,7 +207,7 @@ public function test_ip_address_not_logged_in_demo_mode()
             'type'      => ActivityType::PAGE_UPDATE,
             'ip'        => '127.0.0.1',
             'user_id'   => $editor->id,
-            'entity_id' => $page->id,
+            'loggable_id' => $page->id,
         ]);
     }
 
@@ -229,7 +229,7 @@ public function test_ip_address_respects_precision_setting()
             'type'      => ActivityType::PAGE_UPDATE,
             'ip'        => '192.123.x.x',
             'user_id'   => $editor->id,
-            'entity_id' => $page->id,
+            'loggable_id' => $page->id,
         ]);
     }
 }
diff --git a/tests/Actions/WebhookCallTest.php b/tests/Activity/WebhookCallTest.php
similarity index 99%
rename from tests/Actions/WebhookCallTest.php
rename to tests/Activity/WebhookCallTest.php
index 16986ba2e97..37c87267a8a 100644
--- a/tests/Actions/WebhookCallTest.php
+++ b/tests/Activity/WebhookCallTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Actions;
+namespace Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\DispatchWebhookJob;
diff --git a/tests/Actions/WebhookFormatTesting.php b/tests/Activity/WebhookFormatTesting.php
similarity index 98%
rename from tests/Actions/WebhookFormatTesting.php
rename to tests/Activity/WebhookFormatTesting.php
index b4fa49532c4..edd16ebbad7 100644
--- a/tests/Actions/WebhookFormatTesting.php
+++ b/tests/Activity/WebhookFormatTesting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Actions;
+namespace Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;
diff --git a/tests/Actions/WebhookManagementTest.php b/tests/Activity/WebhookManagementTest.php
similarity index 99%
rename from tests/Actions/WebhookManagementTest.php
rename to tests/Activity/WebhookManagementTest.php
index 05475b6997c..eb7bb4c15a4 100644
--- a/tests/Actions/WebhookManagementTest.php
+++ b/tests/Activity/WebhookManagementTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Actions;
+namespace Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;
diff --git a/tests/Commands/ClearActivityCommandTest.php b/tests/Commands/ClearActivityCommandTest.php
index 410a39aa870..a3d7456b68e 100644
--- a/tests/Commands/ClearActivityCommandTest.php
+++ b/tests/Commands/ClearActivityCommandTest.php
@@ -18,7 +18,7 @@ public function test_clear_activity_command()
 
         $this->assertDatabaseHas('activities', [
             'type'      => 'page_update',
-            'entity_id' => $page->id,
+            'loggable_id' => $page->id,
             'user_id'   => $this->users->editor()->id,
         ]);
 
diff --git a/tests/Settings/RecycleBinTest.php b/tests/Settings/RecycleBinTest.php
index 8adc92f2538..33284b4b3ff 100644
--- a/tests/Settings/RecycleBinTest.php
+++ b/tests/Settings/RecycleBinTest.php
@@ -153,22 +153,22 @@ public function test_permanent_entity_delete_updates_existing_activity_with_enti
 
         $this->assertDatabaseHas('activities', [
             'type'        => 'page_delete',
-            'entity_id'   => $page->id,
-            'entity_type' => $page->getMorphClass(),
+            'loggable_id'   => $page->id,
+            'loggable_type' => $page->getMorphClass(),
         ]);
 
         $this->asAdmin()->delete("/settings/recycle-bin/{$deletion->id}");
 
         $this->assertDatabaseMissing('activities', [
             'type'        => 'page_delete',
-            'entity_id'   => $page->id,
-            'entity_type' => $page->getMorphClass(),
+            'loggable_id'   => $page->id,
+            'loggable_type' => $page->getMorphClass(),
         ]);
 
         $this->assertDatabaseHas('activities', [
             'type'        => 'page_delete',
-            'entity_id'   => null,
-            'entity_type' => null,
+            'loggable_id'   => null,
+            'loggable_type' => null,
             'detail'      => $page->name,
         ]);
     }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index c59f843e94b..b63de307624 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -248,8 +248,8 @@ protected function assertActivityExists(string $type, ?Entity $entity = null, st
         $detailsToCheck = ['type' => $type];
 
         if ($entity) {
-            $detailsToCheck['entity_type'] = $entity->getMorphClass();
-            $detailsToCheck['entity_id'] = $entity->id;
+            $detailsToCheck['loggable_type'] = $entity->getMorphClass();
+            $detailsToCheck['loggable_id'] = $entity->id;
         }
 
         if ($detail) {
diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index 4bfb3c87822..065ae8dc896 100644
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\User;
 
-use Activity;
 use BookStack\Activity\ActivityType;
+use BookStack\Facades\Activity;
 use BookStack\Users\Models\User;
 use Tests\TestCase;
 

From d54c7b4783b05d8a8b4b904b280453d954698732 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 5 May 2024 16:05:21 +0100
Subject: [PATCH 123/666] Audit Log: Fixed bad reference to linked entity item

---
 resources/views/settings/audit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 89d743fdc7c..28cdeb8a5a7 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -94,8 +94,8 @@ class="text-item">{{ $type }}</a></li>
                                     class="mr-xs hide-over-m">{{ trans('settings.audit_table_event') }}
                                 :</strong> {{ $activity->type }}</div>
                         <div class="flex-3 px-m py-xxs min-width-l">
-                            @if($activity->entity)
-                                @include('entities.icon-link', ['entity' => $activity->entity])
+                            @if($activity->loggable instanceof \BookStack\Entities\Models\Entity)
+                                @include('entities.icon-link', ['entity' => $activity->loggable])
                             @elseif($activity->detail && $activity->isForEntity())
                                 <div>
                                     {{ trans('settings.audit_deleted_item') }} <br>

From d206129f3dca103677168e973f66e45c2c636ff6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 5 May 2024 16:30:04 +0100
Subject: [PATCH 124/666] Deps: Updated composer dependencies

---
 composer.lock | 686 ++++++++++++++++++++++++++++----------------------
 1 file changed, 383 insertions(+), 303 deletions(-)

diff --git a/composer.lock b/composer.lock
index ad5648d6bc3..b5b08a90245 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.4",
+            "version": "v1.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2"
+                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2",
-                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
+                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
                 "shasum": ""
             },
             "require": {
@@ -56,22 +56,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.5"
             },
-            "time": "2023-11-08T00:42:13+00:00"
+            "time": "2024-04-19T21:30:56+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.301.1",
+            "version": "3.305.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba"
+                "reference": "a611af9a40a5d93f2f04427b322dbb6044e90327"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a910d2b35e7087337cdf3569dc9b6ce232aafba",
-                "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a611af9a40a5d93f2f04427b322dbb6044e90327",
+                "reference": "a611af9a40a5d93f2f04427b322dbb6044e90327",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.301.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.305.9"
             },
-            "time": "2024-03-15T18:14:42+00:00"
+            "time": "2024-05-03T18:09:03+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -211,25 +211,25 @@
         },
         {
             "name": "brick/math",
-            "version": "0.11.0",
+            "version": "0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.0.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
             },
             "type": "library",
             "autoload": {
@@ -249,12 +249,17 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
+                "bignumber",
                 "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.11.0"
+                "source": "https://github.com/brick/math/tree/0.12.1"
             },
             "funding": [
                 {
@@ -262,7 +267,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-15T23:15:59+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -553,16 +558,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.3",
+            "version": "3.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c"
+                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c",
-                "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd",
+                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd",
                 "shasum": ""
             },
             "require": {
@@ -646,7 +651,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.3"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.4"
             },
             "funding": [
                 {
@@ -662,7 +667,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-03T15:55:06+00:00"
+            "time": "2024-04-25T07:04:44+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -972,16 +977,16 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.7",
+            "version": "v2.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "ab0123052b42ad0867348f25df8c228f1ece8f14"
+                "reference": "c20247574601700e1f7c8dab39310fca1964dc52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/ab0123052b42ad0867348f25df8c228f1ece8f14",
-                "reference": "ab0123052b42ad0867348f25df8c228f1ece8f14",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c20247574601700e1f7c8dab39310fca1964dc52",
+                "reference": "c20247574601700e1f7c8dab39310fca1964dc52",
                 "shasum": ""
             },
             "require": {
@@ -1028,9 +1033,9 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.7"
+                "source": "https://github.com/dompdf/dompdf/tree/v2.0.8"
             },
-            "time": "2024-04-15T12:40:33+00:00"
+            "time": "2024-04-29T13:06:17+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -1160,6 +1165,69 @@
             ],
             "time": "2023-10-06T06:47:41+00:00"
         },
+        {
+            "name": "firebase/php-jwt",
+            "version": "v6.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4||^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
+            },
+            "time": "2023-12-01T16:26:39+00:00"
+        },
         {
             "name": "fruitcake/php-cors",
             "version": "v1.3.0",
@@ -1706,16 +1774,16 @@
         },
         {
             "name": "intervention/gif",
-            "version": "4.0.2",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/gif.git",
-                "reference": "c2b07d1f69709e196c8b4ced423449a7e0f3b925"
+                "reference": "3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/gif/zipball/c2b07d1f69709e196c8b4ced423449a7e0f3b925",
-                "reference": "c2b07d1f69709e196c8b4ced423449a7e0f3b925",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3",
+                "reference": "3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3",
                 "shasum": ""
             },
             "require": {
@@ -1723,7 +1791,7 @@
             },
             "require-dev": {
                 "phpstan/phpstan": "^1",
-                "phpunit/phpunit": "^9",
+                "phpunit/phpunit": "^10.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
             },
@@ -1754,7 +1822,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/gif/issues",
-                "source": "https://github.com/Intervention/gif/tree/4.0.2"
+                "source": "https://github.com/Intervention/gif/tree/4.1.0"
             },
             "funding": [
                 {
@@ -1766,25 +1834,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-18T15:36:58+00:00"
+            "time": "2024-03-26T17:23:47+00:00"
         },
         {
             "name": "intervention/image",
-            "version": "3.5.0",
+            "version": "3.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "408d3655c7705339e8c79731ea7efb51546cfa10"
+                "reference": "2dbfb53bf8909257e710cf6091d10a9ca7500742"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/408d3655c7705339e8c79731ea7efb51546cfa10",
-                "reference": "408d3655c7705339e8c79731ea7efb51546cfa10",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/2dbfb53bf8909257e710cf6091d10a9ca7500742",
+                "reference": "2dbfb53bf8909257e710cf6091d10a9ca7500742",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "intervention/gif": "^4.0.1",
+                "intervention/gif": "^4.1",
                 "php": "^8.1"
             },
             "require-dev": {
@@ -1826,7 +1894,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.5.0"
+                "source": "https://github.com/Intervention/image/tree/3.6.3"
             },
             "funding": [
                 {
@@ -1838,7 +1906,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-13T16:26:15+00:00"
+            "time": "2024-05-02T09:03:18+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1909,16 +1977,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.3",
+            "version": "v10.48.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "5791c052b41c6b593556adc687076bfbdd13c501"
+                "reference": "91e2b9e218afa4e5c377510faa11957042831ba3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/5791c052b41c6b593556adc687076bfbdd13c501",
-                "reference": "5791c052b41c6b593556adc687076bfbdd13c501",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/91e2b9e218afa4e5c377510faa11957042831ba3",
+                "reference": "91e2b9e218afa4e5c377510faa11957042831ba3",
                 "shasum": ""
             },
             "require": {
@@ -2023,7 +2091,7 @@
                 "league/flysystem-sftp-v3": "^3.0",
                 "mockery/mockery": "^1.5.1",
                 "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^8.18",
+                "orchestra/testbench-core": "^8.23.4",
                 "pda/pheanstalk": "^4.0",
                 "phpstan/phpstan": "^1.4.7",
                 "phpunit/phpunit": "^10.0.7",
@@ -2112,20 +2180,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-15T10:17:07+00:00"
+            "time": "2024-04-30T12:52:59+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.16",
+            "version": "v0.1.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781"
+                "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
-                "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920",
+                "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920",
                 "shasum": ""
             },
             "require": {
@@ -2165,11 +2233,12 @@
             "license": [
                 "MIT"
             ],
+            "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.16"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.21"
             },
-            "time": "2024-02-21T19:25:27+00:00"
+            "time": "2024-04-30T12:46:16+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2233,26 +2302,28 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.12.1",
+            "version": "v5.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "7dae1b072573809f32ab6dcf4aebb57c8b3e8acf"
+                "reference": "278d4615f68205722b3a129135774b3764b28a90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/7dae1b072573809f32ab6dcf4aebb57c8b3e8acf",
-                "reference": "7dae1b072573809f32ab6dcf4aebb57c8b3e8acf",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/278d4615f68205722b3a129135774b3764b28a90",
+                "reference": "278d4615f68205722b3a129135774b3764b28a90",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
+                "firebase/php-jwt": "^6.4",
                 "guzzlehttp/guzzle": "^6.0|^7.0",
                 "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "league/oauth1-client": "^1.10.1",
-                "php": "^7.2|^8.0"
+                "php": "^7.2|^8.0",
+                "phpseclib/phpseclib": "^3.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
@@ -2299,7 +2370,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-02-16T08:58:20+00:00"
+            "time": "2024-04-26T13:48:16+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2557,16 +2628,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.25.1",
+            "version": "3.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "abbd664eb4381102c559d358420989f835208f18"
+                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/abbd664eb4381102c559d358420989f835208f18",
-                "reference": "abbd664eb4381102c559d358420989f835208f18",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f",
+                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f",
                 "shasum": ""
             },
             "require": {
@@ -2631,7 +2702,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.25.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.27.0"
             },
             "funding": [
                 {
@@ -2643,20 +2714,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-16T12:53:19+00:00"
+            "time": "2024-04-07T19:17:50+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.25.1",
+            "version": "3.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8"
+                "reference": "3e6ce2f972f1470db779f04d29c289dcd2c32837"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
-                "reference": "6a5be0e6d6a93574e80805c9cc108a4b63c824d8",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/3e6ce2f972f1470db779f04d29c289dcd2c32837",
+                "reference": "3e6ce2f972f1470db779f04d29c289dcd2c32837",
                 "shasum": ""
             },
             "require": {
@@ -2696,7 +2767,7 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.25.1"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.27.0"
             },
             "funding": [
                 {
@@ -2708,7 +2779,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-15T19:58:44+00:00"
+            "time": "2024-04-07T19:16:54+00:00"
         },
         {
             "name": "league/flysystem-local",
@@ -3062,16 +3133,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.8.1",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf"
+                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf",
-                "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
+                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
                 "shasum": ""
             },
             "require": {
@@ -3079,7 +3150,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
             },
             "type": "library",
             "extra": {
@@ -3123,22 +3194,22 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.8.1"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.9.0"
             },
-            "time": "2023-05-10T11:58:31+00:00"
+            "time": "2024-03-31T07:05:07+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "3.5.0",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
                 "shasum": ""
             },
             "require": {
@@ -3161,7 +3232,7 @@
                 "phpstan/phpstan": "^1.9",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
+                "phpunit/phpunit": "^10.5.17",
                 "predis/predis": "^1.1 || ^2",
                 "ruflin/elastica": "^7",
                 "symfony/mailer": "^5.4 || ^6",
@@ -3214,7 +3285,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
             },
             "funding": [
                 {
@@ -3226,7 +3297,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:32:31+00:00"
+            "time": "2024-04-12T21:02:21+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -4717,16 +4788,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.2",
+            "version": "v0.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d"
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d",
-                "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
                 "shasum": ""
             },
             "require": {
@@ -4790,9 +4861,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.2"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
             },
-            "time": "2024-03-17T01:53:00+00:00"
+            "time": "2024-04-02T15:57:53+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -4929,20 +5000,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.5",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -5005,7 +5076,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -5017,7 +5088,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-08T05:53:05+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "robrichards/xmlseclibs",
@@ -5219,21 +5290,21 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.5.1",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "a67f194f0f4c4c7616c549afc697b78df9658d44"
+                "reference": "dea5190981c31b89e52259da9ab1ca4e2b258b21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/a67f194f0f4c4c7616c549afc697b78df9658d44",
-                "reference": "a67f194f0f4c4c7616c549afc697b78df9658d44",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/dea5190981c31b89e52259da9ab1ca4e2b258b21",
+                "reference": "dea5190981c31b89e52259da9ab1ca4e2b258b21",
                 "shasum": ""
             },
             "require": {
                 "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0",
-                "laravel/socialite": "^5.2",
+                "laravel/socialite": "^5.5",
                 "php": "^8.0"
             },
             "require-dev": {
@@ -5289,26 +5360,26 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2024-02-17T08:58:03+00:00"
+            "time": "2024-05-04T07:57:39+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
-            "version": "5.1.0",
+            "version": "5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
-                "reference": "7522b27cd8518706b50e03b40a396fb0a6891feb"
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7522b27cd8518706b50e03b40a396fb0a6891feb",
-                "reference": "7522b27cd8518706b50e03b40a396fb0a6891feb",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.2 || ^8.0",
-                "socialiteproviders/manager": "~4.0"
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
             },
             "type": "library",
             "autoload": {
@@ -5340,7 +5411,7 @@
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2022-03-15T21:17:43+00:00"
+            "time": "2024-03-15T03:02:10+00:00"
         },
         {
             "name": "socialiteproviders/okta",
@@ -5394,22 +5465,22 @@
         },
         {
             "name": "socialiteproviders/twitch",
-            "version": "5.3.1",
+            "version": "5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Twitch.git",
-                "reference": "7accf30ae7a3139b757b4ca8f34989c09a3dbee7"
+                "reference": "c8791b9d208195b5f02bea432de89d0e612b955d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7",
-                "reference": "7accf30ae7a3139b757b4ca8f34989c09a3dbee7",
+                "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/c8791b9d208195b5f02bea432de89d0e612b955d",
+                "reference": "c8791b9d208195b5f02bea432de89d0e612b955d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.2 || ^8.0",
-                "socialiteproviders/manager": "~4.0"
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
             },
             "type": "library",
             "autoload": {
@@ -5428,23 +5499,32 @@
                 }
             ],
             "description": "Twitch OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "laravel",
+                "oauth",
+                "provider",
+                "socialite",
+                "twitch"
+            ],
             "support": {
-                "source": "https://github.com/SocialiteProviders/Twitch/tree/5.3.1"
+                "docs": "https://socialiteproviders.com/twitch",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2020-12-01T23:10:59+00:00"
+            "time": "2024-04-01T01:15:35+00:00"
         },
         {
             "name": "ssddanbrown/htmldiff",
-            "version": "v1.0.2",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ssddanbrown/HtmlDiff.git",
-                "reference": "58f81857c02b50b199273edb4cc339876b5a4038"
+                "reference": "92da405f8138066834b71ac7bedebbda6327761b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/58f81857c02b50b199273edb4cc339876b5a4038",
-                "reference": "58f81857c02b50b199273edb4cc339876b5a4038",
+                "url": "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/92da405f8138066834b71ac7bedebbda6327761b",
+                "reference": "92da405f8138066834b71ac7bedebbda6327761b",
                 "shasum": ""
             },
             "require": {
@@ -5476,7 +5556,7 @@
             "homepage": "https://github.com/ssddanbrown/htmldiff",
             "support": {
                 "issues": "https://github.com/ssddanbrown/HtmlDiff/issues",
-                "source": "https://github.com/ssddanbrown/HtmlDiff/tree/v1.0.2"
+                "source": "https://github.com/ssddanbrown/HtmlDiff/tree/v1.0.3"
             },
             "funding": [
                 {
@@ -5484,7 +5564,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-24T20:12:20+00:00"
+            "time": "2024-03-29T16:51:55+00:00"
         },
         {
             "name": "ssddanbrown/symfony-mailer",
@@ -5525,6 +5605,7 @@
                 "symfony/messenger": "^6.2|^7.0",
                 "symfony/twig-bridge": "^6.2|^7.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -5561,16 +5642,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
                 "shasum": ""
             },
             "require": {
@@ -5635,7 +5716,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.4"
+                "source": "https://github.com/symfony/console/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -5651,20 +5732,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.3",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229"
+                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
-                "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b",
+                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b",
                 "shasum": ""
             },
             "require": {
@@ -5700,7 +5781,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -5716,20 +5797,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                 "shasum": ""
             },
             "require": {
@@ -5738,7 +5819,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5767,7 +5848,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -5783,20 +5864,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a"
+                "reference": "667a072466c6a53827ed7b119af93806b884cbb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/667a072466c6a53827ed7b119af93806b884cbb3",
+                "reference": "667a072466c6a53827ed7b119af93806b884cbb3",
                 "shasum": ""
             },
             "require": {
@@ -5842,7 +5923,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.4"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -5858,20 +5939,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.3",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef"
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
-                "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f",
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f",
                 "shasum": ""
             },
             "require": {
@@ -5922,7 +6003,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -5938,20 +6019,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
                 "shasum": ""
             },
             "require": {
@@ -5961,7 +6042,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5998,7 +6079,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -6014,20 +6095,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.0",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
-                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764",
+                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764",
                 "shasum": ""
             },
             "require": {
@@ -6062,7 +6143,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+                "source": "https://github.com/symfony/finder/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -6078,20 +6159,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-31T17:30:12+00:00"
+            "time": "2024-04-23T10:36:43+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304"
+                "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304",
-                "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759",
+                "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759",
                 "shasum": ""
             },
             "require": {
@@ -6139,7 +6220,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -6155,20 +6236,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-08T15:01:18+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.5",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
+                "reference": "b7b5e6cdef670a0c82d015a966ffc7e855861a98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b7b5e6cdef670a0c82d015a966ffc7e855861a98",
+                "reference": "b7b5e6cdef670a0c82d015a966ffc7e855861a98",
                 "shasum": ""
             },
             "require": {
@@ -6223,6 +6304,7 @@
                 "symfony/translation-contracts": "^2.5|^3",
                 "symfony/uid": "^5.4|^6.0|^7.0",
                 "symfony/validator": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.4|^7.0",
                 "symfony/var-exporter": "^6.2|^7.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
@@ -6252,7 +6334,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -6268,20 +6350,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-04T21:00:47+00:00"
+            "time": "2024-04-29T11:24:44+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.3",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34"
+                "reference": "decadcf3865918ecfcbfa90968553994ce935a5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e",
+                "reference": "decadcf3865918ecfcbfa90968553994ce935a5e",
                 "shasum": ""
             },
             "require": {
@@ -6302,6 +6384,7 @@
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.4|^7.0",
                 "symfony/property-access": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.3.2|^7.0"
@@ -6336,7 +6419,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.3"
+                "source": "https://github.com/symfony/mime/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -6352,7 +6435,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7067,16 +7150,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "710e27879e9be3395de2b98da3f52a946039f297"
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297",
-                "reference": "710e27879e9be3395de2b98da3f52a946039f297",
+                "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381",
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381",
                 "shasum": ""
             },
             "require": {
@@ -7108,7 +7191,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.4"
+                "source": "https://github.com/symfony/process/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7124,20 +7207,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T12:31:00+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.5",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
+                "reference": "276e06398f71fa2a973264d94f28150f93cfb907"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/276e06398f71fa2a973264d94f28150f93cfb907",
+                "reference": "276e06398f71fa2a973264d94f28150f93cfb907",
                 "shasum": ""
             },
             "require": {
@@ -7191,7 +7274,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.5"
+                "source": "https://github.com/symfony/routing/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7207,25 +7290,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-27T12:33:30+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^1.1|^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -7233,7 +7317,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7273,7 +7357,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -7289,20 +7373,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
+                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69",
+                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69",
                 "shasum": ""
             },
             "require": {
@@ -7359,7 +7443,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.4"
+                "source": "https://github.com/symfony/string/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7375,20 +7459,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-01T13:16:41+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e"
+                "reference": "7495687c58bfd88b7883823747b0656d90679123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e",
-                "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
+                "reference": "7495687c58bfd88b7883823747b0656d90679123",
                 "shasum": ""
             },
             "require": {
@@ -7454,7 +7538,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.4"
+                "source": "https://github.com/symfony/translation/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7470,20 +7554,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T13:16:58+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.1",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
                 "shasum": ""
             },
             "require": {
@@ -7492,7 +7576,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7532,7 +7616,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -7548,20 +7632,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.3",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0"
+                "reference": "a66efcb71d8bc3a207d9d78e0bd67f3321510355"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
-                "reference": "1d31267211cc3a2fff32bcfc7c1818dac41b6fc0",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/a66efcb71d8bc3a207d9d78e0bd67f3321510355",
+                "reference": "a66efcb71d8bc3a207d9d78e0bd67f3321510355",
                 "shasum": ""
             },
             "require": {
@@ -7606,7 +7690,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.3"
+                "source": "https://github.com/symfony/uid/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7622,20 +7706,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1"
+                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7",
+                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7",
                 "shasum": ""
             },
             "require": {
@@ -7691,7 +7775,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -7707,7 +7791,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-15T11:23:52+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8167,16 +8251,16 @@
         },
         {
             "name": "itsgoingd/clockwork",
-            "version": "v5.2.0",
+            "version": "v5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/itsgoingd/clockwork.git",
-                "reference": "df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26"
+                "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26",
-                "reference": "df52c7c4d8d60443ea1d14bcf9b182d4eaaeec26",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
+                "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
                 "shasum": ""
             },
             "require": {
@@ -8230,7 +8314,7 @@
             ],
             "support": {
                 "issues": "https://github.com/itsgoingd/clockwork/issues",
-                "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.0"
+                "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.2"
             },
             "funding": [
                 {
@@ -8238,20 +8322,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-20T22:36:44+00:00"
+            "time": "2024-04-14T10:49:22+00:00"
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.2",
+            "version": "v2.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d"
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/a79b46b96060504b400890674b83f66aa7f5db6d",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/101f1a4470f87326f4d3995411d28679d8800abe",
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe",
                 "shasum": ""
             },
             "require": {
@@ -8264,15 +8348,15 @@
                 "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                 "php": "^8.0.2",
-                "phpmyadmin/sql-parser": "^5.8.2",
-                "phpstan/phpstan": "^1.10.50"
+                "phpmyadmin/sql-parser": "^5.9.0",
+                "phpstan/phpstan": "^1.10.66"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "nikic/php-parser": "^4.17.1",
-                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.0",
-                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.0",
-                "phpunit/phpunit": "^9.6.13 || ^10.5"
+                "nikic/php-parser": "^4.19.1",
+                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
+                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -8320,7 +8404,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.2"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.5"
             },
             "funding": [
                 {
@@ -8340,20 +8424,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-02-27T03:16:03+00:00"
+            "time": "2024-04-16T19:13:34+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.9",
+            "version": "1.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
-                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
                 "shasum": ""
             },
             "require": {
@@ -8365,8 +8449,8 @@
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.6.10",
-                "symplify/easy-coding-standard": "^12.0.8"
+                "phpunit/phpunit": "^8.5 || ^9.6.17",
+                "symplify/easy-coding-standard": "^12.1.14"
             },
             "type": "library",
             "autoload": {
@@ -8423,7 +8507,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2023-12-10T02:24:34+00:00"
+            "time": "2024-03-21T18:34:15+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -8788,16 +8872,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.62",
+            "version": "1.10.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9",
-                "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -8840,13 +8924,9 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-03-13T12:27:20+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9171,16 +9251,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.13",
+            "version": "10.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7"
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
-                "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
                 "shasum": ""
             },
             "require": {
@@ -9252,7 +9332,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
             },
             "funding": [
                 {
@@ -9268,7 +9348,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-12T15:37:41+00:00"
+            "time": "2024-04-24T06:32:35+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9642,16 +9722,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "6.0.1",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951",
-                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                 "shasum": ""
             },
             "require": {
@@ -9666,7 +9746,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -9694,7 +9774,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1"
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -9702,7 +9782,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-11T05:39:26+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -10188,16 +10268,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
+            "version": "3.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
                 "shasum": ""
             },
             "require": {
@@ -10264,7 +10344,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-02-16T15:06:51+00:00"
+            "time": "2024-04-23T20:25:34+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10324,16 +10404,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.4",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531"
+                "reference": "2088c5da700b1e7a8689fffc10dda6c1f643deea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531",
-                "reference": "f0e7ec3fa17000e2d0cb4557b4b47c88a6a63531",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2088c5da700b1e7a8689fffc10dda6c1f643deea",
+                "reference": "2088c5da700b1e7a8689fffc10dda6c1f643deea",
                 "shasum": ""
             },
             "require": {
@@ -10371,7 +10451,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.4"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -10387,7 +10467,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-07T09:17:57+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 424e8f503eb6a59c0e3f0b7d8b8a5764bb06327c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 10 May 2024 11:02:20 +0100
Subject: [PATCH 125/666] Readme: Updated sponsor list

---
 readme.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/readme.md b/readme.md
index c46e1641f19..11bf2c8886f 100644
--- a/readme.md
+++ b/readme.md
@@ -45,6 +45,14 @@ Big thanks to these companies for supporting the project.
 
 [Project donation details](https://www.bookstackapp.com/donate/) - [GitHub Sponsors Page](https://github.com/sponsors/ssddanbrown) - [Ko-fi Page](https://ko-fi.com/ssddanbrown)
 
+#### Gold Sponsor
+
+<table><tbody><tr>
+<td align="center"><a href="https://www.federated.computer/bookstack/" target="_blank">
+    <img width="480" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/federated-computer.png" alt="Federated.computer">
+</a></td>
+</tr></tbody></table>
+
 #### Bronze Sponsors
 
 <table><tbody><tr>

From 2b9b0f91cbd053ecc248652db2d86ef42fd86817 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sat, 11 May 2024 15:15:10 +0100
Subject: [PATCH 126/666] Updated translations with latest Crowdin changes
 (#4890)

---
 lang/ar/preferences.php          |   2 +-
 lang/ar/settings.php             |   8 ++
 lang/bg/preferences.php          |   2 +-
 lang/bg/settings.php             |   8 ++
 lang/bs/preferences.php          |   2 +-
 lang/bs/settings.php             |   8 ++
 lang/ca/preferences.php          |   2 +-
 lang/ca/settings.php             |   8 ++
 lang/cs/preferences.php          |   2 +-
 lang/cs/settings.php             |   8 ++
 lang/cy/preferences.php          |   2 +-
 lang/cy/settings.php             |   8 ++
 lang/da/activities.php           |  26 ++--
 lang/da/auth.php                 |  10 +-
 lang/da/common.php               |  14 +-
 lang/da/components.php           |  26 ++--
 lang/da/editor.php               |   8 +-
 lang/da/entities.php             |  28 ++--
 lang/da/notifications.php        |   2 +-
 lang/da/preferences.php          |  74 +++++-----
 lang/da/settings.php             |  20 ++-
 lang/de/preferences.php          |   2 +-
 lang/de/settings.php             |   8 ++
 lang/de_informal/entities.php    |   2 +-
 lang/de_informal/preferences.php |   2 +-
 lang/de_informal/settings.php    |   8 ++
 lang/el/preferences.php          |   2 +-
 lang/el/settings.php             |   8 ++
 lang/es/activities.php           |   4 +-
 lang/es/preferences.php          |   2 +-
 lang/es/settings.php             |   8 ++
 lang/es_AR/activities.php        |   2 +-
 lang/es_AR/notifications.php     |  10 +-
 lang/es_AR/preferences.php       |   2 +-
 lang/es_AR/settings.php          |  14 +-
 lang/et/preferences.php          |   2 +-
 lang/et/settings.php             |   8 ++
 lang/eu/preferences.php          |   2 +-
 lang/eu/settings.php             |   8 ++
 lang/fa/settings.php             |   8 ++
 lang/fi/settings.php             |   8 ++
 lang/fr/passwords.php            |   4 +-
 lang/fr/preferences.php          |   4 +-
 lang/fr/settings.php             |   8 ++
 lang/he/preferences.php          |   2 +-
 lang/he/settings.php             |   8 ++
 lang/hr/preferences.php          |   2 +-
 lang/hr/settings.php             |   8 ++
 lang/hu/preferences.php          |   2 +-
 lang/hu/settings.php             |   8 ++
 lang/id/preferences.php          |   2 +-
 lang/id/settings.php             |   8 ++
 lang/it/activities.php           |  26 ++--
 lang/it/auth.php                 |   6 +-
 lang/it/common.php               |  12 +-
 lang/it/entities.php             |  94 ++++++------
 lang/it/errors.php               |  30 ++--
 lang/it/notifications.php        |  14 +-
 lang/it/passwords.php            |   4 +-
 lang/it/preferences.php          |  28 ++--
 lang/it/settings.php             | 236 ++++++++++++++++---------------
 lang/it/validation.php           |  28 ++--
 lang/ja/preferences.php          |   2 +-
 lang/ja/settings.php             |   8 ++
 lang/ka/preferences.php          |   2 +-
 lang/ka/settings.php             |   8 ++
 lang/ko/preferences.php          |   2 +-
 lang/ko/settings.php             |   8 ++
 lang/lt/common.php               |   2 +-
 lang/lt/preferences.php          |  22 +--
 lang/lt/settings.php             |   8 ++
 lang/lv/activities.php           |   6 +-
 lang/lv/preferences.php          |   2 +-
 lang/lv/settings.php             |   8 ++
 lang/nb/preferences.php          |   2 +-
 lang/nb/settings.php             |   8 ++
 lang/nl/auth.php                 |  32 ++---
 lang/nl/components.php           |   2 +-
 lang/nl/editor.php               |   2 +-
 lang/nl/entities.php             |  22 +--
 lang/nl/errors.php               |  14 +-
 lang/nl/notifications.php        |   2 +-
 lang/nl/passwords.php            |   2 +-
 lang/nl/preferences.php          |   8 +-
 lang/nl/settings.php             |  26 ++--
 lang/nn/preferences.php          |   2 +-
 lang/nn/settings.php             |   8 ++
 lang/pl/activities.php           |   6 +-
 lang/pl/common.php               |   2 +-
 lang/pl/editor.php               |   6 +-
 lang/pl/entities.php             |  12 +-
 lang/pl/errors.php               |   2 +-
 lang/pl/preferences.php          |   2 +-
 lang/pl/settings.php             |  10 +-
 lang/pt/preferences.php          |   2 +-
 lang/pt/settings.php             |   8 ++
 lang/pt_BR/preferences.php       |   2 +-
 lang/pt_BR/settings.php          |   8 ++
 lang/ro/preferences.php          |   2 +-
 lang/ro/settings.php             |   8 ++
 lang/ru/activities.php           |   8 +-
 lang/ru/common.php               |   2 +-
 lang/ru/editor.php               |   6 +-
 lang/ru/entities.php             |  34 ++---
 lang/ru/errors.php               |  10 +-
 lang/ru/notifications.php        |   6 +-
 lang/ru/preferences.php          |  10 +-
 lang/ru/settings.php             |  12 +-
 lang/sk/activities.php           |  18 +--
 lang/sk/preferences.php          |   2 +-
 lang/sk/settings.php             |   8 ++
 lang/sl/activities.php           |   6 +-
 lang/sl/editor.php               | 214 ++++++++++++++--------------
 lang/sl/preferences.php          |   2 +-
 lang/sl/settings.php             |   8 ++
 lang/sl/validation.php           |   8 +-
 lang/sq/preferences.php          |   2 +-
 lang/sq/settings.php             |   8 ++
 lang/sr/editor.php               | 112 +++++++--------
 lang/sr/preferences.php          |   2 +-
 lang/sr/settings.php             |   8 ++
 lang/sv/preferences.php          |   2 +-
 lang/sv/settings.php             |   8 ++
 lang/tr/preferences.php          |   2 +-
 lang/tr/settings.php             |   8 ++
 lang/uk/activities.php           |   6 +-
 lang/uk/common.php               |   2 +-
 lang/uk/editor.php               |   6 +-
 lang/uk/entities.php             |   8 +-
 lang/uk/errors.php               |   2 +-
 lang/uk/preferences.php          |   2 +-
 lang/uk/settings.php             |  10 +-
 lang/uz/preferences.php          |   2 +-
 lang/uz/settings.php             |   8 ++
 lang/vi/preferences.php          |   2 +-
 lang/vi/settings.php             |   8 ++
 lang/zh_CN/preferences.php       |   2 +-
 lang/zh_CN/settings.php          |   8 ++
 lang/zh_TW/activities.php        |  62 ++++----
 lang/zh_TW/common.php            |   2 +-
 lang/zh_TW/entities.php          |   6 +-
 lang/zh_TW/errors.php            |   2 +-
 lang/zh_TW/preferences.php       |  56 ++++----
 lang/zh_TW/settings.php          |  10 +-
 144 files changed, 1134 insertions(+), 766 deletions(-)

diff --git a/lang/ar/preferences.php b/lang/ar/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/ar/preferences.php
+++ b/lang/ar/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 287e6a16606..f2405e9d5e1 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/bg/preferences.php b/lang/bg/preferences.php
index 963f1f04c7d..f954340e2d2 100644
--- a/lang/bg/preferences.php
+++ b/lang/bg/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index bf0c8b3bc75..97de55b366c 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Последна грешка на:',
     'webhooks_last_error_message' => 'Последно съобщение за грешка:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/bs/preferences.php b/lang/bs/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/bs/preferences.php
+++ b/lang/bs/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index 7b7f5d2a2e3..f4c84092c6f 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ca/preferences.php b/lang/ca/preferences.php
index b56b8b3bb09..9d9ed8aa10d 100644
--- a/lang/ca/preferences.php
+++ b/lang/ca/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Desa les preferències',
     'notifications_update_success' => 'S’han actualitzat les preferències de notificacions!',
     'notifications_watched' => 'Elements seguits i ignorats',
-    'notifications_watched_desc' => ' A continuació hi ha els elements que tenen aplicades preferències de seguiment personalitzades. Per a actualitzar-ne les preferències, consulteu l’element i seleccioneu les opcions de seguiment a la barra lateral.',
+    'notifications_watched_desc' => 'A continuació hi ha els elements que tenen aplicades preferències de seguiment personalitzades. Per a actualitzar-ne les preferències, consulteu l’element i seleccioneu les opcions de seguiment a la barra lateral.',
 
     'auth' => 'Accés i seguretat',
     'auth_change_password' => 'Canvia la contrasenya',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index d39174c9bbe..5fe9d3bffe7 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Error per darrera vegada:',
     'webhooks_last_error_message' => 'Darrer missatge d’error:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/cs/preferences.php b/lang/cs/preferences.php
index 295fb5ca1a6..9a127601e2c 100644
--- a/lang/cs/preferences.php
+++ b/lang/cs/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Uložit preference',
     'notifications_update_success' => 'Nastavení oznámení byla aktualizována!',
     'notifications_watched' => 'Sledované a ignorované položky',
-    'notifications_watched_desc' => ' Níže jsou položky, které mají vlastní nastavení hodinek. Chcete-li aktualizovat vaše předvolby, podívejte se na položku a pak najděte možnosti hodinek v postranním panelu.',
+    'notifications_watched_desc' => 'Níže jsou položky, které mají vlastní nastavení hodinek. Chcete-li aktualizovat vaše předvolby, podívejte se na položku a pak najděte možnosti hodinek v postranním panelu.',
 
     'auth' => 'Přístup a zabezpečení',
     'auth_change_password' => 'Změnit heslo',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 75331834e13..23820fe873b 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Poslední chyba:',
     'webhooks_last_error_message' => 'Poslední chybová zpráva',
 
+    // Licensing
+    'licenses' => 'Licence',
+    'licenses_desc' => 'Na této stránce naleznete kromě informací o projektech a knihovnách, které se v rámci BookStacku používají, také informace o licencích pro BookStack. Mnoho uvedených projektů lze používat pouze ve vývojovém kontextu.',
+    'licenses_bookstack' => 'BookStack licence',
+    'licenses_php' => 'Licence PHP knihoven',
+    'licenses_js' => 'Licence JavaScript knihoven',
+    'licenses_other' => 'Ostatní licence',
+    'license_details' => 'Podrobnosti o licenci',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/cy/preferences.php b/lang/cy/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/cy/preferences.php
+++ b/lang/cy/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index 7b7f5d2a2e3..f4c84092c6f 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/da/activities.php b/lang/da/activities.php
index 7478e18bff4..f374d799ab5 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -15,7 +15,7 @@
     'page_restore'                => 'gendannede side',
     'page_restore_notification'   => 'Siden blev gendannet',
     'page_move'                   => 'flyttede side',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'Siden blev flyttet',
 
     // Chapters
     'chapter_create'              => 'oprettede kapitel',
@@ -25,7 +25,7 @@
     'chapter_delete'              => 'slettede kapitel',
     'chapter_delete_notification' => 'Kapitel blev slettet',
     'chapter_move'                => 'flyttede kapitel',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'Kapitlet blev flyttet',
 
     // Books
     'book_create'                 => 'oprettede bog',
@@ -40,19 +40,19 @@
     'book_sort_notification'      => 'Bogen blev re-sorteret',
 
     // Bookshelves
-    'bookshelf_create'            => 'created shelf',
-    'bookshelf_create_notification'    => 'Shelf successfully created',
-    'bookshelf_create_from_book'    => 'converted book to shelf',
+    'bookshelf_create'            => 'oprettede reol',
+    'bookshelf_create_notification'    => 'Reolen blev oprettet',
+    'bookshelf_create_from_book'    => 'omdannede bog til reol',
     'bookshelf_create_from_book_notification'    => 'Bogen blev omdannet til en bogreal',
-    'bookshelf_update'                 => 'updated shelf',
-    'bookshelf_update_notification'    => 'Shelf successfully updated',
-    'bookshelf_delete'                 => 'deleted shelf',
-    'bookshelf_delete_notification'    => 'Shelf successfully deleted',
+    'bookshelf_update'                 => 'opdaterede reolen',
+    'bookshelf_update_notification'    => 'Reolen blev opdateret',
+    'bookshelf_delete'                 => 'slettede reol',
+    'bookshelf_delete_notification'    => 'Reolen blev slettet',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'gendannede version',
+    'revision_delete' => 'slettede version',
+    'revision_delete_notification' => 'Versionen blev slettet',
 
     // Favourites
     'favourite_add_notification' => '":name" er blevet tilføjet til dine favoritter',
@@ -62,7 +62,7 @@
     'watch_update_level_notification' => 'Watch preferences successfully updated',
 
     // Auth
-    'auth_login' => 'logged in',
+    'auth_login' => 'loggede ind',
     'auth_register' => 'registered as new user',
     'auth_password_reset_request' => 'requested user password reset',
     'auth_password_reset_update' => 'reset user password',
diff --git a/lang/da/auth.php b/lang/da/auth.php
index 2d2b7bebb88..090e0751e61 100644
--- a/lang/da/auth.php
+++ b/lang/da/auth.php
@@ -39,9 +39,9 @@
     'register_success' => 'Tak for din registrering. Du er nu registeret og logget ind.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Attempting Login',
-    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
-    'auto_init_start_link' => 'Proceed with authentication',
+    'auto_init_starting' => 'Forsøger Login',
+    'auto_init_starting_desc' => 'Vi kontakter dit godkendelsessystem for at starte loginprocessen. Hvis der ikke er nogen fremskridt efter 5 sekunder, kan du prøve at klikke på linket nedenfor.',
+    'auto_init_start_link' => 'Fortsæt med godkendelse',
 
     // Password Reset
     'reset_password' => 'Nulstil adgangskode',
@@ -61,7 +61,7 @@
     'email_confirm_send_error' => 'E-Mail-bekræftelse kræves, men systemet kunne ikke sende E-Mailen. Kontakt administratoren for at sikre, at E-Mail er konfigureret korrekt.',
     'email_confirm_success' => 'Din email er blevet bekræftet! Du bør nu kune logge ind med denne emailadresse.',
     'email_confirm_resent' => 'Bekræftelsesmail sendt, tjek venligst din indboks.',
-    'email_confirm_thanks' => 'Thanks for confirming!',
+    'email_confirm_thanks' => 'Tak for bekræftelsen!',
     'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
 
     'email_not_confirmed' => 'E-Mail adresse ikke bekræftet',
@@ -103,7 +103,7 @@
     'mfa_gen_totp_verify_setup' => 'Verificer Opsætning',
     'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
     'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
+    'mfa_verify_access' => 'Bekræft Adgang',
     'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
     'mfa_verify_no_methods' => 'Ingen Metoder Konfigureret',
     'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
diff --git a/lang/da/common.php b/lang/da/common.php
index 5b4c0e822a5..8c6fa105cc1 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -6,7 +6,7 @@
 
     // Buttons
     'cancel' => 'Annuller',
-    'close' => 'Close',
+    'close' => 'Luk',
     'confirm' => 'Bekræft',
     'back' => 'Tilbage',
     'save' => 'Gem',
@@ -20,13 +20,13 @@
     'description' => 'Beskrivelse',
     'role' => 'Rolle',
     'cover_image' => 'Coverbillede',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Dette billede skal være omkring 440x250px selvom det vil være fleksibelt skaleret & beskåret for at passe til brugergrænsefladen i forskellige scenarier efter behov. Så de faktiske dimensioner for visning vil være forskellige.',
 
     // Actions
     'actions' => 'Handlinger',
     'view' => 'Vis',
     'view_all' => 'Vis alle',
-    'new' => 'New',
+    'new' => 'Ny',
     'create' => 'Opret',
     'update' => 'Opdater',
     'edit' => 'Rediger',
@@ -42,7 +42,7 @@
     'remove' => 'Fjern',
     'add' => 'Tilføj',
     'configure' => 'Konfigurer',
-    'manage' => 'Manage',
+    'manage' => 'Administrer',
     'fullscreen' => 'Fuld skærm',
     'favourite' => 'Foretrukken',
     'unfavourite' => 'Fjern som foretrukken',
@@ -52,7 +52,7 @@
     'filter_clear' => 'Nulstil Filter',
     'download' => 'Hent',
     'open_in_tab' => 'Åben i ny fane',
-    'open' => 'Open',
+    'open' => 'Åbn',
 
     // Sort Options
     'sort_options' => 'Sorteringsindstillinger',
@@ -84,14 +84,14 @@
     'none' => 'Ingen',
 
     // Header
-    'homepage' => 'Homepage',
+    'homepage' => 'Forside',
     'header_menu_expand' => 'Udvid header menu',
     'profile_menu' => 'Profilmenu',
     'view_profile' => 'Vis profil',
     'edit_profile' => 'Redigér Profil',
     'dark_mode' => 'Mørk tilstand',
     'light_mode' => 'Lys tilstand',
-    'global_search' => 'Global Search',
+    'global_search' => 'Global søgning',
 
     // Layout tabs
     'tab_info' => 'Info',
diff --git a/lang/da/components.php b/lang/da/components.php
index bcbf1167285..410ed4fc5ea 100644
--- a/lang/da/components.php
+++ b/lang/da/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'Billedselektion',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'Billede Liste',
+    'image_details' => 'Billede Detaljer',
+    'image_upload' => 'Upload billede',
+    'image_intro' => 'Her kan du vælge og administrere billeder, der tidligere er blevet uploadet til systemet.',
+    'image_intro_upload' => 'Upload et nyt billede ved at trække en billedfil ind i dette vindue, eller ved at bruge knappen "Upload billede" ovenfor.',
     'image_all' => 'Alt',
     'image_all_title' => 'Se alle billeder',
     'image_book_title' => 'Vis billeder uploadet til denne bog',
     'image_page_title' => 'Vis billeder uploadet til denne side',
     'image_search_hint' => 'Søg efter billednavn',
     'image_uploaded' => 'Uploadet :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'Uploadet af :userName',
+    'image_uploaded_to' => 'Uploadet til :pageLink',
+    'image_updated' => 'Opdateret :updateDate',
     'image_load_more' => 'Indlæse mere',
     'image_image_name' => 'Billednavn',
     'image_delete_used' => 'Dette billede er brugt på siderne nedenfor.',
     'image_delete_confirm_text' => 'Er du sikker på at du vil slette dette billede?',
     'image_select_image' => 'Vælg billede',
     'image_dropzone' => 'Træk-og-slip billede eller klik her for at uploade',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'Slip billeder her for at uploade',
     'images_deleted' => 'Billede slettet',
     'image_preview' => 'Billedeksempel',
     'image_upload_success' => 'Foto uploadet',
     'image_update_success' => 'Billeddetaljer succesfuldt opdateret',
     'image_delete_success' => 'Billede slettet',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'Erstat billede',
+    'image_replace_success' => 'Billedfil blev opdateret',
+    'image_rebuild_thumbs' => 'Regenerer størrelsesvariationer',
+    'image_rebuild_thumbs_success' => 'Variationer i billedstørrelse blev genopbygget!',
 
     // Code Editor
     'code_editor' => 'Rediger kode',
diff --git a/lang/da/editor.php b/lang/da/editor.php
index bf45899a8cc..973c8a90266 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -14,7 +14,7 @@
     'save' => 'Gem',
     'close' => 'Luk',
     'undo' => 'Fortryd',
-    'redo' => 'Redo',
+    'redo' => 'Gendan',
     'left' => 'Venstre',
     'center' => 'Midten',
     'right' => 'Højre',
@@ -31,7 +31,7 @@
     'header_large' => 'Stor Overskrift',
     'header_medium' => 'Mellemstor Overskrift',
     'header_small' => 'Lille Overskrift',
-    'header_tiny' => 'Tiny Header',
+    'header_tiny' => 'Lille Header',
     'paragraph' => 'Paragraf',
     'blockquote' => 'Citat',
     'inline_code' => 'Inline kode',
@@ -125,8 +125,8 @@
     'paste_column_after' => 'Indsæt kolonne efter',
     'cell_padding' => 'Cell padding',
     'cell_spacing' => 'Cell spacing',
-    'caption' => 'Caption',
-    'show_caption' => 'Show caption',
+    'caption' => 'Citat',
+    'show_caption' => 'Vis citat',
     'constrain' => 'Constrain proportions',
     'cell_border_solid' => 'Solid',
     'cell_border_dotted' => 'Prikket',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index c952f147b8b..1e8b38fa9b5 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -34,7 +34,7 @@
     'no_pages_viewed' => 'Du har ikke besøgt nogle sider',
     'no_pages_recently_created' => 'Ingen sider er blevet oprettet for nyligt',
     'no_pages_recently_updated' => 'Ingen sider er blevet opdateret for nyligt',
-    'export' => 'Exporter',
+    'export' => 'Eksporter',
     'export_html' => 'Indeholdt webfil',
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Almindelig tekstfil',
@@ -155,14 +155,14 @@
     'books_sort_show_other' => 'Vis andre bøger',
     'books_sort_save' => 'Gem ny ordre',
     'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
+    'books_sort_move_up' => 'Flyt op',
+    'books_sort_move_down' => 'Flyt ned',
+    'books_sort_move_prev_book' => 'Flyt til forrige bog',
+    'books_sort_move_next_book' => 'Flyt til næste bog',
+    'books_sort_move_prev_chapter' => 'Flyt Til Foregående Kapitel',
+    'books_sort_move_next_chapter' => 'Flyt Til Næste Kapitel',
+    'books_sort_move_book_start' => 'Flyt til Start af bog',
+    'books_sort_move_book_end' => 'Flyt til slutningen af bogen',
     'books_sort_move_before_chapter' => 'Move to Before Chapter',
     'books_sort_move_after_chapter' => 'Move to After Chapter',
     'books_copy' => 'Kopier Bog',
@@ -229,7 +229,7 @@
     'pages_edit_enter_changelog' => 'Indtast ændringsoversigt',
     'pages_editor_switch_title' => 'Skift Editor',
     'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consider_following' => 'Overvej følgende ved skift af redaktører:',
     'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
     'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
     'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
@@ -241,7 +241,7 @@
     'pages_md_insert_image' => 'Indsæt billede',
     'pages_md_insert_link' => 'Indsæt emnelink',
     'pages_md_insert_drawing' => 'Indsæt tegning',
-    'pages_md_show_preview' => 'Show preview',
+    'pages_md_show_preview' => 'Vis forhåndsvisning',
     'pages_md_sync_scroll' => 'Sync preview scroll',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
@@ -261,7 +261,7 @@
     'pages_revisions_created_by' => 'Oprettet af',
     'pages_revisions_date' => 'Revisionsdato',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => 'Revisionsnummer',
     'pages_revisions_numbered' => 'Revision #:id',
     'pages_revisions_numbered_changes' => 'Revision #:id ændringer',
     'pages_revisions_editor' => 'Editor Type',
@@ -299,7 +299,7 @@
     'pages_is_template' => 'Sideskabelon',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Sidebjælke til/fra',
     'page_tags' => 'Sidetags',
     'chapter_tags' => 'Kapiteltags',
     'book_tags' => 'Bogtags',
@@ -412,7 +412,7 @@
     'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
 
     // Watch Options
-    'watch' => 'Watch',
+    'watch' => 'Overvåg',
     'watch_title_default' => 'Default Preferences',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignore',
diff --git a/lang/da/notifications.php b/lang/da/notifications.php
index 61a44f1f094..00b0c464f15 100644
--- a/lang/da/notifications.php
+++ b/lang/da/notifications.php
@@ -20,7 +20,7 @@
     'detail_updated_by' => 'Updated By:',
 
     'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_page' => 'Vis Side',
 
     'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
     'footer_reason_link' => 'your notification preferences',
diff --git a/lang/da/preferences.php b/lang/da/preferences.php
index 2b88f9671ff..9b9436dbab2 100644
--- a/lang/da/preferences.php
+++ b/lang/da/preferences.php
@@ -5,47 +5,47 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Min konto',
 
-    'shortcuts' => 'Shortcuts',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
+    'shortcuts' => 'Genveje',
+    'shortcuts_interface' => 'Genveje',
+    'shortcuts_toggle_desc' => 'Her kan du aktivere eller deaktivere genveje, der bruges til navigation og handlinger.',
+    'shortcuts_customize_desc' => 'Du kan tilpasse hver af genvejene nedenfor. Tryk på din ønskede tastekombination efter at have valgt feltet for genvejen.',
+    'shortcuts_toggle_label' => 'Tastaturgenveje aktiveret',
     'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_section_actions' => 'Almindelige handlinger',
+    'shortcuts_save' => 'Gem Genveje',
+    'shortcuts_overlay_desc' => 'Bemærk: Når genveje er aktiveret kan du altid se de tilgængelige genveje ved at trykke på "?" på dit tastatur.',
+    'shortcuts_update_success' => 'Genvejspræferencer er blevet opdateret!',
+    'shortcuts_overview_desc' => 'Håndtér tastaturgenveje, du kan bruge til at navigere i systemets brugergrænseflade.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications' => 'Notifikationer',
+    'notifications_desc' => 'Administrer de e-mail-notifikationer, du modtager, når visse aktiviteter udføres i systemet.',
+    'notifications_opt_own_page_changes' => 'Adviser ved ændringer af sider, jeg ejer',
+    'notifications_opt_own_page_comments' => 'Adviser ved kommentarer på sider, jeg ejer',
+    'notifications_opt_comment_replies' => 'Adviser ved svar på mine kommentarer',
+    'notifications_save' => 'Gem Indstillinger',
+    'notifications_update_success' => 'Indstillinger for notifikationer er blevet opdateret!',
+    'notifications_watched' => 'Overvågede & Ignorerede',
+    'notifications_watched_desc' => 'Nedenfor er de elementer, der har brugerdefinerede overvågning aktivt. For at opdatere dine præferencer for disse, gå til elementet og find derefter overvågning i sidepanelet.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'Adgang & Sikkerhed',
+    'auth_change_password' => 'Skift adgangskode',
+    'auth_change_password_desc' => 'Skift den adgangskode, du bruger til at logge ind med. Den skal være mindst 8 tegn lang.',
+    'auth_change_password_success' => 'Adgangskoden er blevet opdateret!',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => 'Profil',
+    'profile_desc' => 'Administrer detaljerne på din konto, som repræsenterer dig over for andre brugere.',
+    'profile_view_public' => 'Vis offentlig profil',
+    'profile_name_desc' => 'Konfigurer dit visningsnavn, som vil være synligt for andre brugere i systemet gennem den aktivitet, du udfører, og indhold du ejer.',
+    'profile_email_desc' => 'Denne e-mail vil blive brugt til notifikationer og, afhængigt af aktiv systemgodkendelse, systemadgang.',
+    'profile_email_no_permission' => 'Desværre har du ikke tilladelse til at ændre din e-mailadresse. Hvis du ønsker at ændre dette, skal du bede en administrator om at ændre dette for dig.',
+    'profile_avatar_desc' => 'Vælg et billede som vil blive brugt til at repræsentere dig selv over for andre i systemet. Ideelt set bør dette billede være kvadrat og omkring 256px i bredde og højde.',
+    'profile_admin_options' => 'Administrator Indstillinger',
+    'profile_admin_options_desc' => 'Yderligere indstillinger på administratorniveau, såsom dem der håndterer rolleopgaver, kan findes for din brugerkonto i området "Indstillinger > Brugere".',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'Slet konto',
+    'delete_my_account' => 'Slet min konto',
+    'delete_my_account_desc' => 'Dette vil fuldt ud slette din brugerkonto fra systemet. Du vil ikke være i stand til at gendanne denne konto eller fortryde denne handling. Indhold, du har oprettet, såsom oprettede sider og uploadede billeder, vil ikke blive slettet.',
+    'delete_my_account_warning' => 'Er du sikker at du vil slette din konto?',
 ];
diff --git a/lang/da/settings.php b/lang/da/settings.php
index b777ea14a29..276bb499595 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -51,8 +51,8 @@
     'color_scheme' => 'Application Color Scheme',
     'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
     'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
-    'link_color' => 'Default Link Color',
+    'app_color' => 'Primær farve',
+    'link_color' => 'Standard Link Farve',
     'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
     'bookshelf_color' => 'Bogreolfarve',
     'book_color' => 'Bogfarve',
@@ -92,7 +92,7 @@
     'maint_send_test_email_mail_text' => 'Tillykke! Da du har modtaget denne mailnotifikation, ser det ud som om, at dine mailindstillinger er opsat korrekt.',
     'maint_recycle_bin_desc' => 'Slettede hylder, bøger, kapitler og sider overføres til papirkurven, så de kan gendannes eller slettes permanent. Ældre elementer i papirkurven fjernes automatisk efter et stykke tid afhængigt af systemets konfiguration.',
     'maint_recycle_bin_open' => 'Åbn papirkurven',
-    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references' => 'Regenerer Referencer',
     'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
     'maint_regen_references_success' => 'Reference index has been regenerated!',
     'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
@@ -139,7 +139,7 @@
     'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
     'roles_x_users_assigned' => ':count user assigned|:count users assigned',
     'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
+    'roles_assigned_users' => 'Tildelte brugere',
     'roles_permissions_provided' => 'Provided Permissions',
     'role_create' => 'Opret en ny rolle',
     'role_delete' => 'Slet rolle',
@@ -214,8 +214,8 @@
     'users_social_accounts_info' => 'Her kan du forbinde dine andre konti for hurtigere og lettere login. Afbrydelse af en konto her tilbagekalder ikke tidligere autoriseret adgang. Tilbagekald adgang fra dine profilindstillinger på den tilsluttede sociale konto.',
     'users_social_connect' => 'Forbind konto',
     'users_social_disconnect' => 'Frakobl konto',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Tilsuttet',
+    'users_social_status_disconnected' => 'Afbrudt',
     'users_social_connected' => ':socialAccount kontoen blev knyttet til din profil.',
     'users_social_disconnected' => ':socialAccount kontoen blev afbrudt fra din profil.',
     'users_api_tokens' => 'API Tokens',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Sidst Fejlet:',
     'webhooks_last_error_message' => 'Sidste fejlmeddelelse:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/de/preferences.php b/lang/de/preferences.php
index 66c7f6f12e4..291e0f9f66d 100644
--- a/lang/de/preferences.php
+++ b/lang/de/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Einstellungen speichern',
     'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
     'notifications_watched' => 'Beobachtete und ignorierte Elemente',
-    'notifications_watched_desc' => ' Nachfolgend finden Sie die Elemente, für die benutzerdefinierten Überwachungspräferenzen gelten. Um Ihre Einstellungen für diese Elemente zu aktualisieren, sehen Sie sich das Element an und suchen dann die Überwachungsoptionen in der Seitenleiste.',
+    'notifications_watched_desc' => 'Nachfolgend finden Sie die Elemente, für die benutzerdefinierten Überwachungspräferenzen gelten. Um Ihre Einstellungen für diese Elemente zu aktualisieren, sehen Sie sich das Element an und suchen dann die Überwachungsoptionen in der Seitenleiste.',
 
     'auth' => 'Zugang & Sicherheit',
     'auth_change_password' => 'Passwort ändern',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index f25576e2788..f237ea53271 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -277,6 +277,14 @@
     'webhooks_last_errored' => 'Letzter Fehler:',
     'webhooks_last_error_message' => 'Letzte Fehlermeldung:',
 
+    // Licensing
+    'licenses' => 'Lizenzen',
+    'licenses_desc' => 'Diese Seite beschreibt Lizenzinformationen für BookStack zusätzlich zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele aufgelistete Projekte dürfen nur in einem Entwicklungskontext verwendet werden.',
+    'licenses_bookstack' => 'BookStack-Lizenz',
+    'licenses_php' => 'PHP-Bibliothekslizenzen',
+    'licenses_js' => 'JavaScript-Bibliothekslizenzen',
+    'licenses_other' => 'Andere Lizenzen',
+    'license_details' => 'Lizenzdetails',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 9ed27c9d183..f65e15ee832 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -398,7 +398,7 @@
     'convert_to_shelf' => 'In Regal umwandeln',
     'convert_to_shelf_contents_desc' => 'Du kannst dieses Buch in ein neues Regal mit demselben Inhalt umwandeln. Die in diesem Buch enthaltenen Kapitel werden in neue Bücher umgewandelt. Wenn dieses Buch Seiten enthält, die nicht in einem Kapitel enthalten sind, wird das Buch umbenannt und enthält diese Seiten, und das Buch wird Teil des neuen Regals.',
     'convert_to_shelf_permissions_desc' => 'Alle Berechtigungen, die für dieses Buch festgelegt wurden, werden in das neue Regal und in alle neuen untergeordneten Bücher kopiert, für die keine eigenen Berechtigungen festgelegt wurden. Beachte, dass Berechtigungen für Regale nicht automatisch auf den Inhalt übertragen werden, wie es bei Büchern der Fall ist.',
-    'convert_book' => 'In Buch umwandeln',
+    'convert_book' => 'Buch umwandeln',
     'convert_book_confirm' => 'Bist du dir sicher, dass du dieses Buch umwandelt möchtest?',
     'convert_undo_warning' => 'Das kann nicht so einfach rückgängig gemacht werden.',
     'convert_to_book' => 'In Buch umwandeln',
diff --git a/lang/de_informal/preferences.php b/lang/de_informal/preferences.php
index a2fc60a14ff..8211e2336bf 100644
--- a/lang/de_informal/preferences.php
+++ b/lang/de_informal/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Einstellungen speichern',
     'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
     'notifications_watched' => 'Beobachtete und ignorierte Elemente',
-    'notifications_watched_desc' => ' Nachfolgend finden Sie die Elemente, für die benutzerdefinierten Überwachungspräferenzen gelten. Um deine Einstellungen für diese Elemente zu aktualisieren, sieh dir das Element an und suche dann die Überwachungsoptionen in der Seitenleiste.',
+    'notifications_watched_desc' => 'Nachfolgend finden Sie die Elemente, für die benutzerdefinierten Überwachungspräferenzen gelten. Um deine Einstellungen für diese Elemente zu aktualisieren, sieh dir das Element an und suche dann die Überwachungsoptionen in der Seitenleiste.',
 
     'auth' => 'Zugang & Sicherheit',
     'auth_change_password' => 'Passwort ändern',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index ea65bef5525..4398edebdae 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -277,6 +277,14 @@
     'webhooks_last_errored' => 'Letzter Fehler:',
     'webhooks_last_error_message' => 'Letzte Fehlermeldung:',
 
+    // Licensing
+    'licenses' => 'Lizenzen',
+    'licenses_desc' => 'Diese Seite beschreibt Lizenzinformationen für BookStack zusätzlich zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele aufgelistete Projekte dürfen nur in einem Entwicklungskontext verwendet werden.',
+    'licenses_bookstack' => 'BookStack-Lizenz',
+    'licenses_php' => 'PHP-Bibliothekslizenzen',
+    'licenses_js' => 'JavaScript-Bibliothekslizenzen',
+    'licenses_other' => 'Andere Lizenzen',
+    'license_details' => 'Lizenzdetails',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/el/preferences.php b/lang/el/preferences.php
index a06aff54718..4f7e97d5257 100644
--- a/lang/el/preferences.php
+++ b/lang/el/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 43a27b13b65..8f0e20bacd9 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Τελευταίο σφάλμα:',
     'webhooks_last_error_message' => 'Τελευταίο μήνυμα λάθους:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/es/activities.php b/lang/es/activities.php
index bd1e0dbd02e..9431eeb9fef 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -6,7 +6,7 @@
 return [
 
     // Pages
-    'page_create'                 => 'página creada',
+    'page_create'                 => 'Página creada',
     'page_create_notification'    => 'Página creada correctamente',
     'page_update'                 => 'página actualizada',
     'page_update_notification'    => 'Página actualizada correctamente',
@@ -72,7 +72,7 @@
     'mfa_remove_method_notification' => 'Método de Autenticación en Dos Pasos eliminado correctamente',
 
     // Settings
-    'settings_update' => 'ajustes actualizados',
+    'settings_update' => 'configuración actualizada',
     'settings_update_notification' => 'Configuración actualizada correctamente',
     'maintenance_action_run' => 'ejecutada acción de mantenimiento',
 
diff --git a/lang/es/preferences.php b/lang/es/preferences.php
index 3974683f7f7..13af93d2978 100644
--- a/lang/es/preferences.php
+++ b/lang/es/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Guardar preferencias',
     'notifications_update_success' => '¡Se han actualizado las preferencias de notificaciones!',
     'notifications_watched' => 'Elementos vistos e ignorados',
-    'notifications_watched_desc' => ' A continuación se muestran los elementos que tienen preferencias personalizadas de monitorización. Para actualizar sus preferencias, vea el artículo y las opciones se mostrarán en la barra lateral.',
+    'notifications_watched_desc' => 'A continuación se muestran los elementos que tienen preferencias personalizadas de monitorización. Para actualizar sus preferencias, vea el elemento y las opciones se mostrarán en la barra lateral.',
 
     'auth' => 'Acceso y seguridad',
     'auth_change_password' => 'Cambiar contraseña',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 0d0cf221ee6..b040fda1217 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Último error:',
     'webhooks_last_error_message' => 'Último mensaje de error:',
 
+    // Licensing
+    'licenses' => 'Licencias',
+    'licenses_desc' => 'Esta página detalla información sobre la licencia de BookStack además de los proyectos y bibliotecas que se utilizan en BookStack. Muchos proyectos enumerados aquí pueden ser utilizados solo en un contexto de desarrollo.',
+    'licenses_bookstack' => 'Licencia BookStack',
+    'licenses_php' => 'Licencias de la biblioteca PHP',
+    'licenses_js' => 'Licencias de la biblioteca JavaScript',
+    'licenses_other' => 'Otras Licencias',
+    'license_details' => 'Datos de la licencia',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index 41c26d2c4bd..f0afe2d43c0 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '".name" se eliminó de sus favoritos',
 
     // Watching
-    'watch_update_level_notification' => 'Preferencias de suscripciones actualizadas correctamente',
+    'watch_update_level_notification' => 'Preferencias de visualización actualizadas con éxito',
 
     // Auth
     'auth_login' => 'sesión iniciada',
diff --git a/lang/es_AR/notifications.php b/lang/es_AR/notifications.php
index 5ebc42129d9..a75b30f5572 100644
--- a/lang/es_AR/notifications.php
+++ b/lang/es_AR/notifications.php
@@ -10,11 +10,11 @@
     'new_page_intro' => 'Una nueva página ha sido creada en :appName:',
     'updated_page_subject' => 'Página actualizada: :pageName',
     'updated_page_intro' => 'Una página ha sido actualizada en :appName:',
-    'updated_page_debounce' => 'Para prevenir notificaciones en masa, durante un tiempo no se enviarán notificaciones para futuras ediciones de esta página por el mismo editor.',
+    'updated_page_debounce' => 'Para evitar una avalancha de notificaciones, durante un tiempo no se enviarán notificaciones sobre más ediciones de esta página por el mismo editor.',
 
-    'detail_page_name' => 'Nombre de página:',
+    'detail_page_name' => 'Nombre de la página:',
     'detail_page_path' => 'Ruta de la página:',
-    'detail_commenter' => 'Autor del comentario:',
+    'detail_commenter' => 'Comentarista:',
     'detail_comment' => 'Comentario:',
     'detail_created_by' => 'Creado por:',
     'detail_updated_by' => 'Actualizado por:',
@@ -22,6 +22,6 @@
     'action_view_comment' => 'Ver comentario',
     'action_view_page' => 'Ver página',
 
-    'footer_reason' => 'Esta notificación fue enviada porque :link cubre este tipo de actividad para este artículo.',
-    'footer_reason_link' => 'sus preferencias de notificación',
+    'footer_reason' => 'Esta notificación le fue enviada porque :link cubre este tipo de actividad para este elemento.',
+    'footer_reason_link' => 'nuestras preferencias de notificación',
 ];
diff --git a/lang/es_AR/preferences.php b/lang/es_AR/preferences.php
index f037d0d92a6..2bf3f3f9662 100644
--- a/lang/es_AR/preferences.php
+++ b/lang/es_AR/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Guardar preferencias',
     'notifications_update_success' => '¡Se han actualizado las preferencias de notificaciones!',
     'notifications_watched' => 'Elementos vistos e ignorados',
-    'notifications_watched_desc' => ' A continuación se muestran los elementos que tienen preferencias personalizadas de monitorización. Para actualizar sus preferencias, vea el artículo y las opciones se mostrarán en la barra lateral.',
+    'notifications_watched_desc' => 'A continuación se muestran los elementos que tienen preferencias personalizadas de monitorización. Para actualizar sus preferencias, vea el artículo y las opciones se mostrarán en la barra lateral.',
 
     'auth' => 'Acceso y seguridad',
     'auth_change_password' => 'Cambiar contraseña',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 344a9c87bc5..10da1a0a6fc 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -195,7 +195,7 @@
     'users_send_invite_option' => 'Enviar correo electrónico de invitación al usuario.',
     'users_external_auth_id' => 'ID externo de autenticación',
     'users_external_auth_id_desc' => 'Cuando un sistema de autenticación externa está en uso (como SAML2, OIDC o LDAP) este es el ID que vincula este usuario de BookStack a la cuenta del sistema de autenticación. Puede ignorar este campo si utiliza la autenticación por defecto basada en correo electrónico.',
-    'users_password_warning' => 'Solo debe rellenar este campo si desea cambiar la contraseña pora este usuario.',
+    'users_password_warning' => 'Solo complete lo siguiente si desea cambiar la contraseña para este usuario.',
     'users_system_public' => 'Este usuario representa cualquier usuario invitado que visita la aplicación. No puede utilizarse para hacer login sino que es asignado automáticamente.',
     'users_delete' => 'Borrar usuario',
     'users_delete_named' => 'Borrar usuario :userName',
@@ -211,7 +211,7 @@
     'users_preferred_language' => 'Lenguaje preferido',
     'users_preferred_language_desc' => 'Esta opción cambiará el idioma de la interfaz de usuario en la aplicación. No afectará al contenido creado por los usuarios.',
     'users_social_accounts' => 'Cuentas sociales',
-    'users_social_accounts_desc' => 'Ver el estado de las cuentas sociales conectadas para este usuario. Las cuentas sociales se pueden utilizar adicionalmente al sistema de autenticación primaria para el acceso al sistema.',
+    'users_social_accounts_desc' => 'Vea el estado de las cuentas sociales conectadas para este usuario. Las cuentas sociales se pueden usar además del sistema de autenticación principal para el acceso al sistema.',
     'users_social_accounts_info' => 'Aquí puede conectar sus otras cuentas para un acceso rápido y más fácil. Desconectando una cuenta aquí no revoca accesos ya autorizados. Revoque el acceso desde los ajustes de perfil en la cuenta social conectada.',
     'users_social_connect' => 'Conectar cuenta',
     'users_social_disconnect' => 'Desconectar cuenta',
@@ -220,7 +220,7 @@
     'users_social_connected' => 'La cuenta :socialAccount ha sido exitosamente añadida a su perfil.',
     'users_social_disconnected' => 'La cuenta :socialAccount ha sido desconectada exitosamente de su perfil.',
     'users_api_tokens' => 'Tokens API',
-    'users_api_tokens_desc' => 'Crear y administrar los tokens de acceso utilizados para autenticar con la REST API de BookStack. Los permisos para el API se administran a través del usuario al que pertenece el token.',
+    'users_api_tokens_desc' => 'Cree y administre los tokens de acceso utilizados para autenticarse con la API REST de BookStack. Los permisos para la API se gestionan a través del usuario al que pertenece el token.',
     'users_api_tokens_none' => 'No se han creado tokens API para este usuario',
     'users_api_tokens_create' => 'Crear token',
     'users_api_tokens_expires' => 'Expira',
@@ -277,6 +277,14 @@
     'webhooks_last_errored' => 'Último error:',
     'webhooks_last_error_message' => 'Último mensaje de error:',
 
+    // Licensing
+    'licenses' => 'Licencias',
+    'licenses_desc' => 'Esta página detalla información sobre la licencia de BookStack además de los proyectos y bibliotecas que se utilizan en BookStack. Muchos proyectos enumerados aquí pueden ser utilizados solo en un contexto de desarrollo.',
+    'licenses_bookstack' => 'Licencia BookStack',
+    'licenses_php' => 'Licencias de la biblioteca PHP',
+    'licenses_js' => 'Licencias de la biblioteca JavaScript',
+    'licenses_other' => 'Otras Licencias',
+    'license_details' => 'Datos de la licencia',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/et/preferences.php b/lang/et/preferences.php
index 9ac77a965b6..f4ba5e6aed7 100644
--- a/lang/et/preferences.php
+++ b/lang/et/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Salvesta eelistused',
     'notifications_update_success' => 'Teavituste eelistused on salvestatud!',
     'notifications_watched' => 'Jälgitud ja ignoreeritud objektid',
-    'notifications_watched_desc' => ' Allpool on objektid, millele on määratud kohaldatud jälgimise eelistused. Eelistuste muutmiseks ava vastav objekt ning leia jälgimise valikud külgmenüüs.',
+    'notifications_watched_desc' => 'Allpool on objektid, millele on määratud kohaldatud jälgimise eelistused. Eelistuste muutmiseks ava vastav objekt ning leia jälgimise valikud külgmenüüs.',
 
     'auth' => 'Ligipääs ja turvalisus',
     'auth_change_password' => 'Muuda parool',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 3eefefe563d..e73cde10b62 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Viimati ebaõnnestunud:',
     'webhooks_last_error_message' => 'Viimane veateade:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/eu/preferences.php b/lang/eu/preferences.php
index 3e83a9784d6..da7638593b5 100644
--- a/lang/eu/preferences.php
+++ b/lang/eu/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 441e53bd58f..0bd0d8257ea 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index 4df6e99a0b8..d2df873a984 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'آخرین خطا:',
     'webhooks_last_error_message' => 'آخرین پیغام خطا:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index eceb41d1f49..ee47d30d016 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Viimeisin virhe:',
     'webhooks_last_error_message' => 'Viimeisin virheviesti:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/fr/passwords.php b/lang/fr/passwords.php
index e209c217823..17dd15d01bd 100644
--- a/lang/fr/passwords.php
+++ b/lang/fr/passwords.php
@@ -7,8 +7,8 @@
 return [
 
     'password' => 'Les mots de passe doivent faire au moins 8 caractères et correspondre à la confirmation.',
-    'user' => "Nous n'avons pas trouvé d'utilisateur avec cette adresse.",
-    'token' => 'Le mot de passe reset du token n\'est pas valide pour cette adresse e-mail.',
+    'user' => "Nous n'avons pas trouvé d'utilisateur avec cette adresse e-mail.",
+    'token' => 'Le jeton de réinitialisation du mot de passe n\'est pas valide pour cette adresse e-mail.',
     'sent' => 'Nous vous avons envoyé un lien de réinitialisation de mot de passe par e-mail !',
     'reset' => 'Votre mot de passe a été réinitialisé !',
 
diff --git a/lang/fr/preferences.php b/lang/fr/preferences.php
index f26972d7c36..2180ed70c46 100644
--- a/lang/fr/preferences.php
+++ b/lang/fr/preferences.php
@@ -8,7 +8,7 @@
     'my_account' => 'Mon compte',
 
     'shortcuts' => 'Raccourcis',
-    'shortcuts_interface' => 'Préférences de raccourci de l\'interface utilisateur',
+    'shortcuts_interface' => 'Préférences de raccourcis de l\'interface utilisateur',
     'shortcuts_toggle_desc' => 'Ici vous pouvez activer ou désactiver les raccourcis clavier, utilisés pour la navigation et les actions.',
     'shortcuts_customize_desc' => 'Vous pouvez personnaliser chaque raccourci ci-dessous. Il vous suffit d\'appuyer sur la combinaison de touche choisie après avoir sélectionné l\'entrée pour un raccourci.',
     'shortcuts_toggle_label' => 'Raccourcis clavier activés',
@@ -27,7 +27,7 @@
     'notifications_save' => 'Enregistrer les préférences',
     'notifications_update_success' => 'Les préférences de notification ont été mises à jour !',
     'notifications_watched' => 'Éléments surveillés et ignorés',
-    'notifications_watched_desc' => ' Voici les éléments qui ont des préférences de surveillance personnalisées appliquées. Pour mettre à jour vos préférences pour celles-ci, consultez l\'élément puis trouvez les options de surveillance dans la barre latérale.',
+    'notifications_watched_desc' => 'Voici les éléments qui ont des préférences de surveillance personnalisées appliquées. Pour mettre à jour vos préférences pour celles-ci, consultez l\'élément puis trouvez les options de surveillance dans la barre latérale.',
 
     'auth' => 'Accès et sécurité',
     'auth_change_password' => 'Changer le mot de passe',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 928fed4b351..fa7433c484c 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Dernier en erreur :',
     'webhooks_last_error_message' => 'Dernier message d\'erreur : ',
 
+    // Licensing
+    'licenses' => 'Licences',
+    'licenses_desc' => 'Cette page détaille les informations de licence pour BookStack ainsi que les projets et librairies utilisées dans BookStack. Nombre des projets listés peuvent n\'être utilisés que dans un contexte de développement.',
+    'licenses_bookstack' => 'Licences BookStack',
+    'licenses_php' => 'Licences de librairies PHP',
+    'licenses_js' => 'Licences de librairies JavaScript',
+    'licenses_other' => 'Autres Licences',
+    'license_details' => 'Détails de la licence',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/he/preferences.php b/lang/he/preferences.php
index 28c8b127c11..f0f997f26d2 100644
--- a/lang/he/preferences.php
+++ b/lang/he/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index e16fdb299d6..b8bbfbe2669 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/hr/preferences.php b/lang/hr/preferences.php
index 520d9da73ee..2f409f8d3e4 100644
--- a/lang/hr/preferences.php
+++ b/lang/hr/preferences.php
@@ -29,7 +29,7 @@
     'notifications_save' => 'Spremi Postavke',
     'notifications_update_success' => 'Postavke obavijesti su ažurirane!',
     'notifications_watched' => 'Praćene i ignorirane stavke',
-    'notifications_watched_desc' => ' Ispod su stavke na koje su primijenjene prilagođene postavke praćenja. Da biste ažurirali svoje postavke za ove stavke, pregledajte stavku, a zatim pronađite opcije praćenja u bočnoj traci.',
+    'notifications_watched_desc' => 'Ispod su stavke na koje su primijenjene prilagođene postavke praćenja. Da biste ažurirali svoje postavke za ove stavke, pregledajte stavku, a zatim pronađite opcije praćenja u bočnoj traci.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index 42c033a29e8..4d010ba78f8 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Zadnja pogreška:',
     'webhooks_last_error_message' => 'Posljednja poruka o pogrešci:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/hu/preferences.php b/lang/hu/preferences.php
index 65f6088eca5..11d145064ad 100644
--- a/lang/hu/preferences.php
+++ b/lang/hu/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Beállítások mentése',
     'notifications_update_success' => 'Az értesítési beállítások frissítve lettek!',
     'notifications_watched' => 'Megfigyelt és figyelmen kívül hagyott elemek',
-    'notifications_watched_desc' => ' Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keress a figyelési lehetőségeket az oldalsávban.',
+    'notifications_watched_desc' => 'Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keress a figyelési lehetőségeket az oldalsávban.',
 
     'auth' => 'Hozzáférés és Biztonság',
     'auth_change_password' => 'Jelszó módosítása',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index a7a3d0f19fe..9bf8880d3b6 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Utolsó hiba:',
     'webhooks_last_error_message' => 'Utolsó hibaüzenet:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/id/preferences.php b/lang/id/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/id/preferences.php
+++ b/lang/id/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 54013362816..3b57776f030 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/it/activities.php b/lang/it/activities.php
index 518ffb26961..39b6859e422 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -6,7 +6,7 @@
 return [
 
     // Pages
-    'page_create'                 => 'pagina creata',
+    'page_create'                 => 'ha creato la pagina',
     'page_create_notification'    => 'Pagina creata con successo',
     'page_update'                 => 'ha aggiornato la pagina',
     'page_update_notification'    => 'Pagina aggiornata con successo',
@@ -14,7 +14,7 @@
     'page_delete_notification'    => 'Pagina eliminata con successo',
     'page_restore'                => 'ha ripristinato la pagina',
     'page_restore_notification'   => 'Pagina ripristinata con successo',
-    'page_move'                   => 'ha mosso la pagina',
+    'page_move'                   => 'ha spostato la pagina',
     'page_move_notification'      => 'Pagina spostata con successo',
 
     // Chapters
@@ -30,7 +30,7 @@
     // Books
     'book_create'                 => 'ha creato il libro',
     'book_create_notification'    => 'Libro creato con successo',
-    'book_create_from_chapter'              => 'convertito da capitolo a libro',
+    'book_create_from_chapter'              => 'ha convertito da capitolo a libro',
     'book_create_from_chapter_notification' => 'Capitolo convertito con successo in libro',
     'book_update'                 => 'ha aggiornato il libro',
     'book_update_notification'    => 'Libro aggiornato con successo',
@@ -40,18 +40,18 @@
     'book_sort_notification'      => 'Libro reindicizzato con successo',
 
     // Bookshelves
-    'bookshelf_create'            => 'libreria creata',
+    'bookshelf_create'            => 'ha creato la libreria',
     'bookshelf_create_notification'    => 'Libreria creata con successo',
-    'bookshelf_create_from_book'    => 'libro convertito in libreria',
+    'bookshelf_create_from_book'    => 'ha convertito libro in libreria',
     'bookshelf_create_from_book_notification'    => 'Libro convertito con successo in libreria',
-    'bookshelf_update'                 => 'libreria aggiornata',
+    'bookshelf_update'                 => 'ha aggiornato la libreria',
     'bookshelf_update_notification'    => 'Libreria aggiornata con successo',
-    'bookshelf_delete'                 => 'Iibreria eliminata',
+    'bookshelf_delete'                 => 'ha eliminato la libreria',
     'bookshelf_delete_notification'    => 'Libreria eliminata con successo',
 
     // Revisions
-    'revision_restore' => 'revisione ripristinata',
-    'revision_delete' => 'revisione eliminata',
+    'revision_restore' => 'ha ripristinato la revisione',
+    'revision_delete' => 'ha eliminato la revisione',
     'revision_delete_notification' => 'Revisione eliminata con successo',
 
     // Favourites
@@ -64,11 +64,11 @@
     // Auth
     'auth_login' => 'connesso',
     'auth_register' => 'registrato come nuovo utente',
-    'auth_password_reset_request' => 'richiesta di reimpostazione della password utente',
-    'auth_password_reset_update' => 'reimposta password utente',
-    'mfa_setup_method' => 'metodo MFA configurato',
+    'auth_password_reset_request' => 'ha richiesto di reimpostare la password utente',
+    'auth_password_reset_update' => 'ha reimpostato la password utente',
+    'mfa_setup_method' => 'ha configurato un metodo multi-fattore',
     'mfa_setup_method_notification' => 'Metodo multi-fattore impostato con successo',
-    'mfa_remove_method' => 'metodo MFA rimosso',
+    'mfa_remove_method' => 'ha rimosso un metodo multi-fattore',
     'mfa_remove_method_notification' => 'Metodo multi-fattore rimosso con successo',
 
     // Settings
diff --git a/lang/it/auth.php b/lang/it/auth.php
index b9bc685aac4..00ecf944317 100644
--- a/lang/it/auth.php
+++ b/lang/it/auth.php
@@ -25,15 +25,15 @@
     'forgot_password' => 'Password dimenticata?',
     'remember_me' => 'Ricordami',
     'ldap_email_hint' => 'Inserisci un email per usare quest\'account.',
-    'create_account' => 'Crea Account',
+    'create_account' => 'Crea un account',
     'already_have_account' => 'Hai già un account?',
     'dont_have_account' => 'Non hai un account?',
     'social_login' => 'Login Social',
     'social_registration' => 'Registrazione Social',
-    'social_registration_text' => 'Registrati usando un altro servizio.',
+    'social_registration_text' => 'Registrati e accedi utilizzando un altro servizio.',
 
     'register_thanks' => 'Grazie per esserti registrato!',
-    'register_confirm' => 'Controlla la tua mail e clicca il bottone di conferma per accedere a :appName.',
+    'register_confirm' => 'Controlla la tua mail e clicca il pulsante di conferma per accedere a :appName.',
     'registrations_disabled' => 'La registrazione è disabilitata',
     'registration_email_domain_invalid' => 'Questo dominio della mail non ha accesso a questa applicazione',
     'register_success' => 'Grazie per la registrazione! Sei registrato e loggato.',
diff --git a/lang/it/common.php b/lang/it/common.php
index b886ac35c0b..6410081d2c5 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -35,16 +35,16 @@
     'copy' => 'Copia',
     'reply' => 'Rispondi',
     'delete' => 'Elimina',
-    'delete_confirm' => 'Conferma Eliminazione',
+    'delete_confirm' => 'Conferma eliminazione',
     'search' => 'Cerca',
-    'search_clear' => 'Pulisci Ricerca',
+    'search_clear' => 'Pulisci ricerca',
     'reset' => 'Azzera',
     'remove' => 'Rimuovi',
     'add' => 'Aggiungi',
     'configure' => 'Configura',
     'manage' => 'Gestisci',
     'fullscreen' => 'Schermo intero',
-    'favourite' => 'Aggiungi ai Preferiti',
+    'favourite' => 'Aggiungi ai preferiti',
     'unfavourite' => 'Rimuovi dai preferiti',
     'next' => 'Successivo',
     'previous' => 'Precedente',
@@ -56,9 +56,9 @@
 
     // Sort Options
     'sort_options' => 'Opzioni Ordinamento',
-    'sort_direction_toggle' => 'Inverti Direzione Ordinamento',
-    'sort_ascending' => 'Ordine Ascendente',
-    'sort_descending' => 'Ordine Discendente',
+    'sort_direction_toggle' => 'Inverti direzione ordinamento',
+    'sort_ascending' => 'Ordine ascendente',
+    'sort_descending' => 'Ordine discendente',
     'sort_name' => 'Nome',
     'sort_default' => 'Predefinito',
     'sort_created_at' => 'Data Creazione',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 4c49dae5e16..22bc359ba7e 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -39,8 +39,8 @@
     'export_pdf' => 'File PDF',
     'export_text' => 'File di testo',
     'export_md' => 'File Markdown',
-    'default_template' => 'Modello Di Pagina Predefinito',
-    'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tenere presente che questo verrà utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
+    'default_template' => 'Modello di Pagina Predefinito',
+    'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tieni presente che questo verrà utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
     'default_template_select' => 'Seleziona una pagina modello',
 
     // Permissions and restrictions
@@ -61,15 +61,15 @@
     'search_clear' => 'Pulisci Ricerca',
     'search_no_pages' => 'Nessuna pagina corrisponde alla ricerca',
     'search_for_term' => 'Ricerca per :term',
-    'search_more' => 'Più Risultati',
+    'search_more' => 'Più risultati',
     'search_advanced' => 'Ricerca Avanzata',
     'search_terms' => 'Termini Ricerca',
     'search_content_type' => 'Tipo di Contenuto',
     'search_exact_matches' => 'Corrispondenza Esatta',
     'search_tags' => 'Ricerche Tag',
     'search_options' => 'Opzioni',
-    'search_viewed_by_me' => 'Visti',
-    'search_not_viewed_by_me' => 'Non visti',
+    'search_viewed_by_me' => 'Visti da me',
+    'search_not_viewed_by_me' => 'Non visti da me',
     'search_permissions_set' => 'Permessi impostati',
     'search_created_by_me' => 'Creati da me',
     'search_updated_by_me' => 'Aggiornati da me',
@@ -112,7 +112,7 @@
     'shelves_permissions_create' => 'Le autorizzazioni per la creazione di librerie sono utilizzate solo per copiare le autorizzazioni ai libri figli utilizzando l\'azione sottostante. Non controllano la capacità di creare libri.',
     'shelves_copy_permissions_to_books' => 'Copia Permessi ai Libri',
     'shelves_copy_permissions' => 'Copia Permessi',
-    'shelves_copy_permissions_explain' => 'Verranno applicati tutti i permessi della libreria ai libri al suo interno. Prima dell\'attivazione, assicurati che ogni permesso di questa libreria sia salvato.',
+    'shelves_copy_permissions_explain' => 'Verranno applicati tutti i permessi della libreria ai libri al suo interno. Prima dell\'attivazione, assicurati di aver salvato le modifiche ai permessi di questa libreria.',
     'shelves_copy_permission_success' => 'Permessi della libreria copiati in :count libri',
 
     // Books
@@ -145,7 +145,7 @@
     'books_search_this' => 'Cerca in questo libro',
     'books_navigation' => 'Navigazione Libro',
     'books_sort' => 'Ordina il contenuto del libro',
-    'books_sort_desc' => 'Spostare capitoli e pagine all\'interno di un libro per riorganizzarne il contenuto. È possibile aggiungere altri libri, per spostare facilmente capitoli e pagine da un libro all\'altro.',
+    'books_sort_desc' => 'Sposta capitoli e pagine all\'interno di un libro per riorganizzarne il contenuto. È possibile aggiungere altri libri, per spostare facilmente capitoli e pagine da un libro all\'altro.',
     'books_sort_named' => 'Ordina il libro :bookName',
     'books_sort_name' => 'Ordina per Nome',
     'books_sort_created' => 'Ordina per Data di Creazione',
@@ -154,17 +154,17 @@
     'books_sort_chapters_last' => 'Capitoli Per Ultimi',
     'books_sort_show_other' => 'Mostra Altri Libri',
     'books_sort_save' => 'Salva il nuovo ordine',
-    'books_sort_show_other_desc' => 'Aggiungere qui altri libri per includerli nell\'operazione di ordinamento e consentire una facile riorganizzazione incrociata dei libri.',
+    'books_sort_show_other_desc' => 'Aggiungi qui altri libri per includerli nell\'operazione di ordinamento e consentire una facile riorganizzazione incrociata dei libri.',
     'books_sort_move_up' => 'Muovi su',
     'books_sort_move_down' => 'Muovi giù',
-    'books_sort_move_prev_book' => 'Passare al libro precedente',
-    'books_sort_move_next_book' => 'Passare al libro successivo',
-    'books_sort_move_prev_chapter' => 'Passare al capitolo precedente',
-    'books_sort_move_next_chapter' => 'Passare al capitolo successivo',
-    'books_sort_move_book_start' => 'Spostarsi all\'inizio del libro',
-    'books_sort_move_book_end' => 'Spostarsi alla fine del libro',
-    'books_sort_move_before_chapter' => 'Passare al capitolo precedente',
-    'books_sort_move_after_chapter' => 'Passare al capitolo successivo',
+    'books_sort_move_prev_book' => 'Passa al libro precedente',
+    'books_sort_move_next_book' => 'Passa al libro successivo',
+    'books_sort_move_prev_chapter' => 'Passa al capitolo precedente',
+    'books_sort_move_next_chapter' => 'Passa al capitolo successivo',
+    'books_sort_move_book_start' => 'Passa all\'inizio del libro',
+    'books_sort_move_book_end' => 'Passa alla fine del libro',
+    'books_sort_move_before_chapter' => 'Passa al capitolo precedente',
+    'books_sort_move_after_chapter' => 'Passa al capitolo successivo',
     'books_copy' => 'Copia Libro',
     'books_copy_success' => 'Libro copiato con successo',
 
@@ -177,7 +177,7 @@
     'chapters_create' => 'Crea un nuovo capitolo',
     'chapters_delete' => 'Elimina Capitolo',
     'chapters_delete_named' => 'Elimina il capitolo :chapterName',
-    'chapters_delete_explain' => 'Procedendo si eliminerà il capitolo denominato \':chapterName\'. Anche le pagine in esso contenute saranno eliminate.',
+    'chapters_delete_explain' => 'Procedendo si eliminerà il capitolo denominato \':chapterName\'. Anche le pagine all\'interno saranno eliminate.',
     'chapters_delete_confirm' => 'Sei sicuro di voler eliminare questo capitolo?',
     'chapters_edit' => 'Elimina Capitolo',
     'chapters_edit_named' => 'Modifica il capitolo :chapterName',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Elimina Bozza Pagina',
     'pages_delete_success' => 'Pagina eliminata',
     'pages_delete_draft_success' => 'Bozza di una pagina eliminata',
-    'pages_delete_warning_template' => 'Questa pagina è in uso attivo come modello di pagina predefinito del libro o del capitolo. Questi libri o capitoli non avranno più un modello di pagina predefinito assegnato dopo che questa pagina è stata eliminata.',
+    'pages_delete_warning_template' => 'Questa pagina è in uso come modello di pagina predefinito del libro o del capitolo. Questi libri o capitoli non avranno più un modello di pagina predefinito assegnato dopo che questa pagina sarà eliminata.',
     'pages_delete_confirm' => 'Sei sicuro di voler eliminare questa pagina?',
     'pages_delete_draft_confirm' => 'Sei sicuro di voler eliminare la bozza di questa pagina?',
     'pages_editing_named' => 'Modifica :pageName',
@@ -229,8 +229,8 @@
     'pages_edit_enter_changelog' => 'Inserisci Changelog',
     'pages_editor_switch_title' => 'Cambia Editor',
     'pages_editor_switch_are_you_sure' => 'Sei sicuro di voler cambiare l\'editor di questa pagina?',
-    'pages_editor_switch_consider_following' => 'Considerare quanto segue quando si cambia editor:',
-    'pages_editor_switch_consideration_a' => 'Una volta salvata, la nuova opzione di editor sarà utilizzata da qualsiasi editor futuro, inclusi quelli che potrebbero non essere in grado di cambiare il tipo di editor da solo.',
+    'pages_editor_switch_consider_following' => 'Considera quanto segue quando si cambia editor:',
+    'pages_editor_switch_consideration_a' => 'Una volta salvata, la nuova opzione di editor sarà utilizzata da chi modificherà in futuro, inclusi quelli che potrebbero non essere in grado di cambiare il tipo di editor da soli.',
     'pages_editor_switch_consideration_b' => 'Ciò può potenzialmente portare a una perdita di dettagli e sintassi in determinate circostanze.',
     'pages_editor_switch_consideration_c' => 'Le modifiche al tag o al changelog, fatte dall\'ultimo salvataggio, non persisteranno in questa modifica.',
     'pages_save' => 'Salva Pagina',
@@ -277,19 +277,19 @@
     'pages_pointer_label' => 'Opzioni Sezione Pagina',
     'pages_pointer_permalink' => 'Permalink Sezione Pagina',
     'pages_pointer_include_tag' => 'Sezione Pagina Includi Tag',
-    'pages_pointer_toggle_link' => 'Modalità Permalink, Premi per mostrare il tag includi',
-    'pages_pointer_toggle_include' => 'Modo includi tag, premi per mostrare permalink',
+    'pages_pointer_toggle_link' => 'Modalità Permalink, Premi per mostrare includi tag',
+    'pages_pointer_toggle_include' => 'Modalità includi tag, premi per mostrare permalink',
     'pages_permissions_active' => 'Permessi Pagina Attivi',
     'pages_initial_revision' => 'Pubblicazione iniziale',
     'pages_references_update_revision' => 'Aggiornamento automatico di sistema dei collegamenti interni',
     'pages_initial_name' => 'Nuova Pagina',
     'pages_editing_draft_notification' => 'Stai modificando una bozza che è stata salvata il :timeDiff.',
-    'pages_draft_edited_notification' => 'Questa pagina è stata aggiornata. È consigliabile scartare questa bozza.',
-    'pages_draft_page_changed_since_creation' => 'Questa pagina è stata aggiornata da quando è stata creata questa bozza. Si consiglia di scartare questa bozza o fare attenzione a non sovrascrivere alcun cambiamento di pagina.',
+    'pages_draft_edited_notification' => 'Questa pagina è stata aggiornata. Si consiglia di scartare questa bozza.',
+    'pages_draft_page_changed_since_creation' => 'Questa pagina è stata aggiornata da quando è stata creata questa bozza. Si consiglia di scartare questa bozza o di fare attenzione a non sovrascrivere alcun cambiamento alla pagina.',
     'pages_draft_edit_active' => [
-        'start_a' => ':count hanno iniziato a modificare questa pagina',
+        'start_a' => ':count utenti hanno iniziato a modificare questa pagina',
         'start_b' => ':userName ha iniziato a modificare questa pagina',
-        'time_a' => 'da quando le pagine sono state aggiornate',
+        'time_a' => 'dall\'ultimo aggiornamento della pagina',
         'time_b' => 'negli ultimi :minCount minuti',
         'message' => ':start :time. Assicurati di non sovrascrivere le modifiche degli altri!',
     ],
@@ -299,31 +299,31 @@
     'pages_is_template' => 'Template Pagina',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Attiva/Disattiva Barra Laterale',
+    'toggle_sidebar' => 'Attiva/disattiva barra laterale',
     'page_tags' => 'Tag Pagina',
     'chapter_tags' => 'Tag Capitolo',
     'book_tags' => 'Tag Libro',
     'shelf_tags' => 'Tag Libreria',
     'tag' => 'Tag',
     'tags' =>  'Tag',
-    'tags_index_desc' => 'I tag possono essere applicati ai contenuti del sistema per applicare una forma flessibile di categorizzazione. I tag possono avere contemporaneamente una chiave e un valore, mentre il valore è opzionale. Una volta applicati, i contenuti possono essere interrogati utilizzando il nome e il valore del tag.',
-    'tag_name' =>  'Nome Tag',
-    'tag_value' => 'Valore (Opzionale)',
+    'tags_index_desc' => 'I tag possono essere applicati ai contenuti del sistema per applicare una forma flessibile di categorizzazione. I tag possono avere una chiave e un valore, il valore è opzionale. Una volta applicati, i contenuti possono essere cercati utilizzando il nome e il valore del tag.',
+    'tag_name' =>  'Nome del tag',
+    'tag_value' => 'Valore tag (opzionale)',
     'tags_explain' => "Aggiungi tag per categorizzare meglio il contenuto. \n Puoi assegnare un valore ai tag per una migliore organizzazione.",
     'tags_add' => 'Aggiungi un altro tag',
     'tags_remove' => 'Rimuovi questo tag',
     'tags_usages' => 'Utilizzo totale dei tag',
-    'tags_assigned_pages' => 'Assegnato alle Pagine',
+    'tags_assigned_pages' => 'Assegnato alle pagine',
     'tags_assigned_chapters' => 'Assegnato ai capitoli',
-    'tags_assigned_books' => 'Assegnato a Libri',
-    'tags_assigned_shelves' => 'Assegnato alle Librerie',
+    'tags_assigned_books' => 'Assegnato ai libri',
+    'tags_assigned_shelves' => 'Assegnato alle librerie',
     'tags_x_unique_values' => ':count valori univoci',
     'tags_all_values' => 'Tutti i valori',
     'tags_view_tags' => 'Visualizza tag',
     'tags_view_existing_tags' => 'Usa i tag esistenti',
-    'tags_list_empty_hint' => 'I tag possono essere assegnati tramite la barra laterale dell\'editor di pagina o durante la modifica dei dettagli di un libro, capitolo o libreria.',
+    'tags_list_empty_hint' => 'I tag possono essere assegnati tramite la barra laterale dell\'editor di pagina o durante la modifica dei dettagli di un libro, di un capitolo o di una libreria.',
     'attachments' => 'Allegati',
-    'attachments_explain' => 'Carica alcuni file o allega link per visualizzarli nella pagina. Questi sono visibili nella sidebar della pagina.',
+    'attachments_explain' => 'Carica alcuni file o allega link per visualizzarli nella pagina. Questi sono visibili nella barra laterale della pagina.',
     'attachments_explain_instant_save' => 'I cambiamenti qui sono salvati istantaneamente.',
     'attachments_upload' => 'Carica File',
     'attachments_link' => 'Allega Link',
@@ -338,10 +338,10 @@
     'attachments_link_url' => 'Link al file',
     'attachments_link_url_hint' => 'Url del sito o del file',
     'attach' => 'Allega',
-    'attachments_insert_link' => 'Aggiungi Link Allegato alla Pagina',
-    'attachments_edit_file' => 'Modifica File',
-    'attachments_edit_file_name' => 'Nome File',
-    'attachments_edit_drop_upload' => 'Rilascia file o clicca qui per caricare e sovrascrivere',
+    'attachments_insert_link' => 'Aggiungi link allegato alla pagina',
+    'attachments_edit_file' => 'Modifica file',
+    'attachments_edit_file_name' => 'Nome file',
+    'attachments_edit_drop_upload' => 'Trascina file qui o clicca per caricare e sovrascrivere',
     'attachments_order_updated' => 'Ordine allegato aggiornato',
     'attachments_updated_success' => 'Dettagli allegato aggiornati',
     'attachments_deleted' => 'Allegato eliminato',
@@ -349,11 +349,11 @@
     'attachments_file_updated' => 'File aggiornato correttamente',
     'attachments_link_attached' => 'Link allegato correttamente alla pagina',
     'templates' => 'Modello',
-    'templates_set_as_template' => 'La pagina è un template',
-    'templates_explain_set_as_template' => 'Puoi impostare questa pagina come template in modo che il suo contenuto sia utilizzato quando si creano altre pagine. Gli altri utenti potranno utilizzare questo template se avranno i permessi di visualizzazione per questa pagina.',
+    'templates_set_as_template' => 'La pagina è un modello',
+    'templates_explain_set_as_template' => 'Puoi impostare questa pagina come modello in modo da utilizzare il suo contenuto quando si creano altre pagine. Gli altri utenti potranno utilizzare questo modello se avranno i permessi di visualizzazione per questa pagina.',
     'templates_replace_content' => 'Rimpiazza contenuto della pagina',
     'templates_append_content' => 'Appendi al contenuto della pagina',
-    'templates_prepend_content' => 'Prependi al contenuto della pagina',
+    'templates_prepend_content' => 'Anteponi al contenuto della pagina',
 
     // Profile View
     'profile_user_for_x' => 'Utente da :time',
@@ -361,7 +361,7 @@
     'profile_not_created_pages' => ':userName non ha creato pagine',
     'profile_not_created_chapters' => ':userName non ha creato capitoli',
     'profile_not_created_books' => ':userName non ha creato libri',
-    'profile_not_created_shelves' => ':userName non ha creato alcuna libreria',
+    'profile_not_created_shelves' => ':userName non ha creato librerie',
 
     // Comments
     'comment' => 'Commento',
@@ -387,17 +387,17 @@
     'revision_cannot_delete_latest' => 'Impossibile eliminare l\'ultima revisione.',
 
     // Copy view
-    'copy_consider' => 'Per favore, considerate quanto segue quando copiate il contenuto.',
+    'copy_consider' => 'Considera quanto segue quando copi il contenuto.',
     'copy_consider_permissions' => 'Le impostazioni dei permessi personalizzati non saranno copiate.',
     'copy_consider_owner' => 'Diventerai il proprietario di tutti i contenuti copiati.',
     'copy_consider_images' => 'I file delle immagini delle pagine non saranno duplicati e le immagini originali manterranno la loro relazione con la pagina su cui sono state originariamente caricate.',
     'copy_consider_attachments' => 'Gli allegati della pagina non saranno copiati.',
-    'copy_consider_access' => 'Un cambiamento di luogo, di proprietario o di autorizzazioni può far sì che questo contenuto sia accessibile a chi prima non aveva accesso.',
+    'copy_consider_access' => 'Un cambiamento di posizione, di proprietario o di autorizzazioni può far sì che questo contenuto sia accessibile a chi prima non aveva accesso.',
 
     // Conversions
     'convert_to_shelf' => 'Converti in Libreria',
-    'convert_to_shelf_contents_desc' => 'È possibile convertire questo libro in una nuova libreria con gli stessi contenuti. I capitoli contenuti in questo libro saranno convertiti in nuovi libri. Se il libro contiene pagine che non fanno parte di un capitolo, questo libro verrà rinominato e conterrà tali pagine e diventerà parte della nuova libreria.',
-    'convert_to_shelf_permissions_desc' => 'Tutti i permessi impostati su questo libro saranno copiati sulla nuova libreria e su tutti i nuovi libri figli che non hanno i loro permessi applicati. Si noti che i permessi delle librerie non si trasmettono automaticamente ai contenuti al loro interno, come avviene per i libri.',
+    'convert_to_shelf_contents_desc' => 'Puoi convertire questo libro in una nuova libreria con gli stessi contenuti. I capitoli contenuti in questo libro saranno convertiti in nuovi libri. Se il libro contiene pagine che non fanno parte di un capitolo, questo libro verrà rinominato e conterrà tali pagine e diventerà parte della nuova libreria.',
+    'convert_to_shelf_permissions_desc' => 'Tutti i permessi impostati su questo libro saranno copiati sulla nuova libreria e su tutti i nuovi libri figli che non hanno i loro permessi applicati. Nota che i permessi delle librerie non si trasmettono automaticamente ai contenuti al loro interno, come avviene per i libri.',
     'convert_book' => 'Converti Libro',
     'convert_book_confirm' => 'Sei sicuro di voler convertire questo libro?',
     'convert_undo_warning' => 'Questo non può essere annullato con la stessa facilità.',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index ea24eeeab29..05bf5373ffa 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -27,7 +27,7 @@
     'oidc_no_email_address' => 'Impossibile trovare un indirizzo email, per questo utente, nei dati forniti dal sistema di autenticazione esterno',
     'oidc_fail_authed' => 'Accesso con :system non riuscito, il sistema non ha fornito l\'autorizzazione',
     'social_no_action_defined' => 'Nessuna azione definita',
-    'social_login_bad_response' => "Ricevuto error durante il login con :socialAccount : \n:error",
+    'social_login_bad_response' => "Ricevuto errore durante il login con :socialAccount : \n:error",
     'social_account_in_use' => 'Questo account :socialAccount è già utilizzato, prova a loggarti usando l\'opzione :socialAccount.',
     'social_account_email_in_use' => 'La mail :email è già in uso. Se hai già un account puoi connettere il tuo account :socialAccount dalle impostazioni del tuo profilo.',
     'social_account_existing' => 'Questo account :socialAccount è già connesso al tuo profilo.',
@@ -41,13 +41,13 @@
     // System
     'path_not_writable' => 'Il percorso :filePath non è scrivibile. Controlla che abbia i permessi corretti.',
     'cannot_get_image_from_url' => 'Impossibile scaricare immagine da :url',
-    'cannot_create_thumbs' => 'Il server non può creare thumbnail. Controlla che l\'estensione GD sia installata.',
+    'cannot_create_thumbs' => 'Il server non può creare miniature. Controlla che l\'estensione GD sia installata.',
     'server_upload_limit' => 'Il server non permette un upload di questa grandezza. Prova con un file più piccolo.',
     'server_post_limit' => 'Il server non può ricevere la quantità di dati fornita. Riprovare con meno dati o con un file più piccolo.',
     'uploaded'  => 'Il server non consente upload di questa grandezza. Prova un file più piccolo.',
 
     // Drawing & Images
-    'image_upload_error' => 'C\'è stato un errore caricando l\'immagine',
+    'image_upload_error' => 'Si è verificato un errore nel caricamento dell\'immagine',
     'image_upload_type_error' => 'Il tipo di immagine caricata non è valido',
     'image_upload_replace_type' => 'Le sostituzioni di file immagine devono essere dello stesso tipo',
     'image_upload_memory_limit' => 'Impossibile gestire il caricamento d\'immagini e/o creare miniature a causa dei limiti delle risorse di sistema.',
@@ -71,7 +71,7 @@
     'page_not_found' => 'Pagina non trovata',
     'chapter_not_found' => 'Capitolo non trovato',
     'selected_book_not_found' => 'Il libro selezionato non è stato trovato',
-    'selected_book_chapter_not_found' => 'Il libro selezionato o il capitolo non sono stati trovati',
+    'selected_book_chapter_not_found' => 'Il libro o il capitolo selezionati non sono stati trovati',
     'guests_cannot_save_drafts' => 'Gli ospiti non possono salvare bozze',
 
     // Users
@@ -81,27 +81,27 @@
     // Roles
     'role_cannot_be_edited' => 'Questo ruolo non può essere modificato',
     'role_system_cannot_be_deleted' => 'Questo ruolo è di sistema e non può essere eliminato',
-    'role_registration_default_cannot_delete' => 'Questo ruolo non può essere eliminato finchè è impostato come default alla registrazione',
-    'role_cannot_remove_only_admin' => 'Questo utente è l\'unico con assegnato il ruolo di amministratore. Assegna il ruolo di amministratore ad un altro utente prima di rimuoverlo qui.',
+    'role_registration_default_cannot_delete' => 'Questo ruolo non può essere eliminato finchè è impostato come ruolo di registrazione predefinito',
+    'role_cannot_remove_only_admin' => 'Questo utente è l\'unico con assegnato il ruolo di amministratore. Assegna il ruolo di amministratore ad un altro utente prima di rimuoverlo.',
 
     // Comments
-    'comment_list' => 'C\'è stato un errore scaricando i commenti.',
+    'comment_list' => 'Si è verificato un errore durante il recupero dei commenti.',
     'cannot_add_comment_to_draft' => 'Non puoi aggiungere commenti a una bozza.',
-    'comment_add' => 'C\'è stato un errore aggiungendo / aggiornando il commento.',
-    'comment_delete' => 'C\'è stato un errore eliminando il commento.',
+    'comment_add' => 'Si è verificato un errore durante l\'aggiunta / l\'aggiornamento del commento.',
+    'comment_delete' => 'Si è verificato un errore durante l’eliminazione del commento.',
     'empty_comment' => 'Impossibile aggiungere un commento vuoto.',
 
     // Error pages
-    '404_page_not_found' => 'Pagina Non Trovata',
-    'sorry_page_not_found' => 'La pagina che stavi cercando non è stata trovata.',
+    '404_page_not_found' => 'Pagina non trovata',
+    'sorry_page_not_found' => 'Siamo spiacenti, la pagina che stavi cercando non è stata trovata.',
     'sorry_page_not_found_permission_warning' => 'Se pensi che questa pagina possa esistere, potresti non avere i permessi per visualizzarla.',
     'image_not_found' => 'Immagine non trovata',
     'image_not_found_subtitle' => 'Spiacente, l\'immagine che stai cercando non è stata trovata.',
-    'image_not_found_details' => 'Se ti aspettavi che questa immagine esistesse, potrebbe essere stata cancellata.',
+    'image_not_found_details' => 'Se pensi che questa immagine possa esistere, potrebbe essere stata cancellata.',
     'return_home' => 'Ritorna alla home',
-    'error_occurred' => 'C\'è Stato un errore',
-    'app_down' => ':appName è offline',
-    'back_soon' => 'Ritornerà presto.',
+    'error_occurred' => 'Si è verificato un errore',
+    'app_down' => ':appName è offline al momento',
+    'back_soon' => 'Tornerà presto online.',
 
     // API errors
     'api_no_authorization_found' => 'Nessun token di autorizzazione trovato nella richiesta',
diff --git a/lang/it/notifications.php b/lang/it/notifications.php
index 3b902600f37..6b8932ebee0 100644
--- a/lang/it/notifications.php
+++ b/lang/it/notifications.php
@@ -4,23 +4,23 @@
  */
 return [
 
-    'new_comment_subject' => 'Nuovo commento alla pagina: :pageName',
+    'new_comment_subject' => 'Nuovo commento sulla pagina: :pageName',
     'new_comment_intro' => 'Un utente ha commentato una pagina in :appName:',
     'new_page_subject' => 'Nuova pagina: :pageName',
     'new_page_intro' => 'Una nuova pagina è stata creata in :appName:',
     'updated_page_subject' => 'Pagina aggiornata: :pageName',
     'updated_page_intro' => 'Una pagina è stata aggiornata in :appName:',
-    'updated_page_debounce' => 'Per evitare una massa di notifiche, per un po \'non verranno inviate notifiche per ulteriori modifiche a questa pagina dallo stesso editor.',
+    'updated_page_debounce' => 'Per evitare una massa di notifiche, per un po\' non ti verranno inviate notifiche per ulteriori modifiche a questa pagina dallo stesso editor.',
 
-    'detail_page_name' => 'Nome Della Pagina:',
+    'detail_page_name' => 'Nome della pagina:',
     'detail_page_path' => 'Percorso della pagina:',
     'detail_commenter' => 'Commentatore:',
     'detail_comment' => 'Commento:',
-    'detail_created_by' => 'Creato Da:',
-    'detail_updated_by' => 'Aggiornato Da:',
+    'detail_created_by' => 'Creato da:',
+    'detail_updated_by' => 'Aggiornato da:',
 
-    'action_view_comment' => 'Visualizza Commento',
-    'action_view_page' => 'Visualizza Pagina',
+    'action_view_comment' => 'Vedi commento',
+    'action_view_page' => 'Vedi pagina',
 
     'footer_reason' => 'Questa notifica è stata inviata perché :link copre questo tipo di attività per questo elemento.',
     'footer_reason_link' => 'le tue preferenze di notifica',
diff --git a/lang/it/passwords.php b/lang/it/passwords.php
index 7099d54f37d..ac46ca06f15 100644
--- a/lang/it/passwords.php
+++ b/lang/it/passwords.php
@@ -6,8 +6,8 @@
  */
 return [
 
-    'password' => 'La password deve avere almeno sei caratteri e corrispondere alla conferma.',
-    'user' => "Non possiamo trovare un utente per quella mail.",
+    'password' => 'La password deve avere almeno otto caratteri e corrispondere alla conferma.',
+    'user' => "Nessun utente trovato per quella mail.",
     'token' => 'Il token per reimpostare la password non è valido per questo indirizzo email.',
     'sent' => 'Ti abbiamo inviato via mail il link per reimpostare la password!',
     'reset' => 'La tua password è stata reimpostata!',
diff --git a/lang/it/preferences.php b/lang/it/preferences.php
index c06374e6926..f251384011b 100644
--- a/lang/it/preferences.php
+++ b/lang/it/preferences.php
@@ -5,47 +5,47 @@
  */
 
 return [
-    'my_account' => 'Il Mio Account',
+    'my_account' => 'Il mio account',
 
     'shortcuts' => 'Scorciatoie',
     'shortcuts_interface' => 'Preferenze di scelta rapida dell\'Interfaccia Utente',
     'shortcuts_toggle_desc' => 'Qui puoi abilitare o disabilitare le scorciatoie dell\'interfaccia di sistema da tastiera, utilizzate per la navigazione e le azioni.',
-    'shortcuts_customize_desc' => 'È possibile personalizzare ciascuna delle scorciatoie riportate di seguito. È sufficiente premere la combinazione di tasti desiderata dopo aver selezionato l\'input per una scelta rapida.',
+    'shortcuts_customize_desc' => 'È possibile personalizzare ciascuna delle scorciatoie riportate di seguito. È sufficiente premere la combinazione di tasti desiderata dopo aver selezionato l\'input per una scorciatoia.',
     'shortcuts_toggle_label' => 'Scorciatoie da tastiera attivate',
     'shortcuts_section_navigation' => 'Navigazione',
-    'shortcuts_section_actions' => 'Azioni Comuni',
-    'shortcuts_save' => 'Salva Scorciatoie',
+    'shortcuts_section_actions' => 'Azioni comuni',
+    'shortcuts_save' => 'Salva scorciatoie',
     'shortcuts_overlay_desc' => 'Nota: quando le scorciatoie sono abilitate, premendo "?" è possibile visualizzare le scorciatoie disponibili per le azioni attualmente visibili sullo schermo.',
     'shortcuts_update_success' => 'Le preferenze delle scorciatoie sono state aggiornate!',
     'shortcuts_overview_desc' => 'Gestisci le scorciatoie da tastiera che puoi usare per navigare nell\'interfaccia utente di sistema.',
 
-    'notifications' => 'Preferenze Di Notifica',
+    'notifications' => 'Preferenze notifiche',
     'notifications_desc' => 'Controlla le notifiche email che ricevi quando viene eseguita una determinata attività all\'interno del sistema.',
     'notifications_opt_own_page_changes' => 'Notifica in caso di modifiche alle pagine che possiedo',
     'notifications_opt_own_page_comments' => 'Notifica i commenti sulle pagine che possiedo',
     'notifications_opt_comment_replies' => 'Notificare le risposte ai miei commenti',
-    'notifications_save' => 'Salva Preferenze',
+    'notifications_save' => 'Salva preferenze',
     'notifications_update_success' => 'Le preferenze di notifica sono state aggiornate!',
-    'notifications_watched' => 'Oggetti Osservati E Ignorati',
-    'notifications_watched_desc' => 'Di seguito sono riportati gli articoli a cui sono state applicate le preferenze di monitoraggio personalizzate. Per aggiornare le preferenze, visualizzare l\'articolo e trovare le opzioni di monitoraggio nella barra laterale.',
+    'notifications_watched' => 'Oggetti osservati e ignorati',
+    'notifications_watched_desc' => 'Di seguito sono riportati gli elementi a cui sono state applicate le preferenze di monitoraggio personalizzate. Per aggiornare le preferenze, visualizza l\'elemento e usa le opzioni di monitoraggio nella barra laterale.',
 
-    'auth' => 'Accesso E Sicurezza',
+    'auth' => 'Accesso e sicurezza',
     'auth_change_password' => 'Modifica password',
     'auth_change_password_desc' => 'Modifica la password che usi per accedere all\'applicazione. Deve essere lunga almeno 8 caratteri.',
     'auth_change_password_success' => 'La password è stata aggiornata!',
 
     'profile' => 'Dettagli del profilo',
     'profile_desc' => 'Gestisci i dettagli dell\'account che ti rappresenta agli altri utenti, oltre ai dettagli utilizzati per la comunicazione e la personalizzazione del sistema.',
-    'profile_view_public' => 'Visualizza Profilo Pubblico',
+    'profile_view_public' => 'Visualizza profilo pubblico',
     'profile_name_desc' => 'Configura il tuo nome visualizzato che sarà visibile ad altri utenti del sistema attraverso l\'attività che esegui e il contenuto che possiedi.',
     'profile_email_desc' => 'Questa email verrà utilizzata per le notifiche e, a seconda dell\'autenticazione al sistema attiva, per l\'accesso al sistema.',
-    'profile_email_no_permission' => 'Purtroppo non hai il permesso di modificare il tuo indirizzo email. Se si desidera modificarlo, è necessario chiedere ad un amministratore di farlo per te.',
+    'profile_email_no_permission' => 'Purtroppo non hai il permesso di modificare il tuo indirizzo email. Se vuoi modificarlo, devi chiedere a un amministratore di farlo per te.',
     'profile_avatar_desc' => 'Seleziona un\'immagine che verrà usata per rappresentarti agli altri utenti del sistema. Idealmente questa immagine dovrebbe essere quadrata e di circa 256px in larghezza e altezza.',
-    'profile_admin_options' => 'Opzioni Amministratore',
+    'profile_admin_options' => 'Opzioni amministratore',
     'profile_admin_options_desc' => 'Ulteriori opzioni di livello amministrativo, come quelle per gestire le assegnazioni dei ruoli, possono essere trovate per il tuo account utente nell\'area "Impostazioni > Utenti".',
 
-    'delete_account' => 'Elimina Account',
-    'delete_my_account' => 'Elimina Il Mio Account',
+    'delete_account' => 'Elimina account',
+    'delete_my_account' => 'Elimina il mio account',
     'delete_my_account_desc' => 'Questa azione eliminerà completamente il tuo account utente dal sistema. Non sarai in grado di recuperare l\'account né di annullare questa azione. Il contenuto che hai creato, come le pagine create e le immagini caricate, rimarrà nel sistema.',
     'delete_my_account_warning' => 'Sei sicuro di voler eliminare il tuo account?',
 ];
diff --git a/lang/it/settings.php b/lang/it/settings.php
index a6e5537be0a..ccbc505b7df 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -8,63 +8,63 @@
 
     // Common Messages
     'settings' => 'Impostazioni',
-    'settings_save' => 'Salva Impostazioni',
-    'system_version' => 'Versione Del Sistema',
+    'settings_save' => 'Salva impostazioni',
+    'system_version' => 'Versione del sistema',
     'categories' => 'Categorie',
 
     // App Settings
     'app_customization' => 'Personalizzazione',
-    'app_features_security' => 'Funzioni & Sicurezza',
+    'app_features_security' => 'Funzioni e sicurezza',
     'app_name' => 'Nome applicazione',
-    'app_name_desc' => 'Questo nome è mostrato nell\'header e in tutte le mail.',
-    'app_name_header' => 'Mostrare il nome nell\'header',
-    'app_public_access' => 'Accesso Pubblico',
+    'app_name_desc' => 'Questo nome è mostrato nell\'intestazione e in tutte le email inviate dal sistema.',
+    'app_name_header' => 'Mostra il nome nell\'header',
+    'app_public_access' => 'Accesso pubblico',
     'app_public_access_desc' => 'Abilitando questa opzione, i visitatori, che non sono loggati, potranno accedere ai contenuti nella tua istanza BookStack.',
     'app_public_access_desc_guest' => 'L\'accesso ai visitatori pubblici può essere controllato attraverso l\'utente "Guest".',
     'app_public_access_toggle' => 'Permetti accesso pubblico',
     'app_public_viewing' => 'Consentire la visione pubblica?',
-    'app_secure_images' => 'Abilitare una sicurezza maggiore per le immagini caricate?',
-    'app_secure_images_toggle' => 'Abilita sicurezza aggiuntiva negli upload delle immagini',
-    'app_secure_images_desc' => 'Per una ragione di prestazioni, tutte le immagini sono pubbliche. Questa opzione aaggiunge una stringa, difficile da indovinare, random negli url delle immagini. Assicurati che il listing delle cartelle non sia abilitato per prevenire un accesso semplice.',
-    'app_default_editor' => 'Editor Di Pagina Predefinito',
-    'app_default_editor_desc' => 'Seleziona quale editor sarà usato per impostazione predefinita quando modifichi nuove pagine. Questa impostazione potrà essere sovrascritta a livello di pagina dove i permessi lo permettano.',
-    'app_custom_html' => 'Contenuto Head HTML Custom',
+    'app_secure_images' => 'Sicurezza aggiuntiva per le immagini caricate',
+    'app_secure_images_toggle' => 'Abilita sicurezza aggiuntiva per le immagini caricate',
+    'app_secure_images_desc' => 'Per ragioni di prestazioni, tutte le immagini sono pubbliche. Questa opzione aggiunge una stringa casuale, difficile da indovinare, davanti agli url delle immagini. Assicurati che l\'indicizzazione delle cartelle non sia abilitato per prevenire un accesso semplice.',
+    'app_default_editor' => 'Editor di pagina predefinito',
+    'app_default_editor_desc' => 'Seleziona quale editor sarà usato per impostazione predefinita quando modifichi nuove pagine. Questa impostazione potrà essere sovrascritta a livello di pagina dove i permessi lo consentono.',
+    'app_custom_html' => 'Contenuto Head HTML personalizzato',
     'app_custom_html_desc' => 'Qualsiasi contenuto aggiunto qui verrà inserito alla fine della sezione <head> di tutte le pagine. Questo è utile per sovrascrivere lo stile o aggiungere il codice per gli analytics.',
-    'app_custom_html_disabled_notice' => 'Il contenuto HTML personalizzato è disabilitato su questa pagina impostazioni per garantire che eventuali modifiche possano essere ripristinate.',
+    'app_custom_html_disabled_notice' => 'Il contenuto Head HTML personalizzato è disabilitato su questa pagina delle impostazioni per garantire che eventuali modifiche distruttive possano essere annullate.',
     'app_logo' => 'Logo applicazione',
     'app_logo_desc' => 'Viene utilizzata nella barra di intestazione dell\'applicazione, tra le altre aree. L\'immagine deve avere un\'altezza di 86px. Le immagini più grandi saranno ridimensionate.',
-    'app_icon' => 'Icona Applicazione',
+    'app_icon' => 'Icona applicazione',
     'app_icon_desc' => 'Questa icona viene utilizzata per le schede del browser e per le icone di collegamento. Deve essere un\'immagine PNG quadrata di 256px.',
-    'app_homepage' => 'Homepage Applicazione',
-    'app_homepage_desc' => 'Seleziona una pagina da mostrare nella home anzichè quella di default. I permessi della pagina sono ignorati per quella selezionata.',
+    'app_homepage' => 'Homepage applicazione',
+    'app_homepage_desc' => 'Seleziona una pagina da mostrare nella home anzichè quella di default. I permessi della pagina sono ignorati per le pagine selezionate.',
     'app_homepage_select' => 'Seleziona una pagina',
-    'app_footer_links' => 'Link in basso',
+    'app_footer_links' => 'Link a piè di pagina',
     'app_footer_links_desc' => 'Aggiungi link da mostrare in basso nel sito. Questi saranno visibili in fondo alla maggior parte delle pagine, incluse quelle che non richiedono un autenticazione. Puoi usare l\'etichetta "trans::<chiave>" per utilizzare le traduzioni implementate nella piattaforma. Esempio: usando "trans::common.privacy_policy" mostrerà il testo tradotto "Norme sulla privacy" e "trans::common.terms_of_service" mostrerà il testo tradotto "Condizioni del Servizio".',
-    'app_footer_links_label' => 'Etichetta del Link',
-    'app_footer_links_url' => 'URL del Link',
-    'app_footer_links_add' => 'Aggiungi Link in basso',
-    'app_disable_comments' => 'Disattiva commenti',
-    'app_disable_comments_toggle' => 'Disabilita commenti',
-    'app_disable_comments_desc' => 'Disabilita i commenti su tutte le pagine nell\'applicazione. I commenti esistenti non sono mostrati. ',
+    'app_footer_links_label' => 'Etichetta del link',
+    'app_footer_links_url' => 'URL del link',
+    'app_footer_links_add' => 'Aggiungi link in basso',
+    'app_disable_comments' => 'Disabilita commenti',
+    'app_disable_comments_toggle' => 'Disabilita i commenti',
+    'app_disable_comments_desc' => 'Disabilita i commenti su tutte le pagine dell\'applicazione. <br> I commenti esistenti non sono mostrati.',
 
     // Color settings
     'color_scheme' => 'Schema di colore dell\'applicazione',
-    'color_scheme_desc' => 'Impostare i colori da utilizzare nell\'interfaccia utente dell\'applicazione. I colori possono essere configurati separatamente per le modalità scura e chiara, per adattarsi al meglio al tema e garantire la leggibilità.',
+    'color_scheme_desc' => 'Imposta i colori da utilizzare nell\'interfaccia utente dell\'applicazione. I colori possono essere configurati separatamente per le modalità scura e chiara, per adattarsi al meglio al tema e garantire la leggibilità.',
     'ui_colors_desc' => 'Imposta il colore primario dell\'applicazione e il colore predefinito dei collegamenti. Il colore primario è utilizzato principalmente per il banner dell\'intestazione, i pulsanti e le decorazioni dell\'interfaccia. Il colore predefinito dei collegamenti viene utilizzato per i collegamenti e le azioni basate sul testo, sia all\'interno dei contenuti scritti che nell\'interfaccia dell\'applicazione.',
-    'app_color' => 'Colore Principale',
+    'app_color' => 'Colore principale',
     'link_color' => 'Colore preferito del link',
     'content_colors_desc' => 'Impostare i colori per tutti gli elementi nella gerarchia dell\'organizzazione della pagina. Si consiglia di scegliere colori con una luminosità simile a quella dei colori predefiniti per garantire la leggibilità.',
     'bookshelf_color' => 'Colore della libreria',
     'book_color' => 'Colore del libro',
     'chapter_color' => 'Colore del capitolo',
-    'page_color' => 'Colore della Pagina',
+    'page_color' => 'Colore della pagina',
     'page_draft_color' => 'Colore della bozza',
 
     // Registration Settings
-    'reg_settings' => 'Impostazioni Registrazione',
-    'reg_enable' => 'Abilita Registrazione',
+    'reg_settings' => 'Impostazioni registrazione',
+    'reg_enable' => 'Abilita registrazione',
     'reg_enable_toggle' => 'Abilita registrazione',
-    'reg_enable_desc' => 'Quando la registrazione è abilitata, l\utente sarà in grado di registrarsi all\'applicazione. Al momento della registrazione gli verrà associato un ruolo utente predefinito.',
+    'reg_enable_desc' => 'Quando la registrazione è abilitata, l\utente sarà in grado di registrarsi autonomamente all\'applicazione. Al momento della registrazione gli verrà associato un ruolo utente predefinito.',
     'reg_default_role' => 'Ruolo predefinito dopo la registrazione',
     'reg_enable_external_warning' => 'L\'opzione precedente viene ignorata se l\'autenticazione esterna tramite LDAP o SAML è attiva. Se l\'autenticazione (effettuata sul sistema esterno) sarà valida, gli account di eventuali membri non registrati saranno creati in automatico.',
     'reg_email_confirmation' => 'Conferma Email',
@@ -76,42 +76,42 @@
 
     // Maintenance settings
     'maint' => 'Manutenzione',
-    'maint_image_cleanup' => 'Pulizia Immagini',
-    'maint_image_cleanup_desc' => 'Esegue la scansione del contenuto delle pagine e delle revisioni per verificare quali immagini e disegni sono attualmente in uso e quali immagini sono ridondanti. Assicurati di creare backup completo del database e delle immagini prima di eseguire la pulizia.',
+    'maint_image_cleanup' => 'Pulizia immagini',
+    'maint_image_cleanup_desc' => 'Esegue la scansione del contenuto delle pagine e delle revisioni per verificare quali immagini e disegni sono attualmente in uso e quali immagini sono ridondanti. Assicurati di creare un backup completo del database e delle immagini prima di eseguire la pulizia.',
     'maint_delete_images_only_in_revisions' => 'Elimina anche le immagini che esistono solo nelle vecchie revisioni della pagina',
-    'maint_image_cleanup_run' => 'Esegui Pulizia',
-    'maint_image_cleanup_warning' => ':count immagini potenzialmente inutilizzate sono state trovate. Sei sicuro di voler eliminare queste immagini?',
+    'maint_image_cleanup_run' => 'Esegui pulizia',
+    'maint_image_cleanup_warning' => 'Sono state trovate :count immagini potenzialmente inutilizzate. Sei sicuro di voler eliminare queste immagini?',
     'maint_image_cleanup_success' => ':count immagini potenzialmente inutilizzate trovate e eliminate!',
-    'maint_image_cleanup_nothing_found' => 'Nessuna immagine non utilizzata trovata, Nulla è stato cancellato!',
-    'maint_send_test_email' => 'Invia un Email di Test',
-    'maint_send_test_email_desc' => 'Questo invia un\'email di prova al tuo indirizzo email specificato nel tuo profilo.',
+    'maint_image_cleanup_nothing_found' => 'Nessuna immagine non utilizzata trovata, non è stato cancellato nulla!',
+    'maint_send_test_email' => 'Invia un\'email di test',
+    'maint_send_test_email_desc' => 'Questo comando invia un\'email di prova al tuo indirizzo email specificato nel tuo profilo.',
     'maint_send_test_email_run' => 'Invia email di test',
     'maint_send_test_email_success' => 'Email inviata a :address',
-    'maint_send_test_email_mail_subject' => 'Email di Test',
+    'maint_send_test_email_mail_subject' => 'Email di test',
     'maint_send_test_email_mail_greeting' => 'L\'invio delle email sembra funzionare!',
     'maint_send_test_email_mail_text' => 'Congratulazioni! Siccome hai ricevuto questa notifica email, le tue impostazioni sembrano essere configurate correttamente.',
     'maint_recycle_bin_desc' => 'Le librerie, i libri, i capitoli e le pagine cancellati vengono inviati al cestino in modo che possano essere ripristinati o eliminati definitivamente. Gli elementi più vecchi nel cestino possono essere automaticamente rimossi dopo un certo periodo, a seconda della configurazione del sistema.',
     'maint_recycle_bin_open' => 'Apri il Cestino',
-    'maint_regen_references' => 'Rigenera Riferimenti',
+    'maint_regen_references' => 'Rigenera riferimenti',
     'maint_regen_references_desc' => 'Questa azione ricostruirà l\'indice dei riferimenti incrociati all\'interno del database. Di solito questa operazione è gestita automaticamente, ma può essere utile per indicizzare contenuti vecchi o aggiunti con metodi non ufficiali.',
     'maint_regen_references_success' => 'L\'indice di riferimento è stato rigenerato!',
-    'maint_timeout_command_note' => 'Nota: Questa azione può richiedere del tempo per essere eseguita e può causare problemi di timeout in alcuni ambienti Web. In alternativa, questa azione può essere eseguita usando un comando da terminale.',
+    'maint_timeout_command_note' => 'Nota: Questa azione può richiedere del tempo per essere eseguita e può causare problemi di timeout in alcuni ambienti web. In alternativa, questa azione può essere eseguita usando un comando da terminale.',
 
     // Recycle Bin
     'recycle_bin' => 'Cestino',
     'recycle_bin_desc' => 'Qui è possibile ripristinare gli elementi che sono stati eliminati o scegliere di rimuoverli definitivamente dal sistema. Questo elenco non è filtrato a differenza di elenchi di attività simili nel sistema in cui vengono applicati i filtri autorizzazioni.',
-    'recycle_bin_deleted_item' => 'Elimina Elemento',
+    'recycle_bin_deleted_item' => 'Elemento eliminato',
     'recycle_bin_deleted_parent' => 'Superiore',
     'recycle_bin_deleted_by' => 'Cancellato da',
     'recycle_bin_deleted_at' => 'Orario Cancellazione',
-    'recycle_bin_permanently_delete' => 'Elimina Definitivamente',
+    'recycle_bin_permanently_delete' => 'Elimina definitivamente',
     'recycle_bin_restore' => 'Ripristina',
     'recycle_bin_contents_empty' => 'Al momento il cestino è vuoto',
     'recycle_bin_empty' => 'Svuota Cestino',
     'recycle_bin_empty_confirm' => 'Questa operazione cancellerà definitivamente tutti gli elementi presenti nel cestino, inclusi i contenuti relativi a ciascun elemento. Sei sicuro di voler svuotare il cestino?',
     'recycle_bin_destroy_confirm' => 'Questa azione eliminerà definitivamente questo elemento dal sistema, insieme a qualsiasi elemento figlio elencato di seguito, e non sarai in grado di ripristinare questo contenuto. Sei sicuro di voler eliminare definitivamente questo elemento?',
-    'recycle_bin_destroy_list' => 'Elementi da Eliminare definitivamente',
-    'recycle_bin_restore_list' => 'Elementi da Ripristinare',
+    'recycle_bin_destroy_list' => 'Elementi da eliminare definitivamente',
+    'recycle_bin_restore_list' => 'Elementi da ripristinare',
     'recycle_bin_restore_confirm' => 'Questa azione ripristinerà l\'elemento eliminato, compresi gli elementi figli, nella loro posizione originale. Se la posizione originale è stata eliminata, ed è ora nel cestino, anche l\'elemento padre dovrà essere ripristinato.',
     'recycle_bin_restore_deleted_parent' => 'L\'elemento padre di questo elemento è stato eliminato. Questo elemento rimarrà eliminato fino a che l\'elemento padre non sarà ripristinato.',
     'recycle_bin_restore_parent' => 'Ripristina Superiore',
@@ -121,13 +121,13 @@
     // Audit Log
     'audit' => 'Registro di Controllo',
     'audit_desc' => 'Questo registro di controllo mostra la lista delle attività registrate dal sistema. Questa lista, a differenza di altre liste del sistema a cui vengono applicate dei filtri, è integrale.',
-    'audit_event_filter' => 'Filtra Eventi',
-    'audit_event_filter_no_filter' => 'Nessun Filtro',
-    'audit_deleted_item' => 'Elimina Elemento',
+    'audit_event_filter' => 'Filtro eventi',
+    'audit_event_filter_no_filter' => 'Nessun filtro',
+    'audit_deleted_item' => 'Elemento eliminato',
     'audit_deleted_item_name' => 'Nome: :name',
     'audit_table_user' => 'Utente',
     'audit_table_event' => 'Evento',
-    'audit_table_related' => 'Elemento o Dettaglio correlato',
+    'audit_table_related' => 'Elemento o dettaglio correlato',
     'audit_table_ip' => 'Indirizzo IP',
     'audit_table_date' => 'Data attività',
     'audit_date_from' => 'Dalla data',
@@ -139,89 +139,89 @@
     'roles_index_desc' => 'I ruoli sono utilizzati per raggruppare gli utenti e fornire ai loro membri i permessi di sistema. Quando un utente è membro di più ruoli, i privilegi concessi si sovrappongono e l\'utente eredita tutte le abilità.',
     'roles_x_users_assigned' => ':count utente assegnato|:count utenti assegnati',
     'roles_x_permissions_provided' => ':count permesso|:count permessi',
-    'roles_assigned_users' => 'Utenti Assegnati',
+    'roles_assigned_users' => 'Utenti assegnati',
     'roles_permissions_provided' => 'Autorizzazioni fornite',
-    'role_create' => 'Crea Nuovo Ruolo',
-    'role_delete' => 'Elimina Ruolo',
+    'role_create' => 'Crea nuovo ruolo',
+    'role_delete' => 'Elimina ruolo',
     'role_delete_confirm' => 'Questo eliminerà il ruolo con il nome \':roleName\'.',
     'role_delete_users_assigned' => 'Questo ruolo ha :userCount utenti assegnati. Se vuoi migrare gli utenti da questo ruolo selezionane uno nuovo sotto.',
     'role_delete_no_migration' => "Non migrare gli utenti",
     'role_delete_sure' => 'Sei sicuro di voler eliminare questo ruolo?',
-    'role_edit' => 'Modifica Ruolo',
-    'role_details' => 'Dettagli Ruolo',
-    'role_name' => 'Nome Ruolo',
-    'role_desc' => 'Breve Descrizione del Ruolo',
+    'role_edit' => 'Modifica ruolo',
+    'role_details' => 'Dettagli ruolo',
+    'role_name' => 'Nome ruolo',
+    'role_desc' => 'Breve descrizione del ruolo',
     'role_mfa_enforced' => 'Richiesta autenticazione multi-fattore',
-    'role_external_auth_id' => 'ID Autenticazione Esterna',
-    'role_system' => 'Permessi di Sistema',
+    'role_external_auth_id' => 'ID autenticazione esterna',
+    'role_system' => 'Permessi di sistema',
     'role_manage_users' => 'Gestire gli utenti',
-    'role_manage_roles' => 'Gestire ruoli e permessi di essi',
+    'role_manage_roles' => 'Gestire ruoli e permessi di ruoli',
     'role_manage_entity_permissions' => 'Gestire tutti i permessi di libri, capitoli e pagine',
     'role_manage_own_entity_permissions' => 'Gestire i permessi sui propri libri, capitoli e pagine',
-    'role_manage_page_templates' => 'Gestisci modelli di pagina',
-    'role_access_api' => 'API sistema d\'accesso',
+    'role_manage_page_templates' => 'Gestire modelli di pagina',
+    'role_access_api' => 'Accedere alle API di sistema',
     'role_manage_settings' => 'Gestire impostazioni app',
-    'role_export_content' => 'Esporta contenuto',
-    'role_editor_change' => 'Cambia editor di pagina',
-    'role_notifications' => 'Ricevi & gestisci le notifiche',
-    'role_asset' => 'Permessi Entità',
-    'roles_system_warning' => 'Siate consapevoli che l\'accesso a uno dei tre permessi qui sopra, può consentire a un utente di modificare i propri privilegi o i privilegi di altri nel sistema. Assegna ruoli con questi permessi solo ad utenti fidati.',
-    'role_asset_desc' => 'Questi permessi controllano l\'accesso di default alle entità. I permessi nei Libri, Capitoli e Pagine sovrascriveranno questi.',
+    'role_export_content' => 'Esportare contenuto',
+    'role_editor_change' => 'Cambiare editor di pagina',
+    'role_notifications' => 'Ricevere e gestire le notifiche',
+    'role_asset' => 'Permessi entità',
+    'roles_system_warning' => 'Siate consapevoli che l\'accesso a uno dei tre permessi qui sopra può consentire a un utente di modificare i propri privilegi o i privilegi di altri nel sistema. Assegna ruoli con questi permessi solo ad utenti fidati.',
+    'role_asset_desc' => 'Questi permessi controllano l\'accesso predefinito alle entità. I permessi in libri, capitoli e pagine sovrascriveranno questi.',
     'role_asset_admins' => 'Gli amministratori hanno automaticamente accesso a tutti i contenuti ma queste opzioni possono mostrare o nascondere le opzioni della UI.',
-    'role_asset_image_view_note' => 'Questo si riferisce alla visibilità all\'interno del gestore di immagini. L\'accesso effettivo ai file di immagine caricati dipenderà dall\'opzione di archiviazione delle immagini di sistema.',
+    'role_asset_image_view_note' => 'Questo si riferisce alla visibilità all\'interno del gestore delle immagini. L\'accesso effettivo ai file di immagine caricati dipenderà dall\'opzione di archiviazione delle immagini di sistema.',
     'role_all' => 'Tutti',
     'role_own' => 'Propri',
     'role_controlled_by_asset' => 'Controllato dall\'entità in cui sono caricati',
-    'role_save' => 'Salva Ruolo',
+    'role_save' => 'Salva ruolo',
     'role_users' => 'Utenti in questo ruolo',
     'role_users_none' => 'Nessun utente assegnato a questo ruolo',
 
     // Users
     'users' => 'Utenti',
     'users_index_desc' => 'Crea e gestisci account utente individuali all\'interno del sistema. Gli account utente sono utilizzati per il login e l\'attribuzione di contenuti e attività. Le autorizzazioni di accesso sono principalmente basate sui ruoli, ma la proprietà dei contenuti dell\'utente, insieme ad altri fattori, può influenzare le autorizzazioni e l\'accesso.',
-    'user_profile' => 'Profilo Utente',
+    'user_profile' => 'Profilo utente',
     'users_add_new' => 'Aggiungi Nuovo Utente',
-    'users_search' => 'Cerca Utenti',
-    'users_latest_activity' => 'Ultima Attività',
-    'users_details' => 'Dettagli Utente',
+    'users_search' => 'Cerca utenti',
+    'users_latest_activity' => 'Ultima attività',
+    'users_details' => 'Dettagli utente',
     'users_details_desc' => 'Imposta un nome e un indirizzo email per questo utente. L\'indirizzo email verrà utilizzato per accedere all\'applicazione.',
     'users_details_desc_no_email' => 'Imposta un nome per questo utente così gli altri possono riconoscerlo.',
-    'users_role' => 'Ruoli Utente',
+    'users_role' => 'Ruoli utente',
     'users_role_desc' => 'Seleziona a quali ruoli verrà assegnato questo utente. Se un utente è assegnato a più ruoli riceverà tutte le abilità dei ruoli assegnati.',
-    'users_password' => 'Password Utente',
+    'users_password' => 'Password utente',
     'users_password_desc' => 'Imposta una password usata per accedere all\'applicazione. Deve essere lunga almeno 8 caratteri.',
     'users_send_invite_text' => 'Puoi scegliere di inviare a questo utente un\'email di invito che permette loro di impostare la propria password altrimenti puoi impostare la password tu stesso.',
     'users_send_invite_option' => 'Invia email di invito',
-    'users_external_auth_id' => 'ID Autenticazioni Esterna',
+    'users_external_auth_id' => 'ID autenticazione esterna',
     'users_external_auth_id_desc' => 'Quando è in uso un sistema di autenticazione esterno (come SAML2, OIDC o LDAP) questo è l\'ID che collega questo utente BookStack all\'account del sistema di autenticazione. È possibile ignorare questo campo se si utilizza l\'autenticazione predefinita basata su email.',
     'users_password_warning' => 'Compila la parte sottostante solo se desideri cambiare la password per questo utente.',
     'users_system_public' => 'Questo utente rappresente qualsiasi ospite che visita il sito. Non può essere usato per effettuare il login ma è assegnato automaticamente.',
-    'users_delete' => 'Elimina Utente',
+    'users_delete' => 'Elimina utente',
     'users_delete_named' => 'Elimina l\'utente :userName',
     'users_delete_warning' => 'Questo eliminerà completamente l\'utente \':userName\' dal sistema.',
     'users_delete_confirm' => 'Sei sicuro di voler eliminare questo utente?',
-    'users_migrate_ownership' => 'Cambia Proprietario',
+    'users_migrate_ownership' => 'Cambia proprietario',
     'users_migrate_ownership_desc' => 'Seleziona qui un utente se vuoi che un altro utente diventi il proprietario di tutti gli elementi attualmente di proprietà di questo utente.',
     'users_none_selected' => 'Nessun utente selezionato',
-    'users_edit' => 'Modifica Utente',
-    'users_edit_profile' => 'Modifica Profilo',
-    'users_avatar' => 'Avatar Utente',
-    'users_avatar_desc' => 'Quest\'immagine dovrebbe essere approssimativamente 256px quadrata.',
-    'users_preferred_language' => 'Lingua Preferita',
+    'users_edit' => 'Modifica utente',
+    'users_edit_profile' => 'Modifica profilo',
+    'users_avatar' => 'Avatar utente',
+    'users_avatar_desc' => 'Quest\'immagine dovrebbe essere quadrata e alta circa 256px.',
+    'users_preferred_language' => 'Lingua preferita',
     'users_preferred_language_desc' => 'Questa opzione cambierà la lingua utilizzata per l\'interfaccia utente dell\'applicazione. Questo non influirà su alcun contenuto creato dall\'utente.',
-    'users_social_accounts' => 'Account Social',
+    'users_social_accounts' => 'Account social',
     'users_social_accounts_desc' => 'Visualizza lo stato degli account social connessi per questo utente. Gli account social possono essere utilizzati in aggiunta al sistema di autenticazione primaria per l\'accesso al sistema.',
     'users_social_accounts_info' => 'Qui puoi connettere gli altri account per un accesso più veloce e semplice. Disconnettere un account qui non rimuoverà le altre sessioni. Revoca l\'accesso dal tuo profilo negli account social connessi.',
-    'users_social_connect' => 'Connetti Account',
-    'users_social_disconnect' => 'Disconnetti Account',
+    'users_social_connect' => 'Connetti account',
+    'users_social_disconnect' => 'Disconnetti account',
     'users_social_status_connected' => 'Connesso',
     'users_social_status_disconnected' => 'Disconnesso',
     'users_social_connected' => 'L\'account :socialAccount è stato connesso correttamente al tuo profilo.',
     'users_social_disconnected' => 'L\'account :socialAccount è stato disconnesso correttamente dal tuo profilo.',
     'users_api_tokens' => 'Token API',
-    'users_api_tokens_desc' => 'Creare e gestire i token di accesso utilizzati per autenticarsi con l\'API REST di BookStack. I permessi per l\'API sono gestiti tramite l\'utente a cui appartiene il token.',
+    'users_api_tokens_desc' => 'Crea e gestisci i token di accesso utilizzati per autenticarsi con l\'API REST di BookStack. I permessi per l\'API sono gestiti tramite l\'utente a cui appartiene il token.',
     'users_api_tokens_none' => 'Nessun token API è stato creato per questo utente',
-    'users_api_tokens_create' => 'Crea Token',
+    'users_api_tokens_create' => 'Crea token',
     'users_api_tokens_expires' => 'Scade',
     'users_api_tokens_docs' => 'Documentazione API',
     'users_mfa' => 'Autenticazione multi-fattore',
@@ -230,52 +230,60 @@
     'users_mfa_configure' => 'Configura metodi',
 
     // API Tokens
-    'user_api_token_create' => 'Crea Token API',
+    'user_api_token_create' => 'Crea token API',
     'user_api_token_name' => 'Nome',
     'user_api_token_name_desc' => 'Assegna al tuo token un nome leggibile per ricordarne la funzionalità in futuro.',
     'user_api_token_expiry' => 'Data di scadenza',
     'user_api_token_expiry_desc' => 'Imposta una data di scadenza per questo token. Dopo questa data, le richieste che utilizzeranno questo token non funzioneranno più. Lasciando questo campo vuoto si imposterà la scadenza tra 100 anni.',
-    'user_api_token_create_secret_message' => 'Immediatamente dopo aver creato questo token, un "Token ID" e un "Segreto Token" saranno generati e mostrati. Il segreto verrà mostrato unicamente questa volta, assicurati, quindi, di copiare il valore in un posto sicuro prima di procedere.',
+    'user_api_token_create_secret_message' => 'Immediatamente dopo aver creato questo token, un "ID del Token" e una "Chiave segreta Token" saranno generati e mostrati. La chiave segreta verrà mostrata unicamente questa volta, assicurati, quindi, di copiare il valore in un posto sicuro prima di procedere.',
     'user_api_token' => 'Token API',
-    'user_api_token_id' => 'Token ID',
+    'user_api_token_id' => 'ID del Token',
     'user_api_token_id_desc' => 'Questo è un identificativo non modificabile generato dal sistema per questo token e che sarà necessario fornire per le richieste tramite API.',
-    'user_api_token_secret' => 'Token Segreto',
-    'user_api_token_secret_desc' => 'Questo è un segreto generato dal sistema per questo token che sarà necessario fornire per le richieste via API. Questo valore sarà visibile unicamente in questo momento pertanto copialo in un posto sicuro.',
+    'user_api_token_secret' => 'Chiave segreta token',
+    'user_api_token_secret_desc' => 'Questo è una chiave segreta generata dal sistema per questo token che sarà necessario fornire per le richieste via API. Questo valore sarà visibile unicamente in questo momento pertanto copialo in un posto sicuro.',
     'user_api_token_created' => 'Token Aggiornato :timeAgo',
-    'user_api_token_updated' => 'Token Aggiornato :timeAgo',
-    'user_api_token_delete' => 'Elimina Token',
+    'user_api_token_updated' => 'Token aggiornato :timeAgo',
+    'user_api_token_delete' => 'Elimina token',
     'user_api_token_delete_warning' => 'Questa operazione eliminerà irreversibilmente dal sistema il token API denominato \':tokenName\'.',
     'user_api_token_delete_confirm' => 'Sei sicuri di voler eliminare questo token API?',
 
     // Webhooks
-    'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'I webhook sono un modo per inviare dati a URL esterne quando si verificano determinate azioni ed eventi all\'interno del sistema, consentendo l\'integrazione basata sugli eventi con piattaforme esterne, come sistemi di messaggistica o di notifica.',
+    'webhooks' => 'Webhook',
+    'webhooks_index_desc' => 'I webhook sono un modo per inviare dati a URL esterni quando si verificano determinate azioni ed eventi all\'interno del sistema, consentendo l\'integrazione basata sugli eventi con piattaforme esterne, come sistemi di messaggistica o di notifica.',
     'webhooks_x_trigger_events' => ':count evento trigger|:count eventi trigger',
-    'webhooks_create' => 'Crea Nuovo Webhook',
+    'webhooks_create' => 'Crea nuovo webhook',
     'webhooks_none_created' => 'Nessun webhook è stato creato.',
-    'webhooks_edit' => 'Modifica Webhook',
-    'webhooks_save' => 'Salva Webhook',
-    'webhooks_details' => 'Dettagli Webhook',
-    'webhooks_details_desc' => 'Fornire un nome di facile utilizzo e un endpoint POST come posizione per i dati del webhook da inviare.',
-    'webhooks_events' => 'Eventi Webhook',
+    'webhooks_edit' => 'Modifica webhook',
+    'webhooks_save' => 'Salva webhook',
+    'webhooks_details' => 'Dettagli webhook',
+    'webhooks_details_desc' => 'Fornisci un nome di facile utilizzo e un endpoint POST come posizione per i dati del webhook da inviare.',
+    'webhooks_events' => 'Eventi webhook',
     'webhooks_events_desc' => 'Seleziona tutti gli eventi che dovrebbero attivare questo webhook da chiamare.',
-    'webhooks_events_warning' => 'Tieni presente che questi eventi saranno attivati per tutti gli eventi selezionati, anche se vengono applicati permessi personalizzati. Assicurarsi che l\'uso di questo webhook non esporrà contenuti riservati.',
+    'webhooks_events_warning' => 'Tieni presente che questi eventi saranno attivati per tutti gli eventi selezionati, anche se vengono applicati permessi personalizzati. Assicurati che l\'uso di questo webhook non esporrà contenuti riservati.',
     'webhooks_events_all' => 'Tutti gli eventi di sistema',
-    'webhooks_name' => 'Nome Webhook',
-    'webhooks_timeout' => 'Timeout Richiesta Webhook (Secondi)',
-    'webhooks_endpoint' => 'Endpoint Webhook',
-    'webhooks_active' => 'Webhook Attivo',
+    'webhooks_name' => 'Nome webhook',
+    'webhooks_timeout' => 'Timeout richiesta webhook (secondi)',
+    'webhooks_endpoint' => 'Endpoint webhook',
+    'webhooks_active' => 'Webhook attivo',
     'webhook_events_table_header' => 'Eventi',
-    'webhooks_delete' => 'Elimina Webhook',
-    'webhooks_delete_warning' => 'Questo eliminerà completamente questo webhook, con il nome \':webhookName\', dal sistema.',
+    'webhooks_delete' => 'Elimina webhook',
+    'webhooks_delete_warning' => 'Questo eliminerà completamente questo webhook chiamato \':webhookName\' dal sistema.',
     'webhooks_delete_confirm' => 'Sei sicuro di voler eliminare questo webhook?',
-    'webhooks_format_example' => 'Esempio Di Formato Webhook',
-    'webhooks_format_example_desc' => 'I dati Webhook vengono inviati come richiesta POST all\'endpoint configurato come JSON seguendo il formato sottostante. Le proprietà "related_item" e "url" sono opzionali e dipenderanno dal tipo di evento attivato.',
-    'webhooks_status' => 'Stato Webhook',
-    'webhooks_last_called' => 'Ultima Chiamata:',
-    'webhooks_last_errored' => 'Ultimo Errore:',
-    'webhooks_last_error_message' => 'Ultimo Messaggio Di Errore:',
+    'webhooks_format_example' => 'Esempio di formato webhook',
+    'webhooks_format_example_desc' => 'I dati del webhook vengono inviati come richiesta POST all\'endpoint configurato come JSON seguendo il formato sottostante. Le proprietà "related_item" e "url" sono opzionali e dipenderanno dal tipo di evento attivato.',
+    'webhooks_status' => 'Stato webhook',
+    'webhooks_last_called' => 'Ultima chiamata:',
+    'webhooks_last_errored' => 'Ultimo errore:',
+    'webhooks_last_error_message' => 'Ultimo messaggio di errore:',
 
+    // Licensing
+    'licenses' => 'Licenze',
+    'licenses_desc' => 'Questa pagina contiene informazioni dettagliate sulle licenze di BookStack, oltre ai progetti e alle librerie utilizzate all\'interno di BookStack. Molti dei progetti elencati possono essere utilizzati solo in un contesto di sviluppo.',
+    'licenses_bookstack' => 'Licenza BookStack',
+    'licenses_php' => 'Licenze Librerie PHP',
+    'licenses_js' => 'Licenze Librerie JavaScript',
+    'licenses_other' => 'Altre Licenze',
+    'license_details' => 'Dettagli Licenza',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/it/validation.php b/lang/it/validation.php
index a782986bf2c..f8f59a3ac0f 100644
--- a/lang/it/validation.php
+++ b/lang/it/validation.php
@@ -12,18 +12,18 @@
     'active_url'           => ':attribute non è uno URL valido.',
     'after'                => ':attribute deve essere una data dopo il :date.',
     'alpha'                => ':attribute deve contenere solo lettere.',
-    'alpha_dash'           => ':attribute deve contenere solo lettere, numeri e meno.',
+    'alpha_dash'           => ':attribute deve contenere solo lettere, numeri, trattini e trattini bassi.',
     'alpha_num'            => ':attribute deve contenere solo lettere e numeri.',
     'array'                => ':attribute deve essere un array.',
     'backup_codes'         => 'Il codice fornito non è valido o è già stato utilizzato.',
     'before'               => ':attribute deve essere una data prima del :date.',
     'between'              => [
         'numeric' => 'Il campo :attribute deve essere tra :min e :max.',
-        'file'    => 'Il campo :attribute deve essere tra :min e :max kilobytes.',
+        'file'    => 'Il campo :attribute deve essere tra :min e :max kilobyte.',
         'string'  => 'Il campo :attribute deve essere tra :min e :max caratteri.',
-        'array'   => 'Il campo :attribute deve essere tra :min e :max oggetti.',
+        'array'   => 'Il campo :attribute deve avere tra :min e :max oggetti.',
     ],
-    'boolean'              => ':attribute deve contenere vero o falso.',
+    'boolean'              => ':attribute deve essere vero o falso.',
     'confirmed'            => 'La conferma di :attribute non corrisponde.',
     'date'                 => ':attribute non è una data valida.',
     'date_format'          => 'Il campo :attribute non corrisponde al formato :format.',
@@ -36,17 +36,17 @@
     'filled'               => 'Il campo :attribute field is required.',
     'gt'                   => [
         'numeric' => ':attribute deve essere maggiore di :value.',
-        'file'    => ':attribute deve essere maggiore di :value kilobytes.',
+        'file'    => ':attribute deve essere maggiore di :value kilobyte.',
         'string'  => ':attribute deve essere maggiore di :value caratteri.',
         'array'   => ':attribute deve avere più di :value elementi.',
     ],
     'gte'                  => [
         'numeric' => ':attribute deve essere maggiore o uguale a :value.',
-        'file'    => ':attribute deve essere maggiore o uguale a :value kilobytes.',
+        'file'    => ':attribute deve essere maggiore o uguale a :value kilobyte.',
         'string'  => ':attribute deve essere maggiore o uguale a :value caratteri.',
-        'array'   => ':attribute deve avere :value elementi o più.',
+        'array'   => ':attribute deve avere :value o più elementi.',
     ],
-    'exists'               => 'Il campo :attribute non è valido.',
+    'exists'               => 'Il campo :attribute selezionato non è valido.',
     'image'                => 'Il campo :attribute deve essere un\'immagine.',
     'image_extension'      => ':attribute deve avere un\'estensione immagine valida e supportata.',
     'in'                   => 'Il campo :attribute selezionato non è valido.',
@@ -57,26 +57,26 @@
     'json'                 => ':attribute deve essere una stringa JSON valida.',
     'lt'                   => [
         'numeric' => ':attribute deve essere inferiore a :value.',
-        'file'    => ':attribute deve essere inferiore a :value kilobytes.',
+        'file'    => ':attribute deve essere inferiore a :value kilobyte.',
         'string'  => ':attribute deve essere inferiore a :value caratteri.',
         'array'   => ':attribute deve avere meno di :value elementi.',
     ],
     'lte'                  => [
         'numeric' => ':attribute deve essere minore o uguale :value.',
-        'file'    => ':attribute deve essere minore o uguale a :value kilobytes.',
+        'file'    => ':attribute deve essere minore o uguale a :value kilobyte.',
         'string'  => ':attribute deve essere minore o uguale a :value caratteri.',
         'array'   => ':attribute non deve avere più di :value elementi.',
     ],
     'max'                  => [
         'numeric' => 'Il campo :attribute non deve essere maggiore di :max.',
-        'file'    => 'Il campo :attribute non deve essere maggiore di :max kilobytes.',
+        'file'    => 'Il campo :attribute non deve essere maggiore di :max kilobyte.',
         'string'  => 'Il campo :attribute non deve essere maggiore di :max caratteri.',
         'array'   => 'Il campo :attribute non deve avere più di :max oggetti.',
     ],
     'mimes'                => 'Il campo :attribute deve essere: :values.',
     'min'                  => [
         'numeric' => 'Il campo :attribute deve essere almeno :min.',
-        'file'    => 'Il campo :attribute deve essere almeno :min kilobytes.',
+        'file'    => 'Il campo :attribute deve essere almeno :min kilobyte.',
         'string'  => 'Il campo :attribute deve essere almeno :min caratteri.',
         'array'   => 'Il campo :attribute deve contenere almeno :min elementi.',
     ],
@@ -94,14 +94,14 @@
     'safe_url'             => 'Il link inserito potrebbe non essere sicuro.',
     'size'                 => [
         'numeric' => 'Il campo :attribute deve essere :size.',
-        'file'    => 'Il campo :attribute deve essere :size kilobytes.',
+        'file'    => 'Il campo :attribute deve essere :size kilobyte.',
         'string'  => 'Il campo :attribute deve essere di :size caratteri.',
         'array'   => 'Il campo :attribute deve contenere :size elementi.',
     ],
     'string'               => ':attribute deve essere una stringa.',
     'timezone'             => ':attribute deve essere una zona valida.',
     'totp'                 => 'Il codice fornito non è valido o è scaduto.',
-    'unique'               => ':attribute è già preso.',
+    'unique'               => ':attribute è già usato.',
     'url'                  => 'Il formato :attribute non è valido.',
     'uploaded'             => 'Il file non può essere caricato. Il server potrebbe non accettare file di questa dimensione.',
 
diff --git a/lang/ja/preferences.php b/lang/ja/preferences.php
index 0e56852602c..0207596a9ec 100644
--- a/lang/ja/preferences.php
+++ b/lang/ja/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => '設定を保存',
     'notifications_update_success' => '通知設定を更新しました。',
     'notifications_watched' => 'ウォッチ/通知無効 項目',
-    'notifications_watched_desc' => ' 以下はカスタムウォッチの設定が適用されている項目です。 これらの設定を更新するには、項目を表示してサイドバーのウォッチオプションを参照してください。',
+    'notifications_watched_desc' => '以下はカスタムウォッチの設定が適用されている項目です。 これらの設定を更新するには、項目を表示してサイドバーのウォッチオプションを参照してください。',
 
     'auth' => 'アクセス & セキュリティ',
     'auth_change_password' => 'パスワードの変更',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index c88fa106a0b..9e992d480e8 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => '最後のエラー:',
     'webhooks_last_error_message' => '最後のエラーのメッセージ:',
 
+    // Licensing
+    'licenses' => 'ライセンス',
+    'licenses_desc' => 'このページではBookStackとBookStackで使用されるプロジェクトやライブラリのライセンス情報を詳しく説明します。開発環境でのみ使用するものも多数含まれています。',
+    'licenses_bookstack' => 'BookStack ライセンス',
+    'licenses_php' => 'PHPライブラリライセンス',
+    'licenses_js' => 'JavaScriptライブラリライセンス',
+    'licenses_other' => 'その他のライセンス',
+    'license_details' => 'ライセンス詳細',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ka/preferences.php b/lang/ka/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/ka/preferences.php
+++ b/lang/ka/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index 7b7f5d2a2e3..f4c84092c6f 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ko/preferences.php b/lang/ko/preferences.php
index ccc09e7a33f..ded933923b6 100644
--- a/lang/ko/preferences.php
+++ b/lang/ko/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => '환경설정 저장',
     'notifications_update_success' => '알림 환경설정이 업데이트되었습니다!',
     'notifications_watched' => '주시 및 무시한 항목',
-    'notifications_watched_desc' => ' 아래는 사용자 지정 시계 환경설정이 적용된 항목입니다. 이러한 항목에 대한 환경설정을 업데이트하려면 해당 항목을 본 다음 사이드바에서 시계 옵션을 찾습니다.',
+    'notifications_watched_desc' => '아래는 사용자 지정 시계 환경설정이 적용된 항목입니다. 이러한 항목에 대한 환경설정을 업데이트하려면 해당 항목을 본 다음 사이드바에서 시계 옵션을 찾습니다.',
 
     'auth' => '액세스 및 보안',
     'auth_change_password' => '패스워드 변경',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 70a15a5af68..d52e5064f9c 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => '마지막 에러:',
     'webhooks_last_error_message' => '마지막 에러 메시지:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/lt/common.php b/lang/lt/common.php
index b4fd096d3d2..052b6cdecb6 100644
--- a/lang/lt/common.php
+++ b/lang/lt/common.php
@@ -6,7 +6,7 @@
 
     // Buttons
     'cancel' => 'Atšaukti',
-    'close' => 'Close',
+    'close' => 'Uždaryti',
     'confirm' => 'Patvirtinti',
     'back' => 'Grįžti',
     'save' => 'Išsaugoti',
diff --git a/lang/lt/preferences.php b/lang/lt/preferences.php
index 2b88f9671ff..5c38d191c0b 100644
--- a/lang/lt/preferences.php
+++ b/lang/lt/preferences.php
@@ -5,14 +5,14 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Mano paskyra',
 
     'shortcuts' => 'Shortcuts',
     'shortcuts_interface' => 'UI Shortcut Preferences',
     'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
     'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
     'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
+    'shortcuts_section_navigation' => 'Navigacija',
     'shortcuts_section_actions' => 'Common Actions',
     'shortcuts_save' => 'Save Shortcuts',
     'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
@@ -27,16 +27,16 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'Prieiga ir saugumas',
+    'auth_change_password' => 'Pasikeisti slaptažodį',
+    'auth_change_password_desc' => 'Pakeistas slaptažodis bus naudojamas prisijungti prie aplikacijos. Slaptažodis turi būti bent 8 simbolių ilgio.',
+    'auth_change_password_success' => 'Slaptažodis atnaujintas!',
 
-    'profile' => 'Profile Details',
+    'profile' => 'Profilio informacija',
     'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
+    'profile_view_public' => 'Rodyti viešąjį profilį',
     'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
     'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
     'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
@@ -44,8 +44,8 @@
     'profile_admin_options' => 'Administrator Options',
     'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
+    'delete_account' => 'Ištrinti paskyrą',
+    'delete_my_account' => 'Ištrinti mano paskyrą',
     'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
     'delete_my_account_warning' => 'Are you sure you want to delete your account?',
 ];
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index db985e9aa2c..cd72051401c 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index b28295639e2..f7db090d806 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Lietotājs veiksmīgi dzēsts',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'izveidoja API žetonu',
     'api_token_create_notification' => 'API žetons veiksmīgi izveidots',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'atjaunoja API žetonu',
     'api_token_update_notification' => 'API žetons veiksmīgi atjaunināts',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'izdzēsa API žetonu',
     'api_token_delete_notification' => 'API žetons veiksmīgi dzēsts',
 
     // Roles
diff --git a/lang/lv/preferences.php b/lang/lv/preferences.php
index ac820f61e25..18def9f5c7c 100644
--- a/lang/lv/preferences.php
+++ b/lang/lv/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Saglabāt iestatījumus',
     'notifications_update_success' => 'Paziņojumu iestatījumi ir atjaunoti!',
     'notifications_watched' => 'Vērotie un ignorētie vienumi',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Piekļuve un drošība',
     'auth_change_password' => 'Mainīt paroli',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index 53c764ed64f..cb38482da98 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Pedējoreiz kļūda:',
     'webhooks_last_error_message' => 'Pēdējais kļūdas paziņojums:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/nb/preferences.php b/lang/nb/preferences.php
index 502a343428c..245c9c954f1 100644
--- a/lang/nb/preferences.php
+++ b/lang/nb/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Lagre innstillinger',
     'notifications_update_success' => 'Varslingsinnstillingene er oppdatert!',
     'notifications_watched' => 'Overvåka & ignorerte elementer',
-    'notifications_watched_desc' => ' Nedenfor er elementene som har egendefinerte varslingsinnstillinger i bruk. For å oppdatere innstillingene for disse, se elementet, finn varslingsalternativene i sidepanelet.',
+    'notifications_watched_desc' => 'Nedenfor er elementene som har egendefinerte varslingsinnstillinger i bruk. For å oppdatere innstillingene for disse, se elementet, finn varslingsalternativene i sidepanelet.',
 
     'auth' => 'Tilgang og sikkerhet',
     'auth_change_password' => 'Endre passord',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index f1f2adbe83a..e426eca4ac3 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Siste feil:',
     'webhooks_last_error_message' => 'Siste feilmelding:',
 
+    // Licensing
+    'licenses' => 'Lisenser',
+    'licenses_desc' => 'Denne siden detaljerer lisensinformasjonen for BookStack, i tillegg til prosjektene & bibliotekene som brukes i BookStack. Mange av de oppførte prosjektene kan bare brukes i utviklingssammenheng.',
+    'licenses_bookstack' => 'BookStack lisens',
+    'licenses_php' => 'PHP Bibliotek lisenser',
+    'licenses_js' => 'JavaScript bibliotek-lisenser',
+    'licenses_other' => 'Andre lisenser',
+    'license_details' => 'Lisens detaljer',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index e81d31ccb4d..a0dc79ab1e0 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -40,7 +40,7 @@
 
     // Login auto-initiation
     'auto_init_starting' => 'Poging tot inloggen',
-    'auto_init_starting_desc' => 'We maken contact met uw authenticatiesysteem om het inlogproces te starten. Als er na 5 seconden geen vooruitgang is, kunt u proberen op de onderstaande link te klikken.',
+    'auto_init_starting_desc' => 'We maken contact met jouw authenticatiesysteem om het inlogproces te starten. Als er na 5 seconden geen vooruitgang is, kun je proberen op de onderstaande link te klikken.',
     'auto_init_start_link' => 'Ga verder met authenticatie',
 
     // Password Reset
@@ -59,10 +59,10 @@
     'email_confirm_text' => 'Bevestig je e-mailadres door op onderstaande knop te drukken:',
     'email_confirm_action' => 'Bevestig je e-mail',
     'email_confirm_send_error' => 'Een e-mailbevestiging is vereist, maar het systeem kon de e-mail niet verzenden. Neem contact op met de beheerder.',
-    'email_confirm_success' => 'Uw e-mailadres is bevestigd! U zou nu moeten kunnen inloggen met dit e-mailadres.',
+    'email_confirm_success' => 'Je e-mailadres is bevestigd! Je zou nu moeten kunnen inloggen met dit e-mailadres.',
     'email_confirm_resent' => 'Bevestigingsmail opnieuw verzonden, controleer je inbox.',
     'email_confirm_thanks' => 'Bedankt voor de bevestiging!',
-    'email_confirm_thanks_desc' => 'Wacht even terwijl uw bevestiging wordt behandeld. Als u na 3 seconden niet wordt doorverwezen, drukt u op de onderstaande link "Doorgaan" om verder te gaan.',
+    'email_confirm_thanks_desc' => 'Wacht even terwijl jouw bevestiging wordt behandeld. Als je na 3 seconden niet wordt doorverwezen, druk dan op de onderstaande link "Doorgaan" om verder te gaan.',
 
     'email_not_confirmed' => 'E-mailadres nog niet bevestigd',
     'email_not_confirmed_text' => 'Je e-mailadres is nog niet bevestigd.',
@@ -78,40 +78,40 @@
     'user_invite_page_welcome' => 'Welkom bij :appName!',
     'user_invite_page_text' => 'Om je account af te ronden en toegang te krijgen moet je een wachtwoord instellen dat gebruikt wordt om in te loggen op :appName bij toekomstige bezoeken.',
     'user_invite_page_confirm_button' => 'Bevestig wachtwoord',
-    'user_invite_success_login' => 'Wachtwoord ingesteld, u zou nu moeten kunnen inloggen met uw ingestelde wachtwoord om toegang te krijgen tot :appName!',
+    'user_invite_success_login' => 'Wachtwoord ingesteld, je zou nu moeten kunnen inloggen met je ingestelde wachtwoord om toegang te krijgen tot :appName!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'Multi-factor authenticatie instellen',
-    'mfa_setup_desc' => 'Stel multi-factor authenticatie in als een extra beveiligingslaag voor uw gebruikersaccount.',
+    'mfa_setup_desc' => 'Stel multi-factor authenticatie in als een extra beveiligingslaag voor je gebruikersaccount.',
     'mfa_setup_configured' => 'Reeds geconfigureerd',
     'mfa_setup_reconfigure' => 'Herconfigureren',
     'mfa_setup_remove_confirmation' => 'Weet je zeker dat je deze multi-factor authenticatie methode wilt verwijderen?',
     'mfa_setup_action' => 'Instellen',
-    'mfa_backup_codes_usage_limit_warning' => 'U heeft minder dan 5 back-upcodes over. Genereer en sla een nieuwe set op voordat je geen codes meer hebt om te voorkomen dat je buiten je account wordt gesloten.',
+    'mfa_backup_codes_usage_limit_warning' => 'Je hebt minder dan 5 back-upcodes over. Genereer en sla een nieuwe set op voordat je geen codes meer hebt om te voorkomen dat je buiten je account wordt gesloten.',
     'mfa_option_totp_title' => 'Mobiele app',
-    'mfa_option_totp_desc' => 'Om multi-factor authenticatie te gebruiken heeft u een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'Om multi-factor authenticatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Back-up Codes',
-    'mfa_option_backup_codes_desc' => 'Bewaar veilig een set eenmalige back-upcodes die u kunt invoeren om uw identiteit te verifiëren.',
+    'mfa_option_backup_codes_desc' => 'Bewaar veilig een set eenmalige back-upcodes die je kunt invoeren om je identiteit te verifiëren.',
     'mfa_gen_confirm_and_enable' => 'Bevestigen en inschakelen',
     'mfa_gen_backup_codes_title' => 'Back-up codes instellen',
     'mfa_gen_backup_codes_desc' => 'Bewaar de onderstaande lijst met codes op een veilige plaats. Bij toegang tot het systeem kun je een van de codes gebruiken als tweede verificatiemechanisme.',
     'mfa_gen_backup_codes_download' => 'Download Codes',
     'mfa_gen_backup_codes_usage_warning' => 'Elke code kan slechts eenmaal gebruikt worden',
     'mfa_gen_totp_title' => 'Mobiele app installatie',
-    'mfa_gen_totp_desc' => 'Om multi-factor authenticatie te gebruiken heeft u een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan de onderstaande QR-code door gebruik te maken van uw favoriete authenticatie app om aan de slag te gaan.',
+    'mfa_gen_totp_desc' => 'Om multi-factor authenticatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan de onderstaande QR-code door gebruik te maken van je favoriete authenticatie-app om aan de slag te gaan.',
     'mfa_gen_totp_verify_setup' => 'Installatie verifiëren',
-    'mfa_gen_totp_verify_setup_desc' => 'Controleer of alles werkt door het invoeren van een code, die wordt gegenereerd binnen uw authenticatie-app, in het onderstaande invoerveld:',
-    'mfa_gen_totp_provide_code_here' => 'Geef uw app gegenereerde code hier',
+    'mfa_gen_totp_verify_setup_desc' => 'Controleer of alles werkt door het invoeren van een code, die wordt gegenereerd binnen je authenticatie-app, in het onderstaande invoerveld:',
+    'mfa_gen_totp_provide_code_here' => 'Vul je app-gegenereerde code hier in',
     'mfa_verify_access' => 'Verifieer toegang',
-    'mfa_verify_access_desc' => 'Uw gebruikersaccount vereist dat u uw identiteit bevestigt via een extra verificatieniveau voordat u toegang krijgt. Verifieer met een van de door u geconfigureerde methoden om verder te gaan.',
+    'mfa_verify_access_desc' => 'Je moet jouw identiteit bevestigen via een extra verificatieniveau voordat je toegang krijgt tot je gebruikersaccount. Verifieer met een van de door u geconfigureerde methoden om verder te gaan.',
     'mfa_verify_no_methods' => 'Geen methode geconfigureerd',
-    'mfa_verify_no_methods_desc' => 'Er konden geen meervoudige verificatie methoden voor uw account gevonden worden. Je zult minstens één methode moeten instellen voordat u toegang krijgt.',
+    'mfa_verify_no_methods_desc' => 'Er konden geen meervoudige verificatie methoden voor je account gevonden worden. Je zult minstens één methode moeten instellen voordat je toegang krijgt.',
     'mfa_verify_use_totp' => 'Verifieer met een mobiele app',
     'mfa_verify_use_backup_codes' => 'Verifieer met een back-up code',
     'mfa_verify_backup_code' => 'Back-up code',
-    'mfa_verify_backup_code_desc' => 'Voer een van uw resterende back-up codes hieronder in:',
+    'mfa_verify_backup_code_desc' => 'Voer één van je resterende back-up codes hieronder in:',
     'mfa_verify_backup_code_enter_here' => 'Voer hier de back-up code in',
-    'mfa_verify_totp_desc' => 'Voer de code, gegenereerd met uw mobiele app, hieronder in:',
+    'mfa_verify_totp_desc' => 'Voer de code, gegenereerd met je mobiele app, hieronder in:',
     'mfa_setup_login_notification' => 'Meervoudige verificatie methode geconfigureerd, Gelieve opnieuw in te loggen met de geconfigureerde methode.',
 ];
diff --git a/lang/nl/components.php b/lang/nl/components.php
index 852a7ea85fe..a7fdc3725ec 100644
--- a/lang/nl/components.php
+++ b/lang/nl/components.php
@@ -23,7 +23,7 @@
     'image_load_more' => 'Laad meer',
     'image_image_name' => 'Afbeeldingsnaam',
     'image_delete_used' => 'Deze afbeelding is op onderstaande pagina\'s in gebruik.',
-    'image_delete_confirm_text' => 'Weet u zeker dat u deze afbeelding wilt verwijderen?',
+    'image_delete_confirm_text' => 'Weet je zeker dat je deze afbeelding wilt verwijderen?',
     'image_select_image' => 'Kies afbeelding',
     'image_dropzone' => 'Sleep afbeeldingen naar hier of klik hier om te uploaden',
     'image_dropzone_drop' => 'Sleep hier de afbeeldingen naar toe',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index 4c20c8ea215..481f99ded38 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -143,7 +143,7 @@
     'source' => 'Bron',
     'alt_desc' => 'Alternatieve beschrijving',
     'embed' => 'Insluiten',
-    'paste_embed' => 'Plak uw insluitcode hieronder:',
+    'paste_embed' => 'Plak jouw insluitcode hieronder:',
     'url' => 'URL',
     'text_to_display' => 'Weer te geven tekst',
     'title' => 'Titel',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 8236a6a8e63..23e5c97505f 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -104,7 +104,7 @@
     'shelves_delete' => 'Verwijder Boekenplank',
     'shelves_delete_named' => 'Verwijder Boekenplank :name',
     'shelves_delete_explain' => "Dit zal de boekenplank met de naam ':naam' verwijderen. Boeken die op deze plank staan worden echter niet verwijderd.",
-    'shelves_delete_confirmation' => 'Weet u zeker dat u deze boekenplank wilt verwijderen?',
+    'shelves_delete_confirmation' => 'Weet je zeker dat je deze boekenplank wilt verwijderen?',
     'shelves_permissions' => 'Boekenplank Machtigingen',
     'shelves_permissions_updated' => 'Boekenplank Machtigingen Bijgewerkt',
     'shelves_permissions_active' => 'Machtigingen op Boekenplank Actief',
@@ -228,7 +228,7 @@
     'pages_edit_enter_changelog_desc' => 'Geef een korte omschrijving van de wijzigingen die je gemaakt hebt',
     'pages_edit_enter_changelog' => 'Voeg toe aan logboek',
     'pages_editor_switch_title' => 'Schakel Bewerker',
-    'pages_editor_switch_are_you_sure' => 'Weet u zeker dat u de bewerker voor deze pagina wilt wijzigen?',
+    'pages_editor_switch_are_you_sure' => 'Weet je zeker dat je de bewerker voor deze pagina wilt wijzigen?',
     'pages_editor_switch_consider_following' => 'Houd rekening met het volgende als u van bewerker verandert:',
     'pages_editor_switch_consideration_a' => 'Eenmaal opgeslagen, zal de nieuwe bewerker keuze gebruikt worden door alle toekomstige gebruikers, ook diegene die zelf niet van bewerker type kunnen veranderen.',
     'pages_editor_switch_consideration_b' => 'Dit kan mogelijks tot een verlies van detail en syntax leiden in bepaalde omstandigheden.',
@@ -244,7 +244,7 @@
     'pages_md_show_preview' => 'Toon voorbeeld',
     'pages_md_sync_scroll' => 'Synchroniseer scrollen van voorbeeld',
     'pages_drawing_unsaved' => 'Niet-opgeslagen Tekening Gevonden',
-    'pages_drawing_unsaved_confirm' => 'Er zijn niet-opgeslagen tekeninggegevens gevonden van een eerdere mislukte poging om de tekening op te slaan. Wilt u deze niet-opgeslagen tekening herstellen en verder bewerken?',
+    'pages_drawing_unsaved_confirm' => 'Er zijn niet-opgeslagen tekeninggegevens gevonden van een eerdere mislukte poging om de tekening op te slaan. Wil je deze niet-opgeslagen tekening herstellen en verder bewerken?',
     'pages_not_in_chapter' => 'Pagina is niet in een hoofdstuk',
     'pages_move' => 'Pagina verplaatsten',
     'pages_copy' => 'Pagina kopiëren',
@@ -254,7 +254,7 @@
     'pages_permissions_success' => 'Pagina machtigingen bijgewerkt',
     'pages_revision' => 'Revisie',
     'pages_revisions' => 'Pagina revisies',
-    'pages_revisions_desc' => 'Hieronder staan alle vorige versies van deze pagina. U kunt oude paginaversies terugkijken, vergelijken en herstellen indien de rechten dit toelaten. De volledige geschiedenis van de pagina wordt hier mogelijk niet volledig weergegeven omdat, afhankelijk van de systeemconfiguratie, oude versies al automatisch verwijderd kunnen zijn.',
+    'pages_revisions_desc' => 'Hieronder staan alle vorige versies van deze pagina. Je kunt oude paginaversies terugkijken, vergelijken en herstellen indien de rechten dit toelaten. De volledige geschiedenis van de pagina wordt hier mogelijk niet volledig weergegeven omdat, afhankelijk van de systeemconfiguratie, oude versies al automatisch verwijderd kunnen zijn.',
     'pages_revisions_named' => 'Pagina revisies voor :pageName',
     'pages_revision_named' => 'Pagina revisie voor :pageName',
     'pages_revision_restored_from' => 'Hersteld van #:id; :samenvatting',
@@ -284,7 +284,7 @@
     'pages_references_update_revision' => 'Automatische systeemupdate van interne links',
     'pages_initial_name' => 'Nieuwe pagina',
     'pages_editing_draft_notification' => 'U bewerkt momenteel een concept dat voor het laatst is opgeslagen op :timeDiff.',
-    'pages_draft_edited_notification' => 'Deze pagina is sindsdien bijgewerkt. Het wordt aanbevolen dat u dit concept verwijderd.',
+    'pages_draft_edited_notification' => 'Deze pagina is sindsdien bijgewerkt. Het wordt aanbevolen dat je dit concept verwijderd.',
     'pages_draft_page_changed_since_creation' => 'Deze pagina is bijgewerkt sinds het aanmaken van dit concept. Het wordt aanbevolen dat u dit concept verwijdert of ervoor zorgt dat u wijzigingen op de pagina niet overschrijft.',
     'pages_draft_edit_active' => [
         'start_a' => ':count gebruikers zijn begonnen deze pagina te bewerken',
@@ -309,7 +309,7 @@
     'tags_index_desc' => 'Labels kunnen worden toegepast op inhoud binnen het systeem om een flexibele vorm van categorisering toe te passen. Labels kunnen zowel een sleutel als een waarde hebben, waarbij de waarde optioneel is. Eenmaal toegepast, kan de inhoud worden opgevraagd aan de hand van de naam en de waarde van het label.',
     'tag_name' =>  'Labelnaam',
     'tag_value' => 'Labelwaarde (Optioneel)',
-    'tags_explain' => "Voeg enkele labels toe om uw inhoud beter te categoriseren. \nJe kunt een waarde aan een label toekennen voor een meer gedetailleerde organisatie.",
+    'tags_explain' => "Voeg enkele labels toe om jouw inhoud beter te categoriseren. \nJe kunt een waarde aan een label toekennen voor een meer gedetailleerde organisatie.",
     'tags_add' => 'Voeg nog een label toe',
     'tags_remove' => 'Verwijder deze label',
     'tags_usages' => 'Totaal aantal label-toepassingen',
@@ -327,9 +327,9 @@
     'attachments_explain_instant_save' => 'Wijzigingen worden meteen opgeslagen.',
     'attachments_upload' => 'Bestand uploaden',
     'attachments_link' => 'Link toevoegen',
-    'attachments_upload_drop' => 'Je kan ook een bestand hiernaartoe slepen om het als bijlage to uploaden.',
+    'attachments_upload_drop' => 'Je kan ook een bestand hiernaartoe slepen om het als bijlage te uploaden.',
     'attachments_set_link' => 'Zet link',
-    'attachments_delete' => 'Weet u zeker dat u deze bijlage wilt verwijderen?',
+    'attachments_delete' => 'Weet je zeker dat je deze bijlage wilt verwijderen?',
     'attachments_dropzone' => 'Sleep hier de bestanden naar toe',
     'attachments_no_files' => 'Er zijn geen bestanden geüpload',
     'attachments_explain_link' => 'Je kunt een hyperlink toevoegen als je geen bestanden wilt uploaden. Dit kan een link naar een andere pagina op deze website zijn, maar ook een link naar een andere website.',
@@ -382,8 +382,8 @@
     'comment_editor_explain' => 'Hier zijn de opmerkingen die zijn achtergelaten op deze pagina. Opmerkingen kunnen worden toegevoegd en beheerd wanneer u de opgeslagen pagina bekijkt.',
 
     // Revision
-    'revision_delete_confirm' => 'Weet u zeker dat u deze revisie wilt verwijderen?',
-    'revision_restore_confirm' => 'Weet u zeker dat u deze revisie wilt herstellen? De huidige pagina-inhoud wordt vervangen.',
+    'revision_delete_confirm' => 'Weet je zeker dat je deze revisie wilt verwijderen?',
+    'revision_restore_confirm' => 'Weet je zeker dat je deze revisie wilt herstellen? De huidige pagina-inhoud wordt vervangen.',
     'revision_cannot_delete_latest' => 'Kan de laatste revisie niet verwijderen.',
 
     // Copy view
@@ -396,7 +396,7 @@
 
     // Conversions
     'convert_to_shelf' => 'Converteer naar Boekenplank',
-    'convert_to_shelf_contents_desc' => 'U kunt dit boek converteren naar een nieuwe boekenplank met dezelfde inhoud. Hoofdstukken in dit boek zullen worden geconverteerd naar nieuwe boeken. Als dit boek pagina\'s bevat, die niet in een hoofdstuk staan, zal dit boek een nieuwe naam krijgen en deze pagina\'s bevatten, en zal dit boek deel gaan uitmaken van de nieuwe boekenplank.',
+    'convert_to_shelf_contents_desc' => 'Je kunt dit boek converteren naar een nieuwe boekenplank met dezelfde inhoud. Hoofdstukken in dit boek zullen worden geconverteerd naar nieuwe boeken. Als dit boek pagina\'s bevat, die niet in een hoofdstuk staan, zal dit boek een nieuwe naam krijgen en deze pagina\'s bevatten, en zal dit boek deel gaan uitmaken van de nieuwe boekenplank.',
     'convert_to_shelf_permissions_desc' => 'Elke machtiging ingesteld op dit boek zal gekopieerd worden naar de nieuwe boekenplank en naar alle nieuwe onderliggende boeken die geen eigen machtiging hebben afgedwongen. Merk op dat boekenplank-machtigingen niet automatisch overdragen naar inhoud binnenin de boekenplank, zoals dat wel gebeurd bij boeken.',
     'convert_book' => 'Converteer Boek',
     'convert_book_confirm' => 'Weet je zeker dat je dit boek wil converteren?',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index ba39e0a697c..74b14e08d73 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -5,8 +5,8 @@
 return [
 
     // Permissions
-    'permission' => 'U heeft geen machtiging om de gevraagde pagina te openen.',
-    'permissionJson' => 'U heeft geen machtiging om de gevraagde actie uit te voeren.',
+    'permission' => 'Je hebt geen machtiging om de gevraagde pagina te openen.',
+    'permissionJson' => 'Je hebt geen machtiging om de gevraagde actie uit te voeren.',
 
     // Auth
     'error_user_exists_different_creds' => 'Er bestaat al een gebruiker met het e-mailadres :email, maar met andere inloggegevens.',
@@ -36,7 +36,7 @@
     'social_account_register_instructions' => 'Als je nog geen account hebt, kun je je registreren met de :socialAccount optie.',
     'social_driver_not_found' => 'Social driver niet gevonden',
     'social_driver_not_configured' => 'Je :socialAccount instellingen zijn niet correct geconfigureerd.',
-    'invite_token_expired' => 'Deze uitnodigingslink is verlopen. U kunt in plaats daarvan proberen uw wachtwoord opnieuw in te stellen.',
+    'invite_token_expired' => 'Deze uitnodigingslink is verlopen. Je kunt in plaats daarvan proberen je wachtwoord opnieuw in te stellen.',
 
     // System
     'path_not_writable' => 'Bestandspad :filePath kon niet naar geüpload worden. Zorg dat je schrijfrechten op de server hebt.',
@@ -53,7 +53,7 @@
     'image_upload_memory_limit' => 'Het uploaden van afbeeldingen en/of het maken van miniaturen is mislukt vanwege te beperkte systeemmiddelen.',
     'image_thumbnail_memory_limit' => 'Het maken van variaties in afbeeldingsgrootte is mislukt vanwege te beperkte systeemmiddelen.',
     'image_gallery_thumbnail_memory_limit' => 'Het maken van galerij miniaturen is mislukt vanwege te beperkte systeemmiddelen.',
-    'drawing_data_not_found' => 'De gegevens van de tekening konden niet worden geladen. Het tekenbestand bestaat misschien niet meer of u hebt geen machtiging om het te openen.',
+    'drawing_data_not_found' => 'De gegevens van de tekening konden niet worden geladen. Het tekenbestand bestaat misschien niet meer of je hebt geen machtiging om het te openen.',
 
     // Attachments
     'attachment_not_found' => 'Bijlage niet gevonden',
@@ -86,7 +86,7 @@
 
     // Comments
     'comment_list' => 'Er is een fout opgetreden tijdens het ophalen van de reacties.',
-    'cannot_add_comment_to_draft' => 'U kunt geen reacties toevoegen aan een concept.',
+    'cannot_add_comment_to_draft' => 'Je kunt geen reacties toevoegen aan een concept.',
     'comment_add' => 'Er is een fout opgetreden tijdens het aanpassen / toevoegen van de reactie.',
     'comment_delete' => 'Er is een fout opgetreden tijdens het verwijderen van de reactie.',
     'empty_comment' => 'Kan geen lege reactie toevoegen.',
@@ -94,10 +94,10 @@
     // Error pages
     '404_page_not_found' => 'Pagina Niet Gevonden',
     'sorry_page_not_found' => 'Sorry, de pagina die je zocht kan niet gevonden worden.',
-    'sorry_page_not_found_permission_warning' => 'Als u verwachtte dat deze pagina zou bestaan, hebt u misschien geen machtiging om deze te bekijken.',
+    'sorry_page_not_found_permission_warning' => 'Als je verwachtte dat deze pagina zou bestaan, heb je misschien geen machtiging om deze te bekijken.',
     'image_not_found' => 'Afbeelding niet gevonden',
     'image_not_found_subtitle' => 'Sorry, de afbeelding die je zocht is niet beschikbaar.',
-    'image_not_found_details' => 'Als u verwachtte dat deze afbeelding zou bestaan, dan is deze misschien verwijderd.',
+    'image_not_found_details' => 'Als je verwachtte dat deze afbeelding zou bestaan, dan is deze misschien verwijderd.',
     'return_home' => 'Terug naar home',
     'error_occurred' => 'Er Ging Iets Fout',
     'app_down' => ':appName is nu niet beschikbaar',
diff --git a/lang/nl/notifications.php b/lang/nl/notifications.php
index 79c7e7e8b73..bc5f380c3cf 100644
--- a/lang/nl/notifications.php
+++ b/lang/nl/notifications.php
@@ -22,6 +22,6 @@
     'action_view_comment' => 'Bekijk Opmerking',
     'action_view_page' => 'Bekijk Pagina',
 
-    'footer_reason' => 'Deze melding is naar u verzonden omdat :link dit type activiteit voor dit artikel dekt.',
+    'footer_reason' => 'Deze melding is naar je verzonden omdat :link dit type activiteit voor dit artikel dekt.',
     'footer_reason_link' => 'je meldingsvoorkeuren',
 ];
diff --git a/lang/nl/passwords.php b/lang/nl/passwords.php
index 1f1d71925f8..1781256f254 100644
--- a/lang/nl/passwords.php
+++ b/lang/nl/passwords.php
@@ -8,7 +8,7 @@
 
     'password' => 'Wachtwoorden moeten uit ten minste acht tekens bestaan en overeenkomen met de bevestiging.',
     'user' => "We kunnen niemand vinden met dat e-mailadres.",
-    'token' => 'Het wachtwoord reset token is ongeldig voor dit e-mailadres.',
+    'token' => 'De wachtwoord reset token is ongeldig voor dit e-mailadres.',
     'sent' => 'We hebben je een link gestuurd om je wachtwoord te herstellen!',
     'reset' => 'Je wachtwoord is hersteld!',
 
diff --git a/lang/nl/preferences.php b/lang/nl/preferences.php
index 41ed3c547f7..5e385276c1a 100644
--- a/lang/nl/preferences.php
+++ b/lang/nl/preferences.php
@@ -9,8 +9,8 @@
 
     'shortcuts' => 'Snelkoppelingen',
     'shortcuts_interface' => 'Snelkoppelingen',
-    'shortcuts_toggle_desc' => 'Hier kunt u toetscombinaties voor de gebruikersinterface in- of uitschakelen voor navigatie en acties.',
-    'shortcuts_customize_desc' => 'U kunt elk van de onderstaande toetsencombinaties aanpassen. Druk simpelweg op de gewenste toetscombinatie na het selecteren van de invoer voor een toetscombinatie.',
+    'shortcuts_toggle_desc' => 'Hier kun je toetscombinaties voor de gebruikersinterface in- of uitschakelen voor navigatie en acties.',
+    'shortcuts_customize_desc' => 'Je kunt elk van de onderstaande toetsencombinaties aanpassen. Druk simpelweg op de gewenste toetscombinatie na het selecteren van de invoer voor een toetscombinatie.',
     'shortcuts_toggle_label' => 'Toetsencombinaties ingeschakeld',
     'shortcuts_section_navigation' => 'Navigatie',
     'shortcuts_section_actions' => 'Gebruikelijke acties',
@@ -27,11 +27,11 @@
     'notifications_save' => 'Voorkeuren opslaan',
     'notifications_update_success' => 'Voorkeuren voor meldingen zijn bijgewerkt!',
     'notifications_watched' => 'Gevolgde & Genegeerde Items',
-    'notifications_watched_desc' => ' Hieronder staan de items waarvoor aangepaste \'Volg\'-voorkeuren zijn toegepast. Om je voorkeuren voor deze items bij te werken, bekijk je het item en zoek je naar de \'Volg\' opties in de zijbalk.',
+    'notifications_watched_desc' => 'Hieronder staan de items waarvoor aangepaste \'Volg\'-voorkeuren zijn toegepast. Om je voorkeuren voor deze items bij te werken, bekijk je het item en zoek je naar de \'Volg\' opties in de zijbalk.',
 
     'auth' => 'Toegang & Beveiliging',
     'auth_change_password' => 'Wachtwoord Wijzigen',
-    'auth_change_password_desc' => 'Wijzig hier je wachtwoord om in te loggen op de applicatie. Minstens 8 tekens gebruiken.',
+    'auth_change_password_desc' => 'Wijzig hier je wachtwoord die je gebruikt om in te loggen op de applicatie. Gebruik minimaal 8 tekens.',
     'auth_change_password_success' => 'Wachtwoord is bijgewerkt!',
 
     'profile' => 'Profielgegevens',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 340d1d899d9..828036c1b4e 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -39,7 +39,7 @@
     'app_homepage_desc' => 'Selecteer een weergave om weer te geven op de startpagina in plaats van de standaard weergave. Paginamachtigingen worden genegeerd voor geselecteerde pagina\'s.',
     'app_homepage_select' => 'Selecteer een pagina',
     'app_footer_links' => 'Voettekst hyperlinks',
-    'app_footer_links_desc' => 'Voeg hyperlinks toe aan de voettekst van de applicatie. Deze zullen onderaan de meeste pagina\'s getoond worden, ook aan pagina\'s die geen login vereisen. U kunt een label van "trans::<key>" gebruiken om systeem-gedefinieerde vertalingen te gebruiken. Bijvoorbeeld: Het gebruik van "trans::common.privacy_policy" zal de vertaalde tekst "Privacy Policy" opleveren en "trans::common.terms_of_service" zal de vertaalde tekst "Gebruiksvoorwaarden" opleveren.',
+    'app_footer_links_desc' => 'Voeg hyperlinks toe aan de voettekst van de applicatie. Deze zullen onderaan de meeste pagina\'s getoond worden, ook aan pagina\'s die geen login vereisen. Je kunt een label van "trans::<key>" gebruiken om systeem-gedefinieerde vertalingen te gebruiken. Bijvoorbeeld: Het gebruik van "trans::common.privacy_policy" zal de vertaalde tekst "Privacy Policy" opleveren en "trans::common.terms_of_service" zal de vertaalde tekst "Gebruiksvoorwaarden" opleveren.',
     'app_footer_links_label' => 'Link label',
     'app_footer_links_url' => 'Link URL',
     'app_footer_links_add' => 'Voettekst link toevoegen',
@@ -80,7 +80,7 @@
     'maint_image_cleanup_desc' => 'Scant pagina- en revisie inhoud om te controleren welke afbeeldingen en tekeningen momenteel worden gebruikt en welke afbeeldingen overbodig zijn. Zorg ervoor dat je een volledige database- en afbeelding back-up maakt voordat je dit uitvoert.',
     'maint_delete_images_only_in_revisions' => 'Ook afbeeldingen verwijderen die alleen in oude pagina revisies bestaan',
     'maint_image_cleanup_run' => 'Opschonen uitvoeren',
-    'maint_image_cleanup_warning' => ':count potentieel ongebruikte afbeeldingen gevonden. Weet u zeker dat u deze afbeeldingen wilt verwijderen?',
+    'maint_image_cleanup_warning' => ':count potentieel ongebruikte afbeeldingen gevonden. Weet je zeker dat je deze afbeeldingen wilt verwijderen?',
     'maint_image_cleanup_success' => ':count potentieel ongebruikte afbeeldingen gevonden en verwijderd!',
     'maint_image_cleanup_nothing_found' => 'Geen ongebruikte afbeeldingen gevonden, niets verwijderd!',
     'maint_send_test_email' => 'Stuur een test e-mail',
@@ -99,7 +99,7 @@
 
     // Recycle Bin
     'recycle_bin' => 'Prullenbak',
-    'recycle_bin_desc' => 'Hier kunt u items herstellen die zijn verwijderd of ervoor kiezen om ze permanent uit het systeem te verwijderen. Deze lijst is ongefilterd, in tegenstelling tot vergelijkbare activiteitenlijsten in het systeem waar machtigingenfilters worden toegepast.',
+    'recycle_bin_desc' => 'Hier kun je items herstellen die zijn verwijderd of ervoor kiezen om ze permanent uit het systeem te verwijderen. Deze lijst is ongefilterd, in tegenstelling tot vergelijkbare activiteitenlijsten in het systeem waar machtigingenfilters worden toegepast.',
     'recycle_bin_deleted_item' => 'Verwijderde Item',
     'recycle_bin_deleted_parent' => 'Bovenliggende',
     'recycle_bin_deleted_by' => 'Verwijderd door',
@@ -108,7 +108,7 @@
     'recycle_bin_restore' => 'Herstellen',
     'recycle_bin_contents_empty' => 'De prullenbak is momenteel leeg',
     'recycle_bin_empty' => 'Prullenbak legen',
-    'recycle_bin_empty_confirm' => 'Dit zal permanent alle items in de prullenbak vernietigen, inclusief de inhoud die in elk item zit. Weet u zeker dat u de prullenbak wilt legen?',
+    'recycle_bin_empty_confirm' => 'Dit zal permanent alle items in de prullenbak vernietigen, inclusief de inhoud die in elk item zit. Weet je zeker dat je de prullenbak wil legen?',
     'recycle_bin_destroy_confirm' => 'Deze actie zal dit item permanent verwijderen uit het systeem, samen met onderstaande onderliggende elementen, en u zal deze inhoud niet kunnen herstellen. Bent u zeker dat u dit item permanent wilt verwijderen?',
     'recycle_bin_destroy_list' => 'Te vernietigen items',
     'recycle_bin_restore_list' => 'Items te herstellen',
@@ -190,7 +190,7 @@
     'users_role_desc' => 'Selecteer aan welke rollen deze gebruiker zal worden toegewezen. Als een gebruiker aan meerdere rollen wordt toegewezen, worden de machtigingen van die rollen samengevoegd en krijgt hij alle mogelijkheden van de toegewezen rollen.',
     'users_password' => 'Wachtwoord gebruiker',
     'users_password_desc' => 'Stel een wachtwoord in om op de applicatie in te loggen. Dit moet minstens 8 tekens lang zijn.',
-    'users_send_invite_text' => 'U kunt ervoor kiezen om deze gebruiker een uitnodigingsmail te sturen waarmee hij zijn eigen wachtwoord kan instellen, anders kunt u zelf zijn wachtwoord instellen.',
+    'users_send_invite_text' => 'Je kunt ervoor kiezen om deze gebruiker een uitnodigingsmail te sturen waarmee hij zijn eigen wachtwoord kan instellen, anders kun je zelf zijn wachtwoord instellen.',
     'users_send_invite_option' => 'Stuur gebruiker uitnodigings e-mail',
     'users_external_auth_id' => 'Externe authenticatie ID',
     'users_external_auth_id_desc' => 'Wanneer een extern authenticatiesysteem wordt gebruikt (zoals SAML2, OIDC of LDAP) is dit de ID die deze BookStack-gebruiker koppelt aan het account van het authenticatiesysteem. Je kunt dit veld negeren als je de standaard op e-mail gebaseerde verificatie gebruikt.',
@@ -211,7 +211,7 @@
     'users_preferred_language_desc' => 'Deze optie wijzigt de taal die gebruikt wordt voor de gebruikersinterface. Dit heeft geen invloed op door gebruiker gemaakte inhoud.',
     'users_social_accounts' => 'Sociale media accounts',
     'users_social_accounts_desc' => 'Bekijk de status van de verbonden socialmedia-accounts voor deze gebruiker. socialmedia-accounts kunnen worden gebruikt naast het primaire authenticatiesysteem voor systeemtoegang.',
-    'users_social_accounts_info' => 'Hier kunt u uw andere accounts koppelen om sneller en eenvoudiger in te loggen. Als u hier een account loskoppelt, wordt de eerder gemachtigde toegang niet ingetrokken. U kunt de toegang intrekken via uw profielinstellingen op het gekoppelde socialemedia-account zelf.',
+    'users_social_accounts_info' => 'Hier kun je je andere accounts koppelen om sneller en eenvoudiger in te loggen. Als je hier een account loskoppelt, wordt de eerder gemachtigde toegang niet ingetrokken. Je kunt de toegang intrekken via je profielinstellingen op het gekoppelde socialemedia-account zelf.',
     'users_social_connect' => 'Account Verbinden',
     'users_social_disconnect' => 'Account Ontkoppelen',
     'users_social_status_connected' => 'Verbonden',
@@ -225,7 +225,7 @@
     'users_api_tokens_expires' => 'Verloopt',
     'users_api_tokens_docs' => 'API-Documentatie',
     'users_mfa' => 'Meervoudige Verificatie',
-    'users_mfa_desc' => 'Stel meervoudige verificatie in als extra beveiligingslaag voor uw gebruikersaccount.',
+    'users_mfa_desc' => 'Stel meervoudige verificatie in als extra beveiligingslaag voor je gebruikersaccount.',
     'users_mfa_x_methods' => ':count methode geconfigureerd|:count methoden geconfigureerd',
     'users_mfa_configure' => 'Configureer methoden',
 
@@ -245,7 +245,7 @@
     'user_api_token_updated' => 'Token :timeAgo geleden bijgewerkt',
     'user_api_token_delete' => 'Token Verwijderen',
     'user_api_token_delete_warning' => 'Dit zal de API-token met de naam \':tokenName\' volledig uit het systeem verwijderen.',
-    'user_api_token_delete_confirm' => 'Weet u zeker dat u deze API-token wilt verwijderen?',
+    'user_api_token_delete_confirm' => 'Weet je zeker dat je deze API-token wilt verwijderen?',
 
     // Webhooks
     'webhooks' => 'Webhooks',
@@ -268,7 +268,7 @@
     'webhook_events_table_header' => 'Gebeurtenissen',
     'webhooks_delete' => 'Verwijder Webhook',
     'webhooks_delete_warning' => 'Dit zal de webhook met naam \':webhookName\' volledig verwijderen van het systeem.',
-    'webhooks_delete_confirm' => 'Weet u zeker dat u deze webhook wil verwijderen?',
+    'webhooks_delete_confirm' => 'Weet je zeker dat je deze webhook wilt verwijderen?',
     'webhooks_format_example' => 'Voorbeeld Webhook Formaat',
     'webhooks_format_example_desc' => 'Webhook gegevens worden verzonden als een POST verzoek naar het geconfigureerde eindpunt als JSON volgens het onderstaande formaat. De "related_item" en "url" eigenschappen zijn optioneel en hangen af van het type gebeurtenis die geactiveerd wordt.',
     'webhooks_status' => 'Webhook Status',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Laatst Gefaald:',
     'webhooks_last_error_message' => 'Laatste Foutmelding:',
 
+    // Licensing
+    'licenses' => 'Licenties',
+    'licenses_desc' => 'Deze pagina beschrijft licentie-informatie voor BookStack naast de projecten & bibliotheken die binnen BookStack worden gebruikt. Veel van de vermelde projecten worden alleen in een ontwikkelingscontext gebruikt.',
+    'licenses_bookstack' => 'BookStack Licentie',
+    'licenses_php' => 'PHP Bibliotheek Licenties',
+    'licenses_js' => 'JavaScript Bibliotheek Licenties',
+    'licenses_other' => 'Andere Licenties',
+    'license_details' => 'Licentie Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/nn/preferences.php b/lang/nn/preferences.php
index 4e6e6c1ffd1..ac6dc1b77dc 100644
--- a/lang/nn/preferences.php
+++ b/lang/nn/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Lagre innstillinger',
     'notifications_update_success' => 'Varslingsinnstillingene er oppdatert!',
     'notifications_watched' => 'Overvåka & ignorerte elementer',
-    'notifications_watched_desc' => ' Nedenfor er elementene som har egendefinerte varslingsinnstillinger i bruk. For å oppdatere innstillingene for disse, se elementet, finn varslingsalternativene i sidepanelet.',
+    'notifications_watched_desc' => 'Nedenfor er elementene som har egendefinerte varslingsinnstillinger i bruk. For å oppdatere innstillingene for disse, se elementet, finn varslingsalternativene i sidepanelet.',
 
     'auth' => 'Tilgang og tryggleik',
     'auth_change_password' => 'Endre passord',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index ba8586ce2ed..df5399f90e1 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Siste feil:',
     'webhooks_last_error_message' => 'Siste feilmelding:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index fffb5499e0a..25f9e23c669 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Użytkownik pomyślnie usunięty',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'utworzył token API',
     'api_token_create_notification' => 'Token API został poprawnie utworzony',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'zaktualizował token API',
     'api_token_update_notification' => 'Token API został pomyślnie zaktualizowany',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'usunął token API',
     'api_token_delete_notification' => 'Token API został pomyślnie usunięty',
 
     // Roles
diff --git a/lang/pl/common.php b/lang/pl/common.php
index 2c176ff944f..e3feb2f02e4 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -20,7 +20,7 @@
     'description' => 'Opis',
     'role' => 'Rola',
     'cover_image' => 'Okładka',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Ten obraz powinien być o rozmiarze około 440x250px, chociaż zostanie elastycznie przeskalowany i przycięty, aby dopasować interfejs użytkownika do różnych scenariuszy w zależności od potrzeb, więc faktyczne wymiary wyświetlania będą się różnić.',
 
     // Actions
     'actions' => 'Akcje',
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index ca18521c250..f4ed4b5f2b5 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Właściwości tabeli',
     'table_properties_title' => 'Właściwości Tabeli',
     'delete_table' => 'Usuń tabelę',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Wyczyść formatowanie tabeli',
+    'resize_to_contents' => 'Dostosuj rozmiar do zawartości',
+    'row_header' => 'Wiersz nagłówka',
     'insert_row_before' => 'Wstaw wiersz przed',
     'insert_row_after' => 'Wstaw wiersz za',
     'delete_row' => 'Usuń wiersz',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index b178f680f04..b99de72be0f 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Zaktualizowano :timeLength',
     'meta_updated_name' => 'Zaktualizowano :timeLength przez :user',
     'meta_owned_name' => 'Właściciel: :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Odniesienie w :count elemencie|Odniesienia w :count elementach',
     'entity_select' => 'Wybór obiektu',
     'entity_select_lack_permission' => 'Nie masz wymaganych uprawnień do wybrania tej pozycji',
     'images' => 'Obrazki',
@@ -39,9 +39,9 @@
     'export_pdf' => 'Plik PDF',
     'export_text' => 'Plik tekstowy',
     'export_md' => 'Pliki Markdown',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Domyślny szablon strony',
+    'default_template_explain' => 'Przypisz szablon strony, który będzie używany jako domyślna zawartość dla wszystkich stron utworzonych w tym elemencie. Pamiętaj, że będzie to używane tylko wtedy, gdy twórca strony ma dostęp do wybranej strony szablonu.',
+    'default_template_select' => 'Wybierz stronę szablonu',
 
     // Permissions and restrictions
     'permissions' => 'Uprawnienia',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Usuń wersje roboczą',
     'pages_delete_success' => 'Strona usunięta pomyślnie',
     'pages_delete_draft_success' => 'Werjsa robocza usunięta pomyślnie',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Ta strona jest aktualnie używana jako domyślny szablon strony książki lub rozdziału. Po usunięciu tej strony te książki lub rozdziały nie będą już miały przypisanego domyślnego szablonu strony.',
     'pages_delete_confirm' => 'Czy na pewno chcesz usunąć tę stronę?',
     'pages_delete_draft_confirm' => 'Czy na pewno chcesz usunąć wersje roboczą strony?',
     'pages_editing_named' => 'Edytowanie strony :pageName',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Odniesienia',
     'references_none' => 'Brak śledzonych odwołań do tego elementu.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Wymienione poniżej są wszystkie znane treści w systemie, które nawiązują do tego elementu.',
 
     // Watch Options
     'watch' => 'Obserwuj',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index eb7435424b4..8b1ae1608bd 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Użytkownik o adresie :email już istnieje, ale używa innych poświadczeń.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Konto użytkownika nie może być zarejestrowane z podanymi danymi',
     'email_already_confirmed' => 'E-mail został potwierdzony, spróbuj się zalogować.',
     'email_confirmation_invalid' => 'Ten token jest nieprawidłowy lub został już wykorzystany. Spróbuj zarejestrować się ponownie.',
     'email_confirmation_expired' => 'Ten token potwierdzający wygasł. Wysłaliśmy Ci kolejny.',
diff --git a/lang/pl/preferences.php b/lang/pl/preferences.php
index 6d67dc1b3e6..dd348210279 100644
--- a/lang/pl/preferences.php
+++ b/lang/pl/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Zapisz preferencje',
     'notifications_update_success' => 'Preferencje powiadomień zostały zaktualizowane!',
     'notifications_watched' => 'Obserwowane i ignorowane elementy',
-    'notifications_watched_desc' => ' Poniżej znajdują się elementy, które mają własne preferencje obserwowania. Aby zaktualizować swoje preferencje, zobacz dany element, a następnie znajdź opcje obserwowania na pasku bocznym.',
+    'notifications_watched_desc' => 'Poniżej znajdują się elementy, które mają własne preferencje obserwowania. Aby zaktualizować swoje preferencje, zobacz dany element, a następnie znajdź opcje obserwowania na pasku bocznym.',
 
     'auth' => 'Dostęp i bezpieczeństwo',
     'auth_change_password' => 'Zmień hasło',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 295bb5dd935..89bbba37714 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Kosz jest pusty',
     'recycle_bin_empty' => 'Opróżnij kosz',
     'recycle_bin_empty_confirm' => 'To na stałe zniszczy wszystkie przedmioty w koszu, w tym zawartość w każdym elemencie. Czy na pewno chcesz opróżnić kosz?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Ta akcja trwale usunie ten element z systemu, wraz z elementami podrzędnymi wymienionymi poniżej i nie będziesz już mógł przywrócić tej zawartości. Czy na pewno chcesz trwale usunąć ten element?',
     'recycle_bin_destroy_list' => 'Elementy do usunięcia',
     'recycle_bin_restore_list' => 'Elementy do przywrócenia',
     'recycle_bin_restore_confirm' => 'Ta akcja przywróci usunięty element, w tym elementy podrzędne, do ich oryginalnej lokalizacji. Jeśli oryginalna lokalizacja została od tego czasu usunięta, a teraz znajduje się w koszu, element nadrzędny będzie również musiał zostać przywrócony.',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Ostatni błąd:',
     'webhooks_last_error_message' => 'Ostatni komunikat o błędzie:',
 
+    // Licensing
+    'licenses' => 'Licencje',
+    'licenses_desc' => 'Ta strona podaje szczegóły dotyczące licencji dla BookStack w powiązaniu z projektami i bibliotekami używanymi w BookStack. Wiele wymienionych projektów może zezwalać na wykorzystanie wyłącznie w kontekście rozwoju oprogramowania.',
+    'licenses_bookstack' => 'Licencja BookStack',
+    'licenses_php' => 'Licencje bibliotek PHP',
+    'licenses_js' => 'Licencje bibliotek JavaScript',
+    'licenses_other' => 'Inne licencje',
+    'license_details' => 'Szczegóły licencji',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/pt/preferences.php b/lang/pt/preferences.php
index 1d6ec7d4ccd..ec5e54bba2b 100644
--- a/lang/pt/preferences.php
+++ b/lang/pt/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Guardar preferências',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Acesso e Segurança',
     'auth_change_password' => 'Alterar Palavra-passe',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index eb637d8bd4f..7a25d635ef4 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Último erro:',
     'webhooks_last_error_message' => 'Última mensagem de erro:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/pt_BR/preferences.php b/lang/pt_BR/preferences.php
index aa354a9ad93..28d0e497895 100644
--- a/lang/pt_BR/preferences.php
+++ b/lang/pt_BR/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Salvar Preferências',
     'notifications_update_success' => 'Preferências de notificação foram atualizadas!',
     'notifications_watched' => 'Itens assistidos e ignorados',
-    'notifications_watched_desc' => ' Abaixo estão os itens que possuem preferências de relógio personalizadas aplicadas. Para atualizar suas preferências para estes, veja o item e encontre as opções de relógio na barra lateral.',
+    'notifications_watched_desc' => 'Abaixo estão os itens que possuem preferências de relógio personalizadas aplicadas. Para atualizar suas preferências para estes, veja o item e encontre as opções de relógio na barra lateral.',
 
     'auth' => 'Acesso & Segurança',
     'auth_change_password' => 'Mudar a senha',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index cd30b9e208a..1107855a61a 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Último Erro:',
     'webhooks_last_error_message' => 'Última mensagem de erro:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ro/preferences.php b/lang/ro/preferences.php
index 893b44eaf95..f7529305c82 100644
--- a/lang/ro/preferences.php
+++ b/lang/ro/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Salvează Preferințe',
     'notifications_update_success' => 'Preferințele de notificare au fost actualizate!',
     'notifications_watched' => 'Articole urmărite și ignorate',
-    'notifications_watched_desc' => ' Mai jos sunt elementele care au fost aplicate preferințe personalizate. Pentru a actualiza preferințele pentru acestea, vizualizați elementul și apoi găsiți opțiunile de ceas în bara laterală.',
+    'notifications_watched_desc' => 'Mai jos sunt elementele care au fost aplicate preferințe personalizate. Pentru a actualiza preferințele pentru acestea, vizualizați elementul și apoi găsiți opțiunile de ceas în bara laterală.',
 
     'auth' => 'Acces & Securitate',
     'auth_change_password' => 'Schimbă Parola',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index 508ab595a81..32954a8eabd 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Ultima eroare:',
     'webhooks_last_error_message' => 'Ultimul mesaj de eroare:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index 1c4fd5da124..df6ae9062c2 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -66,7 +66,7 @@
     'auth_register' => 'зарегистрировался как новый пользователь',
     'auth_password_reset_request' => 'запросил смену пароля пользователя',
     'auth_password_reset_update' => 'сбросил пароль пользователя',
-    'mfa_setup_method' => 'ностроил метод МФА',
+    'mfa_setup_method' => 'настроил метод МФА',
     'mfa_setup_method_notification' => 'Многофакторный метод аутентификации успешно настроен',
     'mfa_remove_method' => 'удалил метод МФА',
     'mfa_remove_method_notification' => 'Многофакторный метод аутентификации успешно удален',
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Пользователь успешно удален',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'создан API токен',
     'api_token_create_notification' => 'API токен успешно создан',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'обновлён API токен',
     'api_token_update_notification' => 'API токен успешно обновлен',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'обновил API токен',
     'api_token_delete_notification' => 'API токен успешно удален',
 
     // Roles
diff --git a/lang/ru/common.php b/lang/ru/common.php
index b2af5fdef60..26b725ebc38 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -20,7 +20,7 @@
     'description' => 'Описание',
     'role' => 'Роль',
     'cover_image' => 'Обложка',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Это изображение должно быть приблизительно 440x250px, хотя оно и будет гибко масштабироваться и обрезаться, чтобы соответствовать пользовательскому интерфейсу в различных необходимых сценариях. Так что фактические размеры дисплея будут отличаться.',
 
     // Actions
     'actions' => 'Действия',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index 756925f581f..b93bd8840a5 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Свойства таблицы',
     'table_properties_title' => 'Свойства таблицы',
     'delete_table' => 'Удалить таблицу',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Очистить форматирование таблицы',
+    'resize_to_contents' => 'Изменить размер содержимого',
+    'row_header' => 'Заголовок строки',
     'insert_row_before' => 'Вставить строку выше',
     'insert_row_after' => 'Вставить строку ниже',
     'delete_row' => 'Удалить строку',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index deafa2e85b2..c18c00e795c 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Обновлено :timeLength',
     'meta_updated_name' => ':user обновил :timeLength',
     'meta_owned_name' => 'Владелец :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Ссылается :count элемент|Ссылается :count элементов',
     'entity_select' => 'Выбор объекта',
     'entity_select_lack_permission' => 'У вас нет разрешения на выбор этого элемента',
     'images' => 'Изображения',
@@ -39,9 +39,9 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовый файл',
     'export_md' => 'Файл Markdown',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Шаблон страницы по умолчанию',
+    'default_template_explain' => 'Назначить шаблон страницы, который будет использоваться в качестве содержимого по умолчанию для всех страниц, созданных в этом элементе. Имейте в виду, что это будет работать, только если создатель страницы имеет доступ к выбранной странице шаблона.',
+    'default_template_select' => 'Выберите страницу шаблона',
 
     // Permissions and restrictions
     'permissions' => 'Разрешения',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Удалить черновик',
     'pages_delete_success' => 'Страница удалена',
     'pages_delete_draft_success' => 'Черновик удален',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Эта страница активно используется как шаблон страницы по умолчанию для книги или главы. Эти книги или главы больше не будут иметь шаблон страницы по умолчанию, назначенный после удаления этой страницы.',
     'pages_delete_confirm' => 'Вы действительно хотите удалить эту страницу?',
     'pages_delete_draft_confirm' => 'Вы действительно хотите удалить этот черновик?',
     'pages_editing_named' => 'Редактирование страницы :pageName',
@@ -243,8 +243,8 @@
     'pages_md_insert_drawing' => 'Вставить рисунок',
     'pages_md_show_preview' => 'Предпросмотр',
     'pages_md_sync_scroll' => 'Синхронизировать прокрутку',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_drawing_unsaved' => 'Найден несохраненный чертеж',
+    'pages_drawing_unsaved_confirm' => 'Несохраненные данные были найдены из предыдущей неудачной попытки сохранения рисунка. Вы хотите восстановить и продолжить редактирование несохраненного рисунка?',
     'pages_not_in_chapter' => 'Страница не находится в главе',
     'pages_move' => 'Переместить страницу',
     'pages_copy' => 'Скопировать страницу',
@@ -273,12 +273,12 @@
     'pages_revisions_none' => 'У этой страницы нет других версий',
     'pages_copy_link' => 'Копировать ссылку',
     'pages_edit_content_link' => 'Перейти к разделу в редакторе',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_enter_mode' => 'Войти в режим выбора раздела',
     'pages_pointer_label' => 'Настройки раздела страницы',
     'pages_pointer_permalink' => 'Постоянная ссылка на раздел страницы',
     'pages_pointer_include_tag' => 'Раздел страницы с тегом',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_pointer_toggle_link' => 'Режим постоянной ссылки. Нажмите, чтобы показать включение тега',
+    'pages_pointer_toggle_include' => 'Включить режим тега. Нажмите для отображения постоянной ссылки',
     'pages_permissions_active' => 'Действующие разрешения на страницу',
     'pages_initial_revision' => 'Первоначальное издание',
     'pages_references_update_revision' => 'Система автоматически обновила внутренние ссылки',
@@ -299,7 +299,7 @@
     'pages_is_template' => 'Шаблон страницы',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Переключить боковую панель',
     'page_tags' => 'Теги страницы',
     'chapter_tags' => 'Теги главы',
     'book_tags' => 'Теги книги',
@@ -409,25 +409,25 @@
     // References
     'references' => 'Ссылки',
     'references_none' => 'Нет отслеживаемых ссылок на этот элемент.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Ниже перечислены все известные материалы в системе, которые ссылаются на этот элемент.',
 
     // Watch Options
-    'watch' => 'Watch',
+    'watch' => 'Наблюдать',
     'watch_title_default' => 'Свойства по умолчанию',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_desc_default' => 'Вернуть просмотр только ваших настроек уведомлений по умолчанию.',
     'watch_title_ignore' => 'Игнорировать',
     'watch_desc_ignore' => 'Игнорировать все уведомления, включая уведомления из пользовательского уровня.',
     'watch_title_new' => 'Новые страницы',
     'watch_desc_new' => 'Уведомлять при создании новой страницы внутри этого элемента.',
     'watch_title_updates' => 'Все обновления страницы',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_desc_updates' => 'Уведомлять обо всех новых страницах и изменениях страницы.',
+    'watch_desc_updates_page' => 'Уведомлять о всех изменениях страницы.',
     'watch_title_comments' => 'Все обновления и комментарии страниц',
     'watch_desc_comments' => 'Уведомлять обо всех новых страницах, изменениях страниц и новых комментариях.',
     'watch_desc_comments_page' => 'Уведомлять об изменениях страниц и новых комментариях.',
     'watch_change_default' => 'Изменить настройки уведомлений по умолчанию',
     'watch_detail_ignore' => 'Игнорирование уведомлений',
-    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_new' => 'Наблюдение за новыми страницами',
     'watch_detail_updates' => 'Просмотр новых страниц и обновлений',
     'watch_detail_comments' => 'Просмотр новых страниц, обновлений и комментариев',
     'watch_detail_parent_book' => 'Просмотр через родительскую книгу',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index 0ff14e9f5b3..1fe57af2f11 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Пользователь с электронной почтой :email уже существует, но с другими учетными данными.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Пользователь не может быть зарегистрирован по предоставленной информации',
     'email_already_confirmed' => 'Адрес электронной почты уже был подтвержден, попробуйте войти в систему.',
     'email_confirmation_invalid' => 'Этот токен подтверждения недействителен или уже используется. Повторите попытку регистрации.',
     'email_confirmation_expired' => 'Истек срок действия токена. Отправлено новое письмо с подтверждением.',
@@ -43,16 +43,16 @@
     'cannot_get_image_from_url' => 'Не удается получить изображение из :url',
     'cannot_create_thumbs' => 'Сервер не может создавать эскизы. Убедитесь, что у вас установлено расширение GD PHP.',
     'server_upload_limit' => 'Сервер не разрешает загрузку файлов такого размера. Попробуйте уменьшить размер файла.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'Сервер не может получить указанный объем данных. Повторите попытку, используя меньшее количество данных или файл меньшего размера.',
     'uploaded'  => 'Сервер не позволяет загружать файлы такого размера. Пожалуйста, попробуйте файл меньше.',
 
     // Drawing & Images
     'image_upload_error' => 'Произошла ошибка при загрузке изображения',
     'image_upload_type_error' => 'Неправильный тип загружаемого изображения',
     'image_upload_replace_type' => 'Замена файла изображения должна быть того же типа',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'image_upload_memory_limit' => 'Не удалось выполнить загрузку изображений и/или создать эскизы из-за ограничения системных ресурсов.',
+    'image_thumbnail_memory_limit' => 'Не удалось создать вариации размера изображения из-за ограничений системных ресурсов.',
+    'image_gallery_thumbnail_memory_limit' => 'Не удалось создать эскизы галереи из-за ограниченности системных ресурсов.',
     'drawing_data_not_found' => 'Данные чертежа не могут быть загружены. Возможно, файл чертежа больше не существует или у вас нет разрешения на доступ к нему.',
 
     // Attachments
diff --git a/lang/ru/notifications.php b/lang/ru/notifications.php
index f37f11986ff..c5e98da80ef 100644
--- a/lang/ru/notifications.php
+++ b/lang/ru/notifications.php
@@ -10,10 +10,10 @@
     'new_page_intro' => 'Новая страница была создана в :appName:',
     'updated_page_subject' => 'Обновлена страница: :pageName',
     'updated_page_intro' => 'Страница была обновлена в :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'updated_page_debounce' => 'Чтобы предотвратить массовые уведомления, в течение некоторого времени вы не будете получать уведомления о дальнейших правках этой страницы этим же редактором.',
 
     'detail_page_name' => 'Имя страницы:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Путь страницы:',
     'detail_commenter' => 'Комментатор:',
     'detail_comment' => 'Комментарий:',
     'detail_created_by' => 'Создано:',
@@ -22,6 +22,6 @@
     'action_view_comment' => 'Просмотреть комментарий',
     'action_view_page' => 'Посмотреть страницу',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason' => 'Это уведомление было отправлено, потому что :link покрывает этот тип активности для этого элемента.',
     'footer_reason_link' => 'ваши настройки уведомлений',
 ];
diff --git a/lang/ru/preferences.php b/lang/ru/preferences.php
index 1cfd1c24bc0..27217815d13 100644
--- a/lang/ru/preferences.php
+++ b/lang/ru/preferences.php
@@ -8,7 +8,7 @@
     'my_account' => 'Моя учетная запись',
 
     'shortcuts' => 'Горячие клавиши',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_interface' => 'Настройки горячих клавиш',
     'shortcuts_toggle_desc' => 'Здесь вы можете включить или отключить горячие клавиши системного интерфейса, используемые для навигации и действий.',
     'shortcuts_customize_desc' => 'Вы можете настроить каждую из горячих клавиш ниже. Просто нажмите комбинацию клавиш после выбора вставки для горячих клавиш.',
     'shortcuts_toggle_label' => 'Горячие клавиши включены',
@@ -26,8 +26,8 @@
     'notifications_opt_comment_replies' => 'Уведомлять об ответах на мои комментарии',
     'notifications_save' => 'Сохранить настройки',
     'notifications_update_success' => 'Настройки уведомлений были обновлены!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched' => 'Просмотренные и игнорированные элементы',
+    'notifications_watched_desc' => 'Ниже приведены элементы, которые имеют пользовательские настройки наблюдения. Чтобы обновить ваши предпочтения, посмотрите этот пункт и найдите варианты наблюдения в боковой панели.',
 
     'auth' => 'Доступ и безопасность',
     'auth_change_password' => 'Изменить пароль',
@@ -35,9 +35,9 @@
     'auth_change_password_success' => 'Пароль был обновлен!',
 
     'profile' => 'Детали профиля',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_desc' => 'Управляйте деталями вашей учетной записи, что представляют вас другим пользователям, в дополнение к деталям, используемым для персонализации коммуникации и системы.',
     'profile_view_public' => 'Просмотреть публичный профиль',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_name_desc' => 'Настройте отображаемое имя, видимое другим пользователям системы через действия, что вы выполняете, и контент, которым вы владеете.',
     'profile_email_desc' => 'Этот адрес электронной почты будет использоваться для уведомлений и, в зависимости от активной системы аутентификации, для доступа к системе.',
     'profile_email_no_permission' => 'К сожалению, у вас нет разрешения на изменение адреса электронной почты. Если вам действительно необходимо его изменить, нужно попросить администратора сделать это.',
     'profile_avatar_desc' => 'Выберите изображение, которое будет использоваться для представления себя другим в системе. По возможности это изображение должно быть квадратным и около 256 пикселей по ширине и высоте.',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index e78b2869fb5..238a1da6ba4 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -86,7 +86,7 @@
     'maint_send_test_email' => 'Отправить тестовое письмо',
     'maint_send_test_email_desc' => 'Отправить тестовое письмо на адрес электронной почты, указанный в профиле.',
     'maint_send_test_email_run' => 'Отправить письмо',
-    'maint_send_test_email_success' => 'На адрес :address отравлено письмо',
+    'maint_send_test_email_success' => 'Письмо отправлено на :address',
     'maint_send_test_email_mail_subject' => 'Проверка электронной почты',
     'maint_send_test_email_mail_greeting' => 'Доставка электронной почты работает!',
     'maint_send_test_email_mail_text' => 'Поздравляем! Поскольку вы получили это письмо, электронная почта настроена правильно.',
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'На данный момент корзина пуста',
     'recycle_bin_empty' => 'Очистить корзину',
     'recycle_bin_empty_confirm' => 'Это действие навсегда уничтожит все элементы в корзине, включая содержимое, содержащееся в каждом элементе. Вы уверены, что хотите очистить корзину?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Это действие навсегда удалит этот элемент из системы, вместе с любыми дочерними элементами, перечисленными ниже, и вы не сможете восстановить этот контент. Вы уверены, что хотите навсегда удалить этот элемент?',
     'recycle_bin_destroy_list' => 'Элементы для удаления',
     'recycle_bin_restore_list' => 'Элементы для восстановления',
     'recycle_bin_restore_confirm' => 'Это действие восстановит удаленный элемент, включая дочерние, в исходное место. Если исходное место было удалено и теперь находится в корзине, родительский элемент также необходимо будет восстановить.',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Последняя ошибка:',
     'webhooks_last_error_message' => 'Последнее сообщение об ошибке:',
 
+    // Licensing
+    'licenses' => 'Лицензии',
+    'licenses_desc' => 'Эта страница содержит сведения о лицензиях для BookStack в дополнение к проектам и библиотекам, которые используются в BookStack. Многие перечисленные проекты могут использоваться только в контексте разработки.',
+    'licenses_bookstack' => 'Лицензия BookStack',
+    'licenses_php' => 'Лицензии PHP библиотек',
+    'licenses_js' => 'Лицензии JavaScript библиотек',
+    'licenses_other' => 'Прочие лицензии',
+    'license_details' => 'Подробности о лицензии',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index 2422ea7f6ef..6dad803e003 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -15,7 +15,7 @@
     'page_restore'                => 'obnovil(a) stránku',
     'page_restore_notification'   => 'Stránka úspešne obnovená',
     'page_move'                   => 'presunul(a) stránku',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'Stránka bola úspešne presunutá',
 
     // Chapters
     'chapter_create'              => 'vytvoril(a) kapitolu',
@@ -25,7 +25,7 @@
     'chapter_delete'              => 'odstránil(a) kapitolu',
     'chapter_delete_notification' => 'Kapitola úspešne odstránená',
     'chapter_move'                => 'presunul(a) kapitolu',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'Kapitola bola úspešne presunutá',
 
     // Books
     'book_create'                 => 'vytvoril(a) knihu',
@@ -72,8 +72,8 @@
     'mfa_remove_method_notification' => 'Viacúrovňový spôsob overenia úspešne odstránený',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
+    'settings_update' => 'aktualizované nastavenia',
+    'settings_update_notification' => 'Nastavenia boli úspešne aktualizované',
     'maintenance_action_run' => 'ran maintenance action',
 
     // Webhooks
@@ -85,11 +85,11 @@
     'webhook_delete_notification' => 'Webhook úspešne odstránený',
 
     // Users
-    'user_create' => 'created user',
+    'user_create' => 'užívateľ vytvorený',
     'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
+    'user_update' => 'používateľ aktualizovaný',
     'user_update_notification' => 'Používateľ úspešne upravený',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'odstránený používateľ',
     'user_delete_notification' => 'Používateľ úspešne zmazaný',
 
     // API Tokens
@@ -105,7 +105,7 @@
     'role_create_notification' => 'Rola úspešne vytvorená',
     'role_update' => 'updated role',
     'role_update_notification' => 'Rola úspešne aktualizovaná',
-    'role_delete' => 'deleted role',
+    'role_delete' => 'odstrániť rolu',
     'role_delete_notification' => 'Rola úspešne zmazaná',
 
     // Recycle Bin
@@ -117,7 +117,7 @@
     'commented_on'                => 'komentoval(a)',
     'comment_create'              => 'added comment',
     'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_delete'              => 'odstrániť komentár',
 
     // Other
     'permissions_update'          => 'aktualizované oprávnenia',
diff --git a/lang/sk/preferences.php b/lang/sk/preferences.php
index b3152848f3c..85da4f331f7 100644
--- a/lang/sk/preferences.php
+++ b/lang/sk/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index b6beb5e6a9a..d2190f851b0 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Posledná chyba:',
     'webhooks_last_error_message' => 'Posledná chybová správa:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index e82b174c930..027c17f872a 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Uporabnik uspešno izbrisan',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'ustvarjen žeton API',
     'api_token_create_notification' => 'Žeton API uspešno ustvarjen',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'posodobljen žeton API',
     'api_token_update_notification' => 'Žeton API uspešno posodobljen',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'izbrisan žeton API',
     'api_token_delete_notification' => 'Žeton API uspešno izbrisan',
 
     // Roles
diff --git a/lang/sl/editor.php b/lang/sl/editor.php
index de9aa0ece10..b6f462eb596 100644
--- a/lang/sl/editor.php
+++ b/lang/sl/editor.php
@@ -7,105 +7,105 @@
  */
 return [
     // General editor terms
-    'general' => 'General',
-    'advanced' => 'Advanced',
-    'none' => 'None',
-    'cancel' => 'Cancel',
-    'save' => 'Save',
-    'close' => 'Close',
-    'undo' => 'Undo',
-    'redo' => 'Redo',
-    'left' => 'Left',
-    'center' => 'Center',
-    'right' => 'Right',
-    'top' => 'Top',
-    'middle' => 'Middle',
-    'bottom' => 'Bottom',
-    'width' => 'Width',
-    'height' => 'Height',
-    'More' => 'More',
-    'select' => 'Select...',
+    'general' => 'Splošno',
+    'advanced' => 'Napredno',
+    'none' => 'Brez',
+    'cancel' => 'Prekliči',
+    'save' => 'Shrani',
+    'close' => 'Zapri',
+    'undo' => 'Razveljavi',
+    'redo' => 'Ponovi',
+    'left' => 'Levo',
+    'center' => 'Sredinsko',
+    'right' => 'Desno',
+    'top' => 'Zgoraj',
+    'middle' => 'Sredina',
+    'bottom' => 'Spodaj',
+    'width' => 'Širina',
+    'height' => 'Višina',
+    'More' => 'Več',
+    'select' => 'Izberi ...',
 
     // Toolbar
-    'formats' => 'Formats',
-    'header_large' => 'Large Header',
-    'header_medium' => 'Medium Header',
-    'header_small' => 'Small Header',
-    'header_tiny' => 'Tiny Header',
-    'paragraph' => 'Paragraph',
-    'blockquote' => 'Blockquote',
-    'inline_code' => 'Inline code',
-    'callouts' => 'Callouts',
-    'callout_information' => 'Information',
-    'callout_success' => 'Success',
-    'callout_warning' => 'Warning',
-    'callout_danger' => 'Danger',
-    'bold' => 'Bold',
-    'italic' => 'Italic',
-    'underline' => 'Underline',
-    'strikethrough' => 'Strikethrough',
-    'superscript' => 'Superscript',
-    'subscript' => 'Subscript',
-    'text_color' => 'Text color',
-    'custom_color' => 'Custom color',
-    'remove_color' => 'Remove color',
-    'background_color' => 'Background color',
-    'align_left' => 'Align left',
-    'align_center' => 'Align center',
-    'align_right' => 'Align right',
-    'align_justify' => 'Justify',
-    'list_bullet' => 'Bullet list',
-    'list_numbered' => 'Numbered list',
-    'list_task' => 'Task list',
-    'indent_increase' => 'Increase indent',
-    'indent_decrease' => 'Decrease indent',
-    'table' => 'Table',
-    'insert_image' => 'Insert image',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
+    'formats' => 'Oblike',
+    'header_large' => 'Velika glava',
+    'header_medium' => 'Srednja glava',
+    'header_small' => 'Majhna glava',
+    'header_tiny' => 'Drobna glava',
+    'paragraph' => 'Odstavek',
+    'blockquote' => 'Navedek',
+    'inline_code' => 'Vgrajena koda',
+    'callouts' => 'Opombe',
+    'callout_information' => 'Informacija',
+    'callout_success' => 'Uspešno',
+    'callout_warning' => 'Opozorilo',
+    'callout_danger' => 'Nevarnost',
+    'bold' => 'Krepko',
+    'italic' => 'Ležeče',
+    'underline' => 'Podčrtano',
+    'strikethrough' => 'Prečrtano',
+    'superscript' => 'Nadpisano',
+    'subscript' => 'Podpisano',
+    'text_color' => 'Barva besedila',
+    'custom_color' => 'Barva po meri',
+    'remove_color' => 'Odstrani barvo',
+    'background_color' => 'Barva ozadja',
+    'align_left' => 'Poravnaj levo',
+    'align_center' => 'Poravnaj na sredino',
+    'align_right' => 'Poravnaj desno',
+    'align_justify' => 'Poravnaj obojestransko',
+    'list_bullet' => 'Seznam z oznakami',
+    'list_numbered' => 'Oštevilčen seznam',
+    'list_task' => 'Seznam opravil',
+    'indent_increase' => 'Povečaj zamik',
+    'indent_decrease' => 'Zmanjšaj zamik',
+    'table' => 'Tabela',
+    'insert_image' => 'Vstavi sliko',
+    'insert_image_title' => 'Vstavi/Obdelaj sliko',
+    'insert_link' => 'Vstavi/Obdelaj povezavo',
+    'insert_link_title' => 'Vstavi/obdelaj povezavo',
+    'insert_horizontal_line' => 'Vstavi vodoravno črto',
     'insert_code_block' => 'Insert code block',
     'edit_code_block' => 'Edit code block',
-    'insert_drawing' => 'Insert/edit drawing',
+    'insert_drawing' => 'Vstavi/Obdelaj risbo',
     'drawing_manager' => 'Drawing manager',
     'insert_media' => 'Insert/edit media',
     'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'clear_formatting' => 'Odstrani oblikovanje',
+    'source_code' => 'Izvorna koda',
+    'source_code_title' => 'Izvorna koda',
+    'fullscreen' => 'Celozaslonski način',
+    'image_options' => 'Možnosti za slike',
 
     // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
-    'table_cell' => 'Cell',
-    'table_row' => 'Row',
-    'table_column' => 'Column',
-    'cell_properties' => 'Cell properties',
-    'cell_properties_title' => 'Cell Properties',
-    'cell_type' => 'Cell type',
-    'cell_type_cell' => 'Cell',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
-    'table_row_group' => 'Row Group',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
+    'table_properties' => 'Lastnosti tabele',
+    'table_properties_title' => 'Lastnosti tabele',
+    'delete_table' => 'Izbriši tabelo',
+    'table_clear_formatting' => 'Odstrani oblikovanje tabele',
+    'resize_to_contents' => 'Prilagodi vsebini',
+    'row_header' => 'Glava vrstice',
+    'insert_row_before' => 'Vstavi vrstico pred',
+    'insert_row_after' => 'Vstavi vrstico po',
+    'delete_row' => 'Izbriši vrstico',
+    'insert_column_before' => 'Vstavi stolpec pred',
+    'insert_column_after' => 'Vstavi stolpec po',
+    'delete_column' => 'Izbriši stolpec',
+    'table_cell' => 'Celica',
+    'table_row' => 'Vrstica',
+    'table_column' => 'Stolpec',
+    'cell_properties' => 'Lastnosti celice',
+    'cell_properties_title' => 'Lastnosti celice',
+    'cell_type' => 'Vrsta celice',
+    'cell_type_cell' => 'Celica',
+    'cell_scope' => 'Obseg',
+    'cell_type_header' => 'Naslovna celica',
+    'merge_cells' => 'Združi celice',
+    'split_cell' => 'Razdeli celice',
+    'table_row_group' => 'Skupina vrstic',
+    'table_column_group' => 'Skupina stolpcev',
+    'horizontal_align' => 'Vodoravna poravnava',
+    'vertical_align' => 'Navpična poravnava',
+    'border_width' => 'Debelina roba',
     'border_style' => 'Border style',
     'border_color' => 'Border color',
     'row_properties' => 'Row properties',
@@ -153,25 +153,25 @@
     'open_link_new' => 'New window',
     'remove_link' => 'Remove link',
     'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'collapsible_unwrap' => 'Odpri',
+    'edit_label' => 'Uredi oznako',
+    'toggle_open_closed' => 'Odpri/Zapri',
+    'collapsible_edit' => 'Uredi zložljivi blok',
+    'toggle_label' => 'Preklopi oznako',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
-    'shortcuts' => 'Shortcuts',
-    'shortcut' => 'Shortcut',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'about' => 'O urejevalniku',
+    'about_title' => 'O Urejevalniku WYSIWYG',
+    'editor_license' => 'Licenca in avtorske pravice Urejevalnika',
+    'editor_tiny_license' => 'Urejevalnik je ustvarjen z uporabo :tinyLink pod pogoji licence MIT.',
+    'editor_tiny_license_link' => 'Podrobnosti o avtorskih pravicah in licenci za TinyMCE lahko preberete tukaj.',
+    'save_continue' => 'Shrani stran in Nadaljuj',
+    'callouts_cycle' => '(Večkrat pritisnite, da preklopite med vrstami opomb)',
+    'link_selector' => 'Povezava do vsebine',
+    'shortcuts' => 'Bližnjice',
+    'shortcut' => 'Bližnjica',
+    'shortcuts_intro' => 'Sledeče bližnjice so na voljo v urejevalniku:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
-    'description' => 'Description',
+    'description' => 'Opis',
 ];
diff --git a/lang/sl/preferences.php b/lang/sl/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/sl/preferences.php
+++ b/lang/sl/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 272f1b11407..72a45a14b36 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -277,6 +277,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/sl/validation.php b/lang/sl/validation.php
index 92060dd6d43..012bfe4a704 100644
--- a/lang/sl/validation.php
+++ b/lang/sl/validation.php
@@ -12,10 +12,10 @@
     'active_url'           => ':attribute ni veljaven URL.',
     'after'                => ':attribute mora biti datum po :date.',
     'alpha'                => ':attribute lahko vsebuje samo črke.',
-    'alpha_dash'           => ':attribute lahko vsebuje samo ?rke, ?tevilke in ?rtice.',
+    'alpha_dash'           => ':attribute lahko vsebuje samo črke, številke, pomišljaje in podčrtaje.',
     'alpha_num'            => ':attribute lahko vsebuje samo črke in številke.',
     'array'                => ':attribute mora biti niz.',
-    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'backup_codes'         => 'Podana koda ni veljavna ali je že uporabljena.',
     'before'               => ':attribute mora biti datum pred :date.',
     'between'              => [
         'numeric' => ':attribute mora biti med :min in :max.',
@@ -32,7 +32,7 @@
     'digits_between'       => ':attribute mora biti med :min in :max števkami.',
     'email'                => ':attribute mora biti veljaven e-naslov.',
     'ends_with' => 'The :attribute se mora končati z eno od določenih: :vrednost/values',
-    'file'                 => 'The :attribute must be provided as a valid file.',
+    'file'                 => ':attribute ni veljavna datoteka.',
     'filled'               => 'Polje ne sme biti prazno.',
     'gt'                   => [
         'numeric' => ':attribute mora biti večji kot :vrednost.',
@@ -100,7 +100,7 @@
     ],
     'string'               => ':attribute mora biti niz.',
     'timezone'             => ':attribute mora biti veljavna cona.',
-    'totp'                 => 'The provided code is not valid or has expired.',
+    'totp'                 => 'Podana koda ni veljavna ali je zapadla.',
     'unique'               => ':attribute je že zaseden.',
     'url'                  => ':attribute oblika ni veljavna.',
     'uploaded'             => 'Datoteke ni bilo mogoče naložiti. Strežnik morda ne sprejema datotek te velikosti.',
diff --git a/lang/sq/preferences.php b/lang/sq/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/sq/preferences.php
+++ b/lang/sq/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index 7b7f5d2a2e3..f4c84092c6f 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index ad670af981e..b376e542cf9 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -102,58 +102,58 @@
     'merge_cells' => 'Обједини ћелије',
     'split_cell' => 'Подели ћелију',
     'table_row_group' => 'Група редова',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
-    'border_style' => 'Border style',
-    'border_color' => 'Border color',
-    'row_properties' => 'Row properties',
-    'row_properties_title' => 'Row Properties',
-    'cut_row' => 'Cut row',
-    'copy_row' => 'Copy row',
-    'paste_row_before' => 'Paste row before',
-    'paste_row_after' => 'Paste row after',
-    'row_type' => 'Row type',
-    'row_type_header' => 'Header',
-    'row_type_body' => 'Body',
-    'row_type_footer' => 'Footer',
-    'alignment' => 'Alignment',
-    'cut_column' => 'Cut column',
-    'copy_column' => 'Copy column',
-    'paste_column_before' => 'Paste column before',
-    'paste_column_after' => 'Paste column after',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
-    'caption' => 'Caption',
-    'show_caption' => 'Show caption',
-    'constrain' => 'Constrain proportions',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'table_column_group' => 'Група колона',
+    'horizontal_align' => 'Хоризонтално поравнање',
+    'vertical_align' => 'Вертикално поравнати',
+    'border_width' => 'Ширина ивице',
+    'border_style' => 'Стил ивице',
+    'border_color' => 'Боја ивице',
+    'row_properties' => 'Својства реда',
+    'row_properties_title' => 'Својства реда',
+    'cut_row' => 'Пресеци ред',
+    'copy_row' => 'Копирај ред',
+    'paste_row_before' => 'Налепите ред пре',
+    'paste_row_after' => 'Налепите ред после',
+    'row_type' => 'Врста реда',
+    'row_type_header' => 'Заглавље',
+    'row_type_body' => 'Садржај',
+    'row_type_footer' => 'Подножје',
+    'alignment' => 'Поравнавање',
+    'cut_column' => 'Изрежите колону',
+    'copy_column' => 'Копирај колону',
+    'paste_column_before' => 'Налепите колону пре',
+    'paste_column_after' => 'Налепите колону после',
+    'cell_padding' => 'Попуна ћелија',
+    'cell_spacing' => 'Размак ћелија',
+    'caption' => 'Опис',
+    'show_caption' => 'Прикажи титл',
+    'constrain' => 'Ограничавају размере',
+    'cell_border_solid' => 'Чврсто тело',
+    'cell_border_dotted' => 'Тачкасто',
+    'cell_border_dashed' => 'Испрекидана',
+    'cell_border_double' => 'Двострук',
+    'cell_border_groove' => 'Жлеб',
+    'cell_border_ridge' => 'Гребен',
+    'cell_border_inset' => 'Уметак',
+    'cell_border_outset' => 'Почетак',
+    'cell_border_none' => 'Без',
+    'cell_border_hidden' => 'Сакривено',
 
     // Images, links, details/summary & embed
-    'source' => 'Source',
-    'alt_desc' => 'Alternative description',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
-    'url' => 'URL',
-    'text_to_display' => 'Text to display',
-    'title' => 'Title',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
-    'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
-    'remove_link' => 'Remove link',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
+    'source' => 'Извор',
+    'alt_desc' => 'Алтернативни опис',
+    'embed' => 'Угради',
+    'paste_embed' => 'Налепите свој код за уградњу испод:',
+    'url' => 'УРЛ',
+    'text_to_display' => 'Текст за приказ',
+    'title' => 'Наслов',
+    'open_link' => 'Отвори везу',
+    'open_link_in' => 'Отвори везу у...',
+    'open_link_current' => 'Тренутни прозор',
+    'open_link_new' => 'Нови Прозор',
+    'remove_link' => 'Уклони везу',
+    'insert_collapsible' => 'Уредите склопиви блок',
+    'collapsible_unwrap' => 'Одмотати',
     'edit_label' => 'Уреди ознаку',
     'toggle_open_closed' => 'Отварање/затварање',
     'collapsible_edit' => 'Уредите склопиви блок',
@@ -166,12 +166,12 @@
     'editor_tiny_license' => 'Овај уређивач је направљен помоћу :tinyLink који је обезбеђен под МИТ лиценцом.',
     'editor_tiny_license_link' => 'Детаље о ауторским правима и лиценци за ТиниМЦЕ можете пронаћи овде.',
     'save_continue' => 'Сачувај страницу и настави',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
-    'shortcuts' => 'Shortcuts',
-    'shortcut' => 'Shortcut',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'callouts_cycle' => '(Наставите да притискате да бисте прелазили између типова)',
+    'link_selector' => 'Линк до садржаја',
+    'shortcuts' => 'Пречице',
+    'shortcut' => 'Пречица',
+    'shortcuts_intro' => 'Следеће пречице су доступне у уређивачу:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
-    'description' => 'Description',
+    'description' => 'Опис',
 ];
diff --git a/lang/sr/preferences.php b/lang/sr/preferences.php
index 2b88f9671ff..2872f5f3c65 100644
--- a/lang/sr/preferences.php
+++ b/lang/sr/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index 5d02cc89ab5..3ae7d760783 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Last Error Message:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/sv/preferences.php b/lang/sv/preferences.php
index 9ca2c40b7cd..e06c0fbaa79 100644
--- a/lang/sv/preferences.php
+++ b/lang/sv/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 30b09997747..3ce6567b0a0 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Senast felande:',
     'webhooks_last_error_message' => 'Senaste felmeddelande:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/tr/preferences.php b/lang/tr/preferences.php
index 94a25df739b..1ce7b01fda4 100644
--- a/lang/tr/preferences.php
+++ b/lang/tr/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 6daca434ee8..36c52e52aa8 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Last Errored:',
     'webhooks_last_error_message' => 'Son Hata Mesajı:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index f7d6d284c87..1ab0eca61a8 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Користувача успішно видалено',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'створений APi токен',
     'api_token_create_notification' => 'API токен успішно створений',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'оновлено API токен',
     'api_token_update_notification' => 'Токен API успішно оновлено',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'видалено API токен',
     'api_token_delete_notification' => 'API-токен успішно видалено',
 
     // Roles
diff --git a/lang/uk/common.php b/lang/uk/common.php
index c173e81d2a6..6e372914c2e 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -20,7 +20,7 @@
     'description' => 'Опис',
     'role' => 'Роль',
     'cover_image' => 'Обкладинка',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Це зображення має бути приблизно 440х250пікс, щоб його було легко масштабувати та обводити відповідно до інтерфейсу користувача у різних сценаріях, як це необхідно, тому реальні розміри для відображення відрізняються.',
 
     // Actions
     'actions' => 'Дії',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index fb0d420b798..176f7fab713 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Властивості таблиці',
     'table_properties_title' => 'Властивості таблиці',
     'delete_table' => 'Видалити таблицю',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Очистити форматування таблиці',
+    'resize_to_contents' => 'Змінити розмір до вмісту',
+    'row_header' => 'Заголовок рядка',
     'insert_row_before' => 'Вставити рядок перед',
     'insert_row_after' => 'Вставити рядок після',
     'delete_row' => 'Видалити рядок',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index c26848d75d8..f2af677683a 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -39,9 +39,9 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовий файл',
     'export_md' => 'Файл розмітки',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Типовий шаблон сторінки',
+    'default_template_explain' => 'Призначити шаблон сторінки, який буде використовуватися як типовий вміст для всіх сторінок, створених у цьому елементі. Майте на увазі, що ця сторінка буде використана лише у випадку, якщо вона має доступ до обраної сторінки шаблону.',
+    'default_template_select' => 'Виберіть сторінку шаблону',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Видалити чернетку',
     'pages_delete_success' => 'Сторінка видалена',
     'pages_delete_draft_success' => 'Чернетка видалена',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Ця сторінка використовується в якості шаблону сторінки за промовчанням. У цих книгах або розділах більше не буде встановлено шаблон стандартної сторінки, який використовується після того, як ця сторінка буде видалена.',
     'pages_delete_confirm' => 'Ви впевнені, що хочете видалити цю сторінку?',
     'pages_delete_draft_confirm' => 'Ви впевнені, що хочете видалити цю чернетку?',
     'pages_editing_named' => 'Редагування сторінки :pageName',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index ece86cf89f9..92d91c1831c 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Користувач з електронною адресою: електронна адреса вже існує, але з іншими обліковими даними.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Обліковий запис користувача не може бути зареєстрований за наданими деталями',
     'email_already_confirmed' => 'Електронна пошта вже підтверджена, спробуйте увійти.',
     'email_confirmation_invalid' => 'Цей токен підтвердження недійсний або вже був використаний, будь ласка, спробуйте знову зареєструватися.',
     'email_confirmation_expired' => 'Термін дії токена підтвердження минув, новий електронний лист підтвердження був відправлений.',
diff --git a/lang/uk/preferences.php b/lang/uk/preferences.php
index 2383c6793f4..14989d2a740 100644
--- a/lang/uk/preferences.php
+++ b/lang/uk/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Зберегти налаштування',
     'notifications_update_success' => 'Налаштування сповіщень було оновлено!',
     'notifications_watched' => 'Переглянуті та ігноровані елементи',
-    'notifications_watched_desc' => ' Нижче наведені предмети, які мають застосовані налаштування перегляду. Щоб оновити ваші налаштування для них, перегляньте елемент, а потім знайдіть параметри перегляду на бічній панелі.',
+    'notifications_watched_desc' => 'Нижче наведені предмети, які мають застосовані налаштування перегляду. Щоб оновити ваші налаштування для них, перегляньте елемент, а потім знайдіть параметри перегляду на бічній панелі.',
 
     'auth' => 'Доступ і безпека',
     'auth_change_password' => 'Змінити пароль',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index 3aaed0ef461..fb04a2930fe 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Зараз кошик порожній',
     'recycle_bin_empty' => 'Очистити кошик',
     'recycle_bin_empty_confirm' => 'Це назавжди знищить усі елементи в кошику, включаючи вміст кожного елементу. Ви впевнені, що хочете очистити кошик?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Ця дія назавжди видалить цей елемент з системи, разом з будь-яким дочірнім елементом, перерахованим нижче, і ви не зможете відновити цей контент. Ви дійсно бажаєте остаточно видалити цей елемент?',
     'recycle_bin_destroy_list' => 'Елементи для знищення',
     'recycle_bin_restore_list' => 'Елементи для відновлення',
     'recycle_bin_restore_confirm' => 'Ця дія відновить видалений елемент у початкове місце, включаючи всі дочірні елементи. Якщо вихідне розташування відтоді було видалено, і знаходиться у кошику, батьківський елемент також потрібно буде відновити.',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Остання помилка:',
     'webhooks_last_error_message' => 'Останнє повідомлення про помилку:',
 
+    // Licensing
+    'licenses' => 'Ліцензії',
+    'licenses_desc' => 'На цій сторінці детально описано ліцензійну інформацію для BookStack на додаток до проектів і бібліотек, які використовуються в BookStack. Багато проектів із списку можна використовувати лише в контексті розробки.',
+    'licenses_bookstack' => 'Ліцензія BookStack',
+    'licenses_php' => 'Ліцензії на бібліотеки PHP',
+    'licenses_js' => 'Ліцензії бібліотеки JavaScript',
+    'licenses_other' => 'Інші ліцензії',
+    'license_details' => 'Про ліцензію',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/uz/preferences.php b/lang/uz/preferences.php
index 9dedb0fb545..de36b953e85 100644
--- a/lang/uz/preferences.php
+++ b/lang/uz/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Afzalliklarni saqlash',
     'notifications_update_success' => 'Bildirishnoma sozlamalari yangilandi!',
     'notifications_watched' => 'Koʻrilgan va e\'tiborga olinmagan narsalar',
-    'notifications_watched_desc' => ' Quyida maxsus soat sozlamalari qoʻllaniladigan elementlar mavjud. Bular uchun afzalliklaringizni yangilash uchun elementni koʻring, soʻngra yon paneldagi tomosha parametrlarini toping.',
+    'notifications_watched_desc' => 'Quyida maxsus soat sozlamalari qoʻllaniladigan elementlar mavjud. Bular uchun afzalliklaringizni yangilash uchun elementni koʻring, soʻngra yon paneldagi tomosha parametrlarini toping.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index 07bbb248565..0d7c0415bf7 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Oxirgi xato:',
     'webhooks_last_error_message' => 'Oxirgi xato xabari:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/vi/preferences.php b/lang/vi/preferences.php
index 8c5fc52301a..76bc0be16a2 100644
--- a/lang/vi/preferences.php
+++ b/lang/vi/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
 
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 3ffb37fd3f7..a15128c2b11 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => 'Lần cuối xảy ra lỗi:',
     'webhooks_last_error_message' => 'Nội dung lỗi gần nhất:',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/zh_CN/preferences.php b/lang/zh_CN/preferences.php
index 0b5044137d6..f1ef3957d1e 100644
--- a/lang/zh_CN/preferences.php
+++ b/lang/zh_CN/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => '保存偏好设置',
     'notifications_update_success' => '通知偏好设置已更新！',
     'notifications_watched' => '已关注和忽略的项目',
-    'notifications_watched_desc' => ' 下面是已应用自定义关注选项的项目。要更新您的关注设置，请查看该项目，然后在该项目的侧边栏中找到关注选项。',
+    'notifications_watched_desc' => '下面是已应用自定义关注选项的项目。要更新您的关注设置，请查看该项目，然后在该项目的侧边栏中找到关注选项。',
 
     'auth' => '访问与安全',
     'auth_change_password' => '更改密码',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index 4bf868af6f8..f5fcacdf15d 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => '最后一个错误：',
     'webhooks_last_error_message' => '最后一个错误消息：',
 
+    // Licensing
+    'licenses' => '许可证',
+    'licenses_desc' => '除了 BookStack 中使用的项目和库之外，此页面还详细介绍了 BookStack 的许可证信息。列出的许多项目只能在开发环境中使用。',
+    'licenses_bookstack' => 'BookStack 许可证',
+    'licenses_php' => 'PHP 库许可证',
+    'licenses_js' => 'JavaScript 库许可证',
+    'licenses_other' => '其他许可证',
+    'license_details' => '许可证细节',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index 597131e771d..dddca399ac9 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -50,31 +50,31 @@
     'bookshelf_delete_notification'    => '書棧已刪除',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => '還原的版本',
+    'revision_delete' => '刪除的版本',
+    'revision_delete_notification' => '修訂已成功刪除',
 
     // Favourites
     'favourite_add_notification' => '":name" 已加入到你的最愛',
     'favourite_remove_notification' => '":name" 已從你的最愛移除',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => '追蹤偏好設定已成功更新',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
+    'auth_login' => '已登入',
+    'auth_register' => '註冊為新用戶',
+    'auth_password_reset_request' => '請求重置用戶密碼',
+    'auth_password_reset_update' => '重置使用者密碼',
+    'mfa_setup_method' => '設定MFA方式',
     'mfa_setup_method_notification' => '多重身份驗證已設定成功',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => '移除MFA方式',
     'mfa_remove_method_notification' => '多重身份驗證已移除成功',
 
     // Settings
-    'settings_update' => 'updated settings',
+    'settings_update' => '更新設定',
     'settings_update_notification' => '設定更新成功',
-    'maintenance_action_run' => 'ran maintenance action',
+    'maintenance_action_run' => '執行維護動作',
 
     // Webhooks
     'webhook_create' => '建立 Webhook',
@@ -85,39 +85,39 @@
     'webhook_delete_notification' => 'Webhook 已刪除成功',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
+    'user_create' => '建立使用者',
+    'user_create_notification' => '使用者已成功建立。',
+    'user_update' => '更新使用者',
     'user_update_notification' => '使用者已成功更新。',
-    'user_delete' => 'deleted user',
+    'user_delete' => '已刪除使用者',
     'user_delete_notification' => '使用者移除成功',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => '建立 API 權杖',
+    'api_token_create_notification' => '成功建立 API 權杖',
+    'api_token_update' => '已更新 API 權杖',
+    'api_token_update_notification' => '成功更新 API 權杖',
+    'api_token_delete' => '已刪除 API 權杖',
+    'api_token_delete_notification' => 'API 權杖已成功刪除',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => '創建角色',
     'role_create_notification' => '建立角色成功',
-    'role_update' => 'updated role',
+    'role_update' => '已更新角色',
     'role_update_notification' => '更新角色成功',
-    'role_delete' => 'deleted role',
+    'role_delete' => '已刪除角色',
     'role_delete_notification' => '刪除角色成功',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => '清理資源回收筒',
+    'recycle_bin_restore' => '從資源回收筒復原',
+    'recycle_bin_destroy' => '從資源回收筒刪除',
 
     // Comments
     'commented_on'                => '評論',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => '新增評論',
+    'comment_update'              => '更新評論',
+    'comment_delete'              => '已刪除之評論',
 
     // Other
     'permissions_update'          => '更新權限',
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 72f5969b852..1532d69dda8 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -20,7 +20,7 @@
     'description' => '描述',
     'role' => '角色',
     'cover_image' => '封面圖片',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => '雖然圖片會在不同情境下自動調整顯示方式，但應接近 440x250 像素',
 
     // Actions
     'actions' => '動作',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 3eb77f03010..44f6e475416 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -327,7 +327,7 @@
     'attachments_explain_instant_save' => '此處的變動將會立刻儲存。',
     'attachments_upload' => '上傳檔案',
     'attachments_link' => '附加連結',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => '你也可以將檔案拖曳到此來上傳附加檔案',
     'attachments_set_link' => '設定連結',
     'attachments_delete' => '您確定要刪除此附件嗎？',
     'attachments_dropzone' => 'Drop files here to upload',
@@ -379,7 +379,7 @@
     'comment_updated_success' => '評論已更新',
     'comment_delete_confirm' => '您確定要刪除這則評論？',
     'comment_in_reply_to' => '回覆 :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_editor_explain' => '此為頁面上的評論。在查看檢視與儲存頁面的同時，可以新增和管理評論。',
 
     // Revision
     'revision_delete_confirm' => '您確定要刪除此修訂版本嗎？',
@@ -412,7 +412,7 @@
     'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
 
     // Watch Options
-    'watch' => 'Watch',
+    'watch' => '追蹤',
     'watch_title_default' => '預設偏好設定',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignore',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 4345d16136c..05f7b035c50 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -49,7 +49,7 @@
     // Drawing & Images
     'image_upload_error' => '上傳圖片時發生錯誤',
     'image_upload_type_error' => '上傳圖片類型無效',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
+    'image_upload_replace_type' => '必須使用的檔案類型才能置換圖檔',
     'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
     'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
     'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
diff --git a/lang/zh_TW/preferences.php b/lang/zh_TW/preferences.php
index 9bed83fd132..4900ca15264 100644
--- a/lang/zh_TW/preferences.php
+++ b/lang/zh_TW/preferences.php
@@ -5,10 +5,10 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => '帳號設定',
 
     'shortcuts' => '快捷鍵',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_interface' => '快速鍵設定',
     'shortcuts_toggle_desc' => '您可以在此處啟用或停用鍵盤系統介面快捷鍵，這些快捷鍵用於導覽與操作。',
     'shortcuts_customize_desc' => '您可以自訂下方的每個快捷鍵。只要在選取快捷鍵輸入後按下您想要使用的按鍵組合即可。',
     'shortcuts_toggle_label' => '鍵盤快捷鍵已啟用',
@@ -17,35 +17,35 @@
     'shortcuts_save' => '儲存快捷鍵',
     'shortcuts_overlay_desc' => '注意：當快捷鍵啟用時，可以按下「?」來使用小幫手覆蓋畫面。這將會在目前的畫面上突顯可見動作的快捷鍵。',
     'shortcuts_update_success' => '快捷鍵偏好設定已更新！',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_overview_desc' => '你可使用鍵盤快速鍵來快速瀏覽系統界面',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
+    'notifications' => '通知設定',
+    'notifications_desc' => '控制在系統有特定活動時，是否要接收電子郵件通知',
+    'notifications_opt_own_page_changes' => '當我的頁面有異動時發送通知',
+    'notifications_opt_own_page_comments' => '當我的頁面有評論時發送通知',
+    'notifications_opt_comment_replies' => '當我的評論有新的回覆時發送通知',
     'notifications_save' => '儲存偏好設定',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => ' Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_update_success' => '通知設定已更新',
+    'notifications_watched' => '追蹤與忽略的項目',
+    'notifications_watched_desc' => '以下是已經套用自訂追蹤設定的項目。若要調整，請至該項目側邊欄中的「追蹤」更新設定',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => '存取、安全',
+    'auth_change_password' => '變更密碼',
+    'auth_change_password_desc' => '修改登入時使用的密碼，密碼長度至少需要有 8 個字',
+    'auth_change_password_success' => '密碼已更新',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => '個人檔案',
+    'profile_desc' => '管理欲呈現給其他使用的個人資料，另外資料也用於交流與系統個人化',
+    'profile_view_public' => '檢視公開的個人檔案',
+    'profile_name_desc' => '設定欲公開顯示的名稱，系統中的其他使用者將會透過內容、活動記錄看到您設定的名稱',
+    'profile_email_desc' => 'Email 將用於使用者通知以及系統存取授權 (若有啟用)',
+    'profile_email_no_permission' => '很遺憾您沒有權限變更您的 email，如果有需要，請洽詢系統管理員協助變更 email',
+    'profile_avatar_desc' => ' 選一張圖片供顯示給其他使用者看，理想的圖片大小為 256x256 像素',
+    'profile_admin_options' => '管理選項',
+    'profile_admin_options_desc' => '系統管理層選項可在「設定」=>「使用者」找到，像是角色管理等',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => '刪除帳號',
+    'delete_my_account' => '刪除我的帳號',
+    'delete_my_account_desc' => '將從系統中刪除所有帳號資料，此動作無法復原。你所建立的內容、頁面以及上傳的圖片將會保留。',
+    'delete_my_account_warning' => '您確定要刪除您的帳戶嗎？',
 ];
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index df7b0821be1..938a1000c97 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -34,7 +34,7 @@
     'app_logo' => '應用程式圖示',
     'app_logo_desc' => '這個設定會被使用在應用程式標題欄等區域；圖片的高度應為 86 像素，大型圖片將會按比例縮小。',
     'app_icon' => '應用程式圖示',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_icon_desc' => '這個圖示將顯示在瀏覽器分頁以及捷徑，應為 256 像素的的正方形 PNG 圖片',
     'app_homepage' => '應用程式首頁',
     'app_homepage_desc' => '選取要作為首頁的頁面，這將會取代預設首頁。選定頁面的頁面權限將會被忽略。',
     'app_homepage_select' => '選取頁面',
@@ -276,6 +276,14 @@
     'webhooks_last_errored' => '上次錯誤',
     'webhooks_last_error_message' => '上次錯誤信息',
 
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack 授權',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => '其它授權',
+    'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.

From a3a776d4a6d3a4d8d79c2a27a0e89dd929bd8b14 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 11 May 2024 15:47:38 +0100
Subject: [PATCH 127/666] Updated translator & dependency attribution before
 release v24.05

---
 .github/translators.txt                | 14 +++++-
 dev/licensing/js-library-licenses.txt  | 60 +++++++++++++++++++-------
 dev/licensing/php-library-licenses.txt | 23 ++++------
 3 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index f44042cd582..cf77951b023 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -389,7 +389,7 @@ Marc Hagen (MarcHagen) :: Dutch
 Kasper Alsøe (zeonos) :: Danish
 sultani :: Persian
 renge :: Korean
-TheGatesDev (thegatesdev) :: Dutch
+Tim (thegatesdev) :: Dutch; German Informal; Romanian; French; Catalan; Czech; Danish; German; Finnish; Hungarian; Italian; Japanese; Korean; Polish; Russian; Ukrainian; Chinese Simplified; Chinese Traditional; Portuguese, Brazilian; Persian; Spanish, Argentina; Croatian; Norwegian Nynorsk; Estonian; Uzbek; Norwegian Bokmal
 Irdi (irdiOL) :: Albanian
 KateBarber :: Welsh
 Twister (theuncles75) :: Hebrew
@@ -410,3 +410,15 @@ cracrayol :: French
 CapuaSC :: Dutch
 Guardian75 :: German Informal
 mr-kanister :: German
+Michele Bastianelli (makoblaster) :: Italian
+jespernissen :: Danish
+Andrey (avmaksimov) :: Russian
+Gonzalo Loyola (AlFcl) :: Spanish, Argentina; Spanish
+grobert63 :: French
+wusst. (Supporti) :: German
+MaximMaximS :: Czech
+damian-klima :: Slovak
+crow_ :: Latvian
+JocelynDelalande :: French
+Jan (JW-CH) :: German Informal
+Timo B (lommes) :: German Informal
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 56dc1ff7544..8211a4a44e1 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -60,13 +60,6 @@ Copyright: Copyright (C) 2015 Jordan Harband
 Source: git://github.com/es-shims/array-includes.git
 Link: git://github.com/es-shims/array-includes.git
 -----------
-array.prototype.filter
-License: MIT
-License File: node_modules/array.prototype.filter/LICENSE
-Copyright: Copyright (c) 2021 Jordan Harband
-Source: git+https://github.com/es-shims/Array.prototype.filter.git
-Link: https://github.com/es-shims/Array.prototype.filter#readme
------------
 array.prototype.findlastindex
 License: MIT
 License File: node_modules/array.prototype.findlastindex/LICENSE
@@ -112,7 +105,8 @@ Link: https://github.com/juliangruber/balanced-match
 binary-extensions
 License: MIT
 License File: node_modules/binary-extensions/license
-Copyright: Copyright (c) 2019 Sindre Sorhus <************@*****.***> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Copyright (c) Paul Miller (https://paulmillr.com)
 Source: sindresorhus/binary-extensions
 Link: sindresorhus/binary-extensions
 -----------
@@ -226,6 +220,27 @@ Copyright: Copyright (c) 2018 Made With MOXY Lda <*****@****.******>
 Source: git@github.com:moxystudio/node-cross-spawn.git
 Link: https://github.com/moxystudio/node-cross-spawn
 -----------
+data-view-buffer
+License: MIT
+License File: node_modules/data-view-buffer/LICENSE
+Copyright: Copyright (c) 2023 Jordan Harband
+Source: git+https://github.com/ljharb/data-view-buffer.git
+Link: https://github.com/ljharb/data-view-buffer#readme
+-----------
+data-view-byte-length
+License: MIT
+License File: node_modules/data-view-byte-length/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/data-view-byte-length.git
+Link: https://github.com/ljharb/data-view-byte-length#readme
+-----------
+data-view-byte-offset
+License: MIT
+License File: node_modules/data-view-byte-offset/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/data-view-byte-offset.git
+Link: https://github.com/ljharb/data-view-byte-offset#readme
+-----------
 debug
 License: MIT
 License File: node_modules/debug/LICENSE
@@ -298,13 +313,6 @@ Copyright: Copyright (C) 2015 Jordan Harband
 Source: git://github.com/ljharb/es-abstract.git
 Link: git://github.com/ljharb/es-abstract.git
 -----------
-es-array-method-boxes-properly
-License: MIT
-License File: node_modules/es-array-method-boxes-properly/LICENSE
-Copyright: Copyright (c) 2019 Jordan Harband
-Source: git+https://github.com/ljharb/es-array-method-boxes-properly.git
-Link: https://github.com/ljharb/es-array-method-boxes-properly#readme
------------
 es-define-property
 License: MIT
 License File: node_modules/es-define-property/LICENSE
@@ -319,6 +327,13 @@ Copyright: Copyright (c) 2024 Jordan Harband
 Source: git+https://github.com/ljharb/es-errors.git
 Link: https://github.com/ljharb/es-errors#readme
 -----------
+es-object-atoms
+License: MIT
+License File: node_modules/es-object-atoms/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/es-object-atoms.git
+Link: https://github.com/ljharb/es-object-atoms#readme
+-----------
 es-set-tostringtag
 License: MIT
 License File: node_modules/es-set-tostringtag/LICENSE
@@ -758,6 +773,13 @@ Copyright: Copyright (c) 2014 Dave Justice
 Source: git+https://github.com/inspect-js/is-core-module.git
 Link: https://github.com/inspect-js/is-core-module
 -----------
+is-data-view
+License: MIT
+License File: node_modules/is-data-view/LICENSE
+Copyright: Copyright (c) 2024 Inspect JS
+Source: git+https://github.com/inspect-js/is-data-view.git
+Link: https://github.com/inspect-js/is-data-view#readme
+-----------
 is-date-object
 License: MIT
 License File: node_modules/is-date-object/LICENSE
@@ -1233,6 +1255,12 @@ Copyright: Copyright (c) George Zahariev
 Source: git://github.com/gkz/prelude-ls.git
 Link: http://preludels.com
 -----------
+punycode.js
+License: MIT
+License File: node_modules/punycode.js/LICENSE-MIT.txt
+Source: https://github.com/mathiasbynens/punycode.js.git
+Link: https://mths.be/punycode
+-----------
 punycode
 License: MIT
 License File: node_modules/punycode/LICENSE-MIT.txt
@@ -1753,7 +1781,7 @@ Link: https://github.com/codemirror/lang-php.git
 @codemirror/lang-xml
 License: MIT
 License File: node_modules/@codemirror/lang-xml/LICENSE
-Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
 Source: https://github.com/codemirror/lang-xml.git
 Link: https://github.com/codemirror/lang-xml.git
 -----------
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 2e78ab84518..045d64670f5 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -18,20 +18,6 @@ All rights reserved.
 Source: https://github.com/Bacon/BaconQrCode.git
 Link: https://github.com/Bacon/BaconQrCode
 -----------
-barryvdh/laravel-dompdf
-License: MIT
-License File: vendor/barryvdh/laravel-dompdf/LICENSE
-Copyright: Copyright (c) 2021 barryvdh
-Source: https://github.com/barryvdh/laravel-dompdf.git
-Link: https://github.com/barryvdh/laravel-dompdf.git
------------
-barryvdh/laravel-snappy
-License: MIT
-License File: vendor/barryvdh/laravel-snappy/LICENSE
-Copyright: Copyright (c) 2018
-Source: https://github.com/barryvdh/laravel-snappy.git
-Link: https://github.com/barryvdh/laravel-snappy.git
------------
 brick/math
 License: MIT
 License File: vendor/brick/math/LICENSE
@@ -124,6 +110,13 @@ Copyright: Copyright (c) 2013-2023 Eduardo Gulias Davis
 Source: https://github.com/egulias/EmailValidator.git
 Link: https://github.com/egulias/EmailValidator
 -----------
+firebase/php-jwt
+License: BSD-3-Clause
+License File: vendor/firebase/php-jwt/LICENSE
+Copyright: Copyright (c) 2011, Neuman Vong
+Source: https://github.com/firebase/php-jwt.git
+Link: https://github.com/firebase/php-jwt
+-----------
 fruitcake/php-cors
 License: MIT
 License File: vendor/fruitcake/php-cors/LICENSE
@@ -186,7 +179,7 @@ Link: https://github.com/guzzle/uri-template.git
 intervention/gif
 License: MIT
 License File: vendor/intervention/gif/LICENSE
-Copyright: Copyright (c) 2020 Oliver Vogel
+Copyright: Copyright (c) 2020-2024 Oliver Vogel
 Source: https://github.com/Intervention/gif.git
 Link: https://github.com/intervention/gif
 -----------

From 79f5be4170821644fe0597eb464853a5d411c2da Mon Sep 17 00:00:00 2001
From: Angelo Geant Gaviola <43493935+KiDxS@users.noreply.github.com>
Date: Tue, 14 May 2024 17:04:23 +0800
Subject: [PATCH 128/666] Fixed notification preferences URL in email

---
 .../Notifications/Messages/BaseActivityNotification.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Activity/Notifications/Messages/BaseActivityNotification.php b/app/Activity/Notifications/Messages/BaseActivityNotification.php
index ca86eb81bf8..067cd8f66e6 100644
--- a/app/Activity/Notifications/Messages/BaseActivityNotification.php
+++ b/app/Activity/Notifications/Messages/BaseActivityNotification.php
@@ -43,7 +43,7 @@ public function toArray($notifiable)
     protected function buildReasonFooterLine(LocaleDefinition $locale): LinkedMailMessageLine
     {
         return new LinkedMailMessageLine(
-            url('/preferences/notifications'),
+            url('/my-account/notifications'),
             $locale->trans('notifications.footer_reason'),
             $locale->trans('notifications.footer_reason_link'),
         );

From 38913288d81fb1c8fcc62873499a9f31f4fe46e4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 16 May 2024 14:15:26 +0100
Subject: [PATCH 129/666] Devdocs: Fixed visual theme system lang folder
 reference

Made some other minor updates while there.
Fixes #4998
---
 dev/docs/visual-theme-system.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/docs/visual-theme-system.md b/dev/docs/visual-theme-system.md
index 47ee57c0e0c..6e7105a9ed0 100644
--- a/dev/docs/visual-theme-system.md
+++ b/dev/docs/visual-theme-system.md
@@ -6,14 +6,14 @@ This theme system itself is maintained and supported but usages of this system,
 
 ## Getting Started
 
-*[Video Guide](https://www.youtube.com/watch?v=gLy_2GBse48)*
+*[Video Guide](https://foss.video/w/ibNY6bGmKFV1tva3Jz4KfA)*
 
 This makes use of the theme system. Create a folder for your theme within your BookStack `themes` directory. As an example we'll use `my_theme`, so we'd create a `themes/my_theme` folder.
 You'll need to tell BookStack to use your theme via the `APP_THEME` option in your `.env` file. For example: `APP_THEME=my_theme`.
 
 ## Customizing View Files
 
-Content placed in your `themes/<theme_name>/` folder will override the original view files found in the `resources/views` folder. These files are typically [Laravel Blade](https://laravel.com/docs/8.x/blade) files.
+Content placed in your `themes/<theme_name>/` folder will override the original view files found in the `resources/views` folder. These files are typically [Laravel Blade](https://laravel.com/docs/10.x/blade) files.
 As an example, I could override the `resources/views/books/parts/list-item.blade.php` file with my own template at the path `themes/<theme_name>/books/parts/list-item.blade.php`. 
 
 ## Customizing Icons
@@ -22,7 +22,7 @@ SVG files placed in a `themes/<theme_name>/icons` folder will override any icons
 
 ## Customizing Text Content
 
-Folders with PHP translation files placed in a `themes/<theme_name>/lang` folder will override translations defined within the `resources/lang` folder. Custom translations are merged with the original files so you only need to override the select translations you want to override, you don't need to copy the whole original file. Note that you'll need to include the language folder.
+Folders with PHP translation files placed in a `themes/<theme_name>/lang` folder will override translations defined within the `lang` folder. Custom translations are merged with the original files, so you only need to override the select translations you want to override, you don't need to copy the whole original file. Note that you'll need to include the language folder.
 
 As an example, Say I wanted to change 'Search' to 'Find'; Within a `themes/<theme_name>/lang/en/common.php` file I'd set the following:
 

From 570af500f4155488265d5606a1b31314c1b0c77b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 16 May 2024 14:54:44 +0100
Subject: [PATCH 130/666] WYSIWYG: Added justify cell range cleanup

To help override & gain control of setting text alignment in tables.

- Adds support of clearing "align" attributes in certain operations.
- Updates cell range action handling to dedupe execcommand handling.
- Adds clearing of additional alignment classes on direction control.

Closes #5011
---
 resources/js/wysiwyg/fixes.js | 91 ++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 27 deletions(-)

diff --git a/resources/js/wysiwyg/fixes.js b/resources/js/wysiwyg/fixes.js
index 61cace66052..b6d627ff796 100644
--- a/resources/js/wysiwyg/fixes.js
+++ b/resources/js/wysiwyg/fixes.js
@@ -55,6 +55,19 @@ export function handleEmbedAlignmentChanges(editor) {
     });
 }
 
+/**
+ * Cleans up and removes text-alignment specific properties on all child elements.
+ * @param {HTMLElement} element
+ */
+function cleanChildAlignment(element) {
+    const alignedChildren = element.querySelectorAll('[align],[style*="text-align"],.align-center,.align-left,.align-right');
+    for (const child of alignedChildren) {
+        child.removeAttribute('align');
+        child.style.textAlign = null;
+        child.classList.remove('align-center', 'align-right', 'align-left');
+    }
+}
+
 /**
  * Cleans up the direction property for an element.
  * Removes all inline direction control from child elements.
@@ -62,16 +75,23 @@ export function handleEmbedAlignmentChanges(editor) {
  * @param {HTMLElement} element
  */
 function cleanElementDirection(element) {
-    const directionChildren = element.querySelectorAll('[dir],[style*="direction"],[style*="text-align"]');
+    const directionChildren = element.querySelectorAll('[dir],[style*="direction"]');
     for (const child of directionChildren) {
         child.removeAttribute('dir');
         child.style.direction = null;
-        child.style.textAlign = null;
     }
+
+    cleanChildAlignment(element);
     element.style.direction = null;
     element.style.textAlign = null;
+    element.removeAttribute('align');
 }
 
+/**
+ * @typedef {Function} TableCellHandler
+ * @param {HTMLTableCellElement} cell
+ */
+
 /**
  * This tracks table cell range selection, so we can apply custom handling where
  * required to actions applied to such selections.
@@ -90,34 +110,51 @@ export function handleTableCellRangeEvents(editor) {
         selectedCells = [];
     });
 
-    // TinyMCE does not seem to do a great job on clearing styles in complex
-    // scenarios (like copied word content) when a range of table cells
-    // are selected. Here we watch for clear formatting events, so some manual
-    // cleanup can be performed.
-    const attrsToRemove = ['class', 'style', 'width', 'height'];
-    editor.on('ExecCommand', event => {
-        if (event.command === 'RemoveFormat') {
-            for (const cell of selectedCells) {
-                for (const attr of attrsToRemove) {
-                    cell.removeAttribute(attr);
-                }
+    /**
+     * @type {Object<String, TableCellHandler>}
+     */
+    const actionByCommand = {
+        // TinyMCE does not seem to do a great job on clearing styles in complex
+        // scenarios (like copied word content) when a range of table cells
+        // are selected. Here we watch for clear formatting events, so some manual
+        // cleanup can be performed.
+        RemoveFormat: cell => {
+            const attrsToRemove = ['class', 'style', 'width', 'height', 'align'];
+            for (const attr of attrsToRemove) {
+                cell.removeAttribute(attr);
             }
-        }
-    });
-
-    // TinyMCE does not apply direction events to table cell range selections
-    // so here we hastily patch in that ability by setting the direction ourselves
-    // when a direction event is fired.
-    editor.on('ExecCommand', event => {
-        const command = event.command;
-        if (command !== 'mceDirectionLTR' && command !== 'mceDirectionRTL') {
-            return;
-        }
+        },
 
-        const dir = command === 'mceDirectionLTR' ? 'ltr' : 'rtl';
-        for (const cell of selectedCells) {
-            cell.setAttribute('dir', dir);
+        // TinyMCE does not apply direction events to table cell range selections
+        // so here we hastily patch in that ability by setting the direction ourselves
+        // when a direction event is fired.
+        mceDirectionLTR: cell => {
+            cell.setAttribute('dir', 'ltr');
+            cleanElementDirection(cell);
+        },
+        mceDirectionRTL: cell => {
+            cell.setAttribute('dir', 'rtl');
             cleanElementDirection(cell);
+        },
+
+        // The "align" attribute can exist on table elements so this clears
+        // the attribute, and also clears common child alignment properties,
+        // when a text direction action is made for a table cell range.
+        JustifyLeft: cell => {
+            cell.removeAttribute('align');
+            cleanChildAlignment(cell);
+        },
+        JustifyRight: this.JustifyLeft,
+        JustifyCenter: this.JustifyLeft,
+        JustifyFull: this.JustifyLeft,
+    };
+
+    editor.on('ExecCommand', event => {
+        const action = actionByCommand[event.command];
+        if (action) {
+            for (const cell of selectedCells) {
+                action(cell);
+            }
         }
     });
 }

From fc236f930b6836f49db1a584585581e70288af0a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 18 May 2024 20:37:49 +0100
Subject: [PATCH 131/666] Dark Mode: Fixed setting labels missing dark mode
 handling

Fixes #5018
---
 resources/sass/_forms.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index e6d062ce876..a6f890e3cc4 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -321,6 +321,7 @@ input[type=color] {
   }
 }
 .setting-list-label {
+  @include lightDark(color, #222, #DDD);
   color: #222;
   font-size: 1rem;
 }

From 5651d2c43d3e5e1ba34b74d566b017c45921f069 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 18 May 2024 20:40:26 +0100
Subject: [PATCH 132/666] Config: Reverted change to cache directory

Change made during Laravel 10 updates to align (Laravel made this change
much earlier in 5.x series) but it caused issues due to folder not
pre-existing and due to potentiall permission issues.
(CLI could create this during update, with non-compatible permissions
for webserver).

For #4999
---
 app/Config/cache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Config/cache.php b/app/Config/cache.php
index 2ba16059a17..b588437ff1a 100644
--- a/app/Config/cache.php
+++ b/app/Config/cache.php
@@ -53,8 +53,8 @@
 
         'file' => [
             'driver' => 'file',
-            'path'   => storage_path('framework/cache/data'),
-            'lock_path' => storage_path('framework/cache/data'),
+            'path'   => storage_path('framework/cache'),
+            'lock_path' => storage_path('framework/cache'),
         ],
 
         'memcached' => [

From 72c5141decb1d83910a81fd0c4bf77f4a463ce5c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 18 May 2024 21:18:15 +0100
Subject: [PATCH 133/666] File Uploads: Added basic validation response
 formatting

Tested via app-level validation file limit, and then also with nginx
file post limit.
For #4996
---
 resources/js/components/dropzone.js |  5 +----
 resources/js/services/http.js       | 29 +++++++++++++++++++++++++++++
 resources/sass/_components.scss     |  4 ++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/dropzone.js b/resources/js/components/dropzone.js
index 1cac09b4a5d..93e93a251c7 100644
--- a/resources/js/components/dropzone.js
+++ b/resources/js/components/dropzone.js
@@ -181,10 +181,7 @@ export class Dropzone extends Component {
                 if (this.readyState === XMLHttpRequest.DONE && this.status === 200) {
                     upload.markSuccess(component.successMessage);
                 } else if (this.readyState === XMLHttpRequest.DONE && this.status >= 400) {
-                    const content = this.responseText;
-                    const data = content.startsWith('{') ? JSON.parse(content) : {message: content};
-                    const message = data?.message || data?.error || content;
-                    upload.markError(message);
+                    upload.markError(window.$http.formatErrorResponseText(this.responseText));
                 }
             },
         });
diff --git a/resources/js/services/http.js b/resources/js/services/http.js
index 49d5b6df4e3..d95e4a59a29 100644
--- a/resources/js/services/http.js
+++ b/resources/js/services/http.js
@@ -207,3 +207,32 @@ async function performDelete(url, data = null) {
 }
 
 export {performDelete as delete};
+
+/**
+ * Parse the response text for an error response to a user
+ * presentable string. Handles a range of errors responses including
+ * validation responses & server response text.
+ * @param {String} text
+ * @returns {String}
+ */
+export function formatErrorResponseText(text) {
+    const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
+    if (!data) {
+        return text;
+    }
+
+    if (data.message || data.error) {
+        return data.message || data.error;
+    }
+
+    const values = Object.values(data);
+    const isValidation = values.every(val => {
+        return Array.isArray(val) || val.every(x => typeof x === 'string');
+    });
+
+    if (isValidation) {
+        return values.flat().join(' ');
+    }
+
+    return text;
+}
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index fc4ddeba4ae..18d1bc18f0c 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -321,6 +321,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   background-color: var(--color-primary);
   transition: width ease-in-out 240ms;
 }
+.dropzone-file-item-label {
+  line-height: 1.2;
+  margin-bottom: .2rem;
+}
 .dropzone-file-item-label,
 .dropzone-file-item-status {
   align-items: center;

From 69af9e0dbdefd8c6c951e8afbe2bba141d454beb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 20 May 2024 14:00:58 +0100
Subject: [PATCH 134/666] Routes: Added throttling to a range of auth-related
 endpoints

Some already throttled in some means, but this adds a simple ip-based
non-request-specific layer to many endpoints.
Related to #4993
---
 .../Controllers/ForgotPasswordController.php  |  5 +++
 .../Controllers/ResetPasswordController.php   |  9 ++--
 app/App/Providers/RouteServiceProvider.php    |  4 ++
 routes/web.php                                | 12 +++---
 tests/Auth/RegistrationTest.php               | 29 +++++++++++++
 tests/Auth/ResetPasswordTest.php              | 42 +++++++++++++++++++
 tests/Auth/UserInviteTest.php                 | 20 +++++++++
 7 files changed, 109 insertions(+), 12 deletions(-)

diff --git a/app/Access/Controllers/ForgotPasswordController.php b/app/Access/Controllers/ForgotPasswordController.php
index 86fbe8fa367..36dd977558b 100644
--- a/app/Access/Controllers/ForgotPasswordController.php
+++ b/app/Access/Controllers/ForgotPasswordController.php
@@ -6,6 +6,7 @@
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
+use Illuminate\Support\Sleep;
 
 class ForgotPasswordController extends Controller
 {
@@ -32,6 +33,10 @@ public function sendResetLinkEmail(Request $request)
             'email' => ['required', 'email'],
         ]);
 
+        // Add random pause to the response to help avoid time-base sniffing
+        // of valid resets via slower email send handling.
+        Sleep::for(random_int(1000, 3000))->milliseconds();
+
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
diff --git a/app/Access/Controllers/ResetPasswordController.php b/app/Access/Controllers/ResetPasswordController.php
index a8a45dddf1f..3af65d17fb6 100644
--- a/app/Access/Controllers/ResetPasswordController.php
+++ b/app/Access/Controllers/ResetPasswordController.php
@@ -15,14 +15,11 @@
 
 class ResetPasswordController extends Controller
 {
-    protected LoginService $loginService;
-
-    public function __construct(LoginService $loginService)
-    {
+    public function __construct(
+        protected LoginService $loginService
+    ) {
         $this->middleware('guest');
         $this->middleware('guard:standard');
-
-        $this->loginService = $loginService;
     }
 
     /**
diff --git a/app/App/Providers/RouteServiceProvider.php b/app/App/Providers/RouteServiceProvider.php
index 3a155920eb4..d7c1cb73756 100644
--- a/app/App/Providers/RouteServiceProvider.php
+++ b/app/App/Providers/RouteServiceProvider.php
@@ -81,5 +81,9 @@ protected function configureRateLimiting(): void
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });
+
+        RateLimiter::for('public', function (Request $request) {
+            return Limit::perMinute(10)->by($request->ip());
+        });
     }
 }
diff --git a/routes/web.php b/routes/web.php
index 03595288f92..58b8f4e5431 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -317,8 +317,8 @@
 Route::get('/register/confirm/awaiting', [AccessControllers\ConfirmEmailController::class, 'showAwaiting']);
 Route::post('/register/confirm/resend', [AccessControllers\ConfirmEmailController::class, 'resend']);
 Route::get('/register/confirm/{token}', [AccessControllers\ConfirmEmailController::class, 'showAcceptForm']);
-Route::post('/register/confirm/accept', [AccessControllers\ConfirmEmailController::class, 'confirm']);
-Route::post('/register', [AccessControllers\RegisterController::class, 'postRegister']);
+Route::post('/register/confirm/accept', [AccessControllers\ConfirmEmailController::class, 'confirm'])->middleware('throttle:public');
+Route::post('/register', [AccessControllers\RegisterController::class, 'postRegister'])->middleware('throttle:public');
 
 // SAML routes
 Route::post('/saml2/login', [AccessControllers\Saml2Controller::class, 'login']);
@@ -338,16 +338,16 @@
 Route::post('/oidc/logout', [AccessControllers\OidcController::class, 'logout']);
 
 // User invitation routes
-Route::get('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'showSetPassword']);
-Route::post('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'setPassword']);
+Route::get('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'showSetPassword'])->middleware('throttle:public');
+Route::post('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'setPassword'])->middleware('throttle:public');
 
 // Password reset link request routes
 Route::get('/password/email', [AccessControllers\ForgotPasswordController::class, 'showLinkRequestForm']);
-Route::post('/password/email', [AccessControllers\ForgotPasswordController::class, 'sendResetLinkEmail']);
+Route::post('/password/email', [AccessControllers\ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:public');
 
 // Password reset routes
 Route::get('/password/reset/{token}', [AccessControllers\ResetPasswordController::class, 'showResetForm']);
-Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset']);
+Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset'])->middleware('throttle:public');
 
 // Metadata routes
 Route::view('/help/wysiwyg', 'help.wysiwyg');
diff --git a/tests/Auth/RegistrationTest.php b/tests/Auth/RegistrationTest.php
index 60ae17573eb..42d1120e4a8 100644
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -203,4 +203,33 @@ public function test_registration_simple_honeypot_active()
         $resp = $this->followRedirects($resp);
         $this->withHtml($resp)->assertElementExists('form input[name="username"].text-neg');
     }
+
+    public function test_registration_endpoint_throttled()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->post('/register/', [
+                'name' => "Barry{$i}",
+                'email' => "barry{$i}@example.com",
+                'password' => "barryIsTheBest{$i}",
+            ]);
+            auth()->logout();
+        }
+
+        $response->assertStatus(429);
+    }
+
+    public function test_registration_confirmation_throttled()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->post('/register/confirm/accept', [
+                'token' => "token{$i}",
+            ]);
+        }
+
+        $response->assertStatus(429);
+    }
 }
diff --git a/tests/Auth/ResetPasswordTest.php b/tests/Auth/ResetPasswordTest.php
index d2af17b9cfb..026f8c5ba3f 100644
--- a/tests/Auth/ResetPasswordTest.php
+++ b/tests/Auth/ResetPasswordTest.php
@@ -4,11 +4,19 @@
 
 use BookStack\Access\Notifications\ResetPasswordNotification;
 use BookStack\Users\Models\User;
+use Carbon\CarbonInterval;
 use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Sleep;
 use Tests\TestCase;
 
 class ResetPasswordTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Sleep::fake();
+    }
+
     public function test_reset_flow()
     {
         Notification::fake();
@@ -75,6 +83,17 @@ public function test_reset_flow_shows_success_message_even_if_wrong_password_to_
             ->assertSee('The password reset token is invalid for this email address.');
     }
 
+    public function test_reset_request_with_not_found_user_still_has_delay()
+    {
+        $this->followingRedirects()->post('/password/email', [
+            'email' => 'barrynotfoundrandomuser@example.com',
+        ]);
+
+        Sleep::assertSlept(function (CarbonInterval $duration): bool {
+            return $duration->totalMilliseconds > 999;
+        }, 1);
+    }
+
     public function test_reset_page_shows_sign_links()
     {
         $this->setSettings(['registration-enabled' => 'true']);
@@ -98,4 +117,27 @@ public function test_reset_request_is_throttled()
         Notification::assertSentTimes(ResetPasswordNotification::class, 1);
         $resp->assertSee('A password reset link will be sent to ' . $editor->email . ' if that email address is found in the system.');
     }
+
+    public function test_reset_request_with_not_found_user_is_throttled()
+    {
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->post('/password/email', [
+                'email' => 'barrynotfoundrandomuser@example.com',
+            ]);
+        }
+
+        $response->assertStatus(429);
+    }
+
+    public function test_reset_call_is_throttled()
+    {
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->post('/password/reset', [
+                'email' => "arandomuser{$i}@example.com",
+                'token' => "randomtoken{$i}",
+            ]);
+        }
+
+        $response->assertStatus(429);
+    }
 }
diff --git a/tests/Auth/UserInviteTest.php b/tests/Auth/UserInviteTest.php
index a9dee0007f5..434de6aa6e9 100644
--- a/tests/Auth/UserInviteTest.php
+++ b/tests/Auth/UserInviteTest.php
@@ -137,4 +137,24 @@ public function test_token_expires_after_two_weeks()
         $setPasswordPageResp->assertRedirect('/password/email');
         $setPasswordPageResp->assertSessionHas('error', 'This invitation link has expired. You can instead try to reset your account password.');
     }
+
+    public function test_set_password_view_is_throttled()
+    {
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->get("/register/invite/tokenhere{$i}");
+        }
+
+        $response->assertStatus(429);
+    }
+
+    public function test_set_password_post_is_throttled()
+    {
+        for ($i = 0; $i < 11; $i++) {
+            $response = $this->post("/register/invite/tokenhere{$i}", [
+                'password' => 'my test password',
+            ]);
+        }
+
+        $response->assertStatus(429);
+    }
 }

From d133f904d369cf2ca964a5c9f54e4e19843507c2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 20 May 2024 17:23:15 +0100
Subject: [PATCH 135/666] Auth: Changed email confirmations to use login
 attempt user

Negates the need for a public confirmation resend form
since we can instead just send direct to the last session login attempter.
---
 .../Controllers/ConfirmEmailController.php    | 25 +++++---
 .../Controllers/HandlesPartialLogins.php      |  2 +-
 app/Access/EmailConfirmationService.php       |  2 +-
 .../StoppedAuthenticationException.php        | 14 ++---
 lang/en/errors.php                            |  1 +
 ...hp => register-confirm-awaiting.blade.php} | 10 +---
 tests/Auth/RegistrationTest.php               | 58 +++++++++++++++++++
 7 files changed, 83 insertions(+), 29 deletions(-)
 rename resources/views/auth/{user-unconfirmed.blade.php => register-confirm-awaiting.blade.php} (66%)

diff --git a/app/Access/Controllers/ConfirmEmailController.php b/app/Access/Controllers/ConfirmEmailController.php
index 94647e06e59..d71b8f45068 100644
--- a/app/Access/Controllers/ConfirmEmailController.php
+++ b/app/Access/Controllers/ConfirmEmailController.php
@@ -32,13 +32,17 @@ public function show()
 
     /**
      * Shows a notice that a user's email address has not been confirmed,
-     * Also has the option to re-send the confirmation email.
+     * along with the option to re-send the confirmation email.
      */
     public function showAwaiting()
     {
         $user = $this->loginService->getLastLoginAttemptUser();
+        if ($user === null) {
+            $this->showErrorNotification(trans('errors.login_user_not_found'));
+            return redirect('/login');
+        }
 
-        return view('auth.user-unconfirmed', ['user' => $user]);
+        return view('auth.register-confirm-awaiting');
     }
 
     /**
@@ -90,19 +94,24 @@ public function confirm(Request $request)
     /**
      * Resend the confirmation email.
      */
-    public function resend(Request $request)
+    public function resend()
     {
-        $this->validate($request, [
-            'email' => ['required', 'email', 'exists:users,email'],
-        ]);
-        $user = $this->userRepo->getByEmail($request->get('email'));
+        $user = $this->loginService->getLastLoginAttemptUser();
+        if ($user === null) {
+            $this->showErrorNotification(trans('errors.login_user_not_found'));
+            return redirect('/login');
+        }
 
         try {
             $this->emailConfirmationService->sendConfirmation($user);
+        } catch (ConfirmationEmailException $e) {
+            $this->showErrorNotification($e->getMessage());
+
+            return redirect('/login');
         } catch (Exception $e) {
             $this->showErrorNotification(trans('auth.email_confirm_send_error'));
 
-            return redirect('/register/confirm');
+            return redirect('/register/awaiting');
         }
 
         $this->showSuccessNotification(trans('auth.email_confirm_resent'));
diff --git a/app/Access/Controllers/HandlesPartialLogins.php b/app/Access/Controllers/HandlesPartialLogins.php
index c5554e47300..47a63d19b0c 100644
--- a/app/Access/Controllers/HandlesPartialLogins.php
+++ b/app/Access/Controllers/HandlesPartialLogins.php
@@ -17,7 +17,7 @@ protected function currentOrLastAttemptedUser(): User
         $user = auth()->user() ?? $loginService->getLastLoginAttemptUser();
 
         if (!$user) {
-            throw new NotFoundException('A user for this action could not be found');
+            throw new NotFoundException(trans('errors.login_user_not_found'));
         }
 
         return $user;
diff --git a/app/Access/EmailConfirmationService.php b/app/Access/EmailConfirmationService.php
index de9ea69b882..1a5156d3e7a 100644
--- a/app/Access/EmailConfirmationService.php
+++ b/app/Access/EmailConfirmationService.php
@@ -17,7 +17,7 @@ class EmailConfirmationService extends UserTokenService
      *
      * @throws ConfirmationEmailException
      */
-    public function sendConfirmation(User $user)
+    public function sendConfirmation(User $user): void
     {
         if ($user->email_confirmed) {
             throw new ConfirmationEmailException(trans('errors.email_already_confirmed'), '/login');
diff --git a/app/Exceptions/StoppedAuthenticationException.php b/app/Exceptions/StoppedAuthenticationException.php
index 51e48aa1cf3..8a917bc5226 100644
--- a/app/Exceptions/StoppedAuthenticationException.php
+++ b/app/Exceptions/StoppedAuthenticationException.php
@@ -9,16 +9,10 @@
 
 class StoppedAuthenticationException extends \Exception implements Responsable
 {
-    protected $user;
-    protected $loginService;
-
-    /**
-     * StoppedAuthenticationException constructor.
-     */
-    public function __construct(User $user, LoginService $loginService)
-    {
-        $this->user = $user;
-        $this->loginService = $loginService;
+    public function __construct(
+        protected User $user,
+        protected LoginService $loginService
+    ) {
         parent::__construct();
     }
 
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 8773a78cbf7..752eb5672f1 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
     'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
diff --git a/resources/views/auth/user-unconfirmed.blade.php b/resources/views/auth/register-confirm-awaiting.blade.php
similarity index 66%
rename from resources/views/auth/user-unconfirmed.blade.php
rename to resources/views/auth/register-confirm-awaiting.blade.php
index 2f780b8a31f..e5d6f61b253 100644
--- a/resources/views/auth/user-unconfirmed.blade.php
+++ b/resources/views/auth/register-confirm-awaiting.blade.php
@@ -14,15 +14,7 @@
             </p>
 
             <form action="{{ url("/register/confirm/resend") }}" method="POST" class="stretch-inputs">
-                {!! csrf_field() !!}
-                <div class="form-group">
-                    <label for="email">{{ trans('auth.email') }}</label>
-                    @if($user)
-                        @include('form.text', ['name' => 'email', 'model' => $user])
-                    @else
-                        @include('form.text', ['name' => 'email'])
-                    @endif
-                </div>
+                {{ csrf_field() }}
                 <div class="form-group text-right mt-m">
                     <button type="submit" class="button">{{ trans('auth.email_not_confirmed_resend_button') }}</button>
                 </div>
diff --git a/tests/Auth/RegistrationTest.php b/tests/Auth/RegistrationTest.php
index 42d1120e4a8..2666fa3b4c7 100644
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -25,6 +25,9 @@ public function test_confirmed_registration()
         $resp->assertRedirect('/register/confirm');
         $this->assertDatabaseHas('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 
+        $resp = $this->get('/register/confirm');
+        $resp->assertSee('Thanks for registering!');
+
         // Ensure notification sent
         /** @var User $dbUser */
         $dbUser = User::query()->where('email', '=', $user->email)->first();
@@ -232,4 +235,59 @@ public function test_registration_confirmation_throttled()
 
         $response->assertStatus(429);
     }
+
+    public function test_registration_confirmation_resend()
+    {
+        Notification::fake();
+        $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
+        $user = User::factory()->make();
+
+        $resp = $this->post('/register', $user->only('name', 'email', 'password'));
+        $resp->assertRedirect('/register/confirm');
+        $dbUser = User::query()->where('email', '=', $user->email)->first();
+
+        $resp = $this->post('/login', ['email' => $user->email, 'password' => $user->password]);
+        $resp->assertRedirect('/register/confirm/awaiting');
+
+        $resp = $this->post('/register/confirm/resend');
+        $resp->assertRedirect('/register/confirm');
+        Notification::assertSentToTimes($dbUser, ConfirmEmailNotification::class, 2);
+    }
+
+    public function test_registration_confirmation_expired_resend()
+    {
+        Notification::fake();
+        $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
+        $user = User::factory()->make();
+
+        $resp = $this->post('/register', $user->only('name', 'email', 'password'));
+        $resp->assertRedirect('/register/confirm');
+        $dbUser = User::query()->where('email', '=', $user->email)->first();
+
+        $resp = $this->post('/login', ['email' => $user->email, 'password' => $user->password]);
+        $resp->assertRedirect('/register/confirm/awaiting');
+
+        $emailConfirmation = DB::table('email_confirmations')->where('user_id', '=', $dbUser->id)->first();
+        $this->travel(2)->days();
+
+        $resp = $this->post("/register/confirm/accept", [
+            'token' => $emailConfirmation->token,
+        ]);
+        $resp->assertRedirect('/register/confirm');
+        $this->assertSessionError('The confirmation token has expired, A new confirmation email has been sent.');
+
+        Notification::assertSentToTimes($dbUser, ConfirmEmailNotification::class, 2);
+    }
+
+    public function test_registration_confirmation_awaiting_and_resend_returns_to_log_if_no_login_attempt_user_found()
+    {
+        $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
+
+        $this->get('/register/confirm/awaiting')->assertRedirect('/login');
+        $this->assertSessionError('A user for this action could not be found.');
+        $this->flushSession();
+
+        $this->post('/register/confirm/resend')->assertRedirect('/login');
+        $this->assertSessionError('A user for this action could not be found.');
+    }
 }

From bdfa76ed9ae835d59a7cf52737ea331027770aba Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 20 May 2024 17:28:53 +0100
Subject: [PATCH 136/666] Deps: Updated php/composer packages

---
 composer.lock | 122 +++++++++++++++++++++++++-------------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/composer.lock b/composer.lock
index b5b08a90245..48147599558 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.305.9",
+            "version": "3.307.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "a611af9a40a5d93f2f04427b322dbb6044e90327"
+                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a611af9a40a5d93f2f04427b322dbb6044e90327",
-                "reference": "a611af9a40a5d93f2f04427b322dbb6044e90327",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc79f16e1a1bd3feee421401ba2f21915abfdf91",
+                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.305.9"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.307.1"
             },
-            "time": "2024-05-03T18:09:03+00:00"
+            "time": "2024-05-17T18:07:44+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1167,26 +1167,26 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.0",
+            "version": "v6.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
+                "reference": "500501c2ce893c824c801da135d02661199f60c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
-                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
+                "reference": "500501c2ce893c824c801da135d02661199f60c5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
+                "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "guzzlehttp/guzzle": "^7.4",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
+                "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0"
             },
@@ -1224,9 +1224,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
             },
-            "time": "2023-12-01T16:26:39+00:00"
+            "time": "2024-05-18T18:05:11+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1838,16 +1838,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.6.3",
+            "version": "3.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "2dbfb53bf8909257e710cf6091d10a9ca7500742"
+                "reference": "193324ec88bc5ad4039e57ce9b926ae28dfde813"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/2dbfb53bf8909257e710cf6091d10a9ca7500742",
-                "reference": "2dbfb53bf8909257e710cf6091d10a9ca7500742",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/193324ec88bc5ad4039e57ce9b926ae28dfde813",
+                "reference": "193324ec88bc5ad4039e57ce9b926ae28dfde813",
                 "shasum": ""
             },
             "require": {
@@ -1894,7 +1894,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.6.3"
+                "source": "https://github.com/Intervention/image/tree/3.6.4"
             },
             "funding": [
                 {
@@ -1906,7 +1906,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-02T09:03:18+00:00"
+            "time": "2024-05-08T13:53:15+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -2302,16 +2302,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.13.2",
+            "version": "v5.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "278d4615f68205722b3a129135774b3764b28a90"
+                "reference": "c7b0193a3753a29aff8ce80aa2f511917e6ed68a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/278d4615f68205722b3a129135774b3764b28a90",
-                "reference": "278d4615f68205722b3a129135774b3764b28a90",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/c7b0193a3753a29aff8ce80aa2f511917e6ed68a",
+                "reference": "c7b0193a3753a29aff8ce80aa2f511917e6ed68a",
                 "shasum": ""
             },
             "require": {
@@ -2370,7 +2370,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-04-26T13:48:16+00:00"
+            "time": "2024-05-03T20:31:38+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3822,16 +3822,16 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
                 "shasum": ""
             },
             "require": {
@@ -3885,7 +3885,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2024-05-08T12:18:48+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4579,20 +4579,20 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -4616,7 +4616,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -4628,9 +4628,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
@@ -8326,16 +8326,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.5",
+            "version": "v2.9.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "101f1a4470f87326f4d3995411d28679d8800abe"
+                "reference": "93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/101f1a4470f87326f4d3995411d28679d8800abe",
-                "reference": "101f1a4470f87326f4d3995411d28679d8800abe",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f",
+                "reference": "93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f",
                 "shasum": ""
             },
             "require": {
@@ -8404,7 +8404,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.5"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.6"
             },
             "funding": [
                 {
@@ -8424,20 +8424,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-04-16T19:13:34+00:00"
+            "time": "2024-05-09T11:53:26+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.11",
+            "version": "1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
-                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                 "shasum": ""
             },
             "require": {
@@ -8507,7 +8507,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-03-21T18:34:15+00:00"
+            "time": "2024-05-16T03:13:13+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -8872,16 +8872,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.67",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
+                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
-                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b",
+                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b",
                 "shasum": ""
             },
             "require": {
@@ -8926,7 +8926,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-16T07:22:02+00:00"
+            "time": "2024-05-15T08:00:59+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10268,16 +10268,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.2",
+            "version": "3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
+                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
-                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
+                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
                 "shasum": ""
             },
             "require": {
@@ -10344,7 +10344,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-04-23T20:25:34+00:00"
+            "time": "2024-05-20T08:11:32+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10541,5 +10541,5 @@
     "platform-overrides": {
         "php": "8.1.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From 586e8963a8f47c5fff65a44e1e6bf2db92bc1d35 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Tue, 21 May 2024 11:04:27 +0100
Subject: [PATCH 137/666] Updated translations with latest Crowdin changes
 (#4994)

---
 lang/ar/common.php            |  2 +-
 lang/ar/errors.php            |  1 +
 lang/bg/errors.php            |  1 +
 lang/bs/errors.php            |  1 +
 lang/ca/errors.php            |  1 +
 lang/cs/errors.php            |  1 +
 lang/cy/errors.php            |  1 +
 lang/da/errors.php            |  1 +
 lang/de/errors.php            |  1 +
 lang/de_informal/errors.php   |  1 +
 lang/de_informal/settings.php |  2 +-
 lang/el/errors.php            |  1 +
 lang/es/errors.php            |  1 +
 lang/es_AR/activities.php     |  6 +++---
 lang/es_AR/common.php         | 10 +++++-----
 lang/es_AR/components.php     |  2 +-
 lang/es_AR/editor.php         |  4 ++--
 lang/es_AR/errors.php         |  1 +
 lang/et/errors.php            |  1 +
 lang/eu/errors.php            |  1 +
 lang/fa/errors.php            |  1 +
 lang/fi/errors.php            |  1 +
 lang/fr/errors.php            |  1 +
 lang/fr/settings.php          |  2 +-
 lang/he/activities.php        |  8 ++++----
 lang/he/errors.php            |  1 +
 lang/hr/errors.php            |  1 +
 lang/hu/common.php            |  2 +-
 lang/hu/errors.php            |  1 +
 lang/hu/preferences.php       |  2 +-
 lang/hu/settings.php          | 16 ++++++++--------
 lang/id/errors.php            |  1 +
 lang/it/errors.php            |  1 +
 lang/ja/errors.php            |  1 +
 lang/ka/errors.php            |  1 +
 lang/ko/errors.php            |  1 +
 lang/lt/errors.php            |  1 +
 lang/lv/errors.php            |  1 +
 lang/nb/errors.php            |  1 +
 lang/nl/activities.php        | 14 +++++++-------
 lang/nl/auth.php              | 26 +++++++++++++-------------
 lang/nl/editor.php            |  2 +-
 lang/nl/entities.php          | 10 +++++-----
 lang/nl/errors.php            |  1 +
 lang/nl/settings.php          |  2 +-
 lang/nn/errors.php            |  1 +
 lang/pl/errors.php            |  1 +
 lang/pt/errors.php            |  1 +
 lang/pt_BR/errors.php         |  1 +
 lang/ro/errors.php            |  1 +
 lang/ru/errors.php            |  1 +
 lang/sk/errors.php            |  1 +
 lang/sl/errors.php            |  1 +
 lang/sq/errors.php            |  1 +
 lang/sr/errors.php            |  1 +
 lang/sv/editor.php            | 10 +++++-----
 lang/sv/errors.php            |  1 +
 lang/sv/settings.php          | 20 ++++++++++----------
 lang/tr/errors.php            |  1 +
 lang/uk/errors.php            |  1 +
 lang/uz/errors.php            |  1 +
 lang/vi/errors.php            |  1 +
 lang/zh_CN/errors.php         |  1 +
 lang/zh_TW/errors.php         |  1 +
 lang/zh_TW/settings.php       | 13 +++++++------
 65 files changed, 123 insertions(+), 76 deletions(-)

diff --git a/lang/ar/common.php b/lang/ar/common.php
index 740b1fbbb94..02868b565ad 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -20,7 +20,7 @@
     'description' => 'الوصف',
     'role' => 'الدور',
     'cover_image' => 'صورة الغلاف',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'يجب أن يكون حجم هذه الصورة تقريبًا 440x250 بكسل، على الرغم من أنه سيتم تحجيمها وقصها بشكل مرن لتناسب واجهة المستخدم في سيناريوهات مختلفة حسب الحاجة، لذا فإن الأبعاد الفعلية للعرض ستختلف.',
 
     // Actions
     'actions' => 'إجراءات',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index e1d968a03a7..9ffc4c1759a 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'لم يتم العثور على السوشيال درايفر "Social driver"',
     'social_driver_not_configured' => 'لم يتم تهيئة إعدادات حسابك الاجتماعي بشكل صحيح.',
     'invite_token_expired' => 'انتهت صلاحية رابط هذه الدعوة. يمكنك بدلاً من ذلك محاولة إعادة تعيين كلمة مرور حسابك.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'لا يمكن الرفع إلى مسار :filePath. الرجاء التأكد من قابلية الكتابة إلى الخادم.',
diff --git a/lang/bg/errors.php b/lang/bg/errors.php
index 6b9d8a20c41..8272683db11 100644
--- a/lang/bg/errors.php
+++ b/lang/bg/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Кодът за връзка със социалната мрежа не съществува',
     'social_driver_not_configured' => 'Социалните настройки на твоя :socialAccount не са конфигурирани правилно.',
     'invite_token_expired' => 'Твоята покана е изтекла. Вместо това може да пробваш да възстановиш паролата на профила си.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Не може да се качи файл в :filePath. Увери се на сървъра, че в пътя може да се записва.',
diff --git a/lang/bs/errors.php b/lang/bs/errors.php
index bcf60a323e7..2dd0f94ef28 100644
--- a/lang/bs/errors.php
+++ b/lang/bs/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Driver društvene mreže nije pronađen',
     'social_driver_not_configured' => 'Vaše :socialAccount postavke nisu konfigurisane ispravno.',
     'invite_token_expired' => 'Pozivni link je istekao. Možete umjesto toga pokušati da resetujete lozinku.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Na putanju fajla :filePath se ne može učitati. Potvrdite da je omogućeno pisanje na server.',
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 46943fdb1f3..5655276961f 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'No s’ha trobat el controlador social',
     'social_driver_not_configured' => 'La configuració social de :socialAccount no és correcta.',
     'invite_token_expired' => 'Aquest enllaç d’invitació ha caducat. Podeu provar de restablir la contrasenya del vostre compte.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'No s’ha pogut pujar al camí del fitxer :filePath. Assegureu-vos que el servidor hi té permisos d’escriptura.',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index 2ee281c3eee..37b9348a236 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Doplněk pro tohoto správce identity nebyl nalezen.',
     'social_driver_not_configured' => 'Nastavení vašeho účtu na :socialAccount není správné. :socialAccount musí mít vaše svolení pro naší aplikaci vás přihlásit.',
     'invite_token_expired' => 'Odkaz v pozvánce již bohužel vypršel. Namísto toho ale můžete zkusit resetovat heslo do Vašeho účtu.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Nelze zapisovat na cestu k souboru :filePath. Zajistěte aby se dalo nahrávat na server.',
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index a2c8fada5a7..71a47bc40cd 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Gyrrwr cymdeithasol heb ei ganfod',
     'social_driver_not_configured' => 'Nid yw eich gosodiadau cymdeithasol :socialAccount wedi\'u ffurfweddu\'n gywir.',
     'invite_token_expired' => 'Mae\'r ddolen wahoddiad hon wedi dod i ben. Yn lle hynny, gallwch chi geisio ailosod cyfrinair eich cyfrif.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Nid oedd modd uwchlwytho llwybr ffeil :filePath. Sicrhewch ei fod yn ysgrifenadwy i\'r gweinydd.',
diff --git a/lang/da/errors.php b/lang/da/errors.php
index bc27a90232f..dbee7125115 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Socialdriver ikke fundet',
     'social_driver_not_configured' => 'Dine :socialAccount indstillinger er ikke konfigureret korret.',
     'invite_token_expired' => 'Dette invitationslink er udløbet. I stedet kan du prøve at nulstille din kontos kodeord.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Filsti :filePath kunne ikke uploades til. Sørg for at den kan skrives til af webserveren.',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 8cfddacd8a6..5ba185ee6c3 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Treiber für Social-Media-Konten nicht gefunden',
     'social_driver_not_configured' => 'Ihr :socialAccount-Konto ist nicht korrekt konfiguriert.',
     'invite_token_expired' => 'Dieser Einladungslink ist abgelaufen. Sie können stattdessen versuchen Ihr Passwort zurückzusetzen.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Die Datei kann nicht in den angegebenen Pfad :filePath hochgeladen werden. Stellen Sie sicher, dass dieser Ordner auf dem Server beschreibbar ist.',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index f40b3e1484e..2ae27c1063f 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Treiber für Social-Media-Konten nicht gefunden',
     'social_driver_not_configured' => 'Dein :socialAccount-Konto ist nicht korrekt konfiguriert.',
     'invite_token_expired' => 'Dieser Einladungslink ist abgelaufen. Du kannst stattdessen versuchen, dein Passwort zurückzusetzen.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Die Datei kann nicht in den angegebenen Pfad :filePath hochgeladen werden. Stelle sicher, dass dieser Ordner auf dem Server beschreibbar ist.',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 4398edebdae..e80c2e7b001 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -279,7 +279,7 @@
 
     // Licensing
     'licenses' => 'Lizenzen',
-    'licenses_desc' => 'Diese Seite beschreibt Lizenzinformationen für BookStack zusätzlich zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele aufgelistete Projekte dürfen nur in einem Entwicklungskontext verwendet werden.',
+    'licenses_desc' => 'Diese Seite beschreibt Lizenzinformationen für BookStack zusätzlich zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele aufgelistete Projekte werden nur in einem Entwicklungskontext verwendet.',
     'licenses_bookstack' => 'BookStack-Lizenz',
     'licenses_php' => 'PHP-Bibliothekslizenzen',
     'licenses_js' => 'JavaScript-Bibliothekslizenzen',
diff --git a/lang/el/errors.php b/lang/el/errors.php
index 93b8dd45a02..2872402662f 100644
--- a/lang/el/errors.php
+++ b/lang/el/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Δεν βρέθηκε κοινωνικός οδηγός',
     'social_driver_not_configured' => 'Οι κοινωνικές ρυθμίσεις του :socialAccount δεν έχουν ρυθμιστεί σωστά.',
     'invite_token_expired' => 'Αυτός ο σύνδεσμος πρόσκλησης έχει λήξει. Αντ\' αυτού μπορείτε να προσπαθήσετε να επαναφέρετε τον κωδικό πρόσβασής σας.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Η διαδρομή αρχείου :filePath δεν μπόρεσε να μεταφορτωθεί. Βεβαιωθείτε ότι είναι εγγράψιμη στο διακομιστή.',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index 1bf7db13247..97c376df101 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Driver social no encontrado',
     'social_driver_not_configured' => 'Su configuración :socialAccount no es correcta.',
     'invite_token_expired' => 'Este enlace de invitación ha expirado. Puede resetear la contraseña de su cuenta como alternativa.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'El fichero no pudo ser subido a la ruta :filePath . Asegúrese de que es escribible por el servidor.',
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index f0afe2d43c0..62d986ceaa0 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -97,7 +97,7 @@
     'api_token_create_notification' => 'Token de API creado correctamente',
     'api_token_update' => 'token de API actualizado',
     'api_token_update_notification' => 'Token de API actualizado correctamente',
-    'api_token_delete' => 'token de API borrado',
+    'api_token_delete' => 'API token eliminado',
     'api_token_delete_notification' => 'Token de API eliminado correctamente',
 
     // Roles
@@ -115,9 +115,9 @@
 
     // Comments
     'commented_on'                => 'comentado',
-    'comment_create'              => 'comentario añadido',
+    'comment_create'              => 'comentario agregado',
     'comment_update'              => 'comentario actualizado',
-    'comment_delete'              => 'comentario borrado',
+    'comment_delete'              => 'comentario eliminado',
 
     // Other
     'permissions_update'          => 'permisos actualizados',
diff --git a/lang/es_AR/common.php b/lang/es_AR/common.php
index 73a2664043f..bbda086acf1 100644
--- a/lang/es_AR/common.php
+++ b/lang/es_AR/common.php
@@ -12,7 +12,7 @@
     'save' => 'Guardar',
     'continue' => 'Continuar',
     'select' => 'Seleccionar',
-    'toggle_all' => 'Alternar todo',
+    'toggle_all' => 'Mostrar/Ocultar Todo',
     'more' => 'Más',
 
     // Form Labels
@@ -20,7 +20,7 @@
     'description' => 'Descripción',
     'role' => 'Rol',
     'cover_image' => 'Imagen de cubierta',
-    'cover_image_description' => 'Esta imagen debe ser de aproximadamente 440x250px aunque será escalada y recortada para adaptarse a la interfaz de usuario en diferentes escenarios según sea necesario, por lo que las dimensiones en pantalla diferirán.',
+    'cover_image_description' => 'Esta imagen debe ser de 440x250px aproximadamente, aunque será escalada y recortada para adaptarse a la interfaz de usuario en los diferentes escenarios según sea necesario, por lo que las dimensiones en pantalla serán diferentes.',
 
     // Actions
     'actions' => 'Acciones',
@@ -42,7 +42,7 @@
     'remove' => 'Remover',
     'add' => 'Agregar',
     'configure' => 'Configurar',
-    'manage' => 'Gestionar',
+    'manage' => 'Administra',
     'fullscreen' => 'Pantalla completa',
     'favourite' => 'Favoritos',
     'unfavourite' => 'Eliminar de favoritos',
@@ -70,8 +70,8 @@
     'no_items' => 'No hay elementos disponibles',
     'back_to_top' => 'Volver arriba',
     'skip_to_main_content' => 'Ir al contenido principal',
-    'toggle_details' => 'Alternar detalles',
-    'toggle_thumbnails' => 'Alternar miniaturas',
+    'toggle_details' => 'Mostrar/Ocultar Detalles',
+    'toggle_thumbnails' => 'Mostrar/Ocultar Miniaturas',
     'details' => 'Detalles',
     'grid_view' => 'Vista de grilla',
     'list_view' => 'Vista de lista',
diff --git a/lang/es_AR/components.php b/lang/es_AR/components.php
index d701c857a6a..0e2c4c88bae 100644
--- a/lang/es_AR/components.php
+++ b/lang/es_AR/components.php
@@ -34,7 +34,7 @@
     'image_delete_success' => 'Imagen borrada exitosamente',
     'image_replace' => 'Reemplazar imagen',
     'image_replace_success' => 'Imagen actualizada correctamente',
-    'image_rebuild_thumbs' => 'Regenerar distintos tamaños',
+    'image_rebuild_thumbs' => 'Regenerar Variaciones de Tamaño',
     'image_rebuild_thumbs_success' => '¡Imágenes de distinto tamaño regeneradas correctamente!',
 
     // Code Editor
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 52563e4bc8e..3cd7d4657a7 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Propiedades de tabla',
     'table_properties_title' => 'Propiedades de Tabla',
     'delete_table' => 'Eliminar tabla',
-    'table_clear_formatting' => 'Limpiar formato de tabla',
+    'table_clear_formatting' => 'Limpiar el formato de tabla',
     'resize_to_contents' => 'Redimensionar al contenido',
-    'row_header' => 'Fila de cabecera',
+    'row_header' => 'Cabecera de fila',
     'insert_row_before' => 'Insertar fila arriba',
     'insert_row_after' => 'Insertar fila abajo',
     'delete_row' => 'Eliminar fila',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index 922bcd1dbe0..818dccfb7b5 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Driver social no encontrado',
     'social_driver_not_configured' => 'Su configuración :socialAccount no es correcta.',
     'invite_token_expired' => 'El enace de la esta invitación expiró. Puede intentar restablecer la contraseña de su cuenta',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'La ruta :filePath no pudo ser cargada. Asegurese de que es escribible por el servidor.',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 9868227269f..9cda6252119 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Sotsiaalmeedia kontode draiverit ei leitud',
     'social_driver_not_configured' => 'Sinu :socialAccount konto seaded ei ole korrektsed.',
     'invite_token_expired' => 'Link on aegunud. Võid selle asemel proovida oma konto parooli lähtestada.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Faili asukohaga :filePath ei õnnestunud üles laadida. Veendu, et serveril on kirjutusõigused.',
diff --git a/lang/eu/errors.php b/lang/eu/errors.php
index 61d50d8b1d5..b5eef6ff275 100644
--- a/lang/eu/errors.php
+++ b/lang/eu/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
     'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 97c631edcab..8c16396b353 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'درایور شبکه اجتماعی یافت نشد',
     'social_driver_not_configured' => 'تنظیمات شبکه اجتماعی :socialAccount به درستی پیکربندی نشده است.',
     'invite_token_expired' => 'این پیوند دعوت منقضی شده است. در عوض می توانید سعی کنید رمز عبور حساب خود را بازنشانی کنید.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'مسیر فایل :filePath را نمی توان در آن آپلود کرد. مطمئن شوید که روی سرور قابل نوشتن است.',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index ec348f0f223..73dc3946627 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -38,6 +38,7 @@
     'social_driver_not_found' => 'Sosiaalisen median tilin ajuria ei löytynyt',
     'social_driver_not_configured' => ':socialAccount-tilin asetuksia ei ole määritetty oikein.',
     'invite_token_expired' => 'Tämä kutsulinkki on vanhentunut. Voit sen sijaan yrittää palauttaa tilisi salasanan.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Tiedostopolkuun :filePath ei voitu ladata tiedostoa. Tarkista polun kirjoitusoikeudet.',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index c71ef501d33..7d45c09d836 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Pilote de compte de réseaux sociaux absent',
     'social_driver_not_configured' => 'Vos préférences pour le compte :socialAccount sont incorrectes.',
     'invite_token_expired' => 'Le lien de cette invitation a expiré. Vous pouvez essayer de réinitialiser votre mot de passe.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Impossible d\'écrire dans :filePath. Assurez-vous d\'avoir les droits d\'écriture sur le serveur',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index fa7433c484c..f5c2c6d2b20 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -222,7 +222,7 @@
     'users_api_tokens_desc' => 'Créer et gérer les jetons d\'accès utilisés pour s\'authentifier avec l\'API REST de BookStack. Les permissions pour l\'API sont gérées par l\'utilisateur auquel le jeton appartient.',
     'users_api_tokens_none' => 'Aucun jeton API n\'a été créé pour cet utilisateur',
     'users_api_tokens_create' => 'Créer un jeton',
-    'users_api_tokens_expires' => 'Expiré',
+    'users_api_tokens_expires' => 'Expire',
     'users_api_tokens_docs' => 'Documentation de l\'API',
     'users_mfa' => 'Authentification multi-facteurs',
     'users_mfa_desc' => 'Configurer l\'authentification multi-facteurs ajoute une couche supplémentaire de sécurité à votre compte utilisateur.',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index d8fb69d61e6..4eadd419671 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -6,13 +6,13 @@
 return [
 
     // Pages
-    'page_create'                 => 'דף נוצר',
+    'page_create'                 => 'הדף נוצר',
     'page_create_notification'    => 'הדף נוצר בהצלחה',
-    'page_update'                 => 'דף עודכן',
+    'page_update'                 => 'הדף עודכן',
     'page_update_notification'    => 'הדף עודכן בהצלחה',
-    'page_delete'                 => 'דף נמחק',
+    'page_delete'                 => 'הדף נמחק',
     'page_delete_notification'    => 'הדף הוסר בהצלחה',
-    'page_restore'                => 'דף שוחזר',
+    'page_restore'                => 'הדף שוחזר',
     'page_restore_notification'   => 'הדף שוחזר בהצלחה',
     'page_move'                   => 'דף הועבר',
     'page_move_notification'      => 'Page successfully moved',
diff --git a/lang/he/errors.php b/lang/he/errors.php
index c8246279838..af181b5a5bd 100644
--- a/lang/he/errors.php
+++ b/lang/he/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'הגדרות ה :socialAccount אינן מוגדרות כראוי',
     'invite_token_expired' => 'לינק ההזמנה פג. אתה יכול לנסות לאפס את סיסמת החשבון שלך במקום.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'לא ניתן להעלות את :filePath אנא ודא שניתן לכתוב למיקום זה',
diff --git a/lang/hr/errors.php b/lang/hr/errors.php
index 5be97feb98a..8c1aad79fd0 100644
--- a/lang/hr/errors.php
+++ b/lang/hr/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Nije pronađeno',
     'social_driver_not_configured' => 'Postavke vašeg :socialAccount računa nisu ispravno postavljene.',
     'invite_token_expired' => 'Vaša pozivnica je istekla. Pokušajte ponovno postaviti lozinku.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Datoteka :filePath ne može se prenijeti. Učinite je lakše prepoznatljivom vašem serveru.',
diff --git a/lang/hu/common.php b/lang/hu/common.php
index a79ee00e5f6..715d5e71c90 100644
--- a/lang/hu/common.php
+++ b/lang/hu/common.php
@@ -20,7 +20,7 @@
     'description' => 'Leírás',
     'role' => 'Szerepkör',
     'cover_image' => 'Borítókép',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Ennek a képnek körülbelül 440 x 250 képpont méretűnek kell lennie, bár rugalmasan méretezhető és levágható, hogy a felhasználói felülethez illeszkedjen a különböző lehetőségek esetén, így a megjelenítés tényleges méretei eltérőek lesznek.',
 
     // Actions
     'actions' => 'Műveletek',
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index 0183cd1924d..34e4f2b74a3 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Közösségi meghajtó nem található',
     'social_driver_not_configured' => ':socialAccount közösségi beállítások nem megfelelőek.',
     'invite_token_expired' => 'Ez a meghívó hivatkozás lejárt. Helyette meg lehet próbálni új jelszót megadni a fiókhoz.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => ':filePath elérési út nem tölthető fel. Ellenőrizni kell, hogy az útvonal a kiszolgáló számára írható.',
diff --git a/lang/hu/preferences.php b/lang/hu/preferences.php
index 11d145064ad..8c78a1d0e9c 100644
--- a/lang/hu/preferences.php
+++ b/lang/hu/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Beállítások mentése',
     'notifications_update_success' => 'Az értesítési beállítások frissítve lettek!',
     'notifications_watched' => 'Megfigyelt és figyelmen kívül hagyott elemek',
-    'notifications_watched_desc' => 'Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keress a figyelési lehetőségeket az oldalsávban.',
+    'notifications_watched_desc' => 'Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keresd a figyelési lehetőségeket az oldalsávban.',
 
     'auth' => 'Hozzáférés és Biztonság',
     'auth_change_password' => 'Jelszó módosítása',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index 9bf8880d3b6..bacb466aabe 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'A lomtár jelenleg üres',
     'recycle_bin_empty' => 'Lomtár kiürítése',
     'recycle_bin_empty_confirm' => 'Ezzel véglegesen megsemmisíti a lomtárban lévő összes elemet, beleértve az egyes tételekben található tartalmat is. Biztos benne, hogy ki akarja üríteni a lomtárat?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Ez a művelet véglegesen törli ezt az elemet a rendszerből az alább felsorolt összes alárendelt elemmel együtt, és nem fogja tudni visszaállítani ezt a tartalmat. Biztosan véglegesen törli ezt az elemet?',
     'recycle_bin_destroy_list' => 'Megsemmisítendő elemek',
     'recycle_bin_restore_list' => 'Visszaállítandó elemek',
     'recycle_bin_restore_confirm' => 'Ez a művelet visszaállítja a törölt elemet, beleértve az utódelemeket is, az eredeti helyükre. Ha az eredeti helyet azóta törölték, és most a lomtárban van, akkor a szülőelemet is vissza kell állítani.',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => 'Utolsó hibaüzenet:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Licenszek',
+    'licenses_desc' => 'Ez az oldal a BookStack licencinformációit részletezi, a BookStackben használt projekteken és könyvtárakon kívül. Sok felsorolt projekt csak fejlesztési környezetben használható.',
+    'licenses_bookstack' => 'BookStack Licensz',
+    'licenses_php' => 'PHP könyvtár licencek',
+    'licenses_js' => 'JavaScript könyvtár licencek',
+    'licenses_other' => 'Egyéb licencek',
+    'license_details' => 'Licenc részletek',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/id/errors.php b/lang/id/errors.php
index 64ac146397e..de388358085 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Pengemudi sosial tidak ditemukan',
     'social_driver_not_configured' => 'Pengaturan sosial :socialAccount Anda tidak dikonfigurasi dengan benar.',
     'invite_token_expired' => 'Tautan undangan ini telah kedaluwarsa. Sebagai gantinya, Anda dapat mencoba mengatur ulang kata sandi akun Anda.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Jalur berkas :filePath tidak dapat diunggah. Pastikan berkas tersebut dapat ditulis ke server.',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index 05bf5373ffa..a65ea5e87d4 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Driver social non trovato',
     'social_driver_not_configured' => 'Le impostazioni di :socialAccount non sono configurate correttamente.',
     'invite_token_expired' => 'Il link di invito è scaduto. Puoi provare a resettare la password del tuo account.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Il percorso :filePath non è scrivibile. Controlla che abbia i permessi corretti.',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index a754f61c0c5..a944541111a 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driverが見つかりません',
     'social_driver_not_configured' => 'あなたの:socialAccount設定は正しく構成されていません。',
     'invite_token_expired' => 'この招待リンクの有効期限が切れています。 代わりにアカウントのパスワードをリセットしてみてください。',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'ファイルパス :filePath へアップロードできませんでした。サーバ上での書き込みが許可されているか確認してください。',
diff --git a/lang/ka/errors.php b/lang/ka/errors.php
index 8773a78cbf7..752eb5672f1 100644
--- a/lang/ka/errors.php
+++ b/lang/ka/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
     'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index 4e076c00790..bcfdf876cb6 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => '소셜 드라이버를 찾을 수 없습니다.',
     'social_driver_not_configured' => '소셜 계정 :socialAccount 가(이) 올바르게 구성되지 않았습니다.',
     'invite_token_expired' => '이 초대 링크가 만료되었습니다. 대신 계정 비밀번호 재설정을 시도해 보세요.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => '파일 경로 :filePath 에 업로드할 수 없습니다. 서버에 저장이 가능한지 확인하세요.',
diff --git a/lang/lt/errors.php b/lang/lt/errors.php
index cde76b056e0..c7ecf824510 100644
--- a/lang/lt/errors.php
+++ b/lang/lt/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Socialinis diskas nerastas',
     'social_driver_not_configured' => 'Jūsų :socialAccount socaliniai nustatymai sukonfigūruoti neteisingai.',
     'invite_token_expired' => 'Ši kvietimo nuoroda baigė galioti. Vietoj to, jūs galite bandyti iš naujo nustatyti savo paskyros slaptažodį.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Į failo kelią :filePath negalima įkelti. Įsitikinkite, kad jis yra įrašomas į serverį.',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 27b77b6311a..22ccbe3833a 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Sociālā tīkla savienojums nav atrasts',
     'social_driver_not_configured' => 'Jūsu :socialAccount sociālie iestatījumi nav uzstādīti pareizi.',
     'invite_token_expired' => 'Šī uzaicinājuma saite ir novecojusi. Tā vietā jūs varat mēģināt atiestatīt sava konta paroli.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Faila ceļā :filePath nav iespējams ielādēt failus. Lūdzu pārliecinieties, ka serverim tur ir rakstīšanas tiesības.',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 1e776be800f..2f3e802baae 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Autentiseringstjeneste fra sosiale medier er ikke installert',
     'social_driver_not_configured' => 'Dine :socialAccount innstilliner er ikke angitt.',
     'invite_token_expired' => 'Invitasjonslenken har utgått, du kan forsøke å be om nytt passord istede.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Filstien :filePath aksepterer ikke filer, du må sjekke filstitilganger i systemet.',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 1223dcf34d4..08c168e9fae 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -52,7 +52,7 @@
     // Revisions
     'revision_restore' => 'herstelde revisie',
     'revision_delete' => 'verwijderde revisie',
-    'revision_delete_notification' => 'Revisie met succes verwijderd',
+    'revision_delete_notification' => 'Revisie succesvol verwijderd',
 
     // Favourites
     'favourite_add_notification' => '":name" is toegevoegd aan je favorieten',
@@ -66,14 +66,14 @@
     'auth_register' => 'registreerde als nieuwe gebruiker',
     'auth_password_reset_request' => 'vraagde een nieuw gebruikerswachtwoord aan',
     'auth_password_reset_update' => 'stelde gebruikerswachtwoord opnieuw in',
-    'mfa_setup_method' => 'heeft zijn meervoudige verificatie methode ingesteld',
+    'mfa_setup_method' => 'stelde meervoudige verificatie methode in',
     'mfa_setup_method_notification' => 'Meervoudige verificatie methode succesvol geconfigureerd',
-    'mfa_remove_method' => 'heeft zijn meervoudige verificatie methode verwijderd',
+    'mfa_remove_method' => 'verwijderde meervoudige verificatie methode',
     'mfa_remove_method_notification' => 'Meervoudige verificatie methode is succesvol verwijderd',
 
     // Settings
     'settings_update' => 'werkte instellingen bij',
-    'settings_update_notification' => 'Instellingen met succes bijgewerkt',
+    'settings_update_notification' => 'Instellingen succesvol bijgewerkt',
     'maintenance_action_run' => 'voerde onderhoudsactie uit',
 
     // Webhooks
@@ -86,7 +86,7 @@
 
     // Users
     'user_create' => 'maakte gebruiker aan',
-    'user_create_notification' => 'Gebruiker met succes aangemaakt',
+    'user_create_notification' => 'Gebruiker succesvol aangemaakt',
     'user_update' => 'werkte gebruiker bij',
     'user_update_notification' => 'Gebruiker succesvol bijgewerkt',
     'user_delete' => 'verwijderde gebruiker',
@@ -95,9 +95,9 @@
     // API Tokens
     'api_token_create' => 'API-token aangemaakt',
     'api_token_create_notification' => 'API-token met succes aangemaakt',
-    'api_token_update' => 'geüpdatet API-token',
+    'api_token_update' => 'wijzigde API-token',
     'api_token_update_notification' => 'API-token met succes bijgewerkt',
-    'api_token_delete' => 'verwijderd API-token',
+    'api_token_delete' => 'verwijderde API-token',
     'api_token_delete_notification' => 'API-token met succes verwijderd',
 
     // Roles
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index a0dc79ab1e0..e3ff59cd6c2 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -36,15 +36,15 @@
     'register_confirm' => 'Controleer je e-mail en klik op de bevestigingsknop om toegang te krijgen tot :appName.',
     'registrations_disabled' => 'Registratie is momenteel niet mogelijk',
     'registration_email_domain_invalid' => 'Dit e-maildomein wordt niet toegelaten tot deze applicatie',
-    'register_success' => 'Bedankt voor het aanmelden! Je bent nu geregistreerd en aangemeld.',
+    'register_success' => 'Bedankt voor het aanmelden! Je bent nu geregistreerd en ingelogd.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Poging tot inloggen',
-    'auto_init_starting_desc' => 'We maken contact met jouw authenticatiesysteem om het inlogproces te starten. Als er na 5 seconden geen vooruitgang is, kun je proberen op de onderstaande link te klikken.',
+    'auto_init_starting' => 'Proberen in te loggen',
+    'auto_init_starting_desc' => 'We maken contact met je authenticatiesysteem om het inlogproces te starten. Als er na 5 seconden geen vooruitgang is, kun je proberen op de onderstaande link te klikken.',
     'auto_init_start_link' => 'Ga verder met authenticatie',
 
     // Password Reset
-    'reset_password' => 'Wachtwoord herstellen',
+    'reset_password' => 'Wachtwoord Herstellen',
     'reset_password_send_instructions' => 'Geef je e-mailadres op en er wordt een link gestuurd om je wachtwoord te herstellen.',
     'reset_password_send_button' => 'Stuur Herstel Link',
     'reset_password_sent' => 'Een link om het wachtwoord te resetten zal verstuurd worden naar :email als dat e-mailadres in het systeem gevonden is.',
@@ -62,7 +62,7 @@
     'email_confirm_success' => 'Je e-mailadres is bevestigd! Je zou nu moeten kunnen inloggen met dit e-mailadres.',
     'email_confirm_resent' => 'Bevestigingsmail opnieuw verzonden, controleer je inbox.',
     'email_confirm_thanks' => 'Bedankt voor de bevestiging!',
-    'email_confirm_thanks_desc' => 'Wacht even terwijl jouw bevestiging wordt behandeld. Als je na 3 seconden niet wordt doorverwezen, druk dan op de onderstaande link "Doorgaan" om verder te gaan.',
+    'email_confirm_thanks_desc' => 'Wacht even terwijl je bevestiging wordt behandeld. Als je na 3 seconden niet wordt doorverwezen, druk dan op de onderstaande link "Doorgaan" om verder te gaan.',
 
     'email_not_confirmed' => 'E-mailadres nog niet bevestigd',
     'email_not_confirmed_text' => 'Je e-mailadres is nog niet bevestigd.',
@@ -76,20 +76,20 @@
     'user_invite_email_text' => 'Klik op de onderstaande knop om een account wachtwoord in te stellen en toegang te krijgen:',
     'user_invite_email_action' => 'Account wachtwoord instellen',
     'user_invite_page_welcome' => 'Welkom bij :appName!',
-    'user_invite_page_text' => 'Om je account af te ronden en toegang te krijgen moet je een wachtwoord instellen dat gebruikt wordt om in te loggen op :appName bij toekomstige bezoeken.',
-    'user_invite_page_confirm_button' => 'Bevestig wachtwoord',
+    'user_invite_page_text' => 'Om je registratie af te ronden en toegang te krijgen moet je een wachtwoord instellen dat gebruikt zal worden om in te loggen op :appName bij toekomstige bezoeken.',
+    'user_invite_page_confirm_button' => 'Wachtwoord Bevestigen',
     'user_invite_success_login' => 'Wachtwoord ingesteld, je zou nu moeten kunnen inloggen met je ingestelde wachtwoord om toegang te krijgen tot :appName!',
 
     // Multi-factor Authentication
-    'mfa_setup' => 'Multi-factor authenticatie instellen',
-    'mfa_setup_desc' => 'Stel multi-factor authenticatie in als een extra beveiligingslaag voor je gebruikersaccount.',
-    'mfa_setup_configured' => 'Reeds geconfigureerd',
+    'mfa_setup' => 'Meervoudige verificatie instellen',
+    'mfa_setup_desc' => 'Stel meervoudige verificatie in als een extra beveiligingslaag voor je gebruikersaccount.',
+    'mfa_setup_configured' => 'Is al geconfigureerd',
     'mfa_setup_reconfigure' => 'Herconfigureren',
     'mfa_setup_remove_confirmation' => 'Weet je zeker dat je deze multi-factor authenticatie methode wilt verwijderen?',
     'mfa_setup_action' => 'Instellen',
     'mfa_backup_codes_usage_limit_warning' => 'Je hebt minder dan 5 back-upcodes over. Genereer en sla een nieuwe set op voordat je geen codes meer hebt om te voorkomen dat je buiten je account wordt gesloten.',
     'mfa_option_totp_title' => 'Mobiele app',
-    'mfa_option_totp_desc' => 'Om multi-factor authenticatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'Om meervoudige verificatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Back-up Codes',
     'mfa_option_backup_codes_desc' => 'Bewaar veilig een set eenmalige back-upcodes die je kunt invoeren om je identiteit te verifiëren.',
     'mfa_gen_confirm_and_enable' => 'Bevestigen en inschakelen',
@@ -98,13 +98,13 @@
     'mfa_gen_backup_codes_download' => 'Download Codes',
     'mfa_gen_backup_codes_usage_warning' => 'Elke code kan slechts eenmaal gebruikt worden',
     'mfa_gen_totp_title' => 'Mobiele app installatie',
-    'mfa_gen_totp_desc' => 'Om multi-factor authenticatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
+    'mfa_gen_totp_desc' => 'Om meervoudige verificatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
     'mfa_gen_totp_scan' => 'Scan de onderstaande QR-code door gebruik te maken van je favoriete authenticatie-app om aan de slag te gaan.',
     'mfa_gen_totp_verify_setup' => 'Installatie verifiëren',
     'mfa_gen_totp_verify_setup_desc' => 'Controleer of alles werkt door het invoeren van een code, die wordt gegenereerd binnen je authenticatie-app, in het onderstaande invoerveld:',
     'mfa_gen_totp_provide_code_here' => 'Vul je app-gegenereerde code hier in',
     'mfa_verify_access' => 'Verifieer toegang',
-    'mfa_verify_access_desc' => 'Je moet jouw identiteit bevestigen via een extra verificatieniveau voordat je toegang krijgt tot je gebruikersaccount. Verifieer met een van de door u geconfigureerde methoden om verder te gaan.',
+    'mfa_verify_access_desc' => 'Je moet je identiteit bevestigen via een extra verificatieniveau voordat je toegang krijgt tot je gebruikersaccount. Verifieer met een van de door jou geconfigureerde methoden om verder te gaan.',
     'mfa_verify_no_methods' => 'Geen methode geconfigureerd',
     'mfa_verify_no_methods_desc' => 'Er konden geen meervoudige verificatie methoden voor je account gevonden worden. Je zult minstens één methode moeten instellen voordat je toegang krijgt.',
     'mfa_verify_use_totp' => 'Verifieer met een mobiele app',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index 481f99ded38..89b2e7bea85 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -143,7 +143,7 @@
     'source' => 'Bron',
     'alt_desc' => 'Alternatieve beschrijving',
     'embed' => 'Insluiten',
-    'paste_embed' => 'Plak jouw insluitcode hieronder:',
+    'paste_embed' => 'Plak je insluitcode hieronder:',
     'url' => 'URL',
     'text_to_display' => 'Weer te geven tekst',
     'title' => 'Titel',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 23e5c97505f..69cefd233ec 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -91,8 +91,8 @@
     'shelves_popular' => 'Populaire boekenplanken',
     'shelves_new' => 'Nieuwe boekenplanken',
     'shelves_new_action' => 'Nieuwe boekenplank',
-    'shelves_popular_empty' => 'De meest populaire boekenplanken worden hier weergegeven.',
-    'shelves_new_empty' => 'De meest recent gemaakte boekenplanken worden hier weergeven.',
+    'shelves_popular_empty' => 'Hier worden de meest populaire boekenplanken weergegeven.',
+    'shelves_new_empty' => 'Hier worden de meest recent gemaakte boekenplanken weergegeven.',
     'shelves_save' => 'Boekenplank opslaan',
     'shelves_books' => 'Boeken op deze plank',
     'shelves_add_books' => 'Voeg boeken toe aan deze plank',
@@ -124,8 +124,8 @@
     'books_recent' => 'Recente boeken',
     'books_new' => 'Nieuwe boeken',
     'books_new_action' => 'Nieuw boek',
-    'books_popular_empty' => 'De meest populaire boeken worden hier weergegeven.',
-    'books_new_empty' => 'De meest recent gemaakte boeken verschijnen hier.',
+    'books_popular_empty' => 'Hier worden de meest populaire boeken weergegeven.',
+    'books_new_empty' => 'Hier worden de meest recent gemaakte boeken weergegeven.',
     'books_create' => 'Nieuw boek maken',
     'books_delete' => 'Boek verwijderen',
     'books_delete_named' => 'Verwijder boek :bookName',
@@ -309,7 +309,7 @@
     'tags_index_desc' => 'Labels kunnen worden toegepast op inhoud binnen het systeem om een flexibele vorm van categorisering toe te passen. Labels kunnen zowel een sleutel als een waarde hebben, waarbij de waarde optioneel is. Eenmaal toegepast, kan de inhoud worden opgevraagd aan de hand van de naam en de waarde van het label.',
     'tag_name' =>  'Labelnaam',
     'tag_value' => 'Labelwaarde (Optioneel)',
-    'tags_explain' => "Voeg enkele labels toe om jouw inhoud beter te categoriseren. \nJe kunt een waarde aan een label toekennen voor een meer gedetailleerde organisatie.",
+    'tags_explain' => "Voeg enkele labels toe om je inhoud beter te categoriseren.\nJe kunt een waarde aan een label toekennen voor een meer gedetailleerde organisatie.",
     'tags_add' => 'Voeg nog een label toe',
     'tags_remove' => 'Verwijder deze label',
     'tags_usages' => 'Totaal aantal label-toepassingen',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 74b14e08d73..7f854662574 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver niet gevonden',
     'social_driver_not_configured' => 'Je :socialAccount instellingen zijn niet correct geconfigureerd.',
     'invite_token_expired' => 'Deze uitnodigingslink is verlopen. Je kunt in plaats daarvan proberen je wachtwoord opnieuw in te stellen.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Bestandspad :filePath kon niet naar geüpload worden. Zorg dat je schrijfrechten op de server hebt.',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 828036c1b4e..a7d6fde9b18 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -95,7 +95,7 @@
     'maint_regen_references' => 'Verwijzingen opnieuw genereren',
     'maint_regen_references_desc' => 'Deze actie zal de kruisverwijzingen index binnen de database opnieuw opbouwen. Dit wordt doorgaans automatisch gedaan, maar deze actie kan nuttig zijn om oude inhoud of inhoud die via onofficiële methoden is toegevoegd te indexeren.',
     'maint_regen_references_success' => 'Verwijzingen index is opnieuw gegenereerd!',
-    'maint_timeout_command_note' => 'Opmerking: Het uitvoeren van deze actie kan enige tijd in beslag nemen, wat in sommige webomgevingen kan leiden tot time-outs. Als alternatief kan deze actie ook worden uitgevoerd met een terminal commando.',
+    'maint_timeout_command_note' => 'Let op: Het uitvoeren van deze actie kan enige tijd in beslag nemen, wat in sommige webomgevingen kan leiden tot time-outs. Als alternatief kan deze actie ook worden uitgevoerd met een terminal-commando.',
 
     // Recycle Bin
     'recycle_bin' => 'Prullenbak',
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index 2d9f58b7164..be1823db0ba 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Autentiseringstjeneste fra sosiale medier er ikke installert',
     'social_driver_not_configured' => 'Dine :socialAccount innstilliner er ikke angitt.',
     'invite_token_expired' => 'Invitasjonslenken har utgått, du kan forsøke å be om nytt passord istede.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Filstien :filePath aksepterer ikkje filer, du må sjekke filstitilganger i systemet.',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index 8b1ae1608bd..89e4349a590 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Funkcja społecznościowa nie została odnaleziona',
     'social_driver_not_configured' => 'Ustawienia konta :socialAccount nie są poprawne.',
     'invite_token_expired' => 'Zaproszenie wygasło. Możesz spróować zresetować swoje hasło.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Zapis do ścieżki :filePath jest niemożliwy. Upewnij się że aplikacja ma prawa do zapisu plików na serwerze.',
diff --git a/lang/pt/errors.php b/lang/pt/errors.php
index 67d7bbecfc9..b695caf9618 100644
--- a/lang/pt/errors.php
+++ b/lang/pt/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver não encontrado',
     'social_driver_not_configured' => 'Os seus parâmetros sociais de :socialAccount não estão corretamente configurados.',
     'invite_token_expired' => 'Este link de convite expirou. Alternativamente, pode tentar redefinir a senha da sua conta.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'O caminho do arquivo :filePath não pôde ser carregado. Certifique-se de que tem permissões de escrita no servidor.',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index ca050686768..f57784f9fe6 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver não encontrado',
     'social_driver_not_configured' => 'Seus parâmetros socials de :socialAccount não estão configurados corretamente.',
     'invite_token_expired' => 'Esse link de convite expirou. Alternativamente, você pode tentar redefinir a senha da sua conta.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'O caminho de destino (:filePath) de upload de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
diff --git a/lang/ro/errors.php b/lang/ro/errors.php
index a1ac0e04a9f..71e994be05b 100644
--- a/lang/ro/errors.php
+++ b/lang/ro/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Driver social negăsit',
     'social_driver_not_configured' => 'Setările tale sociale :socialAccount nu sunt configurate corect.',
     'invite_token_expired' => 'Acest link de invitație a expirat. Poți încerca să îți resetezi parola contului.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Calea fișierului :filePath nu a putut fi încărcată. Asigurați-vă că poate fi scrisă pe server.',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index 1fe57af2f11..596d8b78a59 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Драйвер для Соцсети не найден',
     'social_driver_not_configured' => 'Настройки вашего :socialAccount заданы неправильно.',
     'invite_token_expired' => 'Срок действия приглашения истек. Вместо этого вы можете попытаться сбросить пароль своей учетной записи.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Невозможно загрузить файл по пути :filePath. Убедитесь что сервер доступен для записи.',
diff --git a/lang/sk/errors.php b/lang/sk/errors.php
index e09f5f04ed0..ae9575ca517 100644
--- a/lang/sk/errors.php
+++ b/lang/sk/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Ovládač socialnych sietí nebol nájdený',
     'social_driver_not_configured' => 'Nastavenia Vášho :socialAccount účtu nie sú správne.',
     'invite_token_expired' => 'Platnosť tohto odkazu na pozvánku vypršala. Namiesto toho sa môžete pokúsiť obnoviť heslo účtu.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Do cesty :filePath sa nedá nahrávať. Uistite sa, že je zapisovateľná serverom.',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index 1dacb6716a7..6da88f14984 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Socialni vtičnik ni najden',
     'social_driver_not_configured' => 'Vaše nastavitve :socialAccount niso pravilo nastavljene.',
     'invite_token_expired' => 'Ta povezava je potekla. Namesto tega lahko ponastavite vaše geslo računa.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Poti :filePath ni bilo mogoče naložiti. Prepričajte se, da je zapisljiva na strežnik.',
diff --git a/lang/sq/errors.php b/lang/sq/errors.php
index 8773a78cbf7..752eb5672f1 100644
--- a/lang/sq/errors.php
+++ b/lang/sq/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
     'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
index 5f109dc4e9f..ba0043600a7 100644
--- a/lang/sr/errors.php
+++ b/lang/sr/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver not found',
     'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
     'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index 54d55052b36..0ada0a4cec1 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabellegenskaper',
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Ta bort tabell',
-    'table_clear_formatting' => 'Clear table formatting',
+    'table_clear_formatting' => 'Rensa tabell-formatering',
     'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'row_header' => 'Radrubrik',
     'insert_row_before' => 'Infoga rad före',
     'insert_row_after' => 'Infoga rad efter',
     'delete_row' => 'Ta bort rad',
@@ -147,11 +147,11 @@
     'url' => 'URL',
     'text_to_display' => 'Text som ska visas',
     'title' => 'Titel',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
+    'open_link' => 'Öppna länk',
+    'open_link_in' => 'Öppna länk i...',
     'open_link_current' => 'Aktuellt fönster',
     'open_link_new' => 'Nytt fönster',
-    'remove_link' => 'Remove link',
+    'remove_link' => 'Radera länk',
     'insert_collapsible' => 'Infoga hopfällbart block',
     'collapsible_unwrap' => 'Expandera',
     'edit_label' => 'Redigera etikett',
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index 7f44ee713e8..79147f6c669 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Drivrutinen för den här tjänsten hittades inte',
     'social_driver_not_configured' => 'Dina inställningar för :socialAccount är inte korrekta.',
     'invite_token_expired' => 'Denna inbjudningslänk har löpt ut. Du kan istället försöka återställa ditt kontos lösenord.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Kunde inte ladda upp till sökvägen :filePath. Kontrollera att webbservern har skrivåtkomst.',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 3ce6567b0a0..5b5738f79d0 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -32,7 +32,7 @@
     'app_custom_html_desc' => 'Innehåll i det här fältet placeras längst ner i <head>-sektionen på varje sida. Detta kan användas för att skriva över stilmallar eller lägga in spårningskoder.',
     'app_custom_html_disabled_notice' => 'Anpassat innehåll i HTML-huvudet är inaktiverat på denna inställningssida för att säkerställa att eventuella ändringar som påverkar funktionaliteten kan återställas.',
     'app_logo' => 'Applikationslogotyp',
-    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_logo_desc' => 'Detta används bland annat i applikationshuvudet. Bilden bör vara 86 pixlar i höjd. Stora bilder skalas ned.',
     'app_icon' => 'Application Icon',
     'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
     'app_homepage' => 'Startsida',
@@ -48,11 +48,11 @@
     'app_disable_comments_desc' => 'Inaktivera kommentarer på alla sidor i applikationen. Befintliga kommentarer visas inte.',
 
     // Color settings
-    'color_scheme' => 'Application Color Scheme',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
-    'link_color' => 'Default Link Color',
+    'color_scheme' => 'Programmets färgschema',
+    'color_scheme_desc' => 'Ställ in de färger som ska användas i applikationens användargränssnitt. Färger kan konfigureras separat för mörka och ljusa lägen för att bäst passa temat och säkerställa läsbarhet.',
+    'ui_colors_desc' => 'Ange applikationens primära färg och standard färg för länkar. Den primära färgen används främst för huvudrubriken, knappar och gränssnitt dekorationer. Standardfärgen på länken används för textbaserade länkar och åtgärder, både inom skriftligt innehåll och i applikationsgränssnittet.',
+    'app_color' => 'Primärfärg',
+    'link_color' => 'Standardfärg för länkar',
     'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
     'bookshelf_color' => 'Hyllfärg',
     'book_color' => 'Bokfärg',
@@ -214,8 +214,8 @@
     'users_social_accounts_info' => 'Här kan du ansluta dina andra konton för snabbare och smidigare inloggning. Om du kopplar från en tjänst här kommer de behörigheter som tidigare givits inte att tas bort - ta bort behörigheter genom att logga in på ditt konto på tjänsten i fråga.',
     'users_social_connect' => 'Anslut konto',
     'users_social_disconnect' => 'Koppla från konto',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Ansluten',
+    'users_social_status_disconnected' => 'Bortkopplad',
     'users_social_connected' => ':socialAccount har kopplats till ditt konto.',
     'users_social_disconnected' => ':socialAccount har kopplats bort från ditt konto.',
     'users_api_tokens' => 'API-nyckel',
@@ -277,12 +277,12 @@
     'webhooks_last_error_message' => 'Senaste felmeddelande:',
 
     // Licensing
-    'licenses' => 'Licenses',
+    'licenses' => 'Licenser',
     'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
     'licenses_bookstack' => 'BookStack License',
     'licenses_php' => 'PHP Library Licenses',
     'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
+    'licenses_other' => 'Andra licenser',
     'license_details' => 'License Details',
 
     //! If editing translations files directly please ignore this in all
diff --git a/lang/tr/errors.php b/lang/tr/errors.php
index 3e6138c7b41..f693a05f379 100644
--- a/lang/tr/errors.php
+++ b/lang/tr/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Social driver bulunamadı',
     'social_driver_not_configured' => ':socialAccount ayarlarınız doğru bir şekilde ayarlanmadı.',
     'invite_token_expired' => 'Davetiye bağlantısının süresi doldu. Bunun yerine parolanızı sıfırlamayı deneyebilirsiniz.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => ':filePath dosya yolu yüklenemedi. Sunucuya yazılabilir olduğundan emin olun.',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 92d91c1831c..6320a67cbae 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Драйвер для СоціальноїМережі не знайдено',
     'social_driver_not_configured' => 'Ваші соціальні настройки :socialAccount не правильно налаштовані.',
     'invite_token_expired' => 'Термін дії цього запрошення закінчився. Замість цього ви можете спробувати скинути пароль свого облікового запису.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Не вдається завантажити шлях до файлу :filePath. Переконайтеся, що він доступний для запису на сервер.',
diff --git a/lang/uz/errors.php b/lang/uz/errors.php
index cbd4d630c26..d2d8a9c0b52 100644
--- a/lang/uz/errors.php
+++ b/lang/uz/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Ijtimoiy haydovchi topilmadi',
     'social_driver_not_configured' => 'Sizning :socialAccount ijtimoiy sozlamalaringiz toʻgʻri sozlanmagan.',
     'invite_token_expired' => 'Bu taklif havolasi muddati tugagan. Buning oʻrniga hisobingiz parolini tiklashga urinib koʻrishingiz mumkin.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Fayl yoʻli :filePath faylini yuklab boʻlmadi. Uning serverga yozilishi mumkinligiga ishonch hosil qiling.',
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index 47170b10bfa..da58c57a947 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => 'Không tìm thấy driver cho MXH',
     'social_driver_not_configured' => 'Cài đặt MXH :socialAccount của bạn đang không được cấu hình hợp lệ.',
     'invite_token_expired' => 'Liên kết mời này đã hết hạn. Bạn có thể thử đặt lại mật khẩu của tài khoản.',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => 'Đường dẫn tệp tin :filePath không thể tải đến được. Đảm bảo rằng đường dẫn này có thể ghi được ở trên máy chủ.',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index 3627c88d848..0a0318381f0 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => '未找到社交驱动程序',
     'social_driver_not_configured' => '您的:socialAccount社交设置不正确。',
     'invite_token_expired' => '此邀请链接已过期。 您可以尝试重置您的账户密码。',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => '无法上传到文件路径“:filePath”，请确保它可写入服务器。',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 05f7b035c50..5b075135312 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -37,6 +37,7 @@
     'social_driver_not_found' => '找不到社交驅動程式',
     'social_driver_not_configured' => '您的 :socialAccount 社交設定不正確。',
     'invite_token_expired' => '此邀請連結已過期。您可以嘗試重設您的帳號密碼。',
+    'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
     'path_not_writable' => '無法上傳到 :filePath 檔案路徑。請確定其對伺服器來說是可寫入的。',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index 938a1000c97..572739f2933 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -136,7 +136,8 @@
     // Role Settings
     'roles' => '角色',
     'role_user_roles' => '使用者角色',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_index_desc' => '「角色」用於將系統權限套用至使用者群組。當使用者擁有多角色時，
+使用者會自動繼承角色中的所有系統權限',
     'roles_x_users_assigned' => ':count user assigned|:count users assigned',
     'roles_x_permissions_provided' => ':count permission|:count permissions',
     'roles_assigned_users' => 'Assigned Users',
@@ -277,13 +278,13 @@
     'webhooks_last_error_message' => '上次錯誤信息',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses' => '授權',
+    'licenses_desc' => '本頁提供 BookStack 使用到的專案以及函式庫的詳細授權資料，其中部份專案及函式庫僅開開發環境中使用。',
     'licenses_bookstack' => 'BookStack 授權',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_php' => 'PHP 函式庫授權',
+    'licenses_js' => 'JavaScript 函式庫授權',
     'licenses_other' => '其它授權',
-    'license_details' => 'License Details',
+    'license_details' => '詳細授權資料',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.

From f937bf3abb44db21fbada3180e66bfa27dc3f7da Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 21 May 2024 11:06:08 +0100
Subject: [PATCH 138/666] Updated translator & dependency attribution before
 release v24.05.1

---
 .github/translators.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index cf77951b023..8667e5f0bdb 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -347,7 +347,7 @@ Taygun Yıldırım (yildirimtaygun) :: Turkish
 robing29 :: German
 Bruno Eduardo de Jesus Barroso (brunoejb) :: Portuguese, Brazilian
 Igor V Belousov (biv) :: Russian
-David Bauer (davbauer) :: German
+David Bauer (davbauer) :: German; German Informal
 Guttorm Hveem (guttormhveem) :: Norwegian Nynorsk; Norwegian Bokmal
 Minh Giang Truong (minhgiang1204) :: Vietnamese
 Ioannis Ioannides (i.ioannides) :: Greek
@@ -389,7 +389,7 @@ Marc Hagen (MarcHagen) :: Dutch
 Kasper Alsøe (zeonos) :: Danish
 sultani :: Persian
 renge :: Korean
-Tim (thegatesdev) :: Dutch; German Informal; Romanian; French; Catalan; Czech; Danish; German; Finnish; Hungarian; Italian; Japanese; Korean; Polish; Russian; Ukrainian; Chinese Simplified; Chinese Traditional; Portuguese, Brazilian; Persian; Spanish, Argentina; Croatian; Norwegian Nynorsk; Estonian; Uzbek; Norwegian Bokmal
+Tim (thegatesdev) :: Dutch; German Informal; French; Romanian; Catalan; Czech; Danish; German; Finnish; Hungarian; Italian; Japanese; Korean; Polish; Russian; Ukrainian; Chinese Simplified; Chinese Traditional; Portuguese, Brazilian; Persian; Spanish, Argentina; Croatian; Norwegian Nynorsk; Estonian; Uzbek; Norwegian Bokmal
 Irdi (irdiOL) :: Albanian
 KateBarber :: Welsh
 Twister (theuncles75) :: Hebrew
@@ -422,3 +422,6 @@ crow_ :: Latvian
 JocelynDelalande :: French
 Jan (JW-CH) :: German Informal
 Timo B (lommes) :: German Informal
+Erik Lundstedt (Erik.Lundstedt) :: Swedish
+yngams (younessmouhid) :: Arabic
+Ohadp :: Hebrew

From 6019d2ee143e370637bce929bbeaa1213c53d8a2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 23 May 2024 11:30:53 +0100
Subject: [PATCH 139/666] MFA: Tweaked backup code wording

It was not clear before as it could be taken that the system would
securely store the codes.

Closes #5017
---
 lang/en/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/auth.php b/lang/en/auth.php
index dc4b242a09e..57f0cb5c632 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',

From 5a4f59534124a83b9d7b54abe1d5c8984b2fa04f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 27 May 2024 15:39:41 +0100
Subject: [PATCH 140/666] Editors: Added lexical editor for testing

Started basic playground for testing lexical as a new WYSIWYG editor.
Moved out tinymce to be under wysiwyg-tinymce instead so lexical is the
default, but TinyMce code remains.
---
 dev/build/esbuild.js                          |   1 +
 package-lock.json                             |  89 ++++++++++++++
 package.json                                  |   5 +
 resources/js/components/index.js              |   1 +
 resources/js/components/page-comment.js       |   2 +-
 resources/js/components/page-comments.js      |   2 +-
 .../js/components/wysiwyg-editor-tinymce.js   |  48 ++++++++
 resources/js/components/wysiwyg-editor.js     |  21 +---
 resources/js/components/wysiwyg-input.js      |   2 +-
 .../common-events.js                          |   0
 .../js/{wysiwyg => wysiwyg-tinymce}/config.js |   0
 .../drop-paste-handling.js                    |   0
 .../{wysiwyg => wysiwyg-tinymce}/filters.js   |   0
 .../js/{wysiwyg => wysiwyg-tinymce}/fixes.js  |   0
 .../js/{wysiwyg => wysiwyg-tinymce}/icons.js  |   0
 .../plugin-codeeditor.js                      |   0
 .../plugin-drawio.js                          |   0
 .../plugins-about.js                          |   0
 .../plugins-customhr.js                       |   0
 .../plugins-details.js                        |   0
 .../plugins-imagemanager.js                   |   0
 .../plugins-stub.js                           |   0
 .../plugins-table-additions.js                |   0
 .../plugins-tasklist.js                       |   0
 .../{wysiwyg => wysiwyg-tinymce}/scrolling.js |   0
 .../{wysiwyg => wysiwyg-tinymce}/shortcuts.js |   0
 .../{wysiwyg => wysiwyg-tinymce}/toolbars.js  |   0
 .../js/{wysiwyg => wysiwyg-tinymce}/util.js   |   0
 resources/js/wysiwyg/index.mjs                | 109 ++++++++++++++++++
 resources/views/pages/parts/form.blade.php    |   6 +-
 .../parts/wysiwyg-editor-tinymce.blade.php    |  21 ++++
 .../pages/parts/wysiwyg-editor.blade.php      |  26 +++--
 32 files changed, 303 insertions(+), 30 deletions(-)
 create mode 100644 resources/js/components/wysiwyg-editor-tinymce.js
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/common-events.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/config.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/drop-paste-handling.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/filters.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/fixes.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/icons.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugin-codeeditor.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugin-drawio.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-about.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-customhr.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-details.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-imagemanager.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-stub.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-table-additions.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/plugins-tasklist.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/scrolling.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/shortcuts.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/toolbars.js (100%)
 rename resources/js/{wysiwyg => wysiwyg-tinymce}/util.js (100%)
 create mode 100644 resources/js/wysiwyg/index.mjs
 create mode 100644 resources/views/pages/parts/wysiwyg-editor-tinymce.blade.php

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index c5b3c9ef3a3..20193db7fa9 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -14,6 +14,7 @@ const entryPoints = {
     code: path.join(__dirname, '../../resources/js/code/index.mjs'),
     'legacy-modes': path.join(__dirname, '../../resources/js/code/legacy-modes.mjs'),
     markdown: path.join(__dirname, '../../resources/js/markdown/index.mjs'),
+    wysiwyg: path.join(__dirname, '../../resources/js/wysiwyg/index.mjs'),
 };
 
 // Locate our output directory
diff --git a/package-lock.json b/package-lock.json
index 63b0d2478e6..6a992f4d0e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,11 +18,16 @@
         "@codemirror/state": "^6.3.3",
         "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.22.2",
+        "@lexical/history": "^0.15.0",
+        "@lexical/html": "^0.15.0",
+        "@lexical/rich-text": "^0.15.0",
+        "@lexical/utils": "^0.15.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
+        "lexical": "^0.15.0",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.5.1",
@@ -691,6 +696,85 @@
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "dev": true
     },
+    "node_modules/@lexical/clipboard": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.15.0.tgz",
+      "integrity": "sha512-binCltK7KiURQJFogvueYfmDNEKynN/lmZrCLFp2xBjEIajqw4WtOVLJZ33engdqNlvj0JqrxrWxbKG+yvUwrg==",
+      "dependencies": {
+        "@lexical/html": "0.15.0",
+        "@lexical/list": "0.15.0",
+        "@lexical/selection": "0.15.0",
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/history": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.15.0.tgz",
+      "integrity": "sha512-r+pzR2k/51AL6l8UfXeVe/GWPIeWY1kEOuKx9nsYB9tmAkTF66tTFz33DJIMWBVtAHWN7Dcdv0/yy6q8R6CAUQ==",
+      "dependencies": {
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/html": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.15.0.tgz",
+      "integrity": "sha512-x/sfGvibwo8b5Vso4ppqNyS/fVve6Rn+TmvP/0eWOaa0I3aOQ57ulfcK6p/GTe+ZaEi8vW64oZPdi8XDgwSRaA==",
+      "dependencies": {
+        "@lexical/selection": "0.15.0",
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/list": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.15.0.tgz",
+      "integrity": "sha512-JuF4k7uo4rZFOSZGrmkxo1+sUrwTKNBhhJAiCgtM+6TO90jppxzCFNKur81yPzF1+g4GWLC9gbjzKb52QPb6cQ==",
+      "dependencies": {
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/rich-text": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.15.0.tgz",
+      "integrity": "sha512-76tXh/eeEOHl91HpFEXCc/tUiLrsa9RcSyvCzRZahk5zqYvQPXma/AUfRzuSMf2kLwDEoauKAVqNFQcbPhqwpQ==",
+      "dependencies": {
+        "@lexical/clipboard": "0.15.0",
+        "@lexical/selection": "0.15.0",
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/selection": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.15.0.tgz",
+      "integrity": "sha512-S+AQC6eJiQYSa5zOPuecN85prCT0Bcb8miOdJaE17Zh+vgdUH5gk9I0tEBeG5T7tkSpq6lFiEqs2FZSfaHflbQ==",
+      "dependencies": {
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/table": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.15.0.tgz",
+      "integrity": "sha512-3IRBg8IoIHetqKozRQbJQ2aPyG0ziXZ+lc8TOIAGs6METW/wxntaV+rTNrODanKAgvk2iJTIyfFkYjsqS9+VFg==",
+      "dependencies": {
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
+    "node_modules/@lexical/utils": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.15.0.tgz",
+      "integrity": "sha512-/6954LDmTcVFgexhy5WOZDa4TxNQOEZNrf8z7TRAFiAQkihcME/GRoq1en5cbXoVNF8jv5AvNyyc7x0MByRJ6A==",
+      "dependencies": {
+        "@lexical/list": "0.15.0",
+        "@lexical/selection": "0.15.0",
+        "@lexical/table": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
     "node_modules/@lezer/common": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
@@ -2709,6 +2793,11 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lexical": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.15.0.tgz",
+      "integrity": "sha512-/7HrPAmtgsc1F+qpv5bFwoQZ6CbH/w3mPPL2AW5P75/QYrqKz4bhvJrc2jozIX0GxtuT/YUYT7w+1sZMtUWbOg=="
+    },
     "node_modules/linkify-it": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
diff --git a/package.json b/package.json
index ba2de38ba3c..706c187382e 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,16 @@
     "@codemirror/state": "^6.3.3",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.22.2",
+    "@lexical/history": "^0.15.0",
+    "@lexical/html": "^0.15.0",
+    "@lexical/rich-text": "^0.15.0",
+    "@lexical/utils": "^0.15.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
+    "lexical": "^0.15.0",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.5.1",
diff --git a/resources/js/components/index.js b/resources/js/components/index.js
index 3a66079d7f8..8ad5e14cb2e 100644
--- a/resources/js/components/index.js
+++ b/resources/js/components/index.js
@@ -58,4 +58,5 @@ export {TriLayout} from './tri-layout';
 export {UserSelect} from './user-select';
 export {WebhookEvents} from './webhook-events';
 export {WysiwygEditor} from './wysiwyg-editor';
+export {WysiwygEditorTinymce} from './wysiwyg-editor-tinymce';
 export {WysiwygInput} from './wysiwyg-input';
diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.js
index 79c9d3c2c67..cac20c9fb2c 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.js
@@ -1,6 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from '../wysiwyg/config';
+import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class PageComment extends Component {
 
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index cfb0634a904..bd6dd3c82ff 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -1,6 +1,6 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from '../wysiwyg/config';
+import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class PageComments extends Component {
 
diff --git a/resources/js/components/wysiwyg-editor-tinymce.js b/resources/js/components/wysiwyg-editor-tinymce.js
new file mode 100644
index 00000000000..093442ea2bc
--- /dev/null
+++ b/resources/js/components/wysiwyg-editor-tinymce.js
@@ -0,0 +1,48 @@
+import {buildForEditor as buildEditorConfig} from '../wysiwyg-tinymce/config';
+import {Component} from './component';
+
+export class WysiwygEditorTinymce extends Component {
+
+    setup() {
+        this.elem = this.$el;
+
+        this.tinyMceConfig = buildEditorConfig({
+            language: this.$opts.language,
+            containerElement: this.elem,
+            darkMode: document.documentElement.classList.contains('dark-mode'),
+            textDirection: this.$opts.textDirection,
+            drawioUrl: this.getDrawIoUrl(),
+            pageId: Number(this.$opts.pageId),
+            translations: {
+                imageUploadErrorText: this.$opts.imageUploadErrorText,
+                serverUploadLimitText: this.$opts.serverUploadLimitText,
+            },
+            translationMap: window.editor_translations,
+        });
+
+        window.$events.emitPublic(this.elem, 'editor-tinymce::pre-init', {config: this.tinyMceConfig});
+        window.tinymce.init(this.tinyMceConfig).then(editors => {
+            this.editor = editors[0];
+        });
+    }
+
+    getDrawIoUrl() {
+        const drawioUrlElem = document.querySelector('[drawio-url]');
+        if (drawioUrlElem) {
+            return drawioUrlElem.getAttribute('drawio-url');
+        }
+        return '';
+    }
+
+    /**
+     * Get the content of this editor.
+     * Used by the parent page editor component.
+     * @return {{html: String}}
+     */
+    getContent() {
+        return {
+            html: this.editor.getContent(),
+        };
+    }
+
+}
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index 82f60827d7a..bcd480ce6ab 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -1,28 +1,13 @@
-import {buildForEditor as buildEditorConfig} from '../wysiwyg/config';
 import {Component} from './component';
 
 export class WysiwygEditor extends Component {
 
     setup() {
         this.elem = this.$el;
+        this.editArea = this.$refs.editArea;
 
-        this.tinyMceConfig = buildEditorConfig({
-            language: this.$opts.language,
-            containerElement: this.elem,
-            darkMode: document.documentElement.classList.contains('dark-mode'),
-            textDirection: this.$opts.textDirection,
-            drawioUrl: this.getDrawIoUrl(),
-            pageId: Number(this.$opts.pageId),
-            translations: {
-                imageUploadErrorText: this.$opts.imageUploadErrorText,
-                serverUploadLimitText: this.$opts.serverUploadLimitText,
-            },
-            translationMap: window.editor_translations,
-        });
-
-        window.$events.emitPublic(this.elem, 'editor-tinymce::pre-init', {config: this.tinyMceConfig});
-        window.tinymce.init(this.tinyMceConfig).then(editors => {
-            this.editor = editors[0];
+        window.importVersioned('wysiwyg').then(wysiwyg => {
+            wysiwyg.createPageEditorInstance(this.editArea);
         });
     }
 
diff --git a/resources/js/components/wysiwyg-input.js b/resources/js/components/wysiwyg-input.js
index ad964aed2c4..aa21a63717f 100644
--- a/resources/js/components/wysiwyg-input.js
+++ b/resources/js/components/wysiwyg-input.js
@@ -1,5 +1,5 @@
 import {Component} from './component';
-import {buildForInput} from '../wysiwyg/config';
+import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class WysiwygInput extends Component {
 
diff --git a/resources/js/wysiwyg/common-events.js b/resources/js/wysiwyg-tinymce/common-events.js
similarity index 100%
rename from resources/js/wysiwyg/common-events.js
rename to resources/js/wysiwyg-tinymce/common-events.js
diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg-tinymce/config.js
similarity index 100%
rename from resources/js/wysiwyg/config.js
rename to resources/js/wysiwyg-tinymce/config.js
diff --git a/resources/js/wysiwyg/drop-paste-handling.js b/resources/js/wysiwyg-tinymce/drop-paste-handling.js
similarity index 100%
rename from resources/js/wysiwyg/drop-paste-handling.js
rename to resources/js/wysiwyg-tinymce/drop-paste-handling.js
diff --git a/resources/js/wysiwyg/filters.js b/resources/js/wysiwyg-tinymce/filters.js
similarity index 100%
rename from resources/js/wysiwyg/filters.js
rename to resources/js/wysiwyg-tinymce/filters.js
diff --git a/resources/js/wysiwyg/fixes.js b/resources/js/wysiwyg-tinymce/fixes.js
similarity index 100%
rename from resources/js/wysiwyg/fixes.js
rename to resources/js/wysiwyg-tinymce/fixes.js
diff --git a/resources/js/wysiwyg/icons.js b/resources/js/wysiwyg-tinymce/icons.js
similarity index 100%
rename from resources/js/wysiwyg/icons.js
rename to resources/js/wysiwyg-tinymce/icons.js
diff --git a/resources/js/wysiwyg/plugin-codeeditor.js b/resources/js/wysiwyg-tinymce/plugin-codeeditor.js
similarity index 100%
rename from resources/js/wysiwyg/plugin-codeeditor.js
rename to resources/js/wysiwyg-tinymce/plugin-codeeditor.js
diff --git a/resources/js/wysiwyg/plugin-drawio.js b/resources/js/wysiwyg-tinymce/plugin-drawio.js
similarity index 100%
rename from resources/js/wysiwyg/plugin-drawio.js
rename to resources/js/wysiwyg-tinymce/plugin-drawio.js
diff --git a/resources/js/wysiwyg/plugins-about.js b/resources/js/wysiwyg-tinymce/plugins-about.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-about.js
rename to resources/js/wysiwyg-tinymce/plugins-about.js
diff --git a/resources/js/wysiwyg/plugins-customhr.js b/resources/js/wysiwyg-tinymce/plugins-customhr.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-customhr.js
rename to resources/js/wysiwyg-tinymce/plugins-customhr.js
diff --git a/resources/js/wysiwyg/plugins-details.js b/resources/js/wysiwyg-tinymce/plugins-details.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-details.js
rename to resources/js/wysiwyg-tinymce/plugins-details.js
diff --git a/resources/js/wysiwyg/plugins-imagemanager.js b/resources/js/wysiwyg-tinymce/plugins-imagemanager.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-imagemanager.js
rename to resources/js/wysiwyg-tinymce/plugins-imagemanager.js
diff --git a/resources/js/wysiwyg/plugins-stub.js b/resources/js/wysiwyg-tinymce/plugins-stub.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-stub.js
rename to resources/js/wysiwyg-tinymce/plugins-stub.js
diff --git a/resources/js/wysiwyg/plugins-table-additions.js b/resources/js/wysiwyg-tinymce/plugins-table-additions.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-table-additions.js
rename to resources/js/wysiwyg-tinymce/plugins-table-additions.js
diff --git a/resources/js/wysiwyg/plugins-tasklist.js b/resources/js/wysiwyg-tinymce/plugins-tasklist.js
similarity index 100%
rename from resources/js/wysiwyg/plugins-tasklist.js
rename to resources/js/wysiwyg-tinymce/plugins-tasklist.js
diff --git a/resources/js/wysiwyg/scrolling.js b/resources/js/wysiwyg-tinymce/scrolling.js
similarity index 100%
rename from resources/js/wysiwyg/scrolling.js
rename to resources/js/wysiwyg-tinymce/scrolling.js
diff --git a/resources/js/wysiwyg/shortcuts.js b/resources/js/wysiwyg-tinymce/shortcuts.js
similarity index 100%
rename from resources/js/wysiwyg/shortcuts.js
rename to resources/js/wysiwyg-tinymce/shortcuts.js
diff --git a/resources/js/wysiwyg/toolbars.js b/resources/js/wysiwyg-tinymce/toolbars.js
similarity index 100%
rename from resources/js/wysiwyg/toolbars.js
rename to resources/js/wysiwyg-tinymce/toolbars.js
diff --git a/resources/js/wysiwyg/util.js b/resources/js/wysiwyg-tinymce/util.js
similarity index 100%
rename from resources/js/wysiwyg/util.js
rename to resources/js/wysiwyg-tinymce/util.js
diff --git a/resources/js/wysiwyg/index.mjs b/resources/js/wysiwyg/index.mjs
new file mode 100644
index 00000000000..4c4f16ce304
--- /dev/null
+++ b/resources/js/wysiwyg/index.mjs
@@ -0,0 +1,109 @@
+import {$getRoot, createEditor, ElementNode} from 'lexical';
+import {createEmptyHistoryState, registerHistory} from '@lexical/history';
+import {HeadingNode, QuoteNode, registerRichText} from '@lexical/rich-text';
+import {mergeRegister} from '@lexical/utils';
+import {$generateNodesFromDOM} from '@lexical/html';
+
+class CalloutParagraph extends ElementNode {
+    __category = 'info';
+
+    static getType() {
+        return 'callout';
+    }
+
+    static clone(node) {
+        return new CalloutParagraph(node.__category, node.__key);
+    }
+
+    constructor(category, key) {
+        super(key);
+        this.__category = category;
+    }
+
+    createDOM(_config, _editor) {
+        const dom = document.createElement('p');
+        dom.classList.add('callout', this.__category || '');
+        return dom;
+    }
+
+    updateDOM(prevNode, dom) {
+        // Returning false tells Lexical that this node does not need its
+        // DOM element replacing with a new copy from createDOM.
+        return false;
+    }
+
+    static importDOM() {
+        return {
+            p: node => {
+                if (node.classList.contains('callout')) {
+                    return {
+                        conversion: element => {
+                            let category = 'info';
+                            const categories = ['info', 'success', 'warning', 'danger'];
+
+                            for (const c of categories) {
+                                if (element.classList.contains(c)) {
+                                    category = c;
+                                    break;
+                                }
+                            }
+
+                            return {
+                                node: new CalloutParagraph(category),
+                            };
+                        },
+                        priority: 3,
+                    }
+                }
+                return null;
+            }
+        }
+    }
+
+    exportJSON() {
+        return {
+            ...super.exportJSON(),
+            type: 'callout',
+            version: 1,
+            category: this.__category,
+        };
+    }
+}
+
+// TODO - Extract callout to own file
+// TODO - Add helper functions
+//   https://lexical.dev/docs/concepts/nodes#creating-custom-nodes
+
+export function createPageEditorInstance(editArea) {
+    console.log('creating editor', editArea);
+
+    const config = {
+        namespace: 'BookStackPageEditor',
+        nodes: [HeadingNode, QuoteNode, CalloutParagraph],
+        onError: console.error,
+    };
+
+    const startingHtml = editArea.innerHTML;
+    const parser = new DOMParser();
+    const dom = parser.parseFromString(startingHtml, 'text/html');
+
+    const editor = createEditor(config);
+    editor.setRootElement(editArea);
+
+    mergeRegister(
+        registerRichText(editor),
+        registerHistory(editor, createEmptyHistoryState(), 300),
+    );
+
+    editor.update(() => {
+        const startingNodes = $generateNodesFromDOM(editor, dom);
+        const root = $getRoot();
+        root.append(...startingNodes);
+    });
+
+    const debugView = document.getElementById('lexical-debug');
+    editor.registerUpdateListener(({editorState}) => {
+        console.log('editorState', editorState.toJSON());
+        debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
+    });
+}
\ No newline at end of file
diff --git a/resources/views/pages/parts/form.blade.php b/resources/views/pages/parts/form.blade.php
index e2c839cd220..490374e40c4 100644
--- a/resources/views/pages/parts/form.blade.php
+++ b/resources/views/pages/parts/form.blade.php
@@ -33,11 +33,15 @@
                 {{--Editors--}}
                 <div class="edit-area flex-fill flex">
 
-                    {{--WYSIWYG Editor--}}
                     @if($editor === 'wysiwyg')
                         @include('pages.parts.wysiwyg-editor', ['model' => $model])
                     @endif
 
+                    {{--WYSIWYG Editor (TinyMCE - Deprecated)--}}
+                    @if($editor === 'wysiwyg-tinymce')
+                        @include('pages.parts.wysiwyg-editor-tinymce', ['model' => $model])
+                    @endif
+
                     {{--Markdown Editor--}}
                     @if($editor === 'markdown')
                         @include('pages.parts.markdown-editor', ['model' => $model])
diff --git a/resources/views/pages/parts/wysiwyg-editor-tinymce.blade.php b/resources/views/pages/parts/wysiwyg-editor-tinymce.blade.php
new file mode 100644
index 00000000000..33c526a9910
--- /dev/null
+++ b/resources/views/pages/parts/wysiwyg-editor-tinymce.blade.php
@@ -0,0 +1,21 @@
+@push('head')
+    <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
+@endpush
+
+<div component="wysiwyg-editor-tinymce"
+     option:wysiwyg-editor-tinymce:language="{{ $locale->htmlLang() }}"
+     option:wysiwyg-editor-tinymce:page-id="{{ $model->id ?? 0 }}"
+     option:wysiwyg-editor-tinymce:text-direction="{{ $locale->htmlDirection() }}"
+     option:wysiwyg-editor-tinymce:image-upload-error-text="{{ trans('errors.image_upload_error') }}"
+     option:wysiwyg-editor-tinymce:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
+     class="flex-fill flex">
+
+    <textarea id="html-editor"  name="html" rows="5"
+          @if($errors->has('html')) class="text-neg" @endif>@if(isset($model) || old('html')){{ old('html') ? old('html') : $model->html }}@endif</textarea>
+</div>
+
+@if($errors->has('html'))
+    <div class="text-neg text-small">{{ $errors->first('html') }}</div>
+@endif
+
+@include('form.editor-translations')
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 84a267b681b..7528b1e02a7 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -1,21 +1,31 @@
-@push('head')
-    <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
-@endpush
-
 <div component="wysiwyg-editor"
      option:wysiwyg-editor:language="{{ $locale->htmlLang() }}"
      option:wysiwyg-editor:page-id="{{ $model->id ?? 0 }}"
      option:wysiwyg-editor:text-direction="{{ $locale->htmlDirection() }}"
      option:wysiwyg-editor:image-upload-error-text="{{ trans('errors.image_upload_error') }}"
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
-     class="flex-fill flex">
+     class="">
+
+    <div refs="wysiwyg-editor@edit-area" contenteditable="true">
+        <p>Some content here</p>
+        <h2>List below this h2 header</h2>
+        <ul>
+            <li>Hello</li>
+        </ul>
+
+        <p class="callout danger">
+            Hello there, this is an info callout
+        </p>
+    </div>
+
+    <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>
 
-    <textarea id="html-editor"  name="html" rows="5"
-          @if($errors->has('html')) class="text-neg" @endif>@if(isset($model) || old('html')){{ old('html') ? old('html') : $model->html }}@endif</textarea>
+{{--    <textarea id="html-editor"  name="html" rows="5"--}}
+{{--          @if($errors->has('html')) class="text-neg" @endif>@if(isset($model) || old('html')){{ old('html') ? old('html') : $model->html }}@endif</textarea>--}}
 </div>
 
 @if($errors->has('html'))
     <div class="text-neg text-small">{{ $errors->first('html') }}</div>
 @endif
 
-@include('form.editor-translations')
\ No newline at end of file
+{{--TODO - @include('form.editor-translations')--}}
\ No newline at end of file

From 6e852d2e652e881e5f0096efa2b35ae3d712b4a3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 27 May 2024 20:23:45 +0100
Subject: [PATCH 141/666] Lexical: Played with commands, extracted & improved
 callout node

---
 package-lock.json                             |   1 +
 package.json                                  |   1 +
 resources/js/components/wysiwyg-editor.js     |   1 +
 resources/js/wysiwyg/index.mjs                | 113 ++++++------------
 resources/js/wysiwyg/nodes/callout.js         |  98 +++++++++++++++
 resources/js/wysiwyg/nodes/index.js           |  14 +++
 .../pages/parts/wysiwyg-editor.blade.php      |   4 +
 7 files changed, 156 insertions(+), 76 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/callout.js
 create mode 100644 resources/js/wysiwyg/nodes/index.js

diff --git a/package-lock.json b/package-lock.json
index 6a992f4d0e0..6cd32760d96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "@lexical/history": "^0.15.0",
         "@lexical/html": "^0.15.0",
         "@lexical/rich-text": "^0.15.0",
+        "@lexical/selection": "^0.15.0",
         "@lexical/utils": "^0.15.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
diff --git a/package.json b/package.json
index 706c187382e..42b86fdc7b5 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@lexical/history": "^0.15.0",
     "@lexical/html": "^0.15.0",
     "@lexical/rich-text": "^0.15.0",
+    "@lexical/selection": "^0.15.0",
     "@lexical/utils": "^0.15.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index bcd480ce6ab..98732dab73e 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -25,6 +25,7 @@ export class WysiwygEditor extends Component {
      * @return {{html: String}}
      */
     getContent() {
+        // TODO - Update
         return {
             html: this.editor.getContent(),
         };
diff --git a/resources/js/wysiwyg/index.mjs b/resources/js/wysiwyg/index.mjs
index 4c4f16ce304..decfa4f22b1 100644
--- a/resources/js/wysiwyg/index.mjs
+++ b/resources/js/wysiwyg/index.mjs
@@ -1,85 +1,23 @@
-import {$getRoot, createEditor, ElementNode} from 'lexical';
+import {
+    $createParagraphNode,
+    $getRoot,
+    $getSelection,
+    COMMAND_PRIORITY_LOW,
+    createCommand,
+    createEditor
+} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
-import {HeadingNode, QuoteNode, registerRichText} from '@lexical/rich-text';
-import {mergeRegister} from '@lexical/utils';
+import {registerRichText} from '@lexical/rich-text';
+import {$getNearestBlockElementAncestorOrThrow, mergeRegister} from '@lexical/utils';
 import {$generateNodesFromDOM} from '@lexical/html';
-
-class CalloutParagraph extends ElementNode {
-    __category = 'info';
-
-    static getType() {
-        return 'callout';
-    }
-
-    static clone(node) {
-        return new CalloutParagraph(node.__category, node.__key);
-    }
-
-    constructor(category, key) {
-        super(key);
-        this.__category = category;
-    }
-
-    createDOM(_config, _editor) {
-        const dom = document.createElement('p');
-        dom.classList.add('callout', this.__category || '');
-        return dom;
-    }
-
-    updateDOM(prevNode, dom) {
-        // Returning false tells Lexical that this node does not need its
-        // DOM element replacing with a new copy from createDOM.
-        return false;
-    }
-
-    static importDOM() {
-        return {
-            p: node => {
-                if (node.classList.contains('callout')) {
-                    return {
-                        conversion: element => {
-                            let category = 'info';
-                            const categories = ['info', 'success', 'warning', 'danger'];
-
-                            for (const c of categories) {
-                                if (element.classList.contains(c)) {
-                                    category = c;
-                                    break;
-                                }
-                            }
-
-                            return {
-                                node: new CalloutParagraph(category),
-                            };
-                        },
-                        priority: 3,
-                    }
-                }
-                return null;
-            }
-        }
-    }
-
-    exportJSON() {
-        return {
-            ...super.exportJSON(),
-            type: 'callout',
-            version: 1,
-            category: this.__category,
-        };
-    }
-}
-
-// TODO - Extract callout to own file
-// TODO - Add helper functions
-//   https://lexical.dev/docs/concepts/nodes#creating-custom-nodes
+import {getNodesForPageEditor} from "./nodes/index.js";
+import {$createCalloutNode, $isCalloutNode} from "./nodes/callout.js";
+import {$setBlocksType} from "@lexical/selection";
 
 export function createPageEditorInstance(editArea) {
-    console.log('creating editor', editArea);
-
     const config = {
         namespace: 'BookStackPageEditor',
-        nodes: [HeadingNode, QuoteNode, CalloutParagraph],
+        nodes: getNodesForPageEditor(),
         onError: console.error,
     };
 
@@ -106,4 +44,27 @@ export function createPageEditorInstance(editArea) {
         console.log('editorState', editorState.toJSON());
         debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
     });
+
+    // Todo - How can we store things like IDs and alignment?
+    //   Node overrides?
+    //   https://lexical.dev/docs/concepts/node-replacement
+
+    // Example of creating, registering and using a custom command
+
+    const SET_BLOCK_CALLOUT_COMMAND = createCommand();
+    editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category = 'info') => {
+        const selection = $getSelection();
+        const blockElement = $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]);
+        if ($isCalloutNode(blockElement)) {
+            $setBlocksType(selection, $createParagraphNode);
+        } else {
+            $setBlocksType(selection, () => $createCalloutNode(category));
+        }
+        return true;
+    }, COMMAND_PRIORITY_LOW);
+
+    const button = document.getElementById('lexical-button');
+    button.addEventListener('click', event => {
+        editor.dispatchCommand(SET_BLOCK_CALLOUT_COMMAND, 'info');
+    });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/callout.js b/resources/js/wysiwyg/nodes/callout.js
new file mode 100644
index 00000000000..db90f22a945
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/callout.js
@@ -0,0 +1,98 @@
+import {$createParagraphNode, ElementNode} from 'lexical';
+
+export class Callout extends ElementNode {
+
+    __category = 'info';
+
+    static getType() {
+        return 'callout';
+    }
+
+    static clone(node) {
+        return new Callout(node.__category, node.__key);
+    }
+
+    constructor(category, key) {
+        super(key);
+        this.__category = category;
+    }
+
+    createDOM(_config, _editor) {
+        const element = document.createElement('p');
+        element.classList.add('callout', this.__category || '');
+        return element;
+    }
+
+    updateDOM(prevNode, dom) {
+        // Returning false tells Lexical that this node does not need its
+        // DOM element replacing with a new copy from createDOM.
+        return false;
+    }
+
+    insertNewAfter(selection, restoreSelection) {
+        const anchorOffset = selection ? selection.anchor.offset : 0;
+        const newElement = anchorOffset === this.getTextContentSize() || !selection
+            ? $createParagraphNode() : $createCalloutNode(this.__category);
+
+        newElement.setDirection(this.getDirection());
+        this.insertAfter(newElement, restoreSelection);
+
+        if (anchorOffset === 0 && !this.isEmpty() && selection) {
+            const paragraph = $createParagraphNode();
+            paragraph.select();
+            this.replace(paragraph, true);
+        }
+
+        return newElement;
+    }
+
+    static importDOM() {
+        return {
+            p: node => {
+                if (node.classList.contains('callout')) {
+                    return {
+                        conversion: element => {
+                            let category = 'info';
+                            const categories = ['info', 'success', 'warning', 'danger'];
+
+                            for (const c of categories) {
+                                if (element.classList.contains(c)) {
+                                    category = c;
+                                    break;
+                                }
+                            }
+
+                            return {
+                                node: new Callout(category),
+                            };
+                        },
+                        priority: 3,
+                    };
+                }
+                return null;
+            },
+        };
+    }
+
+    exportJSON() {
+        return {
+            ...super.exportJSON(),
+            type: 'callout',
+            version: 1,
+            category: this.__category,
+        };
+    }
+
+    static importJSON(serializedNode) {
+        return $createCalloutNode(serializedNode.category);
+    }
+
+}
+
+export function $createCalloutNode(category = 'info') {
+    return new Callout(category);
+}
+
+export function $isCalloutNode(node) {
+    return node instanceof Callout;
+}
diff --git a/resources/js/wysiwyg/nodes/index.js b/resources/js/wysiwyg/nodes/index.js
new file mode 100644
index 00000000000..ada229d9ea6
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/index.js
@@ -0,0 +1,14 @@
+import {HeadingNode, QuoteNode} from '@lexical/rich-text';
+import {Callout} from './callout';
+
+/**
+ * Load the nodes for lexical.
+ * @returns {LexicalNode[]}
+ */
+export function getNodesForPageEditor() {
+    return [
+        Callout,
+        HeadingNode,
+        QuoteNode,
+    ];
+}
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 7528b1e02a7..30be1a21422 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -6,6 +6,10 @@
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
      class="">
 
+    <div>
+        <button type="button" id="lexical-button">Callout</button>
+    </div>
+
     <div refs="wysiwyg-editor@edit-area" contenteditable="true">
         <p>Some content here</p>
         <h2>List below this h2 header</h2>

From 49546cd627f4595cc245cad7e282d6c1f8506fd6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 27 May 2024 23:50:28 +0100
Subject: [PATCH 142/666] Lexical: Switched to ts for new editor build

---
 dev/build/esbuild.js                          |  2 +-
 package-lock.json                             | 16 ++++++-
 package.json                                  |  6 ++-
 resources/js/wysiwyg/{index.mjs => index.ts}  | 16 +++----
 .../wysiwyg/nodes/{callout.js => callout.ts}  | 48 ++++++++++++-------
 .../js/wysiwyg/nodes/{index.js => index.ts}   |  4 +-
 6 files changed, 62 insertions(+), 30 deletions(-)
 rename resources/js/wysiwyg/{index.mjs => index.ts} (83%)
 rename resources/js/wysiwyg/nodes/{callout.js => callout.ts} (58%)
 rename resources/js/wysiwyg/nodes/{index.js => index.ts} (60%)

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index 20193db7fa9..7f180fc0741 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -14,7 +14,7 @@ const entryPoints = {
     code: path.join(__dirname, '../../resources/js/code/index.mjs'),
     'legacy-modes': path.join(__dirname, '../../resources/js/code/legacy-modes.mjs'),
     markdown: path.join(__dirname, '../../resources/js/markdown/index.mjs'),
-    wysiwyg: path.join(__dirname, '../../resources/js/wysiwyg/index.mjs'),
+    wysiwyg: path.join(__dirname, '../../resources/js/wysiwyg/index.ts'),
 };
 
 // Locate our output directory
diff --git a/package-lock.json b/package-lock.json
index 6cd32760d96..2b6b677c2e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,8 @@
         "eslint-plugin-import": "^2.29.0",
         "livereload": "^0.9.3",
         "npm-run-all": "^4.1.5",
-        "sass": "^1.69.5"
+        "sass": "^1.69.5",
+        "typescript": "^5.4.5"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -4099,6 +4100,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/uc.micro": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
diff --git a/package.json b/package.json
index 42b86fdc7b5..97a79612623 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "eslint-plugin-import": "^2.29.0",
     "livereload": "^0.9.3",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.69.5"
+    "sass": "^1.69.5",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@codemirror/commands": "^6.3.2",
@@ -65,7 +66,8 @@
     },
     "extends": "airbnb-base",
     "ignorePatterns": [
-      "resources/**/*-stub.js"
+      "resources/**/*-stub.js",
+      "resources/**/*.ts"
     ],
     "overrides": [],
     "parserOptions": {
diff --git a/resources/js/wysiwyg/index.mjs b/resources/js/wysiwyg/index.ts
similarity index 83%
rename from resources/js/wysiwyg/index.mjs
rename to resources/js/wysiwyg/index.ts
index decfa4f22b1..266866c6251 100644
--- a/resources/js/wysiwyg/index.mjs
+++ b/resources/js/wysiwyg/index.ts
@@ -4,18 +4,18 @@ import {
     $getSelection,
     COMMAND_PRIORITY_LOW,
     createCommand,
-    createEditor
+    createEditor, CreateEditorArgs,
 } from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {$getNearestBlockElementAncestorOrThrow, mergeRegister} from '@lexical/utils';
 import {$generateNodesFromDOM} from '@lexical/html';
-import {getNodesForPageEditor} from "./nodes/index.js";
-import {$createCalloutNode, $isCalloutNode} from "./nodes/callout.js";
-import {$setBlocksType} from "@lexical/selection";
+import {$setBlocksType} from '@lexical/selection';
+import {getNodesForPageEditor} from './nodes';
+import {$createCalloutNode, $isCalloutNode, CalloutCategory} from './nodes/callout';
 
-export function createPageEditorInstance(editArea) {
-    const config = {
+export function createPageEditorInstance(editArea: HTMLElement) {
+    const config: CreateEditorArgs = {
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
         onError: console.error,
@@ -52,7 +52,7 @@ export function createPageEditorInstance(editArea) {
     // Example of creating, registering and using a custom command
 
     const SET_BLOCK_CALLOUT_COMMAND = createCommand();
-    editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category = 'info') => {
+    editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category: CalloutCategory = 'info') => {
         const selection = $getSelection();
         const blockElement = $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]);
         if ($isCalloutNode(blockElement)) {
@@ -67,4 +67,4 @@ export function createPageEditorInstance(editArea) {
     button.addEventListener('click', event => {
         editor.dispatchCommand(SET_BLOCK_CALLOUT_COMMAND, 'info');
     });
-}
\ No newline at end of file
+}
diff --git a/resources/js/wysiwyg/nodes/callout.js b/resources/js/wysiwyg/nodes/callout.ts
similarity index 58%
rename from resources/js/wysiwyg/nodes/callout.js
rename to resources/js/wysiwyg/nodes/callout.ts
index db90f22a945..4fba5ee5b63 100644
--- a/resources/js/wysiwyg/nodes/callout.js
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -1,35 +1,51 @@
-import {$createParagraphNode, ElementNode} from 'lexical';
+import {
+    $createParagraphNode,
+    DOMConversion,
+    DOMConversionMap, DOMConversionOutput,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode,
+    ParagraphNode, SerializedElementNode, Spread
+} from 'lexical';
+import type {EditorConfig} from "lexical/LexicalEditor";
+import type {RangeSelection} from "lexical/LexicalSelection";
+
+export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
+
+export type SerializedCalloutNode = Spread<{
+    category: CalloutCategory;
+}, SerializedElementNode>
 
 export class Callout extends ElementNode {
 
-    __category = 'info';
+    __category: CalloutCategory = 'info';
 
     static getType() {
         return 'callout';
     }
 
-    static clone(node) {
+    static clone(node: Callout) {
         return new Callout(node.__category, node.__key);
     }
 
-    constructor(category, key) {
+    constructor(category: CalloutCategory, key?: string) {
         super(key);
         this.__category = category;
     }
 
-    createDOM(_config, _editor) {
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('p');
         element.classList.add('callout', this.__category || '');
         return element;
     }
 
-    updateDOM(prevNode, dom) {
+    updateDOM(prevNode: unknown, dom: HTMLElement) {
         // Returning false tells Lexical that this node does not need its
         // DOM element replacing with a new copy from createDOM.
         return false;
     }
 
-    insertNewAfter(selection, restoreSelection) {
+    insertNewAfter(selection: RangeSelection, restoreSelection?: boolean): Callout|ParagraphNode {
         const anchorOffset = selection ? selection.anchor.offset : 0;
         const newElement = anchorOffset === this.getTextContentSize() || !selection
             ? $createParagraphNode() : $createCalloutNode(this.__category);
@@ -46,14 +62,14 @@ export class Callout extends ElementNode {
         return newElement;
     }
 
-    static importDOM() {
+    static importDOM(): DOMConversionMap|null {
         return {
-            p: node => {
+            p(node: HTMLElement): DOMConversion|null {
                 if (node.classList.contains('callout')) {
                     return {
-                        conversion: element => {
-                            let category = 'info';
-                            const categories = ['info', 'success', 'warning', 'danger'];
+                        conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                            let category: CalloutCategory = 'info';
+                            const categories: CalloutCategory[] = ['info', 'success', 'warning', 'danger'];
 
                             for (const c of categories) {
                                 if (element.classList.contains(c)) {
@@ -74,7 +90,7 @@ export class Callout extends ElementNode {
         };
     }
 
-    exportJSON() {
+    exportJSON(): SerializedCalloutNode {
         return {
             ...super.exportJSON(),
             type: 'callout',
@@ -83,16 +99,16 @@ export class Callout extends ElementNode {
         };
     }
 
-    static importJSON(serializedNode) {
+    static importJSON(serializedNode: SerializedCalloutNode): Callout {
         return $createCalloutNode(serializedNode.category);
     }
 
 }
 
-export function $createCalloutNode(category = 'info') {
+export function $createCalloutNode(category: CalloutCategory = 'info') {
     return new Callout(category);
 }
 
-export function $isCalloutNode(node) {
+export function $isCalloutNode(node: LexicalNode | null | undefined) {
     return node instanceof Callout;
 }
diff --git a/resources/js/wysiwyg/nodes/index.js b/resources/js/wysiwyg/nodes/index.ts
similarity index 60%
rename from resources/js/wysiwyg/nodes/index.js
rename to resources/js/wysiwyg/nodes/index.ts
index ada229d9ea6..77f582877f4 100644
--- a/resources/js/wysiwyg/nodes/index.js
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,11 +1,11 @@
 import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {Callout} from './callout';
+import {KlassConstructor, LexicalNode} from "lexical";
 
 /**
  * Load the nodes for lexical.
- * @returns {LexicalNode[]}
  */
-export function getNodesForPageEditor() {
+export function getNodesForPageEditor(): KlassConstructor<typeof LexicalNode>[] {
     return [
         Callout,
         HeadingNode,

From 0f8bd869d8bb0ef3f7318dfe03aa122b87cc9b0d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 28 May 2024 15:09:50 +0100
Subject: [PATCH 143/666] Lexical: Added custom id-supporting paragraph blocks

---
 package.json                                  |  2 +-
 resources/js/wysiwyg/index.ts                 |  4 -
 resources/js/wysiwyg/nodes/callout.ts         | 16 +--
 .../js/wysiwyg/nodes/custom-paragraph.ts      | 98 +++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           | 20 ++--
 .../pages/parts/wysiwyg-editor.blade.php      |  2 +-
 6 files changed, 122 insertions(+), 20 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/custom-paragraph.ts

diff --git a/package.json b/package.json
index 97a79612623..ca0f01f17a7 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "build:css:watch": "sass ./resources/sass:./public/dist --watch --embed-sources",
     "build:css:production": "sass ./resources/sass:./public/dist -s compressed",
     "build:js:dev": "node dev/build/esbuild.js",
-    "build:js:watch": "chokidar --initial \"./resources/**/*.js\" \"./resources/**/*.mjs\" -c \"npm run build:js:dev\"",
+    "build:js:watch": "chokidar --initial \"./resources/**/*.js\" \"./resources/**/*.mjs\" \"./resources/**/*.ts\" -c \"npm run build:js:dev\"",
     "build:js:production": "node dev/build/esbuild.js production",
     "build": "npm-run-all --parallel build:*:dev",
     "production": "npm-run-all --parallel build:*:production",
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 266866c6251..9553fd4dd3d 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -45,10 +45,6 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
     });
 
-    // Todo - How can we store things like IDs and alignment?
-    //   Node overrides?
-    //   https://lexical.dev/docs/concepts/node-replacement
-
     // Example of creating, registering and using a custom command
 
     const SET_BLOCK_CALLOUT_COMMAND = createCommand();
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index 4fba5ee5b63..89b9b162ef0 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -16,7 +16,7 @@ export type SerializedCalloutNode = Spread<{
     category: CalloutCategory;
 }, SerializedElementNode>
 
-export class Callout extends ElementNode {
+export class CalloutNode extends ElementNode {
 
     __category: CalloutCategory = 'info';
 
@@ -24,8 +24,8 @@ export class Callout extends ElementNode {
         return 'callout';
     }
 
-    static clone(node: Callout) {
-        return new Callout(node.__category, node.__key);
+    static clone(node: CalloutNode) {
+        return new CalloutNode(node.__category, node.__key);
     }
 
     constructor(category: CalloutCategory, key?: string) {
@@ -45,7 +45,7 @@ export class Callout extends ElementNode {
         return false;
     }
 
-    insertNewAfter(selection: RangeSelection, restoreSelection?: boolean): Callout|ParagraphNode {
+    insertNewAfter(selection: RangeSelection, restoreSelection?: boolean): CalloutNode|ParagraphNode {
         const anchorOffset = selection ? selection.anchor.offset : 0;
         const newElement = anchorOffset === this.getTextContentSize() || !selection
             ? $createParagraphNode() : $createCalloutNode(this.__category);
@@ -79,7 +79,7 @@ export class Callout extends ElementNode {
                             }
 
                             return {
-                                node: new Callout(category),
+                                node: new CalloutNode(category),
                             };
                         },
                         priority: 3,
@@ -99,16 +99,16 @@ export class Callout extends ElementNode {
         };
     }
 
-    static importJSON(serializedNode: SerializedCalloutNode): Callout {
+    static importJSON(serializedNode: SerializedCalloutNode): CalloutNode {
         return $createCalloutNode(serializedNode.category);
     }
 
 }
 
 export function $createCalloutNode(category: CalloutCategory = 'info') {
-    return new Callout(category);
+    return new CalloutNode(category);
 }
 
 export function $isCalloutNode(node: LexicalNode | null | undefined) {
-    return node instanceof Callout;
+    return node instanceof CalloutNode;
 }
diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
new file mode 100644
index 00000000000..f13cef56f31
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-paragraph.ts
@@ -0,0 +1,98 @@
+import {
+    DOMConversion,
+    DOMConversionMap,
+    DOMConversionOutput, ElementFormatType,
+    LexicalNode,
+    ParagraphNode,
+    SerializedParagraphNode,
+    Spread
+} from "lexical";
+import {EditorConfig} from "lexical/LexicalEditor";
+
+
+export type SerializedCustomParagraphNode = Spread<{
+    id: string;
+}, SerializedParagraphNode>
+
+export class CustomParagraphNode extends ParagraphNode {
+    __id: string = '';
+
+    static getType() {
+        return 'custom-paragraph';
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    static clone(node: CustomParagraphNode) {
+        const newNode = new CustomParagraphNode(node.__key);
+        newNode.__id = node.__id;
+        return newNode;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const dom = super.createDOM(config);
+        const id = this.getId();
+        if (id) {
+            dom.setAttribute('id', id);
+        }
+
+        return dom;
+    }
+
+    exportJSON(): SerializedCustomParagraphNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-paragraph',
+            version: 1,
+            id: this.__id,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomParagraphNode): CustomParagraphNode {
+        const node = $createCustomParagraphNode();
+        node.setId(serializedNode.id);
+        return node;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            p(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        const node = $createCustomParagraphNode();
+                        if (element.style) {
+                            node.setFormat(element.style.textAlign as ElementFormatType);
+                            const indent = parseInt(element.style.textIndent, 10) / 20;
+                            if (indent > 0) {
+                                node.setIndent(indent);
+                            }
+                        }
+
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
+
+                        return {node};
+                    },
+                    priority: 1,
+                };
+            },
+        };
+    }
+}
+
+export function $createCustomParagraphNode() {
+    return new CustomParagraphNode();
+}
+
+export function $isCustomParagraphNode(node: LexicalNode | null | undefined) {
+    return node instanceof CustomParagraphNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 77f582877f4..7dda306479b 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,14 +1,22 @@
 import {HeadingNode, QuoteNode} from '@lexical/rich-text';
-import {Callout} from './callout';
-import {KlassConstructor, LexicalNode} from "lexical";
+import {CalloutNode} from './callout';
+import {KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
+import {CustomParagraphNode} from "./custom-paragraph";
 
 /**
  * Load the nodes for lexical.
  */
-export function getNodesForPageEditor(): KlassConstructor<typeof LexicalNode>[] {
+export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
     return [
-        Callout,
-        HeadingNode,
-        QuoteNode,
+        CalloutNode, // Todo - Create custom
+        HeadingNode, // Todo - Create custom
+        QuoteNode, // Todo - Create custom
+        CustomParagraphNode,
+        {
+            replace: ParagraphNode,
+            with: (node: ParagraphNode) => {
+                return new CustomParagraphNode();
+            }
+        }
     ];
 }
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 30be1a21422..bbe76090c40 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -11,7 +11,7 @@ class="">
     </div>
 
     <div refs="wysiwyg-editor@edit-area" contenteditable="true">
-        <p>Some content here</p>
+        <p id="Content!">Some <strong>content</strong> here</p>
         <h2>List below this h2 header</h2>
         <ul>
             <li>Hello</li>

From b24d60e98d0c990f2a5d0cdf3a09b6d37fc2f195 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 28 May 2024 18:04:48 +0100
Subject: [PATCH 144/666] Lexical: Started UI fundementals with basic button

---
 resources/js/wysiwyg/helpers.ts               |  36 ++++++
 resources/js/wysiwyg/index.ts                 |  52 ++++-----
 resources/js/wysiwyg/nodes/callout.ts         |  14 +++
 resources/js/wysiwyg/nodes/index.ts           |   5 +-
 resources/js/wysiwyg/ui/editor-button.ts      |  45 ++++++++
 resources/js/wysiwyg/ui/index.ts              |  51 ++++++++
 .../pages/parts/wysiwyg-editor.blade.php      |   8 +-
 tsconfig.json                                 | 109 ++++++++++++++++++
 8 files changed, 288 insertions(+), 32 deletions(-)
 create mode 100644 resources/js/wysiwyg/helpers.ts
 create mode 100644 resources/js/wysiwyg/ui/editor-button.ts
 create mode 100644 resources/js/wysiwyg/ui/index.ts
 create mode 100644 tsconfig.json

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
new file mode 100644
index 00000000000..720f3c6d5da
--- /dev/null
+++ b/resources/js/wysiwyg/helpers.ts
@@ -0,0 +1,36 @@
+import {$createParagraphNode, $getSelection, BaseSelection, LexicalEditor} from "lexical";
+import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
+import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
+import {$setBlocksType} from "@lexical/selection";
+
+export function selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
+    if (!selection) {
+        return false;
+    }
+
+    for (const node of selection.getNodes()) {
+        if (matcher(node)) {
+            return true;
+        }
+
+        for (const parent of node.getParents()) {
+            if (matcher(parent)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+export function toggleSelectionBlockNodeType(editor: LexicalEditor, matcher: LexicalNodeMatcher, creator: LexicalElementNodeCreator) {
+    editor.update(() => {
+        const selection = $getSelection();
+        const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
+        if (selection && matcher(blockElement)) {
+            $setBlocksType(selection, $createParagraphNode);
+        } else {
+            $setBlocksType(selection, creator);
+        }
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9553fd4dd3d..0dcbf27f550 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,18 +1,10 @@
-import {
-    $createParagraphNode,
-    $getRoot,
-    $getSelection,
-    COMMAND_PRIORITY_LOW,
-    createCommand,
-    createEditor, CreateEditorArgs,
-} from 'lexical';
+import {$getRoot, createEditor, CreateEditorArgs} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
-import {$getNearestBlockElementAncestorOrThrow, mergeRegister} from '@lexical/utils';
+import {mergeRegister} from '@lexical/utils';
 import {$generateNodesFromDOM} from '@lexical/html';
-import {$setBlocksType} from '@lexical/selection';
 import {getNodesForPageEditor} from './nodes';
-import {$createCalloutNode, $isCalloutNode, CalloutCategory} from './nodes/callout';
+import {buildEditorUI} from "./ui";
 
 export function createPageEditorInstance(editArea: HTMLElement) {
     const config: CreateEditorArgs = {
@@ -42,25 +34,29 @@ export function createPageEditorInstance(editArea: HTMLElement) {
     const debugView = document.getElementById('lexical-debug');
     editor.registerUpdateListener(({editorState}) => {
         console.log('editorState', editorState.toJSON());
-        debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
+        if (debugView) {
+            debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
+        }
     });
 
-    // Example of creating, registering and using a custom command
+    buildEditorUI(editArea, editor);
 
-    const SET_BLOCK_CALLOUT_COMMAND = createCommand();
-    editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category: CalloutCategory = 'info') => {
-        const selection = $getSelection();
-        const blockElement = $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]);
-        if ($isCalloutNode(blockElement)) {
-            $setBlocksType(selection, $createParagraphNode);
-        } else {
-            $setBlocksType(selection, () => $createCalloutNode(category));
-        }
-        return true;
-    }, COMMAND_PRIORITY_LOW);
+    // Example of creating, registering and using a custom command
 
-    const button = document.getElementById('lexical-button');
-    button.addEventListener('click', event => {
-        editor.dispatchCommand(SET_BLOCK_CALLOUT_COMMAND, 'info');
-    });
+    // const SET_BLOCK_CALLOUT_COMMAND = createCommand();
+    // editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category: CalloutCategory = 'info') => {
+    //     const selection = $getSelection();
+    //     const blockElement = $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]);
+    //     if ($isCalloutNode(blockElement)) {
+    //         $setBlocksType(selection, $createParagraphNode);
+    //     } else {
+    //         $setBlocksType(selection, () => $createCalloutNode(category));
+    //     }
+    //     return true;
+    // }, COMMAND_PRIORITY_LOW);
+    //
+    // const button = document.getElementById('lexical-button');
+    // button.addEventListener('click', event => {
+    //     editor.dispatchCommand(SET_BLOCK_CALLOUT_COMMAND, 'info');
+    // });
 }
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index 89b9b162ef0..e39dcc3ee94 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -33,6 +33,16 @@ export class CalloutNode extends ElementNode {
         this.__category = category;
     }
 
+    setCategory(category: CalloutCategory) {
+        const self = this.getWritable();
+        self.__category = category;
+    }
+
+    getCategory(): CalloutCategory {
+        const self = this.getLatest();
+        return self.__category;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('p');
         element.classList.add('callout', this.__category || '');
@@ -112,3 +122,7 @@ export function $createCalloutNode(category: CalloutCategory = 'info') {
 export function $isCalloutNode(node: LexicalNode | null | undefined) {
     return node instanceof CalloutNode;
 }
+
+export function $isCalloutNodeOfCategory(node: LexicalNode | null | undefined, category: CalloutCategory = 'info') {
+    return node instanceof CalloutNode && (node as CalloutNode).getCategory() === category;
+}
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 7dda306479b..ffe1b027fe5 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,6 +1,6 @@
 import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {CalloutNode} from './callout';
-import {KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
+import {ElementNode, KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
 import {CustomParagraphNode} from "./custom-paragraph";
 
 /**
@@ -20,3 +20,6 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         }
     ];
 }
+
+export type LexicalNodeMatcher = (node: LexicalNode|null|undefined) => boolean;
+export type LexicalElementNodeCreator = () => ElementNode;
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/editor-button.ts b/resources/js/wysiwyg/ui/editor-button.ts
new file mode 100644
index 00000000000..2ce272fce7c
--- /dev/null
+++ b/resources/js/wysiwyg/ui/editor-button.ts
@@ -0,0 +1,45 @@
+import {BaseSelection, LexicalEditor} from "lexical";
+
+export interface EditorButtonDefinition {
+    label: string;
+    action: (editor: LexicalEditor) => void;
+    isActive: (selection: BaseSelection|null) => boolean;
+}
+
+export class EditorButton {
+    #definition: EditorButtonDefinition;
+    #editor: LexicalEditor;
+    #dom: HTMLButtonElement;
+
+    constructor(definition: EditorButtonDefinition, editor: LexicalEditor) {
+        this.#definition = definition;
+        this.#editor = editor;
+        this.#dom = this.buildDOM();
+    }
+
+    private buildDOM(): HTMLButtonElement {
+        const button = document.createElement("button");
+        button.setAttribute('type', 'button');
+        button.textContent = this.#definition.label;
+        button.classList.add('editor-toolbar-button');
+
+        button.addEventListener('click', event => {
+            this.runAction();
+        });
+
+        return button;
+    }
+
+    getDOMElement(): HTMLButtonElement {
+        return this.#dom;
+    }
+
+    runAction() {
+        this.#definition.action(this.#editor);
+    }
+
+    updateActiveState(selection: BaseSelection|null) {
+        const isActive = this.#definition.isActive(selection);
+        this.#dom.classList.toggle('editor-toolbar-button-active', isActive);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
new file mode 100644
index 00000000000..10eaa558f3f
--- /dev/null
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -0,0 +1,51 @@
+import {
+    $getSelection,
+    BaseSelection,
+    COMMAND_PRIORITY_LOW,
+    LexicalEditor,
+    SELECTION_CHANGE_COMMAND
+} from "lexical";
+import {$createCalloutNode, $isCalloutNodeOfCategory} from "../nodes/callout";
+import {selectionContainsNodeType, toggleSelectionBlockNodeType} from "../helpers";
+import {EditorButton, EditorButtonDefinition} from "./editor-button";
+
+const calloutButton: EditorButtonDefinition = {
+    label: 'Info Callout',
+    action(editor: LexicalEditor) {
+        toggleSelectionBlockNodeType(
+            editor,
+            (node) => $isCalloutNodeOfCategory(node, 'info'),
+            () => $createCalloutNode('info'),
+        )
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, 'info'));
+    }
+}
+
+const toolbarButtonDefinitions: EditorButtonDefinition[] = [
+    calloutButton,
+];
+
+export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
+    const toolbarContainer = document.createElement('div');
+    toolbarContainer.classList.add('editor-toolbar-container');
+
+    const buttons = toolbarButtonDefinitions.map(definition => {
+        return new EditorButton(definition, editor);
+    });
+
+    const buttonElements = buttons.map(button => button.getDOMElement());
+
+    toolbarContainer.append(...buttonElements);
+    element.before(toolbarContainer);
+
+    // Update button states on editor selection change
+    editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
+        const selection = $getSelection();
+        for (const button of buttons) {
+            button.updateActiveState(selection);
+        }
+        return false;
+    }, COMMAND_PRIORITY_LOW);
+}
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index bbe76090c40..90e42e576c2 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -6,9 +6,11 @@
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
      class="">
 
-    <div>
-        <button type="button" id="lexical-button">Callout</button>
-    </div>
+    <style>
+        .editor-toolbar-button-active {
+            background-color: tomato;
+        }
+    </style>
 
     <div refs="wysiwyg-editor@edit-area" contenteditable="true">
         <p id="Content!">Some <strong>content</strong> here</p>
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000000..e075f973c4d
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,109 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+
+    /* Modules */
+    "module": "commonjs",                                /* Specify what module code is generated. */
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
+    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
+    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
+    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
+    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+
+    /* Emit */
+    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+  }
+}

From 483d9bf26ca5db0de17aa6fbf775874a596e4782 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 28 May 2024 22:56:58 +0100
Subject: [PATCH 145/666] Lexical: Added a range of format buttons

---
 resources/js/wysiwyg/helpers.ts    |  24 +++++-
 resources/js/wysiwyg/ui/buttons.ts | 129 +++++++++++++++++++++++++++++
 resources/js/wysiwyg/ui/index.ts   |  35 ++++----
 3 files changed, 170 insertions(+), 18 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/buttons.ts

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 720f3c6d5da..737666ffa91 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -1,7 +1,15 @@
-import {$createParagraphNode, $getSelection, BaseSelection, LexicalEditor} from "lexical";
+import {
+    $createParagraphNode,
+    $getSelection,
+    $isTextNode,
+    BaseSelection,
+    ElementFormatType,
+    LexicalEditor, TextFormatType
+} from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
+import {TextNodeThemeClasses} from "lexical/LexicalEditor";
 
 export function selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
     if (!selection) {
@@ -23,6 +31,20 @@ export function selectionContainsNodeType(selection: BaseSelection|null, matcher
     return false;
 }
 
+export function selectionContainsTextFormat(selection: BaseSelection|null, format: TextFormatType): boolean {
+    if (!selection) {
+        return false;
+    }
+
+    for (const node of selection.getNodes()) {
+        if ($isTextNode(node) && node.hasFormat(format)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 export function toggleSelectionBlockNodeType(editor: LexicalEditor, matcher: LexicalNodeMatcher, creator: LexicalElementNodeCreator) {
     editor.update(() => {
         const selection = $getSelection();
diff --git a/resources/js/wysiwyg/ui/buttons.ts b/resources/js/wysiwyg/ui/buttons.ts
new file mode 100644
index 00000000000..cf5660ef040
--- /dev/null
+++ b/resources/js/wysiwyg/ui/buttons.ts
@@ -0,0 +1,129 @@
+import {EditorButtonDefinition} from "./editor-button";
+import {
+    $createParagraphNode,
+    $isParagraphNode,
+    BaseSelection, FORMAT_TEXT_COMMAND,
+    LexicalEditor,
+    LexicalNode,
+    REDO_COMMAND, TextFormatType,
+    UNDO_COMMAND
+} from "lexical";
+import {selectionContainsNodeType, selectionContainsTextFormat, toggleSelectionBlockNodeType} from "../helpers";
+import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../nodes/callout";
+import {
+    $createHeadingNode,
+    $createQuoteNode,
+    $isHeadingNode,
+    $isQuoteNode,
+    HeadingNode,
+    HeadingTagType
+} from "@lexical/rich-text";
+
+export const undoButton: EditorButtonDefinition = {
+    label: 'Undo',
+    action(editor: LexicalEditor) {
+        editor.dispatchCommand(UNDO_COMMAND);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    }
+}
+
+export const redoButton: EditorButtonDefinition = {
+    label: 'Redo',
+    action(editor: LexicalEditor) {
+        editor.dispatchCommand(REDO_COMMAND);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    }
+}
+
+function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
+    return {
+        label: `${name} Callout`,
+        action(editor: LexicalEditor) {
+            toggleSelectionBlockNodeType(
+                editor,
+                (node) => $isCalloutNodeOfCategory(node, category),
+                () => $createCalloutNode(category),
+            )
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, category));
+        }
+    };
+}
+
+export const infoCalloutButton: EditorButtonDefinition = buildCalloutButton('info', 'Info');
+export const dangerCalloutButton: EditorButtonDefinition = buildCalloutButton('danger', 'Danger');
+export const warningCalloutButton: EditorButtonDefinition = buildCalloutButton('warning', 'Warning');
+export const successCalloutButton: EditorButtonDefinition = buildCalloutButton('success', 'Success');
+
+const isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
+      return $isHeadingNode(node) && (node as HeadingNode).getTag() === tag;
+};
+
+function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefinition {
+    return {
+        label: name,
+        action(editor: LexicalEditor) {
+            toggleSelectionBlockNodeType(
+                editor,
+                (node) => isHeaderNodeOfTag(node, tag),
+                () => $createHeadingNode(tag),
+            )
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
+        }
+    };
+}
+
+export const h2Button: EditorButtonDefinition = buildHeaderButton('h2', 'Large Header');
+export const h3Button: EditorButtonDefinition = buildHeaderButton('h3', 'Medium Header');
+export const h4Button: EditorButtonDefinition = buildHeaderButton('h4', 'Small Header');
+export const h5Button: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header');
+
+export const blockquoteButton: EditorButtonDefinition = {
+    label: 'Blockquote',
+    action(editor: LexicalEditor) {
+        toggleSelectionBlockNodeType(editor, $isQuoteNode, $createQuoteNode);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isQuoteNode);
+    }
+};
+
+export const paragraphButton: EditorButtonDefinition = {
+    label: 'Paragraph',
+    action(editor: LexicalEditor) {
+        toggleSelectionBlockNodeType(editor, $isParagraphNode, $createParagraphNode);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isParagraphNode);
+    }
+}
+
+function buildFormatButton(label: string, format: TextFormatType): EditorButtonDefinition {
+    return {
+        label: label,
+        action(editor: LexicalEditor) {
+            editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return selectionContainsTextFormat(selection, format);
+        }
+    };
+}
+
+export const boldButton: EditorButtonDefinition = buildFormatButton('Bold', 'bold');
+export const italicButton: EditorButtonDefinition = buildFormatButton('Italic', 'italic');
+export const underlineButton: EditorButtonDefinition = buildFormatButton('Underline', 'underline');
+// Todo - Text color
+// Todo - Highlight color
+export const strikethroughButton: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough');
+export const superscriptButton: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
+export const subscriptButton: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
+export const codeButton: EditorButtonDefinition = buildFormatButton('Inline Code', 'code');
+// Todo - Clear formatting
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 10eaa558f3f..d04808faec5 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,30 +1,31 @@
 import {
     $getSelection,
-    BaseSelection,
     COMMAND_PRIORITY_LOW,
     LexicalEditor,
     SELECTION_CHANGE_COMMAND
 } from "lexical";
-import {$createCalloutNode, $isCalloutNodeOfCategory} from "../nodes/callout";
-import {selectionContainsNodeType, toggleSelectionBlockNodeType} from "../helpers";
 import {EditorButton, EditorButtonDefinition} from "./editor-button";
+import {
+    blockquoteButton, boldButton, codeButton,
+    dangerCalloutButton,
+    h2Button,
+    h3Button, h4Button, h5Button,
+    infoCalloutButton, italicButton, paragraphButton, redoButton, strikethroughButton, subscriptButton,
+    successCalloutButton, superscriptButton, underlineButton, undoButton,
+    warningCalloutButton
+} from "./buttons";
+
 
-const calloutButton: EditorButtonDefinition = {
-    label: 'Info Callout',
-    action(editor: LexicalEditor) {
-        toggleSelectionBlockNodeType(
-            editor,
-            (node) => $isCalloutNodeOfCategory(node, 'info'),
-            () => $createCalloutNode('info'),
-        )
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, 'info'));
-    }
-}
 
 const toolbarButtonDefinitions: EditorButtonDefinition[] = [
-    calloutButton,
+    undoButton, redoButton,
+
+    infoCalloutButton, warningCalloutButton, dangerCalloutButton, successCalloutButton,
+    h2Button, h3Button, h4Button, h5Button,
+    blockquoteButton, paragraphButton,
+
+    boldButton, italicButton, underlineButton, strikethroughButton,
+    superscriptButton, subscriptButton, codeButton,
 ];
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {

From dc1a40ea7465277ae82027e07926e230549c89f0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 29 May 2024 20:38:31 +0100
Subject: [PATCH 146/666] Lexical: Added ui container type

Structured UI logical to be fairly standard and mostly covered via
a base class that handles context and core dom work.
---
 package-lock.json                             | 10 +++
 package.json                                  |  1 +
 resources/js/wysiwyg/helpers.ts               | 20 +++++-
 resources/js/wysiwyg/nodes/index.ts           |  4 +-
 .../button-definitions.ts}                    | 65 ++++++++++++-------
 resources/js/wysiwyg/ui/editor-button.ts      | 45 -------------
 .../js/wysiwyg/ui/framework/base-elements.ts  | 39 +++++++++++
 resources/js/wysiwyg/ui/framework/buttons.ts  | 40 ++++++++++++
 .../js/wysiwyg/ui/framework/containers.ts     | 40 ++++++++++++
 resources/js/wysiwyg/ui/index.ts              | 42 ++----------
 resources/js/wysiwyg/ui/toolbars.ts           | 43 ++++++++++++
 .../pages/parts/wysiwyg-editor.blade.php      |  1 +
 12 files changed, 240 insertions(+), 110 deletions(-)
 rename resources/js/wysiwyg/ui/{buttons.ts => defaults/button-definitions.ts} (57%)
 delete mode 100644 resources/js/wysiwyg/ui/editor-button.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/base-elements.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/buttons.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/containers.ts
 create mode 100644 resources/js/wysiwyg/ui/toolbars.ts

diff --git a/package-lock.json b/package-lock.json
index 2b6b677c2e3..2cddccb5900 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "@codemirror/view": "^6.22.2",
         "@lexical/history": "^0.15.0",
         "@lexical/html": "^0.15.0",
+        "@lexical/link": "^0.15.0",
         "@lexical/rich-text": "^0.15.0",
         "@lexical/selection": "^0.15.0",
         "@lexical/utils": "^0.15.0",
@@ -729,6 +730,15 @@
         "lexical": "0.15.0"
       }
     },
+    "node_modules/@lexical/link": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.15.0.tgz",
+      "integrity": "sha512-KBV/zWk5FxqZGNcq3IKGBDCcS4t0uteU1osAIG+pefo4waTkOOgibxxEJDop2QR5wtjkYva3Qp0D8ZyJDMMMlw==",
+      "dependencies": {
+        "@lexical/utils": "0.15.0",
+        "lexical": "0.15.0"
+      }
+    },
     "node_modules/@lexical/list": {
       "version": "0.15.0",
       "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.15.0.tgz",
diff --git a/package.json b/package.json
index ca0f01f17a7..d9fa89c186a 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@codemirror/view": "^6.22.2",
     "@lexical/history": "^0.15.0",
     "@lexical/html": "^0.15.0",
+    "@lexical/link": "^0.15.0",
     "@lexical/rich-text": "^0.15.0",
     "@lexical/selection": "^0.15.0",
     "@lexical/utils": "^0.15.0",
diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 737666ffa91..7218f1ae643 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -3,13 +3,29 @@ import {
     $getSelection,
     $isTextNode,
     BaseSelection,
-    ElementFormatType,
     LexicalEditor, TextFormatType
 } from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
-import {TextNodeThemeClasses} from "lexical/LexicalEditor";
+
+export function el(tag: string, attrs: Record<string, string> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
+    const el = document.createElement(tag);
+    const attrKeys = Object.keys(attrs);
+    for (const attr of attrKeys) {
+        el.setAttribute(attr, attrs[attr]);
+    }
+
+    for (const child of children) {
+        if (typeof child === 'string') {
+            el.append(document.createTextNode(child));
+        } else {
+            el.append(child);
+        }
+    }
+
+    return el;
+}
 
 export function selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
     if (!selection) {
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index ffe1b027fe5..9f772df1e5c 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -2,6 +2,7 @@ import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {CalloutNode} from './callout';
 import {ElementNode, KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
 import {CustomParagraphNode} from "./custom-paragraph";
+import {LinkNode} from "@lexical/link";
 
 /**
  * Load the nodes for lexical.
@@ -17,7 +18,8 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
             with: (node: ParagraphNode) => {
                 return new CustomParagraphNode();
             }
-        }
+        },
+        LinkNode,
     ];
 }
 
diff --git a/resources/js/wysiwyg/ui/buttons.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
similarity index 57%
rename from resources/js/wysiwyg/ui/buttons.ts
rename to resources/js/wysiwyg/ui/defaults/button-definitions.ts
index cf5660ef040..874f632fe14 100644
--- a/resources/js/wysiwyg/ui/buttons.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,4 +1,4 @@
-import {EditorButtonDefinition} from "./editor-button";
+import {EditorButtonDefinition} from "../framework/buttons";
 import {
     $createParagraphNode,
     $isParagraphNode,
@@ -8,8 +8,8 @@ import {
     REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
 } from "lexical";
-import {selectionContainsNodeType, selectionContainsTextFormat, toggleSelectionBlockNodeType} from "../helpers";
-import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../nodes/callout";
+import {selectionContainsNodeType, selectionContainsTextFormat, toggleSelectionBlockNodeType} from "../../helpers";
+import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../nodes/callout";
 import {
     $createHeadingNode,
     $createQuoteNode,
@@ -18,21 +18,22 @@ import {
     HeadingNode,
     HeadingTagType
 } from "@lexical/rich-text";
+import {$isLinkNode, $toggleLink} from "@lexical/link";
 
-export const undoButton: EditorButtonDefinition = {
+export const undo: EditorButtonDefinition = {
     label: 'Undo',
     action(editor: LexicalEditor) {
-        editor.dispatchCommand(UNDO_COMMAND);
+        editor.dispatchCommand(UNDO_COMMAND, undefined);
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
     }
 }
 
-export const redoButton: EditorButtonDefinition = {
+export const redo: EditorButtonDefinition = {
     label: 'Redo',
     action(editor: LexicalEditor) {
-        editor.dispatchCommand(REDO_COMMAND);
+        editor.dispatchCommand(REDO_COMMAND, undefined);
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
@@ -55,10 +56,10 @@ function buildCalloutButton(category: CalloutCategory, name: string): EditorButt
     };
 }
 
-export const infoCalloutButton: EditorButtonDefinition = buildCalloutButton('info', 'Info');
-export const dangerCalloutButton: EditorButtonDefinition = buildCalloutButton('danger', 'Danger');
-export const warningCalloutButton: EditorButtonDefinition = buildCalloutButton('warning', 'Warning');
-export const successCalloutButton: EditorButtonDefinition = buildCalloutButton('success', 'Success');
+export const infoCallout: EditorButtonDefinition = buildCalloutButton('info', 'Info');
+export const dangerCallout: EditorButtonDefinition = buildCalloutButton('danger', 'Danger');
+export const warningCallout: EditorButtonDefinition = buildCalloutButton('warning', 'Warning');
+export const successCallout: EditorButtonDefinition = buildCalloutButton('success', 'Success');
 
 const isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
       return $isHeadingNode(node) && (node as HeadingNode).getTag() === tag;
@@ -80,12 +81,12 @@ function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefin
     };
 }
 
-export const h2Button: EditorButtonDefinition = buildHeaderButton('h2', 'Large Header');
-export const h3Button: EditorButtonDefinition = buildHeaderButton('h3', 'Medium Header');
-export const h4Button: EditorButtonDefinition = buildHeaderButton('h4', 'Small Header');
-export const h5Button: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header');
+export const h2: EditorButtonDefinition = buildHeaderButton('h2', 'Large Header');
+export const h3: EditorButtonDefinition = buildHeaderButton('h3', 'Medium Header');
+export const h4: EditorButtonDefinition = buildHeaderButton('h4', 'Small Header');
+export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header');
 
-export const blockquoteButton: EditorButtonDefinition = {
+export const blockquote: EditorButtonDefinition = {
     label: 'Blockquote',
     action(editor: LexicalEditor) {
         toggleSelectionBlockNodeType(editor, $isQuoteNode, $createQuoteNode);
@@ -95,7 +96,7 @@ export const blockquoteButton: EditorButtonDefinition = {
     }
 };
 
-export const paragraphButton: EditorButtonDefinition = {
+export const paragraph: EditorButtonDefinition = {
     label: 'Paragraph',
     action(editor: LexicalEditor) {
         toggleSelectionBlockNodeType(editor, $isParagraphNode, $createParagraphNode);
@@ -117,13 +118,27 @@ function buildFormatButton(label: string, format: TextFormatType): EditorButtonD
     };
 }
 
-export const boldButton: EditorButtonDefinition = buildFormatButton('Bold', 'bold');
-export const italicButton: EditorButtonDefinition = buildFormatButton('Italic', 'italic');
-export const underlineButton: EditorButtonDefinition = buildFormatButton('Underline', 'underline');
+export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold');
+export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic');
+export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline');
 // Todo - Text color
 // Todo - Highlight color
-export const strikethroughButton: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough');
-export const superscriptButton: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
-export const subscriptButton: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
-export const codeButton: EditorButtonDefinition = buildFormatButton('Inline Code', 'code');
-// Todo - Clear formatting
\ No newline at end of file
+export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough');
+export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
+export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
+export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code');
+// Todo - Clear formatting
+
+
+export const link: EditorButtonDefinition = {
+    label: 'Insert/edit link',
+    action(editor: LexicalEditor) {
+        editor.update(() => {
+            $toggleLink('http://example.com');
+        })
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isLinkNode);
+    }
+};
+
diff --git a/resources/js/wysiwyg/ui/editor-button.ts b/resources/js/wysiwyg/ui/editor-button.ts
deleted file mode 100644
index 2ce272fce7c..00000000000
--- a/resources/js/wysiwyg/ui/editor-button.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {BaseSelection, LexicalEditor} from "lexical";
-
-export interface EditorButtonDefinition {
-    label: string;
-    action: (editor: LexicalEditor) => void;
-    isActive: (selection: BaseSelection|null) => boolean;
-}
-
-export class EditorButton {
-    #definition: EditorButtonDefinition;
-    #editor: LexicalEditor;
-    #dom: HTMLButtonElement;
-
-    constructor(definition: EditorButtonDefinition, editor: LexicalEditor) {
-        this.#definition = definition;
-        this.#editor = editor;
-        this.#dom = this.buildDOM();
-    }
-
-    private buildDOM(): HTMLButtonElement {
-        const button = document.createElement("button");
-        button.setAttribute('type', 'button');
-        button.textContent = this.#definition.label;
-        button.classList.add('editor-toolbar-button');
-
-        button.addEventListener('click', event => {
-            this.runAction();
-        });
-
-        return button;
-    }
-
-    getDOMElement(): HTMLButtonElement {
-        return this.#dom;
-    }
-
-    runAction() {
-        this.#definition.action(this.#editor);
-    }
-
-    updateActiveState(selection: BaseSelection|null) {
-        const isActive = this.#definition.isActive(selection);
-        this.#dom.classList.toggle('editor-toolbar-button-active', isActive);
-    }
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/base-elements.ts b/resources/js/wysiwyg/ui/framework/base-elements.ts
new file mode 100644
index 00000000000..66501178238
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/base-elements.ts
@@ -0,0 +1,39 @@
+import {BaseSelection, LexicalEditor} from "lexical";
+
+export type EditorUiStateUpdate = {
+    editor: LexicalEditor,
+    selection: BaseSelection|null,
+};
+
+export type EditorUiContext = {
+    editor: LexicalEditor,
+};
+
+export abstract class EditorUiElement {
+    protected dom: HTMLElement|null = null;
+    private context: EditorUiContext|null = null;
+
+    protected abstract buildDOM(): HTMLElement;
+
+    setContext(context: EditorUiContext): void {
+        this.context = context;
+    }
+
+    getContext(): EditorUiContext {
+        if (this.context === null) {
+            throw new Error('Attempted to use EditorUIContext before it has been set');
+        }
+
+        return this.context;
+    }
+
+    getDOMElement(): HTMLElement {
+        if (!this.dom) {
+            this.dom = this.buildDOM();
+        }
+
+        return this.dom;
+    }
+
+    abstract updateState(state: EditorUiStateUpdate): void;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
new file mode 100644
index 00000000000..51c7d294d90
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -0,0 +1,40 @@
+import {BaseSelection, LexicalEditor} from "lexical";
+import {EditorUiElement, EditorUiStateUpdate} from "./base-elements";
+import {el} from "../../helpers";
+
+export interface EditorButtonDefinition {
+    label: string;
+    action: (editor: LexicalEditor) => void;
+    isActive: (selection: BaseSelection|null) => boolean;
+}
+
+export class EditorButton extends EditorUiElement {
+    protected definition: EditorButtonDefinition;
+
+    constructor(definition: EditorButtonDefinition) {
+        super();
+        this.definition = definition;
+    }
+
+    protected buildDOM(): HTMLButtonElement {
+        const button = el('button', {
+            type: 'button',
+            class: 'editor-toolbar-button',
+        }, [this.definition.label]) as HTMLButtonElement;
+
+        button.addEventListener('click', event => {
+            this.definition.action(this.getContext().editor);
+        });
+
+        return button;
+    }
+
+    updateActiveState(selection: BaseSelection|null) {
+        const isActive = this.definition.isActive(selection);
+        this.dom?.classList.toggle('editor-toolbar-button-active', isActive);
+    }
+
+    updateState(state: EditorUiStateUpdate): void {
+        this.updateActiveState(state.selection);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/containers.ts b/resources/js/wysiwyg/ui/framework/containers.ts
new file mode 100644
index 00000000000..9ef59c72f19
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/containers.ts
@@ -0,0 +1,40 @@
+import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./base-elements";
+import {el} from "../../helpers";
+
+export class EditorContainerUiElement extends EditorUiElement {
+    protected children : EditorUiElement[];
+
+    constructor(children: EditorUiElement[]) {
+        super();
+        this.children = children;
+    }
+
+    protected buildDOM(): HTMLElement {
+        return el('div', {}, this.getChildren().map(child => child.getDOMElement()));
+    }
+
+    getChildren(): EditorUiElement[] {
+        return this.children;
+    }
+
+    updateState(state: EditorUiStateUpdate): void {
+        for (const child of this.children) {
+            child.updateState(state);
+        }
+    }
+
+    setContext(context: EditorUiContext) {
+        for (const child of this.getChildren()) {
+            child.setContext(context);
+        }
+    }
+}
+
+export class EditorFormatMenu extends EditorContainerUiElement {
+    buildDOM(): HTMLElement {
+        return el('div', {
+            class: 'editor-format-menu'
+        }, this.getChildren().map(child => child.getDOMElement()));
+    }
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index d04808faec5..56ae9354ae2 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -4,49 +4,17 @@ import {
     LexicalEditor,
     SELECTION_CHANGE_COMMAND
 } from "lexical";
-import {EditorButton, EditorButtonDefinition} from "./editor-button";
-import {
-    blockquoteButton, boldButton, codeButton,
-    dangerCalloutButton,
-    h2Button,
-    h3Button, h4Button, h5Button,
-    infoCalloutButton, italicButton, paragraphButton, redoButton, strikethroughButton, subscriptButton,
-    successCalloutButton, superscriptButton, underlineButton, undoButton,
-    warningCalloutButton
-} from "./buttons";
-
-
-
-const toolbarButtonDefinitions: EditorButtonDefinition[] = [
-    undoButton, redoButton,
-
-    infoCalloutButton, warningCalloutButton, dangerCalloutButton, successCalloutButton,
-    h2Button, h3Button, h4Button, h5Button,
-    blockquoteButton, paragraphButton,
-
-    boldButton, italicButton, underlineButton, strikethroughButton,
-    superscriptButton, subscriptButton, codeButton,
-];
+import {getMainEditorFullToolbar} from "./toolbars";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
-    const toolbarContainer = document.createElement('div');
-    toolbarContainer.classList.add('editor-toolbar-container');
-
-    const buttons = toolbarButtonDefinitions.map(definition => {
-        return new EditorButton(definition, editor);
-    });
-
-    const buttonElements = buttons.map(button => button.getDOMElement());
-
-    toolbarContainer.append(...buttonElements);
-    element.before(toolbarContainer);
+    const toolbar = getMainEditorFullToolbar();
+    toolbar.setContext({editor});
+    element.before(toolbar.getDOMElement());
 
     // Update button states on editor selection change
     editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
         const selection = $getSelection();
-        for (const button of buttons) {
-            button.updateActiveState(selection);
-        }
+        toolbar.updateState({editor, selection});
         return false;
     }, COMMAND_PRIORITY_LOW);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
new file mode 100644
index 00000000000..0f46f5b2a55
--- /dev/null
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -0,0 +1,43 @@
+import {EditorButton} from "./framework/buttons";
+import {
+    blockquote, bold, code,
+    dangerCallout,
+    h2, h3, h4, h5,
+    infoCallout, italic, link, paragraph,
+    redo, strikethrough, subscript,
+    successCallout, superscript, underline,
+    undo,
+    warningCallout
+} from "./defaults/button-definitions";
+import {EditorContainerUiElement, EditorFormatMenu} from "./framework/containers";
+
+
+export function getMainEditorFullToolbar(): EditorContainerUiElement {
+    return new EditorContainerUiElement([
+        new EditorButton(undo),
+        new EditorButton(redo),
+
+        new EditorFormatMenu([
+            new EditorButton(h2),
+            new EditorButton(h3),
+            new EditorButton(h4),
+            new EditorButton(h5),
+            new EditorButton(blockquote),
+            new EditorButton(paragraph),
+            new EditorButton(infoCallout),
+            new EditorButton(successCallout),
+            new EditorButton(warningCallout),
+            new EditorButton(dangerCallout),
+        ]),
+
+        new EditorButton(bold),
+        new EditorButton(italic),
+        new EditorButton(underline),
+        new EditorButton(strikethrough),
+        new EditorButton(superscript),
+        new EditorButton(subscript),
+        new EditorButton(code),
+
+        new EditorButton(link),
+    ]);
+}
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 90e42e576c2..b48e10570b2 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -14,6 +14,7 @@ class="">
 
     <div refs="wysiwyg-editor@edit-area" contenteditable="true">
         <p id="Content!">Some <strong>content</strong> here</p>
+        <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
         <h2>List below this h2 header</h2>
         <ul>
             <li>Hello</li>

From 8759fff1163e4691a208b5326155659f00a3d06a Mon Sep 17 00:00:00 2001
From: bradenterpstra01 <48718509+bradenterpstra01@users.noreply.github.com>
Date: Wed, 29 May 2024 18:01:48 -0400
Subject: [PATCH 147/666] Update wysiwyg.blade.php

Remove the Shift for the numeric shortcut for incline code.

Ctrl+8 instead of Ctrl+Shift+8

I assume Mac is the same but I do not have a Mac to test with.
---
 resources/views/help/wysiwyg.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/help/wysiwyg.blade.php b/resources/views/help/wysiwyg.blade.php
index 8fc0912586d..8ff59c8d664 100644
--- a/resources/views/help/wysiwyg.blade.php
+++ b/resources/views/help/wysiwyg.blade.php
@@ -98,11 +98,11 @@
             </tr>
             <tr>
                 <td>
-                    <code>Ctrl</code>+<code>Shift</code>+<code>8</code><br>
+                    <code>Ctrl</code>+<code>8</code><br>
                     <code>Ctrl</code>+<code>Shift</code>+<code>E</code>
                 </td>
                 <td>
-                    <code>Cmd</code>+<code>Shift</code>+<code>8</code><br>
+                    <code>Cmd</code>+<code>8</code><br>
                     <code>Cmd</code>+<code>Shift</code>+<code>E</code>
                 </td>
                 <td>{{ trans('editor.inline_code') }}</td>

From 57259aee00206785f371cbaff8ca30711f025172 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 30 May 2024 12:25:25 +0100
Subject: [PATCH 148/666] Lexical: Added format previews to format buttons

---
 resources/js/wysiwyg/ui/framework/buttons.ts  | 58 +++++++++++++++++--
 .../js/wysiwyg/ui/framework/containers.ts     | 57 +++++++++++++++++-
 resources/js/wysiwyg/ui/toolbars.ts           | 27 ++++-----
 resources/sass/_editor.scss                   | 49 ++++++++++++++++
 resources/sass/styles.scss                    |  1 +
 .../pages/parts/wysiwyg-editor.blade.php      | 28 ++++-----
 6 files changed, 183 insertions(+), 37 deletions(-)
 create mode 100644 resources/sass/_editor.scss

diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 51c7d294d90..2a6f5a976fd 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -19,22 +19,70 @@ export class EditorButton extends EditorUiElement {
     protected buildDOM(): HTMLButtonElement {
         const button = el('button', {
             type: 'button',
-            class: 'editor-toolbar-button',
+            class: 'editor-button',
         }, [this.definition.label]) as HTMLButtonElement;
 
-        button.addEventListener('click', event => {
-            this.definition.action(this.getContext().editor);
-        });
+        button.addEventListener('click', this.onClick.bind(this));
 
         return button;
     }
 
+    protected onClick() {
+        this.definition.action(this.getContext().editor);
+    }
+
     updateActiveState(selection: BaseSelection|null) {
         const isActive = this.definition.isActive(selection);
-        this.dom?.classList.toggle('editor-toolbar-button-active', isActive);
+        this.dom?.classList.toggle('editor-button-active', isActive);
     }
 
     updateState(state: EditorUiStateUpdate): void {
         this.updateActiveState(state.selection);
     }
+}
+
+export class FormatPreviewButton extends EditorButton {
+    protected previewSampleElement: HTMLElement;
+
+    constructor(previewSampleElement: HTMLElement,definition: EditorButtonDefinition) {
+        super(definition);
+        this.previewSampleElement = previewSampleElement;
+    }
+
+    protected buildDOM(): HTMLButtonElement {
+        const button = super.buildDOM();
+        button.innerHTML = '';
+
+        const preview = el('span', {
+            class: 'editor-button-format-preview'
+        }, [this.definition.label]);
+
+        const stylesToApply = this.getStylesFromPreview();
+        console.log(stylesToApply);
+        for (const style of Object.keys(stylesToApply)) {
+            preview.style.setProperty(style, stylesToApply[style]);
+        }
+
+        button.append(preview);
+        return button;
+    }
+
+    protected getStylesFromPreview(): Record<string, string> {
+        const wrap = el('div', {style: 'display: none', hidden: 'true', class: 'page-content'});
+        const sampleClone = this.previewSampleElement.cloneNode() as HTMLElement;
+        sampleClone.textContent = this.definition.label;
+        wrap.append(sampleClone);
+        document.body.append(wrap);
+
+        const propertiesToFetch = ['color', 'font-size', 'background-color', 'border-inline-start'];
+        const propertiesToReturn: Record<string, string> = {};
+
+        const computed = window.getComputedStyle(sampleClone);
+        for (const property of propertiesToFetch) {
+            propertiesToReturn[property] = computed.getPropertyValue(property);
+        }
+        wrap.remove();
+
+        return propertiesToReturn;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/containers.ts b/resources/js/wysiwyg/ui/framework/containers.ts
index 9ef59c72f19..e58988e7b84 100644
--- a/resources/js/wysiwyg/ui/framework/containers.ts
+++ b/resources/js/wysiwyg/ui/framework/containers.ts
@@ -30,11 +30,62 @@ export class EditorContainerUiElement extends EditorUiElement {
     }
 }
 
-export class EditorFormatMenu extends EditorContainerUiElement {
-    buildDOM(): HTMLElement {
+export class EditorSimpleClassContainer extends EditorContainerUiElement {
+    protected className;
+
+    constructor(className: string, children: EditorUiElement[]) {
+        super(children);
+        this.className = className;
+    }
+
+    protected buildDOM(): HTMLElement {
         return el('div', {
-            class: 'editor-format-menu'
+            class: this.className,
         }, this.getChildren().map(child => child.getDOMElement()));
     }
+}
 
+export class EditorFormatMenu extends EditorContainerUiElement {
+    buildDOM(): HTMLElement {
+        const childElements: HTMLElement[] = this.getChildren().map(child => child.getDOMElement());
+        const menu = el('div', {
+            class: 'editor-format-menu-dropdown editor-dropdown-menu editor-menu-list',
+            hidden: 'true',
+        }, childElements);
+
+        const toggle = el('button', {
+            class: 'editor-format-menu-toggle',
+            type: 'button',
+        }, ['Formats']);
+
+        const wrapper = el('div', {
+            class: 'editor-format-menu editor-dropdown-menu-container',
+        }, [toggle, menu]);
+
+        let clickListener: Function|null = null;
+
+        const hide = () => {
+            menu.hidden = true;
+            if (clickListener) {
+                window.removeEventListener('click', clickListener as EventListener);
+            }
+        };
+
+        const show = () => {
+            menu.hidden = false
+            clickListener = (event: MouseEvent) => {
+                if (!wrapper.contains(event.target as HTMLElement)) {
+                    hide();
+                }
+            }
+            window.addEventListener('click', clickListener as EventListener);
+        };
+
+        toggle.addEventListener('click', event => {
+            menu.hasAttribute('hidden') ? show() : hide();
+        });
+        menu.addEventListener('mouseleave', hide);
+
+        return wrapper;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 0f46f5b2a55..2d5063cf444 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,4 +1,4 @@
-import {EditorButton} from "./framework/buttons";
+import {EditorButton, FormatPreviewButton} from "./framework/buttons";
 import {
     blockquote, bold, code,
     dangerCallout,
@@ -9,25 +9,26 @@ import {
     undo,
     warningCallout
 } from "./defaults/button-definitions";
-import {EditorContainerUiElement, EditorFormatMenu} from "./framework/containers";
+import {EditorContainerUiElement, EditorFormatMenu, EditorSimpleClassContainer} from "./framework/containers";
+import {el} from "../helpers";
 
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
-    return new EditorContainerUiElement([
+    return new EditorSimpleClassContainer('editor-toolbar-main', [
         new EditorButton(undo),
         new EditorButton(redo),
 
         new EditorFormatMenu([
-            new EditorButton(h2),
-            new EditorButton(h3),
-            new EditorButton(h4),
-            new EditorButton(h5),
-            new EditorButton(blockquote),
-            new EditorButton(paragraph),
-            new EditorButton(infoCallout),
-            new EditorButton(successCallout),
-            new EditorButton(warningCallout),
-            new EditorButton(dangerCallout),
+            new FormatPreviewButton(el('h2'), h2),
+            new FormatPreviewButton(el('h3'), h3),
+            new FormatPreviewButton(el('h4'), h4),
+            new FormatPreviewButton(el('h5'), h5),
+            new FormatPreviewButton(el('blockquote'), blockquote),
+            new FormatPreviewButton(el('p'), paragraph),
+            new FormatPreviewButton(el('p', {class: 'callout info'}), infoCallout),
+            new FormatPreviewButton(el('p', {class: 'callout success'}), successCallout),
+            new FormatPreviewButton(el('p', {class: 'callout warning'}), warningCallout),
+            new FormatPreviewButton(el('p', {class: 'callout danger'}), dangerCallout),
         ]),
 
         new EditorButton(bold),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
new file mode 100644
index 00000000000..48912be8b93
--- /dev/null
+++ b/resources/sass/_editor.scss
@@ -0,0 +1,49 @@
+// Main UI elements
+.editor-toolbar-main {
+  display: flex;
+}
+
+// Buttons
+.editor-button {
+  border: 1px solid #DDD;
+  font-size: 12px;
+  padding: 4px 6px;
+  color: #444;
+}
+.editor-button:hover {
+  background-color: #EEE;
+  cursor: pointer;
+  color: #000;
+}
+.editor-button-active, .editor-button-active:hover {
+  background-color: #ceebff;
+  color: #000;
+}
+.editor-button-format-preview {
+  padding: 4px 6px;
+  display: block;
+}
+
+// Containers
+.editor-dropdown-menu-container {
+    position: relative;
+}
+.editor-dropdown-menu {
+  position: absolute;
+  background-color: #FFF;
+  box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.15);
+  z-index: 99;
+  min-width: 120px;
+}
+.editor-menu-list {
+  display: flex;
+  flex-direction: column;
+}
+.editor-menu-list > .editor-button {
+  border-bottom: 0;
+  text-align: start;
+}
+
+.editor-format-menu .editor-dropdown-menu {
+  min-width: 320px;
+}
\ No newline at end of file
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index f52b6199262..636367e3aeb 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -15,6 +15,7 @@
 @import "forms";
 @import "animations";
 @import "tinymce";
+@import "editor";
 @import "codemirror";
 @import "components";
 @import "header";
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index b48e10570b2..940c005b5b7 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -6,23 +6,19 @@
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
      class="">
 
-    <style>
-        .editor-toolbar-button-active {
-            background-color: tomato;
-        }
-    </style>
+    <div class="editor-container">
+        <div refs="wysiwyg-editor@edit-area" contenteditable="true">
+            <p id="Content!">Some <strong>content</strong> here</p>
+            <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
+            <h2>List below this h2 header</h2>
+            <ul>
+                <li>Hello</li>
+            </ul>
 
-    <div refs="wysiwyg-editor@edit-area" contenteditable="true">
-        <p id="Content!">Some <strong>content</strong> here</p>
-        <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
-        <h2>List below this h2 header</h2>
-        <ul>
-            <li>Hello</li>
-        </ul>
-
-        <p class="callout danger">
-            Hello there, this is an info callout
-        </p>
+            <p class="callout danger">
+                Hello there, this is an info callout
+            </p>
+        </div>
     </div>
 
     <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>

From ae987454392a994b350841cbc35f61e0903eebaa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 30 May 2024 16:50:55 +0100
Subject: [PATCH 149/666] Lexical: Started on form UI

---
 .../wysiwyg/ui/defaults/button-definitions.ts | 34 ++++----
 .../wysiwyg/ui/defaults/form-definitions.ts   | 43 ++++++++++
 resources/js/wysiwyg/ui/framework/buttons.ts  | 27 ++++--
 .../js/wysiwyg/ui/framework/containers.ts     | 28 ++++++-
 .../framework/{base-elements.ts => core.ts}   | 11 ++-
 resources/js/wysiwyg/ui/framework/forms.ts    | 82 +++++++++++++++++++
 resources/js/wysiwyg/ui/framework/manager.ts  | 11 +++
 resources/js/wysiwyg/ui/index.ts              | 18 +++-
 8 files changed, 223 insertions(+), 31 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/defaults/form-definitions.ts
 rename resources/js/wysiwyg/ui/framework/{base-elements.ts => core.ts} (75%)
 create mode 100644 resources/js/wysiwyg/ui/framework/forms.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/manager.ts

diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 874f632fe14..da0a1e2c53a 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -3,7 +3,6 @@ import {
     $createParagraphNode,
     $isParagraphNode,
     BaseSelection, FORMAT_TEXT_COMMAND,
-    LexicalEditor,
     LexicalNode,
     REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
@@ -19,11 +18,12 @@ import {
     HeadingTagType
 } from "@lexical/rich-text";
 import {$isLinkNode, $toggleLink} from "@lexical/link";
+import {EditorUiContext} from "../framework/core";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
-    action(editor: LexicalEditor) {
-        editor.dispatchCommand(UNDO_COMMAND, undefined);
+    action(context: EditorUiContext) {
+        context.editor.dispatchCommand(UNDO_COMMAND, undefined);
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
@@ -32,8 +32,8 @@ export const undo: EditorButtonDefinition = {
 
 export const redo: EditorButtonDefinition = {
     label: 'Redo',
-    action(editor: LexicalEditor) {
-        editor.dispatchCommand(REDO_COMMAND, undefined);
+    action(context: EditorUiContext) {
+        context.editor.dispatchCommand(REDO_COMMAND, undefined);
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
@@ -43,9 +43,9 @@ export const redo: EditorButtonDefinition = {
 function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
     return {
         label: `${name} Callout`,
-        action(editor: LexicalEditor) {
+        action(context: EditorUiContext) {
             toggleSelectionBlockNodeType(
-                editor,
+                context.editor,
                 (node) => $isCalloutNodeOfCategory(node, category),
                 () => $createCalloutNode(category),
             )
@@ -68,9 +68,9 @@ const isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTag
 function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefinition {
     return {
         label: name,
-        action(editor: LexicalEditor) {
+        action(context: EditorUiContext) {
             toggleSelectionBlockNodeType(
-                editor,
+                context.editor,
                 (node) => isHeaderNodeOfTag(node, tag),
                 () => $createHeadingNode(tag),
             )
@@ -88,8 +88,8 @@ export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header')
 
 export const blockquote: EditorButtonDefinition = {
     label: 'Blockquote',
-    action(editor: LexicalEditor) {
-        toggleSelectionBlockNodeType(editor, $isQuoteNode, $createQuoteNode);
+    action(context: EditorUiContext) {
+        toggleSelectionBlockNodeType(context.editor, $isQuoteNode, $createQuoteNode);
     },
     isActive(selection: BaseSelection|null): boolean {
         return selectionContainsNodeType(selection, $isQuoteNode);
@@ -98,8 +98,8 @@ export const blockquote: EditorButtonDefinition = {
 
 export const paragraph: EditorButtonDefinition = {
     label: 'Paragraph',
-    action(editor: LexicalEditor) {
-        toggleSelectionBlockNodeType(editor, $isParagraphNode, $createParagraphNode);
+    action(context: EditorUiContext) {
+        toggleSelectionBlockNodeType(context.editor, $isParagraphNode, $createParagraphNode);
     },
     isActive(selection: BaseSelection|null): boolean {
         return selectionContainsNodeType(selection, $isParagraphNode);
@@ -109,8 +109,8 @@ export const paragraph: EditorButtonDefinition = {
 function buildFormatButton(label: string, format: TextFormatType): EditorButtonDefinition {
     return {
         label: label,
-        action(editor: LexicalEditor) {
-            editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
+        action(context: EditorUiContext) {
+            context.editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
         },
         isActive(selection: BaseSelection|null): boolean {
             return selectionContainsTextFormat(selection, format);
@@ -132,8 +132,8 @@ export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'co
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
-    action(editor: LexicalEditor) {
-        editor.update(() => {
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
             $toggleLink('http://example.com');
         })
     },
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
new file mode 100644
index 00000000000..c8477d9f2a4
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -0,0 +1,43 @@
+import {EditorFormDefinition, EditorFormFieldDefinition, EditorSelectFormFieldDefinition} from "../framework/forms";
+import {EditorUiContext} from "../framework/core";
+
+
+export const link: EditorFormDefinition = {
+    submitText: 'Apply',
+    cancelText: 'Cancel',
+    action(formData, context: EditorUiContext) {
+        // Todo
+        console.log('link-form-action', formData);
+        return true;
+    },
+    cancel() {
+        // Todo
+        console.log('link-form-cancel');
+    },
+    fields: [
+        {
+            label: 'URL',
+            name: 'url',
+            type: 'text',
+        },
+        {
+            label: 'Text to display',
+            name: 'text',
+            type: 'text',
+        },
+        {
+            label: 'Title',
+            name: 'title',
+            type: 'text',
+        },
+        {
+            label: 'Open link in...',
+            name: 'target',
+            type: 'select',
+            valuesByLabel: {
+                'Current window': '',
+                'New window': '_blank',
+            }
+        } as EditorSelectFormFieldDefinition,
+    ],
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 2a6f5a976fd..48046e9de9a 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -1,15 +1,16 @@
-import {BaseSelection, LexicalEditor} from "lexical";
-import {EditorUiElement, EditorUiStateUpdate} from "./base-elements";
+import {BaseSelection} from "lexical";
+import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {el} from "../../helpers";
 
 export interface EditorButtonDefinition {
     label: string;
-    action: (editor: LexicalEditor) => void;
+    action: (context: EditorUiContext) => void;
     isActive: (selection: BaseSelection|null) => boolean;
 }
 
 export class EditorButton extends EditorUiElement {
     protected definition: EditorButtonDefinition;
+    protected active: boolean = false;
 
     constructor(definition: EditorButtonDefinition) {
         super();
@@ -20,7 +21,7 @@ export class EditorButton extends EditorUiElement {
         const button = el('button', {
             type: 'button',
             class: 'editor-button',
-        }, [this.definition.label]) as HTMLButtonElement;
+        }, [this.getLabel()]) as HTMLButtonElement;
 
         button.addEventListener('click', this.onClick.bind(this));
 
@@ -28,17 +29,25 @@ export class EditorButton extends EditorUiElement {
     }
 
     protected onClick() {
-        this.definition.action(this.getContext().editor);
+        this.definition.action(this.getContext());
     }
 
     updateActiveState(selection: BaseSelection|null) {
-        const isActive = this.definition.isActive(selection);
-        this.dom?.classList.toggle('editor-button-active', isActive);
+        this.active = this.definition.isActive(selection);
+        this.dom?.classList.toggle('editor-button-active', this.active);
     }
 
     updateState(state: EditorUiStateUpdate): void {
         this.updateActiveState(state.selection);
     }
+
+    isActive(): boolean {
+        return this.active;
+    }
+
+    getLabel(): string {
+        return this.trans(this.definition.label);
+    }
 }
 
 export class FormatPreviewButton extends EditorButton {
@@ -55,7 +64,7 @@ export class FormatPreviewButton extends EditorButton {
 
         const preview = el('span', {
             class: 'editor-button-format-preview'
-        }, [this.definition.label]);
+        }, [this.getLabel()]);
 
         const stylesToApply = this.getStylesFromPreview();
         console.log(stylesToApply);
@@ -70,7 +79,7 @@ export class FormatPreviewButton extends EditorButton {
     protected getStylesFromPreview(): Record<string, string> {
         const wrap = el('div', {style: 'display: none', hidden: 'true', class: 'page-content'});
         const sampleClone = this.previewSampleElement.cloneNode() as HTMLElement;
-        sampleClone.textContent = this.definition.label;
+        sampleClone.textContent = this.getLabel();
         wrap.append(sampleClone);
         document.body.append(wrap);
 
diff --git a/resources/js/wysiwyg/ui/framework/containers.ts b/resources/js/wysiwyg/ui/framework/containers.ts
index e58988e7b84..ed191a88205 100644
--- a/resources/js/wysiwyg/ui/framework/containers.ts
+++ b/resources/js/wysiwyg/ui/framework/containers.ts
@@ -1,5 +1,6 @@
-import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./base-elements";
+import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {el} from "../../helpers";
+import {EditorButton} from "./buttons";
 
 export class EditorContainerUiElement extends EditorUiElement {
     protected children : EditorUiElement[];
@@ -24,6 +25,7 @@ export class EditorContainerUiElement extends EditorUiElement {
     }
 
     setContext(context: EditorUiContext) {
+        super.setContext(context);
         for (const child of this.getChildren()) {
             child.setContext(context);
         }
@@ -54,9 +56,9 @@ export class EditorFormatMenu extends EditorContainerUiElement {
         }, childElements);
 
         const toggle = el('button', {
-            class: 'editor-format-menu-toggle',
+            class: 'editor-format-menu-toggle editor-button',
             type: 'button',
-        }, ['Formats']);
+        }, [this.trans('Formats')]);
 
         const wrapper = el('div', {
             class: 'editor-format-menu editor-dropdown-menu-container',
@@ -88,4 +90,24 @@ export class EditorFormatMenu extends EditorContainerUiElement {
 
         return wrapper;
     }
+
+    updateState(state: EditorUiStateUpdate) {
+        super.updateState(state);
+
+        for (const child of this.children) {
+            if (child instanceof EditorButton && child.isActive()) {
+                this.updateToggleLabel(child.getLabel());
+                return;
+            }
+        }
+
+        this.updateToggleLabel(this.trans('Formats'));
+    }
+
+    protected updateToggleLabel(text: string): void {
+        const button = this.getDOMElement().querySelector('button');
+        if (button) {
+            button.innerText = text;
+        }
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/base-elements.ts b/resources/js/wysiwyg/ui/framework/core.ts
similarity index 75%
rename from resources/js/wysiwyg/ui/framework/base-elements.ts
rename to resources/js/wysiwyg/ui/framework/core.ts
index 66501178238..68d845b4249 100644
--- a/resources/js/wysiwyg/ui/framework/base-elements.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -1,4 +1,5 @@
 import {BaseSelection, LexicalEditor} from "lexical";
+import {EditorUIManager} from "./manager";
 
 export type EditorUiStateUpdate = {
     editor: LexicalEditor,
@@ -7,6 +8,8 @@ export type EditorUiStateUpdate = {
 
 export type EditorUiContext = {
     editor: LexicalEditor,
+    translate: (text: string) => string,
+    manager: EditorUIManager,
 };
 
 export abstract class EditorUiElement {
@@ -35,5 +38,11 @@ export abstract class EditorUiElement {
         return this.dom;
     }
 
-    abstract updateState(state: EditorUiStateUpdate): void;
+    trans(text: string) {
+        return this.getContext().translate(text);
+    }
+
+    updateState(state: EditorUiStateUpdate): void {
+        return;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
new file mode 100644
index 00000000000..0fce73c125a
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -0,0 +1,82 @@
+import {EditorUiContext, EditorUiElement} from "./core";
+import {EditorContainerUiElement} from "./containers";
+import {el} from "../../helpers";
+
+export interface EditorFormFieldDefinition {
+    label: string;
+    name: string;
+    type: 'text' | 'select';
+}
+
+export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefinition {
+    type: 'select',
+    valuesByLabel: Record<string, string>
+}
+
+export interface EditorFormDefinition {
+    submitText: string;
+    cancelText: string;
+    action: (formData: FormData, context: EditorUiContext) => boolean;
+    cancel: () => void;
+    fields: EditorFormFieldDefinition[];
+}
+
+export class EditorFormField extends EditorUiElement {
+    protected definition: EditorFormFieldDefinition;
+
+    constructor(definition: EditorFormFieldDefinition) {
+        super();
+        this.definition = definition;
+    }
+
+    protected buildDOM(): HTMLElement {
+        const id = `editor-form-field-${this.definition.name}-${Date.now()}`;
+        let input: HTMLElement;
+
+        if (this.definition.type === 'select') {
+            const options = (this.definition as EditorSelectFormFieldDefinition).valuesByLabel
+            const labels = Object.keys(options);
+            const optionElems = labels.map(label => el('option', {value: options[label]}, [label]));
+            input = el('select', {id, name: this.definition.name, class: 'editor-form-field-input'}, optionElems);
+        } else {
+            input = el('input', {id, name: this.definition.name, class: 'editor-form-field-input'});
+        }
+
+        return el('div', {class: 'editor-form-field-wrapper'}, [
+            el('label', {class: 'editor-form-field-label', for: id}, [this.trans(this.definition.label)]),
+            input,
+        ]);
+    }
+}
+
+export class EditorForm extends EditorContainerUiElement {
+    protected definition: EditorFormDefinition;
+
+    constructor(definition: EditorFormDefinition) {
+        super(definition.fields.map(fieldDefinition => new EditorFormField(fieldDefinition)));
+        this.definition = definition;
+    }
+
+    protected buildDOM(): HTMLElement {
+        const cancelButton = el('button', {type: 'button', class: 'editor-form-action-secondary'}, [this.trans(this.definition.cancelText)]);
+        const form = el('form', {}, [
+            ...this.children.map(child => child.getDOMElement()),
+            el('div', {class: 'editor-form-actions'}, [
+                cancelButton,
+                el('button', {type: 'submit', class: 'editor-form-action-primary'}, [this.trans(this.definition.submitText)]),
+            ])
+        ]);
+
+        form.addEventListener('submit', (event) => {
+            event.preventDefault();
+            const formData = new FormData(form as HTMLFormElement);
+            this.definition.action(formData, this.getContext());
+        });
+
+        cancelButton.addEventListener('click', (event) => {
+            this.definition.cancel();
+        });
+
+        return form;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
new file mode 100644
index 00000000000..f1a34c92a94
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -0,0 +1,11 @@
+
+
+
+
+
+export class EditorUIManager {
+
+    // Todo - Register and show modal via this
+    //  (Part of UI context)
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 56ae9354ae2..5a0d7fd2d5e 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -5,12 +5,28 @@ import {
     SELECTION_CHANGE_COMMAND
 } from "lexical";
 import {getMainEditorFullToolbar} from "./toolbars";
+import {EditorUIManager} from "./framework/manager";
+import {EditorForm} from "./framework/forms";
+import {link} from "./defaults/form-definitions";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
+    const manager = new EditorUIManager();
+    const context = {
+        editor,
+        manager,
+        translate: (text: string): string => text,
+    };
+
+    // Create primary toolbar
     const toolbar = getMainEditorFullToolbar();
-    toolbar.setContext({editor});
+    toolbar.setContext(context);
     element.before(toolbar.getDOMElement());
 
+    // Form test
+    const linkForm = new EditorForm(link);
+    linkForm.setContext(context);
+    element.before(linkForm.getDOMElement());
+
     // Update button states on editor selection change
     editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
         const selection = $getSelection();

From 7c504a10a8026135bd5237911a91446b3c727f57 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 1 Jun 2024 16:49:47 +0100
Subject: [PATCH 150/666] Lexical: Created core modal functionality

---
 resources/js/wysiwyg/helpers.ts               | 14 +++--
 .../wysiwyg/ui/defaults/button-definitions.ts | 40 +++++++++---
 .../wysiwyg/ui/defaults/form-definitions.ts   | 23 ++++---
 resources/js/wysiwyg/ui/framework/forms.ts    | 41 ++++++++++--
 resources/js/wysiwyg/ui/framework/manager.ts  | 33 +++++++++-
 resources/js/wysiwyg/ui/framework/modals.ts   | 63 +++++++++++++++++++
 resources/js/wysiwyg/ui/index.ts              | 13 ++--
 resources/sass/_editor.scss                   | 26 ++++++++
 8 files changed, 220 insertions(+), 33 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/modals.ts

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 7218f1ae643..40379cc27de 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -3,7 +3,7 @@ import {
     $getSelection,
     $isTextNode,
     BaseSelection,
-    LexicalEditor, TextFormatType
+    LexicalEditor, LexicalNode, TextFormatType
 } from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
@@ -28,23 +28,27 @@ export function el(tag: string, attrs: Record<string, string> = {}, children: (s
 }
 
 export function selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
+    return getNodeFromSelection(selection, matcher) !== null;
+}
+
+export function getNodeFromSelection(selection: BaseSelection|null, matcher: LexicalNodeMatcher): LexicalNode|null {
     if (!selection) {
-        return false;
+        return null;
     }
 
     for (const node of selection.getNodes()) {
         if (matcher(node)) {
-            return true;
+            return node;
         }
 
         for (const parent of node.getParents()) {
             if (matcher(parent)) {
-                return true;
+                return parent;
             }
         }
     }
 
-    return false;
+    return null;
 }
 
 export function selectionContainsTextFormat(selection: BaseSelection|null, format: TextFormatType): boolean {
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index da0a1e2c53a..f5be8251930 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,13 +1,19 @@
 import {EditorButtonDefinition} from "../framework/buttons";
 import {
-    $createParagraphNode,
-    $isParagraphNode,
+    $createNodeSelection,
+    $createParagraphNode, $getSelection,
+    $isParagraphNode, $setSelection,
     BaseSelection, FORMAT_TEXT_COMMAND,
     LexicalNode,
     REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
 } from "lexical";
-import {selectionContainsNodeType, selectionContainsTextFormat, toggleSelectionBlockNodeType} from "../../helpers";
+import {
+    getNodeFromSelection,
+    selectionContainsNodeType,
+    selectionContainsTextFormat,
+    toggleSelectionBlockNodeType
+} from "../../helpers";
 import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../nodes/callout";
 import {
     $createHeadingNode,
@@ -17,7 +23,7 @@ import {
     HeadingNode,
     HeadingTagType
 } from "@lexical/rich-text";
-import {$isLinkNode, $toggleLink} from "@lexical/link";
+import {$isLinkNode, $toggleLink, LinkNode} from "@lexical/link";
 import {EditorUiContext} from "../framework/core";
 
 export const undo: EditorButtonDefinition = {
@@ -133,9 +139,29 @@ export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'co
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
     action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $toggleLink('http://example.com');
-        })
+        const linkModal = context.manager.createModal('link');
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const selectedLink = getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+
+            let formDefaults = {};
+            if (selectedLink) {
+                formDefaults = {
+                    url: selectedLink.getURL(),
+                    text: selectedLink.getTextContent(),
+                    title: selectedLink.getTitle(),
+                    target: selectedLink.getTarget(),
+                }
+
+                context.editor.update(() => {
+                    const selection = $createNodeSelection();
+                    selection.add(selectedLink.getKey());
+                    $setSelection(selection);
+                });
+            }
+
+            linkModal.show(formDefaults);
+        });
     },
     isActive(selection: BaseSelection|null): boolean {
         return selectionContainsNodeType(selection, $isLinkNode);
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index c8477d9f2a4..457efa421e7 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -1,19 +1,26 @@
-import {EditorFormDefinition, EditorFormFieldDefinition, EditorSelectFormFieldDefinition} from "../framework/forms";
+import {EditorFormDefinition, EditorSelectFormFieldDefinition} from "../framework/forms";
 import {EditorUiContext} from "../framework/core";
+import {$createLinkNode} from "@lexical/link";
+import {$createTextNode, $getSelection} from "lexical";
 
 
 export const link: EditorFormDefinition = {
     submitText: 'Apply',
-    cancelText: 'Cancel',
     action(formData, context: EditorUiContext) {
-        // Todo
-        console.log('link-form-action', formData);
+        context.editor.update(() => {
+
+            const selection = $getSelection();
+
+            const linkNode = $createLinkNode(formData.get('url')?.toString() || '', {
+                title: formData.get('title')?.toString() || '',
+                target: formData.get('target')?.toString() || '',
+            });
+            linkNode.append($createTextNode(formData.get('text')?.toString() || ''));
+
+            selection?.insertNodes([linkNode]);
+        });
         return true;
     },
-    cancel() {
-        // Todo
-        console.log('link-form-cancel');
-    },
     fields: [
         {
             label: 'URL',
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 0fce73c125a..c6338f79849 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -15,9 +15,7 @@ export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefiniti
 
 export interface EditorFormDefinition {
     submitText: string;
-    cancelText: string;
     action: (formData: FormData, context: EditorUiContext) => boolean;
-    cancel: () => void;
     fields: EditorFormFieldDefinition[];
 }
 
@@ -29,6 +27,15 @@ export class EditorFormField extends EditorUiElement {
         this.definition = definition;
     }
 
+    setValue(value: string) {
+        const input = this.getDOMElement().querySelector('input,select') as HTMLInputElement;
+        input.value = value;
+    }
+
+    getName(): string {
+        return this.definition.name;
+    }
+
     protected buildDOM(): HTMLElement {
         const id = `editor-form-field-${this.definition.name}-${Date.now()}`;
         let input: HTMLElement;
@@ -51,14 +58,38 @@ export class EditorFormField extends EditorUiElement {
 
 export class EditorForm extends EditorContainerUiElement {
     protected definition: EditorFormDefinition;
+    protected onCancel: null|(() => void) = null;
 
     constructor(definition: EditorFormDefinition) {
         super(definition.fields.map(fieldDefinition => new EditorFormField(fieldDefinition)));
         this.definition = definition;
     }
 
+    setValues(values: Record<string, string>) {
+        for (const name of Object.keys(values)) {
+            const field = this.getFieldByName(name);
+            if (field) {
+                field.setValue(values[name]);
+            }
+        }
+    }
+
+    setOnCancel(callback: () => void) {
+        this.onCancel = callback;
+    }
+
+    protected getFieldByName(name: string): EditorFormField|null {
+        for (const child of this.children as EditorFormField[]) {
+            if (child.getName() === name) {
+                return child;
+            }
+        }
+
+        return null;
+    }
+
     protected buildDOM(): HTMLElement {
-        const cancelButton = el('button', {type: 'button', class: 'editor-form-action-secondary'}, [this.trans(this.definition.cancelText)]);
+        const cancelButton = el('button', {type: 'button', class: 'editor-form-action-secondary'}, [this.trans('Cancel')]);
         const form = el('form', {}, [
             ...this.children.map(child => child.getDOMElement()),
             el('div', {class: 'editor-form-actions'}, [
@@ -74,7 +105,9 @@ export class EditorForm extends EditorContainerUiElement {
         });
 
         cancelButton.addEventListener('click', (event) => {
-            this.definition.cancel();
+            if (this.onCancel) {
+                this.onCancel();
+            }
         });
 
         return form;
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index f1a34c92a94..c3fe9ecd877 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,11 +1,38 @@
+import {EditorFormModal, EditorFormModalDefinition} from "./modals";
+import {EditorUiContext} from "./core";
 
 
+export class EditorUIManager {
 
+    protected modalDefinitionsByKey: Record<string, EditorFormModalDefinition> = {};
+    protected context: EditorUiContext|null = null;
 
+    setContext(context: EditorUiContext) {
+        this.context = context;
+    }
 
-export class EditorUIManager {
+    getContext(): EditorUiContext {
+        if (this.context === null) {
+            throw new Error(`Context attempted to be used without being set`);
+        }
+
+        return this.context;
+    }
+
+    registerModal(key: string, modalDefinition: EditorFormModalDefinition) {
+        this.modalDefinitionsByKey[key] = modalDefinition;
+    }
+
+    createModal(key: string): EditorFormModal {
+        const modalDefinition = this.modalDefinitionsByKey[key];
+        if (!modalDefinition) {
+            console.error(`Attempted to show modal of key [${key}] but no modal registered for that key`);
+        }
+
+        const modal = new EditorFormModal(modalDefinition);
+        modal.setContext(this.getContext());
 
-    // Todo - Register and show modal via this
-    //  (Part of UI context)
+        return modal;
+    }
 
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
new file mode 100644
index 00000000000..e2a6b3f33eb
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -0,0 +1,63 @@
+import {EditorForm, EditorFormDefinition} from "./forms";
+import {el} from "../../helpers";
+import {EditorContainerUiElement} from "./containers";
+
+
+export interface EditorModalDefinition {
+    title: string;
+}
+
+export interface EditorFormModalDefinition extends EditorModalDefinition {
+    form: EditorFormDefinition;
+}
+
+export class EditorFormModal extends EditorContainerUiElement {
+    protected definition: EditorFormModalDefinition;
+
+    constructor(definition: EditorFormModalDefinition) {
+        super([new EditorForm(definition.form)]);
+        this.definition = definition;
+    }
+
+    show(defaultValues: Record<string, string>) {
+        const dom = this.getDOMElement();
+        document.body.append(dom);
+
+        const form = this.getForm();
+        form.setValues(defaultValues);
+        form.setOnCancel(this.hide.bind(this));
+    }
+
+    hide() {
+        this.getDOMElement().remove();
+    }
+
+    protected getForm(): EditorForm {
+        return this.children[0] as EditorForm;
+    }
+
+    protected buildDOM(): HTMLElement {
+        const closeButton = el('button', {class: 'editor-modal-close', type: 'button', title: this.trans('Close')}, ['x']);
+        closeButton.addEventListener('click', this.hide.bind(this));
+
+        const modal = el('div', {class: 'editor-modal editor-form-modal'}, [
+            el('div', {class: 'editor-modal-header'}, [
+                el('div', {class: 'editor-modal-title'}, [this.trans(this.definition.title)]),
+                closeButton,
+            ]),
+            el('div', {class: 'editor-modal-body'}, [
+                this.getForm().getDOMElement(),
+            ]),
+        ]);
+
+        const wrapper = el('div', {class: 'editor-modal-wrapper'}, [modal]);
+
+        wrapper.addEventListener('click', event => {
+            if (event.target && !modal.contains(event.target as HTMLElement)) {
+                this.hide();
+            }
+        });
+
+        return wrapper;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 5a0d7fd2d5e..7e1f8d98173 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,8 +6,7 @@ import {
 } from "lexical";
 import {getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {EditorForm} from "./framework/forms";
-import {link} from "./defaults/form-definitions";
+import {link as linkFormDefinition} from "./defaults/form-definitions";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
@@ -16,16 +15,18 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
         manager,
         translate: (text: string): string => text,
     };
+    manager.setContext(context);
 
     // Create primary toolbar
     const toolbar = getMainEditorFullToolbar();
     toolbar.setContext(context);
     element.before(toolbar.getDOMElement());
 
-    // Form test
-    const linkForm = new EditorForm(link);
-    linkForm.setContext(context);
-    element.before(linkForm.getDOMElement());
+    // Register modals
+    manager.registerModal('link', {
+        title: 'Insert/Edit link',
+        form: linkFormDefinition,
+    });
 
     // Update button states on editor selection change
     editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 48912be8b93..2633e853965 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -46,4 +46,30 @@
 
 .editor-format-menu .editor-dropdown-menu {
   min-width: 320px;
+}
+
+// Modals
+.editor-modal-wrapper {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+  background-color: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+}
+.editor-modal {
+  background-color: #FFF;
+  border: 1px solid #DDD;
+  padding: 1rem;
+  border-radius: 4px;
+}
+.editor-modal-header {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 1rem;
+}
+.editor-modal-title {
+  font-weight: 700;
 }
\ No newline at end of file

From a74e04141c7eee5daeb6a1a2e58de7c704b5020c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 3 Jun 2024 16:56:31 +0100
Subject: [PATCH 151/666] Lexical: Started build of image node and decoration
 UI

---
 resources/js/wysiwyg/nodes/image.ts           | 174 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |   2 +
 resources/js/wysiwyg/ui/framework/buttons.ts  |   1 -
 resources/js/wysiwyg/ui/index.ts              |  17 ++
 .../pages/parts/wysiwyg-editor.blade.php      |   3 +-
 5 files changed, 195 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/image.ts

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
new file mode 100644
index 00000000000..1e2cbd83c11
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -0,0 +1,174 @@
+import {
+    DecoratorNode,
+    DOMConversion,
+    DOMConversionMap,
+    DOMConversionOutput,
+    LexicalEditor, LexicalNode,
+    SerializedLexicalNode,
+    Spread
+} from "lexical";
+import type {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+
+export interface ImageNodeOptions {
+    alt?: string;
+    width?: number;
+    height?: number;
+}
+
+export type SerializedImageNode = Spread<{
+    src: string;
+    alt: string;
+    width: number;
+    height: number;
+}, SerializedLexicalNode>
+
+export class ImageNode extends DecoratorNode<HTMLElement> {
+    __src: string = '';
+    __alt: string = '';
+    __width: number = 0;
+    __height: number = 0;
+    // TODO - Alignment
+
+    static getType(): string {
+        return 'image';
+    }
+
+    static clone(node: ImageNode): ImageNode {
+        return new ImageNode(node.__src, {
+            alt: node.__alt,
+            width: node.__width,
+            height: node.__height,
+        });
+    }
+
+    constructor(src: string, options: ImageNodeOptions, key?: string) {
+        super(key);
+        this.__src = src;
+        if (options.alt) {
+            this.__alt = options.alt;
+        }
+        if (options.width) {
+            this.__width = options.width;
+        }
+        if (options.height) {
+            this.__height = options.height;
+        }
+    }
+
+    setAltText(altText: string): void {
+        const self = this.getWritable();
+        self.__alt = altText;
+    }
+
+    getAltText(): string {
+        const self = this.getLatest();
+        return self.__alt;
+    }
+
+    setHeight(height: number): void {
+        const self = this.getWritable();
+        self.__height = height;
+    }
+
+    getHeight(): number {
+        const self = this.getLatest();
+        return self.__height;
+    }
+
+    setWidth(width: number): void {
+        const self = this.getWritable();
+        self.__width = width;
+    }
+
+    getWidth(): number {
+        const self = this.getLatest();
+        return self.__width;
+    }
+
+    isInline(): boolean {
+        return true;
+    }
+
+    decorate(editor: LexicalEditor, config: EditorConfig): HTMLElement {
+        console.log('decorate!');
+        return el('div', {
+            class: 'editor-image-decorator',
+        }, ['decoration!!!']);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        const element = document.createElement('img');
+        element.setAttribute('src', this.__src);
+        element.textContent
+
+        if (this.__width) {
+            element.setAttribute('width', String(this.__width));
+        }
+        if (this.__height) {
+            element.setAttribute('height', String(this.__height));
+        }
+        if (this.__alt) {
+            element.setAttribute('alt', this.__alt);
+        }
+        return el('span', {class: 'editor-image-wrap'}, [
+            element,
+        ]);
+    }
+
+    updateDOM(prevNode: unknown, dom: HTMLElement) {
+        // Returning false tells Lexical that this node does not need its
+        // DOM element replacing with a new copy from createDOM.
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            img(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+
+                        const src = element.getAttribute('src') || '';
+                        const options: ImageNodeOptions = {
+                            alt: element.getAttribute('alt') || '',
+                            height: Number.parseInt(element.getAttribute('height') || '0'),
+                            width: Number.parseInt(element.getAttribute('width') || '0'),
+                        }
+
+                        return {
+                            node: new ImageNode(src, options),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedImageNode {
+        return {
+            type: 'image',
+            version: 1,
+            src: this.__src,
+            alt: this.__alt,
+            height: this.__height,
+            width: this.__width
+        };
+    }
+
+    static importJSON(serializedNode: SerializedImageNode): ImageNode {
+        return $createImageNode(serializedNode.src, {
+            alt: serializedNode.alt,
+            width: serializedNode.width,
+            height: serializedNode.height,
+        });
+    }
+}
+
+export function $createImageNode(src: string, options: ImageNodeOptions = {}): ImageNode {
+    return new ImageNode(src, options);
+}
+
+export function $isImageNode(node: LexicalNode | null | undefined) {
+    return node instanceof ImageNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 9f772df1e5c..1d492a87a25 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -3,6 +3,7 @@ import {CalloutNode} from './callout';
 import {ElementNode, KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
 import {CustomParagraphNode} from "./custom-paragraph";
 import {LinkNode} from "@lexical/link";
+import {ImageNode} from "./image";
 
 /**
  * Load the nodes for lexical.
@@ -12,6 +13,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CalloutNode, // Todo - Create custom
         HeadingNode, // Todo - Create custom
         QuoteNode, // Todo - Create custom
+        ImageNode,
         CustomParagraphNode,
         {
             replace: ParagraphNode,
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 48046e9de9a..367a3933063 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -67,7 +67,6 @@ export class FormatPreviewButton extends EditorButton {
         }, [this.getLabel()]);
 
         const stylesToApply = this.getStylesFromPreview();
-        console.log(stylesToApply);
         for (const style of Object.keys(stylesToApply)) {
             preview.style.setProperty(style, stylesToApply[style]);
         }
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 7e1f8d98173..9206f8b4056 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -7,6 +7,9 @@ import {
 import {getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {link as linkFormDefinition} from "./defaults/form-definitions";
+import {DecoratorListener} from "lexical/LexicalEditor";
+import type {NodeKey} from "lexical/LexicalNode";
+import {el} from "../helpers";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
@@ -28,6 +31,20 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
         form: linkFormDefinition,
     });
 
+    // Register decorator listener
+    // Maybe move to manager?
+    const domDecorateListener: DecoratorListener<HTMLElement> = (decorator: Record<NodeKey, HTMLElement>) => {
+        const keys = Object.keys(decorator);
+        for (const key of keys) {
+            const decoratedEl = editor.getElementByKey(key);
+            const decoratorEl = decorator[key];
+            if (decoratedEl) {
+                decoratedEl.append(decoratorEl);
+            }
+        }
+    }
+    editor.registerDecoratorListener(domDecorateListener);
+
     // Update button states on editor selection change
     editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
         const selection = $getSelection();
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 940c005b5b7..c0ceddc45d0 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -9,13 +9,14 @@ class="">
     <div class="editor-container">
         <div refs="wysiwyg-editor@edit-area" contenteditable="true">
             <p id="Content!">Some <strong>content</strong> here</p>
+            <p>Content with image in, before text. <img src="https://bookstack.local/bookstack/uploads/images/gallery/2022-03/scaled-1680-/cats-image-2400x1000-2.jpg" width="200" alt="Sleepy meow"> After text.</p>
             <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
             <h2>List below this h2 header</h2>
             <ul>
                 <li>Hello</li>
             </ul>
 
-            <p class="callout danger">
+            <p class="callout info">
                 Hello there, this is an info callout
             </p>
         </div>

From bd6e3c022ffee6e041b9fb4832fe32e5ba7a94e5 Mon Sep 17 00:00:00 2001
From: Michael Ortner <135371107+michaelortnerit@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:07:09 +0200
Subject: [PATCH 152/666] Update docker-compose.yml

Remove the version: because it is obsolete. See: https://docs.docker.com/compose/compose-file/04-version-and-name/#version-top-level-element-optional
---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 13648c12176..2e2fdf700de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,6 @@
 # This is a Docker Compose configuration
 # intended for development purposes only
 
-version: '3'
-
 volumes:
   db: {}
 

From ba871ec46a7e363f3fad2032f18ec0612875e1ad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Jun 2024 13:04:49 +0100
Subject: [PATCH 153/666] Lexical: Started image resize controls, Defined
 thorough decorator model

---
 resources/js/wysiwyg/nodes/image.ts           | 50 ++++++++--
 resources/js/wysiwyg/ui/decorators/image.ts   | 91 +++++++++++++++++++
 .../js/wysiwyg/ui/framework/decorator.ts      | 32 +++++++
 resources/js/wysiwyg/ui/framework/manager.ts  | 24 ++++-
 resources/js/wysiwyg/ui/index.ts              | 13 ++-
 resources/sass/_editor.scss                   | 50 +++++++++-
 6 files changed, 244 insertions(+), 16 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/decorators/image.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/decorator.ts

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index 1e2cbd83c11..289e36c4b32 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -9,6 +9,7 @@ import {
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {el} from "../helpers";
+import {EditorDecoratorAdapter} from "../ui/framework/decorator";
 
 export interface ImageNodeOptions {
     alt?: string;
@@ -23,7 +24,7 @@ export type SerializedImageNode = Spread<{
     height: number;
 }, SerializedLexicalNode>
 
-export class ImageNode extends DecoratorNode<HTMLElement> {
+export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
     __src: string = '';
     __alt: string = '';
     __width: number = 0;
@@ -79,6 +80,7 @@ export class ImageNode extends DecoratorNode<HTMLElement> {
     setWidth(width: number): void {
         const self = this.getWritable();
         self.__width = width;
+        console.log('widrg', width)
     }
 
     getWidth(): number {
@@ -90,17 +92,16 @@ export class ImageNode extends DecoratorNode<HTMLElement> {
         return true;
     }
 
-    decorate(editor: LexicalEditor, config: EditorConfig): HTMLElement {
-        console.log('decorate!');
-        return el('div', {
-            class: 'editor-image-decorator',
-        }, ['decoration!!!']);
+    decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
+        return {
+            type: 'image',
+            getNode: () => this,
+        };
     }
 
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('img');
         element.setAttribute('src', this.__src);
-        element.textContent
 
         if (this.__width) {
             element.setAttribute('width', String(this.__width));
@@ -116,9 +117,38 @@ export class ImageNode extends DecoratorNode<HTMLElement> {
         ]);
     }
 
-    updateDOM(prevNode: unknown, dom: HTMLElement) {
-        // Returning false tells Lexical that this node does not need its
-        // DOM element replacing with a new copy from createDOM.
+    updateDOM(prevNode: ImageNode, dom: HTMLElement) {
+        const image = dom.querySelector('img');
+        if (!image) return false;
+
+        if (prevNode.__src !== this.__src) {
+            image.setAttribute('src', this.__src);
+        }
+
+        if (prevNode.__width !== this.__width) {
+            if (this.__width) {
+                image.setAttribute('width', String(this.__width));
+            } else {
+                image.removeAttribute('width');
+            }
+        }
+
+        if (prevNode.__height !== this.__height) {
+            if (this.__height) {
+                image.setAttribute('height', String(this.__height));
+            } else {
+                image.removeAttribute('height');
+            }
+        }
+
+        if (prevNode.__alt !== this.__alt) {
+            if (this.__alt) {
+                image.setAttribute('alt', String(this.__alt));
+            } else {
+                image.removeAttribute('alt');
+            }
+        }
+
         return false;
     }
 
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
new file mode 100644
index 00000000000..fd333fa5470
--- /dev/null
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -0,0 +1,91 @@
+import {EditorDecorator} from "../framework/decorator";
+import {el} from "../../helpers";
+import {$createNodeSelection, $setSelection} from "lexical";
+import {EditorUiContext} from "../framework/core";
+import {ImageNode} from "../../nodes/image";
+
+
+export class ImageDecorator extends EditorDecorator {
+    protected dom: HTMLElement|null = null;
+
+    buildDOM(context: EditorUiContext) {
+        const handleClasses = ['nw', 'ne', 'se', 'sw'];
+        const handleEls = handleClasses.map(c => {
+            return el('div', {class: `editor-image-decorator-handle ${c}`});
+        });
+
+        const decorateEl = el('div', {
+            class: 'editor-image-decorator',
+        }, handleEls);
+
+        const windowClick = (event: MouseEvent) => {
+            if (!decorateEl.contains(event.target as Node)) {
+                unselect();
+            }
+        };
+
+        const select = () => {
+            decorateEl.classList.add('selected');
+            window.addEventListener('click', windowClick);
+        };
+
+        const unselect = () => {
+            decorateEl.classList.remove('selected');
+            window.removeEventListener('click', windowClick);
+        };
+
+        decorateEl.addEventListener('click', (event) => {
+            context.editor.update(() => {
+                const nodeSelection = $createNodeSelection();
+                nodeSelection.add(this.getNode().getKey());
+                $setSelection(nodeSelection);
+            });
+
+            select();
+        });
+
+        decorateEl.addEventListener('mousedown', (event: MouseEvent) => {
+            const handle = (event.target as Element).closest('.editor-image-decorator-handle');
+            if (handle) {
+                this.startHandlingResize(handle, event, context);
+            }
+        });
+
+        return decorateEl;
+    }
+
+    render(context: EditorUiContext): HTMLElement {
+        if (this.dom) {
+            return this.dom;
+        }
+
+        this.dom = this.buildDOM(context);
+        return this.dom;
+    }
+
+    startHandlingResize(element: Node, event: MouseEvent, context: EditorUiContext) {
+        const startingX = event.screenX;
+        const startingY = event.screenY;
+
+        const mouseMoveListener = (event: MouseEvent) => {
+            const xChange = event.screenX - startingX;
+            const yChange = event.screenY - startingY;
+            console.log({ xChange, yChange });
+
+            context.editor.update(() => {
+                const node = this.getNode() as ImageNode;
+                node.setWidth(node.getWidth() + xChange);
+                node.setHeight(node.getHeight() + yChange);
+            });
+        };
+
+        const mouseUpListener = (event: MouseEvent) => {
+            window.removeEventListener('mousemove', mouseMoveListener);
+            window.removeEventListener('mouseup', mouseUpListener);
+        }
+
+        window.addEventListener('mousemove', mouseMoveListener);
+        window.addEventListener('mouseup', mouseUpListener);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
new file mode 100644
index 00000000000..89077412691
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -0,0 +1,32 @@
+import {EditorUiContext} from "./core";
+import {LexicalNode} from "lexical";
+
+export interface EditorDecoratorAdapter {
+    type: string;
+    getNode(): LexicalNode;
+}
+
+export abstract class EditorDecorator {
+
+    protected node: LexicalNode | null = null;
+    protected context: EditorUiContext;
+
+    constructor(context: EditorUiContext) {
+        this.context = context;
+    }
+
+    protected getNode(): LexicalNode {
+        if (!this.node) {
+            throw new Error('Attempted to get use node without it being set');
+        }
+
+        return this.node;
+    }
+
+    setNode(node: LexicalNode) {
+        this.node = node;
+    }
+
+    abstract render(context: EditorUiContext): HTMLElement;
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index c3fe9ecd877..1684b662813 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,10 +1,13 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorUiContext} from "./core";
+import {EditorDecorator} from "./decorator";
 
 
 export class EditorUIManager {
 
     protected modalDefinitionsByKey: Record<string, EditorFormModalDefinition> = {};
+    protected decoratorConstructorsByType: Record<string, typeof EditorDecorator> = {};
+    protected decoratorInstancesByNodeKey: Record<string, EditorDecorator> = {};
     protected context: EditorUiContext|null = null;
 
     setContext(context: EditorUiContext) {
@@ -26,7 +29,7 @@ export class EditorUIManager {
     createModal(key: string): EditorFormModal {
         const modalDefinition = this.modalDefinitionsByKey[key];
         if (!modalDefinition) {
-            console.error(`Attempted to show modal of key [${key}] but no modal registered for that key`);
+            throw new Error(`Attempted to show modal of key [${key}] but no modal registered for that key`);
         }
 
         const modal = new EditorFormModal(modalDefinition);
@@ -35,4 +38,23 @@ export class EditorUIManager {
         return modal;
     }
 
+    registerDecoratorType(type: string, decorator: typeof EditorDecorator) {
+        this.decoratorConstructorsByType[type] = decorator;
+    }
+
+    getDecorator(decoratorType: string, nodeKey: string): EditorDecorator {
+        if (this.decoratorInstancesByNodeKey[nodeKey]) {
+            return this.decoratorInstancesByNodeKey[nodeKey];
+        }
+
+        const decoratorClass = this.decoratorConstructorsByType[decoratorType];
+        if (!decoratorClass) {
+            throw new Error(`Attempted to use decorator of type [${decoratorType}] but not decorator registered for that type`);
+        }
+
+        // @ts-ignore
+        const decorator = new decoratorClass(nodeKey);
+        this.decoratorInstancesByNodeKey[nodeKey] = decorator;
+        return decorator;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 9206f8b4056..19320b2629f 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -9,7 +9,8 @@ import {EditorUIManager} from "./framework/manager";
 import {link as linkFormDefinition} from "./defaults/form-definitions";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
-import {el} from "../helpers";
+import {EditorDecoratorAdapter} from "./framework/decorator";
+import {ImageDecorator} from "./decorators/image";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
@@ -33,11 +34,15 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
 
     // Register decorator listener
     // Maybe move to manager?
-    const domDecorateListener: DecoratorListener<HTMLElement> = (decorator: Record<NodeKey, HTMLElement>) => {
-        const keys = Object.keys(decorator);
+    manager.registerDecoratorType('image', ImageDecorator);
+    const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
+        const keys = Object.keys(decorators);
         for (const key of keys) {
             const decoratedEl = editor.getElementByKey(key);
-            const decoratorEl = decorator[key];
+            const adapter = decorators[key];
+            const decorator = manager.getDecorator(adapter.type, key);
+            decorator.setNode(adapter.getNode());
+            const decoratorEl = decorator.render(context);
             if (decoratedEl) {
                 decoratedEl.append(decoratorEl);
             }
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 2633e853965..94fe2c75607 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -1,3 +1,8 @@
+// Common variables
+:root {
+  --editor-color-primary: #206ea7;
+}
+
 // Main UI elements
 .editor-toolbar-main {
   display: flex;
@@ -72,4 +77,47 @@
 }
 .editor-modal-title {
   font-weight: 700;
-}
\ No newline at end of file
+}
+
+// In-editor elements
+.editor-image-wrap {
+  position: relative;
+  display: inline-flex;
+}
+.editor-image-decorator {
+  display: inline-block;
+  position: absolute;
+  border: 1px solid var(--editor-color-primary);
+  left: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+}
+.editor-image-decorator-handle {
+  position: absolute;
+  display: block;
+  width: 10px;
+  height: 10px;
+  background-color: var(--editor-color-primary);
+  user-select: none;
+  &.nw {
+    inset-inline-start: -5px;
+    inset-block-start: -5px;
+    cursor: nw-resize;
+  }
+  &.ne {
+    inset-inline-end: -5px;
+    inset-block-start: -5px;
+    cursor: ne-resize;
+  }
+  &.se {
+    inset-inline-end: -5px;
+    inset-block-end: -5px;
+    cursor: se-resize;
+  }
+  &.sw {
+    inset-inline-start: -5px;
+    inset-block-end: -5px;
+    cursor: sw-resize;
+  }
+}

From e959c468f664b937925d39d0188dd94db546d2cb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Jun 2024 17:18:58 +0100
Subject: [PATCH 154/666] Lexical: Made image resize handles functional

---
 resources/js/wysiwyg/nodes/image.ts         |   1 -
 resources/js/wysiwyg/ui/decorators/image.ts | 101 ++++++++++++++------
 resources/sass/_editor.scss                 |   9 +-
 3 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index 289e36c4b32..9f017b5fed2 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -80,7 +80,6 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
     setWidth(width: number): void {
         const self = this.getWritable();
         self.__width = width;
-        console.log('widrg', width)
     }
 
     getWidth(): number {
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index fd333fa5470..b3ceee65fa4 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -7,48 +7,65 @@ import {ImageNode} from "../../nodes/image";
 
 export class ImageDecorator extends EditorDecorator {
     protected dom: HTMLElement|null = null;
+    protected dragLastMouseUp: number = 0;
 
     buildDOM(context: EditorUiContext) {
-        const handleClasses = ['nw', 'ne', 'se', 'sw'];
-        const handleEls = handleClasses.map(c => {
-            return el('div', {class: `editor-image-decorator-handle ${c}`});
-        });
-
+        let handleElems: HTMLElement[] = [];
         const decorateEl = el('div', {
             class: 'editor-image-decorator',
-        }, handleEls);
+        }, []);
+        let selected = false;
 
         const windowClick = (event: MouseEvent) => {
-            if (!decorateEl.contains(event.target as Node)) {
+            if (!decorateEl.contains(event.target as Node) && (Date.now() - this.dragLastMouseUp > 100)) {
                 unselect();
             }
         };
 
+        const mouseDown = (event: MouseEvent) => {
+            const handle = (event.target as HTMLElement).closest('.editor-image-decorator-handle') as HTMLElement|null;
+            if (handle) {
+                // handlingResize = true;
+                this.startHandlingResize(handle, event, context);
+            }
+        };
+
         const select = () => {
+            if (selected) {
+                return;
+            }
+
+            selected = true;
             decorateEl.classList.add('selected');
             window.addEventListener('click', windowClick);
-        };
 
-        const unselect = () => {
-            decorateEl.classList.remove('selected');
-            window.removeEventListener('click', windowClick);
-        };
+            const handleClasses = ['nw', 'ne', 'se', 'sw'];
+            handleElems = handleClasses.map(c => {
+                return el('div', {class: `editor-image-decorator-handle ${c}`});
+            });
+            decorateEl.append(...handleElems);
+            decorateEl.addEventListener('mousedown', mouseDown);
 
-        decorateEl.addEventListener('click', (event) => {
             context.editor.update(() => {
                 const nodeSelection = $createNodeSelection();
                 nodeSelection.add(this.getNode().getKey());
                 $setSelection(nodeSelection);
             });
+        };
 
-            select();
-        });
-
-        decorateEl.addEventListener('mousedown', (event: MouseEvent) => {
-            const handle = (event.target as Element).closest('.editor-image-decorator-handle');
-            if (handle) {
-                this.startHandlingResize(handle, event, context);
+        const unselect = () => {
+            selected = false;
+            // handlingResize = false;
+            decorateEl.classList.remove('selected');
+            window.removeEventListener('click', windowClick);
+            decorateEl.removeEventListener('mousedown', mouseDown);
+            for (const el of handleElems) {
+                el.remove();
             }
+        };
+
+        decorateEl.addEventListener('click', (event) => {
+            select();
         });
 
         return decorateEl;
@@ -63,26 +80,56 @@ export class ImageDecorator extends EditorDecorator {
         return this.dom;
     }
 
-    startHandlingResize(element: Node, event: MouseEvent, context: EditorUiContext) {
+    startHandlingResize(element: HTMLElement, event: MouseEvent, context: EditorUiContext) {
         const startingX = event.screenX;
         const startingY = event.screenY;
+        const node = this.getNode() as ImageNode;
+        let startingWidth = element.clientWidth;
+        let startingHeight = element.clientHeight;
+        let startingRatio = startingWidth / startingHeight;
+        let hasHeight = false;
+        context.editor.getEditorState().read(() => {
+            startingWidth = node.getWidth() || startingWidth;
+            startingHeight = node.getHeight() || startingHeight;
+            if (node.getHeight()) {
+                hasHeight = true;
+            }
+            startingRatio = startingWidth / startingHeight;
+        });
+
+        const flipXChange = element.classList.contains('nw') || element.classList.contains('sw');
+        const flipYChange = element.classList.contains('nw') || element.classList.contains('ne');
 
         const mouseMoveListener = (event: MouseEvent) => {
-            const xChange = event.screenX - startingX;
-            const yChange = event.screenY - startingY;
-            console.log({ xChange, yChange });
+            let xChange = event.screenX - startingX;
+            if (flipXChange) {
+                xChange = 0 - xChange;
+            }
+            let yChange = event.screenY - startingY;
+            if (flipYChange) {
+                yChange = 0 - yChange;
+            }
+            const balancedChange = Math.sqrt(Math.pow(xChange, 2) + Math.pow(yChange, 2));
+            const increase = xChange + yChange > 0;
+            const directedChange = increase ? balancedChange : 0-balancedChange;
+            const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
+            let newHeight = 0;
+            if (hasHeight) {
+                newHeight = newWidth * startingRatio;
+            }
 
             context.editor.update(() => {
                 const node = this.getNode() as ImageNode;
-                node.setWidth(node.getWidth() + xChange);
-                node.setHeight(node.getHeight() + yChange);
+                node.setWidth(newWidth);
+                node.setHeight(newHeight);
             });
         };
 
         const mouseUpListener = (event: MouseEvent) => {
             window.removeEventListener('mousemove', mouseMoveListener);
             window.removeEventListener('mouseup', mouseUpListener);
-        }
+            this.dragLastMouseUp = Date.now();
+        };
 
         window.addEventListener('mousemove', mouseMoveListener);
         window.addEventListener('mouseup', mouseUpListener);
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 94fe2c75607..87cc70c9bf3 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -85,20 +85,23 @@
   display: inline-flex;
 }
 .editor-image-decorator {
-  display: inline-block;
   position: absolute;
-  border: 1px solid var(--editor-color-primary);
   left: 0;
   right: 0;
   width: 100%;
   height: 100%;
+  display: inline-block;
+  &.selected {
+    border: 1px dashed var(--editor-color-primary);
+  }
 }
 .editor-image-decorator-handle {
   position: absolute;
   display: block;
   width: 10px;
   height: 10px;
-  background-color: var(--editor-color-primary);
+  border: 2px solid var(--editor-color-primary);
+  background-color: #FFF;
   user-select: none;
   &.nw {
     inset-inline-start: -5px;

From 0722960260d740e7e0c00b9f6da13992688a8752 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Jun 2024 18:43:42 +0100
Subject: [PATCH 155/666] Lexical: Added selection to state for aligned reading

Connected up to work with image form
---
 resources/js/wysiwyg/nodes/image.ts           | 10 +++++
 resources/js/wysiwyg/ui/decorators/image.ts   |  7 +++-
 .../wysiwyg/ui/defaults/button-definitions.ts | 33 ++++++++++++++++
 .../wysiwyg/ui/defaults/form-definitions.ts   | 39 +++++++++++++++++++
 resources/js/wysiwyg/ui/framework/core.ts     |  1 +
 resources/js/wysiwyg/ui/index.ts              | 11 +++++-
 resources/js/wysiwyg/ui/toolbars.ts           |  3 +-
 7 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index 9f017b5fed2..92d5518dbc7 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -57,6 +57,16 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
         }
     }
 
+    setSrc(src: string): void {
+        const self = this.getWritable();
+        self.__src = src;
+    }
+
+    getSrc(): string {
+        const self = this.getLatest();
+        return self.__src;
+    }
+
     setAltText(altText: string): void {
         const self = this.getWritable();
         self.__alt = altText;
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index b3ceee65fa4..1692d078d0c 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -88,6 +88,7 @@ export class ImageDecorator extends EditorDecorator {
         let startingHeight = element.clientHeight;
         let startingRatio = startingWidth / startingHeight;
         let hasHeight = false;
+        let firstChange = true;
         context.editor.getEditorState().read(() => {
             startingWidth = node.getWidth() || startingWidth;
             startingHeight = node.getHeight() || startingHeight;
@@ -109,7 +110,7 @@ export class ImageDecorator extends EditorDecorator {
             if (flipYChange) {
                 yChange = 0 - yChange;
             }
-            const balancedChange = Math.sqrt(Math.pow(xChange, 2) + Math.pow(yChange, 2));
+            const balancedChange = Math.sqrt(Math.pow(Math.abs(xChange), 2) + Math.pow(Math.abs(yChange), 2));
             const increase = xChange + yChange > 0;
             const directedChange = increase ? balancedChange : 0-balancedChange;
             const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
@@ -118,11 +119,13 @@ export class ImageDecorator extends EditorDecorator {
                 newHeight = newWidth * startingRatio;
             }
 
+            const updateOptions = firstChange ? {} : {tag: 'history-merge'};
             context.editor.update(() => {
                 const node = this.getNode() as ImageNode;
                 node.setWidth(newWidth);
                 node.setHeight(newHeight);
-            });
+            }, updateOptions);
+            firstChange = false;
         };
 
         const mouseUpListener = (event: MouseEvent) => {
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index f5be8251930..92f0cfc8120 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -25,6 +25,7 @@ import {
 } from "@lexical/rich-text";
 import {$isLinkNode, $toggleLink, LinkNode} from "@lexical/link";
 import {EditorUiContext} from "../framework/core";
+import {$isImageNode, ImageNode} from "../../nodes/image";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -168,3 +169,35 @@ export const link: EditorButtonDefinition = {
     }
 };
 
+export const image: EditorButtonDefinition = {
+    label: 'Insert/Edit Image',
+    action(context: EditorUiContext) {
+        const imageModal = context.manager.createModal('image');
+        const selection = context.lastSelection;
+        const selectedImage = getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
+
+        context.editor.getEditorState().read(() => {
+            let formDefaults = {};
+            if (selectedImage) {
+                formDefaults = {
+                    src: selectedImage.getSrc(),
+                    alt: selectedImage.getAltText(),
+                    height: selectedImage.getHeight(),
+                    width: selectedImage.getWidth(),
+                }
+
+                context.editor.update(() => {
+                    const selection = $createNodeSelection();
+                    selection.add(selectedImage.getKey());
+                    $setSelection(selection);
+                });
+            }
+
+            imageModal.show(formDefaults);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isImageNode);
+    }
+};
+
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index 457efa421e7..13e7a9c9fc6 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -2,6 +2,7 @@ import {EditorFormDefinition, EditorSelectFormFieldDefinition} from "../framewor
 import {EditorUiContext} from "../framework/core";
 import {$createLinkNode} from "@lexical/link";
 import {$createTextNode, $getSelection} from "lexical";
+import {$createImageNode} from "../../nodes/image";
 
 
 export const link: EditorFormDefinition = {
@@ -47,4 +48,42 @@ export const link: EditorFormDefinition = {
             }
         } as EditorSelectFormFieldDefinition,
     ],
+};
+
+export const image: EditorFormDefinition = {
+    submitText: 'Apply',
+    action(formData, context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            const imageNode = $createImageNode(formData.get('src')?.toString() || '', {
+                alt: formData.get('alt')?.toString() || '',
+                height: Number(formData.get('height')?.toString() || '0'),
+                width: Number(formData.get('width')?.toString() || '0'),
+            });
+            selection?.insertNodes([imageNode]);
+        });
+        return true;
+    },
+    fields: [
+        {
+            label: 'Source',
+            name: 'src',
+            type: 'text',
+        },
+        {
+            label: 'Alternative description',
+            name: 'alt',
+            type: 'text',
+        },
+        {
+            label: 'Width',
+            name: 'width',
+            type: 'text',
+        },
+        {
+            label: 'Height',
+            name: 'height',
+            type: 'text',
+        },
+    ],
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 68d845b4249..2fdadcb40c9 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -10,6 +10,7 @@ export type EditorUiContext = {
     editor: LexicalEditor,
     translate: (text: string) => string,
     manager: EditorUIManager,
+    lastSelection: BaseSelection|null,
 };
 
 export abstract class EditorUiElement {
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 19320b2629f..8227dec6838 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,18 +6,20 @@ import {
 } from "lexical";
 import {getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {link as linkFormDefinition} from "./defaults/form-definitions";
+import {image as imageFormDefinition, link as linkFormDefinition} from "./defaults/form-definitions";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorDecoratorAdapter} from "./framework/decorator";
 import {ImageDecorator} from "./decorators/image";
+import {EditorUiContext} from "./framework/core";
 
 export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
-    const context = {
+    const context: EditorUiContext = {
         editor,
         manager,
         translate: (text: string): string => text,
+        lastSelection: null,
     };
     manager.setContext(context);
 
@@ -31,6 +33,10 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
         title: 'Insert/Edit link',
         form: linkFormDefinition,
     });
+    manager.registerModal('image', {
+        title: 'Insert/Edit Image',
+        form: imageFormDefinition
+    })
 
     // Register decorator listener
     // Maybe move to manager?
@@ -54,6 +60,7 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
         const selection = $getSelection();
         toolbar.updateState({editor, selection});
+        context.lastSelection = selection;
         return false;
     }, COMMAND_PRIORITY_LOW);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 2d5063cf444..2802b1ca7ba 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -2,7 +2,7 @@ import {EditorButton, FormatPreviewButton} from "./framework/buttons";
 import {
     blockquote, bold, code,
     dangerCallout,
-    h2, h3, h4, h5,
+    h2, h3, h4, h5, image,
     infoCallout, italic, link, paragraph,
     redo, strikethrough, subscript,
     successCallout, superscript, underline,
@@ -40,5 +40,6 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(code),
 
         new EditorButton(link),
+        new EditorButton(image),
     ]);
 }
\ No newline at end of file

From 5c343638b67497cc1229aa4acdedff199553a7e4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 6 Jun 2024 14:43:50 +0100
Subject: [PATCH 156/666] Added base node/button for details/summary

---
 resources/js/wysiwyg/nodes/details.ts         | 120 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |   2 +
 .../wysiwyg/ui/defaults/button-definitions.ts |  33 ++++-
 resources/js/wysiwyg/ui/toolbars.ts           |   3 +-
 .../pages/parts/wysiwyg-editor.blade.php      |   7 +
 5 files changed, 162 insertions(+), 3 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/details.ts

diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/nodes/details.ts
new file mode 100644
index 00000000000..a18c4d858d5
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/details.ts
@@ -0,0 +1,120 @@
+import {
+    DOMConversion,
+    DOMConversionMap, DOMConversionOutput,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode,
+    SerializedElementNode,
+} from 'lexical';
+import type {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+
+export class DetailsNode extends ElementNode {
+
+    static getType() {
+        return 'details';
+    }
+
+    static clone(node: DetailsNode) {
+        return new DetailsNode(node.__key);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        return el('details');
+    }
+
+    updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            details(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        return {
+                            node: new DetailsNode(),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedElementNode {
+        return {
+            ...super.exportJSON(),
+            type: 'details',
+            version: 1,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedElementNode): DetailsNode {
+        return $createDetailsNode();
+    }
+
+}
+
+export function $createDetailsNode() {
+    return new DetailsNode();
+}
+
+export function $isDetailsNode(node: LexicalNode | null | undefined) {
+    return node instanceof DetailsNode;
+}
+
+export class SummaryNode extends ElementNode {
+
+    static getType() {
+        return 'summary';
+    }
+
+    static clone(node: SummaryNode) {
+        return new SummaryNode(node.__key);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        return el('summary');
+    }
+
+    updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            summary(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        return {
+                            node: new SummaryNode(),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedElementNode {
+        return {
+            ...super.exportJSON(),
+            type: 'summary',
+            version: 1,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedElementNode): DetailsNode {
+        return $createSummaryNode();
+    }
+
+}
+
+export function $createSummaryNode() {
+    return new SummaryNode();
+}
+
+export function $isSummaryNode(node: LexicalNode | null | undefined) {
+    return node instanceof SummaryNode;
+}
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 1d492a87a25..f47575bc5f6 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -4,6 +4,7 @@ import {ElementNode, KlassConstructor, LexicalNode, LexicalNodeReplacement, Para
 import {CustomParagraphNode} from "./custom-paragraph";
 import {LinkNode} from "@lexical/link";
 import {ImageNode} from "./image";
+import {DetailsNode, SummaryNode} from "./details";
 
 /**
  * Load the nodes for lexical.
@@ -14,6 +15,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         HeadingNode, // Todo - Create custom
         QuoteNode, // Todo - Create custom
         ImageNode,
+        DetailsNode, SummaryNode,
         CustomParagraphNode,
         {
             replace: ParagraphNode,
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 92f0cfc8120..e549e69a2d7 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,9 +1,9 @@
 import {EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
-    $createParagraphNode, $getSelection,
+    $createParagraphNode, $getRoot, $getSelection, $insertNodes,
     $isParagraphNode, $setSelection,
-    BaseSelection, FORMAT_TEXT_COMMAND,
+    BaseSelection, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
     REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
@@ -26,6 +26,8 @@ import {
 import {$isLinkNode, $toggleLink, LinkNode} from "@lexical/link";
 import {EditorUiContext} from "../framework/core";
 import {$isImageNode, ImageNode} from "../../nodes/image";
+import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
+import {$insertNodeToNearestRoot} from "@lexical/utils";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -201,3 +203,30 @@ export const image: EditorButtonDefinition = {
     }
 };
 
+export const details: EditorButtonDefinition = {
+    label: 'Insert collapsible block',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            const detailsNode = $createDetailsNode();
+            const selectionNodes = selection?.getNodes() || [];
+            const topLevels = selectionNodes.map(n => n.getTopLevelElement())
+                .filter(n => n !== null) as ElementNode[];
+            const uniqueTopLevels = [...new Set(topLevels)];
+
+            if (uniqueTopLevels.length > 0) {
+                uniqueTopLevels[0].insertAfter(detailsNode);
+            } else {
+                $getRoot().append(detailsNode);
+            }
+
+            for (const node of uniqueTopLevels) {
+                detailsNode.append(node);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isDetailsNode);
+    }
+}
+
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 2802b1ca7ba..b5d151fc116 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,7 +1,7 @@
 import {EditorButton, FormatPreviewButton} from "./framework/buttons";
 import {
     blockquote, bold, code,
-    dangerCallout,
+    dangerCallout, details,
     h2, h3, h4, h5, image,
     infoCallout, italic, link, paragraph,
     redo, strikethrough, subscript,
@@ -41,5 +41,6 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
         new EditorButton(link),
         new EditorButton(image),
+        new EditorButton(details),
     ]);
 }
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index c0ceddc45d0..6414027697c 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -16,6 +16,13 @@ class="">
                 <li>Hello</li>
             </ul>
 
+            <details>
+                <summary>Collapsible details/summary block</summary>
+                <p>Inner text here</p>
+                <h4>Inner Header</h4>
+                <p>More text <strong>with bold in</strong> it</p>
+            </details>
+
             <p class="callout info">
                 Hello there, this is an info callout
             </p>

From bddc6ae66bb8094c2c16df64d55663901d5eebd6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 8 Jun 2024 20:33:34 +0100
Subject: [PATCH 157/666] Roles: Added max validation for role external auth id
 field

For #5037
---
 app/Users/Controllers/RoleApiController.php |  4 ++--
 app/Users/Controllers/RoleController.php    |  4 ++--
 tests/User/RoleManagementTest.php           | 25 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 5f4f2999b79..2e96602faae 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -21,7 +21,7 @@ class RoleApiController extends ApiController
             'display_name'  => ['required', 'string', 'min:3', 'max:180'],
             'description'   => ['string', 'max:180'],
             'mfa_enforced'  => ['boolean'],
-            'external_auth_id' => ['string'],
+            'external_auth_id' => ['string', 'max:180'],
             'permissions'   => ['array'],
             'permissions.*' => ['string'],
         ],
@@ -29,7 +29,7 @@ class RoleApiController extends ApiController
             'display_name'  => ['string', 'min:3', 'max:180'],
             'description'   => ['string', 'max:180'],
             'mfa_enforced'  => ['boolean'],
-            'external_auth_id' => ['string'],
+            'external_auth_id' => ['string', 'max:180'],
             'permissions'   => ['array'],
             'permissions.*' => ['string'],
         ]
diff --git a/app/Users/Controllers/RoleController.php b/app/Users/Controllers/RoleController.php
index a874ce4d60f..0a7fdcc9ba8 100644
--- a/app/Users/Controllers/RoleController.php
+++ b/app/Users/Controllers/RoleController.php
@@ -75,7 +75,7 @@ public function store(Request $request)
         $data = $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
-            'external_auth_id' => ['string'],
+            'external_auth_id' => ['string', 'max:180'],
             'permissions'  => ['array'],
             'mfa_enforced' => ['string'],
         ]);
@@ -109,7 +109,7 @@ public function update(Request $request, string $id)
         $data = $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
-            'external_auth_id' => ['string'],
+            'external_auth_id' => ['string', 'max:180'],
             'permissions'  => ['array'],
             'mfa_enforced' => ['string'],
         ]);
diff --git a/tests/User/RoleManagementTest.php b/tests/User/RoleManagementTest.php
index 9e5cf78dd84..8683fcb6e86 100644
--- a/tests/User/RoleManagementTest.php
+++ b/tests/User/RoleManagementTest.php
@@ -96,6 +96,31 @@ public function test_role_create_update_delete_flow()
         $this->assertActivityExists(ActivityType::ROLE_DELETE);
     }
 
+    public function test_role_external_auth_id_validation()
+    {
+        config()->set('auth.method', 'oidc');
+        $role = Role::query()->first();
+        $routeByMethod = [
+            'post' => '/settings/roles/new',
+            'put' => "/settings/roles/{$role->id}",
+        ];
+
+        foreach ($routeByMethod as $method => $route) {
+            $resp = $this->asAdmin()->get($route);
+            $resp->assertDontSee('The external auth id');
+
+            $resp = $this->asAdmin()->call($method, $route, [
+                'display_name' => 'Test role for auth id validation',
+                'description'  => '',
+                'external_auth_id' => str_repeat('a', 181),
+            ]);
+
+            $resp->assertRedirect($route);
+            $resp = $this->followRedirects($resp);
+            $resp->assertSee('The external auth id may not be greater than 180 characters.');
+        }
+    }
+
     public function test_admin_role_cannot_be_removed_if_user_last_admin()
     {
         /** @var Role $adminRole */

From 3406846c82bd2322687dae5b7d38045746219edd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Jun 2024 16:58:23 +0100
Subject: [PATCH 158/666] Images: Updated GIF handling to use native methods

Changes GIF image thumbnail handling to direcly load via gd instead of
going through interventions own handling (which supports frames) since
we don't need animation for our thumbnails, and since performance issues
could arise with GIFs that have large frame counts.

For #5029
---
 app/Uploads/ImageResizer.php |  32 +++++++++++++++++++++++++++-----
 tests/Uploads/ImageTest.php  |  34 ++++++++++++++++++++++++++++++++++
 tests/test-data/animated.gif | Bin 0 -> 93 bytes
 3 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 tests/test-data/animated.gif

diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index d09177fff5c..fa6b1cac2d4 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -7,11 +7,13 @@
 use GuzzleHttp\Psr7\Utils;
 use Illuminate\Support\Facades\Cache;
 use Intervention\Image\Decoders\BinaryImageDecoder;
+use Intervention\Image\Drivers\Gd\Decoders\NativeObjectDecoder;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\Encoders\AutoEncoder;
 use Intervention\Image\Encoders\PngEncoder;
 use Intervention\Image\Interfaces\ImageInterface as InterventionImage;
 use Intervention\Image\ImageManager;
+use Intervention\Image\Origin;
 
 class ImageResizer
 {
@@ -99,7 +101,7 @@ public function resizeToThumbnailUrl(
         }
 
         // If not in cache and thumbnail does not exist, generate thumb and cache path
-        $thumbData = $this->resizeImageData($imageData, $width, $height, $keepRatio);
+        $thumbData = $this->resizeImageData($imageData, $width, $height, $keepRatio, $this->getExtension($image));
         $disk->put($thumbFilePath, $thumbData, true);
         Cache::put($thumbCacheKey, $thumbFilePath, static::THUMBNAIL_CACHE_TIME);
 
@@ -120,7 +122,7 @@ public function resizeImageData(
         ?string $format = null,
     ): string {
         try {
-            $thumb = $this->interventionFromImageData($imageData);
+            $thumb = $this->interventionFromImageData($imageData, $format);
         } catch (Exception $e) {
             throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
         }
@@ -154,11 +156,23 @@ public function resizeImageData(
      * Performs some manual library usage to ensure image is specifically loaded
      * from given binary data instead of data being misinterpreted.
      */
-    protected function interventionFromImageData(string $imageData): InterventionImage
+    protected function interventionFromImageData(string $imageData, ?string $fileType): InterventionImage
     {
         $manager = new ImageManager(new Driver());
 
-        return $manager->read($imageData, BinaryImageDecoder::class);
+        // Ensure gif images are decoded natively instead of deferring to intervention GIF
+        // handling since we don't need the added animation support.
+        $isGif = $fileType === 'gif';
+        $decoder = $isGif ? NativeObjectDecoder::class : BinaryImageDecoder::class;
+        $input = $isGif ? @imagecreatefromstring($imageData) : $imageData;
+
+        $image = $manager->read($input, $decoder);
+
+        if ($isGif) {
+            $image->setOrigin(new Origin('image/gif'));
+        }
+
+        return $image;
     }
 
     /**
@@ -209,7 +223,15 @@ protected function orientImageToOriginalExif(InterventionImage $image, string $o
      */
     protected function isGif(Image $image): bool
     {
-        return strtolower(pathinfo($image->path, PATHINFO_EXTENSION)) === 'gif';
+        return $this->getExtension($image) === 'gif';
+    }
+
+    /**
+     * Get the extension for the given image, normalised to lower-case.
+     */
+    protected function getExtension(Image $image): string
+    {
+        return strtolower(pathinfo($image->path, PATHINFO_EXTENSION));
     }
 
     /**
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index d24b6202b37..db500f60669 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -599,6 +599,40 @@ public function test_image_manager_regen_thumbnails()
         $this->files->deleteAtRelativePath($relPath);
     }
 
+    public function test_gif_thumbnail_generation()
+    {
+        $this->asAdmin();
+        $originalFile = $this->files->testFilePath('animated.gif');
+        $originalFileSize = filesize($originalFile);
+
+        $imgDetails = $this->files->uploadGalleryImageToPage($this, $this->entities->page(), 'animated.gif');
+        $relPath = $imgDetails['path'];
+
+        $this->assertTrue(file_exists(public_path($relPath)), 'Uploaded image found at path: ' . public_path($relPath));
+        $galleryThumb = $imgDetails['response']->thumbs->gallery;
+        $displayThumb = $imgDetails['response']->thumbs->display;
+
+        // Ensure display thumbnail is original image
+        $this->assertStringEndsWith($imgDetails['path'], $displayThumb);
+        $this->assertStringNotContainsString('thumbs', $displayThumb);
+
+        // Ensure gallery thumbnail is reduced image (single frame)
+        $galleryThumbRelPath = implode('/', array_slice(explode('/', $galleryThumb), 3));
+        $galleryThumbPath = public_path($galleryThumbRelPath);
+        $galleryFileSize = filesize($galleryThumbPath);
+
+        // Basic scan of GIF content to check frame count
+        $originalFrameCount = count(explode("\x00\x21\xF9", file_get_contents($originalFile)));
+        $galleryFrameCount = count(explode("\x00\x21\xF9", file_get_contents($galleryThumbPath)));
+
+        $this->files->deleteAtRelativePath($relPath);
+        $this->files->deleteAtRelativePath($galleryThumbRelPath);
+
+        $this->assertNotEquals($originalFileSize, $galleryFileSize);
+        $this->assertEquals(3, $originalFrameCount);
+        $this->assertEquals(1, $galleryFrameCount);
+    }
+
     protected function getTestProfileImage()
     {
         $imageName = 'profile.png';
diff --git a/tests/test-data/animated.gif b/tests/test-data/animated.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13c9d05243a52fde437e54dffa54bee867416380
GIT binary patch
literal 93
zcmZ?wbhEHbWMN=oXkcK_VEF%^fkE*<x1VcBu(M-;tC5}oGa~~~=qC$<5yO859UvR1
al!bwTiOq+hZG|K&Rw)*twiTSL4Aua86cD5U

literal 0
HcmV?d00001


From c77e8730d6f508c923cf60a8b1b314db0bfdb8b3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Jun 2024 17:03:29 +0100
Subject: [PATCH 159/666] Deps: Updated php packages via composer

---
 composer.lock | 395 ++++++++++++++++++++++++--------------------------
 1 file changed, 188 insertions(+), 207 deletions(-)

diff --git a/composer.lock b/composer.lock
index 48147599558..db0c9e667a6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.307.1",
+            "version": "3.311.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91"
+                "reference": "731cd73062909594c5f7443413c4c4c40ed1c25c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc79f16e1a1bd3feee421401ba2f21915abfdf91",
-                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c",
+                "reference": "731cd73062909594c5f7443413c4c4c40ed1c25c",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.307.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.311.2"
             },
-            "time": "2024-05-17T18:07:44+00:00"
+            "time": "2024-06-07T18:05:33+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -718,16 +718,16 @@
         },
         {
             "name": "doctrine/event-manager",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
                 "shasum": ""
             },
             "require": {
@@ -737,10 +737,10 @@
                 "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^12",
                 "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^4.28"
+                "phpunit/phpunit": "^10.5",
+                "vimeo/psalm": "^5.24"
             },
             "type": "library",
             "autoload": {
@@ -789,7 +789,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+                "source": "https://github.com/doctrine/event-manager/tree/2.0.1"
             },
             "funding": [
                 {
@@ -805,7 +805,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-12T20:59:15+00:00"
+            "time": "2024-05-22T20:47:39+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1838,16 +1838,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.6.4",
+            "version": "3.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "193324ec88bc5ad4039e57ce9b926ae28dfde813"
+                "reference": "d428433aa74836ab75e8d4a5241628bebb7f4077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/193324ec88bc5ad4039e57ce9b926ae28dfde813",
-                "reference": "193324ec88bc5ad4039e57ce9b926ae28dfde813",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077",
+                "reference": "d428433aa74836ab75e8d4a5241628bebb7f4077",
                 "shasum": ""
             },
             "require": {
@@ -1894,7 +1894,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.6.4"
+                "source": "https://github.com/Intervention/image/tree/3.6.5"
             },
             "funding": [
                 {
@@ -1906,7 +1906,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-08T13:53:15+00:00"
+            "time": "2024-06-06T17:15:24+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1977,16 +1977,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.10",
+            "version": "v10.48.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "91e2b9e218afa4e5c377510faa11957042831ba3"
+                "reference": "590afea38e708022662629fbf5184351fa82cf08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/91e2b9e218afa4e5c377510faa11957042831ba3",
-                "reference": "91e2b9e218afa4e5c377510faa11957042831ba3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08",
+                "reference": "590afea38e708022662629fbf5184351fa82cf08",
                 "shasum": ""
             },
             "require": {
@@ -2180,20 +2180,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-30T12:52:59+00:00"
+            "time": "2024-05-28T15:46:19+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.21",
+            "version": "v0.1.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920"
+                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920",
-                "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
+                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
                 "shasum": ""
             },
             "require": {
@@ -2236,9 +2236,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.21"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.23"
             },
-            "time": "2024-04-30T12:46:16+00:00"
+            "time": "2024-05-27T13:53:20+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2628,16 +2628,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.27.0",
+            "version": "3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f"
+                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f",
-                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
                 "shasum": ""
             },
             "require": {
@@ -2661,10 +2661,13 @@
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
+                "ext-mongodb": "^1.3",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
+                "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
+                "mongodb/mongodb": "^1.2",
                 "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
@@ -2702,32 +2705,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.27.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-04-07T19:17:50+00:00"
+            "time": "2024-05-22T10:09:12+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.27.0",
+            "version": "3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "3e6ce2f972f1470db779f04d29c289dcd2c32837"
+                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/3e6ce2f972f1470db779f04d29c289dcd2c32837",
-                "reference": "3e6ce2f972f1470db779f04d29c289dcd2c32837",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8",
+                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8",
                 "shasum": ""
             },
             "require": {
@@ -2767,32 +2760,22 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.27.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.28.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-04-07T19:16:54+00:00"
+            "time": "2024-05-06T20:05:52+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.25.1",
+            "version": "3.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92"
+                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92",
-                "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
                 "shasum": ""
             },
             "require": {
@@ -2826,19 +2809,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-15T19:58:44+00:00"
+            "time": "2024-05-06T20:05:52+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -3367,16 +3340,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.3",
+            "version": "2.72.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
+                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
                 "shasum": ""
             },
             "require": {
@@ -3410,8 +3383,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-3.x": "3.x-dev",
-                    "dev-master": "2.x-dev"
+                    "dev-master": "3.x-dev",
+                    "dev-2.x": "2.x-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -3470,7 +3443,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-25T10:35:09+00:00"
+            "time": "2024-06-03T19:18:41+00:00"
         },
         {
             "name": "nette/schema",
@@ -3766,21 +3739,21 @@
         },
         {
             "name": "onelogin/php-saml",
-            "version": "4.1.0",
+            "version": "4.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/onelogin/php-saml.git",
-                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d"
+                "url": "https://github.com/SAML-Toolkits/php-saml.git",
+                "reference": "d3b5172f137db2f412239432d77253ceaaa1e939"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d",
-                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d",
+                "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/d3b5172f137db2f412239432d77253ceaaa1e939",
+                "reference": "d3b5172f137db2f412239432d77253ceaaa1e939",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3",
-                "robrichards/xmlseclibs": ">=3.1.1"
+                "robrichards/xmlseclibs": "^3.1"
             },
             "require-dev": {
                 "pdepend/pdepend": "^2.8.0",
@@ -3806,19 +3779,27 @@
             "license": [
                 "MIT"
             ],
-            "description": "OneLogin PHP SAML Toolkit",
-            "homepage": "https://developers.onelogin.com/saml/php",
+            "description": "PHP SAML Toolkit",
+            "homepage": "https://github.com/SAML-Toolkits/php-saml",
             "keywords": [
+                "Federation",
                 "SAML2",
-                "onelogin",
+                "SSO",
+                "identity",
                 "saml"
             ],
             "support": {
-                "email": "sixto.garcia@onelogin.com",
-                "issues": "https://github.com/onelogin/php-saml/issues",
-                "source": "https://github.com/onelogin/php-saml/"
+                "email": "sixto.martin.garcia@gmail.com",
+                "issues": "https://github.com/onelogin/SAML-Toolkits/issues",
+                "source": "https://github.com/onelogin/SAML-Toolkits/"
             },
-            "time": "2022-07-15T20:44:36+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/SAML-Toolkits",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-05-30T15:10:40+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -5642,16 +5623,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"
+                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
-                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
                 "shasum": ""
             },
             "require": {
@@ -5716,7 +5697,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.7"
+                "source": "https://github.com/symfony/console/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -5732,20 +5713,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b"
+                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b",
-                "reference": "1c5d5c2103c3762aff27a27e1e2409e30a79083b",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08",
+                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08",
                 "shasum": ""
             },
             "require": {
@@ -5781,7 +5762,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.7"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -5797,7 +5778,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -5868,16 +5849,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "667a072466c6a53827ed7b119af93806b884cbb3"
+                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/667a072466c6a53827ed7b119af93806b884cbb3",
-                "reference": "667a072466c6a53827ed7b119af93806b884cbb3",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
+                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
                 "shasum": ""
             },
             "require": {
@@ -5923,7 +5904,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.7"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -5939,20 +5920,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f"
+                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f",
-                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b",
+                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b",
                 "shasum": ""
             },
             "require": {
@@ -6003,7 +5984,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -6019,7 +6000,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -6099,16 +6080,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764"
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764",
-                "reference": "511c48990be17358c23bf45c5d71ab85d40fb764",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
+                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
                 "shasum": ""
             },
             "require": {
@@ -6143,7 +6124,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.7"
+                "source": "https://github.com/symfony/finder/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -6159,20 +6140,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-23T10:36:43+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759"
+                "reference": "27de8cc95e11db7a50b027e71caaab9024545947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759",
-                "reference": "b4db6b833035477cb70e18d0ae33cb7c2b521759",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947",
+                "reference": "27de8cc95e11db7a50b027e71caaab9024545947",
                 "shasum": ""
             },
             "require": {
@@ -6220,7 +6201,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.7"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -6236,20 +6217,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b7b5e6cdef670a0c82d015a966ffc7e855861a98"
+                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b7b5e6cdef670a0c82d015a966ffc7e855861a98",
-                "reference": "b7b5e6cdef670a0c82d015a966ffc7e855861a98",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
+                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
                 "shasum": ""
             },
             "require": {
@@ -6334,7 +6315,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.7"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -6350,20 +6331,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-29T11:24:44+00:00"
+            "time": "2024-06-02T16:06:25+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "decadcf3865918ecfcbfa90968553994ce935a5e"
+                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e",
-                "reference": "decadcf3865918ecfcbfa90968553994ce935a5e",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33",
+                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33",
                 "shasum": ""
             },
             "require": {
@@ -6419,7 +6400,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.7"
+                "source": "https://github.com/symfony/mime/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -6435,7 +6416,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-06-01T07:50:16+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7150,16 +7131,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381"
+                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381",
-                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381",
+                "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
                 "shasum": ""
             },
             "require": {
@@ -7191,7 +7172,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.7"
+                "source": "https://github.com/symfony/process/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7207,20 +7188,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "276e06398f71fa2a973264d94f28150f93cfb907"
+                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/276e06398f71fa2a973264d94f28150f93cfb907",
-                "reference": "276e06398f71fa2a973264d94f28150f93cfb907",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
+                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
                 "shasum": ""
             },
             "require": {
@@ -7274,7 +7255,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.7"
+                "source": "https://github.com/symfony/routing/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7290,7 +7271,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7377,16 +7358,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69"
+                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69",
-                "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
                 "shasum": ""
             },
             "require": {
@@ -7443,7 +7424,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.7"
+                "source": "https://github.com/symfony/string/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7459,20 +7440,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123"
+                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a",
+                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a",
                 "shasum": ""
             },
             "require": {
@@ -7538,7 +7519,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.7"
+                "source": "https://github.com/symfony/translation/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7554,7 +7535,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7636,16 +7617,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "a66efcb71d8bc3a207d9d78e0bd67f3321510355"
+                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/a66efcb71d8bc3a207d9d78e0bd67f3321510355",
-                "reference": "a66efcb71d8bc3a207d9d78e0bd67f3321510355",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
+                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
                 "shasum": ""
             },
             "require": {
@@ -7690,7 +7671,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.7"
+                "source": "https://github.com/symfony/uid/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7706,20 +7687,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7"
+                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7",
-                "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
+                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
                 "shasum": ""
             },
             "require": {
@@ -7775,7 +7756,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.7"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -7791,7 +7772,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8326,16 +8307,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.6",
+            "version": "v2.9.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f"
+                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f",
-                "reference": "93d5b95d2e29cdb8203363d44abfdbc0bc7ef57f",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/5c805f636095cc2e0b659e3954775cf8f1dad1bb",
+                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb",
                 "shasum": ""
             },
             "require": {
@@ -8349,7 +8330,7 @@
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.10.66"
+                "phpstan/phpstan": "^1.11.1"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
@@ -8404,7 +8385,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.6"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.7"
             },
             "funding": [
                 {
@@ -8424,7 +8405,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-05-09T11:53:26+00:00"
+            "time": "2024-05-27T18:33:26+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8872,16 +8853,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.1",
+            "version": "1.11.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b"
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9100a76ce8015b9aa7125b9171ae3a76887b6c82",
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82",
                 "shasum": ""
             },
             "require": {
@@ -8926,7 +8907,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-15T08:00:59+00:00"
+            "time": "2024-06-06T12:19:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10268,16 +10249,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.0",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2"
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
                 "shasum": ""
             },
             "require": {
@@ -10344,7 +10325,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-20T08:11:32+00:00"
+            "time": "2024-05-22T21:24:41+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10404,16 +10385,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.7",
+            "version": "v6.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "2088c5da700b1e7a8689fffc10dda6c1f643deea"
+                "reference": "105b56a0305d219349edeb60a800082eca864e4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2088c5da700b1e7a8689fffc10dda6c1f643deea",
-                "reference": "2088c5da700b1e7a8689fffc10dda6c1f643deea",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/105b56a0305d219349edeb60a800082eca864e4b",
+                "reference": "105b56a0305d219349edeb60a800082eca864e4b",
                 "shasum": ""
             },
             "require": {
@@ -10451,7 +10432,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.7"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.8"
             },
             "funding": [
                 {
@@ -10467,7 +10448,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2024-05-31T14:49:08+00:00"
         },
         {
             "name": "theseer/tokenizer",

From a8ce199e0de8974c8be60450797301839a5d1e82 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Jun 2024 17:18:23 +0100
Subject: [PATCH 160/666] Pages: Fixed unused changelog on first page publish

Included test to cover.
For #5056
---
 app/Entities/Repos/PageRepo.php |  3 ++-
 tests/Entity/PageTest.php       | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 2526b6c445d..be139b0509f 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -77,7 +77,8 @@ public function publishDraft(Page $draft, array $input): Page
         $this->updateTemplateStatusAndContentFromInput($draft, $input);
         $this->baseRepo->update($draft, $input);
 
-        $this->revisionRepo->storeNewForPage($draft, trans('entities.pages_initial_revision'));
+        $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+        $this->revisionRepo->storeNewForPage($draft, $summary);
         $draft->refresh();
 
         Activity::add(ActivityType::PAGE_CREATE, $draft);
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index daad82e76dc..b96d455eb25 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -86,6 +86,32 @@ public function test_page_creation_with_markdown_content()
         $resp->assertSee('# a title');
     }
 
+    public function test_page_creation_allows_summary_to_be_set()
+    {
+        $book = $this->entities->book();
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $draft = Page::query()->where('book_id', '=', $book->id)
+            ->where('draft', '=', true)->first();
+
+        $details = [
+            'html'    => '<h1>a title</h1>',
+            'name'    => 'My page with summary',
+            'summary' => 'Here is my changelog message for a new page!',
+        ];
+        $resp = $this->post($book->getUrl("/draft/{$draft->id}"), $details);
+        $resp->assertRedirect();
+
+        $this->assertDatabaseHas('page_revisions', [
+            'page_id' => $draft->id,
+            'summary' => 'Here is my changelog message for a new page!',
+        ]);
+
+        $draft->refresh();
+        $resp = $this->get($draft->getUrl('/revisions'));
+        $resp->assertSee('Here is my changelog message for a new page!');
+    }
+
     public function test_page_delete()
     {
         $page = $this->entities->page();

From d9b9e6c0b15df4d55a0e7b137bba36051db41db6 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 10 Jun 2024 10:16:34 +0100
Subject: [PATCH 161/666] Updated translations with latest Crowdin changes
 (#5022)

---
 lang/ar/auth.php            |  2 +-
 lang/bg/auth.php            |  2 +-
 lang/bs/auth.php            |  2 +-
 lang/ca/auth.php            |  2 +-
 lang/cs/auth.php            |  2 +-
 lang/cs/errors.php          |  4 ++--
 lang/cy/auth.php            |  2 +-
 lang/da/auth.php            |  2 +-
 lang/de/auth.php            |  2 +-
 lang/de/errors.php          |  2 +-
 lang/de_informal/auth.php   |  2 +-
 lang/de_informal/errors.php |  2 +-
 lang/el/auth.php            |  2 +-
 lang/es/auth.php            |  2 +-
 lang/es/errors.php          |  2 +-
 lang/es_AR/auth.php         |  2 +-
 lang/es_AR/errors.php       |  2 +-
 lang/et/activities.php      |  6 ++---
 lang/et/auth.php            |  2 +-
 lang/et/common.php          |  2 +-
 lang/et/editor.php          |  6 ++---
 lang/et/entities.php        | 12 +++++-----
 lang/et/errors.php          |  4 ++--
 lang/et/settings.php        | 16 ++++++-------
 lang/eu/auth.php            |  2 +-
 lang/fa/auth.php            |  2 +-
 lang/fi/auth.php            |  2 +-
 lang/fr/auth.php            |  2 +-
 lang/fr/errors.php          |  2 +-
 lang/he/auth.php            |  2 +-
 lang/hr/auth.php            |  2 +-
 lang/hu/activities.php      |  6 ++---
 lang/hu/auth.php            |  2 +-
 lang/hu/editor.php          |  8 +++----
 lang/hu/entities.php        |  2 +-
 lang/hu/errors.php          |  4 ++--
 lang/id/activities.php      | 48 ++++++++++++++++++-------------------
 lang/id/auth.php            |  2 +-
 lang/it/auth.php            |  2 +-
 lang/it/errors.php          |  2 +-
 lang/ja/auth.php            |  2 +-
 lang/ka/auth.php            |  2 +-
 lang/ko/activities.php      |  6 ++---
 lang/ko/auth.php            |  2 +-
 lang/ko/common.php          |  2 +-
 lang/ko/editor.php          |  6 ++---
 lang/ko/entities.php        |  8 +++----
 lang/ko/errors.php          |  4 ++--
 lang/ko/settings.php        | 16 ++++++-------
 lang/lt/auth.php            |  2 +-
 lang/lv/auth.php            |  2 +-
 lang/nb/auth.php            |  2 +-
 lang/nl/auth.php            |  2 +-
 lang/nl/errors.php          |  2 +-
 lang/nn/auth.php            |  2 +-
 lang/pl/auth.php            |  2 +-
 lang/pt/auth.php            |  2 +-
 lang/pt_BR/activities.php   |  6 ++---
 lang/pt_BR/auth.php         |  2 +-
 lang/pt_BR/common.php       |  2 +-
 lang/pt_BR/editor.php       |  8 +++----
 lang/pt_BR/errors.php       |  4 ++--
 lang/pt_BR/settings.php     | 16 ++++++-------
 lang/ro/auth.php            |  2 +-
 lang/ru/auth.php            |  2 +-
 lang/sk/auth.php            |  2 +-
 lang/sl/auth.php            |  2 +-
 lang/sq/auth.php            |  2 +-
 lang/sr/auth.php            |  2 +-
 lang/sv/auth.php            |  2 +-
 lang/tr/auth.php            |  2 +-
 lang/uk/auth.php            |  2 +-
 lang/uz/auth.php            |  2 +-
 lang/vi/auth.php            |  2 +-
 lang/zh_CN/auth.php         |  2 +-
 lang/zh_CN/errors.php       |  2 +-
 lang/zh_TW/auth.php         |  4 ++--
 lang/zh_TW/components.php   |  6 ++---
 lang/zh_TW/editor.php       | 14 +++++------
 lang/zh_TW/entities.php     |  8 +++----
 80 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index 7d64babc449..fb434699e2d 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'تطبيق الجوال',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/bg/auth.php b/lang/bg/auth.php
index ec3e753513d..71cd2a71295 100644
--- a/lang/bg/auth.php
+++ b/lang/bg/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Мобилно приложение',
     'mfa_option_totp_desc' => 'За да използваш многофакторно удостоверяване, ще ти трябва мобилно приложение, което поддържа временни еднократни пароли (TOTP), като например Google Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервни кодове',
-    'mfa_option_backup_codes_desc' => 'Запази на сигурно място набор от еднократни резервни кодове, с които можеш да устовериш идентичността си.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Потвърди и включи',
     'mfa_gen_backup_codes_title' => 'Настройка на резервни кодове',
     'mfa_gen_backup_codes_desc' => 'Запази този лист с кодове на сигурно място. Когато достъпваш системата, ще можеш да използваш един от тези кодове като вторичен механизъм за удостоверяване.',
diff --git a/lang/bs/auth.php b/lang/bs/auth.php
index 96ab0efea19..a8d0da78eb9 100644
--- a/lang/bs/auth.php
+++ b/lang/bs/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/ca/auth.php b/lang/ca/auth.php
index 714c095b6c6..c23fa43d474 100644
--- a/lang/ca/auth.php
+++ b/lang/ca/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicació mòbil',
     'mfa_option_totp_desc' => 'Per a fer servir l’autenticació de múltiple factor us caldrà una aplicació mòbil que suporti TOTP, com ara Google Authenticador, Authy o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Codis de seguretat',
-    'mfa_option_backup_codes_desc' => 'Deseu de manera segura codis de seguretat d’un sol ús que podeu introduir per a verificar la vostra identitat.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirma i activa',
     'mfa_gen_backup_codes_title' => 'Configuració de codis de seguretat',
     'mfa_gen_backup_codes_desc' => 'Deseu la següent llista de codis en un lloc segur. Quan accediu al sistema, podeu fer servir un dels codis com a segon mètode d’autenticació.',
diff --git a/lang/cs/auth.php b/lang/cs/auth.php
index 585315ee000..ad225a2fee2 100644
--- a/lang/cs/auth.php
+++ b/lang/cs/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilní aplikace',
     'mfa_option_totp_desc' => 'Pro použití vícefaktorového ověření budete potřebovat mobilní aplikaci, která podporuje TOTP jako např. Google Authenticator, Authy nebo Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Záložní kódy',
-    'mfa_option_backup_codes_desc' => 'Bezpečně si uložte sadu jednorázových záložních kódů, které můžete použít pro ověření vaší identity.',
+    'mfa_option_backup_codes_desc' => 'Vygeneruje sadu jednorázových záložních kódů, které zadáte při přihlášení k ověření své identity. Ujistěte se, že jsou uloženy na bezpečném místě.',
     'mfa_gen_confirm_and_enable' => 'Potvrdit a povolit',
     'mfa_gen_backup_codes_title' => 'Nastavení záložních kódů',
     'mfa_gen_backup_codes_desc' => 'Uložte níže uvedený seznam kódů na bezpečné místo. Při přístupu k systému budete moci použít jeden z kódů jako druhou metodu ověření.',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index 37b9348a236..0f03f897745 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -9,7 +9,7 @@
     'permissionJson' => 'Nemáte povolení k provedení požadované akce.',
 
     // Auth
-    'error_user_exists_different_creds' => 'Uživatel s emailem :email již existuje ale s jinými přihlašovacími údaji.',
+    'error_user_exists_different_creds' => 'Uživatel s emailem :email již existuje, ale s jinými přihlašovacími údaji.',
     'auth_pre_register_theme_prevention' => 'Zadané údaje nedovolují zaregistrovat uživatelský účet',
     'email_already_confirmed' => 'Emailová adresa již byla potvrzena. Zkuste se přihlásit.',
     'email_confirmation_invalid' => 'Tento potvrzovací odkaz již neplatí nebo už byl použit. Zkuste prosím registraci znovu.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Doplněk pro tohoto správce identity nebyl nalezen.',
     'social_driver_not_configured' => 'Nastavení vašeho účtu na :socialAccount není správné. :socialAccount musí mít vaše svolení pro naší aplikaci vás přihlásit.',
     'invite_token_expired' => 'Odkaz v pozvánce již bohužel vypršel. Namísto toho ale můžete zkusit resetovat heslo do Vašeho účtu.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Uživatele pro tuto akci se nepodařilo najít.',
 
     // System
     'path_not_writable' => 'Nelze zapisovat na cestu k souboru :filePath. Zajistěte aby se dalo nahrávat na server.',
diff --git a/lang/cy/auth.php b/lang/cy/auth.php
index 94fc0b6b54b..bda2e741d0e 100644
--- a/lang/cy/auth.php
+++ b/lang/cy/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Ap Ffôn Symudol',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/da/auth.php b/lang/da/auth.php
index 090e0751e61..fb11ea6865a 100644
--- a/lang/da/auth.php
+++ b/lang/da/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobil app',
     'mfa_option_totp_desc' => 'For at bruge multi-faktor godkendelse, skal du bruge en mobil app, der understøtter TOTP såsom Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup koder',
-    'mfa_option_backup_codes_desc' => 'Gem sikkert et sæt af engangs backup koder, som du kan indtaste for at bekræfte din identitet.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Bekræft og aktivér',
     'mfa_gen_backup_codes_title' => 'Backup koder opsætning',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/de/auth.php b/lang/de/auth.php
index aa9dcfd8e1a..92789d18216 100644
--- a/lang/de/auth.php
+++ b/lang/de/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Handy-App',
     'mfa_option_totp_desc' => 'Um Mehrfach-Faktor-Authentifizierung nutzen zu können, benötigen Sie eine Handy-Anwendung, die TOTP unterstützt, wie Google Authenticator, Authy oder Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup-Codes',
-    'mfa_option_backup_codes_desc' => 'Speichern Sie sicher eine Reihe von einmaligen Backup-Codes, die Sie eingeben können, um Ihre Identität zu überprüfen.',
+    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Sie bei der Anmeldung eingeben, um Ihre Identität zu bestätigen. Achten Sie darauf diese an einem sicheren Ort aufzubewahren.',
     'mfa_gen_confirm_and_enable' => 'Bestätigen und aktivieren',
     'mfa_gen_backup_codes_title' => 'Backup-Codes einrichten',
     'mfa_gen_backup_codes_desc' => 'Speichern Sie die folgende Liste von Codes an einem sicheren Ort. Wenn Sie auf das System zugreifen, können Sie einen der Codes als zweiten Authentifizierungsmechanismus verwenden.',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 5ba185ee6c3..90e325c6dd8 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Treiber für Social-Media-Konten nicht gefunden',
     'social_driver_not_configured' => 'Ihr :socialAccount-Konto ist nicht korrekt konfiguriert.',
     'invite_token_expired' => 'Dieser Einladungslink ist abgelaufen. Sie können stattdessen versuchen Ihr Passwort zurückzusetzen.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Ein Benutzer für diese Aktion konnte nicht gefunden werden.',
 
     // System
     'path_not_writable' => 'Die Datei kann nicht in den angegebenen Pfad :filePath hochgeladen werden. Stellen Sie sicher, dass dieser Ordner auf dem Server beschreibbar ist.',
diff --git a/lang/de_informal/auth.php b/lang/de_informal/auth.php
index b133df49e3d..8e05948930c 100644
--- a/lang/de_informal/auth.php
+++ b/lang/de_informal/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'Um Mehrfach-Faktor-Authentifizierung nutzen zu können, benötigst du eine mobile Anwendung, die TOTP unterstützt, wie Google Authenticator, Authy oder Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Code',
-    'mfa_option_backup_codes_desc' => 'Speichere eine Reihe von einmaligen Backup-Codes an einem sicheren Ort. Du kannst damit deine identität bestätigen.',
+    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Sie bei der Anmeldung eingeben, um Ihre Identität zu bestätigen. Achten Sie darauf diese an einem sicheren Ort aufzubewahren.',
     'mfa_gen_confirm_and_enable' => 'Bestätigen und aktivieren',
     'mfa_gen_backup_codes_title' => 'Backup-Codes einrichten',
     'mfa_gen_backup_codes_desc' => 'Speichere die folgende Liste der Codes an einem sicheren Ort. Wenn du auf das System zugreifst, kannst du einen der Codes als zweiten Authentifizierungsmechanismus verwenden.',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index 2ae27c1063f..63c90db1d34 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Treiber für Social-Media-Konten nicht gefunden',
     'social_driver_not_configured' => 'Dein :socialAccount-Konto ist nicht korrekt konfiguriert.',
     'invite_token_expired' => 'Dieser Einladungslink ist abgelaufen. Du kannst stattdessen versuchen, dein Passwort zurückzusetzen.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Ein Benutzer für diese Aktion konnte nicht gefunden werden.',
 
     // System
     'path_not_writable' => 'Die Datei kann nicht in den angegebenen Pfad :filePath hochgeladen werden. Stelle sicher, dass dieser Ordner auf dem Server beschreibbar ist.',
diff --git a/lang/el/auth.php b/lang/el/auth.php
index b6a237dab1e..183baab7a02 100644
--- a/lang/el/auth.php
+++ b/lang/el/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Εφαρμογή για κινητό',
     'mfa_option_totp_desc' => 'Για να χρησιμοποιήσετε τον έλεγχο ταυτότητας πολλαπλών παραγόντων, θα χρειαστείτε μια εφαρμογή για κινητά που υποστηρίζει TOTP, όπως το Google Authenticator, το Authy ή το Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Εφεδρικοί κωδικοί',
-    'mfa_option_backup_codes_desc' => 'Αποθηκεύστε με ασφάλεια ένα σύνολο εφεδρικών κωδικών μίας χρήσης τους οποίους μπορείτε να εισαγάγετε για να επαληθεύσετε την ταυτότητά σας.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Επιβεβαίωση και ενεργοποίηση',
     'mfa_gen_backup_codes_title' => 'Ρύθμιση εφεδρικών κωδικών',
     'mfa_gen_backup_codes_desc' => 'Αποθηκεύστε την παρακάτω λίστα κωδικών σε ασφαλές μέρος. Κατά την πρόσβαση στο σύστημα, θα μπορείτε να χρησιμοποιήσετε έναν από τους κωδικούς ως δεύτερο μηχανισμό ελέγχου ταυτότητας.',
diff --git a/lang/es/auth.php b/lang/es/auth.php
index 13566e81131..45d3eb32916 100644
--- a/lang/es/auth.php
+++ b/lang/es/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicación para móviles',
     'mfa_option_totp_desc' => 'Para utilizar la autenticación en dos pasos necesitarás una aplicación móvil que soporte TOTP como Google Authenticator, Authy o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Códigos de Respaldo',
-    'mfa_option_backup_codes_desc' => 'Almacena de forma segura un conjunto de códigos de respaldo de un solo uso que puedes introducir para verificar tu identidad.',
+    'mfa_option_backup_codes_desc' => 'Genera un conjunto de códigos de seguridad de un solo uso que ingresará al iniciar sesión para verificar su identidad. Asegúrese de guardarlos en un lugar seguro.',
     'mfa_gen_confirm_and_enable' => 'Confirmar y Activar',
     'mfa_gen_backup_codes_title' => 'Configuración de Códigos de Respaldo',
     'mfa_gen_backup_codes_desc' => 'Guarda la siguiente lista de códigos en un lugar seguro. Al acceder al sistema podrás usar uno de los códigos como un segundo mecanismo de autenticación.',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index 97c376df101..1323465000b 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Driver social no encontrado',
     'social_driver_not_configured' => 'Su configuración :socialAccount no es correcta.',
     'invite_token_expired' => 'Este enlace de invitación ha expirado. Puede resetear la contraseña de su cuenta como alternativa.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'No se pudo encontrar un usuario para esta acción.',
 
     // System
     'path_not_writable' => 'El fichero no pudo ser subido a la ruta :filePath . Asegúrese de que es escribible por el servidor.',
diff --git a/lang/es_AR/auth.php b/lang/es_AR/auth.php
index 19b86f67961..1316dd68615 100644
--- a/lang/es_AR/auth.php
+++ b/lang/es_AR/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicación móvil',
     'mfa_option_totp_desc' => 'Para utilizar la autenticación en dos pasos necesitará una aplicación móvil que soporte TOTP como Google Authenticator, Authy o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Códigos de Respaldo',
-    'mfa_option_backup_codes_desc' => 'Almacene de forma segura un conjunto de códigos de respaldo de un solo uso que pueda introducir para verificar su identidad.',
+    'mfa_option_backup_codes_desc' => 'Genera un conjunto de códigos de seguridad de un solo uso que ingresará al iniciar sesión para verificar su identidad. Asegúrese de guardarlos en un lugar seguro.',
     'mfa_gen_confirm_and_enable' => 'Confirmar y Activar',
     'mfa_gen_backup_codes_title' => 'Configuración de Códigos de Respaldo',
     'mfa_gen_backup_codes_desc' => 'Guarde la siguiente lista de códigos en un lugar seguro. Al acceder al sistema podrá usar uno de los códigos como un segundo mecanismo de autenticación.',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index 818dccfb7b5..a5dd84df16c 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Driver social no encontrado',
     'social_driver_not_configured' => 'Su configuración :socialAccount no es correcta.',
     'invite_token_expired' => 'El enace de la esta invitación expiró. Puede intentar restablecer la contraseña de su cuenta',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'No se pudo encontrar un usuario para esta acción.',
 
     // System
     'path_not_writable' => 'La ruta :filePath no pudo ser cargada. Asegurese de que es escribible por el servidor.',
diff --git a/lang/et/activities.php b/lang/et/activities.php
index a8c339030bc..46812551023 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Kasutaja on kustutatud',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'lisas API tunnuse',
     'api_token_create_notification' => 'API tunnus on lisatud',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'muutis API tunnust',
     'api_token_update_notification' => 'API tunnus on muudetud',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'kustutas API tunnuse',
     'api_token_delete_notification' => 'API tunnus on kustutatud',
 
     // Roles
diff --git a/lang/et/auth.php b/lang/et/auth.php
index 74e19a230ad..6edcdfc7af0 100644
--- a/lang/et/auth.php
+++ b/lang/et/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobiilirakendus',
     'mfa_option_totp_desc' => 'Mitmeastmelise autentimise kasutamiseks on sul vaja TOTP-toega mobiilirakendust, nagu Google Authenticator, Authy või Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Varukoodid',
-    'mfa_option_backup_codes_desc' => 'Hoiusta kindlas kohas komplekt ühekordseid varukoode, millega saad oma isikut tuvastada.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Kinnita ja lülita sisse',
     'mfa_gen_backup_codes_title' => 'Varukoodide seadistamine',
     'mfa_gen_backup_codes_desc' => 'Hoiusta allolevad koodid turvalises kohas. Saad neid kasutada sisselogimisel sekundaarse autentimismeetodina.',
diff --git a/lang/et/common.php b/lang/et/common.php
index 9dfcf7de812..6fe7f49a9e3 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -20,7 +20,7 @@
     'description' => 'Kirjeldus',
     'role' => 'Roll',
     'cover_image' => 'Kaanepilt',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'See pildifail peaks olema umbes 440x250px, ehkki seda skaleeritakse ja lõigatakse vastavalt vajadusele, et see mahuks erinevatesse kasutajaliidestesse, seega tegelikud kuvamõõdud võivad erineda.',
 
     // Actions
     'actions' => 'Tegevused',
diff --git a/lang/et/editor.php b/lang/et/editor.php
index 832cd8d4aca..610be639879 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabeli omadused',
     'table_properties_title' => 'Tabeli omadused',
     'delete_table' => 'Kustuta tabel',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Eemalda tabeli vormindus',
+    'resize_to_contents' => 'Muuda suurus sisule vastavaks',
+    'row_header' => 'Päiserida',
     'insert_row_before' => 'Sisesta rida enne',
     'insert_row_after' => 'Sisesta rida pärast',
     'delete_row' => 'Kustuta rida',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 1a62e2c6a9c..b142d79ba94 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Muudetud :timeLength',
     'meta_updated_name' => 'Muudetud :timeLength kasutaja :user poolt',
     'meta_owned_name' => 'Kuulub kasutajale :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Viidatud :count objekti poolt|Viidatud :count objekti poolt',
     'entity_select' => 'Objekti valik',
     'entity_select_lack_permission' => 'Sul pole õiguseid selle objekti valimiseks',
     'images' => 'Pildid',
@@ -39,9 +39,9 @@
     'export_pdf' => 'PDF fail',
     'export_text' => 'Tekstifail',
     'export_md' => 'Markdown fail',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Vaikimisi lehe mall',
+    'default_template_explain' => 'Vali lehe mall, mida kasutatakse kõigi selle objekti sees loodud lehtede vaikimisi sisuna. Pea meeles, et seda kasutatakse ainult siis, kui lehe loojal on valitud malli vaatamise õigus.',
+    'default_template_select' => 'Vali mall',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Kustuta mustand',
     'pages_delete_success' => 'Leht kustutatud',
     'pages_delete_draft_success' => 'Mustand kustutatud',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'See leht on valitud raamatu või peatüki lehe malliks. Pärast selle lehe kustutamist ei ole vastavatel raamatutel või peatükkidel enam vaikimisi lehe malli.',
     'pages_delete_confirm' => 'Kas oled kindel, et soovid selle lehe kustutada?',
     'pages_delete_draft_confirm' => 'Kas oled kindel, et soovid selle mustandi kustutada?',
     'pages_editing_named' => 'Lehe :pageName muutmine',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Viited',
     'references_none' => 'Sellele objektile ei ole viiteid.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Allpool on kogu teadaolev sisu süsteemis, mis sellele objektile viitab.',
 
     // Watch Options
     'watch' => 'Jälgi',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 9cda6252119..dd4df205191 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'See e-posti aadress on juba seotud teise kasutajaga.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Etteantud detailidega kasutajakontot ei saadud registreerida',
     'email_already_confirmed' => 'E-posti aadress on juba kinnitatud. Proovi sisse logida.',
     'email_confirmation_invalid' => 'Kinnituslink ei ole kehtiv või on seda juba kasutatud. Proovi uuesti registreeruda.',
     'email_confirmation_expired' => 'Kinnituslink on aegunud. Sulle saadeti aadressi kinnitamiseks uus e-kiri.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Sotsiaalmeedia kontode draiverit ei leitud',
     'social_driver_not_configured' => 'Sinu :socialAccount konto seaded ei ole korrektsed.',
     'invite_token_expired' => 'Link on aegunud. Võid selle asemel proovida oma konto parooli lähtestada.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Selle tegevuse jaoks ei leitud kasutajat.',
 
     // System
     'path_not_writable' => 'Faili asukohaga :filePath ei õnnestunud üles laadida. Veendu, et serveril on kirjutusõigused.',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index e73cde10b62..899fcefa292 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Prügikast on hetkel tühi',
     'recycle_bin_empty' => 'Tühjenda prügikast',
     'recycle_bin_empty_confirm' => 'See kustutab lõplikult kõik objektid prügikastis, kaasa arvatud nende sisu. Kas oled kindel, et soovid prügikasti tühjendada?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'See kustutab lõplikult süsteemist valitud objekti koos loetletud alamobjektidega, ja seda sisu ei ole enam võimalik taastada. Kas oled kindel, et soovid selle objekti kustutada?',
     'recycle_bin_destroy_list' => 'Kustutatavad objektid',
     'recycle_bin_restore_list' => 'Taastatavad objektid',
     'recycle_bin_restore_confirm' => 'See taastab valitud objekti koos kõigi alamobjektidega nende algsesse asukohta. Kui see asukoht on ka vahepeal kustutatud ja on nüüd prügikastis, tuleb ka see taastada.',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => 'Viimane veateade:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Litsentsid',
+    'licenses_desc' => 'See leht koondab litsentsiinfot BookStack\'i ja selles kasutatud projektide ja teekide kohta. Paljusid loetletud teekidest võidakse kasutada ainult arenduse kontekstis.',
+    'licenses_bookstack' => 'BookStack\'i litsents',
+    'licenses_php' => 'PHP teekide litsentsid',
+    'licenses_js' => 'JavaScript teekide litsentsid',
+    'licenses_other' => 'Muud litsentsid',
+    'license_details' => 'Litsentsi detailid',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/eu/auth.php b/lang/eu/auth.php
index d1f37804b6d..35cbafd721b 100644
--- a/lang/eu/auth.php
+++ b/lang/eu/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikazio mugikorra',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Baieztatu eta gaitu',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/fa/auth.php b/lang/fa/auth.php
index f4b30d43892..c0902d4f984 100644
--- a/lang/fa/auth.php
+++ b/lang/fa/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'برنامه ی موبایل',
     'mfa_option_totp_desc' => 'برای استفاده از احراز هویت چند عاملی به یک برنامه موبایلی نیاز دارید که از TOTP پشتیبانی کند، مانند Google Authenticator، Authy یا Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'کدهای پشتیبان',
-    'mfa_option_backup_codes_desc' => 'مجموعه ای از کدهای پشتیبان یکبار مصرف را ایمن ذخیره کنید که می توانید برای تأیید هویت خود وارد کنید.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'تایید و فعال کنید',
     'mfa_gen_backup_codes_title' => 'راه اندازی کدهای پشتیبان',
     'mfa_gen_backup_codes_desc' => 'لیست کدهای زیر را در مکانی امن ذخیره کنید. هنگام دسترسی به سیستم، می توانید از یکی از کدها به عنوان مکانیزم احراز هویت دوم استفاده کنید.',
diff --git a/lang/fi/auth.php b/lang/fi/auth.php
index 40aca069565..580c8679726 100644
--- a/lang/fi/auth.php
+++ b/lang/fi/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobiilisovellus',
     'mfa_option_totp_desc' => 'Jos haluat käyttää monivaiheista tunnistautumista, tarvitset mobiilisovelluksen, joka tukee TOTP:tä, kuten Google Authenticator, Authy tai Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Varmistuskoodit',
-    'mfa_option_backup_codes_desc' => 'Tallenna turvallisesti joukko kertakäyttöisiä varmistuskoodeja, jotka voit syöttää henkilöllisyytesi varmentamiseksi.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Vahvista ja ota käyttöön',
     'mfa_gen_backup_codes_title' => 'Varmistuskoodien asetukset',
     'mfa_gen_backup_codes_desc' => 'Säilytä alla oleva luettelo koodeista turvallisessa paikassa. Kun käytät järjestelmää, voit käyttää yhtä koodeista toisena tunnistautumistapana.',
diff --git a/lang/fr/auth.php b/lang/fr/auth.php
index 32b8c27ec1c..fab11a83bfc 100644
--- a/lang/fr/auth.php
+++ b/lang/fr/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Application mobile',
     'mfa_option_totp_desc' => 'Pour utiliser l\'authentification multi-facteurs, vous aurez besoin d\'une application mobile qui supporte TOTP comme Google Authenticator, Authy ou Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Codes de secours',
-    'mfa_option_backup_codes_desc' => 'Stockez en toute sécurité un jeu de codes de secours que vous pourrez utiliser pour vérifier votre identité.',
+    'mfa_option_backup_codes_desc' => 'Génère un ensemble de codes de sauvegarde à usage unique que vous saisirez lors de la connexion pour vérifier votre identité. Veillez à les conserver dans un endroit sûr.',
     'mfa_gen_confirm_and_enable' => 'Confirmer et activer',
     'mfa_gen_backup_codes_title' => 'Configuration des codes de secours',
     'mfa_gen_backup_codes_desc' => 'Stockez la liste des codes ci-dessous dans un endroit sûr. Lorsque vous accédez au système, vous pourrez utiliser l\'un des codes comme un deuxième mécanisme d\'authentification.',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 7d45c09d836..95434d400e8 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Pilote de compte de réseaux sociaux absent',
     'social_driver_not_configured' => 'Vos préférences pour le compte :socialAccount sont incorrectes.',
     'invite_token_expired' => 'Le lien de cette invitation a expiré. Vous pouvez essayer de réinitialiser votre mot de passe.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Impossible de trouver un utilisateur pour cette action.',
 
     // System
     'path_not_writable' => 'Impossible d\'écrire dans :filePath. Assurez-vous d\'avoir les droits d\'écriture sur le serveur',
diff --git a/lang/he/auth.php b/lang/he/auth.php
index 4e303a2ebbb..0a85bbaf841 100644
--- a/lang/he/auth.php
+++ b/lang/he/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'אפליקציה לנייד',
     'mfa_option_totp_desc' => 'בכדי להשתמש באימות רב-שלבי תצטרך אפליקציית מובייל תומכת TOTP כמו Google Authenticator, Authy או Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'קודי גיבוי',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/hr/auth.php b/lang/hr/auth.php
index f77853c430d..bef07edcdaf 100644
--- a/lang/hr/auth.php
+++ b/lang/hr/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilna Aplikacija',
     'mfa_option_totp_desc' => 'Da biste koristili višestruku provjeru autentičnosti, trebat će vam mobilna aplikacija koja podržava TOTP (Time-Based One-Time Password) kao što su Google Authenticator, Authy ili Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Rezervni Kodovi',
-    'mfa_option_backup_codes_desc' => 'Sigurno pohranite set jednokratnih rezervnih kodova koje možete unijeti kako biste potvrdili svoj identitet.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Potvrdi i Omogući',
     'mfa_gen_backup_codes_title' => 'Postavke Rezervnih Kodova',
     'mfa_gen_backup_codes_desc' => 'Spremite sljedeći popis kodova na sigurno mjesto. Prilikom pristupa sustavu, moći ćete koristiti jedan od ovih kodova kao drugi mehanizam autentifikacije.',
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index 74c4bbd79df..ea3d0cef3f2 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Felhasználó sikeresen eltávolítva',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'létrehozott API token',
     'api_token_create_notification' => 'API token sikeresen létrehozva',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'frissített API token',
     'api_token_update_notification' => 'API token sikeresen frissítve',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'törölt API token',
     'api_token_delete_notification' => 'API token sikeresen törölve',
 
     // Roles
diff --git a/lang/hu/auth.php b/lang/hu/auth.php
index 22c7aedbcf5..dac6065cce2 100644
--- a/lang/hu/auth.php
+++ b/lang/hu/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilalkalmazás',
     'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Visszaállítási kulcsok',
-    'mfa_option_backup_codes_desc' => 'Biztonságosan tárolja el az egyszer használatos visszaállítási kódjait, amiket a későbbiekben fel tud majd használni bejelentkezése során.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Jóváhagyás és engedélyezés',
     'mfa_gen_backup_codes_title' => 'Visszaállítási kódok beállítása',
     'mfa_gen_backup_codes_desc' => 'Tárolja el egy biztonságos helyen az alábbi kódokat. Bejelentkezés során fel tudja használni őket másodlagos bejelentkezési kódként.',
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index 16b5846c00c..b71efec20f2 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Táblázat tulajdonságai',
     'table_properties_title' => 'Táblázat Tulajdonságai',
     'delete_table' => 'Táblázat törlése',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Tábla formázás törlése',
+    'resize_to_contents' => 'Átméretezés a tartalomhoz',
+    'row_header' => 'Sorfejléc',
     'insert_row_before' => 'Sor beszúrása elé',
     'insert_row_after' => 'Sor beszúrása mögé',
     'delete_row' => 'Sor törlése',
@@ -135,7 +135,7 @@
     'cell_border_groove' => 'Horony',
     'cell_border_ridge' => 'Domború',
     'cell_border_inset' => 'Behúzott',
-    'cell_border_outset' => 'Outset',
+    'cell_border_outset' => 'Kiemelés',
     'cell_border_none' => 'Egyik sem',
     'cell_border_hidden' => 'Rejtett',
 
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index a63eb998278..2ef4de8fd49 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -276,7 +276,7 @@
     'pages_pointer_enter_mode' => 'Lépjen be a szakaszválasztó módba',
     'pages_pointer_label' => 'Oldalszakasz beállításai',
     'pages_pointer_permalink' => 'Oldalszakasz állandó hivatkozás',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_include_tag' => 'Oldalszakasz tartalmazza a címkét',
     'pages_pointer_toggle_link' => 'Permalink mód, Nyomja meg az include tag megjelenítéséhez',
     'pages_pointer_toggle_include' => 'Include tag mód, Nyomja meg az permalink megjelenítéséhez',
     'pages_permissions_active' => 'Oldal jogosultságok aktívak',
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index 34e4f2b74a3..cd65bfc8798 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => ':email címmel már létezik felhasználó, de más hitelesítő adatokkal.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'A felhasználói fiók nem regisztrálható a megadott adatokkal',
     'email_already_confirmed' => 'Az email cím már meg van erősítve, meg lehet próbálni a bejelentkezést.',
     'email_confirmation_invalid' => 'A megerősítő vezérjel nem érvényes vagy használva volt. Meg kell próbálni újraregisztrálni.',
     'email_confirmation_expired' => 'A megerősítő vezérjel lejárt. Egy új megerősítő email lett elküldve.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Közösségi meghajtó nem található',
     'social_driver_not_configured' => ':socialAccount közösségi beállítások nem megfelelőek.',
     'invite_token_expired' => 'Ez a meghívó hivatkozás lejárt. Helyette meg lehet próbálni új jelszót megadni a fiókhoz.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'A művelethez nem található felhasználó.',
 
     // System
     'path_not_writable' => ':filePath elérési út nem tölthető fel. Ellenőrizni kell, hogy az útvonal a kiszolgáló számára írható.',
diff --git a/lang/id/activities.php b/lang/id/activities.php
index b8b8bbe87c8..bc20b86ffb2 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -15,7 +15,7 @@
     'page_restore'                => 'halaman telah dipulihkan',
     'page_restore_notification'   => 'Halaman berhasil dipulihkan',
     'page_move'                   => 'halaman dipindahkan',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'Halaman berhasil dipindahkan',
 
     // Chapters
     'chapter_create'              => 'membuat bab',
@@ -25,7 +25,7 @@
     'chapter_delete'              => 'hapus bab',
     'chapter_delete_notification' => 'Bab berhasil dihapus',
     'chapter_move'                => 'bab dipindahkan',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'Bab berhasil dipindahkan',
 
     // Books
     'book_create'                 => 'membuat buku',
@@ -50,31 +50,31 @@
     'bookshelf_delete_notification'    => 'Rak berhasil dihapus',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'revisi yang dipulihkan',
+    'revision_delete' => 'revisi yang dihapus',
+    'revision_delete_notification' => 'Revisi berhasil dihapus',
 
     // Favourites
     'favourite_add_notification' => '":name" telah ditambahkan ke favorit Anda',
     'favourite_remove_notification' => '":name" telah dihapus dari favorit Anda',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Preferensi pantauan berhasil diperbarui',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
+    'auth_login' => 'telah masuk',
+    'auth_register' => 'daftar sebagai user baru',
+    'auth_password_reset_request' => 'permintaan pengguna mengatur ulang kata sandi',
+    'auth_password_reset_update' => 'atur ulang kata sandi pengguna',
+    'mfa_setup_method' => 'metode MFA yang dikonfigurasi',
     'mfa_setup_method_notification' => 'Metode multi-faktor sukses dikonfigurasi',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => 'menghapus metode MFA',
     'mfa_remove_method_notification' => 'Metode multi-faktor sukses dihapus',
 
     // Settings
     'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
-    'maintenance_action_run' => 'ran maintenance action',
+    'settings_update_notification' => 'Pengaturan berhasil diperbarui',
+    'maintenance_action_run' => 'menjalankan tindakan pemeliharaan',
 
     // Webhooks
     'webhook_create' => 'membuat webhook',
@@ -85,20 +85,20 @@
     'webhook_delete_notification' => 'Webhook berhasil dihapus',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
+    'user_create' => 'pengguna yang dibuat',
+    'user_create_notification' => 'Pengguna berhasil dibuat',
+    'user_update' => 'perbarui Pengguna',
     'user_update_notification' => 'Pengguna berhasil diperbarui',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'pengguna yang dihapus',
     'user_delete_notification' => 'Pengguna berhasil dihapus',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'API token yang dibuat',
+    'api_token_create_notification' => 'Token API berhasil dibuat',
+    'api_token_update' => 'token API yang diperbarui',
+    'api_token_update_notification' => 'token API berhasil dirubah',
+    'api_token_delete' => 'token API yang dihapus',
+    'api_token_delete_notification' => 'token API berhasil dihapus ',
 
     // Roles
     'role_create' => 'created role',
diff --git a/lang/id/auth.php b/lang/id/auth.php
index 5d174f6acb4..552742bc6fe 100644
--- a/lang/id/auth.php
+++ b/lang/id/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikasi Seluler',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Kode Cadangan',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/it/auth.php b/lang/it/auth.php
index 00ecf944317..94f1ebd53b0 100644
--- a/lang/it/auth.php
+++ b/lang/it/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'App mobile',
     'mfa_option_totp_desc' => 'Per utilizzare l\'autenticazione multi-fattore avrai bisogno di un\'applicazione mobile che supporti TOTP come Google Authenticator, Authy o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Codici di backup',
-    'mfa_option_backup_codes_desc' => 'Salva in modo sicuro una serie di codici di backup monouso che puoi inserire per verificare la tua identità.',
+    'mfa_option_backup_codes_desc' => 'Genera un insieme di codici di backup monouso che inserirai al login per verificare la tua identità. Assicurati di conservarli in un luogo sicuro e sicuro.',
     'mfa_gen_confirm_and_enable' => 'Conferma e abilita',
     'mfa_gen_backup_codes_title' => 'Configurazione codici di backup',
     'mfa_gen_backup_codes_desc' => 'Conserva l\'elenco di codici qui sotto in un luogo sicuro. Quando accedi al sistema potrai utilizzare uno dei codici come meccanismo di autenticazione secondario.',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index a65ea5e87d4..13c45c15254 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Driver social non trovato',
     'social_driver_not_configured' => 'Le impostazioni di :socialAccount non sono configurate correttamente.',
     'invite_token_expired' => 'Il link di invito è scaduto. Puoi provare a resettare la password del tuo account.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Impossibile trovare un utente per questa azione.',
 
     // System
     'path_not_writable' => 'Il percorso :filePath non è scrivibile. Controlla che abbia i permessi corretti.',
diff --git a/lang/ja/auth.php b/lang/ja/auth.php
index c0c501b729c..09c14a04f6e 100644
--- a/lang/ja/auth.php
+++ b/lang/ja/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'モバイルアプリ',
     'mfa_option_totp_desc' => '多要素認証を使用するには、Google Authenticator、Authy、Microsoft AuthenticatorなどのTOTPをサポートするモバイルアプリケーションが必要です。',
     'mfa_option_backup_codes_title' => 'バックアップコード',
-    'mfa_option_backup_codes_desc' => '本人確認のために入力する、一度しか使えないバックアップコードを安全に保存します。',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => '確認して有効化',
     'mfa_gen_backup_codes_title' => 'バックアップコードの設定',
     'mfa_gen_backup_codes_desc' => '以下のコードのリストを安全な場所に保管してください。システムにアクセスする際、コードのいずれかを第二の認証手段として使用できます。',
diff --git a/lang/ka/auth.php b/lang/ka/auth.php
index dc4b242a09e..57f0cb5c632 100644
--- a/lang/ka/auth.php
+++ b/lang/ka/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index aceac7d8756..7bdcd3c610f 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => '사용자가 삭제되었습니다',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => '생성된 API 토큰',
     'api_token_create_notification' => 'API 토큰이 성공적으로 생성되었습니다.',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => '갱신된 API 토큰',
     'api_token_update_notification' => 'API 토큰이 성공적으로 업데이트되었습니다.',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => '삭제된 API 토큰',
     'api_token_delete_notification' => 'API 토큰이 성공적으로 삭제되었습니다.',
 
     // Roles
diff --git a/lang/ko/auth.php b/lang/ko/auth.php
index a29f9b9ad96..fbf12859f18 100644
--- a/lang/ko/auth.php
+++ b/lang/ko/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => '모바일 앱',
     'mfa_option_totp_desc' => '다중 인증에는 Google Authenticator, Authy나 Microsoft Authenticator와 같은 TOTP 지원 모바일 앱이 필요합니다.',
     'mfa_option_backup_codes_title' => '백업 코드',
-    'mfa_option_backup_codes_desc' => '일회성 백업 코드를 안전한 장소에 보관하세요.',
+    'mfa_option_backup_codes_desc' => '로그인 시 인증에 사용되는 일회용 백업 코드를 만듭니다. 이 백업 코드는 안전한 곳에 보관하세요.',
     'mfa_gen_confirm_and_enable' => '확인 및 활성화',
     'mfa_gen_backup_codes_title' => '백업 코드 설정',
     'mfa_gen_backup_codes_desc' => '코드 목록을 안전한 장소에 보관하세요. 코드 중 하나를 2FA에 쓸 수 있습니다.',
diff --git a/lang/ko/common.php b/lang/ko/common.php
index 95974dad4f4..3a9a94bc8b7 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -20,7 +20,7 @@
     'description' => '설명',
     'role' => '권한',
     'cover_image' => '대표 이미지',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => '이 이미지는 필요에 따라 다양한 시나리오에서 사용자 인터페이스에 맞게 크기가 조정되거나 잘려질 수 있기 때문에 실제 표시되는 크기가 다를 수는 있지만 대략 440x250px 이어야 합니다.',
 
     // Actions
     'actions' => '활동',
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index 0c9a5cfed09..485ab79cd94 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => '테이블 속성',
     'table_properties_title' => '테이블 속성',
     'delete_table' => '테이블 삭제',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => '테이블 형식 지우기',
+    'resize_to_contents' => '내용 크기 조정',
+    'row_header' => '행 머릿글',
     'insert_row_before' => '앞에 행 추가',
     'insert_row_after' => '뒤에 행 추가',
     'delete_row' => '행 삭제',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 09037fac396..5b7d7143a92 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -39,9 +39,9 @@
     'export_pdf' => 'PDF 파일',
     'export_text' => '일반 텍스트 파일',
     'export_md' => '마크다운 파일',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => '기본 페이지 템플릿',
+    'default_template_explain' => '이 항목 내에서 생성되는 모든 페이지의 기본 콘텐츠로 사용할 페이지 템플릿을 지정합니다. 페이지 작성자가 선택한 템플릿 페이지를 볼 수 있는 권한이 있는 경우에만 이 항목이 사용된다는 점을 유의하세요.',
+    'default_template_select' => '템플릿 페이지 선택',
 
     // Permissions and restrictions
     'permissions' => '권한',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => '초안 문서 삭제하기',
     'pages_delete_success' => '문서 지움',
     'pages_delete_draft_success' => '초안 문서 지움',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => '이 페이지는 책의 기본 페이지 템플릿으로 사용 중입니다. 이 페이지가 삭제되면 해당하는 책에 더 이상 기본 페이지 템플릿이 적용되지 않습니다.',
     'pages_delete_confirm' => '이 문서를 지울 건가요?',
     'pages_delete_draft_confirm' => '이 초안을 지울 건가요?',
     'pages_editing_named' => ':pageName 수정',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index bcfdf876cb6..074cec83b8b 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => '이메일 :email 이 이미 존재하지만 다른 자격 증명을 가진 사용자입니다.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => '제공된 세부 정보로 사용자 계정을 등록할 수 없습니다',
     'email_already_confirmed' => '이메일이 이미 확인되었으니 로그인해 보세요.',
     'email_confirmation_invalid' => '이 확인 토큰이 유효하지 않거나 이미 사용되었습니다. 다시 등록해 주세요.',
     'email_confirmation_expired' => '확인 토큰이 만료되었습니다. 새 확인 이메일이 전송되었습니다.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => '소셜 드라이버를 찾을 수 없습니다.',
     'social_driver_not_configured' => '소셜 계정 :socialAccount 가(이) 올바르게 구성되지 않았습니다.',
     'invite_token_expired' => '이 초대 링크가 만료되었습니다. 대신 계정 비밀번호 재설정을 시도해 보세요.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => '이 동작의 사용자를 찾을 수 없습니다.',
 
     // System
     'path_not_writable' => '파일 경로 :filePath 에 업로드할 수 없습니다. 서버에 저장이 가능한지 확인하세요.',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index d52e5064f9c..817791dc0d0 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => '휴지통이 비었습니다.',
     'recycle_bin_empty' => '비우기',
     'recycle_bin_empty_confirm' => '휴지통을 비울 건가요?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => '이 작업을 수행하면 이 항목이 아래에 나열된 모든 하위 요소와 함께 시스템에서 영구적으로 삭제되며, 복원할 수 없습니다. 이 항목을 영구 삭제하시겠어요?',
     'recycle_bin_destroy_list' => '영구 삭제함',
     'recycle_bin_restore_list' => '복원함',
     'recycle_bin_restore_confirm' => '원래 위치로 복원합니다. 원래 위치의 부모 항목이 지워졌을 경우 부모 항목도 복원해야 합니다.',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => '마지막 에러 메시지:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => '라이선스',
+    'licenses_desc' => '이 페이지에서는 BookStack 내에서 사용되는 프로젝트 및 라이브러리 외에 BookStack 라이선스 정보를 자세히 설명합니다. 나열된 프로젝트는 개발 용도로만 사용할 수 있습니다.',
+    'licenses_bookstack' => 'BookStack 라이선스',
+    'licenses_php' => 'PHP 라이브러리 라이선스',
+    'licenses_js' => 'JavaScript 라이브러리 라이선스',
+    'licenses_other' => '기타 라이선스',
+    'license_details' => '라이선스 세부 사항',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/lt/auth.php b/lang/lt/auth.php
index 02e64e25035..a2f7f466846 100644
--- a/lang/lt/auth.php
+++ b/lang/lt/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/lv/auth.php b/lang/lv/auth.php
index d13d93012eb..1b84480f250 100644
--- a/lang/lv/auth.php
+++ b/lang/lv/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilā aplikācija',
     'mfa_option_totp_desc' => 'Lai lietotu vairākfaktoru autentifikāciju, jums būs nepieciešama mobilā aplikācija, kas atbalsta TOTP, piemēram, Google Authenticator, Authy vai Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Rezerves kodi',
-    'mfa_option_backup_codes_desc' => 'Droši noglabājiet vienreizlietojamu rezerves kodu komplektu, ko varēsiet izmantot, lai verificētu savu identitāti.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Apstiprināt un ieslēgt',
     'mfa_gen_backup_codes_title' => 'Rezerves kodu iestatījumi',
     'mfa_gen_backup_codes_desc' => 'Noglabājiet zemāk esošo kodu sarakstu drošā vietā. Kad piekļūsiet sistēmai, jūs varēsiet izmantot vienu no kodiem kā papildus autentifikācijas mehānismu.',
diff --git a/lang/nb/auth.php b/lang/nb/auth.php
index 1db179b5f37..cdb2f19be30 100644
--- a/lang/nb/auth.php
+++ b/lang/nb/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapplikasjon',
     'mfa_option_totp_desc' => 'For å bruke flerfaktorautentisering trenger du en mobilapplikasjon som støtter TOTP-teknologien, slik som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Sikkerhetskoder',
-    'mfa_option_backup_codes_desc' => 'Lagre sikkerhetskoder til engangsbruk på et trygt sted, disse kan du bruke for å verifisere identiteten din.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Bekreft og aktiver',
     'mfa_gen_backup_codes_title' => 'Konfigurasjon av sikkerhetskoder',
     'mfa_gen_backup_codes_desc' => 'Lagre nedeforstående liste med koder på et trygt sted. Når du skal ha tilgang til systemet kan du bruke en av disse som en faktor under innlogging.',
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index e3ff59cd6c2..8caa1dd1915 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobiele app',
     'mfa_option_totp_desc' => 'Om meervoudige verificatie te gebruiken heb je een mobiele applicatie nodig die TOTP ondersteunt, zoals Google Authenticator, Authy of Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Back-up Codes',
-    'mfa_option_backup_codes_desc' => 'Bewaar veilig een set eenmalige back-upcodes die je kunt invoeren om je identiteit te verifiëren.',
+    'mfa_option_backup_codes_desc' => 'Genereert een set met eenmalige back-upcodes die je kan invoeren om je identiteit te bevestigen. Bewaar deze op een veilige plaats.',
     'mfa_gen_confirm_and_enable' => 'Bevestigen en inschakelen',
     'mfa_gen_backup_codes_title' => 'Back-up codes instellen',
     'mfa_gen_backup_codes_desc' => 'Bewaar de onderstaande lijst met codes op een veilige plaats. Bij toegang tot het systeem kun je een van de codes gebruiken als tweede verificatiemechanisme.',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 7f854662574..58647b66d77 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Social driver niet gevonden',
     'social_driver_not_configured' => 'Je :socialAccount instellingen zijn niet correct geconfigureerd.',
     'invite_token_expired' => 'Deze uitnodigingslink is verlopen. Je kunt in plaats daarvan proberen je wachtwoord opnieuw in te stellen.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Er is geen gebruiker gevonden voor deze actie.',
 
     // System
     'path_not_writable' => 'Bestandspad :filePath kon niet naar geüpload worden. Zorg dat je schrijfrechten op de server hebt.',
diff --git a/lang/nn/auth.php b/lang/nn/auth.php
index a6ae5917aec..04546da1dc4 100644
--- a/lang/nn/auth.php
+++ b/lang/nn/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapplikasjon',
     'mfa_option_totp_desc' => 'For å bruka fleirfaktorautentisering treng du ein mobilapplikasjon som støttar TOTP-teknologien, slik som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Tryggleikskodar',
-    'mfa_option_backup_codes_desc' => 'Lagre tryggleiksskodar til eingongsbruk på ein trygg stad, desse kan du bruka for å verifisera identiteten din.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Stadfest og aktiver',
     'mfa_gen_backup_codes_title' => 'Konfigurasjon av tryggleikskodar',
     'mfa_gen_backup_codes_desc' => 'Lagre lista under med kodar på ein trygg stad. Når du skal ha tilgang til systemet kan du bruka ein av desse som ein faktor under innlogging.',
diff --git a/lang/pl/auth.php b/lang/pl/auth.php
index 00cce1a2cc5..e56e8ab43f1 100644
--- a/lang/pl/auth.php
+++ b/lang/pl/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikacja mobilna',
     'mfa_option_totp_desc' => 'Aby korzystać z uwierzytelniania wieloskładnikowego, potrzebujesz aplikacji mobilnej, która obsługuje TOTP, takiej jak Google Authenticator, Authy lub Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Kody zapasowe',
-    'mfa_option_backup_codes_desc' => 'Bezpiecznie przechowuj zestaw jednorazowych kodów zapasowych, które możesz wprowadzić, aby zweryfikować swoją tożsamość.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Potwierdź i włącz',
     'mfa_gen_backup_codes_title' => 'Ustawienia kopii zapasowych kodów',
     'mfa_gen_backup_codes_desc' => 'Przechowuj poniższą listę kodów w bezpiecznym miejscu. Przy dostępie do systemu będziesz mógł użyć jednego z kodów jako drugiego mechanizmu uwierzytelniania.',
diff --git a/lang/pt/auth.php b/lang/pt/auth.php
index a21eb701b3f..81956161d19 100644
--- a/lang/pt/auth.php
+++ b/lang/pt/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicação móvel',
     'mfa_option_totp_desc' => 'Para usar a autenticação multi-fator, você precisa de uma aplicação móvel que suporte TOTP como o Autenticador do Google, Authy ou o autenticador Microsoft.',
     'mfa_option_backup_codes_title' => 'Códigos de Backup',
-    'mfa_option_backup_codes_desc' => 'Armazene com segurança um conjunto de códigos de backup únicos que você pode inserir para verificar sua identidade.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirmar e ativar',
     'mfa_gen_backup_codes_title' => 'Configuração dos Códigos de Backup',
     'mfa_gen_backup_codes_desc' => 'Armazene a lista de códigos abaixo em um lugar seguro. Ao acessar o sistema você poderá usar um dos códigos como um segundo mecanismo de autenticação.',
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 93b4d91e6fd..d2b963244da 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Usuário removido com sucesso',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'token de API criado',
     'api_token_create_notification' => 'Token de API criado com sucesso',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'token de API atualizado',
     'api_token_update_notification' => 'Token de API atualizado com sucesso',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'token de API excluído',
     'api_token_delete_notification' => 'Token de API excluído com sucesso',
 
     // Roles
diff --git a/lang/pt_BR/auth.php b/lang/pt_BR/auth.php
index 71d8b73a2b3..b5fd974aa20 100644
--- a/lang/pt_BR/auth.php
+++ b/lang/pt_BR/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicativo Móvel',
     'mfa_option_totp_desc' => 'Para usar a autenticação multi-fator, você precisará de um aplicativo móvel que suporte TOTP como o Google Authenticator, Authy ou o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Códigos de backup',
-    'mfa_option_backup_codes_desc' => 'Armazene com segurança um conjunto de códigos de backup únicos que você pode inserir para verificar sua identidade.',
+    'mfa_option_backup_codes_desc' => 'Gera um conjunto de códigos de backup de uso único que você inserirá no login para verificar sua identidade. Certifique-se de armazená-los em um local seguro e protegido.',
     'mfa_gen_confirm_and_enable' => 'Confirmar e habilitar',
     'mfa_gen_backup_codes_title' => 'Configuração dos Códigos de Backup',
     'mfa_gen_backup_codes_desc' => 'Armazene a lista de códigos abaixo em um lugar seguro. Ao acessar o sistema você poderá usar um dos códigos como segundo mecanismo de autenticação.',
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 3bc23623b4b..88bb6de249f 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descrição',
     'role' => 'Cargo',
     'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Esta imagem deve ter aproximadamente 440x250px, embora seja dimensionada e cortada de forma flexível para se ajustar à interface do usuário em diferentes cenários, conforme necessário, portanto, as dimensões reais para exibição serão diferentes.',
 
     // Actions
     'actions' => 'Ações',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index d89117885ca..c54d9eed938 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Propriedades da tabela',
     'table_properties_title' => 'Propriedades da Tabela',
     'delete_table' => 'Excluir Tabela',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Limpar formatação de tabela',
+    'resize_to_contents' => 'Redimensionar para o conteúdo',
+    'row_header' => 'Cabeçalho da linha',
     'insert_row_before' => 'Inserir linha antes',
     'insert_row_after' => 'Inserir linha depois',
     'delete_row' => 'Excluir linha',
@@ -165,7 +165,7 @@
     'editor_license' => 'Licença do Editor e Direitos Autorais',
     'editor_tiny_license' => 'Este editor é construído usando :tinyLink que é fornecido sob a licença MIT.',
     'editor_tiny_license_link' => 'Os dados relativos aos direitos de autor e à licença do TinyMCE podem ser encontrados aqui.',
-    'save_continue' => 'Salvar e continuar',
+    'save_continue' => 'Salvar Página e Continuar',
     'callouts_cycle' => '(Continue pressionando para alternar através de tipos)',
     'link_selector' => 'Link para conteúdo',
     'shortcuts' => 'Atalhos',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index f57784f9fe6..8946e851cba 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Um usuário com o e-mail :email já existe mas com credenciais diferentes.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'A conta do usuário não pôde ser registrada com os detalhes fornecidos',
     'email_already_confirmed' => 'E-mail já foi confirmado. Tente efetuar o login.',
     'email_confirmation_invalid' => 'Esse token de confirmação não é válido ou já foi utilizado. Por favor, tente cadastrar-se novamente.',
     'email_confirmation_expired' => 'O token de confirmação já expirou. Um novo e-mail foi enviado.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Social driver não encontrado',
     'social_driver_not_configured' => 'Seus parâmetros socials de :socialAccount não estão configurados corretamente.',
     'invite_token_expired' => 'Esse link de convite expirou. Alternativamente, você pode tentar redefinir a senha da sua conta.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Não foi possível encontrar um usuário para esta ação.',
 
     // System
     'path_not_writable' => 'O caminho de destino (:filePath) de upload de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 1107855a61a..3e5341e4193 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'A lixeira está vazia',
     'recycle_bin_empty' => 'Esvaziar Lixeira',
     'recycle_bin_empty_confirm' => 'Isso irá destruir permanentemente todos os itens na lixeira inclusive o conteúdo de cada item. Tem certeza de que quer esvaziar a lixeira?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Esta ação excluirá permanentemente este item do sistema, juntamente com quaisquer elementos secundários listados abaixo, e você não poderá restaurar este conteúdo. Tem certeza de que deseja excluir permanentemente este item?',
     'recycle_bin_destroy_list' => 'Itens a serem Destruídos',
     'recycle_bin_restore_list' => 'Itens a serem restaurados',
     'recycle_bin_restore_confirm' => 'Esta ação irá restaurar o item excluído, inclusive quaisquer elementos filhos, para seu local original. Se a localização original tiver, entretanto, sido eliminada e estiver agora na lixeira, o item pai também precisará ser restaurado.',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => 'Última mensagem de erro:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Licenças',
+    'licenses_desc' => 'Esta página detalha informações da licença do BookStack, além dos projetos e bibliotecas usadas no BookStack. Muitos projectos listados só podem ser utilizados num contexto de desenvolvimento.',
+    'licenses_bookstack' => 'Licença do BookStack',
+    'licenses_php' => 'Licenças de Bibliotecas PHP',
+    'licenses_js' => 'Licenças de Bibliotecas JavaScript',
+    'licenses_other' => 'Outras licenças',
+    'license_details' => 'Detalhes da Licença',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ro/auth.php b/lang/ro/auth.php
index 7f461bc7a8f..e02eeb4c1ba 100644
--- a/lang/ro/auth.php
+++ b/lang/ro/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicație mobilă',
     'mfa_option_totp_desc' => 'Pentru a utiliza autentificarea multifactor, vei avea nevoie de o aplicație mobilă care acceptă TOTP, cum ar fi Google Authenticator, Authy sau Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Coduri de rezervă',
-    'mfa_option_backup_codes_desc' => 'Stochează în siguranță un set de coduri de rezervă de unică folosință pe care le poți introduce pentru verificarea identității.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirmă și activează',
     'mfa_gen_backup_codes_title' => 'Configurarea codurilor de rezervă',
     'mfa_gen_backup_codes_desc' => 'Păstrează lista de coduri de mai jos într-un loc sigur. Când accesezi sistemul, vei putea folosi unul dintre coduri ca un al doilea mecanism de autentificare.',
diff --git a/lang/ru/auth.php b/lang/ru/auth.php
index b50d67a9226..62e1911e6c0 100644
--- a/lang/ru/auth.php
+++ b/lang/ru/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Мобильное приложение',
     'mfa_option_totp_desc' => 'Для использования многофакторной аутентификации вам понадобится мобильное приложение, поддерживающее TOTP, например Google Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервные коды',
-    'mfa_option_backup_codes_desc' => 'Безопасно хранить набор одноразовых резервных кодов, которые вы можете ввести для проверки вашей личности.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Подтвердить и включить',
     'mfa_gen_backup_codes_title' => 'Настройка резервных кодов',
     'mfa_gen_backup_codes_desc' => 'Сохраните приведенный ниже список кодов в безопасном месте. При доступе к системе вы сможете использовать один из кодов в качестве второго механизма аутентификации.',
diff --git a/lang/sk/auth.php b/lang/sk/auth.php
index 084de678e2a..11ccdc8893f 100644
--- a/lang/sk/auth.php
+++ b/lang/sk/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilná aplikácia',
     'mfa_option_totp_desc' => 'Pre používanie viacúrovňového prihlasovania budete potrebovať mobilnú aplikáciu, ktorá podporuje TOPS ako napríklad Google Authenticator, Authy alebo Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Záložné kódy',
-    'mfa_option_backup_codes_desc' => 'Bezpečne uložte jednorázové záložné kódy pre overenie vačej identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Potvrdiť a zapnúť',
     'mfa_gen_backup_codes_title' => 'Nastavenie záložných kódov',
     'mfa_gen_backup_codes_desc' => 'Uložte si tieto kódy na bezpečné miesto. Jeden z kódov budete môcť použiť ako druhý faktor overenia identiy na prihlásenie sa.',
diff --git a/lang/sl/auth.php b/lang/sl/auth.php
index ed7b5d4a050..47b70df7f22 100644
--- a/lang/sl/auth.php
+++ b/lang/sl/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/sq/auth.php b/lang/sq/auth.php
index 344ef767e16..e3259a9618f 100644
--- a/lang/sq/auth.php
+++ b/lang/sq/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Codes',
-    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
diff --git a/lang/sr/auth.php b/lang/sr/auth.php
index aae292a3073..c98cb0fe4a4 100644
--- a/lang/sr/auth.php
+++ b/lang/sr/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikacije za mobilne uređaje',
     'mfa_option_totp_desc' => 'Да бисте користили вишефакторску аутентификацију, биће вам потребна мобилна апликација која подржава ТОТП, као што јеGoogle Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервни кодови',
-    'mfa_option_backup_codes_desc' => 'Безбедно чувајте скуп резервних кодова за једнократну употребу које можете да унесете да бисте потврдили свој идентитет.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Потврдите и омогућите',
     'mfa_gen_backup_codes_title' => 'Подешавање резервних кодова',
     'mfa_gen_backup_codes_desc' => 'Чувајте доњу листу кодова на безбедном месту. Када приступате систему, моћи ћете да користите један од кодова као други механизам за аутентификацију.',
diff --git a/lang/sv/auth.php b/lang/sv/auth.php
index e77f4c6696d..813200c36f5 100644
--- a/lang/sv/auth.php
+++ b/lang/sv/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapp',
     'mfa_option_totp_desc' => 'För att använda multifaktorautentisering behöver du en mobil app som stöder TOTP så som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Reservkoder',
-    'mfa_option_backup_codes_desc' => 'Lagra säkert en uppsättning engångsreservkoder som du kan ange för att verifiera din identitet.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Bekräfta och aktivera',
     'mfa_gen_backup_codes_title' => 'Konfiguration av reservkoder',
     'mfa_gen_backup_codes_desc' => 'Spara nedanstående koder på en säker plats. När du använder systemet kommer du att kunna använda en av koderna som en andra autentiseringsmekanism.',
diff --git a/lang/tr/auth.php b/lang/tr/auth.php
index 50f4f60a955..c9663f21e00 100644
--- a/lang/tr/auth.php
+++ b/lang/tr/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobil Uygulama',
     'mfa_option_totp_desc' => 'Çok aşamalı kimlik doğrulamayı kullanabilmek için Google Authenticator, Authy veya Microsoft Authenticator gibi TOTP destekleyen bir mobil uygulamaya ihtiyacınız olacaktır.',
     'mfa_option_backup_codes_title' => 'Yedekleme Kodları',
-    'mfa_option_backup_codes_desc' => 'Kimliğini doğrulamak için kullanabileceğin aşağıdaki tek kullanımlık yedek kodlarını güvenli bir yerde sakla.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Onayla ve aktive et',
     'mfa_gen_backup_codes_title' => 'Yedekleme Kodları Kurulumu',
     'mfa_gen_backup_codes_desc' => 'Aşağıdaki kod listesini güvenli bir yerde sakla. Sisteme giriş yaparken kodlardan birini ikinci bir kimlik doğrulama mekanizması olarak kullanabileceksin.',
diff --git a/lang/uk/auth.php b/lang/uk/auth.php
index 649c6e8df7d..412f9c03fed 100644
--- a/lang/uk/auth.php
+++ b/lang/uk/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Мобільний додаток',
     'mfa_option_totp_desc' => 'Для використання багатофакторної автентифікації вам потрібен мобільний додаток, який підтримує TOTP такі як Google Authenticator, Authy або Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервні коди',
-    'mfa_option_backup_codes_desc' => 'Безпечно зберігайте набір резервних кодів з використанням одноразового використання, які можна увійти, щоб підтвердити свою особу.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Підтвердити та увімкнути',
     'mfa_gen_backup_codes_title' => 'Налаштування резервних кодів',
     'mfa_gen_backup_codes_desc' => 'Зберігайте список кодів в безпечному місці. Для доступу до системи ви зможете використовувати один з кодів як другий механізм аутентифікації.',
diff --git a/lang/uz/auth.php b/lang/uz/auth.php
index 18236a8fba6..1a22f0f1d33 100644
--- a/lang/uz/auth.php
+++ b/lang/uz/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobil ilova',
     'mfa_option_totp_desc' => 'Ko‘p faktorli autentifikatsiyadan foydalanish uchun sizga Google Authenticator, Authy yoki Microsoft Authenticator kabi OTPni qo‘llab-quvvatlaydigan mobil ilova kerak bo‘ladi.',
     'mfa_option_backup_codes_title' => 'Zaxira kodlari',
-    'mfa_option_backup_codes_desc' => 'Shaxsingizni tasdiqlash uchun kiritishingiz mumkin bo‘lgan bir martalik zaxira kodlari to‘plamini xavfsiz saqlang.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Tasdiqlash va yoqish',
     'mfa_gen_backup_codes_title' => 'Zaxira kodlarini sozlash',
     'mfa_gen_backup_codes_desc' => 'Quyidagi kodlar ro‘yxatini xavfsiz joyda saqlang. Tizimga kirishda siz kodlardan birini ikkinchi autentifikatsiya mexanizmi sifatida ishlatishingiz mumkin.',
diff --git a/lang/vi/auth.php b/lang/vi/auth.php
index 78624f22266..a13b8993e6d 100644
--- a/lang/vi/auth.php
+++ b/lang/vi/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Ứng dụng di động',
     'mfa_option_totp_desc' => 'Để sử dụng xác thực đa lớp bạn cần ưng dụng trên điện thoại có hỗ trợ TOTP như Google Authenticator, Authy hoặc Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Mã dự phòng',
-    'mfa_option_backup_codes_desc' => 'Bảo mật việc lưu trữ mã dự phòng dùng một lần mà bạn có thể sử dụng để xác định danh tính của mình.',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Xác nhận và Mở',
     'mfa_gen_backup_codes_title' => 'Cài đặt Mã dự phòng',
     'mfa_gen_backup_codes_desc' => 'Lưu trữ các mã dưới đây ở một nơi an toàn. Khi truy cập vào hệ thống bạn sẽ có thể sử dụng được một trong các đoạn mã đó như là một phương thức xác thực dự phòng.',
diff --git a/lang/zh_CN/auth.php b/lang/zh_CN/auth.php
index d6dcd621933..811d2aecc20 100644
--- a/lang/zh_CN/auth.php
+++ b/lang/zh_CN/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => '移动设备 App',
     'mfa_option_totp_desc' => '要使用多重身份认证功能，您需要一个支持 TOTP（基于时间的一次性密码算法） 的移动设备 App，如谷歌身份验证器（Google Authenticator）、Authy 或微软身份验证器（Microsoft Authenticator）。',
     'mfa_option_backup_codes_title' => '备用认证码',
-    'mfa_option_backup_codes_desc' => '请安全地保存这些一次性使用的备用认证码，您可以输入这些认证码来验证您的身份。',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => '确认并启用',
     'mfa_gen_backup_codes_title' => '备用认证码设置',
     'mfa_gen_backup_codes_desc' => '将下面的认证码存放在一个安全的地方。访问系统时，您可以使用其中的一个验证码进行二次认证。',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index 0a0318381f0..b0f90611fa4 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => '未找到社交驱动程序',
     'social_driver_not_configured' => '您的:socialAccount社交设置不正确。',
     'invite_token_expired' => '此邀请链接已过期。 您可以尝试重置您的账户密码。',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => '找不到执行此操作的用户。',
 
     // System
     'path_not_writable' => '无法上传到文件路径“:filePath”，请确保它可写入服务器。',
diff --git a/lang/zh_TW/auth.php b/lang/zh_TW/auth.php
index 7a3d8031d47..0e7b7f0f543 100644
--- a/lang/zh_TW/auth.php
+++ b/lang/zh_TW/auth.php
@@ -7,7 +7,7 @@
 return [
 
     'failed' => '使用者名稱或密碼錯誤。',
-    'throttle' => '您的登入次數過多，請在:seconds秒後重試。',
+    'throttle' => '您的登入次數過多，請在 :seconds 秒後重試。',
 
     // Login & Register
     'sign_up' => '註冊',
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => '手機App',
     'mfa_option_totp_desc' => '您必須在行動裝置上安裝了支援TOTP的身份驗證程式（例如Google Authenticator, Authy 或是 Microsoft Authenticator）才能使用雙重身份驗證。',
     'mfa_option_backup_codes_title' => '備用驗證碼',
-    'mfa_option_backup_codes_desc' => '妥善保存好您的一次性備用驗證碼，以便日後驗證您的身份。',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => '確認並啟用',
     'mfa_gen_backup_codes_title' => '備援代碼設定',
     'mfa_gen_backup_codes_desc' => '將以下代碼列表儲存在安全的地方。存取系統時，您可以使用其中一個代碼作為第二個身份驗證機制。',
diff --git a/lang/zh_TW/components.php b/lang/zh_TW/components.php
index 682a8ed4d8c..84bfad4562d 100644
--- a/lang/zh_TW/components.php
+++ b/lang/zh_TW/components.php
@@ -17,9 +17,9 @@
     'image_page_title' => '檢視上傳到此頁面的圖片',
     'image_search_hint' => '以圖片名稱搜尋',
     'image_uploaded' => '上傳於 :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => '由 :username 上傳',
+    'image_uploaded_to' => '上傳到 :pageLink',
+    'image_updated' => ':updateDate 更新',
     'image_load_more' => '載入更多',
     'image_image_name' => '圖片名稱',
     'image_delete_used' => '此圖片用於以下頁面。',
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index cd023cd61c9..c4a351f9b6c 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -146,21 +146,21 @@
     'paste_embed' => 'Paste your embed code below:',
     'url' => '網址',
     'text_to_display' => 'Text to display',
-    'title' => 'Title',
+    'title' => '標題',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
     'open_link_new' => 'New window',
-    'remove_link' => 'Remove link',
+    'remove_link' => '移除連結',
     'insert_collapsible' => 'Insert collapsible block',
     'collapsible_unwrap' => 'Unwrap',
     'edit_label' => '編輯標記',
     'toggle_open_closed' => 'Toggle open/closed',
     'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'toggle_label' => '切換標籤',
 
     // About view
-    'about' => 'About the editor',
+    'about' => '關於編輯器',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
@@ -168,10 +168,10 @@
     'save_continue' => 'Save Page & Continue',
     'callouts_cycle' => '(Keep pressing to toggle through types)',
     'link_selector' => 'Link to content',
-    'shortcuts' => 'Shortcuts',
-    'shortcut' => 'Shortcut',
+    'shortcuts' => '快捷鍵',
+    'shortcut' => '快捷鍵',
     'shortcuts_intro' => 'The following shortcuts are available in the editor:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
-    'description' => 'Description',
+    'description' => '說明',
 ];
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 44f6e475416..e8309d6a59a 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -414,7 +414,7 @@
     // Watch Options
     'watch' => '追蹤',
     'watch_title_default' => '預設偏好設定',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_desc_default' => '還原成預設的通知設定',
     'watch_title_ignore' => 'Ignore',
     'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
     'watch_title_new' => 'New Pages',
@@ -427,9 +427,9 @@
     'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
     'watch_change_default' => 'Change default notification preferences',
     'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_new' => '追蹤新頁面',
+    'watch_detail_updates' => '追蹤新頁面與異動',
+    'watch_detail_comments' => '追蹤新頁面、自動與評論',
     'watch_detail_parent_book' => 'Watching via parent book',
     'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
     'watch_detail_parent_chapter' => 'Watching via parent chapter',

From 11a7ccc37e6ff62b7d666d89ae80f5f4a3ebea99 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 10 Jun 2024 10:31:35 +0100
Subject: [PATCH 162/666] SAML: Set static type to pass static checks

Not totally clear if underlying code can actually return null, but
playing it safe to remain as-is for now for patch release.
---
 app/Access/Saml2Service.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Access/Saml2Service.php b/app/Access/Saml2Service.php
index 664b77aba45..bb7e9b572e2 100644
--- a/app/Access/Saml2Service.php
+++ b/app/Access/Saml2Service.php
@@ -133,6 +133,7 @@ public function processSlsResponse(?string $requestId): string
         // value so that the exact encoding format is matched when checking the signature.
         // This is primarily due to ADFS encoding query params with lowercase percent encoding while
         // PHP (And most other sensible providers) standardise on uppercase.
+        /** @var ?string $samlRedirect */
         $samlRedirect = $toolkit->processSLO(true, $requestId, true, null, true);
         $errors = $toolkit->getErrors();
 

From c096b20d9c5473fa4fafd6a8cbaa852bdbef4601 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 10 Jun 2024 11:42:37 +0100
Subject: [PATCH 163/666] Updated translator & dependency attribution before
 release v24.05.2

---
 .github/translators.txt                | 4 ++++
 dev/licensing/php-library-licenses.txt | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 8667e5f0bdb..f77b560fe71 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -425,3 +425,7 @@ Timo B (lommes) :: German Informal
 Erik Lundstedt (Erik.Lundstedt) :: Swedish
 yngams (younessmouhid) :: Arabic
 Ohadp :: Hebrew
+cbridi :: Portuguese, Brazilian
+nanangsb :: Indonesian
+Michal Melich (michalmelich) :: Czech
+David (david-prv) :: German
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 045d64670f5..a2d172e12c5 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -357,9 +357,9 @@ Link: https://github.com/nunomaduro/termwind.git
 onelogin/php-saml
 License: MIT
 License File: vendor/onelogin/php-saml/LICENSE
-Copyright: Copyright (c) 2010-2016 OneLogin, Inc.
-Source: https://github.com/onelogin/php-saml.git
-Link: https://developers.onelogin.com/saml/php
+Copyright: Copyright (c) 2010-2022 OneLogin, Inc.
+Source: https://github.com/SAML-Toolkits/php-saml.git
+Link: https://github.com/SAML-Toolkits/php-saml
 -----------
 paragonie/constant_time_encoding
 License: MIT

From e889bc680b9ff5399a6a3e9fc3c89cd7127d4af2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 12 Jun 2024 14:01:36 +0100
Subject: [PATCH 164/666] Lexical: Added view/edit source code
 button/form/action

---
 resources/js/wysiwyg/actions.ts               | 26 +++++++++++++++++++
 resources/js/wysiwyg/index.ts                 | 12 +++------
 .../wysiwyg/ui/defaults/button-definitions.ts | 12 +++++++++
 .../wysiwyg/ui/defaults/form-definitions.ts   | 16 ++++++++++++
 resources/js/wysiwyg/ui/framework/forms.ts    |  6 +++--
 resources/js/wysiwyg/ui/index.ts              |  8 ++++--
 resources/js/wysiwyg/ui/toolbars.ts           |  4 ++-
 7 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 resources/js/wysiwyg/actions.ts

diff --git a/resources/js/wysiwyg/actions.ts b/resources/js/wysiwyg/actions.ts
new file mode 100644
index 00000000000..bca31e51b7a
--- /dev/null
+++ b/resources/js/wysiwyg/actions.ts
@@ -0,0 +1,26 @@
+import {$getRoot, LexicalEditor} from "lexical";
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from "@lexical/html";
+
+
+export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
+    const parser = new DOMParser();
+    const dom = parser.parseFromString(html, 'text/html');
+
+    editor.update(() => {
+        const nodes = $generateNodesFromDOM(editor, dom);
+        const root = $getRoot();
+        for (const child of root.getChildren()) {
+            child.remove(true);
+        }
+        root.append(...nodes);
+    });
+}
+
+export function getEditorContentAsHtml(editor: LexicalEditor): Promise<string> {
+    return new Promise((resolve, reject) => {
+        editor.getEditorState().read(() => {
+            const html = $generateHtmlFromNodes(editor);
+            resolve(html);
+        });
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 0dcbf27f550..41207b706f4 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,10 +1,10 @@
-import {$getRoot, createEditor, CreateEditorArgs} from 'lexical';
+import {createEditor, CreateEditorArgs} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
-import {$generateNodesFromDOM} from '@lexical/html';
 import {getNodesForPageEditor} from './nodes';
 import {buildEditorUI} from "./ui";
+import {setEditorContentFromHtml} from "./actions";
 
 export function createPageEditorInstance(editArea: HTMLElement) {
     const config: CreateEditorArgs = {
@@ -14,8 +14,6 @@ export function createPageEditorInstance(editArea: HTMLElement) {
     };
 
     const startingHtml = editArea.innerHTML;
-    const parser = new DOMParser();
-    const dom = parser.parseFromString(startingHtml, 'text/html');
 
     const editor = createEditor(config);
     editor.setRootElement(editArea);
@@ -25,11 +23,7 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         registerHistory(editor, createEmptyHistoryState(), 300),
     );
 
-    editor.update(() => {
-        const startingNodes = $generateNodesFromDOM(editor, dom);
-        const root = $getRoot();
-        root.append(...startingNodes);
-    });
+    setEditorContentFromHtml(editor, startingHtml);
 
     const debugView = document.getElementById('lexical-debug');
     editor.registerUpdateListener(({editorState}) => {
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index e549e69a2d7..077bcae21f6 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -28,6 +28,7 @@ import {EditorUiContext} from "../framework/core";
 import {$isImageNode, ImageNode} from "../../nodes/image";
 import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
+import {getEditorContentAsHtml} from "../../actions";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -230,3 +231,14 @@ export const details: EditorButtonDefinition = {
     }
 }
 
+export const source: EditorButtonDefinition = {
+    label: 'Source code',
+    async action(context: EditorUiContext) {
+        const modal = context.manager.createModal('source');
+        const source = await getEditorContentAsHtml(context.editor);
+        modal.show({source});
+    },
+    isActive() {
+        return false;
+    }
+};
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index 13e7a9c9fc6..04147a4f057 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -3,6 +3,7 @@ import {EditorUiContext} from "../framework/core";
 import {$createLinkNode} from "@lexical/link";
 import {$createTextNode, $getSelection} from "lexical";
 import {$createImageNode} from "../../nodes/image";
+import {setEditorContentFromHtml} from "../../actions";
 
 
 export const link: EditorFormDefinition = {
@@ -86,4 +87,19 @@ export const image: EditorFormDefinition = {
             type: 'text',
         },
     ],
+};
+
+export const source: EditorFormDefinition = {
+    submitText: 'Save',
+    action(formData, context: EditorUiContext) {
+        setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
+        return true;
+    },
+    fields: [
+        {
+            label: 'Source',
+            name: 'source',
+            type: 'textarea',
+        },
+    ],
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index c6338f79849..a7fcb45ba6c 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -5,7 +5,7 @@ import {el} from "../../helpers";
 export interface EditorFormFieldDefinition {
     label: string;
     name: string;
-    type: 'text' | 'select';
+    type: 'text' | 'select' | 'textarea';
 }
 
 export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefinition {
@@ -28,7 +28,7 @@ export class EditorFormField extends EditorUiElement {
     }
 
     setValue(value: string) {
-        const input = this.getDOMElement().querySelector('input,select') as HTMLInputElement;
+        const input = this.getDOMElement().querySelector('input,select,textarea') as HTMLInputElement;
         input.value = value;
     }
 
@@ -45,6 +45,8 @@ export class EditorFormField extends EditorUiElement {
             const labels = Object.keys(options);
             const optionElems = labels.map(label => el('option', {value: options[label]}, [label]));
             input = el('select', {id, name: this.definition.name, class: 'editor-form-field-input'}, optionElems);
+        } else if (this.definition.type === 'textarea') {
+            input = el('textarea', {id, name: this.definition.name, class: 'editor-form-field-input'});
         } else {
             input = el('input', {id, name: this.definition.name, class: 'editor-form-field-input'});
         }
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 8227dec6838..b2fd7e05a13 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,7 +6,7 @@ import {
 } from "lexical";
 import {getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {image as imageFormDefinition, link as linkFormDefinition} from "./defaults/form-definitions";
+import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorDecoratorAdapter} from "./framework/decorator";
@@ -36,7 +36,11 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     manager.registerModal('image', {
         title: 'Insert/Edit Image',
         form: imageFormDefinition
-    })
+    });
+    manager.registerModal('source', {
+        title: 'Source code',
+        form: sourceFormDefinition,
+    });
 
     // Register decorator listener
     // Maybe move to manager?
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index b5d151fc116..63ff8a05397 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -4,7 +4,7 @@ import {
     dangerCallout, details,
     h2, h3, h4, h5, image,
     infoCallout, italic, link, paragraph,
-    redo, strikethrough, subscript,
+    redo, source, strikethrough, subscript,
     successCallout, superscript, underline,
     undo,
     warningCallout
@@ -42,5 +42,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(link),
         new EditorButton(image),
         new EditorButton(details),
+
+        new EditorButton(source),
     ]);
 }
\ No newline at end of file

From a475cf68bf7670c4cbf76758f5ead4c129586f13 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 12 Jun 2024 14:24:50 +0100
Subject: [PATCH 165/666] Lexical: Added clear formatting button

---
 .../wysiwyg/ui/defaults/button-definitions.ts | 19 +++++++++++++++++--
 resources/js/wysiwyg/ui/toolbars.ts           |  8 +++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 077bcae21f6..2e7cc6821e5 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -2,7 +2,7 @@ import {EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
     $createParagraphNode, $getRoot, $getSelection, $insertNodes,
-    $isParagraphNode, $setSelection,
+    $isParagraphNode, $isTextNode, $setSelection,
     BaseSelection, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
     REDO_COMMAND, TextFormatType,
@@ -137,7 +137,22 @@ export const strikethrough: EditorButtonDefinition = buildFormatButton('Striketh
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
 export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
 export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code');
-// Todo - Clear formatting
+export const clearFormating: EditorButtonDefinition = {
+    label: 'Clear formatting',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            for (const node of selection?.getNodes() || []) {
+                if ($isTextNode(node)) {
+                    node.setFormat(0);
+                }
+            }
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
 
 
 export const link: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 63ff8a05397..33726661739 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,6 +1,6 @@
 import {EditorButton, FormatPreviewButton} from "./framework/buttons";
 import {
-    blockquote, bold, code,
+    blockquote, bold, clearFormating, code,
     dangerCallout, details,
     h2, h3, h4, h5, image,
     infoCallout, italic, link, paragraph,
@@ -15,9 +15,11 @@ import {el} from "../helpers";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
+        // History state
         new EditorButton(undo),
         new EditorButton(redo),
 
+        // Block formats
         new EditorFormatMenu([
             new FormatPreviewButton(el('h2'), h2),
             new FormatPreviewButton(el('h3'), h3),
@@ -31,6 +33,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new FormatPreviewButton(el('p', {class: 'callout danger'}), dangerCallout),
         ]),
 
+        // Inline formats
         new EditorButton(bold),
         new EditorButton(italic),
         new EditorButton(underline),
@@ -38,11 +41,14 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(superscript),
         new EditorButton(subscript),
         new EditorButton(code),
+        new EditorButton(clearFormating),
 
+        // Insert types
         new EditorButton(link),
         new EditorButton(image),
         new EditorButton(details),
 
+        // Meta elements
         new EditorButton(source),
     ]);
 }
\ No newline at end of file

From 9e43e03db4fbbb95f0219124162c9318c9c31531 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 12 Jun 2024 19:51:42 +0100
Subject: [PATCH 166/666] Lexical: Added color picker controls

---
 .../wysiwyg/ui/defaults/button-definitions.ts |  11 +-
 .../ui/framework/blocks/color-picker.ts       |  90 ++++++++++++++
 .../ui/framework/blocks/dropdown-button.ts    |  51 ++++++++
 .../ui/framework/blocks/format-menu.ts        |  47 ++++++++
 .../framework/blocks/format-preview-button.ts |  47 ++++++++
 resources/js/wysiwyg/ui/framework/buttons.ts  |  50 +-------
 .../js/wysiwyg/ui/framework/containers.ts     | 113 ------------------
 resources/js/wysiwyg/ui/framework/core.ts     |  49 +++++++-
 resources/js/wysiwyg/ui/framework/forms.ts    |   3 +-
 .../wysiwyg/ui/framework/helpers/dropdowns.ts |  34 ++++++
 resources/js/wysiwyg/ui/framework/manager.ts  |   9 +-
 resources/js/wysiwyg/ui/framework/modals.ts   |   2 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  18 ++-
 resources/sass/_editor.scss                   |  16 +++
 14 files changed, 367 insertions(+), 173 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
 delete mode 100644 resources/js/wysiwyg/ui/framework/containers.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts

diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 2e7cc6821e5..d8c7f515cca 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,11 +1,11 @@
-import {EditorButtonDefinition} from "../framework/buttons";
+import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
     $createParagraphNode, $getRoot, $getSelection, $insertNodes,
     $isParagraphNode, $isTextNode, $setSelection,
     BaseSelection, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
-    REDO_COMMAND, TextFormatType,
+    REDO_COMMAND, TextFormatType, TextNode,
     UNDO_COMMAND
 } from "lexical";
 import {
@@ -131,8 +131,9 @@ function buildFormatButton(label: string, format: TextFormatType): EditorButtonD
 export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold');
 export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic');
 export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline');
-// Todo - Text color
-// Todo - Highlight color
+export const textColor: EditorBasicButtonDefinition = {label: 'Text color'};
+export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color'};
+
 export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough');
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
 export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
@@ -256,4 +257,4 @@ export const source: EditorButtonDefinition = {
     isActive() {
         return false;
     }
-};
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
new file mode 100644
index 00000000000..6972d7a8e44
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -0,0 +1,90 @@
+import {el} from "../../../helpers";
+import {EditorUiElement} from "../core";
+import {$getSelection} from "lexical";
+import {$patchStyleText} from "@lexical/selection";
+
+const colorChoices = [
+    '#000000',
+    '#ffffff',
+
+    '#BFEDD2',
+    '#FBEEB8',
+    '#F8CAC6',
+    '#ECCAFA',
+    '#C2E0F4',
+
+    '#2DC26B',
+    '#F1C40F',
+    '#E03E2D',
+    '#B96AD9',
+    '#3598DB',
+
+    '#169179',
+    '#E67E23',
+    '#BA372A',
+    '#843FA1',
+    '#236FA1',
+
+    '#ECF0F1',
+    '#CED4D9',
+    '#95A5A6',
+    '#7E8C8D',
+    '#34495E',
+];
+
+export class EditorColorPicker extends EditorUiElement {
+
+    protected styleProperty: string;
+
+    constructor(styleProperty: string) {
+        super();
+        this.styleProperty = styleProperty;
+    }
+
+    buildDOM(): HTMLElement {
+
+        const colorOptions = colorChoices.map(choice => {
+            return el('div', {
+                class: 'editor-color-select-option',
+                style: `background-color: ${choice}`,
+                'data-color': choice,
+                'aria-label': choice,
+            });
+        });
+
+        colorOptions.push(el('div', {
+            class: 'editor-color-select-option',
+            'data-color': '',
+            title: 'Clear color',
+        }, ['x']));
+
+        const colorRows = [];
+        for (let i = 0; i < colorOptions.length; i+=5) {
+            const options = colorOptions.slice(i, i + 5);
+            colorRows.push(el('div', {
+                class: 'editor-color-select-row',
+            }, options));
+        }
+
+        const wrapper = el('div', {
+            class: 'editor-color-select',
+        }, colorRows);
+
+        wrapper.addEventListener('click', this.onClick.bind(this));
+
+        return wrapper;
+    }
+
+    onClick(event: MouseEvent) {
+        const colorEl = (event.target as HTMLElement).closest('[data-color]') as HTMLElement;
+        if (!colorEl) return;
+
+        const color = colorEl.dataset.color as string;
+        this.getContext().editor.update(() => {
+            const selection = $getSelection();
+            if (selection) {
+                $patchStyleText(selection, {[this.styleProperty]: color || null});
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
new file mode 100644
index 00000000000..199c7728d8a
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -0,0 +1,51 @@
+import {el} from "../../../helpers";
+import {handleDropdown} from "../helpers/dropdowns";
+import {EditorContainerUiElement, EditorUiElement} from "../core";
+import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
+
+export class EditorDropdownButton extends EditorContainerUiElement {
+    protected button: EditorButton;
+    protected childItems: EditorUiElement[];
+    protected open: boolean = false;
+
+    constructor(buttonDefinition: EditorBasicButtonDefinition, children: EditorUiElement[]) {
+        super(children);
+        this.childItems = children
+
+        this.button = new EditorButton({
+            ...buttonDefinition,
+            action() {
+                return false;
+            },
+            isActive: () => {
+                return this.open;
+            }
+        });
+
+        this.children.push(this.button);
+    }
+
+    protected buildDOM(): HTMLElement {
+        const button = this.button.getDOMElement();
+
+        const childElements: HTMLElement[] = this.childItems.map(child => child.getDOMElement());
+        const menu = el('div', {
+            class: 'editor-dropdown-menu',
+            hidden: 'true',
+        }, childElements);
+
+        const wrapper = el('div', {
+            class: 'editor-dropdown-menu-container',
+        }, [button, menu]);
+
+        handleDropdown(button, menu, () => {
+            this.open = true;
+            this.getContext().manager.triggerStateUpdate(this.button);
+        }, () => {
+            this.open = false;
+            this.getContext().manager.triggerStateUpdate(this.button);
+        });
+
+        return wrapper;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
new file mode 100644
index 00000000000..bcd61e45cd3
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
@@ -0,0 +1,47 @@
+import {el} from "../../../helpers";
+import {EditorUiStateUpdate, EditorContainerUiElement} from "../core";
+import {EditorButton} from "../buttons";
+import {handleDropdown} from "../helpers/dropdowns";
+
+export class EditorFormatMenu extends EditorContainerUiElement {
+    buildDOM(): HTMLElement {
+        const childElements: HTMLElement[] = this.getChildren().map(child => child.getDOMElement());
+        const menu = el('div', {
+            class: 'editor-format-menu-dropdown editor-dropdown-menu editor-menu-list',
+            hidden: 'true',
+        }, childElements);
+
+        const toggle = el('button', {
+            class: 'editor-format-menu-toggle editor-button',
+            type: 'button',
+        }, [this.trans('Formats')]);
+
+        const wrapper = el('div', {
+            class: 'editor-format-menu editor-dropdown-menu-container',
+        }, [toggle, menu]);
+
+        handleDropdown(toggle, menu);
+
+        return wrapper;
+    }
+
+    updateState(state: EditorUiStateUpdate) {
+        super.updateState(state);
+
+        for (const child of this.children) {
+            if (child instanceof EditorButton && child.isActive()) {
+                this.updateToggleLabel(child.getLabel());
+                return;
+            }
+        }
+
+        this.updateToggleLabel(this.trans('Formats'));
+    }
+
+    protected updateToggleLabel(text: string): void {
+        const button = this.getDOMElement().querySelector('button');
+        if (button) {
+            button.innerText = text;
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts b/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
new file mode 100644
index 00000000000..f83035aa6bd
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
@@ -0,0 +1,47 @@
+import {el} from "../../../helpers";
+import {EditorButton, EditorButtonDefinition} from "../buttons";
+
+export class FormatPreviewButton extends EditorButton {
+    protected previewSampleElement: HTMLElement;
+
+    constructor(previewSampleElement: HTMLElement,definition: EditorButtonDefinition) {
+        super(definition);
+        this.previewSampleElement = previewSampleElement;
+    }
+
+    protected buildDOM(): HTMLButtonElement {
+        const button = super.buildDOM();
+        button.innerHTML = '';
+
+        const preview = el('span', {
+            class: 'editor-button-format-preview'
+        }, [this.getLabel()]);
+
+        const stylesToApply = this.getStylesFromPreview();
+        for (const style of Object.keys(stylesToApply)) {
+            preview.style.setProperty(style, stylesToApply[style]);
+        }
+
+        button.append(preview);
+        return button;
+    }
+
+    protected getStylesFromPreview(): Record<string, string> {
+        const wrap = el('div', {style: 'display: none', hidden: 'true', class: 'page-content'});
+        const sampleClone = this.previewSampleElement.cloneNode() as HTMLElement;
+        sampleClone.textContent = this.getLabel();
+        wrap.append(sampleClone);
+        document.body.append(wrap);
+
+        const propertiesToFetch = ['color', 'font-size', 'background-color', 'border-inline-start'];
+        const propertiesToReturn: Record<string, string> = {};
+
+        const computed = window.getComputedStyle(sampleClone);
+        for (const property of propertiesToFetch) {
+            propertiesToReturn[property] = computed.getPropertyValue(property);
+        }
+        wrap.remove();
+
+        return propertiesToReturn;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 367a3933063..c3ba533b325 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -2,8 +2,11 @@ import {BaseSelection} from "lexical";
 import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {el} from "../../helpers";
 
-export interface EditorButtonDefinition {
+export interface EditorBasicButtonDefinition {
     label: string;
+}
+
+export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
     action: (context: EditorUiContext) => void;
     isActive: (selection: BaseSelection|null) => boolean;
 }
@@ -49,48 +52,3 @@ export class EditorButton extends EditorUiElement {
         return this.trans(this.definition.label);
     }
 }
-
-export class FormatPreviewButton extends EditorButton {
-    protected previewSampleElement: HTMLElement;
-
-    constructor(previewSampleElement: HTMLElement,definition: EditorButtonDefinition) {
-        super(definition);
-        this.previewSampleElement = previewSampleElement;
-    }
-
-    protected buildDOM(): HTMLButtonElement {
-        const button = super.buildDOM();
-        button.innerHTML = '';
-
-        const preview = el('span', {
-            class: 'editor-button-format-preview'
-        }, [this.getLabel()]);
-
-        const stylesToApply = this.getStylesFromPreview();
-        for (const style of Object.keys(stylesToApply)) {
-            preview.style.setProperty(style, stylesToApply[style]);
-        }
-
-        button.append(preview);
-        return button;
-    }
-
-    protected getStylesFromPreview(): Record<string, string> {
-        const wrap = el('div', {style: 'display: none', hidden: 'true', class: 'page-content'});
-        const sampleClone = this.previewSampleElement.cloneNode() as HTMLElement;
-        sampleClone.textContent = this.getLabel();
-        wrap.append(sampleClone);
-        document.body.append(wrap);
-
-        const propertiesToFetch = ['color', 'font-size', 'background-color', 'border-inline-start'];
-        const propertiesToReturn: Record<string, string> = {};
-
-        const computed = window.getComputedStyle(sampleClone);
-        for (const property of propertiesToFetch) {
-            propertiesToReturn[property] = computed.getPropertyValue(property);
-        }
-        wrap.remove();
-
-        return propertiesToReturn;
-    }
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/containers.ts b/resources/js/wysiwyg/ui/framework/containers.ts
deleted file mode 100644
index ed191a88205..00000000000
--- a/resources/js/wysiwyg/ui/framework/containers.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
-import {el} from "../../helpers";
-import {EditorButton} from "./buttons";
-
-export class EditorContainerUiElement extends EditorUiElement {
-    protected children : EditorUiElement[];
-
-    constructor(children: EditorUiElement[]) {
-        super();
-        this.children = children;
-    }
-
-    protected buildDOM(): HTMLElement {
-        return el('div', {}, this.getChildren().map(child => child.getDOMElement()));
-    }
-
-    getChildren(): EditorUiElement[] {
-        return this.children;
-    }
-
-    updateState(state: EditorUiStateUpdate): void {
-        for (const child of this.children) {
-            child.updateState(state);
-        }
-    }
-
-    setContext(context: EditorUiContext) {
-        super.setContext(context);
-        for (const child of this.getChildren()) {
-            child.setContext(context);
-        }
-    }
-}
-
-export class EditorSimpleClassContainer extends EditorContainerUiElement {
-    protected className;
-
-    constructor(className: string, children: EditorUiElement[]) {
-        super(children);
-        this.className = className;
-    }
-
-    protected buildDOM(): HTMLElement {
-        return el('div', {
-            class: this.className,
-        }, this.getChildren().map(child => child.getDOMElement()));
-    }
-}
-
-export class EditorFormatMenu extends EditorContainerUiElement {
-    buildDOM(): HTMLElement {
-        const childElements: HTMLElement[] = this.getChildren().map(child => child.getDOMElement());
-        const menu = el('div', {
-            class: 'editor-format-menu-dropdown editor-dropdown-menu editor-menu-list',
-            hidden: 'true',
-        }, childElements);
-
-        const toggle = el('button', {
-            class: 'editor-format-menu-toggle editor-button',
-            type: 'button',
-        }, [this.trans('Formats')]);
-
-        const wrapper = el('div', {
-            class: 'editor-format-menu editor-dropdown-menu-container',
-        }, [toggle, menu]);
-
-        let clickListener: Function|null = null;
-
-        const hide = () => {
-            menu.hidden = true;
-            if (clickListener) {
-                window.removeEventListener('click', clickListener as EventListener);
-            }
-        };
-
-        const show = () => {
-            menu.hidden = false
-            clickListener = (event: MouseEvent) => {
-                if (!wrapper.contains(event.target as HTMLElement)) {
-                    hide();
-                }
-            }
-            window.addEventListener('click', clickListener as EventListener);
-        };
-
-        toggle.addEventListener('click', event => {
-            menu.hasAttribute('hidden') ? show() : hide();
-        });
-        menu.addEventListener('mouseleave', hide);
-
-        return wrapper;
-    }
-
-    updateState(state: EditorUiStateUpdate) {
-        super.updateState(state);
-
-        for (const child of this.children) {
-            if (child instanceof EditorButton && child.isActive()) {
-                this.updateToggleLabel(child.getLabel());
-                return;
-            }
-        }
-
-        this.updateToggleLabel(this.trans('Formats'));
-    }
-
-    protected updateToggleLabel(text: string): void {
-        const button = this.getDOMElement().querySelector('button');
-        if (button) {
-            button.innerText = text;
-        }
-    }
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 2fdadcb40c9..d437b36bd09 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -1,5 +1,6 @@
 import {BaseSelection, LexicalEditor} from "lexical";
 import {EditorUIManager} from "./manager";
+import {el} from "../../helpers";
 
 export type EditorUiStateUpdate = {
     editor: LexicalEditor,
@@ -46,4 +47,50 @@ export abstract class EditorUiElement {
     updateState(state: EditorUiStateUpdate): void {
         return;
     }
-}
\ No newline at end of file
+}
+
+export class EditorContainerUiElement extends EditorUiElement {
+    protected children : EditorUiElement[];
+
+    constructor(children: EditorUiElement[]) {
+        super();
+        this.children = children;
+    }
+
+    protected buildDOM(): HTMLElement {
+        return el('div', {}, this.getChildren().map(child => child.getDOMElement()));
+    }
+
+    getChildren(): EditorUiElement[] {
+        return this.children;
+    }
+
+    updateState(state: EditorUiStateUpdate): void {
+        for (const child of this.children) {
+            child.updateState(state);
+        }
+    }
+
+    setContext(context: EditorUiContext) {
+        super.setContext(context);
+        for (const child of this.getChildren()) {
+            child.setContext(context);
+        }
+    }
+}
+
+export class EditorSimpleClassContainer extends EditorContainerUiElement {
+    protected className;
+
+    constructor(className: string, children: EditorUiElement[]) {
+        super(children);
+        this.className = className;
+    }
+
+    protected buildDOM(): HTMLElement {
+        return el('div', {
+            class: this.className,
+        }, this.getChildren().map(child => child.getDOMElement()));
+    }
+}
+
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index a7fcb45ba6c..4fee787d354 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -1,5 +1,4 @@
-import {EditorUiContext, EditorUiElement} from "./core";
-import {EditorContainerUiElement} from "./containers";
+import {EditorUiContext, EditorUiElement, EditorContainerUiElement} from "./core";
 import {el} from "../../helpers";
 
 export interface EditorFormFieldDefinition {
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
new file mode 100644
index 00000000000..35886d2f922
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -0,0 +1,34 @@
+
+
+
+export function handleDropdown(toggle: HTMLElement, menu: HTMLElement, onOpen: Function|undefined = undefined, onClose: Function|undefined = undefined) {
+    let clickListener: Function|null = null;
+
+    const hide = () => {
+        menu.hidden = true;
+        if (clickListener) {
+            window.removeEventListener('click', clickListener as EventListener);
+        }
+        if (onClose) {
+            onClose();
+        }
+    };
+
+    const show = () => {
+        menu.hidden = false
+        clickListener = (event: MouseEvent) => {
+            if (!toggle.contains(event.target as HTMLElement) && !menu.contains(event.target as HTMLElement)) {
+                hide();
+            }
+        }
+        window.addEventListener('click', clickListener as EventListener);
+        if (onOpen) {
+            onOpen();
+        }
+    };
+
+    toggle.addEventListener('click', event => {
+        menu.hasAttribute('hidden') ? show() : hide();
+    });
+    menu.addEventListener('mouseleave', hide);
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 1684b662813..78ddc8ce3d6 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,5 +1,5 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
-import {EditorUiContext} from "./core";
+import {EditorUiContext, EditorUiElement} from "./core";
 import {EditorDecorator} from "./decorator";
 
 
@@ -22,6 +22,13 @@ export class EditorUIManager {
         return this.context;
     }
 
+    triggerStateUpdate(element: EditorUiElement) {
+        element.updateState({
+            selection: null,
+            editor: this.getContext().editor
+        });
+    }
+
     registerModal(key: string, modalDefinition: EditorFormModalDefinition) {
         this.modalDefinitionsByKey[key] = modalDefinition;
     }
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index e2a6b3f33eb..bfc5fc619bf 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -1,6 +1,6 @@
 import {EditorForm, EditorFormDefinition} from "./forms";
 import {el} from "../../helpers";
-import {EditorContainerUiElement} from "./containers";
+import {EditorContainerUiElement} from "./core";
 
 
 export interface EditorModalDefinition {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 33726661739..de90a1d70b3 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,16 +1,20 @@
-import {EditorButton, FormatPreviewButton} from "./framework/buttons";
+import {EditorButton} from "./framework/buttons";
 import {
     blockquote, bold, clearFormating, code,
     dangerCallout, details,
-    h2, h3, h4, h5, image,
+    h2, h3, h4, h5, highlightColor, image,
     infoCallout, italic, link, paragraph,
     redo, source, strikethrough, subscript,
-    successCallout, superscript, underline,
+    successCallout, superscript, textColor, underline,
     undo,
     warningCallout
 } from "./defaults/button-definitions";
-import {EditorContainerUiElement, EditorFormatMenu, EditorSimpleClassContainer} from "./framework/containers";
+import {EditorContainerUiElement, EditorSimpleClassContainer} from "./framework/core";
 import {el} from "../helpers";
+import {EditorFormatMenu} from "./framework/blocks/format-menu";
+import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
+import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
+import {EditorColorPicker} from "./framework/blocks/color-picker";
 
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
@@ -37,6 +41,12 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(bold),
         new EditorButton(italic),
         new EditorButton(underline),
+        new EditorDropdownButton(textColor, [
+            new EditorColorPicker('color'),
+        ]),
+        new EditorDropdownButton(highlightColor, [
+            new EditorColorPicker('background-color'),
+        ]),
         new EditorButton(strikethrough),
         new EditorButton(superscript),
         new EditorButton(subscript),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 87cc70c9bf3..b98e624bdf3 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -79,6 +79,22 @@
   font-weight: 700;
 }
 
+// Specific UI elements
+.editor-color-select-row {
+  display: flex;
+}
+.editor-color-select-option {
+  width: 28px;
+  height: 28px;
+  cursor: pointer;
+}
+.editor-color-select-option:hover {
+  border-radius: 3px;
+  box-sizing: border-box;
+  z-index: 3;
+  box-shadow: 0 0 4px 1px rgba(0, 0, 0, 0.25);
+}
+
 // In-editor elements
 .editor-image-wrap {
   position: relative;

From b81f2b52d0956138c8862dc6a01f54ad3de1a336 Mon Sep 17 00:00:00 2001
From: Stefan Mueller <mueller@contria.com>
Date: Thu, 13 Jun 2024 12:41:05 +0200
Subject: [PATCH 167/666] Add ALLOWED_IFRAME_SOURCES to phpunit.xml

Fix for bug #5068
test_frame_src_csp_header_set fails, when .env-file has
customized ALLOWED_IFRAME_SOURCES
---
 phpunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml b/phpunit.xml
index 21f17685b5b..b72c6e5f13e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,6 +13,7 @@
     <server name="APP_AUTO_LANG_PUBLIC" value="true"/>
     <server name="APP_URL" value="http://bookstack.dev"/>
     <server name="ALLOWED_IFRAME_HOSTS" value=""/>
+    <server name="ALLOWED_IFRAME_SOURCES" value="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"/>
     <server name="ALLOWED_SSR_HOSTS" value="*"/>
     <server name="CACHE_DRIVER" value="array"/>
     <server name="SESSION_DRIVER" value="array"/>

From e30aae33997b89c3e84a3903edee8be197fff0e3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 13 Jun 2024 16:46:39 +0100
Subject: [PATCH 168/666] Sponsors: Added Schroeck IT Consulting

---
 readme.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 11bf2c8886f..c67fcb81435 100644
--- a/readme.md
+++ b/readme.md
@@ -71,9 +71,12 @@ Big thanks to these companies for supporting the project.
 </a></td>
 </tr>
 <tr>
-<td colspan="2" align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
+<td align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
     <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/netways.png" alt="NETWAYS Web Services">
 </a></td>
+<td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
+    <img width="200" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
+</a></td>
 </tr></tbody></table>
 
 ## 🛣️ Road Map

From e2409a5fab3e38e1753adb51ff432b6104c7572b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 19 Jun 2024 16:14:20 +0100
Subject: [PATCH 169/666] Lexical: Added basic list button/support

---
 package-lock.json                             |  1 +
 package.json                                  |  1 +
 resources/js/wysiwyg/nodes/index.ts           |  3 ++
 .../wysiwyg/ui/defaults/button-definitions.ts | 33 ++++++++++++++++---
 resources/js/wysiwyg/ui/toolbars.ts           | 11 +++++--
 resources/sass/_editor.scss                   |  1 +
 6 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2cddccb5900..0757e786873 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "@lexical/history": "^0.15.0",
         "@lexical/html": "^0.15.0",
         "@lexical/link": "^0.15.0",
+        "@lexical/list": "^0.15.0",
         "@lexical/rich-text": "^0.15.0",
         "@lexical/selection": "^0.15.0",
         "@lexical/utils": "^0.15.0",
diff --git a/package.json b/package.json
index d9fa89c186a..732bb175980 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "@lexical/history": "^0.15.0",
     "@lexical/html": "^0.15.0",
     "@lexical/link": "^0.15.0",
+    "@lexical/list": "^0.15.0",
     "@lexical/rich-text": "^0.15.0",
     "@lexical/selection": "^0.15.0",
     "@lexical/utils": "^0.15.0",
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index f47575bc5f6..03fcd33a5b3 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -5,6 +5,7 @@ import {CustomParagraphNode} from "./custom-paragraph";
 import {LinkNode} from "@lexical/link";
 import {ImageNode} from "./image";
 import {DetailsNode, SummaryNode} from "./details";
+import {ListItemNode, ListNode} from "@lexical/list";
 
 /**
  * Load the nodes for lexical.
@@ -14,6 +15,8 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CalloutNode, // Todo - Create custom
         HeadingNode, // Todo - Create custom
         QuoteNode, // Todo - Create custom
+        ListNode, // Todo - Create custom
+        ListItemNode,
         ImageNode,
         DetailsNode, SummaryNode,
         CustomParagraphNode,
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index d8c7f515cca..57460ef60ed 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,11 +1,11 @@
 import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
-    $createParagraphNode, $getRoot, $getSelection, $insertNodes,
+    $createParagraphNode, $getRoot, $getSelection,
     $isParagraphNode, $isTextNode, $setSelection,
     BaseSelection, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
-    REDO_COMMAND, TextFormatType, TextNode,
+    REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
 } from "lexical";
 import {
@@ -23,12 +23,12 @@ import {
     HeadingNode,
     HeadingTagType
 } from "@lexical/rich-text";
-import {$isLinkNode, $toggleLink, LinkNode} from "@lexical/link";
+import {$isLinkNode, LinkNode} from "@lexical/link";
 import {EditorUiContext} from "../framework/core";
 import {$isImageNode, ImageNode} from "../../nodes/image";
 import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
-import {$insertNodeToNearestRoot} from "@lexical/utils";
 import {getEditorContentAsHtml} from "../../actions";
+import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -155,6 +155,31 @@ export const clearFormating: EditorButtonDefinition = {
     }
 };
 
+function buildListButton(label: string, type: ListType): EditorButtonDefinition {
+    return {
+        label,
+        action(context: EditorUiContext) {
+            context.editor.getEditorState().read(() => {
+                const selection = $getSelection();
+                if (this.isActive(selection)) {
+                    removeList(context.editor);
+                } else {
+                    insertList(context.editor, type);
+                }
+            });
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
+                return $isListNode(node) && (node as ListNode).getListType() === type;
+            });
+        }
+    };
+}
+
+export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet');
+export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number');
+export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check');
+
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index de90a1d70b3..fe19b94ed7a 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,11 +1,11 @@
 import {EditorButton} from "./framework/buttons";
 import {
-    blockquote, bold, clearFormating, code,
+    blockquote, bold, bulletList, clearFormating, code,
     dangerCallout, details,
     h2, h3, h4, h5, highlightColor, image,
-    infoCallout, italic, link, paragraph,
+    infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
-    successCallout, superscript, textColor, underline,
+    successCallout, superscript, taskList, textColor, underline,
     undo,
     warningCallout
 } from "./defaults/button-definitions";
@@ -53,6 +53,11 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(code),
         new EditorButton(clearFormating),
 
+        // Lists
+        new EditorButton(bulletList),
+        new EditorButton(numberList),
+        new EditorButton(taskList),
+
         // Insert types
         new EditorButton(link),
         new EditorButton(image),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index b98e624bdf3..13d8e96f98b 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -6,6 +6,7 @@
 // Main UI elements
 .editor-toolbar-main {
   display: flex;
+  flex-wrap: wrap;
 }
 
 // Buttons

From 13d970c7ce0bf9b88c3553b561cef11cbba0e71a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 19 Jun 2024 20:00:29 +0100
Subject: [PATCH 170/666] Lexical: Added button icon system

With a bunch of default icons
---
 dev/build/esbuild.js                          |  7 +++
 resources/icons/editor/align-center.svg       |  1 +
 resources/icons/editor/align-justify.svg      |  1 +
 resources/icons/editor/align-left.svg         |  1 +
 resources/icons/editor/align-right.svg        |  1 +
 resources/icons/editor/bold.svg               |  1 +
 resources/icons/editor/code-block.svg         |  1 +
 resources/icons/editor/code.svg               |  1 +
 resources/icons/editor/details.svg            |  1 +
 resources/icons/editor/format-clear.svg       |  1 +
 resources/icons/editor/help.svg               |  1 +
 resources/icons/editor/horizontal-rule.svg    |  1 +
 resources/icons/editor/image.svg              |  1 +
 resources/icons/editor/indent-decrease.svg    |  1 +
 resources/icons/editor/indent-increase.svg    |  1 +
 resources/icons/editor/italic.svg             |  1 +
 resources/icons/editor/link.svg               |  1 +
 resources/icons/editor/list-bullet.svg        |  1 +
 resources/icons/editor/list-check.svg         |  1 +
 resources/icons/editor/list-numbered.svg      |  1 +
 resources/icons/editor/redo.svg               |  1 +
 resources/icons/editor/source-view.svg        |  1 +
 resources/icons/editor/strikethrough.svg      |  1 +
 resources/icons/editor/subscript.svg          |  1 +
 resources/icons/editor/superscript.svg        |  1 +
 resources/icons/editor/underlined.svg         |  1 +
 resources/icons/editor/undo.svg               |  1 +
 resources/js/global.d.ts                      |  4 ++
 resources/js/wysiwyg/helpers.ts               |  6 ++-
 .../wysiwyg/ui/defaults/button-definitions.ts | 50 ++++++++++++++-----
 resources/js/wysiwyg/ui/framework/buttons.ts  | 12 ++++-
 resources/js/wysiwyg/ui/toolbars.ts           |  1 +
 resources/sass/_editor.scss                   |  5 ++
 tsconfig.json                                 |  4 +-
 34 files changed, 99 insertions(+), 16 deletions(-)
 create mode 100644 resources/icons/editor/align-center.svg
 create mode 100644 resources/icons/editor/align-justify.svg
 create mode 100644 resources/icons/editor/align-left.svg
 create mode 100644 resources/icons/editor/align-right.svg
 create mode 100644 resources/icons/editor/bold.svg
 create mode 100644 resources/icons/editor/code-block.svg
 create mode 100644 resources/icons/editor/code.svg
 create mode 100644 resources/icons/editor/details.svg
 create mode 100644 resources/icons/editor/format-clear.svg
 create mode 100644 resources/icons/editor/help.svg
 create mode 100644 resources/icons/editor/horizontal-rule.svg
 create mode 100644 resources/icons/editor/image.svg
 create mode 100644 resources/icons/editor/indent-decrease.svg
 create mode 100644 resources/icons/editor/indent-increase.svg
 create mode 100644 resources/icons/editor/italic.svg
 create mode 100644 resources/icons/editor/link.svg
 create mode 100644 resources/icons/editor/list-bullet.svg
 create mode 100644 resources/icons/editor/list-check.svg
 create mode 100644 resources/icons/editor/list-numbered.svg
 create mode 100644 resources/icons/editor/redo.svg
 create mode 100644 resources/icons/editor/source-view.svg
 create mode 100644 resources/icons/editor/strikethrough.svg
 create mode 100644 resources/icons/editor/subscript.svg
 create mode 100644 resources/icons/editor/superscript.svg
 create mode 100644 resources/icons/editor/underlined.svg
 create mode 100644 resources/icons/editor/undo.svg
 create mode 100644 resources/js/global.d.ts

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index 7f180fc0741..0680f4ac3da 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -32,6 +32,13 @@ esbuild.build({
     format: 'esm',
     minify: isProd,
     logLevel: 'info',
+    loader: {
+        '.svg': 'text',
+    },
+    absWorkingDir: path.join(__dirname, '../..'),
+    alias: {
+        '@icons': './resources/icons',
+    },
     banner: {
         js: '// See the "/licenses" URI for full package license details',
         css: '/* See the "/licenses" URI for full package license details */',
diff --git a/resources/icons/editor/align-center.svg b/resources/icons/editor/align-center.svg
new file mode 100644
index 00000000000..495ae000cc3
--- /dev/null
+++ b/resources/icons/editor/align-center.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-80h720v80H120Zm160-160v-80h400v80H280ZM120-440v-80h720v80H120Zm160-160v-80h400v80H280ZM120-760v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/align-justify.svg b/resources/icons/editor/align-justify.svg
new file mode 100644
index 00000000000..bf8f61abb7b
--- /dev/null
+++ b/resources/icons/editor/align-justify.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-80h720v80H120Zm0-160v-80h720v80H120Zm0-160v-80h720v80H120Zm0-160v-80h720v80H120Zm0-160v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/align-left.svg b/resources/icons/editor/align-left.svg
new file mode 100644
index 00000000000..811212755c2
--- /dev/null
+++ b/resources/icons/editor/align-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-80h720v80H120Zm0-160v-80h480v80H120Zm0-160v-80h720v80H120Zm0-160v-80h480v80H120Zm0-160v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/align-right.svg b/resources/icons/editor/align-right.svg
new file mode 100644
index 00000000000..839110c420f
--- /dev/null
+++ b/resources/icons/editor/align-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-760v-80h720v80H120Zm240 160v-80h480v80H360ZM120-440v-80h720v80H120Zm240 160v-80h480v80H360ZM120-120v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/bold.svg b/resources/icons/editor/bold.svg
new file mode 100644
index 00000000000..93cc44a3f00
--- /dev/null
+++ b/resources/icons/editor/bold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M272-200v-560h221q65 0 120 40t55 111q0 51-23 78.5T602-491q25 11 55.5 41t30.5 90q0 89-65 124.5T501-200H272Zm121-112h104q48 0 58.5-24.5T566-372q0-11-10.5-35.5T494-432H393v120Zm0-228h93q33 0 48-17t15-38q0-24-17-39t-44-15h-95v109Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/code-block.svg b/resources/icons/editor/code-block.svg
new file mode 100644
index 00000000000..308db53b466
--- /dev/null
+++ b/resources/icons/editor/code-block.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m384-336 56-57-87-87 87-87-56-57-144 144 144 144Zm192 0 144-144-144-144-56 57 87 87-87 87 56 57ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm0-560v560-560Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/code.svg b/resources/icons/editor/code.svg
new file mode 100644
index 00000000000..d8434b76138
--- /dev/null
+++ b/resources/icons/editor/code.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M320-240 80-480l240-240 57 57-184 184 183 183-56 56Zm320 0-57-57 184-184-183-183 56-56 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/details.svg b/resources/icons/editor/details.svg
new file mode 100644
index 00000000000..d86e8c42352
--- /dev/null
+++ b/resources/icons/editor/details.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-480H200v480Zm80-280v-80h400v80H280Zm0 160v-80h240v80H280Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/format-clear.svg b/resources/icons/editor/format-clear.svg
new file mode 100644
index 00000000000..b6483fb5677
--- /dev/null
+++ b/resources/icons/editor/format-clear.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m528-546-93-93-121-121h486v120H568l-40 94ZM792-56 460-388l-80 188H249l119-280L56-792l56-56 736 736-56 56Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/help.svg b/resources/icons/editor/help.svg
new file mode 100644
index 00000000000..8c3410b8432
--- /dev/null
+++ b/resources/icons/editor/help.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M478-240q21 0 35.5-14.5T528-290q0-21-14.5-35.5T478-340q-21 0-35.5 14.5T428-290q0 21 14.5 35.5T478-240Zm-36-154h74q0-33 7.5-52t42.5-52q26-26 41-49.5t15-56.5q0-56-41-86t-97-30q-57 0-92.5 30T342-618l66 26q5-18 22.5-39t53.5-21q32 0 48 17.5t16 38.5q0 20-12 37.5T506-526q-44 39-54 59t-10 73Zm38 314q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/horizontal-rule.svg b/resources/icons/editor/horizontal-rule.svg
new file mode 100644
index 00000000000..c70df0d6e07
--- /dev/null
+++ b/resources/icons/editor/horizontal-rule.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M160-440v-80h640v80H160Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/image.svg b/resources/icons/editor/image.svg
new file mode 100644
index 00000000000..81d04cea702
--- /dev/null
+++ b/resources/icons/editor/image.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h360v80H200v560h560v-360h80v360q0 33-23.5 56.5T760-120H200Zm480-480v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80ZM240-280h480L570-480 450-320l-90-120-120 160Zm-40-480v560-560Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/indent-decrease.svg b/resources/icons/editor/indent-decrease.svg
new file mode 100644
index 00000000000..af0caa8627d
--- /dev/null
+++ b/resources/icons/editor/indent-decrease.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-80h720v80H120Zm320-160v-80h400v80H440Zm0-160v-80h400v80H440Zm0-160v-80h400v80H440ZM120-760v-80h720v80H120Zm160 440L120-480l160-160v320Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/indent-increase.svg b/resources/icons/editor/indent-increase.svg
new file mode 100644
index 00000000000..aa6b4cb3621
--- /dev/null
+++ b/resources/icons/editor/indent-increase.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-80h720v80H120Zm320-160v-80h400v80H440Zm0-160v-80h400v80H440Zm0-160v-80h400v80H440ZM120-760v-80h720v80H120Zm0 440v-320l160 160-160 160Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/italic.svg b/resources/icons/editor/italic.svg
new file mode 100644
index 00000000000..a9881942757
--- /dev/null
+++ b/resources/icons/editor/italic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-200v-100h160l120-360H320v-100h400v100H580L460-300h140v100H200Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/link.svg b/resources/icons/editor/link.svg
new file mode 100644
index 00000000000..b29800dc310
--- /dev/null
+++ b/resources/icons/editor/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M680-160v-120H560v-80h120v-120h80v120h120v80H760v120h-80ZM440-280H280q-83 0-141.5-58.5T80-480q0-83 58.5-141.5T280-680h160v80H280q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h320v80H320Zm560-40h-80q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/list-bullet.svg b/resources/icons/editor/list-bullet.svg
new file mode 100644
index 00000000000..c073c6ff022
--- /dev/null
+++ b/resources/icons/editor/list-bullet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M360-200v-80h480v80H360Zm0-240v-80h480v80H360Zm0-240v-80h480v80H360ZM200-160q-33 0-56.5-23.5T120-240q0-33 23.5-56.5T200-320q33 0 56.5 23.5T280-240q0 33-23.5 56.5T200-160Zm0-240q-33 0-56.5-23.5T120-480q0-33 23.5-56.5T200-560q33 0 56.5 23.5T280-480q0 33-23.5 56.5T200-400Zm0-240q-33 0-56.5-23.5T120-720q0-33 23.5-56.5T200-800q33 0 56.5 23.5T280-720q0 33-23.5 56.5T200-640Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/list-check.svg b/resources/icons/editor/list-check.svg
new file mode 100644
index 00000000000..f30266b27be
--- /dev/null
+++ b/resources/icons/editor/list-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="#5f6368"><path d="M222-200 80-342l56-56 85 85 170-170 56 57-225 226Zm0-320L80-662l56-56 85 85 170-170 56 57-225 226Zm298 240v-80h360v80H520Zm0-320v-80h360v80H520Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/list-numbered.svg b/resources/icons/editor/list-numbered.svg
new file mode 100644
index 00000000000..92cdbf0aed8
--- /dev/null
+++ b/resources/icons/editor/list-numbered.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="#5f6368"><path d="M120-80v-60h100v-30h-60v-60h60v-30H120v-60h120q17 0 28.5 11.5T280-280v40q0 17-11.5 28.5T240-200q17 0 28.5 11.5T280-160v40q0 17-11.5 28.5T240-80H120Zm0-280v-110q0-17 11.5-28.5T160-510h60v-30H120v-60h120q17 0 28.5 11.5T280-560v70q0 17-11.5 28.5T240-450h-60v30h100v60H120Zm60-280v-180h-60v-60h120v240h-60Zm180 440v-80h480v80H360Zm0-240v-80h480v80H360Zm0-240v-80h480v80H360Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/redo.svg b/resources/icons/editor/redo.svg
new file mode 100644
index 00000000000..d542296c5e4
--- /dev/null
+++ b/resources/icons/editor/redo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" ><path d="M396-200q-97 0-166.5-63T160-420q0-94 69.5-157T396-640h252L544-744l56-56 200 200-200 200-56-56 104-104H396q-63 0-109.5 40T240-420q0 60 46.5 100T396-280h284v80H396Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/source-view.svg b/resources/icons/editor/source-view.svg
new file mode 100644
index 00000000000..5314c39dad7
--- /dev/null
+++ b/resources/icons/editor/source-view.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m384-336 56-58-86-86 86-86-56-58-144 144 144 144Zm192 0 144-144-144-144-56 58 86 86-86 86 56 58ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h168q13-36 43.5-58t68.5-22q38 0 68.5 22t43.5 58h168q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm280-590q13 0 21.5-8.5T510-820q0-13-8.5-21.5T480-850q-13 0-21.5 8.5T450-820q0 13 8.5 21.5T480-790ZM200-200v-560 560Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/strikethrough.svg b/resources/icons/editor/strikethrough.svg
new file mode 100644
index 00000000000..92d14aa76fc
--- /dev/null
+++ b/resources/icons/editor/strikethrough.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M80-400v-80h800v80H80Zm340-160v-120H200v-120h560v120H540v120H420Zm0 400v-160h120v160H420Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/subscript.svg b/resources/icons/editor/subscript.svg
new file mode 100644
index 00000000000..e877b335912
--- /dev/null
+++ b/resources/icons/editor/subscript.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M760-160v-80q0-17 11.5-28.5T800-280h80v-40H760v-40h120q17 0 28.5 11.5T920-320v40q0 17-11.5 28.5T880-240h-80v40h120v40H760Zm-525-80 185-291-172-269h106l124 200h4l123-200h107L539-531l186 291H618L482-457h-4L342-240H235Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/superscript.svg b/resources/icons/editor/superscript.svg
new file mode 100644
index 00000000000..897ceddc2b4
--- /dev/null
+++ b/resources/icons/editor/superscript.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M760-600v-80q0-17 11.5-28.5T800-720h80v-40H760v-40h120q17 0 28.5 11.5T920-760v40q0 17-11.5 28.5T880-680h-80v40h120v40H760ZM235-160l185-291-172-269h106l124 200h4l123-200h107L539-451l186 291H618L482-377h-4L342-160H235Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/underlined.svg b/resources/icons/editor/underlined.svg
new file mode 100644
index 00000000000..5d17ef6ef0f
--- /dev/null
+++ b/resources/icons/editor/underlined.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120v-80h560v80H200Zm280-160q-101 0-157-63t-56-167v-330h103v336q0 56 28 91t82 35q54 0 82-35t28-91v-336h103v330q0 104-56 167t-157 63Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/undo.svg b/resources/icons/editor/undo.svg
new file mode 100644
index 00000000000..4b9f22675d0
--- /dev/null
+++ b/resources/icons/editor/undo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M280-200v-80h284q63 0 109.5-40T720-420q0-60-46.5-100T564-560H312l104 104-56 56-200-200 200-200 56 56-104 104h252q97 0 166.5 63T800-420q0 94-69.5 157T564-200H280Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
new file mode 100644
index 00000000000..c5aba8ee287
--- /dev/null
+++ b/resources/js/global.d.ts
@@ -0,0 +1,4 @@
+declare module '*.svg' {
+    const content: string;
+    export default content;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 40379cc27de..d7cd23a359c 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -9,11 +9,13 @@ import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
 
-export function el(tag: string, attrs: Record<string, string> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
+export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
     const el = document.createElement(tag);
     const attrKeys = Object.keys(attrs);
     for (const attr of attrKeys) {
-        el.setAttribute(attr, attrs[attr]);
+        if (attrs[attr] !== null) {
+            el.setAttribute(attr, attrs[attr] as string);
+        }
     }
 
     for (const child of children) {
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 57460ef60ed..7fa1fb5f85b 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -29,9 +29,27 @@ import {$isImageNode, ImageNode} from "../../nodes/image";
 import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
 import {getEditorContentAsHtml} from "../../actions";
 import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
+import undoIcon from "@icons/editor/undo.svg"
+import redoIcon from "@icons/editor/redo.svg"
+import boldIcon from "@icons/editor/bold.svg"
+import italicIcon from "@icons/editor/italic.svg"
+import underlinedIcon from "@icons/editor/underlined.svg"
+import strikethroughIcon from "@icons/editor/strikethrough.svg"
+import superscriptIcon from "@icons/editor/superscript.svg"
+import subscriptIcon from "@icons/editor/subscript.svg"
+import codeIcon from "@icons/editor/code.svg"
+import formatClearIcon from "@icons/editor/format-clear.svg"
+import listBulletIcon from "@icons/editor/list-bullet.svg"
+import listNumberedIcon from "@icons/editor/list-numbered.svg"
+import listCheckIcon from "@icons/editor/list-check.svg"
+import linkIcon from "@icons/editor/link.svg"
+import imageIcon from "@icons/editor/image.svg"
+import detailsIcon from "@icons/editor/details.svg"
+import sourceIcon from "@icons/editor/source-view.svg"
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
+    icon: undoIcon,
     action(context: EditorUiContext) {
         context.editor.dispatchCommand(UNDO_COMMAND, undefined);
     },
@@ -42,6 +60,7 @@ export const undo: EditorButtonDefinition = {
 
 export const redo: EditorButtonDefinition = {
     label: 'Redo',
+    icon: redoIcon,
     action(context: EditorUiContext) {
         context.editor.dispatchCommand(REDO_COMMAND, undefined);
     },
@@ -116,9 +135,10 @@ export const paragraph: EditorButtonDefinition = {
     }
 }
 
-function buildFormatButton(label: string, format: TextFormatType): EditorButtonDefinition {
+function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
     return {
         label: label,
+        icon,
         action(context: EditorUiContext) {
             context.editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
         },
@@ -128,18 +148,19 @@ function buildFormatButton(label: string, format: TextFormatType): EditorButtonD
     };
 }
 
-export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold');
-export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic');
-export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline');
+export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', boldIcon);
+export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
+export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
 export const textColor: EditorBasicButtonDefinition = {label: 'Text color'};
 export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color'};
 
-export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough');
-export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript');
-export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript');
-export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code');
+export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
+export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
+export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript', subscriptIcon);
+export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code', codeIcon);
 export const clearFormating: EditorButtonDefinition = {
     label: 'Clear formatting',
+    icon: formatClearIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
             const selection = $getSelection();
@@ -155,9 +176,10 @@ export const clearFormating: EditorButtonDefinition = {
     }
 };
 
-function buildListButton(label: string, type: ListType): EditorButtonDefinition {
+function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
     return {
         label,
+        icon,
         action(context: EditorUiContext) {
             context.editor.getEditorState().read(() => {
                 const selection = $getSelection();
@@ -176,13 +198,14 @@ function buildListButton(label: string, type: ListType): EditorButtonDefinition
     };
 }
 
-export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet');
-export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number');
-export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check');
+export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet', listBulletIcon);
+export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number', listNumberedIcon);
+export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check', listCheckIcon);
 
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
+    icon: linkIcon,
     action(context: EditorUiContext) {
         const linkModal = context.manager.createModal('link');
         context.editor.getEditorState().read(() => {
@@ -215,6 +238,7 @@ export const link: EditorButtonDefinition = {
 
 export const image: EditorButtonDefinition = {
     label: 'Insert/Edit Image',
+    icon: imageIcon,
     action(context: EditorUiContext) {
         const imageModal = context.manager.createModal('image');
         const selection = context.lastSelection;
@@ -247,6 +271,7 @@ export const image: EditorButtonDefinition = {
 
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
+    icon: detailsIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
             const selection = $getSelection();
@@ -274,6 +299,7 @@ export const details: EditorButtonDefinition = {
 
 export const source: EditorButtonDefinition = {
     label: 'Source code',
+    icon: sourceIcon,
     async action(context: EditorUiContext) {
         const modal = context.manager.createModal('source');
         const source = await getEditorContentAsHtml(context.editor);
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index c3ba533b325..332b3509973 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -4,6 +4,7 @@ import {el} from "../../helpers";
 
 export interface EditorBasicButtonDefinition {
     label: string;
+    icon?: string|undefined;
 }
 
 export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
@@ -21,10 +22,19 @@ export class EditorButton extends EditorUiElement {
     }
 
     protected buildDOM(): HTMLButtonElement {
+
+        const label = this.getLabel();
+        let child: string|HTMLElement = label;
+        if (this.definition.icon) {
+            child = el('span', {class: 'editor-button-icon'});
+            child.innerHTML = this.definition.icon;
+        }
+
         const button = el('button', {
             type: 'button',
             class: 'editor-button',
-        }, [this.getLabel()]) as HTMLButtonElement;
+            title: this.definition.icon ? label : null,
+        }, [child]) as HTMLButtonElement;
 
         button.addEventListener('click', this.onClick.bind(this));
 
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index fe19b94ed7a..559e9a87cfb 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -16,6 +16,7 @@ import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
 import {EditorColorPicker} from "./framework/blocks/color-picker";
 
+console.log(undo);
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 13d8e96f98b..f8c895afd35 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -29,6 +29,11 @@
   padding: 4px 6px;
   display: block;
 }
+.editor-button-icon svg {
+  width: 24px;
+  height: 24px;
+  fill: #000;
+}
 
 // Containers
 .editor-dropdown-menu-container {
diff --git a/tsconfig.json b/tsconfig.json
index e075f973c4d..40d930149a9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,7 +29,9 @@
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    "paths": {                                           /* Specify a set of entries that re-map imports to additional lookup locations. */
+      "@icons/*": ["./resources/icons/*"]
+    },
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */

From f47f7dd9d255db85ff1254d51feb8d47476c784d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 21 Jun 2024 13:47:47 +0100
Subject: [PATCH 171/666] Lexical: Added base table support and started resize
 handling

---
 package-lock.json                             |  1 +
 package.json                                  |  1 +
 resources/js/wysiwyg/index.ts                 |  2 +
 resources/js/wysiwyg/nodes/index.ts           |  4 ++
 .../ui/framework/helpers/table-resizer.ts     | 68 +++++++++++++++++++
 resources/sass/_editor.scss                   | 20 ++++++
 .../pages/parts/wysiwyg-editor.blade.php      | 19 ++++++
 7 files changed, 115 insertions(+)
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts

diff --git a/package-lock.json b/package-lock.json
index 0757e786873..646750df49a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
         "@lexical/list": "^0.15.0",
         "@lexical/rich-text": "^0.15.0",
         "@lexical/selection": "^0.15.0",
+        "@lexical/table": "^0.15.0",
         "@lexical/utils": "^0.15.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
diff --git a/package.json b/package.json
index 732bb175980..d649b54e2d2 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "@lexical/list": "^0.15.0",
     "@lexical/rich-text": "^0.15.0",
     "@lexical/selection": "^0.15.0",
+    "@lexical/table": "^0.15.0",
     "@lexical/utils": "^0.15.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 41207b706f4..b910b2eb619 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -5,6 +5,7 @@ import {mergeRegister} from '@lexical/utils';
 import {getNodesForPageEditor} from './nodes';
 import {buildEditorUI} from "./ui";
 import {setEditorContentFromHtml} from "./actions";
+import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 
 export function createPageEditorInstance(editArea: HTMLElement) {
     const config: CreateEditorArgs = {
@@ -21,6 +22,7 @@ export function createPageEditorInstance(editArea: HTMLElement) {
     mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
+        registerTableResizer(editor, editArea),
     );
 
     setEditorContentFromHtml(editor, startingHtml);
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 03fcd33a5b3..ea6206ac2ba 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -6,6 +6,7 @@ import {LinkNode} from "@lexical/link";
 import {ImageNode} from "./image";
 import {DetailsNode, SummaryNode} from "./details";
 import {ListItemNode, ListNode} from "@lexical/list";
+import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 
 /**
  * Load the nodes for lexical.
@@ -17,6 +18,9 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         QuoteNode, // Todo - Create custom
         ListNode, // Todo - Create custom
         ListItemNode,
+        TableNode, // Todo - Create custom,
+        TableRowNode,
+        TableCellNode,
         ImageNode,
         DetailsNode, SummaryNode,
         CustomParagraphNode,
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
new file mode 100644
index 00000000000..53017e93b93
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -0,0 +1,68 @@
+import {LexicalEditor} from "lexical";
+import {el} from "../../../helpers";
+
+type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
+
+class TableResizer {
+    protected editor: LexicalEditor;
+    protected editArea: HTMLElement;
+    protected markerDom: MarkerDomRecord|null = null;
+
+    constructor(editor: LexicalEditor, editArea: HTMLElement) {
+        this.editor = editor;
+        this.editArea = editArea;
+        this.setupListeners();
+    }
+
+    setupListeners() {
+        this.editArea.addEventListener('mousemove', event => {
+            const cell = (event.target as HTMLElement).closest('td,th');
+            if (cell) {
+                this.onCellMouseMove(cell as HTMLElement, event);
+            }
+        });
+    }
+
+    onCellMouseMove(cell: HTMLElement, event: MouseEvent) {
+        const rect = cell.getBoundingClientRect();
+        const midX = rect.left + (rect.width / 2);
+        const midY = rect.top + (rect.height / 2);
+        const xMarkerPos = event.clientX <= midX ? rect.left : rect.right;
+        const yMarkerPos = event.clientY <= midY ? rect.top : rect.bottom;
+        this.updateMarkersTo(cell, xMarkerPos, yMarkerPos);
+    }
+
+    updateMarkersTo(cell: HTMLElement, xPos: number, yPos: number) {
+        const markers: MarkerDomRecord = this.getMarkers();
+        const table = cell.closest('table') as HTMLElement;
+        const tableRect = table.getBoundingClientRect();
+
+        markers.x.style.left = xPos + 'px';
+        markers.x.style.height = tableRect.height + 'px';
+        markers.x.style.top = tableRect.top + 'px';
+
+        markers.y.style.top = yPos + 'px';
+        markers.y.style.left = tableRect.left + 'px';
+        markers.y.style.width = tableRect.width + 'px';
+    }
+
+    getMarkers(): MarkerDomRecord {
+        if (!this.markerDom) {
+            this.markerDom = {
+                x: el('div', {class: 'editor-table-marker-column'}),
+                y: el('div', {class: 'editor-table-marker-row'}),
+            }
+            this.editArea.after(this.markerDom.x, this.markerDom.y);
+        }
+
+        return this.markerDom;
+    }
+}
+
+
+export function registerTableResizer(editor: LexicalEditor, editorArea: HTMLElement): (() => void) {
+    const resizer = new TableResizer(editor, editorArea);
+
+    // TODO - Strip/close down resizer
+    return () => {};
+}
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index f8c895afd35..ad1f5a339ea 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -146,3 +146,23 @@
     cursor: sw-resize;
   }
 }
+
+.editor-table-marker-row,
+.editor-table-marker-column {
+  position: fixed;
+  background-color: var(--editor-color-primary);
+  z-index: 99;
+  user-select: none;
+  opacity: 0;
+  &:hover {
+    opacity: 0.4;
+  }
+}
+.editor-table-marker-column {
+  width: 4px;
+  cursor: col-resize;
+}
+.editor-table-marker-row {
+  height: 4px;
+  cursor: row-resize;
+}
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 6414027697c..5cd60bbc69b 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -26,6 +26,25 @@ class="">
             <p class="callout info">
                 Hello there, this is an info callout
             </p>
+
+            <h3>Table</h3>
+
+            <table>
+                <thead>
+                <tr>
+                    <th>Cell A</th>
+                    <th>Cell B</th>
+                    <th>Cell C</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>Cell D</td>
+                    <td>Cell E</td>
+                    <td>Cell F</td>
+                </tr>
+                </tbody>
+            </table>
         </div>
     </div>
 

From ac01c62e6e393d17228005d5bb3074960a54714c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 21 Jun 2024 16:18:44 +0100
Subject: [PATCH 172/666] Lexical: Added table creator UI

---
 resources/js/wysiwyg/helpers.ts               | 16 +++-
 .../wysiwyg/ui/defaults/button-definitions.ts |  4 +
 .../ui/framework/blocks/table-creator.ts      | 80 +++++++++++++++++++
 resources/js/wysiwyg/ui/toolbars.ts           |  8 +-
 resources/sass/_editor.scss                   | 16 ++++
 5 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/table-creator.ts

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index d7cd23a359c..62e9457213e 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -1,13 +1,14 @@
 import {
-    $createParagraphNode,
+    $createParagraphNode, $getRoot,
     $getSelection,
     $isTextNode,
-    BaseSelection,
+    BaseSelection, ElementNode,
     LexicalEditor, LexicalNode, TextFormatType
 } from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
+import {$createDetailsNode} from "./nodes/details";
 
 export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
     const el = document.createElement(tag);
@@ -77,4 +78,15 @@ export function toggleSelectionBlockNodeType(editor: LexicalEditor, matcher: Lex
             $setBlocksType(selection, creator);
         }
     });
+}
+
+export function insertNewBlockNodeAtSelection(node: LexicalNode) {
+    const selection = $getSelection();
+    const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
+
+    if (blockElement) {
+        blockElement.insertAfter(node);
+    } else {
+        $getRoot().append(node);
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 7fa1fb5f85b..bf1846b8f13 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -236,6 +236,10 @@ export const link: EditorButtonDefinition = {
     }
 };
 
+export const table: EditorBasicButtonDefinition = {
+    label: 'Table',
+};
+
 export const image: EditorButtonDefinition = {
     label: 'Insert/Edit Image',
     icon: imageIcon,
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
new file mode 100644
index 00000000000..c54645856ab
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -0,0 +1,80 @@
+import {el, insertNewBlockNodeAtSelection} from "../../../helpers";
+import {EditorUiElement} from "../core";
+import {$createTableNodeWithDimensions} from "@lexical/table";
+
+
+export class EditorTableCreator extends EditorUiElement {
+
+    buildDOM(): HTMLElement {
+        const size = 10;
+        const rows: HTMLElement[] = [];
+        const cells: HTMLElement[] = [];
+
+        for (let row = 1; row < size + 1; row++) {
+            const rowCells = [];
+            for (let column = 1; column < size + 1; column++) {
+                const cell = el('div', {
+                    class: 'editor-table-creator-cell',
+                    'data-rows': String(row),
+                    'data-columns': String(column),
+                });
+                rowCells.push(cell);
+                cells.push(cell);
+            }
+            rows.push(el('div', {
+                class: 'editor-table-creator-row'
+            }, rowCells));
+        }
+
+        const display = el('div', {class: 'editor-table-creator-display'}, ['0 x 0']);
+        const grid = el('div', {class: 'editor-table-creator-grid'}, rows);
+        grid.addEventListener('mousemove', event => {
+            const cell = (event.target as HTMLElement).closest('.editor-table-creator-cell') as HTMLElement|null;
+            if (cell) {
+                const row = Number(cell.dataset.rows || 0);
+                const column = Number(cell.dataset.columns || 0);
+                this.updateGridSelection(row, column, cells, display)
+            }
+        });
+
+        grid.addEventListener('click', event => {
+            const cell = (event.target as HTMLElement).closest('.editor-table-creator-cell');
+            if (cell) {
+                this.onCellClick(cell as HTMLElement);
+            }
+        });
+
+        grid.addEventListener('mouseleave', event => {
+             this.updateGridSelection(0, 0, cells, display);
+        });
+
+        return el('div', {
+            class: 'editor-table-creator',
+        }, [
+            grid,
+            display,
+        ]);
+    }
+
+    updateGridSelection(rows: number, columns: number, cells: HTMLElement[], display: HTMLElement) {
+        for (const cell of cells) {
+            const active = Number(cell.dataset.rows) <= rows && Number(cell.dataset.columns) <= columns;
+            cell.classList.toggle('active', active);
+        }
+
+        display.textContent = `${rows} x ${columns}`;
+    }
+
+    onCellClick(cell: HTMLElement) {
+        const rows = Number(cell.dataset.rows || 0);
+        const columns = Number(cell.dataset.columns || 0);
+        if (rows < 1 || columns < 1) {
+            return;
+        }
+
+        this.getContext().editor.update(() => {
+            const table = $createTableNodeWithDimensions(rows, columns, false);
+            insertNewBlockNodeAtSelection(table);
+        });
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 559e9a87cfb..4dbf9bb7e3b 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -5,7 +5,7 @@ import {
     h2, h3, h4, h5, highlightColor, image,
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
-    successCallout, superscript, taskList, textColor, underline,
+    successCallout, superscript, table, taskList, textColor, underline,
     undo,
     warningCallout
 } from "./defaults/button-definitions";
@@ -15,8 +15,7 @@ import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
 import {EditorColorPicker} from "./framework/blocks/color-picker";
-
-console.log(undo);
+import {EditorTableCreator} from "./framework/blocks/table-creator";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -61,6 +60,9 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
         // Insert types
         new EditorButton(link),
+        new EditorDropdownButton(table, [
+            new EditorTableCreator(),
+        ]),
         new EditorButton(image),
         new EditorButton(details),
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index ad1f5a339ea..69027ea69f5 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -100,6 +100,22 @@
   z-index: 3;
   box-shadow: 0 0 4px 1px rgba(0, 0, 0, 0.25);
 }
+.editor-table-creator-row {
+  display: flex;
+}
+.editor-table-creator-cell {
+  border: 1px solid #DDD;
+  width: 15px;
+  height: 15px;
+  cursor: pointer;
+  &.active {
+    background-color: var(--editor-color-primary);
+  }
+}
+.editor-table-creator-display {
+  text-align: center;
+  padding: 0.2em;
+}
 
 // In-editor elements
 .editor-image-wrap {

From a07092b7e65d8e2aafa3b866724b995ae4431cc6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Jun 2024 11:36:48 +0100
Subject: [PATCH 173/666] Lexical: Updated lexical, added undo state tracking,
 format styles

---
 package-lock.json                             | 320 +++++++++---------
 package.json                                  |  18 +-
 resources/js/wysiwyg/index.ts                 |  12 +
 .../wysiwyg/ui/defaults/button-definitions.ts |  20 +-
 resources/js/wysiwyg/ui/framework/buttons.ts  |  23 ++
 resources/sass/_editor.scss                   |  23 ++
 6 files changed, 251 insertions(+), 165 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 646750df49a..3867a1d1fb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,20 +18,20 @@
         "@codemirror/state": "^6.3.3",
         "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.22.2",
-        "@lexical/history": "^0.15.0",
-        "@lexical/html": "^0.15.0",
-        "@lexical/link": "^0.15.0",
-        "@lexical/list": "^0.15.0",
-        "@lexical/rich-text": "^0.15.0",
-        "@lexical/selection": "^0.15.0",
-        "@lexical/table": "^0.15.0",
-        "@lexical/utils": "^0.15.0",
+        "@lexical/history": "^0.16.0",
+        "@lexical/html": "^0.16.0",
+        "@lexical/link": "^0.16.0",
+        "@lexical/list": "^0.16.0",
+        "@lexical/rich-text": "^0.16.0",
+        "@lexical/selection": "^0.16.0",
+        "@lexical/table": "^0.16.0",
+        "@lexical/utils": "^0.16.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
-        "lexical": "^0.15.0",
+        "lexical": "^0.16.0",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.5.1",
@@ -50,19 +50,10 @@
         "typescript": "^5.4.5"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
-      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
+      "version": "6.16.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.3.tgz",
+      "integrity": "sha512-Vl/tIeRVVUCRDuOG48lttBasNQu8usGgXQawBXI7WJAiUDSFOfzflmEsZFZo48mAvAaa4FZ/4/yLLxFtdJaKYA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -77,13 +68,13 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz",
-      "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
+      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.27.0",
         "@lezer/common": "^1.1.0"
       }
     },
@@ -100,9 +91,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz",
-      "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==",
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
+      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -139,9 +130,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.4.tgz",
-      "integrity": "sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==",
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz",
+      "integrity": "sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
         "@codemirror/lang-html": "^6.0.0",
@@ -178,9 +169,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz",
-      "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
+      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -199,9 +190,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz",
-      "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
+      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -235,9 +226,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.1.tgz",
-      "integrity": "sha512-wLw0t3R9AwOSQThdZ5Onw8QQtem5asE7+bPlnzc57eubPqiuJKIzwjMZ+C42vQett+iva+J8VgFV4RYWDBh5FA==",
+      "version": "6.28.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.2.tgz",
+      "integrity": "sha512-A3DmyVfjgPsGIjiJqM/zvODUAPQdQl3ci0ghehYNnbt5x+o76xq+dL5+mMBuysDXnI3kapgOkoeJ0sbtL/3qPw==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -628,9 +619,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz",
+      "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -672,6 +663,7 @@
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
@@ -699,94 +691,95 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
     "node_modules/@lexical/clipboard": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.15.0.tgz",
-      "integrity": "sha512-binCltK7KiURQJFogvueYfmDNEKynN/lmZrCLFp2xBjEIajqw4WtOVLJZ33engdqNlvj0JqrxrWxbKG+yvUwrg==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.16.0.tgz",
+      "integrity": "sha512-eYMJ6jCXpWBVC05Mu9HLMysrBbfi++xFfsm+Yo7A6kYGrqYUhpXqjJkYnw1xdZYL3bV73Oe4ByVJuq42GU+Mqw==",
       "dependencies": {
-        "@lexical/html": "0.15.0",
-        "@lexical/list": "0.15.0",
-        "@lexical/selection": "0.15.0",
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/html": "0.16.0",
+        "@lexical/list": "0.16.0",
+        "@lexical/selection": "0.16.0",
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/history": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.15.0.tgz",
-      "integrity": "sha512-r+pzR2k/51AL6l8UfXeVe/GWPIeWY1kEOuKx9nsYB9tmAkTF66tTFz33DJIMWBVtAHWN7Dcdv0/yy6q8R6CAUQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.16.0.tgz",
+      "integrity": "sha512-xwFxgDZGviyGEqHmgt6A6gPhsyU/yzlKRk9TBUVByba3khuTknlJ1a80H5jb+OYcrpiElml7iVuGYt+oC7atCA==",
       "dependencies": {
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/html": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.15.0.tgz",
-      "integrity": "sha512-x/sfGvibwo8b5Vso4ppqNyS/fVve6Rn+TmvP/0eWOaa0I3aOQ57ulfcK6p/GTe+ZaEi8vW64oZPdi8XDgwSRaA==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.16.0.tgz",
+      "integrity": "sha512-okxn3q/1qkUpCZNEFRI39XeJj4YRjb6prm3WqZgP4d39DI1W24feeTZJjYRCW+dc3NInwFaolU3pNA2MGkjRtg==",
       "dependencies": {
-        "@lexical/selection": "0.15.0",
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/selection": "0.16.0",
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/link": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.15.0.tgz",
-      "integrity": "sha512-KBV/zWk5FxqZGNcq3IKGBDCcS4t0uteU1osAIG+pefo4waTkOOgibxxEJDop2QR5wtjkYva3Qp0D8ZyJDMMMlw==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.16.0.tgz",
+      "integrity": "sha512-ppvJSh/XGqlzbeymOiwcXJcUcrqgQqTK2QXTBAZq7JThtb0WsJxYd2CSLSN+Ycu23prnwqOqILcU0+34+gAVFw==",
       "dependencies": {
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/list": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.15.0.tgz",
-      "integrity": "sha512-JuF4k7uo4rZFOSZGrmkxo1+sUrwTKNBhhJAiCgtM+6TO90jppxzCFNKur81yPzF1+g4GWLC9gbjzKb52QPb6cQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.16.0.tgz",
+      "integrity": "sha512-nBx/DMM7nCgnOzo1JyNnVaIrk/Xi5wIPNi8jixrEV6w9Om2K6dHutn/79Xzp2dQlNGSLHEDjky6N2RyFgmXh0g==",
       "dependencies": {
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/rich-text": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.15.0.tgz",
-      "integrity": "sha512-76tXh/eeEOHl91HpFEXCc/tUiLrsa9RcSyvCzRZahk5zqYvQPXma/AUfRzuSMf2kLwDEoauKAVqNFQcbPhqwpQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.16.0.tgz",
+      "integrity": "sha512-AGTD6yJZ+kj2TNah1r7/6vyufs6fZANeSvv9x5eG+WjV4uyUJYkd1qR8C5gFZHdkyr+bhAcsAXvS039VzAxRrQ==",
       "dependencies": {
-        "@lexical/clipboard": "0.15.0",
-        "@lexical/selection": "0.15.0",
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/clipboard": "0.16.0",
+        "@lexical/selection": "0.16.0",
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/selection": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.15.0.tgz",
-      "integrity": "sha512-S+AQC6eJiQYSa5zOPuecN85prCT0Bcb8miOdJaE17Zh+vgdUH5gk9I0tEBeG5T7tkSpq6lFiEqs2FZSfaHflbQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.16.0.tgz",
+      "integrity": "sha512-trT9gQVJ2j6AwAe7tHJ30SRuxCpV6yR9LFtggxphHsXSvJYnoHC0CXh1TF2jHl8Gd5OsdWseexGLBE4Y0V3gwQ==",
       "dependencies": {
-        "lexical": "0.15.0"
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/table": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.15.0.tgz",
-      "integrity": "sha512-3IRBg8IoIHetqKozRQbJQ2aPyG0ziXZ+lc8TOIAGs6METW/wxntaV+rTNrODanKAgvk2iJTIyfFkYjsqS9+VFg==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.16.0.tgz",
+      "integrity": "sha512-A66K779kxdr0yH2RwT2itsMnkzyFLFNPXyiWGLobCH8ON4QPuBouZvjbRHBe8Pe64yJ0c1bRDxSbTqUi9Wt3Gg==",
       "dependencies": {
-        "@lexical/utils": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/utils": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lexical/utils": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.15.0.tgz",
-      "integrity": "sha512-/6954LDmTcVFgexhy5WOZDa4TxNQOEZNrf8z7TRAFiAQkihcME/GRoq1en5cbXoVNF8jv5AvNyyc7x0MByRJ6A==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-GWmFEmd7o3GHqJBaEwzuZQbfTNI3Gg8ReGuHMHABgrkhZ8j2NggoRBlxsQLG0f7BewfTMVwbye22yBPq78775w==",
       "dependencies": {
-        "@lexical/list": "0.15.0",
-        "@lexical/selection": "0.15.0",
-        "@lexical/table": "0.15.0",
-        "lexical": "0.15.0"
+        "@lexical/list": "0.16.0",
+        "@lexical/selection": "0.16.0",
+        "@lexical/table": "0.16.0",
+        "lexical": "0.16.0"
       }
     },
     "node_modules/@lezer/common": {
@@ -805,9 +798,9 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.0.tgz",
-      "integrity": "sha512-IJ16tx3biLKlCXUzcK4v8S10AVa2BSM2rB12rtAL6f1hL2TS/HQQlGCoWRvanlL2J4mCYEEIv9uG7n4kVMkVDA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.1.tgz",
+      "integrity": "sha512-MgPJN9Si+ccxzXl3OAmCeZuUKw4XiPl4y664FX/hnnyG9CTqUPq65N3/VGPA2jD23D7QgMTtNqflta+cPN+5mQ==",
       "dev": true,
       "dependencies": {
         "@lezer/common": "^1.1.0",
@@ -826,9 +819,9 @@
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz",
-      "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==",
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
+      "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -836,9 +829,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.14.tgz",
-      "integrity": "sha512-GEdUyspTRgc5dwIGebUk+f3BekvqEWVIYsIuAC3pA8e8wcikGwBZRWRa450L0s8noGWuULwnmi4yjxTnYz9PpA==",
+      "version": "1.4.17",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
+      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -856,9 +849,9 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz",
-      "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz",
+      "integrity": "sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -955,9 +948,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
+      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1191,12 +1184,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1444,9 +1437,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -2041,9 +2034,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -2202,6 +2195,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -2246,12 +2240,13 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2386,9 +2381,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -2420,6 +2415,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -2521,12 +2517,15 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2808,9 +2807,9 @@
       }
     },
     "node_modules/lexical": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.15.0.tgz",
-      "integrity": "sha512-/7HrPAmtgsc1F+qpv5bFwoQZ6CbH/w3mPPL2AW5P75/QYrqKz4bhvJrc2jozIX0GxtuT/YUYT7w+1sZMtUWbOg=="
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.16.0.tgz",
+      "integrity": "sha512-Skn45Qhriazq4fpAtwnAB11U//GKc4vjzx54xsV3TkDLDvWpbL4Z9TNRwRoN3g7w8AkWnqjeOSODKkrjgfRSrg=="
     },
     "node_modules/linkify-it": {
       "version": "5.0.0",
@@ -3160,10 +3159,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3268,17 +3270,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3586,6 +3588,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -3656,9 +3659,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.74.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
-      "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
+      "version": "1.77.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
+      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3816,9 +3819,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
-      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
       "dev": true
     },
     "node_modules/string-width": {
@@ -4113,9 +4116,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -4225,6 +4228,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -4294,9 +4306,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
diff --git a/package.json b/package.json
index d649b54e2d2..439eaa5a13d 100644
--- a/package.json
+++ b/package.json
@@ -42,20 +42,20 @@
     "@codemirror/state": "^6.3.3",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.22.2",
-    "@lexical/history": "^0.15.0",
-    "@lexical/html": "^0.15.0",
-    "@lexical/link": "^0.15.0",
-    "@lexical/list": "^0.15.0",
-    "@lexical/rich-text": "^0.15.0",
-    "@lexical/selection": "^0.15.0",
-    "@lexical/table": "^0.15.0",
-    "@lexical/utils": "^0.15.0",
+    "@lexical/history": "^0.16.0",
+    "@lexical/html": "^0.16.0",
+    "@lexical/link": "^0.16.0",
+    "@lexical/list": "^0.16.0",
+    "@lexical/rich-text": "^0.16.0",
+    "@lexical/selection": "^0.16.0",
+    "@lexical/table": "^0.16.0",
+    "@lexical/utils": "^0.16.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
-    "lexical": "^0.15.0",
+    "lexical": "^0.16.0",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.5.1",
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index b910b2eb619..9f2f1645a4f 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -12,6 +12,18 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
         onError: console.error,
+        theme: {
+            text: {
+                bold: 'editor-theme-bold',
+                code: 'editor-theme-code',
+                italic: 'editor-theme-italic',
+                strikethrough: 'editor-theme-strikethrough',
+                subscript: 'editor-theme-subscript',
+                superscript: 'editor-theme-superscript',
+                underline: 'editor-theme-underline',
+                underlineStrikethrough: 'editor-theme-underline-strikethrough',
+            }
+        }
     };
 
     const startingHtml = editArea.innerHTML;
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index bf1846b8f13..589567c031a 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,9 +1,9 @@
-import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../framework/buttons";
+import {EditorBasicButtonDefinition, EditorButton, EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
     $createParagraphNode, $getRoot, $getSelection,
     $isParagraphNode, $isTextNode, $setSelection,
-    BaseSelection, ElementNode, FORMAT_TEXT_COMMAND,
+    BaseSelection, CAN_REDO_COMMAND, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
     REDO_COMMAND, TextFormatType,
     UNDO_COMMAND
@@ -55,6 +55,14 @@ export const undo: EditorButtonDefinition = {
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
+    },
+    setup(context: EditorUiContext, button: EditorButton) {
+        button.toggleDisabled(true);
+
+        context.editor.registerCommand(CAN_UNDO_COMMAND, (payload: boolean): boolean => {
+            button.toggleDisabled(!payload)
+            return false;
+        }, COMMAND_PRIORITY_LOW);
     }
 }
 
@@ -66,6 +74,14 @@ export const redo: EditorButtonDefinition = {
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
+    },
+    setup(context: EditorUiContext, button: EditorButton) {
+        button.toggleDisabled(true);
+
+        context.editor.registerCommand(CAN_REDO_COMMAND, (payload: boolean): boolean => {
+            button.toggleDisabled(!payload)
+            return false;
+        }, COMMAND_PRIORITY_LOW);
     }
 }
 
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 332b3509973..02f88dac8d4 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -1,6 +1,7 @@
 import {BaseSelection} from "lexical";
 import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {el} from "../../helpers";
+import {context} from "esbuild";
 
 export interface EditorBasicButtonDefinition {
     label: string;
@@ -10,17 +11,29 @@ export interface EditorBasicButtonDefinition {
 export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
     action: (context: EditorUiContext) => void;
     isActive: (selection: BaseSelection|null) => boolean;
+    setup?: (context: EditorUiContext, button: EditorButton) => void;
 }
 
 export class EditorButton extends EditorUiElement {
     protected definition: EditorButtonDefinition;
     protected active: boolean = false;
+    protected completedSetup: boolean = false;
+    protected disabled: boolean = false;
 
     constructor(definition: EditorButtonDefinition) {
         super();
         this.definition = definition;
     }
 
+    setContext(context: EditorUiContext) {
+        super.setContext(context);
+
+        if (this.definition.setup && !this.completedSetup) {
+            this.definition.setup(context, this);
+            this.completedSetup = true;
+        }
+    }
+
     protected buildDOM(): HTMLButtonElement {
 
         const label = this.getLabel();
@@ -34,6 +47,7 @@ export class EditorButton extends EditorUiElement {
             type: 'button',
             class: 'editor-button',
             title: this.definition.icon ? label : null,
+            disabled: this.disabled ? 'true' : null,
         }, [child]) as HTMLButtonElement;
 
         button.addEventListener('click', this.onClick.bind(this));
@@ -61,4 +75,13 @@ export class EditorButton extends EditorUiElement {
     getLabel(): string {
         return this.trans(this.definition.label);
     }
+
+    toggleDisabled(disabled: boolean) {
+        this.disabled = disabled;
+        if (disabled) {
+            this.dom?.setAttribute('disabled', 'true');
+        } else {
+            this.dom?.removeAttribute('disabled');
+        }
+    }
 }
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 69027ea69f5..b5ee69d9820 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -21,6 +21,12 @@
   cursor: pointer;
   color: #000;
 }
+.editor-button[disabled] {
+  pointer-events: none;
+  cursor: not-allowed;
+  background-color: #EEE;
+  opacity: .6;
+}
 .editor-button-active, .editor-button-active:hover {
   background-color: #ceebff;
   color: #000;
@@ -181,4 +187,21 @@
 .editor-table-marker-row {
   height: 4px;
   cursor: row-resize;
+}
+
+// Editor theme styles
+.editor-theme-bold {
+  font-weight: bold;
+}
+.editor-theme-italic {
+  font-style: italic;
+}
+.editor-theme-strikethrough {
+  text-decoration-line: line-through;
+}
+.editor-theme-underline {
+  text-decoration-line: underline;
+}
+.editor-theme-underline-strikethrough {
+  text-decoration: underline line-through;
 }
\ No newline at end of file

From 5546b8ff435b268369855106116968e704335e92 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Jun 2024 15:50:41 +0100
Subject: [PATCH 174/666] Lexical: Added more icons, made reflective text/bg
 color buttons

---
 resources/icons/editor/highlighter.svg        |  1 +
 resources/icons/editor/list-check.svg         |  2 +-
 resources/icons/editor/list-numbered.svg      |  2 +-
 resources/icons/editor/table.svg              |  1 +
 resources/icons/editor/text-color.svg         |  1 +
 .../wysiwyg/ui/defaults/button-definitions.ts |  9 +++--
 .../ui/framework/blocks/color-button.ts       | 35 +++++++++++++++++++
 .../ui/framework/blocks/dropdown-button.ts    | 24 +++++++------
 resources/js/wysiwyg/ui/framework/buttons.ts  | 18 ++++++++--
 resources/js/wysiwyg/ui/toolbars.ts           |  5 +--
 10 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 resources/icons/editor/highlighter.svg
 create mode 100644 resources/icons/editor/table.svg
 create mode 100644 resources/icons/editor/text-color.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/color-button.ts

diff --git a/resources/icons/editor/highlighter.svg b/resources/icons/editor/highlighter.svg
new file mode 100644
index 00000000000..b2eaacdb2bf
--- /dev/null
+++ b/resources/icons/editor/highlighter.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 -960 960 960" xmlns="http://www.w3.org/2000/svg"><path class="editor-icon-color-bar" d="m80-2e-6v-160h800v160z"/><path d="m584-480-104-104-160 160 103 104zm-47-160 103 103 160-159-104-104zm-84-29 216 216-189 190c-16 16-34.833 24-56.5 24s-40.5-8-56.5-24l-27 23h-200l126-125c-16-16-24.333-35.167-25-57.5s7-41.5 23-57.5zm0 0 187-187c16-16 34.833-24 56.5-24s40.5 8 56.5 24l104 103c16 16 24 34.833 24 56.5s-8 40.5-24 56.5l-188 187z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/list-check.svg b/resources/icons/editor/list-check.svg
index f30266b27be..4517d0d5311 100644
--- a/resources/icons/editor/list-check.svg
+++ b/resources/icons/editor/list-check.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="#5f6368"><path d="M222-200 80-342l56-56 85 85 170-170 56 57-225 226Zm0-320L80-662l56-56 85 85 170-170 56 57-225 226Zm298 240v-80h360v80H520Zm0-320v-80h360v80H520Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M222-200 80-342l56-56 85 85 170-170 56 57-225 226Zm0-320L80-662l56-56 85 85 170-170 56 57-225 226Zm298 240v-80h360v80H520Zm0-320v-80h360v80H520Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/list-numbered.svg b/resources/icons/editor/list-numbered.svg
index 92cdbf0aed8..4bc0fc1babf 100644
--- a/resources/icons/editor/list-numbered.svg
+++ b/resources/icons/editor/list-numbered.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="#5f6368"><path d="M120-80v-60h100v-30h-60v-60h60v-30H120v-60h120q17 0 28.5 11.5T280-280v40q0 17-11.5 28.5T240-200q17 0 28.5 11.5T280-160v40q0 17-11.5 28.5T240-80H120Zm0-280v-110q0-17 11.5-28.5T160-510h60v-30H120v-60h120q17 0 28.5 11.5T280-560v70q0 17-11.5 28.5T240-450h-60v30h100v60H120Zm60-280v-180h-60v-60h120v240h-60Zm180 440v-80h480v80H360Zm0-240v-80h480v80H360Zm0-240v-80h480v80H360Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-80v-60h100v-30h-60v-60h60v-30H120v-60h120q17 0 28.5 11.5T280-280v40q0 17-11.5 28.5T240-200q17 0 28.5 11.5T280-160v40q0 17-11.5 28.5T240-80H120Zm0-280v-110q0-17 11.5-28.5T160-510h60v-30H120v-60h120q17 0 28.5 11.5T280-560v70q0 17-11.5 28.5T240-450h-60v30h100v60H120Zm60-280v-180h-60v-60h120v240h-60Zm180 440v-80h480v80H360Zm0-240v-80h480v80H360Zm0-240v-80h480v80H360Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table.svg b/resources/icons/editor/table.svg
new file mode 100644
index 00000000000..15425063c40
--- /dev/null
+++ b/resources/icons/editor/table.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200q-33 0-56.5-23.5T120-200Zm80-400h560v-160H200v160Zm213 200h134v-120H413v120Zm0 200h134v-120H413v120ZM200-400h133v-120H200v120Zm427 0h133v-120H627v120ZM200-200h133v-120H200v120Zm427 0h133v-120H627v120Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/text-color.svg b/resources/icons/editor/text-color.svg
new file mode 100644
index 00000000000..a862e19629f
--- /dev/null
+++ b/resources/icons/editor/text-color.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 -960 960 960" xmlns="http://www.w3.org/2000/svg"><path class="editor-icon-color-bar" d="m80-3e-6v-160h800v160z"/><path d="m220-280 210-560h100l210 560h-96l-50-144h-226l-52 144zm176-224h168l-82-232h-4z"/></svg>
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 589567c031a..5e5f0d40904 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -34,6 +34,8 @@ import redoIcon from "@icons/editor/redo.svg"
 import boldIcon from "@icons/editor/bold.svg"
 import italicIcon from "@icons/editor/italic.svg"
 import underlinedIcon from "@icons/editor/underlined.svg"
+import textColorIcon from "@icons/editor/text-color.svg";
+import highlightIcon from "@icons/editor/highlighter.svg";
 import strikethroughIcon from "@icons/editor/strikethrough.svg"
 import superscriptIcon from "@icons/editor/superscript.svg"
 import subscriptIcon from "@icons/editor/subscript.svg"
@@ -43,6 +45,7 @@ import listBulletIcon from "@icons/editor/list-bullet.svg"
 import listNumberedIcon from "@icons/editor/list-numbered.svg"
 import listCheckIcon from "@icons/editor/list-check.svg"
 import linkIcon from "@icons/editor/link.svg"
+import tableIcon from "@icons/editor/table.svg"
 import imageIcon from "@icons/editor/image.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
@@ -167,8 +170,8 @@ function buildFormatButton(label: string, format: TextFormatType, icon: string):
 export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', boldIcon);
 export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
 export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
-export const textColor: EditorBasicButtonDefinition = {label: 'Text color'};
-export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color'};
+export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
+export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color', icon: highlightIcon};
 
 export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
@@ -183,6 +186,7 @@ export const clearFormating: EditorButtonDefinition = {
             for (const node of selection?.getNodes() || []) {
                 if ($isTextNode(node)) {
                     node.setFormat(0);
+                    node.setStyle('');
                 }
             }
         });
@@ -254,6 +258,7 @@ export const link: EditorButtonDefinition = {
 
 export const table: EditorBasicButtonDefinition = {
     label: 'Table',
+    icon: tableIcon,
 };
 
 export const image: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-button.ts b/resources/js/wysiwyg/ui/framework/blocks/color-button.ts
new file mode 100644
index 00000000000..e81521a2677
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-button.ts
@@ -0,0 +1,35 @@
+import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
+import {EditorUiStateUpdate} from "../core";
+import {$isRangeSelection} from "lexical";
+import {$getSelectionStyleValueForProperty} from "@lexical/selection";
+
+export class EditorColorButton extends EditorButton {
+    protected style: string;
+
+    constructor(definition: EditorBasicButtonDefinition, style: string) {
+        super(definition);
+
+        this.style = style;
+    }
+
+    getColorBar(): HTMLElement {
+        const colorBar = this.getDOMElement().querySelector('svg .editor-icon-color-bar');
+
+        if (!colorBar) {
+            throw new Error(`Could not find expected color bar in the icon for this ${this.definition.label} button`);
+        }
+
+        return (colorBar as HTMLElement);
+    }
+
+    updateState(state: EditorUiStateUpdate): void {
+        super.updateState(state);
+
+        if ($isRangeSelection(state.selection)) {
+            const value = $getSelectionStyleValueForProperty(state.selection, this.style);
+            const colorBar = this.getColorBar();
+            colorBar.setAttribute('fill', value);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index 199c7728d8a..a419b92b28e 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -8,19 +8,23 @@ export class EditorDropdownButton extends EditorContainerUiElement {
     protected childItems: EditorUiElement[];
     protected open: boolean = false;
 
-    constructor(buttonDefinition: EditorBasicButtonDefinition, children: EditorUiElement[]) {
+    constructor(button: EditorBasicButtonDefinition|EditorButton, children: EditorUiElement[]) {
         super(children);
         this.childItems = children
 
-        this.button = new EditorButton({
-            ...buttonDefinition,
-            action() {
-                return false;
-            },
-            isActive: () => {
-                return this.open;
-            }
-        });
+        if (button instanceof EditorButton) {
+            this.button = button;
+        } else {
+            this.button = new EditorButton({
+                ...button,
+                action() {
+                    return false;
+                },
+                isActive: () => {
+                    return this.open;
+                }
+            });
+        }
 
         this.children.push(this.button);
     }
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 02f88dac8d4..7e8df076a60 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -1,7 +1,6 @@
 import {BaseSelection} from "lexical";
 import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {el} from "../../helpers";
-import {context} from "esbuild";
 
 export interface EditorBasicButtonDefinition {
     label: string;
@@ -20,9 +19,22 @@ export class EditorButton extends EditorUiElement {
     protected completedSetup: boolean = false;
     protected disabled: boolean = false;
 
-    constructor(definition: EditorButtonDefinition) {
+    constructor(definition: EditorButtonDefinition|EditorBasicButtonDefinition) {
         super();
-        this.definition = definition;
+
+        if ((definition as EditorButtonDefinition).action !== undefined) {
+            this.definition = definition as EditorButtonDefinition;
+        } else {
+            this.definition = {
+                ...definition,
+                action() {
+                    return false;
+                },
+                isActive: () => {
+                    return false;
+                }
+            };
+        }
     }
 
     setContext(context: EditorUiContext) {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 4dbf9bb7e3b..821c9f9cfea 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -16,6 +16,7 @@ import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
 import {EditorColorPicker} from "./framework/blocks/color-picker";
 import {EditorTableCreator} from "./framework/blocks/table-creator";
+import {EditorColorButton} from "./framework/blocks/color-button";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -41,10 +42,10 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(bold),
         new EditorButton(italic),
         new EditorButton(underline),
-        new EditorDropdownButton(textColor, [
+        new EditorDropdownButton(new EditorColorButton(textColor, 'color'), [
             new EditorColorPicker('color'),
         ]),
-        new EditorDropdownButton(highlightColor, [
+        new EditorDropdownButton(new EditorColorButton(highlightColor, 'background-color'), [
             new EditorColorPicker('background-color'),
         ]),
         new EditorButton(strikethrough),

From 3af22ce754db4f656a45833951b746e7db65f432 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 24 Jun 2024 20:50:17 +0100
Subject: [PATCH 175/666] Lexical: Created custom table node with col width
 handling

---
 resources/js/wysiwyg/nodes/custom-table.ts    | 180 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |  11 +-
 .../ui/framework/blocks/table-creator.ts      |   3 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  28 ++-
 4 files changed, 218 insertions(+), 4 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/custom-table.ts

diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
new file mode 100644
index 00000000000..c070e06b51d
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -0,0 +1,180 @@
+import {SerializedTableNode, TableNode, TableRowNode} from "@lexical/table";
+import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, Spread} from "lexical";
+import {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+
+export type SerializedCustomTableNode = Spread<{
+    id: string;
+    colWidths: string[];
+}, SerializedTableNode>
+
+export class CustomTableNode extends TableNode {
+    __id: string = '';
+    __colWidths: string[] = [];
+
+    static getType() {
+        return 'custom-table';
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    setColWidths(widths: string[]) {
+        const self = this.getWritable();
+        self.__colWidths = widths;
+    }
+
+    getColWidths(): string[] {
+        const self = this.getLatest();
+        return self.__colWidths;
+    }
+
+    static clone(node: CustomTableNode) {
+        const newNode = new CustomTableNode(node.__key);
+        newNode.__id = node.__id;
+        newNode.__colWidths = node.__colWidths;
+        return newNode;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const dom = super.createDOM(config);
+        const id = this.getId();
+        if (id) {
+            dom.setAttribute('id', id);
+        }
+
+        const colWidths = this.getColWidths();
+        if (colWidths.length > 0) {
+            const colgroup = el('colgroup');
+            for (const width of colWidths) {
+                const col = el('col');
+                if (width) {
+                    col.style.width = width;
+                }
+                colgroup.append(col);
+            }
+            dom.append(colgroup);
+        }
+
+        return dom;
+    }
+
+    updateDOM(): boolean {
+        return true;
+    }
+
+    exportJSON(): SerializedCustomTableNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-table',
+            version: 1,
+            id: this.__id,
+            colWidths: this.__colWidths,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomTableNode): CustomTableNode {
+        const node = $createCustomTableNode();
+        node.setId(serializedNode.id);
+        node.setColWidths(serializedNode.colWidths);
+        return node;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            table(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        const node = $createCustomTableNode();
+
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
+
+                        const colWidths = getTableColumnWidths(element as HTMLTableElement);
+                        node.setColWidths(colWidths);
+
+                        return {node};
+                    },
+                    priority: 1,
+                };
+            },
+        };
+    }
+}
+
+function getTableColumnWidths(table: HTMLTableElement): string[] {
+    const rows = table.querySelectorAll('tr');
+    let maxColCount: number = 0;
+    let maxColRow: HTMLTableRowElement|null = null;
+
+    for (const row of rows) {
+        if (row.childElementCount > maxColCount) {
+            maxColRow = row;
+            maxColCount = row.childElementCount;
+        }
+    }
+
+    const colGroup = table.querySelector('colgroup');
+    let widths: string[] = [];
+    if (colGroup && colGroup.childElementCount === maxColCount) {
+        widths = extractWidthsFromRow(colGroup);
+    }
+    if (widths.filter(Boolean).length === 0 && maxColRow) {
+        widths = extractWidthsFromRow(maxColRow);
+    }
+
+    return widths;
+}
+
+function extractWidthsFromRow(row: HTMLTableRowElement|HTMLTableColElement) {
+    return [...row.children].map(child => extractWidthFromElement(child as HTMLElement))
+}
+
+function extractWidthFromElement(element: HTMLElement): string {
+    let width = element.style.width || element.getAttribute('width');
+    if (!Number.isNaN(Number(width))) {
+        width = width + 'px';
+    }
+
+    return width || '';
+}
+
+export function $createCustomTableNode(): CustomTableNode {
+    return new CustomTableNode();
+}
+
+export function $isCustomTableNode(node: LexicalNode | null | undefined): boolean {
+    return node instanceof CustomTableNode;
+}
+
+export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number, width: number): void {
+    const rows = node.getChildren() as TableRowNode[];
+    let maxCols = 0;
+    for (const row of rows) {
+        const cellCount = row.getChildren().length;
+        if (cellCount > maxCols) {
+            maxCols = cellCount;
+        }
+    }
+
+    let colWidths = node.getColWidths();
+    if (colWidths.length === 0 || colWidths.length < maxCols) {
+        colWidths = Array(maxCols).fill('');
+    }
+
+    if (columnIndex + 1 > colWidths.length) {
+        console.error(`Attempted to set table column width for column [${columnIndex}] but only ${colWidths.length} columns found`);
+    }
+
+    colWidths[columnIndex] = width + 'px';
+    node.setColWidths(colWidths);
+    console.log('setting col widths', node, colWidths);
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index ea6206ac2ba..6b1b66e6678 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -7,6 +7,7 @@ import {ImageNode} from "./image";
 import {DetailsNode, SummaryNode} from "./details";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
+import {CustomTableNode} from "./custom-table";
 
 /**
  * Load the nodes for lexical.
@@ -18,19 +19,25 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         QuoteNode, // Todo - Create custom
         ListNode, // Todo - Create custom
         ListItemNode,
-        TableNode, // Todo - Create custom,
+        CustomTableNode,
         TableRowNode,
         TableCellNode,
         ImageNode,
         DetailsNode, SummaryNode,
         CustomParagraphNode,
+        LinkNode,
         {
             replace: ParagraphNode,
             with: (node: ParagraphNode) => {
                 return new CustomParagraphNode();
             }
         },
-        LinkNode,
+        {
+            replace: TableNode,
+            with(node: TableNode) {
+                return new CustomTableNode();
+            }
+        },
     ];
 }
 
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index c54645856ab..8c28953d566 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -1,6 +1,7 @@
 import {el, insertNewBlockNodeAtSelection} from "../../../helpers";
 import {EditorUiElement} from "../core";
 import {$createTableNodeWithDimensions} from "@lexical/table";
+import {CustomTableNode} from "../../../nodes/custom-table";
 
 
 export class EditorTableCreator extends EditorUiElement {
@@ -73,7 +74,7 @@ export class EditorTableCreator extends EditorUiElement {
         }
 
         this.getContext().editor.update(() => {
-            const table = $createTableNodeWithDimensions(rows, columns, false);
+            const table = $createTableNodeWithDimensions(rows, columns, false) as CustomTableNode;
             insertNewBlockNodeAtSelection(table);
         });
     }
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 821c9f9cfea..7f7e99a785a 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -9,7 +9,7 @@ import {
     undo,
     warningCallout
 } from "./defaults/button-definitions";
-import {EditorContainerUiElement, EditorSimpleClassContainer} from "./framework/core";
+import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext} from "./framework/core";
 import {el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
@@ -17,6 +17,8 @@ import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
 import {EditorColorPicker} from "./framework/blocks/color-picker";
 import {EditorTableCreator} from "./framework/blocks/table-creator";
 import {EditorColorButton} from "./framework/blocks/color-button";
+import {$isCustomTableNode, $setTableColumnWidth, CustomTableNode} from "../nodes/custom-table";
+import {$getRoot} from "lexical";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -69,5 +71,29 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
         // Meta elements
         new EditorButton(source),
+
+        // Test
+        new EditorButton({
+            label: 'Expand table col 2',
+            action(context: EditorUiContext) {
+                context.editor.update(() => {
+                    const root = $getRoot();
+                    let table: CustomTableNode|null = null;
+                    for (const child of root.getChildren()) {
+                        if ($isCustomTableNode(child)) {
+                            table = child as CustomTableNode;
+                            break;
+                        }
+                    }
+
+                    if (table) {
+                        $setTableColumnWidth(table, 1, 500);
+                    }
+                });
+            },
+            isActive() {
+                return false;
+            }
+        })
     ]);
 }
\ No newline at end of file

From 59936631ecfe1cfd1a987a91f6b550124df35396 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 25 Jun 2024 18:33:29 +0100
Subject: [PATCH 176/666] Lexical: Extracted mouse drag tracking to new helper

---
 resources/js/wysiwyg/ui/decorators/image.ts   | 118 ++++++++----------
 .../framework/helpers/mouse-drag-tracker.ts   |  76 +++++++++++
 .../ui/framework/helpers/table-resizer.ts     |  21 +++-
 3 files changed, 149 insertions(+), 66 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/mouse-drag-tracker.ts

diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index 1692d078d0c..1e8bfd165a9 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -3,6 +3,7 @@ import {el} from "../../helpers";
 import {$createNodeSelection, $setSelection} from "lexical";
 import {EditorUiContext} from "../framework/core";
 import {ImageNode} from "../../nodes/image";
+import {MouseDragTracker, MouseDragTrackerDistance} from "../framework/helpers/mouse-drag-tracker";
 
 
 export class ImageDecorator extends EditorDecorator {
@@ -15,6 +16,7 @@ export class ImageDecorator extends EditorDecorator {
             class: 'editor-image-decorator',
         }, []);
         let selected = false;
+        let tracker: MouseDragTracker|null = null;
 
         const windowClick = (event: MouseEvent) => {
             if (!decorateEl.contains(event.target as Node) && (Date.now() - this.dragLastMouseUp > 100)) {
@@ -22,14 +24,6 @@ export class ImageDecorator extends EditorDecorator {
             }
         };
 
-        const mouseDown = (event: MouseEvent) => {
-            const handle = (event.target as HTMLElement).closest('.editor-image-decorator-handle') as HTMLElement|null;
-            if (handle) {
-                // handlingResize = true;
-                this.startHandlingResize(handle, event, context);
-            }
-        };
-
         const select = () => {
             if (selected) {
                 return;
@@ -44,7 +38,7 @@ export class ImageDecorator extends EditorDecorator {
                 return el('div', {class: `editor-image-decorator-handle ${c}`});
             });
             decorateEl.append(...handleElems);
-            decorateEl.addEventListener('mousedown', mouseDown);
+            tracker = this.setupTracker(decorateEl, context);
 
             context.editor.update(() => {
                 const nodeSelection = $createNodeSelection();
@@ -55,10 +49,9 @@ export class ImageDecorator extends EditorDecorator {
 
         const unselect = () => {
             selected = false;
-            // handlingResize = false;
             decorateEl.classList.remove('selected');
             window.removeEventListener('click', windowClick);
-            decorateEl.removeEventListener('mousedown', mouseDown);
+            tracker?.teardown();
             for (const el of handleElems) {
                 el.remove();
             }
@@ -80,62 +73,61 @@ export class ImageDecorator extends EditorDecorator {
         return this.dom;
     }
 
-    startHandlingResize(element: HTMLElement, event: MouseEvent, context: EditorUiContext) {
-        const startingX = event.screenX;
-        const startingY = event.screenY;
-        const node = this.getNode() as ImageNode;
-        let startingWidth = element.clientWidth;
-        let startingHeight = element.clientHeight;
-        let startingRatio = startingWidth / startingHeight;
+    setupTracker(container: HTMLElement, context: EditorUiContext): MouseDragTracker {
+        let startingWidth: number = 0;
+        let startingHeight: number = 0;
+        let startingRatio: number = 0;
         let hasHeight = false;
         let firstChange = true;
-        context.editor.getEditorState().read(() => {
-            startingWidth = node.getWidth() || startingWidth;
-            startingHeight = node.getHeight() || startingHeight;
-            if (node.getHeight()) {
-                hasHeight = true;
+        let node: ImageNode = this.getNode() as ImageNode;
+        let _this = this;
+        let flipXChange: boolean = false;
+        let flipYChange: boolean = false;
+
+        return new MouseDragTracker(container, '.editor-image-decorator-handle', {
+            down(event: MouseEvent, handle: HTMLElement) {
+                context.editor.getEditorState().read(() => {
+                    startingWidth = node.getWidth() || startingWidth;
+                    startingHeight = node.getHeight() || startingHeight;
+                    if (node.getHeight()) {
+                        hasHeight = true;
+                    }
+                    startingRatio = startingWidth / startingHeight;
+                });
+
+                flipXChange = handle.classList.contains('nw') || handle.classList.contains('sw');
+                flipYChange = handle.classList.contains('nw') || handle.classList.contains('ne');
+            },
+            move(event: MouseEvent, handle: HTMLElement, distance: MouseDragTrackerDistance) {
+                let xChange = distance.x;
+                if (flipXChange) {
+                    xChange = 0 - xChange;
+                }
+                let yChange = distance.y;
+                if (flipYChange) {
+                    yChange = 0 - yChange;
+                }
+                const balancedChange = Math.sqrt(Math.pow(Math.abs(xChange), 2) + Math.pow(Math.abs(yChange), 2));
+                const increase = xChange + yChange > 0;
+                const directedChange = increase ? balancedChange : 0-balancedChange;
+                const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
+                let newHeight = 0;
+                if (hasHeight) {
+                    newHeight = newWidth * startingRatio;
+                }
+
+                const updateOptions = firstChange ? {} : {tag: 'history-merge'};
+                context.editor.update(() => {
+                    const node = _this.getNode() as ImageNode;
+                    node.setWidth(newWidth);
+                    node.setHeight(newHeight);
+                }, updateOptions);
+                firstChange = false;
+            },
+            up() {
+                _this.dragLastMouseUp = Date.now();
             }
-            startingRatio = startingWidth / startingHeight;
         });
-
-        const flipXChange = element.classList.contains('nw') || element.classList.contains('sw');
-        const flipYChange = element.classList.contains('nw') || element.classList.contains('ne');
-
-        const mouseMoveListener = (event: MouseEvent) => {
-            let xChange = event.screenX - startingX;
-            if (flipXChange) {
-                xChange = 0 - xChange;
-            }
-            let yChange = event.screenY - startingY;
-            if (flipYChange) {
-                yChange = 0 - yChange;
-            }
-            const balancedChange = Math.sqrt(Math.pow(Math.abs(xChange), 2) + Math.pow(Math.abs(yChange), 2));
-            const increase = xChange + yChange > 0;
-            const directedChange = increase ? balancedChange : 0-balancedChange;
-            const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
-            let newHeight = 0;
-            if (hasHeight) {
-                newHeight = newWidth * startingRatio;
-            }
-
-            const updateOptions = firstChange ? {} : {tag: 'history-merge'};
-            context.editor.update(() => {
-                const node = this.getNode() as ImageNode;
-                node.setWidth(newWidth);
-                node.setHeight(newHeight);
-            }, updateOptions);
-            firstChange = false;
-        };
-
-        const mouseUpListener = (event: MouseEvent) => {
-            window.removeEventListener('mousemove', mouseMoveListener);
-            window.removeEventListener('mouseup', mouseUpListener);
-            this.dragLastMouseUp = Date.now();
-        };
-
-        window.addEventListener('mousemove', mouseMoveListener);
-        window.addEventListener('mouseup', mouseUpListener);
     }
 
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/mouse-drag-tracker.ts b/resources/js/wysiwyg/ui/framework/helpers/mouse-drag-tracker.ts
new file mode 100644
index 00000000000..141f9b20f6a
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/mouse-drag-tracker.ts
@@ -0,0 +1,76 @@
+
+export type MouseDragTrackerDistance = {
+    x: number;
+    y: number;
+}
+
+export type MouseDragTrackerOptions = {
+    down?: (event: MouseEvent, element: HTMLElement) => any;
+    move?: (event: MouseEvent, element: HTMLElement, distance: MouseDragTrackerDistance) => any;
+    up?: (event: MouseEvent, element: HTMLElement, distance: MouseDragTrackerDistance) => any;
+}
+
+export class MouseDragTracker {
+    protected container: HTMLElement;
+    protected dragTargetSelector: string;
+    protected options: MouseDragTrackerOptions;
+
+    protected startX: number = 0;
+    protected startY: number = 0;
+    protected target: HTMLElement|null = null;
+
+    constructor(container: HTMLElement, dragTargetSelector: string, options: MouseDragTrackerOptions) {
+        this.container = container;
+        this.dragTargetSelector = dragTargetSelector;
+        this.options = options;
+
+        this.onMouseDown = this.onMouseDown.bind(this);
+        this.onMouseMove = this.onMouseMove.bind(this);
+        this.onMouseUp = this.onMouseUp.bind(this);
+        this.container.addEventListener('mousedown', this.onMouseDown);
+    }
+
+    teardown() {
+        this.container.removeEventListener('mousedown', this.onMouseDown);
+        this.container.removeEventListener('mouseup', this.onMouseUp);
+        this.container.removeEventListener('mousemove', this.onMouseMove);
+    }
+
+    protected onMouseDown(event: MouseEvent) {
+        this.target = (event.target as HTMLElement).closest(this.dragTargetSelector);
+        if (!this.target) {
+            return;
+        }
+
+        this.startX = event.screenX;
+        this.startY = event.screenY;
+
+        window.addEventListener('mousemove', this.onMouseMove);
+        window.addEventListener('mouseup', this.onMouseUp);
+        if (this.options.down) {
+            this.options.down(event, this.target);
+        }
+    }
+
+    protected onMouseMove(event: MouseEvent) {
+        if (this.options.move && this.target) {
+            this.options.move(event, this.target, {
+                x: event.screenX - this.startX,
+                y: event.screenY - this.startY,
+            });
+        }
+    }
+
+    protected onMouseUp(event: MouseEvent) {
+        window.removeEventListener('mousemove', this.onMouseMove);
+        window.removeEventListener('mouseup', this.onMouseUp);
+
+        if (this.options.up && this.target) {
+            this.options.up(event, this.target, {
+                x: event.screenX - this.startX,
+                y: event.screenY - this.startY,
+            });
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 53017e93b93..ccf269daa0f 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -1,5 +1,6 @@
 import {LexicalEditor} from "lexical";
 import {el} from "../../../helpers";
+import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 
 type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
@@ -7,6 +8,7 @@ class TableResizer {
     protected editor: LexicalEditor;
     protected editArea: HTMLElement;
     protected markerDom: MarkerDomRecord|null = null;
+    protected mouseTracker: MouseDragTracker|null = null;
 
     constructor(editor: LexicalEditor, editArea: HTMLElement) {
         this.editor = editor;
@@ -49,14 +51,27 @@ class TableResizer {
     getMarkers(): MarkerDomRecord {
         if (!this.markerDom) {
             this.markerDom = {
-                x: el('div', {class: 'editor-table-marker-column'}),
-                y: el('div', {class: 'editor-table-marker-row'}),
+                x: el('div', {class: 'editor-table-marker editor-table-marker-column'}),
+                y: el('div', {class: 'editor-table-marker editor-table-marker-row'}),
             }
-            this.editArea.after(this.markerDom.x, this.markerDom.y);
+            const wrapper = el('div', {
+                class: 'editor-table-marker-wrap',
+            }, [this.markerDom.x, this.markerDom.y]);
+            this.editArea.after(wrapper);
+            this.watchMarkerMouseDrags(wrapper);
         }
 
         return this.markerDom;
     }
+
+    watchMarkerMouseDrags(wrapper: HTMLElement) {
+        this.mouseTracker = new MouseDragTracker(wrapper, '.editor-table-marker', {
+            up(event: MouseEvent, marker: HTMLElement, distance: MouseDragTrackerDistance) {
+                console.log('up', distance, marker);
+                // TODO - Update row/column for distance
+            }
+        });
+    }
 }
 
 

From b1130cb1c32f5993bf40a763186793ec0824b8a9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 26 Jun 2024 13:52:00 +0100
Subject: [PATCH 177/666] Lexical: Linked up table resize handler (unfinished)

---
 resources/js/wysiwyg/nodes/custom-table.ts    | 50 ++++++++----
 .../ui/framework/helpers/table-resizer.ts     | 77 +++++++++++++++++--
 resources/sass/_editor.scss                   |  5 +-
 3 files changed, 110 insertions(+), 22 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index c070e06b51d..1107f0a906b 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -1,5 +1,5 @@
 import {SerializedTableNode, TableNode, TableRowNode} from "@lexical/table";
-import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, Spread} from "lexical";
+import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalEditor, LexicalNode, Spread} from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {el} from "../helpers";
 
@@ -111,6 +111,21 @@ export class CustomTableNode extends TableNode {
 }
 
 function getTableColumnWidths(table: HTMLTableElement): string[] {
+    const maxColRow = getMaxColRowFromTable(table);
+
+    const colGroup = table.querySelector('colgroup');
+    let widths: string[] = [];
+    if (colGroup && (colGroup.childElementCount === maxColRow?.childElementCount || !maxColRow)) {
+        widths = extractWidthsFromRow(colGroup);
+    }
+    if (widths.filter(Boolean).length === 0 && maxColRow) {
+        widths = extractWidthsFromRow(maxColRow);
+    }
+
+    return widths;
+}
+
+function getMaxColRowFromTable(table: HTMLTableElement): HTMLTableRowElement|null {
     const rows = table.querySelectorAll('tr');
     let maxColCount: number = 0;
     let maxColRow: HTMLTableRowElement|null = null;
@@ -122,16 +137,7 @@ function getTableColumnWidths(table: HTMLTableElement): string[] {
         }
     }
 
-    const colGroup = table.querySelector('colgroup');
-    let widths: string[] = [];
-    if (colGroup && colGroup.childElementCount === maxColCount) {
-        widths = extractWidthsFromRow(colGroup);
-    }
-    if (widths.filter(Boolean).length === 0 && maxColRow) {
-        widths = extractWidthsFromRow(maxColRow);
-    }
-
-    return widths;
+    return maxColRow;
 }
 
 function extractWidthsFromRow(row: HTMLTableRowElement|HTMLTableColElement) {
@@ -140,7 +146,7 @@ function extractWidthsFromRow(row: HTMLTableRowElement|HTMLTableColElement) {
 
 function extractWidthFromElement(element: HTMLElement): string {
     let width = element.style.width || element.getAttribute('width');
-    if (!Number.isNaN(Number(width))) {
+    if (width && !Number.isNaN(Number(width))) {
         width = width + 'px';
     }
 
@@ -176,5 +182,23 @@ export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number,
 
     colWidths[columnIndex] = width + 'px';
     node.setColWidths(colWidths);
-    console.log('setting col widths', node, colWidths);
+}
+
+export function $getTableColumnWidth(editor: LexicalEditor, node: CustomTableNode, columnIndex: number): number {
+    const colWidths = node.getColWidths();
+    if (colWidths.length > columnIndex && colWidths[columnIndex].endsWith('px')) {
+        return Number(colWidths[columnIndex].replace('px', ''));
+    }
+
+    // Otherwise, get from table element
+    const table = editor.getElementByKey(node.__key) as HTMLTableElement|null;
+    if (table) {
+        const maxColRow = getMaxColRowFromTable(table);
+        if (maxColRow && maxColRow.children.length > columnIndex) {
+            const cell = maxColRow.children[columnIndex];
+            return cell.clientWidth;
+        }
+    }
+
+    return 0;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index ccf269daa0f..869de8460d2 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -1,6 +1,7 @@
-import {LexicalEditor} from "lexical";
+import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
 import {el} from "../../../helpers";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
+import {$getTableColumnWidth, $setTableColumnWidth, CustomTableNode} from "../../../nodes/custom-table";
 
 type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
@@ -9,6 +10,10 @@ class TableResizer {
     protected editArea: HTMLElement;
     protected markerDom: MarkerDomRecord|null = null;
     protected mouseTracker: MouseDragTracker|null = null;
+    protected dragging: boolean = false;
+    protected targetCell: HTMLElement|null = null;
+    protected xMarkerAtStart : boolean = false;
+    protected yMarkerAtStart : boolean = false;
 
     constructor(editor: LexicalEditor, editArea: HTMLElement) {
         this.editor = editor;
@@ -19,7 +24,7 @@ class TableResizer {
     setupListeners() {
         this.editArea.addEventListener('mousemove', event => {
             const cell = (event.target as HTMLElement).closest('td,th');
-            if (cell) {
+            if (cell && !this.dragging) {
                 this.onCellMouseMove(cell as HTMLElement, event);
             }
         });
@@ -29,8 +34,13 @@ class TableResizer {
         const rect = cell.getBoundingClientRect();
         const midX = rect.left + (rect.width / 2);
         const midY = rect.top + (rect.height / 2);
-        const xMarkerPos = event.clientX <= midX ? rect.left : rect.right;
-        const yMarkerPos = event.clientY <= midY ? rect.top : rect.bottom;
+
+        this.targetCell = cell;
+        this.xMarkerAtStart = event.clientX <= midX;
+        this.yMarkerAtStart = event.clientY <= midY;
+
+        const xMarkerPos = this.xMarkerAtStart ? rect.left : rect.right;
+        const yMarkerPos = this.yMarkerAtStart ? rect.top : rect.bottom;
         this.updateMarkersTo(cell, xMarkerPos, yMarkerPos);
     }
 
@@ -65,13 +75,68 @@ class TableResizer {
     }
 
     watchMarkerMouseDrags(wrapper: HTMLElement) {
+        const _this = this;
+        let markerStart: number = 0;
+        let markerProp: 'left' | 'top' = 'left';
+
         this.mouseTracker = new MouseDragTracker(wrapper, '.editor-table-marker', {
+            down(event: MouseEvent, marker: HTMLElement) {
+                marker.classList.add('active');
+                _this.dragging = true;
+
+                markerProp = marker.classList.contains('editor-table-marker-column') ? 'left' : 'top';
+                markerStart = Number(marker.style[markerProp].replace('px', ''));
+            },
+            move(event: MouseEvent, marker: HTMLElement, distance: MouseDragTrackerDistance) {
+                  marker.style[markerProp] = (markerStart + distance[markerProp === 'left' ? 'x' : 'y']) + 'px';
+            },
             up(event: MouseEvent, marker: HTMLElement, distance: MouseDragTrackerDistance) {
-                console.log('up', distance, marker);
-                // TODO - Update row/column for distance
+                marker.classList.remove('active');
+                marker.style.left = '0';
+                marker.style.top = '0';
+
+                _this.dragging = false;
+                console.log('up', distance, marker, markerProp, _this.targetCell);
+                const parentTable = _this.targetCell?.closest('table');
+
+                if (markerProp === 'left' && _this.targetCell && parentTable) {
+                    const cellIndex = _this.getTargetCellColumnIndex();
+                    _this.editor.update(() => {
+                        const table = $getNearestNodeFromDOMNode(parentTable);
+                        if (table instanceof CustomTableNode) {
+                            const originalWidth = $getTableColumnWidth(_this.editor, table, cellIndex);
+                            const newWidth = Math.max(originalWidth + distance.x, 10);
+                            $setTableColumnWidth(table, cellIndex, newWidth);
+                        }
+                    });
+                }
             }
         });
     }
+
+    getTargetCellColumnIndex(): number {
+        const cell = this.targetCell;
+        if (cell === null) {
+            return -1;
+        }
+
+        let index = 0;
+        const row = cell.parentElement;
+        for (const rowCell of row?.children || []) {
+            let size = Number(rowCell.getAttribute('colspan'));
+            if (Number.isNaN(size) || size < 1) {
+                size = 1;
+            }
+
+            index += size;
+
+            if (rowCell === cell) {
+                return index - 1;
+            }
+        }
+
+        return -1;
+    }
 }
 
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index b5ee69d9820..a4b0e632f28 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -169,14 +169,13 @@
   }
 }
 
-.editor-table-marker-row,
-.editor-table-marker-column {
+.editor-table-marker {
   position: fixed;
   background-color: var(--editor-color-primary);
   z-index: 99;
   user-select: none;
   opacity: 0;
-  &:hover {
+  &:hover, &.active {
     opacity: 0.4;
   }
 }

From 72a0e081ca29657e9960c8a234aff262c90f8d9f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 26 Jun 2024 17:22:00 +0100
Subject: [PATCH 178/666] Lexical: Completed initial table cell resize handle
 logic

---
 .../ui/framework/helpers/table-resizer.ts     | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 869de8460d2..8f1e978e9dc 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -2,6 +2,7 @@ import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
 import {el} from "../../../helpers";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {$getTableColumnWidth, $setTableColumnWidth, CustomTableNode} from "../../../nodes/custom-table";
+import {TableRowNode} from "@lexical/table";
 
 type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
@@ -18,19 +19,28 @@ class TableResizer {
     constructor(editor: LexicalEditor, editArea: HTMLElement) {
         this.editor = editor;
         this.editArea = editArea;
+
         this.setupListeners();
     }
 
-    setupListeners() {
-        this.editArea.addEventListener('mousemove', event => {
-            const cell = (event.target as HTMLElement).closest('td,th');
-            if (cell && !this.dragging) {
-                this.onCellMouseMove(cell as HTMLElement, event);
-            }
-        });
+    teardown() {
+        this.editArea.removeEventListener('mousemove', this.onCellMouseMove);
+        if (this.mouseTracker) {
+            this.mouseTracker.teardown();
+        }
     }
 
-    onCellMouseMove(cell: HTMLElement, event: MouseEvent) {
+    protected setupListeners() {
+        this.onCellMouseMove = this.onCellMouseMove.bind(this);
+        this.editArea.addEventListener('mousemove', this.onCellMouseMove);
+    }
+
+    protected onCellMouseMove(event: MouseEvent) {
+        const cell = (event.target as HTMLElement).closest('td,th') as HTMLElement;
+        if (!cell || this.dragging) {
+            return;
+        }
+
         const rect = cell.getBoundingClientRect();
         const midX = rect.left + (rect.width / 2);
         const midY = rect.top + (rect.height / 2);
@@ -44,7 +54,7 @@ class TableResizer {
         this.updateMarkersTo(cell, xMarkerPos, yMarkerPos);
     }
 
-    updateMarkersTo(cell: HTMLElement, xPos: number, yPos: number) {
+    protected updateMarkersTo(cell: HTMLElement, xPos: number, yPos: number) {
         const markers: MarkerDomRecord = this.getMarkers();
         const table = cell.closest('table') as HTMLElement;
         const tableRect = table.getBoundingClientRect();
@@ -58,7 +68,7 @@ class TableResizer {
         markers.y.style.width = tableRect.width + 'px';
     }
 
-    getMarkers(): MarkerDomRecord {
+    protected getMarkers(): MarkerDomRecord {
         if (!this.markerDom) {
             this.markerDom = {
                 x: el('div', {class: 'editor-table-marker editor-table-marker-column'}),
@@ -74,7 +84,7 @@ class TableResizer {
         return this.markerDom;
     }
 
-    watchMarkerMouseDrags(wrapper: HTMLElement) {
+    protected watchMarkerMouseDrags(wrapper: HTMLElement) {
         const _this = this;
         let markerStart: number = 0;
         let markerProp: 'left' | 'top' = 'left';
@@ -96,25 +106,55 @@ class TableResizer {
                 marker.style.top = '0';
 
                 _this.dragging = false;
-                console.log('up', distance, marker, markerProp, _this.targetCell);
                 const parentTable = _this.targetCell?.closest('table');
 
                 if (markerProp === 'left' && _this.targetCell && parentTable) {
-                    const cellIndex = _this.getTargetCellColumnIndex();
+                    let cellIndex = _this.getTargetCellColumnIndex();
+                    let change = distance.x;
+                    if (_this.xMarkerAtStart && cellIndex > 0) {
+                        cellIndex -= 1;
+                    } else if  (_this.xMarkerAtStart && cellIndex === 0) {
+                        change = -change;
+                    }
+
                     _this.editor.update(() => {
                         const table = $getNearestNodeFromDOMNode(parentTable);
                         if (table instanceof CustomTableNode) {
                             const originalWidth = $getTableColumnWidth(_this.editor, table, cellIndex);
-                            const newWidth = Math.max(originalWidth + distance.x, 10);
+                            const newWidth = Math.max(originalWidth + change, 10);
                             $setTableColumnWidth(table, cellIndex, newWidth);
                         }
                     });
                 }
+
+                if (markerProp === 'top' && _this.targetCell) {
+                    const cellElement = _this.targetCell;
+
+                    _this.editor.update(() => {
+                        const cellNode = $getNearestNodeFromDOMNode(cellElement);
+                        const rowNode = cellNode?.getParent();
+                        let rowIndex = rowNode?.getIndexWithinParent() || 0;
+
+                        let change = distance.y;
+                        if (_this.yMarkerAtStart && rowIndex > 0) {
+                            rowIndex -= 1;
+                        } else if  (_this.yMarkerAtStart && rowIndex === 0) {
+                            change = -change;
+                        }
+
+                        const targetRow = rowNode?.getParent()?.getChildren()[rowIndex];
+                        if (targetRow instanceof TableRowNode) {
+                            const height  = targetRow.getHeight() || 0;
+                            const newHeight = Math.max(height + change, 10);
+                            targetRow.setHeight(newHeight);
+                        }
+                    });
+                }
             }
         });
     }
 
-    getTargetCellColumnIndex(): number {
+    protected getTargetCellColumnIndex(): number {
         const cell = this.targetCell;
         if (cell === null) {
             return -1;
@@ -143,6 +183,7 @@ class TableResizer {
 export function registerTableResizer(editor: LexicalEditor, editorArea: HTMLElement): (() => void) {
     const resizer = new TableResizer(editor, editorArea);
 
-    // TODO - Strip/close down resizer
-    return () => {};
+    return () => {
+        resizer.teardown();
+    };
 }
\ No newline at end of file

From 4e2820d6e3be9d2eb1290d5e4e11ed583354a2ad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 27 Jun 2024 15:48:06 +0100
Subject: [PATCH 179/666] Lexical: Added horizontal rule node

---
 resources/js/wysiwyg/helpers.ts               |  8 ++-
 resources/js/wysiwyg/nodes/horizontal-rule.ts | 64 +++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |  2 +
 .../wysiwyg/ui/defaults/button-definitions.ts | 17 ++++-
 resources/js/wysiwyg/ui/toolbars.ts           | 18 ++----
 5 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/horizontal-rule.ts

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 62e9457213e..64bcb64902e 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -80,12 +80,16 @@ export function toggleSelectionBlockNodeType(editor: LexicalEditor, matcher: Lex
     });
 }
 
-export function insertNewBlockNodeAtSelection(node: LexicalNode) {
+export function insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: boolean = true) {
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
 
     if (blockElement) {
-        blockElement.insertAfter(node);
+        if (insertAfter) {
+            blockElement.insertAfter(node);
+        } else {
+            blockElement.insertBefore(node);
+        }
     } else {
         $getRoot().append(node);
     }
diff --git a/resources/js/wysiwyg/nodes/horizontal-rule.ts b/resources/js/wysiwyg/nodes/horizontal-rule.ts
new file mode 100644
index 00000000000..fbd019e7299
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/horizontal-rule.ts
@@ -0,0 +1,64 @@
+import {
+    DOMConversion,
+    DOMConversionMap, DOMConversionOutput,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode,
+    SerializedElementNode,
+} from 'lexical';
+import type {EditorConfig} from "lexical/LexicalEditor";
+
+export class HorizontalRuleNode extends ElementNode {
+
+    static getType() {
+        return 'horizontal-rule';
+    }
+
+    static clone(node: HorizontalRuleNode): HorizontalRuleNode {
+        return new HorizontalRuleNode(node.__key);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        return document.createElement('hr');
+    }
+
+    updateDOM(prevNode: unknown, dom: HTMLElement) {
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            hr(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        return {
+                            node: new HorizontalRuleNode(),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedElementNode {
+        return {
+            ...super.exportJSON(),
+            type: 'horizontal-rule',
+            version: 1,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedElementNode): HorizontalRuleNode {
+        return $createHorizontalRuleNode();
+    }
+
+}
+
+export function $createHorizontalRuleNode() {
+    return new HorizontalRuleNode();
+}
+
+export function $isHorizontalRuleNode(node: LexicalNode | null | undefined) {
+    return node instanceof HorizontalRuleNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 6b1b66e6678..befc2ab2e05 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -8,6 +8,7 @@ import {DetailsNode, SummaryNode} from "./details";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {CustomTableNode} from "./custom-table";
+import {HorizontalRuleNode} from "./horizontal-rule";
 
 /**
  * Load the nodes for lexical.
@@ -23,6 +24,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         TableRowNode,
         TableCellNode,
         ImageNode,
+        HorizontalRuleNode,
         DetailsNode, SummaryNode,
         CustomParagraphNode,
         LinkNode,
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 5e5f0d40904..aa8b27ec56c 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -9,7 +9,7 @@ import {
     UNDO_COMMAND
 } from "lexical";
 import {
-    getNodeFromSelection,
+    getNodeFromSelection, insertNewBlockNodeAtSelection,
     selectionContainsNodeType,
     selectionContainsTextFormat,
     toggleSelectionBlockNodeType
@@ -47,8 +47,10 @@ import listCheckIcon from "@icons/editor/list-check.svg"
 import linkIcon from "@icons/editor/link.svg"
 import tableIcon from "@icons/editor/table.svg"
 import imageIcon from "@icons/editor/image.svg"
+import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
+import {$createHorizontalRuleNode, $isHorizontalRuleNode, HorizontalRuleNode} from "../../nodes/horizontal-rule";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -294,6 +296,19 @@ export const image: EditorButtonDefinition = {
     }
 };
 
+export const horizontalRule: EditorButtonDefinition = {
+    label: 'Insert horizontal line',
+    icon: horizontalRuleIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isHorizontalRuleNode);
+    }
+};
+
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
     icon: detailsIcon,
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 7f7e99a785a..a8ba52c5f42 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -2,7 +2,7 @@ import {EditorButton} from "./framework/buttons";
 import {
     blockquote, bold, bulletList, clearFormating, code,
     dangerCallout, details,
-    h2, h3, h4, h5, highlightColor, image,
+    h2, h3, h4, h5, highlightColor, horizontalRule, image,
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
     successCallout, superscript, table, taskList, textColor, underline,
@@ -67,6 +67,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorTableCreator(),
         ]),
         new EditorButton(image),
+        new EditorButton(horizontalRule),
         new EditorButton(details),
 
         // Meta elements
@@ -74,21 +75,10 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
         // Test
         new EditorButton({
-            label: 'Expand table col 2',
+            label: 'Test button',
             action(context: EditorUiContext) {
                 context.editor.update(() => {
-                    const root = $getRoot();
-                    let table: CustomTableNode|null = null;
-                    for (const child of root.getChildren()) {
-                        if ($isCustomTableNode(child)) {
-                            table = child as CustomTableNode;
-                            break;
-                        }
-                    }
-
-                    if (table) {
-                        $setTableColumnWidth(table, 1, 500);
-                    }
+                    // Do stuff
                 });
             },
             isActive() {

From f10ec3271a632bf70ddaff93f792956b08a7236a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 27 Jun 2024 16:28:06 +0100
Subject: [PATCH 180/666] Lexical: Added overflow container

---
 resources/icons/editor/more-horizontal.svg    |  1 +
 .../ui/framework/blocks/dropdown-button.ts    |  7 +++-
 .../ui/framework/blocks/overflow-container.ts | 41 +++++++++++++++++++
 resources/js/wysiwyg/ui/framework/core.ts     | 21 +++++++++-
 resources/js/wysiwyg/ui/toolbars.ts           | 17 ++++----
 resources/sass/_editor.scss                   |  4 ++
 6 files changed, 80 insertions(+), 11 deletions(-)
 create mode 100644 resources/icons/editor/more-horizontal.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts

diff --git a/resources/icons/editor/more-horizontal.svg b/resources/icons/editor/more-horizontal.svg
new file mode 100644
index 00000000000..ce09d985586
--- /dev/null
+++ b/resources/icons/editor/more-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index a419b92b28e..b24b4c16c72 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -26,7 +26,12 @@ export class EditorDropdownButton extends EditorContainerUiElement {
             });
         }
 
-        this.children.push(this.button);
+        this.addChildren(this.button);
+    }
+
+    insertItems(...items: EditorUiElement[]) {
+        this.addChildren(...items);
+        this.childItems.push(...items);
     }
 
     protected buildDOM(): HTMLElement {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
new file mode 100644
index 00000000000..2c188471e51
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -0,0 +1,41 @@
+import {EditorContainerUiElement, EditorUiElement} from "../core";
+import {el} from "../../../helpers";
+import {EditorDropdownButton} from "./dropdown-button";
+import moreHorizontal from "@icons/editor/more-horizontal.svg"
+
+
+export class EditorOverflowContainer extends EditorContainerUiElement {
+
+    protected size: number;
+    protected overflowButton: EditorDropdownButton;
+    protected content: EditorUiElement[];
+
+    constructor(size: number, children: EditorUiElement[]) {
+        super(children);
+        this.size = size;
+        this.content = children;
+        this.overflowButton = new EditorDropdownButton({
+            label: 'More',
+            icon: moreHorizontal,
+        }, []);
+        this.addChildren(this.overflowButton);
+    }
+
+    protected buildDOM(): HTMLElement {
+        const visibleChildren = this.content.slice(0, this.size);
+        const invisibleChildren = this.content.slice(this.size);
+
+        const visibleElements = visibleChildren.map(child => child.getDOMElement());
+        if (invisibleChildren.length > 0) {
+            this.removeChildren(...invisibleChildren);
+            this.overflowButton.insertItems(...invisibleChildren);
+            visibleElements.push(this.overflowButton.getDOMElement());
+        }
+
+        return el('div', {
+            class: 'editor-overflow-container',
+        }, visibleElements);
+    }
+
+
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index d437b36bd09..5e29a0f9e1c 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -50,11 +50,11 @@ export abstract class EditorUiElement {
 }
 
 export class EditorContainerUiElement extends EditorUiElement {
-    protected children : EditorUiElement[];
+    protected children : EditorUiElement[] = [];
 
     constructor(children: EditorUiElement[]) {
         super();
-        this.children = children;
+        this.children.push(...children);
     }
 
     protected buildDOM(): HTMLElement {
@@ -65,6 +65,23 @@ export class EditorContainerUiElement extends EditorUiElement {
         return this.children;
     }
 
+    protected addChildren(...children: EditorUiElement[]): void {
+        this.children.push(...children);
+    }
+
+    protected removeChildren(...children: EditorUiElement[]): void {
+        for (const child of children) {
+            this.removeChild(child);
+        }
+    }
+
+    protected removeChild(child: EditorUiElement) {
+        const index = this.children.indexOf(child);
+        if (index !== -1) {
+            this.children.splice(index, 1);
+        }
+    }
+
     updateState(state: EditorUiStateUpdate): void {
         for (const child of this.children) {
             child.updateState(state);
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index a8ba52c5f42..02e46549e83 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -17,8 +17,7 @@ import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
 import {EditorColorPicker} from "./framework/blocks/color-picker";
 import {EditorTableCreator} from "./framework/blocks/table-creator";
 import {EditorColorButton} from "./framework/blocks/color-button";
-import {$isCustomTableNode, $setTableColumnWidth, CustomTableNode} from "../nodes/custom-table";
-import {$getRoot} from "lexical";
+import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -62,13 +61,15 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         new EditorButton(taskList),
 
         // Insert types
-        new EditorButton(link),
-        new EditorDropdownButton(table, [
-            new EditorTableCreator(),
+        new EditorOverflowContainer(6, [
+            new EditorButton(link),
+            new EditorDropdownButton(table, [
+                new EditorTableCreator(),
+            ]),
+            new EditorButton(image),
+            new EditorButton(horizontalRule),
+            new EditorButton(details),
         ]),
-        new EditorButton(image),
-        new EditorButton(horizontalRule),
-        new EditorButton(details),
 
         // Meta elements
         new EditorButton(source),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index a4b0e632f28..e0a2bac9001 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -65,6 +65,10 @@
   min-width: 320px;
 }
 
+.editor-overflow-container {
+  display: flex;
+}
+
 // Modals
 .editor-modal-wrapper {
   position: fixed;

From 14837e34fb7524b8ace87a49c8b808542addd55d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 28 Jun 2024 22:28:06 +0100
Subject: [PATCH 181/666] Readme: Added sponsor practinet

---
 readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/readme.md b/readme.md
index c67fcb81435..5b78129913c 100644
--- a/readme.md
+++ b/readme.md
@@ -77,6 +77,11 @@ Big thanks to these companies for supporting the project.
 <td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
     <img width="200" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
 </a></td>
+</tr>
+<tr>
+<td align="center" colspan="2"><a href="https://practinet.be/" target="_blank">
+    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/practinet.png" alt="Practinet">
+</a></td>
 </tr></tbody></table>
 
 ## 🛣️ Road Map

From 517c578a5f3c7718db9dc54603e553c0a935a89f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 30 Jun 2024 10:31:39 +0100
Subject: [PATCH 182/666] Lexical: Reorganised some logic into manager

---
 .../ui/framework/blocks/dropdown-button.ts    |  4 +-
 resources/js/wysiwyg/ui/framework/core.ts     |  1 +
 resources/js/wysiwyg/ui/framework/manager.ts  | 56 +++++++++++++++++--
 resources/js/wysiwyg/ui/index.ts              | 40 ++-----------
 4 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index b24b4c16c72..70e1a9ffc51 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -49,10 +49,10 @@ export class EditorDropdownButton extends EditorContainerUiElement {
 
         handleDropdown(button, menu, () => {
             this.open = true;
-            this.getContext().manager.triggerStateUpdate(this.button);
+            this.getContext().manager.triggerStateUpdateForElement(this.button);
         }, () => {
             this.open = false;
-            this.getContext().manager.triggerStateUpdate(this.button);
+            this.getContext().manager.triggerStateUpdateForElement(this.button);
         });
 
         return wrapper;
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 5e29a0f9e1c..2972c9821d5 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -9,6 +9,7 @@ export type EditorUiStateUpdate = {
 
 export type EditorUiContext = {
     editor: LexicalEditor,
+    editorDOM: HTMLElement,
     translate: (text: string) => string,
     manager: EditorUIManager,
     lastSelection: BaseSelection|null,
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 78ddc8ce3d6..2ef117b8836 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,6 +1,9 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
-import {EditorUiContext, EditorUiElement} from "./core";
-import {EditorDecorator} from "./decorator";
+import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
+import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
+import {$getSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
+import {DecoratorListener} from "lexical/LexicalEditor";
+import type {NodeKey} from "lexical/LexicalNode";
 
 
 export class EditorUIManager {
@@ -9,9 +12,11 @@ export class EditorUIManager {
     protected decoratorConstructorsByType: Record<string, typeof EditorDecorator> = {};
     protected decoratorInstancesByNodeKey: Record<string, EditorDecorator> = {};
     protected context: EditorUiContext|null = null;
+    protected toolbar: EditorContainerUiElement|null = null;
 
     setContext(context: EditorUiContext) {
         this.context = context;
+        this.setupEditor(context.editor);
     }
 
     getContext(): EditorUiContext {
@@ -22,7 +27,7 @@ export class EditorUIManager {
         return this.context;
     }
 
-    triggerStateUpdate(element: EditorUiElement) {
+    triggerStateUpdateForElement(element: EditorUiElement) {
         element.updateState({
             selection: null,
             editor: this.getContext().editor
@@ -49,7 +54,7 @@ export class EditorUIManager {
         this.decoratorConstructorsByType[type] = decorator;
     }
 
-    getDecorator(decoratorType: string, nodeKey: string): EditorDecorator {
+    protected getDecorator(decoratorType: string, nodeKey: string): EditorDecorator {
         if (this.decoratorInstancesByNodeKey[nodeKey]) {
             return this.decoratorInstancesByNodeKey[nodeKey];
         }
@@ -64,4 +69,47 @@ export class EditorUIManager {
         this.decoratorInstancesByNodeKey[nodeKey] = decorator;
         return decorator;
     }
+
+    setToolbar(toolbar: EditorContainerUiElement) {
+        if (this.toolbar) {
+            this.toolbar.getDOMElement().remove();
+        }
+
+        this.toolbar = toolbar;
+        toolbar.setContext(this.getContext());
+        this.getContext().editorDOM.before(toolbar.getDOMElement());
+    }
+
+    protected triggerStateUpdate(state: EditorUiStateUpdate): void {
+        const context = this.getContext();
+        context.lastSelection = state.selection;
+        this.toolbar?.updateState(state);
+    }
+
+    protected setupEditor(editor: LexicalEditor) {
+        // Update button states on editor selection change
+        editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
+            this.triggerStateUpdate({
+                editor: editor,
+                selection: $getSelection(),
+            });
+            return false;
+        }, COMMAND_PRIORITY_LOW);
+
+        // Register our DOM decorate listener with the editor
+        const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
+            const keys = Object.keys(decorators);
+            for (const key of keys) {
+                const decoratedEl = editor.getElementByKey(key);
+                const adapter = decorators[key];
+                const decorator = this.getDecorator(adapter.type, key);
+                decorator.setNode(adapter.getNode());
+                const decoratorEl = decorator.render(this.getContext());
+                if (decoratedEl) {
+                    decoratedEl.append(decoratorEl);
+                }
+            }
+        }
+        editor.registerDecoratorListener(domDecorateListener);
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index b2fd7e05a13..c823f9f9500 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,15 +1,7 @@
-import {
-    $getSelection,
-    COMMAND_PRIORITY_LOW,
-    LexicalEditor,
-    SELECTION_CHANGE_COMMAND
-} from "lexical";
+import {LexicalEditor} from "lexical";
 import {getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
-import {DecoratorListener} from "lexical/LexicalEditor";
-import type {NodeKey} from "lexical/LexicalNode";
-import {EditorDecoratorAdapter} from "./framework/decorator";
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 
@@ -17,6 +9,7 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
+        editorDOM: element,
         manager,
         translate: (text: string): string => text,
         lastSelection: null,
@@ -24,9 +17,7 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
     manager.setContext(context);
 
     // Create primary toolbar
-    const toolbar = getMainEditorFullToolbar();
-    toolbar.setContext(context);
-    element.before(toolbar.getDOMElement());
+    manager.setToolbar(getMainEditorFullToolbar());
 
     // Register modals
     manager.registerModal('link', {
@@ -42,29 +33,6 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
         form: sourceFormDefinition,
     });
 
-    // Register decorator listener
-    // Maybe move to manager?
+    // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
-    const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
-        const keys = Object.keys(decorators);
-        for (const key of keys) {
-            const decoratedEl = editor.getElementByKey(key);
-            const adapter = decorators[key];
-            const decorator = manager.getDecorator(adapter.type, key);
-            decorator.setNode(adapter.getNode());
-            const decoratorEl = decorator.render(context);
-            if (decoratedEl) {
-                decoratedEl.append(decoratorEl);
-            }
-        }
-    }
-    editor.registerDecoratorListener(domDecorateListener);
-
-    // Update button states on editor selection change
-    editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
-        const selection = $getSelection();
-        toolbar.updateState({editor, selection});
-        context.lastSelection = selection;
-        return false;
-    }, COMMAND_PRIORITY_LOW);
 }
\ No newline at end of file

From c9a03c5b01dd0eb5fdd6a1eba75e77f761cd6aee Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 30 Jun 2024 12:13:13 +0100
Subject: [PATCH 183/666] Lexical: Added base context toolbar logic

---
 resources/js/wysiwyg/ui/framework/manager.ts  | 59 +++++++++++++++++--
 resources/js/wysiwyg/ui/framework/toolbars.ts | 36 +++++++++++
 resources/js/wysiwyg/ui/index.ts              | 11 +++-
 resources/js/wysiwyg/ui/toolbars.ts           |  6 +-
 4 files changed, 106 insertions(+), 6 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/toolbars.ts

diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 2ef117b8836..685031ff871 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -4,7 +4,7 @@ import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
 import {$getSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
-
+import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
 
 export class EditorUIManager {
 
@@ -13,6 +13,8 @@ export class EditorUIManager {
     protected decoratorInstancesByNodeKey: Record<string, EditorDecorator> = {};
     protected context: EditorUiContext|null = null;
     protected toolbar: EditorContainerUiElement|null = null;
+    protected contextToolbarDefinitionsByKey: Record<string, EditorContextToolbarDefinition> = {};
+    protected activeContextToolbars: EditorContextToolbar[] = [];
 
     setContext(context: EditorUiContext) {
         this.context = context;
@@ -80,10 +82,59 @@ export class EditorUIManager {
         this.getContext().editorDOM.before(toolbar.getDOMElement());
     }
 
-    protected triggerStateUpdate(state: EditorUiStateUpdate): void {
+    registerContextToolbar(key: string, definition: EditorContextToolbarDefinition) {
+        this.contextToolbarDefinitionsByKey[key] = definition;
+    }
+
+    protected triggerStateUpdate(update: EditorUiStateUpdate): void {
         const context = this.getContext();
-        context.lastSelection = state.selection;
-        this.toolbar?.updateState(state);
+        context.lastSelection = update.selection;
+        this.toolbar?.updateState(update);
+        this.updateContextToolbars(update);
+        for (const toolbar of this.activeContextToolbars) {
+            toolbar.updateState(update);
+        }
+    }
+
+    protected updateContextToolbars(update: EditorUiStateUpdate): void {
+        for (const toolbar of this.activeContextToolbars) {
+            toolbar.empty();
+            toolbar.getDOMElement().remove();
+        }
+
+        const node = (update.selection?.getNodes() || [])[0] || null;
+        if (!node) {
+            return;
+        }
+
+        const element = update.editor.getElementByKey(node.getKey());
+        if (!element) {
+            return;
+        }
+
+        const toolbarKeys = Object.keys(this.contextToolbarDefinitionsByKey);
+        const contentByTarget = new Map<HTMLElement, EditorUiElement[]>();
+        for (const key of toolbarKeys) {
+            const definition = this.contextToolbarDefinitionsByKey[key];
+            const matchingElem = ((element.closest(definition.selector)) || (element.querySelector(definition.selector))) as HTMLElement|null;
+            if (matchingElem) {
+                const targetEl = definition.displayTargetLocator ? definition.displayTargetLocator(matchingElem) : matchingElem;
+                if (!contentByTarget.has(targetEl)) {
+                    contentByTarget.set(targetEl, [])
+                }
+                // @ts-ignore
+                contentByTarget.get(targetEl).push(...definition.content);
+            }
+        }
+
+        for (const [target, contents] of contentByTarget) {
+            const toolbar = new EditorContextToolbar(contents);
+            toolbar.setContext(this.getContext());
+            this.activeContextToolbars.push(toolbar);
+
+            this.getContext().editorDOM.after(toolbar.getDOMElement());
+            toolbar.attachTo(target);
+        }
     }
 
     protected setupEditor(editor: LexicalEditor) {
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
new file mode 100644
index 00000000000..a844161f468
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -0,0 +1,36 @@
+import {EditorContainerUiElement, EditorUiElement} from "./core";
+import {el} from "../../helpers";
+
+export type EditorContextToolbarDefinition = {
+    selector: string;
+    content: EditorUiElement[],
+    displayTargetLocator?: (originalTarget: HTMLElement) => HTMLElement;
+};
+
+export class EditorContextToolbar extends EditorContainerUiElement {
+
+    protected buildDOM(): HTMLElement {
+        return el('div', {
+            class: 'editor-context-toolbar',
+        }, this.getChildren().map(child => child.getDOMElement()));
+    }
+
+    attachTo(target: HTMLElement) {
+        // Todo - attach to target position
+        console.log('attaching context toolbar to', target);
+    }
+
+    insert(children: EditorUiElement[]) {
+        this.addChildren(...children);
+        const dom = this.getDOMElement();
+        dom.append(...children.map(child => child.getDOMElement()));
+    }
+
+    empty() {
+        const children = this.getChildren();
+        for (const child of children) {
+            child.getDOMElement().remove();
+        }
+        this.removeChildren(...children);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index c823f9f9500..9f05e211ed0 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,5 +1,5 @@
 import {LexicalEditor} from "lexical";
-import {getMainEditorFullToolbar} from "./toolbars";
+import {getImageToolbarContent, getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
@@ -33,6 +33,15 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
         form: sourceFormDefinition,
     });
 
+    // Register context toolbars
+    manager.registerContextToolbar('image', {
+        selector: 'img',
+        content: getImageToolbarContent(),
+        displayTargetLocator(originalTarget: HTMLElement) {
+            return originalTarget.closest('a') || originalTarget;
+        }
+    });
+
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 02e46549e83..6e822e9c139 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -9,7 +9,7 @@ import {
     undo,
     warningCallout
 } from "./defaults/button-definitions";
-import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext} from "./framework/core";
+import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";
 import {el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
@@ -87,4 +87,8 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             }
         })
     ]);
+}
+
+export function getImageToolbarContent(): EditorUiElement[] {
+    return [new EditorButton(image)];
 }
\ No newline at end of file

From b1c489090ecfdbde705de14825e0bd69ce2b5d7d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 30 Jun 2024 19:52:09 +0100
Subject: [PATCH 184/666] Lexical: Added context toolbar placement, added link
 toolbar

Also added some basic context toolbar styling
---
 resources/icons/editor/unlink.svg             |  1 +
 .../wysiwyg/ui/defaults/button-definitions.ts | 30 +++++++++++++++++--
 resources/js/wysiwyg/ui/framework/manager.ts  |  1 +
 resources/js/wysiwyg/ui/framework/toolbars.ts | 10 +++++--
 resources/js/wysiwyg/ui/index.ts              |  6 +++-
 resources/js/wysiwyg/ui/toolbars.ts           |  9 +++++-
 resources/sass/_editor.scss                   | 24 +++++++++++++++
 7 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 resources/icons/editor/unlink.svg

diff --git a/resources/icons/editor/unlink.svg b/resources/icons/editor/unlink.svg
new file mode 100644
index 00000000000..28f47fd24e6
--- /dev/null
+++ b/resources/icons/editor/unlink.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index aa8b27ec56c..cebf2580721 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,7 +1,7 @@
 import {EditorBasicButtonDefinition, EditorButton, EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
-    $createParagraphNode, $getRoot, $getSelection,
+    $createParagraphNode, $createTextNode, $getRoot, $getSelection,
     $isParagraphNode, $isTextNode, $setSelection,
     BaseSelection, CAN_REDO_COMMAND, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, ElementNode, FORMAT_TEXT_COMMAND,
     LexicalNode,
@@ -45,12 +45,13 @@ import listBulletIcon from "@icons/editor/list-bullet.svg"
 import listNumberedIcon from "@icons/editor/list-numbered.svg"
 import listCheckIcon from "@icons/editor/list-check.svg"
 import linkIcon from "@icons/editor/link.svg"
+import unlinkIcon from "@icons/editor/unlink.svg"
 import tableIcon from "@icons/editor/table.svg"
 import imageIcon from "@icons/editor/image.svg"
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
-import {$createHorizontalRuleNode, $isHorizontalRuleNode, HorizontalRuleNode} from "../../nodes/horizontal-rule";
+import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -258,6 +259,31 @@ export const link: EditorButtonDefinition = {
     }
 };
 
+export const unlink: EditorButtonDefinition = {
+    label: 'Remove link',
+    icon: unlinkIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = context.lastSelection;
+            const selectedLink = getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectionPoints = selection?.getStartEndPoints();
+
+            if (selectedLink) {
+                const newNode = $createTextNode(selectedLink.getTextContent());
+                selectedLink.replace(newNode);
+                if (selectionPoints?.length === 2) {
+                    newNode.select(selectionPoints[0].offset, selectionPoints[1].offset);
+                } else {
+                    newNode.select();
+                }
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    }
+};
+
 export const table: EditorBasicButtonDefinition = {
     label: 'Table',
     icon: tableIcon,
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 685031ff871..4ca90a12a1a 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -94,6 +94,7 @@ export class EditorUIManager {
         for (const toolbar of this.activeContextToolbars) {
             toolbar.updateState(update);
         }
+        // console.log('selection update', update.selection);
     }
 
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index a844161f468..c9db0d6bd7f 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -16,8 +16,14 @@ export class EditorContextToolbar extends EditorContainerUiElement {
     }
 
     attachTo(target: HTMLElement) {
-        // Todo - attach to target position
-        console.log('attaching context toolbar to', target);
+        const targetBounds = target.getBoundingClientRect();
+        const dom = this.getDOMElement();
+        const domBounds = dom.getBoundingClientRect();
+
+        const targetMid = targetBounds.left + (targetBounds.width / 2);
+        const targetLeft = targetMid - (domBounds.width / 2);
+        dom.style.top = (targetBounds.bottom + 6) + 'px';
+        dom.style.left = targetLeft + 'px';
     }
 
     insert(children: EditorUiElement[]) {
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 9f05e211ed0..1f07fe71056 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,5 +1,5 @@
 import {LexicalEditor} from "lexical";
-import {getImageToolbarContent, getMainEditorFullToolbar} from "./toolbars";
+import {getImageToolbarContent, getLinkToolbarContent, getMainEditorFullToolbar} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
@@ -41,6 +41,10 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
             return originalTarget.closest('a') || originalTarget;
         }
     });
+    manager.registerContextToolbar('link', {
+        selector: 'a',
+        content: getLinkToolbarContent(),
+    });
 
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 6e822e9c139..bb3b436b9e1 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -6,7 +6,7 @@ import {
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
     successCallout, superscript, table, taskList, textColor, underline,
-    undo,
+    undo, unlink,
     warningCallout
 } from "./defaults/button-definitions";
 import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";
@@ -91,4 +91,11 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
 export function getImageToolbarContent(): EditorUiElement[] {
     return [new EditorButton(image)];
+}
+
+export function getLinkToolbarContent(): EditorUiElement[] {
+    return [
+        new EditorButton(link),
+        new EditorButton(unlink),
+    ];
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index e0a2bac9001..2fcf4edb397 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -69,6 +69,30 @@
   display: flex;
 }
 
+.editor-context-toolbar {
+  position: fixed;
+  background-color: #FFF;
+  border: 1px solid #DDD;
+  padding: .2rem;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12);
+  &:before {
+    content: '';
+    z-index: -1;
+    display: block;
+    width: 8px;
+    height: 8px;
+    position: absolute;
+    background-color: #FFF;
+    border-top: 1px solid #DDD;
+    border-left: 1px solid #DDD;
+    transform: rotate(45deg);
+    left: 50%;
+    margin-left: -4px;
+    top: -5px;
+  }
+}
+
 // Modals
 .editor-modal-wrapper {
   position: fixed;

From c2ecbf071ffddb3f23dd535495ea361954a5ee57 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 1 Jul 2024 10:44:23 +0100
Subject: [PATCH 185/666] Lexical: Added tracked container, added fullscreen
 action

Changed how the editor is loaded in, so it now creates its own DOM, and
content is passed via creation function, to be better self-contained.
---
 resources/icons/editor/fullscreen.svg         |  1 +
 resources/js/components/wysiwyg-editor.js     |  6 +-
 resources/js/wysiwyg/index.ts                 | 32 +++-----
 .../wysiwyg/ui/defaults/button-definitions.ts | 17 +++-
 resources/js/wysiwyg/ui/framework/buttons.ts  | 13 ++-
 resources/js/wysiwyg/ui/framework/core.ts     |  1 +
 resources/js/wysiwyg/ui/framework/manager.ts  | 11 ++-
 resources/js/wysiwyg/ui/index.ts              |  3 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  3 +-
 resources/sass/_editor.scss                   | 14 ++++
 .../pages/parts/wysiwyg-editor.blade.php      | 81 ++++++++++---------
 11 files changed, 108 insertions(+), 74 deletions(-)
 create mode 100644 resources/icons/editor/fullscreen.svg

diff --git a/resources/icons/editor/fullscreen.svg b/resources/icons/editor/fullscreen.svg
new file mode 100644
index 00000000000..3cca3097a87
--- /dev/null
+++ b/resources/icons/editor/fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-120v-200h80v120h120v80H120Zm520 0v-80h120v-120h80v200H640ZM120-640v-200h200v80H200v120h-80Zm640 0v-120H640v-80h200v200h-80Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index 98732dab73e..bdcdd5c51a0 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -4,10 +4,12 @@ export class WysiwygEditor extends Component {
 
     setup() {
         this.elem = this.$el;
-        this.editArea = this.$refs.editArea;
+        this.editContainer = this.$refs.editContainer;
+        this.editContent = this.$refs.editContent;
 
         window.importVersioned('wysiwyg').then(wysiwyg => {
-            wysiwyg.createPageEditorInstance(this.editArea);
+            const editorContent = this.editContent.textContent;
+            wysiwyg.createPageEditorInstance(this.editContainer, editorContent);
         });
     }
 
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9f2f1645a4f..3ca01835f28 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -6,8 +6,9 @@ import {getNodesForPageEditor} from './nodes';
 import {buildEditorUI} from "./ui";
 import {setEditorContentFromHtml} from "./actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
+import {el} from "./helpers";
 
-export function createPageEditorInstance(editArea: HTMLElement) {
+export function createPageEditorInstance(container: HTMLElement, htmlContent: string) {
     const config: CreateEditorArgs = {
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
@@ -26,7 +27,11 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         }
     };
 
-    const startingHtml = editArea.innerHTML;
+    const editArea = el('div', {
+        contenteditable: 'true',
+    });
+    container.append(editArea);
+    container.classList.add('editor-container');
 
     const editor = createEditor(config);
     editor.setRootElement(editArea);
@@ -37,7 +42,7 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         registerTableResizer(editor, editArea),
     );
 
-    setEditorContentFromHtml(editor, startingHtml);
+    setEditorContentFromHtml(editor, htmlContent);
 
     const debugView = document.getElementById('lexical-debug');
     editor.registerUpdateListener(({editorState}) => {
@@ -47,24 +52,5 @@ export function createPageEditorInstance(editArea: HTMLElement) {
         }
     });
 
-    buildEditorUI(editArea, editor);
-
-    // Example of creating, registering and using a custom command
-
-    // const SET_BLOCK_CALLOUT_COMMAND = createCommand();
-    // editor.registerCommand(SET_BLOCK_CALLOUT_COMMAND, (category: CalloutCategory = 'info') => {
-    //     const selection = $getSelection();
-    //     const blockElement = $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]);
-    //     if ($isCalloutNode(blockElement)) {
-    //         $setBlocksType(selection, $createParagraphNode);
-    //     } else {
-    //         $setBlocksType(selection, () => $createCalloutNode(category));
-    //     }
-    //     return true;
-    // }, COMMAND_PRIORITY_LOW);
-    //
-    // const button = document.getElementById('lexical-button');
-    // button.addEventListener('click', event => {
-    //     editor.dispatchCommand(SET_BLOCK_CALLOUT_COMMAND, 'info');
-    // });
+    buildEditorUI(container, editArea, editor);
 }
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index cebf2580721..4a45ef75d0a 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -51,6 +51,7 @@ import imageIcon from "@icons/editor/image.svg"
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
+import fullscreenIcon from "@icons/editor/fullscreen.svg"
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
 
 export const undo: EditorButtonDefinition = {
@@ -206,7 +207,7 @@ function buildListButton(label: string, type: ListType, icon: string): EditorBut
         action(context: EditorUiContext) {
             context.editor.getEditorState().read(() => {
                 const selection = $getSelection();
-                if (this.isActive(selection)) {
+                if (this.isActive(selection, context)) {
                     removeList(context.editor);
                 } else {
                     insertList(context.editor, type);
@@ -374,4 +375,18 @@ export const source: EditorButtonDefinition = {
     isActive() {
         return false;
     }
+};
+
+export const fullscreen: EditorButtonDefinition = {
+    label: 'Fullscreen',
+    icon: fullscreenIcon,
+    async action(context: EditorUiContext, button: EditorButton) {
+        const isFullScreen = context.containerDOM.classList.contains('fullscreen');
+        context.containerDOM.classList.toggle('fullscreen', !isFullScreen);
+        (context.containerDOM.closest('body') as HTMLElement).classList.toggle('editor-is-fullscreen', !isFullScreen);
+        button.setActiveState(!isFullScreen);
+    },
+    isActive(selection, context: EditorUiContext) {
+        return context.containerDOM.classList.contains('fullscreen');
+    }
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 7e8df076a60..f74201ff74c 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -8,8 +8,8 @@ export interface EditorBasicButtonDefinition {
 }
 
 export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
-    action: (context: EditorUiContext) => void;
-    isActive: (selection: BaseSelection|null) => boolean;
+    action: (context: EditorUiContext, button: EditorButton) => void;
+    isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;
 }
 
@@ -68,11 +68,16 @@ export class EditorButton extends EditorUiElement {
     }
 
     protected onClick() {
-        this.definition.action(this.getContext());
+        this.definition.action(this.getContext(), this);
     }
 
     updateActiveState(selection: BaseSelection|null) {
-        this.active = this.definition.isActive(selection);
+        const isActive = this.definition.isActive(selection, this.getContext());
+        this.setActiveState(isActive);
+    }
+
+    setActiveState(active: boolean) {
+        this.active = active;
         this.dom?.classList.toggle('editor-button-active', this.active);
     }
 
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 2972c9821d5..465765caa31 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -10,6 +10,7 @@ export type EditorUiStateUpdate = {
 export type EditorUiContext = {
     editor: LexicalEditor,
     editorDOM: HTMLElement,
+    containerDOM: HTMLElement,
     translate: (text: string) => string,
     manager: EditorUIManager,
     lastSelection: BaseSelection|null,
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 4ca90a12a1a..3c2ad89265c 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -79,7 +79,7 @@ export class EditorUIManager {
 
         this.toolbar = toolbar;
         toolbar.setContext(this.getContext());
-        this.getContext().editorDOM.before(toolbar.getDOMElement());
+        this.getContext().containerDOM.prepend(toolbar.getDOMElement());
     }
 
     registerContextToolbar(key: string, definition: EditorContextToolbarDefinition) {
@@ -97,6 +97,13 @@ export class EditorUIManager {
         // console.log('selection update', update.selection);
     }
 
+    triggerStateRefresh(): void {
+        this.triggerStateUpdate({
+            editor: this.getContext().editor,
+            selection: this.getContext().lastSelection,
+        });
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (const toolbar of this.activeContextToolbars) {
             toolbar.empty();
@@ -133,7 +140,7 @@ export class EditorUIManager {
             toolbar.setContext(this.getContext());
             this.activeContextToolbars.push(toolbar);
 
-            this.getContext().editorDOM.after(toolbar.getDOMElement());
+            this.getContext().containerDOM.append(toolbar.getDOMElement());
             toolbar.attachTo(target);
         }
     }
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 1f07fe71056..3501ed557b6 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -5,10 +5,11 @@ import {image as imageFormDefinition, link as linkFormDefinition, source as sour
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 
-export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {
+export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
+        containerDOM: container,
         editorDOM: element,
         manager,
         translate: (text: string): string => text,
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index bb3b436b9e1..550c798c264 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,7 +1,7 @@
 import {EditorButton} from "./framework/buttons";
 import {
     blockquote, bold, bulletList, clearFormating, code,
-    dangerCallout, details,
+    dangerCallout, details, fullscreen,
     h2, h3, h4, h5, highlightColor, horizontalRule, image,
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
@@ -73,6 +73,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
 
         // Meta elements
         new EditorButton(source),
+        new EditorButton(fullscreen),
 
         // Test
         new EditorButton({
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 2fcf4edb397..79cbc73e89d 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -4,11 +4,25 @@
 }
 
 // Main UI elements
+.editor-container {
+  background-color: #FFF;
+  position: relative;
+  &.fullscreen {
+    z-index: 500;
+  }
+}
 .editor-toolbar-main {
   display: flex;
   flex-wrap: wrap;
 }
 
+body.editor-is-fullscreen {
+  overflow: hidden;
+  .edit-area {
+    z-index: 20;
+  }
+}
+
 // Buttons
 .editor-button {
   border: 1px solid #DDD;
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 5cd60bbc69b..8fc0dc55a55 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -6,48 +6,49 @@
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
      class="">
 
-    <div class="editor-container">
-        <div refs="wysiwyg-editor@edit-area" contenteditable="true">
-            <p id="Content!">Some <strong>content</strong> here</p>
-            <p>Content with image in, before text. <img src="https://bookstack.local/bookstack/uploads/images/gallery/2022-03/scaled-1680-/cats-image-2400x1000-2.jpg" width="200" alt="Sleepy meow"> After text.</p>
-            <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
-            <h2>List below this h2 header</h2>
-            <ul>
-                <li>Hello</li>
-            </ul>
-
-            <details>
-                <summary>Collapsible details/summary block</summary>
-                <p>Inner text here</p>
-                <h4>Inner Header</h4>
-                <p>More text <strong>with bold in</strong> it</p>
-            </details>
-
-            <p class="callout info">
-                Hello there, this is an info callout
-            </p>
-
-            <h3>Table</h3>
-
-            <table>
-                <thead>
-                <tr>
-                    <th>Cell A</th>
-                    <th>Cell B</th>
-                    <th>Cell C</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>Cell D</td>
-                    <td>Cell E</td>
-                    <td>Cell F</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
+    <div class="editor-container" refs="wysiwyg-editor@edit-container">
     </div>
 
+    <script type="text/html" refs="wysiwyg-editor@edit-content">
+        <p id="Content!">Some <strong>content</strong> here</p>
+        <p>Content with image in, before text. <img src="https://bookstack.local/bookstack/uploads/images/gallery/2022-03/scaled-1680-/cats-image-2400x1000-2.jpg" width="200" alt="Sleepy meow"> After text.</p>
+        <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
+        <h2>List below this h2 header</h2>
+        <ul>
+            <li>Hello</li>
+        </ul>
+
+        <details>
+            <summary>Collapsible details/summary block</summary>
+            <p>Inner text here</p>
+            <h4>Inner Header</h4>
+            <p>More text <strong>with bold in</strong> it</p>
+        </details>
+
+        <p class="callout info">
+            Hello there, this is an info callout
+        </p>
+
+        <h3>Table</h3>
+
+        <table>
+            <thead>
+            <tr>
+                <th>Cell A</th>
+                <th>Cell B</th>
+                <th>Cell C</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>Cell D</td>
+                <td>Cell E</td>
+                <td>Cell F</td>
+            </tr>
+            </tbody>
+        </table>
+    </script>
+
     <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>
 
 {{--    <textarea id="html-editor"  name="html" rows="5"--}}

From 9ebbf7ce94e0547e803d63e311b921252ad1dc5c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 1 Jul 2024 15:10:22 +0100
Subject: [PATCH 186/666] Lexical: Started loading real content, Improved html
 loading

Added more styling/layout for buttons and main content area
---
 resources/js/components/wysiwyg-editor.js     |  4 +-
 resources/js/wysiwyg/actions.ts               | 19 +++++++-
 resources/js/wysiwyg/index.ts                 |  6 ++-
 resources/js/wysiwyg/ui/framework/buttons.ts  |  2 +-
 resources/sass/_editor.scss                   | 20 ++++++--
 .../pages/parts/wysiwyg-editor.blade.php      | 47 ++-----------------
 6 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index bdcdd5c51a0..2f0e660b19f 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -5,10 +5,10 @@ export class WysiwygEditor extends Component {
     setup() {
         this.elem = this.$el;
         this.editContainer = this.$refs.editContainer;
-        this.editContent = this.$refs.editContent;
+        this.input = this.$refs.input;
 
         window.importVersioned('wysiwyg').then(wysiwyg => {
-            const editorContent = this.editContent.textContent;
+            const editorContent = this.input.value;
             wysiwyg.createPageEditorInstance(this.editContainer, editorContent);
         });
     }
diff --git a/resources/js/wysiwyg/actions.ts b/resources/js/wysiwyg/actions.ts
index bca31e51b7a..3a32b82d861 100644
--- a/resources/js/wysiwyg/actions.ts
+++ b/resources/js/wysiwyg/actions.ts
@@ -1,17 +1,32 @@
-import {$getRoot, LexicalEditor} from "lexical";
+import {$createParagraphNode, $getRoot, $isTextNode, LexicalEditor} from "lexical";
 import {$generateHtmlFromNodes, $generateNodesFromDOM} from "@lexical/html";
+import {$createCustomParagraphNode} from "./nodes/custom-paragraph";
 
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
     const parser = new DOMParser();
     const dom = parser.parseFromString(html, 'text/html');
 
+    console.log(html);
     editor.update(() => {
-        const nodes = $generateNodesFromDOM(editor, dom);
+        // Empty existing
         const root = $getRoot();
         for (const child of root.getChildren()) {
             child.remove(true);
         }
+
+        const nodes = $generateNodesFromDOM(editor, dom);
+
+        // Wrap top-level text nodes
+        for (let i = 0; i < nodes.length; i++) {
+            const node = nodes[i];
+            if ($isTextNode(node)) {
+                const paragraph = $createCustomParagraphNode();
+                paragraph.append(node);
+                nodes[i] = paragraph;
+            }
+        }
+
         root.append(...nodes);
     });
 }
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 3ca01835f28..b0ff896c76e 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -29,8 +29,12 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     const editArea = el('div', {
         contenteditable: 'true',
+        class: 'editor-content-area page-content',
     });
-    container.append(editArea);
+    const editWrap = el('div', {
+        class: 'editor-content-wrap',
+    }, [editArea]);
+    container.append(editWrap);
     container.classList.add('editor-container');
 
     const editor = createEditor(config);
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index f74201ff74c..4418be6237c 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -51,7 +51,7 @@ export class EditorButton extends EditorUiElement {
         const label = this.getLabel();
         let child: string|HTMLElement = label;
         if (this.definition.icon) {
-            child = el('span', {class: 'editor-button-icon'});
+            child = el('div', {class: 'editor-button-icon'});
             child.innerHTML = this.definition.icon;
         }
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 79cbc73e89d..7530382630b 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -14,6 +14,9 @@
 .editor-toolbar-main {
   display: flex;
   flex-wrap: wrap;
+  justify-content: center;
+  border-top: 1px solid #DDD;
+  border-bottom: 1px solid #DDD;
 }
 
 body.editor-is-fullscreen {
@@ -22,13 +25,24 @@ body.editor-is-fullscreen {
     z-index: 20;
   }
 }
+.editor-content-area {
+  &:focus {
+    outline: 0;
+  }
+}
+.editor-content-wrap {
+  overflow-y: scroll;
+}
 
 // Buttons
 .editor-button {
-  border: 1px solid #DDD;
   font-size: 12px;
   padding: 4px 6px;
   color: #444;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .editor-button:hover {
   background-color: #EEE;
@@ -38,7 +52,6 @@ body.editor-is-fullscreen {
 .editor-button[disabled] {
   pointer-events: none;
   cursor: not-allowed;
-  background-color: #EEE;
   opacity: .6;
 }
 .editor-button-active, .editor-button-active:hover {
@@ -52,7 +65,8 @@ body.editor-is-fullscreen {
 .editor-button-icon svg {
   width: 24px;
   height: 24px;
-  fill: #000;
+  color: inherit;
+  fill: currentColor;
 }
 
 // Containers
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 8fc0dc55a55..ee5a2e19b11 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -4,55 +4,14 @@
      option:wysiwyg-editor:text-direction="{{ $locale->htmlDirection() }}"
      option:wysiwyg-editor:image-upload-error-text="{{ trans('errors.image_upload_error') }}"
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
-     class="">
+     class="flex-container-column flex-fill">
 
-    <div class="editor-container" refs="wysiwyg-editor@edit-container">
+    <div class="editor-container flex-container-column flex-fill" refs="wysiwyg-editor@edit-container">
     </div>
 
-    <script type="text/html" refs="wysiwyg-editor@edit-content">
-        <p id="Content!">Some <strong>content</strong> here</p>
-        <p>Content with image in, before text. <img src="https://bookstack.local/bookstack/uploads/images/gallery/2022-03/scaled-1680-/cats-image-2400x1000-2.jpg" width="200" alt="Sleepy meow"> After text.</p>
-        <p>This has a <a href="https://example.com" target="_blank" title="Link to example">link</a> in it</p>
-        <h2>List below this h2 header</h2>
-        <ul>
-            <li>Hello</li>
-        </ul>
-
-        <details>
-            <summary>Collapsible details/summary block</summary>
-            <p>Inner text here</p>
-            <h4>Inner Header</h4>
-            <p>More text <strong>with bold in</strong> it</p>
-        </details>
-
-        <p class="callout info">
-            Hello there, this is an info callout
-        </p>
-
-        <h3>Table</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Cell A</th>
-                <th>Cell B</th>
-                <th>Cell C</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td>Cell D</td>
-                <td>Cell E</td>
-                <td>Cell F</td>
-            </tr>
-            </tbody>
-        </table>
-    </script>
-
     <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>
 
-{{--    <textarea id="html-editor"  name="html" rows="5"--}}
-{{--          @if($errors->has('html')) class="text-neg" @endif>@if(isset($model) || old('html')){{ old('html') ? old('html') : $model->html }}@endif</textarea>--}}
+    <textarea refs="wysiwyg-editor@input" id="html-editor" hidden="hidden"  name="html" rows="5">{{ old('html') ?? $model->html ?? '' }}</textarea>
 </div>
 
 @if($errors->has('html'))

From 97f570a4ee1e275951a6a10a50df1351505e1974 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 2 Jul 2024 14:46:30 +0100
Subject: [PATCH 187/666] Lexical: Started code block node implementation

---
 resources/js/wysiwyg/nodes/code-block.ts      | 168 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |   2 +
 .../js/wysiwyg/ui/decorators/code-block.ts    |  42 +++++
 .../js/wysiwyg/ui/framework/decorator.ts      |   7 +-
 resources/js/wysiwyg/ui/framework/manager.ts  |   8 +-
 resources/js/wysiwyg/ui/index.ts              |   2 +
 6 files changed, 226 insertions(+), 3 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/code-block.ts
 create mode 100644 resources/js/wysiwyg/ui/decorators/code-block.ts

diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
new file mode 100644
index 00000000000..7184334a0d2
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -0,0 +1,168 @@
+import {
+    DecoratorNode,
+    DOMConversion,
+    DOMConversionMap,
+    DOMConversionOutput,
+    LexicalEditor, LexicalNode,
+    SerializedLexicalNode,
+    Spread
+} from "lexical";
+import type {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+import {EditorDecoratorAdapter} from "../ui/framework/decorator";
+import {code} from "../ui/defaults/button-definitions";
+
+export type SerializedCodeBlockNode = Spread<{
+    language: string;
+    id: string;
+    code: string;
+}, SerializedLexicalNode>
+
+const getLanguageFromClassList = (classes: string) => {
+    const langClasses = classes.split(' ').filter(cssClass => cssClass.startsWith('language-'));
+    return (langClasses[0] || '').replace('language-', '');
+};
+
+export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
+    __id: string = '';
+    __language: string = '';
+    __code: string = '';
+
+    static getType(): string {
+        return 'code-block';
+    }
+
+    static clone(node: CodeBlockNode): CodeBlockNode {
+        return new CodeBlockNode(node.__language, node.__code);
+    }
+
+    constructor(language: string = '', code: string = '', key?: string) {
+        super(key);
+        this.__language = language;
+        this.__code = code;
+    }
+
+    setLanguage(language: string): void {
+        const self = this.getWritable();
+        self.__language = language;
+    }
+
+    getLanguage(): string {
+        const self = this.getLatest();
+        return self.__language;
+    }
+
+    setCode(code: string): void {
+        const self = this.getWritable();
+        self.__code = code;
+    }
+
+    getCode(): string {
+        const self = this.getLatest();
+        return self.__code;
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
+        // TODO
+        return {
+            type: 'code',
+            getNode: () => this,
+        };
+    }
+
+    isInline(): boolean {
+        return false;
+    }
+
+    isIsolated() {
+        return true;
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        const codeBlock = el('pre', {
+            id: this.__id || null,
+        }, [
+            el('code', {
+                class: this.__language ? `language-${this.__language}` : null,
+            }, [this.__code]),
+        ]);
+
+        return el('div', {class: 'editor-code-block-wrap'}, [codeBlock]);
+    }
+
+    updateDOM(prevNode: CodeBlockNode, dom: HTMLElement) {
+        const code = dom.querySelector('code');
+        if (!code) return false;
+
+        if (prevNode.__language !== this.__language) {
+            code.className = this.__language ? `language-${this.__language}` : '';
+        }
+
+        if (prevNode.__id !== this.__id) {
+            dom.setAttribute('id', this.__id);
+        }
+
+        if (prevNode.__code !== this.__code) {
+            code.textContent = this.__code;
+        }
+
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            pre(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+
+                        const codeEl = element.querySelector('code');
+                        const language = getLanguageFromClassList(element.className)
+                                        || (codeEl && getLanguageFromClassList(codeEl.className))
+                                        || '';
+
+                        const code = codeEl ? (codeEl.textContent || '').trim() : (element.textContent || '').trim();
+
+                        return {
+                            node: $createCodeBlockNode(language, code),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedCodeBlockNode {
+        return {
+            type: 'code-block',
+            version: 1,
+            id: this.__id,
+            language: this.__language,
+            code: this.__code,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCodeBlockNode): CodeBlockNode {
+        const node = $createCodeBlockNode(serializedNode.language, serializedNode.code);
+        node.setId(serializedNode.id || '');
+        return node;
+    }
+}
+
+export function $createCodeBlockNode(language: string = '', code: string = ''): CodeBlockNode {
+    return new CodeBlockNode(language, code);
+}
+
+export function $isCodeBlockNode(node: LexicalNode | null | undefined) {
+    return node instanceof CodeBlockNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index befc2ab2e05..4cc6bd08b78 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -9,6 +9,7 @@ import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {CustomTableNode} from "./custom-table";
 import {HorizontalRuleNode} from "./horizontal-rule";
+import {CodeBlockNode} from "./code-block";
 
 /**
  * Load the nodes for lexical.
@@ -26,6 +27,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         ImageNode,
         HorizontalRuleNode,
         DetailsNode, SummaryNode,
+        CodeBlockNode,
         CustomParagraphNode,
         LinkNode,
         {
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
new file mode 100644
index 00000000000..f1fd8c1994b
--- /dev/null
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -0,0 +1,42 @@
+import {EditorDecorator} from "../framework/decorator";
+import {el} from "../../helpers";
+import {EditorUiContext} from "../framework/core";
+import {CodeBlockNode} from "../../nodes/code-block";
+
+
+export class CodeBlockDecorator extends EditorDecorator {
+
+     render(context: EditorUiContext, element: HTMLElement): void {
+        const codeNode = this.getNode() as CodeBlockNode;
+        const preEl = element.querySelector('pre');
+        if (preEl) {
+            preEl.hidden = true;
+        }
+
+        const code = codeNode.__code;
+        const language = codeNode.__language;
+        const lines = code.split('\n').length;
+        const height = (lines * 19.2) + 18 + 24;
+        element.style.height = `${height}px`;
+
+        let editor = null;
+        const startTime = Date.now();
+
+        // Todo - Handling click/edit control
+         // Todo - Add toolbar button for code
+
+        // @ts-ignore
+        const renderEditor = (Code) => {
+            editor = Code.wysiwygView(element, document, code, language);
+            setTimeout(() => {
+                element.style.height = '';
+            }, 12);
+        };
+
+        // @ts-ignore
+        window.importVersioned('code').then((Code) => {
+            const timeout = (Date.now() - startTime < 20) ? 20 : 0;
+            setTimeout(() => renderEditor(Code), timeout);
+        });
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
index 89077412691..b0d2392fd31 100644
--- a/resources/js/wysiwyg/ui/framework/decorator.ts
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -27,6 +27,11 @@ export abstract class EditorDecorator {
         this.node = node;
     }
 
-    abstract render(context: EditorUiContext): HTMLElement;
+    /**
+     * Render the decorator.
+     * If an element is returned, this will be appended to the element
+     * that is being decorated.
+     */
+    abstract render(context: EditorUiContext, decorated: HTMLElement): HTMLElement|void;
 
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 3c2ad89265c..a75d2478624 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -160,11 +160,15 @@ export class EditorUIManager {
             const keys = Object.keys(decorators);
             for (const key of keys) {
                 const decoratedEl = editor.getElementByKey(key);
+                if (!decoratedEl) {
+                    continue;
+                }
+
                 const adapter = decorators[key];
                 const decorator = this.getDecorator(adapter.type, key);
                 decorator.setNode(adapter.getNode());
-                const decoratorEl = decorator.render(this.getContext());
-                if (decoratedEl) {
+                const decoratorEl = decorator.render(this.getContext(), decoratedEl);
+                if (decoratorEl) {
                     decoratedEl.append(decoratorEl);
                 }
             }
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 3501ed557b6..1ad1395dc77 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -4,6 +4,7 @@ import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
+import {CodeBlockDecorator} from "./decorators/code-block";
 
 export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
@@ -49,4 +50,5 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
 
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
+    manager.registerDecoratorType('code', CodeBlockDecorator);
 }
\ No newline at end of file

From d0a5a5ef371512a20f6445fd543dbe95a9b42fac Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 2 Jul 2024 17:34:03 +0100
Subject: [PATCH 188/666] Lexical: Linked code block to editor, added button

---
 resources/js/global.d.ts                      |  8 +++
 resources/js/wysiwyg/nodes/code-block.ts      | 19 +++++-
 .../js/wysiwyg/ui/decorators/code-block.ts    | 60 +++++++++++++++----
 .../wysiwyg/ui/defaults/button-definitions.ts | 27 +++++++++
 .../js/wysiwyg/ui/framework/decorator.ts      |  1 +
 resources/js/wysiwyg/ui/framework/manager.ts  | 30 +++++-----
 resources/js/wysiwyg/ui/toolbars.ts           |  3 +-
 resources/sass/_editor.scss                   |  7 +++
 8 files changed, 129 insertions(+), 26 deletions(-)

diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index c5aba8ee287..537da636854 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -1,4 +1,12 @@
 declare module '*.svg' {
     const content: string;
     export default content;
+}
+
+declare global {
+    interface Window {
+        $components: {
+            first: (string) => Object,
+        }
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index 7184334a0d2..934fe7eddd6 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -73,7 +73,6 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
-        // TODO
         return {
             type: 'code',
             getNode: () => this,
@@ -165,4 +164,22 @@ export function $createCodeBlockNode(language: string = '', code: string = ''):
 
 export function $isCodeBlockNode(node: LexicalNode | null | undefined) {
     return node instanceof CodeBlockNode;
+}
+
+export function $openCodeEditorForNode(editor: LexicalEditor, node: CodeBlockNode): void {
+    const code = node.getCode();
+    const language = node.getLanguage();
+
+    // @ts-ignore
+    const codeEditor = window.$components.first('code-editor');
+    // TODO - Handle direction
+    codeEditor.open(code, language, 'ltr', (newCode: string, newLang: string) => {
+        editor.update(() => {
+            node.setCode(newCode);
+            node.setLanguage(newLang);
+        });
+        // TODO - Re-focus
+    }, () => {
+        // TODO - Re-focus
+    });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index f1fd8c1994b..80dcef3bdea 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,33 +1,46 @@
 import {EditorDecorator} from "../framework/decorator";
-import {el} from "../../helpers";
 import {EditorUiContext} from "../framework/core";
-import {CodeBlockNode} from "../../nodes/code-block";
+import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
+import {ImageNode} from "../../nodes/image";
 
 
 export class CodeBlockDecorator extends EditorDecorator {
 
-     render(context: EditorUiContext, element: HTMLElement): void {
+    protected completedSetup: boolean = false;
+    protected latestCode: string = '';
+    protected latestLanguage: string = '';
+
+    // @ts-ignore
+    protected editor: any = null;
+
+    setup(context: EditorUiContext, element: HTMLElement) {
         const codeNode = this.getNode() as CodeBlockNode;
         const preEl = element.querySelector('pre');
+        if (!preEl) {
+            return;
+        }
+
         if (preEl) {
             preEl.hidden = true;
         }
 
-        const code = codeNode.__code;
-        const language = codeNode.__language;
-        const lines = code.split('\n').length;
+        this.latestCode = codeNode.__code;
+        this.latestLanguage = codeNode.__language;
+        const lines = this.latestCode.split('\n').length;
         const height = (lines * 19.2) + 18 + 24;
         element.style.height = `${height}px`;
 
-        let editor = null;
         const startTime = Date.now();
 
-        // Todo - Handling click/edit control
-         // Todo - Add toolbar button for code
+        element.addEventListener('dblclick', event => {
+            context.editor.getEditorState().read(() => {
+                $openCodeEditorForNode(context.editor, (this.getNode() as CodeBlockNode));
+            });
+        });
 
         // @ts-ignore
         const renderEditor = (Code) => {
-            editor = Code.wysiwygView(element, document, code, language);
+            this.editor = Code.wysiwygView(element, document, this.latestCode, this.latestLanguage);
             setTimeout(() => {
                 element.style.height = '';
             }, 12);
@@ -38,5 +51,32 @@ export class CodeBlockDecorator extends EditorDecorator {
             const timeout = (Date.now() - startTime < 20) ? 20 : 0;
             setTimeout(() => renderEditor(Code), timeout);
         });
+
+        this.completedSetup = true;
+    }
+
+    update() {
+        const codeNode = this.getNode() as CodeBlockNode;
+        const code = codeNode.getCode();
+        const language = codeNode.getLanguage();
+
+        if (this.latestCode === code && this.latestLanguage === language) {
+            return;
+        }
+        this.latestLanguage = language;
+        this.latestCode = code;
+
+        if (this.editor) {
+            this.editor.setContent(code);
+            this.editor.setMode(language, code);
+        }
+    }
+
+    render(context: EditorUiContext, element: HTMLElement): void {
+        if (this.completedSetup) {
+            this.update();
+        } else {
+            this.setup(context, element);
+        }
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 4a45ef75d0a..9f83fbea363 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -49,10 +49,12 @@ import unlinkIcon from "@icons/editor/unlink.svg"
 import tableIcon from "@icons/editor/table.svg"
 import imageIcon from "@icons/editor/image.svg"
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"
+import codeBlockIcon from "@icons/editor/code-block.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
 import fullscreenIcon from "@icons/editor/fullscreen.svg"
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
+import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -336,6 +338,31 @@ export const horizontalRule: EditorButtonDefinition = {
     }
 };
 
+export const codeBlock: EditorButtonDefinition = {
+    label: 'Insert code block',
+    icon: codeBlockIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const codeBlock = getNodeFromSelection(selection, $isCodeBlockNode) as (CodeBlockNode|null);
+            if (codeBlock === null) {
+                context.editor.update(() => {
+                    const codeBlock = $createCodeBlockNode();
+                    codeBlock.setCode(selection?.getTextContent() || '');
+                    insertNewBlockNodeAtSelection(codeBlock, true);
+                    $openCodeEditorForNode(context.editor, codeBlock);
+                    codeBlock.selectStart();
+                });
+            } else {
+                $openCodeEditorForNode(context.editor, codeBlock);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return selectionContainsNodeType(selection, $isCodeBlockNode);
+    }
+};
+
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
     icon: detailsIcon,
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
index b0d2392fd31..a9917ab232f 100644
--- a/resources/js/wysiwyg/ui/framework/decorator.ts
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -29,6 +29,7 @@ export abstract class EditorDecorator {
 
     /**
      * Render the decorator.
+     * Can run on both creation and update for a node decorator.
      * If an element is returned, this will be appended to the element
      * that is being decorated.
      */
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index a75d2478624..6477c4a1a76 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -157,21 +157,23 @@ export class EditorUIManager {
 
         // Register our DOM decorate listener with the editor
         const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
-            const keys = Object.keys(decorators);
-            for (const key of keys) {
-                const decoratedEl = editor.getElementByKey(key);
-                if (!decoratedEl) {
-                    continue;
+            editor.getEditorState().read(() => {
+                const keys = Object.keys(decorators);
+                for (const key of keys) {
+                    const decoratedEl = editor.getElementByKey(key);
+                    if (!decoratedEl) {
+                        continue;
+                    }
+
+                    const adapter = decorators[key];
+                    const decorator = this.getDecorator(adapter.type, key);
+                    decorator.setNode(adapter.getNode());
+                    const decoratorEl = decorator.render(this.getContext(), decoratedEl);
+                    if (decoratorEl) {
+                        decoratedEl.append(decoratorEl);
+                    }
                 }
-
-                const adapter = decorators[key];
-                const decorator = this.getDecorator(adapter.type, key);
-                decorator.setNode(adapter.getNode());
-                const decoratorEl = decorator.render(this.getContext(), decoratedEl);
-                if (decoratorEl) {
-                    decoratedEl.append(decoratorEl);
-                }
-            }
+            });
         }
         editor.registerDecoratorListener(domDecorateListener);
     }
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 550c798c264..18b81138007 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,6 +1,6 @@
 import {EditorButton} from "./framework/buttons";
 import {
-    blockquote, bold, bulletList, clearFormating, code,
+    blockquote, bold, bulletList, clearFormating, code, codeBlock,
     dangerCallout, details, fullscreen,
     h2, h3, h4, h5, highlightColor, horizontalRule, image,
     infoCallout, italic, link, numberList, paragraph,
@@ -68,6 +68,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             ]),
             new EditorButton(image),
             new EditorButton(horizontalRule),
+            new EditorButton(codeBlock),
             new EditorButton(details),
         ]),
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 7530382630b..5305ada8235 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -244,6 +244,13 @@ body.editor-is-fullscreen {
   cursor: row-resize;
 }
 
+.editor-code-block-wrap {
+  user-select: none;
+  > * {
+    pointer-events: none;
+  }
+}
+
 // Editor theme styles
 .editor-theme-bold {
   font-weight: bold;

From feca1f0502177dc3d9911101000244ed6a25396d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 3 Jul 2024 10:28:04 +0100
Subject: [PATCH 189/666] Lexical: Started diagram support

---
 resources/js/wysiwyg/nodes/code-block.ts      |   1 -
 resources/js/wysiwyg/nodes/diagram.ts         | 158 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |   2 +
 resources/js/wysiwyg/ui/decorators/diagram.ts |  25 +++
 resources/js/wysiwyg/ui/index.ts              |   2 +
 tsconfig.json                                 |   2 +-
 6 files changed, 188 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/diagram.ts
 create mode 100644 resources/js/wysiwyg/ui/decorators/diagram.ts

diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index 934fe7eddd6..f839501db2e 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -10,7 +10,6 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {code} from "../ui/defaults/button-definitions";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/nodes/diagram.ts
new file mode 100644
index 00000000000..15726813c9b
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/diagram.ts
@@ -0,0 +1,158 @@
+import {
+    DecoratorNode,
+    DOMConversion,
+    DOMConversionMap,
+    DOMConversionOutput,
+    LexicalEditor, LexicalNode,
+    SerializedLexicalNode,
+    Spread
+} from "lexical";
+import type {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+import {EditorDecoratorAdapter} from "../ui/framework/decorator";
+
+export type SerializedDiagramNode = Spread<{
+    id: string;
+    drawingId: string;
+    drawingUrl: string;
+}, SerializedLexicalNode>
+
+export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
+    __id: string = '';
+    __drawingId: string = '';
+    __drawingUrl: string = '';
+
+    static getType(): string {
+        return 'diagram';
+    }
+
+    static clone(node: DiagramNode): DiagramNode {
+        return new DiagramNode(node.__drawingId, node.__drawingUrl);
+    }
+
+    constructor(drawingId: string, drawingUrl: string, key?: string) {
+        super(key);
+        this.__drawingId = drawingId;
+        this.__drawingUrl = drawingUrl;
+    }
+
+    setDrawingIdAndUrl(drawingId: string, drawingUrl: string): void {
+        const self = this.getWritable();
+        self.__drawingUrl = drawingUrl;
+        self.__drawingId = drawingId;
+    }
+
+    getDrawingIdAndUrl(): {id: string, url: string} {
+        const self = this.getLatest();
+        return {
+            id: self.__drawingUrl,
+            url: self.__drawingUrl,
+        };
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
+        return {
+            type: 'diagram',
+            getNode: () => this,
+        };
+    }
+
+    isInline(): boolean {
+        return false;
+    }
+
+    isIsolated() {
+        return true;
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        return el('div', {
+            id: this.__id || null,
+            'drawio-diagram': this.__drawingId,
+        }, [
+            el('img', {src: this.__drawingUrl}),
+        ]);
+    }
+
+    updateDOM(prevNode: DiagramNode, dom: HTMLElement) {
+        const img = dom.querySelector('img');
+        if (!img) return false;
+
+        if (prevNode.__id !== this.__id) {
+            dom.setAttribute('id', this.__id);
+        }
+
+        if (prevNode.__drawingUrl !== this.__drawingUrl) {
+            img.setAttribute('src', this.__drawingUrl);
+        }
+
+        if (prevNode.__drawingId !== this.__drawingId) {
+            dom.setAttribute('drawio-diagram', this.__drawingId);
+        }
+
+        return false;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            div(node: HTMLElement): DOMConversion|null {
+
+                if (!node.hasAttribute('drawio-diagram')) {
+                    return null;
+                }
+
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+
+                        const img = element.querySelector('img');
+                        const drawingUrl = img?.getAttribute('src') || '';
+                        const drawingId = element.getAttribute('drawio-diagram') || '';
+
+                        return {
+                            node: $createDiagramNode(drawingId, drawingUrl),
+                        };
+                    },
+                    priority: 3,
+                };
+            },
+        };
+    }
+
+    exportJSON(): SerializedDiagramNode {
+        return {
+            type: 'diagram',
+            version: 1,
+            id: this.__id,
+            drawingId: this.__drawingId,
+            drawingUrl: this.__drawingUrl,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedDiagramNode): DiagramNode {
+        const node = $createDiagramNode(serializedNode.drawingId, serializedNode.drawingUrl);
+        node.setId(serializedNode.id || '');
+        return node;
+    }
+}
+
+export function $createDiagramNode(drawingId: string = '', drawingUrl: string = ''): DiagramNode {
+    return new DiagramNode(drawingId, drawingUrl);
+}
+
+export function $isDiagramNode(node: LexicalNode | null | undefined) {
+    return node instanceof DiagramNode;
+}
+
+export function $openDrawingEditorForNode(editor: LexicalEditor, node: DiagramNode): void {
+    // Todo
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 4cc6bd08b78..e2c6902d338 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -10,6 +10,7 @@ import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {CustomTableNode} from "./custom-table";
 import {HorizontalRuleNode} from "./horizontal-rule";
 import {CodeBlockNode} from "./code-block";
+import {DiagramNode} from "./diagram";
 
 /**
  * Load the nodes for lexical.
@@ -28,6 +29,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         HorizontalRuleNode,
         DetailsNode, SummaryNode,
         CodeBlockNode,
+        DiagramNode,
         CustomParagraphNode,
         LinkNode,
         {
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
new file mode 100644
index 00000000000..2f092bd203e
--- /dev/null
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -0,0 +1,25 @@
+import {EditorDecorator} from "../framework/decorator";
+import {EditorUiContext} from "../framework/core";
+
+
+export class DiagramDecorator extends EditorDecorator {
+    protected completedSetup: boolean = false;
+
+    setup(context: EditorUiContext, element: HTMLElement) {
+        //
+
+        this.completedSetup = true;
+    }
+
+    update() {
+        //
+    }
+
+    render(context: EditorUiContext, element: HTMLElement): void {
+        if (this.completedSetup) {
+            this.update();
+        } else {
+            this.setup(context, element);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 1ad1395dc77..50307fa6113 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -5,6 +5,7 @@ import {image as imageFormDefinition, link as linkFormDefinition, source as sour
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
+import {DiagramDecorator} from "./decorators/diagram";
 
 export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor) {
     const manager = new EditorUIManager();
@@ -51,4 +52,5 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
     manager.registerDecoratorType('code', CodeBlockDecorator);
+    manager.registerDecoratorType('diagram', DiagramDecorator);
 }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 40d930149a9..9913c1235a4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -46,7 +46,7 @@
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
 
     /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
     // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 

From a8f1160743ed01091910e3df3075a6cadfa6d960 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 3 Jul 2024 11:00:57 +0100
Subject: [PATCH 190/666] JS: Converted come common services to typescript

---
 package.json                               |   3 +-
 resources/js/app.js                        |   9 +-
 resources/js/custom.d.ts                   |   4 +
 resources/js/global.d.ts                   |   9 +-
 resources/js/services/components.js        | 165 ---------------------
 resources/js/services/components.ts        | 153 +++++++++++++++++++
 resources/js/services/{text.js => text.ts} |  10 +-
 resources/js/wysiwyg/nodes/code-block.ts   |   3 +-
 tsconfig.json                              |   3 +-
 9 files changed, 172 insertions(+), 187 deletions(-)
 create mode 100644 resources/js/custom.d.ts
 delete mode 100644 resources/js/services/components.js
 create mode 100644 resources/js/services/components.ts
 rename resources/js/services/{text.js => text.ts} (55%)

diff --git a/package.json b/package.json
index 439eaa5a13d..71debf2bd68 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,8 @@
     "livereload": "livereload ./public/dist/",
     "permissions": "chown -R $USER:$USER bootstrap/cache storage public/uploads",
     "lint": "eslint \"resources/**/*.js\" \"resources/**/*.mjs\"",
-    "fix": "eslint --fix \"resources/**/*.js\" \"resources/**/*.mjs\""
+    "fix": "eslint --fix \"resources/**/*.js\" \"resources/**/*.mjs\"",
+    "ts:lint": "tsc --noEmit"
   },
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
diff --git a/resources/js/app.js b/resources/js/app.js
index 5b822e9009e..123d6c8f5cd 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,9 +1,8 @@
 import * as events from './services/events';
 import * as httpInstance from './services/http';
 import Translations from './services/translations';
-
-import * as components from './services/components';
 import * as componentMap from './components';
+import {ComponentStore} from './services/components.ts';
 
 // Url retrieval function
 window.baseUrl = function baseUrl(path) {
@@ -32,6 +31,6 @@ window.trans_choice = translator.getPlural.bind(translator);
 window.trans_plural = translator.parsePlural.bind(translator);
 
 // Load & initialise components
-components.register(componentMap);
-window.$components = components;
-components.init();
+window.$components = new ComponentStore();
+window.$components.register(componentMap);
+window.$components.init();
diff --git a/resources/js/custom.d.ts b/resources/js/custom.d.ts
new file mode 100644
index 00000000000..c5aba8ee287
--- /dev/null
+++ b/resources/js/custom.d.ts
@@ -0,0 +1,4 @@
+declare module '*.svg' {
+    const content: string;
+    export default content;
+}
\ No newline at end of file
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index 537da636854..da19545d110 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -1,12 +1,7 @@
-declare module '*.svg' {
-    const content: string;
-    export default content;
-}
+import {ComponentStore} from "./services/components";
 
 declare global {
     interface Window {
-        $components: {
-            first: (string) => Object,
-        }
+        $components: ComponentStore,
     }
 }
\ No newline at end of file
diff --git a/resources/js/services/components.js b/resources/js/services/components.js
deleted file mode 100644
index beb0ce92fbf..00000000000
--- a/resources/js/services/components.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import {kebabToCamel, camelToKebab} from './text';
-
-/**
- * A mapping of active components keyed by name, with values being arrays of component
- * instances since there can be multiple components of the same type.
- * @type {Object<String, Component[]>}
- */
-const components = {};
-
-/**
- * A mapping of component class models, keyed by name.
- * @type {Object<String, Constructor<Component>>}
- */
-const componentModelMap = {};
-
-/**
- * A mapping of active component maps, keyed by the element components are assigned to.
- * @type {WeakMap<Element, Object<String, Component>>}
- */
-const elementComponentMap = new WeakMap();
-
-/**
- * Parse out the element references within the given element
- * for the given component name.
- * @param {String} name
- * @param {Element} element
- */
-function parseRefs(name, element) {
-    const refs = {};
-    const manyRefs = {};
-
-    const prefix = `${name}@`;
-    const selector = `[refs*="${prefix}"]`;
-    const refElems = [...element.querySelectorAll(selector)];
-    if (element.matches(selector)) {
-        refElems.push(element);
-    }
-
-    for (const el of refElems) {
-        const refNames = el.getAttribute('refs')
-            .split(' ')
-            .filter(str => str.startsWith(prefix))
-            .map(str => str.replace(prefix, ''))
-            .map(kebabToCamel);
-        for (const ref of refNames) {
-            refs[ref] = el;
-            if (typeof manyRefs[ref] === 'undefined') {
-                manyRefs[ref] = [];
-            }
-            manyRefs[ref].push(el);
-        }
-    }
-    return {refs, manyRefs};
-}
-
-/**
- * Parse out the element component options.
- * @param {String} componentName
- * @param {Element} element
- * @return {Object<String, String>}
- */
-function parseOpts(componentName, element) {
-    const opts = {};
-    const prefix = `option:${componentName}:`;
-    for (const {name, value} of element.attributes) {
-        if (name.startsWith(prefix)) {
-            const optName = name.replace(prefix, '');
-            opts[kebabToCamel(optName)] = value || '';
-        }
-    }
-    return opts;
-}
-
-/**
- * Initialize a component instance on the given dom element.
- * @param {String} name
- * @param {Element} element
- */
-function initComponent(name, element) {
-    /** @type {Function<Component>|undefined} * */
-    const ComponentModel = componentModelMap[name];
-    if (ComponentModel === undefined) return;
-
-    // Create our component instance
-    /** @type {Component} * */
-    let instance;
-    try {
-        instance = new ComponentModel();
-        instance.$name = name;
-        instance.$el = element;
-        const allRefs = parseRefs(name, element);
-        instance.$refs = allRefs.refs;
-        instance.$manyRefs = allRefs.manyRefs;
-        instance.$opts = parseOpts(name, element);
-        instance.setup();
-    } catch (e) {
-        console.error('Failed to create component', e, name, element);
-    }
-
-    // Add to global listing
-    if (typeof components[name] === 'undefined') {
-        components[name] = [];
-    }
-    components[name].push(instance);
-
-    // Add to element mapping
-    const elComponents = elementComponentMap.get(element) || {};
-    elComponents[name] = instance;
-    elementComponentMap.set(element, elComponents);
-}
-
-/**
- * Initialize all components found within the given element.
- * @param {Element|Document} parentElement
- */
-export function init(parentElement = document) {
-    const componentElems = parentElement.querySelectorAll('[component],[components]');
-
-    for (const el of componentElems) {
-        const componentNames = `${el.getAttribute('component') || ''} ${(el.getAttribute('components'))}`.toLowerCase().split(' ').filter(Boolean);
-        for (const name of componentNames) {
-            initComponent(name, el);
-        }
-    }
-}
-
-/**
- * Register the given component mapping into the component system.
- * @param {Object<String, ObjectConstructor<Component>>} mapping
- */
-export function register(mapping) {
-    const keys = Object.keys(mapping);
-    for (const key of keys) {
-        componentModelMap[camelToKebab(key)] = mapping[key];
-    }
-}
-
-/**
- * Get the first component of the given name.
- * @param {String} name
- * @returns {Component|null}
- */
-export function first(name) {
-    return (components[name] || [null])[0];
-}
-
-/**
- * Get all the components of the given name.
- * @param {String} name
- * @returns {Component[]}
- */
-export function get(name) {
-    return components[name] || [];
-}
-
-/**
- * Get the first component, of the given name, that's assigned to the given element.
- * @param {Element} element
- * @param {String} name
- * @returns {Component|null}
- */
-export function firstOnElement(element, name) {
-    const elComponents = elementComponentMap.get(element) || {};
-    return elComponents[name] || null;
-}
diff --git a/resources/js/services/components.ts b/resources/js/services/components.ts
new file mode 100644
index 00000000000..c19939e92a9
--- /dev/null
+++ b/resources/js/services/components.ts
@@ -0,0 +1,153 @@
+import {kebabToCamel, camelToKebab} from './text';
+import {Component} from "../components/component";
+
+/**
+ * Parse out the element references within the given element
+ * for the given component name.
+ */
+function parseRefs(name: string, element: HTMLElement):
+    {refs: Record<string, HTMLElement>, manyRefs: Record<string, HTMLElement[]>} {
+    const refs: Record<string, HTMLElement> = {};
+    const manyRefs: Record<string, HTMLElement[]> = {};
+
+    const prefix = `${name}@`;
+    const selector = `[refs*="${prefix}"]`;
+    const refElems = [...element.querySelectorAll(selector)];
+    if (element.matches(selector)) {
+        refElems.push(element);
+    }
+
+    for (const el of refElems as HTMLElement[]) {
+        const refNames = (el.getAttribute('refs') || '')
+            .split(' ')
+            .filter(str => str.startsWith(prefix))
+            .map(str => str.replace(prefix, ''))
+            .map(kebabToCamel);
+        for (const ref of refNames) {
+            refs[ref] = el;
+            if (typeof manyRefs[ref] === 'undefined') {
+                manyRefs[ref] = [];
+            }
+            manyRefs[ref].push(el);
+        }
+    }
+    return {refs, manyRefs};
+}
+
+/**
+ * Parse out the element component options.
+ */
+function parseOpts(componentName: string, element: HTMLElement): Record<string, string> {
+    const opts: Record<string, string> = {};
+    const prefix = `option:${componentName}:`;
+    for (const {name, value} of element.attributes) {
+        if (name.startsWith(prefix)) {
+            const optName = name.replace(prefix, '');
+            opts[kebabToCamel(optName)] = value || '';
+        }
+    }
+    return opts;
+}
+
+export class ComponentStore {
+    /**
+     * A mapping of active components keyed by name, with values being arrays of component
+     * instances since there can be multiple components of the same type.
+     */
+    protected components: Record<string, Component[]> = {};
+
+    /**
+     * A mapping of component class models, keyed by name.
+     */
+    protected componentModelMap: Record<string, typeof Component> = {};
+
+    /**
+     * A mapping of active component maps, keyed by the element components are assigned to.
+     */
+    protected elementComponentMap: WeakMap<HTMLElement, Record<string, Component>> = new WeakMap();
+
+    /**
+     * Initialize a component instance on the given dom element.
+     */
+     protected initComponent(name: string, element: HTMLElement): void {
+        const ComponentModel = this.componentModelMap[name];
+        if (ComponentModel === undefined) return;
+
+        // Create our component instance
+        let instance: Component|null = null;
+        try {
+            instance = new ComponentModel();
+            instance.$name = name;
+            instance.$el = element;
+            const allRefs = parseRefs(name, element);
+            instance.$refs = allRefs.refs;
+            instance.$manyRefs = allRefs.manyRefs;
+            instance.$opts = parseOpts(name, element);
+            instance.setup();
+        } catch (e) {
+            console.error('Failed to create component', e, name, element);
+        }
+
+        if (!instance) {
+            return;
+        }
+
+        // Add to global listing
+        if (typeof this.components[name] === 'undefined') {
+            this.components[name] = [];
+        }
+        this.components[name].push(instance);
+
+        // Add to element mapping
+        const elComponents = this.elementComponentMap.get(element) || {};
+        elComponents[name] = instance;
+        this.elementComponentMap.set(element, elComponents);
+    }
+
+    /**
+     * Initialize all components found within the given element.
+     */
+    public init(parentElement: Document|HTMLElement = document) {
+        const componentElems = parentElement.querySelectorAll('[component],[components]');
+
+        for (const el of componentElems) {
+            const componentNames = `${el.getAttribute('component') || ''} ${(el.getAttribute('components'))}`.toLowerCase().split(' ').filter(Boolean);
+            for (const name of componentNames) {
+                this.initComponent(name, el as HTMLElement);
+            }
+        }
+    }
+
+    /**
+     * Register the given component mapping into the component system.
+     * @param {Object<String, ObjectConstructor<Component>>} mapping
+     */
+    public register(mapping: Record<string, typeof Component>) {
+        const keys = Object.keys(mapping);
+        for (const key of keys) {
+            this.componentModelMap[camelToKebab(key)] = mapping[key];
+        }
+    }
+
+    /**
+     * Get the first component of the given name.
+     */
+    public first(name: string): Component|null {
+        return (this.components[name] || [null])[0];
+    }
+
+    /**
+     * Get all the components of the given name.
+     */
+    public get(name: string): Component[] {
+        return this.components[name] || [];
+    }
+
+    /**
+     * Get the first component, of the given name, that's assigned to the given element.
+     */
+    public firstOnElement(element: HTMLElement, name: string): Component|null {
+        const elComponents = this.elementComponentMap.get(element) || {};
+        return elComponents[name] || null;
+    }
+}
diff --git a/resources/js/services/text.js b/resources/js/services/text.ts
similarity index 55%
rename from resources/js/services/text.js
rename to resources/js/services/text.ts
index d5e6fa79874..351e8016734 100644
--- a/resources/js/services/text.js
+++ b/resources/js/services/text.ts
@@ -1,19 +1,15 @@
 /**
  * Convert a kebab-case string to camelCase
- * @param {String} kebab
- * @returns {string}
  */
-export function kebabToCamel(kebab) {
-    const ucFirst = word => word.slice(0, 1).toUpperCase() + word.slice(1);
+export function kebabToCamel(kebab: string): string {
+    const ucFirst = (word: string) => word.slice(0, 1).toUpperCase() + word.slice(1);
     const words = kebab.split('-');
     return words[0] + words.slice(1).map(ucFirst).join('');
 }
 
 /**
  * Convert a camelCase string to a kebab-case string.
- * @param {String} camelStr
- * @returns {String}
  */
-export function camelToKebab(camelStr) {
+export function camelToKebab(camelStr: string): string {
     return camelStr.replace(/[A-Z]/g, (str, offset) => (offset > 0 ? '-' : '') + str.toLowerCase());
 }
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index f839501db2e..2478ba24900 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -10,6 +10,7 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
+import {CodeEditor} from "../../components";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
@@ -170,7 +171,7 @@ export function $openCodeEditorForNode(editor: LexicalEditor, node: CodeBlockNod
     const language = node.getLanguage();
 
     // @ts-ignore
-    const codeEditor = window.$components.first('code-editor');
+    const codeEditor = window.$components.first('code-editor') as CodeEditor;
     // TODO - Handle direction
     codeEditor.open(code, language, 'ltr', (newCode: string, newLang: string) => {
         editor.update(() => {
diff --git a/tsconfig.json b/tsconfig.json
index 9913c1235a4..3ca03da303d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "include": ["resources/js/**/*"],
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
 
@@ -26,7 +27,7 @@
 
     /* Modules */
     "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    "rootDir": "./resources/js/",                        /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     "paths": {                                           /* Specify a set of entries that re-map imports to additional lookup locations. */

From 9b0ef85f77f140be8dffa2f333070f0429c15bb2 Mon Sep 17 00:00:00 2001
From: DanielGordonIT <108084596+DanielGordonIT@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:50:25 -0400
Subject: [PATCH 191/666] Wraps file extension comparison components in
 strtolower() This avoids the issue where replacing file.PNG with newfile.png
 fails due to "PNG" not being equal to "png"

---
 app/Uploads/ImageRepo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 1e58816a4f3..845067fdc29 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -166,7 +166,7 @@ public function updateImageDetails(Image $image, $updateDetails): Image
      */
     public function updateImageFile(Image $image, UploadedFile $file): void
     {
-        if ($file->getClientOriginalExtension() !== pathinfo($image->path, PATHINFO_EXTENSION)) {
+        if (strtolower($file->getClientOriginalExtension()) !== strtolower(pathinfo($image->path, PATHINFO_EXTENSION))) {
             throw new ImageUploadException(trans('errors.image_upload_replace_type'));
         }
 

From 04c7e680fd8e86004ab27c517b3fa300c7091062 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 4 Jul 2024 13:09:53 +0100
Subject: [PATCH 192/666] Lexical: Linked up saving logic of editor via
 interface

---
 resources/js/components/markdown-editor.js    |  4 +--
 resources/js/components/page-editor.js        |  8 +++--
 .../js/components/wysiwyg-editor-tinymce.js   |  4 +--
 resources/js/components/wysiwyg-editor.js     | 31 ++++++++++++++++---
 resources/js/wysiwyg/index.ts                 | 20 ++++++++++--
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/resources/js/components/markdown-editor.js b/resources/js/components/markdown-editor.js
index cd928de9f16..ad5bcf09030 100644
--- a/resources/js/components/markdown-editor.js
+++ b/resources/js/components/markdown-editor.js
@@ -133,9 +133,9 @@ export class MarkdownEditor extends Component {
     /**
      * Get the content of this editor.
      * Used by the parent page editor component.
-     * @return {{html: String, markdown: String}}
+     * @return {Promise<{html: String, markdown: String}>}
      */
-    getContent() {
+    async getContent() {
         return this.editor.actions.getContent();
     }
 
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 963c2100896..ecfc3546f4e 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -118,7 +118,7 @@ export class PageEditor extends Component {
     async saveDraft() {
         const data = {name: this.titleElem.value.trim()};
 
-        const editorContent = this.getEditorComponent().getContent();
+        const editorContent = await this.getEditorComponent().getContent();
         Object.assign(data, editorContent);
 
         let didSave = false;
@@ -235,10 +235,12 @@ export class PageEditor extends Component {
     }
 
     /**
-     * @return MarkdownEditor|WysiwygEditor
+     * @return {MarkdownEditor|WysiwygEditor|WysiwygEditorTinymce}
      */
     getEditorComponent() {
-        return window.$components.first('markdown-editor') || window.$components.first('wysiwyg-editor');
+        return window.$components.first('markdown-editor')
+            || window.$components.first('wysiwyg-editor')
+            || window.$components.first('wysiwyg-editor-tinymce');
     }
 
 }
diff --git a/resources/js/components/wysiwyg-editor-tinymce.js b/resources/js/components/wysiwyg-editor-tinymce.js
index 093442ea2bc..46ae6ecf4cc 100644
--- a/resources/js/components/wysiwyg-editor-tinymce.js
+++ b/resources/js/components/wysiwyg-editor-tinymce.js
@@ -37,9 +37,9 @@ export class WysiwygEditorTinymce extends Component {
     /**
      * Get the content of this editor.
      * Used by the parent page editor component.
-     * @return {{html: String}}
+     * @return {Promise<{html: String}>}
      */
-    getContent() {
+    async getContent() {
         return {
             html: this.editor.getContent(),
         };
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index 2f0e660b19f..deb37186471 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -7,13 +7,35 @@ export class WysiwygEditor extends Component {
         this.editContainer = this.$refs.editContainer;
         this.input = this.$refs.input;
 
+        /** @var {SimpleWysiwygEditorInterface|null} */
+        this.editor = null;
+
         window.importVersioned('wysiwyg').then(wysiwyg => {
             const editorContent = this.input.value;
-            wysiwyg.createPageEditorInstance(this.editContainer, editorContent);
+            this.editor = wysiwyg.createPageEditorInstance(this.editContainer, editorContent);
+        });
+
+        let handlingFormSubmit = false;
+        this.input.form.addEventListener('submit', event => {
+            if (!this.editor) {
+                return;
+            }
+
+            if (!handlingFormSubmit) {
+                event.preventDefault();
+                handlingFormSubmit = true;
+                this.editor.getContentAsHtml().then(html => {
+                    this.input.value = html;
+                    this.input.form.submit();
+                });
+            } else {
+                handlingFormSubmit = false;
+            }
         });
     }
 
     getDrawIoUrl() {
+        // TODO
         const drawioUrlElem = document.querySelector('[drawio-url]');
         if (drawioUrlElem) {
             return drawioUrlElem.getAttribute('drawio-url');
@@ -24,12 +46,11 @@ export class WysiwygEditor extends Component {
     /**
      * Get the content of this editor.
      * Used by the parent page editor component.
-     * @return {{html: String}}
+     * @return {Promise<{html: String}>}
      */
-    getContent() {
-        // TODO - Update
+    async getContent() {
         return {
-            html: this.editor.getContent(),
+            html: await this.editor.getContentAsHtml(),
         };
     }
 
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index b0ff896c76e..09b6e060b67 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,14 +1,14 @@
-import {createEditor, CreateEditorArgs} from 'lexical';
+import {createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
 import {getNodesForPageEditor} from './nodes';
 import {buildEditorUI} from "./ui";
-import {setEditorContentFromHtml} from "./actions";
+import {getEditorContentAsHtml, setEditorContentFromHtml} from "./actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {el} from "./helpers";
 
-export function createPageEditorInstance(container: HTMLElement, htmlContent: string) {
+export function createPageEditorInstance(container: HTMLElement, htmlContent: string): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
@@ -57,4 +57,18 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     });
 
     buildEditorUI(container, editArea, editor);
+
+    return new SimpleWysiwygEditorInterface(editor);
 }
+
+export class SimpleWysiwygEditorInterface {
+    protected editor: LexicalEditor;
+
+    constructor(editor: LexicalEditor) {
+        this.editor = editor;
+    }
+
+    async getContentAsHtml(): Promise<string> {
+        return await getEditorContentAsHtml(this.editor);
+    }
+}
\ No newline at end of file

From 2c96af9aeafe2d4943a76cd69679ee7dcec737a3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 4 Jul 2024 16:16:16 +0100
Subject: [PATCH 193/666] Lexical: Worked on toolbar styling, got format
 submenu working

---
 .../ui/framework/blocks/dropdown-button.ts    | 14 +--
 .../ui/framework/blocks/format-menu.ts        | 11 ++-
 .../ui/framework/blocks/overflow-container.ts |  7 +-
 .../wysiwyg/ui/framework/helpers/dropdowns.ts | 20 ++++-
 resources/js/wysiwyg/ui/toolbars.ts           | 85 +++++++++++--------
 resources/sass/_editor.scss                   | 48 ++++++++++-
 6 files changed, 133 insertions(+), 52 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index 70e1a9ffc51..a75cf64fef5 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -7,10 +7,12 @@ export class EditorDropdownButton extends EditorContainerUiElement {
     protected button: EditorButton;
     protected childItems: EditorUiElement[];
     protected open: boolean = false;
+    protected showOnHover: boolean = false;
 
-    constructor(button: EditorBasicButtonDefinition|EditorButton, children: EditorUiElement[]) {
+    constructor(button: EditorBasicButtonDefinition|EditorButton, showOnHover: boolean, children: EditorUiElement[]) {
         super(children);
-        this.childItems = children
+        this.childItems = children;
+        this.showOnHover = showOnHover;
 
         if (button instanceof EditorButton) {
             this.button = button;
@@ -47,13 +49,15 @@ export class EditorDropdownButton extends EditorContainerUiElement {
             class: 'editor-dropdown-menu-container',
         }, [button, menu]);
 
-        handleDropdown(button, menu, () => {
+        handleDropdown({toggle : button, menu : menu,
+            showOnHover: this.showOnHover,
+            onOpen : () => {
             this.open = true;
             this.getContext().manager.triggerStateUpdateForElement(this.button);
-        }, () => {
+        }, onClose : () => {
             this.open = false;
             this.getContext().manager.triggerStateUpdateForElement(this.button);
-        });
+        }});
 
         return wrapper;
     }
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
index bcd61e45cd3..52a9c380986 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
@@ -20,7 +20,7 @@ export class EditorFormatMenu extends EditorContainerUiElement {
             class: 'editor-format-menu editor-dropdown-menu-container',
         }, [toggle, menu]);
 
-        handleDropdown(toggle, menu);
+        handleDropdown({toggle : toggle, menu : menu});
 
         return wrapper;
     }
@@ -33,6 +33,15 @@ export class EditorFormatMenu extends EditorContainerUiElement {
                 this.updateToggleLabel(child.getLabel());
                 return;
             }
+
+            if (child instanceof EditorContainerUiElement) {
+                for (const grandchild of child.getChildren()) {
+                    if (grandchild instanceof EditorButton && grandchild.isActive()) {
+                        this.updateToggleLabel(grandchild.getLabel());
+                        return;
+                    }
+                }
+            }
         }
 
         this.updateToggleLabel(this.trans('Formats'));
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
index 2c188471e51..83f394d9d86 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -17,13 +17,14 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
         this.overflowButton = new EditorDropdownButton({
             label: 'More',
             icon: moreHorizontal,
-        }, []);
+        }, false, []);
         this.addChildren(this.overflowButton);
     }
 
     protected buildDOM(): HTMLElement {
-        const visibleChildren = this.content.slice(0, this.size);
-        const invisibleChildren = this.content.slice(this.size);
+        const slicePosition = this.content.length > this.size ? this.size - 1 : this.size;
+        const visibleChildren = this.content.slice(0, slicePosition);
+        const invisibleChildren = this.content.slice(slicePosition);
 
         const visibleElements = visibleChildren.map(child => child.getDOMElement());
         if (invisibleChildren.length > 0) {
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index 35886d2f922..45c3f39d190 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -1,7 +1,16 @@
 
 
 
-export function handleDropdown(toggle: HTMLElement, menu: HTMLElement, onOpen: Function|undefined = undefined, onClose: Function|undefined = undefined) {
+interface HandleDropdownParams {
+    toggle: HTMLElement;
+    menu: HTMLElement;
+    showOnHover?: boolean,
+    onOpen?: Function | undefined;
+    onClose?: Function | undefined;
+}
+
+export function handleDropdown(options: HandleDropdownParams) {
+    const {menu, toggle, onClose, onOpen, showOnHover} = options;
     let clickListener: Function|null = null;
 
     const hide = () => {
@@ -27,8 +36,13 @@ export function handleDropdown(toggle: HTMLElement, menu: HTMLElement, onOpen: F
         }
     };
 
-    toggle.addEventListener('click', event => {
+    const toggleShowing = (event: MouseEvent) => {
         menu.hasAttribute('hidden') ? show() : hide();
-    });
+    };
+    toggle.addEventListener('click', toggleShowing);
+    if (showOnHover) {
+        toggle.addEventListener('mouseenter', toggleShowing);
+    }
+
     menu.addEventListener('mouseleave', hide);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 18b81138007..df514e504bf 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -21,9 +21,12 @@ import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
+
         // History state
-        new EditorButton(undo),
-        new EditorButton(redo),
+        new EditorOverflowContainer(2, [
+            new EditorButton(undo),
+            new EditorButton(redo),
+        ]),
 
         // Block formats
         new EditorFormatMenu([
@@ -33,37 +36,43 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new FormatPreviewButton(el('h5'), h5),
             new FormatPreviewButton(el('blockquote'), blockquote),
             new FormatPreviewButton(el('p'), paragraph),
-            new FormatPreviewButton(el('p', {class: 'callout info'}), infoCallout),
-            new FormatPreviewButton(el('p', {class: 'callout success'}), successCallout),
-            new FormatPreviewButton(el('p', {class: 'callout warning'}), warningCallout),
-            new FormatPreviewButton(el('p', {class: 'callout danger'}), dangerCallout),
+            new EditorDropdownButton({label: 'Callouts'}, true, [
+                new FormatPreviewButton(el('p', {class: 'callout info'}), infoCallout),
+                new FormatPreviewButton(el('p', {class: 'callout success'}), successCallout),
+                new FormatPreviewButton(el('p', {class: 'callout warning'}), warningCallout),
+                new FormatPreviewButton(el('p', {class: 'callout danger'}), dangerCallout),
+            ]),
         ]),
 
         // Inline formats
-        new EditorButton(bold),
-        new EditorButton(italic),
-        new EditorButton(underline),
-        new EditorDropdownButton(new EditorColorButton(textColor, 'color'), [
-            new EditorColorPicker('color'),
-        ]),
-        new EditorDropdownButton(new EditorColorButton(highlightColor, 'background-color'), [
-            new EditorColorPicker('background-color'),
+        new EditorOverflowContainer(6, [
+            new EditorButton(bold),
+            new EditorButton(italic),
+            new EditorButton(underline),
+            new EditorDropdownButton(new EditorColorButton(textColor, 'color'), false, [
+                new EditorColorPicker('color'),
+            ]),
+            new EditorDropdownButton(new EditorColorButton(highlightColor, 'background-color'), false, [
+                new EditorColorPicker('background-color'),
+            ]),
+            new EditorButton(strikethrough),
+            new EditorButton(superscript),
+            new EditorButton(subscript),
+            new EditorButton(code),
+            new EditorButton(clearFormating),
         ]),
-        new EditorButton(strikethrough),
-        new EditorButton(superscript),
-        new EditorButton(subscript),
-        new EditorButton(code),
-        new EditorButton(clearFormating),
 
         // Lists
-        new EditorButton(bulletList),
-        new EditorButton(numberList),
-        new EditorButton(taskList),
+        new EditorOverflowContainer(3, [
+            new EditorButton(bulletList),
+            new EditorButton(numberList),
+            new EditorButton(taskList),
+        ]),
 
         // Insert types
         new EditorOverflowContainer(6, [
             new EditorButton(link),
-            new EditorDropdownButton(table, [
+            new EditorDropdownButton(table, false, [
                 new EditorTableCreator(),
             ]),
             new EditorButton(image),
@@ -73,21 +82,23 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Meta elements
-        new EditorButton(source),
-        new EditorButton(fullscreen),
+        new EditorOverflowContainer(3, [
+            new EditorButton(source),
+            new EditorButton(fullscreen),
 
-        // Test
-        new EditorButton({
-            label: 'Test button',
-            action(context: EditorUiContext) {
-                context.editor.update(() => {
-                    // Do stuff
-                });
-            },
-            isActive() {
-                return false;
-            }
-        })
+            // Test
+            new EditorButton({
+                label: 'Test button',
+                action(context: EditorUiContext) {
+                    context.editor.update(() => {
+                        // Do stuff
+                    });
+                },
+                isActive() {
+                    return false;
+                }
+            })
+        ]),
     ]);
 }
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 5305ada8235..f5e166cc3cb 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -37,12 +37,13 @@ body.editor-is-fullscreen {
 // Buttons
 .editor-button {
   font-size: 12px;
-  padding: 4px 6px;
+  padding: 4px;
   color: #444;
   border-radius: 4px;
   display: flex;
   align-items: center;
   justify-content: center;
+  margin: 2px;
 }
 .editor-button:hover {
   background-color: #EEE;
@@ -67,6 +68,7 @@ body.editor-is-fullscreen {
   height: 24px;
   color: inherit;
   fill: currentColor;
+  display: block;
 }
 
 // Containers
@@ -79,22 +81,60 @@ body.editor-is-fullscreen {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.15);
   z-index: 99;
   min-width: 120px;
+  display: flex;
+  flex-direction: row;
 }
 .editor-menu-list {
   display: flex;
   flex-direction: column;
+  align-items: stretch;
 }
-.editor-menu-list > .editor-button {
+.editor-menu-list .editor-button {
   border-bottom: 0;
   text-align: start;
+  display: block;
+  width: 100%;
+}
+.editor-menu-list > .editor-dropdown-menu-container .editor-dropdown-menu {
+  inset-inline-start: 100%;
+  top: 0;
+  flex-direction: column;
 }
 
+.editor-format-menu-toggle {
+  width: 130px;
+  height: 32px;
+  overflow: hidden;
+  padding-inline: 12px;
+  justify-content: start;
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="%23666" d="M7.41 8L12 12.58 16.59 8 18 9.41l-6 6-6-6z"/></svg>');
+  background-repeat: no-repeat;
+  background-position: 98% 50%;
+  background-size: 28px;
+}
 .editor-format-menu .editor-dropdown-menu {
-  min-width: 320px;
+  min-width: 300px;
+  .editor-dropdown-menu {
+    min-width: 220px;
+  }
+}
+.editor-format-menu .editor-dropdown-menu .editor-dropdown-menu-container > .editor-button {
+  padding: 8px 10px;
 }
 
 .editor-overflow-container {
   display: flex;
+  border-inline: 1px solid #DDD;
+  padding-inline: 4px;
+  &:first-child {
+    border-inline-start: none;
+  }
+  &:last-child {
+    border-inline-end: none;
+  }
+  + .editor-overflow-container {
+    border-inline-start: none;
+  }
 }
 
 .editor-context-toolbar {
@@ -104,6 +144,8 @@ body.editor-is-fullscreen {
   padding: .2rem;
   border-radius: 4px;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12);
+  display: flex;
+  flex-direction: row;
   &:before {
     content: '';
     z-index: -1;

From 25f92ce584cf058d225cbb3560b23ca558d60c0d Mon Sep 17 00:00:00 2001
From: DanielGordonIT <108084596+DanielGordonIT@users.noreply.github.com>
Date: Thu, 4 Jul 2024 19:48:12 -0400
Subject: [PATCH 194/666] Add test to verify different case on extensions works

---
 tests/Uploads/ImageTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index db500f60669..e28880c95fd 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -119,6 +119,7 @@ public function test_image_file_update()
         $this->files->deleteAtRelativePath($relPath);
     }
 
+
     public function test_image_file_update_does_not_allow_change_in_image_extension()
     {
         $page = $this->entities->page();

From ca310966b2ef52460c9ad7ca79dc707ff2ed3329 Mon Sep 17 00:00:00 2001
From: DanielGordonIT <108084596+DanielGordonIT@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:59:49 +0000
Subject: [PATCH 195/666] Actually add the test this time

---
 tests/Uploads/ImageTest.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index e28880c95fd..2c36f5f356e 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -119,6 +119,32 @@ public function test_image_file_update()
         $this->files->deleteAtRelativePath($relPath);
     }
 
+    public function test_image_file_update_allows_case_differences()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        $imgDetails = $this->files->uploadGalleryImageToPage($this, $page);
+        $relPath = $imgDetails['path'];
+
+        $newUpload = $this->files->uploadedImage('updated-image.PNG', 'compressed.png');
+        $this->assertFileEquals($this->files->testFilePath('test-image.png'), public_path($relPath));
+
+        $imageId = $imgDetails['response']->id;
+        $image = Image::findOrFail($imageId);
+        $image->updated_at = now()->subMonth();
+        $image->save();
+
+        $this->call('PUT', "/images/{$imageId}/file", [], [], ['file' => $newUpload])
+            ->assertOk();
+
+        $this->assertFileEquals($this->files->testFilePath('compressed.png'), public_path($relPath));
+
+        $image->refresh();
+        $this->assertTrue($image->updated_at->gt(now()->subMinute()));
+
+        $this->files->deleteAtRelativePath($relPath);
+    }
 
     public function test_image_file_update_does_not_allow_change_in_image_extension()
     {

From ce697ab0f5a217b0959b3a0ad2b19f487abd7885 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 9 Jul 2024 14:37:29 +0100
Subject: [PATCH 196/666] Readme: Added sponsor, removed road map section

Road map section was very much outdated and redundant so removing to
avoid confusion.
---
 readme.md | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index 5b78129913c..7c68d7ec607 100644
--- a/readme.md
+++ b/readme.md
@@ -79,20 +79,14 @@ Big thanks to these companies for supporting the project.
 </a></td>
 </tr>
 <tr>
-<td align="center" colspan="2"><a href="https://practinet.be/" target="_blank">
+<td align="center"><a href="https://practinet.be/" target="_blank">
     <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
+<td align="center"><a href="https://transporttalent.com" target="_blank">
+    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
+</a></td>
 </tr></tbody></table>
 
-## 🛣️ Road Map
-
-Below is a high-level road map view for BookStack to provide a sense of direction of where the project is going. This can change at any point and does not reflect many features and improvements that will also be included as part of the journey along this road map. For more granular detail of what will be included in upcoming releases you can review the project milestones as defined in our [Release Process](dev/docs/release-process.md) documentation.
-
-- **Platform REST API** - *(Most actions implemented, maturing)*
-    - *A REST API covering, at minimum, control of core content models (Books, Chapters, Pages) for automation and platform extension.*
-- **Permission System Review** - *(In Progress)*
-    - *Improvement in how permissions are applied and a review of the efficiency of the permission & roles system.*
-
 ## 🛠️ Development & Testing
 
 Please see our [development docs](dev/docs/development.md) for full details regarding work on the BookStack source code.

From 51d8044a547164080bb6ab31a60eb53348e595e7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 9 Jul 2024 20:49:47 +0100
Subject: [PATCH 197/666] Lexical: Added initial form/modal styles

---
 resources/icons/close.svg                   |   2 +-
 resources/js/wysiwyg/index.ts               |   3 +
 resources/js/wysiwyg/ui/framework/modals.ts |   9 +-
 resources/js/wysiwyg/ui/toolbars.ts         |  22 ++---
 resources/sass/_editor.scss                 | 104 +++++++++++++++++++-
 5 files changed, 122 insertions(+), 18 deletions(-)

diff --git a/resources/icons/close.svg b/resources/icons/close.svg
index c2ef4651081..afd3f467145 100644
--- a/resources/icons/close.svg
+++ b/resources/icons/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 09b6e060b67..d1d96b17233 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -49,6 +49,9 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     setEditorContentFromHtml(editor, htmlContent);
 
     const debugView = document.getElementById('lexical-debug');
+    if (debugView) {
+        debugView.hidden = true;
+    }
     editor.registerUpdateListener(({editorState}) => {
         console.log('editorState', editorState.toJSON());
         if (debugView) {
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index bfc5fc619bf..6b09accdc8b 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -1,7 +1,7 @@
 import {EditorForm, EditorFormDefinition} from "./forms";
 import {el} from "../../helpers";
 import {EditorContainerUiElement} from "./core";
-
+import closeIcon from "@icons/close.svg";
 
 export interface EditorModalDefinition {
     title: string;
@@ -37,7 +37,12 @@ export class EditorFormModal extends EditorContainerUiElement {
     }
 
     protected buildDOM(): HTMLElement {
-        const closeButton = el('button', {class: 'editor-modal-close', type: 'button', title: this.trans('Close')}, ['x']);
+        const closeButton = el('button', {
+            class: 'editor-modal-close',
+            type: 'button',
+            title: this.trans('Close'),
+        });
+        closeButton.innerHTML = closeIcon;
         closeButton.addEventListener('click', this.hide.bind(this));
 
         const modal = el('div', {class: 'editor-modal editor-form-modal'}, [
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index df514e504bf..25a7e7815fd 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -87,17 +87,17 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(fullscreen),
 
             // Test
-            new EditorButton({
-                label: 'Test button',
-                action(context: EditorUiContext) {
-                    context.editor.update(() => {
-                        // Do stuff
-                    });
-                },
-                isActive() {
-                    return false;
-                }
-            })
+            // new EditorButton({
+            //     label: 'Test button',
+            //     action(context: EditorUiContext) {
+            //         context.editor.update(() => {
+            //             // Do stuff
+            //         });
+            //     },
+            //     isActive() {
+            //         return false;
+            //     }
+            // })
         ]),
     ]);
 }
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index f5e166cc3cb..1f932e14705 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -176,17 +176,38 @@ body.editor-is-fullscreen {
 }
 .editor-modal {
   background-color: #FFF;
-  border: 1px solid #DDD;
-  padding: 1rem;
   border-radius: 4px;
+  overflow: hidden;
+  box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3);
 }
 .editor-modal-header {
   display: flex;
   justify-content: space-between;
-  margin-bottom: 1rem;
+  align-items: stretch;
+  background-color: var(--color-primary);
+  color: #FFF;
 }
 .editor-modal-title {
-  font-weight: 700;
+  padding: 8px $-m;
+}
+.editor-modal-close {
+  color: #FFF;
+  padding: 8px $-m;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  &:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  }
+  svg {
+    width: 1rem;
+    height: 1rem;
+    fill: currentColor;
+    display: block;
+  }
+}
+.editor-modal-body {
+  padding: $-m;
 }
 
 // Specific UI elements
@@ -293,6 +314,81 @@ body.editor-is-fullscreen {
   }
 }
 
+// Editor form elements
+.editor-form-field-wrapper {
+  margin-bottom: .5rem;
+}
+.editor-form-field-input {
+  display: block;
+  width: 100%;
+  min-width: 250px;
+  border: 1px solid #DDD;
+  padding: .5rem;
+  border-radius: 4px;
+  color: #444;
+}
+textarea.editor-form-field-input {
+  font-family: var(--font-code);
+  width: 350px;
+  height: 250px;
+  font-size: 12px;
+}
+.editor-form-field-label {
+  color: #444;
+  font-weight: 700;
+  font-size: 12px;
+}
+.editor-form-actions {
+  display: flex;
+  justify-content: end;
+  gap: $-s;
+  margin-top: $-m;
+}
+.editor-form-actions > button {
+  display: block;
+  font-size: 0.85rem;
+  line-height: 1.4em;
+  padding: $-xs*1.3 $-m;
+  font-weight: 400;
+  border-radius: 4px;
+  cursor: pointer;
+  box-shadow: none;
+  &:focus {
+    outline: 1px dotted currentColor;
+    outline-offset: -$-xs;
+    box-shadow: none;
+    filter: brightness(90%);
+  }
+}
+.editor-form-action-primary {
+  background-color: var(--color-primary);
+  color: #FFF;
+  border: 1px solid var(--color-primary);
+  &:hover {
+    @include lightDark(box-shadow, $bs-light, $bs-dark);
+    filter: brightness(110%);
+  }
+}
+.editor-form-action-secondary {
+  border: 1px solid;
+  @include lightDark(border-color, #CCC, #666);
+  @include lightDark(color, #666, #AAA);
+  &:hover, &:focus, &:active {
+    @include lightDark(color, #444, #BBB);
+    border: 1px solid #CCC;
+    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
+    background-color: #F2F2F2;
+    @include lightDark(background-color, #f8f8f8, #444);
+    filter: none;
+  }
+  &:active {
+    border-color: #BBB;
+    background-color: #DDD;
+    color: #666;
+    box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.1);
+  }
+}
+
 // Editor theme styles
 .editor-theme-bold {
   font-weight: bold;

From 95c3cc5c00fefe954481129caa68f6bf6bad5f7a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 12:20:06 +0100
Subject: [PATCH 198/666] Styles: Improved callout RTL support

Will now adapt using logical styles where supported, will fallbacks
to old fixed LTR positioning where not supported.
For #5104
---
 resources/sass/_content.scss | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index 3aa4ac653d9..be5a6517e0b 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -127,11 +127,18 @@ body .page-content img,
 
 /**
  * Callouts
+ * Some styles duplicated for supporting logical units (eg. inline-end) while
+ * providing fallbacks to non-logical rules, so RTL is natively supported where possible.
  */
 .callout {
   border-left: 3px solid #BBB;
+  border-inline-start: 3px solid #BBB;
+  border-inline-end: none;
   background-color: #EEE;
-  padding: $-s $-s $-s $-xl;
+  padding: $-s;
+  padding-left: $-xl;
+  padding-inline-start: $-xl;
+  padding-inline-end: $-s;
   display: block;
   position: relative;
   overflow: auto;
@@ -142,6 +149,8 @@ body .page-content img,
     width: 1.2em;
     height: 1.2em;
     left: $-xs + 2px;
+    inset-inline-start: $-xs + 2px;
+    inset-inline-end: unset;
     top: 50%;
     margin-top: -9px;
     display: inline-block;
@@ -150,7 +159,7 @@ body .page-content img,
     opacity: 0.8;
   }
   &.success {
-    @include lightDark(border-left-color, $positive, $positive-dark);
+    @include lightDark(border-color, $positive, $positive-dark);
     @include lightDark(background-color, lighten($positive, 68%), darken($positive-dark, 36%));
     @include lightDark(color, darken($positive, 16%), $positive-dark);
   }
@@ -158,7 +167,7 @@ body .page-content img,
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMzNzZjMzkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEyIDJDNi40OCAyIDIgNi40OCAyIDEyczQuNDggMTAgMTAgMTAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDJ6bS0yIDE1bC01LTUgMS40MS0xLjQxTDEwIDE0LjE3bDcuNTktNy41OUwxOSA4bC05IDl6Ii8+PC9zdmc+");
   }
   &.danger {
-    @include lightDark(border-left-color, $negative, $negative-dark);
+    @include lightDark(border-color, $negative, $negative-dark);
     @include lightDark(background-color, lighten($negative, 56%), darken($negative-dark, 55%));
     @include lightDark(color, darken($negative, 20%), $negative-dark);
   }
@@ -166,12 +175,12 @@ body .page-content img,
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiOTE4MTgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0xNS43MyAzSDguMjdMMyA4LjI3djcuNDZMOC4yNyAyMWg3LjQ2TDIxIDE1LjczVjguMjdMMTUuNzMgM3pNMTIgMTcuM2MtLjcyIDAtMS4zLS41OC0xLjMtMS4zIDAtLjcyLjU4LTEuMyAxLjMtMS4zLjcyIDAgMS4zLjU4IDEuMyAxLjMgMCAuNzItLjU4IDEuMy0xLjMgMS4zem0xLTQuM2gtMlY3aDJ2NnoiLz4gICAgPHBhdGggZD0iTTAgMGgyNHYyNEgweiIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
   }
   &.info {
-    @include lightDark(border-left-color, $info, $info-dark);
+    @include lightDark(border-color, $info, $info-dark);
     @include lightDark(color, darken($info, 20%), $info-dark);
     @include lightDark(background-color, lighten($info, 50%), darken($info-dark, 34%));
   }
   &.warning {
-    @include lightDark(border-left-color, $warning, $warning-dark);
+    @include lightDark(border-color, $warning, $warning-dark);
     @include lightDark(background-color, lighten($warning, 50%), darken($warning-dark, 50%));
     @include lightDark(color, darken($warning, 20%), $warning-dark);
   }

From 7161f2270693cb91b930dd7dc646e933651f96fa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 13:55:46 +0100
Subject: [PATCH 199/666] Dependancies: Updated composer & npm deps

---
 composer.lock     | 452 +++++++++++++++++++++++-----------------------
 package-lock.json | 192 +++++++++++---------
 2 files changed, 328 insertions(+), 316 deletions(-)

diff --git a/composer.lock b/composer.lock
index db0c9e667a6..0a1ed3e7b0e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.5",
+            "version": "v1.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"
+                "reference": "a63485b65b6b3367039306496d49737cf1995408"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
-                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408",
+                "reference": "a63485b65b6b3367039306496d49737cf1995408",
                 "shasum": ""
             },
             "require": {
@@ -56,22 +56,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.5"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.6"
             },
-            "time": "2024-04-19T21:30:56+00:00"
+            "time": "2024-06-13T17:21:28+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.311.2",
+            "version": "3.316.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "731cd73062909594c5f7443413c4c4c40ed1c25c"
+                "reference": "e832e594b3c213760e067e15ef2739f77505e832"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c",
-                "reference": "731cd73062909594c5f7443413c4c4c40ed1c25c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e832e594b3c213760e067e15ef2739f77505e832",
+                "reference": "e832e594b3c213760e067e15ef2739f77505e832",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.311.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.3"
             },
-            "time": "2024-06-07T18:05:33+00:00"
+            "time": "2024-07-12T18:07:23+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -390,16 +390,16 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
                 "shasum": ""
             },
             "require": {
@@ -459,9 +459,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
             },
-            "time": "2022-10-27T11:44:00+00:00"
+            "time": "2024-07-08T12:26:09+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -558,16 +558,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.4",
+            "version": "3.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd"
+                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd",
-                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b7411825cf7efb7e51f9791dea19d86e43b399a1",
+                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1",
                 "shasum": ""
             },
             "require": {
@@ -583,12 +583,12 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.58",
-                "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.16",
+                "phpstan/phpstan": "1.11.5",
+                "phpstan/phpstan-strict-rules": "^1.6",
+                "phpunit/phpunit": "9.6.19",
                 "psalm/plugin-phpunit": "0.18.4",
                 "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.9.0",
+                "squizlabs/php_codesniffer": "3.10.1",
                 "symfony/cache": "^5.4|^6.0|^7.0",
                 "symfony/console": "^4.4|^5.4|^6.0|^7.0",
                 "vimeo/psalm": "4.30.0"
@@ -651,7 +651,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.4"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.6"
             },
             "funding": [
                 {
@@ -667,7 +667,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-25T07:04:44+00:00"
+            "time": "2024-06-19T10:38:17+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1838,16 +1838,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.6.5",
+            "version": "3.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "d428433aa74836ab75e8d4a5241628bebb7f4077"
+                "reference": "5451ff9f909c2fc836722e5ed6831b9f9a6db68c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077",
-                "reference": "d428433aa74836ab75e8d4a5241628bebb7f4077",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/5451ff9f909c2fc836722e5ed6831b9f9a6db68c",
+                "reference": "5451ff9f909c2fc836722e5ed6831b9f9a6db68c",
                 "shasum": ""
             },
             "require": {
@@ -1894,7 +1894,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.6.5"
+                "source": "https://github.com/Intervention/image/tree/3.7.2"
             },
             "funding": [
                 {
@@ -1906,7 +1906,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-06T17:15:24+00:00"
+            "time": "2024-07-05T13:35:01+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1977,16 +1977,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.12",
+            "version": "v10.48.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "590afea38e708022662629fbf5184351fa82cf08"
+                "reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08",
-                "reference": "590afea38e708022662629fbf5184351fa82cf08",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f9a3a50fae399d75e125b0eea637dda90c99eae7",
+                "reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7",
                 "shasum": ""
             },
             "require": {
@@ -2180,20 +2180,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-05-28T15:46:19+00:00"
+            "time": "2024-07-09T15:25:22+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.23",
+            "version": "v0.1.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400"
+                "reference": "409b0b4305273472f3754826e68f4edbd0150149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
-                "reference": "9bc4df7c699b0452c6b815e64a2d84b6d7f99400",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
+                "reference": "409b0b4305273472f3754826e68f4edbd0150149",
                 "shasum": ""
             },
             "require": {
@@ -2236,9 +2236,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.23"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.24"
             },
-            "time": "2024-05-27T13:53:20+00:00"
+            "time": "2024-06-17T13:58:22+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2302,16 +2302,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.14.0",
+            "version": "v5.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "c7b0193a3753a29aff8ce80aa2f511917e6ed68a"
+                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/c7b0193a3753a29aff8ce80aa2f511917e6ed68a",
-                "reference": "c7b0193a3753a29aff8ce80aa2f511917e6ed68a",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029",
+                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029",
                 "shasum": ""
             },
             "require": {
@@ -2370,7 +2370,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-05-03T20:31:38+00:00"
+            "time": "2024-06-28T20:09:34+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3173,16 +3173,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.6.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8",
+                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8",
                 "shasum": ""
             },
             "require": {
@@ -3258,7 +3258,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.7.0"
             },
             "funding": [
                 {
@@ -3270,7 +3270,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-12T21:02:21+00:00"
+            "time": "2024-06-28T09:40:51+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -3595,16 +3595,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
                 "shasum": ""
             },
             "require": {
@@ -3615,7 +3615,7 @@
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -3647,9 +3647,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
             },
-            "time": "2024-03-05T20:51:40+00:00"
+            "time": "2024-07-01T20:03:41+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -4085,20 +4085,20 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.37",
+            "version": "3.0.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
+                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
+                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1|^2",
+                "paragonie/constant_time_encoding": "^1|^2|^3",
                 "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
                 "php": ">=5.6.1"
             },
@@ -4175,7 +4175,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
             },
             "funding": [
                 {
@@ -4191,7 +4191,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-03T02:14:58+00:00"
+            "time": "2024-06-24T06:27:33+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -4769,16 +4769,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.3",
+            "version": "v0.12.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
+                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
-                "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
+                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
                 "shasum": ""
             },
             "require": {
@@ -4842,9 +4842,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
             },
-            "time": "2024-04-02T15:57:53+00:00"
+            "time": "2024-06-10T01:18:23+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -5115,16 +5115,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.5.1",
+            "version": "v8.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
+                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
+                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
                 "shasum": ""
             },
             "require": {
@@ -5174,9 +5174,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.6.0"
             },
-            "time": "2024-02-15T16:41:13+00:00"
+            "time": "2024-07-01T07:33:21+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5623,16 +5623,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
+                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
-                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
                 "shasum": ""
             },
             "require": {
@@ -5697,7 +5697,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.8"
+                "source": "https://github.com/symfony/console/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -5713,7 +5713,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-06-28T09:49:33+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5849,16 +5849,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"
+                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
-                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c9b7cc075b3ab484239855622ca05cb0b99c13ec",
+                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec",
                 "shasum": ""
             },
             "require": {
@@ -5904,7 +5904,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.8"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -5920,7 +5920,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-06-21T16:04:15+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6221,16 +6221,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"
+                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
-                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
+                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
                 "shasum": ""
             },
             "require": {
@@ -6315,7 +6315,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -6331,20 +6331,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-02T16:06:25+00:00"
+            "time": "2024-06-28T11:48:06+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33"
+                "reference": "7d048964877324debdcb4e0549becfa064a20d43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33",
-                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43",
+                "reference": "7d048964877324debdcb4e0549becfa064a20d43",
                 "shasum": ""
             },
             "require": {
@@ -6358,7 +6358,7 @@
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.3.2"
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
@@ -6368,7 +6368,7 @@
                 "symfony/process": "^5.4|^6.4|^7.0",
                 "symfony/property-access": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3.2|^7.0"
+                "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
             "autoload": {
@@ -6400,7 +6400,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.8"
+                "source": "https://github.com/symfony/mime/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -6416,20 +6416,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-01T07:50:16+00:00"
+            "time": "2024-06-28T09:49:33+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
                 "shasum": ""
             },
             "require": {
@@ -6479,7 +6479,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6495,20 +6495,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
                 "shasum": ""
             },
             "require": {
@@ -6557,7 +6557,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6573,20 +6573,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
+                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
                 "shasum": ""
             },
             "require": {
@@ -6641,7 +6641,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6657,20 +6657,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
                 "shasum": ""
             },
             "require": {
@@ -6722,7 +6722,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6738,20 +6738,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
                 "shasum": ""
             },
             "require": {
@@ -6802,7 +6802,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6818,20 +6818,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:30:46+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
+                "reference": "10112722600777e02d2745716b70c5db4ca70442"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
+                "reference": "10112722600777e02d2745716b70c5db4ca70442",
                 "shasum": ""
             },
             "require": {
@@ -6875,7 +6875,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6891,20 +6891,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:30:46+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
                 "shasum": ""
             },
             "require": {
@@ -6955,7 +6955,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -6971,25 +6971,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
+                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
-                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-php80": "^1.14"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
@@ -7032,7 +7031,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -7048,20 +7047,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-06-19T12:35:24+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
+                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
-                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
                 "shasum": ""
             },
             "require": {
@@ -7111,7 +7110,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -7127,7 +7126,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/process",
@@ -7358,16 +7357,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
+                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
-                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7",
+                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7",
                 "shasum": ""
             },
             "require": {
@@ -7424,7 +7423,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.8"
+                "source": "https://github.com/symfony/string/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -7440,7 +7439,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-06-28T09:25:38+00:00"
         },
         {
             "name": "symfony/translation",
@@ -7691,16 +7690,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.8",
+            "version": "v6.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25"
+                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
-                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
+                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
                 "shasum": ""
             },
             "require": {
@@ -7756,7 +7755,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.8"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.9"
             },
             "funding": [
                 {
@@ -7772,7 +7771,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-06-27T13:23:14+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8307,16 +8306,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.7",
+            "version": "v2.9.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb"
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/5c805f636095cc2e0b659e3954775cf8f1dad1bb",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7",
                 "shasum": ""
             },
             "require": {
@@ -8330,7 +8329,7 @@
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.11.1"
+                "phpstan/phpstan": "^1.11.2"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
@@ -8385,7 +8384,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.7"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.8"
             },
             "funding": [
                 {
@@ -8405,7 +8404,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-05-27T18:33:26+00:00"
+            "time": "2024-07-06T17:46:02+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8492,16 +8491,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -8509,11 +8508,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -8539,7 +8539,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -8547,7 +8547,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -8853,16 +8853,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.4",
+            "version": "1.11.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82"
+                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9100a76ce8015b9aa7125b9171ae3a76887b6c82",
-                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d",
+                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d",
                 "shasum": ""
             },
             "require": {
@@ -8907,20 +8907,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-06T12:19:22+00:00"
+            "time": "2024-07-06T11:17:41+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "10.1.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
                 "shasum": ""
             },
             "require": {
@@ -8977,7 +8977,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
             },
             "funding": [
                 {
@@ -8985,7 +8985,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2024-06-29T08:25:15+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9232,16 +9232,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.20",
+            "version": "10.5.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5",
                 "shasum": ""
             },
             "require": {
@@ -9251,26 +9251,26 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.5",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-invoker": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "phpunit/php-timer": "^6.0",
-                "sebastian/cli-parser": "^2.0",
-                "sebastian/code-unit": "^2.0",
-                "sebastian/comparator": "^5.0",
-                "sebastian/diff": "^5.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.1",
-                "sebastian/global-state": "^6.0.1",
-                "sebastian/object-enumerator": "^5.0",
-                "sebastian/recursion-context": "^5.0",
-                "sebastian/type": "^4.0",
-                "sebastian/version": "^4.0"
+                "phpunit/php-code-coverage": "^10.1.15",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.1",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.2",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.0",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
             },
             "suggest": {
                 "ext-soap": "To be able to generate mocks based on WSDL files"
@@ -9313,7 +9313,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27"
             },
             "funding": [
                 {
@@ -9329,7 +9329,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-24T06:32:35+00:00"
+            "time": "2024-07-10T11:48:06+00:00"
         },
         {
             "name": "sebastian/cli-parser",
diff --git a/package-lock.json b/package-lock.json
index 63b0d2478e6..a117f88a636 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,19 +40,10 @@
         "sass": "^1.69.5"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
-      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.17.0.tgz",
+      "integrity": "sha512-fdfj6e6ZxZf8yrkMHUSJJir7OJkHkZKaOZGzLWIYp2PZ3jd+d+UjG8zVPqJF6d3bKxkhvXTPan/UZ1t7Bqm0gA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -67,13 +58,13 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz",
-      "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
+      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.27.0",
         "@lezer/common": "^1.1.0"
       }
     },
@@ -90,9 +81,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz",
-      "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==",
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
+      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -129,9 +120,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.4.tgz",
-      "integrity": "sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==",
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz",
+      "integrity": "sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
         "@codemirror/lang-html": "^6.0.0",
@@ -168,9 +159,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz",
-      "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
+      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -189,9 +180,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz",
-      "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
+      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -225,9 +216,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.1.tgz",
-      "integrity": "sha512-wLw0t3R9AwOSQThdZ5Onw8QQtem5asE7+bPlnzc57eubPqiuJKIzwjMZ+C42vQett+iva+J8VgFV4RYWDBh5FA==",
+      "version": "6.28.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.4.tgz",
+      "integrity": "sha512-QScv95fiviSQ/CaVGflxAvvvDy/9wi0RFyDl4LkHHWiMr/UPebyuTspmYSeN5Nx6eujcPYwsQzA6ZIZucKZVHQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -618,9 +609,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -662,6 +653,7 @@
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
@@ -689,6 +681,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true
     },
     "node_modules/@lezer/common": {
@@ -707,9 +700,9 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.0.tgz",
-      "integrity": "sha512-IJ16tx3biLKlCXUzcK4v8S10AVa2BSM2rB12rtAL6f1hL2TS/HQQlGCoWRvanlL2J4mCYEEIv9uG7n4kVMkVDA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.1.tgz",
+      "integrity": "sha512-MgPJN9Si+ccxzXl3OAmCeZuUKw4XiPl4y664FX/hnnyG9CTqUPq65N3/VGPA2jD23D7QgMTtNqflta+cPN+5mQ==",
       "dev": true,
       "dependencies": {
         "@lezer/common": "^1.1.0",
@@ -728,9 +721,9 @@
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.9.tgz",
-      "integrity": "sha512-MXxeCMPyrcemSLGaTQEZx0dBUH0i+RPl8RN5GwMAzo53nTsd/Unc/t5ZxACeQoyPUM5/GkPLRUs2WliOImzkRA==",
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
+      "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -738,9 +731,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.14.tgz",
-      "integrity": "sha512-GEdUyspTRgc5dwIGebUk+f3BekvqEWVIYsIuAC3pA8e8wcikGwBZRWRa450L0s8noGWuULwnmi4yjxTnYz9PpA==",
+      "version": "1.4.17",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
+      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -758,9 +751,9 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz",
-      "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz",
+      "integrity": "sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -857,9 +850,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1093,12 +1086,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1346,9 +1339,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -1862,9 +1855,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -1943,9 +1936,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -2104,6 +2097,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -2148,12 +2142,13 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2288,9 +2283,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -2322,6 +2317,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -2423,12 +2419,15 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3057,10 +3056,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3165,17 +3167,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3483,6 +3485,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
@@ -3553,9 +3556,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.74.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
-      "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
+      "version": "1.77.8",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
+      "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3713,9 +3716,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
-      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
       "dev": true
     },
     "node_modules/string-width": {
@@ -4109,6 +4112,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -4178,9 +4190,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"

From 767699a0664c13fea1293654578f571ec4a08fa3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 14:21:16 +0100
Subject: [PATCH 200/666] OIDC: Fixed incorrect detection of group detail
 population

An empty (but valid formed) groups list provided via the OIDC ID token
would be considered as a lacking detail, and therefore trigger a lookup
to the userinfo endpoint in an attempt to get that information.

This fixes this to properly distinguish between not-provided and empty
state, to avoid userinfo where provided as valid but empty.

Includes test to cover.
For #5101
---
 app/Access/Oidc/OidcUserDetails.php |  8 ++++----
 tests/Auth/OidcTest.php             | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index bccc49ee4d8..fae20de0b62 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -22,7 +22,7 @@ public function isFullyPopulated(bool $groupSyncActive): bool
         $hasEmpty = empty($this->externalId)
             || empty($this->email)
             || empty($this->name)
-            || ($groupSyncActive && empty($this->groups));
+            || ($groupSyncActive && $this->groups === null);
 
         return !$hasEmpty;
     }
@@ -57,15 +57,15 @@ protected static function getUserDisplayName(string $displayNameClaims, Provides
         return implode(' ', $displayName);
     }
 
-    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): array
+    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): ?array
     {
         if (empty($groupsClaim)) {
-            return [];
+            return null;
         }
 
         $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
         if (!is_array($groupsList)) {
-            return [];
+            return null;
         }
 
         return array_values(array_filter($groupsList, function ($val) {
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 9bde71c80ef..201f67b5333 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -849,6 +849,26 @@ public function test_userinfo_endpoint_response_with_invalid_content_type_throws
         $this->assertSessionError('Userinfo endpoint response validation failed with error: No valid subject value found in userinfo data');
     }
 
+    public function test_userinfo_endpoint_not_called_if_empty_groups_array_provided_in_id_token()
+    {
+        config()->set([
+            'oidc.user_to_groups'     => true,
+            'oidc.groups_claim'       => 'groups',
+            'oidc.remove_from_groups' => false,
+        ]);
+
+        $this->post('/oidc/login');
+        $state = session()->get('oidc_state');
+        $client = $this->mockHttpClient([$this->getMockAuthorizationResponse([
+            'groups' => [],
+        ])]);
+
+        $resp = $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
+        $resp->assertRedirect('/');
+        $this->assertEquals(1, $client->requestCount());
+        $this->assertTrue(auth()->check());
+    }
+
     protected function withAutodiscovery(): void
     {
         config()->set([

From 897bb338f956245e2c86bda6cd5c6a67711f9448 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 16:06:18 +0100
Subject: [PATCH 201/666] CSP: Updated handling of drawio URL to consider port

Previously if a custom port was used in the DRAWIO option it would not
be considered in the CSP handling, which would block loading.

Added test to cover.
For #5107
---
 app/Util/CspService.php      | 30 +++++++++++++++++++++---------
 tests/SecurityHeaderTest.php | 12 ++++++++++++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/Util/CspService.php b/app/Util/CspService.php
index 227ec8e0b3d..4262b5c98f8 100644
--- a/app/Util/CspService.php
+++ b/app/Util/CspService.php
@@ -133,18 +133,30 @@ protected function getAllowedIframeHosts(): array
 
     protected function getAllowedIframeSources(): array
     {
-        $sources = config('app.iframe_sources', '');
-        $hosts = array_filter(explode(' ', $sources));
+        $sources = explode(' ', config('app.iframe_sources', ''));
+        $sources[] = $this->getDrawioHost();
 
-        // Extract drawing service url to allow embedding if active
+        return array_filter($sources);
+    }
+
+    /**
+     * Extract the host name of the configured drawio URL for use in CSP.
+     * Returns empty string if not in use.
+     */
+    protected function getDrawioHost(): string
+    {
         $drawioConfigValue = config('services.drawio');
-        if ($drawioConfigValue) {
-            $drawioSource = is_string($drawioConfigValue) ? $drawioConfigValue : 'https://embed.diagrams.net/';
-            $drawioSourceParsed = parse_url($drawioSource);
-            $drawioHost = $drawioSourceParsed['scheme'] . '://' . $drawioSourceParsed['host'];
-            $hosts[] = $drawioHost;
+        if (!$drawioConfigValue) {
+            return '';
+        }
+
+        $drawioSource = is_string($drawioConfigValue) ? $drawioConfigValue : 'https://embed.diagrams.net/';
+        $drawioSourceParsed = parse_url($drawioSource);
+        $drawioHost = $drawioSourceParsed['scheme'] . '://' . $drawioSourceParsed['host'];
+        if (isset($drawioSourceParsed['port'])) {
+            $drawioHost .= ':' . $drawioSourceParsed['port'];
         }
 
-        return $hosts;
+        return $drawioHost;
     }
 }
diff --git a/tests/SecurityHeaderTest.php b/tests/SecurityHeaderTest.php
index d369e695c51..5d354e5539e 100644
--- a/tests/SecurityHeaderTest.php
+++ b/tests/SecurityHeaderTest.php
@@ -139,6 +139,18 @@ public function test_frame_src_csp_header_has_drawio_host_added()
         $this->assertEquals('frame-src \'self\' https://example.com https://diagrams.example.com', $scriptHeader);
     }
 
+    public function test_frame_src_csp_header_drawio_host_includes_port_if_existing()
+    {
+        config()->set([
+            'app.iframe_sources' => 'https://example.com',
+            'services.drawio'    => 'https://diagrams.example.com:8080/testing?cat=dog',
+        ]);
+
+        $resp = $this->get('/');
+        $scriptHeader = $this->getCspHeader($resp, 'frame-src');
+        $this->assertEquals('frame-src \'self\' https://example.com https://diagrams.example.com:8080', $scriptHeader);
+    }
+
     public function test_cache_control_headers_are_set_on_responses()
     {
         // Public access

From adb7bf7016502ebdc8aafdbca422731dac0abbfc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 16:36:36 +0100
Subject: [PATCH 202/666] Codemirror: Enabled non-standard self-closing tags

For #5078
---
 resources/js/code/languages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/code/languages.js b/resources/js/code/languages.js
index c0f9e6dd996..ef317334c2b 100644
--- a/resources/js/code/languages.js
+++ b/resources/js/code/languages.js
@@ -35,7 +35,7 @@ const modeMap = {
     go: () => legacyLoad('go'),
     haskell: () => legacyLoad('haskell'),
     hs: () => legacyLoad('haskell'),
-    html: async () => html(),
+    html: async () => html({selfClosingTags: true}),
     ini: () => legacyLoad('properties'),
     java: () => legacyLoad('java'),
     javascript: async () => javascript(),

From 75f225d6dc843957ac73e51f1c2ae21177ec1e8b Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sun, 14 Jul 2024 16:39:50 +0100
Subject: [PATCH 203/666] Updated translations with latest Crowdin changes
 (#5065)

---
 lang/cs/preferences.php   |  6 ++--
 lang/cy/editor.php        |  4 +--
 lang/de_informal/auth.php |  2 +-
 lang/hu/auth.php          |  2 +-
 lang/ja/auth.php          | 16 +++++------
 lang/ja/errors.php        |  2 +-
 lang/pt/common.php        |  2 +-
 lang/pt/preferences.php   | 18 ++++++------
 lang/sv/activities.php    | 58 +++++++++++++++++++--------------------
 lang/sv/auth.php          |  6 ++--
 lang/sv/common.php        | 10 +++----
 lang/sv/components.php    | 22 +++++++--------
 lang/sv/editor.php        |  4 +--
 lang/sv/entities.php      |  2 +-
 14 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/lang/cs/preferences.php b/lang/cs/preferences.php
index 9a127601e2c..ec7afaf276b 100644
--- a/lang/cs/preferences.php
+++ b/lang/cs/preferences.php
@@ -20,14 +20,14 @@
     'shortcuts_overview_desc' => 'Správa klávesových zkratek, které můžete použít k navigaci systémového uživatelského rozhraní.',
 
     'notifications' => 'Nastavení upozornění',
-    'notifications_desc' => 'Ovládat e-mailová oznámení, která dostáváte při provádění určité aktivity v systému.',
+    'notifications_desc' => 'Nastavte si e-mailová oznámení, která dostanete při provedení určitých akcí v systému.',
     'notifications_opt_own_page_changes' => 'Upozornit na změny stránek u kterých jsem vlastníkem',
     'notifications_opt_own_page_comments' => 'Upozornit na komentáře na stránkách, které vlastním',
     'notifications_opt_comment_replies' => 'Upozornit na odpovědi na mé komentáře',
-    'notifications_save' => 'Uložit preference',
+    'notifications_save' => 'Uložit nastavení',
     'notifications_update_success' => 'Nastavení oznámení byla aktualizována!',
     'notifications_watched' => 'Sledované a ignorované položky',
-    'notifications_watched_desc' => 'Níže jsou položky, které mají vlastní nastavení hodinek. Chcete-li aktualizovat vaše předvolby, podívejte se na položku a pak najděte možnosti hodinek v postranním panelu.',
+    'notifications_watched_desc' => 'Níže jsou položky, které mají vlastní nastavení sledování. Chcete-li aktualizovat vaše předvolby, zobrazte položku a pak upravte možnosti sledování v postranním panelu.',
 
     'auth' => 'Přístup a zabezpečení',
     'auth_change_password' => 'Změnit heslo',
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index 473759feb2d..eba7834cc73 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -7,7 +7,7 @@
  */
 return [
     // General editor terms
-    'general' => 'General',
+    'general' => 'Cyffredin',
     'advanced' => 'Advanced',
     'none' => 'Dim un',
     'cancel' => 'Canslo',
@@ -59,7 +59,7 @@
     'list_task' => 'Task list',
     'indent_increase' => 'Increase indent',
     'indent_decrease' => 'Decrease indent',
-    'table' => 'Table',
+    'table' => 'Bwrdd',
     'insert_image' => 'Insert image',
     'insert_image_title' => 'Insert/Edit Image',
     'insert_link' => 'Insert/edit link',
diff --git a/lang/de_informal/auth.php b/lang/de_informal/auth.php
index 8e05948930c..779726f4bbe 100644
--- a/lang/de_informal/auth.php
+++ b/lang/de_informal/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'Um Mehrfach-Faktor-Authentifizierung nutzen zu können, benötigst du eine mobile Anwendung, die TOTP unterstützt, wie Google Authenticator, Authy oder Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Code',
-    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Sie bei der Anmeldung eingeben, um Ihre Identität zu bestätigen. Achten Sie darauf diese an einem sicheren Ort aufzubewahren.',
+    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Du bei der Anmeldung eingibst, um deine Identität zu bestätigen. Achte darauf diese an einem sicheren Ort aufzubewahren.',
     'mfa_gen_confirm_and_enable' => 'Bestätigen und aktivieren',
     'mfa_gen_backup_codes_title' => 'Backup-Codes einrichten',
     'mfa_gen_backup_codes_desc' => 'Speichere die folgende Liste der Codes an einem sicheren Ort. Wenn du auf das System zugreifst, kannst du einen der Codes als zweiten Authentifizierungsmechanismus verwenden.',
diff --git a/lang/hu/auth.php b/lang/hu/auth.php
index dac6065cce2..db065453ec3 100644
--- a/lang/hu/auth.php
+++ b/lang/hu/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilalkalmazás',
     'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Visszaállítási kulcsok',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Egyszer használatos biztonsági kódokat hoz létre, amelyeket bejelentkezéskor kell megadnia személyazonosságának igazolására. Ügyeljen arra, hogy ezeket biztonságos helyen tárolja.',
     'mfa_gen_confirm_and_enable' => 'Jóváhagyás és engedélyezés',
     'mfa_gen_backup_codes_title' => 'Visszaállítási kódok beállítása',
     'mfa_gen_backup_codes_desc' => 'Tárolja el egy biztonságos helyen az alábbi kódokat. Bejelentkezés során fel tudja használni őket másodlagos bejelentkezési kódként.',
diff --git a/lang/ja/auth.php b/lang/ja/auth.php
index 09c14a04f6e..077c31ac85c 100644
--- a/lang/ja/auth.php
+++ b/lang/ja/auth.php
@@ -87,13 +87,13 @@
     'mfa_setup_reconfigure' => '再設定',
     'mfa_setup_remove_confirmation' => 'この多要素認証方法を削除してもよろしいですか？',
     'mfa_setup_action' => '設定',
-    'mfa_backup_codes_usage_limit_warning' => 'バックアップコードは残り5つ以下です。アカウントのロックアウトを防ぐため、コードがなくなる前に新しいセットを生成して保存してください。',
+    'mfa_backup_codes_usage_limit_warning' => '有効な確認コードは残り5つ以下です。アカウントのロックアウトを防ぐため、コードがなくなる前に新しいセットを生成して保存してください。',
     'mfa_option_totp_title' => 'モバイルアプリ',
     'mfa_option_totp_desc' => '多要素認証を使用するには、Google Authenticator、Authy、Microsoft AuthenticatorなどのTOTPをサポートするモバイルアプリケーションが必要です。',
-    'mfa_option_backup_codes_title' => 'バックアップコード',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_title' => '確認コード',
+    'mfa_option_backup_codes_desc' => 'ログイン時に本人確認のために追加入力する1回限りの確認コードセットを生成します。 これは安全な場所に保管してください。',
     'mfa_gen_confirm_and_enable' => '確認して有効化',
-    'mfa_gen_backup_codes_title' => 'バックアップコードの設定',
+    'mfa_gen_backup_codes_title' => '確認コードの構成',
     'mfa_gen_backup_codes_desc' => '以下のコードのリストを安全な場所に保管してください。システムにアクセスする際、コードのいずれかを第二の認証手段として使用できます。',
     'mfa_gen_backup_codes_download' => 'コードをダウンロード',
     'mfa_gen_backup_codes_usage_warning' => '各コードは一度だけ使用できます',
@@ -108,10 +108,10 @@
     'mfa_verify_no_methods' => '手段が設定されていません',
     'mfa_verify_no_methods_desc' => 'アカウントの多要素認証手段が見つかりませんでした。アクセスする前に、少なくとも1つの手段を設定する必要があります。',
     'mfa_verify_use_totp' => 'モバイルアプリを利用して確認',
-    'mfa_verify_use_backup_codes' => 'バックアップコードを利用して確認',
-    'mfa_verify_backup_code' => 'バックアップコード',
-    'mfa_verify_backup_code_desc' => '残りのバックアップコードのいずれかを入力してください:',
-    'mfa_verify_backup_code_enter_here' => 'バックアップコードを入力',
+    'mfa_verify_use_backup_codes' => '確認コードによる検証',
+    'mfa_verify_backup_code' => '確認コード',
+    'mfa_verify_backup_code_desc' => '残りの確認コードのいずれかを入力してください:',
+    'mfa_verify_backup_code_enter_here' => '確認コードを入力',
     'mfa_verify_totp_desc' => 'モバイルアプリを利用して生成されたコードを入力してください:',
     'mfa_setup_login_notification' => '多要素認証が構成されました。設定された手段を利用して再度ログインしてください。',
 ];
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index a944541111a..90a4f854ea8 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Social driverが見つかりません',
     'social_driver_not_configured' => 'あなたの:socialAccount設定は正しく構成されていません。',
     'invite_token_expired' => 'この招待リンクの有効期限が切れています。 代わりにアカウントのパスワードをリセットしてみてください。',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'このアクションのユーザーが見つかりません。',
 
     // System
     'path_not_writable' => 'ファイルパス :filePath へアップロードできませんでした。サーバ上での書き込みが許可されているか確認してください。',
diff --git a/lang/pt/common.php b/lang/pt/common.php
index 089cfea3b08..59abaea5c57 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -20,7 +20,7 @@
     'description' => 'Descrição',
     'role' => 'Cargo',
     'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Esta imagem deve ser de aproximadamente 440x250px, embora seja escalada de forma flexível e cortada para caber na interface do usuário em diferentes cenários conforme necessário, então, dimensões atuais para exibição serão diferentes.',
 
     // Actions
     'actions' => 'Ações',
diff --git a/lang/pt/preferences.php b/lang/pt/preferences.php
index ec5e54bba2b..860eec645bc 100644
--- a/lang/pt/preferences.php
+++ b/lang/pt/preferences.php
@@ -25,9 +25,9 @@
     'notifications_opt_own_page_comments' => 'Notificar quando comentam páginas que possuo',
     'notifications_opt_comment_replies' => 'Notificar respostas aos meus comentários',
     'notifications_save' => 'Guardar preferências',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_update_success' => 'Preferências de notificação foram atualizadas!',
+    'notifications_watched' => 'Itens assistidos e ignorados',
+    'notifications_watched_desc' => 'Abaixo estão os itens que possuem preferências de seguir personalizadas aplicadas. Para atualizar suas preferências para estes, veja o item e encontre as opções de seguir na barra lateral.',
 
     'auth' => 'Acesso e Segurança',
     'auth_change_password' => 'Alterar Palavra-passe',
@@ -35,13 +35,13 @@
     'auth_change_password_success' => 'A palavra-passe foi atualizada!',
 
     'profile' => 'Detalhes Do Perfil',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_desc' => 'Gerencie os detalhes de sua conta que o representam para outros usuários, além de detalhes que são usados para personalização do sistema e comunicação.',
     'profile_view_public' => 'Visualizar Perfil Público',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
+    'profile_name_desc' => 'Configure o seu nome de exibição que será visível para outros usuários no sistema através da atividade que você executa e do conteúdo você tem.',
+    'profile_email_desc' => 'Este e-mail será usado para notificações e, dependendo da autenticação ativa do sistema, acesso do sistema.',
+    'profile_email_no_permission' => 'Infelizmente você não tem permissão para alterar seu correio eletrônico. Se você quiser mudar isso, você precisa pedir a um administrador para alterar por você.',
+    'profile_avatar_desc' => 'Selecione uma imagem que será usada para lhe representar aos outros usuários do sistema. Idealmente, esta imagem deve ser quadrada e sobre 256px em largura e altura.',
+    'profile_admin_options' => 'Opções de administrador',
     'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
 
     'delete_account' => 'Excluir Conta',
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index 11b9a9efe58..abe53c856d1 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -64,17 +64,17 @@
     // Auth
     'auth_login' => 'loggade in',
     'auth_register' => 'registrerad som ny användare',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
+    'auth_password_reset_request' => 'begärd återställning av användarlösenord',
+    'auth_password_reset_update' => 'återställa användarens lösenord',
+    'mfa_setup_method' => 'konfigurerad MFA metod',
     'mfa_setup_method_notification' => 'Multifaktor-metod har konfigurerats',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => 'tog bort MFA metod',
     'mfa_remove_method_notification' => 'Multifaktor-metod har tagits bort',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
-    'maintenance_action_run' => 'ran maintenance action',
+    'settings_update' => 'uppdaterade inställningar',
+    'settings_update_notification' => 'Inställningarna har uppdaterats',
+    'maintenance_action_run' => 'körde underhållsåtgärder',
 
     // Webhooks
     'webhook_create' => 'skapade webhook',
@@ -85,39 +85,39 @@
     'webhook_delete_notification' => 'Webhook har tagits bort',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
+    'user_create' => 'skapade användare',
+    'user_create_notification' => 'Användare skapades',
+    'user_update' => 'uppdaterad användare',
     'user_update_notification' => 'Användaren har uppdaterats',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'raderad användare',
     'user_delete_notification' => 'Användaren har tagits bort',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'skapade API-token',
+    'api_token_create_notification' => 'API-token har skapats',
+    'api_token_update' => 'uppdaterad API-token',
+    'api_token_update_notification' => 'API-token har uppdaterats',
+    'api_token_delete' => 'raderad API-token',
+    'api_token_delete_notification' => 'API-token har tagits bort',
 
     // Roles
-    'role_create' => 'created role',
-    'role_create_notification' => 'Role successfully created',
-    'role_update' => 'updated role',
-    'role_update_notification' => 'Role successfully updated',
-    'role_delete' => 'deleted role',
-    'role_delete_notification' => 'Role successfully deleted',
+    'role_create' => 'skapad roll',
+    'role_create_notification' => 'Rollen har skapats',
+    'role_update' => 'uppdaterad roll',
+    'role_update_notification' => 'Rollen har uppdaterats',
+    'role_delete' => 'raderad roll',
+    'role_delete_notification' => 'Rollen har tagits bort',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'tömd papperskorg',
+    'recycle_bin_restore' => 'återställd från papperskorgen',
+    'recycle_bin_destroy' => 'borttagen från papperskorgen',
 
     // Comments
     'commented_on'                => 'kommenterade',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'lagt till kommentar',
+    'comment_update'              => 'uppdaterad kommentar',
+    'comment_delete'              => 'raderad kommentar',
 
     // Other
     'permissions_update'          => 'uppdaterade behörigheter',
diff --git a/lang/sv/auth.php b/lang/sv/auth.php
index 813200c36f5..c9feb831218 100644
--- a/lang/sv/auth.php
+++ b/lang/sv/auth.php
@@ -61,8 +61,8 @@
     'email_confirm_send_error' => 'E-posten behöver bekräftas men systemet kan inte skicka mail. Kontakta adminstratören för att kontrollera att allt är konfigurerat korrekt.',
     'email_confirm_success' => 'Din e-postadress har bekräftats! Du bör nu kunna logga in med denna e-postadress.',
     'email_confirm_resent' => 'Bekräftelsemailet har skickats på nytt, kolla din mail',
-    'email_confirm_thanks' => 'Thanks for confirming!',
-    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+    'email_confirm_thanks' => 'Tack för att du bekräftade!',
+    'email_confirm_thanks_desc' => 'Vänta en stund medan din bekräftelse hanteras. Om du inte omdirigeras efter 3 sekunder tryck på "Fortsätt" länken nedan för att fortsätta.',
 
     'email_not_confirmed' => 'E-posadress ej bekräftad',
     'email_not_confirmed_text' => 'Din e-postadress har inte bekräftats ännu.',
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapp',
     'mfa_option_totp_desc' => 'För att använda multifaktorautentisering behöver du en mobil app som stöder TOTP så som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Reservkoder',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Genererar en uppsättning engångsbaserade säkerhetskopieringskoder som du anger vid inloggningen för att verifiera din identitet. Se till att förvara dessa på en säker och säker plats.',
     'mfa_gen_confirm_and_enable' => 'Bekräfta och aktivera',
     'mfa_gen_backup_codes_title' => 'Konfiguration av reservkoder',
     'mfa_gen_backup_codes_desc' => 'Spara nedanstående koder på en säker plats. När du använder systemet kommer du att kunna använda en av koderna som en andra autentiseringsmekanism.',
diff --git a/lang/sv/common.php b/lang/sv/common.php
index 70e9d2500a0..ae0aded6225 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -20,13 +20,13 @@
     'description' => 'Beskrivning',
     'role' => 'Roll',
     'cover_image' => 'Omslagsbild',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Denna bild bör vara ungefär 440x250px även om den kommer att vara flexibelt skalad och beskuren för att passa användargränssnittet i olika scenarier där så krävs, kommer faktiska visningsmått att skilja sig.',
 
     // Actions
     'actions' => 'Åtgärder',
     'view' => 'Visa',
     'view_all' => 'Visa alla',
-    'new' => 'New',
+    'new' => 'Ny',
     'create' => 'Skapa',
     'update' => 'Uppdatera',
     'edit' => 'Redigera',
@@ -52,7 +52,7 @@
     'filter_clear' => 'Rensa filter',
     'download' => 'Ladda ner',
     'open_in_tab' => 'Öppna i flik',
-    'open' => 'Open',
+    'open' => 'Öppna',
 
     // Sort Options
     'sort_options' => 'Sorteringsalternativ',
@@ -84,14 +84,14 @@
     'none' => 'Inga',
 
     // Header
-    'homepage' => 'Homepage',
+    'homepage' => 'Startsida',
     'header_menu_expand' => 'Expandera sidhuvudsmenyn',
     'profile_menu' => 'Profilmeny',
     'view_profile' => 'Visa profil',
     'edit_profile' => 'Redigera profil',
     'dark_mode' => 'Mörkt läge',
     'light_mode' => 'Ljust läge',
-    'global_search' => 'Global Search',
+    'global_search' => 'Global sökning',
 
     // Layout tabs
     'tab_info' => 'Information',
diff --git a/lang/sv/components.php b/lang/sv/components.php
index 5a4296868ae..dc587a44df6 100644
--- a/lang/sv/components.php
+++ b/lang/sv/components.php
@@ -6,34 +6,34 @@
 
     // Image Manager
     'image_select' => 'Val av bild',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'Bildlista',
+    'image_details' => 'Bilddetaljer',
+    'image_upload' => 'Ladda upp bild',
+    'image_intro' => 'Här kan du välja och hantera bilder som tidigare har laddats upp till systemet.',
+    'image_intro_upload' => 'Ladda upp en ny bild genom att dra en bildfil till detta fönster, eller genom att använda knappen "Ladda upp bild" ovan.',
     'image_all' => 'Alla',
     'image_all_title' => 'Visa alla bilder',
     'image_book_title' => 'Visa bilder som laddats upp till den aktuella boken',
     'image_page_title' => 'Visa bilder som laddats upp till den aktuella sidan',
     'image_search_hint' => 'Sök efter bildens namn',
     'image_uploaded' => 'Laddades upp :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'Uppladdad av :userName',
+    'image_uploaded_to' => 'Uppladdad till :pageLink',
+    'image_updated' => 'Uppdaterad :updateDate',
     'image_load_more' => 'Ladda fler',
     'image_image_name' => 'Bildnamn',
     'image_delete_used' => 'Den här bilden används på nedanstående sidor.',
     'image_delete_confirm_text' => 'Är du säker på att du vill radera denna bild?',
     'image_select_image' => 'Välj bild',
     'image_dropzone' => 'Släpp bilder här eller klicka för att ladda upp',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'Släpp filer här för att ladda upp dem',
     'images_deleted' => 'Bilder borttagna',
     'image_preview' => 'Förhandsgranskning',
     'image_upload_success' => 'Bilden har laddats upp',
     'image_update_success' => 'Bildens uppgifter har ändrats',
     'image_delete_success' => 'Bilden har tagits bort',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
+    'image_replace' => 'Ersätt bild',
+    'image_replace_success' => 'Bildfilen har uppdaterats',
     'image_rebuild_thumbs' => 'Regenerate Size Variations',
     'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
 
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index 0ada0a4cec1..25e443511c1 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -82,7 +82,7 @@
     'table_properties_title' => 'Tabellegenskaper',
     'delete_table' => 'Ta bort tabell',
     'table_clear_formatting' => 'Rensa tabell-formatering',
-    'resize_to_contents' => 'Resize to contents',
+    'resize_to_contents' => 'Ändra storlek till innehåll',
     'row_header' => 'Radrubrik',
     'insert_row_before' => 'Infoga rad före',
     'insert_row_after' => 'Infoga rad efter',
@@ -165,7 +165,7 @@
     'editor_license' => 'Licens och upphovsrätt för redigerare',
     'editor_tiny_license' => 'Denna redigerare är byggd med :tinyLink som tillhandahålls under MIT licensen.',
     'editor_tiny_license_link' => 'Upphovsrätten och licensuppgifterna för TinyMCE hittar du här.',
-    'save_continue' => 'Spara & Fortsätt',
+    'save_continue' => 'Spara sida & fortsätt',
     'callouts_cycle' => '(Fortsätt trycka för att växla mellan typer)',
     'link_selector' => 'Länka till innehåll',
     'shortcuts' => 'Genvägar',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 79aa46365df..1be2a56c6aa 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -39,7 +39,7 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Textfil',
     'export_md' => 'Markdown-fil',
-    'default_template' => 'Default Page Template',
+    'default_template' => 'Förvald sidmall',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
 

From 47ac0d5c3eadcb1d2260dac1d736b0517b6498a0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 14 Jul 2024 17:09:41 +0100
Subject: [PATCH 204/666] Updated translator & dependency attribution before
 release v24.05.3

---
 .github/translators.txt               |  4 +++-
 dev/licensing/js-library-licenses.txt | 18 +++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index f77b560fe71..46e2edfd4c5 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -428,4 +428,6 @@ Ohadp :: Hebrew
 cbridi :: Portuguese, Brazilian
 nanangsb :: Indonesian
 Michal Melich (michalmelich) :: Czech
-David (david-prv) :: German
+David (david-prv) :: German; German Informal
+Larry (lahoje) :: Swedish
+Marcia dos Santos (marciab80) :: Portuguese
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 8211a4a44e1..0383c2fad35 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -9,7 +9,7 @@ acorn
 License: MIT
 License File: node_modules/acorn/LICENSE
 Copyright: Copyright (C) 2012-2022 by various contributors (see AUTHORS)
-Source: https://github.com/acornjs/acorn.git
+Source: git+https://github.com/acornjs/acorn.git
 Link: https://github.com/acornjs/acorn
 -----------
 ajv
@@ -120,7 +120,7 @@ Link: https://github.com/juliangruber/brace-expansion
 braces
 License: MIT
 License File: node_modules/braces/LICENSE
-Copyright: Copyright (c) 2014-2018, Jon Schlinkert.
+Copyright: Copyright (c) 2014-present, Jon Schlinkert.
 Source: micromatch/braces
 Link: https://github.com/micromatch/braces
 -----------
@@ -1665,6 +1665,13 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git://github.com/isaacs/node-which.git
 Link: git://github.com/isaacs/node-which.git
 -----------
+word-wrap
+License: MIT
+License File: node_modules/word-wrap/LICENSE
+Copyright: Copyright (c) 2014-2016, Jon Schlinkert
+Source: jonschlinkert/word-wrap
+Link: https://github.com/jonschlinkert/word-wrap
+-----------
 wrap-ansi
 License: MIT
 License File: node_modules/wrap-ansi/license
@@ -1715,13 +1722,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/yocto-queue
 Link: sindresorhus/yocto-queue
 -----------
-@aashutoshrathi/word-wrap
-License: MIT
-License File: node_modules/@aashutoshrathi/word-wrap/LICENSE
-Copyright: Copyright (c) 2014-2016, Jon Schlinkert
-Source: git+https://github.com/aashutoshrathi/word-wrap.git
-Link: https://github.com/aashutoshrathi/word-wrap
------------
 @codemirror/autocomplete
 License: MIT
 License File: node_modules/@codemirror/autocomplete/LICENSE

From ea4c50c2c22be9a8920d5dfe7f1162c3454f2d53 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 16 Jul 2024 16:36:08 +0100
Subject: [PATCH 205/666] Lexical: Added code block selection & edit features

Also added extra lifecycle handling for decorators to things can be
properly cleaned up after node destruction.
---
 resources/js/wysiwyg/helpers.ts               | 29 ++++++++++++++---
 resources/js/wysiwyg/index.ts                 |  6 ++--
 resources/js/wysiwyg/nodes/index.ts           | 32 ++++++++++++++++++-
 .../js/wysiwyg/ui/decorators/code-block.ts    | 18 ++++++++++-
 resources/js/wysiwyg/ui/decorators/image.ts   |  6 ++--
 .../wysiwyg/ui/defaults/button-definitions.ts |  8 ++++-
 .../js/wysiwyg/ui/framework/decorator.ts      | 19 +++++++++++
 resources/js/wysiwyg/ui/framework/manager.ts  | 29 +++++++++++++++--
 resources/js/wysiwyg/ui/index.ts              | 15 +++++++--
 resources/js/wysiwyg/ui/toolbars.ts           | 10 ++++--
 resources/sass/_editor.scss                   |  3 ++
 11 files changed, 156 insertions(+), 19 deletions(-)

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 64bcb64902e..3708c2b2591 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -1,14 +1,14 @@
 import {
+    $createNodeSelection,
     $createParagraphNode, $getRoot,
     $getSelection,
-    $isTextNode,
-    BaseSelection, ElementNode,
+    $isTextNode, $setSelection,
+    BaseSelection,
     LexicalEditor, LexicalNode, TextFormatType
 } from "lexical";
-import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
+import {getNodesForPageEditor, LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
-import {$createDetailsNode} from "./nodes/details";
 
 export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
     const el = document.createElement(tag);
@@ -93,4 +93,25 @@ export function insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: bo
     } else {
         $getRoot().append(node);
     }
+}
+
+export function selectSingleNode(node: LexicalNode) {
+    const nodeSelection = $createNodeSelection();
+    nodeSelection.add(node.getKey());
+    $setSelection(nodeSelection);
+}
+
+export function selectionContainsNode(selection: BaseSelection|null, node: LexicalNode): boolean {
+    if (!selection) {
+        return false;
+    }
+
+    const key = node.getKey();
+    for (const node of selection.getNodes()) {
+        if (node.getKey() === key) {
+            return true;
+        }
+    }
+
+    return false;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index d1d96b17233..8cbaccd7979 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -2,11 +2,12 @@ import {createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
-import {getNodesForPageEditor} from './nodes';
+import {getNodesForPageEditor, registerCommonNodeMutationListeners} from './nodes';
 import {buildEditorUI} from "./ui";
 import {getEditorContentAsHtml, setEditorContentFromHtml} from "./actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {el} from "./helpers";
+import {EditorUiContext} from "./ui/framework/core";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -59,7 +60,8 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         }
     });
 
-    buildEditorUI(container, editArea, editor);
+    const context: EditorUiContext = buildEditorUI(container, editArea, editor);
+    registerCommonNodeMutationListeners(context);
 
     return new SimpleWysiwygEditorInterface(editor);
 }
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index e2c6902d338..a2c73957687 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,6 +1,14 @@
 import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {CalloutNode} from './callout';
-import {ElementNode, KlassConstructor, LexicalNode, LexicalNodeReplacement, ParagraphNode} from "lexical";
+import {
+    $getNodeByKey,
+    ElementNode,
+    KlassConstructor,
+    LexicalEditor,
+    LexicalNode,
+    LexicalNodeReplacement, NodeMutation,
+    ParagraphNode
+} from "lexical";
 import {CustomParagraphNode} from "./custom-paragraph";
 import {LinkNode} from "@lexical/link";
 import {ImageNode} from "./image";
@@ -11,6 +19,8 @@ import {CustomTableNode} from "./custom-table";
 import {HorizontalRuleNode} from "./horizontal-rule";
 import {CodeBlockNode} from "./code-block";
 import {DiagramNode} from "./diagram";
+import {EditorUIManager} from "../ui/framework/manager";
+import {EditorUiContext} from "../ui/framework/core";
 
 /**
  * Load the nodes for lexical.
@@ -47,5 +57,25 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
     ];
 }
 
+export function registerCommonNodeMutationListeners(context: EditorUiContext): void {
+    const decorated = [ImageNode, CodeBlockNode, DiagramNode];
+
+    const decorationDestroyListener = (mutations: Map<string, NodeMutation>): void => {
+        for (let [nodeKey, mutation] of mutations) {
+            if (mutation === "destroyed") {
+                const decorator = context.manager.getDecoratorByNodeKey(nodeKey);
+                if (decorator) {
+                    decorator.destroy(context);
+                }
+            }
+        }
+    };
+
+    for (let decoratedNode of decorated) {
+        // Have to pass a unique function here since they are stored by lexical keyed on listener function.
+        context.editor.registerMutationListener(decoratedNode, (mutations) => decorationDestroyListener(mutations));
+    }
+}
+
 export type LexicalNodeMatcher = (node: LexicalNode|null|undefined) => boolean;
 export type LexicalElementNodeCreator = () => ElementNode;
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index 80dcef3bdea..11cc02e8f68 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,7 +1,9 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {ImageNode} from "../../nodes/image";
+import {selectionContainsNode, selectSingleNode} from "../../helpers";
+import {context} from "esbuild";
+import {BaseSelection} from "lexical";
 
 
 export class CodeBlockDecorator extends EditorDecorator {
@@ -32,12 +34,26 @@ export class CodeBlockDecorator extends EditorDecorator {
 
         const startTime = Date.now();
 
+        element.addEventListener('click', event => {
+            context.editor.update(() => {
+                selectSingleNode(this.getNode());
+            })
+        });
+
         element.addEventListener('dblclick', event => {
             context.editor.getEditorState().read(() => {
                 $openCodeEditorForNode(context.editor, (this.getNode() as CodeBlockNode));
             });
         });
 
+        const selectionChange = (selection: BaseSelection|null): void => {
+            element.classList.toggle('selected', selectionContainsNode(selection, codeNode));
+        };
+        context.manager.onSelectionChange(selectionChange);
+        this.onDestroy(() => {
+            context.manager.offSelectionChange(selectionChange);
+        });
+
         // @ts-ignore
         const renderEditor = (Code) => {
             this.editor = Code.wysiwygView(element, document, this.latestCode, this.latestLanguage);
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index 1e8bfd165a9..1bc1ea5437a 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -1,5 +1,5 @@
 import {EditorDecorator} from "../framework/decorator";
-import {el} from "../../helpers";
+import {el, selectSingleNode} from "../../helpers";
 import {$createNodeSelection, $setSelection} from "lexical";
 import {EditorUiContext} from "../framework/core";
 import {ImageNode} from "../../nodes/image";
@@ -41,9 +41,7 @@ export class ImageDecorator extends EditorDecorator {
             tracker = this.setupTracker(decorateEl, context);
 
             context.editor.update(() => {
-                const nodeSelection = $createNodeSelection();
-                nodeSelection.add(this.getNode().getKey());
-                $setSelection(nodeSelection);
+                selectSingleNode(this.getNode());
             });
         };
 
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index 9f83fbea363..c6ea85b0d9e 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -53,6 +53,7 @@ import codeBlockIcon from "@icons/editor/code-block.svg"
 import detailsIcon from "@icons/editor/details.svg"
 import sourceIcon from "@icons/editor/source-view.svg"
 import fullscreenIcon from "@icons/editor/fullscreen.svg"
+import editIcon from "@icons/edit.svg"
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
 
@@ -344,7 +345,7 @@ export const codeBlock: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const codeBlock = getNodeFromSelection(selection, $isCodeBlockNode) as (CodeBlockNode|null);
+            const codeBlock = getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
             if (codeBlock === null) {
                 context.editor.update(() => {
                     const codeBlock = $createCodeBlockNode();
@@ -363,6 +364,11 @@ export const codeBlock: EditorButtonDefinition = {
     }
 };
 
+export const editCodeBlock: EditorButtonDefinition = Object.assign({}, codeBlock, {
+    label: 'Edit code block',
+    icon: editIcon,
+});
+
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
     icon: detailsIcon,
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
index a9917ab232f..570b8222b9c 100644
--- a/resources/js/wysiwyg/ui/framework/decorator.ts
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -11,6 +11,8 @@ export abstract class EditorDecorator {
     protected node: LexicalNode | null = null;
     protected context: EditorUiContext;
 
+    private onDestroyCallbacks: (() => void)[] = [];
+
     constructor(context: EditorUiContext) {
         this.context = context;
     }
@@ -27,6 +29,13 @@ export abstract class EditorDecorator {
         this.node = node;
     }
 
+    /**
+     * Register a callback to be ran on destroy of this decorator's node.
+     */
+    protected onDestroy(callback: () => void) {
+        this.onDestroyCallbacks.push(callback);
+    }
+
     /**
      * Render the decorator.
      * Can run on both creation and update for a node decorator.
@@ -35,4 +44,14 @@ export abstract class EditorDecorator {
      */
     abstract render(context: EditorUiContext, decorated: HTMLElement): HTMLElement|void;
 
+    /**
+     * Destroy this decorator. Used for tear-down operations upon destruction
+     * of the underlying node this decorator is attached to.
+     */
+    destroy(context: EditorUiContext): void {
+        for (const callback of this.onDestroyCallbacks) {
+            callback();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 6477c4a1a76..cfa94e8aeec 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,11 +1,13 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
-import {$getSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
+import {$getSelection, BaseSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
 
+export type SelectionChangeHandler = (selection: BaseSelection|null) => void;
+
 export class EditorUIManager {
 
     protected modalDefinitionsByKey: Record<string, EditorFormModalDefinition> = {};
@@ -15,6 +17,7 @@ export class EditorUIManager {
     protected toolbar: EditorContainerUiElement|null = null;
     protected contextToolbarDefinitionsByKey: Record<string, EditorContextToolbarDefinition> = {};
     protected activeContextToolbars: EditorContextToolbar[] = [];
+    protected selectionChangeHandlers: Set<SelectionChangeHandler> = new Set();
 
     setContext(context: EditorUiContext) {
         this.context = context;
@@ -72,6 +75,10 @@ export class EditorUIManager {
         return decorator;
     }
 
+    getDecoratorByNodeKey(nodeKey: string): EditorDecorator|null {
+        return this.decoratorInstancesByNodeKey[nodeKey] || null;
+    }
+
     setToolbar(toolbar: EditorContainerUiElement) {
         if (this.toolbar) {
             this.toolbar.getDOMElement().remove();
@@ -94,7 +101,7 @@ export class EditorUIManager {
         for (const toolbar of this.activeContextToolbars) {
             toolbar.updateState(update);
         }
-        // console.log('selection update', update.selection);
+        this.triggerSelectionChange(update.selection);
     }
 
     triggerStateRefresh(): void {
@@ -104,6 +111,24 @@ export class EditorUIManager {
         });
     }
 
+    protected triggerSelectionChange(selection: BaseSelection|null): void {
+        if (!selection) {
+            return;
+        }
+
+        for (const handler of this.selectionChangeHandlers) {
+            handler(selection);
+        }
+    }
+
+    onSelectionChange(handler: SelectionChangeHandler): void {
+        this.selectionChangeHandlers.add(handler);
+    }
+
+    offSelectionChange(handler: SelectionChangeHandler): void {
+        this.selectionChangeHandlers.delete(handler);
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (const toolbar of this.activeContextToolbars) {
             toolbar.empty();
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 50307fa6113..74837095962 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,5 +1,10 @@
 import {LexicalEditor} from "lexical";
-import {getImageToolbarContent, getLinkToolbarContent, getMainEditorFullToolbar} from "./toolbars";
+import {
+    getCodeToolbarContent,
+    getImageToolbarContent,
+    getLinkToolbarContent,
+    getMainEditorFullToolbar
+} from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
@@ -7,7 +12,7 @@ import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
 
-export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor) {
+export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor): EditorUiContext {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
@@ -48,9 +53,15 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
         selector: 'a',
         content: getLinkToolbarContent(),
     });
+    manager.registerContextToolbar('code', {
+        selector: '.editor-code-block-wrap',
+        content: getCodeToolbarContent(),
+    });
 
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
     manager.registerDecoratorType('code', CodeBlockDecorator);
     manager.registerDecoratorType('diagram', DiagramDecorator);
+
+    return context;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 25a7e7815fd..d512b58e23d 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,7 +1,7 @@
 import {EditorButton} from "./framework/buttons";
 import {
     blockquote, bold, bulletList, clearFormating, code, codeBlock,
-    dangerCallout, details, fullscreen,
+    dangerCallout, details, editCodeBlock, fullscreen,
     h2, h3, h4, h5, highlightColor, horizontalRule, image,
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
@@ -9,7 +9,7 @@ import {
     undo, unlink,
     warningCallout
 } from "./defaults/button-definitions";
-import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";
+import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiElement} from "./framework/core";
 import {el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
@@ -111,4 +111,10 @@ export function getLinkToolbarContent(): EditorUiElement[] {
         new EditorButton(link),
         new EditorButton(unlink),
     ];
+}
+
+export function getCodeToolbarContent(): EditorUiElement[] {
+    return [
+        new EditorButton(editCodeBlock),
+    ];
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 1f932e14705..99045dd5ab1 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -312,6 +312,9 @@ body.editor-is-fullscreen {
   > * {
     pointer-events: none;
   }
+  &.selected .cm-editor {
+    border: 1px dashed var(--editor-color-primary);
+  }
 }
 
 // Editor form elements

From e145f21512fefc80dc779a705e6b23c42e33090e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Jul 2024 11:13:39 +0100
Subject: [PATCH 206/666] Dev compose: Set image versions, removed unsupported
 mysql flag

Quick local test performed, ran a working instance.
For #5124
---
 dev/docker/Dockerfile | 2 +-
 docker-compose.yml    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index fe497e9e63e..50d528fafb8 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.3-apache
 
 ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e2fdf700de..f4c3a64c664 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,13 +6,12 @@ volumes:
 
 services:
   db:
-    image: mysql:8
+    image: mysql:8.4
     environment:
       MYSQL_DATABASE: bookstack-dev
       MYSQL_USER: bookstack-test
       MYSQL_PASSWORD: bookstack-test
       MYSQL_RANDOM_ROOT_PASSWORD: 'true'
-    command: --default-authentication-plugin=mysql_native_password
     volumes:
       - ./dev/docker/init.db:/docker-entrypoint-initdb.d
       - db:/var/lib/mysql
@@ -41,7 +40,7 @@ services:
     extra_hosts:
     - "host.docker.internal:host-gateway"
   node:
-    image: node:alpine
+    image: node:22-alpine
     working_dir: /app
     user: node
     volumes:

From b367490edc84b4aa5cd51e9481037faf0da4558b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Jul 2024 16:38:20 +0100
Subject: [PATCH 207/666] Lexical: Added list support, started todo

---
 resources/js/wysiwyg/helpers.ts               |  38 +++++-
 resources/js/wysiwyg/todo.md                  |  27 ++++
 .../wysiwyg/ui/defaults/button-definitions.ts | 126 ++++++++++++++----
 resources/js/wysiwyg/ui/toolbars.ts           |  11 ++
 4 files changed, 170 insertions(+), 32 deletions(-)
 create mode 100644 resources/js/wysiwyg/todo.md

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 3708c2b2591..600e71dd1cc 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -1,13 +1,13 @@
 import {
     $createNodeSelection,
     $createParagraphNode, $getRoot,
-    $getSelection,
+    $getSelection, $isElementNode,
     $isTextNode, $setSelection,
-    BaseSelection,
+    BaseSelection, ElementFormatType, ElementNode,
     LexicalEditor, LexicalNode, TextFormatType
 } from "lexical";
-import {getNodesForPageEditor, LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
-import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
+import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
+import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
 
 export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
@@ -114,4 +114,34 @@ export function selectionContainsNode(selection: BaseSelection|null, node: Lexic
     }
 
     return false;
+}
+
+export function selectionContainsElementFormat(selection: BaseSelection|null, format: ElementFormatType): boolean {
+    const nodes = getBlockElementNodesInSelection(selection);
+    for (const node of nodes) {
+        if (node.getFormatType() === format) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+export function getBlockElementNodesInSelection(selection: BaseSelection|null): ElementNode[] {
+    if (!selection) {
+        return [];
+    }
+
+    const blockNodes: Map<string, ElementNode> = new Map();
+    for (const node of selection.getNodes()) {
+        const blockElement = $findMatchingParent(node, (node) => {
+            return $isElementNode(node) && !node.isInline();
+        }) as ElementNode|null;
+
+        if (blockElement) {
+            blockNodes.set(blockElement.getKey(), blockElement);
+        }
+    }
+
+    return Array.from(blockNodes.values());
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
new file mode 100644
index 00000000000..67b5fb78062
--- /dev/null
+++ b/resources/js/wysiwyg/todo.md
@@ -0,0 +1,27 @@
+# Lexical based editor todo
+
+## Main Todo
+
+- Alignments: Use existing classes for blocks
+- Alignments: Handle inline block content (image, video)
+- Add Type: Video/media/embed
+- Add Type: Drawings
+- Handle toolbars on scroll
+- Table features
+- Image paste upload
+- Keyboard shortcuts support
+- Global/shared editor events support
+- Draft/change management (connect with page editor component)
+- Add ID support to all block types
+- Template drag & drop / insert
+- Video attachment drop / insert
+- Task list render/import from existing format
+- Link popup menu for cross-content reference
+- Link heading-based ID reference menu
+- Image gallery integration for insert
+- Image gallery integration for form
+
+## Bugs
+
+- Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
+- Table resize bars often floating around in wrong place, and shows on hover or interrupts mouse actions.
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index c6ea85b0d9e..d1d22dae1ea 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -1,15 +1,28 @@
 import {EditorBasicButtonDefinition, EditorButton, EditorButtonDefinition} from "../framework/buttons";
 import {
     $createNodeSelection,
-    $createParagraphNode, $createTextNode, $getRoot, $getSelection,
-    $isParagraphNode, $isTextNode, $setSelection,
-    BaseSelection, CAN_REDO_COMMAND, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, ElementNode, FORMAT_TEXT_COMMAND,
+    $createParagraphNode,
+    $createTextNode,
+    $getRoot,
+    $getSelection,
+    $isParagraphNode,
+    $isTextNode,
+    $setSelection,
+    BaseSelection,
+    CAN_REDO_COMMAND,
+    CAN_UNDO_COMMAND,
+    COMMAND_PRIORITY_LOW,
+    ElementFormatType,
+    ElementNode,
+    FORMAT_TEXT_COMMAND,
     LexicalNode,
-    REDO_COMMAND, TextFormatType,
+    REDO_COMMAND,
+    TextFormatType,
     UNDO_COMMAND
 } from "lexical";
 import {
-    getNodeFromSelection, insertNewBlockNodeAtSelection,
+    getBlockElementNodesInSelection,
+    getNodeFromSelection, insertNewBlockNodeAtSelection, selectionContainsElementFormat,
     selectionContainsNodeType,
     selectionContainsTextFormat,
     toggleSelectionBlockNodeType
@@ -29,31 +42,35 @@ import {$isImageNode, ImageNode} from "../../nodes/image";
 import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
 import {getEditorContentAsHtml} from "../../actions";
 import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
-import undoIcon from "@icons/editor/undo.svg"
-import redoIcon from "@icons/editor/redo.svg"
-import boldIcon from "@icons/editor/bold.svg"
-import italicIcon from "@icons/editor/italic.svg"
-import underlinedIcon from "@icons/editor/underlined.svg"
+import undoIcon from "@icons/editor/undo.svg";
+import redoIcon from "@icons/editor/redo.svg";
+import boldIcon from "@icons/editor/bold.svg";
+import italicIcon from "@icons/editor/italic.svg";
+import underlinedIcon from "@icons/editor/underlined.svg";
 import textColorIcon from "@icons/editor/text-color.svg";
 import highlightIcon from "@icons/editor/highlighter.svg";
-import strikethroughIcon from "@icons/editor/strikethrough.svg"
-import superscriptIcon from "@icons/editor/superscript.svg"
-import subscriptIcon from "@icons/editor/subscript.svg"
-import codeIcon from "@icons/editor/code.svg"
-import formatClearIcon from "@icons/editor/format-clear.svg"
-import listBulletIcon from "@icons/editor/list-bullet.svg"
-import listNumberedIcon from "@icons/editor/list-numbered.svg"
-import listCheckIcon from "@icons/editor/list-check.svg"
-import linkIcon from "@icons/editor/link.svg"
-import unlinkIcon from "@icons/editor/unlink.svg"
-import tableIcon from "@icons/editor/table.svg"
-import imageIcon from "@icons/editor/image.svg"
-import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"
-import codeBlockIcon from "@icons/editor/code-block.svg"
-import detailsIcon from "@icons/editor/details.svg"
-import sourceIcon from "@icons/editor/source-view.svg"
-import fullscreenIcon from "@icons/editor/fullscreen.svg"
-import editIcon from "@icons/edit.svg"
+import strikethroughIcon from "@icons/editor/strikethrough.svg";
+import superscriptIcon from "@icons/editor/superscript.svg";
+import subscriptIcon from "@icons/editor/subscript.svg";
+import codeIcon from "@icons/editor/code.svg";
+import formatClearIcon from "@icons/editor/format-clear.svg";
+import alignLeftIcon from "@icons/editor/align-left.svg";
+import alignCenterIcon from "@icons/editor/align-center.svg";
+import alignRightIcon from "@icons/editor/align-right.svg";
+import alignJustifyIcon from "@icons/editor/align-justify.svg";
+import listBulletIcon from "@icons/editor/list-bullet.svg";
+import listNumberedIcon from "@icons/editor/list-numbered.svg";
+import listCheckIcon from "@icons/editor/list-check.svg";
+import linkIcon from "@icons/editor/link.svg";
+import unlinkIcon from "@icons/editor/unlink.svg";
+import tableIcon from "@icons/editor/table.svg";
+import imageIcon from "@icons/editor/image.svg";
+import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
+import codeBlockIcon from "@icons/editor/code-block.svg";
+import detailsIcon from "@icons/editor/details.svg";
+import sourceIcon from "@icons/editor/source-view.svg";
+import fullscreenIcon from "@icons/editor/fullscreen.svg";
+import editIcon from "@icons/edit.svg";
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
 
@@ -203,6 +220,59 @@ export const clearFormating: EditorButtonDefinition = {
     }
 };
 
+function setAlignmentForSection(alignment: ElementFormatType): void {
+    const selection = $getSelection();
+    const elements = getBlockElementNodesInSelection(selection);
+    for (const node of elements) {
+        node.setFormat(alignment);
+    }
+}
+
+export const alignLeft: EditorButtonDefinition = {
+    label: 'Align left',
+    icon: alignLeftIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('left'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return selectionContainsElementFormat(selection, 'left');
+    }
+};
+
+export const alignCenter: EditorButtonDefinition = {
+    label: 'Align center',
+    icon: alignCenterIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('center'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return selectionContainsElementFormat(selection, 'center');
+    }
+};
+
+export const alignRight: EditorButtonDefinition = {
+    label: 'Align right',
+    icon: alignRightIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('right'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return selectionContainsElementFormat(selection, 'right');
+    }
+};
+
+export const alignJustify: EditorButtonDefinition = {
+    label: 'Align justify',
+    icon: alignJustifyIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('justify'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return selectionContainsElementFormat(selection, 'justify');
+    }
+};
+
+
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
     return {
         label,
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index d512b58e23d..9145b876193 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,5 +1,8 @@
 import {EditorButton} from "./framework/buttons";
 import {
+    alignCenter, alignJustify,
+    alignLeft,
+    alignRight,
     blockquote, bold, bulletList, clearFormating, code, codeBlock,
     dangerCallout, details, editCodeBlock, fullscreen,
     h2, h3, h4, h5, highlightColor, horizontalRule, image,
@@ -62,6 +65,14 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(clearFormating),
         ]),
 
+        // Alignment
+        new EditorOverflowContainer(4, [
+            new EditorButton(alignLeft),
+            new EditorButton(alignCenter),
+            new EditorButton(alignRight),
+            new EditorButton(alignJustify),
+        ]),
+
         // Lists
         new EditorOverflowContainer(3, [
             new EditorButton(bulletList),

From 5002a89754bc0161cf33ea51f5a80d8c6f89eb94 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 17 Jul 2024 16:45:57 +0100
Subject: [PATCH 208/666] Lexical: Standardised helper function format

---
 resources/js/wysiwyg/helpers.ts               | 40 +++++-----
 .../js/wysiwyg/ui/decorators/code-block.ts    |  6 +-
 resources/js/wysiwyg/ui/decorators/image.ts   |  4 +-
 .../wysiwyg/ui/defaults/button-definitions.ts | 80 ++++++++++---------
 .../ui/framework/blocks/table-creator.ts      |  4 +-
 5 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 600e71dd1cc..a7c3e4453bc 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -4,7 +4,7 @@ import {
     $getSelection, $isElementNode,
     $isTextNode, $setSelection,
     BaseSelection, ElementFormatType, ElementNode,
-    LexicalEditor, LexicalNode, TextFormatType
+    LexicalNode, TextFormatType
 } from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
@@ -30,11 +30,11 @@ export function el(tag: string, attrs: Record<string, string|null> = {}, childre
     return el;
 }
 
-export function selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
-    return getNodeFromSelection(selection, matcher) !== null;
+export function $selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
+    return $getNodeFromSelection(selection, matcher) !== null;
 }
 
-export function getNodeFromSelection(selection: BaseSelection|null, matcher: LexicalNodeMatcher): LexicalNode|null {
+export function $getNodeFromSelection(selection: BaseSelection|null, matcher: LexicalNodeMatcher): LexicalNode|null {
     if (!selection) {
         return null;
     }
@@ -54,7 +54,7 @@ export function getNodeFromSelection(selection: BaseSelection|null, matcher: Lex
     return null;
 }
 
-export function selectionContainsTextFormat(selection: BaseSelection|null, format: TextFormatType): boolean {
+export function $selectionContainsTextFormat(selection: BaseSelection|null, format: TextFormatType): boolean {
     if (!selection) {
         return false;
     }
@@ -68,19 +68,17 @@ export function selectionContainsTextFormat(selection: BaseSelection|null, forma
     return false;
 }
 
-export function toggleSelectionBlockNodeType(editor: LexicalEditor, matcher: LexicalNodeMatcher, creator: LexicalElementNodeCreator) {
-    editor.update(() => {
-        const selection = $getSelection();
-        const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
-        if (selection && matcher(blockElement)) {
-            $setBlocksType(selection, $createParagraphNode);
-        } else {
-            $setBlocksType(selection, creator);
-        }
-    });
+export function $toggleSelectionBlockNodeType(matcher: LexicalNodeMatcher, creator: LexicalElementNodeCreator) {
+    const selection = $getSelection();
+    const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
+    if (selection && matcher(blockElement)) {
+        $setBlocksType(selection, $createParagraphNode);
+    } else {
+        $setBlocksType(selection, creator);
+    }
 }
 
-export function insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: boolean = true) {
+export function $insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: boolean = true) {
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
 
@@ -95,13 +93,13 @@ export function insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: bo
     }
 }
 
-export function selectSingleNode(node: LexicalNode) {
+export function $selectSingleNode(node: LexicalNode) {
     const nodeSelection = $createNodeSelection();
     nodeSelection.add(node.getKey());
     $setSelection(nodeSelection);
 }
 
-export function selectionContainsNode(selection: BaseSelection|null, node: LexicalNode): boolean {
+export function $selectionContainsNode(selection: BaseSelection|null, node: LexicalNode): boolean {
     if (!selection) {
         return false;
     }
@@ -116,8 +114,8 @@ export function selectionContainsNode(selection: BaseSelection|null, node: Lexic
     return false;
 }
 
-export function selectionContainsElementFormat(selection: BaseSelection|null, format: ElementFormatType): boolean {
-    const nodes = getBlockElementNodesInSelection(selection);
+export function $selectionContainsElementFormat(selection: BaseSelection|null, format: ElementFormatType): boolean {
+    const nodes = $getBlockElementNodesInSelection(selection);
     for (const node of nodes) {
         if (node.getFormatType() === format) {
             return true;
@@ -127,7 +125,7 @@ export function selectionContainsElementFormat(selection: BaseSelection|null, fo
     return false;
 }
 
-export function getBlockElementNodesInSelection(selection: BaseSelection|null): ElementNode[] {
+export function $getBlockElementNodesInSelection(selection: BaseSelection|null): ElementNode[] {
     if (!selection) {
         return [];
     }
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index 11cc02e8f68..cfb2c6aefb2 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {selectionContainsNode, selectSingleNode} from "../../helpers";
+import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
 import {context} from "esbuild";
 import {BaseSelection} from "lexical";
 
@@ -36,7 +36,7 @@ export class CodeBlockDecorator extends EditorDecorator {
 
         element.addEventListener('click', event => {
             context.editor.update(() => {
-                selectSingleNode(this.getNode());
+                $selectSingleNode(this.getNode());
             })
         });
 
@@ -47,7 +47,7 @@ export class CodeBlockDecorator extends EditorDecorator {
         });
 
         const selectionChange = (selection: BaseSelection|null): void => {
-            element.classList.toggle('selected', selectionContainsNode(selection, codeNode));
+            element.classList.toggle('selected', $selectionContainsNode(selection, codeNode));
         };
         context.manager.onSelectionChange(selectionChange);
         this.onDestroy(() => {
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index 1bc1ea5437a..2046260a023 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -1,5 +1,5 @@
 import {EditorDecorator} from "../framework/decorator";
-import {el, selectSingleNode} from "../../helpers";
+import {el, $selectSingleNode} from "../../helpers";
 import {$createNodeSelection, $setSelection} from "lexical";
 import {EditorUiContext} from "../framework/core";
 import {ImageNode} from "../../nodes/image";
@@ -41,7 +41,7 @@ export class ImageDecorator extends EditorDecorator {
             tracker = this.setupTracker(decorateEl, context);
 
             context.editor.update(() => {
-                selectSingleNode(this.getNode());
+                $selectSingleNode(this.getNode());
             });
         };
 
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index d1d22dae1ea..bf725f8c8c8 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -21,11 +21,11 @@ import {
     UNDO_COMMAND
 } from "lexical";
 import {
-    getBlockElementNodesInSelection,
-    getNodeFromSelection, insertNewBlockNodeAtSelection, selectionContainsElementFormat,
-    selectionContainsNodeType,
-    selectionContainsTextFormat,
-    toggleSelectionBlockNodeType
+    $getBlockElementNodesInSelection,
+    $getNodeFromSelection, $insertNewBlockNodeAtSelection, $selectionContainsElementFormat,
+    $selectionContainsNodeType,
+    $selectionContainsTextFormat,
+    $toggleSelectionBlockNodeType
 } from "../../helpers";
 import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../nodes/callout";
 import {
@@ -116,14 +116,15 @@ function buildCalloutButton(category: CalloutCategory, name: string): EditorButt
     return {
         label: `${name} Callout`,
         action(context: EditorUiContext) {
-            toggleSelectionBlockNodeType(
-                context.editor,
-                (node) => $isCalloutNodeOfCategory(node, category),
-                () => $createCalloutNode(category),
-            )
+            context.editor.update(() => {
+                $toggleSelectionBlockNodeType(
+                    (node) => $isCalloutNodeOfCategory(node, category),
+                    () => $createCalloutNode(category),
+                )
+            });
         },
         isActive(selection: BaseSelection|null): boolean {
-            return selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, category));
+            return $selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, category));
         }
     };
 }
@@ -141,14 +142,15 @@ function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefin
     return {
         label: name,
         action(context: EditorUiContext) {
-            toggleSelectionBlockNodeType(
-                context.editor,
+            context.editor.update(() => {
+                $toggleSelectionBlockNodeType(
                 (node) => isHeaderNodeOfTag(node, tag),
                 () => $createHeadingNode(tag),
-            )
+                )
+            });
         },
         isActive(selection: BaseSelection|null): boolean {
-            return selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
+            return $selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
         }
     };
 }
@@ -161,20 +163,24 @@ export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header')
 export const blockquote: EditorButtonDefinition = {
     label: 'Blockquote',
     action(context: EditorUiContext) {
-        toggleSelectionBlockNodeType(context.editor, $isQuoteNode, $createQuoteNode);
+        context.editor.update(() => {
+            $toggleSelectionBlockNodeType($isQuoteNode, $createQuoteNode);
+        });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isQuoteNode);
+        return $selectionContainsNodeType(selection, $isQuoteNode);
     }
 };
 
 export const paragraph: EditorButtonDefinition = {
     label: 'Paragraph',
     action(context: EditorUiContext) {
-        toggleSelectionBlockNodeType(context.editor, $isParagraphNode, $createParagraphNode);
+        context.editor.update(() => {
+            $toggleSelectionBlockNodeType($isParagraphNode, $createParagraphNode);
+        });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isParagraphNode);
+        return $selectionContainsNodeType(selection, $isParagraphNode);
     }
 }
 
@@ -186,7 +192,7 @@ function buildFormatButton(label: string, format: TextFormatType, icon: string):
             context.editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
         },
         isActive(selection: BaseSelection|null): boolean {
-            return selectionContainsTextFormat(selection, format);
+            return $selectionContainsTextFormat(selection, format);
         }
     };
 }
@@ -222,7 +228,7 @@ export const clearFormating: EditorButtonDefinition = {
 
 function setAlignmentForSection(alignment: ElementFormatType): void {
     const selection = $getSelection();
-    const elements = getBlockElementNodesInSelection(selection);
+    const elements = $getBlockElementNodesInSelection(selection);
     for (const node of elements) {
         node.setFormat(alignment);
     }
@@ -235,7 +241,7 @@ export const alignLeft: EditorButtonDefinition = {
         context.editor.update(() => setAlignmentForSection('left'));
     },
     isActive(selection: BaseSelection|null) {
-        return selectionContainsElementFormat(selection, 'left');
+        return $selectionContainsElementFormat(selection, 'left');
     }
 };
 
@@ -246,7 +252,7 @@ export const alignCenter: EditorButtonDefinition = {
         context.editor.update(() => setAlignmentForSection('center'));
     },
     isActive(selection: BaseSelection|null) {
-        return selectionContainsElementFormat(selection, 'center');
+        return $selectionContainsElementFormat(selection, 'center');
     }
 };
 
@@ -257,7 +263,7 @@ export const alignRight: EditorButtonDefinition = {
         context.editor.update(() => setAlignmentForSection('right'));
     },
     isActive(selection: BaseSelection|null) {
-        return selectionContainsElementFormat(selection, 'right');
+        return $selectionContainsElementFormat(selection, 'right');
     }
 };
 
@@ -268,7 +274,7 @@ export const alignJustify: EditorButtonDefinition = {
         context.editor.update(() => setAlignmentForSection('justify'));
     },
     isActive(selection: BaseSelection|null) {
-        return selectionContainsElementFormat(selection, 'justify');
+        return $selectionContainsElementFormat(selection, 'justify');
     }
 };
 
@@ -288,7 +294,7 @@ function buildListButton(label: string, type: ListType, icon: string): EditorBut
             });
         },
         isActive(selection: BaseSelection|null): boolean {
-            return selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
+            return $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
                 return $isListNode(node) && (node as ListNode).getListType() === type;
             });
         }
@@ -307,7 +313,7 @@ export const link: EditorButtonDefinition = {
         const linkModal = context.manager.createModal('link');
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const selectedLink = getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
 
             let formDefaults = {};
             if (selectedLink) {
@@ -329,7 +335,7 @@ export const link: EditorButtonDefinition = {
         });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isLinkNode);
+        return $selectionContainsNodeType(selection, $isLinkNode);
     }
 };
 
@@ -339,7 +345,7 @@ export const unlink: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.update(() => {
             const selection = context.lastSelection;
-            const selectedLink = getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
             const selectionPoints = selection?.getStartEndPoints();
 
             if (selectedLink) {
@@ -369,7 +375,7 @@ export const image: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         const imageModal = context.manager.createModal('image');
         const selection = context.lastSelection;
-        const selectedImage = getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
+        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
 
         context.editor.getEditorState().read(() => {
             let formDefaults = {};
@@ -392,7 +398,7 @@ export const image: EditorButtonDefinition = {
         });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isImageNode);
+        return $selectionContainsNodeType(selection, $isImageNode);
     }
 };
 
@@ -401,11 +407,11 @@ export const horizontalRule: EditorButtonDefinition = {
     icon: horizontalRuleIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
+            $insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
         });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isHorizontalRuleNode);
+        return $selectionContainsNodeType(selection, $isHorizontalRuleNode);
     }
 };
 
@@ -415,12 +421,12 @@ export const codeBlock: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const codeBlock = getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
+            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
             if (codeBlock === null) {
                 context.editor.update(() => {
                     const codeBlock = $createCodeBlockNode();
                     codeBlock.setCode(selection?.getTextContent() || '');
-                    insertNewBlockNodeAtSelection(codeBlock, true);
+                    $insertNewBlockNodeAtSelection(codeBlock, true);
                     $openCodeEditorForNode(context.editor, codeBlock);
                     codeBlock.selectStart();
                 });
@@ -430,7 +436,7 @@ export const codeBlock: EditorButtonDefinition = {
         });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isCodeBlockNode);
+        return $selectionContainsNodeType(selection, $isCodeBlockNode);
     }
 };
 
@@ -463,7 +469,7 @@ export const details: EditorButtonDefinition = {
         });
     },
     isActive(selection: BaseSelection|null): boolean {
-        return selectionContainsNodeType(selection, $isDetailsNode);
+        return $selectionContainsNodeType(selection, $isDetailsNode);
     }
 }
 
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index 8c28953d566..1981fcb8624 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -1,4 +1,4 @@
-import {el, insertNewBlockNodeAtSelection} from "../../../helpers";
+import {el, $insertNewBlockNodeAtSelection} from "../../../helpers";
 import {EditorUiElement} from "../core";
 import {$createTableNodeWithDimensions} from "@lexical/table";
 import {CustomTableNode} from "../../../nodes/custom-table";
@@ -75,7 +75,7 @@ export class EditorTableCreator extends EditorUiElement {
 
         this.getContext().editor.update(() => {
             const table = $createTableNodeWithDimensions(rows, columns, false) as CustomTableNode;
-            insertNewBlockNodeAtSelection(table);
+            $insertNewBlockNodeAtSelection(table);
         });
     }
 }
\ No newline at end of file

From 634b0aaa07097f4a413a85e7c172176dda8e42e1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 18 Jul 2024 11:19:11 +0100
Subject: [PATCH 209/666] Lexical: Started converting drawio to TS

Converted events service to TS as part of this.
---
 resources/js/app.js                           |  4 +-
 resources/js/global.d.ts                      |  2 +
 .../js/services/{drawio.js => drawio.ts}      | 62 ++++++++------
 resources/js/services/events.js               | 81 -------------------
 resources/js/services/events.ts               | 71 ++++++++++++++++
 resources/js/wysiwyg/todo.md                  |  8 +-
 .../js/wysiwyg/ui/decorators/code-block.ts    |  1 -
 resources/js/wysiwyg/ui/decorators/diagram.ts | 25 +++++-
 tsconfig.json                                 |  2 +-
 9 files changed, 143 insertions(+), 113 deletions(-)
 rename resources/js/services/{drawio.js => drawio.ts} (69%)
 delete mode 100644 resources/js/services/events.js
 create mode 100644 resources/js/services/events.ts

diff --git a/resources/js/app.js b/resources/js/app.js
index 123d6c8f5cd..812a451f233 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,4 +1,4 @@
-import * as events from './services/events';
+import {EventManager} from './services/events.ts';
 import * as httpInstance from './services/http';
 import Translations from './services/translations';
 import * as componentMap from './components';
@@ -21,7 +21,7 @@ window.importVersioned = function importVersioned(moduleName) {
 
 // Set events and http services on window
 window.$http = httpInstance;
-window.$events = events;
+window.$events = new EventManager();
 
 // Translation setup
 // Creates a global function with name 'trans' to be used in the same way as the Laravel translation system
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index da19545d110..a9b9275e92c 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -1,7 +1,9 @@
 import {ComponentStore} from "./services/components";
+import {EventManager} from "./services/events";
 
 declare global {
     interface Window {
         $components: ComponentStore,
+        $events: EventManager,
     }
 }
\ No newline at end of file
diff --git a/resources/js/services/drawio.js b/resources/js/services/drawio.ts
similarity index 69%
rename from resources/js/services/drawio.js
rename to resources/js/services/drawio.ts
index 46e10327a26..75b161f75d5 100644
--- a/resources/js/services/drawio.js
+++ b/resources/js/services/drawio.ts
@@ -1,17 +1,31 @@
 // Docs: https://www.diagrams.net/doc/faq/embed-mode
 import * as store from './store';
-
-let iFrame = null;
-let lastApprovedOrigin;
-let onInit;
-let onSave;
+import {ConfirmDialog} from "../components";
+
+type DrawioExportEventResponse = {
+    action: 'export',
+    format: string,
+    message: string,
+    data: string,
+    xml: string,
+};
+
+type DrawioSaveEventResponse = {
+    action: 'save',
+    xml: string,
+};
+
+let iFrame: HTMLIFrameElement|null = null;
+let lastApprovedOrigin: string;
+let onInit: () => Promise<string>;
+let onSave: (data: string) => Promise<any>;
 const saveBackupKey = 'last-drawing-save';
 
-function drawPostMessage(data) {
-    iFrame.contentWindow.postMessage(JSON.stringify(data), lastApprovedOrigin);
+function drawPostMessage(data: Record<any, any>): void {
+    iFrame?.contentWindow?.postMessage(JSON.stringify(data), lastApprovedOrigin);
 }
 
-function drawEventExport(message) {
+function drawEventExport(message: DrawioExportEventResponse) {
     store.set(saveBackupKey, message.data);
     if (onSave) {
         onSave(message.data).then(() => {
@@ -20,7 +34,7 @@ function drawEventExport(message) {
     }
 }
 
-function drawEventSave(message) {
+function drawEventSave(message: DrawioSaveEventResponse) {
     drawPostMessage({
         action: 'export', format: 'xmlpng', xml: message.xml, spin: 'Updating drawing',
     });
@@ -35,8 +49,10 @@ function drawEventInit() {
 
 function drawEventConfigure() {
     const config = {};
-    window.$events.emitPublic(iFrame, 'editor-drawio::configure', {config});
-    drawPostMessage({action: 'configure', config});
+    if (iFrame) {
+        window.$events.emitPublic(iFrame, 'editor-drawio::configure', {config});
+        drawPostMessage({action: 'configure', config});
+    }
 }
 
 function drawEventClose() {
@@ -47,9 +63,8 @@ function drawEventClose() {
 
 /**
  * Receive and handle a message event from the draw.io window.
- * @param {MessageEvent} event
  */
-function drawReceive(event) {
+function drawReceive(event: MessageEvent) {
     if (!event.data || event.data.length < 1) return;
     if (event.origin !== lastApprovedOrigin) return;
 
@@ -59,9 +74,9 @@ function drawReceive(event) {
     } else if (message.event === 'exit') {
         drawEventClose();
     } else if (message.event === 'save') {
-        drawEventSave(message);
+        drawEventSave(message as DrawioSaveEventResponse);
     } else if (message.event === 'export') {
-        drawEventExport(message);
+        drawEventExport(message as DrawioExportEventResponse);
     } else if (message.event === 'configure') {
         drawEventConfigure();
     }
@@ -79,9 +94,8 @@ async function attemptRestoreIfExists() {
         console.error('Missing expected unsaved-drawing dialog');
     }
 
-    if (backupVal) {
-        /** @var {ConfirmDialog} */
-        const dialog = window.$components.firstOnElement(dialogEl, 'confirm-dialog');
+    if (backupVal && dialogEl) {
+        const dialog = window.$components.firstOnElement(dialogEl, 'confirm-dialog') as ConfirmDialog;
         const restore = await dialog.show();
         if (restore) {
             onInit = async () => backupVal;
@@ -94,11 +108,9 @@ async function attemptRestoreIfExists() {
  * onSaveCallback must return a promise that resolves on successful save and errors on failure.
  * onInitCallback must return a promise with the xml to load for the editor.
  * Will attempt to provide an option to restore unsaved changes if found to exist.
- * @param {String} drawioUrl
- * @param {Function<Promise<String>>} onInitCallback
- * @param {Function<Promise>} onSaveCallback - Is called with the drawing data on save.
+ * onSaveCallback Is called with the drawing data on save.
  */
-export async function show(drawioUrl, onInitCallback, onSaveCallback) {
+export async function show(drawioUrl: string, onInitCallback: () => Promise<string>, onSaveCallback: (data: string) => Promise<void>): Promise<void> {
     onInit = onInitCallback;
     onSave = onSaveCallback;
 
@@ -114,7 +126,7 @@ export async function show(drawioUrl, onInitCallback, onSaveCallback) {
     lastApprovedOrigin = (new URL(drawioUrl)).origin;
 }
 
-export async function upload(imageData, pageUploadedToId) {
+export async function upload(imageData: string, pageUploadedToId: string): Promise<{}|string> {
     const data = {
         image: imageData,
         uploaded_to: pageUploadedToId,
@@ -129,10 +141,8 @@ export function close() {
 
 /**
  * Load an existing image, by fetching it as Base64 from the system.
- * @param drawingId
- * @returns {Promise<string>}
  */
-export async function load(drawingId) {
+export async function load(drawingId: string): Promise<string> {
     try {
         const resp = await window.$http.get(window.baseUrl(`/images/drawio/base64/${drawingId}`));
         return `data:image/png;base64,${resp.data.content}`;
diff --git a/resources/js/services/events.js b/resources/js/services/events.js
deleted file mode 100644
index 761305793a1..00000000000
--- a/resources/js/services/events.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const listeners = {};
-const stack = [];
-
-/**
- * Emit a custom event for any handlers to pick-up.
- * @param {String} eventName
- * @param {*} eventData
- */
-export function emit(eventName, eventData) {
-    stack.push({name: eventName, data: eventData});
-
-    const listenersToRun = listeners[eventName] || [];
-    for (const listener of listenersToRun) {
-        listener(eventData);
-    }
-}
-
-/**
- * Listen to a custom event and run the given callback when that event occurs.
- * @param {String} eventName
- * @param {Function} callback
- * @returns {Events}
- */
-export function listen(eventName, callback) {
-    if (typeof listeners[eventName] === 'undefined') listeners[eventName] = [];
-    listeners[eventName].push(callback);
-}
-
-/**
- * Emit an event for public use.
- * Sends the event via the native DOM event handling system.
- * @param {Element} targetElement
- * @param {String} eventName
- * @param {Object} eventData
- */
-export function emitPublic(targetElement, eventName, eventData) {
-    const event = new CustomEvent(eventName, {
-        detail: eventData,
-        bubbles: true,
-    });
-    targetElement.dispatchEvent(event);
-}
-
-/**
- * Emit a success event with the provided message.
- * @param {String} message
- */
-export function success(message) {
-    emit('success', message);
-}
-
-/**
- * Emit an error event with the provided message.
- * @param {String} message
- */
-export function error(message) {
-    emit('error', message);
-}
-
-/**
- * Notify of standard server-provided validation errors.
- * @param {Object} responseErr
- */
-export function showValidationErrors(responseErr) {
-    if (!responseErr.status) return;
-    if (responseErr.status === 422 && responseErr.data) {
-        const message = Object.values(responseErr.data).flat().join('\n');
-        error(message);
-    }
-}
-
-/**
- * Notify standard server-provided error messages.
- * @param {Object} responseErr
- */
-export function showResponseError(responseErr) {
-    if (!responseErr.status) return;
-    if (responseErr.status >= 400 && responseErr.data && responseErr.data.message) {
-        error(responseErr.data.message);
-    }
-}
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
new file mode 100644
index 00000000000..c251ee21b63
--- /dev/null
+++ b/resources/js/services/events.ts
@@ -0,0 +1,71 @@
+export class EventManager {
+    protected listeners: Record<string, ((data: {}) => void)[]> = {};
+    protected stack: {name: string, data: {}}[] = [];
+
+    /**
+     * Emit a custom event for any handlers to pick-up.
+     */
+    emit(eventName: string, eventData: {}): void {
+        this.stack.push({name: eventName, data: eventData});
+
+        const listenersToRun = this.listeners[eventName] || [];
+        for (const listener of listenersToRun) {
+            listener(eventData);
+        }
+    }
+
+    /**
+     * Listen to a custom event and run the given callback when that event occurs.
+     */
+    listen(eventName: string, callback: (data: {}) => void): void {
+        if (typeof this.listeners[eventName] === 'undefined') this.listeners[eventName] = [];
+        this.listeners[eventName].push(callback);
+    }
+
+    /**
+     * Emit an event for public use.
+     * Sends the event via the native DOM event handling system.
+     */
+    emitPublic(targetElement: Element, eventName: string, eventData: {}): void {
+        const event = new CustomEvent(eventName, {
+            detail: eventData,
+            bubbles: true,
+        });
+        targetElement.dispatchEvent(event);
+    }
+
+    /**
+     * Emit a success event with the provided message.
+     */
+    success(message: string): void {
+        this.emit('success', message);
+    }
+
+    /**
+     * Emit an error event with the provided message.
+     */
+    error(message: string): void {
+        this.emit('error', message);
+    }
+
+    /**
+     * Notify of standard server-provided validation errors.
+     */
+    showValidationErrors(responseErr: {status?: number, data?: object}): void {
+        if (!responseErr.status) return;
+        if (responseErr.status === 422 && responseErr.data) {
+            const message = Object.values(responseErr.data).flat().join('\n');
+            this.error(message);
+        }
+    }
+
+    /**
+     * Notify standard server-provided error messages.
+     */
+    showResponseError(responseErr: {status?: number, data?: {message?: string}}): void {
+        if (!responseErr.status) return;
+        if (responseErr.status >= 400 && responseErr.data && responseErr.data.message) {
+            this.error(responseErr.data.message);
+        }
+    }
+}
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 67b5fb78062..61b592ca023 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -1,11 +1,16 @@
 # Lexical based editor todo
 
+## In progress
+
+- Add Type: Drawings
+  - Continue converting drawio to typescript
+  - Next step to convert http service to ts.
+
 ## Main Todo
 
 - Alignments: Use existing classes for blocks
 - Alignments: Handle inline block content (image, video)
 - Add Type: Video/media/embed
-- Add Type: Drawings
 - Handle toolbars on scroll
 - Table features
 - Image paste upload
@@ -20,6 +25,7 @@
 - Link heading-based ID reference menu
 - Image gallery integration for insert
 - Image gallery integration for form
+- Drawing gallery integration
 
 ## Bugs
 
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index cfb2c6aefb2..d6947ea756d 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -2,7 +2,6 @@ import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
 import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
-import {context} from "esbuild";
 import {BaseSelection} from "lexical";
 
 
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 2f092bd203e..9c48f8c2472 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,12 +1,35 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
+import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
+import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
+import {BaseSelection} from "lexical";
+import {$openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
 
 
 export class DiagramDecorator extends EditorDecorator {
     protected completedSetup: boolean = false;
 
     setup(context: EditorUiContext, element: HTMLElement) {
-        //
+        const diagramNode = this.getNode();
+        element.addEventListener('click', event => {
+            context.editor.update(() => {
+                $selectSingleNode(this.getNode());
+            })
+        });
+
+        element.addEventListener('dblclick', event => {
+            context.editor.getEditorState().read(() => {
+                $openDrawingEditorForNode(context.editor, (this.getNode() as DiagramNode));
+            });
+        });
+
+        const selectionChange = (selection: BaseSelection|null): void => {
+            element.classList.toggle('selected', $selectionContainsNode(selection, diagramNode));
+        };
+        context.manager.onSelectionChange(selectionChange);
+        this.onDestroy(() => {
+            context.manager.offSelectionChange(selectionChange);
+        });
 
         this.completedSetup = true;
     }
diff --git a/tsconfig.json b/tsconfig.json
index 3ca03da303d..0be5421c7c8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2019",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */

From fb87fb57502d03daa36c2eda9df53efebab8cb58 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 18 Jul 2024 15:13:14 +0100
Subject: [PATCH 210/666] JS: Converted http service to ts

---
 resources/js/app.js             |   4 +-
 resources/js/global.d.ts        |   3 +
 resources/js/services/drawio.ts |   6 +-
 resources/js/services/events.ts |   6 +-
 resources/js/services/http.js   | 238 --------------------------------
 resources/js/services/http.ts   | 221 +++++++++++++++++++++++++++++
 6 files changed, 234 insertions(+), 244 deletions(-)
 delete mode 100644 resources/js/services/http.js
 create mode 100644 resources/js/services/http.ts

diff --git a/resources/js/app.js b/resources/js/app.js
index 812a451f233..e08b90ba1e4 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,5 +1,5 @@
 import {EventManager} from './services/events.ts';
-import * as httpInstance from './services/http';
+import {HttpManager} from './services/http.ts';
 import Translations from './services/translations';
 import * as componentMap from './components';
 import {ComponentStore} from './services/components.ts';
@@ -20,7 +20,7 @@ window.importVersioned = function importVersioned(moduleName) {
 };
 
 // Set events and http services on window
-window.$http = httpInstance;
+window.$http = new HttpManager();
 window.$events = new EventManager();
 
 // Translation setup
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index a9b9275e92c..1f216b7a53c 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -1,9 +1,12 @@
 import {ComponentStore} from "./services/components";
 import {EventManager} from "./services/events";
+import {HttpManager} from "./services/http";
 
 declare global {
     interface Window {
         $components: ComponentStore,
         $events: EventManager,
+        $http: HttpManager,
+        baseUrl: (path: string) => string;
     }
 }
\ No newline at end of file
diff --git a/resources/js/services/drawio.ts b/resources/js/services/drawio.ts
index 75b161f75d5..c0a6b5044bc 100644
--- a/resources/js/services/drawio.ts
+++ b/resources/js/services/drawio.ts
@@ -1,6 +1,7 @@
 // Docs: https://www.diagrams.net/doc/faq/embed-mode
 import * as store from './store';
 import {ConfirmDialog} from "../components";
+import {HttpError} from "./http";
 
 type DrawioExportEventResponse = {
     action: 'export',
@@ -145,9 +146,10 @@ export function close() {
 export async function load(drawingId: string): Promise<string> {
     try {
         const resp = await window.$http.get(window.baseUrl(`/images/drawio/base64/${drawingId}`));
-        return `data:image/png;base64,${resp.data.content}`;
+        const data = resp.data as {content: string};
+        return `data:image/png;base64,${data.content}`;
     } catch (error) {
-        if (error instanceof window.$http.HttpError) {
+        if (error instanceof HttpError) {
             window.$events.showResponseError(error);
         }
         close();
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index c251ee21b63..7d72a9f1af5 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -1,3 +1,5 @@
+import {HttpError} from "./http";
+
 export class EventManager {
     protected listeners: Record<string, ((data: {}) => void)[]> = {};
     protected stack: {name: string, data: {}}[] = [];
@@ -62,9 +64,9 @@ export class EventManager {
     /**
      * Notify standard server-provided error messages.
      */
-    showResponseError(responseErr: {status?: number, data?: {message?: string}}): void {
+    showResponseError(responseErr: {status?: number, data?: Record<any, any>}|HttpError): void {
         if (!responseErr.status) return;
-        if (responseErr.status >= 400 && responseErr.data && responseErr.data.message) {
+        if (responseErr.status >= 400 && typeof responseErr.data === 'object' && responseErr.data.message) {
             this.error(responseErr.data.message);
         }
     }
diff --git a/resources/js/services/http.js b/resources/js/services/http.js
deleted file mode 100644
index d95e4a59a29..00000000000
--- a/resources/js/services/http.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * @typedef FormattedResponse
- * @property {Headers} headers
- * @property {Response} original
- * @property {Object|String} data
- * @property {Boolean} redirected
- * @property {Number} status
- * @property {string} statusText
- * @property {string} url
- */
-
-/**
- * Get the content from a fetch response.
- * Checks the content-type header to determine the format.
- * @param {Response} response
- * @returns {Promise<Object|String>}
- */
-async function getResponseContent(response) {
-    if (response.status === 204) {
-        return null;
-    }
-
-    const responseContentType = response.headers.get('Content-Type') || '';
-    const subType = responseContentType.split(';')[0].split('/').pop();
-
-    if (subType === 'javascript' || subType === 'json') {
-        return response.json();
-    }
-
-    return response.text();
-}
-
-export class HttpError extends Error {
-
-    constructor(response, content) {
-        super(response.statusText);
-        this.data = content;
-        this.headers = response.headers;
-        this.redirected = response.redirected;
-        this.status = response.status;
-        this.statusText = response.statusText;
-        this.url = response.url;
-        this.original = response;
-    }
-
-}
-
-/**
- * @param {String} method
- * @param {String} url
- * @param {Object} events
- * @return {XMLHttpRequest}
- */
-export function createXMLHttpRequest(method, url, events = {}) {
-    const csrfToken = document.querySelector('meta[name=token]').getAttribute('content');
-    const req = new XMLHttpRequest();
-
-    for (const [eventName, callback] of Object.entries(events)) {
-        req.addEventListener(eventName, callback.bind(req));
-    }
-
-    req.open(method, url);
-    req.withCredentials = true;
-    req.setRequestHeader('X-CSRF-TOKEN', csrfToken);
-
-    return req;
-}
-
-/**
- * Create a new HTTP request, setting the required CSRF information
- * to communicate with the back-end. Parses & formats the response.
- * @param {String} url
- * @param {Object} options
- * @returns {Promise<FormattedResponse>}
- */
-async function request(url, options = {}) {
-    let requestUrl = url;
-
-    if (!requestUrl.startsWith('http')) {
-        requestUrl = window.baseUrl(requestUrl);
-    }
-
-    if (options.params) {
-        const urlObj = new URL(requestUrl);
-        for (const paramName of Object.keys(options.params)) {
-            const value = options.params[paramName];
-            if (typeof value !== 'undefined' && value !== null) {
-                urlObj.searchParams.set(paramName, value);
-            }
-        }
-        requestUrl = urlObj.toString();
-    }
-
-    const csrfToken = document.querySelector('meta[name=token]').getAttribute('content');
-    const requestOptions = {...options, credentials: 'same-origin'};
-    requestOptions.headers = {
-        ...requestOptions.headers || {},
-        baseURL: window.baseUrl(''),
-        'X-CSRF-TOKEN': csrfToken,
-    };
-
-    const response = await fetch(requestUrl, requestOptions);
-    const content = await getResponseContent(response);
-    const returnData = {
-        data: content,
-        headers: response.headers,
-        redirected: response.redirected,
-        status: response.status,
-        statusText: response.statusText,
-        url: response.url,
-        original: response,
-    };
-
-    if (!response.ok) {
-        throw new HttpError(response, content);
-    }
-
-    return returnData;
-}
-
-/**
- * Perform a HTTP request to the back-end that includes data in the body.
- * Parses the body to JSON if an object, setting the correct headers.
- * @param {String} method
- * @param {String} url
- * @param {Object} data
- * @returns {Promise<FormattedResponse>}
- */
-async function dataRequest(method, url, data = null) {
-    const options = {
-        method,
-        body: data,
-    };
-
-    // Send data as JSON if a plain object
-    if (typeof data === 'object' && !(data instanceof FormData)) {
-        options.headers = {
-            'Content-Type': 'application/json',
-            'X-Requested-With': 'XMLHttpRequest',
-        };
-        options.body = JSON.stringify(data);
-    }
-
-    // Ensure FormData instances are sent over POST
-    // Since Laravel does not read multipart/form-data from other types
-    // of request. Hence the addition of the magic _method value.
-    if (data instanceof FormData && method !== 'post') {
-        data.append('_method', method);
-        options.method = 'post';
-    }
-
-    return request(url, options);
-}
-
-/**
- * Perform a HTTP GET request.
- * Can easily pass query parameters as the second parameter.
- * @param {String} url
- * @param {Object} params
- * @returns {Promise<FormattedResponse>}
- */
-export async function get(url, params = {}) {
-    return request(url, {
-        method: 'GET',
-        params,
-    });
-}
-
-/**
- * Perform a HTTP POST request.
- * @param {String} url
- * @param {Object} data
- * @returns {Promise<FormattedResponse>}
- */
-export async function post(url, data = null) {
-    return dataRequest('POST', url, data);
-}
-
-/**
- * Perform a HTTP PUT request.
- * @param {String} url
- * @param {Object} data
- * @returns {Promise<FormattedResponse>}
- */
-export async function put(url, data = null) {
-    return dataRequest('PUT', url, data);
-}
-
-/**
- * Perform a HTTP PATCH request.
- * @param {String} url
- * @param {Object} data
- * @returns {Promise<FormattedResponse>}
- */
-export async function patch(url, data = null) {
-    return dataRequest('PATCH', url, data);
-}
-
-/**
- * Perform a HTTP DELETE request.
- * @param {String} url
- * @param {Object} data
- * @returns {Promise<FormattedResponse>}
- */
-async function performDelete(url, data = null) {
-    return dataRequest('DELETE', url, data);
-}
-
-export {performDelete as delete};
-
-/**
- * Parse the response text for an error response to a user
- * presentable string. Handles a range of errors responses including
- * validation responses & server response text.
- * @param {String} text
- * @returns {String}
- */
-export function formatErrorResponseText(text) {
-    const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
-    if (!data) {
-        return text;
-    }
-
-    if (data.message || data.error) {
-        return data.message || data.error;
-    }
-
-    const values = Object.values(data);
-    const isValidation = values.every(val => {
-        return Array.isArray(val) || val.every(x => typeof x === 'string');
-    });
-
-    if (isValidation) {
-        return values.flat().join(' ');
-    }
-
-    return text;
-}
diff --git a/resources/js/services/http.ts b/resources/js/services/http.ts
new file mode 100644
index 00000000000..f9eaafc3912
--- /dev/null
+++ b/resources/js/services/http.ts
@@ -0,0 +1,221 @@
+type ResponseData = Record<any, any>|string;
+
+type RequestOptions = {
+    params?: Record<string, string>,
+    headers?: Record<string, string>
+};
+
+type FormattedResponse = {
+    headers: Headers;
+    original: Response;
+    data: ResponseData;
+    redirected: boolean;
+    status: number;
+    statusText: string;
+    url: string;
+};
+
+export class HttpError extends Error implements FormattedResponse {
+
+    data: ResponseData;
+    headers: Headers;
+    original: Response;
+    redirected: boolean;
+    status: number;
+    statusText: string;
+    url: string;
+
+    constructor(response: Response, content: ResponseData) {
+        super(response.statusText);
+        this.data = content;
+        this.headers = response.headers;
+        this.redirected = response.redirected;
+        this.status = response.status;
+        this.statusText = response.statusText;
+        this.url = response.url;
+        this.original = response;
+    }
+}
+
+export class HttpManager {
+
+    /**
+     * Get the content from a fetch response.
+     * Checks the content-type header to determine the format.
+     */
+    protected async getResponseContent(response: Response): Promise<ResponseData|null> {
+        if (response.status === 204) {
+            return null;
+        }
+
+        const responseContentType = response.headers.get('Content-Type') || '';
+        const subType = responseContentType.split(';')[0].split('/').pop();
+
+        if (subType === 'javascript' || subType === 'json') {
+            return response.json();
+        }
+
+        return response.text();
+    }
+
+    createXMLHttpRequest(method: string, url: string, events: Record<string, (e: Event) => void> = {}): XMLHttpRequest {
+        const csrfToken = document.querySelector('meta[name=token]')?.getAttribute('content');
+        const req = new XMLHttpRequest();
+
+        for (const [eventName, callback] of Object.entries(events)) {
+            req.addEventListener(eventName, callback.bind(req));
+        }
+
+        req.open(method, url);
+        req.withCredentials = true;
+        req.setRequestHeader('X-CSRF-TOKEN', csrfToken || '');
+
+        return req;
+    }
+
+    /**
+     * Create a new HTTP request, setting the required CSRF information
+     * to communicate with the back-end. Parses & formats the response.
+     */
+    protected async request(url: string, options: RequestOptions & RequestInit = {}): Promise<FormattedResponse> {
+        let requestUrl = url;
+
+        if (!requestUrl.startsWith('http')) {
+            requestUrl = window.baseUrl(requestUrl);
+        }
+
+        if (options.params) {
+            const urlObj = new URL(requestUrl);
+            for (const paramName of Object.keys(options.params)) {
+                const value = options.params[paramName];
+                if (typeof value !== 'undefined' && value !== null) {
+                    urlObj.searchParams.set(paramName, value);
+                }
+            }
+            requestUrl = urlObj.toString();
+        }
+
+        const csrfToken = document.querySelector('meta[name=token]')?.getAttribute('content') || '';
+        const requestOptions: RequestInit = {...options, credentials: 'same-origin'};
+        requestOptions.headers = {
+            ...requestOptions.headers || {},
+            baseURL: window.baseUrl(''),
+            'X-CSRF-TOKEN': csrfToken,
+        };
+
+        const response = await fetch(requestUrl, requestOptions);
+        const content = await this.getResponseContent(response) || '';
+        const returnData: FormattedResponse = {
+            data: content,
+            headers: response.headers,
+            redirected: response.redirected,
+            status: response.status,
+            statusText: response.statusText,
+            url: response.url,
+            original: response,
+        };
+
+        if (!response.ok) {
+            throw new HttpError(response, content);
+        }
+
+        return returnData;
+    }
+
+    /**
+     * Perform a HTTP request to the back-end that includes data in the body.
+     * Parses the body to JSON if an object, setting the correct headers.
+     */
+    protected async dataRequest(method: string, url: string, data: Record<string, any>|null): Promise<FormattedResponse> {
+        const options: RequestInit & RequestOptions = {
+            method,
+            body: data as BodyInit,
+        };
+
+        // Send data as JSON if a plain object
+        if (typeof data === 'object' && !(data instanceof FormData)) {
+            options.headers = {
+                'Content-Type': 'application/json',
+                'X-Requested-With': 'XMLHttpRequest',
+            };
+            options.body = JSON.stringify(data);
+        }
+
+        // Ensure FormData instances are sent over POST
+        // Since Laravel does not read multipart/form-data from other types
+        // of request, hence the addition of the magic _method value.
+        if (data instanceof FormData && method !== 'post') {
+            data.append('_method', method);
+            options.method = 'post';
+        }
+
+        return this.request(url, options);
+    }
+
+    /**
+     * Perform a HTTP GET request.
+     * Can easily pass query parameters as the second parameter.
+     */
+    async get(url: string, params: {} = {}): Promise<FormattedResponse> {
+        return this.request(url, {
+            method: 'GET',
+            params,
+        });
+    }
+
+    /**
+     * Perform a HTTP POST request.
+     */
+    async post(url: string, data: null|Record<string, any> = null): Promise<FormattedResponse> {
+        return this.dataRequest('POST', url, data);
+    }
+
+    /**
+     * Perform a HTTP PUT request.
+     */
+    async put(url: string, data: null|Record<string, any> = null): Promise<FormattedResponse> {
+        return this.dataRequest('PUT', url, data);
+    }
+
+    /**
+     * Perform a HTTP PATCH request.
+     */
+    async patch(url: string, data: null|Record<string, any> = null): Promise<FormattedResponse> {
+        return this.dataRequest('PATCH', url, data);
+    }
+
+    /**
+     * Perform a HTTP DELETE request.
+     */
+    async delete(url: string, data: null|Record<string, any> = null): Promise<FormattedResponse> {
+        return this.dataRequest('DELETE', url, data);
+    }
+
+    /**
+     * Parse the response text for an error response to a user
+     * presentable string. Handles a range of errors responses including
+     * validation responses & server response text.
+     */
+    protected formatErrorResponseText(text: string): string {
+        const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
+        if (!data) {
+            return text;
+        }
+
+        if (data.message || data.error) {
+            return data.message || data.error;
+        }
+
+        const values = Object.values(data);
+        const isValidation = values.every(val => {
+            return Array.isArray(val) && val.every(x => typeof x === 'string');
+        });
+
+        if (isValidation) {
+            return values.flat().join(' ');
+        }
+
+        return text;
+    }
+
+}

From c7c0df096487a10f879d2a427373c5198bf2435c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 19 Jul 2024 12:09:41 +0100
Subject: [PATCH 211/666] Lexical: Finished up core drawing insert/editing

Added new options that sits on the context, for things needed but not
for the core editor, which are defined out of the editor (drawio URL,
error message text, pageId etc...)
---
 resources/icons/editor/diagram.svg            |  1 +
 resources/js/components/wysiwyg-editor.js     | 10 ++-
 resources/js/services/drawio.ts               |  4 +-
 resources/js/wysiwyg-tinymce/plugin-drawio.js |  2 +-
 resources/js/wysiwyg/index.ts                 |  4 +-
 resources/js/wysiwyg/nodes/diagram.ts         | 75 +++++++++++++++++--
 resources/js/wysiwyg/todo.md                  |  3 -
 resources/js/wysiwyg/ui/decorators/diagram.ts |  4 +-
 .../wysiwyg/ui/defaults/button-definitions.ts | 27 +++++++
 resources/js/wysiwyg/ui/framework/core.ts     | 17 +++--
 resources/js/wysiwyg/ui/index.ts              |  5 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  3 +-
 resources/sass/_editor.scss                   |  3 +
 13 files changed, 128 insertions(+), 30 deletions(-)
 create mode 100644 resources/icons/editor/diagram.svg

diff --git a/resources/icons/editor/diagram.svg b/resources/icons/editor/diagram.svg
new file mode 100644
index 00000000000..6ac78f56e7a
--- /dev/null
+++ b/resources/icons/editor/diagram.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M480-60q-63 0-106.5-43.5T330-210q0-52 31-91.5t79-53.5v-85H200v-160H100v-280h280v280H280v80h400v-85q-48-14-79-53.5T570-750q0-63 43.5-106.5T720-900q63 0 106.5 43.5T870-750q0 52-31 91.5T760-605v165H520v85q48 14 79 53.5t31 91.5q0 63-43.5 106.5T480-60Zm240-620q29 0 49.5-20.5T790-750q0-29-20.5-49.5T720-820q-29 0-49.5 20.5T650-750q0 29 20.5 49.5T720-680Zm-540 0h120v-120H180v120Zm300 540q29 0 49.5-20.5T550-210q0-29-20.5-49.5T480-280q-29 0-49.5 20.5T410-210q0 29 20.5 49.5T480-140ZM240-740Zm480-10ZM480-210Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index deb37186471..ebc142e2abc 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -12,7 +12,14 @@ export class WysiwygEditor extends Component {
 
         window.importVersioned('wysiwyg').then(wysiwyg => {
             const editorContent = this.input.value;
-            this.editor = wysiwyg.createPageEditorInstance(this.editContainer, editorContent);
+            this.editor = wysiwyg.createPageEditorInstance(this.editContainer, editorContent, {
+                drawioUrl: this.getDrawIoUrl(),
+                pageId: Number(this.$opts.pageId),
+                translations: {
+                    imageUploadErrorText: this.$opts.imageUploadErrorText,
+                    serverUploadLimitText: this.$opts.serverUploadLimitText,
+                },
+            });
         });
 
         let handlingFormSubmit = false;
@@ -35,7 +42,6 @@ export class WysiwygEditor extends Component {
     }
 
     getDrawIoUrl() {
-        // TODO
         const drawioUrlElem = document.querySelector('[drawio-url]');
         if (drawioUrlElem) {
             return drawioUrlElem.getAttribute('drawio-url');
diff --git a/resources/js/services/drawio.ts b/resources/js/services/drawio.ts
index c0a6b5044bc..4d7d88f1fdd 100644
--- a/resources/js/services/drawio.ts
+++ b/resources/js/services/drawio.ts
@@ -127,13 +127,13 @@ export async function show(drawioUrl: string, onInitCallback: () => Promise<stri
     lastApprovedOrigin = (new URL(drawioUrl)).origin;
 }
 
-export async function upload(imageData: string, pageUploadedToId: string): Promise<{}|string> {
+export async function upload(imageData: string, pageUploadedToId: string): Promise<{id: number, url: string}> {
     const data = {
         image: imageData,
         uploaded_to: pageUploadedToId,
     };
     const resp = await window.$http.post(window.baseUrl('/images/drawio'), data);
-    return resp.data;
+    return resp.data as {id: number, url: string};
 }
 
 export function close() {
diff --git a/resources/js/wysiwyg-tinymce/plugin-drawio.js b/resources/js/wysiwyg-tinymce/plugin-drawio.js
index 3b343a9586b..342cac0af74 100644
--- a/resources/js/wysiwyg-tinymce/plugin-drawio.js
+++ b/resources/js/wysiwyg-tinymce/plugin-drawio.js
@@ -1,4 +1,4 @@
-import * as DrawIO from '../services/drawio';
+import * as DrawIO from '../services/drawio.ts';
 import {wait} from '../services/util';
 
 let pageEditor = null;
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 8cbaccd7979..0aa04dfd907 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -9,7 +9,7 @@ import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {el} from "./helpers";
 import {EditorUiContext} from "./ui/framework/core";
 
-export function createPageEditorInstance(container: HTMLElement, htmlContent: string): SimpleWysiwygEditorInterface {
+export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
@@ -60,7 +60,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         }
     });
 
-    const context: EditorUiContext = buildEditorUI(container, editArea, editor);
+    const context: EditorUiContext = buildEditorUI(container, editArea, editor, options);
     registerCommonNodeMutationListeners(context);
 
     return new SimpleWysiwygEditorInterface(editor);
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/nodes/diagram.ts
index 15726813c9b..1aff0640037 100644
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/nodes/diagram.ts
@@ -10,6 +10,9 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
+import * as DrawIO from '../../services/drawio';
+import {EditorUiContext} from "../ui/framework/core";
+import {HttpError} from "../../services/http";
 
 export type SerializedDiagramNode = Spread<{
     id: string;
@@ -42,10 +45,10 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
         self.__drawingId = drawingId;
     }
 
-    getDrawingIdAndUrl(): {id: string, url: string} {
+    getDrawingIdAndUrl(): { id: string, url: string } {
         const self = this.getLatest();
         return {
-            id: self.__drawingUrl,
+            id: self.__drawingId,
             url: self.__drawingUrl,
         };
     }
@@ -103,16 +106,16 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
         return false;
     }
 
-    static importDOM(): DOMConversionMap|null {
+    static importDOM(): DOMConversionMap | null {
         return {
-            div(node: HTMLElement): DOMConversion|null {
+            div(node: HTMLElement): DOMConversion | null {
 
                 if (!node.hasAttribute('drawio-diagram')) {
                     return null;
                 }
 
                 return {
-                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                    conversion: (element: HTMLElement): DOMConversionOutput | null => {
 
                         const img = element.querySelector('img');
                         const drawingUrl = img?.getAttribute('src') || '';
@@ -153,6 +156,64 @@ export function $isDiagramNode(node: LexicalNode | null | undefined) {
     return node instanceof DiagramNode;
 }
 
-export function $openDrawingEditorForNode(editor: LexicalEditor, node: DiagramNode): void {
-    // Todo
+
+function handleUploadError(error: HttpError, context: EditorUiContext): void {
+    if (error.status === 413) {
+        window.$events.emit('error', context.options.translations.serverUploadLimitText || '');
+    } else {
+        window.$events.emit('error', context.options.translations.imageUploadErrorText || '');
+    }
+    console.error(error);
+}
+
+async function loadDiagramIdFromNode(editor: LexicalEditor, node: DiagramNode): Promise<string> {
+    const drawingId = await new Promise<string>((res, rej) => {
+        editor.getEditorState().read(() => {
+            const {id: drawingId} = node.getDrawingIdAndUrl();
+            res(drawingId);
+        });
+    });
+
+    return drawingId || '';
+}
+
+async function updateDrawingNodeFromData(context: EditorUiContext, node: DiagramNode, pngData: string, isNew: boolean): Promise<void> {
+    DrawIO.close();
+
+    if (isNew) {
+        const loadingImage: string = window.baseUrl('/loading.gif');
+        context.editor.update(() => {
+            node.setDrawingIdAndUrl('', loadingImage);
+        });
+    }
+
+    try {
+        const img = await DrawIO.upload(pngData, context.options.pageId);
+        context.editor.update(() => {
+            node.setDrawingIdAndUrl(String(img.id), img.url);
+        });
+    } catch (err) {
+        if (err instanceof HttpError) {
+            handleUploadError(err, context);
+        }
+
+        if (isNew) {
+            context.editor.update(() => {
+                node.remove();
+            });
+        }
+
+        throw new Error(`Failed to save image with error: ${err}`);
+    }
+}
+
+export function $openDrawingEditorForNode(context: EditorUiContext, node: DiagramNode): void {
+    let isNew = false;
+    DrawIO.show(context.options.drawioUrl, async () => {
+        const drawingId = await loadDiagramIdFromNode(context.editor, node);
+        isNew = !drawingId;
+        return isNew ? '' : DrawIO.load(drawingId);
+    }, async (pngData: string) => {
+        return updateDrawingNodeFromData(context, node, pngData, isNew);
+    });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 61b592ca023..e0b58eef6a4 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,9 +2,6 @@
 
 ## In progress
 
-- Add Type: Drawings
-  - Continue converting drawio to typescript
-  - Next step to convert http service to ts.
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 9c48f8c2472..0f1263f38f4 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,7 +1,6 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
-import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
 import {BaseSelection} from "lexical";
 import {$openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
 
@@ -11,6 +10,7 @@ export class DiagramDecorator extends EditorDecorator {
 
     setup(context: EditorUiContext, element: HTMLElement) {
         const diagramNode = this.getNode();
+        element.classList.add('editor-diagram');
         element.addEventListener('click', event => {
             context.editor.update(() => {
                 $selectSingleNode(this.getNode());
@@ -19,7 +19,7 @@ export class DiagramDecorator extends EditorDecorator {
 
         element.addEventListener('dblclick', event => {
             context.editor.getEditorState().read(() => {
-                $openDrawingEditorForNode(context.editor, (this.getNode() as DiagramNode));
+                $openDrawingEditorForNode(context, (this.getNode() as DiagramNode));
             });
         });
 
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
index bf725f8c8c8..5316dacf7d3 100644
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
@@ -67,12 +67,14 @@ import tableIcon from "@icons/editor/table.svg";
 import imageIcon from "@icons/editor/image.svg";
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
 import codeBlockIcon from "@icons/editor/code-block.svg";
+import diagramIcon from "@icons/editor/diagram.svg";
 import detailsIcon from "@icons/editor/details.svg";
 import sourceIcon from "@icons/editor/source-view.svg";
 import fullscreenIcon from "@icons/editor/fullscreen.svg";
 import editIcon from "@icons/edit.svg";
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
+import {$createDiagramNode, $isDiagramNode, $openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -445,6 +447,31 @@ export const editCodeBlock: EditorButtonDefinition = Object.assign({}, codeBlock
     icon: editIcon,
 });
 
+export const diagram: EditorButtonDefinition = {
+    label: 'Insert/edit drawing',
+    icon: diagramIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode|null);
+            if (diagramNode === null) {
+                context.editor.update(() => {
+                    const diagram = $createDiagramNode();
+                    $insertNewBlockNodeAtSelection(diagram, true);
+                    $openDrawingEditorForNode(context, diagram);
+                    diagram.selectStart();
+                });
+            } else {
+                $openDrawingEditorForNode(context, diagramNode);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isDiagramNode);
+    }
+};
+
+
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
     icon: detailsIcon,
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 465765caa31..22a821a89b2 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -3,17 +3,18 @@ import {EditorUIManager} from "./manager";
 import {el} from "../../helpers";
 
 export type EditorUiStateUpdate = {
-    editor: LexicalEditor,
-    selection: BaseSelection|null,
+    editor: LexicalEditor;
+    selection: BaseSelection|null;
 };
 
 export type EditorUiContext = {
-    editor: LexicalEditor,
-    editorDOM: HTMLElement,
-    containerDOM: HTMLElement,
-    translate: (text: string) => string,
-    manager: EditorUIManager,
-    lastSelection: BaseSelection|null,
+    editor: LexicalEditor; // Lexical editor instance
+    editorDOM: HTMLElement; // DOM element the editor is bound to
+    containerDOM: HTMLElement; // DOM element which contains all editor elements
+    translate: (text: string) => string; // Translate function
+    manager: EditorUIManager; // UI Manager instance for this editor
+    lastSelection: BaseSelection|null; // The last tracked selection made by the user
+    options: Record<string, any>; // General user options which may be used by sub elements
 };
 
 export abstract class EditorUiElement {
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 74837095962..31407497f76 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -12,7 +12,7 @@ import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
 
-export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor): EditorUiContext {
+export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
@@ -21,6 +21,7 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
         manager,
         translate: (text: string): string => text,
         lastSelection: null,
+        options,
     };
     manager.setContext(context);
 
@@ -43,7 +44,7 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
 
     // Register context toolbars
     manager.registerContextToolbar('image', {
-        selector: 'img',
+        selector: 'img:not([drawio-diagram] img)',
         content: getImageToolbarContent(),
         displayTargetLocator(originalTarget: HTMLElement) {
             return originalTarget.closest('a') || originalTarget;
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 9145b876193..f5eae6b212d 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -4,7 +4,7 @@ import {
     alignLeft,
     alignRight,
     blockquote, bold, bulletList, clearFormating, code, codeBlock,
-    dangerCallout, details, editCodeBlock, fullscreen,
+    dangerCallout, details, diagram, editCodeBlock, fullscreen,
     h2, h3, h4, h5, highlightColor, horizontalRule, image,
     infoCallout, italic, link, numberList, paragraph,
     redo, source, strikethrough, subscript,
@@ -89,6 +89,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(image),
             new EditorButton(horizontalRule),
             new EditorButton(codeBlock),
+            new EditorButton(diagram),
             new EditorButton(details),
         ]),
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 99045dd5ab1..b577d185027 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -316,6 +316,9 @@ body.editor-is-fullscreen {
     border: 1px dashed var(--editor-color-primary);
   }
 }
+.editor-diagram.selected {
+  outline: 2px dashed var(--editor-color-primary);
+}
 
 // Editor form elements
 .editor-form-field-wrapper {

From 63f4b424534bcddbc89c0df6690ee277ebe236ef Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 19 Jul 2024 18:12:51 +0100
Subject: [PATCH 212/666] Lexical: Added toolbar scroll/resize handling

Also added smarter above/below positioning to respond if toolbar would
be off the bottom of the editor, and added hide/show when they'd go
outside editor scroll bounds.
---
 resources/js/wysiwyg/index.ts                 |  2 +-
 resources/js/wysiwyg/todo.md                  |  4 +-
 resources/js/wysiwyg/ui/framework/core.ts     |  1 +
 resources/js/wysiwyg/ui/framework/manager.ts  | 23 +++++++++---
 resources/js/wysiwyg/ui/framework/toolbars.ts | 37 +++++++++++++++++--
 resources/js/wysiwyg/ui/index.ts              | 10 +++--
 resources/sass/_editor.scss                   |  4 ++
 7 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 0aa04dfd907..5f131df5725 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -60,7 +60,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         }
     });
 
-    const context: EditorUiContext = buildEditorUI(container, editArea, editor, options);
+    const context: EditorUiContext = buildEditorUI(container, editArea, editWrap, editor, options);
     registerCommonNodeMutationListeners(context);
 
     return new SimpleWysiwygEditorInterface(editor);
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index e0b58eef6a4..9950254dfe6 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -8,7 +8,6 @@
 - Alignments: Use existing classes for blocks
 - Alignments: Handle inline block content (image, video)
 - Add Type: Video/media/embed
-- Handle toolbars on scroll
 - Table features
 - Image paste upload
 - Keyboard shortcuts support
@@ -27,4 +26,5 @@
 ## Bugs
 
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
-- Table resize bars often floating around in wrong place, and shows on hover or interrupts mouse actions.
\ No newline at end of file
+- Table resize bars often floating around in wrong place, and shows on hover or interrupts mouse actions.
+- Removing link around image via button deletes image, not just link 
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 22a821a89b2..c8f390c4803 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -11,6 +11,7 @@ export type EditorUiContext = {
     editor: LexicalEditor; // Lexical editor instance
     editorDOM: HTMLElement; // DOM element the editor is bound to
     containerDOM: HTMLElement; // DOM element which contains all editor elements
+    scrollDOM: HTMLElement; // DOM element which is the main content scroll container
     translate: (text: string) => string; // Translate function
     manager: EditorUIManager; // UI Manager instance for this editor
     lastSelection: BaseSelection|null; // The last tracked selection made by the user
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index cfa94e8aeec..29d95991075 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -21,6 +21,7 @@ export class EditorUIManager {
 
     setContext(context: EditorUiContext) {
         this.context = context;
+        this.setupEventListeners(context);
         this.setupEditor(context.editor);
     }
 
@@ -130,9 +131,10 @@ export class EditorUIManager {
     }
 
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
-        for (const toolbar of this.activeContextToolbars) {
-            toolbar.empty();
-            toolbar.getDOMElement().remove();
+        for (let i = this.activeContextToolbars.length - 1; i >= 0; i--) {
+            const toolbar = this.activeContextToolbars[i];
+            toolbar.destroy();
+            this.activeContextToolbars.splice(i, 1);
         }
 
         const node = (update.selection?.getNodes() || [])[0] || null;
@@ -161,12 +163,12 @@ export class EditorUIManager {
         }
 
         for (const [target, contents] of contentByTarget) {
-            const toolbar = new EditorContextToolbar(contents);
+            const toolbar = new EditorContextToolbar(target, contents);
             toolbar.setContext(this.getContext());
             this.activeContextToolbars.push(toolbar);
 
             this.getContext().containerDOM.append(toolbar.getDOMElement());
-            toolbar.attachTo(target);
+            toolbar.updatePosition();
         }
     }
 
@@ -202,4 +204,15 @@ export class EditorUIManager {
         }
         editor.registerDecoratorListener(domDecorateListener);
     }
+
+    protected setupEventListeners(context: EditorUiContext) {
+        const updateToolbars = (event: Event) => {
+            for (const toolbar of this.activeContextToolbars) {
+                toolbar.updatePosition();
+            }
+        };
+
+        window.addEventListener('scroll', updateToolbars, {capture: true, passive: true});
+        window.addEventListener('resize', updateToolbars, {passive: true});
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index c9db0d6bd7f..d7c48193479 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -9,20 +9,44 @@ export type EditorContextToolbarDefinition = {
 
 export class EditorContextToolbar extends EditorContainerUiElement {
 
+    protected target: HTMLElement;
+
+    constructor(target: HTMLElement, children: EditorUiElement[]) {
+        super(children);
+        this.target = target;
+    }
+
     protected buildDOM(): HTMLElement {
         return el('div', {
             class: 'editor-context-toolbar',
         }, this.getChildren().map(child => child.getDOMElement()));
     }
 
-    attachTo(target: HTMLElement) {
-        const targetBounds = target.getBoundingClientRect();
+    updatePosition() {
+        const editorBounds = this.getContext().scrollDOM.getBoundingClientRect();
+        const targetBounds = this.target.getBoundingClientRect();
         const dom = this.getDOMElement();
         const domBounds = dom.getBoundingClientRect();
 
+        const showing = targetBounds.bottom > editorBounds.top
+            && targetBounds.top < editorBounds.bottom;
+
+        dom.hidden = !showing;
+
+        if (!showing) {
+            return;
+        }
+
+        const showAbove: boolean = targetBounds.bottom + 6 + domBounds.height > editorBounds.bottom;
+        dom.classList.toggle('is-above', showAbove);
+
         const targetMid = targetBounds.left + (targetBounds.width / 2);
         const targetLeft = targetMid - (domBounds.width / 2);
-        dom.style.top = (targetBounds.bottom + 6) + 'px';
+        if (showAbove) {
+            dom.style.top = (targetBounds.top - 6 - domBounds.height) + 'px';
+        } else {
+            dom.style.top = (targetBounds.bottom + 6) + 'px';
+        }
         dom.style.left = targetLeft + 'px';
     }
 
@@ -32,11 +56,16 @@ export class EditorContextToolbar extends EditorContainerUiElement {
         dom.append(...children.map(child => child.getDOMElement()));
     }
 
-    empty() {
+    protected empty() {
         const children = this.getChildren();
         for (const child of children) {
             child.getDOMElement().remove();
         }
         this.removeChildren(...children);
     }
+
+    destroy() {
+        this.empty();
+        this.getDOMElement().remove();
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 31407497f76..f728ae48fa5 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -12,12 +12,13 @@ import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
 
-export function buildEditorUI(container: HTMLElement, element: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
+export function buildEditorUI(container: HTMLElement, element: HTMLElement, scrollContainer: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
         containerDOM: container,
         editorDOM: element,
+        scrollDOM: scrollContainer,
         manager,
         translate: (text: string): string => text,
         lastSelection: null,
@@ -46,13 +47,14 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, edit
     manager.registerContextToolbar('image', {
         selector: 'img:not([drawio-diagram] img)',
         content: getImageToolbarContent(),
-        displayTargetLocator(originalTarget: HTMLElement) {
-            return originalTarget.closest('a') || originalTarget;
-        }
     });
     manager.registerContextToolbar('link', {
         selector: 'a',
         content: getLinkToolbarContent(),
+        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
+            const image = originalTarget.querySelector('img');
+            return image || originalTarget;
+        }
     });
     manager.registerContextToolbar('code', {
         selector: '.editor-code-block-wrap',
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index b577d185027..17e4af97bb0 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -161,6 +161,10 @@ body.editor-is-fullscreen {
     margin-left: -4px;
     top: -5px;
   }
+  &.is-above:before {
+    top: calc(100% - 5px);
+    transform: rotate(225deg);
+  }
 }
 
 // Modals

From b6182875858d637f19f49a2a98c61887a0c5c5d3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 21 Jul 2024 15:11:24 +0100
Subject: [PATCH 213/666] Lexical: Added table toolbar, organised button code

---
 .../icons/editor/table-delete-column.svg      |   1 +
 resources/icons/editor/table-delete-row.svg   |   1 +
 resources/icons/editor/table-delete.svg       |   1 +
 .../editor/table-insert-column-after.svg      |   1 +
 .../editor/table-insert-column-before.svg     |   1 +
 .../icons/editor/table-insert-row-above.svg   |   1 +
 .../icons/editor/table-insert-row-below.svg   |   1 +
 resources/js/wysiwyg/helpers.ts               |  17 +-
 resources/js/wysiwyg/todo.md                  |  12 +-
 .../wysiwyg/ui/defaults/button-definitions.ts | 528 ------------------
 .../wysiwyg/ui/defaults/buttons/alignments.ts |  61 ++
 .../ui/defaults/buttons/block-formats.ts      |  85 +++
 .../wysiwyg/ui/defaults/buttons/controls.ts   |  81 +++
 .../ui/defaults/buttons/inline-formats.ts     |  56 ++
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   |  35 ++
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 215 +++++++
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 122 ++++
 resources/js/wysiwyg/ui/index.ts              |  10 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  74 ++-
 19 files changed, 756 insertions(+), 547 deletions(-)
 create mode 100644 resources/icons/editor/table-delete-column.svg
 create mode 100644 resources/icons/editor/table-delete-row.svg
 create mode 100644 resources/icons/editor/table-delete.svg
 create mode 100644 resources/icons/editor/table-insert-column-after.svg
 create mode 100644 resources/icons/editor/table-insert-column-before.svg
 create mode 100644 resources/icons/editor/table-insert-row-above.svg
 create mode 100644 resources/icons/editor/table-insert-row-below.svg
 delete mode 100644 resources/js/wysiwyg/ui/defaults/button-definitions.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/controls.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/lists.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/objects.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/buttons/tables.ts

diff --git a/resources/icons/editor/table-delete-column.svg b/resources/icons/editor/table-delete-column.svg
new file mode 100644
index 00000000000..428fc29a670
--- /dev/null
+++ b/resources/icons/editor/table-delete-column.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21 19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h14c1.1 0 2 .9 2 2zm-2 0V5h-4v2.2h-2V5h-2v2.2H9V5H5v14h4v-2.1h2V19h2v-2.1h2V19Z"/><path d="M14.829 10.585 13.415 12l1.414 1.414c.943.943-.472 2.357-1.414 1.414L12 13.414l-1.414 1.414c-.944.944-2.358-.47-1.414-1.414L10.586 12l-1.414-1.415c-.943-.942.471-2.357 1.414-1.414L12 10.585l1.344-1.343c1.111-1.112 2.2.627 1.485 1.343z" style="fill-rule:nonzero"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-delete-row.svg b/resources/icons/editor/table-delete-row.svg
new file mode 100644
index 00000000000..ee2f8a00dab
--- /dev/null
+++ b/resources/icons/editor/table-delete-row.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 21a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v14c0 1.1-.9 2-2 2zm0-2h14v-4h-2.2v-2H19v-2h-2.2V9H19V5H5v4h2.1v2H5v2h2.1v2H5Z"/><path d="M13.415 14.829 12 13.415l-1.414 1.414c-.943.943-2.357-.472-1.414-1.414L10.586 12l-1.414-1.414c-.944-.944.47-2.358 1.414-1.414L12 10.586l1.415-1.414c.942-.943 2.357.471 1.414 1.414L13.415 12l1.343 1.344c1.112 1.111-.627 2.2-1.343 1.485z" style="fill-rule:nonzero"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-delete.svg b/resources/icons/editor/table-delete.svg
new file mode 100644
index 00000000000..412cf073253
--- /dev/null
+++ b/resources/icons/editor/table-delete.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 21a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v14c0 1.1-.9 2-2 2zm0-2h14V5H5v14z"/><path d="m13.711 15.423-1.71-1.712-1.712 1.712c-1.14 1.14-2.852-.57-1.71-1.712l1.71-1.71-1.71-1.712c-1.143-1.142.568-2.853 1.71-1.71L12 10.288l1.711-1.71c1.141-1.142 2.852.57 1.712 1.71L13.71 12l1.626 1.626c1.345 1.345-.76 2.663-1.626 1.797z" style="fill-rule:nonzero;stroke-width:1.20992"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-insert-column-after.svg b/resources/icons/editor/table-insert-column-after.svg
new file mode 100644
index 00000000000..75abd9a85c5
--- /dev/null
+++ b/resources/icons/editor/table-insert-column-after.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16 5h-5v14h5c1.235 0 1.234 2 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11c1.229 0 1.236 2 0 2zm-7 6V5H5v6zm0 8v-6H5v6zm11.076-6h-2v2c0 1.333-2 1.333-2 0v-2h-2c-1.335 0-1.335-2 0-2h2V9c0-1.333 2-1.333 2 0v2h1.9c1.572 0 1.113 2 .1 2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-insert-column-before.svg b/resources/icons/editor/table-insert-column-before.svg
new file mode 100644
index 00000000000..5bb38cd2935
--- /dev/null
+++ b/resources/icons/editor/table-insert-column-before.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8 19h5V5H8C6.764 5 6.766 3 8 3h11a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H8c-1.229 0-1.236-2 0-2zm7-6v6h4v-6zm0-8v6h4V5ZM3.924 11h2V9c0-1.333 2-1.333 2 0v2h2c1.335 0 1.335 2 0 2h-2v2c0 1.333-2 1.333-2 0v-2h-1.9c-1.572 0-1.113-2-.1-2z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-insert-row-above.svg b/resources/icons/editor/table-insert-row-above.svg
new file mode 100644
index 00000000000..df951485a50
--- /dev/null
+++ b/resources/icons/editor/table-insert-row-above.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 8v5h14V8c0-1.235 2-1.234 2 0v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8C3 6.77 5 6.764 5 8zm6 7H5v4h6zm8 0h-6v4h6zM13 3.924v2h2c1.333 0 1.333 2 0 2h-2v2c0 1.335-2 1.335-2 0v-2H9c-1.333 0-1.333-2 0-2h2v-1.9c0-1.572 2-1.113 2-.1z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-insert-row-below.svg b/resources/icons/editor/table-insert-row-below.svg
new file mode 100644
index 00000000000..b2af7759263
--- /dev/null
+++ b/resources/icons/editor/table-insert-row-below.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 16v-5H5v5c0 1.235-2 1.234-2 0V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v11c0 1.229-2 1.236-2 0zm-6-7h6V5h-6zM5 9h6V5H5Zm6 11.076v-2H9c-1.333 0-1.333-2 0-2h2v-2c0-1.335 2-1.335 2 0v2h2c1.333 0 1.333 2 0 2h-2v1.9c0 1.572-2 1.113-2 .1z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index a7c3e4453bc..6a55c429cda 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -44,10 +44,19 @@ export function $getNodeFromSelection(selection: BaseSelection|null, matcher: Le
             return node;
         }
 
-        for (const parent of node.getParents()) {
-            if (matcher(parent)) {
-                return parent;
-            }
+        const matchedParent = $getParentOfType(node, matcher);
+        if (matchedParent) {
+            return matchedParent;
+        }
+    }
+
+    return null;
+}
+
+export function $getParentOfType(node: LexicalNode, matcher: LexicalNodeMatcher): LexicalNode|null {
+    for (const parent of node.getParents()) {
+        if (matcher(parent)) {
+            return parent;
         }
     }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 9950254dfe6..7b958819471 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,12 +2,22 @@
 
 ## In progress
 
+- Add Type: Video/media/embed
+    - TinyMce media embed supported:
+      - iframe
+      - embed
+      - object
+      - video - Can take sources
+      - audio  - Can take sources
+    - Pretty much all attributes look like they were supported.
+    - Core old logic seen here: https://github.com/tinymce/tinymce/blob/main/modules/tinymce/src/plugins/media/main/ts/core/DataToHtml.ts
+    - Copy/store attributes on node based on allow list?
+      - width, height, src, controls, etc... Take valid values from MDN
 
 ## Main Todo
 
 - Alignments: Use existing classes for blocks
 - Alignments: Handle inline block content (image, video)
-- Add Type: Video/media/embed
 - Table features
 - Image paste upload
 - Keyboard shortcuts support
diff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.ts
deleted file mode 100644
index 5316dacf7d3..00000000000
--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts
+++ /dev/null
@@ -1,528 +0,0 @@
-import {EditorBasicButtonDefinition, EditorButton, EditorButtonDefinition} from "../framework/buttons";
-import {
-    $createNodeSelection,
-    $createParagraphNode,
-    $createTextNode,
-    $getRoot,
-    $getSelection,
-    $isParagraphNode,
-    $isTextNode,
-    $setSelection,
-    BaseSelection,
-    CAN_REDO_COMMAND,
-    CAN_UNDO_COMMAND,
-    COMMAND_PRIORITY_LOW,
-    ElementFormatType,
-    ElementNode,
-    FORMAT_TEXT_COMMAND,
-    LexicalNode,
-    REDO_COMMAND,
-    TextFormatType,
-    UNDO_COMMAND
-} from "lexical";
-import {
-    $getBlockElementNodesInSelection,
-    $getNodeFromSelection, $insertNewBlockNodeAtSelection, $selectionContainsElementFormat,
-    $selectionContainsNodeType,
-    $selectionContainsTextFormat,
-    $toggleSelectionBlockNodeType
-} from "../../helpers";
-import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../nodes/callout";
-import {
-    $createHeadingNode,
-    $createQuoteNode,
-    $isHeadingNode,
-    $isQuoteNode,
-    HeadingNode,
-    HeadingTagType
-} from "@lexical/rich-text";
-import {$isLinkNode, LinkNode} from "@lexical/link";
-import {EditorUiContext} from "../framework/core";
-import {$isImageNode, ImageNode} from "../../nodes/image";
-import {$createDetailsNode, $isDetailsNode} from "../../nodes/details";
-import {getEditorContentAsHtml} from "../../actions";
-import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
-import undoIcon from "@icons/editor/undo.svg";
-import redoIcon from "@icons/editor/redo.svg";
-import boldIcon from "@icons/editor/bold.svg";
-import italicIcon from "@icons/editor/italic.svg";
-import underlinedIcon from "@icons/editor/underlined.svg";
-import textColorIcon from "@icons/editor/text-color.svg";
-import highlightIcon from "@icons/editor/highlighter.svg";
-import strikethroughIcon from "@icons/editor/strikethrough.svg";
-import superscriptIcon from "@icons/editor/superscript.svg";
-import subscriptIcon from "@icons/editor/subscript.svg";
-import codeIcon from "@icons/editor/code.svg";
-import formatClearIcon from "@icons/editor/format-clear.svg";
-import alignLeftIcon from "@icons/editor/align-left.svg";
-import alignCenterIcon from "@icons/editor/align-center.svg";
-import alignRightIcon from "@icons/editor/align-right.svg";
-import alignJustifyIcon from "@icons/editor/align-justify.svg";
-import listBulletIcon from "@icons/editor/list-bullet.svg";
-import listNumberedIcon from "@icons/editor/list-numbered.svg";
-import listCheckIcon from "@icons/editor/list-check.svg";
-import linkIcon from "@icons/editor/link.svg";
-import unlinkIcon from "@icons/editor/unlink.svg";
-import tableIcon from "@icons/editor/table.svg";
-import imageIcon from "@icons/editor/image.svg";
-import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
-import codeBlockIcon from "@icons/editor/code-block.svg";
-import diagramIcon from "@icons/editor/diagram.svg";
-import detailsIcon from "@icons/editor/details.svg";
-import sourceIcon from "@icons/editor/source-view.svg";
-import fullscreenIcon from "@icons/editor/fullscreen.svg";
-import editIcon from "@icons/edit.svg";
-import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";
-import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {$createDiagramNode, $isDiagramNode, $openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
-
-export const undo: EditorButtonDefinition = {
-    label: 'Undo',
-    icon: undoIcon,
-    action(context: EditorUiContext) {
-        context.editor.dispatchCommand(UNDO_COMMAND, undefined);
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return false;
-    },
-    setup(context: EditorUiContext, button: EditorButton) {
-        button.toggleDisabled(true);
-
-        context.editor.registerCommand(CAN_UNDO_COMMAND, (payload: boolean): boolean => {
-            button.toggleDisabled(!payload)
-            return false;
-        }, COMMAND_PRIORITY_LOW);
-    }
-}
-
-export const redo: EditorButtonDefinition = {
-    label: 'Redo',
-    icon: redoIcon,
-    action(context: EditorUiContext) {
-        context.editor.dispatchCommand(REDO_COMMAND, undefined);
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return false;
-    },
-    setup(context: EditorUiContext, button: EditorButton) {
-        button.toggleDisabled(true);
-
-        context.editor.registerCommand(CAN_REDO_COMMAND, (payload: boolean): boolean => {
-            button.toggleDisabled(!payload)
-            return false;
-        }, COMMAND_PRIORITY_LOW);
-    }
-}
-
-function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
-    return {
-        label: `${name} Callout`,
-        action(context: EditorUiContext) {
-            context.editor.update(() => {
-                $toggleSelectionBlockNodeType(
-                    (node) => $isCalloutNodeOfCategory(node, category),
-                    () => $createCalloutNode(category),
-                )
-            });
-        },
-        isActive(selection: BaseSelection|null): boolean {
-            return $selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, category));
-        }
-    };
-}
-
-export const infoCallout: EditorButtonDefinition = buildCalloutButton('info', 'Info');
-export const dangerCallout: EditorButtonDefinition = buildCalloutButton('danger', 'Danger');
-export const warningCallout: EditorButtonDefinition = buildCalloutButton('warning', 'Warning');
-export const successCallout: EditorButtonDefinition = buildCalloutButton('success', 'Success');
-
-const isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
-      return $isHeadingNode(node) && (node as HeadingNode).getTag() === tag;
-};
-
-function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefinition {
-    return {
-        label: name,
-        action(context: EditorUiContext) {
-            context.editor.update(() => {
-                $toggleSelectionBlockNodeType(
-                (node) => isHeaderNodeOfTag(node, tag),
-                () => $createHeadingNode(tag),
-                )
-            });
-        },
-        isActive(selection: BaseSelection|null): boolean {
-            return $selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
-        }
-    };
-}
-
-export const h2: EditorButtonDefinition = buildHeaderButton('h2', 'Large Header');
-export const h3: EditorButtonDefinition = buildHeaderButton('h3', 'Medium Header');
-export const h4: EditorButtonDefinition = buildHeaderButton('h4', 'Small Header');
-export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header');
-
-export const blockquote: EditorButtonDefinition = {
-    label: 'Blockquote',
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $toggleSelectionBlockNodeType($isQuoteNode, $createQuoteNode);
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isQuoteNode);
-    }
-};
-
-export const paragraph: EditorButtonDefinition = {
-    label: 'Paragraph',
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $toggleSelectionBlockNodeType($isParagraphNode, $createParagraphNode);
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isParagraphNode);
-    }
-}
-
-function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
-    return {
-        label: label,
-        icon,
-        action(context: EditorUiContext) {
-            context.editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
-        },
-        isActive(selection: BaseSelection|null): boolean {
-            return $selectionContainsTextFormat(selection, format);
-        }
-    };
-}
-
-export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', boldIcon);
-export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
-export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
-export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
-export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color', icon: highlightIcon};
-
-export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
-export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
-export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript', subscriptIcon);
-export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code', codeIcon);
-export const clearFormating: EditorButtonDefinition = {
-    label: 'Clear formatting',
-    icon: formatClearIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            const selection = $getSelection();
-            for (const node of selection?.getNodes() || []) {
-                if ($isTextNode(node)) {
-                    node.setFormat(0);
-                    node.setStyle('');
-                }
-            }
-        });
-    },
-    isActive() {
-        return false;
-    }
-};
-
-function setAlignmentForSection(alignment: ElementFormatType): void {
-    const selection = $getSelection();
-    const elements = $getBlockElementNodesInSelection(selection);
-    for (const node of elements) {
-        node.setFormat(alignment);
-    }
-}
-
-export const alignLeft: EditorButtonDefinition = {
-    label: 'Align left',
-    icon: alignLeftIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('left'));
-    },
-    isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'left');
-    }
-};
-
-export const alignCenter: EditorButtonDefinition = {
-    label: 'Align center',
-    icon: alignCenterIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('center'));
-    },
-    isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'center');
-    }
-};
-
-export const alignRight: EditorButtonDefinition = {
-    label: 'Align right',
-    icon: alignRightIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('right'));
-    },
-    isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'right');
-    }
-};
-
-export const alignJustify: EditorButtonDefinition = {
-    label: 'Align justify',
-    icon: alignJustifyIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('justify'));
-    },
-    isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'justify');
-    }
-};
-
-
-function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
-    return {
-        label,
-        icon,
-        action(context: EditorUiContext) {
-            context.editor.getEditorState().read(() => {
-                const selection = $getSelection();
-                if (this.isActive(selection, context)) {
-                    removeList(context.editor);
-                } else {
-                    insertList(context.editor, type);
-                }
-            });
-        },
-        isActive(selection: BaseSelection|null): boolean {
-            return $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
-                return $isListNode(node) && (node as ListNode).getListType() === type;
-            });
-        }
-    };
-}
-
-export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet', listBulletIcon);
-export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number', listNumberedIcon);
-export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check', listCheckIcon);
-
-
-export const link: EditorButtonDefinition = {
-    label: 'Insert/edit link',
-    icon: linkIcon,
-    action(context: EditorUiContext) {
-        const linkModal = context.manager.createModal('link');
-        context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
-
-            let formDefaults = {};
-            if (selectedLink) {
-                formDefaults = {
-                    url: selectedLink.getURL(),
-                    text: selectedLink.getTextContent(),
-                    title: selectedLink.getTitle(),
-                    target: selectedLink.getTarget(),
-                }
-
-                context.editor.update(() => {
-                    const selection = $createNodeSelection();
-                    selection.add(selectedLink.getKey());
-                    $setSelection(selection);
-                });
-            }
-
-            linkModal.show(formDefaults);
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isLinkNode);
-    }
-};
-
-export const unlink: EditorButtonDefinition = {
-    label: 'Remove link',
-    icon: unlinkIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            const selection = context.lastSelection;
-            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
-            const selectionPoints = selection?.getStartEndPoints();
-
-            if (selectedLink) {
-                const newNode = $createTextNode(selectedLink.getTextContent());
-                selectedLink.replace(newNode);
-                if (selectionPoints?.length === 2) {
-                    newNode.select(selectionPoints[0].offset, selectionPoints[1].offset);
-                } else {
-                    newNode.select();
-                }
-            }
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return false;
-    }
-};
-
-export const table: EditorBasicButtonDefinition = {
-    label: 'Table',
-    icon: tableIcon,
-};
-
-export const image: EditorButtonDefinition = {
-    label: 'Insert/Edit Image',
-    icon: imageIcon,
-    action(context: EditorUiContext) {
-        const imageModal = context.manager.createModal('image');
-        const selection = context.lastSelection;
-        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
-
-        context.editor.getEditorState().read(() => {
-            let formDefaults = {};
-            if (selectedImage) {
-                formDefaults = {
-                    src: selectedImage.getSrc(),
-                    alt: selectedImage.getAltText(),
-                    height: selectedImage.getHeight(),
-                    width: selectedImage.getWidth(),
-                }
-
-                context.editor.update(() => {
-                    const selection = $createNodeSelection();
-                    selection.add(selectedImage.getKey());
-                    $setSelection(selection);
-                });
-            }
-
-            imageModal.show(formDefaults);
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isImageNode);
-    }
-};
-
-export const horizontalRule: EditorButtonDefinition = {
-    label: 'Insert horizontal line',
-    icon: horizontalRuleIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isHorizontalRuleNode);
-    }
-};
-
-export const codeBlock: EditorButtonDefinition = {
-    label: 'Insert code block',
-    icon: codeBlockIcon,
-    action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
-            if (codeBlock === null) {
-                context.editor.update(() => {
-                    const codeBlock = $createCodeBlockNode();
-                    codeBlock.setCode(selection?.getTextContent() || '');
-                    $insertNewBlockNodeAtSelection(codeBlock, true);
-                    $openCodeEditorForNode(context.editor, codeBlock);
-                    codeBlock.selectStart();
-                });
-            } else {
-                $openCodeEditorForNode(context.editor, codeBlock);
-            }
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isCodeBlockNode);
-    }
-};
-
-export const editCodeBlock: EditorButtonDefinition = Object.assign({}, codeBlock, {
-    label: 'Edit code block',
-    icon: editIcon,
-});
-
-export const diagram: EditorButtonDefinition = {
-    label: 'Insert/edit drawing',
-    icon: diagramIcon,
-    action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode|null);
-            if (diagramNode === null) {
-                context.editor.update(() => {
-                    const diagram = $createDiagramNode();
-                    $insertNewBlockNodeAtSelection(diagram, true);
-                    $openDrawingEditorForNode(context, diagram);
-                    diagram.selectStart();
-                });
-            } else {
-                $openDrawingEditorForNode(context, diagramNode);
-            }
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isDiagramNode);
-    }
-};
-
-
-export const details: EditorButtonDefinition = {
-    label: 'Insert collapsible block',
-    icon: detailsIcon,
-    action(context: EditorUiContext) {
-        context.editor.update(() => {
-            const selection = $getSelection();
-            const detailsNode = $createDetailsNode();
-            const selectionNodes = selection?.getNodes() || [];
-            const topLevels = selectionNodes.map(n => n.getTopLevelElement())
-                .filter(n => n !== null) as ElementNode[];
-            const uniqueTopLevels = [...new Set(topLevels)];
-
-            if (uniqueTopLevels.length > 0) {
-                uniqueTopLevels[0].insertAfter(detailsNode);
-            } else {
-                $getRoot().append(detailsNode);
-            }
-
-            for (const node of uniqueTopLevels) {
-                detailsNode.append(node);
-            }
-        });
-    },
-    isActive(selection: BaseSelection|null): boolean {
-        return $selectionContainsNodeType(selection, $isDetailsNode);
-    }
-}
-
-export const source: EditorButtonDefinition = {
-    label: 'Source code',
-    icon: sourceIcon,
-    async action(context: EditorUiContext) {
-        const modal = context.manager.createModal('source');
-        const source = await getEditorContentAsHtml(context.editor);
-        modal.show({source});
-    },
-    isActive() {
-        return false;
-    }
-};
-
-export const fullscreen: EditorButtonDefinition = {
-    label: 'Fullscreen',
-    icon: fullscreenIcon,
-    async action(context: EditorUiContext, button: EditorButton) {
-        const isFullScreen = context.containerDOM.classList.contains('fullscreen');
-        context.containerDOM.classList.toggle('fullscreen', !isFullScreen);
-        (context.containerDOM.closest('body') as HTMLElement).classList.toggle('editor-is-fullscreen', !isFullScreen);
-        button.setActiveState(!isFullScreen);
-    },
-    isActive(selection, context: EditorUiContext) {
-        return context.containerDOM.classList.contains('fullscreen');
-    }
-};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
new file mode 100644
index 00000000000..2b441e5da87
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -0,0 +1,61 @@
+import {$getSelection, BaseSelection, ElementFormatType} from "lexical";
+import {$getBlockElementNodesInSelection, $selectionContainsElementFormat} from "../../../helpers";
+import {EditorButtonDefinition} from "../../framework/buttons";
+import alignLeftIcon from "@icons/editor/align-left.svg";
+import {EditorUiContext} from "../../framework/core";
+import alignCenterIcon from "@icons/editor/align-center.svg";
+import alignRightIcon from "@icons/editor/align-right.svg";
+import alignJustifyIcon from "@icons/editor/align-justify.svg";
+
+
+function setAlignmentForSection(alignment: ElementFormatType): void {
+    const selection = $getSelection();
+    const elements = $getBlockElementNodesInSelection(selection);
+    for (const node of elements) {
+        node.setFormat(alignment);
+    }
+}
+
+export const alignLeft: EditorButtonDefinition = {
+    label: 'Align left',
+    icon: alignLeftIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('left'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsElementFormat(selection, 'left');
+    }
+};
+
+export const alignCenter: EditorButtonDefinition = {
+    label: 'Align center',
+    icon: alignCenterIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('center'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsElementFormat(selection, 'center');
+    }
+};
+
+export const alignRight: EditorButtonDefinition = {
+    label: 'Align right',
+    icon: alignRightIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('right'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsElementFormat(selection, 'right');
+    }
+};
+
+export const alignJustify: EditorButtonDefinition = {
+    label: 'Align justify',
+    icon: alignJustifyIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setAlignmentForSection('justify'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsElementFormat(selection, 'justify');
+    }
+};
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
new file mode 100644
index 00000000000..0eb07ecf1f0
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -0,0 +1,85 @@
+import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../../nodes/callout";
+import {EditorButtonDefinition} from "../../framework/buttons";
+import {EditorUiContext} from "../../framework/core";
+import {$selectionContainsNodeType, $toggleSelectionBlockNodeType} from "../../../helpers";
+import {$createParagraphNode, $isParagraphNode, BaseSelection, LexicalNode} from "lexical";
+import {
+    $createHeadingNode,
+    $createQuoteNode,
+    $isHeadingNode,
+    $isQuoteNode,
+    HeadingNode,
+    HeadingTagType
+} from "@lexical/rich-text";
+
+function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
+    return {
+        label: `${name} Callout`,
+        action(context: EditorUiContext) {
+            context.editor.update(() => {
+                $toggleSelectionBlockNodeType(
+                    (node) => $isCalloutNodeOfCategory(node, category),
+                    () => $createCalloutNode(category),
+                )
+            });
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return $selectionContainsNodeType(selection, (node) => $isCalloutNodeOfCategory(node, category));
+        }
+    };
+}
+
+export const infoCallout: EditorButtonDefinition = buildCalloutButton('info', 'Info');
+export const dangerCallout: EditorButtonDefinition = buildCalloutButton('danger', 'Danger');
+export const warningCallout: EditorButtonDefinition = buildCalloutButton('warning', 'Warning');
+export const successCallout: EditorButtonDefinition = buildCalloutButton('success', 'Success');
+
+const isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
+    return $isHeadingNode(node) && (node as HeadingNode).getTag() === tag;
+};
+
+function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefinition {
+    return {
+        label: name,
+        action(context: EditorUiContext) {
+            context.editor.update(() => {
+                $toggleSelectionBlockNodeType(
+                    (node) => isHeaderNodeOfTag(node, tag),
+                    () => $createHeadingNode(tag),
+                )
+            });
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return $selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
+        }
+    };
+}
+
+export const h2: EditorButtonDefinition = buildHeaderButton('h2', 'Large Header');
+export const h3: EditorButtonDefinition = buildHeaderButton('h3', 'Medium Header');
+export const h4: EditorButtonDefinition = buildHeaderButton('h4', 'Small Header');
+export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header');
+
+export const blockquote: EditorButtonDefinition = {
+    label: 'Blockquote',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $toggleSelectionBlockNodeType($isQuoteNode, $createQuoteNode);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isQuoteNode);
+    }
+};
+
+export const paragraph: EditorButtonDefinition = {
+    label: 'Paragraph',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $toggleSelectionBlockNodeType($isParagraphNode, $createParagraphNode);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isParagraphNode);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
new file mode 100644
index 00000000000..ad69d69d13c
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -0,0 +1,81 @@
+import {EditorButton, EditorButtonDefinition} from "../../framework/buttons";
+import undoIcon from "@icons/editor/undo.svg";
+import {EditorUiContext} from "../../framework/core";
+import {
+    BaseSelection,
+    CAN_REDO_COMMAND,
+    CAN_UNDO_COMMAND,
+    COMMAND_PRIORITY_LOW,
+    REDO_COMMAND,
+    UNDO_COMMAND
+} from "lexical";
+import redoIcon from "@icons/editor/redo.svg";
+import sourceIcon from "@icons/editor/source-view.svg";
+import {getEditorContentAsHtml} from "../../../actions";
+import fullscreenIcon from "@icons/editor/fullscreen.svg";
+
+export const undo: EditorButtonDefinition = {
+    label: 'Undo',
+    icon: undoIcon,
+    action(context: EditorUiContext) {
+        context.editor.dispatchCommand(UNDO_COMMAND, undefined);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    },
+    setup(context: EditorUiContext, button: EditorButton) {
+        button.toggleDisabled(true);
+
+        context.editor.registerCommand(CAN_UNDO_COMMAND, (payload: boolean): boolean => {
+            button.toggleDisabled(!payload)
+            return false;
+        }, COMMAND_PRIORITY_LOW);
+    }
+}
+
+export const redo: EditorButtonDefinition = {
+    label: 'Redo',
+    icon: redoIcon,
+    action(context: EditorUiContext) {
+        context.editor.dispatchCommand(REDO_COMMAND, undefined);
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    },
+    setup(context: EditorUiContext, button: EditorButton) {
+        button.toggleDisabled(true);
+
+        context.editor.registerCommand(CAN_REDO_COMMAND, (payload: boolean): boolean => {
+            button.toggleDisabled(!payload)
+            return false;
+        }, COMMAND_PRIORITY_LOW);
+    }
+}
+
+
+export const source: EditorButtonDefinition = {
+    label: 'Source code',
+    icon: sourceIcon,
+    async action(context: EditorUiContext) {
+        const modal = context.manager.createModal('source');
+        const source = await getEditorContentAsHtml(context.editor);
+        modal.show({source});
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const fullscreen: EditorButtonDefinition = {
+    label: 'Fullscreen',
+    icon: fullscreenIcon,
+    async action(context: EditorUiContext, button: EditorButton) {
+        const isFullScreen = context.containerDOM.classList.contains('fullscreen');
+        context.containerDOM.classList.toggle('fullscreen', !isFullScreen);
+        (context.containerDOM.closest('body') as HTMLElement).classList.toggle('editor-is-fullscreen', !isFullScreen);
+        button.setActiveState(!isFullScreen);
+    },
+    isActive(selection, context: EditorUiContext) {
+        return context.containerDOM.classList.contains('fullscreen');
+    }
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
new file mode 100644
index 00000000000..d04f72a2e57
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -0,0 +1,56 @@
+import {$getSelection, $isTextNode, BaseSelection, FORMAT_TEXT_COMMAND, TextFormatType} from "lexical";
+import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../../framework/buttons";
+import {EditorUiContext} from "../../framework/core";
+import {$selectionContainsTextFormat} from "../../../helpers";
+import boldIcon from "@icons/editor/bold.svg";
+import italicIcon from "@icons/editor/italic.svg";
+import underlinedIcon from "@icons/editor/underlined.svg";
+import textColorIcon from "@icons/editor/text-color.svg";
+import highlightIcon from "@icons/editor/highlighter.svg";
+import strikethroughIcon from "@icons/editor/strikethrough.svg";
+import superscriptIcon from "@icons/editor/superscript.svg";
+import subscriptIcon from "@icons/editor/subscript.svg";
+import codeIcon from "@icons/editor/code.svg";
+import formatClearIcon from "@icons/editor/format-clear.svg";
+
+function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
+    return {
+        label: label,
+        icon,
+        action(context: EditorUiContext) {
+            context.editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return $selectionContainsTextFormat(selection, format);
+        }
+    };
+}
+
+export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', boldIcon);
+export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
+export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
+export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
+export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color', icon: highlightIcon};
+
+export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
+export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
+export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript', subscriptIcon);
+export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code', codeIcon);
+export const clearFormating: EditorButtonDefinition = {
+    label: 'Clear formatting',
+    icon: formatClearIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            for (const node of selection?.getNodes() || []) {
+                if ($isTextNode(node)) {
+                    node.setFormat(0);
+                    node.setStyle('');
+                }
+            }
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
new file mode 100644
index 00000000000..ecda290a12c
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -0,0 +1,35 @@
+import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
+import {EditorButtonDefinition} from "../../framework/buttons";
+import {EditorUiContext} from "../../framework/core";
+import {$getSelection, BaseSelection, LexicalNode} from "lexical";
+import {$selectionContainsNodeType} from "../../../helpers";
+import listBulletIcon from "@icons/editor/list-bullet.svg";
+import listNumberedIcon from "@icons/editor/list-numbered.svg";
+import listCheckIcon from "@icons/editor/list-check.svg";
+
+
+function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
+    return {
+        label,
+        icon,
+        action(context: EditorUiContext) {
+            context.editor.getEditorState().read(() => {
+                const selection = $getSelection();
+                if (this.isActive(selection, context)) {
+                    removeList(context.editor);
+                } else {
+                    insertList(context.editor, type);
+                }
+            });
+        },
+        isActive(selection: BaseSelection|null): boolean {
+            return $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
+                return $isListNode(node) && (node as ListNode).getListType() === type;
+            });
+        }
+    };
+}
+
+export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet', listBulletIcon);
+export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number', listNumberedIcon);
+export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check', listCheckIcon);
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
new file mode 100644
index 00000000000..88241e92626
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -0,0 +1,215 @@
+import {EditorButtonDefinition} from "../../framework/buttons";
+import linkIcon from "@icons/editor/link.svg";
+import {EditorUiContext} from "../../framework/core";
+import {
+    $createNodeSelection,
+    $createTextNode,
+    $getRoot,
+    $getSelection,
+    $setSelection,
+    BaseSelection,
+    ElementNode
+} from "lexical";
+import {$getNodeFromSelection, $insertNewBlockNodeAtSelection, $selectionContainsNodeType} from "../../../helpers";
+import {$isLinkNode, LinkNode} from "@lexical/link";
+import unlinkIcon from "@icons/editor/unlink.svg";
+import imageIcon from "@icons/editor/image.svg";
+import {$isImageNode, ImageNode} from "../../../nodes/image";
+import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
+import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../../nodes/horizontal-rule";
+import codeBlockIcon from "@icons/editor/code-block.svg";
+import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../../nodes/code-block";
+import editIcon from "@icons/edit.svg";
+import diagramIcon from "@icons/editor/diagram.svg";
+import {$createDiagramNode, $isDiagramNode, $openDrawingEditorForNode, DiagramNode} from "../../../nodes/diagram";
+import detailsIcon from "@icons/editor/details.svg";
+import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
+
+export const link: EditorButtonDefinition = {
+    label: 'Insert/edit link',
+    icon: linkIcon,
+    action(context: EditorUiContext) {
+        const linkModal = context.manager.createModal('link');
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+
+            let formDefaults = {};
+            if (selectedLink) {
+                formDefaults = {
+                    url: selectedLink.getURL(),
+                    text: selectedLink.getTextContent(),
+                    title: selectedLink.getTitle(),
+                    target: selectedLink.getTarget(),
+                }
+
+                context.editor.update(() => {
+                    const selection = $createNodeSelection();
+                    selection.add(selectedLink.getKey());
+                    $setSelection(selection);
+                });
+            }
+
+            linkModal.show(formDefaults);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isLinkNode);
+    }
+};
+
+export const unlink: EditorButtonDefinition = {
+    label: 'Remove link',
+    icon: unlinkIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = context.lastSelection;
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectionPoints = selection?.getStartEndPoints();
+
+            if (selectedLink) {
+                const newNode = $createTextNode(selectedLink.getTextContent());
+                selectedLink.replace(newNode);
+                if (selectionPoints?.length === 2) {
+                    newNode.select(selectionPoints[0].offset, selectionPoints[1].offset);
+                } else {
+                    newNode.select();
+                }
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return false;
+    }
+};
+
+
+
+export const image: EditorButtonDefinition = {
+    label: 'Insert/Edit Image',
+    icon: imageIcon,
+    action(context: EditorUiContext) {
+        const imageModal = context.manager.createModal('image');
+        const selection = context.lastSelection;
+        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
+
+        context.editor.getEditorState().read(() => {
+            let formDefaults = {};
+            if (selectedImage) {
+                formDefaults = {
+                    src: selectedImage.getSrc(),
+                    alt: selectedImage.getAltText(),
+                    height: selectedImage.getHeight(),
+                    width: selectedImage.getWidth(),
+                }
+
+                context.editor.update(() => {
+                    const selection = $createNodeSelection();
+                    selection.add(selectedImage.getKey());
+                    $setSelection(selection);
+                });
+            }
+
+            imageModal.show(formDefaults);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isImageNode);
+    }
+};
+
+export const horizontalRule: EditorButtonDefinition = {
+    label: 'Insert horizontal line',
+    icon: horizontalRuleIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isHorizontalRuleNode);
+    }
+};
+
+export const codeBlock: EditorButtonDefinition = {
+    label: 'Insert code block',
+    icon: codeBlockIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
+            if (codeBlock === null) {
+                context.editor.update(() => {
+                    const codeBlock = $createCodeBlockNode();
+                    codeBlock.setCode(selection?.getTextContent() || '');
+                    $insertNewBlockNodeAtSelection(codeBlock, true);
+                    $openCodeEditorForNode(context.editor, codeBlock);
+                    codeBlock.selectStart();
+                });
+            } else {
+                $openCodeEditorForNode(context.editor, codeBlock);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isCodeBlockNode);
+    }
+};
+
+export const editCodeBlock: EditorButtonDefinition = Object.assign({}, codeBlock, {
+    label: 'Edit code block',
+    icon: editIcon,
+});
+
+export const diagram: EditorButtonDefinition = {
+    label: 'Insert/edit drawing',
+    icon: diagramIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode|null);
+            if (diagramNode === null) {
+                context.editor.update(() => {
+                    const diagram = $createDiagramNode();
+                    $insertNewBlockNodeAtSelection(diagram, true);
+                    $openDrawingEditorForNode(context, diagram);
+                    diagram.selectStart();
+                });
+            } else {
+                $openDrawingEditorForNode(context, diagramNode);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isDiagramNode);
+    }
+};
+
+
+export const details: EditorButtonDefinition = {
+    label: 'Insert collapsible block',
+    icon: detailsIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            const detailsNode = $createDetailsNode();
+            const selectionNodes = selection?.getNodes() || [];
+            const topLevels = selectionNodes.map(n => n.getTopLevelElement())
+                .filter(n => n !== null) as ElementNode[];
+            const uniqueTopLevels = [...new Set(topLevels)];
+
+            if (uniqueTopLevels.length > 0) {
+                uniqueTopLevels[0].insertAfter(detailsNode);
+            } else {
+                $getRoot().append(detailsNode);
+            }
+
+            for (const node of uniqueTopLevels) {
+                detailsNode.append(node);
+            }
+        });
+    },
+    isActive(selection: BaseSelection|null): boolean {
+        return $selectionContainsNodeType(selection, $isDetailsNode);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
new file mode 100644
index 00000000000..32fa49f88f3
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -0,0 +1,122 @@
+import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../../framework/buttons";
+import tableIcon from "@icons/editor/table.svg";
+import deleteIcon from "@icons/editor/table-delete.svg";
+import deleteColumnIcon from "@icons/editor/table-delete-column.svg";
+import deleteRowIcon from "@icons/editor/table-delete-row.svg";
+import insertColumnAfterIcon from "@icons/editor/table-insert-column-after.svg";
+import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg";
+import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
+import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
+import {EditorUiContext} from "../../framework/core";
+import {$getBlockElementNodesInSelection, $getNodeFromSelection, $getParentOfType} from "../../../helpers";
+import {$getSelection} from "lexical";
+import {$isCustomTableNode, CustomTableNode} from "../../../nodes/custom-table";
+import {
+    $deleteTableColumn, $deleteTableColumn__EXPERIMENTAL,
+    $deleteTableRow__EXPERIMENTAL,
+    $getTableRowIndexFromTableCellNode, $insertTableColumn, $insertTableColumn__EXPERIMENTAL,
+    $insertTableRow, $insertTableRow__EXPERIMENTAL,
+    $isTableCellNode,
+    $isTableRowNode,
+    TableCellNode
+} from "@lexical/table";
+
+
+export const table: EditorBasicButtonDefinition = {
+    label: 'Table',
+    icon: tableIcon,
+};
+
+export const deleteTable: EditorButtonDefinition = {
+    label: 'Delete table',
+    icon: deleteIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const table = $getNodeFromSelection($getSelection(), $isCustomTableNode);
+            if (table) {
+                table.remove();
+            }
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const insertRowAbove: EditorButtonDefinition = {
+    label: 'Insert row above',
+    icon: insertRowAboveIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $insertTableRow__EXPERIMENTAL(false);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const insertRowBelow: EditorButtonDefinition = {
+    label: 'Insert row below',
+    icon: insertRowBelowIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $insertTableRow__EXPERIMENTAL(true);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const deleteRow: EditorButtonDefinition = {
+    label: 'Delete row',
+    icon: deleteRowIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $deleteTableRow__EXPERIMENTAL();
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const insertColumnBefore: EditorButtonDefinition = {
+    label: 'Insert column before',
+    icon: insertColumnBeforeIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $insertTableColumn__EXPERIMENTAL(false);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const insertColumnAfter: EditorButtonDefinition = {
+    label: 'Insert column after',
+    icon: insertColumnAfterIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $insertTableColumn__EXPERIMENTAL(true);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const deleteColumn: EditorButtonDefinition = {
+    label: 'Delete column',
+    icon: deleteColumnIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $deleteTableColumn__EXPERIMENTAL();
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index f728ae48fa5..5dee6b62b41 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -3,7 +3,7 @@ import {
     getCodeToolbarContent,
     getImageToolbarContent,
     getLinkToolbarContent,
-    getMainEditorFullToolbar
+    getMainEditorFullToolbar, getTableToolbarContent
 } from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
@@ -61,6 +61,14 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         content: getCodeToolbarContent(),
     });
 
+    manager.registerContextToolbar('table', {
+        selector: 'td,th',
+        content: getTableToolbarContent(),
+        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
+            return originalTarget.closest('table') as HTMLTableElement;
+        }
+    });
+
     // Register image decorator listener
     manager.registerDecoratorType('image', ImageDecorator);
     manager.registerDecoratorType('code', CodeBlockDecorator);
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index f5eae6b212d..5d40578a5b1 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,17 +1,4 @@
 import {EditorButton} from "./framework/buttons";
-import {
-    alignCenter, alignJustify,
-    alignLeft,
-    alignRight,
-    blockquote, bold, bulletList, clearFormating, code, codeBlock,
-    dangerCallout, details, diagram, editCodeBlock, fullscreen,
-    h2, h3, h4, h5, highlightColor, horizontalRule, image,
-    infoCallout, italic, link, numberList, paragraph,
-    redo, source, strikethrough, subscript,
-    successCallout, superscript, table, taskList, textColor, underline,
-    undo, unlink,
-    warningCallout
-} from "./defaults/button-definitions";
 import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiElement} from "./framework/core";
 import {el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
@@ -21,6 +8,48 @@ import {EditorColorPicker} from "./framework/blocks/color-picker";
 import {EditorTableCreator} from "./framework/blocks/table-creator";
 import {EditorColorButton} from "./framework/blocks/color-button";
 import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
+import {
+    deleteColumn,
+    deleteRow,
+    deleteTable, insertColumnAfter,
+    insertColumnBefore,
+    insertRowAbove,
+    insertRowBelow,
+    table
+} from "./defaults/buttons/tables";
+import {fullscreen, redo, source, undo} from "./defaults/buttons/controls";
+import {
+    blockquote, dangerCallout,
+    h2,
+    h3,
+    h4,
+    h5,
+    infoCallout,
+    paragraph,
+    successCallout,
+    warningCallout
+} from "./defaults/buttons/block-formats";
+import {
+    bold, clearFormating, code,
+    highlightColor,
+    italic,
+    strikethrough, subscript,
+    superscript,
+    textColor,
+    underline
+} from "./defaults/buttons/inline-formats";
+import {alignCenter, alignJustify, alignLeft, alignRight} from "./defaults/buttons/alignments";
+import {bulletList, numberList, taskList} from "./defaults/buttons/lists";
+import {
+    codeBlock,
+    details,
+    diagram,
+    editCodeBlock,
+    horizontalRule,
+    image,
+    link,
+    unlink
+} from "./defaults/buttons/objects";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -129,4 +158,23 @@ export function getCodeToolbarContent(): EditorUiElement[] {
     return [
         new EditorButton(editCodeBlock),
     ];
+}
+
+export function getTableToolbarContent(): EditorUiElement[] {
+    return [
+        new EditorOverflowContainer(2, [
+            // Todo - Table properties
+            new EditorButton(deleteTable),
+        ]),
+        new EditorOverflowContainer(3, [
+            new EditorButton(insertRowAbove),
+            new EditorButton(insertRowBelow),
+            new EditorButton(deleteRow),
+        ]),
+        new EditorOverflowContainer(3, [
+            new EditorButton(insertColumnBefore),
+            new EditorButton(insertColumnAfter),
+            new EditorButton(deleteColumn),
+        ]),
+    ];
 }
\ No newline at end of file

From c31f8eb2e0e42cda136ad182ba4dbabe62ecbd33 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 22 Jul 2024 16:51:56 +0100
Subject: [PATCH 214/666] Readme: Added route4me sponsorship

---
 readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/readme.md b/readme.md
index 7c68d7ec607..3f38d52c542 100644
--- a/readme.md
+++ b/readme.md
@@ -85,6 +85,11 @@ Big thanks to these companies for supporting the project.
 <td align="center"><a href="https://transporttalent.com" target="_blank">
     <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
 </a></td>
+</tr>
+<tr>
+<td colspan="2" align="center"><a href="https://route4me.com/" target="_blank">
+    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
+</a></td>
 </tr></tbody></table>
 
 ## 🛠️ Development & Testing

From 2cab778f19be477beebdada5096d6b945d84596a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 23 Jul 2024 12:45:58 +0100
Subject: [PATCH 215/666] Lexical: Improved table resize bars

Added scoll & page resize handling.
Added cropping/limiting to edit area.
---
 resources/js/wysiwyg/index.ts                 |  2 +-
 resources/js/wysiwyg/todo.md                  |  4 +-
 .../ui/framework/helpers/table-resizer.ts     | 48 +++++++++++++++----
 resources/js/wysiwyg/ui/framework/manager.ts  |  1 +
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 5f131df5725..469738e7fed 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -44,7 +44,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
-        registerTableResizer(editor, editArea),
+        registerTableResizer(editor, editWrap),
     );
 
     setEditorContentFromHtml(editor, htmlContent);
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 7b958819471..e39a4c655fe 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -36,5 +36,5 @@
 ## Bugs
 
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
-- Table resize bars often floating around in wrong place, and shows on hover or interrupts mouse actions.
-- Removing link around image via button deletes image, not just link 
\ No newline at end of file
+- Removing link around image via button deletes image, not just link 
+- `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 8f1e978e9dc..2d995883a5b 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -8,7 +8,7 @@ type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
 class TableResizer {
     protected editor: LexicalEditor;
-    protected editArea: HTMLElement;
+    protected editScrollContainer: HTMLElement;
     protected markerDom: MarkerDomRecord|null = null;
     protected mouseTracker: MouseDragTracker|null = null;
     protected dragging: boolean = false;
@@ -16,15 +16,17 @@ class TableResizer {
     protected xMarkerAtStart : boolean = false;
     protected yMarkerAtStart : boolean = false;
 
-    constructor(editor: LexicalEditor, editArea: HTMLElement) {
+    constructor(editor: LexicalEditor, editScrollContainer: HTMLElement) {
         this.editor = editor;
-        this.editArea = editArea;
+        this.editScrollContainer = editScrollContainer;
 
         this.setupListeners();
     }
 
     teardown() {
-        this.editArea.removeEventListener('mousemove', this.onCellMouseMove);
+        this.editScrollContainer.removeEventListener('mousemove', this.onCellMouseMove);
+        window.removeEventListener('scroll', this.onScrollOrResize, {capture: true});
+        window.removeEventListener('resize', this.onScrollOrResize);
         if (this.mouseTracker) {
             this.mouseTracker.teardown();
         }
@@ -32,7 +34,14 @@ class TableResizer {
 
     protected setupListeners() {
         this.onCellMouseMove = this.onCellMouseMove.bind(this);
-        this.editArea.addEventListener('mousemove', this.onCellMouseMove);
+        this.onScrollOrResize = this.onScrollOrResize.bind(this);
+        this.editScrollContainer.addEventListener('mousemove', this.onCellMouseMove);
+        window.addEventListener('scroll', this.onScrollOrResize, {capture: true, passive: true});
+        window.addEventListener('resize', this.onScrollOrResize, {passive: true});
+    }
+
+    protected onScrollOrResize(): void {
+        this.updateCurrentMarkerTargetPosition();
     }
 
     protected onCellMouseMove(event: MouseEvent) {
@@ -58,14 +67,33 @@ class TableResizer {
         const markers: MarkerDomRecord = this.getMarkers();
         const table = cell.closest('table') as HTMLElement;
         const tableRect = table.getBoundingClientRect();
+        const editBounds = this.editScrollContainer.getBoundingClientRect();
 
+        const maxTop = Math.max(tableRect.top, editBounds.top);
+        const maxBottom = Math.min(tableRect.bottom, editBounds.bottom);
+        const maxHeight = maxBottom - maxTop;
         markers.x.style.left = xPos + 'px';
-        markers.x.style.height = tableRect.height + 'px';
-        markers.x.style.top = tableRect.top + 'px';
+        markers.x.style.top = maxTop + 'px';
+        markers.x.style.height = maxHeight + 'px';
 
         markers.y.style.top = yPos + 'px';
         markers.y.style.left = tableRect.left + 'px';
         markers.y.style.width = tableRect.width + 'px';
+
+        // Hide markers when out of bounds
+        markers.y.hidden = yPos < editBounds.top || yPos > editBounds.bottom;
+        markers.x.hidden = tableRect.top > editBounds.bottom || tableRect.bottom < editBounds.top;
+    }
+
+    protected updateCurrentMarkerTargetPosition(): void {
+        if (!this.targetCell) {
+            return;
+        }
+
+        const rect = this.targetCell.getBoundingClientRect();
+        const xMarkerPos = this.xMarkerAtStart ? rect.left : rect.right;
+        const yMarkerPos = this.yMarkerAtStart ? rect.top : rect.bottom;
+        this.updateMarkersTo(this.targetCell, xMarkerPos, yMarkerPos);
     }
 
     protected getMarkers(): MarkerDomRecord {
@@ -77,7 +105,7 @@ class TableResizer {
             const wrapper = el('div', {
                 class: 'editor-table-marker-wrap',
             }, [this.markerDom.x, this.markerDom.y]);
-            this.editArea.after(wrapper);
+            this.editScrollContainer.after(wrapper);
             this.watchMarkerMouseDrags(wrapper);
         }
 
@@ -180,8 +208,8 @@ class TableResizer {
 }
 
 
-export function registerTableResizer(editor: LexicalEditor, editorArea: HTMLElement): (() => void) {
-    const resizer = new TableResizer(editor, editorArea);
+export function registerTableResizer(editor: LexicalEditor, editScrollContainer: HTMLElement): (() => void) {
+    const resizer = new TableResizer(editor, editScrollContainer);
 
     return () => {
         resizer.teardown();
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 29d95991075..c0357c3ea80 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -175,6 +175,7 @@ export class EditorUIManager {
     protected setupEditor(editor: LexicalEditor) {
         // Update button states on editor selection change
         editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
+            console.log('select change', arguments);
             this.triggerStateUpdate({
                 editor: editor,
                 selection: $getSelection(),

From 76b0d2d5d85a742aaa1aa2b6fd96a9a9ec661a7f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 23 Jul 2024 15:35:18 +0100
Subject: [PATCH 216/666] Lexical: Added common events support

---
 resources/js/services/events.ts       |  4 +-
 resources/js/wysiwyg/actions.ts       | 79 +++++++++++++++++++++++----
 resources/js/wysiwyg/common-events.ts | 43 +++++++++++++++
 resources/js/wysiwyg/index.ts         |  3 +
 resources/js/wysiwyg/todo.md          |  1 -
 5 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 resources/js/wysiwyg/common-events.ts

diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index 7d72a9f1af5..32c70f5a84b 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -1,7 +1,7 @@
 import {HttpError} from "./http";
 
 export class EventManager {
-    protected listeners: Record<string, ((data: {}) => void)[]> = {};
+    protected listeners: Record<string, ((data: any) => void)[]> = {};
     protected stack: {name: string, data: {}}[] = [];
 
     /**
@@ -19,7 +19,7 @@ export class EventManager {
     /**
      * Listen to a custom event and run the given callback when that event occurs.
      */
-    listen(eventName: string, callback: (data: {}) => void): void {
+    listen<T>(eventName: string, callback: (data: T) => void): void {
         if (typeof this.listeners[eventName] === 'undefined') this.listeners[eventName] = [];
         this.listeners[eventName].push(callback);
     }
diff --git a/resources/js/wysiwyg/actions.ts b/resources/js/wysiwyg/actions.ts
index 3a32b82d861..0e220252567 100644
--- a/resources/js/wysiwyg/actions.ts
+++ b/resources/js/wysiwyg/actions.ts
@@ -1,13 +1,30 @@
-import {$createParagraphNode, $getRoot, $isTextNode, LexicalEditor} from "lexical";
+import {$getRoot, $getSelection, $isTextNode, LexicalEditor, LexicalNode, RootNode} from "lexical";
 import {$generateHtmlFromNodes, $generateNodesFromDOM} from "@lexical/html";
 import {$createCustomParagraphNode} from "./nodes/custom-paragraph";
 
+function htmlToDom(html: string): Document {
+    const parser = new DOMParser();
+    return parser.parseFromString(html, 'text/html');
+}
+
+function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
+    return nodes.map(node => {
+        if ($isTextNode(node)) {
+            const paragraph = $createCustomParagraphNode();
+            paragraph.append(node);
+            return paragraph;
+        }
+        return node;
+    });
+}
+
+function appendNodesToRoot(root: RootNode, nodes: LexicalNode[]) {
+    root.append(...wrapTextNodes(nodes));
+}
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
-    const parser = new DOMParser();
-    const dom = parser.parseFromString(html, 'text/html');
+    const dom = htmlToDom(html);
 
-    console.log(html);
     editor.update(() => {
         // Empty existing
         const root = $getRoot();
@@ -16,18 +33,52 @@ export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
         }
 
         const nodes = $generateNodesFromDOM(editor, dom);
+        root.append(...wrapTextNodes(nodes));
+    });
+}
+
+export function appendHtmlToEditor(editor: LexicalEditor, html: string) {
+    const dom = htmlToDom(html);
 
-        // Wrap top-level text nodes
-        for (let i = 0; i < nodes.length; i++) {
-            const node = nodes[i];
-            if ($isTextNode(node)) {
-                const paragraph = $createCustomParagraphNode();
-                paragraph.append(node);
-                nodes[i] = paragraph;
+    editor.update(() => {
+        const root = $getRoot();
+        const nodes = $generateNodesFromDOM(editor, dom);
+        root.append(...wrapTextNodes(nodes));
+    });
+}
+
+export function prependHtmlToEditor(editor: LexicalEditor, html: string) {
+    const dom = htmlToDom(html);
+
+    editor.update(() => {
+        const root = $getRoot();
+        const nodes = wrapTextNodes($generateNodesFromDOM(editor, dom));
+        let reference = root.getChildren()[0];
+        for (let i = nodes.length - 1; i >= 0; i--) {
+            if (reference) {
+                reference.insertBefore(nodes[i]);
+            } else {
+                root.append(nodes[i])
             }
+            reference = nodes[i];
         }
+    });
+}
+
+export function insertHtmlIntoEditor(editor: LexicalEditor, html: string) {
+    const dom = htmlToDom(html);
+    editor.update(() => {
+        const selection = $getSelection();
+        const nodes = wrapTextNodes($generateNodesFromDOM(editor, dom));
 
-        root.append(...nodes);
+        const reference = selection?.getNodes()[0];
+        const referencesParents = reference?.getParents() || [];
+        const topLevel = referencesParents[referencesParents.length - 1];
+        if (topLevel && reference) {
+            for (let i = nodes.length - 1; i >= 0; i--) {
+                reference.insertAfter(nodes[i]);
+            }
+        }
     });
 }
 
@@ -38,4 +89,8 @@ export function getEditorContentAsHtml(editor: LexicalEditor): Promise<string> {
             resolve(html);
         });
     });
+}
+
+export function focusEditor(editor: LexicalEditor) {
+    editor.focus(() => {}, {defaultSelection: "rootStart"});
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/common-events.ts b/resources/js/wysiwyg/common-events.ts
new file mode 100644
index 00000000000..7355d977ba6
--- /dev/null
+++ b/resources/js/wysiwyg/common-events.ts
@@ -0,0 +1,43 @@
+import {LexicalEditor} from "lexical";
+import {
+    appendHtmlToEditor,
+    focusEditor,
+    insertHtmlIntoEditor,
+    prependHtmlToEditor,
+    setEditorContentFromHtml
+} from "./actions";
+
+type EditorEventContent = {
+    html: string;
+    markdown: string;
+};
+
+function getContentToInsert(eventContent: EditorEventContent): string {
+    return eventContent.html || '';
+}
+
+export function listen(editor: LexicalEditor): void {
+    window.$events.listen<EditorEventContent>('editor::replace', eventContent => {
+        const html = getContentToInsert(eventContent);
+        setEditorContentFromHtml(editor, html);
+    });
+
+    window.$events.listen<EditorEventContent>('editor::append', eventContent => {
+        const html = getContentToInsert(eventContent);
+        appendHtmlToEditor(editor, html);
+    });
+
+    window.$events.listen<EditorEventContent>('editor::prepend', eventContent => {
+        const html = getContentToInsert(eventContent);
+        prependHtmlToEditor(editor, html);
+    });
+
+    window.$events.listen<EditorEventContent>('editor::insert', eventContent => {
+        const html = getContentToInsert(eventContent);
+        insertHtmlIntoEditor(editor, html);
+    });
+
+    window.$events.listen<EditorEventContent>('editor::focus', () => {
+        focusEditor(editor);
+    });
+}
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 469738e7fed..e53b9b057dd 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -8,6 +8,7 @@ import {getEditorContentAsHtml, setEditorContentFromHtml} from "./actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {el} from "./helpers";
 import {EditorUiContext} from "./ui/framework/core";
+import {listen as listenToCommonEvents} from "./common-events";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -47,6 +48,8 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerTableResizer(editor, editWrap),
     );
 
+    listenToCommonEvents(editor);
+
     setEditorContentFromHtml(editor, htmlContent);
 
     const debugView = document.getElementById('lexical-debug');
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index e39a4c655fe..c62a6e52462 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -21,7 +21,6 @@
 - Table features
 - Image paste upload
 - Keyboard shortcuts support
-- Global/shared editor events support
 - Draft/change management (connect with page editor component)
 - Add ID support to all block types
 - Template drag & drop / insert

From f284d31861057dfdb575400b965e99e02cbf8cf7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 25 Jul 2024 16:25:08 +0100
Subject: [PATCH 217/666] Lexical: Started media node support

---
 resources/icons/editor/media.svg              |   1 +
 resources/js/wysiwyg/nodes/index.ts           |   5 +-
 resources/js/wysiwyg/nodes/media.ts           | 215 ++++++++++++++++++
 resources/js/wysiwyg/todo.md                  |  13 +-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |  55 +++--
 .../wysiwyg/ui/defaults/form-definitions.ts   |  50 ++++
 resources/js/wysiwyg/ui/index.ts              |   6 +-
 resources/js/wysiwyg/ui/toolbars.ts           |   5 +-
 8 files changed, 320 insertions(+), 30 deletions(-)
 create mode 100644 resources/icons/editor/media.svg
 create mode 100644 resources/js/wysiwyg/nodes/media.ts

diff --git a/resources/icons/editor/media.svg b/resources/icons/editor/media.svg
new file mode 100644
index 00000000000..0c4feea4c40
--- /dev/null
+++ b/resources/icons/editor/media.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m380-300 280-180-280-180v360ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm0-560v560-560Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index a2c73957687..669ffe6ddc9 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,10 +1,8 @@
 import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {CalloutNode} from './callout';
 import {
-    $getNodeByKey,
     ElementNode,
     KlassConstructor,
-    LexicalEditor,
     LexicalNode,
     LexicalNodeReplacement, NodeMutation,
     ParagraphNode
@@ -19,8 +17,8 @@ import {CustomTableNode} from "./custom-table";
 import {HorizontalRuleNode} from "./horizontal-rule";
 import {CodeBlockNode} from "./code-block";
 import {DiagramNode} from "./diagram";
-import {EditorUIManager} from "../ui/framework/manager";
 import {EditorUiContext} from "../ui/framework/core";
+import {MediaNode} from "./media";
 
 /**
  * Load the nodes for lexical.
@@ -40,6 +38,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         DetailsNode, SummaryNode,
         CodeBlockNode,
         DiagramNode,
+        MediaNode,
         CustomParagraphNode,
         LinkNode,
         {
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
new file mode 100644
index 00000000000..e0c1b31412f
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -0,0 +1,215 @@
+import {
+    DOMConversion,
+    DOMConversionMap, DOMConversionOutput,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode,
+    SerializedElementNode, Spread
+} from 'lexical';
+import type {EditorConfig} from "lexical/LexicalEditor";
+import {el} from "../helpers";
+
+export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
+export type MediaNodeSource = {
+    src: string;
+    type: string;
+};
+
+export type SerializedMediaNode = Spread<{
+    tag: MediaNodeTag;
+    attributes: Record<string, string>;
+    sources: MediaNodeSource[];
+}, SerializedElementNode>
+
+const attributeAllowList = [
+    'id', 'width', 'height', 'style', 'title', 'name',
+    'src', 'allow', 'allowfullscreen', 'loading', 'sandbox',
+    'type', 'data', 'controls', 'autoplay', 'controlslist', 'loop',
+    'muted', 'playsinline', 'poster', 'preload'
+];
+
+function filterAttributes(attributes: Record<string, string>): Record<string, string> {
+    const filtered: Record<string, string> = {};
+    for (const key in Object.keys(attributes)) {
+        if (attributeAllowList.includes(key)) {
+            filtered[key] = attributes[key];
+        }
+    }
+    return filtered;
+}
+
+function domElementToNode(tag: MediaNodeTag, element: Element): MediaNode {
+    const node = $createMediaNode(tag);
+
+    const attributes: Record<string, string> = {};
+    for (const attribute of element.attributes) {
+        attributes[attribute.name] = attribute.value;
+    }
+    node.setAttributes(attributes);
+
+    const sources: MediaNodeSource[] = [];
+    if (tag === 'video' || tag === 'audio') {
+        for (const child of element.children) {
+            if (child.tagName === 'SOURCE') {
+                const src = child.getAttribute('src');
+                const type = child.getAttribute('type');
+                if (src && type) {
+                    sources.push({ src, type });
+                }
+            }
+        }
+        node.setSources(sources);
+    }
+
+    return node;
+}
+
+export class MediaNode extends ElementNode {
+
+    __tag: MediaNodeTag;
+    __attributes: Record<string, string> = {};
+    __sources: MediaNodeSource[] = [];
+
+    static getType() {
+        return 'media';
+    }
+
+    static clone(node: MediaNode) {
+        return new MediaNode(node.__tag, node.__key);
+    }
+
+    constructor(tag: MediaNodeTag, key?: string) {
+        super(key);
+        this.__tag = tag;
+    }
+
+    setTag(tag: MediaNodeTag) {
+        const self = this.getWritable();
+        self.__tag = tag;
+    }
+
+    getTag(): MediaNodeTag {
+        const self = this.getLatest();
+        return self.__tag;
+    }
+
+    setAttributes(attributes: Record<string, string>) {
+        const self = this.getWritable();
+        self.__attributes = filterAttributes(attributes);
+    }
+
+    getAttributes(): Record<string, string> {
+        const self = this.getLatest();
+        return self.__attributes;
+    }
+
+    setSources(sources: MediaNodeSource[]) {
+        const self = this.getWritable();
+        self.__sources = sources;
+    }
+
+    getSources(): MediaNodeSource[] {
+        const self = this.getLatest();
+        return self.__sources;
+    }
+
+    setSrc(src: string): void {
+        const attrs = Object.assign({}, this.getAttributes());
+        if (this.__tag ==='object') {
+            attrs.data = src;
+        } else {
+            attrs.src = src;
+        }
+        this.setAttributes(attrs);
+    }
+
+    setWidthAndHeight(width: string, height: string): void {
+        const attrs = Object.assign(
+            {},
+            this.getAttributes(),
+            {width, height},
+        );
+        this.setAttributes(attrs);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        const sources = (this.__tag === 'video' || this.__tag === 'audio') ? this.__sources : [];
+        const sourceEls = sources.map(source => el('source', source));
+
+        return el(this.__tag, this.__attributes, sourceEls);
+    }
+
+    updateDOM(prevNode: unknown, dom: HTMLElement) {
+        return true;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+
+        const buildConverter = (tag: MediaNodeTag) => {
+            return (node: HTMLElement): DOMConversion|null => {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        return {
+                            node: domElementToNode(tag, element),
+                        };
+                    },
+                    priority: 3,
+                };
+            };
+        };
+
+        return {
+            iframe: buildConverter('iframe'),
+            embed: buildConverter('embed'),
+            object: buildConverter('object'),
+            video: buildConverter('video'),
+            audio: buildConverter('audio'),
+        };
+    }
+
+    exportJSON(): SerializedMediaNode {
+        return {
+            ...super.exportJSON(),
+            type: 'callout',
+            version: 1,
+            tag: this.__tag,
+            attributes: this.__attributes,
+            sources: this.__sources,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedMediaNode): MediaNode {
+        return $createMediaNode(serializedNode.tag);
+    }
+
+}
+
+export function $createMediaNode(tag: MediaNodeTag) {
+    return new MediaNode(tag);
+}
+
+export function $createMediaNodeFromHtml(html: string): MediaNode | null {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(`<body>${html}</body>`, 'text/html');
+
+    const el = doc.body.children[0];
+    if (!el) {
+        return null;
+    }
+
+    const tag = el.tagName.toLowerCase();
+    const validTypes = ['embed', 'iframe', 'video', 'audio', 'object'];
+    if (!validTypes.includes(tag)) {
+        return null;
+    }
+
+    return domElementToNode(tag as MediaNodeTag, el);
+}
+
+export function $isMediaNode(node: LexicalNode | null | undefined) {
+    return node instanceof MediaNode;
+}
+
+export function $isMediaNodeOfTag(node: LexicalNode | null | undefined, tag: MediaNodeTag) {
+    return node instanceof MediaNode && (node as MediaNode).getTag() === tag;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index c62a6e52462..cd36f359ef1 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,17 +2,7 @@
 
 ## In progress
 
-- Add Type: Video/media/embed
-    - TinyMce media embed supported:
-      - iframe
-      - embed
-      - object
-      - video - Can take sources
-      - audio  - Can take sources
-    - Pretty much all attributes look like they were supported.
-    - Core old logic seen here: https://github.com/tinymce/tinymce/blob/main/modules/tinymce/src/plugins/media/main/ts/core/DataToHtml.ts
-    - Copy/store attributes on node based on allow list?
-      - width, height, src, controls, etc... Take valid values from MDN
+- Finish initial media node & form integration
 
 ## Main Todo
 
@@ -31,6 +21,7 @@
 - Image gallery integration for insert
 - Image gallery integration for form
 - Drawing gallery integration
+- Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 
 ## Bugs
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 88241e92626..3c14052baa4 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -23,7 +23,9 @@ import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
 import {$createDiagramNode, $isDiagramNode, $openDrawingEditorForNode, DiagramNode} from "../../../nodes/diagram";
 import detailsIcon from "@icons/editor/details.svg";
+import mediaIcon from "@icons/editor/media.svg";
 import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
+import {$isMediaNode, MediaNode} from "../../../nodes/media";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
@@ -32,7 +34,7 @@ export const link: EditorButtonDefinition = {
         const linkModal = context.manager.createModal('link');
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode | null;
 
             let formDefaults = {};
             if (selectedLink) {
@@ -53,7 +55,7 @@ export const link: EditorButtonDefinition = {
             linkModal.show(formDefaults);
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isLinkNode);
     }
 };
@@ -64,7 +66,7 @@ export const unlink: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.update(() => {
             const selection = context.lastSelection;
-            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;
+            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode | null;
             const selectionPoints = selection?.getStartEndPoints();
 
             if (selectedLink) {
@@ -78,20 +80,19 @@ export const unlink: EditorButtonDefinition = {
             }
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return false;
     }
 };
 
 
-
 export const image: EditorButtonDefinition = {
     label: 'Insert/Edit Image',
     icon: imageIcon,
     action(context: EditorUiContext) {
         const imageModal = context.manager.createModal('image');
         const selection = context.lastSelection;
-        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode|null;
+        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode | null;
 
         context.editor.getEditorState().read(() => {
             let formDefaults = {};
@@ -113,7 +114,7 @@ export const image: EditorButtonDefinition = {
             imageModal.show(formDefaults);
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isImageNode);
     }
 };
@@ -126,7 +127,7 @@ export const horizontalRule: EditorButtonDefinition = {
             $insertNewBlockNodeAtSelection($createHorizontalRuleNode(), false);
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isHorizontalRuleNode);
     }
 };
@@ -137,7 +138,7 @@ export const codeBlock: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode|null);
+            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode | null);
             if (codeBlock === null) {
                 context.editor.update(() => {
                     const codeBlock = $createCodeBlockNode();
@@ -151,7 +152,7 @@ export const codeBlock: EditorButtonDefinition = {
             }
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isCodeBlockNode);
     }
 };
@@ -167,7 +168,7 @@ export const diagram: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
-            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode|null);
+            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode | null);
             if (diagramNode === null) {
                 context.editor.update(() => {
                     const diagram = $createDiagramNode();
@@ -180,11 +181,39 @@ export const diagram: EditorButtonDefinition = {
             }
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isDiagramNode);
     }
 };
 
+export const media: EditorButtonDefinition = {
+    label: 'Insert/edit Media',
+    icon: mediaIcon,
+    action(context: EditorUiContext) {
+        const mediaModal = context.manager.createModal('media');
+
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const selectedNode = $getNodeFromSelection(selection, $isMediaNode) as MediaNode | null;
+
+            let formDefaults = {};
+            if (selectedNode) {
+                const nodeAttrs = selectedNode.getAttributes();
+                formDefaults = {
+                    src: nodeAttrs.src || nodeAttrs.data || '',
+                    width: nodeAttrs.width,
+                    height: nodeAttrs.height,
+                    embed: '',
+                }
+            }
+
+            mediaModal.show(formDefaults);
+        });
+    },
+    isActive(selection: BaseSelection | null): boolean {
+        return $selectionContainsNodeType(selection, $isMediaNode);
+    }
+};
 
 export const details: EditorButtonDefinition = {
     label: 'Insert collapsible block',
@@ -209,7 +238,7 @@ export const details: EditorButtonDefinition = {
             }
         });
     },
-    isActive(selection: BaseSelection|null): boolean {
+    isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isDetailsNode);
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index 04147a4f057..e0459b5c556 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -4,6 +4,7 @@ import {$createLinkNode} from "@lexical/link";
 import {$createTextNode, $getSelection} from "lexical";
 import {$createImageNode} from "../../nodes/image";
 import {setEditorContentFromHtml} from "../../actions";
+import {$createMediaNodeFromHtml} from "../../nodes/media";
 
 
 export const link: EditorFormDefinition = {
@@ -89,6 +90,55 @@ export const image: EditorFormDefinition = {
     ],
 };
 
+export const media: EditorFormDefinition = {
+    submitText: 'Save',
+    action(formData, context: EditorUiContext) {
+
+        // TODO - Get media from selection
+
+        const embedCode = (formData.get('embed') || '').toString().trim();
+        if (embedCode) {
+            context.editor.update(() => {
+                const node = $createMediaNodeFromHtml(embedCode);
+                // TODO - Replace existing or insert new
+            });
+
+            return true;
+        }
+
+        const src = (formData.get('src') || '').toString().trim();
+        const height = (formData.get('height') || '').toString().trim();
+        const width = (formData.get('width') || '').toString().trim();
+
+        // TODO - Update existing or insert new
+
+        return true;
+    },
+    fields: [
+        {
+            label: 'Source',
+            name: 'src',
+            type: 'text',
+        },
+        {
+            label: 'Width',
+            name: 'width',
+            type: 'text',
+        },
+        {
+            label: 'Height',
+            name: 'height',
+            type: 'text',
+        },
+        // TODO - Tabbed interface to separate this option
+        {
+            label: 'Paste your embed code below:',
+            name: 'embed',
+            type: 'textarea',
+        },
+    ],
+};
+
 export const source: EditorFormDefinition = {
     submitText: 'Save',
     action(formData, context: EditorUiContext) {
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 5dee6b62b41..a3f150e529e 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,7 +6,7 @@ import {
     getMainEditorFullToolbar, getTableToolbarContent
 } from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
+import {image as imageFormDefinition, link as linkFormDefinition, media as mediaFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
@@ -38,6 +38,10 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         title: 'Insert/Edit Image',
         form: imageFormDefinition
     });
+    manager.registerModal('media', {
+        title: 'Insert/Edit Media',
+        form: mediaFormDefinition,
+    });
     manager.registerModal('source', {
         title: 'Source code',
         form: sourceFormDefinition,
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 5d40578a5b1..ae6a292a271 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -47,7 +47,7 @@ import {
     editCodeBlock,
     horizontalRule,
     image,
-    link,
+    link, media,
     unlink
 } from "./defaults/buttons/objects";
 
@@ -110,7 +110,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Insert types
-        new EditorOverflowContainer(6, [
+        new EditorOverflowContainer(8, [
             new EditorButton(link),
             new EditorDropdownButton(table, false, [
                 new EditorTableCreator(),
@@ -119,6 +119,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(horizontalRule),
             new EditorButton(codeBlock),
             new EditorButton(diagram),
+            new EditorButton(media),
             new EditorButton(details),
         ]),
 

From c8f6b7e0d655562aa143ad7c3e82c560b376e74b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 27 Jul 2024 17:25:30 +0100
Subject: [PATCH 218/666] Lexical: Got media node core work & form done

---
 resources/js/wysiwyg/nodes/media.ts           | 23 +++++++++-
 resources/js/wysiwyg/todo.md                  |  3 +-
 .../wysiwyg/ui/defaults/form-definitions.ts   | 43 +++++++++++++------
 resources/js/wysiwyg/ui/framework/forms.ts    |  2 +-
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index e0c1b31412f..751f420fa50 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -30,7 +30,7 @@ const attributeAllowList = [
 
 function filterAttributes(attributes: Record<string, string>): Record<string, string> {
     const filtered: Record<string, string> = {};
-    for (const key in Object.keys(attributes)) {
+    for (const key of Object.keys(attributes)) {
         if (attributeAllowList.includes(key)) {
             filtered[key] = attributes[key];
         }
@@ -170,7 +170,7 @@ export class MediaNode extends ElementNode {
     exportJSON(): SerializedMediaNode {
         return {
             ...super.exportJSON(),
-            type: 'callout',
+            type: 'media',
             version: 1,
             tag: this.__tag,
             attributes: this.__attributes,
@@ -206,6 +206,25 @@ export function $createMediaNodeFromHtml(html: string): MediaNode | null {
     return domElementToNode(tag as MediaNodeTag, el);
 }
 
+const videoExtensions = ['mp4', 'mpeg', 'm4v', 'm4p', 'mov'];
+const audioExtensions = ['3gp', 'aac', 'flac', 'mp3', 'm4a', 'ogg', 'wav', 'webm'];
+const iframeExtensions = ['html', 'htm', 'php', 'asp', 'aspx'];
+
+export function $createMediaNodeFromSrc(src: string): MediaNode {
+    let nodeTag: MediaNodeTag = 'iframe';
+    const srcEnd = src.split('?')[0].split('/').pop() || '';
+    const extension = (srcEnd.split('.').pop() || '').toLowerCase();
+    if (videoExtensions.includes(extension)) {
+        nodeTag = 'video';
+    } else if (audioExtensions.includes(extension)) {
+        nodeTag = 'audio';
+    } else if (extension && !iframeExtensions.includes(extension)) {
+        nodeTag = 'embed';
+    }
+
+    return new MediaNode(nodeTag);
+}
+
 export function $isMediaNode(node: LexicalNode | null | undefined) {
     return node instanceof MediaNode;
 }
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index cd36f359ef1..2125aa25878 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,8 @@
 
 ## In progress
 
-- Finish initial media node & form integration
+- Update forms to allow panels (Media)
+  - Will be used for table forms also. 
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index e0459b5c556..a2242c33873 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -1,15 +1,17 @@
 import {EditorFormDefinition, EditorSelectFormFieldDefinition} from "../framework/forms";
 import {EditorUiContext} from "../framework/core";
 import {$createLinkNode} from "@lexical/link";
-import {$createTextNode, $getSelection} from "lexical";
+import {$createTextNode, $getSelection, LexicalNode} from "lexical";
 import {$createImageNode} from "../../nodes/image";
 import {setEditorContentFromHtml} from "../../actions";
-import {$createMediaNodeFromHtml} from "../../nodes/media";
+import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../nodes/media";
+import {$getNodeFromSelection} from "../../helpers";
+import {$insertNodeToNearestRoot} from "@lexical/utils";
 
 
 export const link: EditorFormDefinition = {
     submitText: 'Apply',
-    action(formData, context: EditorUiContext) {
+    async action(formData, context: EditorUiContext) {
         context.editor.update(() => {
 
             const selection = $getSelection();
@@ -54,7 +56,7 @@ export const link: EditorFormDefinition = {
 
 export const image: EditorFormDefinition = {
     submitText: 'Apply',
-    action(formData, context: EditorUiContext) {
+    async action(formData, context: EditorUiContext) {
         context.editor.update(() => {
             const selection = $getSelection();
             const imageNode = $createImageNode(formData.get('src')?.toString() || '', {
@@ -92,25 +94,40 @@ export const image: EditorFormDefinition = {
 
 export const media: EditorFormDefinition = {
     submitText: 'Save',
-    action(formData, context: EditorUiContext) {
-
-        // TODO - Get media from selection
+    async action(formData, context: EditorUiContext) {
+        const selectedNode: MediaNode|null = await (new Promise((res, rej) => {
+            context.editor.getEditorState().read(() => {
+                const node = $getNodeFromSelection($getSelection(), $isMediaNode);
+                res(node as MediaNode|null);
+            });
+        }));
 
         const embedCode = (formData.get('embed') || '').toString().trim();
         if (embedCode) {
             context.editor.update(() => {
                 const node = $createMediaNodeFromHtml(embedCode);
-                // TODO - Replace existing or insert new
+                if (selectedNode && node) {
+                    selectedNode.replace(node)
+                } else if (node) {
+                    $insertNodeToNearestRoot(node);
+                }
             });
 
             return true;
         }
 
-        const src = (formData.get('src') || '').toString().trim();
-        const height = (formData.get('height') || '').toString().trim();
-        const width = (formData.get('width') || '').toString().trim();
+        context.editor.update(() => {
+            const src = (formData.get('src') || '').toString().trim();
+            const height = (formData.get('height') || '').toString().trim();
+            const width = (formData.get('width') || '').toString().trim();
 
-        // TODO - Update existing or insert new
+            const updateNode = selectedNode || $createMediaNodeFromSrc(src);
+            updateNode.setSrc(src);
+            updateNode.setWidthAndHeight(width, height);
+            if (!selectedNode) {
+                $insertNodeToNearestRoot(updateNode);
+            }
+        });
 
         return true;
     },
@@ -141,7 +158,7 @@ export const media: EditorFormDefinition = {
 
 export const source: EditorFormDefinition = {
     submitText: 'Save',
-    action(formData, context: EditorUiContext) {
+    async action(formData, context: EditorUiContext) {
         setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
         return true;
     },
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 4fee787d354..b641f993bd1 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -14,7 +14,7 @@ export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefiniti
 
 export interface EditorFormDefinition {
     submitText: string;
-    action: (formData: FormData, context: EditorUiContext) => boolean;
+    action: (formData: FormData, context: EditorUiContext) => Promise<boolean>;
     fields: EditorFormFieldDefinition[];
 }
 

From ce8c9dd079ec354525bab57c852e8984f08ce25c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 28 Jul 2024 12:48:58 +0100
Subject: [PATCH 219/666] Lexical: Added form complex/tab ui support

---
 resources/js/wysiwyg/todo.md                  |   4 +-
 .../wysiwyg/ui/defaults/form-definitions.ts   |  55 +++++---
 resources/js/wysiwyg/ui/framework/core.ts     |   8 ++
 resources/js/wysiwyg/ui/framework/forms.ts    | 132 ++++++++++++++++--
 resources/sass/_editor.scss                   |  39 ++++++
 5 files changed, 208 insertions(+), 30 deletions(-)

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 2125aa25878..49f685beabf 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,8 +2,7 @@
 
 ## In progress
 
-- Update forms to allow panels (Media)
-  - Will be used for table forms also. 
+//
 
 ## Main Todo
 
@@ -23,6 +22,7 @@
 - Image gallery integration for form
 - Drawing gallery integration
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
+- Media resize support (like images)
 
 ## Bugs
 
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
index a2242c33873..6c0a54f2333 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/form-definitions.ts
@@ -1,4 +1,4 @@
-import {EditorFormDefinition, EditorSelectFormFieldDefinition} from "../framework/forms";
+import {EditorFormDefinition, EditorFormTabs, EditorSelectFormFieldDefinition} from "../framework/forms";
 import {EditorUiContext} from "../framework/core";
 import {$createLinkNode} from "@lexical/link";
 import {$createTextNode, $getSelection, LexicalNode} from "lexical";
@@ -133,25 +133,40 @@ export const media: EditorFormDefinition = {
     },
     fields: [
         {
-            label: 'Source',
-            name: 'src',
-            type: 'text',
-        },
-        {
-            label: 'Width',
-            name: 'width',
-            type: 'text',
-        },
-        {
-            label: 'Height',
-            name: 'height',
-            type: 'text',
-        },
-        // TODO - Tabbed interface to separate this option
-        {
-            label: 'Paste your embed code below:',
-            name: 'embed',
-            type: 'textarea',
+            build() {
+                return new EditorFormTabs([
+                    {
+                        label: 'General',
+                        contents: [
+                            {
+                                label: 'Source',
+                                name: 'src',
+                                type: 'text',
+                            },
+                            {
+                                label: 'Width',
+                                name: 'width',
+                                type: 'text',
+                            },
+                            {
+                                label: 'Height',
+                                name: 'height',
+                                type: 'text',
+                            },
+                        ],
+                    },
+                    {
+                        label: 'Embed',
+                        contents: [
+                            {
+                                label: 'Paste your embed code below:',
+                                name: 'embed',
+                                type: 'textarea',
+                            },
+                        ],
+                    }
+                ])
+            }
         },
     ],
 };
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index c8f390c4803..f644bc37a70 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -18,6 +18,14 @@ export type EditorUiContext = {
     options: Record<string, any>; // General user options which may be used by sub elements
 };
 
+export interface EditorUiBuilderDefinition {
+    build: () => EditorUiElement;
+}
+
+export function isUiBuilderDefinition(object: any): object is EditorUiBuilderDefinition {
+    return 'build' in object;
+}
+
 export abstract class EditorUiElement {
     protected dom: HTMLElement|null = null;
     private context: EditorUiContext|null = null;
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index b641f993bd1..b225a3de2c2 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -1,5 +1,12 @@
-import {EditorUiContext, EditorUiElement, EditorContainerUiElement} from "./core";
+import {
+    EditorUiContext,
+    EditorUiElement,
+    EditorContainerUiElement,
+    EditorUiBuilderDefinition,
+    isUiBuilderDefinition
+} from "./core";
 import {el} from "../../helpers";
+import {uniqueId} from "../../../services/util";
 
 export interface EditorFormFieldDefinition {
     label: string;
@@ -12,10 +19,15 @@ export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefiniti
     valuesByLabel: Record<string, string>
 }
 
+interface EditorFormTabDefinition {
+    label: string;
+    contents: EditorFormFieldDefinition[];
+}
+
 export interface EditorFormDefinition {
     submitText: string;
     action: (formData: FormData, context: EditorUiContext) => Promise<boolean>;
-    fields: EditorFormFieldDefinition[];
+    fields: (EditorFormFieldDefinition|EditorUiBuilderDefinition)[];
 }
 
 export class EditorFormField extends EditorUiElement {
@@ -62,7 +74,14 @@ export class EditorForm extends EditorContainerUiElement {
     protected onCancel: null|(() => void) = null;
 
     constructor(definition: EditorFormDefinition) {
-        super(definition.fields.map(fieldDefinition => new EditorFormField(fieldDefinition)));
+        let children: (EditorFormField|EditorUiElement)[] = definition.fields.map(fieldDefinition => {
+            if (isUiBuilderDefinition(fieldDefinition)) {
+                return fieldDefinition.build();
+            }
+            return new EditorFormField(fieldDefinition)
+        });
+
+        super(children);
         this.definition = definition;
     }
 
@@ -80,13 +99,23 @@ export class EditorForm extends EditorContainerUiElement {
     }
 
     protected getFieldByName(name: string): EditorFormField|null {
-        for (const child of this.children as EditorFormField[]) {
-            if (child.getName() === name) {
-                return child;
+
+        const search = (children: EditorUiElement[]): EditorFormField|null => {
+            for (const child of children) {
+                if (child instanceof EditorFormField && child.getName() === name) {
+                    return child;
+                } else if (child instanceof EditorContainerUiElement) {
+                    const matchingChild = search(child.getChildren());
+                    if (matchingChild) {
+                        return matchingChild;
+                    }
+                }
             }
-        }
 
-        return null;
+            return null;
+        };
+
+        return search(this.getChildren());
     }
 
     protected buildDOM(): HTMLElement {
@@ -113,4 +142,91 @@ export class EditorForm extends EditorContainerUiElement {
 
         return form;
     }
+}
+
+export class EditorFormTab extends EditorContainerUiElement {
+
+    protected definition: EditorFormTabDefinition;
+    protected fields: EditorFormField[];
+    protected id: string;
+
+    constructor(definition: EditorFormTabDefinition) {
+        const fields = definition.contents.map(fieldDef => new EditorFormField(fieldDef));
+        super(fields);
+
+        this.definition = definition;
+        this.fields = fields;
+        this.id = uniqueId();
+    }
+
+    public getLabel(): string {
+        return this.getContext().translate(this.definition.label);
+    }
+
+    public getId(): string {
+        return this.id;
+    }
+
+    protected buildDOM(): HTMLElement {
+        return el(
+            'div',
+            {
+                class: 'editor-form-tab-content',
+                role: 'tabpanel',
+                id: `editor-tabpanel-${this.id}`,
+                'aria-labelledby': `editor-tab-${this.id}`,
+            },
+            this.fields.map(f => f.getDOMElement())
+        );
+    }
+}
+export class EditorFormTabs extends EditorContainerUiElement {
+
+    protected definitions: EditorFormTabDefinition[] = [];
+    protected tabs: EditorFormTab[] = [];
+
+    constructor(definitions: EditorFormTabDefinition[]) {
+        const tabs: EditorFormTab[] = definitions.map(d => new EditorFormTab(d));
+        super(tabs);
+
+        this.definitions = definitions;
+        this.tabs = tabs;
+    }
+
+    protected buildDOM(): HTMLElement {
+        const controls: HTMLElement[] = [];
+        const contents: HTMLElement[] = [];
+
+        const selectTab = (tabIndex: number) => {
+            for (let i = 0; i < controls.length; i++) {
+                controls[i].setAttribute('aria-selected', (i === tabIndex) ? 'true' : 'false');
+            }
+            for (let i = 0; i < contents.length; i++) {
+                contents[i].hidden = !(i === tabIndex);
+            }
+        };
+
+        for (const tab of this.tabs) {
+            const button = el('button', {
+                class: 'editor-form-tab-control',
+                type: 'button',
+                role: 'tab',
+                id: `editor-tab-${tab.getId()}`,
+                'aria-controls': `editor-tabpanel-${tab.getId()}`
+            }, [tab.getLabel()]);
+            contents.push(tab.getDOMElement());
+            controls.push(button);
+
+            button.addEventListener('click', event => {
+                selectTab(controls.indexOf(button));
+            });
+        }
+
+        selectTab(0);
+
+        return el('div', {class: 'editor-form-tab-container'}, [
+            el('div', {class: 'editor-form-tab-controls'}, controls),
+            el('div', {class: 'editor-form-tab-contents'}, contents),
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 17e4af97bb0..1e52ad6a9b2 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -398,6 +398,45 @@ textarea.editor-form-field-input {
     box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.1);
   }
 }
+.editor-form-tab-container {
+  display: flex;
+  flex-direction: row;
+  gap: 2rem;
+}
+.editor-form-tab-controls {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: .25rem;
+}
+.editor-form-tab-control {
+  font-weight: bold;
+  font-size: 14px;
+  color: #444;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  cursor: pointer;
+  padding: .25rem .5rem;
+  text-align: start;
+  &[aria-selected="true"] {
+    border-color: var(--editor-color-primary);
+    color: var(--editor-color-primary);
+  }
+  &[aria-selected="true"]:after, &:hover:after {
+    background-color: var(--editor-color-primary);
+    opacity: .15;
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+  }
+}
+.editor-form-tab-contents {
+  width: 360px;
+}
 
 // Editor theme styles
 .editor-theme-bold {

From 9a7edc6e52467501832202732dec2e61a515aae0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 29 Jul 2024 15:27:41 +0100
Subject: [PATCH 220/666] Lexical: Started drop handling, handled templates

---
 resources/js/wysiwyg/actions.ts       | 43 ++++------------
 resources/js/wysiwyg/drop-handling.ts | 71 +++++++++++++++++++++++++++
 resources/js/wysiwyg/helpers.ts       | 61 +++++++++++++++++++++--
 resources/js/wysiwyg/index.ts         |  2 +
 resources/js/wysiwyg/todo.md          |  4 +-
 5 files changed, 141 insertions(+), 40 deletions(-)
 create mode 100644 resources/js/wysiwyg/drop-handling.ts

diff --git a/resources/js/wysiwyg/actions.ts b/resources/js/wysiwyg/actions.ts
index 0e220252567..a3d2f0ef603 100644
--- a/resources/js/wysiwyg/actions.ts
+++ b/resources/js/wysiwyg/actions.ts
@@ -1,30 +1,10 @@
-import {$getRoot, $getSelection, $isTextNode, LexicalEditor, LexicalNode, RootNode} from "lexical";
-import {$generateHtmlFromNodes, $generateNodesFromDOM} from "@lexical/html";
-import {$createCustomParagraphNode} from "./nodes/custom-paragraph";
+import {$getRoot, $getSelection, LexicalEditor} from "lexical";
+import {$generateHtmlFromNodes} from "@lexical/html";
+import {$htmlToBlockNodes} from "./helpers";
 
-function htmlToDom(html: string): Document {
-    const parser = new DOMParser();
-    return parser.parseFromString(html, 'text/html');
-}
 
-function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
-    return nodes.map(node => {
-        if ($isTextNode(node)) {
-            const paragraph = $createCustomParagraphNode();
-            paragraph.append(node);
-            return paragraph;
-        }
-        return node;
-    });
-}
-
-function appendNodesToRoot(root: RootNode, nodes: LexicalNode[]) {
-    root.append(...wrapTextNodes(nodes));
-}
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
-    const dom = htmlToDom(html);
-
     editor.update(() => {
         // Empty existing
         const root = $getRoot();
@@ -32,27 +12,23 @@ export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
             child.remove(true);
         }
 
-        const nodes = $generateNodesFromDOM(editor, dom);
-        root.append(...wrapTextNodes(nodes));
+        const nodes = $htmlToBlockNodes(editor, html);
+        root.append(...nodes);
     });
 }
 
 export function appendHtmlToEditor(editor: LexicalEditor, html: string) {
-    const dom = htmlToDom(html);
-
     editor.update(() => {
         const root = $getRoot();
-        const nodes = $generateNodesFromDOM(editor, dom);
-        root.append(...wrapTextNodes(nodes));
+        const nodes = $htmlToBlockNodes(editor, html);
+        root.append(...nodes);
     });
 }
 
 export function prependHtmlToEditor(editor: LexicalEditor, html: string) {
-    const dom = htmlToDom(html);
-
     editor.update(() => {
         const root = $getRoot();
-        const nodes = wrapTextNodes($generateNodesFromDOM(editor, dom));
+        const nodes = $htmlToBlockNodes(editor, html);
         let reference = root.getChildren()[0];
         for (let i = nodes.length - 1; i >= 0; i--) {
             if (reference) {
@@ -66,10 +42,9 @@ export function prependHtmlToEditor(editor: LexicalEditor, html: string) {
 }
 
 export function insertHtmlIntoEditor(editor: LexicalEditor, html: string) {
-    const dom = htmlToDom(html);
     editor.update(() => {
         const selection = $getSelection();
-        const nodes = wrapTextNodes($generateNodesFromDOM(editor, dom));
+        const nodes = $htmlToBlockNodes(editor, html);
 
         const reference = selection?.getNodes()[0];
         const referencesParents = reference?.getParents() || [];
diff --git a/resources/js/wysiwyg/drop-handling.ts b/resources/js/wysiwyg/drop-handling.ts
new file mode 100644
index 00000000000..92dc758d8db
--- /dev/null
+++ b/resources/js/wysiwyg/drop-handling.ts
@@ -0,0 +1,71 @@
+import {
+    $getNearestNodeFromDOMNode,
+    $getRoot,
+    $insertNodes,
+    $isDecoratorNode,
+    LexicalEditor,
+    LexicalNode
+} from "lexical";
+import {
+    $getNearestBlockNodeForCoords,
+    $htmlToBlockNodes,
+    $insertNewBlockNodeAtSelection, $insertNewBlockNodesAtSelection,
+    $selectSingleNode
+} from "./helpers";
+
+function $getNodeFromMouseEvent(event: MouseEvent, editor: LexicalEditor): LexicalNode|null {
+    const x = event.clientX;
+    const y = event.clientY;
+    const dom = document.elementFromPoint(x, y);
+    if (!dom) {
+        return null;
+    }
+
+    return $getNearestBlockNodeForCoords(editor, event.clientX, event.clientY);
+}
+
+function $insertNodesAtEvent(nodes: LexicalNode[], event: DragEvent, editor: LexicalEditor) {
+    const positionNode = $getNodeFromMouseEvent(event, editor);
+
+    if (positionNode) {
+        $selectSingleNode(positionNode);
+    }
+
+    $insertNewBlockNodesAtSelection(nodes, true);
+
+    if (!$isDecoratorNode(positionNode) || !positionNode?.getTextContent()) {
+        positionNode?.remove();
+    }
+}
+
+async function insertTemplateToEditor(editor: LexicalEditor, templateId: string, event: DragEvent) {
+    const resp = await window.$http.get(`/templates/${templateId}`);
+    const data = (resp.data || {html: ''}) as {html: string}
+    const html: string = data.html || '';
+
+    editor.update(() => {
+        const newNodes = $htmlToBlockNodes(editor, html);
+        $insertNodesAtEvent(newNodes, event, editor);
+    });
+}
+
+function createDropListener(editor: LexicalEditor): (event: DragEvent) => void {
+    return (event: DragEvent) => {
+        // Template handling
+        const templateId = event.dataTransfer?.getData('bookstack/template') || '';
+        if (templateId) {
+            event.preventDefault();
+            insertTemplateToEditor(editor, templateId, event);
+            return;
+        }
+    };
+}
+
+export function handleDropEvents(editor: LexicalEditor) {
+    const dropListener = createDropListener(editor);
+
+    editor.registerRootListener((rootElement, prevRootElement) => {
+        rootElement?.addEventListener('drop', dropListener);
+        prevRootElement?.removeEventListener('drop', dropListener);
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/helpers.ts
index 6a55c429cda..07755f449e6 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/helpers.ts
@@ -3,12 +3,14 @@ import {
     $createParagraphNode, $getRoot,
     $getSelection, $isElementNode,
     $isTextNode, $setSelection,
-    BaseSelection, ElementFormatType, ElementNode,
+    BaseSelection, ElementFormatType, ElementNode, LexicalEditor,
     LexicalNode, TextFormatType
 } from "lexical";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {$setBlocksType} from "@lexical/selection";
+import {$createCustomParagraphNode} from "./nodes/custom-paragraph";
+import {$generateNodesFromDOM} from "@lexical/html";
 
 export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
     const el = document.createElement(tag);
@@ -30,6 +32,28 @@ export function el(tag: string, attrs: Record<string, string|null> = {}, childre
     return el;
 }
 
+function htmlToDom(html: string): Document {
+    const parser = new DOMParser();
+    return parser.parseFromString(html, 'text/html');
+}
+
+function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
+    return nodes.map(node => {
+        if ($isTextNode(node)) {
+            const paragraph = $createCustomParagraphNode();
+            paragraph.append(node);
+            return paragraph;
+        }
+        return node;
+    });
+}
+
+export function $htmlToBlockNodes(editor: LexicalEditor, html: string): LexicalNode[] {
+    const dom = htmlToDom(html);
+    const nodes = $generateNodesFromDOM(editor, dom);
+    return wrapTextNodes(nodes);
+}
+
 export function $selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
     return $getNodeFromSelection(selection, matcher) !== null;
 }
@@ -88,17 +112,25 @@ export function $toggleSelectionBlockNodeType(matcher: LexicalNodeMatcher, creat
 }
 
 export function $insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: boolean = true) {
+    $insertNewBlockNodesAtSelection([node], insertAfter);
+}
+
+export function $insertNewBlockNodesAtSelection(nodes: LexicalNode[], insertAfter: boolean = true) {
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
 
     if (blockElement) {
         if (insertAfter) {
-            blockElement.insertAfter(node);
+            for (let i = nodes.length - 1; i >= 0; i--) {
+                blockElement.insertAfter(nodes[i]);
+            }
         } else {
-            blockElement.insertBefore(node);
+            for (const node of nodes) {
+                blockElement.insertBefore(node);
+            }
         }
     } else {
-        $getRoot().append(node);
+        $getRoot().append(...nodes);
     }
 }
 
@@ -151,4 +183,25 @@ export function $getBlockElementNodesInSelection(selection: BaseSelection|null):
     }
 
     return Array.from(blockNodes.values());
+}
+
+/**
+ * Get the nearest root/block level node for the given position.
+ */
+export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number, y: number): LexicalNode|null {
+    // TODO - Take into account x for floated blocks?
+    const rootNodes = $getRoot().getChildren();
+    for (const node of rootNodes) {
+        const nodeDom = editor.getElementByKey(node.__key);
+        if (!nodeDom) {
+            continue;
+        }
+
+        const bounds = nodeDom.getBoundingClientRect();
+        if (y <= bounds.bottom) {
+            return node;
+        }
+    }
+
+    return null;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index e53b9b057dd..fee5365728e 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -9,6 +9,7 @@ import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {el} from "./helpers";
 import {EditorUiContext} from "./ui/framework/core";
 import {listen as listenToCommonEvents} from "./common-events";
+import {handleDropEvents} from "./drop-handling";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -49,6 +50,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     );
 
     listenToCommonEvents(editor);
+    handleDropEvents(editor);
 
     setEditorContentFromHtml(editor, htmlContent);
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 49f685beabf..5d495e7d83d 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -13,7 +13,6 @@
 - Keyboard shortcuts support
 - Draft/change management (connect with page editor component)
 - Add ID support to all block types
-- Template drag & drop / insert
 - Video attachment drop / insert
 - Task list render/import from existing format
 - Link popup menu for cross-content reference
@@ -28,4 +27,5 @@
 
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
 - Removing link around image via button deletes image, not just link 
-- `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
\ No newline at end of file
+- `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
+- Template drag/drop not handled when outside core editor area (ignored in margin area).
\ No newline at end of file

From d86837ac07fdb5e68b02a57ca6d75fd6047bdfee Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 29 Jul 2024 21:14:42 +0100
Subject: [PATCH 221/666] Lexical: Got working with attachment insert/drop

---
 resources/js/wysiwyg/drop-handling.ts | 18 +++++++++++++-----
 resources/js/wysiwyg/todo.md          |  4 +---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/js/wysiwyg/drop-handling.ts b/resources/js/wysiwyg/drop-handling.ts
index 92dc758d8db..5d541365ab5 100644
--- a/resources/js/wysiwyg/drop-handling.ts
+++ b/resources/js/wysiwyg/drop-handling.ts
@@ -1,7 +1,4 @@
 import {
-    $getNearestNodeFromDOMNode,
-    $getRoot,
-    $insertNodes,
     $isDecoratorNode,
     LexicalEditor,
     LexicalNode
@@ -9,7 +6,7 @@ import {
 import {
     $getNearestBlockNodeForCoords,
     $htmlToBlockNodes,
-    $insertNewBlockNodeAtSelection, $insertNewBlockNodesAtSelection,
+    $insertNewBlockNodesAtSelection,
     $selectSingleNode
 } from "./helpers";
 
@@ -54,8 +51,19 @@ function createDropListener(editor: LexicalEditor): (event: DragEvent) => void {
         // Template handling
         const templateId = event.dataTransfer?.getData('bookstack/template') || '';
         if (templateId) {
-            event.preventDefault();
             insertTemplateToEditor(editor, templateId, event);
+            event.preventDefault();
+            return;
+        }
+
+        // HTML contents drop
+        const html = event.dataTransfer?.getData('text/html') || '';
+        if (html) {
+            editor.update(() => {
+                const newNodes = $htmlToBlockNodes(editor, html);
+                $insertNodesAtEvent(newNodes, event, editor);
+            });
+            event.preventDefault();
             return;
         }
     };
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 5d495e7d83d..73521df9b25 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-//
+- Draft/change management (connect with page editor component)
 
 ## Main Todo
 
@@ -11,9 +11,7 @@
 - Table features
 - Image paste upload
 - Keyboard shortcuts support
-- Draft/change management (connect with page editor component)
 - Add ID support to all block types
-- Video attachment drop / insert
 - Task list render/import from existing format
 - Link popup menu for cross-content reference
 - Link heading-based ID reference menu

From fe05cff64f87681c796bd8c0cd8a7f0de2ac8874 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 29 Jul 2024 21:43:20 +0100
Subject: [PATCH 222/666] Lexical: Linked up change/draft management

---
 resources/js/wysiwyg/index.ts                | 17 +++++++++++++++--
 resources/js/wysiwyg/todo.md                 |  2 +-
 resources/js/wysiwyg/ui/framework/manager.ts |  1 -
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index fee5365728e..4130f41e8a3 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -58,8 +58,21 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     if (debugView) {
         debugView.hidden = true;
     }
-    editor.registerUpdateListener(({editorState}) => {
-        console.log('editorState', editorState.toJSON());
+
+    let changeFromLoading = true;
+    editor.registerUpdateListener(({editorState, dirtyElements, dirtyLeaves}) => {
+
+        // Emit change event to component system (for draft detection) on actual user content change
+        if (dirtyElements.size > 0 || dirtyLeaves.size > 0) {
+            if (changeFromLoading) {
+                changeFromLoading = false;
+            } else {
+                window.$events.emit('editor-html-change', '');
+            }
+        }
+
+        // Debug logic
+        // console.log('editorState', editorState.toJSON());
         if (debugView) {
             debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
         }
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 73521df9b25..5e6cdd2cc88 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-- Draft/change management (connect with page editor component)
+//
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index c0357c3ea80..29d95991075 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -175,7 +175,6 @@ export class EditorUIManager {
     protected setupEditor(editor: LexicalEditor) {
         // Update button states on editor selection change
         editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
-            console.log('select change', arguments);
             this.triggerStateUpdate({
                 editor: editor,
                 selection: $getSelection(),

From 13f8f39dd5b77644839c092d10a0ad549b19600a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 30 Jul 2024 14:42:19 +0100
Subject: [PATCH 223/666] Lexical: Updated task list to use/support old format

---
 resources/js/wysiwyg/index.ts                 |  2 +
 .../js/wysiwyg/nodes/custom-list-item.ts      | 92 +++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |  9 +-
 resources/js/wysiwyg/todo.md                  |  1 -
 .../ui/framework/helpers/task-list-handler.ts | 59 ++++++++++++
 resources/sass/_editor.scss                   | 31 +++++++
 6 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/custom-list-item.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 4130f41e8a3..1e9dd25df7c 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -10,6 +10,7 @@ import {el} from "./helpers";
 import {EditorUiContext} from "./ui/framework/core";
 import {listen as listenToCommonEvents} from "./common-events";
 import {handleDropEvents} from "./drop-handling";
+import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -47,6 +48,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerTableResizer(editor, editWrap),
+        registerTaskListHandler(editor, editArea),
     );
 
     listenToCommonEvents(editor);
diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
new file mode 100644
index 00000000000..53467e10bc9
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-list-item.ts
@@ -0,0 +1,92 @@
+import {$isListNode, ListItemNode, ListNode, SerializedListItemNode} from "@lexical/list";
+import {EditorConfig} from "lexical/LexicalEditor";
+import {DOMExportOutput, LexicalEditor, LexicalNode} from "lexical";
+import {el} from "../helpers";
+
+function updateListItemChecked(
+    dom: HTMLElement,
+    listItemNode: ListItemNode,
+): void {
+    // Only set task list attrs for leaf list items
+    const shouldBeTaskItem = !$isListNode(listItemNode.getFirstChild());
+    dom.classList.toggle('task-list-item', shouldBeTaskItem);
+    if (listItemNode.__checked) {
+        dom.setAttribute('checked', 'checked');
+    } else {
+        dom.removeAttribute('checked');
+    }
+}
+
+
+export class CustomListItemNode extends ListItemNode {
+    static getType(): string {
+        return 'custom-list-item';
+    }
+
+    static clone(node: CustomListItemNode): CustomListItemNode {
+        return new CustomListItemNode(node.__value, node.__checked, node.__key);
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const element = document.createElement('li');
+        const parent = this.getParent();
+
+        if ($isListNode(parent) && parent.getListType() === 'check') {
+            updateListItemChecked(element, this);
+        }
+
+        element.value = this.__value;
+
+        return element;
+    }
+
+    updateDOM(
+        prevNode: ListItemNode,
+        dom: HTMLElement,
+        config: EditorConfig,
+    ): boolean {
+        const parent = this.getParent();
+        if ($isListNode(parent) && parent.getListType() === 'check') {
+            updateListItemChecked(dom, this);
+        }
+        // @ts-expect-error - this is always HTMLListItemElement
+        dom.value = this.__value;
+
+        return false;
+    }
+
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const element = this.createDOM(editor._config);
+        element.style.textAlign = this.getFormatType();
+
+        if (element.classList.contains('task-list-item')) {
+            const input = el('input', {
+                type: 'checkbox',
+                disabled: 'disabled',
+            });
+            if (element.hasAttribute('checked')) {
+                input.setAttribute('checked', 'checked');
+                element.removeAttribute('checked');
+            }
+
+            element.prepend(input);
+        }
+
+        return {
+            element,
+        };
+    }
+
+    exportJSON(): SerializedListItemNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-list-item',
+        };
+    }
+}
+
+export function $isCustomListItemNode(
+    node: LexicalNode | null | undefined,
+): node is CustomListItemNode {
+    return node instanceof CustomListItemNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 669ffe6ddc9..f0df08fcbb4 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -19,6 +19,7 @@ import {CodeBlockNode} from "./code-block";
 import {DiagramNode} from "./diagram";
 import {EditorUiContext} from "../ui/framework/core";
 import {MediaNode} from "./media";
+import {CustomListItemNode} from "./custom-list-item";
 
 /**
  * Load the nodes for lexical.
@@ -29,7 +30,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         HeadingNode, // Todo - Create custom
         QuoteNode, // Todo - Create custom
         ListNode, // Todo - Create custom
-        ListItemNode,
+        CustomListItemNode,
         CustomTableNode,
         TableRowNode,
         TableCellNode,
@@ -53,6 +54,12 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
                 return new CustomTableNode();
             }
         },
+        {
+            replace: ListItemNode,
+            with: (node: ListItemNode) => {
+                return new CustomListItemNode(node.__value, node.__checked);
+            }
+        }
     ];
 }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 5e6cdd2cc88..dda05f1da80 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -12,7 +12,6 @@
 - Image paste upload
 - Keyboard shortcuts support
 - Add ID support to all block types
-- Task list render/import from existing format
 - Link popup menu for cross-content reference
 - Link heading-based ID reference menu
 - Image gallery integration for insert
diff --git a/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts
new file mode 100644
index 00000000000..da8c0eae3dd
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts
@@ -0,0 +1,59 @@
+import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
+import {$isCustomListItemNode} from "../../../nodes/custom-list-item";
+
+class TaskListHandler {
+    protected editorContainer: HTMLElement;
+    protected editor: LexicalEditor;
+
+    constructor(editor: LexicalEditor, editorContainer: HTMLElement) {
+        this.editor = editor;
+        this.editorContainer = editorContainer;
+        this.setupListeners();
+    }
+
+    protected setupListeners() {
+        this.handleClick = this.handleClick.bind(this);
+        this.editorContainer.addEventListener('click', this.handleClick);
+    }
+
+    handleClick(event: MouseEvent) {
+        const target = event.target;
+        if (target instanceof HTMLElement && target.nodeName === 'LI' && target.classList.contains('task-list-item')) {
+            this.handleTaskListItemClick(target, event);
+            event.preventDefault();
+        }
+    }
+
+    handleTaskListItemClick(listItem: HTMLElement, event: MouseEvent) {
+        const bounds = listItem.getBoundingClientRect();
+        const withinBounds = event.clientX <= bounds.right
+            && event.clientX >= bounds.left
+            && event.clientY >= bounds.top
+            && event.clientY <= bounds.bottom;
+
+        // Outside task list item bounds means we're probably clicking the pseudo-element
+        if (withinBounds) {
+            return;
+        }
+
+        this.editor.update(() => {
+            const node = $getNearestNodeFromDOMNode(listItem);
+            if ($isCustomListItemNode(node)) {
+                node.setChecked(!node.getChecked());
+            }
+        });
+    }
+
+    teardown() {
+        this.editorContainer.removeEventListener('click', this.handleClick);
+    }
+}
+
+
+export function registerTaskListHandler(editor: LexicalEditor, editorContainer: HTMLElement): (() => void) {
+    const handler = new TaskListHandler(editor, editorContainer);
+
+    return () => {
+        handler.teardown();
+    };
+}
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 1e52ad6a9b2..4ffff3cc0c7 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -324,6 +324,37 @@ body.editor-is-fullscreen {
   outline: 2px dashed var(--editor-color-primary);
 }
 
+/**
+ * Fake task list checkboxes
+ */
+.editor-content-area .task-list-item {
+  margin-left: 0;
+  position: relative;
+}
+.editor-content-area .task-list-item > input[type="checkbox"] {
+  display: none;
+}
+.editor-content-area .task-list-item:before {
+  content: '';
+  display: inline-block;
+  border: 2px solid #CCC;
+  width: 12px;
+  height: 12px;
+  border-radius: 2px;
+  margin-right: 8px;
+  vertical-align: text-top;
+  cursor: pointer;
+  position: absolute;
+  left: -24px;
+  top: 4px;
+}
+.editor-content-area .task-list-item[checked]:before {
+  background-color: #CCC;
+  background-image: url('data:image/svg+xml;utf8,<svg fill="%23FFFFFF" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8.4856 20.274-6.736-6.736 2.9287-2.7823 3.8073 3.8073 10.836-10.836 2.9287 2.9287z" stroke-width="1.4644"/></svg>');
+  background-position: 50% 50%;
+  background-size: 100% 100%;
+}
+
 // Editor form elements
 .editor-form-field-wrapper {
   margin-bottom: .5rem;

From 6b06d490c54fb8e2950236655fc3168e922982a6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 2 Aug 2024 11:16:54 +0100
Subject: [PATCH 224/666] Lexical: Started table menu options

Updated UI elements to handle new scenarios needed in more complex table
menu
---
 .../js/wysiwyg/nodes/custom-list-item.ts      |  2 +-
 resources/js/wysiwyg/todo.md                  |  5 +--
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 25 +++++++++-----
 .../ui/framework/blocks/dropdown-button.ts    | 28 +++++++++++-----
 .../ui/framework/blocks/format-menu.ts        |  2 +-
 .../ui/framework/blocks/overflow-container.ts |  8 +++--
 resources/js/wysiwyg/ui/framework/buttons.ts  | 33 ++++++++++++++-----
 resources/js/wysiwyg/ui/toolbars.ts           | 20 +++++++----
 resources/sass/_editor.scss                   | 19 ++++++++---
 9 files changed, 100 insertions(+), 42 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
index 53467e10bc9..21b9f6d5f93 100644
--- a/resources/js/wysiwyg/nodes/custom-list-item.ts
+++ b/resources/js/wysiwyg/nodes/custom-list-item.ts
@@ -1,4 +1,4 @@
-import {$isListNode, ListItemNode, ListNode, SerializedListItemNode} from "@lexical/list";
+import {$isListNode, ListItemNode, SerializedListItemNode} from "@lexical/list";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {DOMExportOutput, LexicalEditor, LexicalNode} from "lexical";
 import {el} from "../helpers";
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index dda05f1da80..1a367d0dd1a 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,13 +2,14 @@
 
 ## In progress
 
-//
+- Table features
+  - Continued table dropdown menu 
 
 ## Main Todo
 
 - Alignments: Use existing classes for blocks
 - Alignments: Handle inline block content (image, video)
-- Table features
+
 - Image paste upload
 - Keyboard shortcuts support
 - Add ID support to all block types
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 32fa49f88f3..b6b92e1970f 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -8,17 +8,18 @@ import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg
 import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
-import {$getBlockElementNodesInSelection, $getNodeFromSelection, $getParentOfType} from "../../../helpers";
+import {
+    $getNodeFromSelection,
+    $selectionContainsNodeType
+} from "../../../helpers";
 import {$getSelection} from "lexical";
-import {$isCustomTableNode, CustomTableNode} from "../../../nodes/custom-table";
+import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
-    $deleteTableColumn, $deleteTableColumn__EXPERIMENTAL,
+    $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
-    $getTableRowIndexFromTableCellNode, $insertTableColumn, $insertTableColumn__EXPERIMENTAL,
-    $insertTableRow, $insertTableRow__EXPERIMENTAL,
-    $isTableCellNode,
-    $isTableRowNode,
-    TableCellNode
+    $insertTableColumn__EXPERIMENTAL,
+    $insertTableRow__EXPERIMENTAL,
+    $isTableNode,
 } from "@lexical/table";
 
 
@@ -43,6 +44,14 @@ export const deleteTable: EditorButtonDefinition = {
     }
 };
 
+export const deleteTableMenuAction: EditorButtonDefinition = {
+    ...deleteTable,
+    format: 'long',
+    isDisabled(selection) {
+        return !$selectionContainsNodeType(selection, $isTableNode);
+    },
+};
+
 export const insertRowAbove: EditorButtonDefinition = {
     label: 'Insert row above',
     icon: insertRowAboveIcon,
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index a75cf64fef5..24659b5469c 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -3,22 +3,34 @@ import {handleDropdown} from "../helpers/dropdowns";
 import {EditorContainerUiElement, EditorUiElement} from "../core";
 import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
 
+export type EditorDropdownButtonOptions = {
+    showOnHover?: boolean;
+    direction?: 'vertical'|'horizontal';
+    button: EditorBasicButtonDefinition|EditorButton;
+};
+
+const defaultOptions: EditorDropdownButtonOptions = {
+    showOnHover: false,
+    direction: 'horizontal',
+    button: {label: 'Menu'},
+}
+
 export class EditorDropdownButton extends EditorContainerUiElement {
     protected button: EditorButton;
     protected childItems: EditorUiElement[];
     protected open: boolean = false;
-    protected showOnHover: boolean = false;
+    protected options: EditorDropdownButtonOptions;
 
-    constructor(button: EditorBasicButtonDefinition|EditorButton, showOnHover: boolean, children: EditorUiElement[]) {
+    constructor(options: EditorDropdownButtonOptions, children: EditorUiElement[]) {
         super(children);
         this.childItems = children;
-        this.showOnHover = showOnHover;
+        this.options = Object.assign(defaultOptions, options);
 
-        if (button instanceof EditorButton) {
-            this.button = button;
+        if (options.button instanceof EditorButton) {
+            this.button = options.button;
         } else {
             this.button = new EditorButton({
-                ...button,
+                ...options.button,
                 action() {
                     return false;
                 },
@@ -41,7 +53,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
 
         const childElements: HTMLElement[] = this.childItems.map(child => child.getDOMElement());
         const menu = el('div', {
-            class: 'editor-dropdown-menu',
+            class: `editor-dropdown-menu editor-dropdown-menu-${this.options.direction}`,
             hidden: 'true',
         }, childElements);
 
@@ -50,7 +62,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
         }, [button, menu]);
 
         handleDropdown({toggle : button, menu : menu,
-            showOnHover: this.showOnHover,
+            showOnHover: this.options.showOnHover,
             onOpen : () => {
             this.open = true;
             this.getContext().manager.triggerStateUpdateForElement(this.button);
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
index 52a9c380986..b0834fe4d48 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
@@ -7,7 +7,7 @@ export class EditorFormatMenu extends EditorContainerUiElement {
     buildDOM(): HTMLElement {
         const childElements: HTMLElement[] = this.getChildren().map(child => child.getDOMElement());
         const menu = el('div', {
-            class: 'editor-format-menu-dropdown editor-dropdown-menu editor-menu-list',
+            class: 'editor-format-menu-dropdown editor-dropdown-menu editor-dropdown-menu-vertical',
             hidden: 'true',
         }, childElements);
 
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
index 83f394d9d86..108992db889 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -15,9 +15,11 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
         this.size = size;
         this.content = children;
         this.overflowButton = new EditorDropdownButton({
-            label: 'More',
-            icon: moreHorizontal,
-        }, false, []);
+            button: {
+                label: 'More',
+                icon: moreHorizontal,
+            },
+        }, []);
         this.addChildren(this.overflowButton);
     }
 
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 4418be6237c..9a23edfb7f6 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -5,11 +5,13 @@ import {el} from "../../helpers";
 export interface EditorBasicButtonDefinition {
     label: string;
     icon?: string|undefined;
+    format?: 'small' | 'long';
 }
 
 export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
     action: (context: EditorUiContext, button: EditorButton) => void;
     isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
+    isDisabled?: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;
 }
 
@@ -47,20 +49,27 @@ export class EditorButton extends EditorUiElement {
     }
 
     protected buildDOM(): HTMLButtonElement {
-
         const label = this.getLabel();
-        let child: string|HTMLElement = label;
-        if (this.definition.icon) {
-            child = el('div', {class: 'editor-button-icon'});
-            child.innerHTML = this.definition.icon;
+        const format = this.definition.format || 'small';
+        const children: (string|HTMLElement)[] = [];
+
+        if (this.definition.icon || format === 'long') {
+            const icon = el('div', {class: 'editor-button-icon'});
+            icon.innerHTML = this.definition.icon || '';
+            children.push(icon);
+        }
+
+        if (!this.definition.icon ||format === 'long') {
+            const text = el('div', {class: 'editor-button-text'}, [label]);
+            children.push(text);
         }
 
         const button = el('button', {
             type: 'button',
-            class: 'editor-button',
+            class: `editor-button editor-button-${format}`,
             title: this.definition.icon ? label : null,
             disabled: this.disabled ? 'true' : null,
-        }, [child]) as HTMLButtonElement;
+        }, children) as HTMLButtonElement;
 
         button.addEventListener('click', this.onClick.bind(this));
 
@@ -71,11 +80,18 @@ export class EditorButton extends EditorUiElement {
         this.definition.action(this.getContext(), this);
     }
 
-    updateActiveState(selection: BaseSelection|null) {
+    protected updateActiveState(selection: BaseSelection|null) {
         const isActive = this.definition.isActive(selection, this.getContext());
         this.setActiveState(isActive);
     }
 
+    protected updateDisabledState(selection: BaseSelection|null) {
+        if (this.definition.isDisabled) {
+            const isDisabled = this.definition.isDisabled(selection, this.getContext());
+            this.toggleDisabled(isDisabled);
+        }
+    }
+
     setActiveState(active: boolean) {
         this.active = active;
         this.dom?.classList.toggle('editor-button-active', this.active);
@@ -83,6 +99,7 @@ export class EditorButton extends EditorUiElement {
 
     updateState(state: EditorUiStateUpdate): void {
         this.updateActiveState(state.selection);
+        this.updateDisabledState(state.selection);
     }
 
     isActive(): boolean {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index ae6a292a271..d2b179eb6ce 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,6 +1,6 @@
 import {EditorButton} from "./framework/buttons";
 import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiElement} from "./framework/core";
-import {el} from "../helpers";
+import {$selectionContainsNodeType, el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
@@ -11,7 +11,7 @@ import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
 import {
     deleteColumn,
     deleteRow,
-    deleteTable, insertColumnAfter,
+    deleteTable, deleteTableMenuAction, insertColumnAfter,
     insertColumnBefore,
     insertRowAbove,
     insertRowBelow,
@@ -50,6 +50,7 @@ import {
     link, media,
     unlink
 } from "./defaults/buttons/objects";
+import {$isTableNode} from "@lexical/table";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -68,7 +69,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new FormatPreviewButton(el('h5'), h5),
             new FormatPreviewButton(el('blockquote'), blockquote),
             new FormatPreviewButton(el('p'), paragraph),
-            new EditorDropdownButton({label: 'Callouts'}, true, [
+            new EditorDropdownButton({button: {label: 'Callouts'}, showOnHover: true, direction: 'vertical'}, [
                 new FormatPreviewButton(el('p', {class: 'callout info'}), infoCallout),
                 new FormatPreviewButton(el('p', {class: 'callout success'}), successCallout),
                 new FormatPreviewButton(el('p', {class: 'callout warning'}), warningCallout),
@@ -81,10 +82,10 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(bold),
             new EditorButton(italic),
             new EditorButton(underline),
-            new EditorDropdownButton(new EditorColorButton(textColor, 'color'), false, [
+            new EditorDropdownButton({ button: new EditorColorButton(textColor, 'color') }, [
                 new EditorColorPicker('color'),
             ]),
-            new EditorDropdownButton(new EditorColorButton(highlightColor, 'background-color'), false, [
+            new EditorDropdownButton({button: new EditorColorButton(highlightColor, 'background-color')}, [
                 new EditorColorPicker('background-color'),
             ]),
             new EditorButton(strikethrough),
@@ -112,9 +113,14 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         // Insert types
         new EditorOverflowContainer(8, [
             new EditorButton(link),
-            new EditorDropdownButton(table, false, [
-                new EditorTableCreator(),
+
+            new EditorDropdownButton({button: table, direction: 'vertical'}, [
+                new EditorDropdownButton({button: {...table, format: 'long'}, showOnHover: true}, [
+                    new EditorTableCreator(),
+                ]),
+                new EditorButton(deleteTableMenuAction),
             ]),
+
             new EditorButton(image),
             new EditorButton(horizontalRule),
             new EditorButton(codeBlock),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 4ffff3cc0c7..0cf14555977 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -59,6 +59,18 @@ body.editor-is-fullscreen {
   background-color: #ceebff;
   color: #000;
 }
+.editor-button-long {
+  display: flex !important;
+  flex-direction: row;
+  align-items: center;
+  justify-content: start;
+  gap: .5rem;
+}
+.editor-button-text {
+  font-weight: 400;
+  color: #000;
+  font-size: 12.2px;
+}
 .editor-button-format-preview {
   padding: 4px 6px;
   display: block;
@@ -84,21 +96,20 @@ body.editor-is-fullscreen {
   display: flex;
   flex-direction: row;
 }
-.editor-menu-list {
+.editor-dropdown-menu-vertical {
   display: flex;
   flex-direction: column;
   align-items: stretch;
 }
-.editor-menu-list .editor-button {
+.editor-dropdown-menu-vertical .editor-button {
   border-bottom: 0;
   text-align: start;
   display: block;
   width: 100%;
 }
-.editor-menu-list > .editor-dropdown-menu-container .editor-dropdown-menu {
+.editor-dropdown-menu-vertical > .editor-dropdown-menu-container .editor-dropdown-menu {
   inset-inline-start: 100%;
   top: 0;
-  flex-direction: column;
 }
 
 .editor-format-menu-toggle {

From a27a325af77e31a184cdb33dc05cb658de697e0b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 2 Aug 2024 15:28:54 +0100
Subject: [PATCH 225/666] Lexical: Started on table actions

Started building table cell form/actions
---
 resources/js/wysiwyg/index.ts                 |   2 +
 resources/js/wysiwyg/nodes/custom-table.ts    |   2 +-
 resources/js/wysiwyg/todo.md                  |   8 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |  62 +++++++++-
 .../js/wysiwyg/ui/defaults/forms/controls.ts  |  18 +++
 .../{form-definitions.ts => forms/objects.ts} | 103 +++++++---------
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 112 ++++++++++++++++++
 resources/js/wysiwyg/ui/defaults/modals.ts    |  27 +++++
 .../helpers/table-selection-handler.ts        |  80 +++++++++++++
 resources/js/wysiwyg/ui/index.ts              |  21 +---
 resources/js/wysiwyg/ui/toolbars.ts           |   8 +-
 11 files changed, 361 insertions(+), 82 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/defaults/forms/controls.ts
 rename resources/js/wysiwyg/ui/defaults/{form-definitions.ts => forms/objects.ts} (87%)
 create mode 100644 resources/js/wysiwyg/ui/defaults/forms/tables.ts
 create mode 100644 resources/js/wysiwyg/ui/defaults/modals.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 1e9dd25df7c..71a007f590e 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -11,6 +11,7 @@ import {EditorUiContext} from "./ui/framework/core";
 import {listen as listenToCommonEvents} from "./common-events";
 import {handleDropEvents} from "./drop-handling";
 import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
+import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -48,6 +49,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerTableResizer(editor, editWrap),
+        registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
     );
 
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index 1107f0a906b..7dda24a7a30 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -157,7 +157,7 @@ export function $createCustomTableNode(): CustomTableNode {
     return new CustomTableNode();
 }
 
-export function $isCustomTableNode(node: LexicalNode | null | undefined): boolean {
+export function $isCustomTableNode(node: LexicalNode | null | undefined): node is CustomTableNode {
     return node instanceof CustomTableNode;
 }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 1a367d0dd1a..0354b7935ff 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,7 +3,9 @@
 ## In progress
 
 - Table features
-  - Continued table dropdown menu 
+  - Continued table dropdown menu
+  - Connect up cell properties form
+  - Merge cell action
 
 ## Main Todo
 
@@ -21,6 +23,10 @@
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 
+## Secondary Todo
+
+- Color picker support in table form color fields
+
 ## Bugs
 
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index b6b92e1970f..e3f7bb570e5 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -18,8 +18,8 @@ import {
     $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
-    $insertTableRow__EXPERIMENTAL,
-    $isTableNode,
+    $insertTableRow__EXPERIMENTAL, $isTableCellNode,
+    $isTableNode, $isTableSelection, $unmergeCell, TableCellNode,
 } from "@lexical/table";
 
 
@@ -128,4 +128,62 @@ export const deleteColumn: EditorButtonDefinition = {
     isActive() {
         return false;
     }
+};
+
+export const cellProperties: EditorButtonDefinition = {
+    label: 'Cell properties',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if ($isTableCellNode(cell)) {
+
+                const modalForm = context.manager.createModal('cell_properties');
+                modalForm.show({});
+            }
+        });
+    },
+    isActive() {
+        return false;
+    },
+    isDisabled(selection) {
+        return !$selectionContainsNodeType(selection, $isTableCellNode);
+    }
+};
+
+export const mergeCells: EditorButtonDefinition = {
+    label: 'Merge cells',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            // Todo - Needs to be done manually
+            // Playground reference:
+            // https://github.com/facebook/lexical/blob/f373759a7849f473d34960a6bf4e34b2a011e762/packages/lexical-playground/src/plugins/TableActionMenuPlugin/index.tsx#L299
+        });
+    },
+    isActive() {
+        return false;
+    },
+    isDisabled(selection) {
+        return !$isTableSelection(selection);
+    }
+};
+
+export const splitCell: EditorButtonDefinition = {
+    label: 'Split cell',
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            $unmergeCell();
+        });
+    },
+    isActive() {
+        return false;
+    },
+    isDisabled(selection) {
+        const cell = $getNodeFromSelection(selection, $isTableCellNode) as TableCellNode|null;
+        if (cell) {
+            const merged = cell.getRowSpan() > 1 || cell.getColSpan() > 1;
+            return !merged;
+        }
+
+        return true;
+    }
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/controls.ts b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
new file mode 100644
index 00000000000..bcb2f5bad6e
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
@@ -0,0 +1,18 @@
+import {EditorFormDefinition} from "../../framework/forms";
+import {EditorUiContext} from "../../framework/core";
+import {setEditorContentFromHtml} from "../../../actions";
+
+export const source: EditorFormDefinition = {
+    submitText: 'Save',
+    async action(formData, context: EditorUiContext) {
+        setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
+        return true;
+    },
+    fields: [
+        {
+            label: 'Source',
+            name: 'source',
+            type: 'textarea',
+        },
+    ],
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/form-definitions.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
similarity index 87%
rename from resources/js/wysiwyg/ui/defaults/form-definitions.ts
rename to resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 6c0a54f2333..7a388751bc4 100644
--- a/resources/js/wysiwyg/ui/defaults/form-definitions.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -1,13 +1,49 @@
-import {EditorFormDefinition, EditorFormTabs, EditorSelectFormFieldDefinition} from "../framework/forms";
-import {EditorUiContext} from "../framework/core";
+import {EditorFormDefinition, EditorFormTabs, EditorSelectFormFieldDefinition} from "../../framework/forms";
+import {EditorUiContext} from "../../framework/core";
+import {$createTextNode, $getSelection} from "lexical";
+import {$createImageNode} from "../../../nodes/image";
 import {$createLinkNode} from "@lexical/link";
-import {$createTextNode, $getSelection, LexicalNode} from "lexical";
-import {$createImageNode} from "../../nodes/image";
-import {setEditorContentFromHtml} from "../../actions";
-import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../nodes/media";
-import {$getNodeFromSelection} from "../../helpers";
+import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
+import {$getNodeFromSelection} from "../../../helpers";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
 
+export const image: EditorFormDefinition = {
+    submitText: 'Apply',
+    async action(formData, context: EditorUiContext) {
+        context.editor.update(() => {
+            const selection = $getSelection();
+            const imageNode = $createImageNode(formData.get('src')?.toString() || '', {
+                alt: formData.get('alt')?.toString() || '',
+                height: Number(formData.get('height')?.toString() || '0'),
+                width: Number(formData.get('width')?.toString() || '0'),
+            });
+            selection?.insertNodes([imageNode]);
+        });
+        return true;
+    },
+    fields: [
+        {
+            label: 'Source',
+            name: 'src',
+            type: 'text',
+        },
+        {
+            label: 'Alternative description',
+            name: 'alt',
+            type: 'text',
+        },
+        {
+            label: 'Width',
+            name: 'width',
+            type: 'text',
+        },
+        {
+            label: 'Height',
+            name: 'height',
+            type: 'text',
+        },
+    ],
+};
 
 export const link: EditorFormDefinition = {
     submitText: 'Apply',
@@ -54,44 +90,6 @@ export const link: EditorFormDefinition = {
     ],
 };
 
-export const image: EditorFormDefinition = {
-    submitText: 'Apply',
-    async action(formData, context: EditorUiContext) {
-        context.editor.update(() => {
-            const selection = $getSelection();
-            const imageNode = $createImageNode(formData.get('src')?.toString() || '', {
-                alt: formData.get('alt')?.toString() || '',
-                height: Number(formData.get('height')?.toString() || '0'),
-                width: Number(formData.get('width')?.toString() || '0'),
-            });
-            selection?.insertNodes([imageNode]);
-        });
-        return true;
-    },
-    fields: [
-        {
-            label: 'Source',
-            name: 'src',
-            type: 'text',
-        },
-        {
-            label: 'Alternative description',
-            name: 'alt',
-            type: 'text',
-        },
-        {
-            label: 'Width',
-            name: 'width',
-            type: 'text',
-        },
-        {
-            label: 'Height',
-            name: 'height',
-            type: 'text',
-        },
-    ],
-};
-
 export const media: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
@@ -169,19 +167,4 @@ export const media: EditorFormDefinition = {
             }
         },
     ],
-};
-
-export const source: EditorFormDefinition = {
-    submitText: 'Save',
-    async action(formData, context: EditorUiContext) {
-        setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
-        return true;
-    },
-    fields: [
-        {
-            label: 'Source',
-            name: 'source',
-            type: 'textarea',
-        },
-    ],
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
new file mode 100644
index 00000000000..a045ba55d61
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -0,0 +1,112 @@
+import {
+    EditorFormDefinition,
+    EditorFormFieldDefinition,
+    EditorFormTabs,
+    EditorSelectFormFieldDefinition
+} from "../../framework/forms";
+import {EditorUiContext} from "../../framework/core";
+import {setEditorContentFromHtml} from "../../../actions";
+
+export const cellProperties: EditorFormDefinition = {
+    submitText: 'Save',
+    async action(formData, context: EditorUiContext) {
+        setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
+        return true;
+    },
+    fields: [
+        {
+            build() {
+                const generalFields: EditorFormFieldDefinition[] = [
+                    {
+                        label: 'Width',
+                        name: 'width',
+                        type: 'text',
+                    },
+                    {
+                        label: 'Height',
+                        name: 'height',
+                        type: 'text',
+                    },
+                    {
+                        label: 'Cell type',
+                        name: 'type',
+                        type: 'select',
+                        valuesByLabel: {
+                            'Cell': 'cell',
+                            'Header cell': 'header',
+                        }
+                    } as EditorSelectFormFieldDefinition,
+                    {
+                        label: 'Horizontal align',
+                        name: 'h_align',
+                        type: 'select',
+                        valuesByLabel: {
+                            'None': '',
+                            'Left': 'left',
+                            'Center': 'center',
+                            'Right': 'right',
+                        }
+                    } as EditorSelectFormFieldDefinition,
+                    {
+                        label: 'Vertical align',
+                        name: 'v_align',
+                        type: 'select',
+                        valuesByLabel: {
+                            'None': '',
+                            'Top': 'top',
+                            'Middle': 'middle',
+                            'Bottom': 'bottom',
+                        }
+                    } as EditorSelectFormFieldDefinition,
+                ];
+
+                const advancedFields: EditorFormFieldDefinition[] = [
+                    {
+                        label: 'Border width',
+                        name: 'border_width',
+                        type: 'text',
+                    },
+                    {
+                        label: 'Border style',
+                        name: 'border_style',
+                        type: 'select',
+                        valuesByLabel: {
+                            'Select...': '',
+                            "Solid": 'solid',
+                            "Dotted": 'dotted',
+                            "Dashed": 'dashed',
+                            "Double": 'double',
+                            "Groove": 'groove',
+                            "Ridge": 'ridge',
+                            "Inset": 'inset',
+                            "Outset": 'outset',
+                            "None": 'none',
+                            "Hidden": 'hidden',
+                        }
+                    } as EditorSelectFormFieldDefinition,
+                    {
+                        label: 'Border color',
+                        name: 'border_color',
+                        type: 'text',
+                    },
+                    {
+                        label: 'Background color',
+                        name: 'background_color',
+                        type: 'text',
+                    },
+                ];
+
+                return new EditorFormTabs([
+                    {
+                        label: 'General',
+                        contents: generalFields,
+                    },
+                    {
+                        label: 'Advanced',
+                        contents: advancedFields,
+                    }
+                ])
+            }
+        },
+    ],
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/modals.ts b/resources/js/wysiwyg/ui/defaults/modals.ts
new file mode 100644
index 00000000000..30351602cc4
--- /dev/null
+++ b/resources/js/wysiwyg/ui/defaults/modals.ts
@@ -0,0 +1,27 @@
+import {EditorFormModalDefinition} from "../framework/modals";
+import {image, link, media} from "./forms/objects";
+import {source} from "./forms/controls";
+import {cellProperties} from "./forms/tables";
+
+export const modals: Record<string, EditorFormModalDefinition> = {
+    link: {
+        title: 'Insert/Edit link',
+        form: link,
+    },
+    image: {
+        title: 'Insert/Edit Image',
+        form: image,
+    },
+    media: {
+        title: 'Insert/Edit Media',
+        form: media,
+    },
+    source: {
+        title: 'Source code',
+        form: source,
+    },
+    cell_properties: {
+        title: 'Cell Properties',
+        form: cellProperties,
+    },
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
new file mode 100644
index 00000000000..0557b37e53e
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
@@ -0,0 +1,80 @@
+import {$getNodeByKey, LexicalEditor} from "lexical";
+import {NodeKey} from "lexical/LexicalNode";
+import {
+    $isTableNode,
+    applyTableHandlers,
+    HTMLTableElementWithWithTableSelectionState,
+    TableNode,
+    TableObserver
+} from "@lexical/table";
+import {$isCustomTableNode, CustomTableNode} from "../../../nodes/custom-table";
+
+// File adapted from logic in:
+// https://github.com/facebook/lexical/blob/f373759a7849f473d34960a6bf4e34b2a011e762/packages/lexical-react/src/LexicalTablePlugin.ts#L49
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+// License: MIT
+
+class TableSelectionHandler {
+
+    protected editor: LexicalEditor
+    protected tableSelections = new Map<NodeKey, TableObserver>();
+    protected unregisterMutationListener = () => {};
+
+    constructor(editor: LexicalEditor) {
+        this.editor = editor;
+        this.init();
+    }
+
+    protected init() {
+        this.unregisterMutationListener = this.editor.registerMutationListener(CustomTableNode, (mutations) => {
+            for (const [nodeKey, mutation] of mutations) {
+                if (mutation === 'created') {
+                    this.editor.getEditorState().read(() => {
+                        const tableNode = $getNodeByKey<CustomTableNode>(nodeKey);
+                        if ($isCustomTableNode(tableNode)) {
+                            this.initializeTableNode(tableNode);
+                        }
+                    });
+                } else if (mutation === 'destroyed') {
+                    const tableSelection = this.tableSelections.get(nodeKey);
+
+                    if (tableSelection !== undefined) {
+                        tableSelection.removeListeners();
+                        this.tableSelections.delete(nodeKey);
+                    }
+                }
+            }
+        });
+    }
+
+    protected initializeTableNode(tableNode: TableNode) {
+        const nodeKey = tableNode.getKey();
+        const tableElement = this.editor.getElementByKey(
+            nodeKey,
+        ) as HTMLTableElementWithWithTableSelectionState;
+        if (tableElement && !this.tableSelections.has(nodeKey)) {
+            const tableSelection = applyTableHandlers(
+                tableNode,
+                tableElement,
+                this.editor,
+                false,
+            );
+            this.tableSelections.set(nodeKey, tableSelection);
+        }
+    };
+
+    teardown() {
+        this.unregisterMutationListener();
+        for (const [, tableSelection] of this.tableSelections) {
+            tableSelection.removeListeners();
+        }
+    }
+}
+
+export function registerTableSelectionHandler(editor: LexicalEditor): (() => void) {
+    const resizer = new TableSelectionHandler(editor);
+
+    return () => {
+        resizer.teardown();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index a3f150e529e..5fbaec91b55 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,11 +6,11 @@ import {
     getMainEditorFullToolbar, getTableToolbarContent
 } from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {image as imageFormDefinition, link as linkFormDefinition, media as mediaFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
 import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
+import {modals} from "./defaults/modals";
 
 export function buildEditorUI(container: HTMLElement, element: HTMLElement, scrollContainer: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
     const manager = new EditorUIManager();
@@ -30,22 +30,9 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
     manager.setToolbar(getMainEditorFullToolbar());
 
     // Register modals
-    manager.registerModal('link', {
-        title: 'Insert/Edit link',
-        form: linkFormDefinition,
-    });
-    manager.registerModal('image', {
-        title: 'Insert/Edit Image',
-        form: imageFormDefinition
-    });
-    manager.registerModal('media', {
-        title: 'Insert/Edit Media',
-        form: mediaFormDefinition,
-    });
-    manager.registerModal('source', {
-        title: 'Source code',
-        form: sourceFormDefinition,
-    });
+    for (const key of Object.keys(modals)) {
+        manager.registerModal(key, modals[key]);
+    }
 
     // Register context toolbars
     manager.registerContextToolbar('image', {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index d2b179eb6ce..43f00c0014b 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -9,12 +9,13 @@ import {EditorTableCreator} from "./framework/blocks/table-creator";
 import {EditorColorButton} from "./framework/blocks/color-button";
 import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
 import {
+    cellProperties,
     deleteColumn,
     deleteRow,
     deleteTable, deleteTableMenuAction, insertColumnAfter,
     insertColumnBefore,
     insertRowAbove,
-    insertRowBelow,
+    insertRowBelow, mergeCells, splitCell,
     table
 } from "./defaults/buttons/tables";
 import {fullscreen, redo, source, undo} from "./defaults/buttons/controls";
@@ -118,6 +119,11 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
                 new EditorDropdownButton({button: {...table, format: 'long'}, showOnHover: true}, [
                     new EditorTableCreator(),
                 ]),
+                new EditorDropdownButton({button: {label: 'Cell'}}, [
+                    new EditorButton(cellProperties),
+                    new EditorButton(mergeCells),
+                    new EditorButton(splitCell),
+                ]),
                 new EditorButton(deleteTableMenuAction),
             ]),
 

From e94ad78ea76b67e0019387afaad0d4e03a8c4346 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 3 Aug 2024 18:01:54 +0100
Subject: [PATCH 226/666] Lexical: Completed out table menu elements, logic
 pending

---
 resources/js/wysiwyg/todo.md                  |   9 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 225 ++++++++++++++++--
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 178 +++++++++++---
 resources/js/wysiwyg/ui/defaults/modals.ts    |  10 +-
 .../ui/framework/blocks/dropdown-button.ts    |   4 +-
 .../wysiwyg/ui/framework/helpers/dropdowns.ts |   2 +-
 resources/js/wysiwyg/ui/toolbars.ts           |  47 +++-
 7 files changed, 409 insertions(+), 66 deletions(-)

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 0354b7935ff..a0ea2e1ebfb 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,15 +3,18 @@
 ## In progress
 
 - Table features
-  - Continued table dropdown menu
-  - Connect up cell properties form
+  - Cell properties form logic
   - Merge cell action
+  - Row properties form logic
+  - Table properties form logic
+    - Caption text support 
+  - Resize to contents button
+  - Remove formatting button
 
 ## Main Todo
 
 - Alignments: Use existing classes for blocks
 - Alignments: Handle inline block content (image, video)
-
 - Image paste upload
 - Keyboard shortcuts support
 - Add ID support to all block types
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index e3f7bb570e5..b0f0bf346a9 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -9,25 +9,93 @@ import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
 import {
-    $getNodeFromSelection,
+    $getNodeFromSelection, $getParentOfType,
     $selectionContainsNodeType
 } from "../../../helpers";
-import {$getSelection} from "lexical";
+import {$getSelection, BaseSelection} from "lexical";
 import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
+    $createTableRowNode,
     $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
     $insertTableRow__EXPERIMENTAL, $isTableCellNode,
-    $isTableNode, $isTableSelection, $unmergeCell, TableCellNode,
+    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode, TableNode,
 } from "@lexical/table";
 
+const neverActive = (): boolean => false;
+const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isTableCellNode);
 
 export const table: EditorBasicButtonDefinition = {
     label: 'Table',
     icon: tableIcon,
 };
 
+export const tableProperties: EditorButtonDefinition = {
+    label: 'Table properties',
+    icon: tableIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
+                return;
+            }
+
+            const table = $getParentOfType(cell, $isTableNode);
+            const modalForm = context.manager.createModal('table_properties');
+            modalForm.show({});
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const clearTableFormatting: EditorButtonDefinition = {
+    label: 'Clear table formatting',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
+                return;
+            }
+
+            const table = $getParentOfType(cell, $isTableNode);
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const resizeTableToContents: EditorButtonDefinition = {
+    label: 'Resize to contents',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
+                return;
+            }
+
+            const table = $getParentOfType(cell, $isCustomTableNode);
+            if (!$isCustomTableNode(table)) {
+                return;
+            }
+
+            for (const row of table.getChildren()) {
+                if ($isTableRowNode(row)) {
+                    // TODO - Come back later as this may depend on if we
+                    //   are using a custom table row
+                }
+            }
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
 export const deleteTable: EditorButtonDefinition = {
     label: 'Delete table',
     icon: deleteIcon,
@@ -53,29 +121,27 @@ export const deleteTableMenuAction: EditorButtonDefinition = {
 };
 
 export const insertRowAbove: EditorButtonDefinition = {
-    label: 'Insert row above',
+    label: 'Insert row before',
     icon: insertRowAboveIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
             $insertTableRow__EXPERIMENTAL(false);
         });
     },
-    isActive() {
-        return false;
-    }
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
 };
 
 export const insertRowBelow: EditorButtonDefinition = {
-    label: 'Insert row below',
+    label: 'Insert row after',
     icon: insertRowBelowIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
             $insertTableRow__EXPERIMENTAL(true);
         });
     },
-    isActive() {
-        return false;
-    }
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
 };
 
 export const deleteRow: EditorButtonDefinition = {
@@ -86,9 +152,124 @@ export const deleteRow: EditorButtonDefinition = {
             $deleteTableRow__EXPERIMENTAL();
         });
     },
-    isActive() {
-        return false;
-    }
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const rowProperties: EditorButtonDefinition = {
+    label: 'Row properties',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
+                return;
+            }
+
+            const row = $getParentOfType(cell, $isTableRowNode);
+            const modalForm = context.manager.createModal('row_properties');
+            modalForm.show({});
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const cutRow: EditorButtonDefinition = {
+    label: 'Cut row',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const copyRow: EditorButtonDefinition = {
+    label: 'Copy row',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const pasteRowBefore: EditorButtonDefinition = {
+    label: 'Paste row before',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const pasteRowAfter: EditorButtonDefinition = {
+    label: 'Paste row after',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const cutColumn: EditorButtonDefinition = {
+    label: 'Cut column',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const copyColumn: EditorButtonDefinition = {
+    label: 'Copy column',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const pasteColumnBefore: EditorButtonDefinition = {
+    label: 'Paste column before',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
+};
+
+export const pasteColumnAfter: EditorButtonDefinition = {
+    label: 'Paste column after',
+    format: 'long',
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            // TODO
+        });
+    },
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
 };
 
 export const insertColumnBefore: EditorButtonDefinition = {
@@ -142,12 +323,8 @@ export const cellProperties: EditorButtonDefinition = {
             }
         });
     },
-    isActive() {
-        return false;
-    },
-    isDisabled(selection) {
-        return !$selectionContainsNodeType(selection, $isTableCellNode);
-    }
+    isActive: neverActive,
+    isDisabled: cellNotSelected,
 };
 
 export const mergeCells: EditorButtonDefinition = {
@@ -159,9 +336,7 @@ export const mergeCells: EditorButtonDefinition = {
             // https://github.com/facebook/lexical/blob/f373759a7849f473d34960a6bf4e34b2a011e762/packages/lexical-playground/src/plugins/TableActionMenuPlugin/index.tsx#L299
         });
     },
-    isActive() {
-        return false;
-    },
+    isActive: neverActive,
     isDisabled(selection) {
         return !$isTableSelection(selection);
     }
@@ -174,9 +349,7 @@ export const splitCell: EditorButtonDefinition = {
             $unmergeCell();
         });
     },
-    isActive() {
-        return false;
-    },
+    isActive: neverActive,
     isDisabled(selection) {
         const cell = $getNodeFromSelection(selection, $isTableCellNode) as TableCellNode|null;
         if (cell) {
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index a045ba55d61..9951bfe7ff6 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -5,12 +5,54 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {setEditorContentFromHtml} from "../../../actions";
+
+const borderStyleInput: EditorSelectFormFieldDefinition = {
+    label: 'Border style',
+    name: 'border_style',
+    type: 'select',
+    valuesByLabel: {
+        'Select...': '',
+        "Solid": 'solid',
+        "Dotted": 'dotted',
+        "Dashed": 'dashed',
+        "Double": 'double',
+        "Groove": 'groove',
+        "Ridge": 'ridge',
+        "Inset": 'inset',
+        "Outset": 'outset',
+        "None": 'none',
+        "Hidden": 'hidden',
+    }
+};
+
+const borderColorInput: EditorFormFieldDefinition = {
+    label: 'Border color',
+    name: 'border_color',
+    type: 'text',
+};
+
+const backgroundColorInput: EditorFormFieldDefinition = {
+    label: 'Background color',
+    name: 'background_color',
+    type: 'text',
+};
+
+const alignmentInput: EditorSelectFormFieldDefinition = {
+    label: 'Alignment',
+    name: 'align',
+    type: 'select',
+    valuesByLabel: {
+        'None': '',
+        'Left': 'left',
+        'Center': 'center',
+        'Right': 'right',
+    }
+};
 
 export const cellProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
-        setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
+        // TODO
         return true;
     },
     fields: [
@@ -37,16 +79,10 @@ export const cellProperties: EditorFormDefinition = {
                         }
                     } as EditorSelectFormFieldDefinition,
                     {
+                        ...alignmentInput,
                         label: 'Horizontal align',
                         name: 'h_align',
-                        type: 'select',
-                        valuesByLabel: {
-                            'None': '',
-                            'Left': 'left',
-                            'Center': 'center',
-                            'Right': 'right',
-                        }
-                    } as EditorSelectFormFieldDefinition,
+                    },
                     {
                         label: 'Vertical align',
                         name: 'v_align',
@@ -66,34 +102,122 @@ export const cellProperties: EditorFormDefinition = {
                         name: 'border_width',
                         type: 'text',
                     },
+                    borderStyleInput,
+                    borderColorInput,
+                    backgroundColorInput,
+                ];
+
+                return new EditorFormTabs([
+                    {
+                        label: 'General',
+                        contents: generalFields,
+                    },
+                    {
+                        label: 'Advanced',
+                        contents: advancedFields,
+                    }
+                ])
+            }
+        },
+    ],
+};
+
+export const rowProperties: EditorFormDefinition = {
+    submitText: 'Save',
+    async action(formData, context: EditorUiContext) {
+        // TODO
+        return true;
+    },
+    fields: [
+        {
+            build() {
+                const generalFields: EditorFormFieldDefinition[] = [
                     {
-                        label: 'Border style',
-                        name: 'border_style',
+                        label: 'Row type',
+                        name: 'type',
                         type: 'select',
                         valuesByLabel: {
-                            'Select...': '',
-                            "Solid": 'solid',
-                            "Dotted": 'dotted',
-                            "Dashed": 'dashed',
-                            "Double": 'double',
-                            "Groove": 'groove',
-                            "Ridge": 'ridge',
-                            "Inset": 'inset',
-                            "Outset": 'outset',
-                            "None": 'none',
-                            "Hidden": 'hidden',
+                            'Body': 'body',
+                            'Header': 'header',
+                            'Footer': 'footer',
                         }
                     } as EditorSelectFormFieldDefinition,
+                    alignmentInput,
+                    {
+                        label: 'Height',
+                        name: 'height',
+                        type: 'text',
+                    },
+                ];
+
+                const advancedFields: EditorFormFieldDefinition[] = [
+                    borderStyleInput,
+                    borderColorInput,
+                    backgroundColorInput,
+                ];
+
+                return new EditorFormTabs([
+                    {
+                        label: 'General',
+                        contents: generalFields,
+                    },
+                    {
+                        label: 'Advanced',
+                        contents: advancedFields,
+                    }
+                ])
+            }
+        },
+    ],
+};
+
+export const tableProperties: EditorFormDefinition = {
+    submitText: 'Save',
+    async action(formData, context: EditorUiContext) {
+        // TODO
+        return true;
+    },
+    fields: [
+        {
+            build() {
+                const generalFields: EditorFormFieldDefinition[] = [
+                    {
+                        label: 'Width',
+                        name: 'width',
+                        type: 'text',
+                    },
+                    {
+                        label: 'Height',
+                        name: 'height',
+                        type: 'text',
+                    },
                     {
-                        label: 'Border color',
-                        name: 'border_color',
+                        label: 'Cell spacing',
+                        name: 'cell_spacing',
                         type: 'text',
                     },
                     {
-                        label: 'Background color',
-                        name: 'background_color',
+                        label: 'Cell padding',
+                        name: 'cell_padding',
                         type: 'text',
                     },
+                    {
+                        label: 'Border width',
+                        name: 'border_width',
+                        type: 'text',
+                    },
+                    {
+                        label: 'caption',
+                        name: 'height',
+                        type: 'text', // TODO -
+                    },
+                    alignmentInput,
+                ];
+
+                const advancedFields: EditorFormFieldDefinition[] = [
+                    borderStyleInput,
+                    borderColorInput,
+                    backgroundColorInput,
                 ];
 
                 return new EditorFormTabs([
diff --git a/resources/js/wysiwyg/ui/defaults/modals.ts b/resources/js/wysiwyg/ui/defaults/modals.ts
index 30351602cc4..44d4e036094 100644
--- a/resources/js/wysiwyg/ui/defaults/modals.ts
+++ b/resources/js/wysiwyg/ui/defaults/modals.ts
@@ -1,7 +1,7 @@
 import {EditorFormModalDefinition} from "../framework/modals";
 import {image, link, media} from "./forms/objects";
 import {source} from "./forms/controls";
-import {cellProperties} from "./forms/tables";
+import {cellProperties, rowProperties, tableProperties} from "./forms/tables";
 
 export const modals: Record<string, EditorFormModalDefinition> = {
     link: {
@@ -24,4 +24,12 @@ export const modals: Record<string, EditorFormModalDefinition> = {
         title: 'Cell Properties',
         form: cellProperties,
     },
+    row_properties: {
+        title: 'Row Properties',
+        form: rowProperties,
+    },
+    table_properties: {
+        title: 'Table Properties',
+        form: tableProperties,
+    },
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index 24659b5469c..da0d3e5d0cf 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -24,7 +24,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
     constructor(options: EditorDropdownButtonOptions, children: EditorUiElement[]) {
         super(children);
         this.childItems = children;
-        this.options = Object.assign(defaultOptions, options);
+        this.options = Object.assign({}, defaultOptions, options);
 
         if (options.button instanceof EditorButton) {
             this.button = options.button;
@@ -61,7 +61,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
             class: 'editor-dropdown-menu-container',
         }, [button, menu]);
 
-        handleDropdown({toggle : button, menu : menu,
+        handleDropdown({toggle: button, menu : menu,
             showOnHover: this.options.showOnHover,
             onOpen : () => {
             this.open = true;
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index 45c3f39d190..e8cef3c8d20 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -44,5 +44,5 @@ export function handleDropdown(options: HandleDropdownParams) {
         toggle.addEventListener('mouseenter', toggleShowing);
     }
 
-    menu.addEventListener('mouseleave', hide);
+    menu.parentElement?.addEventListener('mouseleave', hide);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 43f00c0014b..3346e0a0724 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -9,14 +9,27 @@ import {EditorTableCreator} from "./framework/blocks/table-creator";
 import {EditorColorButton} from "./framework/blocks/color-button";
 import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
 import {
-    cellProperties,
+    cellProperties, clearTableFormatting,
+    copyColumn,
+    copyRow,
+    cutColumn,
+    cutRow,
     deleteColumn,
     deleteRow,
-    deleteTable, deleteTableMenuAction, insertColumnAfter,
+    deleteTable,
+    deleteTableMenuAction,
+    insertColumnAfter,
     insertColumnBefore,
     insertRowAbove,
-    insertRowBelow, mergeCells, splitCell,
-    table
+    insertRowBelow,
+    mergeCells,
+    pasteColumnAfter,
+    pasteColumnBefore,
+    pasteRowAfter,
+    pasteRowBefore, resizeTableToContents,
+    rowProperties,
+    splitCell,
+    table, tableProperties
 } from "./defaults/buttons/tables";
 import {fullscreen, redo, source, undo} from "./defaults/buttons/controls";
 import {
@@ -119,11 +132,33 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
                 new EditorDropdownButton({button: {...table, format: 'long'}, showOnHover: true}, [
                     new EditorTableCreator(),
                 ]),
-                new EditorDropdownButton({button: {label: 'Cell'}}, [
+                new EditorDropdownButton({button: {label: 'Cell'}, direction: 'vertical', showOnHover: true}, [
                     new EditorButton(cellProperties),
                     new EditorButton(mergeCells),
                     new EditorButton(splitCell),
                 ]),
+                new EditorDropdownButton({button: {label: 'Row'}, direction: 'vertical', showOnHover: true}, [
+                    new EditorButton({...insertRowAbove, format: 'long'}),
+                    new EditorButton({...insertRowBelow, format: 'long'}),
+                    new EditorButton({...deleteRow, format: 'long'}),
+                    new EditorButton(rowProperties),
+                    new EditorButton(cutRow),
+                    new EditorButton(copyRow),
+                    new EditorButton(pasteRowBefore),
+                    new EditorButton(pasteRowAfter),
+                ]),
+                new EditorDropdownButton({button: {label: 'Column'}, direction: 'vertical', showOnHover: true}, [
+                    new EditorButton({...insertColumnBefore, format: 'long'}),
+                    new EditorButton({...insertColumnAfter, format: 'long'}),
+                    new EditorButton({...deleteColumn, format: 'long'}),
+                    new EditorButton(cutColumn),
+                    new EditorButton(copyColumn),
+                    new EditorButton(pasteColumnBefore),
+                    new EditorButton(pasteColumnAfter),
+                ]),
+                new EditorButton({...tableProperties, format: 'long'}),
+                new EditorButton(clearTableFormatting),
+                new EditorButton(resizeTableToContents),
                 new EditorButton(deleteTableMenuAction),
             ]),
 
@@ -176,7 +211,7 @@ export function getCodeToolbarContent(): EditorUiElement[] {
 export function getTableToolbarContent(): EditorUiElement[] {
     return [
         new EditorOverflowContainer(2, [
-            // Todo - Table properties
+            new EditorButton(tableProperties),
             new EditorButton(deleteTable),
         ]),
         new EditorOverflowContainer(3, [

From efec752985465227958c48eb5fb90faf95b66fb3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 3 Aug 2024 18:14:01 +0100
Subject: [PATCH 227/666] Lexical: Split helpers to utils, refactored files

---
 resources/js/wysiwyg/index.ts                 |   8 +-
 resources/js/wysiwyg/nodes/code-block.ts      |   2 +-
 .../js/wysiwyg/nodes/custom-list-item.ts      |   3 +-
 resources/js/wysiwyg/nodes/custom-table.ts    |   3 +-
 resources/js/wysiwyg/nodes/details.ts         |   3 +-
 resources/js/wysiwyg/nodes/diagram.ts         |   2 +-
 resources/js/wysiwyg/nodes/image.ts           |   2 +-
 resources/js/wysiwyg/nodes/media.ts           |   3 +-
 .../wysiwyg/{ => services}/common-events.ts   |   2 +-
 .../wysiwyg/{ => services}/drop-handling.ts   |   8 +-
 .../js/wysiwyg/ui/decorators/code-block.ts    |   2 +-
 resources/js/wysiwyg/ui/decorators/diagram.ts |   2 +-
 resources/js/wysiwyg/ui/decorators/image.ts   |   3 +-
 .../wysiwyg/ui/defaults/buttons/alignments.ts |   2 +-
 .../ui/defaults/buttons/block-formats.ts      |   2 +-
 .../wysiwyg/ui/defaults/buttons/controls.ts   |   2 +-
 .../ui/defaults/buttons/inline-formats.ts     |   2 +-
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   |   2 +-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |   6 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |   6 +-
 .../js/wysiwyg/ui/defaults/forms/controls.ts  |   2 +-
 .../js/wysiwyg/ui/defaults/forms/objects.ts   |   2 +-
 .../ui/framework/blocks/color-picker.ts       |   2 +-
 .../ui/framework/blocks/dropdown-button.ts    |   2 +-
 .../ui/framework/blocks/format-menu.ts        |   2 +-
 .../framework/blocks/format-preview-button.ts |   2 +-
 .../ui/framework/blocks/overflow-container.ts |   2 +-
 .../ui/framework/blocks/table-creator.ts      |   3 +-
 resources/js/wysiwyg/ui/framework/buttons.ts  |   3 +-
 resources/js/wysiwyg/ui/framework/core.ts     |   3 +-
 resources/js/wysiwyg/ui/framework/forms.ts    |   2 +-
 .../ui/framework/helpers/table-resizer.ts     |   2 +-
 resources/js/wysiwyg/ui/framework/modals.ts   |   2 +-
 resources/js/wysiwyg/ui/framework/toolbars.ts |   3 +-
 resources/js/wysiwyg/ui/toolbars.ts           |   3 +-
 resources/js/wysiwyg/{ => utils}/actions.ts   |   4 +-
 resources/js/wysiwyg/utils/dom.ts             |  24 ++++
 resources/js/wysiwyg/utils/nodes.ts           |  53 +++++++++
 .../{helpers.ts => utils/selection.ts}        | 107 ++++--------------
 39 files changed, 152 insertions(+), 136 deletions(-)
 rename resources/js/wysiwyg/{ => services}/common-events.ts (97%)
 rename resources/js/wysiwyg/{ => services}/drop-handling.ts (93%)
 rename resources/js/wysiwyg/{ => utils}/actions.ts (97%)
 create mode 100644 resources/js/wysiwyg/utils/dom.ts
 create mode 100644 resources/js/wysiwyg/utils/nodes.ts
 rename resources/js/wysiwyg/{helpers.ts => utils/selection.ts} (53%)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 71a007f590e..9da646a771a 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -4,14 +4,14 @@ import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
 import {getNodesForPageEditor, registerCommonNodeMutationListeners} from './nodes';
 import {buildEditorUI} from "./ui";
-import {getEditorContentAsHtml, setEditorContentFromHtml} from "./actions";
+import {getEditorContentAsHtml, setEditorContentFromHtml} from "./utils/actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
-import {el} from "./helpers";
 import {EditorUiContext} from "./ui/framework/core";
-import {listen as listenToCommonEvents} from "./common-events";
-import {handleDropEvents} from "./drop-handling";
+import {listen as listenToCommonEvents} from "./services/common-events";
+import {handleDropEvents} from "./services/drop-handling";
 import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
+import {el} from "./utils/dom";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index 2478ba24900..e240a38870a 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -8,9 +8,9 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
 import {CodeEditor} from "../../components";
+import {el} from "../utils/dom";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
index 21b9f6d5f93..2b4d7414632 100644
--- a/resources/js/wysiwyg/nodes/custom-list-item.ts
+++ b/resources/js/wysiwyg/nodes/custom-list-item.ts
@@ -1,7 +1,8 @@
 import {$isListNode, ListItemNode, SerializedListItemNode} from "@lexical/list";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {DOMExportOutput, LexicalEditor, LexicalNode} from "lexical";
-import {el} from "../helpers";
+
+import {el} from "../utils/dom";
 
 function updateListItemChecked(
     dom: HTMLElement,
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index 7dda24a7a30..32f3ec4fa57 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -1,7 +1,8 @@
 import {SerializedTableNode, TableNode, TableRowNode} from "@lexical/table";
 import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalEditor, LexicalNode, Spread} from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
+
+import {el} from "../utils/dom";
 
 export type SerializedCustomTableNode = Spread<{
     id: string;
diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/nodes/details.ts
index a18c4d858d5..8071d5e8fd9 100644
--- a/resources/js/wysiwyg/nodes/details.ts
+++ b/resources/js/wysiwyg/nodes/details.ts
@@ -7,7 +7,8 @@ import {
     SerializedElementNode,
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
+
+import {el} from "../utils/dom";
 
 export class DetailsNode extends ElementNode {
 
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/nodes/diagram.ts
index 1aff0640037..76d9392480f 100644
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/nodes/diagram.ts
@@ -8,11 +8,11 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
 import * as DrawIO from '../../services/drawio';
 import {EditorUiContext} from "../ui/framework/core";
 import {HttpError} from "../../services/http";
+import {el} from "../utils/dom";
 
 export type SerializedDiagramNode = Spread<{
     id: string;
diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index 92d5518dbc7..ef6bf35724a 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -8,8 +8,8 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
+import {el} from "../utils/dom";
 
 export interface ImageNodeOptions {
     alt?: string;
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index 751f420fa50..aba4f6c37b4 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -7,7 +7,8 @@ import {
     SerializedElementNode, Spread
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {el} from "../helpers";
+
+import {el} from "../utils/dom";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
diff --git a/resources/js/wysiwyg/common-events.ts b/resources/js/wysiwyg/services/common-events.ts
similarity index 97%
rename from resources/js/wysiwyg/common-events.ts
rename to resources/js/wysiwyg/services/common-events.ts
index 7355d977ba6..16522d66b71 100644
--- a/resources/js/wysiwyg/common-events.ts
+++ b/resources/js/wysiwyg/services/common-events.ts
@@ -5,7 +5,7 @@ import {
     insertHtmlIntoEditor,
     prependHtmlToEditor,
     setEditorContentFromHtml
-} from "./actions";
+} from "../utils/actions";
 
 type EditorEventContent = {
     html: string;
diff --git a/resources/js/wysiwyg/drop-handling.ts b/resources/js/wysiwyg/services/drop-handling.ts
similarity index 93%
rename from resources/js/wysiwyg/drop-handling.ts
rename to resources/js/wysiwyg/services/drop-handling.ts
index 5d541365ab5..7c9bb2713ba 100644
--- a/resources/js/wysiwyg/drop-handling.ts
+++ b/resources/js/wysiwyg/services/drop-handling.ts
@@ -3,12 +3,8 @@ import {
     LexicalEditor,
     LexicalNode
 } from "lexical";
-import {
-    $getNearestBlockNodeForCoords,
-    $htmlToBlockNodes,
-    $insertNewBlockNodesAtSelection,
-    $selectSingleNode
-} from "./helpers";
+import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
+import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
 
 function $getNodeFromMouseEvent(event: MouseEvent, editor: LexicalEditor): LexicalNode|null {
     const x = event.clientX;
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index d6947ea756d..650bd64c550 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,8 +1,8 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
 import {BaseSelection} from "lexical";
+import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 
 export class CodeBlockDecorator extends EditorDecorator {
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 0f1263f38f4..7c79f9f41d8 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,8 +1,8 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
-import {$selectionContainsNode, $selectSingleNode} from "../../helpers";
 import {BaseSelection} from "lexical";
 import {$openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
+import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 
 export class DiagramDecorator extends EditorDecorator {
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
index 2046260a023..d110bc49930 100644
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ b/resources/js/wysiwyg/ui/decorators/image.ts
@@ -1,9 +1,10 @@
 import {EditorDecorator} from "../framework/decorator";
-import {el, $selectSingleNode} from "../../helpers";
 import {$createNodeSelection, $setSelection} from "lexical";
 import {EditorUiContext} from "../framework/core";
 import {ImageNode} from "../../nodes/image";
 import {MouseDragTracker, MouseDragTrackerDistance} from "../framework/helpers/mouse-drag-tracker";
+import {$selectSingleNode} from "../../utils/selection";
+import {el} from "../../utils/dom";
 
 
 export class ImageDecorator extends EditorDecorator {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 2b441e5da87..40d9c89dce8 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -1,11 +1,11 @@
 import {$getSelection, BaseSelection, ElementFormatType} from "lexical";
-import {$getBlockElementNodesInSelection, $selectionContainsElementFormat} from "../../../helpers";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import alignLeftIcon from "@icons/editor/align-left.svg";
 import {EditorUiContext} from "../../framework/core";
 import alignCenterIcon from "@icons/editor/align-center.svg";
 import alignRightIcon from "@icons/editor/align-right.svg";
 import alignJustifyIcon from "@icons/editor/align-justify.svg";
+import {$getBlockElementNodesInSelection, $selectionContainsElementFormat} from "../../../utils/selection";
 
 
 function setAlignmentForSection(alignment: ElementFormatType): void {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index 0eb07ecf1f0..eba903263b3 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -1,7 +1,6 @@
 import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../../nodes/callout";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
-import {$selectionContainsNodeType, $toggleSelectionBlockNodeType} from "../../../helpers";
 import {$createParagraphNode, $isParagraphNode, BaseSelection, LexicalNode} from "lexical";
 import {
     $createHeadingNode,
@@ -11,6 +10,7 @@ import {
     HeadingNode,
     HeadingTagType
 } from "@lexical/rich-text";
+import {$selectionContainsNodeType, $toggleSelectionBlockNodeType} from "../../../utils/selection";
 
 function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
     return {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
index ad69d69d13c..2a2fecc40c4 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -11,7 +11,7 @@ import {
 } from "lexical";
 import redoIcon from "@icons/editor/redo.svg";
 import sourceIcon from "@icons/editor/source-view.svg";
-import {getEditorContentAsHtml} from "../../../actions";
+import {getEditorContentAsHtml} from "../../../utils/actions";
 import fullscreenIcon from "@icons/editor/fullscreen.svg";
 
 export const undo: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
index d04f72a2e57..a967ecb2fc0 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -1,7 +1,6 @@
 import {$getSelection, $isTextNode, BaseSelection, FORMAT_TEXT_COMMAND, TextFormatType} from "lexical";
 import {EditorBasicButtonDefinition, EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
-import {$selectionContainsTextFormat} from "../../../helpers";
 import boldIcon from "@icons/editor/bold.svg";
 import italicIcon from "@icons/editor/italic.svg";
 import underlinedIcon from "@icons/editor/underlined.svg";
@@ -12,6 +11,7 @@ import superscriptIcon from "@icons/editor/superscript.svg";
 import subscriptIcon from "@icons/editor/subscript.svg";
 import codeIcon from "@icons/editor/code.svg";
 import formatClearIcon from "@icons/editor/format-clear.svg";
+import {$selectionContainsTextFormat} from "../../../utils/selection";
 
 function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
     return {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
index ecda290a12c..10500eb6718 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -2,10 +2,10 @@ import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {$getSelection, BaseSelection, LexicalNode} from "lexical";
-import {$selectionContainsNodeType} from "../../../helpers";
 import listBulletIcon from "@icons/editor/list-bullet.svg";
 import listNumberedIcon from "@icons/editor/list-numbered.svg";
 import listCheckIcon from "@icons/editor/list-check.svg";
+import {$selectionContainsNodeType} from "../../../utils/selection";
 
 
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 3c14052baa4..0eac497fce8 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -10,7 +10,6 @@ import {
     BaseSelection,
     ElementNode
 } from "lexical";
-import {$getNodeFromSelection, $insertNewBlockNodeAtSelection, $selectionContainsNodeType} from "../../../helpers";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import unlinkIcon from "@icons/editor/unlink.svg";
 import imageIcon from "@icons/editor/image.svg";
@@ -26,6 +25,11 @@ import detailsIcon from "@icons/editor/details.svg";
 import mediaIcon from "@icons/editor/media.svg";
 import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
 import {$isMediaNode, MediaNode} from "../../../nodes/media";
+import {
+    $getNodeFromSelection,
+    $insertNewBlockNodeAtSelection,
+    $selectionContainsNodeType
+} from "../../../utils/selection";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index b0f0bf346a9..2cc2e701b69 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -8,10 +8,6 @@ import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg
 import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
-import {
-    $getNodeFromSelection, $getParentOfType,
-    $selectionContainsNodeType
-} from "../../../helpers";
 import {$getSelection, BaseSelection} from "lexical";
 import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
@@ -22,6 +18,8 @@ import {
     $insertTableRow__EXPERIMENTAL, $isTableCellNode,
     $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode, TableNode,
 } from "@lexical/table";
+import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
+import {$getParentOfType} from "../../../utils/nodes";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isTableCellNode);
diff --git a/resources/js/wysiwyg/ui/defaults/forms/controls.ts b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
index bcb2f5bad6e..fc461f6626f 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
@@ -1,6 +1,6 @@
 import {EditorFormDefinition} from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {setEditorContentFromHtml} from "../../../actions";
+import {setEditorContentFromHtml} from "../../../utils/actions";
 
 export const source: EditorFormDefinition = {
     submitText: 'Save',
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 7a388751bc4..dbb89b18f9d 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -4,8 +4,8 @@ import {$createTextNode, $getSelection} from "lexical";
 import {$createImageNode} from "../../../nodes/image";
 import {$createLinkNode} from "@lexical/link";
 import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
-import {$getNodeFromSelection} from "../../../helpers";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
+import {$getNodeFromSelection} from "../../../utils/selection";
 
 export const image: EditorFormDefinition = {
     submitText: 'Apply',
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
index 6972d7a8e44..48e313f5cca 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -1,7 +1,7 @@
-import {el} from "../../../helpers";
 import {EditorUiElement} from "../core";
 import {$getSelection} from "lexical";
 import {$patchStyleText} from "@lexical/selection";
+import {el} from "../../../utils/dom";
 
 const colorChoices = [
     '#000000',
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index da0d3e5d0cf..a7905a6dde2 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -1,7 +1,7 @@
-import {el} from "../../../helpers";
 import {handleDropdown} from "../helpers/dropdowns";
 import {EditorContainerUiElement, EditorUiElement} from "../core";
 import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
+import {el} from "../../../utils/dom";
 
 export type EditorDropdownButtonOptions = {
     showOnHover?: boolean;
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
index b0834fe4d48..d666954bf05 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
@@ -1,7 +1,7 @@
-import {el} from "../../../helpers";
 import {EditorUiStateUpdate, EditorContainerUiElement} from "../core";
 import {EditorButton} from "../buttons";
 import {handleDropdown} from "../helpers/dropdowns";
+import {el} from "../../../utils/dom";
 
 export class EditorFormatMenu extends EditorContainerUiElement {
     buildDOM(): HTMLElement {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts b/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
index f83035aa6bd..2371983dd5f 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-preview-button.ts
@@ -1,5 +1,5 @@
-import {el} from "../../../helpers";
 import {EditorButton, EditorButtonDefinition} from "../buttons";
+import {el} from "../../../utils/dom";
 
 export class FormatPreviewButton extends EditorButton {
     protected previewSampleElement: HTMLElement;
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
index 108992db889..cd078053415 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -1,7 +1,7 @@
 import {EditorContainerUiElement, EditorUiElement} from "../core";
-import {el} from "../../../helpers";
 import {EditorDropdownButton} from "./dropdown-button";
 import moreHorizontal from "@icons/editor/more-horizontal.svg"
+import {el} from "../../../utils/dom";
 
 
 export class EditorOverflowContainer extends EditorContainerUiElement {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index 1981fcb8624..a8a142df5a1 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -1,7 +1,8 @@
-import {el, $insertNewBlockNodeAtSelection} from "../../../helpers";
 import {EditorUiElement} from "../core";
 import {$createTableNodeWithDimensions} from "@lexical/table";
 import {CustomTableNode} from "../../../nodes/custom-table";
+import {$insertNewBlockNodeAtSelection} from "../../../utils/selection";
+import {el} from "../../../utils/dom";
 
 
 export class EditorTableCreator extends EditorUiElement {
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 9a23edfb7f6..cf114aa0212 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -1,6 +1,7 @@
 import {BaseSelection} from "lexical";
 import {EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
-import {el} from "../../helpers";
+
+import {el} from "../../utils/dom";
 
 export interface EditorBasicButtonDefinition {
     label: string;
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index f644bc37a70..3e9f1e3d935 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -1,6 +1,7 @@
 import {BaseSelection, LexicalEditor} from "lexical";
 import {EditorUIManager} from "./manager";
-import {el} from "../../helpers";
+
+import {el} from "../../utils/dom";
 
 export type EditorUiStateUpdate = {
     editor: LexicalEditor;
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index b225a3de2c2..a2db34dd7a1 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -5,8 +5,8 @@ import {
     EditorUiBuilderDefinition,
     isUiBuilderDefinition
 } from "./core";
-import {el} from "../../helpers";
 import {uniqueId} from "../../../services/util";
+import {el} from "../../utils/dom";
 
 export interface EditorFormFieldDefinition {
     label: string;
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 2d995883a5b..f312294c59d 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -1,8 +1,8 @@
 import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
-import {el} from "../../../helpers";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {$getTableColumnWidth, $setTableColumnWidth, CustomTableNode} from "../../../nodes/custom-table";
 import {TableRowNode} from "@lexical/table";
+import {el} from "../../../utils/dom";
 
 type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 6b09accdc8b..1768f6f545b 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -1,7 +1,7 @@
 import {EditorForm, EditorFormDefinition} from "./forms";
-import {el} from "../../helpers";
 import {EditorContainerUiElement} from "./core";
 import closeIcon from "@icons/close.svg";
+import {el} from "../../utils/dom";
 
 export interface EditorModalDefinition {
     title: string;
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index d7c48193479..b4e49af950c 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -1,5 +1,6 @@
 import {EditorContainerUiElement, EditorUiElement} from "./core";
-import {el} from "../../helpers";
+
+import {el} from "../../utils/dom";
 
 export type EditorContextToolbarDefinition = {
     selector: string;
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 3346e0a0724..48e11837c95 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,6 +1,5 @@
 import {EditorButton} from "./framework/buttons";
 import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiElement} from "./framework/core";
-import {$selectionContainsNodeType, el} from "../helpers";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
@@ -65,6 +64,8 @@ import {
     unlink
 } from "./defaults/buttons/objects";
 import {$isTableNode} from "@lexical/table";
+import {$selectionContainsNodeType} from "../utils/selection";
+import {el} from "../utils/dom";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
diff --git a/resources/js/wysiwyg/actions.ts b/resources/js/wysiwyg/utils/actions.ts
similarity index 97%
rename from resources/js/wysiwyg/actions.ts
rename to resources/js/wysiwyg/utils/actions.ts
index a3d2f0ef603..ae829bae3a3 100644
--- a/resources/js/wysiwyg/actions.ts
+++ b/resources/js/wysiwyg/utils/actions.ts
@@ -1,8 +1,6 @@
 import {$getRoot, $getSelection, LexicalEditor} from "lexical";
 import {$generateHtmlFromNodes} from "@lexical/html";
-import {$htmlToBlockNodes} from "./helpers";
-
-
+import {$htmlToBlockNodes} from "./nodes";
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
     editor.update(() => {
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
new file mode 100644
index 00000000000..dc0872e89c8
--- /dev/null
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -0,0 +1,24 @@
+export function el(tag: string, attrs: Record<string, string | null> = {}, children: (string | HTMLElement)[] = []): HTMLElement {
+    const el = document.createElement(tag);
+    const attrKeys = Object.keys(attrs);
+    for (const attr of attrKeys) {
+        if (attrs[attr] !== null) {
+            el.setAttribute(attr, attrs[attr] as string);
+        }
+    }
+
+    for (const child of children) {
+        if (typeof child === 'string') {
+            el.append(document.createTextNode(child));
+        } else {
+            el.append(child);
+        }
+    }
+
+    return el;
+}
+
+export function htmlToDom(html: string): Document {
+    const parser = new DOMParser();
+    return parser.parseFromString(html, 'text/html');
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
new file mode 100644
index 00000000000..8e6c666109b
--- /dev/null
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -0,0 +1,53 @@
+import {$getRoot, $isTextNode, LexicalEditor, LexicalNode} from "lexical";
+import {LexicalNodeMatcher} from "../nodes";
+import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+import {$generateNodesFromDOM} from "@lexical/html";
+import {htmlToDom} from "./dom";
+
+function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
+    return nodes.map(node => {
+        if ($isTextNode(node)) {
+            const paragraph = $createCustomParagraphNode();
+            paragraph.append(node);
+            return paragraph;
+        }
+        return node;
+    });
+}
+
+export function $htmlToBlockNodes(editor: LexicalEditor, html: string): LexicalNode[] {
+    const dom = htmlToDom(html);
+    const nodes = $generateNodesFromDOM(editor, dom);
+    return wrapTextNodes(nodes);
+}
+
+export function $getParentOfType(node: LexicalNode, matcher: LexicalNodeMatcher): LexicalNode | null {
+    for (const parent of node.getParents()) {
+        if (matcher(parent)) {
+            return parent;
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Get the nearest root/block level node for the given position.
+ */
+export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number, y: number): LexicalNode | null {
+    // TODO - Take into account x for floated blocks?
+    const rootNodes = $getRoot().getChildren();
+    for (const node of rootNodes) {
+        const nodeDom = editor.getElementByKey(node.__key);
+        if (!nodeDom) {
+            continue;
+        }
+
+        const bounds = nodeDom.getBoundingClientRect();
+        if (y <= bounds.bottom) {
+            return node;
+        }
+    }
+
+    return null;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/helpers.ts b/resources/js/wysiwyg/utils/selection.ts
similarity index 53%
rename from resources/js/wysiwyg/helpers.ts
rename to resources/js/wysiwyg/utils/selection.ts
index 07755f449e6..e34afbe36e8 100644
--- a/resources/js/wysiwyg/helpers.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -1,64 +1,28 @@
 import {
     $createNodeSelection,
-    $createParagraphNode, $getRoot,
-    $getSelection, $isElementNode,
-    $isTextNode, $setSelection,
-    BaseSelection, ElementFormatType, ElementNode, LexicalEditor,
-    LexicalNode, TextFormatType
+    $createParagraphNode,
+    $getRoot,
+    $getSelection,
+    $isElementNode,
+    $isTextNode,
+    $setSelection,
+    BaseSelection,
+    ElementFormatType,
+    ElementNode,
+    LexicalNode,
+    TextFormatType
 } from "lexical";
-import {LexicalElementNodeCreator, LexicalNodeMatcher} from "./nodes";
 import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
+import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
-import {$createCustomParagraphNode} from "./nodes/custom-paragraph";
-import {$generateNodesFromDOM} from "@lexical/html";
-
-export function el(tag: string, attrs: Record<string, string|null> = {}, children: (string|HTMLElement)[] = []): HTMLElement {
-    const el = document.createElement(tag);
-    const attrKeys = Object.keys(attrs);
-    for (const attr of attrKeys) {
-        if (attrs[attr] !== null) {
-            el.setAttribute(attr, attrs[attr] as string);
-        }
-    }
-
-    for (const child of children) {
-        if (typeof child === 'string') {
-            el.append(document.createTextNode(child));
-        } else {
-            el.append(child);
-        }
-    }
 
-    return el;
-}
+import {$getParentOfType} from "./nodes";
 
-function htmlToDom(html: string): Document {
-    const parser = new DOMParser();
-    return parser.parseFromString(html, 'text/html');
-}
-
-function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
-    return nodes.map(node => {
-        if ($isTextNode(node)) {
-            const paragraph = $createCustomParagraphNode();
-            paragraph.append(node);
-            return paragraph;
-        }
-        return node;
-    });
-}
-
-export function $htmlToBlockNodes(editor: LexicalEditor, html: string): LexicalNode[] {
-    const dom = htmlToDom(html);
-    const nodes = $generateNodesFromDOM(editor, dom);
-    return wrapTextNodes(nodes);
-}
-
-export function $selectionContainsNodeType(selection: BaseSelection|null, matcher: LexicalNodeMatcher): boolean {
+export function $selectionContainsNodeType(selection: BaseSelection | null, matcher: LexicalNodeMatcher): boolean {
     return $getNodeFromSelection(selection, matcher) !== null;
 }
 
-export function $getNodeFromSelection(selection: BaseSelection|null, matcher: LexicalNodeMatcher): LexicalNode|null {
+export function $getNodeFromSelection(selection: BaseSelection | null, matcher: LexicalNodeMatcher): LexicalNode | null {
     if (!selection) {
         return null;
     }
@@ -77,17 +41,7 @@ export function $getNodeFromSelection(selection: BaseSelection|null, matcher: Le
     return null;
 }
 
-export function $getParentOfType(node: LexicalNode, matcher: LexicalNodeMatcher): LexicalNode|null {
-    for (const parent of node.getParents()) {
-        if (matcher(parent)) {
-            return parent;
-        }
-    }
-
-    return null;
-}
-
-export function $selectionContainsTextFormat(selection: BaseSelection|null, format: TextFormatType): boolean {
+export function $selectionContainsTextFormat(selection: BaseSelection | null, format: TextFormatType): boolean {
     if (!selection) {
         return false;
     }
@@ -140,7 +94,7 @@ export function $selectSingleNode(node: LexicalNode) {
     $setSelection(nodeSelection);
 }
 
-export function $selectionContainsNode(selection: BaseSelection|null, node: LexicalNode): boolean {
+export function $selectionContainsNode(selection: BaseSelection | null, node: LexicalNode): boolean {
     if (!selection) {
         return false;
     }
@@ -155,7 +109,7 @@ export function $selectionContainsNode(selection: BaseSelection|null, node: Lexi
     return false;
 }
 
-export function $selectionContainsElementFormat(selection: BaseSelection|null, format: ElementFormatType): boolean {
+export function $selectionContainsElementFormat(selection: BaseSelection | null, format: ElementFormatType): boolean {
     const nodes = $getBlockElementNodesInSelection(selection);
     for (const node of nodes) {
         if (node.getFormatType() === format) {
@@ -166,7 +120,7 @@ export function $selectionContainsElementFormat(selection: BaseSelection|null, f
     return false;
 }
 
-export function $getBlockElementNodesInSelection(selection: BaseSelection|null): ElementNode[] {
+export function $getBlockElementNodesInSelection(selection: BaseSelection | null): ElementNode[] {
     if (!selection) {
         return [];
     }
@@ -175,7 +129,7 @@ export function $getBlockElementNodesInSelection(selection: BaseSelection|null):
     for (const node of selection.getNodes()) {
         const blockElement = $findMatchingParent(node, (node) => {
             return $isElementNode(node) && !node.isInline();
-        }) as ElementNode|null;
+        }) as ElementNode | null;
 
         if (blockElement) {
             blockNodes.set(blockElement.getKey(), blockElement);
@@ -183,25 +137,4 @@ export function $getBlockElementNodesInSelection(selection: BaseSelection|null):
     }
 
     return Array.from(blockNodes.values());
-}
-
-/**
- * Get the nearest root/block level node for the given position.
- */
-export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number, y: number): LexicalNode|null {
-    // TODO - Take into account x for floated blocks?
-    const rootNodes = $getRoot().getChildren();
-    for (const node of rootNodes) {
-        const nodeDom = editor.getElementByKey(node.__key);
-        if (!nodeDom) {
-            continue;
-        }
-
-        const bounds = nodeDom.getBoundingClientRect();
-        if (y <= bounds.bottom) {
-            return node;
-        }
-    }
-
-    return null;
 }
\ No newline at end of file

From 8939f310db4eb8c825226f090bd1ab7c37c3654d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 Aug 2024 15:08:52 +0100
Subject: [PATCH 228/666] Lexical: Started linking up cell properties form

---
 .../js/wysiwyg/nodes/custom-paragraph.ts      |  2 +-
 .../wysiwyg/nodes/custom-table-cell-node.ts   | 90 +++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           | 17 +++-
 resources/js/wysiwyg/todo.md                  |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 35 ++++----
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 66 +++++++++++---
 6 files changed, 177 insertions(+), 35 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/custom-table-cell-node.ts

diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
index f13cef56f31..97647bf5e8d 100644
--- a/resources/js/wysiwyg/nodes/custom-paragraph.ts
+++ b/resources/js/wysiwyg/nodes/custom-paragraph.ts
@@ -93,6 +93,6 @@ export function $createCustomParagraphNode() {
     return new CustomParagraphNode();
 }
 
-export function $isCustomParagraphNode(node: LexicalNode | null | undefined) {
+export function $isCustomParagraphNode(node: LexicalNode | null | undefined): node is CustomParagraphNode {
     return node instanceof CustomParagraphNode;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-table-cell-node.ts b/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
new file mode 100644
index 00000000000..693ef5f5be1
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
@@ -0,0 +1,90 @@
+import {EditorConfig} from "lexical/LexicalEditor";
+import {DOMExportOutput, LexicalEditor, LexicalNode, Spread} from "lexical";
+
+import {SerializedTableCellNode, TableCellHeaderStates, TableCellNode} from "@lexical/table";
+import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
+
+export type SerializedCustomTableCellNode = Spread<{
+    styles: Record<string, string>,
+}, SerializedTableCellNode>
+
+export class CustomTableCellNode extends TableCellNode {
+    __styles: Map<string, string> = new Map;
+
+    static getType(): string {
+        return 'custom-table-cell';
+    }
+
+    static clone(node: CustomTableCellNode): CustomTableCellNode {
+        const cellNode = new CustomTableCellNode(
+            node.__headerState,
+            node.__colSpan,
+            node.__width,
+            node.__key,
+        );
+        cellNode.__rowSpan = node.__rowSpan;
+        cellNode.__styles = new Map(node.__styles);
+        return cellNode;
+    }
+
+    getStyles(): Map<string, string> {
+        const self = this.getLatest();
+        return new Map(self.__styles);
+    }
+
+    setStyles(styles: Map<string, string>): void {
+        const self = this.getWritable();
+        self.__styles = new Map(styles);
+    }
+
+    updateTag(tag: string): void {
+        const isHeader = tag.toLowerCase() === 'th';
+        const state = isHeader ? TableCellHeaderStates.ROW : TableCellHeaderStates.NO_STATUS;
+        const self = this.getWritable();
+        self.__headerState = state;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const element = super.createDOM(config);
+
+        for (const [name, value] of this.__styles.entries()) {
+            element.style.setProperty(name, value);
+        }
+
+        return element;
+    }
+
+    // TODO - Import DOM
+
+    updateDOM(prevNode: CustomTableCellNode): boolean {
+        return super.updateDOM(prevNode)
+            || this.__styles !== prevNode.__styles;
+    }
+
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const element = this.createDOM(editor._config);
+        return {
+            element
+        };
+    }
+
+    exportJSON(): SerializedCustomTableCellNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-table-cell',
+            styles: Object.fromEntries(this.__styles),
+        };
+    }
+}
+
+export function $createCustomTableCellNode(
+    headerState: TableCellHeaderState,
+    colSpan = 1,
+    width?: number,
+): CustomTableCellNode {
+    return new CustomTableCellNode(headerState, colSpan, width);
+}
+
+export function $isCustomTableCellNode(node: LexicalNode | null | undefined): node is CustomTableCellNode {
+    return node instanceof CustomTableCellNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index f0df08fcbb4..92f6d2336cf 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -20,6 +20,7 @@ import {DiagramNode} from "./diagram";
 import {EditorUiContext} from "../ui/framework/core";
 import {MediaNode} from "./media";
 import {CustomListItemNode} from "./custom-list-item";
+import {CustomTableCellNode} from "./custom-table-cell-node";
 
 /**
  * Load the nodes for lexical.
@@ -33,7 +34,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CustomListItemNode,
         CustomTableNode,
         TableRowNode,
-        TableCellNode,
+        CustomTableCellNode,
         ImageNode,
         HorizontalRuleNode,
         DetailsNode, SummaryNode,
@@ -59,7 +60,19 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
             with: (node: ListItemNode) => {
                 return new CustomListItemNode(node.__value, node.__checked);
             }
-        }
+        },
+        {
+            replace: TableCellNode,
+            with: (node: TableCellNode) => {
+                const cell = new CustomTableCellNode(
+                    node.__headerState,
+                    node.__colSpan,
+                    node.__width,
+                );
+                cell.__rowSpan = node.__rowSpan;
+                return cell;
+            }
+        },
     ];
 }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index a0ea2e1ebfb..d925711e17b 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -13,7 +13,7 @@
 
 ## Main Todo
 
-- Alignments: Use existing classes for blocks
+- Alignments: Use existing classes for blocks (including table cells)
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
 - Keyboard shortcuts support
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 2cc2e701b69..3b431141f4b 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -11,18 +11,19 @@ import {EditorUiContext} from "../../framework/core";
 import {$getSelection, BaseSelection} from "lexical";
 import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
-    $createTableRowNode,
     $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
-    $insertTableRow__EXPERIMENTAL, $isTableCellNode,
-    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode, TableNode,
+    $insertTableRow__EXPERIMENTAL,
+    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode,
 } from "@lexical/table";
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
+import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell-node";
+import {showCellPropertiesForm} from "../forms/tables";
 
 const neverActive = (): boolean => false;
-const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isTableCellNode);
+const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
 
 export const table: EditorBasicButtonDefinition = {
     label: 'Table',
@@ -34,8 +35,8 @@ export const tableProperties: EditorButtonDefinition = {
     icon: tableIcon,
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
-            if (!$isTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
@@ -54,8 +55,8 @@ export const clearTableFormatting: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
-            if (!$isTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
@@ -72,8 +73,8 @@ export const resizeTableToContents: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
-            if (!$isTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
@@ -159,8 +160,8 @@ export const rowProperties: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
-            if (!$isTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
@@ -313,11 +314,9 @@ export const cellProperties: EditorButtonDefinition = {
     label: 'Cell properties',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
-            if ($isTableCellNode(cell)) {
-
-                const modalForm = context.manager.createModal('cell_properties');
-                modalForm.show({});
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if ($isCustomTableCellNode(cell)) {
+                showCellPropertiesForm(cell, context);
             }
         });
     },
@@ -349,7 +348,7 @@ export const splitCell: EditorButtonDefinition = {
     },
     isActive: neverActive,
     isDisabled(selection) {
-        const cell = $getNodeFromSelection(selection, $isTableCellNode) as TableCellNode|null;
+        const cell = $getNodeFromSelection(selection, $isCustomTableCellNode) as TableCellNode|null;
         if (cell) {
             const merged = cell.getRowSpan() > 1 || cell.getColSpan() > 1;
             return !merged;
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 9951bfe7ff6..291b355e708 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -5,6 +5,11 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
+import {$isCustomTableCellNode, CustomTableCellNode} from "../../../nodes/custom-table-cell-node";
+import {EditorFormModal} from "../../framework/modals";
+import {$getNodeFromSelection} from "../../../utils/selection";
+import {$getSelection, ElementFormatType} from "lexical";
+import {TableCellHeaderStates} from "@lexical/table";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -49,10 +54,46 @@ const alignmentInput: EditorSelectFormFieldDefinition = {
     }
 };
 
+export function showCellPropertiesForm(cell: CustomTableCellNode, context: EditorUiContext): EditorFormModal {
+    const styles = cell.getStyles();
+    const modalForm = context.manager.createModal('cell_properties');
+    modalForm.show({
+        width: '', // TODO
+        height: styles.get('height') || '',
+        type: cell.getTag(),
+        h_align: '', // TODO
+        v_align: styles.get('vertical-align') || '',
+        border_width: styles.get('border-width') || '',
+        border_style: styles.get('border-style') || '',
+        border_color: styles.get('border-color') || '',
+        background_color: styles.get('background-color') || '',
+    });
+    return modalForm;
+}
+
 export const cellProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
-        // TODO
+        // TODO - Set for cell selection range
+        context.editor.update(() => {
+            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
+            if ($isCustomTableCellNode(cell)) {
+                // TODO - Set width
+                cell.setFormat((formData.get('h_align')?.toString() || '') as ElementFormatType);
+                cell.updateTag(formData.get('type')?.toString() || '');
+
+                const styles = cell.getStyles();
+                styles.set('height', formData.get('height')?.toString() || '');
+                styles.set('vertical-align', formData.get('v_align')?.toString() || '');
+                styles.set('border-width', formData.get('border_width')?.toString() || '');
+                styles.set('border-style', formData.get('border_style')?.toString() || '');
+                styles.set('border-color', formData.get('border_color')?.toString() || '');
+                styles.set('background-color', formData.get('background_color')?.toString() || '');
+
+                cell.setStyles(styles);
+            }
+        });
+
         return true;
     },
     fields: [
@@ -60,31 +101,31 @@ export const cellProperties: EditorFormDefinition = {
             build() {
                 const generalFields: EditorFormFieldDefinition[] = [
                     {
-                        label: 'Width',
+                        label: 'Width', // Colgroup width
                         name: 'width',
                         type: 'text',
                     },
                     {
-                        label: 'Height',
+                        label: 'Height', // inline-style: height
                         name: 'height',
                         type: 'text',
                     },
                     {
-                        label: 'Cell type',
+                        label: 'Cell type', // element
                         name: 'type',
                         type: 'select',
                         valuesByLabel: {
-                            'Cell': 'cell',
-                            'Header cell': 'header',
+                            'Cell': 'td',
+                            'Header cell': 'th',
                         }
                     } as EditorSelectFormFieldDefinition,
                     {
-                        ...alignmentInput,
+                        ...alignmentInput, // class: 'align-right/left/center'
                         label: 'Horizontal align',
                         name: 'h_align',
                     },
                     {
-                        label: 'Vertical align',
+                        label: 'Vertical align', // inline-style: vertical-align
                         name: 'v_align',
                         type: 'select',
                         valuesByLabel: {
@@ -98,13 +139,13 @@ export const cellProperties: EditorFormDefinition = {
 
                 const advancedFields: EditorFormFieldDefinition[] = [
                     {
-                        label: 'Border width',
+                        label: 'Border width', // inline-style: border-width
                         name: 'border_width',
                         type: 'text',
                     },
-                    borderStyleInput,
-                    borderColorInput,
-                    backgroundColorInput,
+                    borderStyleInput, // inline-style: border-style
+                    borderColorInput, // inline-style: border-color
+                    backgroundColorInput, // inline-style: background-color
                 ];
 
                 return new EditorFormTabs([
@@ -170,7 +211,6 @@ export const rowProperties: EditorFormDefinition = {
         },
     ],
 };
-
 export const tableProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {

From b3d3b14f79552299ce558083383cf05c2f1a7d90 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 Aug 2024 18:49:17 +0100
Subject: [PATCH 229/666] Lexical: Finished off core cell properties
 functionality

---
 resources/js/wysiwyg/nodes/custom-table.ts    |  90 +-----------
 resources/js/wysiwyg/todo.md                  |   2 +-
 .../js/wysiwyg/ui/defaults/forms/tables.ts    |  23 +--
 .../ui/framework/helpers/table-resizer.ts     |   3 +-
 resources/js/wysiwyg/utils/dom.ts             |   8 ++
 resources/js/wysiwyg/utils/tables.ts          | 134 ++++++++++++++++++
 6 files changed, 160 insertions(+), 100 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/tables.ts

diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index 32f3ec4fa57..99351d8527a 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -1,8 +1,9 @@
-import {SerializedTableNode, TableNode, TableRowNode} from "@lexical/table";
-import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalEditor, LexicalNode, Spread} from "lexical";
+import {SerializedTableNode, TableNode} from "@lexical/table";
+import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, Spread} from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 
 import {el} from "../utils/dom";
+import {getTableColumnWidths} from "../utils/tables";
 
 export type SerializedCustomTableNode = Spread<{
     id: string;
@@ -111,49 +112,6 @@ export class CustomTableNode extends TableNode {
     }
 }
 
-function getTableColumnWidths(table: HTMLTableElement): string[] {
-    const maxColRow = getMaxColRowFromTable(table);
-
-    const colGroup = table.querySelector('colgroup');
-    let widths: string[] = [];
-    if (colGroup && (colGroup.childElementCount === maxColRow?.childElementCount || !maxColRow)) {
-        widths = extractWidthsFromRow(colGroup);
-    }
-    if (widths.filter(Boolean).length === 0 && maxColRow) {
-        widths = extractWidthsFromRow(maxColRow);
-    }
-
-    return widths;
-}
-
-function getMaxColRowFromTable(table: HTMLTableElement): HTMLTableRowElement|null {
-    const rows = table.querySelectorAll('tr');
-    let maxColCount: number = 0;
-    let maxColRow: HTMLTableRowElement|null = null;
-
-    for (const row of rows) {
-        if (row.childElementCount > maxColCount) {
-            maxColRow = row;
-            maxColCount = row.childElementCount;
-        }
-    }
-
-    return maxColRow;
-}
-
-function extractWidthsFromRow(row: HTMLTableRowElement|HTMLTableColElement) {
-    return [...row.children].map(child => extractWidthFromElement(child as HTMLElement))
-}
-
-function extractWidthFromElement(element: HTMLElement): string {
-    let width = element.style.width || element.getAttribute('width');
-    if (width && !Number.isNaN(Number(width))) {
-        width = width + 'px';
-    }
-
-    return width || '';
-}
-
 export function $createCustomTableNode(): CustomTableNode {
     return new CustomTableNode();
 }
@@ -161,45 +119,3 @@ export function $createCustomTableNode(): CustomTableNode {
 export function $isCustomTableNode(node: LexicalNode | null | undefined): node is CustomTableNode {
     return node instanceof CustomTableNode;
 }
-
-export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number, width: number): void {
-    const rows = node.getChildren() as TableRowNode[];
-    let maxCols = 0;
-    for (const row of rows) {
-        const cellCount = row.getChildren().length;
-        if (cellCount > maxCols) {
-            maxCols = cellCount;
-        }
-    }
-
-    let colWidths = node.getColWidths();
-    if (colWidths.length === 0 || colWidths.length < maxCols) {
-        colWidths = Array(maxCols).fill('');
-    }
-
-    if (columnIndex + 1 > colWidths.length) {
-        console.error(`Attempted to set table column width for column [${columnIndex}] but only ${colWidths.length} columns found`);
-    }
-
-    colWidths[columnIndex] = width + 'px';
-    node.setColWidths(colWidths);
-}
-
-export function $getTableColumnWidth(editor: LexicalEditor, node: CustomTableNode, columnIndex: number): number {
-    const colWidths = node.getColWidths();
-    if (colWidths.length > columnIndex && colWidths[columnIndex].endsWith('px')) {
-        return Number(colWidths[columnIndex].replace('px', ''));
-    }
-
-    // Otherwise, get from table element
-    const table = editor.getElementByKey(node.__key) as HTMLTableElement|null;
-    if (table) {
-        const maxColRow = getMaxColRowFromTable(table);
-        if (maxColRow && maxColRow.children.length > columnIndex) {
-            const cell = maxColRow.children[columnIndex];
-            return cell.clientWidth;
-        }
-    }
-
-    return 0;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index d925711e17b..086ca14622d 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,7 +3,7 @@
 ## In progress
 
 - Table features
-  - Cell properties form logic
+  - CustomTableCellNode importDOM logic
   - Merge cell action
   - Row properties form logic
   - Table properties form logic
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 291b355e708..1d637b0eea7 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -5,11 +5,11 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {$isCustomTableCellNode, CustomTableCellNode} from "../../../nodes/custom-table-cell-node";
+import {CustomTableCellNode} from "../../../nodes/custom-table-cell-node";
 import {EditorFormModal} from "../../framework/modals";
-import {$getNodeFromSelection} from "../../../utils/selection";
 import {$getSelection, ElementFormatType} from "lexical";
-import {TableCellHeaderStates} from "@lexical/table";
+import {$getTableCellsFromSelection, $setTableCellColumnWidth} from "../../../utils/tables";
+import {formatSizeValue} from "../../../utils/dom";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -61,7 +61,7 @@ export function showCellPropertiesForm(cell: CustomTableCellNode, context: Edito
         width: '', // TODO
         height: styles.get('height') || '',
         type: cell.getTag(),
-        h_align: '', // TODO
+        h_align: cell.getFormatType(),
         v_align: styles.get('vertical-align') || '',
         border_width: styles.get('border-width') || '',
         border_style: styles.get('border-style') || '',
@@ -74,18 +74,19 @@ export function showCellPropertiesForm(cell: CustomTableCellNode, context: Edito
 export const cellProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
-        // TODO - Set for cell selection range
         context.editor.update(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if ($isCustomTableCellNode(cell)) {
-                // TODO - Set width
-                cell.setFormat((formData.get('h_align')?.toString() || '') as ElementFormatType);
+            const cells = $getTableCellsFromSelection($getSelection());
+            for (const cell of cells) {
+                const width = formData.get('width')?.toString() || '';
+
+                $setTableCellColumnWidth(cell, width);
                 cell.updateTag(formData.get('type')?.toString() || '');
+                cell.setFormat((formData.get('h_align')?.toString() || '') as ElementFormatType);
 
                 const styles = cell.getStyles();
-                styles.set('height', formData.get('height')?.toString() || '');
+                styles.set('height', formatSizeValue(formData.get('height')?.toString() || ''));
                 styles.set('vertical-align', formData.get('v_align')?.toString() || '');
-                styles.set('border-width', formData.get('border_width')?.toString() || '');
+                styles.set('border-width', formatSizeValue(formData.get('border_width')?.toString() || ''));
                 styles.set('border-style', formData.get('border_style')?.toString() || '');
                 styles.set('border-color', formData.get('border_color')?.toString() || '');
                 styles.set('background-color', formData.get('background_color')?.toString() || '');
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index f312294c59d..37f1b6f01ee 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -1,8 +1,9 @@
 import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
-import {$getTableColumnWidth, $setTableColumnWidth, CustomTableNode} from "../../../nodes/custom-table";
+import {CustomTableNode} from "../../../nodes/custom-table";
 import {TableRowNode} from "@lexical/table";
 import {el} from "../../../utils/dom";
+import {$getTableColumnWidth, $setTableColumnWidth} from "../../../utils/tables";
 
 type MarkerDomRecord = {x: HTMLElement, y: HTMLElement};
 
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
index dc0872e89c8..7426ac59252 100644
--- a/resources/js/wysiwyg/utils/dom.ts
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -21,4 +21,12 @@ export function el(tag: string, attrs: Record<string, string | null> = {}, child
 export function htmlToDom(html: string): Document {
     const parser = new DOMParser();
     return parser.parseFromString(html, 'text/html');
+}
+
+export function formatSizeValue(size: number | string, defaultSuffix: string = 'px'): string {
+    if (typeof size === 'number' || /^-?\d+$/.test(size)) {
+        return `${size}${defaultSuffix}`;
+    }
+
+    return size;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
new file mode 100644
index 00000000000..959c8a4236b
--- /dev/null
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -0,0 +1,134 @@
+import {BaseSelection, LexicalEditor} from "lexical";
+import {$isTableRowNode, $isTableSelection, TableRowNode} from "@lexical/table";
+import {$isCustomTableNode, CustomTableNode} from "../nodes/custom-table";
+import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell-node";
+import {$getParentOfType} from "./nodes";
+import {$getNodeFromSelection} from "./selection";
+import {formatSizeValue} from "./dom";
+
+function $getTableFromCell(cell: CustomTableCellNode): CustomTableNode|null {
+    return $getParentOfType(cell, $isCustomTableNode) as CustomTableNode|null;
+}
+
+export function getTableColumnWidths(table: HTMLTableElement): string[] {
+    const maxColRow = getMaxColRowFromTable(table);
+
+    const colGroup = table.querySelector('colgroup');
+    let widths: string[] = [];
+    if (colGroup && (colGroup.childElementCount === maxColRow?.childElementCount || !maxColRow)) {
+        widths = extractWidthsFromRow(colGroup);
+    }
+    if (widths.filter(Boolean).length === 0 && maxColRow) {
+        widths = extractWidthsFromRow(maxColRow);
+    }
+
+    return widths;
+}
+
+function getMaxColRowFromTable(table: HTMLTableElement): HTMLTableRowElement | null {
+    const rows = table.querySelectorAll('tr');
+    let maxColCount: number = 0;
+    let maxColRow: HTMLTableRowElement | null = null;
+
+    for (const row of rows) {
+        if (row.childElementCount > maxColCount) {
+            maxColRow = row;
+            maxColCount = row.childElementCount;
+        }
+    }
+
+    return maxColRow;
+}
+
+function extractWidthsFromRow(row: HTMLTableRowElement | HTMLTableColElement) {
+    return [...row.children].map(child => extractWidthFromElement(child as HTMLElement))
+}
+
+function extractWidthFromElement(element: HTMLElement): string {
+    let width = element.style.width || element.getAttribute('width');
+    if (width && !Number.isNaN(Number(width))) {
+        width = width + 'px';
+    }
+
+    return width || '';
+}
+
+export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number, width: number|string): void {
+    const rows = node.getChildren() as TableRowNode[];
+    let maxCols = 0;
+    for (const row of rows) {
+        const cellCount = row.getChildren().length;
+        if (cellCount > maxCols) {
+            maxCols = cellCount;
+        }
+    }
+
+    let colWidths = node.getColWidths();
+    if (colWidths.length === 0 || colWidths.length < maxCols) {
+        colWidths = Array(maxCols).fill('');
+    }
+
+    if (columnIndex + 1 > colWidths.length) {
+        console.error(`Attempted to set table column width for column [${columnIndex}] but only ${colWidths.length} columns found`);
+    }
+
+    colWidths[columnIndex] = formatSizeValue(width);
+    node.setColWidths(colWidths);
+}
+
+export function $getTableColumnWidth(editor: LexicalEditor, node: CustomTableNode, columnIndex: number): number {
+    const colWidths = node.getColWidths();
+    if (colWidths.length > columnIndex && colWidths[columnIndex].endsWith('px')) {
+        return Number(colWidths[columnIndex].replace('px', ''));
+    }
+
+    // Otherwise, get from table element
+    const table = editor.getElementByKey(node.__key) as HTMLTableElement | null;
+    if (table) {
+        const maxColRow = getMaxColRowFromTable(table);
+        if (maxColRow && maxColRow.children.length > columnIndex) {
+            const cell = maxColRow.children[columnIndex];
+            return cell.clientWidth;
+        }
+    }
+
+    return 0;
+}
+
+function $getCellColumnIndex(node: CustomTableCellNode): number {
+    const row = node.getParent();
+    if (!$isTableRowNode(row)) {
+        return -1;
+    }
+
+    let index = 0;
+    const cells = row.getChildren<CustomTableCellNode>();
+    for (const cell of cells) {
+        let colSpan = cell.getColSpan() || 1;
+        index += colSpan;
+        if (cell.getKey() === node.getKey()) {
+            break;
+        }
+    }
+
+    return index - 1;
+}
+
+export function $setTableCellColumnWidth(cell: CustomTableCellNode, width: string): void {
+    const table = $getTableFromCell(cell)
+    const index = $getCellColumnIndex(cell);
+
+    if (table && index >= 0) {
+        $setTableColumnWidth(table, index, width);
+    }
+}
+
+export function $getTableCellsFromSelection(selection: BaseSelection|null): CustomTableCellNode[]  {
+    if ($isTableSelection(selection)) {
+        const nodes = selection.getNodes();
+        return nodes.filter(n => $isCustomTableCellNode(n));
+    }
+
+    const cell = $getNodeFromSelection(selection, $isCustomTableCellNode) as CustomTableCellNode;
+    return cell ? [cell] : [];
+}
\ No newline at end of file

From fcc1c2968d09fee8491bdc1d239539a7f37b41c3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 6 Aug 2024 09:36:37 +0100
Subject: [PATCH 230/666] Lexical: Added table cell node import logic

---
 .../wysiwyg/nodes/custom-table-cell-node.ts   | 146 +++++++++++++++++-
 resources/js/wysiwyg/todo.md                  |   1 -
 2 files changed, 140 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/custom-table-cell-node.ts b/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
index 693ef5f5be1..31504374ad0 100644
--- a/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
@@ -1,7 +1,24 @@
-import {EditorConfig} from "lexical/LexicalEditor";
-import {DOMExportOutput, LexicalEditor, LexicalNode, Spread} from "lexical";
-
-import {SerializedTableCellNode, TableCellHeaderStates, TableCellNode} from "@lexical/table";
+import {
+    $createParagraphNode,
+    $isElementNode,
+    $isLineBreakNode,
+    $isTextNode,
+    DOMConversionMap,
+    DOMConversionOutput,
+    DOMExportOutput,
+    EditorConfig,
+    LexicalEditor,
+    LexicalNode,
+    Spread
+} from "lexical";
+
+import {
+    $createTableCellNode,
+    $isTableCellNode,
+    SerializedTableCellNode,
+    TableCellHeaderStates,
+    TableCellNode
+} from "@lexical/table";
 import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
 
 export type SerializedCustomTableCellNode = Spread<{
@@ -54,13 +71,24 @@ export class CustomTableCellNode extends TableCellNode {
         return element;
     }
 
-    // TODO - Import DOM
-
     updateDOM(prevNode: CustomTableCellNode): boolean {
         return super.updateDOM(prevNode)
             || this.__styles !== prevNode.__styles;
     }
 
+    static importDOM(): DOMConversionMap | null {
+        return {
+            td: (node: Node) => ({
+                conversion: $convertCustomTableCellNodeElement,
+                priority: 0,
+            }),
+            th: (node: Node) => ({
+                conversion: $convertCustomTableCellNodeElement,
+                priority: 0,
+            }),
+        };
+    }
+
     exportDOM(editor: LexicalEditor): DOMExportOutput {
         const element = this.createDOM(editor._config);
         return {
@@ -68,6 +96,18 @@ export class CustomTableCellNode extends TableCellNode {
         };
     }
 
+    static importJSON(serializedNode: SerializedCustomTableCellNode): CustomTableCellNode {
+        const node = $createCustomTableCellNode(
+            serializedNode.headerState,
+            serializedNode.colSpan,
+            serializedNode.width,
+        );
+
+        node.setStyles(new Map<string, string>(Object.entries(serializedNode.styles)));
+
+        return node;
+    }
+
     exportJSON(): SerializedCustomTableCellNode {
         return {
             ...super.exportJSON(),
@@ -77,6 +117,100 @@ export class CustomTableCellNode extends TableCellNode {
     }
 }
 
+function $convertCustomTableCellNodeElement(domNode: Node): DOMConversionOutput {
+    const output =  $convertTableCellNodeElement(domNode);
+
+    if (domNode instanceof HTMLElement && output.node instanceof CustomTableCellNode) {
+        const styleMap = new Map<string, string>();
+        const styleNames = Array.from(domNode.style);
+        for (const style of styleNames) {
+            styleMap.set(style, domNode.style.getPropertyValue(style));
+        }
+        output.node.setStyles(styleMap);
+    }
+
+    return output;
+}
+
+/**
+ * Function taken from:
+ * https://github.com/facebook/lexical/blob/e1881a6e409e1541c10dd0b5378f3a38c9dc8c9e/packages/lexical-table/src/LexicalTableCellNode.ts#L289
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * MIT LICENSE
+ * Modified since copy.
+ */
+export function $convertTableCellNodeElement(
+    domNode: Node,
+): DOMConversionOutput {
+    const domNode_ = domNode as HTMLTableCellElement;
+    const nodeName = domNode.nodeName.toLowerCase();
+
+    let width: number | undefined = undefined;
+
+
+    const PIXEL_VALUE_REG_EXP = /^(\d+(?:\.\d+)?)px$/;
+    if (PIXEL_VALUE_REG_EXP.test(domNode_.style.width)) {
+        width = parseFloat(domNode_.style.width);
+    }
+
+    const tableCellNode = $createTableCellNode(
+        nodeName === 'th'
+            ? TableCellHeaderStates.ROW
+            : TableCellHeaderStates.NO_STATUS,
+        domNode_.colSpan,
+        width,
+    );
+
+    tableCellNode.__rowSpan = domNode_.rowSpan;
+
+    const style = domNode_.style;
+    const textDecoration = style.textDecoration.split(' ');
+    const hasBoldFontWeight =
+        style.fontWeight === '700' || style.fontWeight === 'bold';
+    const hasLinethroughTextDecoration = textDecoration.includes('line-through');
+    const hasItalicFontStyle = style.fontStyle === 'italic';
+    const hasUnderlineTextDecoration = textDecoration.includes('underline');
+    return {
+        after: (childLexicalNodes) => {
+            if (childLexicalNodes.length === 0) {
+                childLexicalNodes.push($createParagraphNode());
+            }
+            return childLexicalNodes;
+        },
+        forChild: (lexicalNode, parentLexicalNode) => {
+            if ($isTableCellNode(parentLexicalNode) && !$isElementNode(lexicalNode)) {
+                const paragraphNode = $createParagraphNode();
+                if (
+                    $isLineBreakNode(lexicalNode) &&
+                    lexicalNode.getTextContent() === '\n'
+                ) {
+                    return null;
+                }
+                if ($isTextNode(lexicalNode)) {
+                    if (hasBoldFontWeight) {
+                        lexicalNode.toggleFormat('bold');
+                    }
+                    if (hasLinethroughTextDecoration) {
+                        lexicalNode.toggleFormat('strikethrough');
+                    }
+                    if (hasItalicFontStyle) {
+                        lexicalNode.toggleFormat('italic');
+                    }
+                    if (hasUnderlineTextDecoration) {
+                        lexicalNode.toggleFormat('underline');
+                    }
+                }
+                paragraphNode.append(lexicalNode);
+                return paragraphNode;
+            }
+
+            return lexicalNode;
+        },
+        node: tableCellNode,
+    };
+}
+
+
 export function $createCustomTableCellNode(
     headerState: TableCellHeaderState,
     colSpan = 1,
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 086ca14622d..ef86bfe53aa 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,7 +3,6 @@
 ## In progress
 
 - Table features
-  - CustomTableCellNode importDOM logic
   - Merge cell action
   - Row properties form logic
   - Table properties form logic

From 6604e7365f78dcb683241715624d3061007929d0 Mon Sep 17 00:00:00 2001
From: Alexander Wilms <f.alexander.wilms@gmail.com>
Date: Tue, 6 Aug 2024 23:28:21 +0000
Subject: [PATCH 231/666] Update sponsor image URLs in readme

---
 readme.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index 3f38d52c542..3fbc873c2bf 100644
--- a/readme.md
+++ b/readme.md
@@ -49,7 +49,7 @@ Big thanks to these companies for supporting the project.
 
 <table><tbody><tr>
 <td align="center"><a href="https://www.federated.computer/bookstack/" target="_blank">
-    <img width="480" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/federated-computer.png" alt="Federated.computer">
+    <img width="480" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/federated-computer.png" alt="Federated.computer">
 </a></td>
 </tr></tbody></table>
 
@@ -57,38 +57,38 @@ Big thanks to these companies for supporting the project.
 
 <table><tbody><tr>
 <td align="center"><a href="https://www.diagrams.net/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/diagramsnet.png" alt="Diagrams.net">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/diagramsnet.png" alt="Diagrams.net">
 </a></td>
 <td align="center"><a href="https://cloudabove.com/hosting" target="_blank">
-    <img width="200" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/cloudabove.png" alt="Cloudabove">
+    <img width="200" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/cloudabove.png" alt="Cloudabove">
 </a></td>
 </tr><tr>
 <td align="center"><a href="https://www.practicali.be" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/practicali.png" alt="Practicali">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/practicali.png" alt="Practicali">
 </a></td>
 <td align="center"><a href="https://www.stellarhosted.com/bookstack/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
 </a></td>
 </tr>
 <tr>
 <td align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/netways.png" alt="NETWAYS Web Services">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/netways.png" alt="NETWAYS Web Services">
 </a></td>
 <td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
-    <img width="200" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
+    <img width="200" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
 </a></td>
 </tr>
 <tr>
 <td align="center"><a href="https://practinet.be/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/practinet.png" alt="Practinet">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
 <td align="center"><a href="https://transporttalent.com" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
 </a></td>
 </tr>
 <tr>
 <td colspan="2" align="center"><a href="https://route4me.com/" target="_blank">
-    <img width="240" src="https://media.githubusercontent.com/media/BookStackApp/website/main/static/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
+    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
 </tr></tbody></table>
 

From fa6d66db4972dcebc3d58ed2faa999281075389f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Aug 2024 10:53:20 +0100
Subject: [PATCH 232/666] Readme: Updated sponsor image links to use website

---
 readme.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index 3fbc873c2bf..b3768a59ad0 100644
--- a/readme.md
+++ b/readme.md
@@ -49,7 +49,7 @@ Big thanks to these companies for supporting the project.
 
 <table><tbody><tr>
 <td align="center"><a href="https://www.federated.computer/bookstack/" target="_blank">
-    <img width="480" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/federated-computer.png" alt="Federated.computer">
+    <img width="480" src="https://www.bookstackapp.com/images/sponsors/federated-computer.png" alt="Federated.computer">
 </a></td>
 </tr></tbody></table>
 
@@ -57,38 +57,38 @@ Big thanks to these companies for supporting the project.
 
 <table><tbody><tr>
 <td align="center"><a href="https://www.diagrams.net/" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/diagramsnet.png" alt="Diagrams.net">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/diagramsnet.png" alt="Diagrams.net">
 </a></td>
 <td align="center"><a href="https://cloudabove.com/hosting" target="_blank">
-    <img width="200" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/cloudabove.png" alt="Cloudabove">
+    <img width="200" src="https://www.bookstackapp.com/images/sponsors/cloudabove.png" alt="Cloudabove">
 </a></td>
 </tr><tr>
 <td align="center"><a href="https://www.practicali.be" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/practicali.png" alt="Practicali">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/practicali.png" alt="Practicali">
 </a></td>
 <td align="center"><a href="https://www.stellarhosted.com/bookstack/" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
 </a></td>
 </tr>
 <tr>
 <td align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/netways.png" alt="NETWAYS Web Services">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/netways.png" alt="NETWAYS Web Services">
 </a></td>
 <td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
-    <img width="200" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
+    <img width="200" src="https://www.bookstackapp.com/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
 </a></td>
 </tr>
 <tr>
 <td align="center"><a href="https://practinet.be/" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/practinet.png" alt="Practinet">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
 <td align="center"><a href="https://transporttalent.com" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/transport-talent.png" alt="Transport Talent">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/transport-talent.png" alt="Transport Talent">
 </a></td>
 </tr>
 <tr>
 <td colspan="2" align="center"><a href="https://route4me.com/" target="_blank">
-    <img width="240" src="https://codeberg.org/bookstack/website/media/branch/main/static/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
 </tr></tbody></table>
 

From e8532ef4de7d641fabfe86ff313d379711f2209a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 7 Aug 2024 20:32:54 +0100
Subject: [PATCH 233/666] Lexical: Added merge cell logic

---
 resources/js/wysiwyg/todo.md                  |  1 -
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |  8 +-
 .../helpers/table-selection-handler.ts        |  1 -
 resources/js/wysiwyg/utils/table-map.ts       | 96 +++++++++++++++++++
 resources/js/wysiwyg/utils/tables.ts          | 63 +++++++++++-
 5 files changed, 162 insertions(+), 7 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/table-map.ts

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index ef86bfe53aa..2ca9b97dcb7 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,7 +3,6 @@
 ## In progress
 
 - Table features
-  - Merge cell action
   - Row properties form logic
   - Table properties form logic
     - Caption text support 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 3b431141f4b..69d811ce247 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -21,6 +21,7 @@ import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/
 import {$getParentOfType} from "../../../utils/nodes";
 import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell-node";
 import {showCellPropertiesForm} from "../forms/tables";
+import {$mergeTableCellsInSelection} from "../../../utils/tables";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
@@ -328,9 +329,10 @@ export const mergeCells: EditorButtonDefinition = {
     label: 'Merge cells',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            // Todo - Needs to be done manually
-            // Playground reference:
-            // https://github.com/facebook/lexical/blob/f373759a7849f473d34960a6bf4e34b2a011e762/packages/lexical-playground/src/plugins/TableActionMenuPlugin/index.tsx#L299
+            const selection = $getSelection();
+            if ($isTableSelection(selection)) {
+                $mergeTableCellsInSelection(selection);
+            }
         });
     },
     isActive: neverActive,
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
index 0557b37e53e..f631fb804a5 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
@@ -1,7 +1,6 @@
 import {$getNodeByKey, LexicalEditor} from "lexical";
 import {NodeKey} from "lexical/LexicalNode";
 import {
-    $isTableNode,
     applyTableHandlers,
     HTMLTableElementWithWithTableSelectionState,
     TableNode,
diff --git a/resources/js/wysiwyg/utils/table-map.ts b/resources/js/wysiwyg/utils/table-map.ts
new file mode 100644
index 00000000000..77c4eba45dc
--- /dev/null
+++ b/resources/js/wysiwyg/utils/table-map.ts
@@ -0,0 +1,96 @@
+import {CustomTableNode} from "../nodes/custom-table";
+import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell-node";
+import {$isTableRowNode} from "@lexical/table";
+
+export class TableMap {
+
+    rowCount: number = 0;
+    columnCount: number = 0;
+
+    // Represents an array (rows*columns in length) of cell nodes from top-left to
+    // bottom right. Cells may repeat where merged and covering multiple spaces.
+    cells: CustomTableCellNode[] = [];
+
+    constructor(table: CustomTableNode) {
+        this.buildCellMap(table);
+    }
+
+    protected buildCellMap(table: CustomTableNode) {
+        const rowsAndCells: CustomTableCellNode[][] = [];
+        const setCell = (x: number, y: number, cell: CustomTableCellNode) => {
+            if (typeof rowsAndCells[y] === 'undefined') {
+                rowsAndCells[y] = [];
+            }
+
+            rowsAndCells[y][x] = cell;
+        };
+        const cellFilled = (x: number, y: number): boolean => !!(rowsAndCells[y] && rowsAndCells[y][x]);
+
+        const rowNodes = table.getChildren().filter(r => $isTableRowNode(r));
+        for (let rowIndex = 0; rowIndex < rowNodes.length; rowIndex++) {
+            const rowNode = rowNodes[rowIndex];
+            const cellNodes = rowNode.getChildren().filter(c => $isCustomTableCellNode(c));
+            let targetColIndex: number = 0;
+            for (let cellIndex = 0; cellIndex < cellNodes.length; cellIndex++) {
+                const cellNode = cellNodes[cellIndex];
+                const colspan = cellNode.getColSpan() || 1;
+                const rowSpan = cellNode.getRowSpan() || 1;
+                for (let x = targetColIndex; x < targetColIndex + colspan; x++) {
+                    for (let y = rowIndex; y < rowIndex + rowSpan; y++) {
+                        while (cellFilled(x, y)) {
+                            targetColIndex += 1;
+                            x += 1;
+                        }
+
+                        setCell(x, y, cellNode);
+                    }
+                }
+                targetColIndex += colspan;
+            }
+        }
+
+        this.rowCount = rowsAndCells.length;
+        this.columnCount = Math.max(...rowsAndCells.map(r => r.length));
+
+        const cells = [];
+        let lastCell: CustomTableCellNode = rowsAndCells[0][0];
+        for (let y = 0; y < this.rowCount; y++) {
+            for (let x = 0; x < this.columnCount; x++) {
+                if (!rowsAndCells[y] || !rowsAndCells[y][x]) {
+                    cells.push(lastCell);
+                } else {
+                    cells.push(rowsAndCells[y][x]);
+                    lastCell = rowsAndCells[y][x];
+                }
+            }
+        }
+
+        this.cells = cells;
+    }
+
+    public getCellAtPosition(x: number, y: number): CustomTableCellNode {
+        const position = (y * this.columnCount) + x;
+        if (position >= this.cells.length) {
+            throw new Error(`TableMap Error: Attempted to get cell ${position+1} of ${this.cells.length}`);
+        }
+
+        return this.cells[position];
+    }
+
+    public getCellsInRange(fromX: number, fromY: number, toX: number, toY: number): CustomTableCellNode[] {
+        const minX = Math.max(Math.min(fromX, toX), 0);
+        const maxX = Math.min(Math.max(fromX, toX), this.columnCount - 1);
+        const minY = Math.max(Math.min(fromY, toY), 0);
+        const maxY = Math.min(Math.max(fromY, toY), this.rowCount - 1);
+
+        const cells = new Set<CustomTableCellNode>();
+
+        for (let y = minY; y <= maxY; y++) {
+            for (let x = minX; x <= maxX; x++) {
+                cells.add(this.getCellAtPosition(x, y));
+            }
+        }
+
+        return [...cells.values()];
+    }
+}
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index 959c8a4236b..d4ef80f7fa1 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -1,10 +1,11 @@
 import {BaseSelection, LexicalEditor} from "lexical";
-import {$isTableRowNode, $isTableSelection, TableRowNode} from "@lexical/table";
+import {$isTableRowNode, $isTableSelection, TableRowNode, TableSelection, TableSelectionShape} from "@lexical/table";
 import {$isCustomTableNode, CustomTableNode} from "../nodes/custom-table";
 import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell-node";
 import {$getParentOfType} from "./nodes";
 import {$getNodeFromSelection} from "./selection";
 import {formatSizeValue} from "./dom";
+import {TableMap} from "./table-map";
 
 function $getTableFromCell(cell: CustomTableCellNode): CustomTableNode|null {
     return $getParentOfType(cell, $isCustomTableNode) as CustomTableNode|null;
@@ -131,4 +132,62 @@ export function $getTableCellsFromSelection(selection: BaseSelection|null): Cust
 
     const cell = $getNodeFromSelection(selection, $isCustomTableCellNode) as CustomTableCellNode;
     return cell ? [cell] : [];
-}
\ No newline at end of file
+}
+
+export function $mergeTableCellsInSelection(selection: TableSelection): void {
+    const selectionShape = selection.getShape();
+    const cells = $getTableCellsFromSelection(selection);
+    if (cells.length === 0) {
+        return;
+    }
+
+    const table = $getTableFromCell(cells[0]);
+    if (!table) {
+        return;
+    }
+
+    const tableMap = new TableMap(table);
+    const headCell = tableMap.getCellAtPosition(selectionShape.toX, selectionShape.toY);
+    if (!headCell) {
+        return;
+    }
+
+    // We have to adjust the shape since it won't take into account spans for the head corner position.
+    const fixedToX = selectionShape.toX + ((headCell.getColSpan() || 1) - 1);
+    const fixedToY = selectionShape.toY + ((headCell.getRowSpan() || 1) - 1);
+
+    const mergeCells = tableMap.getCellsInRange(
+        selectionShape.fromX,
+        selectionShape.fromY,
+        fixedToX,
+        fixedToY,
+    );
+
+    if (mergeCells.length === 0) {
+        return;
+    }
+
+    const firstCell = mergeCells[0];
+    const newWidth = Math.abs(selectionShape.fromX - fixedToX) + 1;
+    const newHeight = Math.abs(selectionShape.fromY - fixedToY) + 1;
+
+    for (let i = 1; i < mergeCells.length; i++) {
+        const mergeCell = mergeCells[i];
+        firstCell.append(...mergeCell.getChildren());
+        mergeCell.remove();
+    }
+
+    firstCell.setColSpan(newWidth);
+    firstCell.setRowSpan(newHeight);
+}
+
+
+
+
+
+
+
+
+
+
+

From da54e1d87c054ad572b5ce20acc153e274a0b46c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 9 Aug 2024 11:24:25 +0100
Subject: [PATCH 234/666] Lexical: Added cell width fetching, Created custom
 row node

---
 ...able-cell-node.ts => custom-table-cell.ts} |  16 +--
 .../js/wysiwyg/nodes/custom-table-row.ts      | 113 ++++++++++++++++++
 resources/js/wysiwyg/nodes/index.ts           |  17 ++-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |   6 +-
 .../js/wysiwyg/ui/defaults/forms/tables.ts    |  55 +++------
 resources/js/wysiwyg/utils/styles.ts          |  11 ++
 resources/js/wysiwyg/utils/table-map.ts       |   2 +-
 resources/js/wysiwyg/utils/tables.ts          |  13 +-
 8 files changed, 172 insertions(+), 61 deletions(-)
 rename resources/js/wysiwyg/nodes/{custom-table-cell-node.ts => custom-table-cell.ts} (92%)
 create mode 100644 resources/js/wysiwyg/nodes/custom-table-row.ts
 create mode 100644 resources/js/wysiwyg/utils/styles.ts

diff --git a/resources/js/wysiwyg/nodes/custom-table-cell-node.ts b/resources/js/wysiwyg/nodes/custom-table-cell.ts
similarity index 92%
rename from resources/js/wysiwyg/nodes/custom-table-cell-node.ts
rename to resources/js/wysiwyg/nodes/custom-table-cell.ts
index 31504374ad0..b73a2180716 100644
--- a/resources/js/wysiwyg/nodes/custom-table-cell-node.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-cell.ts
@@ -20,13 +20,14 @@ import {
     TableCellNode
 } from "@lexical/table";
 import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
+import {createStyleMapFromDomStyles, StyleMap} from "../utils/styles";
 
 export type SerializedCustomTableCellNode = Spread<{
     styles: Record<string, string>,
 }, SerializedTableCellNode>
 
 export class CustomTableCellNode extends TableCellNode {
-    __styles: Map<string, string> = new Map;
+    __styles: StyleMap = new Map;
 
     static getType(): string {
         return 'custom-table-cell';
@@ -44,12 +45,12 @@ export class CustomTableCellNode extends TableCellNode {
         return cellNode;
     }
 
-    getStyles(): Map<string, string> {
+    getStyles(): StyleMap {
         const self = this.getLatest();
         return new Map(self.__styles);
     }
 
-    setStyles(styles: Map<string, string>): void {
+    setStyles(styles: StyleMap): void {
         const self = this.getWritable();
         self.__styles = new Map(styles);
     }
@@ -103,7 +104,7 @@ export class CustomTableCellNode extends TableCellNode {
             serializedNode.width,
         );
 
-        node.setStyles(new Map<string, string>(Object.entries(serializedNode.styles)));
+        node.setStyles(new Map(Object.entries(serializedNode.styles)));
 
         return node;
     }
@@ -121,12 +122,7 @@ function $convertCustomTableCellNodeElement(domNode: Node): DOMConversionOutput
     const output =  $convertTableCellNodeElement(domNode);
 
     if (domNode instanceof HTMLElement && output.node instanceof CustomTableCellNode) {
-        const styleMap = new Map<string, string>();
-        const styleNames = Array.from(domNode.style);
-        for (const style of styleNames) {
-            styleMap.set(style, domNode.style.getPropertyValue(style));
-        }
-        output.node.setStyles(styleMap);
+        output.node.setStyles(createStyleMapFromDomStyles(domNode.style));
     }
 
     return output;
diff --git a/resources/js/wysiwyg/nodes/custom-table-row.ts b/resources/js/wysiwyg/nodes/custom-table-row.ts
new file mode 100644
index 00000000000..effaaa50d01
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-table-row.ts
@@ -0,0 +1,113 @@
+import {
+    $createParagraphNode,
+    $isElementNode,
+    $isLineBreakNode,
+    $isTextNode,
+    DOMConversionMap,
+    DOMConversionOutput,
+    EditorConfig,
+    LexicalNode,
+    Spread
+} from "lexical";
+
+import {
+    $createTableCellNode,
+    $isTableCellNode,
+    SerializedTableRowNode,
+    TableCellHeaderStates,
+    TableRowNode
+} from "@lexical/table";
+import {createStyleMapFromDomStyles, StyleMap} from "../utils/styles";
+import {NodeKey} from "lexical/LexicalNode";
+
+export type SerializedCustomTableRowNode = Spread<{
+    styles: Record<string, string>,
+}, SerializedTableRowNode>
+
+export class CustomTableRowNode extends TableRowNode {
+    __styles: StyleMap = new Map();
+
+    constructor(key?: NodeKey) {
+        super(0, key);
+    }
+
+    static getType(): string {
+        return 'custom-table-row';
+    }
+
+    static clone(node: CustomTableRowNode): CustomTableRowNode {
+        const cellNode = new CustomTableRowNode(node.__key);
+
+        cellNode.__styles = new Map(node.__styles);
+        return cellNode;
+    }
+
+    getStyles(): StyleMap {
+        const self = this.getLatest();
+        return new Map(self.__styles);
+    }
+
+    setStyles(styles: StyleMap): void {
+        const self = this.getWritable();
+        self.__styles = new Map(styles);
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const element = super.createDOM(config);
+
+        for (const [name, value] of this.__styles.entries()) {
+            element.style.setProperty(name, value);
+        }
+
+        return element;
+    }
+
+    updateDOM(prevNode: CustomTableRowNode): boolean {
+        return super.updateDOM(prevNode)
+            || this.__styles !== prevNode.__styles;
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            tr: (node: Node) => ({
+                conversion: $convertTableRowElement,
+                priority: 0,
+            }),
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomTableRowNode): CustomTableRowNode {
+        const node = $createCustomTableRowNode();
+
+        node.setStyles(new Map(Object.entries(serializedNode.styles)));
+
+        return node;
+    }
+
+    exportJSON(): SerializedCustomTableRowNode {
+        return {
+            ...super.exportJSON(),
+            height: 0,
+            type: 'custom-table-row',
+            styles: Object.fromEntries(this.__styles),
+        };
+    }
+}
+
+export function $convertTableRowElement(domNode: Node): DOMConversionOutput {
+    const rowNode = $createCustomTableRowNode();
+
+    if (domNode instanceof HTMLElement) {
+        rowNode.setStyles(createStyleMapFromDomStyles(domNode.style));
+    }
+
+    return {node: rowNode};
+}
+
+export function $createCustomTableRowNode(): CustomTableRowNode {
+    return new CustomTableRowNode();
+}
+
+export function $isCustomTableRowNode(node: LexicalNode | null | undefined): node is CustomTableRowNode {
+    return node instanceof CustomTableRowNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 92f6d2336cf..81a0c1a0d8e 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -20,7 +20,8 @@ import {DiagramNode} from "./diagram";
 import {EditorUiContext} from "../ui/framework/core";
 import {MediaNode} from "./media";
 import {CustomListItemNode} from "./custom-list-item";
-import {CustomTableCellNode} from "./custom-table-cell-node";
+import {CustomTableCellNode} from "./custom-table-cell";
+import {CustomTableRowNode} from "./custom-table-row";
 
 /**
  * Load the nodes for lexical.
@@ -33,7 +34,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         ListNode, // Todo - Create custom
         CustomListItemNode,
         CustomTableNode,
-        TableRowNode,
+        CustomTableRowNode,
         CustomTableCellNode,
         ImageNode,
         HorizontalRuleNode,
@@ -49,6 +50,12 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
                 return new CustomParagraphNode();
             }
         },
+        {
+            replace: ListItemNode,
+            with: (node: ListItemNode) => {
+                return new CustomListItemNode(node.__value, node.__checked);
+            }
+        },
         {
             replace: TableNode,
             with(node: TableNode) {
@@ -56,9 +63,9 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
             }
         },
         {
-            replace: ListItemNode,
-            with: (node: ListItemNode) => {
-                return new CustomListItemNode(node.__value, node.__checked);
+            replace: TableRowNode,
+            with(node: TableRowNode) {
+                return new CustomTableRowNode();
             }
         },
         {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 69d811ce247..88ea56186ad 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -19,8 +19,8 @@ import {
 } from "@lexical/table";
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
-import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell-node";
-import {showCellPropertiesForm} from "../forms/tables";
+import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell";
+import {$showCellPropertiesForm} from "../forms/tables";
 import {$mergeTableCellsInSelection} from "../../../utils/tables";
 
 const neverActive = (): boolean => false;
@@ -317,7 +317,7 @@ export const cellProperties: EditorButtonDefinition = {
         context.editor.getEditorState().read(() => {
             const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
             if ($isCustomTableCellNode(cell)) {
-                showCellPropertiesForm(cell, context);
+                $showCellPropertiesForm(cell, context);
             }
         });
     },
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 1d637b0eea7..1c577b72a50 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -5,10 +5,10 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {CustomTableCellNode} from "../../../nodes/custom-table-cell-node";
+import {CustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {EditorFormModal} from "../../framework/modals";
 import {$getSelection, ElementFormatType} from "lexical";
-import {$getTableCellsFromSelection, $setTableCellColumnWidth} from "../../../utils/tables";
+import {$getTableCellColumnWidth, $getTableCellsFromSelection, $setTableCellColumnWidth} from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
@@ -54,11 +54,11 @@ const alignmentInput: EditorSelectFormFieldDefinition = {
     }
 };
 
-export function showCellPropertiesForm(cell: CustomTableCellNode, context: EditorUiContext): EditorFormModal {
+export function $showCellPropertiesForm(cell: CustomTableCellNode, context: EditorUiContext): EditorFormModal {
     const styles = cell.getStyles();
     const modalForm = context.manager.createModal('cell_properties');
     modalForm.show({
-        width: '', // TODO
+        width: $getTableCellColumnWidth(context.editor, cell),
         height: styles.get('height') || '',
         type: cell.getTag(),
         h_align: cell.getFormatType(),
@@ -171,45 +171,18 @@ export const rowProperties: EditorFormDefinition = {
         return true;
     },
     fields: [
+        // Removed fields:
+        // Removed 'Row Type' as we don't currently support thead/tfoot elements
+        //  TinyMCE would move rows up/down into these parents when set
+        // Removed 'Alignment' since this was broken in our editor (applied alignment class to whole parent table)
         {
-            build() {
-                const generalFields: EditorFormFieldDefinition[] = [
-                    {
-                        label: 'Row type',
-                        name: 'type',
-                        type: 'select',
-                        valuesByLabel: {
-                            'Body': 'body',
-                            'Header': 'header',
-                            'Footer': 'footer',
-                        }
-                    } as EditorSelectFormFieldDefinition,
-                    alignmentInput,
-                    {
-                        label: 'Height',
-                        name: 'height',
-                        type: 'text',
-                    },
-                ];
-
-                const advancedFields: EditorFormFieldDefinition[] = [
-                    borderStyleInput,
-                    borderColorInput,
-                    backgroundColorInput,
-                ];
-
-                return new EditorFormTabs([
-                    {
-                        label: 'General',
-                        contents: generalFields,
-                    },
-                    {
-                        label: 'Advanced',
-                        contents: advancedFields,
-                    }
-                ])
-            }
+            label: 'Height', // style on tr: height
+            name: 'height',
+            type: 'text',
         },
+        borderStyleInput, // style on tr: height
+        borderColorInput, // style on tr: height
+        backgroundColorInput, // style on tr: height
     ],
 };
 export const tableProperties: EditorFormDefinition = {
diff --git a/resources/js/wysiwyg/utils/styles.ts b/resources/js/wysiwyg/utils/styles.ts
new file mode 100644
index 00000000000..8767a799821
--- /dev/null
+++ b/resources/js/wysiwyg/utils/styles.ts
@@ -0,0 +1,11 @@
+
+export type StyleMap = Map<string, string>;
+
+export function createStyleMapFromDomStyles(domStyles: CSSStyleDeclaration): StyleMap {
+    const styleMap: StyleMap = new Map();
+    const styleNames: string[] = Array.from(domStyles);
+    for (const style of styleNames) {
+        styleMap.set(style, domStyles.getPropertyValue(style));
+    }
+    return styleMap;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/table-map.ts b/resources/js/wysiwyg/utils/table-map.ts
index 77c4eba45dc..2b7eba62c03 100644
--- a/resources/js/wysiwyg/utils/table-map.ts
+++ b/resources/js/wysiwyg/utils/table-map.ts
@@ -1,5 +1,5 @@
 import {CustomTableNode} from "../nodes/custom-table";
-import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell-node";
+import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
 import {$isTableRowNode} from "@lexical/table";
 
 export class TableMap {
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index d4ef80f7fa1..d92f56c8205 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -1,7 +1,7 @@
 import {BaseSelection, LexicalEditor} from "lexical";
 import {$isTableRowNode, $isTableSelection, TableRowNode, TableSelection, TableSelectionShape} from "@lexical/table";
 import {$isCustomTableNode, CustomTableNode} from "../nodes/custom-table";
-import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell-node";
+import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
 import {$getParentOfType} from "./nodes";
 import {$getNodeFromSelection} from "./selection";
 import {formatSizeValue} from "./dom";
@@ -124,6 +124,17 @@ export function $setTableCellColumnWidth(cell: CustomTableCellNode, width: strin
     }
 }
 
+export function $getTableCellColumnWidth(editor: LexicalEditor, cell: CustomTableCellNode): string {
+    const table = $getTableFromCell(cell)
+    const index = $getCellColumnIndex(cell);
+    if (!table) {
+        return '';
+    }
+
+    const widths = table.getColWidths();
+    return (widths.length > index) ? widths[index] : '';
+}
+
 export function $getTableCellsFromSelection(selection: BaseSelection|null): CustomTableCellNode[]  {
     if ($isTableSelection(selection)) {
         const nodes = selection.getNodes();

From db4208a7eb0e9a18ea3dd8950b59b5727b6e3671 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 9 Aug 2024 12:42:04 +0100
Subject: [PATCH 235/666] Lexical: Linked row properties form up

---
 resources/js/wysiwyg/todo.md                  |  1 -
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 11 ++++---
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 32 +++++++++++++++++--
 resources/js/wysiwyg/utils/tables.ts          | 14 ++++++++
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 2ca9b97dcb7..cf24ad677f6 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,7 +3,6 @@
 ## In progress
 
 - Table features
-  - Row properties form logic
   - Table properties form logic
     - Caption text support 
   - Resize to contents button
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 88ea56186ad..50353961f0f 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -20,8 +20,9 @@ import {
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
 import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell";
-import {$showCellPropertiesForm} from "../forms/tables";
+import {$showCellPropertiesForm, $showRowPropertiesForm} from "../forms/tables";
 import {$mergeTableCellsInSelection} from "../../../utils/tables";
+import {$isCustomTableRowNode} from "../../../nodes/custom-table-row";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
@@ -166,10 +167,10 @@ export const rowProperties: EditorButtonDefinition = {
                 return;
             }
 
-            const row = $getParentOfType(cell, $isTableRowNode);
-            const modalForm = context.manager.createModal('row_properties');
-            modalForm.show({});
-            // TODO
+            const row = $getParentOfType(cell, $isCustomTableRowNode);
+            if ($isCustomTableRowNode(row)) {
+                $showRowPropertiesForm(row, context);
+            }
         });
     },
     isActive: neverActive,
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 1c577b72a50..c4879efae66 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -8,8 +8,14 @@ import {EditorUiContext} from "../../framework/core";
 import {CustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {EditorFormModal} from "../../framework/modals";
 import {$getSelection, ElementFormatType} from "lexical";
-import {$getTableCellColumnWidth, $getTableCellsFromSelection, $setTableCellColumnWidth} from "../../../utils/tables";
+import {
+    $getTableCellColumnWidth,
+    $getTableCellsFromSelection,
+    $getTableRowsFromSelection,
+    $setTableCellColumnWidth
+} from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
+import {CustomTableRowNode} from "../../../nodes/custom-table-row";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -164,10 +170,32 @@ export const cellProperties: EditorFormDefinition = {
     ],
 };
 
+export function $showRowPropertiesForm(row: CustomTableRowNode, context: EditorUiContext): EditorFormModal {
+    const styles = row.getStyles();
+    const modalForm = context.manager.createModal('row_properties');
+    modalForm.show({
+        height: styles.get('height') || '',
+        border_style: styles.get('border-style') || '',
+        border_color: styles.get('border-color') || '',
+        background_color: styles.get('background-color') || '',
+    });
+    return modalForm;
+}
+
 export const rowProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
-        // TODO
+        context.editor.update(() => {
+            const rows = $getTableRowsFromSelection($getSelection());
+            for (const row of rows) {
+                const styles = row.getStyles();
+                styles.set('height', formatSizeValue(formData.get('height')?.toString() || ''));
+                styles.set('border-style', formData.get('border_style')?.toString() || '');
+                styles.set('border-color', formData.get('border_color')?.toString() || '');
+                styles.set('background-color', formData.get('background_color')?.toString() || '');
+                row.setStyles(styles);
+            }
+        });
         return true;
     },
     fields: [
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index d92f56c8205..e808fd595cc 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -6,6 +6,7 @@ import {$getParentOfType} from "./nodes";
 import {$getNodeFromSelection} from "./selection";
 import {formatSizeValue} from "./dom";
 import {TableMap} from "./table-map";
+import {$isCustomTableRowNode, CustomTableRowNode} from "../nodes/custom-table-row";
 
 function $getTableFromCell(cell: CustomTableCellNode): CustomTableNode|null {
     return $getParentOfType(cell, $isCustomTableNode) as CustomTableNode|null;
@@ -192,6 +193,19 @@ export function $mergeTableCellsInSelection(selection: TableSelection): void {
     firstCell.setRowSpan(newHeight);
 }
 
+export function $getTableRowsFromSelection(selection: BaseSelection|null): CustomTableRowNode[] {
+    const cells = $getTableCellsFromSelection(selection);
+    const rowsByKey: Record<string, CustomTableRowNode> = {};
+    for (const cell of cells) {
+        const row = cell.getParent();
+        if ($isCustomTableRowNode(row)) {
+            rowsByKey[row.getKey()] = row;
+        }
+    }
+
+    return Object.values(rowsByKey);
+}
+
 
 
 

From abbfd42a6c33d1c5e90517448add0f5909051d0e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 9 Aug 2024 21:58:45 +0100
Subject: [PATCH 236/666] Lexical: Kinda made row copy/paste work

---
 .../js/wysiwyg/services/node-clipboard.ts     | 56 +++++++++++++++++++
 resources/js/wysiwyg/todo.md                  |  5 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 46 +++++++++++----
 3 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 resources/js/wysiwyg/services/node-clipboard.ts

diff --git a/resources/js/wysiwyg/services/node-clipboard.ts b/resources/js/wysiwyg/services/node-clipboard.ts
new file mode 100644
index 00000000000..7d880db9889
--- /dev/null
+++ b/resources/js/wysiwyg/services/node-clipboard.ts
@@ -0,0 +1,56 @@
+import {$isElementNode, LexicalEditor, LexicalNode, SerializedLexicalNode} from "lexical";
+
+type SerializedLexicalNodeWithChildren = {
+    node: SerializedLexicalNode,
+    children: SerializedLexicalNodeWithChildren[],
+};
+
+function serializeNodeRecursive(node: LexicalNode): SerializedLexicalNodeWithChildren {
+    const childNodes = $isElementNode(node) ? node.getChildren() : [];
+    return {
+        node: node.exportJSON(),
+        children: childNodes.map(n => serializeNodeRecursive(n)),
+    };
+}
+
+function unserializeNodeRecursive(editor: LexicalEditor, {node, children}: SerializedLexicalNodeWithChildren): LexicalNode|null {
+    const instance = editor._nodes.get(node.type)?.klass.importJSON(node);
+    if (!instance) {
+        return null;
+    }
+
+    const childNodes = children.map(child => unserializeNodeRecursive(editor, child));
+    for (const child of childNodes) {
+        if (child && $isElementNode(instance)) {
+            instance.append(child);
+        }
+    }
+
+    return instance;
+}
+
+export class NodeClipboard<T extends LexicalNode> {
+    nodeClass: {importJSON: (s: SerializedLexicalNode) => T};
+    protected store: SerializedLexicalNodeWithChildren[] = [];
+
+    constructor(nodeClass: {importJSON: (s: any) => T}) {
+        this.nodeClass = nodeClass;
+    }
+
+    set(...nodes: LexicalNode[]): void {
+        this.store.splice(0, this.store.length);
+        for (const node of nodes) {
+            this.store.push(serializeNodeRecursive(node));
+        }
+    }
+
+    get(editor: LexicalEditor): LexicalNode[] {
+        return this.store.map(json => unserializeNodeRecursive(editor, json)).filter((node) => {
+            return node !== null;
+        });
+    }
+
+    size(): number {
+        return this.store.length;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index cf24ad677f6..b6325688e58 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -7,6 +7,7 @@
     - Caption text support 
   - Resize to contents button
   - Remove formatting button
+  - Cut/Copy/Paste column
 
 ## Main Todo
 
@@ -32,4 +33,6 @@
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
 - Removing link around image via button deletes image, not just link 
 - `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
-- Template drag/drop not handled when outside core editor area (ignored in margin area).
\ No newline at end of file
+- Template drag/drop not handled when outside core editor area (ignored in margin area).
+- Table row copy/paste does not handle merged cells
+  - TinyMCE fills gaps with the  cells that would be visually in the row
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 50353961f0f..c98f6c02f37 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -8,7 +8,7 @@ import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg
 import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
-import {$getSelection, BaseSelection} from "lexical";
+import {$createNodeSelection, $createRangeSelection, $getSelection, BaseSelection} from "lexical";
 import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
     $deleteTableColumn__EXPERIMENTAL,
@@ -21,8 +21,11 @@ import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/
 import {$getParentOfType} from "../../../utils/nodes";
 import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {$showCellPropertiesForm, $showRowPropertiesForm} from "../forms/tables";
-import {$mergeTableCellsInSelection} from "../../../utils/tables";
-import {$isCustomTableRowNode} from "../../../nodes/custom-table-row";
+import {$getTableRowsFromSelection, $mergeTableCellsInSelection} from "../../../utils/tables";
+import {$isCustomTableRowNode, CustomTableRowNode} from "../../../nodes/custom-table-row";
+import {NodeClipboard} from "../../../services/node-clipboard";
+import {r} from "@codemirror/legacy-modes/mode/r";
+import {$generateHtmlFromNodes} from "@lexical/html";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
@@ -177,12 +180,18 @@ export const rowProperties: EditorButtonDefinition = {
     isDisabled: cellNotSelected,
 };
 
+const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>(CustomTableRowNode);
+
 export const cutRow: EditorButtonDefinition = {
     label: 'Cut row',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            const rows = $getTableRowsFromSelection($getSelection());
+            rowClipboard.set(...rows);
+            for (const row of rows) {
+                row.remove();
+            }
         });
     },
     isActive: neverActive,
@@ -194,7 +203,8 @@ export const copyRow: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            // TODO
+            const rows = $getTableRowsFromSelection($getSelection());
+            rowClipboard.set(...rows);
         });
     },
     isActive: neverActive,
@@ -205,24 +215,36 @@ export const pasteRowBefore: EditorButtonDefinition = {
     label: 'Paste row before',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            const rows = $getTableRowsFromSelection($getSelection());
+            const lastRow = rows[rows.length - 1];
+            if (lastRow) {
+                for (const row of rowClipboard.get(context.editor)) {
+                    lastRow.insertBefore(row);
+                }
+            }
         });
     },
     isActive: neverActive,
-    isDisabled: cellNotSelected,
+    isDisabled: (selection) => cellNotSelected(selection) || rowClipboard.size() === 0,
 };
 
 export const pasteRowAfter: EditorButtonDefinition = {
     label: 'Paste row after',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            const rows = $getTableRowsFromSelection($getSelection());
+            const lastRow = rows[rows.length - 1];
+            if (lastRow) {
+                for (const row of rowClipboard.get(context.editor).reverse()) {
+                    lastRow.insertAfter(row);
+                }
+            }
         });
     },
     isActive: neverActive,
-    isDisabled: cellNotSelected,
+    isDisabled: (selection) => cellNotSelected(selection) || rowClipboard.size() === 0,
 };
 
 export const cutColumn: EditorButtonDefinition = {

From ebf95f637a199fa4493013933fabf073d4113bb4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 10 Aug 2024 13:14:55 +0100
Subject: [PATCH 237/666] Lexical: Wired table properties, and other buttons

---
 .../js/wysiwyg/nodes/custom-table-cell.ts     |  9 +-
 .../js/wysiwyg/nodes/custom-table-row.ts      | 11 +--
 resources/js/wysiwyg/nodes/custom-table.ts    | 22 ++++-
 resources/js/wysiwyg/todo.md                  |  9 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 56 +++++------
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 76 +++++++++++---
 resources/js/wysiwyg/utils/dom.ts             | 25 +++++
 resources/js/wysiwyg/utils/styles.ts          | 11 ---
 resources/js/wysiwyg/utils/tables.ts          | 99 +++++++++++++++++++
 9 files changed, 241 insertions(+), 77 deletions(-)
 delete mode 100644 resources/js/wysiwyg/utils/styles.ts

diff --git a/resources/js/wysiwyg/nodes/custom-table-cell.ts b/resources/js/wysiwyg/nodes/custom-table-cell.ts
index b73a2180716..c8fe58c772d 100644
--- a/resources/js/wysiwyg/nodes/custom-table-cell.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-cell.ts
@@ -20,7 +20,7 @@ import {
     TableCellNode
 } from "@lexical/table";
 import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
-import {createStyleMapFromDomStyles, StyleMap} from "../utils/styles";
+import {extractStyleMapFromElement, StyleMap} from "../utils/dom";
 
 export type SerializedCustomTableCellNode = Spread<{
     styles: Record<string, string>,
@@ -45,6 +45,11 @@ export class CustomTableCellNode extends TableCellNode {
         return cellNode;
     }
 
+    clearWidth(): void {
+        const self = this.getWritable();
+        self.__width = undefined;
+    }
+
     getStyles(): StyleMap {
         const self = this.getLatest();
         return new Map(self.__styles);
@@ -122,7 +127,7 @@ function $convertCustomTableCellNodeElement(domNode: Node): DOMConversionOutput
     const output =  $convertTableCellNodeElement(domNode);
 
     if (domNode instanceof HTMLElement && output.node instanceof CustomTableCellNode) {
-        output.node.setStyles(createStyleMapFromDomStyles(domNode.style));
+        output.node.setStyles(extractStyleMapFromElement(domNode));
     }
 
     return output;
diff --git a/resources/js/wysiwyg/nodes/custom-table-row.ts b/resources/js/wysiwyg/nodes/custom-table-row.ts
index effaaa50d01..f4702f36dd5 100644
--- a/resources/js/wysiwyg/nodes/custom-table-row.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-row.ts
@@ -1,8 +1,4 @@
 import {
-    $createParagraphNode,
-    $isElementNode,
-    $isLineBreakNode,
-    $isTextNode,
     DOMConversionMap,
     DOMConversionOutput,
     EditorConfig,
@@ -11,14 +7,11 @@ import {
 } from "lexical";
 
 import {
-    $createTableCellNode,
-    $isTableCellNode,
     SerializedTableRowNode,
-    TableCellHeaderStates,
     TableRowNode
 } from "@lexical/table";
-import {createStyleMapFromDomStyles, StyleMap} from "../utils/styles";
 import {NodeKey} from "lexical/LexicalNode";
+import {extractStyleMapFromElement, StyleMap} from "../utils/dom";
 
 export type SerializedCustomTableRowNode = Spread<{
     styles: Record<string, string>,
@@ -98,7 +91,7 @@ export function $convertTableRowElement(domNode: Node): DOMConversionOutput {
     const rowNode = $createCustomTableRowNode();
 
     if (domNode instanceof HTMLElement) {
-        rowNode.setStyles(createStyleMapFromDomStyles(domNode.style));
+        rowNode.setStyles(extractStyleMapFromElement(domNode));
     }
 
     return {node: rowNode};
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index 99351d8527a..1d95b789625 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -2,17 +2,19 @@ import {SerializedTableNode, TableNode} from "@lexical/table";
 import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, Spread} from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 
-import {el} from "../utils/dom";
+import {el, extractStyleMapFromElement, StyleMap} from "../utils/dom";
 import {getTableColumnWidths} from "../utils/tables";
 
 export type SerializedCustomTableNode = Spread<{
     id: string;
     colWidths: string[];
+    styles: Record<string, string>,
 }, SerializedTableNode>
 
 export class CustomTableNode extends TableNode {
     __id: string = '';
     __colWidths: string[] = [];
+    __styles: StyleMap = new Map;
 
     static getType() {
         return 'custom-table';
@@ -38,10 +40,21 @@ export class CustomTableNode extends TableNode {
         return self.__colWidths;
     }
 
+    getStyles(): StyleMap {
+        const self = this.getLatest();
+        return new Map(self.__styles);
+    }
+
+    setStyles(styles: StyleMap): void {
+        const self = this.getWritable();
+        self.__styles = new Map(styles);
+    }
+
     static clone(node: CustomTableNode) {
         const newNode = new CustomTableNode(node.__key);
         newNode.__id = node.__id;
         newNode.__colWidths = node.__colWidths;
+        newNode.__styles = new Map(node.__styles);
         return newNode;
     }
 
@@ -65,6 +78,10 @@ export class CustomTableNode extends TableNode {
             dom.append(colgroup);
         }
 
+        for (const [name, value] of this.__styles.entries()) {
+            dom.style.setProperty(name, value);
+        }
+
         return dom;
     }
 
@@ -79,6 +96,7 @@ export class CustomTableNode extends TableNode {
             version: 1,
             id: this.__id,
             colWidths: this.__colWidths,
+            styles: Object.fromEntries(this.__styles),
         };
     }
 
@@ -86,6 +104,7 @@ export class CustomTableNode extends TableNode {
         const node = $createCustomTableNode();
         node.setId(serializedNode.id);
         node.setColWidths(serializedNode.colWidths);
+        node.setStyles(new Map(Object.entries(serializedNode.styles)));
         return node;
     }
 
@@ -102,6 +121,7 @@ export class CustomTableNode extends TableNode {
 
                         const colWidths = getTableColumnWidths(element as HTMLTableElement);
                         node.setColWidths(colWidths);
+                        node.setStyles(extractStyleMapFromElement(element));
 
                         return {node};
                     },
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index b6325688e58..9e501fb2421 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,13 +2,6 @@
 
 ## In progress
 
-- Table features
-  - Table properties form logic
-    - Caption text support 
-  - Resize to contents button
-  - Remove formatting button
-  - Cut/Copy/Paste column
-
 ## Main Todo
 
 - Alignments: Use existing classes for blocks (including table cells)
@@ -23,6 +16,8 @@
 - Drawing gallery integration
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
+- Table caption text support
+- Table Cut/Copy/Paste column
 
 ## Secondary Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index c98f6c02f37..6242f0b1dbc 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -8,24 +8,27 @@ import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg
 import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
-import {$createNodeSelection, $createRangeSelection, $getSelection, BaseSelection} from "lexical";
+import {$getSelection, BaseSelection} from "lexical";
 import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
     $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
     $insertTableRow__EXPERIMENTAL,
-    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode,
+    $isTableNode, $isTableSelection, $unmergeCell, TableCellNode,
 } from "@lexical/table";
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
 import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell";
-import {$showCellPropertiesForm, $showRowPropertiesForm} from "../forms/tables";
-import {$getTableRowsFromSelection, $mergeTableCellsInSelection} from "../../../utils/tables";
+import {$showCellPropertiesForm, $showRowPropertiesForm, $showTablePropertiesForm} from "../forms/tables";
+import {
+    $clearTableFormatting,
+    $clearTableSizes, $getTableFromSelection,
+    $getTableRowsFromSelection,
+    $mergeTableCellsInSelection
+} from "../../../utils/tables";
 import {$isCustomTableRowNode, CustomTableRowNode} from "../../../nodes/custom-table-row";
 import {NodeClipboard} from "../../../services/node-clipboard";
-import {r} from "@codemirror/legacy-modes/mode/r";
-import {$generateHtmlFromNodes} from "@lexical/html";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
@@ -40,15 +43,10 @@ export const tableProperties: EditorButtonDefinition = {
     icon: tableIcon,
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if (!$isCustomTableCellNode(cell)) {
-                return;
+            const table = $getTableFromSelection($getSelection());
+            if ($isCustomTableNode(table)) {
+                $showTablePropertiesForm(table, context);
             }
-
-            const table = $getParentOfType(cell, $isTableNode);
-            const modalForm = context.manager.createModal('table_properties');
-            modalForm.show({});
-            // TODO
         });
     },
     isActive: neverActive,
@@ -59,14 +57,16 @@ export const clearTableFormatting: EditorButtonDefinition = {
     label: 'Clear table formatting',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
+        context.editor.update(() => {
             const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
             if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
             const table = $getParentOfType(cell, $isTableNode);
-            // TODO
+            if ($isCustomTableNode(table)) {
+                $clearTableFormatting(table);
+            }
         });
     },
     isActive: neverActive,
@@ -77,22 +77,15 @@ export const resizeTableToContents: EditorButtonDefinition = {
     label: 'Resize to contents',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
+        context.editor.update(() => {
             const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
             if (!$isCustomTableCellNode(cell)) {
                 return;
             }
 
             const table = $getParentOfType(cell, $isCustomTableNode);
-            if (!$isCustomTableNode(table)) {
-                return;
-            }
-
-            for (const row of table.getChildren()) {
-                if ($isTableRowNode(row)) {
-                    // TODO - Come back later as this may depend on if we
-                    //   are using a custom table row
-                }
+            if ($isCustomTableNode(table)) {
+                $clearTableSizes(table);
             }
         });
     },
@@ -165,14 +158,9 @@ export const rowProperties: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if (!$isCustomTableCellNode(cell)) {
-                return;
-            }
-
-            const row = $getParentOfType(cell, $isCustomTableRowNode);
-            if ($isCustomTableRowNode(row)) {
-                $showRowPropertiesForm(row, context);
+            const rows = $getTableRowsFromSelection($getSelection());
+            if ($isCustomTableRowNode(rows[0])) {
+                $showRowPropertiesForm(rows[0], context);
             }
         });
     },
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index c4879efae66..5a41c85b3da 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -9,13 +9,15 @@ import {CustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {EditorFormModal} from "../../framework/modals";
 import {$getSelection, ElementFormatType} from "lexical";
 import {
+    $forEachTableCell, $getCellPaddingForTable,
     $getTableCellColumnWidth,
-    $getTableCellsFromSelection,
+    $getTableCellsFromSelection, $getTableFromSelection,
     $getTableRowsFromSelection,
     $setTableCellColumnWidth
 } from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
 import {CustomTableRowNode} from "../../../nodes/custom-table-row";
+import {CustomTableNode} from "../../../nodes/custom-table";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -213,10 +215,58 @@ export const rowProperties: EditorFormDefinition = {
         backgroundColorInput, // style on tr: height
     ],
 };
+
+export function $showTablePropertiesForm(table: CustomTableNode, context: EditorUiContext): EditorFormModal {
+    const styles = table.getStyles();
+    const modalForm = context.manager.createModal('table_properties');
+    modalForm.show({
+        width: styles.get('width') || '',
+        height: styles.get('height') || '',
+        cell_spacing: styles.get('cell-spacing') || '',
+        cell_padding: $getCellPaddingForTable(table),
+        border_width: styles.get('border-width') || '',
+        border_style: styles.get('border-style') || '',
+        border_color: styles.get('border-color') || '',
+        background_color: styles.get('background-color') || '',
+        // caption: '', TODO
+        align: table.getFormatType(),
+    });
+    return modalForm;
+}
+
 export const tableProperties: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
-        // TODO
+        context.editor.update(() => {
+            const table = $getTableFromSelection($getSelection());
+            if (!table) {
+                return;
+            }
+
+            const styles = table.getStyles();
+            styles.set('width', formatSizeValue(formData.get('width')?.toString() || ''));
+            styles.set('height', formatSizeValue(formData.get('height')?.toString() || ''));
+            styles.set('cell-spacing', formatSizeValue(formData.get('cell_spacing')?.toString() || ''));
+            styles.set('border-width', formatSizeValue(formData.get('border_width')?.toString() || ''));
+            styles.set('border-style', formData.get('border_style')?.toString() || '');
+            styles.set('border-color', formData.get('border_color')?.toString() || '');
+            styles.set('background-color', formData.get('background_color')?.toString() || '');
+            table.setStyles(styles);
+
+            table.setFormat(formData.get('align') as ElementFormatType);
+
+            const cellPadding = (formData.get('cell_padding')?.toString() || '');
+            if (cellPadding) {
+                const cellPaddingFormatted = formatSizeValue(cellPadding);
+                $forEachTableCell(table, (cell: CustomTableCellNode) => {
+                    const styles = cell.getStyles();
+                    styles.set('padding', cellPaddingFormatted);
+                    cell.setStyles(styles);
+                });
+            }
+
+            // TODO - cell caption
+        });
         return true;
     },
     fields: [
@@ -224,42 +274,42 @@ export const tableProperties: EditorFormDefinition = {
             build() {
                 const generalFields: EditorFormFieldDefinition[] = [
                     {
-                        label: 'Width',
+                        label: 'Width', // Style - width
                         name: 'width',
                         type: 'text',
                     },
                     {
-                        label: 'Height',
+                        label: 'Height', // Style - height
                         name: 'height',
                         type: 'text',
                     },
                     {
-                        label: 'Cell spacing',
+                        label: 'Cell spacing', // Style - border-spacing
                         name: 'cell_spacing',
                         type: 'text',
                     },
                     {
-                        label: 'Cell padding',
+                        label: 'Cell padding', // Style - padding on child cells?
                         name: 'cell_padding',
                         type: 'text',
                     },
                     {
-                        label: 'Border width',
+                        label: 'Border width', // Style - border-width
                         name: 'border_width',
                         type: 'text',
                     },
                     {
-                        label: 'caption',
-                        name: 'height',
+                        label: 'caption', // Caption element
+                        name: 'caption',
                         type: 'text', // TODO -
                     },
-                    alignmentInput,
+                    alignmentInput, // alignment class
                 ];
 
                 const advancedFields: EditorFormFieldDefinition[] = [
-                    borderStyleInput,
-                    borderColorInput,
-                    backgroundColorInput,
+                    borderStyleInput, // Style - border-style
+                    borderColorInput, // Style - border-color
+                    backgroundColorInput, // Style - background-color
                 ];
 
                 return new EditorFormTabs([
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
index 7426ac59252..a307bdd7531 100644
--- a/resources/js/wysiwyg/utils/dom.ts
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -29,4 +29,29 @@ export function formatSizeValue(size: number | string, defaultSuffix: string = '
     }
 
     return size;
+}
+
+export type StyleMap = Map<string, string>;
+
+/**
+ * Creates a map from an element's styles.
+ * Uses direct attribute value string handling since attempting to iterate
+ * over .style will expand out any shorthand properties (like 'padding') making
+ * rather than being representative of the actual properties set.
+ */
+export function extractStyleMapFromElement(element: HTMLElement): StyleMap {
+    const map: StyleMap = new Map();
+    const styleText= element.getAttribute('style') || '';
+
+    const rules = styleText.split(';');
+    for (const rule of rules) {
+        const [name, value] = rule.split(':');
+        if (!name || !value) {
+            continue;
+        }
+
+        map.set(name.trim().toLowerCase(), value.trim());
+    }
+
+    return map;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/styles.ts b/resources/js/wysiwyg/utils/styles.ts
deleted file mode 100644
index 8767a799821..00000000000
--- a/resources/js/wysiwyg/utils/styles.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export type StyleMap = Map<string, string>;
-
-export function createStyleMapFromDomStyles(domStyles: CSSStyleDeclaration): StyleMap {
-    const styleMap: StyleMap = new Map();
-    const styleNames: string[] = Array.from(domStyles);
-    for (const style of styleNames) {
-        styleMap.set(style, domStyles.getPropertyValue(style));
-    }
-    return styleMap;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index e808fd595cc..d0fd17e2ce7 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -206,8 +206,107 @@ export function $getTableRowsFromSelection(selection: BaseSelection|null): Custo
     return Object.values(rowsByKey);
 }
 
+export function $getTableFromSelection(selection: BaseSelection|null): CustomTableNode|null {
+    const cells = $getTableCellsFromSelection(selection);
+    if (cells.length === 0) {
+        return null;
+    }
+
+    const table = $getParentOfType(cells[0], $isCustomTableNode);
+    if ($isCustomTableNode(table)) {
+        return table;
+    }
+
+    return null;
+}
+
+export function $clearTableSizes(table: CustomTableNode): void {
+    table.setColWidths([]);
+
+    // TODO - Extra form things once table properties and extra things
+    //   are supported
 
+    for (const row of table.getChildren()) {
+        if (!$isCustomTableRowNode(row)) {
+            continue;
+        }
+
+        const rowStyles = row.getStyles();
+        rowStyles.delete('height');
+        rowStyles.delete('width');
+        row.setStyles(rowStyles);
+
+        const cells = row.getChildren().filter(c => $isCustomTableCellNode(c));
+        for (const cell of cells) {
+            const cellStyles = cell.getStyles();
+            cellStyles.delete('height');
+            cellStyles.delete('width');
+            cell.setStyles(cellStyles);
+            cell.clearWidth();
+        }
+    }
+}
+
+export function $clearTableFormatting(table: CustomTableNode): void {
+    table.setColWidths([]);
+    table.setStyles(new Map);
+
+    for (const row of table.getChildren()) {
+        if (!$isCustomTableRowNode(row)) {
+            continue;
+        }
 
+        row.setStyles(new Map);
+        row.setFormat('');
+
+        const cells = row.getChildren().filter(c => $isCustomTableCellNode(c));
+        for (const cell of cells) {
+            cell.setStyles(new Map);
+            cell.clearWidth();
+            cell.setFormat('');
+        }
+    }
+}
+
+/**
+ * Perform the given callback for each cell in the given table.
+ * Returning false from the callback stops the function early.
+ */
+export function $forEachTableCell(table: CustomTableNode, callback: (c: CustomTableCellNode) => void|false): void {
+    outer: for (const row of table.getChildren()) {
+        if (!$isCustomTableRowNode(row)) {
+            continue;
+        }
+        const cells = row.getChildren();
+        for (const cell of cells) {
+            if (!$isCustomTableCellNode(cell)) {
+                return;
+            }
+            const result = callback(cell);
+            if (result === false) {
+                break outer;
+            }
+        }
+    }
+}
+
+export function $getCellPaddingForTable(table: CustomTableNode): string {
+    let padding: string|null = null;
+
+    $forEachTableCell(table, (cell: CustomTableCellNode) => {
+        const cellPadding = cell.getStyles().get('padding') || ''
+        if (padding === null) {
+            padding = cellPadding;
+        }
+
+        if (cellPadding !== padding) {
+            padding = null;
+            return false;
+        }
+    });
+
+    return padding || '';
+}
 
 
 

From ec965f28c09bf18cab2b615716d902d31ff49cfd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 11 Aug 2024 16:08:51 +0100
Subject: [PATCH 238/666] Lexical: Added id support for all main block types

---
 resources/js/wysiwyg/index.ts                 |   5 +
 resources/js/wysiwyg/nodes/callout.ts         |  35 ++++-
 resources/js/wysiwyg/nodes/code-block.ts      |  22 +++-
 resources/js/wysiwyg/nodes/custom-heading.ts  | 120 ++++++++++++++++++
 resources/js/wysiwyg/nodes/custom-list.ts     |  92 ++++++++++++++
 .../js/wysiwyg/nodes/custom-paragraph.ts      |   9 +-
 resources/js/wysiwyg/nodes/custom-quote.ts    |  89 +++++++++++++
 resources/js/wysiwyg/nodes/details.ts         |  58 ++++++---
 resources/js/wysiwyg/nodes/diagram.ts         |  15 ++-
 resources/js/wysiwyg/nodes/horizontal-rule.ts |  56 ++++++--
 resources/js/wysiwyg/nodes/index.ts           |  31 ++++-
 resources/js/wysiwyg/nodes/media.ts           |  10 +-
 resources/js/wysiwyg/todo.md                  |   3 +-
 13 files changed, 486 insertions(+), 59 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/custom-heading.ts
 create mode 100644 resources/js/wysiwyg/nodes/custom-list.ts
 create mode 100644 resources/js/wysiwyg/nodes/custom-quote.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9da646a771a..a07fbd78980 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -82,6 +82,11 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         }
     });
 
+    // @ts-ignore
+    window.debugEditorState = () => {
+        console.log(editor.getEditorState().toJSON());
+    };
+
     const context: EditorUiContext = buildEditorUI(container, editArea, editWrap, editor, options);
     registerCommonNodeMutationListeners(context);
 
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index e39dcc3ee94..b720b5c43ce 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -9,15 +9,17 @@ import {
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 import type {RangeSelection} from "lexical/LexicalSelection";
+import {el} from "../utils/dom";
 
 export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
 
 export type SerializedCalloutNode = Spread<{
     category: CalloutCategory;
+    id: string;
 }, SerializedElementNode>
 
 export class CalloutNode extends ElementNode {
-
+    __id: string = '';
     __category: CalloutCategory = 'info';
 
     static getType() {
@@ -25,7 +27,9 @@ export class CalloutNode extends ElementNode {
     }
 
     static clone(node: CalloutNode) {
-        return new CalloutNode(node.__category, node.__key);
+        const newNode = new CalloutNode(node.__category, node.__key);
+        newNode.__id = node.__id;
+        return newNode;
     }
 
     constructor(category: CalloutCategory, key?: string) {
@@ -43,9 +47,22 @@ export class CalloutNode extends ElementNode {
         return self.__category;
     }
 
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('p');
         element.classList.add('callout', this.__category || '');
+        if (this.__id) {
+            element.setAttribute('id', this.__id);
+        }
         return element;
     }
 
@@ -88,8 +105,13 @@ export class CalloutNode extends ElementNode {
                                 }
                             }
 
+                            const node = new CalloutNode(category);
+                            if (element.id) {
+                                node.setId(element.id);
+                            }
+
                             return {
-                                node: new CalloutNode(category),
+                                node,
                             };
                         },
                         priority: 3,
@@ -106,11 +128,14 @@ export class CalloutNode extends ElementNode {
             type: 'callout',
             version: 1,
             category: this.__category,
+            id: this.__id,
         };
     }
 
     static importJSON(serializedNode: SerializedCalloutNode): CalloutNode {
-        return $createCalloutNode(serializedNode.category);
+        const node = $createCalloutNode(serializedNode.category);
+        node.setId(serializedNode.id);
+        return node;
     }
 
 }
@@ -119,7 +144,7 @@ export function $createCalloutNode(category: CalloutCategory = 'info') {
     return new CalloutNode(category);
 }
 
-export function $isCalloutNode(node: LexicalNode | null | undefined) {
+export function $isCalloutNode(node: LexicalNode | null | undefined): node is CalloutNode {
     return node instanceof CalloutNode;
 }
 
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index e240a38870a..a71e21e2e73 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -2,7 +2,7 @@ import {
     DecoratorNode,
     DOMConversion,
     DOMConversionMap,
-    DOMConversionOutput,
+    DOMConversionOutput, DOMExportOutput,
     LexicalEditor, LexicalNode,
     SerializedLexicalNode,
     Spread
@@ -33,7 +33,9 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     static clone(node: CodeBlockNode): CodeBlockNode {
-        return new CodeBlockNode(node.__language, node.__code);
+        const newNode = new CodeBlockNode(node.__language, node.__code);
+        newNode.__id = node.__id;
+        return newNode;
     }
 
     constructor(language: string = '', code: string = '', key?: string) {
@@ -118,6 +120,13 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
         return false;
     }
 
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const dom = this.createDOM(editor._config, editor);
+        return {
+            element: dom.querySelector('pre') as HTMLElement,
+        };
+    }
+
     static importDOM(): DOMConversionMap|null {
         return {
             pre(node: HTMLElement): DOMConversion|null {
@@ -130,10 +139,13 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
                                         || '';
 
                         const code = codeEl ? (codeEl.textContent || '').trim() : (element.textContent || '').trim();
+                        const node = $createCodeBlockNode(language, code);
+
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
 
-                        return {
-                            node: $createCodeBlockNode(language, code),
-                        };
+                        return { node };
                     },
                     priority: 3,
                 };
diff --git a/resources/js/wysiwyg/nodes/custom-heading.ts b/resources/js/wysiwyg/nodes/custom-heading.ts
new file mode 100644
index 00000000000..dba49898cc5
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-heading.ts
@@ -0,0 +1,120 @@
+import {
+    DOMConversionMap,
+    DOMConversionOutput, ElementFormatType,
+    LexicalNode,
+    Spread
+} from "lexical";
+import {EditorConfig} from "lexical/LexicalEditor";
+import {HeadingNode, HeadingTagType, SerializedHeadingNode} from "@lexical/rich-text";
+
+
+export type SerializedCustomHeadingNode = Spread<{
+    id: string;
+}, SerializedHeadingNode>
+
+export class CustomHeadingNode extends HeadingNode {
+    __id: string = '';
+
+    static getType() {
+        return 'custom-heading';
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    static clone(node: CustomHeadingNode) {
+        const newNode = new CustomHeadingNode(node.__tag, node.__key);
+        newNode.__id = node.__id;
+        return newNode;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const dom = super.createDOM(config);
+        if (this.__id) {
+            dom.setAttribute('id', this.__id);
+        }
+
+        return dom;
+    }
+
+    exportJSON(): SerializedCustomHeadingNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-heading',
+            version: 1,
+            id: this.__id,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomHeadingNode): CustomHeadingNode {
+        const node = $createCustomHeadingNode(serializedNode.tag);
+        node.setId(serializedNode.id);
+        return node;
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            h1: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h2: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h3: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h4: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h5: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h6: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+        };
+    }
+}
+
+function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
+    const nodeName = element.nodeName.toLowerCase();
+    let node = null;
+    if (
+        nodeName === 'h1' ||
+        nodeName === 'h2' ||
+        nodeName === 'h3' ||
+        nodeName === 'h4' ||
+        nodeName === 'h5' ||
+        nodeName === 'h6'
+    ) {
+        node = $createCustomHeadingNode(nodeName);
+        if (element.style !== null) {
+            node.setFormat(element.style.textAlign as ElementFormatType);
+        }
+        if (element.id) {
+            node.setId(element.id);
+        }
+    }
+    return {node};
+}
+
+export function $createCustomHeadingNode(tag: HeadingTagType) {
+    return new CustomHeadingNode(tag);
+}
+
+export function $isCustomHeadingNode(node: LexicalNode | null | undefined): node is CustomHeadingNode {
+    return node instanceof CustomHeadingNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-list.ts b/resources/js/wysiwyg/nodes/custom-list.ts
new file mode 100644
index 00000000000..953bcb8cd15
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-list.ts
@@ -0,0 +1,92 @@
+import {
+    DOMConversionFn,
+    DOMConversionMap,
+    LexicalNode,
+    Spread
+} from "lexical";
+import {EditorConfig} from "lexical/LexicalEditor";
+import {ListNode, ListType, SerializedListNode} from "@lexical/list";
+
+
+export type SerializedCustomListNode = Spread<{
+    id: string;
+}, SerializedListNode>
+
+export class CustomListNode extends ListNode {
+    __id: string = '';
+
+    static getType() {
+        return 'custom-list';
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    static clone(node: CustomListNode) {
+        const newNode = new CustomListNode(node.__listType, 0, node.__key);
+        newNode.__id = node.__id;
+        return newNode;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const dom = super.createDOM(config);
+        if (this.__id) {
+            dom.setAttribute('id', this.__id);
+        }
+
+        return dom;
+    }
+
+    exportJSON(): SerializedCustomListNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-list',
+            version: 1,
+            id: this.__id,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomListNode): CustomListNode {
+        const node = $createCustomListNode(serializedNode.listType);
+        node.setId(serializedNode.id);
+        return node;
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        // @ts-ignore
+        const converter = super.importDOM().ol().conversion as DOMConversionFn<HTMLElement>;
+        const customConvertFunction = (element: HTMLElement) => {
+            const baseResult = converter(element);
+            if (element.id && baseResult?.node) {
+                (baseResult.node as CustomListNode).setId(element.id);
+            }
+            return baseResult;
+        };
+
+        return {
+            ol: () => ({
+                conversion: customConvertFunction,
+                priority: 0,
+            }),
+            ul: () => ({
+                conversion: customConvertFunction,
+                priority: 0,
+            }),
+        };
+    }
+}
+
+export function $createCustomListNode(type: ListType): CustomListNode {
+    return new CustomListNode(type, 0);
+}
+
+export function $isCustomListNode(node: LexicalNode | null | undefined): node is CustomListNode {
+    return node instanceof CustomListNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
index 97647bf5e8d..cb936a5599b 100644
--- a/resources/js/wysiwyg/nodes/custom-paragraph.ts
+++ b/resources/js/wysiwyg/nodes/custom-paragraph.ts
@@ -31,7 +31,7 @@ export class CustomParagraphNode extends ParagraphNode {
         return self.__id;
     }
 
-    static clone(node: CustomParagraphNode) {
+    static clone(node: CustomParagraphNode): CustomParagraphNode {
         const newNode = new CustomParagraphNode(node.__key);
         newNode.__id = node.__id;
         return newNode;
@@ -39,9 +39,8 @@ export class CustomParagraphNode extends ParagraphNode {
 
     createDOM(config: EditorConfig): HTMLElement {
         const dom = super.createDOM(config);
-        const id = this.getId();
-        if (id) {
-            dom.setAttribute('id', id);
+        if (this.__id) {
+            dom.setAttribute('id', this.__id);
         }
 
         return dom;
@@ -89,7 +88,7 @@ export class CustomParagraphNode extends ParagraphNode {
     }
 }
 
-export function $createCustomParagraphNode() {
+export function $createCustomParagraphNode(): CustomParagraphNode {
     return new CustomParagraphNode();
 }
 
diff --git a/resources/js/wysiwyg/nodes/custom-quote.ts b/resources/js/wysiwyg/nodes/custom-quote.ts
new file mode 100644
index 00000000000..58c62f76919
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/custom-quote.ts
@@ -0,0 +1,89 @@
+import {
+    DOMConversionMap,
+    DOMConversionOutput, ElementFormatType,
+    LexicalNode,
+    Spread
+} from "lexical";
+import {EditorConfig} from "lexical/LexicalEditor";
+import {QuoteNode, SerializedQuoteNode} from "@lexical/rich-text";
+
+
+export type SerializedCustomQuoteNode = Spread<{
+    id: string;
+}, SerializedQuoteNode>
+
+export class CustomQuoteNode extends QuoteNode {
+    __id: string = '';
+
+    static getType() {
+        return 'custom-quote';
+    }
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    static clone(node: CustomQuoteNode) {
+        const newNode = new CustomQuoteNode(node.__key);
+        newNode.__id = node.__id;
+        return newNode;
+    }
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const dom = super.createDOM(config);
+        if (this.__id) {
+            dom.setAttribute('id', this.__id);
+        }
+
+        return dom;
+    }
+
+    exportJSON(): SerializedCustomQuoteNode {
+        return {
+            ...super.exportJSON(),
+            type: 'custom-quote',
+            version: 1,
+            id: this.__id,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedCustomQuoteNode): CustomQuoteNode {
+        const node = $createCustomQuoteNode();
+        node.setId(serializedNode.id);
+        return node;
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            blockquote: (node: Node) => ({
+                conversion: $convertBlockquoteElement,
+                priority: 0,
+            }),
+        };
+    }
+}
+
+function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
+    const node = $createCustomQuoteNode();
+    if (element.style !== null) {
+        node.setFormat(element.style.textAlign as ElementFormatType);
+    }
+    if (element.id) {
+        node.setId(element.id);
+    }
+    return {node};
+}
+
+export function $createCustomQuoteNode() {
+    return new CustomQuoteNode();
+}
+
+export function $isCustomQuoteNode(node: LexicalNode | null | undefined): node is CustomQuoteNode {
+    return node instanceof CustomQuoteNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/nodes/details.ts
index 8071d5e8fd9..119619da6ad 100644
--- a/resources/js/wysiwyg/nodes/details.ts
+++ b/resources/js/wysiwyg/nodes/details.ts
@@ -4,28 +4,50 @@ import {
     ElementNode,
     LexicalEditor,
     LexicalNode,
-    SerializedElementNode,
+    SerializedElementNode, Spread,
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
 import {el} from "../utils/dom";
 
+export type SerializedDetailsNode = Spread<{
+    id: string;
+}, SerializedElementNode>
+
 export class DetailsNode extends ElementNode {
+    __id: string = '';
 
     static getType() {
         return 'details';
     }
 
-    static clone(node: DetailsNode) {
-        return new DetailsNode(node.__key);
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    static clone(node: DetailsNode): DetailsNode {
+        const newNode =  new DetailsNode(node.__key);
+        newNode.__id = node.__id;
+        return newNode;
     }
 
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
-        return el('details');
+        const el = document.createElement('details');
+        if (this.__id) {
+            el.setAttribute('id', this.__id);
+        }
+
+        return el;
     }
 
     updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
-        return false;
+        return prevNode.__id !== this.__id;
     }
 
     static importDOM(): DOMConversionMap|null {
@@ -33,9 +55,12 @@ export class DetailsNode extends ElementNode {
             details(node: HTMLElement): DOMConversion|null {
                 return {
                     conversion: (element: HTMLElement): DOMConversionOutput|null => {
-                        return {
-                            node: new DetailsNode(),
-                        };
+                        const node = new DetailsNode();
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
+
+                        return {node};
                     },
                     priority: 3,
                 };
@@ -43,16 +68,19 @@ export class DetailsNode extends ElementNode {
         };
     }
 
-    exportJSON(): SerializedElementNode {
+    exportJSON(): SerializedDetailsNode {
         return {
             ...super.exportJSON(),
             type: 'details',
             version: 1,
+            id: this.__id,
         };
     }
 
-    static importJSON(serializedNode: SerializedElementNode): DetailsNode {
-        return $createDetailsNode();
+    static importJSON(serializedNode: SerializedDetailsNode): DetailsNode {
+        const node = $createDetailsNode();
+        node.setId(serializedNode.id);
+        return node;
     }
 
 }
@@ -61,7 +89,7 @@ export function $createDetailsNode() {
     return new DetailsNode();
 }
 
-export function $isDetailsNode(node: LexicalNode | null | undefined) {
+export function $isDetailsNode(node: LexicalNode | null | undefined): node is DetailsNode {
     return node instanceof DetailsNode;
 }
 
@@ -106,16 +134,16 @@ export class SummaryNode extends ElementNode {
         };
     }
 
-    static importJSON(serializedNode: SerializedElementNode): DetailsNode {
+    static importJSON(serializedNode: SerializedElementNode): SummaryNode {
         return $createSummaryNode();
     }
 
 }
 
-export function $createSummaryNode() {
+export function $createSummaryNode(): SummaryNode {
     return new SummaryNode();
 }
 
-export function $isSummaryNode(node: LexicalNode | null | undefined) {
+export function $isSummaryNode(node: LexicalNode | null | undefined): node is SummaryNode {
     return node instanceof SummaryNode;
 }
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/nodes/diagram.ts
index 76d9392480f..e2ffeaaddaf 100644
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/nodes/diagram.ts
@@ -30,7 +30,9 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     static clone(node: DiagramNode): DiagramNode {
-        return new DiagramNode(node.__drawingId, node.__drawingUrl);
+        const newNode = new DiagramNode(node.__drawingId, node.__drawingUrl);
+        newNode.__id = node.__id;
+        return newNode;
     }
 
     constructor(drawingId: string, drawingUrl: string, key?: string) {
@@ -120,10 +122,13 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
                         const img = element.querySelector('img');
                         const drawingUrl = img?.getAttribute('src') || '';
                         const drawingId = element.getAttribute('drawio-diagram') || '';
+                        const node = $createDiagramNode(drawingId, drawingUrl);
 
-                        return {
-                            node: $createDiagramNode(drawingId, drawingUrl),
-                        };
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
+
+                        return { node };
                     },
                     priority: 3,
                 };
@@ -152,7 +157,7 @@ export function $createDiagramNode(drawingId: string = '', drawingUrl: string =
     return new DiagramNode(drawingId, drawingUrl);
 }
 
-export function $isDiagramNode(node: LexicalNode | null | undefined) {
+export function $isDiagramNode(node: LexicalNode | null | undefined): node is DiagramNode {
     return node instanceof DiagramNode;
 }
 
diff --git a/resources/js/wysiwyg/nodes/horizontal-rule.ts b/resources/js/wysiwyg/nodes/horizontal-rule.ts
index fbd019e7299..e881d4688df 100644
--- a/resources/js/wysiwyg/nodes/horizontal-rule.ts
+++ b/resources/js/wysiwyg/nodes/horizontal-rule.ts
@@ -4,26 +4,48 @@ import {
     ElementNode,
     LexicalEditor,
     LexicalNode,
-    SerializedElementNode,
+    SerializedElementNode, Spread,
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
+export type SerializedHorizontalRuleNode = Spread<{
+    id: string;
+}, SerializedElementNode>
+
 export class HorizontalRuleNode extends ElementNode {
+    __id: string = '';
 
     static getType() {
         return 'horizontal-rule';
     }
 
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
     static clone(node: HorizontalRuleNode): HorizontalRuleNode {
-        return new HorizontalRuleNode(node.__key);
+        const newNode = new HorizontalRuleNode(node.__key);
+        newNode.__id = node.__id;
+        return newNode;
     }
 
-    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
-        return document.createElement('hr');
+    createDOM(_config: EditorConfig, _editor: LexicalEditor): HTMLElement {
+        const el = document.createElement('hr');
+        if (this.__id) {
+            el.setAttribute('id', this.__id);
+        }
+
+        return el;
     }
 
-    updateDOM(prevNode: unknown, dom: HTMLElement) {
-        return false;
+    updateDOM(prevNode: HorizontalRuleNode, dom: HTMLElement) {
+        return prevNode.__id !== this.__id;
     }
 
     static importDOM(): DOMConversionMap|null {
@@ -31,9 +53,12 @@ export class HorizontalRuleNode extends ElementNode {
             hr(node: HTMLElement): DOMConversion|null {
                 return {
                     conversion: (element: HTMLElement): DOMConversionOutput|null => {
-                        return {
-                            node: new HorizontalRuleNode(),
-                        };
+                        const node = new HorizontalRuleNode();
+                        if (element.id) {
+                            node.setId(element.id);
+                        }
+
+                        return {node};
                     },
                     priority: 3,
                 };
@@ -41,24 +66,27 @@ export class HorizontalRuleNode extends ElementNode {
         };
     }
 
-    exportJSON(): SerializedElementNode {
+    exportJSON(): SerializedHorizontalRuleNode {
         return {
             ...super.exportJSON(),
             type: 'horizontal-rule',
             version: 1,
+            id: this.__id,
         };
     }
 
-    static importJSON(serializedNode: SerializedElementNode): HorizontalRuleNode {
-        return $createHorizontalRuleNode();
+    static importJSON(serializedNode: SerializedHorizontalRuleNode): HorizontalRuleNode {
+        const node = $createHorizontalRuleNode();
+        node.setId(serializedNode.id);
+        return node;
     }
 
 }
 
-export function $createHorizontalRuleNode() {
+export function $createHorizontalRuleNode(): HorizontalRuleNode {
     return new HorizontalRuleNode();
 }
 
-export function $isHorizontalRuleNode(node: LexicalNode | null | undefined) {
+export function $isHorizontalRuleNode(node: LexicalNode | null | undefined): node is HorizontalRuleNode {
     return node instanceof HorizontalRuleNode;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 81a0c1a0d8e..8cbec20dad2 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -22,16 +22,19 @@ import {MediaNode} from "./media";
 import {CustomListItemNode} from "./custom-list-item";
 import {CustomTableCellNode} from "./custom-table-cell";
 import {CustomTableRowNode} from "./custom-table-row";
+import {CustomHeadingNode} from "./custom-heading";
+import {CustomQuoteNode} from "./custom-quote";
+import {CustomListNode} from "./custom-list";
 
 /**
  * Load the nodes for lexical.
  */
 export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
     return [
-        CalloutNode, // Todo - Create custom
-        HeadingNode, // Todo - Create custom
-        QuoteNode, // Todo - Create custom
-        ListNode, // Todo - Create custom
+        CalloutNode,
+        CustomHeadingNode,
+        CustomQuoteNode,
+        CustomListNode,
         CustomListItemNode,
         CustomTableNode,
         CustomTableRowNode,
@@ -42,7 +45,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CodeBlockNode,
         DiagramNode,
         MediaNode,
-        CustomParagraphNode,
+        CustomParagraphNode, // TODO - ID
         LinkNode,
         {
             replace: ParagraphNode,
@@ -50,6 +53,24 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
                 return new CustomParagraphNode();
             }
         },
+        {
+            replace: HeadingNode,
+            with: (node: HeadingNode) => {
+                return new CustomHeadingNode(node.__tag);
+            }
+        },
+        {
+            replace: QuoteNode,
+            with: (node: QuoteNode) => {
+                return new CustomQuoteNode();
+            }
+        },
+        {
+            replace: ListNode,
+            with: (node: ListNode) => {
+                return new CustomListNode(node.getListType(), node.getStart());
+            }
+        },
         {
             replace: ListItemNode,
             with: (node: ListItemNode) => {
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index aba4f6c37b4..73208cb2e43 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -66,7 +66,6 @@ function domElementToNode(tag: MediaNodeTag, element: Element): MediaNode {
 }
 
 export class MediaNode extends ElementNode {
-
     __tag: MediaNodeTag;
     __attributes: Record<string, string> = {};
     __sources: MediaNodeSource[] = [];
@@ -76,7 +75,10 @@ export class MediaNode extends ElementNode {
     }
 
     static clone(node: MediaNode) {
-        return new MediaNode(node.__tag, node.__key);
+        const newNode = new MediaNode(node.__tag, node.__key);
+        newNode.__attributes = Object.assign({}, node.__attributes);
+        newNode.__sources = node.__sources.map(s => Object.assign({}, s));
+        return newNode;
     }
 
     constructor(tag: MediaNodeTag, key?: string) {
@@ -226,10 +228,10 @@ export function $createMediaNodeFromSrc(src: string): MediaNode {
     return new MediaNode(nodeTag);
 }
 
-export function $isMediaNode(node: LexicalNode | null | undefined) {
+export function $isMediaNode(node: LexicalNode | null | undefined): node is MediaNode {
     return node instanceof MediaNode;
 }
 
-export function $isMediaNodeOfTag(node: LexicalNode | null | undefined, tag: MediaNodeTag) {
+export function $isMediaNodeOfTag(node: LexicalNode | null | undefined, tag: MediaNodeTag): boolean {
     return node instanceof MediaNode && (node as MediaNode).getTag() === tag;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 9e501fb2421..c8a0293d51d 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,13 +2,14 @@
 
 ## In progress
 
+// 
+
 ## Main Todo
 
 - Alignments: Use existing classes for blocks (including table cells)
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
 - Keyboard shortcuts support
-- Add ID support to all block types
 - Link popup menu for cross-content reference
 - Link heading-based ID reference menu
 - Image gallery integration for insert

From accf2565a06b05f4db260e761a55d4857404eed2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 13 Aug 2024 19:36:18 +0100
Subject: [PATCH 239/666] Lexical: Integrated image manager to image
 button/form

---
 resources/icons/editor/image-search.svg       |  1 +
 resources/js/wysiwyg/nodes/diagram.ts         | 71 +------------------
 resources/js/wysiwyg/todo.md                  |  4 +-
 resources/js/wysiwyg/ui/decorators/diagram.ts |  3 +-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 32 ++++-----
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 71 +++++++++++++++----
 .../ui/framework/blocks/action-field.ts       | 26 +++++++
 resources/js/wysiwyg/ui/framework/manager.ts  | 15 +++-
 resources/js/wysiwyg/ui/framework/modals.ts   |  9 ++-
 resources/js/wysiwyg/utils/diagrams.ts        | 70 ++++++++++++++++++
 resources/js/wysiwyg/utils/images.ts          | 26 +++++++
 resources/sass/_editor.scss                   | 10 +++
 12 files changed, 230 insertions(+), 108 deletions(-)
 create mode 100644 resources/icons/editor/image-search.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/action-field.ts
 create mode 100644 resources/js/wysiwyg/utils/diagrams.ts
 create mode 100644 resources/js/wysiwyg/utils/images.ts

diff --git a/resources/icons/editor/image-search.svg b/resources/icons/editor/image-search.svg
new file mode 100644
index 00000000000..b8cb2cfc870
--- /dev/null
+++ b/resources/icons/editor/image-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h200v80H200v560h560v-214l80 80v134q0 33-23.5 56.5T760-120H200Zm40-160 120-160 90 120 120-160 150 200H240Zm622-144L738-548q-21 14-45 21t-51 7q-74 0-126-52.5T464-700q0-75 52.5-127.5T644-880q75 0 127.5 52.5T824-700q0 27-8 52t-20 46l122 122-56 56ZM644-600q42 0 71-29t29-71q0-42-29-71t-71-29q-42 0-71 29t-29 71q0 42 29 71t71 29Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/nodes/diagram.ts
index e2ffeaaddaf..bd37b200c80 100644
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/nodes/diagram.ts
@@ -3,15 +3,12 @@ import {
     DOMConversion,
     DOMConversionMap,
     DOMConversionOutput,
-    LexicalEditor, LexicalNode,
+    LexicalEditor,
     SerializedLexicalNode,
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import * as DrawIO from '../../services/drawio';
-import {EditorUiContext} from "../ui/framework/core";
-import {HttpError} from "../../services/http";
 import {el} from "../utils/dom";
 
 export type SerializedDiagramNode = Spread<{
@@ -156,69 +153,3 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
 export function $createDiagramNode(drawingId: string = '', drawingUrl: string = ''): DiagramNode {
     return new DiagramNode(drawingId, drawingUrl);
 }
-
-export function $isDiagramNode(node: LexicalNode | null | undefined): node is DiagramNode {
-    return node instanceof DiagramNode;
-}
-
-
-function handleUploadError(error: HttpError, context: EditorUiContext): void {
-    if (error.status === 413) {
-        window.$events.emit('error', context.options.translations.serverUploadLimitText || '');
-    } else {
-        window.$events.emit('error', context.options.translations.imageUploadErrorText || '');
-    }
-    console.error(error);
-}
-
-async function loadDiagramIdFromNode(editor: LexicalEditor, node: DiagramNode): Promise<string> {
-    const drawingId = await new Promise<string>((res, rej) => {
-        editor.getEditorState().read(() => {
-            const {id: drawingId} = node.getDrawingIdAndUrl();
-            res(drawingId);
-        });
-    });
-
-    return drawingId || '';
-}
-
-async function updateDrawingNodeFromData(context: EditorUiContext, node: DiagramNode, pngData: string, isNew: boolean): Promise<void> {
-    DrawIO.close();
-
-    if (isNew) {
-        const loadingImage: string = window.baseUrl('/loading.gif');
-        context.editor.update(() => {
-            node.setDrawingIdAndUrl('', loadingImage);
-        });
-    }
-
-    try {
-        const img = await DrawIO.upload(pngData, context.options.pageId);
-        context.editor.update(() => {
-            node.setDrawingIdAndUrl(String(img.id), img.url);
-        });
-    } catch (err) {
-        if (err instanceof HttpError) {
-            handleUploadError(err, context);
-        }
-
-        if (isNew) {
-            context.editor.update(() => {
-                node.remove();
-            });
-        }
-
-        throw new Error(`Failed to save image with error: ${err}`);
-    }
-}
-
-export function $openDrawingEditorForNode(context: EditorUiContext, node: DiagramNode): void {
-    let isNew = false;
-    DrawIO.show(context.options.drawioUrl, async () => {
-        const drawingId = await loadDiagramIdFromNode(context.editor, node);
-        isNew = !drawingId;
-        return isNew ? '' : DrawIO.load(drawingId);
-    }, async (pngData: string) => {
-        return updateDrawingNodeFromData(context, node, pngData, isNew);
-    });
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index c8a0293d51d..1b10ef91be2 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-// 
+//
 
 ## Main Todo
 
@@ -12,8 +12,6 @@
 - Keyboard shortcuts support
 - Link popup menu for cross-content reference
 - Link heading-based ID reference menu
-- Image gallery integration for insert
-- Image gallery integration for form
 - Drawing gallery integration
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 7c79f9f41d8..44d332939e8 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,8 +1,9 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {BaseSelection} from "lexical";
-import {$openDrawingEditorForNode, DiagramNode} from "../../nodes/diagram";
+import {DiagramNode} from "../../nodes/diagram";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
+import {$openDrawingEditorForNode} from "../../utils/diagrams";
 
 
 export class DiagramDecorator extends EditorDecorator {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 0eac497fce8..f4075a7403d 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -5,7 +5,7 @@ import {
     $createNodeSelection,
     $createTextNode,
     $getRoot,
-    $getSelection,
+    $getSelection, $insertNodes,
     $setSelection,
     BaseSelection,
     ElementNode
@@ -20,7 +20,7 @@ import codeBlockIcon from "@icons/editor/code-block.svg";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../../nodes/code-block";
 import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
-import {$createDiagramNode, $isDiagramNode, $openDrawingEditorForNode, DiagramNode} from "../../../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "../../../nodes/diagram";
 import detailsIcon from "@icons/editor/details.svg";
 import mediaIcon from "@icons/editor/media.svg";
 import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
@@ -30,6 +30,9 @@ import {
     $insertNewBlockNodeAtSelection,
     $selectionContainsNodeType
 } from "../../../utils/selection";
+import {$isDiagramNode, $openDrawingEditorForNode} from "../../../utils/diagrams";
+import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
+import {$showImageForm} from "../forms/objects";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
@@ -94,28 +97,19 @@ export const image: EditorButtonDefinition = {
     label: 'Insert/Edit Image',
     icon: imageIcon,
     action(context: EditorUiContext) {
-        const imageModal = context.manager.createModal('image');
-        const selection = context.lastSelection;
-        const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode | null;
-
         context.editor.getEditorState().read(() => {
-            let formDefaults = {};
+            const selectedImage = $getNodeFromSelection(context.lastSelection, $isImageNode) as ImageNode | null;
             if (selectedImage) {
-                formDefaults = {
-                    src: selectedImage.getSrc(),
-                    alt: selectedImage.getAltText(),
-                    height: selectedImage.getHeight(),
-                    width: selectedImage.getWidth(),
-                }
+                $showImageForm(selectedImage, context);
+                return;
+            }
 
+            showImageManager((image) => {
                 context.editor.update(() => {
-                    const selection = $createNodeSelection();
-                    selection.add(selectedImage.getKey());
-                    $setSelection(selection);
+                    const link = $createLinkedImageNodeFromImageData(image);
+                    $insertNodes([link]);
                 });
-            }
-
-            imageModal.show(formDefaults);
+            })
         });
     },
     isActive(selection: BaseSelection | null): boolean {
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index dbb89b18f9d..c37696695a7 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -1,31 +1,78 @@
-import {EditorFormDefinition, EditorFormTabs, EditorSelectFormFieldDefinition} from "../../framework/forms";
+import {
+    EditorFormDefinition,
+    EditorFormField,
+    EditorFormTabs,
+    EditorSelectFormFieldDefinition
+} from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
 import {$createTextNode, $getSelection} from "lexical";
-import {$createImageNode} from "../../../nodes/image";
+import {$isImageNode, ImageNode} from "../../../nodes/image";
 import {$createLinkNode} from "@lexical/link";
 import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
 import {$getNodeFromSelection} from "../../../utils/selection";
+import {EditorFormModal} from "../../framework/modals";
+import {EditorActionField} from "../../framework/blocks/action-field";
+import {EditorButton} from "../../framework/buttons";
+import {showImageManager} from "../../../utils/images";
+import searchImageIcon from "@icons/editor/image-search.svg";
+
+export function $showImageForm(image: ImageNode, context: EditorUiContext) {
+    const imageModal: EditorFormModal = context.manager.createModal('image');
+    const height = image.getHeight();
+    const width = image.getWidth();
+
+    const formData = {
+        src: image.getSrc(),
+        alt: image.getAltText(),
+        height: height === 0 ? '' : String(height),
+        width: width === 0 ? '' : String(width),
+    };
+
+    imageModal.show(formData);
+}
 
 export const image: EditorFormDefinition = {
     submitText: 'Apply',
     async action(formData, context: EditorUiContext) {
         context.editor.update(() => {
-            const selection = $getSelection();
-            const imageNode = $createImageNode(formData.get('src')?.toString() || '', {
-                alt: formData.get('alt')?.toString() || '',
-                height: Number(formData.get('height')?.toString() || '0'),
-                width: Number(formData.get('width')?.toString() || '0'),
-            });
-            selection?.insertNodes([imageNode]);
+            const selectedImage = $getNodeFromSelection(context.lastSelection, $isImageNode);
+            if ($isImageNode(selectedImage)) {
+                selectedImage.setSrc(formData.get('src')?.toString() || '');
+                selectedImage.setAltText(formData.get('alt')?.toString() || '');
+
+                selectedImage.setWidth(Number(formData.get('width')?.toString() || '0'));
+                selectedImage.setHeight(Number(formData.get('height')?.toString() || '0'));
+            }
         });
         return true;
     },
     fields: [
         {
-            label: 'Source',
-            name: 'src',
-            type: 'text',
+            build() {
+                return new EditorActionField(
+                    new EditorFormField({
+                        label: 'Source',
+                        name: 'src',
+                        type: 'text',
+                    }),
+                    new EditorButton({
+                        label: 'Browse files',
+                        icon: searchImageIcon,
+                        action(context: EditorUiContext) {
+                            showImageManager((image) => {
+                                 const modal =  context.manager.getActiveModal('image');
+                                 if (modal) {
+                                     modal.getForm().setValues({
+                                         src: image.thumbs?.display || image.url,
+                                         alt: image.name,
+                                     });
+                                 }
+                            });
+                        }
+                    }),
+                );
+            },
         },
         {
             label: 'Alternative description',
diff --git a/resources/js/wysiwyg/ui/framework/blocks/action-field.ts b/resources/js/wysiwyg/ui/framework/blocks/action-field.ts
new file mode 100644
index 00000000000..1f40c2864d1
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/action-field.ts
@@ -0,0 +1,26 @@
+import {EditorContainerUiElement, EditorUiElement} from "../core";
+import {el} from "../../../utils/dom";
+import {EditorFormField} from "../forms";
+import {EditorButton} from "../buttons";
+
+
+export class EditorActionField extends EditorContainerUiElement {
+    protected input: EditorFormField;
+    protected action: EditorButton;
+
+    constructor(input: EditorFormField, action: EditorButton) {
+        super([input, action]);
+
+        this.input = input;
+        this.action = action;
+    }
+
+    buildDOM(): HTMLElement {
+        return el('div', {
+            class: 'editor-action-input-container',
+        }, [
+            this.input.getDOMElement(),
+            this.action.getDOMElement(),
+        ]);
+    }
+}
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 29d95991075..92891b54084 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -11,6 +11,7 @@ export type SelectionChangeHandler = (selection: BaseSelection|null) => void;
 export class EditorUIManager {
 
     protected modalDefinitionsByKey: Record<string, EditorFormModalDefinition> = {};
+    protected activeModalsByKey: Record<string, EditorFormModal> = {};
     protected decoratorConstructorsByType: Record<string, typeof EditorDecorator> = {};
     protected decoratorInstancesByNodeKey: Record<string, EditorDecorator> = {};
     protected context: EditorUiContext|null = null;
@@ -50,12 +51,24 @@ export class EditorUIManager {
             throw new Error(`Attempted to show modal of key [${key}] but no modal registered for that key`);
         }
 
-        const modal = new EditorFormModal(modalDefinition);
+        const modal = new EditorFormModal(modalDefinition, key);
         modal.setContext(this.getContext());
 
         return modal;
     }
 
+    setModalActive(key: string, modal: EditorFormModal): void {
+        this.activeModalsByKey[key] = modal;
+    }
+
+    setModalInactive(key: string): void {
+        delete this.activeModalsByKey[key];
+    }
+
+    getActiveModal(key: string): EditorFormModal|null {
+        return this.activeModalsByKey[key];
+    }
+
     registerDecoratorType(type: string, decorator: typeof EditorDecorator) {
         this.decoratorConstructorsByType[type] = decorator;
     }
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 1768f6f545b..ae69302f6d0 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -13,10 +13,12 @@ export interface EditorFormModalDefinition extends EditorModalDefinition {
 
 export class EditorFormModal extends EditorContainerUiElement {
     protected definition: EditorFormModalDefinition;
+    protected key: string;
 
-    constructor(definition: EditorFormModalDefinition) {
+    constructor(definition: EditorFormModalDefinition, key: string) {
         super([new EditorForm(definition.form)]);
         this.definition = definition;
+        this.key = key;
     }
 
     show(defaultValues: Record<string, string>) {
@@ -26,13 +28,16 @@ export class EditorFormModal extends EditorContainerUiElement {
         const form = this.getForm();
         form.setValues(defaultValues);
         form.setOnCancel(this.hide.bind(this));
+
+        this.getContext().manager.setModalActive(this.key, this);
     }
 
     hide() {
         this.getDOMElement().remove();
+        this.getContext().manager.setModalInactive(this.key);
     }
 
-    protected getForm(): EditorForm {
+    getForm(): EditorForm {
         return this.children[0] as EditorForm;
     }
 
diff --git a/resources/js/wysiwyg/utils/diagrams.ts b/resources/js/wysiwyg/utils/diagrams.ts
new file mode 100644
index 00000000000..50d7d5b3f36
--- /dev/null
+++ b/resources/js/wysiwyg/utils/diagrams.ts
@@ -0,0 +1,70 @@
+import {LexicalEditor, LexicalNode} from "lexical";
+import {HttpError} from "../../services/http";
+import {EditorUiContext} from "../ui/framework/core";
+import * as DrawIO from "../../services/drawio";
+import {DiagramNode} from "../nodes/diagram";
+
+export function $isDiagramNode(node: LexicalNode | null | undefined): node is DiagramNode {
+    return node instanceof DiagramNode;
+}
+
+function handleUploadError(error: HttpError, context: EditorUiContext): void {
+    if (error.status === 413) {
+        window.$events.emit('error', context.options.translations.serverUploadLimitText || '');
+    } else {
+        window.$events.emit('error', context.options.translations.imageUploadErrorText || '');
+    }
+    console.error(error);
+}
+
+async function loadDiagramIdFromNode(editor: LexicalEditor, node: DiagramNode): Promise<string> {
+    const drawingId = await new Promise<string>((res, rej) => {
+        editor.getEditorState().read(() => {
+            const {id: drawingId} = node.getDrawingIdAndUrl();
+            res(drawingId);
+        });
+    });
+
+    return drawingId || '';
+}
+
+async function updateDrawingNodeFromData(context: EditorUiContext, node: DiagramNode, pngData: string, isNew: boolean): Promise<void> {
+    DrawIO.close();
+
+    if (isNew) {
+        const loadingImage: string = window.baseUrl('/loading.gif');
+        context.editor.update(() => {
+            node.setDrawingIdAndUrl('', loadingImage);
+        });
+    }
+
+    try {
+        const img = await DrawIO.upload(pngData, context.options.pageId);
+        context.editor.update(() => {
+            node.setDrawingIdAndUrl(String(img.id), img.url);
+        });
+    } catch (err) {
+        if (err instanceof HttpError) {
+            handleUploadError(err, context);
+        }
+
+        if (isNew) {
+            context.editor.update(() => {
+                node.remove();
+            });
+        }
+
+        throw new Error(`Failed to save image with error: ${err}`);
+    }
+}
+
+export function $openDrawingEditorForNode(context: EditorUiContext, node: DiagramNode): void {
+    let isNew = false;
+    DrawIO.show(context.options.drawioUrl, async () => {
+        const drawingId = await loadDiagramIdFromNode(context.editor, node);
+        isNew = !drawingId;
+        return isNew ? '' : DrawIO.load(drawingId);
+    }, async (pngData: string) => {
+        return updateDrawingNodeFromData(context, node, pngData, isNew);
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
new file mode 100644
index 00000000000..89a4a60f091
--- /dev/null
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -0,0 +1,26 @@
+import {ImageManager} from "../../components";
+import {$createImageNode} from "../nodes/image";
+import {$createLinkNode, LinkNode} from "@lexical/link";
+
+type EditorImageData = {
+    url: string;
+    thumbs?: {display: string};
+    name: string;
+};
+
+export function showImageManager(callback: (image: EditorImageData) => any) {
+    const imageManager: ImageManager = window.$components.first('image-manager') as ImageManager;
+    imageManager.show((image: EditorImageData) => {
+        callback(image);
+    }, 'gallery');
+}
+
+export function $createLinkedImageNodeFromImageData(image: EditorImageData): LinkNode {
+    const url = image.thumbs?.display || image.url;
+    const linkNode = $createLinkNode(url, {target: '_blank'});
+    const imageNode = $createImageNode(url, {
+        alt: image.name
+    });
+    linkNode.append(imageNode);
+    return linkNode;
+}
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 0cf14555977..379c436f466 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -479,6 +479,16 @@ textarea.editor-form-field-input {
 .editor-form-tab-contents {
   width: 360px;
 }
+.editor-action-input-container {
+  display: flex;
+  flex-direction: row;
+  align-items: end;
+  justify-content: space-between;
+  gap: .1rem;
+  .editor-button {
+    margin-bottom: 12px;
+  }
+}
 
 // Editor theme styles
 .editor-theme-bold {

From 1ef40444196e6b3e291a402aa18ddcfca7b35511 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 16 Aug 2024 11:22:12 +0100
Subject: [PATCH 240/666] Lexical: Connected link selector to link form

---
 resources/js/wysiwyg/todo.md                  |  4 +-
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 63 +++++++++++++++----
 resources/js/wysiwyg/utils/links.ts           | 16 +++++
 3 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/links.ts

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 1b10ef91be2..194832d5f62 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-//
+- Link heading-based ID reference menu
 
 ## Main Todo
 
@@ -10,8 +10,6 @@
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
 - Keyboard shortcuts support
-- Link popup menu for cross-content reference
-- Link heading-based ID reference menu
 - Drawing gallery integration
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index c37696695a7..6bd265e6c2a 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -5,9 +5,9 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {$createTextNode, $getSelection} from "lexical";
+import {$createTextNode, $getSelection, $insertNodes} from "lexical";
 import {$isImageNode, ImageNode} from "../../../nodes/image";
-import {$createLinkNode} from "@lexical/link";
+import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
 import {$getNodeFromSelection} from "../../../utils/selection";
@@ -16,6 +16,8 @@ import {EditorActionField} from "../../framework/blocks/action-field";
 import {EditorButton} from "../../framework/buttons";
 import {showImageManager} from "../../../utils/images";
 import searchImageIcon from "@icons/editor/image-search.svg";
+import searchIcon from "@icons/search.svg";
+import {showLinkSelector} from "../../../utils/links";
 
 export function $showImageForm(image: ImageNode, context: EditorUiContext) {
     const imageModal: EditorFormModal = context.manager.createModal('image');
@@ -97,23 +99,62 @@ export const link: EditorFormDefinition = {
     async action(formData, context: EditorUiContext) {
         context.editor.update(() => {
 
+            const url = formData.get('url')?.toString() || '';
+            const title = formData.get('title')?.toString() || ''
+            const target = formData.get('target')?.toString() || '';
+            const text = formData.get('text')?.toString() || '';
+
             const selection = $getSelection();
+            let link = $getNodeFromSelection(selection, $isLinkNode);
+            if ($isLinkNode(link)) {
+                link.setURL(url);
+                link.setTarget(target);
+                link.setTitle(title);
+            } else {
+                link = $createLinkNode(url, {
+                    title: title,
+                    target: target,
+                });
 
-            const linkNode = $createLinkNode(formData.get('url')?.toString() || '', {
-                title: formData.get('title')?.toString() || '',
-                target: formData.get('target')?.toString() || '',
-            });
-            linkNode.append($createTextNode(formData.get('text')?.toString() || ''));
+                $insertNodes([link]);
+            }
 
-            selection?.insertNodes([linkNode]);
+            if ($isLinkNode(link)) {
+                for (const child of link.getChildren()) {
+                    child.remove(true);
+                }
+                link.append($createTextNode(text));
+            }
         });
         return true;
     },
     fields: [
         {
-            label: 'URL',
-            name: 'url',
-            type: 'text',
+            build() {
+                return new EditorActionField(
+                    new EditorFormField({
+                        label: 'URL',
+                        name: 'url',
+                        type: 'text',
+                    }),
+                    new EditorButton({
+                        label: 'Browse links',
+                        icon: searchIcon,
+                        action(context: EditorUiContext) {
+                            showLinkSelector(entity => {
+                                const modal =  context.manager.getActiveModal('link');
+                                if (modal) {
+                                    modal.getForm().setValues({
+                                        url: entity.link,
+                                        text: entity.name,
+                                        title: entity.name,
+                                    });
+                                }
+                            });
+                        }
+                    }),
+                );
+            },
         },
         {
             label: 'Text to display',
diff --git a/resources/js/wysiwyg/utils/links.ts b/resources/js/wysiwyg/utils/links.ts
new file mode 100644
index 00000000000..03c4a5ef075
--- /dev/null
+++ b/resources/js/wysiwyg/utils/links.ts
@@ -0,0 +1,16 @@
+import {EntitySelectorPopup} from "../../components";
+
+type EditorEntityData = {
+    link: string;
+    name: string;
+};
+
+export function showLinkSelector(callback: (entity: EditorEntityData) => any, selectionText?: string) {
+    const selector: EntitySelectorPopup = window.$components.first('entity-selector-popup') as EntitySelectorPopup;
+    selector.show((entity: EditorEntityData) => callback(entity), {
+        initialValue: selectionText,
+        searchEndpoint: '/search/entity-selector',
+        entityTypes: 'page,book,chapter,bookshelf',
+        entityPermission: 'view',
+    });
+}
\ No newline at end of file

From ad6b26ba97b32996455d8fd7f3c3c0f4d3f480af Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 16 Aug 2024 12:29:40 +0100
Subject: [PATCH 241/666] Lexical: Added basic URL field header option list

May show bad option label names on chrome/safari.
This was an easy first pass without loads of extra custom UI since we're
using native datalists.
---
 resources/js/services/util.js                 | 11 +++
 resources/js/wysiwyg/nodes/custom-heading.ts  |  4 +-
 resources/js/wysiwyg/todo.md                  |  2 +-
 .../js/wysiwyg/ui/defaults/forms/objects.ts   |  5 +-
 .../ui/framework/blocks/action-field.ts       |  5 +-
 .../wysiwyg/ui/framework/blocks/link-field.ts | 96 +++++++++++++++++++
 resources/js/wysiwyg/utils/nodes.ts           | 22 ++++-
 7 files changed, 135 insertions(+), 10 deletions(-)
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/link-field.ts

diff --git a/resources/js/services/util.js b/resources/js/services/util.js
index 942456d9ded..1264d105860 100644
--- a/resources/js/services/util.js
+++ b/resources/js/services/util.js
@@ -84,6 +84,17 @@ export function uniqueId() {
     return (`${S4() + S4()}-${S4()}-${S4()}-${S4()}-${S4()}${S4()}${S4()}`);
 }
 
+/**
+ * Generate a random smaller unique ID.
+ *
+ * @returns {string}
+ */
+export function uniqueIdSmall() {
+    // eslint-disable-next-line no-bitwise
+    const S4 = () => (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    return S4();
+}
+
 /**
  * Create a promise that resolves after the given time.
  * @param {int} timeMs
diff --git a/resources/js/wysiwyg/nodes/custom-heading.ts b/resources/js/wysiwyg/nodes/custom-heading.ts
index dba49898cc5..f069ff16048 100644
--- a/resources/js/wysiwyg/nodes/custom-heading.ts
+++ b/resources/js/wysiwyg/nodes/custom-heading.ts
@@ -30,9 +30,7 @@ export class CustomHeadingNode extends HeadingNode {
     }
 
     static clone(node: CustomHeadingNode) {
-        const newNode = new CustomHeadingNode(node.__tag, node.__key);
-        newNode.__id = node.__id;
-        return newNode;
+        return new CustomHeadingNode(node.__tag, node.__key);
     }
 
     createDOM(config: EditorConfig): HTMLElement {
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 194832d5f62..70a3744f3bc 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-- Link heading-based ID reference menu
+//
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 6bd265e6c2a..2ad27f749c1 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -18,6 +18,7 @@ import {showImageManager} from "../../../utils/images";
 import searchImageIcon from "@icons/editor/image-search.svg";
 import searchIcon from "@icons/search.svg";
 import {showLinkSelector} from "../../../utils/links";
+import {LinkField} from "../../framework/blocks/link-field";
 
 export function $showImageForm(image: ImageNode, context: EditorUiContext) {
     const imageModal: EditorFormModal = context.manager.createModal('image');
@@ -132,11 +133,11 @@ export const link: EditorFormDefinition = {
         {
             build() {
                 return new EditorActionField(
-                    new EditorFormField({
+                    new LinkField(new EditorFormField({
                         label: 'URL',
                         name: 'url',
                         type: 'text',
-                    }),
+                    })),
                     new EditorButton({
                         label: 'Browse links',
                         icon: searchIcon,
diff --git a/resources/js/wysiwyg/ui/framework/blocks/action-field.ts b/resources/js/wysiwyg/ui/framework/blocks/action-field.ts
index 1f40c2864d1..b7741321bae 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/action-field.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/action-field.ts
@@ -1,14 +1,13 @@
 import {EditorContainerUiElement, EditorUiElement} from "../core";
 import {el} from "../../../utils/dom";
-import {EditorFormField} from "../forms";
 import {EditorButton} from "../buttons";
 
 
 export class EditorActionField extends EditorContainerUiElement {
-    protected input: EditorFormField;
+    protected input: EditorUiElement;
     protected action: EditorButton;
 
-    constructor(input: EditorFormField, action: EditorButton) {
+    constructor(input: EditorUiElement, action: EditorButton) {
         super([input, action]);
 
         this.input = input;
diff --git a/resources/js/wysiwyg/ui/framework/blocks/link-field.ts b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
new file mode 100644
index 00000000000..5a64cdc30fc
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
@@ -0,0 +1,96 @@
+import {EditorContainerUiElement} from "../core";
+import {el} from "../../../utils/dom";
+import {EditorFormField} from "../forms";
+import {CustomHeadingNode} from "../../../nodes/custom-heading";
+import {$getAllNodesOfType} from "../../../utils/nodes";
+import {$isHeadingNode} from "@lexical/rich-text";
+import {uniqueIdSmall} from "../../../../services/util";
+
+export class LinkField extends EditorContainerUiElement {
+    protected input: EditorFormField;
+    protected headerMap = new Map<string, CustomHeadingNode>();
+
+    constructor(input: EditorFormField) {
+        super([input]);
+
+        this.input = input;
+    }
+
+    buildDOM(): HTMLElement {
+        const listId = 'editor-form-datalist-' + this.input.getName() + '-' + Date.now();
+        const inputOuterDOM = this.input.getDOMElement();
+        const inputFieldDOM = inputOuterDOM.querySelector('input');
+        inputFieldDOM?.setAttribute('list', listId);
+        inputFieldDOM?.setAttribute('autocomplete', 'off');
+        const datalist = el('datalist', {id: listId});
+
+        const container = el('div', {
+            class: 'editor-link-field-container',
+        }, [inputOuterDOM, datalist]);
+
+        inputFieldDOM?.addEventListener('focusin', () => {
+            this.updateDataList(datalist);
+        });
+
+        inputFieldDOM?.addEventListener('input', () => {
+            const value = inputFieldDOM.value;
+            const header = this.headerMap.get(value);
+            if (header) {
+                this.updateFormFromHeader(header);
+            }
+        });
+
+        return container;
+    }
+
+    updateFormFromHeader(header: CustomHeadingNode) {
+        this.getHeaderIdAndText(header).then(({id, text}) => {
+            console.log('updating form', id, text);
+            const modal =  this.getContext().manager.getActiveModal('link');
+            if (modal) {
+                modal.getForm().setValues({
+                    url: `#${id}`,
+                    text: text,
+                    title: text,
+                });
+            }
+        });
+    }
+
+    getHeaderIdAndText(header: CustomHeadingNode): Promise<{id: string, text: string}> {
+        return new Promise((res) => {
+            this.getContext().editor.update(() => {
+                let id = header.getId();
+                console.log('header', id, header.__id);
+                if (!id) {
+                    id = 'header-' + uniqueIdSmall();
+                    header.setId(id);
+                }
+
+                const text = header.getTextContent();
+                res({id, text});
+            });
+        });
+    }
+
+    updateDataList(listEl: HTMLElement) {
+        this.getContext().editor.getEditorState().read(() => {
+            const headers = $getAllNodesOfType($isHeadingNode) as CustomHeadingNode[];
+
+            this.headerMap.clear();
+            const listEls: HTMLElement[] = [];
+
+            for (const header of headers) {
+                const key = 'header-' + header.getKey();
+                this.headerMap.set(key, header);
+                listEls.push(el('option', {
+                    value: key,
+                    label: header.getTextContent().substring(0, 54),
+                }));
+            }
+
+            listEl.innerHTML = '';
+            listEl.append(...listEls);
+        });
+    }
+}
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 8e6c666109b..6278186ca12 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -1,4 +1,4 @@
-import {$getRoot, $isTextNode, LexicalEditor, LexicalNode} from "lexical";
+import {$getRoot, $isElementNode, $isTextNode, ElementNode, LexicalEditor, LexicalNode} from "lexical";
 import {LexicalNodeMatcher} from "../nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$generateNodesFromDOM} from "@lexical/html";
@@ -31,6 +31,26 @@ export function $getParentOfType(node: LexicalNode, matcher: LexicalNodeMatcher)
     return null;
 }
 
+export function $getAllNodesOfType(matcher: LexicalNodeMatcher, root?: ElementNode): LexicalNode[] {
+    if (!root) {
+        root = $getRoot();
+    }
+
+    const matches = [];
+
+    for (const child of root.getChildren()) {
+        if (matcher(child)) {
+            matches.push(child);
+        }
+
+        if ($isElementNode(child)) {
+            matches.push(...$getAllNodesOfType(matcher, child));
+        }
+    }
+
+    return matches;
+}
+
 /**
  * Get the nearest root/block level node for the given position.
  */

From 0039f893ccb6d43c7cd5bacde7163ecdd32dc3d9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 17 Aug 2024 10:48:34 +0100
Subject: [PATCH 242/666] Lexical: Integrated diagram manager, added menu split
 button

---
 resources/icons/caret-down-large.svg          |  1 +
 resources/js/wysiwyg/todo.md                  |  1 -
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 12 ++++++-
 .../ui/framework/blocks/button-with-menu.ts   | 31 +++++++++++++++++++
 resources/js/wysiwyg/ui/toolbars.ts           | 10 +++---
 resources/js/wysiwyg/utils/diagrams.ts        | 29 +++++++++++++++--
 resources/js/wysiwyg/utils/images.ts          |  3 +-
 resources/sass/_editor.scss                   | 25 +++++++++++++++
 8 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 resources/icons/caret-down-large.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts

diff --git a/resources/icons/caret-down-large.svg b/resources/icons/caret-down-large.svg
new file mode 100644
index 00000000000..a15ec42c8f6
--- /dev/null
+++ b/resources/icons/caret-down-large.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 6.9159 10 10.168 10-10.168z" stroke-width="2.0168"/></svg>
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 70a3744f3bc..f3a8da404e6 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -10,7 +10,6 @@
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
 - Keyboard shortcuts support
-- Drawing gallery integration
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 - Table caption text support
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index f4075a7403d..96a92ff2285 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -30,7 +30,7 @@ import {
     $insertNewBlockNodeAtSelection,
     $selectionContainsNodeType
 } from "../../../utils/selection";
-import {$isDiagramNode, $openDrawingEditorForNode} from "../../../utils/diagrams";
+import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert} from "../../../utils/diagrams";
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
 import {$showImageForm} from "../forms/objects";
 
@@ -184,6 +184,16 @@ export const diagram: EditorButtonDefinition = {
     }
 };
 
+export const diagramManager: EditorButtonDefinition = {
+    label: 'Drawing manager',
+    action(context: EditorUiContext) {
+        showDiagramManagerForInsert(context);
+    },
+    isActive(): boolean {
+        return false;
+    }
+};
+
 export const media: EditorButtonDefinition = {
     label: 'Insert/edit Media',
     icon: mediaIcon,
diff --git a/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts
new file mode 100644
index 00000000000..30dd237f60f
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts
@@ -0,0 +1,31 @@
+import {EditorContainerUiElement, EditorUiElement} from "../core";
+import {el} from "../../../utils/dom";
+import {EditorButton} from "../buttons";
+import {EditorDropdownButton} from "./dropdown-button";
+import caretDownIcon from "@icons/caret-down-large.svg";
+
+export class EditorButtonWithMenu extends EditorContainerUiElement {
+    protected button: EditorButton;
+    protected dropdownButton: EditorDropdownButton;
+
+    constructor(button: EditorButton, menuItems: EditorUiElement[]) {
+        super([button]);
+
+        this.button = button;
+        this.dropdownButton = new EditorDropdownButton({
+            button: {label: 'Menu', icon: caretDownIcon},
+            showOnHover: false,
+            direction: 'vertical',
+        }, menuItems);
+        this.addChildren(this.dropdownButton);
+    }
+
+    buildDOM(): HTMLElement {
+        return el('div', {
+            class: 'editor-button-with-menu-container',
+        }, [
+            this.button.getDOMElement(),
+            this.dropdownButton.getDOMElement()
+        ]);
+    }
+}
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 48e11837c95..87ecae03e2b 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -56,16 +56,15 @@ import {bulletList, numberList, taskList} from "./defaults/buttons/lists";
 import {
     codeBlock,
     details,
-    diagram,
+    diagram, diagramManager,
     editCodeBlock,
     horizontalRule,
     image,
     link, media,
     unlink
 } from "./defaults/buttons/objects";
-import {$isTableNode} from "@lexical/table";
-import {$selectionContainsNodeType} from "../utils/selection";
 import {el} from "../utils/dom";
+import {EditorButtonWithMenu} from "./framework/blocks/button-with-menu";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -166,7 +165,10 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new EditorButton(image),
             new EditorButton(horizontalRule),
             new EditorButton(codeBlock),
-            new EditorButton(diagram),
+            new EditorButtonWithMenu(
+                new EditorButton(diagram),
+                [new EditorButton(diagramManager)],
+            ),
             new EditorButton(media),
             new EditorButton(details),
         ]),
diff --git a/resources/js/wysiwyg/utils/diagrams.ts b/resources/js/wysiwyg/utils/diagrams.ts
index 50d7d5b3f36..2dee3ab6b0d 100644
--- a/resources/js/wysiwyg/utils/diagrams.ts
+++ b/resources/js/wysiwyg/utils/diagrams.ts
@@ -1,8 +1,11 @@
-import {LexicalEditor, LexicalNode} from "lexical";
+import {$getSelection, $insertNodes, LexicalEditor, LexicalNode} from "lexical";
 import {HttpError} from "../../services/http";
 import {EditorUiContext} from "../ui/framework/core";
 import * as DrawIO from "../../services/drawio";
-import {DiagramNode} from "../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "../nodes/diagram";
+import {ImageManager} from "../../components";
+import {EditorImageData} from "./images";
+import {$getNodeFromSelection} from "./selection";
 
 export function $isDiagramNode(node: LexicalNode | null | undefined): node is DiagramNode {
     return node instanceof DiagramNode;
@@ -67,4 +70,26 @@ export function $openDrawingEditorForNode(context: EditorUiContext, node: Diagra
     }, async (pngData: string) => {
         return updateDrawingNodeFromData(context, node, pngData, isNew);
     });
+}
+
+export function showDiagramManager(callback: (image: EditorImageData) => any) {
+    const imageManager: ImageManager = window.$components.first('image-manager') as ImageManager;
+    imageManager.show((image: EditorImageData) => {
+        callback(image);
+    }, 'drawio');
+}
+
+export function showDiagramManagerForInsert(context: EditorUiContext) {
+    const selection = context.lastSelection;
+    showDiagramManager((image: EditorImageData) => {
+        context.editor.update(() => {
+            const diagramNode = $createDiagramNode(image.id, image.url);
+            const selectedDiagram = $getNodeFromSelection(selection, $isDiagramNode);
+            if ($isDiagramNode(selectedDiagram)) {
+                selectedDiagram.replace(diagramNode);
+            } else {
+                $insertNodes([diagramNode]);
+            }
+        });
+    });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index 89a4a60f091..a83d554186e 100644
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -2,7 +2,8 @@ import {ImageManager} from "../../components";
 import {$createImageNode} from "../nodes/image";
 import {$createLinkNode, LinkNode} from "@lexical/link";
 
-type EditorImageData = {
+export type EditorImageData = {
+    id: string;
     url: string;
     thumbs?: {display: string};
     name: string;
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 379c436f466..78e518bd566 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -82,6 +82,31 @@ body.editor-is-fullscreen {
   fill: currentColor;
   display: block;
 }
+.editor-button-with-menu-container {
+  display: flex;
+  flex-direction: row;
+  gap: 0;
+  align-items: stretch;
+  border-radius: 4px;
+  .editor-dropdown-menu-container {
+    display: flex;
+  }
+  .editor-dropdown-menu-container > .editor-dropdown-menu {
+    top: 100%;
+  }
+  .editor-dropdown-menu-container > .editor-button {
+    padding-inline: 4px;
+    margin-inline-start: -3px;
+    svg {
+      width: 12px;
+      height: 12px;
+    }
+  }
+  &:hover {
+    outline: 1px solid #DDD;
+    outline-offset: -3px;
+  }
+}
 
 // Containers
 .editor-dropdown-menu-container {

From 111a313d5125bd890d7df46929802f4621388c95 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 18 Aug 2024 16:51:08 +0100
Subject: [PATCH 243/666] Lexical: Added custom alignment handling for blocks

To align with pre-existing use of alignment classes.
---
 resources/js/wysiwyg/nodes/_common.ts         | 66 +++++++++++++++++++
 resources/js/wysiwyg/nodes/callout.ts         | 40 +++++++----
 resources/js/wysiwyg/nodes/custom-heading.ts  | 46 ++++++++-----
 .../js/wysiwyg/nodes/custom-paragraph.ts      | 48 +++++++++-----
 resources/js/wysiwyg/nodes/custom-quote.ts    | 42 ++++++++----
 .../js/wysiwyg/nodes/custom-table-cell.ts     | 26 +++++++-
 resources/js/wysiwyg/nodes/custom-table.ts    | 37 +++++++----
 resources/js/wysiwyg/nodes/index.ts           |  8 +--
 resources/js/wysiwyg/todo.md                  |  2 +-
 .../wysiwyg/ui/defaults/buttons/alignments.ts | 10 ++-
 resources/js/wysiwyg/utils/nodes.ts           |  5 ++
 resources/sass/_content.scss                  |  3 +
 12 files changed, 251 insertions(+), 82 deletions(-)
 create mode 100644 resources/js/wysiwyg/nodes/_common.ts

diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/nodes/_common.ts
new file mode 100644
index 00000000000..cc45dc9107c
--- /dev/null
+++ b/resources/js/wysiwyg/nodes/_common.ts
@@ -0,0 +1,66 @@
+import {LexicalNode, Spread} from "lexical";
+import type {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
+
+export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
+const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
+
+export type SerializedCommonBlockNode = Spread<{
+    id: string;
+    alignment: CommonBlockAlignment;
+}, SerializedElementNode>
+
+export interface NodeHasAlignment {
+    readonly __alignment: CommonBlockAlignment;
+    setAlignment(alignment: CommonBlockAlignment): void;
+    getAlignment(): CommonBlockAlignment;
+}
+
+export interface NodeHasId {
+    readonly __id: string;
+    setId(id: string): void;
+    getId(): string;
+}
+
+interface CommonBlockInterface extends NodeHasId, NodeHasAlignment {}
+
+export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
+    const textAlignStyle: string = element.style.textAlign || '';
+    if (validAlignments.includes(textAlignStyle as CommonBlockAlignment)) {
+        return textAlignStyle as CommonBlockAlignment;
+    }
+
+    if (element.classList.contains('align-left')) {
+        return 'left';
+    } else if (element.classList.contains('align-right')) {
+        return 'right'
+    } else if (element.classList.contains('align-center')) {
+        return 'center'
+    } else if (element.classList.contains('align-justify')) {
+        return 'justify'
+    }
+
+    return '';
+}
+
+export function setCommonBlockPropsFromElement(element: HTMLElement, node: CommonBlockInterface): void {
+    if (element.id) {
+        node.setId(element.id);
+    }
+
+    node.setAlignment(extractAlignmentFromElement(element));
+}
+
+export function commonPropertiesDifferent(nodeA: CommonBlockInterface, nodeB: CommonBlockInterface): boolean {
+    return nodeA.__id !== nodeB.__id ||
+        nodeA.__alignment !== nodeB.__alignment;
+}
+
+export function updateElementWithCommonBlockProps(element: HTMLElement, node: CommonBlockInterface): void {
+    if (node.__id) {
+        element.setAttribute('id', node.__id);
+    }
+
+    if (node.__alignment) {
+        element.classList.add('align-' + node.__alignment);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index b720b5c43ce..8018190c8a7 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -5,22 +5,27 @@ import {
     ElementNode,
     LexicalEditor,
     LexicalNode,
-    ParagraphNode, SerializedElementNode, Spread
+    ParagraphNode, Spread
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 import type {RangeSelection} from "lexical/LexicalSelection";
-import {el} from "../utils/dom";
+import {
+    CommonBlockAlignment, commonPropertiesDifferent,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
 
 export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
 
 export type SerializedCalloutNode = Spread<{
     category: CalloutCategory;
-    id: string;
-}, SerializedElementNode>
+}, SerializedCommonBlockNode>
 
 export class CalloutNode extends ElementNode {
     __id: string = '';
     __category: CalloutCategory = 'info';
+    __alignment: CommonBlockAlignment = '';
 
     static getType() {
         return 'callout';
@@ -57,19 +62,26 @@ export class CalloutNode extends ElementNode {
         return self.__id;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('p');
         element.classList.add('callout', this.__category || '');
-        if (this.__id) {
-            element.setAttribute('id', this.__id);
-        }
+        updateElementWithCommonBlockProps(element, this);
         return element;
     }
 
-    updateDOM(prevNode: unknown, dom: HTMLElement) {
-        // Returning false tells Lexical that this node does not need its
-        // DOM element replacing with a new copy from createDOM.
-        return false;
+    updateDOM(prevNode: CalloutNode): boolean {
+        return prevNode.__category !== this.__category ||
+            commonPropertiesDifferent(prevNode, this);
     }
 
     insertNewAfter(selection: RangeSelection, restoreSelection?: boolean): CalloutNode|ParagraphNode {
@@ -106,9 +118,7 @@ export class CalloutNode extends ElementNode {
                             }
 
                             const node = new CalloutNode(category);
-                            if (element.id) {
-                                node.setId(element.id);
-                            }
+                            setCommonBlockPropsFromElement(element, node);
 
                             return {
                                 node,
@@ -129,12 +139,14 @@ export class CalloutNode extends ElementNode {
             version: 1,
             category: this.__category,
             id: this.__id,
+            alignment: this.__alignment,
         };
     }
 
     static importJSON(serializedNode: SerializedCalloutNode): CalloutNode {
         const node = $createCalloutNode(serializedNode.category);
         node.setId(serializedNode.id);
+        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/custom-heading.ts b/resources/js/wysiwyg/nodes/custom-heading.ts
index f069ff16048..885622ad338 100644
--- a/resources/js/wysiwyg/nodes/custom-heading.ts
+++ b/resources/js/wysiwyg/nodes/custom-heading.ts
@@ -1,19 +1,24 @@
 import {
     DOMConversionMap,
-    DOMConversionOutput, ElementFormatType,
+    DOMConversionOutput,
     LexicalNode,
     Spread
 } from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {HeadingNode, HeadingTagType, SerializedHeadingNode} from "@lexical/rich-text";
+import {
+    CommonBlockAlignment, commonPropertiesDifferent,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
 
 
-export type SerializedCustomHeadingNode = Spread<{
-    id: string;
-}, SerializedHeadingNode>
+export type SerializedCustomHeadingNode = Spread<SerializedCommonBlockNode, SerializedHeadingNode>
 
 export class CustomHeadingNode extends HeadingNode {
     __id: string = '';
+    __alignment: CommonBlockAlignment = '';
 
     static getType() {
         return 'custom-heading';
@@ -29,31 +34,47 @@ export class CustomHeadingNode extends HeadingNode {
         return self.__id;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     static clone(node: CustomHeadingNode) {
-        return new CustomHeadingNode(node.__tag, node.__key);
+        const newNode = new CustomHeadingNode(node.__tag, node.__key);
+        newNode.__alignment = node.__alignment;
+        return newNode;
     }
 
     createDOM(config: EditorConfig): HTMLElement {
         const dom = super.createDOM(config);
-        if (this.__id) {
-            dom.setAttribute('id', this.__id);
-        }
-
+        updateElementWithCommonBlockProps(dom, this);
         return dom;
     }
 
+    updateDOM(prevNode: CustomHeadingNode, dom: HTMLElement): boolean {
+        return super.updateDOM(prevNode, dom)
+            || commonPropertiesDifferent(prevNode, this);
+    }
+
     exportJSON(): SerializedCustomHeadingNode {
         return {
             ...super.exportJSON(),
             type: 'custom-heading',
             version: 1,
             id: this.__id,
+            alignment: this.__alignment,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomHeadingNode): CustomHeadingNode {
         const node = $createCustomHeadingNode(serializedNode.tag);
         node.setId(serializedNode.id);
+        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
@@ -99,12 +120,7 @@ function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
         nodeName === 'h6'
     ) {
         node = $createCustomHeadingNode(nodeName);
-        if (element.style !== null) {
-            node.setFormat(element.style.textAlign as ElementFormatType);
-        }
-        if (element.id) {
-            node.setId(element.id);
-        }
+        setCommonBlockPropsFromElement(element, node);
     }
     return {node};
 }
diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
index cb936a5599b..663f32dfc68 100644
--- a/resources/js/wysiwyg/nodes/custom-paragraph.ts
+++ b/resources/js/wysiwyg/nodes/custom-paragraph.ts
@@ -1,21 +1,23 @@
 import {
     DOMConversion,
     DOMConversionMap,
-    DOMConversionOutput, ElementFormatType,
+    DOMConversionOutput,
     LexicalNode,
-    ParagraphNode,
-    SerializedParagraphNode,
-    Spread
+    ParagraphNode, SerializedParagraphNode, Spread,
 } from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
+import {
+    CommonBlockAlignment, commonPropertiesDifferent,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
 
-
-export type SerializedCustomParagraphNode = Spread<{
-    id: string;
-}, SerializedParagraphNode>
+export type SerializedCustomParagraphNode = Spread<SerializedCommonBlockNode, SerializedParagraphNode>
 
 export class CustomParagraphNode extends ParagraphNode {
     __id: string = '';
+    __alignment: CommonBlockAlignment = '';
 
     static getType() {
         return 'custom-paragraph';
@@ -31,33 +33,48 @@ export class CustomParagraphNode extends ParagraphNode {
         return self.__id;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     static clone(node: CustomParagraphNode): CustomParagraphNode {
         const newNode = new CustomParagraphNode(node.__key);
         newNode.__id = node.__id;
+        newNode.__alignment = node.__alignment;
         return newNode;
     }
 
     createDOM(config: EditorConfig): HTMLElement {
         const dom = super.createDOM(config);
-        if (this.__id) {
-            dom.setAttribute('id', this.__id);
-        }
-
+        updateElementWithCommonBlockProps(dom, this);
         return dom;
     }
 
+    updateDOM(prevNode: CustomParagraphNode, dom: HTMLElement, config: EditorConfig): boolean {
+        return super.updateDOM(prevNode, dom, config)
+            || commonPropertiesDifferent(prevNode, this);
+    }
+
     exportJSON(): SerializedCustomParagraphNode {
         return {
             ...super.exportJSON(),
             type: 'custom-paragraph',
             version: 1,
             id: this.__id,
+            alignment: this.__alignment,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomParagraphNode): CustomParagraphNode {
         const node = $createCustomParagraphNode();
         node.setId(serializedNode.id);
+        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
@@ -67,17 +84,14 @@ export class CustomParagraphNode extends ParagraphNode {
                 return {
                     conversion: (element: HTMLElement): DOMConversionOutput|null => {
                         const node = $createCustomParagraphNode();
-                        if (element.style) {
-                            node.setFormat(element.style.textAlign as ElementFormatType);
+                        if (element.style.textIndent) {
                             const indent = parseInt(element.style.textIndent, 10) / 20;
                             if (indent > 0) {
                                 node.setIndent(indent);
                             }
                         }
 
-                        if (element.id) {
-                            node.setId(element.id);
-                        }
+                        setCommonBlockPropsFromElement(element, node);
 
                         return {node};
                     },
diff --git a/resources/js/wysiwyg/nodes/custom-quote.ts b/resources/js/wysiwyg/nodes/custom-quote.ts
index 58c62f76919..cee289dbe72 100644
--- a/resources/js/wysiwyg/nodes/custom-quote.ts
+++ b/resources/js/wysiwyg/nodes/custom-quote.ts
@@ -1,19 +1,24 @@
 import {
     DOMConversionMap,
-    DOMConversionOutput, ElementFormatType,
+    DOMConversionOutput,
     LexicalNode,
     Spread
 } from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {QuoteNode, SerializedQuoteNode} from "@lexical/rich-text";
+import {
+    CommonBlockAlignment, commonPropertiesDifferent,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
 
 
-export type SerializedCustomQuoteNode = Spread<{
-    id: string;
-}, SerializedQuoteNode>
+export type SerializedCustomQuoteNode = Spread<SerializedCommonBlockNode, SerializedQuoteNode>
 
 export class CustomQuoteNode extends QuoteNode {
     __id: string = '';
+    __alignment: CommonBlockAlignment = '';
 
     static getType() {
         return 'custom-quote';
@@ -29,33 +34,47 @@ export class CustomQuoteNode extends QuoteNode {
         return self.__id;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     static clone(node: CustomQuoteNode) {
         const newNode = new CustomQuoteNode(node.__key);
         newNode.__id = node.__id;
+        newNode.__alignment = node.__alignment;
         return newNode;
     }
 
     createDOM(config: EditorConfig): HTMLElement {
         const dom = super.createDOM(config);
-        if (this.__id) {
-            dom.setAttribute('id', this.__id);
-        }
-
+        updateElementWithCommonBlockProps(dom, this);
         return dom;
     }
 
+    updateDOM(prevNode: CustomQuoteNode): boolean {
+        return commonPropertiesDifferent(prevNode, this);
+    }
+
     exportJSON(): SerializedCustomQuoteNode {
         return {
             ...super.exportJSON(),
             type: 'custom-quote',
             version: 1,
             id: this.__id,
+            alignment: this.__alignment,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomQuoteNode): CustomQuoteNode {
         const node = $createCustomQuoteNode();
         node.setId(serializedNode.id);
+        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
@@ -71,12 +90,7 @@ export class CustomQuoteNode extends QuoteNode {
 
 function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
     const node = $createCustomQuoteNode();
-    if (element.style !== null) {
-        node.setFormat(element.style.textAlign as ElementFormatType);
-    }
-    if (element.id) {
-        node.setId(element.id);
-    }
+    setCommonBlockPropsFromElement(element, node);
     return {node};
 }
 
diff --git a/resources/js/wysiwyg/nodes/custom-table-cell.ts b/resources/js/wysiwyg/nodes/custom-table-cell.ts
index c8fe58c772d..15c305dcb0f 100644
--- a/resources/js/wysiwyg/nodes/custom-table-cell.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-cell.ts
@@ -21,13 +21,16 @@ import {
 } from "@lexical/table";
 import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
 import {extractStyleMapFromElement, StyleMap} from "../utils/dom";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
 
 export type SerializedCustomTableCellNode = Spread<{
-    styles: Record<string, string>,
+    styles: Record<string, string>;
+    alignment: CommonBlockAlignment;
 }, SerializedTableCellNode>
 
 export class CustomTableCellNode extends TableCellNode {
     __styles: StyleMap = new Map;
+    __alignment: CommonBlockAlignment = '';
 
     static getType(): string {
         return 'custom-table-cell';
@@ -42,6 +45,7 @@ export class CustomTableCellNode extends TableCellNode {
         );
         cellNode.__rowSpan = node.__rowSpan;
         cellNode.__styles = new Map(node.__styles);
+        cellNode.__alignment = node.__alignment;
         return cellNode;
     }
 
@@ -60,6 +64,16 @@ export class CustomTableCellNode extends TableCellNode {
         self.__styles = new Map(styles);
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     updateTag(tag: string): void {
         const isHeader = tag.toLowerCase() === 'th';
         const state = isHeader ? TableCellHeaderStates.ROW : TableCellHeaderStates.NO_STATUS;
@@ -74,12 +88,17 @@ export class CustomTableCellNode extends TableCellNode {
             element.style.setProperty(name, value);
         }
 
+        if (this.__alignment) {
+            element.classList.add('align-' + this.__alignment);
+        }
+
         return element;
     }
 
     updateDOM(prevNode: CustomTableCellNode): boolean {
         return super.updateDOM(prevNode)
-            || this.__styles !== prevNode.__styles;
+            || this.__styles !== prevNode.__styles
+            || this.__alignment !== prevNode.__alignment;
     }
 
     static importDOM(): DOMConversionMap | null {
@@ -110,6 +129,7 @@ export class CustomTableCellNode extends TableCellNode {
         );
 
         node.setStyles(new Map(Object.entries(serializedNode.styles)));
+        node.setAlignment(serializedNode.alignment);
 
         return node;
     }
@@ -119,6 +139,7 @@ export class CustomTableCellNode extends TableCellNode {
             ...super.exportJSON(),
             type: 'custom-table-cell',
             styles: Object.fromEntries(this.__styles),
+            alignment: this.__alignment,
         };
     }
 }
@@ -128,6 +149,7 @@ function $convertCustomTableCellNodeElement(domNode: Node): DOMConversionOutput
 
     if (domNode instanceof HTMLElement && output.node instanceof CustomTableCellNode) {
         output.node.setStyles(extractStyleMapFromElement(domNode));
+        output.node.setAlignment(extractAlignmentFromElement(domNode));
     }
 
     return output;
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index 1d95b789625..b699763d976 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -4,17 +4,23 @@ import {EditorConfig} from "lexical/LexicalEditor";
 
 import {el, extractStyleMapFromElement, StyleMap} from "../utils/dom";
 import {getTableColumnWidths} from "../utils/tables";
-
-export type SerializedCustomTableNode = Spread<{
-    id: string;
+import {
+    CommonBlockAlignment,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
+
+export type SerializedCustomTableNode = Spread<Spread<{
     colWidths: string[];
     styles: Record<string, string>,
-}, SerializedTableNode>
+}, SerializedTableNode>, SerializedCommonBlockNode>
 
 export class CustomTableNode extends TableNode {
     __id: string = '';
     __colWidths: string[] = [];
     __styles: StyleMap = new Map;
+    __alignment: CommonBlockAlignment = '';
 
     static getType() {
         return 'custom-table';
@@ -30,6 +36,16 @@ export class CustomTableNode extends TableNode {
         return self.__id;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     setColWidths(widths: string[]) {
         const self = this.getWritable();
         self.__colWidths = widths;
@@ -55,15 +71,13 @@ export class CustomTableNode extends TableNode {
         newNode.__id = node.__id;
         newNode.__colWidths = node.__colWidths;
         newNode.__styles = new Map(node.__styles);
+        newNode.__alignment = node.__alignment;
         return newNode;
     }
 
     createDOM(config: EditorConfig): HTMLElement {
         const dom = super.createDOM(config);
-        const id = this.getId();
-        if (id) {
-            dom.setAttribute('id', id);
-        }
+        updateElementWithCommonBlockProps(dom, this);
 
         const colWidths = this.getColWidths();
         if (colWidths.length > 0) {
@@ -97,6 +111,7 @@ export class CustomTableNode extends TableNode {
             id: this.__id,
             colWidths: this.__colWidths,
             styles: Object.fromEntries(this.__styles),
+            alignment: this.__alignment,
         };
     }
 
@@ -105,6 +120,7 @@ export class CustomTableNode extends TableNode {
         node.setId(serializedNode.id);
         node.setColWidths(serializedNode.colWidths);
         node.setStyles(new Map(Object.entries(serializedNode.styles)));
+        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
@@ -114,10 +130,7 @@ export class CustomTableNode extends TableNode {
                 return {
                     conversion: (element: HTMLElement): DOMConversionOutput|null => {
                         const node = $createCustomTableNode();
-
-                        if (element.id) {
-                            node.setId(element.id);
-                        }
+                        setCommonBlockPropsFromElement(element, node);
 
                         const colWidths = getTableColumnWidths(element as HTMLTableElement);
                         node.setColWidths(colWidths);
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 8cbec20dad2..b5483c5009c 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -35,17 +35,17 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CustomHeadingNode,
         CustomQuoteNode,
         CustomListNode,
-        CustomListItemNode,
+        CustomListItemNode, // TODO - Alignment?
         CustomTableNode,
         CustomTableRowNode,
         CustomTableCellNode,
-        ImageNode,
+        ImageNode, // TODO - Alignment
         HorizontalRuleNode,
         DetailsNode, SummaryNode,
         CodeBlockNode,
         DiagramNode,
-        MediaNode,
-        CustomParagraphNode, // TODO - ID
+        MediaNode, // TODO - Alignment
+        CustomParagraphNode,
         LinkNode,
         {
             replace: ParagraphNode,
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index f3a8da404e6..fec38271a06 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,7 +6,7 @@
 
 ## Main Todo
 
-- Alignments: Use existing classes for blocks (including table cells)
+
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
 - Keyboard shortcuts support
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 40d9c89dce8..78de3c9a243 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -1,4 +1,4 @@
-import {$getSelection, BaseSelection, ElementFormatType} from "lexical";
+import {$getSelection, BaseSelection} from "lexical";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import alignLeftIcon from "@icons/editor/align-left.svg";
 import {EditorUiContext} from "../../framework/core";
@@ -6,13 +6,17 @@ import alignCenterIcon from "@icons/editor/align-center.svg";
 import alignRightIcon from "@icons/editor/align-right.svg";
 import alignJustifyIcon from "@icons/editor/align-justify.svg";
 import {$getBlockElementNodesInSelection, $selectionContainsElementFormat} from "../../../utils/selection";
+import {CommonBlockAlignment} from "../../../nodes/_common";
+import {nodeHasAlignment} from "../../../utils/nodes";
 
 
-function setAlignmentForSection(alignment: ElementFormatType): void {
+function setAlignmentForSection(alignment: CommonBlockAlignment): void {
     const selection = $getSelection();
     const elements = $getBlockElementNodesInSelection(selection);
     for (const node of elements) {
-        node.setFormat(alignment);
+        if (nodeHasAlignment(node)) {
+            node.setAlignment(alignment)
+        }
     }
 }
 
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 6278186ca12..e33cfda7ce6 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -3,6 +3,7 @@ import {LexicalNodeMatcher} from "../nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
+import {NodeHasAlignment} from "../nodes/_common";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -70,4 +71,8 @@ export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number,
     }
 
     return null;
+}
+
+export function nodeHasAlignment(node: object): node is NodeHasAlignment {
+    return '__alignment' in node;
 }
\ No newline at end of file
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index 3aa4ac653d9..b187d6408cc 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -32,6 +32,9 @@
     margin-left: auto;
     margin-right: auto;
   }
+  .align-justify {
+    text-align: justify;
+  }
   h1, h2, h3, h4, h5, h6, pre {
     clear: left;
   }

From aa1fac62d56a25044698afcdd48298bb74299d16 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Aug 2024 13:07:33 +0100
Subject: [PATCH 244/666] Lexical: Started adding editor shortcuts

---
 resources/js/services/events.ts               |  2 +-
 resources/js/wysiwyg/index.ts                 |  2 +
 resources/js/wysiwyg/services/shortcuts.ts    | 91 +++++++++++++++++++
 resources/js/wysiwyg/todo.md                  |  3 +-
 .../ui/defaults/buttons/block-formats.ts      | 24 ++---
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 28 ++----
 .../js/wysiwyg/ui/defaults/forms/objects.ts   |  5 +-
 resources/js/wysiwyg/ui/framework/core.ts     |  1 -
 resources/js/wysiwyg/ui/framework/manager.ts  |  9 +-
 resources/js/wysiwyg/ui/index.ts              |  1 -
 resources/js/wysiwyg/utils/diagrams.ts        |  4 +-
 resources/js/wysiwyg/utils/formats.ts         | 88 ++++++++++++++++++
 resources/js/wysiwyg/utils/selection.ts       | 15 ++-
 13 files changed, 223 insertions(+), 50 deletions(-)
 create mode 100644 resources/js/wysiwyg/services/shortcuts.ts
 create mode 100644 resources/js/wysiwyg/utils/formats.ts

diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index 32c70f5a84b..be9fba7eca5 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -7,7 +7,7 @@ export class EventManager {
     /**
      * Emit a custom event for any handlers to pick-up.
      */
-    emit(eventName: string, eventData: {}): void {
+    emit(eventName: string, eventData: {} = {}): void {
         this.stack.push({name: eventName, data: eventData});
 
         const listenersToRun = this.listeners[eventName] || [];
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index a07fbd78980..0a939baf4d0 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -12,6 +12,7 @@ import {handleDropEvents} from "./services/drop-handling";
 import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 import {el} from "./utils/dom";
+import {registerShortcuts} from "./services/shortcuts";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -48,6 +49,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
+        registerShortcuts(editor),
         registerTableResizer(editor, editWrap),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
new file mode 100644
index 00000000000..235c2788ab1
--- /dev/null
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -0,0 +1,91 @@
+import {COMMAND_PRIORITY_HIGH, FORMAT_TEXT_COMMAND, KEY_ENTER_COMMAND, LexicalEditor} from "lexical";
+import {
+    cycleSelectionCalloutFormats,
+    formatCodeBlock,
+    toggleSelectionAsBlockquote,
+    toggleSelectionAsHeading,
+    toggleSelectionAsParagraph
+} from "../utils/formats";
+import {HeadingTagType} from "@lexical/rich-text";
+
+function headerHandler(editor: LexicalEditor, tag: HeadingTagType): boolean {
+    toggleSelectionAsHeading(editor, tag);
+    return true;
+}
+
+function wrapFormatAction(formatAction: (editor: LexicalEditor) => any): ShortcutAction {
+    return (editor: LexicalEditor) => {
+        formatAction(editor);
+        return true;
+    };
+}
+
+function toggleInlineCode(editor: LexicalEditor): boolean {
+    editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'code');
+    return true;
+}
+
+type ShortcutAction = (editor: LexicalEditor) => boolean;
+
+const actionsByKeys: Record<string, ShortcutAction> = {
+    // Save draft
+    'ctrl+s': () => {
+        window.$events.emit('editor-save-draft');
+        return true;
+    },
+    'ctrl+enter': () => {
+        window.$events.emit('editor-save-page');
+        return true;
+    },
+    'ctrl+1': (editor) => headerHandler(editor, 'h1'),
+    'ctrl+2': (editor) => headerHandler(editor, 'h2'),
+    'ctrl+3': (editor) => headerHandler(editor, 'h3'),
+    'ctrl+4': (editor) => headerHandler(editor, 'h4'),
+    'ctrl+5': wrapFormatAction(toggleSelectionAsParagraph),
+    'ctrl+d': wrapFormatAction(toggleSelectionAsParagraph),
+    'ctrl+6': wrapFormatAction(toggleSelectionAsBlockquote),
+    'ctrl+q': wrapFormatAction(toggleSelectionAsBlockquote),
+    'ctrl+7': wrapFormatAction(formatCodeBlock),
+    'ctrl+e': wrapFormatAction(formatCodeBlock),
+    'ctrl+8': toggleInlineCode,
+    'ctrl+shift+e': toggleInlineCode,
+    'ctrl+9': wrapFormatAction(cycleSelectionCalloutFormats),
+
+    // TODO Lists
+    // TODO Links
+    // TODO Link selector
+};
+
+function createKeyDownListener(editor: LexicalEditor): (e: KeyboardEvent) => void {
+    return (event: KeyboardEvent) => {
+        // TODO - Mac Cmd support
+        const combo = `${event.ctrlKey ? 'ctrl+' : ''}${event.shiftKey ? 'shift+' : ''}${event.key}`.toLowerCase();
+        console.log(`pressed: ${combo}`);
+        if (actionsByKeys[combo]) {
+            const handled = actionsByKeys[combo](editor);
+            if (handled) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
+        }
+    };
+}
+
+function overrideDefaultCommands(editor: LexicalEditor) {
+    // Prevent default ctrl+enter command
+    editor.registerCommand(KEY_ENTER_COMMAND, (event) => {
+        return event?.ctrlKey ? true : false
+    }, COMMAND_PRIORITY_HIGH);
+}
+
+export function registerShortcuts(editor: LexicalEditor) {
+    const listener = createKeyDownListener(editor);
+    overrideDefaultCommands(editor);
+
+    return editor.registerRootListener((rootElement: null | HTMLElement, prevRootElement: null | HTMLElement) => {
+        // add the listener to the current root element
+        rootElement?.addEventListener('keydown', listener);
+        // remove the listener from the old root element
+        prevRootElement?.removeEventListener('keydown', listener);
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index fec38271a06..75263c927dc 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,14 +2,13 @@
 
 ## In progress
 
-//
+- Keyboard shortcuts support
 
 ## Main Todo
 
 
 - Alignments: Handle inline block content (image, video)
 - Image paste upload
-- Keyboard shortcuts support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 - Table caption text support
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index eba903263b3..80e49348616 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -1,16 +1,19 @@
 import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../../nodes/callout";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
-import {$createParagraphNode, $isParagraphNode, BaseSelection, LexicalNode} from "lexical";
+import {$isParagraphNode, BaseSelection, LexicalNode} from "lexical";
 import {
-    $createHeadingNode,
-    $createQuoteNode,
     $isHeadingNode,
     $isQuoteNode,
     HeadingNode,
     HeadingTagType
 } from "@lexical/rich-text";
 import {$selectionContainsNodeType, $toggleSelectionBlockNodeType} from "../../../utils/selection";
+import {
+    toggleSelectionAsBlockquote,
+    toggleSelectionAsHeading,
+    toggleSelectionAsParagraph
+} from "../../../utils/formats";
 
 function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
     return {
@@ -42,12 +45,7 @@ function buildHeaderButton(tag: HeadingTagType, name: string): EditorButtonDefin
     return {
         label: name,
         action(context: EditorUiContext) {
-            context.editor.update(() => {
-                $toggleSelectionBlockNodeType(
-                    (node) => isHeaderNodeOfTag(node, tag),
-                    () => $createHeadingNode(tag),
-                )
-            });
+            toggleSelectionAsHeading(context.editor, tag);
         },
         isActive(selection: BaseSelection|null): boolean {
             return $selectionContainsNodeType(selection, (node) => isHeaderNodeOfTag(node, tag));
@@ -63,9 +61,7 @@ export const h5: EditorButtonDefinition = buildHeaderButton('h5', 'Tiny Header')
 export const blockquote: EditorButtonDefinition = {
     label: 'Blockquote',
     action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $toggleSelectionBlockNodeType($isQuoteNode, $createQuoteNode);
-        });
+        toggleSelectionAsBlockquote(context.editor);
     },
     isActive(selection: BaseSelection|null): boolean {
         return $selectionContainsNodeType(selection, $isQuoteNode);
@@ -75,9 +71,7 @@ export const blockquote: EditorButtonDefinition = {
 export const paragraph: EditorButtonDefinition = {
     label: 'Paragraph',
     action(context: EditorUiContext) {
-        context.editor.update(() => {
-            $toggleSelectionBlockNodeType($isParagraphNode, $createParagraphNode);
-        });
+        toggleSelectionAsParagraph(context.editor);
     },
     isActive(selection: BaseSelection|null): boolean {
         return $selectionContainsNodeType(selection, $isParagraphNode);
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 96a92ff2285..3494096a2c2 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -28,11 +28,12 @@ import {$isMediaNode, MediaNode} from "../../../nodes/media";
 import {
     $getNodeFromSelection,
     $insertNewBlockNodeAtSelection,
-    $selectionContainsNodeType
+    $selectionContainsNodeType, getLastSelection
 } from "../../../utils/selection";
 import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert} from "../../../utils/diagrams";
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
 import {$showImageForm} from "../forms/objects";
+import {formatCodeBlock} from "../../../utils/formats";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
@@ -72,7 +73,7 @@ export const unlink: EditorButtonDefinition = {
     icon: unlinkIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const selection = context.lastSelection;
+            const selection = getLastSelection(context.editor);
             const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode | null;
             const selectionPoints = selection?.getStartEndPoints();
 
@@ -98,7 +99,8 @@ export const image: EditorButtonDefinition = {
     icon: imageIcon,
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const selectedImage = $getNodeFromSelection(context.lastSelection, $isImageNode) as ImageNode | null;
+            const selection = getLastSelection(context.editor);
+            const selectedImage = $getNodeFromSelection(selection, $isImageNode) as ImageNode | null;
             if (selectedImage) {
                 $showImageForm(selectedImage, context);
                 return;
@@ -134,21 +136,7 @@ export const codeBlock: EditorButtonDefinition = {
     label: 'Insert code block',
     icon: codeBlockIcon,
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const codeBlock = $getNodeFromSelection(context.lastSelection, $isCodeBlockNode) as (CodeBlockNode | null);
-            if (codeBlock === null) {
-                context.editor.update(() => {
-                    const codeBlock = $createCodeBlockNode();
-                    codeBlock.setCode(selection?.getTextContent() || '');
-                    $insertNewBlockNodeAtSelection(codeBlock, true);
-                    $openCodeEditorForNode(context.editor, codeBlock);
-                    codeBlock.selectStart();
-                });
-            } else {
-                $openCodeEditorForNode(context.editor, codeBlock);
-            }
-        });
+        formatCodeBlock(context.editor);
     },
     isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isCodeBlockNode);
@@ -165,8 +153,8 @@ export const diagram: EditorButtonDefinition = {
     icon: diagramIcon,
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const diagramNode = $getNodeFromSelection(context.lastSelection, $isDiagramNode) as (DiagramNode | null);
+            const selection = getLastSelection(context.editor);
+            const diagramNode = $getNodeFromSelection(selection, $isDiagramNode) as (DiagramNode | null);
             if (diagramNode === null) {
                 context.editor.update(() => {
                     const diagram = $createDiagramNode();
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 2ad27f749c1..2aefe541450 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -10,7 +10,7 @@ import {$isImageNode, ImageNode} from "../../../nodes/image";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
-import {$getNodeFromSelection} from "../../../utils/selection";
+import {$getNodeFromSelection, getLastSelection} from "../../../utils/selection";
 import {EditorFormModal} from "../../framework/modals";
 import {EditorActionField} from "../../framework/blocks/action-field";
 import {EditorButton} from "../../framework/buttons";
@@ -39,7 +39,8 @@ export const image: EditorFormDefinition = {
     submitText: 'Apply',
     async action(formData, context: EditorUiContext) {
         context.editor.update(() => {
-            const selectedImage = $getNodeFromSelection(context.lastSelection, $isImageNode);
+            const selection = getLastSelection(context.editor);
+            const selectedImage = $getNodeFromSelection(selection, $isImageNode);
             if ($isImageNode(selectedImage)) {
                 selectedImage.setSrc(formData.get('src')?.toString() || '');
                 selectedImage.setAltText(formData.get('alt')?.toString() || '');
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 3e9f1e3d935..b6fe52dcdff 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -15,7 +15,6 @@ export type EditorUiContext = {
     scrollDOM: HTMLElement; // DOM element which is the main content scroll container
     translate: (text: string) => string; // Translate function
     manager: EditorUIManager; // UI Manager instance for this editor
-    lastSelection: BaseSelection|null; // The last tracked selection made by the user
     options: Record<string, any>; // General user options which may be used by sub elements
 };
 
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 92891b54084..f10e85b470a 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -5,6 +5,7 @@ import {$getSelection, BaseSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELEC
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
+import {getLastSelection, setLastSelection} from "../../utils/selection";
 
 export type SelectionChangeHandler = (selection: BaseSelection|null) => void;
 
@@ -108,8 +109,7 @@ export class EditorUIManager {
     }
 
     protected triggerStateUpdate(update: EditorUiStateUpdate): void {
-        const context = this.getContext();
-        context.lastSelection = update.selection;
+        setLastSelection(update.editor, update.selection);
         this.toolbar?.updateState(update);
         this.updateContextToolbars(update);
         for (const toolbar of this.activeContextToolbars) {
@@ -119,9 +119,10 @@ export class EditorUIManager {
     }
 
     triggerStateRefresh(): void {
+        const editor = this.getContext().editor;
         this.triggerStateUpdate({
-            editor: this.getContext().editor,
-            selection: this.getContext().lastSelection,
+            editor,
+            selection: getLastSelection(editor),
         });
     }
 
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 5fbaec91b55..116d6e1fc82 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -21,7 +21,6 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         scrollDOM: scrollContainer,
         manager,
         translate: (text: string): string => text,
-        lastSelection: null,
         options,
     };
     manager.setContext(context);
diff --git a/resources/js/wysiwyg/utils/diagrams.ts b/resources/js/wysiwyg/utils/diagrams.ts
index 2dee3ab6b0d..fb5543005c2 100644
--- a/resources/js/wysiwyg/utils/diagrams.ts
+++ b/resources/js/wysiwyg/utils/diagrams.ts
@@ -5,7 +5,7 @@ import * as DrawIO from "../../services/drawio";
 import {$createDiagramNode, DiagramNode} from "../nodes/diagram";
 import {ImageManager} from "../../components";
 import {EditorImageData} from "./images";
-import {$getNodeFromSelection} from "./selection";
+import {$getNodeFromSelection, getLastSelection} from "./selection";
 
 export function $isDiagramNode(node: LexicalNode | null | undefined): node is DiagramNode {
     return node instanceof DiagramNode;
@@ -80,7 +80,7 @@ export function showDiagramManager(callback: (image: EditorImageData) => any) {
 }
 
 export function showDiagramManagerForInsert(context: EditorUiContext) {
-    const selection = context.lastSelection;
+    const selection = getLastSelection(context.editor);
     showDiagramManager((image: EditorImageData) => {
         context.editor.update(() => {
             const diagramNode = $createDiagramNode(image.id, image.url);
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
new file mode 100644
index 00000000000..340be393da0
--- /dev/null
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -0,0 +1,88 @@
+import {$isQuoteNode, HeadingNode, HeadingTagType} from "@lexical/rich-text";
+import {$getSelection, LexicalEditor, LexicalNode} from "lexical";
+import {
+    $getBlockElementNodesInSelection,
+    $getNodeFromSelection,
+    $insertNewBlockNodeAtSelection,
+    $toggleSelectionBlockNodeType,
+    getLastSelection
+} from "./selection";
+import {$createCustomHeadingNode, $isCustomHeadingNode} from "../nodes/custom-heading";
+import {$createCustomParagraphNode, $isCustomParagraphNode} from "../nodes/custom-paragraph";
+import {$createCustomQuoteNode} from "../nodes/custom-quote";
+import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
+import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
+
+const $isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
+    return $isCustomHeadingNode(node) && (node as HeadingNode).getTag() === tag;
+};
+
+export function toggleSelectionAsHeading(editor: LexicalEditor, tag: HeadingTagType) {
+    editor.update(() => {
+        $toggleSelectionBlockNodeType(
+            (node) => $isHeaderNodeOfTag(node, tag),
+            () => $createCustomHeadingNode(tag),
+        )
+    });
+}
+
+export function toggleSelectionAsParagraph(editor: LexicalEditor) {
+    editor.update(() => {
+        $toggleSelectionBlockNodeType($isCustomParagraphNode, $createCustomParagraphNode);
+    });
+}
+
+export function toggleSelectionAsBlockquote(editor: LexicalEditor) {
+    editor.update(() => {
+        $toggleSelectionBlockNodeType($isQuoteNode, $createCustomQuoteNode);
+    });
+}
+
+export function formatCodeBlock(editor: LexicalEditor) {
+    editor.getEditorState().read(() => {
+        const selection = $getSelection();
+        const lastSelection = getLastSelection(editor);
+        const codeBlock = $getNodeFromSelection(lastSelection, $isCodeBlockNode) as (CodeBlockNode | null);
+        if (codeBlock === null) {
+            editor.update(() => {
+                const codeBlock = $createCodeBlockNode();
+                codeBlock.setCode(selection?.getTextContent() || '');
+                $insertNewBlockNodeAtSelection(codeBlock, true);
+                $openCodeEditorForNode(editor, codeBlock);
+                codeBlock.selectStart();
+            });
+        } else {
+            $openCodeEditorForNode(editor, codeBlock);
+        }
+    });
+}
+
+export function cycleSelectionCalloutFormats(editor: LexicalEditor) {
+    editor.update(() => {
+        const selection = $getSelection();
+        const blocks = $getBlockElementNodesInSelection(selection);
+
+        let created = false;
+        for (const block of blocks) {
+            if (!$isCalloutNode(block)) {
+                block.replace($createCalloutNode('info'), true);
+                created = true;
+            }
+        }
+
+        if (created) {
+            return;
+        }
+
+        const types: CalloutCategory[] = ['info', 'warning', 'danger', 'success'];
+        for (const block of blocks) {
+            if ($isCalloutNode(block)) {
+                const type = block.getCategory();
+                const typeIndex = types.indexOf(type);
+                const newIndex = (typeIndex + 1) % types.length;
+                const newType = types[newIndex];
+                block.setCategory(newType);
+            }
+        }
+    });
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index e34afbe36e8..74dd9452743 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -8,7 +8,7 @@ import {
     $setSelection,
     BaseSelection,
     ElementFormatType,
-    ElementNode,
+    ElementNode, LexicalEditor,
     LexicalNode,
     TextFormatType
 } from "lexical";
@@ -17,6 +17,17 @@ import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
 import {$getParentOfType} from "./nodes";
+import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+
+const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
+
+export function getLastSelection(editor: LexicalEditor): BaseSelection|null {
+    return lastSelectionByEditor.get(editor) || null;
+}
+
+export function setLastSelection(editor: LexicalEditor, selection: BaseSelection|null): void {
+    lastSelectionByEditor.set(editor, selection);
+}
 
 export function $selectionContainsNodeType(selection: BaseSelection | null, matcher: LexicalNodeMatcher): boolean {
     return $getNodeFromSelection(selection, matcher) !== null;
@@ -59,7 +70,7 @@ export function $toggleSelectionBlockNodeType(matcher: LexicalNodeMatcher, creat
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
     if (selection && matcher(blockElement)) {
-        $setBlocksType(selection, $createParagraphNode);
+        $setBlocksType(selection, $createCustomParagraphNode);
     } else {
         $setBlocksType(selection, creator);
     }

From dbb2fe3e599e29bc7fdec7230c6388294f4750c8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Aug 2024 14:54:53 +0100
Subject: [PATCH 245/666] Lexical: Finished off baseline shortcut
 implementation

---
 resources/js/wysiwyg/index.ts                 |  4 +-
 resources/js/wysiwyg/services/shortcuts.ts    | 51 +++++++++++-----
 resources/js/wysiwyg/todo.md                  |  3 +-
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   | 14 ++---
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 29 ++--------
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 58 +++++++++----------
 resources/js/wysiwyg/utils/formats.ts         | 48 ++++++++++++++-
 7 files changed, 123 insertions(+), 84 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 0a939baf4d0..d7f873ea5cc 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -45,11 +45,12 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     const editor = createEditor(config);
     editor.setRootElement(editArea);
+    const context: EditorUiContext = buildEditorUI(container, editArea, editWrap, editor, options);
 
     mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
-        registerShortcuts(editor),
+        registerShortcuts(context),
         registerTableResizer(editor, editWrap),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
@@ -89,7 +90,6 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         console.log(editor.getEditorState().toJSON());
     };
 
-    const context: EditorUiContext = buildEditorUI(container, editArea, editWrap, editor, options);
     registerCommonNodeMutationListeners(context);
 
     return new SimpleWysiwygEditorInterface(editor);
diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
index 235c2788ab1..b17ec1bf7a8 100644
--- a/resources/js/wysiwyg/services/shortcuts.ts
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -1,12 +1,17 @@
-import {COMMAND_PRIORITY_HIGH, FORMAT_TEXT_COMMAND, KEY_ENTER_COMMAND, LexicalEditor} from "lexical";
+import {$getSelection, COMMAND_PRIORITY_HIGH, FORMAT_TEXT_COMMAND, KEY_ENTER_COMMAND, LexicalEditor} from "lexical";
 import {
     cycleSelectionCalloutFormats,
-    formatCodeBlock,
+    formatCodeBlock, insertOrUpdateLink,
     toggleSelectionAsBlockquote,
-    toggleSelectionAsHeading,
+    toggleSelectionAsHeading, toggleSelectionAsList,
     toggleSelectionAsParagraph
 } from "../utils/formats";
 import {HeadingTagType} from "@lexical/rich-text";
+import {EditorUiContext} from "../ui/framework/core";
+import {$getNodeFromSelection} from "../utils/selection";
+import {$isLinkNode, LinkNode} from "@lexical/link";
+import {$showLinkForm} from "../ui/defaults/forms/objects";
+import {showLinkSelector} from "../utils/links";
 
 function headerHandler(editor: LexicalEditor, tag: HeadingTagType): boolean {
     toggleSelectionAsHeading(editor, tag);
@@ -25,10 +30,9 @@ function toggleInlineCode(editor: LexicalEditor): boolean {
     return true;
 }
 
-type ShortcutAction = (editor: LexicalEditor) => boolean;
+type ShortcutAction = (editor: LexicalEditor, context: EditorUiContext) => boolean;
 
 const actionsByKeys: Record<string, ShortcutAction> = {
-    // Save draft
     'ctrl+s': () => {
         window.$events.emit('editor-save-draft');
         return true;
@@ -51,18 +55,35 @@ const actionsByKeys: Record<string, ShortcutAction> = {
     'ctrl+shift+e': toggleInlineCode,
     'ctrl+9': wrapFormatAction(cycleSelectionCalloutFormats),
 
-    // TODO Lists
-    // TODO Links
-    // TODO Link selector
+    'ctrl+o': wrapFormatAction((e) => toggleSelectionAsList(e, 'number')),
+    'ctrl+p': wrapFormatAction((e) => toggleSelectionAsList(e, 'bullet')),
+    'ctrl+k': (editor, context) => {
+        editor.getEditorState().read(() => {
+            const selectedLink = $getNodeFromSelection($getSelection(), $isLinkNode) as LinkNode | null;
+            $showLinkForm(selectedLink, context);
+        });
+        return true;
+    },
+    'ctrl+shift+k': (editor, context) => {
+        showLinkSelector(entity => {
+            insertOrUpdateLink(editor, {
+                text: entity.name,
+                title: entity.link,
+                target: '',
+                url: entity.link,
+            });
+        });
+        return true;
+    },
 };
 
-function createKeyDownListener(editor: LexicalEditor): (e: KeyboardEvent) => void {
+function createKeyDownListener(context: EditorUiContext): (e: KeyboardEvent) => void {
     return (event: KeyboardEvent) => {
         // TODO - Mac Cmd support
         const combo = `${event.ctrlKey ? 'ctrl+' : ''}${event.shiftKey ? 'shift+' : ''}${event.key}`.toLowerCase();
-        console.log(`pressed: ${combo}`);
+        // console.log(`pressed: ${combo}`);
         if (actionsByKeys[combo]) {
-            const handled = actionsByKeys[combo](editor);
+            const handled = actionsByKeys[combo](context.editor, context);
             if (handled) {
                 event.stopPropagation();
                 event.preventDefault();
@@ -78,11 +99,11 @@ function overrideDefaultCommands(editor: LexicalEditor) {
     }, COMMAND_PRIORITY_HIGH);
 }
 
-export function registerShortcuts(editor: LexicalEditor) {
-    const listener = createKeyDownListener(editor);
-    overrideDefaultCommands(editor);
+export function registerShortcuts(context: EditorUiContext) {
+    const listener = createKeyDownListener(context);
+    overrideDefaultCommands(context.editor);
 
-    return editor.registerRootListener((rootElement: null | HTMLElement, prevRootElement: null | HTMLElement) => {
+    return context.editor.registerRootListener((rootElement: null | HTMLElement, prevRootElement: null | HTMLElement) => {
         // add the listener to the current root element
         rootElement?.addEventListener('keydown', listener);
         // remove the listener from the old root element
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 75263c927dc..f05e79baa0f 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-- Keyboard shortcuts support
+// 
 
 ## Main Todo
 
@@ -13,6 +13,7 @@
 - Media resize support (like images)
 - Table caption text support
 - Table Cut/Copy/Paste column
+- Mac: Shortcut support via command.
 
 ## Secondary Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
index 10500eb6718..edec3ea0076 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -1,11 +1,12 @@
-import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
+import {$isListNode, ListNode, ListType} from "@lexical/list";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
-import {$getSelection, BaseSelection, LexicalNode} from "lexical";
+import {BaseSelection, LexicalNode} from "lexical";
 import listBulletIcon from "@icons/editor/list-bullet.svg";
 import listNumberedIcon from "@icons/editor/list-numbered.svg";
 import listCheckIcon from "@icons/editor/list-check.svg";
 import {$selectionContainsNodeType} from "../../../utils/selection";
+import {toggleSelectionAsList} from "../../../utils/formats";
 
 
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
@@ -13,14 +14,7 @@ function buildListButton(label: string, type: ListType, icon: string): EditorBut
         label,
         icon,
         action(context: EditorUiContext) {
-            context.editor.getEditorState().read(() => {
-                const selection = $getSelection();
-                if (this.isActive(selection, context)) {
-                    removeList(context.editor);
-                } else {
-                    insertList(context.editor, type);
-                }
-            });
+            toggleSelectionAsList(context.editor, type);
         },
         isActive(selection: BaseSelection|null): boolean {
             return $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 3494096a2c2..46556d3d136 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -2,11 +2,9 @@ import {EditorButtonDefinition} from "../../framework/buttons";
 import linkIcon from "@icons/editor/link.svg";
 import {EditorUiContext} from "../../framework/core";
 import {
-    $createNodeSelection,
     $createTextNode,
     $getRoot,
     $getSelection, $insertNodes,
-    $setSelection,
     BaseSelection,
     ElementNode
 } from "lexical";
@@ -17,7 +15,7 @@ import {$isImageNode, ImageNode} from "../../../nodes/image";
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
 import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../../nodes/horizontal-rule";
 import codeBlockIcon from "@icons/editor/code-block.svg";
-import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../../../nodes/code-block";
+import {$isCodeBlockNode} from "../../../nodes/code-block";
 import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
 import {$createDiagramNode, DiagramNode} from "../../../nodes/diagram";
@@ -32,35 +30,16 @@ import {
 } from "../../../utils/selection";
 import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert} from "../../../utils/diagrams";
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
-import {$showImageForm} from "../forms/objects";
+import {$showImageForm, $showLinkForm} from "../forms/objects";
 import {formatCodeBlock} from "../../../utils/formats";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
     icon: linkIcon,
     action(context: EditorUiContext) {
-        const linkModal = context.manager.createModal('link');
         context.editor.getEditorState().read(() => {
-            const selection = $getSelection();
-            const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode | null;
-
-            let formDefaults = {};
-            if (selectedLink) {
-                formDefaults = {
-                    url: selectedLink.getURL(),
-                    text: selectedLink.getTextContent(),
-                    title: selectedLink.getTitle(),
-                    target: selectedLink.getTarget(),
-                }
-
-                context.editor.update(() => {
-                    const selection = $createNodeSelection();
-                    selection.add(selectedLink.getKey());
-                    $setSelection(selection);
-                });
-            }
-
-            linkModal.show(formDefaults);
+            const selectedLink = $getNodeFromSelection($getSelection(), $isLinkNode) as LinkNode | null;
+            $showLinkForm(selectedLink, context);
         });
     },
     isActive(selection: BaseSelection | null): boolean {
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 2aefe541450..714d5f64b91 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -5,9 +5,9 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {$createTextNode, $getSelection, $insertNodes} from "lexical";
+import {$createNodeSelection, $createTextNode, $getSelection, $insertNodes, $setSelection} from "lexical";
 import {$isImageNode, ImageNode} from "../../../nodes/image";
-import {$createLinkNode, $isLinkNode} from "@lexical/link";
+import {$createLinkNode, $isLinkNode, LinkNode} from "@lexical/link";
 import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
 import {$insertNodeToNearestRoot} from "@lexical/utils";
 import {$getNodeFromSelection, getLastSelection} from "../../../utils/selection";
@@ -19,6 +19,7 @@ import searchImageIcon from "@icons/editor/image-search.svg";
 import searchIcon from "@icons/search.svg";
 import {showLinkSelector} from "../../../utils/links";
 import {LinkField} from "../../framework/blocks/link-field";
+import {insertOrUpdateLink} from "../../../utils/formats";
 
 export function $showImageForm(image: ImageNode, context: EditorUiContext) {
     const imageModal: EditorFormModal = context.manager.createModal('image');
@@ -96,37 +97,36 @@ export const image: EditorFormDefinition = {
     ],
 };
 
-export const link: EditorFormDefinition = {
-    submitText: 'Apply',
-    async action(formData, context: EditorUiContext) {
-        context.editor.update(() => {
+export function $showLinkForm(link: LinkNode|null, context: EditorUiContext) {
+    const linkModal = context.manager.createModal('link');
 
-            const url = formData.get('url')?.toString() || '';
-            const title = formData.get('title')?.toString() || ''
-            const target = formData.get('target')?.toString() || '';
-            const text = formData.get('text')?.toString() || '';
+    let formDefaults = {};
+    if (link) {
+        formDefaults = {
+            url: link.getURL(),
+            text: link.getTextContent(),
+            title: link.getTitle(),
+            target: link.getTarget(),
+        }
 
-            const selection = $getSelection();
-            let link = $getNodeFromSelection(selection, $isLinkNode);
-            if ($isLinkNode(link)) {
-                link.setURL(url);
-                link.setTarget(target);
-                link.setTitle(title);
-            } else {
-                link = $createLinkNode(url, {
-                    title: title,
-                    target: target,
-                });
+        context.editor.update(() => {
+            const selection = $createNodeSelection();
+            selection.add(link.getKey());
+            $setSelection(selection);
+        });
+    }
 
-                $insertNodes([link]);
-            }
+    linkModal.show(formDefaults);
+}
 
-            if ($isLinkNode(link)) {
-                for (const child of link.getChildren()) {
-                    child.remove(true);
-                }
-                link.append($createTextNode(text));
-            }
+export const link: EditorFormDefinition = {
+    submitText: 'Apply',
+    async action(formData, context: EditorUiContext) {
+        insertOrUpdateLink(context.editor, {
+            url: formData.get('url')?.toString() || '',
+            title: formData.get('title')?.toString() || '',
+            target: formData.get('target')?.toString() || '',
+            text: formData.get('text')?.toString() || '',
         });
         return true;
     },
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 340be393da0..97038f07bad 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -1,9 +1,9 @@
 import {$isQuoteNode, HeadingNode, HeadingTagType} from "@lexical/rich-text";
-import {$getSelection, LexicalEditor, LexicalNode} from "lexical";
+import {$createTextNode, $getSelection, $insertNodes, LexicalEditor, LexicalNode} from "lexical";
 import {
     $getBlockElementNodesInSelection,
     $getNodeFromSelection,
-    $insertNewBlockNodeAtSelection,
+    $insertNewBlockNodeAtSelection, $selectionContainsNodeType,
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";
@@ -12,6 +12,9 @@ import {$createCustomParagraphNode, $isCustomParagraphNode} from "../nodes/custo
 import {$createCustomQuoteNode} from "../nodes/custom-quote";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
 import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
+import {insertList, ListNode, ListType, removeList} from "@lexical/list";
+import {$isCustomListNode} from "../nodes/custom-list";
+import {$createLinkNode, $isLinkNode} from "@lexical/link";
 
 const $isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
     return $isCustomHeadingNode(node) && (node as HeadingNode).getTag() === tag;
@@ -38,6 +41,21 @@ export function toggleSelectionAsBlockquote(editor: LexicalEditor) {
     });
 }
 
+export function toggleSelectionAsList(editor: LexicalEditor, type: ListType) {
+    editor.getEditorState().read(() => {
+        const selection = $getSelection();
+        const listSelected = $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
+            return $isCustomListNode(node) && (node as ListNode).getListType() === type;
+        });
+
+        if (listSelected) {
+            removeList(editor);
+        } else {
+            insertList(editor, type);
+        }
+    });
+}
+
 export function formatCodeBlock(editor: LexicalEditor) {
     editor.getEditorState().read(() => {
         const selection = $getSelection();
@@ -85,4 +103,30 @@ export function cycleSelectionCalloutFormats(editor: LexicalEditor) {
             }
         }
     });
+}
+
+export function insertOrUpdateLink(editor: LexicalEditor, linkDetails: {text: string, title: string, target: string, url: string}) {
+    editor.update(() => {
+        const selection = $getSelection();
+        let link = $getNodeFromSelection(selection, $isLinkNode);
+        if ($isLinkNode(link)) {
+            link.setURL(linkDetails.url);
+            link.setTarget(linkDetails.target);
+            link.setTitle(linkDetails.title);
+        } else {
+            link = $createLinkNode(linkDetails.url, {
+                title: linkDetails.title,
+                target: linkDetails.target,
+            });
+
+            $insertNodes([link]);
+        }
+
+        if ($isLinkNode(link)) {
+            for (const child of link.getChildren()) {
+                child.remove(true);
+            }
+            link.append($createTextNode(linkDetails.text));
+        }
+    });
 }
\ No newline at end of file

From ddf5f2543c2347ee27b48c8a2b8db008d4892950 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 21 Aug 2024 12:59:45 +0100
Subject: [PATCH 246/666] Lexical: Added drop/paste image handling

---
 resources/js/wysiwyg/index.ts                 |   4 +-
 .../js/wysiwyg/services/drop-handling.ts      |  75 ---------
 .../wysiwyg/services/drop-paste-handling.ts   | 158 ++++++++++++++++++
 resources/js/wysiwyg/todo.md                  |   2 -
 resources/js/wysiwyg/utils/images.ts          |  17 ++
 5 files changed, 177 insertions(+), 79 deletions(-)
 delete mode 100644 resources/js/wysiwyg/services/drop-handling.ts
 create mode 100644 resources/js/wysiwyg/services/drop-paste-handling.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index d7f873ea5cc..fdcfa5b7ef0 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -8,7 +8,7 @@ import {getEditorContentAsHtml, setEditorContentFromHtml} from "./utils/actions"
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {EditorUiContext} from "./ui/framework/core";
 import {listen as listenToCommonEvents} from "./services/common-events";
-import {handleDropEvents} from "./services/drop-handling";
+import {registerDropPasteHandling} from "./services/drop-paste-handling";
 import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 import {el} from "./utils/dom";
@@ -54,10 +54,10 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerTableResizer(editor, editWrap),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
+        registerDropPasteHandling(context),
     );
 
     listenToCommonEvents(editor);
-    handleDropEvents(editor);
 
     setEditorContentFromHtml(editor, htmlContent);
 
diff --git a/resources/js/wysiwyg/services/drop-handling.ts b/resources/js/wysiwyg/services/drop-handling.ts
deleted file mode 100644
index 7c9bb2713ba..00000000000
--- a/resources/js/wysiwyg/services/drop-handling.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import {
-    $isDecoratorNode,
-    LexicalEditor,
-    LexicalNode
-} from "lexical";
-import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
-import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
-
-function $getNodeFromMouseEvent(event: MouseEvent, editor: LexicalEditor): LexicalNode|null {
-    const x = event.clientX;
-    const y = event.clientY;
-    const dom = document.elementFromPoint(x, y);
-    if (!dom) {
-        return null;
-    }
-
-    return $getNearestBlockNodeForCoords(editor, event.clientX, event.clientY);
-}
-
-function $insertNodesAtEvent(nodes: LexicalNode[], event: DragEvent, editor: LexicalEditor) {
-    const positionNode = $getNodeFromMouseEvent(event, editor);
-
-    if (positionNode) {
-        $selectSingleNode(positionNode);
-    }
-
-    $insertNewBlockNodesAtSelection(nodes, true);
-
-    if (!$isDecoratorNode(positionNode) || !positionNode?.getTextContent()) {
-        positionNode?.remove();
-    }
-}
-
-async function insertTemplateToEditor(editor: LexicalEditor, templateId: string, event: DragEvent) {
-    const resp = await window.$http.get(`/templates/${templateId}`);
-    const data = (resp.data || {html: ''}) as {html: string}
-    const html: string = data.html || '';
-
-    editor.update(() => {
-        const newNodes = $htmlToBlockNodes(editor, html);
-        $insertNodesAtEvent(newNodes, event, editor);
-    });
-}
-
-function createDropListener(editor: LexicalEditor): (event: DragEvent) => void {
-    return (event: DragEvent) => {
-        // Template handling
-        const templateId = event.dataTransfer?.getData('bookstack/template') || '';
-        if (templateId) {
-            insertTemplateToEditor(editor, templateId, event);
-            event.preventDefault();
-            return;
-        }
-
-        // HTML contents drop
-        const html = event.dataTransfer?.getData('text/html') || '';
-        if (html) {
-            editor.update(() => {
-                const newNodes = $htmlToBlockNodes(editor, html);
-                $insertNodesAtEvent(newNodes, event, editor);
-            });
-            event.preventDefault();
-            return;
-        }
-    };
-}
-
-export function handleDropEvents(editor: LexicalEditor) {
-    const dropListener = createDropListener(editor);
-
-    editor.registerRootListener((rootElement, prevRootElement) => {
-        rootElement?.addEventListener('drop', dropListener);
-        prevRootElement?.removeEventListener('drop', dropListener);
-    });
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
new file mode 100644
index 00000000000..85d0235d88b
--- /dev/null
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -0,0 +1,158 @@
+import {
+    $insertNodes,
+    $isDecoratorNode, COMMAND_PRIORITY_HIGH, DROP_COMMAND,
+    LexicalEditor,
+    LexicalNode, PASTE_COMMAND
+} from "lexical";
+import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
+import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
+import {Clipboard} from "../../services/clipboard";
+import {$createImageNode} from "../nodes/image";
+import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+import {$createLinkNode} from "@lexical/link";
+import {EditorImageData, uploadImageFile} from "../utils/images";
+import {EditorUiContext} from "../ui/framework/core";
+
+function $getNodeFromMouseEvent(event: MouseEvent, editor: LexicalEditor): LexicalNode|null {
+    const x = event.clientX;
+    const y = event.clientY;
+    const dom = document.elementFromPoint(x, y);
+    if (!dom) {
+        return null;
+    }
+
+    return $getNearestBlockNodeForCoords(editor, event.clientX, event.clientY);
+}
+
+function $insertNodesAtEvent(nodes: LexicalNode[], event: DragEvent, editor: LexicalEditor) {
+    const positionNode = $getNodeFromMouseEvent(event, editor);
+
+    if (positionNode) {
+        $selectSingleNode(positionNode);
+    }
+
+    $insertNewBlockNodesAtSelection(nodes, true);
+
+    if (!$isDecoratorNode(positionNode) || !positionNode?.getTextContent()) {
+        positionNode?.remove();
+    }
+}
+
+async function insertTemplateToEditor(editor: LexicalEditor, templateId: string, event: DragEvent) {
+    const resp = await window.$http.get(`/templates/${templateId}`);
+    const data = (resp.data || {html: ''}) as {html: string}
+    const html: string = data.html || '';
+
+    editor.update(() => {
+        const newNodes = $htmlToBlockNodes(editor, html);
+        $insertNodesAtEvent(newNodes, event, editor);
+    });
+}
+
+function handleMediaInsert(data: DataTransfer, context: EditorUiContext): boolean {
+    const clipboard = new Clipboard(data);
+    let handled = false;
+
+    // Don't handle the event ourselves if no items exist of contains table-looking data
+    if (!clipboard.hasItems() || clipboard.containsTabularData()) {
+        return handled;
+    }
+
+    const images = clipboard.getImages();
+    if (images.length > 0) {
+        handled = true;
+    }
+
+    context.editor.update(async () => {
+        for (const imageFile of images) {
+            const loadingImage = window.baseUrl('/loading.gif');
+            const loadingNode = $createImageNode(loadingImage);
+            const imageWrap = $createCustomParagraphNode();
+            imageWrap.append(loadingNode);
+            $insertNodes([imageWrap]);
+
+            try {
+                const respData: EditorImageData = await uploadImageFile(imageFile, context.options.pageId);
+                const safeName = respData.name.replace(/"/g, '');
+                context.editor.update(() => {
+                    const finalImage = $createImageNode(respData.thumbs?.display || '', {
+                        alt: safeName,
+                    });
+                    const imageLink = $createLinkNode(respData.url, {target: '_blank'});
+                    imageLink.append(finalImage);
+                    loadingNode.replace(imageLink);
+                });
+            } catch (err: any) {
+                context.editor.update(() => {
+                    loadingNode.remove(false);
+                });
+                window.$events.error(err?.data?.message || context.options.translations.imageUploadErrorText);
+                console.error(err);
+            }
+        }
+    });
+
+    return handled;
+}
+
+function createDropListener(context: EditorUiContext): (event: DragEvent) => boolean {
+    const editor = context.editor;
+    return (event: DragEvent): boolean => {
+        // Template handling
+        const templateId = event.dataTransfer?.getData('bookstack/template') || '';
+        if (templateId) {
+            insertTemplateToEditor(editor, templateId, event);
+            event.preventDefault();
+            return true;
+        }
+
+        // HTML contents drop
+        const html = event.dataTransfer?.getData('text/html') || '';
+        if (html) {
+            editor.update(() => {
+                const newNodes = $htmlToBlockNodes(editor, html);
+                $insertNodesAtEvent(newNodes, event, editor);
+            });
+            event.preventDefault();
+            return true;
+        }
+
+        if (event.dataTransfer) {
+            const handled = handleMediaInsert(event.dataTransfer, context);
+            if (handled) {
+                event.preventDefault();
+                return true;
+            }
+        }
+
+        return false;
+    };
+}
+
+function createPasteListener(context: EditorUiContext): (event: ClipboardEvent) => boolean {
+    return (event: ClipboardEvent) => {
+        if (!event.clipboardData) {
+            return false;
+        }
+
+        const handled = handleMediaInsert(event.clipboardData, context);
+        if (handled) {
+            event.preventDefault();
+        }
+
+        return handled;
+    };
+}
+
+export function registerDropPasteHandling(context: EditorUiContext): () => void {
+    const dropListener = createDropListener(context);
+    const pasteListener = createPasteListener(context);
+
+    const unregisterDrop = context.editor.registerCommand(DROP_COMMAND, dropListener, COMMAND_PRIORITY_HIGH);
+    const unregisterPaste = context.editor.registerCommand(PASTE_COMMAND, pasteListener, COMMAND_PRIORITY_HIGH);
+
+    return () => {
+        unregisterDrop();
+        unregisterPaste();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index f05e79baa0f..f339a6ed470 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,9 +6,7 @@
 
 ## Main Todo
 
-
 - Alignments: Handle inline block content (image, video)
-- Image paste upload
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 - Table caption text support
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index a83d554186e..2c13427d967 100644
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -24,4 +24,21 @@ export function $createLinkedImageNodeFromImageData(image: EditorImageData): Lin
     });
     linkNode.append(imageNode);
     return linkNode;
+}
+
+/**
+ * Upload an image file to the server
+ */
+export async function uploadImageFile(file: File, pageId: string): Promise<EditorImageData> {
+    if (file === null || file.type.indexOf('image') !== 0) {
+        throw new Error('Not an image file');
+    }
+
+    const remoteFilename = file.name || `image-${Date.now()}.png`;
+    const formData = new FormData();
+    formData.append('file', file, remoteFilename);
+    formData.append('uploaded_to', pageId);
+
+    const resp = await window.$http.post('/images/gallery', formData);
+    return resp.data as EditorImageData;
 }
\ No newline at end of file

From 8a13a9df8092d1f7aad84fd960705380c181763e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 22 Aug 2024 10:08:08 +0100
Subject: [PATCH 247/666] Lexical: Improved table row copy/paste

Added safeguarding/matching of source/target sizes to prevent broken
tables.
---
 .../js/wysiwyg/nodes/custom-table-cell.ts     |  2 +-
 resources/js/wysiwyg/todo.md                  |  3 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  | 49 +++++-----
 resources/js/wysiwyg/ui/framework/core.ts     |  1 +
 resources/js/wysiwyg/ui/index.ts              |  5 +-
 .../{services => utils}/node-clipboard.ts     |  4 +-
 .../js/wysiwyg/utils/table-copy-paste.ts      | 97 +++++++++++++++++++
 resources/js/wysiwyg/utils/table-map.ts       |  2 +-
 8 files changed, 132 insertions(+), 31 deletions(-)
 rename resources/js/wysiwyg/{services => utils}/node-clipboard.ts (96%)
 create mode 100644 resources/js/wysiwyg/utils/table-copy-paste.ts

diff --git a/resources/js/wysiwyg/nodes/custom-table-cell.ts b/resources/js/wysiwyg/nodes/custom-table-cell.ts
index 15c305dcb0f..793302cfec4 100644
--- a/resources/js/wysiwyg/nodes/custom-table-cell.ts
+++ b/resources/js/wysiwyg/nodes/custom-table-cell.ts
@@ -235,7 +235,7 @@ export function $convertTableCellNodeElement(
 
 
 export function $createCustomTableCellNode(
-    headerState: TableCellHeaderState,
+    headerState: TableCellHeaderState = TableCellHeaderStates.NO_STATUS,
     colSpan = 1,
     width?: number,
 ): CustomTableCellNode {
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index f339a6ed470..dcc86688893 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-// 
+- Table Cut/Copy/Paste column
 
 ## Main Todo
 
@@ -10,7 +10,6 @@
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 - Table caption text support
-- Table Cut/Copy/Paste column
 - Mac: Shortcut support via command.
 
 ## Secondary Todo
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 6242f0b1dbc..1a9ffb0d33d 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -27,8 +27,12 @@ import {
     $getTableRowsFromSelection,
     $mergeTableCellsInSelection
 } from "../../../utils/tables";
-import {$isCustomTableRowNode, CustomTableRowNode} from "../../../nodes/custom-table-row";
-import {NodeClipboard} from "../../../services/node-clipboard";
+import {$isCustomTableRowNode} from "../../../nodes/custom-table-row";
+import {
+    $copySelectedRowsToClipboard,
+    $cutSelectedRowsToClipboard,
+    $pasteClipboardRowsBefore, $pasteRowsAfter, isRowClipboardEmpty
+} from "../../../utils/table-copy-paste";
 
 const neverActive = (): boolean => false;
 const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
@@ -168,17 +172,15 @@ export const rowProperties: EditorButtonDefinition = {
     isDisabled: cellNotSelected,
 };
 
-const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>(CustomTableRowNode);
-
 export const cutRow: EditorButtonDefinition = {
     label: 'Cut row',
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const rows = $getTableRowsFromSelection($getSelection());
-            rowClipboard.set(...rows);
-            for (const row of rows) {
-                row.remove();
+            try {
+                $cutSelectedRowsToClipboard();
+            } catch (e: any) {
+                context.error(e.toString());
             }
         });
     },
@@ -191,8 +193,11 @@ export const copyRow: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const rows = $getTableRowsFromSelection($getSelection());
-            rowClipboard.set(...rows);
+            try {
+                $copySelectedRowsToClipboard();
+            } catch (e: any) {
+                context.error(e.toString());
+            }
         });
     },
     isActive: neverActive,
@@ -204,17 +209,15 @@ export const pasteRowBefore: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const rows = $getTableRowsFromSelection($getSelection());
-            const lastRow = rows[rows.length - 1];
-            if (lastRow) {
-                for (const row of rowClipboard.get(context.editor)) {
-                    lastRow.insertBefore(row);
-                }
+            try {
+                $pasteClipboardRowsBefore(context.editor);
+            } catch (e: any) {
+                context.error(e.toString());
             }
         });
     },
     isActive: neverActive,
-    isDisabled: (selection) => cellNotSelected(selection) || rowClipboard.size() === 0,
+    isDisabled: (selection) => cellNotSelected(selection) || isRowClipboardEmpty(),
 };
 
 export const pasteRowAfter: EditorButtonDefinition = {
@@ -222,17 +225,15 @@ export const pasteRowAfter: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const rows = $getTableRowsFromSelection($getSelection());
-            const lastRow = rows[rows.length - 1];
-            if (lastRow) {
-                for (const row of rowClipboard.get(context.editor).reverse()) {
-                    lastRow.insertAfter(row);
-                }
+            try {
+                $pasteRowsAfter(context.editor);
+            } catch (e: any) {
+                context.error(e.toString());
             }
         });
     },
     isActive: neverActive,
-    isDisabled: (selection) => cellNotSelected(selection) || rowClipboard.size() === 0,
+    isDisabled: (selection) => cellNotSelected(selection) || isRowClipboardEmpty(),
 };
 
 export const cutColumn: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index b6fe52dcdff..a04f3c74a8e 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -14,6 +14,7 @@ export type EditorUiContext = {
     containerDOM: HTMLElement; // DOM element which contains all editor elements
     scrollDOM: HTMLElement; // DOM element which is the main content scroll container
     translate: (text: string) => string; // Translate function
+    error: (text: string) => void; // Error reporting function
     manager: EditorUIManager; // UI Manager instance for this editor
     options: Record<string, any>; // General user options which may be used by sub elements
 };
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 116d6e1fc82..bfa76bb82a8 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -20,7 +20,10 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         editorDOM: element,
         scrollDOM: scrollContainer,
         manager,
-        translate: (text: string): string => text,
+        translate: (text: string): string => text, // TODO - Implement
+        error(error: string): void {
+            window.$events.error(error); // TODO - Translate
+        },
         options,
     };
     manager.setContext(context);
diff --git a/resources/js/wysiwyg/services/node-clipboard.ts b/resources/js/wysiwyg/utils/node-clipboard.ts
similarity index 96%
rename from resources/js/wysiwyg/services/node-clipboard.ts
rename to resources/js/wysiwyg/utils/node-clipboard.ts
index 7d880db9889..385c4c46c75 100644
--- a/resources/js/wysiwyg/services/node-clipboard.ts
+++ b/resources/js/wysiwyg/utils/node-clipboard.ts
@@ -44,10 +44,10 @@ export class NodeClipboard<T extends LexicalNode> {
         }
     }
 
-    get(editor: LexicalEditor): LexicalNode[] {
+    get(editor: LexicalEditor): T[] {
         return this.store.map(json => unserializeNodeRecursive(editor, json)).filter((node) => {
             return node !== null;
-        });
+        }) as T[];
     }
 
     size(): number {
diff --git a/resources/js/wysiwyg/utils/table-copy-paste.ts b/resources/js/wysiwyg/utils/table-copy-paste.ts
new file mode 100644
index 00000000000..ae8ef3d3587
--- /dev/null
+++ b/resources/js/wysiwyg/utils/table-copy-paste.ts
@@ -0,0 +1,97 @@
+import {NodeClipboard} from "./node-clipboard";
+import {CustomTableRowNode} from "../nodes/custom-table-row";
+import {$getTableFromSelection, $getTableRowsFromSelection} from "./tables";
+import {$getSelection, LexicalEditor} from "lexical";
+import {$createCustomTableCellNode, $isCustomTableCellNode} from "../nodes/custom-table-cell";
+import {CustomTableNode} from "../nodes/custom-table";
+import {TableMap} from "./table-map";
+
+const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>(CustomTableRowNode);
+
+export function isRowClipboardEmpty(): boolean {
+    return rowClipboard.size() === 0;
+}
+
+export function validateRowsToCopy(rows: CustomTableRowNode[]): void {
+    let commonRowSize: number|null = null;
+
+    for (const row of rows) {
+        const cells = row.getChildren().filter(n => $isCustomTableCellNode(n));
+        let rowSize = 0;
+        for (const cell of cells) {
+            rowSize += cell.getColSpan() || 1;
+            if (cell.getRowSpan() > 1) {
+                throw Error('Cannot copy rows with merged cells');
+            }
+        }
+
+        if (commonRowSize === null) {
+            commonRowSize = rowSize;
+        } else if (commonRowSize !== rowSize) {
+            throw Error('Cannot copy rows with inconsistent sizes');
+        }
+    }
+}
+
+export function validateRowsToPaste(rows: CustomTableRowNode[], targetTable: CustomTableNode): void {
+    const tableColCount = (new TableMap(targetTable)).columnCount;
+    for (const row of rows) {
+        const cells = row.getChildren().filter(n => $isCustomTableCellNode(n));
+        let rowSize = 0;
+        for (const cell of cells) {
+            rowSize += cell.getColSpan() || 1;
+        }
+
+        if (rowSize > tableColCount) {
+            throw Error('Cannot paste rows that are wider than target table');
+        }
+
+        while (rowSize < tableColCount) {
+            row.append($createCustomTableCellNode());
+            rowSize++;
+        }
+    }
+}
+
+export function $cutSelectedRowsToClipboard(): void {
+    const rows = $getTableRowsFromSelection($getSelection());
+    validateRowsToCopy(rows);
+    rowClipboard.set(...rows);
+    for (const row of rows) {
+        row.remove();
+    }
+}
+
+export function $copySelectedRowsToClipboard(): void {
+    const rows = $getTableRowsFromSelection($getSelection());
+    validateRowsToCopy(rows);
+    rowClipboard.set(...rows);
+}
+
+export function $pasteClipboardRowsBefore(editor: LexicalEditor): void {
+    const selection = $getSelection();
+    const rows = $getTableRowsFromSelection(selection);
+    const table = $getTableFromSelection(selection);
+    const lastRow = rows[rows.length - 1];
+    if (lastRow && table) {
+        const clipboardRows = rowClipboard.get(editor);
+        validateRowsToPaste(clipboardRows, table);
+        for (const row of clipboardRows) {
+            lastRow.insertBefore(row);
+        }
+    }
+}
+
+export function $pasteRowsAfter(editor: LexicalEditor): void {
+    const selection = $getSelection();
+    const rows = $getTableRowsFromSelection(selection);
+    const table = $getTableFromSelection(selection);
+    const lastRow = rows[rows.length - 1];
+    if (lastRow && table) {
+        const clipboardRows = rowClipboard.get(editor).reverse();
+        validateRowsToPaste(clipboardRows, table);
+        for (const row of clipboardRows) {
+            lastRow.insertAfter(row);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/table-map.ts b/resources/js/wysiwyg/utils/table-map.ts
index 2b7eba62c03..bc9721d96d6 100644
--- a/resources/js/wysiwyg/utils/table-map.ts
+++ b/resources/js/wysiwyg/utils/table-map.ts
@@ -93,4 +93,4 @@ export class TableMap {
 
         return [...cells.values()];
     }
-}
+}
\ No newline at end of file

From 1ebb0f8c93a0e74c0d6537480e899b3ca766b45f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 22 Aug 2024 13:28:30 +0100
Subject: [PATCH 248/666] Lexical: Added table column cut/copy/paste support

---
 resources/js/wysiwyg/todo.md                  |   2 +-
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |  52 +++--
 resources/js/wysiwyg/ui/framework/core.ts     |   2 +-
 resources/js/wysiwyg/ui/index.ts              |   5 +-
 resources/js/wysiwyg/utils/node-clipboard.ts  |   5 -
 .../js/wysiwyg/utils/table-copy-paste.ts      | 185 +++++++++++++++++-
 resources/js/wysiwyg/utils/table-map.ts       |  50 ++++-
 resources/js/wysiwyg/utils/tables.ts          |  12 +-
 8 files changed, 273 insertions(+), 40 deletions(-)

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index dcc86688893..5df26bd8cfd 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,7 @@
 
 ## In progress
 
-- Table Cut/Copy/Paste column
+//
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 1a9ffb0d33d..49e36bdacbe 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -29,9 +29,15 @@ import {
 } from "../../../utils/tables";
 import {$isCustomTableRowNode} from "../../../nodes/custom-table-row";
 import {
+    $copySelectedColumnsToClipboard,
     $copySelectedRowsToClipboard,
+    $cutSelectedColumnsToClipboard,
     $cutSelectedRowsToClipboard,
-    $pasteClipboardRowsBefore, $pasteRowsAfter, isRowClipboardEmpty
+    $pasteClipboardRowsBefore,
+    $pasteClipboardRowsAfter,
+    isColumnClipboardEmpty,
+    isRowClipboardEmpty,
+    $pasteClipboardColumnsBefore, $pasteClipboardColumnsAfter
 } from "../../../utils/table-copy-paste";
 
 const neverActive = (): boolean => false;
@@ -180,7 +186,7 @@ export const cutRow: EditorButtonDefinition = {
             try {
                 $cutSelectedRowsToClipboard();
             } catch (e: any) {
-                context.error(e.toString());
+                context.error(e);
             }
         });
     },
@@ -196,7 +202,7 @@ export const copyRow: EditorButtonDefinition = {
             try {
                 $copySelectedRowsToClipboard();
             } catch (e: any) {
-                context.error(e.toString());
+                context.error(e);
             }
         });
     },
@@ -212,7 +218,7 @@ export const pasteRowBefore: EditorButtonDefinition = {
             try {
                 $pasteClipboardRowsBefore(context.editor);
             } catch (e: any) {
-                context.error(e.toString());
+                context.error(e);
             }
         });
     },
@@ -226,9 +232,9 @@ export const pasteRowAfter: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.update(() => {
             try {
-                $pasteRowsAfter(context.editor);
+                $pasteClipboardRowsAfter(context.editor);
             } catch (e: any) {
-                context.error(e.toString());
+                context.error(e);
             }
         });
     },
@@ -240,8 +246,12 @@ export const cutColumn: EditorButtonDefinition = {
     label: 'Cut column',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            try {
+                $cutSelectedColumnsToClipboard();
+            } catch (e: any) {
+                context.error(e);
+            }
         });
     },
     isActive: neverActive,
@@ -253,7 +263,11 @@ export const copyColumn: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            // TODO
+            try {
+                $copySelectedColumnsToClipboard();
+            } catch (e: any) {
+                context.error(e);
+            }
         });
     },
     isActive: neverActive,
@@ -264,24 +278,32 @@ export const pasteColumnBefore: EditorButtonDefinition = {
     label: 'Paste column before',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            try {
+                $pasteClipboardColumnsBefore(context.editor);
+            } catch (e: any) {
+                context.error(e);
+            }
         });
     },
     isActive: neverActive,
-    isDisabled: cellNotSelected,
+    isDisabled: (selection) => cellNotSelected(selection) || isColumnClipboardEmpty(),
 };
 
 export const pasteColumnAfter: EditorButtonDefinition = {
     label: 'Paste column after',
     format: 'long',
     action(context: EditorUiContext) {
-        context.editor.getEditorState().read(() => {
-            // TODO
+        context.editor.update(() => {
+            try {
+                $pasteClipboardColumnsAfter(context.editor);
+            } catch (e: any) {
+                context.error(e);
+            }
         });
     },
     isActive: neverActive,
-    isDisabled: cellNotSelected,
+    isDisabled: (selection) => cellNotSelected(selection) || isColumnClipboardEmpty(),
 };
 
 export const insertColumnBefore: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index a04f3c74a8e..3433b96e8d7 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -14,7 +14,7 @@ export type EditorUiContext = {
     containerDOM: HTMLElement; // DOM element which contains all editor elements
     scrollDOM: HTMLElement; // DOM element which is the main content scroll container
     translate: (text: string) => string; // Translate function
-    error: (text: string) => void; // Error reporting function
+    error: (text: string|Error) => void; // Error reporting function
     manager: EditorUIManager; // UI Manager instance for this editor
     options: Record<string, any>; // General user options which may be used by sub elements
 };
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index bfa76bb82a8..3b6d195b76d 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -21,8 +21,9 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         scrollDOM: scrollContainer,
         manager,
         translate: (text: string): string => text, // TODO - Implement
-        error(error: string): void {
-            window.$events.error(error); // TODO - Translate
+        error(error: string|Error): void {
+            const message = error instanceof Error ? error.message : error;
+            window.$events.error(message); // TODO - Translate
         },
         options,
     };
diff --git a/resources/js/wysiwyg/utils/node-clipboard.ts b/resources/js/wysiwyg/utils/node-clipboard.ts
index 385c4c46c75..dd3b4dfbedb 100644
--- a/resources/js/wysiwyg/utils/node-clipboard.ts
+++ b/resources/js/wysiwyg/utils/node-clipboard.ts
@@ -30,13 +30,8 @@ function unserializeNodeRecursive(editor: LexicalEditor, {node, children}: Seria
 }
 
 export class NodeClipboard<T extends LexicalNode> {
-    nodeClass: {importJSON: (s: SerializedLexicalNode) => T};
     protected store: SerializedLexicalNodeWithChildren[] = [];
 
-    constructor(nodeClass: {importJSON: (s: any) => T}) {
-        this.nodeClass = nodeClass;
-    }
-
     set(...nodes: LexicalNode[]): void {
         this.store.splice(0, this.store.length);
         for (const node of nodes) {
diff --git a/resources/js/wysiwyg/utils/table-copy-paste.ts b/resources/js/wysiwyg/utils/table-copy-paste.ts
index ae8ef3d3587..12c19b0fb80 100644
--- a/resources/js/wysiwyg/utils/table-copy-paste.ts
+++ b/resources/js/wysiwyg/utils/table-copy-paste.ts
@@ -1,12 +1,14 @@
 import {NodeClipboard} from "./node-clipboard";
 import {CustomTableRowNode} from "../nodes/custom-table-row";
-import {$getTableFromSelection, $getTableRowsFromSelection} from "./tables";
-import {$getSelection, LexicalEditor} from "lexical";
-import {$createCustomTableCellNode, $isCustomTableCellNode} from "../nodes/custom-table-cell";
+import {$getTableCellsFromSelection, $getTableFromSelection, $getTableRowsFromSelection} from "./tables";
+import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
+import {$createCustomTableCellNode, $isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
 import {CustomTableNode} from "../nodes/custom-table";
 import {TableMap} from "./table-map";
+import {$isTableSelection} from "@lexical/table";
+import {$getNodeFromSelection} from "./selection";
 
-const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>(CustomTableRowNode);
+const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>();
 
 export function isRowClipboardEmpty(): boolean {
     return rowClipboard.size() === 0;
@@ -82,7 +84,7 @@ export function $pasteClipboardRowsBefore(editor: LexicalEditor): void {
     }
 }
 
-export function $pasteRowsAfter(editor: LexicalEditor): void {
+export function $pasteClipboardRowsAfter(editor: LexicalEditor): void {
     const selection = $getSelection();
     const rows = $getTableRowsFromSelection(selection);
     const table = $getTableFromSelection(selection);
@@ -94,4 +96,177 @@ export function $pasteRowsAfter(editor: LexicalEditor): void {
             lastRow.insertAfter(row);
         }
     }
+}
+
+const columnClipboard: NodeClipboard<CustomTableCellNode>[] = [];
+
+function setColumnClipboard(columns: CustomTableCellNode[][]): void {
+    const newClipboards = columns.map(cells => {
+        const clipboard = new NodeClipboard<CustomTableCellNode>();
+        clipboard.set(...cells);
+        return clipboard;
+    });
+
+    columnClipboard.splice(0, columnClipboard.length, ...newClipboards);
+}
+
+type TableRange = {from: number, to: number};
+
+export function isColumnClipboardEmpty(): boolean {
+    return columnClipboard.length === 0;
+}
+
+function $getSelectionColumnRange(selection: BaseSelection|null): TableRange|null {
+    if ($isTableSelection(selection)) {
+        const shape = selection.getShape()
+        return {from: shape.fromX, to: shape.toX};
+    }
+
+    const cell = $getNodeFromSelection(selection, $isCustomTableCellNode);
+    const table = $getTableFromSelection(selection);
+    if (!$isCustomTableCellNode(cell) || !table) {
+        return null;
+    }
+
+    const map = new TableMap(table);
+    const range = map.getRangeForCell(cell);
+    if (!range) {
+        return null;
+    }
+
+    return {from: range.fromX, to: range.toX};
+}
+
+function $getTableColumnCellsFromSelection(range: TableRange, table: CustomTableNode): CustomTableCellNode[][] {
+    const map = new TableMap(table);
+    const columns = [];
+    for (let x = range.from; x <= range.to; x++) {
+        const cells = map.getCellsInColumn(x);
+        columns.push(cells);
+    }
+
+    return columns;
+}
+
+function validateColumnsToCopy(columns: CustomTableCellNode[][]): void {
+    let commonColSize: number|null = null;
+
+    for (const cells of columns) {
+        let colSize = 0;
+        for (const cell of cells) {
+            colSize += cell.getRowSpan() || 1;
+            if (cell.getColSpan() > 1) {
+                throw Error('Cannot copy columns with merged cells');
+            }
+        }
+
+        if (commonColSize === null) {
+            commonColSize = colSize;
+        } else if (commonColSize !== colSize) {
+            throw Error('Cannot copy columns with inconsistent sizes');
+        }
+    }
+}
+
+export function $cutSelectedColumnsToClipboard(): void {
+    const selection = $getSelection();
+    const range = $getSelectionColumnRange(selection);
+    const table = $getTableFromSelection(selection);
+    if (!range || !table) {
+        return;
+    }
+
+    const colWidths = table.getColWidths();
+    const columns = $getTableColumnCellsFromSelection(range, table);
+    validateColumnsToCopy(columns);
+    setColumnClipboard(columns);
+    for (const cells of columns) {
+        for (const cell of cells) {
+            cell.remove();
+        }
+    }
+
+    const newWidths = [...colWidths].splice(range.from, (range.to - range.from) + 1);
+    table.setColWidths(newWidths);
+}
+
+export function $copySelectedColumnsToClipboard(): void {
+    const selection = $getSelection();
+    const range = $getSelectionColumnRange(selection);
+    const table = $getTableFromSelection(selection);
+    if (!range || !table) {
+        return;
+    }
+
+    const columns = $getTableColumnCellsFromSelection(range, table);
+    validateColumnsToCopy(columns);
+    setColumnClipboard(columns);
+}
+
+function validateColumnsToPaste(columns: CustomTableCellNode[][], targetTable: CustomTableNode) {
+    const tableRowCount = (new TableMap(targetTable)).rowCount;
+    for (const cells of columns) {
+        let colSize = 0;
+        for (const cell of cells) {
+            colSize += cell.getRowSpan() || 1;
+        }
+
+        if (colSize > tableRowCount) {
+            throw Error('Cannot paste columns that are taller than target table');
+        }
+
+        while (colSize < tableRowCount) {
+            cells.push($createCustomTableCellNode());
+            colSize++;
+        }
+    }
+}
+
+function $pasteClipboardColumns(editor: LexicalEditor, isBefore: boolean): void {
+    const selection = $getSelection();
+    const table = $getTableFromSelection(selection);
+    const cells = $getTableCellsFromSelection(selection);
+    const referenceCell = cells[isBefore ? 0 : cells.length - 1];
+    if (!table || !referenceCell) {
+        return;
+    }
+
+    const clipboardCols = columnClipboard.map(cb => cb.get(editor));
+    if (!isBefore) {
+        clipboardCols.reverse();
+    }
+
+    validateColumnsToPaste(clipboardCols, table);
+    const map = new TableMap(table);
+    const cellRange = map.getRangeForCell(referenceCell);
+    if (!cellRange) {
+        return;
+    }
+
+    const colIndex = isBefore ? cellRange.fromX : cellRange.toX;
+    const colWidths = table.getColWidths();
+
+    for (let y = 0; y < map.rowCount; y++) {
+        const relCell = map.getCellAtPosition(colIndex, y);
+        for (const cells of clipboardCols) {
+            const newCell = cells[y];
+            if (isBefore) {
+                relCell.insertBefore(newCell);
+            } else {
+                relCell.insertAfter(newCell);
+            }
+        }
+    }
+
+    const refWidth = colWidths[colIndex];
+    const addedWidths = clipboardCols.map(_ => refWidth);
+    colWidths.splice(isBefore ? colIndex : colIndex + 1, 0, ...addedWidths);
+}
+
+export function $pasteClipboardColumnsBefore(editor: LexicalEditor): void {
+    $pasteClipboardColumns(editor, true);
+}
+
+export function $pasteClipboardColumnsAfter(editor: LexicalEditor): void {
+    $pasteClipboardColumns(editor, false);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/table-map.ts b/resources/js/wysiwyg/utils/table-map.ts
index bc9721d96d6..607deffe1ca 100644
--- a/resources/js/wysiwyg/utils/table-map.ts
+++ b/resources/js/wysiwyg/utils/table-map.ts
@@ -2,6 +2,13 @@ import {CustomTableNode} from "../nodes/custom-table";
 import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
 import {$isTableRowNode} from "@lexical/table";
 
+export type CellRange = {
+    fromX: number;
+    fromY: number;
+    toX: number;
+    toY: number;
+}
+
 export class TableMap {
 
     rowCount: number = 0;
@@ -77,11 +84,11 @@ export class TableMap {
         return this.cells[position];
     }
 
-    public getCellsInRange(fromX: number, fromY: number, toX: number, toY: number): CustomTableCellNode[] {
-        const minX = Math.max(Math.min(fromX, toX), 0);
-        const maxX = Math.min(Math.max(fromX, toX), this.columnCount - 1);
-        const minY = Math.max(Math.min(fromY, toY), 0);
-        const maxY = Math.min(Math.max(fromY, toY), this.rowCount - 1);
+    public getCellsInRange(range: CellRange): CustomTableCellNode[] {
+        const minX = Math.max(Math.min(range.fromX, range.toX), 0);
+        const maxX = Math.min(Math.max(range.fromX, range.toX), this.columnCount - 1);
+        const minY = Math.max(Math.min(range.fromY, range.toY), 0);
+        const maxY = Math.min(Math.max(range.fromY, range.toY), this.rowCount - 1);
 
         const cells = new Set<CustomTableCellNode>();
 
@@ -93,4 +100,37 @@ export class TableMap {
 
         return [...cells.values()];
     }
+
+    public getCellsInColumn(columnIndex: number): CustomTableCellNode[] {
+        return this.getCellsInRange({
+            fromX: columnIndex,
+            toX: columnIndex,
+            fromY: 0,
+            toY: this.rowCount - 1,
+        });
+    }
+
+    public getRangeForCell(cell: CustomTableCellNode): CellRange|null {
+        let range: CellRange|null = null;
+        const cellKey = cell.getKey();
+
+        for (let y = 0; y < this.rowCount; y++) {
+            for (let x = 0; x < this.columnCount; x++) {
+                const index = (y * this.columnCount) + x;
+                const lCell = this.cells[index];
+                if (lCell.getKey() === cellKey) {
+                    if (range === null) {
+                        range = {fromX: x, toX: x, fromY: y, toY: y};
+                    } else {
+                        range.fromX = Math.min(range.fromX, x);
+                        range.toX = Math.max(range.toX, x);
+                        range.fromY = Math.min(range.fromY, y);
+                        range.toY = Math.max(range.toY, y);
+                    }
+                }
+            }
+        }
+
+        return range;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index d0fd17e2ce7..aa8ec89ba77 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -168,12 +168,12 @@ export function $mergeTableCellsInSelection(selection: TableSelection): void {
     const fixedToX = selectionShape.toX + ((headCell.getColSpan() || 1) - 1);
     const fixedToY = selectionShape.toY + ((headCell.getRowSpan() || 1) - 1);
 
-    const mergeCells = tableMap.getCellsInRange(
-        selectionShape.fromX,
-        selectionShape.fromY,
-        fixedToX,
-        fixedToY,
-    );
+    const mergeCells = tableMap.getCellsInRange({
+        fromX: selectionShape.fromX,
+        fromY: selectionShape.fromY,
+        toX: fixedToX,
+        toY: fixedToY,
+    });
 
     if (mergeCells.length === 0) {
         return;

From 9f68ca5358722e25bcfd3f53478c93b81347cc6c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 Aug 2024 11:49:02 +0100
Subject: [PATCH 249/666] Dependancies: Updated PHP and JS packages

---
 composer.lock     | 457 +++++++++++++++++++++++-----------------------
 package-lock.json | 323 ++++++++++++++++----------------
 package.json      |   2 +-
 3 files changed, 403 insertions(+), 379 deletions(-)

diff --git a/composer.lock b/composer.lock
index 0a1ed3e7b0e..c5649d7c8d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.316.3",
+            "version": "3.320.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e832e594b3c213760e067e15ef2739f77505e832"
+                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e832e594b3c213760e067e15ef2739f77505e832",
-                "reference": "e832e594b3c213760e067e15ef2739f77505e832",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
+                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
                 "shasum": ""
             },
             "require": {
@@ -124,7 +124,10 @@
                 ],
                 "psr-4": {
                     "Aws\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/data/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -151,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.320.7"
             },
-            "time": "2024-07-12T18:07:23+00:00"
+            "time": "2024-08-23T18:13:50+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -340,23 +343,23 @@
         },
         {
             "name": "dasprid/enum",
-            "version": "1.0.5",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1 <9.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
                 "squizlabs/php_codesniffer": "*"
             },
             "type": "library",
@@ -384,9 +387,9 @@
             ],
             "support": {
                 "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
             },
-            "time": "2023-08-25T16:18:39+00:00"
+            "time": "2024-08-09T14:30:48+00:00"
         },
         {
             "name": "dflydev/dot-access-data",
@@ -558,16 +561,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.6",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1"
+                "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b7411825cf7efb7e51f9791dea19d86e43b399a1",
-                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6",
+                "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6",
                 "shasum": ""
             },
             "require": {
@@ -583,12 +586,12 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.11.5",
+                "phpstan/phpstan": "1.11.7",
                 "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "9.6.19",
+                "phpunit/phpunit": "9.6.20",
                 "psalm/plugin-phpunit": "0.18.4",
                 "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.10.1",
+                "squizlabs/php_codesniffer": "3.10.2",
                 "symfony/cache": "^5.4|^6.0|^7.0",
                 "symfony/console": "^4.4|^5.4|^6.0|^7.0",
                 "vimeo/psalm": "4.30.0"
@@ -651,7 +654,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.6"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.0"
             },
             "funding": [
                 {
@@ -667,7 +670,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T10:38:17+00:00"
+            "time": "2024-08-15T07:34:42+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1301,24 +1304,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -1347,7 +1350,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -1359,26 +1362,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1389,9 +1392,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1469,7 +1472,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
             },
             "funding": [
                 {
@@ -1485,20 +1488,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2024-07-24T11:22:20+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
                 "shasum": ""
             },
             "require": {
@@ -1506,7 +1509,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
             "extra": {
@@ -1552,7 +1555,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.0.3"
             },
             "funding": [
                 {
@@ -1568,20 +1571,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2024-07-18T10:29:17+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
             "require": {
@@ -1596,8 +1599,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1668,7 +1671,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
             },
             "funding": [
                 {
@@ -1684,7 +1687,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2024-07-18T11:15:46+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -1838,16 +1841,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.7.2",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "5451ff9f909c2fc836722e5ed6831b9f9a6db68c"
+                "reference": "1786ad5e1789050939d73cd195de4b8eaeeb34ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/5451ff9f909c2fc836722e5ed6831b9f9a6db68c",
-                "reference": "5451ff9f909c2fc836722e5ed6831b9f9a6db68c",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/1786ad5e1789050939d73cd195de4b8eaeeb34ed",
+                "reference": "1786ad5e1789050939d73cd195de4b8eaeeb34ed",
                 "shasum": ""
             },
             "require": {
@@ -1894,7 +1897,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.7.2"
+                "source": "https://github.com/Intervention/image/tree/3.8.0"
             },
             "funding": [
                 {
@@ -1904,9 +1907,13 @@
                 {
                     "url": "https://github.com/Intervention",
                     "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/interventionphp",
+                    "type": "ko_fi"
                 }
             ],
-            "time": "2024-07-05T13:35:01+00:00"
+            "time": "2024-08-16T14:57:26+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1977,16 +1984,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.16",
+            "version": "v10.48.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7"
+                "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f9a3a50fae399d75e125b0eea637dda90c99eae7",
-                "reference": "f9a3a50fae399d75e125b0eea637dda90c99eae7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/be2be342d4c74db6a8d2bd18469cd6d488ab9c98",
+                "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98",
                 "shasum": ""
             },
             "require": {
@@ -2180,20 +2187,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-09T15:25:22+00:00"
+            "time": "2024-08-09T07:55:45+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.24",
+            "version": "v0.1.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149"
+                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
+                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
                 "shasum": ""
             },
             "require": {
@@ -2236,32 +2243,33 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.24"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.25"
             },
-            "time": "2024-06-17T13:58:22+00:00"
+            "time": "2024-08-12T22:06:33+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.3",
+            "version": "v1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3|^8.0"
             },
             "require-dev": {
-                "nesbot/carbon": "^2.61",
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+                "nesbot/carbon": "^2.61|^3.0",
                 "pestphp/pest": "^1.21.3",
                 "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11"
+                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
@@ -2298,7 +2306,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-11-08T14:08:06+00:00"
+            "time": "2024-08-02T07:48:17+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -2440,16 +2448,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.2",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
                 "shasum": ""
             },
             "require": {
@@ -2462,8 +2470,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.3",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -2485,7 +2493,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.6-dev"
                 }
             },
             "autoload": {
@@ -2542,7 +2550,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-02T11:59:32+00:00"
+            "time": "2024-08-16T11:46:16+00:00"
         },
         {
             "name": "league/config",
@@ -3509,20 +3517,20 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.4"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -3589,9 +3597,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.5"
             },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2024-08-07T15:39:19+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4010,16 +4018,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -4027,13 +4035,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -4069,7 +4077,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -4081,20 +4089,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.39",
+            "version": "3.0.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
                 "shasum": ""
             },
             "require": {
@@ -4175,7 +4183,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
             },
             "funding": [
                 {
@@ -4191,7 +4199,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-24T06:27:33+00:00"
+            "time": "2024-08-12T00:13:54+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -4668,16 +4676,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "79dff0b268932c640297f5208d6298f71855c03e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
+                "reference": "79dff0b268932c640297f5208d6298f71855c03e",
                 "shasum": ""
             },
             "require": {
@@ -4712,9 +4720,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.1"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-08-21T13:31:24+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -5623,16 +5631,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.9",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9"
+                "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
-                "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc",
+                "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc",
                 "shasum": ""
             },
             "require": {
@@ -5697,7 +5705,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.9"
+                "source": "https://github.com/symfony/console/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -5713,7 +5721,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:49:33+00:00"
+            "time": "2024-07-26T12:30:32+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5849,16 +5857,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.9",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec"
+                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c9b7cc075b3ab484239855622ca05cb0b99c13ec",
-                "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0",
+                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0",
                 "shasum": ""
             },
             "require": {
@@ -5904,7 +5912,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.9"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -5920,7 +5928,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-21T16:04:15+00:00"
+            "time": "2024-07-26T12:30:32+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6080,16 +6088,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.8",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
+                "reference": "af29198d87112bebdd397bd7735fbd115997824c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c",
+                "reference": "af29198d87112bebdd397bd7735fbd115997824c",
                 "shasum": ""
             },
             "require": {
@@ -6124,7 +6132,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.8"
+                "source": "https://github.com/symfony/finder/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -6140,20 +6148,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-07-24T07:06:38+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.8",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947"
+                "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b",
+                "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b",
                 "shasum": ""
             },
             "require": {
@@ -6201,7 +6209,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -6217,20 +6225,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-07-26T12:36:27+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.9",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005"
+                "reference": "147e0daf618d7575b5007055340d09aece5cf068"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
-                "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068",
+                "reference": "147e0daf618d7575b5007055340d09aece5cf068",
                 "shasum": ""
             },
             "require": {
@@ -6315,7 +6323,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.9"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -6331,7 +6339,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T11:48:06+00:00"
+            "time": "2024-07-26T14:52:04+00:00"
         },
         {
             "name": "symfony/mime",
@@ -7191,16 +7199,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.8",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"
+                "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87",
+                "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87",
                 "shasum": ""
             },
             "require": {
@@ -7254,7 +7262,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.8"
+                "source": "https://github.com/symfony/routing/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -7270,7 +7278,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-07-15T09:26:24+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7357,16 +7365,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.9",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7"
+                "reference": "ccf9b30251719567bfd46494138327522b9a9446"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7",
-                "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446",
+                "reference": "ccf9b30251719567bfd46494138327522b9a9446",
                 "shasum": ""
             },
             "require": {
@@ -7423,7 +7431,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.9"
+                "source": "https://github.com/symfony/string/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -7439,20 +7447,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:25:38+00:00"
+            "time": "2024-07-22T10:21:14+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.8",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a"
+                "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/94041203f8ac200ae9e7c6a18fa6137814ccecc9",
+                "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9",
                 "shasum": ""
             },
             "require": {
@@ -7518,7 +7526,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.8"
+                "source": "https://github.com/symfony/translation/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -7534,7 +7542,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-07-26T12:30:32+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7690,16 +7698,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.9",
+            "version": "v6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172"
+                "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
-                "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4",
+                "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4",
                 "shasum": ""
             },
             "require": {
@@ -7755,7 +7763,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.9"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.10"
             },
             "funding": [
                 {
@@ -7771,7 +7779,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-27T13:23:14+00:00"
+            "time": "2024-07-26T12:30:32+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7828,23 +7836,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -7861,7 +7869,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -7896,7 +7904,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -7908,7 +7916,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -8765,16 +8773,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.9.0",
+            "version": "5.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984"
+                "reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/011fa18a4e55591fac6545a821921dd1d61c6984",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/169a9f11f1957ea36607c9b29eac1b48679f1ecc",
+                "reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc",
                 "shasum": ""
             },
             "require": {
@@ -8792,8 +8800,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.9.12",
                 "phpstan/phpstan-phpunit": "^1.3.3",
-                "phpunit/php-code-coverage": "*",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.16.1",
                 "vimeo/psalm": "^4.11",
                 "zumba/json-serializer": "~3.0.2"
@@ -8849,20 +8856,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-01-20T20:34:02+00:00"
+            "time": "2024-08-13T19:01:01+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.7",
+            "version": "1.11.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d"
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d",
-                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
                 "shasum": ""
             },
             "require": {
@@ -8907,36 +8914,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-06T11:17:41+00:00"
+            "time": "2024-08-19T14:37:29+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.15",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
-                "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=8.1",
-                "phpunit/php-file-iterator": "^4.0",
-                "phpunit/php-text-template": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^3.0",
-                "sebastian/complexity": "^3.0",
-                "sebastian/environment": "^6.0",
-                "sebastian/lines-of-code": "^2.0",
-                "sebastian/version": "^4.0",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^10.1"
@@ -8948,7 +8955,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
@@ -8977,7 +8984,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
@@ -8985,7 +8992,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-29T08:25:15+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9232,16 +9239,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.27",
+            "version": "10.5.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5"
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2425f713b2a5350568ccb1a2d3984841a23e83c5",
-                "reference": "2425f713b2a5350568ccb1a2d3984841a23e83c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
                 "shasum": ""
             },
             "require": {
@@ -9262,7 +9269,7 @@
                 "phpunit/php-timer": "^6.0.0",
                 "sebastian/cli-parser": "^2.0.1",
                 "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.1",
+                "sebastian/comparator": "^5.0.2",
                 "sebastian/diff": "^5.1.1",
                 "sebastian/environment": "^6.1.0",
                 "sebastian/exporter": "^5.1.2",
@@ -9313,7 +9320,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
             },
             "funding": [
                 {
@@ -9329,7 +9336,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-10T11:48:06+00:00"
+            "time": "2024-08-13T06:09:37+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9501,16 +9508,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
                 "shasum": ""
             },
             "require": {
@@ -9521,7 +9528,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^10.4"
             },
             "type": "library",
             "extra": {
@@ -9566,7 +9573,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
             },
             "funding": [
                 {
@@ -9574,7 +9581,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2024-08-12T06:03:08+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -10249,16 +10256,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.1",
+            "version": "3.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
+                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017",
+                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017",
                 "shasum": ""
             },
             "require": {
@@ -10325,7 +10332,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-22T21:24:41+00:00"
+            "time": "2024-07-21T23:26:44+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
diff --git a/package-lock.json b/package-lock.json
index a117f88a636..0f007659aeb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
       "devDependencies": {
         "@lezer/generator": "^1.5.1",
         "chokidar-cli": "^3.0",
-        "esbuild": "^0.20",
+        "esbuild": "^0.23.0",
         "eslint": "^8.55.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.0",
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.17.0.tgz",
-      "integrity": "sha512-fdfj6e6ZxZf8yrkMHUSJJir7OJkHkZKaOZGzLWIYp2PZ3jd+d+UjG8zVPqJF6d3bKxkhvXTPan/UZ1t7Bqm0gA==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
+      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -172,9 +172,9 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.0.tgz",
-      "integrity": "sha512-5m/K+1A6gYR0e+h/dEde7LoGimMjRtWXZFg4Lo70cc8HzjSdHe3fLwjWMR0VRl5KFT1SxalSap7uMgPKF28wBA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.1.tgz",
+      "integrity": "sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
@@ -216,9 +216,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.28.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.4.tgz",
-      "integrity": "sha512-QScv95fiviSQ/CaVGflxAvvvDy/9wi0RFyDl4LkHHWiMr/UPebyuTspmYSeN5Nx6eujcPYwsQzA6ZIZucKZVHQ==",
+      "version": "6.33.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
+      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -226,9 +226,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
       "cpu": [
         "ppc64"
       ],
@@ -238,13 +238,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
       "cpu": [
         "arm"
       ],
@@ -254,13 +254,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
       "cpu": [
         "arm64"
       ],
@@ -270,13 +270,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
       "cpu": [
         "x64"
       ],
@@ -286,13 +286,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
       "cpu": [
         "arm64"
       ],
@@ -302,13 +302,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
       "cpu": [
         "x64"
       ],
@@ -318,13 +318,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
       "cpu": [
         "arm64"
       ],
@@ -334,13 +334,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
       "cpu": [
         "x64"
       ],
@@ -350,13 +350,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
       "cpu": [
         "arm"
       ],
@@ -366,13 +366,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
       "cpu": [
         "arm64"
       ],
@@ -382,13 +382,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
       "cpu": [
         "ia32"
       ],
@@ -398,13 +398,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
       "cpu": [
         "loong64"
       ],
@@ -414,13 +414,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
       "cpu": [
         "mips64el"
       ],
@@ -430,13 +430,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
       "cpu": [
         "ppc64"
       ],
@@ -446,13 +446,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
       "cpu": [
         "riscv64"
       ],
@@ -462,13 +462,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
       "cpu": [
         "s390x"
       ],
@@ -478,13 +478,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
+      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
       "cpu": [
         "x64"
       ],
@@ -494,13 +494,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
       "cpu": [
         "x64"
       ],
@@ -510,13 +510,29 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
       "cpu": [
         "x64"
       ],
@@ -526,13 +542,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
       "cpu": [
         "x64"
       ],
@@ -542,13 +558,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
       "cpu": [
         "arm64"
       ],
@@ -558,13 +574,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
       "cpu": [
         "ia32"
       ],
@@ -574,13 +590,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
       "cpu": [
         "x64"
       ],
@@ -590,7 +606,7 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -713,9 +729,9 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz",
-      "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -751,9 +767,9 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz",
-      "integrity": "sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -1339,9 +1355,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -1576,41 +1592,42 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
+      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.23.1",
+        "@esbuild/android-arm": "0.23.1",
+        "@esbuild/android-arm64": "0.23.1",
+        "@esbuild/android-x64": "0.23.1",
+        "@esbuild/darwin-arm64": "0.23.1",
+        "@esbuild/darwin-x64": "0.23.1",
+        "@esbuild/freebsd-arm64": "0.23.1",
+        "@esbuild/freebsd-x64": "0.23.1",
+        "@esbuild/linux-arm": "0.23.1",
+        "@esbuild/linux-arm64": "0.23.1",
+        "@esbuild/linux-ia32": "0.23.1",
+        "@esbuild/linux-loong64": "0.23.1",
+        "@esbuild/linux-mips64el": "0.23.1",
+        "@esbuild/linux-ppc64": "0.23.1",
+        "@esbuild/linux-riscv64": "0.23.1",
+        "@esbuild/linux-s390x": "0.23.1",
+        "@esbuild/linux-x64": "0.23.1",
+        "@esbuild/netbsd-x64": "0.23.1",
+        "@esbuild/openbsd-arm64": "0.23.1",
+        "@esbuild/openbsd-x64": "0.23.1",
+        "@esbuild/sunos-x64": "0.23.1",
+        "@esbuild/win32-arm64": "0.23.1",
+        "@esbuild/win32-ia32": "0.23.1",
+        "@esbuild/win32-x64": "0.23.1"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -1720,9 +1737,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.2.tgz",
+      "integrity": "sha512-3XnC5fDyc8M4J2E8pt8pmSVRX2M+5yWMCfI/kDZwauQeFgzQOuhcRBFKjTeJagqgk4sFKxe1mvNVnaWwImx/Tg==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -2274,18 +2291,18 @@
       "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -2419,9 +2436,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
@@ -3716,9 +3733,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
       "dev": true
     },
     "node_modules/string-width": {
diff --git a/package.json b/package.json
index ba2de38ba3c..aa826b416ea 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
     "chokidar-cli": "^3.0",
-    "esbuild": "^0.20",
+    "esbuild": "^0.23.0",
     "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",

From 1f2506221ad7207b37bd093ca3233347d6d76ca1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 27 Aug 2024 12:23:36 +0100
Subject: [PATCH 250/666] API: Updated docs with consistent types, fixed users
 response example

For #5178 and #5183
---
 app/Uploads/Controllers/AttachmentApiController.php |  8 ++++----
 app/Users/Controllers/UserApiController.php         | 13 +++++++------
 dev/api/responses/users-list.json                   |  2 --
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index 9040ba6d3a9..87e00257cb4 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -171,16 +171,16 @@ protected function rules(): array
     {
         return [
             'create' => [
-                'name'        => ['required', 'min:1', 'max:255', 'string'],
+                'name'        => ['required', 'string', 'min:1', 'max:255'],
                 'uploaded_to' => ['required', 'integer', 'exists:pages,id'],
                 'file'        => array_merge(['required_without:link'], $this->attachmentService->getFileValidationRules()),
-                'link'        => ['required_without:file', 'min:1', 'max:2000', 'safe_url'],
+                'link'        => ['required_without:file', 'string', 'min:1', 'max:2000', 'safe_url'],
             ],
             'update' => [
-                'name'        => ['min:1', 'max:255', 'string'],
+                'name'        => ['string', 'min:1', 'max:255'],
                 'uploaded_to' => ['integer', 'exists:pages,id'],
                 'file'        => $this->attachmentService->getFileValidationRules(),
-                'link'        => ['min:1', 'max:2000', 'safe_url'],
+                'link'        => ['string', 'min:1', 'max:2000', 'safe_url'],
             ],
         ];
     }
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 1ccfecd7335..6ee8f16d15e 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -37,27 +37,28 @@ protected function rules(int $userId = null): array
     {
         return [
             'create' => [
-                'name'  => ['required', 'min:2', 'max:100'],
+                'name'  => ['required', 'string', 'min:2', 'max:100'],
                 'email' => [
-                    'required', 'min:2', 'email', new Unique('users', 'email'),
+                    'required', 'string', 'email', 'min:2', new Unique('users', 'email'),
                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],
-                'password'         => [Password::default()],
+                'password'         => ['string', Password::default()],
                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
                 'send_invite'      => ['boolean'],
             ],
             'update' => [
-                'name'  => ['min:2', 'max:100'],
+                'name'  => ['string', 'min:2', 'max:100'],
                 'email' => [
-                    'min:2',
+                    'string',
                     'email',
+                    'min:2',
                     (new Unique('users', 'email'))->ignore($userId ?? null),
                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],
-                'password'         => [Password::default()],
+                'password'         => ['string', Password::default()],
                 'roles'            => ['array'],
                 'roles.*'          => ['integer'],
             ],
diff --git a/dev/api/responses/users-list.json b/dev/api/responses/users-list.json
index cbc7fb1043e..9cc2517b7ff 100644
--- a/dev/api/responses/users-list.json
+++ b/dev/api/responses/users-list.json
@@ -8,7 +8,6 @@
       "updated_at": "2022-02-03T16:27:55.000000Z",
       "external_auth_id": "abc123456",
       "slug": "dan-brown",
-      "user_id": 1,
       "last_activity_at": "2022-02-03T16:27:55.000000Z",
       "profile_url": "https://docs.example.com/user/dan-brown",
       "edit_url": "https://docs.example.com/settings/users/1",
@@ -22,7 +21,6 @@
       "updated_at": "2021-11-18T17:10:58.000000Z",
       "external_auth_id": "",
       "slug": "benny",
-      "user_id": 2,
       "last_activity_at": "2022-01-31T20:39:24.000000Z",
       "profile_url": "https://docs.example.com/user/benny",
       "edit_url": "https://docs.example.com/settings/users/2",

From 90d1223acd7e37f4cb5d87284e00877473aa43a6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 27 Aug 2024 13:32:16 +0100
Subject: [PATCH 251/666] Styles: Added max-width for iframes in content

For #5130
---
 resources/sass/_content.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index be5a6517e0b..84fd4eae635 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -106,7 +106,7 @@
     margin-bottom: 1.375em;
   }
 
-  video {
+  video, iframe {
     max-width: 100%;
   }
 

From 8cef998f4977d23ba87f10e13260f8c7537e53a9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 27 Aug 2024 14:13:33 +0100
Subject: [PATCH 252/666] RTL: Fixed lacking task list RTL support

Added with fallback to old LTR styles.
For #5134
---
 resources/sass/_text.scss    | 11 +++++++++++
 resources/sass/_tinymce.scss |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 9f367984ad5..9acfe2ceed3 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -309,15 +309,26 @@ li > ol, li > ul {
   padding-right: $-m * 1.2;
 }
 
+/**
+ * Checkbox lists
+ * Some styles duplicated for supporting logical units (eg. inline-end) while
+ * providing fallbacks to non-logical rules, so RTL is natively supported where possible.
+ */
 li.checkbox-item, li.task-list-item {
   display: list-item;
   list-style: none;
   margin-left: -($-m * 1.2);
+  margin-inline-start: -($-m * 1.2);
+  margin-inline-end: 0;
   input[type="checkbox"] {
     margin-right: $-xs;
+    margin-inline-end: $-xs;
+    margin-inline-start: 0;
   }
   li.checkbox-item, li.task-list-item {
     margin-left: $-xs;
+    margin-inline-start: $-xs;
+    margin-inline-end: 0;
   }
 }
 
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 95294cdf2c0..129e478212b 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -173,7 +173,7 @@ body.page-content.mce-content-body  {
  * Fake task list checkboxes
  */
 .page-content.mce-content-body .task-list-item {
-  margin-left: 0;
+  margin-inline-start: 0;
   position: relative;
 }
 .page-content.mce-content-body .task-list-item > input[type="checkbox"] {
@@ -186,11 +186,11 @@ body.page-content.mce-content-body  {
   width: 12px;
   height: 12px;
   border-radius: 2px;
-  margin-right: 8px;
+  margin-inline-end: 8px;
   vertical-align: text-top;
   cursor: pointer;
   position: absolute;
-  left: -24px;
+  inset-inline-start: -24px;
   top: 4px;
 }
 

From 1b4ed69f41955d27794718cd74b3f56fba9be63f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 Aug 2024 15:39:05 +0100
Subject: [PATCH 253/666] LDAP: Updated recursive group search to query by DN

Added test to cover, added pre-change.
Need to test post-changes and fix tests.
---
 app/Access/Ldap.php        | 14 ++++++-
 app/Access/LdapService.php | 79 ++++++++++++++++++++++----------------
 tests/Auth/LdapTest.php    | 38 ++++++++++++++++++
 3 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/app/Access/Ldap.php b/app/Access/Ldap.php
index 12a3d1e7122..702d629cef0 100644
--- a/app/Access/Ldap.php
+++ b/app/Access/Ldap.php
@@ -52,13 +52,25 @@ public function setVersion($ldapConnection, int $version): bool
      *
      * @param resource|\LDAP\Connection   $ldapConnection
      *
-     * @return resource|\LDAP\Result
+     * @return \LDAP\Result|array|false
      */
     public function search($ldapConnection, string $baseDn, string $filter, array $attributes = null)
     {
         return ldap_search($ldapConnection, $baseDn, $filter, $attributes);
     }
 
+    /**
+     * Read an entry from the LDAP tree.
+     *
+     * @param resource|\Ldap\Connection $ldapConnection
+     *
+     * @return \LDAP\Result|array|false
+     */
+    public function read($ldapConnection, string $baseDn, string $filter, array $attributes = null)
+    {
+        return ldap_read($ldapConnection, $baseDn, $filter, $attributes);
+    }
+
     /**
      * Get entries from an LDAP search result.
      *
diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index e822b09a67c..7c8d8b18f97 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -321,94 +321,105 @@ public function getUserGroups(string $userName): array
             return [];
         }
 
-        $userGroups = $this->groupFilter($user);
+        $userGroups = $this->extractGroupsFromSearchResponseEntry($user);
         $allGroups = $this->getGroupsRecursive($userGroups, []);
+        $formattedGroups = $this->extractGroupNamesFromLdapGroupDns($allGroups);
 
         if ($this->config['dump_user_groups']) {
             throw new JsonDebugException([
-                'details_from_ldap'             => $user,
-                'parsed_direct_user_groups'     => $userGroups,
-                'parsed_recursive_user_groups'  => $allGroups,
+                'details_from_ldap'            => $user,
+                'parsed_direct_user_groups'    => $userGroups,
+                'parsed_recursive_user_groups' => $allGroups,
+                'parsed_resulting_group_names' => $formattedGroups,
             ]);
         }
 
         return $allGroups;
     }
 
+    protected function extractGroupNamesFromLdapGroupDns(array $groupDNs): array
+    {
+        $names = [];
+
+        foreach ($groupDNs as $groupDN) {
+            $exploded = $this->ldap->explodeDn($groupDN, 1);
+            if ($exploded !== false && count($exploded) > 0) {
+                $names[] = $exploded[0];
+            }
+        }
+
+        return array_unique($names);
+    }
+
     /**
-     * Get the parent groups of an array of groups.
+     * Build an array of all relevant groups DNs after recursively scanning
+     * across parents of the groups given.
      *
      * @throws LdapException
      */
-    private function getGroupsRecursive(array $groupsArray, array $checked): array
+    protected function getGroupsRecursive(array $groupDNs, array $checked): array
     {
         $groupsToAdd = [];
-        foreach ($groupsArray as $groupName) {
-            if (in_array($groupName, $checked)) {
+        foreach ($groupDNs as $groupDN) {
+            if (in_array($groupDN, $checked)) {
                 continue;
             }
 
-            $parentGroups = $this->getGroupGroups($groupName);
+            $parentGroups = $this->getParentsOfGroup($groupDN);
             $groupsToAdd = array_merge($groupsToAdd, $parentGroups);
-            $checked[] = $groupName;
+            $checked[] = $groupDN;
         }
 
-        $groupsArray = array_unique(array_merge($groupsArray, $groupsToAdd), SORT_REGULAR);
+        $uniqueDNs = array_unique(array_merge($groupDNs, $groupsToAdd), SORT_REGULAR);
 
         if (empty($groupsToAdd)) {
-            return $groupsArray;
+            return $uniqueDNs;
         }
 
-        return $this->getGroupsRecursive($groupsArray, $checked);
+        return $this->getGroupsRecursive($uniqueDNs, $checked);
     }
 
     /**
-     * Get the parent groups of a single group.
-     *
      * @throws LdapException
      */
-    private function getGroupGroups(string $groupName): array
+    protected function getParentsOfGroup(string $groupDN): array
     {
+        $groupsAttr = strtolower($this->config['group_attribute']);
         $ldapConnection = $this->getConnection();
         $this->bindSystemUser($ldapConnection);
 
         $followReferrals = $this->config['follow_referrals'] ? 1 : 0;
         $this->ldap->setOption($ldapConnection, LDAP_OPT_REFERRALS, $followReferrals);
-
-        $baseDn = $this->config['base_dn'];
-        $groupsAttr = strtolower($this->config['group_attribute']);
-
-        $groupFilter = 'CN=' . $this->ldap->escape($groupName);
-        $groups = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $groupFilter, [$groupsAttr]);
-        if ($groups['count'] === 0) {
+        $read = $this->ldap->read($ldapConnection, $groupDN, '(objectClass=*)', [$groupsAttr]);
+        $results = $this->ldap->getEntries($ldapConnection, $read);
+        if ($results['count'] === 0) {
             return [];
         }
 
-        return $this->groupFilter($groups[0]);
+        return $this->extractGroupsFromSearchResponseEntry($results[0]);
     }
 
     /**
-     * Filter out LDAP CN and DN language in a ldap search return.
-     * Gets the base CN (common name) of the string.
+     * Extract an array of group DN values from the given LDAP search response entry
      */
-    protected function groupFilter(array $userGroupSearchResponse): array
+    protected function extractGroupsFromSearchResponseEntry(array $ldapEntry): array
     {
         $groupsAttr = strtolower($this->config['group_attribute']);
-        $ldapGroups = [];
+        $groupDNs = [];
         $count = 0;
 
-        if (isset($userGroupSearchResponse[$groupsAttr]['count'])) {
-            $count = (int) $userGroupSearchResponse[$groupsAttr]['count'];
+        if (isset($ldapEntry[$groupsAttr]['count'])) {
+            $count = (int) $ldapEntry[$groupsAttr]['count'];
         }
 
         for ($i = 0; $i < $count; $i++) {
-            $dnComponents = $this->ldap->explodeDn($userGroupSearchResponse[$groupsAttr][$i], 1);
-            if (!in_array($dnComponents[0], $ldapGroups)) {
-                $ldapGroups[] = $dnComponents[0];
+            $dn = $ldapEntry[$groupsAttr][$i];
+            if (!in_array($dn, $groupDNs)) {
+                $groupDNs[] = $dn;
             }
         }
 
-        return $ldapGroups;
+        return $groupDNs;
     }
 
     /**
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 3f80f00f41e..7c2510eb14c 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -435,6 +435,44 @@ public function test_dump_user_groups_shows_group_related_details_as_json()
         ]);
     }
 
+    public function test_recursive_group_search_queries_via_full_dn()
+    {
+        app('config')->set([
+            'services.ldap.user_to_groups'     => true,
+            'services.ldap.group_attribute'    => 'memberOf',
+        ]);
+
+        $userResp = ['count' => 1, 0 => [
+            'uid'      => [$this->mockUser->name],
+            'cn'       => [$this->mockUser->name],
+            'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
+            'mail'     => [$this->mockUser->email],
+        ]];
+        $groupResp = ['count' => 1,
+                      0 => [
+                          'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
+                          'memberof' => [
+                              'count' => 1,
+                              0       => 'cn=ldaptester,ou=groups,dc=example,dc=com',
+                          ],
+                      ],
+        ];
+
+        $this->commonLdapMocks(1, 1, 3, 4, 3, 1);
+
+        $escapedName = ldap_escape($this->mockUser->name);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->twice()
+            ->with($this->resourceId, config('services.ldap.base_dn'), "(&(uid={$escapedName}))", \Mockery::type('array'))
+            ->andReturn($userResp, $groupResp);
+
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
+            ->with($this->resourceId, config('services.ldap.base_dn'), $groupResp[0]['dn'], ['memberof'])
+            ->andReturn(['count' => 0]);
+
+        $resp = $this->mockUserLogin();
+        $resp->assertRedirect('/');
+    }
+
     public function test_external_auth_id_visible_in_roles_page_when_ldap_active()
     {
         $role = Role::factory()->create(['display_name' => 'ldaptester', 'external_auth_id' => 'ex-auth-a, test-second-param']);

From c68d154f0f6bf647c27305597ac48b23f126c08a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 Aug 2024 21:16:18 +0100
Subject: [PATCH 254/666] LDAP: Updated tests for recursive group changes

---
 app/Access/LdapService.php |  2 +-
 tests/Auth/LdapTest.php    | 66 ++++++++++++++++++++++++--------------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 7c8d8b18f97..365cb1db015 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -334,7 +334,7 @@ public function getUserGroups(string $userName): array
             ]);
         }
 
-        return $allGroups;
+        return $formattedGroups;
     }
 
     protected function extractGroupNamesFromLdapGroupDns(array $groupDNs): array
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 7c2510eb14c..ef95bc2e8f4 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -76,7 +76,7 @@ protected function mockUserLogin(?string $email = null): TestResponse
     /**
      * Set LDAP method mocks for things we commonly call without altering.
      */
-    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0)
+    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0, int $groups = 0)
     {
         $this->mockLdap->shouldReceive('connect')->times($connects)->andReturn($this->resourceId);
         $this->mockLdap->shouldReceive('setVersion')->times($versions);
@@ -84,6 +84,13 @@ protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $op
         $this->mockLdap->shouldReceive('bind')->times($binds)->andReturn(true);
         $this->mockEscapes($escapes);
         $this->mockExplodes($explodes);
+        $this->mockGroupLookups($groups);
+    }
+
+    protected function mockGroupLookups(int $times = 1): void
+    {
+        $this->mockLdap->shouldReceive('read')->times($times)->andReturn(['count' => 0]);
+        $this->mockLdap->shouldReceive('getEntries')->times($times)->andReturn(['count' => 0]);
     }
 
     public function test_login()
@@ -307,8 +314,8 @@ public function test_login_maps_roles_and_retains_existing_roles()
             'services.ldap.remove_from_groups' => false,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 4, 6);
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
@@ -352,8 +359,8 @@ public function test_login_maps_roles_and_removes_old_roles_if_set()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 3, 2);
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
@@ -394,22 +401,26 @@ public function test_dump_user_groups_shows_group_related_details_as_json()
             'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
             'mail'     => [$this->mockUser->email],
         ]];
-        $this->commonLdapMocks(1, 1, 4, 5, 4, 2);
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 0);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn($userResp, ['count' => 1,
-                0                           => [
-                    'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
+                0 => [
+                    'dn' => 'dc=test,' . config('services.ldap.base_dn'),
                     'memberof' => [
                         'count' => 1,
-                        0       => 'cn=ldaptester,ou=groups,dc=example,dc=com',
+                        0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
                     ],
                 ],
-            ], [
+            ]);
+
+        $this->mockLdap->shouldReceive('read')->times(2);
+        $this->mockLdap->shouldReceive('getEntries')->times(2)
+            ->andReturn([
                 'count' => 1,
-                0       => [
-                    'dn'       => 'cn=ldaptester,ou=groups,dc=example,dc=com',
-                    'memberof' => [
+                0 => [
+                    'dn'        => 'cn=ldaptester,ou=groups,dc=example,dc=com',
+                    'memberof'  => [
                         'count' => 1,
                         0       => 'cn=monsters,ou=groups,dc=example,dc=com',
                     ],
@@ -426,9 +437,13 @@ public function test_dump_user_groups_shows_group_related_details_as_json()
                 ],
             ],
             'parsed_direct_user_groups' => [
-                'ldaptester',
+                'cn=ldaptester,ou=groups,dc=example,dc=com',
             ],
             'parsed_recursive_user_groups' => [
+                'cn=ldaptester,ou=groups,dc=example,dc=com',
+                'cn=monsters,ou=groups,dc=example,dc=com',
+            ],
+            'parsed_resulting_group_names' => [
                 'ldaptester',
                 'monsters',
             ],
@@ -458,15 +473,18 @@ public function test_recursive_group_search_queries_via_full_dn()
                       ],
         ];
 
-        $this->commonLdapMocks(1, 1, 3, 4, 3, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 1);
 
         $escapedName = ldap_escape($this->mockUser->name);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->twice()
             ->with($this->resourceId, config('services.ldap.base_dn'), "(&(uid={$escapedName}))", \Mockery::type('array'))
             ->andReturn($userResp, $groupResp);
 
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), $groupResp[0]['dn'], ['memberof'])
+        $this->mockLdap->shouldReceive('read')->times(1)
+            ->with($this->resourceId, 'cn=ldaptester,ou=groups,dc=example,dc=com', '(objectClass=*)', ['memberof'])
+            ->andReturn(['count' => 0]);
+        $this->mockLdap->shouldReceive('getEntries')->times(1)
+            ->with($this->resourceId, ['count' => 0])
             ->andReturn(['count' => 0]);
 
         $resp = $this->mockUserLogin();
@@ -491,8 +509,8 @@ public function test_login_maps_roles_using_external_auth_ids_if_set()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 3, 2);
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(3)
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
@@ -532,8 +550,8 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 4, 6);
-        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
@@ -772,9 +790,9 @@ public function test_login_with_email_confirmation_required_maps_groups_but_show
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 6, 8, 6, 4);
+        $this->commonLdapMocks(1, 1, 6, 8, 4, 2, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')
-            ->times(6)
+            ->times(4)
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$user->name],
                 'cn'       => [$user->name],

From 9aa3442a170d486c7ff5d8671ac1b11d3c886af1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 29 Aug 2024 14:43:21 +0100
Subject: [PATCH 255/666] API: Fixed lacking permission enforcement on book
 contents

---
 app/Entities/Controllers/BookApiController.php |  5 ++++-
 tests/Api/BooksApiTest.php                     | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index 15e67a0f723..c1e38e72fe7 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\BookQueries;
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Http\ApiController;
@@ -18,6 +19,7 @@ class BookApiController extends ApiController
     public function __construct(
         protected BookRepo $bookRepo,
         protected BookQueries $queries,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -69,7 +71,8 @@ public function read(string $id)
             ->withType()
             ->withField('pages', function (Entity $entity) {
                 if ($entity instanceof Chapter) {
-                    return (new ApiEntityListFormatter($entity->pages->all()))->format();
+                    $pages = $this->pageQueries->visibleForChapterList($entity->id)->get()->all();
+                    return (new ApiEntityListFormatter($pages))->format();
                 }
                 return null;
             })->format();
diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index b8c2b613387..0de98dc323b 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -149,6 +149,23 @@ public function test_read_endpoint_includes_chapter_and_page_contents()
         ]);
     }
 
+    public function test_read_endpoint_contents_nested_pages_has_permissions_applied()
+    {
+        $this->actingAsApiEditor();
+
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $chapterPage = $chapter->pages()->first();
+        $customName = 'MyNonVisiblePageWithinAChapter';
+        $chapterPage->name = $customName;
+        $chapterPage->save();
+
+        $this->permissions->disableEntityInheritedPermissions($chapterPage);
+
+        $resp = $this->getJson($this->baseEndpoint . "/{$book->id}");
+        $resp->assertJsonMissing(['name' => $customName]);
+    }
+
     public function test_update_endpoint()
     {
         $this->actingAsApiEditor();

From aac7d564c8f7d811baf260281e286e2e635600b6 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Thu, 29 Aug 2024 15:08:27 +0100
Subject: [PATCH 256/666] Updated translations with latest Crowdin changes
 (#5118)

---
 lang/ca/activities.php       | 122 ++++-----
 lang/ca/auth.php             | 146 +++++------
 lang/ca/common.php           |  46 ++--
 lang/ca/components.php       |  36 +--
 lang/ca/editor.php           | 136 +++++-----
 lang/ca/entities.php         | 470 +++++++++++++++++-----------------
 lang/ca/errors.php           | 146 +++++------
 lang/ca/notifications.php    |  22 +-
 lang/ca/passwords.php        |   6 +-
 lang/ca/preferences.php      |  56 ++---
 lang/ca/settings.php         | 314 +++++++++++------------
 lang/ca/validation.php       | 104 ++++----
 lang/cs/activities.php       |  14 +-
 lang/cs/entities.php         |  64 ++---
 lang/cs/errors.php           |   2 +-
 lang/cs/notifications.php    |  20 +-
 lang/cs/settings.php         |   4 +-
 lang/cy/activities.php       |  44 ++--
 lang/cy/auth.php             |  30 +--
 lang/cy/common.php           |  50 ++--
 lang/cy/editor.php           |   2 +-
 lang/cy/entities.php         |  78 +++---
 lang/cy/preferences.php      |   2 +-
 lang/cy/settings.php         | 474 +++++++++++++++++------------------
 lang/cy/validation.php       | 106 ++++----
 lang/de/entities.php         |   2 +-
 lang/et/auth.php             |   2 +-
 lang/fa/common.php           |   2 +-
 lang/fa/errors.php           |  10 +-
 lang/fa/settings.php         |  22 +-
 lang/fr/entities.php         |   6 +-
 lang/he/activities.php       |  14 +-
 lang/lv/auth.php             |   2 +-
 lang/lv/common.php           |   2 +-
 lang/lv/editor.php           |   6 +-
 lang/lv/entities.php         |  20 +-
 lang/lv/errors.php           |   4 +-
 lang/lv/notifications.php    |   6 +-
 lang/lv/settings.php         |  16 +-
 lang/nb/auth.php             |   2 +-
 lang/nb/errors.php           |   4 +-
 lang/nl/activities.php       |  10 +-
 lang/nl/auth.php             |   6 +-
 lang/nl/errors.php           |   2 +-
 lang/nl/passwords.php        |   6 +-
 lang/ru/auth.php             |   4 +-
 lang/ru/errors.php           |   2 +-
 lang/sr/auth.php             |   2 +-
 lang/sr/entities.php         |  96 +++----
 lang/sr/errors.php           |   6 +-
 lang/sv/components.php       |   4 +-
 lang/sv/entities.php         |  30 +--
 lang/sv/preferences.php      |  12 +-
 lang/sv/settings.php         |  12 +-
 lang/zh_TW/auth.php          |   2 +-
 lang/zh_TW/components.php    |   6 +-
 lang/zh_TW/editor.php        | 130 +++++-----
 lang/zh_TW/entities.php      | 232 ++++++++---------
 lang/zh_TW/errors.php        |  18 +-
 lang/zh_TW/notifications.php |  34 +--
 lang/zh_TW/settings.php      |  66 ++---
 61 files changed, 1647 insertions(+), 1647 deletions(-)

diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index a3116ef0d63..c288384826c 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -7,116 +7,116 @@
 
     // Pages
     'page_create'                 => 'ha creat la pàgina',
-    'page_create_notification'    => 'Pàgina creada correctament',
+    'page_create_notification'    => 'S’ha creat la pàgina',
     'page_update'                 => 'ha actualitzat la pàgina',
-    'page_update_notification'    => 'Pàgina actualitzada correctament',
-    'page_delete'                 => 'ha suprimit una pàgina',
-    'page_delete_notification'    => 'Pàgina suprimida correctament',
+    'page_update_notification'    => 'S’ha actualitzat la pàgina',
+    'page_delete'                 => 'ha suprimit la pàgina',
+    'page_delete_notification'    => 'S’ha suprimit la pàgina',
     'page_restore'                => 'ha restaurat la pàgina',
-    'page_restore_notification'   => 'Pàgina restaurada correctament',
+    'page_restore_notification'   => 'S’ha restaurat la pàgina',
     'page_move'                   => 'ha mogut la pàgina',
-    'page_move_notification'      => 'Pàgina moguda correctament',
+    'page_move_notification'      => 'S’ha mogut la pàgina',
 
     // Chapters
     'chapter_create'              => 'ha creat el capítol',
-    'chapter_create_notification' => 'Capítol creat correctament',
+    'chapter_create_notification' => 'S’ha creat el capítol',
     'chapter_update'              => 'ha actualitzat el capítol',
-    'chapter_update_notification' => 'Capítol actualitzat correctament',
-    'chapter_delete'              => 'ha suprimit un capítol',
-    'chapter_delete_notification' => 'Capítol suprimit correctament',
+    'chapter_update_notification' => 'S’ha actualitzat el capítol',
+    'chapter_delete'              => 'ha suprimit el capítol',
+    'chapter_delete_notification' => 'S’ha suprimit el capítol',
     'chapter_move'                => 'ha mogut el capítol',
-    'chapter_move_notification' => 'Capítol mogut correctament',
+    'chapter_move_notification' => 'S’ha mogut el capítol',
 
     // Books
     'book_create'                 => 'ha creat el llibre',
-    'book_create_notification'    => 'Llibre creat correctament',
-    'book_create_from_chapter'              => 'ha convertit un capítol en el llibre',
-    'book_create_from_chapter_notification' => 'Capítol convertit en llibre correctament',
+    'book_create_notification'    => 'S’ha creat el llibre',
+    'book_create_from_chapter'              => 'ha convertit el capítol a llibre',
+    'book_create_from_chapter_notification' => 'S’ha convertit el capítol a llibre',
     'book_update'                 => 'ha actualitzat el llibre',
-    'book_update_notification'    => 'Llibre actualitzat correctament',
-    'book_delete'                 => 'ha suprimit un llibre',
-    'book_delete_notification'    => 'Llibre suprimit correctament',
+    'book_update_notification'    => 'S’ha actualitzat el llibre',
+    'book_delete'                 => 'ha suprimit el llibre',
+    'book_delete_notification'    => 'S’ha suprimit el llibre',
     'book_sort'                   => 'ha ordenat el llibre',
-    'book_sort_notification'      => 'Llibre reordenat correctament',
+    'book_sort_notification'      => 'S’ha tornat a ordenar el llibre',
 
     // Bookshelves
     'bookshelf_create'            => 'ha creat el prestatge',
-    'bookshelf_create_notification'    => 'Prestatge creat correctament',
-    'bookshelf_create_from_book'    => 'ha convertit un llibre en el prestatge',
-    'bookshelf_create_from_book_notification'    => 'Llibre convertit en prestatge correctament',
+    'bookshelf_create_notification'    => 'S’ha creat el prestatge',
+    'bookshelf_create_from_book'    => 'ha convertit el llibre a prestatge',
+    'bookshelf_create_from_book_notification'    => 'S’ha convertit el llibre a prestatge',
     'bookshelf_update'                 => 'ha actualitzat el prestatge',
-    'bookshelf_update_notification'    => 'Prestatge actualitzat correctament',
-    'bookshelf_delete'                 => 'ha suprimit un prestatge',
-    'bookshelf_delete_notification'    => 'Prestatge suprimit correctament',
+    'bookshelf_update_notification'    => 'S’ha actualitzat el prestatge',
+    'bookshelf_delete'                 => 'ha suprimit el prestatge',
+    'bookshelf_delete_notification'    => 'S’ha suprimit el prestatge',
 
     // Revisions
     'revision_restore' => 'ha restaurat la revisió',
-    'revision_delete' => 'ha suprimit una revisió',
-    'revision_delete_notification' => 'Revisió suprimida correctament',
+    'revision_delete' => 'ha suprimit la revisió',
+    'revision_delete_notification' => 'S’ha suprimit la revisió',
 
     // Favourites
-    'favourite_add_notification' => 'S’ha afegit «:name» als vostres preferits',
-    'favourite_remove_notification' => 'S’ha suprimit «:name» dels vostres preferits',
+    'favourite_add_notification' => 'S’ha afegit &laquo;:name&raquo; als favorits.',
+    'favourite_remove_notification' => 'S’ha eliminat &laquo;:name&raquo; dels favorits.',
 
     // Watching
-    'watch_update_level_notification' => 'Preferències de seguiment actualitzades correctament',
+    'watch_update_level_notification' => 'S’han actualitzat les preferències de seguiment',
 
     // Auth
-    'auth_login' => 'ha iniciat la sessió',
+    'auth_login' => 'ha iniciat sessió',
     'auth_register' => 's’ha registrat com a usuari nou',
-    'auth_password_reset_request' => 'ha sol·licitat un restabliment de la contrasenya',
-    'auth_password_reset_update' => 'ha restablert la contrasenya de l’usuari',
-    'mfa_setup_method' => 'ha configurat un mètode d’autenticació de múltiple factor',
-    'mfa_setup_method_notification' => 'Mètode d’autenticació de múltiple factor configurat correctament',
-    'mfa_remove_method' => 'ha suprimit un mètode d’autenticació de múltiple factor',
-    'mfa_remove_method_notification' => 'Mètode d’autenticació de múltiple factor suprimit correctament',
+    'auth_password_reset_request' => 'ha sol·licitat la reinicialització de la contrasenya',
+    'auth_password_reset_update' => 'ha reinicialitzat la contrasenya',
+    'mfa_setup_method' => 'ha configurat un mètode d’autenticació multifactorial',
+    'mfa_setup_method_notification' => 'S’ha configurat un mètode d’autenticació multifactorial',
+    'mfa_remove_method' => 'ha eliminat un mètode d’autenticació multifactorial',
+    'mfa_remove_method_notification' => 'S’ha eliminat un mètode d’autenticació multifactorial',
 
     // Settings
     'settings_update' => 'ha actualitzat la configuració',
-    'settings_update_notification' => 'Configuració actualitzada correctament',
+    'settings_update_notification' => 'S’ha actualitzat la configuració',
     'maintenance_action_run' => 'ha executat una acció de manteniment',
 
     // Webhooks
     'webhook_create' => 'ha creat un webhook',
-    'webhook_create_notification' => 'Webhook creat correctament',
-    'webhook_update' => 'ha actualitzat un webhook',
-    'webhook_update_notification' => 'Webhook actualitzat correctament',
-    'webhook_delete' => 'ha suprimit un webhook',
-    'webhook_delete_notification' => 'Webhook suprimit correctament',
+    'webhook_create_notification' => 'S’ha creat el webhook',
+    'webhook_update' => 'ha actualitzat el webhook',
+    'webhook_update_notification' => 'S’ha actualitzat el webhook',
+    'webhook_delete' => 'ha suprimit el webhook',
+    'webhook_delete_notification' => 'S’ha suprimit el webhook',
 
     // Users
     'user_create' => 'ha creat l’usuari',
-    'user_create_notification' => 'Usuari creat correctament',
+    'user_create_notification' => 'S’ha creat l’usuari',
     'user_update' => 'ha actualitzat l’usuari',
-    'user_update_notification' => 'Usuari actualitzat correctament',
-    'user_delete' => 'ha suprimit un usuari',
-    'user_delete_notification' => 'Usuari suprimit correctament',
+    'user_update_notification' => 'S’ha actualitzat l’usuari',
+    'user_delete' => 'ha suprimit l’usuari',
+    'user_delete_notification' => 'S’ha suprimit l’usuari',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'Testimoni d’API creat correctament',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'Testimoni d’API actualitzat correctament',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'Testimoni d’API suprimit correctament',
+    'api_token_create' => 'ha creat el testimoni API',
+    'api_token_create_notification' => 'S’ha creat el testimoni API',
+    'api_token_update' => 'ha actualitzat el testimoni API',
+    'api_token_update_notification' => 'S’ha actualitzat el testimoni API',
+    'api_token_delete' => 'ha suprimit el testimoni API',
+    'api_token_delete_notification' => 'S’ha suprimit el testimoni API',
 
     // Roles
     'role_create' => 'ha creat el rol',
-    'role_create_notification' => 'Rol creat correctament',
+    'role_create_notification' => 'S’ha creat el rol',
     'role_update' => 'ha actualitzat el rol',
-    'role_update_notification' => 'Rol actualitzat correctament',
-    'role_delete' => 'ha suprimit un rol',
-    'role_delete_notification' => 'Rol suprimit correctament',
+    'role_update_notification' => 'S’ha actualitzat el rol',
+    'role_delete' => 'ha suprimit el rol',
+    'role_delete_notification' => 'S’ha suprimit el rol',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'ha buidat la paperera de reciclatge',
-    'recycle_bin_restore' => 'ha restaurat de la paperera de reciclatge',
-    'recycle_bin_destroy' => 'ha suprimit de la paperera de reciclatge',
+    'recycle_bin_empty' => 'ha buidat la paperera',
+    'recycle_bin_restore' => 'ha restaurat de la paperera',
+    'recycle_bin_destroy' => 'ha eliminat de la paperera',
 
     // Comments
     'commented_on'                => 'ha comentat a',
-    'comment_create'              => 'ha afegit el comentari',
-    'comment_update'              => 'ha actualitzat el comentari',
+    'comment_create'              => 'ha afegit un comentari',
+    'comment_update'              => 'ha actualitzat un comentari',
     'comment_delete'              => 'ha suprimit un comentari',
 
     // Other
diff --git a/lang/ca/auth.php b/lang/ca/auth.php
index c23fa43d474..ba6ede42f0c 100644
--- a/lang/ca/auth.php
+++ b/lang/ca/auth.php
@@ -6,112 +6,112 @@
  */
 return [
 
-    'failed' => 'Les credencials no coincideixen amb les que hi ha emmagatzemades.',
-    'throttle' => 'Massa intents d’inici de sessió. Torneu-ho a provar d’aquí a :seconds segons.',
+    'failed' => 'Aquestes credencials no existeixen al nostre registre.',
+    'throttle' => 'Massa intents d’inici de sessió. Torneu-ho a provar d’aquí :seconds segons.',
 
     // Login & Register
-    'sign_up' => 'Registra-m’hi',
-    'log_in' => 'Inicia la sessió',
-    'log_in_with' => 'Inicia la sessió amb :socialDriver',
-    'sign_up_with' => 'Registra-m’hi amb :socialDriver',
+    'sign_up' => 'Registreu-vos',
+    'log_in' => 'Inicia sessió',
+    'log_in_with' => 'Inicia sessió amb :socialDriver',
+    'sign_up_with' => 'Registreu-vos amb :socialDriver',
     'logout' => 'Tanca la sessió',
 
     'name' => 'Nom',
     'username' => 'Nom d’usuari',
-    'email' => 'Adreça electrònica',
+    'email' => 'Correu electrònic',
     'password' => 'Contrasenya',
     'password_confirm' => 'Confirmeu la contrasenya',
-    'password_hint' => 'Cal que tingui un mínim de 8 caràcters',
+    'password_hint' => 'Ha de tenir almenys 8 caràcters',
     'forgot_password' => 'Heu oblidat la contrasenya?',
     'remember_me' => 'Recorda’m',
-    'ldap_email_hint' => 'Introduïu una adreça electrònica per a aquest compte.',
-    'create_account' => 'Crea el compte',
+    'ldap_email_hint' => 'Introduïu un correu electrònic per al compte.',
+    'create_account' => 'Creeu un compte',
     'already_have_account' => 'Ja teniu un compte?',
     'dont_have_account' => 'No teniu cap compte?',
-    'social_login' => 'Inici de sessió amb xarxes socials',
-    'social_registration' => 'Registre amb xarxes socials',
-    'social_registration_text' => 'Registreu-vos i inicieu la sessió fent servir un altre servei.',
+    'social_login' => 'Inici de sessió amb una xarxa social',
+    'social_registration' => 'Registre amb una xarxa social',
+    'social_registration_text' => 'Registreu-vos i inicieu sessió amb un altre servei.',
 
-    'register_thanks' => 'Gràcies per registrar-vos!',
-    'register_confirm' => 'Reviseu el vostre correu electrònic i feu clic al botó de confirmació per a accedir a :appName.',
-    'registrations_disabled' => 'Actualment, els registres estan desactivats',
-    'registration_email_domain_invalid' => 'Aquest domini de correu electrònic no té accés a aquesta aplicació',
-    'register_success' => 'Gràcies per registrar-vos! Ja us hi heu registrat i heu iniciat la sessió.',
+    'register_thanks' => 'Gràcies per registrar-vos.',
+    'register_confirm' => 'Comproveu el correu electrònic i cliqueu el botó de confirmació per a accedir a :appName.',
+    'registrations_disabled' => 'Els registres estan desactivats',
+    'registration_email_domain_invalid' => 'Aquest domini de correu electrònic no té accés a l’aplicació.',
+    'register_success' => 'Gràcies per registrar-vos Us heu registrat i heu iniciat sessió.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'S’està provant d’iniciar la sessió',
-    'auto_init_starting_desc' => 'Estem contactant amb el vostre sistema d’autenticació per a començar el procés d’inici de sessió. Si no hi ha cap progrés d’aquí a 5 segons, proveu de fer clic a l’enllaç de sota.',
-    'auto_init_start_link' => 'Continua amb l’autenticació',
+    'auto_init_starting' => 'S’està provant d’iniciar sessió',
+    'auto_init_starting_desc' => 'Estem contactant amb el vostre sistema d’autenticació per a començar el procés d’inici sessió. Si d’aquí 5 segons no hi ha hagut cap progrés proveu de clicar l’enllaç.',
+    'auto_init_start_link' => 'Continua amb la l’autenticació',
 
     // Password Reset
-    'reset_password' => 'Restableix la contrasenya',
-    'reset_password_send_instructions' => 'Introduïu la vostra adreça electrònica a continuació i us enviarem un correu electrònic amb un enllaç per a restablir la contrasenya.',
-    'reset_password_send_button' => 'Envia l’enllaç de restabliment',
-    'reset_password_sent' => 'S’enviarà un enllaç per a restablir la contrasenya a :email, si es troba aquesta adreça al sistema.',
-    'reset_password_success' => 'La contrasenya s’ha restablert correctament.',
-    'email_reset_subject' => 'Restabliu la contrasenya a :appName',
-    'email_reset_text' => 'Rebeu aquest correu electrònic perquè s’ha fet una petició de restabliment de contrasenya per al vostre compte.',
-    'email_reset_not_requested' => 'Si no heu demanat restablir la contrasenya, no cal que emprengueu cap acció.',
+    'reset_password' => 'Reinicialitza la contrasenya',
+    'reset_password_send_instructions' => 'Introduïu la vostra adreça electrònica i us enviarem un correu electrònic amb un enllaç de reinicialització de la contrasenya.',
+    'reset_password_send_button' => 'Envia’m un enllaç de reinicialització',
+    'reset_password_sent' => 'Si l’adreça electrònica :email existeix al sistema, us hi enviarem un enllaç de reinicialització de contrasenya.',
+    'reset_password_success' => 'S’ha reinicialitzat la contrasenya.',
+    'email_reset_subject' => 'Reinicialització de la contrasenya de :appName',
+    'email_reset_text' => 'Heu rebut aquest correu electrònic perquè hem rebut una sol·licitud de reinicialització de contrasenya per al vostre compte.',
+    'email_reset_not_requested' => 'Si no heu sol·licitat la reinicialització de la contrasenya, no cal que feu res més.',
 
     // Email Confirmation
-    'email_confirm_subject' => 'Confirmeu la vostra adreça electrònica a :appName',
-    'email_confirm_greeting' => 'Gràcies per unir-vos a :appName!',
-    'email_confirm_text' => 'Confirmeu la vostra adreça electrònica fent clic al botó a continuació:',
-    'email_confirm_action' => 'Confirma el correu',
-    'email_confirm_send_error' => 'Cal confirmar l’adreça electrònica, però el sistema no ha pogut enviar el correu electrònic. Poseu-vos en contacte amb l’administrador perquè s’asseguri que el correu electrònic està ben configurat.',
-    'email_confirm_success' => 'Heu confirmat el vostre correu electrònic! Ara hauríeu de poder iniciar la sessió fent servir aquesta adreça electrònica.',
-    'email_confirm_resent' => 'S’ha tornat a enviar el correu electrònic de confirmació. Reviseu la vostra safata d’entrada.',
-    'email_confirm_thanks' => 'Gràcies per la confirmació!',
-    'email_confirm_thanks_desc' => 'Espereu uns instants mentre gestionem la confirmació. Si no se us redirigeix d’aquí a 3 segons, premeu l’enllaç «Continua» de sota per a continuar.',
+    'email_confirm_subject' => 'Confirmeu l’adreça electrònica de :appName',
+    'email_confirm_greeting' => 'Gràcies per registrar-vos a :appName!',
+    'email_confirm_text' => 'Cliqueu el botó per a confirmar l’adreça electrònica:',
+    'email_confirm_action' => 'Confirmeu d’adreça electrònica',
+    'email_confirm_send_error' => 'S’ha de confirmar de l’adreça electrònica però no s’ha pogut enviar el correu de confirmació. Contacteu l’administrador per a assegurar-vos que el correu està ben configurat.',
+    'email_confirm_success' => 'S’ha confirmat el correu electrònic. Ara hauríeu de poder iniciar sessió amb aquesta adreça electrònica.',
+    'email_confirm_resent' => 'S’ha enviat el correu de confirmació. Comproveu la safata d’entrada.',
+    'email_confirm_thanks' => 'Gràcies per la confirmació.',
+    'email_confirm_thanks_desc' => 'Espereu-vos un moment mentre es gestiona la confirmació. Si d’aquí 3 segons no se us ha redirigit, cliqueu l’enllaç &laquo;Continua&raquo; per a continuar.',
 
-    'email_not_confirmed' => 'Adreça electrònica no confirmada',
-    'email_not_confirmed_text' => 'La vostra adreça electrònica encara no està confirmada.',
-    'email_not_confirmed_click_link' => 'Feu clic a l’enllaç del correu electrònic que us vam enviar poc després que us registréssiu.',
-    'email_not_confirmed_resend' => 'Si no el trobeu, podeu tornar a enviar el correu electrònic de confirmació enviant el formulari a continuació.',
+    'email_not_confirmed' => 'No s’ha confirmat l’adreça de correu electrònic',
+    'email_not_confirmed_text' => 'Encara no heu confirmat l’adreça electrònica.',
+    'email_not_confirmed_click_link' => 'Cliqueu l’enllaç que hi ha al correu electrònic que se us va enviar en registrar-vos.',
+    'email_not_confirmed_resend' => 'Si no trobeu el correu electrònic ompliu el formulari a continuació i us n’enviarem un altre.',
     'email_not_confirmed_resend_button' => 'Torna a enviar el correu de confirmació',
 
     // User Invite
-    'user_invite_email_subject' => 'Us han convidat a unir-vos a :appName!',
-    'user_invite_email_greeting' => 'S’ha creat un compte en el vostre nom a :appName.',
-    'user_invite_email_text' => 'Feu clic al botó a continuació per a definir una contrasenya per al compte i obtenir-hi accés:',
-    'user_invite_email_action' => 'Defineix una contrasenya per al compte',
+    'user_invite_email_subject' => 'Us han convidat a utilitzar :appName!',
+    'user_invite_email_greeting' => 'Us han creat un compte a :appName.',
+    'user_invite_email_text' => 'Cliqueu el botó per a configurar una contrasenya pel compte i poder-hi accedir:',
+    'user_invite_email_action' => 'Configura la contrasenya del compte',
     'user_invite_page_welcome' => 'Us donem la benvinguda a :appName!',
-    'user_invite_page_text' => 'Per a enllestir el vostre compte i obtenir-hi accés, cal que definiu una contrasenya, que es farà servir per a iniciar la sessió a :appName en futures visites.',
+    'user_invite_page_text' => 'Per a poder accedir al compte heu de configurar una contrasenya que s’utilitzarà per a iniciar sessió a :appName d’ara endavant.',
     'user_invite_page_confirm_button' => 'Confirma la contrasenya',
-    'user_invite_success_login' => 'S’ha definit la contrasenya. Ara hauríeu de poder iniciar la sessió fent servir la contrasenya que heu definit per a accedir a :appName!',
+    'user_invite_success_login' => 'S’ha configurat la contrasenya. Ara hauríeu de poder iniciar sessió a :appName amb la contrasenya configurada.',
 
     // Multi-factor Authentication
-    'mfa_setup' => 'Configura l’autenticació de múltiple factor',
-    'mfa_setup_desc' => 'Configureu l’autenticació de múltiple factor com a capa extra de seguretat en el vostre compte d’usuari.',
-    'mfa_setup_configured' => 'Ja està configurada',
+    'mfa_setup' => 'Configuració de l’autenticació multifactorial',
+    'mfa_setup_desc' => 'Configureu l’autenticació multifactorial per a afegir una capa de seguretat extra al vostre compte d’usuari.',
+    'mfa_setup_configured' => 'Ja està configurat',
     'mfa_setup_reconfigure' => 'Torna-la a configurar',
-    'mfa_setup_remove_confirmation' => 'Segur que voleu suprimir aquest mètode d’autenticació de múltiple factor?',
+    'mfa_setup_remove_confirmation' => 'Esteu segur que voleu eliminar aquest mètode d’autenticació multifactorial?',
     'mfa_setup_action' => 'Configura',
-    'mfa_backup_codes_usage_limit_warning' => 'Teniu menys de 5 codis de seguretat restants. Genereu-ne i emmagatzemeu-ne un nou conjunt abans que se us acabin perquè no perdeu l’accés al vostre compte.',
+    'mfa_backup_codes_usage_limit_warning' => 'Us queden menys de 5 codis de suport. Genereu-ne de nous i deseu-los abans de quedar-vos-en sense per a evitar perdre l’accés al  compte.',
     'mfa_option_totp_title' => 'Aplicació mòbil',
-    'mfa_option_totp_desc' => 'Per a fer servir l’autenticació de múltiple factor us caldrà una aplicació mòbil que suporti TOTP, com ara Google Authenticador, Authy o Microsoft Authenticator.',
-    'mfa_option_backup_codes_title' => 'Codis de seguretat',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_totp_desc' => 'Per a utilitzar l’autenticació multifactorial heu de tenir una aplicació que sigui compatible amb TOPT (contrasenyes d’un sol ús basades en el temps) com ara Google Authenticator, Authy, o Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Codis de suport',
+    'mfa_option_backup_codes_desc' => 'Genereu un joc de codis de suport d’un sol ús que haureu d’introduir per a verificar la vostra identitat. Assegureu-vos de desar-los en un lloc segur.',
     'mfa_gen_confirm_and_enable' => 'Confirma i activa',
-    'mfa_gen_backup_codes_title' => 'Configuració de codis de seguretat',
-    'mfa_gen_backup_codes_desc' => 'Deseu la següent llista de codis en un lloc segur. Quan accediu al sistema, podeu fer servir un dels codis com a segon mètode d’autenticació.',
+    'mfa_gen_backup_codes_title' => 'Configuració dels codis de suport',
+    'mfa_gen_backup_codes_desc' => 'Deseu els codis en un lloc segur. Podreu utilitzar un dels codis com a un altre mètode d’autenticació per a iniciar sessió.',
     'mfa_gen_backup_codes_download' => 'Baixa els codis',
-    'mfa_gen_backup_codes_usage_warning' => 'Cada codi es pot fer servir només una vegada',
+    'mfa_gen_backup_codes_usage_warning' => 'Només podeu utilitzar cada codi un sol cop.',
     'mfa_gen_totp_title' => 'Configuració de l’aplicació mòbil',
-    'mfa_gen_totp_desc' => 'Per a fer servir l’autenticació de múltiple factor us caldrà una aplicació mòbil que suporti TOTP, com ara Google Authenticador, Authy o Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Per a començar, escanegeu el codi QR següent fent servir la vostre aplicació d’autenticació preferida.',
-    'mfa_gen_totp_verify_setup' => 'Verifica la configuració',
-    'mfa_gen_totp_verify_setup_desc' => 'Verifiqueu que tot funciona introduint un codi, generat amb l’aplicació d’autenticació, a la capsa de text següent:',
-    'mfa_gen_totp_provide_code_here' => 'Proporcioneu aquí el codi generat per l’aplicació',
+    'mfa_gen_totp_desc' => 'Per a utilitzar l’autenticació multifactorial heu de tenir una aplicació que sigui compatible amb TOPT (contrasenyes d’un sol ús basades en el temps) com ara Google Authenticator, Authy, o Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Escanegeu el codi QR amb l’aplicació d’autenticació que preferiu per a començar.',
+    'mfa_gen_totp_verify_setup' => 'Verificació de la configuració',
+    'mfa_gen_totp_verify_setup_desc' => 'Introduïu un dels codis generats per l’aplicació d’autenticació per a verificar que tot funciona:',
+    'mfa_gen_totp_provide_code_here' => 'Codi',
     'mfa_verify_access' => 'Verifica l’accés',
-    'mfa_verify_access_desc' => 'El vostre compte d’usuari requereix que confirmeu la vostra identitat amb un nivell addicional de verificació abans que pugueu obtenir-hi accés. Verifiqueu-la fent servir un dels vostres mètodes configurats per a continuar.',
+    'mfa_verify_access_desc' => 'Heu de verificar la vostra identitat amb un nivell de verificació addicional per a iniciar sessió. Verifiqueu-la amb un dels mètodes que heu configurat per a continuar.',
     'mfa_verify_no_methods' => 'No hi ha cap mètode configurat',
-    'mfa_verify_no_methods_desc' => 'No s’ha trobat cap mètode d’autenticació de múltiple factor al vostre compte. Cal que configureu almenys un mètode abans d’obtenir-hi accés.',
-    'mfa_verify_use_totp' => 'Verifica fent servir una aplicació mòbil',
-    'mfa_verify_use_backup_codes' => 'Verifica fent servir un codi de seguretat',
-    'mfa_verify_backup_code' => 'Codi de seguretat',
-    'mfa_verify_backup_code_desc' => 'Introduïu un dels vostres codis de seguretat restants a continuació:',
-    'mfa_verify_backup_code_enter_here' => 'Introduïu aquí el codi de seguretat',
-    'mfa_verify_totp_desc' => 'Introduïu el codi generat amb la vostra aplicació mòbil a continuació:',
-    'mfa_setup_login_notification' => 'S’ha configurat el mètode d’autenticació de múltiple factor. Torneu a iniciar la sessió fent servir el mètode que heu configurat.',
+    'mfa_verify_no_methods_desc' => 'No hi ha cap mètode d’autenticació multifactorial configurat al vostre compte. Heu de configurar com a mínim un mètode per a iniciar sessió.',
+    'mfa_verify_use_totp' => 'Verificació amb una aplicació mòbil',
+    'mfa_verify_use_backup_codes' => 'Verificació amb un codi de suport',
+    'mfa_verify_backup_code' => 'Codi de suport',
+    'mfa_verify_backup_code_desc' => 'Introduïu un dels codis de suport que us quedin:',
+    'mfa_verify_backup_code_enter_here' => 'Codi:',
+    'mfa_verify_totp_desc' => 'Introduïu el codi generat per l’aplicació mòbil:',
+    'mfa_setup_login_notification' => 'S’ha configurat el mètode multifactorial. Torneu a iniciar sessió amb el mètode configurat.',
 ];
diff --git a/lang/ca/common.php b/lang/ca/common.php
index f6a825b69fe..34203e600f9 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -7,8 +7,8 @@
     // Buttons
     'cancel' => 'Cancel·la',
     'close' => 'Tanca',
-    'confirm' => 'D’acord',
-    'back' => 'Enrere',
+    'confirm' => 'Confirma',
+    'back' => 'Torna',
     'save' => 'Desa',
     'continue' => 'Continua',
     'select' => 'Selecciona',
@@ -18,14 +18,14 @@
     // Form Labels
     'name' => 'Nom',
     'description' => 'Descripció',
-    'role' => 'Rol',
-    'cover_image' => 'Imatge de portada',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'role' => 'Funció',
+    'cover_image' => 'Imatge de coberta',
+    'cover_image_description' => 'La imatge ha de ser d’uns 440×250px, però quan calgui se n’ajustarà la mida o s’escapçarà per a adaptar-la a la interfície d’usuari i les mides amb què es mostrarà canviaran.',
 
     // Actions
     'actions' => 'Accions',
-    'view' => 'Visualitza',
-    'view_all' => 'Visualitza-ho tot',
+    'view' => 'Mostra',
+    'view_all' => 'Mostra-ho tot',
     'new' => 'Nou',
     'create' => 'Crea',
     'update' => 'Actualitza',
@@ -44,10 +44,10 @@
     'configure' => 'Configura',
     'manage' => 'Gestiona',
     'fullscreen' => 'Pantalla completa',
-    'favourite' => 'Afegeix a preferits',
-    'unfavourite' => 'Suprimeix de preferits',
-    'next' => 'Següent',
-    'previous' => 'Anterior',
+    'favourite' => 'Afegeix als favorits',
+    'unfavourite' => 'Suprimeix dels favorits',
+    'next' => 'Endavant',
+    'previous' => 'Endarrere',
     'filter_active' => 'Filtre actiu:',
     'filter_clear' => 'Esborra el filtre',
     'download' => 'Baixa',
@@ -56,26 +56,26 @@
 
     // Sort Options
     'sort_options' => 'Opcions d’ordenació',
-    'sort_direction_toggle' => 'Commuta la direcció de l’ordenació',
-    'sort_ascending' => 'Ordre ascendent',
-    'sort_descending' => 'Ordre descendent',
+    'sort_direction_toggle' => 'Inverteix l’ordre',
+    'sort_ascending' => 'Ordenació ascendent',
+    'sort_descending' => 'Ordenació descendent',
     'sort_name' => 'Nom',
-    'sort_default' => 'Per defecte',
+    'sort_default' => 'Predeterminat',
     'sort_created_at' => 'Data de creació',
     'sort_updated_at' => 'Data d’actualització',
 
     // Misc
     'deleted_user' => 'Usuari suprimit',
-    'no_activity' => 'No hi ha activitat',
-    'no_items' => 'No hi ha cap element',
-    'back_to_top' => 'Torna a dalt',
-    'skip_to_main_content' => 'Vés al contingut',
+    'no_activity' => 'No hi ha cap activitat per mostrar',
+    'no_items' => 'No hi ha cap element disponible',
+    'back_to_top' => 'Amunt',
+    'skip_to_main_content' => 'Ves al contingut principal',
     'toggle_details' => 'Commuta els detalls',
     'toggle_thumbnails' => 'Commuta les miniatures',
     'details' => 'Detalls',
     'grid_view' => 'Visualització en graella',
     'list_view' => 'Visualització en llista',
-    'default' => 'Per defecte',
+    'default' => 'Predeterminat',
     'breadcrumb' => 'Ruta de navegació',
     'status' => 'Estat',
     'status_active' => 'Actiu',
@@ -84,8 +84,8 @@
     'none' => 'Cap',
 
     // Header
-    'homepage' => 'Pàgina principal',
-    'header_menu_expand' => 'Expandeix el menú de la capçalera',
+    'homepage' => 'Pàgina d’inici',
+    'header_menu_expand' => 'Desplega el menú de la capçalera',
     'profile_menu' => 'Menú del perfil',
     'view_profile' => 'Mostra el perfil',
     'edit_profile' => 'Edita el perfil',
@@ -100,7 +100,7 @@
     'tab_content_label' => 'Pestanya: Mostra el contingut principal',
 
     // Email Content
-    'email_action_help' => 'Si teniu problemes per a fer clic al botó «:actionText», copieu i enganxeu l’URL següent al vostre navegador web:',
+    'email_action_help' => 'Si el botó &laquo;:actionText&raquo; no funciona, copieu i enganxeu l’URL següent al vostre navegador:',
     'email_rights' => 'Tots els drets reservats',
 
     // Footer Link Options
diff --git a/lang/ca/components.php b/lang/ca/components.php
index 9c34850213d..c1494ec53a9 100644
--- a/lang/ca/components.php
+++ b/lang/ca/components.php
@@ -9,37 +9,37 @@
     'image_list' => 'Llista d’imatges',
     'image_details' => 'Detalls de la imatge',
     'image_upload' => 'Puja una imatge',
-    'image_intro' => 'Aquí podeu seleccionar i gestionar imatges que s’hagin pujat anteriorment al sistema.',
-    'image_intro_upload' => 'Pugeu una imatge nova arrossegant un fitxer d’imatge a aquesta finestra o fent servir el botó de «Puja una imatge».',
+    'image_intro' => 'Seleccioneu i gestioneu les imatges que s’han pujat al sistema amb anterioritat.',
+    'image_intro_upload' => 'Pugeu una imatge arrossegant-la i deixant-la anar en aquesta finestra o amb el botó &laquo;Puja una imatge&raquo;.',
     'image_all' => 'Totes',
     'image_all_title' => 'Mostra totes les imatges',
-    'image_book_title' => 'Mostra les imatges pujades a aquest llibre',
-    'image_page_title' => 'Mostra les imatges pujades a aquesta pàgina',
-    'image_search_hint' => 'Cerca per nom d’imatge',
-    'image_uploaded' => 'Pujada :uploadedDate',
+    'image_book_title' => 'Mostra les imatges pujades en aquest llibre',
+    'image_page_title' => 'Mostra les imatges pujades en aquesta pàgina',
+    'image_search_hint' => 'Cerca pel nom de la imatge',
+    'image_uploaded' => 'Pujada el :uploadedDate',
     'image_uploaded_by' => 'Pujada per :userName',
     'image_uploaded_to' => 'Pujada a :pageLink',
-    'image_updated' => 'Actualitzada :updateDate',
+    'image_updated' => 'Actualitzada el :updateDate',
     'image_load_more' => 'Carrega’n més',
     'image_image_name' => 'Nom de la imatge',
-    'image_delete_used' => 'Aquesta imatge s’utilitza a les pàgines següents.',
-    'image_delete_confirm_text' => 'Segur que voleu suprimir aquesta imatge?',
-    'image_select_image' => 'Selecciona una imatge',
-    'image_dropzone' => 'Arrossegueu imatges o feu clic aquí per a pujar-les',
-    'image_dropzone_drop' => 'Arrossegueu imatges aquí per a pujar-les',
+    'image_delete_used' => 'Aquesta imatge s’utilitza en les pàgines següents.',
+    'image_delete_confirm_text' => 'Esteu segur que voleu suprimir aquesta imatge?',
+    'image_select_image' => 'Selecció d’imatges',
+    'image_dropzone' => 'Deixeu-hi anar les imatges o cliqueu aquí per a pujar-ne',
+    'image_dropzone_drop' => 'Deixeu-hi anar les imatges per a pujar-les',
     'images_deleted' => 'Imatges suprimides',
     'image_preview' => 'Previsualització de la imatge',
-    'image_upload_success' => 'Imatge pujada correctament',
-    'image_update_success' => 'Detalls de la imatge actualitzats correctament',
-    'image_delete_success' => 'Imatge suprimida correctament',
+    'image_upload_success' => 'S’ha pujat la imatge',
+    'image_update_success' => 'S’han actualitzat els detalls de la imatge',
+    'image_delete_success' => 'S’ha suprimit la imatge',
     'image_replace' => 'Substitueix la imatge',
-    'image_replace_success' => 'Fitxer de la imatge actualitzat correctament',
+    'image_replace_success' => 'S’ha substituït la imatge',
     'image_rebuild_thumbs' => 'Regenera les variacions de mida',
-    'image_rebuild_thumbs_success' => 'Variacions de mida de la imatge regenerades correctament!',
+    'image_rebuild_thumbs_success' => 'S’han regenerat les variacions de mida',
 
     // Code Editor
     'code_editor' => 'Edita el codi',
-    'code_language' => 'Llenguatge del codi',
+    'code_language' => 'Llenguatge de codificació',
     'code_content' => 'Contingut del codi',
     'code_session_history' => 'Historial de la sessió',
     'code_save' => 'Desa el codi',
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index abfa771a80f..7a09986a2f2 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -18,27 +18,27 @@
     'left' => 'Esquerra',
     'center' => 'Centre',
     'right' => 'Dreta',
-    'top' => 'Superior',
-    'middle' => 'Centre',
-    'bottom' => 'Inferior',
+    'top' => 'Dalt',
+    'middle' => 'Mig',
+    'bottom' => 'Baix',
     'width' => 'Amplada',
-    'height' => 'Alçada',
+    'height' => 'Altura',
     'More' => 'Més',
-    'select' => 'Selecciona...',
+    'select' => 'Selecciona…',
 
     // Toolbar
     'formats' => 'Formats',
-    'header_large' => 'Capçalera grossa',
-    'header_medium' => 'Capçalera mitjana',
-    'header_small' => 'Capçalera petita',
-    'header_tiny' => 'Capçalera minúscula',
+    'header_large' => 'Títol gros',
+    'header_medium' => 'Títol mitjà',
+    'header_small' => 'Títol petit',
+    'header_tiny' => 'Títol minúscul',
     'paragraph' => 'Paràgraf',
-    'blockquote' => 'Citació',
-    'inline_code' => 'Codi en línia',
-    'callouts' => 'Llegendes',
+    'blockquote' => 'Bloc de cita',
+    'inline_code' => 'Línia de codi',
+    'callouts' => 'Crides',
     'callout_information' => 'Informació',
     'callout_success' => 'Èxit',
-    'callout_warning' => 'Advertència',
+    'callout_warning' => 'Advertiment',
     'callout_danger' => 'Perill',
     'bold' => 'Negreta',
     'italic' => 'Cursiva',
@@ -48,30 +48,30 @@
     'subscript' => 'Subíndex',
     'text_color' => 'Color del text',
     'custom_color' => 'Color personalitzat',
-    'remove_color' => 'Suprimeix el color',
+    'remove_color' => 'Elimina el color',
     'background_color' => 'Color de fons',
     'align_left' => 'Alinea a l’esquerra',
     'align_center' => 'Alinea al centre',
     'align_right' => 'Alinea a la dreta',
     'align_justify' => 'Justifica',
-    'list_bullet' => 'Llista amb pics',
+    'list_bullet' => 'Llista de pics',
     'list_numbered' => 'Llista numerada',
-    'list_task' => 'Llista de tasques',
-    'indent_increase' => 'Augmenta el sagnat',
-    'indent_decrease' => 'Redueix el sagnat',
+    'list_task' => 'Llista de caselles',
+    'indent_increase' => 'Augmenta la sagnia',
+    'indent_decrease' => 'Redueix la sagnia',
     'table' => 'Taula',
     'insert_image' => 'Insereix una imatge',
-    'insert_image_title' => 'Insereix/edita una imatge',
-    'insert_link' => 'Insereix/edita un enllaç',
-    'insert_link_title' => 'Insereix/edita un enllaç',
+    'insert_image_title' => 'Insereix o edita una imatge',
+    'insert_link' => 'Insereix un enllaç',
+    'insert_link_title' => 'Insereix o edita un enllaç',
     'insert_horizontal_line' => 'Insereix una línia horitzontal',
     'insert_code_block' => 'Insereix un bloc de codi',
-    'edit_code_block' => 'Edita un bloc de codi',
-    'insert_drawing' => 'Insereix/edita un dibuix',
-    'drawing_manager' => 'Gestor de dibuixos',
-    'insert_media' => 'Insereix/edita un mitjà',
-    'insert_media_title' => 'Insereix/edita un mitjà',
-    'clear_formatting' => 'Neteja el format',
+    'edit_code_block' => 'Edita el bloc de codi',
+    'insert_drawing' => 'Insereix o edita un diagrama',
+    'drawing_manager' => 'Gestor de diagrames',
+    'insert_media' => 'Insereix o edita un contingut multimèdia',
+    'insert_media_title' => 'Insereix o edita un contingut multimèdia',
+    'clear_formatting' => 'Lleva el format',
     'source_code' => 'Codi font',
     'source_code_title' => 'Codi font',
     'fullscreen' => 'Pantalla completa',
@@ -81,9 +81,9 @@
     'table_properties' => 'Propietats de la taula',
     'table_properties_title' => 'Propietats de la taula',
     'delete_table' => 'Suprimeix la taula',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Lleva el format de la taula',
+    'resize_to_contents' => 'Ajusta al contingut',
+    'row_header' => 'Capçalera de la fila',
     'insert_row_before' => 'Insereix una fila abans',
     'insert_row_after' => 'Insereix una fila després',
     'delete_row' => 'Suprimeix la fila',
@@ -97,10 +97,10 @@
     'cell_properties_title' => 'Propietats de la cel·la',
     'cell_type' => 'Tipus de cel·la',
     'cell_type_cell' => 'Cel·la',
-    'cell_scope' => 'Àmbit',
+    'cell_scope' => 'Àmbit de la cel·la',
     'cell_type_header' => 'Cel·la de capçalera',
-    'merge_cells' => 'Fusiona les cel·les',
-    'split_cell' => 'Divideix les cel·les',
+    'merge_cells' => 'Combina les cel·les',
+    'split_cell' => 'Divideix la cel·la',
     'table_row_group' => 'Grup de files',
     'table_column_group' => 'Grup de columnes',
     'horizontal_align' => 'Alineació horitzontal',
@@ -117,61 +117,61 @@
     'row_type' => 'Tipus de fila',
     'row_type_header' => 'Capçalera',
     'row_type_body' => 'Cos',
-    'row_type_footer' => 'Peu de pàgina',
+    'row_type_footer' => 'Peu',
     'alignment' => 'Alineació',
     'cut_column' => 'Retalla la columna',
     'copy_column' => 'Copia la columna',
     'paste_column_before' => 'Enganxa la columna abans',
     'paste_column_after' => 'Enganxa la columna després',
-    'cell_padding' => 'Separació de la cel·la',
-    'cell_spacing' => 'Espaiat de la cel·la',
-    'caption' => 'Títol',
-    'show_caption' => 'Mostra el títol',
+    'cell_padding' => 'Separació de cel·la',
+    'cell_spacing' => 'Espaiat de cel·la',
+    'caption' => 'Llegenda',
+    'show_caption' => 'Mostra la llegenda',
     'constrain' => 'Mantén les proporcions',
     'cell_border_solid' => 'Sòlida',
-    'cell_border_dotted' => 'Puntejada',
-    'cell_border_dashed' => 'Discontínua',
+    'cell_border_dotted' => 'De punts',
+    'cell_border_dashed' => 'De guions',
     'cell_border_double' => 'Doble',
-    'cell_border_groove' => 'Bisellada',
-    'cell_border_ridge' => 'Emmarcada',
-    'cell_border_inset' => 'Enfonsada',
-    'cell_border_outset' => 'Ressaltada',
-    'cell_border_none' => 'Cap',
-    'cell_border_hidden' => 'Oculta',
+    'cell_border_groove' => 'Vora enfonsada',
+    'cell_border_ridge' => 'Vora ressaltada',
+    'cell_border_inset' => 'Fons enfonsat',
+    'cell_border_outset' => 'Fons ressaltat',
+    'cell_border_none' => 'Sense vora',
+    'cell_border_hidden' => 'Amagada',
 
     // Images, links, details/summary & embed
-    'source' => 'Origen',
+    'source' => 'Font',
     'alt_desc' => 'Descripció alternativa',
-    'embed' => 'Incrustació',
-    'paste_embed' => 'Enganxeu el codi d’incrustació a continuació:',
+    'embed' => 'Incrusta',
+    'paste_embed' => 'Enganxa el codi per a incrustar a sota:',
     'url' => 'URL',
-    'text_to_display' => 'Text a mostrar',
+    'text_to_display' => 'Text per a mostrar',
     'title' => 'Títol',
     'open_link' => 'Obre l’enllaç',
-    'open_link_in' => 'Obre l’enllaç a...',
-    'open_link_current' => 'Finestra actual',
-    'open_link_new' => 'Finestra nova',
-    'remove_link' => 'Suprimeix l’enllaç',
-    'insert_collapsible' => 'Insereix un bloc contraïble',
-    'collapsible_unwrap' => 'Deixa de contraure',
+    'open_link_in' => 'Obre l’enllaç…',
+    'open_link_current' => 'A la finestra actual',
+    'open_link_new' => 'En una finestra nova',
+    'remove_link' => 'Lleva l’enllaç',
+    'insert_collapsible' => 'Insereix un bloc desplegable',
+    'collapsible_unwrap' => 'Lleva el bloc desplegable',
     'edit_label' => 'Edita l’etiqueta',
-    'toggle_open_closed' => 'Obre/tanca',
-    'collapsible_edit' => 'Edita el bloc contraïble',
+    'toggle_open_closed' => 'Obre o tanca',
+    'collapsible_edit' => 'Edita el bloc desplegable',
     'toggle_label' => 'Commuta l’etiqueta',
 
     // About view
-    'about' => 'Quant a l’editor',
-    'about_title' => 'Quant a l’editor WYSIWYG',
-    'editor_license' => 'Llicència i copyright de l’editor',
-    'editor_tiny_license' => 'Aquest editor s’ha construït amb :tinyLink, que es proporciona sota la llicència MIT.',
-    'editor_tiny_license_link' => 'Podeu trobar els detalls de la llicència i el copyright del TinyMCE aquí.',
+    'about' => 'Quant a l’Editor',
+    'about_title' => 'Quant a l’Editor WYSIWYG',
+    'editor_license' => 'Llicència i copyright de l’Editor',
+    'editor_tiny_license' => 'Aquest editor s’ha creat amb :tinyLink que es proporciona amb la llicència MIT.',
+    'editor_tiny_license_link' => 'Detalls de la llicència i el copyright de TinyMCE.',
     'save_continue' => 'Desa la pàgina i continua',
-    'callouts_cycle' => '(Continueu prement per a commutar els diferents tipus)',
-    'link_selector' => 'Enllaç al contingut',
-    'shortcuts' => 'Dreceres',
+    'callouts_cycle' => '(Continueu prement per a canviar entre tipus)',
+    'link_selector' => 'Enllaç a contingut',
+    'shortcuts' => 'Dreceres de teclat',
     'shortcut' => 'Drecera',
-    'shortcuts_intro' => 'Hi ha les següents dreceres disponibles a l’editor:',
-    'windows_linux' => '(Windows/Linux)',
+    'shortcuts_intro' => 'A l’editor, hi ha disponibles les dreceres de teclat següents:',
+    'windows_linux' => '(Windows o Linux)',
     'mac' => '(Mac)',
     'description' => 'Descripció',
 ];
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index ba8f574edd1..b6e104fa4f7 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -6,34 +6,34 @@
 return [
 
     // Shared
-    'recently_created' => 'Creat fa poc',
-    'recently_created_pages' => 'Pàgines creades fa poc',
-    'recently_updated_pages' => 'Pàgines actualitzades fa poc',
-    'recently_created_chapters' => 'Capítols creats fa poc',
-    'recently_created_books' => 'Llibres creats fa poc',
-    'recently_created_shelves' => 'Prestatges creats fa poc',
-    'recently_update' => 'Actualitzat fa poc',
-    'recently_viewed' => 'Vist fa poc',
+    'recently_created' => 'Elements creats recentment',
+    'recently_created_pages' => 'Pàgines creades recentment',
+    'recently_updated_pages' => 'Pàgines actualitzades recentment',
+    'recently_created_chapters' => 'Capítols creats recentment',
+    'recently_created_books' => 'Llibres creats recentment',
+    'recently_created_shelves' => 'Prestatges creats recentment',
+    'recently_update' => 'Elements actualitzats recentment',
+    'recently_viewed' => 'Elements vistos recentment',
     'recent_activity' => 'Activitat recent',
-    'create_now' => 'Crea’n ara',
+    'create_now' => 'Crea un element',
     'revisions' => 'Revisions',
     'meta_revision' => 'Revisió núm. :revisionCount',
-    'meta_created' => 'Creat :timeLength',
-    'meta_created_name' => 'Creat :timeLength per :user',
-    'meta_updated' => 'Actualitzat :timeLength',
-    'meta_updated_name' => 'Actualitzat :timeLength per :user',
+    'meta_created' => 'S’ha creat :timeLength',
+    'meta_created_name' => ':user l’ha creat :timeLength',
+    'meta_updated' => 'S’ha actualitzat :timeLength',
+    'meta_updated_name' => ':user l’ha actualitzat :timeLength',
     'meta_owned_name' => 'Propietat de :user',
-    'meta_reference_count' => 'Hi fa referència :count element|Hi fan referència :count elements',
-    'entity_select' => 'Selecciona una entitat',
+    'meta_reference_count' => 'S’hi fa referència en :count element|S’hi fa referència en :count elements',
+    'entity_select' => 'Selecció de l’entitat',
     'entity_select_lack_permission' => 'No teniu els permisos necessaris per a seleccionar aquest element',
     'images' => 'Imatges',
-    'my_recent_drafts' => 'Els vostres esborranys recents',
-    'my_recently_viewed' => 'Les vostres visualitzacions recents',
-    'my_most_viewed_favourites' => 'Els vostres preferits més vistos',
-    'my_favourites' => 'Els vostres preferits',
+    'my_recent_drafts' => 'Els meus esborranys recents',
+    'my_recently_viewed' => 'Els meus vistos recentment',
+    'my_most_viewed_favourites' => 'Els meus favorits més vistos',
+    'my_favourites' => 'Els meus favorits',
     'no_pages_viewed' => 'No heu vist cap pàgina',
-    'no_pages_recently_created' => 'No s’ha creat cap pàgina fa poc',
-    'no_pages_recently_updated' => 'No s’ha actualitzat cap pàgina fa poc',
+    'no_pages_recently_created' => 'No s’ha creat cap pàgina recentment',
+    'no_pages_recently_updated' => 'No s’ha actualitzat cap pàgina recentment',
     'export' => 'Exporta',
     'export_html' => 'Fitxer web independent',
     'export_pdf' => 'Fitxer PDF',
@@ -45,40 +45,40 @@
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
-    'permissions_desc' => 'Definiu aquí permisos que tindran preferència sobre les permisos per defecte proporcionats pels rols d’usuari.',
-    'permissions_book_cascade' => 'Els permisos definits en llibres s’hereten automàticament en pàgines i capítols inferiors, llevat que tinguin permisos propis definits.',
-    'permissions_chapter_cascade' => 'Els permisos definits en capítols s’hereten automàticament en pàgines inferiors, llevat que tinguin permisos propis definits.',
+    'permissions_desc' => 'Configureu aquí els permisos per a sobreescriure els permisos per defecte proporcionats pels rols d’usuari.',
+    'permissions_book_cascade' => 'Els permisos dels llibres s’aplicaran també als capítols i les pàgines que continguin llevat que tinguin els seus propis permisos.',
+    'permissions_chapter_cascade' => 'Els permisos dels capítols s’aplicaran també a les pàgines que continguin llevat que tinguin els seus propis permisos.',
     'permissions_save' => 'Desa els permisos',
     'permissions_owner' => 'Propietari',
-    'permissions_role_everyone_else' => 'Tota la resta',
-    'permissions_role_everyone_else_desc' => 'Definiu permisos per a tots els rols no definits específicament.',
-    'permissions_role_override' => 'Força els permisos per al rol',
-    'permissions_inherit_defaults' => 'Hereta els permisos per defecte',
+    'permissions_role_everyone_else' => 'La resta dels usuaris',
+    'permissions_role_everyone_else_desc' => 'Configureu permisos per a tots els rols que no s’hagin sobreescrit específicament.',
+    'permissions_role_override' => 'Sobreescriu els permisos per al rol',
+    'permissions_inherit_defaults' => 'Hereta la configuració per defecte',
 
     // Search
     'search_results' => 'Resultats de la cerca',
-    'search_total_results_found' => 'S’ha trobat :count resultat|S’han trobat :count resultats en total',
+    'search_total_results_found' => 'S’ha trobat :count coincidència|S’han trobat :count coincidències',
     'search_clear' => 'Esborra la cerca',
-    'search_no_pages' => 'La cerca no coincideix amb cap pàgina',
+    'search_no_pages' => 'No s’ha trobat cap pàgina que coincideixi amb la cerca',
     'search_for_term' => 'Cerca :term',
     'search_more' => 'Més resultats',
     'search_advanced' => 'Cerca avançada',
-    'search_terms' => 'Termes de la cerca',
+    'search_terms' => 'Termes de cerca',
     'search_content_type' => 'Tipus de contingut',
     'search_exact_matches' => 'Coincidències exactes',
     'search_tags' => 'Cerca d’etiquetes',
     'search_options' => 'Opcions',
-    'search_viewed_by_me' => 'Visualitzat per mi',
-    'search_not_viewed_by_me' => 'No visualitzat per mi',
-    'search_permissions_set' => 'Amb permisos definits',
-    'search_created_by_me' => 'Creat per mi',
-    'search_updated_by_me' => 'Actualitzat per mi',
-    'search_owned_by_me' => 'En sóc propietari',
-    'search_date_options' => 'Opcions de dates',
-    'search_updated_before' => 'Actualitzat abans de',
-    'search_updated_after' => 'Actualitzat després de',
-    'search_created_before' => 'Creat abans de',
-    'search_created_after' => 'Creat després de',
+    'search_viewed_by_me' => 'Vistos per mi',
+    'search_not_viewed_by_me' => 'No vistos per mi',
+    'search_permissions_set' => 'Amb permisos',
+    'search_created_by_me' => 'Creats per mi',
+    'search_updated_by_me' => 'Actualitzats per mi',
+    'search_owned_by_me' => 'En soc propietari',
+    'search_date_options' => 'Opcions de data',
+    'search_updated_before' => 'Actualitzats abans de',
+    'search_updated_after' => 'Actualitzats després de',
+    'search_created_before' => 'Creats abans de',
+    'search_created_after' => 'Creats després de',
     'search_set_date' => 'Defineix una data',
     'search_update' => 'Actualitza la cerca',
 
@@ -86,87 +86,87 @@
     'shelf' => 'Prestatge',
     'shelves' => 'Prestatges',
     'x_shelves' => ':count prestatge|:count prestatges',
-    'shelves_empty' => 'No hi ha cap prestatge creat',
-    'shelves_create' => 'Crea un prestatge nou',
+    'shelves_empty' => 'No hi ha cap prestatge',
+    'shelves_create' => 'Crea un prestatge',
     'shelves_popular' => 'Prestatges populars',
     'shelves_new' => 'Prestatges nous',
     'shelves_new_action' => 'Prestatge nou',
     'shelves_popular_empty' => 'Aquí apareixeran els prestatges més populars.',
-    'shelves_new_empty' => 'Aquí apareixeran els prestatges creats fa poc.',
+    'shelves_new_empty' => 'Aquí apareixeran els prestatges més recents.',
     'shelves_save' => 'Desa el prestatge',
     'shelves_books' => 'Llibres en aquest prestatge',
-    'shelves_add_books' => 'Afegeix llibres a aquest prestatge',
-    'shelves_drag_books' => 'Arrossegueu llibres a sota per a afegir-los a aquest prestatge',
-    'shelves_empty_contents' => 'Aquest prestatge no té cap llibre assignat',
-    'shelves_edit_and_assign' => 'Editeu el prestatge per a assignar-hi llibres',
-    'shelves_edit_named' => 'Edita el prestatge :name',
+    'shelves_add_books' => 'Afegiu llibres en aquest prestatge',
+    'shelves_drag_books' => 'Arrossegueu i deixeu anar llibres a sota per a afegir-los en aquest prestatge',
+    'shelves_empty_contents' => 'Aquest prestatge no té cap llibre',
+    'shelves_edit_and_assign' => 'Editeu el prestatge per a afegir-hi llibres',
+    'shelves_edit_named' => 'Edita el prestatge &laquo;:name&raquo;',
     'shelves_edit' => 'Edita el prestatge',
     'shelves_delete' => 'Suprimeix el prestatge',
-    'shelves_delete_named' => 'Suprimeix el prestatge :name',
-    'shelves_delete_explain' => "Se suprimirà el prestatge amb el nom «:name». Els llibres que contingui no se suprimiran.",
-    'shelves_delete_confirmation' => 'Segur que voleu suprimir aquest prestatge?',
+    'shelves_delete_named' => 'Suprimeix del prestatge &laquo;:name&raquo;',
+    'shelves_delete_explain' => "Se suprimirà el prestatge &laquo;:name&raquo;. No se suprimiran els llibres que contingui.",
+    'shelves_delete_confirmation' => 'Esteu segur que voleu suprimir aquest prestatge?',
     'shelves_permissions' => 'Permisos del prestatge',
     'shelves_permissions_updated' => 'S’han actualitzat els permisos del prestatge',
-    'shelves_permissions_active' => 'Permisos del prestatge actius',
-    'shelves_permissions_cascade_warning' => 'Els permisos dels prestatges no s’hereten automàticament en els llibres que contenen. És així perquè un llibre pot estar en múltiples prestatges. Es poden copiar, però, els permisos als llibres continguts fent servir l’opció a continuació.',
-    'shelves_permissions_create' => 'Els permisos de crear prestatges només es fan servir per a copiar permisos a llibres continguts fent servir l’acció següent. No controlen la capacitat de crear llibres.',
+    'shelves_permissions_active' => 'El prestatge té permisos',
+    'shelves_permissions_cascade_warning' => 'Els permisos dels prestatges no s’aplicaran als llibres que contingui. Això és perquè els llibres poden estar en més d’un prestatge a la vegada. Això no obstant, els permisos es poden copiar als llibres que contingui amb l’opció de sota.',
+    'shelves_permissions_create' => 'Els permisos per a crear prestatges només s’utilitzen per a copiar permisos als llibres que contenen amb l’acció de sota. No controlen els permisos per a crear llibres.',
     'shelves_copy_permissions_to_books' => 'Copia els permisos als llibres',
     'shelves_copy_permissions' => 'Copia els permisos',
-    'shelves_copy_permissions_explain' => 'S’aplicarà la configuració de permisos actual a tots els llibres continguts. Abans d’activar-la, assegureu-vos que hàgiu desat qualsevol canvi en els permisos d’aquest prestatge.',
+    'shelves_copy_permissions_explain' => 'S’aplicaran els permisos del prestatge a tots els llibres que contingui. Abans de continuar assegureu-vos que heu desat els canvis que hàgiu fet als permisos del prestatge.',
     'shelves_copy_permission_success' => 'S’han copiat els permisos del prestatge a :count llibres',
 
     // Books
     'book' => 'Llibre',
     'books' => 'Llibres',
     'x_books' => ':count llibre|:count llibres',
-    'books_empty' => 'No hi ha cap llibre creat',
+    'books_empty' => 'No hi ha cap llibre',
     'books_popular' => 'Llibres populars',
     'books_recent' => 'Llibres recents',
     'books_new' => 'Llibres nous',
     'books_new_action' => 'Llibre nou',
     'books_popular_empty' => 'Aquí apareixeran els llibres més populars.',
-    'books_new_empty' => 'Aquí apareixeran els llibres creats fa poc.',
-    'books_create' => 'Crea un llibre nou',
+    'books_new_empty' => 'Aquí apareixeran els llibres més recents.',
+    'books_create' => 'Crea un llibre',
     'books_delete' => 'Suprimeix el llibre',
-    'books_delete_named' => 'Suprimeix el llibre :bookName',
-    'books_delete_explain' => 'Se suprimirà el llibre amb el nom «:bookName». Se’n suprimiran totes les pàgines i tots els capítols.',
-    'books_delete_confirmation' => 'Segur que voleu suprimir aquest llibre?',
+    'books_delete_named' => 'Suprimeix el llibre &laquo;:bookName&raquo;',
+    'books_delete_explain' => 'Se suprimirà el llibre &laquo;:bookName&raquo;. Se suprimiran totes les pàgines i capítols.',
+    'books_delete_confirmation' => 'Esteu segur que voleu suprimir aquest llibre?',
     'books_edit' => 'Edita el llibre',
-    'books_edit_named' => 'Edita el llibre :bookName',
-    'books_form_book_name' => 'Nom del llibre',
+    'books_edit_named' => 'Edita el llibre &laquo;:bookName&raquo;',
+    'books_form_book_name' => 'Títol del llibre',
     'books_save' => 'Desa el llibre',
     'books_permissions' => 'Permisos del llibre',
-    'books_permissions_updated' => 'S’han actualitzat els permisos del llibre',
-    'books_empty_contents' => 'No hi ha cap pàgina ni cap capítol creat en aquest llibre.',
-    'books_empty_create_page' => 'Crea una pàgina nova',
-    'books_empty_sort_current_book' => 'Ordena el llibre actual',
+    'books_permissions_updated' => 'S’han actualitzat els permisos',
+    'books_empty_contents' => 'No hi ha cap capítol ni cap pàgina en aquest llibre.',
+    'books_empty_create_page' => 'Crea una pàgina',
+    'books_empty_sort_current_book' => 'Ordena el llibre',
     'books_empty_add_chapter' => 'Afegeix un capítol',
-    'books_permissions_active' => 'S’han activat els permisos del llibre',
+    'books_permissions_active' => 'El llibre té permisos',
     'books_search_this' => 'Cerca en aquest llibre',
-    'books_navigation' => 'Navegació pel llibre',
-    'books_sort' => 'Ordena el contingut del llibre',
-    'books_sort_desc' => 'Moveu capítols i pàgines dins d’un llibre per a reorganitzar-ne el contingut. Podeu afegir altres llibres, la qual cosa permet moure fàcilment capítols i pàgines entre llibres.',
-    'books_sort_named' => 'Ordena el llibre :bookName',
-    'books_sort_name' => 'Ordena per nom',
-    'books_sort_created' => 'Ordena per data de creació',
-    'books_sort_updated' => 'Ordena per data d’actualització',
-    'books_sort_chapters_first' => 'Els capítols al principi',
-    'books_sort_chapters_last' => 'Els capítols al final',
+    'books_navigation' => 'Navegació del llibre',
+    'books_sort' => 'Ordena el contingut d’un llibre',
+    'books_sort_desc' => 'Moveu els capítols i les pàgines d’un llibre per a reorganitzar-ne el contingut. Podeu afegir altres llibres perquè sigui més fàcil moure capítols i pàgines d’un llibre a un altre.',
+    'books_sort_named' => 'Ordena el llibre &laquo;:bookName&raquo;',
+    'books_sort_name' => 'Ordena pel nom',
+    'books_sort_created' => 'Ordena per la data de creació',
+    'books_sort_updated' => 'Ordena per la data d’actualització',
+    'books_sort_chapters_first' => 'Capítols al principi',
+    'books_sort_chapters_last' => 'Capítols al final',
     'books_sort_show_other' => 'Mostra altres llibres',
     'books_sort_save' => 'Desa l’ordre nou',
-    'books_sort_show_other_desc' => 'Afegiu aquí altres llibres per a incloure’ls a l’operació d’ordenació i permetre la reorganització entre llibres de manera fàcil.',
-    'books_sort_move_up' => 'Mou amunt',
-    'books_sort_move_down' => 'Mou avall',
-    'books_sort_move_prev_book' => 'Mou al llibre anterior',
-    'books_sort_move_next_book' => 'Mou al llibre següent',
-    'books_sort_move_prev_chapter' => 'Mou al capítol anterior',
-    'books_sort_move_next_chapter' => 'Mou al capítol següent',
-    'books_sort_move_book_start' => 'Mou a l’inici del llibre',
-    'books_sort_move_book_end' => 'Mou al final del llibre',
-    'books_sort_move_before_chapter' => 'Mou al capítol anterior',
-    'books_sort_move_after_chapter' => 'Mou al capítol següent',
+    'books_sort_show_other_desc' => 'Afegiu llibres per a incloure’ls en l’ordenació i permetre una reorganització entre llibres més senzilla.',
+    'books_sort_move_up' => 'Mou-ho cap amunt',
+    'books_sort_move_down' => 'Mou-ho cap avall',
+    'books_sort_move_prev_book' => 'Mou-ho al llibre anterior',
+    'books_sort_move_next_book' => 'Mou-ho al llibre següent',
+    'books_sort_move_prev_chapter' => 'Mou-ho al capítol anterior',
+    'books_sort_move_next_chapter' => 'Mou-ho al capítol següent',
+    'books_sort_move_book_start' => 'Mou-ho al principi del llibre',
+    'books_sort_move_book_end' => 'Mou-ho al final del llibre',
+    'books_sort_move_before_chapter' => 'Mou-ho a abans del capítol',
+    'books_sort_move_after_chapter' => 'Mou-ho a després del capítol',
     'books_copy' => 'Copia el llibre',
-    'books_copy_success' => 'Llibre copiat correctament',
+    'books_copy_success' => 'S’ha copiat el llibre',
 
     // Chapters
     'chapter' => 'Capítol',
@@ -174,21 +174,21 @@
     'x_chapters' => ':count capítol|:count capítols',
     'chapters_popular' => 'Capítols populars',
     'chapters_new' => 'Capítol nou',
-    'chapters_create' => 'Crea un capítol nou',
-    'chapters_delete' => 'Suprimeix el capítol',
-    'chapters_delete_named' => 'Suprimeix el capítol :chapterName',
-    'chapters_delete_explain' => 'Se suprimirà el capítol amb el nom «:chapterName». Totes les pàgines que contingui també se suprimiran.',
-    'chapters_delete_confirm' => 'Segur que voleu suprimir aquest capítol?',
+    'chapters_create' => 'Crea un capítol',
+    'chapters_delete' => 'Suprimeix un capítol',
+    'chapters_delete_named' => 'Suprimeix el capítol &laquo;:chapterName&raquo;',
+    'chapters_delete_explain' => 'Se suprimirà el capítol &laquo;:chapterName&raquo;. Se suprimiran totes les pàgines que hi ha al capítol.',
+    'chapters_delete_confirm' => 'Esteu segur que voleu suprimir aquest capítol?',
     'chapters_edit' => 'Edita el capítol',
-    'chapters_edit_named' => 'Edita el capítol :chapterName',
+    'chapters_edit_named' => 'Edita el capítol &laquo;:chapterName&raquo;',
     'chapters_save' => 'Desa el capítol',
     'chapters_move' => 'Mou el capítol',
-    'chapters_move_named' => 'Mou el capítol :chapterName',
+    'chapters_move_named' => 'Mou el capítol &laquo;:chapterName&raquo;',
     'chapters_copy' => 'Copia el capítol',
-    'chapters_copy_success' => 'Capítol copiat correctament',
+    'chapters_copy_success' => 'S’ha copiat el capítol',
     'chapters_permissions' => 'Permisos del capítol',
-    'chapters_empty' => 'De moment, aquest capítol no conté cap pàgina.',
-    'chapters_permissions_active' => 'S’han activat els permisos del capítol',
+    'chapters_empty' => 'No hi ha cap pàgina en aquest capítol.',
+    'chapters_permissions_active' => 'El capítol té permisos',
     'chapters_permissions_success' => 'S’han actualitzat els permisos del capítol',
     'chapters_search_this' => 'Cerca en aquest capítol',
     'chapter_sort_book' => 'Ordena el llibre',
@@ -198,105 +198,105 @@
     'pages' => 'Pàgines',
     'x_pages' => ':count pàgina|:count pàgines',
     'pages_popular' => 'Pàgines populars',
-    'pages_new' => 'Pàgina nova',
-    'pages_attachments' => 'Adjuncions',
-    'pages_navigation' => 'Navegació per la pàgina',
+    'pages_new' => 'Crea una pàgina',
+    'pages_attachments' => 'Fitxers adjunts',
+    'pages_navigation' => 'Navegació de la pàgina',
     'pages_delete' => 'Suprimeix la pàgina',
-    'pages_delete_named' => 'Suprimeix la pàgina :pageName',
-    'pages_delete_draft_named' => 'Suprimeix l’esborrany de pàgina :pageName',
+    'pages_delete_named' => 'Suprimeix la pàgina &laquo;:pageName&raquo;',
+    'pages_delete_draft_named' => 'Suprimeix l’esborrany de pàgina &laquo;:pageName&raquo;',
     'pages_delete_draft' => 'Suprimeix l’esborrany de pàgina',
     'pages_delete_success' => 'S’ha suprimit la pàgina',
     'pages_delete_draft_success' => 'S’ha suprimit l’esborrany de pàgina',
     'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
-    'pages_delete_confirm' => 'Segur que voleu suprimir aquesta pàgina?',
-    'pages_delete_draft_confirm' => 'Segur que voleu suprimir aquest esborrany de pàgina?',
-    'pages_editing_named' => 'Esteu editant :pageName',
+    'pages_delete_confirm' => 'Esteu segur que voleu suprimir aquesta pàgina?',
+    'pages_delete_draft_confirm' => 'Esteu segur que voleu suprimir aquest esborrany de pàgina?',
+    'pages_editing_named' => 'Edició de la pàgina &laquo;:pageName&raquo;',
     'pages_edit_draft_options' => 'Opcions d’esborrany',
     'pages_edit_save_draft' => 'Desa l’esborrany',
     'pages_edit_draft' => 'Edita l’esborrany de pàgina',
-    'pages_editing_draft' => 'Esteu editant l’esborrany',
-    'pages_editing_page' => 'Esteu editant la pàgina',
-    'pages_edit_draft_save_at' => 'Esborrany desat ',
+    'pages_editing_draft' => 'Estàs editant l’esborrany',
+    'pages_editing_page' => 'Edita la pàgina',
+    'pages_edit_draft_save_at' => 'S’ha desat l’esborrany a les ',
     'pages_edit_delete_draft' => 'Suprimeix l’esborrany',
-    'pages_edit_delete_draft_confirm' => 'Segur que voleu suprimir els canvis a l’esborrany de pàgina? Es perdran tots els vostres canvis d’ençà de la darrera vegada que heu desat i s’actualitzarà l’editor amb l’estat de la darrera pàgina desada sense ser un esborrany.',
+    'pages_edit_delete_draft_confirm' => 'Esteu segur que voleu suprimir els canvis de l’esborrany de pàgina? Es perdran tots els canvis que hàgiu fet després de la darrera vegada que vau desar la pàgina i l’editor s’actualitzarà amb l’estat de la darrera vegada que es va desar la pàgina que no era esborrany.',
     'pages_edit_discard_draft' => 'Descarta l’esborrany',
-    'pages_edit_switch_to_markdown' => 'Canvia a l’editor Markdown',
+    'pages_edit_switch_to_markdown' => 'Canvia a l’editor de Markdown',
     'pages_edit_switch_to_markdown_clean' => '(Contingut net)',
     'pages_edit_switch_to_markdown_stable' => '(Contingut estable)',
     'pages_edit_switch_to_wysiwyg' => 'Canvia a l’editor WYSIWYG',
-    'pages_edit_set_changelog' => 'Defineix el registre de canvis',
-    'pages_edit_enter_changelog_desc' => 'Introduïu una breu descripció dels canvis que heu fet',
-    'pages_edit_enter_changelog' => 'Introduïu un registre de canvis',
-    'pages_editor_switch_title' => 'Canvia d’editor',
-    'pages_editor_switch_are_you_sure' => 'Segur que voleu canviar l’editor d’aquesta pàgina?',
-    'pages_editor_switch_consider_following' => 'Considereu el següent en canviar d’editor:',
-    'pages_editor_switch_consideration_a' => 'Quan hàgiu desat, l’opció del nou editor serà la que utilitzaran tots els futurs editors, incloent-hi els que no poden canviar de tipus d’editor amb el seu usuari.',
-    'pages_editor_switch_consideration_b' => 'En algunes circumstàncies, això pot comportar una pèrdua de detalls i de sintaxi.',
-    'pages_editor_switch_consideration_c' => 'Els canvis al registre de canvis o a les etiquetes fets d’ençà de la darrera vegada que s’ha desat no es mantindran en aquest canvi.',
+    'pages_edit_set_changelog' => 'Registre de canvis',
+    'pages_edit_enter_changelog_desc' => 'Introduïu una descripció breu dels canvis que heu fet',
+    'pages_edit_enter_changelog' => 'Registra un canvi',
+    'pages_editor_switch_title' => 'Canvia l’editor',
+    'pages_editor_switch_are_you_sure' => 'Esteu segur que voleu canviar l’editor d’aquesta pàgina?',
+    'pages_editor_switch_consider_following' => 'Quan canvieu l’editor tingueu en compte que:',
+    'pages_editor_switch_consideration_a' => 'Un cop s’hagi desat, l’editor nou serà el que hagin d’utilitzar tots els editor futurs, incloent-hi aquells que no puguin canviar el tipus d’editor.',
+    'pages_editor_switch_consideration_b' => 'És possible que hi hagi pèrdues en el detall i la sintaxi.',
+    'pages_editor_switch_consideration_c' => 'Els canvis en les etiquetes i el registre de canvis que s’hagin fet després de la darrera vegada que es va desar no es conservaran.',
     'pages_save' => 'Desa la pàgina',
     'pages_title' => 'Títol de la pàgina',
     'pages_name' => 'Nom de la pàgina',
     'pages_md_editor' => 'Editor',
-    'pages_md_preview' => 'Previsualització',
+    'pages_md_preview' => 'Visualització prèvia',
     'pages_md_insert_image' => 'Insereix una imatge',
-    'pages_md_insert_link' => 'Insereix un enllaç a una entitat',
-    'pages_md_insert_drawing' => 'Insereix un diagrama',
-    'pages_md_show_preview' => 'Mostra la previsualització',
-    'pages_md_sync_scroll' => 'Sincronitza el desplaçament de la previsualització',
-    'pages_drawing_unsaved' => 'S’ha trobat un diagrama no desat',
-    'pages_drawing_unsaved_confirm' => 'S’han trobat dades d’un diagrama d’un intent de desat fallit anterior. Voleu restaurar-les i continuar editant aquest diagrama no desat?',
-    'pages_not_in_chapter' => 'La pàgina no pertany a cap capítol',
+    'pages_md_insert_link' => 'Insereix un enllaç d’entitat',
+    'pages_md_insert_drawing' => 'Insereix un dibuix',
+    'pages_md_show_preview' => 'Mostra la visualització prèvia',
+    'pages_md_sync_scroll' => 'Sincronitza el desplaçament de la visualització prèvia',
+    'pages_drawing_unsaved' => 'S’ha trobat un dibuix sense desar',
+    'pages_drawing_unsaved_confirm' => 'S’han trobat dades d’un dibuix d’un intent anterior de desar un dibuix. Voleu restaurar aquest dibuix no desat per a reprendre’n l’edició?',
+    'pages_not_in_chapter' => 'La pàgina no és un capítol',
     'pages_move' => 'Mou la pàgina',
     'pages_copy' => 'Copia la pàgina',
-    'pages_copy_desination' => 'Destinació de la còpia',
-    'pages_copy_success' => 'Pàgina copiada correctament',
+    'pages_copy_desination' => 'Copia la destinació',
+    'pages_copy_success' => 'S’ha copiat la pàgina',
     'pages_permissions' => 'Permisos de la pàgina',
     'pages_permissions_success' => 'S’han actualitzat els permisos de la pàgina',
     'pages_revision' => 'Revisió',
     'pages_revisions' => 'Revisions de la pàgina',
-    'pages_revisions_desc' => 'A continuació hi ha les revisions anteriors de la pàgina. Podeu mirar-les, comparar-les i restaurar-ne versions antigues si us ho permeten els permisos. És possible que l’historial complet de la pàgina no s’hi vegi reflectit perquè, depenent de la configuració del sistema, es poden haver esborrat automàticament revisions antigues.',
-    'pages_revisions_named' => 'Revisions de la pàgina :pageName',
-    'pages_revision_named' => 'Revisió de la pàgina :pageName',
-    'pages_revision_restored_from' => 'Restaurada de núm. :id; :summary',
-    'pages_revisions_created_by' => 'Creada per',
+    'pages_revisions_desc' => 'A continuació hi ha la llista de totes les revisions d’aquesta pàgina. Si hi teniu permís, podeu mirar, comparar i restaurar versions antigues de la pàgina. És possible que no hi aparegui tot l’historial de la pàgina ja que, segons la configuració del sistema, és possible que s’hagin suprimit les revisions antigues automàticament.',
+    'pages_revisions_named' => 'Revisions de la pàgina &laquo;:pageName&raquo;',
+    'pages_revision_named' => 'Revisió de la pàgina &laquo;:pageName&raquo;',
+    'pages_revision_restored_from' => 'S’ha restaurat de núm. :id: :summary',
+    'pages_revisions_created_by' => 'Revisor:',
     'pages_revisions_date' => 'Data de la revisió',
-    'pages_revisions_number' => 'Núm. ',
-    'pages_revisions_sort_number' => 'Número de revisió',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Número de la revisió',
     'pages_revisions_numbered' => 'Revisió núm. :id',
     'pages_revisions_numbered_changes' => 'Canvis de la revisió núm. :id',
     'pages_revisions_editor' => 'Tipus d’editor',
     'pages_revisions_changelog' => 'Registre de canvis',
     'pages_revisions_changes' => 'Canvis',
     'pages_revisions_current' => 'Versió actual',
-    'pages_revisions_preview' => 'Previsualitza',
+    'pages_revisions_preview' => 'Visualització prèvia',
     'pages_revisions_restore' => 'Restaura',
     'pages_revisions_none' => 'Aquesta pàgina no té cap revisió',
     'pages_copy_link' => 'Copia l’enllaç',
-    'pages_edit_content_link' => 'Vés a la secció a l’editor',
-    'pages_pointer_enter_mode' => 'Activa el mode de selecció de secció',
-    'pages_pointer_label' => 'Opcions de la secció de la pàgina',
-    'pages_pointer_permalink' => 'Enllaç permanent de la secció de la pàgina',
-    'pages_pointer_include_tag' => 'Etiqueta d’inclusió de la secció de la pàgina',
-    'pages_pointer_toggle_link' => 'Mode d’enllaç permanent, premeu per a mostrar l’etiqueta d‘inclusió',
-    'pages_pointer_toggle_include' => 'Mode d’etiqueta d’inclusió, premeu per a mostrar l’enllaç permanent',
-    'pages_permissions_active' => 'S’han activat els permisos de la pàgina',
+    'pages_edit_content_link' => 'Ves a la secció a l’editor',
+    'pages_pointer_enter_mode' => 'Entra al mode de selecció de secció',
+    'pages_pointer_label' => 'Opcions de la secció de pàgina',
+    'pages_pointer_permalink' => 'Enllaç permanent de la secció de pàgina',
+    'pages_pointer_include_tag' => 'Etiqueta inclou de la secció de pàgina',
+    'pages_pointer_toggle_link' => 'Enllaç permanent. Cliqueu per a mostrar l’etiqueta d’inclusió',
+    'pages_pointer_toggle_include' => 'Etiqueta d’inclusió. Cliqueu per a mostrar l’enllaç permanent',
+    'pages_permissions_active' => 'La pàgina té permisos',
     'pages_initial_revision' => 'Publicació inicial',
-    'pages_references_update_revision' => 'Actualització automàtica dels enllaços interns del sistema',
+    'pages_references_update_revision' => 'Actualització automàtica dels enllaços interns',
     'pages_initial_name' => 'Pàgina nova',
-    'pages_editing_draft_notification' => 'Esteu editant un esborrany que es va desar per darrer cop :timeDiff.',
-    'pages_draft_edited_notification' => 'Aquesta pàgina s’ha actualitzat d’ençà d’aleshores. Us recomanem que descarteu aquest esborrany.',
-    'pages_draft_page_changed_since_creation' => 'Aquesta pàgina s’ha actualitzat d‘ençà que es va crear l’esborrany. Us recomanem que descarteu aquest esborrany i que aneu amb compte de no sobreescriure els canvis de la pàgina.',
+    'pages_editing_draft_notification' => 'Esteu editant un esborrany que es va desar :timeDiff.',
+    'pages_draft_edited_notification' => 'Des de llavors, s’ha actualitzat la pàgina. Us recomanem que descarteu aquest esborrany.',
+    'pages_draft_page_changed_since_creation' => 'Des que es va crear l’esborrany, la pàgina s’ha actualitzat. Us recomanem que descarteu aquest esborrany o que aneu amb compte de no sobreescriure cap canvi.',
     'pages_draft_edit_active' => [
         'start_a' => ':count usuaris han començat a editar aquesta pàgina',
         'start_b' => ':userName ha començat a editar aquesta pàgina',
-        'time_a' => 'd’ençà que la pàgina es va actualitzar per darrer cop',
+        'time_a' => 'des que es va actualitzar aquesta pàgina',
         'time_b' => 'en els darrers :minCount minuts',
-        'message' => ':start :time. Aneu amb compte de no trepitjar-vos les actualitzacions entre vosaltres!',
+        'message' => ':start :time. Aneu amb compte de no sobreescriure-us els canvis.',
     ],
-    'pages_draft_discarded' => 'S’ha descartat l’esborrany! S’ha actualitzat l’editor amb el contingut actual de la pàgina',
-    'pages_draft_deleted' => 'S’ha suprimit l’esborrany! S’ha actualitzat l’editor amb el contingut actual de la pàgina',
-    'pages_specific' => 'Una pàgina específica',
-    'pages_is_template' => 'Plantilla de pàgina',
+    'pages_draft_discarded' => 'S’ha descartat l’esborrany. L’editor s’ha actualitzat amb el contingut actual de la pàgina',
+    'pages_draft_deleted' => 'S’ha suprimit l’esborrany! L’editor s’ha actualitzat amb el contingut actual de la pàgina',
+    'pages_specific' => 'Pàgina específica',
+    'pages_is_template' => 'Plantilla de la pàgina',
 
     // Editor Sidebar
     'toggle_sidebar' => 'Commuta la barra lateral',
@@ -306,57 +306,57 @@
     'shelf_tags' => 'Etiquetes del prestatge',
     'tag' => 'Etiqueta',
     'tags' =>  'Etiquetes',
-    'tags_index_desc' => 'Es poden aplicar etiquetes al contingut dins del sistema per a aplicar un mode de categorització flexible. Les etiquetes poden tenir una clau i un valor, però el valor és opcional. Quan s’han aplican, el contingut es pot cercar fent servir el nom o el valor de l’etiqueta.',
+    'tags_index_desc' => 'Es poden posar etiquetes al contingut per a aconseguir una categorització flexible. Les etiquetes han de tenir una clau i poden o no tenir un valor. Un cop s’hi han posat, es pot cercar el contingut utilitzant el nom o el valor de les etiquetes.',
     'tag_name' =>  'Nom de l’etiqueta',
     'tag_value' => 'Valor de l’etiqueta (opcional)',
-    'tags_explain' => "Afegiu etiquetes per a categoritzar millor el contingut. \n Podeu assignar un valor a cada etiqueta per a una organització més detallada.",
-    'tags_add' => 'Afegeix una altra etiqueta',
-    'tags_remove' => 'Elimina aquesta etiqueta',
-    'tags_usages' => 'Usos totals de l’etiqueta',
-    'tags_assigned_pages' => 'Assignada a pàgines',
-    'tags_assigned_chapters' => 'Assignada a capítols',
-    'tags_assigned_books' => 'Assignada a llibres',
-    'tags_assigned_shelves' => 'Assignada a prestatges',
+    'tags_explain' => "Poseu alguna etiqueta per a categoritzar millor el contingut. \n Podeu assignar un valor a l’etiqueta per a aconseguir una organització més detallada.",
+    'tags_add' => 'Posa-hi una altra etiqueta',
+    'tags_remove' => 'Lleva aquesta etiqueta',
+    'tags_usages' => 'Ús total de les etiquetes',
+    'tags_assigned_pages' => 'Assignades a pàgines',
+    'tags_assigned_chapters' => 'Assignades a capítols',
+    'tags_assigned_books' => 'Assignades a llibres',
+    'tags_assigned_shelves' => 'Assignades a prestatges',
     'tags_x_unique_values' => ':count valors únics',
     'tags_all_values' => 'Tots els valors',
     'tags_view_tags' => 'Mostra les etiquetes',
     'tags_view_existing_tags' => 'Mostra les etiquetes existents',
-    'tags_list_empty_hint' => 'Es poden assignar etiquetes mitjançant la barra lateral de l’editor de la pàgina o quan s’editen els detalls d’un llibre, capítol o prestatge.',
-    'attachments' => 'Adjuncions',
-    'attachments_explain' => 'Pugeu fitxers o adjunteu enllaços per a mostrar-los a la pàgina. Són visibles a la barra lateral de la pàgina.',
-    'attachments_explain_instant_save' => 'Els canvis fets aquí es desen instantàniament.',
+    'tags_list_empty_hint' => 'Podeu posar etiquetes a la barra lateral de l’editor o quan canvieu la informació d’un capítol o d’un prestatge.',
+    'attachments' => 'Fitxers adjunts',
+    'attachments_explain' => 'Pugeu fitxers o afegiu enllaços per a mostrar a la pàgina. Els podreu veure a la barra lateral de la pàgina.',
+    'attachments_explain_instant_save' => 'Els canvis dels fitxers adjunts es desen a l’instant.',
     'attachments_upload' => 'Puja un fitxer',
-    'attachments_link' => 'Adjunta un enllaç',
-    'attachments_upload_drop' => 'De manera alternativa, podeu arrossegar i deixar anar un fitxer aquí per a pujar-lo com a adjunció.',
-    'attachments_set_link' => 'Defineix l’enllaç',
-    'attachments_delete' => 'Segur que voleu suprimir aquesta adjunció?',
-    'attachments_dropzone' => 'Deixeu anar fitxers aquí per a pujar-los',
+    'attachments_link' => 'Afegeix un enllaç',
+    'attachments_upload_drop' => 'També podeu arrossegar i deixar anar un fitxer aquí per a adjuntar-lo.',
+    'attachments_set_link' => 'Configura l’enllaç',
+    'attachments_delete' => 'Esteu segur que voleu suprimir aquest fitxer adjunt?',
+    'attachments_dropzone' => 'Deixeu-hi anar fitxers per a pujar-los',
     'attachments_no_files' => 'No s’ha pujat cap fitxer',
-    'attachments_explain_link' => 'Podeu adjuntar un enllaç si preferiu no pujar un fitxer. Pot ser un enllaç a una altra pàgina o un enllaç a un fitxer al núvol.',
+    'attachments_explain_link' => 'Si us estimeu més no pujar un fitxer, podeu afegir un enllaç. Pot ser un enllaç en una altra pàgina o a un fitxer al núvol.',
     'attachments_link_name' => 'Nom de l’enllaç',
-    'attachment_link' => 'Enllaç de l’adjunció',
+    'attachment_link' => 'Enllaç del fitxer adjunt',
     'attachments_link_url' => 'Enllaç al fitxer',
-    'attachments_link_url_hint' => 'URL del lloc o fitxer',
+    'attachments_link_url_hint' => 'URL del lloc o del fitxer.',
     'attach' => 'Adjunta',
-    'attachments_insert_link' => 'Afegeix un enllaç de l’adjunció a la pàgina',
+    'attachments_insert_link' => 'Afegeix un enllaç de fitxer adjunt a la pàgina',
     'attachments_edit_file' => 'Edita el fitxer',
     'attachments_edit_file_name' => 'Nom del fitxer',
-    'attachments_edit_drop_upload' => 'Arrossegueu fitxers o feu clic aquí per a pujar-los i sobreescriure’ls',
-    'attachments_order_updated' => 'S’ha actualitzat l’ordre de les adjuncions',
-    'attachments_updated_success' => 'S’han actualitzat els detalls de les adjuncions',
-    'attachments_deleted' => 'S’ha suprimit l’adjunció',
-    'attachments_file_uploaded' => 'Fitxer pujat correctament',
-    'attachments_file_updated' => 'Fitxer actualitzat correctament',
-    'attachments_link_attached' => 'Enllaç adjuntat a la pàgina correctament',
+    'attachments_edit_drop_upload' => 'Deixeu-hi anar fitxers o cliqueu aquí per a pujar-ne i sobreescriure’ls.',
+    'attachments_order_updated' => 'S’ha actualitzat l’ordre del fitxer adjunt',
+    'attachments_updated_success' => 'S’han actualitzat els detalls dels fitxer adjunt',
+    'attachments_deleted' => 'S’ha suprimit el fitxer adjunt',
+    'attachments_file_uploaded' => 'S’ha pujat el fitxer',
+    'attachments_file_updated' => 'S’ha actualitzat el fitxer',
+    'attachments_link_attached' => 'S’ha adjuntat l’enllaç a la pàgina',
     'templates' => 'Plantilles',
     'templates_set_as_template' => 'La pàgina és una plantilla',
-    'templates_explain_set_as_template' => 'Podeu definir aquesta pàgina com a plantilla perquè el seu contingut es pugui fer servir en crear altres pàgines. Els altres usuaris podran fer servir la plantilla si tenen permís per a veure aquesta pàgina.',
+    'templates_explain_set_as_template' => 'Podeu configurar aquesta pàgina com a plantilla perquè s’utilitzi en la creació d’altres pàgines. Els altres usuaris podran utilitzar aquesta plantilla si tenen permisos de visualització d’aquesta pàgina.',
     'templates_replace_content' => 'Substitueix el contingut de la pàgina',
-    'templates_append_content' => 'Afegeix al final del contingut de la pàgina',
-    'templates_prepend_content' => 'Afegeix al principi del contingut de la pàgina',
+    'templates_append_content' => 'Afegeix-ho després del contingut la pàgina',
+    'templates_prepend_content' => 'Afegeix-ho abans del contingut la pàgina',
 
     // Profile View
-    'profile_user_for_x' => 'Usuari fa :time',
+    'profile_user_for_x' => 'Usuari des de fa :time',
     'profile_created_content' => 'Contingut creat',
     'profile_not_created_pages' => ':userName no ha creat cap pàgina',
     'profile_not_created_chapters' => ':userName no ha creat cap capítol',
@@ -367,71 +367,71 @@
     'comment' => 'Comentari',
     'comments' => 'Comentaris',
     'comment_add' => 'Afegeix un comentari',
-    'comment_placeholder' => 'Deixeu un comentari aquí',
-    'comment_count' => '{0} Sense comentaris|{1} 1 comentari|[2,*] :count comentaris',
+    'comment_placeholder' => 'Deixa un comentari aquí',
+    'comment_count' => '{0} No hi ha cap comentari|{1} Hi ha 1 comentari|[2,*] Hi ha :count comentaris',
     'comment_save' => 'Desa el comentari',
-    'comment_new' => 'Comentari nou',
+    'comment_new' => 'Crea un comentari',
     'comment_created' => 'ha comentat :createDiff',
-    'comment_updated' => 'Actualitzat :updateDiff per :username',
+    'comment_updated' => ':username l’ha actualitzat :updateDiff',
     'comment_updated_indicator' => 'Actualitzat',
-    'comment_deleted_success' => 'Comentari suprimit',
-    'comment_created_success' => 'Comentari afegit',
-    'comment_updated_success' => 'Comentari actualitzat',
-    'comment_delete_confirm' => 'Segur que voleu suprimir aquest comentari?',
+    'comment_deleted_success' => 'S’ha suprimit el comentari',
+    'comment_created_success' => 'S’ha afegit un comentari',
+    'comment_updated_success' => 'S’ha actualitzat un comentari',
+    'comment_delete_confirm' => 'Esteu segur que voleu suprimir aquest comentari?',
     'comment_in_reply_to' => 'En resposta a :commentId',
-    'comment_editor_explain' => 'Aquí hi ha els comentaris que s’han deixat en aquesta pàgina. Els comentaris es poden afegir i gestionar en veure una pàgina desada.',
+    'comment_editor_explain' => 'Vet aquí els comentaris que s’han fet en aquesta pàgina. Els comentaris es poden fer i gestionar quan es visualitza la pàgina desada.',
 
     // Revision
-    'revision_delete_confirm' => 'Segur que voleu suprimir aquesta revisió?',
-    'revision_restore_confirm' => 'Segur que voleu restaurar aquesta revisió? Se substituirà el contingut de la pàgina actual.',
+    'revision_delete_confirm' => 'Esteu segur que voleu suprimir aquesta revisió?',
+    'revision_restore_confirm' => 'Esteu segur que voleu restaurar aquesta revisió? Se substituirà el contingut actual de la pàgina.',
     'revision_cannot_delete_latest' => 'No es pot suprimir la darrera revisió.',
 
     // Copy view
-    'copy_consider' => 'Tingueu en compte el següent quan copieu contingut.',
+    'copy_consider' => 'Quan copieu contingut, tingueu en compte el següent:',
     'copy_consider_permissions' => 'No es copiarà la configuració personalitzada de permisos.',
-    'copy_consider_owner' => 'Esdevindreu el nou propietari de qualsevol contingut copiat.',
-    'copy_consider_images' => 'Els fitxers d’imatge de les pàgines no es duplicaran i les imatges originals mantindran la relació amb la pàgina a la qual es van pujar originalment.',
-    'copy_consider_attachments' => 'No es copiaran les adjuncions de la pàgina.',
-    'copy_consider_access' => 'Un canvi d’ubicació, propietari o permisos pot provocar que aquest contingut esdevingui accessible a públic que abans no n’hi tenia.',
+    'copy_consider_owner' => 'Sereu el propietari de tot el contingut copiat.',
+    'copy_consider_images' => 'Els fitxers d’imatge de la pàgina no es duplicaran i les imatges originals conservaran la relació amb la pàgina a què es van pujar originalment.',
+    'copy_consider_attachments' => 'No es copiaran els fitxers adjunts de la pàgina.',
+    'copy_consider_access' => 'És possible que, en canviar la ubicació, el propietari o els permisos, el contingut esdevingui accessible a usuaris que no hi tenien accés.',
 
     // Conversions
     'convert_to_shelf' => 'Converteix en prestatge',
-    'convert_to_shelf_contents_desc' => 'Podeu convertir aquest llibre en un prestatge nou amb el mateix contingut. Els capítols continguts en aquest llibre es convertiran en nous lliures. Si aquest llibre conté pàgines que no pertanyin a cap capítol, aquest llibre canviarà de nom i les contindrà, i aquest llibre esdevindrà part del nou prestatge.',
-    'convert_to_shelf_permissions_desc' => 'Qualsevol permís definit en aquest llibre es copiarà al nou prestatge i a tots els nous llibres fills que no tinguin permisos explícits. Tingueu en compte que els permisos dels prestatges no s’hereten automàticament al contingut que continguin de la mateixa manera que passa amb els llibres.',
+    'convert_to_shelf_contents_desc' => 'Pots convertir aquest llibre en un prestatge nou amb els mateixos continguts. Els capítols d’aquest llibre es convertiran en llibres. Si aquest llibre conté cap pàgina que no sigui en un capítol, es canviarà el nom del llibre que contindrà aquestes pàgines i el llibre formarà part del prestatge nou.',
+    'convert_to_shelf_permissions_desc' => 'Es copiaran els permisos d’aquest llibre al prestatge nou i a tots els llibres que contingui que no tinguin els seus propis permisos. Tingueu en compte que els permisos dels prestatges no es propaguen als seus continguts com sí que ho fan els dels llibres.',
     'convert_book' => 'Converteix el llibre',
-    'convert_book_confirm' => 'Segur que voleu convertir aquest llibre?',
-    'convert_undo_warning' => 'No es podrà desfer de manera fàcil.',
+    'convert_book_confirm' => 'Esteu segur que voleu convertir aquest llibre?',
+    'convert_undo_warning' => 'Això no es pot desfer fàcilment.',
     'convert_to_book' => 'Converteix en llibre',
-    'convert_to_book_desc' => 'Podeu convertir aquest capítol en un llibre nou amb el mateix contingut. Qualsevol permís definit en aquest capítol es copiarà al nou llibre, però qualsevol permís heretat del llibre pare no es copiarà, la qual cosa podria implicar canvis en el control d’accés.',
+    'convert_to_book_desc' => 'Podeu convertir aquest capítol en un llibre nou amb els mateixos continguts. Es copiaran els permisos d’aquest capítol al llibre nou, però no es copiaran els permisos heretats del llibre a què pertany cosa que podria canviar-ne el control d’accés.',
     'convert_chapter' => 'Converteix el capítol',
-    'convert_chapter_confirm' => 'Segur que voleu convertir aquest capítol?',
+    'convert_chapter_confirm' => 'Esteu segur que voleu convertir aquest capítol?',
 
     // References
     'references' => 'Referències',
-    'references_none' => 'Ni hi ha cap referència detectada a aquest element.',
-    'references_to_desc' => 'A continuació es llisten tots els continguts coneguts del sistema que enllacen a aquest element.',
+    'references_none' => 'No hi ha cap referència cap a aquest element.',
+    'references_to_desc' => 'A la llista que hi ha a continuació, hi trobareu tot el contingut que enllaça cap aquest element.',
 
     // Watch Options
     'watch' => 'Segueix',
-    'watch_title_default' => 'Preferències per defecte',
-    'watch_desc_default' => 'Restableix el seguiment a només les preferències de notificació per defecte.',
+    'watch_title_default' => 'Preferències predeterminades',
+    'watch_desc_default' => 'Reverteix el seguiment a les preferències de notificació per defecte.',
     'watch_title_ignore' => 'Ignora',
-    'watch_desc_ignore' => 'Ignora totes les notificacions, incloent-hi les preferències a nivell d’usuari.',
+    'watch_desc_ignore' => 'Ignora totes les notificacions, incloent-hi les de les preferències de nivell usuari.',
     'watch_title_new' => 'Pàgines noves',
-    'watch_desc_new' => 'Notifica’m quan es creï qualsevol pàgina nova dins d’aquest element.',
-    'watch_title_updates' => 'Totes les actualitzacions de pàgines',
-    'watch_desc_updates' => 'Notifica’m totes les pàgines noves i qualsevol canvi de pàgina.',
-    'watch_desc_updates_page' => 'Notifica’m tots els canvis de pàgina.',
-    'watch_title_comments' => 'Totes les actualitzacions de pàgines i comentaris',
-    'watch_desc_comments' => 'Notifica’m totes les pàgines noves, qualsevol canvi de pàgina i comentaris nous.',
-    'watch_desc_comments_page' => 'Notifica’m qualsevol canvi de pàgina i comentaris nous.',
-    'watch_change_default' => 'Canvieu les preferències de notificació per deecte',
-    'watch_detail_ignore' => 'S’ignoren les notificacions',
-    'watch_detail_new' => 'Se segueixen pàgines noves',
-    'watch_detail_updates' => 'Se segueixen pàgines noves i actualitzacions',
-    'watch_detail_comments' => 'Se segueixen pàgines noves, actualitzacions i comentaris',
-    'watch_detail_parent_book' => 'Se segueix mitjançant el llibre pare',
-    'watch_detail_parent_book_ignore' => 'S’ignora mitjançant el llibre pare',
-    'watch_detail_parent_chapter' => 'Se segueix mitjançant el capítol pare',
-    'watch_detail_parent_chapter_ignore' => 'S’ignora mitjançant el capítol pare',
+    'watch_desc_new' => 'Notifica’m la creació d’una pàgina nova dins d’aquest element.',
+    'watch_title_updates' => 'Actualitzacions de la pàgina',
+    'watch_desc_updates' => 'Notifica’m totes les pàgines noves i totes les actualitzacions de les pàgines.',
+    'watch_desc_updates_page' => 'Notifica’m totes les actualitzacions de les pàgines.',
+    'watch_title_comments' => 'Actualitzacions i comentaris de la pàgina',
+    'watch_desc_comments' => 'Notifica’m totes les pàgines noves, totes les actualitzacions de les pàgines i tots els comentaris nous.',
+    'watch_desc_comments_page' => 'Notifica’m tots les actualitzacions de pàgines i tots els comentaris nous.',
+    'watch_change_default' => 'Canvia les preferències de notificació per defecte',
+    'watch_detail_ignore' => 'S’estan ignorant les notificacions',
+    'watch_detail_new' => 'S’està fent el seguiment de pàgines noves',
+    'watch_detail_updates' => 'S’està fent el seguiment de pàgines noves i les actualitzacions de les pàgines',
+    'watch_detail_comments' => 'S’està fent el seguiment de pàgines noves i les actualitzacions de les pàgines i els comentaris',
+    'watch_detail_parent_book' => 'S’està fent el seguiment a través del llibre de què és part',
+    'watch_detail_parent_book_ignore' => 'S’està ignorant a través del llibre de què és part',
+    'watch_detail_parent_chapter' => 'S’està fent el seguiment a través del capítol de què és part',
+    'watch_detail_parent_chapter_ignore' => 'S’està ignorant a través del capítol de què és part',
 ];
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 5655276961f..e30ef3d9725 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -6,115 +6,115 @@
 
     // Permissions
     'permission' => 'No teniu permís per a accedir a la pàgina sol·licitada.',
-    'permissionJson' => 'No teniu permís per a executar l’acció sol·licitada.',
+    'permissionJson' => 'No teniu permís per a fer l’acció sol·licitada.',
 
     // Auth
-    'error_user_exists_different_creds' => 'Ja hi ha un usuari amb l’adreça electrònica :email però amb credencials diferents.',
+    'error_user_exists_different_creds' => 'Ja existeix un usuari amb el correu electrònic :email però amb unes credencials diferents.',
     'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
-    'email_already_confirmed' => 'L’adreça electrònica ja està confirmada. Proveu d’iniciar la sessió.',
+    'email_already_confirmed' => 'Ja s’ha confirmat el correu electrònic. Proveu d’iniciar sessió.',
     'email_confirmation_invalid' => 'Aquest testimoni de confirmació no és vàlid o ja s’ha utilitzat. Proveu de tornar-vos a registrar.',
-    'email_confirmation_expired' => 'El testimoni de confirmació ha caducat. S’ha enviat un nou correu electrònic de confirmació.',
-    'email_confirmation_awaiting' => 'Cal confirmar l’adreça electrònica del compte que utilitzeu',
-    'ldap_fail_anonymous' => 'L’accés a l’LDAP ha fallat fent servir un lligam anònim',
-    'ldap_fail_authed' => 'L’accés a l’LDAP ha fallat fent servir els detalls de DN i contrasenya proporcionats',
-    'ldap_extension_not_installed' => 'L’extensió de l’LDAP del PHP no està instal·lada',
-    'ldap_cannot_connect' => 'No s’ha pogut connectar amb el servidor de l’LDAP, la connexió inicial ha fallat',
-    'saml_already_logged_in' => 'Ja heu iniciat la sessió',
-    'saml_no_email_address' => 'No s’ha pogut trobar cap adreça electrònica per a aquest usuari en les dades proporcionades pel sistema d’autenticació extern',
-    'saml_invalid_response_id' => 'La petició del sistema d’autenticació extern no és reconeguda per un procés iniciat per aquesta aplicació. Aquest problema podria ser causat per navegar endarrere després d’iniciar la sessió.',
-    'saml_fail_authed' => 'L’inici de sessió fent servir :system ha fallat, el sistema no ha proporcionat una autorització satisfactòria',
-    'oidc_already_logged_in' => 'Ja teniu una sessió iniciada',
-    'oidc_no_email_address' => 'No s’ha pogut trobar cap adreça electrònica per a aquest usuari en les dades proporcionades pel sistema d’autenticació extern',
-    'oidc_fail_authed' => 'L’inici de sessió fent servir :system ha fallat, el sistema no ha proporcionat una autorització satisfactòria',
-    'social_no_action_defined' => 'No hi ha cap acció definida',
-    'social_login_bad_response' => "S’ha rebut un error mentre s’iniciava la sessió amb :socialAccount: \n:error",
-    'social_account_in_use' => 'Aquest compte de :socialAccount ja està en ús, proveu d’iniciar la sessió mitjançant l’opció de :socialAccount.',
-    'social_account_email_in_use' => 'L’adreça electrònica :email ja està en ús. Si ja teniu un compte, podeu connectar-hi el vostre compte de :socialAccount a la configuració del vostre perfil.',
+    'email_confirmation_expired' => 'Aquest testimoni de confirmació ha caducat. S’ha enviat un altre correu electrònic de confirmació.',
+    'email_confirmation_awaiting' => 'Cal confirmar l’adreça electrònica del compte que utilitzeu.',
+    'ldap_fail_anonymous' => 'L’accés LDAP anònim ha fallat',
+    'ldap_fail_authed' => 'L’accés LDAP amb el nom distintiu i la contrasenya proporcionades',
+    'ldap_extension_not_installed' => 'L’extensió PHP de l’LDAP no està instal·lada',
+    'ldap_cannot_connect' => 'No s’ha pogut connectar amb el servidor LDAP perquè la connexió inicial ha fallat',
+    'saml_already_logged_in' => 'Ja heu iniciat sessió',
+    'saml_no_email_address' => 'No s’ha pogut trobar una adreça electrònica per a aquest usuari a les dades proporcionades pel sistema d’autenticació extern',
+    'saml_invalid_response_id' => 'Un procés iniciat per aquesta aplicació no reconeix la sol·licitud del sistema d’autenticació extern. Haver navegat enrere després d’iniciar sessió en podria ser la causa.',
+    'saml_fail_authed' => 'No s’ha pogut iniciar sessió amb :system perquè el sistema no ha proporcionat una autorització satisfactòria',
+    'oidc_already_logged_in' => 'Ja heu iniciat sessió',
+    'oidc_no_email_address' => 'No s’ha pogut trobar una adreça electrònica per a aquest usuari a les dades proporcionades pel sistema d’autenticació extern',
+    'oidc_fail_authed' => 'No s’ha pogut iniciar sessió amb :system perquè el sistema no ha proporcionat una autorització satisfactòria',
+    'social_no_action_defined' => 'No s’ha definit cap acció',
+    'social_login_bad_response' => "S’ha produït un error en l’inici de sessió amb :socialAccount: \n:error",
+    'social_account_in_use' => 'Aquest compte de :socialAccount ja s’està utilitzant. Proveu d’iniciar sessió amb :socialAccount.',
+    'social_account_email_in_use' => 'L’adreça electrònica :email ja s’està utilitzant. Si ja teniu uns compte podeu connectar-hi el vostre compte de :socialAccount des de la configuració del vostre perfil.',
     'social_account_existing' => 'Aquest compte de :socialAccount ja està associat al vostre perfil.',
-    'social_account_already_used_existing' => 'Aquest compte de :socialAccount ja el fa servir un altre usuari.',
+    'social_account_already_used_existing' => 'Aquest compte de :socialAccount ja està associat a un altre usuari.',
     'social_account_not_used' => 'Aquest compte de :socialAccount no està associat a cap usuari. Associeu-lo a la configuració del vostre perfil. ',
-    'social_account_register_instructions' => 'Si encara no teniu cap compte, podeu registrar-vos fent servir l’opció de :socialAccount.',
+    'social_account_register_instructions' => 'Si encara no teniu un compte, podeu registrar-vos amb l’opció :socialAccount.',
     'social_driver_not_found' => 'No s’ha trobat el controlador social',
-    'social_driver_not_configured' => 'La configuració social de :socialAccount no és correcta.',
-    'invite_token_expired' => 'Aquest enllaç d’invitació ha caducat. Podeu provar de restablir la contrasenya del vostre compte.',
+    'social_driver_not_configured' => 'La configuració de :socialAccount no és correcta.',
+    'invite_token_expired' => 'Aquest enllaç d’invitació ha caducat. Proveu de reinicialitzar la contrasenya.',
     'login_user_not_found' => 'A user for this action could not be found.',
 
     // System
-    'path_not_writable' => 'No s’ha pogut pujar al camí del fitxer :filePath. Assegureu-vos que el servidor hi té permisos d’escriptura.',
-    'cannot_get_image_from_url' => 'No s’ha pogut obtenir la imatge de :url',
-    'cannot_create_thumbs' => 'El servidor no pot crear miniatures. Reviseu que tingueu instal·lada l’extensió GD del PHP.',
-    'server_upload_limit' => 'El servidor no permet pujades d’aquesta mida. Proveu-ho amb una mida de fitxer més petita.',
-    'server_post_limit' => 'El servidor no pot rebre la quantitat de dades que heu proporcionat. Torneu-ho a provar amb menys dades o un fitxer més petit.',
-    'uploaded'  => 'El servidor no permet pujades d’aquesta mida. Proveu-ho amb una mida de fitxer més petita.',
+    'path_not_writable' => 'No s’ha pogut pujar a :filePath. Assegureu-vos que teniu permisos d’escriptura al servidor.',
+    'cannot_get_image_from_url' => 'No s’ha pogut obtenir la imatge des de :url',
+    'cannot_create_thumbs' => 'El servidor no pot crear miniatures. Assegureu-vos que s’ha instal·lat l’extensió de GD PHP.',
+    'server_upload_limit' => 'El servidor no permet pujades d’aquesta mida. Proveu-ho amb una mida més petita.',
+    'server_post_limit' => 'El servidor no pot rebre la quantitat de dades proporcionades. Proveu-ho amb menys dades o amb un fitxer més petit.',
+    'uploaded'  => 'El servidor no permet pujades d’aquesta mida. Proveu-ho amb un fitxer més petit.',
 
     // Drawing & Images
-    'image_upload_error' => 'S’ha produït un error en pujar la imatge',
-    'image_upload_type_error' => 'El tipus d’imatge que heu pujat no és vàlid',
-    'image_upload_replace_type' => 'Les substitucions de fitxers d’imatge han de ser el mateix tipus',
-    'image_upload_memory_limit' => 'No s’ha pogut gestionar la pujada de la imatge i/o crear-ne miniatures a causa dels límits dels recursos del sistema.',
-    'image_thumbnail_memory_limit' => 'No s’ha pogut crear les variacions de mida de la imatge a causa dels límits dels recursos del sistema.',
+    'image_upload_error' => 'S’ha produït un error en pujar la imatge.',
+    'image_upload_type_error' => 'El tipus d’imatge no és vàlid.',
+    'image_upload_replace_type' => 'Els fitxers d’imatge s’han de substituir per un del mateix tipus',
+    'image_upload_memory_limit' => 'No s’ha pogut pujar la imatge o crear-ne les miniatures a causa dels límits dels recursos del sistema.',
+    'image_thumbnail_memory_limit' => 'No s’han pogut crear mides d’imatge diferents a causa dels límits dels recursos del sistema.',
     'image_gallery_thumbnail_memory_limit' => 'No s’han pogut crear les miniatures de la galeria a causa dels límits dels recursos del sistema.',
-    'drawing_data_not_found' => 'No s’han pogut carregar les dades de dibuix. És possible que el fitxer de dibuix ja no existeixi o que no tingueu permisos per a accedir-hi.',
+    'drawing_data_not_found' => 'No s’han pogut pujar les dades del dibuix. És possible que el fitxer del dibuix ja no existeixi o que no tingueu permís per a accedir-hi.',
 
     // Attachments
-    'attachment_not_found' => 'No s’ha trobat l’adjunció',
-    'attachment_upload_error' => 'S’ha produït un error en pujar el fitxer de l’adjunció',
+    'attachment_not_found' => 'No s’ha trobat el fitxer adjunt',
+    'attachment_upload_error' => 'S’ha produït un error en pujar el fitxer adjunt',
 
     // Pages
-    'page_draft_autosave_fail' => 'No s’ha pogut desar l’esborrany. Assegureu-vos que teniu connexió a Internet abans de desar la pàgina',
-    'page_draft_delete_fail' => 'No s’ha pogut suprimir l’esborrany de la pàgina i obtenir el contingut desat actual de la pàgina',
-    'page_custom_home_deletion' => 'No es pot suprimir una pàgina mentre estigui definida com a pàgina d’inici',
+    'page_draft_autosave_fail' => 'No s’ha pogut desar l’esborrany. Assegureu-vos que esteu connectat a internet per a desar la pàgina.',
+    'page_draft_delete_fail' => 'No s’ha pogut suprimir l’esborrany de la pàgina i obtenir el contingut de la pàgina desada actual.',
+    'page_custom_home_deletion' => 'No es pot suprimir una pàgina que està definida com a pàgina d’inici.',
 
     // Entities
-    'entity_not_found' => 'No s’ha trobat l’entitat',
-    'bookshelf_not_found' => 'No s’ha trobat el prestatge',
-    'book_not_found' => 'No s’ha trobat el llibre',
-    'page_not_found' => 'No s’ha trobat la pàgina',
-    'chapter_not_found' => 'No s’ha trobat el capítol',
-    'selected_book_not_found' => 'No s’ha trobat el llibre seleccionat',
-    'selected_book_chapter_not_found' => 'No s’ha trobat el llibre o el capítol seleccionat',
-    'guests_cannot_save_drafts' => 'Els convidats no poden desar esborranys',
+    'entity_not_found' => 'No s’ha trobat l’entitat.',
+    'bookshelf_not_found' => 'No s’ha trobat el prestatge.',
+    'book_not_found' => 'No s’ha trobat el llibre.',
+    'page_not_found' => 'No s’ha trobat la pàgina.',
+    'chapter_not_found' => 'No s’ha trobat el capítol.',
+    'selected_book_not_found' => 'No s’ha trobat el llibre seleccionat.',
+    'selected_book_chapter_not_found' => 'No s’ha trobat el llibre o el capítol seleccionat.',
+    'guests_cannot_save_drafts' => 'Els convidats no poden desar esborranys.',
 
     // Users
-    'users_cannot_delete_only_admin' => 'No podeu suprimir l’únic administrador',
-    'users_cannot_delete_guest' => 'No podeu suprimir l’usuari convidat',
+    'users_cannot_delete_only_admin' => 'No podeu suprimir l’administrador únic.',
+    'users_cannot_delete_guest' => 'No podeu suprimir l’usuari convidat.',
 
     // Roles
-    'role_cannot_be_edited' => 'Aquest rol no es pot editar',
-    'role_system_cannot_be_deleted' => 'Aquest rol és un rol del sistema i no es pot suprimir',
-    'role_registration_default_cannot_delete' => 'No es pot suprimir aquest rol mentre estigui definit com a rol per defecte dels registres',
-    'role_cannot_remove_only_admin' => 'Aquest usuari és l’únic usuari assignat al rol d’administrador. Assigneu el rol d’administrador a un altre usuari abans de provar de suprimir aquest.',
+    'role_cannot_be_edited' => 'No es pot editar aquest rol.',
+    'role_system_cannot_be_deleted' => 'No es pot suprimir aquest rol perquè és un rol del sistema.',
+    'role_registration_default_cannot_delete' => 'No es pot suprimir aquest rol mentre estigui configurat com a rol de registre per defecte.',
+    'role_cannot_remove_only_admin' => 'Aquest és l’únic usuari assignat al rol d’administrador. Assigneu el rol d’administrador a un altre usuari abans de provar de suprimir-lo.',
 
     // Comments
     'comment_list' => 'S’ha produït un error en obtenir els comentaris.',
-    'cannot_add_comment_to_draft' => 'No podeu afegir comentaris a un esborrany.',
+    'cannot_add_comment_to_draft' => 'No es poden afegir comentaris en un esborrany.',
     'comment_add' => 'S’ha produït un error en afegir o actualitzar el comentari.',
     'comment_delete' => 'S’ha produït un error en suprimir el comentari.',
-    'empty_comment' => 'No podeu afegir un comentari buit.',
+    'empty_comment' => 'No es pot afegir un comentari buit.',
 
     // Error pages
     '404_page_not_found' => 'No s’ha trobat la pàgina',
-    'sorry_page_not_found' => 'No hem pogut trobar la pàgina que cerqueu.',
-    'sorry_page_not_found_permission_warning' => 'Si esperàveu que existís, és possible que no tingueu permisos per a veure-la.',
+    'sorry_page_not_found' => 'No s’ha trobat la pàgina que heu cercat.',
+    'sorry_page_not_found_permission_warning' => 'Si la pàgina existeix, és possible que no tingueu permís per a accedir-hi.',
     'image_not_found' => 'No s’ha trobat la imatge',
-    'image_not_found_subtitle' => 'No ha estat possible trobar el fitxer de la imatge que cerqueu.',
-    'image_not_found_details' => 'Si esperàveu que existís, és possible que s’hagi suprimit.',
-    'return_home' => 'Torna a l’inici',
-    'error_occurred' => 'S’ha produït un error',
-    'app_down' => ':appName està fora de servei en aquests moments',
-    'back_soon' => 'Tornarà a estar disponible aviat.',
+    'image_not_found_subtitle' => 'No s’ha trobat la imatge que heu cercat.',
+    'image_not_found_details' => 'És possible que s’hagi suprimit.',
+    'return_home' => 'Torna a la pàgina d’inici',
+    'error_occurred' => 'S’ha produït un error.',
+    'app_down' => ':appName està fora de servei.',
+    'back_soon' => 'Aviat ho arreglarem.',
 
     // API errors
-    'api_no_authorization_found' => 'No s’ha trobat cap testimoni d’autorització a la petició',
-    'api_bad_authorization_format' => 'S’ha trobat un testimoni d’autorització a la petició, però el format sembla erroni',
-    'api_user_token_not_found' => 'No s’ha trobat cap testimoni de l’API per al testimoni d’autorització proporcionat',
-    'api_incorrect_token_secret' => 'El secret proporcionat per al testimoni de l’API proporcionat és incorrecte',
-    'api_user_no_api_permission' => 'El propietari del testimoni de l’API utilitzat no té permís per a fer crides a l’API',
-    'api_user_token_expired' => 'El testimoni d’autorització utilitzat ha caducat',
+    'api_no_authorization_found' => 'No s’ha trobat cap testimoni d’autorització en aquesta sol·licitud.',
+    'api_bad_authorization_format' => 'S’ha trobat un testimoni d’autorització en aquesta sol·licitud però no tenia el format correcte.',
+    'api_user_token_not_found' => 'No s’ha trobat cap testimoni d’API per al testimoni d’autorització proporcionat.',
+    'api_incorrect_token_secret' => 'El secret proporcionat per al testimoni d’API utilitzat no és correcte.',
+    'api_user_no_api_permission' => 'El propietari del testimoni API utilitzat no té permís per a fer crides a l’API.',
+    'api_user_token_expired' => 'El testimoni d’autorització utilitzat ha caducat.',
 
     // Settings & Maintenance
-    'maintenance_test_email_failure' => 'S’ha produït un error en enviar un correu electrònic de prova:',
+    'maintenance_test_email_failure' => 'S’ha produït un error en enviar el correu electrònic de prova:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'L’URL no coincideix amb els amfitrions SSR permesos segons la configuració',
+    'http_ssr_url_no_match' => 'L’URL no coincideix amb els amfitrions SSR configurats permesos.',
 ];
diff --git a/lang/ca/notifications.php b/lang/ca/notifications.php
index 8f86b85ad52..fdea33436de 100644
--- a/lang/ca/notifications.php
+++ b/lang/ca/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'Comentari nou a la pàgina :pageName',
-    'new_comment_intro' => 'Un usuari ha comentat en una pàgina de :appName:',
-    'new_page_subject' => 'Pàgina nova: :pageName',
-    'new_page_intro' => 'S’ha creat una pàgina nova a :appName:',
-    'updated_page_subject' => 'Pàgina actualitzada: :pageName',
-    'updated_page_intro' => 'S’ha actualitzat una pàgina a :appName:',
-    'updated_page_debounce' => 'Per a evitar les notificacions massives, no us enviarem notificacions si hi ha més edicions en aquesta pàgina fetes pel mateix editor.',
+    'new_comment_subject' => 'S’ha fet un comentari a la pàgina :pageName.',
+    'new_comment_intro' => 'S’ha fet un comentari nou en una pàgina a :appName.',
+    'new_page_subject' => 'S’ha creat la pàgina :pageName',
+    'new_page_intro' => 'S’ha creat una pàgina nova a :appName.',
+    'updated_page_subject' => 'S’ha actualitzat la pàgina :pageName',
+    'updated_page_intro' => 'S’ha actualitzat una pàgina a :appName.',
+    'updated_page_debounce' => 'Per a evitar que s’acumulin les notificacions, durant un temps no se us notificarà cap canvi fet en aquesta pàgina pel mateix usuari.',
 
     'detail_page_name' => 'Nom de la pàgina:',
     'detail_page_path' => 'Camí de la pàgina:',
     'detail_commenter' => 'Autor del comentari:',
     'detail_comment' => 'Comentari:',
-    'detail_created_by' => 'Creat per:',
-    'detail_updated_by' => 'Actualitzat per:',
+    'detail_created_by' => 'Creada per:',
+    'detail_updated_by' => 'Actualitzada per:',
 
     'action_view_comment' => 'Mostra el comentari',
     'action_view_page' => 'Mostra la pàgina',
 
-    'footer_reason' => 'Rebeu aquesta notificació perquè :link cobreixen aquest tipus d’activitat en aquest element.',
-    'footer_reason_link' => 'les vostres preferències de notificacions',
+    'footer_reason' => 'Heu rebut aquesta notificació perquè :link inclouen aquest tipus d’activitat per a aquest element.',
+    'footer_reason_link' => 'les vostres preferències de notificació',
 ];
diff --git a/lang/ca/passwords.php b/lang/ca/passwords.php
index 60789c8a248..aa727ad4b61 100644
--- a/lang/ca/passwords.php
+++ b/lang/ca/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => 'Les contrasenyes han de tenir almenys vuit caràcters i coincidir amb la confirmació.',
-    'user' => "No s’ha trobat cap usuari amb aquesta adreça electrònica.",
+    'password' => 'Les contrasenyes han de tenir almenys 8 caràcters i han de coincidir amb la confirmació de contrasenya.',
+    'user' => "No es pot trobar un usuari amb aquesta adreça electrònica.",
     'token' => 'El testimoni de restabliment de la contrasenya no és vàlid per a aquesta adreça electrònica.',
     'sent' => 'Us hem enviat un enllaç per a restablir la contrasenya!',
-    'reset' => 'S’ha restablert la contrasenya!',
+    'reset' => 'S’ha reinicialitzat la contrasenya.',
 
 ];
diff --git a/lang/ca/preferences.php b/lang/ca/preferences.php
index 9d9ed8aa10d..25206726ecd 100644
--- a/lang/ca/preferences.php
+++ b/lang/ca/preferences.php
@@ -7,45 +7,45 @@
 return [
     'my_account' => 'El meu compte',
 
-    'shortcuts' => 'Dreceres',
-    'shortcuts_interface' => 'Preferències de les dreceres de la interfície d’usuari',
-    'shortcuts_toggle_desc' => 'Aquí podeu activar o desactivar les dreceres de teclat de la interfície del sistema, que s’utilitzen per a la navegació i les accions.',
-    'shortcuts_customize_desc' => 'Podeu personalitzar cadascuna de les dreceres següents. Premeu la combinació de tecles desitjada després de seleccionar la casella d’una drecera.',
-    'shortcuts_toggle_label' => 'Dreceres de teclat activades',
+    'shortcuts' => 'Dreceres de teclat',
+    'shortcuts_interface' => 'Preferències de dreceres de teclat de la interfície d’usuari',
+    'shortcuts_toggle_desc' => 'Configureu les dreceres de teclat de la interfície d’usuari del sistema utilitzades per a la navegació i les accions.',
+    'shortcuts_customize_desc' => 'Podeu personalitzar cadascuna de les dreceres a continuació. seleccionant el camp d’entrada de cada drecera i prement la combinació de tecles que vulgueu.',
+    'shortcuts_toggle_label' => 'Activa les dreceres de teclat',
     'shortcuts_section_navigation' => 'Navegació',
     'shortcuts_section_actions' => 'Accions habituals',
     'shortcuts_save' => 'Desa les dreceres',
-    'shortcuts_overlay_desc' => 'Nota: Quan s’activen les dreceres, hi ha una interfície d’ajuda disponible en prémer «?» que destaca les dreceres disponibles per a accions visibles actualment a la pantalla.',
-    'shortcuts_update_success' => 'S’han actualitzat les preferències de les dreceres!',
-    'shortcuts_overview_desc' => 'Gestioneu les dreceres de teclat que podeu utilitzar per a navegar per la interfície d’usuari del sistema.',
+    'shortcuts_overlay_desc' => 'Nota: Quan les dreces estan activades hi haurà disponible una ajuda que es pot obtenir prement &laquo;?&raquo; que ressaltarà les dreceres disponibles a la pantalla que s’estigui visualitzant.',
+    'shortcuts_update_success' => 'S’han actualitzat les preferències de drecera.',
+    'shortcuts_overview_desc' => 'Gestioneu les dreceres que s’utilitzen per a navegar per la interfície d’usuari.',
 
-    'notifications' => 'Preferències de notificació',
-    'notifications_desc' => 'Controleu les notificacions per correu electrònic que rebeu quan es fan certes activitats dins del sistema.',
-    'notifications_opt_own_page_changes' => 'Notifica’m quan hi hagi canvis a pàgines de les quals sóc propietari',
-    'notifications_opt_own_page_comments' => 'Notifica’m quan hi hagi comentaris a pàgines de les quals sóc propietari',
-    'notifications_opt_comment_replies' => 'Notifica’m quan hi hagi respostes als meus comentaris',
+    'notifications' => 'Preferències de les notificacions',
+    'notifications_desc' => 'Gestioneu les notificacions de correu electrònic que rebreu quan es facin certes activitats.',
+    'notifications_opt_own_page_changes' => 'Notifica’m els canvis a les meves pàgines.',
+    'notifications_opt_own_page_comments' => 'Notifica’m la creació de comentaris a les meves pàgines.',
+    'notifications_opt_comment_replies' => 'Notifica’m les respostes als meus comentaris.',
     'notifications_save' => 'Desa les preferències',
-    'notifications_update_success' => 'S’han actualitzat les preferències de notificacions!',
+    'notifications_update_success' => 'S’han actualitzat les preferències de notificació',
     'notifications_watched' => 'Elements seguits i ignorats',
-    'notifications_watched_desc' => 'A continuació hi ha els elements que tenen aplicades preferències de seguiment personalitzades. Per a actualitzar-ne les preferències, consulteu l’element i seleccioneu les opcions de seguiment a la barra lateral.',
+    'notifications_watched_desc' => 'A continuació hi ha els elements que tenen preferències de seguiment personalitzades. Per a actualitzar-les, accediu a l’element i configureu-les a la barra lateral.',
 
     'auth' => 'Accés i seguretat',
     'auth_change_password' => 'Canvia la contrasenya',
-    'auth_change_password_desc' => 'Canvieu la contrasenya que feu servir per a iniciar la sessió a l’aplicació. Cal que tingui un mínim de 8 caràcters.',
-    'auth_change_password_success' => 'S’ha actualitzat la contrasenya!',
+    'auth_change_password_desc' => 'Canvieu la contrasenya que s’utilitzarà per a iniciar sessió a l’aplicació. Ha de tenir com a mínim 8 caràcters.',
+    'auth_change_password_success' => 'S’ha actualitzat la contrasenya.',
 
-    'profile' => 'Detalls del perfil',
-    'profile_desc' => 'Gestioneu els detalls del vostre compte, que us representa davant d’altres usuaris, i també els detalls que s’utilitzen per a la comunicació i la personalització del sistema.',
-    'profile_view_public' => 'Mostra el perfil públic',
-    'profile_name_desc' => 'Configureu el vostre nom públic, que és visible als altres usuaris del sistema a través de les activitats que realitzeu i del contingut del qual sou propietari.',
-    'profile_email_desc' => 'Aquest correu s’utilitza per a notificacions i, depenent de l’autenticació activa del sistema, per a l’accés al sistema.',
-    'profile_email_no_permission' => 'Malauradament, no teniu permisos per a canviar l’adreça electrònica. Si voleu canviar-la, caldrà que demaneu a un administrador que us faci el canvi.',
-    'profile_avatar_desc' => 'Seleccioneu una imatge que us representarà davant d’altres usuaris del sistema. Idealment, aquesta imatge hauria de ser un quadrat de 256 px d’alçada i d’amplada.',
-    'profile_admin_options' => 'Opcions d’administració',
-    'profile_admin_options_desc' => 'Podeu trobar opcions de nivell d’administració addicionals del vostre compte, com ara les que permeten gestionar les assignacions de rols, a l’àrea de l’aplicació «Configuració > Usuaris».',
+    'profile' => 'Informació del perfil',
+    'profile_desc' => 'Gestioneu la informació del vostre compte que representa com us veuran els altres usuaris a més de la informació que s’utilitza per a la comunicació i la personalització del sistema.',
+    'profile_view_public' => 'Mostra’m el perfil públic',
+    'profile_name_desc' => 'Configureu el nom públic que veuran els altres usuaris a les activitats que feu i al vostre contingut.',
+    'profile_email_desc' => 'Aquesta serà l’adreça electrònica on s’enviaran les notificacions i que, segons l’autenticació del sistema activada, s’utilitzarà per a iniciar sessió.',
+    'profile_email_no_permission' => 'No teniu permís per a canviar la vostra adreça electrònica. Si voleu canviar-la, demaneu-ho a un administrador.',
+    'profile_avatar_desc' => 'Seleccioneu una imatge que us representi davant dels altres usuaris. És millor que sigui una imatge quadrada de 256px de costat.',
+    'profile_admin_options' => 'Preferències d’administrador',
+    'profile_admin_options_desc' => 'Podeu trobar preferències addicionals d’administrador pel vostre compte, com ara les que gestionen els rols d’usuari, a &laquo;Preferències &rsaquo; Usuaris&raquo;.',
 
     'delete_account' => 'Suprimeix el compte',
     'delete_my_account' => 'Suprimeix el meu compte',
-    'delete_my_account_desc' => 'Se suprimirà completament el vostre compte d’usuari del sistema. No podreu recuperar aquest compte ni revertir aquesta acció. El contingut que hàgiu creat, com ara les pàgines creades o les imatges pujades, es mantindrà.',
-    'delete_my_account_warning' => 'Segur que voleu suprimir el vostre compte?',
+    'delete_my_account_desc' => 'Se suprimirà completament del sistema el vostre compte d’usuari. No podreu recuperar el compte ni revertir-ne la supressió. Es conservarà el contingut que hàgiu creat, com ara les pàgines o les imatges que hàgiu pujat.',
+    'delete_my_account_warning' => 'Esteu segur que voleu suprimir el vostre compte?',
 ];
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 5fe9d3bffe7..6bb1e8b6989 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -8,119 +8,119 @@
 
     // Common Messages
     'settings' => 'Configuració',
-    'settings_save' => 'Desa la configuració',
-    'system_version' => 'Versió del sistema',
+    'settings_save' => 'Configuració de desat',
+    'system_version' => 'Versió de sistema',
     'categories' => 'Categories',
 
     // App Settings
     'app_customization' => 'Personalització',
-    'app_features_security' => 'Funcionalitats i seguretat',
+    'app_features_security' => 'Funcions i seguretat',
     'app_name' => 'Nom de l’aplicació',
-    'app_name_desc' => 'Aquest nom es mostra a la capçalera i en tots els correus electrònics enviats pel sistema.',
+    'app_name_desc' => 'El nom es mostra a la capçalera i als correus electrònics enviats pel sistema.',
     'app_name_header' => 'Mostra el nom a la capçalera',
     'app_public_access' => 'Accés públic',
-    'app_public_access_desc' => 'Si activeu aquesta opció, es permetrà que els visitants que no hagin iniciat la sessió accedeixin al contingut de la vostra instància del BookStack.',
-    'app_public_access_desc_guest' => 'Podeu controlar l’accés dels visitants públics amb l’usuari «Convidat».',
+    'app_public_access_desc' => 'Si activeu aquesta opció les visitants podran accedir a la vostra instància del BookStack sense iniciar sessió.',
+    'app_public_access_desc_guest' => 'L’accés per als visitants públics es pot gestionar amb l’usuari &laquo;Convidat&raquo;.',
     'app_public_access_toggle' => 'Permet l’accés públic',
-    'app_public_viewing' => 'Voleu permetre la visualització pública?',
-    'app_secure_images' => 'Pujades d’imatges amb més seguretat',
-    'app_secure_images_toggle' => 'Activa les pujades d’imatges amb més seguretat',
-    'app_secure_images_desc' => 'Per motius de rendiment, totes les imatges són públiques. Aquesta opció afegeix una cadena aleatòria i difícil d’endevinar al davant dels URL d’imatges. Assegureu-vos que els índexs de directoris no estiguin activats per a evitar-hi l’accés de manera fàcil.',
+    'app_public_viewing' => 'Esteu segur que voleu permetre l’accés públic?',
+    'app_secure_images' => 'Pujada d’imatges amb més seguretat',
+    'app_secure_images_toggle' => 'Habilita la pujada d’imatges amb més seguretat',
+    'app_secure_images_desc' => 'Per raons de rendiment, totes les imatges són públiques. Aquesta opció afegeix una cadena aleatòria que és difícil d’endevinar al davant de l’URL de les imatges. Assegureu-vos que els índex de carpetes estan desactivats perquè no s’hi pugui accedir fàcilment.',
     'app_default_editor' => 'Editor de pàgines per defecte',
-    'app_default_editor_desc' => 'Seleccioneu quin editor es farà servir per defecte en editar pàgines noves. Es pot canviar a nivell de pàgina si els permisos ho permeten.',
+    'app_default_editor_desc' => 'Seleccioneu quin editor s’utilitzarà per defecte quan s’editin pàgines noves. Això es pot sobreescriure a nivell de pàgina si els permisos ho permeten.',
     'app_custom_html' => 'Contingut personalitzat a la capçalera HTML',
-    'app_custom_html_desc' => 'Aquí podeu afegir contingut que s’inserirà a la part final de la secció <head> de cada pàgina. És útil per a sobreescriure estils o afegir-hi codi d’analítiques.',
-    'app_custom_html_disabled_notice' => 'El contingut personalitzat a la capçalera HTML es desactiva en aquesta pàgina de la configuració per a assegurar que qualsevol canvi que trenqui el web es pugui desfer.',
-    'app_logo' => 'Logo de l’aplicació',
-    'app_logo_desc' => 'Es fa servir a la barra de la capçalera de l’aplicació, a banda d’altres zones. Aquesta imatge ha de fer 86 px d’alçada. Les imatges massa grosses es reduiran.',
+    'app_custom_html_desc' => 'El contingut que s’afegeixi aquí s’inserirà al final de la secció <head> de cada pàgina. Això permet sobreescriure els estils o afegir codi d’analítiques web.',
+    'app_custom_html_disabled_notice' => 'El contingut personalitzat a la capçalera HTML està desactivat en aquesta pàgina perquè es puguin revertir els canvis que trenquin el lloc web.',
+    'app_logo' => 'Logotip de l’aplicació',
+    'app_logo_desc' => 'El logotip s’utilitzarà a la barra de la capçalera de l’aplicació, entre d’altres llocs. La imatge ha de tenir 86px d’alçada. Les imatges més grans es reduiran.',
     'app_icon' => 'Icona de l’aplicació',
-    'app_icon_desc' => 'Aquesta icona es fa servir a la pestanya del navegador i a les icones de les dreceres. Hauria de ser una imatge PNG quadrada de 256 px.',
+    'app_icon_desc' => 'La icona s’utilitzarà a les pestanyes del navegador i a les icones de les adreces. La imatge ha de ser un PNG quadrat de 256px de costat.',
     'app_homepage' => 'Pàgina d’inici de l’aplicació',
-    'app_homepage_desc' => 'Seleccioneu la visualització que es mostrarà a la pàgina d’inici en lloc de la visualització per defecte. Els permisos de pàgines s’ignoraran per a les pàgines seleccionades.',
-    'app_homepage_select' => 'Selecciona una pàgina',
-    'app_footer_links' => 'Enllaços al peu de pàgina',
-    'app_footer_links_desc' => 'Afegiu enllaços que es mostraran al peu de pàgina del lloc. Es mostraran a la part inferior de la majoria de pàgines, incloent-hi les que no requereixen iniciar la sessió. Podeu utilitzar l’etiqueta «trans::<clau>» per a fer servir traduccions definides pel sistema. Per exemple, si feu servir «trans::common.privacy_policy», es mostrarà el text traduït «Política de privadesa», i amb «trans::common.terms_of_service» es mostrarà el text traduït «Condicions del servei».',
-    'app_footer_links_label' => 'Etiqueta de l’enllaç',
+    'app_homepage_desc' => 'Seleccioneu una vista per a mostrar a la pàgina d’inici en comptes de la vista per defecte. Els permisos de pàgina s’ignoren a les pàgines seleccionades.',
+    'app_homepage_select' => 'Seleccioneu una pàgina',
+    'app_footer_links' => 'Enllaços del peu de pàgina',
+    'app_footer_links_desc' => 'Afegiu enllaços per a mostrar al peu de pàgina. Els enllaços es mostraran al final de la majoria de les pàgines, incloent-hi les pàgines per a les que no es requereix iniciar sessió. Podeu utilitzar una etiqueta &laquo;trans::<key>&raquo; per a utilitzar traduccions definides pel sistema. Per exemple: Si utilitzeu &laquo;trans::common.privacy_policy&raquo; es mostrarà la traducció de &laquo;Privacy Policy&raquo; i si utilitzeu &laquo;trans::common.terms_of_service&raquo; es mostrarà la traducció de &laquo;Terms of Service&raquo;.',
+    'app_footer_links_label' => 'Text de l’enllaç',
     'app_footer_links_url' => 'URL de l’enllaç',
-    'app_footer_links_add' => 'Afegeix un enllaç al peu de pàgina',
+    'app_footer_links_add' => 'Afegeix l’enllaç en el peu de pàgina',
     'app_disable_comments' => 'Desactiva els comentaris',
     'app_disable_comments_toggle' => 'Desactiva els comentaris',
-    'app_disable_comments_desc' => 'Desactiva els comentaris a totes les pàgines de l’aplicació. <br> Els comentaris existents no es mostraran.',
+    'app_disable_comments_desc' => 'Desactivarà els comentaris a totes les pàgines de l’aplicació. <br> Els comentaris existents no es mostraran.',
 
     // Color settings
     'color_scheme' => 'Esquema de colors de l’aplicació',
-    'color_scheme_desc' => 'Definiu els colors que s’utilitzaran a la interfície d’usuari de l’aplicació. Els colors es poden configurar de manera separada per als modes fosc i clar perquè encaixin millor amb el tema i n’assegurin la llegibilitat.',
-    'ui_colors_desc' => 'Definiu el color primari de l’aplicació i el color per defecte dels enllaços. El color primari es fa servir sobretot per a la capçalera, els botons i la decoració de la interfície. El color per defecte dels enllaços s’utilitza per als enllaços de text i les  accions, tant al contingut escrit com a la interfície de l’aplicació.',
-    'app_color' => 'Color primari',
+    'color_scheme_desc' => 'Configureu els colors que s’utilitzaran a la interfície d’usuari de l’aplicació. Podeu configurar els colors pel mode clar o el mode fosc per separat perquè escaigui millor al tema i assegurar la llegibilitat.',
+    'ui_colors_desc' => 'Configureu el color principal de l’aplicació i el color per defecte dels enllaços. El color principal s’utilitza al bàner de la capçalera, els botons i les decoracions de la interfície. El color per defecte dels enllaços s’utilitza a les accions i els enllaços de text, tant al contingut escrit com a la interfície de l’aplicació.',
+    'app_color' => 'Color principal',
     'link_color' => 'Color per defecte dels enllaços',
-    'content_colors_desc' => 'Definiu els colors per a tots els elements de la jerarquia d’organització de pàgines. És recomanable triar colors amb una brillantor similar a la dels colors per defecte per a millorar la llegibilitat.',
+    'content_colors_desc' => 'Configureu els colors per a tots els elements en la jerarquia de l’organització de la pàgina. És recomanable que trieu uns colors amb una brillantor similar a la dels colors per defecte per assegurar la llegibilitat.',
     'bookshelf_color' => 'Color dels prestatges',
     'book_color' => 'Color dels llibres',
     'chapter_color' => 'Color dels capítols',
     'page_color' => 'Color de les pàgines',
-    'page_draft_color' => 'Color dels esborranys de pàgines',
+    'page_draft_color' => 'Color de les pàgines d’esborrany',
 
     // Registration Settings
     'reg_settings' => 'Registre',
     'reg_enable' => 'Activa el registre d’usuaris',
     'reg_enable_toggle' => 'Activa el registre d’usuaris',
-    'reg_enable_desc' => 'Si els registres estan activats, els usuaris podran registrar-se ells mateixos com a usuaris de l’aplicació. Un cop registrats, se’ls assigna un únic rol d’usuari per defecte.',
-    'reg_default_role' => 'Rol d’usuari per defecte en registrar-se',
-    'reg_enable_external_warning' => 'L’opció anterior s’ignora quan hi ha activada l’autenticació SAML o LDAP externa. Els comptes d’usuari de membres inexistents es crearan automàticament si l’autenticació contra el sistema extern és satisfactòria.',
-    'reg_email_confirmation' => 'Confirmació de correu electrònic',
-    'reg_email_confirmation_toggle' => 'Requereix la confirmació per correu electrònic',
-    'reg_confirm_email_desc' => 'Si s’utilitza la restricció de dominis, serà obligatòria la confirmació per correu electrònic, i s’ignorarà aquesta opció.',
+    'reg_enable_desc' => 'Quan el registre està activat, els usuaris es podran registrar com a usuari de l’aplicació. Un cop registrat, se’ls assignarà un rol d’usuari per defecte únic.',
+    'reg_default_role' => 'Rol d’usuari per defecte després del registre.',
+    'reg_enable_external_warning' => 'S’ignorarà l’opció de sobre quan l’autenticació LDAP or SAML estigui activada. Es crearan automàticament comptes d’usuari per als membres que encara no ho siguin si no és possible l’autenticació amb els sistema d’autenticació extern.',
+    'reg_email_confirmation' => 'Correu electrònic de confirmació',
+    'reg_email_confirmation_toggle' => 'Requereix un correu electrònic de confirmació',
+    'reg_confirm_email_desc' => 'Si s’utilitza la restricció de dominis es requerirà un correu electrònic de confirmació i s’ignorarà aquesta opció.',
     'reg_confirm_restrict_domain' => 'Restricció de dominis',
-    'reg_confirm_restrict_domain_desc' => 'Introduïu una llista separada per comes de dominis de correu electrònic als quals voleu restringir els registres. S’enviarà un correu electrònic als usuaris perquè confirmin la seva adreça abans de permetre’ls interactuar amb l’aplicació. <br> Tingueu en compte que els usuaris podran canviar les seves adreces electròniques després de registrar-se correctament.',
+    'reg_confirm_restrict_domain_desc' => 'Introduïu una llista separada per comes dels dominis a què voleu restringir el registre. S’enviarà un correu electrònic als usuaris perquè confirmin la seva adreça electrònica abans que puguin interactuar amb l’aplicació. <br> Tingueu en compte que els usuaris podran canviar l’adreça electrònica un cop s’hagin registrat.',
     'reg_confirm_restrict_domain_placeholder' => 'No hi ha cap restricció',
 
     // Maintenance settings
     'maint' => 'Manteniment',
-    'maint_image_cleanup' => 'Neteja les imatges',
-    'maint_image_cleanup_desc' => 'Escaneja el contingut de les pàgines i les revisions per a comprovar quines imatges i diagrames estan en ús actualment i quines imatges són redundants. Assegureu-vos de crear una còpia de seguretat completa de la base de dades i de les imatges abans d’executar això.',
-    'maint_delete_images_only_in_revisions' => 'Suprimeix també les imatges que només existeixin en revisions antigues de pàgines',
+    'maint_image_cleanup' => 'Neteja d’imatges',
+    'maint_image_cleanup_desc' => 'Escanegeu les pàgines i les revisions per a comprovar quines imatges o dibuixos s’utilitzen i quins no. Assegureu-vos de crear una còpia de seguretat completa de la base de dades i de les imatges abans d’executar-la.',
+    'maint_delete_images_only_in_revisions' => 'Suprimiu també les imatges que només existeixen en revisions de pàgina antigues.',
     'maint_image_cleanup_run' => 'Executa la neteja',
-    'maint_image_cleanup_warning' => 'S’han trobat :count imatges potencialment no utilitzades. Segur que voleu suprimir aquestes imatges?',
-    'maint_image_cleanup_success' => 'S’han trobat i suprimit :count imatges potencialment no utilitzades!',
-    'maint_image_cleanup_nothing_found' => 'No s’ha trobat cap imatge no utilitzada, així que no s’ha suprimit res!',
-    'maint_send_test_email' => 'Envia un correu electrònic de prova',
-    'maint_send_test_email_desc' => 'Envia un correu electrònic de prova a l’adreça electrònica que hàgiu especificat al perfil.',
+    'maint_image_cleanup_warning' => 'Imatges que potencialment no s’utilitzen: :count. Esteu segur que voleu suprimir aquestes imatges?',
+    'maint_image_cleanup_success' => 'Imatges que potencialment no s’utilitzen que s’han suprimit: :count.',
+    'maint_image_cleanup_nothing_found' => 'No s’ha trobat cap imatge que no s’utilitzi. No s’ha suprimit res.',
+    'maint_send_test_email' => 'Envia un correu electrònic de prova.',
+    'maint_send_test_email_desc' => 'S’enviarà un correu electrònic de prova a l’adreça electrònica que figura al vostre perfil.',
     'maint_send_test_email_run' => 'Envia el correu electrònic de prova',
-    'maint_send_test_email_success' => 'S’ha enviat el correu electrònic a :address',
+    'maint_send_test_email_success' => 'S’ha enviat un correu electrònic a :address',
     'maint_send_test_email_mail_subject' => 'Correu electrònic de prova',
-    'maint_send_test_email_mail_greeting' => 'El lliurament de correus electrònics sembla que funciona!',
-    'maint_send_test_email_mail_text' => 'Enhorabona! Com que heu rebut aquesta notificació per correu electrònic, la vostra configuració del correu electrònic sembla que està ben configurada.',
-    'maint_recycle_bin_desc' => 'Els prestatges, llibres, capítols i pàgines suprimits s’envien a la paperera de reciclatge perquè es puguin restaurar o suprimir de manera permanent. Pot ser que els elements més antics de la paperera de reciclatge se suprimeixin automàticament després d’un temps, depenent de la configuració del sistema.',
-    'maint_recycle_bin_open' => 'Obre la paperera de reciclatge',
+    'maint_send_test_email_mail_greeting' => 'Sembla que l’enviament de correus electrònics funciona.',
+    'maint_send_test_email_mail_text' => 'Enhorabona! Que hagis rebut aquesta notificació de correu electrònic vol dir que la vostra configuració de correu electrònic és correcta.',
+    'maint_recycle_bin_desc' => 'Els prestatges, els llibres, els capítols i les pàgines suprimides s’envien a la paperera perquè es puguin restaurar o suprimir permanentment. És possible que els elements que fa més temps que són a la paperera s’eliminin automàticament al cap d’un temps segons la configuració del sistema.',
+    'maint_recycle_bin_open' => 'Obre la paperera',
     'maint_regen_references' => 'Regenera les referències',
-    'maint_regen_references_desc' => 'Aquesta acció reconstruirà l’índex de referències entre elements de la base de dades. Normalment es gestiona automàticament, però aquesta acció pot ser útil per a indexar contingut antic o contingut afegit mitjançant mètodes no oficials.',
-    'maint_regen_references_success' => 'L’índex de referències s’ha regenerat!',
-    'maint_timeout_command_note' => 'Nota: Aquesta acció pot trigar estona a executar-se, la qual cosa pot provocar errors de temps d’expera excedits en alguns entorns web. Com a alternativa, podeu executar aquesta acció en una ordre al terminal.',
+    'maint_regen_references_desc' => 'Aquesta acció reconstruirà l’índex de referències creuades entre elements a la base de dades. Normalment es fa automàticament però aquesta acció és útil per a indexar contingut antic o contingut afegit a través de mètodes no oficials.',
+    'maint_regen_references_success' => 'S’ha regenerat l’índex de referències.',
+    'maint_timeout_command_note' => 'Nota: És possible que aquesta acció trigui a executar-se cosa que pot provocar que s’excedeixi el temps d’espera en alguns entorns web. Com a alternativa, podeu executar aquesta acció amb una ordre del terminal.',
 
     // Recycle Bin
-    'recycle_bin' => 'Paperera de reciclatge',
-    'recycle_bin_desc' => 'Aquí podeu restaurar els elements que hàgiu suprimit o triar suprimir-los del sistema de manera permanent. Aquesta llista no té cap filtre, al contrari que altres llistes d’activitat similars en què es tenen en compte els filtres de permisos.',
+    'recycle_bin' => 'Paperera',
+    'recycle_bin_desc' => 'Aquí podeu restaurar els elements que s’han suprimit o suprimir-los permanentment del sistema. Aquesta llista no està filtrada, a diferència de llistes d’activitat similars on s’apliquen filtres de permisos.',
     'recycle_bin_deleted_item' => 'Element suprimit',
     'recycle_bin_deleted_parent' => 'Pare',
     'recycle_bin_deleted_by' => 'Suprimit per',
-    'recycle_bin_deleted_at' => 'Moment de la supressió',
-    'recycle_bin_permanently_delete' => 'Suprimeix permanentment',
+    'recycle_bin_deleted_at' => 'Hora de supressió',
+    'recycle_bin_permanently_delete' => 'Suprimit permanentment',
     'recycle_bin_restore' => 'Restaura',
-    'recycle_bin_contents_empty' => 'La paperera de reciclatge és buida',
-    'recycle_bin_empty' => 'Buida la paperera de reciclatge',
-    'recycle_bin_empty_confirm' => 'Se suprimiran de manera permanent tots els elements de la paperera de reciclatge, incloent-hi el contingut dins de cada element. Segur que voleu buidar la paperera de reciclatge?',
+    'recycle_bin_contents_empty' => 'La paperera és buida',
+    'recycle_bin_empty' => 'Buida la paperera',
+    'recycle_bin_empty_confirm' => 'Se suprimiran permanentment tots els elements que hi ha a la paperera incloent-hi el contingut que hi hagi a cada element. Esteu segur que voleu buidar la paperera?',
     'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
-    'recycle_bin_destroy_list' => 'Elements que es destruiran',
-    'recycle_bin_restore_list' => 'Elements que es restauraran',
-    'recycle_bin_restore_confirm' => 'Aquesta acció restaurarà l’element suprimit, incloent-hi tots els elements fills, a la seva ubicació original. Si la ubicació original ha estat suprimida, i ara és a la paperera de reciclatge, caldrà que també en restaureu l’element pare.',
-    'recycle_bin_restore_deleted_parent' => 'El pare d’aquest element també ha estat suprimit. L’element es mantindrà suprimit fins que el pare també es restauri.',
-    'recycle_bin_restore_parent' => 'Restaura’n el pare',
-    'recycle_bin_destroy_notification' => 'S’han suprimit :count elements en total de la paperera de reciclatge.',
-    'recycle_bin_restore_notification' => 'S’han restaurat :count elements en total de la paperera de reciclatge.',
+    'recycle_bin_destroy_list' => 'Elements per destruir',
+    'recycle_bin_restore_list' => 'Elements per restaurar',
+    'recycle_bin_restore_confirm' => 'Aquesta acció restaurarà l’element suprimit, incloent-hi els elements fills, a la seva ubicació original. Si la ubicació original s’ha suprimit i és a la paperera, l’element pare també s’haurà de restaurar.',
+    'recycle_bin_restore_deleted_parent' => 'El pare d’aquest element també s’ha suprimit. L’element continuarà suprimit fins que no se’n restauri també el pare.',
+    'recycle_bin_restore_parent' => 'Restaura el pare',
+    'recycle_bin_destroy_notification' => 'Elements suprimits de la paperera: :count.',
+    'recycle_bin_restore_notification' => 'Elements restaurats de la paperera: :count.',
 
     // Audit Log
     'audit' => 'Registre d’auditoria',
-    'audit_desc' => 'Aquest registre d’auditoria mostra una llista d’activitats registrades al sistema. Aquesta llista no té cap filtre, al contrari que altres llistes d’activitat similars en què es tenen en compte els filtres de permisos.',
+    'audit_desc' => 'El registre d\'auditoria mostra una llista de les activitats de què es fa un seguiment. Aquesta llista no està filtrada, a diferència de llistes d’activitat similars on s’apliquen filtres de permisos.',
     'audit_event_filter' => 'Filtre d’esdeveniments',
     'audit_event_filter_no_filter' => 'Sense filtre',
     'audit_deleted_item' => 'Element suprimit',
@@ -130,150 +130,150 @@
     'audit_table_related' => 'Element relacionat o detall',
     'audit_table_ip' => 'Adreça IP',
     'audit_table_date' => 'Data de l’activitat',
-    'audit_date_from' => 'Rang de dates a partir de',
-    'audit_date_to' => 'Rang de rates fins a',
+    'audit_date_from' => 'Des de',
+    'audit_date_to' => 'Fins a',
 
     // Role Settings
     'roles' => 'Rols',
     'role_user_roles' => 'Rols d’usuari',
-    'roles_index_desc' => 'Els rols s’utilitzen per a agrupar usuaris i proporcionar permisos del sistema a llurs membres. Quan un usuari és membre de múltiples rols, els privilegis que li concedeixin s’acumularan i l’usuari heretarà totes les habilitats.',
+    'roles_index_desc' => 'Els rols d’usuari s’utilitzen per a agrupar usuaris i donar-los permisos conjuntament. Un usuari que tingui més d’un rol acumularà els privilegis que s’atorguin a tots els rols i n’heretarà els permisos.',
     'roles_x_users_assigned' => ':count usuari assignat|:count usuaris assignats',
     'roles_x_permissions_provided' => ':count permís|:count permisos',
     'roles_assigned_users' => 'Usuaris assignats',
-    'roles_permissions_provided' => 'Permisos proporcionats',
-    'role_create' => 'Crea un rol nou',
-    'role_delete' => 'Suprimeix el rol',
-    'role_delete_confirm' => 'Se suprimirà el rol amb el nom «:roleName».',
-    'role_delete_users_assigned' => 'Aquest rol té :userCount usuaris assignats. Si voleu migrar els usuaris d’aquest rol, seleccioneu un rol nou a continuació.',
+    'roles_permissions_provided' => 'Permisos atorgats',
+    'role_create' => 'Crea un rol',
+    'role_delete' => 'Suprimeix un rol',
+    'role_delete_confirm' => 'Se suprimirà el rol &laquo;:roleName&raquo;.',
+    'role_delete_users_assigned' => 'Usuaris assignats en aquest rol: :userCount. Si voleu migrar aquests usuaris a un altre rol, seleccioneu-ne un dels de sota.',
     'role_delete_no_migration' => "No migris els usuaris",
-    'role_delete_sure' => 'Segur que voleu suprimir aquest rol?',
+    'role_delete_sure' => 'Esteu segur que voleu suprimir aquest rol?',
     'role_edit' => 'Edita el rol',
     'role_details' => 'Detalls del rol',
     'role_name' => 'Nom del rol',
-    'role_desc' => 'Descripció curta del rol',
-    'role_mfa_enforced' => 'Requereix autenticació de múltiple factor',
+    'role_desc' => 'Descripció del rol',
+    'role_mfa_enforced' => 'Autenticació multifactorial requerida',
     'role_external_auth_id' => 'Identificadors d’autenticació externa',
     'role_system' => 'Permisos del sistema',
-    'role_manage_users' => 'Gestiona usuaris',
-    'role_manage_roles' => 'Gestiona rols i permisos de rols',
-    'role_manage_entity_permissions' => 'Gestiona els permisos de tots els llibres, capítols i pàgines',
-    'role_manage_own_entity_permissions' => 'Gestiona els permisos dels llibres, capítols i pàgines propis',
-    'role_manage_page_templates' => 'Gestiona les plantilles de pàgines',
-    'role_access_api' => 'Accedeix a l’API del sistema',
-    'role_manage_settings' => 'Gestiona la configuració de l’aplicació',
-    'role_export_content' => 'Exporta el contingut',
-    'role_editor_change' => 'Canvia l’editor de pàgines',
-    'role_notifications' => 'Rep i gestiona les notificacions',
+    'role_manage_users' => 'Gestió dels usuaris',
+    'role_manage_roles' => 'Gestió dels rols i els seus permisos',
+    'role_manage_entity_permissions' => 'Gestió de tots els permisos de llibres, capítols i pàgines',
+    'role_manage_own_entity_permissions' => 'Gestió dels permisos als seus llibres, capítols i pàgines',
+    'role_manage_page_templates' => 'Gestió de les plantilles de pàgina',
+    'role_access_api' => 'Accés a l’API del sistema',
+    'role_manage_settings' => 'Gestió de la configuració de l’aplicació',
+    'role_export_content' => 'Exportació de contingut',
+    'role_editor_change' => 'Canvi de l’editor de pàgina',
+    'role_notifications' => 'Recepció i gestió de notificacions',
     'role_asset' => 'Permisos de recursos',
-    'roles_system_warning' => 'Tingueu en compte que l’accés a qualsevol dels tres permisos de dalt pot permetre que un usuari alteri els seus propis permisos o els privilegis d’altres usuaris del sistema. Assigneu rols amb aquests permisos només a usuaris de confiança.',
-    'role_asset_desc' => 'Aquests permisos controlen l’accés per defecte als recursos del sistema. Els permisos de llibres, capítols i pàgines tindran més importància que aquests permisos.',
-    'role_asset_admins' => 'Els administradors tenen accés automàticament a tot el contingut, però aquestes opcions poden mostrar o amagar opcions de la interfície d’usuari.',
-    'role_asset_image_view_note' => 'Això és relatiu a la visibilitat dins del gestor d’imatges. L’accés real als fitxers d’imatge pujats dependrà de l’opció d’emmagatzematge d’imatges del sistema.',
+    'roles_system_warning' => 'Tingueu en compte que l’accés a qualsevol dels tres permisos de dalt permeten que l’usuari canviï els seus privilegis i els privilegis d’altres usuaris. Assigneu rols d’usuari amb aquests permisos només a usuaris de confiança.',
+    'role_asset_desc' => 'Aquests permisos controlen l’accés per defecte als recursos del sistema. El permisos dels llibres, capítols i pàgines sobreescriuran aquests permisos.',
+    'role_asset_admins' => 'Als administradors se’ls dona accés automàticament a tot el contingut però aquestes opcions mostren o amaguen opcions de la interfície d’usuari.',
+    'role_asset_image_view_note' => 'Això té relació amb la visibilitat al gestor d’imatges. L’accés a les imatges pujades dependrà de l’opció d’emmagatzematge d’imatges dels sistema.',
     'role_all' => 'Tot',
     'role_own' => 'Propi',
-    'role_controlled_by_asset' => 'Controlat pel recurs en què es pugen',
+    'role_controlled_by_asset' => 'Controlat pel recurs a què estan pujats',
     'role_save' => 'Desa el rol',
-    'role_users' => 'Usuaris amb aquest rol',
-    'role_users_none' => 'Ara mateix no hi ha cap usuari assignat a aquest rol',
+    'role_users' => 'Usuaris assignats en aquest rol',
+    'role_users_none' => 'No hi ha cap usuari assignat en aquest rol',
 
     // Users
     'users' => 'Usuaris',
-    'users_index_desc' => 'Creeu i gestioneu comptes d’usuari individuals dins del sistema. Els comptes d’usuari s’utilitzen per a iniciar la sessió i atribuir el contingut i les activitats. Els permisos d’accés són principalment basats en rols, però si un usuari és propietari o no d’un contingut, entre altres factors, també pot afectar-ne els permisos i l’accés.',
-    'user_profile' => 'Perfil de l’usuari',
+    'users_index_desc' => 'Creeu i gestioneu comptes d’usuari individuals. Els comptes d’usuari s’utilitzen per als inicis de sessió i les atribucions de contingut i activitat. Els permisos d’accés es basen fonamentalment en el rol d’usuari però la propietat del contingut, entre d’altres, també afecta els permisos i l’accés.',
+    'user_profile' => 'Perfil d’usuari',
     'users_add_new' => 'Afegeix un usuari nou',
     'users_search' => 'Cerca usuaris',
-    'users_latest_activity' => 'Darrera activitat',
+    'users_latest_activity' => 'Activitat més recent',
     'users_details' => 'Detalls de l’usuari',
-    'users_details_desc' => 'Definiu un nom públic i una adreça electrònica per a aquest usuari. L’adreça electrònica es farà servir per a iniciar la sessió a l’aplicació.',
-    'users_details_desc_no_email' => 'Definiu un nom públic per a aquest usuari perquè els altres el puguin reconèixer.',
-    'users_role' => 'Rols de l’usuari',
-    'users_role_desc' => 'Seleccioneu a quins rols s’assignarà l’usuari. Si un usuari s’assigna a múltiples rols, els permisos dels rols s’acumularan i l’usuari rebrà totes les habilitats dels rols assignats.',
-    'users_password' => 'Contrasenya de l’usuari',
-    'users_password_desc' => 'Definiu una contrasenya que s’utilitzarà per a iniciar la sessió a l’aplicació. Cal que tingui un mínim de 8 caràcters.',
-    'users_send_invite_text' => 'Podeu elegir enviar un correu d’invitació a aquest usuari, la qual cosa li permetrà definir la seva contrasenya, o podeu definir-li una contrasenya vós.',
-    'users_send_invite_option' => 'Envia un correu d’invitació a l’usuari',
+    'users_details_desc' => 'Configureu un nom i una adreça electrònica per a aquest usuari. L’adreça electrònica s’usarà per a iniciar sessió a l’aplicació.',
+    'users_details_desc_no_email' => 'Configureu un nom per a aquest usuari perquè se’l pugui reconèixer.',
+    'users_role' => 'Rols d’usuari',
+    'users_role_desc' => 'Seleccioneu quins rols s’assignaran en aquest usuari. Si a un usuari se li assignen més d’un rol acumularà els privilegis que s’atorguin a tots els rols i n’heretarà les els permisos.',
+    'users_password' => 'Contrasenya d’usuari',
+    'users_password_desc' => 'Configureu la contrasenya que s’utilitzarà per a iniciar sessió a l’aplicació. Ha de tenir com a mínim 8 caràcters.',
+    'users_send_invite_text' => 'Podeu configurar la contrasenya o enviar un correu electrònic que convidi a l’usuari a configurar-la.',
+    'users_send_invite_option' => 'Envia el correu electrònic',
     'users_external_auth_id' => 'Identificador d’autenticació extern',
-    'users_external_auth_id_desc' => 'Quan es fa servir un sistema d’autenticació extern (com ara SAML2, OIDC o LDAP), aquest és l’identificador que enllaça aquest usuari del BookStack amb el compte del sistema d’autenticació. Podeu ignorar aquest camp si feu servir l’autenticació basada en correu electrònic per defecte.',
-    'users_password_warning' => 'Ompliu-ho només si voleu canviar la contrasenya d’aquest usuari.',
-    'users_system_public' => 'Aquest usuari representa qualsevol usuari convidat que visita la vostra instància. No es pot fer servir per a iniciar la sessió, però s’assigna automàticament.',
+    'users_external_auth_id_desc' => 'Quan s’utilitza un sistema d’autenticació extern (com ara SAML2, OIDC or LDAP) l’identificador enllaça l’usuari amb el compte dels sistema d’autenticació. Podeu ignorar aquest camp si utilitzeu l’autenticació amb correu electrònic per defecte.',
+    'users_password_warning' => 'Ompliu els camps de sota només si voleu canviar la contrasenya d’aquest usuari.',
+    'users_system_public' => 'Aquest usuari representa qualsevol usuari convidat que visiti la instància. No es pot utilitzar per a iniciar sessió sinó que s’assigna automàticament.',
     'users_delete' => 'Suprimeix l’usuari',
     'users_delete_named' => 'Suprimeix l’usuari :userName',
-    'users_delete_warning' => 'Se suprimirà completament del sistema l’usuari amb el nom «:userName».',
-    'users_delete_confirm' => 'Segur que voleu suprimir aquest usuari?',
-    'users_migrate_ownership' => 'Migra l’autoria',
-    'users_migrate_ownership_desc' => 'Seleccioneu un usuari si voleu que un altre usuari esdevingui el propietari de tots els elements que ara són propietat d’aquest usuari.',
-    'users_none_selected' => 'No hi ha cap usuari seleccionat',
+    'users_delete_warning' => 'Se suprimirà l’usuari &laquo;:userName&raquo; del sistema.',
+    'users_delete_confirm' => 'Esteu segur que voleu suprimir aquest usuari?',
+    'users_migrate_ownership' => 'Migració de la propietat',
+    'users_migrate_ownership_desc' => 'Si voleu que un altre usuari esdevingui el propietari de tots els elements d’aquest usuari, seleccioneu-ne un.',
+    'users_none_selected' => 'No s’ha seleccionat cap usuari',
     'users_edit' => 'Edita l’usuari',
     'users_edit_profile' => 'Edita el perfil',
-    'users_avatar' => 'Avatar de l’usuari',
-    'users_avatar_desc' => 'Seleccioneu una imatge que representi aquest usuari. Hauria de ser un quadrat d’aproximadament 256 px.',
-    'users_preferred_language' => 'Llengua preferida',
-    'users_preferred_language_desc' => 'Aquesta opció canviarà la llengua utilitzada a la interfície d’usuari de l’aplicació. No afectarà el contingut creat pels usuaris.',
-    'users_social_accounts' => 'Comptes socials',
-    'users_social_accounts_desc' => 'Vegeu l’estat dels comptes socials connectats d’aquest usuari. Els comptes socials es poden fer servir per a accedir al sistema de manera addicional al sistema d’autenticació principal.',
-    'users_social_accounts_info' => 'Aquí podeu connectar altres comptes per a un inici de sessió més ràpid i còmode. Si desconnecteu un compte aquí, no en revoqueu l’accés d’autorització donat amb anterioritat. Revoqueu-hi l’accés a la configuració del perfil del compte social que hàgiu connectat.',
-    'users_social_connect' => 'Connecta un compte',
+    'users_avatar' => 'Avatar',
+    'users_avatar_desc' => 'Seleccioneu una imatge per a representar aquest usuari. Ha de ser una imatge quadrada de 256px de costat, aproximadament.',
+    'users_preferred_language' => 'Llengua',
+    'users_preferred_language_desc' => 'Canvia la llengua en què es mostra la interfície d’usuari de l’aplicació. No afectarà el contingut creat pels usuaris.',
+    'users_social_accounts' => 'Comptes a les xarxes socials',
+    'users_social_accounts_desc' => 'Mireu l’estat dels comptes socials connectats d’aquest usuari. També es poden utilitzar els comptes socials per a iniciar sessió a banda del sistema d’autenticació principal.',
+    'users_social_accounts_info' => 'Connecteu els vostres comptes socials per a iniciar sessió més ràpidament. La desconnexió d’un compte no revoca l’autorització d’accés atorgada prèviament. Revoqueu l’accés des de la configuració de perfil del compte social connectat.',
+    'users_social_connect' => 'Connecta el compte',
     'users_social_disconnect' => 'Desconnecta el compte',
     'users_social_status_connected' => 'Connectat',
     'users_social_status_disconnected' => 'Desconnectat',
-    'users_social_connected' => 'El compte de :socialAccount s’ha associat correctament al vostre perfil.',
-    'users_social_disconnected' => 'El compte de :socialAccount ’ha desassociat correctament del vostre perfil.',
-    'users_api_tokens' => 'Testimonis de l’API',
-    'users_api_tokens_desc' => 'Creeu i gestioneu els testimonis d’accés que s’utilitzen per a autenticar-vos a l’API REST del BookStack. Els permisos de l’API es gestionen fent servir l’usuari al qual pertany el testimoni.',
-    'users_api_tokens_none' => 'No s’ha creat cap testimoni de l’API per a aquest usuari',
+    'users_social_connected' => 'S’ha connectat el compte :socialAccount al vostre perfil.',
+    'users_social_disconnected' => 'S’ha desconnectat el compte :socialAccount del vostre perfil.',
+    'users_api_tokens' => 'Testimonis API',
+    'users_api_tokens_desc' => 'Creeu i gestioneu els testimonis d’accés que s’utilitzen per autenticar els usuaris amb la l’API REST del BookStack. Els permisos de l’API es gestionen a través de l’usuari a qui pertany el testimoni.',
+    'users_api_tokens_none' => 'No s’ha creat cap testimoni API per a aquest usuari',
     'users_api_tokens_create' => 'Crea un testimoni',
     'users_api_tokens_expires' => 'Caducitat',
     'users_api_tokens_docs' => 'Documentació de l’API',
-    'users_mfa' => 'Autenticació de múltiple factor',
-    'users_mfa_desc' => 'Configureu l’autenticació de múltiple factor com a capa extra de seguretat en el vostre compte d’usuari.',
-    'users_mfa_x_methods' => ':count mètode configurat|:count mètodes configurats',
-    'users_mfa_configure' => 'Configura els mètodes',
+    'users_mfa' => 'Autenticació multifactorial',
+    'users_mfa_desc' => 'Configureu l’autenticació multifactorial per a afegir una capa de seguretat extra al vostre compte d’usuari.',
+    'users_mfa_x_methods' => 'Hi ha :count mètode configurat|Hi ha :count mètodes configurats',
+    'users_mfa_configure' => 'Configura un mètode',
 
     // API Tokens
-    'user_api_token_create' => 'Crea un testimoni de l’API',
+    'user_api_token_create' => 'Crea un testimoni API',
     'user_api_token_name' => 'Nom',
-    'user_api_token_name_desc' => 'Poseu un nom llegible al vostre testimoni com a recordatori futur del propòsit al qual el voleu destinar.',
+    'user_api_token_name_desc' => 'Anomeneu el testimoni amb un nom entenedor que permeti saber-ne el propòsit.',
     'user_api_token_expiry' => 'Data de caducitat',
-    'user_api_token_expiry_desc' => 'Definiu una data en què aquest testimoni caducarà. Després d’aquesta data, les peticions fetes amb aquest testimoni deixaran de funcionar. Si deixeu aquest camp en blanc, es definirà una caducitat d’aquí a 100 anys.',
-    'user_api_token_create_secret_message' => 'Just després de crear aquest testimoni, es generaran i es mostraran un «Identificador del testimoni» i un «Secret del testimoni». El secret només es mostrarà una única vegada: assegureu-vos de copiar-lo a un lloc segur abans de continuar.',
-    'user_api_token' => 'Testimoni de l’API',
-    'user_api_token_id' => 'Identificador del testimoni',
-    'user_api_token_id_desc' => 'Aquest identificador és generat pel sistema per a aquest testimoni i no és editable i caldrà que el proporcioneu a les peticions a l’API.',
-    'user_api_token_secret' => 'Secret del testimoni',
-    'user_api_token_secret_desc' => 'Aquest secret és generat pel sistema per a aquest testimoni i caldrà que el proporcioneu a les peticions a l’API. Només es mostrarà aquesta única vegada, assegureu-vos de copiar-lo a un lloc segur.',
+    'user_api_token_expiry_desc' => 'Configureu la data de caducitat del testimoni. Un cop passada aquesta data, les sol·licituds fetes amb aquest testimoni no funcionaran. Si deixeu aquest camp en blanc, el testimoni caducarà d’aquí 100 anys.',
+    'user_api_token_create_secret_message' => 'Es crearà i es mostrarà un &laquo;identificador de testimoni&raquo; i un &laquo;secret de testimoni&raquo; immediatament després de crear aquest testimoni. El secret es mostrarà només un sol cop. Assegureu-vos d’anotar-lo i de desar-lo en un lloc segur abans de continuar.',
+    'user_api_token' => 'Testimoni API',
+    'user_api_token_id' => 'Identificador de testimoni',
+    'user_api_token_id_desc' => 'És un identificador no editable generat pel sistema per a aquest testimoni i que s’haurà de proporcionar en les sol·licituds API.',
+    'user_api_token_secret' => 'Secret de testimoni',
+    'user_api_token_secret_desc' => 'És un secret generat pel sistema per a aquest testimoni i que s’haurà de proporcionar en les sol·licituds API. Es mostrarà només un sol cop. Assegureu-vos d’anotar-lo i de desar-lo en un lloc segur abans de continuar.',
     'user_api_token_created' => 'Testimoni creat :timeAgo',
     'user_api_token_updated' => 'Testimoni actualitzat :timeAgo',
     'user_api_token_delete' => 'Suprimeix el testimoni',
-    'user_api_token_delete_warning' => 'Se suprimirà completament del sistema aquest testimoni de l’API amb el nom «:tokenName».',
-    'user_api_token_delete_confirm' => 'Segur que voleu suprimir aquest testimoni de l’API?',
+    'user_api_token_delete_warning' => 'Se suprimirà el testimoni API &laquo;:tokenName&raquo; del sistema.',
+    'user_api_token_delete_confirm' => 'Esteu segur que voleu suprimir aquest testimoni API?',
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Els webhooks són una manera d’enviar dades a URL externs quan es produeixen certes accions i esdeveniments al sistema, la qual cosa permet una integració basada en esdeveniments amb plataformes externs, com ara sistemes de missatgeria o de notificacions.',
-    'webhooks_x_trigger_events' => ':count esdeveniment disparador|:count elements disparadors',
-    'webhooks_create' => 'Crea un webhook nou',
-    'webhooks_none_created' => 'Encara no s’ha creat cap webhook.',
+    'webhooks_index_desc' => 'Els webhooks permeten enviar dades a URLs externs quan ocorren unes accions o esdeveniments determinats. Això permet la integració basada en esdeveniments amb plataformes externes com ara sistemes de missatgeria o notificació.',
+    'webhooks_x_trigger_events' => 'Hi ha :count esdeveniment disparador|Hi ha :count esdeveniments disparadors',
+    'webhooks_create' => 'Crea un webhook',
+    'webhooks_none_created' => 'No hi ha cap webhook',
     'webhooks_edit' => 'Edita el webhook',
     'webhooks_save' => 'Desa el webhook',
     'webhooks_details' => 'Detalls del webhook',
-    'webhooks_details_desc' => 'Proporcioneu un nom amigable i un endpoint POST com a ubicació on s’enviaran les dades del webhook.',
-    'webhooks_events' => 'Esdeveniments del webhook',
-    'webhooks_events_desc' => 'Seleccioneu tots els esdeveniments que haurien de fer que es cridés aquest webhook.',
-    'webhooks_events_warning' => 'Tingueu en compte que aquests esdeveniments es produiran per a tots els esdeveniments seleccionats, fins i tot si s’hi apliquen permisos personalitzats. Assegureu-vos que aquest webhook no exposarà contingut confidencial.',
+    'webhooks_details_desc' => 'Anomeneu el webhook amb un nom entenedor i proporcioneu un extrem POST com a ubicació on enviar les dades per al webhook.',
+    'webhooks_events' => 'Esdeveniments webhook',
+    'webhooks_events_desc' => 'Seleccioneu els esdeveniment que voleu que disparin la crida d’aquest webhook.',
+    'webhooks_events_warning' => 'Tingueu en compte que aquestes crides es dispararan a tots els esdeveniments seleccionats, inclús si s’apliquen permisos personalitzats. Assegureu-vos que l’ús d’aquest webhook no exposarà contingut confidencial.',
     'webhooks_events_all' => 'Tots els esdeveniments del sistema',
     'webhooks_name' => 'Nom del webhook',
-    'webhooks_timeout' => 'Temps d’espera de les peticions al webhook (en segons)',
-    'webhooks_endpoint' => 'Endpoint del webhook',
+    'webhooks_timeout' => 'Temps d’espera del webhook (en segons)',
+    'webhooks_endpoint' => 'Extrem del webhook',
     'webhooks_active' => 'Webhook actiu',
     'webhook_events_table_header' => 'Esdeveniments',
     'webhooks_delete' => 'Suprimeix el webhook',
-    'webhooks_delete_warning' => 'Se suprimirà completament del sistema el webhook amb el nom «:webhookName».',
-    'webhooks_delete_confirm' => 'Segur que voleu suprimir aquest webhook?',
-    'webhooks_format_example' => 'Exemple del format del webhook',
-    'webhooks_format_example_desc' => 'Les dades del webhook s’envien com una petició POST a l’endpoint configurat amb un JSON que segueix el següent format. Les propietats «related_item» i «url» són opcionals i dependran del tipus d’esdeveniment produït.',
+    'webhooks_delete_warning' => 'Se suprimirà el webhook &laquo;:webhookName&raquo; del sistema.',
+    'webhooks_delete_confirm' => 'Esteu segur que voleu suprimir aquest webhook?',
+    'webhooks_format_example' => 'Exemple de format de webhook',
+    'webhooks_format_example_desc' => 'Les dades d’un webhook s’envien com una sol·licitud POST a l’extrem configurat com a JSON amb el format següent. Les propietats &laquo;related_item&raquo; i &laquo;url&raquo; són opcionals i dependran del tipus d’esdeveniment que es dispari.',
     'webhooks_status' => 'Estat del webhook',
-    'webhooks_last_called' => 'Cridat per darrera vegada:',
-    'webhooks_last_errored' => 'Error per darrera vegada:',
+    'webhooks_last_called' => 'Darrera crida:',
+    'webhooks_last_errored' => 'Darrer error:',
     'webhooks_last_error_message' => 'Darrer missatge d’error:',
 
     // Licensing
diff --git a/lang/ca/validation.php b/lang/ca/validation.php
index b73a66c5c6c..dc9b02d5024 100644
--- a/lang/ca/validation.php
+++ b/lang/ca/validation.php
@@ -12,13 +12,13 @@
     'active_url'           => 'El camp :attribute no és un URL vàlid.',
     'after'                => 'El camp :attribute ha de ser una data posterior a :date.',
     'alpha'                => 'El camp :attribute només pot contenir lletres.',
-    'alpha_dash'           => 'El camp :attribute només pot contenir lletres, números, guions i guions baixos.',
-    'alpha_num'            => 'El camp :attribute només pot contenir lletres i números.',
-    'array'                => 'El camp :attribute ha de ser un vector.',
-    'backup_codes'         => 'El codi que heu proporcionat no és vàlid o ja s’ha fet servir.',
-    'before'               => 'El camp :attribute ha de ser una data anterior a :date.',
+    'alpha_dash'           => 'El camp :attribute només pot contenir lletres, xifres, guionets i guions baixos.',
+    'alpha_num'            => 'El camp :attribute només pot contenir lletres, xifres.',
+    'array'                => 'El camp :attribute ha de ser una matriu.',
+    'backup_codes'         => 'El codi que heu proporcionat no és vàlid o ja s’ha utilitzat.',
+    'before'               => 'El camp :attribute ha de ser una data posterior a :date.',
     'between'              => [
-        'numeric' => 'El camp :attribute ha d’estar entre :min i :max.',
+        'numeric' => 'El camp :attribute ha de ser un nombre entre :min i :max.',
         'file'    => 'El camp :attribute ha de tenir entre :min i :max kilobytes.',
         'string'  => 'El camp :attribute ha de tenir entre :min i :max caràcters.',
         'array'   => 'El camp :attribute ha de tenir entre :min i :max elements.',
@@ -27,11 +27,11 @@
     'confirmed'            => 'La confirmació del camp :attribute no coincideix.',
     'date'                 => 'El camp :attribute no és una data vàlida.',
     'date_format'          => 'El camp :attribute no coincideix amb el format :format.',
-    'different'            => 'Els camps :attribute i :other han de ser diferents.',
-    'digits'               => 'El camp :attribute ha de tenir :digits dígits.',
-    'digits_between'       => 'El camp :attribute ha de tenir entre :min i :max dígits.',
-    'email'                => 'El camp :attribute ha de ser una adreça electrònica vàlida.',
-    'ends_with' => 'El camp :attribute ha d’acabar amb un dels següents valors: :values',
+    'different'            => 'El camp :attribute i :other han de ser diferents.',
+    'digits'               => 'El camp :attribute ha de tenir :digits xifres.',
+    'digits_between'       => 'El camp :attribute ha de tenir entre :min i :max xifres.',
+    'email'                => 'El camp :attribute ha de ser un adreça electrònica vàlida.',
+    'ends_with' => 'El camp :attribute ha d’acabar amb un dels signes següents: :values',
     'file'                 => 'El camp :attribute ha de ser un fitxer vàlid.',
     'filled'               => 'El camp :attribute és obligatori.',
     'gt'                   => [
@@ -41,74 +41,74 @@
         'array'   => 'El camp :attribute ha de tenir més de :value elements.',
     ],
     'gte'                  => [
-        'numeric' => 'El camp :attribute ha de ser més gran o igual que :value.',
-        'file'    => 'El camp :attribute ha de tenir :value kilobytes o més.',
-        'string'  => 'El camp :attribute ha de tenir :value caràcters o més.',
-        'array'   => 'El camp :attribute ha de tenir :value elements o més.',
+        'numeric' => 'El camp :attribute ha de ser com a mínim :value.',
+        'file'    => 'El camp :attribute ha de tenir com a mínim :value kilobytes.',
+        'string'  => 'El camp :attribute ha de tenir com a mínim :value caràcters.',
+        'array'   => 'El camp :attribute ha de tenir com a mínim :value elements.',
     ],
     'exists'               => 'El camp :attribute seleccionat no és vàlid.',
     'image'                => 'El camp :attribute ha de ser una imatge.',
-    'image_extension'      => 'El camp :attribute ha de tenir una extensió d’imatge vàlida i suportada.',
-    'in'                   => 'El camp :attribute seleccionat no és vàlid.',
-    'integer'              => 'El camp :attribute ha de ser un enter.',
-    'ip'                   => 'El camp :attribute ha de ser una adreça IP vàlida.',
-    'ipv4'                 => 'El camp :attribute ha de ser una adreça IPv4 vàlida.',
-    'ipv6'                 => 'El camp :attribute ha de ser una adreça IPv6 vàlida.',
+    'image_extension'      => 'El camp :attribute ha de tenir una extensió d’imatge compatible.',
+    'in'                   => 'El camp :attribute no és vàlid.',
+    'integer'              => 'El camp :attribute ha de ser un nombre enter.',
+    'ip'                   => 'El camp :attribute ha de ser un adreça IP vàlida.',
+    'ipv4'                 => 'El camp :attribute ha de ser un adreça IPv4 vàlida.',
+    'ipv6'                 => 'El camp :attribute ha de ser un adreça IPv6 vàlida.',
     'json'                 => 'El camp :attribute ha de ser una cadena JSON vàlida.',
     'lt'                   => [
-        'numeric' => 'El camp :attribute ha de ser menor que :value.',
+        'numeric' => 'El camp :attribute ha de ser més petit que :value.',
         'file'    => 'El camp :attribute ha de tenir menys de :value kilobytes.',
         'string'  => 'El camp :attribute ha de tenir menys de :value caràcters.',
         'array'   => 'El camp :attribute ha de tenir menys de :value elements.',
     ],
     'lte'                  => [
-        'numeric' => 'El camp :attribute ha de ser més petit o igual que :value.',
-        'file'    => 'El camp :attribute ha de tenir :value kilobytes o menys.',
-        'string'  => 'El camp :attribute ha de tenir :value caràcters o menys.',
-        'array'   => 'El camp :attribute ha de tenir :value elements o menys.',
+        'numeric' => 'El camp :attribute ha de ser com a màxim :value.',
+        'file'    => 'El camp :attribute ha de tenir com a màxim :value kilobytes.',
+        'string'  => 'El camp :attribute ha de tenir com a màxim :value caràcters.',
+        'array'   => 'El camp :attribute ha de tenir com a màxim :value elements.',
     ],
     'max'                  => [
-        'numeric' => 'El camp :attribute no pot ser més gran que :max.',
-        'file'    => 'El camp :attribute no pot tenir més de :max kilobytes.',
-        'string'  => 'El camp :attribute no pot tenir més de :max caràcters.',
-        'array'   => 'El camp :attribute no pot tenir més de :max elements.',
+        'numeric' => 'El camp :attribute ha de ser com a màxim :max.',
+        'file'    => 'El camp :attribute ha de tenir com a màxim :max kilobytes.',
+        'string'  => 'El camp :attribute ha de tenir com a màxim :max caràcters.',
+        'array'   => 'El camp :attribute ha de tenir com a màxim :max elements.',
     ],
     'mimes'                => 'El camp :attribute ha de ser un fitxer del tipus: :values.',
     'min'                  => [
-        'numeric' => 'El camp :attribute no pot ser més petit que :min.',
-        'file'    => 'El camp :attribute no pot tenir menys de :min kilobytes.',
-        'string'  => 'El camp :attribute no pot tenir menys de :min caràcters.',
-        'array'   => 'El camp :attribute no pot tenir menys de :min elements.',
+        'numeric' => 'El camp :attribute ha de ser com a mínim :min.',
+        'file'    => 'El camp :attribute ha de tenir com a mínim :min kilobytes.',
+        'string'  => 'El camp :attribute ha de tenir com a mínim :min caràcters.',
+        'array'   => 'El camp :attribute ha de tenir com a mínim :min elements.',
     ],
-    'not_in'               => 'El camp :attribute seleccionat no és vàlid.',
-    'not_regex'            => 'El format del camp :attribute no és vàlid.',
-    'numeric'              => 'El camp :attribute ha de ser un número.',
-    'regex'                => 'El format del camp :attribute no és vàlid.',
+    'not_in'               => 'El camp :attribute no és vàlid.',
+    'not_regex'            => 'El format :attribute no és vàlid.',
+    'numeric'              => 'El camp :attribute ha de ser un nombre.',
+    'regex'                => 'El format :attribute no és vàlid.',
     'required'             => 'El camp :attribute és obligatori.',
     'required_if'          => 'El camp :attribute és obligatori quan :other és :value.',
-    'required_with'        => 'El camp :attribute és obligatori quan hi ha aquest valor: :values.',
-    'required_with_all'    => 'El camp :attribute és obligatori quan hi ha algun d’aquests valors: :values.',
-    'required_without'     => 'El camp :attribute és obligatori quan no hi ha aquest valor: :values.',
+    'required_with'        => 'El camp :attribute és obligatori quan hi ha :values.',
+    'required_with_all'    => 'El camp :attribute és obligatori quan hi ha tots aquests valors: :values.',
+    'required_without'     => 'El camp :attribute és obligatori quan no hi ha :values.',
     'required_without_all' => 'El camp :attribute és obligatori quan no hi ha cap d’aquests valors: :values.',
-    'same'                 => 'Els camps :attribute i :other han de coincidir.',
-    'safe_url'             => 'L’enllaç proporcionat podria no ser segur.',
+    'same'                 => 'El camp :attribute i :other han de coincidir.',
+    'safe_url'             => 'És possible que l’enllaç proporcionat no sigui segur.',
     'size'                 => [
         'numeric' => 'El camp :attribute ha de ser :size.',
         'file'    => 'El camp :attribute ha de tenir :size kilobytes.',
-        'string'  => 'El camp :attribute ha de tenir :size caràcters.',
-        'array'   => 'El camp :attribute ha de contenir :size elements.',
+        'string'  => 'El camp :attribute ha de tenir :size caràcters',
+        'array'   => 'El camp :attribute ha de tenir :size elements.',
     ],
-    'string'               => 'El camp :attribute ha de ser una cadena.',
-    'timezone'             => 'El camp :attribute ha de ser una zona vàlida.',
-    'totp'                 => 'El codi que heu proporcionat no és vàlid o ha caducat.',
-    'unique'               => 'El camp :attribute ja es fa servir.',
-    'url'                  => 'El format del camp :attribute no és vàlid.',
-    'uploaded'             => 'No s’ha pogut pujar el fitxer. És possible que el servidor no accepti fitxers d’aquesta mida.',
+    'string'               => 'El camp :attribute ha de ser una cadena de text.',
+    'timezone'             => 'El camp :attribute ha de ser un fus horari vàlid.',
+    'totp'                 => 'El codi proporcionat no és vàlid o ha caducat.',
+    'unique'               => 'El camp :attribute ja s’ha utilitzat.',
+    'url'                  => 'El format :attribute no és vàlid.',
+    'uploaded'             => 'No s’ha pogut pujar el fitxer. És possible que el servidor no admeti fitxers d’aquesta mida.',
 
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
-            'required_with' => 'Cal la confirmació de la contrasenya',
+            'required_with' => 'Heu de confirmar la contrasenya.',
         ],
     ],
 
diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index 4fcc9dacef2..d0bf9cf4577 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -40,14 +40,14 @@
     'book_sort_notification'      => 'Kniha byla úspěšně seřazena',
 
     // Bookshelves
-    'bookshelf_create'            => 'vytvořit knihovnu',
-    'bookshelf_create_notification'    => 'Knihovna byla úspěšně vytvořena',
-    'bookshelf_create_from_book'    => 'převést knihu na knihovnu',
-    'bookshelf_create_from_book_notification'    => 'Kniha byla úspěšně převedena na knihovnu',
-    'bookshelf_update'                 => 'aktualizovat knihovnu',
-    'bookshelf_update_notification'    => 'Knihovna byla úspěšně aktualizována',
+    'bookshelf_create'            => 'vytvořil polici',
+    'bookshelf_create_notification'    => 'Police byla úspěšně vytvořena',
+    'bookshelf_create_from_book'    => 'převést knihu na polici',
+    'bookshelf_create_from_book_notification'    => 'Kniha byla úspěšně převedena na polici',
+    'bookshelf_update'                 => 'aktualizovat polici',
+    'bookshelf_update_notification'    => 'Police byla úspěšně aktualizována',
     'bookshelf_delete'                 => 'odstranit knihovnu',
-    'bookshelf_delete_notification'    => 'Knihovna byla úspěšně smazána',
+    'bookshelf_delete_notification'    => 'Police byla úspěšně odstraněna',
 
     // Revisions
     'revision_restore' => 'obnovil revizi',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 3d402081063..89ff7f2d59e 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -85,35 +85,35 @@
     // Shelves
     'shelf' => 'Knihovna',
     'shelves' => 'Knihovny',
-    'x_shelves' => '{0}:count knihoven|{1}:count knihovna|[2,4]:count knihovny|[5,*]:count knihoven',
-    'shelves_empty' => 'Nebyly vytvořeny žádné knihovny',
-    'shelves_create' => 'Vytvořit novou knihovnu',
-    'shelves_popular' => 'Populární knihovny',
-    'shelves_new' => 'Nové knihovny',
-    'shelves_new_action' => 'Nová Knihovna',
-    'shelves_popular_empty' => 'Nejpopulárnější knihovny se objeví zde.',
-    'shelves_new_empty' => 'Zde se zobrazí nejnověji vytvořené knihovny.',
-    'shelves_save' => 'Uložit knihovnu',
-    'shelves_books' => 'Knihy v této knihovně',
-    'shelves_add_books' => 'Přidat knihy do knihovny',
-    'shelves_drag_books' => 'Přetáhněte knihy níže a přidejte je do této knihovny',
-    'shelves_empty_contents' => 'Tato knihovna neobsahuje žádné knihy',
-    'shelves_edit_and_assign' => 'Upravit knihovnu a přiřadit knihy',
-    'shelves_edit_named' => 'Upravit knihovnu :name',
-    'shelves_edit' => 'Upravit knihovnu',
-    'shelves_delete' => 'Odstranit knihovnu',
-    'shelves_delete_named' => 'Odstranit knihovnu :name',
-    'shelves_delete_explain' => "Chystáte se smazat knihovnu ':name'. Knihy v ní obsažené zůstanou zachovány.",
-    'shelves_delete_confirmation' => 'Opravdu chcete odstranit tuto knihovnu?',
-    'shelves_permissions' => 'Oprávnění knihovny',
-    'shelves_permissions_updated' => 'Oprávnění knihovny byla aktualizována',
-    'shelves_permissions_active' => 'Oprávnění knihovny byla aktivována',
-    'shelves_permissions_cascade_warning' => 'Oprávnění v Knihovnách nejsou automaticky kaskádována do obsažených knih. To proto, že kniha může existovat ve více Knihovnách. Oprávnění však lze zkopírovat do podřízených knih pomocí níže uvedené možnosti.',
+    'x_shelves' => '{0}:count polic|{1}:count police|[2,4]:count police|[5,*]:count polic',
+    'shelves_empty' => 'Nebyly vytvořeny žádné police',
+    'shelves_create' => 'Vytvořit novou polici',
+    'shelves_popular' => 'Populární police',
+    'shelves_new' => 'Nové police',
+    'shelves_new_action' => 'Nová Police',
+    'shelves_popular_empty' => 'Nejpopulárnější police se objeví zde.',
+    'shelves_new_empty' => 'Zde se zobrazí nejnovější police.',
+    'shelves_save' => 'Uložit polici',
+    'shelves_books' => 'Knihy na této polici',
+    'shelves_add_books' => 'Přidat knihy do této police',
+    'shelves_drag_books' => 'Přetáhněte knihy níže a přidejte je do této police',
+    'shelves_empty_contents' => 'Tato police neobsahuje žádné knihy',
+    'shelves_edit_and_assign' => 'Upravit polici a přiřadit knihy',
+    'shelves_edit_named' => 'Upravit polici :name',
+    'shelves_edit' => 'Upravit polici',
+    'shelves_delete' => 'Odstranit polici',
+    'shelves_delete_named' => 'Odstranit polici :name',
+    'shelves_delete_explain' => "Chystáte se smazat polici ':name'. Knihy v ní obsažené zůstanou zachovány.",
+    'shelves_delete_confirmation' => 'Opravdu chcete odstranit tuto polici?',
+    'shelves_permissions' => 'Oprávnění police',
+    'shelves_permissions_updated' => 'Oprávnění police byla aktualizována',
+    'shelves_permissions_active' => 'Oprávnění police byla aktivována',
+    'shelves_permissions_cascade_warning' => 'Oprávnění v policiích nejsou automaticky kaskádována do obsažených knih. To proto, že kniha může existovat ve více policích. Oprávnění však lze zkopírovat do podřízených knih pomocí níže uvedené možnosti.',
     'shelves_permissions_create' => 'Oprávnění k vytváření Shelf se používají pouze ke kopírování oprávnění do dětských knih pomocí níže uvedené akce. Nekontrolují schopnost vytvářet knihy.',
     'shelves_copy_permissions_to_books' => 'Kopírovat oprávnění na knihy',
     'shelves_copy_permissions' => 'Kopírovat oprávnění',
-    'shelves_copy_permissions_explain' => 'Toto použije aktuální nastavení oprávnění knihovny na všechny knihy v ní obsažené. Před aktivací se ujistěte, že byly uloženy všechny změny oprávnění této knihovny.',
-    'shelves_copy_permission_success' => 'Oprávnění knihovny byla zkopírována na :count knih',
+    'shelves_copy_permissions_explain' => 'Tímto se použije aktuální nastavení oprávnění police na všechny knihy v ní obsažené. Před aktivací se ujistěte, že byly uloženy všechny změny oprávnění této police.',
+    'shelves_copy_permission_success' => 'Oprávnění police byla zkopírována na :count knih',
 
     // Books
     'book' => 'Kniha',
@@ -303,7 +303,7 @@
     'page_tags' => 'Štítky stránky',
     'chapter_tags' => 'Štítky kapitoly',
     'book_tags' => 'Štítky knihy',
-    'shelf_tags' => 'Štítky knihovny',
+    'shelf_tags' => 'Štítky police',
     'tag' => 'Štítek',
     'tags' =>  'Štítky',
     'tags_index_desc' => 'Tagy mohou být použity pro obsah v rámci systému pro pružnou formu kategorizace. Tagy mohou mít klíč i hodnotu, přičemž hodnota je nepovinná. Po aplikaci může být obsah dotazován pomocí názvu a hodnoty štítku.',
@@ -316,12 +316,12 @@
     'tags_assigned_pages' => 'Přiřazeno ke stránkám',
     'tags_assigned_chapters' => 'Přiřazeno ke kapitolám',
     'tags_assigned_books' => 'Přiřazeno ke knihám',
-    'tags_assigned_shelves' => 'Přiřazeno ke knihovnám',
+    'tags_assigned_shelves' => 'Přiřazeno k policím',
     'tags_x_unique_values' => ':count jedinečných hodnot',
     'tags_all_values' => 'Všechny hodnoty',
     'tags_view_tags' => 'Zobrazit štítky',
     'tags_view_existing_tags' => 'Zobrazit existující štítky',
-    'tags_list_empty_hint' => 'Štítky mohou být přiřazeny pomocí postranního panelu editoru stránky nebo při úpravách podrobností knihy, kapitoly nebo knihovny.',
+    'tags_list_empty_hint' => 'Štítky mohou být přiřazeny pomocí postranního panelu editoru stránky nebo při úpravách podrobností knihy, kapitoly nebo police.',
     'attachments' => 'Přílohy',
     'attachments_explain' => 'Nahrajte soubory nebo připojte odkazy, které se zobrazí na stránce. Budou k nalezení v postranní liště.',
     'attachments_explain_instant_save' => 'Změny zde provedené se okamžitě ukládají.',
@@ -395,9 +395,9 @@
     'copy_consider_access' => 'Po změně umístění, vlastníka nebo oprávnění může dojít k tomu, že obsah může být přístupný těm, kteří přístup dříve něměli.',
 
     // Conversions
-    'convert_to_shelf' => 'Převést na knihovnu',
-    'convert_to_shelf_contents_desc' => 'Tuto knihu můžete převést na novou knihovnu se stejným obsahem. Kapitoly obsažené v této knize budou převedeny na nové knihy. Pokud tato kniha obsahuje jakékoli stránky, které nejsou uvedeny v kapitole, Tato kniha bude přejmenována a bude obsahovat tyto stránky a tato kniha se stane součástí nové knihovny.',
-    'convert_to_shelf_permissions_desc' => 'Veškerá oprávnění nastavená v této knize budou zkopírována do nové knihovny a do všech nových podřazených knih, které nemají vlastní oprávnění. Všimněte si, že oprávnění na regálech neobsahují automatickou kaskádu na obsah, jak to dělají pro knihy.',
+    'convert_to_shelf' => 'Převést na polici',
+    'convert_to_shelf_contents_desc' => 'Tuto knihu můžete převést na novou polici se stejným obsahem. Kapitoly obsažené v této knize budou převedeny na nové knihy. Pokud tato kniha obsahuje jakékoli stránky, které nejsou uvedeny v kapitole, bude tato kniha přejmenována a bude obsahovat tyto stránky a stane se součástí nové police.',
+    'convert_to_shelf_permissions_desc' => 'Veškerá oprávnění nastavená v této knize budou zkopírována do nové police a do všech nových podřazených knih, které nemají vlastní oprávnění. Všimněte si, že oprávnění na policích neobsahují automatickou kaskádu na obsah, jako je tomu u knih.',
     'convert_book' => 'Převést knihu',
     'convert_book_confirm' => 'Opravdu chcete převést tuto knihu?',
     'convert_undo_warning' => 'To nelze tak snadno vrátit zpět.',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index 0f03f897745..e82be17d3fa 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -67,7 +67,7 @@
 
     // Entities
     'entity_not_found' => 'Prvek nenalezen',
-    'bookshelf_not_found' => 'Knihovna nenalezena',
+    'bookshelf_not_found' => 'Police nenalezena',
     'book_not_found' => 'Kniha nenalezena',
     'page_not_found' => 'Stránka nenalezena',
     'chapter_not_found' => 'Kapitola nenalezena',
diff --git a/lang/cs/notifications.php b/lang/cs/notifications.php
index 8314a0d8f38..caf75f17951 100644
--- a/lang/cs/notifications.php
+++ b/lang/cs/notifications.php
@@ -5,23 +5,23 @@
 return [
 
     'new_comment_subject' => 'Nový komentář na stránce: :pageName',
-    'new_comment_intro' => 'Uživatel(ka) okomentoval(a) stránku v :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'Nová stránka byla vytvořena v :appName:',
+    'new_comment_intro' => 'Uživatel/ka okomentoval/a stránku v :appName:',
+    'new_page_subject' => 'Nová stránka: :pageName',
+    'new_page_intro' => 'V :appName byla vytvořena nová stránka:',
     'updated_page_subject' => 'Aktualizovaná stránka: :pageName',
-    'updated_page_intro' => 'Stránka byla aktualizována v :appName:',
-    'updated_page_debounce' => 'Po nějakou dobu neobdržíte další oznámení o aktualizaci této stránky stejným editorem, aby se omezil počet stejných zaslaných upozornění.',
+    'updated_page_intro' => 'V :appName byla aktualizována stránka:',
+    'updated_page_debounce' => 'Po nějakou dobu neobdržíte další oznámení o aktualizaci této stránky stejným editorem, aby se omezil počet stejných zpráv.',
 
     'detail_page_name' => 'Název stránky:',
-    'detail_page_path' => 'Umístěný v:',
-    'detail_commenter' => 'Komentoval(a):',
+    'detail_page_path' => 'Umístění:',
+    'detail_commenter' => 'Komentoval/a:',
     'detail_comment' => 'Komentář:',
-    'detail_created_by' => 'Vytvořil(a):',
-    'detail_updated_by' => 'Aktualizoval(a):',
+    'detail_created_by' => 'Vytvořil/a:',
+    'detail_updated_by' => 'Aktualizoval/a:',
 
     'action_view_comment' => 'Zobrazit komentář',
     'action_view_page' => 'Zobrazit stránku',
 
-    'footer_reason' => 'Dle :link Vám bylo pro tento typ aktivity zasláno toto upozornění.',
+    'footer_reason' => 'Tato zpráva Vám byla doručena na základě Vašeho :link.',
     'footer_reason_link' => 'nastavení upozornění',
 ];
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 23820fe873b..a74822658a0 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -54,7 +54,7 @@
     'app_color' => 'Hlavní barva',
     'link_color' => 'Výchozí barva odkazu',
     'content_colors_desc' => 'Nastaví barvy pro všechny prvky v organizační struktuře stránky. Pro lepší čitelnost doporučujeme zvolit barvy s podobným jasem, jakou mají výchozí barvy.',
-    'bookshelf_color' => 'Barva knihovny',
+    'bookshelf_color' => 'Barva police',
     'book_color' => 'Barva knihy',
     'chapter_color' => 'Barva kapitoly',
     'page_color' => 'Barva stránky',
@@ -90,7 +90,7 @@
     'maint_send_test_email_mail_subject' => 'Testovací e-mail',
     'maint_send_test_email_mail_greeting' => 'Zdá se, že posílání e-mailů funguje!',
     'maint_send_test_email_mail_text' => 'Gratulujeme! Protože jste dostali tento e-mail, zdá se, že nastavení e-mailů je v pořádku.',
-    'maint_recycle_bin_desc' => 'Odstraněné knihovny, knihy, kapitoly a stránky se přesouvají do Koše, aby je bylo možné obnovit nebo trvale smazat. Starší položky v koši mohou být po čase automaticky odstraněny v závislosti na konfiguraci systému.',
+    'maint_recycle_bin_desc' => 'Odstraněné police, knihy, kapitoly a stránky se přesouvají do Koše, aby je bylo možné obnovit nebo trvale smazat. Starší položky v koši mohou být po čase automaticky odstraněny v závislosti na konfiguraci systému.',
     'maint_recycle_bin_open' => 'Otevřít Koš',
     'maint_regen_references' => 'Přegenerovat odkazy',
     'maint_regen_references_desc' => 'Tato akce obnoví referenční index křížových položek v rámci databáze. Toto je obvykle zpracováno automaticky, ale tato akce může být užitečná pro indexování starého obsahu nebo obsahu přidaného neoficiálními metodami.',
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index b757707d13b..84c4af9f70d 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -30,8 +30,8 @@
     // Books
     'book_create'                 => 'llyfr wedi creu',
     'book_create_notification'    => 'Llyfr wedi\'i creu\'n llwyddiannus',
-    'book_create_from_chapter'              => 'converted chapter to book',
-    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
+    'book_create_from_chapter'              => 'trosodd bennod i lyfr',
+    'book_create_from_chapter_notification' => 'Pennod wedi\'i trosi\'n llwyddiannus i lyfr',
     'book_update'                 => 'llyfr wedi diweddaru',
     'book_update_notification'    => 'Llyfr wedi\'i diweddaru\'n llwyddiannus',
     'book_delete'                 => 'llyfr wedi\'i dileu',
@@ -42,17 +42,17 @@
     // Bookshelves
     'bookshelf_create'            => 'creodd silff',
     'bookshelf_create_notification'    => 'Silff wedi\'i chreu\'n llwyddiannus',
-    'bookshelf_create_from_book'    => 'converted book to shelf',
-    'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
+    'bookshelf_create_from_book'    => 'trosodd lyfr i silff',
+    'bookshelf_create_from_book_notification'    => 'Llyfr wedi\'i trosi\'n llwyddiannus i silff',
     'bookshelf_update'                 => 'diweddarodd silff',
     'bookshelf_update_notification'    => 'Silff wedi\'i diweddaru\'n llwyddiannus',
     'bookshelf_delete'                 => 'dileodd silff',
     'bookshelf_delete_notification'    => 'Silff wedi\'i dileu\'n llwyddiannus',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'adferodd y diwygiad',
+    'revision_delete' => 'dileuodd y diwygiad',
+    'revision_delete_notification' => 'Diwygiad wedi\'i dileu\'n llwyddiannus',
 
     // Favourites
     'favourite_add_notification' => 'Mae ":name" wedi\'i ychwanegu at eich ffefrynnau',
@@ -63,17 +63,17 @@
 
     // Auth
     'auth_login' => 'wedi\'u mewngofnodi',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
+    'auth_register' => 'wedi\'i cofrestru\'n ddefnyddiwr newydd',
+    'auth_password_reset_request' => 'wedi ceisio ailosod gair pass defnyddiwr',
+    'auth_password_reset_update' => 'ailosododd air pass defnyddiwr',
     'mfa_setup_method' => 'configured MFA method',
     'mfa_setup_method_notification' => 'Dull aml-ffactor wedi\'i ffurfweddu\'n llwyddiannus',
     'mfa_remove_method' => 'removed MFA method',
     'mfa_remove_method_notification' => 'Llwyddwyd i ddileu dull aml-ffactor',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
+    'settings_update' => 'diweddarodd osodiadau',
+    'settings_update_notification' => 'Gosodiadau wedi\'i diweddaru\'n llwyddiannus',
     'maintenance_action_run' => 'ran maintenance action',
 
     // Webhooks
@@ -93,24 +93,24 @@
     'user_delete_notification' => 'Tynnwyd y defnyddiwr yn llwyddiannus',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'creodd docyn API',
     'api_token_create_notification' => 'Tocyn API wedi\'i greu\'n llwyddiannus',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'diweddarodd docyn API',
     'api_token_update_notification' => 'Tocyn API wedi\'i ddiweddaru\'n llwyddiannus',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'dileodd docyn API',
     'api_token_delete_notification' => 'Tocyn API wedi\'i ddileu\'n llwyddiannus',
 
     // Roles
-    'role_create' => 'created role',
-    'role_create_notification' => 'Role successfully created',
-    'role_update' => 'updated role',
-    'role_update_notification' => 'Role successfully updated',
-    'role_delete' => 'deleted role',
-    'role_delete_notification' => 'Role successfully deleted',
+    'role_create' => 'creodd rôl',
+    'role_create_notification' => 'Rôl wedi\'i creu\'n llwyddiannus',
+    'role_update' => 'diweddarodd rôl',
+    'role_update_notification' => 'Rôl wedi\'i diweddaru\'n llwyddiannus',
+    'role_delete' => 'dileodd rôl',
+    'role_delete_notification' => 'Rôl wedi\'i dileu\'n llwyddiannus',
 
     // Recycle Bin
     'recycle_bin_empty' => 'gwagodd fin ailgylchu',
-    'recycle_bin_restore' => 'restored from recycle bin',
+    'recycle_bin_restore' => 'wedi\'i adfer o\'r bin ailgylchu',
     'recycle_bin_destroy' => 'removed from recycle bin',
 
     // Comments
diff --git a/lang/cy/auth.php b/lang/cy/auth.php
index bda2e741d0e..8cdb679c8c7 100644
--- a/lang/cy/auth.php
+++ b/lang/cy/auth.php
@@ -39,9 +39,9 @@
     'register_success' => 'Diolch am arwyddo! Rydych bellach wedi cofrestru ac wedi mewngofnodi.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Attempting Login',
+    'auto_init_starting' => 'Wrthi\'n ceisio mewngofnodi',
     'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
-    'auto_init_start_link' => 'Proceed with authentication',
+    'auto_init_start_link' => 'Parhau gyda dilysu',
 
     // Password Reset
     'reset_password' => 'Ailosod cyfrinair',
@@ -49,9 +49,9 @@
     'reset_password_send_button' => 'Anfon Dolen Ailosod',
     'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
     'reset_password_success' => 'Your password has been successfully reset.',
-    'email_reset_subject' => 'Reset your :appName password',
+    'email_reset_subject' => 'Ailosod eich gair pass :appName',
     'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
-    'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
+    'email_reset_not_requested' => 'Os nad oeddwch chi\'n ceisio ailosod eich gair pass, does dim byd arall i wneud.',
 
     // Email Confirmation
     'email_confirm_subject' => 'Cadarnhewch eich e-bost chi a :appName',
@@ -83,19 +83,19 @@
     // Multi-factor Authentication
     'mfa_setup' => 'Setup Multi-Factor Authentication',
     'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'mfa_setup_configured' => 'Already configured',
-    'mfa_setup_reconfigure' => 'Reconfigure',
+    'mfa_setup_configured' => 'Wedi\'i ail-ffurfweddu\'n barod',
+    'mfa_setup_reconfigure' => 'Ail-ffurfweddu',
     'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
-    'mfa_setup_action' => 'Setup',
+    'mfa_setup_action' => 'Gosodiad',
     'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
     'mfa_option_totp_title' => 'Ap Ffôn Symudol',
     'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_option_backup_codes_title' => 'Backup Codes',
+    'mfa_option_backup_codes_title' => 'Codau wrth Gefn',
     'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
-    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
+    'mfa_gen_backup_codes_title' => 'Gosodiad Codau wrth Gefn',
     'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
-    'mfa_gen_backup_codes_download' => 'Download Codes',
+    'mfa_gen_backup_codes_download' => 'Llwytho Codau i Lawr',
     'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
     'mfa_gen_totp_title' => 'Mobile App Setup',
     'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
@@ -103,15 +103,15 @@
     'mfa_gen_totp_verify_setup' => 'Verify Setup',
     'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
     'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
+    'mfa_verify_access' => 'Gwirio Mynediad',
     'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
     'mfa_verify_no_methods' => 'No Methods Configured',
     'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
-    'mfa_verify_use_totp' => 'Verify using a mobile app',
-    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
-    'mfa_verify_backup_code' => 'Backup Code',
+    'mfa_verify_use_totp' => 'Gwirio gan ap ffôn',
+    'mfa_verify_use_backup_codes' => 'Gwirio gan god wrth gefn',
+    'mfa_verify_backup_code' => 'Cod wrth Gefn',
     'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
-    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
+    'mfa_verify_backup_code_enter_here' => 'Cofnodi cod wrth gefn yma',
     'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
     'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
 ];
diff --git a/lang/cy/common.php b/lang/cy/common.php
index 7297e78db53..ce1e188da68 100644
--- a/lang/cy/common.php
+++ b/lang/cy/common.php
@@ -12,13 +12,13 @@
     'save' => 'Cadw',
     'continue' => 'Parhau',
     'select' => 'Dewis',
-    'toggle_all' => 'Toggle All',
+    'toggle_all' => 'Toglo Popeth',
     'more' => 'Mwy',
 
     // Form Labels
     'name' => 'Enw',
     'description' => 'Disgrifiad',
-    'role' => 'Role',
+    'role' => 'Rôl',
     'cover_image' => 'Cover image',
     'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
 
@@ -43,9 +43,9 @@
     'add' => 'Ychwanegu',
     'configure' => 'Ffurfweddu',
     'manage' => 'Rheoli',
-    'fullscreen' => 'Fullscreen',
-    'favourite' => 'Favourite',
-    'unfavourite' => 'Unfavourite',
+    'fullscreen' => 'Sgrin Llawn',
+    'favourite' => 'Gwneud Ffefryn',
+    'unfavourite' => 'Dadwneud Ffefryn',
     'next' => 'Nesa',
     'previous' => 'Cynt',
     'filter_active' => 'Hidl weithredol:',
@@ -60,37 +60,37 @@
     'sort_ascending' => 'Trefnu\'n esgynnol',
     'sort_descending' => 'Trefnu\'n ddisgynnol',
     'sort_name' => 'Enw',
-    'sort_default' => 'Default',
-    'sort_created_at' => 'Created Date',
-    'sort_updated_at' => 'Updated Date',
+    'sort_default' => 'Diofyn',
+    'sort_created_at' => 'Dyddiad Creu',
+    'sort_updated_at' => 'Dyddiad Diweddaru',
 
     // Misc
-    'deleted_user' => 'Deleted User',
-    'no_activity' => 'No activity to show',
+    'deleted_user' => 'Defnyddiwr wedi\'i Dileu',
+    'no_activity' => 'Dim actifedd i arddangos',
     'no_items' => 'Dim eitemau ar gael',
     'back_to_top' => 'Yn ôl i\'r brig',
-    'skip_to_main_content' => 'Skip to main content',
-    'toggle_details' => 'Toggle Details',
-    'toggle_thumbnails' => 'Toggle Thumbnails',
-    'details' => 'Details',
-    'grid_view' => 'Grid View',
-    'list_view' => 'List View',
-    'default' => 'Default',
+    'skip_to_main_content' => 'Neidio i\'r prif gynnwys',
+    'toggle_details' => 'Toglo Manylion',
+    'toggle_thumbnails' => 'Toglo Mân-Luniau',
+    'details' => 'Manylion',
+    'grid_view' => 'Golwg Grid',
+    'list_view' => 'Golwg Rhestr',
+    'default' => 'Diofyn',
     'breadcrumb' => 'Breadcrumb',
-    'status' => 'Status',
+    'status' => 'Statws',
     'status_active' => 'Gweithredol',
     'status_inactive' => 'Anweithredol',
     'never' => 'Byth',
     'none' => 'Dim un',
 
     // Header
-    'homepage' => 'Homepage',
+    'homepage' => 'Tudalen cartref',
     'header_menu_expand' => 'Expand Header Menu',
-    'profile_menu' => 'Profile Menu',
-    'view_profile' => 'View Profile',
-    'edit_profile' => 'Edit Profile',
-    'dark_mode' => 'Dark Mode',
-    'light_mode' => 'Light Mode',
+    'profile_menu' => 'Dewislen Proffil',
+    'view_profile' => 'Gweld proffil',
+    'edit_profile' => 'Golygu Proffil',
+    'dark_mode' => 'Modd Tywyll',
+    'light_mode' => 'Modd Golau',
     'global_search' => 'Global Search',
 
     // Layout tabs
@@ -105,6 +105,6 @@
 
     // Footer Link Options
     // Not directly used but available for convenience to users.
-    'privacy_policy' => 'Privacy Policy',
+    'privacy_policy' => 'Polisi Preifatrwydd',
     'terms_of_service' => 'Terms of Service',
 ];
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index eba7834cc73..ed8119b0538 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -136,7 +136,7 @@
     'cell_border_ridge' => 'Ridge',
     'cell_border_inset' => 'Inset',
     'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
+    'cell_border_none' => 'Dim un',
     'cell_border_hidden' => 'Hidden',
 
     // Images, links, details/summary & embed
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index 9e620b24ed1..6f2e399f62a 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -17,7 +17,7 @@
     'recent_activity' => 'Recent Activity',
     'create_now' => 'Create one now',
     'revisions' => 'Revisions',
-    'meta_revision' => 'Revision #:revisionCount',
+    'meta_revision' => 'Diwygiad #:revisionCount',
     'meta_created' => 'Created :timeLength',
     'meta_created_name' => 'Created :timeLength by :user',
     'meta_updated' => 'Updated :timeLength',
@@ -26,7 +26,7 @@
     'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
     'entity_select' => 'Entity Select',
     'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
-    'images' => 'Images',
+    'images' => 'Delweddau',
     'my_recent_drafts' => 'My Recent Drafts',
     'my_recently_viewed' => 'My Recently Viewed',
     'my_most_viewed_favourites' => 'My Most Viewed Favourites',
@@ -36,7 +36,7 @@
     'no_pages_recently_updated' => 'No pages have been recently updated',
     'export' => 'Export',
     'export_html' => 'Contained Web File',
-    'export_pdf' => 'PDF File',
+    'export_pdf' => 'Ffeil PDF',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
     'default_template' => 'Default Page Template',
@@ -58,7 +58,7 @@
     // Search
     'search_results' => 'Search Results',
     'search_total_results_found' => ':count result found|:count total results found',
-    'search_clear' => 'Clear Search',
+    'search_clear' => 'Clirio\'r Chwiliad',
     'search_no_pages' => 'No pages matched this search',
     'search_for_term' => 'Search for :term',
     'search_more' => 'More Results',
@@ -67,7 +67,7 @@
     'search_content_type' => 'Content Type',
     'search_exact_matches' => 'Exact Matches',
     'search_tags' => 'Tag Searches',
-    'search_options' => 'Options',
+    'search_options' => 'Opsiynau',
     'search_viewed_by_me' => 'Viewed by me',
     'search_not_viewed_by_me' => 'Not viewed by me',
     'search_permissions_set' => 'Permissions set',
@@ -83,14 +83,14 @@
     'search_update' => 'Update Search',
 
     // Shelves
-    'shelf' => 'Shelf',
-    'shelves' => 'Shelves',
-    'x_shelves' => ':count Shelf|:count Shelves',
+    'shelf' => 'Silff',
+    'shelves' => 'Silffau',
+    'x_shelves' => ':count Silff|:count Shelves',
     'shelves_empty' => 'No shelves have been created',
     'shelves_create' => 'Create New Shelf',
     'shelves_popular' => 'Popular Shelves',
-    'shelves_new' => 'New Shelves',
-    'shelves_new_action' => 'New Shelf',
+    'shelves_new' => 'Silffau Newydd',
+    'shelves_new_action' => 'Silff Newydd',
     'shelves_popular_empty' => 'The most popular shelves will appear here.',
     'shelves_new_empty' => 'The most recently created shelves will appear here.',
     'shelves_save' => 'Save Shelf',
@@ -116,8 +116,8 @@
     'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
 
     // Books
-    'book' => 'Book',
-    'books' => 'Books',
+    'book' => 'Llyfr',
+    'books' => 'Llyfrau',
     'x_books' => ':count Book|:count Books',
     'books_empty' => 'No books have been created',
     'books_popular' => 'Popular Books',
@@ -126,19 +126,19 @@
     'books_new_action' => 'New Book',
     'books_popular_empty' => 'The most popular books will appear here.',
     'books_new_empty' => 'The most recently created books will appear here.',
-    'books_create' => 'Create New Book',
-    'books_delete' => 'Delete Book',
-    'books_delete_named' => 'Delete Book :bookName',
+    'books_create' => 'Creu Llyfr Newydd',
+    'books_delete' => 'Dileu Llyfr',
+    'books_delete_named' => 'Dileu :bookName Llyfr',
     'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
     'books_delete_confirmation' => 'Are you sure you want to delete this book?',
-    'books_edit' => 'Edit Book',
-    'books_edit_named' => 'Edit Book :bookName',
-    'books_form_book_name' => 'Book Name',
+    'books_edit' => 'Golygu\'r Llyfr',
+    'books_edit_named' => 'Golygu :bookName Llyfr',
+    'books_form_book_name' => 'Enw\'r Llyfr',
     'books_save' => 'Save Book',
     'books_permissions' => 'Book Permissions',
     'books_permissions_updated' => 'Book Permissions Updated',
     'books_empty_contents' => 'No pages or chapters have been created for this book.',
-    'books_empty_create_page' => 'Create a new page',
+    'books_empty_create_page' => 'Creu tudalen newydd',
     'books_empty_sort_current_book' => 'Sort the current book',
     'books_empty_add_chapter' => 'Add a chapter',
     'books_permissions_active' => 'Book Permissions Active',
@@ -165,18 +165,18 @@
     'books_sort_move_book_end' => 'Move to End of Book',
     'books_sort_move_before_chapter' => 'Move to Before Chapter',
     'books_sort_move_after_chapter' => 'Move to After Chapter',
-    'books_copy' => 'Copy Book',
-    'books_copy_success' => 'Book successfully copied',
+    'books_copy' => 'Copio Llyfr',
+    'books_copy_success' => 'Llyfr wedi\'i copio\'n llwyddiannus',
 
     // Chapters
-    'chapter' => 'Chapter',
-    'chapters' => 'Chapters',
-    'x_chapters' => ':count Chapter|:count Chapters',
+    'chapter' => 'Pennod',
+    'chapters' => 'Penodau',
+    'x_chapters' => ':count Pennod|:count Penodau',
     'chapters_popular' => 'Popular Chapters',
-    'chapters_new' => 'New Chapter',
-    'chapters_create' => 'Create New Chapter',
-    'chapters_delete' => 'Delete Chapter',
-    'chapters_delete_named' => 'Delete Chapter :chapterName',
+    'chapters_new' => 'Pennod Newydd',
+    'chapters_create' => 'Creu Pennod Newydd',
+    'chapters_delete' => 'Dileu Pennod',
+    'chapters_delete_named' => 'Dileu :chapterName Pennod',
     'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
     'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
     'chapters_edit' => 'Edit Chapter',
@@ -196,13 +196,13 @@
     // Pages
     'page' => 'Page',
     'pages' => 'Pages',
-    'x_pages' => ':count Page|:count Pages',
+    'x_pages' => ':count Tudalen|:count Tudalennau',
     'pages_popular' => 'Popular Pages',
-    'pages_new' => 'New Page',
+    'pages_new' => 'Tudalen Newydd',
     'pages_attachments' => 'Attachments',
     'pages_navigation' => 'Page Navigation',
-    'pages_delete' => 'Delete Page',
-    'pages_delete_named' => 'Delete Page :pageName',
+    'pages_delete' => 'Dileu Tudalen',
+    'pages_delete_named' => 'Dileu :pageName Tudalen',
     'pages_delete_draft_named' => 'Delete Draft Page :pageName',
     'pages_delete_draft' => 'Delete Draft Page',
     'pages_delete_success' => 'Page deleted',
@@ -234,9 +234,9 @@
     'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
     'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
     'pages_save' => 'Save Page',
-    'pages_title' => 'Page Title',
-    'pages_name' => 'Page Name',
-    'pages_md_editor' => 'Editor',
+    'pages_title' => 'Teitl y Dudalen',
+    'pages_name' => 'Enw\'r Dudalen',
+    'pages_md_editor' => 'Golygydd',
     'pages_md_preview' => 'Preview',
     'pages_md_insert_image' => 'Insert Image',
     'pages_md_insert_link' => 'Insert Entity Link',
@@ -282,7 +282,7 @@
     'pages_permissions_active' => 'Page Permissions Active',
     'pages_initial_revision' => 'Initial publish',
     'pages_references_update_revision' => 'System auto-update of internal links',
-    'pages_initial_name' => 'New Page',
+    'pages_initial_name' => 'Tudalen Newydd',
     'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
     'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
     'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
@@ -340,7 +340,7 @@
     'attach' => 'Attach',
     'attachments_insert_link' => 'Add Attachment Link to Page',
     'attachments_edit_file' => 'Edit File',
-    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_file_name' => 'Enw\'r Ffeil',
     'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
     'attachments_order_updated' => 'Attachment order updated',
     'attachments_updated_success' => 'Attachment details updated',
@@ -412,12 +412,12 @@
     'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
 
     // Watch Options
-    'watch' => 'Watch',
+    'watch' => 'Gwylio',
     'watch_title_default' => 'Default Preferences',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignore',
     'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
+    'watch_title_new' => 'Tudalennau Newydd',
     'watch_desc_new' => 'Notify when any new page is created within this item.',
     'watch_title_updates' => 'All Page Updates',
     'watch_desc_updates' => 'Notify upon all new pages and page changes.',
diff --git a/lang/cy/preferences.php b/lang/cy/preferences.php
index 2872f5f3c65..89087c9deff 100644
--- a/lang/cy/preferences.php
+++ b/lang/cy/preferences.php
@@ -5,7 +5,7 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Fy Nghyfrif',
 
     'shortcuts' => 'Shortcuts',
     'shortcuts_interface' => 'UI Shortcut Preferences',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index f4c84092c6f..52e03ff15d9 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -7,63 +7,63 @@
 return [
 
     // Common Messages
-    'settings' => 'Settings',
-    'settings_save' => 'Save Settings',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'settings' => 'Gosodiadau',
+    'settings_save' => 'Cadw Gosodiadau',
+    'system_version' => 'Fersiwn System',
+    'categories' => 'Categorïau',
 
     // App Settings
-    'app_customization' => 'Customization',
-    'app_features_security' => 'Features & Security',
-    'app_name' => 'Application Name',
-    'app_name_desc' => 'This name is shown in the header and in any system-sent emails.',
-    'app_name_header' => 'Show name in header',
-    'app_public_access' => 'Public Access',
-    'app_public_access_desc' => 'Enabling this option will allow visitors, that are not logged-in, to access content in your BookStack instance.',
-    'app_public_access_desc_guest' => 'Access for public visitors can be controlled through the "Guest" user.',
-    'app_public_access_toggle' => 'Allow public access',
-    'app_public_viewing' => 'Allow public viewing?',
-    'app_secure_images' => 'Higher Security Image Uploads',
-    'app_secure_images_toggle' => 'Enable higher security image uploads',
-    'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.',
-    'app_default_editor' => 'Default Page Editor',
-    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
-    'app_custom_html' => 'Custom HTML Head Content',
-    'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
-    'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
-    'app_logo' => 'Application Logo',
-    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
-    'app_icon' => 'Application Icon',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
-    'app_homepage' => 'Application Homepage',
-    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
-    'app_homepage_select' => 'Select a page',
-    'app_footer_links' => 'Footer Links',
-    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
-    'app_footer_links_label' => 'Link Label',
-    'app_footer_links_url' => 'Link URL',
-    'app_footer_links_add' => 'Add Footer Link',
-    'app_disable_comments' => 'Disable Comments',
-    'app_disable_comments_toggle' => 'Disable comments',
-    'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
+    'app_customization' => 'Addasiad',
+    'app_features_security' => 'Nodweddion & Diogelwch',
+    'app_name' => 'Enw\'r Rhaglen',
+    'app_name_desc' => 'Dangosir yr enw hwn yn y pennawd ac mewn unrhyw negeseuon e-bost a anfonir gan y system.',
+    'app_name_header' => 'Dangos enw yn y pennyn',
+    'app_public_access' => 'Mynediad Cyhoeddus',
+    'app_public_access_desc' => 'Bydd galluogi\'r opsiwn hwn yn caniatáu i ymwelwyr, nad ydynt wedi mewngofnodi, gael mynediad at gynnwys yn achos BookStack.',
+    'app_public_access_desc_guest' => 'Gellir rheoli mynediad i ymwelwyr cyhoeddus trwy\'r defnyddiwr "Gwestai".',
+    'app_public_access_toggle' => 'Caniatáu mynediad i\'r cyhoedd',
+    'app_public_viewing' => 'Caniatáu i\'r cyhoedd weld?',
+    'app_secure_images' => 'Uwchlwytho Delwedd Diogelwch Uwch',
+    'app_secure_images_toggle' => 'Galluogi uwchlwytho delwedd diogelwch uwch',
+    'app_secure_images_desc' => 'Am resymau perfformiad, mae\'r holl ddelweddau yn gyhoeddus. Mae\'r opsiwn hwn yn ychwanegu llinyn ar hap, anodd ei ddyfalu o flaen urls delwedd. Sicrhau nad yw mynegeion cyfeiriadur yn cael eu galluogi i atal mynediad hawdd.',
+    'app_default_editor' => 'Golygydd Tudalen Diofyn',
+    'app_default_editor_desc' => 'Dewiswch pa olygydd fydd yn cael ei ddefnyddio yn ddiofyn wrth olygu tudalennau newydd. Gellir diystyru hyn ar lefel tudalen os yw’r caniatâd yn galluogi hyn.',
+    'app_custom_html' => 'Cynnwys Pen HTML wedi’i deilwra',
+    'app_custom_html_desc' => 'Bydd unrhyw gynnwys a ychwanegir yma yn cael ei fewnosod i waelod yr adran <head> ar bob tudalen. Mae hyn yn ddefnyddiol ar gyfer diystyru arddulliau neu ychwanegu cod dadansoddeg.',
+    'app_custom_html_disabled_notice' => 'Mae cynnwys pen HTML wedi\'i deilwra wedi’i analluogi ar y dudalen gosodiadau hon i sicrhau y gellir troi unrhyw newidiadau toriadol yn ôl.',
+    'app_logo' => 'Logo’r Rhaglen',
+    'app_logo_desc' => 'Defnyddir hwn ym mar pennawd y rhaglen, ymhlith ardaloedd eraill. Dylai\'r ddelwedd hon fod yn 86px o uchder. Bydd delweddau mawr yn cael eu graddio i lawr.',
+    'app_icon' => 'Eicon yr Ap',
+    'app_icon_desc' => 'Defnyddir yr eicon hwn ar gyfer tabiau porwr ac eiconau llwybr byr. Dylai hwn fod yn ddelwedd PNG sgwâr 256px.',
+    'app_homepage' => 'Hafan y Rhaglen',
+    'app_homepage_desc' => 'Dewiswch wedd i\'w dangos ar yr hafan yn hytrach na\'r wedd ddiofyn. Anwybyddir caniatâd tudalen ar gyfer tudalennau dethol.',
+    'app_homepage_select' => 'Dewiswch dudalen',
+    'app_footer_links' => 'Dolenni Troedynnau',
+    'app_footer_links_desc' => 'Ychwanegwch ddolenni i\'w dangos o fewn troedyn y safle. Bydd y rhain yn cael eu harddangos ar waelod y rhan fwyaf o dudalennau, gan gynnwys y rhai nad oes angen mewngofnodi. Gallwch ddefnyddio label "trans::<key> i ddefnyddio cyfieithiadau wedi\'u diffinio gan y system. Er enghraifft: Bydd defnyddio "trans::common.privacy_policy" yn darparu\'r testun wedi’i gyfieithu "Polisi Preifatrwydd" a "trans::common.terms_of_service" yn darparu\'r testun wedi’i gyfieithu "Telerau Gwasanaeth".',
+    'app_footer_links_label' => 'Label Dolen',
+    'app_footer_links_url' => 'URL Dolen',
+    'app_footer_links_add' => 'Ychwanegu Dolen Troedyn',
+    'app_disable_comments' => 'Analluogi Sylwadau',
+    'app_disable_comments_toggle' => 'Analluogi sylwadau',
+    'app_disable_comments_desc' => 'Analluogi sylwadau ar draws pob tudalen yn y rhaglen. <br> Nid yw\'r sylwadau presennol yn cael eu dangos.',
 
     // Color settings
-    'color_scheme' => 'Application Color Scheme',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
-    'link_color' => 'Default Link Color',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
-    'bookshelf_color' => 'Shelf Color',
-    'book_color' => 'Book Color',
-    'chapter_color' => 'Chapter Color',
-    'page_color' => 'Page Color',
-    'page_draft_color' => 'Page Draft Color',
+    'color_scheme' => 'Cynllun Lliw’r Rhaglen',
+    'color_scheme_desc' => 'Gosodwch y lliwiau i\'w defnyddio yn rhyngwyneb defnyddiwr y rhaglen. Gellir ffurfweddu lliwiau ar wahân ar gyfer moddau tywyll a golau i gyd-fynd â\'r thema orau a sicrhau ei fod yn ddarllenadwy.',
+    'ui_colors_desc' => 'Gosodwch liw sylfaenol y rhaglen a’r lliw diofyn y ddolen. Defnyddir y lliw sylfaenol yn bennaf ar gyfer baner y pennyn, y botymau ac addurniadau rhyngwyneb. Defnyddir lliw diofyn y ddolen ar gyfer dolenni a chamau gweithredu testun, o fewn cynnwys ysgrifenedig ac yn rhyngwyneb y rhaglen.',
+    'app_color' => 'Prif Liw',
+    'link_color' => 'Lliw Diofyn y Ddolen',
+    'content_colors_desc' => 'Gosodwch liwiau ar gyfer pob elfen yn hierarchaeth trefn y dudalen. Argymhellir dewis lliwiau â disgleirdeb tebyg i\'r lliwiau diofyn ar gyfer darllenadwyedd.',
+    'bookshelf_color' => 'Lliw Silff',
+    'book_color' => 'Lliw Llyfr',
+    'chapter_color' => 'Lliw Pennod',
+    'page_color' => 'Lliw Tudalen',
+    'page_draft_color' => 'Lliw Tudalen Ddrafft',
 
     // Registration Settings
-    'reg_settings' => 'Registration',
-    'reg_enable' => 'Enable Registration',
-    'reg_enable_toggle' => 'Enable registration',
+    'reg_settings' => 'Cofrestriad',
+    'reg_enable' => 'Galluogi Cofrestru',
+    'reg_enable_toggle' => 'Galluogi cofrestru',
     'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
     'reg_default_role' => 'Default user role after registration',
     'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
@@ -75,215 +75,215 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Maintenance settings
-    'maint' => 'Maintenance',
-    'maint_image_cleanup' => 'Cleanup Images',
-    'maint_image_cleanup_desc' => 'Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.',
-    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
-    'maint_image_cleanup_run' => 'Run Cleanup',
-    'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
-    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
-    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
-    'maint_send_test_email' => 'Send a Test Email',
-    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
-    'maint_send_test_email_run' => 'Send test email',
-    'maint_send_test_email_success' => 'Email sent to :address',
-    'maint_send_test_email_mail_subject' => 'Test Email',
-    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
-    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
-    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
-    'maint_recycle_bin_open' => 'Open Recycle Bin',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint' => 'Cynnal',
+    'maint_image_cleanup' => 'Glanhau Delweddau',
+    'maint_image_cleanup_desc' => 'Sganio tudalennau a chynnwys adolygu i wirio pa ddelweddau a darluniau sy\'n cael eu defnyddio ar hyn o bryd a pha ddelweddau sy\'n cael eu diddymu. Gwnewch yn siŵr eich bod yn creu cronfa ddata lawn a chopi wrth gefn o’r ddelwedd cyn rhedeg hwn.',
+    'maint_delete_images_only_in_revisions' => 'Hefyd dilëwch ddelweddau sydd ond yn bodoli mewn dhen dudalennau',
+    'maint_image_cleanup_run' => 'Rhedeg Glanhau',
+    'maint_image_cleanup_warning' => 'Daethpwyd o hyd i :count o ddelweddau nas defnyddiwyd o bosibl. Ydych chi\'n siŵr eich bod eisiau dileu’r delweddau hyn?',
+    'maint_image_cleanup_success' => 'daethpwyd o hyd i :count o ddelweddau nas defnyddiwyd o bosibl a chawsant eu dileu!',
+    'maint_image_cleanup_nothing_found' => 'Daethpwyd o hyd i ddim ddelweddau, Dim byd wedi\'i dileu!',
+    'maint_send_test_email' => 'Anfon E-bost Prawf',
+    'maint_send_test_email_desc' => 'Mae hyn yn anfon e-bost prawf i\'ch cyfeiriad e-bost a nodir yn eich proffil.',
+    'maint_send_test_email_run' => 'Anfon e-bost prawf',
+    'maint_send_test_email_success' => 'Anfonwyd e-bost at :address',
+    'maint_send_test_email_mail_subject' => 'E-bost Prawf',
+    'maint_send_test_email_mail_greeting' => 'Mae\'n ymddangos bod anfon e-bost yn gweithio!',
+    'maint_send_test_email_mail_text' => 'Llongyfarchiadau! Gan eich bod wedi derbyn yr hysbysiad e-bost hwn, mae\'n ymddangos bod eich gosodiadau e-bost wedi\'u ffurfweddu\'n iawn.',
+    'maint_recycle_bin_desc' => 'Caiff silffoedd, llyfrau, penodau a thudalennau wedi\'u dileu eu hanfon i’r bin ailgylchu fel y gellir eu hadfer neu eu dileu\'n barhaol. Bydd eitemau hŷn yn y bin ailgylchu yn cael eu dileu’n awtomatig ar ôl ychydig o bosibl, gan ddibynnu ar ffurfweddiad y system.',
+    'maint_recycle_bin_open' => 'Agor y Bin Ailgylchu',
+    'maint_regen_references' => 'Atgynhyrchu Cyfeiriadau',
+    'maint_regen_references_desc' => 'Bydd y weithred hon yn ailadeiladu\'r mynegai cyfeirio traws-eitem yn y gronfa ddata. Fel arfer, caiff hyn ei drin yn awtomatig ond gall y weithred hon fod yn ddefnyddiol i fynegeio hen gynnwys neu gynnwys a ychwanegwyd trwy ddulliau answyddogol.',
+    'maint_regen_references_success' => 'Mae’r mynegai cyfeirio wedi cael ei atgynhyrchu!',
+    'maint_timeout_command_note' => 'Noder: Gall y weithred hon gymryd amser i redeg, a all arwain at faterion amseru mewn rhai amgylcheddau gwe. Fel dewis arall, cyflawnir y weithred hon gan ddefnyddio gorchymyn terfynell.',
 
     // Recycle Bin
-    'recycle_bin' => 'Recycle Bin',
-    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
-    'recycle_bin_deleted_item' => 'Deleted Item',
-    'recycle_bin_deleted_parent' => 'Parent',
-    'recycle_bin_deleted_by' => 'Deleted By',
-    'recycle_bin_deleted_at' => 'Deletion Time',
-    'recycle_bin_permanently_delete' => 'Permanently Delete',
-    'recycle_bin_restore' => 'Restore',
-    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
-    'recycle_bin_empty' => 'Empty Recycle Bin',
-    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
-    'recycle_bin_destroy_list' => 'Items to be Destroyed',
-    'recycle_bin_restore_list' => 'Items to be Restored',
-    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
-    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
-    'recycle_bin_restore_parent' => 'Restore Parent',
-    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
-    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+    'recycle_bin' => 'Bin Ailgylchu',
+    'recycle_bin_desc' => 'Yma gallwch adfer eitemau sydd wedi\'u dileu neu ddewis eu dileu yn barhaol oddi ar y system. Nid yw’r rhestr hon wedi’i hidlo yn wahanol i restrau gweithgaredd tebyg yn y system lle mae hidlwyr caniatâd yn cael eu cymhwyso.',
+    'recycle_bin_deleted_item' => 'Eitem wedi\'i Dileu',
+    'recycle_bin_deleted_parent' => 'Rhiant',
+    'recycle_bin_deleted_by' => 'Dilëwyd gan',
+    'recycle_bin_deleted_at' => 'Amser Dileu',
+    'recycle_bin_permanently_delete' => 'Dileu yn Barhaol',
+    'recycle_bin_restore' => 'Adfer',
+    'recycle_bin_contents_empty' => 'Mae\'r bin ailgylchu yn wag ar hyn o bryd',
+    'recycle_bin_empty' => 'Gwagio’r Bin Ailgylchu',
+    'recycle_bin_empty_confirm' => 'Bydd hyn yn dileu pob eitem yn y bin ailgylchu yn barhaol gan gynnwys popeth sydd wedi\'i gynnwys ym mhob eitem. Ydych chi\'n siŵr eich bod am wagio’r bin ailgylchu?',
+    'recycle_bin_destroy_confirm' => 'Bydd y weithred hon yn dileu\'r eitem hon o\'r system yn barhaol, ynghyd ag unrhyw elfennau plentyn a restrir isod, ac ni fyddwch yn gallu adfer y cynnwys hwn. Ydych chi\'n siŵr eich bod eisiau dileu\'r eitem hon yn barhaol?',
+    'recycle_bin_destroy_list' => 'Eitemau i\'w Dinistrio',
+    'recycle_bin_restore_list' => 'Eitemau i\'w Hadfer',
+    'recycle_bin_restore_confirm' => 'Bydd y weithred hon yn adfer yr eitem a ddilëwyd, gan gynnwys unrhyw elfennau plentyn, i\'w lleoliad gwreiddiol. Os yw\'r lleoliad gwreiddiol wedi\'i ddileu ers hynny, a’i fod bellach yn y bin ailgylchu, bydd angen adfer yr eitem riant hefyd.',
+    'recycle_bin_restore_deleted_parent' => 'Mae rhiant yr eitem hon hefyd wedi\'i dileu. Bydd y rhain yn parhau i fod wedi’u dileu nes bod y rhiant hwnnw hefyd yn cael ei adfer.',
+    'recycle_bin_restore_parent' => 'Adfer Rhiant',
+    'recycle_bin_destroy_notification' => 'Dilëwyd cyfanswm o :count o eitemau o\'r bin ailgylchu.',
+    'recycle_bin_restore_notification' => 'Adferwyd cyfanswm o :count o eitemau o\'r bin ailgylchu.',
 
     // Audit Log
-    'audit' => 'Audit Log',
-    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
-    'audit_event_filter' => 'Event Filter',
-    'audit_event_filter_no_filter' => 'No Filter',
-    'audit_deleted_item' => 'Deleted Item',
-    'audit_deleted_item_name' => 'Name: :name',
-    'audit_table_user' => 'User',
-    'audit_table_event' => 'Event',
-    'audit_table_related' => 'Related Item or Detail',
-    'audit_table_ip' => 'IP Address',
-    'audit_table_date' => 'Activity Date',
+    'audit' => 'Log Awdit',
+    'audit_desc' => 'Mae\'r cofnod archwilio hwn yn dangos rhestr o weithgareddau sydd wedi\'u holrhain yn y system. Nid yw’r rhestr hon wedi’i hidlo yn wahanol i restrau gweithgaredd tebyg yn y system lle mae hidlwyr caniatâd yn cael eu cymhwyso.',
+    'audit_event_filter' => 'Hidlydd Digwyddiad',
+    'audit_event_filter_no_filter' => 'Dim Fidlydd',
+    'audit_deleted_item' => 'Eitem wedi\'i Dileu',
+    'audit_deleted_item_name' => 'Enw: :name',
+    'audit_table_user' => 'Defnyddiwr',
+    'audit_table_event' => 'Digwyddiad',
+    'audit_table_related' => 'Eitem neu Fanylion Cysylltiedig',
+    'audit_table_ip' => 'Cyfeiriad IP',
+    'audit_table_date' => 'Dyddiad Gweithgaredd',
     'audit_date_from' => 'Date Range From',
     'audit_date_to' => 'Date Range To',
 
     // Role Settings
-    'roles' => 'Roles',
-    'role_user_roles' => 'User Roles',
+    'roles' => 'Rolau',
+    'role_user_roles' => 'Rolau Defnyddiwr',
     'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
     'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_x_permissions_provided' => ':count caniatâd|:count caniatâd',
     'roles_assigned_users' => 'Assigned Users',
     'roles_permissions_provided' => 'Provided Permissions',
-    'role_create' => 'Create New Role',
-    'role_delete' => 'Delete Role',
-    'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.',
-    'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.',
-    'role_delete_no_migration' => "Don't migrate users",
-    'role_delete_sure' => 'Are you sure you want to delete this role?',
-    'role_edit' => 'Edit Role',
-    'role_details' => 'Role Details',
-    'role_name' => 'Role Name',
-    'role_desc' => 'Short Description of Role',
-    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
-    'role_external_auth_id' => 'External Authentication IDs',
-    'role_system' => 'System Permissions',
-    'role_manage_users' => 'Manage users',
-    'role_manage_roles' => 'Manage roles & role permissions',
-    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
-    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
-    'role_manage_page_templates' => 'Manage page templates',
-    'role_access_api' => 'Access system API',
-    'role_manage_settings' => 'Manage app settings',
-    'role_export_content' => 'Export content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
-    'role_asset' => 'Asset Permissions',
-    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
-    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
-    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
-    'role_all' => 'All',
-    'role_own' => 'Own',
-    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
-    'role_save' => 'Save Role',
-    'role_users' => 'Users in this role',
-    'role_users_none' => 'No users are currently assigned to this role',
+    'role_create' => 'Creu Rôl Newydd',
+    'role_delete' => 'Dileu Rôl',
+    'role_delete_confirm' => 'Bydd hyn yn dileu\'r rôl gyda\'r enw \':roleName\'.',
+    'role_delete_users_assigned' => 'Mae gan y rôl hon :userCount o ddefnyddwyr wedi’u clustnodi iddi. Os hoffech chi fudo\'r defnyddwyr o\'r rôl hon dewiswch rôl newydd isod.',
+    'role_delete_no_migration' => "Peidiwch â mudo defnyddwyr",
+    'role_delete_sure' => 'Wyt ti\'n bendant eisiau dileu\'r rôl hwn?',
+    'role_edit' => 'Golygu Rôl',
+    'role_details' => 'Manylion Rôl',
+    'role_name' => 'Enw Rôl',
+    'role_desc' => 'Disgrifiad Byr o’r Rôl',
+    'role_mfa_enforced' => 'Angen Dilysu Aml-Ffactor',
+    'role_external_auth_id' => 'ID Dilysu Allanol',
+    'role_system' => 'Caniatâd System',
+    'role_manage_users' => 'Rheoli defnyddwyr',
+    'role_manage_roles' => 'Rheoli rolau & chaniatâd rolau',
+    'role_manage_entity_permissions' => 'Rheoli caniatâd pob llyfr, pennod a thudalen',
+    'role_manage_own_entity_permissions' => 'Rheoli caniatâd eich llyfr, pennod a thudalennau eich hun',
+    'role_manage_page_templates' => 'Rheoli templedi tudalen',
+    'role_access_api' => 'Mynediad i Ryngwyneb Rhaglennu Cymwysiadau (API) system',
+    'role_manage_settings' => 'Rheoli gosodiadau apiau',
+    'role_export_content' => 'Cynnwys allforio',
+    'role_editor_change' => 'Newid golygydd tudalen',
+    'role_notifications' => 'Derbyn a rheoli hysbysiadau',
+    'role_asset' => 'Caniatâd Asedau',
+    'roles_system_warning' => 'Byddwch yn ymwybodol y gall mynediad i unrhyw un o\'r tri chaniatâd uchod ganiatáu i ddefnyddiwr newid eu breintiau eu hunain neu freintiau eraill yn y system. Neilltuo rolau gyda\'r caniatâd hyn i ddefnyddwyr dibynadwy yn unig.',
+    'role_asset_desc' => 'Mae\'r caniatâd hwn yn rheoli mynediad diofyn i\'r asedau o fewn y system. Bydd caniatâd ar Lyfrau, Penodau a Thudalennau yn diystyru\'r caniatâd hwn.',
+    'role_asset_admins' => 'Mae gweinyddwyr yn cael mynediad awtomatig i\'r holl gynnwys ond gall yr opsiynau hyn ddangos neu guddio opsiynau UI.',
+    'role_asset_image_view_note' => 'Mae hyn yn ymwneud â gwelededd o fewn y rheolwr delweddau. Bydd mynediad gwirioneddol i ffeiliau delwedd wedi\'u huwchlwytho yn dibynnu ar opsiwn storio delwedd y system.',
+    'role_all' => 'Popeth',
+    'role_own' => 'Meddu',
+    'role_controlled_by_asset' => 'Wedi\'u rheoli gan yr ased y maent yn cael eu huwchlwytho iddo',
+    'role_save' => 'Cadw Rôl',
+    'role_users' => 'Defnyddwyr yn y rôl hon',
+    'role_users_none' => 'Nid oes unrhyw ddefnyddwyr wedi’u neilltuo i\'r rôl hon ar hyn o bryd',
 
     // Users
-    'users' => 'Users',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
-    'user_profile' => 'User Profile',
-    'users_add_new' => 'Add New User',
-    'users_search' => 'Search Users',
-    'users_latest_activity' => 'Latest Activity',
-    'users_details' => 'User Details',
-    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
-    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
-    'users_role' => 'User Roles',
-    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
-    'users_password' => 'User Password',
-    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
-    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
-    'users_send_invite_option' => 'Send user invite email',
+    'users' => 'Defnyddwyr',
+    'users_index_desc' => 'Creu a rheoli cyfrifon defnyddwyr unigol o fewn y system. Defnyddir cyfrifon defnyddwyr ar gyfer mewngofnodi a phriodoli cynnwys a gweithgaredd. Mae caniatâd mynediad yn seiliedig ar rôl yn bennaf ond gall perchenogaeth cynnwys defnyddwyr, ymhlith ffactorau eraill, hefyd effeithio ar ganiatâd a mynediad.',
+    'user_profile' => 'Proffil Defnyddiwr',
+    'users_add_new' => 'Ychwanegu Defnyddiwr Newydd',
+    'users_search' => 'Chwilio Defnyddwyr',
+    'users_latest_activity' => 'Gweithgaredd Diweddaraf',
+    'users_details' => 'Manylion Defnyddiwr',
+    'users_details_desc' => 'Gosodwch enw arddangos a chyfeiriad e-bost ar gyfer y defnyddiwr hwn. Bydd y cyfeiriad e-bost yn cael ei ddefnyddio ar gyfer mewngofnodi i’r cais.',
+    'users_details_desc_no_email' => 'Gosodwch enw arddangos ar gyfer y defnyddiwr hwn fel y gall eraill eu hadnabod.',
+    'users_role' => 'Rolau Defnyddiwr',
+    'users_role_desc' => 'Dewiswch ba rolau a neilltuir i’r defnyddiwr hwn. Os yw defnyddiwr yn cael ei neilltuo i rolau lluosog, bydd y caniatâd o\'r rolau hynny yn pentyrru a byddant yn derbyn pob gallu o\'r rolau a neilltuwyd.',
+    'users_password' => 'Cyfrinair Defnyddiwr',
+    'users_password_desc' => 'Gosodwch gyfrinair a ddefnyddir i fewngofnodi i\'r rhaglen. Rhaid i gyfrineiriau fod yn 8 nod o leiaf.',
+    'users_send_invite_text' => 'Gallwch ddewis anfon e-bost gwahoddiad i\'r defnyddiwr hwn sy\'n caniatáu iddynt osod eu cyfrinair eu hunain neu gallwch osod eu cyfrinair eich hun.',
+    'users_send_invite_option' => 'Anfon e-bost gwahodd i’r defnyddiwr',
     'users_external_auth_id' => 'External Authentication ID',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
-    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
-    'users_delete' => 'Delete User',
-    'users_delete_named' => 'Delete user :userName',
-    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
-    'users_delete_confirm' => 'Are you sure you want to delete this user?',
+    'users_external_auth_id_desc' => 'Pan fydd system ddilysu allanol yn cael ei defnyddio (megis SAML2, OIDC neu LDAP) dyma\'r ID sy\'n cysylltu\'r defnyddiwr BookStack hwn â\'r cyfrif system ddilysu. Gallwch anwybyddu\'r maes hwn os ydych chi\'n defnyddio\'r dilysiad diofyn e-bost.',
+    'users_password_warning' => 'Llenwch y canlynol os hoffech newid y cyfrinair ar gyfer y defnyddiwr hwn yn unig.',
+    'users_system_public' => 'Mae\'r defnyddiwr hwn yn cynrychioli unrhyw westeion sy\'n ymweld â\'ch enghraifft. Ni ellir ei ddefnyddio i fewngofnodi ond mae\'n cael ei aseinio\'n awtomatig.',
+    'users_delete' => 'Dileu Defnyddiwr',
+    'users_delete_named' => 'Dileu defnyddiwr :userName',
+    'users_delete_warning' => 'Bydd hyn yn dileu\'r defnyddiwr hwn yn llawn gyda\'r enw \':userName\' o\'r system.',
+    'users_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu’r defnyddiwr hwn?',
     'users_migrate_ownership' => 'Migrate Ownership',
-    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
-    'users_none_selected' => 'No user selected',
-    'users_edit' => 'Edit User',
-    'users_edit_profile' => 'Edit Profile',
-    'users_avatar' => 'User Avatar',
-    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
-    'users_preferred_language' => 'Preferred Language',
-    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
-    'users_social_accounts' => 'Social Accounts',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
-    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
-    'users_social_connect' => 'Connect Account',
-    'users_social_disconnect' => 'Disconnect Account',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
-    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
-    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
-    'users_api_tokens' => 'API Tokens',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
-    'users_api_tokens_none' => 'No API tokens have been created for this user',
-    'users_api_tokens_create' => 'Create Token',
-    'users_api_tokens_expires' => 'Expires',
-    'users_api_tokens_docs' => 'API Documentation',
-    'users_mfa' => 'Multi-Factor Authentication',
-    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
-    'users_mfa_configure' => 'Configure Methods',
+    'users_migrate_ownership_desc' => 'Dewiswch ddefnyddiwr yma os ydych chi am i ddefnyddiwr arall ddod yn berchennog ar yr holl eitemau sy\'n eiddo i\'r defnyddiwr hwn ar hyn o bryd.',
+    'users_none_selected' => 'Ni ddewiswyd defnyddiwr',
+    'users_edit' => 'Golygu Defnyddiwr',
+    'users_edit_profile' => 'Golygu Proffil',
+    'users_avatar' => 'Afatar Defnyddiwr',
+    'users_avatar_desc' => 'Dewiswch ddelwedd i gynrychioli\'r defnyddiwr hwn. Dylai hwn fod yn ddelwedd sgwâr tua 256px.',
+    'users_preferred_language' => 'Dewis Iaith',
+    'users_preferred_language_desc' => 'Bydd yr opsiwn hwn yn newid yr iaith a ddefnyddir ar gyfer rhyngwyneb defnyddiwr y rhaglen. Ni fydd hyn yn effeithio ar unrhyw gynnwys a grëwyd gan y defnyddiwr.',
+    'users_social_accounts' => 'Cyfrifon Cymdeithasol',
+    'users_social_accounts_desc' => 'Gweld statws y cyfrifon cymdeithasol cysylltiedig ar gyfer y defnyddiwr hwn. Gellir defnyddio cyfrifon cymdeithasol yn ychwanegol at y system ddilysu sylfaenol ar gyfer mynediad system.',
+    'users_social_accounts_info' => 'Yma gallwch gysylltu eich cyfrifon eraill ar gyfer mewngofnodi cyflymach a haws. Nid yw datgysylltu cyfrif yma yn diddymu mynediad awdurdodedig blaenorol. Diddymu mynediad o\'ch gosodiadau proffil ar y cyfrif cymdeithasol cysylltiedig.',
+    'users_social_connect' => 'Cysylltu Cyfrif',
+    'users_social_disconnect' => 'Datgysylltu Cyfrif',
+    'users_social_status_connected' => 'Wedi Cysylltu',
+    'users_social_status_disconnected' => 'Wedi Datgysylltu',
+    'users_social_connected' => 'Mae eich cyfrif :socialAccount wedi\'i gysylltu\'n llwyddiannus â\'ch proffil.',
+    'users_social_disconnected' => 'Mae eich cyfrif :socialAccount wedi\'i ddatgysylltu\'n llwyddiannus o\'ch proffil.',
+    'users_api_tokens' => 'Tocynnau API',
+    'users_api_tokens_desc' => 'Creu a rheoli\'r tocynnau mynediad a ddefnyddir i ddilysu gyda\'r API BookStack REST. Rheolir caniatâd ar gyfer yr API trwy\'r defnyddiwr y mae\'r tocyn yn perthyn iddo.',
+    'users_api_tokens_none' => 'Nid oes tocynnau API wedi\'u creu ar gyfer y defnyddiwr hwn',
+    'users_api_tokens_create' => 'Creu Tocyn',
+    'users_api_tokens_expires' => 'Yn dod i ben',
+    'users_api_tokens_docs' => 'Dogfennaeth API',
+    'users_mfa' => 'Dilysu Aml-Ffactor',
+    'users_mfa_desc' => 'Gosod dilysu aml-ffactor fel haen ychwanegol o ddiogelwch ar gyfer eich cyfrif defnyddiwr.',
+    'users_mfa_x_methods' => ':count dull wedi\'i ffurfweddu|:count dull wedi\'u ffurfweddu',
+    'users_mfa_configure' => 'Ffurfweddu Dulliau',
 
     // API Tokens
-    'user_api_token_create' => 'Create API Token',
-    'user_api_token_name' => 'Name',
-    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
-    'user_api_token_expiry' => 'Expiry Date',
-    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
-    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
-    'user_api_token' => 'API Token',
-    'user_api_token_id' => 'Token ID',
-    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
-    'user_api_token_secret' => 'Token Secret',
-    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
-    'user_api_token_created' => 'Token created :timeAgo',
-    'user_api_token_updated' => 'Token updated :timeAgo',
-    'user_api_token_delete' => 'Delete Token',
-    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
-    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+    'user_api_token_create' => 'Creu Tocyn API',
+    'user_api_token_name' => 'Enw',
+    'user_api_token_name_desc' => 'Rhowch enw darllenadwy i\'ch tocyn i\'ch atgoffa o\'i bwrpas arfaethedig yn y dyfodol.',
+    'user_api_token_expiry' => 'Dyddiad Dod i Ben',
+    'user_api_token_expiry_desc' => 'Gosodwch ddyddiad pan fydd y tocyn hwn yn dod i ben. Ar ôl y dyddiad hwn, ni fydd ceisiadau a wneir gan ddefnyddio\'r tocyn hwn yn gweithio mwyach. Bydd gadael y maes hwn yn wag yn gosod dyddiad dod i ben 100 mlynedd i\'r dyfodol.',
+    'user_api_token_create_secret_message' => 'Yn syth ar ôl creu\'r tocyn hwn bydd "ID tocyn" a "Chyfrinach Tocyn" yn cael eu cynhyrchu a\'u harddangos. Dim ond unwaith y bydd y gyfrinach yn cael ei dangos, felly gwnewch yn siŵr eich bod yn copïo\'r gwerth i rywle diogel cyn bwrw ymlaen.',
+    'user_api_token' => 'Tocyn API',
+    'user_api_token_id' => 'ID Tocyn',
+    'user_api_token_id_desc' => 'Mae hwn yn ddynodwr a gynhyrchir gan y system na ellir ei olygu ar gyfer y tocyn hwn y bydd angen ei ddarparu mewn ceisiadau API.',
+    'user_api_token_secret' => 'Cyfrinach Tocyn',
+    'user_api_token_secret_desc' => 'Mae hwn yn gyfrinach a gynhyrchir gan y system ar gyfer y tocyn hwn y bydd angen ei ddarparu mewn ceisiadau API. Dim ond unwaith y bydd hyn yn cael ei arddangos, felly copïwch y gwerth hwn i rywle diogel.',
+    'user_api_token_created' => 'Crëwyd tocyn :timeAgo',
+    'user_api_token_updated' => 'Diweddarwyd tocyn :timeAgo',
+    'user_api_token_delete' => 'Dileu Tocyn',
+    'user_api_token_delete_warning' => 'Bydd hyn yn dileu\'r tocyn API hwn yn llawn gyda\'r enw \':tokenName\' o\'r system.',
+    'user_api_token_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu’r tocyn API hwn?',
 
     // Webhooks
-    'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
-    'webhooks_create' => 'Create New Webhook',
-    'webhooks_none_created' => 'No webhooks have yet been created.',
-    'webhooks_edit' => 'Edit Webhook',
-    'webhooks_save' => 'Save Webhook',
-    'webhooks_details' => 'Webhook Details',
+    'webhooks' => 'Gwe-fachau',
+    'webhooks_index_desc' => 'Mae gwe-fachau’n ffordd o anfon data at URL allanol pan fydd rhai gweithredoedd a digwyddiadau yn digwydd o fewn y system sy\'n caniatáu integreiddio ar sail digwyddiadau gyda llwyfannau allanol megis systemau negeseuon neu hysbysu.',
+    'webhooks_x_trigger_events' => ':count sbarduno digwyddiad|:count sbarduno digwyddiadau',
+    'webhooks_create' => 'Creu Gwe-fachyn Newydd',
+    'webhooks_none_created' => 'Nid oes unrhyw we-fachau wedi\'u creu eto.',
+    'webhooks_edit' => 'Golygu Gwe-fachyn',
+    'webhooks_save' => 'Cadw Gwe-fachyn',
+    'webhooks_details' => 'Manylion Gwe-fachyn',
     'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
-    'webhooks_events_all' => 'All system events',
-    'webhooks_name' => 'Webhook Name',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
-    'webhook_events_table_header' => 'Events',
-    'webhooks_delete' => 'Delete Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
-    'webhooks_format_example' => 'Webhook Format Example',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
-    'webhooks_status' => 'Webhook Status',
-    'webhooks_last_called' => 'Last Called:',
-    'webhooks_last_errored' => 'Last Errored:',
-    'webhooks_last_error_message' => 'Last Error Message:',
+    'webhooks_events' => 'Digwyddiadau Gwe-fachyn',
+    'webhooks_events_desc' => 'Dewiswch yr holl ddigwyddiadau a ddylai sbarduno\'r gwe-fachyn hwn i gael ei alw.',
+    'webhooks_events_warning' => 'Cadwch mewn cof y bydd y digwyddiadau hyn yn cael eu sbarduno ar gyfer yr holl ddigwyddiadau a ddewiswyd, hyd yn oed os rhoddir caniatâd arferol ar waith. Gwnewch yn siŵr na fydd defnyddio\'r gwe-fachyn hwn yn datgelu cynnwys cyfrinachol.',
+    'webhooks_events_all' => 'Holl ddigwyddiadau\'r system',
+    'webhooks_name' => 'Enw Gwe-fachyn',
+    'webhooks_timeout' => 'Terfyn Amser Gwneud Cais Gwe-fachyn (Eiliadau)',
+    'webhooks_endpoint' => 'Pwynt Terfyn Gwe-fachyn',
+    'webhooks_active' => 'Gwe-fachyn Byw',
+    'webhook_events_table_header' => 'Digwyddiadau',
+    'webhooks_delete' => 'Dileu Gwe-fachyn',
+    'webhooks_delete_warning' => 'Bydd hyn yn dileu\'r gwe-fachyn hwn yn llawn gyda\'r enw \':webhookName\', o\'r system.',
+    'webhooks_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu’r gwe-fachyn hwn?',
+    'webhooks_format_example' => 'Enghraifft Fformat Gwe-fachyn',
+    'webhooks_format_example_desc' => 'Anfonir data Gwe-fachyn fel cais POST i\'r pwynt terfyn wedi\'i ffurfweddu fel JSON yn dilyn y fformat isod. Mae\'r nodweddion "related_item" ac "url" yn ddewisol a byddant yn dibynnu ar y math o ddigwyddiad a sbardunir.',
+    'webhooks_status' => 'Statws Gwe-fachyn',
+    'webhooks_last_called' => 'Galwyd Ddiwethaf:',
+    'webhooks_last_errored' => 'Cafwyd Gwall Ddiwethaf:',
+    'webhooks_last_error_message' => 'Neges Wall Ddiwethaf:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Trwyddedau',
+    'licenses_desc' => 'Mae\'r dudalen hon yn manylu ar wybodaeth am drwydded ar gyfer BookStack yn ychwanegol at y prosiectau a’r llyfrgelloedd a ddefnyddir o fewn BookStack. Dim ond mewn cyd-destun datblygu y gellir defnyddio llawer o’r prosiectau a restrir.',
+    'licenses_bookstack' => 'Trwydded BookStack',
+    'licenses_php' => 'Trwyddedau Llyfrgell PHP',
+    'licenses_js' => 'Trwyddedau Llyfrgell JavaScript',
+    'licenses_other' => 'Trwyddedau Eraill',
+    'license_details' => 'Manylion y Drwydded',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/cy/validation.php b/lang/cy/validation.php
index 87efe285093..00664184174 100644
--- a/lang/cy/validation.php
+++ b/lang/cy/validation.php
@@ -41,74 +41,74 @@
         'array'   => 'Rhaid i\'r :attribute fod yn fwy na :value eitemau.',
     ],
     'gte'                  => [
-        'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'numeric' => 'Rhaid i’r :attribute fod yn fwy na, neu’n gyfartal â :value.',
+        'file'    => 'Rhaid i’r :attribute fod yn fwy na, neu’n gyfartal â :value cilobeit.',
+        'string'  => 'Rhaid i’r :attribute fod yn fwy na, neu’n gyfartal â :value nod.',
+        'array'   => 'Rhaid i’r :attribute fod â :value o eitemau neu fwy.',
     ],
-    'exists'               => 'The selected :attribute is invalid.',
-    'image'                => 'The :attribute must be an image.',
-    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
+    'exists'               => 'Mae\'r dewis :attribute yn annilys.',
+    'image'                => 'Rhaid i’r :attribute fod yn ddelwedd.',
+    'image_extension'      => 'Rhaid i’r :attribute fod ag estyniad delwedd dilys & gefnogir.',
+    'in'                   => 'Mae\'r dewis :attribute yn annilys.',
+    'integer'              => 'Rhaid i’r :attribute fod yn gyfanrif.',
+    'ip'                   => 'Rhaid i’r :attribute fod yn gyfeiriad IP dilys.',
+    'ipv4'                 => 'Rhaid i’r :attribute fod yn gyfeiriad IPv4 dilys.',
+    'ipv6'                 => 'Rhaid i’r :attribute fod yn gyfeiriad IPv6 dilys.',
+    'json'                 => 'Rhaid i’r :attribute fod yn llinyn JSON dilys.',
     'lt'                   => [
-        'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'numeric' => 'Rhaid i’r :attribute fod yn llai na :value.',
+        'file'    => 'Rhaid i’r :attribute fod yn llai na :value cilobeit.',
+        'string'  => 'Rhaid i’r :attribute fod yn llai na :value nod.',
+        'array'   => 'Rhaid i’r :attribute fod â llai na :value o eitemau.',
     ],
     'lte'                  => [
-        'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'numeric' => 'Rhaid i’r :attribute fod yn llai na, neu’n gyfartal â :value.',
+        'file'    => 'Rhaid i’r :attribute fod yn llai na, neu’n gyfartal â :value cilobeit.',
+        'string'  => 'Rhaid i’r :attribute fod yn llai na, neu’n gyfartal â :value nod.',
+        'array'   => 'Ni ddylai’r :attribute fod â mwy na :value o eitemau.',
     ],
     'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'numeric' => 'Ni ddylai’r :attribute fod yn fwy na :max.',
+        'file'    => 'Ni ddylai’r :attribute fod yn fwy na :max cilobeit.',
+        'string'  => 'Ni ddylai’r :attribute fod yn fwy na :max nod.',
+        'array'   => 'Ni ddylai’r :attribute fod â mwy na :max o eitemau.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimes'                => 'Rhaid i’r :attribute fod yn ffeil o fath: :values.',
     'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'numeric' => 'Rhaid i’r :attribute fod yn o leiaf :min.',
+        'file'    => 'Rhaid i’r :attribute fod yn o leiaf :min cilobeit.',
+        'string'  => 'Rhaid i’r :attribute fod yn o leiaf :min nod.',
+        'array'   => 'Rhaid i’r :attribute fod â llai na :min o eitemau.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'safe_url'             => 'The provided link may not be safe.',
+    'not_in'               => 'Mae\'r dewis :attribute yn annilys.',
+    'not_regex'            => 'Mae’r fformat :attribute yn annilys.',
+    'numeric'              => 'Rhaid i’r :attribute fod yn rhif.',
+    'regex'                => 'Mae’r fformat :attribute yn annilys.',
+    'required'             => 'Mae :attribute yn faes gofynnol.',
+    'required_if'          => 'Mae :attribute yn faes gofynnol pan fo :other yn :value.',
+    'required_with'        => 'Mae :attribute yn faes gofynnol pan fo :values yn bresennol.',
+    'required_with_all'    => 'Mae :attribute yn faes gofynnol pan fo :values yn bresennol.',
+    'required_without'     => 'Mae :attitude yn faes gofynnol pan nad yw :values yn bresennol.',
+    'required_without_all' => 'Mae angen y maes :attribute os dydi\'r un o :values yn bresennol.',
+    'same'                 => 'Mae’n rhaid i’r :attribute a :other gyd-fynd.',
+    'safe_url'             => 'Efallai na fydd y ddolen a ddarperir yn ddiogel.',
     'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'numeric' => 'Rhaid i’r :attribute fod yn :size.',
+        'file'    => 'Rhaid i’r :attribute fod yn :size cilobeit.',
+        'string'  => 'Rhaid i’r :attribute fod yn :size nod.',
+        'array'   => 'Rhaid i’r :attribute gynnwys eitemau :size.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'totp'                 => 'The provided code is not valid or has expired.',
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
-    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+    'string'               => 'Rhaid i’r :attribute fod yn llinyn.',
+    'timezone'             => 'Rhaid i’r :attribute fod yn barth dilys.',
+    'totp'                 => 'Nid yw\'r cod a ddarperir yn ddilys neu mae wedi dod i ben.',
+    'unique'               => 'Mae’r :attribute eisoes wedi ei gymryd.',
+    'url'                  => 'Mae’r fformat :attribute yn annilys.',
+    'uploaded'             => 'Nid oedd modd uwchlwytho’r ffeil. Efallai na fydd y gweinydd yn derbyn ffeiliau o\'r maint hwn.',
 
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
-            'required_with' => 'Password confirmation required',
+            'required_with' => 'Rhaid cadarnhau cyfrinair',
         ],
     ],
 
diff --git a/lang/de/entities.php b/lang/de/entities.php
index fd926b3a975..dda99bacfec 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -73,7 +73,7 @@
     'search_permissions_set' => 'Berechtigungen gesetzt',
     'search_created_by_me' => 'Von mir erstellt',
     'search_updated_by_me' => 'Von mir aktualisiert',
-    'search_owned_by_me' => 'Besitzt von mir',
+    'search_owned_by_me' => 'In meinem Besitz',
     'search_date_options' => 'Datums Optionen',
     'search_updated_before' => 'Aktualisiert vor',
     'search_updated_after' => 'Aktualisiert nach',
diff --git a/lang/et/auth.php b/lang/et/auth.php
index 6edcdfc7af0..014a9f858eb 100644
--- a/lang/et/auth.php
+++ b/lang/et/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobiilirakendus',
     'mfa_option_totp_desc' => 'Mitmeastmelise autentimise kasutamiseks on sul vaja TOTP-toega mobiilirakendust, nagu Google Authenticator, Authy või Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Varukoodid',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Genereerib komplekti ühekordseid tagavarakoode, mille abil saad sisselogimisel oma isikut tuvastada. Hoia neid kindlas ja turvalises kohas.',
     'mfa_gen_confirm_and_enable' => 'Kinnita ja lülita sisse',
     'mfa_gen_backup_codes_title' => 'Varukoodide seadistamine',
     'mfa_gen_backup_codes_desc' => 'Hoiusta allolevad koodid turvalises kohas. Saad neid kasutada sisselogimisel sekundaarse autentimismeetodina.',
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 97f808f2ab3..18b80de92a5 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -20,7 +20,7 @@
     'description' => 'توضیحات',
     'role' => 'نقش',
     'cover_image' => 'تصویر روی جلد',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'تصویر باید حدودا 250*440 پیکسل باشد اما از آنجا که متناسب با رابط کاربری کوچک و بزرگ شده و بریده میشود، پس ابعاد نمایش داده شده متفاوت خواهند بود.',
 
     // Actions
     'actions' => 'عملیات',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 8c16396b353..e014ca83e3c 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'کاربری با ایمیل :email از قبل وجود دارد اما دارای اطلاعات متفاوتی می باشد.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'بر اساس اطلاعات ارائه شده، حساب کاربری نمی‌نواند ایجاد بشود',
     'email_already_confirmed' => 'ایمیل قبلا تایید شده است، وارد سیستم شوید.',
     'email_confirmation_invalid' => 'این کلمه عبور معتبر نمی باشد و یا قبلا استفاده شده است، لطفا دوباره ثبت نام نمایید.',
     'email_confirmation_expired' => 'کلمه عبور منقضی شده است، یک ایمیل تایید جدید ارسال شد.',
@@ -37,22 +37,22 @@
     'social_driver_not_found' => 'درایور شبکه اجتماعی یافت نشد',
     'social_driver_not_configured' => 'تنظیمات شبکه اجتماعی :socialAccount به درستی پیکربندی نشده است.',
     'invite_token_expired' => 'این پیوند دعوت منقضی شده است. در عوض می توانید سعی کنید رمز عبور حساب خود را بازنشانی کنید.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'کاربری برای این کار پیدا نمی‌شود.',
 
     // System
     'path_not_writable' => 'مسیر فایل :filePath را نمی توان در آن آپلود کرد. مطمئن شوید که روی سرور قابل نوشتن است.',
     'cannot_get_image_from_url' => 'نمی توان تصویر را از :url دریافت کرد',
     'cannot_create_thumbs' => 'سرور نمی تواند تصاویر کوچک ایجاد کند. لطفاً بررسی کنید که پسوند GD PHP را نصب کرده اید.',
     'server_upload_limit' => 'سرور اجازه آپلود در این اندازه را نمی دهد. لطفا اندازه فایل کوچکتر را امتحان کنید.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'سرور نمی‌تواند داده مقادیر ارائه شده داده را دریافت کند. با مقدار کمتر و فایل کوچکتر دوباره امتحان کنید.',
     'uploaded'  => 'سرور اجازه آپلود در این اندازه را نمی دهد. لطفا اندازه فایل کوچکتر را امتحان کنید.',
 
     // Drawing & Images
     'image_upload_error' => 'هنگام آپلود تصویر خطایی روی داد',
     'image_upload_type_error' => 'نوع تصویر در حال آپلود نامعتبر است',
     'image_upload_replace_type' => 'جایگزینی فایل تصویری باید از یک نوع باشد',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_upload_memory_limit' => 'به دلیل محدودیت منابع سامانه، بارگذاری فایل و/یا ایجاد تصاویر کاور (thumbnails) ناموفق بود.',
+    'image_thumbnail_memory_limit' => 'به دلیل محدودیت منابع سیستم، تصاویر با اندازه گوناگون ایجاد نشدند.',
     'image_gallery_thumbnail_memory_limit' => 'به دلیل محدودیت منابع سیستم، تصاویر کوچک گالری ایجاد نشد.',
     'drawing_data_not_found' => 'داده های طرح قابل بارگذاری نیستند. ممکن است فایل طرح دیگر وجود نداشته باشد یا شما به آن دسترسی نداشته باشید.',
 
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index d2df873a984..c6c4ddddd5e 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'سطل بازیافت در حال حاضر خالی است',
     'recycle_bin_empty' => 'سطل آشغال خالی',
     'recycle_bin_empty_confirm' => 'این کار همه اقلام موجود در سطل بازیافت از جمله محتوای موجود در هر مورد را برای همیشه از بین می برد. آیا مطمئن هستید که می خواهید سطل بازیافت را خالی کنید؟',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'این کار تمامی عناصر زیر مجموعه آیتم که در پایین فهرست شده را به همراه خودش برای همیشه از سامانه پاک میکند و شما امکان بازیابی آن را نخواهید داشت. آیا مطمئن هستید که میخواهید برای همیشه این آیتم را پاک کنید؟',
     'recycle_bin_destroy_list' => 'مواردی که باید نابود شوند',
     'recycle_bin_restore_list' => 'مواردی که باید بازیابی شوند',
     'recycle_bin_restore_confirm' => 'این اقدام، مورد حذف شده، از جمله هر عنصر فرزند، را به مکان اصلی خود باز می گرداند. اگر مکان اصلی از آن زمان حذف شده باشد، و اکنون در سطل بازیافت است، مورد اصلی نیز باید بازیابی شود.',
@@ -193,7 +193,7 @@
     'users_send_invite_text' => 'می توانید انتخاب کنید که برای این کاربر یک ایمیل دعوت نامه ارسال شود که به آنها امکان می دهد رمز عبور خود را تعیین کنند در غیر این صورت می توانید رمز عبور خود را تعیین کنید.',
     'users_send_invite_option' => 'ارسال ایمیل دعوت کاربر',
     'users_external_auth_id' => 'شناسه احراز هویت خارجی',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_external_auth_id_desc' => 'هنگامی که یک سامانه احراز هویت خارجی مورد استفاده است (مانند SAML2، OIDC یا LDAP)، شناسه ای که کاربر BookStack را به حساب سامانه احراز هویت مرتبط میکند بدین‌گونه می‌باشد. اگر از احراز هویت پیش فرض ایمیلی استفاده می‌کنید، میتوانید این را در نظر نگیرید.',
     'users_password_warning' => 'فقط در صورتی که مایل به تغییر رمز عبور این کاربر هستید، موارد زیر را پر کنید.',
     'users_system_public' => 'این کاربر نماینده هر کاربر مهمانی است که از نمونه شما بازدید می کند. نمی توان از آن برای ورود استفاده کرد اما به طور خودکار اختصاص داده می شود.',
     'users_delete' => 'حذف کاربر',
@@ -214,12 +214,12 @@
     'users_social_accounts_info' => 'در اینجا می‌توانید حساب‌های دیگر خود را برای ورود سریع‌تر و آسان‌تر متصل کنید. قطع ارتباط حساب در اینجا، دسترسی مجاز قبلی را لغو نمی کند. دسترسی را از تنظیمات نمایه خود در حساب اجتماعی متصل لغو کنید.',
     'users_social_connect' => 'اتصال حساب کاربری',
     'users_social_disconnect' => 'قطع حساب',
-    'users_social_status_connected' => 'Connected',
+    'users_social_status_connected' => 'ارتباط برقرار شد',
     'users_social_status_disconnected' => 'قطع اتصال',
     'users_social_connected' => 'حساب :socialAccount با موفقیت به نمایه شما پیوست شد.',
     'users_social_disconnected' => 'حساب :socialAccount با موفقیت از نمایه شما قطع شد.',
     'users_api_tokens' => 'توکن‌های API',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'توکن های دسترسی مورد استفاده در BookStack REST API را بسازید و مدیریت کنید. اجازه‌های مربوط به API توسط کاربری که صاحب آنها است مدیریت می‌شوند.',
     'users_api_tokens_none' => 'هیچ نشانه API برای این کاربر ایجاد نشده است',
     'users_api_tokens_create' => 'ایجاد توکن',
     'users_api_tokens_expires' => 'منقضی شده ها',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => 'آخرین پیغام خطا:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'مجوز‌ها',
+    'licenses_desc' => 'این صفحه اطلاعات مجوز‌های بوک استک به همراه پروژه‌ها و کتابخانه‌های مورد استفاده با آن را به نمایش می‌گذارد. بسیاری از پروژه‌های فهرست شده ممکن است فقط در بحث توسعه به کار گرفته شده باشند.',
+    'licenses_bookstack' => 'مجوز‌های بوک استک',
+    'licenses_php' => 'مجوز‌های کتابخانه PHP',
+    'licenses_js' => 'مجوز‌های کتابخانه جاوا اسکریپت',
+    'licenses_other' => 'سایر مجوز‌ها',
+    'license_details' => 'جزئیات مجوز',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index d6b054fe83e..c04ef24e3bb 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -63,10 +63,10 @@
     'search_for_term' => 'recherche pour :term',
     'search_more' => 'Plus de résultats',
     'search_advanced' => 'Recherche avancée',
-    'search_terms' => 'Mot-clé',
+    'search_terms' => 'Termes de recherche',
     'search_content_type' => 'Type de contenu',
     'search_exact_matches' => 'Correspondances exactes',
-    'search_tags' => 'Recherche par mots-clés',
+    'search_tags' => 'Recherche par tags',
     'search_options' => 'Options',
     'search_viewed_by_me' => 'Vu par moi',
     'search_not_viewed_by_me' => 'Non vu par moi',
@@ -307,7 +307,7 @@
     'tag' => 'Mot-clé',
     'tags' =>  'Mots-clés',
     'tags_index_desc' => 'Les tags peuvent être appliqués au contenu du système pour appliquer une forme flexible de catégorisation. Les tags peuvent avoir à la fois une clé et une valeur, la valeur étant facultative. Une fois appliqué, le contenu peut ensuite être interrogé à l’aide du nom et de la valeur du tag.',
-    'tag_name' =>  'Nom du mot-clé',
+    'tag_name' =>  'Nom de l’étiquette',
     'tag_value' => 'Valeur du mot-clé (optionnel)',
     'tags_explain' => "Ajouter des mots-clés pour catégoriser votre contenu.",
     'tags_add' => 'Ajouter un autre mot-clé',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 4eadd419671..587e4bdddce 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -15,7 +15,7 @@
     'page_restore'                => 'הדף שוחזר',
     'page_restore_notification'   => 'הדף שוחזר בהצלחה',
     'page_move'                   => 'דף הועבר',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'הדף הוזז בהצלחה',
 
     // Chapters
     'chapter_create'              => 'פרק נוצר',
@@ -25,7 +25,7 @@
     'chapter_delete'              => 'פרק נמחק',
     'chapter_delete_notification' => 'הפרק נמחק בהצלחה',
     'chapter_move'                => 'פרק הועבר',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'פרק הוזז בהצלחה',
 
     // Books
     'book_create'                 => 'ספר נוצר',
@@ -50,13 +50,13 @@
     'bookshelf_delete_notification'    => 'מדף נמחק בהצלחה',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_restore' => 'גרסא שוחזרה',
+    'revision_delete' => 'גרסא הוסרה',
+    'revision_delete_notification' => 'גרסא הוסרה בהצלחה',
 
     // Favourites
-    'favourite_add_notification' => '":name" has been added to your favourites',
-    'favourite_remove_notification' => '":name" has been removed from your favourites',
+    'favourite_add_notification' => '":name" הוסף למועדפים',
+    'favourite_remove_notification' => '":name" הוסר מהמועדפים',
 
     // Watching
     'watch_update_level_notification' => 'Watch preferences successfully updated',
diff --git a/lang/lv/auth.php b/lang/lv/auth.php
index 1b84480f250..71b92ac0109 100644
--- a/lang/lv/auth.php
+++ b/lang/lv/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilā aplikācija',
     'mfa_option_totp_desc' => 'Lai lietotu vairākfaktoru autentifikāciju, jums būs nepieciešama mobilā aplikācija, kas atbalsta TOTP, piemēram, Google Authenticator, Authy vai Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Rezerves kodi',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Izveido vienreizējas lietošanas rezerves kodus, ko var izmantot pierakstoties, lai apstiprinātu savu identitāti. Pārliecinieties, ka tie ir noglabāti drošā vietā.',
     'mfa_gen_confirm_and_enable' => 'Apstiprināt un ieslēgt',
     'mfa_gen_backup_codes_title' => 'Rezerves kodu iestatījumi',
     'mfa_gen_backup_codes_desc' => 'Noglabājiet zemāk esošo kodu sarakstu drošā vietā. Kad piekļūsiet sistēmai, jūs varēsiet izmantot vienu no kodiem kā papildus autentifikācijas mehānismu.',
diff --git a/lang/lv/common.php b/lang/lv/common.php
index dcee2878223..657d9be64fd 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -20,7 +20,7 @@
     'description' => 'Apraksts',
     'role' => 'Loma',
     'cover_image' => 'Vāka attēls',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Šim attēlam jābūt apmēram 440x250px izmērā, taču tas tiks pielāgots lietotāja saskarnei dažādos scenārijos pēc nepieciešamības, un attēla izmēri tad var atšķirties.',
 
     // Actions
     'actions' => 'Darbības',
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index 4a5747e9e28..5443e505d66 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => 'Tabulas īpašības',
     'table_properties_title' => 'Tabulas īpašības',
     'delete_table' => 'Dzēst tabulu',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Notīrīt tabulas formatējumu',
+    'resize_to_contents' => 'Pielāgot izmēru saturam',
+    'row_header' => 'Rindas galvene',
     'insert_row_before' => 'Ievietot rindu augstāk',
     'insert_row_after' => 'Ievietot rindu zemāk',
     'delete_row' => 'Dzēst rindu',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 6db02da6a8c..147f5d28b28 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -39,9 +39,9 @@
     'export_pdf' => 'PDF fails',
     'export_text' => 'Vienkāršs teksta fails',
     'export_md' => 'Markdown fails',
-    'default_template' => 'Default Page Template',
+    'default_template' => 'Noklusētā lapas sagatave',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template_select' => 'Izvēlēt sagataves lapu',
 
     // Permissions and restrictions
     'permissions' => 'Atļaujas',
@@ -299,7 +299,7 @@
     'pages_is_template' => 'Lapas šablons',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Pārslēgt sānjoslu',
     'page_tags' => 'Lapas birkas',
     'chapter_tags' => 'Nodaļas birkas',
     'book_tags' => 'Grāmatas birkas',
@@ -330,7 +330,7 @@
     'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
     'attachments_set_link' => 'Uzstādīt saiti',
     'attachments_delete' => 'Vai tiešām vēlaties dzēst šo pielikumu?',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'Ievelciet failus šeit, lai augšupielādētu',
     'attachments_no_files' => 'Neviens fails nav augšupielādēts',
     'attachments_explain_link' => 'Ja nevēlaties augšupielādēt failu, varat pievienot saiti. Tā var būt saite uz citu lapu vai saite uz failu mākonī.',
     'attachments_link_name' => 'Saites nosaukums',
@@ -416,16 +416,16 @@
     'watch_title_default' => 'Noklusētie uzstādījumi',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignorēt',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_desc_ignore' => 'Ignorēt visus paziņojumus, tai skaitā arī tādus, kas uzstādīti lietotāja uzstādījumos.',
     'watch_title_new' => 'Jaunas lapas',
     'watch_desc_new' => 'Notify when any new page is created within this item.',
     'watch_title_updates' => 'Visi lapu atjauninājumi',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_desc_updates' => 'Paziņot par visām jaunām lapām un lapu izmaiņām.',
+    'watch_desc_updates_page' => 'Paziņot par visām lapu izmaiņām.',
     'watch_title_comments' => 'Visi lapu atjauninājumi un komentāri',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
+    'watch_desc_comments' => 'Paziņot par visām jaunām lapām, lapu izmaiņām un jauniem komentāriem.',
+    'watch_desc_comments_page' => 'Paziņot par lapu izmaiņām un jauniem komentāriem.',
+    'watch_change_default' => 'Izmainīt noklusētos paziņojumu uzstādījumus',
     'watch_detail_ignore' => 'Ignorēt paziņojumus',
     'watch_detail_new' => 'Watching for new pages',
     'watch_detail_updates' => 'Watching new pages and updates',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 22ccbe3833a..192676f35a7 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Lietotājs ar epastu :email bet ar citiem piekļuves datiem jau eksistē.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Lietotāja kontu nevar reģistrēt ar norādītajām detaļām',
     'email_already_confirmed' => 'Epasts jau ir apstiprināts, mēģini ielogoties.',
     'email_confirmation_invalid' => 'Šis apstiprinājuma žetons nav derīgs vai jau ir izmantots. Lūdzu, mēģiniet reģistrēties vēlreiz.',
     'email_confirmation_expired' => 'Apstiprinājuma žetona derīguma termiņš ir beidzies. Ir nosūtīts jauns apstiprinājuma e-pasts.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Sociālā tīkla savienojums nav atrasts',
     'social_driver_not_configured' => 'Jūsu :socialAccount sociālie iestatījumi nav uzstādīti pareizi.',
     'invite_token_expired' => 'Šī uzaicinājuma saite ir novecojusi. Tā vietā jūs varat mēģināt atiestatīt sava konta paroli.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Šai darbībai netika atrasts lietotājs.',
 
     // System
     'path_not_writable' => 'Faila ceļā :filePath nav iespējams ielādēt failus. Lūdzu pārliecinieties, ka serverim tur ir rakstīšanas tiesības.',
diff --git a/lang/lv/notifications.php b/lang/lv/notifications.php
index d0fee395021..9fd60222a72 100644
--- a/lang/lv/notifications.php
+++ b/lang/lv/notifications.php
@@ -10,10 +10,10 @@
     'new_page_intro' => 'Jauna lapa izveidota :appName:',
     'updated_page_subject' => 'Atjaunināta lapa: :pageName',
     'updated_page_intro' => 'Lapa atjaunināta :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'updated_page_debounce' => 'Lai novērstu pārliecīgu paziņojumu sūtīšanu, uz laiku jums tiks pārtraukti paziņojumi par turpmākiem šī lietotāja labojumiem šai lapai.',
 
     'detail_page_name' => 'Lapas nosaukums:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Ceļš uz lapu:',
     'detail_commenter' => 'Komentētājs:',
     'detail_comment' => 'Komentārs:',
     'detail_created_by' => 'Izveidoja:',
@@ -22,6 +22,6 @@
     'action_view_comment' => 'Skatīt komentāru',
     'action_view_page' => 'Skatīt lapu',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason' => 'Šis paziņojums nosūtīts tāpēc, ka :link paredz šādu aktivitāti šai vienībai.',
     'footer_reason_link' => 'paziņojumu vēlamie iestatījumi',
 ];
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index cb38482da98..895d9a89809 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Miskaste ir tukša',
     'recycle_bin_empty' => 'Iztīrīt miskasti',
     'recycle_bin_empty_confirm' => 'Šī darbība pilnībā dzēsīs visas vienības miskastē, ieskaitot saturu, kas ievietots katrā no šīm vienībām. Vai tiešām vēlaties dzēst visu miskastes saturu?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Šī darbība pilnībā no sistēmas izdzēsis šo vienību kopā ar tai pakārtotajiem elementiem, un jūs nevarēsiet šo saturu atjaunot. Vai tiešām vēlaties pilnībā izdzēst šo vienību?',
     'recycle_bin_destroy_list' => 'Dzēšamās vienības',
     'recycle_bin_restore_list' => 'Atjaunojamās vienības',
     'recycle_bin_restore_confirm' => 'Šī darbība atjaunos dzēsto vienību, tai skaitā visus tai pakārtotos elementus, uz tās sākotnējo atrašanās vietu. Ja sākotnējā atrašanās vieta ir izdzēsta un atrodas miskastē, būs nepieciešams atjaunot arī to.',
@@ -277,13 +277,13 @@
     'webhooks_last_error_message' => 'Pēdējais kļūdas paziņojums:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Licences',
+    'licenses_desc' => 'Šī lapa attēlo BookStack licences informāciju, kā arī licences citiem projektiem un bibliotēkām, kas tiek izmantoti BookStack. Daļa no minētajiem projektiem var būt izmantoti tikai izstrādē.',
+    'licenses_bookstack' => 'BookStack licence',
+    'licenses_php' => 'PHP bibliotēku licences',
+    'licenses_js' => 'JavaScript bibliotēku licences',
+    'licenses_other' => 'Citas licences',
+    'license_details' => 'Licences informācija',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/nb/auth.php b/lang/nb/auth.php
index cdb2f19be30..125e6daf5d4 100644
--- a/lang/nb/auth.php
+++ b/lang/nb/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapplikasjon',
     'mfa_option_totp_desc' => 'For å bruke flerfaktorautentisering trenger du en mobilapplikasjon som støtter TOTP-teknologien, slik som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Sikkerhetskoder',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Genererer et sett med engangskoder som du kan bruke ved innlogging for å bekrefte identiteten din. Sørg for å lagre disse på et sikkert sted.',
     'mfa_gen_confirm_and_enable' => 'Bekreft og aktiver',
     'mfa_gen_backup_codes_title' => 'Konfigurasjon av sikkerhetskoder',
     'mfa_gen_backup_codes_desc' => 'Lagre nedeforstående liste med koder på et trygt sted. Når du skal ha tilgang til systemet kan du bruke en av disse som en faktor under innlogging.',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 2f3e802baae..7b7f6e8a930 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Autentiseringstjeneste fra sosiale medier er ikke installert',
     'social_driver_not_configured' => 'Dine :socialAccount innstilliner er ikke angitt.',
     'invite_token_expired' => 'Invitasjonslenken har utgått, du kan forsøke å be om nytt passord istede.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'En bruker for denne handlingen ble ikke funnet.',
 
     // System
     'path_not_writable' => 'Filstien :filePath aksepterer ikke filer, du må sjekke filstitilganger i systemet.',
@@ -76,7 +76,7 @@
     'guests_cannot_save_drafts' => 'Gjester kan ikke lagre utkast',
 
     // Users
-    'users_cannot_delete_only_admin' => 'Du kan ikke kaste ut den eneste administratoren',
+    'users_cannot_delete_only_admin' => 'Du kan ikke slette den eneste administratoren',
     'users_cannot_delete_guest' => 'Du kan ikke slette gjestebrukeren (Du kan deaktivere offentlig visning istede)',
 
     // Roles
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 08c168e9fae..52a8e3e3762 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -94,11 +94,11 @@
 
     // API Tokens
     'api_token_create' => 'API-token aangemaakt',
-    'api_token_create_notification' => 'API-token met succes aangemaakt',
+    'api_token_create_notification' => 'API-token succesvol aangemaakt',
     'api_token_update' => 'wijzigde API-token',
-    'api_token_update_notification' => 'API-token met succes bijgewerkt',
+    'api_token_update_notification' => 'API-token succesvol bijgewerkt',
     'api_token_delete' => 'verwijderde API-token',
-    'api_token_delete_notification' => 'API-token met succes verwijderd',
+    'api_token_delete_notification' => 'API-token succesvol verwijderd',
 
     // Roles
     'role_create' => 'maakte rol aan',
@@ -110,8 +110,8 @@
 
     // Recycle Bin
     'recycle_bin_empty' => 'leegde prullenbak',
-    'recycle_bin_restore' => 'is van prullenbak hersteld',
-    'recycle_bin_destroy' => 'is van prullenbak verwijderd',
+    'recycle_bin_restore' => 'herstelde van prullenbak',
+    'recycle_bin_destroy' => 'verwijderde van prullenbak',
 
     // Comments
     'commented_on'                => 'reageerde op',
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index 8caa1dd1915..12c6b6c7bff 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -47,11 +47,11 @@
     'reset_password' => 'Wachtwoord Herstellen',
     'reset_password_send_instructions' => 'Geef je e-mailadres op en er wordt een link gestuurd om je wachtwoord te herstellen.',
     'reset_password_send_button' => 'Stuur Herstel Link',
-    'reset_password_sent' => 'Een link om het wachtwoord te resetten zal verstuurd worden naar :email als dat e-mailadres in het systeem gevonden is.',
+    'reset_password_sent' => 'Een wachtwoordherstel-link zal worden verstuurd naar :email als dat e-mailadres in het systeem gevonden is.',
     'reset_password_success' => 'Je wachtwoord is succesvol hersteld.',
     'email_reset_subject' => 'Herstel je wachtwoord van :appName',
-    'email_reset_text' => 'Je ontvangt deze e-mail omdat we een wachtwoordresetverzoek voor uw account hebben ontvangen.',
-    'email_reset_not_requested' => 'Als je geen wachtwoord herstel hebt aangevraagd, hoef je niets te doen.',
+    'email_reset_text' => 'Je ontvangt deze e-mail omdat we een wachtwoordherstelverzoek voor uw account hebben ontvangen.',
+    'email_reset_not_requested' => 'Als je geen wachtwoordherstel hebt aangevraagd, hoef je niets te doen.',
 
     // Email Confirmation
     'email_confirm_subject' => 'Bevestig je e-mailadres op :appName',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 58647b66d77..896b7a71d09 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -36,7 +36,7 @@
     'social_account_register_instructions' => 'Als je nog geen account hebt, kun je je registreren met de :socialAccount optie.',
     'social_driver_not_found' => 'Social driver niet gevonden',
     'social_driver_not_configured' => 'Je :socialAccount instellingen zijn niet correct geconfigureerd.',
-    'invite_token_expired' => 'Deze uitnodigingslink is verlopen. Je kunt in plaats daarvan proberen je wachtwoord opnieuw in te stellen.',
+    'invite_token_expired' => 'Deze uitnodigingslink is verlopen. Je kunt in plaats daarvan proberen je wachtwoord te herstellen.',
     'login_user_not_found' => 'Er is geen gebruiker gevonden voor deze actie.',
 
     // System
diff --git a/lang/nl/passwords.php b/lang/nl/passwords.php
index 1781256f254..5223bdf39ee 100644
--- a/lang/nl/passwords.php
+++ b/lang/nl/passwords.php
@@ -6,9 +6,9 @@
  */
 return [
 
-    'password' => 'Wachtwoorden moeten uit ten minste acht tekens bestaan en overeenkomen met de bevestiging.',
-    'user' => "We kunnen niemand vinden met dat e-mailadres.",
-    'token' => 'De wachtwoord reset token is ongeldig voor dit e-mailadres.',
+    'password' => 'Wachtwoorden moeten uit minstens acht tekens bestaan en overeenkomen met de bevestiging.',
+    'user' => "We kunnen geen gebruiker vinden met dat e-mailadres.",
+    'token' => 'De wachtwoordhersteltoken is ongeldig voor dit e-mailadres.',
     'sent' => 'We hebben je een link gestuurd om je wachtwoord te herstellen!',
     'reset' => 'Je wachtwoord is hersteld!',
 
diff --git a/lang/ru/auth.php b/lang/ru/auth.php
index 62e1911e6c0..d39da119dea 100644
--- a/lang/ru/auth.php
+++ b/lang/ru/auth.php
@@ -6,7 +6,7 @@
  */
 return [
 
-    'failed' => 'Учетная запись не найдена.',
+    'failed' => 'Введенные вами данные не найдены в нашей базе.',
     'throttle' => 'Слишком много попыток входа. Пожалуйста, повторите попытку через :seconds секунд.',
 
     // Login & Register
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Мобильное приложение',
     'mfa_option_totp_desc' => 'Для использования многофакторной аутентификации вам понадобится мобильное приложение, поддерживающее TOTP, например Google Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервные коды',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Генерирует набор одноразовых резервных кодов, которые вы вводите при входе, чтобы проверить вашу личность. Не забудьте сохранить их в безопасном месте.',
     'mfa_gen_confirm_and_enable' => 'Подтвердить и включить',
     'mfa_gen_backup_codes_title' => 'Настройка резервных кодов',
     'mfa_gen_backup_codes_desc' => 'Сохраните приведенный ниже список кодов в безопасном месте. При доступе к системе вы сможете использовать один из кодов в качестве второго механизма аутентификации.',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index 596d8b78a59..a234bd9c9cc 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Драйвер для Соцсети не найден',
     'social_driver_not_configured' => 'Настройки вашего :socialAccount заданы неправильно.',
     'invite_token_expired' => 'Срок действия приглашения истек. Вместо этого вы можете попытаться сбросить пароль своей учетной записи.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Пользователь для этого действия не найден.',
 
     // System
     'path_not_writable' => 'Невозможно загрузить файл по пути :filePath. Убедитесь что сервер доступен для записи.',
diff --git a/lang/sr/auth.php b/lang/sr/auth.php
index c98cb0fe4a4..0100e666fa3 100644
--- a/lang/sr/auth.php
+++ b/lang/sr/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikacije za mobilne uređaje',
     'mfa_option_totp_desc' => 'Да бисте користили вишефакторску аутентификацију, биће вам потребна мобилна апликација која подржава ТОТП, као што јеGoogle Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервни кодови',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Генерише скуп резервних кодова за једнократну употребу које ћете унети приликом пријављивања да бисте потврдили свој идентитет. Обавезно их чувајте на безбедном и безбедном месту.',
     'mfa_gen_confirm_and_enable' => 'Потврдите и омогућите',
     'mfa_gen_backup_codes_title' => 'Подешавање резервних кодова',
     'mfa_gen_backup_codes_desc' => 'Чувајте доњу листу кодова на безбедном месту. Када приступате систему, моћи ћете да користите један од кодова као други механизам за аутентификацију.',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 9e620b24ed1..0666a58ead9 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -6,59 +6,59 @@
 return [
 
     // Shared
-    'recently_created' => 'Recently Created',
-    'recently_created_pages' => 'Recently Created Pages',
-    'recently_updated_pages' => 'Recently Updated Pages',
-    'recently_created_chapters' => 'Recently Created Chapters',
-    'recently_created_books' => 'Recently Created Books',
-    'recently_created_shelves' => 'Recently Created Shelves',
-    'recently_update' => 'Recently Updated',
-    'recently_viewed' => 'Recently Viewed',
-    'recent_activity' => 'Recent Activity',
-    'create_now' => 'Create one now',
-    'revisions' => 'Revisions',
-    'meta_revision' => 'Revision #:revisionCount',
-    'meta_created' => 'Created :timeLength',
-    'meta_created_name' => 'Created :timeLength by :user',
-    'meta_updated' => 'Updated :timeLength',
-    'meta_updated_name' => 'Updated :timeLength by :user',
-    'meta_owned_name' => 'Owned by :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
-    'entity_select' => 'Entity Select',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
-    'images' => 'Images',
-    'my_recent_drafts' => 'My Recent Drafts',
-    'my_recently_viewed' => 'My Recently Viewed',
-    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
-    'my_favourites' => 'My Favourites',
-    'no_pages_viewed' => 'You have not viewed any pages',
-    'no_pages_recently_created' => 'No pages have been recently created',
-    'no_pages_recently_updated' => 'No pages have been recently updated',
-    'export' => 'Export',
-    'export_html' => 'Contained Web File',
-    'export_pdf' => 'PDF File',
-    'export_text' => 'Plain Text File',
+    'recently_created' => 'Недавно додато',
+    'recently_created_pages' => 'Недавно креиране странице',
+    'recently_updated_pages' => 'Недавно ажуриране странице',
+    'recently_created_chapters' => 'Недавно креирана поглавља',
+    'recently_created_books' => 'Недавно креиране књиге',
+    'recently_created_shelves' => 'Недавно креиране полице',
+    'recently_update' => 'Недавно ажурирано',
+    'recently_viewed' => 'Недавно прегледано',
+    'recent_activity' => 'Скорашња активност',
+    'create_now' => 'Направи један сада',
+    'revisions' => 'Ревизије',
+    'meta_revision' => 'Ревизија #:revisionCount',
+    'meta_created' => 'Направљено :timeLength',
+    'meta_created_name' => 'Направљено :timeLength од :user',
+    'meta_updated' => 'Ажурирано :timeLength',
+    'meta_updated_name' => 'Ажурирано :timeLength од :user',
+    'meta_owned_name' => 'Власништво :user',
+    'meta_reference_count' => 'Референтна од :count item|Референтна од :count items',
+    'entity_select' => 'Избор ентитета',
+    'entity_select_lack_permission' => 'Немате потребне дозволе да изаберете ову ставку',
+    'images' => 'Слике',
+    'my_recent_drafts' => 'Моји недавни нацрти',
+    'my_recently_viewed' => 'Моје недавно прегледано',
+    'my_most_viewed_favourites' => 'Моји најгледанији фаворити',
+    'my_favourites' => 'Моји омиљени',
+    'no_pages_viewed' => 'Нисте погледали ниједну страницу',
+    'no_pages_recently_created' => 'Недавно није направљена ниједна страница',
+    'no_pages_recently_updated' => 'Ниједна страница није недавно ажурирана',
+    'export' => 'Извоз',
+    'export_html' => 'Садржана веб датотека',
+    'export_pdf' => 'PDF датотека',
+    'export_text' => 'Датотеке чистог текста',
     'export_md' => 'Markdown File',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => 'Подразумевани шаблон странице',
+    'default_template_explain' => 'Доделите шаблон странице који ће се користити као подразумевани садржај за све странице креиране у оквиру ове ставке. Имајте на уму да ће се ово користити само ако креатор странице има приступ за преглед изабране странице шаблона.',
+    'default_template_select' => 'Изаберите страницу са шаблоном',
 
     // Permissions and restrictions
-    'permissions' => 'Permissions',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
-    'permissions_save' => 'Save Permissions',
-    'permissions_owner' => 'Owner',
-    'permissions_role_everyone_else' => 'Everyone Else',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions' => 'Дозволе',
+    'permissions_desc' => 'Подесите дозволе овде да бисте заменили подразумеване дозволе које дају корисничке улоге.',
+    'permissions_book_cascade' => 'Дозволе постављене за књиге ће се аутоматски пребацивати на подређена поглавља и странице, осим ако немају дефинисане сопствене дозволе.',
+    'permissions_chapter_cascade' => 'Дозволе постављене на поглављима ће се аутоматски каскадно пребацивати на подређене странице, осим ако немају дефинисане сопствене дозволе.',
+    'permissions_save' => 'Сачувај дозволе',
+    'permissions_owner' => 'Власник',
+    'permissions_role_everyone_else' => 'Сви остали',
+    'permissions_role_everyone_else_desc' => 'Подесите дозволе за све улоге које нису посебно замењене.',
+    'permissions_role_override' => 'Замени дозволе за улогу',
+    'permissions_inherit_defaults' => 'Наследи подразумеване вредности',
 
     // Search
-    'search_results' => 'Search Results',
-    'search_total_results_found' => ':count result found|:count total results found',
-    'search_clear' => 'Clear Search',
+    'search_results' => 'Резултати претраге',
+    'search_total_results_found' => ':count пронађених резултата|:count укупно пронађених резултата',
+    'search_clear' => 'Обриши претрагу',
     'search_no_pages' => 'No pages matched this search',
     'search_for_term' => 'Search for :term',
     'search_more' => 'More Results',
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
index ba0043600a7..44df0307a48 100644
--- a/lang/sr/errors.php
+++ b/lang/sr/errors.php
@@ -5,11 +5,11 @@
 return [
 
     // Permissions
-    'permission' => 'You do not have permission to access the requested page.',
-    'permissionJson' => 'You do not have permission to perform the requested action.',
+    'permission' => 'Немате дозволу да приступите овој страни.',
+    'permissionJson' => 'Немате овлашћење да извршите ову акцију.',
 
     // Auth
-    'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'error_user_exists_different_creds' => 'Корисник са е-мејл адресом :email већ постоји са другим приступним подацима.',
     'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
     'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
     'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
diff --git a/lang/sv/components.php b/lang/sv/components.php
index dc587a44df6..315e1683c50 100644
--- a/lang/sv/components.php
+++ b/lang/sv/components.php
@@ -34,8 +34,8 @@
     'image_delete_success' => 'Bilden har tagits bort',
     'image_replace' => 'Ersätt bild',
     'image_replace_success' => 'Bildfilen har uppdaterats',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_rebuild_thumbs' => 'Återskapa variationer av bildstorlekar',
+    'image_rebuild_thumbs_success' => 'Variationer av bildstorlekar har återskapats!',
 
     // Code Editor
     'code_editor' => 'Redigera kod',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 1be2a56c6aa..6023c6cd3b4 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Uppdaterad :timeLength',
     'meta_updated_name' => 'Uppdaterad :timeLength av :user',
     'meta_owned_name' => 'Ägs av :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Refererad till av :count item|Referenced by :count items',
     'entity_select' => 'Välj enhet',
     'entity_select_lack_permission' => 'Du har inte den behörighet som krävs för att välja det här objektet',
     'images' => 'Bilder',
@@ -53,7 +53,7 @@
     'permissions_role_everyone_else' => 'Alla andra',
     'permissions_role_everyone_else_desc' => 'Ställ in rättigheter för alla roller som inte uttryckligen har åsidosatts.',
     'permissions_role_override' => 'Åsidosätt rättigheter för roll',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions_inherit_defaults' => 'Ärv standardrättigheter',
 
     // Search
     'search_results' => 'Sökresultat',
@@ -155,16 +155,16 @@
     'books_sort_show_other' => 'Visa andra böcker',
     'books_sort_save' => 'Spara ordning',
     'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_sort_move_up' => 'Flytta upp',
+    'books_sort_move_down' => 'Flytta ned',
+    'books_sort_move_prev_book' => 'Gå till förgående bok',
+    'books_sort_move_next_book' => 'Gå till nästa bok',
+    'books_sort_move_prev_chapter' => 'Gå till förgående kapitel',
+    'books_sort_move_next_chapter' => 'Gå till nästa kapitel',
+    'books_sort_move_book_start' => 'Gå till början av boken',
+    'books_sort_move_book_end' => 'Gå till slutet av boken',
+    'books_sort_move_before_chapter' => 'Gå till innan kapitlet',
+    'books_sort_move_after_chapter' => 'Gå till efter kapitlet',
     'books_copy' => 'Kopiera bok',
     'books_copy_success' => 'Boken har kopierats',
 
@@ -373,7 +373,7 @@
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterade :createDiff',
     'comment_updated' => 'Uppdaterade :updateDiff av :username',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => 'Uppdaterad',
     'comment_deleted_success' => 'Kommentar borttagen',
     'comment_created_success' => 'Kommentaren har sparats',
     'comment_updated_success' => 'Kommentaren har uppdaterats',
@@ -412,12 +412,12 @@
     'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
 
     // Watch Options
-    'watch' => 'Watch',
+    'watch' => 'Följ',
     'watch_title_default' => 'Default Preferences',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignorera',
     'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
+    'watch_title_new' => 'Nya sidor',
     'watch_desc_new' => 'Notify when any new page is created within this item.',
     'watch_title_updates' => 'All Page Updates',
     'watch_desc_updates' => 'Notify upon all new pages and page changes.',
diff --git a/lang/sv/preferences.php b/lang/sv/preferences.php
index e06c0fbaa79..945099151f2 100644
--- a/lang/sv/preferences.php
+++ b/lang/sv/preferences.php
@@ -14,7 +14,7 @@
     'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
     'shortcuts_section_navigation' => 'Navigation',
     'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
+    'shortcuts_save' => 'Spara genvägar',
     'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
@@ -32,11 +32,11 @@
     'auth' => 'Access & Security',
     'auth_change_password' => 'Change Password',
     'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth_change_password_success' => 'Lösenordet har uppdaterats!',
 
-    'profile' => 'Profile Details',
+    'profile' => 'Profildetaljer',
     'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
+    'profile_view_public' => 'Visa publik profil',
     'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
     'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
     'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
@@ -44,8 +44,8 @@
     'profile_admin_options' => 'Administrator Options',
     'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
+    'delete_account' => 'Radera konto',
+    'delete_my_account' => 'Radera mitt konto',
     'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
     'delete_my_account_warning' => 'Are you sure you want to delete your account?',
 ];
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 5b5738f79d0..ef1ee584eb8 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -33,8 +33,8 @@
     'app_custom_html_disabled_notice' => 'Anpassat innehåll i HTML-huvudet är inaktiverat på denna inställningssida för att säkerställa att eventuella ändringar som påverkar funktionaliteten kan återställas.',
     'app_logo' => 'Applikationslogotyp',
     'app_logo_desc' => 'Detta används bland annat i applikationshuvudet. Bilden bör vara 86 pixlar i höjd. Stora bilder skalas ned.',
-    'app_icon' => 'Application Icon',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_icon' => 'Applikationsikon',
+    'app_icon_desc' => 'Den här ikonen syns i webbläsarens flikar, bokmärken och genvägar. Den skall vara 256x256 pixlar i PNG format.',
     'app_homepage' => 'Startsida',
     'app_homepage_desc' => 'Välj en vy att använda som startsida istället för standardvyn. Behörigheter för valda sidor kommer att ignoreras.',
     'app_homepage_select' => 'Välj en sida',
@@ -279,11 +279,11 @@
     // Licensing
     'licenses' => 'Licenser',
     'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_bookstack' => 'BookStack licens',
+    'licenses_php' => 'Licenser för PHP-bibliotek',
+    'licenses_js' => 'Licenser för JavaScript-bibliotek',
     'licenses_other' => 'Andra licenser',
-    'license_details' => 'License Details',
+    'license_details' => 'Licensinformation',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/zh_TW/auth.php b/lang/zh_TW/auth.php
index 0e7b7f0f543..1168b48b270 100644
--- a/lang/zh_TW/auth.php
+++ b/lang/zh_TW/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => '手機App',
     'mfa_option_totp_desc' => '您必須在行動裝置上安裝了支援TOTP的身份驗證程式（例如Google Authenticator, Authy 或是 Microsoft Authenticator）才能使用雙重身份驗證。',
     'mfa_option_backup_codes_title' => '備用驗證碼',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => '產生一次使用的備份代碼，你可以在登入時用來辨識身份。請確認代碼被存放在安全的地方。',
     'mfa_gen_confirm_and_enable' => '確認並啟用',
     'mfa_gen_backup_codes_title' => '備援代碼設定',
     'mfa_gen_backup_codes_desc' => '將以下代碼列表儲存在安全的地方。存取系統時，您可以使用其中一個代碼作為第二個身份驗證機制。',
diff --git a/lang/zh_TW/components.php b/lang/zh_TW/components.php
index 84bfad4562d..d66dd383e8d 100644
--- a/lang/zh_TW/components.php
+++ b/lang/zh_TW/components.php
@@ -10,7 +10,7 @@
     'image_details' => '圖片詳細資訊',
     'image_upload' => '上傳圖片',
     'image_intro' => '您可以在這裡選取和管理上傳到系統的圖片。',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_intro_upload' => '透過拖曳圖檔至視窗中，或是使用下方的「上傳圖片」按鍵',
     'image_all' => '全部',
     'image_all_title' => '檢視所有圖片',
     'image_book_title' => '檢視上傳到此書本的圖片',
@@ -34,8 +34,8 @@
     'image_delete_success' => '圖片刪除成功',
     'image_replace' => '替換圖片',
     'image_replace_success' => '圖片更新成功',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_rebuild_thumbs' => '重建影像縮圖',
+    'image_rebuild_thumbs_success' => '縮圖建立成功',
 
     // Code Editor
     'code_editor' => '編輯程式碼',
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index c4a351f9b6c..2ee37f863de 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -81,9 +81,9 @@
     'table_properties' => '表格屬性',
     'table_properties_title' => '表格屬性',
     'delete_table' => '刪除表格',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => '清除格式',
+    'resize_to_contents' => '將大小調整到符合內容',
+    'row_header' => '列標題',
     'insert_row_before' => '插入上方列',
     'insert_row_after' => '插入下方列',
     'delete_row' => '刪除列',
@@ -93,84 +93,84 @@
     'table_cell' => '儲存格',
     'table_row' => '行',
     'table_column' => '欄',
-    'cell_properties' => 'Cell properties',
-    'cell_properties_title' => 'Cell Properties',
-    'cell_type' => 'Cell type',
-    'cell_type_cell' => 'Cell',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
-    'table_row_group' => 'Row Group',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
-    'border_style' => 'Border style',
-    'border_color' => 'Border color',
-    'row_properties' => 'Row properties',
-    'row_properties_title' => 'Row Properties',
-    'cut_row' => 'Cut row',
-    'copy_row' => 'Copy row',
-    'paste_row_before' => 'Paste row before',
-    'paste_row_after' => 'Paste row after',
-    'row_type' => 'Row type',
+    'cell_properties' => '表格屬性',
+    'cell_properties_title' => '表格屬性',
+    'cell_type' => '儲存格類型',
+    'cell_type_cell' => '儲存格',
+    'cell_scope' => '範圍',
+    'cell_type_header' => '標題儲存格',
+    'merge_cells' => '合併儲存格',
+    'split_cell' => '分割儲存格',
+    'table_row_group' => '依行分組',
+    'table_column_group' => '依列分組',
+    'horizontal_align' => '水平對齊',
+    'vertical_align' => '垂直對齊',
+    'border_width' => '邊框寬度',
+    'border_style' => '邊框樣式',
+    'border_color' => '邊框顏色',
+    'row_properties' => '行屬性',
+    'row_properties_title' => '行屬性',
+    'cut_row' => '剪切行',
+    'copy_row' => '複製行',
+    'paste_row_before' => '插入上方行',
+    'paste_row_after' => '插入下方行',
+    'row_type' => '行類型',
     'row_type_header' => '頁眉',
     'row_type_body' => '正文',
     'row_type_footer' => '页脚',
-    'alignment' => 'Alignment',
-    'cut_column' => 'Cut column',
-    'copy_column' => 'Copy column',
-    'paste_column_before' => 'Paste column before',
-    'paste_column_after' => 'Paste column after',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
-    'caption' => 'Caption',
-    'show_caption' => 'Show caption',
-    'constrain' => 'Constrain proportions',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'alignment' => '對齊',
+    'cut_column' => '剪切列',
+    'copy_column' => '剪切列',
+    'paste_column_before' => '插入前方列',
+    'paste_column_after' => '插入後方列',
+    'cell_padding' => '單元格填充',
+    'cell_spacing' => '單元格間距',
+    'caption' => '標題',
+    'show_caption' => '顯示標題',
+    'constrain' => '維持比例',
+    'cell_border_solid' => '實線',
+    'cell_border_dotted' => '點線',
+    'cell_border_dashed' => '虛線',
+    'cell_border_double' => '兩倍',
+    'cell_border_groove' => '凹線',
+    'cell_border_ridge' => '浮出',
+    'cell_border_inset' => '嵌入',
+    'cell_border_outset' => '外嵌',
+    'cell_border_none' => '無',
+    'cell_border_hidden' => '隱藏',
 
     // Images, links, details/summary & embed
     'source' => '來源',
-    'alt_desc' => 'Alternative description',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
+    'alt_desc' => '替代描述',
+    'embed' => '內嵌',
+    'paste_embed' => '在下面黏貼您的嵌入代碼：',
     'url' => '網址',
-    'text_to_display' => 'Text to display',
+    'text_to_display' => '要顯示的文字',
     'title' => '標題',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
-    'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
+    'open_link' => '開啟連結',
+    'open_link_in' => '打開連結於……',
+    'open_link_current' => '當前視窗',
+    'open_link_new' => '新視窗',
     'remove_link' => '移除連結',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
+    'insert_collapsible' => '插入可折疊塊',
+    'collapsible_unwrap' => '展開',
     'edit_label' => '編輯標記',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_open_closed' => '切換打開/關閉',
+    'collapsible_edit' => '編輯可折疊塊',
     'toggle_label' => '切換標籤',
 
     // About view
     'about' => '關於編輯器',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
+    'about_title' => '關於所見即所得（WYSIWYG）編輯器',
+    'editor_license' => '編輯器許可證與版權信息',
+    'editor_tiny_license' => '此編輯器是用 :tinyLink 構建的，基於 MIT 許可證。',
+    'editor_tiny_license_link' => 'TinyMCE 的版權和許可證詳細信息可以在這裡找到。',
+    'save_continue' => '保存頁面並繼續',
+    'callouts_cycle' => '(繼續按下以切換類型)',
+    'link_selector' => '鏈接到內容',
     'shortcuts' => '快捷鍵',
     'shortcut' => '快捷鍵',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'shortcuts_intro' => '編輯器中提供了以下快捷鍵：',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
     'description' => '說明',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index e8309d6a59a..8aa9255c511 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -23,9 +23,9 @@
     'meta_updated' => '更新於 :timeLength',
     'meta_updated_name' => '由 :user 更新於 :timeLength',
     'meta_owned_name' => ':user 所擁有',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => '被 :count 個項目引用',
     'entity_select' => '選取項目',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'entity_select_lack_permission' => '你沒有權限使用此項目',
     'images' => '圖片',
     'my_recent_drafts' => '我最近的草稿',
     'my_recently_viewed' => '我最近檢視',
@@ -39,21 +39,21 @@
     'export_pdf' => 'PDF 檔案',
     'export_text' => '純文字檔案',
     'export_md' => 'Markdown 檔案',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'default_template' => '預設頁面範本',
+    'default_template_explain' => '請設定一個頁面範本，作為新頁面的預設內容。請注意，這僅限於作者擁有頁面範本讀取權限時才能夠使用。',
+    'default_template_select' => '選擇一個頁面範本',
 
     // Permissions and restrictions
     'permissions' => '權限',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_desc' => '設定權限，並覆蓋角色預設權限',
+    'permissions_book_cascade' => '除非章節、頁面有自訂權限，否則書籍設定的權限將自動套用',
+    'permissions_chapter_cascade' => '除非章節、頁面有自訂權限，否則章節的權限將自動套用',
     'permissions_save' => '儲存權限',
     'permissions_owner' => '擁有者',
-    'permissions_role_everyone_else' => 'Everyone Else',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions_role_everyone_else' => '所有其他人',
+    'permissions_role_everyone_else_desc' => '設定未被指派角色時的權限',
+    'permissions_role_override' => '覆蓋角色權限',
+    'permissions_inherit_defaults' => '繼承預設值',
 
     // Search
     'search_results' => '搜尋結果',
@@ -96,24 +96,24 @@
     'shelves_save' => '儲存書架',
     'shelves_books' => '此書架上的書本',
     'shelves_add_books' => '新增書本至此書架',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_drag_books' => '拖曳書籍至下方，以便新增至此書架',
     'shelves_empty_contents' => '此書架沒有分配任何書本',
     'shelves_edit_and_assign' => '編輯書架以分配書本',
-    'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
-    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_edit_named' => '編輯書架',
+    'shelves_edit' => '編輯書架',
+    'shelves_delete' => '刪除書架',
+    'shelves_delete_named' => '刪除書架「:name」',
     'shelves_delete_explain' => "這將刪除名為「:name」的書架。但其中的書本不會被刪除。",
     'shelves_delete_confirmation' => '您確定要刪除此書架嗎？',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_permissions' => '書架權限',
+    'shelves_permissions_updated' => '已更新書架權限',
+    'shelves_permissions_active' => '已啟用書架權限',
+    'shelves_permissions_cascade_warning' => '因書籍可位於多個書架，因此書架權限不會自動套用至書籍上。但仍可透過下方的選項來複製權限到子書籍。',
+    'shelves_permissions_create' => '書架創建權限僅用於使用下面的操作將權限複製到子圖書。這個權限不是用來控制創建書籍的。',
     'shelves_copy_permissions_to_books' => '將權限複製到書本',
     'shelves_copy_permissions' => '複製權限',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => '此操作會將此書架的當前權限設置應用於其中包含的所有圖書上。 啓用前請確保已保存對此書架權限的任何更改。',
+    'shelves_copy_permission_success' => '書架權限已複製到 :count 本書籍',
 
     // Books
     'book' => '書本',
@@ -145,7 +145,7 @@
     'books_search_this' => '搜尋此書本',
     'books_navigation' => '書本導覽',
     'books_sort' => '排序書本內容',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => '移動章節、頁面來重新組織內容。也可以透過顯示多本書籍來調整書籍之間的內容',
     'books_sort_named' => '排序書本 :bookName',
     'books_sort_name' => '按名稱排序',
     'books_sort_created' => '按建立時間排序',
@@ -154,19 +154,19 @@
     'books_sort_chapters_last' => '最後一章',
     'books_sort_show_other' => '顯示其他書本',
     'books_sort_save' => '儲存新順序',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
-    'books_copy' => 'Copy Book',
-    'books_copy_success' => 'Book successfully copied',
+    'books_sort_show_other_desc' => '新增書籍到排序清單中，以便跨書籍重組資料',
+    'books_sort_move_up' => '上移',
+    'books_sort_move_down' => '下移',
+    'books_sort_move_prev_book' => '移動至前一書籍',
+    'books_sort_move_next_book' => '移動至前一書籍',
+    'books_sort_move_prev_chapter' => '移動至前一章節',
+    'books_sort_move_next_chapter' => '移動至下一章節',
+    'books_sort_move_book_start' => '移動到書籍開頭',
+    'books_sort_move_book_end' => '移動到書籍結尾',
+    'books_sort_move_before_chapter' => '移動到章節之前',
+    'books_sort_move_after_chapter' => '移動到章節之後',
+    'books_copy' => '複製書籍',
+    'books_copy_success' => '書籍已成功被複製',
 
     // Chapters
     'chapter' => '章節',
@@ -184,14 +184,14 @@
     'chapters_save' => '儲存章節',
     'chapters_move' => '移動章節',
     'chapters_move_named' => '移動章節 :chapterName',
-    'chapters_copy' => 'Copy Chapter',
-    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_copy' => '複製章節',
+    'chapters_copy_success' => '章節已成功被複製',
     'chapters_permissions' => '章節權限',
     'chapters_empty' => '本章目前沒有頁面。',
     'chapters_permissions_active' => '章節權限已啟用',
     'chapters_permissions_success' => '章節權限已更新',
     'chapters_search_this' => '搜尋此章節',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter_sort_book' => '排序書籍內容',
 
     // Pages
     'page' => '頁面',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => '刪除草稿頁面',
     'pages_delete_success' => '頁面已刪除',
     'pages_delete_draft_success' => '草稿頁面已刪除',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => '此頁面是當前書籍或章節的默認頁面模板。刪除此頁面後，這些書籍或章節的默認頁面模板將被取消。',
     'pages_delete_confirm' => '您確定要刪除此頁面嗎？',
     'pages_delete_draft_confirm' => '您確定要刪除此草稿頁面嗎？',
     'pages_editing_named' => '正在編輯頁面 :pageName',
@@ -218,21 +218,21 @@
     'pages_editing_page' => '正在編輯頁面',
     'pages_edit_draft_save_at' => '草稿儲存於 ',
     'pages_edit_delete_draft' => '刪除草稿',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => '您確定要刪除您的草稿頁面更改嗎？自上次完整保存以來的所有更改都將丟失，編輯器將更新為最新非草稿頁面。',
     'pages_edit_discard_draft' => '放棄草稿',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_markdown' => '切換到 Markdown 編輯器',
+    'pages_edit_switch_to_markdown_clean' => '(清除內容)',
+    'pages_edit_switch_to_markdown_stable' => '(保留內容)',
+    'pages_edit_switch_to_wysiwyg' => '切換到所見即所得編輯器',
     'pages_edit_set_changelog' => '設定變更日誌',
     'pages_edit_enter_changelog_desc' => '輸入對您所做變動的簡易描述',
     'pages_edit_enter_changelog' => '輸入變更日誌',
     'pages_editor_switch_title' => '切換編輯器',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_are_you_sure' => '你想要更改這頁所使用的編輯器嗎？',
+    'pages_editor_switch_consider_following' => '更換編輯器時請考慮以下事項：',
+    'pages_editor_switch_consideration_a' => '一旦選擇使用新的編輯器，其他頁面以及沒有權限更換編輯器的使用者都將使用新的編輯器',
+    'pages_editor_switch_consideration_b' => '在某些情況下，將遺失細部設定以及語法',
+    'pages_editor_switch_consideration_c' => '切換編輯器時，本次的標籤設定、版本修訂記錄將不會被保留',
     'pages_save' => '儲存頁面',
     'pages_title' => '頁面標題',
     'pages_name' => '頁面名稱',
@@ -242,9 +242,9 @@
     'pages_md_insert_link' => '插入連結',
     'pages_md_insert_drawing' => '插入繪圖',
     'pages_md_show_preview' => '顯示預覽',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_md_sync_scroll' => '預覽頁面同步捲動',
+    'pages_drawing_unsaved' => '偵測到未儲存的繪圖',
+    'pages_drawing_unsaved_confirm' => '從之前保存失敗的繪圖中發現了可恢復的數據。您想恢復並繼續編輯這個未保存的繪圖嗎？',
     'pages_not_in_chapter' => '頁面不在章節中',
     'pages_move' => '移動頁面',
     'pages_copy' => '複製頁面',
@@ -254,17 +254,17 @@
     'pages_permissions_success' => '頁面權限已更新',
     'pages_revision' => '修訂版本',
     'pages_revisions' => '頁面修訂版本',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => '下面列出的是該頁面的所有過去修訂。如果權限允許，您可以回顧、比較和恢復舊的頁面版本。頁面的完整歷史可能不會在這裡完全反映出來，因為根據系統配置，舊的修訂可能會被自動刪除。',
     'pages_revisions_named' => ':pageName 頁面修訂版本',
     'pages_revision_named' => ':pageName 頁面修訂版本',
     'pages_revision_restored_from' => '從 #:id; :summary 復原',
     'pages_revisions_created_by' => '建立者',
     'pages_revisions_date' => '修訂日期',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => '修訂版號',
     'pages_revisions_numbered' => '修訂版本 #:id',
     'pages_revisions_numbered_changes' => '修訂版本 #:id 變更',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_editor' => '編輯器類型',
     'pages_revisions_changelog' => '變動日誌',
     'pages_revisions_changes' => '變動',
     'pages_revisions_current' => '目前版本',
@@ -272,20 +272,20 @@
     'pages_revisions_restore' => '還原',
     'pages_revisions_none' => '此頁面沒有修訂',
     'pages_copy_link' => '複製連結',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_edit_content_link' => '移動到編輯器區段',
+    'pages_pointer_enter_mode' => '進入區段選取模式',
+    'pages_pointer_label' => '頁面區段選項',
+    'pages_pointer_permalink' => '頁面區段永久連結',
+    'pages_pointer_include_tag' => '包含標籤的頁面區段',
+    'pages_pointer_toggle_link' => '永久連結模式，點擊顯示包含的標籤',
+    'pages_pointer_toggle_include' => '包含標籤模式，按下顯示永久鏈接',
     'pages_permissions_active' => '頁面權限已啟用',
     'pages_initial_revision' => '初次發布',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_references_update_revision' => '系統自動更新的內部鏈接',
     'pages_initial_name' => '新頁面',
     'pages_editing_draft_notification' => '您正在編輯最後儲存為 :timeDiff 的草稿。',
     'pages_draft_edited_notification' => '此頁面已經被更新過。建議您放棄此草稿。',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_page_changed_since_creation' => '這個頁面在您的草稿創建後被其他用戶更新了，您目前的草稿不包含新的內容。建議您放棄此草稿，或是注意不要覆蓋新的頁面更改。',
     'pages_draft_edit_active' => [
         'start_a' => ':count 位使用者已經開始編輯此頁面',
         'start_b' => '使用者 :userName 已經開始編輯此頁面',
@@ -293,35 +293,35 @@
         'time_b' => '在最近:minCount分鐘',
         'message' => ':start :time。注意不要覆寫其他人的更新！',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => '草稿已丟棄！編輯器已更新到當前頁面內容',
+    'pages_draft_deleted' => '草稿已刪除！編輯器已更新為當前頁面內容',
     'pages_specific' => '特定頁面',
     'pages_is_template' => '頁面模板',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => '切換側邊欄',
     'page_tags' => '頁面標籤',
     'chapter_tags' => '章節標籤',
     'book_tags' => '書本標籤',
     'shelf_tags' => '書架標籤',
     'tag' => '標籤',
     'tags' =>  '標籤',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => '為內容加上標籤可靈活得進行分類。標籤可以設定名稱與數值，其中數值為選用。一旦標籤設定完成，便可透過標籤名稱與數值來進行搜尋。',
     'tag_name' =>  '標籤名稱',
     'tag_value' => '標籤值（選擇性）',
     'tags_explain' => "加入一些標籤以更好地對您的內容進行分類。 \n 您可以為標籤分配一個值，以進行更深入的組織。",
     'tags_add' => '新增另一個標籤',
     'tags_remove' => '移除此標籤',
-    'tags_usages' => 'Total tag usages',
-    'tags_assigned_pages' => 'Assigned to Pages',
-    'tags_assigned_chapters' => 'Assigned to Chapters',
-    'tags_assigned_books' => 'Assigned to Books',
-    'tags_assigned_shelves' => 'Assigned to Shelves',
-    'tags_x_unique_values' => ':count unique values',
-    'tags_all_values' => 'All values',
+    'tags_usages' => '總用量',
+    'tags_assigned_pages' => '頁面',
+    'tags_assigned_chapters' => '章節',
+    'tags_assigned_books' => '書籍',
+    'tags_assigned_shelves' => '書架',
+    'tags_x_unique_values' => ':count 個不同的數值',
+    'tags_all_values' => '所有數值',
     'tags_view_tags' => '檢視標籤',
     'tags_view_existing_tags' => '檢視已存在的標籤',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'tags_list_empty_hint' => '可在編輯書架、書籍時設定標籤，或是在編輯章節、頁面時透過側邊欄設定',
     'attachments' => '附件',
     'attachments_explain' => '上傳一些檔案或附加連結以顯示在您的網頁上。將顯示在在頁面的側邊欄。',
     'attachments_explain_instant_save' => '此處的變動將會立刻儲存。',
@@ -330,7 +330,7 @@
     'attachments_upload_drop' => '你也可以將檔案拖曳到此來上傳附加檔案',
     'attachments_set_link' => '設定連結',
     'attachments_delete' => '您確定要刪除此附件嗎？',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => '將檔案拖曳至此來上傳',
     'attachments_no_files' => '尚未上傳檔案',
     'attachments_explain_link' => '如果您不想上傳檔案，則可以附加連結。這可以是指向其他頁面的連結，也可以是指向雲端檔案的連結。',
     'attachments_link_name' => '連結名稱',
@@ -373,7 +373,7 @@
     'comment_new' => '新評論',
     'comment_created' => '評論於 :createDiff',
     'comment_updated' => '由 :username 於 :updateDiff 更新',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => '已更新',
     'comment_deleted_success' => '評論已刪除',
     'comment_created_success' => '評論已加入',
     'comment_updated_success' => '評論已更新',
@@ -387,51 +387,51 @@
     'revision_cannot_delete_latest' => '無法刪除最新修訂版本。',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => '複製內容時請注意以下事項',
+    'copy_consider_permissions' => '自定義權限設置將不會被複製。',
+    'copy_consider_owner' => '您將成為所有已複製內容的所有者。',
+    'copy_consider_images' => '頁面中的圖像文件不會被複製，原始圖像將保留它們與最初上傳到的頁面的關係。',
+    'copy_consider_attachments' => '頁面中的附件不會被複製。',
+    'copy_consider_access' => '改變位置、所有者或權限可能會導致此內容被以前無法訪問的人訪問。',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => '轉換成書架',
+    'convert_to_shelf_contents_desc' => '你可以將此書籍轉換成包含相同內容的新書架，書籍中的章節則會轉換成書籍。若書籍中有不屬於任何章節的頁面，這些頁面會自動轉換成新書架中的書籍。',
+    'convert_to_shelf_permissions_desc' => '在這本書上設置的任何權限都將複製到所有未強制執行權限的新書架和新子圖書上。請注意，書架上的權限不會像圖書那樣繼承到內容物上。',
+    'convert_book' => '轉換成書本',
+    'convert_book_confirm' => '您確定要轉換此書本嗎？',
+    'convert_undo_warning' => '這可不能輕易撤消。',
+    'convert_to_book' => '轉換成書籍',
+    'convert_to_book_desc' => '您可以將此章節轉換為具有相同內容的新書本。此章節中設置的任何權限都將複製到新書本上，但從父圖書繼承的任何權限都不會被複製，這可能會導致訪問控制發生變化。',
+    'convert_chapter' => '轉換章節',
+    'convert_chapter_confirm' => '您確定要轉換此章節嗎？',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => '引用',
+    'references_none' => '沒有跟蹤到對此項目的引用。',
+    'references_to_desc' => '下方列出了系統中鏈接到此項目的所有已知內容。',
 
     // Watch Options
     'watch' => '追蹤',
     'watch_title_default' => '預設偏好設定',
     'watch_desc_default' => '還原成預設的通知設定',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_title_ignore' => '忽略',
+    'watch_desc_ignore' => '忽略所有通知，包括來自用戶級偏好的通知。',
+    'watch_title_new' => '新頁面',
+    'watch_desc_new' => '在此項目中創建任何新頁面時通知我。',
+    'watch_title_updates' => '所有頁面更新',
+    'watch_desc_updates' => '在所有新頁面和頁面更改時通知我。',
+    'watch_desc_updates_page' => '在有頁面發生更改時通知我。',
+    'watch_title_comments' => '所有頁面更新和評論',
+    'watch_desc_comments' => '在有新頁面、頁面更改和新評論時通知我。',
+    'watch_desc_comments_page' => '在有頁面更改和新評論時通知我。',
+    'watch_change_default' => '更改默認通知偏好',
+    'watch_detail_ignore' => '忽略通知',
     'watch_detail_new' => '追蹤新頁面',
     'watch_detail_updates' => '追蹤新頁面與異動',
     'watch_detail_comments' => '追蹤新頁面、自動與評論',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_detail_parent_book' => '已關注—繼承自父書本',
+    'watch_detail_parent_book_ignore' => '已忽略—繼承自父書本',
+    'watch_detail_parent_chapter' => '已關注—繼承自父章節',
+    'watch_detail_parent_chapter_ignore' => '已忽略—繼承自父章節',
 ];
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 5b075135312..6fec01ea0d4 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => '電子郵件為 :email 已存在，但帳號密碼不同。',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => '無法使用資料建立帳號',
     'email_already_confirmed' => '已確認電子郵件，請嘗試登入。',
     'email_confirmation_invalid' => '這個確認權杖無效或已被使用，請嘗試重新註冊。',
     'email_confirmation_expired' => '這個確認權杖無效或已被使用，已傳送新的確認電子郵件。',
@@ -37,32 +37,32 @@
     'social_driver_not_found' => '找不到社交驅動程式',
     'social_driver_not_configured' => '您的 :socialAccount 社交設定不正確。',
     'invite_token_expired' => '此邀請連結已過期。您可以嘗試重設您的帳號密碼。',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => '使用者不存在',
 
     // System
     'path_not_writable' => '無法上傳到 :filePath 檔案路徑。請確定其對伺服器來說是可寫入的。',
     'cannot_get_image_from_url' => '無法從 :url 取得圖片',
     'cannot_create_thumbs' => '伺服器無法建立縮圖。請檢查您是否安裝了 PHP 的 GD 擴充程式。',
     'server_upload_limit' => '伺服器不允許上傳這個大的檔案。請嘗試較小的檔案。',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => '伺服器無法處理提供的資料，請嘗試刪減內容或較小的檔案',
     'uploaded'  => '伺服器不允許上傳這個大的檔案。請嘗試較小的檔案。',
 
     // Drawing & Images
     'image_upload_error' => '上傳圖片時發生錯誤',
     'image_upload_type_error' => '上傳圖片類型無效',
     'image_upload_replace_type' => '必須使用的檔案類型才能置換圖檔',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'image_upload_memory_limit' => '由於系統限制，無法處理上傳的檔案或縮圖',
+    'image_thumbnail_memory_limit' => '由於系統限制，無法建立不同尺寸的圖片',
+    'image_gallery_thumbnail_memory_limit' => '由於系統限制，無法建立縮圖',
     'drawing_data_not_found' => '無法載入繪圖資料，繪圖檔案可能不存在，或您可能沒有權限存取它。',
 
     // Attachments
     'attachment_not_found' => '找不到附件',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => '上傳檔案時發生錯誤',
 
     // Pages
     'page_draft_autosave_fail' => '無法儲存草稿。請確保您在儲存此頁面前已連線至網際網路',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => '無法刪除草稿並取得最新的頁面存檔',
     'page_custom_home_deletion' => '無法刪除被設定為首頁的頁面',
 
     // Entities
@@ -116,5 +116,5 @@
     'maintenance_test_email_failure' => '寄送測試電子郵件時發生錯誤:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'URL 與設置的 SSR 主機不符',
 ];
diff --git a/lang/zh_TW/notifications.php b/lang/zh_TW/notifications.php
index 1afd23f1dc4..7fcfa640090 100644
--- a/lang/zh_TW/notifications.php
+++ b/lang/zh_TW/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => '頁面上有新評論：:pageName',
+    'new_comment_intro' => '一位用戶在 :appName: 的頁面上發表了評論',
+    'new_page_subject' => '新頁面：:pageName',
+    'new_page_intro' => ':appName: 中創建了一個新頁面',
+    'updated_page_subject' => '頁面更新：:pageName',
+    'updated_page_intro' => ':appName: 中的一個頁面已被更新',
+    'updated_page_debounce' => '為了防止出現大量通知，一段時間內您不會收到同一編輯者再次編輯本頁面的通知。',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => '頁面名稱:',
+    'detail_page_path' => '頁面路徑：',
+    'detail_commenter' => '評論者:',
+    'detail_comment' => '評論:',
+    'detail_created_by' => '建立者:',
+    'detail_updated_by' => '更新者：',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => '檢視評論',
+    'action_view_page' => '查看頁面',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => '向您發送此通知是因為 :link 涵蓋了該項目的此類活動。',
+    'footer_reason_link' => '個人偏好通知設定',
 ];
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index 572739f2933..acfbe334d7b 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -27,7 +27,7 @@
     'app_secure_images_toggle' => '啟用更高安全性的圖片上傳',
     'app_secure_images_desc' => '因為效能因素，所有圖片都是公開的。此選項會在圖片的網址前加入一串隨機且難以猜測的字串。確保未啟用目錄索引，讓直接進入變得更困難。',
     'app_default_editor' => '預設頁面編輯器',
-    'app_default_editor_desc' => '选择编辑新页面时默认使用的编辑器。这可以在权限允许的页面级别被覆盖。',
+    'app_default_editor_desc' => '選擇編輯頁面時預設使用的編輯器，這項設定值可被頁面的權限覆蓋',
     'app_custom_html' => '自訂 HTML 標題內容',
     'app_custom_html_desc' => '此處加入的任何內容都將插入到每個頁面的 <head> 部分的底部，這對於覆蓋樣式或加入分析程式碼很方便。',
     'app_custom_html_disabled_notice' => '在此設定頁面上停用了自訂 HTML 標題內容，以確保任何重大變更都能被還原。',
@@ -49,8 +49,8 @@
 
     // Color settings
     'color_scheme' => '應用程式配色',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'color_scheme_desc' => '設定使用者頁面欲使用的顏色。可分別針對淺色模式與暗色模式設定顏色，以確保容易閱讀',
+    'ui_colors_desc' => '設定頁面主要色彩以及頁面連結預設顏色。主要色彩用於標題橫幅、按鈕以及主要操作界面，頁面連結顏色，主要用於主頁面、編輯頁面中的文字連結、操作按鈕。',
     'app_color' => '主要顏色',
     'link_color' => '連結預設顏色',
     'content_colors_desc' => '設定頁面層次結構中的元素顏色；為了提高可讀性，建議選擇亮度與預設顏色相似的顏色。',
@@ -92,9 +92,9 @@
     'maint_send_test_email_mail_text' => '恭喜！您收到這封電子郵件通知時，代表您的電子郵件設定已正確設定。',
     'maint_recycle_bin_desc' => '刪除的書架、書本、章節與頁面將會被傳送到回收桶，這樣仍可以還原或永久刪除。回收桶中較舊的項目可能會在一段時間後自動移除，取決於您的系統設定。',
     'maint_recycle_bin_open' => '開啟回收桶',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_regen_references' => '重新生成引用',
+    'maint_regen_references_desc' => '此操作將重建數據庫中的跨項目引用索引。這通常是自動處理的，但可能有助於索引舊內容或通過非官方方法添加的內容。',
+    'maint_regen_references_success' => '引用索引已重新生成！',
     'maint_timeout_command_note' => '備註：這項操作需要較長的時間，可能導致多數的網路環境發生連線逾時的問題。若有需要，可以透過終端機指令來替代。',
 
     // Recycle Bin
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => '回收桶目前是空的',
     'recycle_bin_empty' => '清空回收桶',
     'recycle_bin_empty_confirm' => '這將會永久破壞回收桶中的所有項目，包括每個項目中包含的內容。您確定您想要清空回收桶嗎？',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => '此操作將從系統中永久刪除此項目以及下面列出的所有子元素，並且您將無法還原此內容。您確定要永久刪除該項目嗎？',
     'recycle_bin_destroy_list' => '要被銷毀的項目',
     'recycle_bin_restore_list' => '要被還原的項目',
     'recycle_bin_restore_confirm' => '此動作將會還原已被刪除的項目（包含任何下層元素）到其原始位置。如果原始位置已被刪除，且目前位於垃圾桶裡，那麼上層項目也需要被還原。',
@@ -138,10 +138,10 @@
     'role_user_roles' => '使用者角色',
     'roles_index_desc' => '「角色」用於將系統權限套用至使用者群組。當使用者擁有多角色時，
 使用者會自動繼承角色中的所有系統權限',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_x_users_assigned' => ':count 位用戶已分配|:count 位用戶已分配',
+    'roles_x_permissions_provided' => ':count 個權限|:count 個權限',
+    'roles_assigned_users' => '已分配用戶',
+    'roles_permissions_provided' => '已提供權限',
     'role_create' => '建立新角色',
     'role_delete' => '刪除角色',
     'role_delete_confirm' => '這將會刪除名為「:roleName」的角色.',
@@ -164,12 +164,12 @@
     'role_manage_settings' => '管理應用程式設定',
     'role_export_content' => '匯出內容',
     'role_editor_change' => '重設頁面編輯器',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => '管理和接收通知',
     'role_asset' => '資源權限',
     'roles_system_warning' => '請注意，有上述三項權限中的任一項的使用者都可以更改自己或系統中其他人的權限。有這些權限的角色只應分配給受信任的使用者。',
     'role_asset_desc' => '對系統內資源的預設權限將由這裡的權限控制。若有單獨設定在書本、章節和頁面上的權限，將會覆寫這裡的權限設定。',
     'role_asset_admins' => '管理員會自動取得對所有內容的存取權，但這些選項可能會顯示或隱藏使用者介面的選項。',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => '這與圖像管理器中的可見性有關。已經上傳的圖片的實際訪問取決於系統圖像存儲選項。',
     'role_all' => '全部',
     'role_own' => '擁有',
     'role_controlled_by_asset' => '依據隸屬的資源來決定',
@@ -194,8 +194,8 @@
     'users_send_invite_text' => '您可以選擇向此使用者傳送邀請電子郵件，讓他們可以設定自己的密碼，您也可以自行設定他們的密碼。',
     'users_send_invite_option' => '傳送邀請電子郵件給使用者',
     'users_external_auth_id' => '外部身份驗證 ID',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => '使用外部驗證系統時 (如 SAML2、OIDC、LDAP)，將使這個帳號與驗證系統帳號連結。若使用一般的 email 認證方式，可以忽略此欄位。',
+    'users_password_warning' => '如果您想更改此用戶的密碼，請填寫以下內容：',
     'users_system_public' => '此使用者代表造訪您站台的任何訪客使用者。其不能用於登入，而會自動分配。',
     'users_delete' => '刪除使用者',
     'users_delete_named' => '刪除使用者 :userName',
@@ -211,23 +211,23 @@
     'users_preferred_language' => '偏好語言',
     'users_preferred_language_desc' => '此選項將會變更用於應用程式使用者介面的語言。不會影響任何使用者建立的內容。',
     'users_social_accounts' => '社群網站帳號',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => '查看此用戶已連接的社交賬戶狀態。 除了主要認證系統外，社交賬戶也可用於系統訪問。',
     'users_social_accounts_info' => '您可以在此處連結您其他的帳號以供快速登入。從此處取消連結帳號並不會撤銷先前已授權的存取。請從您連結的社群網站帳號的個人設定中撤銷存取權。',
     'users_social_connect' => '連結帳號',
     'users_social_disconnect' => '取消連結帳號',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => '已連接',
+    'users_social_status_disconnected' => '已斷開連接',
     'users_social_connected' => ':socialAccount 帳號已經成功連結到您的個人資料。',
     'users_social_disconnected' => ':socialAccount 帳號已經成功取消連結。',
     'users_api_tokens' => 'API 權杖',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => '創建和管理用於 BookStack REST API 認證的訪問令牌。 API 的權限是通過令牌所屬的用戶管理的。',
     'users_api_tokens_none' => '尚未為此使用者建立 API 權杖',
     'users_api_tokens_create' => '建立權杖',
     'users_api_tokens_expires' => '過期',
     'users_api_tokens_docs' => 'API 文件',
     'users_mfa' => '多重身分驗證',
     'users_mfa_desc' => '設定多重身份驗證為您的帳戶多增加了一道防線',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_x_methods' => ':count 個措施已配置|:count 個措施已配置',
     'users_mfa_configure' => '方式設置',
 
     // API Tokens
@@ -250,30 +250,30 @@
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_index_desc' => 'Webhook 是一種在系統內發生某些操作和事件時將數據發送到外部 URL 的方法，它允許與外部平台（例如消息傳遞或通知系統）進行基於事件的集成。',
+    'webhooks_x_trigger_events' => ':count 個觸發事件 |:count 個觸發事件',
     'webhooks_create' => '建立 Webhook',
     'webhooks_none_created' => '沒有已建立的 Webhook',
     'webhooks_edit' => '設置 Webhook',
     'webhooks_save' => '儲存 Webhook',
     'webhooks_details' => 'WebHook 詳細資料',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_details_desc' => '提供一個用戶友好的名稱和一個 POST Endpoint 作為 Webhook 數據發送的位置。',
+    'webhooks_events' => 'Webhook 事件',
+    'webhooks_events_desc' => '選擇所有應觸發此 Webhook 的事件。',
+    'webhooks_events_warning' => '請記住，即使應用了自定義權限，所有選定的事件也仍然會被觸發。 確保使用此 Webhook 不會洩露機密內容。',
     'webhooks_events_all' => '全部系統活動',
     'webhooks_name' => 'Webhook 名稱',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
+    'webhooks_timeout' => 'Webhook 請求超時（秒）',
+    'webhooks_endpoint' => 'Webhook 端點',
+    'webhooks_active' => 'Webhook 啟用',
     'webhook_events_table_header' => '事件',
     'webhooks_delete' => '刪除 Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
+    'webhooks_delete_warning' => '這將會從系統中完全刪除名為 “:webhookName” 的 webhook。',
+    'webhooks_delete_confirm' => '確定要刪除此 Webhook 嗎？',
     'webhooks_format_example' => 'Webhook 格式範例',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_format_example_desc' => 'Webhook 數據會以 POST 請求按照以下 JSON 格式發送到設置的 Endpoint。 “related_item” 和 “url” 屬性是可選的，取決於觸發的事件類型。',
     'webhooks_status' => 'Webhook 狀態',
-    'webhooks_last_called' => 'Last Called:',
+    'webhooks_last_called' => '最後一次調用：',
     'webhooks_last_errored' => '上次錯誤',
     'webhooks_last_error_message' => '上次錯誤信息',
 

From 1c9afcb84ef702412d6a004df1a3d861a8f57f1b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 6 Sep 2024 14:07:10 +0100
Subject: [PATCH 257/666] Lexical: Added some level of img/media alignment

---
 resources/js/wysiwyg/nodes/image.ts           | 42 ++++++++++++---
 resources/js/wysiwyg/nodes/media.ts           | 51 ++++++++++++++++---
 resources/js/wysiwyg/todo.md                  |  5 +-
 .../wysiwyg/ui/defaults/buttons/alignments.ts | 39 +++++++++-----
 resources/js/wysiwyg/utils/selection.ts       | 19 +++++--
 5 files changed, 124 insertions(+), 32 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index ef6bf35724a..77c854b419d 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -10,6 +10,7 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {EditorDecoratorAdapter} from "../ui/framework/decorator";
 import {el} from "../utils/dom";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
 
 export interface ImageNodeOptions {
     alt?: string;
@@ -22,6 +23,7 @@ export type SerializedImageNode = Spread<{
     alt: string;
     width: number;
     height: number;
+    alignment: CommonBlockAlignment;
 }, SerializedLexicalNode>
 
 export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
@@ -29,7 +31,7 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
     __alt: string = '';
     __width: number = 0;
     __height: number = 0;
-    // TODO - Alignment
+    __alignment: CommonBlockAlignment = '';
 
     static getType(): string {
         return 'image';
@@ -97,6 +99,16 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
         return self.__width;
     }
 
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     isInline(): boolean {
         return true;
     }
@@ -121,6 +133,11 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
         if (this.__alt) {
             element.setAttribute('alt', this.__alt);
         }
+
+        if (this.__alignment) {
+            element.classList.add('align-' + this.__alignment);
+        }
+
         return el('span', {class: 'editor-image-wrap'}, [
             element,
         ]);
@@ -158,6 +175,15 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
             }
         }
 
+        if (prevNode.__alignment !== this.__alignment) {
+            if (prevNode.__alignment) {
+                image.classList.remove('align-' + prevNode.__alignment);
+            }
+            if (this.__alignment) {
+                image.classList.add('align-' + this.__alignment);
+            }
+        }
+
         return false;
     }
 
@@ -174,9 +200,10 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
                             width: Number.parseInt(element.getAttribute('width') || '0'),
                         }
 
-                        return {
-                            node: new ImageNode(src, options),
-                        };
+                        const node = new ImageNode(src, options);
+                        node.setAlignment(extractAlignmentFromElement(element));
+
+                        return { node };
                     },
                     priority: 3,
                 };
@@ -191,16 +218,19 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
             src: this.__src,
             alt: this.__alt,
             height: this.__height,
-            width: this.__width
+            width: this.__width,
+            alignment: this.__alignment,
         };
     }
 
     static importJSON(serializedNode: SerializedImageNode): ImageNode {
-        return $createImageNode(serializedNode.src, {
+        const node = $createImageNode(serializedNode.src, {
             alt: serializedNode.alt,
             width: serializedNode.width,
             height: serializedNode.height,
         });
+        node.setAlignment(serializedNode.alignment);
+        return node;
     }
 }
 
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index 73208cb2e43..4159cd457e5 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -9,6 +9,13 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 
 import {el} from "../utils/dom";
+import {
+    CommonBlockAlignment,
+    SerializedCommonBlockNode,
+    setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "./_common";
+import {elem} from "../../services/dom";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
@@ -20,10 +27,10 @@ export type SerializedMediaNode = Spread<{
     tag: MediaNodeTag;
     attributes: Record<string, string>;
     sources: MediaNodeSource[];
-}, SerializedElementNode>
+}, SerializedCommonBlockNode>
 
 const attributeAllowList = [
-    'id', 'width', 'height', 'style', 'title', 'name',
+    'width', 'height', 'style', 'title', 'name',
     'src', 'allow', 'allowfullscreen', 'loading', 'sandbox',
     'type', 'data', 'controls', 'autoplay', 'controlslist', 'loop',
     'muted', 'playsinline', 'poster', 'preload'
@@ -39,7 +46,7 @@ function filterAttributes(attributes: Record<string, string>): Record<string, st
     return filtered;
 }
 
-function domElementToNode(tag: MediaNodeTag, element: Element): MediaNode {
+function domElementToNode(tag: MediaNodeTag, element: HTMLElement): MediaNode {
     const node = $createMediaNode(tag);
 
     const attributes: Record<string, string> = {};
@@ -62,10 +69,14 @@ function domElementToNode(tag: MediaNodeTag, element: Element): MediaNode {
         node.setSources(sources);
     }
 
+    setCommonBlockPropsFromElement(element, node);
+
     return node;
 }
 
 export class MediaNode extends ElementNode {
+    __id: string = '';
+    __alignment: CommonBlockAlignment = '';
     __tag: MediaNodeTag;
     __attributes: Record<string, string> = {};
     __sources: MediaNodeSource[] = [];
@@ -135,11 +146,32 @@ export class MediaNode extends ElementNode {
         this.setAttributes(attrs);
     }
 
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const sources = (this.__tag === 'video' || this.__tag === 'audio') ? this.__sources : [];
         const sourceEls = sources.map(source => el('source', source));
-
-        return el(this.__tag, this.__attributes, sourceEls);
+        const element = el(this.__tag, this.__attributes, sourceEls);
+        updateElementWithCommonBlockProps(element, this);
+        return element;
     }
 
     updateDOM(prevNode: unknown, dom: HTMLElement) {
@@ -175,6 +207,8 @@ export class MediaNode extends ElementNode {
             ...super.exportJSON(),
             type: 'media',
             version: 1,
+            id: this.__id,
+            alignment: this.__alignment,
             tag: this.__tag,
             attributes: this.__attributes,
             sources: this.__sources,
@@ -182,7 +216,10 @@ export class MediaNode extends ElementNode {
     }
 
     static importJSON(serializedNode: SerializedMediaNode): MediaNode {
-        return $createMediaNode(serializedNode.tag);
+        const node = $createMediaNode(serializedNode.tag);
+        node.setId(serializedNode.id);
+        node.setAlignment(serializedNode.alignment);
+        return node;
     }
 
 }
@@ -196,7 +233,7 @@ export function $createMediaNodeFromHtml(html: string): MediaNode | null {
     const doc = parser.parseFromString(`<body>${html}</body>`, 'text/html');
 
     const el = doc.body.children[0];
-    if (!el) {
+    if (!(el instanceof HTMLElement)) {
         return null;
     }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 5df26bd8cfd..795f7ab9c04 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,18 +6,19 @@
 
 ## Main Todo
 
-- Alignments: Handle inline block content (image, video)
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
-- Table caption text support
 - Mac: Shortcut support via command.
 
 ## Secondary Todo
 
 - Color picker support in table form color fields
+- Table caption text support
 
 ## Bugs
 
+- Image alignment in editor dodgy due to wrapper.
+- Can't select iframe embeds by themselves. (click enters iframe)
 - Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
 - Removing link around image via button deletes image, not just link 
 - `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 78de3c9a243..75440aed819 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -1,17 +1,32 @@
-import {$getSelection, BaseSelection} from "lexical";
+import {BaseSelection, LexicalEditor} from "lexical";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import alignLeftIcon from "@icons/editor/align-left.svg";
 import {EditorUiContext} from "../../framework/core";
 import alignCenterIcon from "@icons/editor/align-center.svg";
 import alignRightIcon from "@icons/editor/align-right.svg";
 import alignJustifyIcon from "@icons/editor/align-justify.svg";
-import {$getBlockElementNodesInSelection, $selectionContainsElementFormat} from "../../../utils/selection";
+import {
+    $getBlockElementNodesInSelection,
+    $getDecoratorNodesInSelection,
+    $selectionContainsAlignment, getLastSelection
+} from "../../../utils/selection";
 import {CommonBlockAlignment} from "../../../nodes/_common";
 import {nodeHasAlignment} from "../../../utils/nodes";
 
 
-function setAlignmentForSection(alignment: CommonBlockAlignment): void {
-    const selection = $getSelection();
+function setAlignmentForSection(editor: LexicalEditor, alignment: CommonBlockAlignment): void {
+    const selection = getLastSelection(editor);
+    const selectionNodes = selection?.getNodes() || [];
+    const decorators = $getDecoratorNodesInSelection(selection);
+
+    // Handle decorator node selection alignment
+    if (selectionNodes.length === 1 && decorators.length === 1 && nodeHasAlignment(decorators[0])) {
+        decorators[0].setAlignment(alignment);
+        console.log('setting for decorator!');
+        return;
+    }
+
+    // Handle normal block/range alignment
     const elements = $getBlockElementNodesInSelection(selection);
     for (const node of elements) {
         if (nodeHasAlignment(node)) {
@@ -24,10 +39,10 @@ export const alignLeft: EditorButtonDefinition = {
     label: 'Align left',
     icon: alignLeftIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('left'));
+        context.editor.update(() => setAlignmentForSection(context.editor, 'left'));
     },
     isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'left');
+        return $selectionContainsAlignment(selection, 'left');
     }
 };
 
@@ -35,10 +50,10 @@ export const alignCenter: EditorButtonDefinition = {
     label: 'Align center',
     icon: alignCenterIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('center'));
+        context.editor.update(() => setAlignmentForSection(context.editor, 'center'));
     },
     isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'center');
+        return $selectionContainsAlignment(selection, 'center');
     }
 };
 
@@ -46,10 +61,10 @@ export const alignRight: EditorButtonDefinition = {
     label: 'Align right',
     icon: alignRightIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('right'));
+        context.editor.update(() => setAlignmentForSection(context.editor, 'right'));
     },
     isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'right');
+        return $selectionContainsAlignment(selection, 'right');
     }
 };
 
@@ -57,9 +72,9 @@ export const alignJustify: EditorButtonDefinition = {
     label: 'Align justify',
     icon: alignJustifyIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection('justify'));
+        context.editor.update(() => setAlignmentForSection(context.editor, 'justify'));
     },
     isActive(selection: BaseSelection|null) {
-        return $selectionContainsElementFormat(selection, 'justify');
+        return $selectionContainsAlignment(selection, 'justify');
     }
 };
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 74dd9452743..791eb749904 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -2,11 +2,11 @@ import {
     $createNodeSelection,
     $createParagraphNode,
     $getRoot,
-    $getSelection,
+    $getSelection, $isDecoratorNode,
     $isElementNode,
     $isTextNode,
     $setSelection,
-    BaseSelection,
+    BaseSelection, DecoratorNode,
     ElementFormatType,
     ElementNode, LexicalEditor,
     LexicalNode,
@@ -16,8 +16,9 @@ import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexi
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
-import {$getParentOfType} from "./nodes";
+import {$getParentOfType, nodeHasAlignment} from "./nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+import {CommonBlockAlignment} from "../nodes/_common";
 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
 
@@ -120,10 +121,10 @@ export function $selectionContainsNode(selection: BaseSelection | null, node: Le
     return false;
 }
 
-export function $selectionContainsElementFormat(selection: BaseSelection | null, format: ElementFormatType): boolean {
+export function $selectionContainsAlignment(selection: BaseSelection | null, alignment: CommonBlockAlignment): boolean {
     const nodes = $getBlockElementNodesInSelection(selection);
     for (const node of nodes) {
-        if (node.getFormatType() === format) {
+        if (nodeHasAlignment(node) && node.getAlignment() === alignment) {
             return true;
         }
     }
@@ -148,4 +149,12 @@ export function $getBlockElementNodesInSelection(selection: BaseSelection | null
     }
 
     return Array.from(blockNodes.values());
+}
+
+export function $getDecoratorNodesInSelection(selection: BaseSelection | null): DecoratorNode<any>[] {
+    if (!selection) {
+        return [];
+    }
+
+    return selection.getNodes().filter(node => $isDecoratorNode(node));
 }
\ No newline at end of file

From e5b6d28bcaf78a08fab97e0ee0496650b2466569 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 7 Sep 2024 18:39:58 +0100
Subject: [PATCH 258/666] Lexical: Revamped image node resize method

Changed from using a decorator to using a helper that watches for image
selections to then display a resize helper.
Also changes resizer to use a ghost and apply changes on end instead of
continuosly during resize.
---
 resources/js/wysiwyg/index.ts                 |   2 +
 resources/js/wysiwyg/nodes/image.ts           |  55 +++---
 resources/js/wysiwyg/todo.md                  |   4 +-
 resources/js/wysiwyg/ui/decorators/image.ts   | 132 --------------
 .../wysiwyg/ui/defaults/buttons/alignments.ts |  16 +-
 .../ui/framework/helpers/image-resizer.ts     | 167 ++++++++++++++++++
 resources/js/wysiwyg/ui/framework/manager.ts  |  19 +-
 resources/js/wysiwyg/ui/index.ts              |   2 -
 resources/js/wysiwyg/utils/selection.ts       |  20 ++-
 resources/sass/_editor.scss                   |  26 ++-
 10 files changed, 251 insertions(+), 192 deletions(-)
 delete mode 100644 resources/js/wysiwyg/ui/decorators/image.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index fdcfa5b7ef0..c312919dbb7 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -13,6 +13,7 @@ import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler"
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
+import {registerImageResizer} from "./ui/framework/helpers/image-resizer";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -55,6 +56,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
         registerDropPasteHandling(context),
+        registerImageResizer(context),
     );
 
     listenToCommonEvents(editor);
diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index 77c854b419d..c9d11d871b3 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -1,16 +1,14 @@
 import {
-    DecoratorNode,
     DOMConversion,
     DOMConversionMap,
-    DOMConversionOutput,
+    DOMConversionOutput, ElementNode,
     LexicalEditor, LexicalNode,
-    SerializedLexicalNode,
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {el} from "../utils/dom";
 import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
+import {$selectSingleNode} from "../utils/selection";
+import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {
     alt?: string;
@@ -24,9 +22,9 @@ export type SerializedImageNode = Spread<{
     width: number;
     height: number;
     alignment: CommonBlockAlignment;
-}, SerializedLexicalNode>
+}, SerializedElementNode>
 
-export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
+export class ImageNode extends ElementNode {
     __src: string = '';
     __alt: string = '';
     __width: number = 0;
@@ -38,11 +36,13 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     static clone(node: ImageNode): ImageNode {
-        return new ImageNode(node.__src, {
+        const newNode = new ImageNode(node.__src, {
             alt: node.__alt,
             width: node.__width,
             height: node.__height,
         });
+        newNode.__alignment = node.__alignment;
+        return newNode;
     }
 
     constructor(src: string, options: ImageNodeOptions, key?: string) {
@@ -113,13 +113,6 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
         return true;
     }
 
-    decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
-        return {
-            type: 'image',
-            getNode: () => this,
-        };
-    }
-
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('img');
         element.setAttribute('src', this.__src);
@@ -138,49 +131,50 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
             element.classList.add('align-' + this.__alignment);
         }
 
-        return el('span', {class: 'editor-image-wrap'}, [
-            element,
-        ]);
+        element.addEventListener('click', e => {
+            _editor.update(() => {
+                $selectSingleNode(this);
+            });
+        });
+
+        return element;
     }
 
     updateDOM(prevNode: ImageNode, dom: HTMLElement) {
-        const image = dom.querySelector('img');
-        if (!image) return false;
-
         if (prevNode.__src !== this.__src) {
-            image.setAttribute('src', this.__src);
+            dom.setAttribute('src', this.__src);
         }
 
         if (prevNode.__width !== this.__width) {
             if (this.__width) {
-                image.setAttribute('width', String(this.__width));
+                dom.setAttribute('width', String(this.__width));
             } else {
-                image.removeAttribute('width');
+                dom.removeAttribute('width');
             }
         }
 
         if (prevNode.__height !== this.__height) {
             if (this.__height) {
-                image.setAttribute('height', String(this.__height));
+                dom.setAttribute('height', String(this.__height));
             } else {
-                image.removeAttribute('height');
+                dom.removeAttribute('height');
             }
         }
 
         if (prevNode.__alt !== this.__alt) {
             if (this.__alt) {
-                image.setAttribute('alt', String(this.__alt));
+                dom.setAttribute('alt', String(this.__alt));
             } else {
-                image.removeAttribute('alt');
+                dom.removeAttribute('alt');
             }
         }
 
         if (prevNode.__alignment !== this.__alignment) {
             if (prevNode.__alignment) {
-                image.classList.remove('align-' + prevNode.__alignment);
+                dom.classList.remove('align-' + prevNode.__alignment);
             }
             if (this.__alignment) {
-                image.classList.add('align-' + this.__alignment);
+                dom.classList.add('align-' + this.__alignment);
             }
         }
 
@@ -213,6 +207,7 @@ export class ImageNode extends DecoratorNode<EditorDecoratorAdapter> {
 
     exportJSON(): SerializedImageNode {
         return {
+            ...super.exportJSON(),
             type: 'image',
             version: 1,
             src: this.__src,
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 795f7ab9c04..064d65e4c49 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,7 +6,6 @@
 
 ## Main Todo
 
-- Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Media resize support (like images)
 - Mac: Shortcut support via command.
 
@@ -14,12 +13,11 @@
 
 - Color picker support in table form color fields
 - Table caption text support
+- Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 
 ## Bugs
 
-- Image alignment in editor dodgy due to wrapper.
 - Can't select iframe embeds by themselves. (click enters iframe)
-- Image resizing currently bugged, maybe change to ghost resizer in decorator instead of updating core node.
 - Removing link around image via button deletes image, not just link 
 - `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
 - Template drag/drop not handled when outside core editor area (ignored in margin area).
diff --git a/resources/js/wysiwyg/ui/decorators/image.ts b/resources/js/wysiwyg/ui/decorators/image.ts
deleted file mode 100644
index d110bc49930..00000000000
--- a/resources/js/wysiwyg/ui/decorators/image.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import {EditorDecorator} from "../framework/decorator";
-import {$createNodeSelection, $setSelection} from "lexical";
-import {EditorUiContext} from "../framework/core";
-import {ImageNode} from "../../nodes/image";
-import {MouseDragTracker, MouseDragTrackerDistance} from "../framework/helpers/mouse-drag-tracker";
-import {$selectSingleNode} from "../../utils/selection";
-import {el} from "../../utils/dom";
-
-
-export class ImageDecorator extends EditorDecorator {
-    protected dom: HTMLElement|null = null;
-    protected dragLastMouseUp: number = 0;
-
-    buildDOM(context: EditorUiContext) {
-        let handleElems: HTMLElement[] = [];
-        const decorateEl = el('div', {
-            class: 'editor-image-decorator',
-        }, []);
-        let selected = false;
-        let tracker: MouseDragTracker|null = null;
-
-        const windowClick = (event: MouseEvent) => {
-            if (!decorateEl.contains(event.target as Node) && (Date.now() - this.dragLastMouseUp > 100)) {
-                unselect();
-            }
-        };
-
-        const select = () => {
-            if (selected) {
-                return;
-            }
-
-            selected = true;
-            decorateEl.classList.add('selected');
-            window.addEventListener('click', windowClick);
-
-            const handleClasses = ['nw', 'ne', 'se', 'sw'];
-            handleElems = handleClasses.map(c => {
-                return el('div', {class: `editor-image-decorator-handle ${c}`});
-            });
-            decorateEl.append(...handleElems);
-            tracker = this.setupTracker(decorateEl, context);
-
-            context.editor.update(() => {
-                $selectSingleNode(this.getNode());
-            });
-        };
-
-        const unselect = () => {
-            selected = false;
-            decorateEl.classList.remove('selected');
-            window.removeEventListener('click', windowClick);
-            tracker?.teardown();
-            for (const el of handleElems) {
-                el.remove();
-            }
-        };
-
-        decorateEl.addEventListener('click', (event) => {
-            select();
-        });
-
-        return decorateEl;
-    }
-
-    render(context: EditorUiContext): HTMLElement {
-        if (this.dom) {
-            return this.dom;
-        }
-
-        this.dom = this.buildDOM(context);
-        return this.dom;
-    }
-
-    setupTracker(container: HTMLElement, context: EditorUiContext): MouseDragTracker {
-        let startingWidth: number = 0;
-        let startingHeight: number = 0;
-        let startingRatio: number = 0;
-        let hasHeight = false;
-        let firstChange = true;
-        let node: ImageNode = this.getNode() as ImageNode;
-        let _this = this;
-        let flipXChange: boolean = false;
-        let flipYChange: boolean = false;
-
-        return new MouseDragTracker(container, '.editor-image-decorator-handle', {
-            down(event: MouseEvent, handle: HTMLElement) {
-                context.editor.getEditorState().read(() => {
-                    startingWidth = node.getWidth() || startingWidth;
-                    startingHeight = node.getHeight() || startingHeight;
-                    if (node.getHeight()) {
-                        hasHeight = true;
-                    }
-                    startingRatio = startingWidth / startingHeight;
-                });
-
-                flipXChange = handle.classList.contains('nw') || handle.classList.contains('sw');
-                flipYChange = handle.classList.contains('nw') || handle.classList.contains('ne');
-            },
-            move(event: MouseEvent, handle: HTMLElement, distance: MouseDragTrackerDistance) {
-                let xChange = distance.x;
-                if (flipXChange) {
-                    xChange = 0 - xChange;
-                }
-                let yChange = distance.y;
-                if (flipYChange) {
-                    yChange = 0 - yChange;
-                }
-                const balancedChange = Math.sqrt(Math.pow(Math.abs(xChange), 2) + Math.pow(Math.abs(yChange), 2));
-                const increase = xChange + yChange > 0;
-                const directedChange = increase ? balancedChange : 0-balancedChange;
-                const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
-                let newHeight = 0;
-                if (hasHeight) {
-                    newHeight = newWidth * startingRatio;
-                }
-
-                const updateOptions = firstChange ? {} : {tag: 'history-merge'};
-                context.editor.update(() => {
-                    const node = _this.getNode() as ImageNode;
-                    node.setWidth(newWidth);
-                    node.setHeight(newHeight);
-                }, updateOptions);
-                firstChange = false;
-            },
-            up() {
-                _this.dragLastMouseUp = Date.now();
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 75440aed819..329b1195609 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -1,4 +1,4 @@
-import {BaseSelection, LexicalEditor} from "lexical";
+import {$isElementNode, BaseSelection, LexicalEditor} from "lexical";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import alignLeftIcon from "@icons/editor/align-left.svg";
 import {EditorUiContext} from "../../framework/core";
@@ -7,8 +7,7 @@ import alignRightIcon from "@icons/editor/align-right.svg";
 import alignJustifyIcon from "@icons/editor/align-justify.svg";
 import {
     $getBlockElementNodesInSelection,
-    $getDecoratorNodesInSelection,
-    $selectionContainsAlignment, getLastSelection
+    $selectionContainsAlignment, $selectSingleNode, $toggleSelection, getLastSelection
 } from "../../../utils/selection";
 import {CommonBlockAlignment} from "../../../nodes/_common";
 import {nodeHasAlignment} from "../../../utils/nodes";
@@ -17,12 +16,12 @@ import {nodeHasAlignment} from "../../../utils/nodes";
 function setAlignmentForSection(editor: LexicalEditor, alignment: CommonBlockAlignment): void {
     const selection = getLastSelection(editor);
     const selectionNodes = selection?.getNodes() || [];
-    const decorators = $getDecoratorNodesInSelection(selection);
 
-    // Handle decorator node selection alignment
-    if (selectionNodes.length === 1 && decorators.length === 1 && nodeHasAlignment(decorators[0])) {
-        decorators[0].setAlignment(alignment);
-        console.log('setting for decorator!');
+    // Handle inline node selection alignment
+    if (selectionNodes.length === 1 && $isElementNode(selectionNodes[0]) && selectionNodes[0].isInline() && nodeHasAlignment(selectionNodes[0])) {
+        selectionNodes[0].setAlignment(alignment);
+        $selectSingleNode(selectionNodes[0]);
+        $toggleSelection(editor);
         return;
     }
 
@@ -33,6 +32,7 @@ function setAlignmentForSection(editor: LexicalEditor, alignment: CommonBlockAli
             node.setAlignment(alignment)
         }
     }
+    $toggleSelection(editor);
 }
 
 export const alignLeft: EditorButtonDefinition = {
diff --git a/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
new file mode 100644
index 00000000000..cceb58b6b3b
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
@@ -0,0 +1,167 @@
+import {BaseSelection,} from "lexical";
+import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
+import {el} from "../../../utils/dom";
+import {$isImageNode, ImageNode} from "../../../nodes/image";
+import {EditorUiContext} from "../core";
+
+class ImageResizer {
+    protected context: EditorUiContext;
+    protected dom: HTMLElement|null = null;
+    protected scrollContainer: HTMLElement;
+
+    protected mouseTracker: MouseDragTracker|null = null;
+    protected activeSelection: string = '';
+
+    constructor(context: EditorUiContext) {
+        this.context = context;
+        this.scrollContainer = context.scrollDOM;
+
+        this.onSelectionChange = this.onSelectionChange.bind(this);
+        context.manager.onSelectionChange(this.onSelectionChange);
+    }
+
+    onSelectionChange(selection: BaseSelection|null) {
+        const nodes = selection?.getNodes() || [];
+        if (this.activeSelection) {
+            this.hide();
+        }
+
+        if (nodes.length === 1 && $isImageNode(nodes[0])) {
+            const imageNode = nodes[0];
+            const nodeKey = imageNode.getKey();
+            const imageDOM = this.context.editor.getElementByKey(nodeKey);
+
+            if (imageDOM) {
+                this.showForImage(imageNode, imageDOM);
+            }
+        }
+    }
+
+    teardown() {
+        this.context.manager.offSelectionChange(this.onSelectionChange);
+        this.hide();
+    }
+
+    protected showForImage(node: ImageNode, dom: HTMLElement) {
+        this.dom = this.buildDOM();
+
+        const ghost = el('img', {src: dom.getAttribute('src'), class: 'editor-image-resizer-ghost'});
+        this.dom.append(ghost);
+
+        this.context.scrollDOM.append(this.dom);
+        this.updateDOMPosition(dom);
+
+        this.mouseTracker = this.setupTracker(this.dom, node, dom);
+        this.activeSelection = node.getKey();
+    }
+
+    protected updateDOMPosition(imageDOM: HTMLElement) {
+        if (!this.dom) {
+            return;
+        }
+
+        const imageBounds = imageDOM.getBoundingClientRect();
+        this.dom.style.left = imageDOM.offsetLeft + 'px';
+        this.dom.style.top = imageDOM.offsetTop + 'px';
+        this.dom.style.width = imageBounds.width + 'px';
+        this.dom.style.height = imageBounds.height + 'px';
+    }
+
+    protected updateDOMSize(width: number, height: number): void {
+        if (!this.dom) {
+            return;
+        }
+
+        this.dom.style.width = width + 'px';
+        this.dom.style.height = height + 'px';
+    }
+
+    protected hide() {
+        this.mouseTracker?.teardown();
+        this.dom?.remove();
+        this.activeSelection = '';
+    }
+
+    protected buildDOM() {
+        const handleClasses = ['nw', 'ne', 'se', 'sw'];
+        const handleElems = handleClasses.map(c => {
+            return el('div', {class: `editor-image-resizer-handle ${c}`});
+        });
+
+        return el('div', {
+            class: 'editor-image-resizer',
+        }, handleElems);
+    }
+
+    setupTracker(container: HTMLElement, node: ImageNode, imageDOM: HTMLElement): MouseDragTracker {
+        let startingWidth: number = 0;
+        let startingHeight: number = 0;
+        let startingRatio: number = 0;
+        let hasHeight = false;
+        let _this = this;
+        let flipXChange: boolean = false;
+        let flipYChange: boolean = false;
+
+        const calculateSize = (distance: MouseDragTrackerDistance): {width: number, height: number} => {
+            let xChange = distance.x;
+            if (flipXChange) {
+                xChange = 0 - xChange;
+            }
+            let yChange = distance.y;
+            if (flipYChange) {
+                yChange = 0 - yChange;
+            }
+
+            const balancedChange = Math.sqrt(Math.pow(Math.abs(xChange), 2) + Math.pow(Math.abs(yChange), 2));
+            const increase = xChange + yChange > 0;
+            const directedChange = increase ? balancedChange : 0-balancedChange;
+            const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
+            const newHeight = newWidth * startingRatio;
+
+            return {width: newWidth, height: newHeight};
+        };
+
+        return new MouseDragTracker(container, '.editor-image-resizer-handle', {
+            down(event: MouseEvent, handle: HTMLElement) {
+                _this.dom?.classList.add('active');
+                _this.context.editor.getEditorState().read(() => {
+                    const imageRect = imageDOM.getBoundingClientRect();
+                    startingWidth = node.getWidth() || imageRect.width;
+                    startingHeight = node.getHeight() || imageRect.height;
+                    if (node.getHeight()) {
+                        hasHeight = true;
+                    }
+                    startingRatio = startingWidth / startingHeight;
+                });
+
+                flipXChange = handle.classList.contains('nw') || handle.classList.contains('sw');
+                flipYChange = handle.classList.contains('nw') || handle.classList.contains('ne');
+            },
+            move(event: MouseEvent, handle: HTMLElement, distance: MouseDragTrackerDistance) {
+                const size = calculateSize(distance);
+                _this.updateDOMSize(size.width, size.height);
+            },
+            up(event: MouseEvent, handle: HTMLElement, distance: MouseDragTrackerDistance) {
+                const size = calculateSize(distance);
+                _this.context.editor.update(() => {
+                    node.setWidth(size.width);
+                    node.setHeight(hasHeight ? size.height : 0);
+                    _this.context.manager.triggerLayoutUpdate();
+                    requestAnimationFrame(() => {
+                        _this.updateDOMPosition(imageDOM);
+                    })
+                });
+                _this.dom?.classList.remove('active');
+            }
+        });
+    }
+}
+
+
+export function registerImageResizer(context: EditorUiContext): (() => void) {
+    const resizer = new ImageResizer(context);
+
+    return () => {
+        resizer.teardown();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index f10e85b470a..8fda66cb25f 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -144,6 +144,14 @@ export class EditorUIManager {
         this.selectionChangeHandlers.delete(handler);
     }
 
+    triggerLayoutUpdate(): void {
+        window.requestAnimationFrame(() => {
+            for (const toolbar of this.activeContextToolbars) {
+                toolbar.updatePosition();
+            }
+        });
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (let i = this.activeContextToolbars.length - 1; i >= 0; i--) {
             const toolbar = this.activeContextToolbars[i];
@@ -220,13 +228,8 @@ export class EditorUIManager {
     }
 
     protected setupEventListeners(context: EditorUiContext) {
-        const updateToolbars = (event: Event) => {
-            for (const toolbar of this.activeContextToolbars) {
-                toolbar.updatePosition();
-            }
-        };
-
-        window.addEventListener('scroll', updateToolbars, {capture: true, passive: true});
-        window.addEventListener('resize', updateToolbars, {passive: true});
+        const layoutUpdate = this.triggerLayoutUpdate.bind(this);
+        window.addEventListener('scroll', layoutUpdate, {capture: true, passive: true});
+        window.addEventListener('resize', layoutUpdate, {passive: true});
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 3b6d195b76d..71a2623d6aa 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -6,7 +6,6 @@ import {
     getMainEditorFullToolbar, getTableToolbarContent
 } from "./toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
@@ -64,7 +63,6 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
     });
 
     // Register image decorator listener
-    manager.registerDecoratorType('image', ImageDecorator);
     manager.registerDecoratorType('code', CodeBlockDecorator);
     manager.registerDecoratorType('diagram', DiagramDecorator);
 
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 791eb749904..4f565fa10db 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -1,6 +1,6 @@
 import {
     $createNodeSelection,
-    $createParagraphNode,
+    $createParagraphNode, $createRangeSelection,
     $getRoot,
     $getSelection, $isDecoratorNode,
     $isElementNode,
@@ -106,6 +106,18 @@ export function $selectSingleNode(node: LexicalNode) {
     $setSelection(nodeSelection);
 }
 
+export function $toggleSelection(editor: LexicalEditor) {
+    const lastSelection = getLastSelection(editor);
+
+    if (lastSelection) {
+        window.requestAnimationFrame(() => {
+            editor.update(() => {
+                $setSelection(lastSelection.clone());
+            })
+        });
+    }
+}
+
 export function $selectionContainsNode(selection: BaseSelection | null, node: LexicalNode): boolean {
     if (!selection) {
         return false;
@@ -122,7 +134,11 @@ export function $selectionContainsNode(selection: BaseSelection | null, node: Le
 }
 
 export function $selectionContainsAlignment(selection: BaseSelection | null, alignment: CommonBlockAlignment): boolean {
-    const nodes = $getBlockElementNodesInSelection(selection);
+
+    const nodes = [
+        ...(selection?.getNodes() || []),
+        ...$getBlockElementNodesInSelection(selection)
+    ];
     for (const node of nodes) {
         if (nodeHasAlignment(node) && node.getAlignment() === alignment) {
             return true;
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 78e518bd566..80633df94d5 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -31,6 +31,7 @@ body.editor-is-fullscreen {
   }
 }
 .editor-content-wrap {
+  position: relative;
   overflow-y: scroll;
 }
 
@@ -287,23 +288,20 @@ body.editor-is-fullscreen {
   position: relative;
   display: inline-flex;
 }
-.editor-image-decorator {
+.editor-image-resizer {
   position: absolute;
   left: 0;
   right: 0;
-  width: 100%;
-  height: 100%;
   display: inline-block;
-  &.selected {
-    border: 1px dashed var(--editor-color-primary);
-  }
+  outline: 2px dashed var(--editor-color-primary);
 }
-.editor-image-decorator-handle {
+.editor-image-resizer-handle {
   position: absolute;
   display: block;
   width: 10px;
   height: 10px;
   border: 2px solid var(--editor-color-primary);
+  z-index: 3;
   background-color: #FFF;
   user-select: none;
   &.nw {
@@ -327,6 +325,20 @@ body.editor-is-fullscreen {
     cursor: sw-resize;
   }
 }
+.editor-image-resizer-ghost {
+  opacity: 0.5;
+  display: none;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 2;
+  pointer-events: none;
+}
+.editor-image-resizer.active .editor-image-resizer-ghost {
+  display: block;
+}
 
 .editor-table-marker {
   position: fixed;

From bed2c29a33f6e109ce1dd2ef76fc9fbd7a217080 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 8 Sep 2024 13:37:13 +0100
Subject: [PATCH 259/666] Lexical: Added media resize support via drag handles

---
 resources/js/wysiwyg/index.ts                 |  4 +-
 resources/js/wysiwyg/nodes/_common.ts         |  7 ++
 resources/js/wysiwyg/nodes/callout.ts         |  1 +
 resources/js/wysiwyg/nodes/media.ts           | 55 +++++++++++++-
 resources/js/wysiwyg/todo.md                  |  6 +-
 .../ui/framework/helpers/image-resizer.ts     | 71 +++++++++++--------
 resources/js/wysiwyg/utils/dom.ts             | 16 +++++
 resources/sass/_editor.scss                   | 16 +++--
 8 files changed, 133 insertions(+), 43 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index c312919dbb7..64b59492be1 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -13,7 +13,7 @@ import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler"
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
-import {registerImageResizer} from "./ui/framework/helpers/image-resizer";
+import {registerNodeResizer} from "./ui/framework/helpers/image-resizer";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -56,7 +56,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
         registerDropPasteHandling(context),
-        registerImageResizer(context),
+        registerNodeResizer(context),
     );
 
     listenToCommonEvents(editor);
diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/nodes/_common.ts
index cc45dc9107c..ff957f95300 100644
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/nodes/_common.ts
@@ -63,4 +63,11 @@ export function updateElementWithCommonBlockProps(element: HTMLElement, node: Co
     if (node.__alignment) {
         element.classList.add('align-' + node.__alignment);
     }
+}
+
+export interface NodeHasSize {
+    setHeight(height: number): void;
+    setWidth(width: number): void;
+    getHeight(): number;
+    getWidth(): number;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index 8018190c8a7..ededc0f2909 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -34,6 +34,7 @@ export class CalloutNode extends ElementNode {
     static clone(node: CalloutNode) {
         const newNode = new CalloutNode(node.__category, node.__key);
         newNode.__id = node.__id;
+        newNode.__alignment = node.__alignment;
         return newNode;
     }
 
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index 4159cd457e5..5b3c1b9c271 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -1,6 +1,6 @@
 import {
     DOMConversion,
-    DOMConversionMap, DOMConversionOutput,
+    DOMConversionMap, DOMConversionOutput, DOMExportOutput,
     ElementNode,
     LexicalEditor,
     LexicalNode,
@@ -8,7 +8,7 @@ import {
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
-import {el} from "../utils/dom";
+import {el, sizeToPixels} from "../utils/dom";
 import {
     CommonBlockAlignment,
     SerializedCommonBlockNode,
@@ -16,6 +16,7 @@ import {
     updateElementWithCommonBlockProps
 } from "./_common";
 import {elem} from "../../services/dom";
+import {$selectSingleNode} from "../utils/selection";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
@@ -89,6 +90,8 @@ export class MediaNode extends ElementNode {
         const newNode = new MediaNode(node.__tag, node.__key);
         newNode.__attributes = Object.assign({}, node.__attributes);
         newNode.__sources = node.__sources.map(s => Object.assign({}, s));
+        newNode.__id = node.__id;
+        newNode.__alignment = node.__alignment;
         return newNode;
     }
 
@@ -166,7 +169,35 @@ export class MediaNode extends ElementNode {
         return self.__alignment;
     }
 
-    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+    setHeight(height: number): void {
+        if (!height) {
+            return;
+        }
+
+        const attrs = Object.assign({}, this.getAttributes(), {height});
+        this.setAttributes(attrs);
+    }
+
+    getHeight(): number {
+        const self = this.getLatest();
+        return sizeToPixels(self.__attributes.height || '0');
+    }
+
+    setWidth(width: number): void {
+        const attrs = Object.assign({}, this.getAttributes(), {width});
+        this.setAttributes(attrs);
+    }
+
+    getWidth(): number {
+        const self = this.getLatest();
+        return sizeToPixels(self.__attributes.width || '0');
+    }
+
+    isInline(): boolean {
+        return true;
+    }
+
+    createInnerDOM() {
         const sources = (this.__tag === 'video' || this.__tag === 'audio') ? this.__sources : [];
         const sourceEls = sources.map(source => el('source', source));
         const element = el(this.__tag, this.__attributes, sourceEls);
@@ -174,6 +205,19 @@ export class MediaNode extends ElementNode {
         return element;
     }
 
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        const media = this.createInnerDOM();
+        const wrap = el('span', {
+            class: media.className + ' editor-media-wrap',
+        }, [media]);
+
+        wrap.addEventListener('click', e => {
+            _editor.update(() => $selectSingleNode(this));
+        });
+
+        return wrap;
+    }
+
     updateDOM(prevNode: unknown, dom: HTMLElement) {
         return true;
     }
@@ -202,6 +246,11 @@ export class MediaNode extends ElementNode {
         };
     }
 
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const element = this.createInnerDOM();
+        return { element };
+    }
+
     exportJSON(): SerializedMediaNode {
         return {
             ...super.exportJSON(),
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 064d65e4c49..92042295c90 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,7 +6,6 @@
 
 ## Main Todo
 
-- Media resize support (like images)
 - Mac: Shortcut support via command.
 
 ## Secondary Todo
@@ -17,9 +16,6 @@
 
 ## Bugs
 
-- Can't select iframe embeds by themselves. (click enters iframe)
 - Removing link around image via button deletes image, not just link 
 - `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
-- Template drag/drop not handled when outside core editor area (ignored in margin area).
-- Table row copy/paste does not handle merged cells
-  - TinyMCE fills gaps with the  cells that would be visually in the row
\ No newline at end of file
+- Template drag/drop not handled when outside core editor area (ignored in margin area).
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
index cceb58b6b3b..c8105eafcbb 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
@@ -1,10 +1,16 @@
-import {BaseSelection,} from "lexical";
+import {BaseSelection, LexicalNode,} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {el} from "../../../utils/dom";
-import {$isImageNode, ImageNode} from "../../../nodes/image";
+import {$isImageNode} from "../../../nodes/image";
 import {EditorUiContext} from "../core";
+import {NodeHasSize} from "../../../nodes/_common";
+import {$isMediaNode} from "../../../nodes/media";
 
-class ImageResizer {
+function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
+    return $isImageNode(node) || $isMediaNode(node);
+}
+
+class NodeResizer {
     protected context: EditorUiContext;
     protected dom: HTMLElement|null = null;
     protected scrollContainer: HTMLElement;
@@ -26,13 +32,17 @@ class ImageResizer {
             this.hide();
         }
 
-        if (nodes.length === 1 && $isImageNode(nodes[0])) {
-            const imageNode = nodes[0];
-            const nodeKey = imageNode.getKey();
-            const imageDOM = this.context.editor.getElementByKey(nodeKey);
+        if (nodes.length === 1 && isNodeWithSize(nodes[0])) {
+            const node = nodes[0];
+            const nodeKey = node.getKey();
+            let nodeDOM = this.context.editor.getElementByKey(nodeKey);
 
-            if (imageDOM) {
-                this.showForImage(imageNode, imageDOM);
+            if (nodeDOM && nodeDOM.nodeName === 'SPAN') {
+                nodeDOM = nodeDOM.firstElementChild as HTMLElement;
+            }
+
+            if (nodeDOM) {
+                this.showForNode(node, nodeDOM);
             }
         }
     }
@@ -42,10 +52,13 @@ class ImageResizer {
         this.hide();
     }
 
-    protected showForImage(node: ImageNode, dom: HTMLElement) {
+    protected showForNode(node: NodeHasSize&LexicalNode, dom: HTMLElement) {
         this.dom = this.buildDOM();
 
-        const ghost = el('img', {src: dom.getAttribute('src'), class: 'editor-image-resizer-ghost'});
+        let ghost = el('span', {class: 'editor-node-resizer-ghost'});
+        if ($isImageNode(node)) {
+            ghost = el('img', {src: dom.getAttribute('src'), class: 'editor-node-resizer-ghost'});
+        }
         this.dom.append(ghost);
 
         this.context.scrollDOM.append(this.dom);
@@ -55,16 +68,16 @@ class ImageResizer {
         this.activeSelection = node.getKey();
     }
 
-    protected updateDOMPosition(imageDOM: HTMLElement) {
+    protected updateDOMPosition(nodeDOM: HTMLElement) {
         if (!this.dom) {
             return;
         }
 
-        const imageBounds = imageDOM.getBoundingClientRect();
-        this.dom.style.left = imageDOM.offsetLeft + 'px';
-        this.dom.style.top = imageDOM.offsetTop + 'px';
-        this.dom.style.width = imageBounds.width + 'px';
-        this.dom.style.height = imageBounds.height + 'px';
+        const nodeDOMBounds = nodeDOM.getBoundingClientRect();
+        this.dom.style.left = nodeDOM.offsetLeft + 'px';
+        this.dom.style.top = nodeDOM.offsetTop + 'px';
+        this.dom.style.width = nodeDOMBounds.width + 'px';
+        this.dom.style.height = nodeDOMBounds.height + 'px';
     }
 
     protected updateDOMSize(width: number, height: number): void {
@@ -85,15 +98,15 @@ class ImageResizer {
     protected buildDOM() {
         const handleClasses = ['nw', 'ne', 'se', 'sw'];
         const handleElems = handleClasses.map(c => {
-            return el('div', {class: `editor-image-resizer-handle ${c}`});
+            return el('div', {class: `editor-node-resizer-handle ${c}`});
         });
 
         return el('div', {
-            class: 'editor-image-resizer',
+            class: 'editor-node-resizer',
         }, handleElems);
     }
 
-    setupTracker(container: HTMLElement, node: ImageNode, imageDOM: HTMLElement): MouseDragTracker {
+    setupTracker(container: HTMLElement, node: NodeHasSize, nodeDOM: HTMLElement): MouseDragTracker {
         let startingWidth: number = 0;
         let startingHeight: number = 0;
         let startingRatio: number = 0;
@@ -116,22 +129,22 @@ class ImageResizer {
             const increase = xChange + yChange > 0;
             const directedChange = increase ? balancedChange : 0-balancedChange;
             const newWidth = Math.max(5, Math.round(startingWidth + directedChange));
-            const newHeight = newWidth * startingRatio;
+            const newHeight = Math.round(newWidth * startingRatio);
 
             return {width: newWidth, height: newHeight};
         };
 
-        return new MouseDragTracker(container, '.editor-image-resizer-handle', {
+        return new MouseDragTracker(container, '.editor-node-resizer-handle', {
             down(event: MouseEvent, handle: HTMLElement) {
                 _this.dom?.classList.add('active');
                 _this.context.editor.getEditorState().read(() => {
-                    const imageRect = imageDOM.getBoundingClientRect();
-                    startingWidth = node.getWidth() || imageRect.width;
-                    startingHeight = node.getHeight() || imageRect.height;
+                    const domRect = nodeDOM.getBoundingClientRect();
+                    startingWidth = node.getWidth() || domRect.width;
+                    startingHeight = node.getHeight() || domRect.height;
                     if (node.getHeight()) {
                         hasHeight = true;
                     }
-                    startingRatio = startingWidth / startingHeight;
+                    startingRatio = startingHeight / startingWidth;
                 });
 
                 flipXChange = handle.classList.contains('nw') || handle.classList.contains('sw');
@@ -148,7 +161,7 @@ class ImageResizer {
                     node.setHeight(hasHeight ? size.height : 0);
                     _this.context.manager.triggerLayoutUpdate();
                     requestAnimationFrame(() => {
-                        _this.updateDOMPosition(imageDOM);
+                        _this.updateDOMPosition(nodeDOM);
                     })
                 });
                 _this.dom?.classList.remove('active');
@@ -158,8 +171,8 @@ class ImageResizer {
 }
 
 
-export function registerImageResizer(context: EditorUiContext): (() => void) {
-    const resizer = new ImageResizer(context);
+export function registerNodeResizer(context: EditorUiContext): (() => void) {
+    const resizer = new NodeResizer(context);
 
     return () => {
         resizer.teardown();
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
index a307bdd7531..d5c63a816e4 100644
--- a/resources/js/wysiwyg/utils/dom.ts
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -31,6 +31,22 @@ export function formatSizeValue(size: number | string, defaultSuffix: string = '
     return size;
 }
 
+export function sizeToPixels(size: string): number {
+    if (/^-?\d+$/.test(size)) {
+        return Number(size);
+    }
+
+    if (/^-?\d+\.\d+$/.test(size)) {
+        return Math.round(Number(size));
+    }
+
+    if (/^-?\d+px\s*$/.test(size)) {
+        return Number(size.trim().replace('px', ''));
+    }
+
+    return 0;
+}
+
 export type StyleMap = Map<string, string>;
 
 /**
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 80633df94d5..31ce564be37 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -288,14 +288,14 @@ body.editor-is-fullscreen {
   position: relative;
   display: inline-flex;
 }
-.editor-image-resizer {
+.editor-node-resizer {
   position: absolute;
   left: 0;
   right: 0;
   display: inline-block;
   outline: 2px dashed var(--editor-color-primary);
 }
-.editor-image-resizer-handle {
+.editor-node-resizer-handle {
   position: absolute;
   display: block;
   width: 10px;
@@ -325,7 +325,7 @@ body.editor-is-fullscreen {
     cursor: sw-resize;
   }
 }
-.editor-image-resizer-ghost {
+.editor-node-resizer-ghost {
   opacity: 0.5;
   display: none;
   position: absolute;
@@ -335,8 +335,9 @@ body.editor-is-fullscreen {
   height: 100%;
   z-index: 2;
   pointer-events: none;
+  background-color: var(--editor-color-primary);
 }
-.editor-image-resizer.active .editor-image-resizer-ghost {
+.editor-node-resizer.active .editor-node-resizer-ghost {
   display: block;
 }
 
@@ -372,6 +373,13 @@ body.editor-is-fullscreen {
   outline: 2px dashed var(--editor-color-primary);
 }
 
+.editor-media-wrap {
+  cursor: not-allowed;
+  iframe {
+    pointer-events: none;
+  }
+}
+
 /**
  * Fake task list checkboxes
  */

From 16518a4f893f2c2be3a08292951650881bf4e278 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 8 Sep 2024 15:54:59 +0100
Subject: [PATCH 260/666] Lexical: Range of bug fixes, Updated lexical version

- Updated selection change detection to be more accurate
- Added UI refresh for extra actions
- Fixed remove link deleting contents
---
 package-lock.json                             | 287 +++++++++---------
 package.json                                  |  18 +-
 resources/js/wysiwyg/index.ts                 |  16 +-
 resources/js/wysiwyg/nodes/image.ts           |   2 +-
 resources/js/wysiwyg/todo.md                  |   2 -
 .../wysiwyg/ui/defaults/buttons/controls.ts   |   2 +
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |  17 +-
 resources/js/wysiwyg/ui/framework/manager.ts  |  24 +-
 8 files changed, 195 insertions(+), 173 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3867a1d1fb0..1d252766152 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,20 +18,20 @@
         "@codemirror/state": "^6.3.3",
         "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.22.2",
-        "@lexical/history": "^0.16.0",
-        "@lexical/html": "^0.16.0",
-        "@lexical/link": "^0.16.0",
-        "@lexical/list": "^0.16.0",
-        "@lexical/rich-text": "^0.16.0",
-        "@lexical/selection": "^0.16.0",
-        "@lexical/table": "^0.16.0",
-        "@lexical/utils": "^0.16.0",
+        "@lexical/history": "^0.17.0",
+        "@lexical/html": "^0.17.0",
+        "@lexical/link": "^0.17.0",
+        "@lexical/list": "^0.17.0",
+        "@lexical/rich-text": "^0.17.0",
+        "@lexical/selection": "^0.17.0",
+        "@lexical/table": "^0.17.0",
+        "@lexical/utils": "^0.17.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
-        "lexical": "^0.16.0",
+        "lexical": "^0.17.0",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.5.1",
@@ -51,9 +51,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.16.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.3.tgz",
-      "integrity": "sha512-Vl/tIeRVVUCRDuOG48lttBasNQu8usGgXQawBXI7WJAiUDSFOfzflmEsZFZo48mAvAaa4FZ/4/yLLxFtdJaKYA==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
+      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -68,9 +68,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
-      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
+      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -79,15 +79,15 @@
       }
     },
     "node_modules/@codemirror/lang-css": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
-      "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
+      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
         "@lezer/common": "^1.0.2",
-        "@lezer/css": "^1.0.0"
+        "@lezer/css": "^1.1.7"
       }
     },
     "node_modules/@codemirror/lang-html": {
@@ -182,9 +182,9 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.0.tgz",
-      "integrity": "sha512-5m/K+1A6gYR0e+h/dEde7LoGimMjRtWXZFg4Lo70cc8HzjSdHe3fLwjWMR0VRl5KFT1SxalSap7uMgPKF28wBA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.1.tgz",
+      "integrity": "sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
@@ -226,9 +226,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.28.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.2.tgz",
-      "integrity": "sha512-A3DmyVfjgPsGIjiJqM/zvODUAPQdQl3ci0ghehYNnbt5x+o76xq+dL5+mMBuysDXnI3kapgOkoeJ0sbtL/3qPw==",
+      "version": "6.33.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
+      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -619,9 +619,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz",
-      "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -695,91 +695,91 @@
       "dev": true
     },
     "node_modules/@lexical/clipboard": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.16.0.tgz",
-      "integrity": "sha512-eYMJ6jCXpWBVC05Mu9HLMysrBbfi++xFfsm+Yo7A6kYGrqYUhpXqjJkYnw1xdZYL3bV73Oe4ByVJuq42GU+Mqw==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.17.1.tgz",
+      "integrity": "sha512-OVqnEfWX8XN5xxuMPo6BfgGKHREbz++D5V5ISOiml0Z8fV/TQkdgwqbBJcUdJHGRHWSUwdK7CWGs/VALvVvZyw==",
       "dependencies": {
-        "@lexical/html": "0.16.0",
-        "@lexical/list": "0.16.0",
-        "@lexical/selection": "0.16.0",
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/html": "0.17.1",
+        "@lexical/list": "0.17.1",
+        "@lexical/selection": "0.17.1",
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/history": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.16.0.tgz",
-      "integrity": "sha512-xwFxgDZGviyGEqHmgt6A6gPhsyU/yzlKRk9TBUVByba3khuTknlJ1a80H5jb+OYcrpiElml7iVuGYt+oC7atCA==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.17.1.tgz",
+      "integrity": "sha512-OU/ohajz4FXchUhghsWC7xeBPypFe50FCm5OePwo767G7P233IztgRKIng2pTT4zhCPW7S6Mfl53JoFHKehpWA==",
       "dependencies": {
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/html": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.16.0.tgz",
-      "integrity": "sha512-okxn3q/1qkUpCZNEFRI39XeJj4YRjb6prm3WqZgP4d39DI1W24feeTZJjYRCW+dc3NInwFaolU3pNA2MGkjRtg==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.17.1.tgz",
+      "integrity": "sha512-yGG+K2DXl7Wn2DpNuZ0Y3uCHJgfHkJN3/MmnFb4jLnH1FoJJiuy7WJb/BRRh9H+6xBJ9v70iv+kttDJ0u1xp5w==",
       "dependencies": {
-        "@lexical/selection": "0.16.0",
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/selection": "0.17.1",
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/link": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.16.0.tgz",
-      "integrity": "sha512-ppvJSh/XGqlzbeymOiwcXJcUcrqgQqTK2QXTBAZq7JThtb0WsJxYd2CSLSN+Ycu23prnwqOqILcU0+34+gAVFw==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.17.1.tgz",
+      "integrity": "sha512-qFJEKBesZAtR8kfJfIVXRFXVw6dwcpmGCW7duJbtBRjdLjralOxrlVKyFhW9PEXGhi4Mdq2Ux16YnnDncpORdQ==",
       "dependencies": {
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/list": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.16.0.tgz",
-      "integrity": "sha512-nBx/DMM7nCgnOzo1JyNnVaIrk/Xi5wIPNi8jixrEV6w9Om2K6dHutn/79Xzp2dQlNGSLHEDjky6N2RyFgmXh0g==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.17.1.tgz",
+      "integrity": "sha512-k9ZnmQuBvW+xVUtWJZwoGtiVG2cy+hxzkLGU4jTq1sqxRIoSeGcjvhFAK8JSEj4i21SgkB1FmkWXoYK5kbwtRA==",
       "dependencies": {
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/rich-text": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.16.0.tgz",
-      "integrity": "sha512-AGTD6yJZ+kj2TNah1r7/6vyufs6fZANeSvv9x5eG+WjV4uyUJYkd1qR8C5gFZHdkyr+bhAcsAXvS039VzAxRrQ==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.17.1.tgz",
+      "integrity": "sha512-T3kvj4P1OpedX9jvxN3WN8NP1Khol6mCW2ScFIRNRz2dsXgyN00thH1Q1J/uyu7aKyGS7rzcY0rb1Pz1qFufqQ==",
       "dependencies": {
-        "@lexical/clipboard": "0.16.0",
-        "@lexical/selection": "0.16.0",
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/clipboard": "0.17.1",
+        "@lexical/selection": "0.17.1",
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/selection": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.16.0.tgz",
-      "integrity": "sha512-trT9gQVJ2j6AwAe7tHJ30SRuxCpV6yR9LFtggxphHsXSvJYnoHC0CXh1TF2jHl8Gd5OsdWseexGLBE4Y0V3gwQ==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.17.1.tgz",
+      "integrity": "sha512-qBKVn+lMV2YIoyRELNr1/QssXx/4c0id9NCB/BOuYlG8du5IjviVJquEF56NEv2t0GedDv4BpUwkhXT2QbNAxA==",
       "dependencies": {
-        "lexical": "0.16.0"
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/table": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.16.0.tgz",
-      "integrity": "sha512-A66K779kxdr0yH2RwT2itsMnkzyFLFNPXyiWGLobCH8ON4QPuBouZvjbRHBe8Pe64yJ0c1bRDxSbTqUi9Wt3Gg==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.17.1.tgz",
+      "integrity": "sha512-2fUYPmxhyuMQX3MRvSsNaxbgvwGNJpHaKx1Ldc+PT2MvDZ6ALZkfsxbi0do54Q3i7dOon8/avRp4TuVaCnqvoA==",
       "dependencies": {
-        "@lexical/utils": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/utils": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lexical/utils": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.16.0.tgz",
-      "integrity": "sha512-GWmFEmd7o3GHqJBaEwzuZQbfTNI3Gg8ReGuHMHABgrkhZ8j2NggoRBlxsQLG0f7BewfTMVwbye22yBPq78775w==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.17.1.tgz",
+      "integrity": "sha512-jCQER5EsvhLNxKH3qgcpdWj/necUb82Xjp8qWQ3c0tyL07hIRm2tDRA/s9mQmvcP855HEZSmGVmR5SKtkcEAVg==",
       "dependencies": {
-        "@lexical/list": "0.16.0",
-        "@lexical/selection": "0.16.0",
-        "@lexical/table": "0.16.0",
-        "lexical": "0.16.0"
+        "@lexical/list": "0.17.1",
+        "@lexical/selection": "0.17.1",
+        "@lexical/table": "0.17.1",
+        "lexical": "0.17.1"
       }
     },
     "node_modules/@lezer/common": {
@@ -811,9 +811,9 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz",
-      "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -849,17 +849,17 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz",
-      "integrity": "sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.0.tgz",
-      "integrity": "sha512-ErbEQ15eowmJUyT095e9NJc3BI9yZ894fjSDtHftD0InkfUBGgnKSU6dvan9jqsZuNHg2+ag/1oyDRxNsENupQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
+      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
       "dependencies": {
         "@lezer/common": "^1.0.0",
         "@lezer/highlight": "^1.0.0"
@@ -920,6 +920,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
     "node_modules/@ssddanbrown/codemirror-lang-smarty": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-smarty/-/codemirror-lang-smarty-1.0.0.tgz",
@@ -948,9 +954,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
-      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1437,12 +1443,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1818,9 +1824,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
+      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -1844,26 +1850,27 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
+      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
         "array.prototype.flat": "^1.3.2",
         "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.9.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.15.0"
       },
@@ -1953,9 +1960,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -2372,18 +2379,18 @@
       "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
     "node_modules/import-fresh": {
@@ -2517,9 +2524,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
@@ -2807,9 +2814,9 @@
       }
     },
     "node_modules/lexical": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.16.0.tgz",
-      "integrity": "sha512-Skn45Qhriazq4fpAtwnAB11U//GKc4vjzx54xsV3TkDLDvWpbL4Z9TNRwRoN3g7w8AkWnqjeOSODKkrjgfRSrg=="
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.17.1.tgz",
+      "integrity": "sha512-72/MhR7jqmyqD10bmJw8gztlCm4KDDT+TPtU4elqXrEvHoO5XENi34YAEUD9gIkPfqSwyLa9mwAX1nKzIr5xEA=="
     },
     "node_modules/linkify-it": {
       "version": "5.0.0",
@@ -2948,9 +2955,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/natural-compare": {
@@ -3659,9 +3666,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.77.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
-      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "version": "1.78.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
+      "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3779,9 +3786,9 @@
       }
     },
     "node_modules/sortablejs": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
-      "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.3.tgz",
+      "integrity": "sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg=="
     },
     "node_modules/source-map-js": {
       "version": "1.2.0",
@@ -3819,9 +3826,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
       "dev": true
     },
     "node_modules/string-width": {
@@ -4116,9 +4123,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index 71debf2bd68..d39bf5a2cb2 100644
--- a/package.json
+++ b/package.json
@@ -43,20 +43,20 @@
     "@codemirror/state": "^6.3.3",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.22.2",
-    "@lexical/history": "^0.16.0",
-    "@lexical/html": "^0.16.0",
-    "@lexical/link": "^0.16.0",
-    "@lexical/list": "^0.16.0",
-    "@lexical/rich-text": "^0.16.0",
-    "@lexical/selection": "^0.16.0",
-    "@lexical/table": "^0.16.0",
-    "@lexical/utils": "^0.16.0",
+    "@lexical/history": "^0.17.0",
+    "@lexical/html": "^0.17.0",
+    "@lexical/link": "^0.17.0",
+    "@lexical/list": "^0.17.0",
+    "@lexical/rich-text": "^0.17.0",
+    "@lexical/selection": "^0.17.0",
+    "@lexical/table": "^0.17.0",
+    "@lexical/utils": "^0.17.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
-    "lexical": "^0.16.0",
+    "lexical": "^0.17.0",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.5.1",
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 64b59492be1..1e5e4b3ce3e 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,4 +1,4 @@
-import {createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';
+import {$getSelection, createEditor, CreateEditorArgs, isCurrentlyReadOnlyMode, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
@@ -69,7 +69,19 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     }
 
     let changeFromLoading = true;
-    editor.registerUpdateListener(({editorState, dirtyElements, dirtyLeaves}) => {
+    editor.registerUpdateListener(({dirtyElements, dirtyLeaves, editorState, prevEditorState}) => {
+        // Watch for selection changes to update the UI on change
+        // Used to be done via SELECTION_CHANGE_COMMAND but this would not always emit
+        // for all selection changes, so this proved more reliable.
+        const selectionChange = !(prevEditorState._selection?.is(editorState._selection) || false);
+        if (selectionChange) {
+            editor.update(() => {
+                const selection = $getSelection();
+                context.manager.triggerStateUpdate({
+                    editor, selection,
+                });
+            });
+        }
 
         // Emit change event to component system (for draft detection) on actual user content change
         if (dirtyElements.size > 0 || dirtyLeaves.size > 0) {
diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/nodes/image.ts
index c9d11d871b3..b6d362b62c9 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/nodes/image.ts
@@ -40,7 +40,7 @@ export class ImageNode extends ElementNode {
             alt: node.__alt,
             width: node.__width,
             height: node.__height,
-        });
+        }, node.__key);
         newNode.__alignment = node.__alignment;
         return newNode;
     }
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 92042295c90..15a59c7345f 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -16,6 +16,4 @@
 
 ## Bugs
 
-- Removing link around image via button deletes image, not just link 
-- `SELECTION_CHANGE_COMMAND` not fired when clicking out of a table cell. Prevents toolbar hiding on table unselect.
 - Template drag/drop not handled when outside core editor area (ignored in margin area).
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
index 2a2fecc40c4..8829d241f16 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -19,6 +19,7 @@ export const undo: EditorButtonDefinition = {
     icon: undoIcon,
     action(context: EditorUiContext) {
         context.editor.dispatchCommand(UNDO_COMMAND, undefined);
+        context.manager.triggerFutureStateRefresh();
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
@@ -38,6 +39,7 @@ export const redo: EditorButtonDefinition = {
     icon: redoIcon,
     action(context: EditorUiContext) {
         context.editor.dispatchCommand(REDO_COMMAND, undefined);
+        context.manager.triggerFutureStateRefresh();
     },
     isActive(selection: BaseSelection|null): boolean {
         return false;
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 46556d3d136..fd95f9f35d2 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -6,7 +6,7 @@ import {
     $getRoot,
     $getSelection, $insertNodes,
     BaseSelection,
-    ElementNode
+    ElementNode, isCurrentlyReadOnlyMode
 } from "lexical";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import unlinkIcon from "@icons/editor/unlink.svg";
@@ -54,16 +54,17 @@ export const unlink: EditorButtonDefinition = {
         context.editor.update(() => {
             const selection = getLastSelection(context.editor);
             const selectedLink = $getNodeFromSelection(selection, $isLinkNode) as LinkNode | null;
-            const selectionPoints = selection?.getStartEndPoints();
 
             if (selectedLink) {
-                const newNode = $createTextNode(selectedLink.getTextContent());
-                selectedLink.replace(newNode);
-                if (selectionPoints?.length === 2) {
-                    newNode.select(selectionPoints[0].offset, selectionPoints[1].offset);
-                } else {
-                    newNode.select();
+                const contents = selectedLink.getChildren().reverse();
+                for (const child of contents) {
+                    selectedLink.insertAfter(child);
                 }
+                selectedLink.remove();
+
+                contents[contents.length - 1].selectStart();
+
+                context.manager.triggerFutureStateRefresh();
             }
         });
     },
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 8fda66cb25f..73253037583 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -108,7 +108,7 @@ export class EditorUIManager {
         this.contextToolbarDefinitionsByKey[key] = definition;
     }
 
-    protected triggerStateUpdate(update: EditorUiStateUpdate): void {
+    triggerStateUpdate(update: EditorUiStateUpdate): void {
         setLastSelection(update.editor, update.selection);
         this.toolbar?.updateState(update);
         this.updateContextToolbars(update);
@@ -120,9 +120,20 @@ export class EditorUIManager {
 
     triggerStateRefresh(): void {
         const editor = this.getContext().editor;
-        this.triggerStateUpdate({
+        const update = {
             editor,
             selection: getLastSelection(editor),
+        };
+
+        this.triggerStateUpdate(update);
+        this.updateContextToolbars(update);
+    }
+
+    triggerFutureStateRefresh(): void {
+        requestAnimationFrame(() => {
+            this.getContext().editor.getEditorState().read(() => {
+                this.triggerStateRefresh();
+            });
         });
     }
 
@@ -195,15 +206,6 @@ export class EditorUIManager {
     }
 
     protected setupEditor(editor: LexicalEditor) {
-        // Update button states on editor selection change
-        editor.registerCommand(SELECTION_CHANGE_COMMAND, () => {
-            this.triggerStateUpdate({
-                editor: editor,
-                selection: $getSelection(),
-            });
-            return false;
-        }, COMMAND_PRIORITY_LOW);
-
         // Register our DOM decorate listener with the editor
         const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
             editor.getEditorState().read(() => {

From fd07aa0f05389055840a3d41c19cdfc1c81b4d0b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Sep 2024 12:28:01 +0100
Subject: [PATCH 261/666] Lexical: Further fixes

- Improved node resizer positioning to be more accurate
- Fixed drop handling not running within editor margin space
- Made media dom update smarter to reduce reloads
- Fixed media alignment, broken due to added wrapper
---
 resources/js/wysiwyg/index.ts                 |  2 +-
 resources/js/wysiwyg/nodes/media.ts           | 38 ++++++++++++++++---
 .../wysiwyg/services/drop-paste-handling.ts   |  5 +++
 resources/js/wysiwyg/todo.md                  |  2 +-
 .../{image-resizer.ts => node-resizer.ts}     | 14 ++++---
 resources/js/wysiwyg/utils/dom.ts             |  8 ++++
 resources/sass/_editor.scss                   | 11 ++++++
 7 files changed, 68 insertions(+), 12 deletions(-)
 rename resources/js/wysiwyg/ui/framework/helpers/{image-resizer.ts => node-resizer.ts} (92%)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 1e5e4b3ce3e..9015cea0c56 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -13,7 +13,7 @@ import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler"
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
 import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
-import {registerNodeResizer} from "./ui/framework/helpers/image-resizer";
+import {registerNodeResizer} from "./ui/framework/helpers/node-resizer";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index 5b3c1b9c271..fb940f8934e 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -4,18 +4,17 @@ import {
     ElementNode,
     LexicalEditor,
     LexicalNode,
-    SerializedElementNode, Spread
+    Spread
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
-import {el, sizeToPixels} from "../utils/dom";
+import {el, setOrRemoveAttribute, sizeToPixels} from "../utils/dom";
 import {
     CommonBlockAlignment,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
 } from "./_common";
-import {elem} from "../../services/dom";
 import {$selectSingleNode} from "../utils/selection";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
@@ -218,8 +217,37 @@ export class MediaNode extends ElementNode {
         return wrap;
     }
 
-    updateDOM(prevNode: unknown, dom: HTMLElement) {
-        return true;
+    updateDOM(prevNode: MediaNode, dom: HTMLElement): boolean {
+        if (prevNode.__tag !== this.__tag) {
+            return true;
+        }
+
+        if (JSON.stringify(prevNode.__sources) !== JSON.stringify(this.__sources)) {
+            return true;
+        }
+
+        if (JSON.stringify(prevNode.__attributes) !== JSON.stringify(this.__attributes)) {
+            return true;
+        }
+
+        const mediaEl = dom.firstElementChild as HTMLElement;
+
+        if (prevNode.__id !== this.__id) {
+            setOrRemoveAttribute(mediaEl, 'id', this.__id);
+        }
+
+        if (prevNode.__alignment !== this.__alignment) {
+            if (prevNode.__alignment) {
+                dom.classList.remove(`align-${prevNode.__alignment}`);
+                mediaEl.classList.remove(`align-${prevNode.__alignment}`);
+            }
+            if (this.__alignment) {
+                dom.classList.add(`align-${this.__alignment}`);
+                mediaEl.classList.add(`align-${this.__alignment}`);
+            }
+        }
+
+        return false;
     }
 
     static importDOM(): DOMConversionMap|null {
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index 85d0235d88b..07e35d4438e 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -103,6 +103,7 @@ function createDropListener(context: EditorUiContext): (event: DragEvent) => boo
         if (templateId) {
             insertTemplateToEditor(editor, templateId, event);
             event.preventDefault();
+            event.stopPropagation();
             return true;
         }
 
@@ -114,6 +115,7 @@ function createDropListener(context: EditorUiContext): (event: DragEvent) => boo
                 $insertNodesAtEvent(newNodes, event, editor);
             });
             event.preventDefault();
+            event.stopPropagation();
             return true;
         }
 
@@ -121,6 +123,7 @@ function createDropListener(context: EditorUiContext): (event: DragEvent) => boo
             const handled = handleMediaInsert(event.dataTransfer, context);
             if (handled) {
                 event.preventDefault();
+                event.stopPropagation();
                 return true;
             }
         }
@@ -150,9 +153,11 @@ export function registerDropPasteHandling(context: EditorUiContext): () => void
 
     const unregisterDrop = context.editor.registerCommand(DROP_COMMAND, dropListener, COMMAND_PRIORITY_HIGH);
     const unregisterPaste = context.editor.registerCommand(PASTE_COMMAND, pasteListener, COMMAND_PRIORITY_HIGH);
+    context.scrollDOM.addEventListener('drop', dropListener);
 
     return () => {
         unregisterDrop();
         unregisterPaste();
+        context.scrollDOM.removeEventListener('drop', dropListener);
     };
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 15a59c7345f..9c196d6d306 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -16,4 +16,4 @@
 
 ## Bugs
 
-- Template drag/drop not handled when outside core editor area (ignored in margin area).
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
similarity index 92%
rename from resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
rename to resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index c8105eafcbb..2e4f2939ca2 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/image-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -73,11 +73,15 @@ class NodeResizer {
             return;
         }
 
-        const nodeDOMBounds = nodeDOM.getBoundingClientRect();
-        this.dom.style.left = nodeDOM.offsetLeft + 'px';
-        this.dom.style.top = nodeDOM.offsetTop + 'px';
-        this.dom.style.width = nodeDOMBounds.width + 'px';
-        this.dom.style.height = nodeDOMBounds.height + 'px';
+        const scrollAreaRect = this.scrollContainer.getBoundingClientRect();
+        const nodeRect = nodeDOM.getBoundingClientRect();
+        const top = nodeRect.top - (scrollAreaRect.top - this.scrollContainer.scrollTop);
+        const left = nodeRect.left - scrollAreaRect.left;
+
+        this.dom.style.top = `${top}px`;
+        this.dom.style.left = `${left}px`;
+        this.dom.style.width = nodeRect.width + 'px';
+        this.dom.style.height = nodeRect.height + 'px';
     }
 
     protected updateDOMSize(width: number, height: number): void {
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
index d5c63a816e4..bbb07cb414d 100644
--- a/resources/js/wysiwyg/utils/dom.ts
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -70,4 +70,12 @@ export function extractStyleMapFromElement(element: HTMLElement): StyleMap {
     }
 
     return map;
+}
+
+export function setOrRemoveAttribute(element: HTMLElement, name: string, value: string|null|undefined) {
+    if (value) {
+        element.setAttribute(name, value);
+    } else {
+        element.removeAttribute(name);
+    }
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 31ce564be37..04f18702e4e 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -374,10 +374,21 @@ body.editor-is-fullscreen {
 }
 
 .editor-media-wrap {
+  display: inline-block;
   cursor: not-allowed;
   iframe {
     pointer-events: none;
   }
+  &.align-left {
+    float: left;
+  }
+  &.align-right {
+    float: right;
+  }
+  &.align-center {
+    display: block;
+    margin-inline: auto;
+  }
 }
 
 /**

From fb49371c6bc7aa0bdb4acdeeac86185ff2cd7405 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Sep 2024 14:06:41 +0100
Subject: [PATCH 262/666] Lexical: Refined editor UI

- Cleaned up dropdown lists to look integrated
- Added icons for color picker clear and menu list items
---
 resources/icons/editor/color-clear.svg        |  1 +
 resources/js/wysiwyg/todo.md                  |  1 +
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |  3 ++
 .../ui/framework/blocks/color-picker.ts       |  8 +++-
 .../ui/framework/blocks/dropdown-button.ts    |  4 +-
 .../ui/framework/blocks/menu-button.ts        | 15 +++++++
 .../wysiwyg/ui/framework/blocks/separator.ts  | 10 +++++
 resources/js/wysiwyg/ui/toolbars.ts           | 17 +++++---
 resources/sass/_editor.scss                   | 39 ++++++++++++++++++-
 9 files changed, 87 insertions(+), 11 deletions(-)
 create mode 100644 resources/icons/editor/color-clear.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/menu-button.ts
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/separator.ts

diff --git a/resources/icons/editor/color-clear.svg b/resources/icons/editor/color-clear.svg
new file mode 100644
index 00000000000..5d0850282f3
--- /dev/null
+++ b/resources/icons/editor/color-clear.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M800-436q0 36-8 69t-22 63l-62-60q6-17 9-34.5t3-37.5q0-47-17.5-89T650-600L480-768l-88 86-56-56 144-142 226 222q44 42 69 99.5T800-436Zm-8 380L668-180q-41 29-88 44.5T480-120q-133 0-226.5-92.5T160-436q0-51 16-98t48-90L56-792l56-56 736 736-56 56ZM480-200q36 0 68.5-10t61.5-28L280-566q-21 32-30.5 64t-9.5 66q0 98 70 167t170 69Zm-37-204Zm110-116Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 9c196d6d306..498d286fd45 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -11,6 +11,7 @@
 ## Secondary Todo
 
 - Color picker support in table form color fields
+- Color picker for color controls
 - Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 49e36bdacbe..fc4196f0a08 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -347,6 +347,7 @@ export const deleteColumn: EditorButtonDefinition = {
 
 export const cellProperties: EditorButtonDefinition = {
     label: 'Cell properties',
+    format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
@@ -361,6 +362,7 @@ export const cellProperties: EditorButtonDefinition = {
 
 export const mergeCells: EditorButtonDefinition = {
     label: 'Merge cells',
+    format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
             const selection = $getSelection();
@@ -377,6 +379,7 @@ export const mergeCells: EditorButtonDefinition = {
 
 export const splitCell: EditorButtonDefinition = {
     label: 'Split cell',
+    format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
             $unmergeCell();
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
index 48e313f5cca..b068fb4f0bf 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -3,6 +3,8 @@ import {$getSelection} from "lexical";
 import {$patchStyleText} from "@lexical/selection";
 import {el} from "../../../utils/dom";
 
+import removeIcon from "@icons/editor/color-clear.svg";
+
 const colorChoices = [
     '#000000',
     '#ffffff',
@@ -52,11 +54,13 @@ export class EditorColorPicker extends EditorUiElement {
             });
         });
 
-        colorOptions.push(el('div', {
+        const removeButton = el('div', {
             class: 'editor-color-select-option',
             'data-color': '',
             title: 'Clear color',
-        }, ['x']));
+        }, []);
+        removeButton.innerHTML = removeIcon;
+        colorOptions.push(removeButton);
 
         const colorRows = [];
         for (let i = 0; i < colorOptions.length; i+=5) {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index a7905a6dde2..cba141f6c77 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -2,6 +2,7 @@ import {handleDropdown} from "../helpers/dropdowns";
 import {EditorContainerUiElement, EditorUiElement} from "../core";
 import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
 import {el} from "../../../utils/dom";
+import {EditorMenuButton} from "./menu-button";
 
 export type EditorDropdownButtonOptions = {
     showOnHover?: boolean;
@@ -29,7 +30,8 @@ export class EditorDropdownButton extends EditorContainerUiElement {
         if (options.button instanceof EditorButton) {
             this.button = options.button;
         } else {
-            this.button = new EditorButton({
+            const type = options.button.format === 'long' ? EditorMenuButton : EditorButton;
+            this.button = new type({
                 ...options.button,
                 action() {
                     return false;
diff --git a/resources/js/wysiwyg/ui/framework/blocks/menu-button.ts b/resources/js/wysiwyg/ui/framework/blocks/menu-button.ts
new file mode 100644
index 00000000000..6f6c8cf1b5f
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/menu-button.ts
@@ -0,0 +1,15 @@
+import {EditorButton} from "../buttons";
+import {el} from "../../../utils/dom";
+import arrowIcon from "@icons/chevron-right.svg"
+
+export class EditorMenuButton extends EditorButton {
+    protected buildDOM(): HTMLButtonElement {
+        const dom = super.buildDOM();
+
+        const icon = el('div', {class: 'editor-menu-button-icon'});
+        icon.innerHTML = arrowIcon;
+        dom.append(icon);
+
+        return dom;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/separator.ts b/resources/js/wysiwyg/ui/framework/blocks/separator.ts
new file mode 100644
index 00000000000..c0ef353e696
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/separator.ts
@@ -0,0 +1,10 @@
+import {EditorUiElement} from "../core";
+import {el} from "../../../utils/dom";
+
+export class EditorSeparator extends EditorUiElement {
+    buildDOM(): HTMLElement {
+        return el('div', {
+            class: 'editor-separator',
+        });
+    }
+}
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 87ecae03e2b..e7d486cd530 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -65,6 +65,7 @@ import {
 } from "./defaults/buttons/objects";
 import {el} from "../utils/dom";
 import {EditorButtonWithMenu} from "./framework/blocks/button-with-menu";
+import {EditorSeparator} from "./framework/blocks/separator";
 
 export function getMainEditorFullToolbar(): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
@@ -83,7 +84,7 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
             new FormatPreviewButton(el('h5'), h5),
             new FormatPreviewButton(el('blockquote'), blockquote),
             new FormatPreviewButton(el('p'), paragraph),
-            new EditorDropdownButton({button: {label: 'Callouts'}, showOnHover: true, direction: 'vertical'}, [
+            new EditorDropdownButton({button: {label: 'Callouts', format: 'long'}, showOnHover: true, direction: 'vertical'}, [
                 new FormatPreviewButton(el('p', {class: 'callout info'}), infoCallout),
                 new FormatPreviewButton(el('p', {class: 'callout success'}), successCallout),
                 new FormatPreviewButton(el('p', {class: 'callout warning'}), warningCallout),
@@ -125,37 +126,41 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Insert types
-        new EditorOverflowContainer(8, [
+        new EditorOverflowContainer(4, [
             new EditorButton(link),
 
             new EditorDropdownButton({button: table, direction: 'vertical'}, [
-                new EditorDropdownButton({button: {...table, format: 'long'}, showOnHover: true}, [
+                new EditorDropdownButton({button: {label: 'Insert', format: 'long'}, showOnHover: true}, [
                     new EditorTableCreator(),
                 ]),
-                new EditorDropdownButton({button: {label: 'Cell'}, direction: 'vertical', showOnHover: true}, [
+                new EditorSeparator(),
+                new EditorDropdownButton({button: {label: 'Cell', format: 'long'}, direction: 'vertical', showOnHover: true}, [
                     new EditorButton(cellProperties),
                     new EditorButton(mergeCells),
                     new EditorButton(splitCell),
                 ]),
-                new EditorDropdownButton({button: {label: 'Row'}, direction: 'vertical', showOnHover: true}, [
+                new EditorDropdownButton({button: {label: 'Row', format: 'long'}, direction: 'vertical', showOnHover: true}, [
                     new EditorButton({...insertRowAbove, format: 'long'}),
                     new EditorButton({...insertRowBelow, format: 'long'}),
                     new EditorButton({...deleteRow, format: 'long'}),
                     new EditorButton(rowProperties),
+                    new EditorSeparator(),
                     new EditorButton(cutRow),
                     new EditorButton(copyRow),
                     new EditorButton(pasteRowBefore),
                     new EditorButton(pasteRowAfter),
                 ]),
-                new EditorDropdownButton({button: {label: 'Column'}, direction: 'vertical', showOnHover: true}, [
+                new EditorDropdownButton({button: {label: 'Column', format: 'long'}, direction: 'vertical', showOnHover: true}, [
                     new EditorButton({...insertColumnBefore, format: 'long'}),
                     new EditorButton({...insertColumnAfter, format: 'long'}),
                     new EditorButton({...deleteColumn, format: 'long'}),
+                    new EditorSeparator(),
                     new EditorButton(cutColumn),
                     new EditorButton(copyColumn),
                     new EditorButton(pasteColumnBefore),
                     new EditorButton(pasteColumnAfter),
                 ]),
+                new EditorSeparator(),
                 new EditorButton({...tableProperties, format: 'long'}),
                 new EditorButton(clearTableFormatting),
                 new EditorButton(resizeTableToContents),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 04f18702e4e..61a9f2de01f 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -70,12 +70,18 @@ body.editor-is-fullscreen {
 .editor-button-text {
   font-weight: 400;
   color: #000;
-  font-size: 12.2px;
+  font-size: 14px;
+  flex: 1;
+  padding-inline-end: 4px;
 }
 .editor-button-format-preview {
   padding: 4px 6px;
   display: block;
 }
+.editor-button-long .editor-button-icon {
+  width: 24px;
+  height: 24px;
+}
 .editor-button-icon svg {
   width: 24px;
   height: 24px;
@@ -83,6 +89,13 @@ body.editor-is-fullscreen {
   fill: currentColor;
   display: block;
 }
+.editor-menu-button-icon {
+  width: 24px;
+  height: 24px;
+  svg {
+    fill: #888;
+  }
+}
 .editor-button-with-menu-container {
   display: flex;
   flex-direction: row;
@@ -126,6 +139,7 @@ body.editor-is-fullscreen {
   display: flex;
   flex-direction: column;
   align-items: stretch;
+  min-width: 160px;
 }
 .editor-dropdown-menu-vertical .editor-button {
   border-bottom: 0;
@@ -138,9 +152,17 @@ body.editor-is-fullscreen {
   top: 0;
 }
 
+.editor-separator {
+  display: block;
+  height: 1px;
+  background-color: #DDD;
+  opacity: .8;
+}
+
 .editor-format-menu-toggle {
   width: 130px;
   height: 32px;
+  font-size: 13px;
   overflow: hidden;
   padding-inline: 12px;
   justify-content: start;
@@ -154,6 +176,9 @@ body.editor-is-fullscreen {
   .editor-dropdown-menu {
     min-width: 220px;
   }
+  .editor-button-icon {
+    display: none;
+  }
 }
 .editor-format-menu .editor-dropdown-menu .editor-dropdown-menu-container > .editor-button {
   padding: 8px 10px;
@@ -259,6 +284,9 @@ body.editor-is-fullscreen {
   width: 28px;
   height: 28px;
   cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .editor-color-select-option:hover {
   border-radius: 3px;
@@ -266,6 +294,11 @@ body.editor-is-fullscreen {
   z-index: 3;
   box-shadow: 0 0 4px 1px rgba(0, 0, 0, 0.25);
 }
+.editor-color-select-option[data-color=""] svg {
+  width: 20px;
+  height: 20px;
+  fill: #888;
+}
 .editor-table-creator-row {
   display: flex;
 }
@@ -422,7 +455,9 @@ body.editor-is-fullscreen {
   background-size: 100% 100%;
 }
 
-// Editor form elements
+/**
+ * Form elements
+ */
 .editor-form-field-wrapper {
   margin-bottom: .5rem;
 }

From ced66f167132ff8b556ad0df6204a6a8b09e2d77 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Sep 2024 18:33:54 +0100
Subject: [PATCH 263/666] Lexical: Added single node backspace/delete support

---
 resources/js/wysiwyg/index.ts                 |  2 +
 resources/js/wysiwyg/nodes/code-block.ts      |  2 +-
 .../js/wysiwyg/services/keyboard-handling.ts  | 40 +++++++++++++++++++
 .../js/wysiwyg/ui/decorators/code-block.ts    | 10 +++--
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 resources/js/wysiwyg/services/keyboard-handling.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9015cea0c56..c5dd151af67 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -14,6 +14,7 @@ import {registerTableSelectionHandler} from "./ui/framework/helpers/table-select
 import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
 import {registerNodeResizer} from "./ui/framework/helpers/node-resizer";
+import {registerKeyboardHandling} from "./services/keyboard-handling";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -52,6 +53,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerShortcuts(context),
+        registerKeyboardHandling(context),
         registerTableResizer(editor, editWrap),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, editArea),
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/nodes/code-block.ts
index a71e21e2e73..76c17197111 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/nodes/code-block.ts
@@ -33,7 +33,7 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     static clone(node: CodeBlockNode): CodeBlockNode {
-        const newNode = new CodeBlockNode(node.__language, node.__code);
+        const newNode = new CodeBlockNode(node.__language, node.__code, node.__key);
         newNode.__id = node.__id;
         return newNode;
     }
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
new file mode 100644
index 00000000000..7e3323f86de
--- /dev/null
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -0,0 +1,40 @@
+import {EditorUiContext} from "../ui/framework/core";
+import {
+    $isDecoratorNode,
+    COMMAND_PRIORITY_LOW,
+    KEY_BACKSPACE_COMMAND,
+    KEY_DELETE_COMMAND,
+    LexicalEditor
+} from "lexical";
+import {$isImageNode} from "../nodes/image";
+import {$isMediaNode} from "../nodes/media";
+import {getLastSelection} from "../utils/selection";
+
+function deleteSingleSelectedNode(editor: LexicalEditor) {
+    const selectionNodes = getLastSelection(editor)?.getNodes() || [];
+    if (selectionNodes.length === 1) {
+        const node = selectionNodes[0];
+        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node)) {
+            editor.update(() => {
+                node.remove();
+            });
+        }
+    }
+}
+
+export function registerKeyboardHandling(context: EditorUiContext): () => void {
+    const unregisterBackspace = context.editor.registerCommand(KEY_BACKSPACE_COMMAND, (): boolean => {
+        deleteSingleSelectedNode(context.editor);
+        return false;
+    }, COMMAND_PRIORITY_LOW);
+
+    const unregisterDelete = context.editor.registerCommand(KEY_DELETE_COMMAND, (): boolean => {
+        deleteSingleSelectedNode(context.editor);
+        return false;
+    }, COMMAND_PRIORITY_LOW);
+
+    return () => {
+          unregisterBackspace();
+          unregisterDelete();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index 650bd64c550..37d3df588c3 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {BaseSelection} from "lexical";
+import {$isDecoratorNode, BaseSelection} from "lexical";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 
@@ -34,9 +34,11 @@ export class CodeBlockDecorator extends EditorDecorator {
         const startTime = Date.now();
 
         element.addEventListener('click', event => {
-            context.editor.update(() => {
-                $selectSingleNode(this.getNode());
-            })
+            requestAnimationFrame(() => {
+                context.editor.update(() => {
+                    $selectSingleNode(this.getNode());
+                });
+            });
         });
 
         element.addEventListener('dblclick', event => {

From 476c2be5a62579d755157a27de67d217bea23593 Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:54:33 +0200
Subject: [PATCH 264/666] Add XML for OpenSearch

---
 app/App/MetaController.php                | 10 ++++++++++
 resources/views/layouts/base.blade.php    |  3 +++
 resources/views/misc/opensearch.blade.php | 11 +++++++++++
 routes/web.php                            |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 resources/views/misc/opensearch.blade.php

diff --git a/app/App/MetaController.php b/app/App/MetaController.php
index 1515b4f7eda..a94334c5851 100644
--- a/app/App/MetaController.php
+++ b/app/App/MetaController.php
@@ -64,4 +64,14 @@ public function licenses()
             'jsLibData' => file_get_contents(base_path('dev/licensing/js-library-licenses.txt')),
         ]);
     }
+
+    /**
+     * Show the view for /opensearch.xml.
+     */
+    public function opensearch()
+    {
+        return response()
+            ->view('misc.opensearch')
+            ->header('Content-Type', 'application/opensearchdescription+xml');
+    }
 }
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 4d4d07dc2ac..ddecb8e76e1 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -32,6 +32,9 @@ class="{{ setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : ''
     <link rel="manifest" href="{{ url('/manifest.json') }}">
     <meta name="mobile-web-app-capable" content="yes">
 
+    <!-- OpenSearch -->
+    <link rel="search" type="application/opensearchdescription+xml" title="{{ setting('app-name') }}" href="{{ url('/opensearch.xml') }}">
+
     @yield('head')
 
     <!-- Custom Styles & Head Content -->
diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
new file mode 100644
index 00000000000..cfcca8e4194
--- /dev/null
+++ b/resources/views/misc/opensearch.blade.php
@@ -0,0 +1,11 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>{{ setting('app-name') }}</ShortName>
+  <Description>Search {{ setting('app-name') }}</Description>
+  <Image width="256" height="256" type="image/png">{{ setting('app-icon') ?: url('/icon.png') }}</Image>
+  <Image width="180" height="180" type="image/png">{{ setting('app-icon-180') ?: url('/icon-180.png') }}</Image>
+  <Image width="128" height="128" type="image/png">{{ setting('app-icon-128') ?: url('/icon-128.png') }}</Image>
+  <Image width="64" height="64" type="image/png">{{ setting('app-icon-64') ?: url('/icon-64.png') }}</Image>
+  <Image width="32" height="32" type="image/png">{{ setting('app-icon-32') ?: url('/icon-32.png') }}</Image>
+  <Url type="text/html" rel="results" method="get" template="{{ url('/search') }}?term={searchTerms}"/>
+  <Url type="application/opensearchdescription+xml" rel="self" template="{{ url('/opensearch.xml') }}"/>
+</OpenSearchDescription>
diff --git a/routes/web.php b/routes/web.php
index 58b8f4e5431..81b938f32ec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -23,6 +23,7 @@
 Route::get('/favicon.ico', [MetaController::class, 'favicon']);
 Route::get('/manifest.json', [MetaController::class, 'pwaManifest']);
 Route::get('/licenses', [MetaController::class, 'licenses']);
+Route::get('/opensearch.xml', [MetaController::class, 'opensearch']);
 
 // Authenticated routes...
 Route::middleware('auth')->group(function () {

From 20364382034c4979dc05e207242baf2871bf6283 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 10 Sep 2024 12:14:26 +0100
Subject: [PATCH 265/666] Lexical: Added single node enter handling

Also updated media to be an inline element to align with old editor
behaviour.
---
 resources/js/wysiwyg/nodes/media.ts           |  9 +++-
 .../js/wysiwyg/services/keyboard-handling.ts  | 52 ++++++++++++++++---
 .../js/wysiwyg/ui/defaults/forms/objects.ts   |  4 +-
 resources/js/wysiwyg/utils/nodes.ts           | 23 +++++++-
 resources/js/wysiwyg/utils/selection.ts       |  9 ++--
 5 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index fb940f8934e..8658a12167b 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -196,6 +196,10 @@ export class MediaNode extends ElementNode {
         return true;
     }
 
+    isParentRequired(): boolean {
+        return true;
+    }
+
     createInnerDOM() {
         const sources = (this.__tag === 'video' || this.__tag === 'audio') ? this.__sources : [];
         const sourceEls = sources.map(source => el('source', source));
@@ -325,12 +329,13 @@ export function $createMediaNodeFromHtml(html: string): MediaNode | null {
 
 const videoExtensions = ['mp4', 'mpeg', 'm4v', 'm4p', 'mov'];
 const audioExtensions = ['3gp', 'aac', 'flac', 'mp3', 'm4a', 'ogg', 'wav', 'webm'];
-const iframeExtensions = ['html', 'htm', 'php', 'asp', 'aspx'];
+const iframeExtensions = ['html', 'htm', 'php', 'asp', 'aspx', ''];
 
 export function $createMediaNodeFromSrc(src: string): MediaNode {
     let nodeTag: MediaNodeTag = 'iframe';
     const srcEnd = src.split('?')[0].split('/').pop() || '';
-    const extension = (srcEnd.split('.').pop() || '').toLowerCase();
+    const srcEndSplit = srcEnd.split('.');
+    const extension = (srcEndSplit.length > 1 ? srcEndSplit[srcEndSplit.length - 1] : '').toLowerCase();
     if (videoExtensions.includes(extension)) {
         nodeTag = 'video';
     } else if (audioExtensions.includes(extension)) {
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 7e3323f86de..65a8e42547d 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -4,22 +4,55 @@ import {
     COMMAND_PRIORITY_LOW,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
-    LexicalEditor
+    KEY_ENTER_COMMAND,
+    LexicalEditor,
+    LexicalNode
 } from "lexical";
 import {$isImageNode} from "../nodes/image";
 import {$isMediaNode} from "../nodes/media";
 import {getLastSelection} from "../utils/selection";
+import {$getNearestNodeBlockParent} from "../utils/nodes";
+import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+
+function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
+    if (nodes.length === 1) {
+        const node = nodes[0];
+        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node)) {
+            return true;
+        }
+    }
+
+    return false;
+}
 
 function deleteSingleSelectedNode(editor: LexicalEditor) {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (selectionNodes.length === 1) {
+    if (isSingleSelectedNode(selectionNodes)) {
+        editor.update(() => {
+            selectionNodes[0].remove();
+        });
+    }
+}
+
+function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
+    const selectionNodes = getLastSelection(editor)?.getNodes() || [];
+    if (isSingleSelectedNode(selectionNodes)) {
         const node = selectionNodes[0];
-        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node)) {
-            editor.update(() => {
-                node.remove();
+        const nearestBlock = $getNearestNodeBlockParent(node) || node;
+        if (nearestBlock) {
+            requestAnimationFrame(() => {
+                editor.update(() => {
+                    const newParagraph = $createCustomParagraphNode();
+                    nearestBlock.insertAfter(newParagraph);
+                    newParagraph.select();
+                });
             });
+            event?.preventDefault();
+            return true;
         }
     }
+
+    return false;
 }
 
 export function registerKeyboardHandling(context: EditorUiContext): () => void {
@@ -33,8 +66,13 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
         return false;
     }, COMMAND_PRIORITY_LOW);
 
+    const unregisterEnter = context.editor.registerCommand(KEY_ENTER_COMMAND, (event): boolean => {
+        return insertAfterSingleSelectedNode(context.editor, event);
+    }, COMMAND_PRIORITY_LOW);
+
     return () => {
-          unregisterBackspace();
-          unregisterDelete();
+        unregisterBackspace();
+        unregisterDelete();
+        unregisterEnter();
     };
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 714d5f64b91..f1575953b51 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -197,7 +197,7 @@ export const media: EditorFormDefinition = {
                 if (selectedNode && node) {
                     selectedNode.replace(node)
                 } else if (node) {
-                    $insertNodeToNearestRoot(node);
+                    $insertNodes([node]);
                 }
             });
 
@@ -213,7 +213,7 @@ export const media: EditorFormDefinition = {
             updateNode.setSrc(src);
             updateNode.setWidthAndHeight(width, height);
             if (!selectedNode) {
-                $insertNodeToNearestRoot(updateNode);
+                $insertNodes([updateNode]);
             }
         });
 
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index e33cfda7ce6..b8bb8de9a2d 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -1,9 +1,18 @@
-import {$getRoot, $isElementNode, $isTextNode, ElementNode, LexicalEditor, LexicalNode} from "lexical";
+import {
+    $getRoot,
+    $isDecoratorNode,
+    $isElementNode,
+    $isTextNode,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode
+} from "lexical";
 import {LexicalNodeMatcher} from "../nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
 import {NodeHasAlignment} from "../nodes/_common";
+import {$findMatchingParent} from "@lexical/utils";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -73,6 +82,18 @@ export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number,
     return null;
 }
 
+export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null {
+    const isBlockNode = (node: LexicalNode): boolean => {
+        return ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline();
+    };
+
+    if (isBlockNode(node)) {
+        return node;
+    }
+
+    return $findMatchingParent(node, isBlockNode);
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 4f565fa10db..4aa21045f30 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -16,7 +16,7 @@ import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexi
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
-import {$getParentOfType, nodeHasAlignment} from "./nodes";
+import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {CommonBlockAlignment} from "../nodes/_common";
 
@@ -155,11 +155,8 @@ export function $getBlockElementNodesInSelection(selection: BaseSelection | null
 
     const blockNodes: Map<string, ElementNode> = new Map();
     for (const node of selection.getNodes()) {
-        const blockElement = $findMatchingParent(node, (node) => {
-            return $isElementNode(node) && !node.isInline();
-        }) as ElementNode | null;
-
-        if (blockElement) {
+        const blockElement = $getNearestNodeBlockParent(node);
+        if ($isElementNode(blockElement)) {
             blockNodes.set(blockElement.getKey(), blockElement);
         }
     }

From 5083188ed82b9aa2e5df976f592d1baa67865c39 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 10 Sep 2024 15:55:46 +0100
Subject: [PATCH 266/666] Lexical: Added block indenting capability

Needed a custom implementation due to hardcoded defaults for Lexical
default indenting.
---
 resources/js/wysiwyg/nodes/_common.ts         | 29 +++++++++-
 resources/js/wysiwyg/nodes/callout.ts         | 18 +++++-
 resources/js/wysiwyg/nodes/custom-heading.ts  | 18 +++++-
 .../js/wysiwyg/nodes/custom-paragraph.ts      | 18 +++++-
 resources/js/wysiwyg/nodes/custom-quote.ts    | 18 +++++-
 resources/js/wysiwyg/nodes/custom-table.ts    | 18 +++++-
 resources/js/wysiwyg/nodes/media.ts           | 22 ++++++-
 resources/js/wysiwyg/todo.md                  |  1 +
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   | 58 ++++++++++++++++++-
 resources/js/wysiwyg/ui/toolbars.ts           | 12 +++-
 resources/js/wysiwyg/utils/nodes.ts           |  6 +-
 11 files changed, 193 insertions(+), 25 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/nodes/_common.ts
index ff957f95300..8a0475c7bda 100644
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/nodes/_common.ts
@@ -1,5 +1,6 @@
 import {LexicalNode, Spread} from "lexical";
 import type {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
+import {sizeToPixels} from "../utils/dom";
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
@@ -7,6 +8,7 @@ const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'jus
 export type SerializedCommonBlockNode = Spread<{
     id: string;
     alignment: CommonBlockAlignment;
+    inset: number;
 }, SerializedElementNode>
 
 export interface NodeHasAlignment {
@@ -21,7 +23,13 @@ export interface NodeHasId {
     getId(): string;
 }
 
-interface CommonBlockInterface extends NodeHasId, NodeHasAlignment {}
+export interface NodeHasInset {
+    readonly __inset: number;
+    setInset(inset: number): void;
+    getInset(): number;
+}
+
+interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset {}
 
 export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
     const textAlignStyle: string = element.style.textAlign || '';
@@ -42,17 +50,24 @@ export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAl
     return '';
 }
 
+export function extractInsetFromElement(element: HTMLElement): number {
+    const elemPadding: string = element.style.paddingLeft || '0';
+    return sizeToPixels(elemPadding);
+}
+
 export function setCommonBlockPropsFromElement(element: HTMLElement, node: CommonBlockInterface): void {
     if (element.id) {
         node.setId(element.id);
     }
 
     node.setAlignment(extractAlignmentFromElement(element));
+    node.setInset(extractInsetFromElement(element));
 }
 
 export function commonPropertiesDifferent(nodeA: CommonBlockInterface, nodeB: CommonBlockInterface): boolean {
     return nodeA.__id !== nodeB.__id ||
-        nodeA.__alignment !== nodeB.__alignment;
+        nodeA.__alignment !== nodeB.__alignment ||
+        nodeA.__inset !== nodeB.__inset;
 }
 
 export function updateElementWithCommonBlockProps(element: HTMLElement, node: CommonBlockInterface): void {
@@ -63,6 +78,16 @@ export function updateElementWithCommonBlockProps(element: HTMLElement, node: Co
     if (node.__alignment) {
         element.classList.add('align-' + node.__alignment);
     }
+
+    if (node.__inset) {
+        element.style.paddingLeft = `${node.__inset}px`;
+    }
+}
+
+export function deserializeCommonBlockNode(serializedNode: SerializedCommonBlockNode, node: CommonBlockInterface): void {
+    node.setId(serializedNode.id);
+    node.setAlignment(serializedNode.alignment);
+    node.setInset(serializedNode.inset);
 }
 
 export interface NodeHasSize {
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/nodes/callout.ts
index ededc0f2909..cfe32ec854c 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/nodes/callout.ts
@@ -10,7 +10,7 @@ import {
 import type {EditorConfig} from "lexical/LexicalEditor";
 import type {RangeSelection} from "lexical/LexicalSelection";
 import {
-    CommonBlockAlignment, commonPropertiesDifferent,
+    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -26,6 +26,7 @@ export class CalloutNode extends ElementNode {
     __id: string = '';
     __category: CalloutCategory = 'info';
     __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
 
     static getType() {
         return 'callout';
@@ -35,6 +36,7 @@ export class CalloutNode extends ElementNode {
         const newNode = new CalloutNode(node.__category, node.__key);
         newNode.__id = node.__id;
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -73,6 +75,16 @@ export class CalloutNode extends ElementNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const element = document.createElement('p');
         element.classList.add('callout', this.__category || '');
@@ -141,13 +153,13 @@ export class CalloutNode extends ElementNode {
             category: this.__category,
             id: this.__id,
             alignment: this.__alignment,
+            inset: this.__inset,
         };
     }
 
     static importJSON(serializedNode: SerializedCalloutNode): CalloutNode {
         const node = $createCalloutNode(serializedNode.category);
-        node.setId(serializedNode.id);
-        node.setAlignment(serializedNode.alignment);
+        deserializeCommonBlockNode(serializedNode, node);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/custom-heading.ts b/resources/js/wysiwyg/nodes/custom-heading.ts
index 885622ad338..5df6245f5a5 100644
--- a/resources/js/wysiwyg/nodes/custom-heading.ts
+++ b/resources/js/wysiwyg/nodes/custom-heading.ts
@@ -7,7 +7,7 @@ import {
 import {EditorConfig} from "lexical/LexicalEditor";
 import {HeadingNode, HeadingTagType, SerializedHeadingNode} from "@lexical/rich-text";
 import {
-    CommonBlockAlignment, commonPropertiesDifferent,
+    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -19,6 +19,7 @@ export type SerializedCustomHeadingNode = Spread<SerializedCommonBlockNode, Seri
 export class CustomHeadingNode extends HeadingNode {
     __id: string = '';
     __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
 
     static getType() {
         return 'custom-heading';
@@ -44,9 +45,20 @@ export class CustomHeadingNode extends HeadingNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     static clone(node: CustomHeadingNode) {
         const newNode = new CustomHeadingNode(node.__tag, node.__key);
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -68,13 +80,13 @@ export class CustomHeadingNode extends HeadingNode {
             version: 1,
             id: this.__id,
             alignment: this.__alignment,
+            inset: this.__inset,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomHeadingNode): CustomHeadingNode {
         const node = $createCustomHeadingNode(serializedNode.tag);
-        node.setId(serializedNode.id);
-        node.setAlignment(serializedNode.alignment);
+        deserializeCommonBlockNode(serializedNode, node);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
index 663f32dfc68..3adc10d0e9c 100644
--- a/resources/js/wysiwyg/nodes/custom-paragraph.ts
+++ b/resources/js/wysiwyg/nodes/custom-paragraph.ts
@@ -7,7 +7,7 @@ import {
 } from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
 import {
-    CommonBlockAlignment, commonPropertiesDifferent,
+    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -18,6 +18,7 @@ export type SerializedCustomParagraphNode = Spread<SerializedCommonBlockNode, Se
 export class CustomParagraphNode extends ParagraphNode {
     __id: string = '';
     __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
 
     static getType() {
         return 'custom-paragraph';
@@ -43,10 +44,21 @@ export class CustomParagraphNode extends ParagraphNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     static clone(node: CustomParagraphNode): CustomParagraphNode {
         const newNode = new CustomParagraphNode(node.__key);
         newNode.__id = node.__id;
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -68,13 +80,13 @@ export class CustomParagraphNode extends ParagraphNode {
             version: 1,
             id: this.__id,
             alignment: this.__alignment,
+            inset: this.__inset,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomParagraphNode): CustomParagraphNode {
         const node = $createCustomParagraphNode();
-        node.setId(serializedNode.id);
-        node.setAlignment(serializedNode.alignment);
+        deserializeCommonBlockNode(serializedNode, node);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/custom-quote.ts b/resources/js/wysiwyg/nodes/custom-quote.ts
index cee289dbe72..39ae7bf8af3 100644
--- a/resources/js/wysiwyg/nodes/custom-quote.ts
+++ b/resources/js/wysiwyg/nodes/custom-quote.ts
@@ -7,7 +7,7 @@ import {
 import {EditorConfig} from "lexical/LexicalEditor";
 import {QuoteNode, SerializedQuoteNode} from "@lexical/rich-text";
 import {
-    CommonBlockAlignment, commonPropertiesDifferent,
+    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -19,6 +19,7 @@ export type SerializedCustomQuoteNode = Spread<SerializedCommonBlockNode, Serial
 export class CustomQuoteNode extends QuoteNode {
     __id: string = '';
     __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
 
     static getType() {
         return 'custom-quote';
@@ -44,10 +45,21 @@ export class CustomQuoteNode extends QuoteNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     static clone(node: CustomQuoteNode) {
         const newNode = new CustomQuoteNode(node.__key);
         newNode.__id = node.__id;
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -68,13 +80,13 @@ export class CustomQuoteNode extends QuoteNode {
             version: 1,
             id: this.__id,
             alignment: this.__alignment,
+            inset: this.__inset,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomQuoteNode): CustomQuoteNode {
         const node = $createCustomQuoteNode();
-        node.setId(serializedNode.id);
-        node.setAlignment(serializedNode.alignment);
+        deserializeCommonBlockNode(serializedNode, node);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
index b699763d976..c25c06c6515 100644
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ b/resources/js/wysiwyg/nodes/custom-table.ts
@@ -5,7 +5,7 @@ import {EditorConfig} from "lexical/LexicalEditor";
 import {el, extractStyleMapFromElement, StyleMap} from "../utils/dom";
 import {getTableColumnWidths} from "../utils/tables";
 import {
-    CommonBlockAlignment,
+    CommonBlockAlignment, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -21,6 +21,7 @@ export class CustomTableNode extends TableNode {
     __colWidths: string[] = [];
     __styles: StyleMap = new Map;
     __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
 
     static getType() {
         return 'custom-table';
@@ -46,6 +47,16 @@ export class CustomTableNode extends TableNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     setColWidths(widths: string[]) {
         const self = this.getWritable();
         self.__colWidths = widths;
@@ -72,6 +83,7 @@ export class CustomTableNode extends TableNode {
         newNode.__colWidths = node.__colWidths;
         newNode.__styles = new Map(node.__styles);
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -112,15 +124,15 @@ export class CustomTableNode extends TableNode {
             colWidths: this.__colWidths,
             styles: Object.fromEntries(this.__styles),
             alignment: this.__alignment,
+            inset: this.__inset,
         };
     }
 
     static importJSON(serializedNode: SerializedCustomTableNode): CustomTableNode {
         const node = $createCustomTableNode();
-        node.setId(serializedNode.id);
+        deserializeCommonBlockNode(serializedNode, node);
         node.setColWidths(serializedNode.colWidths);
         node.setStyles(new Map(Object.entries(serializedNode.styles)));
-        node.setAlignment(serializedNode.alignment);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/nodes/media.ts
index 8658a12167b..64fe8f77b4d 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/nodes/media.ts
@@ -10,7 +10,7 @@ import type {EditorConfig} from "lexical/LexicalEditor";
 
 import {el, setOrRemoveAttribute, sizeToPixels} from "../utils/dom";
 import {
-    CommonBlockAlignment,
+    CommonBlockAlignment, deserializeCommonBlockNode,
     SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
@@ -80,6 +80,7 @@ export class MediaNode extends ElementNode {
     __tag: MediaNodeTag;
     __attributes: Record<string, string> = {};
     __sources: MediaNodeSource[] = [];
+    __inset: number = 0;
 
     static getType() {
         return 'media';
@@ -91,6 +92,7 @@ export class MediaNode extends ElementNode {
         newNode.__sources = node.__sources.map(s => Object.assign({}, s));
         newNode.__id = node.__id;
         newNode.__alignment = node.__alignment;
+        newNode.__inset = node.__inset;
         return newNode;
     }
 
@@ -168,6 +170,16 @@ export class MediaNode extends ElementNode {
         return self.__alignment;
     }
 
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
     setHeight(height: number): void {
         if (!height) {
             return;
@@ -251,6 +263,10 @@ export class MediaNode extends ElementNode {
             }
         }
 
+        if (prevNode.__inset !== this.__inset) {
+            dom.style.paddingLeft = `${this.__inset}px`;
+        }
+
         return false;
     }
 
@@ -290,6 +306,7 @@ export class MediaNode extends ElementNode {
             version: 1,
             id: this.__id,
             alignment: this.__alignment,
+            inset: this.__inset,
             tag: this.__tag,
             attributes: this.__attributes,
             sources: this.__sources,
@@ -298,8 +315,7 @@ export class MediaNode extends ElementNode {
 
     static importJSON(serializedNode: SerializedMediaNode): MediaNode {
         const node = $createMediaNode(serializedNode.tag);
-        node.setId(serializedNode.id);
-        node.setAlignment(serializedNode.alignment);
+        deserializeCommonBlockNode(serializedNode, node);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 498d286fd45..34367a36b9c 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,6 +6,7 @@
 
 ## Main Todo
 
+- Align list nesting with old editor
 - Mac: Shortcut support via command.
 
 ## Secondary Todo
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
index edec3ea0076..0857fb70a49 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -1,12 +1,24 @@
 import {$isListNode, ListNode, ListType} from "@lexical/list";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
-import {BaseSelection, LexicalNode} from "lexical";
+import {
+    BaseSelection,
+    LexicalEditor,
+    LexicalNode,
+} from "lexical";
 import listBulletIcon from "@icons/editor/list-bullet.svg";
 import listNumberedIcon from "@icons/editor/list-numbered.svg";
 import listCheckIcon from "@icons/editor/list-check.svg";
-import {$selectionContainsNodeType} from "../../../utils/selection";
+import indentIncreaseIcon from "@icons/editor/indent-increase.svg";
+import indentDecreaseIcon from "@icons/editor/indent-decrease.svg";
+import {
+    $getBlockElementNodesInSelection,
+    $selectionContainsNodeType,
+    $toggleSelection,
+    getLastSelection
+} from "../../../utils/selection";
 import {toggleSelectionAsList} from "../../../utils/formats";
+import {nodeHasInset} from "../../../utils/nodes";
 
 
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
@@ -27,3 +39,45 @@ function buildListButton(label: string, type: ListType, icon: string): EditorBut
 export const bulletList: EditorButtonDefinition = buildListButton('Bullet list', 'bullet', listBulletIcon);
 export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number', listNumberedIcon);
 export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check', listCheckIcon);
+
+
+function setInsetForSelection(editor: LexicalEditor, change: number): void {
+    const selection = getLastSelection(editor);
+
+    const elements = $getBlockElementNodesInSelection(selection);
+    for (const node of elements) {
+        if (nodeHasInset(node)) {
+            const currentInset = node.getInset();
+            const newInset = Math.min(Math.max(currentInset + change, 0), 500);
+            node.setInset(newInset)
+        }
+    }
+
+    $toggleSelection(editor);
+}
+
+export const indentIncrease: EditorButtonDefinition = {
+    label: 'Increase indent',
+    icon: indentIncreaseIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            setInsetForSelection(context.editor, 40);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
+
+export const indentDecrease: EditorButtonDefinition = {
+    label: 'Decrease indent',
+    icon: indentDecreaseIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            setInsetForSelection(context.editor, -40);
+        });
+    },
+    isActive() {
+        return false;
+    }
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index e7d486cd530..0ad638410ad 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -52,7 +52,13 @@ import {
     underline
 } from "./defaults/buttons/inline-formats";
 import {alignCenter, alignJustify, alignLeft, alignRight} from "./defaults/buttons/alignments";
-import {bulletList, numberList, taskList} from "./defaults/buttons/lists";
+import {
+    bulletList,
+    indentDecrease,
+    indentIncrease,
+    numberList,
+    taskList
+} from "./defaults/buttons/lists";
 import {
     codeBlock,
     details,
@@ -119,10 +125,12 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Lists
-        new EditorOverflowContainer(3, [
+        new EditorOverflowContainer(5, [
             new EditorButton(bulletList),
             new EditorButton(numberList),
             new EditorButton(taskList),
+            new EditorButton(indentDecrease),
+            new EditorButton(indentIncrease),
         ]),
 
         // Insert types
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index b8bb8de9a2d..48fbe043f39 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -11,7 +11,7 @@ import {LexicalNodeMatcher} from "../nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
-import {NodeHasAlignment} from "../nodes/_common";
+import {NodeHasAlignment, NodeHasInset} from "../nodes/_common";
 import {$findMatchingParent} from "@lexical/utils";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
@@ -96,4 +96,8 @@ export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null
 
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
+}
+
+export function nodeHasInset(node: object): node is NodeHasInset {
+    return '__inset' in node;
 }
\ No newline at end of file

From 662110c269218807379546cc19c2292f5e3765de Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Sep 2024 15:50:42 +0100
Subject: [PATCH 267/666] Lexical: Custom list nesting support

Added list nesting support to allow li > ul style nesting which lexical
didn't do by default.
Adds tab handling for inset/outset controls.
Will be a range of edge-case bugs to squash during testing.
---
 .../js/wysiwyg/nodes/custom-list-item.ts      |  25 ++++
 resources/js/wysiwyg/nodes/custom-list.ts     |  38 +++++-
 .../js/wysiwyg/services/keyboard-handling.ts  |  21 ++-
 resources/js/wysiwyg/todo.md                  |   5 +-
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   |  24 +---
 resources/js/wysiwyg/utils/lists.ts           | 123 ++++++++++++++++++
 resources/js/wysiwyg/utils/selection.ts       |  53 +++++++-
 7 files changed, 263 insertions(+), 26 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/lists.ts

diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
index 2b4d7414632..659a55a157a 100644
--- a/resources/js/wysiwyg/nodes/custom-list-item.ts
+++ b/resources/js/wysiwyg/nodes/custom-list-item.ts
@@ -3,6 +3,7 @@ import {EditorConfig} from "lexical/LexicalEditor";
 import {DOMExportOutput, LexicalEditor, LexicalNode} from "lexical";
 
 import {el} from "../utils/dom";
+import {$isCustomListNode} from "./custom-list";
 
 function updateListItemChecked(
     dom: HTMLElement,
@@ -38,6 +39,10 @@ export class CustomListItemNode extends ListItemNode {
 
         element.value = this.__value;
 
+        if ($hasNestedListWithoutLabel(this)) {
+            element.style.listStyle = 'none';
+        }
+
         return element;
     }
 
@@ -86,8 +91,28 @@ export class CustomListItemNode extends ListItemNode {
     }
 }
 
+function $hasNestedListWithoutLabel(node: CustomListItemNode): boolean {
+    const children = node.getChildren();
+    let hasLabel = false;
+    let hasNestedList = false;
+
+    for (const child of children) {
+        if ($isCustomListNode(child)) {
+            hasNestedList = true;
+        } else if (child.getTextContent().trim().length > 0) {
+            hasLabel = true;
+        }
+    }
+
+    return hasNestedList && !hasLabel;
+}
+
 export function $isCustomListItemNode(
     node: LexicalNode | null | undefined,
 ): node is CustomListItemNode {
     return node instanceof CustomListItemNode;
+}
+
+export function $createCustomListItemNode(): CustomListItemNode {
+    return new CustomListItemNode();
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-list.ts b/resources/js/wysiwyg/nodes/custom-list.ts
index 953bcb8cd15..a6c47399905 100644
--- a/resources/js/wysiwyg/nodes/custom-list.ts
+++ b/resources/js/wysiwyg/nodes/custom-list.ts
@@ -5,7 +5,8 @@ import {
     Spread
 } from "lexical";
 import {EditorConfig} from "lexical/LexicalEditor";
-import {ListNode, ListType, SerializedListNode} from "@lexical/list";
+import {$isListItemNode, ListItemNode, ListNode, ListType, SerializedListNode} from "@lexical/list";
+import {$createCustomListItemNode} from "./custom-list-item";
 
 
 export type SerializedCustomListNode = Spread<{
@@ -30,7 +31,7 @@ export class CustomListNode extends ListNode {
     }
 
     static clone(node: CustomListNode) {
-        const newNode = new CustomListNode(node.__listType, 0, node.__key);
+        const newNode = new CustomListNode(node.__listType, node.__start, node.__key);
         newNode.__id = node.__id;
         return newNode;
     }
@@ -67,6 +68,11 @@ export class CustomListNode extends ListNode {
             if (element.id && baseResult?.node) {
                 (baseResult.node as CustomListNode).setId(element.id);
             }
+
+            if (baseResult) {
+                baseResult.after = $normalizeChildren;
+            }
+
             return baseResult;
         };
 
@@ -83,8 +89,34 @@ export class CustomListNode extends ListNode {
     }
 }
 
+/*
+ * This function is a custom normalization function to allow nested lists within list item elements.
+ * Original taken from https://github.com/facebook/lexical/blob/6e10210fd1e113ccfafdc999b1d896733c5c5bea/packages/lexical-list/src/LexicalListNode.ts#L284-L303
+ * With modifications made.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * MIT license
+ */
+function $normalizeChildren(nodes: Array<LexicalNode>): Array<ListItemNode> {
+    const normalizedListItems: Array<ListItemNode> = [];
+
+    for (const node of nodes) {
+        if ($isListItemNode(node)) {
+            normalizedListItems.push(node);
+        } else {
+            normalizedListItems.push($wrapInListItem(node));
+        }
+    }
+
+    return normalizedListItems;
+}
+
+function $wrapInListItem(node: LexicalNode): ListItemNode {
+    const listItemWrapper = $createCustomListItemNode();
+    return listItemWrapper.append(node);
+}
+
 export function $createCustomListNode(type: ListType): CustomListNode {
-    return new CustomListNode(type, 0);
+    return new CustomListNode(type, 1);
 }
 
 export function $isCustomListNode(node: LexicalNode | null | undefined): node is CustomListNode {
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 65a8e42547d..791fb0bed3f 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -1,10 +1,11 @@
 import {EditorUiContext} from "../ui/framework/core";
 import {
+    $getSelection,
     $isDecoratorNode,
     COMMAND_PRIORITY_LOW,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
-    KEY_ENTER_COMMAND,
+    KEY_ENTER_COMMAND, KEY_TAB_COMMAND,
     LexicalEditor,
     LexicalNode
 } from "lexical";
@@ -13,6 +14,8 @@ import {$isMediaNode} from "../nodes/media";
 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
 import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
+import {$isCustomListItemNode} from "../nodes/custom-list-item";
+import {$setInsetForSelection} from "../utils/lists";
 
 function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     if (nodes.length === 1) {
@@ -55,6 +58,17 @@ function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEve
     return false;
 }
 
+function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null) {
+    const change = event?.shiftKey ? -40 : 40;
+    editor.update(() => {
+        const selection = $getSelection();
+        const nodes = selection?.getNodes() || [];
+        if (nodes.length > 1 || (nodes.length === 1 && $isCustomListItemNode(nodes[0].getParent()))) {
+            $setInsetForSelection(editor, change);
+        }
+    });
+}
+
 export function registerKeyboardHandling(context: EditorUiContext): () => void {
     const unregisterBackspace = context.editor.registerCommand(KEY_BACKSPACE_COMMAND, (): boolean => {
         deleteSingleSelectedNode(context.editor);
@@ -70,9 +84,14 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
         return insertAfterSingleSelectedNode(context.editor, event);
     }, COMMAND_PRIORITY_LOW);
 
+    const unregisterTab = context.editor.registerCommand(KEY_TAB_COMMAND, (event): boolean => {
+        return handleInsetOnTab(context.editor, event);
+    }, COMMAND_PRIORITY_LOW);
+
     return () => {
         unregisterBackspace();
         unregisterDelete();
         unregisterEnter();
+        unregisterTab();
     };
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 34367a36b9c..2662350afe1 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,8 +6,8 @@
 
 ## Main Todo
 
-- Align list nesting with old editor
 - Mac: Shortcut support via command.
+- RTL/LTR support
 
 ## Secondary Todo
 
@@ -18,4 +18,5 @@
 
 ## Bugs
 
-//
\ No newline at end of file
+- Focus/click area reduced to content area, single line on initial access
+- List selection can get lost on nesting/unnesting
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
index 0857fb70a49..87630eb27fd 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -13,12 +13,14 @@ import indentIncreaseIcon from "@icons/editor/indent-increase.svg";
 import indentDecreaseIcon from "@icons/editor/indent-decrease.svg";
 import {
     $getBlockElementNodesInSelection,
-    $selectionContainsNodeType,
+    $selectionContainsNodeType, $selectNodes, $selectSingleNode,
     $toggleSelection,
     getLastSelection
 } from "../../../utils/selection";
 import {toggleSelectionAsList} from "../../../utils/formats";
 import {nodeHasInset} from "../../../utils/nodes";
+import {$isCustomListItemNode, CustomListItemNode} from "../../../nodes/custom-list-item";
+import {$nestListItem, $setInsetForSelection, $unnestListItem} from "../../../utils/lists";
 
 
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
@@ -40,28 +42,12 @@ export const bulletList: EditorButtonDefinition = buildListButton('Bullet list',
 export const numberList: EditorButtonDefinition = buildListButton('Numbered list', 'number', listNumberedIcon);
 export const taskList: EditorButtonDefinition = buildListButton('Task list', 'check', listCheckIcon);
 
-
-function setInsetForSelection(editor: LexicalEditor, change: number): void {
-    const selection = getLastSelection(editor);
-
-    const elements = $getBlockElementNodesInSelection(selection);
-    for (const node of elements) {
-        if (nodeHasInset(node)) {
-            const currentInset = node.getInset();
-            const newInset = Math.min(Math.max(currentInset + change, 0), 500);
-            node.setInset(newInset)
-        }
-    }
-
-    $toggleSelection(editor);
-}
-
 export const indentIncrease: EditorButtonDefinition = {
     label: 'Increase indent',
     icon: indentIncreaseIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            setInsetForSelection(context.editor, 40);
+            $setInsetForSelection(context.editor, 40);
         });
     },
     isActive() {
@@ -74,7 +60,7 @@ export const indentDecrease: EditorButtonDefinition = {
     icon: indentDecreaseIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            setInsetForSelection(context.editor, -40);
+            $setInsetForSelection(context.editor, -40);
         });
     },
     isActive() {
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
new file mode 100644
index 00000000000..edde994e5a0
--- /dev/null
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -0,0 +1,123 @@
+import {$createCustomListItemNode, $isCustomListItemNode, CustomListItemNode} from "../nodes/custom-list-item";
+import {$createCustomListNode, $isCustomListNode} from "../nodes/custom-list";
+import {BaseSelection, LexicalEditor} from "lexical";
+import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection, getLastSelection} from "./selection";
+import {nodeHasInset} from "./nodes";
+
+
+export function $nestListItem(node: CustomListItemNode) {
+    const list = node.getParent();
+    if (!$isCustomListNode(list)) {
+        return;
+    }
+
+    const listItems = list.getChildren() as CustomListItemNode[];
+    const nodeIndex = listItems.findIndex((n) => n.getKey() === node.getKey());
+    const isFirst = nodeIndex === 0;
+
+    const newListItem = $createCustomListItemNode();
+    const newList = $createCustomListNode(list.getListType());
+    newList.append(newListItem);
+    newListItem.append(...node.getChildren());
+
+    if (isFirst) {
+        node.append(newList);
+    } else  {
+        const prevListItem = listItems[nodeIndex - 1];
+        prevListItem.append(newList);
+        node.remove();
+    }
+}
+
+export function $unnestListItem(node: CustomListItemNode) {
+    const list = node.getParent();
+    const parentListItem = list?.getParent();
+    const outerList = parentListItem?.getParent();
+    if (!$isCustomListNode(list) || !$isCustomListNode(outerList) || !$isCustomListItemNode(parentListItem)) {
+        return;
+    }
+
+    parentListItem.insertAfter(node);
+    if (list.getChildren().length === 0) {
+        list.remove();
+    }
+
+    if (parentListItem.getChildren().length === 0) {
+        parentListItem.remove();
+    }
+}
+
+function getListItemsForSelection(selection: BaseSelection|null): (CustomListItemNode|null)[] {
+    const nodes = selection?.getNodes() || [];
+    const listItemNodes = [];
+
+    outer: for (const node of nodes) {
+        if ($isCustomListItemNode(node)) {
+            listItemNodes.push(node);
+            continue;
+        }
+
+        const parents = node.getParents();
+        for (const parent of parents) {
+            if ($isCustomListItemNode(parent)) {
+                listItemNodes.push(parent);
+                continue outer;
+            }
+        }
+
+        listItemNodes.push(null);
+    }
+
+    return listItemNodes;
+}
+
+function $reduceDedupeListItems(listItems: (CustomListItemNode|null)[]): CustomListItemNode[] {
+    const listItemMap: Record<string, CustomListItemNode> = {};
+
+    for (const item of listItems) {
+        if (item === null) {
+            continue;
+        }
+
+        const key = item.getKey();
+        if (typeof listItemMap[key] === 'undefined') {
+            listItemMap[key] = item;
+        }
+    }
+
+    return Object.values(listItemMap);
+}
+
+export function $setInsetForSelection(editor: LexicalEditor, change: number): void {
+    const selection = getLastSelection(editor);
+
+    const listItemsInSelection = getListItemsForSelection(selection);
+    const isListSelection = listItemsInSelection.length > 0 && !listItemsInSelection.includes(null);
+
+    if (isListSelection) {
+        const listItems = $reduceDedupeListItems(listItemsInSelection);
+        if (change > 0) {
+            for (const listItem of listItems) {
+                $nestListItem(listItem);
+            }
+        } else if (change < 0) {
+            for (const listItem of [...listItems].reverse()) {
+                $unnestListItem(listItem);
+            }
+        }
+
+        $selectNodes(listItems);
+        return;
+    }
+
+    const elements = $getBlockElementNodesInSelection(selection);
+    for (const node of elements) {
+        if (nodeHasInset(node)) {
+            const currentInset = node.getInset();
+            const newInset = Math.min(Math.max(currentInset + change, 0), 500);
+            node.setInset(newInset)
+        }
+    }
+
+    $toggleSelection(editor);
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 4aa21045f30..2110ea4beb9 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -10,7 +10,7 @@ import {
     ElementFormatType,
     ElementNode, LexicalEditor,
     LexicalNode,
-    TextFormatType
+    TextFormatType, TextNode
 } from "lexical";
 import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
@@ -106,6 +106,57 @@ export function $selectSingleNode(node: LexicalNode) {
     $setSelection(nodeSelection);
 }
 
+function getFirstTextNodeInNodes(nodes: LexicalNode[]): TextNode|null {
+    for (const node of nodes) {
+        if ($isTextNode(node)) {
+            return node;
+        }
+
+        if ($isElementNode(node)) {
+            const children = node.getChildren();
+            const textNode = getFirstTextNodeInNodes(children);
+            if (textNode !== null) {
+                return textNode;
+            }
+        }
+    }
+
+    return null;
+}
+
+function getLastTextNodeInNodes(nodes: LexicalNode[]): TextNode|null {
+    const revNodes = [...nodes].reverse();
+    for (const node of revNodes) {
+        if ($isTextNode(node)) {
+            return node;
+        }
+
+        if ($isElementNode(node)) {
+            const children = [...node.getChildren()].reverse();
+            const textNode = getLastTextNodeInNodes(children);
+            if (textNode !== null) {
+                return textNode;
+            }
+        }
+    }
+
+    return null;
+}
+
+export function $selectNodes(nodes: LexicalNode[]) {
+    if (nodes.length === 0) {
+        return;
+    }
+
+    const selection = $createRangeSelection();
+    const firstText = getFirstTextNodeInNodes(nodes);
+    const lastText = getLastTextNodeInNodes(nodes);
+    if (firstText && lastText) {
+        selection.setTextNodeRange(firstText, 0, lastText, lastText.getTextContentSize() || 0)
+        $setSelection(selection);
+    }
+}
+
 export function $toggleSelection(editor: LexicalEditor) {
     const lastSelection = getLastSelection(editor);
 

From 6872eb802c3c7bf9fed1e21eb7dc691a5e09af98 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Sep 2024 16:05:55 +0100
Subject: [PATCH 268/666] Lexical: Altered keyboard handling to indicant
 handled state

---
 .../js/wysiwyg/services/keyboard-handling.ts   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 791fb0bed3f..2c7bfdbbae7 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -58,15 +58,19 @@ function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEve
     return false;
 }
 
-function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null) {
+function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const change = event?.shiftKey ? -40 : 40;
-    editor.update(() => {
-        const selection = $getSelection();
-        const nodes = selection?.getNodes() || [];
-        if (nodes.length > 1 || (nodes.length === 1 && $isCustomListItemNode(nodes[0].getParent()))) {
+    const selection = $getSelection();
+    const nodes = selection?.getNodes() || [];
+    if (nodes.length > 1 || (nodes.length === 1 && $isCustomListItemNode(nodes[0].getParent()))) {
+        editor.update(() => {
             $setInsetForSelection(editor, change);
-        }
-    });
+        });
+        event?.preventDefault();
+        return true;
+    }
+
+    return false;
 }
 
 export function registerKeyboardHandling(context: EditorUiContext): () => void {

From c110a97d8a871b3f2e56af728c4460096399cbf3 Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Sat, 14 Sep 2024 15:24:42 +0200
Subject: [PATCH 269/666] Remove unofficial method-attribute from
 OpenSearch-XML

---
 resources/views/misc/opensearch.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
index cfcca8e4194..2b5a6c143f1 100644
--- a/resources/views/misc/opensearch.blade.php
+++ b/resources/views/misc/opensearch.blade.php
@@ -6,6 +6,6 @@
   <Image width="128" height="128" type="image/png">{{ setting('app-icon-128') ?: url('/icon-128.png') }}</Image>
   <Image width="64" height="64" type="image/png">{{ setting('app-icon-64') ?: url('/icon-64.png') }}</Image>
   <Image width="32" height="32" type="image/png">{{ setting('app-icon-32') ?: url('/icon-32.png') }}</Image>
-  <Url type="text/html" rel="results" method="get" template="{{ url('/search') }}?term={searchTerms}"/>
+  <Url type="text/html" rel="results" template="{{ url('/search') }}?term={searchTerms}"/>
   <Url type="application/opensearchdescription+xml" rel="self" template="{{ url('/opensearch.xml') }}"/>
 </OpenSearchDescription>

From 4f890c431c6fb5f83e047eebcea7f078cb1c9d5c Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Sat, 14 Sep 2024 15:31:56 +0200
Subject: [PATCH 270/666] Limit short-name for OpenSearch XML to 16 characters

The specification does not allow more than 16 characters.
---
 resources/views/misc/opensearch.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
index 2b5a6c143f1..e83e83c12fe 100644
--- a/resources/views/misc/opensearch.blade.php
+++ b/resources/views/misc/opensearch.blade.php
@@ -1,5 +1,5 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>{{ setting('app-name') }}</ShortName>
+  <ShortName>{{ mb_strimwidth(setting('app-name'), 0, 16) }}</ShortName>
   <Description>Search {{ setting('app-name') }}</Description>
   <Image width="256" height="256" type="image/png">{{ setting('app-icon') ?: url('/icon.png') }}</Image>
   <Image width="180" height="180" type="image/png">{{ setting('app-icon-180') ?: url('/icon-180.png') }}</Image>

From 5f46d71af0af216e413af8771f227f2a73deb2ec Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Sep 2024 16:10:46 +0100
Subject: [PATCH 271/666] Lexical: Fixed a range of issues in RTL mode

---
 resources/js/components/wysiwyg-editor.js | 2 ++
 resources/js/wysiwyg/index.ts             | 5 +++++
 resources/js/wysiwyg/todo.md              | 4 ++--
 resources/sass/_editor.scss               | 9 ++++++++-
 resources/sass/_pages.scss                | 2 --
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index ebc142e2abc..eed1c61555f 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -15,6 +15,8 @@ export class WysiwygEditor extends Component {
             this.editor = wysiwyg.createPageEditorInstance(this.editContainer, editorContent, {
                 drawioUrl: this.getDrawIoUrl(),
                 pageId: Number(this.$opts.pageId),
+                darkMode: document.documentElement.classList.contains('dark-mode'),
+                textDirection: this.$opts.textDirection,
                 translations: {
                     imageUploadErrorText: this.$opts.imageUploadErrorText,
                     serverUploadLimitText: this.$opts.serverUploadLimitText,
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index c5dd151af67..c4403773bf2 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -42,8 +42,13 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     const editWrap = el('div', {
         class: 'editor-content-wrap',
     }, [editArea]);
+
     container.append(editWrap);
     container.classList.add('editor-container');
+    container.setAttribute('dir', options.textDirection);
+    if (options.darkMode) {
+        container.classList.add('editor-dark');
+    }
 
     const editor = createEditor(config);
     editor.setRootElement(editArea);
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 2662350afe1..874ac537fe3 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,12 +2,12 @@
 
 ## In progress
 
-//
+- RTL/LTR support
 
 ## Main Todo
 
 - Mac: Shortcut support via command.
-- RTL/LTR support
+- Translations
 
 ## Secondary Todo
 
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 61a9f2de01f..dd1e1a2c368 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -96,6 +96,9 @@ body.editor-is-fullscreen {
     fill: #888;
   }
 }
+.editor-container[dir="rtl"] .editor-menu-button-icon {
+  rotate: 180deg;
+}
 .editor-button-with-menu-container {
   display: flex;
   flex-direction: row;
@@ -171,6 +174,9 @@ body.editor-is-fullscreen {
   background-position: 98% 50%;
   background-size: 28px;
 }
+.editor-container[dir="rtl"] .editor-format-menu-toggle {
+  background-position: 2% 50%;
+}
 .editor-format-menu .editor-dropdown-menu {
   min-width: 300px;
   .editor-dropdown-menu {
@@ -324,9 +330,10 @@ body.editor-is-fullscreen {
 .editor-node-resizer {
   position: absolute;
   left: 0;
-  right: 0;
+  right: auto;
   display: inline-block;
   outline: 2px dashed var(--editor-color-primary);
+  direction: ltr;
 }
 .editor-node-resizer-handle {
   position: absolute;
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index ca59c85ca1a..6e6f7bb7e21 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -2,13 +2,11 @@
   display: flex;
   flex-direction: column;
   align-items: stretch;
-  overflow: hidden;
 
   .edit-area {
     flex: 1;
     flex-direction: column;
     z-index: 10;
-    overflow: hidden;
     border-radius: 0 0 8px 8px;
   }
 

From 03490d6597dae4b50019b3087c517a783afaff81 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 16 Sep 2024 12:29:46 +0100
Subject: [PATCH 272/666] Lexical: Added RTL/LTR actions

Kinda useless though due to Lexical reconciler :(
---
 resources/icons/editor/direction-ltr.svg      |  1 +
 resources/icons/editor/direction-rtl.svg      |  1 +
 .../wysiwyg/ui/defaults/buttons/alignments.ts | 46 ++++++++++++++++---
 resources/js/wysiwyg/ui/toolbars.ts           | 13 +++++-
 resources/js/wysiwyg/utils/selection.ts       | 18 +++++++-
 5 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 resources/icons/editor/direction-ltr.svg
 create mode 100644 resources/icons/editor/direction-rtl.svg

diff --git a/resources/icons/editor/direction-ltr.svg b/resources/icons/editor/direction-ltr.svg
new file mode 100644
index 00000000000..16befc75c2e
--- /dev/null
+++ b/resources/icons/editor/direction-ltr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M440-800v400q0 17-11.5 28.5T400-360q-17 0-28.5-11.5T360-400v-160q-66 0-113-47t-47-113q0-66 47-113t113-47h280q17 0 28.5 11.5T680-840q0 17-11.5 28.5T640-800h-40v400q0 17-11.5 28.5T560-360q-17 0-28.5-11.5T520-400v-400h-80Zm-80 160v-160q-33 0-56.5 23.5T280-720q0 33 23.5 56.5T360-640Zm0-80Zm328 520H160q-17 0-28.5-11.5T120-240q0-17 11.5-28.5T160-280h528l-36-36q-11-11-11-28t11-28q11-11 28-11t28 11l104 104q12 12 12 28t-12 28L708-108q-11 11-28 11t-28-11q-11-11-11-28t11-28l36-36Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/direction-rtl.svg b/resources/icons/editor/direction-rtl.svg
new file mode 100644
index 00000000000..5125472a007
--- /dev/null
+++ b/resources/icons/editor/direction-rtl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M440-800v400q0 17-11.5 28.5T400-360q-17 0-28.5-11.5T360-400v-160q-66 0-113-47t-47-113q0-66 47-113t113-47h280q17 0 28.5 11.5T680-840q0 17-11.5 28.5T640-800h-40v400q0 17-11.5 28.5T560-360q-17 0-28.5-11.5T520-400v-400h-80ZM272-200l36 36q11 11 11 28t-11 28q-11 11-28 11t-28-11L148-212q-12-12-12-28t12-28l104-104q11-11 28-11t28 11q11 11 11 28t-11 28l-36 36h528q17 0 28.5 11.5T840-240q0 17-11.5 28.5T800-200H272Zm88-440v-160q-33 0-56.5 23.5T280-720q0 33 23.5 56.5T360-640Zm0-80Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 329b1195609..130fd6b726c 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -5,15 +5,17 @@ import {EditorUiContext} from "../../framework/core";
 import alignCenterIcon from "@icons/editor/align-center.svg";
 import alignRightIcon from "@icons/editor/align-right.svg";
 import alignJustifyIcon from "@icons/editor/align-justify.svg";
+import ltrIcon from "@icons/editor/direction-ltr.svg";
+import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
     $getBlockElementNodesInSelection,
-    $selectionContainsAlignment, $selectSingleNode, $toggleSelection, getLastSelection
+    $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, $toggleSelection, getLastSelection
 } from "../../../utils/selection";
 import {CommonBlockAlignment} from "../../../nodes/_common";
 import {nodeHasAlignment} from "../../../utils/nodes";
 
 
-function setAlignmentForSection(editor: LexicalEditor, alignment: CommonBlockAlignment): void {
+function setAlignmentForSelection(editor: LexicalEditor, alignment: CommonBlockAlignment): void {
     const selection = getLastSelection(editor);
     const selectionNodes = selection?.getNodes() || [];
 
@@ -35,11 +37,21 @@ function setAlignmentForSection(editor: LexicalEditor, alignment: CommonBlockAli
     $toggleSelection(editor);
 }
 
+function setDirectionForSelection(editor: LexicalEditor, direction: 'ltr' | 'rtl'): void {
+    const selection = getLastSelection(editor);
+
+    const elements = $getBlockElementNodesInSelection(selection);
+    for (const node of elements) {
+        console.log('setting direction', node);
+        node.setDirection(direction);
+    }
+}
+
 export const alignLeft: EditorButtonDefinition = {
     label: 'Align left',
     icon: alignLeftIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection(context.editor, 'left'));
+        context.editor.update(() => setAlignmentForSelection(context.editor, 'left'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'left');
@@ -50,7 +62,7 @@ export const alignCenter: EditorButtonDefinition = {
     label: 'Align center',
     icon: alignCenterIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection(context.editor, 'center'));
+        context.editor.update(() => setAlignmentForSelection(context.editor, 'center'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'center');
@@ -61,7 +73,7 @@ export const alignRight: EditorButtonDefinition = {
     label: 'Align right',
     icon: alignRightIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection(context.editor, 'right'));
+        context.editor.update(() => setAlignmentForSelection(context.editor, 'right'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'right');
@@ -72,9 +84,31 @@ export const alignJustify: EditorButtonDefinition = {
     label: 'Align justify',
     icon: alignJustifyIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSection(context.editor, 'justify'));
+        context.editor.update(() => setAlignmentForSelection(context.editor, 'justify'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'justify');
     }
 };
+
+export const directionLTR: EditorButtonDefinition = {
+    label: 'Left to right',
+    icon: ltrIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setDirectionForSelection(context.editor, 'ltr'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsDirection(selection, 'ltr');
+    }
+};
+
+export const directionRTL: EditorButtonDefinition = {
+    label: 'Right to left',
+    icon: rtlIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => setDirectionForSelection(context.editor, 'rtl'));
+    },
+    isActive(selection: BaseSelection|null) {
+        return $selectionContainsDirection(selection, 'rtl');
+    }
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 0ad638410ad..b064a2a9f1b 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -51,7 +51,14 @@ import {
     textColor,
     underline
 } from "./defaults/buttons/inline-formats";
-import {alignCenter, alignJustify, alignLeft, alignRight} from "./defaults/buttons/alignments";
+import {
+    alignCenter,
+    alignJustify,
+    alignLeft,
+    alignRight,
+    directionLTR,
+    directionRTL
+} from "./defaults/buttons/alignments";
 import {
     bulletList,
     indentDecrease,
@@ -117,11 +124,13 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Alignment
-        new EditorOverflowContainer(4, [
+        new EditorOverflowContainer(6, [ // TODO - Dynamic
             new EditorButton(alignLeft),
             new EditorButton(alignCenter),
             new EditorButton(alignRight),
             new EditorButton(alignJustify),
+            new EditorButton(directionLTR), // TODO - Dynamic
+            new EditorButton(directionRTL), // TODO - Dynamic
         ]),
 
         // Lists
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 2110ea4beb9..f1055d98ac8 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -2,7 +2,7 @@ import {
     $createNodeSelection,
     $createParagraphNode, $createRangeSelection,
     $getRoot,
-    $getSelection, $isDecoratorNode,
+    $getSelection, $isBlockElementNode, $isDecoratorNode,
     $isElementNode,
     $isTextNode,
     $setSelection,
@@ -199,6 +199,22 @@ export function $selectionContainsAlignment(selection: BaseSelection | null, ali
     return false;
 }
 
+export function $selectionContainsDirection(selection: BaseSelection | null, direction: 'rtl'|'ltr'): boolean {
+
+    const nodes = [
+        ...(selection?.getNodes() || []),
+        ...$getBlockElementNodesInSelection(selection)
+    ];
+
+    for (const node of nodes) {
+        if ($isBlockElementNode(node) && node.getDirection() === direction) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 export function $getBlockElementNodesInSelection(selection: BaseSelection | null): ElementNode[] {
     if (!selection) {
         return [];

From 22d078b47f5bd024da98432c7db745d953291712 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 18 Sep 2024 13:43:39 +0100
Subject: [PATCH 273/666] Lexical: Imported core lexical libs

Imported at 0.17.1, Modified to work in-app.
Added & configured test dependancies.
Tests need to be altered to avoid using non-included deps including
react dependancies.
---
 .gitignore                                    |    1 +
 dev/build/esbuild.js                          |    2 +
 jest.config.ts                                |  207 +
 package-lock.json                             | 7322 ++++++++++++-----
 package.json                                  |   18 +-
 resources/js/app.js                           |    3 +
 resources/js/global.d.ts                      |    8 +-
 .../wysiwyg/lexical/ORIGINAL-LEXICAL-LICENSE  |   21 +
 .../js/wysiwyg/lexical/clipboard/clipboard.ts |  542 ++
 .../js/wysiwyg/lexical/clipboard/index.ts     |   21 +
 .../wysiwyg/lexical/core/LexicalCommands.ts   |  125 +
 .../wysiwyg/lexical/core/LexicalConstants.ts  |  145 +
 .../js/wysiwyg/lexical/core/LexicalEditor.ts  | 1289 +++
 .../lexical/core/LexicalEditorState.ts        |  137 +
 .../js/wysiwyg/lexical/core/LexicalEvents.ts  | 1385 ++++
 .../js/wysiwyg/lexical/core/LexicalGC.ts      |  125 +
 .../wysiwyg/lexical/core/LexicalMutations.ts  |  322 +
 .../js/wysiwyg/lexical/core/LexicalNode.ts    | 1221 +++
 .../lexical/core/LexicalNormalization.ts      |  124 +
 .../wysiwyg/lexical/core/LexicalReconciler.ts |  943 +++
 .../wysiwyg/lexical/core/LexicalSelection.ts  | 2835 +++++++
 .../js/wysiwyg/lexical/core/LexicalUpdates.ts | 1035 +++
 .../js/wysiwyg/lexical/core/LexicalUtils.ts   | 1788 ++++
 .../core/__tests__/unit/CodeBlock.test.ts     |  144 +
 .../__tests__/unit/HTMLCopyAndPaste.test.ts   |  125 +
 .../core/__tests__/unit/LexicalEditor.test.ts | 2856 +++++++
 .../__tests__/unit/LexicalEditorState.test.ts |  159 +
 .../__tests__/unit/LexicalListPlugin.test.tsx |  212 +
 .../core/__tests__/unit/LexicalNode.test.ts   | 1517 ++++
 .../unit/LexicalNormalization.test.tsx        |  176 +
 .../__tests__/unit/LexicalSelection.test.ts   |  342 +
 .../unit/LexicalSerialization.test.ts         |  126 +
 .../core/__tests__/unit/LexicalUtils.test.ts  |  293 +
 .../lexical/core/__tests__/utils/index.ts     |  751 ++
 resources/js/wysiwyg/lexical/core/index.ts    |  208 +
 .../lexical/core/nodes/ArtificialNode.ts      |   23 +
 .../core/nodes/LexicalDecoratorNode.ts        |   56 +
 .../lexical/core/nodes/LexicalElementNode.ts  |  635 ++
 .../core/nodes/LexicalLineBreakNode.ts        |  142 +
 .../core/nodes/LexicalParagraphNode.ts        |  236 +
 .../lexical/core/nodes/LexicalRootNode.ts     |  132 +
 .../lexical/core/nodes/LexicalTabNode.ts      |   94 +
 .../lexical/core/nodes/LexicalTextNode.ts     | 1364 +++
 .../unit/LexicalElementNode.test.tsx          |  635 ++
 .../nodes/__tests__/unit/LexicalGC.test.tsx   |  119 +
 .../unit/LexicalLineBreakNode.test.ts         |   74 +
 .../unit/LexicalParagraphNode.test.ts         |  153 +
 .../__tests__/unit/LexicalRootNode.test.ts    |  271 +
 .../__tests__/unit/LexicalTabNode.test.tsx    |  257 +
 .../__tests__/unit/LexicalTextNode.test.tsx   |  843 ++
 .../core/shared/__mocks__/invariant.ts        |   24 +
 .../wysiwyg/lexical/core/shared/canUseDOM.ts  |   12 +
 .../lexical/core/shared/caretFromPoint.ts     |   40 +
 .../lexical/core/shared/environment.ts        |   56 +
 .../wysiwyg/lexical/core/shared/invariant.ts  |   26 +
 .../core/shared/normalizeClassNames.ts        |   21 +
 .../lexical/core/shared/react-test-utils.ts   |   18 +
 .../lexical/core/shared/reactPatches.ts       |   22 +
 .../core/shared/simpleDiffWithCursor.ts       |   49 +
 .../lexical/core/shared/useLayoutEffect.ts    |   19 +
 .../lexical/core/shared/warnOnlyOnce.ts       |   20 +
 .../unit/LexicalHeadlessEditor.test.ts        |  212 +
 .../js/wysiwyg/lexical/headless/index.ts      |   43 +
 resources/js/wysiwyg/lexical/history/index.ts |  501 ++
 .../html/__tests__/unit/LexicalHtml.test.ts   |  212 +
 resources/js/wysiwyg/lexical/html/index.ts    |  376 +
 .../unit/LexicalAutoLinkNode.test.ts          |  506 ++
 .../__tests__/unit/LexicalLinkNode.test.ts    |  413 +
 resources/js/wysiwyg/lexical/link/index.ts    |  610 ++
 .../lexical/list/LexicalListItemNode.ts       |  552 ++
 .../wysiwyg/lexical/list/LexicalListNode.ts   |  367 +
 .../unit/LexicalListItemNode.test.ts          | 1365 +++
 .../__tests__/unit/LexicalListNode.test.ts    |  317 +
 .../lexical/list/__tests__/unit/utils.test.ts |  335 +
 .../wysiwyg/lexical/list/__tests__/utils.ts   |   33 +
 .../js/wysiwyg/lexical/list/formatList.ts     |  530 ++
 resources/js/wysiwyg/lexical/list/index.ts    |   50 +
 resources/js/wysiwyg/lexical/list/utils.ts    |  205 +
 resources/js/wysiwyg/lexical/readme.md        |   12 +
 .../__tests__/unit/LexicalHeadingNode.test.ts |  202 +
 .../__tests__/unit/LexicalQuoteNode.test.ts   |   97 +
 .../js/wysiwyg/lexical/rich-text/index.ts     | 1067 +++
 .../__tests__/unit/LexicalSelection.test.tsx  | 3082 +++++++
 .../unit/LexicalSelectionHelpers.test.ts      | 3173 +++++++
 .../selection/__tests__/utils/index.ts        |  918 +++
 .../js/wysiwyg/lexical/selection/constants.ts |    8 +
 .../js/wysiwyg/lexical/selection/index.ts     |   56 +
 .../wysiwyg/lexical/selection/lexical-node.ts |  427 +
 .../lexical/selection/range-selection.ts      |  608 ++
 .../js/wysiwyg/lexical/selection/utils.ts     |  228 +
 .../lexical/table/LexicalTableCellNode.ts     |  374 +
 .../lexical/table/LexicalTableCommands.ts     |   27 +
 .../wysiwyg/lexical/table/LexicalTableNode.ts |  258 +
 .../lexical/table/LexicalTableObserver.ts     |  414 +
 .../lexical/table/LexicalTableRowNode.ts      |  130 +
 .../lexical/table/LexicalTableSelection.ts    |  373 +
 .../table/LexicalTableSelectionHelpers.ts     | 1819 ++++
 .../lexical/table/LexicalTableUtils.ts        |  894 ++
 .../unit/LexicalTableCellNode.test.ts         |   70 +
 .../__tests__/unit/LexicalTableNode.test.tsx  |  351 +
 .../unit/LexicalTableRowNode.test.ts          |   50 +
 .../unit/LexicalTableSelection.test.tsx       |  176 +
 .../js/wysiwyg/lexical/table/constants.ts     |   13 +
 resources/js/wysiwyg/lexical/table/index.ts   |   74 +
 .../unit/LexicalElementHelpers.test.ts        |   77 +
 .../unit/LexicalEventHelpers.test.tsx         |  747 ++
 .../__tests__/unit/LexicalNodeHelpers.test.ts |  236 +
 .../__tests__/unit/LexicalRootHelpers.test.ts |   63 +
 .../unit/LexicalUtilsKlassEqual.test.ts       |   36 +
 .../unit/LexicalUtilsSplitNode.test.tsx       |  142 +
 ...xlcaiUtilsInsertNodeToNearestRoot.test.tsx |  184 +
 .../__tests__/unit/mergeRegister.test.ts      |   21 +
 resources/js/wysiwyg/lexical/utils/index.ts   |  607 ++
 .../js/wysiwyg/lexical/utils/markSelection.ts |  170 +
 .../js/wysiwyg/lexical/utils/mergeRegister.ts |   44 +
 .../lexical/utils/positionNodeOnRange.ts      |  141 +
 resources/js/wysiwyg/lexical/utils/px.ts      |   11 +
 resources/js/wysiwyg/lexical/yjs/Bindings.ts  |   78 +
 .../lexical/yjs/CollabDecoratorNode.ts        |  110 +
 .../wysiwyg/lexical/yjs/CollabElementNode.ts  |  666 ++
 .../lexical/yjs/CollabLineBreakNode.ts        |   68 +
 .../js/wysiwyg/lexical/yjs/CollabTextNode.ts  |  178 +
 .../js/wysiwyg/lexical/yjs/SyncCursors.ts     |  536 ++
 .../wysiwyg/lexical/yjs/SyncEditorStates.ts   |  247 +
 resources/js/wysiwyg/lexical/yjs/Utils.ts     |  560 ++
 resources/js/wysiwyg/lexical/yjs/index.ts     |  116 +
 resources/js/wysiwyg/lexical/yjs/types.ts     |   27 +
 tsconfig.json                                 |  121 +-
 128 files changed, 56625 insertions(+), 1958 deletions(-)
 create mode 100644 jest.config.ts
 create mode 100644 resources/js/wysiwyg/lexical/ORIGINAL-LEXICAL-LICENSE
 create mode 100644 resources/js/wysiwyg/lexical/clipboard/clipboard.ts
 create mode 100644 resources/js/wysiwyg/lexical/clipboard/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalCommands.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalConstants.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalEditor.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalEditorState.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalEvents.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalGC.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalMutations.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalNormalization.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalSelection.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalUpdates.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/LexicalUtils.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalUtils.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/ArtificialNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalTabNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/canUseDOM.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/caretFromPoint.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/environment.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/invariant.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/normalizeClassNames.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/simpleDiffWithCursor.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts
 create mode 100644 resources/js/wysiwyg/lexical/core/shared/warnOnlyOnce.ts
 create mode 100644 resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/headless/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/history/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/html/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/link/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/LexicalListNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/__tests__/utils.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/formatList.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/list/utils.ts
 create mode 100644 resources/js/wysiwyg/lexical/readme.md
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/constants.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/lexical-node.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/range-selection.ts
 create mode 100644 resources/js/wysiwyg/lexical/selection/utils.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableCommands.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableObserver.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableSelection.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/table/constants.ts
 create mode 100644 resources/js/wysiwyg/lexical/table/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalElementHelpers.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
 create mode 100644 resources/js/wysiwyg/lexical/utils/__tests__/unit/mergeRegister.test.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/markSelection.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/mergeRegister.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/positionNodeOnRange.ts
 create mode 100644 resources/js/wysiwyg/lexical/utils/px.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/Bindings.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/CollabDecoratorNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/CollabElementNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/CollabLineBreakNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/CollabTextNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/SyncCursors.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/SyncEditorStates.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/Utils.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/index.ts
 create mode 100644 resources/js/wysiwyg/lexical/yjs/types.ts

diff --git a/.gitignore b/.gitignore
index 55cc0557b8c..3582c410221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /node_modules
 /.vscode
 /composer
+/coverage
 Homestead.yaml
 .env
 .idea
diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index 0680f4ac3da..fea8c01e353 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -38,6 +38,8 @@ esbuild.build({
     absWorkingDir: path.join(__dirname, '../..'),
     alias: {
         '@icons': './resources/icons',
+        lexical: './resources/js/wysiwyg/lexical/core',
+        '@lexical': './resources/js/wysiwyg/lexical',
     },
     banner: {
         js: '// See the "/licenses" URI for full package license details',
diff --git a/jest.config.ts b/jest.config.ts
new file mode 100644
index 00000000000..0243b39cddc
--- /dev/null
+++ b/jest.config.ts
@@ -0,0 +1,207 @@
+/**
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+import type {Config} from 'jest';
+import {pathsToModuleNameMapper} from "ts-jest";
+import { compilerOptions }  from './tsconfig.json';
+
+const config: Config = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/tmp/jest_rs",
+
+  // Automatically clear mock calls, instances, contexts and results before every test
+  clearMocks: true,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  collectCoverage: true,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  coverageDirectory: "coverage",
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // The default configuration for fake timers
+  // fakeTimers: {
+  //   "enableGlobally": false
+  // },
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  globals: {
+    __DEV__: true,
+  },
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "mjs",
+  //   "cjs",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  modulePaths: ['/home/dan/web/bookstack/'],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  // preset: undefined,
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state before every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state and implementation before every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  roots: [
+    "./resources/js"
+  ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  testEnvironment: "jsdom",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // A map from regular expressions to paths to transformers
+  transform: {
+    "^.+.tsx?$": ["ts-jest",{}],
+  },
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};
+
+export default config;
diff --git a/package-lock.json b/package-lock.json
index 1d252766152..0b6c970806c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,20 +18,12 @@
         "@codemirror/state": "^6.3.3",
         "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.22.2",
-        "@lexical/history": "^0.17.0",
-        "@lexical/html": "^0.17.0",
-        "@lexical/link": "^0.17.0",
-        "@lexical/list": "^0.17.0",
-        "@lexical/rich-text": "^0.17.0",
-        "@lexical/selection": "^0.17.0",
-        "@lexical/table": "^0.17.0",
-        "@lexical/utils": "^0.17.0",
         "@lezer/highlight": "^1.2.0",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
+        "@types/jest": "^29.5.13",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
-        "lexical": "^0.17.0",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.5.1",
@@ -39,1467 +31,3877 @@
       },
       "devDependencies": {
         "@lezer/generator": "^1.5.1",
+        "babel-jest": "^29.7.0",
         "chokidar-cli": "^3.0",
         "esbuild": "^0.20",
         "eslint": "^8.55.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.29.0",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "livereload": "^0.9.3",
         "npm-run-all": "^4.1.5",
         "sass": "^1.69.5",
+        "ts-jest": "^29.2.5",
+        "ts-node": "^10.9.2",
         "typescript": "^5.4.5"
       }
     },
-    "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
-      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
-      "peerDependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@codemirror/commands": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
-      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.4.0",
-        "@codemirror/view": "^6.27.0",
-        "@lezer/common": "^1.1.0"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lang-css": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
-      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@lezer/common": "^1.0.2",
-        "@lezer/css": "^1.1.7"
+    "node_modules/@babel/compat-data": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lang-html": {
-      "version": "6.4.9",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
-      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
+    "node_modules/@babel/core": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/lang-css": "^6.0.0",
-        "@codemirror/lang-javascript": "^6.0.0",
-        "@codemirror/language": "^6.4.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/css": "^1.1.0",
-        "@lezer/html": "^1.3.0"
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
-      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.6.0",
-        "@codemirror/lint": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/javascript": "^1.0.0"
+    "node_modules/@babel/core/node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/@codemirror/lang-json": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
-      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+    "node_modules/@babel/generator": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@lezer/json": "^1.0.0"
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz",
-      "integrity": "sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/autocomplete": "^6.7.1",
-        "@codemirror/lang-html": "^6.0.0",
-        "@codemirror/language": "^6.3.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.2.1",
-        "@lezer/markdown": "^1.0.0"
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lang-php": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
-      "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/lang-html": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/php": "^1.0.0"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lang-xml": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
-      "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.4.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/xml": "^1.0.0"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@codemirror/language": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
-      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.23.0",
-        "@lezer/common": "^1.1.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0",
-        "style-mod": "^4.0.0"
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.1.tgz",
-      "integrity": "sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==",
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/language": "^6.0.0"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/lint": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
-      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "crelt": "^1.0.5"
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/search": {
-      "version": "6.5.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
-      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "crelt": "^1.0.5"
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/state": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@codemirror/theme-one-dark": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
-      "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+    "node_modules/@babel/helpers": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/highlight": "^1.0.0"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/view": {
-      "version": "6.33.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
-      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dependencies": {
-        "@codemirror/state": "^6.4.0",
-        "style-mod": "^4.1.0",
-        "w3c-keyname": "^2.2.4"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/parser": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz",
+      "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.8"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
-      "cpu": [
-        "mips64el"
-      ],
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz",
+      "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "@babel/helper-plugin-utils": "^7.24.8"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+    "node_modules/@babel/template": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
+      },
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/@babel/traverse": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@babel/types": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
       },
       "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@lexical/clipboard": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.17.1.tgz",
-      "integrity": "sha512-OVqnEfWX8XN5xxuMPo6BfgGKHREbz++D5V5ISOiml0Z8fV/TQkdgwqbBJcUdJHGRHWSUwdK7CWGs/VALvVvZyw==",
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
+      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
       "dependencies": {
-        "@lexical/html": "0.17.1",
-        "@lexical/list": "0.17.1",
-        "@lexical/selection": "0.17.1",
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0"
+      },
+      "peerDependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
       }
     },
-    "node_modules/@lexical/history": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/history/-/history-0.17.1.tgz",
-      "integrity": "sha512-OU/ohajz4FXchUhghsWC7xeBPypFe50FCm5OePwo767G7P233IztgRKIng2pTT4zhCPW7S6Mfl53JoFHKehpWA==",
+    "node_modules/@codemirror/commands": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
+      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
       "dependencies": {
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.4.0",
+        "@codemirror/view": "^6.27.0",
+        "@lezer/common": "^1.1.0"
       }
     },
-    "node_modules/@lexical/html": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/html/-/html-0.17.1.tgz",
-      "integrity": "sha512-yGG+K2DXl7Wn2DpNuZ0Y3uCHJgfHkJN3/MmnFb4jLnH1FoJJiuy7WJb/BRRh9H+6xBJ9v70iv+kttDJ0u1xp5w==",
+    "node_modules/@codemirror/lang-css": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
+      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
       "dependencies": {
-        "@lexical/selection": "0.17.1",
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.2",
+        "@lezer/css": "^1.1.7"
       }
     },
-    "node_modules/@lexical/link": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/link/-/link-0.17.1.tgz",
-      "integrity": "sha512-qFJEKBesZAtR8kfJfIVXRFXVw6dwcpmGCW7duJbtBRjdLjralOxrlVKyFhW9PEXGhi4Mdq2Ux16YnnDncpORdQ==",
+    "node_modules/@codemirror/lang-html": {
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
+      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
       "dependencies": {
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/lang-css": "^6.0.0",
+        "@codemirror/lang-javascript": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/css": "^1.1.0",
+        "@lezer/html": "^1.3.0"
       }
     },
-    "node_modules/@lexical/list": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/list/-/list-0.17.1.tgz",
-      "integrity": "sha512-k9ZnmQuBvW+xVUtWJZwoGtiVG2cy+hxzkLGU4jTq1sqxRIoSeGcjvhFAK8JSEj4i21SgkB1FmkWXoYK5kbwtRA==",
+    "node_modules/@codemirror/lang-javascript": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
+      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
       "dependencies": {
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.6.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/javascript": "^1.0.0"
       }
     },
-    "node_modules/@lexical/rich-text": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.17.1.tgz",
-      "integrity": "sha512-T3kvj4P1OpedX9jvxN3WN8NP1Khol6mCW2ScFIRNRz2dsXgyN00thH1Q1J/uyu7aKyGS7rzcY0rb1Pz1qFufqQ==",
+    "node_modules/@codemirror/lang-json": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
+      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
       "dependencies": {
-        "@lexical/clipboard": "0.17.1",
-        "@lexical/selection": "0.17.1",
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
       }
     },
-    "node_modules/@lexical/selection": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/selection/-/selection-0.17.1.tgz",
-      "integrity": "sha512-qBKVn+lMV2YIoyRELNr1/QssXx/4c0id9NCB/BOuYlG8du5IjviVJquEF56NEv2t0GedDv4BpUwkhXT2QbNAxA==",
+    "node_modules/@codemirror/lang-markdown": {
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz",
+      "integrity": "sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==",
       "dependencies": {
-        "lexical": "0.17.1"
+        "@codemirror/autocomplete": "^6.7.1",
+        "@codemirror/lang-html": "^6.0.0",
+        "@codemirror/language": "^6.3.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.2.1",
+        "@lezer/markdown": "^1.0.0"
       }
     },
-    "node_modules/@lexical/table": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/table/-/table-0.17.1.tgz",
-      "integrity": "sha512-2fUYPmxhyuMQX3MRvSsNaxbgvwGNJpHaKx1Ldc+PT2MvDZ6ALZkfsxbi0do54Q3i7dOon8/avRp4TuVaCnqvoA==",
+    "node_modules/@codemirror/lang-php": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
+      "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
       "dependencies": {
-        "@lexical/utils": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/lang-html": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/php": "^1.0.0"
       }
     },
-    "node_modules/@lexical/utils": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@lexical/utils/-/utils-0.17.1.tgz",
-      "integrity": "sha512-jCQER5EsvhLNxKH3qgcpdWj/necUb82Xjp8qWQ3c0tyL07hIRm2tDRA/s9mQmvcP855HEZSmGVmR5SKtkcEAVg==",
+    "node_modules/@codemirror/lang-xml": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
+      "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
       "dependencies": {
-        "@lexical/list": "0.17.1",
-        "@lexical/selection": "0.17.1",
-        "@lexical/table": "0.17.1",
-        "lexical": "0.17.1"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/xml": "^1.0.0"
       }
     },
-    "node_modules/@lezer/common": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
-    },
-    "node_modules/@lezer/css": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
-      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
+    "node_modules/@codemirror/language": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
+      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
       "dependencies": {
-        "@lezer/common": "^1.2.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
+        "@lezer/common": "^1.1.0",
         "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
       }
     },
-    "node_modules/@lezer/generator": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.1.tgz",
-      "integrity": "sha512-MgPJN9Si+ccxzXl3OAmCeZuUKw4XiPl4y664FX/hnnyG9CTqUPq65N3/VGPA2jD23D7QgMTtNqflta+cPN+5mQ==",
-      "dev": true,
+    "node_modules/@codemirror/legacy-modes": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.1.tgz",
+      "integrity": "sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0"
+      }
+    },
+    "node_modules/@codemirror/lint": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
+      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/search": {
+      "version": "6.5.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "crelt": "^1.0.5"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
+    },
+    "node_modules/@codemirror/theme-one-dark": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
+      "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/highlight": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.33.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
+      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
+      "dependencies": {
+        "@codemirror/state": "^6.4.0",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@lezer/common": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
+      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
+    },
+    "node_modules/@lezer/css": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
+      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/generator": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.1.tgz",
+      "integrity": "sha512-MgPJN9Si+ccxzXl3OAmCeZuUKw4XiPl4y664FX/hnnyG9CTqUPq65N3/VGPA2jD23D7QgMTtNqflta+cPN+5mQ==",
+      "dev": true,
       "dependencies": {
         "@lezer/common": "^1.1.0",
         "@lezer/lr": "^1.3.0"
       },
       "bin": {
-        "lezer-generator": "src/lezer-generator.cjs"
+        "lezer-generator": "src/lezer-generator.cjs"
+      }
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/html": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
+      "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/javascript": {
+      "version": "1.4.17",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
+      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.1.3",
+        "@lezer/lr": "^1.3.0"
+      }
+    },
+    "node_modules/@lezer/json": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
+      "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
+      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/markdown": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
+      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
+      "dependencies": {
+        "@lezer/common": "^1.0.0",
+        "@lezer/highlight": "^1.0.0"
+      }
+    },
+    "node_modules/@lezer/php": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.2.tgz",
+      "integrity": "sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.1.0"
+      }
+    },
+    "node_modules/@lezer/xml": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.5.tgz",
+      "integrity": "sha512-VFouqOzmUWfIg+tfmpcdV33ewtK+NSwd4ngSe1aG7HFb4BN0ExyY1b8msp+ndFrnlG4V4iC8yXacjFtrwERnaw==",
+      "dependencies": {
+        "@lezer/common": "^1.2.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@ssddanbrown/codemirror-lang-smarty": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-smarty/-/codemirror-lang-smarty-1.0.0.tgz",
+      "integrity": "sha512-F0ut1kmdbT3eORk3xVIKfQsGCZiQdh+6sLayBa0+FTex2gyIQlVQZRRA7bPSlchI3uZtWwNnqGNz5O/QLWRlFg=="
+    },
+    "node_modules/@ssddanbrown/codemirror-lang-twig": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-twig/-/codemirror-lang-twig-1.0.0.tgz",
+      "integrity": "sha512-7WIMIh8Ssc54TooGCY57WU2rKEqZZrcV2tZSVRPtd0gKYsrDEKCSLWpQjUWEx7bdgh3NKHUjq1O4ugIzI/+dwQ==",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.13",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
+      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/jsdom": {
+      "version": "20.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
+      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^7.0.0"
+      }
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "22.5.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
+      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "dev": true
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001660",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar-cli": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-3.0.0.tgz",
+      "integrity": "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "lodash.debounce": "^4.0.8",
+        "lodash.throttle": "^4.1.1",
+        "yargs": "^13.3.0"
+      },
+      "bin": {
+        "chokidar": "index.js"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+      "dev": true
+    },
+    "node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/codemirror": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+      "dependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/commands": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/search": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@lezer/highlight": {
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "dev": true,
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.0.0"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@lezer/html": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
-      "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.2.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@lezer/javascript": {
-      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
-      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.2.0",
-        "@lezer/highlight": "^1.1.3",
-        "@lezer/lr": "^1.3.0"
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@lezer/json": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
-      "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.2.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@lezer/lr": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
-      "dependencies": {
-        "@lezer/common": "^1.0.0"
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.25",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz",
+      "integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/@lezer/markdown": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
-      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
-      "dependencies": {
-        "@lezer/common": "^1.0.0",
-        "@lezer/highlight": "^1.0.0"
+    "node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/@lezer/php": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.2.tgz",
-      "integrity": "sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==",
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.2.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.1.0"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/@lezer/xml": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.5.tgz",
-      "integrity": "sha512-VFouqOzmUWfIg+tfmpcdV33ewtK+NSwd4ngSe1aG7HFb4BN0ExyY1b8msp+ndFrnlG4V4iC8yXacjFtrwERnaw==",
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
       "dependencies": {
-        "@lezer/common": "^1.2.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@rtsao/scc": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
-      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "dev": true
-    },
-    "node_modules/@ssddanbrown/codemirror-lang-smarty": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-smarty/-/codemirror-lang-smarty-1.0.0.tgz",
-      "integrity": "sha512-F0ut1kmdbT3eORk3xVIKfQsGCZiQdh+6sLayBa0+FTex2gyIQlVQZRRA7bPSlchI3uZtWwNnqGNz5O/QLWRlFg=="
-    },
-    "node_modules/@ssddanbrown/codemirror-lang-twig": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-twig/-/codemirror-lang-twig-1.0.0.tgz",
-      "integrity": "sha512-7WIMIh8Ssc54TooGCY57WU2rKEqZZrcV2tZSVRPtd0gKYsrDEKCSLWpQjUWEx7bdgh3NKHUjq1O4ugIzI/+dwQ==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+    "node_modules/esbuild": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
       "dev": true,
+      "hasInstallScript": true,
       "bin": {
-        "acorn": "bin/acorn"
+        "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
       }
     },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/eslint": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
       }
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
     },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+    "node_modules/eslint-module-utils": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
+      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
+        "debug": "^3.2.7"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
+      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
+      "dev": true,
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.9.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=4.0"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "dev": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
       "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/chokidar-cli": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-3.0.0.tgz",
-      "integrity": "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==",
-      "dev": true,
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dependencies": {
-        "chokidar": "^3.5.2",
-        "lodash.debounce": "^4.0.8",
-        "lodash.throttle": "^4.1.1",
-        "yargs": "^13.3.0"
-      },
-      "bin": {
-        "chokidar": "index.js"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
-    "node_modules/codemirror": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
       "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/commands": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/lint": "^6.0.0",
-        "@codemirror/search": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
     },
-    "node_modules/crelt": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
       }
     },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
-      "dev": true,
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "is-callable": "^1.1.3"
       }
     },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">= 0.4"
-      },
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1508,96 +3910,44 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
       "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "hasown": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1606,537 +3956,541 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "es-errors": "^1.3.0"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
+        "es-define-property": "^1.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
-      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7"
+        "whatwg-encoding": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
+        "node": ">=12"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
-      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "dependencies": {
-        "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.8",
-        "array.prototype.findlastindex": "^1.2.5",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.9.0",
-        "hasown": "^2.0.2",
-        "is-core-module": "^2.15.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.8",
-        "object.groupby": "^1.0.3",
-        "object.values": "^1.2.0",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.15.0"
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+    "node_modules/idb-keyval": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
+      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "has-bigints": "^1.0.1"
       },
-      "engines": {
-        "node": ">=4.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
       "dev": true,
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -2144,35 +4498,52 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": ">=8"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2181,15 +4552,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "call-bind": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2198,62 +4567,55 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2262,486 +4624,842 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3"
+        "call-bind": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
       "dev": true
     },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "dependencies": {
-        "es-define-property": "^1.0.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dev": true,
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.3"
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+    "node_modules/jest-cli/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.2"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+    "node_modules/jest-cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "node_modules/idb-keyval": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
-      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+    "node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "engines": {
-        "node": ">= 4"
+        "node": ">=8"
       }
     },
-    "node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true
+    "node_modules/jest-cli/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "node_modules/jest-cli/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+    "node_modules/jest-cli/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.19"
+        "node": ">=10"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/jest-cli/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+    "node_modules/jest-cli/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+    "node_modules/jest-config/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.2"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
       "dependencies": {
-        "is-typed-array": "^1.1.13"
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
       "engines": {
-        "node": ">=0.12.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dev": true,
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -2755,6 +5473,84 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -2767,6 +5563,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -2800,6 +5602,24 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -2813,10 +5633,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lexical": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/lexical/-/lexical-0.17.1.tgz",
-      "integrity": "sha512-72/MhR7jqmyqD10bmJw8gztlCm4KDDT+TPtU4elqXrEvHoO5XENi34YAEUD9gIkPfqSwyLa9mwAX1nKzIr5xEA=="
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/linkify-it": {
       "version": "5.0.0",
@@ -2886,6 +5707,12 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true
     },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -2898,6 +5725,57 @@
       "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
       "dev": true
     },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
     "node_modules/markdown-it": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
@@ -2933,6 +5811,54 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2972,6 +5898,18 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true
+    },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -3165,6 +6103,24 @@
         "which": "bin/which"
       }
     },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
+      "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
+      "dev": true
+    },
     "node_modules/object-inspect": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
@@ -3276,6 +6232,21 @@
         "wrappy": "1"
       }
     },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -3363,6 +6334,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3408,11 +6391,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -3441,6 +6428,79 @@
         "node": ">=4"
       }
     },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -3459,6 +6519,49 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -3476,6 +6579,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -3496,6 +6621,11 @@
         }
       ]
     },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
     "node_modules/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -3555,6 +6685,12 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -3572,6 +6708,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -3581,6 +6738,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3665,6 +6831,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "node_modules/sass": {
       "version": "1.78.0",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
@@ -3682,6 +6854,18 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -3777,6 +6961,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/snabbdom": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.2.tgz",
@@ -3790,6 +6994,15 @@
       "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.3.tgz",
       "integrity": "sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg=="
     },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
@@ -3799,6 +7012,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -3831,6 +7054,44 @@
       "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
       "dev": true
     },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -3954,6 +7215,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3975,7 +7245,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3995,17 +7264,51 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4013,6 +7316,157 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "29.2.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+      "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "^0.2.6",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "^2.1.0",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.6.3",
+        "yargs-parser": "^21.1.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/transform": "^29.0.0",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3 <6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/transform": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -4037,6 +7491,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -4155,6 +7618,50 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+    },
+    "node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -4164,6 +7671,36 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -4179,6 +7716,70 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
     },
+    "node_modules/w3c-xmlserializer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4312,6 +7913,19 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
     "node_modules/ws": {
       "version": "7.5.10",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
@@ -4333,12 +7947,33 @@
         }
       }
     },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
     "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
     "node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -4428,6 +8063,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index d39bf5a2cb2..163df34ed22 100644
--- a/package.json
+++ b/package.json
@@ -15,18 +15,24 @@
     "permissions": "chown -R $USER:$USER bootstrap/cache storage public/uploads",
     "lint": "eslint \"resources/**/*.js\" \"resources/**/*.mjs\"",
     "fix": "eslint --fix \"resources/**/*.js\" \"resources/**/*.mjs\"",
-    "ts:lint": "tsc --noEmit"
+    "ts:lint": "tsc --noEmit",
+    "test": "jest"
   },
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
+    "babel-jest": "^29.7.0",
     "chokidar-cli": "^3.0",
     "esbuild": "^0.20",
     "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "livereload": "^0.9.3",
     "npm-run-all": "^4.1.5",
     "sass": "^1.69.5",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   },
   "dependencies": {
@@ -43,20 +49,12 @@
     "@codemirror/state": "^6.3.3",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.22.2",
-    "@lexical/history": "^0.17.0",
-    "@lexical/html": "^0.17.0",
-    "@lexical/link": "^0.17.0",
-    "@lexical/list": "^0.17.0",
-    "@lexical/rich-text": "^0.17.0",
-    "@lexical/selection": "^0.17.0",
-    "@lexical/table": "^0.17.0",
-    "@lexical/utils": "^0.17.0",
     "@lezer/highlight": "^1.2.0",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
+    "@types/jest": "^29.5.13",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
-    "lexical": "^0.17.0",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.5.1",
diff --git a/resources/js/app.js b/resources/js/app.js
index e08b90ba1e4..7f4bbe54d63 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -4,6 +4,9 @@ import Translations from './services/translations';
 import * as componentMap from './components';
 import {ComponentStore} from './services/components.ts';
 
+// eslint-disable-next-line no-underscore-dangle
+window.__DEV__ = false;
+
 // Url retrieval function
 window.baseUrl = function baseUrl(path) {
     let targetPath = path;
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index 1f216b7a53c..0d7efc4d43c 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -3,10 +3,12 @@ import {EventManager} from "./services/events";
 import {HttpManager} from "./services/http";
 
 declare global {
+    const __DEV__: boolean;
+
     interface Window {
-        $components: ComponentStore,
-        $events: EventManager,
-        $http: HttpManager,
+        $components: ComponentStore;
+        $events: EventManager;
+        $http: HttpManager;
         baseUrl: (path: string) => string;
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/ORIGINAL-LEXICAL-LICENSE b/resources/js/wysiwyg/lexical/ORIGINAL-LEXICAL-LICENSE
new file mode 100644
index 00000000000..b93be90515c
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/ORIGINAL-LEXICAL-LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/resources/js/wysiwyg/lexical/clipboard/clipboard.ts b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
new file mode 100644
index 00000000000..1d79c2d7ba4
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
@@ -0,0 +1,542 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {$addNodeStyle, $sliceSelectedTextNodeContent} from '@lexical/selection';
+import {objectKlassEquals} from '@lexical/utils';
+import {
+  $cloneWithProperties,
+  $createTabNode,
+  $getEditor,
+  $getRoot,
+  $getSelection,
+  $isElementNode,
+  $isRangeSelection,
+  $isTextNode,
+  $parseSerializedNode,
+  BaseSelection,
+  COMMAND_PRIORITY_CRITICAL,
+  COPY_COMMAND,
+  isSelectionWithinEditor,
+  LexicalEditor,
+  LexicalNode,
+  SELECTION_INSERT_CLIPBOARD_NODES_COMMAND,
+  SerializedElementNode,
+  SerializedTextNode,
+} from 'lexical';
+import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
+import invariant from 'lexical/shared/invariant';
+
+const getDOMSelection = (targetWindow: Window | null): Selection | null =>
+  CAN_USE_DOM ? (targetWindow || window).getSelection() : null;
+
+export interface LexicalClipboardData {
+  'text/html'?: string | undefined;
+  'application/x-lexical-editor'?: string | undefined;
+  'text/plain': string;
+}
+
+/**
+ * Returns the *currently selected* Lexical content as an HTML string, relying on the
+ * logic defined in the exportDOM methods on the LexicalNode classes. Note that
+ * this will not return the HTML content of the entire editor (unless all the content is included
+ * in the current selection).
+ *
+ * @param editor - LexicalEditor instance to get HTML content from
+ * @param selection - The selection to use (default is $getSelection())
+ * @returns a string of HTML content
+ */
+export function $getHtmlContent(
+  editor: LexicalEditor,
+  selection = $getSelection(),
+): string {
+  if (selection == null) {
+    invariant(false, 'Expected valid LexicalSelection');
+  }
+
+  // If we haven't selected anything
+  if (
+    ($isRangeSelection(selection) && selection.isCollapsed()) ||
+    selection.getNodes().length === 0
+  ) {
+    return '';
+  }
+
+  return $generateHtmlFromNodes(editor, selection);
+}
+
+/**
+ * Returns the *currently selected* Lexical content as a JSON string, relying on the
+ * logic defined in the exportJSON methods on the LexicalNode classes. Note that
+ * this will not return the JSON content of the entire editor (unless all the content is included
+ * in the current selection).
+ *
+ * @param editor  - LexicalEditor instance to get the JSON content from
+ * @param selection - The selection to use (default is $getSelection())
+ * @returns
+ */
+export function $getLexicalContent(
+  editor: LexicalEditor,
+  selection = $getSelection(),
+): null | string {
+  if (selection == null) {
+    invariant(false, 'Expected valid LexicalSelection');
+  }
+
+  // If we haven't selected anything
+  if (
+    ($isRangeSelection(selection) && selection.isCollapsed()) ||
+    selection.getNodes().length === 0
+  ) {
+    return null;
+  }
+
+  return JSON.stringify($generateJSONFromSelectedNodes(editor, selection));
+}
+
+/**
+ * Attempts to insert content of the mime-types text/plain or text/uri-list from
+ * the provided DataTransfer object into the editor at the provided selection.
+ * text/uri-list is only used if text/plain is not also provided.
+ *
+ * @param dataTransfer an object conforming to the [DataTransfer interface] (https://html.spec.whatwg.org/multipage/dnd.html#the-datatransfer-interface)
+ * @param selection the selection to use as the insertion point for the content in the DataTransfer object
+ */
+export function $insertDataTransferForPlainText(
+  dataTransfer: DataTransfer,
+  selection: BaseSelection,
+): void {
+  const text =
+    dataTransfer.getData('text/plain') || dataTransfer.getData('text/uri-list');
+
+  if (text != null) {
+    selection.insertRawText(text);
+  }
+}
+
+/**
+ * Attempts to insert content of the mime-types application/x-lexical-editor, text/html,
+ * text/plain, or text/uri-list (in descending order of priority) from the provided DataTransfer
+ * object into the editor at the provided selection.
+ *
+ * @param dataTransfer an object conforming to the [DataTransfer interface] (https://html.spec.whatwg.org/multipage/dnd.html#the-datatransfer-interface)
+ * @param selection the selection to use as the insertion point for the content in the DataTransfer object
+ * @param editor the LexicalEditor the content is being inserted into.
+ */
+export function $insertDataTransferForRichText(
+  dataTransfer: DataTransfer,
+  selection: BaseSelection,
+  editor: LexicalEditor,
+): void {
+  const lexicalString = dataTransfer.getData('application/x-lexical-editor');
+
+  if (lexicalString) {
+    try {
+      const payload = JSON.parse(lexicalString);
+      if (
+        payload.namespace === editor._config.namespace &&
+        Array.isArray(payload.nodes)
+      ) {
+        const nodes = $generateNodesFromSerializedNodes(payload.nodes);
+        return $insertGeneratedNodes(editor, nodes, selection);
+      }
+    } catch {
+      // Fail silently.
+    }
+  }
+
+  const htmlString = dataTransfer.getData('text/html');
+  if (htmlString) {
+    try {
+      const parser = new DOMParser();
+      const dom = parser.parseFromString(htmlString, 'text/html');
+      const nodes = $generateNodesFromDOM(editor, dom);
+      return $insertGeneratedNodes(editor, nodes, selection);
+    } catch {
+      // Fail silently.
+    }
+  }
+
+  // Multi-line plain text in rich text mode pasted as separate paragraphs
+  // instead of single paragraph with linebreaks.
+  // Webkit-specific: Supports read 'text/uri-list' in clipboard.
+  const text =
+    dataTransfer.getData('text/plain') || dataTransfer.getData('text/uri-list');
+  if (text != null) {
+    if ($isRangeSelection(selection)) {
+      const parts = text.split(/(\r?\n|\t)/);
+      if (parts[parts.length - 1] === '') {
+        parts.pop();
+      }
+      for (let i = 0; i < parts.length; i++) {
+        const currentSelection = $getSelection();
+        if ($isRangeSelection(currentSelection)) {
+          const part = parts[i];
+          if (part === '\n' || part === '\r\n') {
+            currentSelection.insertParagraph();
+          } else if (part === '\t') {
+            currentSelection.insertNodes([$createTabNode()]);
+          } else {
+            currentSelection.insertText(part);
+          }
+        }
+      }
+    } else {
+      selection.insertRawText(text);
+    }
+  }
+}
+
+/**
+ * Inserts Lexical nodes into the editor using different strategies depending on
+ * some simple selection-based heuristics. If you're looking for a generic way to
+ * to insert nodes into the editor at a specific selection point, you probably want
+ * {@link lexical.$insertNodes}
+ *
+ * @param editor LexicalEditor instance to insert the nodes into.
+ * @param nodes The nodes to insert.
+ * @param selection The selection to insert the nodes into.
+ */
+export function $insertGeneratedNodes(
+  editor: LexicalEditor,
+  nodes: Array<LexicalNode>,
+  selection: BaseSelection,
+): void {
+  if (
+    !editor.dispatchCommand(SELECTION_INSERT_CLIPBOARD_NODES_COMMAND, {
+      nodes,
+      selection,
+    })
+  ) {
+    selection.insertNodes(nodes);
+  }
+  return;
+}
+
+export interface BaseSerializedNode {
+  children?: Array<BaseSerializedNode>;
+  type: string;
+  version: number;
+}
+
+function exportNodeToJSON<T extends LexicalNode>(node: T): BaseSerializedNode {
+  const serializedNode = node.exportJSON();
+  const nodeClass = node.constructor;
+
+  if (serializedNode.type !== nodeClass.getType()) {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .exportJSON().',
+      nodeClass.name,
+    );
+  }
+
+  if ($isElementNode(node)) {
+    const serializedChildren = (serializedNode as SerializedElementNode)
+      .children;
+    if (!Array.isArray(serializedChildren)) {
+      invariant(
+        false,
+        'LexicalNode: Node %s is an element but .exportJSON() does not have a children array.',
+        nodeClass.name,
+      );
+    }
+  }
+
+  return serializedNode;
+}
+
+function $appendNodesToJSON(
+  editor: LexicalEditor,
+  selection: BaseSelection | null,
+  currentNode: LexicalNode,
+  targetArray: Array<BaseSerializedNode> = [],
+): boolean {
+  let shouldInclude =
+    selection !== null ? currentNode.isSelected(selection) : true;
+  const shouldExclude =
+    $isElementNode(currentNode) && currentNode.excludeFromCopy('html');
+  let target = currentNode;
+
+  if (selection !== null) {
+    let clone = $cloneWithProperties(currentNode);
+    clone =
+      $isTextNode(clone) && selection !== null
+        ? $sliceSelectedTextNodeContent(selection, clone)
+        : clone;
+    target = clone;
+  }
+  const children = $isElementNode(target) ? target.getChildren() : [];
+
+  const serializedNode = exportNodeToJSON(target);
+
+  // TODO: TextNode calls getTextContent() (NOT node.__text) within its exportJSON method
+  // which uses getLatest() to get the text from the original node with the same key.
+  // This is a deeper issue with the word "clone" here, it's still a reference to the
+  // same node as far as the LexicalEditor is concerned since it shares a key.
+  // We need a way to create a clone of a Node in memory with its own key, but
+  // until then this hack will work for the selected text extract use case.
+  if ($isTextNode(target)) {
+    const text = target.__text;
+    // If an uncollapsed selection ends or starts at the end of a line of specialized,
+    // TextNodes, such as code tokens, we will get a 'blank' TextNode here, i.e., one
+    // with text of length 0. We don't want this, it makes a confusing mess. Reset!
+    if (text.length > 0) {
+      (serializedNode as SerializedTextNode).text = text;
+    } else {
+      shouldInclude = false;
+    }
+  }
+
+  for (let i = 0; i < children.length; i++) {
+    const childNode = children[i];
+    const shouldIncludeChild = $appendNodesToJSON(
+      editor,
+      selection,
+      childNode,
+      serializedNode.children,
+    );
+
+    if (
+      !shouldInclude &&
+      $isElementNode(currentNode) &&
+      shouldIncludeChild &&
+      currentNode.extractWithChild(childNode, selection, 'clone')
+    ) {
+      shouldInclude = true;
+    }
+  }
+
+  if (shouldInclude && !shouldExclude) {
+    targetArray.push(serializedNode);
+  } else if (Array.isArray(serializedNode.children)) {
+    for (let i = 0; i < serializedNode.children.length; i++) {
+      const serializedChildNode = serializedNode.children[i];
+      targetArray.push(serializedChildNode);
+    }
+  }
+
+  return shouldInclude;
+}
+
+// TODO why $ function with Editor instance?
+/**
+ * Gets the Lexical JSON of the nodes inside the provided Selection.
+ *
+ * @param editor LexicalEditor to get the JSON content from.
+ * @param selection Selection to get the JSON content from.
+ * @returns an object with the editor namespace and a list of serializable nodes as JavaScript objects.
+ */
+export function $generateJSONFromSelectedNodes<
+  SerializedNode extends BaseSerializedNode,
+>(
+  editor: LexicalEditor,
+  selection: BaseSelection | null,
+): {
+  namespace: string;
+  nodes: Array<SerializedNode>;
+} {
+  const nodes: Array<SerializedNode> = [];
+  const root = $getRoot();
+  const topLevelChildren = root.getChildren();
+  for (let i = 0; i < topLevelChildren.length; i++) {
+    const topLevelNode = topLevelChildren[i];
+    $appendNodesToJSON(editor, selection, topLevelNode, nodes);
+  }
+  return {
+    namespace: editor._config.namespace,
+    nodes,
+  };
+}
+
+/**
+ * This method takes an array of objects conforming to the BaseSeralizedNode interface and returns
+ * an Array containing instances of the corresponding LexicalNode classes registered on the editor.
+ * Normally, you'd get an Array of BaseSerialized nodes from {@link $generateJSONFromSelectedNodes}
+ *
+ * @param serializedNodes an Array of objects conforming to the BaseSerializedNode interface.
+ * @returns an Array of Lexical Node objects.
+ */
+export function $generateNodesFromSerializedNodes(
+  serializedNodes: Array<BaseSerializedNode>,
+): Array<LexicalNode> {
+  const nodes = [];
+  for (let i = 0; i < serializedNodes.length; i++) {
+    const serializedNode = serializedNodes[i];
+    const node = $parseSerializedNode(serializedNode);
+    if ($isTextNode(node)) {
+      $addNodeStyle(node);
+    }
+    nodes.push(node);
+  }
+  return nodes;
+}
+
+const EVENT_LATENCY = 50;
+let clipboardEventTimeout: null | number = null;
+
+// TODO custom selection
+// TODO potentially have a node customizable version for plain text
+/**
+ * Copies the content of the current selection to the clipboard in
+ * text/plain, text/html, and application/x-lexical-editor (Lexical JSON)
+ * formats.
+ *
+ * @param editor the LexicalEditor instance to copy content from
+ * @param event the native browser ClipboardEvent to add the content to.
+ * @returns
+ */
+export async function copyToClipboard(
+  editor: LexicalEditor,
+  event: null | ClipboardEvent,
+  data?: LexicalClipboardData,
+): Promise<boolean> {
+  if (clipboardEventTimeout !== null) {
+    // Prevent weird race conditions that can happen when this function is run multiple times
+    // synchronously. In the future, we can do better, we can cancel/override the previously running job.
+    return false;
+  }
+  if (event !== null) {
+    return new Promise((resolve, reject) => {
+      editor.update(() => {
+        resolve($copyToClipboardEvent(editor, event, data));
+      });
+    });
+  }
+
+  const rootElement = editor.getRootElement();
+  const windowDocument =
+    editor._window == null ? window.document : editor._window.document;
+  const domSelection = getDOMSelection(editor._window);
+  if (rootElement === null || domSelection === null) {
+    return false;
+  }
+  const element = windowDocument.createElement('span');
+  element.style.cssText = 'position: fixed; top: -1000px;';
+  element.append(windowDocument.createTextNode('#'));
+  rootElement.append(element);
+  const range = new Range();
+  range.setStart(element, 0);
+  range.setEnd(element, 1);
+  domSelection.removeAllRanges();
+  domSelection.addRange(range);
+  return new Promise((resolve, reject) => {
+    const removeListener = editor.registerCommand(
+      COPY_COMMAND,
+      (secondEvent) => {
+        if (objectKlassEquals(secondEvent, ClipboardEvent)) {
+          removeListener();
+          if (clipboardEventTimeout !== null) {
+            window.clearTimeout(clipboardEventTimeout);
+            clipboardEventTimeout = null;
+          }
+          resolve(
+            $copyToClipboardEvent(editor, secondEvent as ClipboardEvent, data),
+          );
+        }
+        // Block the entire copy flow while we wait for the next ClipboardEvent
+        return true;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    );
+    // If the above hack execCommand hack works, this timeout code should never fire. Otherwise,
+    // the listener will be quickly freed so that the user can reuse it again
+    clipboardEventTimeout = window.setTimeout(() => {
+      removeListener();
+      clipboardEventTimeout = null;
+      resolve(false);
+    }, EVENT_LATENCY);
+    windowDocument.execCommand('copy');
+    element.remove();
+  });
+}
+
+// TODO shouldn't pass editor (pass namespace directly)
+function $copyToClipboardEvent(
+  editor: LexicalEditor,
+  event: ClipboardEvent,
+  data?: LexicalClipboardData,
+): boolean {
+  if (data === undefined) {
+    const domSelection = getDOMSelection(editor._window);
+    if (!domSelection) {
+      return false;
+    }
+    const anchorDOM = domSelection.anchorNode;
+    const focusDOM = domSelection.focusNode;
+    if (
+      anchorDOM !== null &&
+      focusDOM !== null &&
+      !isSelectionWithinEditor(editor, anchorDOM, focusDOM)
+    ) {
+      return false;
+    }
+    const selection = $getSelection();
+    if (selection === null) {
+      return false;
+    }
+    data = $getClipboardDataFromSelection(selection);
+  }
+  event.preventDefault();
+  const clipboardData = event.clipboardData;
+  if (clipboardData === null) {
+    return false;
+  }
+  setLexicalClipboardDataTransfer(clipboardData, data);
+  return true;
+}
+
+const clipboardDataFunctions = [
+  ['text/html', $getHtmlContent],
+  ['application/x-lexical-editor', $getLexicalContent],
+] as const;
+
+/**
+ * Serialize the content of the current selection to strings in
+ * text/plain, text/html, and application/x-lexical-editor (Lexical JSON)
+ * formats (as available).
+ *
+ * @param selection the selection to serialize (defaults to $getSelection())
+ * @returns LexicalClipboardData
+ */
+export function $getClipboardDataFromSelection(
+  selection: BaseSelection | null = $getSelection(),
+): LexicalClipboardData {
+  const clipboardData: LexicalClipboardData = {
+    'text/plain': selection ? selection.getTextContent() : '',
+  };
+  if (selection) {
+    const editor = $getEditor();
+    for (const [mimeType, $editorFn] of clipboardDataFunctions) {
+      const v = $editorFn(editor, selection);
+      if (v !== null) {
+        clipboardData[mimeType] = v;
+      }
+    }
+  }
+  return clipboardData;
+}
+
+/**
+ * Call setData on the given clipboardData for each MIME type present
+ * in the given data (from {@link $getClipboardDataFromSelection})
+ *
+ * @param clipboardData the event.clipboardData to populate from data
+ * @param data The lexical data
+ */
+export function setLexicalClipboardDataTransfer(
+  clipboardData: DataTransfer,
+  data: LexicalClipboardData,
+) {
+  for (const k in data) {
+    const v = data[k as keyof LexicalClipboardData];
+    if (v !== undefined) {
+      clipboardData.setData(k, v);
+    }
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/clipboard/index.ts b/resources/js/wysiwyg/lexical/clipboard/index.ts
new file mode 100644
index 00000000000..ffa1f19f6ac
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/clipboard/index.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export {
+  $generateJSONFromSelectedNodes,
+  $generateNodesFromSerializedNodes,
+  $getClipboardDataFromSelection,
+  $getHtmlContent,
+  $getLexicalContent,
+  $insertDataTransferForPlainText,
+  $insertDataTransferForRichText,
+  $insertGeneratedNodes,
+  copyToClipboard,
+  type LexicalClipboardData,
+  setLexicalClipboardDataTransfer,
+} from './clipboard';
diff --git a/resources/js/wysiwyg/lexical/core/LexicalCommands.ts b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
new file mode 100644
index 00000000000..0f1c0a5d31e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  BaseSelection,
+  ElementFormatType,
+  LexicalCommand,
+  LexicalNode,
+  TextFormatType,
+} from 'lexical';
+
+export type PasteCommandType = ClipboardEvent | InputEvent | KeyboardEvent;
+
+export function createCommand<T>(type?: string): LexicalCommand<T> {
+  return __DEV__ ? {type} : {};
+}
+
+export const SELECTION_CHANGE_COMMAND: LexicalCommand<void> = createCommand(
+  'SELECTION_CHANGE_COMMAND',
+);
+export const SELECTION_INSERT_CLIPBOARD_NODES_COMMAND: LexicalCommand<{
+  nodes: Array<LexicalNode>;
+  selection: BaseSelection;
+}> = createCommand('SELECTION_INSERT_CLIPBOARD_NODES_COMMAND');
+export const CLICK_COMMAND: LexicalCommand<MouseEvent> =
+  createCommand('CLICK_COMMAND');
+export const DELETE_CHARACTER_COMMAND: LexicalCommand<boolean> = createCommand(
+  'DELETE_CHARACTER_COMMAND',
+);
+export const INSERT_LINE_BREAK_COMMAND: LexicalCommand<boolean> = createCommand(
+  'INSERT_LINE_BREAK_COMMAND',
+);
+export const INSERT_PARAGRAPH_COMMAND: LexicalCommand<void> = createCommand(
+  'INSERT_PARAGRAPH_COMMAND',
+);
+export const CONTROLLED_TEXT_INSERTION_COMMAND: LexicalCommand<
+  InputEvent | string
+> = createCommand('CONTROLLED_TEXT_INSERTION_COMMAND');
+export const PASTE_COMMAND: LexicalCommand<PasteCommandType> =
+  createCommand('PASTE_COMMAND');
+export const REMOVE_TEXT_COMMAND: LexicalCommand<InputEvent | null> =
+  createCommand('REMOVE_TEXT_COMMAND');
+export const DELETE_WORD_COMMAND: LexicalCommand<boolean> = createCommand(
+  'DELETE_WORD_COMMAND',
+);
+export const DELETE_LINE_COMMAND: LexicalCommand<boolean> = createCommand(
+  'DELETE_LINE_COMMAND',
+);
+export const FORMAT_TEXT_COMMAND: LexicalCommand<TextFormatType> =
+  createCommand('FORMAT_TEXT_COMMAND');
+export const UNDO_COMMAND: LexicalCommand<void> = createCommand('UNDO_COMMAND');
+export const REDO_COMMAND: LexicalCommand<void> = createCommand('REDO_COMMAND');
+export const KEY_DOWN_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEYDOWN_COMMAND');
+export const KEY_ARROW_RIGHT_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_ARROW_RIGHT_COMMAND');
+export const MOVE_TO_END: LexicalCommand<KeyboardEvent> =
+  createCommand('MOVE_TO_END');
+export const KEY_ARROW_LEFT_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_ARROW_LEFT_COMMAND');
+export const MOVE_TO_START: LexicalCommand<KeyboardEvent> =
+  createCommand('MOVE_TO_START');
+export const KEY_ARROW_UP_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_ARROW_UP_COMMAND');
+export const KEY_ARROW_DOWN_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_ARROW_DOWN_COMMAND');
+export const KEY_ENTER_COMMAND: LexicalCommand<KeyboardEvent | null> =
+  createCommand('KEY_ENTER_COMMAND');
+export const KEY_SPACE_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_SPACE_COMMAND');
+export const KEY_BACKSPACE_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_BACKSPACE_COMMAND');
+export const KEY_ESCAPE_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_ESCAPE_COMMAND');
+export const KEY_DELETE_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_DELETE_COMMAND');
+export const KEY_TAB_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_TAB_COMMAND');
+export const INSERT_TAB_COMMAND: LexicalCommand<void> =
+  createCommand('INSERT_TAB_COMMAND');
+export const INDENT_CONTENT_COMMAND: LexicalCommand<void> = createCommand(
+  'INDENT_CONTENT_COMMAND',
+);
+export const OUTDENT_CONTENT_COMMAND: LexicalCommand<void> = createCommand(
+  'OUTDENT_CONTENT_COMMAND',
+);
+export const DROP_COMMAND: LexicalCommand<DragEvent> =
+  createCommand('DROP_COMMAND');
+export const FORMAT_ELEMENT_COMMAND: LexicalCommand<ElementFormatType> =
+  createCommand('FORMAT_ELEMENT_COMMAND');
+export const DRAGSTART_COMMAND: LexicalCommand<DragEvent> =
+  createCommand('DRAGSTART_COMMAND');
+export const DRAGOVER_COMMAND: LexicalCommand<DragEvent> =
+  createCommand('DRAGOVER_COMMAND');
+export const DRAGEND_COMMAND: LexicalCommand<DragEvent> =
+  createCommand('DRAGEND_COMMAND');
+export const COPY_COMMAND: LexicalCommand<
+  ClipboardEvent | KeyboardEvent | null
+> = createCommand('COPY_COMMAND');
+export const CUT_COMMAND: LexicalCommand<
+  ClipboardEvent | KeyboardEvent | null
+> = createCommand('CUT_COMMAND');
+export const SELECT_ALL_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('SELECT_ALL_COMMAND');
+export const CLEAR_EDITOR_COMMAND: LexicalCommand<void> = createCommand(
+  'CLEAR_EDITOR_COMMAND',
+);
+export const CLEAR_HISTORY_COMMAND: LexicalCommand<void> = createCommand(
+  'CLEAR_HISTORY_COMMAND',
+);
+export const CAN_REDO_COMMAND: LexicalCommand<boolean> =
+  createCommand('CAN_REDO_COMMAND');
+export const CAN_UNDO_COMMAND: LexicalCommand<boolean> =
+  createCommand('CAN_UNDO_COMMAND');
+export const FOCUS_COMMAND: LexicalCommand<FocusEvent> =
+  createCommand('FOCUS_COMMAND');
+export const BLUR_COMMAND: LexicalCommand<FocusEvent> =
+  createCommand('BLUR_COMMAND');
+export const KEY_MODIFIER_COMMAND: LexicalCommand<KeyboardEvent> =
+  createCommand('KEY_MODIFIER_COMMAND');
diff --git a/resources/js/wysiwyg/lexical/core/LexicalConstants.ts b/resources/js/wysiwyg/lexical/core/LexicalConstants.ts
new file mode 100644
index 00000000000..82461e74d95
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalConstants.ts
@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {ElementFormatType} from './nodes/LexicalElementNode';
+import type {
+  TextDetailType,
+  TextFormatType,
+  TextModeType,
+} from './nodes/LexicalTextNode';
+
+import {
+  IS_APPLE_WEBKIT,
+  IS_FIREFOX,
+  IS_IOS,
+  IS_SAFARI,
+} from 'lexical/shared/environment';
+
+// DOM
+export const DOM_ELEMENT_TYPE = 1;
+export const DOM_TEXT_TYPE = 3;
+
+// Reconciling
+export const NO_DIRTY_NODES = 0;
+export const HAS_DIRTY_NODES = 1;
+export const FULL_RECONCILE = 2;
+
+// Text node modes
+export const IS_NORMAL = 0;
+export const IS_TOKEN = 1;
+export const IS_SEGMENTED = 2;
+// IS_INERT = 3
+
+// Text node formatting
+export const IS_BOLD = 1;
+export const IS_ITALIC = 1 << 1;
+export const IS_STRIKETHROUGH = 1 << 2;
+export const IS_UNDERLINE = 1 << 3;
+export const IS_CODE = 1 << 4;
+export const IS_SUBSCRIPT = 1 << 5;
+export const IS_SUPERSCRIPT = 1 << 6;
+export const IS_HIGHLIGHT = 1 << 7;
+
+export const IS_ALL_FORMATTING =
+  IS_BOLD |
+  IS_ITALIC |
+  IS_STRIKETHROUGH |
+  IS_UNDERLINE |
+  IS_CODE |
+  IS_SUBSCRIPT |
+  IS_SUPERSCRIPT |
+  IS_HIGHLIGHT;
+
+// Text node details
+export const IS_DIRECTIONLESS = 1;
+export const IS_UNMERGEABLE = 1 << 1;
+
+// Element node formatting
+export const IS_ALIGN_LEFT = 1;
+export const IS_ALIGN_CENTER = 2;
+export const IS_ALIGN_RIGHT = 3;
+export const IS_ALIGN_JUSTIFY = 4;
+export const IS_ALIGN_START = 5;
+export const IS_ALIGN_END = 6;
+
+// Reconciliation
+export const NON_BREAKING_SPACE = '\u00A0';
+const ZERO_WIDTH_SPACE = '\u200b';
+
+// For iOS/Safari we use a non breaking space, otherwise the cursor appears
+// overlapping the composed text.
+export const COMPOSITION_SUFFIX: string =
+  IS_SAFARI || IS_IOS || IS_APPLE_WEBKIT
+    ? NON_BREAKING_SPACE
+    : ZERO_WIDTH_SPACE;
+export const DOUBLE_LINE_BREAK = '\n\n';
+
+// For FF, we need to use a non-breaking space, or it gets composition
+// in a stuck state.
+export const COMPOSITION_START_CHAR: string = IS_FIREFOX
+  ? NON_BREAKING_SPACE
+  : COMPOSITION_SUFFIX;
+const RTL = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC';
+const LTR =
+  'A-Za-z\u00C0-\u00D6\u00D8-\u00F6' +
+  '\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF\u200E\u2C00-\uFB1C' +
+  '\uFE00-\uFE6F\uFEFD-\uFFFF';
+
+// eslint-disable-next-line no-misleading-character-class
+export const RTL_REGEX = new RegExp('^[^' + LTR + ']*[' + RTL + ']');
+// eslint-disable-next-line no-misleading-character-class
+export const LTR_REGEX = new RegExp('^[^' + RTL + ']*[' + LTR + ']');
+
+export const TEXT_TYPE_TO_FORMAT: Record<TextFormatType | string, number> = {
+  bold: IS_BOLD,
+  code: IS_CODE,
+  highlight: IS_HIGHLIGHT,
+  italic: IS_ITALIC,
+  strikethrough: IS_STRIKETHROUGH,
+  subscript: IS_SUBSCRIPT,
+  superscript: IS_SUPERSCRIPT,
+  underline: IS_UNDERLINE,
+};
+
+export const DETAIL_TYPE_TO_DETAIL: Record<TextDetailType | string, number> = {
+  directionless: IS_DIRECTIONLESS,
+  unmergeable: IS_UNMERGEABLE,
+};
+
+export const ELEMENT_TYPE_TO_FORMAT: Record<
+  Exclude<ElementFormatType, ''>,
+  number
+> = {
+  center: IS_ALIGN_CENTER,
+  end: IS_ALIGN_END,
+  justify: IS_ALIGN_JUSTIFY,
+  left: IS_ALIGN_LEFT,
+  right: IS_ALIGN_RIGHT,
+  start: IS_ALIGN_START,
+};
+
+export const ELEMENT_FORMAT_TO_TYPE: Record<number, ElementFormatType> = {
+  [IS_ALIGN_CENTER]: 'center',
+  [IS_ALIGN_END]: 'end',
+  [IS_ALIGN_JUSTIFY]: 'justify',
+  [IS_ALIGN_LEFT]: 'left',
+  [IS_ALIGN_RIGHT]: 'right',
+  [IS_ALIGN_START]: 'start',
+};
+
+export const TEXT_MODE_TO_TYPE: Record<TextModeType, 0 | 1 | 2> = {
+  normal: IS_NORMAL,
+  segmented: IS_SEGMENTED,
+  token: IS_TOKEN,
+};
+
+export const TEXT_TYPE_TO_MODE: Record<number, TextModeType> = {
+  [IS_NORMAL]: 'normal',
+  [IS_SEGMENTED]: 'segmented',
+  [IS_TOKEN]: 'token',
+};
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
new file mode 100644
index 00000000000..b0b90002eaa
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
@@ -0,0 +1,1289 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {EditorState, SerializedEditorState} from './LexicalEditorState';
+import type {
+  DOMConversion,
+  DOMConversionMap,
+  DOMExportOutput,
+  DOMExportOutputMap,
+  NodeKey,
+} from './LexicalNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {$getRoot, $getSelection, TextNode} from '.';
+import {FULL_RECONCILE, NO_DIRTY_NODES} from './LexicalConstants';
+import {createEmptyEditorState} from './LexicalEditorState';
+import {addRootElementEvents, removeRootElementEvents} from './LexicalEvents';
+import {$flushRootMutations, initMutationObserver} from './LexicalMutations';
+import {LexicalNode} from './LexicalNode';
+import {
+  $commitPendingUpdates,
+  internalGetActiveEditor,
+  parseEditorState,
+  triggerListeners,
+  updateEditor,
+} from './LexicalUpdates';
+import {
+  createUID,
+  dispatchCommand,
+  getCachedClassNameArray,
+  getCachedTypeToNodeMap,
+  getDefaultView,
+  getDOMSelection,
+  markAllNodesAsDirty,
+} from './LexicalUtils';
+import {ArtificialNode__DO_NOT_USE} from './nodes/ArtificialNode';
+import {DecoratorNode} from './nodes/LexicalDecoratorNode';
+import {LineBreakNode} from './nodes/LexicalLineBreakNode';
+import {ParagraphNode} from './nodes/LexicalParagraphNode';
+import {RootNode} from './nodes/LexicalRootNode';
+import {TabNode} from './nodes/LexicalTabNode';
+
+export type Spread<T1, T2> = Omit<T2, keyof T1> & T1;
+
+// https://github.com/microsoft/TypeScript/issues/3841
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type KlassConstructor<Cls extends GenericConstructor<any>> =
+  GenericConstructor<InstanceType<Cls>> & {[k in keyof Cls]: Cls[k]};
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type GenericConstructor<T> = new (...args: any[]) => T;
+
+export type Klass<T extends LexicalNode> = InstanceType<
+  T['constructor']
+> extends T
+  ? T['constructor']
+  : GenericConstructor<T> & T['constructor'];
+
+export type EditorThemeClassName = string;
+
+export type TextNodeThemeClasses = {
+  base?: EditorThemeClassName;
+  bold?: EditorThemeClassName;
+  code?: EditorThemeClassName;
+  highlight?: EditorThemeClassName;
+  italic?: EditorThemeClassName;
+  strikethrough?: EditorThemeClassName;
+  subscript?: EditorThemeClassName;
+  superscript?: EditorThemeClassName;
+  underline?: EditorThemeClassName;
+  underlineStrikethrough?: EditorThemeClassName;
+  [key: string]: EditorThemeClassName | undefined;
+};
+
+export type EditorUpdateOptions = {
+  onUpdate?: () => void;
+  skipTransforms?: true;
+  tag?: string;
+  discrete?: true;
+};
+
+export type EditorSetOptions = {
+  tag?: string;
+};
+
+export type EditorFocusOptions = {
+  defaultSelection?: 'rootStart' | 'rootEnd';
+};
+
+export type EditorThemeClasses = {
+  blockCursor?: EditorThemeClassName;
+  characterLimit?: EditorThemeClassName;
+  code?: EditorThemeClassName;
+  codeHighlight?: Record<string, EditorThemeClassName>;
+  hashtag?: EditorThemeClassName;
+  heading?: {
+    h1?: EditorThemeClassName;
+    h2?: EditorThemeClassName;
+    h3?: EditorThemeClassName;
+    h4?: EditorThemeClassName;
+    h5?: EditorThemeClassName;
+    h6?: EditorThemeClassName;
+  };
+  hr?: EditorThemeClassName;
+  image?: EditorThemeClassName;
+  link?: EditorThemeClassName;
+  list?: {
+    ul?: EditorThemeClassName;
+    ulDepth?: Array<EditorThemeClassName>;
+    ol?: EditorThemeClassName;
+    olDepth?: Array<EditorThemeClassName>;
+    checklist?: EditorThemeClassName;
+    listitem?: EditorThemeClassName;
+    listitemChecked?: EditorThemeClassName;
+    listitemUnchecked?: EditorThemeClassName;
+    nested?: {
+      list?: EditorThemeClassName;
+      listitem?: EditorThemeClassName;
+    };
+  };
+  ltr?: EditorThemeClassName;
+  mark?: EditorThemeClassName;
+  markOverlap?: EditorThemeClassName;
+  paragraph?: EditorThemeClassName;
+  quote?: EditorThemeClassName;
+  root?: EditorThemeClassName;
+  rtl?: EditorThemeClassName;
+  table?: EditorThemeClassName;
+  tableAddColumns?: EditorThemeClassName;
+  tableAddRows?: EditorThemeClassName;
+  tableCellActionButton?: EditorThemeClassName;
+  tableCellActionButtonContainer?: EditorThemeClassName;
+  tableCellPrimarySelected?: EditorThemeClassName;
+  tableCellSelected?: EditorThemeClassName;
+  tableCell?: EditorThemeClassName;
+  tableCellEditing?: EditorThemeClassName;
+  tableCellHeader?: EditorThemeClassName;
+  tableCellResizer?: EditorThemeClassName;
+  tableCellSortedIndicator?: EditorThemeClassName;
+  tableResizeRuler?: EditorThemeClassName;
+  tableRow?: EditorThemeClassName;
+  tableSelected?: EditorThemeClassName;
+  text?: TextNodeThemeClasses;
+  embedBlock?: {
+    base?: EditorThemeClassName;
+    focus?: EditorThemeClassName;
+  };
+  indent?: EditorThemeClassName;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string]: any;
+};
+
+export type EditorConfig = {
+  disableEvents?: boolean;
+  namespace: string;
+  theme: EditorThemeClasses;
+};
+
+export type LexicalNodeReplacement = {
+  replace: Klass<LexicalNode>;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  with: <T extends {new (...args: any): any}>(
+    node: InstanceType<T>,
+  ) => LexicalNode;
+  withKlass?: Klass<LexicalNode>;
+};
+
+export type HTMLConfig = {
+  export?: DOMExportOutputMap;
+  import?: DOMConversionMap;
+};
+
+export type CreateEditorArgs = {
+  disableEvents?: boolean;
+  editorState?: EditorState;
+  namespace?: string;
+  nodes?: ReadonlyArray<Klass<LexicalNode> | LexicalNodeReplacement>;
+  onError?: ErrorHandler;
+  parentEditor?: LexicalEditor;
+  editable?: boolean;
+  theme?: EditorThemeClasses;
+  html?: HTMLConfig;
+};
+
+export type RegisteredNodes = Map<string, RegisteredNode>;
+
+export type RegisteredNode = {
+  klass: Klass<LexicalNode>;
+  transforms: Set<Transform<LexicalNode>>;
+  replace: null | ((node: LexicalNode) => LexicalNode);
+  replaceWithKlass: null | Klass<LexicalNode>;
+  exportDOM?: (
+    editor: LexicalEditor,
+    targetNode: LexicalNode,
+  ) => DOMExportOutput;
+};
+
+export type Transform<T extends LexicalNode> = (node: T) => void;
+
+export type ErrorHandler = (error: Error) => void;
+
+export type MutationListeners = Map<MutationListener, Klass<LexicalNode>>;
+
+export type MutatedNodes = Map<Klass<LexicalNode>, Map<NodeKey, NodeMutation>>;
+
+export type NodeMutation = 'created' | 'updated' | 'destroyed';
+
+export interface MutationListenerOptions {
+  /**
+   * Skip the initial call of the listener with pre-existing DOM nodes.
+   *
+   * The default is currently true for backwards compatibility with <= 0.16.1
+   * but this default is expected to change to false in 0.17.0.
+   */
+  skipInitialization?: boolean;
+}
+
+const DEFAULT_SKIP_INITIALIZATION = true;
+
+export type UpdateListener = (arg0: {
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>;
+  dirtyLeaves: Set<NodeKey>;
+  editorState: EditorState;
+  normalizedNodes: Set<NodeKey>;
+  prevEditorState: EditorState;
+  tags: Set<string>;
+}) => void;
+
+export type DecoratorListener<T = never> = (
+  decorator: Record<NodeKey, T>,
+) => void;
+
+export type RootListener = (
+  rootElement: null | HTMLElement,
+  prevRootElement: null | HTMLElement,
+) => void;
+
+export type TextContentListener = (text: string) => void;
+
+export type MutationListener = (
+  nodes: Map<NodeKey, NodeMutation>,
+  payload: {
+    updateTags: Set<string>;
+    dirtyLeaves: Set<string>;
+    prevEditorState: EditorState;
+  },
+) => void;
+
+export type CommandListener<P> = (payload: P, editor: LexicalEditor) => boolean;
+
+export type EditableListener = (editable: boolean) => void;
+
+export type CommandListenerPriority = 0 | 1 | 2 | 3 | 4;
+
+export const COMMAND_PRIORITY_EDITOR = 0;
+export const COMMAND_PRIORITY_LOW = 1;
+export const COMMAND_PRIORITY_NORMAL = 2;
+export const COMMAND_PRIORITY_HIGH = 3;
+export const COMMAND_PRIORITY_CRITICAL = 4;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export type LexicalCommand<TPayload> = {
+  type?: string;
+};
+
+/**
+ * Type helper for extracting the payload type from a command.
+ *
+ * @example
+ * ```ts
+ * const MY_COMMAND = createCommand<SomeType>();
+ *
+ * // ...
+ *
+ * editor.registerCommand(MY_COMMAND, payload => {
+ *   // Type of `payload` is inferred here. But lets say we want to extract a function to delegate to
+ *   handleMyCommand(editor, payload);
+ *   return true;
+ * });
+ *
+ * function handleMyCommand(editor: LexicalEditor, payload: CommandPayloadType<typeof MY_COMMAND>) {
+ *   // `payload` is of type `SomeType`, extracted from the command.
+ * }
+ * ```
+ */
+export type CommandPayloadType<TCommand extends LexicalCommand<unknown>> =
+  TCommand extends LexicalCommand<infer TPayload> ? TPayload : never;
+
+type Commands = Map<
+  LexicalCommand<unknown>,
+  Array<Set<CommandListener<unknown>>>
+>;
+type Listeners = {
+  decorator: Set<DecoratorListener>;
+  mutation: MutationListeners;
+  editable: Set<EditableListener>;
+  root: Set<RootListener>;
+  textcontent: Set<TextContentListener>;
+  update: Set<UpdateListener>;
+};
+
+export type Listener =
+  | DecoratorListener
+  | EditableListener
+  | MutationListener
+  | RootListener
+  | TextContentListener
+  | UpdateListener;
+
+export type ListenerType =
+  | 'update'
+  | 'root'
+  | 'decorator'
+  | 'textcontent'
+  | 'mutation'
+  | 'editable';
+
+export type TransformerType = 'text' | 'decorator' | 'element' | 'root';
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+type DOMConversionCache = Map<
+  string,
+  Array<(node: Node) => DOMConversion | null>
+>;
+
+export type SerializedEditor = {
+  editorState: SerializedEditorState;
+};
+
+export function resetEditor(
+  editor: LexicalEditor,
+  prevRootElement: null | HTMLElement,
+  nextRootElement: null | HTMLElement,
+  pendingEditorState: EditorState,
+): void {
+  const keyNodeMap = editor._keyToDOMMap;
+  keyNodeMap.clear();
+  editor._editorState = createEmptyEditorState();
+  editor._pendingEditorState = pendingEditorState;
+  editor._compositionKey = null;
+  editor._dirtyType = NO_DIRTY_NODES;
+  editor._cloneNotNeeded.clear();
+  editor._dirtyLeaves = new Set();
+  editor._dirtyElements.clear();
+  editor._normalizedNodes = new Set();
+  editor._updateTags = new Set();
+  editor._updates = [];
+  editor._blockCursorElement = null;
+
+  const observer = editor._observer;
+
+  if (observer !== null) {
+    observer.disconnect();
+    editor._observer = null;
+  }
+
+  // Remove all the DOM nodes from the root element
+  if (prevRootElement !== null) {
+    prevRootElement.textContent = '';
+  }
+
+  if (nextRootElement !== null) {
+    nextRootElement.textContent = '';
+    keyNodeMap.set('root', nextRootElement);
+  }
+}
+
+function initializeConversionCache(
+  nodes: RegisteredNodes,
+  additionalConversions?: DOMConversionMap,
+): DOMConversionCache {
+  const conversionCache = new Map();
+  const handledConversions = new Set();
+  const addConversionsToCache = (map: DOMConversionMap) => {
+    Object.keys(map).forEach((key) => {
+      let currentCache = conversionCache.get(key);
+
+      if (currentCache === undefined) {
+        currentCache = [];
+        conversionCache.set(key, currentCache);
+      }
+
+      currentCache.push(map[key]);
+    });
+  };
+  nodes.forEach((node) => {
+    const importDOM = node.klass.importDOM;
+
+    if (importDOM == null || handledConversions.has(importDOM)) {
+      return;
+    }
+
+    handledConversions.add(importDOM);
+    const map = importDOM.call(node.klass);
+
+    if (map !== null) {
+      addConversionsToCache(map);
+    }
+  });
+  if (additionalConversions) {
+    addConversionsToCache(additionalConversions);
+  }
+  return conversionCache;
+}
+
+/**
+ * Creates a new LexicalEditor attached to a single contentEditable (provided in the config). This is
+ * the lowest-level initialization API for a LexicalEditor. If you're using React or another framework,
+ * consider using the appropriate abstractions, such as LexicalComposer
+ * @param editorConfig - the editor configuration.
+ * @returns a LexicalEditor instance
+ */
+export function createEditor(editorConfig?: CreateEditorArgs): LexicalEditor {
+  const config = editorConfig || {};
+  const activeEditor = internalGetActiveEditor();
+  const theme = config.theme || {};
+  const parentEditor =
+    editorConfig === undefined ? activeEditor : config.parentEditor || null;
+  const disableEvents = config.disableEvents || false;
+  const editorState = createEmptyEditorState();
+  const namespace =
+    config.namespace ||
+    (parentEditor !== null ? parentEditor._config.namespace : createUID());
+  const initialEditorState = config.editorState;
+  const nodes = [
+    RootNode,
+    TextNode,
+    LineBreakNode,
+    TabNode,
+    ParagraphNode,
+    ArtificialNode__DO_NOT_USE,
+    ...(config.nodes || []),
+  ];
+  const {onError, html} = config;
+  const isEditable = config.editable !== undefined ? config.editable : true;
+  let registeredNodes: Map<string, RegisteredNode>;
+
+  if (editorConfig === undefined && activeEditor !== null) {
+    registeredNodes = activeEditor._nodes;
+  } else {
+    registeredNodes = new Map();
+    for (let i = 0; i < nodes.length; i++) {
+      let klass = nodes[i];
+      let replace: RegisteredNode['replace'] = null;
+      let replaceWithKlass: RegisteredNode['replaceWithKlass'] = null;
+
+      if (typeof klass !== 'function') {
+        const options = klass;
+        klass = options.replace;
+        replace = options.with;
+        replaceWithKlass = options.withKlass || null;
+      }
+      // Ensure custom nodes implement required methods and replaceWithKlass is instance of base klass.
+      if (__DEV__) {
+        // ArtificialNode__DO_NOT_USE can get renamed, so we use the type
+        const nodeType =
+          Object.prototype.hasOwnProperty.call(klass, 'getType') &&
+          klass.getType();
+        const name = klass.name;
+
+        if (replaceWithKlass) {
+          invariant(
+            replaceWithKlass.prototype instanceof klass,
+            "%s doesn't extend the %s",
+            replaceWithKlass.name,
+            name,
+          );
+        }
+
+        if (
+          name !== 'RootNode' &&
+          nodeType !== 'root' &&
+          nodeType !== 'artificial'
+        ) {
+          const proto = klass.prototype;
+          ['getType', 'clone'].forEach((method) => {
+            // eslint-disable-next-line no-prototype-builtins
+            if (!klass.hasOwnProperty(method)) {
+              console.warn(`${name} must implement static "${method}" method`);
+            }
+          });
+          if (
+            // eslint-disable-next-line no-prototype-builtins
+            !klass.hasOwnProperty('importDOM') &&
+            // eslint-disable-next-line no-prototype-builtins
+            klass.hasOwnProperty('exportDOM')
+          ) {
+            console.warn(
+              `${name} should implement "importDOM" if using a custom "exportDOM" method to ensure HTML serialization (important for copy & paste) works as expected`,
+            );
+          }
+          if (proto instanceof DecoratorNode) {
+            // eslint-disable-next-line no-prototype-builtins
+            if (!proto.hasOwnProperty('decorate')) {
+              console.warn(
+                `${proto.constructor.name} must implement "decorate" method`,
+              );
+            }
+          }
+          if (
+            // eslint-disable-next-line no-prototype-builtins
+            !klass.hasOwnProperty('importJSON')
+          ) {
+            console.warn(
+              `${name} should implement "importJSON" method to ensure JSON and default HTML serialization works as expected`,
+            );
+          }
+          if (
+            // eslint-disable-next-line no-prototype-builtins
+            !proto.hasOwnProperty('exportJSON')
+          ) {
+            console.warn(
+              `${name} should implement "exportJSON" method to ensure JSON and default HTML serialization works as expected`,
+            );
+          }
+        }
+      }
+      const type = klass.getType();
+      const transform = klass.transform();
+      const transforms = new Set<Transform<LexicalNode>>();
+      if (transform !== null) {
+        transforms.add(transform);
+      }
+      registeredNodes.set(type, {
+        exportDOM: html && html.export ? html.export.get(klass) : undefined,
+        klass,
+        replace,
+        replaceWithKlass,
+        transforms,
+      });
+    }
+  }
+  const editor = new LexicalEditor(
+    editorState,
+    parentEditor,
+    registeredNodes,
+    {
+      disableEvents,
+      namespace,
+      theme,
+    },
+    onError ? onError : console.error,
+    initializeConversionCache(registeredNodes, html ? html.import : undefined),
+    isEditable,
+  );
+
+  if (initialEditorState !== undefined) {
+    editor._pendingEditorState = initialEditorState;
+    editor._dirtyType = FULL_RECONCILE;
+  }
+
+  return editor;
+}
+export class LexicalEditor {
+  ['constructor']!: KlassConstructor<typeof LexicalEditor>;
+
+  /** The version with build identifiers for this editor (since 0.17.1) */
+  static version: string | undefined;
+
+  /** @internal */
+  _headless: boolean;
+  /** @internal */
+  _parentEditor: null | LexicalEditor;
+  /** @internal */
+  _rootElement: null | HTMLElement;
+  /** @internal */
+  _editorState: EditorState;
+  /** @internal */
+  _pendingEditorState: null | EditorState;
+  /** @internal */
+  _compositionKey: null | NodeKey;
+  /** @internal */
+  _deferred: Array<() => void>;
+  /** @internal */
+  _keyToDOMMap: Map<NodeKey, HTMLElement>;
+  /** @internal */
+  _updates: Array<[() => void, EditorUpdateOptions | undefined]>;
+  /** @internal */
+  _updating: boolean;
+  /** @internal */
+  _listeners: Listeners;
+  /** @internal */
+  _commands: Commands;
+  /** @internal */
+  _nodes: RegisteredNodes;
+  /** @internal */
+  _decorators: Record<NodeKey, unknown>;
+  /** @internal */
+  _pendingDecorators: null | Record<NodeKey, unknown>;
+  /** @internal */
+  _config: EditorConfig;
+  /** @internal */
+  _dirtyType: 0 | 1 | 2;
+  /** @internal */
+  _cloneNotNeeded: Set<NodeKey>;
+  /** @internal */
+  _dirtyLeaves: Set<NodeKey>;
+  /** @internal */
+  _dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>;
+  /** @internal */
+  _normalizedNodes: Set<NodeKey>;
+  /** @internal */
+  _updateTags: Set<string>;
+  /** @internal */
+  _observer: null | MutationObserver;
+  /** @internal */
+  _key: string;
+  /** @internal */
+  _onError: ErrorHandler;
+  /** @internal */
+  _htmlConversions: DOMConversionCache;
+  /** @internal */
+  _window: null | Window;
+  /** @internal */
+  _editable: boolean;
+  /** @internal */
+  _blockCursorElement: null | HTMLDivElement;
+
+  /** @internal */
+  constructor(
+    editorState: EditorState,
+    parentEditor: null | LexicalEditor,
+    nodes: RegisteredNodes,
+    config: EditorConfig,
+    onError: ErrorHandler,
+    htmlConversions: DOMConversionCache,
+    editable: boolean,
+  ) {
+    this._parentEditor = parentEditor;
+    // The root element associated with this editor
+    this._rootElement = null;
+    // The current editor state
+    this._editorState = editorState;
+    // Handling of drafts and updates
+    this._pendingEditorState = null;
+    // Used to help co-ordinate selection and events
+    this._compositionKey = null;
+    this._deferred = [];
+    // Used during reconciliation
+    this._keyToDOMMap = new Map();
+    this._updates = [];
+    this._updating = false;
+    // Listeners
+    this._listeners = {
+      decorator: new Set(),
+      editable: new Set(),
+      mutation: new Map(),
+      root: new Set(),
+      textcontent: new Set(),
+      update: new Set(),
+    };
+    // Commands
+    this._commands = new Map();
+    // Editor configuration for theme/context.
+    this._config = config;
+    // Mapping of types to their nodes
+    this._nodes = nodes;
+    // React node decorators for portals
+    this._decorators = {};
+    this._pendingDecorators = null;
+    // Used to optimize reconciliation
+    this._dirtyType = NO_DIRTY_NODES;
+    this._cloneNotNeeded = new Set();
+    this._dirtyLeaves = new Set();
+    this._dirtyElements = new Map();
+    this._normalizedNodes = new Set();
+    this._updateTags = new Set();
+    // Handling of DOM mutations
+    this._observer = null;
+    // Used for identifying owning editors
+    this._key = createUID();
+
+    this._onError = onError;
+    this._htmlConversions = htmlConversions;
+    this._editable = editable;
+    this._headless = parentEditor !== null && parentEditor._headless;
+    this._window = null;
+    this._blockCursorElement = null;
+  }
+
+  /**
+   *
+   * @returns true if the editor is currently in "composition" mode due to receiving input
+   * through an IME, or 3P extension, for example. Returns false otherwise.
+   */
+  isComposing(): boolean {
+    return this._compositionKey != null;
+  }
+  /**
+   * Registers a listener for Editor update event. Will trigger the provided callback
+   * each time the editor goes through an update (via {@link LexicalEditor.update}) until the
+   * teardown function is called.
+   *
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerUpdateListener(listener: UpdateListener): () => void {
+    const listenerSetOrMap = this._listeners.update;
+    listenerSetOrMap.add(listener);
+    return () => {
+      listenerSetOrMap.delete(listener);
+    };
+  }
+  /**
+   * Registers a listener for for when the editor changes between editable and non-editable states.
+   * Will trigger the provided callback each time the editor transitions between these states until the
+   * teardown function is called.
+   *
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerEditableListener(listener: EditableListener): () => void {
+    const listenerSetOrMap = this._listeners.editable;
+    listenerSetOrMap.add(listener);
+    return () => {
+      listenerSetOrMap.delete(listener);
+    };
+  }
+  /**
+   * Registers a listener for when the editor's decorator object changes. The decorator object contains
+   * all DecoratorNode keys -> their decorated value. This is primarily used with external UI frameworks.
+   *
+   * Will trigger the provided callback each time the editor transitions between these states until the
+   * teardown function is called.
+   *
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerDecoratorListener<T>(listener: DecoratorListener<T>): () => void {
+    const listenerSetOrMap = this._listeners.decorator;
+    listenerSetOrMap.add(listener);
+    return () => {
+      listenerSetOrMap.delete(listener);
+    };
+  }
+  /**
+   * Registers a listener for when Lexical commits an update to the DOM and the text content of
+   * the editor changes from the previous state of the editor. If the text content is the
+   * same between updates, no notifications to the listeners will happen.
+   *
+   * Will trigger the provided callback each time the editor transitions between these states until the
+   * teardown function is called.
+   *
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerTextContentListener(listener: TextContentListener): () => void {
+    const listenerSetOrMap = this._listeners.textcontent;
+    listenerSetOrMap.add(listener);
+    return () => {
+      listenerSetOrMap.delete(listener);
+    };
+  }
+  /**
+   * Registers a listener for when the editor's root DOM element (the content editable
+   * Lexical attaches to) changes. This is primarily used to attach event listeners to the root
+   *  element. The root listener function is executed directly upon registration and then on
+   * any subsequent update.
+   *
+   * Will trigger the provided callback each time the editor transitions between these states until the
+   * teardown function is called.
+   *
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerRootListener(listener: RootListener): () => void {
+    const listenerSetOrMap = this._listeners.root;
+    listener(this._rootElement, null);
+    listenerSetOrMap.add(listener);
+    return () => {
+      listener(null, this._rootElement);
+      listenerSetOrMap.delete(listener);
+    };
+  }
+  /**
+   * Registers a listener that will trigger anytime the provided command
+   * is dispatched, subject to priority. Listeners that run at a higher priority can "intercept"
+   * commands and prevent them from propagating to other handlers by returning true.
+   *
+   * Listeners registered at the same priority level will run deterministically in the order of registration.
+   *
+   * @param command - the command that will trigger the callback.
+   * @param listener - the function that will execute when the command is dispatched.
+   * @param priority - the relative priority of the listener. 0 | 1 | 2 | 3 | 4
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerCommand<P>(
+    command: LexicalCommand<P>,
+    listener: CommandListener<P>,
+    priority: CommandListenerPriority,
+  ): () => void {
+    if (priority === undefined) {
+      invariant(false, 'Listener for type "command" requires a "priority".');
+    }
+
+    const commandsMap = this._commands;
+
+    if (!commandsMap.has(command)) {
+      commandsMap.set(command, [
+        new Set(),
+        new Set(),
+        new Set(),
+        new Set(),
+        new Set(),
+      ]);
+    }
+
+    const listenersInPriorityOrder = commandsMap.get(command);
+
+    if (listenersInPriorityOrder === undefined) {
+      invariant(
+        false,
+        'registerCommand: Command %s not found in command map',
+        String(command),
+      );
+    }
+
+    const listeners = listenersInPriorityOrder[priority];
+    listeners.add(listener as CommandListener<unknown>);
+    return () => {
+      listeners.delete(listener as CommandListener<unknown>);
+
+      if (
+        listenersInPriorityOrder.every(
+          (listenersSet) => listenersSet.size === 0,
+        )
+      ) {
+        commandsMap.delete(command);
+      }
+    };
+  }
+
+  /**
+   * Registers a listener that will run when a Lexical node of the provided class is
+   * mutated. The listener will receive a list of nodes along with the type of mutation
+   * that was performed on each: created, destroyed, or updated.
+   *
+   * One common use case for this is to attach DOM event listeners to the underlying DOM nodes as Lexical nodes are created.
+   * {@link LexicalEditor.getElementByKey} can be used for this.
+   *
+   * If any existing nodes are in the DOM, and skipInitialization is not true, the listener
+   * will be called immediately with an updateTag of 'registerMutationListener' where all
+   * nodes have the 'created' NodeMutation. This can be controlled with the skipInitialization option
+   * (default is currently true for backwards compatibility in 0.16.x but will change to false in 0.17.0).
+   *
+   * @param klass - The class of the node that you want to listen to mutations on.
+   * @param listener - The logic you want to run when the node is mutated.
+   * @param options - see {@link MutationListenerOptions}
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerMutationListener(
+    klass: Klass<LexicalNode>,
+    listener: MutationListener,
+    options?: MutationListenerOptions,
+  ): () => void {
+    const klassToMutate = this.resolveRegisteredNodeAfterReplacements(
+      this.getRegisteredNode(klass),
+    ).klass;
+    const mutations = this._listeners.mutation;
+    mutations.set(listener, klassToMutate);
+    const skipInitialization = options && options.skipInitialization;
+    if (
+      !(skipInitialization === undefined
+        ? DEFAULT_SKIP_INITIALIZATION
+        : skipInitialization)
+    ) {
+      this.initializeMutationListener(listener, klassToMutate);
+    }
+
+    return () => {
+      mutations.delete(listener);
+    };
+  }
+
+  /** @internal */
+  private getRegisteredNode(klass: Klass<LexicalNode>): RegisteredNode {
+    const registeredNode = this._nodes.get(klass.getType());
+
+    if (registeredNode === undefined) {
+      invariant(
+        false,
+        'Node %s has not been registered. Ensure node has been passed to createEditor.',
+        klass.name,
+      );
+    }
+
+    return registeredNode;
+  }
+
+  /** @internal */
+  private resolveRegisteredNodeAfterReplacements(
+    registeredNode: RegisteredNode,
+  ): RegisteredNode {
+    while (registeredNode.replaceWithKlass) {
+      registeredNode = this.getRegisteredNode(registeredNode.replaceWithKlass);
+    }
+    return registeredNode;
+  }
+
+  /** @internal */
+  private initializeMutationListener(
+    listener: MutationListener,
+    klass: Klass<LexicalNode>,
+  ): void {
+    const prevEditorState = this._editorState;
+    const nodeMap = getCachedTypeToNodeMap(prevEditorState).get(
+      klass.getType(),
+    );
+    if (!nodeMap) {
+      return;
+    }
+    const nodeMutationMap = new Map<string, NodeMutation>();
+    for (const k of nodeMap.keys()) {
+      nodeMutationMap.set(k, 'created');
+    }
+    if (nodeMutationMap.size > 0) {
+      listener(nodeMutationMap, {
+        dirtyLeaves: new Set(),
+        prevEditorState,
+        updateTags: new Set(['registerMutationListener']),
+      });
+    }
+  }
+
+  /** @internal */
+  private registerNodeTransformToKlass<T extends LexicalNode>(
+    klass: Klass<T>,
+    listener: Transform<T>,
+  ): RegisteredNode {
+    const registeredNode = this.getRegisteredNode(klass);
+    registeredNode.transforms.add(listener as Transform<LexicalNode>);
+
+    return registeredNode;
+  }
+
+  /**
+   * Registers a listener that will run when a Lexical node of the provided class is
+   * marked dirty during an update. The listener will continue to run as long as the node
+   * is marked dirty. There are no guarantees around the order of transform execution!
+   *
+   * Watch out for infinite loops. See [Node Transforms](https://lexical.dev/docs/concepts/transforms)
+   * @param klass - The class of the node that you want to run transforms on.
+   * @param listener - The logic you want to run when the node is updated.
+   * @returns a teardown function that can be used to cleanup the listener.
+   */
+  registerNodeTransform<T extends LexicalNode>(
+    klass: Klass<T>,
+    listener: Transform<T>,
+  ): () => void {
+    const registeredNode = this.registerNodeTransformToKlass(klass, listener);
+    const registeredNodes = [registeredNode];
+
+    const replaceWithKlass = registeredNode.replaceWithKlass;
+    if (replaceWithKlass != null) {
+      const registeredReplaceWithNode = this.registerNodeTransformToKlass(
+        replaceWithKlass,
+        listener as Transform<LexicalNode>,
+      );
+      registeredNodes.push(registeredReplaceWithNode);
+    }
+
+    markAllNodesAsDirty(this, klass.getType());
+    return () => {
+      registeredNodes.forEach((node) =>
+        node.transforms.delete(listener as Transform<LexicalNode>),
+      );
+    };
+  }
+
+  /**
+   * Used to assert that a certain node is registered, usually by plugins to ensure nodes that they
+   * depend on have been registered.
+   * @returns True if the editor has registered the provided node type, false otherwise.
+   */
+  hasNode<T extends Klass<LexicalNode>>(node: T): boolean {
+    return this._nodes.has(node.getType());
+  }
+
+  /**
+   * Used to assert that certain nodes are registered, usually by plugins to ensure nodes that they
+   * depend on have been registered.
+   * @returns True if the editor has registered all of the provided node types, false otherwise.
+   */
+  hasNodes<T extends Klass<LexicalNode>>(nodes: Array<T>): boolean {
+    return nodes.every(this.hasNode.bind(this));
+  }
+
+  /**
+   * Dispatches a command of the specified type with the specified payload.
+   * This triggers all command listeners (set by {@link LexicalEditor.registerCommand})
+   * for this type, passing them the provided payload.
+   * @param type - the type of command listeners to trigger.
+   * @param payload - the data to pass as an argument to the command listeners.
+   */
+  dispatchCommand<TCommand extends LexicalCommand<unknown>>(
+    type: TCommand,
+    payload: CommandPayloadType<TCommand>,
+  ): boolean {
+    return dispatchCommand(this, type, payload);
+  }
+
+  /**
+   * Gets a map of all decorators in the editor.
+   * @returns A mapping of call decorator keys to their decorated content
+   */
+  getDecorators<T>(): Record<NodeKey, T> {
+    return this._decorators as Record<NodeKey, T>;
+  }
+
+  /**
+   *
+   * @returns the current root element of the editor. If you want to register
+   * an event listener, do it via {@link LexicalEditor.registerRootListener}, since
+   * this reference may not be stable.
+   */
+  getRootElement(): null | HTMLElement {
+    return this._rootElement;
+  }
+
+  /**
+   * Gets the key of the editor
+   * @returns The editor key
+   */
+  getKey(): string {
+    return this._key;
+  }
+
+  /**
+   * Imperatively set the root contenteditable element that Lexical listens
+   * for events on.
+   */
+  setRootElement(nextRootElement: null | HTMLElement): void {
+    const prevRootElement = this._rootElement;
+
+    if (nextRootElement !== prevRootElement) {
+      const classNames = getCachedClassNameArray(this._config.theme, 'root');
+      const pendingEditorState = this._pendingEditorState || this._editorState;
+      this._rootElement = nextRootElement;
+      resetEditor(this, prevRootElement, nextRootElement, pendingEditorState);
+
+      if (prevRootElement !== null) {
+        // TODO: remove this flag once we no longer use UEv2 internally
+        if (!this._config.disableEvents) {
+          removeRootElementEvents(prevRootElement);
+        }
+        if (classNames != null) {
+          prevRootElement.classList.remove(...classNames);
+        }
+      }
+
+      if (nextRootElement !== null) {
+        const windowObj = getDefaultView(nextRootElement);
+        const style = nextRootElement.style;
+        style.userSelect = 'text';
+        style.whiteSpace = 'pre-wrap';
+        style.wordBreak = 'break-word';
+        nextRootElement.setAttribute('data-lexical-editor', 'true');
+        this._window = windowObj;
+        this._dirtyType = FULL_RECONCILE;
+        initMutationObserver(this);
+
+        this._updateTags.add('history-merge');
+
+        $commitPendingUpdates(this);
+
+        // TODO: remove this flag once we no longer use UEv2 internally
+        if (!this._config.disableEvents) {
+          addRootElementEvents(nextRootElement, this);
+        }
+        if (classNames != null) {
+          nextRootElement.classList.add(...classNames);
+        }
+      } else {
+        // If content editable is unmounted we'll reset editor state back to original
+        // (or pending) editor state since there will be no reconciliation
+        this._editorState = pendingEditorState;
+        this._pendingEditorState = null;
+        this._window = null;
+      }
+
+      triggerListeners('root', this, false, nextRootElement, prevRootElement);
+    }
+  }
+
+  /**
+   * Gets the underlying HTMLElement associated with the LexicalNode for the given key.
+   * @returns the HTMLElement rendered by the LexicalNode associated with the key.
+   * @param key - the key of the LexicalNode.
+   */
+  getElementByKey(key: NodeKey): HTMLElement | null {
+    return this._keyToDOMMap.get(key) || null;
+  }
+
+  /**
+   * Gets the active editor state.
+   * @returns The editor state
+   */
+  getEditorState(): EditorState {
+    return this._editorState;
+  }
+
+  /**
+   * Imperatively set the EditorState. Triggers reconciliation like an update.
+   * @param editorState - the state to set the editor
+   * @param options - options for the update.
+   */
+  setEditorState(editorState: EditorState, options?: EditorSetOptions): void {
+    if (editorState.isEmpty()) {
+      invariant(
+        false,
+        "setEditorState: the editor state is empty. Ensure the editor state's root node never becomes empty.",
+      );
+    }
+
+    $flushRootMutations(this);
+    const pendingEditorState = this._pendingEditorState;
+    const tags = this._updateTags;
+    const tag = options !== undefined ? options.tag : null;
+
+    if (pendingEditorState !== null && !pendingEditorState.isEmpty()) {
+      if (tag != null) {
+        tags.add(tag);
+      }
+
+      $commitPendingUpdates(this);
+    }
+
+    this._pendingEditorState = editorState;
+    this._dirtyType = FULL_RECONCILE;
+    this._dirtyElements.set('root', false);
+    this._compositionKey = null;
+
+    if (tag != null) {
+      tags.add(tag);
+    }
+
+    $commitPendingUpdates(this);
+  }
+
+  /**
+   * Parses a SerializedEditorState (usually produced by {@link EditorState.toJSON}) and returns
+   * and EditorState object that can be, for example, passed to {@link LexicalEditor.setEditorState}. Typically,
+   * deserialization from JSON stored in a database uses this method.
+   * @param maybeStringifiedEditorState
+   * @param updateFn
+   * @returns
+   */
+  parseEditorState(
+    maybeStringifiedEditorState: string | SerializedEditorState,
+    updateFn?: () => void,
+  ): EditorState {
+    const serializedEditorState =
+      typeof maybeStringifiedEditorState === 'string'
+        ? JSON.parse(maybeStringifiedEditorState)
+        : maybeStringifiedEditorState;
+    return parseEditorState(serializedEditorState, this, updateFn);
+  }
+
+  /**
+   * Executes a read of the editor's state, with the
+   * editor context available (useful for exporting and read-only DOM
+   * operations). Much like update, but prevents any mutation of the
+   * editor's state. Any pending updates will be flushed immediately before
+   * the read.
+   * @param callbackFn - A function that has access to read-only editor state.
+   */
+  read<T>(callbackFn: () => T): T {
+    $commitPendingUpdates(this);
+    return this.getEditorState().read(callbackFn, {editor: this});
+  }
+
+  /**
+   * Executes an update to the editor state. The updateFn callback is the ONLY place
+   * where Lexical editor state can be safely mutated.
+   * @param updateFn - A function that has access to writable editor state.
+   * @param options - A bag of options to control the behavior of the update.
+   * @param options.onUpdate - A function to run once the update is complete.
+   * Useful for synchronizing updates in some cases.
+   * @param options.skipTransforms - Setting this to true will suppress all node
+   * transforms for this update cycle.
+   * @param options.tag - A tag to identify this update, in an update listener, for instance.
+   * Some tags are reserved by the core and control update behavior in different ways.
+   * @param options.discrete - If true, prevents this update from being batched, forcing it to
+   * run synchronously.
+   */
+  update(updateFn: () => void, options?: EditorUpdateOptions): void {
+    updateEditor(this, updateFn, options);
+  }
+
+  /**
+   * Focuses the editor
+   * @param callbackFn - A function to run after the editor is focused.
+   * @param options - A bag of options
+   * @param options.defaultSelection - Where to move selection when the editor is
+   * focused. Can be rootStart, rootEnd, or undefined. Defaults to rootEnd.
+   */
+  focus(callbackFn?: () => void, options: EditorFocusOptions = {}): void {
+    const rootElement = this._rootElement;
+
+    if (rootElement !== null) {
+      // This ensures that iOS does not trigger caps lock upon focus
+      rootElement.setAttribute('autocapitalize', 'off');
+      updateEditor(
+        this,
+        () => {
+          const selection = $getSelection();
+          const root = $getRoot();
+
+          if (selection !== null) {
+            // Marking the selection dirty will force the selection back to it
+            selection.dirty = true;
+          } else if (root.getChildrenSize() !== 0) {
+            if (options.defaultSelection === 'rootStart') {
+              root.selectStart();
+            } else {
+              root.selectEnd();
+            }
+          }
+        },
+        {
+          onUpdate: () => {
+            rootElement.removeAttribute('autocapitalize');
+            if (callbackFn) {
+              callbackFn();
+            }
+          },
+          tag: 'focus',
+        },
+      );
+      // In the case where onUpdate doesn't fire (due to the focus update not
+      // occuring).
+      if (this._pendingEditorState === null) {
+        rootElement.removeAttribute('autocapitalize');
+      }
+    }
+  }
+
+  /**
+   * Removes focus from the editor.
+   */
+  blur(): void {
+    const rootElement = this._rootElement;
+
+    if (rootElement !== null) {
+      rootElement.blur();
+    }
+
+    const domSelection = getDOMSelection(this._window);
+
+    if (domSelection !== null) {
+      domSelection.removeAllRanges();
+    }
+  }
+  /**
+   * Returns true if the editor is editable, false otherwise.
+   * @returns True if the editor is editable, false otherwise.
+   */
+  isEditable(): boolean {
+    return this._editable;
+  }
+  /**
+   * Sets the editable property of the editor. When false, the
+   * editor will not listen for user events on the underling contenteditable.
+   * @param editable - the value to set the editable mode to.
+   */
+  setEditable(editable: boolean): void {
+    if (this._editable !== editable) {
+      this._editable = editable;
+      triggerListeners('editable', this, true, editable);
+    }
+  }
+  /**
+   * Returns a JSON-serializable javascript object NOT a JSON string.
+   * You still must call JSON.stringify (or something else) to turn the
+   * state into a string you can transfer over the wire and store in a database.
+   *
+   * See {@link LexicalNode.exportJSON}
+   *
+   * @returns A JSON-serializable javascript object
+   */
+  toJSON(): SerializedEditor {
+    return {
+      editorState: this._editorState.toJSON(),
+    };
+  }
+}
+
+LexicalEditor.version = '0.17.1';
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEditorState.ts b/resources/js/wysiwyg/lexical/core/LexicalEditorState.ts
new file mode 100644
index 00000000000..f84d2e40a8c
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditorState.ts
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor} from './LexicalEditor';
+import type {LexicalNode, NodeMap, SerializedLexicalNode} from './LexicalNode';
+import type {BaseSelection} from './LexicalSelection';
+import type {SerializedElementNode} from './nodes/LexicalElementNode';
+import type {SerializedRootNode} from './nodes/LexicalRootNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {readEditorState} from './LexicalUpdates';
+import {$getRoot} from './LexicalUtils';
+import {$isElementNode} from './nodes/LexicalElementNode';
+import {$createRootNode} from './nodes/LexicalRootNode';
+
+export interface SerializedEditorState<
+  T extends SerializedLexicalNode = SerializedLexicalNode,
+> {
+  root: SerializedRootNode<T>;
+}
+
+export function editorStateHasDirtySelection(
+  editorState: EditorState,
+  editor: LexicalEditor,
+): boolean {
+  const currentSelection = editor.getEditorState()._selection;
+
+  const pendingSelection = editorState._selection;
+
+  // Check if we need to update because of changes in selection
+  if (pendingSelection !== null) {
+    if (pendingSelection.dirty || !pendingSelection.is(currentSelection)) {
+      return true;
+    }
+  } else if (currentSelection !== null) {
+    return true;
+  }
+
+  return false;
+}
+
+export function cloneEditorState(current: EditorState): EditorState {
+  return new EditorState(new Map(current._nodeMap));
+}
+
+export function createEmptyEditorState(): EditorState {
+  return new EditorState(new Map([['root', $createRootNode()]]));
+}
+
+function exportNodeToJSON<SerializedNode extends SerializedLexicalNode>(
+  node: LexicalNode,
+): SerializedNode {
+  const serializedNode = node.exportJSON();
+  const nodeClass = node.constructor;
+
+  if (serializedNode.type !== nodeClass.getType()) {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not match the serialized type. Check if .exportJSON() is implemented and it is returning the correct type.',
+      nodeClass.name,
+    );
+  }
+
+  if ($isElementNode(node)) {
+    const serializedChildren = (serializedNode as SerializedElementNode)
+      .children;
+    if (!Array.isArray(serializedChildren)) {
+      invariant(
+        false,
+        'LexicalNode: Node %s is an element but .exportJSON() does not have a children array.',
+        nodeClass.name,
+      );
+    }
+
+    const children = node.getChildren();
+
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      const serializedChildNode = exportNodeToJSON(child);
+      serializedChildren.push(serializedChildNode);
+    }
+  }
+
+  // @ts-expect-error
+  return serializedNode;
+}
+
+export interface EditorStateReadOptions {
+  editor?: LexicalEditor | null;
+}
+
+export class EditorState {
+  _nodeMap: NodeMap;
+  _selection: null | BaseSelection;
+  _flushSync: boolean;
+  _readOnly: boolean;
+
+  constructor(nodeMap: NodeMap, selection?: null | BaseSelection) {
+    this._nodeMap = nodeMap;
+    this._selection = selection || null;
+    this._flushSync = false;
+    this._readOnly = false;
+  }
+
+  isEmpty(): boolean {
+    return this._nodeMap.size === 1 && this._selection === null;
+  }
+
+  read<V>(callbackFn: () => V, options?: EditorStateReadOptions): V {
+    return readEditorState(
+      (options && options.editor) || null,
+      this,
+      callbackFn,
+    );
+  }
+
+  clone(selection?: null | BaseSelection): EditorState {
+    const editorState = new EditorState(
+      this._nodeMap,
+      selection === undefined ? this._selection : selection,
+    );
+    editorState._readOnly = true;
+
+    return editorState;
+  }
+  toJSON(): SerializedEditorState {
+    return readEditorState(null, this, () => ({
+      root: exportNodeToJSON($getRoot()),
+    }));
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
new file mode 100644
index 00000000000..5fd671a76c5
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
@@ -0,0 +1,1385 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor} from './LexicalEditor';
+import type {NodeKey} from './LexicalNode';
+import type {ElementNode} from './nodes/LexicalElementNode';
+import type {TextNode} from './nodes/LexicalTextNode';
+
+import {
+  CAN_USE_BEFORE_INPUT,
+  IS_ANDROID_CHROME,
+  IS_APPLE_WEBKIT,
+  IS_FIREFOX,
+  IS_IOS,
+  IS_SAFARI,
+} from 'lexical/shared/environment';
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $getPreviousSelection,
+  $getRoot,
+  $getSelection,
+  $isElementNode,
+  $isNodeSelection,
+  $isRangeSelection,
+  $isRootNode,
+  $isTextNode,
+  $setCompositionKey,
+  BLUR_COMMAND,
+  CLICK_COMMAND,
+  CONTROLLED_TEXT_INSERTION_COMMAND,
+  COPY_COMMAND,
+  CUT_COMMAND,
+  DELETE_CHARACTER_COMMAND,
+  DELETE_LINE_COMMAND,
+  DELETE_WORD_COMMAND,
+  DRAGEND_COMMAND,
+  DRAGOVER_COMMAND,
+  DRAGSTART_COMMAND,
+  DROP_COMMAND,
+  FOCUS_COMMAND,
+  FORMAT_TEXT_COMMAND,
+  INSERT_LINE_BREAK_COMMAND,
+  INSERT_PARAGRAPH_COMMAND,
+  KEY_ARROW_DOWN_COMMAND,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_ARROW_UP_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND,
+  KEY_DOWN_COMMAND,
+  KEY_ENTER_COMMAND,
+  KEY_ESCAPE_COMMAND,
+  KEY_SPACE_COMMAND,
+  KEY_TAB_COMMAND,
+  MOVE_TO_END,
+  MOVE_TO_START,
+  ParagraphNode,
+  PASTE_COMMAND,
+  REDO_COMMAND,
+  REMOVE_TEXT_COMMAND,
+  SELECTION_CHANGE_COMMAND,
+  UNDO_COMMAND,
+} from '.';
+import {KEY_MODIFIER_COMMAND, SELECT_ALL_COMMAND} from './LexicalCommands';
+import {
+  COMPOSITION_START_CHAR,
+  DOM_ELEMENT_TYPE,
+  DOM_TEXT_TYPE,
+  DOUBLE_LINE_BREAK,
+  IS_ALL_FORMATTING,
+} from './LexicalConstants';
+import {
+  $internalCreateRangeSelection,
+  RangeSelection,
+} from './LexicalSelection';
+import {getActiveEditor, updateEditor} from './LexicalUpdates';
+import {
+  $flushMutations,
+  $getNodeByKey,
+  $isSelectionCapturedInDecorator,
+  $isTokenOrSegmented,
+  $setSelection,
+  $shouldInsertTextAfterOrBeforeTextNode,
+  $updateSelectedTextFromDOM,
+  $updateTextNodeFromDOMContent,
+  dispatchCommand,
+  doesContainGrapheme,
+  getAnchorTextFromDOM,
+  getDOMSelection,
+  getDOMTextNode,
+  getEditorPropertyFromDOMNode,
+  getEditorsToPropagate,
+  getNearestEditorFromDOMNode,
+  getWindow,
+  isBackspace,
+  isBold,
+  isCopy,
+  isCut,
+  isDelete,
+  isDeleteBackward,
+  isDeleteForward,
+  isDeleteLineBackward,
+  isDeleteLineForward,
+  isDeleteWordBackward,
+  isDeleteWordForward,
+  isEscape,
+  isFirefoxClipboardEvents,
+  isItalic,
+  isLexicalEditor,
+  isLineBreak,
+  isModifier,
+  isMoveBackward,
+  isMoveDown,
+  isMoveForward,
+  isMoveToEnd,
+  isMoveToStart,
+  isMoveUp,
+  isOpenLineBreak,
+  isParagraph,
+  isRedo,
+  isSelectAll,
+  isSelectionWithinEditor,
+  isSpace,
+  isTab,
+  isUnderline,
+  isUndo,
+} from './LexicalUtils';
+
+type RootElementRemoveHandles = Array<() => void>;
+type RootElementEvents = Array<
+  [
+    string,
+    Record<string, unknown> | ((event: Event, editor: LexicalEditor) => void),
+  ]
+>;
+const PASS_THROUGH_COMMAND = Object.freeze({});
+const ANDROID_COMPOSITION_LATENCY = 30;
+const rootElementEvents: RootElementEvents = [
+  ['keydown', onKeyDown],
+  ['pointerdown', onPointerDown],
+  ['compositionstart', onCompositionStart],
+  ['compositionend', onCompositionEnd],
+  ['input', onInput],
+  ['click', onClick],
+  ['cut', PASS_THROUGH_COMMAND],
+  ['copy', PASS_THROUGH_COMMAND],
+  ['dragstart', PASS_THROUGH_COMMAND],
+  ['dragover', PASS_THROUGH_COMMAND],
+  ['dragend', PASS_THROUGH_COMMAND],
+  ['paste', PASS_THROUGH_COMMAND],
+  ['focus', PASS_THROUGH_COMMAND],
+  ['blur', PASS_THROUGH_COMMAND],
+  ['drop', PASS_THROUGH_COMMAND],
+];
+
+if (CAN_USE_BEFORE_INPUT) {
+  rootElementEvents.push([
+    'beforeinput',
+    (event, editor) => onBeforeInput(event as InputEvent, editor),
+  ]);
+}
+
+let lastKeyDownTimeStamp = 0;
+let lastKeyCode: null | string = null;
+let lastBeforeInputInsertTextTimeStamp = 0;
+let unprocessedBeforeInputData: null | string = null;
+const rootElementsRegistered = new WeakMap<Document, number>();
+let isSelectionChangeFromDOMUpdate = false;
+let isSelectionChangeFromMouseDown = false;
+let isInsertLineBreak = false;
+let isFirefoxEndingComposition = false;
+let collapsedSelectionFormat: [number, string, number, NodeKey, number] = [
+  0,
+  '',
+  0,
+  'root',
+  0,
+];
+
+// This function is used to determine if Lexical should attempt to override
+// the default browser behavior for insertion of text and use its own internal
+// heuristics. This is an extremely important function, and makes much of Lexical
+// work as intended between different browsers and across word, line and character
+// boundary/formats. It also is important for text replacement, node schemas and
+// composition mechanics.
+
+function $shouldPreventDefaultAndInsertText(
+  selection: RangeSelection,
+  domTargetRange: null | StaticRange,
+  text: string,
+  timeStamp: number,
+  isBeforeInput: boolean,
+): boolean {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const anchorNode = anchor.getNode();
+  const editor = getActiveEditor();
+  const domSelection = getDOMSelection(editor._window);
+  const domAnchorNode = domSelection !== null ? domSelection.anchorNode : null;
+  const anchorKey = anchor.key;
+  const backingAnchorElement = editor.getElementByKey(anchorKey);
+  const textLength = text.length;
+
+  return (
+    anchorKey !== focus.key ||
+    // If we're working with a non-text node.
+    !$isTextNode(anchorNode) ||
+    // If we are replacing a range with a single character or grapheme, and not composing.
+    (((!isBeforeInput &&
+      (!CAN_USE_BEFORE_INPUT ||
+        // We check to see if there has been
+        // a recent beforeinput event for "textInput". If there has been one in the last
+        // 50ms then we proceed as normal. However, if there is not, then this is likely
+        // a dangling `input` event caused by execCommand('insertText').
+        lastBeforeInputInsertTextTimeStamp < timeStamp + 50)) ||
+      (anchorNode.isDirty() && textLength < 2) ||
+      doesContainGrapheme(text)) &&
+      anchor.offset !== focus.offset &&
+      !anchorNode.isComposing()) ||
+    // Any non standard text node.
+    $isTokenOrSegmented(anchorNode) ||
+    // If the text length is more than a single character and we're either
+    // dealing with this in "beforeinput" or where the node has already recently
+    // been changed (thus is dirty).
+    (anchorNode.isDirty() && textLength > 1) ||
+    // If the DOM selection element is not the same as the backing node during beforeinput.
+    ((isBeforeInput || !CAN_USE_BEFORE_INPUT) &&
+      backingAnchorElement !== null &&
+      !anchorNode.isComposing() &&
+      domAnchorNode !== getDOMTextNode(backingAnchorElement)) ||
+    // If TargetRange is not the same as the DOM selection; browser trying to edit random parts
+    // of the editor.
+    (domSelection !== null &&
+      domTargetRange !== null &&
+      (!domTargetRange.collapsed ||
+        domTargetRange.startContainer !== domSelection.anchorNode ||
+        domTargetRange.startOffset !== domSelection.anchorOffset)) ||
+    // Check if we're changing from bold to italics, or some other format.
+    anchorNode.getFormat() !== selection.format ||
+    anchorNode.getStyle() !== selection.style ||
+    // One last set of heuristics to check against.
+    $shouldInsertTextAfterOrBeforeTextNode(selection, anchorNode)
+  );
+}
+
+function shouldSkipSelectionChange(
+  domNode: null | Node,
+  offset: number,
+): boolean {
+  return (
+    domNode !== null &&
+    domNode.nodeValue !== null &&
+    domNode.nodeType === DOM_TEXT_TYPE &&
+    offset !== 0 &&
+    offset !== domNode.nodeValue.length
+  );
+}
+
+function onSelectionChange(
+  domSelection: Selection,
+  editor: LexicalEditor,
+  isActive: boolean,
+): void {
+  const {
+    anchorNode: anchorDOM,
+    anchorOffset,
+    focusNode: focusDOM,
+    focusOffset,
+  } = domSelection;
+  if (isSelectionChangeFromDOMUpdate) {
+    isSelectionChangeFromDOMUpdate = false;
+
+    // If native DOM selection is on a DOM element, then
+    // we should continue as usual, as Lexical's selection
+    // may have normalized to a better child. If the DOM
+    // element is a text node, we can safely apply this
+    // optimization and skip the selection change entirely.
+    // We also need to check if the offset is at the boundary,
+    // because in this case, we might need to normalize to a
+    // sibling instead.
+    if (
+      shouldSkipSelectionChange(anchorDOM, anchorOffset) &&
+      shouldSkipSelectionChange(focusDOM, focusOffset)
+    ) {
+      return;
+    }
+  }
+  updateEditor(editor, () => {
+    // Non-active editor don't need any extra logic for selection, it only needs update
+    // to reconcile selection (set it to null) to ensure that only one editor has non-null selection.
+    if (!isActive) {
+      $setSelection(null);
+      return;
+    }
+
+    if (!isSelectionWithinEditor(editor, anchorDOM, focusDOM)) {
+      return;
+    }
+
+    const selection = $getSelection();
+
+    // Update the selection format
+    if ($isRangeSelection(selection)) {
+      const anchor = selection.anchor;
+      const anchorNode = anchor.getNode();
+
+      if (selection.isCollapsed()) {
+        // Badly interpreted range selection when collapsed - #1482
+        if (
+          domSelection.type === 'Range' &&
+          domSelection.anchorNode === domSelection.focusNode
+        ) {
+          selection.dirty = true;
+        }
+
+        // If we have marked a collapsed selection format, and we're
+        // within the given time range – then attempt to use that format
+        // instead of getting the format from the anchor node.
+        const windowEvent = getWindow(editor).event;
+        const currentTimeStamp = windowEvent
+          ? windowEvent.timeStamp
+          : performance.now();
+        const [lastFormat, lastStyle, lastOffset, lastKey, timeStamp] =
+          collapsedSelectionFormat;
+
+        const root = $getRoot();
+        const isRootTextContentEmpty =
+          editor.isComposing() === false && root.getTextContent() === '';
+
+        if (
+          currentTimeStamp < timeStamp + 200 &&
+          anchor.offset === lastOffset &&
+          anchor.key === lastKey
+        ) {
+          selection.format = lastFormat;
+          selection.style = lastStyle;
+        } else {
+          if (anchor.type === 'text') {
+            invariant(
+              $isTextNode(anchorNode),
+              'Point.getNode() must return TextNode when type is text',
+            );
+            selection.format = anchorNode.getFormat();
+            selection.style = anchorNode.getStyle();
+          } else if (anchor.type === 'element' && !isRootTextContentEmpty) {
+            const lastNode = anchor.getNode();
+            selection.style = '';
+            if (
+              lastNode instanceof ParagraphNode &&
+              lastNode.getChildrenSize() === 0
+            ) {
+              selection.format = lastNode.getTextFormat();
+              selection.style = lastNode.getTextStyle();
+            } else {
+              selection.format = 0;
+            }
+          }
+        }
+      } else {
+        const anchorKey = anchor.key;
+        const focus = selection.focus;
+        const focusKey = focus.key;
+        const nodes = selection.getNodes();
+        const nodesLength = nodes.length;
+        const isBackward = selection.isBackward();
+        const startOffset = isBackward ? focusOffset : anchorOffset;
+        const endOffset = isBackward ? anchorOffset : focusOffset;
+        const startKey = isBackward ? focusKey : anchorKey;
+        const endKey = isBackward ? anchorKey : focusKey;
+        let combinedFormat = IS_ALL_FORMATTING;
+        let hasTextNodes = false;
+        for (let i = 0; i < nodesLength; i++) {
+          const node = nodes[i];
+          const textContentSize = node.getTextContentSize();
+          if (
+            $isTextNode(node) &&
+            textContentSize !== 0 &&
+            // Exclude empty text nodes at boundaries resulting from user's selection
+            !(
+              (i === 0 &&
+                node.__key === startKey &&
+                startOffset === textContentSize) ||
+              (i === nodesLength - 1 &&
+                node.__key === endKey &&
+                endOffset === 0)
+            )
+          ) {
+            // TODO: what about style?
+            hasTextNodes = true;
+            combinedFormat &= node.getFormat();
+            if (combinedFormat === 0) {
+              break;
+            }
+          }
+        }
+
+        selection.format = hasTextNodes ? combinedFormat : 0;
+      }
+    }
+
+    dispatchCommand(editor, SELECTION_CHANGE_COMMAND, undefined);
+  });
+}
+
+// This is a work-around is mainly Chrome specific bug where if you select
+// the contents of an empty block, you cannot easily unselect anything.
+// This results in a tiny selection box that looks buggy/broken. This can
+// also help other browsers when selection might "appear" lost, when it
+// really isn't.
+function onClick(event: PointerEvent, editor: LexicalEditor): void {
+  updateEditor(editor, () => {
+    const selection = $getSelection();
+    const domSelection = getDOMSelection(editor._window);
+    const lastSelection = $getPreviousSelection();
+
+    if (domSelection) {
+      if ($isRangeSelection(selection)) {
+        const anchor = selection.anchor;
+        const anchorNode = anchor.getNode();
+
+        if (
+          anchor.type === 'element' &&
+          anchor.offset === 0 &&
+          selection.isCollapsed() &&
+          !$isRootNode(anchorNode) &&
+          $getRoot().getChildrenSize() === 1 &&
+          anchorNode.getTopLevelElementOrThrow().isEmpty() &&
+          lastSelection !== null &&
+          selection.is(lastSelection)
+        ) {
+          domSelection.removeAllRanges();
+          selection.dirty = true;
+        } else if (event.detail === 3 && !selection.isCollapsed()) {
+          // Tripple click causing selection to overflow into the nearest element. In that
+          // case visually it looks like a single element content is selected, focus node
+          // is actually at the beginning of the next element (if present) and any manipulations
+          // with selection (formatting) are affecting second element as well
+          const focus = selection.focus;
+          const focusNode = focus.getNode();
+          if (anchorNode !== focusNode) {
+            if ($isElementNode(anchorNode)) {
+              anchorNode.select(0);
+            } else {
+              anchorNode.getParentOrThrow().select(0);
+            }
+          }
+        }
+      } else if (event.pointerType === 'touch') {
+        // This is used to update the selection on touch devices when the user clicks on text after a
+        // node selection. See isSelectionChangeFromMouseDown for the inverse
+        const domAnchorNode = domSelection.anchorNode;
+        if (domAnchorNode !== null) {
+          const nodeType = domAnchorNode.nodeType;
+          // If the user is attempting to click selection back onto text, then
+          // we should attempt create a range selection.
+          // When we click on an empty paragraph node or the end of a paragraph that ends
+          // with an image/poll, the nodeType will be ELEMENT_NODE
+          if (nodeType === DOM_ELEMENT_TYPE || nodeType === DOM_TEXT_TYPE) {
+            const newSelection = $internalCreateRangeSelection(
+              lastSelection,
+              domSelection,
+              editor,
+              event,
+            );
+            $setSelection(newSelection);
+          }
+        }
+      }
+    }
+
+    dispatchCommand(editor, CLICK_COMMAND, event);
+  });
+}
+
+function onPointerDown(event: PointerEvent, editor: LexicalEditor) {
+  // TODO implement text drag & drop
+  const target = event.target;
+  const pointerType = event.pointerType;
+  if (target instanceof Node && pointerType !== 'touch') {
+    updateEditor(editor, () => {
+      // Drag & drop should not recompute selection until mouse up; otherwise the initially
+      // selected content is lost.
+      if (!$isSelectionCapturedInDecorator(target)) {
+        isSelectionChangeFromMouseDown = true;
+      }
+    });
+  }
+}
+
+function getTargetRange(event: InputEvent): null | StaticRange {
+  if (!event.getTargetRanges) {
+    return null;
+  }
+  const targetRanges = event.getTargetRanges();
+  if (targetRanges.length === 0) {
+    return null;
+  }
+  return targetRanges[0];
+}
+
+function $canRemoveText(
+  anchorNode: TextNode | ElementNode,
+  focusNode: TextNode | ElementNode,
+): boolean {
+  return (
+    anchorNode !== focusNode ||
+    $isElementNode(anchorNode) ||
+    $isElementNode(focusNode) ||
+    !anchorNode.isToken() ||
+    !focusNode.isToken()
+  );
+}
+
+function isPossiblyAndroidKeyPress(timeStamp: number): boolean {
+  return (
+    lastKeyCode === 'MediaLast' &&
+    timeStamp < lastKeyDownTimeStamp + ANDROID_COMPOSITION_LATENCY
+  );
+}
+
+function onBeforeInput(event: InputEvent, editor: LexicalEditor): void {
+  const inputType = event.inputType;
+  const targetRange = getTargetRange(event);
+
+  // We let the browser do its own thing for composition.
+  if (
+    inputType === 'deleteCompositionText' ||
+    // If we're pasting in FF, we shouldn't get this event
+    // as the `paste` event should have triggered, unless the
+    // user has dom.event.clipboardevents.enabled disabled in
+    // about:config. In that case, we need to process the
+    // pasted content in the DOM mutation phase.
+    (IS_FIREFOX && isFirefoxClipboardEvents(editor))
+  ) {
+    return;
+  } else if (inputType === 'insertCompositionText') {
+    return;
+  }
+
+  updateEditor(editor, () => {
+    const selection = $getSelection();
+
+    if (inputType === 'deleteContentBackward') {
+      if (selection === null) {
+        // Use previous selection
+        const prevSelection = $getPreviousSelection();
+
+        if (!$isRangeSelection(prevSelection)) {
+          return;
+        }
+
+        $setSelection(prevSelection.clone());
+      }
+
+      if ($isRangeSelection(selection)) {
+        const isSelectionAnchorSameAsFocus =
+          selection.anchor.key === selection.focus.key;
+
+        if (
+          isPossiblyAndroidKeyPress(event.timeStamp) &&
+          editor.isComposing() &&
+          isSelectionAnchorSameAsFocus
+        ) {
+          $setCompositionKey(null);
+          lastKeyDownTimeStamp = 0;
+          // Fixes an Android bug where selection flickers when backspacing
+          setTimeout(() => {
+            updateEditor(editor, () => {
+              $setCompositionKey(null);
+            });
+          }, ANDROID_COMPOSITION_LATENCY);
+          if ($isRangeSelection(selection)) {
+            const anchorNode = selection.anchor.getNode();
+            anchorNode.markDirty();
+            selection.format = anchorNode.getFormat();
+            invariant(
+              $isTextNode(anchorNode),
+              'Anchor node must be a TextNode',
+            );
+            selection.style = anchorNode.getStyle();
+          }
+        } else {
+          $setCompositionKey(null);
+          event.preventDefault();
+          // Chromium Android at the moment seems to ignore the preventDefault
+          // on 'deleteContentBackward' and still deletes the content. Which leads
+          // to multiple deletions. So we let the browser handle the deletion in this case.
+          const selectedNodeText = selection.anchor.getNode().getTextContent();
+          const hasSelectedAllTextInNode =
+            selection.anchor.offset === 0 &&
+            selection.focus.offset === selectedNodeText.length;
+          const shouldLetBrowserHandleDelete =
+            IS_ANDROID_CHROME &&
+            isSelectionAnchorSameAsFocus &&
+            !hasSelectedAllTextInNode;
+          if (!shouldLetBrowserHandleDelete) {
+            dispatchCommand(editor, DELETE_CHARACTER_COMMAND, true);
+          }
+        }
+        return;
+      }
+    }
+
+    if (!$isRangeSelection(selection)) {
+      return;
+    }
+
+    const data = event.data;
+
+    // This represents the case when two beforeinput events are triggered at the same time (without a
+    // full event loop ending at input). This happens with MacOS with the default keyboard settings,
+    // a combination of autocorrection + autocapitalization.
+    // Having Lexical run everything in controlled mode would fix the issue without additional code
+    // but this would kill the massive performance win from the most common typing event.
+    // Alternatively, when this happens we can prematurely update our EditorState based on the DOM
+    // content, a job that would usually be the input event's responsibility.
+    if (unprocessedBeforeInputData !== null) {
+      $updateSelectedTextFromDOM(false, editor, unprocessedBeforeInputData);
+    }
+
+    if (
+      (!selection.dirty || unprocessedBeforeInputData !== null) &&
+      selection.isCollapsed() &&
+      !$isRootNode(selection.anchor.getNode()) &&
+      targetRange !== null
+    ) {
+      selection.applyDOMRange(targetRange);
+    }
+
+    unprocessedBeforeInputData = null;
+
+    const anchor = selection.anchor;
+    const focus = selection.focus;
+    const anchorNode = anchor.getNode();
+    const focusNode = focus.getNode();
+
+    if (inputType === 'insertText' || inputType === 'insertTranspose') {
+      if (data === '\n') {
+        event.preventDefault();
+        dispatchCommand(editor, INSERT_LINE_BREAK_COMMAND, false);
+      } else if (data === DOUBLE_LINE_BREAK) {
+        event.preventDefault();
+        dispatchCommand(editor, INSERT_PARAGRAPH_COMMAND, undefined);
+      } else if (data == null && event.dataTransfer) {
+        // Gets around a Safari text replacement bug.
+        const text = event.dataTransfer.getData('text/plain');
+        event.preventDefault();
+        selection.insertRawText(text);
+      } else if (
+        data != null &&
+        $shouldPreventDefaultAndInsertText(
+          selection,
+          targetRange,
+          data,
+          event.timeStamp,
+          true,
+        )
+      ) {
+        event.preventDefault();
+        dispatchCommand(editor, CONTROLLED_TEXT_INSERTION_COMMAND, data);
+      } else {
+        unprocessedBeforeInputData = data;
+      }
+      lastBeforeInputInsertTextTimeStamp = event.timeStamp;
+      return;
+    }
+
+    // Prevent the browser from carrying out
+    // the input event, so we can control the
+    // output.
+    event.preventDefault();
+
+    switch (inputType) {
+      case 'insertFromYank':
+      case 'insertFromDrop':
+      case 'insertReplacementText': {
+        dispatchCommand(editor, CONTROLLED_TEXT_INSERTION_COMMAND, event);
+        break;
+      }
+
+      case 'insertFromComposition': {
+        // This is the end of composition
+        $setCompositionKey(null);
+        dispatchCommand(editor, CONTROLLED_TEXT_INSERTION_COMMAND, event);
+        break;
+      }
+
+      case 'insertLineBreak': {
+        // Used for Android
+        $setCompositionKey(null);
+        dispatchCommand(editor, INSERT_LINE_BREAK_COMMAND, false);
+        break;
+      }
+
+      case 'insertParagraph': {
+        // Used for Android
+        $setCompositionKey(null);
+
+        // Safari does not provide the type "insertLineBreak".
+        // So instead, we need to infer it from the keyboard event.
+        // We do not apply this logic to iOS to allow newline auto-capitalization
+        // work without creating linebreaks when pressing Enter
+        if (isInsertLineBreak && !IS_IOS) {
+          isInsertLineBreak = false;
+          dispatchCommand(editor, INSERT_LINE_BREAK_COMMAND, false);
+        } else {
+          dispatchCommand(editor, INSERT_PARAGRAPH_COMMAND, undefined);
+        }
+
+        break;
+      }
+
+      case 'insertFromPaste':
+      case 'insertFromPasteAsQuotation': {
+        dispatchCommand(editor, PASTE_COMMAND, event);
+        break;
+      }
+
+      case 'deleteByComposition': {
+        if ($canRemoveText(anchorNode, focusNode)) {
+          dispatchCommand(editor, REMOVE_TEXT_COMMAND, event);
+        }
+
+        break;
+      }
+
+      case 'deleteByDrag':
+      case 'deleteByCut': {
+        dispatchCommand(editor, REMOVE_TEXT_COMMAND, event);
+        break;
+      }
+
+      case 'deleteContent': {
+        dispatchCommand(editor, DELETE_CHARACTER_COMMAND, false);
+        break;
+      }
+
+      case 'deleteWordBackward': {
+        dispatchCommand(editor, DELETE_WORD_COMMAND, true);
+        break;
+      }
+
+      case 'deleteWordForward': {
+        dispatchCommand(editor, DELETE_WORD_COMMAND, false);
+        break;
+      }
+
+      case 'deleteHardLineBackward':
+      case 'deleteSoftLineBackward': {
+        dispatchCommand(editor, DELETE_LINE_COMMAND, true);
+        break;
+      }
+
+      case 'deleteContentForward':
+      case 'deleteHardLineForward':
+      case 'deleteSoftLineForward': {
+        dispatchCommand(editor, DELETE_LINE_COMMAND, false);
+        break;
+      }
+
+      case 'formatStrikeThrough': {
+        dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'strikethrough');
+        break;
+      }
+
+      case 'formatBold': {
+        dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'bold');
+        break;
+      }
+
+      case 'formatItalic': {
+        dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'italic');
+        break;
+      }
+
+      case 'formatUnderline': {
+        dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'underline');
+        break;
+      }
+
+      case 'historyUndo': {
+        dispatchCommand(editor, UNDO_COMMAND, undefined);
+        break;
+      }
+
+      case 'historyRedo': {
+        dispatchCommand(editor, REDO_COMMAND, undefined);
+        break;
+      }
+
+      default:
+      // NO-OP
+    }
+  });
+}
+
+function onInput(event: InputEvent, editor: LexicalEditor): void {
+  // We don't want the onInput to bubble, in the case of nested editors.
+  event.stopPropagation();
+  updateEditor(editor, () => {
+    const selection = $getSelection();
+    const data = event.data;
+    const targetRange = getTargetRange(event);
+
+    if (
+      data != null &&
+      $isRangeSelection(selection) &&
+      $shouldPreventDefaultAndInsertText(
+        selection,
+        targetRange,
+        data,
+        event.timeStamp,
+        false,
+      )
+    ) {
+      // Given we're over-riding the default behavior, we will need
+      // to ensure to disable composition before dispatching the
+      // insertText command for when changing the sequence for FF.
+      if (isFirefoxEndingComposition) {
+        $onCompositionEndImpl(editor, data);
+        isFirefoxEndingComposition = false;
+      }
+      const anchor = selection.anchor;
+      const anchorNode = anchor.getNode();
+      const domSelection = getDOMSelection(editor._window);
+      if (domSelection === null) {
+        return;
+      }
+      const isBackward = selection.isBackward();
+      const startOffset = isBackward
+        ? selection.anchor.offset
+        : selection.focus.offset;
+      const endOffset = isBackward
+        ? selection.focus.offset
+        : selection.anchor.offset;
+      // If the content is the same as inserted, then don't dispatch an insertion.
+      // Given onInput doesn't take the current selection (it uses the previous)
+      // we can compare that against what the DOM currently says.
+      if (
+        !CAN_USE_BEFORE_INPUT ||
+        selection.isCollapsed() ||
+        !$isTextNode(anchorNode) ||
+        domSelection.anchorNode === null ||
+        anchorNode.getTextContent().slice(0, startOffset) +
+          data +
+          anchorNode.getTextContent().slice(startOffset + endOffset) !==
+          getAnchorTextFromDOM(domSelection.anchorNode)
+      ) {
+        dispatchCommand(editor, CONTROLLED_TEXT_INSERTION_COMMAND, data);
+      }
+
+      const textLength = data.length;
+
+      // Another hack for FF, as it's possible that the IME is still
+      // open, even though compositionend has already fired (sigh).
+      if (
+        IS_FIREFOX &&
+        textLength > 1 &&
+        event.inputType === 'insertCompositionText' &&
+        !editor.isComposing()
+      ) {
+        selection.anchor.offset -= textLength;
+      }
+
+      // This ensures consistency on Android.
+      if (!IS_SAFARI && !IS_IOS && !IS_APPLE_WEBKIT && editor.isComposing()) {
+        lastKeyDownTimeStamp = 0;
+        $setCompositionKey(null);
+      }
+    } else {
+      const characterData = data !== null ? data : undefined;
+      $updateSelectedTextFromDOM(false, editor, characterData);
+
+      // onInput always fires after onCompositionEnd for FF.
+      if (isFirefoxEndingComposition) {
+        $onCompositionEndImpl(editor, data || undefined);
+        isFirefoxEndingComposition = false;
+      }
+    }
+
+    // Also flush any other mutations that might have occurred
+    // since the change.
+    $flushMutations();
+  });
+  unprocessedBeforeInputData = null;
+}
+
+function onCompositionStart(
+  event: CompositionEvent,
+  editor: LexicalEditor,
+): void {
+  updateEditor(editor, () => {
+    const selection = $getSelection();
+
+    if ($isRangeSelection(selection) && !editor.isComposing()) {
+      const anchor = selection.anchor;
+      const node = selection.anchor.getNode();
+      $setCompositionKey(anchor.key);
+
+      if (
+        // If it has been 30ms since the last keydown, then we should
+        // apply the empty space heuristic. We can't do this for Safari,
+        // as the keydown fires after composition start.
+        event.timeStamp < lastKeyDownTimeStamp + ANDROID_COMPOSITION_LATENCY ||
+        // FF has issues around composing multibyte characters, so we also
+        // need to invoke the empty space heuristic below.
+        anchor.type === 'element' ||
+        !selection.isCollapsed() ||
+        node.getFormat() !== selection.format ||
+        ($isTextNode(node) && node.getStyle() !== selection.style)
+      ) {
+        // We insert a zero width character, ready for the composition
+        // to get inserted into the new node we create. If
+        // we don't do this, Safari will fail on us because
+        // there is no text node matching the selection.
+        dispatchCommand(
+          editor,
+          CONTROLLED_TEXT_INSERTION_COMMAND,
+          COMPOSITION_START_CHAR,
+        );
+      }
+    }
+  });
+}
+
+function $onCompositionEndImpl(editor: LexicalEditor, data?: string): void {
+  const compositionKey = editor._compositionKey;
+  $setCompositionKey(null);
+
+  // Handle termination of composition.
+  if (compositionKey !== null && data != null) {
+    // Composition can sometimes move to an adjacent DOM node when backspacing.
+    // So check for the empty case.
+    if (data === '') {
+      const node = $getNodeByKey(compositionKey);
+      const textNode = getDOMTextNode(editor.getElementByKey(compositionKey));
+
+      if (
+        textNode !== null &&
+        textNode.nodeValue !== null &&
+        $isTextNode(node)
+      ) {
+        $updateTextNodeFromDOMContent(
+          node,
+          textNode.nodeValue,
+          null,
+          null,
+          true,
+        );
+      }
+
+      return;
+    }
+
+    // Composition can sometimes be that of a new line. In which case, we need to
+    // handle that accordingly.
+    if (data[data.length - 1] === '\n') {
+      const selection = $getSelection();
+
+      if ($isRangeSelection(selection)) {
+        // If the last character is a line break, we also need to insert
+        // a line break.
+        const focus = selection.focus;
+        selection.anchor.set(focus.key, focus.offset, focus.type);
+        dispatchCommand(editor, KEY_ENTER_COMMAND, null);
+        return;
+      }
+    }
+  }
+
+  $updateSelectedTextFromDOM(true, editor, data);
+}
+
+function onCompositionEnd(
+  event: CompositionEvent,
+  editor: LexicalEditor,
+): void {
+  // Firefox fires onCompositionEnd before onInput, but Chrome/Webkit,
+  // fire onInput before onCompositionEnd. To ensure the sequence works
+  // like Chrome/Webkit we use the isFirefoxEndingComposition flag to
+  // defer handling of onCompositionEnd in Firefox till we have processed
+  // the logic in onInput.
+  if (IS_FIREFOX) {
+    isFirefoxEndingComposition = true;
+  } else {
+    updateEditor(editor, () => {
+      $onCompositionEndImpl(editor, event.data);
+    });
+  }
+}
+
+function onKeyDown(event: KeyboardEvent, editor: LexicalEditor): void {
+  lastKeyDownTimeStamp = event.timeStamp;
+  lastKeyCode = event.key;
+  if (editor.isComposing()) {
+    return;
+  }
+
+  const {key, shiftKey, ctrlKey, metaKey, altKey} = event;
+
+  if (dispatchCommand(editor, KEY_DOWN_COMMAND, event)) {
+    return;
+  }
+
+  if (key == null) {
+    return;
+  }
+
+  if (isMoveForward(key, ctrlKey, altKey, metaKey)) {
+    dispatchCommand(editor, KEY_ARROW_RIGHT_COMMAND, event);
+  } else if (isMoveToEnd(key, ctrlKey, shiftKey, altKey, metaKey)) {
+    dispatchCommand(editor, MOVE_TO_END, event);
+  } else if (isMoveBackward(key, ctrlKey, altKey, metaKey)) {
+    dispatchCommand(editor, KEY_ARROW_LEFT_COMMAND, event);
+  } else if (isMoveToStart(key, ctrlKey, shiftKey, altKey, metaKey)) {
+    dispatchCommand(editor, MOVE_TO_START, event);
+  } else if (isMoveUp(key, ctrlKey, metaKey)) {
+    dispatchCommand(editor, KEY_ARROW_UP_COMMAND, event);
+  } else if (isMoveDown(key, ctrlKey, metaKey)) {
+    dispatchCommand(editor, KEY_ARROW_DOWN_COMMAND, event);
+  } else if (isLineBreak(key, shiftKey)) {
+    isInsertLineBreak = true;
+    dispatchCommand(editor, KEY_ENTER_COMMAND, event);
+  } else if (isSpace(key)) {
+    dispatchCommand(editor, KEY_SPACE_COMMAND, event);
+  } else if (isOpenLineBreak(key, ctrlKey)) {
+    event.preventDefault();
+    isInsertLineBreak = true;
+    dispatchCommand(editor, INSERT_LINE_BREAK_COMMAND, true);
+  } else if (isParagraph(key, shiftKey)) {
+    isInsertLineBreak = false;
+    dispatchCommand(editor, KEY_ENTER_COMMAND, event);
+  } else if (isDeleteBackward(key, altKey, metaKey, ctrlKey)) {
+    if (isBackspace(key)) {
+      dispatchCommand(editor, KEY_BACKSPACE_COMMAND, event);
+    } else {
+      event.preventDefault();
+      dispatchCommand(editor, DELETE_CHARACTER_COMMAND, true);
+    }
+  } else if (isEscape(key)) {
+    dispatchCommand(editor, KEY_ESCAPE_COMMAND, event);
+  } else if (isDeleteForward(key, ctrlKey, shiftKey, altKey, metaKey)) {
+    if (isDelete(key)) {
+      dispatchCommand(editor, KEY_DELETE_COMMAND, event);
+    } else {
+      event.preventDefault();
+      dispatchCommand(editor, DELETE_CHARACTER_COMMAND, false);
+    }
+  } else if (isDeleteWordBackward(key, altKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, DELETE_WORD_COMMAND, true);
+  } else if (isDeleteWordForward(key, altKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, DELETE_WORD_COMMAND, false);
+  } else if (isDeleteLineBackward(key, metaKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, DELETE_LINE_COMMAND, true);
+  } else if (isDeleteLineForward(key, metaKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, DELETE_LINE_COMMAND, false);
+  } else if (isBold(key, altKey, metaKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'bold');
+  } else if (isUnderline(key, altKey, metaKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'underline');
+  } else if (isItalic(key, altKey, metaKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'italic');
+  } else if (isTab(key, altKey, ctrlKey, metaKey)) {
+    dispatchCommand(editor, KEY_TAB_COMMAND, event);
+  } else if (isUndo(key, shiftKey, metaKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, UNDO_COMMAND, undefined);
+  } else if (isRedo(key, shiftKey, metaKey, ctrlKey)) {
+    event.preventDefault();
+    dispatchCommand(editor, REDO_COMMAND, undefined);
+  } else {
+    const prevSelection = editor._editorState._selection;
+    if ($isNodeSelection(prevSelection)) {
+      if (isCopy(key, shiftKey, metaKey, ctrlKey)) {
+        event.preventDefault();
+        dispatchCommand(editor, COPY_COMMAND, event);
+      } else if (isCut(key, shiftKey, metaKey, ctrlKey)) {
+        event.preventDefault();
+        dispatchCommand(editor, CUT_COMMAND, event);
+      } else if (isSelectAll(key, metaKey, ctrlKey)) {
+        event.preventDefault();
+        dispatchCommand(editor, SELECT_ALL_COMMAND, event);
+      }
+      // FF does it well (no need to override behavior)
+    } else if (!IS_FIREFOX && isSelectAll(key, metaKey, ctrlKey)) {
+      event.preventDefault();
+      dispatchCommand(editor, SELECT_ALL_COMMAND, event);
+    }
+  }
+
+  if (isModifier(ctrlKey, shiftKey, altKey, metaKey)) {
+    dispatchCommand(editor, KEY_MODIFIER_COMMAND, event);
+  }
+}
+
+function getRootElementRemoveHandles(
+  rootElement: HTMLElement,
+): RootElementRemoveHandles {
+  // @ts-expect-error: internal field
+  let eventHandles = rootElement.__lexicalEventHandles;
+
+  if (eventHandles === undefined) {
+    eventHandles = [];
+    // @ts-expect-error: internal field
+    rootElement.__lexicalEventHandles = eventHandles;
+  }
+
+  return eventHandles;
+}
+
+// Mapping root editors to their active nested editors, contains nested editors
+// mapping only, so if root editor is selected map will have no reference to free up memory
+const activeNestedEditorsMap: Map<string, LexicalEditor> = new Map();
+
+function onDocumentSelectionChange(event: Event): void {
+  const target = event.target as null | Element | Document;
+  const targetWindow =
+    target == null
+      ? null
+      : target.nodeType === 9
+      ? (target as Document).defaultView
+      : (target as Element).ownerDocument.defaultView;
+  const domSelection = getDOMSelection(targetWindow);
+  if (domSelection === null) {
+    return;
+  }
+  const nextActiveEditor = getNearestEditorFromDOMNode(domSelection.anchorNode);
+  if (nextActiveEditor === null) {
+    return;
+  }
+
+  if (isSelectionChangeFromMouseDown) {
+    isSelectionChangeFromMouseDown = false;
+    updateEditor(nextActiveEditor, () => {
+      const lastSelection = $getPreviousSelection();
+      const domAnchorNode = domSelection.anchorNode;
+      if (domAnchorNode === null) {
+        return;
+      }
+      const nodeType = domAnchorNode.nodeType;
+      // If the user is attempting to click selection back onto text, then
+      // we should attempt create a range selection.
+      // When we click on an empty paragraph node or the end of a paragraph that ends
+      // with an image/poll, the nodeType will be ELEMENT_NODE
+      if (nodeType !== DOM_ELEMENT_TYPE && nodeType !== DOM_TEXT_TYPE) {
+        return;
+      }
+      const newSelection = $internalCreateRangeSelection(
+        lastSelection,
+        domSelection,
+        nextActiveEditor,
+        event,
+      );
+      $setSelection(newSelection);
+    });
+  }
+
+  // When editor receives selection change event, we're checking if
+  // it has any sibling editors (within same parent editor) that were active
+  // before, and trigger selection change on it to nullify selection.
+  const editors = getEditorsToPropagate(nextActiveEditor);
+  const rootEditor = editors[editors.length - 1];
+  const rootEditorKey = rootEditor._key;
+  const activeNestedEditor = activeNestedEditorsMap.get(rootEditorKey);
+  const prevActiveEditor = activeNestedEditor || rootEditor;
+
+  if (prevActiveEditor !== nextActiveEditor) {
+    onSelectionChange(domSelection, prevActiveEditor, false);
+  }
+
+  onSelectionChange(domSelection, nextActiveEditor, true);
+
+  // If newly selected editor is nested, then add it to the map, clean map otherwise
+  if (nextActiveEditor !== rootEditor) {
+    activeNestedEditorsMap.set(rootEditorKey, nextActiveEditor);
+  } else if (activeNestedEditor) {
+    activeNestedEditorsMap.delete(rootEditorKey);
+  }
+}
+
+function stopLexicalPropagation(event: Event): void {
+  // We attach a special property to ensure the same event doesn't re-fire
+  // for parent editors.
+  // @ts-ignore
+  event._lexicalHandled = true;
+}
+
+function hasStoppedLexicalPropagation(event: Event): boolean {
+  // @ts-ignore
+  const stopped = event._lexicalHandled === true;
+  return stopped;
+}
+
+export type EventHandler = (event: Event, editor: LexicalEditor) => void;
+
+export function addRootElementEvents(
+  rootElement: HTMLElement,
+  editor: LexicalEditor,
+): void {
+  // We only want to have a single global selectionchange event handler, shared
+  // between all editor instances.
+  const doc = rootElement.ownerDocument;
+  const documentRootElementsCount = rootElementsRegistered.get(doc);
+  if (
+    documentRootElementsCount === undefined ||
+    documentRootElementsCount < 1
+  ) {
+    doc.addEventListener('selectionchange', onDocumentSelectionChange);
+  }
+  rootElementsRegistered.set(doc, (documentRootElementsCount || 0) + 1);
+
+  // @ts-expect-error: internal field
+  rootElement.__lexicalEditor = editor;
+  const removeHandles = getRootElementRemoveHandles(rootElement);
+
+  for (let i = 0; i < rootElementEvents.length; i++) {
+    const [eventName, onEvent] = rootElementEvents[i];
+    const eventHandler =
+      typeof onEvent === 'function'
+        ? (event: Event) => {
+            if (hasStoppedLexicalPropagation(event)) {
+              return;
+            }
+            stopLexicalPropagation(event);
+            if (editor.isEditable() || eventName === 'click') {
+              onEvent(event, editor);
+            }
+          }
+        : (event: Event) => {
+            if (hasStoppedLexicalPropagation(event)) {
+              return;
+            }
+            stopLexicalPropagation(event);
+            const isEditable = editor.isEditable();
+            switch (eventName) {
+              case 'cut':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, CUT_COMMAND, event as ClipboardEvent)
+                );
+
+              case 'copy':
+                return dispatchCommand(
+                  editor,
+                  COPY_COMMAND,
+                  event as ClipboardEvent,
+                );
+
+              case 'paste':
+                return (
+                  isEditable &&
+                  dispatchCommand(
+                    editor,
+                    PASTE_COMMAND,
+                    event as ClipboardEvent,
+                  )
+                );
+
+              case 'dragstart':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, DRAGSTART_COMMAND, event as DragEvent)
+                );
+
+              case 'dragover':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, DRAGOVER_COMMAND, event as DragEvent)
+                );
+
+              case 'dragend':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, DRAGEND_COMMAND, event as DragEvent)
+                );
+
+              case 'focus':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, FOCUS_COMMAND, event as FocusEvent)
+                );
+
+              case 'blur': {
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, BLUR_COMMAND, event as FocusEvent)
+                );
+              }
+
+              case 'drop':
+                return (
+                  isEditable &&
+                  dispatchCommand(editor, DROP_COMMAND, event as DragEvent)
+                );
+            }
+          };
+    rootElement.addEventListener(eventName, eventHandler);
+    removeHandles.push(() => {
+      rootElement.removeEventListener(eventName, eventHandler);
+    });
+  }
+}
+
+export function removeRootElementEvents(rootElement: HTMLElement): void {
+  const doc = rootElement.ownerDocument;
+  const documentRootElementsCount = rootElementsRegistered.get(doc);
+  invariant(
+    documentRootElementsCount !== undefined,
+    'Root element not registered',
+  );
+
+  // We only want to have a single global selectionchange event handler, shared
+  // between all editor instances.
+  const newCount = documentRootElementsCount - 1;
+  invariant(newCount >= 0, 'Root element count less than 0');
+  rootElementsRegistered.set(doc, newCount);
+  if (newCount === 0) {
+    doc.removeEventListener('selectionchange', onDocumentSelectionChange);
+  }
+
+  const editor = getEditorPropertyFromDOMNode(rootElement);
+
+  if (isLexicalEditor(editor)) {
+    cleanActiveNestedEditorsMap(editor);
+    // @ts-expect-error: internal field
+    rootElement.__lexicalEditor = null;
+  } else if (editor) {
+    invariant(
+      false,
+      'Attempted to remove event handlers from a node that does not belong to this build of Lexical',
+    );
+  }
+
+  const removeHandles = getRootElementRemoveHandles(rootElement);
+
+  for (let i = 0; i < removeHandles.length; i++) {
+    removeHandles[i]();
+  }
+
+  // @ts-expect-error: internal field
+  rootElement.__lexicalEventHandles = [];
+}
+
+function cleanActiveNestedEditorsMap(editor: LexicalEditor) {
+  if (editor._parentEditor !== null) {
+    // For nested editor cleanup map if this editor was marked as active
+    const editors = getEditorsToPropagate(editor);
+    const rootEditor = editors[editors.length - 1];
+    const rootEditorKey = rootEditor._key;
+
+    if (activeNestedEditorsMap.get(rootEditorKey) === editor) {
+      activeNestedEditorsMap.delete(rootEditorKey);
+    }
+  } else {
+    // For top-level editors cleanup map
+    activeNestedEditorsMap.delete(editor._key);
+  }
+}
+
+export function markSelectionChangeFromDOMUpdate(): void {
+  isSelectionChangeFromDOMUpdate = true;
+}
+
+export function markCollapsedSelectionFormat(
+  format: number,
+  style: string,
+  offset: number,
+  key: NodeKey,
+  timeStamp: number,
+): void {
+  collapsedSelectionFormat = [format, style, offset, key, timeStamp];
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalGC.ts b/resources/js/wysiwyg/lexical/core/LexicalGC.ts
new file mode 100644
index 00000000000..9405ae6cfb8
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalGC.ts
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {ElementNode} from '.';
+import type {LexicalEditor} from './LexicalEditor';
+import type {EditorState} from './LexicalEditorState';
+import type {NodeKey, NodeMap} from './LexicalNode';
+
+import {$isElementNode} from '.';
+import {cloneDecorators} from './LexicalUtils';
+
+export function $garbageCollectDetachedDecorators(
+  editor: LexicalEditor,
+  pendingEditorState: EditorState,
+): void {
+  const currentDecorators = editor._decorators;
+  const pendingDecorators = editor._pendingDecorators;
+  let decorators = pendingDecorators || currentDecorators;
+  const nodeMap = pendingEditorState._nodeMap;
+  let key;
+
+  for (key in decorators) {
+    if (!nodeMap.has(key)) {
+      if (decorators === currentDecorators) {
+        decorators = cloneDecorators(editor);
+      }
+
+      delete decorators[key];
+    }
+  }
+}
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+function $garbageCollectDetachedDeepChildNodes(
+  node: ElementNode,
+  parentKey: NodeKey,
+  prevNodeMap: NodeMap,
+  nodeMap: NodeMap,
+  nodeMapDelete: Array<NodeKey>,
+  dirtyNodes: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+): void {
+  let child = node.getFirstChild();
+
+  while (child !== null) {
+    const childKey = child.__key;
+    // TODO Revise condition below, redundant? LexicalNode already cleans up children when moving Nodes
+    if (child.__parent === parentKey) {
+      if ($isElementNode(child)) {
+        $garbageCollectDetachedDeepChildNodes(
+          child,
+          childKey,
+          prevNodeMap,
+          nodeMap,
+          nodeMapDelete,
+          dirtyNodes,
+        );
+      }
+
+      // If we have created a node and it was dereferenced, then also
+      // remove it from out dirty nodes Set.
+      if (!prevNodeMap.has(childKey)) {
+        dirtyNodes.delete(childKey);
+      }
+      nodeMapDelete.push(childKey);
+    }
+    child = child.getNextSibling();
+  }
+}
+
+export function $garbageCollectDetachedNodes(
+  prevEditorState: EditorState,
+  editorState: EditorState,
+  dirtyLeaves: Set<NodeKey>,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+): void {
+  const prevNodeMap = prevEditorState._nodeMap;
+  const nodeMap = editorState._nodeMap;
+  // Store dirtyElements in a queue for later deletion; deleting dirty subtrees too early will
+  // hinder accessing .__next on child nodes
+  const nodeMapDelete: Array<NodeKey> = [];
+
+  for (const [nodeKey] of dirtyElements) {
+    const node = nodeMap.get(nodeKey);
+    if (node !== undefined) {
+      // Garbage collect node and its children if they exist
+      if (!node.isAttached()) {
+        if ($isElementNode(node)) {
+          $garbageCollectDetachedDeepChildNodes(
+            node,
+            nodeKey,
+            prevNodeMap,
+            nodeMap,
+            nodeMapDelete,
+            dirtyElements,
+          );
+        }
+        // If we have created a node and it was dereferenced, then also
+        // remove it from out dirty nodes Set.
+        if (!prevNodeMap.has(nodeKey)) {
+          dirtyElements.delete(nodeKey);
+        }
+        nodeMapDelete.push(nodeKey);
+      }
+    }
+  }
+  for (const nodeKey of nodeMapDelete) {
+    nodeMap.delete(nodeKey);
+  }
+
+  for (const nodeKey of dirtyLeaves) {
+    const node = nodeMap.get(nodeKey);
+    if (node !== undefined && !node.isAttached()) {
+      if (!prevNodeMap.has(nodeKey)) {
+        dirtyLeaves.delete(nodeKey);
+      }
+      nodeMap.delete(nodeKey);
+    }
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
new file mode 100644
index 00000000000..56f364501ee
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
@@ -0,0 +1,322 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {TextNode} from '.';
+import type {LexicalEditor} from './LexicalEditor';
+import type {BaseSelection} from './LexicalSelection';
+
+import {IS_FIREFOX} from 'lexical/shared/environment';
+
+import {
+  $getSelection,
+  $isDecoratorNode,
+  $isElementNode,
+  $isRangeSelection,
+  $isTextNode,
+  $setSelection,
+} from '.';
+import {DOM_TEXT_TYPE} from './LexicalConstants';
+import {updateEditor} from './LexicalUpdates';
+import {
+  $getNearestNodeFromDOMNode,
+  $getNodeFromDOMNode,
+  $updateTextNodeFromDOMContent,
+  getDOMSelection,
+  getWindow,
+  internalGetRoot,
+  isFirefoxClipboardEvents,
+} from './LexicalUtils';
+// The time between a text entry event and the mutation observer firing.
+const TEXT_MUTATION_VARIANCE = 100;
+
+let isProcessingMutations = false;
+let lastTextEntryTimeStamp = 0;
+
+export function getIsProcessingMutations(): boolean {
+  return isProcessingMutations;
+}
+
+function updateTimeStamp(event: Event) {
+  lastTextEntryTimeStamp = event.timeStamp;
+}
+
+function initTextEntryListener(editor: LexicalEditor): void {
+  if (lastTextEntryTimeStamp === 0) {
+    getWindow(editor).addEventListener('textInput', updateTimeStamp, true);
+  }
+}
+
+function isManagedLineBreak(
+  dom: Node,
+  target: Node,
+  editor: LexicalEditor,
+): boolean {
+  return (
+    // @ts-expect-error: internal field
+    target.__lexicalLineBreak === dom ||
+    // @ts-ignore We intentionally add this to the Node.
+    dom[`__lexicalKey_${editor._key}`] !== undefined
+  );
+}
+
+function getLastSelection(editor: LexicalEditor): null | BaseSelection {
+  return editor.getEditorState().read(() => {
+    const selection = $getSelection();
+    return selection !== null ? selection.clone() : null;
+  });
+}
+
+function $handleTextMutation(
+  target: Text,
+  node: TextNode,
+  editor: LexicalEditor,
+): void {
+  const domSelection = getDOMSelection(editor._window);
+  let anchorOffset = null;
+  let focusOffset = null;
+
+  if (domSelection !== null && domSelection.anchorNode === target) {
+    anchorOffset = domSelection.anchorOffset;
+    focusOffset = domSelection.focusOffset;
+  }
+
+  const text = target.nodeValue;
+  if (text !== null) {
+    $updateTextNodeFromDOMContent(node, text, anchorOffset, focusOffset, false);
+  }
+}
+
+function shouldUpdateTextNodeFromMutation(
+  selection: null | BaseSelection,
+  targetDOM: Node,
+  targetNode: TextNode,
+): boolean {
+  if ($isRangeSelection(selection)) {
+    const anchorNode = selection.anchor.getNode();
+    if (
+      anchorNode.is(targetNode) &&
+      selection.format !== anchorNode.getFormat()
+    ) {
+      return false;
+    }
+  }
+  return targetDOM.nodeType === DOM_TEXT_TYPE && targetNode.isAttached();
+}
+
+export function $flushMutations(
+  editor: LexicalEditor,
+  mutations: Array<MutationRecord>,
+  observer: MutationObserver,
+): void {
+  isProcessingMutations = true;
+  const shouldFlushTextMutations =
+    performance.now() - lastTextEntryTimeStamp > TEXT_MUTATION_VARIANCE;
+
+  try {
+    updateEditor(editor, () => {
+      const selection = $getSelection() || getLastSelection(editor);
+      const badDOMTargets = new Map();
+      const rootElement = editor.getRootElement();
+      // We use the current editor state, as that reflects what is
+      // actually "on screen".
+      const currentEditorState = editor._editorState;
+      const blockCursorElement = editor._blockCursorElement;
+      let shouldRevertSelection = false;
+      let possibleTextForFirefoxPaste = '';
+
+      for (let i = 0; i < mutations.length; i++) {
+        const mutation = mutations[i];
+        const type = mutation.type;
+        const targetDOM = mutation.target;
+        let targetNode = $getNearestNodeFromDOMNode(
+          targetDOM,
+          currentEditorState,
+        );
+
+        if (
+          (targetNode === null && targetDOM !== rootElement) ||
+          $isDecoratorNode(targetNode)
+        ) {
+          continue;
+        }
+
+        if (type === 'characterData') {
+          // Text mutations are deferred and passed to mutation listeners to be
+          // processed outside of the Lexical engine.
+          if (
+            shouldFlushTextMutations &&
+            $isTextNode(targetNode) &&
+            shouldUpdateTextNodeFromMutation(selection, targetDOM, targetNode)
+          ) {
+            $handleTextMutation(
+              // nodeType === DOM_TEXT_TYPE is a Text DOM node
+              targetDOM as Text,
+              targetNode,
+              editor,
+            );
+          }
+        } else if (type === 'childList') {
+          shouldRevertSelection = true;
+          // We attempt to "undo" any changes that have occurred outside
+          // of Lexical. We want Lexical's editor state to be source of truth.
+          // To the user, these will look like no-ops.
+          const addedDOMs = mutation.addedNodes;
+
+          for (let s = 0; s < addedDOMs.length; s++) {
+            const addedDOM = addedDOMs[s];
+            const node = $getNodeFromDOMNode(addedDOM);
+            const parentDOM = addedDOM.parentNode;
+
+            if (
+              parentDOM != null &&
+              addedDOM !== blockCursorElement &&
+              node === null &&
+              (addedDOM.nodeName !== 'BR' ||
+                !isManagedLineBreak(addedDOM, parentDOM, editor))
+            ) {
+              if (IS_FIREFOX) {
+                const possibleText =
+                  (addedDOM as HTMLElement).innerText || addedDOM.nodeValue;
+
+                if (possibleText) {
+                  possibleTextForFirefoxPaste += possibleText;
+                }
+              }
+
+              parentDOM.removeChild(addedDOM);
+            }
+          }
+
+          const removedDOMs = mutation.removedNodes;
+          const removedDOMsLength = removedDOMs.length;
+
+          if (removedDOMsLength > 0) {
+            let unremovedBRs = 0;
+
+            for (let s = 0; s < removedDOMsLength; s++) {
+              const removedDOM = removedDOMs[s];
+
+              if (
+                (removedDOM.nodeName === 'BR' &&
+                  isManagedLineBreak(removedDOM, targetDOM, editor)) ||
+                blockCursorElement === removedDOM
+              ) {
+                targetDOM.appendChild(removedDOM);
+                unremovedBRs++;
+              }
+            }
+
+            if (removedDOMsLength !== unremovedBRs) {
+              if (targetDOM === rootElement) {
+                targetNode = internalGetRoot(currentEditorState);
+              }
+
+              badDOMTargets.set(targetDOM, targetNode);
+            }
+          }
+        }
+      }
+
+      // Now we process each of the unique target nodes, attempting
+      // to restore their contents back to the source of truth, which
+      // is Lexical's "current" editor state. This is basically like
+      // an internal revert on the DOM.
+      if (badDOMTargets.size > 0) {
+        for (const [targetDOM, targetNode] of badDOMTargets) {
+          if ($isElementNode(targetNode)) {
+            const childKeys = targetNode.getChildrenKeys();
+            let currentDOM = targetDOM.firstChild;
+
+            for (let s = 0; s < childKeys.length; s++) {
+              const key = childKeys[s];
+              const correctDOM = editor.getElementByKey(key);
+
+              if (correctDOM === null) {
+                continue;
+              }
+
+              if (currentDOM == null) {
+                targetDOM.appendChild(correctDOM);
+                currentDOM = correctDOM;
+              } else if (currentDOM !== correctDOM) {
+                targetDOM.replaceChild(correctDOM, currentDOM);
+              }
+
+              currentDOM = currentDOM.nextSibling;
+            }
+          } else if ($isTextNode(targetNode)) {
+            targetNode.markDirty();
+          }
+        }
+      }
+
+      // Capture all the mutations made during this function. This
+      // also prevents us having to process them on the next cycle
+      // of onMutation, as these mutations were made by us.
+      const records = observer.takeRecords();
+
+      // Check for any random auto-added <br> elements, and remove them.
+      // These get added by the browser when we undo the above mutations
+      // and this can lead to a broken UI.
+      if (records.length > 0) {
+        for (let i = 0; i < records.length; i++) {
+          const record = records[i];
+          const addedNodes = record.addedNodes;
+          const target = record.target;
+
+          for (let s = 0; s < addedNodes.length; s++) {
+            const addedDOM = addedNodes[s];
+            const parentDOM = addedDOM.parentNode;
+
+            if (
+              parentDOM != null &&
+              addedDOM.nodeName === 'BR' &&
+              !isManagedLineBreak(addedDOM, target, editor)
+            ) {
+              parentDOM.removeChild(addedDOM);
+            }
+          }
+        }
+
+        // Clear any of those removal mutations
+        observer.takeRecords();
+      }
+
+      if (selection !== null) {
+        if (shouldRevertSelection) {
+          selection.dirty = true;
+          $setSelection(selection);
+        }
+
+        if (IS_FIREFOX && isFirefoxClipboardEvents(editor)) {
+          selection.insertRawText(possibleTextForFirefoxPaste);
+        }
+      }
+    });
+  } finally {
+    isProcessingMutations = false;
+  }
+}
+
+export function $flushRootMutations(editor: LexicalEditor): void {
+  const observer = editor._observer;
+
+  if (observer !== null) {
+    const mutations = observer.takeRecords();
+    $flushMutations(editor, mutations, observer);
+  }
+}
+
+export function initMutationObserver(editor: LexicalEditor): void {
+  initTextEntryListener(editor);
+  editor._observer = new MutationObserver(
+    (mutations: Array<MutationRecord>, observer: MutationObserver) => {
+      $flushMutations(editor, mutations, observer);
+    },
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
new file mode 100644
index 00000000000..c6bc2e642ee
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -0,0 +1,1221 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/* eslint-disable no-constant-condition */
+import type {EditorConfig, LexicalEditor} from './LexicalEditor';
+import type {BaseSelection, RangeSelection} from './LexicalSelection';
+import type {Klass, KlassConstructor} from 'lexical';
+
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $createParagraphNode,
+  $isDecoratorNode,
+  $isElementNode,
+  $isRootNode,
+  $isTextNode,
+  type DecoratorNode,
+  ElementNode,
+} from '.';
+import {
+  $getSelection,
+  $isNodeSelection,
+  $isRangeSelection,
+  $moveSelectionPointToEnd,
+  $updateElementSelectionOnCreateDeleteNode,
+  moveSelectionPointToSibling,
+} from './LexicalSelection';
+import {
+  errorOnReadOnly,
+  getActiveEditor,
+  getActiveEditorState,
+} from './LexicalUpdates';
+import {
+  $cloneWithProperties,
+  $getCompositionKey,
+  $getNodeByKey,
+  $isRootOrShadowRoot,
+  $maybeMoveChildrenSelectionToParent,
+  $setCompositionKey,
+  $setNodeKey,
+  $setSelection,
+  errorOnInsertTextNodeOnRoot,
+  internalMarkNodeAsDirty,
+  removeFromParent,
+} from './LexicalUtils';
+
+export type NodeMap = Map<NodeKey, LexicalNode>;
+
+export type SerializedLexicalNode = {
+  type: string;
+  version: number;
+};
+
+export function $removeNode(
+  nodeToRemove: LexicalNode,
+  restoreSelection: boolean,
+  preserveEmptyParent?: boolean,
+): void {
+  errorOnReadOnly();
+  const key = nodeToRemove.__key;
+  const parent = nodeToRemove.getParent();
+  if (parent === null) {
+    return;
+  }
+  const selection = $maybeMoveChildrenSelectionToParent(nodeToRemove);
+  let selectionMoved = false;
+  if ($isRangeSelection(selection) && restoreSelection) {
+    const anchor = selection.anchor;
+    const focus = selection.focus;
+    if (anchor.key === key) {
+      moveSelectionPointToSibling(
+        anchor,
+        nodeToRemove,
+        parent,
+        nodeToRemove.getPreviousSibling(),
+        nodeToRemove.getNextSibling(),
+      );
+      selectionMoved = true;
+    }
+    if (focus.key === key) {
+      moveSelectionPointToSibling(
+        focus,
+        nodeToRemove,
+        parent,
+        nodeToRemove.getPreviousSibling(),
+        nodeToRemove.getNextSibling(),
+      );
+      selectionMoved = true;
+    }
+  } else if (
+    $isNodeSelection(selection) &&
+    restoreSelection &&
+    nodeToRemove.isSelected()
+  ) {
+    nodeToRemove.selectPrevious();
+  }
+
+  if ($isRangeSelection(selection) && restoreSelection && !selectionMoved) {
+    // Doing this is O(n) so lets avoid it unless we need to do it
+    const index = nodeToRemove.getIndexWithinParent();
+    removeFromParent(nodeToRemove);
+    $updateElementSelectionOnCreateDeleteNode(selection, parent, index, -1);
+  } else {
+    removeFromParent(nodeToRemove);
+  }
+
+  if (
+    !preserveEmptyParent &&
+    !$isRootOrShadowRoot(parent) &&
+    !parent.canBeEmpty() &&
+    parent.isEmpty()
+  ) {
+    $removeNode(parent, restoreSelection);
+  }
+  if (restoreSelection && $isRootNode(parent) && parent.isEmpty()) {
+    parent.selectEnd();
+  }
+}
+
+export type DOMConversion<T extends HTMLElement = HTMLElement> = {
+  conversion: DOMConversionFn<T>;
+  priority?: 0 | 1 | 2 | 3 | 4;
+};
+
+export type DOMConversionFn<T extends HTMLElement = HTMLElement> = (
+  element: T,
+) => DOMConversionOutput | null;
+
+export type DOMChildConversion = (
+  lexicalNode: LexicalNode,
+  parentLexicalNode: LexicalNode | null | undefined,
+) => LexicalNode | null | undefined;
+
+export type DOMConversionMap<T extends HTMLElement = HTMLElement> = Record<
+  NodeName,
+  (node: T) => DOMConversion<T> | null
+>;
+type NodeName = string;
+
+export type DOMConversionOutput = {
+  after?: (childLexicalNodes: Array<LexicalNode>) => Array<LexicalNode>;
+  forChild?: DOMChildConversion;
+  node: null | LexicalNode | Array<LexicalNode>;
+};
+
+export type DOMExportOutputMap = Map<
+  Klass<LexicalNode>,
+  (editor: LexicalEditor, target: LexicalNode) => DOMExportOutput
+>;
+
+export type DOMExportOutput = {
+  after?: (
+    generatedElement: HTMLElement | Text | null | undefined,
+  ) => HTMLElement | Text | null | undefined;
+  element: HTMLElement | Text | null;
+};
+
+export type NodeKey = string;
+
+export class LexicalNode {
+  // Allow us to look up the type including static props
+  ['constructor']!: KlassConstructor<typeof LexicalNode>;
+  /** @internal */
+  __type: string;
+  /** @internal */
+  //@ts-ignore We set the key in the constructor.
+  __key: string;
+  /** @internal */
+  __parent: null | NodeKey;
+  /** @internal */
+  __prev: null | NodeKey;
+  /** @internal */
+  __next: null | NodeKey;
+
+  // Flow doesn't support abstract classes unfortunately, so we can't _force_
+  // subclasses of Node to implement statics. All subclasses of Node should have
+  // a static getType and clone method though. We define getType and clone here so we can call it
+  // on any  Node, and we throw this error by default since the subclass should provide
+  // their own implementation.
+  /**
+   * Returns the string type of this node. Every node must
+   * implement this and it MUST BE UNIQUE amongst nodes registered
+   * on the editor.
+   *
+   */
+  static getType(): string {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .getType().',
+      this.name,
+    );
+  }
+
+  /**
+   * Clones this node, creating a new node with a different key
+   * and adding it to the EditorState (but not attaching it anywhere!). All nodes must
+   * implement this method.
+   *
+   */
+  static clone(_data: unknown): LexicalNode {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .clone().',
+      this.name,
+    );
+  }
+
+  /**
+   * Perform any state updates on the clone of prevNode that are not already
+   * handled by the constructor call in the static clone method. If you have
+   * state to update in your clone that is not handled directly by the
+   * constructor, it is advisable to override this method but it is required
+   * to include a call to `super.afterCloneFrom(prevNode)` in your
+   * implementation. This is only intended to be called by
+   * {@link $cloneWithProperties} function or via a super call.
+   *
+   * @example
+   * ```ts
+   * class ClassesTextNode extends TextNode {
+   *   // Not shown: static getType, static importJSON, exportJSON, createDOM, updateDOM
+   *   __classes = new Set<string>();
+   *   static clone(node: ClassesTextNode): ClassesTextNode {
+   *     // The inherited TextNode constructor is used here, so
+   *     // classes is not set by this method.
+   *     return new ClassesTextNode(node.__text, node.__key);
+   *   }
+   *   afterCloneFrom(node: this): void {
+   *     // This calls TextNode.afterCloneFrom and LexicalNode.afterCloneFrom
+   *     // for necessary state updates
+   *     super.afterCloneFrom(node);
+   *     this.__addClasses(node.__classes);
+   *   }
+   *   // This method is a private implementation detail, it is not
+   *   // suitable for the public API because it does not call getWritable
+   *   __addClasses(classNames: Iterable<string>): this {
+   *     for (const className of classNames) {
+   *       this.__classes.add(className);
+   *     }
+   *     return this;
+   *   }
+   *   addClass(...classNames: string[]): this {
+   *     return this.getWritable().__addClasses(classNames);
+   *   }
+   *   removeClass(...classNames: string[]): this {
+   *     const node = this.getWritable();
+   *     for (const className of classNames) {
+   *       this.__classes.delete(className);
+   *     }
+   *     return this;
+   *   }
+   *   getClasses(): Set<string> {
+   *     return this.getLatest().__classes;
+   *   }
+   * }
+   * ```
+   *
+   */
+  afterCloneFrom(prevNode: this) {
+    this.__parent = prevNode.__parent;
+    this.__next = prevNode.__next;
+    this.__prev = prevNode.__prev;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static importDOM?: () => DOMConversionMap<any> | null;
+
+  constructor(key?: NodeKey) {
+    this.__type = this.constructor.getType();
+    this.__parent = null;
+    this.__prev = null;
+    this.__next = null;
+    $setNodeKey(this, key);
+
+    if (__DEV__) {
+      if (this.__type !== 'root') {
+        errorOnReadOnly();
+        errorOnTypeKlassMismatch(this.__type, this.constructor);
+      }
+    }
+  }
+  // Getters and Traversers
+
+  /**
+   * Returns the string type of this node.
+   */
+  getType(): string {
+    return this.__type;
+  }
+
+  isInline(): boolean {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .isInline().',
+      this.constructor.name,
+    );
+  }
+
+  /**
+   * Returns true if there is a path between this node and the RootNode, false otherwise.
+   * This is a way of determining if the node is "attached" EditorState. Unattached nodes
+   * won't be reconciled and will ultimatelt be cleaned up by the Lexical GC.
+   */
+  isAttached(): boolean {
+    let nodeKey: string | null = this.__key;
+    while (nodeKey !== null) {
+      if (nodeKey === 'root') {
+        return true;
+      }
+
+      const node: LexicalNode | null = $getNodeByKey(nodeKey);
+
+      if (node === null) {
+        break;
+      }
+      nodeKey = node.__parent;
+    }
+    return false;
+  }
+
+  /**
+   * Returns true if this node is contained within the provided Selection., false otherwise.
+   * Relies on the algorithms implemented in {@link BaseSelection.getNodes} to determine
+   * what's included.
+   *
+   * @param selection - The selection that we want to determine if the node is in.
+   */
+  isSelected(selection?: null | BaseSelection): boolean {
+    const targetSelection = selection || $getSelection();
+    if (targetSelection == null) {
+      return false;
+    }
+
+    const isSelected = targetSelection
+      .getNodes()
+      .some((n) => n.__key === this.__key);
+
+    if ($isTextNode(this)) {
+      return isSelected;
+    }
+    // For inline images inside of element nodes.
+    // Without this change the image will be selected if the cursor is before or after it.
+    const isElementRangeSelection =
+      $isRangeSelection(targetSelection) &&
+      targetSelection.anchor.type === 'element' &&
+      targetSelection.focus.type === 'element';
+
+    if (isElementRangeSelection) {
+      if (targetSelection.isCollapsed()) {
+        return false;
+      }
+
+      const parentNode = this.getParent();
+      if ($isDecoratorNode(this) && this.isInline() && parentNode) {
+        const firstPoint = targetSelection.isBackward()
+          ? targetSelection.focus
+          : targetSelection.anchor;
+        const firstElement = firstPoint.getNode() as ElementNode;
+        if (
+          firstPoint.offset === firstElement.getChildrenSize() &&
+          firstElement.is(parentNode) &&
+          firstElement.getLastChildOrThrow().is(this)
+        ) {
+          return false;
+        }
+      }
+    }
+    return isSelected;
+  }
+
+  /**
+   * Returns this nodes key.
+   */
+  getKey(): NodeKey {
+    // Key is stable between copies
+    return this.__key;
+  }
+
+  /**
+   * Returns the zero-based index of this node within the parent.
+   */
+  getIndexWithinParent(): number {
+    const parent = this.getParent();
+    if (parent === null) {
+      return -1;
+    }
+    let node = parent.getFirstChild();
+    let index = 0;
+    while (node !== null) {
+      if (this.is(node)) {
+        return index;
+      }
+      index++;
+      node = node.getNextSibling();
+    }
+    return -1;
+  }
+
+  /**
+   * Returns the parent of this node, or null if none is found.
+   */
+  getParent<T extends ElementNode>(): T | null {
+    const parent = this.getLatest().__parent;
+    if (parent === null) {
+      return null;
+    }
+    return $getNodeByKey<T>(parent);
+  }
+
+  /**
+   * Returns the parent of this node, or throws if none is found.
+   */
+  getParentOrThrow<T extends ElementNode>(): T {
+    const parent = this.getParent<T>();
+    if (parent === null) {
+      invariant(false, 'Expected node %s to have a parent.', this.__key);
+    }
+    return parent;
+  }
+
+  /**
+   * Returns the highest (in the EditorState tree)
+   * non-root ancestor of this node, or null if none is found. See {@link lexical!$isRootOrShadowRoot}
+   * for more information on which Elements comprise "roots".
+   */
+  getTopLevelElement(): ElementNode | DecoratorNode<unknown> | null {
+    let node: ElementNode | this | null = this;
+    while (node !== null) {
+      const parent: ElementNode | null = node.getParent();
+      if ($isRootOrShadowRoot(parent)) {
+        invariant(
+          $isElementNode(node) || (node === this && $isDecoratorNode(node)),
+          'Children of root nodes must be elements or decorators',
+        );
+        return node;
+      }
+      node = parent;
+    }
+    return null;
+  }
+
+  /**
+   * Returns the highest (in the EditorState tree)
+   * non-root ancestor of this node, or throws if none is found. See {@link lexical!$isRootOrShadowRoot}
+   * for more information on which Elements comprise "roots".
+   */
+  getTopLevelElementOrThrow(): ElementNode | DecoratorNode<unknown> {
+    const parent = this.getTopLevelElement();
+    if (parent === null) {
+      invariant(
+        false,
+        'Expected node %s to have a top parent element.',
+        this.__key,
+      );
+    }
+    return parent;
+  }
+
+  /**
+   * Returns a list of the every ancestor of this node,
+   * all the way up to the RootNode.
+   *
+   */
+  getParents(): Array<ElementNode> {
+    const parents: Array<ElementNode> = [];
+    let node = this.getParent();
+    while (node !== null) {
+      parents.push(node);
+      node = node.getParent();
+    }
+    return parents;
+  }
+
+  /**
+   * Returns a list of the keys of every ancestor of this node,
+   * all the way up to the RootNode.
+   *
+   */
+  getParentKeys(): Array<NodeKey> {
+    const parents = [];
+    let node = this.getParent();
+    while (node !== null) {
+      parents.push(node.__key);
+      node = node.getParent();
+    }
+    return parents;
+  }
+
+  /**
+   * Returns the "previous" siblings - that is, the node that comes
+   * before this one in the same parent.
+   *
+   */
+  getPreviousSibling<T extends LexicalNode>(): T | null {
+    const self = this.getLatest();
+    const prevKey = self.__prev;
+    return prevKey === null ? null : $getNodeByKey<T>(prevKey);
+  }
+
+  /**
+   * Returns the "previous" siblings - that is, the nodes that come between
+   * this one and the first child of it's parent, inclusive.
+   *
+   */
+  getPreviousSiblings<T extends LexicalNode>(): Array<T> {
+    const siblings: Array<T> = [];
+    const parent = this.getParent();
+    if (parent === null) {
+      return siblings;
+    }
+    let node: null | T = parent.getFirstChild();
+    while (node !== null) {
+      if (node.is(this)) {
+        break;
+      }
+      siblings.push(node);
+      node = node.getNextSibling();
+    }
+    return siblings;
+  }
+
+  /**
+   * Returns the "next" siblings - that is, the node that comes
+   * after this one in the same parent
+   *
+   */
+  getNextSibling<T extends LexicalNode>(): T | null {
+    const self = this.getLatest();
+    const nextKey = self.__next;
+    return nextKey === null ? null : $getNodeByKey<T>(nextKey);
+  }
+
+  /**
+   * Returns all "next" siblings - that is, the nodes that come between this
+   * one and the last child of it's parent, inclusive.
+   *
+   */
+  getNextSiblings<T extends LexicalNode>(): Array<T> {
+    const siblings: Array<T> = [];
+    let node: null | T = this.getNextSibling();
+    while (node !== null) {
+      siblings.push(node);
+      node = node.getNextSibling();
+    }
+    return siblings;
+  }
+
+  /**
+   * Returns the closest common ancestor of this node and the provided one or null
+   * if one cannot be found.
+   *
+   * @param node - the other node to find the common ancestor of.
+   */
+  getCommonAncestor<T extends ElementNode = ElementNode>(
+    node: LexicalNode,
+  ): T | null {
+    const a = this.getParents();
+    const b = node.getParents();
+    if ($isElementNode(this)) {
+      a.unshift(this);
+    }
+    if ($isElementNode(node)) {
+      b.unshift(node);
+    }
+    const aLength = a.length;
+    const bLength = b.length;
+    if (aLength === 0 || bLength === 0 || a[aLength - 1] !== b[bLength - 1]) {
+      return null;
+    }
+    const bSet = new Set(b);
+    for (let i = 0; i < aLength; i++) {
+      const ancestor = a[i] as T;
+      if (bSet.has(ancestor)) {
+        return ancestor;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns true if the provided node is the exact same one as this node, from Lexical's perspective.
+   * Always use this instead of referential equality.
+   *
+   * @param object - the node to perform the equality comparison on.
+   */
+  is(object: LexicalNode | null | undefined): boolean {
+    if (object == null) {
+      return false;
+    }
+    return this.__key === object.__key;
+  }
+
+  /**
+   * Returns true if this node logical precedes the target node in the editor state.
+   *
+   * @param targetNode - the node we're testing to see if it's after this one.
+   */
+  isBefore(targetNode: LexicalNode): boolean {
+    if (this === targetNode) {
+      return false;
+    }
+    if (targetNode.isParentOf(this)) {
+      return true;
+    }
+    if (this.isParentOf(targetNode)) {
+      return false;
+    }
+    const commonAncestor = this.getCommonAncestor(targetNode);
+    let indexA = 0;
+    let indexB = 0;
+    let node: this | ElementNode | LexicalNode = this;
+    while (true) {
+      const parent: ElementNode = node.getParentOrThrow();
+      if (parent === commonAncestor) {
+        indexA = node.getIndexWithinParent();
+        break;
+      }
+      node = parent;
+    }
+    node = targetNode;
+    while (true) {
+      const parent: ElementNode = node.getParentOrThrow();
+      if (parent === commonAncestor) {
+        indexB = node.getIndexWithinParent();
+        break;
+      }
+      node = parent;
+    }
+    return indexA < indexB;
+  }
+
+  /**
+   * Returns true if this node is the parent of the target node, false otherwise.
+   *
+   * @param targetNode - the would-be child node.
+   */
+  isParentOf(targetNode: LexicalNode): boolean {
+    const key = this.__key;
+    if (key === targetNode.__key) {
+      return false;
+    }
+    let node: ElementNode | LexicalNode | null = targetNode;
+    while (node !== null) {
+      if (node.__key === key) {
+        return true;
+      }
+      node = node.getParent();
+    }
+    return false;
+  }
+
+  // TO-DO: this function can be simplified a lot
+  /**
+   * Returns a list of nodes that are between this node and
+   * the target node in the EditorState.
+   *
+   * @param targetNode - the node that marks the other end of the range of nodes to be returned.
+   */
+  getNodesBetween(targetNode: LexicalNode): Array<LexicalNode> {
+    const isBefore = this.isBefore(targetNode);
+    const nodes = [];
+    const visited = new Set();
+    let node: LexicalNode | this | null = this;
+    while (true) {
+      if (node === null) {
+        break;
+      }
+      const key = node.__key;
+      if (!visited.has(key)) {
+        visited.add(key);
+        nodes.push(node);
+      }
+      if (node === targetNode) {
+        break;
+      }
+      const child: LexicalNode | null = $isElementNode(node)
+        ? isBefore
+          ? node.getFirstChild()
+          : node.getLastChild()
+        : null;
+      if (child !== null) {
+        node = child;
+        continue;
+      }
+      const nextSibling: LexicalNode | null = isBefore
+        ? node.getNextSibling()
+        : node.getPreviousSibling();
+      if (nextSibling !== null) {
+        node = nextSibling;
+        continue;
+      }
+      const parent: LexicalNode | null = node.getParentOrThrow();
+      if (!visited.has(parent.__key)) {
+        nodes.push(parent);
+      }
+      if (parent === targetNode) {
+        break;
+      }
+      let parentSibling = null;
+      let ancestor: LexicalNode | null = parent;
+      do {
+        if (ancestor === null) {
+          invariant(false, 'getNodesBetween: ancestor is null');
+        }
+        parentSibling = isBefore
+          ? ancestor.getNextSibling()
+          : ancestor.getPreviousSibling();
+        ancestor = ancestor.getParent();
+        if (ancestor !== null) {
+          if (parentSibling === null && !visited.has(ancestor.__key)) {
+            nodes.push(ancestor);
+          }
+        } else {
+          break;
+        }
+      } while (parentSibling === null);
+      node = parentSibling;
+    }
+    if (!isBefore) {
+      nodes.reverse();
+    }
+    return nodes;
+  }
+
+  /**
+   * Returns true if this node has been marked dirty during this update cycle.
+   *
+   */
+  isDirty(): boolean {
+    const editor = getActiveEditor();
+    const dirtyLeaves = editor._dirtyLeaves;
+    return dirtyLeaves !== null && dirtyLeaves.has(this.__key);
+  }
+
+  /**
+   * Returns the latest version of the node from the active EditorState.
+   * This is used to avoid getting values from stale node references.
+   *
+   */
+  getLatest(): this {
+    const latest = $getNodeByKey<this>(this.__key);
+    if (latest === null) {
+      invariant(
+        false,
+        'Lexical node does not exist in active editor state. Avoid using the same node references between nested closures from editorState.read/editor.update.',
+      );
+    }
+    return latest;
+  }
+
+  /**
+   * Returns a mutable version of the node using {@link $cloneWithProperties}
+   * if necessary. Will throw an error if called outside of a Lexical Editor
+   * {@link LexicalEditor.update} callback.
+   *
+   */
+  getWritable(): this {
+    errorOnReadOnly();
+    const editorState = getActiveEditorState();
+    const editor = getActiveEditor();
+    const nodeMap = editorState._nodeMap;
+    const key = this.__key;
+    // Ensure we get the latest node from pending state
+    const latestNode = this.getLatest();
+    const cloneNotNeeded = editor._cloneNotNeeded;
+    const selection = $getSelection();
+    if (selection !== null) {
+      selection.setCachedNodes(null);
+    }
+    if (cloneNotNeeded.has(key)) {
+      // Transforms clear the dirty node set on each iteration to keep track on newly dirty nodes
+      internalMarkNodeAsDirty(latestNode);
+      return latestNode;
+    }
+    const mutableNode = $cloneWithProperties(latestNode);
+    cloneNotNeeded.add(key);
+    internalMarkNodeAsDirty(mutableNode);
+    // Update reference in node map
+    nodeMap.set(key, mutableNode);
+
+    return mutableNode;
+  }
+
+  /**
+   * Returns the text content of the node. Override this for
+   * custom nodes that should have a representation in plain text
+   * format (for copy + paste, for example)
+   *
+   */
+  getTextContent(): string {
+    return '';
+  }
+
+  /**
+   * Returns the length of the string produced by calling getTextContent on this node.
+   *
+   */
+  getTextContentSize(): number {
+    return this.getTextContent().length;
+  }
+
+  // View
+
+  /**
+   * Called during the reconciliation process to determine which nodes
+   * to insert into the DOM for this Lexical Node.
+   *
+   * This method must return exactly one HTMLElement. Nested elements are not supported.
+   *
+   * Do not attempt to update the Lexical EditorState during this phase of the update lifecyle.
+   *
+   * @param _config - allows access to things like the EditorTheme (to apply classes) during reconciliation.
+   * @param _editor - allows access to the editor for context during reconciliation.
+   *
+   * */
+  createDOM(_config: EditorConfig, _editor: LexicalEditor): HTMLElement {
+    invariant(false, 'createDOM: base method not extended');
+  }
+
+  /**
+   * Called when a node changes and should update the DOM
+   * in whatever way is necessary to make it align with any changes that might
+   * have happened during the update.
+   *
+   * Returning "true" here will cause lexical to unmount and recreate the DOM node
+   * (by calling createDOM). You would need to do this if the element tag changes,
+   * for instance.
+   *
+   * */
+  updateDOM(
+    _prevNode: unknown,
+    _dom: HTMLElement,
+    _config: EditorConfig,
+  ): boolean {
+    invariant(false, 'updateDOM: base method not extended');
+  }
+
+  /**
+   * Controls how the this node is serialized to HTML. This is important for
+   * copy and paste between Lexical and non-Lexical editors, or Lexical editors with different namespaces,
+   * in which case the primary transfer format is HTML. It's also important if you're serializing
+   * to HTML for any other reason via {@link @lexical/html!$generateHtmlFromNodes}. You could
+   * also use this method to build your own HTML renderer.
+   *
+   * */
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const element = this.createDOM(editor._config, editor);
+    return {element};
+  }
+
+  /**
+   * Controls how the this node is serialized to JSON. This is important for
+   * copy and paste between Lexical editors sharing the same namespace. It's also important
+   * if you're serializing to JSON for persistent storage somewhere.
+   * See [Serialization & Deserialization](https://lexical.dev/docs/concepts/serialization#lexical---html).
+   *
+   * */
+  exportJSON(): SerializedLexicalNode {
+    invariant(false, 'exportJSON: base method not extended');
+  }
+
+  /**
+   * Controls how the this node is deserialized from JSON. This is usually boilerplate,
+   * but provides an abstraction between the node implementation and serialized interface that can
+   * be important if you ever make breaking changes to a node schema (by adding or removing properties).
+   * See [Serialization & Deserialization](https://lexical.dev/docs/concepts/serialization#lexical---html).
+   *
+   * */
+  static importJSON(_serializedNode: SerializedLexicalNode): LexicalNode {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .importJSON().',
+      this.name,
+    );
+  }
+  /**
+   * @experimental
+   *
+   * Registers the returned function as a transform on the node during
+   * Editor initialization. Most such use cases should be addressed via
+   * the {@link LexicalEditor.registerNodeTransform} API.
+   *
+   * Experimental - use at your own risk.
+   */
+  static transform(): ((node: LexicalNode) => void) | null {
+    return null;
+  }
+
+  // Setters and mutators
+
+  /**
+   * Removes this LexicalNode from the EditorState. If the node isn't re-inserted
+   * somewhere, the Lexical garbage collector will eventually clean it up.
+   *
+   * @param preserveEmptyParent - If falsy, the node's parent will be removed if
+   * it's empty after the removal operation. This is the default behavior, subject to
+   * other node heuristics such as {@link ElementNode#canBeEmpty}
+   * */
+  remove(preserveEmptyParent?: boolean): void {
+    $removeNode(this, true, preserveEmptyParent);
+  }
+
+  /**
+   * Replaces this LexicalNode with the provided node, optionally transferring the children
+   * of the replaced node to the replacing node.
+   *
+   * @param replaceWith - The node to replace this one with.
+   * @param includeChildren - Whether or not to transfer the children of this node to the replacing node.
+   * */
+  replace<N extends LexicalNode>(replaceWith: N, includeChildren?: boolean): N {
+    errorOnReadOnly();
+    let selection = $getSelection();
+    if (selection !== null) {
+      selection = selection.clone();
+    }
+    errorOnInsertTextNodeOnRoot(this, replaceWith);
+    const self = this.getLatest();
+    const toReplaceKey = this.__key;
+    const key = replaceWith.__key;
+    const writableReplaceWith = replaceWith.getWritable();
+    const writableParent = this.getParentOrThrow().getWritable();
+    const size = writableParent.__size;
+    removeFromParent(writableReplaceWith);
+    const prevSibling = self.getPreviousSibling();
+    const nextSibling = self.getNextSibling();
+    const prevKey = self.__prev;
+    const nextKey = self.__next;
+    const parentKey = self.__parent;
+    $removeNode(self, false, true);
+
+    if (prevSibling === null) {
+      writableParent.__first = key;
+    } else {
+      const writablePrevSibling = prevSibling.getWritable();
+      writablePrevSibling.__next = key;
+    }
+    writableReplaceWith.__prev = prevKey;
+    if (nextSibling === null) {
+      writableParent.__last = key;
+    } else {
+      const writableNextSibling = nextSibling.getWritable();
+      writableNextSibling.__prev = key;
+    }
+    writableReplaceWith.__next = nextKey;
+    writableReplaceWith.__parent = parentKey;
+    writableParent.__size = size;
+    if (includeChildren) {
+      invariant(
+        $isElementNode(this) && $isElementNode(writableReplaceWith),
+        'includeChildren should only be true for ElementNodes',
+      );
+      this.getChildren().forEach((child: LexicalNode) => {
+        writableReplaceWith.append(child);
+      });
+    }
+    if ($isRangeSelection(selection)) {
+      $setSelection(selection);
+      const anchor = selection.anchor;
+      const focus = selection.focus;
+      if (anchor.key === toReplaceKey) {
+        $moveSelectionPointToEnd(anchor, writableReplaceWith);
+      }
+      if (focus.key === toReplaceKey) {
+        $moveSelectionPointToEnd(focus, writableReplaceWith);
+      }
+    }
+    if ($getCompositionKey() === toReplaceKey) {
+      $setCompositionKey(key);
+    }
+    return writableReplaceWith;
+  }
+
+  /**
+   * Inserts a node after this LexicalNode (as the next sibling).
+   *
+   * @param nodeToInsert - The node to insert after this one.
+   * @param restoreSelection - Whether or not to attempt to resolve the
+   * selection to the appropriate place after the operation is complete.
+   * */
+  insertAfter(nodeToInsert: LexicalNode, restoreSelection = true): LexicalNode {
+    errorOnReadOnly();
+    errorOnInsertTextNodeOnRoot(this, nodeToInsert);
+    const writableSelf = this.getWritable();
+    const writableNodeToInsert = nodeToInsert.getWritable();
+    const oldParent = writableNodeToInsert.getParent();
+    const selection = $getSelection();
+    let elementAnchorSelectionOnNode = false;
+    let elementFocusSelectionOnNode = false;
+    if (oldParent !== null) {
+      // TODO: this is O(n), can we improve?
+      const oldIndex = nodeToInsert.getIndexWithinParent();
+      removeFromParent(writableNodeToInsert);
+      if ($isRangeSelection(selection)) {
+        const oldParentKey = oldParent.__key;
+        const anchor = selection.anchor;
+        const focus = selection.focus;
+        elementAnchorSelectionOnNode =
+          anchor.type === 'element' &&
+          anchor.key === oldParentKey &&
+          anchor.offset === oldIndex + 1;
+        elementFocusSelectionOnNode =
+          focus.type === 'element' &&
+          focus.key === oldParentKey &&
+          focus.offset === oldIndex + 1;
+      }
+    }
+    const nextSibling = this.getNextSibling();
+    const writableParent = this.getParentOrThrow().getWritable();
+    const insertKey = writableNodeToInsert.__key;
+    const nextKey = writableSelf.__next;
+    if (nextSibling === null) {
+      writableParent.__last = insertKey;
+    } else {
+      const writableNextSibling = nextSibling.getWritable();
+      writableNextSibling.__prev = insertKey;
+    }
+    writableParent.__size++;
+    writableSelf.__next = insertKey;
+    writableNodeToInsert.__next = nextKey;
+    writableNodeToInsert.__prev = writableSelf.__key;
+    writableNodeToInsert.__parent = writableSelf.__parent;
+    if (restoreSelection && $isRangeSelection(selection)) {
+      const index = this.getIndexWithinParent();
+      $updateElementSelectionOnCreateDeleteNode(
+        selection,
+        writableParent,
+        index + 1,
+      );
+      const writableParentKey = writableParent.__key;
+      if (elementAnchorSelectionOnNode) {
+        selection.anchor.set(writableParentKey, index + 2, 'element');
+      }
+      if (elementFocusSelectionOnNode) {
+        selection.focus.set(writableParentKey, index + 2, 'element');
+      }
+    }
+    return nodeToInsert;
+  }
+
+  /**
+   * Inserts a node before this LexicalNode (as the previous sibling).
+   *
+   * @param nodeToInsert - The node to insert before this one.
+   * @param restoreSelection - Whether or not to attempt to resolve the
+   * selection to the appropriate place after the operation is complete.
+   * */
+  insertBefore(
+    nodeToInsert: LexicalNode,
+    restoreSelection = true,
+  ): LexicalNode {
+    errorOnReadOnly();
+    errorOnInsertTextNodeOnRoot(this, nodeToInsert);
+    const writableSelf = this.getWritable();
+    const writableNodeToInsert = nodeToInsert.getWritable();
+    const insertKey = writableNodeToInsert.__key;
+    removeFromParent(writableNodeToInsert);
+    const prevSibling = this.getPreviousSibling();
+    const writableParent = this.getParentOrThrow().getWritable();
+    const prevKey = writableSelf.__prev;
+    // TODO: this is O(n), can we improve?
+    const index = this.getIndexWithinParent();
+    if (prevSibling === null) {
+      writableParent.__first = insertKey;
+    } else {
+      const writablePrevSibling = prevSibling.getWritable();
+      writablePrevSibling.__next = insertKey;
+    }
+    writableParent.__size++;
+    writableSelf.__prev = insertKey;
+    writableNodeToInsert.__prev = prevKey;
+    writableNodeToInsert.__next = writableSelf.__key;
+    writableNodeToInsert.__parent = writableSelf.__parent;
+    const selection = $getSelection();
+    if (restoreSelection && $isRangeSelection(selection)) {
+      const parent = this.getParentOrThrow();
+      $updateElementSelectionOnCreateDeleteNode(selection, parent, index);
+    }
+    return nodeToInsert;
+  }
+
+  /**
+   * Whether or not this node has a required parent. Used during copy + paste operations
+   * to normalize nodes that would otherwise be orphaned. For example, ListItemNodes without
+   * a ListNode parent or TextNodes with a ParagraphNode parent.
+   *
+   * */
+  isParentRequired(): boolean {
+    return false;
+  }
+
+  /**
+   * The creation logic for any required parent. Should be implemented if {@link isParentRequired} returns true.
+   *
+   * */
+  createParentElementNode(): ElementNode {
+    return $createParagraphNode();
+  }
+
+  selectStart(): RangeSelection {
+    return this.selectPrevious();
+  }
+
+  selectEnd(): RangeSelection {
+    return this.selectNext(0, 0);
+  }
+
+  /**
+   * Moves selection to the previous sibling of this node, at the specified offsets.
+   *
+   * @param anchorOffset - The anchor offset for selection.
+   * @param focusOffset -  The focus offset for selection
+   * */
+  selectPrevious(anchorOffset?: number, focusOffset?: number): RangeSelection {
+    errorOnReadOnly();
+    const prevSibling = this.getPreviousSibling();
+    const parent = this.getParentOrThrow();
+    if (prevSibling === null) {
+      return parent.select(0, 0);
+    }
+    if ($isElementNode(prevSibling)) {
+      return prevSibling.select();
+    } else if (!$isTextNode(prevSibling)) {
+      const index = prevSibling.getIndexWithinParent() + 1;
+      return parent.select(index, index);
+    }
+    return prevSibling.select(anchorOffset, focusOffset);
+  }
+
+  /**
+   * Moves selection to the next sibling of this node, at the specified offsets.
+   *
+   * @param anchorOffset - The anchor offset for selection.
+   * @param focusOffset -  The focus offset for selection
+   * */
+  selectNext(anchorOffset?: number, focusOffset?: number): RangeSelection {
+    errorOnReadOnly();
+    const nextSibling = this.getNextSibling();
+    const parent = this.getParentOrThrow();
+    if (nextSibling === null) {
+      return parent.select();
+    }
+    if ($isElementNode(nextSibling)) {
+      return nextSibling.select(0, 0);
+    } else if (!$isTextNode(nextSibling)) {
+      const index = nextSibling.getIndexWithinParent();
+      return parent.select(index, index);
+    }
+    return nextSibling.select(anchorOffset, focusOffset);
+  }
+
+  /**
+   * Marks a node dirty, triggering transforms and
+   * forcing it to be reconciled during the update cycle.
+   *
+   * */
+  markDirty(): void {
+    this.getWritable();
+  }
+}
+
+function errorOnTypeKlassMismatch(
+  type: string,
+  klass: Klass<LexicalNode>,
+): void {
+  const registeredNode = getActiveEditor()._nodes.get(type);
+  // Common error - split in its own invariant
+  if (registeredNode === undefined) {
+    invariant(
+      false,
+      'Create node: Attempted to create node %s that was not configured to be used on the editor.',
+      klass.name,
+    );
+  }
+  const editorKlass = registeredNode.klass;
+  if (editorKlass !== klass) {
+    invariant(
+      false,
+      'Create node: Type %s in node %s does not match registered node %s with the same type',
+      type,
+      klass.name,
+      editorKlass.name,
+    );
+  }
+}
+
+/**
+ * Insert a series of nodes after this LexicalNode (as next siblings)
+ *
+ * @param firstToInsert - The first node to insert after this one.
+ * @param lastToInsert - The last node to insert after this one. Must be a
+ * later sibling of FirstNode. If not provided, it will be its last sibling.
+ */
+export function insertRangeAfter(
+  node: LexicalNode,
+  firstToInsert: LexicalNode,
+  lastToInsert?: LexicalNode,
+) {
+  const lastToInsert2 =
+    lastToInsert || firstToInsert.getParentOrThrow().getLastChild()!;
+  let current = firstToInsert;
+  const nodesToInsert = [firstToInsert];
+  while (current !== lastToInsert2) {
+    if (!current.getNextSibling()) {
+      invariant(
+        false,
+        'insertRangeAfter: lastToInsert must be a later sibling of firstToInsert',
+      );
+    }
+    current = current.getNextSibling()!;
+    nodesToInsert.push(current);
+  }
+
+  let currentNode: LexicalNode = node;
+  for (const nodeToInsert of nodesToInsert) {
+    currentNode = currentNode.insertAfter(nodeToInsert);
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalNormalization.ts b/resources/js/wysiwyg/lexical/core/LexicalNormalization.ts
new file mode 100644
index 00000000000..59a7be64489
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalNormalization.ts
@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {RangeSelection, TextNode} from '.';
+import type {PointType} from './LexicalSelection';
+
+import {$isElementNode, $isTextNode} from '.';
+import {getActiveEditor} from './LexicalUpdates';
+
+function $canSimpleTextNodesBeMerged(
+  node1: TextNode,
+  node2: TextNode,
+): boolean {
+  const node1Mode = node1.__mode;
+  const node1Format = node1.__format;
+  const node1Style = node1.__style;
+  const node2Mode = node2.__mode;
+  const node2Format = node2.__format;
+  const node2Style = node2.__style;
+  return (
+    (node1Mode === null || node1Mode === node2Mode) &&
+    (node1Format === null || node1Format === node2Format) &&
+    (node1Style === null || node1Style === node2Style)
+  );
+}
+
+function $mergeTextNodes(node1: TextNode, node2: TextNode): TextNode {
+  const writableNode1 = node1.mergeWithSibling(node2);
+
+  const normalizedNodes = getActiveEditor()._normalizedNodes;
+
+  normalizedNodes.add(node1.__key);
+  normalizedNodes.add(node2.__key);
+  return writableNode1;
+}
+
+export function $normalizeTextNode(textNode: TextNode): void {
+  let node = textNode;
+
+  if (node.__text === '' && node.isSimpleText() && !node.isUnmergeable()) {
+    node.remove();
+    return;
+  }
+
+  // Backward
+  let previousNode;
+
+  while (
+    (previousNode = node.getPreviousSibling()) !== null &&
+    $isTextNode(previousNode) &&
+    previousNode.isSimpleText() &&
+    !previousNode.isUnmergeable()
+  ) {
+    if (previousNode.__text === '') {
+      previousNode.remove();
+    } else if ($canSimpleTextNodesBeMerged(previousNode, node)) {
+      node = $mergeTextNodes(previousNode, node);
+      break;
+    } else {
+      break;
+    }
+  }
+
+  // Forward
+  let nextNode;
+
+  while (
+    (nextNode = node.getNextSibling()) !== null &&
+    $isTextNode(nextNode) &&
+    nextNode.isSimpleText() &&
+    !nextNode.isUnmergeable()
+  ) {
+    if (nextNode.__text === '') {
+      nextNode.remove();
+    } else if ($canSimpleTextNodesBeMerged(node, nextNode)) {
+      node = $mergeTextNodes(node, nextNode);
+      break;
+    } else {
+      break;
+    }
+  }
+}
+
+export function $normalizeSelection(selection: RangeSelection): RangeSelection {
+  $normalizePoint(selection.anchor);
+  $normalizePoint(selection.focus);
+  return selection;
+}
+
+function $normalizePoint(point: PointType): void {
+  while (point.type === 'element') {
+    const node = point.getNode();
+    const offset = point.offset;
+    let nextNode;
+    let nextOffsetAtEnd;
+    if (offset === node.getChildrenSize()) {
+      nextNode = node.getChildAtIndex(offset - 1);
+      nextOffsetAtEnd = true;
+    } else {
+      nextNode = node.getChildAtIndex(offset);
+      nextOffsetAtEnd = false;
+    }
+    if ($isTextNode(nextNode)) {
+      point.set(
+        nextNode.__key,
+        nextOffsetAtEnd ? nextNode.getTextContentSize() : 0,
+        'text',
+      );
+      break;
+    } else if (!$isElementNode(nextNode)) {
+      break;
+    }
+    point.set(
+      nextNode.__key,
+      nextOffsetAtEnd ? nextNode.getChildrenSize() : 0,
+      'element',
+    );
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
new file mode 100644
index 00000000000..0162d2281f9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -0,0 +1,943 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  EditorConfig,
+  LexicalEditor,
+  MutatedNodes,
+  MutationListeners,
+  RegisteredNodes,
+} from './LexicalEditor';
+import type {NodeKey, NodeMap} from './LexicalNode';
+import type {ElementNode} from './nodes/LexicalElementNode';
+
+import invariant from 'lexical/shared/invariant';
+import normalizeClassNames from 'lexical/shared/normalizeClassNames';
+
+import {
+  $isDecoratorNode,
+  $isElementNode,
+  $isLineBreakNode,
+  $isParagraphNode,
+  $isRootNode,
+  $isTextNode,
+} from '.';
+import {
+  DOUBLE_LINE_BREAK,
+  FULL_RECONCILE,
+  IS_ALIGN_CENTER,
+  IS_ALIGN_END,
+  IS_ALIGN_JUSTIFY,
+  IS_ALIGN_LEFT,
+  IS_ALIGN_RIGHT,
+  IS_ALIGN_START,
+} from './LexicalConstants';
+import {EditorState} from './LexicalEditorState';
+import {
+  $textContentRequiresDoubleLinebreakAtEnd,
+  cloneDecorators,
+  getElementByKeyOrThrow,
+  getTextDirection,
+  setMutatedNode,
+} from './LexicalUtils';
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+let subTreeTextContent = '';
+let subTreeDirectionedTextContent = '';
+let subTreeTextFormat: number | null = null;
+let subTreeTextStyle: string = '';
+let editorTextContent = '';
+let activeEditorConfig: EditorConfig;
+let activeEditor: LexicalEditor;
+let activeEditorNodes: RegisteredNodes;
+let treatAllNodesAsDirty = false;
+let activeEditorStateReadOnly = false;
+let activeMutationListeners: MutationListeners;
+let activeTextDirection: 'ltr' | 'rtl' | null = null;
+let activeDirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>;
+let activeDirtyLeaves: Set<NodeKey>;
+let activePrevNodeMap: NodeMap;
+let activeNextNodeMap: NodeMap;
+let activePrevKeyToDOMMap: Map<NodeKey, HTMLElement>;
+let mutatedNodes: MutatedNodes;
+
+function destroyNode(key: NodeKey, parentDOM: null | HTMLElement): void {
+  const node = activePrevNodeMap.get(key);
+
+  if (parentDOM !== null) {
+    const dom = getPrevElementByKeyOrThrow(key);
+    if (dom.parentNode === parentDOM) {
+      parentDOM.removeChild(dom);
+    }
+  }
+
+  // This logic is really important, otherwise we will leak DOM nodes
+  // when their corresponding LexicalNodes are removed from the editor state.
+  if (!activeNextNodeMap.has(key)) {
+    activeEditor._keyToDOMMap.delete(key);
+  }
+
+  if ($isElementNode(node)) {
+    const children = createChildrenArray(node, activePrevNodeMap);
+    destroyChildren(children, 0, children.length - 1, null);
+  }
+
+  if (node !== undefined) {
+    setMutatedNode(
+      mutatedNodes,
+      activeEditorNodes,
+      activeMutationListeners,
+      node,
+      'destroyed',
+    );
+  }
+}
+
+function destroyChildren(
+  children: Array<NodeKey>,
+  _startIndex: number,
+  endIndex: number,
+  dom: null | HTMLElement,
+): void {
+  let startIndex = _startIndex;
+
+  for (; startIndex <= endIndex; ++startIndex) {
+    const child = children[startIndex];
+
+    if (child !== undefined) {
+      destroyNode(child, dom);
+    }
+  }
+}
+
+function setTextAlign(domStyle: CSSStyleDeclaration, value: string): void {
+  domStyle.setProperty('text-align', value);
+}
+
+const DEFAULT_INDENT_VALUE = '40px';
+
+function setElementIndent(dom: HTMLElement, indent: number): void {
+  const indentClassName = activeEditorConfig.theme.indent;
+
+  if (typeof indentClassName === 'string') {
+    const elementHasClassName = dom.classList.contains(indentClassName);
+
+    if (indent > 0 && !elementHasClassName) {
+      dom.classList.add(indentClassName);
+    } else if (indent < 1 && elementHasClassName) {
+      dom.classList.remove(indentClassName);
+    }
+  }
+
+  const indentationBaseValue =
+    getComputedStyle(dom).getPropertyValue('--lexical-indent-base-value') ||
+    DEFAULT_INDENT_VALUE;
+
+  dom.style.setProperty(
+    'padding-inline-start',
+    indent === 0 ? '' : `calc(${indent} * ${indentationBaseValue})`,
+  );
+}
+
+function setElementFormat(dom: HTMLElement, format: number): void {
+  const domStyle = dom.style;
+
+  if (format === 0) {
+    setTextAlign(domStyle, '');
+  } else if (format === IS_ALIGN_LEFT) {
+    setTextAlign(domStyle, 'left');
+  } else if (format === IS_ALIGN_CENTER) {
+    setTextAlign(domStyle, 'center');
+  } else if (format === IS_ALIGN_RIGHT) {
+    setTextAlign(domStyle, 'right');
+  } else if (format === IS_ALIGN_JUSTIFY) {
+    setTextAlign(domStyle, 'justify');
+  } else if (format === IS_ALIGN_START) {
+    setTextAlign(domStyle, 'start');
+  } else if (format === IS_ALIGN_END) {
+    setTextAlign(domStyle, 'end');
+  }
+}
+
+function $createNode(
+  key: NodeKey,
+  parentDOM: null | HTMLElement,
+  insertDOM: null | Node,
+): HTMLElement {
+  const node = activeNextNodeMap.get(key);
+
+  if (node === undefined) {
+    invariant(false, 'createNode: node does not exist in nodeMap');
+  }
+  const dom = node.createDOM(activeEditorConfig, activeEditor);
+  storeDOMWithKey(key, dom, activeEditor);
+
+  // This helps preserve the text, and stops spell check tools from
+  // merging or break the spans (which happens if they are missing
+  // this attribute).
+  if ($isTextNode(node)) {
+    dom.setAttribute('data-lexical-text', 'true');
+  } else if ($isDecoratorNode(node)) {
+    dom.setAttribute('data-lexical-decorator', 'true');
+  }
+
+  if ($isElementNode(node)) {
+    const indent = node.__indent;
+    const childrenSize = node.__size;
+
+    if (indent !== 0) {
+      setElementIndent(dom, indent);
+    }
+    if (childrenSize !== 0) {
+      const endIndex = childrenSize - 1;
+      const children = createChildrenArray(node, activeNextNodeMap);
+      $createChildrenWithDirection(children, endIndex, node, dom);
+    }
+    const format = node.__format;
+
+    if (format !== 0) {
+      setElementFormat(dom, format);
+    }
+    if (!node.isInline()) {
+      reconcileElementTerminatingLineBreak(null, node, dom);
+    }
+    if ($textContentRequiresDoubleLinebreakAtEnd(node)) {
+      subTreeTextContent += DOUBLE_LINE_BREAK;
+      editorTextContent += DOUBLE_LINE_BREAK;
+    }
+  } else {
+    const text = node.getTextContent();
+
+    if ($isDecoratorNode(node)) {
+      const decorator = node.decorate(activeEditor, activeEditorConfig);
+
+      if (decorator !== null) {
+        reconcileDecorator(key, decorator);
+      }
+      // Decorators are always non editable
+      dom.contentEditable = 'false';
+    } else if ($isTextNode(node)) {
+      if (!node.isDirectionless()) {
+        subTreeDirectionedTextContent += text;
+      }
+    }
+    subTreeTextContent += text;
+    editorTextContent += text;
+  }
+
+  if (parentDOM !== null) {
+    if (insertDOM != null) {
+      parentDOM.insertBefore(dom, insertDOM);
+    } else {
+      // @ts-expect-error: internal field
+      const possibleLineBreak = parentDOM.__lexicalLineBreak;
+
+      if (possibleLineBreak != null) {
+        parentDOM.insertBefore(dom, possibleLineBreak);
+      } else {
+        parentDOM.appendChild(dom);
+      }
+    }
+  }
+
+  if (__DEV__) {
+    // Freeze the node in DEV to prevent accidental mutations
+    Object.freeze(node);
+  }
+
+  setMutatedNode(
+    mutatedNodes,
+    activeEditorNodes,
+    activeMutationListeners,
+    node,
+    'created',
+  );
+  return dom;
+}
+
+function $createChildrenWithDirection(
+  children: Array<NodeKey>,
+  endIndex: number,
+  element: ElementNode,
+  dom: HTMLElement,
+): void {
+  const previousSubTreeDirectionedTextContent = subTreeDirectionedTextContent;
+  subTreeDirectionedTextContent = '';
+  $createChildren(children, element, 0, endIndex, dom, null);
+  reconcileBlockDirection(element, dom);
+  subTreeDirectionedTextContent = previousSubTreeDirectionedTextContent;
+}
+
+function $createChildren(
+  children: Array<NodeKey>,
+  element: ElementNode,
+  _startIndex: number,
+  endIndex: number,
+  dom: null | HTMLElement,
+  insertDOM: null | HTMLElement,
+): void {
+  const previousSubTreeTextContent = subTreeTextContent;
+  subTreeTextContent = '';
+  let startIndex = _startIndex;
+
+  for (; startIndex <= endIndex; ++startIndex) {
+    $createNode(children[startIndex], dom, insertDOM);
+    const node = activeNextNodeMap.get(children[startIndex]);
+    if (node !== null && $isTextNode(node)) {
+      if (subTreeTextFormat === null) {
+        subTreeTextFormat = node.getFormat();
+      }
+      if (subTreeTextStyle === '') {
+        subTreeTextStyle = node.getStyle();
+      }
+    }
+  }
+  if ($textContentRequiresDoubleLinebreakAtEnd(element)) {
+    subTreeTextContent += DOUBLE_LINE_BREAK;
+  }
+  // @ts-expect-error: internal field
+  dom.__lexicalTextContent = subTreeTextContent;
+  subTreeTextContent = previousSubTreeTextContent + subTreeTextContent;
+}
+
+function isLastChildLineBreakOrDecorator(
+  childKey: NodeKey,
+  nodeMap: NodeMap,
+): boolean {
+  const node = nodeMap.get(childKey);
+  return $isLineBreakNode(node) || ($isDecoratorNode(node) && node.isInline());
+}
+
+// If we end an element with a LineBreakNode, then we need to add an additional <br>
+function reconcileElementTerminatingLineBreak(
+  prevElement: null | ElementNode,
+  nextElement: ElementNode,
+  dom: HTMLElement,
+): void {
+  const prevLineBreak =
+    prevElement !== null &&
+    (prevElement.__size === 0 ||
+      isLastChildLineBreakOrDecorator(
+        prevElement.__last as NodeKey,
+        activePrevNodeMap,
+      ));
+  const nextLineBreak =
+    nextElement.__size === 0 ||
+    isLastChildLineBreakOrDecorator(
+      nextElement.__last as NodeKey,
+      activeNextNodeMap,
+    );
+
+  if (prevLineBreak) {
+    if (!nextLineBreak) {
+      // @ts-expect-error: internal field
+      const element = dom.__lexicalLineBreak;
+
+      if (element != null) {
+        try {
+          dom.removeChild(element);
+        } catch (error) {
+          if (typeof error === 'object' && error != null) {
+            const msg = `${error.toString()} Parent: ${dom.tagName}, child: ${
+              element.tagName
+            }.`;
+            throw new Error(msg);
+          } else {
+            throw error;
+          }
+        }
+      }
+
+      // @ts-expect-error: internal field
+      dom.__lexicalLineBreak = null;
+    }
+  } else if (nextLineBreak) {
+    const element = document.createElement('br');
+    // @ts-expect-error: internal field
+    dom.__lexicalLineBreak = element;
+    dom.appendChild(element);
+  }
+}
+
+function reconcileParagraphFormat(element: ElementNode): void {
+  if (
+    $isParagraphNode(element) &&
+    subTreeTextFormat != null &&
+    subTreeTextFormat !== element.__textFormat &&
+    !activeEditorStateReadOnly
+  ) {
+    element.setTextFormat(subTreeTextFormat);
+    element.setTextStyle(subTreeTextStyle);
+  }
+}
+
+function reconcileParagraphStyle(element: ElementNode): void {
+  if (
+    $isParagraphNode(element) &&
+    subTreeTextStyle !== '' &&
+    subTreeTextStyle !== element.__textStyle &&
+    !activeEditorStateReadOnly
+  ) {
+    element.setTextStyle(subTreeTextStyle);
+  }
+}
+
+function reconcileBlockDirection(element: ElementNode, dom: HTMLElement): void {
+  const previousSubTreeDirectionTextContent: string =
+    // @ts-expect-error: internal field
+    dom.__lexicalDirTextContent;
+  // @ts-expect-error: internal field
+  const previousDirection: string = dom.__lexicalDir;
+
+  if (
+    previousSubTreeDirectionTextContent !== subTreeDirectionedTextContent ||
+    previousDirection !== activeTextDirection
+  ) {
+    const hasEmptyDirectionedTextContent = subTreeDirectionedTextContent === '';
+    const direction = hasEmptyDirectionedTextContent
+      ? activeTextDirection
+      : getTextDirection(subTreeDirectionedTextContent);
+
+    if (direction !== previousDirection) {
+      const classList = dom.classList;
+      const theme = activeEditorConfig.theme;
+      let previousDirectionTheme =
+        previousDirection !== null ? theme[previousDirection] : undefined;
+      let nextDirectionTheme =
+        direction !== null ? theme[direction] : undefined;
+
+      // Remove the old theme classes if they exist
+      if (previousDirectionTheme !== undefined) {
+        if (typeof previousDirectionTheme === 'string') {
+          const classNamesArr = normalizeClassNames(previousDirectionTheme);
+          previousDirectionTheme = theme[previousDirection] = classNamesArr;
+        }
+
+        // @ts-ignore: intentional
+        classList.remove(...previousDirectionTheme);
+      }
+
+      if (
+        direction === null ||
+        (hasEmptyDirectionedTextContent && direction === 'ltr')
+      ) {
+        // Remove direction
+        dom.removeAttribute('dir');
+      } else {
+        // Apply the new theme classes if they exist
+        if (nextDirectionTheme !== undefined) {
+          if (typeof nextDirectionTheme === 'string') {
+            const classNamesArr = normalizeClassNames(nextDirectionTheme);
+            // @ts-expect-error: intentional
+            nextDirectionTheme = theme[direction] = classNamesArr;
+          }
+
+          if (nextDirectionTheme !== undefined) {
+            classList.add(...nextDirectionTheme);
+          }
+        }
+
+        // Update direction
+        dom.dir = direction;
+      }
+
+      if (!activeEditorStateReadOnly) {
+        const writableNode = element.getWritable();
+        writableNode.__dir = direction;
+      }
+    }
+
+    activeTextDirection = direction;
+    // @ts-expect-error: internal field
+    dom.__lexicalDirTextContent = subTreeDirectionedTextContent;
+    // @ts-expect-error: internal field
+    dom.__lexicalDir = direction;
+  }
+}
+
+function $reconcileChildrenWithDirection(
+  prevElement: ElementNode,
+  nextElement: ElementNode,
+  dom: HTMLElement,
+): void {
+  const previousSubTreeDirectionTextContent = subTreeDirectionedTextContent;
+  subTreeDirectionedTextContent = '';
+  subTreeTextFormat = null;
+  subTreeTextStyle = '';
+  $reconcileChildren(prevElement, nextElement, dom);
+  reconcileBlockDirection(nextElement, dom);
+  reconcileParagraphFormat(nextElement);
+  reconcileParagraphStyle(nextElement);
+  subTreeDirectionedTextContent = previousSubTreeDirectionTextContent;
+}
+
+function createChildrenArray(
+  element: ElementNode,
+  nodeMap: NodeMap,
+): Array<NodeKey> {
+  const children = [];
+  let nodeKey = element.__first;
+  while (nodeKey !== null) {
+    const node = nodeMap.get(nodeKey);
+    if (node === undefined) {
+      invariant(false, 'createChildrenArray: node does not exist in nodeMap');
+    }
+    children.push(nodeKey);
+    nodeKey = node.__next;
+  }
+  return children;
+}
+
+function $reconcileChildren(
+  prevElement: ElementNode,
+  nextElement: ElementNode,
+  dom: HTMLElement,
+): void {
+  const previousSubTreeTextContent = subTreeTextContent;
+  const prevChildrenSize = prevElement.__size;
+  const nextChildrenSize = nextElement.__size;
+  subTreeTextContent = '';
+
+  if (prevChildrenSize === 1 && nextChildrenSize === 1) {
+    const prevFirstChildKey = prevElement.__first as NodeKey;
+    const nextFrstChildKey = nextElement.__first as NodeKey;
+    if (prevFirstChildKey === nextFrstChildKey) {
+      $reconcileNode(prevFirstChildKey, dom);
+    } else {
+      const lastDOM = getPrevElementByKeyOrThrow(prevFirstChildKey);
+      const replacementDOM = $createNode(nextFrstChildKey, null, null);
+      try {
+        dom.replaceChild(replacementDOM, lastDOM);
+      } catch (error) {
+        if (typeof error === 'object' && error != null) {
+          const msg = `${error.toString()} Parent: ${
+            dom.tagName
+          }, new child: {tag: ${
+            replacementDOM.tagName
+          } key: ${nextFrstChildKey}}, old child: {tag: ${
+            lastDOM.tagName
+          }, key: ${prevFirstChildKey}}.`;
+          throw new Error(msg);
+        } else {
+          throw error;
+        }
+      }
+      destroyNode(prevFirstChildKey, null);
+    }
+    const nextChildNode = activeNextNodeMap.get(nextFrstChildKey);
+    if ($isTextNode(nextChildNode)) {
+      if (subTreeTextFormat === null) {
+        subTreeTextFormat = nextChildNode.getFormat();
+      }
+      if (subTreeTextStyle === '') {
+        subTreeTextStyle = nextChildNode.getStyle();
+      }
+    }
+  } else {
+    const prevChildren = createChildrenArray(prevElement, activePrevNodeMap);
+    const nextChildren = createChildrenArray(nextElement, activeNextNodeMap);
+
+    if (prevChildrenSize === 0) {
+      if (nextChildrenSize !== 0) {
+        $createChildren(
+          nextChildren,
+          nextElement,
+          0,
+          nextChildrenSize - 1,
+          dom,
+          null,
+        );
+      }
+    } else if (nextChildrenSize === 0) {
+      if (prevChildrenSize !== 0) {
+        // @ts-expect-error: internal field
+        const lexicalLineBreak = dom.__lexicalLineBreak;
+        const canUseFastPath = lexicalLineBreak == null;
+        destroyChildren(
+          prevChildren,
+          0,
+          prevChildrenSize - 1,
+          canUseFastPath ? null : dom,
+        );
+
+        if (canUseFastPath) {
+          // Fast path for removing DOM nodes
+          dom.textContent = '';
+        }
+      }
+    } else {
+      $reconcileNodeChildren(
+        nextElement,
+        prevChildren,
+        nextChildren,
+        prevChildrenSize,
+        nextChildrenSize,
+        dom,
+      );
+    }
+  }
+
+  if ($textContentRequiresDoubleLinebreakAtEnd(nextElement)) {
+    subTreeTextContent += DOUBLE_LINE_BREAK;
+  }
+
+  // @ts-expect-error: internal field
+  dom.__lexicalTextContent = subTreeTextContent;
+  subTreeTextContent = previousSubTreeTextContent + subTreeTextContent;
+}
+
+function $reconcileNode(
+  key: NodeKey,
+  parentDOM: HTMLElement | null,
+): HTMLElement {
+  const prevNode = activePrevNodeMap.get(key);
+  let nextNode = activeNextNodeMap.get(key);
+
+  if (prevNode === undefined || nextNode === undefined) {
+    invariant(
+      false,
+      'reconcileNode: prevNode or nextNode does not exist in nodeMap',
+    );
+  }
+
+  const isDirty =
+    treatAllNodesAsDirty ||
+    activeDirtyLeaves.has(key) ||
+    activeDirtyElements.has(key);
+  const dom = getElementByKeyOrThrow(activeEditor, key);
+
+  // If the node key points to the same instance in both states
+  // and isn't dirty, we just update the text content cache
+  // and return the existing DOM Node.
+  if (prevNode === nextNode && !isDirty) {
+    if ($isElementNode(prevNode)) {
+      // @ts-expect-error: internal field
+      const previousSubTreeTextContent = dom.__lexicalTextContent;
+
+      if (previousSubTreeTextContent !== undefined) {
+        subTreeTextContent += previousSubTreeTextContent;
+        editorTextContent += previousSubTreeTextContent;
+      }
+
+      // @ts-expect-error: internal field
+      const previousSubTreeDirectionTextContent = dom.__lexicalDirTextContent;
+
+      if (previousSubTreeDirectionTextContent !== undefined) {
+        subTreeDirectionedTextContent += previousSubTreeDirectionTextContent;
+      }
+    } else {
+      const text = prevNode.getTextContent();
+
+      if ($isTextNode(prevNode) && !prevNode.isDirectionless()) {
+        subTreeDirectionedTextContent += text;
+      }
+
+      editorTextContent += text;
+      subTreeTextContent += text;
+    }
+
+    return dom;
+  }
+  // If the node key doesn't point to the same instance in both maps,
+  // it means it were cloned. If they're also dirty, we mark them as mutated.
+  if (prevNode !== nextNode && isDirty) {
+    setMutatedNode(
+      mutatedNodes,
+      activeEditorNodes,
+      activeMutationListeners,
+      nextNode,
+      'updated',
+    );
+  }
+
+  // Update node. If it returns true, we need to unmount and re-create the node
+  if (nextNode.updateDOM(prevNode, dom, activeEditorConfig)) {
+    const replacementDOM = $createNode(key, null, null);
+
+    if (parentDOM === null) {
+      invariant(false, 'reconcileNode: parentDOM is null');
+    }
+
+    parentDOM.replaceChild(replacementDOM, dom);
+    destroyNode(key, null);
+    return replacementDOM;
+  }
+
+  if ($isElementNode(prevNode) && $isElementNode(nextNode)) {
+    // Reconcile element children
+    const nextIndent = nextNode.__indent;
+
+    if (nextIndent !== prevNode.__indent) {
+      setElementIndent(dom, nextIndent);
+    }
+
+    const nextFormat = nextNode.__format;
+
+    if (nextFormat !== prevNode.__format) {
+      setElementFormat(dom, nextFormat);
+    }
+    if (isDirty) {
+      $reconcileChildrenWithDirection(prevNode, nextNode, dom);
+      if (!$isRootNode(nextNode) && !nextNode.isInline()) {
+        reconcileElementTerminatingLineBreak(prevNode, nextNode, dom);
+      }
+    }
+
+    if ($textContentRequiresDoubleLinebreakAtEnd(nextNode)) {
+      subTreeTextContent += DOUBLE_LINE_BREAK;
+      editorTextContent += DOUBLE_LINE_BREAK;
+    }
+  } else {
+    const text = nextNode.getTextContent();
+
+    if ($isDecoratorNode(nextNode)) {
+      const decorator = nextNode.decorate(activeEditor, activeEditorConfig);
+
+      if (decorator !== null) {
+        reconcileDecorator(key, decorator);
+      }
+    } else if ($isTextNode(nextNode) && !nextNode.isDirectionless()) {
+      // Handle text content, for LTR, LTR cases.
+      subTreeDirectionedTextContent += text;
+    }
+
+    subTreeTextContent += text;
+    editorTextContent += text;
+  }
+
+  if (
+    !activeEditorStateReadOnly &&
+    $isRootNode(nextNode) &&
+    nextNode.__cachedText !== editorTextContent
+  ) {
+    // Cache the latest text content.
+    const nextRootNode = nextNode.getWritable();
+    nextRootNode.__cachedText = editorTextContent;
+    nextNode = nextRootNode;
+  }
+
+  if (__DEV__) {
+    // Freeze the node in DEV to prevent accidental mutations
+    Object.freeze(nextNode);
+  }
+
+  return dom;
+}
+
+function reconcileDecorator(key: NodeKey, decorator: unknown): void {
+  let pendingDecorators = activeEditor._pendingDecorators;
+  const currentDecorators = activeEditor._decorators;
+
+  if (pendingDecorators === null) {
+    if (currentDecorators[key] === decorator) {
+      return;
+    }
+
+    pendingDecorators = cloneDecorators(activeEditor);
+  }
+
+  pendingDecorators[key] = decorator;
+}
+
+function getFirstChild(element: HTMLElement): Node | null {
+  return element.firstChild;
+}
+
+function getNextSibling(element: HTMLElement): Node | null {
+  let nextSibling = element.nextSibling;
+  if (
+    nextSibling !== null &&
+    nextSibling === activeEditor._blockCursorElement
+  ) {
+    nextSibling = nextSibling.nextSibling;
+  }
+  return nextSibling;
+}
+
+function $reconcileNodeChildren(
+  nextElement: ElementNode,
+  prevChildren: Array<NodeKey>,
+  nextChildren: Array<NodeKey>,
+  prevChildrenLength: number,
+  nextChildrenLength: number,
+  dom: HTMLElement,
+): void {
+  const prevEndIndex = prevChildrenLength - 1;
+  const nextEndIndex = nextChildrenLength - 1;
+  let prevChildrenSet: Set<NodeKey> | undefined;
+  let nextChildrenSet: Set<NodeKey> | undefined;
+  let siblingDOM: null | Node = getFirstChild(dom);
+  let prevIndex = 0;
+  let nextIndex = 0;
+
+  while (prevIndex <= prevEndIndex && nextIndex <= nextEndIndex) {
+    const prevKey = prevChildren[prevIndex];
+    const nextKey = nextChildren[nextIndex];
+
+    if (prevKey === nextKey) {
+      siblingDOM = getNextSibling($reconcileNode(nextKey, dom));
+      prevIndex++;
+      nextIndex++;
+    } else {
+      if (prevChildrenSet === undefined) {
+        prevChildrenSet = new Set(prevChildren);
+      }
+
+      if (nextChildrenSet === undefined) {
+        nextChildrenSet = new Set(nextChildren);
+      }
+
+      const nextHasPrevKey = nextChildrenSet.has(prevKey);
+      const prevHasNextKey = prevChildrenSet.has(nextKey);
+
+      if (!nextHasPrevKey) {
+        // Remove prev
+        siblingDOM = getNextSibling(getPrevElementByKeyOrThrow(prevKey));
+        destroyNode(prevKey, dom);
+        prevIndex++;
+      } else if (!prevHasNextKey) {
+        // Create next
+        $createNode(nextKey, dom, siblingDOM);
+        nextIndex++;
+      } else {
+        // Move next
+        const childDOM = getElementByKeyOrThrow(activeEditor, nextKey);
+
+        if (childDOM === siblingDOM) {
+          siblingDOM = getNextSibling($reconcileNode(nextKey, dom));
+        } else {
+          if (siblingDOM != null) {
+            dom.insertBefore(childDOM, siblingDOM);
+          } else {
+            dom.appendChild(childDOM);
+          }
+
+          $reconcileNode(nextKey, dom);
+        }
+
+        prevIndex++;
+        nextIndex++;
+      }
+    }
+
+    const node = activeNextNodeMap.get(nextKey);
+    if (node !== null && $isTextNode(node)) {
+      if (subTreeTextFormat === null) {
+        subTreeTextFormat = node.getFormat();
+      }
+      if (subTreeTextStyle === '') {
+        subTreeTextStyle = node.getStyle();
+      }
+    }
+  }
+
+  const appendNewChildren = prevIndex > prevEndIndex;
+  const removeOldChildren = nextIndex > nextEndIndex;
+
+  if (appendNewChildren && !removeOldChildren) {
+    const previousNode = nextChildren[nextEndIndex + 1];
+    const insertDOM =
+      previousNode === undefined
+        ? null
+        : activeEditor.getElementByKey(previousNode);
+    $createChildren(
+      nextChildren,
+      nextElement,
+      nextIndex,
+      nextEndIndex,
+      dom,
+      insertDOM,
+    );
+  } else if (removeOldChildren && !appendNewChildren) {
+    destroyChildren(prevChildren, prevIndex, prevEndIndex, dom);
+  }
+}
+
+export function $reconcileRoot(
+  prevEditorState: EditorState,
+  nextEditorState: EditorState,
+  editor: LexicalEditor,
+  dirtyType: 0 | 1 | 2,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+  dirtyLeaves: Set<NodeKey>,
+): MutatedNodes {
+  // We cache text content to make retrieval more efficient.
+  // The cache must be rebuilt during reconciliation to account for any changes.
+  subTreeTextContent = '';
+  editorTextContent = '';
+  subTreeDirectionedTextContent = '';
+  // Rather than pass around a load of arguments through the stack recursively
+  // we instead set them as bindings within the scope of the module.
+  treatAllNodesAsDirty = dirtyType === FULL_RECONCILE;
+  activeTextDirection = null;
+  activeEditor = editor;
+  activeEditorConfig = editor._config;
+  activeEditorNodes = editor._nodes;
+  activeMutationListeners = activeEditor._listeners.mutation;
+  activeDirtyElements = dirtyElements;
+  activeDirtyLeaves = dirtyLeaves;
+  activePrevNodeMap = prevEditorState._nodeMap;
+  activeNextNodeMap = nextEditorState._nodeMap;
+  activeEditorStateReadOnly = nextEditorState._readOnly;
+  activePrevKeyToDOMMap = new Map(editor._keyToDOMMap);
+  // We keep track of mutated nodes so we can trigger mutation
+  // listeners later in the update cycle.
+  const currentMutatedNodes = new Map();
+  mutatedNodes = currentMutatedNodes;
+  $reconcileNode('root', null);
+  // We don't want a bunch of void checks throughout the scope
+  // so instead we make it seem that these values are always set.
+  // We also want to make sure we clear them down, otherwise we
+  // can leak memory.
+  // @ts-ignore
+  activeEditor = undefined;
+  // @ts-ignore
+  activeEditorNodes = undefined;
+  // @ts-ignore
+  activeDirtyElements = undefined;
+  // @ts-ignore
+  activeDirtyLeaves = undefined;
+  // @ts-ignore
+  activePrevNodeMap = undefined;
+  // @ts-ignore
+  activeNextNodeMap = undefined;
+  // @ts-ignore
+  activeEditorConfig = undefined;
+  // @ts-ignore
+  activePrevKeyToDOMMap = undefined;
+  // @ts-ignore
+  mutatedNodes = undefined;
+
+  return currentMutatedNodes;
+}
+
+export function storeDOMWithKey(
+  key: NodeKey,
+  dom: HTMLElement,
+  editor: LexicalEditor,
+): void {
+  const keyToDOMMap = editor._keyToDOMMap;
+  // @ts-ignore We intentionally add this to the Node.
+  dom['__lexicalKey_' + editor._key] = key;
+  keyToDOMMap.set(key, dom);
+}
+
+function getPrevElementByKeyOrThrow(key: NodeKey): HTMLElement {
+  const element = activePrevKeyToDOMMap.get(key);
+
+  if (element === undefined) {
+    invariant(
+      false,
+      'Reconciliation: could not find DOM element for node key %s',
+      key,
+    );
+  }
+
+  return element;
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
new file mode 100644
index 00000000000..db18cfc4a77
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -0,0 +1,2835 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor} from './LexicalEditor';
+import type {EditorState} from './LexicalEditorState';
+import type {NodeKey} from './LexicalNode';
+import type {ElementNode} from './nodes/LexicalElementNode';
+import type {TextFormatType} from './nodes/LexicalTextNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $createLineBreakNode,
+  $createParagraphNode,
+  $createTextNode,
+  $isDecoratorNode,
+  $isElementNode,
+  $isLineBreakNode,
+  $isRootNode,
+  $isTextNode,
+  $setSelection,
+  SELECTION_CHANGE_COMMAND,
+  TextNode,
+} from '.';
+import {DOM_ELEMENT_TYPE, TEXT_TYPE_TO_FORMAT} from './LexicalConstants';
+import {
+  markCollapsedSelectionFormat,
+  markSelectionChangeFromDOMUpdate,
+} from './LexicalEvents';
+import {getIsProcessingMutations} from './LexicalMutations';
+import {insertRangeAfter, LexicalNode} from './LexicalNode';
+import {
+  getActiveEditor,
+  getActiveEditorState,
+  isCurrentlyReadOnlyMode,
+} from './LexicalUpdates';
+import {
+  $getAdjacentNode,
+  $getAncestor,
+  $getCompositionKey,
+  $getNearestRootOrShadowRoot,
+  $getNodeByKey,
+  $getNodeFromDOM,
+  $getRoot,
+  $hasAncestor,
+  $isTokenOrSegmented,
+  $setCompositionKey,
+  doesContainGrapheme,
+  getDOMSelection,
+  getDOMTextNode,
+  getElementByKeyOrThrow,
+  getTextNodeOffset,
+  INTERNAL_$isBlock,
+  isSelectionCapturedInDecoratorInput,
+  isSelectionWithinEditor,
+  removeDOMBlockCursorElement,
+  scrollIntoViewIfNeeded,
+  toggleTextFormatType,
+} from './LexicalUtils';
+import {$createTabNode, $isTabNode} from './nodes/LexicalTabNode';
+
+export type TextPointType = {
+  _selection: BaseSelection;
+  getNode: () => TextNode;
+  is: (point: PointType) => boolean;
+  isBefore: (point: PointType) => boolean;
+  key: NodeKey;
+  offset: number;
+  set: (key: NodeKey, offset: number, type: 'text' | 'element') => void;
+  type: 'text';
+};
+
+export type ElementPointType = {
+  _selection: BaseSelection;
+  getNode: () => ElementNode;
+  is: (point: PointType) => boolean;
+  isBefore: (point: PointType) => boolean;
+  key: NodeKey;
+  offset: number;
+  set: (key: NodeKey, offset: number, type: 'text' | 'element') => void;
+  type: 'element';
+};
+
+export type PointType = TextPointType | ElementPointType;
+
+export class Point {
+  key: NodeKey;
+  offset: number;
+  type: 'text' | 'element';
+  _selection: BaseSelection | null;
+
+  constructor(key: NodeKey, offset: number, type: 'text' | 'element') {
+    this._selection = null;
+    this.key = key;
+    this.offset = offset;
+    this.type = type;
+  }
+
+  is(point: PointType): boolean {
+    return (
+      this.key === point.key &&
+      this.offset === point.offset &&
+      this.type === point.type
+    );
+  }
+
+  isBefore(b: PointType): boolean {
+    let aNode = this.getNode();
+    let bNode = b.getNode();
+    const aOffset = this.offset;
+    const bOffset = b.offset;
+
+    if ($isElementNode(aNode)) {
+      const aNodeDescendant = aNode.getDescendantByIndex<ElementNode>(aOffset);
+      aNode = aNodeDescendant != null ? aNodeDescendant : aNode;
+    }
+    if ($isElementNode(bNode)) {
+      const bNodeDescendant = bNode.getDescendantByIndex<ElementNode>(bOffset);
+      bNode = bNodeDescendant != null ? bNodeDescendant : bNode;
+    }
+    if (aNode === bNode) {
+      return aOffset < bOffset;
+    }
+    return aNode.isBefore(bNode);
+  }
+
+  getNode(): LexicalNode {
+    const key = this.key;
+    const node = $getNodeByKey(key);
+    if (node === null) {
+      invariant(false, 'Point.getNode: node not found');
+    }
+    return node;
+  }
+
+  set(key: NodeKey, offset: number, type: 'text' | 'element'): void {
+    const selection = this._selection;
+    const oldKey = this.key;
+    this.key = key;
+    this.offset = offset;
+    this.type = type;
+    if (!isCurrentlyReadOnlyMode()) {
+      if ($getCompositionKey() === oldKey) {
+        $setCompositionKey(key);
+      }
+      if (selection !== null) {
+        selection.setCachedNodes(null);
+        selection.dirty = true;
+      }
+    }
+  }
+}
+
+export function $createPoint(
+  key: NodeKey,
+  offset: number,
+  type: 'text' | 'element',
+): PointType {
+  // @ts-expect-error: intentionally cast as we use a class for perf reasons
+  return new Point(key, offset, type);
+}
+
+function selectPointOnNode(point: PointType, node: LexicalNode): void {
+  let key = node.__key;
+  let offset = point.offset;
+  let type: 'element' | 'text' = 'element';
+  if ($isTextNode(node)) {
+    type = 'text';
+    const textContentLength = node.getTextContentSize();
+    if (offset > textContentLength) {
+      offset = textContentLength;
+    }
+  } else if (!$isElementNode(node)) {
+    const nextSibling = node.getNextSibling();
+    if ($isTextNode(nextSibling)) {
+      key = nextSibling.__key;
+      offset = 0;
+      type = 'text';
+    } else {
+      const parentNode = node.getParent();
+      if (parentNode) {
+        key = parentNode.__key;
+        offset = node.getIndexWithinParent() + 1;
+      }
+    }
+  }
+  point.set(key, offset, type);
+}
+
+export function $moveSelectionPointToEnd(
+  point: PointType,
+  node: LexicalNode,
+): void {
+  if ($isElementNode(node)) {
+    const lastNode = node.getLastDescendant();
+    if ($isElementNode(lastNode) || $isTextNode(lastNode)) {
+      selectPointOnNode(point, lastNode);
+    } else {
+      selectPointOnNode(point, node);
+    }
+  } else {
+    selectPointOnNode(point, node);
+  }
+}
+
+function $transferStartingElementPointToTextPoint(
+  start: ElementPointType,
+  end: PointType,
+  format: number,
+  style: string,
+): void {
+  const element = start.getNode();
+  const placementNode = element.getChildAtIndex(start.offset);
+  const textNode = $createTextNode();
+  const target = $isRootNode(element)
+    ? $createParagraphNode().append(textNode)
+    : textNode;
+  textNode.setFormat(format);
+  textNode.setStyle(style);
+  if (placementNode === null) {
+    element.append(target);
+  } else {
+    placementNode.insertBefore(target);
+  }
+  // Transfer the element point to a text point.
+  if (start.is(end)) {
+    end.set(textNode.__key, 0, 'text');
+  }
+  start.set(textNode.__key, 0, 'text');
+}
+
+function $setPointValues(
+  point: PointType,
+  key: NodeKey,
+  offset: number,
+  type: 'text' | 'element',
+): void {
+  point.key = key;
+  point.offset = offset;
+  point.type = type;
+}
+
+export interface BaseSelection {
+  _cachedNodes: Array<LexicalNode> | null;
+  dirty: boolean;
+
+  clone(): BaseSelection;
+  extract(): Array<LexicalNode>;
+  getNodes(): Array<LexicalNode>;
+  getTextContent(): string;
+  insertText(text: string): void;
+  insertRawText(text: string): void;
+  is(selection: null | BaseSelection): boolean;
+  insertNodes(nodes: Array<LexicalNode>): void;
+  getStartEndPoints(): null | [PointType, PointType];
+  isCollapsed(): boolean;
+  isBackward(): boolean;
+  getCachedNodes(): LexicalNode[] | null;
+  setCachedNodes(nodes: LexicalNode[] | null): void;
+}
+
+export class NodeSelection implements BaseSelection {
+  _nodes: Set<NodeKey>;
+  _cachedNodes: Array<LexicalNode> | null;
+  dirty: boolean;
+
+  constructor(objects: Set<NodeKey>) {
+    this._cachedNodes = null;
+    this._nodes = objects;
+    this.dirty = false;
+  }
+
+  getCachedNodes(): LexicalNode[] | null {
+    return this._cachedNodes;
+  }
+
+  setCachedNodes(nodes: LexicalNode[] | null): void {
+    this._cachedNodes = nodes;
+  }
+
+  is(selection: null | BaseSelection): boolean {
+    if (!$isNodeSelection(selection)) {
+      return false;
+    }
+    const a: Set<NodeKey> = this._nodes;
+    const b: Set<NodeKey> = selection._nodes;
+    return a.size === b.size && Array.from(a).every((key) => b.has(key));
+  }
+
+  isCollapsed(): boolean {
+    return false;
+  }
+
+  isBackward(): boolean {
+    return false;
+  }
+
+  getStartEndPoints(): null {
+    return null;
+  }
+
+  add(key: NodeKey): void {
+    this.dirty = true;
+    this._nodes.add(key);
+    this._cachedNodes = null;
+  }
+
+  delete(key: NodeKey): void {
+    this.dirty = true;
+    this._nodes.delete(key);
+    this._cachedNodes = null;
+  }
+
+  clear(): void {
+    this.dirty = true;
+    this._nodes.clear();
+    this._cachedNodes = null;
+  }
+
+  has(key: NodeKey): boolean {
+    return this._nodes.has(key);
+  }
+
+  clone(): NodeSelection {
+    return new NodeSelection(new Set(this._nodes));
+  }
+
+  extract(): Array<LexicalNode> {
+    return this.getNodes();
+  }
+
+  insertRawText(text: string): void {
+    // Do nothing?
+  }
+
+  insertText(): void {
+    // Do nothing?
+  }
+
+  insertNodes(nodes: Array<LexicalNode>) {
+    const selectedNodes = this.getNodes();
+    const selectedNodesLength = selectedNodes.length;
+    const lastSelectedNode = selectedNodes[selectedNodesLength - 1];
+    let selectionAtEnd: RangeSelection;
+    // Insert nodes
+    if ($isTextNode(lastSelectedNode)) {
+      selectionAtEnd = lastSelectedNode.select();
+    } else {
+      const index = lastSelectedNode.getIndexWithinParent() + 1;
+      selectionAtEnd = lastSelectedNode.getParentOrThrow().select(index, index);
+    }
+    selectionAtEnd.insertNodes(nodes);
+    // Remove selected nodes
+    for (let i = 0; i < selectedNodesLength; i++) {
+      selectedNodes[i].remove();
+    }
+  }
+
+  getNodes(): Array<LexicalNode> {
+    const cachedNodes = this._cachedNodes;
+    if (cachedNodes !== null) {
+      return cachedNodes;
+    }
+    const objects = this._nodes;
+    const nodes = [];
+    for (const object of objects) {
+      const node = $getNodeByKey(object);
+      if (node !== null) {
+        nodes.push(node);
+      }
+    }
+    if (!isCurrentlyReadOnlyMode()) {
+      this._cachedNodes = nodes;
+    }
+    return nodes;
+  }
+
+  getTextContent(): string {
+    const nodes = this.getNodes();
+    let textContent = '';
+    for (let i = 0; i < nodes.length; i++) {
+      textContent += nodes[i].getTextContent();
+    }
+    return textContent;
+  }
+}
+
+export function $isRangeSelection(x: unknown): x is RangeSelection {
+  return x instanceof RangeSelection;
+}
+
+export class RangeSelection implements BaseSelection {
+  format: number;
+  style: string;
+  anchor: PointType;
+  focus: PointType;
+  _cachedNodes: Array<LexicalNode> | null;
+  dirty: boolean;
+
+  constructor(
+    anchor: PointType,
+    focus: PointType,
+    format: number,
+    style: string,
+  ) {
+    this.anchor = anchor;
+    this.focus = focus;
+    anchor._selection = this;
+    focus._selection = this;
+    this._cachedNodes = null;
+    this.format = format;
+    this.style = style;
+    this.dirty = false;
+  }
+
+  getCachedNodes(): LexicalNode[] | null {
+    return this._cachedNodes;
+  }
+
+  setCachedNodes(nodes: LexicalNode[] | null): void {
+    this._cachedNodes = nodes;
+  }
+
+  /**
+   * Used to check if the provided selections is equal to this one by value,
+   * inluding anchor, focus, format, and style properties.
+   * @param selection - the Selection to compare this one to.
+   * @returns true if the Selections are equal, false otherwise.
+   */
+  is(selection: null | BaseSelection): boolean {
+    if (!$isRangeSelection(selection)) {
+      return false;
+    }
+    return (
+      this.anchor.is(selection.anchor) &&
+      this.focus.is(selection.focus) &&
+      this.format === selection.format &&
+      this.style === selection.style
+    );
+  }
+
+  /**
+   * Returns whether the Selection is "collapsed", meaning the anchor and focus are
+   * the same node and have the same offset.
+   *
+   * @returns true if the Selection is collapsed, false otherwise.
+   */
+  isCollapsed(): boolean {
+    return this.anchor.is(this.focus);
+  }
+
+  /**
+   * Gets all the nodes in the Selection. Uses caching to make it generally suitable
+   * for use in hot paths.
+   *
+   * @returns an Array containing all the nodes in the Selection
+   */
+  getNodes(): Array<LexicalNode> {
+    const cachedNodes = this._cachedNodes;
+    if (cachedNodes !== null) {
+      return cachedNodes;
+    }
+    const anchor = this.anchor;
+    const focus = this.focus;
+    const isBefore = anchor.isBefore(focus);
+    const firstPoint = isBefore ? anchor : focus;
+    const lastPoint = isBefore ? focus : anchor;
+    let firstNode = firstPoint.getNode();
+    let lastNode = lastPoint.getNode();
+    const startOffset = firstPoint.offset;
+    const endOffset = lastPoint.offset;
+
+    if ($isElementNode(firstNode)) {
+      const firstNodeDescendant =
+        firstNode.getDescendantByIndex<ElementNode>(startOffset);
+      firstNode = firstNodeDescendant != null ? firstNodeDescendant : firstNode;
+    }
+    if ($isElementNode(lastNode)) {
+      let lastNodeDescendant =
+        lastNode.getDescendantByIndex<ElementNode>(endOffset);
+      // We don't want to over-select, as node selection infers the child before
+      // the last descendant, not including that descendant.
+      if (
+        lastNodeDescendant !== null &&
+        lastNodeDescendant !== firstNode &&
+        lastNode.getChildAtIndex(endOffset) === lastNodeDescendant
+      ) {
+        lastNodeDescendant = lastNodeDescendant.getPreviousSibling();
+      }
+      lastNode = lastNodeDescendant != null ? lastNodeDescendant : lastNode;
+    }
+
+    let nodes: Array<LexicalNode>;
+
+    if (firstNode.is(lastNode)) {
+      if ($isElementNode(firstNode) && firstNode.getChildrenSize() > 0) {
+        nodes = [];
+      } else {
+        nodes = [firstNode];
+      }
+    } else {
+      nodes = firstNode.getNodesBetween(lastNode);
+    }
+    if (!isCurrentlyReadOnlyMode()) {
+      this._cachedNodes = nodes;
+    }
+    return nodes;
+  }
+
+  /**
+   * Sets this Selection to be of type "text" at the provided anchor and focus values.
+   *
+   * @param anchorNode - the anchor node to set on the Selection
+   * @param anchorOffset - the offset to set on the Selection
+   * @param focusNode - the focus node to set on the Selection
+   * @param focusOffset - the focus offset to set on the Selection
+   */
+  setTextNodeRange(
+    anchorNode: TextNode,
+    anchorOffset: number,
+    focusNode: TextNode,
+    focusOffset: number,
+  ): void {
+    $setPointValues(this.anchor, anchorNode.__key, anchorOffset, 'text');
+    $setPointValues(this.focus, focusNode.__key, focusOffset, 'text');
+    this._cachedNodes = null;
+    this.dirty = true;
+  }
+
+  /**
+   * Gets the (plain) text content of all the nodes in the selection.
+   *
+   * @returns a string representing the text content of all the nodes in the Selection
+   */
+  getTextContent(): string {
+    const nodes = this.getNodes();
+    if (nodes.length === 0) {
+      return '';
+    }
+    const firstNode = nodes[0];
+    const lastNode = nodes[nodes.length - 1];
+    const anchor = this.anchor;
+    const focus = this.focus;
+    const isBefore = anchor.isBefore(focus);
+    const [anchorOffset, focusOffset] = $getCharacterOffsets(this);
+    let textContent = '';
+    let prevWasElement = true;
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      if ($isElementNode(node) && !node.isInline()) {
+        if (!prevWasElement) {
+          textContent += '\n';
+        }
+        if (node.isEmpty()) {
+          prevWasElement = false;
+        } else {
+          prevWasElement = true;
+        }
+      } else {
+        prevWasElement = false;
+        if ($isTextNode(node)) {
+          let text = node.getTextContent();
+          if (node === firstNode) {
+            if (node === lastNode) {
+              if (
+                anchor.type !== 'element' ||
+                focus.type !== 'element' ||
+                focus.offset === anchor.offset
+              ) {
+                text =
+                  anchorOffset < focusOffset
+                    ? text.slice(anchorOffset, focusOffset)
+                    : text.slice(focusOffset, anchorOffset);
+              }
+            } else {
+              text = isBefore
+                ? text.slice(anchorOffset)
+                : text.slice(focusOffset);
+            }
+          } else if (node === lastNode) {
+            text = isBefore
+              ? text.slice(0, focusOffset)
+              : text.slice(0, anchorOffset);
+          }
+          textContent += text;
+        } else if (
+          ($isDecoratorNode(node) || $isLineBreakNode(node)) &&
+          (node !== lastNode || !this.isCollapsed())
+        ) {
+          textContent += node.getTextContent();
+        }
+      }
+    }
+    return textContent;
+  }
+
+  /**
+   * Attempts to map a DOM selection range onto this Lexical Selection,
+   * setting the anchor, focus, and type accordingly
+   *
+   * @param range a DOM Selection range conforming to the StaticRange interface.
+   */
+  applyDOMRange(range: StaticRange): void {
+    const editor = getActiveEditor();
+    const currentEditorState = editor.getEditorState();
+    const lastSelection = currentEditorState._selection;
+    const resolvedSelectionPoints = $internalResolveSelectionPoints(
+      range.startContainer,
+      range.startOffset,
+      range.endContainer,
+      range.endOffset,
+      editor,
+      lastSelection,
+    );
+    if (resolvedSelectionPoints === null) {
+      return;
+    }
+    const [anchorPoint, focusPoint] = resolvedSelectionPoints;
+    $setPointValues(
+      this.anchor,
+      anchorPoint.key,
+      anchorPoint.offset,
+      anchorPoint.type,
+    );
+    $setPointValues(
+      this.focus,
+      focusPoint.key,
+      focusPoint.offset,
+      focusPoint.type,
+    );
+    this._cachedNodes = null;
+  }
+
+  /**
+   * Creates a new RangeSelection, copying over all the property values from this one.
+   *
+   * @returns a new RangeSelection with the same property values as this one.
+   */
+  clone(): RangeSelection {
+    const anchor = this.anchor;
+    const focus = this.focus;
+    const selection = new RangeSelection(
+      $createPoint(anchor.key, anchor.offset, anchor.type),
+      $createPoint(focus.key, focus.offset, focus.type),
+      this.format,
+      this.style,
+    );
+    return selection;
+  }
+
+  /**
+   * Toggles the provided format on all the TextNodes in the Selection.
+   *
+   * @param format a string TextFormatType to toggle on the TextNodes in the selection
+   */
+  toggleFormat(format: TextFormatType): void {
+    this.format = toggleTextFormatType(this.format, format, null);
+    this.dirty = true;
+  }
+
+  /**
+   * Sets the value of the style property on the Selection
+   *
+   * @param style - the style to set at the value of the style property.
+   */
+  setStyle(style: string): void {
+    this.style = style;
+    this.dirty = true;
+  }
+
+  /**
+   * Returns whether the provided TextFormatType is present on the Selection. This will be true if any node in the Selection
+   * has the specified format.
+   *
+   * @param type the TextFormatType to check for.
+   * @returns true if the provided format is currently toggled on on the Selection, false otherwise.
+   */
+  hasFormat(type: TextFormatType): boolean {
+    const formatFlag = TEXT_TYPE_TO_FORMAT[type];
+    return (this.format & formatFlag) !== 0;
+  }
+
+  /**
+   * Attempts to insert the provided text into the EditorState at the current Selection.
+   * converts tabs, newlines, and carriage returns into LexicalNodes.
+   *
+   * @param text the text to insert into the Selection
+   */
+  insertRawText(text: string): void {
+    const parts = text.split(/(\r?\n|\t)/);
+    const nodes = [];
+    const length = parts.length;
+    for (let i = 0; i < length; i++) {
+      const part = parts[i];
+      if (part === '\n' || part === '\r\n') {
+        nodes.push($createLineBreakNode());
+      } else if (part === '\t') {
+        nodes.push($createTabNode());
+      } else {
+        nodes.push($createTextNode(part));
+      }
+    }
+    this.insertNodes(nodes);
+  }
+
+  /**
+   * Attempts to insert the provided text into the EditorState at the current Selection as a new
+   * Lexical TextNode, according to a series of insertion heuristics based on the selection type and position.
+   *
+   * @param text the text to insert into the Selection
+   */
+  insertText(text: string): void {
+    const anchor = this.anchor;
+    const focus = this.focus;
+    const format = this.format;
+    const style = this.style;
+    let firstPoint = anchor;
+    let endPoint = focus;
+    if (!this.isCollapsed() && focus.isBefore(anchor)) {
+      firstPoint = focus;
+      endPoint = anchor;
+    }
+    if (firstPoint.type === 'element') {
+      $transferStartingElementPointToTextPoint(
+        firstPoint,
+        endPoint,
+        format,
+        style,
+      );
+    }
+    const startOffset = firstPoint.offset;
+    let endOffset = endPoint.offset;
+    const selectedNodes = this.getNodes();
+    const selectedNodesLength = selectedNodes.length;
+    let firstNode: TextNode = selectedNodes[0] as TextNode;
+
+    if (!$isTextNode(firstNode)) {
+      invariant(false, 'insertText: first node is not a text node');
+    }
+    const firstNodeText = firstNode.getTextContent();
+    const firstNodeTextLength = firstNodeText.length;
+    const firstNodeParent = firstNode.getParentOrThrow();
+    const lastIndex = selectedNodesLength - 1;
+    let lastNode = selectedNodes[lastIndex];
+
+    if (selectedNodesLength === 1 && endPoint.type === 'element') {
+      endOffset = firstNodeTextLength;
+      endPoint.set(firstPoint.key, endOffset, 'text');
+    }
+
+    if (
+      this.isCollapsed() &&
+      startOffset === firstNodeTextLength &&
+      (firstNode.isSegmented() ||
+        firstNode.isToken() ||
+        !firstNode.canInsertTextAfter() ||
+        (!firstNodeParent.canInsertTextAfter() &&
+          firstNode.getNextSibling() === null))
+    ) {
+      let nextSibling = firstNode.getNextSibling<TextNode>();
+      if (
+        !$isTextNode(nextSibling) ||
+        !nextSibling.canInsertTextBefore() ||
+        $isTokenOrSegmented(nextSibling)
+      ) {
+        nextSibling = $createTextNode();
+        nextSibling.setFormat(format);
+        nextSibling.setStyle(style);
+        if (!firstNodeParent.canInsertTextAfter()) {
+          firstNodeParent.insertAfter(nextSibling);
+        } else {
+          firstNode.insertAfter(nextSibling);
+        }
+      }
+      nextSibling.select(0, 0);
+      firstNode = nextSibling;
+      if (text !== '') {
+        this.insertText(text);
+        return;
+      }
+    } else if (
+      this.isCollapsed() &&
+      startOffset === 0 &&
+      (firstNode.isSegmented() ||
+        firstNode.isToken() ||
+        !firstNode.canInsertTextBefore() ||
+        (!firstNodeParent.canInsertTextBefore() &&
+          firstNode.getPreviousSibling() === null))
+    ) {
+      let prevSibling = firstNode.getPreviousSibling<TextNode>();
+      if (!$isTextNode(prevSibling) || $isTokenOrSegmented(prevSibling)) {
+        prevSibling = $createTextNode();
+        prevSibling.setFormat(format);
+        if (!firstNodeParent.canInsertTextBefore()) {
+          firstNodeParent.insertBefore(prevSibling);
+        } else {
+          firstNode.insertBefore(prevSibling);
+        }
+      }
+      prevSibling.select();
+      firstNode = prevSibling;
+      if (text !== '') {
+        this.insertText(text);
+        return;
+      }
+    } else if (firstNode.isSegmented() && startOffset !== firstNodeTextLength) {
+      const textNode = $createTextNode(firstNode.getTextContent());
+      textNode.setFormat(format);
+      firstNode.replace(textNode);
+      firstNode = textNode;
+    } else if (!this.isCollapsed() && text !== '') {
+      // When the firstNode or lastNode parents are elements that
+      // do not allow text to be inserted before or after, we first
+      // clear the content. Then we normalize selection, then insert
+      // the new content.
+      const lastNodeParent = lastNode.getParent();
+
+      if (
+        !firstNodeParent.canInsertTextBefore() ||
+        !firstNodeParent.canInsertTextAfter() ||
+        ($isElementNode(lastNodeParent) &&
+          (!lastNodeParent.canInsertTextBefore() ||
+            !lastNodeParent.canInsertTextAfter()))
+      ) {
+        this.insertText('');
+        $normalizeSelectionPointsForBoundaries(this.anchor, this.focus, null);
+        this.insertText(text);
+        return;
+      }
+    }
+
+    if (selectedNodesLength === 1) {
+      if (firstNode.isToken()) {
+        const textNode = $createTextNode(text);
+        textNode.select();
+        firstNode.replace(textNode);
+        return;
+      }
+      const firstNodeFormat = firstNode.getFormat();
+      const firstNodeStyle = firstNode.getStyle();
+
+      if (
+        startOffset === endOffset &&
+        (firstNodeFormat !== format || firstNodeStyle !== style)
+      ) {
+        if (firstNode.getTextContent() === '') {
+          firstNode.setFormat(format);
+          firstNode.setStyle(style);
+        } else {
+          const textNode = $createTextNode(text);
+          textNode.setFormat(format);
+          textNode.setStyle(style);
+          textNode.select();
+          if (startOffset === 0) {
+            firstNode.insertBefore(textNode, false);
+          } else {
+            const [targetNode] = firstNode.splitText(startOffset);
+            targetNode.insertAfter(textNode, false);
+          }
+          // When composing, we need to adjust the anchor offset so that
+          // we correctly replace that right range.
+          if (textNode.isComposing() && this.anchor.type === 'text') {
+            this.anchor.offset -= text.length;
+          }
+          return;
+        }
+      } else if ($isTabNode(firstNode)) {
+        // We don't need to check for delCount because there is only the entire selected node case
+        // that can hit here for content size 1 and with canInsertTextBeforeAfter false
+        const textNode = $createTextNode(text);
+        textNode.setFormat(format);
+        textNode.setStyle(style);
+        textNode.select();
+        firstNode.replace(textNode);
+        return;
+      }
+      const delCount = endOffset - startOffset;
+
+      firstNode = firstNode.spliceText(startOffset, delCount, text, true);
+      if (firstNode.getTextContent() === '') {
+        firstNode.remove();
+      } else if (this.anchor.type === 'text') {
+        if (firstNode.isComposing()) {
+          // When composing, we need to adjust the anchor offset so that
+          // we correctly replace that right range.
+          this.anchor.offset -= text.length;
+        } else {
+          this.format = firstNodeFormat;
+          this.style = firstNodeStyle;
+        }
+      }
+    } else {
+      const markedNodeKeysForKeep = new Set([
+        ...firstNode.getParentKeys(),
+        ...lastNode.getParentKeys(),
+      ]);
+
+      // We have to get the parent elements before the next section,
+      // as in that section we might mutate the lastNode.
+      const firstElement = $isElementNode(firstNode)
+        ? firstNode
+        : firstNode.getParentOrThrow();
+      let lastElement = $isElementNode(lastNode)
+        ? lastNode
+        : lastNode.getParentOrThrow();
+      let lastElementChild = lastNode;
+
+      // If the last element is inline, we should instead look at getting
+      // the nodes of its parent, rather than itself. This behavior will
+      // then better match how text node insertions work. We will need to
+      // also update the last element's child accordingly as we do this.
+      if (!firstElement.is(lastElement) && lastElement.isInline()) {
+        // Keep traversing till we have a non-inline element parent.
+        do {
+          lastElementChild = lastElement;
+          lastElement = lastElement.getParentOrThrow();
+        } while (lastElement.isInline());
+      }
+
+      // Handle mutations to the last node.
+      if (
+        (endPoint.type === 'text' &&
+          (endOffset !== 0 || lastNode.getTextContent() === '')) ||
+        (endPoint.type === 'element' &&
+          lastNode.getIndexWithinParent() < endOffset)
+      ) {
+        if (
+          $isTextNode(lastNode) &&
+          !lastNode.isToken() &&
+          endOffset !== lastNode.getTextContentSize()
+        ) {
+          if (lastNode.isSegmented()) {
+            const textNode = $createTextNode(lastNode.getTextContent());
+            lastNode.replace(textNode);
+            lastNode = textNode;
+          }
+          // root node selections only select whole nodes, so no text splice is necessary
+          if (!$isRootNode(endPoint.getNode()) && endPoint.type === 'text') {
+            lastNode = (lastNode as TextNode).spliceText(0, endOffset, '');
+          }
+          markedNodeKeysForKeep.add(lastNode.__key);
+        } else {
+          const lastNodeParent = lastNode.getParentOrThrow();
+          if (
+            !lastNodeParent.canBeEmpty() &&
+            lastNodeParent.getChildrenSize() === 1
+          ) {
+            lastNodeParent.remove();
+          } else {
+            lastNode.remove();
+          }
+        }
+      } else {
+        markedNodeKeysForKeep.add(lastNode.__key);
+      }
+
+      // Either move the remaining nodes of the last parent to after
+      // the first child, or remove them entirely. If the last parent
+      // is the same as the first parent, this logic also works.
+      const lastNodeChildren = lastElement.getChildren();
+      const selectedNodesSet = new Set(selectedNodes);
+      const firstAndLastElementsAreEqual = firstElement.is(lastElement);
+
+      // We choose a target to insert all nodes after. In the case of having
+      // and inline starting parent element with a starting node that has no
+      // siblings, we should insert after the starting parent element, otherwise
+      // we will incorrectly merge into the starting parent element.
+      // TODO: should we keep on traversing parents if we're inside another
+      // nested inline element?
+      const insertionTarget =
+        firstElement.isInline() && firstNode.getNextSibling() === null
+          ? firstElement
+          : firstNode;
+
+      for (let i = lastNodeChildren.length - 1; i >= 0; i--) {
+        const lastNodeChild = lastNodeChildren[i];
+
+        if (
+          lastNodeChild.is(firstNode) ||
+          ($isElementNode(lastNodeChild) && lastNodeChild.isParentOf(firstNode))
+        ) {
+          break;
+        }
+
+        if (lastNodeChild.isAttached()) {
+          if (
+            !selectedNodesSet.has(lastNodeChild) ||
+            lastNodeChild.is(lastElementChild)
+          ) {
+            if (!firstAndLastElementsAreEqual) {
+              insertionTarget.insertAfter(lastNodeChild, false);
+            }
+          } else {
+            lastNodeChild.remove();
+          }
+        }
+      }
+
+      if (!firstAndLastElementsAreEqual) {
+        // Check if we have already moved out all the nodes of the
+        // last parent, and if so, traverse the parent tree and mark
+        // them all as being able to deleted too.
+        let parent: ElementNode | null = lastElement;
+        let lastRemovedParent = null;
+
+        while (parent !== null) {
+          const children = parent.getChildren();
+          const childrenLength = children.length;
+          if (
+            childrenLength === 0 ||
+            children[childrenLength - 1].is(lastRemovedParent)
+          ) {
+            markedNodeKeysForKeep.delete(parent.__key);
+            lastRemovedParent = parent;
+          }
+          parent = parent.getParent();
+        }
+      }
+
+      // Ensure we do splicing after moving of nodes, as splicing
+      // can have side-effects (in the case of hashtags).
+      if (!firstNode.isToken()) {
+        firstNode = firstNode.spliceText(
+          startOffset,
+          firstNodeTextLength - startOffset,
+          text,
+          true,
+        );
+        if (firstNode.getTextContent() === '') {
+          firstNode.remove();
+        } else if (firstNode.isComposing() && this.anchor.type === 'text') {
+          // When composing, we need to adjust the anchor offset so that
+          // we correctly replace that right range.
+          this.anchor.offset -= text.length;
+        }
+      } else if (startOffset === firstNodeTextLength) {
+        firstNode.select();
+      } else {
+        const textNode = $createTextNode(text);
+        textNode.select();
+        firstNode.replace(textNode);
+      }
+
+      // Remove all selected nodes that haven't already been removed.
+      for (let i = 1; i < selectedNodesLength; i++) {
+        const selectedNode = selectedNodes[i];
+        const key = selectedNode.__key;
+        if (!markedNodeKeysForKeep.has(key)) {
+          selectedNode.remove();
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes the text in the Selection, adjusting the EditorState accordingly.
+   */
+  removeText(): void {
+    this.insertText('');
+  }
+
+  /**
+   * Applies the provided format to the TextNodes in the Selection, splitting or
+   * merging nodes as necessary.
+   *
+   * @param formatType the format type to apply to the nodes in the Selection.
+   */
+  formatText(formatType: TextFormatType): void {
+    if (this.isCollapsed()) {
+      this.toggleFormat(formatType);
+      // When changing format, we should stop composition
+      $setCompositionKey(null);
+      return;
+    }
+
+    const selectedNodes = this.getNodes();
+    const selectedTextNodes: Array<TextNode> = [];
+    for (const selectedNode of selectedNodes) {
+      if ($isTextNode(selectedNode)) {
+        selectedTextNodes.push(selectedNode);
+      }
+    }
+
+    const selectedTextNodesLength = selectedTextNodes.length;
+    if (selectedTextNodesLength === 0) {
+      this.toggleFormat(formatType);
+      // When changing format, we should stop composition
+      $setCompositionKey(null);
+      return;
+    }
+
+    const anchor = this.anchor;
+    const focus = this.focus;
+    const isBackward = this.isBackward();
+    const startPoint = isBackward ? focus : anchor;
+    const endPoint = isBackward ? anchor : focus;
+
+    let firstIndex = 0;
+    let firstNode = selectedTextNodes[0];
+    let startOffset = startPoint.type === 'element' ? 0 : startPoint.offset;
+
+    // In case selection started at the end of text node use next text node
+    if (
+      startPoint.type === 'text' &&
+      startOffset === firstNode.getTextContentSize()
+    ) {
+      firstIndex = 1;
+      firstNode = selectedTextNodes[1];
+      startOffset = 0;
+    }
+
+    if (firstNode == null) {
+      return;
+    }
+
+    const firstNextFormat = firstNode.getFormatFlags(formatType, null);
+
+    const lastIndex = selectedTextNodesLength - 1;
+    let lastNode = selectedTextNodes[lastIndex];
+    const endOffset =
+      endPoint.type === 'text'
+        ? endPoint.offset
+        : lastNode.getTextContentSize();
+
+    // Single node selected
+    if (firstNode.is(lastNode)) {
+      // No actual text is selected, so do nothing.
+      if (startOffset === endOffset) {
+        return;
+      }
+      // The entire node is selected or it is token, so just format it
+      if (
+        $isTokenOrSegmented(firstNode) ||
+        (startOffset === 0 && endOffset === firstNode.getTextContentSize())
+      ) {
+        firstNode.setFormat(firstNextFormat);
+      } else {
+        // Node is partially selected, so split it into two nodes
+        // add style the selected one.
+        const splitNodes = firstNode.splitText(startOffset, endOffset);
+        const replacement = startOffset === 0 ? splitNodes[0] : splitNodes[1];
+        replacement.setFormat(firstNextFormat);
+
+        // Update selection only if starts/ends on text node
+        if (startPoint.type === 'text') {
+          startPoint.set(replacement.__key, 0, 'text');
+        }
+        if (endPoint.type === 'text') {
+          endPoint.set(replacement.__key, endOffset - startOffset, 'text');
+        }
+      }
+
+      this.format = firstNextFormat;
+
+      return;
+    }
+    // Multiple nodes selected
+    // The entire first node isn't selected, so split it
+    if (startOffset !== 0 && !$isTokenOrSegmented(firstNode)) {
+      [, firstNode as TextNode] = firstNode.splitText(startOffset);
+      startOffset = 0;
+    }
+    firstNode.setFormat(firstNextFormat);
+
+    const lastNextFormat = lastNode.getFormatFlags(formatType, firstNextFormat);
+    // If the offset is 0, it means no actual characters are selected,
+    // so we skip formatting the last node altogether.
+    if (endOffset > 0) {
+      if (
+        endOffset !== lastNode.getTextContentSize() &&
+        !$isTokenOrSegmented(lastNode)
+      ) {
+        [lastNode as TextNode] = lastNode.splitText(endOffset);
+      }
+      lastNode.setFormat(lastNextFormat);
+    }
+
+    // Process all text nodes in between
+    for (let i = firstIndex + 1; i < lastIndex; i++) {
+      const textNode = selectedTextNodes[i];
+      const nextFormat = textNode.getFormatFlags(formatType, lastNextFormat);
+      textNode.setFormat(nextFormat);
+    }
+
+    // Update selection only if starts/ends on text node
+    if (startPoint.type === 'text') {
+      startPoint.set(firstNode.__key, startOffset, 'text');
+    }
+    if (endPoint.type === 'text') {
+      endPoint.set(lastNode.__key, endOffset, 'text');
+    }
+
+    this.format = firstNextFormat | lastNextFormat;
+  }
+
+  /**
+   * Attempts to "intelligently" insert an arbitrary list of Lexical nodes into the EditorState at the
+   * current Selection according to a set of heuristics that determine how surrounding nodes
+   * should be changed, replaced, or moved to accomodate the incoming ones.
+   *
+   * @param nodes - the nodes to insert
+   */
+  insertNodes(nodes: Array<LexicalNode>): void {
+    if (nodes.length === 0) {
+      return;
+    }
+    if (this.anchor.key === 'root') {
+      this.insertParagraph();
+      const selection = $getSelection();
+      invariant(
+        $isRangeSelection(selection),
+        'Expected RangeSelection after insertParagraph',
+      );
+      return selection.insertNodes(nodes);
+    }
+
+    const firstPoint = this.isBackward() ? this.focus : this.anchor;
+    const firstBlock = $getAncestor(firstPoint.getNode(), INTERNAL_$isBlock)!;
+
+    const last = nodes[nodes.length - 1]!;
+
+    // CASE 1: insert inside a code block
+    if ('__language' in firstBlock && $isElementNode(firstBlock)) {
+      if ('__language' in nodes[0]) {
+        this.insertText(nodes[0].getTextContent());
+      } else {
+        const index = $removeTextAndSplitBlock(this);
+        firstBlock.splice(index, 0, nodes);
+        last.selectEnd();
+      }
+      return;
+    }
+
+    // CASE 2: All elements of the array are inline
+    const notInline = (node: LexicalNode) =>
+      ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline();
+
+    if (!nodes.some(notInline)) {
+      invariant(
+        $isElementNode(firstBlock),
+        "Expected 'firstBlock' to be an ElementNode",
+      );
+      const index = $removeTextAndSplitBlock(this);
+      firstBlock.splice(index, 0, nodes);
+      last.selectEnd();
+      return;
+    }
+
+    // CASE 3: At least 1 element of the array is not inline
+    const blocksParent = $wrapInlineNodes(nodes);
+    const nodeToSelect = blocksParent.getLastDescendant()!;
+    const blocks = blocksParent.getChildren();
+    const isMergeable = (node: LexicalNode): node is ElementNode =>
+      $isElementNode(node) &&
+      INTERNAL_$isBlock(node) &&
+      !node.isEmpty() &&
+      $isElementNode(firstBlock) &&
+      (!firstBlock.isEmpty() || firstBlock.canMergeWhenEmpty());
+
+    const shouldInsert = !$isElementNode(firstBlock) || !firstBlock.isEmpty();
+    const insertedParagraph = shouldInsert ? this.insertParagraph() : null;
+    const lastToInsert = blocks[blocks.length - 1];
+    let firstToInsert = blocks[0];
+    if (isMergeable(firstToInsert)) {
+      invariant(
+        $isElementNode(firstBlock),
+        "Expected 'firstBlock' to be an ElementNode",
+      );
+      firstBlock.append(...firstToInsert.getChildren());
+      firstToInsert = blocks[1];
+    }
+    if (firstToInsert) {
+      insertRangeAfter(firstBlock, firstToInsert);
+    }
+    const lastInsertedBlock = $getAncestor(nodeToSelect, INTERNAL_$isBlock)!;
+
+    if (
+      insertedParagraph &&
+      $isElementNode(lastInsertedBlock) &&
+      (insertedParagraph.canMergeWhenEmpty() || INTERNAL_$isBlock(lastToInsert))
+    ) {
+      lastInsertedBlock.append(...insertedParagraph.getChildren());
+      insertedParagraph.remove();
+    }
+    if ($isElementNode(firstBlock) && firstBlock.isEmpty()) {
+      firstBlock.remove();
+    }
+
+    nodeToSelect.selectEnd();
+
+    // To understand this take a look at the test "can wrap post-linebreak nodes into new element"
+    const lastChild = $isElementNode(firstBlock)
+      ? firstBlock.getLastChild()
+      : null;
+    if ($isLineBreakNode(lastChild) && lastInsertedBlock !== firstBlock) {
+      lastChild.remove();
+    }
+  }
+
+  /**
+   * Inserts a new ParagraphNode into the EditorState at the current Selection
+   *
+   * @returns the newly inserted node.
+   */
+  insertParagraph(): ElementNode | null {
+    if (this.anchor.key === 'root') {
+      const paragraph = $createParagraphNode();
+      $getRoot().splice(this.anchor.offset, 0, [paragraph]);
+      paragraph.select();
+      return paragraph;
+    }
+    const index = $removeTextAndSplitBlock(this);
+    const block = $getAncestor(this.anchor.getNode(), INTERNAL_$isBlock)!;
+    invariant($isElementNode(block), 'Expected ancestor to be an ElementNode');
+    const firstToAppend = block.getChildAtIndex(index);
+    const nodesToInsert = firstToAppend
+      ? [firstToAppend, ...firstToAppend.getNextSiblings()]
+      : [];
+    const newBlock = block.insertNewAfter(this, false) as ElementNode | null;
+    if (newBlock) {
+      newBlock.append(...nodesToInsert);
+      newBlock.selectStart();
+      return newBlock;
+    }
+    // if newBlock is null, it means that block is of type CodeNode.
+    return null;
+  }
+
+  /**
+   * Inserts a logical linebreak, which may be a new LineBreakNode or a new ParagraphNode, into the EditorState at the
+   * current Selection.
+   */
+  insertLineBreak(selectStart?: boolean): void {
+    const lineBreak = $createLineBreakNode();
+    this.insertNodes([lineBreak]);
+    // this is used in MacOS with the command 'ctrl-O' (openLineBreak)
+    if (selectStart) {
+      const parent = lineBreak.getParentOrThrow();
+      const index = lineBreak.getIndexWithinParent();
+      parent.select(index, index);
+    }
+  }
+
+  /**
+   * Extracts the nodes in the Selection, splitting nodes where necessary
+   * to get offset-level precision.
+   *
+   * @returns The nodes in the Selection
+   */
+  extract(): Array<LexicalNode> {
+    const selectedNodes = this.getNodes();
+    const selectedNodesLength = selectedNodes.length;
+    const lastIndex = selectedNodesLength - 1;
+    const anchor = this.anchor;
+    const focus = this.focus;
+    let firstNode = selectedNodes[0];
+    let lastNode = selectedNodes[lastIndex];
+    const [anchorOffset, focusOffset] = $getCharacterOffsets(this);
+
+    if (selectedNodesLength === 0) {
+      return [];
+    } else if (selectedNodesLength === 1) {
+      if ($isTextNode(firstNode) && !this.isCollapsed()) {
+        const startOffset =
+          anchorOffset > focusOffset ? focusOffset : anchorOffset;
+        const endOffset =
+          anchorOffset > focusOffset ? anchorOffset : focusOffset;
+        const splitNodes = firstNode.splitText(startOffset, endOffset);
+        const node = startOffset === 0 ? splitNodes[0] : splitNodes[1];
+        return node != null ? [node] : [];
+      }
+      return [firstNode];
+    }
+    const isBefore = anchor.isBefore(focus);
+
+    if ($isTextNode(firstNode)) {
+      const startOffset = isBefore ? anchorOffset : focusOffset;
+      if (startOffset === firstNode.getTextContentSize()) {
+        selectedNodes.shift();
+      } else if (startOffset !== 0) {
+        [, firstNode] = firstNode.splitText(startOffset);
+        selectedNodes[0] = firstNode;
+      }
+    }
+    if ($isTextNode(lastNode)) {
+      const lastNodeText = lastNode.getTextContent();
+      const lastNodeTextLength = lastNodeText.length;
+      const endOffset = isBefore ? focusOffset : anchorOffset;
+      if (endOffset === 0) {
+        selectedNodes.pop();
+      } else if (endOffset !== lastNodeTextLength) {
+        [lastNode] = lastNode.splitText(endOffset);
+        selectedNodes[lastIndex] = lastNode;
+      }
+    }
+    return selectedNodes;
+  }
+
+  /**
+   * Modifies the Selection according to the parameters and a set of heuristics that account for
+   * various node types. Can be used to safely move or extend selection by one logical "unit" without
+   * dealing explicitly with all the possible node types.
+   *
+   * @param alter the type of modification to perform
+   * @param isBackward whether or not selection is backwards
+   * @param granularity the granularity at which to apply the modification
+   */
+  modify(
+    alter: 'move' | 'extend',
+    isBackward: boolean,
+    granularity: 'character' | 'word' | 'lineboundary',
+  ): void {
+    const focus = this.focus;
+    const anchor = this.anchor;
+    const collapse = alter === 'move';
+
+    // Handle the selection movement around decorators.
+    const possibleNode = $getAdjacentNode(focus, isBackward);
+    if ($isDecoratorNode(possibleNode) && !possibleNode.isIsolated()) {
+      // Make it possible to move selection from range selection to
+      // node selection on the node.
+      if (collapse && possibleNode.isKeyboardSelectable()) {
+        const nodeSelection = $createNodeSelection();
+        nodeSelection.add(possibleNode.__key);
+        $setSelection(nodeSelection);
+        return;
+      }
+      const sibling = isBackward
+        ? possibleNode.getPreviousSibling()
+        : possibleNode.getNextSibling();
+
+      if (!$isTextNode(sibling)) {
+        const parent = possibleNode.getParentOrThrow();
+        let offset;
+        let elementKey;
+
+        if ($isElementNode(sibling)) {
+          elementKey = sibling.__key;
+          offset = isBackward ? sibling.getChildrenSize() : 0;
+        } else {
+          offset = possibleNode.getIndexWithinParent();
+          elementKey = parent.__key;
+          if (!isBackward) {
+            offset++;
+          }
+        }
+        focus.set(elementKey, offset, 'element');
+        if (collapse) {
+          anchor.set(elementKey, offset, 'element');
+        }
+        return;
+      } else {
+        const siblingKey = sibling.__key;
+        const offset = isBackward ? sibling.getTextContent().length : 0;
+        focus.set(siblingKey, offset, 'text');
+        if (collapse) {
+          anchor.set(siblingKey, offset, 'text');
+        }
+        return;
+      }
+    }
+    const editor = getActiveEditor();
+    const domSelection = getDOMSelection(editor._window);
+
+    if (!domSelection) {
+      return;
+    }
+    const blockCursorElement = editor._blockCursorElement;
+    const rootElement = editor._rootElement;
+    // Remove the block cursor element if it exists. This will ensure selection
+    // works as intended. If we leave it in the DOM all sorts of strange bugs
+    // occur. :/
+    if (
+      rootElement !== null &&
+      blockCursorElement !== null &&
+      $isElementNode(possibleNode) &&
+      !possibleNode.isInline() &&
+      !possibleNode.canBeEmpty()
+    ) {
+      removeDOMBlockCursorElement(blockCursorElement, editor, rootElement);
+    }
+    // We use the DOM selection.modify API here to "tell" us what the selection
+    // will be. We then use it to update the Lexical selection accordingly. This
+    // is much more reliable than waiting for a beforeinput and using the ranges
+    // from getTargetRanges(), and is also better than trying to do it ourselves
+    // using Intl.Segmenter or other workarounds that struggle with word segments
+    // and line segments (especially with word wrapping and non-Roman languages).
+    moveNativeSelection(
+      domSelection,
+      alter,
+      isBackward ? 'backward' : 'forward',
+      granularity,
+    );
+    // Guard against no ranges
+    if (domSelection.rangeCount > 0) {
+      const range = domSelection.getRangeAt(0);
+      // Apply the DOM selection to our Lexical selection.
+      const anchorNode = this.anchor.getNode();
+      const root = $isRootNode(anchorNode)
+        ? anchorNode
+        : $getNearestRootOrShadowRoot(anchorNode);
+      this.applyDOMRange(range);
+      this.dirty = true;
+      if (!collapse) {
+        // Validate selection; make sure that the new extended selection respects shadow roots
+        const nodes = this.getNodes();
+        const validNodes = [];
+        let shrinkSelection = false;
+        for (let i = 0; i < nodes.length; i++) {
+          const nextNode = nodes[i];
+          if ($hasAncestor(nextNode, root)) {
+            validNodes.push(nextNode);
+          } else {
+            shrinkSelection = true;
+          }
+        }
+        if (shrinkSelection && validNodes.length > 0) {
+          // validNodes length check is a safeguard against an invalid selection; as getNodes()
+          // will return an empty array in this case
+          if (isBackward) {
+            const firstValidNode = validNodes[0];
+            if ($isElementNode(firstValidNode)) {
+              firstValidNode.selectStart();
+            } else {
+              firstValidNode.getParentOrThrow().selectStart();
+            }
+          } else {
+            const lastValidNode = validNodes[validNodes.length - 1];
+            if ($isElementNode(lastValidNode)) {
+              lastValidNode.selectEnd();
+            } else {
+              lastValidNode.getParentOrThrow().selectEnd();
+            }
+          }
+        }
+
+        // Because a range works on start and end, we might need to flip
+        // the anchor and focus points to match what the DOM has, not what
+        // the range has specifically.
+        if (
+          domSelection.anchorNode !== range.startContainer ||
+          domSelection.anchorOffset !== range.startOffset
+        ) {
+          $swapPoints(this);
+        }
+      }
+    }
+  }
+  /**
+   * Helper for handling forward character and word deletion that prevents element nodes
+   * like a table, columns layout being destroyed
+   *
+   * @param anchor the anchor
+   * @param anchorNode the anchor node in the selection
+   * @param isBackward whether or not selection is backwards
+   */
+  forwardDeletion(
+    anchor: PointType,
+    anchorNode: TextNode | ElementNode,
+    isBackward: boolean,
+  ): boolean {
+    if (
+      !isBackward &&
+      // Delete forward handle case
+      ((anchor.type === 'element' &&
+        $isElementNode(anchorNode) &&
+        anchor.offset === anchorNode.getChildrenSize()) ||
+        (anchor.type === 'text' &&
+          anchor.offset === anchorNode.getTextContentSize()))
+    ) {
+      const parent = anchorNode.getParent();
+      const nextSibling =
+        anchorNode.getNextSibling() ||
+        (parent === null ? null : parent.getNextSibling());
+
+      if ($isElementNode(nextSibling) && nextSibling.isShadowRoot()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Performs one logical character deletion operation on the EditorState based on the current Selection.
+   * Handles different node types.
+   *
+   * @param isBackward whether or not the selection is backwards.
+   */
+  deleteCharacter(isBackward: boolean): void {
+    const wasCollapsed = this.isCollapsed();
+    if (this.isCollapsed()) {
+      const anchor = this.anchor;
+      let anchorNode: TextNode | ElementNode | null = anchor.getNode();
+      if (this.forwardDeletion(anchor, anchorNode, isBackward)) {
+        return;
+      }
+
+      // Handle the deletion around decorators.
+      const focus = this.focus;
+      const possibleNode = $getAdjacentNode(focus, isBackward);
+      if ($isDecoratorNode(possibleNode) && !possibleNode.isIsolated()) {
+        // Make it possible to move selection from range selection to
+        // node selection on the node.
+        if (
+          possibleNode.isKeyboardSelectable() &&
+          $isElementNode(anchorNode) &&
+          anchorNode.getChildrenSize() === 0
+        ) {
+          anchorNode.remove();
+          const nodeSelection = $createNodeSelection();
+          nodeSelection.add(possibleNode.__key);
+          $setSelection(nodeSelection);
+        } else {
+          possibleNode.remove();
+          const editor = getActiveEditor();
+          editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+        }
+        return;
+      } else if (
+        !isBackward &&
+        $isElementNode(possibleNode) &&
+        $isElementNode(anchorNode) &&
+        anchorNode.isEmpty()
+      ) {
+        anchorNode.remove();
+        possibleNode.selectStart();
+        return;
+      }
+      this.modify('extend', isBackward, 'character');
+
+      if (!this.isCollapsed()) {
+        const focusNode = focus.type === 'text' ? focus.getNode() : null;
+        anchorNode = anchor.type === 'text' ? anchor.getNode() : null;
+
+        if (focusNode !== null && focusNode.isSegmented()) {
+          const offset = focus.offset;
+          const textContentSize = focusNode.getTextContentSize();
+          if (
+            focusNode.is(anchorNode) ||
+            (isBackward && offset !== textContentSize) ||
+            (!isBackward && offset !== 0)
+          ) {
+            $removeSegment(focusNode, isBackward, offset);
+            return;
+          }
+        } else if (anchorNode !== null && anchorNode.isSegmented()) {
+          const offset = anchor.offset;
+          const textContentSize = anchorNode.getTextContentSize();
+          if (
+            anchorNode.is(focusNode) ||
+            (isBackward && offset !== 0) ||
+            (!isBackward && offset !== textContentSize)
+          ) {
+            $removeSegment(anchorNode, isBackward, offset);
+            return;
+          }
+        }
+        $updateCaretSelectionForUnicodeCharacter(this, isBackward);
+      } else if (isBackward && anchor.offset === 0) {
+        // Special handling around rich text nodes
+        const element =
+          anchor.type === 'element'
+            ? anchor.getNode()
+            : anchor.getNode().getParentOrThrow();
+        if (element.collapseAtStart(this)) {
+          return;
+        }
+      }
+    }
+    this.removeText();
+    if (
+      isBackward &&
+      !wasCollapsed &&
+      this.isCollapsed() &&
+      this.anchor.type === 'element' &&
+      this.anchor.offset === 0
+    ) {
+      const anchorNode = this.anchor.getNode();
+      if (
+        anchorNode.isEmpty() &&
+        $isRootNode(anchorNode.getParent()) &&
+        anchorNode.getIndexWithinParent() === 0
+      ) {
+        anchorNode.collapseAtStart(this);
+      }
+    }
+  }
+
+  /**
+   * Performs one logical line deletion operation on the EditorState based on the current Selection.
+   * Handles different node types.
+   *
+   * @param isBackward whether or not the selection is backwards.
+   */
+  deleteLine(isBackward: boolean): void {
+    if (this.isCollapsed()) {
+      // Since `domSelection.modify('extend', ..., 'lineboundary')` works well for text selections
+      // but doesn't properly handle selections which end on elements, a space character is added
+      // for such selections transforming their anchor's type to 'text'
+      const anchorIsElement = this.anchor.type === 'element';
+      if (anchorIsElement) {
+        this.insertText(' ');
+      }
+
+      this.modify('extend', isBackward, 'lineboundary');
+
+      // If selection is extended to cover text edge then extend it one character more
+      // to delete its parent element. Otherwise text content will be deleted but empty
+      // parent node will remain
+      const endPoint = isBackward ? this.focus : this.anchor;
+      if (endPoint.offset === 0) {
+        this.modify('extend', isBackward, 'character');
+      }
+
+      // Adjusts selection to include an extra character added for element anchors to remove it
+      if (anchorIsElement) {
+        const startPoint = isBackward ? this.anchor : this.focus;
+        startPoint.set(startPoint.key, startPoint.offset + 1, startPoint.type);
+      }
+    }
+    this.removeText();
+  }
+
+  /**
+   * Performs one logical word deletion operation on the EditorState based on the current Selection.
+   * Handles different node types.
+   *
+   * @param isBackward whether or not the selection is backwards.
+   */
+  deleteWord(isBackward: boolean): void {
+    if (this.isCollapsed()) {
+      const anchor = this.anchor;
+      const anchorNode: TextNode | ElementNode | null = anchor.getNode();
+      if (this.forwardDeletion(anchor, anchorNode, isBackward)) {
+        return;
+      }
+      this.modify('extend', isBackward, 'word');
+    }
+    this.removeText();
+  }
+
+  /**
+   * Returns whether the Selection is "backwards", meaning the focus
+   * logically precedes the anchor in the EditorState.
+   * @returns true if the Selection is backwards, false otherwise.
+   */
+  isBackward(): boolean {
+    return this.focus.isBefore(this.anchor);
+  }
+
+  getStartEndPoints(): null | [PointType, PointType] {
+    return [this.anchor, this.focus];
+  }
+}
+
+export function $isNodeSelection(x: unknown): x is NodeSelection {
+  return x instanceof NodeSelection;
+}
+
+function getCharacterOffset(point: PointType): number {
+  const offset = point.offset;
+  if (point.type === 'text') {
+    return offset;
+  }
+
+  const parent = point.getNode();
+  return offset === parent.getChildrenSize()
+    ? parent.getTextContent().length
+    : 0;
+}
+
+export function $getCharacterOffsets(
+  selection: BaseSelection,
+): [number, number] {
+  const anchorAndFocus = selection.getStartEndPoints();
+  if (anchorAndFocus === null) {
+    return [0, 0];
+  }
+  const [anchor, focus] = anchorAndFocus;
+  if (
+    anchor.type === 'element' &&
+    focus.type === 'element' &&
+    anchor.key === focus.key &&
+    anchor.offset === focus.offset
+  ) {
+    return [0, 0];
+  }
+  return [getCharacterOffset(anchor), getCharacterOffset(focus)];
+}
+
+function $swapPoints(selection: RangeSelection): void {
+  const focus = selection.focus;
+  const anchor = selection.anchor;
+  const anchorKey = anchor.key;
+  const anchorOffset = anchor.offset;
+  const anchorType = anchor.type;
+
+  $setPointValues(anchor, focus.key, focus.offset, focus.type);
+  $setPointValues(focus, anchorKey, anchorOffset, anchorType);
+  selection._cachedNodes = null;
+}
+
+function moveNativeSelection(
+  domSelection: Selection,
+  alter: 'move' | 'extend',
+  direction: 'backward' | 'forward' | 'left' | 'right',
+  granularity: 'character' | 'word' | 'lineboundary',
+): void {
+  // Selection.modify() method applies a change to the current selection or cursor position,
+  // but is still non-standard in some browsers.
+  domSelection.modify(alter, direction, granularity);
+}
+
+function $updateCaretSelectionForUnicodeCharacter(
+  selection: RangeSelection,
+  isBackward: boolean,
+): void {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const anchorNode = anchor.getNode();
+  const focusNode = focus.getNode();
+
+  if (
+    anchorNode === focusNode &&
+    anchor.type === 'text' &&
+    focus.type === 'text'
+  ) {
+    // Handling of multibyte characters
+    const anchorOffset = anchor.offset;
+    const focusOffset = focus.offset;
+    const isBefore = anchorOffset < focusOffset;
+    const startOffset = isBefore ? anchorOffset : focusOffset;
+    const endOffset = isBefore ? focusOffset : anchorOffset;
+    const characterOffset = endOffset - 1;
+
+    if (startOffset !== characterOffset) {
+      const text = anchorNode.getTextContent().slice(startOffset, endOffset);
+      if (!doesContainGrapheme(text)) {
+        if (isBackward) {
+          focus.offset = characterOffset;
+        } else {
+          anchor.offset = characterOffset;
+        }
+      }
+    }
+  } else {
+    // TODO Handling of multibyte characters
+  }
+}
+
+function $removeSegment(
+  node: TextNode,
+  isBackward: boolean,
+  offset: number,
+): void {
+  const textNode = node;
+  const textContent = textNode.getTextContent();
+  const split = textContent.split(/(?=\s)/g);
+  const splitLength = split.length;
+  let segmentOffset = 0;
+  let restoreOffset: number | undefined = 0;
+
+  for (let i = 0; i < splitLength; i++) {
+    const text = split[i];
+    const isLast = i === splitLength - 1;
+    restoreOffset = segmentOffset;
+    segmentOffset += text.length;
+
+    if (
+      (isBackward && segmentOffset === offset) ||
+      segmentOffset > offset ||
+      isLast
+    ) {
+      split.splice(i, 1);
+      if (isLast) {
+        restoreOffset = undefined;
+      }
+      break;
+    }
+  }
+  const nextTextContent = split.join('').trim();
+
+  if (nextTextContent === '') {
+    textNode.remove();
+  } else {
+    textNode.setTextContent(nextTextContent);
+    textNode.select(restoreOffset, restoreOffset);
+  }
+}
+
+function shouldResolveAncestor(
+  resolvedElement: ElementNode,
+  resolvedOffset: number,
+  lastPoint: null | PointType,
+): boolean {
+  const parent = resolvedElement.getParent();
+  return (
+    lastPoint === null ||
+    parent === null ||
+    !parent.canBeEmpty() ||
+    parent !== lastPoint.getNode()
+  );
+}
+
+function $internalResolveSelectionPoint(
+  dom: Node,
+  offset: number,
+  lastPoint: null | PointType,
+  editor: LexicalEditor,
+): null | PointType {
+  let resolvedOffset = offset;
+  let resolvedNode: TextNode | LexicalNode | null;
+  // If we have selection on an element, we will
+  // need to figure out (using the offset) what text
+  // node should be selected.
+
+  if (dom.nodeType === DOM_ELEMENT_TYPE) {
+    // Resolve element to a ElementNode, or TextNode, or null
+    let moveSelectionToEnd = false;
+    // Given we're moving selection to another node, selection is
+    // definitely dirty.
+    // We use the anchor to find which child node to select
+    const childNodes = dom.childNodes;
+    const childNodesLength = childNodes.length;
+    const blockCursorElement = editor._blockCursorElement;
+    // If the anchor is the same as length, then this means we
+    // need to select the very last text node.
+    if (resolvedOffset === childNodesLength) {
+      moveSelectionToEnd = true;
+      resolvedOffset = childNodesLength - 1;
+    }
+    let childDOM = childNodes[resolvedOffset];
+    let hasBlockCursor = false;
+    if (childDOM === blockCursorElement) {
+      childDOM = childNodes[resolvedOffset + 1];
+      hasBlockCursor = true;
+    } else if (blockCursorElement !== null) {
+      const blockCursorElementParent = blockCursorElement.parentNode;
+      if (dom === blockCursorElementParent) {
+        const blockCursorOffset = Array.prototype.indexOf.call(
+          blockCursorElementParent.children,
+          blockCursorElement,
+        );
+        if (offset > blockCursorOffset) {
+          resolvedOffset--;
+        }
+      }
+    }
+    resolvedNode = $getNodeFromDOM(childDOM);
+
+    if ($isTextNode(resolvedNode)) {
+      resolvedOffset = getTextNodeOffset(resolvedNode, moveSelectionToEnd);
+    } else {
+      let resolvedElement = $getNodeFromDOM(dom);
+      // Ensure resolvedElement is actually a element.
+      if (resolvedElement === null) {
+        return null;
+      }
+      if ($isElementNode(resolvedElement)) {
+        resolvedOffset = Math.min(
+          resolvedElement.getChildrenSize(),
+          resolvedOffset,
+        );
+        let child = resolvedElement.getChildAtIndex(resolvedOffset);
+        if (
+          $isElementNode(child) &&
+          shouldResolveAncestor(child, resolvedOffset, lastPoint)
+        ) {
+          const descendant = moveSelectionToEnd
+            ? child.getLastDescendant()
+            : child.getFirstDescendant();
+          if (descendant === null) {
+            resolvedElement = child;
+          } else {
+            child = descendant;
+            resolvedElement = $isElementNode(child)
+              ? child
+              : child.getParentOrThrow();
+          }
+          resolvedOffset = 0;
+        }
+        if ($isTextNode(child)) {
+          resolvedNode = child;
+          resolvedElement = null;
+          resolvedOffset = getTextNodeOffset(child, moveSelectionToEnd);
+        } else if (
+          child !== resolvedElement &&
+          moveSelectionToEnd &&
+          !hasBlockCursor
+        ) {
+          resolvedOffset++;
+        }
+      } else {
+        const index = resolvedElement.getIndexWithinParent();
+        // When selecting decorators, there can be some selection issues when using resolvedOffset,
+        // and instead we should be checking if we're using the offset
+        if (
+          offset === 0 &&
+          $isDecoratorNode(resolvedElement) &&
+          $getNodeFromDOM(dom) === resolvedElement
+        ) {
+          resolvedOffset = index;
+        } else {
+          resolvedOffset = index + 1;
+        }
+        resolvedElement = resolvedElement.getParentOrThrow();
+      }
+      if ($isElementNode(resolvedElement)) {
+        return $createPoint(resolvedElement.__key, resolvedOffset, 'element');
+      }
+    }
+  } else {
+    // TextNode or null
+    resolvedNode = $getNodeFromDOM(dom);
+  }
+  if (!$isTextNode(resolvedNode)) {
+    return null;
+  }
+  return $createPoint(resolvedNode.__key, resolvedOffset, 'text');
+}
+
+function resolveSelectionPointOnBoundary(
+  point: TextPointType,
+  isBackward: boolean,
+  isCollapsed: boolean,
+): void {
+  const offset = point.offset;
+  const node = point.getNode();
+
+  if (offset === 0) {
+    const prevSibling = node.getPreviousSibling();
+    const parent = node.getParent();
+
+    if (!isBackward) {
+      if (
+        $isElementNode(prevSibling) &&
+        !isCollapsed &&
+        prevSibling.isInline()
+      ) {
+        point.key = prevSibling.__key;
+        point.offset = prevSibling.getChildrenSize();
+        // @ts-expect-error: intentional
+        point.type = 'element';
+      } else if ($isTextNode(prevSibling)) {
+        point.key = prevSibling.__key;
+        point.offset = prevSibling.getTextContent().length;
+      }
+    } else if (
+      (isCollapsed || !isBackward) &&
+      prevSibling === null &&
+      $isElementNode(parent) &&
+      parent.isInline()
+    ) {
+      const parentSibling = parent.getPreviousSibling();
+      if ($isTextNode(parentSibling)) {
+        point.key = parentSibling.__key;
+        point.offset = parentSibling.getTextContent().length;
+      }
+    }
+  } else if (offset === node.getTextContent().length) {
+    const nextSibling = node.getNextSibling();
+    const parent = node.getParent();
+
+    if (isBackward && $isElementNode(nextSibling) && nextSibling.isInline()) {
+      point.key = nextSibling.__key;
+      point.offset = 0;
+      // @ts-expect-error: intentional
+      point.type = 'element';
+    } else if (
+      (isCollapsed || isBackward) &&
+      nextSibling === null &&
+      $isElementNode(parent) &&
+      parent.isInline() &&
+      !parent.canInsertTextAfter()
+    ) {
+      const parentSibling = parent.getNextSibling();
+      if ($isTextNode(parentSibling)) {
+        point.key = parentSibling.__key;
+        point.offset = 0;
+      }
+    }
+  }
+}
+
+function $normalizeSelectionPointsForBoundaries(
+  anchor: PointType,
+  focus: PointType,
+  lastSelection: null | BaseSelection,
+): void {
+  if (anchor.type === 'text' && focus.type === 'text') {
+    const isBackward = anchor.isBefore(focus);
+    const isCollapsed = anchor.is(focus);
+
+    // Attempt to normalize the offset to the previous sibling if we're at the
+    // start of a text node and the sibling is a text node or inline element.
+    resolveSelectionPointOnBoundary(anchor, isBackward, isCollapsed);
+    resolveSelectionPointOnBoundary(focus, !isBackward, isCollapsed);
+
+    if (isCollapsed) {
+      focus.key = anchor.key;
+      focus.offset = anchor.offset;
+      focus.type = anchor.type;
+    }
+    const editor = getActiveEditor();
+
+    if (
+      editor.isComposing() &&
+      editor._compositionKey !== anchor.key &&
+      $isRangeSelection(lastSelection)
+    ) {
+      const lastAnchor = lastSelection.anchor;
+      const lastFocus = lastSelection.focus;
+      $setPointValues(
+        anchor,
+        lastAnchor.key,
+        lastAnchor.offset,
+        lastAnchor.type,
+      );
+      $setPointValues(focus, lastFocus.key, lastFocus.offset, lastFocus.type);
+    }
+  }
+}
+
+function $internalResolveSelectionPoints(
+  anchorDOM: null | Node,
+  anchorOffset: number,
+  focusDOM: null | Node,
+  focusOffset: number,
+  editor: LexicalEditor,
+  lastSelection: null | BaseSelection,
+): null | [PointType, PointType] {
+  if (
+    anchorDOM === null ||
+    focusDOM === null ||
+    !isSelectionWithinEditor(editor, anchorDOM, focusDOM)
+  ) {
+    return null;
+  }
+  const resolvedAnchorPoint = $internalResolveSelectionPoint(
+    anchorDOM,
+    anchorOffset,
+    $isRangeSelection(lastSelection) ? lastSelection.anchor : null,
+    editor,
+  );
+  if (resolvedAnchorPoint === null) {
+    return null;
+  }
+  const resolvedFocusPoint = $internalResolveSelectionPoint(
+    focusDOM,
+    focusOffset,
+    $isRangeSelection(lastSelection) ? lastSelection.focus : null,
+    editor,
+  );
+  if (resolvedFocusPoint === null) {
+    return null;
+  }
+  if (
+    resolvedAnchorPoint.type === 'element' &&
+    resolvedFocusPoint.type === 'element'
+  ) {
+    const anchorNode = $getNodeFromDOM(anchorDOM);
+    const focusNode = $getNodeFromDOM(focusDOM);
+    // Ensure if we're selecting the content of a decorator that we
+    // return null for this point, as it's not in the controlled scope
+    // of Lexical.
+    if ($isDecoratorNode(anchorNode) && $isDecoratorNode(focusNode)) {
+      return null;
+    }
+  }
+
+  // Handle normalization of selection when it is at the boundaries.
+  $normalizeSelectionPointsForBoundaries(
+    resolvedAnchorPoint,
+    resolvedFocusPoint,
+    lastSelection,
+  );
+
+  return [resolvedAnchorPoint, resolvedFocusPoint];
+}
+
+export function $isBlockElementNode(
+  node: LexicalNode | null | undefined,
+): node is ElementNode {
+  return $isElementNode(node) && !node.isInline();
+}
+
+// This is used to make a selection when the existing
+// selection is null, i.e. forcing selection on the editor
+// when it current exists outside the editor.
+
+export function $internalMakeRangeSelection(
+  anchorKey: NodeKey,
+  anchorOffset: number,
+  focusKey: NodeKey,
+  focusOffset: number,
+  anchorType: 'text' | 'element',
+  focusType: 'text' | 'element',
+): RangeSelection {
+  const editorState = getActiveEditorState();
+  const selection = new RangeSelection(
+    $createPoint(anchorKey, anchorOffset, anchorType),
+    $createPoint(focusKey, focusOffset, focusType),
+    0,
+    '',
+  );
+  selection.dirty = true;
+  editorState._selection = selection;
+  return selection;
+}
+
+export function $createRangeSelection(): RangeSelection {
+  const anchor = $createPoint('root', 0, 'element');
+  const focus = $createPoint('root', 0, 'element');
+  return new RangeSelection(anchor, focus, 0, '');
+}
+
+export function $createNodeSelection(): NodeSelection {
+  return new NodeSelection(new Set());
+}
+
+export function $internalCreateSelection(
+  editor: LexicalEditor,
+): null | BaseSelection {
+  const currentEditorState = editor.getEditorState();
+  const lastSelection = currentEditorState._selection;
+  const domSelection = getDOMSelection(editor._window);
+
+  if ($isRangeSelection(lastSelection) || lastSelection == null) {
+    return $internalCreateRangeSelection(
+      lastSelection,
+      domSelection,
+      editor,
+      null,
+    );
+  }
+  return lastSelection.clone();
+}
+
+export function $createRangeSelectionFromDom(
+  domSelection: Selection | null,
+  editor: LexicalEditor,
+): null | RangeSelection {
+  return $internalCreateRangeSelection(null, domSelection, editor, null);
+}
+
+export function $internalCreateRangeSelection(
+  lastSelection: null | BaseSelection,
+  domSelection: Selection | null,
+  editor: LexicalEditor,
+  event: UIEvent | Event | null,
+): null | RangeSelection {
+  const windowObj = editor._window;
+  if (windowObj === null) {
+    return null;
+  }
+  // When we create a selection, we try to use the previous
+  // selection where possible, unless an actual user selection
+  // change has occurred. When we do need to create a new selection
+  // we validate we can have text nodes for both anchor and focus
+  // nodes. If that holds true, we then return that selection
+  // as a mutable object that we use for the editor state for this
+  // update cycle. If a selection gets changed, and requires a
+  // update to native DOM selection, it gets marked as "dirty".
+  // If the selection changes, but matches with the existing
+  // DOM selection, then we only need to sync it. Otherwise,
+  // we generally bail out of doing an update to selection during
+  // reconciliation unless there are dirty nodes that need
+  // reconciling.
+
+  const windowEvent = event || windowObj.event;
+  const eventType = windowEvent ? windowEvent.type : undefined;
+  const isSelectionChange = eventType === 'selectionchange';
+  const useDOMSelection =
+    !getIsProcessingMutations() &&
+    (isSelectionChange ||
+      eventType === 'beforeinput' ||
+      eventType === 'compositionstart' ||
+      eventType === 'compositionend' ||
+      (eventType === 'click' &&
+        windowEvent &&
+        (windowEvent as InputEvent).detail === 3) ||
+      eventType === 'drop' ||
+      eventType === undefined);
+  let anchorDOM, focusDOM, anchorOffset, focusOffset;
+
+  if (!$isRangeSelection(lastSelection) || useDOMSelection) {
+    if (domSelection === null) {
+      return null;
+    }
+    anchorDOM = domSelection.anchorNode;
+    focusDOM = domSelection.focusNode;
+    anchorOffset = domSelection.anchorOffset;
+    focusOffset = domSelection.focusOffset;
+    if (
+      isSelectionChange &&
+      $isRangeSelection(lastSelection) &&
+      !isSelectionWithinEditor(editor, anchorDOM, focusDOM)
+    ) {
+      return lastSelection.clone();
+    }
+  } else {
+    return lastSelection.clone();
+  }
+  // Let's resolve the text nodes from the offsets and DOM nodes we have from
+  // native selection.
+  const resolvedSelectionPoints = $internalResolveSelectionPoints(
+    anchorDOM,
+    anchorOffset,
+    focusDOM,
+    focusOffset,
+    editor,
+    lastSelection,
+  );
+  if (resolvedSelectionPoints === null) {
+    return null;
+  }
+  const [resolvedAnchorPoint, resolvedFocusPoint] = resolvedSelectionPoints;
+  return new RangeSelection(
+    resolvedAnchorPoint,
+    resolvedFocusPoint,
+    !$isRangeSelection(lastSelection) ? 0 : lastSelection.format,
+    !$isRangeSelection(lastSelection) ? '' : lastSelection.style,
+  );
+}
+
+export function $getSelection(): null | BaseSelection {
+  const editorState = getActiveEditorState();
+  return editorState._selection;
+}
+
+export function $getPreviousSelection(): null | BaseSelection {
+  const editor = getActiveEditor();
+  return editor._editorState._selection;
+}
+
+export function $updateElementSelectionOnCreateDeleteNode(
+  selection: RangeSelection,
+  parentNode: LexicalNode,
+  nodeOffset: number,
+  times = 1,
+): void {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const anchorNode = anchor.getNode();
+  const focusNode = focus.getNode();
+  if (!parentNode.is(anchorNode) && !parentNode.is(focusNode)) {
+    return;
+  }
+  const parentKey = parentNode.__key;
+  // Single node. We shift selection but never redimension it
+  if (selection.isCollapsed()) {
+    const selectionOffset = anchor.offset;
+    if (
+      (nodeOffset <= selectionOffset && times > 0) ||
+      (nodeOffset < selectionOffset && times < 0)
+    ) {
+      const newSelectionOffset = Math.max(0, selectionOffset + times);
+      anchor.set(parentKey, newSelectionOffset, 'element');
+      focus.set(parentKey, newSelectionOffset, 'element');
+      // The new selection might point to text nodes, try to resolve them
+      $updateSelectionResolveTextNodes(selection);
+    }
+  } else {
+    // Multiple nodes selected. We shift or redimension selection
+    const isBackward = selection.isBackward();
+    const firstPoint = isBackward ? focus : anchor;
+    const firstPointNode = firstPoint.getNode();
+    const lastPoint = isBackward ? anchor : focus;
+    const lastPointNode = lastPoint.getNode();
+    if (parentNode.is(firstPointNode)) {
+      const firstPointOffset = firstPoint.offset;
+      if (
+        (nodeOffset <= firstPointOffset && times > 0) ||
+        (nodeOffset < firstPointOffset && times < 0)
+      ) {
+        firstPoint.set(
+          parentKey,
+          Math.max(0, firstPointOffset + times),
+          'element',
+        );
+      }
+    }
+    if (parentNode.is(lastPointNode)) {
+      const lastPointOffset = lastPoint.offset;
+      if (
+        (nodeOffset <= lastPointOffset && times > 0) ||
+        (nodeOffset < lastPointOffset && times < 0)
+      ) {
+        lastPoint.set(
+          parentKey,
+          Math.max(0, lastPointOffset + times),
+          'element',
+        );
+      }
+    }
+  }
+  // The new selection might point to text nodes, try to resolve them
+  $updateSelectionResolveTextNodes(selection);
+}
+
+function $updateSelectionResolveTextNodes(selection: RangeSelection): void {
+  const anchor = selection.anchor;
+  const anchorOffset = anchor.offset;
+  const focus = selection.focus;
+  const focusOffset = focus.offset;
+  const anchorNode = anchor.getNode();
+  const focusNode = focus.getNode();
+  if (selection.isCollapsed()) {
+    if (!$isElementNode(anchorNode)) {
+      return;
+    }
+    const childSize = anchorNode.getChildrenSize();
+    const anchorOffsetAtEnd = anchorOffset >= childSize;
+    const child = anchorOffsetAtEnd
+      ? anchorNode.getChildAtIndex(childSize - 1)
+      : anchorNode.getChildAtIndex(anchorOffset);
+    if ($isTextNode(child)) {
+      let newOffset = 0;
+      if (anchorOffsetAtEnd) {
+        newOffset = child.getTextContentSize();
+      }
+      anchor.set(child.__key, newOffset, 'text');
+      focus.set(child.__key, newOffset, 'text');
+    }
+    return;
+  }
+  if ($isElementNode(anchorNode)) {
+    const childSize = anchorNode.getChildrenSize();
+    const anchorOffsetAtEnd = anchorOffset >= childSize;
+    const child = anchorOffsetAtEnd
+      ? anchorNode.getChildAtIndex(childSize - 1)
+      : anchorNode.getChildAtIndex(anchorOffset);
+    if ($isTextNode(child)) {
+      let newOffset = 0;
+      if (anchorOffsetAtEnd) {
+        newOffset = child.getTextContentSize();
+      }
+      anchor.set(child.__key, newOffset, 'text');
+    }
+  }
+  if ($isElementNode(focusNode)) {
+    const childSize = focusNode.getChildrenSize();
+    const focusOffsetAtEnd = focusOffset >= childSize;
+    const child = focusOffsetAtEnd
+      ? focusNode.getChildAtIndex(childSize - 1)
+      : focusNode.getChildAtIndex(focusOffset);
+    if ($isTextNode(child)) {
+      let newOffset = 0;
+      if (focusOffsetAtEnd) {
+        newOffset = child.getTextContentSize();
+      }
+      focus.set(child.__key, newOffset, 'text');
+    }
+  }
+}
+
+export function applySelectionTransforms(
+  nextEditorState: EditorState,
+  editor: LexicalEditor,
+): void {
+  const prevEditorState = editor.getEditorState();
+  const prevSelection = prevEditorState._selection;
+  const nextSelection = nextEditorState._selection;
+  if ($isRangeSelection(nextSelection)) {
+    const anchor = nextSelection.anchor;
+    const focus = nextSelection.focus;
+    let anchorNode;
+
+    if (anchor.type === 'text') {
+      anchorNode = anchor.getNode();
+      anchorNode.selectionTransform(prevSelection, nextSelection);
+    }
+    if (focus.type === 'text') {
+      const focusNode = focus.getNode();
+      if (anchorNode !== focusNode) {
+        focusNode.selectionTransform(prevSelection, nextSelection);
+      }
+    }
+  }
+}
+
+export function moveSelectionPointToSibling(
+  point: PointType,
+  node: LexicalNode,
+  parent: ElementNode,
+  prevSibling: LexicalNode | null,
+  nextSibling: LexicalNode | null,
+): void {
+  let siblingKey = null;
+  let offset = 0;
+  let type: 'text' | 'element' | null = null;
+  if (prevSibling !== null) {
+    siblingKey = prevSibling.__key;
+    if ($isTextNode(prevSibling)) {
+      offset = prevSibling.getTextContentSize();
+      type = 'text';
+    } else if ($isElementNode(prevSibling)) {
+      offset = prevSibling.getChildrenSize();
+      type = 'element';
+    }
+  } else {
+    if (nextSibling !== null) {
+      siblingKey = nextSibling.__key;
+      if ($isTextNode(nextSibling)) {
+        type = 'text';
+      } else if ($isElementNode(nextSibling)) {
+        type = 'element';
+      }
+    }
+  }
+  if (siblingKey !== null && type !== null) {
+    point.set(siblingKey, offset, type);
+  } else {
+    offset = node.getIndexWithinParent();
+    if (offset === -1) {
+      // Move selection to end of parent
+      offset = parent.getChildrenSize();
+    }
+    point.set(parent.__key, offset, 'element');
+  }
+}
+
+export function adjustPointOffsetForMergedSibling(
+  point: PointType,
+  isBefore: boolean,
+  key: NodeKey,
+  target: TextNode,
+  textLength: number,
+): void {
+  if (point.type === 'text') {
+    point.key = key;
+    if (!isBefore) {
+      point.offset += textLength;
+    }
+  } else if (point.offset > target.getIndexWithinParent()) {
+    point.offset -= 1;
+  }
+}
+
+export function updateDOMSelection(
+  prevSelection: BaseSelection | null,
+  nextSelection: BaseSelection | null,
+  editor: LexicalEditor,
+  domSelection: Selection,
+  tags: Set<string>,
+  rootElement: HTMLElement,
+  nodeCount: number,
+): void {
+  const anchorDOMNode = domSelection.anchorNode;
+  const focusDOMNode = domSelection.focusNode;
+  const anchorOffset = domSelection.anchorOffset;
+  const focusOffset = domSelection.focusOffset;
+  const activeElement = document.activeElement;
+
+  // TODO: make this not hard-coded, and add another config option
+  // that makes this configurable.
+  if (
+    (tags.has('collaboration') && activeElement !== rootElement) ||
+    (activeElement !== null &&
+      isSelectionCapturedInDecoratorInput(activeElement))
+  ) {
+    return;
+  }
+
+  if (!$isRangeSelection(nextSelection)) {
+    // We don't remove selection if the prevSelection is null because
+    // of editor.setRootElement(). If this occurs on init when the
+    // editor is already focused, then this can cause the editor to
+    // lose focus.
+    if (
+      prevSelection !== null &&
+      isSelectionWithinEditor(editor, anchorDOMNode, focusDOMNode)
+    ) {
+      domSelection.removeAllRanges();
+    }
+
+    return;
+  }
+
+  const anchor = nextSelection.anchor;
+  const focus = nextSelection.focus;
+  const anchorKey = anchor.key;
+  const focusKey = focus.key;
+  const anchorDOM = getElementByKeyOrThrow(editor, anchorKey);
+  const focusDOM = getElementByKeyOrThrow(editor, focusKey);
+  const nextAnchorOffset = anchor.offset;
+  const nextFocusOffset = focus.offset;
+  const nextFormat = nextSelection.format;
+  const nextStyle = nextSelection.style;
+  const isCollapsed = nextSelection.isCollapsed();
+  let nextAnchorNode: HTMLElement | Text | null = anchorDOM;
+  let nextFocusNode: HTMLElement | Text | null = focusDOM;
+  let anchorFormatOrStyleChanged = false;
+
+  if (anchor.type === 'text') {
+    nextAnchorNode = getDOMTextNode(anchorDOM);
+    const anchorNode = anchor.getNode();
+    anchorFormatOrStyleChanged =
+      anchorNode.getFormat() !== nextFormat ||
+      anchorNode.getStyle() !== nextStyle;
+  } else if (
+    $isRangeSelection(prevSelection) &&
+    prevSelection.anchor.type === 'text'
+  ) {
+    anchorFormatOrStyleChanged = true;
+  }
+
+  if (focus.type === 'text') {
+    nextFocusNode = getDOMTextNode(focusDOM);
+  }
+
+  // If we can't get an underlying text node for selection, then
+  // we should avoid setting selection to something incorrect.
+  if (nextAnchorNode === null || nextFocusNode === null) {
+    return;
+  }
+
+  if (
+    isCollapsed &&
+    (prevSelection === null ||
+      anchorFormatOrStyleChanged ||
+      ($isRangeSelection(prevSelection) &&
+        (prevSelection.format !== nextFormat ||
+          prevSelection.style !== nextStyle)))
+  ) {
+    markCollapsedSelectionFormat(
+      nextFormat,
+      nextStyle,
+      nextAnchorOffset,
+      anchorKey,
+      performance.now(),
+    );
+  }
+
+  // Diff against the native DOM selection to ensure we don't do
+  // an unnecessary selection update. We also skip this check if
+  // we're moving selection to within an element, as this can
+  // sometimes be problematic around scrolling.
+  if (
+    anchorOffset === nextAnchorOffset &&
+    focusOffset === nextFocusOffset &&
+    anchorDOMNode === nextAnchorNode &&
+    focusDOMNode === nextFocusNode && // Badly interpreted range selection when collapsed - #1482
+    !(domSelection.type === 'Range' && isCollapsed)
+  ) {
+    // If the root element does not have focus, ensure it has focus
+    if (activeElement === null || !rootElement.contains(activeElement)) {
+      rootElement.focus({
+        preventScroll: true,
+      });
+    }
+    if (anchor.type !== 'element') {
+      return;
+    }
+  }
+
+  // Apply the updated selection to the DOM. Note: this will trigger
+  // a "selectionchange" event, although it will be asynchronous.
+  try {
+    domSelection.setBaseAndExtent(
+      nextAnchorNode,
+      nextAnchorOffset,
+      nextFocusNode,
+      nextFocusOffset,
+    );
+  } catch (error) {
+    // If we encounter an error, continue. This can sometimes
+    // occur with FF and there's no good reason as to why it
+    // should happen.
+    if (__DEV__) {
+      console.warn(error);
+    }
+  }
+  if (
+    !tags.has('skip-scroll-into-view') &&
+    nextSelection.isCollapsed() &&
+    rootElement !== null &&
+    rootElement === document.activeElement
+  ) {
+    const selectionTarget: null | Range | HTMLElement | Text =
+      nextSelection instanceof RangeSelection &&
+      nextSelection.anchor.type === 'element'
+        ? (nextAnchorNode.childNodes[nextAnchorOffset] as HTMLElement | Text) ||
+          null
+        : domSelection.rangeCount > 0
+        ? domSelection.getRangeAt(0)
+        : null;
+    if (selectionTarget !== null) {
+      let selectionRect: DOMRect;
+      if (selectionTarget instanceof Text) {
+        const range = document.createRange();
+        range.selectNode(selectionTarget);
+        selectionRect = range.getBoundingClientRect();
+      } else {
+        selectionRect = selectionTarget.getBoundingClientRect();
+      }
+      scrollIntoViewIfNeeded(editor, selectionRect, rootElement);
+    }
+  }
+
+  markSelectionChangeFromDOMUpdate();
+}
+
+export function $insertNodes(nodes: Array<LexicalNode>) {
+  let selection = $getSelection() || $getPreviousSelection();
+
+  if (selection === null) {
+    selection = $getRoot().selectEnd();
+  }
+  selection.insertNodes(nodes);
+}
+
+export function $getTextContent(): string {
+  const selection = $getSelection();
+  if (selection === null) {
+    return '';
+  }
+  return selection.getTextContent();
+}
+
+function $removeTextAndSplitBlock(selection: RangeSelection): number {
+  let selection_ = selection;
+  if (!selection.isCollapsed()) {
+    selection_.removeText();
+  }
+  // A new selection can originate as a result of node replacement, in which case is registered via
+  // $setSelection
+  const newSelection = $getSelection();
+  if ($isRangeSelection(newSelection)) {
+    selection_ = newSelection;
+  }
+
+  invariant(
+    $isRangeSelection(selection_),
+    'Unexpected dirty selection to be null',
+  );
+
+  const anchor = selection_.anchor;
+  let node = anchor.getNode();
+  let offset = anchor.offset;
+
+  while (!INTERNAL_$isBlock(node)) {
+    [node, offset] = $splitNodeAtPoint(node, offset);
+  }
+
+  return offset;
+}
+
+function $splitNodeAtPoint(
+  node: LexicalNode,
+  offset: number,
+): [parent: ElementNode, offset: number] {
+  const parent = node.getParent();
+  if (!parent) {
+    const paragraph = $createParagraphNode();
+    $getRoot().append(paragraph);
+    paragraph.select();
+    return [$getRoot(), 0];
+  }
+
+  if ($isTextNode(node)) {
+    const split = node.splitText(offset);
+    if (split.length === 0) {
+      return [parent, node.getIndexWithinParent()];
+    }
+    const x = offset === 0 ? 0 : 1;
+    const index = split[0].getIndexWithinParent() + x;
+
+    return [parent, index];
+  }
+
+  if (!$isElementNode(node) || offset === 0) {
+    return [parent, node.getIndexWithinParent()];
+  }
+
+  const firstToAppend = node.getChildAtIndex(offset);
+  if (firstToAppend) {
+    const insertPoint = new RangeSelection(
+      $createPoint(node.__key, offset, 'element'),
+      $createPoint(node.__key, offset, 'element'),
+      0,
+      '',
+    );
+    const newElement = node.insertNewAfter(insertPoint) as ElementNode | null;
+    if (newElement) {
+      newElement.append(firstToAppend, ...firstToAppend.getNextSiblings());
+    }
+  }
+  return [parent, node.getIndexWithinParent() + 1];
+}
+
+function $wrapInlineNodes(nodes: LexicalNode[]) {
+  // We temporarily insert the topLevelNodes into an arbitrary ElementNode,
+  // since insertAfter does not work on nodes that have no parent (TO-DO: fix that).
+  const virtualRoot = $createParagraphNode();
+
+  let currentBlock = null;
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+
+    const isLineBreakNode = $isLineBreakNode(node);
+
+    if (
+      isLineBreakNode ||
+      ($isDecoratorNode(node) && node.isInline()) ||
+      ($isElementNode(node) && node.isInline()) ||
+      $isTextNode(node) ||
+      node.isParentRequired()
+    ) {
+      if (currentBlock === null) {
+        currentBlock = node.createParentElementNode();
+        virtualRoot.append(currentBlock);
+        // In the case of LineBreakNode, we just need to
+        // add an empty ParagraphNode to the topLevelBlocks.
+        if (isLineBreakNode) {
+          continue;
+        }
+      }
+
+      if (currentBlock !== null) {
+        currentBlock.append(node);
+      }
+    } else {
+      virtualRoot.append(node);
+      currentBlock = null;
+    }
+  }
+
+  return virtualRoot;
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalUpdates.ts b/resources/js/wysiwyg/lexical/core/LexicalUpdates.ts
new file mode 100644
index 00000000000..86ed2740fcd
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalUpdates.ts
@@ -0,0 +1,1035 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {SerializedEditorState} from './LexicalEditorState';
+import type {LexicalNode, SerializedLexicalNode} from './LexicalNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {$isElementNode, $isTextNode, SELECTION_CHANGE_COMMAND} from '.';
+import {FULL_RECONCILE, NO_DIRTY_NODES} from './LexicalConstants';
+import {
+  CommandPayloadType,
+  EditorUpdateOptions,
+  LexicalCommand,
+  LexicalEditor,
+  Listener,
+  MutatedNodes,
+  RegisteredNodes,
+  resetEditor,
+  Transform,
+} from './LexicalEditor';
+import {
+  cloneEditorState,
+  createEmptyEditorState,
+  EditorState,
+  editorStateHasDirtySelection,
+} from './LexicalEditorState';
+import {
+  $garbageCollectDetachedDecorators,
+  $garbageCollectDetachedNodes,
+} from './LexicalGC';
+import {initMutationObserver} from './LexicalMutations';
+import {$normalizeTextNode} from './LexicalNormalization';
+import {$reconcileRoot} from './LexicalReconciler';
+import {
+  $internalCreateSelection,
+  $isNodeSelection,
+  $isRangeSelection,
+  applySelectionTransforms,
+  updateDOMSelection,
+} from './LexicalSelection';
+import {
+  $getCompositionKey,
+  getDOMSelection,
+  getEditorPropertyFromDOMNode,
+  getEditorStateTextContent,
+  getEditorsToPropagate,
+  getRegisteredNodeOrThrow,
+  isLexicalEditor,
+  removeDOMBlockCursorElement,
+  scheduleMicroTask,
+  updateDOMBlockCursorElement,
+} from './LexicalUtils';
+
+let activeEditorState: null | EditorState = null;
+let activeEditor: null | LexicalEditor = null;
+let isReadOnlyMode = false;
+let isAttemptingToRecoverFromReconcilerError = false;
+let infiniteTransformCount = 0;
+
+const observerOptions = {
+  characterData: true,
+  childList: true,
+  subtree: true,
+};
+
+export function isCurrentlyReadOnlyMode(): boolean {
+  return (
+    isReadOnlyMode ||
+    (activeEditorState !== null && activeEditorState._readOnly)
+  );
+}
+
+export function errorOnReadOnly(): void {
+  if (isReadOnlyMode) {
+    invariant(false, 'Cannot use method in read-only mode.');
+  }
+}
+
+export function errorOnInfiniteTransforms(): void {
+  if (infiniteTransformCount > 99) {
+    invariant(
+      false,
+      'One or more transforms are endlessly triggering additional transforms. May have encountered infinite recursion caused by transforms that have their preconditions too lose and/or conflict with each other.',
+    );
+  }
+}
+
+export function getActiveEditorState(): EditorState {
+  if (activeEditorState === null) {
+    invariant(
+      false,
+      'Unable to find an active editor state. ' +
+        'State helpers or node methods can only be used ' +
+        'synchronously during the callback of ' +
+        'editor.update(), editor.read(), or editorState.read().%s',
+      collectBuildInformation(),
+    );
+  }
+
+  return activeEditorState;
+}
+
+export function getActiveEditor(): LexicalEditor {
+  if (activeEditor === null) {
+    invariant(
+      false,
+      'Unable to find an active editor. ' +
+        'This method can only be used ' +
+        'synchronously during the callback of ' +
+        'editor.update() or editor.read().%s',
+      collectBuildInformation(),
+    );
+  }
+  return activeEditor;
+}
+
+function collectBuildInformation(): string {
+  let compatibleEditors = 0;
+  const incompatibleEditors = new Set<string>();
+  const thisVersion = LexicalEditor.version;
+  if (typeof window !== 'undefined') {
+    for (const node of document.querySelectorAll('[contenteditable]')) {
+      const editor = getEditorPropertyFromDOMNode(node);
+      if (isLexicalEditor(editor)) {
+        compatibleEditors++;
+      } else if (editor) {
+        let version = String(
+          (
+            editor.constructor as typeof editor['constructor'] &
+              Record<string, unknown>
+          ).version || '<0.17.1',
+        );
+        if (version === thisVersion) {
+          version +=
+            ' (separately built, likely a bundler configuration issue)';
+        }
+        incompatibleEditors.add(version);
+      }
+    }
+  }
+  let output = ` Detected on the page: ${compatibleEditors} compatible editor(s) with version ${thisVersion}`;
+  if (incompatibleEditors.size) {
+    output += ` and incompatible editors with versions ${Array.from(
+      incompatibleEditors,
+    ).join(', ')}`;
+  }
+  return output;
+}
+
+export function internalGetActiveEditor(): LexicalEditor | null {
+  return activeEditor;
+}
+
+export function internalGetActiveEditorState(): EditorState | null {
+  return activeEditorState;
+}
+
+export function $applyTransforms(
+  editor: LexicalEditor,
+  node: LexicalNode,
+  transformsCache: Map<string, Array<Transform<LexicalNode>>>,
+) {
+  const type = node.__type;
+  const registeredNode = getRegisteredNodeOrThrow(editor, type);
+  let transformsArr = transformsCache.get(type);
+
+  if (transformsArr === undefined) {
+    transformsArr = Array.from(registeredNode.transforms);
+    transformsCache.set(type, transformsArr);
+  }
+
+  const transformsArrLength = transformsArr.length;
+
+  for (let i = 0; i < transformsArrLength; i++) {
+    transformsArr[i](node);
+
+    if (!node.isAttached()) {
+      break;
+    }
+  }
+}
+
+function $isNodeValidForTransform(
+  node: LexicalNode,
+  compositionKey: null | string,
+): boolean {
+  return (
+    node !== undefined &&
+    // We don't want to transform nodes being composed
+    node.__key !== compositionKey &&
+    node.isAttached()
+  );
+}
+
+function $normalizeAllDirtyTextNodes(
+  editorState: EditorState,
+  editor: LexicalEditor,
+): void {
+  const dirtyLeaves = editor._dirtyLeaves;
+  const nodeMap = editorState._nodeMap;
+
+  for (const nodeKey of dirtyLeaves) {
+    const node = nodeMap.get(nodeKey);
+
+    if (
+      $isTextNode(node) &&
+      node.isAttached() &&
+      node.isSimpleText() &&
+      !node.isUnmergeable()
+    ) {
+      $normalizeTextNode(node);
+    }
+  }
+}
+
+/**
+ * Transform heuristic:
+ * 1. We transform leaves first. If transforms generate additional dirty nodes we repeat step 1.
+ * The reasoning behind this is that marking a leaf as dirty marks all its parent elements as dirty too.
+ * 2. We transform elements. If element transforms generate additional dirty nodes we repeat step 1.
+ * If element transforms only generate additional dirty elements we only repeat step 2.
+ *
+ * Note that to keep track of newly dirty nodes and subtrees we leverage the editor._dirtyNodes and
+ * editor._subtrees which we reset in every loop.
+ */
+function $applyAllTransforms(
+  editorState: EditorState,
+  editor: LexicalEditor,
+): void {
+  const dirtyLeaves = editor._dirtyLeaves;
+  const dirtyElements = editor._dirtyElements;
+  const nodeMap = editorState._nodeMap;
+  const compositionKey = $getCompositionKey();
+  const transformsCache = new Map();
+
+  let untransformedDirtyLeaves = dirtyLeaves;
+  let untransformedDirtyLeavesLength = untransformedDirtyLeaves.size;
+  let untransformedDirtyElements = dirtyElements;
+  let untransformedDirtyElementsLength = untransformedDirtyElements.size;
+
+  while (
+    untransformedDirtyLeavesLength > 0 ||
+    untransformedDirtyElementsLength > 0
+  ) {
+    if (untransformedDirtyLeavesLength > 0) {
+      // We leverage editor._dirtyLeaves to track the new dirty leaves after the transforms
+      editor._dirtyLeaves = new Set();
+
+      for (const nodeKey of untransformedDirtyLeaves) {
+        const node = nodeMap.get(nodeKey);
+
+        if (
+          $isTextNode(node) &&
+          node.isAttached() &&
+          node.isSimpleText() &&
+          !node.isUnmergeable()
+        ) {
+          $normalizeTextNode(node);
+        }
+
+        if (
+          node !== undefined &&
+          $isNodeValidForTransform(node, compositionKey)
+        ) {
+          $applyTransforms(editor, node, transformsCache);
+        }
+
+        dirtyLeaves.add(nodeKey);
+      }
+
+      untransformedDirtyLeaves = editor._dirtyLeaves;
+      untransformedDirtyLeavesLength = untransformedDirtyLeaves.size;
+
+      // We want to prioritize node transforms over element transforms
+      if (untransformedDirtyLeavesLength > 0) {
+        infiniteTransformCount++;
+        continue;
+      }
+    }
+
+    // All dirty leaves have been processed. Let's do elements!
+    // We have previously processed dirty leaves, so let's restart the editor leaves Set to track
+    // new ones caused by element transforms
+    editor._dirtyLeaves = new Set();
+    editor._dirtyElements = new Map();
+
+    for (const currentUntransformedDirtyElement of untransformedDirtyElements) {
+      const nodeKey = currentUntransformedDirtyElement[0];
+      const intentionallyMarkedAsDirty = currentUntransformedDirtyElement[1];
+      if (nodeKey !== 'root' && !intentionallyMarkedAsDirty) {
+        continue;
+      }
+
+      const node = nodeMap.get(nodeKey);
+
+      if (
+        node !== undefined &&
+        $isNodeValidForTransform(node, compositionKey)
+      ) {
+        $applyTransforms(editor, node, transformsCache);
+      }
+
+      dirtyElements.set(nodeKey, intentionallyMarkedAsDirty);
+    }
+
+    untransformedDirtyLeaves = editor._dirtyLeaves;
+    untransformedDirtyLeavesLength = untransformedDirtyLeaves.size;
+    untransformedDirtyElements = editor._dirtyElements;
+    untransformedDirtyElementsLength = untransformedDirtyElements.size;
+    infiniteTransformCount++;
+  }
+
+  editor._dirtyLeaves = dirtyLeaves;
+  editor._dirtyElements = dirtyElements;
+}
+
+type InternalSerializedNode = {
+  children?: Array<InternalSerializedNode>;
+  type: string;
+  version: number;
+};
+
+export function $parseSerializedNode(
+  serializedNode: SerializedLexicalNode,
+): LexicalNode {
+  const internalSerializedNode: InternalSerializedNode = serializedNode;
+  return $parseSerializedNodeImpl(
+    internalSerializedNode,
+    getActiveEditor()._nodes,
+  );
+}
+
+function $parseSerializedNodeImpl<
+  SerializedNode extends InternalSerializedNode,
+>(
+  serializedNode: SerializedNode,
+  registeredNodes: RegisteredNodes,
+): LexicalNode {
+  const type = serializedNode.type;
+  const registeredNode = registeredNodes.get(type);
+
+  if (registeredNode === undefined) {
+    invariant(false, 'parseEditorState: type "%s" + not found', type);
+  }
+
+  const nodeClass = registeredNode.klass;
+
+  if (serializedNode.type !== nodeClass.getType()) {
+    invariant(
+      false,
+      'LexicalNode: Node %s does not implement .importJSON().',
+      nodeClass.name,
+    );
+  }
+
+  const node = nodeClass.importJSON(serializedNode);
+  const children = serializedNode.children;
+
+  if ($isElementNode(node) && Array.isArray(children)) {
+    for (let i = 0; i < children.length; i++) {
+      const serializedJSONChildNode = children[i];
+      const childNode = $parseSerializedNodeImpl(
+        serializedJSONChildNode,
+        registeredNodes,
+      );
+      node.append(childNode);
+    }
+  }
+
+  return node;
+}
+
+export function parseEditorState(
+  serializedEditorState: SerializedEditorState,
+  editor: LexicalEditor,
+  updateFn: void | (() => void),
+): EditorState {
+  const editorState = createEmptyEditorState();
+  const previousActiveEditorState = activeEditorState;
+  const previousReadOnlyMode = isReadOnlyMode;
+  const previousActiveEditor = activeEditor;
+  const previousDirtyElements = editor._dirtyElements;
+  const previousDirtyLeaves = editor._dirtyLeaves;
+  const previousCloneNotNeeded = editor._cloneNotNeeded;
+  const previousDirtyType = editor._dirtyType;
+  editor._dirtyElements = new Map();
+  editor._dirtyLeaves = new Set();
+  editor._cloneNotNeeded = new Set();
+  editor._dirtyType = 0;
+  activeEditorState = editorState;
+  isReadOnlyMode = false;
+  activeEditor = editor;
+
+  try {
+    const registeredNodes = editor._nodes;
+    const serializedNode = serializedEditorState.root;
+    $parseSerializedNodeImpl(serializedNode, registeredNodes);
+    if (updateFn) {
+      updateFn();
+    }
+
+    // Make the editorState immutable
+    editorState._readOnly = true;
+
+    if (__DEV__) {
+      handleDEVOnlyPendingUpdateGuarantees(editorState);
+    }
+  } catch (error) {
+    if (error instanceof Error) {
+      editor._onError(error);
+    }
+  } finally {
+    editor._dirtyElements = previousDirtyElements;
+    editor._dirtyLeaves = previousDirtyLeaves;
+    editor._cloneNotNeeded = previousCloneNotNeeded;
+    editor._dirtyType = previousDirtyType;
+    activeEditorState = previousActiveEditorState;
+    isReadOnlyMode = previousReadOnlyMode;
+    activeEditor = previousActiveEditor;
+  }
+
+  return editorState;
+}
+
+// This technically isn't an update but given we need
+// exposure to the module's active bindings, we have this
+// function here
+
+export function readEditorState<V>(
+  editor: LexicalEditor | null,
+  editorState: EditorState,
+  callbackFn: () => V,
+): V {
+  const previousActiveEditorState = activeEditorState;
+  const previousReadOnlyMode = isReadOnlyMode;
+  const previousActiveEditor = activeEditor;
+
+  activeEditorState = editorState;
+  isReadOnlyMode = true;
+  activeEditor = editor;
+
+  try {
+    return callbackFn();
+  } finally {
+    activeEditorState = previousActiveEditorState;
+    isReadOnlyMode = previousReadOnlyMode;
+    activeEditor = previousActiveEditor;
+  }
+}
+
+function handleDEVOnlyPendingUpdateGuarantees(
+  pendingEditorState: EditorState,
+): void {
+  // Given we can't Object.freeze the nodeMap as it's a Map,
+  // we instead replace its set, clear and delete methods.
+  const nodeMap = pendingEditorState._nodeMap;
+
+  nodeMap.set = () => {
+    throw new Error('Cannot call set() on a frozen Lexical node map');
+  };
+
+  nodeMap.clear = () => {
+    throw new Error('Cannot call clear() on a frozen Lexical node map');
+  };
+
+  nodeMap.delete = () => {
+    throw new Error('Cannot call delete() on a frozen Lexical node map');
+  };
+}
+
+export function $commitPendingUpdates(
+  editor: LexicalEditor,
+  recoveryEditorState?: EditorState,
+): void {
+  const pendingEditorState = editor._pendingEditorState;
+  const rootElement = editor._rootElement;
+  const shouldSkipDOM = editor._headless || rootElement === null;
+
+  if (pendingEditorState === null) {
+    return;
+  }
+
+  // ======
+  // Reconciliation has started.
+  // ======
+
+  const currentEditorState = editor._editorState;
+  const currentSelection = currentEditorState._selection;
+  const pendingSelection = pendingEditorState._selection;
+  const needsUpdate = editor._dirtyType !== NO_DIRTY_NODES;
+  const previousActiveEditorState = activeEditorState;
+  const previousReadOnlyMode = isReadOnlyMode;
+  const previousActiveEditor = activeEditor;
+  const previouslyUpdating = editor._updating;
+  const observer = editor._observer;
+  let mutatedNodes = null;
+  editor._pendingEditorState = null;
+  editor._editorState = pendingEditorState;
+
+  if (!shouldSkipDOM && needsUpdate && observer !== null) {
+    activeEditor = editor;
+    activeEditorState = pendingEditorState;
+    isReadOnlyMode = false;
+    // We don't want updates to sync block the reconciliation.
+    editor._updating = true;
+    try {
+      const dirtyType = editor._dirtyType;
+      const dirtyElements = editor._dirtyElements;
+      const dirtyLeaves = editor._dirtyLeaves;
+      observer.disconnect();
+
+      mutatedNodes = $reconcileRoot(
+        currentEditorState,
+        pendingEditorState,
+        editor,
+        dirtyType,
+        dirtyElements,
+        dirtyLeaves,
+      );
+    } catch (error) {
+      // Report errors
+      if (error instanceof Error) {
+        editor._onError(error);
+      }
+
+      // Reset editor and restore incoming editor state to the DOM
+      if (!isAttemptingToRecoverFromReconcilerError) {
+        resetEditor(editor, null, rootElement, pendingEditorState);
+        initMutationObserver(editor);
+        editor._dirtyType = FULL_RECONCILE;
+        isAttemptingToRecoverFromReconcilerError = true;
+        $commitPendingUpdates(editor, currentEditorState);
+        isAttemptingToRecoverFromReconcilerError = false;
+      } else {
+        // To avoid a possible situation of infinite loops, lets throw
+        throw error;
+      }
+
+      return;
+    } finally {
+      observer.observe(rootElement as Node, observerOptions);
+      editor._updating = previouslyUpdating;
+      activeEditorState = previousActiveEditorState;
+      isReadOnlyMode = previousReadOnlyMode;
+      activeEditor = previousActiveEditor;
+    }
+  }
+
+  if (!pendingEditorState._readOnly) {
+    pendingEditorState._readOnly = true;
+    if (__DEV__) {
+      handleDEVOnlyPendingUpdateGuarantees(pendingEditorState);
+      if ($isRangeSelection(pendingSelection)) {
+        Object.freeze(pendingSelection.anchor);
+        Object.freeze(pendingSelection.focus);
+      }
+      Object.freeze(pendingSelection);
+    }
+  }
+
+  const dirtyLeaves = editor._dirtyLeaves;
+  const dirtyElements = editor._dirtyElements;
+  const normalizedNodes = editor._normalizedNodes;
+  const tags = editor._updateTags;
+  const deferred = editor._deferred;
+  const nodeCount = pendingEditorState._nodeMap.size;
+
+  if (needsUpdate) {
+    editor._dirtyType = NO_DIRTY_NODES;
+    editor._cloneNotNeeded.clear();
+    editor._dirtyLeaves = new Set();
+    editor._dirtyElements = new Map();
+    editor._normalizedNodes = new Set();
+    editor._updateTags = new Set();
+  }
+  $garbageCollectDetachedDecorators(editor, pendingEditorState);
+
+  // ======
+  // Reconciliation has finished. Now update selection and trigger listeners.
+  // ======
+
+  const domSelection = shouldSkipDOM ? null : getDOMSelection(editor._window);
+
+  // Attempt to update the DOM selection, including focusing of the root element,
+  // and scroll into view if needed.
+  if (
+    editor._editable &&
+    // domSelection will be null in headless
+    domSelection !== null &&
+    (needsUpdate || pendingSelection === null || pendingSelection.dirty)
+  ) {
+    activeEditor = editor;
+    activeEditorState = pendingEditorState;
+    try {
+      if (observer !== null) {
+        observer.disconnect();
+      }
+      if (needsUpdate || pendingSelection === null || pendingSelection.dirty) {
+        const blockCursorElement = editor._blockCursorElement;
+        if (blockCursorElement !== null) {
+          removeDOMBlockCursorElement(
+            blockCursorElement,
+            editor,
+            rootElement as HTMLElement,
+          );
+        }
+        updateDOMSelection(
+          currentSelection,
+          pendingSelection,
+          editor,
+          domSelection,
+          tags,
+          rootElement as HTMLElement,
+          nodeCount,
+        );
+      }
+      updateDOMBlockCursorElement(
+        editor,
+        rootElement as HTMLElement,
+        pendingSelection,
+      );
+      if (observer !== null) {
+        observer.observe(rootElement as Node, observerOptions);
+      }
+    } finally {
+      activeEditor = previousActiveEditor;
+      activeEditorState = previousActiveEditorState;
+    }
+  }
+
+  if (mutatedNodes !== null) {
+    triggerMutationListeners(
+      editor,
+      mutatedNodes,
+      tags,
+      dirtyLeaves,
+      currentEditorState,
+    );
+  }
+  if (
+    !$isRangeSelection(pendingSelection) &&
+    pendingSelection !== null &&
+    (currentSelection === null || !currentSelection.is(pendingSelection))
+  ) {
+    editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+  }
+  /**
+   * Capture pendingDecorators after garbage collecting detached decorators
+   */
+  const pendingDecorators = editor._pendingDecorators;
+  if (pendingDecorators !== null) {
+    editor._decorators = pendingDecorators;
+    editor._pendingDecorators = null;
+    triggerListeners('decorator', editor, true, pendingDecorators);
+  }
+
+  // If reconciler fails, we reset whole editor (so current editor state becomes empty)
+  // and attempt to re-render pendingEditorState. If that goes through we trigger
+  // listeners, but instead use recoverEditorState which is current editor state before reset
+  // This specifically important for collab that relies on prevEditorState from update
+  // listener to calculate delta of changed nodes/properties
+  triggerTextContentListeners(
+    editor,
+    recoveryEditorState || currentEditorState,
+    pendingEditorState,
+  );
+  triggerListeners('update', editor, true, {
+    dirtyElements,
+    dirtyLeaves,
+    editorState: pendingEditorState,
+    normalizedNodes,
+    prevEditorState: recoveryEditorState || currentEditorState,
+    tags,
+  });
+  triggerDeferredUpdateCallbacks(editor, deferred);
+  $triggerEnqueuedUpdates(editor);
+}
+
+function triggerTextContentListeners(
+  editor: LexicalEditor,
+  currentEditorState: EditorState,
+  pendingEditorState: EditorState,
+): void {
+  const currentTextContent = getEditorStateTextContent(currentEditorState);
+  const latestTextContent = getEditorStateTextContent(pendingEditorState);
+
+  if (currentTextContent !== latestTextContent) {
+    triggerListeners('textcontent', editor, true, latestTextContent);
+  }
+}
+
+function triggerMutationListeners(
+  editor: LexicalEditor,
+  mutatedNodes: MutatedNodes,
+  updateTags: Set<string>,
+  dirtyLeaves: Set<string>,
+  prevEditorState: EditorState,
+): void {
+  const listeners = Array.from(editor._listeners.mutation);
+  const listenersLength = listeners.length;
+
+  for (let i = 0; i < listenersLength; i++) {
+    const [listener, klass] = listeners[i];
+    const mutatedNodesByType = mutatedNodes.get(klass);
+    if (mutatedNodesByType !== undefined) {
+      listener(mutatedNodesByType, {
+        dirtyLeaves,
+        prevEditorState,
+        updateTags,
+      });
+    }
+  }
+}
+
+export function triggerListeners(
+  type: 'update' | 'root' | 'decorator' | 'textcontent' | 'editable',
+  editor: LexicalEditor,
+  isCurrentlyEnqueuingUpdates: boolean,
+  ...payload: unknown[]
+): void {
+  const previouslyUpdating = editor._updating;
+  editor._updating = isCurrentlyEnqueuingUpdates;
+
+  try {
+    const listeners = Array.from<Listener>(editor._listeners[type]);
+    for (let i = 0; i < listeners.length; i++) {
+      // @ts-ignore
+      listeners[i].apply(null, payload);
+    }
+  } finally {
+    editor._updating = previouslyUpdating;
+  }
+}
+
+export function triggerCommandListeners<
+  TCommand extends LexicalCommand<unknown>,
+>(
+  editor: LexicalEditor,
+  type: TCommand,
+  payload: CommandPayloadType<TCommand>,
+): boolean {
+  if (editor._updating === false || activeEditor !== editor) {
+    let returnVal = false;
+    editor.update(() => {
+      returnVal = triggerCommandListeners(editor, type, payload);
+    });
+    return returnVal;
+  }
+
+  const editors = getEditorsToPropagate(editor);
+
+  for (let i = 4; i >= 0; i--) {
+    for (let e = 0; e < editors.length; e++) {
+      const currentEditor = editors[e];
+      const commandListeners = currentEditor._commands;
+      const listenerInPriorityOrder = commandListeners.get(type);
+
+      if (listenerInPriorityOrder !== undefined) {
+        const listenersSet = listenerInPriorityOrder[i];
+
+        if (listenersSet !== undefined) {
+          const listeners = Array.from(listenersSet);
+          const listenersLength = listeners.length;
+
+          for (let j = 0; j < listenersLength; j++) {
+            if (listeners[j](payload, editor) === true) {
+              return true;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+function $triggerEnqueuedUpdates(editor: LexicalEditor): void {
+  const queuedUpdates = editor._updates;
+
+  if (queuedUpdates.length !== 0) {
+    const queuedUpdate = queuedUpdates.shift();
+    if (queuedUpdate) {
+      const [updateFn, options] = queuedUpdate;
+      $beginUpdate(editor, updateFn, options);
+    }
+  }
+}
+
+function triggerDeferredUpdateCallbacks(
+  editor: LexicalEditor,
+  deferred: Array<() => void>,
+): void {
+  editor._deferred = [];
+
+  if (deferred.length !== 0) {
+    const previouslyUpdating = editor._updating;
+    editor._updating = true;
+
+    try {
+      for (let i = 0; i < deferred.length; i++) {
+        deferred[i]();
+      }
+    } finally {
+      editor._updating = previouslyUpdating;
+    }
+  }
+}
+
+function processNestedUpdates(
+  editor: LexicalEditor,
+  initialSkipTransforms?: boolean,
+): boolean {
+  const queuedUpdates = editor._updates;
+  let skipTransforms = initialSkipTransforms || false;
+
+  // Updates might grow as we process them, we so we'll need
+  // to handle each update as we go until the updates array is
+  // empty.
+  while (queuedUpdates.length !== 0) {
+    const queuedUpdate = queuedUpdates.shift();
+    if (queuedUpdate) {
+      const [nextUpdateFn, options] = queuedUpdate;
+
+      let onUpdate;
+      let tag;
+
+      if (options !== undefined) {
+        onUpdate = options.onUpdate;
+        tag = options.tag;
+
+        if (options.skipTransforms) {
+          skipTransforms = true;
+        }
+        if (options.discrete) {
+          const pendingEditorState = editor._pendingEditorState;
+          invariant(
+            pendingEditorState !== null,
+            'Unexpected empty pending editor state on discrete nested update',
+          );
+          pendingEditorState._flushSync = true;
+        }
+
+        if (onUpdate) {
+          editor._deferred.push(onUpdate);
+        }
+
+        if (tag) {
+          editor._updateTags.add(tag);
+        }
+      }
+
+      nextUpdateFn();
+    }
+  }
+
+  return skipTransforms;
+}
+
+function $beginUpdate(
+  editor: LexicalEditor,
+  updateFn: () => void,
+  options?: EditorUpdateOptions,
+): void {
+  const updateTags = editor._updateTags;
+  let onUpdate;
+  let tag;
+  let skipTransforms = false;
+  let discrete = false;
+
+  if (options !== undefined) {
+    onUpdate = options.onUpdate;
+    tag = options.tag;
+
+    if (tag != null) {
+      updateTags.add(tag);
+    }
+
+    skipTransforms = options.skipTransforms || false;
+    discrete = options.discrete || false;
+  }
+
+  if (onUpdate) {
+    editor._deferred.push(onUpdate);
+  }
+
+  const currentEditorState = editor._editorState;
+  let pendingEditorState = editor._pendingEditorState;
+  let editorStateWasCloned = false;
+
+  if (pendingEditorState === null || pendingEditorState._readOnly) {
+    pendingEditorState = editor._pendingEditorState = cloneEditorState(
+      pendingEditorState || currentEditorState,
+    );
+    editorStateWasCloned = true;
+  }
+  pendingEditorState._flushSync = discrete;
+
+  const previousActiveEditorState = activeEditorState;
+  const previousReadOnlyMode = isReadOnlyMode;
+  const previousActiveEditor = activeEditor;
+  const previouslyUpdating = editor._updating;
+  activeEditorState = pendingEditorState;
+  isReadOnlyMode = false;
+  editor._updating = true;
+  activeEditor = editor;
+
+  try {
+    if (editorStateWasCloned) {
+      if (editor._headless) {
+        if (currentEditorState._selection !== null) {
+          pendingEditorState._selection = currentEditorState._selection.clone();
+        }
+      } else {
+        pendingEditorState._selection = $internalCreateSelection(editor);
+      }
+    }
+
+    const startingCompositionKey = editor._compositionKey;
+    updateFn();
+    skipTransforms = processNestedUpdates(editor, skipTransforms);
+    applySelectionTransforms(pendingEditorState, editor);
+
+    if (editor._dirtyType !== NO_DIRTY_NODES) {
+      if (skipTransforms) {
+        $normalizeAllDirtyTextNodes(pendingEditorState, editor);
+      } else {
+        $applyAllTransforms(pendingEditorState, editor);
+      }
+
+      processNestedUpdates(editor);
+      $garbageCollectDetachedNodes(
+        currentEditorState,
+        pendingEditorState,
+        editor._dirtyLeaves,
+        editor._dirtyElements,
+      );
+    }
+
+    const endingCompositionKey = editor._compositionKey;
+
+    if (startingCompositionKey !== endingCompositionKey) {
+      pendingEditorState._flushSync = true;
+    }
+
+    const pendingSelection = pendingEditorState._selection;
+
+    if ($isRangeSelection(pendingSelection)) {
+      const pendingNodeMap = pendingEditorState._nodeMap;
+      const anchorKey = pendingSelection.anchor.key;
+      const focusKey = pendingSelection.focus.key;
+
+      if (
+        pendingNodeMap.get(anchorKey) === undefined ||
+        pendingNodeMap.get(focusKey) === undefined
+      ) {
+        invariant(
+          false,
+          'updateEditor: selection has been lost because the previously selected nodes have been removed and ' +
+            "selection wasn't moved to another node. Ensure selection changes after removing/replacing a selected node.",
+        );
+      }
+    } else if ($isNodeSelection(pendingSelection)) {
+      // TODO: we should also validate node selection?
+      if (pendingSelection._nodes.size === 0) {
+        pendingEditorState._selection = null;
+      }
+    }
+  } catch (error) {
+    // Report errors
+    if (error instanceof Error) {
+      editor._onError(error);
+    }
+
+    // Restore existing editor state to the DOM
+    editor._pendingEditorState = currentEditorState;
+    editor._dirtyType = FULL_RECONCILE;
+
+    editor._cloneNotNeeded.clear();
+
+    editor._dirtyLeaves = new Set();
+
+    editor._dirtyElements.clear();
+
+    $commitPendingUpdates(editor);
+    return;
+  } finally {
+    activeEditorState = previousActiveEditorState;
+    isReadOnlyMode = previousReadOnlyMode;
+    activeEditor = previousActiveEditor;
+    editor._updating = previouslyUpdating;
+    infiniteTransformCount = 0;
+  }
+
+  const shouldUpdate =
+    editor._dirtyType !== NO_DIRTY_NODES ||
+    editorStateHasDirtySelection(pendingEditorState, editor);
+
+  if (shouldUpdate) {
+    if (pendingEditorState._flushSync) {
+      pendingEditorState._flushSync = false;
+      $commitPendingUpdates(editor);
+    } else if (editorStateWasCloned) {
+      scheduleMicroTask(() => {
+        $commitPendingUpdates(editor);
+      });
+    }
+  } else {
+    pendingEditorState._flushSync = false;
+
+    if (editorStateWasCloned) {
+      updateTags.clear();
+      editor._deferred = [];
+      editor._pendingEditorState = null;
+    }
+  }
+}
+
+export function updateEditor(
+  editor: LexicalEditor,
+  updateFn: () => void,
+  options?: EditorUpdateOptions,
+): void {
+  if (editor._updating) {
+    editor._updates.push([updateFn, options]);
+  } else {
+    $beginUpdate(editor, updateFn, options);
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/LexicalUtils.ts b/resources/js/wysiwyg/lexical/core/LexicalUtils.ts
new file mode 100644
index 00000000000..71096b19dce
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/LexicalUtils.ts
@@ -0,0 +1,1788 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  CommandPayloadType,
+  EditorConfig,
+  EditorThemeClasses,
+  Klass,
+  LexicalCommand,
+  MutatedNodes,
+  MutationListeners,
+  NodeMutation,
+  RegisteredNode,
+  RegisteredNodes,
+  Spread,
+} from './LexicalEditor';
+import type {EditorState} from './LexicalEditorState';
+import type {LexicalNode, NodeKey, NodeMap} from './LexicalNode';
+import type {
+  BaseSelection,
+  PointType,
+  RangeSelection,
+} from './LexicalSelection';
+import type {RootNode} from './nodes/LexicalRootNode';
+import type {TextFormatType, TextNode} from './nodes/LexicalTextNode';
+
+import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
+import {IS_APPLE, IS_APPLE_WEBKIT, IS_IOS, IS_SAFARI} from 'lexical/shared/environment';
+import invariant from 'lexical/shared/invariant';
+import normalizeClassNames from 'lexical/shared/normalizeClassNames';
+
+import {
+  $createTextNode,
+  $getPreviousSelection,
+  $getSelection,
+  $isDecoratorNode,
+  $isElementNode,
+  $isLineBreakNode,
+  $isRangeSelection,
+  $isRootNode,
+  $isTextNode,
+  DecoratorNode,
+  ElementNode,
+  LineBreakNode,
+} from '.';
+import {
+  COMPOSITION_SUFFIX,
+  DOM_TEXT_TYPE,
+  HAS_DIRTY_NODES,
+  LTR_REGEX,
+  RTL_REGEX,
+  TEXT_TYPE_TO_FORMAT,
+} from './LexicalConstants';
+import {LexicalEditor} from './LexicalEditor';
+import {$flushRootMutations} from './LexicalMutations';
+import {$normalizeSelection} from './LexicalNormalization';
+import {
+  errorOnInfiniteTransforms,
+  errorOnReadOnly,
+  getActiveEditor,
+  getActiveEditorState,
+  internalGetActiveEditorState,
+  isCurrentlyReadOnlyMode,
+  triggerCommandListeners,
+  updateEditor,
+} from './LexicalUpdates';
+
+export const emptyFunction = () => {
+  return;
+};
+
+let keyCounter = 1;
+
+export function resetRandomKey(): void {
+  keyCounter = 1;
+}
+
+export function generateRandomKey(): string {
+  return '' + keyCounter++;
+}
+
+export function getRegisteredNodeOrThrow(
+  editor: LexicalEditor,
+  nodeType: string,
+): RegisteredNode {
+  const registeredNode = editor._nodes.get(nodeType);
+  if (registeredNode === undefined) {
+    invariant(false, 'registeredNode: Type %s not found', nodeType);
+  }
+  return registeredNode;
+}
+
+export const isArray = Array.isArray;
+
+export const scheduleMicroTask: (fn: () => void) => void =
+  typeof queueMicrotask === 'function'
+    ? queueMicrotask
+    : (fn) => {
+        // No window prefix intended (#1400)
+        Promise.resolve().then(fn);
+      };
+
+export function $isSelectionCapturedInDecorator(node: Node): boolean {
+  return $isDecoratorNode($getNearestNodeFromDOMNode(node));
+}
+
+export function isSelectionCapturedInDecoratorInput(anchorDOM: Node): boolean {
+  const activeElement = document.activeElement as HTMLElement;
+
+  if (activeElement === null) {
+    return false;
+  }
+  const nodeName = activeElement.nodeName;
+
+  return (
+    $isDecoratorNode($getNearestNodeFromDOMNode(anchorDOM)) &&
+    (nodeName === 'INPUT' ||
+      nodeName === 'TEXTAREA' ||
+      (activeElement.contentEditable === 'true' &&
+        getEditorPropertyFromDOMNode(activeElement) == null))
+  );
+}
+
+export function isSelectionWithinEditor(
+  editor: LexicalEditor,
+  anchorDOM: null | Node,
+  focusDOM: null | Node,
+): boolean {
+  const rootElement = editor.getRootElement();
+  try {
+    return (
+      rootElement !== null &&
+      rootElement.contains(anchorDOM) &&
+      rootElement.contains(focusDOM) &&
+      // Ignore if selection is within nested editor
+      anchorDOM !== null &&
+      !isSelectionCapturedInDecoratorInput(anchorDOM as Node) &&
+      getNearestEditorFromDOMNode(anchorDOM) === editor
+    );
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * @returns true if the given argument is a LexicalEditor instance from this build of Lexical
+ */
+export function isLexicalEditor(editor: unknown): editor is LexicalEditor {
+  // Check instanceof to prevent issues with multiple embedded Lexical installations
+  return editor instanceof LexicalEditor;
+}
+
+export function getNearestEditorFromDOMNode(
+  node: Node | null,
+): LexicalEditor | null {
+  let currentNode = node;
+  while (currentNode != null) {
+    const editor = getEditorPropertyFromDOMNode(currentNode);
+    if (isLexicalEditor(editor)) {
+      return editor;
+    }
+    currentNode = getParentElement(currentNode);
+  }
+  return null;
+}
+
+/** @internal */
+export function getEditorPropertyFromDOMNode(node: Node | null): unknown {
+  // @ts-expect-error: internal field
+  return node ? node.__lexicalEditor : null;
+}
+
+export function getTextDirection(text: string): 'ltr' | 'rtl' | null {
+  if (RTL_REGEX.test(text)) {
+    return 'rtl';
+  }
+  if (LTR_REGEX.test(text)) {
+    return 'ltr';
+  }
+  return null;
+}
+
+export function $isTokenOrSegmented(node: TextNode): boolean {
+  return node.isToken() || node.isSegmented();
+}
+
+function isDOMNodeLexicalTextNode(node: Node): node is Text {
+  return node.nodeType === DOM_TEXT_TYPE;
+}
+
+export function getDOMTextNode(element: Node | null): Text | null {
+  let node = element;
+  while (node != null) {
+    if (isDOMNodeLexicalTextNode(node)) {
+      return node;
+    }
+    node = node.firstChild;
+  }
+  return null;
+}
+
+export function toggleTextFormatType(
+  format: number,
+  type: TextFormatType,
+  alignWithFormat: null | number,
+): number {
+  const activeFormat = TEXT_TYPE_TO_FORMAT[type];
+  if (
+    alignWithFormat !== null &&
+    (format & activeFormat) === (alignWithFormat & activeFormat)
+  ) {
+    return format;
+  }
+  let newFormat = format ^ activeFormat;
+  if (type === 'subscript') {
+    newFormat &= ~TEXT_TYPE_TO_FORMAT.superscript;
+  } else if (type === 'superscript') {
+    newFormat &= ~TEXT_TYPE_TO_FORMAT.subscript;
+  }
+  return newFormat;
+}
+
+export function $isLeafNode(
+  node: LexicalNode | null | undefined,
+): node is TextNode | LineBreakNode | DecoratorNode<unknown> {
+  return $isTextNode(node) || $isLineBreakNode(node) || $isDecoratorNode(node);
+}
+
+export function $setNodeKey(
+  node: LexicalNode,
+  existingKey: NodeKey | null | undefined,
+): void {
+  if (existingKey != null) {
+    if (__DEV__) {
+      errorOnNodeKeyConstructorMismatch(node, existingKey);
+    }
+    node.__key = existingKey;
+    return;
+  }
+  errorOnReadOnly();
+  errorOnInfiniteTransforms();
+  const editor = getActiveEditor();
+  const editorState = getActiveEditorState();
+  const key = generateRandomKey();
+  editorState._nodeMap.set(key, node);
+  // TODO Split this function into leaf/element
+  if ($isElementNode(node)) {
+    editor._dirtyElements.set(key, true);
+  } else {
+    editor._dirtyLeaves.add(key);
+  }
+  editor._cloneNotNeeded.add(key);
+  editor._dirtyType = HAS_DIRTY_NODES;
+  node.__key = key;
+}
+
+function errorOnNodeKeyConstructorMismatch(
+  node: LexicalNode,
+  existingKey: NodeKey,
+) {
+  const editorState = internalGetActiveEditorState();
+  if (!editorState) {
+    // tests expect to be able to do this kind of clone without an active editor state
+    return;
+  }
+  const existingNode = editorState._nodeMap.get(existingKey);
+  if (existingNode && existingNode.constructor !== node.constructor) {
+    // Lifted condition to if statement because the inverted logic is a bit confusing
+    if (node.constructor.name !== existingNode.constructor.name) {
+      invariant(
+        false,
+        'Lexical node with constructor %s attempted to re-use key from node in active editor state with constructor %s. Keys must not be re-used when the type is changed.',
+        node.constructor.name,
+        existingNode.constructor.name,
+      );
+    } else {
+      invariant(
+        false,
+        'Lexical node with constructor %s attempted to re-use key from node in active editor state with different constructor with the same name (possibly due to invalid Hot Module Replacement). Keys must not be re-used when the type is changed.',
+        node.constructor.name,
+      );
+    }
+  }
+}
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+function internalMarkParentElementsAsDirty(
+  parentKey: NodeKey,
+  nodeMap: NodeMap,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+): void {
+  let nextParentKey: string | null = parentKey;
+  while (nextParentKey !== null) {
+    if (dirtyElements.has(nextParentKey)) {
+      return;
+    }
+    const node = nodeMap.get(nextParentKey);
+    if (node === undefined) {
+      break;
+    }
+    dirtyElements.set(nextParentKey, false);
+    nextParentKey = node.__parent;
+  }
+}
+
+// TODO #6031 this function or their callers have to adjust selection (i.e. insertBefore)
+export function removeFromParent(node: LexicalNode): void {
+  const oldParent = node.getParent();
+  if (oldParent !== null) {
+    const writableNode = node.getWritable();
+    const writableParent = oldParent.getWritable();
+    const prevSibling = node.getPreviousSibling();
+    const nextSibling = node.getNextSibling();
+    // TODO: this function duplicates a bunch of operations, can be simplified.
+    if (prevSibling === null) {
+      if (nextSibling !== null) {
+        const writableNextSibling = nextSibling.getWritable();
+        writableParent.__first = nextSibling.__key;
+        writableNextSibling.__prev = null;
+      } else {
+        writableParent.__first = null;
+      }
+    } else {
+      const writablePrevSibling = prevSibling.getWritable();
+      if (nextSibling !== null) {
+        const writableNextSibling = nextSibling.getWritable();
+        writableNextSibling.__prev = writablePrevSibling.__key;
+        writablePrevSibling.__next = writableNextSibling.__key;
+      } else {
+        writablePrevSibling.__next = null;
+      }
+      writableNode.__prev = null;
+    }
+    if (nextSibling === null) {
+      if (prevSibling !== null) {
+        const writablePrevSibling = prevSibling.getWritable();
+        writableParent.__last = prevSibling.__key;
+        writablePrevSibling.__next = null;
+      } else {
+        writableParent.__last = null;
+      }
+    } else {
+      const writableNextSibling = nextSibling.getWritable();
+      if (prevSibling !== null) {
+        const writablePrevSibling = prevSibling.getWritable();
+        writablePrevSibling.__next = writableNextSibling.__key;
+        writableNextSibling.__prev = writablePrevSibling.__key;
+      } else {
+        writableNextSibling.__prev = null;
+      }
+      writableNode.__next = null;
+    }
+    writableParent.__size--;
+    writableNode.__parent = null;
+  }
+}
+
+// Never use this function directly! It will break
+// the cloning heuristic. Instead use node.getWritable().
+export function internalMarkNodeAsDirty(node: LexicalNode): void {
+  errorOnInfiniteTransforms();
+  const latest = node.getLatest();
+  const parent = latest.__parent;
+  const editorState = getActiveEditorState();
+  const editor = getActiveEditor();
+  const nodeMap = editorState._nodeMap;
+  const dirtyElements = editor._dirtyElements;
+  if (parent !== null) {
+    internalMarkParentElementsAsDirty(parent, nodeMap, dirtyElements);
+  }
+  const key = latest.__key;
+  editor._dirtyType = HAS_DIRTY_NODES;
+  if ($isElementNode(node)) {
+    dirtyElements.set(key, true);
+  } else {
+    // TODO split internally MarkNodeAsDirty into two dedicated Element/leave functions
+    editor._dirtyLeaves.add(key);
+  }
+}
+
+export function internalMarkSiblingsAsDirty(node: LexicalNode) {
+  const previousNode = node.getPreviousSibling();
+  const nextNode = node.getNextSibling();
+  if (previousNode !== null) {
+    internalMarkNodeAsDirty(previousNode);
+  }
+  if (nextNode !== null) {
+    internalMarkNodeAsDirty(nextNode);
+  }
+}
+
+export function $setCompositionKey(compositionKey: null | NodeKey): void {
+  errorOnReadOnly();
+  const editor = getActiveEditor();
+  const previousCompositionKey = editor._compositionKey;
+  if (compositionKey !== previousCompositionKey) {
+    editor._compositionKey = compositionKey;
+    if (previousCompositionKey !== null) {
+      const node = $getNodeByKey(previousCompositionKey);
+      if (node !== null) {
+        node.getWritable();
+      }
+    }
+    if (compositionKey !== null) {
+      const node = $getNodeByKey(compositionKey);
+      if (node !== null) {
+        node.getWritable();
+      }
+    }
+  }
+}
+
+export function $getCompositionKey(): null | NodeKey {
+  if (isCurrentlyReadOnlyMode()) {
+    return null;
+  }
+  const editor = getActiveEditor();
+  return editor._compositionKey;
+}
+
+export function $getNodeByKey<T extends LexicalNode>(
+  key: NodeKey,
+  _editorState?: EditorState,
+): T | null {
+  const editorState = _editorState || getActiveEditorState();
+  const node = editorState._nodeMap.get(key) as T;
+  if (node === undefined) {
+    return null;
+  }
+  return node;
+}
+
+export function $getNodeFromDOMNode(
+  dom: Node,
+  editorState?: EditorState,
+): LexicalNode | null {
+  const editor = getActiveEditor();
+  // @ts-ignore We intentionally add this to the Node.
+  const key = dom[`__lexicalKey_${editor._key}`];
+  if (key !== undefined) {
+    return $getNodeByKey(key, editorState);
+  }
+  return null;
+}
+
+export function $getNearestNodeFromDOMNode(
+  startingDOM: Node,
+  editorState?: EditorState,
+): LexicalNode | null {
+  let dom: Node | null = startingDOM;
+  while (dom != null) {
+    const node = $getNodeFromDOMNode(dom, editorState);
+    if (node !== null) {
+      return node;
+    }
+    dom = getParentElement(dom);
+  }
+  return null;
+}
+
+export function cloneDecorators(
+  editor: LexicalEditor,
+): Record<NodeKey, unknown> {
+  const currentDecorators = editor._decorators;
+  const pendingDecorators = Object.assign({}, currentDecorators);
+  editor._pendingDecorators = pendingDecorators;
+  return pendingDecorators;
+}
+
+export function getEditorStateTextContent(editorState: EditorState): string {
+  return editorState.read(() => $getRoot().getTextContent());
+}
+
+export function markAllNodesAsDirty(editor: LexicalEditor, type: string): void {
+  // Mark all existing text nodes as dirty
+  updateEditor(
+    editor,
+    () => {
+      const editorState = getActiveEditorState();
+      if (editorState.isEmpty()) {
+        return;
+      }
+      if (type === 'root') {
+        $getRoot().markDirty();
+        return;
+      }
+      const nodeMap = editorState._nodeMap;
+      for (const [, node] of nodeMap) {
+        node.markDirty();
+      }
+    },
+    editor._pendingEditorState === null
+      ? {
+          tag: 'history-merge',
+        }
+      : undefined,
+  );
+}
+
+export function $getRoot(): RootNode {
+  return internalGetRoot(getActiveEditorState());
+}
+
+export function internalGetRoot(editorState: EditorState): RootNode {
+  return editorState._nodeMap.get('root') as RootNode;
+}
+
+export function $setSelection(selection: null | BaseSelection): void {
+  errorOnReadOnly();
+  const editorState = getActiveEditorState();
+  if (selection !== null) {
+    if (__DEV__) {
+      if (Object.isFrozen(selection)) {
+        invariant(
+          false,
+          '$setSelection called on frozen selection object. Ensure selection is cloned before passing in.',
+        );
+      }
+    }
+    selection.dirty = true;
+    selection.setCachedNodes(null);
+  }
+  editorState._selection = selection;
+}
+
+export function $flushMutations(): void {
+  errorOnReadOnly();
+  const editor = getActiveEditor();
+  $flushRootMutations(editor);
+}
+
+export function $getNodeFromDOM(dom: Node): null | LexicalNode {
+  const editor = getActiveEditor();
+  const nodeKey = getNodeKeyFromDOM(dom, editor);
+  if (nodeKey === null) {
+    const rootElement = editor.getRootElement();
+    if (dom === rootElement) {
+      return $getNodeByKey('root');
+    }
+    return null;
+  }
+  return $getNodeByKey(nodeKey);
+}
+
+export function getTextNodeOffset(
+  node: TextNode,
+  moveSelectionToEnd: boolean,
+): number {
+  return moveSelectionToEnd ? node.getTextContentSize() : 0;
+}
+
+function getNodeKeyFromDOM(
+  // Note that node here refers to a DOM Node, not an Lexical Node
+  dom: Node,
+  editor: LexicalEditor,
+): NodeKey | null {
+  let node: Node | null = dom;
+  while (node != null) {
+    // @ts-ignore We intentionally add this to the Node.
+    const key: NodeKey = node[`__lexicalKey_${editor._key}`];
+    if (key !== undefined) {
+      return key;
+    }
+    node = getParentElement(node);
+  }
+  return null;
+}
+
+export function doesContainGrapheme(str: string): boolean {
+  return /[\uD800-\uDBFF][\uDC00-\uDFFF]/g.test(str);
+}
+
+export function getEditorsToPropagate(
+  editor: LexicalEditor,
+): Array<LexicalEditor> {
+  const editorsToPropagate = [];
+  let currentEditor: LexicalEditor | null = editor;
+  while (currentEditor !== null) {
+    editorsToPropagate.push(currentEditor);
+    currentEditor = currentEditor._parentEditor;
+  }
+  return editorsToPropagate;
+}
+
+export function createUID(): string {
+  return Math.random()
+    .toString(36)
+    .replace(/[^a-z]+/g, '')
+    .substr(0, 5);
+}
+
+export function getAnchorTextFromDOM(anchorNode: Node): null | string {
+  if (anchorNode.nodeType === DOM_TEXT_TYPE) {
+    return anchorNode.nodeValue;
+  }
+  return null;
+}
+
+export function $updateSelectedTextFromDOM(
+  isCompositionEnd: boolean,
+  editor: LexicalEditor,
+  data?: string,
+): void {
+  // Update the text content with the latest composition text
+  const domSelection = getDOMSelection(editor._window);
+  if (domSelection === null) {
+    return;
+  }
+  const anchorNode = domSelection.anchorNode;
+  let {anchorOffset, focusOffset} = domSelection;
+  if (anchorNode !== null) {
+    let textContent = getAnchorTextFromDOM(anchorNode);
+    const node = $getNearestNodeFromDOMNode(anchorNode);
+    if (textContent !== null && $isTextNode(node)) {
+      // Data is intentionally truthy, as we check for boolean, null and empty string.
+      if (textContent === COMPOSITION_SUFFIX && data) {
+        const offset = data.length;
+        textContent = data;
+        anchorOffset = offset;
+        focusOffset = offset;
+      }
+
+      if (textContent !== null) {
+        $updateTextNodeFromDOMContent(
+          node,
+          textContent,
+          anchorOffset,
+          focusOffset,
+          isCompositionEnd,
+        );
+      }
+    }
+  }
+}
+
+export function $updateTextNodeFromDOMContent(
+  textNode: TextNode,
+  textContent: string,
+  anchorOffset: null | number,
+  focusOffset: null | number,
+  compositionEnd: boolean,
+): void {
+  let node = textNode;
+
+  if (node.isAttached() && (compositionEnd || !node.isDirty())) {
+    const isComposing = node.isComposing();
+    let normalizedTextContent = textContent;
+
+    if (
+      (isComposing || compositionEnd) &&
+      textContent[textContent.length - 1] === COMPOSITION_SUFFIX
+    ) {
+      normalizedTextContent = textContent.slice(0, -1);
+    }
+    const prevTextContent = node.getTextContent();
+
+    if (compositionEnd || normalizedTextContent !== prevTextContent) {
+      if (normalizedTextContent === '') {
+        $setCompositionKey(null);
+        if (!IS_SAFARI && !IS_IOS && !IS_APPLE_WEBKIT) {
+          // For composition (mainly Android), we have to remove the node on a later update
+          const editor = getActiveEditor();
+          setTimeout(() => {
+            editor.update(() => {
+              if (node.isAttached()) {
+                node.remove();
+              }
+            });
+          }, 20);
+        } else {
+          node.remove();
+        }
+        return;
+      }
+      const parent = node.getParent();
+      const prevSelection = $getPreviousSelection();
+      const prevTextContentSize = node.getTextContentSize();
+      const compositionKey = $getCompositionKey();
+      const nodeKey = node.getKey();
+
+      if (
+        node.isToken() ||
+        (compositionKey !== null &&
+          nodeKey === compositionKey &&
+          !isComposing) ||
+        // Check if character was added at the start or boundaries when not insertable, and we need
+        // to clear this input from occurring as that action wasn't permitted.
+        ($isRangeSelection(prevSelection) &&
+          ((parent !== null &&
+            !parent.canInsertTextBefore() &&
+            prevSelection.anchor.offset === 0) ||
+            (prevSelection.anchor.key === textNode.__key &&
+              prevSelection.anchor.offset === 0 &&
+              !node.canInsertTextBefore() &&
+              !isComposing) ||
+            (prevSelection.focus.key === textNode.__key &&
+              prevSelection.focus.offset === prevTextContentSize &&
+              !node.canInsertTextAfter() &&
+              !isComposing)))
+      ) {
+        node.markDirty();
+        return;
+      }
+      const selection = $getSelection();
+
+      if (
+        !$isRangeSelection(selection) ||
+        anchorOffset === null ||
+        focusOffset === null
+      ) {
+        node.setTextContent(normalizedTextContent);
+        return;
+      }
+      selection.setTextNodeRange(node, anchorOffset, node, focusOffset);
+
+      if (node.isSegmented()) {
+        const originalTextContent = node.getTextContent();
+        const replacement = $createTextNode(originalTextContent);
+        node.replace(replacement);
+        node = replacement;
+      }
+      node.setTextContent(normalizedTextContent);
+    }
+  }
+}
+
+function $previousSiblingDoesNotAcceptText(node: TextNode): boolean {
+  const previousSibling = node.getPreviousSibling();
+
+  return (
+    ($isTextNode(previousSibling) ||
+      ($isElementNode(previousSibling) && previousSibling.isInline())) &&
+    !previousSibling.canInsertTextAfter()
+  );
+}
+
+// This function is connected to $shouldPreventDefaultAndInsertText and determines whether the
+// TextNode boundaries are writable or we should use the previous/next sibling instead. For example,
+// in the case of a LinkNode, boundaries are not writable.
+export function $shouldInsertTextAfterOrBeforeTextNode(
+  selection: RangeSelection,
+  node: TextNode,
+): boolean {
+  if (node.isSegmented()) {
+    return true;
+  }
+  if (!selection.isCollapsed()) {
+    return false;
+  }
+  const offset = selection.anchor.offset;
+  const parent = node.getParentOrThrow();
+  const isToken = node.isToken();
+  if (offset === 0) {
+    return (
+      !node.canInsertTextBefore() ||
+      (!parent.canInsertTextBefore() && !node.isComposing()) ||
+      isToken ||
+      $previousSiblingDoesNotAcceptText(node)
+    );
+  } else if (offset === node.getTextContentSize()) {
+    return (
+      !node.canInsertTextAfter() ||
+      (!parent.canInsertTextAfter() && !node.isComposing()) ||
+      isToken
+    );
+  } else {
+    return false;
+  }
+}
+
+export function isTab(
+  key: string,
+  altKey: boolean,
+  ctrlKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return key === 'Tab' && !altKey && !ctrlKey && !metaKey;
+}
+
+export function isBold(
+  key: string,
+  altKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return (
+    key.toLowerCase() === 'b' && !altKey && controlOrMeta(metaKey, ctrlKey)
+  );
+}
+
+export function isItalic(
+  key: string,
+  altKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return (
+    key.toLowerCase() === 'i' && !altKey && controlOrMeta(metaKey, ctrlKey)
+  );
+}
+
+export function isUnderline(
+  key: string,
+  altKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return (
+    key.toLowerCase() === 'u' && !altKey && controlOrMeta(metaKey, ctrlKey)
+  );
+}
+
+export function isParagraph(key: string, shiftKey: boolean): boolean {
+  return isReturn(key) && !shiftKey;
+}
+
+export function isLineBreak(key: string, shiftKey: boolean): boolean {
+  return isReturn(key) && shiftKey;
+}
+
+// Inserts a new line after the selection
+
+export function isOpenLineBreak(key: string, ctrlKey: boolean): boolean {
+  // 79 = KeyO
+  return IS_APPLE && ctrlKey && key.toLowerCase() === 'o';
+}
+
+export function isDeleteWordBackward(
+  key: string,
+  altKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return isBackspace(key) && (IS_APPLE ? altKey : ctrlKey);
+}
+
+export function isDeleteWordForward(
+  key: string,
+  altKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return isDelete(key) && (IS_APPLE ? altKey : ctrlKey);
+}
+
+export function isDeleteLineBackward(key: string, metaKey: boolean): boolean {
+  return IS_APPLE && metaKey && isBackspace(key);
+}
+
+export function isDeleteLineForward(key: string, metaKey: boolean): boolean {
+  return IS_APPLE && metaKey && isDelete(key);
+}
+
+export function isDeleteBackward(
+  key: string,
+  altKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  if (IS_APPLE) {
+    if (altKey || metaKey) {
+      return false;
+    }
+    return isBackspace(key) || (key.toLowerCase() === 'h' && ctrlKey);
+  }
+  if (ctrlKey || altKey || metaKey) {
+    return false;
+  }
+  return isBackspace(key);
+}
+
+export function isDeleteForward(
+  key: string,
+  ctrlKey: boolean,
+  shiftKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  if (IS_APPLE) {
+    if (shiftKey || altKey || metaKey) {
+      return false;
+    }
+    return isDelete(key) || (key.toLowerCase() === 'd' && ctrlKey);
+  }
+  if (ctrlKey || altKey || metaKey) {
+    return false;
+  }
+  return isDelete(key);
+}
+
+export function isUndo(
+  key: string,
+  shiftKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return (
+    key.toLowerCase() === 'z' && !shiftKey && controlOrMeta(metaKey, ctrlKey)
+  );
+}
+
+export function isRedo(
+  key: string,
+  shiftKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  if (IS_APPLE) {
+    return key.toLowerCase() === 'z' && metaKey && shiftKey;
+  }
+  return (
+    (key.toLowerCase() === 'y' && ctrlKey) ||
+    (key.toLowerCase() === 'z' && ctrlKey && shiftKey)
+  );
+}
+
+export function isCopy(
+  key: string,
+  shiftKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  if (shiftKey) {
+    return false;
+  }
+  if (key.toLowerCase() === 'c') {
+    return IS_APPLE ? metaKey : ctrlKey;
+  }
+
+  return false;
+}
+
+export function isCut(
+  key: string,
+  shiftKey: boolean,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  if (shiftKey) {
+    return false;
+  }
+  if (key.toLowerCase() === 'x') {
+    return IS_APPLE ? metaKey : ctrlKey;
+  }
+
+  return false;
+}
+
+function isArrowLeft(key: string): boolean {
+  return key === 'ArrowLeft';
+}
+
+function isArrowRight(key: string): boolean {
+  return key === 'ArrowRight';
+}
+
+function isArrowUp(key: string): boolean {
+  return key === 'ArrowUp';
+}
+
+function isArrowDown(key: string): boolean {
+  return key === 'ArrowDown';
+}
+
+export function isMoveBackward(
+  key: string,
+  ctrlKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowLeft(key) && !ctrlKey && !metaKey && !altKey;
+}
+
+export function isMoveToStart(
+  key: string,
+  ctrlKey: boolean,
+  shiftKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowLeft(key) && !altKey && !shiftKey && (ctrlKey || metaKey);
+}
+
+export function isMoveForward(
+  key: string,
+  ctrlKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowRight(key) && !ctrlKey && !metaKey && !altKey;
+}
+
+export function isMoveToEnd(
+  key: string,
+  ctrlKey: boolean,
+  shiftKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowRight(key) && !altKey && !shiftKey && (ctrlKey || metaKey);
+}
+
+export function isMoveUp(
+  key: string,
+  ctrlKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowUp(key) && !ctrlKey && !metaKey;
+}
+
+export function isMoveDown(
+  key: string,
+  ctrlKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return isArrowDown(key) && !ctrlKey && !metaKey;
+}
+
+export function isModifier(
+  ctrlKey: boolean,
+  shiftKey: boolean,
+  altKey: boolean,
+  metaKey: boolean,
+): boolean {
+  return ctrlKey || shiftKey || altKey || metaKey;
+}
+
+export function isSpace(key: string): boolean {
+  return key === ' ';
+}
+
+export function controlOrMeta(metaKey: boolean, ctrlKey: boolean): boolean {
+  if (IS_APPLE) {
+    return metaKey;
+  }
+  return ctrlKey;
+}
+
+export function isReturn(key: string): boolean {
+  return key === 'Enter';
+}
+
+export function isBackspace(key: string): boolean {
+  return key === 'Backspace';
+}
+
+export function isEscape(key: string): boolean {
+  return key === 'Escape';
+}
+
+export function isDelete(key: string): boolean {
+  return key === 'Delete';
+}
+
+export function isSelectAll(
+  key: string,
+  metaKey: boolean,
+  ctrlKey: boolean,
+): boolean {
+  return key.toLowerCase() === 'a' && controlOrMeta(metaKey, ctrlKey);
+}
+
+export function $selectAll(): void {
+  const root = $getRoot();
+  const selection = root.select(0, root.getChildrenSize());
+  $setSelection($normalizeSelection(selection));
+}
+
+export function getCachedClassNameArray(
+  classNamesTheme: EditorThemeClasses,
+  classNameThemeType: string,
+): Array<string> {
+  if (classNamesTheme.__lexicalClassNameCache === undefined) {
+    classNamesTheme.__lexicalClassNameCache = {};
+  }
+  const classNamesCache = classNamesTheme.__lexicalClassNameCache;
+  const cachedClassNames = classNamesCache[classNameThemeType];
+  if (cachedClassNames !== undefined) {
+    return cachedClassNames;
+  }
+  const classNames = classNamesTheme[classNameThemeType];
+  // As we're using classList, we need
+  // to handle className tokens that have spaces.
+  // The easiest way to do this to convert the
+  // className tokens to an array that can be
+  // applied to classList.add()/remove().
+  if (typeof classNames === 'string') {
+    const classNamesArr = normalizeClassNames(classNames);
+    classNamesCache[classNameThemeType] = classNamesArr;
+    return classNamesArr;
+  }
+  return classNames;
+}
+
+export function setMutatedNode(
+  mutatedNodes: MutatedNodes,
+  registeredNodes: RegisteredNodes,
+  mutationListeners: MutationListeners,
+  node: LexicalNode,
+  mutation: NodeMutation,
+) {
+  if (mutationListeners.size === 0) {
+    return;
+  }
+  const nodeType = node.__type;
+  const nodeKey = node.__key;
+  const registeredNode = registeredNodes.get(nodeType);
+  if (registeredNode === undefined) {
+    invariant(false, 'Type %s not in registeredNodes', nodeType);
+  }
+  const klass = registeredNode.klass;
+  let mutatedNodesByType = mutatedNodes.get(klass);
+  if (mutatedNodesByType === undefined) {
+    mutatedNodesByType = new Map();
+    mutatedNodes.set(klass, mutatedNodesByType);
+  }
+  const prevMutation = mutatedNodesByType.get(nodeKey);
+  // If the node has already been "destroyed", yet we are
+  // re-making it, then this means a move likely happened.
+  // We should change the mutation to be that of "updated"
+  // instead.
+  const isMove = prevMutation === 'destroyed' && mutation === 'created';
+  if (prevMutation === undefined || isMove) {
+    mutatedNodesByType.set(nodeKey, isMove ? 'updated' : mutation);
+  }
+}
+
+export function $nodesOfType<T extends LexicalNode>(klass: Klass<T>): Array<T> {
+  const klassType = klass.getType();
+  const editorState = getActiveEditorState();
+  if (editorState._readOnly) {
+    const nodes = getCachedTypeToNodeMap(editorState).get(klassType) as
+      | undefined
+      | Map<string, T>;
+    return nodes ? Array.from(nodes.values()) : [];
+  }
+  const nodes = editorState._nodeMap;
+  const nodesOfType: Array<T> = [];
+  for (const [, node] of nodes) {
+    if (
+      node instanceof klass &&
+      node.__type === klassType &&
+      node.isAttached()
+    ) {
+      nodesOfType.push(node as T);
+    }
+  }
+  return nodesOfType;
+}
+
+function resolveElement(
+  element: ElementNode,
+  isBackward: boolean,
+  focusOffset: number,
+): LexicalNode | null {
+  const parent = element.getParent();
+  let offset = focusOffset;
+  let block = element;
+  if (parent !== null) {
+    if (isBackward && focusOffset === 0) {
+      offset = block.getIndexWithinParent();
+      block = parent;
+    } else if (!isBackward && focusOffset === block.getChildrenSize()) {
+      offset = block.getIndexWithinParent() + 1;
+      block = parent;
+    }
+  }
+  return block.getChildAtIndex(isBackward ? offset - 1 : offset);
+}
+
+export function $getAdjacentNode(
+  focus: PointType,
+  isBackward: boolean,
+): null | LexicalNode {
+  const focusOffset = focus.offset;
+  if (focus.type === 'element') {
+    const block = focus.getNode();
+    return resolveElement(block, isBackward, focusOffset);
+  } else {
+    const focusNode = focus.getNode();
+    if (
+      (isBackward && focusOffset === 0) ||
+      (!isBackward && focusOffset === focusNode.getTextContentSize())
+    ) {
+      const possibleNode = isBackward
+        ? focusNode.getPreviousSibling()
+        : focusNode.getNextSibling();
+      if (possibleNode === null) {
+        return resolveElement(
+          focusNode.getParentOrThrow(),
+          isBackward,
+          focusNode.getIndexWithinParent() + (isBackward ? 0 : 1),
+        );
+      }
+      return possibleNode;
+    }
+  }
+  return null;
+}
+
+export function isFirefoxClipboardEvents(editor: LexicalEditor): boolean {
+  const event = getWindow(editor).event;
+  const inputType = event && (event as InputEvent).inputType;
+  return (
+    inputType === 'insertFromPaste' ||
+    inputType === 'insertFromPasteAsQuotation'
+  );
+}
+
+export function dispatchCommand<TCommand extends LexicalCommand<unknown>>(
+  editor: LexicalEditor,
+  command: TCommand,
+  payload: CommandPayloadType<TCommand>,
+): boolean {
+  return triggerCommandListeners(editor, command, payload);
+}
+
+export function $textContentRequiresDoubleLinebreakAtEnd(
+  node: ElementNode,
+): boolean {
+  return !$isRootNode(node) && !node.isLastChild() && !node.isInline();
+}
+
+export function getElementByKeyOrThrow(
+  editor: LexicalEditor,
+  key: NodeKey,
+): HTMLElement {
+  const element = editor._keyToDOMMap.get(key);
+
+  if (element === undefined) {
+    invariant(
+      false,
+      'Reconciliation: could not find DOM element for node key %s',
+      key,
+    );
+  }
+
+  return element;
+}
+
+export function getParentElement(node: Node): HTMLElement | null {
+  const parentElement =
+    (node as HTMLSlotElement).assignedSlot || node.parentElement;
+  return parentElement !== null && parentElement.nodeType === 11
+    ? ((parentElement as unknown as ShadowRoot).host as HTMLElement)
+    : parentElement;
+}
+
+export function scrollIntoViewIfNeeded(
+  editor: LexicalEditor,
+  selectionRect: DOMRect,
+  rootElement: HTMLElement,
+): void {
+  const doc = rootElement.ownerDocument;
+  const defaultView = doc.defaultView;
+
+  if (defaultView === null) {
+    return;
+  }
+  let {top: currentTop, bottom: currentBottom} = selectionRect;
+  let targetTop = 0;
+  let targetBottom = 0;
+  let element: HTMLElement | null = rootElement;
+
+  while (element !== null) {
+    const isBodyElement = element === doc.body;
+    if (isBodyElement) {
+      targetTop = 0;
+      targetBottom = getWindow(editor).innerHeight;
+    } else {
+      const targetRect = element.getBoundingClientRect();
+      targetTop = targetRect.top;
+      targetBottom = targetRect.bottom;
+    }
+    let diff = 0;
+
+    if (currentTop < targetTop) {
+      diff = -(targetTop - currentTop);
+    } else if (currentBottom > targetBottom) {
+      diff = currentBottom - targetBottom;
+    }
+
+    if (diff !== 0) {
+      if (isBodyElement) {
+        // Only handles scrolling of Y axis
+        defaultView.scrollBy(0, diff);
+      } else {
+        const scrollTop = element.scrollTop;
+        element.scrollTop += diff;
+        const yOffset = element.scrollTop - scrollTop;
+        currentTop -= yOffset;
+        currentBottom -= yOffset;
+      }
+    }
+    if (isBodyElement) {
+      break;
+    }
+    element = getParentElement(element);
+  }
+}
+
+export function $hasUpdateTag(tag: string): boolean {
+  const editor = getActiveEditor();
+  return editor._updateTags.has(tag);
+}
+
+export function $addUpdateTag(tag: string): void {
+  errorOnReadOnly();
+  const editor = getActiveEditor();
+  editor._updateTags.add(tag);
+}
+
+export function $maybeMoveChildrenSelectionToParent(
+  parentNode: LexicalNode,
+): BaseSelection | null {
+  const selection = $getSelection();
+  if (!$isRangeSelection(selection) || !$isElementNode(parentNode)) {
+    return selection;
+  }
+  const {anchor, focus} = selection;
+  const anchorNode = anchor.getNode();
+  const focusNode = focus.getNode();
+  if ($hasAncestor(anchorNode, parentNode)) {
+    anchor.set(parentNode.__key, 0, 'element');
+  }
+  if ($hasAncestor(focusNode, parentNode)) {
+    focus.set(parentNode.__key, 0, 'element');
+  }
+  return selection;
+}
+
+export function $hasAncestor(
+  child: LexicalNode,
+  targetNode: LexicalNode,
+): boolean {
+  let parent = child.getParent();
+  while (parent !== null) {
+    if (parent.is(targetNode)) {
+      return true;
+    }
+    parent = parent.getParent();
+  }
+  return false;
+}
+
+export function getDefaultView(domElem: HTMLElement): Window | null {
+  const ownerDoc = domElem.ownerDocument;
+  return (ownerDoc && ownerDoc.defaultView) || null;
+}
+
+export function getWindow(editor: LexicalEditor): Window {
+  const windowObj = editor._window;
+  if (windowObj === null) {
+    invariant(false, 'window object not found');
+  }
+  return windowObj;
+}
+
+export function $isInlineElementOrDecoratorNode(node: LexicalNode): boolean {
+  return (
+    ($isElementNode(node) && node.isInline()) ||
+    ($isDecoratorNode(node) && node.isInline())
+  );
+}
+
+export function $getNearestRootOrShadowRoot(
+  node: LexicalNode,
+): RootNode | ElementNode {
+  let parent = node.getParentOrThrow();
+  while (parent !== null) {
+    if ($isRootOrShadowRoot(parent)) {
+      return parent;
+    }
+    parent = parent.getParentOrThrow();
+  }
+  return parent;
+}
+
+const ShadowRootNodeBrand: unique symbol = Symbol.for(
+  '@lexical/ShadowRootNodeBrand',
+);
+type ShadowRootNode = Spread<
+  {isShadowRoot(): true; [ShadowRootNodeBrand]: never},
+  ElementNode
+>;
+export function $isRootOrShadowRoot(
+  node: null | LexicalNode,
+): node is RootNode | ShadowRootNode {
+  return $isRootNode(node) || ($isElementNode(node) && node.isShadowRoot());
+}
+
+/**
+ * Returns a shallow clone of node with a new key
+ *
+ * @param node - The node to be copied.
+ * @returns The copy of the node.
+ */
+export function $copyNode<T extends LexicalNode>(node: T): T {
+  const copy = node.constructor.clone(node) as T;
+  $setNodeKey(copy, null);
+  return copy;
+}
+
+export function $applyNodeReplacement<N extends LexicalNode>(
+  node: LexicalNode,
+): N {
+  const editor = getActiveEditor();
+  const nodeType = node.constructor.getType();
+  const registeredNode = editor._nodes.get(nodeType);
+  if (registeredNode === undefined) {
+    invariant(
+      false,
+      '$initializeNode failed. Ensure node has been registered to the editor. You can do this by passing the node class via the "nodes" array in the editor config.',
+    );
+  }
+  const replaceFunc = registeredNode.replace;
+  if (replaceFunc !== null) {
+    const replacementNode = replaceFunc(node) as N;
+    if (!(replacementNode instanceof node.constructor)) {
+      invariant(
+        false,
+        '$initializeNode failed. Ensure replacement node is a subclass of the original node.',
+      );
+    }
+    return replacementNode;
+  }
+  return node as N;
+}
+
+export function errorOnInsertTextNodeOnRoot(
+  node: LexicalNode,
+  insertNode: LexicalNode,
+): void {
+  const parentNode = node.getParent();
+  if (
+    $isRootNode(parentNode) &&
+    !$isElementNode(insertNode) &&
+    !$isDecoratorNode(insertNode)
+  ) {
+    invariant(
+      false,
+      'Only element or decorator nodes can be inserted in to the root node',
+    );
+  }
+}
+
+export function $getNodeByKeyOrThrow<N extends LexicalNode>(key: NodeKey): N {
+  const node = $getNodeByKey<N>(key);
+  if (node === null) {
+    invariant(
+      false,
+      "Expected node with key %s to exist but it's not in the nodeMap.",
+      key,
+    );
+  }
+  return node;
+}
+
+function createBlockCursorElement(editorConfig: EditorConfig): HTMLDivElement {
+  const theme = editorConfig.theme;
+  const element = document.createElement('div');
+  element.contentEditable = 'false';
+  element.setAttribute('data-lexical-cursor', 'true');
+  let blockCursorTheme = theme.blockCursor;
+  if (blockCursorTheme !== undefined) {
+    if (typeof blockCursorTheme === 'string') {
+      const classNamesArr = normalizeClassNames(blockCursorTheme);
+      // @ts-expect-error: intentional
+      blockCursorTheme = theme.blockCursor = classNamesArr;
+    }
+    if (blockCursorTheme !== undefined) {
+      element.classList.add(...blockCursorTheme);
+    }
+  }
+  return element;
+}
+
+function needsBlockCursor(node: null | LexicalNode): boolean {
+  return (
+    ($isDecoratorNode(node) || ($isElementNode(node) && !node.canBeEmpty())) &&
+    !node.isInline()
+  );
+}
+
+export function removeDOMBlockCursorElement(
+  blockCursorElement: HTMLElement,
+  editor: LexicalEditor,
+  rootElement: HTMLElement,
+) {
+  rootElement.style.removeProperty('caret-color');
+  editor._blockCursorElement = null;
+  const parentElement = blockCursorElement.parentElement;
+  if (parentElement !== null) {
+    parentElement.removeChild(blockCursorElement);
+  }
+}
+
+export function updateDOMBlockCursorElement(
+  editor: LexicalEditor,
+  rootElement: HTMLElement,
+  nextSelection: null | BaseSelection,
+): void {
+  let blockCursorElement = editor._blockCursorElement;
+
+  if (
+    $isRangeSelection(nextSelection) &&
+    nextSelection.isCollapsed() &&
+    nextSelection.anchor.type === 'element' &&
+    rootElement.contains(document.activeElement)
+  ) {
+    const anchor = nextSelection.anchor;
+    const elementNode = anchor.getNode();
+    const offset = anchor.offset;
+    const elementNodeSize = elementNode.getChildrenSize();
+    let isBlockCursor = false;
+    let insertBeforeElement: null | HTMLElement = null;
+
+    if (offset === elementNodeSize) {
+      const child = elementNode.getChildAtIndex(offset - 1);
+      if (needsBlockCursor(child)) {
+        isBlockCursor = true;
+      }
+    } else {
+      const child = elementNode.getChildAtIndex(offset);
+      if (needsBlockCursor(child)) {
+        const sibling = (child as LexicalNode).getPreviousSibling();
+        if (sibling === null || needsBlockCursor(sibling)) {
+          isBlockCursor = true;
+          insertBeforeElement = editor.getElementByKey(
+            (child as LexicalNode).__key,
+          );
+        }
+      }
+    }
+    if (isBlockCursor) {
+      const elementDOM = editor.getElementByKey(
+        elementNode.__key,
+      ) as HTMLElement;
+      if (blockCursorElement === null) {
+        editor._blockCursorElement = blockCursorElement =
+          createBlockCursorElement(editor._config);
+      }
+      rootElement.style.caretColor = 'transparent';
+      if (insertBeforeElement === null) {
+        elementDOM.appendChild(blockCursorElement);
+      } else {
+        elementDOM.insertBefore(blockCursorElement, insertBeforeElement);
+      }
+      return;
+    }
+  }
+  // Remove cursor
+  if (blockCursorElement !== null) {
+    removeDOMBlockCursorElement(blockCursorElement, editor, rootElement);
+  }
+}
+
+export function getDOMSelection(targetWindow: null | Window): null | Selection {
+  return !CAN_USE_DOM ? null : (targetWindow || window).getSelection();
+}
+
+export function $splitNode(
+  node: ElementNode,
+  offset: number,
+): [ElementNode | null, ElementNode] {
+  let startNode = node.getChildAtIndex(offset);
+  if (startNode == null) {
+    startNode = node;
+  }
+
+  invariant(
+    !$isRootOrShadowRoot(node),
+    'Can not call $splitNode() on root element',
+  );
+
+  const recurse = <T extends LexicalNode>(
+    currentNode: T,
+  ): [ElementNode, ElementNode, T] => {
+    const parent = currentNode.getParentOrThrow();
+    const isParentRoot = $isRootOrShadowRoot(parent);
+    // The node we start split from (leaf) is moved, but its recursive
+    // parents are copied to create separate tree
+    const nodeToMove =
+      currentNode === startNode && !isParentRoot
+        ? currentNode
+        : $copyNode(currentNode);
+
+    if (isParentRoot) {
+      invariant(
+        $isElementNode(currentNode) && $isElementNode(nodeToMove),
+        'Children of a root must be ElementNode',
+      );
+
+      currentNode.insertAfter(nodeToMove);
+      return [currentNode, nodeToMove, nodeToMove];
+    } else {
+      const [leftTree, rightTree, newParent] = recurse(parent);
+      const nextSiblings = currentNode.getNextSiblings();
+
+      newParent.append(nodeToMove, ...nextSiblings);
+      return [leftTree, rightTree, nodeToMove];
+    }
+  };
+
+  const [leftTree, rightTree] = recurse(startNode);
+
+  return [leftTree, rightTree];
+}
+
+export function $findMatchingParent(
+  startingNode: LexicalNode,
+  findFn: (node: LexicalNode) => boolean,
+): LexicalNode | null {
+  let curr: ElementNode | LexicalNode | null = startingNode;
+
+  while (curr !== $getRoot() && curr != null) {
+    if (findFn(curr)) {
+      return curr;
+    }
+
+    curr = curr.getParent();
+  }
+
+  return null;
+}
+
+/**
+ * @param x - The element being tested
+ * @returns Returns true if x is an HTML anchor tag, false otherwise
+ */
+export function isHTMLAnchorElement(x: Node): x is HTMLAnchorElement {
+  return isHTMLElement(x) && x.tagName === 'A';
+}
+
+/**
+ * @param x - The element being testing
+ * @returns Returns true if x is an HTML element, false otherwise.
+ */
+export function isHTMLElement(x: Node | EventTarget): x is HTMLElement {
+  // @ts-ignore-next-line - strict check on nodeType here should filter out non-Element EventTarget implementors
+  return x.nodeType === 1;
+}
+
+/**
+ *
+ * @param node - the Dom Node to check
+ * @returns if the Dom Node is an inline node
+ */
+export function isInlineDomNode(node: Node) {
+  const inlineNodes = new RegExp(
+    /^(a|abbr|acronym|b|cite|code|del|em|i|ins|kbd|label|output|q|ruby|s|samp|span|strong|sub|sup|time|u|tt|var|#text)$/,
+    'i',
+  );
+  return node.nodeName.match(inlineNodes) !== null;
+}
+
+/**
+ *
+ * @param node - the Dom Node to check
+ * @returns if the Dom Node is a block node
+ */
+export function isBlockDomNode(node: Node) {
+  const blockNodes = new RegExp(
+    /^(address|article|aside|blockquote|canvas|dd|div|dl|dt|fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hr|li|main|nav|noscript|ol|p|pre|section|table|td|tfoot|ul|video)$/,
+    'i',
+  );
+  return node.nodeName.match(blockNodes) !== null;
+}
+
+/**
+ * This function is for internal use of the library.
+ * Please do not use it as it may change in the future.
+ */
+export function INTERNAL_$isBlock(
+  node: LexicalNode,
+): node is ElementNode | DecoratorNode<unknown> {
+  if ($isRootNode(node) || ($isDecoratorNode(node) && !node.isInline())) {
+    return true;
+  }
+  if (!$isElementNode(node) || $isRootOrShadowRoot(node)) {
+    return false;
+  }
+
+  const firstChild = node.getFirstChild();
+  const isLeafElement =
+    firstChild === null ||
+    $isLineBreakNode(firstChild) ||
+    $isTextNode(firstChild) ||
+    firstChild.isInline();
+
+  return !node.isInline() && node.canBeEmpty() !== false && isLeafElement;
+}
+
+export function $getAncestor<NodeType extends LexicalNode = LexicalNode>(
+  node: LexicalNode,
+  predicate: (ancestor: LexicalNode) => ancestor is NodeType,
+) {
+  let parent = node;
+  while (parent !== null && parent.getParent() !== null && !predicate(parent)) {
+    parent = parent.getParentOrThrow();
+  }
+  return predicate(parent) ? parent : null;
+}
+
+/**
+ * Utility function for accessing current active editor instance.
+ * @returns Current active editor
+ */
+export function $getEditor(): LexicalEditor {
+  return getActiveEditor();
+}
+
+/** @internal */
+export type TypeToNodeMap = Map<string, NodeMap>;
+/**
+ * @internal
+ * Compute a cached Map of node type to nodes for a frozen EditorState
+ */
+const cachedNodeMaps = new WeakMap<EditorState, TypeToNodeMap>();
+const EMPTY_TYPE_TO_NODE_MAP: TypeToNodeMap = new Map();
+export function getCachedTypeToNodeMap(
+  editorState: EditorState,
+): TypeToNodeMap {
+  // If this is a new Editor it may have a writable this._editorState
+  // with only a 'root' entry.
+  if (!editorState._readOnly && editorState.isEmpty()) {
+    return EMPTY_TYPE_TO_NODE_MAP;
+  }
+  invariant(
+    editorState._readOnly,
+    'getCachedTypeToNodeMap called with a writable EditorState',
+  );
+  let typeToNodeMap = cachedNodeMaps.get(editorState);
+  if (!typeToNodeMap) {
+    typeToNodeMap = new Map();
+    cachedNodeMaps.set(editorState, typeToNodeMap);
+    for (const [nodeKey, node] of editorState._nodeMap) {
+      const nodeType = node.__type;
+      let nodeMap = typeToNodeMap.get(nodeType);
+      if (!nodeMap) {
+        nodeMap = new Map();
+        typeToNodeMap.set(nodeType, nodeMap);
+      }
+      nodeMap.set(nodeKey, node);
+    }
+  }
+  return typeToNodeMap;
+}
+
+/**
+ * Returns a clone of a node using `node.constructor.clone()` followed by
+ * `clone.afterCloneFrom(node)`. The resulting clone must have the same key,
+ * parent/next/prev pointers, and other properties that are not set by
+ * `node.constructor.clone` (format, style, etc.). This is primarily used by
+ * {@link LexicalNode.getWritable} to create a writable version of an
+ * existing node. The clone is the same logical node as the original node,
+ * do not try and use this function to duplicate or copy an existing node.
+ *
+ * Does not mutate the EditorState.
+ * @param node - The node to be cloned.
+ * @returns The clone of the node.
+ */
+export function $cloneWithProperties<T extends LexicalNode>(latestNode: T): T {
+  const constructor = latestNode.constructor;
+  const mutableNode = constructor.clone(latestNode) as T;
+  mutableNode.afterCloneFrom(latestNode);
+  if (__DEV__) {
+    invariant(
+      mutableNode.__key === latestNode.__key,
+      "$cloneWithProperties: %s.clone(node) (with type '%s') did not return a node with the same key, make sure to specify node.__key as the last argument to the constructor",
+      constructor.name,
+      constructor.getType(),
+    );
+    invariant(
+      mutableNode.__parent === latestNode.__parent &&
+        mutableNode.__next === latestNode.__next &&
+        mutableNode.__prev === latestNode.__prev,
+      "$cloneWithProperties: %s.clone(node) (with type '%s') overrided afterCloneFrom but did not call super.afterCloneFrom(prevNode)",
+      constructor.name,
+      constructor.getType(),
+    );
+  }
+  return mutableNode;
+}
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts
new file mode 100644
index 00000000000..5d6a9311bf7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts
@@ -0,0 +1,144 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$insertDataTransferForRichText} from '@lexical/clipboard';
+import {
+  $createParagraphNode,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+} from 'lexical';
+import {
+  DataTransferMock,
+  initializeUnitTest,
+  invariant,
+} from 'lexical/__tests__/utils';
+
+describe('CodeBlock tests', () => {
+  initializeUnitTest(
+    (testEnv) => {
+      beforeEach(async () => {
+        const {editor} = testEnv;
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+          paragraph.select();
+        });
+      });
+
+      /**
+       * Code example for tests:
+       *
+       * function run() {
+       *   return [null, undefined, 2, ""];
+       * }
+       *
+       */
+      const EXPECTED_HTML = `<code spellcheck="false" dir="ltr"><span data-lexical-text="true">function run() {</span><br><span data-lexical-text="true">  return [null, undefined, 2, ""];</span><br><span data-lexical-text="true">}</span></code>`;
+
+      const CODE_PASTING_TESTS = [
+        {
+          expectedHTML: EXPECTED_HTML,
+          name: 'VS Code',
+          pastedHTML: `<meta charset='utf-8'><div style="color: #d4d4d4;background-color: #1e1e1e;font-family: Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 12px;line-height: 18px;white-space: pre;"><div><span style="color: #569cd6;">function</span><span style="color: #d4d4d4;"> </span><span style="color: #dcdcaa;">run</span><span style="color: #d4d4d4;">() {</span></div><div><span style="color: #d4d4d4;">  </span><span style="color: #c586c0;">return</span><span style="color: #d4d4d4;"> [</span><span style="color: #569cd6;">null</span><span style="color: #d4d4d4;">, </span><span style="color: #569cd6;">undefined</span><span style="color: #d4d4d4;">, </span><span style="color: #b5cea8;">2</span><span style="color: #d4d4d4;">, </span><span style="color: #ce9178;">""</span><span style="color: #d4d4d4;">];</span></div><div><span style="color: #d4d4d4;">}</span></div></div>`,
+        },
+        {
+          expectedHTML: EXPECTED_HTML,
+          name: 'Quip',
+          pastedHTML: `<meta charset='utf-8'><pre>function run() {<br>  return [null, undefined, 2, ""];<br>}</pre>`,
+        },
+        {
+          expectedHTML: EXPECTED_HTML,
+          name: 'WebStorm / Idea',
+          pastedHTML: `<html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><pre style="background-color:#2b2b2b;color:#a9b7c6;font-family:'JetBrains Mono',monospace;font-size:9.8pt;"><span style="color:#cc7832;">function&#32;</span><span style="color:#ffc66d;">run</span>()&#32;{<br>&#32;&#32;<span style="color:#cc7832;">return&#32;</span>[<span style="color:#cc7832;">null,&#32;undefined,&#32;</span><span style="color:#6897bb;">2</span><span style="color:#cc7832;">,&#32;</span><span style="color:#6a8759;">""</span>]<span style="color:#cc7832;">;<br></span>}</pre></body></html>`,
+        },
+        {
+          expectedHTML: `<code spellcheck="false" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">function</strong><span data-lexical-text="true"> run() {</span><br><span data-lexical-text="true">  </span><strong class="editor-text-bold" data-lexical-text="true">return</strong><span data-lexical-text="true"> [</span><strong class="editor-text-bold" data-lexical-text="true">null</strong><span data-lexical-text="true">, </span><strong class="editor-text-bold" data-lexical-text="true">undefined</strong><span data-lexical-text="true">, 2, ""];</span><br><span data-lexical-text="true">}</span></code>`,
+          name: 'Postman IDE',
+          pastedHTML: `<meta charset='utf-8'><div style="color: #000000;background-color: #fffffe;font-family: Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 12px;line-height: 18px;white-space: pre;"><div><span style="color: #800555;font-weight: bold;">function</span><span style="color: #000000;"> run() {</span></div><div><span style="color: #000000;">  </span><span style="color: #800555;font-weight: bold;">return</span><span style="color: #000000;"> [</span><span style="color: #800555;font-weight: bold;">null</span><span style="color: #000000;">, </span><span style="color: #800555;font-weight: bold;">undefined</span><span style="color: #000000;">, </span><span style="color: #ff00aa;">2</span><span style="color: #000000;">, </span><span style="color: #2a00ff;">""</span><span style="color: #000000;">];</span></div><div><span style="color: #000000;">}</span></div></div>`,
+        },
+        {
+          expectedHTML: EXPECTED_HTML,
+          name: 'Slack message',
+          pastedHTML: `<meta charset='utf-8'><pre class="c-mrkdwn__pre" data-stringify-type="pre" style="box-sizing: inherit; margin: 4px 0px; padding: 8px; --saf-0:rgba(var(--sk_foreground_low,29,28,29),0.13); font-size: 12px; line-height: 1.50001; font-variant-ligatures: none; white-space: pre-wrap; word-break: break-word; word-break: normal; tab-size: 4; font-family: Monaco, Menlo, Consolas, &quot;Courier New&quot;, monospace !important; border: 1px solid var(--saf-0); border-radius: 4px; background: rgba(var(--sk_foreground_min,29,28,29),0.04); counter-reset: list-0 0 list-1 0 list-2 0 list-3 0 list-4 0 list-5 0 list-6 0 list-7 0 list-8 0 list-9 0; color: rgb(29, 28, 29); font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">function run() {\n  return [null, undefined, 2, ""];\n}</pre>`,
+        },
+        {
+          expectedHTML: `<code spellcheck="false" dir="ltr"><span data-lexical-text="true">const Lexical = requireCond('gk', 'runtime_is_dev', {</span><br><span data-lexical-text="true">  true: 'Lexical.dev',</span><br><span data-lexical-text="true">  false: 'Lexical.prod',</span><br><span data-lexical-text="true">});</span></code>`,
+          name: 'CodeHub',
+          pastedHTML: `<meta charset='utf-8'><div style="color: #000000;background-color: #fffffe;font-family: 'monaco,monospace', Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 13px;line-height: 20px;white-space: pre;"><div><span style="color: #ff0000;">const</span><span style="color: #000000;"> </span><span style="color: #800000;">Lexical</span><span style="color: #000000;"> = </span><span style="color: #383838;">requireCond</span><span style="color: #000000;">(</span><span style="color: #863b00;">'gk'</span><span style="color: #000000;">, </span><span style="color: #863b00;">'runtime_is_dev'</span><span style="color: #000000;">, {</span></div><div><span style="color: #000000;">  </span><span style="color: #863b00;">true</span><span style="color: #000000;">: </span><span style="color: #863b00;">'Lexical.dev'</span><span style="color: #000000;">,</span></div><div><span style="color: #000000;">  </span><span style="color: #863b00;">false</span><span style="color: #000000;">: </span><span style="color: #863b00;">'Lexical.prod'</span><span style="color: #000000;">,</span></div><div><span style="color: #000000;">});</span></div></div>`,
+        },
+        {
+          expectedHTML: EXPECTED_HTML,
+          name: 'GitHub / Gist',
+          pastedHTML: `<meta charset='utf-8'><table class="highlight tab-size js-file-line-container js-code-nav-container js-tagsearch-file" data-tab-size="8" data-paste-markdown-skip="" data-tagsearch-lang="JavaScript" data-tagsearch-path="example.js" style="box-sizing: border-box; border-spacing: 0px; border-collapse: collapse; tab-size: 8; color: rgb(36, 41, 47); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><tbody style="box-sizing: border-box;"><tr style="box-sizing: border-box;"><td id="file-example-js-LC1" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;"><span class="pl-k" style="box-sizing: border-box; color: var(--color-prettylights-syntax-keyword);">function</span> <span class="pl-en" style="box-sizing: border-box; color: var(--color-prettylights-syntax-entity);">run</span><span class="pl-kos" style="box-sizing: border-box;">(</span><span class="pl-kos" style="box-sizing: border-box;">)</span> <span class="pl-kos" style="box-sizing: border-box;">{</span></td></tr><tr style="box-sizing: border-box; background-color: transparent;"><td id="file-example-js-L2" class="blob-num js-line-number js-code-nav-line-number" data-line-number="2" style="box-sizing: border-box; padding: 0px 10px; width: 50px; min-width: 50px; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; line-height: 20px; color: var(--color-fg-subtle); text-align: right; white-space: nowrap; vertical-align: top; cursor: pointer; user-select: none;"></td><td id="file-example-js-LC2" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;">  <span class="pl-k" style="box-sizing: border-box; color: var(--color-prettylights-syntax-keyword);">return</span> <span class="pl-kos" style="box-sizing: border-box;">[</span><span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">null</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">undefined</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">2</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-s" style="box-sizing: border-box; color: var(--color-prettylights-syntax-string);">""</span><span class="pl-kos" style="box-sizing: border-box;">]</span><span class="pl-kos" style="box-sizing: border-box;">;</span></td></tr><tr style="box-sizing: border-box;"><td id="file-example-js-L3" class="blob-num js-line-number js-code-nav-line-number" data-line-number="3" style="box-sizing: border-box; padding: 0px 10px; width: 50px; min-width: 50px; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; line-height: 20px; color: var(--color-fg-subtle); text-align: right; white-space: nowrap; vertical-align: top; cursor: pointer; user-select: none;"></td><td id="file-example-js-LC3" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;"><span class="pl-kos" style="box-sizing: border-box;">}</span></td></tr></tbody></table>`,
+        },
+        {
+          expectedHTML: `<p><code spellcheck="false" data-lexical-text="true"><span>12</span></code></p>`,
+          name: 'Single line <code>',
+          pastedHTML: `<meta charset='utf-8'><code>12</code>`,
+        },
+        {
+          expectedHTML: `<code spellcheck="false"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></code>`,
+          name: 'Multiline <code>',
+          // TODO This is not correct. This resembles how Lexical exports code right now but
+          // semantically it should be wrapped in a pre
+          pastedHTML: `<meta charset='utf-8'><code>1<br>2</code>`,
+        },
+        {
+          expectedHTML: `<p dir="ltr"><strong class="editor-text-bold editor-text-italic editor-text-underline" data-lexical-text="true">Hello </strong><sub data-lexical-text="true"><strong class="editor-text-bold editor-text-italic">World </strong></sub><sup data-lexical-text="true"><strong class="editor-text-bold editor-text-italic editor-text-underline">Lexical</strong></sup></p>`,
+          name: 'Multiple text formats',
+          pastedHTML: `<strong style="font-weight: 700; font-style: italic; text-decoration: underline; color: rgb(0, 0, 0); font-size: 15px; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);">Hello </strong><sub style="color: rgb(0, 0, 0); font-style: normal; font-weight: 400; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);"><strong style="font-weight: 700; font-style: italic; text-decoration: line-through; font-size: 0.8em; vertical-align: sub !important;">World </strong></sub><sup style="color: rgb(0, 0, 0); font-style: normal; font-weight: 400; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);"><strong style="font-weight: 700; font-style: italic; text-decoration: underline line-through; font-size: 0.8em; vertical-align: super;">Lexical</strong></sup>`,
+        },
+        {
+          expectedHTML: `<h1 dir="ltr"><span data-lexical-text="true">My document</span></h1>`,
+          name: 'Title from Google Docs',
+          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-whatever"><span style="font-size:26pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">My document</span></b>`,
+        },
+        {
+          expectedHTML: `<h1 dir="ltr"><span data-lexical-text="true">My document</span></h1>`,
+          name: 'Title from Google Docs Wrapped in Paragraph',
+          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-wjatever"><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:3pt;"><span style="font-size:26pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">My document</span></p></b>`,
+        },
+        {
+          expectedHTML: `<p dir="ltr"><sub data-lexical-text="true"><span>subscript</span></sub><span data-lexical-text="true"> and </span><sup data-lexical-text="true"><span>superscript</span></sup></p>`,
+          name: 'Subscript and Superscript',
+          pastedHTML: `<b style="font-weight:normal;" id="docs-internal-guid-374b5f9d-7fff-9120-bcb0-1f5c1b6d59fa"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span style="font-size:0.6em;vertical-align:sub;">subscript</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"> and </span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span style="font-size:0.6em;vertical-align:super;">superscript</span></span></b>`,
+        },
+      ];
+
+      CODE_PASTING_TESTS.forEach((testCase, i) => {
+        test(`Code block html paste: ${testCase.name}`, async () => {
+          const {editor} = testEnv;
+
+          const dataTransfer = new DataTransferMock();
+          dataTransfer.setData('text/html', testCase.pastedHTML);
+          await editor.update(() => {
+            const selection = $getSelection();
+            invariant(
+              $isRangeSelection(selection),
+              'isRangeSelection(selection)',
+            );
+            $insertDataTransferForRichText(dataTransfer, selection, editor);
+          });
+          expect(testEnv.innerHTML).toBe(testCase.expectedHTML);
+        });
+      });
+    },
+    {
+      namespace: 'test',
+      theme: {
+        text: {
+          bold: 'editor-text-bold',
+          italic: 'editor-text-italic',
+          underline: 'editor-text-underline',
+        },
+      },
+    },
+  );
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
new file mode 100644
index 00000000000..b146548383c
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$insertDataTransferForRichText} from '@lexical/clipboard';
+import {
+  $createParagraphNode,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+} from 'lexical';
+import {
+  DataTransferMock,
+  initializeUnitTest,
+  invariant,
+} from 'lexical/src/__tests__/utils';
+
+describe('HTMLCopyAndPaste tests', () => {
+  initializeUnitTest(
+    (testEnv) => {
+      beforeEach(async () => {
+        const {editor} = testEnv;
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+          paragraph.select();
+        });
+      });
+
+      const HTML_COPY_PASTING_TESTS = [
+        {
+          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">Hello!</span></p>`,
+          name: 'plain DOM text node',
+          pastedHTML: `Hello!`,
+        },
+        {
+          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">Hello!</span></p><p><br></p>`,
+          name: 'a paragraph element',
+          pastedHTML: `<p>Hello!<p>`,
+        },
+        {
+          expectedHTML: `<p><span data-lexical-text="true">123</span></p><p><span data-lexical-text="true">456</span></p>`,
+          name: 'a single div',
+          pastedHTML: `123
+            <div>
+              456
+            </div>`,
+        },
+        {
+          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">a b c d e</span></p><p dir="ltr"><span data-lexical-text="true">f g h</span></p>`,
+          name: 'multiple nested spans and divs',
+          pastedHTML: `<div>
+            a b
+            <span>
+              c d
+              <span>e</span>
+            </span>
+            <div>
+              f
+              <span>g h</span>
+            </div>
+          </div>`,
+        },
+        {
+          expectedHTML: `<p><span data-lexical-text="true">123</span></p><p><span data-lexical-text="true">456</span></p>`,
+          name: 'nested span in a div',
+          pastedHTML: `<div>
+            <span>
+              123
+              <div>456</div>
+            </span>
+          </div>`,
+        },
+        {
+          expectedHTML: `<p><span data-lexical-text="true">123</span></p><p><span data-lexical-text="true">456</span></p>`,
+          name: 'nested div in a span',
+          pastedHTML: ` <span>123<div>456</div></span>`,
+        },
+        {
+          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr"><span data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr"><span data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3" dir="ltr"><span data-lexical-text="true">todo</span></li></ul>`,
+          name: 'google doc checklist',
+          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-1980f960-7fff-f4df-4ba3-26c6e1508542"><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li dir="ltr" role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li dir="ltr" role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul></b>`,
+        },
+        {
+          expectedHTML: `<p dir="ltr" style="text-align: start;"><span data-lexical-text="true">checklist</span></p><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr" style="text-align: start;"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr" style="text-align: start;"><span data-lexical-text="true">todo</span></li></ul>`,
+          name: 'github checklist',
+          pastedHTML: `<meta charset='utf-8'><p dir="auto" style="box-sizing: border-box; margin-top: 0px !important; margin-bottom: 16px; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">checklist</p><ul class="contains-task-list" style="box-sizing: border-box; padding: 0px; margin-top: 0px; margin-bottom: 0px !important; position: relative; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" checked="" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>done</li><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; margin-top: 0px; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>todo</li></ul>`,
+        },
+      ];
+
+      HTML_COPY_PASTING_TESTS.forEach((testCase, i) => {
+        test(`HTML copy paste: ${testCase.name}`, async () => {
+          const {editor} = testEnv;
+
+          const dataTransfer = new DataTransferMock();
+          dataTransfer.setData('text/html', testCase.pastedHTML);
+          await editor.update(() => {
+            const selection = $getSelection();
+            invariant(
+              $isRangeSelection(selection),
+              'isRangeSelection(selection)',
+            );
+            $insertDataTransferForRichText(dataTransfer, selection, editor);
+          });
+          expect(testEnv.innerHTML).toBe(testCase.expectedHTML);
+        });
+      });
+    },
+    {
+      namespace: 'test',
+      theme: {
+        text: {
+          bold: 'editor-text-bold',
+          italic: 'editor-text-italic',
+          underline: 'editor-text-underline',
+        },
+      },
+    },
+  );
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
new file mode 100644
index 00000000000..4ca6b77c814
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -0,0 +1,2856 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {
+  $createTableCellNode,
+  $createTableNode,
+  $createTableRowNode,
+  TableCellNode,
+  TableRowNode,
+} from '@lexical/table';
+import {
+  $createLineBreakNode,
+  $createNodeSelection,
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTextNode,
+  $getEditor,
+  $getNearestNodeFromDOMNode,
+  $getNodeByKey,
+  $getRoot,
+  $isParagraphNode,
+  $isTextNode,
+  $parseSerializedNode,
+  $setCompositionKey,
+  $setSelection,
+  COMMAND_PRIORITY_EDITOR,
+  COMMAND_PRIORITY_LOW,
+  createCommand,
+  createEditor,
+  EditorState,
+  ElementNode,
+  type Klass,
+  type LexicalEditor,
+  type LexicalNode,
+  type LexicalNodeReplacement,
+  ParagraphNode,
+  RootNode,
+  TextNode,
+} from 'lexical';
+
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $createTestDecoratorNode,
+  $createTestElementNode,
+  $createTestInlineElementNode,
+  createTestEditor,
+  createTestHeadlessEditor,
+  TestTextNode,
+} from '../utils';
+
+describe('LexicalEditor tests', () => {
+  let container: HTMLElement;
+  let reactRoot: Root;
+
+  beforeEach(() => {
+    container = document.createElement('div');
+    reactRoot = createRoot(container);
+    document.body.appendChild(container);
+  });
+
+  afterEach(() => {
+    document.body.removeChild(container);
+    // @ts-ignore
+    container = null;
+
+    jest.restoreAllMocks();
+  });
+
+  function useLexicalEditor(
+    rootElementRef: React.RefObject<HTMLDivElement>,
+    onError?: (error: Error) => void,
+    nodes?: ReadonlyArray<Klass<LexicalNode> | LexicalNodeReplacement>,
+  ) {
+    const editor = useMemo(
+      () =>
+        createTestEditor({
+          nodes: nodes ?? [],
+          onError: onError || jest.fn(),
+          theme: {
+            text: {
+              bold: 'editor-text-bold',
+              italic: 'editor-text-italic',
+              underline: 'editor-text-underline',
+            },
+          },
+        }),
+      [onError, nodes],
+    );
+
+    useEffect(() => {
+      const rootElement = rootElementRef.current;
+
+      editor.setRootElement(rootElement);
+    }, [rootElementRef, editor]);
+
+    return editor;
+  }
+
+  let editor: LexicalEditor;
+
+  function init(onError?: (error: Error) => void) {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref, onError);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase />);
+    });
+  }
+
+  async function update(fn: () => void) {
+    editor.update(fn);
+
+    return Promise.resolve().then();
+  }
+
+  describe('read()', () => {
+    it('Can read the editor state', async () => {
+      init(function onError(err) {
+        throw err;
+      });
+      expect(editor.read(() => $getRoot().getTextContent())).toEqual('');
+      expect(editor.read(() => $getEditor())).toBe(editor);
+      const onUpdate = jest.fn();
+      editor.update(
+        () => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('This works!');
+          root.append(paragraph);
+          paragraph.append(text);
+        },
+        {onUpdate},
+      );
+      expect(onUpdate).toHaveBeenCalledTimes(0);
+      // This read will flush pending updates
+      expect(editor.read(() => $getRoot().getTextContent())).toEqual(
+        'This works!',
+      );
+      expect(onUpdate).toHaveBeenCalledTimes(1);
+      // Check to make sure there is not an unexpected reconciliation
+      await Promise.resolve().then();
+      expect(onUpdate).toHaveBeenCalledTimes(1);
+      editor.read(() => {
+        const rootElement = editor.getRootElement();
+        expect(rootElement).toBeDefined();
+        // The root never works for this call
+        expect($getNearestNodeFromDOMNode(rootElement!)).toBe(null);
+        const paragraphDom = rootElement!.querySelector('p');
+        expect(paragraphDom).toBeDefined();
+        expect(
+          $isParagraphNode($getNearestNodeFromDOMNode(paragraphDom!)),
+        ).toBe(true);
+        expect(
+          $getNearestNodeFromDOMNode(paragraphDom!)!.getTextContent(),
+        ).toBe('This works!');
+        const textDom = paragraphDom!.querySelector('span');
+        expect(textDom).toBeDefined();
+        expect($isTextNode($getNearestNodeFromDOMNode(textDom!))).toBe(true);
+        expect($getNearestNodeFromDOMNode(textDom!)!.getTextContent()).toBe(
+          'This works!',
+        );
+        expect(
+          $getNearestNodeFromDOMNode(textDom!.firstChild!)!.getTextContent(),
+        ).toBe('This works!');
+      });
+      expect(onUpdate).toHaveBeenCalledTimes(1);
+    });
+    it('runs transforms the editor state', async () => {
+      init(function onError(err) {
+        throw err;
+      });
+      expect(editor.read(() => $getRoot().getTextContent())).toEqual('');
+      expect(editor.read(() => $getEditor())).toBe(editor);
+      editor.registerNodeTransform(TextNode, (node) => {
+        if (node.getTextContent() === 'This works!') {
+          node.replace($createTextNode('Transforms work!'));
+        }
+      });
+      const onUpdate = jest.fn();
+      editor.update(
+        () => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('This works!');
+          root.append(paragraph);
+          paragraph.append(text);
+        },
+        {onUpdate},
+      );
+      expect(onUpdate).toHaveBeenCalledTimes(0);
+      // This read will flush pending updates
+      expect(editor.read(() => $getRoot().getTextContent())).toEqual(
+        'Transforms work!',
+      );
+      expect(editor.getRootElement()!.textContent).toEqual('Transforms work!');
+      expect(onUpdate).toHaveBeenCalledTimes(1);
+      // Check to make sure there is not an unexpected reconciliation
+      await Promise.resolve().then();
+      expect(onUpdate).toHaveBeenCalledTimes(1);
+      expect(editor.read(() => $getRoot().getTextContent())).toEqual(
+        'Transforms work!',
+      );
+    });
+    it('can be nested in an update or read', async () => {
+      init(function onError(err) {
+        throw err;
+      });
+      editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('This works!');
+        root.append(paragraph);
+        paragraph.append(text);
+        editor.read(() => {
+          expect($getRoot().getTextContent()).toBe('This works!');
+        });
+        editor.read(() => {
+          // Nesting update in read works, although it is discouraged in the documentation.
+          editor.update(() => {
+            expect($getRoot().getTextContent()).toBe('This works!');
+          });
+        });
+        // Updating after a nested read will fail as it has already been committed
+        expect(() => {
+          root.append(
+            $createParagraphNode().append(
+              $createTextNode('update-read-update'),
+            ),
+          );
+        }).toThrow();
+      });
+      editor.read(() => {
+        editor.read(() => {
+          expect($getRoot().getTextContent()).toBe('This works!');
+        });
+      });
+    });
+  });
+
+  it('Should create an editor with an initial editor state', async () => {
+    const rootElement = document.createElement('div');
+
+    container.appendChild(rootElement);
+
+    const initialEditor = createTestEditor({
+      onError: jest.fn(),
+    });
+
+    initialEditor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const text = $createTextNode('This works!');
+      root.append(paragraph);
+      paragraph.append(text);
+    });
+
+    initialEditor.setRootElement(rootElement);
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(container.innerHTML).toBe(
+      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    );
+
+    const initialEditorState = initialEditor.getEditorState();
+    initialEditor.setRootElement(null);
+
+    expect(container.innerHTML).toBe(
+      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"></div>',
+    );
+
+    editor = createTestEditor({
+      editorState: initialEditorState,
+      onError: jest.fn(),
+    });
+    editor.setRootElement(rootElement);
+
+    expect(editor.getEditorState()).toEqual(initialEditorState);
+    expect(container.innerHTML).toBe(
+      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    );
+  });
+
+  it('Should handle nested updates in the correct sequence', async () => {
+    init();
+    const onUpdate = jest.fn();
+
+    let log: Array<string> = [];
+
+    editor.registerUpdateListener(onUpdate);
+    editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const text = $createTextNode('This works!');
+      root.append(paragraph);
+      paragraph.append(text);
+    });
+
+    editor.update(
+      () => {
+        log.push('A1');
+        // To enforce the update
+        $getRoot().markDirty();
+        editor.update(
+          () => {
+            log.push('B1');
+            editor.update(
+              () => {
+                log.push('C1');
+              },
+              {
+                onUpdate: () => {
+                  log.push('F1');
+                },
+              },
+            );
+          },
+          {
+            onUpdate: () => {
+              log.push('E1');
+            },
+          },
+        );
+      },
+      {
+        onUpdate: () => {
+          log.push('D1');
+        },
+      },
+    );
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(onUpdate).toHaveBeenCalledTimes(1);
+    expect(log).toEqual(['A1', 'B1', 'C1', 'D1', 'E1', 'F1']);
+
+    log = [];
+    editor.update(
+      () => {
+        log.push('A2');
+        // To enforce the update
+        $getRoot().markDirty();
+      },
+      {
+        onUpdate: () => {
+          log.push('B2');
+          editor.update(
+            () => {
+              // force flush sync
+              $setCompositionKey('root');
+              log.push('D2');
+            },
+            {
+              onUpdate: () => {
+                log.push('F2');
+              },
+            },
+          );
+          log.push('C2');
+          editor.update(
+            () => {
+              log.push('E2');
+            },
+            {
+              onUpdate: () => {
+                log.push('G2');
+              },
+            },
+          );
+        },
+      },
+    );
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(log).toEqual(['A2', 'B2', 'C2', 'D2', 'E2', 'F2', 'G2']);
+
+    log = [];
+    editor.registerNodeTransform(TextNode, () => {
+      log.push('TextTransform A3');
+      editor.update(
+        () => {
+          log.push('TextTransform B3');
+        },
+        {
+          onUpdate: () => {
+            log.push('TextTransform C3');
+          },
+        },
+      );
+    });
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(log).toEqual([
+      'TextTransform A3',
+      'TextTransform B3',
+      'TextTransform C3',
+    ]);
+
+    log = [];
+    editor.update(
+      () => {
+        log.push('A3');
+        $getRoot().getLastDescendant()!.markDirty();
+      },
+      {
+        onUpdate: () => {
+          log.push('B3');
+        },
+      },
+    );
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(log).toEqual([
+      'A3',
+      'TextTransform A3',
+      'TextTransform B3',
+      'B3',
+      'TextTransform C3',
+    ]);
+  });
+
+  it('nested update after selection update triggers exactly 1 update', async () => {
+    init();
+    const onUpdate = jest.fn();
+    editor.registerUpdateListener(onUpdate);
+    editor.update(() => {
+      $setSelection($createRangeSelection());
+      editor.update(() => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('Sync update')),
+        );
+      });
+    });
+
+    await Promise.resolve().then();
+
+    const textContent = editor
+      .getEditorState()
+      .read(() => $getRoot().getTextContent());
+    expect(textContent).toBe('Sync update');
+    expect(onUpdate).toHaveBeenCalledTimes(1);
+  });
+
+  it('update does not call onUpdate callback when no dirty nodes', () => {
+    init();
+
+    const fn = jest.fn();
+    editor.update(
+      () => {
+        //
+      },
+      {
+        onUpdate: fn,
+      },
+    );
+    expect(fn).toHaveBeenCalledTimes(0);
+  });
+
+  it('editor.focus() callback is called', async () => {
+    init();
+
+    await editor.update(() => {
+      const root = $getRoot();
+      root.append($createParagraphNode());
+    });
+
+    const fn = jest.fn();
+
+    await editor.focus(fn);
+
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+
+  it('Synchronously runs three transforms, two of them depend on the other', async () => {
+    init();
+
+    // 2. Add italics
+    const italicsListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (
+        node.getTextContent() === 'foo' &&
+        node.hasFormat('bold') &&
+        !node.hasFormat('italic')
+      ) {
+        node.toggleFormat('italic');
+      }
+    });
+
+    // 1. Add bold
+    const boldListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (node.getTextContent() === 'foo' && !node.hasFormat('bold')) {
+        node.toggleFormat('bold');
+      }
+    });
+
+    // 2. Add underline
+    const underlineListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (
+        node.getTextContent() === 'foo' &&
+        node.hasFormat('bold') &&
+        !node.hasFormat('underline')
+      ) {
+        node.toggleFormat('underline');
+      }
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+      paragraph.append($createTextNode('foo'));
+    });
+    italicsListener();
+    boldListener();
+    underlineListener();
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold editor-text-italic editor-text-underline" data-lexical-text="true">foo</strong></p></div>',
+    );
+  });
+
+  it('Synchronously runs three transforms, two of them depend on the other (2)', async () => {
+    await init();
+
+    // Add transform makes everything dirty the first time (let's not leverage this here)
+    const skipFirst = [true, true, true];
+
+    // 2. (Block transform) Add text
+    const testParagraphListener = editor.registerNodeTransform(
+      ParagraphNode,
+      (paragraph) => {
+        if (skipFirst[0]) {
+          skipFirst[0] = false;
+
+          return;
+        }
+
+        if (paragraph.isEmpty()) {
+          paragraph.append($createTextNode('foo'));
+        }
+      },
+    );
+
+    // 2. (Text transform) Add bold to text
+    const boldListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (node.getTextContent() === 'foo' && !node.hasFormat('bold')) {
+        node.toggleFormat('bold');
+      }
+    });
+
+    // 3. (Block transform) Add italics to bold text
+    const italicsListener = editor.registerNodeTransform(
+      ParagraphNode,
+      (paragraph) => {
+        const child = paragraph.getLastDescendant();
+
+        if (
+          $isTextNode(child) &&
+          child.hasFormat('bold') &&
+          !child.hasFormat('italic')
+        ) {
+          child.toggleFormat('italic');
+        }
+      },
+    );
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = root.getFirstChild();
+      paragraph!.markDirty();
+    });
+
+    testParagraphListener();
+    boldListener();
+    italicsListener();
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">foo</strong></p></div>',
+    );
+  });
+
+  it('Synchronously runs three transforms, two of them depend on previously merged text content', async () => {
+    const hasRun = [false, false, false];
+    init();
+
+    // 1. [Foo] into [<empty>,Fo,o,<empty>,!,<empty>]
+    const fooListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (node.getTextContent() === 'Foo' && !hasRun[0]) {
+        const [before, after] = node.splitText(2);
+
+        before.insertBefore($createTextNode(''));
+        after.insertAfter($createTextNode(''));
+        after.insertAfter($createTextNode('!'));
+        after.insertAfter($createTextNode(''));
+
+        hasRun[0] = true;
+      }
+    });
+
+    // 2. [Foo!] into [<empty>,Fo,o!,<empty>,!,<empty>]
+    const megaFooListener = editor.registerNodeTransform(
+      ParagraphNode,
+      (paragraph) => {
+        const child = paragraph.getFirstChild();
+
+        if (
+          $isTextNode(child) &&
+          child.getTextContent() === 'Foo!' &&
+          !hasRun[1]
+        ) {
+          const [before, after] = child.splitText(2);
+
+          before.insertBefore($createTextNode(''));
+          after.insertAfter($createTextNode(''));
+          after.insertAfter($createTextNode('!'));
+          after.insertAfter($createTextNode(''));
+
+          hasRun[1] = true;
+        }
+      },
+    );
+
+    // 3. [Foo!!] into formatted bold [<empty>,Fo,o!!,<empty>]
+    const boldFooListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (node.getTextContent() === 'Foo!!' && !hasRun[2]) {
+        node.toggleFormat('bold');
+
+        const [before, after] = node.splitText(2);
+        before.insertBefore($createTextNode(''));
+        after.insertAfter($createTextNode(''));
+
+        hasRun[2] = true;
+      }
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+
+      root.append(paragraph);
+      paragraph.append($createTextNode('Foo'));
+    });
+
+    fooListener();
+    megaFooListener();
+    boldFooListener();
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Foo!!</strong></p></div>',
+    );
+  });
+
+  it('text transform runs when node is removed', async () => {
+    init();
+
+    const executeTransform = jest.fn();
+    let hasBeenRemoved = false;
+    const removeListener = editor.registerNodeTransform(TextNode, (node) => {
+      if (hasBeenRemoved) {
+        executeTransform();
+      }
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+      paragraph.append(
+        $createTextNode('Foo').toggleUnmergeable(),
+        $createTextNode('Bar').toggleUnmergeable(),
+      );
+    });
+
+    await editor.update(() => {
+      $getRoot().getLastDescendant()!.remove();
+      hasBeenRemoved = true;
+    });
+
+    expect(executeTransform).toHaveBeenCalledTimes(1);
+
+    removeListener();
+  });
+
+  it('transforms only run on nodes that were explicitly marked as dirty', async () => {
+    init();
+
+    let executeParagraphNodeTransform = () => {
+      return;
+    };
+
+    let executeTextNodeTransform = () => {
+      return;
+    };
+
+    const removeParagraphTransform = editor.registerNodeTransform(
+      ParagraphNode,
+      (node) => {
+        executeParagraphNodeTransform();
+      },
+    );
+    const removeTextNodeTransform = editor.registerNodeTransform(
+      TextNode,
+      (node) => {
+        executeTextNodeTransform();
+      },
+    );
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+      paragraph.append($createTextNode('Foo'));
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = root.getFirstChild() as ParagraphNode;
+      const textNode = paragraph.getFirstChild() as TextNode;
+
+      textNode.getWritable();
+
+      executeParagraphNodeTransform = jest.fn();
+      executeTextNodeTransform = jest.fn();
+    });
+
+    expect(executeParagraphNodeTransform).toHaveBeenCalledTimes(0);
+    expect(executeTextNodeTransform).toHaveBeenCalledTimes(1);
+
+    removeParagraphTransform();
+    removeTextNodeTransform();
+  });
+
+  describe('transforms on siblings', () => {
+    let textNodeKeys: string[];
+    let textTransformCount: number[];
+    let removeTransform: () => void;
+
+    beforeEach(async () => {
+      init();
+
+      textNodeKeys = [];
+      textTransformCount = [];
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph0 = $createParagraphNode();
+        const paragraph1 = $createParagraphNode();
+        const textNodes: Array<LexicalNode> = [];
+
+        for (let i = 0; i < 6; i++) {
+          const node = $createTextNode(String(i)).toggleUnmergeable();
+          textNodes.push(node);
+          textNodeKeys.push(node.getKey());
+          textTransformCount[i] = 0;
+        }
+
+        root.append(paragraph0, paragraph1);
+        paragraph0.append(...textNodes.slice(0, 3));
+        paragraph1.append(...textNodes.slice(3));
+      });
+
+      removeTransform = editor.registerNodeTransform(TextNode, (node) => {
+        textTransformCount[Number(node.__text)]++;
+      });
+    });
+
+    afterEach(() => {
+      removeTransform();
+    });
+
+    it('on remove', async () => {
+      await editor.update(() => {
+        const textNode1 = $getNodeByKey(textNodeKeys[1])!;
+        textNode1.remove();
+      });
+      expect(textTransformCount).toEqual([2, 1, 2, 1, 1, 1]);
+    });
+
+    it('on replace', async () => {
+      await editor.update(() => {
+        const textNode1 = $getNodeByKey(textNodeKeys[1])!;
+        const textNode4 = $getNodeByKey(textNodeKeys[4])!;
+        textNode4.replace(textNode1);
+      });
+      expect(textTransformCount).toEqual([2, 2, 2, 2, 1, 2]);
+    });
+
+    it('on insertBefore', async () => {
+      await editor.update(() => {
+        const textNode1 = $getNodeByKey(textNodeKeys[1])!;
+        const textNode4 = $getNodeByKey(textNodeKeys[4])!;
+        textNode4.insertBefore(textNode1);
+      });
+      expect(textTransformCount).toEqual([2, 2, 2, 2, 2, 1]);
+    });
+
+    it('on insertAfter', async () => {
+      await editor.update(() => {
+        const textNode1 = $getNodeByKey(textNodeKeys[1])!;
+        const textNode4 = $getNodeByKey(textNodeKeys[4])!;
+        textNode4.insertAfter(textNode1);
+      });
+      expect(textTransformCount).toEqual([2, 2, 2, 1, 2, 2]);
+    });
+
+    it('on splitText', async () => {
+      await editor.update(() => {
+        const textNode1 = $getNodeByKey(textNodeKeys[1]) as TextNode;
+        textNode1.setTextContent('67');
+        textNode1.splitText(1);
+        textTransformCount.push(0, 0);
+      });
+      expect(textTransformCount).toEqual([2, 1, 2, 1, 1, 1, 1, 1]);
+    });
+
+    it('on append', async () => {
+      await editor.update(() => {
+        const paragraph1 = $getRoot().getFirstChild() as ParagraphNode;
+        paragraph1.append($createTextNode('6').toggleUnmergeable());
+        textTransformCount.push(0);
+      });
+      expect(textTransformCount).toEqual([1, 1, 2, 1, 1, 1, 1]);
+    });
+  });
+
+  it('Detects infinite recursivity on transforms', async () => {
+    const errorListener = jest.fn();
+    init(errorListener);
+
+    const boldListener = editor.registerNodeTransform(TextNode, (node) => {
+      node.toggleFormat('bold');
+    });
+
+    expect(errorListener).toHaveBeenCalledTimes(0);
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+      paragraph.append($createTextNode('foo'));
+    });
+
+    expect(errorListener).toHaveBeenCalledTimes(1);
+    boldListener();
+  });
+
+  it('Should be able to update an editor state without a root element', () => {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase({element}: {element: HTMLElement | null}) {
+      editor = useMemo(() => createTestEditor(), []);
+
+      useEffect(() => {
+        editor.setRootElement(element);
+      }, [element]);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase element={null} />);
+    });
+    editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const text = $createTextNode('This works!');
+      root.append(paragraph);
+      paragraph.append(text);
+    });
+
+    expect(container.innerHTML).toBe('<div contenteditable="true"></div>');
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase element={ref.current} />);
+    });
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    );
+  });
+
+  it('Should be able to recover from an update error', async () => {
+    const errorListener = jest.fn();
+    init(errorListener);
+    editor.update(() => {
+      const root = $getRoot();
+
+      if (root.getFirstChild() === null) {
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('This works!');
+        root.append(paragraph);
+        paragraph.append(text);
+      }
+    });
+
+    // Wait for update to complete
+    await Promise.resolve().then();
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    );
+    expect(errorListener).toHaveBeenCalledTimes(0);
+
+    editor.update(() => {
+      const root = $getRoot();
+      root
+        .getFirstChild<ElementNode>()!
+        .getFirstChild<ElementNode>()!
+        .getFirstChild<TextNode>()!
+        .setTextContent('Foo');
+    });
+
+    expect(errorListener).toHaveBeenCalledTimes(1);
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    );
+  });
+
+  it('Should be able to handle a change in root element', async () => {
+    const rootListener = jest.fn();
+    const updateListener = jest.fn();
+
+    function TestBase({changeElement}: {changeElement: boolean}) {
+      editor = useMemo(() => createTestEditor(), []);
+
+      useEffect(() => {
+        editor.update(() => {
+          const root = $getRoot();
+          const firstChild = root.getFirstChild() as ParagraphNode | null;
+          const text = changeElement ? 'Change successful' : 'Not changed';
+
+          if (firstChild === null) {
+            const paragraph = $createParagraphNode();
+            const textNode = $createTextNode(text);
+            paragraph.append(textNode);
+            root.append(paragraph);
+          } else {
+            const textNode = firstChild.getFirstChild() as TextNode;
+            textNode.setTextContent(text);
+          }
+        });
+      }, [changeElement]);
+
+      useEffect(() => {
+        return editor.registerRootListener(rootListener);
+      }, []);
+
+      useEffect(() => {
+        return editor.registerUpdateListener(updateListener);
+      }, []);
+
+      const ref = useCallback((node: HTMLElement | null) => {
+        editor.setRootElement(node);
+      }, []);
+
+      return changeElement ? (
+        <span ref={ref} contentEditable={true} />
+      ) : (
+        <div ref={ref} contentEditable={true} />
+      );
+    }
+
+    await ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase changeElement={false} />);
+    });
+
+    expect(container.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">Not changed</span></p></div>',
+    );
+
+    await ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase changeElement={true} />);
+    });
+
+    expect(rootListener).toHaveBeenCalledTimes(3);
+    expect(updateListener).toHaveBeenCalledTimes(3);
+    expect(container.innerHTML).toBe(
+      '<span contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">Change successful</span></p></span>',
+    );
+  });
+
+  for (const editable of [true, false]) {
+    it(`Retains pendingEditor while rootNode is not set (${
+      editable ? 'editable' : 'non-editable'
+    })`, async () => {
+      const JSON_EDITOR_STATE =
+        '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"123","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
+      init();
+      const contentEditable = editor.getRootElement();
+      editor.setEditable(editable);
+      editor.setRootElement(null);
+      const editorState = editor.parseEditorState(JSON_EDITOR_STATE);
+      editor.setEditorState(editorState);
+      editor.update(() => {
+        //
+      });
+      editor.setRootElement(contentEditable);
+      expect(JSON.stringify(editor.getEditorState().toJSON())).toBe(
+        JSON_EDITOR_STATE,
+      );
+    });
+  }
+
+  describe('With node decorators', () => {
+    function useDecorators() {
+      const [decorators, setDecorators] = useState(() =>
+        editor.getDecorators<ReactNode>(),
+      );
+
+      // Subscribe to changes
+      useEffect(() => {
+        return editor.registerDecoratorListener<ReactNode>((nextDecorators) => {
+          setDecorators(nextDecorators);
+        });
+      }, []);
+
+      const decoratedPortals = useMemo(
+        () =>
+          Object.keys(decorators).map((nodeKey) => {
+            const reactDecorator = decorators[nodeKey];
+            const element = editor.getElementByKey(nodeKey)!;
+
+            return createPortal(reactDecorator, element);
+          }),
+        [decorators],
+      );
+
+      return decoratedPortals;
+    }
+
+    afterEach(async () => {
+      // Clean up so we are not calling setState outside of act
+      await ReactTestUtils.act(async () => {
+        reactRoot.render(null);
+        await Promise.resolve().then();
+      });
+    });
+
+    it('Should correctly render React component into Lexical node #1', async () => {
+      const listener = jest.fn();
+
+      function Test() {
+        editor = useMemo(() => createTestEditor(), []);
+
+        useEffect(() => {
+          editor.registerRootListener(listener);
+        }, []);
+
+        const ref = useCallback((node: HTMLDivElement | null) => {
+          editor.setRootElement(node);
+        }, []);
+
+        const decorators = useDecorators();
+
+        return (
+          <>
+            <div ref={ref} contentEditable={true} />
+            {decorators}
+          </>
+        );
+      }
+
+      ReactTestUtils.act(() => {
+        reactRoot.render(<Test />);
+      });
+      // Update the editor with the decorator
+      await ReactTestUtils.act(async () => {
+        await editor.update(() => {
+          const paragraph = $createParagraphNode();
+          const test = $createTestDecoratorNode();
+          paragraph.append(test);
+          $getRoot().append(paragraph);
+        });
+      });
+
+      expect(listener).toHaveBeenCalledTimes(1);
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p>' +
+          '<span data-lexical-decorator="true"><span>Hello world</span></span><br></p></div>',
+      );
+    });
+
+    it('Should correctly render React component into Lexical node #2', async () => {
+      const listener = jest.fn();
+
+      function Test({divKey}: {divKey: number}): JSX.Element {
+        function TestPlugin() {
+          [editor] = useLexicalComposerContext();
+
+          useEffect(() => {
+            return editor.registerRootListener(listener);
+          }, []);
+
+          return null;
+        }
+
+        return (
+          <TestComposer>
+            <RichTextPlugin
+              contentEditable={
+                // @ts-ignore
+                // eslint-disable-next-line jsx-a11y/aria-role
+                <ContentEditable key={divKey} role={null} spellCheck={null} />
+              }
+              placeholder={null}
+              ErrorBoundary={LexicalErrorBoundary}
+            />
+            <TestPlugin />
+          </TestComposer>
+        );
+      }
+
+      await ReactTestUtils.act(async () => {
+        reactRoot.render(<Test divKey={0} />);
+        // Wait for update to complete
+        await Promise.resolve().then();
+      });
+
+      expect(listener).toHaveBeenCalledTimes(1);
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
+      );
+
+      await ReactTestUtils.act(async () => {
+        reactRoot.render(<Test divKey={1} />);
+        // Wait for update to complete
+        await Promise.resolve().then();
+      });
+
+      expect(listener).toHaveBeenCalledTimes(5);
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
+      );
+
+      // Wait for update to complete
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const root = $getRoot();
+        const paragraph = root.getFirstChild()!;
+        expect(root).toEqual({
+          __cachedText: '',
+          __dir: null,
+          __first: paragraph.getKey(),
+          __format: 0,
+          __indent: 0,
+          __key: 'root',
+          __last: paragraph.getKey(),
+          __next: null,
+          __parent: null,
+          __prev: null,
+          __size: 1,
+          __style: '',
+          __type: 'root',
+        });
+        expect(paragraph).toEqual({
+          __dir: null,
+          __first: null,
+          __format: 0,
+          __indent: 0,
+          __key: paragraph.getKey(),
+          __last: null,
+          __next: null,
+          __parent: 'root',
+          __prev: null,
+          __size: 0,
+          __style: '',
+          __textFormat: 0,
+          __textStyle: '',
+          __type: 'paragraph',
+        });
+      });
+    });
+  });
+
+  describe('parseEditorState()', () => {
+    let originalText: TextNode;
+    let parsedParagraph: ParagraphNode;
+    let parsedRoot: RootNode;
+    let parsedText: TextNode;
+    let paragraphKey: string;
+    let textKey: string;
+    let parsedEditorState: EditorState;
+
+    it('exportJSON API - parses parsed JSON', async () => {
+      await update(() => {
+        const paragraph = $createParagraphNode();
+        originalText = $createTextNode('Hello world');
+        originalText.select(6, 11);
+        paragraph.append(originalText);
+        $getRoot().append(paragraph);
+      });
+      const stringifiedEditorState = JSON.stringify(editor.getEditorState());
+      const parsedEditorStateFromObject = editor.parseEditorState(
+        JSON.parse(stringifiedEditorState),
+      );
+      parsedEditorStateFromObject.read(() => {
+        const root = $getRoot();
+        expect(root.getTextContent()).toMatch(/Hello world/);
+      });
+    });
+
+    describe('range selection', () => {
+      beforeEach(async () => {
+        await init();
+
+        await update(() => {
+          const paragraph = $createParagraphNode();
+          originalText = $createTextNode('Hello world');
+          originalText.select(6, 11);
+          paragraph.append(originalText);
+          $getRoot().append(paragraph);
+        });
+        const stringifiedEditorState = JSON.stringify(
+          editor.getEditorState().toJSON(),
+        );
+        parsedEditorState = editor.parseEditorState(stringifiedEditorState);
+        parsedEditorState.read(() => {
+          parsedRoot = $getRoot();
+          parsedParagraph = parsedRoot.getFirstChild() as ParagraphNode;
+          paragraphKey = parsedParagraph.getKey();
+          parsedText = parsedParagraph.getFirstChild() as TextNode;
+          textKey = parsedText.getKey();
+        });
+      });
+
+      it('Parses the nodes of a stringified editor state', async () => {
+        expect(parsedRoot).toEqual({
+          __cachedText: null,
+          __dir: 'ltr',
+          __first: paragraphKey,
+          __format: 0,
+          __indent: 0,
+          __key: 'root',
+          __last: paragraphKey,
+          __next: null,
+          __parent: null,
+          __prev: null,
+          __size: 1,
+          __style: '',
+          __type: 'root',
+        });
+        expect(parsedParagraph).toEqual({
+          __dir: 'ltr',
+          __first: textKey,
+          __format: 0,
+          __indent: 0,
+          __key: paragraphKey,
+          __last: textKey,
+          __next: null,
+          __parent: 'root',
+          __prev: null,
+          __size: 1,
+          __style: '',
+          __textFormat: 0,
+          __textStyle: '',
+          __type: 'paragraph',
+        });
+        expect(parsedText).toEqual({
+          __detail: 0,
+          __format: 0,
+          __key: textKey,
+          __mode: 0,
+          __next: null,
+          __parent: paragraphKey,
+          __prev: null,
+          __style: '',
+          __text: 'Hello world',
+          __type: 'text',
+        });
+      });
+
+      it('Parses the text content of the editor state', async () => {
+        expect(parsedEditorState.read(() => $getRoot().__cachedText)).toBe(
+          null,
+        );
+        expect(parsedEditorState.read(() => $getRoot().getTextContent())).toBe(
+          'Hello world',
+        );
+      });
+    });
+
+    describe('node selection', () => {
+      beforeEach(async () => {
+        init();
+
+        await update(() => {
+          const paragraph = $createParagraphNode();
+          originalText = $createTextNode('Hello world');
+          const selection = $createNodeSelection();
+          selection.add(originalText.getKey());
+          $setSelection(selection);
+          paragraph.append(originalText);
+          $getRoot().append(paragraph);
+        });
+        const stringifiedEditorState = JSON.stringify(
+          editor.getEditorState().toJSON(),
+        );
+        parsedEditorState = editor.parseEditorState(stringifiedEditorState);
+        parsedEditorState.read(() => {
+          parsedRoot = $getRoot();
+          parsedParagraph = parsedRoot.getFirstChild() as ParagraphNode;
+          paragraphKey = parsedParagraph.getKey();
+          parsedText = parsedParagraph.getFirstChild() as TextNode;
+          textKey = parsedText.getKey();
+        });
+      });
+
+      it('Parses the nodes of a stringified editor state', async () => {
+        expect(parsedRoot).toEqual({
+          __cachedText: null,
+          __dir: 'ltr',
+          __first: paragraphKey,
+          __format: 0,
+          __indent: 0,
+          __key: 'root',
+          __last: paragraphKey,
+          __next: null,
+          __parent: null,
+          __prev: null,
+          __size: 1,
+          __style: '',
+          __type: 'root',
+        });
+        expect(parsedParagraph).toEqual({
+          __dir: 'ltr',
+          __first: textKey,
+          __format: 0,
+          __indent: 0,
+          __key: paragraphKey,
+          __last: textKey,
+          __next: null,
+          __parent: 'root',
+          __prev: null,
+          __size: 1,
+          __style: '',
+          __textFormat: 0,
+          __textStyle: '',
+          __type: 'paragraph',
+        });
+        expect(parsedText).toEqual({
+          __detail: 0,
+          __format: 0,
+          __key: textKey,
+          __mode: 0,
+          __next: null,
+          __parent: paragraphKey,
+          __prev: null,
+          __style: '',
+          __text: 'Hello world',
+          __type: 'text',
+        });
+      });
+
+      it('Parses the text content of the editor state', async () => {
+        expect(parsedEditorState.read(() => $getRoot().__cachedText)).toBe(
+          null,
+        );
+        expect(parsedEditorState.read(() => $getRoot().getTextContent())).toBe(
+          'Hello world',
+        );
+      });
+    });
+  });
+
+  describe('$parseSerializedNode()', () => {
+    it('parses serialized nodes', async () => {
+      const expectedTextContent = 'Hello world\n\nHello world';
+      let actualTextContent: string;
+      let root: RootNode;
+      await update(() => {
+        root = $getRoot();
+        root.clear();
+        const paragraph = $createParagraphNode();
+        paragraph.append($createTextNode('Hello world'));
+        root.append(paragraph);
+      });
+      const stringifiedEditorState = JSON.stringify(editor.getEditorState());
+      const parsedEditorStateJson = JSON.parse(stringifiedEditorState);
+      const rootJson = parsedEditorStateJson.root;
+      await update(() => {
+        const children = rootJson.children.map($parseSerializedNode);
+        root = $getRoot();
+        root.append(...children);
+        actualTextContent = root.getTextContent();
+      });
+      expect(actualTextContent!).toEqual(expectedTextContent);
+    });
+  });
+
+  describe('Node children', () => {
+    beforeEach(async () => {
+      init();
+
+      await reset();
+    });
+
+    async function reset() {
+      init();
+
+      await update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+      });
+    }
+
+    it('moves node to different tree branches', async () => {
+      function $createElementNodeWithText(text: string) {
+        const elementNode = $createTestElementNode();
+        const textNode = $createTextNode(text);
+        elementNode.append(textNode);
+
+        return [elementNode, textNode];
+      }
+
+      let paragraphNodeKey: string;
+      let elementNode1Key: string;
+      let textNode1Key: string;
+      let elementNode2Key: string;
+      let textNode2Key: string;
+
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+        paragraphNodeKey = paragraph.getKey();
+
+        const [elementNode1, textNode1] = $createElementNodeWithText('A');
+        elementNode1Key = elementNode1.getKey();
+        textNode1Key = textNode1.getKey();
+
+        const [elementNode2, textNode2] = $createElementNodeWithText('B');
+        elementNode2Key = elementNode2.getKey();
+        textNode2Key = textNode2.getKey();
+
+        paragraph.append(elementNode1, elementNode2);
+      });
+
+      await update(() => {
+        const elementNode1 = $getNodeByKey(elementNode1Key) as ElementNode;
+        const elementNode2 = $getNodeByKey(elementNode2Key) as TextNode;
+        elementNode1.append(elementNode2);
+      });
+      const keys = [
+        paragraphNodeKey!,
+        elementNode1Key!,
+        textNode1Key!,
+        elementNode2Key!,
+        textNode2Key!,
+      ];
+
+      for (let i = 0; i < keys.length; i++) {
+        expect(editor._editorState._nodeMap.has(keys[i])).toBe(true);
+        expect(editor._keyToDOMMap.has(keys[i])).toBe(true);
+      }
+
+      expect(editor._editorState._nodeMap.size).toBe(keys.length + 1); // + root
+      expect(editor._keyToDOMMap.size).toBe(keys.length + 1); // + root
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">A</span><div dir="ltr"><span data-lexical-text="true">B</span></div></div></p></div>',
+      );
+    });
+
+    it('moves node to different tree branches (inverse)', async () => {
+      function $createElementNodeWithText(text: string) {
+        const elementNode = $createTestElementNode();
+        const textNode = $createTextNode(text);
+        elementNode.append(textNode);
+
+        return elementNode;
+      }
+
+      let elementNode1Key: string;
+      let elementNode2Key: string;
+
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+
+        const elementNode1 = $createElementNodeWithText('A');
+        elementNode1Key = elementNode1.getKey();
+
+        const elementNode2 = $createElementNodeWithText('B');
+        elementNode2Key = elementNode2.getKey();
+
+        paragraph.append(elementNode1, elementNode2);
+      });
+
+      await update(() => {
+        const elementNode1 = $getNodeByKey(elementNode1Key) as TextNode;
+        const elementNode2 = $getNodeByKey(elementNode2Key) as ElementNode;
+        elementNode2.append(elementNode1);
+      });
+
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">B</span><div dir="ltr"><span data-lexical-text="true">A</span></div></div></p></div>',
+      );
+    });
+
+    it('moves node to different tree branches (node appended twice in two different branches)', async () => {
+      function $createElementNodeWithText(text: string) {
+        const elementNode = $createTestElementNode();
+        const textNode = $createTextNode(text);
+        elementNode.append(textNode);
+
+        return elementNode;
+      }
+
+      let elementNode1Key: string;
+      let elementNode2Key: string;
+      let elementNode3Key: string;
+
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+
+        const elementNode1 = $createElementNodeWithText('A');
+        elementNode1Key = elementNode1.getKey();
+
+        const elementNode2 = $createElementNodeWithText('B');
+        elementNode2Key = elementNode2.getKey();
+
+        const elementNode3 = $createElementNodeWithText('C');
+        elementNode3Key = elementNode3.getKey();
+
+        paragraph.append(elementNode1, elementNode2, elementNode3);
+      });
+
+      await update(() => {
+        const elementNode1 = $getNodeByKey(elementNode1Key) as ElementNode;
+        const elementNode2 = $getNodeByKey(elementNode2Key) as ElementNode;
+        const elementNode3 = $getNodeByKey(elementNode3Key) as TextNode;
+        elementNode2.append(elementNode3);
+        elementNode1.append(elementNode3);
+      });
+
+      expect(container.innerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">A</span><div dir="ltr"><span data-lexical-text="true">C</span></div></div><div dir="ltr"><span data-lexical-text="true">B</span></div></p></div>',
+      );
+    });
+  });
+
+  it('can subscribe and unsubscribe from commands and the callback is fired', () => {
+    init();
+
+    const commandListener = jest.fn();
+    const command = createCommand('TEST_COMMAND');
+    const payload = 'testPayload';
+    const removeCommandListener = editor.registerCommand(
+      command,
+      commandListener,
+      COMMAND_PRIORITY_EDITOR,
+    );
+    editor.dispatchCommand(command, payload);
+    editor.dispatchCommand(command, payload);
+    editor.dispatchCommand(command, payload);
+
+    expect(commandListener).toHaveBeenCalledTimes(3);
+    expect(commandListener).toHaveBeenCalledWith(payload, editor);
+
+    removeCommandListener();
+
+    editor.dispatchCommand(command, payload);
+    editor.dispatchCommand(command, payload);
+    editor.dispatchCommand(command, payload);
+
+    expect(commandListener).toHaveBeenCalledTimes(3);
+    expect(commandListener).toHaveBeenCalledWith(payload, editor);
+  });
+
+  it('removes the command from the command map when no listener are attached', () => {
+    init();
+
+    const commandListener = jest.fn();
+    const commandListenerTwo = jest.fn();
+    const command = createCommand('TEST_COMMAND');
+    const removeCommandListener = editor.registerCommand(
+      command,
+      commandListener,
+      COMMAND_PRIORITY_EDITOR,
+    );
+    const removeCommandListenerTwo = editor.registerCommand(
+      command,
+      commandListenerTwo,
+      COMMAND_PRIORITY_EDITOR,
+    );
+
+    expect(editor._commands).toEqual(
+      new Map([
+        [
+          command,
+          [
+            new Set([commandListener, commandListenerTwo]),
+            new Set(),
+            new Set(),
+            new Set(),
+            new Set(),
+          ],
+        ],
+      ]),
+    );
+
+    removeCommandListener();
+
+    expect(editor._commands).toEqual(
+      new Map([
+        [
+          command,
+          [
+            new Set([commandListenerTwo]),
+            new Set(),
+            new Set(),
+            new Set(),
+            new Set(),
+          ],
+        ],
+      ]),
+    );
+
+    removeCommandListenerTwo();
+
+    expect(editor._commands).toEqual(new Map());
+  });
+
+  it('can register transforms before updates', async () => {
+    init();
+
+    const emptyTransform = () => {
+      return;
+    };
+
+    const removeTextTransform = editor.registerNodeTransform(
+      TextNode,
+      emptyTransform,
+    );
+    const removeParagraphTransform = editor.registerNodeTransform(
+      ParagraphNode,
+      emptyTransform,
+    );
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+    });
+
+    removeTextTransform();
+    removeParagraphTransform();
+  });
+
+  it('textcontent listener', async () => {
+    init();
+
+    const fn = jest.fn();
+    editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode = $createTextNode('foo');
+      root.append(paragraph);
+      paragraph.append(textNode);
+    });
+    editor.registerTextContentListener((text) => {
+      fn(text);
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const child = root.getLastDescendant()!;
+      child.insertAfter($createTextNode('bar'));
+    });
+
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(fn).toHaveBeenCalledWith('foobar');
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const child = root.getLastDescendant()!;
+      child.insertAfter($createLineBreakNode());
+    });
+
+    expect(fn).toHaveBeenCalledTimes(2);
+    expect(fn).toHaveBeenCalledWith('foobar\n');
+
+    await editor.update(() => {
+      const root = $getRoot();
+      root.clear();
+      const paragraph = $createParagraphNode();
+      const paragraph2 = $createParagraphNode();
+      root.append(paragraph);
+      paragraph.append($createTextNode('bar'));
+      paragraph2.append($createTextNode('yar'));
+      paragraph.insertAfter(paragraph2);
+    });
+
+    expect(fn).toHaveBeenCalledTimes(3);
+    expect(fn).toHaveBeenCalledWith('bar\n\nyar');
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const paragraph2 = $createParagraphNode();
+      root.getLastChild()!.insertAfter(paragraph);
+      paragraph.append($createTextNode('bar2'));
+      paragraph2.append($createTextNode('yar2'));
+      paragraph.insertAfter(paragraph2);
+    });
+
+    expect(fn).toHaveBeenCalledTimes(4);
+    expect(fn).toHaveBeenCalledWith('bar\n\nyar\n\nbar2\n\nyar2');
+  });
+
+  it('mutation listener', async () => {
+    init();
+
+    const paragraphNodeMutations = jest.fn();
+    const textNodeMutations = jest.fn();
+    editor.registerMutationListener(ParagraphNode, paragraphNodeMutations, {
+      skipInitialization: false,
+    });
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    const paragraphKeys: string[] = [];
+    const textNodeKeys: string[] = [];
+
+    // No await intentional (batch with next)
+    editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode = $createTextNode('foo');
+      root.append(paragraph);
+      paragraph.append(textNode);
+      paragraphKeys.push(paragraph.getKey());
+      textNodeKeys.push(textNode.getKey());
+    });
+
+    await editor.update(() => {
+      const textNode = $getNodeByKey(textNodeKeys[0]) as TextNode;
+      const textNode2 = $createTextNode('bar').toggleFormat('bold');
+      const textNode3 = $createTextNode('xyz').toggleFormat('italic');
+      textNode.insertAfter(textNode2);
+      textNode2.insertAfter(textNode3);
+      textNodeKeys.push(textNode2.getKey());
+      textNodeKeys.push(textNode3.getKey());
+    });
+
+    await editor.update(() => {
+      $getRoot().clear();
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+
+      paragraphKeys.push(paragraph.getKey());
+
+      // Created and deleted in the same update (not attached to node)
+      textNodeKeys.push($createTextNode('zzz').getKey());
+      root.append(paragraph);
+    });
+
+    expect(paragraphNodeMutations.mock.calls.length).toBe(3);
+    expect(textNodeMutations.mock.calls.length).toBe(2);
+
+    const [paragraphMutation1, paragraphMutation2, paragraphMutation3] =
+      paragraphNodeMutations.mock.calls;
+    const [textNodeMutation1, textNodeMutation2] = textNodeMutations.mock.calls;
+
+    expect(paragraphMutation1[0].size).toBe(1);
+    expect(paragraphMutation1[0].get(paragraphKeys[0])).toBe('created');
+    expect(paragraphMutation1[0].size).toBe(1);
+    expect(paragraphMutation2[0].get(paragraphKeys[0])).toBe('destroyed');
+    expect(paragraphMutation3[0].size).toBe(1);
+    expect(paragraphMutation3[0].get(paragraphKeys[1])).toBe('created');
+    expect(textNodeMutation1[0].size).toBe(3);
+    expect(textNodeMutation1[0].get(textNodeKeys[0])).toBe('created');
+    expect(textNodeMutation1[0].get(textNodeKeys[1])).toBe('created');
+    expect(textNodeMutation1[0].get(textNodeKeys[2])).toBe('created');
+    expect(textNodeMutation2[0].size).toBe(3);
+    expect(textNodeMutation2[0].get(textNodeKeys[0])).toBe('destroyed');
+    expect(textNodeMutation2[0].get(textNodeKeys[1])).toBe('destroyed');
+    expect(textNodeMutation2[0].get(textNodeKeys[2])).toBe('destroyed');
+  });
+  it('mutation listener on newly initialized editor', async () => {
+    editor = createEditor();
+    const textNodeMutations = jest.fn();
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    expect(textNodeMutations.mock.calls.length).toBe(0);
+  });
+  it('mutation listener with setEditorState', async () => {
+    init();
+
+    await editor.update(() => {
+      $getRoot().append($createParagraphNode());
+    });
+
+    const initialEditorState = editor.getEditorState();
+    const textNodeMutations = jest.fn();
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    const textNodeKeys: string[] = [];
+
+    await editor.update(() => {
+      const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+      const textNode1 = $createTextNode('foo');
+      paragraph.append(textNode1);
+      textNodeKeys.push(textNode1.getKey());
+    });
+
+    const fooEditorState = editor.getEditorState();
+
+    await editor.setEditorState(initialEditorState);
+    // This line should have no effect on the mutation listeners
+    const parsedFooEditorState = editor.parseEditorState(
+      JSON.stringify(fooEditorState),
+    );
+
+    await editor.update(() => {
+      const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+      const textNode2 = $createTextNode('bar').toggleFormat('bold');
+      const textNode3 = $createTextNode('xyz').toggleFormat('italic');
+      paragraph.append(textNode2, textNode3);
+      textNodeKeys.push(textNode2.getKey(), textNode3.getKey());
+    });
+
+    await editor.setEditorState(parsedFooEditorState);
+
+    expect(textNodeMutations.mock.calls.length).toBe(4);
+
+    const [
+      textNodeMutation1,
+      textNodeMutation2,
+      textNodeMutation3,
+      textNodeMutation4,
+    ] = textNodeMutations.mock.calls;
+
+    expect(textNodeMutation1[0].size).toBe(1);
+    expect(textNodeMutation1[0].get(textNodeKeys[0])).toBe('created');
+    expect(textNodeMutation2[0].size).toBe(1);
+    expect(textNodeMutation2[0].get(textNodeKeys[0])).toBe('destroyed');
+    expect(textNodeMutation3[0].size).toBe(2);
+    expect(textNodeMutation3[0].get(textNodeKeys[1])).toBe('created');
+    expect(textNodeMutation3[0].get(textNodeKeys[2])).toBe('created');
+    expect(textNodeMutation4[0].size).toBe(3); // +1 newly generated key by parseEditorState
+    expect(textNodeMutation4[0].get(textNodeKeys[1])).toBe('destroyed');
+    expect(textNodeMutation4[0].get(textNodeKeys[2])).toBe('destroyed');
+  });
+
+  it('mutation listener set for original node should work with the replaced node', async () => {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref, undefined, [
+        TestTextNode,
+        {
+          replace: TextNode,
+          with: (node: TextNode) => new TestTextNode(node.getTextContent()),
+          withKlass: TestTextNode,
+        },
+      ]);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase />);
+    });
+
+    const textNodeMutations = jest.fn();
+    const textNodeMutationsB = jest.fn();
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    const textNodeKeys: string[] = [];
+
+    // No await intentional (batch with next)
+    editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode = $createTextNode('foo');
+      root.append(paragraph);
+      paragraph.append(textNode);
+      textNodeKeys.push(textNode.getKey());
+    });
+
+    await editor.update(() => {
+      const textNode = $getNodeByKey(textNodeKeys[0]) as TextNode;
+      const textNode2 = $createTextNode('bar').toggleFormat('bold');
+      const textNode3 = $createTextNode('xyz').toggleFormat('italic');
+      textNode.insertAfter(textNode2);
+      textNode2.insertAfter(textNode3);
+      textNodeKeys.push(textNode2.getKey());
+      textNodeKeys.push(textNode3.getKey());
+    });
+
+    editor.registerMutationListener(TextNode, textNodeMutationsB, {
+      skipInitialization: false,
+    });
+
+    await editor.update(() => {
+      $getRoot().clear();
+    });
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+
+      // Created and deleted in the same update (not attached to node)
+      textNodeKeys.push($createTextNode('zzz').getKey());
+      root.append(paragraph);
+    });
+
+    expect(textNodeMutations.mock.calls.length).toBe(2);
+    expect(textNodeMutationsB.mock.calls.length).toBe(2);
+
+    const [textNodeMutation1, textNodeMutation2] = textNodeMutations.mock.calls;
+
+    expect(textNodeMutation1[0].size).toBe(3);
+    expect(textNodeMutation1[0].get(textNodeKeys[0])).toBe('created');
+    expect(textNodeMutation1[0].get(textNodeKeys[1])).toBe('created');
+    expect(textNodeMutation1[0].get(textNodeKeys[2])).toBe('created');
+    expect([...textNodeMutation1[1].updateTags]).toEqual([]);
+    expect(textNodeMutation2[0].size).toBe(3);
+    expect(textNodeMutation2[0].get(textNodeKeys[0])).toBe('destroyed');
+    expect(textNodeMutation2[0].get(textNodeKeys[1])).toBe('destroyed');
+    expect(textNodeMutation2[0].get(textNodeKeys[2])).toBe('destroyed');
+    expect([...textNodeMutation2[1].updateTags]).toEqual([]);
+
+    const [textNodeMutationB1, textNodeMutationB2] =
+      textNodeMutationsB.mock.calls;
+
+    expect(textNodeMutationB1[0].size).toBe(3);
+    expect(textNodeMutationB1[0].get(textNodeKeys[0])).toBe('created');
+    expect(textNodeMutationB1[0].get(textNodeKeys[1])).toBe('created');
+    expect(textNodeMutationB1[0].get(textNodeKeys[2])).toBe('created');
+    expect([...textNodeMutationB1[1].updateTags]).toEqual([
+      'registerMutationListener',
+    ]);
+    expect(textNodeMutationB2[0].size).toBe(3);
+    expect(textNodeMutationB2[0].get(textNodeKeys[0])).toBe('destroyed');
+    expect(textNodeMutationB2[0].get(textNodeKeys[1])).toBe('destroyed');
+    expect(textNodeMutationB2[0].get(textNodeKeys[2])).toBe('destroyed');
+    expect([...textNodeMutationB2[1].updateTags]).toEqual([]);
+  });
+
+  it('mutation listener should work with the replaced node', async () => {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref, undefined, [
+        TestTextNode,
+        {
+          replace: TextNode,
+          with: (node: TextNode) => new TestTextNode(node.getTextContent()),
+          withKlass: TestTextNode,
+        },
+      ]);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase />);
+    });
+
+    const textNodeMutations = jest.fn();
+    const textNodeMutationsB = jest.fn();
+    editor.registerMutationListener(TestTextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    const textNodeKeys: string[] = [];
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode = $createTextNode('foo');
+      root.append(paragraph);
+      paragraph.append(textNode);
+      textNodeKeys.push(textNode.getKey());
+    });
+
+    editor.registerMutationListener(TestTextNode, textNodeMutationsB, {
+      skipInitialization: false,
+    });
+
+    expect(textNodeMutations.mock.calls.length).toBe(1);
+
+    const [textNodeMutation1] = textNodeMutations.mock.calls;
+
+    expect(textNodeMutation1[0].size).toBe(1);
+    expect(textNodeMutation1[0].get(textNodeKeys[0])).toBe('created');
+    expect([...textNodeMutation1[1].updateTags]).toEqual([]);
+
+    const [textNodeMutationB1] = textNodeMutationsB.mock.calls;
+
+    expect(textNodeMutationB1[0].size).toBe(1);
+    expect(textNodeMutationB1[0].get(textNodeKeys[0])).toBe('created');
+    expect([...textNodeMutationB1[1].updateTags]).toEqual([
+      'registerMutationListener',
+    ]);
+  });
+
+  it('mutation listeners does not trigger when other node types are mutated', async () => {
+    init();
+
+    const paragraphNodeMutations = jest.fn();
+    const textNodeMutations = jest.fn();
+    editor.registerMutationListener(ParagraphNode, paragraphNodeMutations, {
+      skipInitialization: false,
+    });
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+
+    await editor.update(() => {
+      $getRoot().append($createParagraphNode());
+    });
+
+    expect(paragraphNodeMutations.mock.calls.length).toBe(1);
+    expect(textNodeMutations.mock.calls.length).toBe(0);
+  });
+
+  it('mutation listeners with normalization', async () => {
+    init();
+
+    const textNodeMutations = jest.fn();
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+    const textNodeKeys: string[] = [];
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode1 = $createTextNode('foo');
+      const textNode2 = $createTextNode('bar');
+
+      textNodeKeys.push(textNode1.getKey(), textNode2.getKey());
+      root.append(paragraph);
+      paragraph.append(textNode1, textNode2);
+    });
+
+    await editor.update(() => {
+      const paragraph = $getRoot().getFirstChild() as ParagraphNode;
+      const textNode3 = $createTextNode('xyz').toggleFormat('bold');
+      paragraph.append(textNode3);
+      textNodeKeys.push(textNode3.getKey());
+    });
+
+    await editor.update(() => {
+      const textNode3 = $getNodeByKey(textNodeKeys[2]) as TextNode;
+      textNode3.toggleFormat('bold'); // Normalize with foobar
+    });
+
+    expect(textNodeMutations.mock.calls.length).toBe(3);
+
+    const [textNodeMutation1, textNodeMutation2, textNodeMutation3] =
+      textNodeMutations.mock.calls;
+
+    expect(textNodeMutation1[0].size).toBe(1);
+    expect(textNodeMutation1[0].get(textNodeKeys[0])).toBe('created');
+    expect(textNodeMutation2[0].size).toBe(2);
+    expect(textNodeMutation2[0].get(textNodeKeys[2])).toBe('created');
+    expect(textNodeMutation3[0].size).toBe(2);
+    expect(textNodeMutation3[0].get(textNodeKeys[0])).toBe('updated');
+    expect(textNodeMutation3[0].get(textNodeKeys[2])).toBe('destroyed');
+  });
+
+  it('mutation "update" listener', async () => {
+    init();
+
+    const paragraphNodeMutations = jest.fn();
+    const textNodeMutations = jest.fn();
+
+    editor.registerMutationListener(ParagraphNode, paragraphNodeMutations, {
+      skipInitialization: false,
+    });
+    editor.registerMutationListener(TextNode, textNodeMutations, {
+      skipInitialization: false,
+    });
+
+    const paragraphNodeKeys: string[] = [];
+    const textNodeKeys: string[] = [];
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const paragraph = $createParagraphNode();
+      const textNode1 = $createTextNode('foo');
+      textNodeKeys.push(textNode1.getKey());
+      paragraphNodeKeys.push(paragraph.getKey());
+      root.append(paragraph);
+      paragraph.append(textNode1);
+    });
+
+    expect(paragraphNodeMutations.mock.calls.length).toBe(1);
+
+    const [paragraphNodeMutation1] = paragraphNodeMutations.mock.calls;
+    expect(textNodeMutations.mock.calls.length).toBe(1);
+
+    const [textNodeMutation1] = textNodeMutations.mock.calls;
+
+    expect(textNodeMutation1[0].size).toBe(1);
+    expect(paragraphNodeMutation1[0].size).toBe(1);
+
+    // Change first text node's content.
+    await editor.update(() => {
+      const textNode1 = $getNodeByKey(textNodeKeys[0]) as TextNode;
+      textNode1.setTextContent('Test'); // Normalize with foobar
+    });
+
+    // Append text node to paragraph.
+    await editor.update(() => {
+      const paragraphNode1 = $getNodeByKey(
+        paragraphNodeKeys[0],
+      ) as ParagraphNode;
+      const textNode1 = $createTextNode('foo');
+      paragraphNode1.append(textNode1);
+    });
+
+    expect(textNodeMutations.mock.calls.length).toBe(3);
+
+    const textNodeMutation2 = textNodeMutations.mock.calls[1];
+
+    // Show TextNode was updated when text content changed.
+    expect(textNodeMutation2[0].get(textNodeKeys[0])).toBe('updated');
+    expect(paragraphNodeMutations.mock.calls.length).toBe(2);
+
+    const paragraphNodeMutation2 = paragraphNodeMutations.mock.calls[1];
+
+    // Show ParagraphNode was updated when new text node was appended.
+    expect(paragraphNodeMutation2[0].get(paragraphNodeKeys[0])).toBe('updated');
+
+    let tableCellKey: string;
+    let tableRowKey: string;
+
+    const tableCellMutations = jest.fn();
+    const tableRowMutations = jest.fn();
+
+    editor.registerMutationListener(TableCellNode, tableCellMutations, {
+      skipInitialization: false,
+    });
+    editor.registerMutationListener(TableRowNode, tableRowMutations, {
+      skipInitialization: false,
+    });
+    // Create Table
+
+    await editor.update(() => {
+      const root = $getRoot();
+      const tableCell = $createTableCellNode(0);
+      const tableRow = $createTableRowNode();
+      const table = $createTableNode();
+
+      tableRow.append(tableCell);
+      table.append(tableRow);
+      root.append(table);
+
+      tableRowKey = tableRow.getKey();
+      tableCellKey = tableCell.getKey();
+    });
+    // Add New Table Cell To Row
+
+    await editor.update(() => {
+      const tableRow = $getNodeByKey(tableRowKey) as TableRowNode;
+      const tableCell = $createTableCellNode(0);
+      tableRow.append(tableCell);
+    });
+
+    // Update Table Cell
+    await editor.update(() => {
+      const tableCell = $getNodeByKey(tableCellKey) as TableCellNode;
+      tableCell.toggleHeaderStyle(1);
+    });
+
+    expect(tableCellMutations.mock.calls.length).toBe(3);
+    const tableCellMutation3 = tableCellMutations.mock.calls[2];
+
+    // Show table cell is updated when header value changes.
+    expect(tableCellMutation3[0].get(tableCellKey!)).toBe('updated');
+    expect(tableRowMutations.mock.calls.length).toBe(2);
+
+    const tableRowMutation2 = tableRowMutations.mock.calls[1];
+
+    // Show row is updated when a new child is added.
+    expect(tableRowMutation2[0].get(tableRowKey!)).toBe('updated');
+  });
+
+  it('editable listener', () => {
+    init();
+
+    const editableFn = jest.fn();
+    editor.registerEditableListener(editableFn);
+
+    expect(editor.isEditable()).toBe(true);
+
+    editor.setEditable(false);
+
+    expect(editor.isEditable()).toBe(false);
+
+    editor.setEditable(true);
+
+    expect(editableFn.mock.calls).toEqual([[false], [true]]);
+  });
+
+  it('does not add new listeners while triggering existing', async () => {
+    const updateListener = jest.fn();
+    const mutationListener = jest.fn();
+    const nodeTransformListener = jest.fn();
+    const textContentListener = jest.fn();
+    const editableListener = jest.fn();
+    const commandListener = jest.fn();
+    const TEST_COMMAND = createCommand('TEST_COMMAND');
+
+    init();
+
+    editor.registerUpdateListener(() => {
+      updateListener();
+
+      editor.registerUpdateListener(() => {
+        updateListener();
+      });
+    });
+
+    editor.registerMutationListener(
+      TextNode,
+      (map) => {
+        mutationListener();
+        editor.registerMutationListener(
+          TextNode,
+          () => {
+            mutationListener();
+          },
+          {skipInitialization: true},
+        );
+      },
+      {skipInitialization: false},
+    );
+
+    editor.registerNodeTransform(ParagraphNode, () => {
+      nodeTransformListener();
+      editor.registerNodeTransform(ParagraphNode, () => {
+        nodeTransformListener();
+      });
+    });
+
+    editor.registerEditableListener(() => {
+      editableListener();
+      editor.registerEditableListener(() => {
+        editableListener();
+      });
+    });
+
+    editor.registerTextContentListener(() => {
+      textContentListener();
+      editor.registerTextContentListener(() => {
+        textContentListener();
+      });
+    });
+
+    editor.registerCommand(
+      TEST_COMMAND,
+      (): boolean => {
+        commandListener();
+        editor.registerCommand(
+          TEST_COMMAND,
+          commandListener,
+          COMMAND_PRIORITY_LOW,
+        );
+        return false;
+      },
+      COMMAND_PRIORITY_LOW,
+    );
+
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Hello world')),
+      );
+    });
+
+    editor.dispatchCommand(TEST_COMMAND, false);
+
+    editor.setEditable(false);
+
+    expect(updateListener).toHaveBeenCalledTimes(1);
+    expect(editableListener).toHaveBeenCalledTimes(1);
+    expect(commandListener).toHaveBeenCalledTimes(1);
+    expect(textContentListener).toHaveBeenCalledTimes(1);
+    expect(nodeTransformListener).toHaveBeenCalledTimes(1);
+    expect(mutationListener).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls mutation listener with initial state', async () => {
+    // TODO add tests for node replacement
+    const mutationListenerA = jest.fn();
+    const mutationListenerB = jest.fn();
+    const mutationListenerC = jest.fn();
+    init();
+
+    editor.registerMutationListener(TextNode, mutationListenerA, {
+      skipInitialization: false,
+    });
+    expect(mutationListenerA).toHaveBeenCalledTimes(0);
+
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Hello world')),
+      );
+    });
+
+    function asymmetricMatcher<T>(asymmetricMatch: (x: T) => boolean) {
+      return {asymmetricMatch};
+    }
+
+    expect(mutationListenerA).toHaveBeenCalledTimes(1);
+    expect(mutationListenerA).toHaveBeenLastCalledWith(
+      expect.anything(),
+      expect.objectContaining({
+        updateTags: asymmetricMatcher(
+          (s: Set<string>) => !s.has('registerMutationListener'),
+        ),
+      }),
+    );
+    editor.registerMutationListener(TextNode, mutationListenerB, {
+      skipInitialization: false,
+    });
+    editor.registerMutationListener(TextNode, mutationListenerC, {
+      skipInitialization: true,
+    });
+    expect(mutationListenerA).toHaveBeenCalledTimes(1);
+    expect(mutationListenerB).toHaveBeenCalledTimes(1);
+    expect(mutationListenerB).toHaveBeenLastCalledWith(
+      expect.anything(),
+      expect.objectContaining({
+        updateTags: asymmetricMatcher((s: Set<string>) =>
+          s.has('registerMutationListener'),
+        ),
+      }),
+    );
+    expect(mutationListenerC).toHaveBeenCalledTimes(0);
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Another update!')),
+      );
+    });
+    expect(mutationListenerA).toHaveBeenCalledTimes(2);
+    expect(mutationListenerB).toHaveBeenCalledTimes(2);
+    expect(mutationListenerC).toHaveBeenCalledTimes(1);
+    [mutationListenerA, mutationListenerB, mutationListenerC].forEach((fn) => {
+      expect(fn).toHaveBeenLastCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          updateTags: asymmetricMatcher(
+            (s: Set<string>) => !s.has('registerMutationListener'),
+          ),
+        }),
+      );
+    });
+  });
+
+  it('can use discrete for synchronous updates', () => {
+    init();
+    const onUpdate = jest.fn();
+    editor.registerUpdateListener(onUpdate);
+    editor.update(
+      () => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('Sync update')),
+        );
+      },
+      {
+        discrete: true,
+      },
+    );
+
+    const textContent = editor
+      .getEditorState()
+      .read(() => $getRoot().getTextContent());
+    expect(textContent).toBe('Sync update');
+    expect(onUpdate).toHaveBeenCalledTimes(1);
+  });
+
+  it('can use discrete after a non-discrete update to flush the entire queue', () => {
+    const headless = createTestHeadlessEditor();
+    const onUpdate = jest.fn();
+    headless.registerUpdateListener(onUpdate);
+    headless.update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Async update')),
+      );
+    });
+    headless.update(
+      () => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('Sync update')),
+        );
+      },
+      {
+        discrete: true,
+      },
+    );
+
+    const textContent = headless
+      .getEditorState()
+      .read(() => $getRoot().getTextContent());
+    expect(textContent).toBe('Async update\n\nSync update');
+    expect(onUpdate).toHaveBeenCalledTimes(1);
+  });
+
+  it('can use discrete after a non-discrete setEditorState to flush the entire queue', () => {
+    init();
+    editor.update(
+      () => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('Async update')),
+        );
+      },
+      {
+        discrete: true,
+      },
+    );
+
+    const headless = createTestHeadlessEditor(editor.getEditorState());
+    headless.update(
+      () => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('Sync update')),
+        );
+      },
+      {
+        discrete: true,
+      },
+    );
+    const textContent = headless
+      .getEditorState()
+      .read(() => $getRoot().getTextContent());
+    expect(textContent).toBe('Async update\n\nSync update');
+  });
+
+  it('can use discrete in a nested update to flush the entire queue', () => {
+    init();
+    const onUpdate = jest.fn();
+    editor.registerUpdateListener(onUpdate);
+    editor.update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Async update')),
+      );
+      editor.update(
+        () => {
+          $getRoot().append(
+            $createParagraphNode().append($createTextNode('Sync update')),
+          );
+        },
+        {
+          discrete: true,
+        },
+      );
+    });
+
+    const textContent = editor
+      .getEditorState()
+      .read(() => $getRoot().getTextContent());
+    expect(textContent).toBe('Async update\n\nSync update');
+    expect(onUpdate).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not include linebreak into inline elements', async () => {
+    init();
+
+    await editor.update(() => {
+      $getRoot().append(
+        $createParagraphNode().append(
+          $createTextNode('Hello'),
+          $createTestInlineElementNode(),
+        ),
+      );
+    });
+
+    expect(container.firstElementChild?.innerHTML).toBe(
+      '<p dir="ltr"><span data-lexical-text="true">Hello</span><a></a></p>',
+    );
+  });
+
+  it('reconciles state without root element', () => {
+    editor = createTestEditor({});
+    const state = editor.parseEditorState(
+      `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+    );
+    editor.setEditorState(state);
+    expect(editor._editorState).toBe(state);
+    expect(editor._pendingEditorState).toBe(null);
+  });
+
+  describe('node replacement', () => {
+    it('should work correctly', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        nodes: [
+          TestTextNode,
+          {
+            replace: TextNode,
+            with: (node: TextNode) => new TestTextNode(node.getTextContent()),
+          },
+        ],
+        onError: onError,
+        theme: {
+          text: {
+            bold: 'editor-text-bold',
+            italic: 'editor-text-italic',
+            underline: 'editor-text-underline',
+          },
+        },
+      });
+
+      newEditor.setRootElement(container);
+
+      await newEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('123');
+        root.append(paragraph);
+        paragraph.append(text);
+        expect(text instanceof TestTextNode).toBe(true);
+        expect(text.getTextContent()).toBe('123');
+      });
+
+      expect(onError).not.toHaveBeenCalled();
+    });
+
+    it('should fail if node keys are re-used', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        nodes: [
+          TestTextNode,
+          {
+            replace: TextNode,
+            with: (node: TextNode) =>
+              new TestTextNode(node.getTextContent(), node.getKey()),
+          },
+        ],
+        onError: onError,
+        theme: {
+          text: {
+            bold: 'editor-text-bold',
+            italic: 'editor-text-italic',
+            underline: 'editor-text-underline',
+          },
+        },
+      });
+
+      newEditor.setRootElement(container);
+
+      await newEditor.update(() => {
+        // this will throw
+        $createTextNode('123');
+        expect(false).toBe('unreachable');
+      });
+
+      expect(onError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          message: expect.stringMatching(/TestTextNode.*re-use key.*TextNode/),
+        }),
+      );
+    });
+
+    it('node transform to the nodes specified by "replace" should not be applied to the nodes specified by "with" when "withKlass" is not specified', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        nodes: [
+          TestTextNode,
+          {
+            replace: TextNode,
+            with: (node: TextNode) => new TestTextNode(node.getTextContent()),
+          },
+        ],
+        onError: onError,
+        theme: {
+          text: {
+            bold: 'editor-text-bold',
+            italic: 'editor-text-italic',
+            underline: 'editor-text-underline',
+          },
+        },
+      });
+
+      newEditor.setRootElement(container);
+
+      const mockTransform = jest.fn();
+      const removeTransform = newEditor.registerNodeTransform(
+        TextNode,
+        mockTransform,
+      );
+
+      await newEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('123');
+        root.append(paragraph);
+        paragraph.append(text);
+        expect(text instanceof TestTextNode).toBe(true);
+        expect(text.getTextContent()).toBe('123');
+      });
+
+      await newEditor.getEditorState().read(() => {
+        expect(mockTransform).toHaveBeenCalledTimes(0);
+      });
+
+      expect(onError).not.toHaveBeenCalled();
+      removeTransform();
+    });
+
+    it('node transform to the nodes specified by "replace" should be applied also to the nodes specified by "with" when "withKlass" is specified', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        nodes: [
+          TestTextNode,
+          {
+            replace: TextNode,
+            with: (node: TextNode) => new TestTextNode(node.getTextContent()),
+            withKlass: TestTextNode,
+          },
+        ],
+        onError: onError,
+        theme: {
+          text: {
+            bold: 'editor-text-bold',
+            italic: 'editor-text-italic',
+            underline: 'editor-text-underline',
+          },
+        },
+      });
+
+      newEditor.setRootElement(container);
+
+      const mockTransform = jest.fn();
+      const removeTransform = newEditor.registerNodeTransform(
+        TextNode,
+        mockTransform,
+      );
+
+      await newEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('123');
+        root.append(paragraph);
+        paragraph.append(text);
+        expect(text instanceof TestTextNode).toBe(true);
+        expect(text.getTextContent()).toBe('123');
+      });
+
+      await newEditor.getEditorState().read(() => {
+        expect(mockTransform).toHaveBeenCalledTimes(1);
+      });
+
+      expect(onError).not.toHaveBeenCalled();
+      removeTransform();
+    });
+  });
+
+  it('recovers from reconciler failure and trigger proper prev editor state', async () => {
+    const updateListener = jest.fn();
+    const textListener = jest.fn();
+    const onError = jest.fn();
+    const updateError = new Error('Failed updateDOM');
+
+    init(onError);
+
+    editor.registerUpdateListener(updateListener);
+    editor.registerTextContentListener(textListener);
+
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('Hello')),
+      );
+    });
+
+    // Cause reconciler error in update dom, so that it attempts to fallback by
+    // reseting editor and rerendering whole content
+    jest.spyOn(ParagraphNode.prototype, 'updateDOM').mockImplementation(() => {
+      throw updateError;
+    });
+
+    const editorState = editor.getEditorState();
+
+    editor.registerUpdateListener(updateListener);
+
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append($createTextNode('world')),
+      );
+    });
+
+    expect(onError).toBeCalledWith(updateError);
+    expect(textListener).toBeCalledWith('Hello\n\nworld');
+    expect(updateListener.mock.lastCall[0].prevEditorState).toBe(editorState);
+  });
+
+  it('should call importDOM methods only once', async () => {
+    jest.spyOn(ParagraphNode, 'importDOM');
+
+    class CustomParagraphNode extends ParagraphNode {
+      static getType() {
+        return 'custom-paragraph';
+      }
+
+      static clone(node: CustomParagraphNode) {
+        return new CustomParagraphNode(node.__key);
+      }
+
+      static importJSON() {
+        return new CustomParagraphNode();
+      }
+
+      exportJSON() {
+        return {...super.exportJSON(), type: 'custom-paragraph'};
+      }
+    }
+
+    createTestEditor({nodes: [CustomParagraphNode]});
+
+    expect(ParagraphNode.importDOM).toHaveBeenCalledTimes(1);
+  });
+
+  it('root element count is always positive', () => {
+    const newEditor1 = createTestEditor();
+    const newEditor2 = createTestEditor();
+
+    const container1 = document.createElement('div');
+    const container2 = document.createElement('div');
+
+    newEditor1.setRootElement(container1);
+    newEditor1.setRootElement(null);
+
+    newEditor1.setRootElement(container1);
+    newEditor2.setRootElement(container2);
+    newEditor1.setRootElement(null);
+    newEditor2.setRootElement(null);
+  });
+
+  describe('html config', () => {
+    it('should override export output function', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        html: {
+          export: new Map([
+            [
+              TextNode,
+              (_, target) => {
+                invariant($isTextNode(target));
+
+                return {
+                  element: target.hasFormat('bold')
+                    ? document.createElement('bor')
+                    : document.createElement('foo'),
+                };
+              },
+            ],
+          ]),
+        },
+        onError: onError,
+      });
+
+      newEditor.setRootElement(container);
+
+      newEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode();
+        root.append(paragraph);
+        paragraph.append(text);
+
+        const selection = $createNodeSelection();
+        selection.add(text.getKey());
+
+        const htmlFoo = $generateHtmlFromNodes(newEditor, selection);
+        expect(htmlFoo).toBe('<foo></foo>');
+
+        text.toggleFormat('bold');
+
+        const htmlBold = $generateHtmlFromNodes(newEditor, selection);
+        expect(htmlBold).toBe('<bor></bor>');
+      });
+
+      expect(onError).not.toHaveBeenCalled();
+    });
+
+    it('should override import conversion function', async () => {
+      const onError = jest.fn();
+
+      const newEditor = createTestEditor({
+        html: {
+          import: {
+            figure: () => ({
+              conversion: () => ({node: $createTextNode('yolo')}),
+              priority: 4,
+            }),
+          },
+        },
+        onError: onError,
+      });
+
+      newEditor.setRootElement(container);
+
+      newEditor.update(() => {
+        const html = '<figure></figure>';
+
+        const parser = new DOMParser();
+        const dom = parser.parseFromString(html, 'text/html');
+        const node = $generateNodesFromDOM(newEditor, dom)[0];
+
+        expect(node).toEqual({
+          __detail: 0,
+          __format: 0,
+          __key: node.getKey(),
+          __mode: 0,
+          __next: null,
+          __parent: null,
+          __prev: null,
+          __style: '',
+          __text: 'yolo',
+          __type: 'text',
+        });
+      });
+
+      expect(onError).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
new file mode 100644
index 00000000000..09b49b738d7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getEditor,
+  $getRoot,
+  ParagraphNode,
+  TextNode,
+} from 'lexical';
+
+import {EditorState} from '../../LexicalEditorState';
+import {$createRootNode, RootNode} from '../../nodes/LexicalRootNode';
+import {initializeUnitTest} from '../utils';
+
+describe('LexicalEditorState tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('constructor', async () => {
+      const root = $createRootNode();
+      const nodeMap = new Map([['root', root]]);
+
+      const editorState = new EditorState(nodeMap);
+      expect(editorState._nodeMap).toBe(nodeMap);
+      expect(editorState._selection).toBe(null);
+    });
+
+    test('read()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('foo');
+        paragraph.append(text);
+        $getRoot().append(paragraph);
+      });
+
+      let root!: RootNode;
+      let paragraph!: ParagraphNode;
+      let text!: TextNode;
+
+      editor.getEditorState().read(() => {
+        root = $getRoot();
+        paragraph = root.getFirstChild()!;
+        text = paragraph.getFirstChild()!;
+      });
+
+      expect(root).toEqual({
+        __cachedText: 'foo',
+        __dir: 'ltr',
+        __first: '1',
+        __format: 0,
+        __indent: 0,
+        __key: 'root',
+        __last: '1',
+        __next: null,
+        __parent: null,
+        __prev: null,
+        __size: 1,
+        __style: '',
+        __type: 'root',
+      });
+      expect(paragraph).toEqual({
+        __dir: 'ltr',
+        __first: '2',
+        __format: 0,
+        __indent: 0,
+        __key: '1',
+        __last: '2',
+        __next: null,
+        __parent: 'root',
+        __prev: null,
+        __size: 1,
+        __style: '',
+        __textFormat: 0,
+        __textStyle: '',
+        __type: 'paragraph',
+      });
+      expect(text).toEqual({
+        __detail: 0,
+        __format: 0,
+        __key: '2',
+        __mode: 0,
+        __next: null,
+        __parent: '1',
+        __prev: null,
+        __style: '',
+        __text: 'foo',
+        __type: 'text',
+      });
+      expect(() => editor.getEditorState().read(() => $getEditor())).toThrow(
+        /Unable to find an active editor/,
+      );
+      expect(
+        editor.getEditorState().read(() => $getEditor(), {editor: editor}),
+      ).toBe(editor);
+    });
+
+    test('toJSON()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('Hello world');
+        text.select(6, 11);
+        paragraph.append(text);
+        $getRoot().append(paragraph);
+      });
+
+      expect(JSON.stringify(editor.getEditorState().toJSON())).toEqual(
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+      );
+    });
+
+    test('ensure garbage collection works as expected', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('foo');
+        paragraph.append(text);
+        $getRoot().append(paragraph);
+      });
+      // Remove the first node, which should cause a GC for everything
+
+      await editor.update(() => {
+        $getRoot().getFirstChild()!.remove();
+      });
+
+      expect(editor.getEditorState()._nodeMap).toEqual(
+        new Map([
+          [
+            'root',
+            {
+              __cachedText: '',
+              __dir: null,
+              __first: null,
+              __format: 0,
+              __indent: 0,
+              __key: 'root',
+              __last: null,
+              __next: null,
+              __parent: null,
+              __prev: null,
+              __size: 0,
+              __style: '',
+              __type: 'root',
+            },
+          ],
+        ]),
+      );
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
new file mode 100644
index 00000000000..a2968c2592b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
@@ -0,0 +1,212 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {ListItemNode, ListNode} from '@lexical/list';
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {ContentEditable} from '@lexical/react/LexicalContentEditable';
+import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
+import {ListPlugin} from '@lexical/react/LexicalListPlugin';
+import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
+import {
+  INDENT_CONTENT_COMMAND,
+  LexicalEditor,
+  OUTDENT_CONTENT_COMMAND,
+} from 'lexical';
+import {
+  expectHtmlToBeEqual,
+  html,
+  TestComposer,
+} from 'lexical/src/__tests__/utils';
+import {createRoot, Root} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+import {
+  INSERT_UNORDERED_LIST_COMMAND,
+  REMOVE_LIST_COMMAND,
+} from '../../../../lexical-list/src/index';
+
+describe('@lexical/list tests', () => {
+  let container: HTMLDivElement;
+  let reactRoot: Root;
+
+  beforeEach(() => {
+    container = document.createElement('div');
+    reactRoot = createRoot(container);
+    document.body.appendChild(container);
+  });
+
+  afterEach(() => {
+    container.remove();
+    // @ts-ignore
+    container = null;
+
+    jest.restoreAllMocks();
+  });
+
+  // Shared instance across tests
+  let editor: LexicalEditor;
+
+  function Test(): JSX.Element {
+    function TestPlugin() {
+      // Plugin used just to get our hands on the Editor object
+      [editor] = useLexicalComposerContext();
+      return null;
+    }
+
+    return (
+      <TestComposer config={{nodes: [ListNode, ListItemNode], theme: {}}}>
+        <RichTextPlugin
+          contentEditable={<ContentEditable />}
+          placeholder={
+            <div className="editor-placeholder">Enter some text...</div>
+          }
+          ErrorBoundary={LexicalErrorBoundary}
+        />
+        <TestPlugin />
+        <ListPlugin />
+      </TestComposer>
+    );
+  }
+
+  test('Toggle an empty list on/off', async () => {
+    ReactTestUtils.act(() => {
+      reactRoot.render(<Test key="MegaSeeds, Morty!" />);
+    });
+
+    await ReactTestUtils.act(async () => {
+      await editor.update(() => {
+        editor.focus();
+        editor.dispatchCommand(INSERT_UNORDERED_LIST_COMMAND, undefined);
+      });
+    });
+
+    expectHtmlToBeEqual(
+      container.innerHTML,
+      html`
+        <div
+          contenteditable="true"
+          role="textbox"
+          spellcheck="true"
+          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+          data-lexical-editor="true">
+          <ul>
+            <li value="1">
+              <br />
+            </li>
+          </ul>
+        </div>
+      `,
+    );
+
+    await ReactTestUtils.act(async () => {
+      await editor.update(() => {
+        editor.focus();
+        editor.dispatchCommand(REMOVE_LIST_COMMAND, undefined);
+      });
+    });
+
+    expectHtmlToBeEqual(
+      container.innerHTML,
+      html`
+        <div
+          contenteditable="true"
+          role="textbox"
+          spellcheck="true"
+          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+          data-lexical-editor="true">
+          <p>
+            <br />
+          </p>
+        </div>
+        <div class="editor-placeholder">Enter some text...</div>
+      `,
+    );
+  });
+
+  test('Can create a list and indent/outdent it', async () => {
+    ReactTestUtils.act(() => {
+      reactRoot.render(<Test key="MegaSeeds, Morty!" />);
+    });
+
+    await ReactTestUtils.act(async () => {
+      await editor.update(() => {
+        editor.focus();
+        editor.dispatchCommand(INSERT_UNORDERED_LIST_COMMAND, undefined);
+      });
+    });
+
+    expectHtmlToBeEqual(
+      container.innerHTML,
+      html`
+        <div
+          contenteditable="true"
+          role="textbox"
+          spellcheck="true"
+          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+          data-lexical-editor="true">
+          <ul>
+            <li value="1">
+              <br />
+            </li>
+          </ul>
+        </div>
+      `,
+    );
+
+    await ReactTestUtils.act(async () => {
+      await editor.update(() => {
+        editor.focus();
+        editor.dispatchCommand(INDENT_CONTENT_COMMAND, undefined);
+      });
+    });
+
+    expectHtmlToBeEqual(
+      container.innerHTML,
+      html`
+        <div
+          contenteditable="true"
+          role="textbox"
+          spellcheck="true"
+          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+          data-lexical-editor="true">
+          <ul>
+            <li value="1">
+              <ul>
+                <li value="1"><br /></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      `,
+    );
+
+    await ReactTestUtils.act(async () => {
+      await editor.update(() => {
+        editor.focus();
+        editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined);
+      });
+    });
+
+    expectHtmlToBeEqual(
+      container.innerHTML,
+      html`
+        <div
+          contenteditable="true"
+          role="textbox"
+          spellcheck="true"
+          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+          data-lexical-editor="true">
+          <ul>
+            <li value="1">
+              <br />
+            </li>
+          </ul>
+        </div>
+      `,
+    );
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
new file mode 100644
index 00000000000..7373f898d80
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
@@ -0,0 +1,1517 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createRangeSelection,
+  $getRoot,
+  $getSelection,
+  $isDecoratorNode,
+  $isElementNode,
+  $isRangeSelection,
+  $setSelection,
+  createEditor,
+  DecoratorNode,
+  ElementNode,
+  LexicalEditor,
+  NodeKey,
+  ParagraphNode,
+  RangeSelection,
+  SerializedTextNode,
+  TextNode,
+} from 'lexical';
+
+import {LexicalNode} from '../../LexicalNode';
+import {$createParagraphNode} from '../../nodes/LexicalParagraphNode';
+import {$createTextNode} from '../../nodes/LexicalTextNode';
+import {
+  $createTestInlineElementNode,
+  initializeUnitTest,
+  TestElementNode,
+  TestInlineElementNode,
+} from '../utils';
+
+class TestNode extends LexicalNode {
+  static getType(): string {
+    return 'test';
+  }
+
+  static clone(node: TestNode) {
+    return new TestNode(node.__key);
+  }
+
+  createDOM() {
+    return document.createElement('div');
+  }
+
+  static importJSON() {
+    return new TestNode();
+  }
+
+  exportJSON() {
+    return {type: 'test', version: 1};
+  }
+}
+
+class InlineDecoratorNode extends DecoratorNode<string> {
+  static getType(): string {
+    return 'inline-decorator';
+  }
+
+  static clone(): InlineDecoratorNode {
+    return new InlineDecoratorNode();
+  }
+
+  static importJSON() {
+    return new InlineDecoratorNode();
+  }
+
+  exportJSON() {
+    return {type: 'inline-decorator', version: 1};
+  }
+
+  createDOM(): HTMLElement {
+    return document.createElement('span');
+  }
+
+  isInline(): true {
+    return true;
+  }
+
+  isParentRequired(): true {
+    return true;
+  }
+
+  decorate() {
+    return 'inline-decorator';
+  }
+}
+
+// This is a hack to bypass the node type validation on LexicalNode. We never want to create
+// an LexicalNode directly but we're testing the base functionality in this module.
+LexicalNode.getType = function () {
+  return 'node';
+};
+
+describe('LexicalNode tests', () => {
+  initializeUnitTest(
+    (testEnv) => {
+      let paragraphNode: ParagraphNode;
+      let textNode: TextNode;
+
+      beforeEach(async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const rootNode = $getRoot();
+          paragraphNode = new ParagraphNode();
+          textNode = new TextNode('foo');
+          paragraphNode.append(textNode);
+          rootNode.append(paragraphNode);
+        });
+      });
+
+      test('LexicalNode.constructor', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode('__custom_key__');
+          expect(node.__type).toBe('node');
+          expect(node.__key).toBe('__custom_key__');
+          expect(node.__parent).toBe(null);
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(() => new LexicalNode()).toThrow();
+          expect(() => new LexicalNode('__custom_key__')).toThrow();
+        });
+      });
+
+      test('LexicalNode.constructor: type change detected', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const validNode = new TextNode(textNode.__text, textNode.__key);
+          expect(textNode.getLatest()).toBe(textNode);
+          expect(validNode.getLatest()).toBe(textNode);
+          expect(() => new TestNode(textNode.__key)).toThrowError(
+            /TestNode.*re-use key.*TextNode/,
+          );
+        });
+      });
+
+      test('LexicalNode.clone()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode('__custom_key__');
+
+          expect(() => LexicalNode.clone(node)).toThrow();
+        });
+      });
+      test('LexicalNode.afterCloneFrom()', () => {
+        class VersionedTextNode extends TextNode {
+          // ['constructor']!: KlassConstructor<typeof VersionedTextNode>;
+          __version = 0;
+          static getType(): 'vtext' {
+            return 'vtext';
+          }
+          static clone(node: VersionedTextNode): VersionedTextNode {
+            return new VersionedTextNode(node.__text, node.__key);
+          }
+          static importJSON(node: SerializedTextNode): VersionedTextNode {
+            throw new Error('Not implemented');
+          }
+          exportJSON(): SerializedTextNode {
+            throw new Error('Not implemented');
+          }
+          afterCloneFrom(node: this): void {
+            super.afterCloneFrom(node);
+            this.__version = node.__version + 1;
+          }
+        }
+        const editor = createEditor({
+          nodes: [VersionedTextNode],
+          onError(err) {
+            throw err;
+          },
+        });
+        let versionedTextNode: VersionedTextNode;
+
+        editor.update(
+          () => {
+            versionedTextNode = new VersionedTextNode('test');
+            $getRoot().append($createParagraphNode().append(versionedTextNode));
+            expect(versionedTextNode.__version).toEqual(0);
+          },
+          {discrete: true},
+        );
+        editor.update(
+          () => {
+            expect(versionedTextNode.getLatest().__version).toEqual(0);
+            expect(
+              versionedTextNode.setTextContent('update').setMode('token')
+                .__version,
+            ).toEqual(1);
+          },
+          {discrete: true},
+        );
+        editor.update(
+          () => {
+            let latest = versionedTextNode.getLatest();
+            expect(versionedTextNode.__version).toEqual(0);
+            expect(versionedTextNode.__mode).toEqual(0);
+            expect(versionedTextNode.getMode()).toEqual('token');
+            expect(latest.__version).toEqual(1);
+            expect(latest.__mode).toEqual(1);
+            latest = latest.setTextContent('another update');
+            expect(latest.__version).toEqual(2);
+            expect(latest.getWritable().__version).toEqual(2);
+            expect(
+              versionedTextNode.getLatest().getWritable().__version,
+            ).toEqual(2);
+            expect(versionedTextNode.getLatest().__version).toEqual(2);
+            expect(versionedTextNode.__mode).toEqual(0);
+            expect(versionedTextNode.getLatest().__mode).toEqual(1);
+            expect(versionedTextNode.getMode()).toEqual('token');
+          },
+          {discrete: true},
+        );
+      });
+
+      test('LexicalNode.getType()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode('__custom_key__');
+          expect(node.getType()).toEqual(node.__type);
+        });
+      });
+
+      test('LexicalNode.isAttached()', async () => {
+        const {editor} = testEnv;
+        let node: LexicalNode;
+
+        await editor.update(() => {
+          node = new LexicalNode('__custom_key__');
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(node.isAttached()).toBe(false);
+          expect(textNode.isAttached()).toBe(true);
+          expect(paragraphNode.isAttached()).toBe(true);
+        });
+
+        expect(() => textNode.isAttached()).toThrow();
+      });
+
+      test('LexicalNode.isSelected()', async () => {
+        const {editor} = testEnv;
+        let node: LexicalNode;
+
+        await editor.update(() => {
+          node = new LexicalNode('__custom_key__');
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(node.isSelected()).toBe(false);
+          expect(textNode.isSelected()).toBe(false);
+          expect(paragraphNode.isSelected()).toBe(false);
+        });
+
+        await editor.update(() => {
+          textNode.select(0, 0);
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isSelected()).toBe(true);
+        });
+
+        expect(() => textNode.isSelected()).toThrow();
+      });
+
+      test('LexicalNode.isSelected(): selected text node', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          expect(paragraphNode.isSelected()).toBe(false);
+          expect(textNode.isSelected()).toBe(false);
+        });
+
+        await editor.update(() => {
+          textNode.select(0, 0);
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isSelected()).toBe(true);
+          expect(paragraphNode.isSelected()).toBe(false);
+        });
+      });
+
+      test('LexicalNode.isSelected(): selected block node range', async () => {
+        const {editor} = testEnv;
+        let newParagraphNode: ParagraphNode;
+        let newTextNode: TextNode;
+
+        await editor.update(() => {
+          expect(paragraphNode.isSelected()).toBe(false);
+          expect(textNode.isSelected()).toBe(false);
+          newParagraphNode = new ParagraphNode();
+          newTextNode = new TextNode('bar');
+          newParagraphNode.append(newTextNode);
+          paragraphNode.insertAfter(newParagraphNode);
+          expect(newParagraphNode.isSelected()).toBe(false);
+          expect(newTextNode.isSelected()).toBe(false);
+        });
+
+        await editor.update(() => {
+          textNode.select(0, 0);
+          const selection = $getSelection();
+
+          expect(selection).not.toBe(null);
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.anchor.type = 'text';
+          selection.anchor.offset = 1;
+          selection.anchor.key = textNode.getKey();
+          selection.focus.type = 'text';
+          selection.focus.offset = 1;
+          selection.focus.key = newTextNode.getKey();
+        });
+
+        await Promise.resolve().then();
+
+        await editor.update(() => {
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          expect(selection.anchor.key).toBe(textNode.getKey());
+          expect(selection.focus.key).toBe(newTextNode.getKey());
+          expect(paragraphNode.isSelected()).toBe(true);
+          expect(textNode.isSelected()).toBe(true);
+          expect(newParagraphNode.isSelected()).toBe(true);
+          expect(newTextNode.isSelected()).toBe(true);
+        });
+      });
+
+      test('LexicalNode.isSelected(): with custom range selection', async () => {
+        const {editor} = testEnv;
+        let newParagraphNode: ParagraphNode;
+        let newTextNode: TextNode;
+
+        await editor.update(() => {
+          expect(paragraphNode.isSelected()).toBe(false);
+          expect(textNode.isSelected()).toBe(false);
+          newParagraphNode = new ParagraphNode();
+          newTextNode = new TextNode('bar');
+          newParagraphNode.append(newTextNode);
+          paragraphNode.insertAfter(newParagraphNode);
+          expect(newParagraphNode.isSelected()).toBe(false);
+          expect(newTextNode.isSelected()).toBe(false);
+        });
+
+        await editor.update(() => {
+          const rangeSelection = $createRangeSelection();
+
+          rangeSelection.anchor.type = 'text';
+          rangeSelection.anchor.offset = 1;
+          rangeSelection.anchor.key = textNode.getKey();
+          rangeSelection.focus.type = 'text';
+          rangeSelection.focus.offset = 1;
+          rangeSelection.focus.key = newTextNode.getKey();
+
+          expect(paragraphNode.isSelected(rangeSelection)).toBe(true);
+          expect(textNode.isSelected(rangeSelection)).toBe(true);
+          expect(newParagraphNode.isSelected(rangeSelection)).toBe(true);
+          expect(newTextNode.isSelected(rangeSelection)).toBe(true);
+        });
+
+        await Promise.resolve().then();
+      });
+
+      describe('LexicalNode.isSelected(): with inline decorator node', () => {
+        let editor: LexicalEditor;
+        let paragraphNode1: ParagraphNode;
+        let paragraphNode2: ParagraphNode;
+        let paragraphNode3: ParagraphNode;
+        let inlineDecoratorNode: InlineDecoratorNode;
+        let names: Record<NodeKey, string>;
+        beforeEach(() => {
+          editor = testEnv.editor;
+          editor.update(() => {
+            inlineDecoratorNode = new InlineDecoratorNode();
+            paragraphNode1 = $createParagraphNode();
+            paragraphNode2 = $createParagraphNode().append(inlineDecoratorNode);
+            paragraphNode3 = $createParagraphNode();
+            names = {
+              [inlineDecoratorNode.getKey()]: 'd',
+              [paragraphNode1.getKey()]: 'p1',
+              [paragraphNode2.getKey()]: 'p2',
+              [paragraphNode3.getKey()]: 'p3',
+            };
+            $getRoot()
+              .clear()
+              .append(paragraphNode1, paragraphNode2, paragraphNode3);
+          });
+        });
+        const cases: {
+          label: string;
+          isSelected: boolean;
+          update: () => void;
+        }[] = [
+          {
+            isSelected: true,
+            label: 'whole editor',
+            update() {
+              $getRoot().select(0);
+            },
+          },
+          {
+            isSelected: true,
+            label: 'containing paragraph',
+            update() {
+              paragraphNode2.select(0);
+            },
+          },
+          {
+            isSelected: true,
+            label: 'before and containing',
+            update() {
+              paragraphNode2
+                .select(0)
+                .anchor.set(paragraphNode1.getKey(), 0, 'element');
+            },
+          },
+          {
+            isSelected: true,
+            label: 'containing and after',
+            update() {
+              paragraphNode2
+                .select(0)
+                .focus.set(paragraphNode3.getKey(), 0, 'element');
+            },
+          },
+          {
+            isSelected: true,
+            label: 'before and after',
+            update() {
+              paragraphNode1
+                .select(0)
+                .focus.set(paragraphNode3.getKey(), 0, 'element');
+            },
+          },
+          {
+            isSelected: false,
+            label: 'collapsed before',
+            update() {
+              paragraphNode2.select(0, 0);
+            },
+          },
+          {
+            isSelected: false,
+            label: 'in another element',
+            update() {
+              paragraphNode1.select(0);
+            },
+          },
+          {
+            isSelected: false,
+            label: 'before',
+            update() {
+              paragraphNode1
+                .select(0)
+                .focus.set(paragraphNode2.getKey(), 0, 'element');
+            },
+          },
+          {
+            isSelected: false,
+            label: 'collapsed after',
+            update() {
+              paragraphNode2.selectEnd();
+            },
+          },
+          {
+            isSelected: false,
+            label: 'after',
+            update() {
+              paragraphNode3
+                .select(0)
+                .anchor.set(
+                  paragraphNode2.getKey(),
+                  paragraphNode2.getChildrenSize(),
+                  'element',
+                );
+            },
+          },
+        ];
+        for (const {label, isSelected, update} of cases) {
+          test(`${isSelected ? 'is' : "isn't"} selected ${label}`, () => {
+            editor.update(update);
+            const $verify = () => {
+              const selection = $getSelection() as RangeSelection;
+              expect($isRangeSelection(selection)).toBe(true);
+              const dbg = [selection.anchor, selection.focus]
+                .map(
+                  (point) =>
+                    `(${names[point.key] || point.key}:${point.offset})`,
+                )
+                .join(' ');
+              const nodes = `[${selection
+                .getNodes()
+                .map((k) => names[k.__key] || k.__key)
+                .join(',')}]`;
+              expect([dbg, nodes, inlineDecoratorNode.isSelected()]).toEqual([
+                dbg,
+                nodes,
+                isSelected,
+              ]);
+            };
+            editor.read($verify);
+            editor.update(() => {
+              const selection = $getSelection();
+              if ($isRangeSelection(selection)) {
+                const backwards = $createRangeSelection();
+                backwards.anchor.set(
+                  selection.focus.key,
+                  selection.focus.offset,
+                  selection.focus.type,
+                );
+                backwards.focus.set(
+                  selection.anchor.key,
+                  selection.anchor.offset,
+                  selection.anchor.type,
+                );
+                $setSelection(backwards);
+              }
+              expect($isRangeSelection(selection)).toBe(true);
+            });
+            editor.read($verify);
+          });
+        }
+      });
+
+      test('LexicalNode.getKey()', async () => {
+        expect(textNode.getKey()).toEqual(textNode.__key);
+      });
+
+      test('LexicalNode.getParent()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(node.getParent()).toBe(null);
+        });
+
+        await editor.getEditorState().read(() => {
+          const rootNode = $getRoot();
+          expect(textNode.getParent()).toBe(paragraphNode);
+          expect(paragraphNode.getParent()).toBe(rootNode);
+        });
+        expect(() => textNode.getParent()).toThrow();
+      });
+
+      test('LexicalNode.getParentOrThrow()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(() => node.getParentOrThrow()).toThrow();
+        });
+
+        await editor.getEditorState().read(() => {
+          const rootNode = $getRoot();
+          expect(textNode.getParent()).toBe(paragraphNode);
+          expect(paragraphNode.getParent()).toBe(rootNode);
+        });
+        expect(() => textNode.getParentOrThrow()).toThrow();
+      });
+
+      test('LexicalNode.getTopLevelElement()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(node.getTopLevelElement()).toBe(null);
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getTopLevelElement()).toBe(paragraphNode);
+          expect(paragraphNode.getTopLevelElement()).toBe(paragraphNode);
+        });
+        expect(() => textNode.getTopLevelElement()).toThrow();
+        await editor.update(() => {
+          const node = new InlineDecoratorNode();
+          expect(node.getTopLevelElement()).toBe(null);
+          $getRoot().append(node);
+          expect(node.getTopLevelElement()).toBe(node);
+        });
+        editor.getEditorState().read(() => {
+          const elementNodes: ElementNode[] = [];
+          const decoratorNodes: DecoratorNode<unknown>[] = [];
+          for (const child of $getRoot().getChildren()) {
+            expect(child.getTopLevelElement()).toBe(child);
+            if ($isElementNode(child)) {
+              elementNodes.push(child);
+            } else if ($isDecoratorNode(child)) {
+              decoratorNodes.push(child);
+            } else {
+              throw new Error(
+                'Expecting all children to be ElementNode or DecoratorNode',
+              );
+            }
+          }
+          expect(decoratorNodes).toHaveLength(1);
+          expect(elementNodes).toHaveLength(1);
+        });
+      });
+
+      test('LexicalNode.getTopLevelElementOrThrow()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(() => node.getTopLevelElementOrThrow()).toThrow();
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getTopLevelElementOrThrow()).toBe(paragraphNode);
+          expect(paragraphNode.getTopLevelElementOrThrow()).toBe(paragraphNode);
+        });
+        expect(() => textNode.getTopLevelElementOrThrow()).toThrow();
+        await editor.update(() => {
+          const node = new InlineDecoratorNode();
+          expect(() => node.getTopLevelElementOrThrow()).toThrow();
+          $getRoot().append(node);
+          expect(node.getTopLevelElementOrThrow()).toBe(node);
+        });
+      });
+
+      test('LexicalNode.getParents()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(node.getParents()).toEqual([]);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          const rootNode = $getRoot();
+          expect(textNode.getParents()).toEqual([paragraphNode, rootNode]);
+          expect(paragraphNode.getParents()).toEqual([rootNode]);
+        });
+        expect(() => textNode.getParents()).toThrow();
+      });
+
+      test('LexicalNode.getPreviousSibling()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+
+        await editor.update(() => {
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          paragraphNode.append(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(barTextNode.getPreviousSibling()).toEqual({
+            ...textNode,
+            __next: '3',
+          });
+          expect(textNode.getPreviousSibling()).toEqual(null);
+        });
+        expect(() => textNode.getPreviousSibling()).toThrow();
+      });
+
+      test('LexicalNode.getPreviousSiblings()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+        let bazTextNode: TextNode;
+
+        await editor.update(() => {
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          bazTextNode = new TextNode('baz');
+          bazTextNode.toggleUnmergeable();
+          paragraphNode.append(barTextNode, bazTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(bazTextNode.getPreviousSiblings()).toEqual([
+            {
+              ...textNode,
+              __next: '3',
+            },
+            {
+              ...barTextNode,
+              __prev: '2',
+            },
+          ]);
+          expect(barTextNode.getPreviousSiblings()).toEqual([
+            {
+              ...textNode,
+              __next: '3',
+            },
+          ]);
+          expect(textNode.getPreviousSiblings()).toEqual([]);
+        });
+        expect(() => textNode.getPreviousSiblings()).toThrow();
+      });
+
+      test('LexicalNode.getNextSibling()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+
+        await editor.update(() => {
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          paragraphNode.append(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(barTextNode.getNextSibling()).toEqual(null);
+          expect(textNode.getNextSibling()).toEqual(barTextNode);
+        });
+        expect(() => textNode.getNextSibling()).toThrow();
+      });
+
+      test('LexicalNode.getNextSiblings()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+        let bazTextNode: TextNode;
+
+        await editor.update(() => {
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          bazTextNode = new TextNode('baz');
+          bazTextNode.toggleUnmergeable();
+          paragraphNode.append(barTextNode, bazTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(bazTextNode.getNextSiblings()).toEqual([]);
+          expect(barTextNode.getNextSiblings()).toEqual([bazTextNode]);
+          expect(textNode.getNextSiblings()).toEqual([
+            barTextNode,
+            bazTextNode,
+          ]);
+        });
+        expect(() => textNode.getNextSiblings()).toThrow();
+      });
+
+      test('LexicalNode.getCommonAncestor()', async () => {
+        const {editor} = testEnv;
+        let quxTextNode: TextNode;
+        let barParagraphNode: ParagraphNode;
+        let barTextNode: TextNode;
+        let bazParagraphNode: ParagraphNode;
+        let bazTextNode: TextNode;
+
+        await editor.update(() => {
+          const rootNode = $getRoot();
+          barParagraphNode = new ParagraphNode();
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          bazParagraphNode = new ParagraphNode();
+          bazTextNode = new TextNode('baz');
+          bazTextNode.toggleUnmergeable();
+          quxTextNode = new TextNode('qux');
+          quxTextNode.toggleUnmergeable();
+          paragraphNode.append(quxTextNode);
+          expect(barTextNode.getCommonAncestor(bazTextNode)).toBe(null);
+          barParagraphNode.append(barTextNode);
+          bazParagraphNode.append(bazTextNode);
+          expect(barTextNode.getCommonAncestor(bazTextNode)).toBe(null);
+          rootNode.append(barParagraphNode, bazParagraphNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">qux</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p><p dir="ltr"><span data-lexical-text="true">baz</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          const rootNode = $getRoot();
+          expect(textNode.getCommonAncestor(rootNode)).toBe(rootNode);
+          expect(quxTextNode.getCommonAncestor(rootNode)).toBe(rootNode);
+          expect(barTextNode.getCommonAncestor(rootNode)).toBe(rootNode);
+          expect(bazTextNode.getCommonAncestor(rootNode)).toBe(rootNode);
+          expect(textNode.getCommonAncestor(quxTextNode)).toBe(
+            paragraphNode.getLatest(),
+          );
+          expect(barTextNode.getCommonAncestor(bazTextNode)).toBe(rootNode);
+          expect(barTextNode.getCommonAncestor(bazTextNode)).toBe(rootNode);
+        });
+
+        expect(() => textNode.getCommonAncestor(barTextNode)).toThrow();
+      });
+
+      test('LexicalNode.isBefore()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+        let bazTextNode: TextNode;
+
+        await editor.update(() => {
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          bazTextNode = new TextNode('baz');
+          bazTextNode.toggleUnmergeable();
+          paragraphNode.append(barTextNode, bazTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isBefore(textNode)).toBe(false);
+          expect(textNode.isBefore(barTextNode)).toBe(true);
+          expect(textNode.isBefore(bazTextNode)).toBe(true);
+          expect(barTextNode.isBefore(bazTextNode)).toBe(true);
+          expect(bazTextNode.isBefore(barTextNode)).toBe(false);
+          expect(bazTextNode.isBefore(textNode)).toBe(false);
+        });
+        expect(() => textNode.isBefore(barTextNode)).toThrow();
+      });
+
+      test('LexicalNode.isParentOf()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          const rootNode = $getRoot();
+          expect(rootNode.isParentOf(textNode)).toBe(true);
+          expect(rootNode.isParentOf(paragraphNode)).toBe(true);
+          expect(paragraphNode.isParentOf(textNode)).toBe(true);
+          expect(paragraphNode.isParentOf(rootNode)).toBe(false);
+          expect(textNode.isParentOf(paragraphNode)).toBe(false);
+          expect(textNode.isParentOf(rootNode)).toBe(false);
+        });
+        expect(() => paragraphNode.isParentOf(textNode)).toThrow();
+      });
+
+      test('LexicalNode.getNodesBetween()', async () => {
+        const {editor} = testEnv;
+        let barTextNode: TextNode;
+        let bazTextNode: TextNode;
+        let newParagraphNode: ParagraphNode;
+        let quxTextNode: TextNode;
+
+        await editor.update(() => {
+          const rootNode = $getRoot();
+          barTextNode = new TextNode('bar');
+          barTextNode.toggleUnmergeable();
+          bazTextNode = new TextNode('baz');
+          bazTextNode.toggleUnmergeable();
+          newParagraphNode = new ParagraphNode();
+          quxTextNode = new TextNode('qux');
+          quxTextNode.toggleUnmergeable();
+          rootNode.append(newParagraphNode);
+          paragraphNode.append(barTextNode, bazTextNode);
+          newParagraphNode.append(quxTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p><p dir="ltr"><span data-lexical-text="true">qux</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getNodesBetween(textNode)).toEqual([textNode]);
+          expect(textNode.getNodesBetween(barTextNode)).toEqual([
+            textNode,
+            barTextNode,
+          ]);
+          expect(textNode.getNodesBetween(bazTextNode)).toEqual([
+            textNode,
+            barTextNode,
+            bazTextNode,
+          ]);
+          expect(textNode.getNodesBetween(quxTextNode)).toEqual([
+            textNode,
+            barTextNode,
+            bazTextNode,
+            paragraphNode.getLatest(),
+            newParagraphNode,
+            quxTextNode,
+          ]);
+        });
+        expect(() => textNode.getNodesBetween(bazTextNode)).toThrow();
+      });
+
+      test('LexicalNode.isToken()', async () => {
+        const {editor} = testEnv;
+        let tokenTextNode: TextNode;
+
+        await editor.update(() => {
+          tokenTextNode = new TextNode('token').setMode('token');
+          paragraphNode.append(tokenTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">token</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isToken()).toBe(false);
+          expect(tokenTextNode.isToken()).toBe(true);
+        });
+        expect(() => textNode.isToken()).toThrow();
+      });
+
+      test('LexicalNode.isSegmented()', async () => {
+        const {editor} = testEnv;
+        let segmentedTextNode: TextNode;
+
+        await editor.update(() => {
+          segmentedTextNode = new TextNode('segmented').setMode('segmented');
+          paragraphNode.append(segmentedTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">segmented</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isSegmented()).toBe(false);
+          expect(segmentedTextNode.isSegmented()).toBe(true);
+        });
+        expect(() => textNode.isSegmented()).toThrow();
+      });
+
+      test('LexicalNode.isDirectionless()', async () => {
+        const {editor} = testEnv;
+        let directionlessTextNode: TextNode;
+
+        await editor.update(() => {
+          directionlessTextNode = new TextNode(
+            'directionless',
+          ).toggleDirectionless();
+          directionlessTextNode.toggleUnmergeable();
+          paragraphNode.append(directionlessTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">directionless</span></p></div>',
+        );
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.isDirectionless()).toBe(false);
+          expect(directionlessTextNode.isDirectionless()).toBe(true);
+        });
+        expect(() => directionlessTextNode.isDirectionless()).toThrow();
+      });
+
+      test('LexicalNode.getLatest()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getLatest()).toBe(textNode);
+        });
+        expect(() => textNode.getLatest()).toThrow();
+      });
+
+      test('LexicalNode.getLatest(): garbage collected node', async () => {
+        const {editor} = testEnv;
+        let node: LexicalNode;
+        let text: TextNode;
+        let block: TestElementNode;
+
+        await editor.update(() => {
+          node = new LexicalNode();
+          node.getLatest();
+          text = new TextNode('');
+          text.getLatest();
+          block = new TestElementNode();
+          block.getLatest();
+        });
+
+        await editor.update(() => {
+          expect(() => node.getLatest()).toThrow();
+          expect(() => text.getLatest()).toThrow();
+          expect(() => block.getLatest()).toThrow();
+        });
+      });
+
+      test('LexicalNode.getTextContent()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          expect(node.getTextContent()).toBe('');
+        });
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getTextContent()).toBe('foo');
+        });
+        expect(() => textNode.getTextContent()).toThrow();
+      });
+
+      test('LexicalNode.getTextContentSize()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          expect(textNode.getTextContentSize()).toBe('foo'.length);
+        });
+        expect(() => textNode.getTextContentSize()).toThrow();
+      });
+
+      test('LexicalNode.createDOM()', async () => {
+        const {editor} = testEnv;
+
+        editor.update(() => {
+          const node = new LexicalNode();
+          expect(() =>
+            node.createDOM(
+              {
+                namespace: '',
+                theme: {},
+              },
+              editor,
+            ),
+          ).toThrow();
+        });
+      });
+
+      test('LexicalNode.updateDOM()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          // @ts-expect-error
+          expect(() => node.updateDOM()).toThrow();
+        });
+      });
+
+      test('LexicalNode.remove()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          expect(() => textNode.remove()).toThrow();
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const node = new LexicalNode();
+          node.remove();
+          expect(node.getParent()).toBe(null);
+          textNode.remove();
+          expect(textNode.getParent()).toBe(null);
+          expect(editor._dirtyLeaves.has(textNode.getKey()));
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
+        );
+        expect(() => textNode.remove()).toThrow();
+      });
+
+      test('LexicalNode.replace()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          // @ts-expect-error
+          expect(() => textNode.replace()).toThrow();
+        });
+        expect(() => textNode.remove()).toThrow();
+      });
+
+      test('LexicalNode.replace(): from another parent', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+        let barTextNode: TextNode;
+
+        await editor.update(() => {
+          const rootNode = $getRoot();
+          const barParagraphNode = new ParagraphNode();
+          barTextNode = new TextNode('bar');
+          barParagraphNode.append(barTextNode);
+          rootNode.append(barParagraphNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+        );
+
+        await editor.update(() => {
+          textNode.replace(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p><p dir="ltr"><br></p></div>',
+        );
+      });
+
+      test('LexicalNode.replace(): text', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar');
+          textNode.replace(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.replace(): token', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('token');
+          textNode.replace(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.replace(): segmented', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('segmented');
+          textNode.replace(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.replace(): directionless', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode(`bar`).toggleDirectionless();
+          textNode.replace(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span></p></div>',
+        );
+        // TODO: add text direction validations
+      });
+
+      test('LexicalNode.replace() within canBeEmpty: false', async () => {
+        const {editor} = testEnv;
+
+        jest
+          .spyOn(TestInlineElementNode.prototype, 'canBeEmpty')
+          .mockReturnValue(false);
+
+        await editor.update(() => {
+          textNode = $createTextNode('Hello');
+
+          $getRoot()
+            .clear()
+            .append(
+              $createParagraphNode().append(
+                $createTestInlineElementNode().append(textNode),
+              ),
+            );
+
+          textNode.replace($createTextNode('world'));
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><a dir="ltr"><span data-lexical-text="true">world</span></a></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertAfter()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          // @ts-expect-error
+          expect(() => textNode.insertAfter()).toThrow();
+        });
+        // @ts-expect-error
+        expect(() => textNode.insertAfter()).toThrow();
+      });
+
+      test('LexicalNode.insertAfter(): text', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar');
+          textNode.insertAfter(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foobar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertAfter(): token', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('token');
+          textNode.insertAfter(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertAfter(): segmented', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('token');
+          textNode.insertAfter(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertAfter(): directionless', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode(`bar`).toggleDirectionless();
+          textNode.insertAfter(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foobar</span></p></div>',
+        );
+        // TODO: add text direction validations
+      });
+
+      test('LexicalNode.insertAfter() move blocks around', async () => {
+        const {editor} = testEnv;
+        let block1: ParagraphNode,
+          block2: ParagraphNode,
+          block3: ParagraphNode,
+          text1: TextNode,
+          text2: TextNode,
+          text3: TextNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          root.clear();
+          block1 = new ParagraphNode();
+          block2 = new ParagraphNode();
+          block3 = new ParagraphNode();
+          text1 = new TextNode('A');
+          text2 = new TextNode('B');
+          text3 = new TextNode('C');
+          block1.append(text1);
+          block2.append(text2);
+          block3.append(text3);
+          root.append(block1, block2, block3);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span></p><p dir="ltr"><span data-lexical-text="true">B</span></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+        );
+
+        await editor.update(() => {
+          text1.insertAfter(block2);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span><p dir="ltr"><span data-lexical-text="true">B</span></p></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertAfter() move blocks around #2', async () => {
+        const {editor} = testEnv;
+        let block1: ParagraphNode,
+          block2: ParagraphNode,
+          block3: ParagraphNode,
+          text1: TextNode,
+          text2: TextNode,
+          text3: TextNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          root.clear();
+          block1 = new ParagraphNode();
+          block2 = new ParagraphNode();
+          block3 = new ParagraphNode();
+          text1 = new TextNode('A');
+          text1.toggleUnmergeable();
+          text2 = new TextNode('B');
+          text2.toggleUnmergeable();
+          text3 = new TextNode('C');
+          text3.toggleUnmergeable();
+          block1.append(text1);
+          block2.append(text2);
+          block3.append(text3);
+          root.append(block1);
+          root.append(block2);
+          root.append(block3);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span></p><p dir="ltr"><span data-lexical-text="true">B</span></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+        );
+
+        await editor.update(() => {
+          text3.insertAfter(text1);
+          text3.insertAfter(text2);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p><p><br></p><p dir="ltr"><span data-lexical-text="true">C</span><span data-lexical-text="true">B</span><span data-lexical-text="true">A</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertBefore()', async () => {
+        const {editor} = testEnv;
+
+        await editor.getEditorState().read(() => {
+          // @ts-expect-error
+          expect(() => textNode.insertBefore()).toThrow();
+        });
+        // @ts-expect-error
+        expect(() => textNode.insertBefore()).toThrow();
+      });
+
+      test('LexicalNode.insertBefore(): from another parent', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+        let barTextNode;
+
+        await editor.update(() => {
+          const rootNode = $getRoot();
+          const barParagraphNode = new ParagraphNode();
+          barTextNode = new TextNode('bar');
+          barParagraphNode.append(barTextNode);
+          rootNode.append(barParagraphNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertBefore(): text', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar');
+          textNode.insertBefore(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">barfoo</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertBefore(): token', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('token');
+          textNode.insertBefore(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertBefore(): segmented', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar').setMode('segmented');
+          textNode.insertBefore(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.insertBefore(): directionless', async () => {
+        const {editor} = testEnv;
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+        );
+
+        await editor.update(() => {
+          const barTextNode = new TextNode(`bar`).toggleDirectionless();
+          textNode.insertBefore(barTextNode);
+        });
+
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">barfoo</span></p></div>',
+        );
+      });
+
+      test('LexicalNode.selectNext()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const barTextNode = new TextNode('bar');
+          textNode.insertAfter(barTextNode);
+
+          expect(barTextNode.isSelected()).not.toBe(true);
+
+          textNode.selectNext();
+
+          expect(barTextNode.isSelected()).toBe(true);
+          // TODO: additional validation of anchorOffset and focusOffset
+        });
+      });
+
+      test('LexicalNode.selectNext(): no next sibling', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const selection = textNode.selectNext();
+          expect(selection.anchor.getNode()).toBe(paragraphNode);
+          expect(selection.anchor.offset).toBe(1);
+        });
+      });
+
+      test('LexicalNode.selectNext(): non-text node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const barNode = new TestNode();
+          textNode.insertAfter(barNode);
+          const selection = textNode.selectNext();
+
+          expect(selection.anchor.getNode()).toBe(textNode.getParent());
+          expect(selection.anchor.offset).toBe(1);
+        });
+      });
+    },
+    {
+      namespace: '',
+      nodes: [LexicalNode, TestNode, InlineDecoratorNode],
+      theme: {},
+    },
+  );
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx
new file mode 100644
index 00000000000..ecfbe6bf77f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx
@@ -0,0 +1,176 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  RangeSelection,
+} from 'lexical';
+
+import {$normalizeSelection} from '../../LexicalNormalization';
+import {
+  $createTestDecoratorNode,
+  $createTestElementNode,
+  initializeUnitTest,
+} from '../utils';
+
+describe('LexicalNormalization tests', () => {
+  initializeUnitTest((testEnv) => {
+    describe('$normalizeSelection', () => {
+      for (const reversed of [false, true]) {
+        const getAnchor = (x: RangeSelection) =>
+          reversed ? x.focus : x.anchor;
+        const getFocus = (x: RangeSelection) => (reversed ? x.anchor : x.focus);
+        const reversedStr = reversed ? ' (reversed)' : '';
+
+        test(`paragraph to text nodes${reversedStr}`, async () => {
+          const {editor} = testEnv;
+          editor.update(() => {
+            const root = $getRoot();
+            const paragraph = $createParagraphNode();
+            const text1 = $createTextNode('a');
+            const text2 = $createTextNode('b');
+            paragraph.append(text1, text2);
+            root.append(paragraph);
+
+            const selection = paragraph.select();
+            getAnchor(selection).set(paragraph.__key, 0, 'element');
+            getFocus(selection).set(paragraph.__key, 2, 'element');
+
+            const normalizedSelection = $normalizeSelection(selection);
+            expect(getAnchor(normalizedSelection).type).toBe('text');
+            expect(getAnchor(normalizedSelection).getNode().__key).toBe(
+              text1.__key,
+            );
+            expect(getAnchor(normalizedSelection).offset).toBe(0);
+            expect(getFocus(normalizedSelection).type).toBe('text');
+            expect(getFocus(normalizedSelection).getNode().__key).toBe(
+              text2.__key,
+            );
+            expect(getFocus(normalizedSelection).offset).toBe(1);
+          });
+        });
+
+        test(`paragraph to text node + element${reversedStr}`, async () => {
+          const {editor} = testEnv;
+          editor.update(() => {
+            const root = $getRoot();
+            const paragraph = $createParagraphNode();
+            const text1 = $createTextNode('a');
+            const elementNode = $createTestElementNode();
+            paragraph.append(text1, elementNode);
+            root.append(paragraph);
+
+            const selection = paragraph.select();
+            getAnchor(selection).set(paragraph.__key, 0, 'element');
+            getFocus(selection).set(paragraph.__key, 2, 'element');
+
+            const normalizedSelection = $normalizeSelection(selection);
+            expect(getAnchor(normalizedSelection).type).toBe('text');
+            expect(getAnchor(normalizedSelection).getNode().__key).toBe(
+              text1.__key,
+            );
+            expect(getAnchor(normalizedSelection).offset).toBe(0);
+            expect(getFocus(normalizedSelection).type).toBe('element');
+            expect(getFocus(normalizedSelection).getNode().__key).toBe(
+              elementNode.__key,
+            );
+            expect(getFocus(normalizedSelection).offset).toBe(0);
+          });
+        });
+
+        test(`paragraph to text node + decorator${reversedStr}`, async () => {
+          const {editor} = testEnv;
+          editor.update(() => {
+            const root = $getRoot();
+            const paragraph = $createParagraphNode();
+            const text1 = $createTextNode('a');
+            const decoratorNode = $createTestDecoratorNode();
+            paragraph.append(text1, decoratorNode);
+            root.append(paragraph);
+
+            const selection = paragraph.select();
+            getAnchor(selection).set(paragraph.__key, 0, 'element');
+            getFocus(selection).set(paragraph.__key, 2, 'element');
+
+            const normalizedSelection = $normalizeSelection(selection);
+            expect(getAnchor(normalizedSelection).type).toBe('text');
+            expect(getAnchor(normalizedSelection).getNode().__key).toBe(
+              text1.__key,
+            );
+            expect(getAnchor(normalizedSelection).offset).toBe(0);
+            expect(getFocus(normalizedSelection).type).toBe('element');
+            expect(getFocus(normalizedSelection).getNode().__key).toBe(
+              paragraph.__key,
+            );
+            expect(getFocus(normalizedSelection).offset).toBe(2);
+          });
+        });
+
+        test(`text + text node${reversedStr}`, async () => {
+          const {editor} = testEnv;
+          editor.update(() => {
+            const root = $getRoot();
+            const paragraph = $createParagraphNode();
+            const text1 = $createTextNode('a');
+            const text2 = $createTextNode('b');
+            paragraph.append(text1, text2);
+            root.append(paragraph);
+
+            const selection = paragraph.select();
+            getAnchor(selection).set(text1.__key, 0, 'text');
+            getFocus(selection).set(text2.__key, 1, 'text');
+
+            const normalizedSelection = $normalizeSelection(selection);
+            expect(getAnchor(normalizedSelection).type).toBe('text');
+            expect(getAnchor(normalizedSelection).getNode().__key).toBe(
+              text1.__key,
+            );
+            expect(getAnchor(normalizedSelection).offset).toBe(0);
+            expect(getFocus(normalizedSelection).type).toBe('text');
+            expect(getFocus(normalizedSelection).getNode().__key).toBe(
+              text2.__key,
+            );
+            expect(getFocus(normalizedSelection).offset).toBe(1);
+          });
+        });
+
+        test(`paragraph to test element to text + text${reversedStr}`, async () => {
+          const {editor} = testEnv;
+          editor.update(() => {
+            const root = $getRoot();
+            const paragraph = $createParagraphNode();
+            const elementNode = $createTestElementNode();
+            const text1 = $createTextNode('a');
+            const text2 = $createTextNode('b');
+            elementNode.append(text1, text2);
+            paragraph.append(elementNode);
+            root.append(paragraph);
+
+            const selection = paragraph.select();
+            getAnchor(selection).set(text1.__key, 0, 'text');
+            getFocus(selection).set(text2.__key, 1, 'text');
+
+            const normalizedSelection = $normalizeSelection(selection);
+            expect(getAnchor(normalizedSelection).type).toBe('text');
+            expect(getAnchor(normalizedSelection).getNode().__key).toBe(
+              text1.__key,
+            );
+            expect(getAnchor(normalizedSelection).offset).toBe(0);
+            expect(getFocus(normalizedSelection).type).toBe('text');
+            expect(getFocus(normalizedSelection).getNode().__key).toBe(
+              text2.__key,
+            );
+            expect(getFocus(normalizedSelection).offset).toBe(1);
+          });
+        });
+      }
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
new file mode 100644
index 00000000000..7055f361a96
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
@@ -0,0 +1,342 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createLinkNode, $isLinkNode} from '@lexical/link';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $isParagraphNode,
+  $isTextNode,
+  LexicalEditor,
+  RangeSelection,
+} from 'lexical';
+
+import {initializeUnitTest, invariant} from '../utils';
+
+describe('LexicalSelection tests', () => {
+  initializeUnitTest((testEnv) => {
+    describe('Inserting text either side of inline elements', () => {
+      const setup = async (
+        mode: 'start-of-paragraph' | 'mid-paragraph' | 'end-of-paragraph',
+      ) => {
+        const {container, editor} = testEnv;
+
+        if (!container) {
+          throw new Error('Expected container to be truthy');
+        }
+
+        await editor.update(() => {
+          const root = $getRoot();
+          if (root.getFirstChild() !== null) {
+            throw new Error('Expected root to be childless');
+          }
+
+          const paragraph = $createParagraphNode();
+          if (mode === 'start-of-paragraph') {
+            paragraph.append(
+              $createLinkNode('https://', {}).append($createTextNode('a')),
+              $createTextNode('b'),
+            );
+          } else if (mode === 'mid-paragraph') {
+            paragraph.append(
+              $createTextNode('a'),
+              $createLinkNode('https://', {}).append($createTextNode('b')),
+              $createTextNode('c'),
+            );
+          } else {
+            paragraph.append(
+              $createTextNode('a'),
+              $createLinkNode('https://', {}).append($createTextNode('b')),
+            );
+          }
+
+          root.append(paragraph);
+        });
+
+        const expectation =
+          mode === 'start-of-paragraph'
+            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>'
+            : mode === 'mid-paragraph'
+            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>'
+            : '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a></p></div>';
+
+        expect(container.innerHTML).toBe(expectation);
+
+        return {container, editor};
+      };
+
+      const $insertTextOrNodes = (
+        selection: RangeSelection,
+        method: 'insertText' | 'insertNodes',
+      ) => {
+        if (method === 'insertText') {
+          // Insert text (mirroring what LexicalClipboard does when pasting
+          // inline plain text)
+          selection.insertText('x');
+        } else {
+          // Insert a paragraph bearing a single text node (mirroring what
+          // LexicalClipboard does when pasting inline rich text)
+          selection.insertNodes([
+            $createParagraphNode().append($createTextNode('x')),
+          ]);
+        }
+      };
+
+      describe('Inserting text before inline elements', () => {
+        describe('Start-of-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const linkNode = paragraph.getFirstChildOrThrow();
+              invariant($isLinkNode(linkNode));
+
+              // Place the cursor at the start of the link node
+              // For review: is there a way to select "outside" of the link
+              // node?
+              const selection = linkNode.select(0, 0);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">x</span><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>',
+            );
+          };
+
+          test('Can insert text before a start-of-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('start-of-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          // TODO: https://github.com/facebook/lexical/issues/4295
+          // test('Can insert text before a start-of-paragraph inline element, using insertNodes', async () => {
+          //   const {container, editor} = await setup('start-of-paragraph');
+
+          //   await insertText({container, editor, method: 'insertNodes'});
+          // });
+        });
+
+        describe('Mid-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const textNode = paragraph.getFirstChildOrThrow();
+              invariant($isTextNode(textNode));
+
+              // Place the cursor between the link and the first text node by
+              // selecting the end of the text node
+              const selection = textNode.select(1, 1);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">ax</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>',
+            );
+          };
+
+          test('Can insert text before a mid-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('mid-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          test('Can insert text before a mid-paragraph inline element, using insertNodes', async () => {
+            const {container, editor} = await setup('mid-paragraph');
+
+            await insertText({container, editor, method: 'insertNodes'});
+          });
+        });
+
+        describe('End-of-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const textNode = paragraph.getFirstChildOrThrow();
+              invariant($isTextNode(textNode));
+
+              // Place the cursor before the link element by selecting the end
+              // of the text node
+              const selection = textNode.select(1, 1);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">ax</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a></p></div>',
+            );
+          };
+
+          test('Can insert text before an end-of-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('end-of-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          test('Can insert text before an end-of-paragraph inline element, using insertNodes', async () => {
+            const {container, editor} = await setup('end-of-paragraph');
+
+            await insertText({container, editor, method: 'insertNodes'});
+          });
+        });
+      });
+
+      describe('Inserting text after inline elements', () => {
+        describe('Start-of-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const textNode = paragraph.getLastChildOrThrow();
+              invariant($isTextNode(textNode));
+
+              // Place the cursor between the link and the last text node by
+              // selecting the start of the text node
+              const selection = textNode.select(0, 0);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">xb</span></p></div>',
+            );
+          };
+
+          test('Can insert text after a start-of-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('start-of-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          // TODO: https://github.com/facebook/lexical/issues/4295
+          // test('Can insert text after a start-of-paragraph inline element, using insertNodes', async () => {
+          //   const {container, editor} = await setup('start-of-paragraph');
+
+          //   await insertText({container, editor, method: 'insertNodes'});
+          // });
+        });
+
+        describe('Mid-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const textNode = paragraph.getLastChildOrThrow();
+              invariant($isTextNode(textNode));
+
+              // Place the cursor between the link and the last text node by
+              // selecting the start of the text node
+              const selection = textNode.select(0, 0);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">xc</span></p></div>',
+            );
+          };
+
+          test('Can insert text after a mid-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('mid-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          // TODO: https://github.com/facebook/lexical/issues/4295
+          // test('Can insert text after a mid-paragraph inline element, using insertNodes', async () => {
+          //   const {container, editor} = await setup('mid-paragraph');
+
+          //   await insertText({container, editor, method: 'insertNodes'});
+          // });
+        });
+
+        describe('End-of-paragraph inline elements', () => {
+          const insertText = async ({
+            container,
+            editor,
+            method,
+          }: {
+            container: HTMLDivElement;
+            editor: LexicalEditor;
+            method: 'insertText' | 'insertNodes';
+          }) => {
+            await editor.update(() => {
+              const paragraph = $getRoot().getFirstChildOrThrow();
+              invariant($isParagraphNode(paragraph));
+              const linkNode = paragraph.getLastChildOrThrow();
+              invariant($isLinkNode(linkNode));
+
+              // Place the cursor at the end of the link element
+              // For review: not sure if there's a better way to select
+              // "outside" of the link element.
+              const selection = linkNode.select(1, 1);
+              $insertTextOrNodes(selection, method);
+            });
+
+            expect(container.innerHTML).toBe(
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">x</span></p></div>',
+            );
+          };
+
+          test('Can insert text after an end-of-paragraph inline element, using insertText', async () => {
+            const {container, editor} = await setup('end-of-paragraph');
+
+            await insertText({container, editor, method: 'insertText'});
+          });
+
+          // TODO: https://github.com/facebook/lexical/issues/4295
+          // test('Can insert text after an end-of-paragraph inline element, using insertNodes', async () => {
+          //   const {container, editor} = await setup('end-of-paragraph');
+
+          //   await insertText({container, editor, method: 'insertNodes'});
+          // });
+        });
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
new file mode 100644
index 00000000000..9237bc9d3dd
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createCodeHighlightNode, $createCodeNode} from '@lexical/code';
+import {$createLinkNode} from '@lexical/link';
+import {$createListItemNode, $createListNode} from '@lexical/list';
+import {$createHeadingNode, $createQuoteNode} from '@lexical/rich-text';
+import {$createTableNodeWithDimensions} from '@lexical/table';
+import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
+
+import {initializeUnitTest} from '../utils';
+
+function $createEditorContent() {
+  const root = $getRoot();
+  if (root.getFirstChild() === null) {
+    const heading = $createHeadingNode('h1');
+    heading.append($createTextNode('Welcome to the playground'));
+    root.append(heading);
+    const quote = $createQuoteNode();
+    quote.append(
+      $createTextNode(
+        `In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. ` +
+          `You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.`,
+      ),
+    );
+    root.append(quote);
+    const paragraph = $createParagraphNode();
+    paragraph.append(
+      $createTextNode('The playground is a demo environment built with '),
+      $createTextNode('@lexical/react').toggleFormat('code'),
+      $createTextNode('.'),
+      $createTextNode(' Try typing in '),
+      $createTextNode('some text').toggleFormat('bold'),
+      $createTextNode(' with '),
+      $createTextNode('different').toggleFormat('italic'),
+      $createTextNode(' formats.'),
+    );
+    root.append(paragraph);
+    const paragraph2 = $createParagraphNode();
+    paragraph2.append(
+      $createTextNode(
+        'Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!',
+      ),
+    );
+    root.append(paragraph2);
+    const paragraph3 = $createParagraphNode();
+    paragraph3.append(
+      $createTextNode(`If you'd like to find out more about Lexical, you can:`),
+    );
+    root.append(paragraph3);
+    const list = $createListNode('bullet');
+    list.append(
+      $createListItemNode().append(
+        $createTextNode(`Visit the `),
+        $createLinkNode('https://lexical.dev/').append(
+          $createTextNode('Lexical website'),
+        ),
+        $createTextNode(` for documentation and more information.`),
+      ),
+      $createListItemNode().append(
+        $createTextNode(`Check out the code on our `),
+        $createLinkNode('https://github.com/facebook/lexical').append(
+          $createTextNode('GitHub repository'),
+        ),
+        $createTextNode(`.`),
+      ),
+      $createListItemNode().append(
+        $createTextNode(`Playground code can be found `),
+        $createLinkNode(
+          'https://github.com/facebook/lexical/tree/main/packages/lexical-playground',
+        ).append($createTextNode('here')),
+        $createTextNode(`.`),
+      ),
+      $createListItemNode().append(
+        $createTextNode(`Join our `),
+        $createLinkNode('https://discord.com/invite/KmG4wQnnD9').append(
+          $createTextNode('Discord Server'),
+        ),
+        $createTextNode(` and chat with the team.`),
+      ),
+    );
+    root.append(list);
+    const paragraph4 = $createParagraphNode();
+    paragraph4.append(
+      $createTextNode(
+        `Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).`,
+      ),
+    );
+    root.append(paragraph4);
+    const codeBlock = $createCodeNode('javascript');
+    codeBlock.append($createCodeHighlightNode('const lexical = "awesome"'));
+    root.append(codeBlock);
+    const table = $createTableNodeWithDimensions(5, 5, true);
+    root.append(table);
+  }
+}
+
+describe('LexicalSerialization tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('serializes and deserializes from JSON', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        $createEditorContent();
+      });
+
+      const stringifiedEditorState = JSON.stringify(editor.getEditorState());
+      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"const lexical = \\"awesome\\"","type":"code-highlight","version":1}],"direction":"ltr","format":"","indent":0,"type":"code","version":1,"language":"javascript"},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1}],"direction":"ltr","format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`;
+
+      expect(stringifiedEditorState).toBe(expectedStringifiedEditorState);
+
+      const editorState = editor.parseEditorState(stringifiedEditorState);
+
+      const otherStringifiedEditorState = JSON.stringify(editorState);
+
+      expect(otherStringifiedEditorState).toBe(
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"const lexical = \\"awesome\\"","type":"code-highlight","version":1}],"direction":"ltr","format":"","indent":0,"type":"code","version":1,"language":"javascript"},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+      );
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalUtils.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalUtils.test.ts
new file mode 100644
index 00000000000..0026cf5d6ad
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalUtils.test.ts
@@ -0,0 +1,293 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $getNodeByKey,
+  $getRoot,
+  $isTokenOrSegmented,
+  $nodesOfType,
+  emptyFunction,
+  generateRandomKey,
+  getCachedTypeToNodeMap,
+  getTextDirection,
+  isArray,
+  isSelectionWithinEditor,
+  resetRandomKey,
+  scheduleMicroTask,
+} from '../../LexicalUtils';
+import {
+  $createParagraphNode,
+  ParagraphNode,
+} from '../../nodes/LexicalParagraphNode';
+import {$createTextNode, TextNode} from '../../nodes/LexicalTextNode';
+import {initializeUnitTest} from '../utils';
+
+describe('LexicalUtils tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('scheduleMicroTask(): native', async () => {
+      jest.resetModules();
+
+      let flag = false;
+
+      scheduleMicroTask(() => {
+        flag = true;
+      });
+
+      expect(flag).toBe(false);
+
+      await null;
+
+      expect(flag).toBe(true);
+    });
+
+    test('scheduleMicroTask(): promise', async () => {
+      jest.resetModules();
+      const nativeQueueMicrotask = window.queueMicrotask;
+      const fn = jest.fn();
+      try {
+        // @ts-ignore
+        window.queueMicrotask = undefined;
+        scheduleMicroTask(fn);
+      } finally {
+        // Reset it before yielding control
+        window.queueMicrotask = nativeQueueMicrotask;
+      }
+
+      expect(fn).toHaveBeenCalledTimes(0);
+
+      await null;
+
+      expect(fn).toHaveBeenCalledTimes(1);
+    });
+
+    test('emptyFunction()', () => {
+      expect(emptyFunction).toBeInstanceOf(Function);
+      expect(emptyFunction.length).toBe(0);
+      expect(emptyFunction()).toBe(undefined);
+    });
+
+    test('resetRandomKey()', () => {
+      resetRandomKey();
+      const key1 = generateRandomKey();
+      resetRandomKey();
+      const key2 = generateRandomKey();
+      expect(typeof key1).toBe('string');
+      expect(typeof key2).toBe('string');
+      expect(key1).not.toBe('');
+      expect(key2).not.toBe('');
+      expect(key1).toEqual(key2);
+    });
+
+    test('generateRandomKey()', () => {
+      const key1 = generateRandomKey();
+      const key2 = generateRandomKey();
+      expect(typeof key1).toBe('string');
+      expect(typeof key2).toBe('string');
+      expect(key1).not.toBe('');
+      expect(key2).not.toBe('');
+      expect(key1).not.toEqual(key2);
+    });
+
+    test('isArray()', () => {
+      expect(isArray).toBeInstanceOf(Function);
+      expect(isArray).toBe(Array.isArray);
+    });
+
+    test('isSelectionWithinEditor()', async () => {
+      const {editor} = testEnv;
+      let textNode: TextNode;
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        textNode = $createTextNode('foo');
+        paragraph.append(textNode);
+        root.append(paragraph);
+      });
+
+      await editor.update(() => {
+        const domSelection = window.getSelection()!;
+
+        expect(
+          isSelectionWithinEditor(
+            editor,
+            domSelection.anchorNode,
+            domSelection.focusNode,
+          ),
+        ).toBe(false);
+
+        textNode.select(0, 0);
+      });
+
+      await editor.update(() => {
+        const domSelection = window.getSelection()!;
+
+        expect(
+          isSelectionWithinEditor(
+            editor,
+            domSelection.anchorNode,
+            domSelection.focusNode,
+          ),
+        ).toBe(true);
+      });
+    });
+
+    test('getTextDirection()', () => {
+      expect(getTextDirection('')).toBe(null);
+      expect(getTextDirection(' ')).toBe(null);
+      expect(getTextDirection('0')).toBe(null);
+      expect(getTextDirection('A')).toBe('ltr');
+      expect(getTextDirection('Z')).toBe('ltr');
+      expect(getTextDirection('a')).toBe('ltr');
+      expect(getTextDirection('z')).toBe('ltr');
+      expect(getTextDirection('\u00C0')).toBe('ltr');
+      expect(getTextDirection('\u00D6')).toBe('ltr');
+      expect(getTextDirection('\u00D8')).toBe('ltr');
+      expect(getTextDirection('\u00F6')).toBe('ltr');
+      expect(getTextDirection('\u00F8')).toBe('ltr');
+      expect(getTextDirection('\u02B8')).toBe('ltr');
+      expect(getTextDirection('\u0300')).toBe('ltr');
+      expect(getTextDirection('\u0590')).toBe('ltr');
+      expect(getTextDirection('\u0800')).toBe('ltr');
+      expect(getTextDirection('\u1FFF')).toBe('ltr');
+      expect(getTextDirection('\u200E')).toBe('ltr');
+      expect(getTextDirection('\u2C00')).toBe('ltr');
+      expect(getTextDirection('\uFB1C')).toBe('ltr');
+      expect(getTextDirection('\uFE00')).toBe('ltr');
+      expect(getTextDirection('\uFE6F')).toBe('ltr');
+      expect(getTextDirection('\uFEFD')).toBe('ltr');
+      expect(getTextDirection('\uFFFF')).toBe('ltr');
+      expect(getTextDirection(`\u0591`)).toBe('rtl');
+      expect(getTextDirection(`\u07FF`)).toBe('rtl');
+      expect(getTextDirection(`\uFB1D`)).toBe('rtl');
+      expect(getTextDirection(`\uFDFD`)).toBe('rtl');
+      expect(getTextDirection(`\uFE70`)).toBe('rtl');
+      expect(getTextDirection(`\uFEFC`)).toBe('rtl');
+    });
+
+    test('isTokenOrSegmented()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const node = $createTextNode('foo');
+        expect($isTokenOrSegmented(node)).toBe(false);
+
+        const tokenNode = $createTextNode().setMode('token');
+        expect($isTokenOrSegmented(tokenNode)).toBe(true);
+
+        const segmentedNode = $createTextNode('foo').setMode('segmented');
+        expect($isTokenOrSegmented(segmentedNode)).toBe(true);
+      });
+    });
+
+    test('$getNodeByKey', async () => {
+      const {editor} = testEnv;
+      let paragraphNode: ParagraphNode;
+      let textNode: TextNode;
+
+      await editor.update(() => {
+        const rootNode = $getRoot();
+        paragraphNode = new ParagraphNode();
+        textNode = new TextNode('foo');
+        paragraphNode.append(textNode);
+        rootNode.append(paragraphNode);
+      });
+
+      await editor.getEditorState().read(() => {
+        expect($getNodeByKey('1')).toBe(paragraphNode);
+        expect($getNodeByKey('2')).toBe(textNode);
+        expect($getNodeByKey('3')).toBe(null);
+      });
+
+      // @ts-expect-error
+      expect(() => $getNodeByKey()).toThrow();
+    });
+
+    test('$nodesOfType', async () => {
+      const {editor} = testEnv;
+      const paragraphKeys: string[] = [];
+
+      const $paragraphKeys = () =>
+        $nodesOfType(ParagraphNode).map((node) => node.getKey());
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+        $createParagraphNode();
+        root.append(paragraph1, paragraph2);
+        paragraphKeys.push(paragraph1.getKey(), paragraph2.getKey());
+        const currentParagraphKeys = $paragraphKeys();
+        expect(currentParagraphKeys).toHaveLength(paragraphKeys.length);
+        expect(currentParagraphKeys).toEqual(
+          expect.arrayContaining(paragraphKeys),
+        );
+      });
+      editor.getEditorState().read(() => {
+        const currentParagraphKeys = $paragraphKeys();
+        expect(currentParagraphKeys).toHaveLength(paragraphKeys.length);
+        expect(currentParagraphKeys).toEqual(
+          expect.arrayContaining(paragraphKeys),
+        );
+      });
+    });
+
+    test('getCachedTypeToNodeMap', async () => {
+      const {editor} = testEnv;
+      const paragraphKeys: string[] = [];
+
+      const initialTypeToNodeMap = getCachedTypeToNodeMap(
+        editor.getEditorState(),
+      );
+      expect(getCachedTypeToNodeMap(editor.getEditorState())).toBe(
+        initialTypeToNodeMap,
+      );
+      expect([...initialTypeToNodeMap.keys()]).toEqual(['root']);
+      expect(initialTypeToNodeMap.get('root')).toMatchObject({size: 1});
+
+      editor.update(
+        () => {
+          const root = $getRoot();
+          const paragraph1 = $createParagraphNode().append(
+            $createTextNode('a'),
+          );
+          const paragraph2 = $createParagraphNode().append(
+            $createTextNode('b'),
+          );
+          // these will be garbage collected and not in the readonly map
+          $createParagraphNode().append($createTextNode('c'));
+          root.append(paragraph1, paragraph2);
+          paragraphKeys.push(paragraph1.getKey(), paragraph2.getKey());
+        },
+        {discrete: true},
+      );
+
+      const typeToNodeMap = getCachedTypeToNodeMap(editor.getEditorState());
+      // verify that the initial cache was not used
+      expect(typeToNodeMap).not.toBe(initialTypeToNodeMap);
+      // verify that the cache is used for subsequent calls
+      expect(getCachedTypeToNodeMap(editor.getEditorState())).toBe(
+        typeToNodeMap,
+      );
+      expect(typeToNodeMap.size).toEqual(3);
+      expect([...typeToNodeMap.keys()]).toEqual(
+        expect.arrayContaining(['root', 'paragraph', 'text']),
+      );
+      const paragraphMap = typeToNodeMap.get('paragraph')!;
+      expect(paragraphMap.size).toEqual(paragraphKeys.length);
+      expect([...paragraphMap.keys()]).toEqual(
+        expect.arrayContaining(paragraphKeys),
+      );
+      const textMap = typeToNodeMap.get('text')!;
+      expect(textMap.size).toEqual(2);
+      expect(
+        [...textMap.values()].map((node) => (node as TextNode).__text),
+      ).toEqual(expect.arrayContaining(['a', 'b']));
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
new file mode 100644
index 00000000000..b7ccfab1ebd
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -0,0 +1,751 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {createHeadlessEditor} from '@lexical/headless';
+import {AutoLinkNode, LinkNode} from '@lexical/link';
+import {ListItemNode, ListNode} from '@lexical/list';
+
+import {HeadingNode, QuoteNode} from '@lexical/rich-text';
+import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
+
+import {
+  $isRangeSelection,
+  createEditor,
+  DecoratorNode,
+  EditorState,
+  EditorThemeClasses,
+  ElementNode,
+  Klass,
+  LexicalEditor,
+  LexicalNode,
+  RangeSelection,
+  SerializedElementNode,
+  SerializedLexicalNode,
+  SerializedTextNode,
+  TextNode,
+} from 'lexical';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+import {
+  CreateEditorArgs,
+  HTMLConfig,
+  LexicalNodeReplacement,
+} from '../../LexicalEditor';
+import {resetRandomKey} from '../../LexicalUtils';
+
+
+type TestEnv = {
+  readonly container: HTMLDivElement;
+  readonly editor: LexicalEditor;
+  readonly outerHTML: string;
+  readonly innerHTML: string;
+};
+
+export function initializeUnitTest(
+  runTests: (testEnv: TestEnv) => void,
+  editorConfig: CreateEditorArgs = {namespace: 'test', theme: {}},
+) {
+  const testEnv = {
+    _container: null as HTMLDivElement | null,
+    _editor: null as LexicalEditor | null,
+    get container() {
+      if (!this._container) {
+        throw new Error('testEnv.container not initialized.');
+      }
+      return this._container;
+    },
+    set container(container) {
+      this._container = container;
+    },
+    get editor() {
+      if (!this._editor) {
+        throw new Error('testEnv.editor not initialized.');
+      }
+      return this._editor;
+    },
+    set editor(editor) {
+      this._editor = editor;
+    },
+    get innerHTML() {
+      return (this.container.firstChild as HTMLElement).innerHTML;
+    },
+    get outerHTML() {
+      return this.container.innerHTML;
+    },
+    reset() {
+      this._container = null;
+      this._editor = null;
+    },
+  };
+
+  beforeEach(async () => {
+    resetRandomKey();
+
+    testEnv.container = document.createElement('div');
+    document.body.appendChild(testEnv.container);
+
+    const useLexicalEditor = (
+      rootElementRef: React.RefObject<HTMLDivElement>,
+    ) => {
+      const lexicalEditor = React.useMemo(() => {
+        const lexical = createTestEditor(editorConfig);
+        return lexical;
+      }, []);
+
+      React.useEffect(() => {
+        const rootElement = rootElementRef.current;
+        lexicalEditor.setRootElement(rootElement);
+      }, [rootElementRef, lexicalEditor]);
+      return lexicalEditor;
+    };
+
+    const Editor = () => {
+      testEnv.editor = useLexicalEditor(ref);
+      const context = createLexicalComposerContext(
+        null,
+        editorConfig?.theme ?? {},
+      );
+      return (
+        <LexicalComposerContext.Provider value={[testEnv.editor, context]}>
+          <div ref={ref} contentEditable={true} />
+          {plugins}
+        </LexicalComposerContext.Provider>
+      );
+    };
+
+    ReactTestUtils.act(() => {
+      createRoot(testEnv.container).render(<Editor />);
+    });
+  });
+
+  afterEach(() => {
+    document.body.removeChild(testEnv.container);
+    testEnv.reset();
+  });
+
+  runTests(testEnv);
+}
+
+export function initializeClipboard() {
+  Object.defineProperty(window, 'DragEvent', {
+    value: class DragEvent {},
+  });
+  Object.defineProperty(window, 'ClipboardEvent', {
+    value: class ClipboardEvent {},
+  });
+}
+
+export type SerializedTestElementNode = SerializedElementNode;
+
+export class TestElementNode extends ElementNode {
+  static getType(): string {
+    return 'test_block';
+  }
+
+  static clone(node: TestElementNode) {
+    return new TestElementNode(node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestElementNode,
+  ): TestInlineElementNode {
+    const node = $createTestInlineElementNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedTestElementNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_block',
+      version: 1,
+    };
+  }
+
+  createDOM() {
+    return document.createElement('div');
+  }
+
+  updateDOM() {
+    return false;
+  }
+}
+
+export function $createTestElementNode(): TestElementNode {
+  return new TestElementNode();
+}
+
+type SerializedTestTextNode = SerializedTextNode;
+
+export class TestTextNode extends TextNode {
+  static getType() {
+    return 'test_text';
+  }
+
+  static clone(node: TestTextNode): TestTextNode {
+    return new TestTextNode(node.__text, node.__key);
+  }
+
+  static importJSON(serializedNode: SerializedTestTextNode): TestTextNode {
+    return new TestTextNode(serializedNode.text);
+  }
+
+  exportJSON(): SerializedTestTextNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_text',
+      version: 1,
+    };
+  }
+}
+
+export type SerializedTestInlineElementNode = SerializedElementNode;
+
+export class TestInlineElementNode extends ElementNode {
+  static getType(): string {
+    return 'test_inline_block';
+  }
+
+  static clone(node: TestInlineElementNode) {
+    return new TestInlineElementNode(node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestInlineElementNode,
+  ): TestInlineElementNode {
+    const node = $createTestInlineElementNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedTestInlineElementNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_inline_block',
+      version: 1,
+    };
+  }
+
+  createDOM() {
+    return document.createElement('a');
+  }
+
+  updateDOM() {
+    return false;
+  }
+
+  isInline() {
+    return true;
+  }
+}
+
+export function $createTestInlineElementNode(): TestInlineElementNode {
+  return new TestInlineElementNode();
+}
+
+export type SerializedTestShadowRootNode = SerializedElementNode;
+
+export class TestShadowRootNode extends ElementNode {
+  static getType(): string {
+    return 'test_shadow_root';
+  }
+
+  static clone(node: TestShadowRootNode) {
+    return new TestElementNode(node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestShadowRootNode,
+  ): TestShadowRootNode {
+    const node = $createTestShadowRootNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedTestShadowRootNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_block',
+      version: 1,
+    };
+  }
+
+  createDOM() {
+    return document.createElement('div');
+  }
+
+  updateDOM() {
+    return false;
+  }
+
+  isShadowRoot() {
+    return true;
+  }
+}
+
+export function $createTestShadowRootNode(): TestShadowRootNode {
+  return new TestShadowRootNode();
+}
+
+export type SerializedTestSegmentedNode = SerializedTextNode;
+
+export class TestSegmentedNode extends TextNode {
+  static getType(): string {
+    return 'test_segmented';
+  }
+
+  static clone(node: TestSegmentedNode): TestSegmentedNode {
+    return new TestSegmentedNode(node.__text, node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestSegmentedNode,
+  ): TestSegmentedNode {
+    const node = $createTestSegmentedNode(serializedNode.text);
+    node.setFormat(serializedNode.format);
+    node.setDetail(serializedNode.detail);
+    node.setMode(serializedNode.mode);
+    node.setStyle(serializedNode.style);
+    return node;
+  }
+
+  exportJSON(): SerializedTestSegmentedNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_segmented',
+      version: 1,
+    };
+  }
+}
+
+export function $createTestSegmentedNode(text: string): TestSegmentedNode {
+  return new TestSegmentedNode(text).setMode('segmented');
+}
+
+export type SerializedTestExcludeFromCopyElementNode = SerializedElementNode;
+
+export class TestExcludeFromCopyElementNode extends ElementNode {
+  static getType(): string {
+    return 'test_exclude_from_copy_block';
+  }
+
+  static clone(node: TestExcludeFromCopyElementNode) {
+    return new TestExcludeFromCopyElementNode(node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestExcludeFromCopyElementNode,
+  ): TestExcludeFromCopyElementNode {
+    const node = $createTestExcludeFromCopyElementNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedTestExcludeFromCopyElementNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_exclude_from_copy_block',
+      version: 1,
+    };
+  }
+
+  createDOM() {
+    return document.createElement('div');
+  }
+
+  updateDOM() {
+    return false;
+  }
+
+  excludeFromCopy() {
+    return true;
+  }
+}
+
+export function $createTestExcludeFromCopyElementNode(): TestExcludeFromCopyElementNode {
+  return new TestExcludeFromCopyElementNode();
+}
+
+export type SerializedTestDecoratorNode = SerializedLexicalNode;
+
+export class TestDecoratorNode extends DecoratorNode<JSX.Element> {
+  static getType(): string {
+    return 'test_decorator';
+  }
+
+  static clone(node: TestDecoratorNode) {
+    return new TestDecoratorNode(node.__key);
+  }
+
+  static importJSON(
+    serializedNode: SerializedTestDecoratorNode,
+  ): TestDecoratorNode {
+    return $createTestDecoratorNode();
+  }
+
+  exportJSON(): SerializedTestDecoratorNode {
+    return {
+      ...super.exportJSON(),
+      type: 'test_decorator',
+      version: 1,
+    };
+  }
+
+  static importDOM() {
+    return {
+      'test-decorator': (domNode: HTMLElement) => {
+        return {
+          conversion: () => ({node: $createTestDecoratorNode()}),
+        };
+      },
+    };
+  }
+
+  exportDOM() {
+    return {
+      element: document.createElement('test-decorator'),
+    };
+  }
+
+  getTextContent() {
+    return 'Hello world';
+  }
+
+  createDOM() {
+    return document.createElement('span');
+  }
+
+  updateDOM() {
+    return false;
+  }
+
+  decorate() {
+    return <Decorator text={'Hello world'} />;
+  }
+}
+
+function Decorator({text}: {text: string}): JSX.Element {
+  return <span>{text}</span>;
+}
+
+export function $createTestDecoratorNode(): TestDecoratorNode {
+  return new TestDecoratorNode();
+}
+
+const DEFAULT_NODES: NonNullable<InitialConfigType['nodes']> = [
+  HeadingNode,
+  ListNode,
+  ListItemNode,
+  QuoteNode,
+  CodeNode,
+  TableNode,
+  TableCellNode,
+  TableRowNode,
+  HashtagNode,
+  CodeHighlightNode,
+  AutoLinkNode,
+  LinkNode,
+  OverflowNode,
+  TestElementNode,
+  TestSegmentedNode,
+  TestExcludeFromCopyElementNode,
+  TestDecoratorNode,
+  TestInlineElementNode,
+  TestShadowRootNode,
+  TestTextNode,
+];
+
+export function createTestEditor(
+  config: {
+    namespace?: string;
+    editorState?: EditorState;
+    theme?: EditorThemeClasses;
+    parentEditor?: LexicalEditor;
+    nodes?: ReadonlyArray<Klass<LexicalNode> | LexicalNodeReplacement>;
+    onError?: (error: Error) => void;
+    disableEvents?: boolean;
+    readOnly?: boolean;
+    html?: HTMLConfig;
+  } = {},
+): LexicalEditor {
+  const customNodes = config.nodes || [];
+  const editor = createEditor({
+    namespace: config.namespace,
+    onError: (e) => {
+      throw e;
+    },
+    ...config,
+    nodes: DEFAULT_NODES.concat(customNodes),
+  });
+  return editor;
+}
+
+export function createTestHeadlessEditor(
+  editorState?: EditorState,
+): LexicalEditor {
+  return createHeadlessEditor({
+    editorState,
+    onError: (error) => {
+      throw error;
+    },
+  });
+}
+
+export function $assertRangeSelection(selection: unknown): RangeSelection {
+  if (!$isRangeSelection(selection)) {
+    throw new Error(`Expected RangeSelection, got ${selection}`);
+  }
+  return selection;
+}
+
+export function invariant(cond?: boolean, message?: string): asserts cond {
+  if (cond) {
+    return;
+  }
+  throw new Error(`Invariant: ${message}`);
+}
+
+export class ClipboardDataMock {
+  getData: jest.Mock<string, [string]>;
+  setData: jest.Mock<void, [string, string]>;
+
+  constructor() {
+    this.getData = jest.fn();
+    this.setData = jest.fn();
+  }
+}
+
+export class DataTransferMock implements DataTransfer {
+  _data: Map<string, string> = new Map();
+  get dropEffect(): DataTransfer['dropEffect'] {
+    throw new Error('Getter not implemented.');
+  }
+  get effectAllowed(): DataTransfer['effectAllowed'] {
+    throw new Error('Getter not implemented.');
+  }
+  get files(): FileList {
+    throw new Error('Getter not implemented.');
+  }
+  get items(): DataTransferItemList {
+    throw new Error('Getter not implemented.');
+  }
+  get types(): ReadonlyArray<string> {
+    return Array.from(this._data.keys());
+  }
+  clearData(dataType?: string): void {
+    //
+  }
+  getData(dataType: string): string {
+    return this._data.get(dataType) || '';
+  }
+  setData(dataType: string, data: string): void {
+    this._data.set(dataType, data);
+  }
+  setDragImage(image: Element, x: number, y: number): void {
+    //
+  }
+}
+
+export class EventMock implements Event {
+  get bubbles(): boolean {
+    throw new Error('Getter not implemented.');
+  }
+  get cancelBubble(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get cancelable(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get composed(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get currentTarget(): EventTarget | null {
+    throw new Error('Gettter not implemented.');
+  }
+  get defaultPrevented(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get eventPhase(): number {
+    throw new Error('Gettter not implemented.');
+  }
+  get isTrusted(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get returnValue(): boolean {
+    throw new Error('Gettter not implemented.');
+  }
+  get srcElement(): EventTarget | null {
+    throw new Error('Gettter not implemented.');
+  }
+  get target(): EventTarget | null {
+    throw new Error('Gettter not implemented.');
+  }
+  get timeStamp(): number {
+    throw new Error('Gettter not implemented.');
+  }
+  get type(): string {
+    throw new Error('Gettter not implemented.');
+  }
+  composedPath(): EventTarget[] {
+    throw new Error('Method not implemented.');
+  }
+  initEvent(
+    type: string,
+    bubbles?: boolean | undefined,
+    cancelable?: boolean | undefined,
+  ): void {
+    throw new Error('Method not implemented.');
+  }
+  stopImmediatePropagation(): void {
+    return;
+  }
+  stopPropagation(): void {
+    return;
+  }
+  NONE = 0 as const;
+  CAPTURING_PHASE = 1 as const;
+  AT_TARGET = 2 as const;
+  BUBBLING_PHASE = 3 as const;
+  preventDefault() {
+    return;
+  }
+}
+
+export class KeyboardEventMock extends EventMock implements KeyboardEvent {
+  altKey = false;
+  get charCode(): number {
+    throw new Error('Getter not implemented.');
+  }
+  get code(): string {
+    throw new Error('Getter not implemented.');
+  }
+  ctrlKey = false;
+  get isComposing(): boolean {
+    throw new Error('Getter not implemented.');
+  }
+  get key(): string {
+    throw new Error('Getter not implemented.');
+  }
+  get keyCode(): number {
+    throw new Error('Getter not implemented.');
+  }
+  get location(): number {
+    throw new Error('Getter not implemented.');
+  }
+  metaKey = false;
+  get repeat(): boolean {
+    throw new Error('Getter not implemented.');
+  }
+  shiftKey = false;
+  constructor(type: void | string) {
+    super();
+  }
+  getModifierState(keyArg: string): boolean {
+    throw new Error('Method not implemented.');
+  }
+  initKeyboardEvent(
+    typeArg: string,
+    bubblesArg?: boolean | undefined,
+    cancelableArg?: boolean | undefined,
+    viewArg?: Window | null | undefined,
+    keyArg?: string | undefined,
+    locationArg?: number | undefined,
+    ctrlKey?: boolean | undefined,
+    altKey?: boolean | undefined,
+    shiftKey?: boolean | undefined,
+    metaKey?: boolean | undefined,
+  ): void {
+    throw new Error('Method not implemented.');
+  }
+  DOM_KEY_LOCATION_STANDARD = 0 as const;
+  DOM_KEY_LOCATION_LEFT = 1 as const;
+  DOM_KEY_LOCATION_RIGHT = 2 as const;
+  DOM_KEY_LOCATION_NUMPAD = 3 as const;
+  get detail(): number {
+    throw new Error('Getter not implemented.');
+  }
+  get view(): Window | null {
+    throw new Error('Getter not implemented.');
+  }
+  get which(): number {
+    throw new Error('Getter not implemented.');
+  }
+  initUIEvent(
+    typeArg: string,
+    bubblesArg?: boolean | undefined,
+    cancelableArg?: boolean | undefined,
+    viewArg?: Window | null | undefined,
+    detailArg?: number | undefined,
+  ): void {
+    throw new Error('Method not implemented.');
+  }
+}
+
+export function tabKeyboardEvent() {
+  return new KeyboardEventMock('keydown');
+}
+
+export function shiftTabKeyboardEvent() {
+  const keyboardEvent = new KeyboardEventMock('keydown');
+  keyboardEvent.shiftKey = true;
+  return keyboardEvent;
+}
+
+export function generatePermutations<T>(
+  values: T[],
+  maxLength = values.length,
+): T[][] {
+  if (maxLength > values.length) {
+    throw new Error('maxLength over values.length');
+  }
+  const result: T[][] = [];
+  const current: T[] = [];
+  const seen = new Set();
+  (function permutationsImpl() {
+    if (current.length > maxLength) {
+      return;
+    }
+    result.push(current.slice());
+    for (let i = 0; i < values.length; i++) {
+      const key = values[i];
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+      current.push(key);
+      permutationsImpl();
+      seen.delete(key);
+      current.pop();
+    }
+  })();
+  return result;
+}
+
+// This tag function is just used to trigger prettier auto-formatting.
+// (https://prettier.io/blog/2020/08/24/2.1.0.html#api)
+export function html(
+  partials: TemplateStringsArray,
+  ...params: string[]
+): string {
+  let output = '';
+  for (let i = 0; i < partials.length; i++) {
+    output += partials[i];
+    if (i < partials.length - 1) {
+      output += params[i];
+    }
+  }
+  return output;
+}
diff --git a/resources/js/wysiwyg/lexical/core/index.ts b/resources/js/wysiwyg/lexical/core/index.ts
new file mode 100644
index 00000000000..5ef926b5afc
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/index.ts
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export type {PasteCommandType} from './LexicalCommands';
+export type {
+  CommandListener,
+  CommandListenerPriority,
+  CommandPayloadType,
+  CreateEditorArgs,
+  EditableListener,
+  EditorConfig,
+  EditorSetOptions,
+  EditorThemeClasses,
+  EditorThemeClassName,
+  EditorUpdateOptions,
+  HTMLConfig,
+  Klass,
+  KlassConstructor,
+  LexicalCommand,
+  LexicalEditor,
+  LexicalNodeReplacement,
+  MutationListener,
+  NodeMutation,
+  SerializedEditor,
+  Spread,
+  Transform,
+} from './LexicalEditor';
+export type {
+  EditorState,
+  EditorStateReadOptions,
+  SerializedEditorState,
+} from './LexicalEditorState';
+export type {
+  DOMChildConversion,
+  DOMConversion,
+  DOMConversionFn,
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  LexicalNode,
+  NodeKey,
+  NodeMap,
+  SerializedLexicalNode,
+} from './LexicalNode';
+export type {
+  BaseSelection,
+  ElementPointType as ElementPoint,
+  NodeSelection,
+  Point,
+  PointType,
+  RangeSelection,
+  TextPointType as TextPoint,
+} from './LexicalSelection';
+export type {
+  ElementFormatType,
+  SerializedElementNode,
+} from './nodes/LexicalElementNode';
+export type {SerializedRootNode} from './nodes/LexicalRootNode';
+export type {
+  SerializedTextNode,
+  TextFormatType,
+  TextModeType,
+} from './nodes/LexicalTextNode';
+
+// TODO Move this somewhere else and/or recheck if we still need this
+export {
+  BLUR_COMMAND,
+  CAN_REDO_COMMAND,
+  CAN_UNDO_COMMAND,
+  CLEAR_EDITOR_COMMAND,
+  CLEAR_HISTORY_COMMAND,
+  CLICK_COMMAND,
+  CONTROLLED_TEXT_INSERTION_COMMAND,
+  COPY_COMMAND,
+  createCommand,
+  CUT_COMMAND,
+  DELETE_CHARACTER_COMMAND,
+  DELETE_LINE_COMMAND,
+  DELETE_WORD_COMMAND,
+  DRAGEND_COMMAND,
+  DRAGOVER_COMMAND,
+  DRAGSTART_COMMAND,
+  DROP_COMMAND,
+  FOCUS_COMMAND,
+  FORMAT_ELEMENT_COMMAND,
+  FORMAT_TEXT_COMMAND,
+  INDENT_CONTENT_COMMAND,
+  INSERT_LINE_BREAK_COMMAND,
+  INSERT_PARAGRAPH_COMMAND,
+  INSERT_TAB_COMMAND,
+  KEY_ARROW_DOWN_COMMAND,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_ARROW_UP_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND,
+  KEY_DOWN_COMMAND,
+  KEY_ENTER_COMMAND,
+  KEY_ESCAPE_COMMAND,
+  KEY_MODIFIER_COMMAND,
+  KEY_SPACE_COMMAND,
+  KEY_TAB_COMMAND,
+  MOVE_TO_END,
+  MOVE_TO_START,
+  OUTDENT_CONTENT_COMMAND,
+  PASTE_COMMAND,
+  REDO_COMMAND,
+  REMOVE_TEXT_COMMAND,
+  SELECT_ALL_COMMAND,
+  SELECTION_CHANGE_COMMAND,
+  SELECTION_INSERT_CLIPBOARD_NODES_COMMAND,
+  UNDO_COMMAND,
+} from './LexicalCommands';
+export {
+  IS_ALL_FORMATTING,
+  IS_BOLD,
+  IS_CODE,
+  IS_HIGHLIGHT,
+  IS_ITALIC,
+  IS_STRIKETHROUGH,
+  IS_SUBSCRIPT,
+  IS_SUPERSCRIPT,
+  IS_UNDERLINE,
+  TEXT_TYPE_TO_FORMAT,
+} from './LexicalConstants';
+export {
+  COMMAND_PRIORITY_CRITICAL,
+  COMMAND_PRIORITY_EDITOR,
+  COMMAND_PRIORITY_HIGH,
+  COMMAND_PRIORITY_LOW,
+  COMMAND_PRIORITY_NORMAL,
+  createEditor,
+} from './LexicalEditor';
+export type {EventHandler} from './LexicalEvents';
+export {$normalizeSelection as $normalizeSelection__EXPERIMENTAL} from './LexicalNormalization';
+export {
+  $createNodeSelection,
+  $createPoint,
+  $createRangeSelection,
+  $createRangeSelectionFromDom,
+  $getCharacterOffsets,
+  $getPreviousSelection,
+  $getSelection,
+  $getTextContent,
+  $insertNodes,
+  $isBlockElementNode,
+  $isNodeSelection,
+  $isRangeSelection,
+} from './LexicalSelection';
+export {$parseSerializedNode, isCurrentlyReadOnlyMode} from './LexicalUpdates';
+export {
+  $addUpdateTag,
+  $applyNodeReplacement,
+  $cloneWithProperties,
+  $copyNode,
+  $getAdjacentNode,
+  $getEditor,
+  $getNearestNodeFromDOMNode,
+  $getNearestRootOrShadowRoot,
+  $getNodeByKey,
+  $getNodeByKeyOrThrow,
+  $getRoot,
+  $hasAncestor,
+  $hasUpdateTag,
+  $isInlineElementOrDecoratorNode,
+  $isLeafNode,
+  $isRootOrShadowRoot,
+  $isTokenOrSegmented,
+  $nodesOfType,
+  $selectAll,
+  $setCompositionKey,
+  $setSelection,
+  $splitNode,
+  getEditorPropertyFromDOMNode,
+  getNearestEditorFromDOMNode,
+  isBlockDomNode,
+  isHTMLAnchorElement,
+  isHTMLElement,
+  isInlineDomNode,
+  isLexicalEditor,
+  isSelectionCapturedInDecoratorInput,
+  isSelectionWithinEditor,
+  resetRandomKey,
+} from './LexicalUtils';
+export {ArtificialNode__DO_NOT_USE} from './nodes/ArtificialNode';
+export {$isDecoratorNode, DecoratorNode} from './nodes/LexicalDecoratorNode';
+export {$isElementNode, ElementNode} from './nodes/LexicalElementNode';
+export type {SerializedLineBreakNode} from './nodes/LexicalLineBreakNode';
+export {
+  $createLineBreakNode,
+  $isLineBreakNode,
+  LineBreakNode,
+} from './nodes/LexicalLineBreakNode';
+export type {SerializedParagraphNode} from './nodes/LexicalParagraphNode';
+export {
+  $createParagraphNode,
+  $isParagraphNode,
+  ParagraphNode,
+} from './nodes/LexicalParagraphNode';
+export {$isRootNode, RootNode} from './nodes/LexicalRootNode';
+export type {SerializedTabNode} from './nodes/LexicalTabNode';
+export {$createTabNode, $isTabNode, TabNode} from './nodes/LexicalTabNode';
+export {$createTextNode, $isTextNode, TextNode} from './nodes/LexicalTextNode';
diff --git a/resources/js/wysiwyg/lexical/core/nodes/ArtificialNode.ts b/resources/js/wysiwyg/lexical/core/nodes/ArtificialNode.ts
new file mode 100644
index 00000000000..0f01d2c3493
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/ArtificialNode.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import type {EditorConfig} from 'lexical';
+
+import {ElementNode} from './LexicalElementNode';
+
+// TODO: Cleanup ArtificialNode__DO_NOT_USE #5966
+export class ArtificialNode__DO_NOT_USE extends ElementNode {
+  static getType(): string {
+    return 'artificial';
+  }
+
+  createDOM(config: EditorConfig): HTMLElement {
+    // this isnt supposed to be used and is not used anywhere but defining it to appease the API
+    const dom = document.createElement('div');
+    return dom;
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
new file mode 100644
index 00000000000..99d2669d92f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {KlassConstructor, LexicalEditor} from '../LexicalEditor';
+import type {NodeKey} from '../LexicalNode';
+import type {ElementNode} from './LexicalElementNode';
+
+import {EditorConfig} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {LexicalNode} from '../LexicalNode';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export interface DecoratorNode<T> {
+  getTopLevelElement(): ElementNode | this | null;
+  getTopLevelElementOrThrow(): ElementNode | this;
+}
+
+/** @noInheritDoc */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export class DecoratorNode<T> extends LexicalNode {
+  ['constructor']!: KlassConstructor<typeof DecoratorNode<T>>;
+  constructor(key?: NodeKey) {
+    super(key);
+  }
+
+  /**
+   * The returned value is added to the LexicalEditor._decorators
+   */
+  decorate(editor: LexicalEditor, config: EditorConfig): T {
+    invariant(false, 'decorate: base method not extended');
+  }
+
+  isIsolated(): boolean {
+    return false;
+  }
+
+  isInline(): boolean {
+    return true;
+  }
+
+  isKeyboardSelectable(): boolean {
+    return true;
+  }
+}
+
+export function $isDecoratorNode<T>(
+  node: LexicalNode | null | undefined,
+): node is DecoratorNode<T> {
+  return node instanceof DecoratorNode;
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
new file mode 100644
index 00000000000..88c6d56780f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -0,0 +1,635 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {NodeKey, SerializedLexicalNode} from '../LexicalNode';
+import type {
+  BaseSelection,
+  PointType,
+  RangeSelection,
+} from '../LexicalSelection';
+import type {KlassConstructor, Spread} from 'lexical';
+
+import invariant from 'lexical/shared/invariant';
+
+import {$isTextNode, TextNode} from '../index';
+import {
+  DOUBLE_LINE_BREAK,
+  ELEMENT_FORMAT_TO_TYPE,
+  ELEMENT_TYPE_TO_FORMAT,
+} from '../LexicalConstants';
+import {LexicalNode} from '../LexicalNode';
+import {
+  $getSelection,
+  $internalMakeRangeSelection,
+  $isRangeSelection,
+  moveSelectionPointToSibling,
+} from '../LexicalSelection';
+import {errorOnReadOnly, getActiveEditor} from '../LexicalUpdates';
+import {
+  $getNodeByKey,
+  $isRootOrShadowRoot,
+  removeFromParent,
+} from '../LexicalUtils';
+
+export type SerializedElementNode<
+  T extends SerializedLexicalNode = SerializedLexicalNode,
+> = Spread<
+  {
+    children: Array<T>;
+    direction: 'ltr' | 'rtl' | null;
+    format: ElementFormatType;
+    indent: number;
+  },
+  SerializedLexicalNode
+>;
+
+export type ElementFormatType =
+  | 'left'
+  | 'start'
+  | 'center'
+  | 'right'
+  | 'end'
+  | 'justify'
+  | '';
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export interface ElementNode {
+  getTopLevelElement(): ElementNode | null;
+  getTopLevelElementOrThrow(): ElementNode;
+}
+
+/** @noInheritDoc */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export class ElementNode extends LexicalNode {
+  ['constructor']!: KlassConstructor<typeof ElementNode>;
+  /** @internal */
+  __first: null | NodeKey;
+  /** @internal */
+  __last: null | NodeKey;
+  /** @internal */
+  __size: number;
+  /** @internal */
+  __format: number;
+  /** @internal */
+  __style: string;
+  /** @internal */
+  __indent: number;
+  /** @internal */
+  __dir: 'ltr' | 'rtl' | null;
+
+  constructor(key?: NodeKey) {
+    super(key);
+    this.__first = null;
+    this.__last = null;
+    this.__size = 0;
+    this.__format = 0;
+    this.__style = '';
+    this.__indent = 0;
+    this.__dir = null;
+  }
+
+  afterCloneFrom(prevNode: this) {
+    super.afterCloneFrom(prevNode);
+    this.__first = prevNode.__first;
+    this.__last = prevNode.__last;
+    this.__size = prevNode.__size;
+    this.__indent = prevNode.__indent;
+    this.__format = prevNode.__format;
+    this.__style = prevNode.__style;
+    this.__dir = prevNode.__dir;
+  }
+
+  getFormat(): number {
+    const self = this.getLatest();
+    return self.__format;
+  }
+  getFormatType(): ElementFormatType {
+    const format = this.getFormat();
+    return ELEMENT_FORMAT_TO_TYPE[format] || '';
+  }
+  getStyle(): string {
+    const self = this.getLatest();
+    return self.__style;
+  }
+  getIndent(): number {
+    const self = this.getLatest();
+    return self.__indent;
+  }
+  getChildren<T extends LexicalNode>(): Array<T> {
+    const children: Array<T> = [];
+    let child: T | null = this.getFirstChild();
+    while (child !== null) {
+      children.push(child);
+      child = child.getNextSibling();
+    }
+    return children;
+  }
+  getChildrenKeys(): Array<NodeKey> {
+    const children: Array<NodeKey> = [];
+    let child: LexicalNode | null = this.getFirstChild();
+    while (child !== null) {
+      children.push(child.__key);
+      child = child.getNextSibling();
+    }
+    return children;
+  }
+  getChildrenSize(): number {
+    const self = this.getLatest();
+    return self.__size;
+  }
+  isEmpty(): boolean {
+    return this.getChildrenSize() === 0;
+  }
+  isDirty(): boolean {
+    const editor = getActiveEditor();
+    const dirtyElements = editor._dirtyElements;
+    return dirtyElements !== null && dirtyElements.has(this.__key);
+  }
+  isLastChild(): boolean {
+    const self = this.getLatest();
+    const parentLastChild = this.getParentOrThrow().getLastChild();
+    return parentLastChild !== null && parentLastChild.is(self);
+  }
+  getAllTextNodes(): Array<TextNode> {
+    const textNodes = [];
+    let child: LexicalNode | null = this.getFirstChild();
+    while (child !== null) {
+      if ($isTextNode(child)) {
+        textNodes.push(child);
+      }
+      if ($isElementNode(child)) {
+        const subChildrenNodes = child.getAllTextNodes();
+        textNodes.push(...subChildrenNodes);
+      }
+      child = child.getNextSibling();
+    }
+    return textNodes;
+  }
+  getFirstDescendant<T extends LexicalNode>(): null | T {
+    let node = this.getFirstChild<T>();
+    while ($isElementNode(node)) {
+      const child = node.getFirstChild<T>();
+      if (child === null) {
+        break;
+      }
+      node = child;
+    }
+    return node;
+  }
+  getLastDescendant<T extends LexicalNode>(): null | T {
+    let node = this.getLastChild<T>();
+    while ($isElementNode(node)) {
+      const child = node.getLastChild<T>();
+      if (child === null) {
+        break;
+      }
+      node = child;
+    }
+    return node;
+  }
+  getDescendantByIndex<T extends LexicalNode>(index: number): null | T {
+    const children = this.getChildren<T>();
+    const childrenLength = children.length;
+    // For non-empty element nodes, we resolve its descendant
+    // (either a leaf node or the bottom-most element)
+    if (index >= childrenLength) {
+      const resolvedNode = children[childrenLength - 1];
+      return (
+        ($isElementNode(resolvedNode) && resolvedNode.getLastDescendant()) ||
+        resolvedNode ||
+        null
+      );
+    }
+    const resolvedNode = children[index];
+    return (
+      ($isElementNode(resolvedNode) && resolvedNode.getFirstDescendant()) ||
+      resolvedNode ||
+      null
+    );
+  }
+  getFirstChild<T extends LexicalNode>(): null | T {
+    const self = this.getLatest();
+    const firstKey = self.__first;
+    return firstKey === null ? null : $getNodeByKey<T>(firstKey);
+  }
+  getFirstChildOrThrow<T extends LexicalNode>(): T {
+    const firstChild = this.getFirstChild<T>();
+    if (firstChild === null) {
+      invariant(false, 'Expected node %s to have a first child.', this.__key);
+    }
+    return firstChild;
+  }
+  getLastChild<T extends LexicalNode>(): null | T {
+    const self = this.getLatest();
+    const lastKey = self.__last;
+    return lastKey === null ? null : $getNodeByKey<T>(lastKey);
+  }
+  getLastChildOrThrow<T extends LexicalNode>(): T {
+    const lastChild = this.getLastChild<T>();
+    if (lastChild === null) {
+      invariant(false, 'Expected node %s to have a last child.', this.__key);
+    }
+    return lastChild;
+  }
+  getChildAtIndex<T extends LexicalNode>(index: number): null | T {
+    const size = this.getChildrenSize();
+    let node: null | T;
+    let i;
+    if (index < size / 2) {
+      node = this.getFirstChild<T>();
+      i = 0;
+      while (node !== null && i <= index) {
+        if (i === index) {
+          return node;
+        }
+        node = node.getNextSibling();
+        i++;
+      }
+      return null;
+    }
+    node = this.getLastChild<T>();
+    i = size - 1;
+    while (node !== null && i >= index) {
+      if (i === index) {
+        return node;
+      }
+      node = node.getPreviousSibling();
+      i--;
+    }
+    return null;
+  }
+  getTextContent(): string {
+    let textContent = '';
+    const children = this.getChildren();
+    const childrenLength = children.length;
+    for (let i = 0; i < childrenLength; i++) {
+      const child = children[i];
+      textContent += child.getTextContent();
+      if (
+        $isElementNode(child) &&
+        i !== childrenLength - 1 &&
+        !child.isInline()
+      ) {
+        textContent += DOUBLE_LINE_BREAK;
+      }
+    }
+    return textContent;
+  }
+  getTextContentSize(): number {
+    let textContentSize = 0;
+    const children = this.getChildren();
+    const childrenLength = children.length;
+    for (let i = 0; i < childrenLength; i++) {
+      const child = children[i];
+      textContentSize += child.getTextContentSize();
+      if (
+        $isElementNode(child) &&
+        i !== childrenLength - 1 &&
+        !child.isInline()
+      ) {
+        textContentSize += DOUBLE_LINE_BREAK.length;
+      }
+    }
+    return textContentSize;
+  }
+  getDirection(): 'ltr' | 'rtl' | null {
+    const self = this.getLatest();
+    return self.__dir;
+  }
+  hasFormat(type: ElementFormatType): boolean {
+    if (type !== '') {
+      const formatFlag = ELEMENT_TYPE_TO_FORMAT[type];
+      return (this.getFormat() & formatFlag) !== 0;
+    }
+    return false;
+  }
+
+  // Mutators
+
+  select(_anchorOffset?: number, _focusOffset?: number): RangeSelection {
+    errorOnReadOnly();
+    const selection = $getSelection();
+    let anchorOffset = _anchorOffset;
+    let focusOffset = _focusOffset;
+    const childrenCount = this.getChildrenSize();
+    if (!this.canBeEmpty()) {
+      if (_anchorOffset === 0 && _focusOffset === 0) {
+        const firstChild = this.getFirstChild();
+        if ($isTextNode(firstChild) || $isElementNode(firstChild)) {
+          return firstChild.select(0, 0);
+        }
+      } else if (
+        (_anchorOffset === undefined || _anchorOffset === childrenCount) &&
+        (_focusOffset === undefined || _focusOffset === childrenCount)
+      ) {
+        const lastChild = this.getLastChild();
+        if ($isTextNode(lastChild) || $isElementNode(lastChild)) {
+          return lastChild.select();
+        }
+      }
+    }
+    if (anchorOffset === undefined) {
+      anchorOffset = childrenCount;
+    }
+    if (focusOffset === undefined) {
+      focusOffset = childrenCount;
+    }
+    const key = this.__key;
+    if (!$isRangeSelection(selection)) {
+      return $internalMakeRangeSelection(
+        key,
+        anchorOffset,
+        key,
+        focusOffset,
+        'element',
+        'element',
+      );
+    } else {
+      selection.anchor.set(key, anchorOffset, 'element');
+      selection.focus.set(key, focusOffset, 'element');
+      selection.dirty = true;
+    }
+    return selection;
+  }
+  selectStart(): RangeSelection {
+    const firstNode = this.getFirstDescendant();
+    return firstNode ? firstNode.selectStart() : this.select();
+  }
+  selectEnd(): RangeSelection {
+    const lastNode = this.getLastDescendant();
+    return lastNode ? lastNode.selectEnd() : this.select();
+  }
+  clear(): this {
+    const writableSelf = this.getWritable();
+    const children = this.getChildren();
+    children.forEach((child) => child.remove());
+    return writableSelf;
+  }
+  append(...nodesToAppend: LexicalNode[]): this {
+    return this.splice(this.getChildrenSize(), 0, nodesToAppend);
+  }
+  setDirection(direction: 'ltr' | 'rtl' | null): this {
+    const self = this.getWritable();
+    self.__dir = direction;
+    return self;
+  }
+  setFormat(type: ElementFormatType): this {
+    const self = this.getWritable();
+    self.__format = type !== '' ? ELEMENT_TYPE_TO_FORMAT[type] : 0;
+    return this;
+  }
+  setStyle(style: string): this {
+    const self = this.getWritable();
+    self.__style = style || '';
+    return this;
+  }
+  setIndent(indentLevel: number): this {
+    const self = this.getWritable();
+    self.__indent = indentLevel;
+    return this;
+  }
+  splice(
+    start: number,
+    deleteCount: number,
+    nodesToInsert: Array<LexicalNode>,
+  ): this {
+    const nodesToInsertLength = nodesToInsert.length;
+    const oldSize = this.getChildrenSize();
+    const writableSelf = this.getWritable();
+    const writableSelfKey = writableSelf.__key;
+    const nodesToInsertKeys = [];
+    const nodesToRemoveKeys = [];
+    const nodeAfterRange = this.getChildAtIndex(start + deleteCount);
+    let nodeBeforeRange = null;
+    let newSize = oldSize - deleteCount + nodesToInsertLength;
+
+    if (start !== 0) {
+      if (start === oldSize) {
+        nodeBeforeRange = this.getLastChild();
+      } else {
+        const node = this.getChildAtIndex(start);
+        if (node !== null) {
+          nodeBeforeRange = node.getPreviousSibling();
+        }
+      }
+    }
+
+    if (deleteCount > 0) {
+      let nodeToDelete =
+        nodeBeforeRange === null
+          ? this.getFirstChild()
+          : nodeBeforeRange.getNextSibling();
+      for (let i = 0; i < deleteCount; i++) {
+        if (nodeToDelete === null) {
+          invariant(false, 'splice: sibling not found');
+        }
+        const nextSibling = nodeToDelete.getNextSibling();
+        const nodeKeyToDelete = nodeToDelete.__key;
+        const writableNodeToDelete = nodeToDelete.getWritable();
+        removeFromParent(writableNodeToDelete);
+        nodesToRemoveKeys.push(nodeKeyToDelete);
+        nodeToDelete = nextSibling;
+      }
+    }
+
+    let prevNode = nodeBeforeRange;
+    for (let i = 0; i < nodesToInsertLength; i++) {
+      const nodeToInsert = nodesToInsert[i];
+      if (prevNode !== null && nodeToInsert.is(prevNode)) {
+        nodeBeforeRange = prevNode = prevNode.getPreviousSibling();
+      }
+      const writableNodeToInsert = nodeToInsert.getWritable();
+      if (writableNodeToInsert.__parent === writableSelfKey) {
+        newSize--;
+      }
+      removeFromParent(writableNodeToInsert);
+      const nodeKeyToInsert = nodeToInsert.__key;
+      if (prevNode === null) {
+        writableSelf.__first = nodeKeyToInsert;
+        writableNodeToInsert.__prev = null;
+      } else {
+        const writablePrevNode = prevNode.getWritable();
+        writablePrevNode.__next = nodeKeyToInsert;
+        writableNodeToInsert.__prev = writablePrevNode.__key;
+      }
+      if (nodeToInsert.__key === writableSelfKey) {
+        invariant(false, 'append: attempting to append self');
+      }
+      // Set child parent to self
+      writableNodeToInsert.__parent = writableSelfKey;
+      nodesToInsertKeys.push(nodeKeyToInsert);
+      prevNode = nodeToInsert;
+    }
+
+    if (start + deleteCount === oldSize) {
+      if (prevNode !== null) {
+        const writablePrevNode = prevNode.getWritable();
+        writablePrevNode.__next = null;
+        writableSelf.__last = prevNode.__key;
+      }
+    } else if (nodeAfterRange !== null) {
+      const writableNodeAfterRange = nodeAfterRange.getWritable();
+      if (prevNode !== null) {
+        const writablePrevNode = prevNode.getWritable();
+        writableNodeAfterRange.__prev = prevNode.__key;
+        writablePrevNode.__next = nodeAfterRange.__key;
+      } else {
+        writableNodeAfterRange.__prev = null;
+      }
+    }
+
+    writableSelf.__size = newSize;
+
+    // In case of deletion we need to adjust selection, unlink removed nodes
+    // and clean up node itself if it becomes empty. None of these needed
+    // for insertion-only cases
+    if (nodesToRemoveKeys.length) {
+      // Adjusting selection, in case node that was anchor/focus will be deleted
+      const selection = $getSelection();
+      if ($isRangeSelection(selection)) {
+        const nodesToRemoveKeySet = new Set(nodesToRemoveKeys);
+        const nodesToInsertKeySet = new Set(nodesToInsertKeys);
+
+        const {anchor, focus} = selection;
+        if (isPointRemoved(anchor, nodesToRemoveKeySet, nodesToInsertKeySet)) {
+          moveSelectionPointToSibling(
+            anchor,
+            anchor.getNode(),
+            this,
+            nodeBeforeRange,
+            nodeAfterRange,
+          );
+        }
+        if (isPointRemoved(focus, nodesToRemoveKeySet, nodesToInsertKeySet)) {
+          moveSelectionPointToSibling(
+            focus,
+            focus.getNode(),
+            this,
+            nodeBeforeRange,
+            nodeAfterRange,
+          );
+        }
+        // Cleanup if node can't be empty
+        if (newSize === 0 && !this.canBeEmpty() && !$isRootOrShadowRoot(this)) {
+          this.remove();
+        }
+      }
+    }
+
+    return writableSelf;
+  }
+  // JSON serialization
+  exportJSON(): SerializedElementNode {
+    return {
+      children: [],
+      direction: this.getDirection(),
+      format: this.getFormatType(),
+      indent: this.getIndent(),
+      type: 'element',
+      version: 1,
+    };
+  }
+  // These are intended to be extends for specific element heuristics.
+  insertNewAfter(
+    selection: RangeSelection,
+    restoreSelection?: boolean,
+  ): null | LexicalNode {
+    return null;
+  }
+  canIndent(): boolean {
+    return true;
+  }
+  /*
+   * This method controls the behavior of a the node during backwards
+   * deletion (i.e., backspace) when selection is at the beginning of
+   * the node (offset 0)
+   */
+  collapseAtStart(selection: RangeSelection): boolean {
+    return false;
+  }
+  excludeFromCopy(destination?: 'clone' | 'html'): boolean {
+    return false;
+  }
+  /** @deprecated @internal */
+  canReplaceWith(replacement: LexicalNode): boolean {
+    return true;
+  }
+  /** @deprecated @internal */
+  canInsertAfter(node: LexicalNode): boolean {
+    return true;
+  }
+  canBeEmpty(): boolean {
+    return true;
+  }
+  canInsertTextBefore(): boolean {
+    return true;
+  }
+  canInsertTextAfter(): boolean {
+    return true;
+  }
+  isInline(): boolean {
+    return false;
+  }
+  // A shadow root is a Node that behaves like RootNode. The shadow root (and RootNode) mark the
+  // end of the hiercharchy, most implementations should treat it as there's nothing (upwards)
+  // beyond this point. For example, node.getTopLevelElement(), when performed inside a TableCellNode
+  // will return the immediate first child underneath TableCellNode instead of RootNode.
+  isShadowRoot(): boolean {
+    return false;
+  }
+  /** @deprecated @internal */
+  canMergeWith(node: ElementNode): boolean {
+    return false;
+  }
+  extractWithChild(
+    child: LexicalNode,
+    selection: BaseSelection | null,
+    destination: 'clone' | 'html',
+  ): boolean {
+    return false;
+  }
+
+  /**
+   * Determines whether this node, when empty, can merge with a first block
+   * of nodes being inserted.
+   *
+   * This method is specifically called in {@link RangeSelection.insertNodes}
+   * to determine merging behavior during nodes insertion.
+   *
+   * @example
+   * // In a ListItemNode or QuoteNode implementation:
+   * canMergeWhenEmpty(): true {
+   *  return true;
+   * }
+   */
+  canMergeWhenEmpty(): boolean {
+    return false;
+  }
+}
+
+export function $isElementNode(
+  node: LexicalNode | null | undefined,
+): node is ElementNode {
+  return node instanceof ElementNode;
+}
+
+function isPointRemoved(
+  point: PointType,
+  nodesToRemoveKeySet: Set<NodeKey>,
+  nodesToInsertKeySet: Set<NodeKey>,
+): boolean {
+  let node: ElementNode | TextNode | null = point.getNode();
+  while (node) {
+    const nodeKey = node.__key;
+    if (nodesToRemoveKeySet.has(nodeKey) && !nodesToInsertKeySet.has(nodeKey)) {
+      return true;
+    }
+    node = node.getParent();
+  }
+  return false;
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
new file mode 100644
index 00000000000..2d28db08c12
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {KlassConstructor} from '../LexicalEditor';
+import type {
+  DOMConversionMap,
+  DOMConversionOutput,
+  NodeKey,
+  SerializedLexicalNode,
+} from '../LexicalNode';
+
+import {DOM_TEXT_TYPE} from '../LexicalConstants';
+import {LexicalNode} from '../LexicalNode';
+import {$applyNodeReplacement, isBlockDomNode} from '../LexicalUtils';
+
+export type SerializedLineBreakNode = SerializedLexicalNode;
+
+/** @noInheritDoc */
+export class LineBreakNode extends LexicalNode {
+  ['constructor']!: KlassConstructor<typeof LineBreakNode>;
+  static getType(): string {
+    return 'linebreak';
+  }
+
+  static clone(node: LineBreakNode): LineBreakNode {
+    return new LineBreakNode(node.__key);
+  }
+
+  constructor(key?: NodeKey) {
+    super(key);
+  }
+
+  getTextContent(): '\n' {
+    return '\n';
+  }
+
+  createDOM(): HTMLElement {
+    return document.createElement('br');
+  }
+
+  updateDOM(): false {
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      br: (node: Node) => {
+        if (isOnlyChildInBlockNode(node) || isLastChildInBlockNode(node)) {
+          return null;
+        }
+        return {
+          conversion: $convertLineBreakElement,
+          priority: 0,
+        };
+      },
+    };
+  }
+
+  static importJSON(
+    serializedLineBreakNode: SerializedLineBreakNode,
+  ): LineBreakNode {
+    return $createLineBreakNode();
+  }
+
+  exportJSON(): SerializedLexicalNode {
+    return {
+      type: 'linebreak',
+      version: 1,
+    };
+  }
+}
+
+function $convertLineBreakElement(node: Node): DOMConversionOutput {
+  return {node: $createLineBreakNode()};
+}
+
+export function $createLineBreakNode(): LineBreakNode {
+  return $applyNodeReplacement(new LineBreakNode());
+}
+
+export function $isLineBreakNode(
+  node: LexicalNode | null | undefined,
+): node is LineBreakNode {
+  return node instanceof LineBreakNode;
+}
+
+function isOnlyChildInBlockNode(node: Node): boolean {
+  const parentElement = node.parentElement;
+  if (parentElement !== null && isBlockDomNode(parentElement)) {
+    const firstChild = parentElement.firstChild!;
+    if (
+      firstChild === node ||
+      (firstChild.nextSibling === node && isWhitespaceDomTextNode(firstChild))
+    ) {
+      const lastChild = parentElement.lastChild!;
+      if (
+        lastChild === node ||
+        (lastChild.previousSibling === node &&
+          isWhitespaceDomTextNode(lastChild))
+      ) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+function isLastChildInBlockNode(node: Node): boolean {
+  const parentElement = node.parentElement;
+  if (parentElement !== null && isBlockDomNode(parentElement)) {
+    // check if node is first child, because only childs dont count
+    const firstChild = parentElement.firstChild!;
+    if (
+      firstChild === node ||
+      (firstChild.nextSibling === node && isWhitespaceDomTextNode(firstChild))
+    ) {
+      return false;
+    }
+
+    // check if its last child
+    const lastChild = parentElement.lastChild!;
+    if (
+      lastChild === node ||
+      (lastChild.previousSibling === node && isWhitespaceDomTextNode(lastChild))
+    ) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isWhitespaceDomTextNode(node: Node): boolean {
+  return (
+    node.nodeType === DOM_TEXT_TYPE &&
+    /^( |\t|\r?\n)+$/.test(node.textContent || '')
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
new file mode 100644
index 00000000000..deab3a2cc13
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -0,0 +1,236 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  EditorConfig,
+  KlassConstructor,
+  LexicalEditor,
+  Spread,
+} from '../LexicalEditor';
+import type {
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  LexicalNode,
+  NodeKey,
+} from '../LexicalNode';
+import type {
+  ElementFormatType,
+  SerializedElementNode,
+} from './LexicalElementNode';
+import type {RangeSelection} from 'lexical';
+
+import {TEXT_TYPE_TO_FORMAT} from '../LexicalConstants';
+import {
+  $applyNodeReplacement,
+  getCachedClassNameArray,
+  isHTMLElement,
+} from '../LexicalUtils';
+import {ElementNode} from './LexicalElementNode';
+import {$isTextNode, TextFormatType} from './LexicalTextNode';
+
+export type SerializedParagraphNode = Spread<
+  {
+    textFormat: number;
+    textStyle: string;
+  },
+  SerializedElementNode
+>;
+
+/** @noInheritDoc */
+export class ParagraphNode extends ElementNode {
+  ['constructor']!: KlassConstructor<typeof ParagraphNode>;
+  /** @internal */
+  __textFormat: number;
+  __textStyle: string;
+
+  constructor(key?: NodeKey) {
+    super(key);
+    this.__textFormat = 0;
+    this.__textStyle = '';
+  }
+
+  static getType(): string {
+    return 'paragraph';
+  }
+
+  getTextFormat(): number {
+    const self = this.getLatest();
+    return self.__textFormat;
+  }
+
+  setTextFormat(type: number): this {
+    const self = this.getWritable();
+    self.__textFormat = type;
+    return self;
+  }
+
+  hasTextFormat(type: TextFormatType): boolean {
+    const formatFlag = TEXT_TYPE_TO_FORMAT[type];
+    return (this.getTextFormat() & formatFlag) !== 0;
+  }
+
+  getTextStyle(): string {
+    const self = this.getLatest();
+    return self.__textStyle;
+  }
+
+  setTextStyle(style: string): this {
+    const self = this.getWritable();
+    self.__textStyle = style;
+    return self;
+  }
+
+  static clone(node: ParagraphNode): ParagraphNode {
+    return new ParagraphNode(node.__key);
+  }
+
+  afterCloneFrom(prevNode: this) {
+    super.afterCloneFrom(prevNode);
+    this.__textFormat = prevNode.__textFormat;
+    this.__textStyle = prevNode.__textStyle;
+  }
+
+  // View
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const dom = document.createElement('p');
+    const classNames = getCachedClassNameArray(config.theme, 'paragraph');
+    if (classNames !== undefined) {
+      const domClassList = dom.classList;
+      domClassList.add(...classNames);
+    }
+    return dom;
+  }
+  updateDOM(
+    prevNode: ParagraphNode,
+    dom: HTMLElement,
+    config: EditorConfig,
+  ): boolean {
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      p: (node: Node) => ({
+        conversion: $convertParagraphElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const {element} = super.exportDOM(editor);
+
+    if (element && isHTMLElement(element)) {
+      if (this.isEmpty()) {
+        element.append(document.createElement('br'));
+      }
+
+      const formatType = this.getFormatType();
+      element.style.textAlign = formatType;
+
+      const direction = this.getDirection();
+      if (direction) {
+        element.dir = direction;
+      }
+      const indent = this.getIndent();
+      if (indent > 0) {
+        // padding-inline-start is not widely supported in email HTML, but
+        // Lexical Reconciler uses padding-inline-start. Using text-indent instead.
+        element.style.textIndent = `${indent * 20}px`;
+      }
+    }
+
+    return {
+      element,
+    };
+  }
+
+  static importJSON(serializedNode: SerializedParagraphNode): ParagraphNode {
+    const node = $createParagraphNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    node.setTextFormat(serializedNode.textFormat);
+    return node;
+  }
+
+  exportJSON(): SerializedParagraphNode {
+    return {
+      ...super.exportJSON(),
+      textFormat: this.getTextFormat(),
+      textStyle: this.getTextStyle(),
+      type: 'paragraph',
+      version: 1,
+    };
+  }
+
+  // Mutation
+
+  insertNewAfter(
+    rangeSelection: RangeSelection,
+    restoreSelection: boolean,
+  ): ParagraphNode {
+    const newElement = $createParagraphNode();
+    newElement.setTextFormat(rangeSelection.format);
+    newElement.setTextStyle(rangeSelection.style);
+    const direction = this.getDirection();
+    newElement.setDirection(direction);
+    newElement.setFormat(this.getFormatType());
+    newElement.setStyle(this.getTextStyle());
+    this.insertAfter(newElement, restoreSelection);
+    return newElement;
+  }
+
+  collapseAtStart(): boolean {
+    const children = this.getChildren();
+    // If we have an empty (trimmed) first paragraph and try and remove it,
+    // delete the paragraph as long as we have another sibling to go to
+    if (
+      children.length === 0 ||
+      ($isTextNode(children[0]) && children[0].getTextContent().trim() === '')
+    ) {
+      const nextSibling = this.getNextSibling();
+      if (nextSibling !== null) {
+        this.selectNext();
+        this.remove();
+        return true;
+      }
+      const prevSibling = this.getPreviousSibling();
+      if (prevSibling !== null) {
+        this.selectPrevious();
+        this.remove();
+        return true;
+      }
+    }
+    return false;
+  }
+}
+
+function $convertParagraphElement(element: HTMLElement): DOMConversionOutput {
+  const node = $createParagraphNode();
+  if (element.style) {
+    node.setFormat(element.style.textAlign as ElementFormatType);
+    const indent = parseInt(element.style.textIndent, 10) / 20;
+    if (indent > 0) {
+      node.setIndent(indent);
+    }
+  }
+  return {node};
+}
+
+export function $createParagraphNode(): ParagraphNode {
+  return $applyNodeReplacement(new ParagraphNode());
+}
+
+export function $isParagraphNode(
+  node: LexicalNode | null | undefined,
+): node is ParagraphNode {
+  return node instanceof ParagraphNode;
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
new file mode 100644
index 00000000000..74c8d5a7f9b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalNode, SerializedLexicalNode} from '../LexicalNode';
+import type {SerializedElementNode} from './LexicalElementNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {NO_DIRTY_NODES} from '../LexicalConstants';
+import {getActiveEditor, isCurrentlyReadOnlyMode} from '../LexicalUpdates';
+import {$getRoot} from '../LexicalUtils';
+import {$isDecoratorNode} from './LexicalDecoratorNode';
+import {$isElementNode, ElementNode} from './LexicalElementNode';
+
+export type SerializedRootNode<
+  T extends SerializedLexicalNode = SerializedLexicalNode,
+> = SerializedElementNode<T>;
+
+/** @noInheritDoc */
+export class RootNode extends ElementNode {
+  /** @internal */
+  __cachedText: null | string;
+
+  static getType(): string {
+    return 'root';
+  }
+
+  static clone(): RootNode {
+    return new RootNode();
+  }
+
+  constructor() {
+    super('root');
+    this.__cachedText = null;
+  }
+
+  getTopLevelElementOrThrow(): never {
+    invariant(
+      false,
+      'getTopLevelElementOrThrow: root nodes are not top level elements',
+    );
+  }
+
+  getTextContent(): string {
+    const cachedText = this.__cachedText;
+    if (
+      isCurrentlyReadOnlyMode() ||
+      getActiveEditor()._dirtyType === NO_DIRTY_NODES
+    ) {
+      if (cachedText !== null) {
+        return cachedText;
+      }
+    }
+    return super.getTextContent();
+  }
+
+  remove(): never {
+    invariant(false, 'remove: cannot be called on root nodes');
+  }
+
+  replace<N = LexicalNode>(node: N): never {
+    invariant(false, 'replace: cannot be called on root nodes');
+  }
+
+  insertBefore(nodeToInsert: LexicalNode): LexicalNode {
+    invariant(false, 'insertBefore: cannot be called on root nodes');
+  }
+
+  insertAfter(nodeToInsert: LexicalNode): LexicalNode {
+    invariant(false, 'insertAfter: cannot be called on root nodes');
+  }
+
+  // View
+
+  updateDOM(prevNode: RootNode, dom: HTMLElement): false {
+    return false;
+  }
+
+  // Mutate
+
+  append(...nodesToAppend: LexicalNode[]): this {
+    for (let i = 0; i < nodesToAppend.length; i++) {
+      const node = nodesToAppend[i];
+      if (!$isElementNode(node) && !$isDecoratorNode(node)) {
+        invariant(
+          false,
+          'rootNode.append: Only element or decorator nodes can be appended to the root node',
+        );
+      }
+    }
+    return super.append(...nodesToAppend);
+  }
+
+  static importJSON(serializedNode: SerializedRootNode): RootNode {
+    // We don't create a root, and instead use the existing root.
+    const node = $getRoot();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedRootNode {
+    return {
+      children: [],
+      direction: this.getDirection(),
+      format: this.getFormatType(),
+      indent: this.getIndent(),
+      type: 'root',
+      version: 1,
+    };
+  }
+
+  collapseAtStart(): true {
+    return true;
+  }
+}
+
+export function $createRootNode(): RootNode {
+  return new RootNode();
+}
+
+export function $isRootNode(
+  node: RootNode | LexicalNode | null | undefined,
+): node is RootNode {
+  return node instanceof RootNode;
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTabNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTabNode.ts
new file mode 100644
index 00000000000..5fa3623d41d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTabNode.ts
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {DOMConversionMap, NodeKey} from '../LexicalNode';
+
+import invariant from 'lexical/shared/invariant';
+
+import {IS_UNMERGEABLE} from '../LexicalConstants';
+import {LexicalNode} from '../LexicalNode';
+import {$applyNodeReplacement} from '../LexicalUtils';
+import {
+  SerializedTextNode,
+  TextDetailType,
+  TextModeType,
+  TextNode,
+} from './LexicalTextNode';
+
+export type SerializedTabNode = SerializedTextNode;
+
+/** @noInheritDoc */
+export class TabNode extends TextNode {
+  static getType(): string {
+    return 'tab';
+  }
+
+  static clone(node: TabNode): TabNode {
+    return new TabNode(node.__key);
+  }
+
+  afterCloneFrom(prevNode: this): void {
+    super.afterCloneFrom(prevNode);
+    // TabNode __text can be either '\t' or ''. insertText will remove the empty Node
+    this.__text = prevNode.__text;
+  }
+
+  constructor(key?: NodeKey) {
+    super('\t', key);
+    this.__detail = IS_UNMERGEABLE;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return null;
+  }
+
+  static importJSON(serializedTabNode: SerializedTabNode): TabNode {
+    const node = $createTabNode();
+    node.setFormat(serializedTabNode.format);
+    node.setStyle(serializedTabNode.style);
+    return node;
+  }
+
+  exportJSON(): SerializedTabNode {
+    return {
+      ...super.exportJSON(),
+      type: 'tab',
+      version: 1,
+    };
+  }
+
+  setTextContent(_text: string): this {
+    invariant(false, 'TabNode does not support setTextContent');
+  }
+
+  setDetail(_detail: TextDetailType | number): this {
+    invariant(false, 'TabNode does not support setDetail');
+  }
+
+  setMode(_type: TextModeType): this {
+    invariant(false, 'TabNode does not support setMode');
+  }
+
+  canInsertTextBefore(): boolean {
+    return false;
+  }
+
+  canInsertTextAfter(): boolean {
+    return false;
+  }
+}
+
+export function $createTabNode(): TabNode {
+  return $applyNodeReplacement(new TabNode());
+}
+
+export function $isTabNode(
+  node: LexicalNode | null | undefined,
+): node is TabNode {
+  return node instanceof TabNode;
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
new file mode 100644
index 00000000000..43bef7e83c0
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -0,0 +1,1364 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  EditorConfig,
+  KlassConstructor,
+  LexicalEditor,
+  Spread,
+  TextNodeThemeClasses,
+} from '../LexicalEditor';
+import type {
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  NodeKey,
+  SerializedLexicalNode,
+} from '../LexicalNode';
+import type {BaseSelection, RangeSelection} from '../LexicalSelection';
+import type {ElementNode} from './LexicalElementNode';
+
+import {IS_FIREFOX} from 'lexical/shared/environment';
+import invariant from 'lexical/shared/invariant';
+
+import {
+  COMPOSITION_SUFFIX,
+  DETAIL_TYPE_TO_DETAIL,
+  DOM_ELEMENT_TYPE,
+  DOM_TEXT_TYPE,
+  IS_BOLD,
+  IS_CODE,
+  IS_DIRECTIONLESS,
+  IS_HIGHLIGHT,
+  IS_ITALIC,
+  IS_SEGMENTED,
+  IS_STRIKETHROUGH,
+  IS_SUBSCRIPT,
+  IS_SUPERSCRIPT,
+  IS_TOKEN,
+  IS_UNDERLINE,
+  IS_UNMERGEABLE,
+  TEXT_MODE_TO_TYPE,
+  TEXT_TYPE_TO_FORMAT,
+  TEXT_TYPE_TO_MODE,
+} from '../LexicalConstants';
+import {LexicalNode} from '../LexicalNode';
+import {
+  $getSelection,
+  $internalMakeRangeSelection,
+  $isRangeSelection,
+  $updateElementSelectionOnCreateDeleteNode,
+  adjustPointOffsetForMergedSibling,
+} from '../LexicalSelection';
+import {errorOnReadOnly} from '../LexicalUpdates';
+import {
+  $applyNodeReplacement,
+  $getCompositionKey,
+  $setCompositionKey,
+  getCachedClassNameArray,
+  internalMarkSiblingsAsDirty,
+  isHTMLElement,
+  isInlineDomNode,
+  toggleTextFormatType,
+} from '../LexicalUtils';
+import {$createLineBreakNode} from './LexicalLineBreakNode';
+import {$createTabNode} from './LexicalTabNode';
+
+export type SerializedTextNode = Spread<
+  {
+    detail: number;
+    format: number;
+    mode: TextModeType;
+    style: string;
+    text: string;
+  },
+  SerializedLexicalNode
+>;
+
+export type TextDetailType = 'directionless' | 'unmergable';
+
+export type TextFormatType =
+  | 'bold'
+  | 'underline'
+  | 'strikethrough'
+  | 'italic'
+  | 'highlight'
+  | 'code'
+  | 'subscript'
+  | 'superscript';
+
+export type TextModeType = 'normal' | 'token' | 'segmented';
+
+export type TextMark = {end: null | number; id: string; start: null | number};
+
+export type TextMarks = Array<TextMark>;
+
+function getElementOuterTag(node: TextNode, format: number): string | null {
+  if (format & IS_CODE) {
+    return 'code';
+  }
+  if (format & IS_HIGHLIGHT) {
+    return 'mark';
+  }
+  if (format & IS_SUBSCRIPT) {
+    return 'sub';
+  }
+  if (format & IS_SUPERSCRIPT) {
+    return 'sup';
+  }
+  return null;
+}
+
+function getElementInnerTag(node: TextNode, format: number): string {
+  if (format & IS_BOLD) {
+    return 'strong';
+  }
+  if (format & IS_ITALIC) {
+    return 'em';
+  }
+  return 'span';
+}
+
+function setTextThemeClassNames(
+  tag: string,
+  prevFormat: number,
+  nextFormat: number,
+  dom: HTMLElement,
+  textClassNames: TextNodeThemeClasses,
+): void {
+  const domClassList = dom.classList;
+  // Firstly we handle the base theme.
+  let classNames = getCachedClassNameArray(textClassNames, 'base');
+  if (classNames !== undefined) {
+    domClassList.add(...classNames);
+  }
+  // Secondly we handle the special case: underline + strikethrough.
+  // We have to do this as we need a way to compose the fact that
+  // the same CSS property will need to be used: text-decoration.
+  // In an ideal world we shouldn't have to do this, but there's no
+  // easy workaround for many atomic CSS systems today.
+  classNames = getCachedClassNameArray(
+    textClassNames,
+    'underlineStrikethrough',
+  );
+  let hasUnderlineStrikethrough = false;
+  const prevUnderlineStrikethrough =
+    prevFormat & IS_UNDERLINE && prevFormat & IS_STRIKETHROUGH;
+  const nextUnderlineStrikethrough =
+    nextFormat & IS_UNDERLINE && nextFormat & IS_STRIKETHROUGH;
+
+  if (classNames !== undefined) {
+    if (nextUnderlineStrikethrough) {
+      hasUnderlineStrikethrough = true;
+      if (!prevUnderlineStrikethrough) {
+        domClassList.add(...classNames);
+      }
+    } else if (prevUnderlineStrikethrough) {
+      domClassList.remove(...classNames);
+    }
+  }
+
+  for (const key in TEXT_TYPE_TO_FORMAT) {
+    const format = key;
+    const flag = TEXT_TYPE_TO_FORMAT[format];
+    classNames = getCachedClassNameArray(textClassNames, key);
+    if (classNames !== undefined) {
+      if (nextFormat & flag) {
+        if (
+          hasUnderlineStrikethrough &&
+          (key === 'underline' || key === 'strikethrough')
+        ) {
+          if (prevFormat & flag) {
+            domClassList.remove(...classNames);
+          }
+          continue;
+        }
+        if (
+          (prevFormat & flag) === 0 ||
+          (prevUnderlineStrikethrough && key === 'underline') ||
+          key === 'strikethrough'
+        ) {
+          domClassList.add(...classNames);
+        }
+      } else if (prevFormat & flag) {
+        domClassList.remove(...classNames);
+      }
+    }
+  }
+}
+
+function diffComposedText(a: string, b: string): [number, number, string] {
+  const aLength = a.length;
+  const bLength = b.length;
+  let left = 0;
+  let right = 0;
+
+  while (left < aLength && left < bLength && a[left] === b[left]) {
+    left++;
+  }
+  while (
+    right + left < aLength &&
+    right + left < bLength &&
+    a[aLength - right - 1] === b[bLength - right - 1]
+  ) {
+    right++;
+  }
+
+  return [left, aLength - left - right, b.slice(left, bLength - right)];
+}
+
+function setTextContent(
+  nextText: string,
+  dom: HTMLElement,
+  node: TextNode,
+): void {
+  const firstChild = dom.firstChild;
+  const isComposing = node.isComposing();
+  // Always add a suffix if we're composing a node
+  const suffix = isComposing ? COMPOSITION_SUFFIX : '';
+  const text: string = nextText + suffix;
+
+  if (firstChild == null) {
+    dom.textContent = text;
+  } else {
+    const nodeValue = firstChild.nodeValue;
+    if (nodeValue !== text) {
+      if (isComposing || IS_FIREFOX) {
+        // We also use the diff composed text for general text in FF to avoid
+        // the spellcheck red line from flickering.
+        const [index, remove, insert] = diffComposedText(
+          nodeValue as string,
+          text,
+        );
+        if (remove !== 0) {
+          // @ts-expect-error
+          firstChild.deleteData(index, remove);
+        }
+        // @ts-expect-error
+        firstChild.insertData(index, insert);
+      } else {
+        firstChild.nodeValue = text;
+      }
+    }
+  }
+}
+
+function createTextInnerDOM(
+  innerDOM: HTMLElement,
+  node: TextNode,
+  innerTag: string,
+  format: number,
+  text: string,
+  config: EditorConfig,
+): void {
+  setTextContent(text, innerDOM, node);
+  const theme = config.theme;
+  // Apply theme class names
+  const textClassNames = theme.text;
+
+  if (textClassNames !== undefined) {
+    setTextThemeClassNames(innerTag, 0, format, innerDOM, textClassNames);
+  }
+}
+
+function wrapElementWith(
+  element: HTMLElement | Text,
+  tag: string,
+): HTMLElement {
+  const el = document.createElement(tag);
+  el.appendChild(element);
+  return el;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export interface TextNode {
+  getTopLevelElement(): ElementNode | null;
+  getTopLevelElementOrThrow(): ElementNode;
+}
+
+/** @noInheritDoc */
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export class TextNode extends LexicalNode {
+  ['constructor']!: KlassConstructor<typeof TextNode>;
+  __text: string;
+  /** @internal */
+  __format: number;
+  /** @internal */
+  __style: string;
+  /** @internal */
+  __mode: 0 | 1 | 2 | 3;
+  /** @internal */
+  __detail: number;
+
+  static getType(): string {
+    return 'text';
+  }
+
+  static clone(node: TextNode): TextNode {
+    return new TextNode(node.__text, node.__key);
+  }
+
+  afterCloneFrom(prevNode: this): void {
+    super.afterCloneFrom(prevNode);
+    this.__format = prevNode.__format;
+    this.__style = prevNode.__style;
+    this.__mode = prevNode.__mode;
+    this.__detail = prevNode.__detail;
+  }
+
+  constructor(text: string, key?: NodeKey) {
+    super(key);
+    this.__text = text;
+    this.__format = 0;
+    this.__style = '';
+    this.__mode = 0;
+    this.__detail = 0;
+  }
+
+  /**
+   * Returns a 32-bit integer that represents the TextFormatTypes currently applied to the
+   * TextNode. You probably don't want to use this method directly - consider using TextNode.hasFormat instead.
+   *
+   * @returns a number representing the format of the text node.
+   */
+  getFormat(): number {
+    const self = this.getLatest();
+    return self.__format;
+  }
+
+  /**
+   * Returns a 32-bit integer that represents the TextDetailTypes currently applied to the
+   * TextNode. You probably don't want to use this method directly - consider using TextNode.isDirectionless
+   * or TextNode.isUnmergeable instead.
+   *
+   * @returns a number representing the detail of the text node.
+   */
+  getDetail(): number {
+    const self = this.getLatest();
+    return self.__detail;
+  }
+
+  /**
+   * Returns the mode (TextModeType) of the TextNode, which may be "normal", "token", or "segmented"
+   *
+   * @returns TextModeType.
+   */
+  getMode(): TextModeType {
+    const self = this.getLatest();
+    return TEXT_TYPE_TO_MODE[self.__mode];
+  }
+
+  /**
+   * Returns the styles currently applied to the node. This is analogous to CSSText in the DOM.
+   *
+   * @returns CSSText-like string of styles applied to the underlying DOM node.
+   */
+  getStyle(): string {
+    const self = this.getLatest();
+    return self.__style;
+  }
+
+  /**
+   * Returns whether or not the node is in "token" mode. TextNodes in token mode can be navigated through character-by-character
+   * with a RangeSelection, but are deleted as a single entity (not invdividually by character).
+   *
+   * @returns true if the node is in token mode, false otherwise.
+   */
+  isToken(): boolean {
+    const self = this.getLatest();
+    return self.__mode === IS_TOKEN;
+  }
+
+  /**
+   *
+   * @returns true if Lexical detects that an IME or other 3rd-party script is attempting to
+   * mutate the TextNode, false otherwise.
+   */
+  isComposing(): boolean {
+    return this.__key === $getCompositionKey();
+  }
+
+  /**
+   * Returns whether or not the node is in "segemented" mode. TextNodes in segemented mode can be navigated through character-by-character
+   * with a RangeSelection, but are deleted in space-delimited "segments".
+   *
+   * @returns true if the node is in segmented mode, false otherwise.
+   */
+  isSegmented(): boolean {
+    const self = this.getLatest();
+    return self.__mode === IS_SEGMENTED;
+  }
+  /**
+   * Returns whether or not the node is "directionless". Directionless nodes don't respect changes between RTL and LTR modes.
+   *
+   * @returns true if the node is directionless, false otherwise.
+   */
+  isDirectionless(): boolean {
+    const self = this.getLatest();
+    return (self.__detail & IS_DIRECTIONLESS) !== 0;
+  }
+  /**
+   * Returns whether or not the node is unmergeable. In some scenarios, Lexical tries to merge
+   * adjacent TextNodes into a single TextNode. If a TextNode is unmergeable, this won't happen.
+   *
+   * @returns true if the node is unmergeable, false otherwise.
+   */
+  isUnmergeable(): boolean {
+    const self = this.getLatest();
+    return (self.__detail & IS_UNMERGEABLE) !== 0;
+  }
+
+  /**
+   * Returns whether or not the node has the provided format applied. Use this with the human-readable TextFormatType
+   * string values to get the format of a TextNode.
+   *
+   * @param type - the TextFormatType to check for.
+   *
+   * @returns true if the node has the provided format, false otherwise.
+   */
+  hasFormat(type: TextFormatType): boolean {
+    const formatFlag = TEXT_TYPE_TO_FORMAT[type];
+    return (this.getFormat() & formatFlag) !== 0;
+  }
+
+  /**
+   * Returns whether or not the node is simple text. Simple text is defined as a TextNode that has the string type "text"
+   * (i.e., not a subclass) and has no mode applied to it (i.e., not segmented or token).
+   *
+   * @returns true if the node is simple text, false otherwise.
+   */
+  isSimpleText(): boolean {
+    return this.__type === 'text' && this.__mode === 0;
+  }
+
+  /**
+   * Returns the text content of the node as a string.
+   *
+   * @returns a string representing the text content of the node.
+   */
+  getTextContent(): string {
+    const self = this.getLatest();
+    return self.__text;
+  }
+
+  /**
+   * Returns the format flags applied to the node as a 32-bit integer.
+   *
+   * @returns a number representing the TextFormatTypes applied to the node.
+   */
+  getFormatFlags(type: TextFormatType, alignWithFormat: null | number): number {
+    const self = this.getLatest();
+    const format = self.__format;
+    return toggleTextFormatType(format, type, alignWithFormat);
+  }
+
+  /**
+   *
+   * @returns true if the text node supports font styling, false otherwise.
+   */
+  canHaveFormat(): boolean {
+    return true;
+  }
+
+  // View
+
+  createDOM(config: EditorConfig, editor?: LexicalEditor): HTMLElement {
+    const format = this.__format;
+    const outerTag = getElementOuterTag(this, format);
+    const innerTag = getElementInnerTag(this, format);
+    const tag = outerTag === null ? innerTag : outerTag;
+    const dom = document.createElement(tag);
+    let innerDOM = dom;
+    if (this.hasFormat('code')) {
+      dom.setAttribute('spellcheck', 'false');
+    }
+    if (outerTag !== null) {
+      innerDOM = document.createElement(innerTag);
+      dom.appendChild(innerDOM);
+    }
+    const text = this.__text;
+    createTextInnerDOM(innerDOM, this, innerTag, format, text, config);
+    const style = this.__style;
+    if (style !== '') {
+      dom.style.cssText = style;
+    }
+    return dom;
+  }
+
+  updateDOM(
+    prevNode: TextNode,
+    dom: HTMLElement,
+    config: EditorConfig,
+  ): boolean {
+    const nextText = this.__text;
+    const prevFormat = prevNode.__format;
+    const nextFormat = this.__format;
+    const prevOuterTag = getElementOuterTag(this, prevFormat);
+    const nextOuterTag = getElementOuterTag(this, nextFormat);
+    const prevInnerTag = getElementInnerTag(this, prevFormat);
+    const nextInnerTag = getElementInnerTag(this, nextFormat);
+    const prevTag = prevOuterTag === null ? prevInnerTag : prevOuterTag;
+    const nextTag = nextOuterTag === null ? nextInnerTag : nextOuterTag;
+
+    if (prevTag !== nextTag) {
+      return true;
+    }
+    if (prevOuterTag === nextOuterTag && prevInnerTag !== nextInnerTag) {
+      // should always be an element
+      const prevInnerDOM: HTMLElement = dom.firstChild as HTMLElement;
+      if (prevInnerDOM == null) {
+        invariant(false, 'updateDOM: prevInnerDOM is null or undefined');
+      }
+      const nextInnerDOM = document.createElement(nextInnerTag);
+      createTextInnerDOM(
+        nextInnerDOM,
+        this,
+        nextInnerTag,
+        nextFormat,
+        nextText,
+        config,
+      );
+      dom.replaceChild(nextInnerDOM, prevInnerDOM);
+      return false;
+    }
+    let innerDOM = dom;
+    if (nextOuterTag !== null) {
+      if (prevOuterTag !== null) {
+        innerDOM = dom.firstChild as HTMLElement;
+        if (innerDOM == null) {
+          invariant(false, 'updateDOM: innerDOM is null or undefined');
+        }
+      }
+    }
+    setTextContent(nextText, innerDOM, this);
+    const theme = config.theme;
+    // Apply theme class names
+    const textClassNames = theme.text;
+
+    if (textClassNames !== undefined && prevFormat !== nextFormat) {
+      setTextThemeClassNames(
+        nextInnerTag,
+        prevFormat,
+        nextFormat,
+        innerDOM,
+        textClassNames,
+      );
+    }
+    const prevStyle = prevNode.__style;
+    const nextStyle = this.__style;
+    if (prevStyle !== nextStyle) {
+      dom.style.cssText = nextStyle;
+    }
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      '#text': () => ({
+        conversion: $convertTextDOMNode,
+        priority: 0,
+      }),
+      b: () => ({
+        conversion: convertBringAttentionToElement,
+        priority: 0,
+      }),
+      code: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      em: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      i: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      s: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      span: () => ({
+        conversion: convertSpanElement,
+        priority: 0,
+      }),
+      strong: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      sub: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      sup: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+      u: () => ({
+        conversion: convertTextFormatElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  static importJSON(serializedNode: SerializedTextNode): TextNode {
+    const node = $createTextNode(serializedNode.text);
+    node.setFormat(serializedNode.format);
+    node.setDetail(serializedNode.detail);
+    node.setMode(serializedNode.mode);
+    node.setStyle(serializedNode.style);
+    return node;
+  }
+
+  // This improves Lexical's basic text output in copy+paste plus
+  // for headless mode where people might use Lexical to generate
+  // HTML content and not have the ability to use CSS classes.
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    let {element} = super.exportDOM(editor);
+    invariant(
+      element !== null && isHTMLElement(element),
+      'Expected TextNode createDOM to always return a HTMLElement',
+    );
+    element.style.whiteSpace = 'pre-wrap';
+    // This is the only way to properly add support for most clients,
+    // even if it's semantically incorrect to have to resort to using
+    // <b>, <u>, <s>, <i> elements.
+    if (this.hasFormat('bold')) {
+      element = wrapElementWith(element, 'b');
+    }
+    if (this.hasFormat('italic')) {
+      element = wrapElementWith(element, 'i');
+    }
+    if (this.hasFormat('strikethrough')) {
+      element = wrapElementWith(element, 's');
+    }
+    if (this.hasFormat('underline')) {
+      element = wrapElementWith(element, 'u');
+    }
+
+    return {
+      element,
+    };
+  }
+
+  exportJSON(): SerializedTextNode {
+    return {
+      detail: this.getDetail(),
+      format: this.getFormat(),
+      mode: this.getMode(),
+      style: this.getStyle(),
+      text: this.getTextContent(),
+      type: 'text',
+      version: 1,
+    };
+  }
+
+  // Mutators
+  selectionTransform(
+    prevSelection: null | BaseSelection,
+    nextSelection: RangeSelection,
+  ): void {
+    return;
+  }
+
+  /**
+   * Sets the node format to the provided TextFormatType or 32-bit integer. Note that the TextFormatType
+   * version of the argument can only specify one format and doing so will remove all other formats that
+   * may be applied to the node. For toggling behavior, consider using {@link TextNode.toggleFormat}
+   *
+   * @param format - TextFormatType or 32-bit integer representing the node format.
+   *
+   * @returns this TextNode.
+   * // TODO 0.12 This should just be a `string`.
+   */
+  setFormat(format: TextFormatType | number): this {
+    const self = this.getWritable();
+    self.__format =
+      typeof format === 'string' ? TEXT_TYPE_TO_FORMAT[format] : format;
+    return self;
+  }
+
+  /**
+   * Sets the node detail to the provided TextDetailType or 32-bit integer. Note that the TextDetailType
+   * version of the argument can only specify one detail value and doing so will remove all other detail values that
+   * may be applied to the node. For toggling behavior, consider using {@link TextNode.toggleDirectionless}
+   * or {@link TextNode.toggleUnmergeable}
+   *
+   * @param detail - TextDetailType or 32-bit integer representing the node detail.
+   *
+   * @returns this TextNode.
+   * // TODO 0.12 This should just be a `string`.
+   */
+  setDetail(detail: TextDetailType | number): this {
+    const self = this.getWritable();
+    self.__detail =
+      typeof detail === 'string' ? DETAIL_TYPE_TO_DETAIL[detail] : detail;
+    return self;
+  }
+
+  /**
+   * Sets the node style to the provided CSSText-like string. Set this property as you
+   * would an HTMLElement style attribute to apply inline styles to the underlying DOM Element.
+   *
+   * @param style - CSSText to be applied to the underlying HTMLElement.
+   *
+   * @returns this TextNode.
+   */
+  setStyle(style: string): this {
+    const self = this.getWritable();
+    self.__style = style;
+    return self;
+  }
+
+  /**
+   * Applies the provided format to this TextNode if it's not present. Removes it if it's present.
+   * The subscript and superscript formats are mutually exclusive.
+   * Prefer using this method to turn specific formats on and off.
+   *
+   * @param type - TextFormatType to toggle.
+   *
+   * @returns this TextNode.
+   */
+  toggleFormat(type: TextFormatType): this {
+    const format = this.getFormat();
+    const newFormat = toggleTextFormatType(format, type, null);
+    return this.setFormat(newFormat);
+  }
+
+  /**
+   * Toggles the directionless detail value of the node. Prefer using this method over setDetail.
+   *
+   * @returns this TextNode.
+   */
+  toggleDirectionless(): this {
+    const self = this.getWritable();
+    self.__detail ^= IS_DIRECTIONLESS;
+    return self;
+  }
+
+  /**
+   * Toggles the unmergeable detail value of the node. Prefer using this method over setDetail.
+   *
+   * @returns this TextNode.
+   */
+  toggleUnmergeable(): this {
+    const self = this.getWritable();
+    self.__detail ^= IS_UNMERGEABLE;
+    return self;
+  }
+
+  /**
+   * Sets the mode of the node.
+   *
+   * @returns this TextNode.
+   */
+  setMode(type: TextModeType): this {
+    const mode = TEXT_MODE_TO_TYPE[type];
+    if (this.__mode === mode) {
+      return this;
+    }
+    const self = this.getWritable();
+    self.__mode = mode;
+    return self;
+  }
+
+  /**
+   * Sets the text content of the node.
+   *
+   * @param text - the string to set as the text value of the node.
+   *
+   * @returns this TextNode.
+   */
+  setTextContent(text: string): this {
+    if (this.__text === text) {
+      return this;
+    }
+    const self = this.getWritable();
+    self.__text = text;
+    return self;
+  }
+
+  /**
+   * Sets the current Lexical selection to be a RangeSelection with anchor and focus on this TextNode at the provided offsets.
+   *
+   * @param _anchorOffset - the offset at which the Selection anchor will be placed.
+   * @param _focusOffset - the offset at which the Selection focus will be placed.
+   *
+   * @returns the new RangeSelection.
+   */
+  select(_anchorOffset?: number, _focusOffset?: number): RangeSelection {
+    errorOnReadOnly();
+    let anchorOffset = _anchorOffset;
+    let focusOffset = _focusOffset;
+    const selection = $getSelection();
+    const text = this.getTextContent();
+    const key = this.__key;
+    if (typeof text === 'string') {
+      const lastOffset = text.length;
+      if (anchorOffset === undefined) {
+        anchorOffset = lastOffset;
+      }
+      if (focusOffset === undefined) {
+        focusOffset = lastOffset;
+      }
+    } else {
+      anchorOffset = 0;
+      focusOffset = 0;
+    }
+    if (!$isRangeSelection(selection)) {
+      return $internalMakeRangeSelection(
+        key,
+        anchorOffset,
+        key,
+        focusOffset,
+        'text',
+        'text',
+      );
+    } else {
+      const compositionKey = $getCompositionKey();
+      if (
+        compositionKey === selection.anchor.key ||
+        compositionKey === selection.focus.key
+      ) {
+        $setCompositionKey(key);
+      }
+      selection.setTextNodeRange(this, anchorOffset, this, focusOffset);
+    }
+    return selection;
+  }
+
+  selectStart(): RangeSelection {
+    return this.select(0, 0);
+  }
+
+  selectEnd(): RangeSelection {
+    const size = this.getTextContentSize();
+    return this.select(size, size);
+  }
+
+  /**
+   * Inserts the provided text into this TextNode at the provided offset, deleting the number of characters
+   * specified. Can optionally calculate a new selection after the operation is complete.
+   *
+   * @param offset - the offset at which the splice operation should begin.
+   * @param delCount - the number of characters to delete, starting from the offset.
+   * @param newText - the text to insert into the TextNode at the offset.
+   * @param moveSelection - optional, whether or not to move selection to the end of the inserted substring.
+   *
+   * @returns this TextNode.
+   */
+  spliceText(
+    offset: number,
+    delCount: number,
+    newText: string,
+    moveSelection?: boolean,
+  ): TextNode {
+    const writableSelf = this.getWritable();
+    const text = writableSelf.__text;
+    const handledTextLength = newText.length;
+    let index = offset;
+    if (index < 0) {
+      index = handledTextLength + index;
+      if (index < 0) {
+        index = 0;
+      }
+    }
+    const selection = $getSelection();
+    if (moveSelection && $isRangeSelection(selection)) {
+      const newOffset = offset + handledTextLength;
+      selection.setTextNodeRange(
+        writableSelf,
+        newOffset,
+        writableSelf,
+        newOffset,
+      );
+    }
+
+    const updatedText =
+      text.slice(0, index) + newText + text.slice(index + delCount);
+
+    writableSelf.__text = updatedText;
+    return writableSelf;
+  }
+
+  /**
+   * This method is meant to be overriden by TextNode subclasses to control the behavior of those nodes
+   * when a user event would cause text to be inserted before them in the editor. If true, Lexical will attempt
+   * to insert text into this node. If false, it will insert the text in a new sibling node.
+   *
+   * @returns true if text can be inserted before the node, false otherwise.
+   */
+  canInsertTextBefore(): boolean {
+    return true;
+  }
+
+  /**
+   * This method is meant to be overriden by TextNode subclasses to control the behavior of those nodes
+   * when a user event would cause text to be inserted after them in the editor. If true, Lexical will attempt
+   * to insert text into this node. If false, it will insert the text in a new sibling node.
+   *
+   * @returns true if text can be inserted after the node, false otherwise.
+   */
+  canInsertTextAfter(): boolean {
+    return true;
+  }
+
+  /**
+   * Splits this TextNode at the provided character offsets, forming new TextNodes from the substrings
+   * formed by the split, and inserting those new TextNodes into the editor, replacing the one that was split.
+   *
+   * @param splitOffsets - rest param of the text content character offsets at which this node should be split.
+   *
+   * @returns an Array containing the newly-created TextNodes.
+   */
+  splitText(...splitOffsets: Array<number>): Array<TextNode> {
+    errorOnReadOnly();
+    const self = this.getLatest();
+    const textContent = self.getTextContent();
+    const key = self.__key;
+    const compositionKey = $getCompositionKey();
+    const offsetsSet = new Set(splitOffsets);
+    const parts = [];
+    const textLength = textContent.length;
+    let string = '';
+    for (let i = 0; i < textLength; i++) {
+      if (string !== '' && offsetsSet.has(i)) {
+        parts.push(string);
+        string = '';
+      }
+      string += textContent[i];
+    }
+    if (string !== '') {
+      parts.push(string);
+    }
+    const partsLength = parts.length;
+    if (partsLength === 0) {
+      return [];
+    } else if (parts[0] === textContent) {
+      return [self];
+    }
+    const firstPart = parts[0];
+    const parent = self.getParent();
+    let writableNode;
+    const format = self.getFormat();
+    const style = self.getStyle();
+    const detail = self.__detail;
+    let hasReplacedSelf = false;
+
+    if (self.isSegmented()) {
+      // Create a new TextNode
+      writableNode = $createTextNode(firstPart);
+      writableNode.__format = format;
+      writableNode.__style = style;
+      writableNode.__detail = detail;
+      hasReplacedSelf = true;
+    } else {
+      // For the first part, update the existing node
+      writableNode = self.getWritable();
+      writableNode.__text = firstPart;
+    }
+
+    // Handle selection
+    const selection = $getSelection();
+
+    // Then handle all other parts
+    const splitNodes: TextNode[] = [writableNode];
+    let textSize = firstPart.length;
+
+    for (let i = 1; i < partsLength; i++) {
+      const part = parts[i];
+      const partSize = part.length;
+      const sibling = $createTextNode(part).getWritable();
+      sibling.__format = format;
+      sibling.__style = style;
+      sibling.__detail = detail;
+      const siblingKey = sibling.__key;
+      const nextTextSize = textSize + partSize;
+
+      if ($isRangeSelection(selection)) {
+        const anchor = selection.anchor;
+        const focus = selection.focus;
+
+        if (
+          anchor.key === key &&
+          anchor.type === 'text' &&
+          anchor.offset > textSize &&
+          anchor.offset <= nextTextSize
+        ) {
+          anchor.key = siblingKey;
+          anchor.offset -= textSize;
+          selection.dirty = true;
+        }
+        if (
+          focus.key === key &&
+          focus.type === 'text' &&
+          focus.offset > textSize &&
+          focus.offset <= nextTextSize
+        ) {
+          focus.key = siblingKey;
+          focus.offset -= textSize;
+          selection.dirty = true;
+        }
+      }
+      if (compositionKey === key) {
+        $setCompositionKey(siblingKey);
+      }
+      textSize = nextTextSize;
+      splitNodes.push(sibling);
+    }
+
+    // Insert the nodes into the parent's children
+    if (parent !== null) {
+      internalMarkSiblingsAsDirty(this);
+      const writableParent = parent.getWritable();
+      const insertionIndex = this.getIndexWithinParent();
+      if (hasReplacedSelf) {
+        writableParent.splice(insertionIndex, 0, splitNodes);
+        this.remove();
+      } else {
+        writableParent.splice(insertionIndex, 1, splitNodes);
+      }
+
+      if ($isRangeSelection(selection)) {
+        $updateElementSelectionOnCreateDeleteNode(
+          selection,
+          parent,
+          insertionIndex,
+          partsLength - 1,
+        );
+      }
+    }
+
+    return splitNodes;
+  }
+
+  /**
+   * Merges the target TextNode into this TextNode, removing the target node.
+   *
+   * @param target - the TextNode to merge into this one.
+   *
+   * @returns this TextNode.
+   */
+  mergeWithSibling(target: TextNode): TextNode {
+    const isBefore = target === this.getPreviousSibling();
+    if (!isBefore && target !== this.getNextSibling()) {
+      invariant(
+        false,
+        'mergeWithSibling: sibling must be a previous or next sibling',
+      );
+    }
+    const key = this.__key;
+    const targetKey = target.__key;
+    const text = this.__text;
+    const textLength = text.length;
+    const compositionKey = $getCompositionKey();
+
+    if (compositionKey === targetKey) {
+      $setCompositionKey(key);
+    }
+    const selection = $getSelection();
+    if ($isRangeSelection(selection)) {
+      const anchor = selection.anchor;
+      const focus = selection.focus;
+      if (anchor !== null && anchor.key === targetKey) {
+        adjustPointOffsetForMergedSibling(
+          anchor,
+          isBefore,
+          key,
+          target,
+          textLength,
+        );
+        selection.dirty = true;
+      }
+      if (focus !== null && focus.key === targetKey) {
+        adjustPointOffsetForMergedSibling(
+          focus,
+          isBefore,
+          key,
+          target,
+          textLength,
+        );
+        selection.dirty = true;
+      }
+    }
+    const targetText = target.__text;
+    const newText = isBefore ? targetText + text : text + targetText;
+    this.setTextContent(newText);
+    const writableSelf = this.getWritable();
+    target.remove();
+    return writableSelf;
+  }
+
+  /**
+   * This method is meant to be overriden by TextNode subclasses to control the behavior of those nodes
+   * when used with the registerLexicalTextEntity function. If you're using registerLexicalTextEntity, the
+   * node class that you create and replace matched text with should return true from this method.
+   *
+   * @returns true if the node is to be treated as a "text entity", false otherwise.
+   */
+  isTextEntity(): boolean {
+    return false;
+  }
+}
+
+function convertSpanElement(domNode: HTMLSpanElement): DOMConversionOutput {
+  // domNode is a <span> since we matched it by nodeName
+  const span = domNode;
+  const style = span.style;
+
+  return {
+    forChild: applyTextFormatFromStyle(style),
+    node: null,
+  };
+}
+
+function convertBringAttentionToElement(
+  domNode: HTMLElement,
+): DOMConversionOutput {
+  // domNode is a <b> since we matched it by nodeName
+  const b = domNode;
+  // Google Docs wraps all copied HTML in a <b> with font-weight normal
+  const hasNormalFontWeight = b.style.fontWeight === 'normal';
+
+  return {
+    forChild: applyTextFormatFromStyle(
+      b.style,
+      hasNormalFontWeight ? undefined : 'bold',
+    ),
+    node: null,
+  };
+}
+
+const preParentCache = new WeakMap<Node, null | Node>();
+
+function isNodePre(node: Node): boolean {
+  return (
+    node.nodeName === 'PRE' ||
+    (node.nodeType === DOM_ELEMENT_TYPE &&
+      (node as HTMLElement).style !== undefined &&
+      (node as HTMLElement).style.whiteSpace !== undefined &&
+      (node as HTMLElement).style.whiteSpace.startsWith('pre'))
+  );
+}
+
+export function findParentPreDOMNode(node: Node) {
+  let cached;
+  let parent = node.parentNode;
+  const visited = [node];
+  while (
+    parent !== null &&
+    (cached = preParentCache.get(parent)) === undefined &&
+    !isNodePre(parent)
+  ) {
+    visited.push(parent);
+    parent = parent.parentNode;
+  }
+  const resultNode = cached === undefined ? parent : cached;
+  for (let i = 0; i < visited.length; i++) {
+    preParentCache.set(visited[i], resultNode);
+  }
+  return resultNode;
+}
+
+function $convertTextDOMNode(domNode: Node): DOMConversionOutput {
+  const domNode_ = domNode as Text;
+  const parentDom = domNode.parentElement;
+  invariant(
+    parentDom !== null,
+    'Expected parentElement of Text not to be null',
+  );
+  let textContent = domNode_.textContent || '';
+  // No collapse and preserve segment break for pre, pre-wrap and pre-line
+  if (findParentPreDOMNode(domNode_) !== null) {
+    const parts = textContent.split(/(\r?\n|\t)/);
+    const nodes: Array<LexicalNode> = [];
+    const length = parts.length;
+    for (let i = 0; i < length; i++) {
+      const part = parts[i];
+      if (part === '\n' || part === '\r\n') {
+        nodes.push($createLineBreakNode());
+      } else if (part === '\t') {
+        nodes.push($createTabNode());
+      } else if (part !== '') {
+        nodes.push($createTextNode(part));
+      }
+    }
+    return {node: nodes};
+  }
+  textContent = textContent.replace(/\r/g, '').replace(/[ \t\n]+/g, ' ');
+  if (textContent === '') {
+    return {node: null};
+  }
+  if (textContent[0] === ' ') {
+    // Traverse backward while in the same line. If content contains new line or tab -> pontential
+    // delete, other elements can borrow from this one. Deletion depends on whether it's also the
+    // last space (see next condition: textContent[textContent.length - 1] === ' '))
+    let previousText: null | Text = domNode_;
+    let isStartOfLine = true;
+    while (
+      previousText !== null &&
+      (previousText = findTextInLine(previousText, false)) !== null
+    ) {
+      const previousTextContent = previousText.textContent || '';
+      if (previousTextContent.length > 0) {
+        if (/[ \t\n]$/.test(previousTextContent)) {
+          textContent = textContent.slice(1);
+        }
+        isStartOfLine = false;
+        break;
+      }
+    }
+    if (isStartOfLine) {
+      textContent = textContent.slice(1);
+    }
+  }
+  if (textContent[textContent.length - 1] === ' ') {
+    // Traverse forward while in the same line, preserve if next inline will require a space
+    let nextText: null | Text = domNode_;
+    let isEndOfLine = true;
+    while (
+      nextText !== null &&
+      (nextText = findTextInLine(nextText, true)) !== null
+    ) {
+      const nextTextContent = (nextText.textContent || '').replace(
+        /^( |\t|\r?\n)+/,
+        '',
+      );
+      if (nextTextContent.length > 0) {
+        isEndOfLine = false;
+        break;
+      }
+    }
+    if (isEndOfLine) {
+      textContent = textContent.slice(0, textContent.length - 1);
+    }
+  }
+  if (textContent === '') {
+    return {node: null};
+  }
+  return {node: $createTextNode(textContent)};
+}
+
+function findTextInLine(text: Text, forward: boolean): null | Text {
+  let node: Node = text;
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    let sibling: null | Node;
+    while (
+      (sibling = forward ? node.nextSibling : node.previousSibling) === null
+    ) {
+      const parentElement = node.parentElement;
+      if (parentElement === null) {
+        return null;
+      }
+      node = parentElement;
+    }
+    node = sibling;
+    if (node.nodeType === DOM_ELEMENT_TYPE) {
+      const display = (node as HTMLElement).style.display;
+      if (
+        (display === '' && !isInlineDomNode(node)) ||
+        (display !== '' && !display.startsWith('inline'))
+      ) {
+        return null;
+      }
+    }
+    let descendant: null | Node = node;
+    while ((descendant = forward ? node.firstChild : node.lastChild) !== null) {
+      node = descendant;
+    }
+    if (node.nodeType === DOM_TEXT_TYPE) {
+      return node as Text;
+    } else if (node.nodeName === 'BR') {
+      return null;
+    }
+  }
+}
+
+const nodeNameToTextFormat: Record<string, TextFormatType> = {
+  code: 'code',
+  em: 'italic',
+  i: 'italic',
+  s: 'strikethrough',
+  strong: 'bold',
+  sub: 'subscript',
+  sup: 'superscript',
+  u: 'underline',
+};
+
+function convertTextFormatElement(domNode: HTMLElement): DOMConversionOutput {
+  const format = nodeNameToTextFormat[domNode.nodeName.toLowerCase()];
+  if (format === undefined) {
+    return {node: null};
+  }
+  return {
+    forChild: applyTextFormatFromStyle(domNode.style, format),
+    node: null,
+  };
+}
+
+export function $createTextNode(text = ''): TextNode {
+  return $applyNodeReplacement(new TextNode(text));
+}
+
+export function $isTextNode(
+  node: LexicalNode | null | undefined,
+): node is TextNode {
+  return node instanceof TextNode;
+}
+
+function applyTextFormatFromStyle(
+  style: CSSStyleDeclaration,
+  shouldApply?: TextFormatType,
+) {
+  const fontWeight = style.fontWeight;
+  const textDecoration = style.textDecoration.split(' ');
+  // Google Docs uses span tags + font-weight for bold text
+  const hasBoldFontWeight = fontWeight === '700' || fontWeight === 'bold';
+  // Google Docs uses span tags + text-decoration: line-through for strikethrough text
+  const hasLinethroughTextDecoration = textDecoration.includes('line-through');
+  // Google Docs uses span tags + font-style for italic text
+  const hasItalicFontStyle = style.fontStyle === 'italic';
+  // Google Docs uses span tags + text-decoration: underline for underline text
+  const hasUnderlineTextDecoration = textDecoration.includes('underline');
+  // Google Docs uses span tags + vertical-align to specify subscript and superscript
+  const verticalAlign = style.verticalAlign;
+
+  return (lexicalNode: LexicalNode) => {
+    if (!$isTextNode(lexicalNode)) {
+      return lexicalNode;
+    }
+    if (hasBoldFontWeight && !lexicalNode.hasFormat('bold')) {
+      lexicalNode.toggleFormat('bold');
+    }
+    if (
+      hasLinethroughTextDecoration &&
+      !lexicalNode.hasFormat('strikethrough')
+    ) {
+      lexicalNode.toggleFormat('strikethrough');
+    }
+    if (hasItalicFontStyle && !lexicalNode.hasFormat('italic')) {
+      lexicalNode.toggleFormat('italic');
+    }
+    if (hasUnderlineTextDecoration && !lexicalNode.hasFormat('underline')) {
+      lexicalNode.toggleFormat('underline');
+    }
+    if (verticalAlign === 'sub' && !lexicalNode.hasFormat('subscript')) {
+      lexicalNode.toggleFormat('subscript');
+    }
+    if (verticalAlign === 'super' && !lexicalNode.hasFormat('superscript')) {
+      lexicalNode.toggleFormat('superscript');
+    }
+
+    if (shouldApply && !lexicalNode.hasFormat(shouldApply)) {
+      lexicalNode.toggleFormat(shouldApply);
+    }
+
+    return lexicalNode;
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx
new file mode 100644
index 00000000000..e165df7a9ce
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx
@@ -0,0 +1,635 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+  ElementNode,
+  LexicalEditor,
+  LexicalNode,
+  TextNode,
+} from 'lexical';
+import * as React from 'react';
+import {createRef, useEffect} from 'react';
+import {createRoot} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+import {
+  $createTestElementNode,
+  createTestEditor,
+} from '../../../__tests__/utils';
+
+describe('LexicalElementNode tests', () => {
+  let container: HTMLElement;
+
+  beforeEach(async () => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+
+    await init();
+  });
+
+  afterEach(() => {
+    document.body.removeChild(container);
+    // @ts-ignore
+    container = null;
+  });
+
+  async function update(fn: () => void) {
+    editor.update(fn);
+    return Promise.resolve().then();
+  }
+
+  function useLexicalEditor(rootElementRef: React.RefObject<HTMLDivElement>) {
+    const editor = React.useMemo(() => createTestEditor(), []);
+
+    useEffect(() => {
+      const rootElement = rootElementRef.current;
+      editor.setRootElement(rootElement);
+    }, [rootElementRef, editor]);
+
+    return editor;
+  }
+
+  let editor: LexicalEditor;
+
+  async function init() {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      createRoot(container).render(<TestBase />);
+    });
+
+    // Insert initial block
+    await update(() => {
+      const block = $createTestElementNode();
+      const text = $createTextNode('Foo');
+      const text2 = $createTextNode('Bar');
+      // Prevent text nodes from combining.
+      text2.setMode('segmented');
+      const text3 = $createTextNode('Baz');
+      // Some operations require a selection to exist, hence
+      // we make a selection in the setup code.
+      text.select(0, 0);
+      block.append(text, text2, text3);
+      $getRoot().append(block);
+    });
+  }
+
+  describe('exportJSON()', () => {
+    test('should return and object conforming to the expected schema', async () => {
+      await update(() => {
+        const node = $createTestElementNode();
+
+        // If you broke this test, you changed the public interface of a
+        // serialized Lexical Core Node. Please ensure the correct adapter
+        // logic is in place in the corresponding importJSON  method
+        // to accomodate these changes.
+
+        expect(node.exportJSON()).toStrictEqual({
+          children: [],
+          direction: null,
+          format: '',
+          indent: 0,
+          type: 'test_block',
+          version: 1,
+        });
+      });
+    });
+  });
+
+  describe('getChildren()', () => {
+    test('no children', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        const children = block.getChildren();
+        expect(children).toHaveLength(0);
+        expect(children).toEqual([]);
+      });
+    });
+
+    test('some children', async () => {
+      await update(() => {
+        const children = $getRoot().getFirstChild<ElementNode>()!.getChildren();
+        expect(children).toHaveLength(3);
+      });
+    });
+  });
+
+  describe('getAllTextNodes()', () => {
+    test('basic', async () => {
+      await update(() => {
+        const textNodes = $getRoot()
+          .getFirstChild<ElementNode>()!
+          .getAllTextNodes();
+        expect(textNodes).toHaveLength(3);
+      });
+    });
+
+    test('nested', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        const innerBlock = $createTestElementNode();
+        const text = $createTextNode('Foo');
+        text.select(0, 0);
+        const text2 = $createTextNode('Bar');
+        const text3 = $createTextNode('Baz');
+        const text4 = $createTextNode('Qux');
+        block.append(text, innerBlock, text4);
+        innerBlock.append(text2, text3);
+        const children = block.getAllTextNodes();
+
+        expect(children).toHaveLength(4);
+        expect(children).toEqual([text, text2, text3, text4]);
+
+        const innerInnerBlock = $createTestElementNode();
+        const text5 = $createTextNode('More');
+        const text6 = $createTextNode('Stuff');
+        innerInnerBlock.append(text5, text6);
+        innerBlock.append(innerInnerBlock);
+        const children2 = block.getAllTextNodes();
+
+        expect(children2).toHaveLength(6);
+        expect(children2).toEqual([text, text2, text3, text5, text6, text4]);
+
+        $getRoot().append(block);
+      });
+    });
+  });
+
+  describe('getFirstChild()', () => {
+    test('basic', async () => {
+      await update(() => {
+        expect(
+          $getRoot()
+            .getFirstChild<ElementNode>()!
+            .getFirstChild()!
+            .getTextContent(),
+        ).toBe('Foo');
+      });
+    });
+
+    test('empty', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        expect(block.getFirstChild()).toBe(null);
+      });
+    });
+  });
+
+  describe('getLastChild()', () => {
+    test('basic', async () => {
+      await update(() => {
+        expect(
+          $getRoot()
+            .getFirstChild<ElementNode>()!
+            .getLastChild()!
+            .getTextContent(),
+        ).toBe('Baz');
+      });
+    });
+
+    test('empty', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        expect(block.getLastChild()).toBe(null);
+      });
+    });
+  });
+
+  describe('getTextContent()', () => {
+    test('basic', async () => {
+      await update(() => {
+        expect($getRoot().getFirstChild()!.getTextContent()).toBe('FooBarBaz');
+      });
+    });
+
+    test('empty', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        expect(block.getTextContent()).toBe('');
+      });
+    });
+
+    test('nested', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        const innerBlock = $createTestElementNode();
+        const text = $createTextNode('Foo');
+        text.select(0, 0);
+        const text2 = $createTextNode('Bar');
+        const text3 = $createTextNode('Baz');
+        text3.setMode('token');
+        const text4 = $createTextNode('Qux');
+        block.append(text, innerBlock, text4);
+        innerBlock.append(text2, text3);
+
+        expect(block.getTextContent()).toEqual('FooBarBaz\n\nQux');
+
+        const innerInnerBlock = $createTestElementNode();
+        const text5 = $createTextNode('More');
+        text5.setMode('token');
+        const text6 = $createTextNode('Stuff');
+        innerInnerBlock.append(text5, text6);
+        innerBlock.append(innerInnerBlock);
+
+        expect(block.getTextContent()).toEqual('FooBarBazMoreStuff\n\nQux');
+
+        $getRoot().append(block);
+      });
+    });
+  });
+
+  describe('getTextContentSize()', () => {
+    test('basic', async () => {
+      await update(() => {
+        expect($getRoot().getFirstChild()!.getTextContentSize()).toBe(
+          $getRoot().getFirstChild()!.getTextContent().length,
+        );
+      });
+    });
+
+    test('child node getTextContentSize() can be overridden and is then reflected when calling the same method on parent node', async () => {
+      await update(() => {
+        const block = $createTestElementNode();
+        const text = $createTextNode('Foo');
+        text.getTextContentSize = () => 1;
+        block.append(text);
+
+        expect(block.getTextContentSize()).toBe(1);
+      });
+    });
+  });
+
+  describe('splice', () => {
+    let block: ElementNode;
+
+    beforeEach(async () => {
+      await update(() => {
+        block = $getRoot().getFirstChildOrThrow();
+      });
+    });
+
+    const BASE_INSERTIONS: Array<{
+      deleteCount: number;
+      deleteOnly: boolean | null | undefined;
+      expectedText: string;
+      name: string;
+      start: number;
+    }> = [
+      // Do nothing
+      {
+        deleteCount: 0,
+        deleteOnly: true,
+        expectedText: 'FooBarBaz',
+        name: 'Do nothing',
+        start: 0,
+      },
+      // Insert
+      {
+        deleteCount: 0,
+        deleteOnly: false,
+        expectedText: 'QuxQuuzFooBarBaz',
+        name: 'Insert in the beginning',
+        start: 0,
+      },
+      {
+        deleteCount: 0,
+        deleteOnly: false,
+        expectedText: 'FooQuxQuuzBarBaz',
+        name: 'Insert in the middle',
+        start: 1,
+      },
+      {
+        deleteCount: 0,
+        deleteOnly: false,
+        expectedText: 'FooBarBazQuxQuuz',
+        name: 'Insert in the end',
+        start: 3,
+      },
+      // Delete
+      {
+        deleteCount: 1,
+        deleteOnly: true,
+        expectedText: 'BarBaz',
+        name: 'Delete in the beginning',
+        start: 0,
+      },
+      {
+        deleteCount: 1,
+        deleteOnly: true,
+        expectedText: 'FooBaz',
+        name: 'Delete in the middle',
+        start: 1,
+      },
+      {
+        deleteCount: 1,
+        deleteOnly: true,
+        expectedText: 'FooBar',
+        name: 'Delete in the end',
+        start: 2,
+      },
+      {
+        deleteCount: 3,
+        deleteOnly: true,
+        expectedText: '',
+        name: 'Delete all',
+        start: 0,
+      },
+      // Replace
+      {
+        deleteCount: 1,
+        deleteOnly: false,
+        expectedText: 'QuxQuuzBarBaz',
+        name: 'Replace in the beginning',
+        start: 0,
+      },
+      {
+        deleteCount: 1,
+        deleteOnly: false,
+        expectedText: 'FooQuxQuuzBaz',
+        name: 'Replace in the middle',
+        start: 1,
+      },
+      {
+        deleteCount: 1,
+        deleteOnly: false,
+        expectedText: 'FooBarQuxQuuz',
+        name: 'Replace in the end',
+        start: 2,
+      },
+      {
+        deleteCount: 3,
+        deleteOnly: false,
+        expectedText: 'QuxQuuz',
+        name: 'Replace all',
+        start: 0,
+      },
+    ];
+
+    BASE_INSERTIONS.forEach((testCase) => {
+      it(`Plain text: ${testCase.name}`, async () => {
+        await update(() => {
+          block.splice(
+            testCase.start,
+            testCase.deleteCount,
+            testCase.deleteOnly
+              ? []
+              : [$createTextNode('Qux'), $createTextNode('Quuz')],
+          );
+
+          expect(block.getTextContent()).toEqual(testCase.expectedText);
+        });
+      });
+    });
+
+    let nodes: Record<string, LexicalNode> = {};
+
+    const NESTED_ELEMENTS_TESTS: Array<{
+      deleteCount: number;
+      deleteOnly?: boolean;
+      expectedSelection: () => {
+        anchor: {
+          key: string;
+          offset: number;
+          type: string;
+        };
+        focus: {
+          key: string;
+          offset: number;
+          type: string;
+        };
+      };
+      expectedText: string;
+      name: string;
+      start: number;
+    }> = [
+      {
+        deleteCount: 0,
+        deleteOnly: true,
+        expectedSelection: () => {
+          return {
+            anchor: {
+              key: nodes.nestedText1.__key,
+              offset: 1,
+              type: 'text',
+            },
+            focus: {
+              key: nodes.nestedText1.__key,
+              offset: 1,
+              type: 'text',
+            },
+          };
+        },
+        expectedText: 'FooWiz\n\nFuz\n\nBar',
+        name: 'Do nothing',
+        start: 1,
+      },
+      {
+        deleteCount: 1,
+        deleteOnly: true,
+        expectedSelection: () => {
+          return {
+            anchor: {
+              key: nodes.text1.__key,
+              offset: 3,
+              type: 'text',
+            },
+            focus: {
+              key: nodes.text1.__key,
+              offset: 3,
+              type: 'text',
+            },
+          };
+        },
+        expectedText: 'FooFuz\n\nBar',
+        name: 'Delete selected element (selection moves to the previous)',
+        start: 1,
+      },
+      {
+        deleteCount: 1,
+        expectedSelection: () => {
+          return {
+            anchor: {
+              key: nodes.text1.__key,
+              offset: 3,
+              type: 'text',
+            },
+            focus: {
+              key: nodes.text1.__key,
+              offset: 3,
+              type: 'text',
+            },
+          };
+        },
+        expectedText: 'FooQuxQuuzFuz\n\nBar',
+        name: 'Replace selected element (selection moves to the previous)',
+        start: 1,
+      },
+      {
+        deleteCount: 2,
+        deleteOnly: true,
+        expectedSelection: () => {
+          return {
+            anchor: {
+              key: nodes.nestedText2.__key,
+              offset: 0,
+              type: 'text',
+            },
+            focus: {
+              key: nodes.nestedText2.__key,
+              offset: 0,
+              type: 'text',
+            },
+          };
+        },
+        expectedText: 'Fuz\n\nBar',
+        name: 'Delete selected with previous element (selection moves to the next)',
+        start: 0,
+      },
+      {
+        deleteCount: 4,
+        deleteOnly: true,
+        expectedSelection: () => {
+          return {
+            anchor: {
+              key: block.__key,
+              offset: 0,
+              type: 'element',
+            },
+            focus: {
+              key: block.__key,
+              offset: 0,
+              type: 'element',
+            },
+          };
+        },
+        expectedText: '',
+        name: 'Delete selected with all siblings (selection moves up to the element)',
+        start: 0,
+      },
+    ];
+
+    NESTED_ELEMENTS_TESTS.forEach((testCase) => {
+      it(`Nested elements: ${testCase.name}`, async () => {
+        await update(() => {
+          const text1 = $createTextNode('Foo');
+          const text2 = $createTextNode('Bar');
+
+          const nestedBlock1 = $createTestElementNode();
+          const nestedText1 = $createTextNode('Wiz');
+          nestedBlock1.append(nestedText1);
+
+          const nestedBlock2 = $createTestElementNode();
+          const nestedText2 = $createTextNode('Fuz');
+          nestedBlock2.append(nestedText2);
+
+          block.clear();
+          block.append(text1, nestedBlock1, nestedBlock2, text2);
+          nestedText1.select(1, 1);
+
+          expect(block.getTextContent()).toEqual('FooWiz\n\nFuz\n\nBar');
+
+          nodes = {
+            nestedBlock1,
+            nestedBlock2,
+            nestedText1,
+            nestedText2,
+            text1,
+            text2,
+          };
+        });
+
+        await update(() => {
+          block.splice(
+            testCase.start,
+            testCase.deleteCount,
+            testCase.deleteOnly
+              ? []
+              : [$createTextNode('Qux'), $createTextNode('Quuz')],
+          );
+        });
+
+        await update(() => {
+          expect(block.getTextContent()).toEqual(testCase.expectedText);
+
+          const selection = $getSelection();
+          const expectedSelection = testCase.expectedSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          expect({
+            key: selection.anchor.key,
+            offset: selection.anchor.offset,
+            type: selection.anchor.type,
+          }).toEqual(expectedSelection.anchor);
+          expect({
+            key: selection.focus.key,
+            offset: selection.focus.offset,
+            type: selection.focus.type,
+          }).toEqual(expectedSelection.focus);
+        });
+      });
+    });
+
+    it('Running transforms for inserted nodes, their previous siblings and new siblings', async () => {
+      const transforms = new Set();
+      const expectedTransforms: string[] = [];
+
+      const removeTransform = editor.registerNodeTransform(TextNode, (node) => {
+        transforms.add(node.__key);
+      });
+
+      await update(() => {
+        const anotherBlock = $createTestElementNode();
+        const text1 = $createTextNode('1');
+        // Prevent text nodes from combining
+        const text2 = $createTextNode('2');
+        text2.setMode('segmented');
+        const text3 = $createTextNode('3');
+        anotherBlock.append(text1, text2, text3);
+        $getRoot().append(anotherBlock);
+
+        // Expect inserted node, its old siblings and new siblings to receive
+        // transformer calls
+        expectedTransforms.push(
+          text1.__key,
+          text2.__key,
+          text3.__key,
+          block.getChildAtIndex(0)!.__key,
+          block.getChildAtIndex(1)!.__key,
+        );
+      });
+
+      await update(() => {
+        block.splice(1, 0, [
+          $getRoot().getLastChild<ElementNode>()!.getChildAtIndex(1)!,
+        ]);
+      });
+
+      removeTransform();
+
+      await update(() => {
+        expect(block.getTextContent()).toEqual('Foo2BarBaz');
+        expectedTransforms.forEach((key) => {
+          expect(transforms).toContain(key);
+        });
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx
new file mode 100644
index 00000000000..2c7e978a1fc
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getNodeByKey,
+  $getRoot,
+  $isElementNode,
+} from 'lexical';
+
+import {
+  $createTestElementNode,
+  generatePermutations,
+  initializeUnitTest,
+  invariant,
+} from '../../../__tests__/utils';
+
+describe('LexicalGC tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('RootNode.clear() with a child and subchild', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        $getRoot().append(
+          $createParagraphNode().append($createTextNode('foo')),
+        );
+      });
+      expect(editor.getEditorState()._nodeMap.size).toBe(3);
+      await editor.update(() => {
+        $getRoot().clear();
+      });
+      expect(editor.getEditorState()._nodeMap.size).toBe(1);
+    });
+
+    test('RootNode.clear() with a child and three subchildren', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const text1 = $createTextNode('foo');
+        const text2 = $createTextNode('bar').toggleUnmergeable();
+        const text3 = $createTextNode('zzz').toggleUnmergeable();
+        const paragraph = $createParagraphNode();
+        paragraph.append(text1, text2, text3);
+        $getRoot().append(paragraph);
+      });
+      expect(editor.getEditorState()._nodeMap.size).toBe(5);
+      await editor.update(() => {
+        $getRoot().clear();
+      });
+      expect(editor.getEditorState()._nodeMap.size).toBe(1);
+    });
+
+    for (let i = 0; i < 3; i++) {
+      test(`RootNode.clear() with a child and three subchildren, subchild ${i} removed first`, async () => {
+        const {editor} = testEnv;
+        await editor.update(() => {
+          const text1 = $createTextNode('foo'); // 1
+          const text2 = $createTextNode('bar').toggleUnmergeable(); // 2
+          const text3 = $createTextNode('zzz').toggleUnmergeable(); // 3
+          const paragraph = $createParagraphNode(); // 4
+          paragraph.append(text1, text2, text3);
+          $getRoot().append(paragraph);
+        });
+        expect(editor.getEditorState()._nodeMap.size).toBe(5);
+        await editor.update(() => {
+          const root = $getRoot();
+          const firstChild = root.getFirstChild();
+          invariant($isElementNode(firstChild));
+          const subchild = firstChild.getChildAtIndex(i)!;
+          expect(subchild.getTextContent()).toBe(['foo', 'bar', 'zzz'][i]);
+          subchild.remove();
+          root.clear();
+        });
+        expect(editor.getEditorState()._nodeMap.size).toEqual(1);
+      });
+    }
+
+    const permutations2 = generatePermutations<string>(
+      ['1', '2', '3', '4', '5', '6'],
+      2,
+    );
+    for (let i = 0; i < permutations2.length; i++) {
+      const removeKeys = permutations2[i];
+      /**
+       *          R
+       *          P
+       *     T   TE    T
+       *        T  T
+       */
+      test(`RootNode.clear() with a complex tree, nodes ${removeKeys.toString()} removed first`, async () => {
+        const {editor} = testEnv;
+        await editor.update(() => {
+          const testElement = $createTestElementNode(); // 1
+          const testElementText1 = $createTextNode('te1').toggleUnmergeable(); // 2
+          const testElementText2 = $createTextNode('te2').toggleUnmergeable(); // 3
+          const text1 = $createTextNode('a').toggleUnmergeable(); // 4
+          const text2 = $createTextNode('b').toggleUnmergeable(); // 5
+          const paragraph = $createParagraphNode(); // 6
+          testElement.append(testElementText1, testElementText2);
+          paragraph.append(text1, testElement, text2);
+          $getRoot().append(paragraph);
+        });
+        expect(editor.getEditorState()._nodeMap.size).toBe(7);
+        await editor.update(() => {
+          for (const key of removeKeys) {
+            const node = $getNodeByKey(String(key))!;
+            node.remove();
+          }
+          $getRoot().clear();
+        });
+        expect(editor.getEditorState()._nodeMap.size).toEqual(1);
+      });
+    }
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
new file mode 100644
index 00000000000..110086ac816
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createLineBreakNode, $isLineBreakNode} from 'lexical';
+
+import {initializeUnitTest} from '../../../__tests__/utils';
+
+describe('LexicalLineBreakNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('LineBreakNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const lineBreakNode = $createLineBreakNode();
+
+        expect(lineBreakNode.getType()).toEqual('linebreak');
+        expect(lineBreakNode.getTextContent()).toEqual('\n');
+      });
+    });
+
+    test('LineBreakNode.exportJSON() should return and object conforming to the expected schema', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const node = $createLineBreakNode();
+
+        // If you broke this test, you changed the public interface of a
+        // serialized Lexical Core Node. Please ensure the correct adapter
+        // logic is in place in the corresponding importJSON  method
+        // to accomodate these changes.
+        expect(node.exportJSON()).toStrictEqual({
+          type: 'linebreak',
+          version: 1,
+        });
+      });
+    });
+
+    test('LineBreakNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const lineBreakNode = $createLineBreakNode();
+        const element = lineBreakNode.createDOM();
+
+        expect(element.outerHTML).toBe('<br>');
+      });
+    });
+
+    test('LineBreakNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const lineBreakNode = $createLineBreakNode();
+
+        expect(lineBreakNode.updateDOM()).toBe(false);
+      });
+    });
+
+    test('LineBreakNode.$isLineBreakNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const lineBreakNode = $createLineBreakNode();
+
+        expect($isLineBreakNode(lineBreakNode)).toBe(true);
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
new file mode 100644
index 00000000000..1f7c4cfc3a7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $getRoot,
+  $isParagraphNode,
+  ParagraphNode,
+  RangeSelection,
+} from 'lexical';
+
+import {initializeUnitTest} from '../../../__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    paragraph: 'my-paragraph-class',
+  },
+});
+
+describe('LexicalParagraphNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('ParagraphNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraphNode = new ParagraphNode();
+
+        expect(paragraphNode.getType()).toBe('paragraph');
+        expect(paragraphNode.getTextContent()).toBe('');
+      });
+      expect(() => new ParagraphNode()).toThrow();
+    });
+
+    test('ParagraphNode.exportJSON() should return and object conforming to the expected schema', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const node = $createParagraphNode();
+
+        // If you broke this test, you changed the public interface of a
+        // serialized Lexical Core Node. Please ensure the correct adapter
+        // logic is in place in the corresponding importJSON  method
+        // to accomodate these changes.
+        expect(node.exportJSON()).toStrictEqual({
+          children: [],
+          direction: null,
+          format: '',
+          indent: 0,
+          textFormat: 0,
+          textStyle: '',
+          type: 'paragraph',
+          version: 1,
+        });
+      });
+    });
+
+    test('ParagraphNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraphNode = new ParagraphNode();
+
+        expect(paragraphNode.createDOM(editorConfig).outerHTML).toBe(
+          '<p class="my-paragraph-class"></p>',
+        );
+        expect(
+          paragraphNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<p></p>');
+      });
+    });
+
+    test('ParagraphNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraphNode = new ParagraphNode();
+        const domElement = paragraphNode.createDOM(editorConfig);
+
+        expect(domElement.outerHTML).toBe('<p class="my-paragraph-class"></p>');
+
+        const newParagraphNode = new ParagraphNode();
+        const result = newParagraphNode.updateDOM(
+          paragraphNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe('<p class="my-paragraph-class"></p>');
+      });
+    });
+
+    test('ParagraphNode.insertNewAfter()', async () => {
+      const {editor} = testEnv;
+      let paragraphNode: ParagraphNode;
+
+      await editor.update(() => {
+        const root = $getRoot();
+        paragraphNode = new ParagraphNode();
+        root.append(paragraphNode);
+      });
+
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
+      );
+
+      await editor.update(() => {
+        const selection = paragraphNode.select();
+        const result = paragraphNode.insertNewAfter(
+          selection as RangeSelection,
+          false,
+        );
+        expect(result).toBeInstanceOf(ParagraphNode);
+        expect(result.getDirection()).toEqual(paragraphNode.getDirection());
+        expect(testEnv.outerHTML).toBe(
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
+        );
+      });
+    });
+
+    test('$createParagraphNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraphNode = new ParagraphNode();
+        const createdParagraphNode = $createParagraphNode();
+
+        expect(paragraphNode.__type).toEqual(createdParagraphNode.__type);
+        expect(paragraphNode.__parent).toEqual(createdParagraphNode.__parent);
+        expect(paragraphNode.__key).not.toEqual(createdParagraphNode.__key);
+      });
+    });
+
+    test('$isParagraphNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraphNode = new ParagraphNode();
+
+        expect($isParagraphNode(paragraphNode)).toBe(true);
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
new file mode 100644
index 00000000000..123cb3375d6
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
@@ -0,0 +1,271 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+  $isRootNode,
+  ElementNode,
+  RootNode,
+  TextNode,
+} from 'lexical';
+
+import {
+  $createTestDecoratorNode,
+  $createTestElementNode,
+  $createTestInlineElementNode,
+  initializeUnitTest,
+} from '../../../__tests__/utils';
+import {$createRootNode} from '../../LexicalRootNode';
+
+describe('LexicalRootNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    let rootNode: RootNode;
+
+    function expectRootTextContentToBe(text: string): void {
+      const {editor} = testEnv;
+      editor.getEditorState().read(() => {
+        const root = $getRoot();
+
+        expect(root.__cachedText).toBe(text);
+
+        // Copy root to remove __cachedText because it's frozen
+        const rootCopy = Object.assign({}, root);
+        rootCopy.__cachedText = null;
+        Object.setPrototypeOf(rootCopy, Object.getPrototypeOf(root));
+
+        expect(rootCopy.getTextContent()).toBe(text);
+      });
+    }
+
+    beforeEach(async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        rootNode = $createRootNode();
+      });
+    });
+
+    test('RootNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        expect(rootNode).toStrictEqual($createRootNode());
+        expect(rootNode.getType()).toBe('root');
+        expect(rootNode.getTextContent()).toBe('');
+      });
+    });
+
+    test('RootNode.exportJSON() should return and object conforming to the expected schema', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const node = $createRootNode();
+
+        // If you broke this test, you changed the public interface of a
+        // serialized Lexical Core Node. Please ensure the correct adapter
+        // logic is in place in the corresponding importJSON method
+        // to accomodate these changes.
+        expect(node.exportJSON()).toStrictEqual({
+          children: [],
+          direction: null,
+          format: '',
+          indent: 0,
+          type: 'root',
+          version: 1,
+        });
+      });
+    });
+
+    test('RootNode.clone()', async () => {
+      const rootNodeClone = (rootNode.constructor as typeof RootNode).clone();
+
+      expect(rootNodeClone).not.toBe(rootNode);
+      expect(rootNodeClone).toStrictEqual(rootNode);
+    });
+
+    test('RootNode.createDOM()', async () => {
+      // @ts-expect-error
+      expect(() => rootNode.createDOM()).toThrow();
+    });
+
+    test('RootNode.updateDOM()', async () => {
+      // @ts-expect-error
+      expect(rootNode.updateDOM()).toBe(false);
+    });
+
+    test('RootNode.isAttached()', async () => {
+      expect(rootNode.isAttached()).toBe(true);
+    });
+
+    test('RootNode.isRootNode()', () => {
+      expect($isRootNode(rootNode)).toBe(true);
+    });
+
+    test('Cached getTextContent with decorators', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        paragraph.append($createTestDecoratorNode());
+      });
+
+      expect(
+        editor.getEditorState().read(() => {
+          return $getRoot().getTextContent();
+        }),
+      ).toBe('Hello world');
+    });
+
+    test('RootNode.clear() to handle selection update', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        const text = $createTextNode('Hello');
+        paragraph.append(text);
+        text.select();
+      });
+
+      await editor.update(() => {
+        const root = $getRoot();
+        root.clear();
+      });
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor.getNode()).toBe(root);
+        expect(selection.focus.getNode()).toBe(root);
+      });
+    });
+
+    test('RootNode is selected when its only child removed', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        const text = $createTextNode('Hello');
+        paragraph.append(text);
+        text.select();
+      });
+
+      await editor.update(() => {
+        const root = $getRoot();
+        root.getFirstChild()!.remove();
+      });
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor.getNode()).toBe(root);
+        expect(selection.focus.getNode()).toBe(root);
+      });
+    });
+
+    test('RootNode __cachedText', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        $getRoot().append($createParagraphNode());
+      });
+
+      expectRootTextContentToBe('');
+
+      await editor.update(() => {
+        const firstParagraph = $getRoot().getFirstChild<ElementNode>()!;
+
+        firstParagraph.append($createTextNode('first line'));
+      });
+
+      expectRootTextContentToBe('first line');
+
+      await editor.update(() => {
+        $getRoot().append($createParagraphNode());
+      });
+
+      expectRootTextContentToBe('first line\n\n');
+
+      await editor.update(() => {
+        const secondParagraph = $getRoot().getLastChild<ElementNode>()!;
+
+        secondParagraph.append($createTextNode('second line'));
+      });
+
+      expectRootTextContentToBe('first line\n\nsecond line');
+
+      await editor.update(() => {
+        $getRoot().append($createParagraphNode());
+      });
+
+      expectRootTextContentToBe('first line\n\nsecond line\n\n');
+
+      await editor.update(() => {
+        const thirdParagraph = $getRoot().getLastChild<ElementNode>()!;
+        thirdParagraph.append($createTextNode('third line'));
+      });
+
+      expectRootTextContentToBe('first line\n\nsecond line\n\nthird line');
+
+      await editor.update(() => {
+        const secondParagraph = $getRoot().getChildAtIndex<ElementNode>(1)!;
+        const secondParagraphText = secondParagraph.getFirstChild<TextNode>()!;
+        secondParagraphText.setTextContent('second line!');
+      });
+
+      expectRootTextContentToBe('first line\n\nsecond line!\n\nthird line');
+    });
+
+    test('RootNode __cachedText (empty paragraph)', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        $getRoot().append($createParagraphNode(), $createParagraphNode());
+      });
+
+      expectRootTextContentToBe('\n\n');
+    });
+
+    test('RootNode __cachedText (inlines)', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const paragraph = $createParagraphNode();
+        $getRoot().append(paragraph);
+        paragraph.append(
+          $createTextNode('a'),
+          $createTestElementNode(),
+          $createTextNode('b'),
+          $createTestInlineElementNode(),
+          $createTextNode('c'),
+        );
+      });
+
+      expectRootTextContentToBe('a\n\nbc');
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx
new file mode 100644
index 00000000000..0c06273eca1
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx
@@ -0,0 +1,257 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $insertDataTransferForPlainText,
+  $insertDataTransferForRichText,
+} from '@lexical/clipboard';
+import {$createListItemNode, $createListNode} from '@lexical/list';
+import {registerTabIndentation} from '@lexical/react/LexicalTabIndentationPlugin';
+import {$createHeadingNode, registerRichText} from '@lexical/rich-text';
+import {
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTabNode,
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  $insertNodes,
+  $isElementNode,
+  $isRangeSelection,
+  $isTextNode,
+  $setSelection,
+  KEY_TAB_COMMAND,
+} from 'lexical';
+
+import {
+  DataTransferMock,
+  initializeUnitTest,
+  invariant,
+} from '../../../__tests__/utils';
+
+describe('LexicalTabNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    beforeEach(async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        paragraph.select();
+      });
+    });
+
+    test('can paste plain text with tabs and newlines in plain text', async () => {
+      const {editor} = testEnv;
+      const dataTransfer = new DataTransferMock();
+      dataTransfer.setData('text/plain', 'hello\tworld\nhello\tworld');
+      await editor.update(() => {
+        const selection = $getSelection();
+        invariant($isRangeSelection(selection), 'isRangeSelection(selection)');
+        $insertDataTransferForPlainText(dataTransfer, selection);
+      });
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+      );
+    });
+
+    test('can paste plain text with tabs and newlines in rich text', async () => {
+      const {editor} = testEnv;
+      const dataTransfer = new DataTransferMock();
+      dataTransfer.setData('text/plain', 'hello\tworld\nhello\tworld');
+      await editor.update(() => {
+        const selection = $getSelection();
+        invariant($isRangeSelection(selection), 'isRangeSelection(selection)');
+        $insertDataTransferForRichText(dataTransfer, selection, editor);
+      });
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+      );
+    });
+
+    // TODO fixme
+    // test('can paste HTML with tabs and new lines #4429', async () => {
+    //       const {editor} = testEnv;
+    //       const dataTransfer = new DataTransferMock();
+    //       // https://codepen.io/zurfyx/pen/bGmrzMR
+    //       dataTransfer.setData(
+    //         'text/html',
+    //         `<meta charset='utf-8'><span style="color: rgb(0, 0, 0); font-family: Times; font-size: medium; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">hello	world
+    // hello	world</span>`,
+    //       );
+    //       await editor.update(() => {
+    //         const selection = $getSelection();
+    //         invariant($isRangeSelection(selection), 'isRangeSelection(selection)');
+    //         $insertDataTransferForRichText(dataTransfer, selection, editor);
+    //       });
+    //       expect(testEnv.innerHTML).toBe(
+    //         '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+    //       );
+    // });
+
+    test('can paste HTML with tabs and new lines (2)', async () => {
+      const {editor} = testEnv;
+      const dataTransfer = new DataTransferMock();
+      // GDoc 2-liner hello\tworld (like previous test)
+      dataTransfer.setData(
+        'text/html',
+        `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-123"><p dir="ltr" style="line-height:1.38;margin-left: 36pt;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></p><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></b>`,
+      );
+      await editor.update(() => {
+        const selection = $getSelection();
+        invariant($isRangeSelection(selection), 'isRangeSelection(selection)');
+        $insertDataTransferForRichText(dataTransfer, selection, editor);
+      });
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p dir="ltr"><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+      );
+    });
+
+    test('element indents when selection at the start of the block', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        const selection = $getSelection()!;
+        selection.insertText('foo');
+        $getRoot().selectStart();
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">foo</span></p>',
+      );
+    });
+
+    test('elements indent when selection spans across multiple blocks', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = root.getFirstChild();
+        invariant($isElementNode(paragraph));
+        const heading = $createHeadingNode('h1');
+        const list = $createListNode('number');
+        const listItem = $createListItemNode();
+        const paragraphText = $createTextNode('foo');
+        const headingText = $createTextNode('bar');
+        const listItemText = $createTextNode('xyz');
+        root.append(heading, list);
+        paragraph.append(paragraphText);
+        heading.append(headingText);
+        list.append(listItem);
+        listItem.append(listItemText);
+        const selection = $createRangeSelection();
+        selection.focus.set(paragraphText.getKey(), 1, 'text');
+        selection.anchor.set(listItemText.getKey(), 1, 'text');
+        $setSelection(selection);
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">foo</span></p><h1 dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">bar</span></h1><ol><li value="1"><ol><li value="1" dir="ltr"><span data-lexical-text="true">xyz</span></li></ol></li></ol>',
+      );
+    });
+
+    test('element tabs when selection is not at the start (1)', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        $getSelection()!.insertText('foo');
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">\t</span></p>',
+      );
+    });
+
+    test('element tabs when selection is not at the start (2)', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        $getSelection()!.insertText('foo');
+        const textNode = $getRoot().getLastDescendant();
+        invariant($isTextNode(textNode));
+        textNode.select(1, 1);
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">oo</span></p>',
+      );
+    });
+
+    test('element tabs when selection is not at the start (3)', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        $getSelection()!.insertText('foo');
+        const textNode = $getRoot().getLastDescendant();
+        invariant($isTextNode(textNode));
+        textNode.select(1, 2);
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">o</span></p>',
+      );
+    });
+
+    test('elements tabs when selection is not at the start and overlaps another tab', async () => {
+      const {editor} = testEnv;
+      registerRichText(editor);
+      registerTabIndentation(editor);
+      await editor.update(() => {
+        $getSelection()!.insertRawText('hello\tworld');
+        const root = $getRoot();
+        const firstTextNode = root.getFirstDescendant();
+        const lastTextNode = root.getLastDescendant();
+        const selection = $createRangeSelection();
+        selection.anchor.set(firstTextNode!.getKey(), 'hell'.length, 'text');
+        selection.focus.set(lastTextNode!.getKey(), 'wo'.length, 'text');
+        $setSelection(selection);
+      });
+      await editor.dispatchCommand(
+        KEY_TAB_COMMAND,
+        new KeyboardEvent('keydown'),
+      );
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">hell</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">rld</span></p>',
+      );
+    });
+
+    test('can type between two (leaf nodes) canInsertBeforeAfter false', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const tab1 = $createTabNode();
+        const tab2 = $createTabNode();
+        $insertNodes([tab1, tab2]);
+        tab1.select(1, 1);
+        $getSelection()!.insertText('f');
+      });
+      expect(testEnv.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">\t</span><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span></p>',
+      );
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx
new file mode 100644
index 00000000000..7fc509dfd13
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx
@@ -0,0 +1,843 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getNodeByKey,
+  $getRoot,
+  $getSelection,
+  $isNodeSelection,
+  $isRangeSelection,
+  ElementNode,
+  LexicalEditor,
+  ParagraphNode,
+  TextFormatType,
+  TextModeType,
+  TextNode,
+} from 'lexical';
+import * as React from 'react';
+import {createRef, useEffect, useMemo} from 'react';
+import {createRoot} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+import {
+  $createTestSegmentedNode,
+  createTestEditor,
+} from '../../../__tests__/utils';
+import {
+  IS_BOLD,
+  IS_CODE,
+  IS_HIGHLIGHT,
+  IS_ITALIC,
+  IS_STRIKETHROUGH,
+  IS_SUBSCRIPT,
+  IS_SUPERSCRIPT,
+  IS_UNDERLINE,
+} from '../../../LexicalConstants';
+import {
+  $getCompositionKey,
+  $setCompositionKey,
+  getEditorStateTextContent,
+} from '../../../LexicalUtils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    text: {
+      bold: 'my-bold-class',
+      code: 'my-code-class',
+      highlight: 'my-highlight-class',
+      italic: 'my-italic-class',
+      strikethrough: 'my-strikethrough-class',
+      underline: 'my-underline-class',
+      underlineStrikethrough: 'my-underline-strikethrough-class',
+    },
+  },
+});
+
+describe('LexicalTextNode tests', () => {
+  let container: HTMLElement;
+
+  beforeEach(async () => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+
+    await init();
+  });
+  afterEach(() => {
+    document.body.removeChild(container);
+    // @ts-ignore
+    container = null;
+  });
+
+  async function update(fn: () => void) {
+    editor.update(fn);
+    return Promise.resolve().then();
+  }
+
+  function useLexicalEditor(rootElementRef: React.RefObject<HTMLDivElement>) {
+    const editor = useMemo(() => createTestEditor(editorConfig), []);
+
+    useEffect(() => {
+      const rootElement = rootElementRef.current;
+
+      editor.setRootElement(rootElement);
+    }, [rootElementRef, editor]);
+
+    return editor;
+  }
+
+  let editor: LexicalEditor;
+
+  async function init() {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      createRoot(container).render(<TestBase />);
+    });
+
+    // Insert initial block
+    await update(() => {
+      const paragraph = $createParagraphNode();
+      const text = $createTextNode();
+      text.toggleUnmergeable();
+      paragraph.append(text);
+      $getRoot().append(paragraph);
+    });
+  }
+
+  describe('exportJSON()', () => {
+    test('should return and object conforming to the expected schema', async () => {
+      await update(() => {
+        const node = $createTextNode();
+
+        // If you broke this test, you changed the public interface of a
+        // serialized Lexical Core Node. Please ensure the correct adapter
+        // logic is in place in the corresponding importJSON  method
+        // to accomodate these changes.
+
+        expect(node.exportJSON()).toStrictEqual({
+          detail: 0,
+          format: 0,
+          mode: 'normal',
+          style: '',
+          text: '',
+          type: 'text',
+          version: 1,
+        });
+      });
+    });
+  });
+
+  describe('root.getTextContent()', () => {
+    test('writable nodes', async () => {
+      let nodeKey: string;
+
+      await update(() => {
+        const textNode = $createTextNode('Text');
+        nodeKey = textNode.getKey();
+
+        expect(textNode.getTextContent()).toBe('Text');
+        expect(textNode.__text).toBe('Text');
+
+        $getRoot().getFirstChild<ElementNode>()!.append(textNode);
+      });
+
+      expect(
+        editor.getEditorState().read(() => {
+          const root = $getRoot();
+          return root.__cachedText;
+        }),
+      );
+      expect(getEditorStateTextContent(editor.getEditorState())).toBe('Text');
+
+      // Make sure that the editor content is still set after further reconciliations
+      await update(() => {
+        $getNodeByKey(nodeKey)!.markDirty();
+      });
+      expect(getEditorStateTextContent(editor.getEditorState())).toBe('Text');
+    });
+
+    test('prepend node', async () => {
+      await update(() => {
+        const textNode = $createTextNode('World').toggleUnmergeable();
+        $getRoot().getFirstChild<ElementNode>()!.append(textNode);
+      });
+
+      await update(() => {
+        const textNode = $createTextNode('Hello ').toggleUnmergeable();
+        const previousTextNode = $getRoot()
+          .getFirstChild<ElementNode>()!
+          .getFirstChild()!;
+        previousTextNode.insertBefore(textNode);
+      });
+
+      expect(getEditorStateTextContent(editor.getEditorState())).toBe(
+        'Hello World',
+      );
+    });
+  });
+
+  describe('setTextContent()', () => {
+    test('writable nodes', async () => {
+      await update(() => {
+        const textNode = $createTextNode('My new text node');
+        textNode.setTextContent('My newer text node');
+
+        expect(textNode.getTextContent()).toBe('My newer text node');
+      });
+    });
+  });
+
+  describe.each([
+    ['bold', IS_BOLD],
+    ['italic', IS_ITALIC],
+    ['strikethrough', IS_STRIKETHROUGH],
+    ['underline', IS_UNDERLINE],
+    ['code', IS_CODE],
+    ['subscript', IS_SUBSCRIPT],
+    ['superscript', IS_SUPERSCRIPT],
+    ['highlight', IS_HIGHLIGHT],
+  ] as const)('%s flag', (formatFlag: TextFormatType, stateFormat: number) => {
+    const flagPredicate = (node: TextNode) => node.hasFormat(formatFlag);
+    const flagToggle = (node: TextNode) => node.toggleFormat(formatFlag);
+
+    test(`getFormatFlags(${formatFlag})`, async () => {
+      await update(() => {
+        const root = $getRoot();
+        const paragraphNode = root.getFirstChild<ParagraphNode>()!;
+        const textNode = paragraphNode.getFirstChild<TextNode>()!;
+        const newFormat = textNode.getFormatFlags(formatFlag, null);
+
+        expect(newFormat).toBe(stateFormat);
+
+        textNode.setFormat(newFormat);
+        const newFormat2 = textNode.getFormatFlags(formatFlag, null);
+
+        expect(newFormat2).toBe(0);
+      });
+    });
+
+    test(`predicate for ${formatFlag}`, async () => {
+      await update(() => {
+        const root = $getRoot();
+        const paragraphNode = root.getFirstChild<ParagraphNode>()!;
+        const textNode = paragraphNode.getFirstChild<TextNode>()!;
+
+        textNode.setFormat(stateFormat);
+
+        expect(flagPredicate(textNode)).toBe(true);
+      });
+    });
+
+    test(`toggling for ${formatFlag}`, async () => {
+      // Toggle method hasn't been implemented for this flag.
+      if (flagToggle === null) {
+        return;
+      }
+
+      await update(() => {
+        const root = $getRoot();
+        const paragraphNode = root.getFirstChild<ParagraphNode>()!;
+        const textNode = paragraphNode.getFirstChild<TextNode>()!;
+
+        expect(flagPredicate(textNode)).toBe(false);
+
+        flagToggle(textNode);
+
+        expect(flagPredicate(textNode)).toBe(true);
+
+        flagToggle(textNode);
+
+        expect(flagPredicate(textNode)).toBe(false);
+      });
+    });
+  });
+
+  test('setting subscript clears superscript', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      paragraphNode.append(textNode);
+      $getRoot().append(paragraphNode);
+      textNode.toggleFormat('superscript');
+      textNode.toggleFormat('subscript');
+      expect(textNode.hasFormat('subscript')).toBe(true);
+      expect(textNode.hasFormat('superscript')).toBe(false);
+    });
+  });
+
+  test('setting superscript clears subscript', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      paragraphNode.append(textNode);
+      $getRoot().append(paragraphNode);
+      textNode.toggleFormat('subscript');
+      textNode.toggleFormat('superscript');
+      expect(textNode.hasFormat('superscript')).toBe(true);
+      expect(textNode.hasFormat('subscript')).toBe(false);
+    });
+  });
+
+  test('clearing subscript does not set superscript', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      paragraphNode.append(textNode);
+      $getRoot().append(paragraphNode);
+      textNode.toggleFormat('subscript');
+      textNode.toggleFormat('subscript');
+      expect(textNode.hasFormat('subscript')).toBe(false);
+      expect(textNode.hasFormat('superscript')).toBe(false);
+    });
+  });
+
+  test('clearing superscript does not set subscript', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      paragraphNode.append(textNode);
+      $getRoot().append(paragraphNode);
+      textNode.toggleFormat('superscript');
+      textNode.toggleFormat('superscript');
+      expect(textNode.hasFormat('superscript')).toBe(false);
+      expect(textNode.hasFormat('subscript')).toBe(false);
+    });
+  });
+
+  test('selectPrevious()', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      const textNode2 = $createTextNode('Goodbye Earth');
+      paragraphNode.append(textNode, textNode2);
+      $getRoot().append(paragraphNode);
+
+      let selection = textNode2.selectPrevious();
+
+      expect(selection.anchor.getNode()).toBe(textNode);
+      expect(selection.anchor.offset).toBe(11);
+      expect(selection.focus.getNode()).toBe(textNode);
+      expect(selection.focus.offset).toBe(11);
+
+      selection = textNode.selectPrevious();
+
+      expect(selection.anchor.getNode()).toBe(paragraphNode);
+      expect(selection.anchor.offset).toBe(0);
+    });
+  });
+
+  test('selectNext()', async () => {
+    await update(() => {
+      const paragraphNode = $createParagraphNode();
+      const textNode = $createTextNode('Hello World');
+      const textNode2 = $createTextNode('Goodbye Earth');
+      paragraphNode.append(textNode, textNode2);
+      $getRoot().append(paragraphNode);
+      let selection = textNode.selectNext(1, 3);
+
+      if ($isNodeSelection(selection)) {
+        return;
+      }
+
+      expect(selection.anchor.getNode()).toBe(textNode2);
+      expect(selection.anchor.offset).toBe(1);
+      expect(selection.focus.getNode()).toBe(textNode2);
+      expect(selection.focus.offset).toBe(3);
+
+      selection = textNode2.selectNext();
+
+      expect(selection.anchor.getNode()).toBe(paragraphNode);
+      expect(selection.anchor.offset).toBe(2);
+    });
+  });
+
+  describe('select()', () => {
+    test.each([
+      [
+        [2, 4],
+        [2, 4],
+      ],
+      [
+        [4, 2],
+        [4, 2],
+      ],
+      [
+        [undefined, 2],
+        [11, 2],
+      ],
+      [
+        [2, undefined],
+        [2, 11],
+      ],
+      [
+        [undefined, undefined],
+        [11, 11],
+      ],
+    ])(
+      'select(...%p)',
+      async (
+        [anchorOffset, focusOffset],
+        [expectedAnchorOffset, expectedFocusOffset],
+      ) => {
+        await update(() => {
+          const paragraphNode = $createParagraphNode();
+          const textNode = $createTextNode('Hello World');
+          paragraphNode.append(textNode);
+          $getRoot().append(paragraphNode);
+
+          const selection = textNode.select(anchorOffset, focusOffset);
+
+          expect(selection.focus.getNode()).toBe(textNode);
+          expect(selection.anchor.offset).toBe(expectedAnchorOffset);
+          expect(selection.focus.getNode()).toBe(textNode);
+          expect(selection.focus.offset).toBe(expectedFocusOffset);
+        });
+      },
+    );
+  });
+
+  describe('splitText()', () => {
+    test('convert segmented node into plain text', async () => {
+      await update(() => {
+        const segmentedNode = $createTestSegmentedNode('Hello World');
+        const paragraphNode = $createParagraphNode();
+        paragraphNode.append(segmentedNode);
+
+        const [middle, next] = segmentedNode.splitText(5);
+
+        const children = paragraphNode.getAllTextNodes();
+        expect(paragraphNode.getTextContent()).toBe('Hello World');
+        expect(children[0].isSimpleText()).toBe(true);
+        expect(children[0].getTextContent()).toBe('Hello');
+        expect(middle).toBe(children[0]);
+        expect(next).toBe(children[1]);
+      });
+    });
+    test.each([
+      ['a', [], ['a']],
+      ['a', [1], ['a']],
+      ['a', [5], ['a']],
+      ['Hello World', [], ['Hello World']],
+      ['Hello World', [3], ['Hel', 'lo World']],
+      ['Hello World', [3, 3], ['Hel', 'lo World']],
+      ['Hello World', [3, 7], ['Hel', 'lo W', 'orld']],
+      ['Hello World', [7, 3], ['Hel', 'lo W', 'orld']],
+      ['Hello World', [3, 7, 99], ['Hel', 'lo W', 'orld']],
+    ])(
+      '"%s" splitText(...%p)',
+      async (initialString, splitOffsets, splitStrings) => {
+        await update(() => {
+          const paragraphNode = $createParagraphNode();
+          const textNode = $createTextNode(initialString);
+          paragraphNode.append(textNode);
+
+          const splitNodes = textNode.splitText(...splitOffsets);
+
+          expect(paragraphNode.getChildren()).toHaveLength(splitStrings.length);
+          expect(splitNodes.map((node) => node.getTextContent())).toEqual(
+            splitStrings,
+          );
+        });
+      },
+    );
+
+    test('splitText moves composition key to last node', async () => {
+      await update(() => {
+        const paragraphNode = $createParagraphNode();
+        const textNode = $createTextNode('12345');
+        paragraphNode.append(textNode);
+        $setCompositionKey(textNode.getKey());
+
+        const [, splitNode2] = textNode.splitText(1);
+        expect($getCompositionKey()).toBe(splitNode2.getKey());
+      });
+    });
+
+    test.each([
+      [
+        'Hello',
+        [4],
+        [3, 3],
+        {
+          anchorNodeIndex: 0,
+          anchorOffset: 3,
+          focusNodeIndex: 0,
+          focusOffset: 3,
+        },
+      ],
+      [
+        'Hello',
+        [4],
+        [5, 5],
+        {
+          anchorNodeIndex: 1,
+          anchorOffset: 1,
+          focusNodeIndex: 1,
+          focusOffset: 1,
+        },
+      ],
+      [
+        'Hello World',
+        [4],
+        [2, 7],
+        {
+          anchorNodeIndex: 0,
+          anchorOffset: 2,
+          focusNodeIndex: 1,
+          focusOffset: 3,
+        },
+      ],
+      [
+        'Hello World',
+        [4],
+        [2, 4],
+        {
+          anchorNodeIndex: 0,
+          anchorOffset: 2,
+          focusNodeIndex: 0,
+          focusOffset: 4,
+        },
+      ],
+      [
+        'Hello World',
+        [4],
+        [7, 2],
+        {
+          anchorNodeIndex: 1,
+          anchorOffset: 3,
+          focusNodeIndex: 0,
+          focusOffset: 2,
+        },
+      ],
+      [
+        'Hello World',
+        [4, 6],
+        [2, 9],
+        {
+          anchorNodeIndex: 0,
+          anchorOffset: 2,
+          focusNodeIndex: 2,
+          focusOffset: 3,
+        },
+      ],
+      [
+        'Hello World',
+        [4, 6],
+        [9, 2],
+        {
+          anchorNodeIndex: 2,
+          anchorOffset: 3,
+          focusNodeIndex: 0,
+          focusOffset: 2,
+        },
+      ],
+      [
+        'Hello World',
+        [4, 6],
+        [9, 9],
+        {
+          anchorNodeIndex: 2,
+          anchorOffset: 3,
+          focusNodeIndex: 2,
+          focusOffset: 3,
+        },
+      ],
+    ])(
+      '"%s" splitText(...%p) with select(...%p)',
+      async (
+        initialString,
+        splitOffsets,
+        selectionOffsets,
+        {anchorNodeIndex, anchorOffset, focusNodeIndex, focusOffset},
+      ) => {
+        await update(() => {
+          const paragraphNode = $createParagraphNode();
+          const textNode = $createTextNode(initialString);
+          paragraphNode.append(textNode);
+          $getRoot().append(paragraphNode);
+
+          const selection = textNode.select(...selectionOffsets);
+          const childrenNodes = textNode.splitText(...splitOffsets);
+
+          expect(selection.anchor.getNode()).toBe(
+            childrenNodes[anchorNodeIndex],
+          );
+          expect(selection.anchor.offset).toBe(anchorOffset);
+          expect(selection.focus.getNode()).toBe(childrenNodes[focusNodeIndex]);
+          expect(selection.focus.offset).toBe(focusOffset);
+        });
+      },
+    );
+
+    test('with detached parent', async () => {
+      await update(() => {
+        const textNode = $createTextNode('foo');
+        const splits = textNode.splitText(1, 2);
+        expect(splits.map((split) => split.getTextContent())).toEqual([
+          'f',
+          'o',
+          'o',
+        ]);
+      });
+    });
+  });
+
+  describe('createDOM()', () => {
+    test.each([
+      ['no formatting', 0, 'My text node', '<span>My text node</span>'],
+      [
+        'bold',
+        IS_BOLD,
+        'My text node',
+        '<strong class="my-bold-class">My text node</strong>',
+      ],
+      ['bold + empty', IS_BOLD, '', `<strong class="my-bold-class"></strong>`],
+      [
+        'underline',
+        IS_UNDERLINE,
+        'My text node',
+        '<span class="my-underline-class">My text node</span>',
+      ],
+      [
+        'strikethrough',
+        IS_STRIKETHROUGH,
+        'My text node',
+        '<span class="my-strikethrough-class">My text node</span>',
+      ],
+      [
+        'highlight',
+        IS_HIGHLIGHT,
+        'My text node',
+        '<mark><span class="my-highlight-class">My text node</span></mark>',
+      ],
+      [
+        'italic',
+        IS_ITALIC,
+        'My text node',
+        '<em class="my-italic-class">My text node</em>',
+      ],
+      [
+        'code',
+        IS_CODE,
+        'My text node',
+        '<code spellcheck="false"><span class="my-code-class">My text node</span></code>',
+      ],
+      [
+        'underline + strikethrough',
+        IS_UNDERLINE | IS_STRIKETHROUGH,
+        'My text node',
+        '<span class="my-underline-strikethrough-class">' +
+          'My text node</span>',
+      ],
+      [
+        'code + italic',
+        IS_CODE | IS_ITALIC,
+        'My text node',
+        '<code spellcheck="false"><em class="my-code-class my-italic-class">My text node</em></code>',
+      ],
+      [
+        'code + underline + strikethrough',
+        IS_CODE | IS_UNDERLINE | IS_STRIKETHROUGH,
+        'My text node',
+        '<code spellcheck="false"><span class="my-underline-strikethrough-class my-code-class">' +
+          'My text node</span></code>',
+      ],
+      [
+        'highlight + italic',
+        IS_HIGHLIGHT | IS_ITALIC,
+        'My text node',
+        '<mark><em class="my-highlight-class my-italic-class">My text node</em></mark>',
+      ],
+      [
+        'code + underline + strikethrough + bold + italic',
+        IS_CODE | IS_UNDERLINE | IS_STRIKETHROUGH | IS_BOLD | IS_ITALIC,
+        'My text node',
+        '<code spellcheck="false"><strong class="my-underline-strikethrough-class my-bold-class my-code-class my-italic-class">My text node</strong></code>',
+      ],
+      [
+        'code + underline + strikethrough + bold + italic + highlight',
+        IS_CODE |
+          IS_UNDERLINE |
+          IS_STRIKETHROUGH |
+          IS_BOLD |
+          IS_ITALIC |
+          IS_HIGHLIGHT,
+        'My text node',
+        '<code spellcheck="false"><strong class="my-underline-strikethrough-class my-bold-class my-code-class my-highlight-class my-italic-class">My text node</strong></code>',
+      ],
+    ])('%s text format type', async (_type, format, contents, expectedHTML) => {
+      await update(() => {
+        const textNode = $createTextNode(contents);
+        textNode.setFormat(format);
+        const element = textNode.createDOM(editorConfig);
+
+        expect(element.outerHTML).toBe(expectedHTML);
+      });
+    });
+
+    describe('has parent node', () => {
+      test.each([
+        ['no formatting', 0, 'My text node', '<span>My text node</span>'],
+        ['no formatting + empty string', 0, '', `<span></span>`],
+      ])(
+        '%s text format type',
+        async (_type, format, contents, expectedHTML) => {
+          await update(() => {
+            const paragraphNode = $createParagraphNode();
+            const textNode = $createTextNode(contents);
+            textNode.setFormat(format);
+            paragraphNode.append(textNode);
+            const element = textNode.createDOM(editorConfig);
+
+            expect(element.outerHTML).toBe(expectedHTML);
+          });
+        },
+      );
+    });
+  });
+
+  describe('updateDOM()', () => {
+    test.each([
+      [
+        'different tags',
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          format: IS_ITALIC,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          expectedHTML: null,
+          result: true,
+        },
+      ],
+      [
+        'no change in tags',
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          expectedHTML: '<strong class="my-bold-class">My text node</strong>',
+          result: false,
+        },
+      ],
+      [
+        'change in text',
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My new text node',
+        },
+        {
+          expectedHTML:
+            '<strong class="my-bold-class">My new text node</strong>',
+          result: false,
+        },
+      ],
+      [
+        'removing code block',
+        {
+          format: IS_CODE | IS_BOLD,
+          mode: 'normal',
+          text: 'My text node',
+        },
+        {
+          format: IS_BOLD,
+          mode: 'normal',
+          text: 'My new text node',
+        },
+        {
+          expectedHTML: null,
+          result: true,
+        },
+      ],
+    ])(
+      '%s',
+      async (
+        _desc,
+        {text: prevText, mode: prevMode, format: prevFormat},
+        {text: nextText, mode: nextMode, format: nextFormat},
+        {result, expectedHTML},
+      ) => {
+        await update(() => {
+          const prevTextNode = $createTextNode(prevText);
+          prevTextNode.setMode(prevMode as TextModeType);
+          prevTextNode.setFormat(prevFormat);
+          const element = prevTextNode.createDOM(editorConfig);
+          const textNode = $createTextNode(nextText);
+          textNode.setMode(nextMode as TextModeType);
+          textNode.setFormat(nextFormat);
+
+          expect(textNode.updateDOM(prevTextNode, element, editorConfig)).toBe(
+            result,
+          );
+          // Only need to bother about DOM element contents if updateDOM()
+          // returns false.
+          if (!result) {
+            expect(element.outerHTML).toBe(expectedHTML);
+          }
+        });
+      },
+    );
+  });
+
+  test('mergeWithSibling', async () => {
+    await update(() => {
+      const paragraph = $getRoot().getFirstChild<ElementNode>()!;
+      const textNode1 = $createTextNode('1');
+      const textNode2 = $createTextNode('2');
+      const textNode3 = $createTextNode('3');
+      paragraph.append(textNode1, textNode2, textNode3);
+      textNode2.select();
+
+      const selection = $getSelection();
+      textNode2.mergeWithSibling(textNode1);
+
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+
+      expect(selection.anchor.getNode()).toBe(textNode2);
+      expect(selection.anchor.offset).toBe(1);
+      expect(selection.focus.offset).toBe(1);
+
+      textNode2.mergeWithSibling(textNode3);
+
+      expect(selection.anchor.getNode()).toBe(textNode2);
+      expect(selection.anchor.offset).toBe(1);
+      expect(selection.focus.offset).toBe(1);
+    });
+
+    expect(getEditorStateTextContent(editor.getEditorState())).toBe('123');
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant.ts b/resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant.ts
new file mode 100644
index 00000000000..ff3b7cbf194
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+// invariant(condition, message) will refine types based on "condition", and
+// if "condition" is false will throw an error. This function is special-cased
+// in flow itself, so we can't name it anything else.
+export default function invariant(
+  cond?: boolean,
+  message?: string,
+  ...args: string[]
+): asserts cond {
+  if (cond) {
+    return;
+  }
+
+  throw new Error(
+    args.reduce((msg, arg) => msg.replace('%s', String(arg)), message || ''),
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/canUseDOM.ts b/resources/js/wysiwyg/lexical/core/shared/canUseDOM.ts
new file mode 100644
index 00000000000..78db6aafd4c
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/canUseDOM.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export const CAN_USE_DOM: boolean =
+  typeof window !== 'undefined' &&
+  typeof window.document !== 'undefined' &&
+  typeof window.document.createElement !== 'undefined';
diff --git a/resources/js/wysiwyg/lexical/core/shared/caretFromPoint.ts b/resources/js/wysiwyg/lexical/core/shared/caretFromPoint.ts
new file mode 100644
index 00000000000..642e070e1c5
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/caretFromPoint.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export default function caretFromPoint(
+  x: number,
+  y: number,
+): null | {
+  offset: number;
+  node: Node;
+} {
+  if (typeof document.caretRangeFromPoint !== 'undefined') {
+    const range = document.caretRangeFromPoint(x, y);
+    if (range === null) {
+      return null;
+    }
+    return {
+      node: range.startContainer,
+      offset: range.startOffset,
+    };
+    // @ts-ignore
+  } else if (document.caretPositionFromPoint !== 'undefined') {
+    // @ts-ignore FF - no types
+    const range = document.caretPositionFromPoint(x, y);
+    if (range === null) {
+      return null;
+    }
+    return {
+      node: range.offsetNode,
+      offset: range.offset,
+    };
+  } else {
+    // Gracefully handle IE
+    return null;
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/environment.ts b/resources/js/wysiwyg/lexical/core/shared/environment.ts
new file mode 100644
index 00000000000..c05d332217f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/environment.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
+
+declare global {
+  interface Document {
+    documentMode?: unknown;
+  }
+
+  interface Window {
+    MSStream?: unknown;
+  }
+}
+
+const documentMode =
+  CAN_USE_DOM && 'documentMode' in document ? document.documentMode : null;
+
+export const IS_APPLE: boolean =
+  CAN_USE_DOM && /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+
+export const IS_FIREFOX: boolean =
+  CAN_USE_DOM && /^(?!.*Seamonkey)(?=.*Firefox).*/i.test(navigator.userAgent);
+
+export const CAN_USE_BEFORE_INPUT: boolean =
+  CAN_USE_DOM && 'InputEvent' in window && !documentMode
+    ? 'getTargetRanges' in new window.InputEvent('input')
+    : false;
+
+export const IS_SAFARI: boolean =
+  CAN_USE_DOM && /Version\/[\d.]+.*Safari/.test(navigator.userAgent);
+
+export const IS_IOS: boolean =
+  CAN_USE_DOM &&
+  /iPad|iPhone|iPod/.test(navigator.userAgent) &&
+  !window.MSStream;
+
+export const IS_ANDROID: boolean =
+  CAN_USE_DOM && /Android/.test(navigator.userAgent);
+
+// Keep these in case we need to use them in the future.
+// export const IS_WINDOWS: boolean = CAN_USE_DOM && /Win/.test(navigator.platform);
+export const IS_CHROME: boolean =
+  CAN_USE_DOM && /^(?=.*Chrome).*/i.test(navigator.userAgent);
+// export const canUseTextInputEvent: boolean = CAN_USE_DOM && 'TextEvent' in window && !documentMode;
+
+export const IS_ANDROID_CHROME: boolean =
+  CAN_USE_DOM && IS_ANDROID && IS_CHROME;
+
+export const IS_APPLE_WEBKIT =
+  CAN_USE_DOM && /AppleWebKit\/[\d.]+/.test(navigator.userAgent) && !IS_CHROME;
diff --git a/resources/js/wysiwyg/lexical/core/shared/invariant.ts b/resources/js/wysiwyg/lexical/core/shared/invariant.ts
new file mode 100644
index 00000000000..0e73848bac1
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/invariant.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+// invariant(condition, message) will refine types based on "condition", and
+// if "condition" is false will throw an error. This function is special-cased
+// in flow itself, so we can't name it anything else.
+export default function invariant(
+  cond?: boolean,
+  message?: string,
+  ...args: string[]
+): asserts cond {
+  if (cond) {
+    return;
+  }
+
+  throw new Error(
+    'Internal Lexical error: invariant() is meant to be replaced at compile ' +
+      'time. There is no runtime version. Error: ' +
+      message,
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/normalizeClassNames.ts b/resources/js/wysiwyg/lexical/core/shared/normalizeClassNames.ts
new file mode 100644
index 00000000000..22ea3a940bf
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/normalizeClassNames.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export default function normalizeClassNames(
+  ...classNames: Array<typeof undefined | boolean | null | string>
+): Array<string> {
+  const rval = [];
+  for (const className of classNames) {
+    if (className && typeof className === 'string') {
+      for (const [s] of className.matchAll(/\S+/g)) {
+        rval.push(s);
+      }
+    }
+  }
+  return rval;
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts b/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
new file mode 100644
index 00000000000..8e086744d5e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import * as React from 'react';
+import * as ReactTestUtils from 'react-dom/test-utils';
+
+/**
+ * React 19 moved act from react-dom/test-utils to react
+ * https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-react-dom-test-utils
+ */
+export const act =
+  'act' in React
+    ? (React.act as typeof ReactTestUtils.act)
+    : ReactTestUtils.act;
diff --git a/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts b/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
new file mode 100644
index 00000000000..9685cd89e95
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import React from 'react';
+
+// Webpack + React 17 fails to compile on the usage of `React.startTransition` or
+// `React["startTransition"]` even if it's behind a feature detection of
+// `"startTransition" in React`. Moving this to a constant avoids the issue :/
+const START_TRANSITION = 'startTransition';
+
+export function startTransition(callback: () => void) {
+  if (START_TRANSITION in React) {
+    React[START_TRANSITION](callback);
+  } else {
+    callback();
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/simpleDiffWithCursor.ts b/resources/js/wysiwyg/lexical/core/shared/simpleDiffWithCursor.ts
new file mode 100644
index 00000000000..39f3d3b339d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/simpleDiffWithCursor.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export default function simpleDiffWithCursor(
+  a: string,
+  b: string,
+  cursor: number,
+): {index: number; insert: string; remove: number} {
+  const aLength = a.length;
+  const bLength = b.length;
+  let left = 0; // number of same characters counting from left
+  let right = 0; // number of same characters counting from right
+  // Iterate left to the right until we find a changed character
+  // First iteration considers the current cursor position
+  while (
+    left < aLength &&
+    left < bLength &&
+    a[left] === b[left] &&
+    left < cursor
+  ) {
+    left++;
+  }
+  // Iterate right to the left until we find a changed character
+  while (
+    right + left < aLength &&
+    right + left < bLength &&
+    a[aLength - right - 1] === b[bLength - right - 1]
+  ) {
+    right++;
+  }
+  // Try to iterate left further to the right without caring about the current cursor position
+  while (
+    right + left < aLength &&
+    right + left < bLength &&
+    a[left] === b[left]
+  ) {
+    left++;
+  }
+  return {
+    index: left,
+    insert: b.slice(left, bLength - right),
+    remove: aLength - left - right,
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts b/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts
new file mode 100644
index 00000000000..6149879cbb5
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {useEffect, useLayoutEffect} from 'react';
+import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
+
+// This workaround is no longer necessary in React 19,
+// but we currently support React >=17.x
+// https://github.com/facebook/react/pull/26395
+const useLayoutEffectImpl: typeof useLayoutEffect = CAN_USE_DOM
+  ? useLayoutEffect
+  : useEffect;
+
+export default useLayoutEffectImpl;
diff --git a/resources/js/wysiwyg/lexical/core/shared/warnOnlyOnce.ts b/resources/js/wysiwyg/lexical/core/shared/warnOnlyOnce.ts
new file mode 100644
index 00000000000..d29e99e02bc
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/shared/warnOnlyOnce.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export default function warnOnlyOnce(message: string) {
+  if (!__DEV__) {
+    return;
+  }
+  let run = false;
+  return () => {
+    if (!run) {
+      console.warn(message);
+    }
+    run = true;
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
new file mode 100644
index 00000000000..afa65708d4b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
@@ -0,0 +1,212 @@
+/**
+ * @jest-environment node
+ */
+
+// Jest environment should be at the very top of the file. overriding environment for this test
+// to ensure that headless editor works within node environment
+// https://jestjs.io/docs/configuration#testenvironment-string
+
+/* eslint-disable header/header */
+
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {EditorState, LexicalEditor, RangeSelection} from 'lexical';
+
+import {$generateHtmlFromNodes} from '@lexical/html';
+import {JSDOM} from 'jsdom';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  COMMAND_PRIORITY_NORMAL,
+  CONTROLLED_TEXT_INSERTION_COMMAND,
+  ParagraphNode,
+} from 'lexical';
+
+import {createHeadlessEditor} from '../..';
+
+describe('LexicalHeadlessEditor', () => {
+  let editor: LexicalEditor;
+
+  async function update(updateFn: () => void) {
+    editor.update(updateFn);
+    await Promise.resolve();
+  }
+
+  function assertEditorState(
+    editorState: EditorState,
+    nodes: Record<string, unknown>[],
+  ) {
+    const nodesFromState = Array.from(editorState._nodeMap.values());
+    expect(nodesFromState).toEqual(
+      nodes.map((node) => expect.objectContaining(node)),
+    );
+  }
+
+  beforeEach(() => {
+    editor = createHeadlessEditor({
+      namespace: '',
+      onError: (error) => {
+        throw error;
+      },
+    });
+  });
+
+  it('should be headless environment', async () => {
+    expect(typeof window === 'undefined').toBe(true);
+    expect(typeof document === 'undefined').toBe(true);
+    expect(typeof navigator === 'undefined').toBe(true);
+  });
+
+  it('can update editor', async () => {
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append(
+          $createTextNode('Hello').toggleFormat('bold'),
+          $createTextNode('world'),
+        ),
+      );
+    });
+
+    assertEditorState(editor.getEditorState(), [
+      {
+        __key: 'root',
+      },
+      {
+        __type: 'paragraph',
+      },
+      {
+        __format: 1,
+        __text: 'Hello',
+        __type: 'text',
+      },
+      {
+        __format: 0,
+        __text: 'world',
+        __type: 'text',
+      },
+    ]);
+  });
+
+  it('can set editor state from json', async () => {
+    editor.setEditorState(
+      editor.parseEditorState(
+        '{"root":{"children":[{"children":[{"detail":0,"format":1,"mode":"normal","style":"","text":"Hello","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}',
+      ),
+    );
+
+    assertEditorState(editor.getEditorState(), [
+      {
+        __key: 'root',
+      },
+      {
+        __type: 'paragraph',
+      },
+      {
+        __format: 1,
+        __text: 'Hello',
+        __type: 'text',
+      },
+      {
+        __format: 0,
+        __text: 'world',
+        __type: 'text',
+      },
+    ]);
+  });
+
+  it('can register listeners', async () => {
+    const onUpdate = jest.fn();
+    const onCommand = jest.fn();
+    const onTransform = jest.fn();
+    const onTextContent = jest.fn();
+
+    editor.registerUpdateListener(onUpdate);
+    editor.registerCommand(
+      CONTROLLED_TEXT_INSERTION_COMMAND,
+      onCommand,
+      COMMAND_PRIORITY_NORMAL,
+    );
+    editor.registerNodeTransform(ParagraphNode, onTransform);
+    editor.registerTextContentListener(onTextContent);
+
+    await update(() => {
+      $getRoot().append(
+        $createParagraphNode().append(
+          $createTextNode('Hello').toggleFormat('bold'),
+          $createTextNode('world'),
+        ),
+      );
+      editor.dispatchCommand(CONTROLLED_TEXT_INSERTION_COMMAND, 'foo');
+    });
+
+    expect(onUpdate).toBeCalled();
+    expect(onCommand).toBeCalledWith('foo', expect.anything());
+    expect(onTransform).toBeCalledWith(
+      expect.objectContaining({__type: 'paragraph'}),
+    );
+    expect(onTextContent).toBeCalledWith('Helloworld');
+  });
+
+  it('can preserve selection for pending editor state (within update loop)', async () => {
+    await update(() => {
+      const textNode = $createTextNode('Hello world');
+      $getRoot().append($createParagraphNode().append(textNode));
+      textNode.select(1, 2);
+    });
+
+    await update(() => {
+      const selection = $getSelection() as RangeSelection;
+      expect(selection.anchor).toEqual(
+        expect.objectContaining({offset: 1, type: 'text'}),
+      );
+      expect(selection.focus).toEqual(
+        expect.objectContaining({offset: 2, type: 'text'}),
+      );
+    });
+  });
+
+  function setupDom() {
+    const jsdom = new JSDOM();
+
+    const _window = global.window;
+    const _document = global.document;
+
+    // @ts-expect-error
+    global.window = jsdom.window;
+    global.document = jsdom.window.document;
+
+    return () => {
+      global.window = _window;
+      global.document = _document;
+    };
+  }
+
+  it('can generate html from the nodes when dom is set', async () => {
+    editor.setEditorState(
+      // "hello world"
+      editor.parseEditorState(
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"hello world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+      ),
+    );
+
+    const cleanup = setupDom();
+
+    const html = editor
+      .getEditorState()
+      .read(() => $generateHtmlFromNodes(editor, null));
+
+    cleanup();
+
+    expect(html).toBe(
+      '<p dir="ltr"><span style="white-space: pre-wrap;">hello world</span></p>',
+    );
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/headless/index.ts b/resources/js/wysiwyg/lexical/headless/index.ts
new file mode 100644
index 00000000000..2b8eddb8ed3
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/headless/index.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {CreateEditorArgs, LexicalEditor} from 'lexical';
+
+import {createEditor} from 'lexical';
+
+/**
+ * Generates a headless editor that allows lexical to be used without the need for a DOM, eg in Node.js.
+ * Throws an error when unsupported methods are used.
+ * @param editorConfig - The optional lexical editor configuration.
+ * @returns - The configured headless editor.
+ */
+export function createHeadlessEditor(
+  editorConfig?: CreateEditorArgs,
+): LexicalEditor {
+  const editor = createEditor(editorConfig);
+  editor._headless = true;
+
+  const unsupportedMethods = [
+    'registerDecoratorListener',
+    'registerRootListener',
+    'registerMutationListener',
+    'getRootElement',
+    'setRootElement',
+    'getElementByKey',
+    'focus',
+    'blur',
+  ] as const;
+
+  unsupportedMethods.forEach((method: typeof unsupportedMethods[number]) => {
+    editor[method] = () => {
+      throw new Error(`${method} is not supported in headless mode`);
+    };
+  });
+
+  return editor;
+}
diff --git a/resources/js/wysiwyg/lexical/history/index.ts b/resources/js/wysiwyg/lexical/history/index.ts
new file mode 100644
index 00000000000..8c731d3aaf4
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/history/index.ts
@@ -0,0 +1,501 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {EditorState, LexicalEditor, LexicalNode, NodeKey} from 'lexical';
+
+import {mergeRegister} from '@lexical/utils';
+import {
+  $isRangeSelection,
+  $isRootNode,
+  $isTextNode,
+  CAN_REDO_COMMAND,
+  CAN_UNDO_COMMAND,
+  CLEAR_EDITOR_COMMAND,
+  CLEAR_HISTORY_COMMAND,
+  COMMAND_PRIORITY_EDITOR,
+  REDO_COMMAND,
+  UNDO_COMMAND,
+} from 'lexical';
+
+type MergeAction = 0 | 1 | 2;
+const HISTORY_MERGE = 0;
+const HISTORY_PUSH = 1;
+const DISCARD_HISTORY_CANDIDATE = 2;
+
+type ChangeType = 0 | 1 | 2 | 3 | 4;
+const OTHER = 0;
+const COMPOSING_CHARACTER = 1;
+const INSERT_CHARACTER_AFTER_SELECTION = 2;
+const DELETE_CHARACTER_BEFORE_SELECTION = 3;
+const DELETE_CHARACTER_AFTER_SELECTION = 4;
+
+export type HistoryStateEntry = {
+  editor: LexicalEditor;
+  editorState: EditorState;
+};
+export type HistoryState = {
+  current: null | HistoryStateEntry;
+  redoStack: Array<HistoryStateEntry>;
+  undoStack: Array<HistoryStateEntry>;
+};
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+function getDirtyNodes(
+  editorState: EditorState,
+  dirtyLeaves: Set<NodeKey>,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+): Array<LexicalNode> {
+  const nodeMap = editorState._nodeMap;
+  const nodes = [];
+
+  for (const dirtyLeafKey of dirtyLeaves) {
+    const dirtyLeaf = nodeMap.get(dirtyLeafKey);
+
+    if (dirtyLeaf !== undefined) {
+      nodes.push(dirtyLeaf);
+    }
+  }
+
+  for (const [dirtyElementKey, intentionallyMarkedAsDirty] of dirtyElements) {
+    if (!intentionallyMarkedAsDirty) {
+      continue;
+    }
+
+    const dirtyElement = nodeMap.get(dirtyElementKey);
+
+    if (dirtyElement !== undefined && !$isRootNode(dirtyElement)) {
+      nodes.push(dirtyElement);
+    }
+  }
+
+  return nodes;
+}
+
+function getChangeType(
+  prevEditorState: null | EditorState,
+  nextEditorState: EditorState,
+  dirtyLeavesSet: Set<NodeKey>,
+  dirtyElementsSet: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+  isComposing: boolean,
+): ChangeType {
+  if (
+    prevEditorState === null ||
+    (dirtyLeavesSet.size === 0 && dirtyElementsSet.size === 0 && !isComposing)
+  ) {
+    return OTHER;
+  }
+
+  const nextSelection = nextEditorState._selection;
+  const prevSelection = prevEditorState._selection;
+
+  if (isComposing) {
+    return COMPOSING_CHARACTER;
+  }
+
+  if (
+    !$isRangeSelection(nextSelection) ||
+    !$isRangeSelection(prevSelection) ||
+    !prevSelection.isCollapsed() ||
+    !nextSelection.isCollapsed()
+  ) {
+    return OTHER;
+  }
+
+  const dirtyNodes = getDirtyNodes(
+    nextEditorState,
+    dirtyLeavesSet,
+    dirtyElementsSet,
+  );
+
+  if (dirtyNodes.length === 0) {
+    return OTHER;
+  }
+
+  // Catching the case when inserting new text node into an element (e.g. first char in paragraph/list),
+  // or after existing node.
+  if (dirtyNodes.length > 1) {
+    const nextNodeMap = nextEditorState._nodeMap;
+    const nextAnchorNode = nextNodeMap.get(nextSelection.anchor.key);
+    const prevAnchorNode = nextNodeMap.get(prevSelection.anchor.key);
+
+    if (
+      nextAnchorNode &&
+      prevAnchorNode &&
+      !prevEditorState._nodeMap.has(nextAnchorNode.__key) &&
+      $isTextNode(nextAnchorNode) &&
+      nextAnchorNode.__text.length === 1 &&
+      nextSelection.anchor.offset === 1
+    ) {
+      return INSERT_CHARACTER_AFTER_SELECTION;
+    }
+
+    return OTHER;
+  }
+
+  const nextDirtyNode = dirtyNodes[0];
+
+  const prevDirtyNode = prevEditorState._nodeMap.get(nextDirtyNode.__key);
+
+  if (
+    !$isTextNode(prevDirtyNode) ||
+    !$isTextNode(nextDirtyNode) ||
+    prevDirtyNode.__mode !== nextDirtyNode.__mode
+  ) {
+    return OTHER;
+  }
+
+  const prevText = prevDirtyNode.__text;
+  const nextText = nextDirtyNode.__text;
+
+  if (prevText === nextText) {
+    return OTHER;
+  }
+
+  const nextAnchor = nextSelection.anchor;
+  const prevAnchor = prevSelection.anchor;
+
+  if (nextAnchor.key !== prevAnchor.key || nextAnchor.type !== 'text') {
+    return OTHER;
+  }
+
+  const nextAnchorOffset = nextAnchor.offset;
+  const prevAnchorOffset = prevAnchor.offset;
+  const textDiff = nextText.length - prevText.length;
+
+  if (textDiff === 1 && prevAnchorOffset === nextAnchorOffset - 1) {
+    return INSERT_CHARACTER_AFTER_SELECTION;
+  }
+
+  if (textDiff === -1 && prevAnchorOffset === nextAnchorOffset + 1) {
+    return DELETE_CHARACTER_BEFORE_SELECTION;
+  }
+
+  if (textDiff === -1 && prevAnchorOffset === nextAnchorOffset) {
+    return DELETE_CHARACTER_AFTER_SELECTION;
+  }
+
+  return OTHER;
+}
+
+function isTextNodeUnchanged(
+  key: NodeKey,
+  prevEditorState: EditorState,
+  nextEditorState: EditorState,
+): boolean {
+  const prevNode = prevEditorState._nodeMap.get(key);
+  const nextNode = nextEditorState._nodeMap.get(key);
+
+  const prevSelection = prevEditorState._selection;
+  const nextSelection = nextEditorState._selection;
+  const isDeletingLine =
+    $isRangeSelection(prevSelection) &&
+    $isRangeSelection(nextSelection) &&
+    prevSelection.anchor.type === 'element' &&
+    prevSelection.focus.type === 'element' &&
+    nextSelection.anchor.type === 'text' &&
+    nextSelection.focus.type === 'text';
+
+  if (
+    !isDeletingLine &&
+    $isTextNode(prevNode) &&
+    $isTextNode(nextNode) &&
+    prevNode.__parent === nextNode.__parent
+  ) {
+    // This has the assumption that object key order won't change if the
+    // content did not change, which should normally be safe given
+    // the manner in which nodes and exportJSON are typically implemented.
+    return (
+      JSON.stringify(prevEditorState.read(() => prevNode.exportJSON())) ===
+      JSON.stringify(nextEditorState.read(() => nextNode.exportJSON()))
+    );
+  }
+  return false;
+}
+
+function createMergeActionGetter(
+  editor: LexicalEditor,
+  delay: number,
+): (
+  prevEditorState: null | EditorState,
+  nextEditorState: EditorState,
+  currentHistoryEntry: null | HistoryStateEntry,
+  dirtyLeaves: Set<NodeKey>,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+  tags: Set<string>,
+) => MergeAction {
+  let prevChangeTime = Date.now();
+  let prevChangeType = OTHER;
+
+  return (
+    prevEditorState,
+    nextEditorState,
+    currentHistoryEntry,
+    dirtyLeaves,
+    dirtyElements,
+    tags,
+  ) => {
+    const changeTime = Date.now();
+
+    // If applying changes from history stack there's no need
+    // to run history logic again, as history entries already calculated
+    if (tags.has('historic')) {
+      prevChangeType = OTHER;
+      prevChangeTime = changeTime;
+      return DISCARD_HISTORY_CANDIDATE;
+    }
+
+    const changeType = getChangeType(
+      prevEditorState,
+      nextEditorState,
+      dirtyLeaves,
+      dirtyElements,
+      editor.isComposing(),
+    );
+
+    const mergeAction = (() => {
+      const isSameEditor =
+        currentHistoryEntry === null || currentHistoryEntry.editor === editor;
+      const shouldPushHistory = tags.has('history-push');
+      const shouldMergeHistory =
+        !shouldPushHistory && isSameEditor && tags.has('history-merge');
+
+      if (shouldMergeHistory) {
+        return HISTORY_MERGE;
+      }
+
+      if (prevEditorState === null) {
+        return HISTORY_PUSH;
+      }
+
+      const selection = nextEditorState._selection;
+      const hasDirtyNodes = dirtyLeaves.size > 0 || dirtyElements.size > 0;
+
+      if (!hasDirtyNodes) {
+        if (selection !== null) {
+          return HISTORY_MERGE;
+        }
+
+        return DISCARD_HISTORY_CANDIDATE;
+      }
+
+      if (
+        shouldPushHistory === false &&
+        changeType !== OTHER &&
+        changeType === prevChangeType &&
+        changeTime < prevChangeTime + delay &&
+        isSameEditor
+      ) {
+        return HISTORY_MERGE;
+      }
+
+      // A single node might have been marked as dirty, but not have changed
+      // due to some node transform reverting the change.
+      if (dirtyLeaves.size === 1) {
+        const dirtyLeafKey = Array.from(dirtyLeaves)[0];
+        if (
+          isTextNodeUnchanged(dirtyLeafKey, prevEditorState, nextEditorState)
+        ) {
+          return HISTORY_MERGE;
+        }
+      }
+
+      return HISTORY_PUSH;
+    })();
+
+    prevChangeTime = changeTime;
+    prevChangeType = changeType;
+
+    return mergeAction;
+  };
+}
+
+function redo(editor: LexicalEditor, historyState: HistoryState): void {
+  const redoStack = historyState.redoStack;
+  const undoStack = historyState.undoStack;
+
+  if (redoStack.length !== 0) {
+    const current = historyState.current;
+
+    if (current !== null) {
+      undoStack.push(current);
+      editor.dispatchCommand(CAN_UNDO_COMMAND, true);
+    }
+
+    const historyStateEntry = redoStack.pop();
+
+    if (redoStack.length === 0) {
+      editor.dispatchCommand(CAN_REDO_COMMAND, false);
+    }
+
+    historyState.current = historyStateEntry || null;
+
+    if (historyStateEntry) {
+      historyStateEntry.editor.setEditorState(historyStateEntry.editorState, {
+        tag: 'historic',
+      });
+    }
+  }
+}
+
+function undo(editor: LexicalEditor, historyState: HistoryState): void {
+  const redoStack = historyState.redoStack;
+  const undoStack = historyState.undoStack;
+  const undoStackLength = undoStack.length;
+
+  if (undoStackLength !== 0) {
+    const current = historyState.current;
+    const historyStateEntry = undoStack.pop();
+
+    if (current !== null) {
+      redoStack.push(current);
+      editor.dispatchCommand(CAN_REDO_COMMAND, true);
+    }
+
+    if (undoStack.length === 0) {
+      editor.dispatchCommand(CAN_UNDO_COMMAND, false);
+    }
+
+    historyState.current = historyStateEntry || null;
+
+    if (historyStateEntry) {
+      historyStateEntry.editor.setEditorState(historyStateEntry.editorState, {
+        tag: 'historic',
+      });
+    }
+  }
+}
+
+function clearHistory(historyState: HistoryState) {
+  historyState.undoStack = [];
+  historyState.redoStack = [];
+  historyState.current = null;
+}
+
+/**
+ * Registers necessary listeners to manage undo/redo history stack and related editor commands.
+ * It returns `unregister` callback that cleans up all listeners and should be called on editor unmount.
+ * @param editor - The lexical editor.
+ * @param historyState - The history state, containing the current state and the undo/redo stack.
+ * @param delay - The time (in milliseconds) the editor should delay generating a new history stack,
+ * instead of merging the current changes with the current stack.
+ * @returns The listeners cleanup callback function.
+ */
+export function registerHistory(
+  editor: LexicalEditor,
+  historyState: HistoryState,
+  delay: number,
+): () => void {
+  const getMergeAction = createMergeActionGetter(editor, delay);
+
+  const applyChange = ({
+    editorState,
+    prevEditorState,
+    dirtyLeaves,
+    dirtyElements,
+    tags,
+  }: {
+    editorState: EditorState;
+    prevEditorState: EditorState;
+    dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>;
+    dirtyLeaves: Set<NodeKey>;
+    tags: Set<string>;
+  }): void => {
+    const current = historyState.current;
+    const redoStack = historyState.redoStack;
+    const undoStack = historyState.undoStack;
+    const currentEditorState = current === null ? null : current.editorState;
+
+    if (current !== null && editorState === currentEditorState) {
+      return;
+    }
+
+    const mergeAction = getMergeAction(
+      prevEditorState,
+      editorState,
+      current,
+      dirtyLeaves,
+      dirtyElements,
+      tags,
+    );
+
+    if (mergeAction === HISTORY_PUSH) {
+      if (redoStack.length !== 0) {
+        historyState.redoStack = [];
+        editor.dispatchCommand(CAN_REDO_COMMAND, false);
+      }
+
+      if (current !== null) {
+        undoStack.push({
+          ...current,
+        });
+        editor.dispatchCommand(CAN_UNDO_COMMAND, true);
+      }
+    } else if (mergeAction === DISCARD_HISTORY_CANDIDATE) {
+      return;
+    }
+
+    // Else we merge
+    historyState.current = {
+      editor,
+      editorState,
+    };
+  };
+
+  const unregister = mergeRegister(
+    editor.registerCommand(
+      UNDO_COMMAND,
+      () => {
+        undo(editor, historyState);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      REDO_COMMAND,
+      () => {
+        redo(editor, historyState);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      CLEAR_EDITOR_COMMAND,
+      () => {
+        clearHistory(historyState);
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      CLEAR_HISTORY_COMMAND,
+      () => {
+        clearHistory(historyState);
+        editor.dispatchCommand(CAN_REDO_COMMAND, false);
+        editor.dispatchCommand(CAN_UNDO_COMMAND, false);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerUpdateListener(applyChange),
+  );
+
+  return unregister;
+}
+
+/**
+ * Creates an empty history state.
+ * @returns - The empty history state, as an object.
+ */
+export function createEmptyHistoryState(): HistoryState {
+  return {
+    current: null,
+    redoStack: [],
+    undoStack: [],
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
new file mode 100644
index 00000000000..55d120bdd1b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -0,0 +1,212 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+//@ts-ignore-next-line
+import type {RangeSelection} from 'lexical';
+
+import {createHeadlessEditor} from '@lexical/headless';
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {LinkNode} from '@lexical/link';
+import {ListItemNode, ListNode} from '@lexical/list';
+import {HeadingNode, QuoteNode} from '@lexical/rich-text';
+import {
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTextNode,
+  $getRoot,
+} from 'lexical';
+
+describe('HTML', () => {
+  type Input = Array<{
+    name: string;
+    html: string;
+    initializeEditorState: () => void;
+  }>;
+
+  const HTML_SERIALIZE: Input = [
+    {
+      html: '<p><br></p>',
+      initializeEditorState: () => {
+        $getRoot().append($createParagraphNode());
+      },
+      name: 'Empty editor state',
+    },
+  ];
+  for (const {name, html, initializeEditorState} of HTML_SERIALIZE) {
+    test(`[Lexical -> HTML]: ${name}`, () => {
+      const editor = createHeadlessEditor({
+        nodes: [
+          HeadingNode,
+          ListNode,
+          ListItemNode,
+          QuoteNode,
+          LinkNode,
+        ],
+      });
+
+      editor.update(initializeEditorState, {
+        discrete: true,
+      });
+
+      expect(
+        editor.getEditorState().read(() => $generateHtmlFromNodes(editor)),
+      ).toBe(html);
+    });
+  }
+
+  test(`[Lexical -> HTML]: Use provided selection`, () => {
+    const editor = createHeadlessEditor({
+      nodes: [
+        HeadingNode,
+        ListNode,
+        ListItemNode,
+        QuoteNode,
+        LinkNode,
+      ],
+    });
+
+    let selection: RangeSelection | null = null;
+
+    editor.update(
+      () => {
+        const root = $getRoot();
+        const p1 = $createParagraphNode();
+        const text1 = $createTextNode('Hello');
+        p1.append(text1);
+        const p2 = $createParagraphNode();
+        const text2 = $createTextNode('World');
+        p2.append(text2);
+        root.append(p1).append(p2);
+        // Root
+        // - ParagraphNode
+        // -- TextNode "Hello"
+        // - ParagraphNode
+        // -- TextNode "World"
+        p1.select(0, text1.getTextContentSize());
+        selection = $createRangeSelection();
+        selection.setTextNodeRange(text2, 0, text2, text2.getTextContentSize());
+      },
+      {
+        discrete: true,
+      },
+    );
+
+    let html = '';
+
+    editor.update(() => {
+      html = $generateHtmlFromNodes(editor, selection);
+    });
+
+    expect(html).toBe('<span style="white-space: pre-wrap;">World</span>');
+  });
+
+  test(`[Lexical -> HTML]: Default selection (undefined) should serialize entire editor state`, () => {
+    const editor = createHeadlessEditor({
+      nodes: [
+        HeadingNode,
+        ListNode,
+        ListItemNode,
+        QuoteNode,
+        CodeNode,
+        LinkNode,
+      ],
+    });
+
+    editor.update(
+      () => {
+        const root = $getRoot();
+        const p1 = $createParagraphNode();
+        const text1 = $createTextNode('Hello');
+        p1.append(text1);
+        const p2 = $createParagraphNode();
+        const text2 = $createTextNode('World');
+        p2.append(text2);
+        root.append(p1).append(p2);
+        // Root
+        // - ParagraphNode
+        // -- TextNode "Hello"
+        // - ParagraphNode
+        // -- TextNode "World"
+        p1.select(0, text1.getTextContentSize());
+      },
+      {
+        discrete: true,
+      },
+    );
+
+    let html = '';
+
+    editor.update(() => {
+      html = $generateHtmlFromNodes(editor);
+    });
+
+    expect(html).toBe(
+      '<p><span style="white-space: pre-wrap;">Hello</span></p><p><span style="white-space: pre-wrap;">World</span></p>',
+    );
+  });
+
+  test(`If alignment is set on the paragraph, don't overwrite from parent empty format`, () => {
+    const editor = createHeadlessEditor();
+    const parser = new DOMParser();
+    const rightAlignedParagraphInDiv =
+      '<div><p style="text-align: center;">Hello world!</p></div>';
+
+    editor.update(
+      () => {
+        const root = $getRoot();
+        const dom = parser.parseFromString(
+          rightAlignedParagraphInDiv,
+          'text/html',
+        );
+        const nodes = $generateNodesFromDOM(editor, dom);
+        root.append(...nodes);
+      },
+      {discrete: true},
+    );
+
+    let html = '';
+
+    editor.update(() => {
+      html = $generateHtmlFromNodes(editor);
+    });
+
+    expect(html).toBe(
+      '<p style="text-align: center;"><span style="white-space: pre-wrap;">Hello world!</span></p>',
+    );
+  });
+
+  test(`If alignment is set on the paragraph, it should take precedence over its parent block alignment`, () => {
+    const editor = createHeadlessEditor();
+    const parser = new DOMParser();
+    const rightAlignedParagraphInDiv =
+      '<div style="text-align: right;"><p style="text-align: center;">Hello world!</p></div>';
+
+    editor.update(
+      () => {
+        const root = $getRoot();
+        const dom = parser.parseFromString(
+          rightAlignedParagraphInDiv,
+          'text/html',
+        );
+        const nodes = $generateNodesFromDOM(editor, dom);
+        root.append(...nodes);
+      },
+      {discrete: true},
+    );
+
+    let html = '';
+
+    editor.update(() => {
+      html = $generateHtmlFromNodes(editor);
+    });
+
+    expect(html).toBe(
+      '<p style="text-align: center;"><span style="white-space: pre-wrap;">Hello world!</span></p>',
+    );
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
new file mode 100644
index 00000000000..2975315cc35
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -0,0 +1,376 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  BaseSelection,
+  DOMChildConversion,
+  DOMConversion,
+  DOMConversionFn,
+  ElementFormatType,
+  LexicalEditor,
+  LexicalNode,
+} from 'lexical';
+
+import {$sliceSelectedTextNodeContent} from '@lexical/selection';
+import {isBlockDomNode, isHTMLElement} from '@lexical/utils';
+import {
+  $cloneWithProperties,
+  $createLineBreakNode,
+  $createParagraphNode,
+  $getRoot,
+  $isBlockElementNode,
+  $isElementNode,
+  $isRootOrShadowRoot,
+  $isTextNode,
+  ArtificialNode__DO_NOT_USE,
+  ElementNode,
+  isInlineDomNode,
+} from 'lexical';
+
+/**
+ * How you parse your html string to get a document is left up to you. In the browser you can use the native
+ * DOMParser API to generate a document (see clipboard.ts), but to use in a headless environment you can use JSDom
+ * or an equivalent library and pass in the document here.
+ */
+export function $generateNodesFromDOM(
+  editor: LexicalEditor,
+  dom: Document,
+): Array<LexicalNode> {
+  const elements = dom.body ? dom.body.childNodes : [];
+  let lexicalNodes: Array<LexicalNode> = [];
+  const allArtificialNodes: Array<ArtificialNode__DO_NOT_USE> = [];
+  for (let i = 0; i < elements.length; i++) {
+    const element = elements[i];
+    if (!IGNORE_TAGS.has(element.nodeName)) {
+      const lexicalNode = $createNodesFromDOM(
+        element,
+        editor,
+        allArtificialNodes,
+        false,
+      );
+      if (lexicalNode !== null) {
+        lexicalNodes = lexicalNodes.concat(lexicalNode);
+      }
+    }
+  }
+  $unwrapArtificalNodes(allArtificialNodes);
+
+  return lexicalNodes;
+}
+
+export function $generateHtmlFromNodes(
+  editor: LexicalEditor,
+  selection?: BaseSelection | null,
+): string {
+  if (
+    typeof document === 'undefined' ||
+    (typeof window === 'undefined' && typeof global.window === 'undefined')
+  ) {
+    throw new Error(
+      'To use $generateHtmlFromNodes in headless mode please initialize a headless browser implementation such as JSDom before calling this function.',
+    );
+  }
+
+  const container = document.createElement('div');
+  const root = $getRoot();
+  const topLevelChildren = root.getChildren();
+
+  for (let i = 0; i < topLevelChildren.length; i++) {
+    const topLevelNode = topLevelChildren[i];
+    $appendNodesToHTML(editor, topLevelNode, container, selection);
+  }
+
+  return container.innerHTML;
+}
+
+function $appendNodesToHTML(
+  editor: LexicalEditor,
+  currentNode: LexicalNode,
+  parentElement: HTMLElement | DocumentFragment,
+  selection: BaseSelection | null = null,
+): boolean {
+  let shouldInclude =
+    selection !== null ? currentNode.isSelected(selection) : true;
+  const shouldExclude =
+    $isElementNode(currentNode) && currentNode.excludeFromCopy('html');
+  let target = currentNode;
+
+  if (selection !== null) {
+    let clone = $cloneWithProperties(currentNode);
+    clone =
+      $isTextNode(clone) && selection !== null
+        ? $sliceSelectedTextNodeContent(selection, clone)
+        : clone;
+    target = clone;
+  }
+  const children = $isElementNode(target) ? target.getChildren() : [];
+  const registeredNode = editor._nodes.get(target.getType());
+  let exportOutput;
+
+  // Use HTMLConfig overrides, if available.
+  if (registeredNode && registeredNode.exportDOM !== undefined) {
+    exportOutput = registeredNode.exportDOM(editor, target);
+  } else {
+    exportOutput = target.exportDOM(editor);
+  }
+
+  const {element, after} = exportOutput;
+
+  if (!element) {
+    return false;
+  }
+
+  const fragment = document.createDocumentFragment();
+
+  for (let i = 0; i < children.length; i++) {
+    const childNode = children[i];
+    const shouldIncludeChild = $appendNodesToHTML(
+      editor,
+      childNode,
+      fragment,
+      selection,
+    );
+
+    if (
+      !shouldInclude &&
+      $isElementNode(currentNode) &&
+      shouldIncludeChild &&
+      currentNode.extractWithChild(childNode, selection, 'html')
+    ) {
+      shouldInclude = true;
+    }
+  }
+
+  if (shouldInclude && !shouldExclude) {
+    if (isHTMLElement(element)) {
+      element.append(fragment);
+    }
+    parentElement.append(element);
+
+    if (after) {
+      const newElement = after.call(target, element);
+      if (newElement) {
+        element.replaceWith(newElement);
+      }
+    }
+  } else {
+    parentElement.append(fragment);
+  }
+
+  return shouldInclude;
+}
+
+function getConversionFunction(
+  domNode: Node,
+  editor: LexicalEditor,
+): DOMConversionFn | null {
+  const {nodeName} = domNode;
+
+  const cachedConversions = editor._htmlConversions.get(nodeName.toLowerCase());
+
+  let currentConversion: DOMConversion | null = null;
+
+  if (cachedConversions !== undefined) {
+    for (const cachedConversion of cachedConversions) {
+      const domConversion = cachedConversion(domNode);
+      if (
+        domConversion !== null &&
+        (currentConversion === null ||
+          (currentConversion.priority || 0) < (domConversion.priority || 0))
+      ) {
+        currentConversion = domConversion;
+      }
+    }
+  }
+
+  return currentConversion !== null ? currentConversion.conversion : null;
+}
+
+const IGNORE_TAGS = new Set(['STYLE', 'SCRIPT']);
+
+function $createNodesFromDOM(
+  node: Node,
+  editor: LexicalEditor,
+  allArtificialNodes: Array<ArtificialNode__DO_NOT_USE>,
+  hasBlockAncestorLexicalNode: boolean,
+  forChildMap: Map<string, DOMChildConversion> = new Map(),
+  parentLexicalNode?: LexicalNode | null | undefined,
+): Array<LexicalNode> {
+  let lexicalNodes: Array<LexicalNode> = [];
+
+  if (IGNORE_TAGS.has(node.nodeName)) {
+    return lexicalNodes;
+  }
+
+  let currentLexicalNode = null;
+  const transformFunction = getConversionFunction(node, editor);
+  const transformOutput = transformFunction
+    ? transformFunction(node as HTMLElement)
+    : null;
+  let postTransform = null;
+
+  if (transformOutput !== null) {
+    postTransform = transformOutput.after;
+    const transformNodes = transformOutput.node;
+    currentLexicalNode = Array.isArray(transformNodes)
+      ? transformNodes[transformNodes.length - 1]
+      : transformNodes;
+
+    if (currentLexicalNode !== null) {
+      for (const [, forChildFunction] of forChildMap) {
+        currentLexicalNode = forChildFunction(
+          currentLexicalNode,
+          parentLexicalNode,
+        );
+
+        if (!currentLexicalNode) {
+          break;
+        }
+      }
+
+      if (currentLexicalNode) {
+        lexicalNodes.push(
+          ...(Array.isArray(transformNodes)
+            ? transformNodes
+            : [currentLexicalNode]),
+        );
+      }
+    }
+
+    if (transformOutput.forChild != null) {
+      forChildMap.set(node.nodeName, transformOutput.forChild);
+    }
+  }
+
+  // If the DOM node doesn't have a transformer, we don't know what
+  // to do with it but we still need to process any childNodes.
+  const children = node.childNodes;
+  let childLexicalNodes = [];
+
+  const hasBlockAncestorLexicalNodeForChildren =
+    currentLexicalNode != null && $isRootOrShadowRoot(currentLexicalNode)
+      ? false
+      : (currentLexicalNode != null &&
+          $isBlockElementNode(currentLexicalNode)) ||
+        hasBlockAncestorLexicalNode;
+
+  for (let i = 0; i < children.length; i++) {
+    childLexicalNodes.push(
+      ...$createNodesFromDOM(
+        children[i],
+        editor,
+        allArtificialNodes,
+        hasBlockAncestorLexicalNodeForChildren,
+        new Map(forChildMap),
+        currentLexicalNode,
+      ),
+    );
+  }
+
+  if (postTransform != null) {
+    childLexicalNodes = postTransform(childLexicalNodes);
+  }
+
+  if (isBlockDomNode(node)) {
+    if (!hasBlockAncestorLexicalNodeForChildren) {
+      childLexicalNodes = wrapContinuousInlines(
+        node,
+        childLexicalNodes,
+        $createParagraphNode,
+      );
+    } else {
+      childLexicalNodes = wrapContinuousInlines(node, childLexicalNodes, () => {
+        const artificialNode = new ArtificialNode__DO_NOT_USE();
+        allArtificialNodes.push(artificialNode);
+        return artificialNode;
+      });
+    }
+  }
+
+  if (currentLexicalNode == null) {
+    if (childLexicalNodes.length > 0) {
+      // If it hasn't been converted to a LexicalNode, we hoist its children
+      // up to the same level as it.
+      lexicalNodes = lexicalNodes.concat(childLexicalNodes);
+    } else {
+      if (isBlockDomNode(node) && isDomNodeBetweenTwoInlineNodes(node)) {
+        // Empty block dom node that hasnt been converted, we replace it with a linebreak if its between inline nodes
+        lexicalNodes = lexicalNodes.concat($createLineBreakNode());
+      }
+    }
+  } else {
+    if ($isElementNode(currentLexicalNode)) {
+      // If the current node is a ElementNode after conversion,
+      // we can append all the children to it.
+      currentLexicalNode.append(...childLexicalNodes);
+    }
+  }
+
+  return lexicalNodes;
+}
+
+function wrapContinuousInlines(
+  domNode: Node,
+  nodes: Array<LexicalNode>,
+  createWrapperFn: () => ElementNode,
+): Array<LexicalNode> {
+  const textAlign = (domNode as HTMLElement).style
+    .textAlign as ElementFormatType;
+  const out: Array<LexicalNode> = [];
+  let continuousInlines: Array<LexicalNode> = [];
+  // wrap contiguous inline child nodes in para
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if ($isBlockElementNode(node)) {
+      if (textAlign && !node.getFormat()) {
+        node.setFormat(textAlign);
+      }
+      out.push(node);
+    } else {
+      continuousInlines.push(node);
+      if (
+        i === nodes.length - 1 ||
+        (i < nodes.length - 1 && $isBlockElementNode(nodes[i + 1]))
+      ) {
+        const wrapper = createWrapperFn();
+        wrapper.setFormat(textAlign);
+        wrapper.append(...continuousInlines);
+        out.push(wrapper);
+        continuousInlines = [];
+      }
+    }
+  }
+  return out;
+}
+
+function $unwrapArtificalNodes(
+  allArtificialNodes: Array<ArtificialNode__DO_NOT_USE>,
+) {
+  for (const node of allArtificialNodes) {
+    if (node.getNextSibling() instanceof ArtificialNode__DO_NOT_USE) {
+      node.insertAfter($createLineBreakNode());
+    }
+  }
+  // Replace artificial node with it's children
+  for (const node of allArtificialNodes) {
+    const children = node.getChildren();
+    for (const child of children) {
+      node.insertBefore(child);
+    }
+    node.remove();
+  }
+}
+
+function isDomNodeBetweenTwoInlineNodes(node: Node): boolean {
+  if (node.nextSibling == null || node.previousSibling == null) {
+    return false;
+  }
+  return (
+    isInlineDomNode(node.nextSibling) && isInlineDomNode(node.previousSibling)
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
new file mode 100644
index 00000000000..8ef2aa0519f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
@@ -0,0 +1,506 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createAutoLinkNode,
+  $isAutoLinkNode,
+  $toggleLink,
+  AutoLinkNode,
+  SerializedAutoLinkNode,
+} from '@lexical/link';
+import {
+  $getRoot,
+  $selectAll,
+  ParagraphNode,
+  SerializedParagraphNode,
+  TextNode,
+} from 'lexical/src';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    link: 'my-autolink-class',
+    text: {
+      bold: 'my-bold-class',
+      code: 'my-code-class',
+      hashtag: 'my-hashtag-class',
+      italic: 'my-italic-class',
+      strikethrough: 'my-strikethrough-class',
+      underline: 'my-underline-class',
+      underlineStrikethrough: 'my-underline-strikethrough-class',
+    },
+  },
+});
+
+describe('LexicalAutoAutoLinkNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('AutoAutoLinkNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const actutoLinkNode = new AutoLinkNode('/');
+
+        expect(actutoLinkNode.__type).toBe('autolink');
+        expect(actutoLinkNode.__url).toBe('/');
+        expect(actutoLinkNode.__isUnlinked).toBe(false);
+      });
+
+      expect(() => new AutoLinkNode('')).toThrow();
+    });
+
+    test('AutoAutoLinkNode.constructor with isUnlinked param set to true', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const actutoLinkNode = new AutoLinkNode('/', {
+          isUnlinked: true,
+        });
+
+        expect(actutoLinkNode.__type).toBe('autolink');
+        expect(actutoLinkNode.__url).toBe('/');
+        expect(actutoLinkNode.__isUnlinked).toBe(true);
+      });
+
+      expect(() => new AutoLinkNode('')).toThrow();
+    });
+
+    ///
+
+    test('LineBreakNode.clone()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('/');
+
+        const clone = AutoLinkNode.clone(autoLinkNode);
+
+        expect(clone).not.toBe(autoLinkNode);
+        expect(clone).toStrictEqual(autoLinkNode);
+      });
+    });
+
+    test('AutoLinkNode.getURL()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+
+        expect(autoLinkNode.getURL()).toBe('https://example.com/foo');
+      });
+    });
+
+    test('AutoLinkNode.setURL()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+
+        expect(autoLinkNode.getURL()).toBe('https://example.com/foo');
+
+        autoLinkNode.setURL('https://example.com/bar');
+
+        expect(autoLinkNode.getURL()).toBe('https://example.com/bar');
+      });
+    });
+
+    test('AutoLinkNode.getTarget()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          target: '_blank',
+        });
+
+        expect(autoLinkNode.getTarget()).toBe('_blank');
+      });
+    });
+
+    test('AutoLinkNode.setTarget()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          target: '_blank',
+        });
+
+        expect(autoLinkNode.getTarget()).toBe('_blank');
+
+        autoLinkNode.setTarget('_self');
+
+        expect(autoLinkNode.getTarget()).toBe('_self');
+      });
+    });
+
+    test('AutoLinkNode.getRel()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+        });
+
+        expect(autoLinkNode.getRel()).toBe('noopener noreferrer');
+      });
+    });
+
+    test('AutoLinkNode.setRel()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener',
+          target: '_blank',
+        });
+
+        expect(autoLinkNode.getRel()).toBe('noopener');
+
+        autoLinkNode.setRel('noopener noreferrer');
+
+        expect(autoLinkNode.getRel()).toBe('noopener noreferrer');
+      });
+    });
+
+    test('AutoLinkNode.getTitle()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          title: 'Hello world',
+        });
+
+        expect(autoLinkNode.getTitle()).toBe('Hello world');
+      });
+    });
+
+    test('AutoLinkNode.setTitle()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          title: 'Hello world',
+        });
+
+        expect(autoLinkNode.getTitle()).toBe('Hello world');
+
+        autoLinkNode.setTitle('World hello');
+
+        expect(autoLinkNode.getTitle()).toBe('World hello');
+      });
+    });
+
+    test('AutoLinkNode.getIsUnlinked()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('/', {
+          isUnlinked: true,
+        });
+        expect(autoLinkNode.getIsUnlinked()).toBe(true);
+      });
+    });
+
+    test('AutoLinkNode.setIsUnlinked()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('/');
+        expect(autoLinkNode.getIsUnlinked()).toBe(false);
+        autoLinkNode.setIsUnlinked(true);
+        expect(autoLinkNode.getIsUnlinked()).toBe(true);
+      });
+    });
+
+    test('AutoLinkNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" class="my-autolink-class"></a>',
+        );
+        expect(
+          autoLinkNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<a href="https://example.com/foo"></a>');
+      });
+    });
+
+    test('AutoLinkNode.createDOM() for unlinked', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          isUnlinked: true,
+        });
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          `<span>${autoLinkNode.getTextContent()}</span>`,
+        );
+      });
+    });
+
+    test('AutoLinkNode.createDOM() with target, rel and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-autolink-class"></a>',
+        );
+        expect(
+          autoLinkNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world"></a>',
+        );
+      });
+    });
+
+    test('AutoLinkNode.createDOM() sanitizes javascript: URLs', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        // eslint-disable-next-line no-script-url
+        const autoLinkNode = new AutoLinkNode('javascript:alert(0)');
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="about:blank" class="my-autolink-class"></a>',
+        );
+      });
+    });
+
+    test('AutoLinkNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+
+        const domElement = autoLinkNode.createDOM(editorConfig);
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" class="my-autolink-class"></a>',
+        );
+
+        const newAutoLinkNode = new AutoLinkNode('https://example.com/bar');
+        const result = newAutoLinkNode.updateDOM(
+          autoLinkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" class="my-autolink-class"></a>',
+        );
+      });
+    });
+
+    test('AutoLinkNode.updateDOM() with target, rel and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const domElement = autoLinkNode.createDOM(editorConfig);
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-autolink-class"></a>',
+        );
+
+        const newAutoLinkNode = new AutoLinkNode('https://example.com/bar', {
+          rel: 'noopener',
+          target: '_self',
+          title: 'World hello',
+        });
+        const result = newAutoLinkNode.updateDOM(
+          autoLinkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" target="_self" rel="noopener" title="World hello" class="my-autolink-class"></a>',
+        );
+      });
+    });
+
+    test('AutoLinkNode.updateDOM() with undefined target, undefined rel and undefined title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const domElement = autoLinkNode.createDOM(editorConfig);
+
+        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-autolink-class"></a>',
+        );
+
+        const newNode = new AutoLinkNode('https://example.com/bar');
+        const result = newNode.updateDOM(
+          autoLinkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" class="my-autolink-class"></a>',
+        );
+      });
+    });
+
+    test('AutoLinkNode.updateDOM() with isUnlinked "true"', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          isUnlinked: false,
+        });
+
+        const domElement = autoLinkNode.createDOM(editorConfig);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/foo" class="my-autolink-class"></a>',
+        );
+
+        const newAutoLinkNode = new AutoLinkNode('https://example.com/bar', {
+          isUnlinked: true,
+        });
+        const newDomElement = newAutoLinkNode.createDOM(editorConfig);
+        expect(newDomElement.outerHTML).toBe(
+          `<span>${newAutoLinkNode.getTextContent()}</span>`,
+        );
+
+        const result = newAutoLinkNode.updateDOM(
+          autoLinkNode,
+          domElement,
+          editorConfig,
+        );
+        expect(result).toBe(true);
+      });
+    });
+
+    test('AutoLinkNode.canInsertTextBefore()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+
+        expect(autoLinkNode.canInsertTextBefore()).toBe(false);
+      });
+    });
+
+    test('AutoLinkNode.canInsertTextAfter()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+        expect(autoLinkNode.canInsertTextAfter()).toBe(false);
+      });
+    });
+
+    test('$createAutoLinkNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo');
+        const createdAutoLinkNode = $createAutoLinkNode(
+          'https://example.com/foo',
+        );
+
+        expect(autoLinkNode.__type).toEqual(createdAutoLinkNode.__type);
+        expect(autoLinkNode.__parent).toEqual(createdAutoLinkNode.__parent);
+        expect(autoLinkNode.__url).toEqual(createdAutoLinkNode.__url);
+        expect(autoLinkNode.__isUnlinked).toEqual(
+          createdAutoLinkNode.__isUnlinked,
+        );
+        expect(autoLinkNode.__key).not.toEqual(createdAutoLinkNode.__key);
+      });
+    });
+
+    test('$createAutoLinkNode() with target, rel, isUnlinked and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const createdAutoLinkNode = $createAutoLinkNode(
+          'https://example.com/foo',
+          {
+            isUnlinked: true,
+            rel: 'noopener noreferrer',
+            target: '_blank',
+            title: 'Hello world',
+          },
+        );
+
+        expect(autoLinkNode.__type).toEqual(createdAutoLinkNode.__type);
+        expect(autoLinkNode.__parent).toEqual(createdAutoLinkNode.__parent);
+        expect(autoLinkNode.__url).toEqual(createdAutoLinkNode.__url);
+        expect(autoLinkNode.__target).toEqual(createdAutoLinkNode.__target);
+        expect(autoLinkNode.__rel).toEqual(createdAutoLinkNode.__rel);
+        expect(autoLinkNode.__title).toEqual(createdAutoLinkNode.__title);
+        expect(autoLinkNode.__key).not.toEqual(createdAutoLinkNode.__key);
+        expect(autoLinkNode.__isUnlinked).not.toEqual(
+          createdAutoLinkNode.__isUnlinked,
+        );
+      });
+    });
+
+    test('$isAutoLinkNode()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const autoLinkNode = new AutoLinkNode('');
+        expect($isAutoLinkNode(autoLinkNode)).toBe(true);
+      });
+    });
+
+    test('$toggleLink applies the title attribute when creating', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const p = new ParagraphNode();
+        p.append(new TextNode('Some text'));
+        $getRoot().append(p);
+      });
+
+      await editor.update(() => {
+        $selectAll();
+        $toggleLink('https://lexical.dev/', {title: 'Lexical Website'});
+      });
+
+      const paragraph = editor!.getEditorState().toJSON().root
+        .children[0] as SerializedParagraphNode;
+      const link = paragraph.children[0] as SerializedAutoLinkNode;
+      expect(link.title).toBe('Lexical Website');
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
new file mode 100644
index 00000000000..3ad6cbad8b8
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
@@ -0,0 +1,413 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createLinkNode,
+  $isLinkNode,
+  $toggleLink,
+  LinkNode,
+  SerializedLinkNode,
+} from '@lexical/link';
+import {
+  $getRoot,
+  $selectAll,
+  ParagraphNode,
+  SerializedParagraphNode,
+  TextNode,
+} from 'lexical/src';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    link: 'my-link-class',
+    text: {
+      bold: 'my-bold-class',
+      code: 'my-code-class',
+      hashtag: 'my-hashtag-class',
+      italic: 'my-italic-class',
+      strikethrough: 'my-strikethrough-class',
+      underline: 'my-underline-class',
+      underlineStrikethrough: 'my-underline-strikethrough-class',
+    },
+  },
+});
+
+describe('LexicalLinkNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('LinkNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('/');
+
+        expect(linkNode.__type).toBe('link');
+        expect(linkNode.__url).toBe('/');
+      });
+
+      expect(() => new LinkNode('')).toThrow();
+    });
+
+    test('LineBreakNode.clone()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('/');
+
+        const linkNodeClone = LinkNode.clone(linkNode);
+
+        expect(linkNodeClone).not.toBe(linkNode);
+        expect(linkNodeClone).toStrictEqual(linkNode);
+      });
+    });
+
+    test('LinkNode.getURL()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        expect(linkNode.getURL()).toBe('https://example.com/foo');
+      });
+    });
+
+    test('LinkNode.setURL()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        expect(linkNode.getURL()).toBe('https://example.com/foo');
+
+        linkNode.setURL('https://example.com/bar');
+
+        expect(linkNode.getURL()).toBe('https://example.com/bar');
+      });
+    });
+
+    test('LinkNode.getTarget()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          target: '_blank',
+        });
+
+        expect(linkNode.getTarget()).toBe('_blank');
+      });
+    });
+
+    test('LinkNode.setTarget()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          target: '_blank',
+        });
+
+        expect(linkNode.getTarget()).toBe('_blank');
+
+        linkNode.setTarget('_self');
+
+        expect(linkNode.getTarget()).toBe('_self');
+      });
+    });
+
+    test('LinkNode.getRel()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+        });
+
+        expect(linkNode.getRel()).toBe('noopener noreferrer');
+      });
+    });
+
+    test('LinkNode.setRel()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener',
+          target: '_blank',
+        });
+
+        expect(linkNode.getRel()).toBe('noopener');
+
+        linkNode.setRel('noopener noreferrer');
+
+        expect(linkNode.getRel()).toBe('noopener noreferrer');
+      });
+    });
+
+    test('LinkNode.getTitle()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          title: 'Hello world',
+        });
+
+        expect(linkNode.getTitle()).toBe('Hello world');
+      });
+    });
+
+    test('LinkNode.setTitle()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          title: 'Hello world',
+        });
+
+        expect(linkNode.getTitle()).toBe('Hello world');
+
+        linkNode.setTitle('World hello');
+
+        expect(linkNode.getTitle()).toBe('World hello');
+      });
+    });
+
+    test('LinkNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" class="my-link-class"></a>',
+        );
+        expect(
+          linkNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<a href="https://example.com/foo"></a>');
+      });
+    });
+
+    test('LinkNode.createDOM() with target, rel and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-link-class"></a>',
+        );
+        expect(
+          linkNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world"></a>',
+        );
+      });
+    });
+
+    test('LinkNode.createDOM() sanitizes javascript: URLs', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        // eslint-disable-next-line no-script-url
+        const linkNode = new LinkNode('javascript:alert(0)');
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="about:blank" class="my-link-class"></a>',
+        );
+      });
+    });
+
+    test('LinkNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        const domElement = linkNode.createDOM(editorConfig);
+
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" class="my-link-class"></a>',
+        );
+
+        const newLinkNode = new LinkNode('https://example.com/bar');
+        const result = newLinkNode.updateDOM(
+          linkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" class="my-link-class"></a>',
+        );
+      });
+    });
+
+    test('LinkNode.updateDOM() with target, rel and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const domElement = linkNode.createDOM(editorConfig);
+
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-link-class"></a>',
+        );
+
+        const newLinkNode = new LinkNode('https://example.com/bar', {
+          rel: 'noopener',
+          target: '_self',
+          title: 'World hello',
+        });
+        const result = newLinkNode.updateDOM(
+          linkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" target="_self" rel="noopener" title="World hello" class="my-link-class"></a>',
+        );
+      });
+    });
+
+    test('LinkNode.updateDOM() with undefined target, undefined rel and undefined title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const domElement = linkNode.createDOM(editorConfig);
+
+        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
+          '<a href="https://example.com/foo" target="_blank" rel="noopener noreferrer" title="Hello world" class="my-link-class"></a>',
+        );
+
+        const newLinkNode = new LinkNode('https://example.com/bar');
+        const result = newLinkNode.updateDOM(
+          linkNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<a href="https://example.com/bar" class="my-link-class"></a>',
+        );
+      });
+    });
+
+    test('LinkNode.canInsertTextBefore()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        expect(linkNode.canInsertTextBefore()).toBe(false);
+      });
+    });
+
+    test('LinkNode.canInsertTextAfter()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        expect(linkNode.canInsertTextAfter()).toBe(false);
+      });
+    });
+
+    test('$createLinkNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo');
+
+        const createdLinkNode = $createLinkNode('https://example.com/foo');
+
+        expect(linkNode.__type).toEqual(createdLinkNode.__type);
+        expect(linkNode.__parent).toEqual(createdLinkNode.__parent);
+        expect(linkNode.__url).toEqual(createdLinkNode.__url);
+        expect(linkNode.__key).not.toEqual(createdLinkNode.__key);
+      });
+    });
+
+    test('$createLinkNode() with target, rel and title', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        const createdLinkNode = $createLinkNode('https://example.com/foo', {
+          rel: 'noopener noreferrer',
+          target: '_blank',
+          title: 'Hello world',
+        });
+
+        expect(linkNode.__type).toEqual(createdLinkNode.__type);
+        expect(linkNode.__parent).toEqual(createdLinkNode.__parent);
+        expect(linkNode.__url).toEqual(createdLinkNode.__url);
+        expect(linkNode.__target).toEqual(createdLinkNode.__target);
+        expect(linkNode.__rel).toEqual(createdLinkNode.__rel);
+        expect(linkNode.__title).toEqual(createdLinkNode.__title);
+        expect(linkNode.__key).not.toEqual(createdLinkNode.__key);
+      });
+    });
+
+    test('$isLinkNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const linkNode = new LinkNode('');
+
+        expect($isLinkNode(linkNode)).toBe(true);
+      });
+    });
+
+    test('$toggleLink applies the title attribute when creating', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const p = new ParagraphNode();
+        p.append(new TextNode('Some text'));
+        $getRoot().append(p);
+      });
+
+      await editor.update(() => {
+        $selectAll();
+        $toggleLink('https://lexical.dev/', {title: 'Lexical Website'});
+      });
+
+      const paragraph = editor!.getEditorState().toJSON().root
+        .children[0] as SerializedParagraphNode;
+      const link = paragraph.children[0] as SerializedLinkNode;
+      expect(link.title).toBe('Lexical Website');
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/link/index.ts b/resources/js/wysiwyg/lexical/link/index.ts
new file mode 100644
index 00000000000..fe2b9757048
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/link/index.ts
@@ -0,0 +1,610 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  BaseSelection,
+  DOMConversionMap,
+  DOMConversionOutput,
+  EditorConfig,
+  LexicalCommand,
+  LexicalNode,
+  NodeKey,
+  RangeSelection,
+  SerializedElementNode,
+} from 'lexical';
+
+import {addClassNamesToElement, isHTMLAnchorElement} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $getSelection,
+  $isElementNode,
+  $isRangeSelection,
+  createCommand,
+  ElementNode,
+  Spread,
+} from 'lexical';
+
+export type LinkAttributes = {
+  rel?: null | string;
+  target?: null | string;
+  title?: null | string;
+};
+
+export type AutoLinkAttributes = Partial<
+  Spread<LinkAttributes, {isUnlinked?: boolean}>
+>;
+
+export type SerializedLinkNode = Spread<
+  {
+    url: string;
+  },
+  Spread<LinkAttributes, SerializedElementNode>
+>;
+
+type LinkHTMLElementType = HTMLAnchorElement | HTMLSpanElement;
+
+const SUPPORTED_URL_PROTOCOLS = new Set([
+  'http:',
+  'https:',
+  'mailto:',
+  'sms:',
+  'tel:',
+]);
+
+/** @noInheritDoc */
+export class LinkNode extends ElementNode {
+  /** @internal */
+  __url: string;
+  /** @internal */
+  __target: null | string;
+  /** @internal */
+  __rel: null | string;
+  /** @internal */
+  __title: null | string;
+
+  static getType(): string {
+    return 'link';
+  }
+
+  static clone(node: LinkNode): LinkNode {
+    return new LinkNode(
+      node.__url,
+      {rel: node.__rel, target: node.__target, title: node.__title},
+      node.__key,
+    );
+  }
+
+  constructor(url: string, attributes: LinkAttributes = {}, key?: NodeKey) {
+    super(key);
+    const {target = null, rel = null, title = null} = attributes;
+    this.__url = url;
+    this.__target = target;
+    this.__rel = rel;
+    this.__title = title;
+  }
+
+  createDOM(config: EditorConfig): LinkHTMLElementType {
+    const element = document.createElement('a');
+    element.href = this.sanitizeUrl(this.__url);
+    if (this.__target !== null) {
+      element.target = this.__target;
+    }
+    if (this.__rel !== null) {
+      element.rel = this.__rel;
+    }
+    if (this.__title !== null) {
+      element.title = this.__title;
+    }
+    addClassNamesToElement(element, config.theme.link);
+    return element;
+  }
+
+  updateDOM(
+    prevNode: LinkNode,
+    anchor: LinkHTMLElementType,
+    config: EditorConfig,
+  ): boolean {
+    if (anchor instanceof HTMLAnchorElement) {
+      const url = this.__url;
+      const target = this.__target;
+      const rel = this.__rel;
+      const title = this.__title;
+      if (url !== prevNode.__url) {
+        anchor.href = url;
+      }
+
+      if (target !== prevNode.__target) {
+        if (target) {
+          anchor.target = target;
+        } else {
+          anchor.removeAttribute('target');
+        }
+      }
+
+      if (rel !== prevNode.__rel) {
+        if (rel) {
+          anchor.rel = rel;
+        } else {
+          anchor.removeAttribute('rel');
+        }
+      }
+
+      if (title !== prevNode.__title) {
+        if (title) {
+          anchor.title = title;
+        } else {
+          anchor.removeAttribute('title');
+        }
+      }
+    }
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      a: (node: Node) => ({
+        conversion: $convertAnchorElement,
+        priority: 1,
+      }),
+    };
+  }
+
+  static importJSON(
+    serializedNode: SerializedLinkNode | SerializedAutoLinkNode,
+  ): LinkNode {
+    const node = $createLinkNode(serializedNode.url, {
+      rel: serializedNode.rel,
+      target: serializedNode.target,
+      title: serializedNode.title,
+    });
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  sanitizeUrl(url: string): string {
+    try {
+      const parsedUrl = new URL(url);
+      // eslint-disable-next-line no-script-url
+      if (!SUPPORTED_URL_PROTOCOLS.has(parsedUrl.protocol)) {
+        return 'about:blank';
+      }
+    } catch {
+      return url;
+    }
+    return url;
+  }
+
+  exportJSON(): SerializedLinkNode | SerializedAutoLinkNode {
+    return {
+      ...super.exportJSON(),
+      rel: this.getRel(),
+      target: this.getTarget(),
+      title: this.getTitle(),
+      type: 'link',
+      url: this.getURL(),
+      version: 1,
+    };
+  }
+
+  getURL(): string {
+    return this.getLatest().__url;
+  }
+
+  setURL(url: string): void {
+    const writable = this.getWritable();
+    writable.__url = url;
+  }
+
+  getTarget(): null | string {
+    return this.getLatest().__target;
+  }
+
+  setTarget(target: null | string): void {
+    const writable = this.getWritable();
+    writable.__target = target;
+  }
+
+  getRel(): null | string {
+    return this.getLatest().__rel;
+  }
+
+  setRel(rel: null | string): void {
+    const writable = this.getWritable();
+    writable.__rel = rel;
+  }
+
+  getTitle(): null | string {
+    return this.getLatest().__title;
+  }
+
+  setTitle(title: null | string): void {
+    const writable = this.getWritable();
+    writable.__title = title;
+  }
+
+  insertNewAfter(
+    _: RangeSelection,
+    restoreSelection = true,
+  ): null | ElementNode {
+    const linkNode = $createLinkNode(this.__url, {
+      rel: this.__rel,
+      target: this.__target,
+      title: this.__title,
+    });
+    this.insertAfter(linkNode, restoreSelection);
+    return linkNode;
+  }
+
+  canInsertTextBefore(): false {
+    return false;
+  }
+
+  canInsertTextAfter(): false {
+    return false;
+  }
+
+  canBeEmpty(): false {
+    return false;
+  }
+
+  isInline(): true {
+    return true;
+  }
+
+  extractWithChild(
+    child: LexicalNode,
+    selection: BaseSelection,
+    destination: 'clone' | 'html',
+  ): boolean {
+    if (!$isRangeSelection(selection)) {
+      return false;
+    }
+
+    const anchorNode = selection.anchor.getNode();
+    const focusNode = selection.focus.getNode();
+
+    return (
+      this.isParentOf(anchorNode) &&
+      this.isParentOf(focusNode) &&
+      selection.getTextContent().length > 0
+    );
+  }
+
+  isEmailURI(): boolean {
+    return this.__url.startsWith('mailto:');
+  }
+
+  isWebSiteURI(): boolean {
+    return (
+      this.__url.startsWith('https://') || this.__url.startsWith('http://')
+    );
+  }
+}
+
+function $convertAnchorElement(domNode: Node): DOMConversionOutput {
+  let node = null;
+  if (isHTMLAnchorElement(domNode)) {
+    const content = domNode.textContent;
+    if ((content !== null && content !== '') || domNode.children.length > 0) {
+      node = $createLinkNode(domNode.getAttribute('href') || '', {
+        rel: domNode.getAttribute('rel'),
+        target: domNode.getAttribute('target'),
+        title: domNode.getAttribute('title'),
+      });
+    }
+  }
+  return {node};
+}
+
+/**
+ * Takes a URL and creates a LinkNode.
+ * @param url - The URL the LinkNode should direct to.
+ * @param attributes - Optional HTML a tag attributes \\{ target, rel, title \\}
+ * @returns The LinkNode.
+ */
+export function $createLinkNode(
+  url: string,
+  attributes?: LinkAttributes,
+): LinkNode {
+  return $applyNodeReplacement(new LinkNode(url, attributes));
+}
+
+/**
+ * Determines if node is a LinkNode.
+ * @param node - The node to be checked.
+ * @returns true if node is a LinkNode, false otherwise.
+ */
+export function $isLinkNode(
+  node: LexicalNode | null | undefined,
+): node is LinkNode {
+  return node instanceof LinkNode;
+}
+
+export type SerializedAutoLinkNode = Spread<
+  {
+    isUnlinked: boolean;
+  },
+  SerializedLinkNode
+>;
+
+// Custom node type to override `canInsertTextAfter` that will
+// allow typing within the link
+export class AutoLinkNode extends LinkNode {
+  /** @internal */
+  /** Indicates whether the autolink was ever unlinked. **/
+  __isUnlinked: boolean;
+
+  constructor(url: string, attributes: AutoLinkAttributes = {}, key?: NodeKey) {
+    super(url, attributes, key);
+    this.__isUnlinked =
+      attributes.isUnlinked !== undefined && attributes.isUnlinked !== null
+        ? attributes.isUnlinked
+        : false;
+  }
+
+  static getType(): string {
+    return 'autolink';
+  }
+
+  static clone(node: AutoLinkNode): AutoLinkNode {
+    return new AutoLinkNode(
+      node.__url,
+      {
+        isUnlinked: node.__isUnlinked,
+        rel: node.__rel,
+        target: node.__target,
+        title: node.__title,
+      },
+      node.__key,
+    );
+  }
+
+  getIsUnlinked(): boolean {
+    return this.__isUnlinked;
+  }
+
+  setIsUnlinked(value: boolean) {
+    const self = this.getWritable();
+    self.__isUnlinked = value;
+    return self;
+  }
+
+  createDOM(config: EditorConfig): LinkHTMLElementType {
+    if (this.__isUnlinked) {
+      return document.createElement('span');
+    } else {
+      return super.createDOM(config);
+    }
+  }
+
+  updateDOM(
+    prevNode: AutoLinkNode,
+    anchor: LinkHTMLElementType,
+    config: EditorConfig,
+  ): boolean {
+    return (
+      super.updateDOM(prevNode, anchor, config) ||
+      prevNode.__isUnlinked !== this.__isUnlinked
+    );
+  }
+
+  static importJSON(serializedNode: SerializedAutoLinkNode): AutoLinkNode {
+    const node = $createAutoLinkNode(serializedNode.url, {
+      isUnlinked: serializedNode.isUnlinked,
+      rel: serializedNode.rel,
+      target: serializedNode.target,
+      title: serializedNode.title,
+    });
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  static importDOM(): null {
+    // TODO: Should link node should handle the import over autolink?
+    return null;
+  }
+
+  exportJSON(): SerializedAutoLinkNode {
+    return {
+      ...super.exportJSON(),
+      isUnlinked: this.__isUnlinked,
+      type: 'autolink',
+      version: 1,
+    };
+  }
+
+  insertNewAfter(
+    selection: RangeSelection,
+    restoreSelection = true,
+  ): null | ElementNode {
+    const element = this.getParentOrThrow().insertNewAfter(
+      selection,
+      restoreSelection,
+    );
+    if ($isElementNode(element)) {
+      const linkNode = $createAutoLinkNode(this.__url, {
+        isUnlinked: this.__isUnlinked,
+        rel: this.__rel,
+        target: this.__target,
+        title: this.__title,
+      });
+      element.append(linkNode);
+      return linkNode;
+    }
+    return null;
+  }
+}
+
+/**
+ * Takes a URL and creates an AutoLinkNode. AutoLinkNodes are generally automatically generated
+ * during typing, which is especially useful when a button to generate a LinkNode is not practical.
+ * @param url - The URL the LinkNode should direct to.
+ * @param attributes - Optional HTML a tag attributes. \\{ target, rel, title \\}
+ * @returns The LinkNode.
+ */
+export function $createAutoLinkNode(
+  url: string,
+  attributes?: AutoLinkAttributes,
+): AutoLinkNode {
+  return $applyNodeReplacement(new AutoLinkNode(url, attributes));
+}
+
+/**
+ * Determines if node is an AutoLinkNode.
+ * @param node - The node to be checked.
+ * @returns true if node is an AutoLinkNode, false otherwise.
+ */
+export function $isAutoLinkNode(
+  node: LexicalNode | null | undefined,
+): node is AutoLinkNode {
+  return node instanceof AutoLinkNode;
+}
+
+export const TOGGLE_LINK_COMMAND: LexicalCommand<
+  string | ({url: string} & LinkAttributes) | null
+> = createCommand('TOGGLE_LINK_COMMAND');
+
+/**
+ * Generates or updates a LinkNode. It can also delete a LinkNode if the URL is null,
+ * but saves any children and brings them up to the parent node.
+ * @param url - The URL the link directs to.
+ * @param attributes - Optional HTML a tag attributes. \\{ target, rel, title \\}
+ */
+export function $toggleLink(
+  url: null | string,
+  attributes: LinkAttributes = {},
+): void {
+  const {target, title} = attributes;
+  const rel = attributes.rel === undefined ? 'noreferrer' : attributes.rel;
+  const selection = $getSelection();
+
+  if (!$isRangeSelection(selection)) {
+    return;
+  }
+  const nodes = selection.extract();
+
+  if (url === null) {
+    // Remove LinkNodes
+    nodes.forEach((node) => {
+      const parent = node.getParent();
+
+      if (!$isAutoLinkNode(parent) && $isLinkNode(parent)) {
+        const children = parent.getChildren();
+
+        for (let i = 0; i < children.length; i++) {
+          parent.insertBefore(children[i]);
+        }
+
+        parent.remove();
+      }
+    });
+  } else {
+    // Add or merge LinkNodes
+    if (nodes.length === 1) {
+      const firstNode = nodes[0];
+      // if the first node is a LinkNode or if its
+      // parent is a LinkNode, we update the URL, target and rel.
+      const linkNode = $getAncestor(firstNode, $isLinkNode);
+      if (linkNode !== null) {
+        linkNode.setURL(url);
+        if (target !== undefined) {
+          linkNode.setTarget(target);
+        }
+        if (rel !== null) {
+          linkNode.setRel(rel);
+        }
+        if (title !== undefined) {
+          linkNode.setTitle(title);
+        }
+        return;
+      }
+    }
+
+    let prevParent: ElementNode | LinkNode | null = null;
+    let linkNode: LinkNode | null = null;
+
+    nodes.forEach((node) => {
+      const parent = node.getParent();
+
+      if (
+        parent === linkNode ||
+        parent === null ||
+        ($isElementNode(node) && !node.isInline())
+      ) {
+        return;
+      }
+
+      if ($isLinkNode(parent)) {
+        linkNode = parent;
+        parent.setURL(url);
+        if (target !== undefined) {
+          parent.setTarget(target);
+        }
+        if (rel !== null) {
+          linkNode.setRel(rel);
+        }
+        if (title !== undefined) {
+          linkNode.setTitle(title);
+        }
+        return;
+      }
+
+      if (!parent.is(prevParent)) {
+        prevParent = parent;
+        linkNode = $createLinkNode(url, {rel, target, title});
+
+        if ($isLinkNode(parent)) {
+          if (node.getPreviousSibling() === null) {
+            parent.insertBefore(linkNode);
+          } else {
+            parent.insertAfter(linkNode);
+          }
+        } else {
+          node.insertBefore(linkNode);
+        }
+      }
+
+      if ($isLinkNode(node)) {
+        if (node.is(linkNode)) {
+          return;
+        }
+        if (linkNode !== null) {
+          const children = node.getChildren();
+
+          for (let i = 0; i < children.length; i++) {
+            linkNode.append(children[i]);
+          }
+        }
+
+        node.remove();
+        return;
+      }
+
+      if (linkNode !== null) {
+        linkNode.append(node);
+      }
+    });
+  }
+}
+/** @deprecated renamed to {@link $toggleLink} by @lexical/eslint-plugin rules-of-lexical */
+export const toggleLink = $toggleLink;
+
+function $getAncestor<NodeType extends LexicalNode = LexicalNode>(
+  node: LexicalNode,
+  predicate: (ancestor: LexicalNode) => ancestor is NodeType,
+) {
+  let parent = node;
+  while (parent !== null && parent.getParent() !== null && !predicate(parent)) {
+    parent = parent.getParentOrThrow();
+  }
+  return predicate(parent) ? parent : null;
+}
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
new file mode 100644
index 00000000000..7d12b5bd38a
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -0,0 +1,552 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {ListNode, ListType} from './';
+import type {
+  BaseSelection,
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  EditorConfig,
+  EditorThemeClasses,
+  LexicalNode,
+  NodeKey,
+  ParagraphNode,
+  RangeSelection,
+  SerializedElementNode,
+  Spread,
+} from 'lexical';
+
+import {
+  addClassNamesToElement,
+  removeClassNamesFromElement,
+} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $createParagraphNode,
+  $isElementNode,
+  $isParagraphNode,
+  $isRangeSelection,
+  ElementNode,
+  LexicalEditor,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import normalizeClassNames from 'lexical/shared/normalizeClassNames';
+
+import {$createListNode, $isListNode} from './';
+import {$handleIndent, $handleOutdent, mergeLists} from './formatList';
+import {isNestedListNode} from './utils';
+
+export type SerializedListItemNode = Spread<
+  {
+    checked: boolean | undefined;
+    value: number;
+  },
+  SerializedElementNode
+>;
+
+/** @noInheritDoc */
+export class ListItemNode extends ElementNode {
+  /** @internal */
+  __value: number;
+  /** @internal */
+  __checked?: boolean;
+
+  static getType(): string {
+    return 'listitem';
+  }
+
+  static clone(node: ListItemNode): ListItemNode {
+    return new ListItemNode(node.__value, node.__checked, node.__key);
+  }
+
+  constructor(value?: number, checked?: boolean, key?: NodeKey) {
+    super(key);
+    this.__value = value === undefined ? 1 : value;
+    this.__checked = checked;
+  }
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const element = document.createElement('li');
+    const parent = this.getParent();
+    if ($isListNode(parent) && parent.getListType() === 'check') {
+      updateListItemChecked(element, this, null, parent);
+    }
+    element.value = this.__value;
+    $setListItemThemeClassNames(element, config.theme, this);
+    return element;
+  }
+
+  updateDOM(
+    prevNode: ListItemNode,
+    dom: HTMLElement,
+    config: EditorConfig,
+  ): boolean {
+    const parent = this.getParent();
+    if ($isListNode(parent) && parent.getListType() === 'check') {
+      updateListItemChecked(dom, this, prevNode, parent);
+    }
+    // @ts-expect-error - this is always HTMLListItemElement
+    dom.value = this.__value;
+    $setListItemThemeClassNames(dom, config.theme, this);
+
+    return false;
+  }
+
+  static transform(): (node: LexicalNode) => void {
+    return (node: LexicalNode) => {
+      invariant($isListItemNode(node), 'node is not a ListItemNode');
+      if (node.__checked == null) {
+        return;
+      }
+      const parent = node.getParent();
+      if ($isListNode(parent)) {
+        if (parent.getListType() !== 'check' && node.getChecked() != null) {
+          node.setChecked(undefined);
+        }
+      }
+    };
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      li: () => ({
+        conversion: $convertListItemElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  static importJSON(serializedNode: SerializedListItemNode): ListItemNode {
+    const node = $createListItemNode();
+    node.setChecked(serializedNode.checked);
+    node.setValue(serializedNode.value);
+    node.setFormat(serializedNode.format);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const element = this.createDOM(editor._config);
+    element.style.textAlign = this.getFormatType();
+    return {
+      element,
+    };
+  }
+
+  exportJSON(): SerializedListItemNode {
+    return {
+      ...super.exportJSON(),
+      checked: this.getChecked(),
+      type: 'listitem',
+      value: this.getValue(),
+      version: 1,
+    };
+  }
+
+  append(...nodes: LexicalNode[]): this {
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+
+      if ($isElementNode(node) && this.canMergeWith(node)) {
+        const children = node.getChildren();
+        this.append(...children);
+        node.remove();
+      } else {
+        super.append(node);
+      }
+    }
+
+    return this;
+  }
+
+  replace<N extends LexicalNode>(
+    replaceWithNode: N,
+    includeChildren?: boolean,
+  ): N {
+    if ($isListItemNode(replaceWithNode)) {
+      return super.replace(replaceWithNode);
+    }
+    this.setIndent(0);
+    const list = this.getParentOrThrow();
+    if (!$isListNode(list)) {
+      return replaceWithNode;
+    }
+    if (list.__first === this.getKey()) {
+      list.insertBefore(replaceWithNode);
+    } else if (list.__last === this.getKey()) {
+      list.insertAfter(replaceWithNode);
+    } else {
+      // Split the list
+      const newList = $createListNode(list.getListType());
+      let nextSibling = this.getNextSibling();
+      while (nextSibling) {
+        const nodeToAppend = nextSibling;
+        nextSibling = nextSibling.getNextSibling();
+        newList.append(nodeToAppend);
+      }
+      list.insertAfter(replaceWithNode);
+      replaceWithNode.insertAfter(newList);
+    }
+    if (includeChildren) {
+      invariant(
+        $isElementNode(replaceWithNode),
+        'includeChildren should only be true for ElementNodes',
+      );
+      this.getChildren().forEach((child: LexicalNode) => {
+        replaceWithNode.append(child);
+      });
+    }
+    this.remove();
+    if (list.getChildrenSize() === 0) {
+      list.remove();
+    }
+    return replaceWithNode;
+  }
+
+  insertAfter(node: LexicalNode, restoreSelection = true): LexicalNode {
+    const listNode = this.getParentOrThrow();
+
+    if (!$isListNode(listNode)) {
+      invariant(
+        false,
+        'insertAfter: list node is not parent of list item node',
+      );
+    }
+
+    if ($isListItemNode(node)) {
+      return super.insertAfter(node, restoreSelection);
+    }
+
+    const siblings = this.getNextSiblings();
+
+    // Split the lists and insert the node in between them
+    listNode.insertAfter(node, restoreSelection);
+
+    if (siblings.length !== 0) {
+      const newListNode = $createListNode(listNode.getListType());
+
+      siblings.forEach((sibling) => newListNode.append(sibling));
+
+      node.insertAfter(newListNode, restoreSelection);
+    }
+
+    return node;
+  }
+
+  remove(preserveEmptyParent?: boolean): void {
+    const prevSibling = this.getPreviousSibling();
+    const nextSibling = this.getNextSibling();
+    super.remove(preserveEmptyParent);
+
+    if (
+      prevSibling &&
+      nextSibling &&
+      isNestedListNode(prevSibling) &&
+      isNestedListNode(nextSibling)
+    ) {
+      mergeLists(prevSibling.getFirstChild(), nextSibling.getFirstChild());
+      nextSibling.remove();
+    }
+  }
+
+  insertNewAfter(
+    _: RangeSelection,
+    restoreSelection = true,
+  ): ListItemNode | ParagraphNode {
+    const newElement = $createListItemNode(
+      this.__checked == null ? undefined : false,
+    );
+    this.insertAfter(newElement, restoreSelection);
+
+    return newElement;
+  }
+
+  collapseAtStart(selection: RangeSelection): true {
+    const paragraph = $createParagraphNode();
+    const children = this.getChildren();
+    children.forEach((child) => paragraph.append(child));
+    const listNode = this.getParentOrThrow();
+    const listNodeParent = listNode.getParentOrThrow();
+    const isIndented = $isListItemNode(listNodeParent);
+
+    if (listNode.getChildrenSize() === 1) {
+      if (isIndented) {
+        // if the list node is nested, we just want to remove it,
+        // effectively unindenting it.
+        listNode.remove();
+        listNodeParent.select();
+      } else {
+        listNode.insertBefore(paragraph);
+        listNode.remove();
+        // If we have selection on the list item, we'll need to move it
+        // to the paragraph
+        const anchor = selection.anchor;
+        const focus = selection.focus;
+        const key = paragraph.getKey();
+
+        if (anchor.type === 'element' && anchor.getNode().is(this)) {
+          anchor.set(key, anchor.offset, 'element');
+        }
+
+        if (focus.type === 'element' && focus.getNode().is(this)) {
+          focus.set(key, focus.offset, 'element');
+        }
+      }
+    } else {
+      listNode.insertBefore(paragraph);
+      this.remove();
+    }
+
+    return true;
+  }
+
+  getValue(): number {
+    const self = this.getLatest();
+
+    return self.__value;
+  }
+
+  setValue(value: number): void {
+    const self = this.getWritable();
+    self.__value = value;
+  }
+
+  getChecked(): boolean | undefined {
+    const self = this.getLatest();
+
+    let listType: ListType | undefined;
+
+    const parent = this.getParent();
+    if ($isListNode(parent)) {
+      listType = parent.getListType();
+    }
+
+    return listType === 'check' ? Boolean(self.__checked) : undefined;
+  }
+
+  setChecked(checked?: boolean): void {
+    const self = this.getWritable();
+    self.__checked = checked;
+  }
+
+  toggleChecked(): void {
+    this.setChecked(!this.__checked);
+  }
+
+  getIndent(): number {
+    // If we don't have a parent, we are likely serializing
+    const parent = this.getParent();
+    if (parent === null) {
+      return this.getLatest().__indent;
+    }
+    // ListItemNode should always have a ListNode for a parent.
+    let listNodeParent = parent.getParentOrThrow();
+    let indentLevel = 0;
+    while ($isListItemNode(listNodeParent)) {
+      listNodeParent = listNodeParent.getParentOrThrow().getParentOrThrow();
+      indentLevel++;
+    }
+
+    return indentLevel;
+  }
+
+  setIndent(indent: number): this {
+    invariant(typeof indent === 'number', 'Invalid indent value.');
+    indent = Math.floor(indent);
+    invariant(indent >= 0, 'Indent value must be non-negative.');
+    let currentIndent = this.getIndent();
+    while (currentIndent !== indent) {
+      if (currentIndent < indent) {
+        $handleIndent(this);
+        currentIndent++;
+      } else {
+        $handleOutdent(this);
+        currentIndent--;
+      }
+    }
+
+    return this;
+  }
+
+  /** @deprecated @internal */
+  canInsertAfter(node: LexicalNode): boolean {
+    return $isListItemNode(node);
+  }
+
+  /** @deprecated @internal */
+  canReplaceWith(replacement: LexicalNode): boolean {
+    return $isListItemNode(replacement);
+  }
+
+  canMergeWith(node: LexicalNode): boolean {
+    return $isParagraphNode(node) || $isListItemNode(node);
+  }
+
+  extractWithChild(child: LexicalNode, selection: BaseSelection): boolean {
+    if (!$isRangeSelection(selection)) {
+      return false;
+    }
+
+    const anchorNode = selection.anchor.getNode();
+    const focusNode = selection.focus.getNode();
+
+    return (
+      this.isParentOf(anchorNode) &&
+      this.isParentOf(focusNode) &&
+      this.getTextContent().length === selection.getTextContent().length
+    );
+  }
+
+  isParentRequired(): true {
+    return true;
+  }
+
+  createParentElementNode(): ElementNode {
+    return $createListNode('bullet');
+  }
+
+  canMergeWhenEmpty(): true {
+    return true;
+  }
+}
+
+function $setListItemThemeClassNames(
+  dom: HTMLElement,
+  editorThemeClasses: EditorThemeClasses,
+  node: ListItemNode,
+): void {
+  const classesToAdd = [];
+  const classesToRemove = [];
+  const listTheme = editorThemeClasses.list;
+  const listItemClassName = listTheme ? listTheme.listitem : undefined;
+  let nestedListItemClassName;
+
+  if (listTheme && listTheme.nested) {
+    nestedListItemClassName = listTheme.nested.listitem;
+  }
+
+  if (listItemClassName !== undefined) {
+    classesToAdd.push(...normalizeClassNames(listItemClassName));
+  }
+
+  if (listTheme) {
+    const parentNode = node.getParent();
+    const isCheckList =
+      $isListNode(parentNode) && parentNode.getListType() === 'check';
+    const checked = node.getChecked();
+
+    if (!isCheckList || checked) {
+      classesToRemove.push(listTheme.listitemUnchecked);
+    }
+
+    if (!isCheckList || !checked) {
+      classesToRemove.push(listTheme.listitemChecked);
+    }
+
+    if (isCheckList) {
+      classesToAdd.push(
+        checked ? listTheme.listitemChecked : listTheme.listitemUnchecked,
+      );
+    }
+  }
+
+  if (nestedListItemClassName !== undefined) {
+    const nestedListItemClasses = normalizeClassNames(nestedListItemClassName);
+
+    if (node.getChildren().some((child) => $isListNode(child))) {
+      classesToAdd.push(...nestedListItemClasses);
+    } else {
+      classesToRemove.push(...nestedListItemClasses);
+    }
+  }
+
+  if (classesToRemove.length > 0) {
+    removeClassNamesFromElement(dom, ...classesToRemove);
+  }
+
+  if (classesToAdd.length > 0) {
+    addClassNamesToElement(dom, ...classesToAdd);
+  }
+}
+
+function updateListItemChecked(
+  dom: HTMLElement,
+  listItemNode: ListItemNode,
+  prevListItemNode: ListItemNode | null,
+  listNode: ListNode,
+): void {
+  // Only add attributes for leaf list items
+  if ($isListNode(listItemNode.getFirstChild())) {
+    dom.removeAttribute('role');
+    dom.removeAttribute('tabIndex');
+    dom.removeAttribute('aria-checked');
+  } else {
+    dom.setAttribute('role', 'checkbox');
+    dom.setAttribute('tabIndex', '-1');
+
+    if (
+      !prevListItemNode ||
+      listItemNode.__checked !== prevListItemNode.__checked
+    ) {
+      dom.setAttribute(
+        'aria-checked',
+        listItemNode.getChecked() ? 'true' : 'false',
+      );
+    }
+  }
+}
+
+function $convertListItemElement(domNode: HTMLElement): DOMConversionOutput {
+  const isGitHubCheckList = domNode.classList.contains('task-list-item');
+  if (isGitHubCheckList) {
+    for (const child of domNode.children) {
+      if (child.tagName === 'INPUT') {
+        return $convertCheckboxInput(child);
+      }
+    }
+  }
+
+  const ariaCheckedAttr = domNode.getAttribute('aria-checked');
+  const checked =
+    ariaCheckedAttr === 'true'
+      ? true
+      : ariaCheckedAttr === 'false'
+      ? false
+      : undefined;
+  return {node: $createListItemNode(checked)};
+}
+
+function $convertCheckboxInput(domNode: Element): DOMConversionOutput {
+  const isCheckboxInput = domNode.getAttribute('type') === 'checkbox';
+  if (!isCheckboxInput) {
+    return {node: null};
+  }
+  const checked = domNode.hasAttribute('checked');
+  return {node: $createListItemNode(checked)};
+}
+
+/**
+ * Creates a new List Item node, passing true/false will convert it to a checkbox input.
+ * @param checked - Is the List Item a checkbox and, if so, is it checked? undefined/null: not a checkbox, true/false is a checkbox and checked/unchecked, respectively.
+ * @returns The new List Item.
+ */
+export function $createListItemNode(checked?: boolean): ListItemNode {
+  return $applyNodeReplacement(new ListItemNode(undefined, checked));
+}
+
+/**
+ * Checks to see if the node is a ListItemNode.
+ * @param node - The node to be checked.
+ * @returns true if the node is a ListItemNode, false otherwise.
+ */
+export function $isListItemNode(
+  node: LexicalNode | null | undefined,
+): node is ListItemNode {
+  return node instanceof ListItemNode;
+}
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
new file mode 100644
index 00000000000..e22fbf7717f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -0,0 +1,367 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  addClassNamesToElement,
+  isHTMLElement,
+  removeClassNamesFromElement,
+} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $createTextNode,
+  $isElementNode,
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  EditorConfig,
+  EditorThemeClasses,
+  ElementNode,
+  LexicalEditor,
+  LexicalNode,
+  NodeKey,
+  SerializedElementNode,
+  Spread,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import normalizeClassNames from 'lexical/shared/normalizeClassNames';
+
+import {$createListItemNode, $isListItemNode, ListItemNode} from '.';
+import {
+  mergeNextSiblingListIfSameType,
+  updateChildrenListItemValue,
+} from './formatList';
+import {$getListDepth, $wrapInListItem} from './utils';
+
+export type SerializedListNode = Spread<
+  {
+    listType: ListType;
+    start: number;
+    tag: ListNodeTagType;
+  },
+  SerializedElementNode
+>;
+
+export type ListType = 'number' | 'bullet' | 'check';
+
+export type ListNodeTagType = 'ul' | 'ol';
+
+/** @noInheritDoc */
+export class ListNode extends ElementNode {
+  /** @internal */
+  __tag: ListNodeTagType;
+  /** @internal */
+  __start: number;
+  /** @internal */
+  __listType: ListType;
+
+  static getType(): string {
+    return 'list';
+  }
+
+  static clone(node: ListNode): ListNode {
+    const listType = node.__listType || TAG_TO_LIST_TYPE[node.__tag];
+
+    return new ListNode(listType, node.__start, node.__key);
+  }
+
+  constructor(listType: ListType, start: number, key?: NodeKey) {
+    super(key);
+    const _listType = TAG_TO_LIST_TYPE[listType] || listType;
+    this.__listType = _listType;
+    this.__tag = _listType === 'number' ? 'ol' : 'ul';
+    this.__start = start;
+  }
+
+  getTag(): ListNodeTagType {
+    return this.__tag;
+  }
+
+  setListType(type: ListType): void {
+    const writable = this.getWritable();
+    writable.__listType = type;
+    writable.__tag = type === 'number' ? 'ol' : 'ul';
+  }
+
+  getListType(): ListType {
+    return this.__listType;
+  }
+
+  getStart(): number {
+    return this.__start;
+  }
+
+  // View
+
+  createDOM(config: EditorConfig, _editor?: LexicalEditor): HTMLElement {
+    const tag = this.__tag;
+    const dom = document.createElement(tag);
+
+    if (this.__start !== 1) {
+      dom.setAttribute('start', String(this.__start));
+    }
+    // @ts-expect-error Internal field.
+    dom.__lexicalListType = this.__listType;
+    $setListThemeClassNames(dom, config.theme, this);
+
+    return dom;
+  }
+
+  updateDOM(
+    prevNode: ListNode,
+    dom: HTMLElement,
+    config: EditorConfig,
+  ): boolean {
+    if (prevNode.__tag !== this.__tag) {
+      return true;
+    }
+
+    $setListThemeClassNames(dom, config.theme, this);
+
+    return false;
+  }
+
+  static transform(): (node: LexicalNode) => void {
+    return (node: LexicalNode) => {
+      invariant($isListNode(node), 'node is not a ListNode');
+      mergeNextSiblingListIfSameType(node);
+      updateChildrenListItemValue(node);
+    };
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      ol: () => ({
+        conversion: $convertListNode,
+        priority: 0,
+      }),
+      ul: () => ({
+        conversion: $convertListNode,
+        priority: 0,
+      }),
+    };
+  }
+
+  static importJSON(serializedNode: SerializedListNode): ListNode {
+    const node = $createListNode(serializedNode.listType, serializedNode.start);
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const {element} = super.exportDOM(editor);
+    if (element && isHTMLElement(element)) {
+      if (this.__start !== 1) {
+        element.setAttribute('start', String(this.__start));
+      }
+      if (this.__listType === 'check') {
+        element.setAttribute('__lexicalListType', 'check');
+      }
+    }
+    return {
+      element,
+    };
+  }
+
+  exportJSON(): SerializedListNode {
+    return {
+      ...super.exportJSON(),
+      listType: this.getListType(),
+      start: this.getStart(),
+      tag: this.getTag(),
+      type: 'list',
+      version: 1,
+    };
+  }
+
+  canBeEmpty(): false {
+    return false;
+  }
+
+  canIndent(): false {
+    return false;
+  }
+
+  append(...nodesToAppend: LexicalNode[]): this {
+    for (let i = 0; i < nodesToAppend.length; i++) {
+      const currentNode = nodesToAppend[i];
+
+      if ($isListItemNode(currentNode)) {
+        super.append(currentNode);
+      } else {
+        const listItemNode = $createListItemNode();
+
+        if ($isListNode(currentNode)) {
+          listItemNode.append(currentNode);
+        } else if ($isElementNode(currentNode)) {
+          const textNode = $createTextNode(currentNode.getTextContent());
+          listItemNode.append(textNode);
+        } else {
+          listItemNode.append(currentNode);
+        }
+        super.append(listItemNode);
+      }
+    }
+    return this;
+  }
+
+  extractWithChild(child: LexicalNode): boolean {
+    return $isListItemNode(child);
+  }
+}
+
+function $setListThemeClassNames(
+  dom: HTMLElement,
+  editorThemeClasses: EditorThemeClasses,
+  node: ListNode,
+): void {
+  const classesToAdd = [];
+  const classesToRemove = [];
+  const listTheme = editorThemeClasses.list;
+
+  if (listTheme !== undefined) {
+    const listLevelsClassNames = listTheme[`${node.__tag}Depth`] || [];
+    const listDepth = $getListDepth(node) - 1;
+    const normalizedListDepth = listDepth % listLevelsClassNames.length;
+    const listLevelClassName = listLevelsClassNames[normalizedListDepth];
+    const listClassName = listTheme[node.__tag];
+    let nestedListClassName;
+    const nestedListTheme = listTheme.nested;
+    const checklistClassName = listTheme.checklist;
+
+    if (nestedListTheme !== undefined && nestedListTheme.list) {
+      nestedListClassName = nestedListTheme.list;
+    }
+
+    if (listClassName !== undefined) {
+      classesToAdd.push(listClassName);
+    }
+
+    if (checklistClassName !== undefined && node.__listType === 'check') {
+      classesToAdd.push(checklistClassName);
+    }
+
+    if (listLevelClassName !== undefined) {
+      classesToAdd.push(...normalizeClassNames(listLevelClassName));
+      for (let i = 0; i < listLevelsClassNames.length; i++) {
+        if (i !== normalizedListDepth) {
+          classesToRemove.push(node.__tag + i);
+        }
+      }
+    }
+
+    if (nestedListClassName !== undefined) {
+      const nestedListItemClasses = normalizeClassNames(nestedListClassName);
+
+      if (listDepth > 1) {
+        classesToAdd.push(...nestedListItemClasses);
+      } else {
+        classesToRemove.push(...nestedListItemClasses);
+      }
+    }
+  }
+
+  if (classesToRemove.length > 0) {
+    removeClassNamesFromElement(dom, ...classesToRemove);
+  }
+
+  if (classesToAdd.length > 0) {
+    addClassNamesToElement(dom, ...classesToAdd);
+  }
+}
+
+/*
+ * This function normalizes the children of a ListNode after the conversion from HTML,
+ * ensuring that they are all ListItemNodes and contain either a single nested ListNode
+ * or some other inline content.
+ */
+function $normalizeChildren(nodes: Array<LexicalNode>): Array<ListItemNode> {
+  const normalizedListItems: Array<ListItemNode> = [];
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if ($isListItemNode(node)) {
+      normalizedListItems.push(node);
+      const children = node.getChildren();
+      if (children.length > 1) {
+        children.forEach((child) => {
+          if ($isListNode(child)) {
+            normalizedListItems.push($wrapInListItem(child));
+          }
+        });
+      }
+    } else {
+      normalizedListItems.push($wrapInListItem(node));
+    }
+  }
+  return normalizedListItems;
+}
+
+function isDomChecklist(domNode: HTMLElement) {
+  if (
+    domNode.getAttribute('__lexicallisttype') === 'check' ||
+    // is github checklist
+    domNode.classList.contains('contains-task-list')
+  ) {
+    return true;
+  }
+  // if children are checklist items, the node is a checklist ul. Applicable for googledoc checklist pasting.
+  for (const child of domNode.childNodes) {
+    if (isHTMLElement(child) && child.hasAttribute('aria-checked')) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function $convertListNode(domNode: HTMLElement): DOMConversionOutput {
+  const nodeName = domNode.nodeName.toLowerCase();
+  let node = null;
+  if (nodeName === 'ol') {
+    // @ts-ignore
+    const start = domNode.start;
+    node = $createListNode('number', start);
+  } else if (nodeName === 'ul') {
+    if (isDomChecklist(domNode)) {
+      node = $createListNode('check');
+    } else {
+      node = $createListNode('bullet');
+    }
+  }
+
+  return {
+    after: $normalizeChildren,
+    node,
+  };
+}
+
+const TAG_TO_LIST_TYPE: Record<string, ListType> = {
+  ol: 'number',
+  ul: 'bullet',
+};
+
+/**
+ * Creates a ListNode of listType.
+ * @param listType - The type of list to be created. Can be 'number', 'bullet', or 'check'.
+ * @param start - Where an ordered list starts its count, start = 1 if left undefined.
+ * @returns The new ListNode
+ */
+export function $createListNode(listType: ListType, start = 1): ListNode {
+  return $applyNodeReplacement(new ListNode(listType, start));
+}
+
+/**
+ * Checks to see if the node is a ListNode.
+ * @param node - The node to be checked.
+ * @returns true if the node is a ListNode, false otherwise.
+ */
+export function $isListNode(
+  node: LexicalNode | null | undefined,
+): node is ListNode {
+  return node instanceof ListNode;
+}
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
new file mode 100644
index 00000000000..d36b8f1cbd5
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -0,0 +1,1365 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createRangeSelection,
+  $getRoot,
+  TextNode,
+} from 'lexical';
+import {
+  expectHtmlToBeEqual,
+  html,
+  initializeUnitTest,
+} from 'lexical/src/__tests__/utils';
+
+import {
+  $createListItemNode,
+  $isListItemNode,
+  ListItemNode,
+  ListNode,
+} from '../..';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    list: {
+      listitem: 'my-listItem-item-class',
+      nested: {
+        listitem: 'my-nested-list-listItem-class',
+      },
+    },
+  },
+});
+
+describe('LexicalListItemNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('ListItemNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listItemNode = new ListItemNode();
+
+        expect(listItemNode.getType()).toBe('listitem');
+
+        expect(listItemNode.getTextContent()).toBe('');
+      });
+
+      expect(() => new ListItemNode()).toThrow();
+    });
+
+    test('ListItemNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listItemNode = new ListItemNode();
+
+        expectHtmlToBeEqual(
+          listItemNode.createDOM(editorConfig).outerHTML,
+          html`
+            <li class="my-listItem-item-class" value="1"></li>
+          `,
+        );
+
+        expectHtmlToBeEqual(
+          listItemNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+          html`
+            <li value="1"></li>
+          `,
+        );
+      });
+    });
+
+    describe('ListItemNode.updateDOM()', () => {
+      test('base', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const listItemNode = new ListItemNode();
+
+          const domElement = listItemNode.createDOM(editorConfig);
+
+          expectHtmlToBeEqual(
+            domElement.outerHTML,
+            html`
+              <li class="my-listItem-item-class" value="1"></li>
+            `,
+          );
+          const newListItemNode = new ListItemNode();
+
+          const result = newListItemNode.updateDOM(
+            listItemNode,
+            domElement,
+            editorConfig,
+          );
+
+          expect(result).toBe(false);
+
+          expectHtmlToBeEqual(
+            domElement.outerHTML,
+            html`
+              <li class="my-listItem-item-class" value="1"></li>
+            `,
+          );
+        });
+      });
+
+      test('nested list', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const parentListNode = new ListNode('bullet', 1);
+          const parentlistItemNode = new ListItemNode();
+
+          parentListNode.append(parentlistItemNode);
+          const domElement = parentlistItemNode.createDOM(editorConfig);
+
+          expectHtmlToBeEqual(
+            domElement.outerHTML,
+            html`
+              <li class="my-listItem-item-class" value="1"></li>
+            `,
+          );
+          const nestedListNode = new ListNode('bullet', 1);
+          nestedListNode.append(new ListItemNode());
+          parentlistItemNode.append(nestedListNode);
+          const result = parentlistItemNode.updateDOM(
+            parentlistItemNode,
+            domElement,
+            editorConfig,
+          );
+
+          expect(result).toBe(false);
+
+          expectHtmlToBeEqual(
+            domElement.outerHTML,
+            html`
+              <li
+                class="my-listItem-item-class my-nested-list-listItem-class"
+                value="1"></li>
+            `,
+          );
+        });
+      });
+    });
+
+    describe('ListItemNode.replace()', () => {
+      let listNode: ListNode;
+      let listItemNode1: ListItemNode;
+      let listItemNode2: ListItemNode;
+      let listItemNode3: ListItemNode;
+
+      beforeEach(async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          listNode = new ListNode('bullet', 1);
+          listItemNode1 = new ListItemNode();
+
+          listItemNode1.append(new TextNode('one'));
+          listItemNode2 = new ListItemNode();
+
+          listItemNode2.append(new TextNode('two'));
+          listItemNode3 = new ListItemNode();
+
+          listItemNode3.append(new TextNode('three'));
+          root.append(listNode);
+          listNode.append(listItemNode1, listItemNode2, listItemNode3);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('another list item node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const newListItemNode = new ListItemNode();
+
+          newListItemNode.append(new TextNode('bar'));
+          listItemNode1.replace(newListItemNode);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">bar</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('first list item with a non list item node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          return;
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => {
+          const paragraphNode = $createParagraphNode();
+          listItemNode1.replace(paragraphNode);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <p><br /></p>
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('last list item with a non list item node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const paragraphNode = $createParagraphNode();
+          listItemNode3.replace(paragraphNode);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+              </ul>
+              <p><br /></p>
+            </div>
+          `,
+        );
+      });
+
+      test('middle list item with a non list item node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const paragraphNode = $createParagraphNode();
+          listItemNode2.replace(paragraphNode);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+              </ul>
+              <p><br /></p>
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('the only list item with a non list item node', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode2.remove();
+          listItemNode3.remove();
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => {
+          const paragraphNode = $createParagraphNode();
+          listItemNode1.replace(paragraphNode);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <p><br /></p>
+            </div>
+          `,
+        );
+      });
+    });
+
+    describe('ListItemNode.remove()', () => {
+      // - A
+      // - x
+      // - B
+      test('siblings are not nested', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          A_listItem.append(new TextNode('A'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          B_listItem.append(new TextNode('B'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">A</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">B</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">A</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">B</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      //   - A
+      // - x
+      // - B
+      test('the previous sibling is nested', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          const A_nestedList = new ListNode('bullet', 1);
+          const A_nestedListItem = new ListItemNode();
+          A_listItem.append(A_nestedList);
+          A_nestedList.append(A_nestedListItem);
+          A_nestedListItem.append(new TextNode('A'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          B_listItem.append(new TextNode('B'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">B</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">B</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      // - A
+      // - x
+      //   - B
+      test('the next sibling is nested', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          A_listItem.append(new TextNode('A'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          const B_nestedList = new ListNode('bullet', 1);
+          const B_nestedListItem = new ListItemNode();
+          B_listItem.append(B_nestedList);
+          B_nestedList.append(B_nestedListItem);
+          B_nestedListItem.append(new TextNode('B'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">A</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li value="3">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">A</span>
+                </li>
+                <li value="2">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      //   - A
+      // - x
+      //   - B
+      test('both siblings are nested', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          const A_nestedList = new ListNode('bullet', 1);
+          const A_nestedListItem = new ListItemNode();
+          A_listItem.append(A_nestedList);
+          A_nestedList.append(A_nestedListItem);
+          A_nestedListItem.append(new TextNode('A'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          const B_nestedList = new ListNode('bullet', 1);
+          const B_nestedListItem = new ListItemNode();
+          B_listItem.append(B_nestedList);
+          B_nestedList.append(B_nestedListItem);
+          B_nestedListItem.append(new TextNode('B'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li value="2">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                    <li dir="ltr" value="2">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      //  - A1
+      //     - A2
+      // - x
+      //   - B
+      test('the previous sibling is nested deeper than the next sibling', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          const A_nestedList = new ListNode('bullet', 1);
+          const A_nestedListItem1 = new ListItemNode();
+          const A_nestedListItem2 = new ListItemNode();
+          const A_deeplyNestedList = new ListNode('bullet', 1);
+          const A_deeplyNestedListItem = new ListItemNode();
+          A_listItem.append(A_nestedList);
+          A_nestedList.append(A_nestedListItem1);
+          A_nestedList.append(A_nestedListItem2);
+          A_nestedListItem1.append(new TextNode('A1'));
+          A_nestedListItem2.append(A_deeplyNestedList);
+          A_deeplyNestedList.append(A_deeplyNestedListItem);
+          A_deeplyNestedListItem.append(new TextNode('A2'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          const B_nestedList = new ListNode('bullet', 1);
+          const B_nestedlistItem = new ListItemNode();
+          B_listItem.append(B_nestedList);
+          B_nestedList.append(B_nestedlistItem);
+          B_nestedlistItem.append(new TextNode('B'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A1</span>
+                    </li>
+                    <li value="2">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">A2</span>
+                        </li>
+                      </ul>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li value="2">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A1</span>
+                    </li>
+                    <li value="2">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">A2</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li dir="ltr" value="2">
+                      <span data-lexical-text="true">B</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      //   - A
+      // - x
+      //     - B1
+      //   - B2
+      test('the next sibling is nested deeper than the previous sibling', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          const A_nestedList = new ListNode('bullet', 1);
+          const A_nestedListItem = new ListItemNode();
+          A_listItem.append(A_nestedList);
+          A_nestedList.append(A_nestedListItem);
+          A_nestedListItem.append(new TextNode('A'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          const B_nestedList = new ListNode('bullet', 1);
+          const B_nestedListItem1 = new ListItemNode();
+          const B_nestedListItem2 = new ListItemNode();
+          const B_deeplyNestedList = new ListNode('bullet', 1);
+          const B_deeplyNestedListItem = new ListItemNode();
+          B_listItem.append(B_nestedList);
+          B_nestedList.append(B_nestedListItem1);
+          B_nestedList.append(B_nestedListItem2);
+          B_nestedListItem1.append(B_deeplyNestedList);
+          B_nestedListItem2.append(new TextNode('B2'));
+          B_deeplyNestedList.append(B_deeplyNestedListItem);
+          B_deeplyNestedListItem.append(new TextNode('B1'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li value="2">
+                  <ul>
+                    <li value="1">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">B1</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B2</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A</span>
+                    </li>
+                    <li value="2">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">B1</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li dir="ltr" value="2">
+                      <span data-lexical-text="true">B2</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      //   - A1
+      //     - A2
+      // - x
+      //     - B1
+      //   - B2
+      test('both siblings are deeply nested', async () => {
+        const {editor} = testEnv;
+        let x: ListItemNode;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const parent = new ListNode('bullet', 1);
+
+          const A_listItem = new ListItemNode();
+          const A_nestedList = new ListNode('bullet', 1);
+          const A_nestedListItem1 = new ListItemNode();
+          const A_nestedListItem2 = new ListItemNode();
+          const A_deeplyNestedList = new ListNode('bullet', 1);
+          const A_deeplyNestedListItem = new ListItemNode();
+          A_listItem.append(A_nestedList);
+          A_nestedList.append(A_nestedListItem1);
+          A_nestedList.append(A_nestedListItem2);
+          A_nestedListItem1.append(new TextNode('A1'));
+          A_nestedListItem2.append(A_deeplyNestedList);
+          A_deeplyNestedList.append(A_deeplyNestedListItem);
+          A_deeplyNestedListItem.append(new TextNode('A2'));
+
+          x = new ListItemNode();
+          x.append(new TextNode('x'));
+
+          const B_listItem = new ListItemNode();
+          const B_nestedList = new ListNode('bullet', 1);
+          const B_nestedListItem1 = new ListItemNode();
+          const B_nestedListItem2 = new ListItemNode();
+          const B_deeplyNestedList = new ListNode('bullet', 1);
+          const B_deeplyNestedListItem = new ListItemNode();
+          B_listItem.append(B_nestedList);
+          B_nestedList.append(B_nestedListItem1);
+          B_nestedList.append(B_nestedListItem2);
+          B_nestedListItem1.append(B_deeplyNestedList);
+          B_nestedListItem2.append(new TextNode('B2'));
+          B_deeplyNestedList.append(B_deeplyNestedListItem);
+          B_deeplyNestedListItem.append(new TextNode('B1'));
+
+          parent.append(A_listItem, x, B_listItem);
+          root.append(parent);
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A1</span>
+                    </li>
+                    <li value="2">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">A2</span>
+                        </li>
+                      </ul>
+                    </li>
+                  </ul>
+                </li>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">x</span>
+                </li>
+                <li value="2">
+                  <ul>
+                    <li value="1">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">B1</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">B2</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => x.remove());
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li value="1">
+                  <ul>
+                    <li dir="ltr" value="1">
+                      <span data-lexical-text="true">A1</span>
+                    </li>
+                    <li value="2">
+                      <ul>
+                        <li dir="ltr" value="1">
+                          <span data-lexical-text="true">A2</span>
+                        </li>
+                        <li dir="ltr" value="2">
+                          <span data-lexical-text="true">B1</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li dir="ltr" value="2">
+                      <span data-lexical-text="true">B2</span>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+    });
+
+    describe('ListItemNode.insertNewAfter(): non-empty list items', () => {
+      let listNode: ListNode;
+      let listItemNode1: ListItemNode;
+      let listItemNode2: ListItemNode;
+      let listItemNode3: ListItemNode;
+
+      beforeEach(async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          listNode = new ListNode('bullet', 1);
+          listItemNode1 = new ListItemNode();
+
+          listItemNode2 = new ListItemNode();
+
+          listItemNode3 = new ListItemNode();
+
+          root.append(listNode);
+          listNode.append(listItemNode1, listItemNode2, listItemNode3);
+          listItemNode1.append(new TextNode('one'));
+          listItemNode2.append(new TextNode('two'));
+          listItemNode3.append(new TextNode('three'));
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('first list item', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode1.insertNewAfter($createRangeSelection());
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li value="2"><br /></li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="4">
+                  <span data-lexical-text="true">three</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('last list item', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode3.insertNewAfter($createRangeSelection());
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+                <li value="4"><br /></li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('middle list item', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode3.insertNewAfter($createRangeSelection());
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li dir="ltr" value="2">
+                  <span data-lexical-text="true">two</span>
+                </li>
+                <li dir="ltr" value="3">
+                  <span data-lexical-text="true">three</span>
+                </li>
+                <li value="4"><br /></li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+
+      test('the only list item', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode2.remove();
+          listItemNode3.remove();
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+              </ul>
+            </div>
+          `,
+        );
+
+        await editor.update(() => {
+          listItemNode1.insertNewAfter($createRangeSelection());
+        });
+
+        expectHtmlToBeEqual(
+          testEnv.outerHTML,
+          html`
+            <div
+              contenteditable="true"
+              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
+              data-lexical-editor="true">
+              <ul>
+                <li dir="ltr" value="1">
+                  <span data-lexical-text="true">one</span>
+                </li>
+                <li value="2"><br /></li>
+              </ul>
+            </div>
+          `,
+        );
+      });
+    });
+
+    test('$createListItemNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listItemNode = new ListItemNode();
+
+        const createdListItemNode = $createListItemNode();
+
+        expect(listItemNode.__type).toEqual(createdListItemNode.__type);
+        expect(listItemNode.__parent).toEqual(createdListItemNode.__parent);
+        expect(listItemNode.__key).not.toEqual(createdListItemNode.__key);
+      });
+    });
+
+    test('$isListItemNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listItemNode = new ListItemNode();
+
+        expect($isListItemNode(listItemNode)).toBe(true);
+      });
+    });
+
+    describe('ListItemNode.setIndent()', () => {
+      let listNode: ListNode;
+      let listItemNode1: ListItemNode;
+      let listItemNode2: ListItemNode;
+
+      beforeEach(async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          listNode = new ListNode('bullet', 1);
+          listItemNode1 = new ListItemNode();
+
+          listItemNode2 = new ListItemNode();
+
+          root.append(listNode);
+          listNode.append(listItemNode1, listItemNode2);
+          listItemNode1.append(new TextNode('one'));
+          listItemNode2.append(new TextNode('two'));
+        });
+      });
+      it('indents and outdents list item', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode1.setIndent(3);
+        });
+
+        await editor.update(() => {
+          expect(listItemNode1.getIndent()).toBe(3);
+        });
+
+        expectHtmlToBeEqual(
+          editor.getRootElement()!.innerHTML,
+          html`
+            <ul>
+              <li value="1">
+                <ul>
+                  <li value="1">
+                    <ul>
+                      <li value="1">
+                        <ul>
+                          <li dir="ltr" value="1">
+                            <span data-lexical-text="true">one</span>
+                          </li>
+                        </ul>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+              <li dir="ltr" value="1">
+                <span data-lexical-text="true">two</span>
+              </li>
+            </ul>
+          `,
+        );
+
+        await editor.update(() => {
+          listItemNode1.setIndent(0);
+        });
+
+        await editor.update(() => {
+          expect(listItemNode1.getIndent()).toBe(0);
+        });
+
+        expectHtmlToBeEqual(
+          editor.getRootElement()!.innerHTML,
+          html`
+            <ul>
+              <li dir="ltr" value="1">
+                <span data-lexical-text="true">one</span>
+              </li>
+              <li dir="ltr" value="2">
+                <span data-lexical-text="true">two</span>
+              </li>
+            </ul>
+          `,
+        );
+      });
+
+      it('handles fractional indent values', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          listItemNode1.setIndent(0.5);
+        });
+
+        await editor.update(() => {
+          expect(listItemNode1.getIndent()).toBe(0);
+        });
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
new file mode 100644
index 00000000000..6abcbbd4cb7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
@@ -0,0 +1,317 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {ParagraphNode, TextNode} from 'lexical';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+import {
+  $createListItemNode,
+  $createListNode,
+  $isListItemNode,
+  $isListNode,
+  ListItemNode,
+  ListNode,
+} from '../..';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    list: {
+      ol: 'my-ol-list-class',
+      olDepth: [
+        'my-ol-list-class-1',
+        'my-ol-list-class-2',
+        'my-ol-list-class-3',
+        'my-ol-list-class-4',
+        'my-ol-list-class-5',
+        'my-ol-list-class-6',
+        'my-ol-list-class-7',
+      ],
+      ul: 'my-ul-list-class',
+      ulDepth: [
+        'my-ul-list-class-1',
+        'my-ul-list-class-2',
+        'my-ul-list-class-3',
+        'my-ul-list-class-4',
+        'my-ul-list-class-5',
+        'my-ul-list-class-6',
+        'my-ul-list-class-7',
+      ],
+    },
+  },
+});
+
+describe('LexicalListNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('ListNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = $createListNode('bullet', 1);
+        expect(listNode.getType()).toBe('list');
+        expect(listNode.getTag()).toBe('ul');
+        expect(listNode.getTextContent()).toBe('');
+      });
+
+      // @ts-expect-error
+      expect(() => $createListNode()).toThrow();
+    });
+
+    test('ListNode.getTag()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const ulListNode = $createListNode('bullet', 1);
+        expect(ulListNode.getTag()).toBe('ul');
+        const olListNode = $createListNode('number', 1);
+        expect(olListNode.getTag()).toBe('ol');
+        const checkListNode = $createListNode('check', 1);
+        expect(checkListNode.getTag()).toBe('ul');
+      });
+    });
+
+    test('ListNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = $createListNode('bullet', 1);
+        expect(listNode.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
+        );
+        expect(
+          listNode.createDOM({
+            namespace: '',
+            theme: {
+              list: {},
+            },
+          }).outerHTML,
+        ).toBe('<ul></ul>');
+        expect(
+          listNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<ul></ul>');
+      });
+    });
+
+    test('ListNode.createDOM() correctly applies classes to a nested ListNode', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode1 = $createListNode('bullet');
+        const listNode2 = $createListNode('bullet');
+        const listNode3 = $createListNode('bullet');
+        const listNode4 = $createListNode('bullet');
+        const listNode5 = $createListNode('bullet');
+        const listNode6 = $createListNode('bullet');
+        const listNode7 = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+        const listItem4 = $createListItemNode();
+
+        listNode1.append(listItem1);
+        listItem1.append(listNode2);
+        listNode2.append(listItem2);
+        listItem2.append(listNode3);
+        listNode3.append(listItem3);
+        listItem3.append(listNode4);
+        listNode4.append(listItem4);
+        listNode4.append(listNode5);
+        listNode5.append(listNode6);
+        listNode6.append(listNode7);
+
+        expect(listNode1.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
+        );
+        expect(
+          listNode1.createDOM({
+            namespace: '',
+            theme: {
+              list: {},
+            },
+          }).outerHTML,
+        ).toBe('<ul></ul>');
+        expect(
+          listNode1.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<ul></ul>');
+        expect(listNode2.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-2"></ul>',
+        );
+        expect(listNode3.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-3"></ul>',
+        );
+        expect(listNode4.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-4"></ul>',
+        );
+        expect(listNode5.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-5"></ul>',
+        );
+        expect(listNode6.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-6"></ul>',
+        );
+        expect(listNode7.createDOM(editorConfig).outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-7"></ul>',
+        );
+        expect(
+          listNode5.createDOM({
+            namespace: '',
+            theme: {
+              list: {
+                ...editorConfig.theme.list,
+                ulDepth: [
+                  'my-ul-list-class-1',
+                  'my-ul-list-class-2',
+                  'my-ul-list-class-3',
+                ],
+              },
+            },
+          }).outerHTML,
+        ).toBe('<ul class="my-ul-list-class my-ul-list-class-2"></ul>');
+      });
+    });
+
+    test('ListNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = $createListNode('bullet', 1);
+        const domElement = listNode.createDOM(editorConfig);
+
+        expect(domElement.outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
+        );
+
+        const newListNode = $createListNode('number', 1);
+        const result = newListNode.updateDOM(
+          listNode,
+          domElement,
+          editorConfig,
+        );
+
+        expect(result).toBe(true);
+        expect(domElement.outerHTML).toBe(
+          '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
+        );
+      });
+    });
+
+    test('ListNode.append() should properly transform a ListItemNode', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = new ListNode('bullet', 1);
+        const listItemNode = new ListItemNode();
+        const textNode = new TextNode('Hello');
+
+        listItemNode.append(textNode);
+        const nodesToAppend = [listItemNode];
+
+        expect(listNode.append(...nodesToAppend)).toBe(listNode);
+        expect(listNode.getFirstChild()).toBe(listItemNode);
+        expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
+      });
+    });
+
+    test('ListNode.append() should properly transform a ListNode', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = new ListNode('bullet', 1);
+        const nestedListNode = new ListNode('bullet', 1);
+        const listItemNode = new ListItemNode();
+        const textNode = new TextNode('Hello');
+
+        listItemNode.append(textNode);
+        nestedListNode.append(listItemNode);
+
+        const nodesToAppend = [nestedListNode];
+
+        expect(listNode.append(...nodesToAppend)).toBe(listNode);
+        expect($isListItemNode(listNode.getFirstChild())).toBe(true);
+        expect(listNode.getFirstChild<ListItemNode>()!.getFirstChild()).toBe(
+          nestedListNode,
+        );
+      });
+    });
+
+    test('ListNode.append() should properly transform a ParagraphNode', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = new ListNode('bullet', 1);
+        const paragraph = new ParagraphNode();
+        const textNode = new TextNode('Hello');
+        paragraph.append(textNode);
+        const nodesToAppend = [paragraph];
+
+        expect(listNode.append(...nodesToAppend)).toBe(listNode);
+        expect($isListItemNode(listNode.getFirstChild())).toBe(true);
+        expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
+      });
+    });
+
+    test('$createListNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = $createListNode('bullet', 1);
+        const createdListNode = $createListNode('bullet');
+
+        expect(listNode.__type).toEqual(createdListNode.__type);
+        expect(listNode.__parent).toEqual(createdListNode.__parent);
+        expect(listNode.__tag).toEqual(createdListNode.__tag);
+        expect(listNode.__key).not.toEqual(createdListNode.__key);
+      });
+    });
+
+    test('$isListNode()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const listNode = $createListNode('bullet', 1);
+
+        expect($isListNode(listNode)).toBe(true);
+      });
+    });
+
+    test('$createListNode() with tag name (backward compatibility)', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const numberList = $createListNode('number', 1);
+        const bulletList = $createListNode('bullet', 1);
+        expect(numberList.__listType).toBe('number');
+        expect(bulletList.__listType).toBe('bullet');
+      });
+    });
+
+    test('ListNode.clone() without list type (backward compatibility)', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const olNode = ListNode.clone({
+          __key: '1',
+          __start: 1,
+          __tag: 'ol',
+        } as unknown as ListNode);
+        const ulNode = ListNode.clone({
+          __key: '1',
+          __start: 1,
+          __tag: 'ul',
+        } as unknown as ListNode);
+        expect(olNode.__listType).toBe('number');
+        expect(ulNode.__listType).toBe('bullet');
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
new file mode 100644
index 00000000000..1fa327379b9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
@@ -0,0 +1,335 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {$createParagraphNode, $getRoot} from 'lexical';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+import {$createListItemNode, $createListNode} from '../..';
+import {$getListDepth, $getTopListNode, $isLastItemInList} from '../../utils';
+
+describe('Lexical List Utils tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('getListDepth should return the 1-based depth of a list with one levels', async () => {
+      const editor = testEnv.editor;
+
+      editor.update(() => {
+        // Root
+        //   |- ListNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+
+        root.append(topListNode);
+
+        const result = $getListDepth(topListNode);
+
+        expect(result).toEqual(1);
+      });
+    });
+
+    test('getListDepth should return the 1-based depth of a list with two levels', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //         |- ListItemNode
+        //         |- ListItemNode
+        //         |- ListNode
+        //               |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        topListNode.append(listItem2);
+        topListNode.append(secondLevelListNode);
+
+        secondLevelListNode.append(listItem3);
+
+        const result = $getListDepth(secondLevelListNode);
+
+        expect(result).toEqual(2);
+      });
+    });
+
+    test('getListDepth should return the 1-based depth of a list with five levels', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //        |- ListItemNode
+        //             |- ListNode
+        //                  |- ListItemNode
+        //                       |- ListNode
+        //                            |- ListItemNode
+        //                                 |- ListNode
+        //                                     |- ListItemNode
+        //                                          |- ListNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+        const listNode2 = $createListNode('bullet');
+        const listNode3 = $createListNode('bullet');
+        const listNode4 = $createListNode('bullet');
+        const listNode5 = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+        const listItem4 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+
+        listItem1.append(listNode2);
+        listNode2.append(listItem2);
+        listItem2.append(listNode3);
+        listNode3.append(listItem3);
+        listItem3.append(listNode4);
+        listNode4.append(listItem4);
+        listItem4.append(listNode5);
+
+        const result = $getListDepth(listNode5);
+
+        expect(result).toEqual(5);
+      });
+    });
+
+    test('getTopListNode should return the top list node when the list is a direct child of the RootNode', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //         |- ListItemNode
+        //         |- ListItemNode
+        //         |- ListNode
+        //               |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        topListNode.append(listItem2);
+        topListNode.append(secondLevelListNode);
+        secondLevelListNode.append(listItem3);
+
+        const result = $getTopListNode(listItem3);
+        expect(result.getKey()).toEqual(topListNode.getKey());
+      });
+    });
+
+    test('getTopListNode should return the top list node when the list is not a direct child of the RootNode', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        // |- ParagraphNode
+        //     |- ListNode
+        //        |- ListItemNode
+        //        |- ListItemNode
+        //           |- ListNode
+        //              |- ListItemNode
+        const root = $getRoot();
+
+        const paragraphNode = $createParagraphNode();
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+        root.append(paragraphNode);
+        paragraphNode.append(topListNode);
+        topListNode.append(listItem1);
+        topListNode.append(listItem2);
+        topListNode.append(secondLevelListNode);
+        secondLevelListNode.append(listItem3);
+
+        const result = $getTopListNode(listItem3);
+        expect(result.getKey()).toEqual(topListNode.getKey());
+      });
+    });
+
+    test('getTopListNode should return the top list node when the list item is deeply nested.', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        // |- ParagraphNode
+        //     |- ListNode
+        //        |- ListItemNode
+        //           |- ListNode
+        //              |- ListItemNode
+        //                  |- ListNode
+        //                      |- ListItemNode
+        //        |- ListItemNode
+        const root = $getRoot();
+
+        const paragraphNode = $createParagraphNode();
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+        const thirdLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+        const listItem4 = $createListItemNode();
+        root.append(paragraphNode);
+        paragraphNode.append(topListNode);
+        topListNode.append(listItem1);
+        listItem1.append(secondLevelListNode);
+        secondLevelListNode.append(listItem2);
+        listItem2.append(thirdLevelListNode);
+        thirdLevelListNode.append(listItem3);
+        topListNode.append(listItem4);
+
+        const result = $getTopListNode(listItem4);
+        expect(result.getKey()).toEqual(topListNode.getKey());
+      });
+    });
+
+    test('isLastItemInList should return true if the listItem is the last in a nested list.', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //      |- ListItemNode
+        //         |- ListNode
+        //            |- ListItemNode
+        //                |- ListNode
+        //                    |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+        const thirdLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        listItem1.append(secondLevelListNode);
+        secondLevelListNode.append(listItem2);
+        listItem2.append(thirdLevelListNode);
+        thirdLevelListNode.append(listItem3);
+
+        const result = $isLastItemInList(listItem3);
+
+        expect(result).toEqual(true);
+      });
+    });
+
+    test('isLastItemInList should return true if the listItem is the last in a non-nested list.', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //      |- ListItemNode
+        //      |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        topListNode.append(listItem2);
+
+        const result = $isLastItemInList(listItem2);
+
+        expect(result).toEqual(true);
+      });
+    });
+
+    test('isLastItemInList should return false if the listItem is not the last in a nested list.', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //      |- ListItemNode
+        //         |- ListNode
+        //            |- ListItemNode
+        //                |- ListNode
+        //                    |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+        const secondLevelListNode = $createListNode('bullet');
+        const thirdLevelListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+        const listItem3 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        listItem1.append(secondLevelListNode);
+        secondLevelListNode.append(listItem2);
+        listItem2.append(thirdLevelListNode);
+        thirdLevelListNode.append(listItem3);
+
+        const result = $isLastItemInList(listItem2);
+
+        expect(result).toEqual(false);
+      });
+    });
+
+    test('isLastItemInList should return true if the listItem is not the last in a non-nested list.', async () => {
+      const editor = testEnv.editor;
+
+      await editor.update(() => {
+        // Root
+        //   |- ListNode
+        //      |- ListItemNode
+        //      |- ListItemNode
+        const root = $getRoot();
+
+        const topListNode = $createListNode('bullet');
+
+        const listItem1 = $createListItemNode();
+        const listItem2 = $createListItemNode();
+
+        root.append(topListNode);
+
+        topListNode.append(listItem1);
+        topListNode.append(listItem2);
+
+        const result = $isLastItemInList(listItem1);
+
+        expect(result).toEqual(false);
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/utils.ts b/resources/js/wysiwyg/lexical/list/__tests__/utils.ts
new file mode 100644
index 00000000000..aa95a7a01b0
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/__tests__/utils.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {expect} from '@playwright/test';
+import prettier from 'prettier';
+
+// This tag function is just used to trigger prettier auto-formatting.
+// (https://prettier.io/blog/2020/08/24/2.1.0.html#api)
+export function html(
+  partials: TemplateStringsArray,
+  ...params: string[]
+): string {
+  let output = '';
+  for (let i = 0; i < partials.length; i++) {
+    output += partials[i];
+    if (i < partials.length - 1) {
+      output += params[i];
+    }
+  }
+  return output;
+}
+
+export function expectHtmlToBeEqual(expected: string, actual: string): void {
+  expect(prettifyHtml(expected)).toBe(prettifyHtml(actual));
+}
+
+export function prettifyHtml(s: string): string {
+  return prettier.format(s.replace(/\n/g, ''), {parser: 'html'});
+}
diff --git a/resources/js/wysiwyg/lexical/list/formatList.ts b/resources/js/wysiwyg/lexical/list/formatList.ts
new file mode 100644
index 00000000000..b9ca011696a
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/formatList.ts
@@ -0,0 +1,530 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$getNearestNodeOfType} from '@lexical/utils';
+import {
+  $createParagraphNode,
+  $getSelection,
+  $isElementNode,
+  $isLeafNode,
+  $isParagraphNode,
+  $isRangeSelection,
+  $isRootOrShadowRoot,
+  ElementNode,
+  LexicalEditor,
+  LexicalNode,
+  NodeKey,
+  ParagraphNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $createListItemNode,
+  $createListNode,
+  $isListItemNode,
+  $isListNode,
+  ListItemNode,
+  ListNode,
+} from './';
+import {ListType} from './LexicalListNode';
+import {
+  $getAllListItems,
+  $getTopListNode,
+  $removeHighestEmptyListParent,
+  isNestedListNode,
+} from './utils';
+
+function $isSelectingEmptyListItem(
+  anchorNode: ListItemNode | LexicalNode,
+  nodes: Array<LexicalNode>,
+): boolean {
+  return (
+    $isListItemNode(anchorNode) &&
+    (nodes.length === 0 ||
+      (nodes.length === 1 &&
+        anchorNode.is(nodes[0]) &&
+        anchorNode.getChildrenSize() === 0))
+  );
+}
+
+/**
+ * Inserts a new ListNode. If the selection's anchor node is an empty ListItemNode and is a child of
+ * the root/shadow root, it will replace the ListItemNode with a ListNode and the old ListItemNode.
+ * Otherwise it will replace its parent with a new ListNode and re-insert the ListItemNode and any previous children.
+ * If the selection's anchor node is not an empty ListItemNode, it will add a new ListNode or merge an existing ListNode,
+ * unless the the node is a leaf node, in which case it will attempt to find a ListNode up the branch and replace it with
+ * a new ListNode, or create a new ListNode at the nearest root/shadow root.
+ * @param editor - The lexical editor.
+ * @param listType - The type of list, "number" | "bullet" | "check".
+ */
+export function insertList(editor: LexicalEditor, listType: ListType): void {
+  editor.update(() => {
+    const selection = $getSelection();
+
+    if (selection !== null) {
+      const nodes = selection.getNodes();
+      if ($isRangeSelection(selection)) {
+        const anchorAndFocus = selection.getStartEndPoints();
+        invariant(
+          anchorAndFocus !== null,
+          'insertList: anchor should be defined',
+        );
+        const [anchor] = anchorAndFocus;
+        const anchorNode = anchor.getNode();
+        const anchorNodeParent = anchorNode.getParent();
+
+        if ($isSelectingEmptyListItem(anchorNode, nodes)) {
+          const list = $createListNode(listType);
+
+          if ($isRootOrShadowRoot(anchorNodeParent)) {
+            anchorNode.replace(list);
+            const listItem = $createListItemNode();
+            if ($isElementNode(anchorNode)) {
+              listItem.setFormat(anchorNode.getFormatType());
+              listItem.setIndent(anchorNode.getIndent());
+            }
+            list.append(listItem);
+          } else if ($isListItemNode(anchorNode)) {
+            const parent = anchorNode.getParentOrThrow();
+            append(list, parent.getChildren());
+            parent.replace(list);
+          }
+
+          return;
+        }
+      }
+
+      const handled = new Set();
+      for (let i = 0; i < nodes.length; i++) {
+        const node = nodes[i];
+
+        if (
+          $isElementNode(node) &&
+          node.isEmpty() &&
+          !$isListItemNode(node) &&
+          !handled.has(node.getKey())
+        ) {
+          $createListOrMerge(node, listType);
+          continue;
+        }
+
+        if ($isLeafNode(node)) {
+          let parent = node.getParent();
+          while (parent != null) {
+            const parentKey = parent.getKey();
+
+            if ($isListNode(parent)) {
+              if (!handled.has(parentKey)) {
+                const newListNode = $createListNode(listType);
+                append(newListNode, parent.getChildren());
+                parent.replace(newListNode);
+                handled.add(parentKey);
+              }
+
+              break;
+            } else {
+              const nextParent = parent.getParent();
+
+              if ($isRootOrShadowRoot(nextParent) && !handled.has(parentKey)) {
+                handled.add(parentKey);
+                $createListOrMerge(parent, listType);
+                break;
+              }
+
+              parent = nextParent;
+            }
+          }
+        }
+      }
+    }
+  });
+}
+
+function append(node: ElementNode, nodesToAppend: Array<LexicalNode>) {
+  node.splice(node.getChildrenSize(), 0, nodesToAppend);
+}
+
+function $createListOrMerge(node: ElementNode, listType: ListType): ListNode {
+  if ($isListNode(node)) {
+    return node;
+  }
+
+  const previousSibling = node.getPreviousSibling();
+  const nextSibling = node.getNextSibling();
+  const listItem = $createListItemNode();
+  listItem.setFormat(node.getFormatType());
+  listItem.setIndent(node.getIndent());
+  append(listItem, node.getChildren());
+
+  if (
+    $isListNode(previousSibling) &&
+    listType === previousSibling.getListType()
+  ) {
+    previousSibling.append(listItem);
+    node.remove();
+    // if the same type of list is on both sides, merge them.
+
+    if ($isListNode(nextSibling) && listType === nextSibling.getListType()) {
+      append(previousSibling, nextSibling.getChildren());
+      nextSibling.remove();
+    }
+    return previousSibling;
+  } else if (
+    $isListNode(nextSibling) &&
+    listType === nextSibling.getListType()
+  ) {
+    nextSibling.getFirstChildOrThrow().insertBefore(listItem);
+    node.remove();
+    return nextSibling;
+  } else {
+    const list = $createListNode(listType);
+    list.append(listItem);
+    node.replace(list);
+    return list;
+  }
+}
+
+/**
+ * A recursive function that goes through each list and their children, including nested lists,
+ * appending list2 children after list1 children and updating ListItemNode values.
+ * @param list1 - The first list to be merged.
+ * @param list2 - The second list to be merged.
+ */
+export function mergeLists(list1: ListNode, list2: ListNode): void {
+  const listItem1 = list1.getLastChild();
+  const listItem2 = list2.getFirstChild();
+
+  if (
+    listItem1 &&
+    listItem2 &&
+    isNestedListNode(listItem1) &&
+    isNestedListNode(listItem2)
+  ) {
+    mergeLists(listItem1.getFirstChild(), listItem2.getFirstChild());
+    listItem2.remove();
+  }
+
+  const toMerge = list2.getChildren();
+  if (toMerge.length > 0) {
+    list1.append(...toMerge);
+  }
+
+  list2.remove();
+}
+
+/**
+ * Searches for the nearest ancestral ListNode and removes it. If selection is an empty ListItemNode
+ * it will remove the whole list, including the ListItemNode. For each ListItemNode in the ListNode,
+ * removeList will also generate new ParagraphNodes in the removed ListNode's place. Any child node
+ * inside a ListItemNode will be appended to the new ParagraphNodes.
+ * @param editor - The lexical editor.
+ */
+export function removeList(editor: LexicalEditor): void {
+  editor.update(() => {
+    const selection = $getSelection();
+
+    if ($isRangeSelection(selection)) {
+      const listNodes = new Set<ListNode>();
+      const nodes = selection.getNodes();
+      const anchorNode = selection.anchor.getNode();
+
+      if ($isSelectingEmptyListItem(anchorNode, nodes)) {
+        listNodes.add($getTopListNode(anchorNode));
+      } else {
+        for (let i = 0; i < nodes.length; i++) {
+          const node = nodes[i];
+
+          if ($isLeafNode(node)) {
+            const listItemNode = $getNearestNodeOfType(node, ListItemNode);
+
+            if (listItemNode != null) {
+              listNodes.add($getTopListNode(listItemNode));
+            }
+          }
+        }
+      }
+
+      for (const listNode of listNodes) {
+        let insertionPoint: ListNode | ParagraphNode = listNode;
+
+        const listItems = $getAllListItems(listNode);
+
+        for (const listItemNode of listItems) {
+          const paragraph = $createParagraphNode();
+
+          append(paragraph, listItemNode.getChildren());
+
+          insertionPoint.insertAfter(paragraph);
+          insertionPoint = paragraph;
+
+          // When the anchor and focus fall on the textNode
+          // we don't have to change the selection because the textNode will be appended to
+          // the newly generated paragraph.
+          // When selection is in empty nested list item, selection is actually on the listItemNode.
+          // When the corresponding listItemNode is deleted and replaced by the newly generated paragraph
+          // we should manually set the selection's focus and anchor to the newly generated paragraph.
+          if (listItemNode.__key === selection.anchor.key) {
+            selection.anchor.set(paragraph.getKey(), 0, 'element');
+          }
+          if (listItemNode.__key === selection.focus.key) {
+            selection.focus.set(paragraph.getKey(), 0, 'element');
+          }
+
+          listItemNode.remove();
+        }
+        listNode.remove();
+      }
+    }
+  });
+}
+
+/**
+ * Takes the value of a child ListItemNode and makes it the value the ListItemNode
+ * should be if it isn't already. Also ensures that checked is undefined if the
+ * parent does not have a list type of 'check'.
+ * @param list - The list whose children are updated.
+ */
+export function updateChildrenListItemValue(list: ListNode): void {
+  const isNotChecklist = list.getListType() !== 'check';
+  let value = list.getStart();
+  for (const child of list.getChildren()) {
+    if ($isListItemNode(child)) {
+      if (child.getValue() !== value) {
+        child.setValue(value);
+      }
+      if (isNotChecklist && child.getLatest().__checked != null) {
+        child.setChecked(undefined);
+      }
+      if (!$isListNode(child.getFirstChild())) {
+        value++;
+      }
+    }
+  }
+}
+
+/**
+ * Merge the next sibling list if same type.
+ * <ul> will merge with <ul>, but NOT <ul> with <ol>.
+ * @param list - The list whose next sibling should be potentially merged
+ */
+export function mergeNextSiblingListIfSameType(list: ListNode): void {
+  const nextSibling = list.getNextSibling();
+  if (
+    $isListNode(nextSibling) &&
+    list.getListType() === nextSibling.getListType()
+  ) {
+    mergeLists(list, nextSibling);
+  }
+}
+
+/**
+ * Adds an empty ListNode/ListItemNode chain at listItemNode, so as to
+ * create an indent effect. Won't indent ListItemNodes that have a ListNode as
+ * a child, but does merge sibling ListItemNodes if one has a nested ListNode.
+ * @param listItemNode - The ListItemNode to be indented.
+ */
+export function $handleIndent(listItemNode: ListItemNode): void {
+  // go through each node and decide where to move it.
+  const removed = new Set<NodeKey>();
+
+  if (isNestedListNode(listItemNode) || removed.has(listItemNode.getKey())) {
+    return;
+  }
+
+  const parent = listItemNode.getParent();
+
+  // We can cast both of the below `isNestedListNode` only returns a boolean type instead of a user-defined type guards
+  const nextSibling =
+    listItemNode.getNextSibling<ListItemNode>() as ListItemNode;
+  const previousSibling =
+    listItemNode.getPreviousSibling<ListItemNode>() as ListItemNode;
+  // if there are nested lists on either side, merge them all together.
+
+  if (isNestedListNode(nextSibling) && isNestedListNode(previousSibling)) {
+    const innerList = previousSibling.getFirstChild();
+
+    if ($isListNode(innerList)) {
+      innerList.append(listItemNode);
+      const nextInnerList = nextSibling.getFirstChild();
+
+      if ($isListNode(nextInnerList)) {
+        const children = nextInnerList.getChildren();
+        append(innerList, children);
+        nextSibling.remove();
+        removed.add(nextSibling.getKey());
+      }
+    }
+  } else if (isNestedListNode(nextSibling)) {
+    // if the ListItemNode is next to a nested ListNode, merge them
+    const innerList = nextSibling.getFirstChild();
+
+    if ($isListNode(innerList)) {
+      const firstChild = innerList.getFirstChild();
+
+      if (firstChild !== null) {
+        firstChild.insertBefore(listItemNode);
+      }
+    }
+  } else if (isNestedListNode(previousSibling)) {
+    const innerList = previousSibling.getFirstChild();
+
+    if ($isListNode(innerList)) {
+      innerList.append(listItemNode);
+    }
+  } else {
+    // otherwise, we need to create a new nested ListNode
+
+    if ($isListNode(parent)) {
+      const newListItem = $createListItemNode();
+      const newList = $createListNode(parent.getListType());
+      newListItem.append(newList);
+      newList.append(listItemNode);
+
+      if (previousSibling) {
+        previousSibling.insertAfter(newListItem);
+      } else if (nextSibling) {
+        nextSibling.insertBefore(newListItem);
+      } else {
+        parent.append(newListItem);
+      }
+    }
+  }
+}
+
+/**
+ * Removes an indent by removing an empty ListNode/ListItemNode chain. An indented ListItemNode
+ * has a great grandparent node of type ListNode, which is where the ListItemNode will reside
+ * within as a child.
+ * @param listItemNode - The ListItemNode to remove the indent (outdent).
+ */
+export function $handleOutdent(listItemNode: ListItemNode): void {
+  // go through each node and decide where to move it.
+
+  if (isNestedListNode(listItemNode)) {
+    return;
+  }
+  const parentList = listItemNode.getParent();
+  const grandparentListItem = parentList ? parentList.getParent() : undefined;
+  const greatGrandparentList = grandparentListItem
+    ? grandparentListItem.getParent()
+    : undefined;
+  // If it doesn't have these ancestors, it's not indented.
+
+  if (
+    $isListNode(greatGrandparentList) &&
+    $isListItemNode(grandparentListItem) &&
+    $isListNode(parentList)
+  ) {
+    // if it's the first child in it's parent list, insert it into the
+    // great grandparent list before the grandparent
+    const firstChild = parentList ? parentList.getFirstChild() : undefined;
+    const lastChild = parentList ? parentList.getLastChild() : undefined;
+
+    if (listItemNode.is(firstChild)) {
+      grandparentListItem.insertBefore(listItemNode);
+
+      if (parentList.isEmpty()) {
+        grandparentListItem.remove();
+      }
+      // if it's the last child in it's parent list, insert it into the
+      // great grandparent list after the grandparent.
+    } else if (listItemNode.is(lastChild)) {
+      grandparentListItem.insertAfter(listItemNode);
+
+      if (parentList.isEmpty()) {
+        grandparentListItem.remove();
+      }
+    } else {
+      // otherwise, we need to split the siblings into two new nested lists
+      const listType = parentList.getListType();
+      const previousSiblingsListItem = $createListItemNode();
+      const previousSiblingsList = $createListNode(listType);
+      previousSiblingsListItem.append(previousSiblingsList);
+      listItemNode
+        .getPreviousSiblings()
+        .forEach((sibling) => previousSiblingsList.append(sibling));
+      const nextSiblingsListItem = $createListItemNode();
+      const nextSiblingsList = $createListNode(listType);
+      nextSiblingsListItem.append(nextSiblingsList);
+      append(nextSiblingsList, listItemNode.getNextSiblings());
+      // put the sibling nested lists on either side of the grandparent list item in the great grandparent.
+      grandparentListItem.insertBefore(previousSiblingsListItem);
+      grandparentListItem.insertAfter(nextSiblingsListItem);
+      // replace the grandparent list item (now between the siblings) with the outdented list item.
+      grandparentListItem.replace(listItemNode);
+    }
+  }
+}
+
+/**
+ * Attempts to insert a ParagraphNode at selection and selects the new node. The selection must contain a ListItemNode
+ * or a node that does not already contain text. If its grandparent is the root/shadow root, it will get the ListNode
+ * (which should be the parent node) and insert the ParagraphNode as a sibling to the ListNode. If the ListNode is
+ * nested in a ListItemNode instead, it will add the ParagraphNode after the grandparent ListItemNode.
+ * Throws an invariant if the selection is not a child of a ListNode.
+ * @returns true if a ParagraphNode was inserted succesfully, false if there is no selection
+ * or the selection does not contain a ListItemNode or the node already holds text.
+ */
+export function $handleListInsertParagraph(): boolean {
+  const selection = $getSelection();
+
+  if (!$isRangeSelection(selection) || !selection.isCollapsed()) {
+    return false;
+  }
+  // Only run this code on empty list items
+  const anchor = selection.anchor.getNode();
+
+  if (!$isListItemNode(anchor) || anchor.getChildrenSize() !== 0) {
+    return false;
+  }
+  const topListNode = $getTopListNode(anchor);
+  const parent = anchor.getParent();
+
+  invariant(
+    $isListNode(parent),
+    'A ListItemNode must have a ListNode for a parent.',
+  );
+
+  const grandparent = parent.getParent();
+
+  let replacementNode;
+
+  if ($isRootOrShadowRoot(grandparent)) {
+    replacementNode = $createParagraphNode();
+    topListNode.insertAfter(replacementNode);
+  } else if ($isListItemNode(grandparent)) {
+    replacementNode = $createListItemNode();
+    grandparent.insertAfter(replacementNode);
+  } else {
+    return false;
+  }
+  replacementNode.select();
+
+  const nextSiblings = anchor.getNextSiblings();
+
+  if (nextSiblings.length > 0) {
+    const newList = $createListNode(parent.getListType());
+
+    if ($isParagraphNode(replacementNode)) {
+      replacementNode.insertAfter(newList);
+    } else {
+      const newListItem = $createListItemNode();
+      newListItem.append(newList);
+      replacementNode.insertAfter(newListItem);
+    }
+    nextSiblings.forEach((sibling) => {
+      sibling.remove();
+      newList.append(sibling);
+    });
+  }
+
+  // Don't leave hanging nested empty lists
+  $removeHighestEmptyListParent(anchor);
+
+  return true;
+}
diff --git a/resources/js/wysiwyg/lexical/list/index.ts b/resources/js/wysiwyg/lexical/list/index.ts
new file mode 100644
index 00000000000..157fe79de1d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/index.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {SerializedListItemNode} from './LexicalListItemNode';
+import type {ListType, SerializedListNode} from './LexicalListNode';
+import type {LexicalCommand} from 'lexical';
+
+import {createCommand} from 'lexical';
+
+import {$handleListInsertParagraph, insertList, removeList} from './formatList';
+import {
+  $createListItemNode,
+  $isListItemNode,
+  ListItemNode,
+} from './LexicalListItemNode';
+import {$createListNode, $isListNode, ListNode} from './LexicalListNode';
+import {$getListDepth} from './utils';
+
+export {
+  $createListItemNode,
+  $createListNode,
+  $getListDepth,
+  $handleListInsertParagraph,
+  $isListItemNode,
+  $isListNode,
+  insertList,
+  ListItemNode,
+  ListNode,
+  ListType,
+  removeList,
+  SerializedListItemNode,
+  SerializedListNode,
+};
+
+export const INSERT_UNORDERED_LIST_COMMAND: LexicalCommand<void> =
+  createCommand('INSERT_UNORDERED_LIST_COMMAND');
+export const INSERT_ORDERED_LIST_COMMAND: LexicalCommand<void> = createCommand(
+  'INSERT_ORDERED_LIST_COMMAND',
+);
+export const INSERT_CHECK_LIST_COMMAND: LexicalCommand<void> = createCommand(
+  'INSERT_CHECK_LIST_COMMAND',
+);
+export const REMOVE_LIST_COMMAND: LexicalCommand<void> = createCommand(
+  'REMOVE_LIST_COMMAND',
+);
diff --git a/resources/js/wysiwyg/lexical/list/utils.ts b/resources/js/wysiwyg/lexical/list/utils.ts
new file mode 100644
index 00000000000..c451a45085d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/list/utils.ts
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalNode, Spread} from 'lexical';
+
+import {$findMatchingParent} from '@lexical/utils';
+import invariant from 'lexical/shared/invariant';
+
+import {
+  $createListItemNode,
+  $isListItemNode,
+  $isListNode,
+  ListItemNode,
+  ListNode,
+} from './';
+
+/**
+ * Checks the depth of listNode from the root node.
+ * @param listNode - The ListNode to be checked.
+ * @returns The depth of the ListNode.
+ */
+export function $getListDepth(listNode: ListNode): number {
+  let depth = 1;
+  let parent = listNode.getParent();
+
+  while (parent != null) {
+    if ($isListItemNode(parent)) {
+      const parentList = parent.getParent();
+
+      if ($isListNode(parentList)) {
+        depth++;
+        parent = parentList.getParent();
+        continue;
+      }
+      invariant(false, 'A ListItemNode must have a ListNode for a parent.');
+    }
+
+    return depth;
+  }
+
+  return depth;
+}
+
+/**
+ * Finds the nearest ancestral ListNode and returns it, throws an invariant if listItem is not a ListItemNode.
+ * @param listItem - The node to be checked.
+ * @returns The ListNode found.
+ */
+export function $getTopListNode(listItem: LexicalNode): ListNode {
+  let list = listItem.getParent<ListNode>();
+
+  if (!$isListNode(list)) {
+    invariant(false, 'A ListItemNode must have a ListNode for a parent.');
+  }
+
+  let parent: ListNode | null = list;
+
+  while (parent !== null) {
+    parent = parent.getParent();
+
+    if ($isListNode(parent)) {
+      list = parent;
+    }
+  }
+
+  return list;
+}
+
+/**
+ * Checks if listItem has no child ListNodes and has no ListItemNode ancestors with siblings.
+ * @param listItem - the ListItemNode to be checked.
+ * @returns true if listItem has no child ListNode and no ListItemNode ancestors with siblings, false otherwise.
+ */
+export function $isLastItemInList(listItem: ListItemNode): boolean {
+  let isLast = true;
+  const firstChild = listItem.getFirstChild();
+
+  if ($isListNode(firstChild)) {
+    return false;
+  }
+  let parent: ListItemNode | null = listItem;
+
+  while (parent !== null) {
+    if ($isListItemNode(parent)) {
+      if (parent.getNextSiblings().length > 0) {
+        isLast = false;
+      }
+    }
+
+    parent = parent.getParent();
+  }
+
+  return isLast;
+}
+
+/**
+ * A recursive Depth-First Search (Postorder Traversal) that finds all of a node's children
+ * that are of type ListItemNode and returns them in an array.
+ * @param node - The ListNode to start the search.
+ * @returns An array containing all nodes of type ListItemNode found.
+ */
+// This should probably be $getAllChildrenOfType
+export function $getAllListItems(node: ListNode): Array<ListItemNode> {
+  let listItemNodes: Array<ListItemNode> = [];
+  const listChildren: Array<ListItemNode> = node
+    .getChildren()
+    .filter($isListItemNode);
+
+  for (let i = 0; i < listChildren.length; i++) {
+    const listItemNode = listChildren[i];
+    const firstChild = listItemNode.getFirstChild();
+
+    if ($isListNode(firstChild)) {
+      listItemNodes = listItemNodes.concat($getAllListItems(firstChild));
+    } else {
+      listItemNodes.push(listItemNode);
+    }
+  }
+
+  return listItemNodes;
+}
+
+const NestedListNodeBrand: unique symbol = Symbol.for(
+  '@lexical/NestedListNodeBrand',
+);
+
+/**
+ * Checks to see if the passed node is a ListItemNode and has a ListNode as a child.
+ * @param node - The node to be checked.
+ * @returns true if the node is a ListItemNode and has a ListNode child, false otherwise.
+ */
+export function isNestedListNode(
+  node: LexicalNode | null | undefined,
+): node is Spread<
+  {getFirstChild(): ListNode; [NestedListNodeBrand]: never},
+  ListItemNode
+> {
+  return $isListItemNode(node) && $isListNode(node.getFirstChild());
+}
+
+/**
+ * Traverses up the tree and returns the first ListItemNode found.
+ * @param node - Node to start the search.
+ * @returns The first ListItemNode found, or null if none exist.
+ */
+export function $findNearestListItemNode(
+  node: LexicalNode,
+): ListItemNode | null {
+  const matchingParent = $findMatchingParent(node, (parent) =>
+    $isListItemNode(parent),
+  );
+  return matchingParent as ListItemNode | null;
+}
+
+/**
+ * Takes a deeply nested ListNode or ListItemNode and traverses up the branch to delete the first
+ * ancestral ListNode (which could be the root ListNode) or ListItemNode with siblings, essentially
+ * bringing the deeply nested node up the branch once. Would remove sublist if it has siblings.
+ * Should not break ListItem -> List -> ListItem chain as empty List/ItemNodes should be removed on .remove().
+ * @param sublist - The nested ListNode or ListItemNode to be brought up the branch.
+ */
+export function $removeHighestEmptyListParent(
+  sublist: ListItemNode | ListNode,
+) {
+  // Nodes may be repeatedly indented, to create deeply nested lists that each
+  // contain just one bullet.
+  // Our goal is to remove these (empty) deeply nested lists. The easiest
+  // way to do that is crawl back up the tree until we find a node that has siblings
+  // (e.g. is actually part of the list contents) and delete that, or delete
+  // the root of the list (if no list nodes have siblings.)
+  let emptyListPtr = sublist;
+
+  while (
+    emptyListPtr.getNextSibling() == null &&
+    emptyListPtr.getPreviousSibling() == null
+  ) {
+    const parent = emptyListPtr.getParent<ListItemNode | ListNode>();
+
+    if (
+      parent == null ||
+      !($isListItemNode(emptyListPtr) || $isListNode(emptyListPtr))
+    ) {
+      break;
+    }
+
+    emptyListPtr = parent;
+  }
+
+  emptyListPtr.remove();
+}
+
+/**
+ * Wraps a node into a ListItemNode.
+ * @param node - The node to be wrapped into a ListItemNode
+ * @returns The ListItemNode which the passed node is wrapped in.
+ */
+export function $wrapInListItem(node: LexicalNode): ListItemNode {
+  const listItemWrapper = $createListItemNode();
+  return listItemWrapper.append(node);
+}
diff --git a/resources/js/wysiwyg/lexical/readme.md b/resources/js/wysiwyg/lexical/readme.md
new file mode 100644
index 00000000000..31db8fab1ca
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/readme.md
@@ -0,0 +1,12 @@
+# Lexical Editor Framework
+
+This is a fork and import of [the Lexical editor](https://lexical.dev/) at the version of v0.17.1 for direct use and modification in BookStack. This was done due to fighting many of the opinionated defaults in Lexical during editor development.
+
+Only components used, or intended to be used, were copied in at this point.
+
+#### License
+
+The original work built upon in this directory and below is under the copyright of Meta Platforms, Inc. and affiliates.
+The original license can be seen in the [ORIGINAL-LEXICAL-LICENSE](./ORIGINAL-LEXICAL-LICENSE) file.
+
+Files may have since been modified with modifications being under the license and copyright of the BookStack project as a whole. 
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
new file mode 100644
index 00000000000..057999ba031
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
@@ -0,0 +1,202 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createHeadingNode,
+  $isHeadingNode,
+  HeadingNode,
+} from '@lexical/rich-text';
+import {
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  ParagraphNode,
+  RangeSelection,
+} from 'lexical';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    heading: {
+      h1: 'my-h1-class',
+      h2: 'my-h2-class',
+      h3: 'my-h3-class',
+      h4: 'my-h4-class',
+      h5: 'my-h5-class',
+      h6: 'my-h6-class',
+    },
+  },
+});
+
+describe('LexicalHeadingNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('HeadingNode.constructor', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const headingNode = new HeadingNode('h1');
+        expect(headingNode.getType()).toBe('heading');
+        expect(headingNode.getTag()).toBe('h1');
+        expect(headingNode.getTextContent()).toBe('');
+      });
+      expect(() => new HeadingNode('h1')).toThrow();
+    });
+
+    test('HeadingNode.createDOM()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const headingNode = new HeadingNode('h1');
+        expect(headingNode.createDOM(editorConfig).outerHTML).toBe(
+          '<h1 class="my-h1-class"></h1>',
+        );
+        expect(
+          headingNode.createDOM({
+            namespace: '',
+            theme: {
+              heading: {},
+            },
+          }).outerHTML,
+        ).toBe('<h1></h1>');
+        expect(
+          headingNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<h1></h1>');
+      });
+    });
+
+    test('HeadingNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const headingNode = new HeadingNode('h1');
+        const domElement = headingNode.createDOM(editorConfig);
+        expect(domElement.outerHTML).toBe('<h1 class="my-h1-class"></h1>');
+        const newHeadingNode = new HeadingNode('h2');
+        const result = newHeadingNode.updateDOM(headingNode, domElement);
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe('<h1 class="my-h1-class"></h1>');
+      });
+    });
+
+    test('HeadingNode.insertNewAfter() empty', async () => {
+      const {editor} = testEnv;
+      let headingNode: HeadingNode;
+      await editor.update(() => {
+        const root = $getRoot();
+        headingNode = new HeadingNode('h1');
+        root.append(headingNode);
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><br></h1></div>',
+      );
+      await editor.update(() => {
+        const selection = $getSelection() as RangeSelection;
+        const result = headingNode.insertNewAfter(selection);
+        expect(result).toBeInstanceOf(ParagraphNode);
+        expect(result.getDirection()).toEqual(headingNode.getDirection());
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><br></h1><p><br></p></div>',
+      );
+    });
+
+    test('HeadingNode.insertNewAfter() middle', async () => {
+      const {editor} = testEnv;
+      let headingNode: HeadingNode;
+      await editor.update(() => {
+        const root = $getRoot();
+        headingNode = new HeadingNode('h1');
+        const headingTextNode = $createTextNode('hello world');
+        root.append(headingNode.append(headingTextNode));
+        headingTextNode.select(5, 5);
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello world</span></h1></div>',
+      );
+      await editor.update(() => {
+        const selection = $getSelection() as RangeSelection;
+        const result = headingNode.insertNewAfter(selection);
+        expect(result).toBeInstanceOf(HeadingNode);
+        expect(result.getDirection()).toEqual(headingNode.getDirection());
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello world</span></h1><h1><br></h1></div>',
+      );
+    });
+
+    test('HeadingNode.insertNewAfter() end', async () => {
+      const {editor} = testEnv;
+      let headingNode: HeadingNode;
+      await editor.update(() => {
+        const root = $getRoot();
+        headingNode = new HeadingNode('h1');
+        const headingTextNode1 = $createTextNode('hello');
+        const headingTextNode2 = $createTextNode(' world');
+        headingTextNode2.setFormat('bold');
+        root.append(headingNode.append(headingTextNode1, headingTextNode2));
+        headingTextNode2.selectEnd();
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1></div>',
+      );
+      await editor.update(() => {
+        const selection = $getSelection() as RangeSelection;
+        const result = headingNode.insertNewAfter(selection);
+        expect(result).toBeInstanceOf(ParagraphNode);
+        expect(result.getDirection()).toEqual(headingNode.getDirection());
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1><p><br></p></div>',
+      );
+    });
+
+    test('$createHeadingNode()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const headingNode = new HeadingNode('h1');
+        const createdHeadingNode = $createHeadingNode('h1');
+        expect(headingNode.__type).toEqual(createdHeadingNode.__type);
+        expect(headingNode.__parent).toEqual(createdHeadingNode.__parent);
+        expect(headingNode.__key).not.toEqual(createdHeadingNode.__key);
+      });
+    });
+
+    test('$isHeadingNode()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const headingNode = new HeadingNode('h1');
+        expect($isHeadingNode(headingNode)).toBe(true);
+      });
+    });
+
+    test('creates a h2 with text and can insert a new paragraph after', async () => {
+      const {editor} = testEnv;
+      let headingNode: HeadingNode;
+      const text = 'hello world';
+      await editor.update(() => {
+        const root = $getRoot();
+        headingNode = new HeadingNode('h2');
+        root.append(headingNode);
+        const textNode = $createTextNode(text);
+        headingNode.append(textNode);
+      });
+      expect(testEnv.outerHTML).toBe(
+        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 dir="ltr"><span data-lexical-text="true">${text}</span></h2></div>`,
+      );
+      await editor.update(() => {
+        const result = headingNode.insertNewAfter();
+        expect(result).toBeInstanceOf(ParagraphNode);
+        expect(result.getDirection()).toEqual(headingNode.getDirection());
+      });
+      expect(testEnv.outerHTML).toBe(
+        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 dir="ltr"><span data-lexical-text="true">${text}</span></h2><p><br></p></div>`,
+      );
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
new file mode 100644
index 00000000000..e64c418803e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createQuoteNode, QuoteNode} from '@lexical/rich-text';
+import {$createRangeSelection, $getRoot, ParagraphNode} from 'lexical';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    quote: 'my-quote-class',
+  },
+});
+
+describe('LexicalQuoteNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('QuoteNode.constructor', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const quoteNode = $createQuoteNode();
+        expect(quoteNode.getType()).toBe('quote');
+        expect(quoteNode.getTextContent()).toBe('');
+      });
+      expect(() => $createQuoteNode()).toThrow();
+    });
+
+    test('QuoteNode.createDOM()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const quoteNode = $createQuoteNode();
+        expect(quoteNode.createDOM(editorConfig).outerHTML).toBe(
+          '<blockquote class="my-quote-class"></blockquote>',
+        );
+        expect(
+          quoteNode.createDOM({
+            namespace: '',
+            theme: {},
+          }).outerHTML,
+        ).toBe('<blockquote></blockquote>');
+      });
+    });
+
+    test('QuoteNode.updateDOM()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const quoteNode = $createQuoteNode();
+        const domElement = quoteNode.createDOM(editorConfig);
+        expect(domElement.outerHTML).toBe(
+          '<blockquote class="my-quote-class"></blockquote>',
+        );
+        const newQuoteNode = $createQuoteNode();
+        const result = newQuoteNode.updateDOM(quoteNode, domElement);
+        expect(result).toBe(false);
+        expect(domElement.outerHTML).toBe(
+          '<blockquote class="my-quote-class"></blockquote>',
+        );
+      });
+    });
+
+    test('QuoteNode.insertNewAfter()', async () => {
+      const {editor} = testEnv;
+      let quoteNode: QuoteNode;
+      await editor.update(() => {
+        const root = $getRoot();
+        quoteNode = $createQuoteNode();
+        root.append(quoteNode);
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><blockquote><br></blockquote></div>',
+      );
+      await editor.update(() => {
+        const result = quoteNode.insertNewAfter($createRangeSelection());
+        expect(result).toBeInstanceOf(ParagraphNode);
+        expect(result.getDirection()).toEqual(quoteNode.getDirection());
+      });
+      expect(testEnv.outerHTML).toBe(
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><blockquote><br></blockquote><p><br></p></div>',
+      );
+    });
+
+    test('$createQuoteNode()', async () => {
+      const {editor} = testEnv;
+      await editor.update(() => {
+        const quoteNode = $createQuoteNode();
+        const createdQuoteNode = $createQuoteNode();
+        expect(quoteNode.__type).toEqual(createdQuoteNode.__type);
+        expect(quoteNode.__parent).toEqual(createdQuoteNode.__parent);
+        expect(quoteNode.__key).not.toEqual(createdQuoteNode.__key);
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
new file mode 100644
index 00000000000..fd9162566a4
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -0,0 +1,1067 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  CommandPayloadType,
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  EditorConfig,
+  ElementFormatType,
+  LexicalCommand,
+  LexicalEditor,
+  LexicalNode,
+  NodeKey,
+  ParagraphNode,
+  PasteCommandType,
+  RangeSelection,
+  SerializedElementNode,
+  Spread,
+  TextFormatType,
+} from 'lexical';
+
+import {
+  $insertDataTransferForRichText,
+  copyToClipboard,
+} from '@lexical/clipboard';
+import {
+  $moveCharacter,
+  $shouldOverrideDefaultCharacterSelection,
+} from '@lexical/selection';
+import {
+  $findMatchingParent,
+  $getNearestBlockElementAncestorOrThrow,
+  addClassNamesToElement,
+  isHTMLElement,
+  mergeRegister,
+  objectKlassEquals,
+} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTabNode,
+  $getAdjacentNode,
+  $getNearestNodeFromDOMNode,
+  $getRoot,
+  $getSelection,
+  $insertNodes,
+  $isDecoratorNode,
+  $isElementNode,
+  $isNodeSelection,
+  $isRangeSelection,
+  $isRootNode,
+  $isTextNode,
+  $normalizeSelection__EXPERIMENTAL,
+  $selectAll,
+  $setSelection,
+  CLICK_COMMAND,
+  COMMAND_PRIORITY_EDITOR,
+  CONTROLLED_TEXT_INSERTION_COMMAND,
+  COPY_COMMAND,
+  createCommand,
+  CUT_COMMAND,
+  DELETE_CHARACTER_COMMAND,
+  DELETE_LINE_COMMAND,
+  DELETE_WORD_COMMAND,
+  DRAGOVER_COMMAND,
+  DRAGSTART_COMMAND,
+  DROP_COMMAND,
+  ElementNode,
+  FORMAT_ELEMENT_COMMAND,
+  FORMAT_TEXT_COMMAND,
+  INDENT_CONTENT_COMMAND,
+  INSERT_LINE_BREAK_COMMAND,
+  INSERT_PARAGRAPH_COMMAND,
+  INSERT_TAB_COMMAND,
+  isSelectionCapturedInDecoratorInput,
+  KEY_ARROW_DOWN_COMMAND,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_ARROW_UP_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND,
+  KEY_ENTER_COMMAND,
+  KEY_ESCAPE_COMMAND,
+  OUTDENT_CONTENT_COMMAND,
+  PASTE_COMMAND,
+  REMOVE_TEXT_COMMAND,
+  SELECT_ALL_COMMAND,
+} from 'lexical';
+import caretFromPoint from 'lexical/shared/caretFromPoint';
+import {
+  CAN_USE_BEFORE_INPUT,
+  IS_APPLE_WEBKIT,
+  IS_IOS,
+  IS_SAFARI,
+} from 'lexical/shared/environment';
+
+export type SerializedHeadingNode = Spread<
+  {
+    tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+  },
+  SerializedElementNode
+>;
+
+export const DRAG_DROP_PASTE: LexicalCommand<Array<File>> = createCommand(
+  'DRAG_DROP_PASTE_FILE',
+);
+
+export type SerializedQuoteNode = SerializedElementNode;
+
+/** @noInheritDoc */
+export class QuoteNode extends ElementNode {
+  static getType(): string {
+    return 'quote';
+  }
+
+  static clone(node: QuoteNode): QuoteNode {
+    return new QuoteNode(node.__key);
+  }
+
+  constructor(key?: NodeKey) {
+    super(key);
+  }
+
+  // View
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const element = document.createElement('blockquote');
+    addClassNamesToElement(element, config.theme.quote);
+    return element;
+  }
+  updateDOM(prevNode: QuoteNode, dom: HTMLElement): boolean {
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      blockquote: (node: Node) => ({
+        conversion: $convertBlockquoteElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const {element} = super.exportDOM(editor);
+
+    if (element && isHTMLElement(element)) {
+      if (this.isEmpty()) {
+        element.append(document.createElement('br'));
+      }
+
+      const formatType = this.getFormatType();
+      element.style.textAlign = formatType;
+
+      const direction = this.getDirection();
+      if (direction) {
+        element.dir = direction;
+      }
+    }
+
+    return {
+      element,
+    };
+  }
+
+  static importJSON(serializedNode: SerializedQuoteNode): QuoteNode {
+    const node = $createQuoteNode();
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedElementNode {
+    return {
+      ...super.exportJSON(),
+      type: 'quote',
+    };
+  }
+
+  // Mutation
+
+  insertNewAfter(_: RangeSelection, restoreSelection?: boolean): ParagraphNode {
+    const newBlock = $createParagraphNode();
+    const direction = this.getDirection();
+    newBlock.setDirection(direction);
+    this.insertAfter(newBlock, restoreSelection);
+    return newBlock;
+  }
+
+  collapseAtStart(): true {
+    const paragraph = $createParagraphNode();
+    const children = this.getChildren();
+    children.forEach((child) => paragraph.append(child));
+    this.replace(paragraph);
+    return true;
+  }
+
+  canMergeWhenEmpty(): true {
+    return true;
+  }
+}
+
+export function $createQuoteNode(): QuoteNode {
+  return $applyNodeReplacement(new QuoteNode());
+}
+
+export function $isQuoteNode(
+  node: LexicalNode | null | undefined,
+): node is QuoteNode {
+  return node instanceof QuoteNode;
+}
+
+export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+/** @noInheritDoc */
+export class HeadingNode extends ElementNode {
+  /** @internal */
+  __tag: HeadingTagType;
+
+  static getType(): string {
+    return 'heading';
+  }
+
+  static clone(node: HeadingNode): HeadingNode {
+    return new HeadingNode(node.__tag, node.__key);
+  }
+
+  constructor(tag: HeadingTagType, key?: NodeKey) {
+    super(key);
+    this.__tag = tag;
+  }
+
+  getTag(): HeadingTagType {
+    return this.__tag;
+  }
+
+  // View
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const tag = this.__tag;
+    const element = document.createElement(tag);
+    const theme = config.theme;
+    const classNames = theme.heading;
+    if (classNames !== undefined) {
+      const className = classNames[tag];
+      addClassNamesToElement(element, className);
+    }
+    return element;
+  }
+
+  updateDOM(prevNode: HeadingNode, dom: HTMLElement): boolean {
+    return false;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      h1: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      h2: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      h3: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      h4: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      h5: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      h6: (node: Node) => ({
+        conversion: $convertHeadingElement,
+        priority: 0,
+      }),
+      p: (node: Node) => {
+        // domNode is a <p> since we matched it by nodeName
+        const paragraph = node as HTMLParagraphElement;
+        const firstChild = paragraph.firstChild;
+        if (firstChild !== null && isGoogleDocsTitle(firstChild)) {
+          return {
+            conversion: () => ({node: null}),
+            priority: 3,
+          };
+        }
+        return null;
+      },
+      span: (node: Node) => {
+        if (isGoogleDocsTitle(node)) {
+          return {
+            conversion: (domNode: Node) => {
+              return {
+                node: $createHeadingNode('h1'),
+              };
+            },
+            priority: 3,
+          };
+        }
+        return null;
+      },
+    };
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const {element} = super.exportDOM(editor);
+
+    if (element && isHTMLElement(element)) {
+      if (this.isEmpty()) {
+        element.append(document.createElement('br'));
+      }
+
+      const formatType = this.getFormatType();
+      element.style.textAlign = formatType;
+
+      const direction = this.getDirection();
+      if (direction) {
+        element.dir = direction;
+      }
+    }
+
+    return {
+      element,
+    };
+  }
+
+  static importJSON(serializedNode: SerializedHeadingNode): HeadingNode {
+    const node = $createHeadingNode(serializedNode.tag);
+    node.setFormat(serializedNode.format);
+    node.setIndent(serializedNode.indent);
+    node.setDirection(serializedNode.direction);
+    return node;
+  }
+
+  exportJSON(): SerializedHeadingNode {
+    return {
+      ...super.exportJSON(),
+      tag: this.getTag(),
+      type: 'heading',
+      version: 1,
+    };
+  }
+
+  // Mutation
+  insertNewAfter(
+    selection?: RangeSelection,
+    restoreSelection = true,
+  ): ParagraphNode | HeadingNode {
+    const anchorOffet = selection ? selection.anchor.offset : 0;
+    const lastDesc = this.getLastDescendant();
+    const isAtEnd =
+      !lastDesc ||
+      (selection &&
+        selection.anchor.key === lastDesc.getKey() &&
+        anchorOffet === lastDesc.getTextContentSize());
+    const newElement =
+      isAtEnd || !selection
+        ? $createParagraphNode()
+        : $createHeadingNode(this.getTag());
+    const direction = this.getDirection();
+    newElement.setDirection(direction);
+    this.insertAfter(newElement, restoreSelection);
+    if (anchorOffet === 0 && !this.isEmpty() && selection) {
+      const paragraph = $createParagraphNode();
+      paragraph.select();
+      this.replace(paragraph, true);
+    }
+    return newElement;
+  }
+
+  collapseAtStart(): true {
+    const newElement = !this.isEmpty()
+      ? $createHeadingNode(this.getTag())
+      : $createParagraphNode();
+    const children = this.getChildren();
+    children.forEach((child) => newElement.append(child));
+    this.replace(newElement);
+    return true;
+  }
+
+  extractWithChild(): boolean {
+    return true;
+  }
+}
+
+function isGoogleDocsTitle(domNode: Node): boolean {
+  if (domNode.nodeName.toLowerCase() === 'span') {
+    return (domNode as HTMLSpanElement).style.fontSize === '26pt';
+  }
+  return false;
+}
+
+function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
+  const nodeName = element.nodeName.toLowerCase();
+  let node = null;
+  if (
+    nodeName === 'h1' ||
+    nodeName === 'h2' ||
+    nodeName === 'h3' ||
+    nodeName === 'h4' ||
+    nodeName === 'h5' ||
+    nodeName === 'h6'
+  ) {
+    node = $createHeadingNode(nodeName);
+    if (element.style !== null) {
+      node.setFormat(element.style.textAlign as ElementFormatType);
+    }
+  }
+  return {node};
+}
+
+function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
+  const node = $createQuoteNode();
+  if (element.style !== null) {
+    node.setFormat(element.style.textAlign as ElementFormatType);
+  }
+  return {node};
+}
+
+export function $createHeadingNode(headingTag: HeadingTagType): HeadingNode {
+  return $applyNodeReplacement(new HeadingNode(headingTag));
+}
+
+export function $isHeadingNode(
+  node: LexicalNode | null | undefined,
+): node is HeadingNode {
+  return node instanceof HeadingNode;
+}
+
+function onPasteForRichText(
+  event: CommandPayloadType<typeof PASTE_COMMAND>,
+  editor: LexicalEditor,
+): void {
+  event.preventDefault();
+  editor.update(
+    () => {
+      const selection = $getSelection();
+      const clipboardData =
+        objectKlassEquals(event, InputEvent) ||
+        objectKlassEquals(event, KeyboardEvent)
+          ? null
+          : (event as ClipboardEvent).clipboardData;
+      if (clipboardData != null && selection !== null) {
+        $insertDataTransferForRichText(clipboardData, selection, editor);
+      }
+    },
+    {
+      tag: 'paste',
+    },
+  );
+}
+
+async function onCutForRichText(
+  event: CommandPayloadType<typeof CUT_COMMAND>,
+  editor: LexicalEditor,
+): Promise<void> {
+  await copyToClipboard(
+    editor,
+    objectKlassEquals(event, ClipboardEvent) ? (event as ClipboardEvent) : null,
+  );
+  editor.update(() => {
+    const selection = $getSelection();
+    if ($isRangeSelection(selection)) {
+      selection.removeText();
+    } else if ($isNodeSelection(selection)) {
+      selection.getNodes().forEach((node) => node.remove());
+    }
+  });
+}
+
+// Clipboard may contain files that we aren't allowed to read. While the event is arguably useless,
+// in certain occasions, we want to know whether it was a file transfer, as opposed to text. We
+// control this with the first boolean flag.
+export function eventFiles(
+  event: DragEvent | PasteCommandType,
+): [boolean, Array<File>, boolean] {
+  let dataTransfer: null | DataTransfer = null;
+  if (objectKlassEquals(event, DragEvent)) {
+    dataTransfer = (event as DragEvent).dataTransfer;
+  } else if (objectKlassEquals(event, ClipboardEvent)) {
+    dataTransfer = (event as ClipboardEvent).clipboardData;
+  }
+
+  if (dataTransfer === null) {
+    return [false, [], false];
+  }
+
+  const types = dataTransfer.types;
+  const hasFiles = types.includes('Files');
+  const hasContent =
+    types.includes('text/html') || types.includes('text/plain');
+  return [hasFiles, Array.from(dataTransfer.files), hasContent];
+}
+
+function $handleIndentAndOutdent(
+  indentOrOutdent: (block: ElementNode) => void,
+): boolean {
+  const selection = $getSelection();
+  if (!$isRangeSelection(selection)) {
+    return false;
+  }
+  const alreadyHandled = new Set();
+  const nodes = selection.getNodes();
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    const key = node.getKey();
+    if (alreadyHandled.has(key)) {
+      continue;
+    }
+    const parentBlock = $findMatchingParent(
+      node,
+      (parentNode): parentNode is ElementNode =>
+        $isElementNode(parentNode) && !parentNode.isInline(),
+    );
+    if (parentBlock === null) {
+      continue;
+    }
+    const parentKey = parentBlock.getKey();
+    if (parentBlock.canIndent() && !alreadyHandled.has(parentKey)) {
+      alreadyHandled.add(parentKey);
+      indentOrOutdent(parentBlock);
+    }
+  }
+  return alreadyHandled.size > 0;
+}
+
+function $isTargetWithinDecorator(target: HTMLElement): boolean {
+  const node = $getNearestNodeFromDOMNode(target);
+  return $isDecoratorNode(node);
+}
+
+function $isSelectionAtEndOfRoot(selection: RangeSelection) {
+  const focus = selection.focus;
+  return focus.key === 'root' && focus.offset === $getRoot().getChildrenSize();
+}
+
+export function registerRichText(editor: LexicalEditor): () => void {
+  const removeListener = mergeRegister(
+    editor.registerCommand(
+      CLICK_COMMAND,
+      (payload) => {
+        const selection = $getSelection();
+        if ($isNodeSelection(selection)) {
+          selection.clear();
+          return true;
+        }
+        return false;
+      },
+      0,
+    ),
+    editor.registerCommand<boolean>(
+      DELETE_CHARACTER_COMMAND,
+      (isBackward) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.deleteCharacter(isBackward);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<boolean>(
+      DELETE_WORD_COMMAND,
+      (isBackward) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.deleteWord(isBackward);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<boolean>(
+      DELETE_LINE_COMMAND,
+      (isBackward) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.deleteLine(isBackward);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      CONTROLLED_TEXT_INSERTION_COMMAND,
+      (eventOrText) => {
+        const selection = $getSelection();
+
+        if (typeof eventOrText === 'string') {
+          if (selection !== null) {
+            selection.insertText(eventOrText);
+          }
+        } else {
+          if (selection === null) {
+            return false;
+          }
+
+          const dataTransfer = eventOrText.dataTransfer;
+          if (dataTransfer != null) {
+            $insertDataTransferForRichText(dataTransfer, selection, editor);
+          } else if ($isRangeSelection(selection)) {
+            const data = eventOrText.data;
+            if (data) {
+              selection.insertText(data);
+            }
+            return true;
+          }
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      REMOVE_TEXT_COMMAND,
+      () => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.removeText();
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<TextFormatType>(
+      FORMAT_TEXT_COMMAND,
+      (format) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.formatText(format);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<ElementFormatType>(
+      FORMAT_ELEMENT_COMMAND,
+      (format) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection) && !$isNodeSelection(selection)) {
+          return false;
+        }
+        const nodes = selection.getNodes();
+        for (const node of nodes) {
+          const element = $findMatchingParent(
+            node,
+            (parentNode): parentNode is ElementNode =>
+              $isElementNode(parentNode) && !parentNode.isInline(),
+          );
+          if (element !== null) {
+            element.setFormat(format);
+          }
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<boolean>(
+      INSERT_LINE_BREAK_COMMAND,
+      (selectStart) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.insertLineBreak(selectStart);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      INSERT_PARAGRAPH_COMMAND,
+      () => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        selection.insertParagraph();
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      INSERT_TAB_COMMAND,
+      () => {
+        $insertNodes([$createTabNode()]);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      INDENT_CONTENT_COMMAND,
+      () => {
+        return $handleIndentAndOutdent((block) => {
+          const indent = block.getIndent();
+          block.setIndent(indent + 1);
+        });
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      OUTDENT_CONTENT_COMMAND,
+      () => {
+        return $handleIndentAndOutdent((block) => {
+          const indent = block.getIndent();
+          if (indent > 0) {
+            block.setIndent(indent - 1);
+          }
+        });
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_UP_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if (
+          $isNodeSelection(selection) &&
+          !$isTargetWithinDecorator(event.target as HTMLElement)
+        ) {
+          // If selection is on a node, let's try and move selection
+          // back to being a range selection.
+          const nodes = selection.getNodes();
+          if (nodes.length > 0) {
+            nodes[0].selectPrevious();
+            return true;
+          }
+        } else if ($isRangeSelection(selection)) {
+          const possibleNode = $getAdjacentNode(selection.focus, true);
+          if (
+            !event.shiftKey &&
+            $isDecoratorNode(possibleNode) &&
+            !possibleNode.isIsolated() &&
+            !possibleNode.isInline()
+          ) {
+            possibleNode.selectPrevious();
+            event.preventDefault();
+            return true;
+          }
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_DOWN_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if ($isNodeSelection(selection)) {
+          // If selection is on a node, let's try and move selection
+          // back to being a range selection.
+          const nodes = selection.getNodes();
+          if (nodes.length > 0) {
+            nodes[0].selectNext(0, 0);
+            return true;
+          }
+        } else if ($isRangeSelection(selection)) {
+          if ($isSelectionAtEndOfRoot(selection)) {
+            event.preventDefault();
+            return true;
+          }
+          const possibleNode = $getAdjacentNode(selection.focus, false);
+          if (
+            !event.shiftKey &&
+            $isDecoratorNode(possibleNode) &&
+            !possibleNode.isIsolated() &&
+            !possibleNode.isInline()
+          ) {
+            possibleNode.selectNext();
+            event.preventDefault();
+            return true;
+          }
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_LEFT_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if ($isNodeSelection(selection)) {
+          // If selection is on a node, let's try and move selection
+          // back to being a range selection.
+          const nodes = selection.getNodes();
+          if (nodes.length > 0) {
+            event.preventDefault();
+            nodes[0].selectPrevious();
+            return true;
+          }
+        }
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        if ($shouldOverrideDefaultCharacterSelection(selection, true)) {
+          const isHoldingShift = event.shiftKey;
+          event.preventDefault();
+          $moveCharacter(selection, isHoldingShift, true);
+          return true;
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_RIGHT_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if (
+          $isNodeSelection(selection) &&
+          !$isTargetWithinDecorator(event.target as HTMLElement)
+        ) {
+          // If selection is on a node, let's try and move selection
+          // back to being a range selection.
+          const nodes = selection.getNodes();
+          if (nodes.length > 0) {
+            event.preventDefault();
+            nodes[0].selectNext(0, 0);
+            return true;
+          }
+        }
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        const isHoldingShift = event.shiftKey;
+        if ($shouldOverrideDefaultCharacterSelection(selection, false)) {
+          event.preventDefault();
+          $moveCharacter(selection, isHoldingShift, false);
+          return true;
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_BACKSPACE_COMMAND,
+      (event) => {
+        if ($isTargetWithinDecorator(event.target as HTMLElement)) {
+          return false;
+        }
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        event.preventDefault();
+        const {anchor} = selection;
+        const anchorNode = anchor.getNode();
+
+        if (
+          selection.isCollapsed() &&
+          anchor.offset === 0 &&
+          !$isRootNode(anchorNode)
+        ) {
+          const element = $getNearestBlockElementAncestorOrThrow(anchorNode);
+          if (element.getIndent() > 0) {
+            return editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined);
+          }
+        }
+        return editor.dispatchCommand(DELETE_CHARACTER_COMMAND, true);
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent>(
+      KEY_DELETE_COMMAND,
+      (event) => {
+        if ($isTargetWithinDecorator(event.target as HTMLElement)) {
+          return false;
+        }
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        event.preventDefault();
+        return editor.dispatchCommand(DELETE_CHARACTER_COMMAND, false);
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<KeyboardEvent | null>(
+      KEY_ENTER_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        if (event !== null) {
+          // If we have beforeinput, then we can avoid blocking
+          // the default behavior. This ensures that the iOS can
+          // intercept that we're actually inserting a paragraph,
+          // and autocomplete, autocapitalize etc work as intended.
+          // This can also cause a strange performance issue in
+          // Safari, where there is a noticeable pause due to
+          // preventing the key down of enter.
+          if (
+            (IS_IOS || IS_SAFARI || IS_APPLE_WEBKIT) &&
+            CAN_USE_BEFORE_INPUT
+          ) {
+            return false;
+          }
+          event.preventDefault();
+          if (event.shiftKey) {
+            return editor.dispatchCommand(INSERT_LINE_BREAK_COMMAND, false);
+          }
+        }
+        return editor.dispatchCommand(INSERT_PARAGRAPH_COMMAND, undefined);
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      KEY_ESCAPE_COMMAND,
+      () => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+        editor.blur();
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<DragEvent>(
+      DROP_COMMAND,
+      (event) => {
+        const [, files] = eventFiles(event);
+        if (files.length > 0) {
+          const x = event.clientX;
+          const y = event.clientY;
+          const eventRange = caretFromPoint(x, y);
+          if (eventRange !== null) {
+            const {offset: domOffset, node: domNode} = eventRange;
+            const node = $getNearestNodeFromDOMNode(domNode);
+            if (node !== null) {
+              const selection = $createRangeSelection();
+              if ($isTextNode(node)) {
+                selection.anchor.set(node.getKey(), domOffset, 'text');
+                selection.focus.set(node.getKey(), domOffset, 'text');
+              } else {
+                const parentKey = node.getParentOrThrow().getKey();
+                const offset = node.getIndexWithinParent() + 1;
+                selection.anchor.set(parentKey, offset, 'element');
+                selection.focus.set(parentKey, offset, 'element');
+              }
+              const normalizedSelection =
+                $normalizeSelection__EXPERIMENTAL(selection);
+              $setSelection(normalizedSelection);
+            }
+            editor.dispatchCommand(DRAG_DROP_PASTE, files);
+          }
+          event.preventDefault();
+          return true;
+        }
+
+        const selection = $getSelection();
+        if ($isRangeSelection(selection)) {
+          return true;
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<DragEvent>(
+      DRAGSTART_COMMAND,
+      (event) => {
+        const [isFileTransfer] = eventFiles(event);
+        const selection = $getSelection();
+        if (isFileTransfer && !$isRangeSelection(selection)) {
+          return false;
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand<DragEvent>(
+      DRAGOVER_COMMAND,
+      (event) => {
+        const [isFileTransfer] = eventFiles(event);
+        const selection = $getSelection();
+        if (isFileTransfer && !$isRangeSelection(selection)) {
+          return false;
+        }
+        const x = event.clientX;
+        const y = event.clientY;
+        const eventRange = caretFromPoint(x, y);
+        if (eventRange !== null) {
+          const node = $getNearestNodeFromDOMNode(eventRange.node);
+          if ($isDecoratorNode(node)) {
+            // Show browser caret as the user is dragging the media across the screen. Won't work
+            // for DecoratorNode nor it's relevant.
+            event.preventDefault();
+          }
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      SELECT_ALL_COMMAND,
+      () => {
+        $selectAll();
+
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      COPY_COMMAND,
+      (event) => {
+        copyToClipboard(
+          editor,
+          objectKlassEquals(event, ClipboardEvent)
+            ? (event as ClipboardEvent)
+            : null,
+        );
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      CUT_COMMAND,
+      (event) => {
+        onCutForRichText(event, editor);
+        return true;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+    editor.registerCommand(
+      PASTE_COMMAND,
+      (event) => {
+        const [, files, hasTextContent] = eventFiles(event);
+        if (files.length > 0 && !hasTextContent) {
+          editor.dispatchCommand(DRAG_DROP_PASTE, files);
+          return true;
+        }
+
+        // if inputs then paste within the input ignore creating a new node on paste event
+        if (isSelectionCapturedInDecoratorInput(event.target as Node)) {
+          return false;
+        }
+
+        const selection = $getSelection();
+        if (selection !== null) {
+          onPasteForRichText(event, editor);
+          return true;
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_EDITOR,
+    ),
+  );
+  return removeListener;
+}
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
new file mode 100644
index 00000000000..e6086783159
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
@@ -0,0 +1,3082 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createLinkNode} from '@lexical/link';
+import {$createListItemNode, $createListNode} from '@lexical/list';
+import {AutoFocusPlugin} from '@lexical/react/LexicalAutoFocusPlugin';
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {ContentEditable} from '@lexical/react/LexicalContentEditable';
+import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
+import {HistoryPlugin} from '@lexical/react/LexicalHistoryPlugin';
+import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
+import {$createHeadingNode} from '@lexical/rich-text';
+import {
+  $addNodeStyle,
+  $getSelectionStyleValueForProperty,
+  $patchStyleText,
+  $setBlocksType,
+} from '@lexical/selection';
+import {$createTableNodeWithDimensions} from '@lexical/table';
+import {
+  $createLineBreakNode,
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  $isElementNode,
+  $isRangeSelection,
+  $isTextNode,
+  $setSelection,
+  DecoratorNode,
+  ElementNode,
+  LexicalEditor,
+  LexicalNode,
+  ParagraphNode,
+  PointType,
+  type RangeSelection,
+  TextNode,
+} from 'lexical';
+import {
+  $assertRangeSelection,
+  $createTestDecoratorNode,
+  $createTestElementNode,
+  createTestEditor,
+  initializeClipboard,
+  invariant,
+  TestComposer,
+} from 'lexical/src/__tests__/utils';
+import {createRoot, Root} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+import {
+  $setAnchorPoint,
+  $setFocusPoint,
+  applySelectionInputs,
+  convertToSegmentedNode,
+  convertToTokenNode,
+  deleteBackward,
+  deleteWordBackward,
+  deleteWordForward,
+  formatBold,
+  formatItalic,
+  formatStrikeThrough,
+  formatUnderline,
+  getNodeFromPath,
+  insertParagraph,
+  insertSegmentedNode,
+  insertText,
+  insertTokenNode,
+  moveBackward,
+  moveEnd,
+  moveNativeSelection,
+  pastePlain,
+  printWhitespace,
+  redo,
+  setNativeSelectionWithPaths,
+  undo,
+} from '../utils';
+
+interface ExpectedSelection {
+  anchorPath: number[];
+  anchorOffset: number;
+  focusPath: number[];
+  focusOffset: number;
+}
+
+initializeClipboard();
+
+jest.mock('lexical/shared/environment', () => {
+  const originalModule = jest.requireActual('lexical/shared/environment');
+
+  return {...originalModule, IS_FIREFOX: true};
+});
+
+Range.prototype.getBoundingClientRect = function (): DOMRect {
+  const rect = {
+    bottom: 0,
+    height: 0,
+    left: 0,
+    right: 0,
+    top: 0,
+    width: 0,
+    x: 0,
+    y: 0,
+  };
+  return {
+    ...rect,
+    toJSON() {
+      return rect;
+    },
+  };
+};
+
+describe('LexicalSelection tests', () => {
+  let container: HTMLElement;
+  let reactRoot: Root;
+  let editor: LexicalEditor | null = null;
+
+  beforeEach(async () => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    reactRoot = createRoot(container);
+    await init();
+  });
+
+  afterEach(async () => {
+    // Ensure we are clearing out any React state and running effects with
+    // act
+    await ReactTestUtils.act(async () => {
+      reactRoot.unmount();
+      await Promise.resolve().then();
+    });
+    document.body.removeChild(container);
+  });
+
+  async function init() {
+    function TestBase() {
+      function TestPlugin() {
+        [editor] = useLexicalComposerContext();
+
+        return null;
+      }
+
+      return (
+        <TestComposer
+          config={{
+            nodes: [],
+            theme: {
+              code: 'editor-code',
+              heading: {
+                h1: 'editor-heading-h1',
+                h2: 'editor-heading-h2',
+                h3: 'editor-heading-h3',
+                h4: 'editor-heading-h4',
+                h5: 'editor-heading-h5',
+                h6: 'editor-heading-h6',
+              },
+              image: 'editor-image',
+              list: {
+                ol: 'editor-list-ol',
+                ul: 'editor-list-ul',
+              },
+              listitem: 'editor-listitem',
+              paragraph: 'editor-paragraph',
+              quote: 'editor-quote',
+              text: {
+                bold: 'editor-text-bold',
+                code: 'editor-text-code',
+                hashtag: 'editor-text-hashtag',
+                italic: 'editor-text-italic',
+                link: 'editor-text-link',
+                strikethrough: 'editor-text-strikethrough',
+                underline: 'editor-text-underline',
+                underlineStrikethrough: 'editor-text-underlineStrikethrough',
+              },
+            },
+          }}>
+          <RichTextPlugin
+            contentEditable={
+              // eslint-disable-next-line jsx-a11y/aria-role, @typescript-eslint/no-explicit-any
+              <ContentEditable role={null as any} spellCheck={null as any} />
+            }
+            placeholder={null}
+            ErrorBoundary={LexicalErrorBoundary}
+          />
+          <HistoryPlugin />
+          <TestPlugin />
+          <AutoFocusPlugin />
+        </TestComposer>
+      );
+    }
+
+    await ReactTestUtils.act(async () => {
+      reactRoot.render(<TestBase />);
+      await Promise.resolve().then();
+    });
+
+    await Promise.resolve().then();
+    // Focus first element
+    setNativeSelectionWithPaths(
+      editor!.getRootElement()!,
+      [0, 0],
+      0,
+      [0, 0],
+      0,
+    );
+  }
+
+  async function update(fn: () => void) {
+    await ReactTestUtils.act(async () => {
+      await editor!.update(fn);
+    });
+  }
+
+  test('Expect initial output to be a block with no text.', () => {
+    expect(container!.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><br></p></div>',
+    );
+  });
+
+  function assertSelection(
+    rootElement: HTMLElement,
+    expectedSelection: ExpectedSelection,
+  ) {
+    const actualSelection = window.getSelection()!;
+
+    expect(actualSelection.anchorNode).toBe(
+      getNodeFromPath(expectedSelection.anchorPath, rootElement),
+    );
+    expect(actualSelection.anchorOffset).toBe(expectedSelection.anchorOffset);
+    expect(actualSelection.focusNode).toBe(
+      getNodeFromPath(expectedSelection.focusPath, rootElement),
+    );
+    expect(actualSelection.focusOffset).toBe(expectedSelection.focusOffset);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const GRAPHEME_SCENARIOS = [
+    {
+      description: 'grapheme cluster',
+      // Hangul grapheme cluster.
+      // https://www.compart.com/en/unicode/U+AC01
+      grapheme: '\u1100\u1161\u11A8',
+    },
+    {
+      description: 'extended grapheme cluster',
+      // Tamil 'ni' grapheme cluster.
+      // http://unicode.org/reports/tr29/#Table_Sample_Grapheme_Clusters
+      grapheme: '\u0BA8\u0BBF',
+    },
+    {
+      description: 'tailored grapheme cluster',
+      // Devangari 'kshi' tailored grapheme cluster.
+      // http://unicode.org/reports/tr29/#Table_Sample_Grapheme_Clusters
+      grapheme: '\u0915\u094D\u0937\u093F',
+    },
+    {
+      description: 'Emoji sequence combined using zero-width joiners',
+      // https://emojipedia.org/family-woman-woman-girl-boy/
+      grapheme:
+        '\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66',
+    },
+    {
+      description: 'Emoji sequence with skin-tone modifier',
+      // https://emojipedia.org/clapping-hands-medium-skin-tone/
+      grapheme: '\uD83D\uDC4F\uD83C\uDFFD',
+    },
+  ];
+
+  const suite = [
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello</span></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatBold(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in bold',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<em class="editor-text-italic" data-lexical-text="true">Hello</em></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatItalic(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in italic',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold editor-text-italic" data-lexical-text="true">Hello</strong></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatItalic(),
+        formatBold(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in italic + bold',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span class="editor-text-underline" data-lexical-text="true">Hello</span></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatUnderline(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in underline',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span class="editor-text-strikethrough" data-lexical-text="true">Hello</span></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatStrikeThrough(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in strikethrough',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span class="editor-text-underlineStrikethrough" data-lexical-text="true">Hello</span></p></div>',
+      expectedSelection: {
+        anchorOffset: 5,
+        anchorPath: [0, 0, 0],
+        focusOffset: 5,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        formatUnderline(),
+        formatStrikeThrough(),
+        insertText('H'),
+        insertText('e'),
+        insertText('l'),
+        insertText('l'),
+        insertText('o'),
+      ],
+      name: 'Simple typing in underline + strikethrough',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">1246</span></p></div>',
+      expectedSelection: {
+        anchorOffset: 4,
+        anchorPath: [0, 0, 0],
+        focusOffset: 4,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [
+        insertText('1'),
+        insertText('2'),
+        insertText('3'),
+        deleteBackward(1),
+        insertText('4'),
+        insertText('5'),
+        deleteBackward(1),
+        insertText('6'),
+      ],
+      name: 'Deletion',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">Dominic Gannaway</span>' +
+        '</p></div>',
+      expectedSelection: {
+        anchorOffset: 16,
+        anchorPath: [0, 0, 0],
+        focusOffset: 16,
+        focusPath: [0, 0, 0],
+      },
+      inputs: [insertTokenNode('Dominic Gannaway')],
+      name: 'Creation of an token node',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">Dominic Gannaway</span>' +
+        '</p></div>',
+      expectedSelection: {
+        anchorOffset: 1,
+        anchorPath: [0],
+        focusOffset: 1,
+        focusPath: [0],
+      },
+      inputs: [
+        insertText('Dominic Gannaway'),
+        moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 16),
+        convertToTokenNode(),
+      ],
+      name: 'Convert text to an token node',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">Dominic Gannaway</span>' +
+        '</p></div>',
+      expectedSelection: {
+        anchorOffset: 1,
+        anchorPath: [0],
+        focusOffset: 1,
+        focusPath: [0],
+      },
+      inputs: [insertSegmentedNode('Dominic Gannaway')],
+      name: 'Creation of a segmented node',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">Dominic Gannaway</span>' +
+        '</p></div>',
+      expectedSelection: {
+        anchorOffset: 1,
+        anchorPath: [0],
+        focusOffset: 1,
+        focusPath: [0],
+      },
+      inputs: [
+        insertText('Dominic Gannaway'),
+        moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 16),
+        convertToSegmentedNode(),
+      ],
+      name: 'Convert text to a segmented node',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0],
+        focusOffset: 0,
+        focusPath: [2],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello world'),
+        insertParagraph(),
+        moveNativeSelection([0], 0, [2], 0),
+        formatBold(),
+      ],
+      name: 'Format selection that starts and ends on element and retain selection',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0],
+        focusOffset: 0,
+        focusPath: [3],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello'),
+        insertParagraph(),
+        insertText('world'),
+        insertParagraph(),
+        moveNativeSelection([0], 0, [3], 0),
+        formatBold(),
+      ],
+      name: 'Format multiline text selection that starts and ends on element and retain selection',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">He</span>' +
+        '<strong class="editor-text-bold" data-lexical-text="true">llo</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">wo</strong>' +
+        '<span data-lexical-text="true">rld</span>' +
+        '</p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0, 1, 0],
+        focusOffset: 2,
+        focusPath: [1, 0, 0],
+      },
+      inputs: [
+        insertText('Hello'),
+        insertParagraph(),
+        insertText('world'),
+        moveNativeSelection([0, 0, 0], 2, [1, 0, 0], 2),
+        formatBold(),
+      ],
+      name: 'Format multiline text selection that starts and ends within text',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<span data-lexical-text="true">Hello </span>' +
+        '<strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [1, 1, 0],
+        focusOffset: 0,
+        focusPath: [2],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello world'),
+        insertParagraph(),
+        moveNativeSelection([1, 0, 0], 6, [2], 0),
+        formatBold(),
+      ],
+      name: 'Format selection that starts on text and ends on element and retain selection',
+    },
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong>' +
+        '<span data-lexical-text="true"> world</span>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0],
+        focusOffset: 5,
+        focusPath: [1, 0, 0],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello world'),
+        insertParagraph(),
+        moveNativeSelection([0], 0, [1, 0, 0], 5),
+        formatBold(),
+      ],
+      name: 'Format selection that starts on element and ends on text and retain selection',
+    },
+
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong><strong class="editor-text-bold" data-lexical-text="true"> world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 2,
+        anchorPath: [1, 0, 0],
+        focusOffset: 0,
+        focusPath: [2],
+      },
+      inputs: [
+        insertParagraph(),
+        insertTokenNode('Hello'),
+        insertText(' world'),
+        insertParagraph(),
+        moveNativeSelection([1, 0, 0], 2, [2], 0),
+        formatBold(),
+      ],
+      name: 'Format selection that starts on middle of token node should format complete node',
+    },
+
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello </strong><strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0],
+        focusOffset: 2,
+        focusPath: [1, 1, 0],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello '),
+        insertTokenNode('world'),
+        insertParagraph(),
+        moveNativeSelection([0], 0, [1, 1, 0], 2),
+        formatBold(),
+      ],
+      name: 'Format selection that ends on middle of token node should format complete node',
+    },
+
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong><span data-lexical-text="true"> world</span>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 2,
+        anchorPath: [1, 0, 0],
+        focusOffset: 3,
+        focusPath: [1, 0, 0],
+      },
+      inputs: [
+        insertParagraph(),
+        insertTokenNode('Hello'),
+        insertText(' world'),
+        insertParagraph(),
+        moveNativeSelection([1, 0, 0], 2, [1, 0, 0], 3),
+        formatBold(),
+      ],
+      name: 'Format token node if it is the single one selected',
+    },
+
+    {
+      expectedHTML:
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
+        '<p class="editor-paragraph"><br></p>' +
+        '<p class="editor-paragraph" dir="ltr">' +
+        '<strong class="editor-text-bold" data-lexical-text="true">Hello </strong><strong class="editor-text-bold" data-lexical-text="true">beautiful</strong><strong class="editor-text-bold" data-lexical-text="true"> world</strong>' +
+        '</p>' +
+        '<p class="editor-paragraph"><br></p>' +
+        '</div>',
+      expectedSelection: {
+        anchorOffset: 0,
+        anchorPath: [0],
+        focusOffset: 0,
+        focusPath: [2],
+      },
+      inputs: [
+        insertParagraph(),
+        insertText('Hello '),
+        insertTokenNode('beautiful'),
+        insertText(' world'),
+        insertParagraph(),
+        moveNativeSelection([0], 0, [2], 0),
+        formatBold(),
+      ],
+      name: 'Format selection that contains a token node in the middle should format the token node',
+    },
+
+    // Tests need fixing:
+    // ...GRAPHEME_SCENARIOS.flatMap(({description, grapheme}) => [
+    //   {
+    //     name: `Delete backward eliminates entire ${description} (${grapheme})`,
+    //     inputs: [insertText(grapheme + grapheme), deleteBackward(1)],
+    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}</span></p></div>`,
+    //     expectedSelection: {
+    //       anchorPath: [0, 0, 0],
+    //       anchorOffset: grapheme.length,
+    //       focusPath: [0, 0, 0],
+    //       focusOffset: grapheme.length,
+    //     },
+    //     setup: emptySetup,
+    //   },
+    //   {
+    //     name: `Delete forward eliminates entire ${description} (${grapheme})`,
+    //     inputs: [
+    //       insertText(grapheme + grapheme),
+    //       moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
+    //       deleteForward(),
+    //     ],
+    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}</span></p></div>`,
+    //     expectedSelection: {
+    //       anchorPath: [0, 0, 0],
+    //       anchorOffset: 0,
+    //       focusPath: [0, 0, 0],
+    //       focusOffset: 0,
+    //     },
+    //     setup: emptySetup,
+    //   },
+    //   {
+    //     name: `Move backward skips over grapheme cluster (${grapheme})`,
+    //     inputs: [insertText(grapheme + grapheme), moveBackward(1)],
+    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}${grapheme}</span></p></div>`,
+    //     expectedSelection: {
+    //       anchorPath: [0, 0, 0],
+    //       anchorOffset: grapheme.length,
+    //       focusPath: [0, 0, 0],
+    //       focusOffset: grapheme.length,
+    //     },
+    //     setup: emptySetup,
+    //   },
+    //   {
+    //     name: `Move forward skips over grapheme cluster (${grapheme})`,
+    //     inputs: [
+    //       insertText(grapheme + grapheme),
+    //       moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
+    //       moveForward(),
+    //     ],
+    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}${grapheme}</span></p></div>`,
+    //     expectedSelection: {
+    //       anchorPath: [0, 0, 0],
+    //       anchorOffset: grapheme.length,
+    //       focusPath: [0, 0, 0],
+    //       focusOffset: grapheme.length,
+    //     },
+    //     setup: emptySetup,
+    //   },
+    // ]),
+    // {
+    //   name: 'Jump to beginning and insert',
+    //   inputs: [
+    //     insertText('1'),
+    //     insertText('1'),
+    //     insertText('2'),
+    //     insertText('3'),
+    //     moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
+    //     insertText('a'),
+    //     insertText('b'),
+    //     insertText('c'),
+    //     deleteForward(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">abc123</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 3,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 3,
+    //   },
+    // },
+    // {
+    //   name: 'Select and replace',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     insertText('lexical'),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello lexical!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 13,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 13,
+    //   },
+    // },
+    // {
+    //   name: 'Select and bold',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatBold(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<strong class="editor-text-bold" data-lexical-text="true">draft</strong><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and italic',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatItalic(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<em class="editor-text-italic" data-lexical-text="true">draft</em><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and bold + italic',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatBold(),
+    //     formatItalic(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<strong class="editor-text-bold editor-text-italic" data-lexical-text="true">draft</strong><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and underline',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatUnderline(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<span class="editor-text-underline" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and strikethrough',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatStrikeThrough(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<span class="editor-text-strikethrough" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and underline + strikethrough',
+    //   inputs: [
+    //     insertText('Hello draft!'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
+    //     formatUnderline(),
+    //     formatStrikeThrough(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
+    //     '<span class="editor-text-underlineStrikethrough" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 1, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 1, 0],
+    //     focusOffset: 5,
+    //   },
+    // },
+    // {
+    //   name: 'Select and replace all',
+    //   inputs: [
+    //     insertText('This is broken.'),
+    //     moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 15),
+    //     insertText('This works!'),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 11,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 11,
+    //   },
+    // },
+    // {
+    //   name: 'Select and delete',
+    //   inputs: [
+    //     insertText('A lion.'),
+    //     moveNativeSelection([0, 0, 0], 2, [0, 0, 0], 6),
+    //     deleteForward(),
+    //     insertText('duck'),
+    //     moveNativeSelection([0, 0, 0], 2, [0, 0, 0], 6),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A duck.</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 2,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 6,
+    //   },
+    // },
+    // {
+    //   name: 'Inserting a paragraph',
+    //   inputs: [insertParagraph()],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p>' +
+    //     '<p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [1, 0, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [1, 0, 0],
+    //     focusOffset: 0,
+    //   },
+    // },
+    // {
+    //   name: 'Inserting a paragraph and then removing it',
+    //   inputs: [insertParagraph(), deleteBackward(1)],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 0,
+    //   },
+    // },
+    // {
+    //   name: 'Inserting a paragraph part way through text',
+    //   inputs: [
+    //     insertText('Hello world'),
+    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 6),
+    //     insertParagraph(),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span></p>' +
+    //     '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">world</span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [1, 0, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [1, 0, 0],
+    //     focusOffset: 0,
+    //   },
+    // },
+    // {
+    //   name: 'Inserting two paragraphs and then deleting via selection',
+    //   inputs: [
+    //     insertText('123'),
+    //     insertParagraph(),
+    //     insertText('456'),
+    //     moveNativeSelection([0, 0, 0], 0, [1, 0, 0], 3),
+    //     deleteBackward(1),
+    //   ],
+    //   expectedHTML:
+    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
+    //   expectedSelection: {
+    //     anchorPath: [0, 0, 0],
+    //     anchorOffset: 0,
+    //     focusPath: [0, 0, 0],
+    //     focusOffset: 0,
+    //   },
+    // },
+    ...[
+      {
+        whitespaceCharacter: ' ',
+        whitespaceName: 'space',
+      },
+      {
+        whitespaceCharacter: '\u00a0',
+        whitespaceName: 'non-breaking space',
+      },
+      {
+        whitespaceCharacter: '\u2000',
+        whitespaceName: 'en quad',
+      },
+      {
+        whitespaceCharacter: '\u2001',
+        whitespaceName: 'em quad',
+      },
+      {
+        whitespaceCharacter: '\u2002',
+        whitespaceName: 'en space',
+      },
+      {
+        whitespaceCharacter: '\u2003',
+        whitespaceName: 'em space',
+      },
+      {
+        whitespaceCharacter: '\u2004',
+        whitespaceName: 'three-per-em space',
+      },
+      {
+        whitespaceCharacter: '\u2005',
+        whitespaceName: 'four-per-em space',
+      },
+      {
+        whitespaceCharacter: '\u2006',
+        whitespaceName: 'six-per-em space',
+      },
+      {
+        whitespaceCharacter: '\u2007',
+        whitespaceName: 'figure space',
+      },
+      {
+        whitespaceCharacter: '\u2008',
+        whitespaceName: 'punctuation space',
+      },
+      {
+        whitespaceCharacter: '\u2009',
+        whitespaceName: 'thin space',
+      },
+      {
+        whitespaceCharacter: '\u200A',
+        whitespaceName: 'hair space',
+      },
+    ].flatMap(({whitespaceCharacter, whitespaceName}) => [
+      {
+        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello${printWhitespace(
+          whitespaceCharacter,
+        )}</span></p></div>`,
+        expectedSelection: {
+          anchorOffset: 6,
+          anchorPath: [0, 0, 0],
+          focusOffset: 6,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText(`Hello${whitespaceCharacter}world`),
+          deleteWordBackward(1),
+        ],
+        name: `Type two words separated by a ${whitespaceName}, delete word backward from end`,
+      },
+      {
+        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">${printWhitespace(
+          whitespaceCharacter,
+        )}world</span></p></div>`,
+        expectedSelection: {
+          anchorOffset: 0,
+          anchorPath: [0, 0, 0],
+          focusOffset: 0,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText(`Hello${whitespaceCharacter}world`),
+          moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
+          deleteWordForward(1),
+        ],
+        name: `Type two words separated by a ${whitespaceName}, delete word forward from beginning`,
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello</span></p></div>',
+        expectedSelection: {
+          anchorOffset: 5,
+          anchorPath: [0, 0, 0],
+          focusOffset: 5,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText(`Hello${whitespaceCharacter}world`),
+          moveNativeSelection([0, 0, 0], 5, [0, 0, 0], 5),
+          deleteWordForward(1),
+        ],
+        name: `Type two words separated by a ${whitespaceName}, delete word forward from beginning of preceding whitespace`,
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">world</span></p></div>',
+        expectedSelection: {
+          anchorOffset: 0,
+          anchorPath: [0, 0, 0],
+          focusOffset: 0,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText(`Hello${whitespaceCharacter}world`),
+          moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 6),
+          deleteWordBackward(1),
+        ],
+        name: `Type two words separated by a ${whitespaceName}, delete word backward from end of trailing whitespace`,
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello world</span></p></div>',
+        expectedSelection: {
+          anchorOffset: 11,
+          anchorPath: [0, 0, 0],
+          focusOffset: 11,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [insertText('Hello world'), deleteWordBackward(1), undo(1)],
+        name: `Type a word, delete it and undo the deletion`,
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span></p></div>',
+        expectedSelection: {
+          anchorOffset: 6,
+          anchorPath: [0, 0, 0],
+          focusOffset: 6,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText('Hello world'),
+          deleteWordBackward(1),
+          undo(1),
+          redo(1),
+        ],
+        name: `Type a word, delete it and undo the deletion`,
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+          '<span data-lexical-text="true">this is weird test</span></p></div>',
+        expectedSelection: {
+          anchorOffset: 0,
+          anchorPath: [0, 0, 0],
+          focusOffset: 0,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          insertText('this is weird test'),
+          moveNativeSelection([0, 0, 0], 14, [0, 0, 0], 14),
+          moveBackward(14),
+        ],
+        name: 'Type a sentence, move the caret to the middle and move with the arrows to the start',
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+          '<span data-lexical-text="true">Hello </span>' +
+          '<span data-lexical-text="true">Bob</span>' +
+          '</p></div>',
+        expectedSelection: {
+          anchorOffset: 3,
+          anchorPath: [0, 1, 0],
+          focusOffset: 3,
+          focusPath: [0, 1, 0],
+        },
+        inputs: [
+          insertText('Hello '),
+          insertTokenNode('Bob'),
+          moveBackward(1),
+          moveBackward(1),
+          moveEnd(),
+        ],
+        name: 'Type a text and token text, move the caret to the end of the first text',
+      },
+      {
+        expectedHTML:
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">ABD</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">EFG</span></p></div>',
+        expectedSelection: {
+          anchorOffset: 3,
+          anchorPath: [0, 0, 0],
+          focusOffset: 3,
+          focusPath: [0, 0, 0],
+        },
+        inputs: [
+          pastePlain('ABD\tEFG'),
+          moveBackward(5),
+          insertText('C'),
+          moveBackward(1),
+          deleteWordForward(1),
+        ],
+        name: 'Paste text, move selection and delete word forward',
+      },
+    ]),
+  ];
+
+  suite.forEach((testUnit, i) => {
+    const name = testUnit.name || 'Test case';
+
+    test(name + ` (#${i + 1})`, async () => {
+      await applySelectionInputs(testUnit.inputs, update, editor!);
+
+      // Validate HTML matches
+      expect(container.innerHTML).toBe(testUnit.expectedHTML);
+
+      // Validate selection matches
+      const rootElement = editor!.getRootElement()!;
+      const expectedSelection = testUnit.expectedSelection;
+
+      assertSelection(rootElement, expectedSelection);
+    });
+  });
+
+  test('insert text one selected node element selection', async () => {
+    await ReactTestUtils.act(async () => {
+      await editor!.update(() => {
+        const root = $getRoot();
+
+        const paragraph = root.getFirstChild<ParagraphNode>()!;
+
+        const elementNode = $createTestElementNode();
+        const text = $createTextNode('foo');
+
+        paragraph.append(elementNode);
+        elementNode.append(text);
+
+        const selection = $createRangeSelection();
+        selection.anchor.set(text.__key, 0, 'text');
+        selection.focus.set(paragraph.__key, 1, 'element');
+
+        selection.insertText('');
+
+        expect(root.getTextContent()).toBe('');
+      });
+    });
+  });
+
+  test('getNodes resolves nested block nodes', async () => {
+    await ReactTestUtils.act(async () => {
+      await editor!.update(() => {
+        const root = $getRoot();
+
+        const paragraph = root.getFirstChild<ParagraphNode>()!;
+
+        const elementNode = $createTestElementNode();
+        const text = $createTextNode();
+
+        paragraph.append(elementNode);
+        elementNode.append(text);
+
+        const selectedNodes = $getSelection()!.getNodes();
+
+        expect(selectedNodes.length).toBe(1);
+        expect(selectedNodes[0].getKey()).toBe(text.getKey());
+      });
+    });
+  });
+
+  describe('Block selection moves when new nodes are inserted', () => {
+    const baseCases: {
+      name: string;
+      anchorOffset: number;
+      focusOffset: number;
+      fn: (
+        paragraph: ElementNode,
+        text: TextNode,
+      ) => {
+        expectedAnchor: LexicalNode;
+        expectedAnchorOffset: number;
+        expectedFocus: LexicalNode;
+        expectedFocusOffset: number;
+      };
+      fnBefore?: (paragraph: ElementNode, text: TextNode) => void;
+      invertSelection?: true;
+      only?: true;
+    }[] = [
+      // Collapsed selection on end; add/remove/replace beginning
+      {
+        anchorOffset: 2,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('2');
+          text.insertBefore(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 3,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 2,
+        name: 'insertBefore - Collapsed selection on end; add beginning',
+      },
+      {
+        anchorOffset: 2,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('2');
+          text.insertAfter(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 3,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 2,
+        name: 'insertAfter - Collapsed selection on end; add beginning',
+      },
+      {
+        anchorOffset: 2,
+        fn: (paragraph, text) => {
+          text.splitText(1);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 3,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 2,
+        name: 'splitText - Collapsed selection on end; add beginning',
+      },
+      {
+        anchorOffset: 1,
+        fn: (paragraph, text) => {
+          text.remove();
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 0,
+          };
+        },
+        focusOffset: 1,
+        name: 'remove - Collapsed selection on end; add beginning',
+      },
+      {
+        anchorOffset: 1,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('replacement');
+          text.replace(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 1,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 1,
+          };
+        },
+        focusOffset: 1,
+        name: 'replace - Collapsed selection on end; replace beginning',
+      },
+      // All selected; add/remove/replace on beginning
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('2');
+          text.insertBefore(newText);
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 2,
+        name: 'insertBefore - All selected; add on beginning',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText) => {
+          const [, text] = originalText.splitText(1);
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 2,
+        name: 'splitNodes - All selected; add on beginning',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          text.remove();
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 0,
+          };
+        },
+        focusOffset: 1,
+        name: 'remove - All selected; remove on beginning',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('replacement');
+          text.replace(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 1,
+          };
+        },
+        focusOffset: 1,
+        name: 'replace - All selected; replace on beginning',
+      },
+      // Selection beginning; add/remove/replace on end
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          const lastChild = paragraph.getLastChild()!;
+          const newText = $createTextNode('2');
+          lastChild.insertBefore(newText);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: originalText1,
+            expectedFocusOffset: 0,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 1,
+        name: 'insertBefore - Selection beginning; add on end',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const lastChild = paragraph.getLastChild()!;
+          const newText = $createTextNode('2');
+          lastChild.insertAfter(newText);
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 1,
+          };
+        },
+        focusOffset: 1,
+        name: 'insertAfter - Selection beginning; add on end',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          const [, text] = originalText1.splitText(1);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: text,
+            expectedFocusOffset: 0,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 1,
+        name: 'splitText - Selection beginning; add on end',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const lastChild = paragraph.getLastChild()!;
+          lastChild.remove();
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: text,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 1,
+        name: 'remove - Selection beginning; remove on end',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('replacement');
+          const lastChild = paragraph.getLastChild()!;
+          lastChild.replace(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 1,
+          };
+        },
+        focusOffset: 1,
+        name: 'replace - Selection beginning; replace on end',
+      },
+      // All selected; add/remove/replace in end offset [1, 2] -> [1, N, 2]
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const lastChild = paragraph.getLastChild()!;
+          const newText = $createTextNode('2');
+          lastChild.insertBefore(newText);
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 2,
+          };
+        },
+        focusOffset: 1,
+        name: 'insertBefore - All selected; add in end offset',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, text) => {
+          const newText = $createTextNode('2');
+          text.insertAfter(newText);
+
+          return {
+            expectedAnchor: text,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 2,
+          };
+        },
+        focusOffset: 1,
+        name: 'insertAfter - All selected; add in end offset',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          const [, text] = originalText1.splitText(1);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: text,
+            expectedFocusOffset: 0,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 1,
+        name: 'splitText - All selected; add in end offset',
+      },
+      {
+        anchorOffset: 1,
+        fn: (paragraph, originalText1) => {
+          const lastChild = paragraph.getLastChild()!;
+          lastChild.remove();
+
+          return {
+            expectedAnchor: originalText1,
+            expectedAnchorOffset: 0,
+            expectedFocus: originalText1,
+            expectedFocusOffset: 3,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'remove - All selected; remove in end offset',
+      },
+      {
+        anchorOffset: 1,
+        fn: (paragraph, originalText1) => {
+          const newText = $createTextNode('replacement');
+          const lastChild = paragraph.getLastChild()!;
+          lastChild.replace(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 1,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 2,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'replace - All selected; replace in end offset',
+      },
+      // All selected; add/remove/replace in middle [1, 2, 3] -> [1, 2, N, 3]
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          const lastChild = paragraph.getLastChild()!;
+          const newText = $createTextNode('2');
+          lastChild.insertBefore(newText);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'insertBefore - All selected; add in middle',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          const newText = $createTextNode('2');
+          originalText1.insertAfter(newText);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'insertAfter - All selected; add in middle',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          originalText1.splitText(1);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 3,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'splitText - All selected; add in middle',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = originalText1.getPreviousSibling()!;
+          originalText1.remove();
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 1,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'remove - All selected; remove in middle',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const newText = $createTextNode('replacement');
+          originalText1.replace(newText);
+
+          return {
+            expectedAnchor: paragraph,
+            expectedAnchorOffset: 0,
+            expectedFocus: paragraph,
+            expectedFocusOffset: 2,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          originalText1.insertBefore(originalText2);
+        },
+        focusOffset: 2,
+        name: 'replace - All selected; replace in middle',
+      },
+      // Edge cases
+      {
+        anchorOffset: 3,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = paragraph.getLastChild()!;
+          const newText = $createTextNode('new');
+          originalText1.insertBefore(newText);
+
+          return {
+            expectedAnchor: originalText2,
+            expectedAnchorOffset: 'bar'.length,
+            expectedFocus: originalText2,
+            expectedFocusOffset: 'bar'.length,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          paragraph.append(originalText2);
+        },
+        focusOffset: 3,
+        name: "Selection resolves to the end of text node when it's at the end (1)",
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          const originalText2 = paragraph.getLastChild()!;
+          const newText = $createTextNode('new');
+          originalText1.insertBefore(newText);
+
+          return {
+            expectedAnchor: originalText1,
+            expectedAnchorOffset: 0,
+            expectedFocus: originalText2,
+            expectedFocusOffset: 'bar'.length,
+          };
+        },
+        fnBefore: (paragraph, originalText1) => {
+          const originalText2 = $createTextNode('bar');
+          paragraph.append(originalText2);
+        },
+        focusOffset: 3,
+        name: "Selection resolves to the end of text node when it's at the end (2)",
+      },
+      {
+        anchorOffset: 1,
+        fn: (paragraph, originalText1) => {
+          originalText1.getNextSibling()!.remove();
+
+          return {
+            expectedAnchor: originalText1,
+            expectedAnchorOffset: 3,
+            expectedFocus: originalText1,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 1,
+        name: 'remove - Remove with collapsed selection at offset #4221',
+      },
+      {
+        anchorOffset: 0,
+        fn: (paragraph, originalText1) => {
+          originalText1.getNextSibling()!.remove();
+
+          return {
+            expectedAnchor: originalText1,
+            expectedAnchorOffset: 0,
+            expectedFocus: originalText1,
+            expectedFocusOffset: 3,
+          };
+        },
+        focusOffset: 1,
+        name: 'remove - Remove with non-collapsed selection at offset',
+      },
+    ];
+    baseCases
+      .flatMap((testCase) => {
+        // Test inverse selection
+        const inverse = {
+          ...testCase,
+          anchorOffset: testCase.focusOffset,
+          focusOffset: testCase.anchorOffset,
+          invertSelection: true,
+          name: testCase.name + ' (inverse selection)',
+        };
+        return [testCase, inverse];
+      })
+      .forEach(
+        ({
+          name,
+          fn,
+          fnBefore = () => {
+            return;
+          },
+          anchorOffset,
+          focusOffset,
+          invertSelection,
+          only,
+        }) => {
+          // eslint-disable-next-line no-only-tests/no-only-tests
+          const test_ = only === true ? test.only : test;
+          test_(name, async () => {
+            await ReactTestUtils.act(async () => {
+              await editor!.update(() => {
+                const root = $getRoot();
+
+                const paragraph = root.getFirstChild<ParagraphNode>()!;
+                const textNode = $createTextNode('foo');
+                // Note: line break can't be selected by the DOM
+                const linebreak = $createLineBreakNode();
+
+                const selection = $getSelection();
+
+                if (!$isRangeSelection(selection)) {
+                  return;
+                }
+
+                const anchor = selection.anchor;
+                const focus = selection.focus;
+
+                paragraph.append(textNode, linebreak);
+
+                fnBefore(paragraph, textNode);
+
+                anchor.set(paragraph.getKey(), anchorOffset, 'element');
+                focus.set(paragraph.getKey(), focusOffset, 'element');
+
+                const {
+                  expectedAnchor,
+                  expectedAnchorOffset,
+                  expectedFocus,
+                  expectedFocusOffset,
+                } = fn(paragraph, textNode);
+
+                if (invertSelection !== true) {
+                  expect(selection.anchor.key).toBe(expectedAnchor.__key);
+                  expect(selection.anchor.offset).toBe(expectedAnchorOffset);
+                  expect(selection.focus.key).toBe(expectedFocus.__key);
+                  expect(selection.focus.offset).toBe(expectedFocusOffset);
+                } else {
+                  expect(selection.anchor.key).toBe(expectedFocus.__key);
+                  expect(selection.anchor.offset).toBe(expectedFocusOffset);
+                  expect(selection.focus.key).toBe(expectedAnchor.__key);
+                  expect(selection.focus.offset).toBe(expectedAnchorOffset);
+                }
+              });
+            });
+          });
+        },
+      );
+  });
+
+  describe('Selection correctly resolves to a sibling ElementNode when a node is removed', () => {
+    test('', async () => {
+      await ReactTestUtils.act(async () => {
+        await editor!.update(() => {
+          const root = $getRoot();
+
+          const listNode = $createListNode('bullet');
+          const listItemNode = $createListItemNode();
+          const paragraph = $createParagraphNode();
+
+          root.append(listNode);
+
+          listNode.append(listItemNode);
+          listItemNode.select();
+          listNode.insertAfter(paragraph);
+          listItemNode.remove();
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          expect(selection.anchor.getNode().__type).toBe('paragraph');
+          expect(selection.focus.getNode().__type).toBe('paragraph');
+        });
+      });
+    });
+  });
+
+  describe('Selection correctly resolves to a sibling ElementNode when a selected node child is removed', () => {
+    test('', async () => {
+      await ReactTestUtils.act(async () => {
+        let paragraphNodeKey: string;
+        await editor!.update(() => {
+          const root = $getRoot();
+
+          const paragraphNode = $createParagraphNode();
+          paragraphNodeKey = paragraphNode.__key;
+          const listNode = $createListNode('number');
+          const listItemNode1 = $createListItemNode();
+          const textNode1 = $createTextNode('foo');
+          const listItemNode2 = $createListItemNode();
+          const listNode2 = $createListNode('number');
+          const listItemNode2x1 = $createListItemNode();
+
+          listNode.append(listItemNode1, listItemNode2);
+          listItemNode1.append(textNode1);
+          listItemNode2.append(listNode2);
+          listNode2.append(listItemNode2x1);
+          root.append(paragraphNode, listNode);
+
+          listItemNode2.select();
+
+          listNode.remove();
+        });
+        await editor!.getEditorState().read(() => {
+          const selection = $assertRangeSelection($getSelection());
+          expect(selection.anchor.key).toBe(paragraphNodeKey);
+          expect(selection.focus.key).toBe(paragraphNodeKey);
+        });
+      });
+    });
+  });
+
+  describe('Selection correctly resolves to a sibling ElementNode that has multiple children with the correct offset when a node is removed', () => {
+    test('', async () => {
+      await ReactTestUtils.act(async () => {
+        await editor!.update(() => {
+          // Arrange
+          // Root
+          //  |- Paragraph
+          //    |- Link
+          //      |- Text
+          //      |- LineBreak
+          //      |- Text
+          //    |- Text
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          const link = $createLinkNode('bullet');
+          const textOne = $createTextNode('Hello');
+          const br = $createLineBreakNode();
+          const textTwo = $createTextNode('world');
+          const textThree = $createTextNode(' ');
+
+          root.append(paragraph);
+          link.append(textOne);
+          link.append(br);
+          link.append(textTwo);
+
+          paragraph.append(link);
+          paragraph.append(textThree);
+
+          textThree.select();
+          // Act
+          textThree.remove();
+          // Assert
+          const expectedKey = link.getKey();
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          const {anchor, focus} = selection;
+
+          expect(anchor.getNode().getKey()).toBe(expectedKey);
+          expect(focus.getNode().getKey()).toBe(expectedKey);
+          expect(anchor.offset).toBe(3);
+          expect(focus.offset).toBe(3);
+        });
+      });
+    });
+  });
+
+  test('isBackward', async () => {
+    await ReactTestUtils.act(async () => {
+      await editor!.update(() => {
+        const root = $getRoot();
+
+        const paragraph = root.getFirstChild<ParagraphNode>()!;
+        const paragraphKey = paragraph.getKey();
+        const textNode = $createTextNode('foo');
+        const textNodeKey = textNode.getKey();
+        // Note: line break can't be selected by the DOM
+        const linebreak = $createLineBreakNode();
+
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        const anchor = selection.anchor;
+        const focus = selection.focus;
+        paragraph.append(textNode, linebreak);
+        anchor.set(textNodeKey, 0, 'text');
+        focus.set(textNodeKey, 0, 'text');
+
+        expect(selection.isBackward()).toBe(false);
+
+        anchor.set(paragraphKey, 1, 'element');
+        focus.set(paragraphKey, 1, 'element');
+
+        expect(selection.isBackward()).toBe(false);
+
+        anchor.set(paragraphKey, 0, 'element');
+        focus.set(paragraphKey, 1, 'element');
+
+        expect(selection.isBackward()).toBe(false);
+
+        anchor.set(paragraphKey, 1, 'element');
+        focus.set(paragraphKey, 0, 'element');
+
+        expect(selection.isBackward()).toBe(true);
+      });
+    });
+  });
+
+  describe('Decorator text content for selection', () => {
+    const baseCases: {
+      name: string;
+      fn: (opts: {
+        textNode1: TextNode;
+        textNode2: TextNode;
+        decorator: DecoratorNode<unknown>;
+        paragraph: ParagraphNode;
+        anchor: PointType;
+        focus: PointType;
+      }) => string;
+      invertSelection?: true;
+    }[] = [
+      {
+        fn: ({textNode1, anchor, focus}) => {
+          anchor.set(textNode1.getKey(), 1, 'text');
+          focus.set(textNode1.getKey(), 1, 'text');
+
+          return '';
+        },
+        name: 'Not included if cursor right before it',
+      },
+      {
+        fn: ({textNode2, anchor, focus}) => {
+          anchor.set(textNode2.getKey(), 0, 'text');
+          focus.set(textNode2.getKey(), 0, 'text');
+
+          return '';
+        },
+        name: 'Not included if cursor right after it',
+      },
+      {
+        fn: ({textNode1, textNode2, decorator, anchor, focus}) => {
+          anchor.set(textNode1.getKey(), 1, 'text');
+          focus.set(textNode2.getKey(), 0, 'text');
+
+          return decorator.getTextContent();
+        },
+        name: 'Included if decorator is selected within text',
+      },
+      {
+        fn: ({textNode1, textNode2, decorator, anchor, focus}) => {
+          anchor.set(textNode1.getKey(), 0, 'text');
+          focus.set(textNode2.getKey(), 0, 'text');
+
+          return textNode1.getTextContent() + decorator.getTextContent();
+        },
+        name: 'Included if decorator is selected with another node before it',
+      },
+      {
+        fn: ({textNode1, textNode2, decorator, anchor, focus}) => {
+          anchor.set(textNode1.getKey(), 1, 'text');
+          focus.set(textNode2.getKey(), 1, 'text');
+
+          return decorator.getTextContent() + textNode2.getTextContent();
+        },
+        name: 'Included if decorator is selected with another node after it',
+      },
+      {
+        fn: ({paragraph, textNode1, textNode2, decorator, anchor, focus}) => {
+          textNode1.remove();
+          textNode2.remove();
+          anchor.set(paragraph.getKey(), 0, 'element');
+          focus.set(paragraph.getKey(), 1, 'element');
+
+          return decorator.getTextContent();
+        },
+        name: 'Included if decorator is selected as the only node',
+      },
+    ];
+    baseCases
+      .flatMap((testCase) => {
+        const inverse = {
+          ...testCase,
+          invertSelection: true,
+          name: testCase.name + ' (inverse selection)',
+        };
+
+        return [testCase, inverse];
+      })
+      .forEach(({name, fn, invertSelection}) => {
+        it(name, async () => {
+          await ReactTestUtils.act(async () => {
+            await editor!.update(() => {
+              const root = $getRoot();
+
+              const paragraph = root.getFirstChild<ParagraphNode>()!;
+              const textNode1 = $createTextNode('1');
+              const textNode2 = $createTextNode('2');
+              const decorator = $createTestDecoratorNode();
+
+              paragraph.append(textNode1, decorator, textNode2);
+
+              const selection = $getSelection();
+
+              if (!$isRangeSelection(selection)) {
+                return;
+              }
+
+              const expectedTextContent = fn({
+                anchor: invertSelection ? selection.focus : selection.anchor,
+                decorator,
+                focus: invertSelection ? selection.anchor : selection.focus,
+                paragraph,
+                textNode1,
+                textNode2,
+              });
+
+              expect(selection.getTextContent()).toBe(expectedTextContent);
+            });
+          });
+        });
+      });
+  });
+
+  describe('insertParagraph', () => {
+    test('three text nodes at offset 0 on third node', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('Hello ');
+        const text2 = $createTextNode('awesome');
+
+        text2.toggleFormat('bold');
+
+        const text3 = $createTextNode(' world');
+
+        paragraph.append(text, text2, text3);
+        root.append(paragraph);
+
+        $setAnchorPoint({
+          key: text3.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: text3.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        selection.insertParagraph();
+      });
+
+      expect(element.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome</strong></p><p dir="ltr"><span data-lexical-text="true"> world</span></p>',
+      );
+    });
+
+    test('four text nodes at offset 0 on third node', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('Hello ');
+        const text2 = $createTextNode('awesome ');
+
+        text2.toggleFormat('bold');
+
+        const text3 = $createTextNode('beautiful');
+        const text4 = $createTextNode(' world');
+
+        text4.toggleFormat('bold');
+
+        paragraph.append(text, text2, text3, text4);
+        root.append(paragraph);
+
+        $setAnchorPoint({
+          key: text3.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: text3.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        selection.insertParagraph();
+      });
+
+      expect(element.innerHTML).toBe(
+        '<p dir="ltr"><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome </strong></p><p dir="ltr"><span data-lexical-text="true">beautiful</span><strong data-lexical-text="true"> world</strong></p>',
+      );
+    });
+
+    it('adjust offset for inline elements text formatting', async () => {
+      await init();
+
+      await ReactTestUtils.act(async () => {
+        await editor!.update(() => {
+          const root = $getRoot();
+
+          const text1 = $createTextNode('--');
+          const text2 = $createTextNode('abc');
+          const text3 = $createTextNode('--');
+
+          root.append(
+            $createParagraphNode().append(
+              text1,
+              $createLinkNode('https://lexical.dev').append(text2),
+              text3,
+            ),
+          );
+
+          $setAnchorPoint({
+            key: text1.getKey(),
+            offset: 2,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text3.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.formatText('bold');
+
+          expect(text2.hasFormat('bold')).toBe(true);
+        });
+      });
+    });
+  });
+
+  describe('Node.replace', () => {
+    let text1: TextNode,
+      text2: TextNode,
+      text3: TextNode,
+      paragraph: ParagraphNode,
+      testEditor: LexicalEditor;
+
+    beforeEach(async () => {
+      testEditor = createTestEditor();
+
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+
+        paragraph = $createParagraphNode();
+        text1 = $createTextNode('Hello ');
+        text2 = $createTextNode('awesome');
+
+        text2.toggleFormat('bold');
+
+        text3 = $createTextNode(' world');
+
+        paragraph.append(text1, text2, text3);
+        root.append(paragraph);
+      });
+    });
+    [
+      {
+        fn: () => {
+          text2.select(1, 1);
+          text2.replace($createTestDecoratorNode());
+
+          return {
+            key: text3.__key,
+            offset: 0,
+          };
+        },
+        name: 'moves selection to to next text node if replacing with decorator',
+      },
+      {
+        fn: () => {
+          text3.replace($createTestDecoratorNode());
+          text2.select(1, 1);
+          text2.replace($createTestDecoratorNode());
+
+          return {
+            key: paragraph.__key,
+            offset: 2,
+          };
+        },
+        name: 'moves selection to parent if next sibling is not a text node',
+      },
+    ].forEach((testCase) => {
+      test(testCase.name, async () => {
+        await testEditor.update(() => {
+          const {key, offset} = testCase.fn();
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          expect(selection.anchor.key).toBe(key);
+          expect(selection.anchor.offset).toBe(offset);
+          expect(selection.focus.key).toBe(key);
+          expect(selection.focus.offset).toBe(offset);
+        });
+      });
+    });
+  });
+
+  describe('Testing that $getStyleObjectFromRawCSS handles unformatted css text ', () => {
+    test('', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const textNode = $createTextNode('Hello, World!');
+        textNode.setStyle(
+          '   font-family  : Arial  ;  color    :   red   ;top     : 50px',
+        );
+        $addNodeStyle(textNode);
+        paragraph.append(textNode);
+        root.append(paragraph);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        selection.insertParagraph();
+        $setAnchorPoint({
+          key: textNode.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: textNode.getKey(),
+          offset: 10,
+          type: 'text',
+        });
+
+        const cssFontFamilyValue = $getSelectionStyleValueForProperty(
+          selection,
+          'font-family',
+          '',
+        );
+        expect(cssFontFamilyValue).toBe('Arial');
+
+        const cssColorValue = $getSelectionStyleValueForProperty(
+          selection,
+          'color',
+          '',
+        );
+        expect(cssColorValue).toBe('red');
+
+        const cssTopValue = $getSelectionStyleValueForProperty(
+          selection,
+          'top',
+          '',
+        );
+        expect(cssTopValue).toBe('50px');
+      });
+    });
+  });
+
+  describe('Testing that getStyleObjectFromRawCSS handles values with colons', () => {
+    test('', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const textNode = $createTextNode('Hello, World!');
+        textNode.setStyle(
+          'font-family: double:prefix:Arial; color: color:white; font-size: 30px',
+        );
+        $addNodeStyle(textNode);
+        paragraph.append(textNode);
+        root.append(paragraph);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        selection.insertParagraph();
+        $setAnchorPoint({
+          key: textNode.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: textNode.getKey(),
+          offset: 10,
+          type: 'text',
+        });
+
+        const cssFontFamilyValue = $getSelectionStyleValueForProperty(
+          selection,
+          'font-family',
+          '',
+        );
+        expect(cssFontFamilyValue).toBe('double:prefix:Arial');
+
+        const cssColorValue = $getSelectionStyleValueForProperty(
+          selection,
+          'color',
+          '',
+        );
+        expect(cssColorValue).toBe('color:white');
+
+        const cssFontSizeValue = $getSelectionStyleValueForProperty(
+          selection,
+          'font-size',
+          '',
+        );
+        expect(cssFontSizeValue).toBe('30px');
+      });
+    });
+  });
+
+  describe('$patchStyle', () => {
+    it('should patch the style with the new style object', async () => {
+      await ReactTestUtils.act(async () => {
+        await editor!.update(() => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          const textNode = $createTextNode('Hello, World!');
+          textNode.setStyle('font-family: serif; color: red;');
+          $addNodeStyle(textNode);
+          paragraph.append(textNode);
+          root.append(paragraph);
+
+          const selection = $createRangeSelection();
+          $setSelection(selection);
+          selection.insertParagraph();
+          $setAnchorPoint({
+            key: textNode.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: textNode.getKey(),
+            offset: 10,
+            type: 'text',
+          });
+
+          const newStyle = {
+            color: 'blue',
+            'font-family': 'Arial',
+          };
+
+          $patchStyleText(selection, newStyle);
+
+          const cssFontFamilyValue = $getSelectionStyleValueForProperty(
+            selection,
+            'font-family',
+            '',
+          );
+          expect(cssFontFamilyValue).toBe('Arial');
+
+          const cssColorValue = $getSelectionStyleValueForProperty(
+            selection,
+            'color',
+            '',
+          );
+          expect(cssColorValue).toBe('blue');
+        });
+      });
+    });
+
+    it('should patch the style with property function', async () => {
+      await ReactTestUtils.act(async () => {
+        await editor!.update(() => {
+          const currentColor = 'red';
+          const nextColor = 'blue';
+
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          const textNode = $createTextNode('Hello, World!');
+          textNode.setStyle(`color: ${currentColor};`);
+          $addNodeStyle(textNode);
+          paragraph.append(textNode);
+          root.append(paragraph);
+
+          const selection = $createRangeSelection();
+          $setSelection(selection);
+          selection.insertParagraph();
+          $setAnchorPoint({
+            key: textNode.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: textNode.getKey(),
+            offset: 10,
+            type: 'text',
+          });
+
+          const newStyle = {
+            color: jest.fn(
+              (current: string | null, target: LexicalNode | RangeSelection) =>
+                nextColor,
+            ),
+          };
+
+          $patchStyleText(selection, newStyle);
+
+          const cssColorValue = $getSelectionStyleValueForProperty(
+            selection,
+            'color',
+            '',
+          );
+
+          expect(cssColorValue).toBe(nextColor);
+          expect(newStyle.color).toHaveBeenCalledTimes(1);
+
+          const lastCall = newStyle.color.mock.lastCall!;
+          expect(lastCall[0]).toBe(currentColor);
+          // @ts-ignore - It expected to be a LexicalNode
+          expect($isTextNode(lastCall[1])).toBeTruthy();
+        });
+      });
+    });
+  });
+
+  describe('$setBlocksType', () => {
+    test('Collapsed selection in text', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const text1 = $createTextNode('text 1');
+        const paragraph2 = $createParagraphNode();
+        const text2 = $createTextNode('text 2');
+        root.append(paragraph1, paragraph2);
+        paragraph1.append(text1);
+        paragraph2.append(text2);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1.__key,
+          offset: text1.__text.length,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text1.__key,
+          offset: text1.__text.length,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren[0].__type).toBe('heading');
+        expect(rootChildren[1].__type).toBe('paragraph');
+        expect(rootChildren.length).toBe(2);
+      });
+    });
+
+    test('Collapsed selection in element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+        root.append(paragraph1, paragraph2);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: 'root',
+          offset: 0,
+          type: 'element',
+        });
+        $setFocusPoint({
+          key: 'root',
+          offset: 0,
+          type: 'element',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren[0].__type).toBe('heading');
+        expect(rootChildren[1].__type).toBe('paragraph');
+        expect(rootChildren.length).toBe(2);
+      });
+    });
+
+    test('Two elements, same top-element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const text1 = $createTextNode('text 1');
+        const paragraph2 = $createParagraphNode();
+        const text2 = $createTextNode('text 2');
+        root.append(paragraph1, paragraph2);
+        paragraph1.append(text1);
+        paragraph2.append(text2);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1.__key,
+          offset: 0,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text2.__key,
+          offset: text1.__text.length,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren[0].__type).toBe('heading');
+        expect(rootChildren[1].__type).toBe('heading');
+        expect(rootChildren.length).toBe(2);
+      });
+    });
+
+    test('Two empty elements, same top-element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+        root.append(paragraph1, paragraph2);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: paragraph1.__key,
+          offset: 0,
+          type: 'element',
+        });
+        $setFocusPoint({
+          key: paragraph2.__key,
+          offset: 0,
+          type: 'element',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren[0].__type).toBe('heading');
+        expect(rootChildren[1].__type).toBe('heading');
+        expect(rootChildren.length).toBe(2);
+        const sel = $getSelection()!;
+        expect(sel.getNodes().length).toBe(2);
+      });
+    });
+
+    test('Two elements, same top-element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph1 = $createParagraphNode();
+        const text1 = $createTextNode('text 1');
+        const paragraph2 = $createParagraphNode();
+        const text2 = $createTextNode('text 2');
+        root.append(paragraph1, paragraph2);
+        paragraph1.append(text1);
+        paragraph2.append(text2);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1.__key,
+          offset: 0,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text2.__key,
+          offset: text1.__text.length,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren[0].__type).toBe('heading');
+        expect(rootChildren[1].__type).toBe('heading');
+        expect(rootChildren.length).toBe(2);
+      });
+    });
+
+    test('Collapsed in element inside top-element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const table = $createTableNodeWithDimensions(1, 1);
+        const row = table.getFirstChild();
+        invariant($isElementNode(row));
+        const column = row.getFirstChild();
+        invariant($isElementNode(column));
+        const paragraph = column.getFirstChild();
+        invariant($isElementNode(paragraph));
+        if (paragraph.getFirstChild()) {
+          paragraph.getFirstChild()!.remove();
+        }
+        root.append(table);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: paragraph.__key,
+          offset: 0,
+          type: 'element',
+        });
+        $setFocusPoint({
+          key: paragraph.__key,
+          offset: 0,
+          type: 'element',
+        });
+
+        const columnChildrenPrev = column.getChildren();
+        expect(columnChildrenPrev[0].__type).toBe('paragraph');
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const columnChildrenAfter = column.getChildren();
+        expect(columnChildrenAfter[0].__type).toBe('heading');
+        expect(columnChildrenAfter.length).toBe(1);
+      });
+    });
+
+    test('Collapsed in text inside top-element', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const table = $createTableNodeWithDimensions(1, 1);
+        const row = table.getFirstChild();
+        invariant($isElementNode(row));
+        const column = row.getFirstChild();
+        invariant($isElementNode(column));
+        const paragraph = column.getFirstChild();
+        invariant($isElementNode(paragraph));
+        const text = $createTextNode('foo');
+        root.append(table);
+        paragraph.append(text);
+
+        const selectionz = $createRangeSelection();
+        $setSelection(selectionz);
+        $setAnchorPoint({
+          key: text.__key,
+          offset: text.__text.length,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text.__key,
+          offset: text.__text.length,
+          type: 'text',
+        });
+        const selection = $getSelection() as RangeSelection;
+
+        const columnChildrenPrev = column.getChildren();
+        expect(columnChildrenPrev[0].__type).toBe('paragraph');
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const columnChildrenAfter = column.getChildren();
+        expect(columnChildrenAfter[0].__type).toBe('heading');
+        expect(columnChildrenAfter.length).toBe(1);
+      });
+    });
+
+    test('Full editor selection with a mix of top-elements', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+
+        const paragraph1 = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+        const text1 = $createTextNode();
+        const text2 = $createTextNode();
+        paragraph1.append(text1);
+        paragraph2.append(text2);
+        root.append(paragraph1, paragraph2);
+
+        const table = $createTableNodeWithDimensions(1, 2);
+        const row = table.getFirstChild();
+        invariant($isElementNode(row));
+        const columns = row.getChildren();
+        root.append(table);
+
+        const column1 = columns[0];
+        const paragraph3 = $createParagraphNode();
+        const paragraph4 = $createParagraphNode();
+        const text3 = $createTextNode();
+        const text4 = $createTextNode();
+        paragraph1.append(text3);
+        paragraph2.append(text4);
+        invariant($isElementNode(column1));
+        column1.append(paragraph3, paragraph4);
+
+        const column2 = columns[1];
+        const paragraph5 = $createParagraphNode();
+        const paragraph6 = $createParagraphNode();
+        invariant($isElementNode(column2));
+        column2.append(paragraph5, paragraph6);
+
+        const paragraph7 = $createParagraphNode();
+        root.append(paragraph7);
+
+        const selectionz = $createRangeSelection();
+        $setSelection(selectionz);
+        $setAnchorPoint({
+          key: paragraph1.__key,
+          offset: 0,
+          type: 'element',
+        });
+        $setFocusPoint({
+          key: paragraph7.__key,
+          offset: 0,
+          type: 'element',
+        });
+        const selection = $getSelection() as RangeSelection;
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+        expect(JSON.stringify(testEditor._pendingEditorState?.toJSON())).toBe(
+          '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"children":[{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"root","version":1}}',
+        );
+      });
+    });
+
+    test('Paragraph with links to heading with links', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text1 = $createTextNode('Links: ');
+        const text2 = $createTextNode('link1');
+        const text3 = $createTextNode('link2');
+        root.append(
+          paragraph.append(
+            text1,
+            $createLinkNode('https://lexical.dev').append(text2),
+            $createTextNode(' '),
+            $createLinkNode('https://playground.lexical.dev').append(text3),
+          ),
+        );
+
+        const paragraphChildrenKeys = [...paragraph.getChildrenKeys()];
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text3.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+
+        const rootChildren = root.getChildren();
+        expect(rootChildren.length).toBe(1);
+        invariant($isElementNode(rootChildren[0]));
+        expect(rootChildren[0].getType()).toBe('heading');
+        expect(rootChildren[0].getChildrenKeys()).toEqual(
+          paragraphChildrenKeys,
+        );
+      });
+    });
+
+    test('Nested list', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const ul1 = $createListNode('bullet');
+        const text1 = $createTextNode('1');
+        const li1 = $createListItemNode().append(text1);
+        const li1_wrapper = $createListItemNode();
+        const ul2 = $createListNode('bullet');
+        const text1_1 = $createTextNode('1.1');
+        const li1_1 = $createListItemNode().append(text1_1);
+        ul1.append(li1, li1_wrapper);
+        li1_wrapper.append(ul2);
+        ul2.append(li1_1);
+        root.append(ul1);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text1_1.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+      });
+      expect(element.innerHTML).toStrictEqual(
+        `<h1><span data-lexical-text="true">1</span></h1><h1 style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">1.1</span></h1>`,
+      );
+    });
+
+    test('Nested list with listItem twice indented from his father', async () => {
+      const testEditor = createTestEditor();
+      const element = document.createElement('div');
+      testEditor.setRootElement(element);
+
+      await testEditor.update(() => {
+        const root = $getRoot();
+        const ul1 = $createListNode('bullet');
+        const li1_wrapper = $createListItemNode();
+        const ul2 = $createListNode('bullet');
+        const text1_1 = $createTextNode('1.1');
+        const li1_1 = $createListItemNode().append(text1_1);
+        ul1.append(li1_wrapper);
+        li1_wrapper.append(ul2);
+        ul2.append(li1_1);
+        root.append(ul1);
+
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        $setAnchorPoint({
+          key: text1_1.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+        $setFocusPoint({
+          key: text1_1.getKey(),
+          offset: 1,
+          type: 'text',
+        });
+
+        $setBlocksType(selection, () => {
+          return $createHeadingNode('h1');
+        });
+      });
+      expect(element.innerHTML).toStrictEqual(
+        `<h1 style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">1.1</span></h1>`,
+      );
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
new file mode 100644
index 00000000000..01390ed7180
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
@@ -0,0 +1,3173 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createLinkNode} from '@lexical/link';
+import {$createHeadingNode, $isHeadingNode} from '@lexical/rich-text';
+import {
+  $getSelectionStyleValueForProperty,
+  $patchStyleText,
+} from '@lexical/selection';
+import {
+  $createLineBreakNode,
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTextNode,
+  $getNodeByKey,
+  $getRoot,
+  $getSelection,
+  $insertNodes,
+  $isElementNode,
+  $isParagraphNode,
+  $isRangeSelection,
+  $setSelection,
+  ElementNode,
+  LexicalEditor,
+  LexicalNode,
+  ParagraphNode,
+  RangeSelection,
+  TextModeType,
+  TextNode,
+} from 'lexical';
+import {
+  $createTestDecoratorNode,
+  $createTestElementNode,
+  $createTestShadowRootNode,
+  createTestEditor,
+  createTestHeadlessEditor,
+  invariant,
+  TestDecoratorNode,
+} from 'lexical/src/__tests__/utils';
+
+import {$setAnchorPoint, $setFocusPoint} from '../utils';
+
+Range.prototype.getBoundingClientRect = function (): DOMRect {
+  const rect = {
+    bottom: 0,
+    height: 0,
+    left: 0,
+    right: 0,
+    top: 0,
+    width: 0,
+    x: 0,
+    y: 0,
+  };
+  return {
+    ...rect,
+    toJSON() {
+      return rect;
+    },
+  };
+};
+
+function $createParagraphWithNodes(
+  editor: LexicalEditor,
+  nodes: {text: string; key: string; mergeable?: boolean}[],
+) {
+  const paragraph = $createParagraphNode();
+  const nodeMap = editor._pendingEditorState!._nodeMap;
+
+  for (let i = 0; i < nodes.length; i++) {
+    const {text, key, mergeable} = nodes[i];
+    const textNode = new TextNode(text, key);
+    nodeMap.set(key, textNode);
+
+    if (!mergeable) {
+      textNode.toggleUnmergeable();
+    }
+
+    paragraph.append(textNode);
+  }
+
+  return paragraph;
+}
+
+describe('LexicalSelectionHelpers tests', () => {
+  describe('Collapsed', () => {
+    test('Can handle a text point', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, node: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          });
+          const selection = $getSelection();
+          cb(selection as RangeSelection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection, state) => {
+        expect(selection.getNodes()).toEqual([$getNodeByKey('a')]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('');
+      });
+
+      // insertText
+      setupTestCase((selection, state) => {
+        selection.insertText('Test');
+
+        expect($getNodeByKey('a')!.getTextContent()).toBe('Testa');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertNodes
+      setupTestCase((selection, element) => {
+        selection.insertNodes([$createTextNode('foo')]);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 3,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 3,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection) => {
+        selection.insertParagraph();
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+
+        expect(element.getFirstChild()!.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(
+          element.getFirstChild()!.getNextSibling()!.getTextContent(),
+        ).toBe('a');
+      });
+
+      // Extract selection
+      setupTestCase((selection, state) => {
+        expect(selection.extract()).toEqual([$getNodeByKey('a')]);
+      });
+    });
+
+    test('Has correct text point after removal after merge', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: 'a',
+          },
+          {
+            key: 'bb',
+            mergeable: true,
+            text: 'bb',
+          },
+          {
+            key: 'empty',
+            mergeable: true,
+            text: '',
+          },
+          {
+            key: 'cc',
+            mergeable: true,
+            text: 'cc',
+          },
+          {
+            key: 'd',
+            mergeable: true,
+            text: 'd',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: 'bb',
+          offset: 1,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: 'cc',
+          offset: 1,
+          type: 'text',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Has correct text point after removal after merge (2)', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: 'a',
+          },
+          {
+            key: 'empty',
+            mergeable: true,
+            text: '',
+          },
+          {
+            key: 'b',
+            mergeable: true,
+            text: 'b',
+          },
+          {
+            key: 'c',
+            mergeable: true,
+            text: 'c',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: 'a',
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: 'c',
+          offset: 1,
+          type: 'text',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 3,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Has correct text point adjust to element point after removal of a single empty text node', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element: ParagraphNode;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: '',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: 'a',
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: 'a',
+          offset: 0,
+          type: 'text',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+    });
+
+    test('Has correct element point after removal of an empty text node in a group #1', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: '',
+          },
+          {
+            key: 'b',
+            mergeable: false,
+            text: 'b',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: element.getKey(),
+          offset: 2,
+          type: 'element',
+        });
+
+        $setFocusPoint({
+          key: element.getKey(),
+          offset: 2,
+          type: 'element',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 1,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 1,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Has correct element point after removal of an empty text node in a group #2', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: '',
+          },
+          {
+            key: 'b',
+            mergeable: false,
+            text: 'b',
+          },
+          {
+            key: 'c',
+            mergeable: true,
+            text: 'c',
+          },
+          {
+            key: 'd',
+            mergeable: true,
+            text: 'd',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: element.getKey(),
+          offset: 4,
+          type: 'element',
+        });
+
+        $setFocusPoint({
+          key: element.getKey(),
+          offset: 4,
+          type: 'element',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'c',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'c',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Has correct text point after removal of an empty text node in a group #3', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: '',
+          },
+          {
+            key: 'b',
+            mergeable: false,
+            text: 'b',
+          },
+          {
+            key: 'c',
+            mergeable: true,
+            text: 'c',
+          },
+          {
+            key: 'd',
+            mergeable: true,
+            text: 'd',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: 'd',
+          offset: 1,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: 'd',
+          offset: 1,
+          type: 'text',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'c',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'c',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Can handle an element point on empty element', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, []);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+          const selection = $getSelection();
+          cb(selection as RangeSelection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection, element) => {
+        expect(selection.getNodes()).toEqual([element]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('');
+      });
+
+      // insertText
+      setupTestCase((selection, element) => {
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection, element) => {
+        selection.insertParagraph();
+        const nextElement = element.getNextSibling()!;
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: nextElement.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: nextElement.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, element) => {
+        expect(selection.extract()).toEqual([element]);
+      });
+    });
+
+    test('Can handle a start element point', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+          const selection = $getSelection();
+          cb(selection as RangeSelection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection, state) => {
+        expect(selection.getNodes()).toEqual([$getNodeByKey('a')]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('');
+      });
+
+      // insertText
+      setupTestCase((selection, element) => {
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection, element) => {
+        selection.insertParagraph();
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, element) => {
+        expect(selection.extract()).toEqual([$getNodeByKey('a')]);
+      });
+    });
+
+    test('Can handle an end element point', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: element.getKey(),
+            offset: 3,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: element.getKey(),
+            offset: 3,
+            type: 'element',
+          });
+          const selection = $getSelection();
+          cb(selection as RangeSelection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection, state) => {
+        expect(selection.getNodes()).toEqual([$getNodeByKey('c')]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('');
+      });
+
+      // insertText
+      setupTestCase((selection, element) => {
+        selection.insertText('Test');
+        const lastChild = element.getLastChild()!;
+
+        expect(lastChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: lastChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: lastChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection, element) => {
+        selection.insertParagraph();
+        const nextSibling = element.getNextSibling()!;
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: nextSibling.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: nextSibling.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak();
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 4,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 4,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+        const lastChild = element.getLastChild()!;
+
+        expect(lastChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: lastChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: lastChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, element) => {
+        expect(selection.extract()).toEqual([$getNodeByKey('c')]);
+      });
+    });
+
+    test('Has correct element point after merge from middle', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: 'a',
+          },
+          {
+            key: 'b',
+            mergeable: true,
+            text: 'b',
+          },
+          {
+            key: 'c',
+            mergeable: true,
+            text: 'c',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: element.getKey(),
+          offset: 2,
+          type: 'element',
+        });
+
+        $setFocusPoint({
+          key: element.getKey(),
+          offset: 2,
+          type: 'element',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 2,
+            type: 'text',
+          }),
+        );
+      });
+    });
+
+    test('Has correct element point after merge from end', async () => {
+      const editor = createTestEditor();
+
+      const domElement = document.createElement('div');
+      let element;
+
+      editor.setRootElement(domElement);
+
+      editor.update(() => {
+        const root = $getRoot();
+
+        element = $createParagraphWithNodes(editor, [
+          {
+            key: 'a',
+            mergeable: true,
+            text: 'a',
+          },
+          {
+            key: 'b',
+            mergeable: true,
+            text: 'b',
+          },
+          {
+            key: 'c',
+            mergeable: true,
+            text: 'c',
+          },
+        ]);
+
+        root.append(element);
+
+        $setAnchorPoint({
+          key: element.getKey(),
+          offset: 3,
+          type: 'element',
+        });
+
+        $setFocusPoint({
+          key: element.getKey(),
+          offset: 3,
+          type: 'element',
+        });
+      });
+
+      await Promise.resolve().then();
+
+      editor.getEditorState().read(() => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 3,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 3,
+            type: 'text',
+          }),
+        );
+      });
+    });
+  });
+
+  describe('Simple range', () => {
+    test('Can handle multiple text points', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: 'a',
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: 'b',
+            offset: 0,
+            type: 'text',
+          });
+          const selection = $getSelection();
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          cb(selection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection, state) => {
+        expect(selection.getNodes()).toEqual([
+          $getNodeByKey('a'),
+          $getNodeByKey('b'),
+        ]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('a');
+      });
+
+      // insertText
+      setupTestCase((selection, state) => {
+        selection.insertText('Test');
+
+        expect($getNodeByKey('a')!.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'a',
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertNodes
+      setupTestCase((selection, element) => {
+        selection.insertNodes([$createTextNode('foo')]);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 3,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 3,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection) => {
+        selection.insertParagraph();
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+
+        expect(element.getFirstChild()!.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getFirstChild()!.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, state) => {
+        expect(selection.extract()).toEqual([{...$getNodeByKey('a')}]);
+      });
+    });
+
+    test('Can handle multiple element points', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: element.getKey(),
+            offset: 1,
+            type: 'element',
+          });
+          const selection = $getSelection();
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          cb(selection, element);
+        });
+      };
+
+      // getNodes
+      setupTestCase((selection) => {
+        expect(selection.getNodes()).toEqual([$getNodeByKey('a')]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('a');
+      });
+
+      // insertText
+      setupTestCase((selection, element) => {
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection, element) => {
+        selection.insertParagraph();
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: 'b',
+            offset: 0,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, element) => {
+        const firstChild = element.getFirstChild();
+
+        expect(selection.extract()).toEqual([firstChild]);
+      });
+    });
+
+    test('Can handle a mix of text and element points', () => {
+      const setupTestCase = (
+        cb: (selection: RangeSelection, el: ElementNode) => void,
+      ) => {
+        const editor = createTestEditor();
+
+        editor.update(() => {
+          const root = $getRoot();
+
+          const element = $createParagraphWithNodes(editor, [
+            {
+              key: 'a',
+              mergeable: false,
+              text: 'a',
+            },
+            {
+              key: 'b',
+              mergeable: false,
+              text: 'b',
+            },
+            {
+              key: 'c',
+              mergeable: false,
+              text: 'c',
+            },
+          ]);
+
+          root.append(element);
+
+          $setAnchorPoint({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: 'c',
+            offset: 1,
+            type: 'text',
+          });
+          const selection = $getSelection();
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          cb(selection, element);
+        });
+      };
+
+      // isBefore
+      setupTestCase((selection, state) => {
+        expect(selection.anchor.isBefore(selection.focus)).toEqual(true);
+      });
+
+      // getNodes
+      setupTestCase((selection, state) => {
+        expect(selection.getNodes()).toEqual([
+          $getNodeByKey('a'),
+          $getNodeByKey('b'),
+          $getNodeByKey('c'),
+        ]);
+      });
+
+      // getTextContent
+      setupTestCase((selection) => {
+        expect(selection.getTextContent()).toEqual('abc');
+      });
+
+      // insertText
+      setupTestCase((selection, element) => {
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // insertParagraph
+      setupTestCase((selection, element) => {
+        selection.insertParagraph();
+        const nextElement = element.getNextSibling()!;
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: nextElement.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: nextElement.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // insertLineBreak
+      setupTestCase((selection, element) => {
+        selection.insertLineBreak(true);
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: element.getKey(),
+            offset: 0,
+            type: 'element',
+          }),
+        );
+      });
+
+      // Format text
+      setupTestCase((selection, element) => {
+        selection.formatText('bold');
+        selection.insertText('Test');
+        const firstChild = element.getFirstChild()!;
+
+        expect(firstChild.getTextContent()).toBe('Test');
+
+        expect(selection.anchor).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+
+        expect(selection.focus).toEqual(
+          expect.objectContaining({
+            key: firstChild.getKey(),
+            offset: 4,
+            type: 'text',
+          }),
+        );
+      });
+
+      // Extract selection
+      setupTestCase((selection, element) => {
+        expect(selection.extract()).toEqual([
+          $getNodeByKey('a'),
+          $getNodeByKey('b'),
+          $getNodeByKey('c'),
+        ]);
+      });
+    });
+  });
+
+  describe('can insert non-element nodes correctly', () => {
+    describe('with an empty paragraph node selected', () => {
+      test('a single text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([$createTextNode('foo')]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+        );
+      });
+
+      test('two text nodes', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([
+            $createTextNode('foo'),
+            $createTextNode('bar'),
+          ]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foobar</span></p>',
+        );
+      });
+
+      test('link insertion without parent element', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+          const link = $createLinkNode('https://');
+          link.append($createTextNode('ello worl'));
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([
+            $createTextNode('h'),
+            link,
+            $createTextNode('d'),
+          ]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">h</span><a href="https://" dir="ltr"><span data-lexical-text="true">ello worl</span></a><span data-lexical-text="true">d</span></p>',
+        );
+      });
+
+      test('a single heading node with a child text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          $setFocusPoint({
+            key: paragraph.getKey(),
+            offset: 0,
+            type: 'element',
+          });
+
+          const heading = $createHeadingNode('h1');
+          const child = $createTextNode('foo');
+
+          heading.append(child);
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([heading]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<h1 dir="ltr"><span data-lexical-text="true">foo</span></h1>',
+        );
+      });
+    });
+
+    describe('with a paragraph node selected on some existing text', () => {
+      test('a single text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('Existing text...');
+
+          paragraph.append(text);
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([$createTextNode('foo')]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">Existing text...foo</span></p>',
+        );
+      });
+
+      test('two text nodes', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('Existing text...');
+
+          paragraph.append(text);
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([
+            $createTextNode('foo'),
+            $createTextNode('bar'),
+          ]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">Existing text...foobar</span></p>',
+        );
+      });
+
+      test('a single heading node with a child text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('Existing text...');
+
+          paragraph.append(text);
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 16,
+            type: 'text',
+          });
+
+          const heading = $createHeadingNode('h1');
+          const child = $createTextNode('foo');
+
+          heading.append(child);
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([heading]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">Existing text...foo</span></p>',
+        );
+      });
+
+      test('a paragraph with a child text and a child italic text and a child text', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          const text = $createTextNode('AE');
+
+          paragraph.append(text);
+          root.append(paragraph);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 1,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 1,
+            type: 'text',
+          });
+
+          const insertedParagraph = $createParagraphNode();
+          const insertedTextB = $createTextNode('B');
+          const insertedTextC = $createTextNode('C');
+          const insertedTextD = $createTextNode('D');
+
+          insertedTextC.toggleFormat('italic');
+
+          insertedParagraph.append(insertedTextB, insertedTextC, insertedTextD);
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+
+          selection.insertNodes([insertedParagraph]);
+
+          expect(selection.anchor).toEqual(
+            expect.objectContaining({
+              key: paragraph
+                .getChildAtIndex(paragraph.getChildrenSize() - 2)!
+                .getKey(),
+              offset: 1,
+              type: 'text',
+            }),
+          );
+
+          expect(selection.focus).toEqual(
+            expect.objectContaining({
+              key: paragraph
+                .getChildAtIndex(paragraph.getChildrenSize() - 2)!
+                .getKey(),
+              offset: 1,
+              type: 'text',
+            }),
+          );
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">AB</span><em data-lexical-text="true">C</em><span data-lexical-text="true">DE</span></p>',
+        );
+      });
+    });
+
+    describe('with a fully-selected text node', () => {
+      test('a single text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([$createTextNode('foo')]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+        );
+      });
+    });
+
+    describe('with a fully-selected text node followed by an inline element', () => {
+      test('a single text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          const link = $createLinkNode('https://');
+          link.append($createTextNode('link'));
+          paragraph.append(link);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([$createTextNode('foo')]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foo</span><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a></p>',
+        );
+      });
+    });
+
+    describe('with a fully-selected text node preceded by an inline element', () => {
+      test('a single text node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const link = $createLinkNode('https://');
+          link.append($createTextNode('link'));
+          paragraph.append(link);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([$createTextNode('foo')]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
+        );
+      });
+    });
+
+    test.skip('can insert a linebreak node before an inline element node', async () => {
+      const editor = createTestEditor();
+      const element = document.createElement('div');
+      editor.setRootElement(element);
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        const link = $createLinkNode('https://lexical.dev/');
+        paragraph.append(link);
+        const text = $createTextNode('Lexical');
+        link.append(text);
+        text.select(0, 0);
+
+        $insertNodes([$createLineBreakNode()]);
+      });
+
+      // TODO #5109 ElementNode should have a way to control when other nodes can be inserted inside
+      expect(element.innerHTML).toBe(
+        '<p><a href="https://lexical.dev/" dir="ltr"><br><span data-lexical-text="true">Lexical</span></a></p>',
+      );
+    });
+  });
+
+  describe('can insert block element nodes correctly', () => {
+    describe('with a fully-selected text node', () => {
+      test('a paragraph node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const paragraphToInsert = $createParagraphNode();
+          paragraphToInsert.append($createTextNode('foo'));
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([paragraphToInsert]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+        );
+      });
+    });
+
+    describe('with a fully-selected text node followed by an inline element', () => {
+      test('a paragraph node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          const link = $createLinkNode('https://');
+          link.append($createTextNode('link'));
+          paragraph.append(link);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const paragraphToInsert = $createParagraphNode();
+          paragraphToInsert.append($createTextNode('foo'));
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([paragraphToInsert]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><span data-lexical-text="true">foo</span><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a></p>',
+        );
+      });
+    });
+
+    describe('with a fully-selected text node preceded by an inline element', () => {
+      test('a paragraph node', async () => {
+        const editor = createTestEditor();
+
+        const element = document.createElement('div');
+
+        editor.setRootElement(element);
+
+        await editor.update(() => {
+          const root = $getRoot();
+
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+
+          const link = $createLinkNode('https://');
+          link.append($createTextNode('link'));
+          paragraph.append(link);
+
+          const text = $createTextNode('Existing text...');
+          paragraph.append(text);
+
+          $setAnchorPoint({
+            key: text.getKey(),
+            offset: 0,
+            type: 'text',
+          });
+
+          $setFocusPoint({
+            key: text.getKey(),
+            offset: 'Existing text...'.length,
+            type: 'text',
+          });
+
+          const paragraphToInsert = $createParagraphNode();
+          paragraphToInsert.append($createTextNode('foo'));
+
+          const selection = $getSelection();
+
+          if (!$isRangeSelection(selection)) {
+            return;
+          }
+          selection.insertNodes([paragraphToInsert]);
+        });
+
+        expect(element.innerHTML).toBe(
+          '<p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
+        );
+      });
+    });
+
+    test('Can insert link into empty paragraph', async () => {
+      const editor = createTestEditor();
+      const element = document.createElement('div');
+      editor.setRootElement(element);
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        const linkNode = $createLinkNode('https://lexical.dev');
+        const linkTextNode = $createTextNode('Lexical');
+        linkNode.append(linkTextNode);
+        $insertNodes([linkNode]);
+      });
+      expect(element.innerHTML).toBe(
+        '<p><a href="https://lexical.dev" dir="ltr"><span data-lexical-text="true">Lexical</span></a></p>',
+      );
+    });
+
+    test('Can insert link into empty paragraph (2)', async () => {
+      const editor = createTestEditor();
+      const element = document.createElement('div');
+      editor.setRootElement(element);
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        const linkNode = $createLinkNode('https://lexical.dev');
+        const linkTextNode = $createTextNode('Lexical');
+        linkNode.append(linkTextNode);
+        const textNode2 = $createTextNode('...');
+        $insertNodes([linkNode, textNode2]);
+      });
+      expect(element.innerHTML).toBe(
+        '<p><a href="https://lexical.dev" dir="ltr"><span data-lexical-text="true">Lexical</span></a><span data-lexical-text="true">...</span></p>',
+      );
+    });
+
+    test('Can insert an ElementNode after ShadowRoot', async () => {
+      const editor = createTestEditor();
+      const element = document.createElement('div');
+      editor.setRootElement(element);
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+        paragraph.selectStart();
+        const element1 = $createTestShadowRootNode();
+        const element2 = $createTestElementNode();
+        $insertNodes([element1, element2]);
+      });
+      expect([
+        '<div><br></div><div><br></div>',
+        '<div><br></div><p><br></p>',
+      ]).toContain(element.innerHTML);
+    });
+  });
+});
+
+describe('extract', () => {
+  test('Should return the selected node when collapsed on a TextNode', async () => {
+    const editor = createTestEditor();
+
+    const element = document.createElement('div');
+
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      const text = $createTextNode('Existing text...');
+
+      paragraph.append(text);
+      root.append(paragraph);
+
+      $setAnchorPoint({
+        key: text.getKey(),
+        offset: 16,
+        type: 'text',
+      });
+
+      $setFocusPoint({
+        key: text.getKey(),
+        offset: 16,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      expect($isRangeSelection(selection)).toBeTruthy();
+
+      expect(selection!.extract()).toEqual([text]);
+    });
+  });
+});
+
+describe('insertNodes', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('can insert element next to top level decorator node', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    jest.spyOn(TestDecoratorNode.prototype, 'isInline').mockReturnValue(false);
+
+    await editor.update(() => {
+      $getRoot().append(
+        $createParagraphNode(),
+        $createTestDecoratorNode(),
+        $createParagraphNode().append($createTextNode('Text after')),
+      );
+    });
+
+    await editor.update(() => {
+      const selectionNode = $getRoot().getFirstChild();
+      invariant($isElementNode(selectionNode));
+      const selection = selectionNode.select();
+      selection.insertNodes([
+        $createParagraphNode().append($createTextNode('Text before')),
+      ]);
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr"><span data-lexical-text="true">Text before</span></p>' +
+        '<span data-lexical-decorator="true" contenteditable="false"></span>' +
+        '<p dir="ltr"><span data-lexical-text="true">Text after</span></p>',
+    );
+  });
+
+  it('can insert when previous selection was null', async () => {
+    const editor = createTestHeadlessEditor();
+    await editor.update(() => {
+      const selection = $createRangeSelection();
+      selection.anchor.set('root', 0, 'element');
+      selection.focus.set('root', 0, 'element');
+
+      selection.insertNodes([
+        $createParagraphNode().append($createTextNode('Text')),
+      ]);
+
+      expect($getRoot().getTextContent()).toBe('Text');
+
+      $setSelection(null);
+    });
+    await editor.update(() => {
+      const selection = $createRangeSelection();
+      const text = $getRoot().getLastDescendant()!;
+      selection.anchor.set(text.getKey(), 0, 'text');
+      selection.focus.set(text.getKey(), 0, 'text');
+
+      selection.insertNodes([
+        $createParagraphNode().append($createTextNode('Before ')),
+      ]);
+
+      expect($getRoot().getTextContent()).toBe('Before Text');
+    });
+  });
+
+  it('can insert when before empty text node', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      // Empty text node to test empty text split
+      const emptyTextNode = $createTextNode('');
+      $getRoot().append(
+        $createParagraphNode().append(emptyTextNode, $createTextNode('text')),
+      );
+      emptyTextNode.select(0, 0);
+      const selection = $getSelection()!;
+      expect($isRangeSelection(selection)).toBeTruthy();
+      selection.insertNodes([$createTextNode('foo')]);
+
+      expect($getRoot().getTextContent()).toBe('footext');
+    });
+  });
+
+  it('last node is LineBreakNode', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      // Empty text node to test empty text split
+      const paragraph = $createParagraphNode();
+      $getRoot().append(paragraph);
+      const selection = paragraph.select();
+      expect($isRangeSelection(selection)).toBeTruthy();
+
+      const newHeading = $createHeadingNode('h1').append(
+        $createTextNode('heading'),
+      );
+      selection.insertNodes([newHeading, $createLineBreakNode()]);
+    });
+    editor.getEditorState().read(() => {
+      expect(element.innerHTML).toBe(
+        '<h1 dir="ltr"><span data-lexical-text="true">heading</span></h1><p><br></p>',
+      );
+      const selectedNode = ($getSelection() as RangeSelection).anchor.getNode();
+      expect($isParagraphNode(selectedNode)).toBeTruthy();
+      expect($isHeadingNode(selectedNode.getPreviousSibling())).toBeTruthy();
+    });
+  });
+});
+
+describe('$patchStyleText', () => {
+  test('can patch a selection anchored to the end of a TextNode before an inline element', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphWithNodes(editor, [
+        {
+          key: 'a',
+          mergeable: false,
+          text: 'a',
+        },
+        {
+          key: 'b',
+          mergeable: false,
+          text: 'b',
+        },
+      ]);
+
+      root.append(paragraph);
+
+      const link = $createLinkNode('https://');
+      link.append($createTextNode('link'));
+
+      const a = $getNodeByKey('a')!;
+      a.insertAfter(link);
+
+      $setAnchorPoint({
+        key: 'a',
+        offset: 1,
+        type: 'text',
+      });
+      $setFocusPoint({
+        key: 'b',
+        offset: 1,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr"><span data-lexical-text="true">a</span>' +
+        '<a href="https://" dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
+        '</a>' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">b</span></p>',
+    );
+  });
+
+  test('can patch a selection anchored to the end of a TextNode at the end of a paragraph', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph1 = $createParagraphWithNodes(editor, [
+        {
+          key: 'a',
+          mergeable: false,
+          text: 'a',
+        },
+      ]);
+      const paragraph2 = $createParagraphWithNodes(editor, [
+        {
+          key: 'b',
+          mergeable: false,
+          text: 'b',
+        },
+      ]);
+
+      root.append(paragraph1);
+      root.append(paragraph2);
+
+      $setAnchorPoint({
+        key: 'a',
+        offset: 1,
+        type: 'text',
+      });
+      $setFocusPoint({
+        key: 'b',
+        offset: 1,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr"><span data-lexical-text="true">a</span></p>' +
+        '<p dir="ltr"><span style="text-emphasis: filled;" data-lexical-text="true">b</span></p>',
+    );
+  });
+
+  test('can patch a selection that ends on an element', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphWithNodes(editor, [
+        {
+          key: 'a',
+          mergeable: false,
+          text: 'a',
+        },
+      ]);
+
+      root.append(paragraph);
+
+      const link = $createLinkNode('https://');
+      link.append($createTextNode('link'));
+
+      const a = $getNodeByKey('a')!;
+      a.insertAfter(link);
+
+      $setAnchorPoint({
+        key: 'a',
+        offset: 0,
+        type: 'text',
+      });
+      // Select to end of the link _element_
+      $setFocusPoint({
+        key: link.getKey(),
+        offset: 1,
+        type: 'element',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">a</span>' +
+        '<a href="https://" dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
+        '</a>' +
+        '</p>',
+    );
+  });
+
+  test('can patch a reversed selection that ends on an element', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphWithNodes(editor, [
+        {
+          key: 'a',
+          mergeable: false,
+          text: 'a',
+        },
+      ]);
+
+      root.append(paragraph);
+
+      const link = $createLinkNode('https://');
+      link.append($createTextNode('link'));
+
+      const a = $getNodeByKey('a')!;
+      a.insertAfter(link);
+
+      // Select from the end of the link _element_
+      $setAnchorPoint({
+        key: link.getKey(),
+        offset: 1,
+        type: 'element',
+      });
+      $setFocusPoint({
+        key: 'a',
+        offset: 0,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">a</span>' +
+        '<a href="https://" dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
+        '</a>' +
+        '</p>',
+    );
+  });
+
+  test('can patch a selection that starts and ends on an element', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+
+      const link = $createLinkNode('https://');
+      link.append($createTextNode('link'));
+      paragraph.append(link);
+
+      $setAnchorPoint({
+        key: link.getKey(),
+        offset: 0,
+        type: 'element',
+      });
+      $setFocusPoint({
+        key: link.getKey(),
+        offset: 1,
+        type: 'element',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p>' +
+        '<a href="https://" dir="ltr">' +
+        '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
+        '</a>' +
+        '</p>',
+    );
+  });
+
+  test('can clear a style', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+
+      const text = $createTextNode('text');
+      paragraph.append(text);
+
+      $setAnchorPoint({
+        key: text.getKey(),
+        offset: 0,
+        type: 'text',
+      });
+      $setFocusPoint({
+        key: text.getKey(),
+        offset: text.getTextContentSize(),
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+      $patchStyleText(selection, {'text-emphasis': null});
+    });
+
+    expect(element.innerHTML).toBe(
+      '<p dir="ltr"><span data-lexical-text="true">text</span></p>',
+    );
+  });
+
+  test('can toggle a style on a collapsed selection', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+
+      const text = $createTextNode('text');
+      paragraph.append(text);
+
+      $setAnchorPoint({
+        key: text.getKey(),
+        offset: 0,
+        type: 'text',
+      });
+      $setFocusPoint({
+        key: text.getKey(),
+        offset: 0,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+
+      expect(
+        $getSelectionStyleValueForProperty(selection, 'text-emphasis', ''),
+      ).toEqual('filled');
+
+      $patchStyleText(selection, {'text-emphasis': null});
+
+      expect(
+        $getSelectionStyleValueForProperty(selection, 'text-emphasis', ''),
+      ).toEqual('');
+
+      $patchStyleText(selection, {'text-emphasis': 'filled'});
+
+      expect(
+        $getSelectionStyleValueForProperty(selection, 'text-emphasis', ''),
+      ).toEqual('filled');
+    });
+  });
+
+  test('updates cached styles when setting on a collapsed selection', async () => {
+    const editor = createTestEditor();
+    const element = document.createElement('div');
+    editor.setRootElement(element);
+
+    await editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+
+      const text = $createTextNode('text');
+      paragraph.append(text);
+
+      $setAnchorPoint({
+        key: text.getKey(),
+        offset: 0,
+        type: 'text',
+      });
+      $setFocusPoint({
+        key: text.getKey(),
+        offset: 0,
+        type: 'text',
+      });
+
+      // First fetch the initial style -- this will cause the CSS cache to be
+      // populated with an empty string pointing to an empty style object.
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
+      $getSelectionStyleValueForProperty(selection, 'color', '');
+
+      // Now when we set the style, we should _not_ touch the previously created
+      // empty style object, but create a new one instead.
+      $patchStyleText(selection, {color: 'red'});
+
+      // We can check that result by clearing the style and re-querying it.
+      ($getSelection() as RangeSelection).setStyle('');
+
+      const color = $getSelectionStyleValueForProperty(
+        $getSelection() as RangeSelection,
+        'color',
+        '',
+      );
+      expect(color).toEqual('');
+    });
+  });
+
+  test.each<TextModeType>(['token', 'segmented'])(
+    'can update style of text node that is in %s mode',
+    async (mode) => {
+      const editor = createTestEditor();
+
+      const element = document.createElement('div');
+      editor.setRootElement(element);
+
+      await editor.update(() => {
+        const root = $getRoot();
+
+        const paragraph = $createParagraphNode();
+        root.append(paragraph);
+
+        const text = $createTextNode('first').setFormat('bold');
+        paragraph.append(text);
+
+        const textInMode = $createTextNode('second').setMode(mode);
+        paragraph.append(textInMode);
+
+        $setAnchorPoint({
+          key: text.getKey(),
+          offset: 'fir'.length,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: textInMode.getKey(),
+          offset: 'sec'.length,
+          type: 'text',
+        });
+
+        const selection = $getSelection();
+        $patchStyleText(selection!, {'font-size': '15px'});
+      });
+
+      expect(element.innerHTML).toBe(
+        '<p dir="ltr">' +
+          '<strong data-lexical-text="true">fir</strong>' +
+          '<strong style="font-size: 15px;" data-lexical-text="true">st</strong>' +
+          '<span style="font-size: 15px;" data-lexical-text="true">second</span>' +
+          '</p>',
+      );
+    },
+  );
+
+  test('preserve backward selection when changing style of 2 different text nodes', async () => {
+    const editor = createTestEditor();
+
+    const element = document.createElement('div');
+
+    editor.setRootElement(element);
+
+    editor.update(() => {
+      const root = $getRoot();
+
+      const paragraph = $createParagraphNode();
+      root.append(paragraph);
+
+      const firstText = $createTextNode('first ').setFormat('bold');
+      paragraph.append(firstText);
+
+      const secondText = $createTextNode('second').setFormat('italic');
+      paragraph.append(secondText);
+
+      $setAnchorPoint({
+        key: secondText.getKey(),
+        offset: 'sec'.length,
+        type: 'text',
+      });
+
+      $setFocusPoint({
+        key: firstText.getKey(),
+        offset: 'fir'.length,
+        type: 'text',
+      });
+
+      const selection = $getSelection();
+
+      $patchStyleText(selection!, {'font-size': '11px'});
+
+      const [newAnchor, newFocus] = selection!.getStartEndPoints()!;
+
+      const newAnchorNode: LexicalNode = newAnchor.getNode();
+      expect(newAnchorNode.getTextContent()).toBe('sec');
+      expect(newAnchor.offset).toBe('sec'.length);
+
+      const newFocusNode: LexicalNode = newFocus.getNode();
+      expect(newFocusNode.getTextContent()).toBe('st ');
+      expect(newFocus.offset).toBe(0);
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
new file mode 100644
index 00000000000..84c82edecfa
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
@@ -0,0 +1,918 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createTextNode,
+  $getSelection,
+  $isNodeSelection,
+  $isRangeSelection,
+  $isTextNode,
+  LexicalEditor,
+  PointType,
+} from 'lexical';
+
+Object.defineProperty(HTMLElement.prototype, 'contentEditable', {
+  get() {
+    return this.getAttribute('contenteditable');
+  },
+
+  set(value) {
+    this.setAttribute('contenteditable', value);
+  },
+});
+
+type Segment = {
+  index: number;
+  isWordLike: boolean;
+  segment: string;
+};
+
+if (!Selection.prototype.modify) {
+  const wordBreakPolyfillRegex =
+    /[\s.,\\/#!$%^&*;:{}=\-`~()\uD800-\uDBFF\uDC00-\uDFFF\u3000-\u303F]/u;
+
+  const pushSegment = function (
+    segments: Array<Segment>,
+    index: number,
+    str: string,
+    isWordLike: boolean,
+  ): void {
+    segments.push({
+      index: index - str.length,
+      isWordLike,
+      segment: str,
+    });
+  };
+
+  const getWordsFromString = function (string: string): Array<Segment> {
+    const segments: Segment[] = [];
+    let wordString = '';
+    let nonWordString = '';
+    let i;
+
+    for (i = 0; i < string.length; i++) {
+      const char = string[i];
+
+      if (wordBreakPolyfillRegex.test(char)) {
+        if (wordString !== '') {
+          pushSegment(segments, i, wordString, true);
+          wordString = '';
+        }
+
+        nonWordString += char;
+      } else {
+        if (nonWordString !== '') {
+          pushSegment(segments, i, nonWordString, false);
+          nonWordString = '';
+        }
+
+        wordString += char;
+      }
+    }
+
+    if (wordString !== '') {
+      pushSegment(segments, i, wordString, true);
+    }
+
+    if (nonWordString !== '') {
+      pushSegment(segments, i, nonWordString, false);
+    }
+
+    return segments;
+  };
+
+  Selection.prototype.modify = function (alter, direction, granularity) {
+    // This is not a thorough implementation, it was more to get tests working
+    // given the refactor to use this selection method.
+    const symbol = Object.getOwnPropertySymbols(this)[0];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const impl = (this as any)[symbol];
+    const focus = impl._focus;
+    const anchor = impl._anchor;
+
+    if (granularity === 'character') {
+      let anchorNode = anchor.node;
+      let anchorOffset = anchor.offset;
+      let _$isTextNode = false;
+
+      if (anchorNode.nodeType === 3) {
+        _$isTextNode = true;
+        anchorNode = anchorNode.parentElement;
+      } else if (anchorNode.nodeName === 'BR') {
+        const parentNode = anchorNode.parentElement;
+        const childNodes = Array.from(parentNode.childNodes);
+        anchorOffset = childNodes.indexOf(anchorNode);
+        anchorNode = parentNode;
+      }
+
+      if (direction === 'backward') {
+        if (anchorOffset === 0) {
+          let prevSibling = anchorNode.previousSibling;
+
+          if (prevSibling === null) {
+            prevSibling = anchorNode.parentElement.previousSibling.lastChild;
+          }
+
+          if (prevSibling.nodeName === 'P') {
+            prevSibling = prevSibling.firstChild;
+          }
+
+          if (prevSibling.nodeName === 'BR') {
+            anchor.node = prevSibling;
+            anchor.offset = 0;
+          } else {
+            anchor.node = prevSibling.firstChild;
+            anchor.offset = anchor.node.nodeValue.length - 1;
+          }
+        } else if (!_$isTextNode) {
+          anchor.node = anchorNode.childNodes[anchorOffset - 1];
+          anchor.offset = anchor.node.nodeValue.length - 1;
+        } else {
+          anchor.offset--;
+        }
+      } else {
+        if (
+          (_$isTextNode && anchorOffset === anchorNode.textContent.length) ||
+          (!_$isTextNode &&
+            (anchorNode.childNodes.length === anchorOffset ||
+              (anchorNode.childNodes.length === 1 &&
+                anchorNode.firstChild.nodeName === 'BR')))
+        ) {
+          let nextSibling = anchorNode.nextSibling;
+
+          if (nextSibling === null) {
+            nextSibling = anchorNode.parentElement.nextSibling.lastChild;
+          }
+
+          if (nextSibling.nodeName === 'P') {
+            nextSibling = nextSibling.lastChild;
+          }
+
+          if (nextSibling.nodeName === 'BR') {
+            anchor.node = nextSibling;
+            anchor.offset = 0;
+          } else {
+            anchor.node = nextSibling.firstChild;
+            anchor.offset = 0;
+          }
+        } else {
+          anchor.offset++;
+        }
+      }
+    } else if (granularity === 'word') {
+      const anchorNode = this.anchorNode!;
+      const targetTextContent =
+        direction === 'backward'
+          ? anchorNode.textContent!.slice(0, this.anchorOffset)
+          : anchorNode.textContent!.slice(this.anchorOffset);
+      const segments = getWordsFromString(targetTextContent);
+      const segmentsLength = segments.length;
+      let index = anchor.offset;
+      let foundWordNode = false;
+
+      if (direction === 'backward') {
+        for (let i = segmentsLength - 1; i >= 0; i--) {
+          const segment = segments[i];
+          const nextIndex = segment.index;
+
+          if (segment.isWordLike) {
+            index = nextIndex;
+            foundWordNode = true;
+          } else if (foundWordNode) {
+            break;
+          } else {
+            index = nextIndex;
+          }
+        }
+      } else {
+        for (let i = 0; i < segmentsLength; i++) {
+          const segment = segments[i];
+          const nextIndex = segment.index + segment.segment.length;
+
+          if (segment.isWordLike) {
+            index = nextIndex;
+            foundWordNode = true;
+          } else if (foundWordNode) {
+            break;
+          } else {
+            index = nextIndex;
+          }
+        }
+      }
+
+      if (direction === 'forward') {
+        index += anchor.offset;
+      }
+
+      anchor.offset = index;
+    }
+
+    if (alter === 'move') {
+      focus.offset = anchor.offset;
+      focus.node = anchor.node;
+    }
+  };
+}
+
+export function printWhitespace(whitespaceCharacter: string) {
+  return whitespaceCharacter.charCodeAt(0) === 160
+    ? '&nbsp;'
+    : whitespaceCharacter;
+}
+
+export function insertText(text: string) {
+  return {
+    text,
+    type: 'insert_text',
+  };
+}
+
+export function insertTokenNode(text: string) {
+  return {
+    text,
+    type: 'insert_token_node',
+  };
+}
+
+export function insertSegmentedNode(text: string) {
+  return {
+    text,
+    type: 'insert_segmented_node',
+  };
+}
+
+export function convertToTokenNode() {
+  return {
+    text: null,
+    type: 'convert_to_token_node',
+  };
+}
+
+export function convertToSegmentedNode() {
+  return {
+    text: null,
+    type: 'convert_to_segmented_node',
+  };
+}
+
+export function insertParagraph() {
+  return {
+    type: 'insert_paragraph',
+  };
+}
+
+export function deleteWordBackward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'delete_word_backward',
+  };
+}
+
+export function deleteWordForward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'delete_word_forward',
+  };
+}
+
+export function moveBackward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'move_backward',
+  };
+}
+
+export function moveForward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'move_forward',
+  };
+}
+
+export function moveEnd() {
+  return {
+    type: 'move_end',
+  };
+}
+
+export function deleteBackward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'delete_backward',
+  };
+}
+
+export function deleteForward(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'delete_forward',
+  };
+}
+
+export function formatBold() {
+  return {
+    format: 'bold',
+    type: 'format_text',
+  };
+}
+
+export function formatItalic() {
+  return {
+    format: 'italic',
+    type: 'format_text',
+  };
+}
+
+export function formatStrikeThrough() {
+  return {
+    format: 'strikethrough',
+    type: 'format_text',
+  };
+}
+
+export function formatUnderline() {
+  return {
+    format: 'underline',
+    type: 'format_text',
+  };
+}
+
+export function redo(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'redo',
+  };
+}
+
+export function undo(n: number | null | undefined) {
+  return {
+    text: null,
+    times: n,
+    type: 'undo',
+  };
+}
+
+export function pastePlain(text: string) {
+  return {
+    text: text,
+    type: 'paste_plain',
+  };
+}
+
+export function pasteLexical(text: string) {
+  return {
+    text: text,
+    type: 'paste_lexical',
+  };
+}
+
+export function pasteHTML(text: string) {
+  return {
+    text: text,
+    type: 'paste_html',
+  };
+}
+
+export function moveNativeSelection(
+  anchorPath: number[],
+  anchorOffset: number,
+  focusPath: number[],
+  focusOffset: number,
+) {
+  return {
+    anchorOffset,
+    anchorPath,
+    focusOffset,
+    focusPath,
+    type: 'move_native_selection',
+  };
+}
+
+export function getNodeFromPath(path: number[], rootElement: Node) {
+  let node = rootElement;
+
+  for (let i = 0; i < path.length; i++) {
+    node = node.childNodes[path[i]];
+  }
+
+  return node;
+}
+
+export function setNativeSelection(
+  anchorNode: Node,
+  anchorOffset: number,
+  focusNode: Node,
+  focusOffset: number,
+) {
+  const domSelection = window.getSelection()!;
+  const range = document.createRange();
+  range.setStart(anchorNode, anchorOffset);
+  range.setEnd(focusNode, focusOffset);
+  domSelection.removeAllRanges();
+  domSelection.addRange(range);
+  Promise.resolve().then(() => {
+    document.dispatchEvent(new Event('selectionchange'));
+  });
+}
+
+export function setNativeSelectionWithPaths(
+  rootElement: Node,
+  anchorPath: number[],
+  anchorOffset: number,
+  focusPath: number[],
+  focusOffset: number,
+) {
+  const anchorNode = getNodeFromPath(anchorPath, rootElement);
+  const focusNode = getNodeFromPath(focusPath, rootElement);
+  setNativeSelection(anchorNode, anchorOffset, focusNode, focusOffset);
+}
+
+function getLastTextNode(startingNode: Node) {
+  let node = startingNode;
+
+  mainLoop: while (node !== null) {
+    if (node !== startingNode && node.nodeType === 3) {
+      return node;
+    }
+
+    const child = node.lastChild;
+
+    if (child !== null) {
+      node = child;
+      continue;
+    }
+
+    const previousSibling = node.previousSibling;
+
+    if (previousSibling !== null) {
+      node = previousSibling;
+      continue;
+    }
+
+    let parent = node.parentNode;
+
+    while (parent !== null) {
+      const parentSibling = parent.previousSibling;
+
+      if (parentSibling !== null) {
+        node = parentSibling;
+        continue mainLoop;
+      }
+
+      parent = parent.parentNode;
+    }
+  }
+
+  return null;
+}
+
+function getNextTextNode(startingNode: Node) {
+  let node = startingNode;
+
+  mainLoop: while (node !== null) {
+    if (node !== startingNode && node.nodeType === 3) {
+      return node;
+    }
+
+    const child = node.firstChild;
+
+    if (child !== null) {
+      node = child;
+      continue;
+    }
+
+    const nextSibling = node.nextSibling;
+
+    if (nextSibling !== null) {
+      node = nextSibling;
+      continue;
+    }
+
+    let parent = node.parentNode;
+
+    while (parent !== null) {
+      const parentSibling = parent.nextSibling;
+
+      if (parentSibling !== null) {
+        node = parentSibling;
+        continue mainLoop;
+      }
+
+      parent = parent.parentNode;
+    }
+  }
+
+  return null;
+}
+
+function moveNativeSelectionBackward() {
+  const domSelection = window.getSelection()!;
+  let anchorNode = domSelection.anchorNode!;
+  let anchorOffset = domSelection.anchorOffset!;
+
+  if (domSelection.isCollapsed) {
+    const target = (
+      anchorNode.nodeType === 1 ? anchorNode : anchorNode.parentNode
+    )!;
+    const keyDownEvent = new KeyboardEvent('keydown', {
+      bubbles: true,
+      cancelable: true,
+      key: 'ArrowLeft',
+      keyCode: 37,
+    });
+    target.dispatchEvent(keyDownEvent);
+
+    if (!keyDownEvent.defaultPrevented) {
+      if (anchorNode.nodeType === 3) {
+        if (anchorOffset === 0) {
+          const lastTextNode = getLastTextNode(anchorNode);
+
+          if (lastTextNode === null) {
+            throw new Error('moveNativeSelectionBackward: TODO');
+          } else {
+            const textLength = lastTextNode.nodeValue!.length;
+            setNativeSelection(
+              lastTextNode,
+              textLength,
+              lastTextNode,
+              textLength,
+            );
+          }
+        } else {
+          setNativeSelection(
+            anchorNode,
+            anchorOffset - 1,
+            anchorNode,
+            anchorOffset - 1,
+          );
+        }
+      } else if (anchorNode.nodeType === 1) {
+        if (anchorNode.nodeName === 'BR') {
+          const parentNode = anchorNode.parentNode!;
+          const childNodes = Array.from(parentNode.childNodes);
+          anchorOffset = childNodes.indexOf(anchorNode as ChildNode);
+          anchorNode = parentNode;
+        } else {
+          anchorOffset--;
+        }
+
+        setNativeSelection(anchorNode, anchorOffset, anchorNode, anchorOffset);
+      } else {
+        throw new Error('moveNativeSelectionBackward: TODO');
+      }
+    }
+
+    const keyUpEvent = new KeyboardEvent('keyup', {
+      bubbles: true,
+      cancelable: true,
+      key: 'ArrowLeft',
+      keyCode: 37,
+    });
+    target.dispatchEvent(keyUpEvent);
+  } else {
+    throw new Error('moveNativeSelectionBackward: TODO');
+  }
+}
+
+function moveNativeSelectionForward() {
+  const domSelection = window.getSelection()!;
+  const anchorNode = domSelection.anchorNode!;
+  const anchorOffset = domSelection.anchorOffset!;
+
+  if (domSelection.isCollapsed) {
+    const target = (
+      anchorNode.nodeType === 1 ? anchorNode : anchorNode.parentNode
+    )!;
+    const keyDownEvent = new KeyboardEvent('keydown', {
+      bubbles: true,
+      cancelable: true,
+      key: 'ArrowRight',
+      keyCode: 39,
+    });
+    target.dispatchEvent(keyDownEvent);
+
+    if (!keyDownEvent.defaultPrevented) {
+      if (anchorNode.nodeType === 3) {
+        const text = anchorNode.nodeValue!;
+
+        if (text.length === anchorOffset) {
+          const nextTextNode = getNextTextNode(anchorNode);
+
+          if (nextTextNode === null) {
+            throw new Error('moveNativeSelectionForward: TODO');
+          } else {
+            setNativeSelection(nextTextNode, 0, nextTextNode, 0);
+          }
+        } else {
+          setNativeSelection(
+            anchorNode,
+            anchorOffset + 1,
+            anchorNode,
+            anchorOffset + 1,
+          );
+        }
+      } else {
+        throw new Error('moveNativeSelectionForward: TODO');
+      }
+    }
+
+    const keyUpEvent = new KeyboardEvent('keyup', {
+      bubbles: true,
+      cancelable: true,
+      key: 'ArrowRight',
+      keyCode: 39,
+    });
+    target.dispatchEvent(keyUpEvent);
+  } else {
+    throw new Error('moveNativeSelectionForward: TODO');
+  }
+}
+
+export async function applySelectionInputs(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  inputs: Record<string, any>[],
+  update: (fn: () => void) => Promise<void>,
+  editor: LexicalEditor,
+) {
+  const rootElement = editor.getRootElement()!;
+
+  for (let i = 0; i < inputs.length; i++) {
+    const input = inputs[i];
+    const times = input?.times ?? 1;
+
+    for (let j = 0; j < times; j++) {
+      await update(() => {
+        const selection = $getSelection()!;
+
+        switch (input.type) {
+          case 'insert_text': {
+            selection.insertText(input.text);
+            break;
+          }
+
+          case 'insert_paragraph': {
+            if ($isRangeSelection(selection)) {
+              selection.insertParagraph();
+            }
+            break;
+          }
+
+          case 'move_backward': {
+            moveNativeSelectionBackward();
+            break;
+          }
+
+          case 'move_forward': {
+            moveNativeSelectionForward();
+            break;
+          }
+
+          case 'move_end': {
+            if ($isRangeSelection(selection)) {
+              const anchorNode = selection.anchor.getNode();
+              if ($isTextNode(anchorNode)) {
+                anchorNode.select();
+              }
+            }
+            break;
+          }
+
+          case 'delete_backward': {
+            if ($isRangeSelection(selection)) {
+              selection.deleteCharacter(true);
+            }
+            break;
+          }
+
+          case 'delete_forward': {
+            if ($isRangeSelection(selection)) {
+              selection.deleteCharacter(false);
+            }
+            break;
+          }
+
+          case 'delete_word_backward': {
+            if ($isRangeSelection(selection)) {
+              selection.deleteWord(true);
+            }
+            break;
+          }
+
+          case 'delete_word_forward': {
+            if ($isRangeSelection(selection)) {
+              selection.deleteWord(false);
+            }
+            break;
+          }
+
+          case 'format_text': {
+            if ($isRangeSelection(selection)) {
+              selection.formatText(input.format);
+            }
+            break;
+          }
+
+          case 'move_native_selection': {
+            setNativeSelectionWithPaths(
+              rootElement,
+              input.anchorPath,
+              input.anchorOffset,
+              input.focusPath,
+              input.focusOffset,
+            );
+            break;
+          }
+
+          case 'insert_token_node': {
+            const text = $createTextNode(input.text);
+            text.setMode('token');
+            if ($isRangeSelection(selection)) {
+              selection.insertNodes([text]);
+            }
+            break;
+          }
+
+          case 'insert_segmented_node': {
+            const text = $createTextNode(input.text);
+            text.setMode('segmented');
+            if ($isRangeSelection(selection)) {
+              selection.insertNodes([text]);
+            }
+            text.selectNext();
+            break;
+          }
+
+          case 'convert_to_token_node': {
+            const text = $createTextNode(selection.getTextContent());
+            text.setMode('token');
+            if ($isRangeSelection(selection)) {
+              selection.insertNodes([text]);
+            }
+            text.selectNext();
+            break;
+          }
+
+          case 'convert_to_segmented_node': {
+            const text = $createTextNode(selection.getTextContent());
+            text.setMode('segmented');
+            if ($isRangeSelection(selection)) {
+              selection.insertNodes([text]);
+            }
+            text.selectNext();
+            break;
+          }
+
+          case 'undo': {
+            rootElement.dispatchEvent(
+              new KeyboardEvent('keydown', {
+                bubbles: true,
+                cancelable: true,
+                ctrlKey: true,
+                key: 'z',
+                keyCode: 90,
+              }),
+            );
+            break;
+          }
+
+          case 'redo': {
+            rootElement.dispatchEvent(
+              new KeyboardEvent('keydown', {
+                bubbles: true,
+                cancelable: true,
+                ctrlKey: true,
+                key: 'z',
+                keyCode: 90,
+                shiftKey: true,
+              }),
+            );
+            break;
+          }
+
+          case 'paste_plain': {
+            rootElement.dispatchEvent(
+              Object.assign(
+                new Event('paste', {
+                  bubbles: true,
+                  cancelable: true,
+                }),
+                {
+                  clipboardData: {
+                    getData: (type: string) => {
+                      if (type === 'text/plain') {
+                        return input.text;
+                      }
+
+                      return '';
+                    },
+                  },
+                },
+              ),
+            );
+            break;
+          }
+
+          case 'paste_lexical': {
+            rootElement.dispatchEvent(
+              Object.assign(
+                new Event('paste', {
+                  bubbles: true,
+                  cancelable: true,
+                }),
+                {
+                  clipboardData: {
+                    getData: (type: string) => {
+                      if (type === 'application/x-lexical-editor') {
+                        return input.text;
+                      }
+
+                      return '';
+                    },
+                  },
+                },
+              ),
+            );
+            break;
+          }
+
+          case 'paste_html': {
+            rootElement.dispatchEvent(
+              Object.assign(
+                new Event('paste', {
+                  bubbles: true,
+                  cancelable: true,
+                }),
+                {
+                  clipboardData: {
+                    getData: (type: string) => {
+                      if (type === 'text/html') {
+                        return input.text;
+                      }
+
+                      return '';
+                    },
+                  },
+                },
+              ),
+            );
+            break;
+          }
+        }
+      });
+    }
+  }
+}
+
+export function $setAnchorPoint(
+  point: Pick<PointType, 'type' | 'offset' | 'key'>,
+) {
+  const selection = $getSelection();
+
+  if (!$isRangeSelection(selection)) {
+    const dummyTextNode = $createTextNode();
+    dummyTextNode.select();
+    return $setAnchorPoint(point);
+  }
+
+  if ($isNodeSelection(selection)) {
+    return;
+  }
+
+  const anchor = selection.anchor;
+  anchor.type = point.type;
+  anchor.offset = point.offset;
+  anchor.key = point.key;
+}
+
+export function $setFocusPoint(
+  point: Pick<PointType, 'type' | 'offset' | 'key'>,
+) {
+  const selection = $getSelection();
+
+  if (!$isRangeSelection(selection)) {
+    const dummyTextNode = $createTextNode();
+    dummyTextNode.select();
+    return $setFocusPoint(point);
+  }
+
+  if ($isNodeSelection(selection)) {
+    return;
+  }
+
+  const focus = selection.focus;
+  focus.type = point.type;
+  focus.offset = point.offset;
+  focus.key = point.key;
+}
diff --git a/resources/js/wysiwyg/lexical/selection/constants.ts b/resources/js/wysiwyg/lexical/selection/constants.ts
new file mode 100644
index 00000000000..104f57df530
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/constants.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+export const CSS_TO_STYLES: Map<string, Record<string, string>> = new Map();
diff --git a/resources/js/wysiwyg/lexical/selection/index.ts b/resources/js/wysiwyg/lexical/selection/index.ts
new file mode 100644
index 00000000000..b2d18b1645a
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/index.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $addNodeStyle,
+  $isAtNodeEnd,
+  $patchStyleText,
+  $sliceSelectedTextNodeContent,
+  $trimTextContentFromAnchor,
+} from './lexical-node';
+import {
+  $getSelectionStyleValueForProperty,
+  $isParentElementRTL,
+  $moveCaretSelection,
+  $moveCharacter,
+  $selectAll,
+  $setBlocksType,
+  $shouldOverrideDefaultCharacterSelection,
+  $wrapNodes,
+} from './range-selection';
+import {
+  createDOMRange,
+  createRectsFromDOMRange,
+  getStyleObjectFromCSS,
+} from './utils';
+
+export {
+  /** @deprecated moved to the lexical package */ $cloneWithProperties,
+} from 'lexical';
+export {
+  $addNodeStyle,
+  $isAtNodeEnd,
+  $patchStyleText,
+  $sliceSelectedTextNodeContent,
+  $trimTextContentFromAnchor,
+};
+/** @deprecated renamed to {@link $trimTextContentFromAnchor} by @lexical/eslint-plugin rules-of-lexical */
+export const trimTextContentFromAnchor = $trimTextContentFromAnchor;
+
+export {
+  $getSelectionStyleValueForProperty,
+  $isParentElementRTL,
+  $moveCaretSelection,
+  $moveCharacter,
+  $selectAll,
+  $setBlocksType,
+  $shouldOverrideDefaultCharacterSelection,
+  $wrapNodes,
+};
+
+export {createDOMRange, createRectsFromDOMRange, getStyleObjectFromCSS};
diff --git a/resources/js/wysiwyg/lexical/selection/lexical-node.ts b/resources/js/wysiwyg/lexical/selection/lexical-node.ts
new file mode 100644
index 00000000000..82f7d330ed1
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/lexical-node.ts
@@ -0,0 +1,427 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {
+  $createTextNode,
+  $getCharacterOffsets,
+  $getNodeByKey,
+  $getPreviousSelection,
+  $isElementNode,
+  $isRangeSelection,
+  $isRootNode,
+  $isTextNode,
+  $isTokenOrSegmented,
+  BaseSelection,
+  LexicalEditor,
+  LexicalNode,
+  Point,
+  RangeSelection,
+  TextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {CSS_TO_STYLES} from './constants';
+import {
+  getCSSFromStyleObject,
+  getStyleObjectFromCSS,
+  getStyleObjectFromRawCSS,
+} from './utils';
+
+/**
+ * Generally used to append text content to HTML and JSON. Grabs the text content and "slices"
+ * it to be generated into the new TextNode.
+ * @param selection - The selection containing the node whose TextNode is to be edited.
+ * @param textNode - The TextNode to be edited.
+ * @returns The updated TextNode.
+ */
+export function $sliceSelectedTextNodeContent(
+  selection: BaseSelection,
+  textNode: TextNode,
+): LexicalNode {
+  const anchorAndFocus = selection.getStartEndPoints();
+  if (
+    textNode.isSelected(selection) &&
+    !textNode.isSegmented() &&
+    !textNode.isToken() &&
+    anchorAndFocus !== null
+  ) {
+    const [anchor, focus] = anchorAndFocus;
+    const isBackward = selection.isBackward();
+    const anchorNode = anchor.getNode();
+    const focusNode = focus.getNode();
+    const isAnchor = textNode.is(anchorNode);
+    const isFocus = textNode.is(focusNode);
+
+    if (isAnchor || isFocus) {
+      const [anchorOffset, focusOffset] = $getCharacterOffsets(selection);
+      const isSame = anchorNode.is(focusNode);
+      const isFirst = textNode.is(isBackward ? focusNode : anchorNode);
+      const isLast = textNode.is(isBackward ? anchorNode : focusNode);
+      let startOffset = 0;
+      let endOffset = undefined;
+
+      if (isSame) {
+        startOffset = anchorOffset > focusOffset ? focusOffset : anchorOffset;
+        endOffset = anchorOffset > focusOffset ? anchorOffset : focusOffset;
+      } else if (isFirst) {
+        const offset = isBackward ? focusOffset : anchorOffset;
+        startOffset = offset;
+        endOffset = undefined;
+      } else if (isLast) {
+        const offset = isBackward ? anchorOffset : focusOffset;
+        startOffset = 0;
+        endOffset = offset;
+      }
+
+      textNode.__text = textNode.__text.slice(startOffset, endOffset);
+      return textNode;
+    }
+  }
+  return textNode;
+}
+
+/**
+ * Determines if the current selection is at the end of the node.
+ * @param point - The point of the selection to test.
+ * @returns true if the provided point offset is in the last possible position, false otherwise.
+ */
+export function $isAtNodeEnd(point: Point): boolean {
+  if (point.type === 'text') {
+    return point.offset === point.getNode().getTextContentSize();
+  }
+  const node = point.getNode();
+  invariant(
+    $isElementNode(node),
+    'isAtNodeEnd: node must be a TextNode or ElementNode',
+  );
+
+  return point.offset === node.getChildrenSize();
+}
+
+/**
+ * Trims text from a node in order to shorten it, eg. to enforce a text's max length. If it deletes text
+ * that is an ancestor of the anchor then it will leave 2 indents, otherwise, if no text content exists, it deletes
+ * the TextNode. It will move the focus to either the end of any left over text or beginning of a new TextNode.
+ * @param editor - The lexical editor.
+ * @param anchor - The anchor of the current selection, where the selection should be pointing.
+ * @param delCount - The amount of characters to delete. Useful as a dynamic variable eg. textContentSize - maxLength;
+ */
+export function $trimTextContentFromAnchor(
+  editor: LexicalEditor,
+  anchor: Point,
+  delCount: number,
+): void {
+  // Work from the current selection anchor point
+  let currentNode: LexicalNode | null = anchor.getNode();
+  let remaining: number = delCount;
+
+  if ($isElementNode(currentNode)) {
+    const descendantNode = currentNode.getDescendantByIndex(anchor.offset);
+    if (descendantNode !== null) {
+      currentNode = descendantNode;
+    }
+  }
+
+  while (remaining > 0 && currentNode !== null) {
+    if ($isElementNode(currentNode)) {
+      const lastDescendant: null | LexicalNode =
+        currentNode.getLastDescendant<LexicalNode>();
+      if (lastDescendant !== null) {
+        currentNode = lastDescendant;
+      }
+    }
+    let nextNode: LexicalNode | null = currentNode.getPreviousSibling();
+    let additionalElementWhitespace = 0;
+    if (nextNode === null) {
+      let parent: LexicalNode | null = currentNode.getParentOrThrow();
+      let parentSibling: LexicalNode | null = parent.getPreviousSibling();
+
+      while (parentSibling === null) {
+        parent = parent.getParent();
+        if (parent === null) {
+          nextNode = null;
+          break;
+        }
+        parentSibling = parent.getPreviousSibling();
+      }
+      if (parent !== null) {
+        additionalElementWhitespace = parent.isInline() ? 0 : 2;
+        nextNode = parentSibling;
+      }
+    }
+    let text = currentNode.getTextContent();
+    // If the text is empty, we need to consider adding in two line breaks to match
+    // the content if we were to get it from its parent.
+    if (text === '' && $isElementNode(currentNode) && !currentNode.isInline()) {
+      // TODO: should this be handled in core?
+      text = '\n\n';
+    }
+    const currentNodeSize = text.length;
+
+    if (!$isTextNode(currentNode) || remaining >= currentNodeSize) {
+      const parent = currentNode.getParent();
+      currentNode.remove();
+      if (
+        parent != null &&
+        parent.getChildrenSize() === 0 &&
+        !$isRootNode(parent)
+      ) {
+        parent.remove();
+      }
+      remaining -= currentNodeSize + additionalElementWhitespace;
+      currentNode = nextNode;
+    } else {
+      const key = currentNode.getKey();
+      // See if we can just revert it to what was in the last editor state
+      const prevTextContent: string | null = editor
+        .getEditorState()
+        .read(() => {
+          const prevNode = $getNodeByKey(key);
+          if ($isTextNode(prevNode) && prevNode.isSimpleText()) {
+            return prevNode.getTextContent();
+          }
+          return null;
+        });
+      const offset = currentNodeSize - remaining;
+      const slicedText = text.slice(0, offset);
+      if (prevTextContent !== null && prevTextContent !== text) {
+        const prevSelection = $getPreviousSelection();
+        let target = currentNode;
+        if (!currentNode.isSimpleText()) {
+          const textNode = $createTextNode(prevTextContent);
+          currentNode.replace(textNode);
+          target = textNode;
+        } else {
+          currentNode.setTextContent(prevTextContent);
+        }
+        if ($isRangeSelection(prevSelection) && prevSelection.isCollapsed()) {
+          const prevOffset = prevSelection.anchor.offset;
+          target.select(prevOffset, prevOffset);
+        }
+      } else if (currentNode.isSimpleText()) {
+        // Split text
+        const isSelected = anchor.key === key;
+        let anchorOffset = anchor.offset;
+        // Move offset to end if it's less than the remaining number, otherwise
+        // we'll have a negative splitStart.
+        if (anchorOffset < remaining) {
+          anchorOffset = currentNodeSize;
+        }
+        const splitStart = isSelected ? anchorOffset - remaining : 0;
+        const splitEnd = isSelected ? anchorOffset : offset;
+        if (isSelected && splitStart === 0) {
+          const [excessNode] = currentNode.splitText(splitStart, splitEnd);
+          excessNode.remove();
+        } else {
+          const [, excessNode] = currentNode.splitText(splitStart, splitEnd);
+          excessNode.remove();
+        }
+      } else {
+        const textNode = $createTextNode(slicedText);
+        currentNode.replace(textNode);
+      }
+      remaining = 0;
+    }
+  }
+}
+
+/**
+ * Gets the TextNode's style object and adds the styles to the CSS.
+ * @param node - The TextNode to add styles to.
+ */
+export function $addNodeStyle(node: TextNode): void {
+  const CSSText = node.getStyle();
+  const styles = getStyleObjectFromRawCSS(CSSText);
+  CSS_TO_STYLES.set(CSSText, styles);
+}
+
+function $patchStyle(
+  target: TextNode | RangeSelection,
+  patch: Record<
+    string,
+    | string
+    | null
+    | ((currentStyleValue: string | null, _target: typeof target) => string)
+  >,
+): void {
+  const prevStyles = getStyleObjectFromCSS(
+    'getStyle' in target ? target.getStyle() : target.style,
+  );
+  const newStyles = Object.entries(patch).reduce<Record<string, string>>(
+    (styles, [key, value]) => {
+      if (typeof value === 'function') {
+        styles[key] = value(prevStyles[key], target);
+      } else if (value === null) {
+        delete styles[key];
+      } else {
+        styles[key] = value;
+      }
+      return styles;
+    },
+    {...prevStyles} || {},
+  );
+  const newCSSText = getCSSFromStyleObject(newStyles);
+  target.setStyle(newCSSText);
+  CSS_TO_STYLES.set(newCSSText, newStyles);
+}
+
+/**
+ * Applies the provided styles to the TextNodes in the provided Selection.
+ * Will update partially selected TextNodes by splitting the TextNode and applying
+ * the styles to the appropriate one.
+ * @param selection - The selected node(s) to update.
+ * @param patch - The patch to apply, which can include multiple styles. \\{CSSProperty: value\\} . Can also accept a function that returns the new property value.
+ */
+export function $patchStyleText(
+  selection: BaseSelection,
+  patch: Record<
+    string,
+    | string
+    | null
+    | ((
+        currentStyleValue: string | null,
+        target: TextNode | RangeSelection,
+      ) => string)
+  >,
+): void {
+  const selectedNodes = selection.getNodes();
+  const selectedNodesLength = selectedNodes.length;
+  const anchorAndFocus = selection.getStartEndPoints();
+  if (anchorAndFocus === null) {
+    return;
+  }
+  const [anchor, focus] = anchorAndFocus;
+
+  const lastIndex = selectedNodesLength - 1;
+  let firstNode = selectedNodes[0];
+  let lastNode = selectedNodes[lastIndex];
+
+  if (selection.isCollapsed() && $isRangeSelection(selection)) {
+    $patchStyle(selection, patch);
+    return;
+  }
+
+  const firstNodeText = firstNode.getTextContent();
+  const firstNodeTextLength = firstNodeText.length;
+  const focusOffset = focus.offset;
+  let anchorOffset = anchor.offset;
+  const isBefore = anchor.isBefore(focus);
+  let startOffset = isBefore ? anchorOffset : focusOffset;
+  let endOffset = isBefore ? focusOffset : anchorOffset;
+  const startType = isBefore ? anchor.type : focus.type;
+  const endType = isBefore ? focus.type : anchor.type;
+  const endKey = isBefore ? focus.key : anchor.key;
+
+  // This is the case where the user only selected the very end of the
+  // first node so we don't want to include it in the formatting change.
+  if ($isTextNode(firstNode) && startOffset === firstNodeTextLength) {
+    const nextSibling = firstNode.getNextSibling();
+
+    if ($isTextNode(nextSibling)) {
+      // we basically make the second node the firstNode, changing offsets accordingly
+      anchorOffset = 0;
+      startOffset = 0;
+      firstNode = nextSibling;
+    }
+  }
+
+  // This is the case where we only selected a single node
+  if (selectedNodes.length === 1) {
+    if ($isTextNode(firstNode) && firstNode.canHaveFormat()) {
+      startOffset =
+        startType === 'element'
+          ? 0
+          : anchorOffset > focusOffset
+          ? focusOffset
+          : anchorOffset;
+      endOffset =
+        endType === 'element'
+          ? firstNodeTextLength
+          : anchorOffset > focusOffset
+          ? anchorOffset
+          : focusOffset;
+
+      // No actual text is selected, so do nothing.
+      if (startOffset === endOffset) {
+        return;
+      }
+
+      // The entire node is selected or a token/segment, so just format it
+      if (
+        $isTokenOrSegmented(firstNode) ||
+        (startOffset === 0 && endOffset === firstNodeTextLength)
+      ) {
+        $patchStyle(firstNode, patch);
+        firstNode.select(startOffset, endOffset);
+      } else {
+        // The node is partially selected, so split it into two nodes
+        // and style the selected one.
+        const splitNodes = firstNode.splitText(startOffset, endOffset);
+        const replacement = startOffset === 0 ? splitNodes[0] : splitNodes[1];
+        $patchStyle(replacement, patch);
+        replacement.select(0, endOffset - startOffset);
+      }
+    } // multiple nodes selected.
+  } else {
+    if (
+      $isTextNode(firstNode) &&
+      startOffset < firstNode.getTextContentSize() &&
+      firstNode.canHaveFormat()
+    ) {
+      if (startOffset !== 0 && !$isTokenOrSegmented(firstNode)) {
+        // the entire first node isn't selected and it isn't a token or segmented, so split it
+        firstNode = firstNode.splitText(startOffset)[1];
+        startOffset = 0;
+        if (isBefore) {
+          anchor.set(firstNode.getKey(), startOffset, 'text');
+        } else {
+          focus.set(firstNode.getKey(), startOffset, 'text');
+        }
+      }
+
+      $patchStyle(firstNode as TextNode, patch);
+    }
+
+    if ($isTextNode(lastNode) && lastNode.canHaveFormat()) {
+      const lastNodeText = lastNode.getTextContent();
+      const lastNodeTextLength = lastNodeText.length;
+
+      // The last node might not actually be the end node
+      //
+      // If not, assume the last node is fully-selected unless the end offset is
+      // zero.
+      if (lastNode.__key !== endKey && endOffset !== 0) {
+        endOffset = lastNodeTextLength;
+      }
+
+      // if the entire last node isn't selected and it isn't a token or segmented, split it
+      if (endOffset !== lastNodeTextLength && !$isTokenOrSegmented(lastNode)) {
+        [lastNode] = lastNode.splitText(endOffset);
+      }
+
+      if (endOffset !== 0 || endType === 'element') {
+        $patchStyle(lastNode as TextNode, patch);
+      }
+    }
+
+    // style all the text nodes in between
+    for (let i = 1; i < lastIndex; i++) {
+      const selectedNode = selectedNodes[i];
+      const selectedNodeKey = selectedNode.getKey();
+
+      if (
+        $isTextNode(selectedNode) &&
+        selectedNode.canHaveFormat() &&
+        selectedNodeKey !== firstNode.getKey() &&
+        selectedNodeKey !== lastNode.getKey() &&
+        !selectedNode.isToken()
+      ) {
+        $patchStyle(selectedNode, patch);
+      }
+    }
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/selection/range-selection.ts b/resources/js/wysiwyg/lexical/selection/range-selection.ts
new file mode 100644
index 00000000000..dbadaf346b6
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/range-selection.ts
@@ -0,0 +1,608 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  BaseSelection,
+  ElementNode,
+  LexicalNode,
+  NodeKey,
+  Point,
+  RangeSelection,
+  TextNode,
+} from 'lexical';
+
+import {TableSelection} from '@lexical/table';
+import {
+  $getAdjacentNode,
+  $getPreviousSelection,
+  $getRoot,
+  $hasAncestor,
+  $isDecoratorNode,
+  $isElementNode,
+  $isLeafNode,
+  $isLineBreakNode,
+  $isRangeSelection,
+  $isRootNode,
+  $isRootOrShadowRoot,
+  $isTextNode,
+  $setSelection,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {getStyleObjectFromCSS} from './utils';
+
+/**
+ * Converts all nodes in the selection that are of one block type to another.
+ * @param selection - The selected blocks to be converted.
+ * @param createElement - The function that creates the node. eg. $createParagraphNode.
+ */
+export function $setBlocksType(
+  selection: BaseSelection | null,
+  createElement: () => ElementNode,
+): void {
+  if (selection === null) {
+    return;
+  }
+  const anchorAndFocus = selection.getStartEndPoints();
+  const anchor = anchorAndFocus ? anchorAndFocus[0] : null;
+
+  if (anchor !== null && anchor.key === 'root') {
+    const element = createElement();
+    const root = $getRoot();
+    const firstChild = root.getFirstChild();
+
+    if (firstChild) {
+      firstChild.replace(element, true);
+    } else {
+      root.append(element);
+    }
+
+    return;
+  }
+
+  const nodes = selection.getNodes();
+  const firstSelectedBlock =
+    anchor !== null ? $getAncestor(anchor.getNode(), INTERNAL_$isBlock) : false;
+  if (firstSelectedBlock && nodes.indexOf(firstSelectedBlock) === -1) {
+    nodes.push(firstSelectedBlock);
+  }
+
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+
+    if (!INTERNAL_$isBlock(node)) {
+      continue;
+    }
+    invariant($isElementNode(node), 'Expected block node to be an ElementNode');
+
+    const targetElement = createElement();
+    targetElement.setFormat(node.getFormatType());
+    targetElement.setIndent(node.getIndent());
+    node.replace(targetElement, true);
+  }
+}
+
+function isPointAttached(point: Point): boolean {
+  return point.getNode().isAttached();
+}
+
+function $removeParentEmptyElements(startingNode: ElementNode): void {
+  let node: ElementNode | null = startingNode;
+
+  while (node !== null && !$isRootOrShadowRoot(node)) {
+    const latest = node.getLatest();
+    const parentNode: ElementNode | null = node.getParent<ElementNode>();
+
+    if (latest.getChildrenSize() === 0) {
+      node.remove(true);
+    }
+
+    node = parentNode;
+  }
+}
+
+/**
+ * @deprecated
+ * Wraps all nodes in the selection into another node of the type returned by createElement.
+ * @param selection - The selection of nodes to be wrapped.
+ * @param createElement - A function that creates the wrapping ElementNode. eg. $createParagraphNode.
+ * @param wrappingElement - An element to append the wrapped selection and its children to.
+ */
+export function $wrapNodes(
+  selection: BaseSelection,
+  createElement: () => ElementNode,
+  wrappingElement: null | ElementNode = null,
+): void {
+  const anchorAndFocus = selection.getStartEndPoints();
+  const anchor = anchorAndFocus ? anchorAndFocus[0] : null;
+  const nodes = selection.getNodes();
+  const nodesLength = nodes.length;
+
+  if (
+    anchor !== null &&
+    (nodesLength === 0 ||
+      (nodesLength === 1 &&
+        anchor.type === 'element' &&
+        anchor.getNode().getChildrenSize() === 0))
+  ) {
+    const target =
+      anchor.type === 'text'
+        ? anchor.getNode().getParentOrThrow()
+        : anchor.getNode();
+    const children = target.getChildren();
+    let element = createElement();
+    element.setFormat(target.getFormatType());
+    element.setIndent(target.getIndent());
+    children.forEach((child) => element.append(child));
+
+    if (wrappingElement) {
+      element = wrappingElement.append(element);
+    }
+
+    target.replace(element);
+
+    return;
+  }
+
+  let topLevelNode = null;
+  let descendants: LexicalNode[] = [];
+  for (let i = 0; i < nodesLength; i++) {
+    const node = nodes[i];
+    // Determine whether wrapping has to be broken down into multiple chunks. This can happen if the
+    // user selected multiple Root-like nodes that have to be treated separately as if they are
+    // their own branch. I.e. you don't want to wrap a whole table, but rather the contents of each
+    // of each of the cell nodes.
+    if ($isRootOrShadowRoot(node)) {
+      $wrapNodesImpl(
+        selection,
+        descendants,
+        descendants.length,
+        createElement,
+        wrappingElement,
+      );
+      descendants = [];
+      topLevelNode = node;
+    } else if (
+      topLevelNode === null ||
+      (topLevelNode !== null && $hasAncestor(node, topLevelNode))
+    ) {
+      descendants.push(node);
+    } else {
+      $wrapNodesImpl(
+        selection,
+        descendants,
+        descendants.length,
+        createElement,
+        wrappingElement,
+      );
+      descendants = [node];
+    }
+  }
+  $wrapNodesImpl(
+    selection,
+    descendants,
+    descendants.length,
+    createElement,
+    wrappingElement,
+  );
+}
+
+/**
+ * Wraps each node into a new ElementNode.
+ * @param selection - The selection of nodes to wrap.
+ * @param nodes - An array of nodes, generally the descendants of the selection.
+ * @param nodesLength - The length of nodes.
+ * @param createElement - A function that creates the wrapping ElementNode. eg. $createParagraphNode.
+ * @param wrappingElement - An element to wrap all the nodes into.
+ * @returns
+ */
+export function $wrapNodesImpl(
+  selection: BaseSelection,
+  nodes: LexicalNode[],
+  nodesLength: number,
+  createElement: () => ElementNode,
+  wrappingElement: null | ElementNode = null,
+): void {
+  if (nodes.length === 0) {
+    return;
+  }
+
+  const firstNode = nodes[0];
+  const elementMapping: Map<NodeKey, ElementNode> = new Map();
+  const elements = [];
+  // The below logic is to find the right target for us to
+  // either insertAfter/insertBefore/append the corresponding
+  // elements to. This is made more complicated due to nested
+  // structures.
+  let target = $isElementNode(firstNode)
+    ? firstNode
+    : firstNode.getParentOrThrow();
+
+  if (target.isInline()) {
+    target = target.getParentOrThrow();
+  }
+
+  let targetIsPrevSibling = false;
+  while (target !== null) {
+    const prevSibling = target.getPreviousSibling<ElementNode>();
+
+    if (prevSibling !== null) {
+      target = prevSibling;
+      targetIsPrevSibling = true;
+      break;
+    }
+
+    target = target.getParentOrThrow();
+
+    if ($isRootOrShadowRoot(target)) {
+      break;
+    }
+  }
+
+  const emptyElements = new Set();
+
+  // Find any top level empty elements
+  for (let i = 0; i < nodesLength; i++) {
+    const node = nodes[i];
+
+    if ($isElementNode(node) && node.getChildrenSize() === 0) {
+      emptyElements.add(node.getKey());
+    }
+  }
+
+  const movedNodes: Set<NodeKey> = new Set();
+
+  // Move out all leaf nodes into our elements array.
+  // If we find a top level empty element, also move make
+  // an element for that.
+  for (let i = 0; i < nodesLength; i++) {
+    const node = nodes[i];
+    let parent = node.getParent();
+
+    if (parent !== null && parent.isInline()) {
+      parent = parent.getParent();
+    }
+
+    if (
+      parent !== null &&
+      $isLeafNode(node) &&
+      !movedNodes.has(node.getKey())
+    ) {
+      const parentKey = parent.getKey();
+
+      if (elementMapping.get(parentKey) === undefined) {
+        const targetElement = createElement();
+        targetElement.setFormat(parent.getFormatType());
+        targetElement.setIndent(parent.getIndent());
+        elements.push(targetElement);
+        elementMapping.set(parentKey, targetElement);
+        // Move node and its siblings to the new
+        // element.
+        parent.getChildren().forEach((child) => {
+          targetElement.append(child);
+          movedNodes.add(child.getKey());
+          if ($isElementNode(child)) {
+            // Skip nested leaf nodes if the parent has already been moved
+            child.getChildrenKeys().forEach((key) => movedNodes.add(key));
+          }
+        });
+        $removeParentEmptyElements(parent);
+      }
+    } else if (emptyElements.has(node.getKey())) {
+      invariant(
+        $isElementNode(node),
+        'Expected node in emptyElements to be an ElementNode',
+      );
+      const targetElement = createElement();
+      targetElement.setFormat(node.getFormatType());
+      targetElement.setIndent(node.getIndent());
+      elements.push(targetElement);
+      node.remove(true);
+    }
+  }
+
+  if (wrappingElement !== null) {
+    for (let i = 0; i < elements.length; i++) {
+      const element = elements[i];
+      wrappingElement.append(element);
+    }
+  }
+  let lastElement = null;
+
+  // If our target is Root-like, let's see if we can re-adjust
+  // so that the target is the first child instead.
+  if ($isRootOrShadowRoot(target)) {
+    if (targetIsPrevSibling) {
+      if (wrappingElement !== null) {
+        target.insertAfter(wrappingElement);
+      } else {
+        for (let i = elements.length - 1; i >= 0; i--) {
+          const element = elements[i];
+          target.insertAfter(element);
+        }
+      }
+    } else {
+      const firstChild = target.getFirstChild();
+
+      if ($isElementNode(firstChild)) {
+        target = firstChild;
+      }
+
+      if (firstChild === null) {
+        if (wrappingElement) {
+          target.append(wrappingElement);
+        } else {
+          for (let i = 0; i < elements.length; i++) {
+            const element = elements[i];
+            target.append(element);
+            lastElement = element;
+          }
+        }
+      } else {
+        if (wrappingElement !== null) {
+          firstChild.insertBefore(wrappingElement);
+        } else {
+          for (let i = 0; i < elements.length; i++) {
+            const element = elements[i];
+            firstChild.insertBefore(element);
+            lastElement = element;
+          }
+        }
+      }
+    }
+  } else {
+    if (wrappingElement) {
+      target.insertAfter(wrappingElement);
+    } else {
+      for (let i = elements.length - 1; i >= 0; i--) {
+        const element = elements[i];
+        target.insertAfter(element);
+        lastElement = element;
+      }
+    }
+  }
+
+  const prevSelection = $getPreviousSelection();
+
+  if (
+    $isRangeSelection(prevSelection) &&
+    isPointAttached(prevSelection.anchor) &&
+    isPointAttached(prevSelection.focus)
+  ) {
+    $setSelection(prevSelection.clone());
+  } else if (lastElement !== null) {
+    lastElement.selectEnd();
+  } else {
+    selection.dirty = true;
+  }
+}
+
+/**
+ * Determines if the default character selection should be overridden. Used with DecoratorNodes
+ * @param selection - The selection whose default character selection may need to be overridden.
+ * @param isBackward - Is the selection backwards (the focus comes before the anchor)?
+ * @returns true if it should be overridden, false if not.
+ */
+export function $shouldOverrideDefaultCharacterSelection(
+  selection: RangeSelection,
+  isBackward: boolean,
+): boolean {
+  const possibleNode = $getAdjacentNode(selection.focus, isBackward);
+
+  return (
+    ($isDecoratorNode(possibleNode) && !possibleNode.isIsolated()) ||
+    ($isElementNode(possibleNode) &&
+      !possibleNode.isInline() &&
+      !possibleNode.canBeEmpty())
+  );
+}
+
+/**
+ * Moves the selection according to the arguments.
+ * @param selection - The selected text or nodes.
+ * @param isHoldingShift - Is the shift key being held down during the operation.
+ * @param isBackward - Is the selection selected backwards (the focus comes before the anchor)?
+ * @param granularity - The distance to adjust the current selection.
+ */
+export function $moveCaretSelection(
+  selection: RangeSelection,
+  isHoldingShift: boolean,
+  isBackward: boolean,
+  granularity: 'character' | 'word' | 'lineboundary',
+): void {
+  selection.modify(isHoldingShift ? 'extend' : 'move', isBackward, granularity);
+}
+
+/**
+ * Tests a parent element for right to left direction.
+ * @param selection - The selection whose parent is to be tested.
+ * @returns true if the selections' parent element has a direction of 'rtl' (right to left), false otherwise.
+ */
+export function $isParentElementRTL(selection: RangeSelection): boolean {
+  const anchorNode = selection.anchor.getNode();
+  const parent = $isRootNode(anchorNode)
+    ? anchorNode
+    : anchorNode.getParentOrThrow();
+
+  return parent.getDirection() === 'rtl';
+}
+
+/**
+ * Moves selection by character according to arguments.
+ * @param selection - The selection of the characters to move.
+ * @param isHoldingShift - Is the shift key being held down during the operation.
+ * @param isBackward - Is the selection backward (the focus comes before the anchor)?
+ */
+export function $moveCharacter(
+  selection: RangeSelection,
+  isHoldingShift: boolean,
+  isBackward: boolean,
+): void {
+  const isRTL = $isParentElementRTL(selection);
+  $moveCaretSelection(
+    selection,
+    isHoldingShift,
+    isBackward ? !isRTL : isRTL,
+    'character',
+  );
+}
+
+/**
+ * Expands the current Selection to cover all of the content in the editor.
+ * @param selection - The current selection.
+ */
+export function $selectAll(selection: RangeSelection): void {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const anchorNode = anchor.getNode();
+  const topParent = anchorNode.getTopLevelElementOrThrow();
+  const root = topParent.getParentOrThrow();
+  let firstNode = root.getFirstDescendant();
+  let lastNode = root.getLastDescendant();
+  let firstType: 'element' | 'text' = 'element';
+  let lastType: 'element' | 'text' = 'element';
+  let lastOffset = 0;
+
+  if ($isTextNode(firstNode)) {
+    firstType = 'text';
+  } else if (!$isElementNode(firstNode) && firstNode !== null) {
+    firstNode = firstNode.getParentOrThrow();
+  }
+
+  if ($isTextNode(lastNode)) {
+    lastType = 'text';
+    lastOffset = lastNode.getTextContentSize();
+  } else if (!$isElementNode(lastNode) && lastNode !== null) {
+    lastNode = lastNode.getParentOrThrow();
+  }
+
+  if (firstNode && lastNode) {
+    anchor.set(firstNode.getKey(), 0, firstType);
+    focus.set(lastNode.getKey(), lastOffset, lastType);
+  }
+}
+
+/**
+ * Returns the current value of a CSS property for Nodes, if set. If not set, it returns the defaultValue.
+ * @param node - The node whose style value to get.
+ * @param styleProperty - The CSS style property.
+ * @param defaultValue - The default value for the property.
+ * @returns The value of the property for node.
+ */
+function $getNodeStyleValueForProperty(
+  node: TextNode,
+  styleProperty: string,
+  defaultValue: string,
+): string {
+  const css = node.getStyle();
+  const styleObject = getStyleObjectFromCSS(css);
+
+  if (styleObject !== null) {
+    return styleObject[styleProperty] || defaultValue;
+  }
+
+  return defaultValue;
+}
+
+/**
+ * Returns the current value of a CSS property for TextNodes in the Selection, if set. If not set, it returns the defaultValue.
+ * If all TextNodes do not have the same value, it returns an empty string.
+ * @param selection - The selection of TextNodes whose value to find.
+ * @param styleProperty - The CSS style property.
+ * @param defaultValue - The default value for the property, defaults to an empty string.
+ * @returns The value of the property for the selected TextNodes.
+ */
+export function $getSelectionStyleValueForProperty(
+  selection: RangeSelection | TableSelection,
+  styleProperty: string,
+  defaultValue = '',
+): string {
+  let styleValue: string | null = null;
+  const nodes = selection.getNodes();
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const isBackward = selection.isBackward();
+  const endOffset = isBackward ? focus.offset : anchor.offset;
+  const endNode = isBackward ? focus.getNode() : anchor.getNode();
+
+  if (
+    $isRangeSelection(selection) &&
+    selection.isCollapsed() &&
+    selection.style !== ''
+  ) {
+    const css = selection.style;
+    const styleObject = getStyleObjectFromCSS(css);
+
+    if (styleObject !== null && styleProperty in styleObject) {
+      return styleObject[styleProperty];
+    }
+  }
+
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+
+    // if no actual characters in the end node are selected, we don't
+    // include it in the selection for purposes of determining style
+    // value
+    if (i !== 0 && endOffset === 0 && node.is(endNode)) {
+      continue;
+    }
+
+    if ($isTextNode(node)) {
+      const nodeStyleValue = $getNodeStyleValueForProperty(
+        node,
+        styleProperty,
+        defaultValue,
+      );
+
+      if (styleValue === null) {
+        styleValue = nodeStyleValue;
+      } else if (styleValue !== nodeStyleValue) {
+        // multiple text nodes are in the selection and they don't all
+        // have the same style.
+        styleValue = '';
+        break;
+      }
+    }
+  }
+
+  return styleValue === null ? defaultValue : styleValue;
+}
+
+/**
+ * This function is for internal use of the library.
+ * Please do not use it as it may change in the future.
+ */
+export function INTERNAL_$isBlock(node: LexicalNode): node is ElementNode {
+  if ($isDecoratorNode(node)) {
+    return false;
+  }
+  if (!$isElementNode(node) || $isRootOrShadowRoot(node)) {
+    return false;
+  }
+
+  const firstChild = node.getFirstChild();
+  const isLeafElement =
+    firstChild === null ||
+    $isLineBreakNode(firstChild) ||
+    $isTextNode(firstChild) ||
+    firstChild.isInline();
+
+  return !node.isInline() && node.canBeEmpty() !== false && isLeafElement;
+}
+
+export function $getAncestor<NodeType extends LexicalNode = LexicalNode>(
+  node: LexicalNode,
+  predicate: (ancestor: LexicalNode) => ancestor is NodeType,
+) {
+  let parent = node;
+  while (parent !== null && parent.getParent() !== null && !predicate(parent)) {
+    parent = parent.getParentOrThrow();
+  }
+  return predicate(parent) ? parent : null;
+}
diff --git a/resources/js/wysiwyg/lexical/selection/utils.ts b/resources/js/wysiwyg/lexical/selection/utils.ts
new file mode 100644
index 00000000000..0608706eab7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/selection/utils.ts
@@ -0,0 +1,228 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import type {LexicalEditor, LexicalNode} from 'lexical';
+
+import {$isTextNode} from 'lexical';
+
+import {CSS_TO_STYLES} from './constants';
+
+function getDOMTextNode(element: Node | null): Text | null {
+  let node = element;
+
+  while (node != null) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      return node as Text;
+    }
+
+    node = node.firstChild;
+  }
+
+  return null;
+}
+
+function getDOMIndexWithinParent(node: ChildNode): [ParentNode, number] {
+  const parent = node.parentNode;
+
+  if (parent == null) {
+    throw new Error('Should never happen');
+  }
+
+  return [parent, Array.from(parent.childNodes).indexOf(node)];
+}
+
+/**
+ * Creates a selection range for the DOM.
+ * @param editor - The lexical editor.
+ * @param anchorNode - The anchor node of a selection.
+ * @param _anchorOffset - The amount of space offset from the anchor to the focus.
+ * @param focusNode - The current focus.
+ * @param _focusOffset - The amount of space offset from the focus to the anchor.
+ * @returns The range of selection for the DOM that was created.
+ */
+export function createDOMRange(
+  editor: LexicalEditor,
+  anchorNode: LexicalNode,
+  _anchorOffset: number,
+  focusNode: LexicalNode,
+  _focusOffset: number,
+): Range | null {
+  const anchorKey = anchorNode.getKey();
+  const focusKey = focusNode.getKey();
+  const range = document.createRange();
+  let anchorDOM: Node | Text | null = editor.getElementByKey(anchorKey);
+  let focusDOM: Node | Text | null = editor.getElementByKey(focusKey);
+  let anchorOffset = _anchorOffset;
+  let focusOffset = _focusOffset;
+
+  if ($isTextNode(anchorNode)) {
+    anchorDOM = getDOMTextNode(anchorDOM);
+  }
+
+  if ($isTextNode(focusNode)) {
+    focusDOM = getDOMTextNode(focusDOM);
+  }
+
+  if (
+    anchorNode === undefined ||
+    focusNode === undefined ||
+    anchorDOM === null ||
+    focusDOM === null
+  ) {
+    return null;
+  }
+
+  if (anchorDOM.nodeName === 'BR') {
+    [anchorDOM, anchorOffset] = getDOMIndexWithinParent(anchorDOM as ChildNode);
+  }
+
+  if (focusDOM.nodeName === 'BR') {
+    [focusDOM, focusOffset] = getDOMIndexWithinParent(focusDOM as ChildNode);
+  }
+
+  const firstChild = anchorDOM.firstChild;
+
+  if (
+    anchorDOM === focusDOM &&
+    firstChild != null &&
+    firstChild.nodeName === 'BR' &&
+    anchorOffset === 0 &&
+    focusOffset === 0
+  ) {
+    focusOffset = 1;
+  }
+
+  try {
+    range.setStart(anchorDOM, anchorOffset);
+    range.setEnd(focusDOM, focusOffset);
+  } catch (e) {
+    return null;
+  }
+
+  if (
+    range.collapsed &&
+    (anchorOffset !== focusOffset || anchorKey !== focusKey)
+  ) {
+    // Range is backwards, we need to reverse it
+    range.setStart(focusDOM, focusOffset);
+    range.setEnd(anchorDOM, anchorOffset);
+  }
+
+  return range;
+}
+
+/**
+ * Creates DOMRects, generally used to help the editor find a specific location on the screen.
+ * @param editor - The lexical editor
+ * @param range - A fragment of a document that can contain nodes and parts of text nodes.
+ * @returns The selectionRects as an array.
+ */
+export function createRectsFromDOMRange(
+  editor: LexicalEditor,
+  range: Range,
+): Array<ClientRect> {
+  const rootElement = editor.getRootElement();
+
+  if (rootElement === null) {
+    return [];
+  }
+  const rootRect = rootElement.getBoundingClientRect();
+  const computedStyle = getComputedStyle(rootElement);
+  const rootPadding =
+    parseFloat(computedStyle.paddingLeft) +
+    parseFloat(computedStyle.paddingRight);
+  const selectionRects = Array.from(range.getClientRects());
+  let selectionRectsLength = selectionRects.length;
+  //sort rects from top left to bottom right.
+  selectionRects.sort((a, b) => {
+    const top = a.top - b.top;
+    // Some rects match position closely, but not perfectly,
+    // so we give a 3px tolerance.
+    if (Math.abs(top) <= 3) {
+      return a.left - b.left;
+    }
+    return top;
+  });
+  let prevRect;
+  for (let i = 0; i < selectionRectsLength; i++) {
+    const selectionRect = selectionRects[i];
+    // Exclude rects that overlap preceding Rects in the sorted list.
+    const isOverlappingRect =
+      prevRect &&
+      prevRect.top <= selectionRect.top &&
+      prevRect.top + prevRect.height > selectionRect.top &&
+      prevRect.left + prevRect.width > selectionRect.left;
+    // Exclude selections that span the entire element
+    const selectionSpansElement =
+      selectionRect.width + rootPadding === rootRect.width;
+    if (isOverlappingRect || selectionSpansElement) {
+      selectionRects.splice(i--, 1);
+      selectionRectsLength--;
+      continue;
+    }
+    prevRect = selectionRect;
+  }
+  return selectionRects;
+}
+
+/**
+ * Creates an object containing all the styles and their values provided in the CSS string.
+ * @param css - The CSS string of styles and their values.
+ * @returns The styleObject containing all the styles and their values.
+ */
+export function getStyleObjectFromRawCSS(css: string): Record<string, string> {
+  const styleObject: Record<string, string> = {};
+  const styles = css.split(';');
+
+  for (const style of styles) {
+    if (style !== '') {
+      const [key, value] = style.split(/:([^]+)/); // split on first colon
+      if (key && value) {
+        styleObject[key.trim()] = value.trim();
+      }
+    }
+  }
+
+  return styleObject;
+}
+
+/**
+ * Given a CSS string, returns an object from the style cache.
+ * @param css - The CSS property as a string.
+ * @returns The value of the given CSS property.
+ */
+export function getStyleObjectFromCSS(css: string): Record<string, string> {
+  let value = CSS_TO_STYLES.get(css);
+  if (value === undefined) {
+    value = getStyleObjectFromRawCSS(css);
+    CSS_TO_STYLES.set(css, value);
+  }
+
+  if (__DEV__) {
+    // Freeze the value in DEV to prevent accidental mutations
+    Object.freeze(value);
+  }
+
+  return value;
+}
+
+/**
+ * Gets the CSS styles from the style object.
+ * @param styles - The style object containing the styles to get.
+ * @returns A string containing the CSS styles and their values.
+ */
+export function getCSSFromStyleObject(styles: Record<string, string>): string {
+  let css = '';
+
+  for (const style in styles) {
+    if (style) {
+      css += `${style}: ${styles[style]};`;
+    }
+  }
+
+  return css;
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
new file mode 100644
index 00000000000..455d39bf6c9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -0,0 +1,374 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  EditorConfig,
+  LexicalEditor,
+  LexicalNode,
+  NodeKey,
+  SerializedElementNode,
+  Spread,
+} from 'lexical';
+
+import {addClassNamesToElement} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $createParagraphNode,
+  $isElementNode,
+  $isLineBreakNode,
+  $isTextNode,
+  ElementNode,
+} from 'lexical';
+
+import {COLUMN_WIDTH, PIXEL_VALUE_REG_EXP} from './constants';
+
+export const TableCellHeaderStates = {
+  BOTH: 3,
+  COLUMN: 2,
+  NO_STATUS: 0,
+  ROW: 1,
+};
+
+export type TableCellHeaderState =
+  typeof TableCellHeaderStates[keyof typeof TableCellHeaderStates];
+
+export type SerializedTableCellNode = Spread<
+  {
+    colSpan?: number;
+    rowSpan?: number;
+    headerState: TableCellHeaderState;
+    width?: number;
+    backgroundColor?: null | string;
+  },
+  SerializedElementNode
+>;
+
+/** @noInheritDoc */
+export class TableCellNode extends ElementNode {
+  /** @internal */
+  __colSpan: number;
+  /** @internal */
+  __rowSpan: number;
+  /** @internal */
+  __headerState: TableCellHeaderState;
+  /** @internal */
+  __width?: number;
+  /** @internal */
+  __backgroundColor: null | string;
+
+  static getType(): string {
+    return 'tablecell';
+  }
+
+  static clone(node: TableCellNode): TableCellNode {
+    const cellNode = new TableCellNode(
+      node.__headerState,
+      node.__colSpan,
+      node.__width,
+      node.__key,
+    );
+    cellNode.__rowSpan = node.__rowSpan;
+    cellNode.__backgroundColor = node.__backgroundColor;
+    return cellNode;
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      td: (node: Node) => ({
+        conversion: $convertTableCellNodeElement,
+        priority: 0,
+      }),
+      th: (node: Node) => ({
+        conversion: $convertTableCellNodeElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  static importJSON(serializedNode: SerializedTableCellNode): TableCellNode {
+    const colSpan = serializedNode.colSpan || 1;
+    const rowSpan = serializedNode.rowSpan || 1;
+    const cellNode = $createTableCellNode(
+      serializedNode.headerState,
+      colSpan,
+      serializedNode.width || undefined,
+    );
+    cellNode.__rowSpan = rowSpan;
+    cellNode.__backgroundColor = serializedNode.backgroundColor || null;
+    return cellNode;
+  }
+
+  constructor(
+    headerState = TableCellHeaderStates.NO_STATUS,
+    colSpan = 1,
+    width?: number,
+    key?: NodeKey,
+  ) {
+    super(key);
+    this.__colSpan = colSpan;
+    this.__rowSpan = 1;
+    this.__headerState = headerState;
+    this.__width = width;
+    this.__backgroundColor = null;
+  }
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const element = document.createElement(
+      this.getTag(),
+    ) as HTMLTableCellElement;
+
+    if (this.__width) {
+      element.style.width = `${this.__width}px`;
+    }
+    if (this.__colSpan > 1) {
+      element.colSpan = this.__colSpan;
+    }
+    if (this.__rowSpan > 1) {
+      element.rowSpan = this.__rowSpan;
+    }
+    if (this.__backgroundColor !== null) {
+      element.style.backgroundColor = this.__backgroundColor;
+    }
+
+    addClassNamesToElement(
+      element,
+      config.theme.tableCell,
+      this.hasHeader() && config.theme.tableCellHeader,
+    );
+
+    return element;
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const {element} = super.exportDOM(editor);
+
+    if (element) {
+      const element_ = element as HTMLTableCellElement;
+      element_.style.border = '1px solid black';
+      if (this.__colSpan > 1) {
+        element_.colSpan = this.__colSpan;
+      }
+      if (this.__rowSpan > 1) {
+        element_.rowSpan = this.__rowSpan;
+      }
+      element_.style.width = `${this.getWidth() || COLUMN_WIDTH}px`;
+
+      element_.style.verticalAlign = 'top';
+      element_.style.textAlign = 'start';
+
+      const backgroundColor = this.getBackgroundColor();
+      if (backgroundColor !== null) {
+        element_.style.backgroundColor = backgroundColor;
+      } else if (this.hasHeader()) {
+        element_.style.backgroundColor = '#f2f3f5';
+      }
+    }
+
+    return {
+      element,
+    };
+  }
+
+  exportJSON(): SerializedTableCellNode {
+    return {
+      ...super.exportJSON(),
+      backgroundColor: this.getBackgroundColor(),
+      colSpan: this.__colSpan,
+      headerState: this.__headerState,
+      rowSpan: this.__rowSpan,
+      type: 'tablecell',
+      width: this.getWidth(),
+    };
+  }
+
+  getColSpan(): number {
+    return this.__colSpan;
+  }
+
+  setColSpan(colSpan: number): this {
+    this.getWritable().__colSpan = colSpan;
+    return this;
+  }
+
+  getRowSpan(): number {
+    return this.__rowSpan;
+  }
+
+  setRowSpan(rowSpan: number): this {
+    this.getWritable().__rowSpan = rowSpan;
+    return this;
+  }
+
+  getTag(): string {
+    return this.hasHeader() ? 'th' : 'td';
+  }
+
+  setHeaderStyles(headerState: TableCellHeaderState): TableCellHeaderState {
+    const self = this.getWritable();
+    self.__headerState = headerState;
+    return this.__headerState;
+  }
+
+  getHeaderStyles(): TableCellHeaderState {
+    return this.getLatest().__headerState;
+  }
+
+  setWidth(width: number): number | null | undefined {
+    const self = this.getWritable();
+    self.__width = width;
+    return this.__width;
+  }
+
+  getWidth(): number | undefined {
+    return this.getLatest().__width;
+  }
+
+  getBackgroundColor(): null | string {
+    return this.getLatest().__backgroundColor;
+  }
+
+  setBackgroundColor(newBackgroundColor: null | string): void {
+    this.getWritable().__backgroundColor = newBackgroundColor;
+  }
+
+  toggleHeaderStyle(headerStateToToggle: TableCellHeaderState): TableCellNode {
+    const self = this.getWritable();
+
+    if ((self.__headerState & headerStateToToggle) === headerStateToToggle) {
+      self.__headerState -= headerStateToToggle;
+    } else {
+      self.__headerState += headerStateToToggle;
+    }
+
+    return self;
+  }
+
+  hasHeaderState(headerState: TableCellHeaderState): boolean {
+    return (this.getHeaderStyles() & headerState) === headerState;
+  }
+
+  hasHeader(): boolean {
+    return this.getLatest().__headerState !== TableCellHeaderStates.NO_STATUS;
+  }
+
+  updateDOM(prevNode: TableCellNode): boolean {
+    return (
+      prevNode.__headerState !== this.__headerState ||
+      prevNode.__width !== this.__width ||
+      prevNode.__colSpan !== this.__colSpan ||
+      prevNode.__rowSpan !== this.__rowSpan ||
+      prevNode.__backgroundColor !== this.__backgroundColor
+    );
+  }
+
+  isShadowRoot(): boolean {
+    return true;
+  }
+
+  collapseAtStart(): true {
+    return true;
+  }
+
+  canBeEmpty(): false {
+    return false;
+  }
+
+  canIndent(): false {
+    return false;
+  }
+}
+
+export function $convertTableCellNodeElement(
+  domNode: Node,
+): DOMConversionOutput {
+  const domNode_ = domNode as HTMLTableCellElement;
+  const nodeName = domNode.nodeName.toLowerCase();
+
+  let width: number | undefined = undefined;
+
+  if (PIXEL_VALUE_REG_EXP.test(domNode_.style.width)) {
+    width = parseFloat(domNode_.style.width);
+  }
+
+  const tableCellNode = $createTableCellNode(
+    nodeName === 'th'
+      ? TableCellHeaderStates.ROW
+      : TableCellHeaderStates.NO_STATUS,
+    domNode_.colSpan,
+    width,
+  );
+
+  tableCellNode.__rowSpan = domNode_.rowSpan;
+  const backgroundColor = domNode_.style.backgroundColor;
+  if (backgroundColor !== '') {
+    tableCellNode.__backgroundColor = backgroundColor;
+  }
+
+  const style = domNode_.style;
+  const textDecoration = style.textDecoration.split(' ');
+  const hasBoldFontWeight =
+    style.fontWeight === '700' || style.fontWeight === 'bold';
+  const hasLinethroughTextDecoration = textDecoration.includes('line-through');
+  const hasItalicFontStyle = style.fontStyle === 'italic';
+  const hasUnderlineTextDecoration = textDecoration.includes('underline');
+  return {
+    after: (childLexicalNodes) => {
+      if (childLexicalNodes.length === 0) {
+        childLexicalNodes.push($createParagraphNode());
+      }
+      return childLexicalNodes;
+    },
+    forChild: (lexicalNode, parentLexicalNode) => {
+      if ($isTableCellNode(parentLexicalNode) && !$isElementNode(lexicalNode)) {
+        const paragraphNode = $createParagraphNode();
+        if (
+          $isLineBreakNode(lexicalNode) &&
+          lexicalNode.getTextContent() === '\n'
+        ) {
+          return null;
+        }
+        if ($isTextNode(lexicalNode)) {
+          if (hasBoldFontWeight) {
+            lexicalNode.toggleFormat('bold');
+          }
+          if (hasLinethroughTextDecoration) {
+            lexicalNode.toggleFormat('strikethrough');
+          }
+          if (hasItalicFontStyle) {
+            lexicalNode.toggleFormat('italic');
+          }
+          if (hasUnderlineTextDecoration) {
+            lexicalNode.toggleFormat('underline');
+          }
+        }
+        paragraphNode.append(lexicalNode);
+        return paragraphNode;
+      }
+
+      return lexicalNode;
+    },
+    node: tableCellNode,
+  };
+}
+
+export function $createTableCellNode(
+  headerState: TableCellHeaderState,
+  colSpan = 1,
+  width?: number,
+): TableCellNode {
+  return $applyNodeReplacement(new TableCellNode(headerState, colSpan, width));
+}
+
+export function $isTableCellNode(
+  node: LexicalNode | null | undefined,
+): node is TableCellNode {
+  return node instanceof TableCellNode;
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCommands.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCommands.ts
new file mode 100644
index 00000000000..8fb542383d2
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCommands.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalCommand} from 'lexical';
+
+import {createCommand} from 'lexical';
+
+export type InsertTableCommandPayloadHeaders =
+  | Readonly<{
+      rows: boolean;
+      columns: boolean;
+    }>
+  | boolean;
+
+export type InsertTableCommandPayload = Readonly<{
+  columns: string;
+  rows: string;
+  includeHeaders?: InsertTableCommandPayloadHeaders;
+}>;
+
+export const INSERT_TABLE_COMMAND: LexicalCommand<InsertTableCommandPayload> =
+  createCommand('INSERT_TABLE_COMMAND');
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
new file mode 100644
index 00000000000..3e695eaa475
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -0,0 +1,258 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {TableCellNode} from './LexicalTableCellNode';
+import type {
+  DOMConversionMap,
+  DOMConversionOutput,
+  DOMExportOutput,
+  EditorConfig,
+  LexicalEditor,
+  LexicalNode,
+  NodeKey,
+  SerializedElementNode,
+} from 'lexical';
+
+import {addClassNamesToElement, isHTMLElement} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  $getNearestNodeFromDOMNode,
+  ElementNode,
+} from 'lexical';
+
+import {$isTableCellNode} from './LexicalTableCellNode';
+import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
+import {$isTableRowNode, TableRowNode} from './LexicalTableRowNode';
+import {getTable} from './LexicalTableSelectionHelpers';
+
+export type SerializedTableNode = SerializedElementNode;
+
+/** @noInheritDoc */
+export class TableNode extends ElementNode {
+  static getType(): string {
+    return 'table';
+  }
+
+  static clone(node: TableNode): TableNode {
+    return new TableNode(node.__key);
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      table: (_node: Node) => ({
+        conversion: $convertTableElement,
+        priority: 1,
+      }),
+    };
+  }
+
+  static importJSON(_serializedNode: SerializedTableNode): TableNode {
+    return $createTableNode();
+  }
+
+  constructor(key?: NodeKey) {
+    super(key);
+  }
+
+  exportJSON(): SerializedElementNode {
+    return {
+      ...super.exportJSON(),
+      type: 'table',
+      version: 1,
+    };
+  }
+
+  createDOM(config: EditorConfig, editor?: LexicalEditor): HTMLElement {
+    const tableElement = document.createElement('table');
+
+    addClassNamesToElement(tableElement, config.theme.table);
+
+    return tableElement;
+  }
+
+  updateDOM(): boolean {
+    return false;
+  }
+
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    return {
+      ...super.exportDOM(editor),
+      after: (tableElement) => {
+        if (tableElement) {
+          const newElement = tableElement.cloneNode() as ParentNode;
+          const colGroup = document.createElement('colgroup');
+          const tBody = document.createElement('tbody');
+          if (isHTMLElement(tableElement)) {
+            tBody.append(...tableElement.children);
+          }
+          const firstRow = this.getFirstChildOrThrow<TableRowNode>();
+
+          if (!$isTableRowNode(firstRow)) {
+            throw new Error('Expected to find row node.');
+          }
+
+          const colCount = firstRow.getChildrenSize();
+
+          for (let i = 0; i < colCount; i++) {
+            const col = document.createElement('col');
+            colGroup.append(col);
+          }
+
+          newElement.replaceChildren(colGroup, tBody);
+
+          return newElement as HTMLElement;
+        }
+      },
+    };
+  }
+
+  canBeEmpty(): false {
+    return false;
+  }
+
+  isShadowRoot(): boolean {
+    return true;
+  }
+
+  getCordsFromCellNode(
+    tableCellNode: TableCellNode,
+    table: TableDOMTable,
+  ): {x: number; y: number} {
+    const {rows, domRows} = table;
+
+    for (let y = 0; y < rows; y++) {
+      const row = domRows[y];
+
+      if (row == null) {
+        continue;
+      }
+
+      const x = row.findIndex((cell) => {
+        if (!cell) {
+          return;
+        }
+        const {elem} = cell;
+        const cellNode = $getNearestNodeFromDOMNode(elem);
+        return cellNode === tableCellNode;
+      });
+
+      if (x !== -1) {
+        return {x, y};
+      }
+    }
+
+    throw new Error('Cell not found in table.');
+  }
+
+  getDOMCellFromCords(
+    x: number,
+    y: number,
+    table: TableDOMTable,
+  ): null | TableDOMCell {
+    const {domRows} = table;
+
+    const row = domRows[y];
+
+    if (row == null) {
+      return null;
+    }
+
+    const index = x < row.length ? x : row.length - 1;
+
+    const cell = row[index];
+
+    if (cell == null) {
+      return null;
+    }
+
+    return cell;
+  }
+
+  getDOMCellFromCordsOrThrow(
+    x: number,
+    y: number,
+    table: TableDOMTable,
+  ): TableDOMCell {
+    const cell = this.getDOMCellFromCords(x, y, table);
+
+    if (!cell) {
+      throw new Error('Cell not found at cords.');
+    }
+
+    return cell;
+  }
+
+  getCellNodeFromCords(
+    x: number,
+    y: number,
+    table: TableDOMTable,
+  ): null | TableCellNode {
+    const cell = this.getDOMCellFromCords(x, y, table);
+
+    if (cell == null) {
+      return null;
+    }
+
+    const node = $getNearestNodeFromDOMNode(cell.elem);
+
+    if ($isTableCellNode(node)) {
+      return node;
+    }
+
+    return null;
+  }
+
+  getCellNodeFromCordsOrThrow(
+    x: number,
+    y: number,
+    table: TableDOMTable,
+  ): TableCellNode {
+    const node = this.getCellNodeFromCords(x, y, table);
+
+    if (!node) {
+      throw new Error('Node at cords not TableCellNode.');
+    }
+
+    return node;
+  }
+
+  canSelectBefore(): true {
+    return true;
+  }
+
+  canIndent(): false {
+    return false;
+  }
+}
+
+export function $getElementForTableNode(
+  editor: LexicalEditor,
+  tableNode: TableNode,
+): TableDOMTable {
+  const tableElement = editor.getElementByKey(tableNode.getKey());
+
+  if (tableElement == null) {
+    throw new Error('Table Element Not Found');
+  }
+
+  return getTable(tableElement);
+}
+
+export function $convertTableElement(_domNode: Node): DOMConversionOutput {
+  return {node: $createTableNode()};
+}
+
+export function $createTableNode(): TableNode {
+  return $applyNodeReplacement(new TableNode());
+}
+
+export function $isTableNode(
+  node: LexicalNode | null | undefined,
+): node is TableNode {
+  return node instanceof TableNode;
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableObserver.ts b/resources/js/wysiwyg/lexical/table/LexicalTableObserver.ts
new file mode 100644
index 00000000000..0d40d0699e2
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableObserver.ts
@@ -0,0 +1,414 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor, NodeKey, TextFormatType} from 'lexical';
+
+import {
+  addClassNamesToElement,
+  removeClassNamesFromElement,
+} from '@lexical/utils';
+import {
+  $createParagraphNode,
+  $createRangeSelection,
+  $createTextNode,
+  $getNearestNodeFromDOMNode,
+  $getNodeByKey,
+  $getRoot,
+  $getSelection,
+  $isElementNode,
+  $setSelection,
+  SELECTION_CHANGE_COMMAND,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {$isTableCellNode} from './LexicalTableCellNode';
+import {$isTableNode} from './LexicalTableNode';
+import {
+  $createTableSelection,
+  $isTableSelection,
+  type TableSelection,
+} from './LexicalTableSelection';
+import {
+  $findTableNode,
+  $updateDOMForSelection,
+  getDOMSelection,
+  getTable,
+} from './LexicalTableSelectionHelpers';
+
+export type TableDOMCell = {
+  elem: HTMLElement;
+  highlighted: boolean;
+  hasBackgroundColor: boolean;
+  x: number;
+  y: number;
+};
+
+export type TableDOMRows = Array<Array<TableDOMCell | undefined> | undefined>;
+
+export type TableDOMTable = {
+  domRows: TableDOMRows;
+  columns: number;
+  rows: number;
+};
+
+export class TableObserver {
+  focusX: number;
+  focusY: number;
+  listenersToRemove: Set<() => void>;
+  table: TableDOMTable;
+  isHighlightingCells: boolean;
+  anchorX: number;
+  anchorY: number;
+  tableNodeKey: NodeKey;
+  anchorCell: TableDOMCell | null;
+  focusCell: TableDOMCell | null;
+  anchorCellNodeKey: NodeKey | null;
+  focusCellNodeKey: NodeKey | null;
+  editor: LexicalEditor;
+  tableSelection: TableSelection | null;
+  hasHijackedSelectionStyles: boolean;
+  isSelecting: boolean;
+
+  constructor(editor: LexicalEditor, tableNodeKey: string) {
+    this.isHighlightingCells = false;
+    this.anchorX = -1;
+    this.anchorY = -1;
+    this.focusX = -1;
+    this.focusY = -1;
+    this.listenersToRemove = new Set();
+    this.tableNodeKey = tableNodeKey;
+    this.editor = editor;
+    this.table = {
+      columns: 0,
+      domRows: [],
+      rows: 0,
+    };
+    this.tableSelection = null;
+    this.anchorCellNodeKey = null;
+    this.focusCellNodeKey = null;
+    this.anchorCell = null;
+    this.focusCell = null;
+    this.hasHijackedSelectionStyles = false;
+    this.trackTable();
+    this.isSelecting = false;
+  }
+
+  getTable(): TableDOMTable {
+    return this.table;
+  }
+
+  removeListeners() {
+    Array.from(this.listenersToRemove).forEach((removeListener) =>
+      removeListener(),
+    );
+  }
+
+  trackTable() {
+    const observer = new MutationObserver((records) => {
+      this.editor.update(() => {
+        let gridNeedsRedraw = false;
+
+        for (let i = 0; i < records.length; i++) {
+          const record = records[i];
+          const target = record.target;
+          const nodeName = target.nodeName;
+
+          if (
+            nodeName === 'TABLE' ||
+            nodeName === 'TBODY' ||
+            nodeName === 'THEAD' ||
+            nodeName === 'TR'
+          ) {
+            gridNeedsRedraw = true;
+            break;
+          }
+        }
+
+        if (!gridNeedsRedraw) {
+          return;
+        }
+
+        const tableElement = this.editor.getElementByKey(this.tableNodeKey);
+
+        if (!tableElement) {
+          throw new Error('Expected to find TableElement in DOM');
+        }
+
+        this.table = getTable(tableElement);
+      });
+    });
+    this.editor.update(() => {
+      const tableElement = this.editor.getElementByKey(this.tableNodeKey);
+
+      if (!tableElement) {
+        throw new Error('Expected to find TableElement in DOM');
+      }
+
+      this.table = getTable(tableElement);
+      observer.observe(tableElement, {
+        attributes: true,
+        childList: true,
+        subtree: true,
+      });
+    });
+  }
+
+  clearHighlight() {
+    const editor = this.editor;
+    this.isHighlightingCells = false;
+    this.anchorX = -1;
+    this.anchorY = -1;
+    this.focusX = -1;
+    this.focusY = -1;
+    this.tableSelection = null;
+    this.anchorCellNodeKey = null;
+    this.focusCellNodeKey = null;
+    this.anchorCell = null;
+    this.focusCell = null;
+    this.hasHijackedSelectionStyles = false;
+
+    this.enableHighlightStyle();
+
+    editor.update(() => {
+      const tableNode = $getNodeByKey(this.tableNodeKey);
+
+      if (!$isTableNode(tableNode)) {
+        throw new Error('Expected TableNode.');
+      }
+
+      const tableElement = editor.getElementByKey(this.tableNodeKey);
+
+      if (!tableElement) {
+        throw new Error('Expected to find TableElement in DOM');
+      }
+
+      const grid = getTable(tableElement);
+      $updateDOMForSelection(editor, grid, null);
+      $setSelection(null);
+      editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+    });
+  }
+
+  enableHighlightStyle() {
+    const editor = this.editor;
+    editor.update(() => {
+      const tableElement = editor.getElementByKey(this.tableNodeKey);
+
+      if (!tableElement) {
+        throw new Error('Expected to find TableElement in DOM');
+      }
+
+      removeClassNamesFromElement(
+        tableElement,
+        editor._config.theme.tableSelection,
+      );
+      tableElement.classList.remove('disable-selection');
+      this.hasHijackedSelectionStyles = false;
+    });
+  }
+
+  disableHighlightStyle() {
+    const editor = this.editor;
+    editor.update(() => {
+      const tableElement = editor.getElementByKey(this.tableNodeKey);
+
+      if (!tableElement) {
+        throw new Error('Expected to find TableElement in DOM');
+      }
+
+      addClassNamesToElement(tableElement, editor._config.theme.tableSelection);
+      this.hasHijackedSelectionStyles = true;
+    });
+  }
+
+  updateTableTableSelection(selection: TableSelection | null): void {
+    if (selection !== null && selection.tableKey === this.tableNodeKey) {
+      const editor = this.editor;
+      this.tableSelection = selection;
+      this.isHighlightingCells = true;
+      this.disableHighlightStyle();
+      $updateDOMForSelection(editor, this.table, this.tableSelection);
+    } else if (selection == null) {
+      this.clearHighlight();
+    } else {
+      this.tableNodeKey = selection.tableKey;
+      this.updateTableTableSelection(selection);
+    }
+  }
+
+  setFocusCellForSelection(cell: TableDOMCell, ignoreStart = false) {
+    const editor = this.editor;
+    editor.update(() => {
+      const tableNode = $getNodeByKey(this.tableNodeKey);
+
+      if (!$isTableNode(tableNode)) {
+        throw new Error('Expected TableNode.');
+      }
+
+      const tableElement = editor.getElementByKey(this.tableNodeKey);
+
+      if (!tableElement) {
+        throw new Error('Expected to find TableElement in DOM');
+      }
+
+      const cellX = cell.x;
+      const cellY = cell.y;
+      this.focusCell = cell;
+
+      if (this.anchorCell !== null) {
+        const domSelection = getDOMSelection(editor._window);
+        // Collapse the selection
+        if (domSelection) {
+          domSelection.setBaseAndExtent(
+            this.anchorCell.elem,
+            0,
+            this.focusCell.elem,
+            0,
+          );
+        }
+      }
+
+      if (
+        !this.isHighlightingCells &&
+        (this.anchorX !== cellX || this.anchorY !== cellY || ignoreStart)
+      ) {
+        this.isHighlightingCells = true;
+        this.disableHighlightStyle();
+      } else if (cellX === this.focusX && cellY === this.focusY) {
+        return;
+      }
+
+      this.focusX = cellX;
+      this.focusY = cellY;
+
+      if (this.isHighlightingCells) {
+        const focusTableCellNode = $getNearestNodeFromDOMNode(cell.elem);
+
+        if (
+          this.tableSelection != null &&
+          this.anchorCellNodeKey != null &&
+          $isTableCellNode(focusTableCellNode) &&
+          tableNode.is($findTableNode(focusTableCellNode))
+        ) {
+          const focusNodeKey = focusTableCellNode.getKey();
+
+          this.tableSelection =
+            this.tableSelection.clone() || $createTableSelection();
+
+          this.focusCellNodeKey = focusNodeKey;
+          this.tableSelection.set(
+            this.tableNodeKey,
+            this.anchorCellNodeKey,
+            this.focusCellNodeKey,
+          );
+
+          $setSelection(this.tableSelection);
+
+          editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+
+          $updateDOMForSelection(editor, this.table, this.tableSelection);
+        }
+      }
+    });
+  }
+
+  setAnchorCellForSelection(cell: TableDOMCell) {
+    this.isHighlightingCells = false;
+    this.anchorCell = cell;
+    this.anchorX = cell.x;
+    this.anchorY = cell.y;
+
+    this.editor.update(() => {
+      const anchorTableCellNode = $getNearestNodeFromDOMNode(cell.elem);
+
+      if ($isTableCellNode(anchorTableCellNode)) {
+        const anchorNodeKey = anchorTableCellNode.getKey();
+        this.tableSelection =
+          this.tableSelection != null
+            ? this.tableSelection.clone()
+            : $createTableSelection();
+        this.anchorCellNodeKey = anchorNodeKey;
+      }
+    });
+  }
+
+  formatCells(type: TextFormatType) {
+    this.editor.update(() => {
+      const selection = $getSelection();
+
+      if (!$isTableSelection(selection)) {
+        invariant(false, 'Expected grid selection');
+      }
+
+      const formatSelection = $createRangeSelection();
+
+      const anchor = formatSelection.anchor;
+      const focus = formatSelection.focus;
+
+      selection.getNodes().forEach((cellNode) => {
+        if ($isTableCellNode(cellNode) && cellNode.getTextContentSize() !== 0) {
+          anchor.set(cellNode.getKey(), 0, 'element');
+          focus.set(cellNode.getKey(), cellNode.getChildrenSize(), 'element');
+          formatSelection.formatText(type);
+        }
+      });
+
+      $setSelection(selection);
+
+      this.editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+    });
+  }
+
+  clearText() {
+    const editor = this.editor;
+    editor.update(() => {
+      const tableNode = $getNodeByKey(this.tableNodeKey);
+
+      if (!$isTableNode(tableNode)) {
+        throw new Error('Expected TableNode.');
+      }
+
+      const selection = $getSelection();
+
+      if (!$isTableSelection(selection)) {
+        invariant(false, 'Expected grid selection');
+      }
+
+      const selectedNodes = selection.getNodes().filter($isTableCellNode);
+
+      if (selectedNodes.length === this.table.columns * this.table.rows) {
+        tableNode.selectPrevious();
+        // Delete entire table
+        tableNode.remove();
+        const rootNode = $getRoot();
+        rootNode.selectStart();
+        return;
+      }
+
+      selectedNodes.forEach((cellNode) => {
+        if ($isElementNode(cellNode)) {
+          const paragraphNode = $createParagraphNode();
+          const textNode = $createTextNode();
+          paragraphNode.append(textNode);
+          cellNode.append(paragraphNode);
+          cellNode.getChildren().forEach((child) => {
+            if (child !== paragraphNode) {
+              child.remove();
+            }
+          });
+        }
+      });
+
+      $updateDOMForSelection(editor, this.table, null);
+
+      $setSelection(null);
+
+      editor.dispatchCommand(SELECTION_CHANGE_COMMAND, undefined);
+    });
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
new file mode 100644
index 00000000000..eddea69a27e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Spread} from 'lexical';
+
+import {addClassNamesToElement} from '@lexical/utils';
+import {
+  $applyNodeReplacement,
+  DOMConversionMap,
+  DOMConversionOutput,
+  EditorConfig,
+  ElementNode,
+  LexicalNode,
+  NodeKey,
+  SerializedElementNode,
+} from 'lexical';
+
+import {PIXEL_VALUE_REG_EXP} from './constants';
+
+export type SerializedTableRowNode = Spread<
+  {
+    height?: number;
+  },
+  SerializedElementNode
+>;
+
+/** @noInheritDoc */
+export class TableRowNode extends ElementNode {
+  /** @internal */
+  __height?: number;
+
+  static getType(): string {
+    return 'tablerow';
+  }
+
+  static clone(node: TableRowNode): TableRowNode {
+    return new TableRowNode(node.__height, node.__key);
+  }
+
+  static importDOM(): DOMConversionMap | null {
+    return {
+      tr: (node: Node) => ({
+        conversion: $convertTableRowElement,
+        priority: 0,
+      }),
+    };
+  }
+
+  static importJSON(serializedNode: SerializedTableRowNode): TableRowNode {
+    return $createTableRowNode(serializedNode.height);
+  }
+
+  constructor(height?: number, key?: NodeKey) {
+    super(key);
+    this.__height = height;
+  }
+
+  exportJSON(): SerializedTableRowNode {
+    return {
+      ...super.exportJSON(),
+      ...(this.getHeight() && {height: this.getHeight()}),
+      type: 'tablerow',
+      version: 1,
+    };
+  }
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const element = document.createElement('tr');
+
+    if (this.__height) {
+      element.style.height = `${this.__height}px`;
+    }
+
+    addClassNamesToElement(element, config.theme.tableRow);
+
+    return element;
+  }
+
+  isShadowRoot(): boolean {
+    return true;
+  }
+
+  setHeight(height: number): number | null | undefined {
+    const self = this.getWritable();
+    self.__height = height;
+    return this.__height;
+  }
+
+  getHeight(): number | undefined {
+    return this.getLatest().__height;
+  }
+
+  updateDOM(prevNode: TableRowNode): boolean {
+    return prevNode.__height !== this.__height;
+  }
+
+  canBeEmpty(): false {
+    return false;
+  }
+
+  canIndent(): false {
+    return false;
+  }
+}
+
+export function $convertTableRowElement(domNode: Node): DOMConversionOutput {
+  const domNode_ = domNode as HTMLTableCellElement;
+  let height: number | undefined = undefined;
+
+  if (PIXEL_VALUE_REG_EXP.test(domNode_.style.height)) {
+    height = parseFloat(domNode_.style.height);
+  }
+
+  return {node: $createTableRowNode(height)};
+}
+
+export function $createTableRowNode(height?: number): TableRowNode {
+  return $applyNodeReplacement(new TableRowNode(height));
+}
+
+export function $isTableRowNode(
+  node: LexicalNode | null | undefined,
+): node is TableRowNode {
+  return node instanceof TableRowNode;
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelection.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelection.ts
new file mode 100644
index 00000000000..4564ace7fb7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelection.ts
@@ -0,0 +1,373 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$findMatchingParent} from '@lexical/utils';
+import {
+  $createPoint,
+  $getNodeByKey,
+  $isElementNode,
+  $normalizeSelection__EXPERIMENTAL,
+  BaseSelection,
+  isCurrentlyReadOnlyMode,
+  LexicalNode,
+  NodeKey,
+  PointType,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {$isTableCellNode, TableCellNode} from './LexicalTableCellNode';
+import {$isTableNode} from './LexicalTableNode';
+import {$isTableRowNode} from './LexicalTableRowNode';
+import {$computeTableMap, $getTableCellNodeRect} from './LexicalTableUtils';
+
+export type TableSelectionShape = {
+  fromX: number;
+  fromY: number;
+  toX: number;
+  toY: number;
+};
+
+export type TableMapValueType = {
+  cell: TableCellNode;
+  startRow: number;
+  startColumn: number;
+};
+export type TableMapType = Array<Array<TableMapValueType>>;
+
+export class TableSelection implements BaseSelection {
+  tableKey: NodeKey;
+  anchor: PointType;
+  focus: PointType;
+  _cachedNodes: Array<LexicalNode> | null;
+  dirty: boolean;
+
+  constructor(tableKey: NodeKey, anchor: PointType, focus: PointType) {
+    this.anchor = anchor;
+    this.focus = focus;
+    anchor._selection = this;
+    focus._selection = this;
+    this._cachedNodes = null;
+    this.dirty = false;
+    this.tableKey = tableKey;
+  }
+
+  getStartEndPoints(): [PointType, PointType] {
+    return [this.anchor, this.focus];
+  }
+
+  /**
+   * Returns whether the Selection is "backwards", meaning the focus
+   * logically precedes the anchor in the EditorState.
+   * @returns true if the Selection is backwards, false otherwise.
+   */
+  isBackward(): boolean {
+    return this.focus.isBefore(this.anchor);
+  }
+
+  getCachedNodes(): LexicalNode[] | null {
+    return this._cachedNodes;
+  }
+
+  setCachedNodes(nodes: LexicalNode[] | null): void {
+    this._cachedNodes = nodes;
+  }
+
+  is(selection: null | BaseSelection): boolean {
+    if (!$isTableSelection(selection)) {
+      return false;
+    }
+    return (
+      this.tableKey === selection.tableKey &&
+      this.anchor.is(selection.anchor) &&
+      this.focus.is(selection.focus)
+    );
+  }
+
+  set(tableKey: NodeKey, anchorCellKey: NodeKey, focusCellKey: NodeKey): void {
+    this.dirty = true;
+    this.tableKey = tableKey;
+    this.anchor.key = anchorCellKey;
+    this.focus.key = focusCellKey;
+    this._cachedNodes = null;
+  }
+
+  clone(): TableSelection {
+    return new TableSelection(this.tableKey, this.anchor, this.focus);
+  }
+
+  isCollapsed(): boolean {
+    return false;
+  }
+
+  extract(): Array<LexicalNode> {
+    return this.getNodes();
+  }
+
+  insertRawText(text: string): void {
+    // Do nothing?
+  }
+
+  insertText(): void {
+    // Do nothing?
+  }
+
+  insertNodes(nodes: Array<LexicalNode>) {
+    const focusNode = this.focus.getNode();
+    invariant(
+      $isElementNode(focusNode),
+      'Expected TableSelection focus to be an ElementNode',
+    );
+    const selection = $normalizeSelection__EXPERIMENTAL(
+      focusNode.select(0, focusNode.getChildrenSize()),
+    );
+    selection.insertNodes(nodes);
+  }
+
+  // TODO Deprecate this method. It's confusing when used with colspan|rowspan
+  getShape(): TableSelectionShape {
+    const anchorCellNode = $getNodeByKey(this.anchor.key);
+    invariant(
+      $isTableCellNode(anchorCellNode),
+      'Expected TableSelection anchor to be (or a child of) TableCellNode',
+    );
+    const anchorCellNodeRect = $getTableCellNodeRect(anchorCellNode);
+    invariant(
+      anchorCellNodeRect !== null,
+      'getCellRect: expected to find AnchorNode',
+    );
+
+    const focusCellNode = $getNodeByKey(this.focus.key);
+    invariant(
+      $isTableCellNode(focusCellNode),
+      'Expected TableSelection focus to be (or a child of) TableCellNode',
+    );
+    const focusCellNodeRect = $getTableCellNodeRect(focusCellNode);
+    invariant(
+      focusCellNodeRect !== null,
+      'getCellRect: expected to find focusCellNode',
+    );
+
+    const startX = Math.min(
+      anchorCellNodeRect.columnIndex,
+      focusCellNodeRect.columnIndex,
+    );
+    const stopX = Math.max(
+      anchorCellNodeRect.columnIndex,
+      focusCellNodeRect.columnIndex,
+    );
+
+    const startY = Math.min(
+      anchorCellNodeRect.rowIndex,
+      focusCellNodeRect.rowIndex,
+    );
+    const stopY = Math.max(
+      anchorCellNodeRect.rowIndex,
+      focusCellNodeRect.rowIndex,
+    );
+
+    return {
+      fromX: Math.min(startX, stopX),
+      fromY: Math.min(startY, stopY),
+      toX: Math.max(startX, stopX),
+      toY: Math.max(startY, stopY),
+    };
+  }
+
+  getNodes(): Array<LexicalNode> {
+    const cachedNodes = this._cachedNodes;
+    if (cachedNodes !== null) {
+      return cachedNodes;
+    }
+
+    const anchorNode = this.anchor.getNode();
+    const focusNode = this.focus.getNode();
+    const anchorCell = $findMatchingParent(anchorNode, $isTableCellNode);
+    // todo replace with triplet
+    const focusCell = $findMatchingParent(focusNode, $isTableCellNode);
+    invariant(
+      $isTableCellNode(anchorCell),
+      'Expected TableSelection anchor to be (or a child of) TableCellNode',
+    );
+    invariant(
+      $isTableCellNode(focusCell),
+      'Expected TableSelection focus to be (or a child of) TableCellNode',
+    );
+    const anchorRow = anchorCell.getParent();
+    invariant(
+      $isTableRowNode(anchorRow),
+      'Expected anchorCell to have a parent TableRowNode',
+    );
+    const tableNode = anchorRow.getParent();
+    invariant(
+      $isTableNode(tableNode),
+      'Expected tableNode to have a parent TableNode',
+    );
+
+    const focusCellGrid = focusCell.getParents()[1];
+    if (focusCellGrid !== tableNode) {
+      if (!tableNode.isParentOf(focusCell)) {
+        // focus is on higher Grid level than anchor
+        const gridParent = tableNode.getParent();
+        invariant(gridParent != null, 'Expected gridParent to have a parent');
+        this.set(this.tableKey, gridParent.getKey(), focusCell.getKey());
+      } else {
+        // anchor is on higher Grid level than focus
+        const focusCellParent = focusCellGrid.getParent();
+        invariant(
+          focusCellParent != null,
+          'Expected focusCellParent to have a parent',
+        );
+        this.set(this.tableKey, focusCell.getKey(), focusCellParent.getKey());
+      }
+      return this.getNodes();
+    }
+
+    // TODO Mapping the whole Grid every time not efficient. We need to compute the entire state only
+    // once (on load) and iterate on it as updates occur. However, to do this we need to have the
+    // ability to store a state. Killing TableSelection and moving the logic to the plugin would make
+    // this possible.
+    const [map, cellAMap, cellBMap] = $computeTableMap(
+      tableNode,
+      anchorCell,
+      focusCell,
+    );
+
+    let minColumn = Math.min(cellAMap.startColumn, cellBMap.startColumn);
+    let minRow = Math.min(cellAMap.startRow, cellBMap.startRow);
+    let maxColumn = Math.max(
+      cellAMap.startColumn + cellAMap.cell.__colSpan - 1,
+      cellBMap.startColumn + cellBMap.cell.__colSpan - 1,
+    );
+    let maxRow = Math.max(
+      cellAMap.startRow + cellAMap.cell.__rowSpan - 1,
+      cellBMap.startRow + cellBMap.cell.__rowSpan - 1,
+    );
+    let exploredMinColumn = minColumn;
+    let exploredMinRow = minRow;
+    let exploredMaxColumn = minColumn;
+    let exploredMaxRow = minRow;
+    function expandBoundary(mapValue: TableMapValueType): void {
+      const {
+        cell,
+        startColumn: cellStartColumn,
+        startRow: cellStartRow,
+      } = mapValue;
+      minColumn = Math.min(minColumn, cellStartColumn);
+      minRow = Math.min(minRow, cellStartRow);
+      maxColumn = Math.max(maxColumn, cellStartColumn + cell.__colSpan - 1);
+      maxRow = Math.max(maxRow, cellStartRow + cell.__rowSpan - 1);
+    }
+    while (
+      minColumn < exploredMinColumn ||
+      minRow < exploredMinRow ||
+      maxColumn > exploredMaxColumn ||
+      maxRow > exploredMaxRow
+    ) {
+      if (minColumn < exploredMinColumn) {
+        // Expand on the left
+        const rowDiff = exploredMaxRow - exploredMinRow;
+        const previousColumn = exploredMinColumn - 1;
+        for (let i = 0; i <= rowDiff; i++) {
+          expandBoundary(map[exploredMinRow + i][previousColumn]);
+        }
+        exploredMinColumn = previousColumn;
+      }
+      if (minRow < exploredMinRow) {
+        // Expand on top
+        const columnDiff = exploredMaxColumn - exploredMinColumn;
+        const previousRow = exploredMinRow - 1;
+        for (let i = 0; i <= columnDiff; i++) {
+          expandBoundary(map[previousRow][exploredMinColumn + i]);
+        }
+        exploredMinRow = previousRow;
+      }
+      if (maxColumn > exploredMaxColumn) {
+        // Expand on the right
+        const rowDiff = exploredMaxRow - exploredMinRow;
+        const nextColumn = exploredMaxColumn + 1;
+        for (let i = 0; i <= rowDiff; i++) {
+          expandBoundary(map[exploredMinRow + i][nextColumn]);
+        }
+        exploredMaxColumn = nextColumn;
+      }
+      if (maxRow > exploredMaxRow) {
+        // Expand on the bottom
+        const columnDiff = exploredMaxColumn - exploredMinColumn;
+        const nextRow = exploredMaxRow + 1;
+        for (let i = 0; i <= columnDiff; i++) {
+          expandBoundary(map[nextRow][exploredMinColumn + i]);
+        }
+        exploredMaxRow = nextRow;
+      }
+    }
+
+    const nodes: Array<LexicalNode> = [tableNode];
+    let lastRow = null;
+    for (let i = minRow; i <= maxRow; i++) {
+      for (let j = minColumn; j <= maxColumn; j++) {
+        const {cell} = map[i][j];
+        const currentRow = cell.getParent();
+        invariant(
+          $isTableRowNode(currentRow),
+          'Expected TableCellNode parent to be a TableRowNode',
+        );
+        if (currentRow !== lastRow) {
+          nodes.push(currentRow);
+        }
+        nodes.push(cell, ...$getChildrenRecursively(cell));
+        lastRow = currentRow;
+      }
+    }
+
+    if (!isCurrentlyReadOnlyMode()) {
+      this._cachedNodes = nodes;
+    }
+    return nodes;
+  }
+
+  getTextContent(): string {
+    const nodes = this.getNodes().filter((node) => $isTableCellNode(node));
+    let textContent = '';
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      const row = node.__parent;
+      const nextRow = (nodes[i + 1] || {}).__parent;
+      textContent += node.getTextContent() + (nextRow !== row ? '\n' : '\t');
+    }
+    return textContent;
+  }
+}
+
+export function $isTableSelection(x: unknown): x is TableSelection {
+  return x instanceof TableSelection;
+}
+
+export function $createTableSelection(): TableSelection {
+  const anchor = $createPoint('root', 0, 'element');
+  const focus = $createPoint('root', 0, 'element');
+  return new TableSelection('root', anchor, focus);
+}
+
+export function $getChildrenRecursively(node: LexicalNode): Array<LexicalNode> {
+  const nodes = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const currentNode = stack.pop();
+    invariant(
+      currentNode !== undefined,
+      "Stack.length > 0; can't be undefined",
+    );
+    if ($isElementNode(currentNode)) {
+      stack.unshift(...currentNode.getChildren());
+    }
+    if (currentNode !== node) {
+      nodes.push(currentNode);
+    }
+  }
+  return nodes;
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
new file mode 100644
index 00000000000..812cccc0d25
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -0,0 +1,1819 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {TableCellNode} from './LexicalTableCellNode';
+import type {TableNode} from './LexicalTableNode';
+import type {TableDOMCell, TableDOMRows} from './LexicalTableObserver';
+import type {
+  TableMapType,
+  TableMapValueType,
+  TableSelection,
+} from './LexicalTableSelection';
+import type {
+  BaseSelection,
+  ElementFormatType,
+  LexicalCommand,
+  LexicalEditor,
+  LexicalNode,
+  RangeSelection,
+  TextFormatType,
+} from 'lexical';
+
+import {
+  $getClipboardDataFromSelection,
+  copyToClipboard,
+} from '@lexical/clipboard';
+import {$findMatchingParent, objectKlassEquals} from '@lexical/utils';
+import {
+  $createParagraphNode,
+  $createRangeSelectionFromDom,
+  $createTextNode,
+  $getNearestNodeFromDOMNode,
+  $getPreviousSelection,
+  $getSelection,
+  $isDecoratorNode,
+  $isElementNode,
+  $isRangeSelection,
+  $isRootOrShadowRoot,
+  $isTextNode,
+  $setSelection,
+  COMMAND_PRIORITY_CRITICAL,
+  COMMAND_PRIORITY_HIGH,
+  CONTROLLED_TEXT_INSERTION_COMMAND,
+  CUT_COMMAND,
+  DELETE_CHARACTER_COMMAND,
+  DELETE_LINE_COMMAND,
+  DELETE_WORD_COMMAND,
+  FOCUS_COMMAND,
+  FORMAT_ELEMENT_COMMAND,
+  FORMAT_TEXT_COMMAND,
+  INSERT_PARAGRAPH_COMMAND,
+  KEY_ARROW_DOWN_COMMAND,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_ARROW_UP_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND,
+  KEY_ESCAPE_COMMAND,
+  KEY_TAB_COMMAND,
+  SELECTION_CHANGE_COMMAND,
+  SELECTION_INSERT_CLIPBOARD_NODES_COMMAND,
+} from 'lexical';
+import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
+import invariant from 'lexical/shared/invariant';
+
+import {$isTableCellNode} from './LexicalTableCellNode';
+import {$isTableNode} from './LexicalTableNode';
+import {TableDOMTable, TableObserver} from './LexicalTableObserver';
+import {$isTableRowNode} from './LexicalTableRowNode';
+import {$isTableSelection} from './LexicalTableSelection';
+import {$computeTableMap, $getNodeTriplet} from './LexicalTableUtils';
+
+const LEXICAL_ELEMENT_KEY = '__lexicalTableSelection';
+
+export const getDOMSelection = (
+  targetWindow: Window | null,
+): Selection | null =>
+  CAN_USE_DOM ? (targetWindow || window).getSelection() : null;
+
+const isMouseDownOnEvent = (event: MouseEvent) => {
+  return (event.buttons & 1) === 1;
+};
+
+export function applyTableHandlers(
+  tableNode: TableNode,
+  tableElement: HTMLTableElementWithWithTableSelectionState,
+  editor: LexicalEditor,
+  hasTabHandler: boolean,
+): TableObserver {
+  const rootElement = editor.getRootElement();
+
+  if (rootElement === null) {
+    throw new Error('No root element.');
+  }
+
+  const tableObserver = new TableObserver(editor, tableNode.getKey());
+  const editorWindow = editor._window || window;
+
+  attachTableObserverToTableElement(tableElement, tableObserver);
+
+  const createMouseHandlers = () => {
+    const onMouseUp = () => {
+      tableObserver.isSelecting = false;
+      editorWindow.removeEventListener('mouseup', onMouseUp);
+      editorWindow.removeEventListener('mousemove', onMouseMove);
+    };
+
+    const onMouseMove = (moveEvent: MouseEvent) => {
+      // delaying mousemove handler to allow selectionchange handler from LexicalEvents.ts to be executed first
+      setTimeout(() => {
+        if (!isMouseDownOnEvent(moveEvent) && tableObserver.isSelecting) {
+          tableObserver.isSelecting = false;
+          editorWindow.removeEventListener('mouseup', onMouseUp);
+          editorWindow.removeEventListener('mousemove', onMouseMove);
+          return;
+        }
+        const focusCell = getDOMCellFromTarget(moveEvent.target as Node);
+        if (
+          focusCell !== null &&
+          (tableObserver.anchorX !== focusCell.x ||
+            tableObserver.anchorY !== focusCell.y)
+        ) {
+          moveEvent.preventDefault();
+          tableObserver.setFocusCellForSelection(focusCell);
+        }
+      }, 0);
+    };
+    return {onMouseMove: onMouseMove, onMouseUp: onMouseUp};
+  };
+
+  tableElement.addEventListener('mousedown', (event: MouseEvent) => {
+    setTimeout(() => {
+      if (event.button !== 0) {
+        return;
+      }
+
+      if (!editorWindow) {
+        return;
+      }
+
+      const anchorCell = getDOMCellFromTarget(event.target as Node);
+      if (anchorCell !== null) {
+        stopEvent(event);
+        tableObserver.setAnchorCellForSelection(anchorCell);
+      }
+
+      const {onMouseUp, onMouseMove} = createMouseHandlers();
+      tableObserver.isSelecting = true;
+      editorWindow.addEventListener('mouseup', onMouseUp);
+      editorWindow.addEventListener('mousemove', onMouseMove);
+    }, 0);
+  });
+
+  // Clear selection when clicking outside of dom.
+  const mouseDownCallback = (event: MouseEvent) => {
+    if (event.button !== 0) {
+      return;
+    }
+
+    editor.update(() => {
+      const selection = $getSelection();
+      const target = event.target as Node;
+      if (
+        $isTableSelection(selection) &&
+        selection.tableKey === tableObserver.tableNodeKey &&
+        rootElement.contains(target)
+      ) {
+        tableObserver.clearHighlight();
+      }
+    });
+  };
+
+  editorWindow.addEventListener('mousedown', mouseDownCallback);
+
+  tableObserver.listenersToRemove.add(() =>
+    editorWindow.removeEventListener('mousedown', mouseDownCallback),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_DOWN_COMMAND,
+      (event) =>
+        $handleArrowKey(editor, event, 'down', tableNode, tableObserver),
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_UP_COMMAND,
+      (event) => $handleArrowKey(editor, event, 'up', tableNode, tableObserver),
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_LEFT_COMMAND,
+      (event) =>
+        $handleArrowKey(editor, event, 'backward', tableNode, tableObserver),
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ARROW_RIGHT_COMMAND,
+      (event) =>
+        $handleArrowKey(editor, event, 'forward', tableNode, tableObserver),
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_ESCAPE_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if ($isTableSelection(selection)) {
+          const focusCellNode = $findMatchingParent(
+            selection.focus.getNode(),
+            $isTableCellNode,
+          );
+          if ($isTableCellNode(focusCellNode)) {
+            stopEvent(event);
+            focusCellNode.selectEnd();
+            return true;
+          }
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  const deleteTextHandler = (command: LexicalCommand<boolean>) => () => {
+    const selection = $getSelection();
+
+    if (!$isSelectionInTable(selection, tableNode)) {
+      return false;
+    }
+
+    if ($isTableSelection(selection)) {
+      tableObserver.clearText();
+
+      return true;
+    } else if ($isRangeSelection(selection)) {
+      const tableCellNode = $findMatchingParent(
+        selection.anchor.getNode(),
+        (n) => $isTableCellNode(n),
+      );
+
+      if (!$isTableCellNode(tableCellNode)) {
+        return false;
+      }
+
+      const anchorNode = selection.anchor.getNode();
+      const focusNode = selection.focus.getNode();
+      const isAnchorInside = tableNode.isParentOf(anchorNode);
+      const isFocusInside = tableNode.isParentOf(focusNode);
+
+      const selectionContainsPartialTable =
+        (isAnchorInside && !isFocusInside) ||
+        (isFocusInside && !isAnchorInside);
+
+      if (selectionContainsPartialTable) {
+        tableObserver.clearText();
+        return true;
+      }
+
+      const nearestElementNode = $findMatchingParent(
+        selection.anchor.getNode(),
+        (n) => $isElementNode(n),
+      );
+
+      const topLevelCellElementNode =
+        nearestElementNode &&
+        $findMatchingParent(
+          nearestElementNode,
+          (n) => $isElementNode(n) && $isTableCellNode(n.getParent()),
+        );
+
+      if (
+        !$isElementNode(topLevelCellElementNode) ||
+        !$isElementNode(nearestElementNode)
+      ) {
+        return false;
+      }
+
+      if (
+        command === DELETE_LINE_COMMAND &&
+        topLevelCellElementNode.getPreviousSibling() === null
+      ) {
+        // TODO: Fix Delete Line in Table Cells.
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  [DELETE_WORD_COMMAND, DELETE_LINE_COMMAND, DELETE_CHARACTER_COMMAND].forEach(
+    (command) => {
+      tableObserver.listenersToRemove.add(
+        editor.registerCommand(
+          command,
+          deleteTextHandler(command),
+          COMMAND_PRIORITY_CRITICAL,
+        ),
+      );
+    },
+  );
+
+  const $deleteCellHandler = (
+    event: KeyboardEvent | ClipboardEvent | null,
+  ): boolean => {
+    const selection = $getSelection();
+
+    if (!$isSelectionInTable(selection, tableNode)) {
+      const nodes = selection ? selection.getNodes() : null;
+      if (nodes) {
+        const table = nodes.find(
+          (node) =>
+            $isTableNode(node) && node.getKey() === tableObserver.tableNodeKey,
+        );
+        if ($isTableNode(table)) {
+          const parentNode = table.getParent();
+          if (!parentNode) {
+            return false;
+          }
+          table.remove();
+        }
+      }
+      return false;
+    }
+
+    if ($isTableSelection(selection)) {
+      if (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      tableObserver.clearText();
+
+      return true;
+    } else if ($isRangeSelection(selection)) {
+      const tableCellNode = $findMatchingParent(
+        selection.anchor.getNode(),
+        (n) => $isTableCellNode(n),
+      );
+
+      if (!$isTableCellNode(tableCellNode)) {
+        return false;
+      }
+    }
+
+    return false;
+  };
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_BACKSPACE_COMMAND,
+      $deleteCellHandler,
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent>(
+      KEY_DELETE_COMMAND,
+      $deleteCellHandler,
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<KeyboardEvent | ClipboardEvent | null>(
+      CUT_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+        if (selection) {
+          if (!($isTableSelection(selection) || $isRangeSelection(selection))) {
+            return false;
+          }
+          // Copying to the clipboard is async so we must capture the data
+          // before we delete it
+          void copyToClipboard(
+            editor,
+            objectKlassEquals(event, ClipboardEvent)
+              ? (event as ClipboardEvent)
+              : null,
+            $getClipboardDataFromSelection(selection),
+          );
+          const intercepted = $deleteCellHandler(event);
+          if ($isRangeSelection(selection)) {
+            selection.removeText();
+          }
+          return intercepted;
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<TextFormatType>(
+      FORMAT_TEXT_COMMAND,
+      (payload) => {
+        const selection = $getSelection();
+
+        if (!$isSelectionInTable(selection, tableNode)) {
+          return false;
+        }
+
+        if ($isTableSelection(selection)) {
+          tableObserver.formatCells(payload);
+
+          return true;
+        } else if ($isRangeSelection(selection)) {
+          const tableCellNode = $findMatchingParent(
+            selection.anchor.getNode(),
+            (n) => $isTableCellNode(n),
+          );
+
+          if (!$isTableCellNode(tableCellNode)) {
+            return false;
+          }
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand<ElementFormatType>(
+      FORMAT_ELEMENT_COMMAND,
+      (formatType) => {
+        const selection = $getSelection();
+        if (
+          !$isTableSelection(selection) ||
+          !$isSelectionInTable(selection, tableNode)
+        ) {
+          return false;
+        }
+
+        const anchorNode = selection.anchor.getNode();
+        const focusNode = selection.focus.getNode();
+        if (!$isTableCellNode(anchorNode) || !$isTableCellNode(focusNode)) {
+          return false;
+        }
+
+        const [tableMap, anchorCell, focusCell] = $computeTableMap(
+          tableNode,
+          anchorNode,
+          focusNode,
+        );
+        const maxRow = Math.max(anchorCell.startRow, focusCell.startRow);
+        const maxColumn = Math.max(
+          anchorCell.startColumn,
+          focusCell.startColumn,
+        );
+        const minRow = Math.min(anchorCell.startRow, focusCell.startRow);
+        const minColumn = Math.min(
+          anchorCell.startColumn,
+          focusCell.startColumn,
+        );
+        for (let i = minRow; i <= maxRow; i++) {
+          for (let j = minColumn; j <= maxColumn; j++) {
+            const cell = tableMap[i][j].cell;
+            cell.setFormat(formatType);
+
+            const cellChildren = cell.getChildren();
+            for (let k = 0; k < cellChildren.length; k++) {
+              const child = cellChildren[k];
+              if ($isElementNode(child) && !child.isInline()) {
+                child.setFormat(formatType);
+              }
+            }
+          }
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand(
+      CONTROLLED_TEXT_INSERTION_COMMAND,
+      (payload) => {
+        const selection = $getSelection();
+
+        if (!$isSelectionInTable(selection, tableNode)) {
+          return false;
+        }
+
+        if ($isTableSelection(selection)) {
+          tableObserver.clearHighlight();
+
+          return false;
+        } else if ($isRangeSelection(selection)) {
+          const tableCellNode = $findMatchingParent(
+            selection.anchor.getNode(),
+            (n) => $isTableCellNode(n),
+          );
+
+          if (!$isTableCellNode(tableCellNode)) {
+            return false;
+          }
+
+          if (typeof payload === 'string') {
+            const edgePosition = $getTableEdgeCursorPosition(
+              editor,
+              selection,
+              tableNode,
+            );
+            if (edgePosition) {
+              $insertParagraphAtTableEdge(edgePosition, tableNode, [
+                $createTextNode(payload),
+              ]);
+              return true;
+            }
+          }
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  if (hasTabHandler) {
+    tableObserver.listenersToRemove.add(
+      editor.registerCommand<KeyboardEvent>(
+        KEY_TAB_COMMAND,
+        (event) => {
+          const selection = $getSelection();
+          if (
+            !$isRangeSelection(selection) ||
+            !selection.isCollapsed() ||
+            !$isSelectionInTable(selection, tableNode)
+          ) {
+            return false;
+          }
+
+          const tableCellNode = $findCellNode(selection.anchor.getNode());
+          if (tableCellNode === null) {
+            return false;
+          }
+
+          stopEvent(event);
+
+          const currentCords = tableNode.getCordsFromCellNode(
+            tableCellNode,
+            tableObserver.table,
+          );
+
+          selectTableNodeInDirection(
+            tableObserver,
+            tableNode,
+            currentCords.x,
+            currentCords.y,
+            !event.shiftKey ? 'forward' : 'backward',
+          );
+
+          return true;
+        },
+        COMMAND_PRIORITY_CRITICAL,
+      ),
+    );
+  }
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand(
+      FOCUS_COMMAND,
+      (payload) => {
+        return tableNode.isSelected();
+      },
+      COMMAND_PRIORITY_HIGH,
+    ),
+  );
+
+  function getObserverCellFromCellNode(
+    tableCellNode: TableCellNode,
+  ): TableDOMCell {
+    const currentCords = tableNode.getCordsFromCellNode(
+      tableCellNode,
+      tableObserver.table,
+    );
+    return tableNode.getDOMCellFromCordsOrThrow(
+      currentCords.x,
+      currentCords.y,
+      tableObserver.table,
+    );
+  }
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand(
+      SELECTION_INSERT_CLIPBOARD_NODES_COMMAND,
+      (selectionPayload) => {
+        const {nodes, selection} = selectionPayload;
+        const anchorAndFocus = selection.getStartEndPoints();
+        const isTableSelection = $isTableSelection(selection);
+        const isRangeSelection = $isRangeSelection(selection);
+        const isSelectionInsideOfGrid =
+          (isRangeSelection &&
+            $findMatchingParent(selection.anchor.getNode(), (n) =>
+              $isTableCellNode(n),
+            ) !== null &&
+            $findMatchingParent(selection.focus.getNode(), (n) =>
+              $isTableCellNode(n),
+            ) !== null) ||
+          isTableSelection;
+
+        if (
+          nodes.length !== 1 ||
+          !$isTableNode(nodes[0]) ||
+          !isSelectionInsideOfGrid ||
+          anchorAndFocus === null
+        ) {
+          return false;
+        }
+        const [anchor] = anchorAndFocus;
+
+        const newGrid = nodes[0];
+        const newGridRows = newGrid.getChildren();
+        const newColumnCount = newGrid
+          .getFirstChildOrThrow<TableNode>()
+          .getChildrenSize();
+        const newRowCount = newGrid.getChildrenSize();
+        const gridCellNode = $findMatchingParent(anchor.getNode(), (n) =>
+          $isTableCellNode(n),
+        );
+        const gridRowNode =
+          gridCellNode &&
+          $findMatchingParent(gridCellNode, (n) => $isTableRowNode(n));
+        const gridNode =
+          gridRowNode &&
+          $findMatchingParent(gridRowNode, (n) => $isTableNode(n));
+
+        if (
+          !$isTableCellNode(gridCellNode) ||
+          !$isTableRowNode(gridRowNode) ||
+          !$isTableNode(gridNode)
+        ) {
+          return false;
+        }
+
+        const startY = gridRowNode.getIndexWithinParent();
+        const stopY = Math.min(
+          gridNode.getChildrenSize() - 1,
+          startY + newRowCount - 1,
+        );
+        const startX = gridCellNode.getIndexWithinParent();
+        const stopX = Math.min(
+          gridRowNode.getChildrenSize() - 1,
+          startX + newColumnCount - 1,
+        );
+        const fromX = Math.min(startX, stopX);
+        const fromY = Math.min(startY, stopY);
+        const toX = Math.max(startX, stopX);
+        const toY = Math.max(startY, stopY);
+        const gridRowNodes = gridNode.getChildren();
+        let newRowIdx = 0;
+
+        for (let r = fromY; r <= toY; r++) {
+          const currentGridRowNode = gridRowNodes[r];
+
+          if (!$isTableRowNode(currentGridRowNode)) {
+            return false;
+          }
+
+          const newGridRowNode = newGridRows[newRowIdx];
+
+          if (!$isTableRowNode(newGridRowNode)) {
+            return false;
+          }
+
+          const gridCellNodes = currentGridRowNode.getChildren();
+          const newGridCellNodes = newGridRowNode.getChildren();
+          let newColumnIdx = 0;
+
+          for (let c = fromX; c <= toX; c++) {
+            const currentGridCellNode = gridCellNodes[c];
+
+            if (!$isTableCellNode(currentGridCellNode)) {
+              return false;
+            }
+
+            const newGridCellNode = newGridCellNodes[newColumnIdx];
+
+            if (!$isTableCellNode(newGridCellNode)) {
+              return false;
+            }
+
+            const originalChildren = currentGridCellNode.getChildren();
+            newGridCellNode.getChildren().forEach((child) => {
+              if ($isTextNode(child)) {
+                const paragraphNode = $createParagraphNode();
+                paragraphNode.append(child);
+                currentGridCellNode.append(child);
+              } else {
+                currentGridCellNode.append(child);
+              }
+            });
+            originalChildren.forEach((n) => n.remove());
+            newColumnIdx++;
+          }
+
+          newRowIdx++;
+        }
+        return true;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand(
+      SELECTION_CHANGE_COMMAND,
+      () => {
+        const selection = $getSelection();
+        const prevSelection = $getPreviousSelection();
+
+        if ($isRangeSelection(selection)) {
+          const {anchor, focus} = selection;
+          const anchorNode = anchor.getNode();
+          const focusNode = focus.getNode();
+          // Using explicit comparison with table node to ensure it's not a nested table
+          // as in that case we'll leave selection resolving to that table
+          const anchorCellNode = $findCellNode(anchorNode);
+          const focusCellNode = $findCellNode(focusNode);
+          const isAnchorInside = !!(
+            anchorCellNode && tableNode.is($findTableNode(anchorCellNode))
+          );
+          const isFocusInside = !!(
+            focusCellNode && tableNode.is($findTableNode(focusCellNode))
+          );
+          const isPartialyWithinTable = isAnchorInside !== isFocusInside;
+          const isWithinTable = isAnchorInside && isFocusInside;
+          const isBackward = selection.isBackward();
+
+          if (isPartialyWithinTable) {
+            const newSelection = selection.clone();
+            if (isFocusInside) {
+              const [tableMap] = $computeTableMap(
+                tableNode,
+                focusCellNode,
+                focusCellNode,
+              );
+              const firstCell = tableMap[0][0].cell;
+              const lastCell = tableMap[tableMap.length - 1].at(-1)!.cell;
+              newSelection.focus.set(
+                isBackward ? firstCell.getKey() : lastCell.getKey(),
+                isBackward
+                  ? firstCell.getChildrenSize()
+                  : lastCell.getChildrenSize(),
+                'element',
+              );
+            }
+            $setSelection(newSelection);
+            $addHighlightStyleToTable(editor, tableObserver);
+          } else if (isWithinTable) {
+            // Handle case when selection spans across multiple cells but still
+            // has range selection, then we convert it into grid selection
+            if (!anchorCellNode.is(focusCellNode)) {
+              tableObserver.setAnchorCellForSelection(
+                getObserverCellFromCellNode(anchorCellNode),
+              );
+              tableObserver.setFocusCellForSelection(
+                getObserverCellFromCellNode(focusCellNode),
+                true,
+              );
+              if (!tableObserver.isSelecting) {
+                setTimeout(() => {
+                  const {onMouseUp, onMouseMove} = createMouseHandlers();
+                  tableObserver.isSelecting = true;
+                  editorWindow.addEventListener('mouseup', onMouseUp);
+                  editorWindow.addEventListener('mousemove', onMouseMove);
+                }, 0);
+              }
+            }
+          }
+        } else if (
+          selection &&
+          $isTableSelection(selection) &&
+          selection.is(prevSelection) &&
+          selection.tableKey === tableNode.getKey()
+        ) {
+          // if selection goes outside of the table we need to change it to Range selection
+          const domSelection = getDOMSelection(editor._window);
+          if (
+            domSelection &&
+            domSelection.anchorNode &&
+            domSelection.focusNode
+          ) {
+            const focusNode = $getNearestNodeFromDOMNode(
+              domSelection.focusNode,
+            );
+            const isFocusOutside =
+              focusNode && !tableNode.is($findTableNode(focusNode));
+
+            const anchorNode = $getNearestNodeFromDOMNode(
+              domSelection.anchorNode,
+            );
+            const isAnchorInside =
+              anchorNode && tableNode.is($findTableNode(anchorNode));
+
+            if (
+              isFocusOutside &&
+              isAnchorInside &&
+              domSelection.rangeCount > 0
+            ) {
+              const newSelection = $createRangeSelectionFromDom(
+                domSelection,
+                editor,
+              );
+              if (newSelection) {
+                newSelection.anchor.set(
+                  tableNode.getKey(),
+                  selection.isBackward() ? tableNode.getChildrenSize() : 0,
+                  'element',
+                );
+                domSelection.removeAllRanges();
+                $setSelection(newSelection);
+              }
+            }
+          }
+        }
+
+        if (
+          selection &&
+          !selection.is(prevSelection) &&
+          ($isTableSelection(selection) || $isTableSelection(prevSelection)) &&
+          tableObserver.tableSelection &&
+          !tableObserver.tableSelection.is(prevSelection)
+        ) {
+          if (
+            $isTableSelection(selection) &&
+            selection.tableKey === tableObserver.tableNodeKey
+          ) {
+            tableObserver.updateTableTableSelection(selection);
+          } else if (
+            !$isTableSelection(selection) &&
+            $isTableSelection(prevSelection) &&
+            prevSelection.tableKey === tableObserver.tableNodeKey
+          ) {
+            tableObserver.updateTableTableSelection(null);
+          }
+          return false;
+        }
+
+        if (
+          tableObserver.hasHijackedSelectionStyles &&
+          !tableNode.isSelected()
+        ) {
+          $removeHighlightStyleToTable(editor, tableObserver);
+        } else if (
+          !tableObserver.hasHijackedSelectionStyles &&
+          tableNode.isSelected()
+        ) {
+          $addHighlightStyleToTable(editor, tableObserver);
+        }
+
+        return false;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  tableObserver.listenersToRemove.add(
+    editor.registerCommand(
+      INSERT_PARAGRAPH_COMMAND,
+      () => {
+        const selection = $getSelection();
+        if (
+          !$isRangeSelection(selection) ||
+          !selection.isCollapsed() ||
+          !$isSelectionInTable(selection, tableNode)
+        ) {
+          return false;
+        }
+        const edgePosition = $getTableEdgeCursorPosition(
+          editor,
+          selection,
+          tableNode,
+        );
+        if (edgePosition) {
+          $insertParagraphAtTableEdge(edgePosition, tableNode);
+          return true;
+        }
+        return false;
+      },
+      COMMAND_PRIORITY_CRITICAL,
+    ),
+  );
+
+  return tableObserver;
+}
+
+export type HTMLTableElementWithWithTableSelectionState = HTMLTableElement &
+  Record<typeof LEXICAL_ELEMENT_KEY, TableObserver>;
+
+export function attachTableObserverToTableElement(
+  tableElement: HTMLTableElementWithWithTableSelectionState,
+  tableObserver: TableObserver,
+) {
+  tableElement[LEXICAL_ELEMENT_KEY] = tableObserver;
+}
+
+export function getTableObserverFromTableElement(
+  tableElement: HTMLTableElementWithWithTableSelectionState,
+): TableObserver | null {
+  return tableElement[LEXICAL_ELEMENT_KEY];
+}
+
+export function getDOMCellFromTarget(node: Node): TableDOMCell | null {
+  let currentNode: ParentNode | Node | null = node;
+
+  while (currentNode != null) {
+    const nodeName = currentNode.nodeName;
+
+    if (nodeName === 'TD' || nodeName === 'TH') {
+      // @ts-expect-error: internal field
+      const cell = currentNode._cell;
+
+      if (cell === undefined) {
+        return null;
+      }
+
+      return cell;
+    }
+
+    currentNode = currentNode.parentNode;
+  }
+
+  return null;
+}
+
+export function doesTargetContainText(node: Node): boolean {
+  const currentNode: ParentNode | Node | null = node;
+
+  if (currentNode !== null) {
+    const nodeName = currentNode.nodeName;
+
+    if (nodeName === 'SPAN') {
+      return true;
+    }
+  }
+  return false;
+}
+
+export function getTable(tableElement: HTMLElement): TableDOMTable {
+  const domRows: TableDOMRows = [];
+  const grid = {
+    columns: 0,
+    domRows,
+    rows: 0,
+  };
+  let currentNode = tableElement.firstChild;
+  let x = 0;
+  let y = 0;
+  domRows.length = 0;
+
+  while (currentNode != null) {
+    const nodeMame = currentNode.nodeName;
+
+    if (nodeMame === 'TD' || nodeMame === 'TH') {
+      const elem = currentNode as HTMLElement;
+      const cell = {
+        elem,
+        hasBackgroundColor: elem.style.backgroundColor !== '',
+        highlighted: false,
+        x,
+        y,
+      };
+
+      // @ts-expect-error: internal field
+      currentNode._cell = cell;
+
+      let row = domRows[y];
+      if (row === undefined) {
+        row = domRows[y] = [];
+      }
+
+      row[x] = cell;
+    } else {
+      const child = currentNode.firstChild;
+
+      if (child != null) {
+        currentNode = child;
+        continue;
+      }
+    }
+
+    const sibling = currentNode.nextSibling;
+
+    if (sibling != null) {
+      x++;
+      currentNode = sibling;
+      continue;
+    }
+
+    const parent = currentNode.parentNode;
+
+    if (parent != null) {
+      const parentSibling = parent.nextSibling;
+
+      if (parentSibling == null) {
+        break;
+      }
+
+      y++;
+      x = 0;
+      currentNode = parentSibling;
+    }
+  }
+
+  grid.columns = x + 1;
+  grid.rows = y + 1;
+
+  return grid;
+}
+
+export function $updateDOMForSelection(
+  editor: LexicalEditor,
+  table: TableDOMTable,
+  selection: TableSelection | RangeSelection | null,
+) {
+  const selectedCellNodes = new Set(selection ? selection.getNodes() : []);
+  $forEachTableCell(table, (cell, lexicalNode) => {
+    const elem = cell.elem;
+
+    if (selectedCellNodes.has(lexicalNode)) {
+      cell.highlighted = true;
+      $addHighlightToDOM(editor, cell);
+    } else {
+      cell.highlighted = false;
+      $removeHighlightFromDOM(editor, cell);
+      if (!elem.getAttribute('style')) {
+        elem.removeAttribute('style');
+      }
+    }
+  });
+}
+
+export function $forEachTableCell(
+  grid: TableDOMTable,
+  cb: (
+    cell: TableDOMCell,
+    lexicalNode: LexicalNode,
+    cords: {
+      x: number;
+      y: number;
+    },
+  ) => void,
+) {
+  const {domRows} = grid;
+
+  for (let y = 0; y < domRows.length; y++) {
+    const row = domRows[y];
+    if (!row) {
+      continue;
+    }
+
+    for (let x = 0; x < row.length; x++) {
+      const cell = row[x];
+      if (!cell) {
+        continue;
+      }
+      const lexicalNode = $getNearestNodeFromDOMNode(cell.elem);
+
+      if (lexicalNode !== null) {
+        cb(cell, lexicalNode, {
+          x,
+          y,
+        });
+      }
+    }
+  }
+}
+
+export function $addHighlightStyleToTable(
+  editor: LexicalEditor,
+  tableSelection: TableObserver,
+) {
+  tableSelection.disableHighlightStyle();
+  $forEachTableCell(tableSelection.table, (cell) => {
+    cell.highlighted = true;
+    $addHighlightToDOM(editor, cell);
+  });
+}
+
+export function $removeHighlightStyleToTable(
+  editor: LexicalEditor,
+  tableObserver: TableObserver,
+) {
+  tableObserver.enableHighlightStyle();
+  $forEachTableCell(tableObserver.table, (cell) => {
+    const elem = cell.elem;
+    cell.highlighted = false;
+    $removeHighlightFromDOM(editor, cell);
+
+    if (!elem.getAttribute('style')) {
+      elem.removeAttribute('style');
+    }
+  });
+}
+
+type Direction = 'backward' | 'forward' | 'up' | 'down';
+
+const selectTableNodeInDirection = (
+  tableObserver: TableObserver,
+  tableNode: TableNode,
+  x: number,
+  y: number,
+  direction: Direction,
+): boolean => {
+  const isForward = direction === 'forward';
+
+  switch (direction) {
+    case 'backward':
+    case 'forward':
+      if (x !== (isForward ? tableObserver.table.columns - 1 : 0)) {
+        selectTableCellNode(
+          tableNode.getCellNodeFromCordsOrThrow(
+            x + (isForward ? 1 : -1),
+            y,
+            tableObserver.table,
+          ),
+          isForward,
+        );
+      } else {
+        if (y !== (isForward ? tableObserver.table.rows - 1 : 0)) {
+          selectTableCellNode(
+            tableNode.getCellNodeFromCordsOrThrow(
+              isForward ? 0 : tableObserver.table.columns - 1,
+              y + (isForward ? 1 : -1),
+              tableObserver.table,
+            ),
+            isForward,
+          );
+        } else if (!isForward) {
+          tableNode.selectPrevious();
+        } else {
+          tableNode.selectNext();
+        }
+      }
+
+      return true;
+
+    case 'up':
+      if (y !== 0) {
+        selectTableCellNode(
+          tableNode.getCellNodeFromCordsOrThrow(x, y - 1, tableObserver.table),
+          false,
+        );
+      } else {
+        tableNode.selectPrevious();
+      }
+
+      return true;
+
+    case 'down':
+      if (y !== tableObserver.table.rows - 1) {
+        selectTableCellNode(
+          tableNode.getCellNodeFromCordsOrThrow(x, y + 1, tableObserver.table),
+          true,
+        );
+      } else {
+        tableNode.selectNext();
+      }
+
+      return true;
+    default:
+      return false;
+  }
+};
+
+const adjustFocusNodeInDirection = (
+  tableObserver: TableObserver,
+  tableNode: TableNode,
+  x: number,
+  y: number,
+  direction: Direction,
+): boolean => {
+  const isForward = direction === 'forward';
+
+  switch (direction) {
+    case 'backward':
+    case 'forward':
+      if (x !== (isForward ? tableObserver.table.columns - 1 : 0)) {
+        tableObserver.setFocusCellForSelection(
+          tableNode.getDOMCellFromCordsOrThrow(
+            x + (isForward ? 1 : -1),
+            y,
+            tableObserver.table,
+          ),
+        );
+      }
+
+      return true;
+    case 'up':
+      if (y !== 0) {
+        tableObserver.setFocusCellForSelection(
+          tableNode.getDOMCellFromCordsOrThrow(x, y - 1, tableObserver.table),
+        );
+
+        return true;
+      } else {
+        return false;
+      }
+    case 'down':
+      if (y !== tableObserver.table.rows - 1) {
+        tableObserver.setFocusCellForSelection(
+          tableNode.getDOMCellFromCordsOrThrow(x, y + 1, tableObserver.table),
+        );
+
+        return true;
+      } else {
+        return false;
+      }
+    default:
+      return false;
+  }
+};
+
+function $isSelectionInTable(
+  selection: null | BaseSelection,
+  tableNode: TableNode,
+): boolean {
+  if ($isRangeSelection(selection) || $isTableSelection(selection)) {
+    const isAnchorInside = tableNode.isParentOf(selection.anchor.getNode());
+    const isFocusInside = tableNode.isParentOf(selection.focus.getNode());
+
+    return isAnchorInside && isFocusInside;
+  }
+
+  return false;
+}
+
+function selectTableCellNode(tableCell: TableCellNode, fromStart: boolean) {
+  if (fromStart) {
+    tableCell.selectStart();
+  } else {
+    tableCell.selectEnd();
+  }
+}
+
+const BROWSER_BLUE_RGB = '172,206,247';
+function $addHighlightToDOM(editor: LexicalEditor, cell: TableDOMCell): void {
+  const element = cell.elem;
+  const node = $getNearestNodeFromDOMNode(element);
+  invariant(
+    $isTableCellNode(node),
+    'Expected to find LexicalNode from Table Cell DOMNode',
+  );
+  const backgroundColor = node.getBackgroundColor();
+  if (backgroundColor === null) {
+    element.style.setProperty('background-color', `rgb(${BROWSER_BLUE_RGB})`);
+  } else {
+    element.style.setProperty(
+      'background-image',
+      `linear-gradient(to right, rgba(${BROWSER_BLUE_RGB},0.85), rgba(${BROWSER_BLUE_RGB},0.85))`,
+    );
+  }
+  element.style.setProperty('caret-color', 'transparent');
+}
+
+function $removeHighlightFromDOM(
+  editor: LexicalEditor,
+  cell: TableDOMCell,
+): void {
+  const element = cell.elem;
+  const node = $getNearestNodeFromDOMNode(element);
+  invariant(
+    $isTableCellNode(node),
+    'Expected to find LexicalNode from Table Cell DOMNode',
+  );
+  const backgroundColor = node.getBackgroundColor();
+  if (backgroundColor === null) {
+    element.style.removeProperty('background-color');
+  }
+  element.style.removeProperty('background-image');
+  element.style.removeProperty('caret-color');
+}
+
+export function $findCellNode(node: LexicalNode): null | TableCellNode {
+  const cellNode = $findMatchingParent(node, $isTableCellNode);
+  return $isTableCellNode(cellNode) ? cellNode : null;
+}
+
+export function $findTableNode(node: LexicalNode): null | TableNode {
+  const tableNode = $findMatchingParent(node, $isTableNode);
+  return $isTableNode(tableNode) ? tableNode : null;
+}
+
+function $handleArrowKey(
+  editor: LexicalEditor,
+  event: KeyboardEvent,
+  direction: Direction,
+  tableNode: TableNode,
+  tableObserver: TableObserver,
+): boolean {
+  if (
+    (direction === 'up' || direction === 'down') &&
+    isTypeaheadMenuInView(editor)
+  ) {
+    return false;
+  }
+
+  const selection = $getSelection();
+
+  if (!$isSelectionInTable(selection, tableNode)) {
+    if ($isRangeSelection(selection)) {
+      if (selection.isCollapsed() && direction === 'backward') {
+        const anchorType = selection.anchor.type;
+        const anchorOffset = selection.anchor.offset;
+        if (
+          anchorType !== 'element' &&
+          !(anchorType === 'text' && anchorOffset === 0)
+        ) {
+          return false;
+        }
+        const anchorNode = selection.anchor.getNode();
+        if (!anchorNode) {
+          return false;
+        }
+        const parentNode = $findMatchingParent(
+          anchorNode,
+          (n) => $isElementNode(n) && !n.isInline(),
+        );
+        if (!parentNode) {
+          return false;
+        }
+        const siblingNode = parentNode.getPreviousSibling();
+        if (!siblingNode || !$isTableNode(siblingNode)) {
+          return false;
+        }
+        stopEvent(event);
+        siblingNode.selectEnd();
+        return true;
+      } else if (
+        event.shiftKey &&
+        (direction === 'up' || direction === 'down')
+      ) {
+        const focusNode = selection.focus.getNode();
+        if ($isRootOrShadowRoot(focusNode)) {
+          const selectedNode = selection.getNodes()[0];
+          if (selectedNode) {
+            const tableCellNode = $findMatchingParent(
+              selectedNode,
+              $isTableCellNode,
+            );
+            if (tableCellNode && tableNode.isParentOf(tableCellNode)) {
+              const firstDescendant = tableNode.getFirstDescendant();
+              const lastDescendant = tableNode.getLastDescendant();
+              if (!firstDescendant || !lastDescendant) {
+                return false;
+              }
+              const [firstCellNode] = $getNodeTriplet(firstDescendant);
+              const [lastCellNode] = $getNodeTriplet(lastDescendant);
+              const firstCellCoords = tableNode.getCordsFromCellNode(
+                firstCellNode,
+                tableObserver.table,
+              );
+              const lastCellCoords = tableNode.getCordsFromCellNode(
+                lastCellNode,
+                tableObserver.table,
+              );
+              const firstCellDOM = tableNode.getDOMCellFromCordsOrThrow(
+                firstCellCoords.x,
+                firstCellCoords.y,
+                tableObserver.table,
+              );
+              const lastCellDOM = tableNode.getDOMCellFromCordsOrThrow(
+                lastCellCoords.x,
+                lastCellCoords.y,
+                tableObserver.table,
+              );
+              tableObserver.setAnchorCellForSelection(firstCellDOM);
+              tableObserver.setFocusCellForSelection(lastCellDOM, true);
+              return true;
+            }
+          }
+          return false;
+        } else {
+          const focusParentNode = $findMatchingParent(
+            focusNode,
+            (n) => $isElementNode(n) && !n.isInline(),
+          );
+          if (!focusParentNode) {
+            return false;
+          }
+          const sibling =
+            direction === 'down'
+              ? focusParentNode.getNextSibling()
+              : focusParentNode.getPreviousSibling();
+          if (
+            $isTableNode(sibling) &&
+            tableObserver.tableNodeKey === sibling.getKey()
+          ) {
+            const firstDescendant = sibling.getFirstDescendant();
+            const lastDescendant = sibling.getLastDescendant();
+            if (!firstDescendant || !lastDescendant) {
+              return false;
+            }
+            const [firstCellNode] = $getNodeTriplet(firstDescendant);
+            const [lastCellNode] = $getNodeTriplet(lastDescendant);
+            const newSelection = selection.clone();
+            newSelection.focus.set(
+              (direction === 'up' ? firstCellNode : lastCellNode).getKey(),
+              direction === 'up' ? 0 : lastCellNode.getChildrenSize(),
+              'element',
+            );
+            $setSelection(newSelection);
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  if ($isRangeSelection(selection) && selection.isCollapsed()) {
+    const {anchor, focus} = selection;
+    const anchorCellNode = $findMatchingParent(
+      anchor.getNode(),
+      $isTableCellNode,
+    );
+    const focusCellNode = $findMatchingParent(
+      focus.getNode(),
+      $isTableCellNode,
+    );
+    if (
+      !$isTableCellNode(anchorCellNode) ||
+      !anchorCellNode.is(focusCellNode)
+    ) {
+      return false;
+    }
+    const anchorCellTable = $findTableNode(anchorCellNode);
+    if (anchorCellTable !== tableNode && anchorCellTable != null) {
+      const anchorCellTableElement = editor.getElementByKey(
+        anchorCellTable.getKey(),
+      );
+      if (anchorCellTableElement != null) {
+        tableObserver.table = getTable(anchorCellTableElement);
+        return $handleArrowKey(
+          editor,
+          event,
+          direction,
+          anchorCellTable,
+          tableObserver,
+        );
+      }
+    }
+
+    if (direction === 'backward' || direction === 'forward') {
+      const anchorType = anchor.type;
+      const anchorOffset = anchor.offset;
+      const anchorNode = anchor.getNode();
+      if (!anchorNode) {
+        return false;
+      }
+
+      const selectedNodes = selection.getNodes();
+      if (selectedNodes.length === 1 && $isDecoratorNode(selectedNodes[0])) {
+        return false;
+      }
+
+      if (
+        isExitingTableAnchor(anchorType, anchorOffset, anchorNode, direction)
+      ) {
+        return $handleTableExit(event, anchorNode, tableNode, direction);
+      }
+
+      return false;
+    }
+
+    const anchorCellDom = editor.getElementByKey(anchorCellNode.__key);
+    const anchorDOM = editor.getElementByKey(anchor.key);
+    if (anchorDOM == null || anchorCellDom == null) {
+      return false;
+    }
+
+    let edgeSelectionRect;
+    if (anchor.type === 'element') {
+      edgeSelectionRect = anchorDOM.getBoundingClientRect();
+    } else {
+      const domSelection = window.getSelection();
+      if (domSelection === null || domSelection.rangeCount === 0) {
+        return false;
+      }
+
+      const range = domSelection.getRangeAt(0);
+      edgeSelectionRect = range.getBoundingClientRect();
+    }
+
+    const edgeChild =
+      direction === 'up'
+        ? anchorCellNode.getFirstChild()
+        : anchorCellNode.getLastChild();
+    if (edgeChild == null) {
+      return false;
+    }
+
+    const edgeChildDOM = editor.getElementByKey(edgeChild.__key);
+
+    if (edgeChildDOM == null) {
+      return false;
+    }
+
+    const edgeRect = edgeChildDOM.getBoundingClientRect();
+    const isExiting =
+      direction === 'up'
+        ? edgeRect.top > edgeSelectionRect.top - edgeSelectionRect.height
+        : edgeSelectionRect.bottom + edgeSelectionRect.height > edgeRect.bottom;
+
+    if (isExiting) {
+      stopEvent(event);
+
+      const cords = tableNode.getCordsFromCellNode(
+        anchorCellNode,
+        tableObserver.table,
+      );
+
+      if (event.shiftKey) {
+        const cell = tableNode.getDOMCellFromCordsOrThrow(
+          cords.x,
+          cords.y,
+          tableObserver.table,
+        );
+        tableObserver.setAnchorCellForSelection(cell);
+        tableObserver.setFocusCellForSelection(cell, true);
+      } else {
+        return selectTableNodeInDirection(
+          tableObserver,
+          tableNode,
+          cords.x,
+          cords.y,
+          direction,
+        );
+      }
+
+      return true;
+    }
+  } else if ($isTableSelection(selection)) {
+    const {anchor, focus} = selection;
+    const anchorCellNode = $findMatchingParent(
+      anchor.getNode(),
+      $isTableCellNode,
+    );
+    const focusCellNode = $findMatchingParent(
+      focus.getNode(),
+      $isTableCellNode,
+    );
+
+    const [tableNodeFromSelection] = selection.getNodes();
+    const tableElement = editor.getElementByKey(
+      tableNodeFromSelection.getKey(),
+    );
+    if (
+      !$isTableCellNode(anchorCellNode) ||
+      !$isTableCellNode(focusCellNode) ||
+      !$isTableNode(tableNodeFromSelection) ||
+      tableElement == null
+    ) {
+      return false;
+    }
+    tableObserver.updateTableTableSelection(selection);
+
+    const grid = getTable(tableElement);
+    const cordsAnchor = tableNode.getCordsFromCellNode(anchorCellNode, grid);
+    const anchorCell = tableNode.getDOMCellFromCordsOrThrow(
+      cordsAnchor.x,
+      cordsAnchor.y,
+      grid,
+    );
+    tableObserver.setAnchorCellForSelection(anchorCell);
+
+    stopEvent(event);
+
+    if (event.shiftKey) {
+      const cords = tableNode.getCordsFromCellNode(focusCellNode, grid);
+      return adjustFocusNodeInDirection(
+        tableObserver,
+        tableNodeFromSelection,
+        cords.x,
+        cords.y,
+        direction,
+      );
+    } else {
+      focusCellNode.selectEnd();
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+function stopEvent(event: Event) {
+  event.preventDefault();
+  event.stopImmediatePropagation();
+  event.stopPropagation();
+}
+
+function isTypeaheadMenuInView(editor: LexicalEditor) {
+  // There is no inbuilt way to check if the component picker is in view
+  // but we can check if the root DOM element has the aria-controls attribute "typeahead-menu".
+  const root = editor.getRootElement();
+  if (!root) {
+    return false;
+  }
+  return (
+    root.hasAttribute('aria-controls') &&
+    root.getAttribute('aria-controls') === 'typeahead-menu'
+  );
+}
+
+function isExitingTableAnchor(
+  type: string,
+  offset: number,
+  anchorNode: LexicalNode,
+  direction: 'backward' | 'forward',
+) {
+  return (
+    isExitingTableElementAnchor(type, anchorNode, direction) ||
+    $isExitingTableTextAnchor(type, offset, anchorNode, direction)
+  );
+}
+
+function isExitingTableElementAnchor(
+  type: string,
+  anchorNode: LexicalNode,
+  direction: 'backward' | 'forward',
+) {
+  return (
+    type === 'element' &&
+    (direction === 'backward'
+      ? anchorNode.getPreviousSibling() === null
+      : anchorNode.getNextSibling() === null)
+  );
+}
+
+function $isExitingTableTextAnchor(
+  type: string,
+  offset: number,
+  anchorNode: LexicalNode,
+  direction: 'backward' | 'forward',
+) {
+  const parentNode = $findMatchingParent(
+    anchorNode,
+    (n) => $isElementNode(n) && !n.isInline(),
+  );
+  if (!parentNode) {
+    return false;
+  }
+  const hasValidOffset =
+    direction === 'backward'
+      ? offset === 0
+      : offset === anchorNode.getTextContentSize();
+  return (
+    type === 'text' &&
+    hasValidOffset &&
+    (direction === 'backward'
+      ? parentNode.getPreviousSibling() === null
+      : parentNode.getNextSibling() === null)
+  );
+}
+
+function $handleTableExit(
+  event: KeyboardEvent,
+  anchorNode: LexicalNode,
+  tableNode: TableNode,
+  direction: 'backward' | 'forward',
+) {
+  const anchorCellNode = $findMatchingParent(anchorNode, $isTableCellNode);
+  if (!$isTableCellNode(anchorCellNode)) {
+    return false;
+  }
+  const [tableMap, cellValue] = $computeTableMap(
+    tableNode,
+    anchorCellNode,
+    anchorCellNode,
+  );
+  if (!isExitingCell(tableMap, cellValue, direction)) {
+    return false;
+  }
+
+  const toNode = $getExitingToNode(anchorNode, direction, tableNode);
+  if (!toNode || $isTableNode(toNode)) {
+    return false;
+  }
+
+  stopEvent(event);
+  if (direction === 'backward') {
+    toNode.selectEnd();
+  } else {
+    toNode.selectStart();
+  }
+  return true;
+}
+
+function isExitingCell(
+  tableMap: TableMapType,
+  cellValue: TableMapValueType,
+  direction: 'backward' | 'forward',
+) {
+  const firstCell = tableMap[0][0];
+  const lastCell = tableMap[tableMap.length - 1][tableMap[0].length - 1];
+  const {startColumn, startRow} = cellValue;
+  return direction === 'backward'
+    ? startColumn === firstCell.startColumn && startRow === firstCell.startRow
+    : startColumn === lastCell.startColumn && startRow === lastCell.startRow;
+}
+
+function $getExitingToNode(
+  anchorNode: LexicalNode,
+  direction: 'backward' | 'forward',
+  tableNode: TableNode,
+) {
+  const parentNode = $findMatchingParent(
+    anchorNode,
+    (n) => $isElementNode(n) && !n.isInline(),
+  );
+  if (!parentNode) {
+    return undefined;
+  }
+  const anchorSibling =
+    direction === 'backward'
+      ? parentNode.getPreviousSibling()
+      : parentNode.getNextSibling();
+  return anchorSibling && $isTableNode(anchorSibling)
+    ? anchorSibling
+    : direction === 'backward'
+    ? tableNode.getPreviousSibling()
+    : tableNode.getNextSibling();
+}
+
+function $insertParagraphAtTableEdge(
+  edgePosition: 'first' | 'last',
+  tableNode: TableNode,
+  children?: LexicalNode[],
+) {
+  const paragraphNode = $createParagraphNode();
+  if (edgePosition === 'first') {
+    tableNode.insertBefore(paragraphNode);
+  } else {
+    tableNode.insertAfter(paragraphNode);
+  }
+  paragraphNode.append(...(children || []));
+  paragraphNode.selectEnd();
+}
+
+function $getTableEdgeCursorPosition(
+  editor: LexicalEditor,
+  selection: RangeSelection,
+  tableNode: TableNode,
+) {
+  const tableNodeParent = tableNode.getParent();
+  if (!tableNodeParent) {
+    return undefined;
+  }
+
+  const tableNodeParentDOM = editor.getElementByKey(tableNodeParent.getKey());
+  if (!tableNodeParentDOM) {
+    return undefined;
+  }
+
+  // TODO: Add support for nested tables
+  const domSelection = window.getSelection();
+  if (!domSelection || domSelection.anchorNode !== tableNodeParentDOM) {
+    return undefined;
+  }
+
+  const anchorCellNode = $findMatchingParent(selection.anchor.getNode(), (n) =>
+    $isTableCellNode(n),
+  ) as TableCellNode | null;
+  if (!anchorCellNode) {
+    return undefined;
+  }
+
+  const parentTable = $findMatchingParent(anchorCellNode, (n) =>
+    $isTableNode(n),
+  );
+  if (!$isTableNode(parentTable) || !parentTable.is(tableNode)) {
+    return undefined;
+  }
+
+  const [tableMap, cellValue] = $computeTableMap(
+    tableNode,
+    anchorCellNode,
+    anchorCellNode,
+  );
+  const firstCell = tableMap[0][0];
+  const lastCell = tableMap[tableMap.length - 1][tableMap[0].length - 1];
+  const {startRow, startColumn} = cellValue;
+
+  const isAtFirstCell =
+    startRow === firstCell.startRow && startColumn === firstCell.startColumn;
+  const isAtLastCell =
+    startRow === lastCell.startRow && startColumn === lastCell.startColumn;
+
+  if (isAtFirstCell) {
+    return 'first';
+  } else if (isAtLastCell) {
+    return 'last';
+  } else {
+    return undefined;
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts b/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
new file mode 100644
index 00000000000..cdbc846584d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
@@ -0,0 +1,894 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {TableMapType, TableMapValueType} from './LexicalTableSelection';
+import type {ElementNode, PointType} from 'lexical';
+
+import {$findMatchingParent} from '@lexical/utils';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getSelection,
+  $isRangeSelection,
+  LexicalNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {InsertTableCommandPayloadHeaders} from '.';
+import {
+  $createTableCellNode,
+  $isTableCellNode,
+  TableCellHeaderState,
+  TableCellHeaderStates,
+  TableCellNode,
+} from './LexicalTableCellNode';
+import {$createTableNode, $isTableNode, TableNode} from './LexicalTableNode';
+import {TableDOMTable} from './LexicalTableObserver';
+import {
+  $createTableRowNode,
+  $isTableRowNode,
+  TableRowNode,
+} from './LexicalTableRowNode';
+import {$isTableSelection} from './LexicalTableSelection';
+
+export function $createTableNodeWithDimensions(
+  rowCount: number,
+  columnCount: number,
+  includeHeaders: InsertTableCommandPayloadHeaders = true,
+): TableNode {
+  const tableNode = $createTableNode();
+
+  for (let iRow = 0; iRow < rowCount; iRow++) {
+    const tableRowNode = $createTableRowNode();
+
+    for (let iColumn = 0; iColumn < columnCount; iColumn++) {
+      let headerState = TableCellHeaderStates.NO_STATUS;
+
+      if (typeof includeHeaders === 'object') {
+        if (iRow === 0 && includeHeaders.rows) {
+          headerState |= TableCellHeaderStates.ROW;
+        }
+        if (iColumn === 0 && includeHeaders.columns) {
+          headerState |= TableCellHeaderStates.COLUMN;
+        }
+      } else if (includeHeaders) {
+        if (iRow === 0) {
+          headerState |= TableCellHeaderStates.ROW;
+        }
+        if (iColumn === 0) {
+          headerState |= TableCellHeaderStates.COLUMN;
+        }
+      }
+
+      const tableCellNode = $createTableCellNode(headerState);
+      const paragraphNode = $createParagraphNode();
+      paragraphNode.append($createTextNode());
+      tableCellNode.append(paragraphNode);
+      tableRowNode.append(tableCellNode);
+    }
+
+    tableNode.append(tableRowNode);
+  }
+
+  return tableNode;
+}
+
+export function $getTableCellNodeFromLexicalNode(
+  startingNode: LexicalNode,
+): TableCellNode | null {
+  const node = $findMatchingParent(startingNode, (n) => $isTableCellNode(n));
+
+  if ($isTableCellNode(node)) {
+    return node;
+  }
+
+  return null;
+}
+
+export function $getTableRowNodeFromTableCellNodeOrThrow(
+  startingNode: LexicalNode,
+): TableRowNode {
+  const node = $findMatchingParent(startingNode, (n) => $isTableRowNode(n));
+
+  if ($isTableRowNode(node)) {
+    return node;
+  }
+
+  throw new Error('Expected table cell to be inside of table row.');
+}
+
+export function $getTableNodeFromLexicalNodeOrThrow(
+  startingNode: LexicalNode,
+): TableNode {
+  const node = $findMatchingParent(startingNode, (n) => $isTableNode(n));
+
+  if ($isTableNode(node)) {
+    return node;
+  }
+
+  throw new Error('Expected table cell to be inside of table.');
+}
+
+export function $getTableRowIndexFromTableCellNode(
+  tableCellNode: TableCellNode,
+): number {
+  const tableRowNode = $getTableRowNodeFromTableCellNodeOrThrow(tableCellNode);
+  const tableNode = $getTableNodeFromLexicalNodeOrThrow(tableRowNode);
+  return tableNode.getChildren().findIndex((n) => n.is(tableRowNode));
+}
+
+export function $getTableColumnIndexFromTableCellNode(
+  tableCellNode: TableCellNode,
+): number {
+  const tableRowNode = $getTableRowNodeFromTableCellNodeOrThrow(tableCellNode);
+  return tableRowNode.getChildren().findIndex((n) => n.is(tableCellNode));
+}
+
+export type TableCellSiblings = {
+  above: TableCellNode | null | undefined;
+  below: TableCellNode | null | undefined;
+  left: TableCellNode | null | undefined;
+  right: TableCellNode | null | undefined;
+};
+
+export function $getTableCellSiblingsFromTableCellNode(
+  tableCellNode: TableCellNode,
+  table: TableDOMTable,
+): TableCellSiblings {
+  const tableNode = $getTableNodeFromLexicalNodeOrThrow(tableCellNode);
+  const {x, y} = tableNode.getCordsFromCellNode(tableCellNode, table);
+  return {
+    above: tableNode.getCellNodeFromCords(x, y - 1, table),
+    below: tableNode.getCellNodeFromCords(x, y + 1, table),
+    left: tableNode.getCellNodeFromCords(x - 1, y, table),
+    right: tableNode.getCellNodeFromCords(x + 1, y, table),
+  };
+}
+
+export function $removeTableRowAtIndex(
+  tableNode: TableNode,
+  indexToDelete: number,
+): TableNode {
+  const tableRows = tableNode.getChildren();
+
+  if (indexToDelete >= tableRows.length || indexToDelete < 0) {
+    throw new Error('Expected table cell to be inside of table row.');
+  }
+
+  const targetRowNode = tableRows[indexToDelete];
+  targetRowNode.remove();
+  return tableNode;
+}
+
+export function $insertTableRow(
+  tableNode: TableNode,
+  targetIndex: number,
+  shouldInsertAfter = true,
+  rowCount: number,
+  table: TableDOMTable,
+): TableNode {
+  const tableRows = tableNode.getChildren();
+
+  if (targetIndex >= tableRows.length || targetIndex < 0) {
+    throw new Error('Table row target index out of range');
+  }
+
+  const targetRowNode = tableRows[targetIndex];
+
+  if ($isTableRowNode(targetRowNode)) {
+    for (let r = 0; r < rowCount; r++) {
+      const tableRowCells = targetRowNode.getChildren<TableCellNode>();
+      const tableColumnCount = tableRowCells.length;
+      const newTableRowNode = $createTableRowNode();
+
+      for (let c = 0; c < tableColumnCount; c++) {
+        const tableCellFromTargetRow = tableRowCells[c];
+
+        invariant(
+          $isTableCellNode(tableCellFromTargetRow),
+          'Expected table cell',
+        );
+
+        const {above, below} = $getTableCellSiblingsFromTableCellNode(
+          tableCellFromTargetRow,
+          table,
+        );
+
+        let headerState = TableCellHeaderStates.NO_STATUS;
+        const width =
+          (above && above.getWidth()) ||
+          (below && below.getWidth()) ||
+          undefined;
+
+        if (
+          (above && above.hasHeaderState(TableCellHeaderStates.COLUMN)) ||
+          (below && below.hasHeaderState(TableCellHeaderStates.COLUMN))
+        ) {
+          headerState |= TableCellHeaderStates.COLUMN;
+        }
+
+        const tableCellNode = $createTableCellNode(headerState, 1, width);
+
+        tableCellNode.append($createParagraphNode());
+
+        newTableRowNode.append(tableCellNode);
+      }
+
+      if (shouldInsertAfter) {
+        targetRowNode.insertAfter(newTableRowNode);
+      } else {
+        targetRowNode.insertBefore(newTableRowNode);
+      }
+    }
+  } else {
+    throw new Error('Row before insertion index does not exist.');
+  }
+
+  return tableNode;
+}
+
+const getHeaderState = (
+  currentState: TableCellHeaderState,
+  possibleState: TableCellHeaderState,
+): TableCellHeaderState => {
+  if (
+    currentState === TableCellHeaderStates.BOTH ||
+    currentState === possibleState
+  ) {
+    return possibleState;
+  }
+  return TableCellHeaderStates.NO_STATUS;
+};
+
+export function $insertTableRow__EXPERIMENTAL(insertAfter = true): void {
+  const selection = $getSelection();
+  invariant(
+    $isRangeSelection(selection) || $isTableSelection(selection),
+    'Expected a RangeSelection or TableSelection',
+  );
+  const focus = selection.focus.getNode();
+  const [focusCell, , grid] = $getNodeTriplet(focus);
+  const [gridMap, focusCellMap] = $computeTableMap(grid, focusCell, focusCell);
+  const columnCount = gridMap[0].length;
+  const {startRow: focusStartRow} = focusCellMap;
+  if (insertAfter) {
+    const focusEndRow = focusStartRow + focusCell.__rowSpan - 1;
+    const focusEndRowMap = gridMap[focusEndRow];
+    const newRow = $createTableRowNode();
+    for (let i = 0; i < columnCount; i++) {
+      const {cell, startRow} = focusEndRowMap[i];
+      if (startRow + cell.__rowSpan - 1 <= focusEndRow) {
+        const currentCell = focusEndRowMap[i].cell as TableCellNode;
+        const currentCellHeaderState = currentCell.__headerState;
+
+        const headerState = getHeaderState(
+          currentCellHeaderState,
+          TableCellHeaderStates.COLUMN,
+        );
+
+        newRow.append(
+          $createTableCellNode(headerState).append($createParagraphNode()),
+        );
+      } else {
+        cell.setRowSpan(cell.__rowSpan + 1);
+      }
+    }
+    const focusEndRowNode = grid.getChildAtIndex(focusEndRow);
+    invariant(
+      $isTableRowNode(focusEndRowNode),
+      'focusEndRow is not a TableRowNode',
+    );
+    focusEndRowNode.insertAfter(newRow);
+  } else {
+    const focusStartRowMap = gridMap[focusStartRow];
+    const newRow = $createTableRowNode();
+    for (let i = 0; i < columnCount; i++) {
+      const {cell, startRow} = focusStartRowMap[i];
+      if (startRow === focusStartRow) {
+        const currentCell = focusStartRowMap[i].cell as TableCellNode;
+        const currentCellHeaderState = currentCell.__headerState;
+
+        const headerState = getHeaderState(
+          currentCellHeaderState,
+          TableCellHeaderStates.COLUMN,
+        );
+
+        newRow.append(
+          $createTableCellNode(headerState).append($createParagraphNode()),
+        );
+      } else {
+        cell.setRowSpan(cell.__rowSpan + 1);
+      }
+    }
+    const focusStartRowNode = grid.getChildAtIndex(focusStartRow);
+    invariant(
+      $isTableRowNode(focusStartRowNode),
+      'focusEndRow is not a TableRowNode',
+    );
+    focusStartRowNode.insertBefore(newRow);
+  }
+}
+
+export function $insertTableColumn(
+  tableNode: TableNode,
+  targetIndex: number,
+  shouldInsertAfter = true,
+  columnCount: number,
+  table: TableDOMTable,
+): TableNode {
+  const tableRows = tableNode.getChildren();
+
+  const tableCellsToBeInserted = [];
+  for (let r = 0; r < tableRows.length; r++) {
+    const currentTableRowNode = tableRows[r];
+
+    if ($isTableRowNode(currentTableRowNode)) {
+      for (let c = 0; c < columnCount; c++) {
+        const tableRowChildren = currentTableRowNode.getChildren();
+        if (targetIndex >= tableRowChildren.length || targetIndex < 0) {
+          throw new Error('Table column target index out of range');
+        }
+
+        const targetCell = tableRowChildren[targetIndex];
+
+        invariant($isTableCellNode(targetCell), 'Expected table cell');
+
+        const {left, right} = $getTableCellSiblingsFromTableCellNode(
+          targetCell,
+          table,
+        );
+
+        let headerState = TableCellHeaderStates.NO_STATUS;
+
+        if (
+          (left && left.hasHeaderState(TableCellHeaderStates.ROW)) ||
+          (right && right.hasHeaderState(TableCellHeaderStates.ROW))
+        ) {
+          headerState |= TableCellHeaderStates.ROW;
+        }
+
+        const newTableCell = $createTableCellNode(headerState);
+
+        newTableCell.append($createParagraphNode());
+        tableCellsToBeInserted.push({
+          newTableCell,
+          targetCell,
+        });
+      }
+    }
+  }
+  tableCellsToBeInserted.forEach(({newTableCell, targetCell}) => {
+    if (shouldInsertAfter) {
+      targetCell.insertAfter(newTableCell);
+    } else {
+      targetCell.insertBefore(newTableCell);
+    }
+  });
+
+  return tableNode;
+}
+
+export function $insertTableColumn__EXPERIMENTAL(insertAfter = true): void {
+  const selection = $getSelection();
+  invariant(
+    $isRangeSelection(selection) || $isTableSelection(selection),
+    'Expected a RangeSelection or TableSelection',
+  );
+  const anchor = selection.anchor.getNode();
+  const focus = selection.focus.getNode();
+  const [anchorCell] = $getNodeTriplet(anchor);
+  const [focusCell, , grid] = $getNodeTriplet(focus);
+  const [gridMap, focusCellMap, anchorCellMap] = $computeTableMap(
+    grid,
+    focusCell,
+    anchorCell,
+  );
+  const rowCount = gridMap.length;
+  const startColumn = insertAfter
+    ? Math.max(focusCellMap.startColumn, anchorCellMap.startColumn)
+    : Math.min(focusCellMap.startColumn, anchorCellMap.startColumn);
+  const insertAfterColumn = insertAfter
+    ? startColumn + focusCell.__colSpan - 1
+    : startColumn - 1;
+  const gridFirstChild = grid.getFirstChild();
+  invariant(
+    $isTableRowNode(gridFirstChild),
+    'Expected firstTable child to be a row',
+  );
+  let firstInsertedCell: null | TableCellNode = null;
+  function $createTableCellNodeForInsertTableColumn(
+    headerState: TableCellHeaderState = TableCellHeaderStates.NO_STATUS,
+  ) {
+    const cell = $createTableCellNode(headerState).append(
+      $createParagraphNode(),
+    );
+    if (firstInsertedCell === null) {
+      firstInsertedCell = cell;
+    }
+    return cell;
+  }
+  let loopRow: TableRowNode = gridFirstChild;
+  rowLoop: for (let i = 0; i < rowCount; i++) {
+    if (i !== 0) {
+      const currentRow = loopRow.getNextSibling();
+      invariant(
+        $isTableRowNode(currentRow),
+        'Expected row nextSibling to be a row',
+      );
+      loopRow = currentRow;
+    }
+    const rowMap = gridMap[i];
+
+    const currentCellHeaderState = (
+      rowMap[insertAfterColumn < 0 ? 0 : insertAfterColumn]
+        .cell as TableCellNode
+    ).__headerState;
+
+    const headerState = getHeaderState(
+      currentCellHeaderState,
+      TableCellHeaderStates.ROW,
+    );
+
+    if (insertAfterColumn < 0) {
+      $insertFirst(
+        loopRow,
+        $createTableCellNodeForInsertTableColumn(headerState),
+      );
+      continue;
+    }
+    const {
+      cell: currentCell,
+      startColumn: currentStartColumn,
+      startRow: currentStartRow,
+    } = rowMap[insertAfterColumn];
+    if (currentStartColumn + currentCell.__colSpan - 1 <= insertAfterColumn) {
+      let insertAfterCell: TableCellNode = currentCell;
+      let insertAfterCellRowStart = currentStartRow;
+      let prevCellIndex = insertAfterColumn;
+      while (insertAfterCellRowStart !== i && insertAfterCell.__rowSpan > 1) {
+        prevCellIndex -= currentCell.__colSpan;
+        if (prevCellIndex >= 0) {
+          const {cell: cell_, startRow: startRow_} = rowMap[prevCellIndex];
+          insertAfterCell = cell_;
+          insertAfterCellRowStart = startRow_;
+        } else {
+          loopRow.append($createTableCellNodeForInsertTableColumn(headerState));
+          continue rowLoop;
+        }
+      }
+      insertAfterCell.insertAfter(
+        $createTableCellNodeForInsertTableColumn(headerState),
+      );
+    } else {
+      currentCell.setColSpan(currentCell.__colSpan + 1);
+    }
+  }
+  if (firstInsertedCell !== null) {
+    $moveSelectionToCell(firstInsertedCell);
+  }
+}
+
+export function $deleteTableColumn(
+  tableNode: TableNode,
+  targetIndex: number,
+): TableNode {
+  const tableRows = tableNode.getChildren();
+
+  for (let i = 0; i < tableRows.length; i++) {
+    const currentTableRowNode = tableRows[i];
+
+    if ($isTableRowNode(currentTableRowNode)) {
+      const tableRowChildren = currentTableRowNode.getChildren();
+
+      if (targetIndex >= tableRowChildren.length || targetIndex < 0) {
+        throw new Error('Table column target index out of range');
+      }
+
+      tableRowChildren[targetIndex].remove();
+    }
+  }
+
+  return tableNode;
+}
+
+export function $deleteTableRow__EXPERIMENTAL(): void {
+  const selection = $getSelection();
+  invariant(
+    $isRangeSelection(selection) || $isTableSelection(selection),
+    'Expected a RangeSelection or TableSelection',
+  );
+  const anchor = selection.anchor.getNode();
+  const focus = selection.focus.getNode();
+  const [anchorCell, , grid] = $getNodeTriplet(anchor);
+  const [focusCell] = $getNodeTriplet(focus);
+  const [gridMap, anchorCellMap, focusCellMap] = $computeTableMap(
+    grid,
+    anchorCell,
+    focusCell,
+  );
+  const {startRow: anchorStartRow} = anchorCellMap;
+  const {startRow: focusStartRow} = focusCellMap;
+  const focusEndRow = focusStartRow + focusCell.__rowSpan - 1;
+  if (gridMap.length === focusEndRow - anchorStartRow + 1) {
+    // Empty grid
+    grid.remove();
+    return;
+  }
+  const columnCount = gridMap[0].length;
+  const nextRow = gridMap[focusEndRow + 1];
+  const nextRowNode: null | TableRowNode = grid.getChildAtIndex(
+    focusEndRow + 1,
+  );
+  for (let row = focusEndRow; row >= anchorStartRow; row--) {
+    for (let column = columnCount - 1; column >= 0; column--) {
+      const {
+        cell,
+        startRow: cellStartRow,
+        startColumn: cellStartColumn,
+      } = gridMap[row][column];
+      if (cellStartColumn !== column) {
+        // Don't repeat work for the same Cell
+        continue;
+      }
+      // Rows overflowing top have to be trimmed
+      if (row === anchorStartRow && cellStartRow < anchorStartRow) {
+        cell.setRowSpan(cell.__rowSpan - (cellStartRow - anchorStartRow));
+      }
+      // Rows overflowing bottom have to be trimmed and moved to the next row
+      if (
+        cellStartRow >= anchorStartRow &&
+        cellStartRow + cell.__rowSpan - 1 > focusEndRow
+      ) {
+        cell.setRowSpan(cell.__rowSpan - (focusEndRow - cellStartRow + 1));
+        invariant(nextRowNode !== null, 'Expected nextRowNode not to be null');
+        if (column === 0) {
+          $insertFirst(nextRowNode, cell);
+        } else {
+          const {cell: previousCell} = nextRow[column - 1];
+          previousCell.insertAfter(cell);
+        }
+      }
+    }
+    const rowNode = grid.getChildAtIndex(row);
+    invariant(
+      $isTableRowNode(rowNode),
+      'Expected GridNode childAtIndex(%s) to be RowNode',
+      String(row),
+    );
+    rowNode.remove();
+  }
+  if (nextRow !== undefined) {
+    const {cell} = nextRow[0];
+    $moveSelectionToCell(cell);
+  } else {
+    const previousRow = gridMap[anchorStartRow - 1];
+    const {cell} = previousRow[0];
+    $moveSelectionToCell(cell);
+  }
+}
+
+export function $deleteTableColumn__EXPERIMENTAL(): void {
+  const selection = $getSelection();
+  invariant(
+    $isRangeSelection(selection) || $isTableSelection(selection),
+    'Expected a RangeSelection or TableSelection',
+  );
+  const anchor = selection.anchor.getNode();
+  const focus = selection.focus.getNode();
+  const [anchorCell, , grid] = $getNodeTriplet(anchor);
+  const [focusCell] = $getNodeTriplet(focus);
+  const [gridMap, anchorCellMap, focusCellMap] = $computeTableMap(
+    grid,
+    anchorCell,
+    focusCell,
+  );
+  const {startColumn: anchorStartColumn} = anchorCellMap;
+  const {startRow: focusStartRow, startColumn: focusStartColumn} = focusCellMap;
+  const startColumn = Math.min(anchorStartColumn, focusStartColumn);
+  const endColumn = Math.max(
+    anchorStartColumn + anchorCell.__colSpan - 1,
+    focusStartColumn + focusCell.__colSpan - 1,
+  );
+  const selectedColumnCount = endColumn - startColumn + 1;
+  const columnCount = gridMap[0].length;
+  if (columnCount === endColumn - startColumn + 1) {
+    // Empty grid
+    grid.selectPrevious();
+    grid.remove();
+    return;
+  }
+  const rowCount = gridMap.length;
+  for (let row = 0; row < rowCount; row++) {
+    for (let column = startColumn; column <= endColumn; column++) {
+      const {cell, startColumn: cellStartColumn} = gridMap[row][column];
+      if (cellStartColumn < startColumn) {
+        if (column === startColumn) {
+          const overflowLeft = startColumn - cellStartColumn;
+          // Overflowing left
+          cell.setColSpan(
+            cell.__colSpan -
+              // Possible overflow right too
+              Math.min(selectedColumnCount, cell.__colSpan - overflowLeft),
+          );
+        }
+      } else if (cellStartColumn + cell.__colSpan - 1 > endColumn) {
+        if (column === endColumn) {
+          // Overflowing right
+          const inSelectedArea = endColumn - cellStartColumn + 1;
+          cell.setColSpan(cell.__colSpan - inSelectedArea);
+        }
+      } else {
+        cell.remove();
+      }
+    }
+  }
+  const focusRowMap = gridMap[focusStartRow];
+  const nextColumn =
+    anchorStartColumn > focusStartColumn
+      ? focusRowMap[anchorStartColumn + anchorCell.__colSpan]
+      : focusRowMap[focusStartColumn + focusCell.__colSpan];
+  if (nextColumn !== undefined) {
+    const {cell} = nextColumn;
+    $moveSelectionToCell(cell);
+  } else {
+    const previousRow =
+      focusStartColumn < anchorStartColumn
+        ? focusRowMap[focusStartColumn - 1]
+        : focusRowMap[anchorStartColumn - 1];
+    const {cell} = previousRow;
+    $moveSelectionToCell(cell);
+  }
+}
+
+function $moveSelectionToCell(cell: TableCellNode): void {
+  const firstDescendant = cell.getFirstDescendant();
+  if (firstDescendant == null) {
+    cell.selectStart();
+  } else {
+    firstDescendant.getParentOrThrow().selectStart();
+  }
+}
+
+function $insertFirst(parent: ElementNode, node: LexicalNode): void {
+  const firstChild = parent.getFirstChild();
+  if (firstChild !== null) {
+    firstChild.insertBefore(node);
+  } else {
+    parent.append(node);
+  }
+}
+
+export function $unmergeCell(): void {
+  const selection = $getSelection();
+  invariant(
+    $isRangeSelection(selection) || $isTableSelection(selection),
+    'Expected a RangeSelection or TableSelection',
+  );
+  const anchor = selection.anchor.getNode();
+  const [cell, row, grid] = $getNodeTriplet(anchor);
+  const colSpan = cell.__colSpan;
+  const rowSpan = cell.__rowSpan;
+  if (colSpan > 1) {
+    for (let i = 1; i < colSpan; i++) {
+      cell.insertAfter(
+        $createTableCellNode(TableCellHeaderStates.NO_STATUS).append(
+          $createParagraphNode(),
+        ),
+      );
+    }
+    cell.setColSpan(1);
+  }
+  if (rowSpan > 1) {
+    const [map, cellMap] = $computeTableMap(grid, cell, cell);
+    const {startColumn, startRow} = cellMap;
+    let currentRowNode;
+    for (let i = 1; i < rowSpan; i++) {
+      const currentRow = startRow + i;
+      const currentRowMap = map[currentRow];
+      currentRowNode = (currentRowNode || row).getNextSibling();
+      invariant(
+        $isTableRowNode(currentRowNode),
+        'Expected row next sibling to be a row',
+      );
+      let insertAfterCell: null | TableCellNode = null;
+      for (let column = 0; column < startColumn; column++) {
+        const currentCellMap = currentRowMap[column];
+        const currentCell = currentCellMap.cell;
+        if (currentCellMap.startRow === currentRow) {
+          insertAfterCell = currentCell;
+        }
+        if (currentCell.__colSpan > 1) {
+          column += currentCell.__colSpan - 1;
+        }
+      }
+      if (insertAfterCell === null) {
+        for (let j = 0; j < colSpan; j++) {
+          $insertFirst(
+            currentRowNode,
+            $createTableCellNode(TableCellHeaderStates.NO_STATUS).append(
+              $createParagraphNode(),
+            ),
+          );
+        }
+      } else {
+        for (let j = 0; j < colSpan; j++) {
+          insertAfterCell.insertAfter(
+            $createTableCellNode(TableCellHeaderStates.NO_STATUS).append(
+              $createParagraphNode(),
+            ),
+          );
+        }
+      }
+    }
+    cell.setRowSpan(1);
+  }
+}
+
+export function $computeTableMap(
+  grid: TableNode,
+  cellA: TableCellNode,
+  cellB: TableCellNode,
+): [TableMapType, TableMapValueType, TableMapValueType] {
+  const [tableMap, cellAValue, cellBValue] = $computeTableMapSkipCellCheck(
+    grid,
+    cellA,
+    cellB,
+  );
+  invariant(cellAValue !== null, 'Anchor not found in Grid');
+  invariant(cellBValue !== null, 'Focus not found in Grid');
+  return [tableMap, cellAValue, cellBValue];
+}
+
+export function $computeTableMapSkipCellCheck(
+  grid: TableNode,
+  cellA: null | TableCellNode,
+  cellB: null | TableCellNode,
+): [TableMapType, TableMapValueType | null, TableMapValueType | null] {
+  const tableMap: TableMapType = [];
+  let cellAValue: null | TableMapValueType = null;
+  let cellBValue: null | TableMapValueType = null;
+  function write(startRow: number, startColumn: number, cell: TableCellNode) {
+    const value = {
+      cell,
+      startColumn,
+      startRow,
+    };
+    const rowSpan = cell.__rowSpan;
+    const colSpan = cell.__colSpan;
+    for (let i = 0; i < rowSpan; i++) {
+      if (tableMap[startRow + i] === undefined) {
+        tableMap[startRow + i] = [];
+      }
+      for (let j = 0; j < colSpan; j++) {
+        tableMap[startRow + i][startColumn + j] = value;
+      }
+    }
+    if (cellA !== null && cellA.is(cell)) {
+      cellAValue = value;
+    }
+    if (cellB !== null && cellB.is(cell)) {
+      cellBValue = value;
+    }
+  }
+  function isEmpty(row: number, column: number) {
+    return tableMap[row] === undefined || tableMap[row][column] === undefined;
+  }
+
+  const gridChildren = grid.getChildren();
+  for (let i = 0; i < gridChildren.length; i++) {
+    const row = gridChildren[i];
+    invariant(
+      $isTableRowNode(row),
+      'Expected GridNode children to be TableRowNode',
+    );
+    const rowChildren = row.getChildren();
+    let j = 0;
+    for (const cell of rowChildren) {
+      invariant(
+        $isTableCellNode(cell),
+        'Expected TableRowNode children to be TableCellNode',
+      );
+      while (!isEmpty(i, j)) {
+        j++;
+      }
+      write(i, j, cell);
+      j += cell.__colSpan;
+    }
+  }
+  return [tableMap, cellAValue, cellBValue];
+}
+
+export function $getNodeTriplet(
+  source: PointType | LexicalNode | TableCellNode,
+): [TableCellNode, TableRowNode, TableNode] {
+  let cell: TableCellNode;
+  if (source instanceof TableCellNode) {
+    cell = source;
+  } else if ('__type' in source) {
+    const cell_ = $findMatchingParent(source, $isTableCellNode);
+    invariant(
+      $isTableCellNode(cell_),
+      'Expected to find a parent TableCellNode',
+    );
+    cell = cell_;
+  } else {
+    const cell_ = $findMatchingParent(source.getNode(), $isTableCellNode);
+    invariant(
+      $isTableCellNode(cell_),
+      'Expected to find a parent TableCellNode',
+    );
+    cell = cell_;
+  }
+  const row = cell.getParent();
+  invariant(
+    $isTableRowNode(row),
+    'Expected TableCellNode to have a parent TableRowNode',
+  );
+  const grid = row.getParent();
+  invariant(
+    $isTableNode(grid),
+    'Expected TableRowNode to have a parent GridNode',
+  );
+  return [cell, row, grid];
+}
+
+export function $getTableCellNodeRect(tableCellNode: TableCellNode): {
+  rowIndex: number;
+  columnIndex: number;
+  rowSpan: number;
+  colSpan: number;
+} | null {
+  const [cellNode, , gridNode] = $getNodeTriplet(tableCellNode);
+  const rows = gridNode.getChildren<TableRowNode>();
+  const rowCount = rows.length;
+  const columnCount = rows[0].getChildren().length;
+
+  // Create a matrix of the same size as the table to track the position of each cell
+  const cellMatrix = new Array(rowCount);
+  for (let i = 0; i < rowCount; i++) {
+    cellMatrix[i] = new Array(columnCount);
+  }
+
+  for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+    const row = rows[rowIndex];
+    const cells = row.getChildren<TableCellNode>();
+    let columnIndex = 0;
+
+    for (let cellIndex = 0; cellIndex < cells.length; cellIndex++) {
+      // Find the next available position in the matrix, skip the position of merged cells
+      while (cellMatrix[rowIndex][columnIndex]) {
+        columnIndex++;
+      }
+
+      const cell = cells[cellIndex];
+      const rowSpan = cell.__rowSpan || 1;
+      const colSpan = cell.__colSpan || 1;
+
+      // Put the cell into the corresponding position in the matrix
+      for (let i = 0; i < rowSpan; i++) {
+        for (let j = 0; j < colSpan; j++) {
+          cellMatrix[rowIndex + i][columnIndex + j] = cell;
+        }
+      }
+
+      // Return to the original index, row span and column span of the cell.
+      if (cellNode === cell) {
+        return {
+          colSpan,
+          columnIndex,
+          rowIndex,
+          rowSpan,
+        };
+      }
+
+      columnIndex += colSpan;
+    }
+  }
+
+  return null;
+}
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
new file mode 100644
index 00000000000..9c56db63bf3
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createTableCellNode, TableCellHeaderStates} from '@lexical/table';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    tableCell: 'test-table-cell-class',
+  },
+});
+
+describe('LexicalTableCellNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('TableCellNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const cellNode = $createTableCellNode(TableCellHeaderStates.NO_STATUS);
+
+        expect(cellNode).not.toBe(null);
+      });
+
+      expect(() =>
+        $createTableCellNode(TableCellHeaderStates.NO_STATUS),
+      ).toThrow();
+    });
+
+    test('TableCellNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const cellNode = $createTableCellNode(TableCellHeaderStates.NO_STATUS);
+        expect(cellNode.createDOM(editorConfig).outerHTML).toBe(
+          `<td class="${editorConfig.theme.tableCell}"></td>`,
+        );
+
+        const headerCellNode = $createTableCellNode(TableCellHeaderStates.ROW);
+        expect(headerCellNode.createDOM(editorConfig).outerHTML).toBe(
+          `<th class="${editorConfig.theme.tableCell}"></th>`,
+        );
+
+        const colSpan = 2;
+        const cellWithRowSpanNode = $createTableCellNode(
+          TableCellHeaderStates.NO_STATUS,
+          colSpan,
+        );
+        expect(cellWithRowSpanNode.createDOM(editorConfig).outerHTML).toBe(
+          `<td colspan="${colSpan}" class="${editorConfig.theme.tableCell}"></td>`,
+        );
+
+        const cellWidth = 200;
+        const cellWithCustomWidthNode = $createTableCellNode(
+          TableCellHeaderStates.NO_STATUS,
+          undefined,
+          cellWidth,
+        );
+        expect(cellWithCustomWidthNode.createDOM(editorConfig).outerHTML).toBe(
+          `<td style="width: ${cellWidth}px;" class="${editorConfig.theme.tableCell}"></td>`,
+        );
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
new file mode 100644
index 00000000000..b11b99490b6
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
@@ -0,0 +1,351 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$insertDataTransferForRichText} from '@lexical/clipboard';
+import {TablePlugin} from '@lexical/react/LexicalTablePlugin';
+import {
+  $createTableNode,
+  $createTableNodeWithDimensions,
+  $createTableSelection,
+} from '@lexical/table';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+  $selectAll,
+  $setSelection,
+  CUT_COMMAND,
+  ParagraphNode,
+} from 'lexical';
+import {
+  DataTransferMock,
+  initializeUnitTest,
+  invariant,
+} from 'lexical/src/__tests__/utils';
+
+import {$getElementForTableNode, TableNode} from '../../LexicalTableNode';
+
+export class ClipboardDataMock {
+  getData: jest.Mock<string, [string]>;
+  setData: jest.Mock<void, [string, string]>;
+
+  constructor() {
+    this.getData = jest.fn();
+    this.setData = jest.fn();
+  }
+}
+
+export class ClipboardEventMock extends Event {
+  clipboardData: ClipboardDataMock;
+
+  constructor(type: string, options?: EventInit) {
+    super(type, options);
+    this.clipboardData = new ClipboardDataMock();
+  }
+}
+
+global.document.execCommand = function execCommandMock(
+  commandId: string,
+  showUI?: boolean,
+  value?: string,
+): boolean {
+  return true;
+};
+Object.defineProperty(window, 'ClipboardEvent', {
+  value: new ClipboardEventMock('cut'),
+});
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    table: 'test-table-class',
+  },
+});
+
+describe('LexicalTableNode tests', () => {
+  initializeUnitTest(
+    (testEnv) => {
+      beforeEach(async () => {
+        const {editor} = testEnv;
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = $createParagraphNode();
+          root.append(paragraph);
+          paragraph.select();
+        });
+      });
+
+      test('TableNode.constructor', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const tableNode = $createTableNode();
+
+          expect(tableNode).not.toBe(null);
+        });
+
+        expect(() => $createTableNode()).toThrow();
+      });
+
+      test('TableNode.createDOM()', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const tableNode = $createTableNode();
+
+          expect(tableNode.createDOM(editorConfig).outerHTML).toBe(
+            `<table class="${editorConfig.theme.table}"></table>`,
+          );
+        });
+      });
+
+      test('Copy table from an external source', async () => {
+        const {editor} = testEnv;
+
+        const dataTransfer = new DataTransferMock();
+        dataTransfer.setData(
+          'text/html',
+          '<html><body><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-16a69100-7fff-6cb9-b829-cb1def16a58d"><div dir="ltr" style="margin-left:0pt;" align="left"><table style="border:none;border-collapse:collapse;table-layout:fixed;width:468pt"><colgroup><col /><col /></colgroup><tbody><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello there</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">General Kenobi!</span></p></td></tr><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Lexical is nice</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><br /></td></tr></tbody></table></div></b><!--EndFragment--></body></html>',
+        );
+        await editor.update(() => {
+          const selection = $getSelection();
+          invariant(
+            $isRangeSelection(selection),
+            'isRangeSelection(selection)',
+          );
+          $insertDataTransferForRichText(dataTransfer, selection, editor);
+        });
+        // Make sure paragraph is inserted inside empty cells
+        const emptyCell = '<td><p><br></p></td>';
+        expect(testEnv.innerHTML).toBe(
+          `<table><tr><td><p dir="ltr"><span data-lexical-text="true">Hello there</span></p></td><td><p dir="ltr"><span data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p dir="ltr"><span data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
+        );
+      });
+
+      test('Copy table from an external source like gdoc with formatting', async () => {
+        const {editor} = testEnv;
+
+        const dataTransfer = new DataTransferMock();
+        dataTransfer.setData(
+          'text/html',
+          '<google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none" data-sheets-root="1"><colgroup><col width="100"/><col width="189"/><col width="171"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-weight:bold;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Surface&quot;}">Surface</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-style:italic;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;MWP_WORK_LS_COMPOSER&quot;}">MWP_WORK_LS_COMPOSER</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:underline;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:77349}">77349</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Lexical&quot;}">Lexical</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:line-through;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;XDS_RICH_TEXT_AREA&quot;}">XDS_RICH_TEXT_AREA</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;sdvd sdfvsfs&quot;}" data-sheets-textstyleruns="{&quot;1&quot;:0}{&quot;1&quot;:5,&quot;2&quot;:{&quot;5&quot;:1}}"><span style="font-size:10pt;font-family:Arial;font-style:normal;">sdvd </span><span style="font-size:10pt;font-family:Arial;font-weight:bold;font-style:normal;">sdfvsfs</span></td></tr></tbody></table>',
+        );
+        await editor.update(() => {
+          const selection = $getSelection();
+          invariant(
+            $isRangeSelection(selection),
+            'isRangeSelection(selection)',
+          );
+          $insertDataTransferForRichText(dataTransfer, selection, editor);
+        });
+        expect(testEnv.innerHTML).toBe(
+          `<table><tr style="height: 21px;"><td><p dir="ltr"><strong data-lexical-text="true">Surface</strong></p></td><td><p dir="ltr"><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td><p style="text-align: right;"><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td><p dir="ltr"><span data-lexical-text="true">Lexical</span></p></td><td><p dir="ltr"><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td><p dir="ltr"><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
+        );
+      });
+
+      test('Cut table in the middle of a range selection', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = root.getFirstChild<ParagraphNode>();
+          const beforeText = $createTextNode('text before the table');
+          const table = $createTableNodeWithDimensions(4, 4, true);
+          const afterText = $createTextNode('text after the table');
+
+          paragraph?.append(beforeText);
+          paragraph?.append(table);
+          paragraph?.append(afterText);
+        });
+        await editor.update(() => {
+          editor.focus();
+          $selectAll();
+        });
+        await editor.update(() => {
+          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
+        });
+
+        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
+      });
+
+      test('Cut table as last node in range selection ', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = root.getFirstChild<ParagraphNode>();
+          const beforeText = $createTextNode('text before the table');
+          const table = $createTableNodeWithDimensions(4, 4, true);
+
+          paragraph?.append(beforeText);
+          paragraph?.append(table);
+        });
+        await editor.update(() => {
+          editor.focus();
+          $selectAll();
+        });
+        await editor.update(() => {
+          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
+        });
+
+        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
+      });
+
+      test('Cut table as first node in range selection ', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const paragraph = root.getFirstChild<ParagraphNode>();
+          const table = $createTableNodeWithDimensions(4, 4, true);
+          const afterText = $createTextNode('text after the table');
+
+          paragraph?.append(table);
+          paragraph?.append(afterText);
+        });
+        await editor.update(() => {
+          editor.focus();
+          $selectAll();
+        });
+        await editor.update(() => {
+          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
+        });
+
+        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
+      });
+
+      test('Cut table is whole selection, should remove it', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = $createTableNodeWithDimensions(4, 4, true);
+          root.append(table);
+        });
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = root.getLastChild<TableNode>();
+          if (table) {
+            const DOMTable = $getElementForTableNode(editor, table);
+            if (DOMTable) {
+              table
+                ?.getCellNodeFromCords(0, 0, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('some text'));
+              const selection = $createTableSelection();
+              selection.set(
+                table.__key,
+                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
+                table?.getCellNodeFromCords(3, 3, DOMTable)?.__key || '',
+              );
+              $setSelection(selection);
+              editor.dispatchCommand(CUT_COMMAND, {
+                preventDefault: () => {},
+                stopPropagation: () => {},
+              } as ClipboardEvent);
+            }
+          }
+        });
+
+        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
+      });
+
+      test('Cut subsection of table cells, should just clear contents', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = $createTableNodeWithDimensions(4, 4, true);
+          root.append(table);
+        });
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = root.getLastChild<TableNode>();
+          if (table) {
+            const DOMTable = $getElementForTableNode(editor, table);
+            if (DOMTable) {
+              table
+                ?.getCellNodeFromCords(0, 0, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('some text'));
+              const selection = $createTableSelection();
+              selection.set(
+                table.__key,
+                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
+                table?.getCellNodeFromCords(2, 2, DOMTable)?.__key || '',
+              );
+              $setSelection(selection);
+              editor.dispatchCommand(CUT_COMMAND, {
+                preventDefault: () => {},
+                stopPropagation: () => {},
+              } as ClipboardEvent);
+            }
+          }
+        });
+
+        expect(testEnv.innerHTML).toBe(
+          `<p><br></p><table><tr><th><p><br></p></th><th><p><br></p></th><th><p><br></p></th><th><p><br></p></th></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></table>`,
+        );
+      });
+
+      test('Table plain text output validation', async () => {
+        const {editor} = testEnv;
+
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = $createTableNodeWithDimensions(4, 4, true);
+          root.append(table);
+        });
+        await editor.update(() => {
+          const root = $getRoot();
+          const table = root.getLastChild<TableNode>();
+          if (table) {
+            const DOMTable = $getElementForTableNode(editor, table);
+            if (DOMTable) {
+              table
+                ?.getCellNodeFromCords(0, 0, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('1'));
+              table
+                ?.getCellNodeFromCords(1, 0, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode(''));
+              table
+                ?.getCellNodeFromCords(2, 0, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('2'));
+              table
+                ?.getCellNodeFromCords(0, 1, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('3'));
+              table
+                ?.getCellNodeFromCords(1, 1, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode('4'));
+              table
+                ?.getCellNodeFromCords(2, 1, DOMTable)
+                ?.getLastChild<ParagraphNode>()
+                ?.append($createTextNode(''));
+              const selection = $createTableSelection();
+              selection.set(
+                table.__key,
+                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
+                table?.getCellNodeFromCords(2, 1, DOMTable)?.__key || '',
+              );
+              expect(selection.getTextContent()).toBe(`1\t\t2\n3\t4\t\n`);
+            }
+          }
+        });
+      });
+    },
+    undefined,
+    <TablePlugin />,
+  );
+});
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
new file mode 100644
index 00000000000..cf110634b5b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createTableRowNode} from '@lexical/table';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+const editorConfig = Object.freeze({
+  namespace: '',
+  theme: {
+    tableRow: 'test-table-row-class',
+  },
+});
+
+describe('LexicalTableRowNode tests', () => {
+  initializeUnitTest((testEnv) => {
+    test('TableRowNode.constructor', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const rowNode = $createTableRowNode();
+
+        expect(rowNode).not.toBe(null);
+      });
+
+      expect(() => $createTableRowNode()).toThrow();
+    });
+
+    test('TableRowNode.createDOM()', async () => {
+      const {editor} = testEnv;
+
+      await editor.update(() => {
+        const rowNode = $createTableRowNode();
+        expect(rowNode.createDOM(editorConfig).outerHTML).toBe(
+          `<tr class="${editorConfig.theme.tableRow}"></tr>`,
+        );
+
+        const rowHeight = 36;
+        const rowWithCustomHeightNode = $createTableRowNode(36);
+        expect(rowWithCustomHeightNode.createDOM(editorConfig).outerHTML).toBe(
+          `<tr style="height: ${rowHeight}px;" class="${editorConfig.theme.tableRow}"></tr>`,
+        );
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
new file mode 100644
index 00000000000..5eb631c31f7
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
@@ -0,0 +1,176 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {$createTableSelection} from '@lexical/table';
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $setSelection,
+  EditorState,
+  type LexicalEditor,
+  ParagraphNode,
+  RootNode,
+  TextNode,
+} from 'lexical';
+import {createTestEditor} from 'lexical/src/__tests__/utils';
+import {createRef, useEffect, useMemo} from 'react';
+import {createRoot, Root} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+describe('table selection', () => {
+  let originalText: TextNode;
+  let parsedParagraph: ParagraphNode;
+  let parsedRoot: RootNode;
+  let parsedText: TextNode;
+  let paragraphKey: string;
+  let textKey: string;
+  let parsedEditorState: EditorState;
+  let reactRoot: Root;
+  let container: HTMLDivElement | null = null;
+  let editor: LexicalEditor | null = null;
+
+  beforeEach(() => {
+    container = document.createElement('div');
+    reactRoot = createRoot(container);
+    document.body.appendChild(container);
+  });
+
+  function useLexicalEditor(
+    rootElementRef: React.RefObject<HTMLDivElement>,
+    onError?: () => void,
+  ) {
+    const editorInHook = useMemo(
+      () =>
+        createTestEditor({
+          nodes: [],
+          onError: onError || jest.fn(),
+          theme: {
+            text: {
+              bold: 'editor-text-bold',
+              italic: 'editor-text-italic',
+              underline: 'editor-text-underline',
+            },
+          },
+        }),
+      [onError],
+    );
+
+    useEffect(() => {
+      const rootElement = rootElementRef.current;
+
+      editorInHook.setRootElement(rootElement);
+    }, [rootElementRef, editorInHook]);
+
+    return editorInHook;
+  }
+
+  function init(onError?: () => void) {
+    const ref = createRef<HTMLDivElement>();
+
+    function TestBase() {
+      editor = useLexicalEditor(ref, onError);
+
+      return <div ref={ref} contentEditable={true} />;
+    }
+
+    ReactTestUtils.act(() => {
+      reactRoot.render(<TestBase />);
+    });
+  }
+
+  async function update(fn: () => void) {
+    editor!.update(fn);
+
+    return Promise.resolve().then();
+  }
+
+  beforeEach(async () => {
+    init();
+
+    await update(() => {
+      const paragraph = $createParagraphNode();
+      originalText = $createTextNode('Hello world');
+      const selection = $createTableSelection();
+      selection.set(
+        originalText.getKey(),
+        originalText.getKey(),
+        originalText.getKey(),
+      );
+      $setSelection(selection);
+      paragraph.append(originalText);
+      $getRoot().append(paragraph);
+    });
+
+    const stringifiedEditorState = JSON.stringify(
+      editor!.getEditorState().toJSON(),
+    );
+
+    parsedEditorState = editor!.parseEditorState(stringifiedEditorState);
+    parsedEditorState.read(() => {
+      parsedRoot = $getRoot();
+      parsedParagraph = parsedRoot.getFirstChild()!;
+      paragraphKey = parsedParagraph.getKey();
+      parsedText = parsedParagraph.getFirstChild()!;
+      textKey = parsedText.getKey();
+    });
+  });
+
+  it('Parses the nodes of a stringified editor state', async () => {
+    expect(parsedRoot).toEqual({
+      __cachedText: null,
+      __dir: 'ltr',
+      __first: paragraphKey,
+      __format: 0,
+      __indent: 0,
+      __key: 'root',
+      __last: paragraphKey,
+      __next: null,
+      __parent: null,
+      __prev: null,
+      __size: 1,
+      __style: '',
+      __type: 'root',
+    });
+    expect(parsedParagraph).toEqual({
+      __dir: 'ltr',
+      __first: textKey,
+      __format: 0,
+      __indent: 0,
+      __key: paragraphKey,
+      __last: textKey,
+      __next: null,
+      __parent: 'root',
+      __prev: null,
+      __size: 1,
+      __style: '',
+      __textFormat: 0,
+      __textStyle: '',
+      __type: 'paragraph',
+    });
+    expect(parsedText).toEqual({
+      __detail: 0,
+      __format: 0,
+      __key: textKey,
+      __mode: 0,
+      __next: null,
+      __parent: paragraphKey,
+      __prev: null,
+      __style: '',
+      __text: 'Hello world',
+      __type: 'text',
+    });
+  });
+
+  it('Parses the text content of the editor state', async () => {
+    expect(parsedEditorState.read(() => $getRoot().__cachedText)).toBe(null);
+    expect(parsedEditorState.read(() => $getRoot().getTextContent())).toBe(
+      'Hello world',
+    );
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/table/constants.ts b/resources/js/wysiwyg/lexical/table/constants.ts
new file mode 100644
index 00000000000..ffa6ba1c35b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/constants.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export const PIXEL_VALUE_REG_EXP = /^(\d+(?:\.\d+)?)px$/;
+
+// .PlaygroundEditorTheme__tableCell width value from
+// packages/lexical-playground/src/themes/PlaygroundEditorTheme.css
+export const COLUMN_WIDTH = 75;
diff --git a/resources/js/wysiwyg/lexical/table/index.ts b/resources/js/wysiwyg/lexical/table/index.ts
new file mode 100644
index 00000000000..2429eb608a9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/index.ts
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export type {SerializedTableCellNode} from './LexicalTableCellNode';
+export {
+  $createTableCellNode,
+  $isTableCellNode,
+  TableCellHeaderStates,
+  TableCellNode,
+} from './LexicalTableCellNode';
+export type {
+  InsertTableCommandPayload,
+  InsertTableCommandPayloadHeaders,
+} from './LexicalTableCommands';
+export {INSERT_TABLE_COMMAND} from './LexicalTableCommands';
+export type {SerializedTableNode} from './LexicalTableNode';
+export {
+  $createTableNode,
+  $getElementForTableNode,
+  $isTableNode,
+  TableNode,
+} from './LexicalTableNode';
+export type {TableDOMCell} from './LexicalTableObserver';
+export {TableObserver} from './LexicalTableObserver';
+export type {SerializedTableRowNode} from './LexicalTableRowNode';
+export {
+  $createTableRowNode,
+  $isTableRowNode,
+  TableRowNode,
+} from './LexicalTableRowNode';
+export type {
+  TableMapType,
+  TableMapValueType,
+  TableSelection,
+  TableSelectionShape,
+} from './LexicalTableSelection';
+export {
+  $createTableSelection,
+  $isTableSelection,
+} from './LexicalTableSelection';
+export type {HTMLTableElementWithWithTableSelectionState} from './LexicalTableSelectionHelpers';
+export {
+  $findCellNode,
+  $findTableNode,
+  applyTableHandlers,
+  getDOMCellFromTarget,
+  getTableObserverFromTableElement,
+} from './LexicalTableSelectionHelpers';
+export {
+  $computeTableMap,
+  $computeTableMapSkipCellCheck,
+  $createTableNodeWithDimensions,
+  $deleteTableColumn,
+  $deleteTableColumn__EXPERIMENTAL,
+  $deleteTableRow__EXPERIMENTAL,
+  $getNodeTriplet,
+  $getTableCellNodeFromLexicalNode,
+  $getTableCellNodeRect,
+  $getTableColumnIndexFromTableCellNode,
+  $getTableNodeFromLexicalNodeOrThrow,
+  $getTableRowIndexFromTableCellNode,
+  $getTableRowNodeFromTableCellNodeOrThrow,
+  $insertTableColumn,
+  $insertTableColumn__EXPERIMENTAL,
+  $insertTableRow,
+  $insertTableRow__EXPERIMENTAL,
+  $removeTableRowAtIndex,
+  $unmergeCell,
+} from './LexicalTableUtils';
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalElementHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalElementHelpers.test.ts
new file mode 100644
index 00000000000..0bca8a9ea64
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalElementHelpers.test.ts
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  addClassNamesToElement,
+  removeClassNamesFromElement,
+} from '@lexical/utils';
+
+describe('LexicalElementHelpers tests', () => {
+  describe('addClassNamesToElement() and removeClassNamesFromElement()', () => {
+    test('basic', async () => {
+      const element = document.createElement('div');
+      addClassNamesToElement(element, 'test-class');
+
+      expect(element.className).toEqual('test-class');
+
+      removeClassNamesFromElement(element, 'test-class');
+
+      expect(element.className).toEqual('');
+    });
+
+    test('empty', async () => {
+      const element = document.createElement('div');
+      addClassNamesToElement(
+        element,
+        null,
+        undefined,
+        false,
+        true,
+        '',
+        ' ',
+        '  \t\n',
+      );
+
+      expect(element.className).toEqual('');
+    });
+
+    test('multiple', async () => {
+      const element = document.createElement('div');
+      addClassNamesToElement(element, 'a', 'b', 'c');
+
+      expect(element.className).toEqual('a b c');
+
+      removeClassNamesFromElement(element, 'a', 'b', 'c');
+
+      expect(element.className).toEqual('');
+    });
+
+    test('space separated', async () => {
+      const element = document.createElement('div');
+      addClassNamesToElement(element, 'a b c');
+
+      expect(element.className).toEqual('a b c');
+
+      removeClassNamesFromElement(element, 'a b c');
+
+      expect(element.className).toEqual('');
+    });
+  });
+
+  test('multiple spaces', async () => {
+    const classNames = ' a  b   c \t\n  ';
+    const element = document.createElement('div');
+    addClassNamesToElement(element, classNames);
+
+    expect(element.className).toEqual('a b c');
+
+    removeClassNamesFromElement(element, classNames);
+
+    expect(element.className).toEqual('');
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
new file mode 100644
index 00000000000..2b49e3bd7b8
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
@@ -0,0 +1,747 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {CodeHighlightNode, CodeNode} from '@lexical/code';
+import {HashtagNode} from '@lexical/hashtag';
+import {AutoLinkNode, LinkNode} from '@lexical/link';
+import {ListItemNode, ListNode} from '@lexical/list';
+import {OverflowNode} from '@lexical/overflow';
+import {AutoFocusPlugin} from '@lexical/react/LexicalAutoFocusPlugin';
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {ContentEditable} from '@lexical/react/LexicalContentEditable';
+import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
+import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
+import {HeadingNode, QuoteNode} from '@lexical/rich-text';
+import {
+  applySelectionInputs,
+  pasteHTML,
+} from '@lexical/selection/src/__tests__/utils';
+import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
+import {LexicalEditor} from 'lexical';
+import {initializeClipboard, TestComposer} from 'lexical/src/__tests__/utils';
+import {createRoot} from 'react-dom/client';
+import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+
+jest.mock('lexical/shared/environment', () => {
+  const originalModule = jest.requireActual('lexical/shared/environment');
+  return {...originalModule, IS_FIREFOX: true};
+});
+
+Range.prototype.getBoundingClientRect = function (): DOMRect {
+  const rect = {
+    bottom: 0,
+    height: 0,
+    left: 0,
+    right: 0,
+    top: 0,
+    width: 0,
+    x: 0,
+    y: 0,
+  };
+  return {
+    ...rect,
+    toJSON() {
+      return rect;
+    },
+  };
+};
+
+initializeClipboard();
+
+Range.prototype.getBoundingClientRect = function (): DOMRect {
+  const rect = {
+    bottom: 0,
+    height: 0,
+    left: 0,
+    right: 0,
+    top: 0,
+    width: 0,
+    x: 0,
+    y: 0,
+  };
+  return {
+    ...rect,
+    toJSON() {
+      return rect;
+    },
+  };
+};
+
+describe('LexicalEventHelpers', () => {
+  let container: HTMLDivElement | null = null;
+
+  beforeEach(async () => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+    await init();
+  });
+
+  afterEach(() => {
+    document.body.removeChild(container!);
+    container = null;
+  });
+
+  let editor: LexicalEditor | null = null;
+
+  async function init() {
+    function TestBase() {
+      function TestPlugin(): null {
+        [editor] = useLexicalComposerContext();
+
+        return null;
+      }
+
+      return (
+        <TestComposer
+          config={{
+            nodes: [
+              LinkNode,
+              HeadingNode,
+              ListNode,
+              ListItemNode,
+              QuoteNode,
+              CodeNode,
+              TableNode,
+              TableCellNode,
+              TableRowNode,
+              HashtagNode,
+              CodeHighlightNode,
+              AutoLinkNode,
+              OverflowNode,
+            ],
+            theme: {
+              code: 'editor-code',
+              heading: {
+                h1: 'editor-heading-h1',
+                h2: 'editor-heading-h2',
+                h3: 'editor-heading-h3',
+                h4: 'editor-heading-h4',
+                h5: 'editor-heading-h5',
+                h6: 'editor-heading-h6',
+              },
+              image: 'editor-image',
+              list: {
+                listitem: 'editor-listitem',
+                olDepth: ['editor-list-ol'],
+                ulDepth: ['editor-list-ul'],
+              },
+              paragraph: 'editor-paragraph',
+              placeholder: 'editor-placeholder',
+              quote: 'editor-quote',
+              text: {
+                bold: 'editor-text-bold',
+                code: 'editor-text-code',
+                hashtag: 'editor-text-hashtag',
+                italic: 'editor-text-italic',
+                link: 'editor-text-link',
+                strikethrough: 'editor-text-strikethrough',
+                underline: 'editor-text-underline',
+                underlineStrikethrough: 'editor-text-underlineStrikethrough',
+              },
+            },
+          }}>
+          <RichTextPlugin
+            contentEditable={
+              // eslint-disable-next-line jsx-a11y/aria-role, @typescript-eslint/no-explicit-any
+              <ContentEditable role={null as any} spellCheck={null as any} />
+            }
+            placeholder={null}
+            ErrorBoundary={LexicalErrorBoundary}
+          />
+          <AutoFocusPlugin />
+          <TestPlugin />
+        </TestComposer>
+      );
+    }
+
+    ReactTestUtils.act(() => {
+      createRoot(container!).render(<TestBase />);
+    });
+  }
+
+  async function update(fn: () => void) {
+    await ReactTestUtils.act(async () => {
+      await editor!.update(fn);
+    });
+
+    return Promise.resolve().then();
+  }
+
+  test('Expect initial output to be a block with no text', () => {
+    expect(container!.innerHTML).toBe(
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><br></p></div>',
+    );
+  });
+
+  describe('onPasteForRichText', () => {
+    describe('baseline', () => {
+      const suite = [
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1" dir="ltr"><span data-lexical-text="true">Hello</span></h1></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><h1>Hello</h1>`)],
+          name: 'should produce the correct editor state from a pasted HTML h1 element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 class="editor-heading-h2" dir="ltr"><span data-lexical-text="true">From</span></h2></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><h2>From</h2>`)],
+          name: 'should produce the correct editor state from a pasted HTML h2 element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h3 class="editor-heading-h3" dir="ltr"><span data-lexical-text="true">The</span></h3></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><h3>The</h3>`)],
+          name: 'should produce the correct editor state from a pasted HTML h3 element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Other side</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">I must have called</span></li></ul></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><ul><li>Other side</li><li>I must have called</li></ul>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from a pasted HTML ul element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ol class="editor-list-ol"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">To tell you</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">I’m sorry</span></li></ol></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><ol><li>To tell you</li><li>I’m sorry</li></ol>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from pasted HTML ol element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A thousand times</span></p></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'>A thousand times`)],
+          name: 'should produce the correct editor state from pasted DOM Text Node',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Bold</strong></p></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><b>Bold</b>`)],
+          name: 'should produce the correct editor state from a pasted HTML b element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><i>Italic</i>`)],
+          name: 'should produce the correct editor state from a pasted HTML i element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><em>Italic</em>`)],
+          name: 'should produce the correct editor state from a pasted HTML em element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span class="editor-text-underline" data-lexical-text="true">Underline</span></p></div>',
+          inputs: [pasteHTML(`<meta charset='utf-8'><u>Underline</u>`)],
+          name: 'should produce the correct editor state from a pasted HTML u element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1" dir="ltr"><span data-lexical-text="true">Lyrics to Hello by Adele</span></h1><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A thousand times</span></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><h1>Lyrics to Hello by Adele</h1>A thousand times`,
+            ),
+          ],
+          name: 'should produce the correct editor state from pasted heading node followed by a DOM Text Node',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook</span></a></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><a href="https://facebook.com">Facebook</a>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from a pasted HTML anchor element',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook!</span></a></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'>Welcome to<a href="https://facebook.com">Facebook!</a>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from a pasted combination of an HTML text node followed by an anchor node',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook!</span></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'>Welcome to<a href="https://facebook.com">Facebook!</a>We hope you like it here.`,
+            ),
+          ],
+          name: 'should produce the correct editor state from a pasted combination of HTML anchor elements and text nodes',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem" dir="ltr"><span data-lexical-text="true">side</span></li></ul></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist>`,
+            ),
+          ],
+          name: 'should ignore DOM node types that do not have transformers, but still process their children.',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem" dir="ltr"><span data-lexical-text="true">side</span></li></ul></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'><doesnotexist><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist></doesnotexist>`,
+            ),
+          ],
+          name: 'should ignore multiple levels of DOM node types that do not have transformers, but still process their children.',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'>Welcome to<b><a href="https://facebook.com">Facebook!</a></b>We hope you like it here.`,
+            ),
+          ],
+          name: 'should preserve formatting from HTML tags on deeply nested text nodes.',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold" data-lexical-text="true">We hope you like it here.</strong></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'>Welcome to<b><a href="https://facebook.com">Facebook!</a>We hope you like it here.</b>`,
+            ),
+          ],
+          name: 'should preserve formatting from HTML tags on deeply nested and top level text nodes.',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">We hope you like it here.</strong></p></div>',
+          inputs: [
+            pasteHTML(
+              `<meta charset='utf-8'>Welcome to<b><i><a href="https://facebook.com">Facebook!</a>We hope you like it here.</i></b>`,
+            ),
+          ],
+          name: 'should preserve multiple types of formatting on deeply nested text nodes and top level text nodes',
+        },
+      ];
+
+      suite.forEach((testUnit, i) => {
+        const name = testUnit.name || 'Test case';
+
+        test(name + ` (#${i + 1})`, async () => {
+          await applySelectionInputs(testUnit.inputs, update, editor!);
+
+          // Validate HTML matches
+          expect(container!.innerHTML).toBe(testUnit.expectedHTML);
+        });
+      });
+    });
+
+    describe('Google Docs', () => {
+      const suite = [
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Get schwifty!</span></p></div>',
+          inputs: [
+            pasteHTML(
+              `<b style="font-weight:normal;" id="docs-internal-guid-2c706577-7fff-f54a-fe65-12f480020fac"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from Normal text',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Get schwifty!</strong></p></div>',
+          inputs: [
+            pasteHTML(
+              `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:700;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from bold text',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Get schwifty!</em></p></div>',
+          inputs: [
+            pasteHTML(
+              `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:italic;font-variant:normal;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from italic text',
+        },
+        {
+          expectedHTML:
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span class="editor-text-strikethrough" data-lexical-text="true">Get schwifty!</span></p></div>',
+          inputs: [
+            pasteHTML(
+              `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
+            ),
+          ],
+          name: 'should produce the correct editor state from strikethrough text',
+        },
+      ];
+
+      suite.forEach((testUnit, i) => {
+        const name = testUnit.name || 'Test case';
+
+        test(name + ` (#${i + 1})`, async () => {
+          await applySelectionInputs(testUnit.inputs, update, editor!);
+
+          // Validate HTML matches
+          expect(container!.innerHTML).toBe(testUnit.expectedHTML);
+        });
+      });
+    });
+
+    describe('W3 spacing', () => {
+      const suite = [
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+          inputs: [pasteHTML('<span>hello world</span>')],
+          name: 'inline hello world',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+          inputs: [pasteHTML('<span>    hello  </span>world  ')],
+          name: 'inline hello world (2)',
+        },
+        {
+          // MS Office got it right
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true"> hello world</span></p>',
+          inputs: [
+            pasteHTML(' <span style="white-space: pre"> hello </span> world  '),
+          ],
+          name: 'pre + inline (inline collapses with pre)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">  a b</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">c  </span></p>',
+          inputs: [pasteHTML('<p style="white-space: pre">  a b\tc  </p>')],
+          name: 'white-space: pre (1) (no touchy)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a b c</span></p>',
+          inputs: [pasteHTML('<p>\ta\tb  <span>c\t</span>\t</p>')],
+          name: 'tabs are collapsed',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+          inputs: [
+            pasteHTML(`
+              <div>
+                hello
+                world
+              </div>
+            `),
+          ],
+          name: 'remove beginning + end spaces on the block',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">hello world</strong></p>',
+          inputs: [
+            pasteHTML(`
+              <div>
+                <strong>
+                  hello
+                  world
+                </strong>
+              </div>
+          `),
+          ],
+          name: 'remove beginning + end spaces on the block (2)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a </span><strong class="editor-text-bold" data-lexical-text="true">b</strong><span data-lexical-text="true"> c</span></p>',
+          inputs: [
+            pasteHTML(`
+              <div>
+                a
+                <strong>b</strong>
+                c
+              </div>
+          `),
+          ],
+          name: 'remove beginning + end spaces on the block + anonymous inlines collapsible rules',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
+          inputs: [pasteHTML('<div><strong>a </strong>b</div>')],
+          name: 'collapsibles and neighbors (1)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
+          inputs: [pasteHTML('<div>a<strong> b</strong></div>')],
+          name: 'collapsibles and neighbors (2)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
+          inputs: [pasteHTML('<div><strong>a </strong><span></span>b</div>')],
+          name: 'collapsibles and neighbors (3)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
+          inputs: [pasteHTML('<div>a<span></span><strong> b</strong></div>')],
+          name: 'collapsibles and neighbors (4)',
+        },
+        {
+          expectedHTML: '<p class="editor-paragraph"><br></p>',
+          inputs: [
+            pasteHTML(`
+              <p>
+              </p>
+          `),
+          ],
+          name: 'empty block',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p>',
+          inputs: [pasteHTML('<span> </span><span>a</span>')],
+          name: 'redundant inline at start',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p>',
+          inputs: [pasteHTML('<span>a</span><span> </span>')],
+          name: 'redundant inline at end',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b</span></p>',
+          inputs: [
+            pasteHTML(`
+            <div>
+              <p>
+                a
+              </p>
+              <p>
+                b
+              </p>
+            </div>
+            `),
+          ],
+          name: 'collapsible spaces with nested structures',
+        },
+        // TODO no proper support for divs #4465
+        // {
+        //   expectedHTML:
+        //     '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b</span></p>',
+        //   inputs: [
+        //     pasteHTML(`
+        //     <div>
+        //     <div>
+        //     a
+        //     </div>
+        //     <div>
+        //     b
+        //     </div>
+        //     </div>
+        //     `),
+        //   ],
+        //   name: 'collapsible spaces with nested structures (2)',
+        // },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a b</strong></p>',
+          inputs: [
+            pasteHTML(`
+            <div>
+              <strong>
+                a
+              </strong>
+              <strong>
+                b
+              </strong>
+            </div>
+            `),
+          ],
+          name: 'collapsible spaces with nested structures (3)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
+          inputs: [
+            pasteHTML(`
+            <p>
+            a
+            <br>
+            b
+            </p>
+            `),
+          ],
+          name: 'forced line break should remain',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
+          inputs: [
+            pasteHTML(`
+            <p>
+            a
+            \t<br>\t
+            b
+            </p>
+            `),
+          ],
+          name: 'forced line break with tabs',
+        },
+        // The 3 below are not correct, they're missing the first \n -> <br> but that's a fault with
+        // the implementation of DOMParser, it works correctly in Safari
+        {
+          expectedHTML:
+            '<code class="editor-code" spellcheck="false" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></code>',
+          inputs: [pasteHTML(`<pre>\na\r\nb\r\n</pre>`)],
+          name: 'pre (no touchy) (1)',
+        },
+        {
+          expectedHTML:
+            '<code class="editor-code" spellcheck="false" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></code>',
+          inputs: [
+            pasteHTML(`
+              <pre>\na\r\nb\r\n</pre>
+          `),
+          ],
+          name: 'pre (no touchy) (2)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><br><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></p>',
+          inputs: [
+            pasteHTML(`<span style="white-space: pre">\na\r\nb\r\n</span>`),
+          ],
+          name: 'white-space: pre (no touchy) (2)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph2</span></p>',
+          inputs: [
+            pasteHTML(
+              '\n<p class="p1">paragraph1</p>\n<p class="p1">paragraph2</p>\n',
+            ),
+          ],
+          name: 'two Apple Notes paragraphs',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 2</span></p>',
+          inputs: [
+            pasteHTML(
+              '\n<p class="p1">line 1<br>\nline 2</p>\n<p class="p2"><br></p>\n<p class="p1">paragraph 1</p>\n<p class="p1">paragraph 2</p>\n',
+            ),
+          ],
+          name: 'two Apple Notes lines + two paragraphs separated by an empty paragraph',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 2</span></p>',
+          inputs: [
+            pasteHTML(
+              '\n<p class="p1">line 1<br>\nline 2</p>\n<p class="p2">\n<br>\n</p>\n<p class="p1">paragraph 1</p>\n<p class="p1">paragraph 2</p>\n',
+            ),
+          ],
+          name: 'two lines + two paragraphs separated by an empty paragraph (2)',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p>',
+          inputs: [
+            pasteHTML(
+              '<p class="p1"><span>line 1</span><span><br></span><span>line 2</span></p>',
+            ),
+          ],
+          name: 'two lines and br in spans',
+        },
+        {
+          expectedHTML:
+            '<ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></li><li value="2" class="editor-listitem"><br></li><li value="3" class="editor-listitem"><span data-lexical-text="true">3</span></li></ol>',
+          inputs: [
+            pasteHTML('<ol><li>1<div></div>2</li><li></li><li>3</li></ol>'),
+          ],
+          name: 'empty block node in li behaves like a line break',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></p>',
+          inputs: [pasteHTML('<div>1<div></div>2</div>')],
+          name: 'empty block node in div behaves like a line break',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph"><span data-lexical-text="true">12</span></p>',
+          inputs: [pasteHTML('<div>1<text></text>2</div>')],
+          name: 'empty inline node does not behave like a line break',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph"><span data-lexical-text="true">1</span></p><p class="editor-paragraph"><span data-lexical-text="true">2</span></p>',
+          inputs: [pasteHTML('<div><div>1</div><div></div><div>2</div></div>')],
+          name: 'empty block node between non inline siblings does not behave like a line break',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b b</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">c</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">z</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">d e</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">fg</span></p>',
+          inputs: [
+            pasteHTML(
+              `<div>a<div>b b<div>c<div><div></div>z</div></div>d e</div>fg</div>`,
+            ),
+          ],
+          name: 'nested divs',
+        },
+        {
+          expectedHTML:
+            '<ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">1</span></li><li value="2" class="editor-listitem"><br></li><li value="3" class="editor-listitem"><span data-lexical-text="true">3</span></li></ol>',
+          inputs: [pasteHTML('<ol><li>1</li><li><br /></li><li>3</li></ol>')],
+          name: 'only br in a li',
+        },
+        {
+          expectedHTML:
+            '<p class="editor-paragraph"><span data-lexical-text="true">1</span></p><p class="editor-paragraph"><span data-lexical-text="true">2</span></p><p class="editor-paragraph"><span data-lexical-text="true">3</span></p>',
+          inputs: [pasteHTML('1<p>2<br /></p>3')],
+          name: 'last br in a block node is ignored',
+        },
+      ];
+
+      suite.forEach((testUnit, i) => {
+        const name = testUnit.name || 'Test case';
+
+        // eslint-disable-next-line no-only-tests/no-only-tests, dot-notation
+        const test_ = 'only' in testUnit && testUnit['only'] ? test.only : test;
+        test_(name + ` (#${i + 1})`, async () => {
+          await applySelectionInputs(testUnit.inputs, update, editor!);
+
+          // Validate HTML matches
+          expect((container!.firstChild as HTMLElement).innerHTML).toBe(
+            testUnit.expectedHTML,
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
new file mode 100644
index 00000000000..82d2dddf88d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
@@ -0,0 +1,236 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $createParagraphNode,
+  $createTextNode,
+  $getNodeByKey,
+  $getRoot,
+  $isElementNode,
+  LexicalEditor,
+  NodeKey,
+} from 'lexical';
+import {
+  $createTestElementNode,
+  initializeUnitTest,
+  invariant,
+} from 'lexical/src/__tests__/utils';
+
+import {$dfs} from '../..';
+
+describe('LexicalNodeHelpers tests', () => {
+  initializeUnitTest((testEnv) => {
+    /**
+     *               R
+     *        P1            P2
+     *     B1     B2     T4 T5 B3
+     *     T1   T2 T3          T6
+     *
+     *  DFS: R, P1, B1, T1, B2, T2, T3, P2, T4, T5, B3, T6
+     */
+    test('DFS node order', async () => {
+      const editor: LexicalEditor = testEnv.editor;
+
+      let expectedKeys: Array<{
+        depth: number;
+        node: NodeKey;
+      }> = [];
+
+      await editor.update(() => {
+        const root = $getRoot();
+
+        const paragraph1 = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+
+        const block1 = $createTestElementNode();
+        const block2 = $createTestElementNode();
+        const block3 = $createTestElementNode();
+
+        const text1 = $createTextNode('text1');
+        const text2 = $createTextNode('text2');
+        const text3 = $createTextNode('text3');
+        const text4 = $createTextNode('text4');
+        const text5 = $createTextNode('text5');
+        const text6 = $createTextNode('text6');
+
+        root.append(paragraph1, paragraph2);
+        paragraph1.append(block1, block2);
+        paragraph2.append(text4, text5);
+
+        text5.toggleFormat('bold'); // Prevent from merging with text 4
+
+        paragraph2.append(block3);
+        block1.append(text1);
+        block2.append(text2, text3);
+
+        text3.toggleFormat('bold'); // Prevent from merging with text2
+
+        block3.append(text6);
+
+        expectedKeys = [
+          {
+            depth: 0,
+            node: root.getKey(),
+          },
+          {
+            depth: 1,
+            node: paragraph1.getKey(),
+          },
+          {
+            depth: 2,
+            node: block1.getKey(),
+          },
+          {
+            depth: 3,
+            node: text1.getKey(),
+          },
+          {
+            depth: 2,
+            node: block2.getKey(),
+          },
+          {
+            depth: 3,
+            node: text2.getKey(),
+          },
+          {
+            depth: 3,
+            node: text3.getKey(),
+          },
+          {
+            depth: 1,
+            node: paragraph2.getKey(),
+          },
+          {
+            depth: 2,
+            node: text4.getKey(),
+          },
+          {
+            depth: 2,
+            node: text5.getKey(),
+          },
+          {
+            depth: 2,
+            node: block3.getKey(),
+          },
+          {
+            depth: 3,
+            node: text6.getKey(),
+          },
+        ];
+      });
+
+      editor.getEditorState().read(() => {
+        const expectedNodes = expectedKeys.map(({depth, node: nodeKey}) => ({
+          depth,
+          node: $getNodeByKey(nodeKey)!.getLatest(),
+        }));
+
+        const first = expectedNodes[0];
+        const second = expectedNodes[1];
+        const last = expectedNodes[expectedNodes.length - 1];
+        const secondToLast = expectedNodes[expectedNodes.length - 2];
+
+        expect($dfs(first.node, last.node)).toEqual(expectedNodes);
+        expect($dfs(second.node, secondToLast.node)).toEqual(
+          expectedNodes.slice(1, expectedNodes.length - 1),
+        );
+        expect($dfs()).toEqual(expectedNodes);
+        expect($dfs($getRoot())).toEqual(expectedNodes);
+      });
+    });
+
+    test('DFS triggers getLatest()', async () => {
+      const editor: LexicalEditor = testEnv.editor;
+
+      let rootKey: string;
+      let paragraphKey: string;
+      let block1Key: string;
+      let block2Key: string;
+
+      await editor.update(() => {
+        const root = $getRoot();
+
+        const paragraph = $createParagraphNode();
+        const block1 = $createTestElementNode();
+        const block2 = $createTestElementNode();
+
+        rootKey = root.getKey();
+        paragraphKey = paragraph.getKey();
+        block1Key = block1.getKey();
+        block2Key = block2.getKey();
+
+        root.append(paragraph);
+        paragraph.append(block1, block2);
+      });
+
+      await editor.update(() => {
+        const root = $getNodeByKey(rootKey);
+        const paragraph = $getNodeByKey(paragraphKey);
+        const block1 = $getNodeByKey(block1Key);
+        const block2 = $getNodeByKey(block2Key);
+
+        const block3 = $createTestElementNode();
+        invariant($isElementNode(block1));
+
+        block1.append(block3);
+
+        expect($dfs(root!)).toEqual([
+          {
+            depth: 0,
+            node: root!.getLatest(),
+          },
+          {
+            depth: 1,
+            node: paragraph!.getLatest(),
+          },
+          {
+            depth: 2,
+            node: block1.getLatest(),
+          },
+          {
+            depth: 3,
+            node: block3.getLatest(),
+          },
+          {
+            depth: 2,
+            node: block2!.getLatest(),
+          },
+        ]);
+      });
+    });
+
+    test('DFS of empty ParagraphNode returns only itself', async () => {
+      const editor: LexicalEditor = testEnv.editor;
+
+      let paragraphKey: string;
+
+      await editor.update(() => {
+        const root = $getRoot();
+
+        const paragraph = $createParagraphNode();
+        const paragraph2 = $createParagraphNode();
+        const text = $createTextNode('test');
+
+        paragraphKey = paragraph.getKey();
+
+        paragraph2.append(text);
+        root.append(paragraph, paragraph2);
+      });
+      await editor.update(() => {
+        const paragraph = $getNodeByKey(paragraphKey)!;
+
+        expect($dfs(paragraph ?? undefined)).toEqual([
+          {
+            depth: 1,
+            node: paragraph?.getLatest(),
+          },
+        ]);
+      });
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
new file mode 100644
index 00000000000..070107583b5
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $isRootTextContentEmpty,
+  $isRootTextContentEmptyCurry,
+  $rootTextContent,
+} from '@lexical/text';
+import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+describe('LexicalRootHelpers tests', () => {
+  initializeUnitTest((testEnv) => {
+    it('textContent', async () => {
+      const editor = testEnv.editor;
+
+      expect(editor.getEditorState().read($rootTextContent)).toBe('');
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('foo');
+        root.append(paragraph);
+        paragraph.append(text);
+
+        expect($rootTextContent()).toBe('foo');
+      });
+
+      expect(editor.getEditorState().read($rootTextContent)).toBe('foo');
+    });
+
+    it('isBlank', async () => {
+      const editor = testEnv.editor;
+
+      expect(
+        editor
+          .getEditorState()
+          .read($isRootTextContentEmptyCurry(editor.isComposing())),
+      ).toBe(true);
+
+      await editor.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const text = $createTextNode('foo');
+        root.append(paragraph);
+        paragraph.append(text);
+
+        expect($isRootTextContentEmpty(editor.isComposing())).toBe(false);
+      });
+
+      expect(
+        editor
+          .getEditorState()
+          .read($isRootTextContentEmptyCurry(editor.isComposing())),
+      ).toBe(false);
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
new file mode 100644
index 00000000000..b4b18ef017f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {objectKlassEquals} from '@lexical/utils';
+import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+
+class MyEvent extends Event {}
+
+class MyEvent2 extends Event {}
+
+let MyEventShadow: typeof Event = MyEvent;
+
+{
+  // eslint-disable-next-line no-shadow
+  class MyEvent extends Event {}
+  MyEventShadow = MyEvent;
+}
+
+describe('LexicalUtilsKlassEqual tests', () => {
+  initializeUnitTest((testEnv) => {
+    it('objectKlassEquals', async () => {
+      const eventInstance = new MyEvent('');
+      expect(eventInstance instanceof MyEvent).toBeTruthy();
+      expect(objectKlassEquals(eventInstance, MyEvent)).toBeTruthy();
+      expect(eventInstance instanceof MyEvent2).toBeFalsy();
+      expect(objectKlassEquals(eventInstance, MyEvent2)).toBeFalsy();
+      expect(eventInstance instanceof MyEventShadow).toBeFalsy();
+      expect(objectKlassEquals(eventInstance, MyEventShadow)).toBeTruthy();
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
new file mode 100644
index 00000000000..f3db39390d6
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {ElementNode, LexicalEditor} from 'lexical';
+
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {$getRoot, $isElementNode} from 'lexical';
+import {createTestEditor} from 'lexical/src/__tests__/utils';
+
+import {$splitNode} from '../../index';
+
+describe('LexicalUtils#splitNode', () => {
+  let editor: LexicalEditor;
+
+  const update = async (updateFn: () => void) => {
+    editor.update(updateFn);
+    await Promise.resolve();
+  };
+
+  beforeEach(async () => {
+    editor = createTestEditor();
+    editor._headless = true;
+  });
+
+  const testCases: Array<{
+    _: string;
+    expectedHtml: string;
+    initialHtml: string;
+    splitPath: Array<number>;
+    splitOffset: number;
+    only?: boolean;
+  }> = [
+    {
+      _: 'split paragraph in between two text nodes',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Hello</span></p><p><span style="white-space: pre-wrap;">world</span></p>',
+      initialHtml: '<p><span>Hello</span><span>world</span></p>',
+      splitOffset: 1,
+      splitPath: [0],
+    },
+    {
+      _: 'split paragraph before the first text node',
+      expectedHtml:
+        '<p><br></p><p><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></p>',
+      initialHtml: '<p><span>Hello</span><span>world</span></p>',
+      splitOffset: 0,
+      splitPath: [0],
+    },
+    {
+      _: 'split paragraph after the last text node',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></p><p><br></p>',
+      initialHtml: '<p><span>Hello</span><span>world</span></p>',
+      splitOffset: 2, // Any offset that is higher than children size
+      splitPath: [0],
+    },
+    {
+      _: 'split list items between two text nodes',
+      expectedHtml:
+        '<ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul>' +
+        '<ul><li><span style="white-space: pre-wrap;">world</span></li></ul>',
+      initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
+      splitOffset: 1, // Any offset that is higher than children size
+      splitPath: [0, 0],
+    },
+    {
+      _: 'split list items before the first text node',
+      expectedHtml:
+        '<ul><li></li></ul>' +
+        '<ul><li><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></li></ul>',
+      initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
+      splitOffset: 0, // Any offset that is higher than children size
+      splitPath: [0, 0],
+    },
+    {
+      _: 'split nested list items',
+      expectedHtml:
+        '<ul>' +
+        '<li><span style="white-space: pre-wrap;">Before</span></li>' +
+        '<li><ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul></li>' +
+        '</ul>' +
+        '<ul>' +
+        '<li><ul><li><span style="white-space: pre-wrap;">world</span></li></ul></li>' +
+        '<li><span style="white-space: pre-wrap;">After</span></li>' +
+        '</ul>',
+      initialHtml:
+        '<ul>' +
+        '<li><span>Before</span></li>' +
+        '<ul><li><span>Hello</span><span>world</span></li></ul>' +
+        '<li><span>After</span></li>' +
+        '</ul>',
+      splitOffset: 1, // Any offset that is higher than children size
+      splitPath: [0, 1, 0, 0],
+    },
+  ];
+
+  for (const testCase of testCases) {
+    it(testCase._, async () => {
+      await update(() => {
+        // Running init, update, assert in the same update loop
+        // to skip text nodes normalization (then separate text
+        // nodes will still be separate and represented by its own
+        // spans in html output) and make assertions more precise
+        const parser = new DOMParser();
+        const dom = parser.parseFromString(testCase.initialHtml, 'text/html');
+        const nodesToInsert = $generateNodesFromDOM(editor, dom);
+        $getRoot()
+          .clear()
+          .append(...nodesToInsert);
+
+        let nodeToSplit: ElementNode = $getRoot();
+        for (const index of testCase.splitPath) {
+          nodeToSplit = nodeToSplit.getChildAtIndex(index)!;
+          if (!$isElementNode(nodeToSplit)) {
+            throw new Error('Expected node to be element');
+          }
+        }
+
+        $splitNode(nodeToSplit, testCase.splitOffset);
+
+        // Cleaning up list value attributes as it's not really needed in this test
+        // and it clutters expected output
+        const actualHtml = $generateHtmlFromNodes(editor).replace(
+          /\svalue="\d{1,}"/g,
+          '',
+        );
+        expect(actualHtml).toEqual(testCase.expectedHtml);
+      });
+    });
+  }
+
+  it('throws when splitting root', async () => {
+    await update(() => {
+      expect(() => $splitNode($getRoot(), 0)).toThrow();
+    });
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
new file mode 100644
index 00000000000..0e46573e7f6
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
@@ -0,0 +1,184 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor, LexicalNode} from 'lexical';
+
+import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {
+  $createRangeSelection,
+  $getRoot,
+  $isElementNode,
+  $setSelection,
+} from 'lexical';
+import {
+  $createTestDecoratorNode,
+  createTestEditor,
+} from 'lexical/src/__tests__/utils';
+
+import {$insertNodeToNearestRoot} from '../..';
+
+describe('LexicalUtils#insertNodeToNearestRoot', () => {
+  let editor: LexicalEditor;
+
+  const update = async (updateFn: () => void) => {
+    editor.update(updateFn);
+    await Promise.resolve();
+  };
+
+  beforeEach(async () => {
+    editor = createTestEditor();
+    editor._headless = true;
+  });
+
+  const testCases: Array<{
+    _: string;
+    expectedHtml: string;
+    initialHtml: string;
+    selectionPath: Array<number>;
+    selectionOffset: number;
+    only?: boolean;
+  }> = [
+    {
+      _: 'insert into paragraph in between two text nodes',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Hello</span></p><test-decorator></test-decorator><p><span style="white-space: pre-wrap;">world</span></p>',
+      initialHtml: '<p><span>Helloworld</span></p>',
+      selectionOffset: 5, // Selection on text node after "Hello" world
+      selectionPath: [0, 0],
+    },
+    {
+      _: 'insert into nested list items',
+      expectedHtml:
+        '<ul>' +
+        '<li><span style="white-space: pre-wrap;">Before</span></li>' +
+        '<li><ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul></li>' +
+        '</ul>' +
+        '<test-decorator></test-decorator>' +
+        '<ul>' +
+        '<li><ul><li><span style="white-space: pre-wrap;">world</span></li></ul></li>' +
+        '<li><span style="white-space: pre-wrap;">After</span></li>' +
+        '</ul>',
+      initialHtml:
+        '<ul>' +
+        '<li><span>Before</span></li>' +
+        '<ul><li><span>Helloworld</span></li></ul>' +
+        '<li><span>After</span></li>' +
+        '</ul>',
+      selectionOffset: 5, // Selection on text node after "Hello" world
+      selectionPath: [0, 1, 0, 0, 0],
+    },
+    {
+      _: 'insert into empty paragraph',
+      expectedHtml: '<p><br></p><test-decorator></test-decorator><p><br></p>',
+      initialHtml: '<p></p>',
+      selectionOffset: 0, // Selection on text node after "Hello" world
+      selectionPath: [0],
+    },
+    {
+      _: 'insert in the end of paragraph',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Hello world</span></p>' +
+        '<test-decorator></test-decorator>' +
+        '<p><br></p>',
+      initialHtml: '<p>Hello world</p>',
+      selectionOffset: 12, // Selection on text node after "Hello" world
+      selectionPath: [0, 0],
+    },
+    {
+      _: 'insert in the beginning of paragraph',
+      expectedHtml:
+        '<p><br></p>' +
+        '<test-decorator></test-decorator>' +
+        '<p><span style="white-space: pre-wrap;">Hello world</span></p>',
+      initialHtml: '<p>Hello world</p>',
+      selectionOffset: 0, // Selection on text node after "Hello" world
+      selectionPath: [0, 0],
+    },
+    {
+      _: 'insert with selection on root start',
+      expectedHtml:
+        '<test-decorator></test-decorator>' +
+        '<test-decorator></test-decorator>' +
+        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
+        '<p><span style="white-space: pre-wrap;">After</span></p>',
+      initialHtml:
+        '<test-decorator></test-decorator>' +
+        '<p><span>Before</span></p>' +
+        '<p><span>After</span></p>',
+      selectionOffset: 0,
+      selectionPath: [],
+    },
+    {
+      _: 'insert with selection on root child',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
+        '<test-decorator></test-decorator>' +
+        '<p><span style="white-space: pre-wrap;">After</span></p>',
+      initialHtml: '<p>Before</p><p>After</p>',
+      selectionOffset: 1,
+      selectionPath: [],
+    },
+    {
+      _: 'insert with selection on root end',
+      expectedHtml:
+        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
+        '<test-decorator></test-decorator>',
+      initialHtml: '<p>Before</p>',
+      selectionOffset: 1,
+      selectionPath: [],
+    },
+  ];
+
+  for (const testCase of testCases) {
+    it(testCase._, async () => {
+      await update(() => {
+        // Running init, update, assert in the same update loop
+        // to skip text nodes normalization (then separate text
+        // nodes will still be separate and represented by its own
+        // spans in html output) and make assertions more precise
+        const parser = new DOMParser();
+        const dom = parser.parseFromString(testCase.initialHtml, 'text/html');
+        const nodesToInsert = $generateNodesFromDOM(editor, dom);
+        $getRoot()
+          .clear()
+          .append(...nodesToInsert);
+
+        let selectionNode: LexicalNode = $getRoot();
+        for (const index of testCase.selectionPath) {
+          if (!$isElementNode(selectionNode)) {
+            throw new Error(
+              'Expected node to be element (to traverse the tree)',
+            );
+          }
+          selectionNode = selectionNode.getChildAtIndex(index)!;
+        }
+
+        // Calling selectionNode.select() would "normalize" selection and move it
+        // to text node (if available), while for the purpose of the test we'd want
+        // to use whatever was passed (e.g. keep selection on root node)
+        const selection = $createRangeSelection();
+        const type = $isElementNode(selectionNode) ? 'element' : 'text';
+        selection.anchor.key = selection.focus.key = selectionNode.getKey();
+        selection.anchor.offset = selection.focus.offset =
+          testCase.selectionOffset;
+        selection.anchor.type = selection.focus.type = type;
+        $setSelection(selection);
+
+        $insertNodeToNearestRoot($createTestDecoratorNode());
+
+        // Cleaning up list value attributes as it's not really needed in this test
+        // and it clutters expected output
+        const actualHtml = $generateHtmlFromNodes(editor).replace(
+          /\svalue="\d{1,}"/g,
+          '',
+        );
+        expect(actualHtml).toEqual(testCase.expectedHtml);
+      });
+    });
+  }
+});
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/mergeRegister.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/mergeRegister.test.ts
new file mode 100644
index 00000000000..01228f629ef
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/mergeRegister.test.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+import {mergeRegister} from '@lexical/utils';
+
+describe('mergeRegister', () => {
+  it('calls all of the clean-up functions', () => {
+    const cleanup = jest.fn();
+    mergeRegister(cleanup, cleanup)();
+    expect(cleanup).toHaveBeenCalledTimes(2);
+  });
+  it('calls the clean-up functions in reverse order', () => {
+    const cleanup = jest.fn();
+    mergeRegister(cleanup.bind(null, 1), cleanup.bind(null, 2))();
+    expect(cleanup.mock.calls.map(([v]) => v)).toEqual([2, 1]);
+  });
+});
diff --git a/resources/js/wysiwyg/lexical/utils/index.ts b/resources/js/wysiwyg/lexical/utils/index.ts
new file mode 100644
index 00000000000..7984126e394
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/index.ts
@@ -0,0 +1,607 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $cloneWithProperties,
+  $createParagraphNode,
+  $getPreviousSelection,
+  $getRoot,
+  $getSelection,
+  $isElementNode,
+  $isRangeSelection,
+  $isRootOrShadowRoot,
+  $isTextNode,
+  $setSelection,
+  $splitNode,
+  EditorState,
+  ElementNode,
+  Klass,
+  LexicalEditor,
+  LexicalNode,
+} from 'lexical';
+// This underscore postfixing is used as a hotfix so we do not
+// export shared types from this module #5918
+import {CAN_USE_DOM as CAN_USE_DOM_} from 'lexical/shared/canUseDOM';
+import {
+  CAN_USE_BEFORE_INPUT as CAN_USE_BEFORE_INPUT_,
+  IS_ANDROID as IS_ANDROID_,
+  IS_ANDROID_CHROME as IS_ANDROID_CHROME_,
+  IS_APPLE as IS_APPLE_,
+  IS_APPLE_WEBKIT as IS_APPLE_WEBKIT_,
+  IS_CHROME as IS_CHROME_,
+  IS_FIREFOX as IS_FIREFOX_,
+  IS_IOS as IS_IOS_,
+  IS_SAFARI as IS_SAFARI_,
+} from 'lexical/shared/environment';
+import invariant from 'lexical/shared/invariant';
+import normalizeClassNames from 'lexical/shared/normalizeClassNames';
+
+export {default as markSelection} from './markSelection';
+export {default as mergeRegister} from './mergeRegister';
+export {default as positionNodeOnRange} from './positionNodeOnRange';
+export {
+  $splitNode,
+  isBlockDomNode,
+  isHTMLAnchorElement,
+  isHTMLElement,
+  isInlineDomNode,
+} from 'lexical';
+// Hotfix to export these with inlined types #5918
+export const CAN_USE_BEFORE_INPUT: boolean = CAN_USE_BEFORE_INPUT_;
+export const CAN_USE_DOM: boolean = CAN_USE_DOM_;
+export const IS_ANDROID: boolean = IS_ANDROID_;
+export const IS_ANDROID_CHROME: boolean = IS_ANDROID_CHROME_;
+export const IS_APPLE: boolean = IS_APPLE_;
+export const IS_APPLE_WEBKIT: boolean = IS_APPLE_WEBKIT_;
+export const IS_CHROME: boolean = IS_CHROME_;
+export const IS_FIREFOX: boolean = IS_FIREFOX_;
+export const IS_IOS: boolean = IS_IOS_;
+export const IS_SAFARI: boolean = IS_SAFARI_;
+
+export type DFSNode = Readonly<{
+  depth: number;
+  node: LexicalNode;
+}>;
+
+/**
+ * Takes an HTML element and adds the classNames passed within an array,
+ * ignoring any non-string types. A space can be used to add multiple classes
+ * eg. addClassNamesToElement(element, ['element-inner active', true, null])
+ * will add both 'element-inner' and 'active' as classes to that element.
+ * @param element - The element in which the classes are added
+ * @param classNames - An array defining the class names to add to the element
+ */
+export function addClassNamesToElement(
+  element: HTMLElement,
+  ...classNames: Array<typeof undefined | boolean | null | string>
+): void {
+  const classesToAdd = normalizeClassNames(...classNames);
+  if (classesToAdd.length > 0) {
+    element.classList.add(...classesToAdd);
+  }
+}
+
+/**
+ * Takes an HTML element and removes the classNames passed within an array,
+ * ignoring any non-string types. A space can be used to remove multiple classes
+ * eg. removeClassNamesFromElement(element, ['active small', true, null])
+ * will remove both the 'active' and 'small' classes from that element.
+ * @param element - The element in which the classes are removed
+ * @param classNames - An array defining the class names to remove from the element
+ */
+export function removeClassNamesFromElement(
+  element: HTMLElement,
+  ...classNames: Array<typeof undefined | boolean | null | string>
+): void {
+  const classesToRemove = normalizeClassNames(...classNames);
+  if (classesToRemove.length > 0) {
+    element.classList.remove(...classesToRemove);
+  }
+}
+
+/**
+ * Returns true if the file type matches the types passed within the acceptableMimeTypes array, false otherwise.
+ * The types passed must be strings and are CASE-SENSITIVE.
+ * eg. if file is of type 'text' and acceptableMimeTypes = ['TEXT', 'IMAGE'] the function will return false.
+ * @param file - The file you want to type check.
+ * @param acceptableMimeTypes - An array of strings of types which the file is checked against.
+ * @returns true if the file is an acceptable mime type, false otherwise.
+ */
+export function isMimeType(
+  file: File,
+  acceptableMimeTypes: Array<string>,
+): boolean {
+  for (const acceptableType of acceptableMimeTypes) {
+    if (file.type.startsWith(acceptableType)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Lexical File Reader with:
+ *  1. MIME type support
+ *  2. batched results (HistoryPlugin compatibility)
+ *  3. Order aware (respects the order when multiple Files are passed)
+ *
+ * const filesResult = await mediaFileReader(files, ['image/']);
+ * filesResult.forEach(file => editor.dispatchCommand('INSERT_IMAGE', \\{
+ *   src: file.result,
+ * \\}));
+ */
+export function mediaFileReader(
+  files: Array<File>,
+  acceptableMimeTypes: Array<string>,
+): Promise<Array<{file: File; result: string}>> {
+  const filesIterator = files[Symbol.iterator]();
+  return new Promise((resolve, reject) => {
+    const processed: Array<{file: File; result: string}> = [];
+    const handleNextFile = () => {
+      const {done, value: file} = filesIterator.next();
+      if (done) {
+        return resolve(processed);
+      }
+      const fileReader = new FileReader();
+      fileReader.addEventListener('error', reject);
+      fileReader.addEventListener('load', () => {
+        const result = fileReader.result;
+        if (typeof result === 'string') {
+          processed.push({file, result});
+        }
+        handleNextFile();
+      });
+      if (isMimeType(file, acceptableMimeTypes)) {
+        fileReader.readAsDataURL(file);
+      } else {
+        handleNextFile();
+      }
+    };
+    handleNextFile();
+  });
+}
+
+/**
+ * "Depth-First Search" starts at the root/top node of a tree and goes as far as it can down a branch end
+ * before backtracking and finding a new path. Consider solving a maze by hugging either wall, moving down a
+ * branch until you hit a dead-end (leaf) and backtracking to find the nearest branching path and repeat.
+ * It will then return all the nodes found in the search in an array of objects.
+ * @param startingNode - The node to start the search, if ommitted, it will start at the root node.
+ * @param endingNode - The node to end the search, if ommitted, it will find all descendants of the startingNode.
+ * @returns An array of objects of all the nodes found by the search, including their depth into the tree.
+ * \\{depth: number, node: LexicalNode\\} It will always return at least 1 node (the ending node) so long as it exists
+ */
+export function $dfs(
+  startingNode?: LexicalNode,
+  endingNode?: LexicalNode,
+): Array<DFSNode> {
+  const nodes = [];
+  const start = (startingNode || $getRoot()).getLatest();
+  const end =
+    endingNode ||
+    ($isElementNode(start) ? start.getLastDescendant() || start : start);
+  let node: LexicalNode | null = start;
+  let depth = $getDepth(node);
+
+  while (node !== null && !node.is(end)) {
+    nodes.push({depth, node});
+
+    if ($isElementNode(node) && node.getChildrenSize() > 0) {
+      node = node.getFirstChild();
+      depth++;
+    } else {
+      // Find immediate sibling or nearest parent sibling
+      let sibling = null;
+
+      while (sibling === null && node !== null) {
+        sibling = node.getNextSibling();
+
+        if (sibling === null) {
+          node = node.getParent();
+          depth--;
+        } else {
+          node = sibling;
+        }
+      }
+    }
+  }
+
+  if (node !== null && node.is(end)) {
+    nodes.push({depth, node});
+  }
+
+  return nodes;
+}
+
+function $getDepth(node: LexicalNode): number {
+  let innerNode: LexicalNode | null = node;
+  let depth = 0;
+
+  while ((innerNode = innerNode.getParent()) !== null) {
+    depth++;
+  }
+
+  return depth;
+}
+
+/**
+ * Performs a right-to-left preorder tree traversal.
+ * From the starting node it goes to the rightmost child, than backtracks to paret and finds new rightmost path.
+ * It will return the next node in traversal sequence after the startingNode.
+ * The traversal is similar to $dfs functions above, but the nodes are visited right-to-left, not left-to-right.
+ * @param startingNode - The node to start the search.
+ * @returns The next node in pre-order right to left traversal sequence or `null`, if the node does not exist
+ */
+export function $getNextRightPreorderNode(
+  startingNode: LexicalNode,
+): LexicalNode | null {
+  let node: LexicalNode | null = startingNode;
+
+  if ($isElementNode(node) && node.getChildrenSize() > 0) {
+    node = node.getLastChild();
+  } else {
+    let sibling = null;
+
+    while (sibling === null && node !== null) {
+      sibling = node.getPreviousSibling();
+
+      if (sibling === null) {
+        node = node.getParent();
+      } else {
+        node = sibling;
+      }
+    }
+  }
+  return node;
+}
+
+/**
+ * Takes a node and traverses up its ancestors (toward the root node)
+ * in order to find a specific type of node.
+ * @param node - the node to begin searching.
+ * @param klass - an instance of the type of node to look for.
+ * @returns the node of type klass that was passed, or null if none exist.
+ */
+export function $getNearestNodeOfType<T extends ElementNode>(
+  node: LexicalNode,
+  klass: Klass<T>,
+): T | null {
+  let parent: ElementNode | LexicalNode | null = node;
+
+  while (parent != null) {
+    if (parent instanceof klass) {
+      return parent as T;
+    }
+
+    parent = parent.getParent();
+  }
+
+  return null;
+}
+
+/**
+ * Returns the element node of the nearest ancestor, otherwise throws an error.
+ * @param startNode - The starting node of the search
+ * @returns The ancestor node found
+ */
+export function $getNearestBlockElementAncestorOrThrow(
+  startNode: LexicalNode,
+): ElementNode {
+  const blockNode = $findMatchingParent(
+    startNode,
+    (node) => $isElementNode(node) && !node.isInline(),
+  );
+  if (!$isElementNode(blockNode)) {
+    invariant(
+      false,
+      'Expected node %s to have closest block element node.',
+      startNode.__key,
+    );
+  }
+  return blockNode;
+}
+
+export type DOMNodeToLexicalConversion = (element: Node) => LexicalNode;
+
+export type DOMNodeToLexicalConversionMap = Record<
+  string,
+  DOMNodeToLexicalConversion
+>;
+
+/**
+ * Starts with a node and moves up the tree (toward the root node) to find a matching node based on
+ * the search parameters of the findFn. (Consider JavaScripts' .find() function where a testing function must be
+ * passed as an argument. eg. if( (node) => node.__type === 'div') ) return true; otherwise return false
+ * @param startingNode - The node where the search starts.
+ * @param findFn - A testing function that returns true if the current node satisfies the testing parameters.
+ * @returns A parent node that matches the findFn parameters, or null if one wasn't found.
+ */
+export const $findMatchingParent: {
+  <T extends LexicalNode>(
+    startingNode: LexicalNode,
+    findFn: (node: LexicalNode) => node is T,
+  ): T | null;
+  (
+    startingNode: LexicalNode,
+    findFn: (node: LexicalNode) => boolean,
+  ): LexicalNode | null;
+} = (
+  startingNode: LexicalNode,
+  findFn: (node: LexicalNode) => boolean,
+): LexicalNode | null => {
+  let curr: ElementNode | LexicalNode | null = startingNode;
+
+  while (curr !== $getRoot() && curr != null) {
+    if (findFn(curr)) {
+      return curr;
+    }
+
+    curr = curr.getParent();
+  }
+
+  return null;
+};
+
+/**
+ * Attempts to resolve nested element nodes of the same type into a single node of that type.
+ * It is generally used for marks/commenting
+ * @param editor - The lexical editor
+ * @param targetNode - The target for the nested element to be extracted from.
+ * @param cloneNode - See {@link $createMarkNode}
+ * @param handleOverlap - Handles any overlap between the node to extract and the targetNode
+ * @returns The lexical editor
+ */
+export function registerNestedElementResolver<N extends ElementNode>(
+  editor: LexicalEditor,
+  targetNode: Klass<N>,
+  cloneNode: (from: N) => N,
+  handleOverlap: (from: N, to: N) => void,
+): () => void {
+  const $isTargetNode = (node: LexicalNode | null | undefined): node is N => {
+    return node instanceof targetNode;
+  };
+
+  const $findMatch = (node: N): {child: ElementNode; parent: N} | null => {
+    // First validate we don't have any children that are of the target,
+    // as we need to handle them first.
+    const children = node.getChildren();
+
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+
+      if ($isTargetNode(child)) {
+        return null;
+      }
+    }
+
+    let parentNode: N | null = node;
+    let childNode = node;
+
+    while (parentNode !== null) {
+      childNode = parentNode;
+      parentNode = parentNode.getParent();
+
+      if ($isTargetNode(parentNode)) {
+        return {child: childNode, parent: parentNode};
+      }
+    }
+
+    return null;
+  };
+
+  const $elementNodeTransform = (node: N) => {
+    const match = $findMatch(node);
+
+    if (match !== null) {
+      const {child, parent} = match;
+
+      // Simple path, we can move child out and siblings into a new parent.
+
+      if (child.is(node)) {
+        handleOverlap(parent, node);
+        const nextSiblings = child.getNextSiblings();
+        const nextSiblingsLength = nextSiblings.length;
+        parent.insertAfter(child);
+
+        if (nextSiblingsLength !== 0) {
+          const newParent = cloneNode(parent);
+          child.insertAfter(newParent);
+
+          for (let i = 0; i < nextSiblingsLength; i++) {
+            newParent.append(nextSiblings[i]);
+          }
+        }
+
+        if (!parent.canBeEmpty() && parent.getChildrenSize() === 0) {
+          parent.remove();
+        }
+      } else {
+        // Complex path, we have a deep node that isn't a child of the
+        // target parent.
+        // TODO: implement this functionality
+      }
+    }
+  };
+
+  return editor.registerNodeTransform(targetNode, $elementNodeTransform);
+}
+
+/**
+ * Clones the editor and marks it as dirty to be reconciled. If there was a selection,
+ * it would be set back to its previous state, or null otherwise.
+ * @param editor - The lexical editor
+ * @param editorState - The editor's state
+ */
+export function $restoreEditorState(
+  editor: LexicalEditor,
+  editorState: EditorState,
+): void {
+  const FULL_RECONCILE = 2;
+  const nodeMap = new Map();
+  const activeEditorState = editor._pendingEditorState;
+
+  for (const [key, node] of editorState._nodeMap) {
+    nodeMap.set(key, $cloneWithProperties(node));
+  }
+
+  if (activeEditorState) {
+    activeEditorState._nodeMap = nodeMap;
+  }
+
+  editor._dirtyType = FULL_RECONCILE;
+  const selection = editorState._selection;
+  $setSelection(selection === null ? null : selection.clone());
+}
+
+/**
+ * If the selected insertion area is the root/shadow root node (see {@link lexical!$isRootOrShadowRoot}),
+ * the node will be appended there, otherwise, it will be inserted before the insertion area.
+ * If there is no selection where the node is to be inserted, it will be appended after any current nodes
+ * within the tree, as a child of the root node. A paragraph node will then be added after the inserted node and selected.
+ * @param node - The node to be inserted
+ * @returns The node after its insertion
+ */
+export function $insertNodeToNearestRoot<T extends LexicalNode>(node: T): T {
+  const selection = $getSelection() || $getPreviousSelection();
+
+  if ($isRangeSelection(selection)) {
+    const {focus} = selection;
+    const focusNode = focus.getNode();
+    const focusOffset = focus.offset;
+
+    if ($isRootOrShadowRoot(focusNode)) {
+      const focusChild = focusNode.getChildAtIndex(focusOffset);
+      if (focusChild == null) {
+        focusNode.append(node);
+      } else {
+        focusChild.insertBefore(node);
+      }
+      node.selectNext();
+    } else {
+      let splitNode: ElementNode;
+      let splitOffset: number;
+      if ($isTextNode(focusNode)) {
+        splitNode = focusNode.getParentOrThrow();
+        splitOffset = focusNode.getIndexWithinParent();
+        if (focusOffset > 0) {
+          splitOffset += 1;
+          focusNode.splitText(focusOffset);
+        }
+      } else {
+        splitNode = focusNode;
+        splitOffset = focusOffset;
+      }
+      const [, rightTree] = $splitNode(splitNode, splitOffset);
+      rightTree.insertBefore(node);
+      rightTree.selectStart();
+    }
+  } else {
+    if (selection != null) {
+      const nodes = selection.getNodes();
+      nodes[nodes.length - 1].getTopLevelElementOrThrow().insertAfter(node);
+    } else {
+      const root = $getRoot();
+      root.append(node);
+    }
+    const paragraphNode = $createParagraphNode();
+    node.insertAfter(paragraphNode);
+    paragraphNode.select();
+  }
+  return node.getLatest();
+}
+
+/**
+ * Wraps the node into another node created from a createElementNode function, eg. $createParagraphNode
+ * @param node - Node to be wrapped.
+ * @param createElementNode - Creates a new lexical element to wrap the to-be-wrapped node and returns it.
+ * @returns A new lexical element with the previous node appended within (as a child, including its children).
+ */
+export function $wrapNodeInElement(
+  node: LexicalNode,
+  createElementNode: () => ElementNode,
+): ElementNode {
+  const elementNode = createElementNode();
+  node.replace(elementNode);
+  elementNode.append(node);
+  return elementNode;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type ObjectKlass<T> = new (...args: any[]) => T;
+
+/**
+ * @param object = The instance of the type
+ * @param objectClass = The class of the type
+ * @returns Whether the object is has the same Klass of the objectClass, ignoring the difference across window (e.g. different iframs)
+ */
+export function objectKlassEquals<T>(
+  object: unknown,
+  objectClass: ObjectKlass<T>,
+): boolean {
+  return object !== null
+    ? Object.getPrototypeOf(object).constructor.name === objectClass.name
+    : false;
+}
+
+/**
+ * Filter the nodes
+ * @param nodes Array of nodes that needs to be filtered
+ * @param filterFn A filter function that returns node if the current node satisfies the condition otherwise null
+ * @returns Array of filtered nodes
+ */
+
+export function $filter<T>(
+  nodes: Array<LexicalNode>,
+  filterFn: (node: LexicalNode) => null | T,
+): Array<T> {
+  const result: T[] = [];
+  for (let i = 0; i < nodes.length; i++) {
+    const node = filterFn(nodes[i]);
+    if (node !== null) {
+      result.push(node);
+    }
+  }
+  return result;
+}
+/**
+ * Appends the node before the first child of the parent node
+ * @param parent A parent node
+ * @param node Node that needs to be appended
+ */
+export function $insertFirst(parent: ElementNode, node: LexicalNode): void {
+  const firstChild = parent.getFirstChild();
+  if (firstChild !== null) {
+    firstChild.insertBefore(node);
+  } else {
+    parent.append(node);
+  }
+}
+
+/**
+ * Calculates the zoom level of an element as a result of using
+ * css zoom property.
+ * @param element
+ */
+export function calculateZoomLevel(element: Element | null): number {
+  if (IS_FIREFOX) {
+    return 1;
+  }
+  let zoom = 1;
+  while (element) {
+    zoom *= Number(window.getComputedStyle(element).getPropertyValue('zoom'));
+    element = element.parentElement;
+  }
+  return zoom;
+}
+
+/**
+ * Checks if the editor is a nested editor created by LexicalNestedComposer
+ */
+export function $isEditorIsNestedEditor(editor: LexicalEditor): boolean {
+  return editor._parentEditor !== null;
+}
diff --git a/resources/js/wysiwyg/lexical/utils/markSelection.ts b/resources/js/wysiwyg/lexical/utils/markSelection.ts
new file mode 100644
index 00000000000..b1359c6dfb3
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/markSelection.ts
@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  $getSelection,
+  $isRangeSelection,
+  type EditorState,
+  ElementNode,
+  type LexicalEditor,
+  TextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import mergeRegister from './mergeRegister';
+import positionNodeOnRange from './positionNodeOnRange';
+import px from './px';
+
+export default function markSelection(
+  editor: LexicalEditor,
+  onReposition?: (node: Array<HTMLElement>) => void,
+): () => void {
+  let previousAnchorNode: null | TextNode | ElementNode = null;
+  let previousAnchorOffset: null | number = null;
+  let previousFocusNode: null | TextNode | ElementNode = null;
+  let previousFocusOffset: null | number = null;
+  let removeRangeListener: () => void = () => {};
+  function compute(editorState: EditorState) {
+    editorState.read(() => {
+      const selection = $getSelection();
+      if (!$isRangeSelection(selection)) {
+        // TODO
+        previousAnchorNode = null;
+        previousAnchorOffset = null;
+        previousFocusNode = null;
+        previousFocusOffset = null;
+        removeRangeListener();
+        removeRangeListener = () => {};
+        return;
+      }
+      const {anchor, focus} = selection;
+      const currentAnchorNode = anchor.getNode();
+      const currentAnchorNodeKey = currentAnchorNode.getKey();
+      const currentAnchorOffset = anchor.offset;
+      const currentFocusNode = focus.getNode();
+      const currentFocusNodeKey = currentFocusNode.getKey();
+      const currentFocusOffset = focus.offset;
+      const currentAnchorNodeDOM = editor.getElementByKey(currentAnchorNodeKey);
+      const currentFocusNodeDOM = editor.getElementByKey(currentFocusNodeKey);
+      const differentAnchorDOM =
+        previousAnchorNode === null ||
+        currentAnchorNodeDOM === null ||
+        currentAnchorOffset !== previousAnchorOffset ||
+        currentAnchorNodeKey !== previousAnchorNode.getKey() ||
+        (currentAnchorNode !== previousAnchorNode &&
+          (!(previousAnchorNode instanceof TextNode) ||
+            currentAnchorNode.updateDOM(
+              previousAnchorNode,
+              currentAnchorNodeDOM,
+              editor._config,
+            )));
+      const differentFocusDOM =
+        previousFocusNode === null ||
+        currentFocusNodeDOM === null ||
+        currentFocusOffset !== previousFocusOffset ||
+        currentFocusNodeKey !== previousFocusNode.getKey() ||
+        (currentFocusNode !== previousFocusNode &&
+          (!(previousFocusNode instanceof TextNode) ||
+            currentFocusNode.updateDOM(
+              previousFocusNode,
+              currentFocusNodeDOM,
+              editor._config,
+            )));
+      if (differentAnchorDOM || differentFocusDOM) {
+        const anchorHTMLElement = editor.getElementByKey(
+          anchor.getNode().getKey(),
+        );
+        const focusHTMLElement = editor.getElementByKey(
+          focus.getNode().getKey(),
+        );
+        // TODO handle selection beyond the common TextNode
+        if (
+          anchorHTMLElement !== null &&
+          focusHTMLElement !== null &&
+          anchorHTMLElement.tagName === 'SPAN' &&
+          focusHTMLElement.tagName === 'SPAN'
+        ) {
+          const range = document.createRange();
+          let firstHTMLElement;
+          let firstOffset;
+          let lastHTMLElement;
+          let lastOffset;
+          if (focus.isBefore(anchor)) {
+            firstHTMLElement = focusHTMLElement;
+            firstOffset = focus.offset;
+            lastHTMLElement = anchorHTMLElement;
+            lastOffset = anchor.offset;
+          } else {
+            firstHTMLElement = anchorHTMLElement;
+            firstOffset = anchor.offset;
+            lastHTMLElement = focusHTMLElement;
+            lastOffset = focus.offset;
+          }
+          const firstTextNode = firstHTMLElement.firstChild;
+          invariant(
+            firstTextNode !== null,
+            'Expected text node to be first child of span',
+          );
+          const lastTextNode = lastHTMLElement.firstChild;
+          invariant(
+            lastTextNode !== null,
+            'Expected text node to be first child of span',
+          );
+          range.setStart(firstTextNode, firstOffset);
+          range.setEnd(lastTextNode, lastOffset);
+          removeRangeListener();
+          removeRangeListener = positionNodeOnRange(
+            editor,
+            range,
+            (domNodes) => {
+              for (const domNode of domNodes) {
+                const domNodeStyle = domNode.style;
+                if (domNodeStyle.background !== 'Highlight') {
+                  domNodeStyle.background = 'Highlight';
+                }
+                if (domNodeStyle.color !== 'HighlightText') {
+                  domNodeStyle.color = 'HighlightText';
+                }
+                if (domNodeStyle.zIndex !== '-1') {
+                  domNodeStyle.zIndex = '-1';
+                }
+                if (domNodeStyle.pointerEvents !== 'none') {
+                  domNodeStyle.pointerEvents = 'none';
+                }
+                if (domNodeStyle.marginTop !== px(-1.5)) {
+                  domNodeStyle.marginTop = px(-1.5);
+                }
+                if (domNodeStyle.paddingTop !== px(4)) {
+                  domNodeStyle.paddingTop = px(4);
+                }
+                if (domNodeStyle.paddingBottom !== px(0)) {
+                  domNodeStyle.paddingBottom = px(0);
+                }
+              }
+              if (onReposition !== undefined) {
+                onReposition(domNodes);
+              }
+            },
+          );
+        }
+      }
+      previousAnchorNode = currentAnchorNode;
+      previousAnchorOffset = currentAnchorOffset;
+      previousFocusNode = currentFocusNode;
+      previousFocusOffset = currentFocusOffset;
+    });
+  }
+  compute(editor.getEditorState());
+  return mergeRegister(
+    editor.registerUpdateListener(({editorState}) => compute(editorState)),
+    removeRangeListener,
+    () => {
+      removeRangeListener();
+    },
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/utils/mergeRegister.ts b/resources/js/wysiwyg/lexical/utils/mergeRegister.ts
new file mode 100644
index 00000000000..0d1a19255e4
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/mergeRegister.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+type Func = () => void;
+
+/**
+ * Returns a function that will execute all functions passed when called. It is generally used
+ * to register multiple lexical listeners and then tear them down with a single function call, such
+ * as React's useEffect hook.
+ * @example
+ * ```ts
+ * useEffect(() => {
+ *   return mergeRegister(
+ *     editor.registerCommand(...registerCommand1 logic),
+ *     editor.registerCommand(...registerCommand2 logic),
+ *     editor.registerCommand(...registerCommand3 logic)
+ *   )
+ * }, [editor])
+ * ```
+ * In this case, useEffect is returning the function returned by mergeRegister as a cleanup
+ * function to be executed after either the useEffect runs again (due to one of its dependencies
+ * updating) or the component it resides in unmounts.
+ * Note the functions don't neccesarily need to be in an array as all arguments
+ * are considered to be the func argument and spread from there.
+ * The order of cleanup is the reverse of the argument order. Generally it is
+ * expected that the first "acquire" will be "released" last (LIFO order),
+ * because a later step may have some dependency on an earlier one.
+ * @param func - An array of cleanup functions meant to be executed by the returned function.
+ * @returns the function which executes all the passed cleanup functions.
+ */
+export default function mergeRegister(...func: Array<Func>): () => void {
+  return () => {
+    for (let i = func.length - 1; i >= 0; i--) {
+      func[i]();
+    }
+    // Clean up the references and make future calls a no-op
+    func.length = 0;
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/utils/positionNodeOnRange.ts b/resources/js/wysiwyg/lexical/utils/positionNodeOnRange.ts
new file mode 100644
index 00000000000..468d25c0825
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/positionNodeOnRange.ts
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {LexicalEditor} from 'lexical';
+
+import {createRectsFromDOMRange} from '@lexical/selection';
+import invariant from 'lexical/shared/invariant';
+
+import px from './px';
+
+const mutationObserverConfig = {
+  attributes: true,
+  characterData: true,
+  childList: true,
+  subtree: true,
+};
+
+export default function positionNodeOnRange(
+  editor: LexicalEditor,
+  range: Range,
+  onReposition: (node: Array<HTMLElement>) => void,
+): () => void {
+  let rootDOMNode: null | HTMLElement = null;
+  let parentDOMNode: null | HTMLElement = null;
+  let observer: null | MutationObserver = null;
+  let lastNodes: Array<HTMLElement> = [];
+  const wrapperNode = document.createElement('div');
+
+  function position(): void {
+    invariant(rootDOMNode !== null, 'Unexpected null rootDOMNode');
+    invariant(parentDOMNode !== null, 'Unexpected null parentDOMNode');
+    const {left: rootLeft, top: rootTop} = rootDOMNode.getBoundingClientRect();
+    const parentDOMNode_ = parentDOMNode;
+    const rects = createRectsFromDOMRange(editor, range);
+    if (!wrapperNode.isConnected) {
+      parentDOMNode_.append(wrapperNode);
+    }
+    let hasRepositioned = false;
+    for (let i = 0; i < rects.length; i++) {
+      const rect = rects[i];
+      // Try to reuse the previously created Node when possible, no need to
+      // remove/create on the most common case reposition case
+      const rectNode = lastNodes[i] || document.createElement('div');
+      const rectNodeStyle = rectNode.style;
+      if (rectNodeStyle.position !== 'absolute') {
+        rectNodeStyle.position = 'absolute';
+        hasRepositioned = true;
+      }
+      const left = px(rect.left - rootLeft);
+      if (rectNodeStyle.left !== left) {
+        rectNodeStyle.left = left;
+        hasRepositioned = true;
+      }
+      const top = px(rect.top - rootTop);
+      if (rectNodeStyle.top !== top) {
+        rectNode.style.top = top;
+        hasRepositioned = true;
+      }
+      const width = px(rect.width);
+      if (rectNodeStyle.width !== width) {
+        rectNode.style.width = width;
+        hasRepositioned = true;
+      }
+      const height = px(rect.height);
+      if (rectNodeStyle.height !== height) {
+        rectNode.style.height = height;
+        hasRepositioned = true;
+      }
+      if (rectNode.parentNode !== wrapperNode) {
+        wrapperNode.append(rectNode);
+        hasRepositioned = true;
+      }
+      lastNodes[i] = rectNode;
+    }
+    while (lastNodes.length > rects.length) {
+      lastNodes.pop();
+    }
+    if (hasRepositioned) {
+      onReposition(lastNodes);
+    }
+  }
+
+  function stop(): void {
+    parentDOMNode = null;
+    rootDOMNode = null;
+    if (observer !== null) {
+      observer.disconnect();
+    }
+    observer = null;
+    wrapperNode.remove();
+    for (const node of lastNodes) {
+      node.remove();
+    }
+    lastNodes = [];
+  }
+
+  function restart(): void {
+    const currentRootDOMNode = editor.getRootElement();
+    if (currentRootDOMNode === null) {
+      return stop();
+    }
+    const currentParentDOMNode = currentRootDOMNode.parentElement;
+    if (!(currentParentDOMNode instanceof HTMLElement)) {
+      return stop();
+    }
+    stop();
+    rootDOMNode = currentRootDOMNode;
+    parentDOMNode = currentParentDOMNode;
+    observer = new MutationObserver((mutations) => {
+      const nextRootDOMNode = editor.getRootElement();
+      const nextParentDOMNode =
+        nextRootDOMNode && nextRootDOMNode.parentElement;
+      if (
+        nextRootDOMNode !== rootDOMNode ||
+        nextParentDOMNode !== parentDOMNode
+      ) {
+        return restart();
+      }
+      for (const mutation of mutations) {
+        if (!wrapperNode.contains(mutation.target)) {
+          // TODO throttle
+          return position();
+        }
+      }
+    });
+    observer.observe(currentParentDOMNode, mutationObserverConfig);
+    position();
+  }
+
+  const removeRootListener = editor.registerRootListener(restart);
+
+  return () => {
+    removeRootListener();
+    stop();
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/utils/px.ts b/resources/js/wysiwyg/lexical/utils/px.ts
new file mode 100644
index 00000000000..c306cc7d685
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/utils/px.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export default function px(value: number) {
+  return `${value}px`;
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/Bindings.ts b/resources/js/wysiwyg/lexical/yjs/Bindings.ts
new file mode 100644
index 00000000000..4d3ac01f463
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/Bindings.ts
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {CollabDecoratorNode} from './CollabDecoratorNode';
+import type {CollabElementNode} from './CollabElementNode';
+import type {CollabLineBreakNode} from './CollabLineBreakNode';
+import type {CollabTextNode} from './CollabTextNode';
+import type {Cursor} from './SyncCursors';
+import type {LexicalEditor, NodeKey} from 'lexical';
+import type {Doc} from 'yjs';
+
+import {Klass, LexicalNode} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import {XmlText} from 'yjs';
+
+import {Provider} from '.';
+import {$createCollabElementNode} from './CollabElementNode';
+
+export type ClientID = number;
+export type Binding = {
+  clientID: number;
+  collabNodeMap: Map<
+    NodeKey,
+    | CollabElementNode
+    | CollabTextNode
+    | CollabDecoratorNode
+    | CollabLineBreakNode
+  >;
+  cursors: Map<ClientID, Cursor>;
+  cursorsContainer: null | HTMLElement;
+  doc: Doc;
+  docMap: Map<string, Doc>;
+  editor: LexicalEditor;
+  id: string;
+  nodeProperties: Map<string, Array<string>>;
+  root: CollabElementNode;
+  excludedProperties: ExcludedProperties;
+};
+export type ExcludedProperties = Map<Klass<LexicalNode>, Set<string>>;
+
+export function createBinding(
+  editor: LexicalEditor,
+  provider: Provider,
+  id: string,
+  doc: Doc | null | undefined,
+  docMap: Map<string, Doc>,
+  excludedProperties?: ExcludedProperties,
+): Binding {
+  invariant(
+    doc !== undefined && doc !== null,
+    'createBinding: doc is null or undefined',
+  );
+  const rootXmlText = doc.get('root', XmlText) as XmlText;
+  const root: CollabElementNode = $createCollabElementNode(
+    rootXmlText,
+    null,
+    'root',
+  );
+  root._key = 'root';
+  return {
+    clientID: doc.clientID,
+    collabNodeMap: new Map(),
+    cursors: new Map(),
+    cursorsContainer: null,
+    doc,
+    docMap,
+    editor,
+    excludedProperties: excludedProperties || new Map(),
+    id,
+    nodeProperties: new Map(),
+    root,
+  };
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/CollabDecoratorNode.ts b/resources/js/wysiwyg/lexical/yjs/CollabDecoratorNode.ts
new file mode 100644
index 00000000000..3578ed7f504
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/CollabDecoratorNode.ts
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from '.';
+import type {CollabElementNode} from './CollabElementNode';
+import type {DecoratorNode, NodeKey, NodeMap} from 'lexical';
+import type {XmlElement} from 'yjs';
+
+import {$getNodeByKey, $isDecoratorNode} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {syncPropertiesFromLexical, syncPropertiesFromYjs} from './Utils';
+
+export class CollabDecoratorNode {
+  _xmlElem: XmlElement;
+  _key: NodeKey;
+  _parent: CollabElementNode;
+  _type: string;
+
+  constructor(xmlElem: XmlElement, parent: CollabElementNode, type: string) {
+    this._key = '';
+    this._xmlElem = xmlElem;
+    this._parent = parent;
+    this._type = type;
+  }
+
+  getPrevNode(nodeMap: null | NodeMap): null | DecoratorNode<unknown> {
+    if (nodeMap === null) {
+      return null;
+    }
+
+    const node = nodeMap.get(this._key);
+    return $isDecoratorNode(node) ? node : null;
+  }
+
+  getNode(): null | DecoratorNode<unknown> {
+    const node = $getNodeByKey(this._key);
+    return $isDecoratorNode(node) ? node : null;
+  }
+
+  getSharedType(): XmlElement {
+    return this._xmlElem;
+  }
+
+  getType(): string {
+    return this._type;
+  }
+
+  getKey(): NodeKey {
+    return this._key;
+  }
+
+  getSize(): number {
+    return 1;
+  }
+
+  getOffset(): number {
+    const collabElementNode = this._parent;
+    return collabElementNode.getChildOffset(this);
+  }
+
+  syncPropertiesFromLexical(
+    binding: Binding,
+    nextLexicalNode: DecoratorNode<unknown>,
+    prevNodeMap: null | NodeMap,
+  ): void {
+    const prevLexicalNode = this.getPrevNode(prevNodeMap);
+    const xmlElem = this._xmlElem;
+
+    syncPropertiesFromLexical(
+      binding,
+      xmlElem,
+      prevLexicalNode,
+      nextLexicalNode,
+    );
+  }
+
+  syncPropertiesFromYjs(
+    binding: Binding,
+    keysChanged: null | Set<string>,
+  ): void {
+    const lexicalNode = this.getNode();
+    invariant(
+      lexicalNode !== null,
+      'syncPropertiesFromYjs: could not find decorator node',
+    );
+    const xmlElem = this._xmlElem;
+    syncPropertiesFromYjs(binding, xmlElem, lexicalNode, keysChanged);
+  }
+
+  destroy(binding: Binding): void {
+    const collabNodeMap = binding.collabNodeMap;
+    collabNodeMap.delete(this._key);
+  }
+}
+
+export function $createCollabDecoratorNode(
+  xmlElem: XmlElement,
+  parent: CollabElementNode,
+  type: string,
+): CollabDecoratorNode {
+  const collabNode = new CollabDecoratorNode(xmlElem, parent, type);
+  xmlElem._collabNode = collabNode;
+  return collabNode;
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/CollabElementNode.ts b/resources/js/wysiwyg/lexical/yjs/CollabElementNode.ts
new file mode 100644
index 00000000000..b3866043d21
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/CollabElementNode.ts
@@ -0,0 +1,666 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from '.';
+import type {ElementNode, NodeKey, NodeMap} from 'lexical';
+import type {AbstractType, Map as YMap, XmlElement, XmlText} from 'yjs';
+
+import {$createChildrenArray} from '@lexical/offset';
+import {
+  $getNodeByKey,
+  $isDecoratorNode,
+  $isElementNode,
+  $isTextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+
+import {CollabDecoratorNode} from './CollabDecoratorNode';
+import {CollabLineBreakNode} from './CollabLineBreakNode';
+import {CollabTextNode} from './CollabTextNode';
+import {
+  $createCollabNodeFromLexicalNode,
+  $getNodeByKeyOrThrow,
+  $getOrInitCollabNodeFromSharedType,
+  createLexicalNodeFromCollabNode,
+  getPositionFromElementAndOffset,
+  removeFromParent,
+  spliceString,
+  syncPropertiesFromLexical,
+  syncPropertiesFromYjs,
+} from './Utils';
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+export class CollabElementNode {
+  _key: NodeKey;
+  _children: Array<
+    | CollabElementNode
+    | CollabTextNode
+    | CollabDecoratorNode
+    | CollabLineBreakNode
+  >;
+  _xmlText: XmlText;
+  _type: string;
+  _parent: null | CollabElementNode;
+
+  constructor(
+    xmlText: XmlText,
+    parent: null | CollabElementNode,
+    type: string,
+  ) {
+    this._key = '';
+    this._children = [];
+    this._xmlText = xmlText;
+    this._type = type;
+    this._parent = parent;
+  }
+
+  getPrevNode(nodeMap: null | NodeMap): null | ElementNode {
+    if (nodeMap === null) {
+      return null;
+    }
+
+    const node = nodeMap.get(this._key);
+    return $isElementNode(node) ? node : null;
+  }
+
+  getNode(): null | ElementNode {
+    const node = $getNodeByKey(this._key);
+    return $isElementNode(node) ? node : null;
+  }
+
+  getSharedType(): XmlText {
+    return this._xmlText;
+  }
+
+  getType(): string {
+    return this._type;
+  }
+
+  getKey(): NodeKey {
+    return this._key;
+  }
+
+  isEmpty(): boolean {
+    return this._children.length === 0;
+  }
+
+  getSize(): number {
+    return 1;
+  }
+
+  getOffset(): number {
+    const collabElementNode = this._parent;
+    invariant(
+      collabElementNode !== null,
+      'getOffset: could not find collab element node',
+    );
+
+    return collabElementNode.getChildOffset(this);
+  }
+
+  syncPropertiesFromYjs(
+    binding: Binding,
+    keysChanged: null | Set<string>,
+  ): void {
+    const lexicalNode = this.getNode();
+    invariant(
+      lexicalNode !== null,
+      'syncPropertiesFromYjs: could not find element node',
+    );
+    syncPropertiesFromYjs(binding, this._xmlText, lexicalNode, keysChanged);
+  }
+
+  applyChildrenYjsDelta(
+    binding: Binding,
+    deltas: Array<{
+      insert?: string | object | AbstractType<unknown>;
+      delete?: number;
+      retain?: number;
+      attributes?: {
+        [x: string]: unknown;
+      };
+    }>,
+  ): void {
+    const children = this._children;
+    let currIndex = 0;
+
+    for (let i = 0; i < deltas.length; i++) {
+      const delta = deltas[i];
+      const insertDelta = delta.insert;
+      const deleteDelta = delta.delete;
+
+      if (delta.retain != null) {
+        currIndex += delta.retain;
+      } else if (typeof deleteDelta === 'number') {
+        let deletionSize = deleteDelta;
+
+        while (deletionSize > 0) {
+          const {node, nodeIndex, offset, length} =
+            getPositionFromElementAndOffset(this, currIndex, false);
+
+          if (
+            node instanceof CollabElementNode ||
+            node instanceof CollabLineBreakNode ||
+            node instanceof CollabDecoratorNode
+          ) {
+            children.splice(nodeIndex, 1);
+            deletionSize -= 1;
+          } else if (node instanceof CollabTextNode) {
+            const delCount = Math.min(deletionSize, length);
+            const prevCollabNode =
+              nodeIndex !== 0 ? children[nodeIndex - 1] : null;
+            const nodeSize = node.getSize();
+
+            if (
+              offset === 0 &&
+              delCount === 1 &&
+              nodeIndex > 0 &&
+              prevCollabNode instanceof CollabTextNode &&
+              length === nodeSize &&
+              // If the node has no keys, it's been deleted
+              Array.from(node._map.keys()).length === 0
+            ) {
+              // Merge the text node with previous.
+              prevCollabNode._text += node._text;
+              children.splice(nodeIndex, 1);
+            } else if (offset === 0 && delCount === nodeSize) {
+              // The entire thing needs removing
+              children.splice(nodeIndex, 1);
+            } else {
+              node._text = spliceString(node._text, offset, delCount, '');
+            }
+
+            deletionSize -= delCount;
+          } else {
+            // Can occur due to the deletion from the dangling text heuristic below.
+            break;
+          }
+        }
+      } else if (insertDelta != null) {
+        if (typeof insertDelta === 'string') {
+          const {node, offset} = getPositionFromElementAndOffset(
+            this,
+            currIndex,
+            true,
+          );
+
+          if (node instanceof CollabTextNode) {
+            node._text = spliceString(node._text, offset, 0, insertDelta);
+          } else {
+            // TODO: maybe we can improve this by keeping around a redundant
+            // text node map, rather than removing all the text nodes, so there
+            // never can be dangling text.
+
+            // We have a conflict where there was likely a CollabTextNode and
+            // an Lexical TextNode too, but they were removed in a merge. So
+            // let's just ignore the text and trigger a removal for it from our
+            // shared type.
+            this._xmlText.delete(offset, insertDelta.length);
+          }
+
+          currIndex += insertDelta.length;
+        } else {
+          const sharedType = insertDelta;
+          const {nodeIndex} = getPositionFromElementAndOffset(
+            this,
+            currIndex,
+            false,
+          );
+          const collabNode = $getOrInitCollabNodeFromSharedType(
+            binding,
+            sharedType as XmlText | YMap<unknown> | XmlElement,
+            this,
+          );
+          children.splice(nodeIndex, 0, collabNode);
+          currIndex += 1;
+        }
+      } else {
+        throw new Error('Unexpected delta format');
+      }
+    }
+  }
+
+  syncChildrenFromYjs(binding: Binding): void {
+    // Now diff the children of the collab node with that of our existing Lexical node.
+    const lexicalNode = this.getNode();
+    invariant(
+      lexicalNode !== null,
+      'syncChildrenFromYjs: could not find element node',
+    );
+
+    const key = lexicalNode.__key;
+    const prevLexicalChildrenKeys = $createChildrenArray(lexicalNode, null);
+    const nextLexicalChildrenKeys: Array<NodeKey> = [];
+    const lexicalChildrenKeysLength = prevLexicalChildrenKeys.length;
+    const collabChildren = this._children;
+    const collabChildrenLength = collabChildren.length;
+    const collabNodeMap = binding.collabNodeMap;
+    const visitedKeys = new Set();
+    let collabKeys;
+    let writableLexicalNode;
+    let prevIndex = 0;
+    let prevChildNode = null;
+
+    if (collabChildrenLength !== lexicalChildrenKeysLength) {
+      writableLexicalNode = lexicalNode.getWritable();
+    }
+
+    for (let i = 0; i < collabChildrenLength; i++) {
+      const lexicalChildKey = prevLexicalChildrenKeys[prevIndex];
+      const childCollabNode = collabChildren[i];
+      const collabLexicalChildNode = childCollabNode.getNode();
+      const collabKey = childCollabNode._key;
+
+      if (collabLexicalChildNode !== null && lexicalChildKey === collabKey) {
+        const childNeedsUpdating = $isTextNode(collabLexicalChildNode);
+        // Update
+        visitedKeys.add(lexicalChildKey);
+
+        if (childNeedsUpdating) {
+          childCollabNode._key = lexicalChildKey;
+
+          if (childCollabNode instanceof CollabElementNode) {
+            const xmlText = childCollabNode._xmlText;
+            childCollabNode.syncPropertiesFromYjs(binding, null);
+            childCollabNode.applyChildrenYjsDelta(binding, xmlText.toDelta());
+            childCollabNode.syncChildrenFromYjs(binding);
+          } else if (childCollabNode instanceof CollabTextNode) {
+            childCollabNode.syncPropertiesAndTextFromYjs(binding, null);
+          } else if (childCollabNode instanceof CollabDecoratorNode) {
+            childCollabNode.syncPropertiesFromYjs(binding, null);
+          } else if (!(childCollabNode instanceof CollabLineBreakNode)) {
+            invariant(
+              false,
+              'syncChildrenFromYjs: expected text, element, decorator, or linebreak collab node',
+            );
+          }
+        }
+
+        nextLexicalChildrenKeys[i] = lexicalChildKey;
+        prevChildNode = collabLexicalChildNode;
+        prevIndex++;
+      } else {
+        if (collabKeys === undefined) {
+          collabKeys = new Set();
+
+          for (let s = 0; s < collabChildrenLength; s++) {
+            const child = collabChildren[s];
+            const childKey = child._key;
+
+            if (childKey !== '') {
+              collabKeys.add(childKey);
+            }
+          }
+        }
+
+        if (
+          collabLexicalChildNode !== null &&
+          lexicalChildKey !== undefined &&
+          !collabKeys.has(lexicalChildKey)
+        ) {
+          const nodeToRemove = $getNodeByKeyOrThrow(lexicalChildKey);
+          removeFromParent(nodeToRemove);
+          i--;
+          prevIndex++;
+          continue;
+        }
+
+        writableLexicalNode = lexicalNode.getWritable();
+        // Create/Replace
+        const lexicalChildNode = createLexicalNodeFromCollabNode(
+          binding,
+          childCollabNode,
+          key,
+        );
+        const childKey = lexicalChildNode.__key;
+        collabNodeMap.set(childKey, childCollabNode);
+        nextLexicalChildrenKeys[i] = childKey;
+        if (prevChildNode === null) {
+          const nextSibling = writableLexicalNode.getFirstChild();
+          writableLexicalNode.__first = childKey;
+          if (nextSibling !== null) {
+            const writableNextSibling = nextSibling.getWritable();
+            writableNextSibling.__prev = childKey;
+            lexicalChildNode.__next = writableNextSibling.__key;
+          }
+        } else {
+          const writablePrevChildNode = prevChildNode.getWritable();
+          const nextSibling = prevChildNode.getNextSibling();
+          writablePrevChildNode.__next = childKey;
+          lexicalChildNode.__prev = prevChildNode.__key;
+          if (nextSibling !== null) {
+            const writableNextSibling = nextSibling.getWritable();
+            writableNextSibling.__prev = childKey;
+            lexicalChildNode.__next = writableNextSibling.__key;
+          }
+        }
+        if (i === collabChildrenLength - 1) {
+          writableLexicalNode.__last = childKey;
+        }
+        writableLexicalNode.__size++;
+        prevChildNode = lexicalChildNode;
+      }
+    }
+
+    for (let i = 0; i < lexicalChildrenKeysLength; i++) {
+      const lexicalChildKey = prevLexicalChildrenKeys[i];
+
+      if (!visitedKeys.has(lexicalChildKey)) {
+        // Remove
+        const lexicalChildNode = $getNodeByKeyOrThrow(lexicalChildKey);
+        const collabNode = binding.collabNodeMap.get(lexicalChildKey);
+
+        if (collabNode !== undefined) {
+          collabNode.destroy(binding);
+        }
+        removeFromParent(lexicalChildNode);
+      }
+    }
+  }
+
+  syncPropertiesFromLexical(
+    binding: Binding,
+    nextLexicalNode: ElementNode,
+    prevNodeMap: null | NodeMap,
+  ): void {
+    syncPropertiesFromLexical(
+      binding,
+      this._xmlText,
+      this.getPrevNode(prevNodeMap),
+      nextLexicalNode,
+    );
+  }
+
+  _syncChildFromLexical(
+    binding: Binding,
+    index: number,
+    key: NodeKey,
+    prevNodeMap: null | NodeMap,
+    dirtyElements: null | Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+    dirtyLeaves: null | Set<NodeKey>,
+  ): void {
+    const childCollabNode = this._children[index];
+    // Update
+    const nextChildNode = $getNodeByKeyOrThrow(key);
+
+    if (
+      childCollabNode instanceof CollabElementNode &&
+      $isElementNode(nextChildNode)
+    ) {
+      childCollabNode.syncPropertiesFromLexical(
+        binding,
+        nextChildNode,
+        prevNodeMap,
+      );
+      childCollabNode.syncChildrenFromLexical(
+        binding,
+        nextChildNode,
+        prevNodeMap,
+        dirtyElements,
+        dirtyLeaves,
+      );
+    } else if (
+      childCollabNode instanceof CollabTextNode &&
+      $isTextNode(nextChildNode)
+    ) {
+      childCollabNode.syncPropertiesAndTextFromLexical(
+        binding,
+        nextChildNode,
+        prevNodeMap,
+      );
+    } else if (
+      childCollabNode instanceof CollabDecoratorNode &&
+      $isDecoratorNode(nextChildNode)
+    ) {
+      childCollabNode.syncPropertiesFromLexical(
+        binding,
+        nextChildNode,
+        prevNodeMap,
+      );
+    }
+  }
+
+  syncChildrenFromLexical(
+    binding: Binding,
+    nextLexicalNode: ElementNode,
+    prevNodeMap: null | NodeMap,
+    dirtyElements: null | Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+    dirtyLeaves: null | Set<NodeKey>,
+  ): void {
+    const prevLexicalNode = this.getPrevNode(prevNodeMap);
+    const prevChildren =
+      prevLexicalNode === null
+        ? []
+        : $createChildrenArray(prevLexicalNode, prevNodeMap);
+    const nextChildren = $createChildrenArray(nextLexicalNode, null);
+    const prevEndIndex = prevChildren.length - 1;
+    const nextEndIndex = nextChildren.length - 1;
+    const collabNodeMap = binding.collabNodeMap;
+    let prevChildrenSet: Set<NodeKey> | undefined;
+    let nextChildrenSet: Set<NodeKey> | undefined;
+    let prevIndex = 0;
+    let nextIndex = 0;
+
+    while (prevIndex <= prevEndIndex && nextIndex <= nextEndIndex) {
+      const prevKey = prevChildren[prevIndex];
+      const nextKey = nextChildren[nextIndex];
+
+      if (prevKey === nextKey) {
+        // Nove move, create or remove
+        this._syncChildFromLexical(
+          binding,
+          nextIndex,
+          nextKey,
+          prevNodeMap,
+          dirtyElements,
+          dirtyLeaves,
+        );
+
+        prevIndex++;
+        nextIndex++;
+      } else {
+        if (prevChildrenSet === undefined) {
+          prevChildrenSet = new Set(prevChildren);
+        }
+
+        if (nextChildrenSet === undefined) {
+          nextChildrenSet = new Set(nextChildren);
+        }
+
+        const nextHasPrevKey = nextChildrenSet.has(prevKey);
+        const prevHasNextKey = prevChildrenSet.has(nextKey);
+
+        if (!nextHasPrevKey) {
+          // Remove
+          this.splice(binding, nextIndex, 1);
+          prevIndex++;
+        } else {
+          // Create or replace
+          const nextChildNode = $getNodeByKeyOrThrow(nextKey);
+          const collabNode = $createCollabNodeFromLexicalNode(
+            binding,
+            nextChildNode,
+            this,
+          );
+          collabNodeMap.set(nextKey, collabNode);
+
+          if (prevHasNextKey) {
+            this.splice(binding, nextIndex, 1, collabNode);
+            prevIndex++;
+            nextIndex++;
+          } else {
+            this.splice(binding, nextIndex, 0, collabNode);
+            nextIndex++;
+          }
+        }
+      }
+    }
+
+    const appendNewChildren = prevIndex > prevEndIndex;
+    const removeOldChildren = nextIndex > nextEndIndex;
+
+    if (appendNewChildren && !removeOldChildren) {
+      for (; nextIndex <= nextEndIndex; ++nextIndex) {
+        const key = nextChildren[nextIndex];
+        const nextChildNode = $getNodeByKeyOrThrow(key);
+        const collabNode = $createCollabNodeFromLexicalNode(
+          binding,
+          nextChildNode,
+          this,
+        );
+        this.append(collabNode);
+        collabNodeMap.set(key, collabNode);
+      }
+    } else if (removeOldChildren && !appendNewChildren) {
+      for (let i = this._children.length - 1; i >= nextIndex; i--) {
+        this.splice(binding, i, 1);
+      }
+    }
+  }
+
+  append(
+    collabNode:
+      | CollabElementNode
+      | CollabDecoratorNode
+      | CollabTextNode
+      | CollabLineBreakNode,
+  ): void {
+    const xmlText = this._xmlText;
+    const children = this._children;
+    const lastChild = children[children.length - 1];
+    const offset =
+      lastChild !== undefined ? lastChild.getOffset() + lastChild.getSize() : 0;
+
+    if (collabNode instanceof CollabElementNode) {
+      xmlText.insertEmbed(offset, collabNode._xmlText);
+    } else if (collabNode instanceof CollabTextNode) {
+      const map = collabNode._map;
+
+      if (map.parent === null) {
+        xmlText.insertEmbed(offset, map);
+      }
+
+      xmlText.insert(offset + 1, collabNode._text);
+    } else if (collabNode instanceof CollabLineBreakNode) {
+      xmlText.insertEmbed(offset, collabNode._map);
+    } else if (collabNode instanceof CollabDecoratorNode) {
+      xmlText.insertEmbed(offset, collabNode._xmlElem);
+    }
+
+    this._children.push(collabNode);
+  }
+
+  splice(
+    binding: Binding,
+    index: number,
+    delCount: number,
+    collabNode?:
+      | CollabElementNode
+      | CollabDecoratorNode
+      | CollabTextNode
+      | CollabLineBreakNode,
+  ): void {
+    const children = this._children;
+    const child = children[index];
+
+    if (child === undefined) {
+      invariant(
+        collabNode !== undefined,
+        'splice: could not find collab element node',
+      );
+      this.append(collabNode);
+      return;
+    }
+
+    const offset = child.getOffset();
+    invariant(offset !== -1, 'splice: expected offset to be greater than zero');
+
+    const xmlText = this._xmlText;
+
+    if (delCount !== 0) {
+      // What if we delete many nodes, don't we need to get all their
+      // sizes?
+      xmlText.delete(offset, child.getSize());
+    }
+
+    if (collabNode instanceof CollabElementNode) {
+      xmlText.insertEmbed(offset, collabNode._xmlText);
+    } else if (collabNode instanceof CollabTextNode) {
+      const map = collabNode._map;
+
+      if (map.parent === null) {
+        xmlText.insertEmbed(offset, map);
+      }
+
+      xmlText.insert(offset + 1, collabNode._text);
+    } else if (collabNode instanceof CollabLineBreakNode) {
+      xmlText.insertEmbed(offset, collabNode._map);
+    } else if (collabNode instanceof CollabDecoratorNode) {
+      xmlText.insertEmbed(offset, collabNode._xmlElem);
+    }
+
+    if (delCount !== 0) {
+      const childrenToDelete = children.slice(index, index + delCount);
+
+      for (let i = 0; i < childrenToDelete.length; i++) {
+        childrenToDelete[i].destroy(binding);
+      }
+    }
+
+    if (collabNode !== undefined) {
+      children.splice(index, delCount, collabNode);
+    } else {
+      children.splice(index, delCount);
+    }
+  }
+
+  getChildOffset(
+    collabNode:
+      | CollabElementNode
+      | CollabTextNode
+      | CollabDecoratorNode
+      | CollabLineBreakNode,
+  ): number {
+    let offset = 0;
+    const children = this._children;
+
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+
+      if (child === collabNode) {
+        return offset;
+      }
+
+      offset += child.getSize();
+    }
+
+    return -1;
+  }
+
+  destroy(binding: Binding): void {
+    const collabNodeMap = binding.collabNodeMap;
+    const children = this._children;
+
+    for (let i = 0; i < children.length; i++) {
+      children[i].destroy(binding);
+    }
+
+    collabNodeMap.delete(this._key);
+  }
+}
+
+export function $createCollabElementNode(
+  xmlText: XmlText,
+  parent: null | CollabElementNode,
+  type: string,
+): CollabElementNode {
+  const collabNode = new CollabElementNode(xmlText, parent, type);
+  xmlText._collabNode = collabNode;
+  return collabNode;
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/CollabLineBreakNode.ts b/resources/js/wysiwyg/lexical/yjs/CollabLineBreakNode.ts
new file mode 100644
index 00000000000..6d1267f8ed9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/CollabLineBreakNode.ts
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from '.';
+import type {CollabElementNode} from './CollabElementNode';
+import type {LineBreakNode, NodeKey} from 'lexical';
+import type {Map as YMap} from 'yjs';
+
+import {$getNodeByKey, $isLineBreakNode} from 'lexical';
+
+export class CollabLineBreakNode {
+  _map: YMap<unknown>;
+  _key: NodeKey;
+  _parent: CollabElementNode;
+  _type: 'linebreak';
+
+  constructor(map: YMap<unknown>, parent: CollabElementNode) {
+    this._key = '';
+    this._map = map;
+    this._parent = parent;
+    this._type = 'linebreak';
+  }
+
+  getNode(): null | LineBreakNode {
+    const node = $getNodeByKey(this._key);
+    return $isLineBreakNode(node) ? node : null;
+  }
+
+  getKey(): NodeKey {
+    return this._key;
+  }
+
+  getSharedType(): YMap<unknown> {
+    return this._map;
+  }
+
+  getType(): string {
+    return this._type;
+  }
+
+  getSize(): number {
+    return 1;
+  }
+
+  getOffset(): number {
+    const collabElementNode = this._parent;
+    return collabElementNode.getChildOffset(this);
+  }
+
+  destroy(binding: Binding): void {
+    const collabNodeMap = binding.collabNodeMap;
+    collabNodeMap.delete(this._key);
+  }
+}
+
+export function $createCollabLineBreakNode(
+  map: YMap<unknown>,
+  parent: CollabElementNode,
+): CollabLineBreakNode {
+  const collabNode = new CollabLineBreakNode(map, parent);
+  map._collabNode = collabNode;
+  return collabNode;
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/CollabTextNode.ts b/resources/js/wysiwyg/lexical/yjs/CollabTextNode.ts
new file mode 100644
index 00000000000..86caf91f2c9
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/CollabTextNode.ts
@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from '.';
+import type {CollabElementNode} from './CollabElementNode';
+import type {NodeKey, NodeMap, TextNode} from 'lexical';
+import type {Map as YMap} from 'yjs';
+
+import {
+  $getNodeByKey,
+  $getSelection,
+  $isRangeSelection,
+  $isTextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import simpleDiffWithCursor from 'lexical/shared/simpleDiffWithCursor';
+
+import {syncPropertiesFromLexical, syncPropertiesFromYjs} from './Utils';
+
+function $diffTextContentAndApplyDelta(
+  collabNode: CollabTextNode,
+  key: NodeKey,
+  prevText: string,
+  nextText: string,
+): void {
+  const selection = $getSelection();
+  let cursorOffset = nextText.length;
+
+  if ($isRangeSelection(selection) && selection.isCollapsed()) {
+    const anchor = selection.anchor;
+
+    if (anchor.key === key) {
+      cursorOffset = anchor.offset;
+    }
+  }
+
+  const diff = simpleDiffWithCursor(prevText, nextText, cursorOffset);
+  collabNode.spliceText(diff.index, diff.remove, diff.insert);
+}
+
+export class CollabTextNode {
+  _map: YMap<unknown>;
+  _key: NodeKey;
+  _parent: CollabElementNode;
+  _text: string;
+  _type: string;
+  _normalized: boolean;
+
+  constructor(
+    map: YMap<unknown>,
+    text: string,
+    parent: CollabElementNode,
+    type: string,
+  ) {
+    this._key = '';
+    this._map = map;
+    this._parent = parent;
+    this._text = text;
+    this._type = type;
+    this._normalized = false;
+  }
+
+  getPrevNode(nodeMap: null | NodeMap): null | TextNode {
+    if (nodeMap === null) {
+      return null;
+    }
+
+    const node = nodeMap.get(this._key);
+    return $isTextNode(node) ? node : null;
+  }
+
+  getNode(): null | TextNode {
+    const node = $getNodeByKey(this._key);
+    return $isTextNode(node) ? node : null;
+  }
+
+  getSharedType(): YMap<unknown> {
+    return this._map;
+  }
+
+  getType(): string {
+    return this._type;
+  }
+
+  getKey(): NodeKey {
+    return this._key;
+  }
+
+  getSize(): number {
+    return this._text.length + (this._normalized ? 0 : 1);
+  }
+
+  getOffset(): number {
+    const collabElementNode = this._parent;
+    return collabElementNode.getChildOffset(this);
+  }
+
+  spliceText(index: number, delCount: number, newText: string): void {
+    const collabElementNode = this._parent;
+    const xmlText = collabElementNode._xmlText;
+    const offset = this.getOffset() + 1 + index;
+
+    if (delCount !== 0) {
+      xmlText.delete(offset, delCount);
+    }
+
+    if (newText !== '') {
+      xmlText.insert(offset, newText);
+    }
+  }
+
+  syncPropertiesAndTextFromLexical(
+    binding: Binding,
+    nextLexicalNode: TextNode,
+    prevNodeMap: null | NodeMap,
+  ): void {
+    const prevLexicalNode = this.getPrevNode(prevNodeMap);
+    const nextText = nextLexicalNode.__text;
+
+    syncPropertiesFromLexical(
+      binding,
+      this._map,
+      prevLexicalNode,
+      nextLexicalNode,
+    );
+
+    if (prevLexicalNode !== null) {
+      const prevText = prevLexicalNode.__text;
+
+      if (prevText !== nextText) {
+        const key = nextLexicalNode.__key;
+        $diffTextContentAndApplyDelta(this, key, prevText, nextText);
+        this._text = nextText;
+      }
+    }
+  }
+
+  syncPropertiesAndTextFromYjs(
+    binding: Binding,
+    keysChanged: null | Set<string>,
+  ): void {
+    const lexicalNode = this.getNode();
+    invariant(
+      lexicalNode !== null,
+      'syncPropertiesAndTextFromYjs: could not find decorator node',
+    );
+
+    syncPropertiesFromYjs(binding, this._map, lexicalNode, keysChanged);
+
+    const collabText = this._text;
+
+    if (lexicalNode.__text !== collabText) {
+      const writable = lexicalNode.getWritable();
+      writable.__text = collabText;
+    }
+  }
+
+  destroy(binding: Binding): void {
+    const collabNodeMap = binding.collabNodeMap;
+    collabNodeMap.delete(this._key);
+  }
+}
+
+export function $createCollabTextNode(
+  map: YMap<unknown>,
+  text: string,
+  parent: CollabElementNode,
+  type: string,
+): CollabTextNode {
+  const collabNode = new CollabTextNode(map, text, parent, type);
+  map._collabNode = collabNode;
+  return collabNode;
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/SyncCursors.ts b/resources/js/wysiwyg/lexical/yjs/SyncCursors.ts
new file mode 100644
index 00000000000..721fbb68f44
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/SyncCursors.ts
@@ -0,0 +1,536 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from './Bindings';
+import type {BaseSelection, NodeKey, NodeMap, Point} from 'lexical';
+import type {AbsolutePosition, RelativePosition} from 'yjs';
+
+import {createDOMRange, createRectsFromDOMRange} from '@lexical/selection';
+import {
+  $getNodeByKey,
+  $getSelection,
+  $isElementNode,
+  $isLineBreakNode,
+  $isRangeSelection,
+  $isTextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import {
+  compareRelativePositions,
+  createAbsolutePositionFromRelativePosition,
+  createRelativePositionFromTypeIndex,
+} from 'yjs';
+
+import {Provider} from '.';
+import {CollabDecoratorNode} from './CollabDecoratorNode';
+import {CollabElementNode} from './CollabElementNode';
+import {CollabLineBreakNode} from './CollabLineBreakNode';
+import {CollabTextNode} from './CollabTextNode';
+import {getPositionFromElementAndOffset} from './Utils';
+
+export type CursorSelection = {
+  anchor: {
+    key: NodeKey;
+    offset: number;
+  };
+  caret: HTMLElement;
+  color: string;
+  focus: {
+    key: NodeKey;
+    offset: number;
+  };
+  name: HTMLSpanElement;
+  selections: Array<HTMLElement>;
+};
+export type Cursor = {
+  color: string;
+  name: string;
+  selection: null | CursorSelection;
+};
+
+function createRelativePosition(
+  point: Point,
+  binding: Binding,
+): null | RelativePosition {
+  const collabNodeMap = binding.collabNodeMap;
+  const collabNode = collabNodeMap.get(point.key);
+
+  if (collabNode === undefined) {
+    return null;
+  }
+
+  let offset = point.offset;
+  let sharedType = collabNode.getSharedType();
+
+  if (collabNode instanceof CollabTextNode) {
+    sharedType = collabNode._parent._xmlText;
+    const currentOffset = collabNode.getOffset();
+
+    if (currentOffset === -1) {
+      return null;
+    }
+
+    offset = currentOffset + 1 + offset;
+  } else if (
+    collabNode instanceof CollabElementNode &&
+    point.type === 'element'
+  ) {
+    const parent = point.getNode();
+    invariant($isElementNode(parent), 'Element point must be an element node');
+    let accumulatedOffset = 0;
+    let i = 0;
+    let node = parent.getFirstChild();
+    while (node !== null && i++ < offset) {
+      if ($isTextNode(node)) {
+        accumulatedOffset += node.getTextContentSize() + 1;
+      } else {
+        accumulatedOffset++;
+      }
+      node = node.getNextSibling();
+    }
+    offset = accumulatedOffset;
+  }
+
+  return createRelativePositionFromTypeIndex(sharedType, offset);
+}
+
+function createAbsolutePosition(
+  relativePosition: RelativePosition,
+  binding: Binding,
+): AbsolutePosition | null {
+  return createAbsolutePositionFromRelativePosition(
+    relativePosition,
+    binding.doc,
+  );
+}
+
+function shouldUpdatePosition(
+  currentPos: RelativePosition | null | undefined,
+  pos: RelativePosition | null | undefined,
+): boolean {
+  if (currentPos == null) {
+    if (pos != null) {
+      return true;
+    }
+  } else if (pos == null || !compareRelativePositions(currentPos, pos)) {
+    return true;
+  }
+
+  return false;
+}
+
+function createCursor(name: string, color: string): Cursor {
+  return {
+    color: color,
+    name: name,
+    selection: null,
+  };
+}
+
+function destroySelection(binding: Binding, selection: CursorSelection) {
+  const cursorsContainer = binding.cursorsContainer;
+
+  if (cursorsContainer !== null) {
+    const selections = selection.selections;
+    const selectionsLength = selections.length;
+
+    for (let i = 0; i < selectionsLength; i++) {
+      cursorsContainer.removeChild(selections[i]);
+    }
+  }
+}
+
+function destroyCursor(binding: Binding, cursor: Cursor) {
+  const selection = cursor.selection;
+
+  if (selection !== null) {
+    destroySelection(binding, selection);
+  }
+}
+
+function createCursorSelection(
+  cursor: Cursor,
+  anchorKey: NodeKey,
+  anchorOffset: number,
+  focusKey: NodeKey,
+  focusOffset: number,
+): CursorSelection {
+  const color = cursor.color;
+  const caret = document.createElement('span');
+  caret.style.cssText = `position:absolute;top:0;bottom:0;right:-1px;width:1px;background-color:${color};z-index:10;`;
+  const name = document.createElement('span');
+  name.textContent = cursor.name;
+  name.style.cssText = `position:absolute;left:-2px;top:-16px;background-color:${color};color:#fff;line-height:12px;font-size:12px;padding:2px;font-family:Arial;font-weight:bold;white-space:nowrap;`;
+  caret.appendChild(name);
+  return {
+    anchor: {
+      key: anchorKey,
+      offset: anchorOffset,
+    },
+    caret,
+    color,
+    focus: {
+      key: focusKey,
+      offset: focusOffset,
+    },
+    name,
+    selections: [],
+  };
+}
+
+function updateCursor(
+  binding: Binding,
+  cursor: Cursor,
+  nextSelection: null | CursorSelection,
+  nodeMap: NodeMap,
+): void {
+  const editor = binding.editor;
+  const rootElement = editor.getRootElement();
+  const cursorsContainer = binding.cursorsContainer;
+
+  if (cursorsContainer === null || rootElement === null) {
+    return;
+  }
+
+  const cursorsContainerOffsetParent = cursorsContainer.offsetParent;
+  if (cursorsContainerOffsetParent === null) {
+    return;
+  }
+
+  const containerRect = cursorsContainerOffsetParent.getBoundingClientRect();
+  const prevSelection = cursor.selection;
+
+  if (nextSelection === null) {
+    if (prevSelection === null) {
+      return;
+    } else {
+      cursor.selection = null;
+      destroySelection(binding, prevSelection);
+      return;
+    }
+  } else {
+    cursor.selection = nextSelection;
+  }
+
+  const caret = nextSelection.caret;
+  const color = nextSelection.color;
+  const selections = nextSelection.selections;
+  const anchor = nextSelection.anchor;
+  const focus = nextSelection.focus;
+  const anchorKey = anchor.key;
+  const focusKey = focus.key;
+  const anchorNode = nodeMap.get(anchorKey);
+  const focusNode = nodeMap.get(focusKey);
+
+  if (anchorNode == null || focusNode == null) {
+    return;
+  }
+  let selectionRects: Array<DOMRect>;
+
+  // In the case of a collapsed selection on a linebreak, we need
+  // to improvise as the browser will return nothing here as <br>
+  // apparantly take up no visual space :/
+  // This won't work in all cases, but it's better than just showing
+  // nothing all the time.
+  if (anchorNode === focusNode && $isLineBreakNode(anchorNode)) {
+    const brRect = (
+      editor.getElementByKey(anchorKey) as HTMLElement
+    ).getBoundingClientRect();
+    selectionRects = [brRect];
+  } else {
+    const range = createDOMRange(
+      editor,
+      anchorNode,
+      anchor.offset,
+      focusNode,
+      focus.offset,
+    );
+
+    if (range === null) {
+      return;
+    }
+    selectionRects = createRectsFromDOMRange(editor, range);
+  }
+
+  const selectionsLength = selections.length;
+  const selectionRectsLength = selectionRects.length;
+
+  for (let i = 0; i < selectionRectsLength; i++) {
+    const selectionRect = selectionRects[i];
+    let selection = selections[i];
+
+    if (selection === undefined) {
+      selection = document.createElement('span');
+      selections[i] = selection;
+      const selectionBg = document.createElement('span');
+      selection.appendChild(selectionBg);
+      cursorsContainer.appendChild(selection);
+    }
+
+    const top = selectionRect.top - containerRect.top;
+    const left = selectionRect.left - containerRect.left;
+    const style = `position:absolute;top:${top}px;left:${left}px;height:${selectionRect.height}px;width:${selectionRect.width}px;pointer-events:none;z-index:5;`;
+    selection.style.cssText = style;
+
+    (
+      selection.firstChild as HTMLSpanElement
+    ).style.cssText = `${style}left:0;top:0;background-color:${color};opacity:0.3;`;
+
+    if (i === selectionRectsLength - 1) {
+      if (caret.parentNode !== selection) {
+        selection.appendChild(caret);
+      }
+    }
+  }
+
+  for (let i = selectionsLength - 1; i >= selectionRectsLength; i--) {
+    const selection = selections[i];
+    cursorsContainer.removeChild(selection);
+    selections.pop();
+  }
+}
+
+export function $syncLocalCursorPosition(
+  binding: Binding,
+  provider: Provider,
+): void {
+  const awareness = provider.awareness;
+  const localState = awareness.getLocalState();
+
+  if (localState === null) {
+    return;
+  }
+
+  const anchorPos = localState.anchorPos;
+  const focusPos = localState.focusPos;
+
+  if (anchorPos !== null && focusPos !== null) {
+    const anchorAbsPos = createAbsolutePosition(anchorPos, binding);
+    const focusAbsPos = createAbsolutePosition(focusPos, binding);
+
+    if (anchorAbsPos !== null && focusAbsPos !== null) {
+      const [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(
+        anchorAbsPos.type,
+        anchorAbsPos.index,
+      );
+      const [focusCollabNode, focusOffset] = getCollabNodeAndOffset(
+        focusAbsPos.type,
+        focusAbsPos.index,
+      );
+
+      if (anchorCollabNode !== null && focusCollabNode !== null) {
+        const anchorKey = anchorCollabNode.getKey();
+        const focusKey = focusCollabNode.getKey();
+
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+        const anchor = selection.anchor;
+        const focus = selection.focus;
+
+        $setPoint(anchor, anchorKey, anchorOffset);
+        $setPoint(focus, focusKey, focusOffset);
+      }
+    }
+  }
+}
+
+function $setPoint(point: Point, key: NodeKey, offset: number): void {
+  if (point.key !== key || point.offset !== offset) {
+    let anchorNode = $getNodeByKey(key);
+    if (
+      anchorNode !== null &&
+      !$isElementNode(anchorNode) &&
+      !$isTextNode(anchorNode)
+    ) {
+      const parent = anchorNode.getParentOrThrow();
+      key = parent.getKey();
+      offset = anchorNode.getIndexWithinParent();
+      anchorNode = parent;
+    }
+    point.set(key, offset, $isElementNode(anchorNode) ? 'element' : 'text');
+  }
+}
+
+function getCollabNodeAndOffset(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  sharedType: any,
+  offset: number,
+): [
+  (
+    | null
+    | CollabDecoratorNode
+    | CollabElementNode
+    | CollabTextNode
+    | CollabLineBreakNode
+  ),
+  number,
+] {
+  const collabNode = sharedType._collabNode;
+
+  if (collabNode === undefined) {
+    return [null, 0];
+  }
+
+  if (collabNode instanceof CollabElementNode) {
+    const {node, offset: collabNodeOffset} = getPositionFromElementAndOffset(
+      collabNode,
+      offset,
+      true,
+    );
+
+    if (node === null) {
+      return [collabNode, 0];
+    } else {
+      return [node, collabNodeOffset];
+    }
+  }
+
+  return [null, 0];
+}
+
+export function syncCursorPositions(
+  binding: Binding,
+  provider: Provider,
+): void {
+  const awarenessStates = Array.from(provider.awareness.getStates());
+  const localClientID = binding.clientID;
+  const cursors = binding.cursors;
+  const editor = binding.editor;
+  const nodeMap = editor._editorState._nodeMap;
+  const visitedClientIDs = new Set();
+
+  for (let i = 0; i < awarenessStates.length; i++) {
+    const awarenessState = awarenessStates[i];
+    const [clientID, awareness] = awarenessState;
+
+    if (clientID !== localClientID) {
+      visitedClientIDs.add(clientID);
+      const {anchorPos, focusPos, name, color, focusing} = awareness;
+      let selection = null;
+
+      let cursor = cursors.get(clientID);
+
+      if (cursor === undefined) {
+        cursor = createCursor(name, color);
+        cursors.set(clientID, cursor);
+      }
+
+      if (anchorPos !== null && focusPos !== null && focusing) {
+        const anchorAbsPos = createAbsolutePosition(anchorPos, binding);
+        const focusAbsPos = createAbsolutePosition(focusPos, binding);
+
+        if (anchorAbsPos !== null && focusAbsPos !== null) {
+          const [anchorCollabNode, anchorOffset] = getCollabNodeAndOffset(
+            anchorAbsPos.type,
+            anchorAbsPos.index,
+          );
+          const [focusCollabNode, focusOffset] = getCollabNodeAndOffset(
+            focusAbsPos.type,
+            focusAbsPos.index,
+          );
+
+          if (anchorCollabNode !== null && focusCollabNode !== null) {
+            const anchorKey = anchorCollabNode.getKey();
+            const focusKey = focusCollabNode.getKey();
+            selection = cursor.selection;
+
+            if (selection === null) {
+              selection = createCursorSelection(
+                cursor,
+                anchorKey,
+                anchorOffset,
+                focusKey,
+                focusOffset,
+              );
+            } else {
+              const anchor = selection.anchor;
+              const focus = selection.focus;
+              anchor.key = anchorKey;
+              anchor.offset = anchorOffset;
+              focus.key = focusKey;
+              focus.offset = focusOffset;
+            }
+          }
+        }
+      }
+
+      updateCursor(binding, cursor, selection, nodeMap);
+    }
+  }
+
+  const allClientIDs = Array.from(cursors.keys());
+
+  for (let i = 0; i < allClientIDs.length; i++) {
+    const clientID = allClientIDs[i];
+
+    if (!visitedClientIDs.has(clientID)) {
+      const cursor = cursors.get(clientID);
+
+      if (cursor !== undefined) {
+        destroyCursor(binding, cursor);
+        cursors.delete(clientID);
+      }
+    }
+  }
+}
+
+export function syncLexicalSelectionToYjs(
+  binding: Binding,
+  provider: Provider,
+  prevSelection: null | BaseSelection,
+  nextSelection: null | BaseSelection,
+): void {
+  const awareness = provider.awareness;
+  const localState = awareness.getLocalState();
+
+  if (localState === null) {
+    return;
+  }
+
+  const {
+    anchorPos: currentAnchorPos,
+    focusPos: currentFocusPos,
+    name,
+    color,
+    focusing,
+    awarenessData,
+  } = localState;
+  let anchorPos = null;
+  let focusPos = null;
+
+  if (
+    nextSelection === null ||
+    (currentAnchorPos !== null && !nextSelection.is(prevSelection))
+  ) {
+    if (prevSelection === null) {
+      return;
+    }
+  }
+
+  if ($isRangeSelection(nextSelection)) {
+    anchorPos = createRelativePosition(nextSelection.anchor, binding);
+    focusPos = createRelativePosition(nextSelection.focus, binding);
+  }
+
+  if (
+    shouldUpdatePosition(currentAnchorPos, anchorPos) ||
+    shouldUpdatePosition(currentFocusPos, focusPos)
+  ) {
+    awareness.setLocalState({
+      anchorPos,
+      awarenessData,
+      color,
+      focusPos,
+      focusing,
+      name,
+    });
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/SyncEditorStates.ts b/resources/js/wysiwyg/lexical/yjs/SyncEditorStates.ts
new file mode 100644
index 00000000000..c2dd077481e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/SyncEditorStates.ts
@@ -0,0 +1,247 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {EditorState, NodeKey} from 'lexical';
+
+import {
+  $createParagraphNode,
+  $getNodeByKey,
+  $getRoot,
+  $getSelection,
+  $isRangeSelection,
+  $isTextNode,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import {Text as YText, YEvent, YMapEvent, YTextEvent, YXmlEvent} from 'yjs';
+
+import {Binding, Provider} from '.';
+import {CollabDecoratorNode} from './CollabDecoratorNode';
+import {CollabElementNode} from './CollabElementNode';
+import {CollabTextNode} from './CollabTextNode';
+import {
+  $syncLocalCursorPosition,
+  syncCursorPositions,
+  syncLexicalSelectionToYjs,
+} from './SyncCursors';
+import {
+  $getOrInitCollabNodeFromSharedType,
+  $moveSelectionToPreviousNode,
+  doesSelectionNeedRecovering,
+  syncWithTransaction,
+} from './Utils';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function $syncEvent(binding: Binding, event: any): void {
+  const {target} = event;
+  const collabNode = $getOrInitCollabNodeFromSharedType(binding, target);
+
+  if (collabNode instanceof CollabElementNode && event instanceof YTextEvent) {
+    // @ts-expect-error We need to access the private property of the class
+    const {keysChanged, childListChanged, delta} = event;
+
+    // Update
+    if (keysChanged.size > 0) {
+      collabNode.syncPropertiesFromYjs(binding, keysChanged);
+    }
+
+    if (childListChanged) {
+      collabNode.applyChildrenYjsDelta(binding, delta);
+      collabNode.syncChildrenFromYjs(binding);
+    }
+  } else if (
+    collabNode instanceof CollabTextNode &&
+    event instanceof YMapEvent
+  ) {
+    const {keysChanged} = event;
+
+    // Update
+    if (keysChanged.size > 0) {
+      collabNode.syncPropertiesAndTextFromYjs(binding, keysChanged);
+    }
+  } else if (
+    collabNode instanceof CollabDecoratorNode &&
+    event instanceof YXmlEvent
+  ) {
+    const {attributesChanged} = event;
+
+    // Update
+    if (attributesChanged.size > 0) {
+      collabNode.syncPropertiesFromYjs(binding, attributesChanged);
+    }
+  } else {
+    invariant(false, 'Expected text, element, or decorator event');
+  }
+}
+
+export function syncYjsChangesToLexical(
+  binding: Binding,
+  provider: Provider,
+  events: Array<YEvent<YText>>,
+  isFromUndoManger: boolean,
+): void {
+  const editor = binding.editor;
+  const currentEditorState = editor._editorState;
+
+  // This line precompute the delta before editor update. The reason is
+  // delta is computed when it is accessed. Note that this can only be
+  // safely computed during the event call. If it is accessed after event
+  // call it might result in unexpected behavior.
+  // https://github.com/yjs/yjs/blob/00ef472d68545cb260abd35c2de4b3b78719c9e4/src/utils/YEvent.js#L132
+  events.forEach((event) => event.delta);
+
+  editor.update(
+    () => {
+      for (let i = 0; i < events.length; i++) {
+        const event = events[i];
+        $syncEvent(binding, event);
+      }
+
+      const selection = $getSelection();
+
+      if ($isRangeSelection(selection)) {
+        if (doesSelectionNeedRecovering(selection)) {
+          const prevSelection = currentEditorState._selection;
+
+          if ($isRangeSelection(prevSelection)) {
+            $syncLocalCursorPosition(binding, provider);
+            if (doesSelectionNeedRecovering(selection)) {
+              // If the selected node is deleted, move the selection to the previous or parent node.
+              const anchorNodeKey = selection.anchor.key;
+              $moveSelectionToPreviousNode(anchorNodeKey, currentEditorState);
+            }
+          }
+
+          syncLexicalSelectionToYjs(
+            binding,
+            provider,
+            prevSelection,
+            $getSelection(),
+          );
+        } else {
+          $syncLocalCursorPosition(binding, provider);
+        }
+      }
+    },
+    {
+      onUpdate: () => {
+        syncCursorPositions(binding, provider);
+        // If there was a collision on the top level paragraph
+        // we need to re-add a paragraph. To ensure this insertion properly syncs with other clients,
+        // it must be placed outside of the update block above that has tags 'collaboration' or 'historic'.
+        editor.update(() => {
+          if ($getRoot().getChildrenSize() === 0) {
+            $getRoot().append($createParagraphNode());
+          }
+        });
+      },
+      skipTransforms: true,
+      tag: isFromUndoManger ? 'historic' : 'collaboration',
+    },
+  );
+}
+
+function $handleNormalizationMergeConflicts(
+  binding: Binding,
+  normalizedNodes: Set<NodeKey>,
+): void {
+  // We handle the merge operations here
+  const normalizedNodesKeys = Array.from(normalizedNodes);
+  const collabNodeMap = binding.collabNodeMap;
+  const mergedNodes = [];
+
+  for (let i = 0; i < normalizedNodesKeys.length; i++) {
+    const nodeKey = normalizedNodesKeys[i];
+    const lexicalNode = $getNodeByKey(nodeKey);
+    const collabNode = collabNodeMap.get(nodeKey);
+
+    if (collabNode instanceof CollabTextNode) {
+      if ($isTextNode(lexicalNode)) {
+        // We mutate the text collab nodes after removing
+        // all the dead nodes first, otherwise offsets break.
+        mergedNodes.push([collabNode, lexicalNode.__text]);
+      } else {
+        const offset = collabNode.getOffset();
+
+        if (offset === -1) {
+          continue;
+        }
+
+        const parent = collabNode._parent;
+        collabNode._normalized = true;
+
+        parent._xmlText.delete(offset, 1);
+
+        collabNodeMap.delete(nodeKey);
+        const parentChildren = parent._children;
+        const index = parentChildren.indexOf(collabNode);
+        parentChildren.splice(index, 1);
+      }
+    }
+  }
+
+  for (let i = 0; i < mergedNodes.length; i++) {
+    const [collabNode, text] = mergedNodes[i];
+    if (collabNode instanceof CollabTextNode && typeof text === 'string') {
+      collabNode._text = text;
+    }
+  }
+}
+
+type IntentionallyMarkedAsDirtyElement = boolean;
+
+export function syncLexicalUpdateToYjs(
+  binding: Binding,
+  provider: Provider,
+  prevEditorState: EditorState,
+  currEditorState: EditorState,
+  dirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>,
+  dirtyLeaves: Set<NodeKey>,
+  normalizedNodes: Set<NodeKey>,
+  tags: Set<string>,
+): void {
+  syncWithTransaction(binding, () => {
+    currEditorState.read(() => {
+      // We check if the update has come from a origin where the origin
+      // was the collaboration binding previously. This can help us
+      // prevent unnecessarily re-diffing and possible re-applying
+      // the same change editor state again. For example, if a user
+      // types a character and we get it, we don't want to then insert
+      // the same character again. The exception to this heuristic is
+      // when we need to handle normalization merge conflicts.
+      if (tags.has('collaboration') || tags.has('historic')) {
+        if (normalizedNodes.size > 0) {
+          $handleNormalizationMergeConflicts(binding, normalizedNodes);
+        }
+
+        return;
+      }
+
+      if (dirtyElements.has('root')) {
+        const prevNodeMap = prevEditorState._nodeMap;
+        const nextLexicalRoot = $getRoot();
+        const collabRoot = binding.root;
+        collabRoot.syncPropertiesFromLexical(
+          binding,
+          nextLexicalRoot,
+          prevNodeMap,
+        );
+        collabRoot.syncChildrenFromLexical(
+          binding,
+          nextLexicalRoot,
+          prevNodeMap,
+          dirtyElements,
+          dirtyLeaves,
+        );
+      }
+
+      const selection = $getSelection();
+      const prevSelection = prevEditorState._selection;
+      syncLexicalSelectionToYjs(binding, provider, prevSelection, selection);
+    });
+  });
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/Utils.ts b/resources/js/wysiwyg/lexical/yjs/Utils.ts
new file mode 100644
index 00000000000..c0e6bc96d0b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/Utils.ts
@@ -0,0 +1,560 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding, YjsNode} from '.';
+import type {
+  DecoratorNode,
+  EditorState,
+  ElementNode,
+  LexicalNode,
+  RangeSelection,
+  TextNode,
+} from 'lexical';
+
+import {
+  $getNodeByKey,
+  $getRoot,
+  $isDecoratorNode,
+  $isElementNode,
+  $isLineBreakNode,
+  $isRootNode,
+  $isTextNode,
+  createEditor,
+  NodeKey,
+} from 'lexical';
+import invariant from 'lexical/shared/invariant';
+import {Doc, Map as YMap, XmlElement, XmlText} from 'yjs';
+
+import {
+  $createCollabDecoratorNode,
+  CollabDecoratorNode,
+} from './CollabDecoratorNode';
+import {$createCollabElementNode, CollabElementNode} from './CollabElementNode';
+import {
+  $createCollabLineBreakNode,
+  CollabLineBreakNode,
+} from './CollabLineBreakNode';
+import {$createCollabTextNode, CollabTextNode} from './CollabTextNode';
+
+const baseExcludedProperties = new Set<string>([
+  '__key',
+  '__parent',
+  '__next',
+  '__prev',
+]);
+const elementExcludedProperties = new Set<string>([
+  '__first',
+  '__last',
+  '__size',
+]);
+const rootExcludedProperties = new Set<string>(['__cachedText']);
+const textExcludedProperties = new Set<string>(['__text']);
+
+function isExcludedProperty(
+  name: string,
+  node: LexicalNode,
+  binding: Binding,
+): boolean {
+  if (baseExcludedProperties.has(name)) {
+    return true;
+  }
+
+  if ($isTextNode(node)) {
+    if (textExcludedProperties.has(name)) {
+      return true;
+    }
+  } else if ($isElementNode(node)) {
+    if (
+      elementExcludedProperties.has(name) ||
+      ($isRootNode(node) && rootExcludedProperties.has(name))
+    ) {
+      return true;
+    }
+  }
+
+  const nodeKlass = node.constructor;
+  const excludedProperties = binding.excludedProperties.get(nodeKlass);
+  return excludedProperties != null && excludedProperties.has(name);
+}
+
+export function getIndexOfYjsNode(
+  yjsParentNode: YjsNode,
+  yjsNode: YjsNode,
+): number {
+  let node = yjsParentNode.firstChild;
+  let i = -1;
+
+  if (node === null) {
+    return -1;
+  }
+
+  do {
+    i++;
+
+    if (node === yjsNode) {
+      return i;
+    }
+
+    // @ts-expect-error Sibling exists but type is not available from YJS.
+    node = node.nextSibling;
+
+    if (node === null) {
+      return -1;
+    }
+  } while (node !== null);
+
+  return i;
+}
+
+export function $getNodeByKeyOrThrow(key: NodeKey): LexicalNode {
+  const node = $getNodeByKey(key);
+  invariant(node !== null, 'could not find node by key');
+  return node;
+}
+
+export function $createCollabNodeFromLexicalNode(
+  binding: Binding,
+  lexicalNode: LexicalNode,
+  parent: CollabElementNode,
+):
+  | CollabElementNode
+  | CollabTextNode
+  | CollabLineBreakNode
+  | CollabDecoratorNode {
+  const nodeType = lexicalNode.__type;
+  let collabNode;
+
+  if ($isElementNode(lexicalNode)) {
+    const xmlText = new XmlText();
+    collabNode = $createCollabElementNode(xmlText, parent, nodeType);
+    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
+    collabNode.syncChildrenFromLexical(binding, lexicalNode, null, null, null);
+  } else if ($isTextNode(lexicalNode)) {
+    // TODO create a token text node for token, segmented nodes.
+    const map = new YMap();
+    collabNode = $createCollabTextNode(
+      map,
+      lexicalNode.__text,
+      parent,
+      nodeType,
+    );
+    collabNode.syncPropertiesAndTextFromLexical(binding, lexicalNode, null);
+  } else if ($isLineBreakNode(lexicalNode)) {
+    const map = new YMap();
+    map.set('__type', 'linebreak');
+    collabNode = $createCollabLineBreakNode(map, parent);
+  } else if ($isDecoratorNode(lexicalNode)) {
+    const xmlElem = new XmlElement();
+    collabNode = $createCollabDecoratorNode(xmlElem, parent, nodeType);
+    collabNode.syncPropertiesFromLexical(binding, lexicalNode, null);
+  } else {
+    invariant(false, 'Expected text, element, decorator, or linebreak node');
+  }
+
+  collabNode._key = lexicalNode.__key;
+  return collabNode;
+}
+
+function getNodeTypeFromSharedType(
+  sharedType: XmlText | YMap<unknown> | XmlElement,
+): string {
+  const type =
+    sharedType instanceof YMap
+      ? sharedType.get('__type')
+      : sharedType.getAttribute('__type');
+  invariant(type != null, 'Expected shared type to include type attribute');
+  return type;
+}
+
+export function $getOrInitCollabNodeFromSharedType(
+  binding: Binding,
+  sharedType: XmlText | YMap<unknown> | XmlElement,
+  parent?: CollabElementNode,
+):
+  | CollabElementNode
+  | CollabTextNode
+  | CollabLineBreakNode
+  | CollabDecoratorNode {
+  const collabNode = sharedType._collabNode;
+
+  if (collabNode === undefined) {
+    const registeredNodes = binding.editor._nodes;
+    const type = getNodeTypeFromSharedType(sharedType);
+    const nodeInfo = registeredNodes.get(type);
+    invariant(nodeInfo !== undefined, 'Node %s is not registered', type);
+
+    const sharedParent = sharedType.parent;
+    const targetParent =
+      parent === undefined && sharedParent !== null
+        ? $getOrInitCollabNodeFromSharedType(
+            binding,
+            sharedParent as XmlText | YMap<unknown> | XmlElement,
+          )
+        : parent || null;
+
+    invariant(
+      targetParent instanceof CollabElementNode,
+      'Expected parent to be a collab element node',
+    );
+
+    if (sharedType instanceof XmlText) {
+      return $createCollabElementNode(sharedType, targetParent, type);
+    } else if (sharedType instanceof YMap) {
+      if (type === 'linebreak') {
+        return $createCollabLineBreakNode(sharedType, targetParent);
+      }
+      return $createCollabTextNode(sharedType, '', targetParent, type);
+    } else if (sharedType instanceof XmlElement) {
+      return $createCollabDecoratorNode(sharedType, targetParent, type);
+    }
+  }
+
+  return collabNode;
+}
+
+export function createLexicalNodeFromCollabNode(
+  binding: Binding,
+  collabNode:
+    | CollabElementNode
+    | CollabTextNode
+    | CollabDecoratorNode
+    | CollabLineBreakNode,
+  parentKey: NodeKey,
+): LexicalNode {
+  const type = collabNode.getType();
+  const registeredNodes = binding.editor._nodes;
+  const nodeInfo = registeredNodes.get(type);
+  invariant(nodeInfo !== undefined, 'Node %s is not registered', type);
+  const lexicalNode:
+    | DecoratorNode<unknown>
+    | TextNode
+    | ElementNode
+    | LexicalNode = new nodeInfo.klass();
+  lexicalNode.__parent = parentKey;
+  collabNode._key = lexicalNode.__key;
+
+  if (collabNode instanceof CollabElementNode) {
+    const xmlText = collabNode._xmlText;
+    collabNode.syncPropertiesFromYjs(binding, null);
+    collabNode.applyChildrenYjsDelta(binding, xmlText.toDelta());
+    collabNode.syncChildrenFromYjs(binding);
+  } else if (collabNode instanceof CollabTextNode) {
+    collabNode.syncPropertiesAndTextFromYjs(binding, null);
+  } else if (collabNode instanceof CollabDecoratorNode) {
+    collabNode.syncPropertiesFromYjs(binding, null);
+  }
+
+  binding.collabNodeMap.set(lexicalNode.__key, collabNode);
+  return lexicalNode;
+}
+
+export function syncPropertiesFromYjs(
+  binding: Binding,
+  sharedType: XmlText | YMap<unknown> | XmlElement,
+  lexicalNode: LexicalNode,
+  keysChanged: null | Set<string>,
+): void {
+  const properties =
+    keysChanged === null
+      ? sharedType instanceof YMap
+        ? Array.from(sharedType.keys())
+        : Object.keys(sharedType.getAttributes())
+      : Array.from(keysChanged);
+  let writableNode;
+
+  for (let i = 0; i < properties.length; i++) {
+    const property = properties[i];
+    if (isExcludedProperty(property, lexicalNode, binding)) {
+      continue;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const prevValue = (lexicalNode as any)[property];
+    let nextValue =
+      sharedType instanceof YMap
+        ? sharedType.get(property)
+        : sharedType.getAttribute(property);
+
+    if (prevValue !== nextValue) {
+      if (nextValue instanceof Doc) {
+        const yjsDocMap = binding.docMap;
+
+        if (prevValue instanceof Doc) {
+          yjsDocMap.delete(prevValue.guid);
+        }
+
+        const nestedEditor = createEditor();
+        const key = nextValue.guid;
+        nestedEditor._key = key;
+        yjsDocMap.set(key, nextValue);
+
+        nextValue = nestedEditor;
+      }
+
+      if (writableNode === undefined) {
+        writableNode = lexicalNode.getWritable();
+      }
+
+      writableNode[property as keyof typeof writableNode] = nextValue;
+    }
+  }
+}
+
+export function syncPropertiesFromLexical(
+  binding: Binding,
+  sharedType: XmlText | YMap<unknown> | XmlElement,
+  prevLexicalNode: null | LexicalNode,
+  nextLexicalNode: LexicalNode,
+): void {
+  const type = nextLexicalNode.__type;
+  const nodeProperties = binding.nodeProperties;
+  let properties = nodeProperties.get(type);
+  if (properties === undefined) {
+    properties = Object.keys(nextLexicalNode).filter((property) => {
+      return !isExcludedProperty(property, nextLexicalNode, binding);
+    });
+    nodeProperties.set(type, properties);
+  }
+
+  const EditorClass = binding.editor.constructor;
+
+  for (let i = 0; i < properties.length; i++) {
+    const property = properties[i];
+    const prevValue =
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      prevLexicalNode === null ? undefined : (prevLexicalNode as any)[property];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let nextValue = (nextLexicalNode as any)[property];
+
+    if (prevValue !== nextValue) {
+      if (nextValue instanceof EditorClass) {
+        const yjsDocMap = binding.docMap;
+        let prevDoc;
+
+        if (prevValue instanceof EditorClass) {
+          const prevKey = prevValue._key;
+          prevDoc = yjsDocMap.get(prevKey);
+          yjsDocMap.delete(prevKey);
+        }
+
+        // If we already have a document, use it.
+        const doc = prevDoc || new Doc();
+        const key = doc.guid;
+        nextValue._key = key;
+        yjsDocMap.set(key, doc);
+        nextValue = doc;
+        // Mark the node dirty as we've assigned a new key to it
+        binding.editor.update(() => {
+          nextLexicalNode.markDirty();
+        });
+      }
+
+      if (sharedType instanceof YMap) {
+        sharedType.set(property, nextValue);
+      } else {
+        sharedType.setAttribute(property, nextValue);
+      }
+    }
+  }
+}
+
+export function spliceString(
+  str: string,
+  index: number,
+  delCount: number,
+  newText: string,
+): string {
+  return str.slice(0, index) + newText + str.slice(index + delCount);
+}
+
+export function getPositionFromElementAndOffset(
+  node: CollabElementNode,
+  offset: number,
+  boundaryIsEdge: boolean,
+): {
+  length: number;
+  node:
+    | CollabElementNode
+    | CollabTextNode
+    | CollabDecoratorNode
+    | CollabLineBreakNode
+    | null;
+  nodeIndex: number;
+  offset: number;
+} {
+  let index = 0;
+  let i = 0;
+  const children = node._children;
+  const childrenLength = children.length;
+
+  for (; i < childrenLength; i++) {
+    const child = children[i];
+    const childOffset = index;
+    const size = child.getSize();
+    index += size;
+    const exceedsBoundary = boundaryIsEdge ? index >= offset : index > offset;
+
+    if (exceedsBoundary && child instanceof CollabTextNode) {
+      let textOffset = offset - childOffset - 1;
+
+      if (textOffset < 0) {
+        textOffset = 0;
+      }
+
+      const diffLength = index - offset;
+      return {
+        length: diffLength,
+        node: child,
+        nodeIndex: i,
+        offset: textOffset,
+      };
+    }
+
+    if (index > offset) {
+      return {
+        length: 0,
+        node: child,
+        nodeIndex: i,
+        offset: childOffset,
+      };
+    } else if (i === childrenLength - 1) {
+      return {
+        length: 0,
+        node: null,
+        nodeIndex: i + 1,
+        offset: childOffset + 1,
+      };
+    }
+  }
+
+  return {
+    length: 0,
+    node: null,
+    nodeIndex: 0,
+    offset: 0,
+  };
+}
+
+export function doesSelectionNeedRecovering(
+  selection: RangeSelection,
+): boolean {
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  let recoveryNeeded = false;
+
+  try {
+    const anchorNode = anchor.getNode();
+    const focusNode = focus.getNode();
+
+    if (
+      // We might have removed a node that no longer exists
+      !anchorNode.isAttached() ||
+      !focusNode.isAttached() ||
+      // If we've split a node, then the offset might not be right
+      ($isTextNode(anchorNode) &&
+        anchor.offset > anchorNode.getTextContentSize()) ||
+      ($isTextNode(focusNode) && focus.offset > focusNode.getTextContentSize())
+    ) {
+      recoveryNeeded = true;
+    }
+  } catch (e) {
+    // Sometimes checking nor a node via getNode might trigger
+    // an error, so we need recovery then too.
+    recoveryNeeded = true;
+  }
+
+  return recoveryNeeded;
+}
+
+export function syncWithTransaction(binding: Binding, fn: () => void): void {
+  binding.doc.transact(fn, binding);
+}
+
+export function removeFromParent(node: LexicalNode): void {
+  const oldParent = node.getParent();
+  if (oldParent !== null) {
+    const writableNode = node.getWritable();
+    const writableParent = oldParent.getWritable();
+    const prevSibling = node.getPreviousSibling();
+    const nextSibling = node.getNextSibling();
+    // TODO: this function duplicates a bunch of operations, can be simplified.
+    if (prevSibling === null) {
+      if (nextSibling !== null) {
+        const writableNextSibling = nextSibling.getWritable();
+        writableParent.__first = nextSibling.__key;
+        writableNextSibling.__prev = null;
+      } else {
+        writableParent.__first = null;
+      }
+    } else {
+      const writablePrevSibling = prevSibling.getWritable();
+      if (nextSibling !== null) {
+        const writableNextSibling = nextSibling.getWritable();
+        writableNextSibling.__prev = writablePrevSibling.__key;
+        writablePrevSibling.__next = writableNextSibling.__key;
+      } else {
+        writablePrevSibling.__next = null;
+      }
+      writableNode.__prev = null;
+    }
+    if (nextSibling === null) {
+      if (prevSibling !== null) {
+        const writablePrevSibling = prevSibling.getWritable();
+        writableParent.__last = prevSibling.__key;
+        writablePrevSibling.__next = null;
+      } else {
+        writableParent.__last = null;
+      }
+    } else {
+      const writableNextSibling = nextSibling.getWritable();
+      if (prevSibling !== null) {
+        const writablePrevSibling = prevSibling.getWritable();
+        writablePrevSibling.__next = writableNextSibling.__key;
+        writableNextSibling.__prev = writablePrevSibling.__key;
+      } else {
+        writableNextSibling.__prev = null;
+      }
+      writableNode.__next = null;
+    }
+    writableParent.__size--;
+    writableNode.__parent = null;
+  }
+}
+
+export function $moveSelectionToPreviousNode(
+  anchorNodeKey: string,
+  currentEditorState: EditorState,
+) {
+  const anchorNode = currentEditorState._nodeMap.get(anchorNodeKey);
+  if (!anchorNode) {
+    $getRoot().selectStart();
+    return;
+  }
+  // Get previous node
+  const prevNodeKey = anchorNode.__prev;
+  let prevNode: ElementNode | null = null;
+  if (prevNodeKey) {
+    prevNode = $getNodeByKey(prevNodeKey);
+  }
+
+  // If previous node not found, get parent node
+  if (prevNode === null && anchorNode.__parent !== null) {
+    prevNode = $getNodeByKey(anchorNode.__parent);
+  }
+  if (prevNode === null) {
+    $getRoot().selectStart();
+    return;
+  }
+
+  if (prevNode !== null && prevNode.isAttached()) {
+    prevNode.selectEnd();
+    return;
+  } else {
+    // If the found node is also deleted, select the next one
+    $moveSelectionToPreviousNode(prevNode.__key, currentEditorState);
+  }
+}
diff --git a/resources/js/wysiwyg/lexical/yjs/index.ts b/resources/js/wysiwyg/lexical/yjs/index.ts
new file mode 100644
index 00000000000..248e344268b
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/index.ts
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {Binding} from './Bindings';
+import type {LexicalCommand} from 'lexical';
+import type {Doc, RelativePosition, UndoManager, XmlText} from 'yjs';
+
+import {createCommand} from 'lexical';
+import {UndoManager as YjsUndoManager} from 'yjs';
+
+export type UserState = {
+  anchorPos: null | RelativePosition;
+  color: string;
+  focusing: boolean;
+  focusPos: null | RelativePosition;
+  name: string;
+  awarenessData: object;
+};
+export const CONNECTED_COMMAND: LexicalCommand<boolean> =
+  createCommand('CONNECTED_COMMAND');
+export const TOGGLE_CONNECT_COMMAND: LexicalCommand<boolean> = createCommand(
+  'TOGGLE_CONNECT_COMMAND',
+);
+export type ProviderAwareness = {
+  getLocalState: () => UserState | null;
+  getStates: () => Map<number, UserState>;
+  off: (type: 'update', cb: () => void) => void;
+  on: (type: 'update', cb: () => void) => void;
+  setLocalState: (arg0: UserState) => void;
+};
+declare interface Provider {
+  awareness: ProviderAwareness;
+  connect(): void | Promise<void>;
+  disconnect(): void;
+  off(type: 'sync', cb: (isSynced: boolean) => void): void;
+  off(type: 'update', cb: (arg0: unknown) => void): void;
+  off(type: 'status', cb: (arg0: {status: string}) => void): void;
+  off(type: 'reload', cb: (doc: Doc) => void): void;
+  on(type: 'sync', cb: (isSynced: boolean) => void): void;
+  on(type: 'status', cb: (arg0: {status: string}) => void): void;
+  on(type: 'update', cb: (arg0: unknown) => void): void;
+  on(type: 'reload', cb: (doc: Doc) => void): void;
+}
+export type Operation = {
+  attributes: {
+    __type: string;
+  };
+  insert: string | Record<string, unknown>;
+};
+export type Delta = Array<Operation>;
+export type YjsNode = Record<string, unknown>;
+export type YjsEvent = Record<string, unknown>;
+export type {Provider};
+export type {Binding, ClientID, ExcludedProperties} from './Bindings';
+export {createBinding} from './Bindings';
+
+export function createUndoManager(
+  binding: Binding,
+  root: XmlText,
+): UndoManager {
+  return new YjsUndoManager(root, {
+    trackedOrigins: new Set([binding, null]),
+  });
+}
+
+export function initLocalState(
+  provider: Provider,
+  name: string,
+  color: string,
+  focusing: boolean,
+  awarenessData: object,
+): void {
+  provider.awareness.setLocalState({
+    anchorPos: null,
+    awarenessData,
+    color,
+    focusPos: null,
+    focusing: focusing,
+    name,
+  });
+}
+
+export function setLocalStateFocus(
+  provider: Provider,
+  name: string,
+  color: string,
+  focusing: boolean,
+  awarenessData: object,
+): void {
+  const {awareness} = provider;
+  let localState = awareness.getLocalState();
+
+  if (localState === null) {
+    localState = {
+      anchorPos: null,
+      awarenessData,
+      color,
+      focusPos: null,
+      focusing: focusing,
+      name,
+    };
+  }
+
+  localState.focusing = focusing;
+  awareness.setLocalState(localState);
+}
+export {syncCursorPositions} from './SyncCursors';
+export {
+  syncLexicalUpdateToYjs,
+  syncYjsChangesToLexical,
+} from './SyncEditorStates';
diff --git a/resources/js/wysiwyg/lexical/yjs/types.ts b/resources/js/wysiwyg/lexical/yjs/types.ts
new file mode 100644
index 00000000000..d8807a288ed
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/yjs/types.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {CollabDecoratorNode} from './src/CollabDecoratorNode';
+import {CollabElementNode} from './src/CollabElementNode';
+import {CollabLineBreakNode} from './src/CollabLineBreakNode';
+import {CollabTextNode} from './src/CollabTextNode';
+
+declare module 'yjs' {
+  interface XmlElement {
+    _collabNode: CollabDecoratorNode;
+  }
+
+  interface XmlText {
+    _collabNode: CollabElementNode;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface Map<MapType> {
+    _collabNode: CollabLineBreakNode | CollabTextNode;
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 0be5421c7c8..4026872ac9a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,112 +1,21 @@
 {
   "include": ["resources/js/**/*"],
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "es2019",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
-    /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
-    "rootDir": "./resources/js/",                        /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    "paths": {                                           /* Specify a set of entries that re-map imports to additional lookup locations. */
-      "@icons/*": ["./resources/icons/*"]
+    "target": "es2019",
+    "module": "commonjs",
+    "rootDir": "./resources/js/",
+    "baseUrl": "./",
+    "paths": {
+      "@icons/*": ["resources/icons/*"],
+      "lexical": ["resources/js/wysiwyg/lexical/core/index.ts"],
+      "lexical/*": ["resources/js/wysiwyg/lexical/core/*"],
+      "@lexical/*": ["resources/js/wysiwyg/lexical/*"]
     },
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
-    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
-    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
-    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
-    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
-    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
-    /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
-    // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
   }
 }

From ccd486f2a9b96527742a556988a4cbf168b5f4ff Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 18 Sep 2024 17:31:51 +0100
Subject: [PATCH 274/666] Lexical: Got a range of Editor tests working

---
 jest.config.ts                                |   7 +-
 .../js/wysiwyg/lexical/core/LexicalEditor.ts  |   7 +
 .../core/__tests__/unit/CodeBlock.test.ts     | 144 --------
 .../__tests__/unit/HTMLCopyAndPaste.test.ts   |   2 +-
 .../core/__tests__/unit/LexicalEditor.test.ts | 348 ++++--------------
 .../__tests__/unit/LexicalListPlugin.test.tsx |   2 +-
 .../lexical/core/__tests__/utils/index.ts     |  54 +--
 .../unit/LexicalAutoLinkNode.test.ts          |   2 +-
 .../__tests__/unit/LexicalLinkNode.test.ts    |   2 +-
 .../unit/LexicalListItemNode.test.ts          |   2 +-
 .../__tests__/unit/LexicalListNode.test.ts    |   2 +-
 .../lexical/list/__tests__/unit/utils.test.ts |   2 +-
 .../__tests__/unit/LexicalHeadingNode.test.ts |   2 +-
 .../__tests__/unit/LexicalQuoteNode.test.ts   |   2 +-
 .../__tests__/unit/LexicalSelection.test.tsx  |   2 +-
 .../unit/LexicalSelectionHelpers.test.ts      |   2 +-
 .../unit/LexicalTableCellNode.test.ts         |   2 +-
 .../__tests__/unit/LexicalTableNode.test.tsx  |   2 +-
 .../unit/LexicalTableRowNode.test.ts          |   2 +-
 .../unit/LexicalTableSelection.test.tsx       |   2 +-
 .../unit/LexicalEventHelpers.test.tsx         |   2 +-
 .../__tests__/unit/LexicalNodeHelpers.test.ts |   2 +-
 .../__tests__/unit/LexicalRootHelpers.test.ts |   2 +-
 .../unit/LexicalUtilsKlassEqual.test.ts       |   2 +-
 .../unit/LexicalUtilsSplitNode.test.tsx       |   2 +-
 ...xlcaiUtilsInsertNodeToNearestRoot.test.tsx |   2 +-
 26 files changed, 116 insertions(+), 486 deletions(-)
 delete mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts

diff --git a/jest.config.ts b/jest.config.ts
index 0243b39cddc..11a86c672ce 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -93,10 +93,13 @@ const config: Config = {
   //   "node"
   // ],
 
-  modulePaths: ['/home/dan/web/bookstack/'],
+  modulePaths: ['./'],
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
+  moduleNameMapper: {
+    'lexical/shared/invariant': 'resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant',
+    ...pathsToModuleNameMapper(compilerOptions.paths),
+  },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
   // modulePathIgnorePatterns: [],
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
index b0b90002eaa..092429156be 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
@@ -1236,6 +1236,13 @@ export class LexicalEditor {
     }
   }
 
+  /**
+   * Commits any currently pending updates scheduled for the editor.
+   */
+  commitUpdates(): void {
+    $commitPendingUpdates(this);
+  }
+
   /**
    * Removes focus from the editor.
    */
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts
deleted file mode 100644
index 5d6a9311bf7..00000000000
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/CodeBlock.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import {$insertDataTransferForRichText} from '@lexical/clipboard';
-import {
-  $createParagraphNode,
-  $getRoot,
-  $getSelection,
-  $isRangeSelection,
-} from 'lexical';
-import {
-  DataTransferMock,
-  initializeUnitTest,
-  invariant,
-} from 'lexical/__tests__/utils';
-
-describe('CodeBlock tests', () => {
-  initializeUnitTest(
-    (testEnv) => {
-      beforeEach(async () => {
-        const {editor} = testEnv;
-        await editor.update(() => {
-          const root = $getRoot();
-          const paragraph = $createParagraphNode();
-          root.append(paragraph);
-          paragraph.select();
-        });
-      });
-
-      /**
-       * Code example for tests:
-       *
-       * function run() {
-       *   return [null, undefined, 2, ""];
-       * }
-       *
-       */
-      const EXPECTED_HTML = `<code spellcheck="false" dir="ltr"><span data-lexical-text="true">function run() {</span><br><span data-lexical-text="true">  return [null, undefined, 2, ""];</span><br><span data-lexical-text="true">}</span></code>`;
-
-      const CODE_PASTING_TESTS = [
-        {
-          expectedHTML: EXPECTED_HTML,
-          name: 'VS Code',
-          pastedHTML: `<meta charset='utf-8'><div style="color: #d4d4d4;background-color: #1e1e1e;font-family: Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 12px;line-height: 18px;white-space: pre;"><div><span style="color: #569cd6;">function</span><span style="color: #d4d4d4;"> </span><span style="color: #dcdcaa;">run</span><span style="color: #d4d4d4;">() {</span></div><div><span style="color: #d4d4d4;">  </span><span style="color: #c586c0;">return</span><span style="color: #d4d4d4;"> [</span><span style="color: #569cd6;">null</span><span style="color: #d4d4d4;">, </span><span style="color: #569cd6;">undefined</span><span style="color: #d4d4d4;">, </span><span style="color: #b5cea8;">2</span><span style="color: #d4d4d4;">, </span><span style="color: #ce9178;">""</span><span style="color: #d4d4d4;">];</span></div><div><span style="color: #d4d4d4;">}</span></div></div>`,
-        },
-        {
-          expectedHTML: EXPECTED_HTML,
-          name: 'Quip',
-          pastedHTML: `<meta charset='utf-8'><pre>function run() {<br>  return [null, undefined, 2, ""];<br>}</pre>`,
-        },
-        {
-          expectedHTML: EXPECTED_HTML,
-          name: 'WebStorm / Idea',
-          pastedHTML: `<html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><pre style="background-color:#2b2b2b;color:#a9b7c6;font-family:'JetBrains Mono',monospace;font-size:9.8pt;"><span style="color:#cc7832;">function&#32;</span><span style="color:#ffc66d;">run</span>()&#32;{<br>&#32;&#32;<span style="color:#cc7832;">return&#32;</span>[<span style="color:#cc7832;">null,&#32;undefined,&#32;</span><span style="color:#6897bb;">2</span><span style="color:#cc7832;">,&#32;</span><span style="color:#6a8759;">""</span>]<span style="color:#cc7832;">;<br></span>}</pre></body></html>`,
-        },
-        {
-          expectedHTML: `<code spellcheck="false" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">function</strong><span data-lexical-text="true"> run() {</span><br><span data-lexical-text="true">  </span><strong class="editor-text-bold" data-lexical-text="true">return</strong><span data-lexical-text="true"> [</span><strong class="editor-text-bold" data-lexical-text="true">null</strong><span data-lexical-text="true">, </span><strong class="editor-text-bold" data-lexical-text="true">undefined</strong><span data-lexical-text="true">, 2, ""];</span><br><span data-lexical-text="true">}</span></code>`,
-          name: 'Postman IDE',
-          pastedHTML: `<meta charset='utf-8'><div style="color: #000000;background-color: #fffffe;font-family: Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 12px;line-height: 18px;white-space: pre;"><div><span style="color: #800555;font-weight: bold;">function</span><span style="color: #000000;"> run() {</span></div><div><span style="color: #000000;">  </span><span style="color: #800555;font-weight: bold;">return</span><span style="color: #000000;"> [</span><span style="color: #800555;font-weight: bold;">null</span><span style="color: #000000;">, </span><span style="color: #800555;font-weight: bold;">undefined</span><span style="color: #000000;">, </span><span style="color: #ff00aa;">2</span><span style="color: #000000;">, </span><span style="color: #2a00ff;">""</span><span style="color: #000000;">];</span></div><div><span style="color: #000000;">}</span></div></div>`,
-        },
-        {
-          expectedHTML: EXPECTED_HTML,
-          name: 'Slack message',
-          pastedHTML: `<meta charset='utf-8'><pre class="c-mrkdwn__pre" data-stringify-type="pre" style="box-sizing: inherit; margin: 4px 0px; padding: 8px; --saf-0:rgba(var(--sk_foreground_low,29,28,29),0.13); font-size: 12px; line-height: 1.50001; font-variant-ligatures: none; white-space: pre-wrap; word-break: break-word; word-break: normal; tab-size: 4; font-family: Monaco, Menlo, Consolas, &quot;Courier New&quot;, monospace !important; border: 1px solid var(--saf-0); border-radius: 4px; background: rgba(var(--sk_foreground_min,29,28,29),0.04); counter-reset: list-0 0 list-1 0 list-2 0 list-3 0 list-4 0 list-5 0 list-6 0 list-7 0 list-8 0 list-9 0; color: rgb(29, 28, 29); font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: left; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">function run() {\n  return [null, undefined, 2, ""];\n}</pre>`,
-        },
-        {
-          expectedHTML: `<code spellcheck="false" dir="ltr"><span data-lexical-text="true">const Lexical = requireCond('gk', 'runtime_is_dev', {</span><br><span data-lexical-text="true">  true: 'Lexical.dev',</span><br><span data-lexical-text="true">  false: 'Lexical.prod',</span><br><span data-lexical-text="true">});</span></code>`,
-          name: 'CodeHub',
-          pastedHTML: `<meta charset='utf-8'><div style="color: #000000;background-color: #fffffe;font-family: 'monaco,monospace', Menlo, Monaco, 'Courier New', monospace;font-weight: normal;font-size: 13px;line-height: 20px;white-space: pre;"><div><span style="color: #ff0000;">const</span><span style="color: #000000;"> </span><span style="color: #800000;">Lexical</span><span style="color: #000000;"> = </span><span style="color: #383838;">requireCond</span><span style="color: #000000;">(</span><span style="color: #863b00;">'gk'</span><span style="color: #000000;">, </span><span style="color: #863b00;">'runtime_is_dev'</span><span style="color: #000000;">, {</span></div><div><span style="color: #000000;">  </span><span style="color: #863b00;">true</span><span style="color: #000000;">: </span><span style="color: #863b00;">'Lexical.dev'</span><span style="color: #000000;">,</span></div><div><span style="color: #000000;">  </span><span style="color: #863b00;">false</span><span style="color: #000000;">: </span><span style="color: #863b00;">'Lexical.prod'</span><span style="color: #000000;">,</span></div><div><span style="color: #000000;">});</span></div></div>`,
-        },
-        {
-          expectedHTML: EXPECTED_HTML,
-          name: 'GitHub / Gist',
-          pastedHTML: `<meta charset='utf-8'><table class="highlight tab-size js-file-line-container js-code-nav-container js-tagsearch-file" data-tab-size="8" data-paste-markdown-skip="" data-tagsearch-lang="JavaScript" data-tagsearch-path="example.js" style="box-sizing: border-box; border-spacing: 0px; border-collapse: collapse; tab-size: 8; color: rgb(36, 41, 47); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><tbody style="box-sizing: border-box;"><tr style="box-sizing: border-box;"><td id="file-example-js-LC1" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;"><span class="pl-k" style="box-sizing: border-box; color: var(--color-prettylights-syntax-keyword);">function</span> <span class="pl-en" style="box-sizing: border-box; color: var(--color-prettylights-syntax-entity);">run</span><span class="pl-kos" style="box-sizing: border-box;">(</span><span class="pl-kos" style="box-sizing: border-box;">)</span> <span class="pl-kos" style="box-sizing: border-box;">{</span></td></tr><tr style="box-sizing: border-box; background-color: transparent;"><td id="file-example-js-L2" class="blob-num js-line-number js-code-nav-line-number" data-line-number="2" style="box-sizing: border-box; padding: 0px 10px; width: 50px; min-width: 50px; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; line-height: 20px; color: var(--color-fg-subtle); text-align: right; white-space: nowrap; vertical-align: top; cursor: pointer; user-select: none;"></td><td id="file-example-js-LC2" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;">  <span class="pl-k" style="box-sizing: border-box; color: var(--color-prettylights-syntax-keyword);">return</span> <span class="pl-kos" style="box-sizing: border-box;">[</span><span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">null</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">undefined</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-c1" style="box-sizing: border-box; color: var(--color-prettylights-syntax-constant);">2</span><span class="pl-kos" style="box-sizing: border-box;">,</span> <span class="pl-s" style="box-sizing: border-box; color: var(--color-prettylights-syntax-string);">""</span><span class="pl-kos" style="box-sizing: border-box;">]</span><span class="pl-kos" style="box-sizing: border-box;">;</span></td></tr><tr style="box-sizing: border-box;"><td id="file-example-js-L3" class="blob-num js-line-number js-code-nav-line-number" data-line-number="3" style="box-sizing: border-box; padding: 0px 10px; width: 50px; min-width: 50px; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; line-height: 20px; color: var(--color-fg-subtle); text-align: right; white-space: nowrap; vertical-align: top; cursor: pointer; user-select: none;"></td><td id="file-example-js-LC3" class="blob-code blob-code-inner js-file-line" style="box-sizing: border-box; padding: 0px 10px; position: relative; line-height: 20px; vertical-align: top; overflow: visible; font-family: ui-monospace, SFMono-Regular, &quot;SF Mono&quot;, Menlo, Consolas, &quot;Liberation Mono&quot;, monospace; font-size: 12px; color: var(--color-fg-default); overflow-wrap: normal; white-space: pre;"><span class="pl-kos" style="box-sizing: border-box;">}</span></td></tr></tbody></table>`,
-        },
-        {
-          expectedHTML: `<p><code spellcheck="false" data-lexical-text="true"><span>12</span></code></p>`,
-          name: 'Single line <code>',
-          pastedHTML: `<meta charset='utf-8'><code>12</code>`,
-        },
-        {
-          expectedHTML: `<code spellcheck="false"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></code>`,
-          name: 'Multiline <code>',
-          // TODO This is not correct. This resembles how Lexical exports code right now but
-          // semantically it should be wrapped in a pre
-          pastedHTML: `<meta charset='utf-8'><code>1<br>2</code>`,
-        },
-        {
-          expectedHTML: `<p dir="ltr"><strong class="editor-text-bold editor-text-italic editor-text-underline" data-lexical-text="true">Hello </strong><sub data-lexical-text="true"><strong class="editor-text-bold editor-text-italic">World </strong></sub><sup data-lexical-text="true"><strong class="editor-text-bold editor-text-italic editor-text-underline">Lexical</strong></sup></p>`,
-          name: 'Multiple text formats',
-          pastedHTML: `<strong style="font-weight: 700; font-style: italic; text-decoration: underline; color: rgb(0, 0, 0); font-size: 15px; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);">Hello </strong><sub style="color: rgb(0, 0, 0); font-style: normal; font-weight: 400; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);"><strong style="font-weight: 700; font-style: italic; text-decoration: line-through; font-size: 0.8em; vertical-align: sub !important;">World </strong></sub><sup style="color: rgb(0, 0, 0); font-style: normal; font-weight: 400; text-align: left; text-indent: 0px; background-color: rgb(255, 255, 255);"><strong style="font-weight: 700; font-style: italic; text-decoration: underline line-through; font-size: 0.8em; vertical-align: super;">Lexical</strong></sup>`,
-        },
-        {
-          expectedHTML: `<h1 dir="ltr"><span data-lexical-text="true">My document</span></h1>`,
-          name: 'Title from Google Docs',
-          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-whatever"><span style="font-size:26pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">My document</span></b>`,
-        },
-        {
-          expectedHTML: `<h1 dir="ltr"><span data-lexical-text="true">My document</span></h1>`,
-          name: 'Title from Google Docs Wrapped in Paragraph',
-          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-wjatever"><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:3pt;"><span style="font-size:26pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">My document</span></p></b>`,
-        },
-        {
-          expectedHTML: `<p dir="ltr"><sub data-lexical-text="true"><span>subscript</span></sub><span data-lexical-text="true"> and </span><sup data-lexical-text="true"><span>superscript</span></sup></p>`,
-          name: 'Subscript and Superscript',
-          pastedHTML: `<b style="font-weight:normal;" id="docs-internal-guid-374b5f9d-7fff-9120-bcb0-1f5c1b6d59fa"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span style="font-size:0.6em;vertical-align:sub;">subscript</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"> and </span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span style="font-size:0.6em;vertical-align:super;">superscript</span></span></b>`,
-        },
-      ];
-
-      CODE_PASTING_TESTS.forEach((testCase, i) => {
-        test(`Code block html paste: ${testCase.name}`, async () => {
-          const {editor} = testEnv;
-
-          const dataTransfer = new DataTransferMock();
-          dataTransfer.setData('text/html', testCase.pastedHTML);
-          await editor.update(() => {
-            const selection = $getSelection();
-            invariant(
-              $isRangeSelection(selection),
-              'isRangeSelection(selection)',
-            );
-            $insertDataTransferForRichText(dataTransfer, selection, editor);
-          });
-          expect(testEnv.innerHTML).toBe(testCase.expectedHTML);
-        });
-      });
-    },
-    {
-      namespace: 'test',
-      theme: {
-        text: {
-          bold: 'editor-text-bold',
-          italic: 'editor-text-italic',
-          underline: 'editor-text-underline',
-        },
-      },
-    },
-  );
-});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
index b146548383c..056de19e49e 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
@@ -17,7 +17,7 @@ import {
   DataTransferMock,
   initializeUnitTest,
   invariant,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 describe('HTMLCopyAndPaste tests', () => {
   initializeUnitTest(
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index 4ca6b77c814..4e3e622ced9 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -57,11 +57,13 @@ import {
 
 describe('LexicalEditor tests', () => {
   let container: HTMLElement;
-  let reactRoot: Root;
+  function setContainerChild(el: HTMLElement) {
+    container.innerHTML = '';
+    container.append(el);
+  }
 
   beforeEach(() => {
     container = document.createElement('div');
-    reactRoot = createRoot(container);
     document.body.appendChild(container);
   });
 
@@ -74,49 +76,33 @@ describe('LexicalEditor tests', () => {
   });
 
   function useLexicalEditor(
-    rootElementRef: React.RefObject<HTMLDivElement>,
+    rootElement: HTMLDivElement,
     onError?: (error: Error) => void,
     nodes?: ReadonlyArray<Klass<LexicalNode> | LexicalNodeReplacement>,
   ) {
-    const editor = useMemo(
-      () =>
-        createTestEditor({
-          nodes: nodes ?? [],
-          onError: onError || jest.fn(),
-          theme: {
-            text: {
-              bold: 'editor-text-bold',
-              italic: 'editor-text-italic',
-              underline: 'editor-text-underline',
-            },
-          },
-        }),
-      [onError, nodes],
-    );
-
-    useEffect(() => {
-      const rootElement = rootElementRef.current;
-
-      editor.setRootElement(rootElement);
-    }, [rootElementRef, editor]);
-
+    const editor = createTestEditor({
+      nodes: nodes ?? [],
+      onError: onError || jest.fn(),
+      theme: {
+        text: {
+          bold: 'editor-text-bold',
+          italic: 'editor-text-italic',
+          underline: 'editor-text-underline',
+        },
+      },
+    });
+    editor.setRootElement(rootElement);
     return editor;
   }
 
   let editor: LexicalEditor;
 
   function init(onError?: (error: Error) => void) {
-    const ref = createRef<HTMLDivElement>();
+    const edContainer = document.createElement('div');
+    edContainer.setAttribute('contenteditable', 'true');
 
-    function TestBase() {
-      editor = useLexicalEditor(ref, onError);
-
-      return <div ref={ref} contentEditable={true} />;
-    }
-
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase />);
-    });
+    setContainerChild(edContainer);
+    editor = useLexicalEditor(edContainer, onError);
   }
 
   async function update(fn: () => void) {
@@ -870,21 +856,12 @@ describe('LexicalEditor tests', () => {
   });
 
   it('Should be able to update an editor state without a root element', () => {
-    const ref = createRef<HTMLDivElement>();
+    const element = document.createElement('div');
+    element.setAttribute('contenteditable', 'true');
+    setContainerChild(element);
 
-    function TestBase({element}: {element: HTMLElement | null}) {
-      editor = useMemo(() => createTestEditor(), []);
+    editor = createTestEditor();
 
-      useEffect(() => {
-        editor.setRootElement(element);
-      }, [element]);
-
-      return <div ref={ref} contentEditable={true} />;
-    }
-
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase element={null} />);
-    });
     editor.update(() => {
       const root = $getRoot();
       const paragraph = $createParagraphNode();
@@ -895,9 +872,7 @@ describe('LexicalEditor tests', () => {
 
     expect(container.innerHTML).toBe('<div contenteditable="true"></div>');
 
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase element={ref.current} />);
-    });
+    editor.setRootElement(element);
 
     expect(container.innerHTML).toBe(
       '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
@@ -945,57 +920,48 @@ describe('LexicalEditor tests', () => {
     const rootListener = jest.fn();
     const updateListener = jest.fn();
 
-    function TestBase({changeElement}: {changeElement: boolean}) {
-      editor = useMemo(() => createTestEditor(), []);
+    let editorInstance = createTestEditor();
+    editorInstance.registerRootListener(rootListener);
+    editorInstance.registerUpdateListener(updateListener);
 
-      useEffect(() => {
-        editor.update(() => {
-          const root = $getRoot();
-          const firstChild = root.getFirstChild() as ParagraphNode | null;
-          const text = changeElement ? 'Change successful' : 'Not changed';
-
-          if (firstChild === null) {
-            const paragraph = $createParagraphNode();
-            const textNode = $createTextNode(text);
-            paragraph.append(textNode);
-            root.append(paragraph);
-          } else {
-            const textNode = firstChild.getFirstChild() as TextNode;
-            textNode.setTextContent(text);
-          }
-        });
-      }, [changeElement]);
-
-      useEffect(() => {
-        return editor.registerRootListener(rootListener);
-      }, []);
-
-      useEffect(() => {
-        return editor.registerUpdateListener(updateListener);
-      }, []);
+    let edContainer: HTMLElement = document.createElement('div');
+    edContainer.setAttribute('contenteditable', 'true');
+    setContainerChild(edContainer);
+    editorInstance.setRootElement(edContainer);
 
-      const ref = useCallback((node: HTMLElement | null) => {
-        editor.setRootElement(node);
-      }, []);
+    function runUpdate(changeElement: boolean) {
+      editorInstance.update(() => {
+        const root = $getRoot();
+        const firstChild = root.getFirstChild() as ParagraphNode | null;
+        const text = changeElement ? 'Change successful' : 'Not changed';
 
-      return changeElement ? (
-        <span ref={ref} contentEditable={true} />
-      ) : (
-        <div ref={ref} contentEditable={true} />
-      );
+        if (firstChild === null) {
+          const paragraph = $createParagraphNode();
+          const textNode = $createTextNode(text);
+          paragraph.append(textNode);
+          root.append(paragraph);
+        } else {
+          const textNode = firstChild.getFirstChild() as TextNode;
+          textNode.setTextContent(text);
+        }
+      });
     }
 
-    await ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase changeElement={false} />);
-    });
+    setContainerChild(edContainer);
+    editorInstance.setRootElement(edContainer);
+    runUpdate(false);
+    editorInstance.commitUpdates();
 
     expect(container.innerHTML).toBe(
       '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">Not changed</span></p></div>',
     );
 
-    await ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase changeElement={true} />);
-    });
+    edContainer = document.createElement('span');
+    edContainer.setAttribute('contenteditable', 'true');
+    runUpdate(true);
+    editorInstance.setRootElement(edContainer);
+    setContainerChild(edContainer);
+    editorInstance.commitUpdates();
 
     expect(rootListener).toHaveBeenCalledTimes(3);
     expect(updateListener).toHaveBeenCalledTimes(3);
@@ -1026,178 +992,6 @@ describe('LexicalEditor tests', () => {
     });
   }
 
-  describe('With node decorators', () => {
-    function useDecorators() {
-      const [decorators, setDecorators] = useState(() =>
-        editor.getDecorators<ReactNode>(),
-      );
-
-      // Subscribe to changes
-      useEffect(() => {
-        return editor.registerDecoratorListener<ReactNode>((nextDecorators) => {
-          setDecorators(nextDecorators);
-        });
-      }, []);
-
-      const decoratedPortals = useMemo(
-        () =>
-          Object.keys(decorators).map((nodeKey) => {
-            const reactDecorator = decorators[nodeKey];
-            const element = editor.getElementByKey(nodeKey)!;
-
-            return createPortal(reactDecorator, element);
-          }),
-        [decorators],
-      );
-
-      return decoratedPortals;
-    }
-
-    afterEach(async () => {
-      // Clean up so we are not calling setState outside of act
-      await ReactTestUtils.act(async () => {
-        reactRoot.render(null);
-        await Promise.resolve().then();
-      });
-    });
-
-    it('Should correctly render React component into Lexical node #1', async () => {
-      const listener = jest.fn();
-
-      function Test() {
-        editor = useMemo(() => createTestEditor(), []);
-
-        useEffect(() => {
-          editor.registerRootListener(listener);
-        }, []);
-
-        const ref = useCallback((node: HTMLDivElement | null) => {
-          editor.setRootElement(node);
-        }, []);
-
-        const decorators = useDecorators();
-
-        return (
-          <>
-            <div ref={ref} contentEditable={true} />
-            {decorators}
-          </>
-        );
-      }
-
-      ReactTestUtils.act(() => {
-        reactRoot.render(<Test />);
-      });
-      // Update the editor with the decorator
-      await ReactTestUtils.act(async () => {
-        await editor.update(() => {
-          const paragraph = $createParagraphNode();
-          const test = $createTestDecoratorNode();
-          paragraph.append(test);
-          $getRoot().append(paragraph);
-        });
-      });
-
-      expect(listener).toHaveBeenCalledTimes(1);
-      expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p>' +
-          '<span data-lexical-decorator="true"><span>Hello world</span></span><br></p></div>',
-      );
-    });
-
-    it('Should correctly render React component into Lexical node #2', async () => {
-      const listener = jest.fn();
-
-      function Test({divKey}: {divKey: number}): JSX.Element {
-        function TestPlugin() {
-          [editor] = useLexicalComposerContext();
-
-          useEffect(() => {
-            return editor.registerRootListener(listener);
-          }, []);
-
-          return null;
-        }
-
-        return (
-          <TestComposer>
-            <RichTextPlugin
-              contentEditable={
-                // @ts-ignore
-                // eslint-disable-next-line jsx-a11y/aria-role
-                <ContentEditable key={divKey} role={null} spellCheck={null} />
-              }
-              placeholder={null}
-              ErrorBoundary={LexicalErrorBoundary}
-            />
-            <TestPlugin />
-          </TestComposer>
-        );
-      }
-
-      await ReactTestUtils.act(async () => {
-        reactRoot.render(<Test divKey={0} />);
-        // Wait for update to complete
-        await Promise.resolve().then();
-      });
-
-      expect(listener).toHaveBeenCalledTimes(1);
-      expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
-      );
-
-      await ReactTestUtils.act(async () => {
-        reactRoot.render(<Test divKey={1} />);
-        // Wait for update to complete
-        await Promise.resolve().then();
-      });
-
-      expect(listener).toHaveBeenCalledTimes(5);
-      expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p></div>',
-      );
-
-      // Wait for update to complete
-      await Promise.resolve().then();
-
-      editor.getEditorState().read(() => {
-        const root = $getRoot();
-        const paragraph = root.getFirstChild()!;
-        expect(root).toEqual({
-          __cachedText: '',
-          __dir: null,
-          __first: paragraph.getKey(),
-          __format: 0,
-          __indent: 0,
-          __key: 'root',
-          __last: paragraph.getKey(),
-          __next: null,
-          __parent: null,
-          __prev: null,
-          __size: 1,
-          __style: '',
-          __type: 'root',
-        });
-        expect(paragraph).toEqual({
-          __dir: null,
-          __first: null,
-          __format: 0,
-          __indent: 0,
-          __key: paragraph.getKey(),
-          __last: null,
-          __next: null,
-          __parent: 'root',
-          __prev: null,
-          __size: 0,
-          __style: '',
-          __textFormat: 0,
-          __textStyle: '',
-          __type: 'paragraph',
-        });
-      });
-    });
-  });
-
   describe('parseEditorState()', () => {
     let originalText: TextNode;
     let parsedParagraph: ParagraphNode;
@@ -1872,10 +1666,12 @@ describe('LexicalEditor tests', () => {
   });
 
   it('mutation listener set for original node should work with the replaced node', async () => {
-    const ref = createRef<HTMLDivElement>();
 
     function TestBase() {
-      editor = useLexicalEditor(ref, undefined, [
+      const edContainer = document.createElement('div');
+      edContainer.contentEditable = 'true';
+
+      editor = useLexicalEditor(edContainer, undefined, [
         TestTextNode,
         {
           replace: TextNode,
@@ -1884,12 +1680,10 @@ describe('LexicalEditor tests', () => {
         },
       ]);
 
-      return <div ref={ref} contentEditable={true} />;
+      return edContainer;
     }
 
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase />);
-    });
+    setContainerChild(TestBase());
 
     const textNodeMutations = jest.fn();
     const textNodeMutationsB = jest.fn();
@@ -1969,10 +1763,12 @@ describe('LexicalEditor tests', () => {
   });
 
   it('mutation listener should work with the replaced node', async () => {
-    const ref = createRef<HTMLDivElement>();
 
     function TestBase() {
-      editor = useLexicalEditor(ref, undefined, [
+      const edContainer = document.createElement('div');
+      edContainer.contentEditable = 'true';
+
+      editor = useLexicalEditor(edContainer, undefined, [
         TestTextNode,
         {
           replace: TextNode,
@@ -1981,12 +1777,10 @@ describe('LexicalEditor tests', () => {
         },
       ]);
 
-      return <div ref={ref} contentEditable={true} />;
+      return edContainer;
     }
 
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase />);
-    });
+    setContainerChild(TestBase());
 
     const textNodeMutations = jest.fn();
     const textNodeMutationsB = jest.fn();
@@ -2581,6 +2375,8 @@ describe('LexicalEditor tests', () => {
         expect(false).toBe('unreachable');
       });
 
+      newEditor.commitUpdates();
+
       expect(onError).toHaveBeenCalledWith(
         expect.objectContaining({
           message: expect.stringMatching(/TestTextNode.*re-use key.*TextNode/),
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
index a2968c2592b..5493b696257 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
@@ -20,7 +20,7 @@ import {
   expectHtmlToBeEqual,
   html,
   TestComposer,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index b7ccfab1ebd..090ace10d57 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -29,7 +29,6 @@ import {
   SerializedTextNode,
   TextNode,
 } from 'lexical';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 import {
   CreateEditorArgs,
@@ -89,38 +88,13 @@ export function initializeUnitTest(
     testEnv.container = document.createElement('div');
     document.body.appendChild(testEnv.container);
 
-    const useLexicalEditor = (
-      rootElementRef: React.RefObject<HTMLDivElement>,
-    ) => {
-      const lexicalEditor = React.useMemo(() => {
-        const lexical = createTestEditor(editorConfig);
-        return lexical;
-      }, []);
-
-      React.useEffect(() => {
-        const rootElement = rootElementRef.current;
-        lexicalEditor.setRootElement(rootElement);
-      }, [rootElementRef, lexicalEditor]);
-      return lexicalEditor;
-    };
-
-    const Editor = () => {
-      testEnv.editor = useLexicalEditor(ref);
-      const context = createLexicalComposerContext(
-        null,
-        editorConfig?.theme ?? {},
-      );
-      return (
-        <LexicalComposerContext.Provider value={[testEnv.editor, context]}>
-          <div ref={ref} contentEditable={true} />
-          {plugins}
-        </LexicalComposerContext.Provider>
-      );
-    };
+    const editorEl = document.createElement('div');
+    editorEl.contentEditable = 'true';
+    testEnv.container.append(editorEl);
 
-    ReactTestUtils.act(() => {
-      createRoot(testEnv.container).render(<Editor />);
-    });
+    const lexicalEditor = createTestEditor(editorConfig);
+    lexicalEditor.setRootElement(editorEl);
+    testEnv.editor = lexicalEditor;
   });
 
   afterEach(() => {
@@ -381,7 +355,7 @@ export function $createTestExcludeFromCopyElementNode(): TestExcludeFromCopyElem
 
 export type SerializedTestDecoratorNode = SerializedLexicalNode;
 
-export class TestDecoratorNode extends DecoratorNode<JSX.Element> {
+export class TestDecoratorNode extends DecoratorNode<HTMLElement> {
   static getType(): string {
     return 'test_decorator';
   }
@@ -433,32 +407,26 @@ export class TestDecoratorNode extends DecoratorNode<JSX.Element> {
   }
 
   decorate() {
-    return <Decorator text={'Hello world'} />;
+    const decorator = document.createElement('span');
+    decorator.textContent = 'Hello world';
+    return decorator;
   }
 }
 
-function Decorator({text}: {text: string}): JSX.Element {
-  return <span>{text}</span>;
-}
-
 export function $createTestDecoratorNode(): TestDecoratorNode {
   return new TestDecoratorNode();
 }
 
-const DEFAULT_NODES: NonNullable<InitialConfigType['nodes']> = [
+const DEFAULT_NODES: NonNullable<ReadonlyArray<Klass<LexicalNode> | LexicalNodeReplacement>> = [
   HeadingNode,
   ListNode,
   ListItemNode,
   QuoteNode,
-  CodeNode,
   TableNode,
   TableCellNode,
   TableRowNode,
-  HashtagNode,
-  CodeHighlightNode,
   AutoLinkNode,
   LinkNode,
-  OverflowNode,
   TestElementNode,
   TestSegmentedNode,
   TestExcludeFromCopyElementNode,
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
index 8ef2aa0519f..ffcefd7c8d9 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
@@ -20,7 +20,7 @@ import {
   SerializedParagraphNode,
   TextNode,
 } from 'lexical/src';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
index 3ad6cbad8b8..fe978849b15 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
@@ -20,7 +20,7 @@ import {
   SerializedParagraphNode,
   TextNode,
 } from 'lexical/src';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index d36b8f1cbd5..a1ccd50207c 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -16,7 +16,7 @@ import {
   expectHtmlToBeEqual,
   html,
   initializeUnitTest,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 import {
   $createListItemNode,
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
index 6abcbbd4cb7..497e096b1c2 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
@@ -6,7 +6,7 @@
  *
  */
 import {ParagraphNode, TextNode} from 'lexical';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 import {
   $createListItemNode,
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
index 1fa327379b9..ba397128916 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/utils.test.ts
@@ -6,7 +6,7 @@
  *
  */
 import {$createParagraphNode, $getRoot} from 'lexical';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 import {$createListItemNode, $createListNode} from '../..';
 import {$getListDepth, $getTopListNode, $isLastItemInList} from '../../utils';
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
index 057999ba031..dcbd62ab3c1 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
@@ -18,7 +18,7 @@ import {
   ParagraphNode,
   RangeSelection,
 } from 'lexical';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
index e64c418803e..66374bf5ff0 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
@@ -8,7 +8,7 @@
 
 import {$createQuoteNode, QuoteNode} from '@lexical/rich-text';
 import {$createRangeSelection, $getRoot, ParagraphNode} from 'lexical';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
index e6086783159..68e9dcab555 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
@@ -50,7 +50,7 @@ import {
   initializeClipboard,
   invariant,
   TestComposer,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
index 01390ed7180..7b5bef4518b 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
@@ -41,7 +41,7 @@ import {
   createTestHeadlessEditor,
   invariant,
   TestDecoratorNode,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 import {$setAnchorPoint, $setFocusPoint} from '../utils';
 
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
index 9c56db63bf3..70b3278667b 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableCellNode.test.ts
@@ -7,7 +7,7 @@
  */
 
 import {$createTableCellNode, TableCellHeaderStates} from '@lexical/table';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
index b11b99490b6..37049e598d6 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
@@ -28,7 +28,7 @@ import {
   DataTransferMock,
   initializeUnitTest,
   invariant,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 import {$getElementForTableNode, TableNode} from '../../LexicalTableNode';
 
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
index cf110634b5b..285d587bf5f 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
@@ -7,7 +7,7 @@
  */
 
 import {$createTableRowNode} from '@lexical/table';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
index 5eb631c31f7..9e9dbac8131 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
@@ -18,7 +18,7 @@ import {
   RootNode,
   TextNode,
 } from 'lexical';
-import {createTestEditor} from 'lexical/src/__tests__/utils';
+import {createTestEditor} from 'lexical/__tests__/utils';
 import {createRef, useEffect, useMemo} from 'react';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'lexical/shared/react-test-utils';
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
index 2b49e3bd7b8..2d5db2c6913 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
@@ -23,7 +23,7 @@ import {
 } from '@lexical/selection/src/__tests__/utils';
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 import {LexicalEditor} from 'lexical';
-import {initializeClipboard, TestComposer} from 'lexical/src/__tests__/utils';
+import {initializeClipboard, TestComposer} from 'lexical/__tests__/utils';
 import {createRoot} from 'react-dom/client';
 import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
index 82d2dddf88d..1d994e14020 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalNodeHelpers.test.ts
@@ -19,7 +19,7 @@ import {
   $createTestElementNode,
   initializeUnitTest,
   invariant,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 import {$dfs} from '../..';
 
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
index 070107583b5..369caaea4af 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
@@ -12,7 +12,7 @@ import {
   $rootTextContent,
 } from '@lexical/text';
 import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 describe('LexicalRootHelpers tests', () => {
   initializeUnitTest((testEnv) => {
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
index b4b18ef017f..a62b7bae176 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsKlassEqual.test.ts
@@ -7,7 +7,7 @@
  */
 
 import {objectKlassEquals} from '@lexical/utils';
-import {initializeUnitTest} from 'lexical/src/__tests__/utils';
+import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 class MyEvent extends Event {}
 
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
index f3db39390d6..f04bb5d2e46 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
@@ -10,7 +10,7 @@ import type {ElementNode, LexicalEditor} from 'lexical';
 
 import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
 import {$getRoot, $isElementNode} from 'lexical';
-import {createTestEditor} from 'lexical/src/__tests__/utils';
+import {createTestEditor} from 'lexical/__tests__/utils';
 
 import {$splitNode} from '../../index';
 
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
index 0e46573e7f6..9664b2d80ca 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
@@ -18,7 +18,7 @@ import {
 import {
   $createTestDecoratorNode,
   createTestEditor,
-} from 'lexical/src/__tests__/utils';
+} from 'lexical/__tests__/utils';
 
 import {$insertNodeToNearestRoot} from '../..';
 

From 787e06e3d8bc0dbf79cf01db20bc2de845732529 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 20 Sep 2024 13:05:29 +0100
Subject: [PATCH 275/666] Lexical: Adapted a range of further existing tests

---
 .../__tests__/unit/LexicalListPlugin.test.tsx | 212 ------------------
 ....test.tsx => LexicalNormalization.test.ts} |   0
 .../unit/LexicalSerialization.test.ts         |   8 +-
 .../lexical/core/__tests__/utils/index.ts     |   2 +-
 ...de.test.tsx => LexicalElementNode.test.ts} |  32 +--
 .../{LexicalGC.test.tsx => LexicalGC.test.ts} |   0
 ...abNode.test.tsx => LexicalTabNode.test.ts} | 129 -----------
 ...tNode.test.tsx => LexicalTextNode.test.ts} |  32 +--
 .../html/__tests__/unit/LexicalHtml.test.ts   |   1 -
 9 files changed, 17 insertions(+), 399 deletions(-)
 delete mode 100644 resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
 rename resources/js/wysiwyg/lexical/core/__tests__/unit/{LexicalNormalization.test.tsx => LexicalNormalization.test.ts} (100%)
 rename resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/{LexicalElementNode.test.tsx => LexicalElementNode.test.ts} (95%)
 rename resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/{LexicalGC.test.tsx => LexicalGC.test.ts} (100%)
 rename resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/{LexicalTabNode.test.tsx => LexicalTabNode.test.ts} (58%)
 rename resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/{LexicalTextNode.test.tsx => LexicalTextNode.test.ts} (97%)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
deleted file mode 100644
index 5493b696257..00000000000
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalListPlugin.test.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-import {ListItemNode, ListNode} from '@lexical/list';
-import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
-import {ContentEditable} from '@lexical/react/LexicalContentEditable';
-import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
-import {ListPlugin} from '@lexical/react/LexicalListPlugin';
-import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
-import {
-  INDENT_CONTENT_COMMAND,
-  LexicalEditor,
-  OUTDENT_CONTENT_COMMAND,
-} from 'lexical';
-import {
-  expectHtmlToBeEqual,
-  html,
-  TestComposer,
-} from 'lexical/__tests__/utils';
-import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
-
-import {
-  INSERT_UNORDERED_LIST_COMMAND,
-  REMOVE_LIST_COMMAND,
-} from '../../../../lexical-list/src/index';
-
-describe('@lexical/list tests', () => {
-  let container: HTMLDivElement;
-  let reactRoot: Root;
-
-  beforeEach(() => {
-    container = document.createElement('div');
-    reactRoot = createRoot(container);
-    document.body.appendChild(container);
-  });
-
-  afterEach(() => {
-    container.remove();
-    // @ts-ignore
-    container = null;
-
-    jest.restoreAllMocks();
-  });
-
-  // Shared instance across tests
-  let editor: LexicalEditor;
-
-  function Test(): JSX.Element {
-    function TestPlugin() {
-      // Plugin used just to get our hands on the Editor object
-      [editor] = useLexicalComposerContext();
-      return null;
-    }
-
-    return (
-      <TestComposer config={{nodes: [ListNode, ListItemNode], theme: {}}}>
-        <RichTextPlugin
-          contentEditable={<ContentEditable />}
-          placeholder={
-            <div className="editor-placeholder">Enter some text...</div>
-          }
-          ErrorBoundary={LexicalErrorBoundary}
-        />
-        <TestPlugin />
-        <ListPlugin />
-      </TestComposer>
-    );
-  }
-
-  test('Toggle an empty list on/off', async () => {
-    ReactTestUtils.act(() => {
-      reactRoot.render(<Test key="MegaSeeds, Morty!" />);
-    });
-
-    await ReactTestUtils.act(async () => {
-      await editor.update(() => {
-        editor.focus();
-        editor.dispatchCommand(INSERT_UNORDERED_LIST_COMMAND, undefined);
-      });
-    });
-
-    expectHtmlToBeEqual(
-      container.innerHTML,
-      html`
-        <div
-          contenteditable="true"
-          role="textbox"
-          spellcheck="true"
-          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-          data-lexical-editor="true">
-          <ul>
-            <li value="1">
-              <br />
-            </li>
-          </ul>
-        </div>
-      `,
-    );
-
-    await ReactTestUtils.act(async () => {
-      await editor.update(() => {
-        editor.focus();
-        editor.dispatchCommand(REMOVE_LIST_COMMAND, undefined);
-      });
-    });
-
-    expectHtmlToBeEqual(
-      container.innerHTML,
-      html`
-        <div
-          contenteditable="true"
-          role="textbox"
-          spellcheck="true"
-          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-          data-lexical-editor="true">
-          <p>
-            <br />
-          </p>
-        </div>
-        <div class="editor-placeholder">Enter some text...</div>
-      `,
-    );
-  });
-
-  test('Can create a list and indent/outdent it', async () => {
-    ReactTestUtils.act(() => {
-      reactRoot.render(<Test key="MegaSeeds, Morty!" />);
-    });
-
-    await ReactTestUtils.act(async () => {
-      await editor.update(() => {
-        editor.focus();
-        editor.dispatchCommand(INSERT_UNORDERED_LIST_COMMAND, undefined);
-      });
-    });
-
-    expectHtmlToBeEqual(
-      container.innerHTML,
-      html`
-        <div
-          contenteditable="true"
-          role="textbox"
-          spellcheck="true"
-          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-          data-lexical-editor="true">
-          <ul>
-            <li value="1">
-              <br />
-            </li>
-          </ul>
-        </div>
-      `,
-    );
-
-    await ReactTestUtils.act(async () => {
-      await editor.update(() => {
-        editor.focus();
-        editor.dispatchCommand(INDENT_CONTENT_COMMAND, undefined);
-      });
-    });
-
-    expectHtmlToBeEqual(
-      container.innerHTML,
-      html`
-        <div
-          contenteditable="true"
-          role="textbox"
-          spellcheck="true"
-          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-          data-lexical-editor="true">
-          <ul>
-            <li value="1">
-              <ul>
-                <li value="1"><br /></li>
-              </ul>
-            </li>
-          </ul>
-        </div>
-      `,
-    );
-
-    await ReactTestUtils.act(async () => {
-      await editor.update(() => {
-        editor.focus();
-        editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined);
-      });
-    });
-
-    expectHtmlToBeEqual(
-      container.innerHTML,
-      html`
-        <div
-          contenteditable="true"
-          role="textbox"
-          spellcheck="true"
-          style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-          data-lexical-editor="true">
-          <ul>
-            <li value="1">
-              <br />
-            </li>
-          </ul>
-        </div>
-      `,
-    );
-  });
-});
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.ts
similarity index 100%
rename from resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.tsx
rename to resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNormalization.test.ts
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
index 9237bc9d3dd..02231f8bf0d 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -6,7 +6,6 @@
  *
  */
 
-import {$createCodeHighlightNode, $createCodeNode} from '@lexical/code';
 import {$createLinkNode} from '@lexical/link';
 import {$createListItemNode, $createListNode} from '@lexical/list';
 import {$createHeadingNode, $createQuoteNode} from '@lexical/rich-text';
@@ -92,9 +91,6 @@ function $createEditorContent() {
       ),
     );
     root.append(paragraph4);
-    const codeBlock = $createCodeNode('javascript');
-    codeBlock.append($createCodeHighlightNode('const lexical = "awesome"'));
-    root.append(codeBlock);
     const table = $createTableNodeWithDimensions(5, 5, true);
     root.append(table);
   }
@@ -110,7 +106,7 @@ describe('LexicalSerialization tests', () => {
       });
 
       const stringifiedEditorState = JSON.stringify(editor.getEditorState());
-      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"const lexical = \\"awesome\\"","type":"code-highlight","version":1}],"direction":"ltr","format":"","indent":0,"type":"code","version":1,"language":"javascript"},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1}],"direction":"ltr","format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`;
+      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1}],"direction":"ltr","format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`;
 
       expect(stringifiedEditorState).toBe(expectedStringifiedEditorState);
 
@@ -119,7 +115,7 @@ describe('LexicalSerialization tests', () => {
       const otherStringifiedEditorState = JSON.stringify(editorState);
 
       expect(otherStringifiedEditorState).toBe(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"const lexical = \\"awesome\\"","type":"code-highlight","version":1}],"direction":"ltr","format":"","indent":0,"type":"code","version":1,"language":"javascript"},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 090ace10d57..30b0bc8c818 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -89,7 +89,7 @@ export function initializeUnitTest(
     document.body.appendChild(testEnv.container);
 
     const editorEl = document.createElement('div');
-    editorEl.contentEditable = 'true';
+    editorEl.setAttribute('contenteditable', 'true');
     testEnv.container.append(editorEl);
 
     const lexicalEditor = createTestEditor(editorConfig);
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
similarity index 95%
rename from resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx
rename to resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
index e165df7a9ce..fb5c98f8a6c 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
@@ -16,10 +16,6 @@ import {
   LexicalNode,
   TextNode,
 } from 'lexical';
-import * as React from 'react';
-import {createRef, useEffect} from 'react';
-import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 import {
   $createTestElementNode,
@@ -44,34 +40,20 @@ describe('LexicalElementNode tests', () => {
 
   async function update(fn: () => void) {
     editor.update(fn);
+    editor.commitUpdates();
     return Promise.resolve().then();
   }
 
-  function useLexicalEditor(rootElementRef: React.RefObject<HTMLDivElement>) {
-    const editor = React.useMemo(() => createTestEditor(), []);
-
-    useEffect(() => {
-      const rootElement = rootElementRef.current;
-      editor.setRootElement(rootElement);
-    }, [rootElementRef, editor]);
-
-    return editor;
-  }
-
   let editor: LexicalEditor;
 
   async function init() {
-    const ref = createRef<HTMLDivElement>();
+    const root = document.createElement('div');
+    root.setAttribute('contenteditable', 'true');
+    container.innerHTML = '';
+    container.appendChild(root);
 
-    function TestBase() {
-      editor = useLexicalEditor(ref);
-
-      return <div ref={ref} contentEditable={true} />;
-    }
-
-    ReactTestUtils.act(() => {
-      createRoot(container).render(<TestBase />);
-    });
+    editor = createTestEditor();
+    editor.setRootElement(root);
 
     // Insert initial block
     await update(() => {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.ts
similarity index 100%
rename from resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.tsx
rename to resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalGC.test.ts
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
similarity index 58%
rename from resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx
rename to resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index 0c06273eca1..2d751f5fd7b 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -11,7 +11,6 @@ import {
   $insertDataTransferForRichText,
 } from '@lexical/clipboard';
 import {$createListItemNode, $createListNode} from '@lexical/list';
-import {registerTabIndentation} from '@lexical/react/LexicalTabIndentationPlugin';
 import {$createHeadingNode, registerRichText} from '@lexical/rich-text';
 import {
   $createParagraphNode,
@@ -112,134 +111,6 @@ describe('LexicalTabNode tests', () => {
       );
     });
 
-    test('element indents when selection at the start of the block', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        const selection = $getSelection()!;
-        selection.insertText('foo');
-        $getRoot().selectStart();
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">foo</span></p>',
-      );
-    });
-
-    test('elements indent when selection spans across multiple blocks', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        const root = $getRoot();
-        const paragraph = root.getFirstChild();
-        invariant($isElementNode(paragraph));
-        const heading = $createHeadingNode('h1');
-        const list = $createListNode('number');
-        const listItem = $createListItemNode();
-        const paragraphText = $createTextNode('foo');
-        const headingText = $createTextNode('bar');
-        const listItemText = $createTextNode('xyz');
-        root.append(heading, list);
-        paragraph.append(paragraphText);
-        heading.append(headingText);
-        list.append(listItem);
-        listItem.append(listItemText);
-        const selection = $createRangeSelection();
-        selection.focus.set(paragraphText.getKey(), 1, 'text');
-        selection.anchor.set(listItemText.getKey(), 1, 'text');
-        $setSelection(selection);
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">foo</span></p><h1 dir="ltr" style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">bar</span></h1><ol><li value="1"><ol><li value="1" dir="ltr"><span data-lexical-text="true">xyz</span></li></ol></li></ol>',
-      );
-    });
-
-    test('element tabs when selection is not at the start (1)', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        $getSelection()!.insertText('foo');
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">\t</span></p>',
-      );
-    });
-
-    test('element tabs when selection is not at the start (2)', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        $getSelection()!.insertText('foo');
-        const textNode = $getRoot().getLastDescendant();
-        invariant($isTextNode(textNode));
-        textNode.select(1, 1);
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">oo</span></p>',
-      );
-    });
-
-    test('element tabs when selection is not at the start (3)', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        $getSelection()!.insertText('foo');
-        const textNode = $getRoot().getLastDescendant();
-        invariant($isTextNode(textNode));
-        textNode.select(1, 2);
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">o</span></p>',
-      );
-    });
-
-    test('elements tabs when selection is not at the start and overlaps another tab', async () => {
-      const {editor} = testEnv;
-      registerRichText(editor);
-      registerTabIndentation(editor);
-      await editor.update(() => {
-        $getSelection()!.insertRawText('hello\tworld');
-        const root = $getRoot();
-        const firstTextNode = root.getFirstDescendant();
-        const lastTextNode = root.getLastDescendant();
-        const selection = $createRangeSelection();
-        selection.anchor.set(firstTextNode!.getKey(), 'hell'.length, 'text');
-        selection.focus.set(lastTextNode!.getKey(), 'wo'.length, 'text');
-        $setSelection(selection);
-      });
-      await editor.dispatchCommand(
-        KEY_TAB_COMMAND,
-        new KeyboardEvent('keydown'),
-      );
-      expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">hell</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">rld</span></p>',
-      );
-    });
-
     test('can type between two (leaf nodes) canInsertBeforeAfter false', async () => {
       const {editor} = testEnv;
       await editor.update(() => {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
similarity index 97%
rename from resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx
rename to resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index 7fc509dfd13..337c96a4163 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -21,9 +21,6 @@ import {
   TextModeType,
   TextNode,
 } from 'lexical';
-import * as React from 'react';
-import {createRef, useEffect, useMemo} from 'react';
-import {createRoot} from 'react-dom/client';
 import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 import {
@@ -78,35 +75,20 @@ describe('LexicalTextNode tests', () => {
 
   async function update(fn: () => void) {
     editor.update(fn);
+    editor.commitUpdates();
     return Promise.resolve().then();
   }
 
-  function useLexicalEditor(rootElementRef: React.RefObject<HTMLDivElement>) {
-    const editor = useMemo(() => createTestEditor(editorConfig), []);
-
-    useEffect(() => {
-      const rootElement = rootElementRef.current;
-
-      editor.setRootElement(rootElement);
-    }, [rootElementRef, editor]);
-
-    return editor;
-  }
-
   let editor: LexicalEditor;
 
   async function init() {
-    const ref = createRef<HTMLDivElement>();
-
-    function TestBase() {
-      editor = useLexicalEditor(ref);
+    const root = document.createElement('div');
+    root.setAttribute('contenteditable', 'true');
+    container.innerHTML = '';
+    container.appendChild(root);
 
-      return <div ref={ref} contentEditable={true} />;
-    }
-
-    ReactTestUtils.act(() => {
-      createRoot(container).render(<TestBase />);
-    });
+    editor = createTestEditor();
+    editor.setRootElement(root);
 
     // Insert initial block
     await update(() => {
diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
index 55d120bdd1b..3dbe5da8b3e 100644
--- a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -112,7 +112,6 @@ describe('HTML', () => {
         ListNode,
         ListItemNode,
         QuoteNode,
-        CodeNode,
         LinkNode,
       ],
     });

From dba8ab947fef64ce4d482045941aa8f6ed153818 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 20 Sep 2024 15:31:19 +0100
Subject: [PATCH 276/666] Lexical: Finished conversion/update of test files

---
 jest.config.ts                                |    9 +-
 .../lexical/core/__tests__/utils/index.ts     |    8 +
 .../__tests__/unit/LexicalTextNode.test.ts    |    1 -
 .../lexical/core/shared/react-test-utils.ts   |   18 -
 .../unit/LexicalAutoLinkNode.test.ts          |    2 +-
 .../__tests__/unit/LexicalLinkNode.test.ts    |    2 +-
 .../unit/LexicalListItemNode.test.ts          |  182 ++-
 .../wysiwyg/lexical/list/__tests__/utils.ts   |   33 -
 ...tion.test.tsx => LexicalSelection.test.ts} | 1032 ++++++-----------
 ...Node.test.tsx => LexicalTableNode.test.ts} |  206 ----
 ...test.tsx => LexicalTableSelection.test.ts} |   63 +-
 ...s.test.tsx => LexicalEventHelpers.test.ts} |  191 +--
 .../__tests__/unit/LexicalRootHelpers.test.ts |   35 +-
 ...test.tsx => LexicalUtilsSplitNode.test.ts} |    0
 ...xlcaiUtilsInsertNodeToNearestRoot.test.ts} |    0
 15 files changed, 558 insertions(+), 1224 deletions(-)
 delete mode 100644 resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
 delete mode 100644 resources/js/wysiwyg/lexical/list/__tests__/utils.ts
 rename resources/js/wysiwyg/lexical/selection/__tests__/unit/{LexicalSelection.test.tsx => LexicalSelection.test.ts} (73%)
 rename resources/js/wysiwyg/lexical/table/__tests__/unit/{LexicalTableNode.test.tsx => LexicalTableNode.test.ts} (53%)
 rename resources/js/wysiwyg/lexical/table/__tests__/unit/{LexicalTableSelection.test.tsx => LexicalTableSelection.test.ts} (73%)
 rename resources/js/wysiwyg/lexical/utils/__tests__/unit/{LexicalEventHelpers.test.tsx => LexicalEventHelpers.test.ts} (85%)
 rename resources/js/wysiwyg/lexical/utils/__tests__/unit/{LexicalUtilsSplitNode.test.tsx => LexicalUtilsSplitNode.test.ts} (100%)
 rename resources/js/wysiwyg/lexical/utils/__tests__/unit/{LexlcaiUtilsInsertNodeToNearestRoot.test.tsx => LexlcaiUtilsInsertNodeToNearestRoot.test.ts} (100%)

diff --git a/jest.config.ts b/jest.config.ts
index 11a86c672ce..3c04f05b218 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -21,7 +21,7 @@ const config: Config = {
   clearMocks: true,
 
   // Indicates whether the coverage information should be collected while executing the test
-  collectCoverage: true,
+  collectCoverage: false,
 
   // An array of glob patterns indicating a set of files for which coverage information should be collected
   // collectCoverageFrom: undefined,
@@ -164,10 +164,9 @@ const config: Config = {
   // testLocationInResults: false,
 
   // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
+  testMatch: [
+    "**/__tests__/**/*.test.[jt]s",
+  ],
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
   // testPathIgnorePatterns: [
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 30b0bc8c818..f7230595a43 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -717,3 +717,11 @@ export function html(
   }
   return output;
 }
+
+export function expectHtmlToBeEqual(expected: string, actual: string): void {
+  expect(formatHtml(expected)).toBe(formatHtml(actual));
+}
+
+function formatHtml(s: string): string {
+  return s.replace(/>\s+</g, '><').replace(/\s*\n\s*/g, ' ').trim();
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index 337c96a4163..57e1dcb3baf 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -21,7 +21,6 @@ import {
   TextModeType,
   TextNode,
 } from 'lexical';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 import {
   $createTestSegmentedNode,
diff --git a/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts b/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
deleted file mode 100644
index 8e086744d5e..00000000000
--- a/resources/js/wysiwyg/lexical/core/shared/react-test-utils.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-import * as React from 'react';
-import * as ReactTestUtils from 'react-dom/test-utils';
-
-/**
- * React 19 moved act from react-dom/test-utils to react
- * https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-react-dom-test-utils
- */
-export const act =
-  'act' in React
-    ? (React.act as typeof ReactTestUtils.act)
-    : ReactTestUtils.act;
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
index ffcefd7c8d9..0f35136821b 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
@@ -19,7 +19,7 @@ import {
   ParagraphNode,
   SerializedParagraphNode,
   TextNode,
-} from 'lexical/src';
+} from 'lexical';
 import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
index fe978849b15..1aff9186306 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
@@ -19,7 +19,7 @@ import {
   ParagraphNode,
   SerializedParagraphNode,
   TextNode,
-} from 'lexical/src';
+} from 'lexical';
 import {initializeUnitTest} from 'lexical/__tests__/utils';
 
 const editorConfig = Object.freeze({
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index a1ccd50207c..22e555f35b5 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -62,7 +62,7 @@ describe('LexicalListItemNode tests', () => {
         expectHtmlToBeEqual(
           listItemNode.createDOM(editorConfig).outerHTML,
           html`
-            <li class="my-listItem-item-class" value="1"></li>
+            <li value="1" class="my-listItem-item-class"></li>
           `,
         );
 
@@ -90,7 +90,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li class="my-listItem-item-class" value="1"></li>
+              <li value="1" class="my-listItem-item-class"></li>
             `,
           );
           const newListItemNode = new ListItemNode();
@@ -106,7 +106,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li class="my-listItem-item-class" value="1"></li>
+              <li value="1" class="my-listItem-item-class"></li>
             `,
           );
         });
@@ -125,7 +125,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li class="my-listItem-item-class" value="1"></li>
+              <li value="1" class="my-listItem-item-class"></li>
             `,
           );
           const nestedListNode = new ListNode('bullet', 1);
@@ -142,9 +142,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li
-                class="my-listItem-item-class my-nested-list-listItem-class"
-                value="1"></li>
+              <li value="1" class="my-listItem-item-class my-nested-list-listItem-class"></li>
             `,
           );
         });
@@ -184,13 +182,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -217,13 +215,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">bar</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -247,13 +245,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -273,12 +271,12 @@ describe('LexicalListItemNode tests', () => {
               contenteditable="true"
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
-              <p><br /></p>
+              <p><br></p>
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -303,14 +301,14 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
               </ul>
-              <p><br /></p>
+              <p><br></p>
             </div>
           `,
         );
@@ -332,13 +330,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
-              <p><br /></p>
+              <p><br></p>
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -363,7 +361,7 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
@@ -383,7 +381,7 @@ describe('LexicalListItemNode tests', () => {
               contenteditable="true"
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
-              <p><br /></p>
+              <p><br></p>
             </div>
           `,
         );
@@ -423,13 +421,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -447,10 +445,10 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -497,15 +495,15 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -525,12 +523,12 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -575,15 +573,15 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="3">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -603,12 +601,12 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">A</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -661,17 +659,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -693,10 +691,10 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
-                    <li dir="ltr" value="2">
+                    <li value="2" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -757,24 +755,24 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -796,17 +794,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
-                    <li dir="ltr" value="2">
+                    <li value="2" dir="ltr">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -867,24 +865,24 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
                     <li value="1">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -906,17 +904,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li dir="ltr" value="2">
+                    <li value="2" dir="ltr">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -985,31 +983,31 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
                   </ul>
                 </li>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
                     <li value="1">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -1031,20 +1029,20 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li dir="ltr" value="1">
+                    <li value="1" dir="ltr">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li dir="ltr" value="1">
+                        <li value="1" dir="ltr">
                           <span data-lexical-text="true">A2</span>
                         </li>
-                        <li dir="ltr" value="2">
+                        <li value="2" dir="ltr">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li dir="ltr" value="2">
+                    <li value="2" dir="ltr">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -1089,13 +1087,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -1119,14 +1117,14 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2"><br /></li>
-                <li dir="ltr" value="3">
+                <li value="2"><br></li>
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="4">
+                <li value="4" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -1150,16 +1148,16 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
-                <li value="4"><br /></li>
+                <li value="4"><br></li>
               </ul>
             </div>
           `,
@@ -1181,16 +1179,16 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li dir="ltr" value="2">
+                <li value="2" dir="ltr">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li dir="ltr" value="3">
+                <li value="3" dir="ltr">
                   <span data-lexical-text="true">three</span>
                 </li>
-                <li value="4"><br /></li>
+                <li value="4"><br></li>
               </ul>
             </div>
           `,
@@ -1213,7 +1211,7 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
@@ -1233,10 +1231,10 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li dir="ltr" value="1">
+                <li value="1" dir="ltr">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2"><br /></li>
+                <li value="2"><br></li>
               </ul>
             </div>
           `,
@@ -1310,7 +1308,7 @@ describe('LexicalListItemNode tests', () => {
                     <ul>
                       <li value="1">
                         <ul>
-                          <li dir="ltr" value="1">
+                          <li value="1" dir="ltr">
                             <span data-lexical-text="true">one</span>
                           </li>
                         </ul>
@@ -1319,7 +1317,7 @@ describe('LexicalListItemNode tests', () => {
                   </li>
                 </ul>
               </li>
-              <li dir="ltr" value="1">
+              <li value="1" dir="ltr">
                 <span data-lexical-text="true">two</span>
               </li>
             </ul>
@@ -1338,10 +1336,10 @@ describe('LexicalListItemNode tests', () => {
           editor.getRootElement()!.innerHTML,
           html`
             <ul>
-              <li dir="ltr" value="1">
+              <li value="1" dir="ltr">
                 <span data-lexical-text="true">one</span>
               </li>
-              <li dir="ltr" value="2">
+              <li value="2" dir="ltr">
                 <span data-lexical-text="true">two</span>
               </li>
             </ul>
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/utils.ts b/resources/js/wysiwyg/lexical/list/__tests__/utils.ts
deleted file mode 100644
index aa95a7a01b0..00000000000
--- a/resources/js/wysiwyg/lexical/list/__tests__/utils.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-import {expect} from '@playwright/test';
-import prettier from 'prettier';
-
-// This tag function is just used to trigger prettier auto-formatting.
-// (https://prettier.io/blog/2020/08/24/2.1.0.html#api)
-export function html(
-  partials: TemplateStringsArray,
-  ...params: string[]
-): string {
-  let output = '';
-  for (let i = 0; i < partials.length; i++) {
-    output += partials[i];
-    if (i < partials.length - 1) {
-      output += params[i];
-    }
-  }
-  return output;
-}
-
-export function expectHtmlToBeEqual(expected: string, actual: string): void {
-  expect(prettifyHtml(expected)).toBe(prettifyHtml(actual));
-}
-
-export function prettifyHtml(s: string): string {
-  return prettier.format(s.replace(/\n/g, ''), {parser: 'html'});
-}
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
similarity index 73%
rename from resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
rename to resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
index 68e9dcab555..665f5d854e2 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.tsx
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
@@ -8,13 +8,7 @@
 
 import {$createLinkNode} from '@lexical/link';
 import {$createListItemNode, $createListNode} from '@lexical/list';
-import {AutoFocusPlugin} from '@lexical/react/LexicalAutoFocusPlugin';
-import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
-import {ContentEditable} from '@lexical/react/LexicalContentEditable';
-import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
-import {HistoryPlugin} from '@lexical/react/LexicalHistoryPlugin';
-import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
-import {$createHeadingNode} from '@lexical/rich-text';
+import {$createHeadingNode, registerRichText} from '@lexical/rich-text';
 import {
   $addNodeStyle,
   $getSelectionStyleValueForProperty,
@@ -28,7 +22,7 @@ import {
   $createRangeSelection,
   $createTextNode,
   $getRoot,
-  $getSelection,
+  $getSelection, $insertNodes,
   $isElementNode,
   $isRangeSelection,
   $isTextNode,
@@ -49,10 +43,7 @@ import {
   createTestEditor,
   initializeClipboard,
   invariant,
-  TestComposer,
 } from 'lexical/__tests__/utils';
-import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 import {
   $setAnchorPoint,
@@ -81,6 +72,8 @@ import {
   setNativeSelectionWithPaths,
   undo,
 } from '../utils';
+import {createEmptyHistoryState, registerHistory} from "@lexical/history";
+import {mergeRegister} from "@lexical/utils";
 
 interface ExpectedSelection {
   anchorPath: number[];
@@ -118,89 +111,72 @@ Range.prototype.getBoundingClientRect = function (): DOMRect {
 
 describe('LexicalSelection tests', () => {
   let container: HTMLElement;
-  let reactRoot: Root;
+  let root: HTMLDivElement;
   let editor: LexicalEditor | null = null;
 
   beforeEach(async () => {
     container = document.createElement('div');
     document.body.appendChild(container);
-    reactRoot = createRoot(container);
+
+    root = document.createElement('div');
+    root.setAttribute('contenteditable', 'true');
+    container.append(root);
+
     await init();
   });
 
   afterEach(async () => {
-    // Ensure we are clearing out any React state and running effects with
-    // act
-    await ReactTestUtils.act(async () => {
-      reactRoot.unmount();
-      await Promise.resolve().then();
-    });
     document.body.removeChild(container);
   });
 
   async function init() {
-    function TestBase() {
-      function TestPlugin() {
-        [editor] = useLexicalComposerContext();
 
-        return null;
+    editor = createTestEditor({
+      nodes: [],
+      theme: {
+        code: 'editor-code',
+        heading: {
+          h1: 'editor-heading-h1',
+          h2: 'editor-heading-h2',
+          h3: 'editor-heading-h3',
+          h4: 'editor-heading-h4',
+          h5: 'editor-heading-h5',
+          h6: 'editor-heading-h6',
+        },
+        image: 'editor-image',
+        list: {
+          ol: 'editor-list-ol',
+          ul: 'editor-list-ul',
+        },
+        listitem: 'editor-listitem',
+        paragraph: 'editor-paragraph',
+        quote: 'editor-quote',
+        text: {
+          bold: 'editor-text-bold',
+          code: 'editor-text-code',
+          hashtag: 'editor-text-hashtag',
+          italic: 'editor-text-italic',
+          link: 'editor-text-link',
+          strikethrough: 'editor-text-strikethrough',
+          underline: 'editor-text-underline',
+          underlineStrikethrough: 'editor-text-underlineStrikethrough',
+        },
       }
+    });
 
-      return (
-        <TestComposer
-          config={{
-            nodes: [],
-            theme: {
-              code: 'editor-code',
-              heading: {
-                h1: 'editor-heading-h1',
-                h2: 'editor-heading-h2',
-                h3: 'editor-heading-h3',
-                h4: 'editor-heading-h4',
-                h5: 'editor-heading-h5',
-                h6: 'editor-heading-h6',
-              },
-              image: 'editor-image',
-              list: {
-                ol: 'editor-list-ol',
-                ul: 'editor-list-ul',
-              },
-              listitem: 'editor-listitem',
-              paragraph: 'editor-paragraph',
-              quote: 'editor-quote',
-              text: {
-                bold: 'editor-text-bold',
-                code: 'editor-text-code',
-                hashtag: 'editor-text-hashtag',
-                italic: 'editor-text-italic',
-                link: 'editor-text-link',
-                strikethrough: 'editor-text-strikethrough',
-                underline: 'editor-text-underline',
-                underlineStrikethrough: 'editor-text-underlineStrikethrough',
-              },
-            },
-          }}>
-          <RichTextPlugin
-            contentEditable={
-              // eslint-disable-next-line jsx-a11y/aria-role, @typescript-eslint/no-explicit-any
-              <ContentEditable role={null as any} spellCheck={null as any} />
-            }
-            placeholder={null}
-            ErrorBoundary={LexicalErrorBoundary}
-          />
-          <HistoryPlugin />
-          <TestPlugin />
-          <AutoFocusPlugin />
-        </TestComposer>
-      );
-    }
+    mergeRegister(
+      registerHistory(editor, createEmptyHistoryState(), 300),
+      registerRichText(editor),
+    );
 
-    await ReactTestUtils.act(async () => {
-      reactRoot.render(<TestBase />);
-      await Promise.resolve().then();
+    editor.setRootElement(root);
+    editor.update(() => {
+        const p = $createParagraphNode();
+        $insertNodes([p]);
     });
+    editor.commitUpdates();
+    editor.focus();
 
-    await Promise.resolve().then();
     // Focus first element
     setNativeSelectionWithPaths(
       editor!.getRootElement()!,
@@ -212,9 +188,8 @@ describe('LexicalSelection tests', () => {
   }
 
   async function update(fn: () => void) {
-    await ReactTestUtils.act(async () => {
-      await editor!.update(fn);
-    });
+    editor!.update(fn);
+    editor!.commitUpdates();
   }
 
   test('Expect initial output to be a block with no text.', () => {
@@ -734,301 +709,6 @@ describe('LexicalSelection tests', () => {
       name: 'Format selection that contains a token node in the middle should format the token node',
     },
 
-    // Tests need fixing:
-    // ...GRAPHEME_SCENARIOS.flatMap(({description, grapheme}) => [
-    //   {
-    //     name: `Delete backward eliminates entire ${description} (${grapheme})`,
-    //     inputs: [insertText(grapheme + grapheme), deleteBackward(1)],
-    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}</span></p></div>`,
-    //     expectedSelection: {
-    //       anchorPath: [0, 0, 0],
-    //       anchorOffset: grapheme.length,
-    //       focusPath: [0, 0, 0],
-    //       focusOffset: grapheme.length,
-    //     },
-    //     setup: emptySetup,
-    //   },
-    //   {
-    //     name: `Delete forward eliminates entire ${description} (${grapheme})`,
-    //     inputs: [
-    //       insertText(grapheme + grapheme),
-    //       moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
-    //       deleteForward(),
-    //     ],
-    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}</span></p></div>`,
-    //     expectedSelection: {
-    //       anchorPath: [0, 0, 0],
-    //       anchorOffset: 0,
-    //       focusPath: [0, 0, 0],
-    //       focusOffset: 0,
-    //     },
-    //     setup: emptySetup,
-    //   },
-    //   {
-    //     name: `Move backward skips over grapheme cluster (${grapheme})`,
-    //     inputs: [insertText(grapheme + grapheme), moveBackward(1)],
-    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}${grapheme}</span></p></div>`,
-    //     expectedSelection: {
-    //       anchorPath: [0, 0, 0],
-    //       anchorOffset: grapheme.length,
-    //       focusPath: [0, 0, 0],
-    //       focusOffset: grapheme.length,
-    //     },
-    //     setup: emptySetup,
-    //   },
-    //   {
-    //     name: `Move forward skips over grapheme cluster (${grapheme})`,
-    //     inputs: [
-    //       insertText(grapheme + grapheme),
-    //       moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
-    //       moveForward(),
-    //     ],
-    //     expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir=\"ltr\"><span>${grapheme}${grapheme}</span></p></div>`,
-    //     expectedSelection: {
-    //       anchorPath: [0, 0, 0],
-    //       anchorOffset: grapheme.length,
-    //       focusPath: [0, 0, 0],
-    //       focusOffset: grapheme.length,
-    //     },
-    //     setup: emptySetup,
-    //   },
-    // ]),
-    // {
-    //   name: 'Jump to beginning and insert',
-    //   inputs: [
-    //     insertText('1'),
-    //     insertText('1'),
-    //     insertText('2'),
-    //     insertText('3'),
-    //     moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 0),
-    //     insertText('a'),
-    //     insertText('b'),
-    //     insertText('c'),
-    //     deleteForward(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">abc123</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 3,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 3,
-    //   },
-    // },
-    // {
-    //   name: 'Select and replace',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     insertText('lexical'),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello lexical!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 13,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 13,
-    //   },
-    // },
-    // {
-    //   name: 'Select and bold',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatBold(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<strong class="editor-text-bold" data-lexical-text="true">draft</strong><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and italic',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatItalic(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<em class="editor-text-italic" data-lexical-text="true">draft</em><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and bold + italic',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatBold(),
-    //     formatItalic(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<strong class="editor-text-bold editor-text-italic" data-lexical-text="true">draft</strong><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and underline',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatUnderline(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<span class="editor-text-underline" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and strikethrough',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatStrikeThrough(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<span class="editor-text-strikethrough" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and underline + strikethrough',
-    //   inputs: [
-    //     insertText('Hello draft!'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 11),
-    //     formatUnderline(),
-    //     formatStrikeThrough(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span>' +
-    //     '<span class="editor-text-underlineStrikethrough" data-lexical-text="true">draft</span><span data-lexical-text="true">!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 1, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 1, 0],
-    //     focusOffset: 5,
-    //   },
-    // },
-    // {
-    //   name: 'Select and replace all',
-    //   inputs: [
-    //     insertText('This is broken.'),
-    //     moveNativeSelection([0, 0, 0], 0, [0, 0, 0], 15),
-    //     insertText('This works!'),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 11,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 11,
-    //   },
-    // },
-    // {
-    //   name: 'Select and delete',
-    //   inputs: [
-    //     insertText('A lion.'),
-    //     moveNativeSelection([0, 0, 0], 2, [0, 0, 0], 6),
-    //     deleteForward(),
-    //     insertText('duck'),
-    //     moveNativeSelection([0, 0, 0], 2, [0, 0, 0], 6),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A duck.</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 2,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 6,
-    //   },
-    // },
-    // {
-    //   name: 'Inserting a paragraph',
-    //   inputs: [insertParagraph()],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p>' +
-    //     '<p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [1, 0, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [1, 0, 0],
-    //     focusOffset: 0,
-    //   },
-    // },
-    // {
-    //   name: 'Inserting a paragraph and then removing it',
-    //   inputs: [insertParagraph(), deleteBackward(1)],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 0,
-    //   },
-    // },
-    // {
-    //   name: 'Inserting a paragraph part way through text',
-    //   inputs: [
-    //     insertText('Hello world'),
-    //     moveNativeSelection([0, 0, 0], 6, [0, 0, 0], 6),
-    //     insertParagraph(),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span></p>' +
-    //     '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">world</span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [1, 0, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [1, 0, 0],
-    //     focusOffset: 0,
-    //   },
-    // },
-    // {
-    //   name: 'Inserting two paragraphs and then deleting via selection',
-    //   inputs: [
-    //     insertText('123'),
-    //     insertParagraph(),
-    //     insertText('456'),
-    //     moveNativeSelection([0, 0, 0], 0, [1, 0, 0], 3),
-    //     deleteBackward(1),
-    //   ],
-    //   expectedHTML:
-    //     '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true"><br></span></p></div>',
-    //   expectedSelection: {
-    //     anchorPath: [0, 0, 0],
-    //     anchorOffset: 0,
-    //     focusPath: [0, 0, 0],
-    //     focusOffset: 0,
-    //   },
-    // },
     ...[
       {
         whitespaceCharacter: ' ',
@@ -1254,47 +934,43 @@ describe('LexicalSelection tests', () => {
   });
 
   test('insert text one selected node element selection', async () => {
-    await ReactTestUtils.act(async () => {
-      await editor!.update(() => {
-        const root = $getRoot();
+    await editor!.update(() => {
+      const root = $getRoot();
 
-        const paragraph = root.getFirstChild<ParagraphNode>()!;
+      const paragraph = root.getFirstChild<ParagraphNode>()!;
 
-        const elementNode = $createTestElementNode();
-        const text = $createTextNode('foo');
+      const elementNode = $createTestElementNode();
+      const text = $createTextNode('foo');
 
-        paragraph.append(elementNode);
-        elementNode.append(text);
+      paragraph.append(elementNode);
+      elementNode.append(text);
 
-        const selection = $createRangeSelection();
-        selection.anchor.set(text.__key, 0, 'text');
-        selection.focus.set(paragraph.__key, 1, 'element');
+      const selection = $createRangeSelection();
+      selection.anchor.set(text.__key, 0, 'text');
+      selection.focus.set(paragraph.__key, 1, 'element');
 
-        selection.insertText('');
+      selection.insertText('');
 
-        expect(root.getTextContent()).toBe('');
-      });
+      expect(root.getTextContent()).toBe('');
     });
   });
 
   test('getNodes resolves nested block nodes', async () => {
-    await ReactTestUtils.act(async () => {
-      await editor!.update(() => {
-        const root = $getRoot();
+    await editor!.update(() => {
+      const root = $getRoot();
 
-        const paragraph = root.getFirstChild<ParagraphNode>()!;
+      const paragraph = root.getFirstChild<ParagraphNode>()!;
 
-        const elementNode = $createTestElementNode();
-        const text = $createTextNode();
+      const elementNode = $createTestElementNode();
+      const text = $createTextNode();
 
-        paragraph.append(elementNode);
-        elementNode.append(text);
+      paragraph.append(elementNode);
+      elementNode.append(text);
 
-        const selectedNodes = $getSelection()!.getNodes();
+      const selectedNodes = $getSelection()!.getNodes();
 
-        expect(selectedNodes.length).toBe(1);
-        expect(selectedNodes[0].getKey()).toBe(text.getKey());
-      });
+      expect(selectedNodes.length).toBe(1);
+      expect(selectedNodes[0].getKey()).toBe(text.getKey());
     });
   });
 
@@ -1851,50 +1527,48 @@ describe('LexicalSelection tests', () => {
           // eslint-disable-next-line no-only-tests/no-only-tests
           const test_ = only === true ? test.only : test;
           test_(name, async () => {
-            await ReactTestUtils.act(async () => {
-              await editor!.update(() => {
-                const root = $getRoot();
-
-                const paragraph = root.getFirstChild<ParagraphNode>()!;
-                const textNode = $createTextNode('foo');
-                // Note: line break can't be selected by the DOM
-                const linebreak = $createLineBreakNode();
-
-                const selection = $getSelection();
-
-                if (!$isRangeSelection(selection)) {
-                  return;
-                }
-
-                const anchor = selection.anchor;
-                const focus = selection.focus;
-
-                paragraph.append(textNode, linebreak);
-
-                fnBefore(paragraph, textNode);
-
-                anchor.set(paragraph.getKey(), anchorOffset, 'element');
-                focus.set(paragraph.getKey(), focusOffset, 'element');
-
-                const {
-                  expectedAnchor,
-                  expectedAnchorOffset,
-                  expectedFocus,
-                  expectedFocusOffset,
-                } = fn(paragraph, textNode);
-
-                if (invertSelection !== true) {
-                  expect(selection.anchor.key).toBe(expectedAnchor.__key);
-                  expect(selection.anchor.offset).toBe(expectedAnchorOffset);
-                  expect(selection.focus.key).toBe(expectedFocus.__key);
-                  expect(selection.focus.offset).toBe(expectedFocusOffset);
-                } else {
-                  expect(selection.anchor.key).toBe(expectedFocus.__key);
-                  expect(selection.anchor.offset).toBe(expectedFocusOffset);
-                  expect(selection.focus.key).toBe(expectedAnchor.__key);
-                  expect(selection.focus.offset).toBe(expectedAnchorOffset);
-                }
-              });
+            await editor!.update(() => {
+              const root = $getRoot();
+
+              const paragraph = root.getFirstChild<ParagraphNode>()!;
+              const textNode = $createTextNode('foo');
+              // Note: line break can't be selected by the DOM
+              const linebreak = $createLineBreakNode();
+
+              const selection = $getSelection();
+
+              if (!$isRangeSelection(selection)) {
+                return;
+              }
+
+              const anchor = selection.anchor;
+              const focus = selection.focus;
+
+              paragraph.append(textNode, linebreak);
+
+              fnBefore(paragraph, textNode);
+
+              anchor.set(paragraph.getKey(), anchorOffset, 'element');
+              focus.set(paragraph.getKey(), focusOffset, 'element');
+
+              const {
+                expectedAnchor,
+                expectedAnchorOffset,
+                expectedFocus,
+                expectedFocusOffset,
+              } = fn(paragraph, textNode);
+
+              if (invertSelection !== true) {
+                expect(selection.anchor.key).toBe(expectedAnchor.__key);
+                expect(selection.anchor.offset).toBe(expectedAnchorOffset);
+                expect(selection.focus.key).toBe(expectedFocus.__key);
+                expect(selection.focus.offset).toBe(expectedFocusOffset);
+              } else {
+                expect(selection.anchor.key).toBe(expectedFocus.__key);
+                expect(selection.anchor.offset).toBe(expectedFocusOffset);
+                expect(selection.focus.key).toBe(expectedAnchor.__key);
+                expect(selection.focus.offset).toBe(expectedAnchorOffset);
+              }
             });
           });
         },
@@ -1903,162 +1577,154 @@ describe('LexicalSelection tests', () => {
 
   describe('Selection correctly resolves to a sibling ElementNode when a node is removed', () => {
     test('', async () => {
-      await ReactTestUtils.act(async () => {
-        await editor!.update(() => {
-          const root = $getRoot();
+      await editor!.update(() => {
+        const root = $getRoot();
 
-          const listNode = $createListNode('bullet');
-          const listItemNode = $createListItemNode();
-          const paragraph = $createParagraphNode();
+        const listNode = $createListNode('bullet');
+        const listItemNode = $createListItemNode();
+        const paragraph = $createParagraphNode();
 
-          root.append(listNode);
+        root.append(listNode);
 
-          listNode.append(listItemNode);
-          listItemNode.select();
-          listNode.insertAfter(paragraph);
-          listItemNode.remove();
+        listNode.append(listItemNode);
+        listItemNode.select();
+        listNode.insertAfter(paragraph);
+        listItemNode.remove();
 
-          const selection = $getSelection();
+        const selection = $getSelection();
 
-          if (!$isRangeSelection(selection)) {
-            return;
-          }
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
 
-          expect(selection.anchor.getNode().__type).toBe('paragraph');
-          expect(selection.focus.getNode().__type).toBe('paragraph');
-        });
+        expect(selection.anchor.getNode().__type).toBe('paragraph');
+        expect(selection.focus.getNode().__type).toBe('paragraph');
       });
     });
   });
 
   describe('Selection correctly resolves to a sibling ElementNode when a selected node child is removed', () => {
     test('', async () => {
-      await ReactTestUtils.act(async () => {
-        let paragraphNodeKey: string;
-        await editor!.update(() => {
-          const root = $getRoot();
-
-          const paragraphNode = $createParagraphNode();
-          paragraphNodeKey = paragraphNode.__key;
-          const listNode = $createListNode('number');
-          const listItemNode1 = $createListItemNode();
-          const textNode1 = $createTextNode('foo');
-          const listItemNode2 = $createListItemNode();
-          const listNode2 = $createListNode('number');
-          const listItemNode2x1 = $createListItemNode();
-
-          listNode.append(listItemNode1, listItemNode2);
-          listItemNode1.append(textNode1);
-          listItemNode2.append(listNode2);
-          listNode2.append(listItemNode2x1);
-          root.append(paragraphNode, listNode);
-
-          listItemNode2.select();
-
-          listNode.remove();
-        });
-        await editor!.getEditorState().read(() => {
-          const selection = $assertRangeSelection($getSelection());
-          expect(selection.anchor.key).toBe(paragraphNodeKey);
-          expect(selection.focus.key).toBe(paragraphNodeKey);
-        });
+      let paragraphNodeKey: string;
+      await editor!.update(() => {
+        const root = $getRoot();
+
+        const paragraphNode = $createParagraphNode();
+        paragraphNodeKey = paragraphNode.__key;
+        const listNode = $createListNode('number');
+        const listItemNode1 = $createListItemNode();
+        const textNode1 = $createTextNode('foo');
+        const listItemNode2 = $createListItemNode();
+        const listNode2 = $createListNode('number');
+        const listItemNode2x1 = $createListItemNode();
+
+        listNode.append(listItemNode1, listItemNode2);
+        listItemNode1.append(textNode1);
+        listItemNode2.append(listNode2);
+        listNode2.append(listItemNode2x1);
+        root.append(paragraphNode, listNode);
+
+        listItemNode2.select();
+
+        listNode.remove();
+      });
+      await editor!.getEditorState().read(() => {
+        const selection = $assertRangeSelection($getSelection());
+        expect(selection.anchor.key).toBe(paragraphNodeKey);
+        expect(selection.focus.key).toBe(paragraphNodeKey);
       });
     });
   });
 
   describe('Selection correctly resolves to a sibling ElementNode that has multiple children with the correct offset when a node is removed', () => {
     test('', async () => {
-      await ReactTestUtils.act(async () => {
-        await editor!.update(() => {
-          // Arrange
-          // Root
-          //  |- Paragraph
-          //    |- Link
-          //      |- Text
-          //      |- LineBreak
-          //      |- Text
-          //    |- Text
-          const root = $getRoot();
-
-          const paragraph = $createParagraphNode();
-          const link = $createLinkNode('bullet');
-          const textOne = $createTextNode('Hello');
-          const br = $createLineBreakNode();
-          const textTwo = $createTextNode('world');
-          const textThree = $createTextNode(' ');
-
-          root.append(paragraph);
-          link.append(textOne);
-          link.append(br);
-          link.append(textTwo);
-
-          paragraph.append(link);
-          paragraph.append(textThree);
-
-          textThree.select();
-          // Act
-          textThree.remove();
-          // Assert
-          const expectedKey = link.getKey();
+      await editor!.update(() => {
+        // Arrange
+        // Root
+        //  |- Paragraph
+        //    |- Link
+        //      |- Text
+        //      |- LineBreak
+        //      |- Text
+        //    |- Text
+        const root = $getRoot();
 
-          const selection = $getSelection();
+        const paragraph = $createParagraphNode();
+        const link = $createLinkNode('bullet');
+        const textOne = $createTextNode('Hello');
+        const br = $createLineBreakNode();
+        const textTwo = $createTextNode('world');
+        const textThree = $createTextNode(' ');
 
-          if (!$isRangeSelection(selection)) {
-            return;
-          }
+        root.append(paragraph);
+        link.append(textOne);
+        link.append(br);
+        link.append(textTwo);
 
-          const {anchor, focus} = selection;
+        paragraph.append(link);
+        paragraph.append(textThree);
 
-          expect(anchor.getNode().getKey()).toBe(expectedKey);
-          expect(focus.getNode().getKey()).toBe(expectedKey);
-          expect(anchor.offset).toBe(3);
-          expect(focus.offset).toBe(3);
-        });
+        textThree.select();
+        // Act
+        textThree.remove();
+        // Assert
+        const expectedKey = link.getKey();
+
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
+
+        const {anchor, focus} = selection;
+
+        expect(anchor.getNode().getKey()).toBe(expectedKey);
+        expect(focus.getNode().getKey()).toBe(expectedKey);
+        expect(anchor.offset).toBe(3);
+        expect(focus.offset).toBe(3);
       });
     });
   });
 
   test('isBackward', async () => {
-    await ReactTestUtils.act(async () => {
-      await editor!.update(() => {
-        const root = $getRoot();
+    await editor!.update(() => {
+      const root = $getRoot();
 
-        const paragraph = root.getFirstChild<ParagraphNode>()!;
-        const paragraphKey = paragraph.getKey();
-        const textNode = $createTextNode('foo');
-        const textNodeKey = textNode.getKey();
-        // Note: line break can't be selected by the DOM
-        const linebreak = $createLineBreakNode();
+      const paragraph = root.getFirstChild<ParagraphNode>()!;
+      const paragraphKey = paragraph.getKey();
+      const textNode = $createTextNode('foo');
+      const textNodeKey = textNode.getKey();
+      // Note: line break can't be selected by the DOM
+      const linebreak = $createLineBreakNode();
 
-        const selection = $getSelection();
+      const selection = $getSelection();
 
-        if (!$isRangeSelection(selection)) {
-          return;
-        }
+      if (!$isRangeSelection(selection)) {
+        return;
+      }
 
-        const anchor = selection.anchor;
-        const focus = selection.focus;
-        paragraph.append(textNode, linebreak);
-        anchor.set(textNodeKey, 0, 'text');
-        focus.set(textNodeKey, 0, 'text');
+      const anchor = selection.anchor;
+      const focus = selection.focus;
+      paragraph.append(textNode, linebreak);
+      anchor.set(textNodeKey, 0, 'text');
+      focus.set(textNodeKey, 0, 'text');
 
-        expect(selection.isBackward()).toBe(false);
+      expect(selection.isBackward()).toBe(false);
 
-        anchor.set(paragraphKey, 1, 'element');
-        focus.set(paragraphKey, 1, 'element');
+      anchor.set(paragraphKey, 1, 'element');
+      focus.set(paragraphKey, 1, 'element');
 
-        expect(selection.isBackward()).toBe(false);
+      expect(selection.isBackward()).toBe(false);
 
-        anchor.set(paragraphKey, 0, 'element');
-        focus.set(paragraphKey, 1, 'element');
+      anchor.set(paragraphKey, 0, 'element');
+      focus.set(paragraphKey, 1, 'element');
 
-        expect(selection.isBackward()).toBe(false);
+      expect(selection.isBackward()).toBe(false);
 
-        anchor.set(paragraphKey, 1, 'element');
-        focus.set(paragraphKey, 0, 'element');
+      anchor.set(paragraphKey, 1, 'element');
+      focus.set(paragraphKey, 0, 'element');
 
-        expect(selection.isBackward()).toBe(true);
-      });
+      expect(selection.isBackward()).toBe(true);
     });
   });
 
@@ -2144,34 +1810,32 @@ describe('LexicalSelection tests', () => {
       })
       .forEach(({name, fn, invertSelection}) => {
         it(name, async () => {
-          await ReactTestUtils.act(async () => {
-            await editor!.update(() => {
-              const root = $getRoot();
+          await editor!.update(() => {
+            const root = $getRoot();
 
-              const paragraph = root.getFirstChild<ParagraphNode>()!;
-              const textNode1 = $createTextNode('1');
-              const textNode2 = $createTextNode('2');
-              const decorator = $createTestDecoratorNode();
+            const paragraph = root.getFirstChild<ParagraphNode>()!;
+            const textNode1 = $createTextNode('1');
+            const textNode2 = $createTextNode('2');
+            const decorator = $createTestDecoratorNode();
 
-              paragraph.append(textNode1, decorator, textNode2);
+            paragraph.append(textNode1, decorator, textNode2);
 
-              const selection = $getSelection();
+            const selection = $getSelection();
 
-              if (!$isRangeSelection(selection)) {
-                return;
-              }
-
-              const expectedTextContent = fn({
-                anchor: invertSelection ? selection.focus : selection.anchor,
-                decorator,
-                focus: invertSelection ? selection.anchor : selection.focus,
-                paragraph,
-                textNode1,
-                textNode2,
-              });
+            if (!$isRangeSelection(selection)) {
+              return;
+            }
 
-              expect(selection.getTextContent()).toBe(expectedTextContent);
+            const expectedTextContent = fn({
+              anchor: invertSelection ? selection.focus : selection.anchor,
+              decorator,
+              focus: invertSelection ? selection.anchor : selection.focus,
+              paragraph,
+              textNode1,
+              textNode2,
             });
+
+            expect(selection.getTextContent()).toBe(expectedTextContent);
           });
         });
       });
@@ -2274,44 +1938,42 @@ describe('LexicalSelection tests', () => {
     it('adjust offset for inline elements text formatting', async () => {
       await init();
 
-      await ReactTestUtils.act(async () => {
-        await editor!.update(() => {
-          const root = $getRoot();
+      await editor!.update(() => {
+        const root = $getRoot();
 
-          const text1 = $createTextNode('--');
-          const text2 = $createTextNode('abc');
-          const text3 = $createTextNode('--');
+        const text1 = $createTextNode('--');
+        const text2 = $createTextNode('abc');
+        const text3 = $createTextNode('--');
 
-          root.append(
+        root.append(
             $createParagraphNode().append(
-              text1,
-              $createLinkNode('https://lexical.dev').append(text2),
-              text3,
+                text1,
+                $createLinkNode('https://lexical.dev').append(text2),
+                text3,
             ),
-          );
+        );
 
-          $setAnchorPoint({
-            key: text1.getKey(),
-            offset: 2,
-            type: 'text',
-          });
+        $setAnchorPoint({
+          key: text1.getKey(),
+          offset: 2,
+          type: 'text',
+        });
 
-          $setFocusPoint({
-            key: text3.getKey(),
-            offset: 0,
-            type: 'text',
-          });
+        $setFocusPoint({
+          key: text3.getKey(),
+          offset: 0,
+          type: 'text',
+        });
 
-          const selection = $getSelection();
+        const selection = $getSelection();
 
-          if (!$isRangeSelection(selection)) {
-            return;
-          }
+        if (!$isRangeSelection(selection)) {
+          return;
+        }
 
-          selection.formatText('bold');
+        selection.formatText('bold');
 
-          expect(text2.hasFormat('bold')).toBe(true);
-        });
+        expect(text2.hasFormat('bold')).toBe(true);
       });
     });
   });
@@ -2504,107 +2166,103 @@ describe('LexicalSelection tests', () => {
 
   describe('$patchStyle', () => {
     it('should patch the style with the new style object', async () => {
-      await ReactTestUtils.act(async () => {
-        await editor!.update(() => {
-          const root = $getRoot();
-          const paragraph = $createParagraphNode();
-          const textNode = $createTextNode('Hello, World!');
-          textNode.setStyle('font-family: serif; color: red;');
-          $addNodeStyle(textNode);
-          paragraph.append(textNode);
-          root.append(paragraph);
-
-          const selection = $createRangeSelection();
-          $setSelection(selection);
-          selection.insertParagraph();
-          $setAnchorPoint({
-            key: textNode.getKey(),
-            offset: 0,
-            type: 'text',
-          });
+      await editor!.update(() => {
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const textNode = $createTextNode('Hello, World!');
+        textNode.setStyle('font-family: serif; color: red;');
+        $addNodeStyle(textNode);
+        paragraph.append(textNode);
+        root.append(paragraph);
 
-          $setFocusPoint({
-            key: textNode.getKey(),
-            offset: 10,
-            type: 'text',
-          });
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        selection.insertParagraph();
+        $setAnchorPoint({
+          key: textNode.getKey(),
+          offset: 0,
+          type: 'text',
+        });
 
-          const newStyle = {
-            color: 'blue',
-            'font-family': 'Arial',
-          };
+        $setFocusPoint({
+          key: textNode.getKey(),
+          offset: 10,
+          type: 'text',
+        });
+
+        const newStyle = {
+          color: 'blue',
+          'font-family': 'Arial',
+        };
 
-          $patchStyleText(selection, newStyle);
+        $patchStyleText(selection, newStyle);
 
-          const cssFontFamilyValue = $getSelectionStyleValueForProperty(
+        const cssFontFamilyValue = $getSelectionStyleValueForProperty(
             selection,
             'font-family',
             '',
-          );
-          expect(cssFontFamilyValue).toBe('Arial');
+        );
+        expect(cssFontFamilyValue).toBe('Arial');
 
-          const cssColorValue = $getSelectionStyleValueForProperty(
+        const cssColorValue = $getSelectionStyleValueForProperty(
             selection,
             'color',
             '',
-          );
-          expect(cssColorValue).toBe('blue');
-        });
+        );
+        expect(cssColorValue).toBe('blue');
       });
     });
 
     it('should patch the style with property function', async () => {
-      await ReactTestUtils.act(async () => {
-        await editor!.update(() => {
-          const currentColor = 'red';
-          const nextColor = 'blue';
-
-          const root = $getRoot();
-          const paragraph = $createParagraphNode();
-          const textNode = $createTextNode('Hello, World!');
-          textNode.setStyle(`color: ${currentColor};`);
-          $addNodeStyle(textNode);
-          paragraph.append(textNode);
-          root.append(paragraph);
-
-          const selection = $createRangeSelection();
-          $setSelection(selection);
-          selection.insertParagraph();
-          $setAnchorPoint({
-            key: textNode.getKey(),
-            offset: 0,
-            type: 'text',
-          });
+      await editor!.update(() => {
+        const currentColor = 'red';
+        const nextColor = 'blue';
 
-          $setFocusPoint({
-            key: textNode.getKey(),
-            offset: 10,
-            type: 'text',
-          });
+        const root = $getRoot();
+        const paragraph = $createParagraphNode();
+        const textNode = $createTextNode('Hello, World!');
+        textNode.setStyle(`color: ${currentColor};`);
+        $addNodeStyle(textNode);
+        paragraph.append(textNode);
+        root.append(paragraph);
 
-          const newStyle = {
-            color: jest.fn(
+        const selection = $createRangeSelection();
+        $setSelection(selection);
+        selection.insertParagraph();
+        $setAnchorPoint({
+          key: textNode.getKey(),
+          offset: 0,
+          type: 'text',
+        });
+
+        $setFocusPoint({
+          key: textNode.getKey(),
+          offset: 10,
+          type: 'text',
+        });
+
+        const newStyle = {
+          color: jest.fn(
               (current: string | null, target: LexicalNode | RangeSelection) =>
-                nextColor,
-            ),
-          };
+                  nextColor,
+          ),
+        };
 
-          $patchStyleText(selection, newStyle);
+        $patchStyleText(selection, newStyle);
 
-          const cssColorValue = $getSelectionStyleValueForProperty(
+        const cssColorValue = $getSelectionStyleValueForProperty(
             selection,
             'color',
             '',
-          );
+        );
 
-          expect(cssColorValue).toBe(nextColor);
-          expect(newStyle.color).toHaveBeenCalledTimes(1);
+        expect(cssColorValue).toBe(nextColor);
+        expect(newStyle.color).toHaveBeenCalledTimes(1);
 
-          const lastCall = newStyle.color.mock.lastCall!;
-          expect(lastCall[0]).toBe(currentColor);
-          // @ts-ignore - It expected to be a LexicalNode
-          expect($isTextNode(lastCall[1])).toBeTruthy();
-        });
+        const lastCall = newStyle.color.mock.lastCall!;
+        expect(lastCall[0]).toBe(currentColor);
+        // @ts-ignore - It expected to be a LexicalNode
+        expect($isTextNode(lastCall[1])).toBeTruthy();
       });
     });
   });
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
similarity index 53%
rename from resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
rename to resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
index 37049e598d6..6ce133d184e 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.tsx
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
@@ -7,22 +7,14 @@
  */
 
 import {$insertDataTransferForRichText} from '@lexical/clipboard';
-import {TablePlugin} from '@lexical/react/LexicalTablePlugin';
 import {
   $createTableNode,
-  $createTableNodeWithDimensions,
-  $createTableSelection,
 } from '@lexical/table';
 import {
   $createParagraphNode,
-  $createTextNode,
   $getRoot,
   $getSelection,
   $isRangeSelection,
-  $selectAll,
-  $setSelection,
-  CUT_COMMAND,
-  ParagraphNode,
 } from 'lexical';
 import {
   DataTransferMock,
@@ -30,8 +22,6 @@ import {
   invariant,
 } from 'lexical/__tests__/utils';
 
-import {$getElementForTableNode, TableNode} from '../../LexicalTableNode';
-
 export class ClipboardDataMock {
   getData: jest.Mock<string, [string]>;
   setData: jest.Mock<void, [string, string]>;
@@ -149,203 +139,7 @@ describe('LexicalTableNode tests', () => {
           `<table><tr style="height: 21px;"><td><p dir="ltr"><strong data-lexical-text="true">Surface</strong></p></td><td><p dir="ltr"><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td><p style="text-align: right;"><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td><p dir="ltr"><span data-lexical-text="true">Lexical</span></p></td><td><p dir="ltr"><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td><p dir="ltr"><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
         );
       });
-
-      test('Cut table in the middle of a range selection', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const paragraph = root.getFirstChild<ParagraphNode>();
-          const beforeText = $createTextNode('text before the table');
-          const table = $createTableNodeWithDimensions(4, 4, true);
-          const afterText = $createTextNode('text after the table');
-
-          paragraph?.append(beforeText);
-          paragraph?.append(table);
-          paragraph?.append(afterText);
-        });
-        await editor.update(() => {
-          editor.focus();
-          $selectAll();
-        });
-        await editor.update(() => {
-          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
-        });
-
-        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
-      });
-
-      test('Cut table as last node in range selection ', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const paragraph = root.getFirstChild<ParagraphNode>();
-          const beforeText = $createTextNode('text before the table');
-          const table = $createTableNodeWithDimensions(4, 4, true);
-
-          paragraph?.append(beforeText);
-          paragraph?.append(table);
-        });
-        await editor.update(() => {
-          editor.focus();
-          $selectAll();
-        });
-        await editor.update(() => {
-          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
-        });
-
-        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
-      });
-
-      test('Cut table as first node in range selection ', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const paragraph = root.getFirstChild<ParagraphNode>();
-          const table = $createTableNodeWithDimensions(4, 4, true);
-          const afterText = $createTextNode('text after the table');
-
-          paragraph?.append(table);
-          paragraph?.append(afterText);
-        });
-        await editor.update(() => {
-          editor.focus();
-          $selectAll();
-        });
-        await editor.update(() => {
-          editor.dispatchCommand(CUT_COMMAND, {} as ClipboardEvent);
-        });
-
-        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
-      });
-
-      test('Cut table is whole selection, should remove it', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = $createTableNodeWithDimensions(4, 4, true);
-          root.append(table);
-        });
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = root.getLastChild<TableNode>();
-          if (table) {
-            const DOMTable = $getElementForTableNode(editor, table);
-            if (DOMTable) {
-              table
-                ?.getCellNodeFromCords(0, 0, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('some text'));
-              const selection = $createTableSelection();
-              selection.set(
-                table.__key,
-                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
-                table?.getCellNodeFromCords(3, 3, DOMTable)?.__key || '',
-              );
-              $setSelection(selection);
-              editor.dispatchCommand(CUT_COMMAND, {
-                preventDefault: () => {},
-                stopPropagation: () => {},
-              } as ClipboardEvent);
-            }
-          }
-        });
-
-        expect(testEnv.innerHTML).toBe(`<p><br></p>`);
-      });
-
-      test('Cut subsection of table cells, should just clear contents', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = $createTableNodeWithDimensions(4, 4, true);
-          root.append(table);
-        });
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = root.getLastChild<TableNode>();
-          if (table) {
-            const DOMTable = $getElementForTableNode(editor, table);
-            if (DOMTable) {
-              table
-                ?.getCellNodeFromCords(0, 0, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('some text'));
-              const selection = $createTableSelection();
-              selection.set(
-                table.__key,
-                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
-                table?.getCellNodeFromCords(2, 2, DOMTable)?.__key || '',
-              );
-              $setSelection(selection);
-              editor.dispatchCommand(CUT_COMMAND, {
-                preventDefault: () => {},
-                stopPropagation: () => {},
-              } as ClipboardEvent);
-            }
-          }
-        });
-
-        expect(testEnv.innerHTML).toBe(
-          `<p><br></p><table><tr><th><p><br></p></th><th><p><br></p></th><th><p><br></p></th><th><p><br></p></th></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><th><p><br></p></th><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></table>`,
-        );
-      });
-
-      test('Table plain text output validation', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = $createTableNodeWithDimensions(4, 4, true);
-          root.append(table);
-        });
-        await editor.update(() => {
-          const root = $getRoot();
-          const table = root.getLastChild<TableNode>();
-          if (table) {
-            const DOMTable = $getElementForTableNode(editor, table);
-            if (DOMTable) {
-              table
-                ?.getCellNodeFromCords(0, 0, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('1'));
-              table
-                ?.getCellNodeFromCords(1, 0, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode(''));
-              table
-                ?.getCellNodeFromCords(2, 0, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('2'));
-              table
-                ?.getCellNodeFromCords(0, 1, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('3'));
-              table
-                ?.getCellNodeFromCords(1, 1, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode('4'));
-              table
-                ?.getCellNodeFromCords(2, 1, DOMTable)
-                ?.getLastChild<ParagraphNode>()
-                ?.append($createTextNode(''));
-              const selection = $createTableSelection();
-              selection.set(
-                table.__key,
-                table?.getCellNodeFromCords(0, 0, DOMTable)?.__key || '',
-                table?.getCellNodeFromCords(2, 1, DOMTable)?.__key || '',
-              );
-              expect(selection.getTextContent()).toBe(`1\t\t2\n3\t4\t\n`);
-            }
-          }
-        });
-      });
     },
     undefined,
-    <TablePlugin />,
   );
 });
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
similarity index 73%
rename from resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
rename to resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
index 9e9dbac8131..35ee65b688c 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.tsx
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
@@ -19,9 +19,6 @@ import {
   TextNode,
 } from 'lexical';
 import {createTestEditor} from 'lexical/__tests__/utils';
-import {createRef, useEffect, useMemo} from 'react';
-import {createRoot, Root} from 'react-dom/client';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
 
 describe('table selection', () => {
   let originalText: TextNode;
@@ -31,57 +28,35 @@ describe('table selection', () => {
   let paragraphKey: string;
   let textKey: string;
   let parsedEditorState: EditorState;
-  let reactRoot: Root;
+  let root: HTMLDivElement;
   let container: HTMLDivElement | null = null;
   let editor: LexicalEditor | null = null;
 
   beforeEach(() => {
     container = document.createElement('div');
-    reactRoot = createRoot(container);
+    root = document.createElement('div');
+    root.setAttribute('contenteditable', 'true');
     document.body.appendChild(container);
   });
 
-  function useLexicalEditor(
-    rootElementRef: React.RefObject<HTMLDivElement>,
-    onError?: () => void,
-  ) {
-    const editorInHook = useMemo(
-      () =>
-        createTestEditor({
-          nodes: [],
-          onError: onError || jest.fn(),
-          theme: {
-            text: {
-              bold: 'editor-text-bold',
-              italic: 'editor-text-italic',
-              underline: 'editor-text-underline',
-            },
-          },
-        }),
-      [onError],
-    );
-
-    useEffect(() => {
-      const rootElement = rootElementRef.current;
-
-      editorInHook.setRootElement(rootElement);
-    }, [rootElementRef, editorInHook]);
-
-    return editorInHook;
-  }
+  afterEach(() => {
+    container?.remove();
+  });
 
   function init(onError?: () => void) {
-    const ref = createRef<HTMLDivElement>();
-
-    function TestBase() {
-      editor = useLexicalEditor(ref, onError);
-
-      return <div ref={ref} contentEditable={true} />;
-    }
-
-    ReactTestUtils.act(() => {
-      reactRoot.render(<TestBase />);
-    });
+    editor = createTestEditor({
+      nodes: [],
+      onError: onError || jest.fn(),
+      theme: {
+        text: {
+          bold: 'editor-text-bold',
+          italic: 'editor-text-italic',
+          underline: 'editor-text-underline',
+        },
+      },
+    })
+
+    editor.setRootElement(root);
   }
 
   async function update(fn: () => void) {
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
similarity index 85%
rename from resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
rename to resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
index 2d5db2c6913..53c743df637 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.tsx
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
@@ -5,27 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-
-import {CodeHighlightNode, CodeNode} from '@lexical/code';
-import {HashtagNode} from '@lexical/hashtag';
 import {AutoLinkNode, LinkNode} from '@lexical/link';
 import {ListItemNode, ListNode} from '@lexical/list';
-import {OverflowNode} from '@lexical/overflow';
-import {AutoFocusPlugin} from '@lexical/react/LexicalAutoFocusPlugin';
-import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
-import {ContentEditable} from '@lexical/react/LexicalContentEditable';
-import {LexicalErrorBoundary} from '@lexical/react/LexicalErrorBoundary';
-import {RichTextPlugin} from '@lexical/react/LexicalRichTextPlugin';
-import {HeadingNode, QuoteNode} from '@lexical/rich-text';
+import {HeadingNode, QuoteNode, registerRichText} from '@lexical/rich-text';
 import {
   applySelectionInputs,
   pasteHTML,
-} from '@lexical/selection/src/__tests__/utils';
+} from '@lexical/selection/__tests__/utils';
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
-import {LexicalEditor} from 'lexical';
-import {initializeClipboard, TestComposer} from 'lexical/__tests__/utils';
-import {createRoot} from 'react-dom/client';
-import * as ReactTestUtils from 'lexical/shared/react-test-utils';
+import {$createParagraphNode, $insertNodes, LexicalEditor} from 'lexical';
+import {createTestEditor, initializeClipboard} from 'lexical/__tests__/utils';
 
 jest.mock('lexical/shared/environment', () => {
   const originalModule = jest.requireActual('lexical/shared/environment');
@@ -89,85 +78,69 @@ describe('LexicalEventHelpers', () => {
   let editor: LexicalEditor | null = null;
 
   async function init() {
-    function TestBase() {
-      function TestPlugin(): null {
-        [editor] = useLexicalComposerContext();
 
-        return null;
-      }
+    const config = {
+      nodes: [
+        LinkNode,
+        HeadingNode,
+        ListNode,
+        ListItemNode,
+        QuoteNode,
+        TableNode,
+        TableCellNode,
+        TableRowNode,
+        AutoLinkNode,
+      ],
+      theme: {
+        code: 'editor-code',
+        heading: {
+          h1: 'editor-heading-h1',
+          h2: 'editor-heading-h2',
+          h3: 'editor-heading-h3',
+          h4: 'editor-heading-h4',
+          h5: 'editor-heading-h5',
+          h6: 'editor-heading-h6',
+        },
+        image: 'editor-image',
+        list: {
+          listitem: 'editor-listitem',
+          olDepth: ['editor-list-ol'],
+          ulDepth: ['editor-list-ul'],
+        },
+        paragraph: 'editor-paragraph',
+        placeholder: 'editor-placeholder',
+        quote: 'editor-quote',
+        text: {
+          bold: 'editor-text-bold',
+          code: 'editor-text-code',
+          hashtag: 'editor-text-hashtag',
+          italic: 'editor-text-italic',
+          link: 'editor-text-link',
+          strikethrough: 'editor-text-strikethrough',
+          underline: 'editor-text-underline',
+          underlineStrikethrough: 'editor-text-underlineStrikethrough',
+        },
+      },
+    };
+
+    editor = createTestEditor(config);
+    registerRichText(editor);
+
+    const root = document.createElement('div');
+    root.setAttribute('contenteditable', 'true');
+    container?.append(root);
 
-      return (
-        <TestComposer
-          config={{
-            nodes: [
-              LinkNode,
-              HeadingNode,
-              ListNode,
-              ListItemNode,
-              QuoteNode,
-              CodeNode,
-              TableNode,
-              TableCellNode,
-              TableRowNode,
-              HashtagNode,
-              CodeHighlightNode,
-              AutoLinkNode,
-              OverflowNode,
-            ],
-            theme: {
-              code: 'editor-code',
-              heading: {
-                h1: 'editor-heading-h1',
-                h2: 'editor-heading-h2',
-                h3: 'editor-heading-h3',
-                h4: 'editor-heading-h4',
-                h5: 'editor-heading-h5',
-                h6: 'editor-heading-h6',
-              },
-              image: 'editor-image',
-              list: {
-                listitem: 'editor-listitem',
-                olDepth: ['editor-list-ol'],
-                ulDepth: ['editor-list-ul'],
-              },
-              paragraph: 'editor-paragraph',
-              placeholder: 'editor-placeholder',
-              quote: 'editor-quote',
-              text: {
-                bold: 'editor-text-bold',
-                code: 'editor-text-code',
-                hashtag: 'editor-text-hashtag',
-                italic: 'editor-text-italic',
-                link: 'editor-text-link',
-                strikethrough: 'editor-text-strikethrough',
-                underline: 'editor-text-underline',
-                underlineStrikethrough: 'editor-text-underlineStrikethrough',
-              },
-            },
-          }}>
-          <RichTextPlugin
-            contentEditable={
-              // eslint-disable-next-line jsx-a11y/aria-role, @typescript-eslint/no-explicit-any
-              <ContentEditable role={null as any} spellCheck={null as any} />
-            }
-            placeholder={null}
-            ErrorBoundary={LexicalErrorBoundary}
-          />
-          <AutoFocusPlugin />
-          <TestPlugin />
-        </TestComposer>
-      );
-    }
+    editor.setRootElement(root);
 
-    ReactTestUtils.act(() => {
-      createRoot(container!).render(<TestBase />);
+    editor.update(() => {
+      $insertNodes([$createParagraphNode()])
     });
+    editor.commitUpdates();
   }
 
   async function update(fn: () => void) {
-    await ReactTestUtils.act(async () => {
-      await editor!.update(fn);
-    });
+    await editor!.update(fn);
+    editor?.commitUpdates();
 
     return Promise.resolve().then();
   }
@@ -549,24 +522,6 @@ describe('LexicalEventHelpers', () => {
           ],
           name: 'collapsible spaces with nested structures',
         },
-        // TODO no proper support for divs #4465
-        // {
-        //   expectedHTML:
-        //     '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b</span></p>',
-        //   inputs: [
-        //     pasteHTML(`
-        //     <div>
-        //     <div>
-        //     a
-        //     </div>
-        //     <div>
-        //     b
-        //     </div>
-        //     </div>
-        //     `),
-        //   ],
-        //   name: 'collapsible spaces with nested structures (2)',
-        // },
         {
           expectedHTML:
             '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a b</strong></p>',
@@ -612,32 +567,6 @@ describe('LexicalEventHelpers', () => {
           ],
           name: 'forced line break with tabs',
         },
-        // The 3 below are not correct, they're missing the first \n -> <br> but that's a fault with
-        // the implementation of DOMParser, it works correctly in Safari
-        {
-          expectedHTML:
-            '<code class="editor-code" spellcheck="false" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></code>',
-          inputs: [pasteHTML(`<pre>\na\r\nb\r\n</pre>`)],
-          name: 'pre (no touchy) (1)',
-        },
-        {
-          expectedHTML:
-            '<code class="editor-code" spellcheck="false" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></code>',
-          inputs: [
-            pasteHTML(`
-              <pre>\na\r\nb\r\n</pre>
-          `),
-          ],
-          name: 'pre (no touchy) (2)',
-        },
-        {
-          expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><br><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span><br><br></p>',
-          inputs: [
-            pasteHTML(`<span style="white-space: pre">\na\r\nb\r\n</span>`),
-          ],
-          name: 'white-space: pre (no touchy) (2)',
-        },
         {
           expectedHTML:
             '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph2</span></p>',
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
index 369caaea4af..1322b482be9 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalRootHelpers.test.ts
@@ -6,14 +6,39 @@
  *
  */
 
-import {
-  $isRootTextContentEmpty,
-  $isRootTextContentEmptyCurry,
-  $rootTextContent,
-} from '@lexical/text';
 import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
 import {initializeUnitTest} from 'lexical/__tests__/utils';
 
+export function $rootTextContent(): string {
+  const root = $getRoot();
+
+  return root.getTextContent();
+}
+
+export function $isRootTextContentEmpty(
+    isEditorComposing: boolean,
+    trim = true,
+): boolean {
+  if (isEditorComposing) {
+    return false;
+  }
+
+  let text = $rootTextContent();
+
+  if (trim) {
+    text = text.trim();
+  }
+
+  return text === '';
+}
+
+export function $isRootTextContentEmptyCurry(
+    isEditorComposing: boolean,
+    trim?: boolean,
+): () => boolean {
+  return () => $isRootTextContentEmpty(isEditorComposing, trim);
+}
+
 describe('LexicalRootHelpers tests', () => {
   initializeUnitTest((testEnv) => {
     it('textContent', async () => {
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
similarity index 100%
rename from resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.tsx
rename to resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
similarity index 100%
rename from resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.tsx
rename to resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts

From 654a7a5d03000e6236929fa4dc3e2d6607edb757 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 21 Sep 2024 13:00:16 +0100
Subject: [PATCH 277/666] Lexical: Removed reconciler level direction handling

- Updated tests to consider changes
---
 .../wysiwyg/lexical/core/LexicalReconciler.ts | 115 +------------
 .../__tests__/unit/HTMLCopyAndPaste.test.ts   |  12 +-
 .../core/__tests__/unit/LexicalEditor.test.ts |  38 ++---
 .../__tests__/unit/LexicalEditorState.test.ts |   6 +-
 .../core/__tests__/unit/LexicalNode.test.ts   |  88 +++++-----
 .../__tests__/unit/LexicalSelection.test.ts   |  18 +-
 .../unit/LexicalSerialization.test.ts         |   4 +-
 .../__tests__/unit/LexicalTabNode.test.ts     |  12 +-
 .../lexical/core/shared/reactPatches.ts       |  22 ---
 .../lexical/core/shared/useLayoutEffect.ts    |  19 ---
 .../unit/LexicalListItemNode.test.ts          | 154 +++++++++---------
 .../__tests__/unit/LexicalHeadingNode.test.ts |  12 +-
 .../__tests__/unit/LexicalSelection.test.ts   |  66 ++++----
 .../unit/LexicalSelectionHelpers.test.ts      |  62 +++----
 .../__tests__/unit/LexicalTableNode.test.ts   |   8 +-
 .../unit/LexicalTableSelection.test.ts        |   4 +-
 .../unit/LexicalEventHelpers.test.ts          |  92 +++++------
 resources/js/wysiwyg/nodes/_common.ts         |  30 +++-
 resources/js/wysiwyg/todo.md                  |   4 +
 .../wysiwyg/ui/defaults/buttons/alignments.ts |  11 +-
 .../js/wysiwyg/ui/defaults/buttons/lists.ts   |  10 +-
 tsconfig.json                                 |   1 +
 22 files changed, 329 insertions(+), 459 deletions(-)
 delete mode 100644 resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
 delete mode 100644 resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts

diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
index 0162d2281f9..09d01bffd43 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -42,14 +42,12 @@ import {
   $textContentRequiresDoubleLinebreakAtEnd,
   cloneDecorators,
   getElementByKeyOrThrow,
-  getTextDirection,
   setMutatedNode,
 } from './LexicalUtils';
 
 type IntentionallyMarkedAsDirtyElement = boolean;
 
 let subTreeTextContent = '';
-let subTreeDirectionedTextContent = '';
 let subTreeTextFormat: number | null = null;
 let subTreeTextStyle: string = '';
 let editorTextContent = '';
@@ -59,7 +57,6 @@ let activeEditorNodes: RegisteredNodes;
 let treatAllNodesAsDirty = false;
 let activeEditorStateReadOnly = false;
 let activeMutationListeners: MutationListeners;
-let activeTextDirection: 'ltr' | 'rtl' | null = null;
 let activeDirtyElements: Map<NodeKey, IntentionallyMarkedAsDirtyElement>;
 let activeDirtyLeaves: Set<NodeKey>;
 let activePrevNodeMap: NodeMap;
@@ -197,7 +194,7 @@ function $createNode(
     if (childrenSize !== 0) {
       const endIndex = childrenSize - 1;
       const children = createChildrenArray(node, activeNextNodeMap);
-      $createChildrenWithDirection(children, endIndex, node, dom);
+      $createChildren(children, node, 0, endIndex, dom, null);
     }
     const format = node.__format;
 
@@ -222,10 +219,6 @@ function $createNode(
       }
       // Decorators are always non editable
       dom.contentEditable = 'false';
-    } else if ($isTextNode(node)) {
-      if (!node.isDirectionless()) {
-        subTreeDirectionedTextContent += text;
-      }
     }
     subTreeTextContent += text;
     editorTextContent += text;
@@ -261,19 +254,6 @@ function $createNode(
   return dom;
 }
 
-function $createChildrenWithDirection(
-  children: Array<NodeKey>,
-  endIndex: number,
-  element: ElementNode,
-  dom: HTMLElement,
-): void {
-  const previousSubTreeDirectionedTextContent = subTreeDirectionedTextContent;
-  subTreeDirectionedTextContent = '';
-  $createChildren(children, element, 0, endIndex, dom, null);
-  reconcileBlockDirection(element, dom);
-  subTreeDirectionedTextContent = previousSubTreeDirectionedTextContent;
-}
-
 function $createChildren(
   children: Array<NodeKey>,
   element: ElementNode,
@@ -388,93 +368,16 @@ function reconcileParagraphStyle(element: ElementNode): void {
   }
 }
 
-function reconcileBlockDirection(element: ElementNode, dom: HTMLElement): void {
-  const previousSubTreeDirectionTextContent: string =
-    // @ts-expect-error: internal field
-    dom.__lexicalDirTextContent;
-  // @ts-expect-error: internal field
-  const previousDirection: string = dom.__lexicalDir;
-
-  if (
-    previousSubTreeDirectionTextContent !== subTreeDirectionedTextContent ||
-    previousDirection !== activeTextDirection
-  ) {
-    const hasEmptyDirectionedTextContent = subTreeDirectionedTextContent === '';
-    const direction = hasEmptyDirectionedTextContent
-      ? activeTextDirection
-      : getTextDirection(subTreeDirectionedTextContent);
-
-    if (direction !== previousDirection) {
-      const classList = dom.classList;
-      const theme = activeEditorConfig.theme;
-      let previousDirectionTheme =
-        previousDirection !== null ? theme[previousDirection] : undefined;
-      let nextDirectionTheme =
-        direction !== null ? theme[direction] : undefined;
-
-      // Remove the old theme classes if they exist
-      if (previousDirectionTheme !== undefined) {
-        if (typeof previousDirectionTheme === 'string') {
-          const classNamesArr = normalizeClassNames(previousDirectionTheme);
-          previousDirectionTheme = theme[previousDirection] = classNamesArr;
-        }
-
-        // @ts-ignore: intentional
-        classList.remove(...previousDirectionTheme);
-      }
-
-      if (
-        direction === null ||
-        (hasEmptyDirectionedTextContent && direction === 'ltr')
-      ) {
-        // Remove direction
-        dom.removeAttribute('dir');
-      } else {
-        // Apply the new theme classes if they exist
-        if (nextDirectionTheme !== undefined) {
-          if (typeof nextDirectionTheme === 'string') {
-            const classNamesArr = normalizeClassNames(nextDirectionTheme);
-            // @ts-expect-error: intentional
-            nextDirectionTheme = theme[direction] = classNamesArr;
-          }
-
-          if (nextDirectionTheme !== undefined) {
-            classList.add(...nextDirectionTheme);
-          }
-        }
-
-        // Update direction
-        dom.dir = direction;
-      }
-
-      if (!activeEditorStateReadOnly) {
-        const writableNode = element.getWritable();
-        writableNode.__dir = direction;
-      }
-    }
-
-    activeTextDirection = direction;
-    // @ts-expect-error: internal field
-    dom.__lexicalDirTextContent = subTreeDirectionedTextContent;
-    // @ts-expect-error: internal field
-    dom.__lexicalDir = direction;
-  }
-}
-
 function $reconcileChildrenWithDirection(
   prevElement: ElementNode,
   nextElement: ElementNode,
   dom: HTMLElement,
 ): void {
-  const previousSubTreeDirectionTextContent = subTreeDirectionedTextContent;
-  subTreeDirectionedTextContent = '';
   subTreeTextFormat = null;
   subTreeTextStyle = '';
   $reconcileChildren(prevElement, nextElement, dom);
-  reconcileBlockDirection(nextElement, dom);
   reconcileParagraphFormat(nextElement);
   reconcileParagraphStyle(nextElement);
-  subTreeDirectionedTextContent = previousSubTreeDirectionTextContent;
 }
 
 function createChildrenArray(
@@ -624,20 +527,9 @@ function $reconcileNode(
         subTreeTextContent += previousSubTreeTextContent;
         editorTextContent += previousSubTreeTextContent;
       }
-
-      // @ts-expect-error: internal field
-      const previousSubTreeDirectionTextContent = dom.__lexicalDirTextContent;
-
-      if (previousSubTreeDirectionTextContent !== undefined) {
-        subTreeDirectionedTextContent += previousSubTreeDirectionTextContent;
-      }
     } else {
       const text = prevNode.getTextContent();
 
-      if ($isTextNode(prevNode) && !prevNode.isDirectionless()) {
-        subTreeDirectionedTextContent += text;
-      }
-
       editorTextContent += text;
       subTreeTextContent += text;
     }
@@ -702,9 +594,6 @@ function $reconcileNode(
       if (decorator !== null) {
         reconcileDecorator(key, decorator);
       }
-    } else if ($isTextNode(nextNode) && !nextNode.isDirectionless()) {
-      // Handle text content, for LTR, LTR cases.
-      subTreeDirectionedTextContent += text;
     }
 
     subTreeTextContent += text;
@@ -871,11 +760,9 @@ export function $reconcileRoot(
   // The cache must be rebuilt during reconciliation to account for any changes.
   subTreeTextContent = '';
   editorTextContent = '';
-  subTreeDirectionedTextContent = '';
   // Rather than pass around a load of arguments through the stack recursively
   // we instead set them as bindings within the scope of the module.
   treatAllNodesAsDirty = dirtyType === FULL_RECONCILE;
-  activeTextDirection = null;
   activeEditor = editor;
   activeEditorConfig = editor._config;
   activeEditorNodes = editor._nodes;
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
index 056de19e49e..9f832b69e40 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
@@ -34,12 +34,12 @@ describe('HTMLCopyAndPaste tests', () => {
 
       const HTML_COPY_PASTING_TESTS = [
         {
-          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">Hello!</span></p>`,
+          expectedHTML: `<p><span data-lexical-text="true">Hello!</span></p>`,
           name: 'plain DOM text node',
           pastedHTML: `Hello!`,
         },
         {
-          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">Hello!</span></p><p><br></p>`,
+          expectedHTML: `<p><span data-lexical-text="true">Hello!</span></p><p><br></p>`,
           name: 'a paragraph element',
           pastedHTML: `<p>Hello!<p>`,
         },
@@ -52,7 +52,7 @@ describe('HTMLCopyAndPaste tests', () => {
             </div>`,
         },
         {
-          expectedHTML: `<p dir="ltr"><span data-lexical-text="true">a b c d e</span></p><p dir="ltr"><span data-lexical-text="true">f g h</span></p>`,
+          expectedHTML: `<p><span data-lexical-text="true">a b c d e</span></p><p><span data-lexical-text="true">f g h</span></p>`,
           name: 'multiple nested spans and divs',
           pastedHTML: `<div>
             a b
@@ -82,12 +82,12 @@ describe('HTMLCopyAndPaste tests', () => {
           pastedHTML: ` <span>123<div>456</div></span>`,
         },
         {
-          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr"><span data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr"><span data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3" dir="ltr"><span data-lexical-text="true">todo</span></li></ul>`,
+          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3"><span data-lexical-text="true">todo</span></li></ul>`,
           name: 'google doc checklist',
-          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-1980f960-7fff-f4df-4ba3-26c6e1508542"><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li dir="ltr" role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li dir="ltr" role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul><li dir="ltr" role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul></b>`,
+          pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-1980f960-7fff-f4df-4ba3-26c6e1508542"><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul></b>`,
         },
         {
-          expectedHTML: `<p dir="ltr" style="text-align: start;"><span data-lexical-text="true">checklist</span></p><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" dir="ltr" style="text-align: start;"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" dir="ltr" style="text-align: start;"><span data-lexical-text="true">todo</span></li></ul>`,
+          expectedHTML: `<p style="text-align: start;"><span data-lexical-text="true">checklist</span></p><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" style="text-align: start;"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" style="text-align: start;"><span data-lexical-text="true">todo</span></li></ul>`,
           name: 'github checklist',
           pastedHTML: `<meta charset='utf-8'><p dir="auto" style="box-sizing: border-box; margin-top: 0px !important; margin-bottom: 16px; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">checklist</p><ul class="contains-task-list" style="box-sizing: border-box; padding: 0px; margin-top: 0px; margin-bottom: 0px !important; position: relative; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" checked="" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>done</li><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; margin-top: 0px; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>todo</li></ul>`,
         },
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index 4e3e622ced9..f3c6f710509 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -258,7 +258,7 @@ describe('LexicalEditor tests', () => {
     await Promise.resolve().then();
 
     expect(container.innerHTML).toBe(
-      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">This works!</span></p></div>',
     );
 
     const initialEditorState = initialEditor.getEditorState();
@@ -276,7 +276,7 @@ describe('LexicalEditor tests', () => {
 
     expect(editor.getEditorState()).toEqual(initialEditorState);
     expect(container.innerHTML).toBe(
-      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+      '<div style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">This works!</span></p></div>',
     );
   });
 
@@ -520,7 +520,7 @@ describe('LexicalEditor tests', () => {
     underlineListener();
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold editor-text-italic editor-text-underline" data-lexical-text="true">foo</strong></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><strong class="editor-text-bold editor-text-italic editor-text-underline" data-lexical-text="true">foo</strong></p></div>',
     );
   });
 
@@ -586,7 +586,7 @@ describe('LexicalEditor tests', () => {
     italicsListener();
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">foo</strong></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">foo</strong></p></div>',
     );
   });
 
@@ -657,7 +657,7 @@ describe('LexicalEditor tests', () => {
     boldFooListener();
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Foo!!</strong></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><strong class="editor-text-bold" data-lexical-text="true">Foo!!</strong></p></div>',
     );
   });
 
@@ -875,7 +875,7 @@ describe('LexicalEditor tests', () => {
     editor.setRootElement(element);
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">This works!</span></p></div>',
     );
   });
 
@@ -897,7 +897,7 @@ describe('LexicalEditor tests', () => {
     await Promise.resolve().then();
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">This works!</span></p></div>',
     );
     expect(errorListener).toHaveBeenCalledTimes(0);
 
@@ -912,7 +912,7 @@ describe('LexicalEditor tests', () => {
 
     expect(errorListener).toHaveBeenCalledTimes(1);
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">This works!</span></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">This works!</span></p></div>',
     );
   });
 
@@ -953,7 +953,7 @@ describe('LexicalEditor tests', () => {
     editorInstance.commitUpdates();
 
     expect(container.innerHTML).toBe(
-      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">Not changed</span></p></div>',
+      '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">Not changed</span></p></div>',
     );
 
     edContainer = document.createElement('span');
@@ -966,7 +966,7 @@ describe('LexicalEditor tests', () => {
     expect(rootListener).toHaveBeenCalledTimes(3);
     expect(updateListener).toHaveBeenCalledTimes(3);
     expect(container.innerHTML).toBe(
-      '<span contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">Change successful</span></p></span>',
+      '<span contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">Change successful</span></p></span>',
     );
   });
 
@@ -1046,7 +1046,7 @@ describe('LexicalEditor tests', () => {
       it('Parses the nodes of a stringified editor state', async () => {
         expect(parsedRoot).toEqual({
           __cachedText: null,
-          __dir: 'ltr',
+          __dir: null,
           __first: paragraphKey,
           __format: 0,
           __indent: 0,
@@ -1060,7 +1060,7 @@ describe('LexicalEditor tests', () => {
           __type: 'root',
         });
         expect(parsedParagraph).toEqual({
-          __dir: 'ltr',
+          __dir: null,
           __first: textKey,
           __format: 0,
           __indent: 0,
@@ -1128,7 +1128,7 @@ describe('LexicalEditor tests', () => {
       it('Parses the nodes of a stringified editor state', async () => {
         expect(parsedRoot).toEqual({
           __cachedText: null,
-          __dir: 'ltr',
+          __dir: null,
           __first: paragraphKey,
           __format: 0,
           __indent: 0,
@@ -1142,7 +1142,7 @@ describe('LexicalEditor tests', () => {
           __type: 'root',
         });
         expect(parsedParagraph).toEqual({
-          __dir: 'ltr',
+          __dir: null,
           __first: textKey,
           __format: 0,
           __indent: 0,
@@ -1275,7 +1275,7 @@ describe('LexicalEditor tests', () => {
       expect(editor._editorState._nodeMap.size).toBe(keys.length + 1); // + root
       expect(editor._keyToDOMMap.size).toBe(keys.length + 1); // + root
       expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">A</span><div dir="ltr"><span data-lexical-text="true">B</span></div></div></p></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div><span data-lexical-text="true">A</span><div><span data-lexical-text="true">B</span></div></div></p></div>',
       );
     });
 
@@ -1310,7 +1310,7 @@ describe('LexicalEditor tests', () => {
       });
 
       expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">B</span><div dir="ltr"><span data-lexical-text="true">A</span></div></div></p></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div><span data-lexical-text="true">B</span><div><span data-lexical-text="true">A</span></div></div></p></div>',
       );
     });
 
@@ -1351,7 +1351,7 @@ describe('LexicalEditor tests', () => {
       });
 
       expect(container.innerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div dir="ltr"><span data-lexical-text="true">A</span><div dir="ltr"><span data-lexical-text="true">C</span></div></div><div dir="ltr"><span data-lexical-text="true">B</span></div></p></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><div><span data-lexical-text="true">A</span><div><span data-lexical-text="true">C</span></div></div><div><span data-lexical-text="true">B</span></div></p></div>',
       );
     });
   });
@@ -2294,14 +2294,14 @@ describe('LexicalEditor tests', () => {
     });
 
     expect(container.firstElementChild?.innerHTML).toBe(
-      '<p dir="ltr"><span data-lexical-text="true">Hello</span><a></a></p>',
+      '<p><span data-lexical-text="true">Hello</span><a></a></p>',
     );
   });
 
   it('reconciles state without root element', () => {
     editor = createTestEditor({});
     const state = editor.parseEditorState(
-      `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+      `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`,
     );
     editor.setEditorState(state);
     expect(editor._editorState).toBe(state);
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
index 09b49b738d7..38ecf03bce2 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
@@ -52,7 +52,7 @@ describe('LexicalEditorState tests', () => {
 
       expect(root).toEqual({
         __cachedText: 'foo',
-        __dir: 'ltr',
+        __dir: null,
         __first: '1',
         __format: 0,
         __indent: 0,
@@ -66,7 +66,7 @@ describe('LexicalEditorState tests', () => {
         __type: 'root',
       });
       expect(paragraph).toEqual({
-        __dir: 'ltr',
+        __dir: null,
         __first: '2',
         __format: 0,
         __indent: 0,
@@ -113,7 +113,7 @@ describe('LexicalEditorState tests', () => {
       });
 
       expect(JSON.stringify(editor.getEditorState().toJSON())).toEqual(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`,
       );
     });
 
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
index 7373f898d80..fcf666213d6 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
@@ -645,7 +645,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -667,7 +667,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -694,7 +694,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -730,7 +730,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -754,7 +754,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -795,7 +795,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">qux</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p><p dir="ltr"><span data-lexical-text="true">baz</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">qux</span></p><p><span data-lexical-text="true">bar</span></p><p><span data-lexical-text="true">baz</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -828,7 +828,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -879,7 +879,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p><p dir="ltr"><span data-lexical-text="true">qux</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span><span data-lexical-text="true">baz</span></p><p><span data-lexical-text="true">qux</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -915,7 +915,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">token</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">token</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -935,7 +935,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">segmented</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">segmented</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -958,7 +958,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">directionless</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">directionless</span></p></div>',
         );
 
         await editor.getEditorState().read(() => {
@@ -1057,7 +1057,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1089,7 +1089,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
         let barTextNode: TextNode;
 
@@ -1102,7 +1102,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p><p><span data-lexical-text="true">bar</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1110,7 +1110,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p><p dir="ltr"><br></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span></p><p><br></p></div>',
         );
       });
 
@@ -1118,7 +1118,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1127,7 +1127,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1135,7 +1135,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1144,7 +1144,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1152,7 +1152,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1161,7 +1161,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1169,7 +1169,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1205,7 +1205,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><a dir="ltr"><span data-lexical-text="true">world</span></a></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><a><span data-lexical-text="true">world</span></a></p></div>',
         );
       });
 
@@ -1224,7 +1224,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1233,7 +1233,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foobar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foobar</span></p></div>',
         );
       });
 
@@ -1241,7 +1241,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1250,7 +1250,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1258,7 +1258,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1267,7 +1267,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1275,7 +1275,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1284,7 +1284,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foobar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foobar</span></p></div>',
         );
         // TODO: add text direction validations
       });
@@ -1314,7 +1314,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span></p><p dir="ltr"><span data-lexical-text="true">B</span></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">A</span></p><p><span data-lexical-text="true">B</span></p><p><span data-lexical-text="true">C</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1322,7 +1322,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span><p dir="ltr"><span data-lexical-text="true">B</span></p></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">A</span><p><span data-lexical-text="true">B</span></p></p><p><span data-lexical-text="true">C</span></p></div>',
         );
       });
 
@@ -1356,7 +1356,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">A</span></p><p dir="ltr"><span data-lexical-text="true">B</span></p><p dir="ltr"><span data-lexical-text="true">C</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">A</span></p><p><span data-lexical-text="true">B</span></p><p><span data-lexical-text="true">C</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1365,7 +1365,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p><p><br></p><p dir="ltr"><span data-lexical-text="true">C</span><span data-lexical-text="true">B</span><span data-lexical-text="true">A</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><br></p><p><br></p><p><span data-lexical-text="true">C</span><span data-lexical-text="true">B</span><span data-lexical-text="true">A</span></p></div>',
         );
       });
 
@@ -1384,7 +1384,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
         let barTextNode;
 
@@ -1397,7 +1397,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p><p dir="ltr"><span data-lexical-text="true">bar</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p><p><span data-lexical-text="true">bar</span></p></div>',
         );
       });
 
@@ -1405,7 +1405,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1414,7 +1414,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">barfoo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">barfoo</span></p></div>',
         );
       });
 
@@ -1422,7 +1422,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1431,7 +1431,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
         );
       });
 
@@ -1439,7 +1439,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
@@ -1448,7 +1448,7 @@ describe('LexicalNode tests', () => {
         });
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">bar</span><span data-lexical-text="true">foo</span></p></div>',
         );
       });
 
@@ -1456,7 +1456,7 @@ describe('LexicalNode tests', () => {
         const {editor} = testEnv;
 
         expect(testEnv.outerHTML).toBe(
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">foo</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">foo</span></p></div>',
         );
 
         await editor.update(() => {
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
index 7055f361a96..ac0ec15e576 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSelection.test.ts
@@ -61,10 +61,10 @@ describe('LexicalSelection tests', () => {
 
         const expectation =
           mode === 'start-of-paragraph'
-            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>'
+            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><a href="https://"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>'
             : mode === 'mid-paragraph'
-            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>'
-            : '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a></p></div>';
+            ? '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">a</span><a href="https://"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>'
+            : '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">a</span><a href="https://"><span data-lexical-text="true">b</span></a></p></div>';
 
         expect(container.innerHTML).toBe(expectation);
 
@@ -113,7 +113,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">x</span><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">x</span><a href="https://"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">b</span></p></div>',
             );
           };
 
@@ -154,7 +154,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">ax</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">ax</span><a href="https://"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">c</span></p></div>',
             );
           };
 
@@ -194,7 +194,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">ax</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">ax</span><a href="https://"><span data-lexical-text="true">b</span></a></p></div>',
             );
           };
 
@@ -236,7 +236,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">xb</span></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><a href="https://"><span data-lexical-text="true">a</span></a><span data-lexical-text="true">xb</span></p></div>',
             );
           };
 
@@ -277,7 +277,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">xc</span></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">a</span><a href="https://"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">xc</span></p></div>',
             );
           };
 
@@ -319,7 +319,7 @@ describe('LexicalSelection tests', () => {
             });
 
             expect(container.innerHTML).toBe(
-              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p dir="ltr"><span data-lexical-text="true">a</span><a href="https://" dir="ltr"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">x</span></p></div>',
+              '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p><span data-lexical-text="true">a</span><a href="https://"><span data-lexical-text="true">b</span></a><span data-lexical-text="true">x</span></p></div>',
             );
           };
 
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
index 02231f8bf0d..5599604c059 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -106,7 +106,7 @@ describe('LexicalSerialization tests', () => {
       });
 
       const stringifiedEditorState = JSON.stringify(editor.getEditorState());
-      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":"ltr","format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":"ltr","format":"","indent":0,"type":"tablerow","version":1}],"direction":"ltr","format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`;
+      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":null,"format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`;
 
       expect(stringifiedEditorState).toBe(expectedStringifiedEditorState);
 
@@ -115,7 +115,7 @@ describe('LexicalSerialization tests', () => {
       const otherStringifiedEditorState = JSON.stringify(editorState);
 
       expect(otherStringifiedEditorState).toBe(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":"ltr","format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":null,"format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index 2d751f5fd7b..a57ff3f42f6 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -55,7 +55,7 @@ describe('LexicalTabNode tests', () => {
         $insertDataTransferForPlainText(dataTransfer, selection);
       });
       expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+        '<p><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
       );
     });
 
@@ -69,7 +69,7 @@ describe('LexicalTabNode tests', () => {
         $insertDataTransferForRichText(dataTransfer, selection, editor);
       });
       expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+        '<p><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
       );
     });
 
@@ -89,7 +89,7 @@ describe('LexicalTabNode tests', () => {
     //         $insertDataTransferForRichText(dataTransfer, selection, editor);
     //       });
     //       expect(testEnv.innerHTML).toBe(
-    //         '<p dir="ltr"><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+    //         '<p><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span><br><span data-lexical-text="true">hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
     //       );
     // });
 
@@ -99,7 +99,7 @@ describe('LexicalTabNode tests', () => {
       // GDoc 2-liner hello\tworld (like previous test)
       dataTransfer.setData(
         'text/html',
-        `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-123"><p dir="ltr" style="line-height:1.38;margin-left: 36pt;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></p><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></b>`,
+        `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-123"><p style="line-height:1.38;margin-left: 36pt;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></p><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello</span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;"><span class="Apple-tab-span" style="white-space:pre;">	</span></span><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">world</span></b>`,
       );
       await editor.update(() => {
         const selection = $getSelection();
@@ -107,7 +107,7 @@ describe('LexicalTabNode tests', () => {
         $insertDataTransferForRichText(dataTransfer, selection, editor);
       });
       expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p dir="ltr"><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+        '<p><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
       );
     });
 
@@ -121,7 +121,7 @@ describe('LexicalTabNode tests', () => {
         $getSelection()!.insertText('f');
       });
       expect(testEnv.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">\t</span><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span></p>',
+        '<p><span data-lexical-text="true">\t</span><span data-lexical-text="true">f</span><span data-lexical-text="true">\t</span></p>',
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts b/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
deleted file mode 100644
index 9685cd89e95..00000000000
--- a/resources/js/wysiwyg/lexical/core/shared/reactPatches.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import React from 'react';
-
-// Webpack + React 17 fails to compile on the usage of `React.startTransition` or
-// `React["startTransition"]` even if it's behind a feature detection of
-// `"startTransition" in React`. Moving this to a constant avoids the issue :/
-const START_TRANSITION = 'startTransition';
-
-export function startTransition(callback: () => void) {
-  if (START_TRANSITION in React) {
-    React[START_TRANSITION](callback);
-  } else {
-    callback();
-  }
-}
diff --git a/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts b/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts
deleted file mode 100644
index 6149879cbb5..00000000000
--- a/resources/js/wysiwyg/lexical/core/shared/useLayoutEffect.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import {useEffect, useLayoutEffect} from 'react';
-import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
-
-// This workaround is no longer necessary in React 19,
-// but we currently support React >=17.x
-// https://github.com/facebook/react/pull/26395
-const useLayoutEffectImpl: typeof useLayoutEffect = CAN_USE_DOM
-  ? useLayoutEffect
-  : useEffect;
-
-export default useLayoutEffectImpl;
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index 22e555f35b5..581db0294f5 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -182,13 +182,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -215,13 +215,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">bar</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -245,13 +245,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -273,10 +273,10 @@ describe('LexicalListItemNode tests', () => {
               data-lexical-editor="true">
               <p><br></p>
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -301,10 +301,10 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
               </ul>
@@ -330,13 +330,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
               <p><br></p>
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -361,7 +361,7 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
@@ -421,13 +421,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">x</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -445,10 +445,10 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -495,15 +495,15 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">x</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -523,12 +523,12 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">B</span>
                 </li>
               </ul>
@@ -573,15 +573,15 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">A</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="3">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -601,12 +601,12 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">A</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -659,17 +659,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -691,10 +691,10 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
-                    <li value="2" dir="ltr">
+                    <li value="2">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -755,24 +755,24 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -794,17 +794,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
-                    <li value="2" dir="ltr">
+                    <li value="2">
                       <span data-lexical-text="true">B</span>
                     </li>
                   </ul>
@@ -865,24 +865,24 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
                     <li value="1">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -904,17 +904,17 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li value="2" dir="ltr">
+                    <li value="2">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -983,31 +983,31 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">A2</span>
                         </li>
                       </ul>
                     </li>
                   </ul>
                 </li>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">x</span>
                 </li>
                 <li value="2">
                   <ul>
                     <li value="1">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -1029,20 +1029,20 @@ describe('LexicalListItemNode tests', () => {
               <ul>
                 <li value="1">
                   <ul>
-                    <li value="1" dir="ltr">
+                    <li value="1">
                       <span data-lexical-text="true">A1</span>
                     </li>
                     <li value="2">
                       <ul>
-                        <li value="1" dir="ltr">
+                        <li value="1">
                           <span data-lexical-text="true">A2</span>
                         </li>
-                        <li value="2" dir="ltr">
+                        <li value="2">
                           <span data-lexical-text="true">B1</span>
                         </li>
                       </ul>
                     </li>
-                    <li value="2" dir="ltr">
+                    <li value="2">
                       <span data-lexical-text="true">B2</span>
                     </li>
                   </ul>
@@ -1087,13 +1087,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -1117,14 +1117,14 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
                 <li value="2"><br></li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="4" dir="ltr">
+                <li value="4">
                   <span data-lexical-text="true">three</span>
                 </li>
               </ul>
@@ -1148,13 +1148,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
                 <li value="4"><br></li>
@@ -1179,13 +1179,13 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
-                <li value="2" dir="ltr">
+                <li value="2">
                   <span data-lexical-text="true">two</span>
                 </li>
-                <li value="3" dir="ltr">
+                <li value="3">
                   <span data-lexical-text="true">three</span>
                 </li>
                 <li value="4"><br></li>
@@ -1211,7 +1211,7 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
               </ul>
@@ -1231,7 +1231,7 @@ describe('LexicalListItemNode tests', () => {
               style="user-select: text; white-space: pre-wrap; word-break: break-word;"
               data-lexical-editor="true">
               <ul>
-                <li value="1" dir="ltr">
+                <li value="1">
                   <span data-lexical-text="true">one</span>
                 </li>
                 <li value="2"><br></li>
@@ -1308,7 +1308,7 @@ describe('LexicalListItemNode tests', () => {
                     <ul>
                       <li value="1">
                         <ul>
-                          <li value="1" dir="ltr">
+                          <li value="1">
                             <span data-lexical-text="true">one</span>
                           </li>
                         </ul>
@@ -1317,7 +1317,7 @@ describe('LexicalListItemNode tests', () => {
                   </li>
                 </ul>
               </li>
-              <li value="1" dir="ltr">
+              <li value="1">
                 <span data-lexical-text="true">two</span>
               </li>
             </ul>
@@ -1336,10 +1336,10 @@ describe('LexicalListItemNode tests', () => {
           editor.getRootElement()!.innerHTML,
           html`
             <ul>
-              <li value="1" dir="ltr">
+              <li value="1">
                 <span data-lexical-text="true">one</span>
               </li>
-              <li value="2" dir="ltr">
+              <li value="2">
                 <span data-lexical-text="true">two</span>
               </li>
             </ul>
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
index dcbd62ab3c1..a94f9ee0bb8 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
@@ -117,7 +117,7 @@ describe('LexicalHeadingNode tests', () => {
         headingTextNode.select(5, 5);
       });
       expect(testEnv.outerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello world</span></h1></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><span data-lexical-text="true">hello world</span></h1></div>',
       );
       await editor.update(() => {
         const selection = $getSelection() as RangeSelection;
@@ -126,7 +126,7 @@ describe('LexicalHeadingNode tests', () => {
         expect(result.getDirection()).toEqual(headingNode.getDirection());
       });
       expect(testEnv.outerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello world</span></h1><h1><br></h1></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><span data-lexical-text="true">hello world</span></h1><h1><br></h1></div>',
       );
     });
 
@@ -143,7 +143,7 @@ describe('LexicalHeadingNode tests', () => {
         headingTextNode2.selectEnd();
       });
       expect(testEnv.outerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1></div>',
       );
       await editor.update(() => {
         const selection = $getSelection() as RangeSelection;
@@ -152,7 +152,7 @@ describe('LexicalHeadingNode tests', () => {
         expect(result.getDirection()).toEqual(headingNode.getDirection());
       });
       expect(testEnv.outerHTML).toBe(
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 dir="ltr"><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1><p><br></p></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1><span data-lexical-text="true">hello</span><strong data-lexical-text="true"> world</strong></h1><p><br></p></div>',
       );
     });
 
@@ -187,7 +187,7 @@ describe('LexicalHeadingNode tests', () => {
         headingNode.append(textNode);
       });
       expect(testEnv.outerHTML).toBe(
-        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 dir="ltr"><span data-lexical-text="true">${text}</span></h2></div>`,
+        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2><span data-lexical-text="true">${text}</span></h2></div>`,
       );
       await editor.update(() => {
         const result = headingNode.insertNewAfter();
@@ -195,7 +195,7 @@ describe('LexicalHeadingNode tests', () => {
         expect(result.getDirection()).toEqual(headingNode.getDirection());
       });
       expect(testEnv.outerHTML).toBe(
-        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 dir="ltr"><span data-lexical-text="true">${text}</span></h2><p><br></p></div>`,
+        `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2><span data-lexical-text="true">${text}</span></h2><p><br></p></div>`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
index 665f5d854e2..5f2d9dcc093 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
@@ -250,7 +250,7 @@ describe('LexicalSelection tests', () => {
   const suite = [
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello</span></p></div>',
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Hello</span></p></div>',
       expectedSelection: {
         anchorOffset: 5,
         anchorPath: [0, 0, 0],
@@ -268,7 +268,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -288,7 +288,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<em class="editor-text-italic" data-lexical-text="true">Hello</em></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -308,7 +308,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<strong class="editor-text-bold editor-text-italic" data-lexical-text="true">Hello</strong></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -329,7 +329,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span class="editor-text-underline" data-lexical-text="true">Hello</span></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -349,7 +349,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span class="editor-text-strikethrough" data-lexical-text="true">Hello</span></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -369,7 +369,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span class="editor-text-underlineStrikethrough" data-lexical-text="true">Hello</span></p></div>',
       expectedSelection: {
         anchorOffset: 5,
@@ -411,7 +411,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span data-lexical-text="true">Dominic Gannaway</span>' +
         '</p></div>',
       expectedSelection: {
@@ -425,7 +425,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span data-lexical-text="true">Dominic Gannaway</span>' +
         '</p></div>',
       expectedSelection: {
@@ -443,7 +443,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span data-lexical-text="true">Dominic Gannaway</span>' +
         '</p></div>',
       expectedSelection: {
@@ -457,7 +457,7 @@ describe('LexicalSelection tests', () => {
     },
     {
       expectedHTML:
-        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+        '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
         '<span data-lexical-text="true">Dominic Gannaway</span>' +
         '</p></div>',
       expectedSelection: {
@@ -477,7 +477,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello world</strong>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -501,10 +501,10 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong>' +
         '</p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -529,11 +529,11 @@ describe('LexicalSelection tests', () => {
     {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<span data-lexical-text="true">He</span>' +
         '<strong class="editor-text-bold" data-lexical-text="true">llo</strong>' +
         '</p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">wo</strong>' +
         '<span data-lexical-text="true">rld</span>' +
         '</p>' +
@@ -557,7 +557,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<span data-lexical-text="true">Hello </span>' +
         '<strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
         '</p>' +
@@ -582,7 +582,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong>' +
         '<span data-lexical-text="true"> world</span>' +
         '</p>' +
@@ -608,7 +608,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong><strong class="editor-text-bold" data-lexical-text="true"> world</strong>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -634,7 +634,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello </strong><strong class="editor-text-bold" data-lexical-text="true">world</strong>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -660,7 +660,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello</strong><span data-lexical-text="true"> world</span>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -686,7 +686,7 @@ describe('LexicalSelection tests', () => {
       expectedHTML:
         '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true">' +
         '<p class="editor-paragraph"><br></p>' +
-        '<p class="editor-paragraph" dir="ltr">' +
+        '<p class="editor-paragraph">' +
         '<strong class="editor-text-bold" data-lexical-text="true">Hello </strong><strong class="editor-text-bold" data-lexical-text="true">beautiful</strong><strong class="editor-text-bold" data-lexical-text="true"> world</strong>' +
         '</p>' +
         '<p class="editor-paragraph"><br></p>' +
@@ -764,7 +764,7 @@ describe('LexicalSelection tests', () => {
       },
     ].flatMap(({whitespaceCharacter, whitespaceName}) => [
       {
-        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello${printWhitespace(
+        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Hello${printWhitespace(
           whitespaceCharacter,
         )}</span></p></div>`,
         expectedSelection: {
@@ -780,7 +780,7 @@ describe('LexicalSelection tests', () => {
         name: `Type two words separated by a ${whitespaceName}, delete word backward from end`,
       },
       {
-        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">${printWhitespace(
+        expectedHTML: `<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">${printWhitespace(
           whitespaceCharacter,
         )}world</span></p></div>`,
         expectedSelection: {
@@ -798,7 +798,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Hello</span></p></div>',
         expectedSelection: {
           anchorOffset: 5,
           anchorPath: [0, 0, 0],
@@ -814,7 +814,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">world</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">world</span></p></div>',
         expectedSelection: {
           anchorOffset: 0,
           anchorPath: [0, 0, 0],
@@ -830,7 +830,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello world</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Hello world</span></p></div>',
         expectedSelection: {
           anchorOffset: 11,
           anchorPath: [0, 0, 0],
@@ -842,7 +842,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Hello </span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Hello </span></p></div>',
         expectedSelection: {
           anchorOffset: 6,
           anchorPath: [0, 0, 0],
@@ -859,7 +859,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
           '<span data-lexical-text="true">this is weird test</span></p></div>',
         expectedSelection: {
           anchorOffset: 0,
@@ -876,7 +876,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr">' +
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph">' +
           '<span data-lexical-text="true">Hello </span>' +
           '<span data-lexical-text="true">Bob</span>' +
           '</p></div>',
@@ -897,7 +897,7 @@ describe('LexicalSelection tests', () => {
       },
       {
         expectedHTML:
-          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">ABD</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">EFG</span></p></div>',
+          '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">ABD</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">EFG</span></p></div>',
         expectedSelection: {
           anchorOffset: 3,
           anchorPath: [0, 0, 0],
@@ -1883,7 +1883,7 @@ describe('LexicalSelection tests', () => {
       });
 
       expect(element.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome</strong></p><p dir="ltr"><span data-lexical-text="true"> world</span></p>',
+        '<p><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome</strong></p><p><span data-lexical-text="true"> world</span></p>',
       );
     });
 
@@ -1931,7 +1931,7 @@ describe('LexicalSelection tests', () => {
       });
 
       expect(element.innerHTML).toBe(
-        '<p dir="ltr"><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome </strong></p><p dir="ltr"><span data-lexical-text="true">beautiful</span><strong data-lexical-text="true"> world</strong></p>',
+        '<p><span data-lexical-text="true">Hello </span><strong data-lexical-text="true">awesome </strong></p><p><span data-lexical-text="true">beautiful</span><strong data-lexical-text="true"> world</strong></p>',
       );
     });
 
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
index 7b5bef4518b..4d88bde0e4c 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
@@ -1827,7 +1827,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+          '<p><span data-lexical-text="true">foo</span></p>',
         );
       });
 
@@ -1868,7 +1868,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foobar</span></p>',
+          '<p><span data-lexical-text="true">foobar</span></p>',
         );
       });
 
@@ -1913,7 +1913,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">h</span><a href="https://" dir="ltr"><span data-lexical-text="true">ello worl</span></a><span data-lexical-text="true">d</span></p>',
+          '<p><span data-lexical-text="true">h</span><a href="https://"><span data-lexical-text="true">ello worl</span></a><span data-lexical-text="true">d</span></p>',
         );
       });
 
@@ -1956,7 +1956,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<h1 dir="ltr"><span data-lexical-text="true">foo</span></h1>',
+          '<h1><span data-lexical-text="true">foo</span></h1>',
         );
       });
     });
@@ -1999,7 +1999,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">Existing text...foo</span></p>',
+          '<p><span data-lexical-text="true">Existing text...foo</span></p>',
         );
       });
 
@@ -2044,7 +2044,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">Existing text...foobar</span></p>',
+          '<p><span data-lexical-text="true">Existing text...foobar</span></p>',
         );
       });
 
@@ -2091,7 +2091,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">Existing text...foo</span></p>',
+          '<p><span data-lexical-text="true">Existing text...foo</span></p>',
         );
       });
 
@@ -2162,7 +2162,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">AB</span><em data-lexical-text="true">C</em><span data-lexical-text="true">DE</span></p>',
+          '<p><span data-lexical-text="true">AB</span><em data-lexical-text="true">C</em><span data-lexical-text="true">DE</span></p>',
         );
       });
     });
@@ -2205,7 +2205,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+          '<p><span data-lexical-text="true">foo</span></p>',
         );
       });
     });
@@ -2252,7 +2252,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foo</span><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a></p>',
+          '<p><span data-lexical-text="true">foo</span><a href="https://"><span data-lexical-text="true">link</span></a></p>',
         );
       });
     });
@@ -2299,7 +2299,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
+          '<p><a href="https://"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
         );
       });
     });
@@ -2324,7 +2324,7 @@ describe('LexicalSelectionHelpers tests', () => {
 
       // TODO #5109 ElementNode should have a way to control when other nodes can be inserted inside
       expect(element.innerHTML).toBe(
-        '<p><a href="https://lexical.dev/" dir="ltr"><br><span data-lexical-text="true">Lexical</span></a></p>',
+        '<p><a href="https://lexical.dev/"><br><span data-lexical-text="true">Lexical</span></a></p>',
       );
     });
   });
@@ -2371,7 +2371,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foo</span></p>',
+          '<p><span data-lexical-text="true">foo</span></p>',
         );
       });
     });
@@ -2421,7 +2421,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><span data-lexical-text="true">foo</span><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a></p>',
+          '<p><span data-lexical-text="true">foo</span><a href="https://"><span data-lexical-text="true">link</span></a></p>',
         );
       });
     });
@@ -2471,7 +2471,7 @@ describe('LexicalSelectionHelpers tests', () => {
         });
 
         expect(element.innerHTML).toBe(
-          '<p dir="ltr"><a href="https://" dir="ltr"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
+          '<p><a href="https://"><span data-lexical-text="true">link</span></a><span data-lexical-text="true">foo</span></p>',
         );
       });
     });
@@ -2491,7 +2491,7 @@ describe('LexicalSelectionHelpers tests', () => {
         $insertNodes([linkNode]);
       });
       expect(element.innerHTML).toBe(
-        '<p><a href="https://lexical.dev" dir="ltr"><span data-lexical-text="true">Lexical</span></a></p>',
+        '<p><a href="https://lexical.dev"><span data-lexical-text="true">Lexical</span></a></p>',
       );
     });
 
@@ -2511,7 +2511,7 @@ describe('LexicalSelectionHelpers tests', () => {
         $insertNodes([linkNode, textNode2]);
       });
       expect(element.innerHTML).toBe(
-        '<p><a href="https://lexical.dev" dir="ltr"><span data-lexical-text="true">Lexical</span></a><span data-lexical-text="true">...</span></p>',
+        '<p><a href="https://lexical.dev"><span data-lexical-text="true">Lexical</span></a><span data-lexical-text="true">...</span></p>',
       );
     });
 
@@ -2604,9 +2604,9 @@ describe('insertNodes', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr"><span data-lexical-text="true">Text before</span></p>' +
+      '<p><span data-lexical-text="true">Text before</span></p>' +
         '<span data-lexical-decorator="true" contenteditable="false"></span>' +
-        '<p dir="ltr"><span data-lexical-text="true">Text after</span></p>',
+        '<p><span data-lexical-text="true">Text after</span></p>',
     );
   });
 
@@ -2678,7 +2678,7 @@ describe('insertNodes', () => {
     });
     editor.getEditorState().read(() => {
       expect(element.innerHTML).toBe(
-        '<h1 dir="ltr"><span data-lexical-text="true">heading</span></h1><p><br></p>',
+        '<h1><span data-lexical-text="true">heading</span></h1><p><br></p>',
       );
       const selectedNode = ($getSelection() as RangeSelection).anchor.getNode();
       expect($isParagraphNode(selectedNode)).toBeTruthy();
@@ -2736,8 +2736,8 @@ describe('$patchStyleText', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr"><span data-lexical-text="true">a</span>' +
-        '<a href="https://" dir="ltr">' +
+      '<p><span data-lexical-text="true">a</span>' +
+        '<a href="https://">' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
         '</a>' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">b</span></p>',
@@ -2789,8 +2789,8 @@ describe('$patchStyleText', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr"><span data-lexical-text="true">a</span></p>' +
-        '<p dir="ltr"><span style="text-emphasis: filled;" data-lexical-text="true">b</span></p>',
+      '<p><span data-lexical-text="true">a</span></p>' +
+        '<p><span style="text-emphasis: filled;" data-lexical-text="true">b</span></p>',
     );
   });
 
@@ -2838,9 +2838,9 @@ describe('$patchStyleText', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr">' +
+      '<p>' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">a</span>' +
-        '<a href="https://" dir="ltr">' +
+        '<a href="https://">' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
         '</a>' +
         '</p>',
@@ -2891,9 +2891,9 @@ describe('$patchStyleText', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr">' +
+      '<p>' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">a</span>' +
-        '<a href="https://" dir="ltr">' +
+        '<a href="https://">' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
         '</a>' +
         '</p>',
@@ -2935,7 +2935,7 @@ describe('$patchStyleText', () => {
 
     expect(element.innerHTML).toBe(
       '<p>' +
-        '<a href="https://" dir="ltr">' +
+        '<a href="https://">' +
         '<span style="text-emphasis: filled;" data-lexical-text="true">link</span>' +
         '</a>' +
         '</p>',
@@ -2976,7 +2976,7 @@ describe('$patchStyleText', () => {
     });
 
     expect(element.innerHTML).toBe(
-      '<p dir="ltr"><span data-lexical-text="true">text</span></p>',
+      '<p><span data-lexical-text="true">text</span></p>',
     );
   });
 
@@ -3115,7 +3115,7 @@ describe('$patchStyleText', () => {
       });
 
       expect(element.innerHTML).toBe(
-        '<p dir="ltr">' +
+        '<p>' +
           '<strong data-lexical-text="true">fir</strong>' +
           '<strong style="font-size: 15px;" data-lexical-text="true">st</strong>' +
           '<span style="font-size: 15px;" data-lexical-text="true">second</span>' +
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
index 6ce133d184e..abc50962949 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
@@ -102,7 +102,7 @@ describe('LexicalTableNode tests', () => {
         const dataTransfer = new DataTransferMock();
         dataTransfer.setData(
           'text/html',
-          '<html><body><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-16a69100-7fff-6cb9-b829-cb1def16a58d"><div dir="ltr" style="margin-left:0pt;" align="left"><table style="border:none;border-collapse:collapse;table-layout:fixed;width:468pt"><colgroup><col /><col /></colgroup><tbody><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello there</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">General Kenobi!</span></p></td></tr><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p dir="ltr" style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Lexical is nice</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><br /></td></tr></tbody></table></div></b><!--EndFragment--></body></html>',
+          '<html><body><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-16a69100-7fff-6cb9-b829-cb1def16a58d"><div style="margin-left:0pt;" align="left"><table style="border:none;border-collapse:collapse;table-layout:fixed;width:468pt"><colgroup><col /><col /></colgroup><tbody><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Hello there</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">General Kenobi!</span></p></td></tr><tr style="height:22.015pt"><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><p style="line-height:1.2;margin-top:0pt;margin-bottom:0pt;"><span style="font-size:11pt;font-family:Arial,sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Lexical is nice</span></p></td><td style="border-left:solid #000000 1pt;border-right:solid #000000 1pt;border-bottom:solid #000000 1pt;border-top:solid #000000 1pt;vertical-align:top;padding:5pt 5pt 5pt 5pt;overflow:hidden;overflow-wrap:break-word;"><br /></td></tr></tbody></table></div></b><!--EndFragment--></body></html>',
         );
         await editor.update(() => {
           const selection = $getSelection();
@@ -115,7 +115,7 @@ describe('LexicalTableNode tests', () => {
         // Make sure paragraph is inserted inside empty cells
         const emptyCell = '<td><p><br></p></td>';
         expect(testEnv.innerHTML).toBe(
-          `<table><tr><td><p dir="ltr"><span data-lexical-text="true">Hello there</span></p></td><td><p dir="ltr"><span data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p dir="ltr"><span data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
+          `<table><tr><td><p><span data-lexical-text="true">Hello there</span></p></td><td><p><span data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p><span data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
         );
       });
 
@@ -125,7 +125,7 @@ describe('LexicalTableNode tests', () => {
         const dataTransfer = new DataTransferMock();
         dataTransfer.setData(
           'text/html',
-          '<google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none" data-sheets-root="1"><colgroup><col width="100"/><col width="189"/><col width="171"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-weight:bold;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Surface&quot;}">Surface</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-style:italic;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;MWP_WORK_LS_COMPOSER&quot;}">MWP_WORK_LS_COMPOSER</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:underline;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:77349}">77349</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Lexical&quot;}">Lexical</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:line-through;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;XDS_RICH_TEXT_AREA&quot;}">XDS_RICH_TEXT_AREA</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;sdvd sdfvsfs&quot;}" data-sheets-textstyleruns="{&quot;1&quot;:0}{&quot;1&quot;:5,&quot;2&quot;:{&quot;5&quot;:1}}"><span style="font-size:10pt;font-family:Arial;font-style:normal;">sdvd </span><span style="font-size:10pt;font-family:Arial;font-weight:bold;font-style:normal;">sdfvsfs</span></td></tr></tbody></table>',
+          '<google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none" data-sheets-root="1"><colgroup><col width="100"/><col width="189"/><col width="171"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-weight:bold;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Surface&quot;}">Surface</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-style:italic;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;MWP_WORK_LS_COMPOSER&quot;}">MWP_WORK_LS_COMPOSER</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:underline;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:77349}">77349</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;Lexical&quot;}">Lexical</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-decoration:line-through;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;XDS_RICH_TEXT_AREA&quot;}">XDS_RICH_TEXT_AREA</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;sdvd sdfvsfs&quot;}" data-sheets-textstyleruns="{&quot;1&quot;:0}{&quot;1&quot;:5,&quot;2&quot;:{&quot;5&quot;:1}}"><span style="font-size:10pt;font-family:Arial;font-style:normal;">sdvd </span><span style="font-size:10pt;font-family:Arial;font-weight:bold;font-style:normal;">sdfvsfs</span></td></tr></tbody></table>',
         );
         await editor.update(() => {
           const selection = $getSelection();
@@ -136,7 +136,7 @@ describe('LexicalTableNode tests', () => {
           $insertDataTransferForRichText(dataTransfer, selection, editor);
         });
         expect(testEnv.innerHTML).toBe(
-          `<table><tr style="height: 21px;"><td><p dir="ltr"><strong data-lexical-text="true">Surface</strong></p></td><td><p dir="ltr"><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td><p style="text-align: right;"><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td><p dir="ltr"><span data-lexical-text="true">Lexical</span></p></td><td><p dir="ltr"><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td><p dir="ltr"><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
+          `<table><tr style="height: 21px;"><td><p><strong data-lexical-text="true">Surface</strong></p></td><td><p><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td><p style="text-align: right;"><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td><p><span data-lexical-text="true">Lexical</span></p></td><td><p><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td><p><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
         );
       });
     },
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
index 35ee65b688c..d5b85ccaaa0 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
@@ -99,7 +99,7 @@ describe('table selection', () => {
   it('Parses the nodes of a stringified editor state', async () => {
     expect(parsedRoot).toEqual({
       __cachedText: null,
-      __dir: 'ltr',
+      __dir: null,
       __first: paragraphKey,
       __format: 0,
       __indent: 0,
@@ -113,7 +113,7 @@ describe('table selection', () => {
       __type: 'root',
     });
     expect(parsedParagraph).toEqual({
-      __dir: 'ltr',
+      __dir: null,
       __first: textKey,
       __format: 0,
       __indent: 0,
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
index 53c743df637..7655b454053 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
@@ -156,25 +156,25 @@ describe('LexicalEventHelpers', () => {
       const suite = [
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1" dir="ltr"><span data-lexical-text="true">Hello</span></h1></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1"><span data-lexical-text="true">Hello</span></h1></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><h1>Hello</h1>`)],
           name: 'should produce the correct editor state from a pasted HTML h1 element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 class="editor-heading-h2" dir="ltr"><span data-lexical-text="true">From</span></h2></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h2 class="editor-heading-h2"><span data-lexical-text="true">From</span></h2></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><h2>From</h2>`)],
           name: 'should produce the correct editor state from a pasted HTML h2 element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h3 class="editor-heading-h3" dir="ltr"><span data-lexical-text="true">The</span></h3></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h3 class="editor-heading-h3"><span data-lexical-text="true">The</span></h3></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><h3>The</h3>`)],
           name: 'should produce the correct editor state from a pasted HTML h3 element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Other side</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">I must have called</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Other side</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">I must have called</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><ul><li>Other side</li><li>I must have called</li></ul>`,
@@ -184,7 +184,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ol class="editor-list-ol"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">To tell you</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">I’m sorry</span></li></ol></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">To tell you</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">I’m sorry</span></li></ol></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><ol><li>To tell you</li><li>I’m sorry</li></ol>`,
@@ -194,37 +194,37 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A thousand times</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">A thousand times</span></p></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'>A thousand times`)],
           name: 'should produce the correct editor state from pasted DOM Text Node',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Bold</strong></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">Bold</strong></p></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><b>Bold</b>`)],
           name: 'should produce the correct editor state from a pasted HTML b element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><i>Italic</i>`)],
           name: 'should produce the correct editor state from a pasted HTML i element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><em class="editor-text-italic" data-lexical-text="true">Italic</em></p></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><em>Italic</em>`)],
           name: 'should produce the correct editor state from a pasted HTML em element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span class="editor-text-underline" data-lexical-text="true">Underline</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span class="editor-text-underline" data-lexical-text="true">Underline</span></p></div>',
           inputs: [pasteHTML(`<meta charset='utf-8'><u>Underline</u>`)],
           name: 'should produce the correct editor state from a pasted HTML u element',
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1" dir="ltr"><span data-lexical-text="true">Lyrics to Hello by Adele</span></h1><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">A thousand times</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><h1 class="editor-heading-h1"><span data-lexical-text="true">Lyrics to Hello by Adele</span></h1><p class="editor-paragraph"><span data-lexical-text="true">A thousand times</span></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><h1>Lyrics to Hello by Adele</h1>A thousand times`,
@@ -234,7 +234,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook</span></a></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><a href="https://facebook.com"><span data-lexical-text="true">Facebook</span></a></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><a href="https://facebook.com">Facebook</a>`,
@@ -244,7 +244,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook!</span></a></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com"><span data-lexical-text="true">Facebook!</span></a></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'>Welcome to<a href="https://facebook.com">Facebook!</a>`,
@@ -254,7 +254,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><span data-lexical-text="true">Facebook!</span></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com"><span data-lexical-text="true">Facebook!</span></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'>Welcome to<a href="https://facebook.com">Facebook!</a>We hope you like it here.`,
@@ -264,7 +264,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem" dir="ltr"><span data-lexical-text="true">side</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem"><span data-lexical-text="true">side</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist>`,
@@ -274,7 +274,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem" dir="ltr"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem" dir="ltr"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem" dir="ltr"><span data-lexical-text="true">side</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem"><span data-lexical-text="true">side</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><doesnotexist><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist></doesnotexist>`,
@@ -284,7 +284,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><span data-lexical-text="true">We hope you like it here.</span></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'>Welcome to<b><a href="https://facebook.com">Facebook!</a></b>We hope you like it here.`,
@@ -294,7 +294,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold" data-lexical-text="true">We hope you like it here.</strong></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com"><strong class="editor-text-bold" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold" data-lexical-text="true">We hope you like it here.</strong></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'>Welcome to<b><a href="https://facebook.com">Facebook!</a>We hope you like it here.</b>`,
@@ -304,7 +304,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com" dir="ltr"><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">We hope you like it here.</strong></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Welcome to</span><a href="https://facebook.com"><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">Facebook!</strong></a><strong class="editor-text-bold editor-text-italic" data-lexical-text="true">We hope you like it here.</strong></p></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'>Welcome to<b><i><a href="https://facebook.com">Facebook!</a>We hope you like it here.</i></b>`,
@@ -330,7 +330,7 @@ describe('LexicalEventHelpers', () => {
       const suite = [
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">Get schwifty!</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Get schwifty!</span></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-2c706577-7fff-f54a-fe65-12f480020fac"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -340,7 +340,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">Get schwifty!</strong></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">Get schwifty!</strong></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:700;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -350,7 +350,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><em class="editor-text-italic" data-lexical-text="true">Get schwifty!</em></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><em class="editor-text-italic" data-lexical-text="true">Get schwifty!</em></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:italic;font-variant:normal;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -360,7 +360,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph" dir="ltr"><span class="editor-text-strikethrough" data-lexical-text="true">Get schwifty!</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span class="editor-text-strikethrough" data-lexical-text="true">Get schwifty!</span></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -386,20 +386,20 @@ describe('LexicalEventHelpers', () => {
       const suite = [
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">hello world</span></p>',
           inputs: [pasteHTML('<span>hello world</span>')],
           name: 'inline hello world',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">hello world</span></p>',
           inputs: [pasteHTML('<span>    hello  </span>world  ')],
           name: 'inline hello world (2)',
         },
         {
           // MS Office got it right
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true"> hello world</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true"> hello world</span></p>',
           inputs: [
             pasteHTML(' <span style="white-space: pre"> hello </span> world  '),
           ],
@@ -407,19 +407,19 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">  a b</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">c  </span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">  a b</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">c  </span></p>',
           inputs: [pasteHTML('<p style="white-space: pre">  a b\tc  </p>')],
           name: 'white-space: pre (1) (no touchy)',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a b c</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a b c</span></p>',
           inputs: [pasteHTML('<p>\ta\tb  <span>c\t</span>\t</p>')],
           name: 'tabs are collapsed',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">hello world</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">hello world</span></p>',
           inputs: [
             pasteHTML(`
               <div>
@@ -432,7 +432,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">hello world</strong></p>',
+            '<p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">hello world</strong></p>',
           inputs: [
             pasteHTML(`
               <div>
@@ -447,7 +447,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a </span><strong class="editor-text-bold" data-lexical-text="true">b</strong><span data-lexical-text="true"> c</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a </span><strong class="editor-text-bold" data-lexical-text="true">b</strong><span data-lexical-text="true"> c</span></p>',
           inputs: [
             pasteHTML(`
               <div>
@@ -461,25 +461,25 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
+            '<p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
           inputs: [pasteHTML('<div><strong>a </strong>b</div>')],
           name: 'collapsibles and neighbors (1)',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
           inputs: [pasteHTML('<div>a<strong> b</strong></div>')],
           name: 'collapsibles and neighbors (2)',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
+            '<p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">a </strong><span data-lexical-text="true">b</span></p>',
           inputs: [pasteHTML('<div><strong>a </strong><span></span>b</div>')],
           name: 'collapsibles and neighbors (3)',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span><strong class="editor-text-bold" data-lexical-text="true"> b</strong></p>',
           inputs: [pasteHTML('<div>a<span></span><strong> b</strong></div>')],
           name: 'collapsibles and neighbors (4)',
         },
@@ -495,19 +495,19 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span></p>',
           inputs: [pasteHTML('<span> </span><span>a</span>')],
           name: 'redundant inline at start',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span></p>',
           inputs: [pasteHTML('<span>a</span><span> </span>')],
           name: 'redundant inline at end',
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span></p><p class="editor-paragraph"><span data-lexical-text="true">b</span></p>',
           inputs: [
             pasteHTML(`
             <div>
@@ -524,7 +524,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><strong class="editor-text-bold" data-lexical-text="true">a b</strong></p>',
+            '<p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">a b</strong></p>',
           inputs: [
             pasteHTML(`
             <div>
@@ -541,7 +541,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
           inputs: [
             pasteHTML(`
             <p>
@@ -555,7 +555,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span><br><span data-lexical-text="true">b</span></p>',
           inputs: [
             pasteHTML(`
             <p>
@@ -569,7 +569,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph2</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">paragraph1</span></p><p class="editor-paragraph"><span data-lexical-text="true">paragraph2</span></p>',
           inputs: [
             pasteHTML(
               '\n<p class="p1">paragraph1</p>\n<p class="p1">paragraph2</p>\n',
@@ -579,7 +579,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 2</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph"><span data-lexical-text="true">paragraph 2</span></p>',
           inputs: [
             pasteHTML(
               '\n<p class="p1">line 1<br>\nline 2</p>\n<p class="p2"><br></p>\n<p class="p1">paragraph 1</p>\n<p class="p1">paragraph 2</p>\n',
@@ -589,7 +589,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">paragraph 2</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p><p class="editor-paragraph"><br></p><p class="editor-paragraph"><span data-lexical-text="true">paragraph 1</span></p><p class="editor-paragraph"><span data-lexical-text="true">paragraph 2</span></p>',
           inputs: [
             pasteHTML(
               '\n<p class="p1">line 1<br>\nline 2</p>\n<p class="p2">\n<br>\n</p>\n<p class="p1">paragraph 1</p>\n<p class="p1">paragraph 2</p>\n',
@@ -599,7 +599,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">line 1</span><br><span data-lexical-text="true">line 2</span></p>',
           inputs: [
             pasteHTML(
               '<p class="p1"><span>line 1</span><span><br></span><span>line 2</span></p>',
@@ -635,7 +635,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">a</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">b b</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">c</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">z</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">d e</span></p><p class="editor-paragraph" dir="ltr"><span data-lexical-text="true">fg</span></p>',
+            '<p class="editor-paragraph"><span data-lexical-text="true">a</span></p><p class="editor-paragraph"><span data-lexical-text="true">b b</span></p><p class="editor-paragraph"><span data-lexical-text="true">c</span></p><p class="editor-paragraph"><span data-lexical-text="true">z</span></p><p class="editor-paragraph"><span data-lexical-text="true">d e</span></p><p class="editor-paragraph"><span data-lexical-text="true">fg</span></p>',
           inputs: [
             pasteHTML(
               `<div>a<div>b b<div>c<div><div></div>z</div></div>d e</div>fg</div>`,
diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/nodes/_common.ts
index 8a0475c7bda..36e692f255b 100644
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/nodes/_common.ts
@@ -1,10 +1,12 @@
 import {LexicalNode, Spread} from "lexical";
 import type {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
-import {sizeToPixels} from "../utils/dom";
+import {el, sizeToPixels} from "../utils/dom";
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
 
+type EditorNodeDirection = 'ltr' | 'rtl' | null;
+
 export type SerializedCommonBlockNode = Spread<{
     id: string;
     alignment: CommonBlockAlignment;
@@ -29,7 +31,13 @@ export interface NodeHasInset {
     getInset(): number;
 }
 
-interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset {}
+export interface NodeHasDirection {
+    readonly __dir: EditorNodeDirection;
+    setDirection(direction: EditorNodeDirection): void;
+    getDirection(): EditorNodeDirection;
+}
+
+interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset, NodeHasDirection {}
 
 export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
     const textAlignStyle: string = element.style.textAlign || '';
@@ -55,6 +63,15 @@ export function extractInsetFromElement(element: HTMLElement): number {
     return sizeToPixels(elemPadding);
 }
 
+function extractDirectionFromElement(element: HTMLElement): EditorNodeDirection {
+    const elemDir = (element.dir || '').toLowerCase();
+    if (elemDir === 'rtl' || elemDir === 'ltr') {
+        return elemDir;
+    }
+
+    return null;
+}
+
 export function setCommonBlockPropsFromElement(element: HTMLElement, node: CommonBlockInterface): void {
     if (element.id) {
         node.setId(element.id);
@@ -62,12 +79,14 @@ export function setCommonBlockPropsFromElement(element: HTMLElement, node: Commo
 
     node.setAlignment(extractAlignmentFromElement(element));
     node.setInset(extractInsetFromElement(element));
+    node.setDirection(extractDirectionFromElement(element));
 }
 
 export function commonPropertiesDifferent(nodeA: CommonBlockInterface, nodeB: CommonBlockInterface): boolean {
     return nodeA.__id !== nodeB.__id ||
         nodeA.__alignment !== nodeB.__alignment ||
-        nodeA.__inset !== nodeB.__inset;
+        nodeA.__inset !== nodeB.__inset ||
+        nodeA.__dir !== nodeB.__dir;
 }
 
 export function updateElementWithCommonBlockProps(element: HTMLElement, node: CommonBlockInterface): void {
@@ -82,12 +101,17 @@ export function updateElementWithCommonBlockProps(element: HTMLElement, node: Co
     if (node.__inset) {
         element.style.paddingLeft = `${node.__inset}px`;
     }
+
+    if (node.__dir) {
+        element.dir = node.__dir;
+    }
 }
 
 export function deserializeCommonBlockNode(serializedNode: SerializedCommonBlockNode, node: CommonBlockInterface): void {
     node.setId(serializedNode.id);
     node.setAlignment(serializedNode.alignment);
     node.setInset(serializedNode.inset);
+    node.setDirection(serializedNode.direction);
 }
 
 export interface NodeHasSize {
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 874ac537fe3..e07792a1c06 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -3,6 +3,10 @@
 ## In progress
 
 - RTL/LTR support
+  - Basic implementation added 
+  - Test across main range of content blocks
+  - Test that HTML is being set as expected
+  - Test editor defaults when between RTL/LTR modes
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 130fd6b726c..b1c701dda4d 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -37,14 +37,15 @@ function setAlignmentForSelection(editor: LexicalEditor, alignment: CommonBlockA
     $toggleSelection(editor);
 }
 
-function setDirectionForSelection(editor: LexicalEditor, direction: 'ltr' | 'rtl'): void {
-    const selection = getLastSelection(editor);
+function setDirectionForSelection(context: EditorUiContext, direction: 'ltr' | 'rtl'): void {
+    const selection = getLastSelection(context.editor);
 
     const elements = $getBlockElementNodesInSelection(selection);
     for (const node of elements) {
-        console.log('setting direction', node);
         node.setDirection(direction);
     }
+
+    context.manager.triggerFutureStateRefresh();
 }
 
 export const alignLeft: EditorButtonDefinition = {
@@ -95,7 +96,7 @@ export const directionLTR: EditorButtonDefinition = {
     label: 'Left to right',
     icon: ltrIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setDirectionForSelection(context.editor, 'ltr'));
+        context.editor.update(() => setDirectionForSelection(context, 'ltr'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsDirection(selection, 'ltr');
@@ -106,7 +107,7 @@ export const directionRTL: EditorButtonDefinition = {
     label: 'Right to left',
     icon: rtlIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setDirectionForSelection(context.editor, 'rtl'));
+        context.editor.update(() => setDirectionForSelection(context, 'rtl'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsDirection(selection, 'rtl');
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
index 87630eb27fd..9cfa8168ecf 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/lists.ts
@@ -3,7 +3,6 @@ import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {
     BaseSelection,
-    LexicalEditor,
     LexicalNode,
 } from "lexical";
 import listBulletIcon from "@icons/editor/list-bullet.svg";
@@ -12,15 +11,10 @@ import listCheckIcon from "@icons/editor/list-check.svg";
 import indentIncreaseIcon from "@icons/editor/indent-increase.svg";
 import indentDecreaseIcon from "@icons/editor/indent-decrease.svg";
 import {
-    $getBlockElementNodesInSelection,
-    $selectionContainsNodeType, $selectNodes, $selectSingleNode,
-    $toggleSelection,
-    getLastSelection
+    $selectionContainsNodeType,
 } from "../../../utils/selection";
 import {toggleSelectionAsList} from "../../../utils/formats";
-import {nodeHasInset} from "../../../utils/nodes";
-import {$isCustomListItemNode, CustomListItemNode} from "../../../nodes/custom-list-item";
-import {$nestListItem, $setInsetForSelection, $unnestListItem} from "../../../utils/lists";
+import {$setInsetForSelection} from "../../../utils/lists";
 
 
 function buildListButton(label: string, type: ListType, icon: string): EditorButtonDefinition {
diff --git a/tsconfig.json b/tsconfig.json
index 4026872ac9a..8bffc25f898 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "include": ["resources/js/**/*"],
+  "exclude": ["resources/js/wysiwyg/lexical/yjs/*"],
   "compilerOptions": {
     "target": "es2019",
     "module": "commonjs",

From e6edd9340ee59cdd33634647bd467dd806529a6b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 21 Sep 2024 17:02:54 +0100
Subject: [PATCH 278/666] Lexical: Added alignment detoggle, fixed inital focus
 area

---
 resources/js/wysiwyg/todo.md                  |  1 -
 .../wysiwyg/ui/defaults/buttons/alignments.ts | 28 ++++++++++---------
 resources/sass/_editor.scss                   |  2 ++
 .../pages/parts/wysiwyg-editor.blade.php      |  4 +--
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index e07792a1c06..7fcf2544455 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -22,5 +22,4 @@
 
 ## Bugs
 
-- Focus/click area reduced to content area, single line on initial access
 - List selection can get lost on nesting/unnesting
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index b1c701dda4d..6233e6ce64c 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -1,4 +1,4 @@
-import {$isElementNode, BaseSelection, LexicalEditor} from "lexical";
+import {$isElementNode, BaseSelection} from "lexical";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import alignLeftIcon from "@icons/editor/align-left.svg";
 import {EditorUiContext} from "../../framework/core";
@@ -15,26 +15,28 @@ import {CommonBlockAlignment} from "../../../nodes/_common";
 import {nodeHasAlignment} from "../../../utils/nodes";
 
 
-function setAlignmentForSelection(editor: LexicalEditor, alignment: CommonBlockAlignment): void {
-    const selection = getLastSelection(editor);
+function setAlignmentForSelection(context: EditorUiContext, alignment: CommonBlockAlignment): void {
+    const selection = getLastSelection(context.editor);
     const selectionNodes = selection?.getNodes() || [];
 
     // Handle inline node selection alignment
     if (selectionNodes.length === 1 && $isElementNode(selectionNodes[0]) && selectionNodes[0].isInline() && nodeHasAlignment(selectionNodes[0])) {
         selectionNodes[0].setAlignment(alignment);
         $selectSingleNode(selectionNodes[0]);
-        $toggleSelection(editor);
+        context.manager.triggerFutureStateRefresh();
         return;
     }
 
     // Handle normal block/range alignment
     const elements = $getBlockElementNodesInSelection(selection);
-    for (const node of elements) {
-        if (nodeHasAlignment(node)) {
-            node.setAlignment(alignment)
-        }
+    const alignmentNodes = elements.filter(n => nodeHasAlignment(n));
+    const allAlreadyAligned = alignmentNodes.every(n => n.getAlignment() === alignment);
+    const newAlignment = allAlreadyAligned ? '' : alignment;
+    for (const node of alignmentNodes) {
+        node.setAlignment(newAlignment);
     }
-    $toggleSelection(editor);
+
+    context.manager.triggerFutureStateRefresh();
 }
 
 function setDirectionForSelection(context: EditorUiContext, direction: 'ltr' | 'rtl'): void {
@@ -52,7 +54,7 @@ export const alignLeft: EditorButtonDefinition = {
     label: 'Align left',
     icon: alignLeftIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSelection(context.editor, 'left'));
+        context.editor.update(() => setAlignmentForSelection(context, 'left'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'left');
@@ -63,7 +65,7 @@ export const alignCenter: EditorButtonDefinition = {
     label: 'Align center',
     icon: alignCenterIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSelection(context.editor, 'center'));
+        context.editor.update(() => setAlignmentForSelection(context, 'center'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'center');
@@ -74,7 +76,7 @@ export const alignRight: EditorButtonDefinition = {
     label: 'Align right',
     icon: alignRightIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSelection(context.editor, 'right'));
+        context.editor.update(() => setAlignmentForSelection(context, 'right'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'right');
@@ -85,7 +87,7 @@ export const alignJustify: EditorButtonDefinition = {
     label: 'Align justify',
     icon: alignJustifyIcon,
     action(context: EditorUiContext) {
-        context.editor.update(() => setAlignmentForSelection(context.editor, 'justify'));
+        context.editor.update(() => setAlignmentForSelection(context, 'justify'));
     },
     isActive(selection: BaseSelection|null) {
         return $selectionContainsAlignment(selection, 'justify');
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index dd1e1a2c368..91aef992086 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -26,6 +26,7 @@ body.editor-is-fullscreen {
   }
 }
 .editor-content-area {
+  min-height: 100%;
   &:focus {
     outline: 0;
   }
@@ -33,6 +34,7 @@ body.editor-is-fullscreen {
 .editor-content-wrap {
   position: relative;
   overflow-y: scroll;
+  flex: 1;
 }
 
 // Buttons
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index ee5a2e19b11..d927a03d3fb 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -4,9 +4,9 @@
      option:wysiwyg-editor:text-direction="{{ $locale->htmlDirection() }}"
      option:wysiwyg-editor:image-upload-error-text="{{ trans('errors.image_upload_error') }}"
      option:wysiwyg-editor:server-upload-limit-text="{{ trans('errors.server_upload_limit') }}"
-     class="flex-container-column flex-fill">
+     class="flex-container-column flex-fill flex">
 
-    <div class="editor-container flex-container-column flex-fill" refs="wysiwyg-editor@edit-container">
+    <div class="editor-container flex-container-column flex-fill flex" refs="wysiwyg-editor@edit-container">
     </div>
 
     <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>

From 2add15bd728b0f02af619e425d97b441d5832145 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 22 Sep 2024 12:07:24 +0100
Subject: [PATCH 279/666] Lexical: Added direction support to extra blocks

Also removed duplicated dir functionality that remained in core.
---
 .../core/nodes/LexicalParagraphNode.ts        |  5 -----
 .../js/wysiwyg/lexical/rich-text/index.ts     | 12 ------------
 resources/js/wysiwyg/nodes/_common.ts         |  2 +-
 resources/js/wysiwyg/nodes/custom-list.ts     | 19 +++++++++++++++++--
 resources/js/wysiwyg/nodes/details.ts         | 16 ++++++++++++++--
 resources/js/wysiwyg/todo.md                  | 14 ++++++++------
 6 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index deab3a2cc13..4e69dc21c3c 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -135,10 +135,6 @@ export class ParagraphNode extends ElementNode {
       const formatType = this.getFormatType();
       element.style.textAlign = formatType;
 
-      const direction = this.getDirection();
-      if (direction) {
-        element.dir = direction;
-      }
       const indent = this.getIndent();
       if (indent > 0) {
         // padding-inline-start is not widely supported in email HTML, but
@@ -156,7 +152,6 @@ export class ParagraphNode extends ElementNode {
     const node = $createParagraphNode();
     node.setFormat(serializedNode.format);
     node.setIndent(serializedNode.indent);
-    node.setDirection(serializedNode.direction);
     node.setTextFormat(serializedNode.textFormat);
     return node;
   }
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index fd9162566a4..d937060c658 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -158,11 +158,6 @@ export class QuoteNode extends ElementNode {
 
       const formatType = this.getFormatType();
       element.style.textAlign = formatType;
-
-      const direction = this.getDirection();
-      if (direction) {
-        element.dir = direction;
-      }
     }
 
     return {
@@ -174,7 +169,6 @@ export class QuoteNode extends ElementNode {
     const node = $createQuoteNode();
     node.setFormat(serializedNode.format);
     node.setIndent(serializedNode.indent);
-    node.setDirection(serializedNode.direction);
     return node;
   }
 
@@ -324,11 +318,6 @@ export class HeadingNode extends ElementNode {
 
       const formatType = this.getFormatType();
       element.style.textAlign = formatType;
-
-      const direction = this.getDirection();
-      if (direction) {
-        element.dir = direction;
-      }
     }
 
     return {
@@ -340,7 +329,6 @@ export class HeadingNode extends ElementNode {
     const node = $createHeadingNode(serializedNode.tag);
     node.setFormat(serializedNode.format);
     node.setIndent(serializedNode.indent);
-    node.setDirection(serializedNode.direction);
     return node;
   }
 
diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/nodes/_common.ts
index 36e692f255b..71849bb4589 100644
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/nodes/_common.ts
@@ -63,7 +63,7 @@ export function extractInsetFromElement(element: HTMLElement): number {
     return sizeToPixels(elemPadding);
 }
 
-function extractDirectionFromElement(element: HTMLElement): EditorNodeDirection {
+export function extractDirectionFromElement(element: HTMLElement): EditorNodeDirection {
     const elemDir = (element.dir || '').toLowerCase();
     if (elemDir === 'rtl' || elemDir === 'ltr') {
         return elemDir;
diff --git a/resources/js/wysiwyg/nodes/custom-list.ts b/resources/js/wysiwyg/nodes/custom-list.ts
index a6c47399905..4b05fa62e25 100644
--- a/resources/js/wysiwyg/nodes/custom-list.ts
+++ b/resources/js/wysiwyg/nodes/custom-list.ts
@@ -1,12 +1,12 @@
 import {
     DOMConversionFn,
-    DOMConversionMap,
+    DOMConversionMap, EditorConfig,
     LexicalNode,
     Spread
 } from "lexical";
-import {EditorConfig} from "lexical/LexicalEditor";
 import {$isListItemNode, ListItemNode, ListNode, ListType, SerializedListNode} from "@lexical/list";
 import {$createCustomListItemNode} from "./custom-list-item";
+import {extractDirectionFromElement} from "./_common";
 
 
 export type SerializedCustomListNode = Spread<{
@@ -33,6 +33,7 @@ export class CustomListNode extends ListNode {
     static clone(node: CustomListNode) {
         const newNode = new CustomListNode(node.__listType, node.__start, node.__key);
         newNode.__id = node.__id;
+        newNode.__dir = node.__dir;
         return newNode;
     }
 
@@ -42,9 +43,18 @@ export class CustomListNode extends ListNode {
             dom.setAttribute('id', this.__id);
         }
 
+        if (this.__dir) {
+            dom.setAttribute('dir', this.__dir);
+        }
+
         return dom;
     }
 
+    updateDOM(prevNode: ListNode, dom: HTMLElement, config: EditorConfig): boolean {
+        return super.updateDOM(prevNode, dom, config) ||
+            prevNode.__dir !== this.__dir;
+    }
+
     exportJSON(): SerializedCustomListNode {
         return {
             ...super.exportJSON(),
@@ -57,6 +67,7 @@ export class CustomListNode extends ListNode {
     static importJSON(serializedNode: SerializedCustomListNode): CustomListNode {
         const node = $createCustomListNode(serializedNode.listType);
         node.setId(serializedNode.id);
+        node.setDirection(serializedNode.direction);
         return node;
     }
 
@@ -69,6 +80,10 @@ export class CustomListNode extends ListNode {
                 (baseResult.node as CustomListNode).setId(element.id);
             }
 
+            if (element.dir && baseResult?.node) {
+                (baseResult.node as CustomListNode).setDirection(extractDirectionFromElement(element));
+            }
+
             if (baseResult) {
                 baseResult.after = $normalizeChildren;
             }
diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/nodes/details.ts
index 119619da6ad..de87696f345 100644
--- a/resources/js/wysiwyg/nodes/details.ts
+++ b/resources/js/wysiwyg/nodes/details.ts
@@ -5,10 +5,11 @@ import {
     LexicalEditor,
     LexicalNode,
     SerializedElementNode, Spread,
+    EditorConfig,
 } from 'lexical';
-import type {EditorConfig} from "lexical/LexicalEditor";
 
 import {el} from "../utils/dom";
+import {extractDirectionFromElement} from "./_common";
 
 export type SerializedDetailsNode = Spread<{
     id: string;
@@ -34,6 +35,7 @@ export class DetailsNode extends ElementNode {
     static clone(node: DetailsNode): DetailsNode {
         const newNode =  new DetailsNode(node.__key);
         newNode.__id = node.__id;
+        newNode.__dir = node.__dir;
         return newNode;
     }
 
@@ -43,11 +45,16 @@ export class DetailsNode extends ElementNode {
             el.setAttribute('id', this.__id);
         }
 
+        if (this.__dir) {
+            el.setAttribute('dir', this.__dir);
+        }
+
         return el;
     }
 
     updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
-        return prevNode.__id !== this.__id;
+        return prevNode.__id !== this.__id
+        || prevNode.__dir !== this.__dir;
     }
 
     static importDOM(): DOMConversionMap|null {
@@ -60,6 +67,10 @@ export class DetailsNode extends ElementNode {
                             node.setId(element.id);
                         }
 
+                        if (element.dir) {
+                            node.setDirection(extractDirectionFromElement(element));
+                        }
+
                         return {node};
                     },
                     priority: 3,
@@ -80,6 +91,7 @@ export class DetailsNode extends ElementNode {
     static importJSON(serializedNode: SerializedDetailsNode): DetailsNode {
         const node = $createDetailsNode();
         node.setId(serializedNode.id);
+        node.setDirection(serializedNode.direction);
         return node;
     }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 7fcf2544455..66878f37db0 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,16 +2,14 @@
 
 ## In progress
 
-- RTL/LTR support
-  - Basic implementation added 
-  - Test across main range of content blocks
-  - Test that HTML is being set as expected
-  - Test editor defaults when between RTL/LTR modes
+//
 
 ## Main Todo
 
 - Mac: Shortcut support via command.
 - Translations
+- Form closing on submit
+- Update toolbar overflows to match existing editor, incl. direction dynamic controls
 
 ## Secondary Todo
 
@@ -19,7 +17,11 @@
 - Color picker for color controls
 - Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
+- Check translation coverage
 
 ## Bugs
 
-- List selection can get lost on nesting/unnesting
\ No newline at end of file
+- List selection can get lost on nesting/unnesting
+- Can't escape lists when bottom element
+- Content not properly saving on new pages
+- BookStack UI (non-editor) shortcuts can trigger in editor (`/` for example)
\ No newline at end of file

From ef3de1050f880d6848e2382c5df13cf48131c02e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 22 Sep 2024 12:29:06 +0100
Subject: [PATCH 280/666] Lexical: Added UI translation support

---
 resources/js/components/wysiwyg-editor.js             | 11 +++++++----
 .../js/wysiwyg/ui/defaults/buttons/alignments.ts      |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/block-formats.ts   |  2 +-
 resources/js/wysiwyg/ui/defaults/buttons/controls.ts  |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/inline-formats.ts  |  4 ++--
 resources/js/wysiwyg/ui/defaults/modals.ts            |  2 +-
 resources/js/wysiwyg/ui/framework/forms.ts            |  2 +-
 resources/js/wysiwyg/ui/index.ts                      |  5 ++++-
 resources/views/pages/parts/wysiwyg-editor.blade.php  |  4 ++--
 9 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index eed1c61555f..56dbe8d7c5f 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -10,6 +10,12 @@ export class WysiwygEditor extends Component {
         /** @var {SimpleWysiwygEditorInterface|null} */
         this.editor = null;
 
+        const translations = {
+            ...window.editor_translations,
+            imageUploadErrorText: this.$opts.imageUploadErrorText,
+            serverUploadLimitText: this.$opts.serverUploadLimitText,
+        };
+
         window.importVersioned('wysiwyg').then(wysiwyg => {
             const editorContent = this.input.value;
             this.editor = wysiwyg.createPageEditorInstance(this.editContainer, editorContent, {
@@ -17,10 +23,7 @@ export class WysiwygEditor extends Component {
                 pageId: Number(this.$opts.pageId),
                 darkMode: document.documentElement.classList.contains('dark-mode'),
                 textDirection: this.$opts.textDirection,
-                translations: {
-                    imageUploadErrorText: this.$opts.imageUploadErrorText,
-                    serverUploadLimitText: this.$opts.serverUploadLimitText,
-                },
+                translations,
             });
         });
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 6233e6ce64c..f0f46ddc674 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -84,7 +84,7 @@ export const alignRight: EditorButtonDefinition = {
 };
 
 export const alignJustify: EditorButtonDefinition = {
-    label: 'Align justify',
+    label: 'Justify',
     icon: alignJustifyIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => setAlignmentForSelection(context, 'justify'));
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index 80e49348616..f86e33c311e 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -17,7 +17,7 @@ import {
 
 function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
     return {
-        label: `${name} Callout`,
+        label: name,
         action(context: EditorUiContext) {
             context.editor.update(() => {
                 $toggleSelectionBlockNodeType(
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
index 8829d241f16..77223dac3f7 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -56,7 +56,7 @@ export const redo: EditorButtonDefinition = {
 
 
 export const source: EditorButtonDefinition = {
-    label: 'Source code',
+    label: 'Source',
     icon: sourceIcon,
     async action(context: EditorUiContext) {
         const modal = context.manager.createModal('source');
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
index a967ecb2fc0..c3726acf001 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -30,12 +30,12 @@ export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', bo
 export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
 export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
 export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
-export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color', icon: highlightIcon};
+export const highlightColor: EditorBasicButtonDefinition = {label: 'Background color', icon: highlightIcon};
 
 export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
 export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript', subscriptIcon);
-export const code: EditorButtonDefinition = buildFormatButton('Inline Code', 'code', codeIcon);
+export const code: EditorButtonDefinition = buildFormatButton('Inline code', 'code', codeIcon);
 export const clearFormating: EditorButtonDefinition = {
     label: 'Clear formatting',
     icon: formatClearIcon,
diff --git a/resources/js/wysiwyg/ui/defaults/modals.ts b/resources/js/wysiwyg/ui/defaults/modals.ts
index 44d4e036094..c4392377828 100644
--- a/resources/js/wysiwyg/ui/defaults/modals.ts
+++ b/resources/js/wysiwyg/ui/defaults/modals.ts
@@ -5,7 +5,7 @@ import {cellProperties, rowProperties, tableProperties} from "./forms/tables";
 
 export const modals: Record<string, EditorFormModalDefinition> = {
     link: {
-        title: 'Insert/Edit link',
+        title: 'Insert/Edit Link',
         form: link,
     },
     image: {
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index a2db34dd7a1..615d5b4ded0 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -54,7 +54,7 @@ export class EditorFormField extends EditorUiElement {
         if (this.definition.type === 'select') {
             const options = (this.definition as EditorSelectFormFieldDefinition).valuesByLabel
             const labels = Object.keys(options);
-            const optionElems = labels.map(label => el('option', {value: options[label]}, [label]));
+            const optionElems = labels.map(label => el('option', {value: options[label]}, [this.trans(label)]));
             input = el('select', {id, name: this.definition.name, class: 'editor-form-field-input'}, optionElems);
         } else if (this.definition.type === 'textarea') {
             input = el('textarea', {id, name: this.definition.name, class: 'editor-form-field-input'});
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 71a2623d6aa..8bfdb8965d2 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -19,7 +19,10 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         editorDOM: element,
         scrollDOM: scrollContainer,
         manager,
-        translate: (text: string): string => text, // TODO - Implement
+        translate(text: string): string {
+            const translations = options.translations;
+            return translations[text] || text;
+        },
         error(error: string|Error): void {
             const message = error instanceof Error ? error.message : error;
             window.$events.error(message); // TODO - Translate
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index d927a03d3fb..73e6557527f 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -9,7 +9,7 @@ class="flex-container-column flex-fill flex">
     <div class="editor-container flex-container-column flex-fill flex" refs="wysiwyg-editor@edit-container">
     </div>
 
-    <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>
+{{--    <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>--}}
 
     <textarea refs="wysiwyg-editor@input" id="html-editor" hidden="hidden"  name="html" rows="5">{{ old('html') ?? $model->html ?? '' }}</textarea>
 </div>
@@ -18,4 +18,4 @@ class="flex-container-column flex-fill flex">
     <div class="text-neg text-small">{{ $errors->first('html') }}</div>
 @endif
 
-{{--TODO - @include('form.editor-translations')--}}
\ No newline at end of file
+@include('form.editor-translations')
\ No newline at end of file

From c8ccb2bac7a211741222c371bf92caac65fc9979 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 22 Sep 2024 16:15:02 +0100
Subject: [PATCH 281/666] Lexical: Range of fixes

- Prevented ui shortcuts running in editor
- Added form modal closing on submit
- Fixed ability to escape lists via enter on empty last item
---
 resources/js/components/shortcuts.js           |  2 +-
 .../lexical/list/LexicalListItemNode.ts        | 12 ++++++++++++
 resources/js/wysiwyg/todo.md                   |  8 ++------
 .../js/wysiwyg/ui/defaults/forms/objects.ts    | 18 ++++++++++++------
 resources/js/wysiwyg/ui/framework/forms.ts     | 12 ++++++++++--
 resources/js/wysiwyg/ui/framework/modals.ts    |  1 +
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/resources/js/components/shortcuts.js b/resources/js/components/shortcuts.js
index b22c467318e..8bf26fbb51c 100644
--- a/resources/js/components/shortcuts.js
+++ b/resources/js/components/shortcuts.js
@@ -25,7 +25,7 @@ export class Shortcuts extends Component {
 
     setupListeners() {
         window.addEventListener('keydown', event => {
-            if (event.target.closest('input, select, textarea, .cm-editor')) {
+            if (event.target.closest('input, select, textarea, .cm-editor, .editor-container')) {
                 return;
             }
 
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
index 7d12b5bd38a..5026a01293e 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -259,9 +259,21 @@ export class ListItemNode extends ElementNode {
     _: RangeSelection,
     restoreSelection = true,
   ): ListItemNode | ParagraphNode {
+
+    if (this.getTextContent().trim() === '' && this.isLastChild()) {
+      const list = this.getParentOrThrow<ListNode>();
+      if (!$isListItemNode(list.getParent())) {
+        const paragraph = $createParagraphNode();
+        list.insertAfter(paragraph, restoreSelection);
+        this.remove();
+        return paragraph;
+      }
+    }
+
     const newElement = $createListItemNode(
       this.__checked == null ? undefined : false,
     );
+
     this.insertAfter(newElement, restoreSelection);
 
     return newElement;
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 66878f37db0..91e1a967853 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -7,8 +7,6 @@
 ## Main Todo
 
 - Mac: Shortcut support via command.
-- Translations
-- Form closing on submit
 - Update toolbar overflows to match existing editor, incl. direction dynamic controls
 
 ## Secondary Todo
@@ -17,11 +15,9 @@
 - Color picker for color controls
 - Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
-- Check translation coverage
+- Deep check of translation coverage
 
 ## Bugs
 
 - List selection can get lost on nesting/unnesting
-- Can't escape lists when bottom element
-- Content not properly saving on new pages
-- BookStack UI (non-editor) shortcuts can trigger in editor (`/` for example)
\ No newline at end of file
+- Content not properly saving on new pages
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index f1575953b51..228566d442e 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -100,13 +100,12 @@ export const image: EditorFormDefinition = {
 export function $showLinkForm(link: LinkNode|null, context: EditorUiContext) {
     const linkModal = context.manager.createModal('link');
 
-    let formDefaults = {};
     if (link) {
-        formDefaults = {
+        const formDefaults: Record<string, string> = {
             url: link.getURL(),
             text: link.getTextContent(),
-            title: link.getTitle(),
-            target: link.getTarget(),
+            title: link.getTitle() || '',
+            target: link.getTarget() || '',
         }
 
         context.editor.update(() => {
@@ -114,9 +113,16 @@ export function $showLinkForm(link: LinkNode|null, context: EditorUiContext) {
             selection.add(link.getKey());
             $setSelection(selection);
         });
-    }
 
-    linkModal.show(formDefaults);
+        linkModal.show(formDefaults);
+    } else {
+        context.editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const text = selection?.getTextContent() || '';
+            const formDefaults = {text};
+            linkModal.show(formDefaults);
+        });
+    }
 }
 
 export const link: EditorFormDefinition = {
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 615d5b4ded0..36371e30238 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -72,6 +72,7 @@ export class EditorFormField extends EditorUiElement {
 export class EditorForm extends EditorContainerUiElement {
     protected definition: EditorFormDefinition;
     protected onCancel: null|(() => void) = null;
+    protected onSuccessfulSubmit: null|(() => void) = null;
 
     constructor(definition: EditorFormDefinition) {
         let children: (EditorFormField|EditorUiElement)[] = definition.fields.map(fieldDefinition => {
@@ -98,6 +99,10 @@ export class EditorForm extends EditorContainerUiElement {
         this.onCancel = callback;
     }
 
+    setOnSuccessfulSubmit(callback: () => void) {
+        this.onSuccessfulSubmit = callback;
+    }
+
     protected getFieldByName(name: string): EditorFormField|null {
 
         const search = (children: EditorUiElement[]): EditorFormField|null => {
@@ -128,10 +133,13 @@ export class EditorForm extends EditorContainerUiElement {
             ])
         ]);
 
-        form.addEventListener('submit', (event) => {
+        form.addEventListener('submit', async (event) => {
             event.preventDefault();
             const formData = new FormData(form as HTMLFormElement);
-            this.definition.action(formData, this.getContext());
+            const result = await this.definition.action(formData, this.getContext());
+            if (result && this.onSuccessfulSubmit) {
+                this.onSuccessfulSubmit();
+            }
         });
 
         cancelButton.addEventListener('click', (event) => {
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index ae69302f6d0..3eea62ebb94 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -28,6 +28,7 @@ export class EditorFormModal extends EditorContainerUiElement {
         const form = this.getForm();
         form.setValues(defaultValues);
         form.setOnCancel(this.hide.bind(this));
+        form.setOnSuccessfulSubmit(this.hide.bind(this));
 
         this.getContext().manager.setModalActive(this.key, this);
     }

From 8b32e6c15ac4a188b48aed478be4382acae120ee Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 22 Sep 2024 20:06:55 +0100
Subject: [PATCH 282/666] Page Editors: Added switching/options for new lexical
 editor

---
 app/Entities/Models/Page.php                  |  1 +
 app/Entities/Repos/PageRepo.php               | 11 ++--
 app/Entities/Tools/PageEditorData.php         | 22 ++-----
 app/Entities/Tools/PageEditorType.php         | 37 +++++++++++
 lang/en/entities.php                          |  2 +
 resources/js/wysiwyg/todo.md                  |  1 +
 .../pages/parts/editor-toolbar.blade.php      | 15 ++++-
 resources/views/pages/parts/form.blade.php    |  7 +-
 .../views/settings/customization.blade.php    |  1 +
 tests/Entity/PageEditorTest.php               | 65 +++++++++++++++++--
 10 files changed, 134 insertions(+), 28 deletions(-)
 create mode 100644 app/Entities/Tools/PageEditorType.php

diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index 3a433338bfe..499ef4d7288 100644
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -3,6 +3,7 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Entities\Tools\PageContent;
+use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 2526b6c445d..0d9541c52e5 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -12,6 +12,7 @@
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditorData;
+use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
@@ -126,7 +127,9 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
         }
 
         $pageContent = new PageContent($page);
-        $currentEditor = $page->editor ?: PageEditorData::getSystemDefaultEditor();
+        $defaultEditor = PageEditorType::getSystemDefault();
+        $currentEditor = PageEditorType::forPage($page) ?: $defaultEditor;
+        $inputEditor = PageEditorType::fromRequestValue($input['editor'] ?? '') ?? $currentEditor;
         $newEditor = $currentEditor;
 
         $haveInput = isset($input['markdown']) || isset($input['html']);
@@ -135,15 +138,15 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
         if ($haveInput && $inputEmpty) {
             $pageContent->setNewHTML('', user());
         } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {
-            $newEditor = 'markdown';
+            $newEditor = PageEditorType::Markdown;
             $pageContent->setNewMarkdown($input['markdown'], user());
         } elseif (isset($input['html'])) {
-            $newEditor = 'wysiwyg';
+            $newEditor = ($inputEditor->isHtmlBased() ? $inputEditor : null) ?? ($defaultEditor->isHtmlBased() ? $defaultEditor : null) ?? PageEditorType::WysiwygTinymce;
             $pageContent->setNewHTML($input['html'], user());
         }
 
         if ($newEditor !== $currentEditor && userCan('editor-change')) {
-            $page->editor = $newEditor;
+            $page->editor = $newEditor->value;
         }
     }
 
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index f0bd235897d..e4fe2fd25bb 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -74,17 +74,17 @@ protected function build(): array
         ];
     }
 
-    protected function updateContentForEditor(Page $page, string $editorType): void
+    protected function updateContentForEditor(Page $page, PageEditorType $editorType): void
     {
         $isHtml = !empty($page->html) && empty($page->markdown);
 
         // HTML to markdown-clean conversion
-        if ($editorType === 'markdown' && $isHtml && $this->requestedEditor === 'markdown-clean') {
+        if ($editorType === PageEditorType::Markdown && $isHtml && $this->requestedEditor === 'markdown-clean') {
             $page->markdown = (new HtmlToMarkdown($page->html))->convert();
         }
 
         // Markdown to HTML conversion if we don't have HTML
-        if ($editorType === 'wysiwyg' && !$isHtml) {
+        if ($editorType->isHtmlBased() && !$isHtml) {
             $page->html = (new MarkdownToHtml($page->markdown))->convert();
         }
     }
@@ -94,24 +94,16 @@ protected function updateContentForEditor(Page $page, string $editorType): void
      * Defaults based upon the current content of the page otherwise will fall back
      * to system default but will take a requested type (if provided) if permissions allow.
      */
-    protected function getEditorType(Page $page): string
+    protected function getEditorType(Page $page): PageEditorType
     {
-        $editorType = $page->editor ?: self::getSystemDefaultEditor();
+        $editorType = PageEditorType::forPage($page) ?: PageEditorType::getSystemDefault();
 
         // Use requested editor if valid and if we have permission
-        $requestedType = explode('-', $this->requestedEditor)[0];
-        if (($requestedType === 'markdown' || $requestedType === 'wysiwyg') && userCan('editor-change')) {
+        $requestedType = PageEditorType::fromRequestValue($this->requestedEditor);
+        if ($requestedType && userCan('editor-change')) {
             $editorType = $requestedType;
         }
 
         return $editorType;
     }
-
-    /**
-     * Get the configured system default editor.
-     */
-    public static function getSystemDefaultEditor(): string
-    {
-        return setting('app-editor') === 'markdown' ? 'markdown' : 'wysiwyg';
-    }
 }
diff --git a/app/Entities/Tools/PageEditorType.php b/app/Entities/Tools/PageEditorType.php
new file mode 100644
index 00000000000..1c1d430e4a2
--- /dev/null
+++ b/app/Entities/Tools/PageEditorType.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\Page;
+
+enum PageEditorType: string
+{
+    case WysiwygTinymce = 'wysiwyg';
+    case WysiwygLexical = 'wysiwyg2024';
+    case Markdown = 'markdown';
+
+    public function isHtmlBased(): bool
+    {
+        return match ($this) {
+            self::WysiwygTinymce, self::WysiwygLexical => true,
+            self::Markdown => false,
+        };
+    }
+
+    public static function fromRequestValue(string $value): static|null
+    {
+        $editor = explode('-', $value)[0];
+        return static::tryFrom($editor);
+    }
+
+    public static function forPage(Page $page): static|null
+    {
+        return static::tryFrom($page->editor);
+    }
+
+    public static function getSystemDefault(): static
+    {
+        $setting = setting('app-editor');
+        return static::tryFrom($setting) ?? static::WysiwygTinymce;
+    }
+}
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 9e620b24ed1..35e6f050bb8 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 91e1a967853..31e3533b1e0 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -19,5 +19,6 @@
 
 ## Bugs
 
+- Editor theme classes remain on items after export
 - List selection can get lost on nesting/unnesting
 - Content not properly saving on new pages
\ No newline at end of file
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index d25f6a0a402..341fbf67d6c 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -55,7 +55,7 @@ class="text-link icon-list-item">
                         <hr>
                     </li>
                     <li>
-                        @if($editor === 'wysiwyg')
+                        @if($editor !== \BookStack\Entities\Tools\PageEditorType::Markdown)
                             <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-clean" refs="page-editor@changeEditor" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>
@@ -72,12 +72,23 @@ class="text-link icon-list-item">
                                     <small>{{ trans('entities.pages_edit_switch_to_markdown_stable') }}</small>
                                 </div>
                             </a>
-                        @else
+                        @endif
+                        @if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygTinymce)
                             <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg" refs="page-editor@changeEditor" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>{{ trans('entities.pages_edit_switch_to_wysiwyg') }}</div>
                             </a>
                         @endif
+                        @if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygLexical)
+                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg2024" refs="page-editor@changeEditor" class="icon-item">
+                                @icon('swap-horizontal')
+                                <div>
+                                    {{ trans('entities.pages_edit_switch_to_new_wysiwyg') }}
+                                    <br>
+                                    <small>{{ trans('entities.pages_edit_switch_to_new_wysiwyg_desc') }}</small>
+                                </div>
+                            </a>
+                        @endif
                     </li>
                 @endif
             </ul>
diff --git a/resources/views/pages/parts/form.blade.php b/resources/views/pages/parts/form.blade.php
index 490374e40c4..e1104b40642 100644
--- a/resources/views/pages/parts/form.blade.php
+++ b/resources/views/pages/parts/form.blade.php
@@ -32,18 +32,19 @@
             <div class="flex-fill flex">
                 {{--Editors--}}
                 <div class="edit-area flex-fill flex">
+                    <input type="hidden" name="editor" value="{{ $editor->value }}">
 
-                    @if($editor === 'wysiwyg')
+                    @if($editor === \BookStack\Entities\Tools\PageEditorType::WysiwygLexical)
                         @include('pages.parts.wysiwyg-editor', ['model' => $model])
                     @endif
 
                     {{--WYSIWYG Editor (TinyMCE - Deprecated)--}}
-                    @if($editor === 'wysiwyg-tinymce')
+                    @if($editor === \BookStack\Entities\Tools\PageEditorType::WysiwygTinymce)
                         @include('pages.parts.wysiwyg-editor-tinymce', ['model' => $model])
                     @endif
 
                     {{--Markdown Editor--}}
-                    @if($editor === 'markdown')
+                    @if($editor === \BookStack\Entities\Tools\PageEditorType::Markdown)
                         @include('pages.parts.markdown-editor', ['model' => $model])
                     @endif
 
diff --git a/resources/views/settings/customization.blade.php b/resources/views/settings/customization.blade.php
index 4845e2055fc..70a490298c7 100644
--- a/resources/views/settings/customization.blade.php
+++ b/resources/views/settings/customization.blade.php
@@ -32,6 +32,7 @@
                     <select name="setting-app-editor" id="setting-app-editor">
                         <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
                         <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
+                        <option @if(setting('app-editor') === 'wysiwyg2024') selected @endif value="wysiwyg2024">New WYSIWYG (alpha testing)</option>
                     </select>
                 </div>
             </div>
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index b2fb8595543..9340249568c 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\PageEditorType;
 use Tests\TestCase;
 
 class PageEditorTest extends TestCase
@@ -25,7 +26,7 @@ public function test_default_editor_is_wysiwyg_for_new_pages()
 
     public function test_markdown_setting_shows_markdown_editor_for_new_pages()
     {
-        $this->setSettings(['app-editor' => 'markdown']);
+        $this->setSettings(['app-editor' => PageEditorType::Markdown->value]);
 
         $resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
         $this->withHtml($this->followRedirects($resp))
@@ -37,7 +38,7 @@ public function test_markdown_content_given_to_editor()
     {
         $mdContent = '# hello. This is a test';
         $this->page->markdown = $mdContent;
-        $this->page->editor = 'markdown';
+        $this->page->editor = PageEditorType::Markdown;
         $this->page->save();
 
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
@@ -135,6 +136,19 @@ public function test_switching_from_markdown_to_wysiwyg_works()
 
         $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=wysiwyg'));
         $resp->assertStatus(200);
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor-tinymce"]');
+        $resp->assertSee("<h2>A Header</h2>\n<p>Some content with <strong>bold</strong> text!</p>", true);
+    }
+
+    public function test_switching_from_markdown_to_wysiwyg2024_works()
+    {
+        $page = $this->entities->page();
+        $page->html = '';
+        $page->markdown = "## A Header\n\nSome content with **bold** text!";
+        $page->save();
+
+        $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=wysiwyg2024'));
+        $resp->assertStatus(200);
         $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
         $resp->assertSee("<h2>A Header</h2>\n<p>Some content with <strong>bold</strong> text!</p>", true);
     }
@@ -142,7 +156,7 @@ public function test_switching_from_markdown_to_wysiwyg_works()
     public function test_page_editor_changes_with_editor_property()
     {
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
-        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor-tinymce"]');
 
         $this->page->markdown = "## A Header\n\nSome content with **bold** text!";
         $this->page->editor = 'markdown';
@@ -150,6 +164,12 @@ public function test_page_editor_changes_with_editor_property()
 
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
         $this->withHtml($resp)->assertElementExists('[component="markdown-editor"]');
+
+        $this->page->editor = 'wysiwyg2024';
+        $this->page->save();
+
+        $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
     }
 
     public function test_editor_type_switch_options_show()
@@ -158,6 +178,7 @@ public function test_editor_type_switch_options_show()
         $editLink = $this->page->getUrl('/edit') . '?editor=';
         $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-clean\"]", '(Clean Content)');
         $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-stable\"]", '(Stable Content)');
+        $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}wysiwyg2024\"]", '(In Alpha Testing)');
 
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit?editor=markdown-stable'));
         $editLink = $this->page->getUrl('/edit') . '?editor=';
@@ -179,7 +200,7 @@ public function test_page_editor_type_switch_does_not_work_without_change_editor
 
         $resp = $this->asEditor()->get($page->getUrl('/edit?editor=markdown-stable'));
         $resp->assertStatus(200);
-        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor-tinymce"]');
         $this->withHtml($resp)->assertElementNotExists('[component="markdown-editor"]');
     }
 
@@ -193,4 +214,40 @@ public function test_page_save_does_not_change_active_editor_without_change_edit
         $this->asEditor()->put($page->getUrl(), ['name' => $page->name, 'markdown' => '## Updated content abc']);
         $this->assertEquals('wysiwyg', $page->refresh()->editor);
     }
+
+    public function test_editor_type_change_to_wysiwyg_infers_type_from_request_or_uses_system_default()
+    {
+        $tests = [
+            [
+                'setting' => 'wysiwyg',
+                'request' => 'wysiwyg2024',
+                'expected' => 'wysiwyg2024',
+            ],
+            [
+                'setting' => 'wysiwyg2024',
+                'request' => 'wysiwyg',
+                'expected' => 'wysiwyg',
+            ],
+            [
+                'setting' => 'wysiwyg',
+                'request' => null,
+                'expected' => 'wysiwyg',
+            ],
+            [
+                'setting' => 'wysiwyg2024',
+                'request' => null,
+                'expected' => 'wysiwyg2024',
+            ]
+        ];
+
+        $page = $this->entities->page();
+        foreach ($tests as $test) {
+            $page->editor = 'markdown';
+            $page->save();
+
+            $this->setSettings(['app-editor' => $test['setting']]);
+            $this->asAdmin()->put($page->getUrl(), ['name' => $page->name, 'html' => '<p>Hello</p>', 'editor' => $test['request']]);
+            $this->assertEquals($test['expected'], $page->refresh()->editor, "Failed asserting global editor {$test['setting']} with request editor {$test['request']} results in {$test['expected']} set for the page");
+        }
+    }
 }

From a62d8381be1b5736b625f516c303b84c8a64c47a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 23 Sep 2024 17:36:16 +0100
Subject: [PATCH 283/666] Lexical: Updated toolbar & text node exporting

- Updated toolbar to match existing editor, including dynamic RTL/LTR
  controls.
- Updated text node handling to not include spans and extra classes when
  not needed. Added & update tests to cover.
---
 .../__tests__/unit/HTMLCopyAndPaste.test.ts   |  2 +-
 .../lexical/core/nodes/LexicalTextNode.ts     | 41 ++++++++++++-
 .../__tests__/unit/LexicalTabNode.test.ts     |  2 +-
 .../__tests__/unit/LexicalTextNode.test.ts    | 57 ++++++++++++++++++-
 .../unit/LexicalHeadlessEditor.test.ts        |  2 +-
 .../html/__tests__/unit/LexicalHtml.test.ts   |  8 +--
 .../__tests__/unit/LexicalTableNode.test.ts   |  2 +-
 .../unit/LexicalEventHelpers.test.ts          |  8 +--
 .../unit/LexicalUtilsSplitNode.test.ts        | 20 +++----
 ...exlcaiUtilsInsertNodeToNearestRoot.test.ts | 24 ++++----
 resources/js/wysiwyg/todo.md                  |  7 +--
 resources/js/wysiwyg/ui/framework/manager.ts  |  4 ++
 resources/js/wysiwyg/ui/index.ts              |  2 +-
 resources/js/wysiwyg/ui/toolbars.ts           | 17 +++---
 resources/sass/_editor.scss                   |  2 +-
 resources/sass/_pages.scss                    |  5 +-
 16 files changed, 152 insertions(+), 51 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
index 9f832b69e40..534663a54b4 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
@@ -82,7 +82,7 @@ describe('HTMLCopyAndPaste tests', () => {
           pastedHTML: ` <span>123<div>456</div></span>`,
         },
         {
-          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3"><span data-lexical-text="true">todo</span></li></ul>`,
+          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul>`,
           name: 'google doc checklist',
           pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-1980f960-7fff-f4df-4ba3-26c6e1508542"><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul></b>`,
         },
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
index 43bef7e83c0..4a3a489504e 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -624,7 +624,28 @@ export class TextNode extends LexicalNode {
       element !== null && isHTMLElement(element),
       'Expected TextNode createDOM to always return a HTMLElement',
     );
-    element.style.whiteSpace = 'pre-wrap';
+
+    // Wrap up to retain space if head/tail whitespace exists
+    const text = this.getTextContent();
+    if (/^\s|\s$/.test(text)) {
+      element.style.whiteSpace = 'pre-wrap';
+    }
+
+    // Strip editor theme classes
+    for (const className of Array.from(element.classList.values())) {
+      if (className.startsWith('editor-theme-')) {
+        element.classList.remove(className);
+      }
+    }
+    if (element.classList.length === 0) {
+      element.removeAttribute('class');
+    }
+
+    // Remove placeholder tag if redundant
+    if (element.nodeName === 'SPAN' && !element.getAttribute('style')) {
+      element = document.createTextNode(text);
+    }
+
     // This is the only way to properly add support for most clients,
     // even if it's semantically incorrect to have to resort to using
     // <b>, <u>, <s>, <i> elements.
@@ -632,7 +653,7 @@ export class TextNode extends LexicalNode {
       element = wrapElementWith(element, 'b');
     }
     if (this.hasFormat('italic')) {
-      element = wrapElementWith(element, 'i');
+      element = wrapElementWith(element, 'em');
     }
     if (this.hasFormat('strikethrough')) {
       element = wrapElementWith(element, 's');
@@ -1329,6 +1350,10 @@ function applyTextFormatFromStyle(
   // Google Docs uses span tags + vertical-align to specify subscript and superscript
   const verticalAlign = style.verticalAlign;
 
+  // Styles to copy to node
+  const color = style.color;
+  const backgroundColor = style.backgroundColor;
+
   return (lexicalNode: LexicalNode) => {
     if (!$isTextNode(lexicalNode)) {
       return lexicalNode;
@@ -1355,6 +1380,18 @@ function applyTextFormatFromStyle(
       lexicalNode.toggleFormat('superscript');
     }
 
+    // Apply styles
+    let style = lexicalNode.getStyle();
+    if (color) {
+      style += `color: ${color};`;
+    }
+    if (backgroundColor && backgroundColor !== 'transparent') {
+      style += `background-color: ${backgroundColor};`;
+    }
+    if (style) {
+      lexicalNode.setStyle(style);
+    }
+
     if (shouldApply && !lexicalNode.hasFormat(shouldApply)) {
       lexicalNode.toggleFormat(shouldApply);
     }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index a57ff3f42f6..d8525fb369f 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -107,7 +107,7 @@ describe('LexicalTabNode tests', () => {
         $insertDataTransferForRichText(dataTransfer, selection, editor);
       });
       expect(testEnv.innerHTML).toBe(
-        '<p><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p><p><span data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span data-lexical-text="true">world</span></p>',
+        '<p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span style="color: rgb(0, 0, 0);" data-lexical-text="true">world</span></p><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello</span><span data-lexical-text="true">\t</span><span style="color: rgb(0, 0, 0);" data-lexical-text="true">world</span></p>',
       );
     });
 
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index 57e1dcb3baf..b1ea099ac1e 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -8,7 +8,7 @@
 
 import {
   $createParagraphNode,
-  $createTextNode,
+  $createTextNode, $getEditor,
   $getNodeByKey,
   $getRoot,
   $getSelection,
@@ -41,6 +41,9 @@ import {
   $setCompositionKey,
   getEditorStateTextContent,
 } from '../../../LexicalUtils';
+import {Text} from "@codemirror/state";
+import {$generateHtmlFromNodes} from "@lexical/html";
+import {formatBold} from "@lexical/selection/__tests__/utils";
 
 const editorConfig = Object.freeze({
   namespace: '',
@@ -792,6 +795,58 @@ describe('LexicalTextNode tests', () => {
     );
   });
 
+  describe('exportDOM()', () => {
+
+    test('simple text exports as a text node', async () => {
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild<ElementNode>()!;
+        const textNode = $createTextNode('hello');
+        paragraph.append(textNode);
+
+        const html = $generateHtmlFromNodes($getEditor(), null);
+        expect(html).toBe('<p>hello</p>');
+      });
+    });
+
+    test('simple text wrapped in span if leading or ending spacing', async () => {
+
+      const textByExpectedHtml = {
+        'hello ': '<p><span style="white-space: pre-wrap;">hello </span></p>',
+        ' hello': '<p><span style="white-space: pre-wrap;"> hello</span></p>',
+        ' hello ': '<p><span style="white-space: pre-wrap;"> hello </span></p>',
+      }
+
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild<ElementNode>()!;
+        for (const [text, expectedHtml] of Object.entries(textByExpectedHtml)) {
+          paragraph.getChildren().forEach(c => c.remove(true));
+          const textNode = $createTextNode(text);
+          paragraph.append(textNode);
+
+          const html = $generateHtmlFromNodes($getEditor(), null);
+          expect(html).toBe(expectedHtml);
+        }
+      });
+    });
+
+    test('text with formats exports using format elements instead of classes', async () => {
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild<ElementNode>()!;
+        const textNode = $createTextNode('hello');
+        textNode.toggleFormat('bold');
+        textNode.toggleFormat('subscript');
+        textNode.toggleFormat('italic');
+        textNode.toggleFormat('underline');
+        textNode.toggleFormat('code');
+        paragraph.append(textNode);
+
+        const html = $generateHtmlFromNodes($getEditor(), null);
+        expect(html).toBe('<p><u><em><b><code spellcheck="false"><strong>hello</strong></code></b></em></u></p>');
+      });
+    });
+
+  });
+
   test('mergeWithSibling', async () => {
     await update(() => {
       const paragraph = $getRoot().getFirstChild<ElementNode>()!;
diff --git a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
index afa65708d4b..c4dedd47d13 100644
--- a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
@@ -206,7 +206,7 @@ describe('LexicalHeadlessEditor', () => {
     cleanup();
 
     expect(html).toBe(
-      '<p dir="ltr"><span style="white-space: pre-wrap;">hello world</span></p>',
+      '<p>hello world</p>',
     );
   });
 });
diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
index 3dbe5da8b3e..947e591b4ff 100644
--- a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -102,7 +102,7 @@ describe('HTML', () => {
       html = $generateHtmlFromNodes(editor, selection);
     });
 
-    expect(html).toBe('<span style="white-space: pre-wrap;">World</span>');
+    expect(html).toBe('World');
   });
 
   test(`[Lexical -> HTML]: Default selection (undefined) should serialize entire editor state`, () => {
@@ -145,7 +145,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p><span style="white-space: pre-wrap;">Hello</span></p><p><span style="white-space: pre-wrap;">World</span></p>',
+      '<p>Hello</p><p>World</p>',
     );
   });
 
@@ -175,7 +175,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p style="text-align: center;"><span style="white-space: pre-wrap;">Hello world!</span></p>',
+      '<p style="text-align: center;">Hello world!</p>',
     );
   });
 
@@ -205,7 +205,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p style="text-align: center;"><span style="white-space: pre-wrap;">Hello world!</span></p>',
+      '<p style="text-align: center;">Hello world!</p>',
     );
   });
 });
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
index abc50962949..6848e55325d 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
@@ -115,7 +115,7 @@ describe('LexicalTableNode tests', () => {
         // Make sure paragraph is inserted inside empty cells
         const emptyCell = '<td><p><br></p></td>';
         expect(testEnv.innerHTML).toBe(
-          `<table><tr><td><p><span data-lexical-text="true">Hello there</span></p></td><td><p><span data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p><span data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
+          `<table><tr><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello there</span></p></td><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
         );
       });
 
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
index 7655b454053..fd7731f9061 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
@@ -330,7 +330,7 @@ describe('LexicalEventHelpers', () => {
       const suite = [
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span data-lexical-text="true">Get schwifty!</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Get schwifty!</span></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-2c706577-7fff-f54a-fe65-12f480020fac"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -340,7 +340,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><strong class="editor-text-bold" data-lexical-text="true">Get schwifty!</strong></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><strong class="editor-text-bold" style="color: rgb(0, 0, 0);" data-lexical-text="true">Get schwifty!</strong></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:700;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -350,7 +350,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><em class="editor-text-italic" data-lexical-text="true">Get schwifty!</em></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><em class="editor-text-italic" style="color: rgb(0, 0, 0);" data-lexical-text="true">Get schwifty!</em></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:italic;font-variant:normal;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
@@ -360,7 +360,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span class="editor-text-strikethrough" data-lexical-text="true">Get schwifty!</span></p></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><p class="editor-paragraph"><span class="editor-text-strikethrough" style="color: rgb(0, 0, 0);" data-lexical-text="true">Get schwifty!</span></p></div>',
           inputs: [
             pasteHTML(
               `<b style="font-weight:normal;" id="docs-internal-guid-9db03964-7fff-c26c-8b1e-9484fb3b54a4"><span style="font-size:11pt;font-family:Arial;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">Get schwifty!</span></b>`,
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
index f04bb5d2e46..a70200d6349 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
@@ -38,7 +38,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph in between two text nodes',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Hello</span></p><p><span style="white-space: pre-wrap;">world</span></p>',
+        '<p>Hello</p><p>world</p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 1,
       splitPath: [0],
@@ -46,7 +46,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph before the first text node',
       expectedHtml:
-        '<p><br></p><p><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></p>',
+        '<p><br></p><p>Helloworld</p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 0,
       splitPath: [0],
@@ -54,7 +54,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph after the last text node',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></p><p><br></p>',
+        '<p>Helloworld</p><p><br></p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 2, // Any offset that is higher than children size
       splitPath: [0],
@@ -62,8 +62,8 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split list items between two text nodes',
       expectedHtml:
-        '<ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul>' +
-        '<ul><li><span style="white-space: pre-wrap;">world</span></li></ul>',
+        '<ul><li>Hello</li></ul>' +
+        '<ul><li>world</li></ul>',
       initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
       splitOffset: 1, // Any offset that is higher than children size
       splitPath: [0, 0],
@@ -72,7 +72,7 @@ describe('LexicalUtils#splitNode', () => {
       _: 'split list items before the first text node',
       expectedHtml:
         '<ul><li></li></ul>' +
-        '<ul><li><span style="white-space: pre-wrap;">Hello</span><span style="white-space: pre-wrap;">world</span></li></ul>',
+        '<ul><li>Helloworld</li></ul>',
       initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
       splitOffset: 0, // Any offset that is higher than children size
       splitPath: [0, 0],
@@ -81,12 +81,12 @@ describe('LexicalUtils#splitNode', () => {
       _: 'split nested list items',
       expectedHtml:
         '<ul>' +
-        '<li><span style="white-space: pre-wrap;">Before</span></li>' +
-        '<li><ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul></li>' +
+        '<li>Before</li>' +
+        '<li><ul><li>Hello</li></ul></li>' +
         '</ul>' +
         '<ul>' +
-        '<li><ul><li><span style="white-space: pre-wrap;">world</span></li></ul></li>' +
-        '<li><span style="white-space: pre-wrap;">After</span></li>' +
+        '<li><ul><li>world</li></ul></li>' +
+        '<li>After</li>' +
         '</ul>',
       initialHtml:
         '<ul>' +
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
index 9664b2d80ca..fb04e628413 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
@@ -46,7 +46,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert into paragraph in between two text nodes',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Hello</span></p><test-decorator></test-decorator><p><span style="white-space: pre-wrap;">world</span></p>',
+        '<p>Hello</p><test-decorator></test-decorator><p>world</p>',
       initialHtml: '<p><span>Helloworld</span></p>',
       selectionOffset: 5, // Selection on text node after "Hello" world
       selectionPath: [0, 0],
@@ -55,13 +55,13 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
       _: 'insert into nested list items',
       expectedHtml:
         '<ul>' +
-        '<li><span style="white-space: pre-wrap;">Before</span></li>' +
-        '<li><ul><li><span style="white-space: pre-wrap;">Hello</span></li></ul></li>' +
+        '<li>Before</li>' +
+        '<li><ul><li>Hello</li></ul></li>' +
         '</ul>' +
         '<test-decorator></test-decorator>' +
         '<ul>' +
-        '<li><ul><li><span style="white-space: pre-wrap;">world</span></li></ul></li>' +
-        '<li><span style="white-space: pre-wrap;">After</span></li>' +
+        '<li><ul><li>world</li></ul></li>' +
+        '<li>After</li>' +
         '</ul>',
       initialHtml:
         '<ul>' +
@@ -82,7 +82,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert in the end of paragraph',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Hello world</span></p>' +
+        '<p>Hello world</p>' +
         '<test-decorator></test-decorator>' +
         '<p><br></p>',
       initialHtml: '<p>Hello world</p>',
@@ -94,7 +94,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
       expectedHtml:
         '<p><br></p>' +
         '<test-decorator></test-decorator>' +
-        '<p><span style="white-space: pre-wrap;">Hello world</span></p>',
+        '<p>Hello world</p>',
       initialHtml: '<p>Hello world</p>',
       selectionOffset: 0, // Selection on text node after "Hello" world
       selectionPath: [0, 0],
@@ -104,8 +104,8 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
       expectedHtml:
         '<test-decorator></test-decorator>' +
         '<test-decorator></test-decorator>' +
-        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
-        '<p><span style="white-space: pre-wrap;">After</span></p>',
+        '<p>Before</p>' +
+        '<p>After</p>',
       initialHtml:
         '<test-decorator></test-decorator>' +
         '<p><span>Before</span></p>' +
@@ -116,9 +116,9 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert with selection on root child',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
+        '<p>Before</p>' +
         '<test-decorator></test-decorator>' +
-        '<p><span style="white-space: pre-wrap;">After</span></p>',
+        '<p>After</p>',
       initialHtml: '<p>Before</p><p>After</p>',
       selectionOffset: 1,
       selectionPath: [],
@@ -126,7 +126,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert with selection on root end',
       expectedHtml:
-        '<p><span style="white-space: pre-wrap;">Before</span></p>' +
+        '<p>Before</p>' +
         '<test-decorator></test-decorator>',
       initialHtml: '<p>Before</p>',
       selectionOffset: 1,
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 31e3533b1e0..bcd4851e805 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -7,7 +7,6 @@
 ## Main Todo
 
 - Mac: Shortcut support via command.
-- Update toolbar overflows to match existing editor, incl. direction dynamic controls
 
 ## Secondary Todo
 
@@ -16,9 +15,9 @@
 - Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Deep check of translation coverage
+- About button & view
+- Mobile display and handling
 
 ## Bugs
 
-- Editor theme classes remain on items after export
-- List selection can get lost on nesting/unnesting
-- Content not properly saving on new pages
\ No newline at end of file
+- List selection can get lost on nesting/unnesting
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 73253037583..7c0975da7e7 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -163,6 +163,10 @@ export class EditorUIManager {
         });
     }
 
+    getDefaultDirection(): 'rtl' | 'ltr' {
+        return this.getContext().options.textDirection === 'rtl' ? 'rtl' : 'ltr';
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (let i = this.activeContextToolbars.length - 1; i >= 0; i--) {
             const toolbar = this.activeContextToolbars[i];
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 8bfdb8965d2..3811f44b9bf 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -32,7 +32,7 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
     manager.setContext(context);
 
     // Create primary toolbar
-    manager.setToolbar(getMainEditorFullToolbar());
+    manager.setToolbar(getMainEditorFullToolbar(context));
 
     // Register modals
     for (const key of Object.keys(modals)) {
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index b064a2a9f1b..35146e5a440 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -1,5 +1,5 @@
 import {EditorButton} from "./framework/buttons";
-import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiElement} from "./framework/core";
+import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";
 import {EditorFormatMenu} from "./framework/blocks/format-menu";
 import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
 import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
@@ -80,7 +80,10 @@ import {el} from "../utils/dom";
 import {EditorButtonWithMenu} from "./framework/blocks/button-with-menu";
 import {EditorSeparator} from "./framework/blocks/separator";
 
-export function getMainEditorFullToolbar(): EditorContainerUiElement {
+export function getMainEditorFullToolbar(context: EditorUiContext): EditorContainerUiElement {
+
+    const inRtlMode = context.manager.getDefaultDirection() === 'rtl';
+
     return new EditorSimpleClassContainer('editor-toolbar-main', [
 
         // History state
@@ -124,17 +127,17 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {
         ]),
 
         // Alignment
-        new EditorOverflowContainer(6, [ // TODO - Dynamic
+        new EditorOverflowContainer(6, [
             new EditorButton(alignLeft),
             new EditorButton(alignCenter),
             new EditorButton(alignRight),
             new EditorButton(alignJustify),
-            new EditorButton(directionLTR), // TODO - Dynamic
-            new EditorButton(directionRTL), // TODO - Dynamic
-        ]),
+            inRtlMode ? new EditorButton(directionLTR) : null,
+            inRtlMode ? new EditorButton(directionRTL) : null,
+        ].filter(x => x !== null)),
 
         // Lists
-        new EditorOverflowContainer(5, [
+        new EditorOverflowContainer(3, [
             new EditorButton(bulletList),
             new EditorButton(numberList),
             new EditorButton(taskList),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 91aef992086..b33cb4d0558 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -27,6 +27,7 @@ body.editor-is-fullscreen {
 }
 .editor-content-area {
   min-height: 100%;
+  padding-block: 1rem;
   &:focus {
     outline: 0;
   }
@@ -136,7 +137,6 @@ body.editor-is-fullscreen {
   background-color: #FFF;
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.15);
   z-index: 99;
-  min-width: 120px;
   display: flex;
   flex-direction: row;
 }
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 6e6f7bb7e21..426f7961c72 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -35,12 +35,15 @@
 }
 
 @include larger-than($xxl) {
+  .page-editor-wysiwyg2024 .page-edit-toolbar,
+  .page-editor-wysiwyg2024 .page-editor-page-area,
   .page-editor-wysiwyg .page-edit-toolbar,
   .page-editor-wysiwyg .page-editor-page-area {
     max-width: 1140px;
   }
 
-  .page-editor-wysiwyg .floating-toolbox {
+  .page-editor-wysiwyg .floating-toolbox,
+  .page-editor-wysiwyg2024 .floating-toolbox {
     position: absolute;
   }
 }

From 1b9310e7662756215928ce8f4470706cac537a93 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 10:40:53 +0100
Subject: [PATCH 284/666] Meta: Added lexical licensing info and added TS/JS CI
 testing

---
 .github/workflows/lint-js.yml           |  4 ++--
 .github/workflows/test-js.yml           | 29 +++++++++++++++++++++++++
 readme.md                               |  1 +
 resources/views/help/licenses.blade.php |  6 +++++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/test-js.yml

diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index 0391ce5b5c6..9aceea2a26c 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -13,9 +13,9 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Install NPM deps
       run: npm ci
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
new file mode 100644
index 00000000000..13f9a8a9819
--- /dev/null
+++ b/.github/workflows/test-js.yml
@@ -0,0 +1,29 @@
+name: test-js
+
+on:
+  push:
+    paths:
+      - '**.js'
+      - '**.ts'
+      - '**.json'
+  pull_request:
+    paths:
+      - '**.js'
+      - '**.ts'
+      - '**.json'
+
+jobs:
+  build:
+    if: ${{ github.ref != 'refs/heads/l10n_development' }}
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install NPM deps
+      run: npm ci
+
+    - name: Run TypeScript type checking
+      run: npm run ts:lint
+
+    - name: Run JavaScript tests
+      run: npm run test
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 11bf2c8886f..29983eafff0 100644
--- a/readme.md
+++ b/readme.md
@@ -145,6 +145,7 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 
 * [Laravel](http://laravel.com/) - _[MIT](https://github.com/laravel/framework/blob/v8.82.0/LICENSE.md)_
 * [TinyMCE](https://www.tinymce.com/) - _[MIT](https://github.com/tinymce/tinymce/blob/develop/LICENSE.TXT)_
+* [Lexical](https://lexical.dev/) - _[MIT](https://github.com/facebook/lexical/blob/main/LICENSE)_
 * [CodeMirror](https://codemirror.net) - _[MIT](https://github.com/codemirror/CodeMirror/blob/master/LICENSE)_
 * [Sortable](https://github.com/SortableJS/Sortable) - _[MIT](https://github.com/SortableJS/Sortable/blob/master/LICENSE)_
 * [Google Material Icons](https://github.com/google/material-design-icons) - _[Apache-2.0](https://github.com/google/material-design-icons/blob/master/LICENSE)_
diff --git a/resources/views/help/licenses.blade.php b/resources/views/help/licenses.blade.php
index 1eb293523b6..09126ddadb6 100644
--- a/resources/views/help/licenses.blade.php
+++ b/resources/views/help/licenses.blade.php
@@ -54,6 +54,12 @@
                 License File: https://github.com/tinymce/tinymce/blob/release/6.7/LICENSE.TXT
                 Copyright: Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
                 Link: https://github.com/tinymce/tinymce
+                -----------
+                BookStack's newer WYSIWYG editor is based upon lexical code:
+                License: MIT
+                License File: https://github.com/facebook/lexical/blob/v0.17.1/LICENSE
+                Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+                Link: https://github.com/facebook/lexical
             </div>
         </div>
     </div>

From 56b9107c6b47dd84aa91f4f1660ab9ecaf695fd8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 12:29:19 +0100
Subject: [PATCH 285/666] Dependancies: Updated php & JS deps, updated license
 lists

Fixed issue now picked up by newer TS version
---
 composer.lock                                 |  574 +++---
 dev/licensing/js-library-licenses.txt         | 1745 ++++++++++++++++-
 dev/licensing/php-library-licenses.txt        |    9 +-
 package-lock.json                             |  769 ++++++--
 package.json                                  |    3 +-
 .../wysiwyg/lexical/selection/lexical-node.ts |    2 +-
 version                                       |    2 +-
 7 files changed, 2577 insertions(+), 527 deletions(-)

diff --git a/composer.lock b/composer.lock
index c5649d7c8d7..1abbf7e9483 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.320.7",
+            "version": "3.322.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"
+                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
-                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
+                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.320.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.6"
             },
-            "time": "2024-08-23T18:13:50+00:00"
+            "time": "2024-09-26T18:12:45+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -561,16 +561,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.9.0",
+            "version": "3.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6"
+                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6",
-                "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
+                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
                 "shasum": ""
             },
             "require": {
@@ -586,7 +586,7 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.11.7",
+                "phpstan/phpstan": "1.12.0",
                 "phpstan/phpstan-strict-rules": "^1.6",
                 "phpunit/phpunit": "9.6.20",
                 "psalm/plugin-phpunit": "0.18.4",
@@ -654,7 +654,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.9.0"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.1"
             },
             "funding": [
                 {
@@ -670,7 +670,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-15T07:34:42+00:00"
+            "time": "2024-09-01T13:49:23+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1777,16 +1777,16 @@
         },
         {
             "name": "intervention/gif",
-            "version": "4.1.0",
+            "version": "4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/gif.git",
-                "reference": "3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3"
+                "reference": "42c131a31b93c440ad49061b599fa218f06f93be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/gif/zipball/3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3",
-                "reference": "3a2b5f8a8856e8877cdab5c47e51aab2d4cb23a3",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/42c131a31b93c440ad49061b599fa218f06f93be",
+                "reference": "42c131a31b93c440ad49061b599fa218f06f93be",
                 "shasum": ""
             },
             "require": {
@@ -1825,7 +1825,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/gif/issues",
-                "source": "https://github.com/Intervention/gif/tree/4.1.0"
+                "source": "https://github.com/Intervention/gif/tree/4.2.0"
             },
             "funding": [
                 {
@@ -1835,9 +1835,13 @@
                 {
                     "url": "https://github.com/Intervention",
                     "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/interventionphp",
+                    "type": "ko_fi"
                 }
             ],
-            "time": "2024-03-26T17:23:47+00:00"
+            "time": "2024-09-20T13:35:02+00:00"
         },
         {
             "name": "intervention/image",
@@ -1984,16 +1988,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.20",
+            "version": "v10.48.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98"
+                "reference": "c4ea52bb044faef4a103d7dd81746c01b2ec860e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/be2be342d4c74db6a8d2bd18469cd6d488ab9c98",
-                "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c4ea52bb044faef4a103d7dd81746c01b2ec860e",
+                "reference": "c4ea52bb044faef4a103d7dd81746c01b2ec860e",
                 "shasum": ""
             },
             "require": {
@@ -2187,7 +2191,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-08-09T07:55:45+00:00"
+            "time": "2024-09-12T15:00:09+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2249,16 +2253,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.4",
+            "version": "v1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
                 "shasum": ""
             },
             "require": {
@@ -2306,20 +2310,20 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-08-02T07:48:17+00:00"
+            "time": "2024-09-23T13:33:08+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.15.1",
+            "version": "v5.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029"
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
                 "shasum": ""
             },
             "require": {
@@ -2378,20 +2382,20 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-06-28T20:09:34+00:00"
+            "time": "2024-09-03T09:46:57+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.9.0",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe"
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
                 "shasum": ""
             },
             "require": {
@@ -2442,9 +2446,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.9.0"
+                "source": "https://github.com/laravel/tinker/tree/v2.10.0"
             },
-            "time": "2024-01-04T16:10:04+00:00"
+            "time": "2024-09-23T13:32:56+00:00"
         },
         {
             "name": "league/commonmark",
@@ -2912,16 +2916,16 @@
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                 "shasum": ""
             },
             "require": {
@@ -2952,7 +2956,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
             },
             "funding": [
                 {
@@ -2964,7 +2968,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-28T23:22:08+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
         },
         {
             "name": "league/oauth1-client",
@@ -3282,16 +3286,16 @@
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b"
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
                 "shasum": ""
             },
             "require": {
@@ -3308,7 +3312,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -3342,9 +3346,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
             },
-            "time": "2023-08-25T10:54:48+00:00"
+            "time": "2024-09-04T18:46:31+00:00"
         },
         {
             "name": "nesbot/carbon",
@@ -3603,16 +3607,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.1.0",
+            "version": "v5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
+                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
-                "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
+                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
                 "shasum": ""
             },
             "require": {
@@ -3655,9 +3659,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
             },
-            "time": "2024-07-01T20:03:41+00:00"
+            "time": "2024-09-15T16:40:33+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -3811,24 +3815,24 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.7.0",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
-                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
                 "shasum": ""
             },
             "require": {
-                "php": "^7|^8"
+                "php": "^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
+                "phpunit/phpunit": "^9",
+                "vimeo/psalm": "^4|^5"
             },
             "type": "library",
             "autoload": {
@@ -3874,7 +3878,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2024-05-08T12:18:48+00:00"
+            "time": "2024-05-08T12:36:18+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4093,16 +4097,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.41",
+            "version": "3.0.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
-                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "shasum": ""
             },
             "require": {
@@ -4183,7 +4187,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
             },
             "funding": [
                 {
@@ -4199,28 +4203,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T00:13:54+00:00"
+            "time": "2024-09-16T03:06:04+00:00"
         },
         {
             "name": "pragmarx/google2fa",
-            "version": "v8.0.1",
+            "version": "v8.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1.0|^2.0",
+                "paragonie/constant_time_encoding": "^1.0|^2.0|^3.0",
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.18",
+                "phpstan/phpstan": "^1.9",
                 "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
             },
             "type": "library",
@@ -4249,9 +4253,9 @@
             ],
             "support": {
                 "issues": "https://github.com/antonioribeiro/google2fa/issues",
-                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
+                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"
             },
-            "time": "2022-06-13T21:57:56+00:00"
+            "time": "2024-09-05T11:56:40+00:00"
         },
         {
             "name": "predis/predis",
@@ -4676,16 +4680,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "79dff0b268932c640297f5208d6298f71855c03e"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
-                "reference": "79dff0b268932c640297f5208d6298f71855c03e",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -4720,9 +4724,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.1"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2024-08-21T13:31:24+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -5631,16 +5635,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc"
+                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc",
-                "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc",
+                "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765",
+                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765",
                 "shasum": ""
             },
             "require": {
@@ -5705,7 +5709,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.10"
+                "source": "https://github.com/symfony/console/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -5721,7 +5725,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:30:32+00:00"
+            "time": "2024-09-20T08:15:52+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6088,16 +6092,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.10",
+            "version": "v6.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "af29198d87112bebdd397bd7735fbd115997824c"
+                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c",
-                "reference": "af29198d87112bebdd397bd7735fbd115997824c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
+                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
                 "shasum": ""
             },
             "require": {
@@ -6132,7 +6136,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.10"
+                "source": "https://github.com/symfony/finder/tree/v6.4.11"
             },
             "funding": [
                 {
@@ -6148,20 +6152,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-24T07:06:38+00:00"
+            "time": "2024-08-13T14:27:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b"
+                "reference": "133ac043875f59c26c55e79cf074562127cce4d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b",
-                "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2",
+                "reference": "133ac043875f59c26c55e79cf074562127cce4d2",
                 "shasum": ""
             },
             "require": {
@@ -6209,7 +6213,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.10"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -6225,20 +6229,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:36:27+00:00"
+            "time": "2024-09-20T08:18:25+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "147e0daf618d7575b5007055340d09aece5cf068"
+                "reference": "96df83d51b5f78804f70c093b97310794fd6257b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068",
-                "reference": "147e0daf618d7575b5007055340d09aece5cf068",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b",
+                "reference": "96df83d51b5f78804f70c093b97310794fd6257b",
                 "shasum": ""
             },
             "require": {
@@ -6323,7 +6327,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.10"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -6339,20 +6343,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T14:52:04+00:00"
+            "time": "2024-09-21T06:02:57+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.9",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43"
+                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/abe16ee7790b16aa525877419deb0f113953f0e1",
+                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1",
                 "shasum": ""
             },
             "require": {
@@ -6408,7 +6412,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.9"
+                "source": "https://github.com/symfony/mime/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -6424,24 +6428,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:49:33+00:00"
+            "time": "2024-09-20T08:18:25+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -6487,7 +6491,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6503,24 +6507,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -6565,7 +6569,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6581,26 +6585,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -6649,7 +6652,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6665,24 +6668,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -6730,7 +6733,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6746,24 +6749,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -6810,7 +6813,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6826,97 +6829,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:30:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-19T12:30:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -6963,7 +6893,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -6979,24 +6909,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -7039,7 +6969,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7055,24 +6985,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:35:24+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -7118,7 +7048,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -7134,20 +7064,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.8",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
+                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3",
+                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3",
                 "shasum": ""
             },
             "require": {
@@ -7179,7 +7109,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.8"
+                "source": "https://github.com/symfony/process/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -7195,20 +7125,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-17T12:47:12+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87"
+                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87",
-                "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f",
+                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f",
                 "shasum": ""
             },
             "require": {
@@ -7262,7 +7192,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.10"
+                "source": "https://github.com/symfony/routing/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -7278,7 +7208,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-15T09:26:24+00:00"
+            "time": "2024-09-20T08:32:26+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7365,16 +7295,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ccf9b30251719567bfd46494138327522b9a9446"
+                "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446",
-                "reference": "ccf9b30251719567bfd46494138327522b9a9446",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b",
+                "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b",
                 "shasum": ""
             },
             "require": {
@@ -7431,7 +7361,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.10"
+                "source": "https://github.com/symfony/string/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -7447,20 +7377,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-22T10:21:14+00:00"
+            "time": "2024-09-20T08:15:52+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.10",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9"
+                "reference": "cf8360b8352b086be620fae8342c4d96e391a489"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/94041203f8ac200ae9e7c6a18fa6137814ccecc9",
-                "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/cf8360b8352b086be620fae8342c4d96e391a489",
+                "reference": "cf8360b8352b086be620fae8342c4d96e391a489",
                 "shasum": ""
             },
             "require": {
@@ -7526,7 +7456,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.10"
+                "source": "https://github.com/symfony/translation/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -7542,7 +7472,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:30:32+00:00"
+            "time": "2024-09-16T06:02:54+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7624,16 +7554,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.8",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"
+                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
+                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
                 "shasum": ""
             },
             "require": {
@@ -7678,7 +7608,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.8"
+                "source": "https://github.com/symfony/uid/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -7694,20 +7624,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-20T08:32:26+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.10",
+            "version": "v6.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4"
+                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4",
-                "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694",
+                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694",
                 "shasum": ""
             },
             "require": {
@@ -7763,7 +7693,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.10"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.11"
             },
             "funding": [
                 {
@@ -7779,7 +7709,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:30:32+00:00"
+            "time": "2024-08-30T16:03:21+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8117,26 +8047,26 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.15.4",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -8176,7 +8106,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.4"
+                "source": "https://github.com/filp/whoops/tree/2.16.0"
             },
             "funding": [
                 {
@@ -8184,7 +8114,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-03T12:00:00+00:00"
+            "time": "2024-09-25T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8773,16 +8703,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.9.1",
+            "version": "5.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc"
+                "reference": "91d980ab76c3f152481e367f62b921adc38af451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/169a9f11f1957ea36607c9b29eac1b48679f1ecc",
-                "reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/91d980ab76c3f152481e367f62b921adc38af451",
+                "reference": "91d980ab76c3f152481e367f62b921adc38af451",
                 "shasum": ""
             },
             "require": {
@@ -8856,20 +8786,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-08-13T19:01:01+00:00"
+            "time": "2024-08-29T20:56:34+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.11",
+            "version": "1.12.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
-                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
                 "shasum": ""
             },
             "require": {
@@ -8914,7 +8844,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-19T14:37:29+00:00"
+            "time": "2024-09-26T12:45:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9239,16 +9169,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.30",
+            "version": "10.5.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
+                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
-                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7ac8b4e63f456046dcb4c9787da9382831a1874b",
+                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b",
                 "shasum": ""
             },
             "require": {
@@ -9262,7 +9192,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.15",
+                "phpunit/php-code-coverage": "^10.1.16",
                 "phpunit/php-file-iterator": "^4.1.0",
                 "phpunit/php-invoker": "^4.0.0",
                 "phpunit/php-text-template": "^3.0.1",
@@ -9320,7 +9250,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.35"
             },
             "funding": [
                 {
@@ -9336,7 +9266,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T06:09:37+00:00"
+            "time": "2024-09-19T10:52:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10256,16 +10186,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.2",
+            "version": "3.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017"
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017",
-                "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
                 "shasum": ""
             },
             "require": {
@@ -10332,7 +10262,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-07-21T23:26:44+00:00"
+            "time": "2024-09-18T10:38:58+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10392,16 +10322,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.8",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "105b56a0305d219349edeb60a800082eca864e4b"
+                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/105b56a0305d219349edeb60a800082eca864e4b",
-                "reference": "105b56a0305d219349edeb60a800082eca864e4b",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0",
+                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0",
                 "shasum": ""
             },
             "require": {
@@ -10439,7 +10369,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.8"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -10455,7 +10385,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-15T06:35:36+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 0383c2fad35..a6a01cdcc4f 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -1,3 +1,16 @@
+abab
+License: BSD-3-Clause
+License File: node_modules/abab/LICENSE.md
+Source: git+https://github.com/jsdom/abab.git
+Link: https://github.com/jsdom/abab#readme
+-----------
+acorn-globals
+License: MIT
+License File: node_modules/acorn-globals/LICENSE
+Copyright: Copyright (c) 2014 Forbes Lindesay
+Source: https://github.com/ForbesLindesay/acorn-globals.git
+Link: https://github.com/ForbesLindesay/acorn-globals.git
+-----------
 acorn-jsx
 License: MIT
 License File: node_modules/acorn-jsx/LICENSE
@@ -5,6 +18,13 @@ Copyright: Copyright (C) 2012-2017 by Ingvar Stepanyan
 Source: https://github.com/acornjs/acorn-jsx
 Link: https://github.com/acornjs/acorn-jsx
 -----------
+acorn-walk
+License: MIT
+License File: node_modules/acorn-walk/LICENSE
+Copyright: Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+Source: https://github.com/acornjs/acorn.git
+Link: https://github.com/acornjs/acorn
+-----------
 acorn
 License: MIT
 License File: node_modules/acorn/LICENSE
@@ -12,6 +32,11 @@ Copyright: Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 Source: git+https://github.com/acornjs/acorn.git
 Link: https://github.com/acornjs/acorn
 -----------
+agent-base
+License: MIT
+Source: git://github.com/TooTallNate/node-agent-base.git
+Link: git://github.com/TooTallNate/node-agent-base.git
+-----------
 ajv
 License: MIT
 License File: node_modules/ajv/LICENSE
@@ -19,6 +44,13 @@ Copyright: Copyright (c) 2015-2017 Evgeny Poberezkin
 Source: https://github.com/ajv-validator/ajv.git
 Link: https://github.com/ajv-validator/ajv
 -----------
+ansi-escapes
+License: MIT
+License File: node_modules/ansi-escapes/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/ansi-escapes
+Link: sindresorhus/ansi-escapes
+-----------
 ansi-regex
 License: MIT
 License File: node_modules/ansi-regex/license
@@ -40,6 +72,13 @@ Copyright: Copyright (c) 2019 Elan Shanker, Paul Miller (https://paulmillr.com)
 Source: https://github.com/micromatch/anymatch
 Link: https://github.com/micromatch/anymatch
 -----------
+arg
+License: MIT
+License File: node_modules/arg/LICENSE.md
+Copyright: Copyright (c) 2017-2019 Zeit, Inc.
+Source: zeit/arg
+Link: zeit/arg
+-----------
 argparse
 License: Python-2.0
 License File: node_modules/argparse/LICENSE
@@ -88,6 +127,20 @@ Copyright: Copyright (c) 2023 ECMAScript Shims
 Source: git+https://github.com/es-shims/ArrayBuffer.prototype.slice.git
 Link: https://github.com/es-shims/ArrayBuffer.prototype.slice#readme
 -----------
+async
+License: MIT
+License File: node_modules/async/LICENSE
+Copyright: Copyright (c) 2010-2018 Caolan McMahon
+Source: https://github.com/caolan/async.git
+Link: https://caolan.github.io/async/
+-----------
+asynckit
+License: MIT
+License File: node_modules/asynckit/LICENSE
+Copyright: Copyright (c) 2016 Alex Indigo
+Source: git+https://github.com/alexindigo/asynckit.git
+Link: https://github.com/alexindigo/asynckit#readme
+-----------
 available-typed-arrays
 License: MIT
 License File: node_modules/available-typed-arrays/LICENSE
@@ -95,6 +148,42 @@ Copyright: Copyright (c) 2020 Inspect JS
 Source: git+https://github.com/inspect-js/available-typed-arrays.git
 Link: https://github.com/inspect-js/available-typed-arrays#readme
 -----------
+babel-jest
+License: MIT
+License File: node_modules/babel-jest/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+babel-plugin-istanbul
+License: BSD-3-Clause
+License File: node_modules/babel-plugin-istanbul/LICENSE
+Copyright: Copyright (c) 2016, Istanbul Code Coverage
+All rights reserved.
+Source: git+https://github.com/istanbuljs/babel-plugin-istanbul.git
+Link: https://github.com/istanbuljs/babel-plugin-istanbul#readme
+-----------
+babel-plugin-jest-hoist
+License: MIT
+License File: node_modules/babel-plugin-jest-hoist/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+babel-preset-current-node-syntax
+License: MIT
+License File: node_modules/babel-preset-current-node-syntax/LICENSE
+Copyright: Copyright (c) 2020 Nicolò Ribaudo and other contributors
+Source: https://github.com/nicolo-ribaudo/babel-preset-current-node-syntax.git
+Link: https://github.com/nicolo-ribaudo/babel-preset-current-node-syntax.git
+-----------
+babel-preset-jest
+License: MIT
+License File: node_modules/babel-preset-jest/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
 balanced-match
 License: MIT
 License File: node_modules/balanced-match/LICENSE.md
@@ -124,6 +213,32 @@ Copyright: Copyright (c) 2014-present, Jon Schlinkert.
 Source: micromatch/braces
 Link: https://github.com/micromatch/braces
 -----------
+browserslist
+License: MIT
+License File: node_modules/browserslist/LICENSE
+Copyright: Copyright 2014 Andrey Sitnik <******@******.**> and other contributors
+Source: browserslist/browserslist
+Link: browserslist/browserslist
+-----------
+bs-logger
+License: MIT
+License File: node_modules/bs-logger/LICENSE
+Copyright: Copyright (c) 2018 Huafu Gandon
+Source: git+https://github.com/huafu/bs-logger.git
+Link: git+https://github.com/huafu/bs-logger.git
+-----------
+bser
+License: Apache-2.0
+Source: https://github.com/facebook/watchman
+Link: https://facebook.github.io/watchman/docs/bser.html
+-----------
+buffer-from
+License: MIT
+License File: node_modules/buffer-from/LICENSE
+Copyright: Copyright (c) 2016, 2018 Linus Unnebäck
+Source: LinusU/buffer-from
+Link: LinusU/buffer-from
+-----------
 call-bind
 License: MIT
 License File: node_modules/call-bind/LICENSE
@@ -145,6 +260,12 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/camelcase
 Link: sindresorhus/camelcase
 -----------
+caniuse-lite
+License: CC-BY-4.0
+License File: node_modules/caniuse-lite/LICENSE
+Source: browserslist/caniuse-lite
+Link: browserslist/caniuse-lite
+-----------
 chalk
 License: MIT
 License File: node_modules/chalk/license
@@ -152,6 +273,12 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: chalk/chalk
 Link: chalk/chalk
 -----------
+char-regex
+License: MIT
+License File: node_modules/char-regex/LICENSE
+Source: https://github.com/Richienb/char-regex.git
+Link: https://github.com/Richienb/char-regex.git
+-----------
 chokidar-cli
 License: MIT
 License File: node_modules/chokidar-cli/LICENSE
@@ -166,6 +293,19 @@ Copyright: Copyright (c) 2012-2019 Paul Miller (https://paulmillr.com), Elan Sha
 Source: git+https://github.com/paulmillr/chokidar.git
 Link: https://github.com/paulmillr/chokidar
 -----------
+ci-info
+License: MIT
+License File: node_modules/ci-info/LICENSE
+Copyright: Copyright (c) 2016 Thomas Watson Steen
+Source: https://github.com/watson/ci-info.git
+Link: https://github.com/watson/ci-info
+-----------
+cjs-module-lexer
+License: MIT
+License File: node_modules/cjs-module-lexer/LICENSE
+Source: git+https://github.com/nodejs/cjs-module-lexer.git
+Link: https://github.com/nodejs/cjs-module-lexer#readme
+-----------
 cliui
 License: ISC
 License File: node_modules/cliui/LICENSE.txt
@@ -173,6 +313,13 @@ Copyright: Copyright (c) 2015, Contributors
 Source: http://github.com/yargs/cliui.git
 Link: http://github.com/yargs/cliui.git
 -----------
+co
+License: MIT
+License File: node_modules/co/LICENSE
+Copyright: Copyright (c) 2014 TJ Holowaychuk &lt;**@************.**&gt;
+Source: tj/co
+Link: tj/co
+-----------
 codemirror
 License: MIT
 License File: node_modules/codemirror/LICENSE
@@ -180,6 +327,13 @@ Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and o
 Source: https://github.com/codemirror/basic-setup.git
 Link: https://github.com/codemirror/basic-setup.git
 -----------
+collect-v8-coverage
+License: MIT
+License File: node_modules/collect-v8-coverage/LICENSE
+Copyright: Copyright (c) 2019 Simen Bekkhus
+Source: SimenB/collect-v8-coverage
+Link: SimenB/collect-v8-coverage
+-----------
 color-convert
 License: MIT
 License File: node_modules/color-convert/LICENSE
@@ -193,6 +347,13 @@ License File: node_modules/color-name/LICENSE
 Source: git@github.com:colorjs/color-name.git
 Link: https://github.com/colorjs/color-name
 -----------
+combined-stream
+License: MIT
+License File: node_modules/combined-stream/License
+Copyright: Copyright (c) 2011 Debuggable Limited <*****@**********.***>
+Source: git://github.com/felixge/node-combined-stream.git
+Link: https://github.com/felixge/node-combined-stream
+-----------
 concat-map
 License: MIT
 License File: node_modules/concat-map/LICENSE
@@ -206,6 +367,28 @@ Copyright: Copyright (c) 2013-present, Facebook, Inc.
 Source: https://github.com/facebook/create-react-app.git
 Link: https://github.com/facebook/create-react-app.git
 -----------
+convert-source-map
+License: MIT
+License File: node_modules/convert-source-map/LICENSE
+Copyright: Copyright 2013 Thorsten Lorenz. 
+All rights reserved.
+Source: git://github.com/thlorenz/convert-source-map.git
+Link: https://github.com/thlorenz/convert-source-map
+-----------
+create-jest
+License: MIT
+License File: node_modules/create-jest/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+create-require
+License: MIT
+License File: node_modules/create-require/LICENSE
+Copyright: Copyright (c) 2020
+Source: nuxt-contrib/create-require
+Link: nuxt-contrib/create-require
+-----------
 crelt
 License: MIT
 License File: node_modules/crelt/LICENSE
@@ -220,6 +403,26 @@ Copyright: Copyright (c) 2018 Made With MOXY Lda <*****@****.******>
 Source: git@github.com:moxystudio/node-cross-spawn.git
 Link: https://github.com/moxystudio/node-cross-spawn
 -----------
+cssom
+License: MIT
+License File: node_modules/cssom/LICENSE.txt
+Copyright: Copyright (c) Nikita Vasilyev
+Source: NV/CSSOM
+Link: NV/CSSOM
+-----------
+cssstyle
+License: MIT
+License File: node_modules/cssstyle/LICENSE
+Copyright: Copyright (c) Chad Walker
+Source: jsdom/cssstyle
+Link: https://github.com/jsdom/cssstyle
+-----------
+data-urls
+License: MIT
+License File: node_modules/data-urls/LICENSE.txt
+Source: jsdom/data-urls
+Link: jsdom/data-urls
+-----------
 data-view-buffer
 License: MIT
 License File: node_modules/data-view-buffer/LICENSE
@@ -256,6 +459,17 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/decamelize
 Link: sindresorhus/decamelize
 -----------
+decimal.js
+License: MIT
+Source: https://github.com/MikeMcl/decimal.js.git
+Link: https://github.com/MikeMcl/decimal.js.git
+-----------
+dedent
+License: MIT
+License File: node_modules/dedent/LICENSE.md
+Source: https://github.com/dmnd/dedent
+Link: https://github.com/dmnd/dedent
+-----------
 deep-is
 License: MIT
 License File: node_modules/deep-is/LICENSE
@@ -265,6 +479,13 @@ Copyright (c) 2009 Thomas Robinson <280north.com>
 Source: http://github.com/thlorenz/deep-is.git
 Link: http://github.com/thlorenz/deep-is.git
 -----------
+deepmerge
+License: MIT
+License File: node_modules/deepmerge/license.txt
+Copyright: Copyright (c) 2012 James Halliday, Josh Duff, and other contributors
+Source: git://github.com/TehShrike/deepmerge.git
+Link: https://github.com/TehShrike/deepmerge
+-----------
 define-data-property
 License: MIT
 License File: node_modules/define-data-property/LICENSE
@@ -279,12 +500,66 @@ Copyright: Copyright (C) 2015 Jordan Harband
 Source: git://github.com/ljharb/define-properties.git
 Link: git://github.com/ljharb/define-properties.git
 -----------
+delayed-stream
+License: MIT
+License File: node_modules/delayed-stream/License
+Copyright: Copyright (c) 2011 Debuggable Limited <*****@**********.***>
+Source: git://github.com/felixge/node-delayed-stream.git
+Link: https://github.com/felixge/node-delayed-stream
+-----------
+detect-newline
+License: MIT
+License File: node_modules/detect-newline/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/detect-newline
+Link: sindresorhus/detect-newline
+-----------
+diff-sequences
+License: MIT
+License File: node_modules/diff-sequences/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+diff
+License: BSD-3-Clause
+License File: node_modules/diff/LICENSE
+Copyright: Copyright (c) 2009-2015, Kevin Decker <********@*****.***>
+Source: git://github.com/kpdecker/jsdiff.git
+Link: git://github.com/kpdecker/jsdiff.git
+-----------
 doctrine
 License: Apache-2.0
 License File: node_modules/doctrine/LICENSE
 Source: eslint/doctrine
 Link: https://github.com/eslint/doctrine
 -----------
+domexception
+License: MIT
+License File: node_modules/domexception/LICENSE.txt
+Source: jsdom/domexception
+Link: jsdom/domexception
+-----------
+ejs
+License: Apache-2.0
+License File: node_modules/ejs/LICENSE
+Source: git://github.com/mde/ejs.git
+Link: https://github.com/mde/ejs
+-----------
+electron-to-chromium
+License: ISC
+License File: node_modules/electron-to-chromium/LICENSE
+Copyright: Copyright 2018 Kilian Valkhof
+Source: https://github.com/kilian/electron-to-chromium/
+Link: https://github.com/kilian/electron-to-chromium/
+-----------
+emittery
+License: MIT
+License File: node_modules/emittery/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/emittery
+Link: sindresorhus/emittery
+-----------
 emoji-regex
 License: MIT
 License File: node_modules/emoji-regex/LICENSE-MIT.txt
@@ -362,6 +637,13 @@ Copyright: Copyright (c) 2020 Evan Wallace
 Source: git+https://github.com/evanw/esbuild.git
 Link: git+https://github.com/evanw/esbuild.git
 -----------
+escalade
+License: MIT
+License File: node_modules/escalade/license
+Copyright: Copyright (c) Luke Edwards <****.*********@*****.***> (lukeed.com)
+Source: lukeed/escalade
+Link: lukeed/escalade
+-----------
 escape-string-regexp
 License: MIT
 License File: node_modules/escape-string-regexp/license
@@ -369,6 +651,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/escape-string-regexp
 Link: sindresorhus/escape-string-regexp
 -----------
+escodegen
+License: BSD-2-Clause
+License File: node_modules/escodegen/LICENSE.BSD
+Copyright: Copyright (C) 2012 Yusuke Suzuki (twitter: @Constellation) and other contributors.
+Source: http://github.com/estools/escodegen.git
+Link: http://github.com/estools/escodegen
+-----------
 eslint-config-airbnb-base
 License: MIT
 License File: node_modules/eslint-config-airbnb-base/LICENSE.md
@@ -424,6 +713,12 @@ All rights reserved.
 Source: eslint/espree
 Link: https://github.com/eslint/espree
 -----------
+esprima
+License: BSD-2-Clause
+License File: node_modules/esprima/LICENSE.BSD
+Source: https://github.com/jquery/esprima.git
+Link: http://esprima.org
+-----------
 esquery
 License: BSD-3-Clause
 License File: node_modules/esquery/license.txt
@@ -449,6 +744,24 @@ License File: node_modules/esutils/LICENSE.BSD
 Source: http://github.com/estools/esutils.git
 Link: https://github.com/estools/esutils
 -----------
+execa
+License: MIT
+License File: node_modules/execa/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/execa
+Link: sindresorhus/execa
+-----------
+exit
+Source: git://github.com/cowboy/node-exit.git
+Link: https://github.com/cowboy/node-exit
+-----------
+expect
+License: MIT
+License File: node_modules/expect/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
 fast-deep-equal
 License: MIT
 License File: node_modules/fast-deep-equal/LICENSE
@@ -478,6 +791,11 @@ Copyright: Copyright (c) 2015-2020, Matteo Collina <******.*******@*****.***>
 Source: git+https://github.com/mcollina/fastq.git
 Link: https://github.com/mcollina/fastq#readme
 -----------
+fb-watchman
+License: Apache-2.0
+Source: git@github.com:facebook/watchman.git
+Link: https://facebook.github.io/watchman/
+-----------
 file-entry-cache
 License: MIT
 License File: node_modules/file-entry-cache/LICENSE
@@ -485,6 +803,11 @@ Copyright: Copyright (c) 2015 Roy Riojas
 Source: royriojas/file-entry-cache
 Link: royriojas/file-entry-cache
 -----------
+filelist
+License: Apache-2.0
+Source: git://github.com/mde/filelist.git
+Link: https://github.com/mde/filelist
+-----------
 fill-range
 License: MIT
 License File: node_modules/fill-range/LICENSE
@@ -520,6 +843,13 @@ Copyright: Copyright (c) 2012 Raynos.
 Source: git://github.com/Raynos/for-each.git
 Link: https://github.com/Raynos/for-each
 -----------
+form-data
+License: MIT
+License File: node_modules/form-data/License
+Copyright: Copyright (c) 2012 Felix Geisendörfer (*****@**********.***) and contributors
+Source: git://github.com/form-data/form-data.git
+Link: git://github.com/form-data/form-data.git
+-----------
 fs.realpath
 License: ISC
 License File: node_modules/fs.realpath/LICENSE
@@ -548,6 +878,13 @@ Copyright: Copyright (c) 2019 Jordan Harband
 Source: git+https://github.com/inspect-js/functions-have-names.git
 Link: https://github.com/inspect-js/functions-have-names#readme
 -----------
+gensync
+License: MIT
+License File: node_modules/gensync/LICENSE
+Copyright: Copyright 2018 Logan Smyth <***********@*****.***>
+Source: https://github.com/loganfsmyth/gensync.git
+Link: https://github.com/loganfsmyth/gensync
+-----------
 get-caller-file
 License: ISC
 License File: node_modules/get-caller-file/LICENSE.md
@@ -562,6 +899,20 @@ Copyright: Copyright (c) 2020 Jordan Harband
 Source: git+https://github.com/ljharb/get-intrinsic.git
 Link: https://github.com/ljharb/get-intrinsic#readme
 -----------
+get-package-type
+License: MIT
+License File: node_modules/get-package-type/LICENSE
+Copyright: Copyright (c) 2020 CFWare, LLC
+Source: git+https://github.com/cfware/get-package-type.git
+Link: https://github.com/cfware/get-package-type#readme
+-----------
+get-stream
+License: MIT
+License File: node_modules/get-stream/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/get-stream
+Link: sindresorhus/get-stream
+-----------
 get-symbol-description
 License: MIT
 License File: node_modules/get-symbol-description/LICENSE
@@ -674,6 +1025,43 @@ Copyright: Copyright (c) 2015, Rebecca Turner
 Source: git+https://github.com/npm/hosted-git-info.git
 Link: https://github.com/npm/hosted-git-info
 -----------
+html-encoding-sniffer
+License: MIT
+License File: node_modules/html-encoding-sniffer/LICENSE.txt
+Source: jsdom/html-encoding-sniffer
+Link: jsdom/html-encoding-sniffer
+-----------
+html-escaper
+License: MIT
+License File: node_modules/html-escaper/LICENSE.txt
+Copyright: Copyright (C) 2017-present by Andrea Giammarchi - @WebReflection
+Source: https://github.com/WebReflection/html-escaper.git
+Link: https://github.com/WebReflection/html-escaper
+-----------
+http-proxy-agent
+License: MIT
+Source: git://github.com/TooTallNate/node-http-proxy-agent.git
+Link: git://github.com/TooTallNate/node-http-proxy-agent.git
+-----------
+https-proxy-agent
+License: MIT
+Source: git://github.com/TooTallNate/node-https-proxy-agent.git
+Link: git://github.com/TooTallNate/node-https-proxy-agent.git
+-----------
+human-signals
+License: Apache-2.0
+License File: node_modules/human-signals/LICENSE
+Copyright: Copyright 2019 ehmicky <*******@*****.***>
+Source: ehmicky/human-signals
+Link: https://git.io/JeluP
+-----------
+iconv-lite
+License: MIT
+License File: node_modules/iconv-lite/LICENSE
+Copyright: Copyright (c) 2011 Alexander Shtuchkin
+Source: git://github.com/ashtuchkin/iconv-lite.git
+Link: https://github.com/ashtuchkin/iconv-lite
+-----------
 idb-keyval
 License: Apache-2.0
 Source: git+https://github.com/jakearchibald/idb-keyval.git
@@ -698,6 +1086,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/import-fresh
 Link: sindresorhus/import-fresh
 -----------
+import-local
+License: MIT
+License File: node_modules/import-local/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/import-local
+Link: sindresorhus/import-local
+-----------
 imurmurhash
 License: MIT
 Source: https://github.com/jensyt/imurmurhash-js
@@ -801,6 +1196,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/is-fullwidth-code-point
 Link: sindresorhus/is-fullwidth-code-point
 -----------
+is-generator-fn
+License: MIT
+License File: node_modules/is-generator-fn/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/is-generator-fn
+Link: sindresorhus/is-generator-fn
+-----------
 is-glob
 License: MIT
 License File: node_modules/is-glob/LICENSE
@@ -836,6 +1238,12 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/is-path-inside
 Link: sindresorhus/is-path-inside
 -----------
+is-potential-custom-element-name
+License: MIT
+License File: node_modules/is-potential-custom-element-name/LICENSE-MIT.txt
+Source: https://github.com/mathiasbynens/is-potential-custom-element-name.git
+Link: https://github.com/mathiasbynens/is-potential-custom-element-name
+-----------
 is-regex
 License: MIT
 License File: node_modules/is-regex/LICENSE
@@ -850,6 +1258,13 @@ Copyright: Copyright (c) 2021 Inspect JS
 Source: git+https://github.com/inspect-js/is-shared-array-buffer.git
 Link: https://github.com/inspect-js/is-shared-array-buffer#readme
 -----------
+is-stream
+License: MIT
+License File: node_modules/is-stream/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/is-stream
+Link: sindresorhus/is-stream
+-----------
 is-string
 License: MIT
 License File: node_modules/is-string/LICENSE
@@ -892,6 +1307,240 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git+https://github.com/isaacs/isexe.git
 Link: https://github.com/isaacs/isexe#readme
 -----------
+istanbul-lib-coverage
+License: BSD-3-Clause
+License File: node_modules/istanbul-lib-coverage/LICENSE
+Copyright: Copyright 2012-2015 Yahoo! Inc.
+Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
+Link: https://istanbul.js.org/
+-----------
+istanbul-lib-instrument
+License: BSD-3-Clause
+License File: node_modules/istanbul-lib-instrument/LICENSE
+Copyright: Copyright 2012-2015 Yahoo! Inc.
+Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
+Link: https://istanbul.js.org/
+-----------
+istanbul-lib-report
+License: BSD-3-Clause
+License File: node_modules/istanbul-lib-report/LICENSE
+Copyright: Copyright 2012-2015 Yahoo! Inc.
+Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
+Link: https://istanbul.js.org/
+-----------
+istanbul-lib-source-maps
+License: BSD-3-Clause
+License File: node_modules/istanbul-lib-source-maps/LICENSE
+Copyright: Copyright 2015 Yahoo! Inc.
+Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
+Link: https://istanbul.js.org/
+-----------
+istanbul-reports
+License: BSD-3-Clause
+License File: node_modules/istanbul-reports/LICENSE
+Copyright: Copyright 2012-2015 Yahoo! Inc.
+Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
+Link: https://istanbul.js.org/
+-----------
+jake
+License: Apache-2.0
+Source: git://github.com/jakejs/jake.git
+Link: git://github.com/jakejs/jake.git
+-----------
+jest-changed-files
+License: MIT
+License File: node_modules/jest-changed-files/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-circus
+License: MIT
+License File: node_modules/jest-circus/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-cli
+License: MIT
+License File: node_modules/jest-cli/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://jestjs.io/
+-----------
+jest-config
+License: MIT
+License File: node_modules/jest-config/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-diff
+License: MIT
+License File: node_modules/jest-diff/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-docblock
+License: MIT
+License File: node_modules/jest-docblock/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-each
+License: MIT
+License File: node_modules/jest-each/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-environment-jsdom
+License: MIT
+License File: node_modules/jest-environment-jsdom/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-environment-node
+License: MIT
+License File: node_modules/jest-environment-node/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-get-type
+License: MIT
+License File: node_modules/jest-get-type/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-haste-map
+License: MIT
+License File: node_modules/jest-haste-map/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-leak-detector
+License: MIT
+License File: node_modules/jest-leak-detector/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-matcher-utils
+License: MIT
+License File: node_modules/jest-matcher-utils/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-message-util
+License: MIT
+License File: node_modules/jest-message-util/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-mock
+License: MIT
+License File: node_modules/jest-mock/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-pnp-resolver
+License: MIT
+Source: https://github.com/arcanis/jest-pnp-resolver.git
+Link: https://github.com/arcanis/jest-pnp-resolver
+-----------
+jest-regex-util
+License: MIT
+License File: node_modules/jest-regex-util/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-resolve-dependencies
+License: MIT
+License File: node_modules/jest-resolve-dependencies/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-resolve
+License: MIT
+License File: node_modules/jest-resolve/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-runner
+License: MIT
+License File: node_modules/jest-runner/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-runtime
+License: MIT
+License File: node_modules/jest-runtime/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-snapshot
+License: MIT
+License File: node_modules/jest-snapshot/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-util
+License: MIT
+License File: node_modules/jest-util/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-validate
+License: MIT
+License File: node_modules/jest-validate/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest-watcher
+License: MIT
+License File: node_modules/jest-watcher/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://jestjs.io/
+-----------
+jest-worker
+License: MIT
+License File: node_modules/jest-worker/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+jest
+License: MIT
+License File: node_modules/jest/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://jestjs.io/
+-----------
+js-tokens
+License: MIT
+License File: node_modules/js-tokens/LICENSE
+Copyright: Copyright (c) 2014, 2015, 2016, 2017, 2018 Simon Lydell
+Source: lydell/js-tokens
+Link: lydell/js-tokens
+-----------
 js-yaml
 License: MIT
 License File: node_modules/js-yaml/LICENSE
@@ -899,6 +1548,19 @@ Copyright: Copyright (C) 2011-2015 by Vitaly Puzrin
 Source: nodeca/js-yaml
 Link: nodeca/js-yaml
 -----------
+jsdom
+License: MIT
+License File: node_modules/jsdom/LICENSE.txt
+Copyright: Copyright (c) 2010 Elijah Insua
+Source: jsdom/jsdom
+Link: jsdom/jsdom
+-----------
+jsesc
+License: MIT
+License File: node_modules/jsesc/LICENSE-MIT.txt
+Source: https://github.com/mathiasbynens/jsesc.git
+Link: https://mths.be/jsesc
+-----------
 json-buffer
 License: MIT
 License File: node_modules/json-buffer/LICENSE
@@ -913,6 +1575,14 @@ Copyright: Copyright 2017 Kat Marchán
 Source: https://github.com/zkat/json-parse-better-errors
 Link: https://github.com/zkat/json-parse-better-errors
 -----------
+json-parse-even-better-errors
+License: MIT
+License File: node_modules/json-parse-even-better-errors/LICENSE.md
+Copyright: Copyright 2017 Kat Marchán
+Copyright npm, Inc.
+Source: https://github.com/npm/json-parse-even-better-errors
+Link: https://github.com/npm/json-parse-even-better-errors
+-----------
 json-schema-traverse
 License: MIT
 License File: node_modules/json-schema-traverse/LICENSE
@@ -938,6 +1608,20 @@ License: MIT
 Source: git+https://github.com/jaredwray/keyv.git
 Link: https://github.com/jaredwray/keyv
 -----------
+kleur
+License: MIT
+License File: node_modules/kleur/license
+Copyright: Copyright (c) Luke Edwards <****.*********@*****.***> (lukeed.com)
+Source: lukeed/kleur
+Link: lukeed/kleur
+-----------
+leven
+License: MIT
+License File: node_modules/leven/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/leven
+Link: sindresorhus/leven
+-----------
 levn
 License: MIT
 License File: node_modules/levn/LICENSE
@@ -945,6 +1629,13 @@ Copyright: Copyright (c) George Zahariev
 Source: git://github.com/gkz/levn.git
 Link: https://github.com/gkz/levn
 -----------
+lines-and-columns
+License: MIT
+License File: node_modules/lines-and-columns/LICENSE
+Copyright: Copyright (c) 2015 Brian Donovan
+Source: https://github.com/eventualbuddha/lines-and-columns.git
+Link: https://github.com/eventualbuddha/lines-and-columns#readme
+-----------
 linkify-it
 License: MIT
 License File: node_modules/linkify-it/LICENSE
@@ -986,6 +1677,12 @@ License File: node_modules/lodash.debounce/LICENSE
 Source: lodash/lodash
 Link: https://lodash.com/
 -----------
+lodash.memoize
+License: MIT
+License File: node_modules/lodash.memoize/LICENSE
+Source: lodash/lodash
+Link: https://lodash.com/
+-----------
 lodash.merge
 License: MIT
 License File: node_modules/lodash.merge/LICENSE
@@ -998,6 +1695,34 @@ License File: node_modules/lodash.throttle/LICENSE
 Source: lodash/lodash
 Link: https://lodash.com/
 -----------
+lru-cache
+License: ISC
+License File: node_modules/lru-cache/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git://github.com/isaacs/node-lru-cache.git
+Link: git://github.com/isaacs/node-lru-cache.git
+-----------
+make-dir
+License: MIT
+License File: node_modules/make-dir/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/make-dir
+Link: sindresorhus/make-dir
+-----------
+make-error
+License: ISC
+License File: node_modules/make-error/LICENSE
+Copyright: Copyright 2014 Julien Fontanet
+Source: git://github.com/JsCommunity/make-error.git
+Link: https://github.com/JsCommunity/make-error
+-----------
+makeerror
+License: BSD-3-Clause
+License File: node_modules/makeerror/license
+Copyright: Copyright (c) 2014, Naitik Shah. All rights reserved.
+Source: https://github.com/daaku/nodejs-makeerror
+Link: https://github.com/daaku/nodejs-makeerror
+-----------
 markdown-it-task-lists
 License: ISC
 License File: node_modules/markdown-it-task-lists/LICENSE
@@ -1025,6 +1750,43 @@ Copyright: Copyright (C) 2011 Dmitry Nizovtsev
 Source: https://github.com/JSBizon/node-memorystream.git
 Link: https://github.com/JSBizon/node-memorystream
 -----------
+merge-stream
+License: MIT
+License File: node_modules/merge-stream/LICENSE
+Copyright: Copyright (c) Stephen Sugden <**@*************.***> (stephensugden.com)
+Source: grncdr/merge-stream
+Link: grncdr/merge-stream
+-----------
+micromatch
+License: MIT
+License File: node_modules/micromatch/LICENSE
+Copyright: Copyright (c) 2014-present, Jon Schlinkert.
+Source: micromatch/micromatch
+Link: https://github.com/micromatch/micromatch
+-----------
+mime-db
+License: MIT
+License File: node_modules/mime-db/LICENSE
+Copyright: Copyright (c) 2014 Jonathan Ong <**@***********.***>
+Copyright (c) 2015-2022 Douglas Christopher Wilson <****@*************.***>
+Source: jshttp/mime-db
+Link: jshttp/mime-db
+-----------
+mime-types
+License: MIT
+License File: node_modules/mime-types/LICENSE
+Copyright: Copyright (c) 2014 Jonathan Ong <**@***********.***>
+Copyright (c) 2015 Douglas Christopher Wilson <****@*************.***>
+Source: jshttp/mime-types
+Link: jshttp/mime-types
+-----------
+mimic-fn
+License: MIT
+License File: node_modules/mimic-fn/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/mimic-fn
+Link: sindresorhus/mimic-fn
+-----------
 minimatch
 License: ISC
 License File: node_modules/minimatch/LICENSE
@@ -1041,9 +1803,9 @@ Link: https://github.com/minimistjs/minimist
 ms
 License: MIT
 License File: node_modules/ms/license.md
-Copyright: Copyright (c) 2016 Zeit, Inc.
-Source: zeit/ms
-Link: zeit/ms
+Copyright: Copyright (c) 2020 Vercel, Inc.
+Source: vercel/ms
+Link: vercel/ms
 -----------
 natural-compare
 License: MIT
@@ -1057,6 +1819,20 @@ Copyright: Copyright (c) 2018 Tobias Reich
 Source: https://github.com/electerious/nice-try.git
 Link: https://github.com/electerious/nice-try
 -----------
+node-int64
+License: MIT
+License File: node_modules/node-int64/LICENSE
+Copyright: Copyright (c) 2014 Robert Kieffer
+Source: https://github.com/broofa/node-int64
+Link: https://github.com/broofa/node-int64
+-----------
+node-releases
+License: MIT
+License File: node_modules/node-releases/LICENSE
+Copyright: Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
+Source: git+https://github.com/chicoxyzzy/node-releases.git
+Link: git+https://github.com/chicoxyzzy/node-releases.git
+-----------
 normalize-package-data
 License: BSD-2-Clause
 License File: node_modules/normalize-package-data/LICENSE
@@ -1079,6 +1855,20 @@ Copyright: Copyright (c) 2015 Toru Nagashima
 Source: mysticatea/npm-run-all
 Link: https://github.com/mysticatea/npm-run-all
 -----------
+npm-run-path
+License: MIT
+License File: node_modules/npm-run-path/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/npm-run-path
+Link: sindresorhus/npm-run-path
+-----------
+nwsapi
+License: MIT
+License File: node_modules/nwsapi/LICENSE
+Copyright: Copyright (c) 2007-2024 Diego Perini (http://www.iport.it/)
+Source: git://github.com/dperini/nwsapi.git
+Link: http://javascript.nwbox.com/nwsapi/
+-----------
 object-inspect
 License: MIT
 License File: node_modules/object-inspect/LICENSE
@@ -1135,6 +1925,13 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git://github.com/isaacs/once
 Link: git://github.com/isaacs/once
 -----------
+onetime
+License: MIT
+License File: node_modules/onetime/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/onetime
+Link: sindresorhus/onetime
+-----------
 optionator
 License: MIT
 License File: node_modules/optionator/LICENSE
@@ -1181,10 +1978,17 @@ Link: sindresorhus/parent-module
 parse-json
 License: MIT
 License File: node_modules/parse-json/license
-Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
 Source: sindresorhus/parse-json
 Link: sindresorhus/parse-json
 -----------
+parse5
+License: MIT
+License File: node_modules/parse5/LICENSE
+Copyright: Copyright (c) 2013-2019 Ivan Nikulin (******@*****.***, https://github.com/inikulin)
+Source: git://github.com/inikulin/parse5.git
+Link: https://github.com/inikulin/parse5
+-----------
 path-exists
 License: MIT
 License File: node_modules/path-exists/license
@@ -1220,6 +2024,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/path-type
 Link: sindresorhus/path-type
 -----------
+picocolors
+License: ISC
+License File: node_modules/picocolors/LICENSE
+Copyright: Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov
+Source: alexeyraspopov/picocolors
+Link: alexeyraspopov/picocolors
+-----------
 picomatch
 License: MIT
 License File: node_modules/picomatch/LICENSE
@@ -1241,6 +2052,20 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/pify
 Link: sindresorhus/pify
 -----------
+pirates
+License: MIT
+License File: node_modules/pirates/LICENSE
+Copyright: Copyright (c) 2016-2018 Ari Porad
+Source: https://github.com/danez/pirates.git
+Link: https://github.com/danez/pirates#readme
+-----------
+pkg-dir
+License: MIT
+License File: node_modules/pkg-dir/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/pkg-dir
+Link: sindresorhus/pkg-dir
+-----------
 possible-typed-array-names
 License: MIT
 License File: node_modules/possible-typed-array-names/LICENSE
@@ -1255,6 +2080,27 @@ Copyright: Copyright (c) George Zahariev
 Source: git://github.com/gkz/prelude-ls.git
 Link: http://preludels.com
 -----------
+pretty-format
+License: MIT
+License File: node_modules/pretty-format/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+prompts
+License: MIT
+License File: node_modules/prompts/license
+Copyright: Copyright (c) 2018 Terkel Gjervig Nielsen
+Source: terkelg/prompts
+Link: terkelg/prompts
+-----------
+psl
+License: MIT
+License File: node_modules/psl/LICENSE
+Copyright: Copyright (c) 2017 Lupo Montero ***********@*****.***
+Source: git@github.com:lupomontero/psl.git
+Link: git@github.com:lupomontero/psl.git
+-----------
 punycode.js
 License: MIT
 License File: node_modules/punycode.js/LICENSE-MIT.txt
@@ -1267,6 +2113,20 @@ License File: node_modules/punycode/LICENSE-MIT.txt
 Source: https://github.com/mathiasbynens/punycode.js.git
 Link: https://mths.be/punycode
 -----------
+pure-rand
+License: MIT
+License File: node_modules/pure-rand/LICENSE
+Copyright: Copyright (c) 2018 Nicolas DUBIEN
+Source: git+https://github.com/dubzzz/pure-rand.git
+Link: https://github.com/dubzzz/pure-rand#readme
+-----------
+querystringify
+License: MIT
+License File: node_modules/querystringify/LICENSE
+Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
+Source: https://github.com/unshiftio/querystringify
+Link: https://github.com/unshiftio/querystringify
+-----------
 queue-microtask
 License: MIT
 License File: node_modules/queue-microtask/LICENSE
@@ -1274,6 +2134,13 @@ Copyright: Copyright (c) Feross Aboukhadijeh
 Source: git://github.com/feross/queue-microtask.git
 Link: https://github.com/feross/queue-microtask
 -----------
+react-is
+License: MIT
+License File: node_modules/react-is/LICENSE
+Copyright: Copyright (c) Facebook, Inc. and its affiliates.
+Source: https://github.com/facebook/react.git
+Link: https://reactjs.org/
+-----------
 read-pkg
 License: MIT
 License File: node_modules/read-pkg/license
@@ -1309,6 +2176,20 @@ Copyright: Copyright (c) 2016, Contributors
 Source: git+ssh://git@github.com/yargs/require-main-filename.git
 Link: https://github.com/yargs/require-main-filename#readme
 -----------
+requires-port
+License: MIT
+License File: node_modules/requires-port/LICENSE
+Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
+Source: https://github.com/unshiftio/requires-port
+Link: https://github.com/unshiftio/requires-port
+-----------
+resolve-cwd
+License: MIT
+License File: node_modules/resolve-cwd/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/resolve-cwd
+Link: sindresorhus/resolve-cwd
+-----------
 resolve-from
 License: MIT
 License File: node_modules/resolve-from/license
@@ -1316,6 +2197,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/resolve-from
 Link: sindresorhus/resolve-from
 -----------
+resolve.exports
+License: MIT
+License File: node_modules/resolve.exports/license
+Copyright: Copyright (c) Luke Edwards <****.*********@*****.***> (lukeed.com)
+Source: lukeed/resolve.exports
+Link: lukeed/resolve.exports
+-----------
 resolve
 License: MIT
 License File: node_modules/resolve/LICENSE
@@ -1358,6 +2246,13 @@ Copyright: Copyright (c) 2022 Jordan Harband
 Source: git+https://github.com/ljharb/safe-regex-test.git
 Link: https://github.com/ljharb/safe-regex-test#readme
 -----------
+safer-buffer
+License: MIT
+License File: node_modules/safer-buffer/LICENSE
+Copyright: Copyright (c) 2018 Nikita Skovoroda <********@*****.***>
+Source: git+https://github.com/ChALkeR/safer-buffer.git
+Link: git+https://github.com/ChALkeR/safer-buffer.git
+-----------
 sass
 License: MIT
 License File: node_modules/sass/LICENSE
@@ -1365,6 +2260,11 @@ Copyright: Copyright (c) 2016, Google Inc.
 Source: https://github.com/sass/dart-sass
 Link: https://github.com/sass/dart-sass
 -----------
+saxes
+License: ISC
+Source: https://github.com/lddubeau/saxes.git
+Link: https://github.com/lddubeau/saxes.git
+-----------
 semver
 License: ISC
 License File: node_modules/semver/LICENSE
@@ -1421,6 +2321,27 @@ Copyright: Copyright (c) 2019 Jordan Harband
 Source: git+https://github.com/ljharb/side-channel.git
 Link: https://github.com/ljharb/side-channel#readme
 -----------
+signal-exit
+License: ISC
+License File: node_modules/signal-exit/LICENSE.txt
+Copyright: Copyright (c) 2015, Contributors
+Source: https://github.com/tapjs/signal-exit.git
+Link: https://github.com/tapjs/signal-exit
+-----------
+sisteransi
+License: MIT
+License File: node_modules/sisteransi/license
+Copyright: Copyright (c) 2018 Terkel Gjervig Nielsen
+Source: https://github.com/terkelg/sisteransi
+Link: https://github.com/terkelg/sisteransi
+-----------
+slash
+License: MIT
+License File: node_modules/slash/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/slash
+Link: sindresorhus/slash
+-----------
 snabbdom
 License: MIT
 License File: node_modules/snabbdom/LICENSE
@@ -1442,6 +2363,21 @@ All rights reserved.
 Source: 7rulnik/source-map-js
 Link: https://github.com/7rulnik/source-map-js
 -----------
+source-map-support
+License: MIT
+License File: node_modules/source-map-support/LICENSE.md
+Copyright: Copyright (c) 2014 Evan Wallace
+Source: https://github.com/evanw/node-source-map-support
+Link: https://github.com/evanw/node-source-map-support
+-----------
+source-map
+License: BSD-3-Clause
+License File: node_modules/source-map/LICENSE
+Copyright: Copyright (c) 2009-2011, Mozilla Foundation and contributors
+All rights reserved.
+Source: http://github.com/mozilla/source-map.git
+Link: https://github.com/mozilla/source-map
+-----------
 spdx-correct
 License: Apache-2.0
 License File: node_modules/spdx-correct/LICENSE
@@ -1465,6 +2401,28 @@ License: CC0-1.0
 Source: jslicense/spdx-license-ids
 Link: jslicense/spdx-license-ids
 -----------
+sprintf-js
+License: BSD-3-Clause
+License File: node_modules/sprintf-js/LICENSE
+Copyright: Copyright (c) 2007-2014, Alexandru Marasteanu <hello [at) alexei (dot] ro>
+All rights reserved.
+Source: https://github.com/alexei/sprintf.js.git
+Link: https://github.com/alexei/sprintf.js.git
+-----------
+stack-utils
+License: MIT
+License File: node_modules/stack-utils/LICENSE.md
+Copyright: Copyright (c) 2016-2022 Isaac Z. Schlueter <*@***.**>, James Talmage <*****@*******.**> (github.com/jamestalmage), and Contributors
+Source: tapjs/stack-utils
+Link: tapjs/stack-utils
+-----------
+string-length
+License: MIT
+License File: node_modules/string-length/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: sindresorhus/string-length
+Link: sindresorhus/string-length
+-----------
 string-width
 License: MIT
 License File: node_modules/string-width/license
@@ -1514,6 +2472,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/strip-bom
 Link: sindresorhus/strip-bom
 -----------
+strip-final-newline
+License: MIT
+License File: node_modules/strip-final-newline/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/strip-final-newline
+Link: sindresorhus/strip-final-newline
+-----------
 strip-json-comments
 License: MIT
 License File: node_modules/strip-json-comments/license
@@ -1542,12 +2507,41 @@ Copyright: Copyright (c) 2022 Inspect JS
 Source: git+https://github.com/inspect-js/node-supports-preserve-symlinks-flag.git
 Link: https://github.com/inspect-js/node-supports-preserve-symlinks-flag#readme
 -----------
+symbol-tree
+License: MIT
+License File: node_modules/symbol-tree/LICENSE
+Copyright: Copyright (c) 2015 Joris van der Wel
+Source: https://github.com/jsdom/js-symbol-tree.git
+Link: https://github.com/jsdom/js-symbol-tree#symbol-tree
+-----------
+test-exclude
+License: ISC
+License File: node_modules/test-exclude/LICENSE.txt
+Copyright: Copyright (c) 2016, Contributors
+Source: git+https://github.com/istanbuljs/test-exclude.git
+Link: https://istanbul.js.org/
+-----------
 text-table
 License: MIT
 License File: node_modules/text-table/LICENSE
 Source: git://github.com/substack/text-table.git
 Link: https://github.com/substack/text-table
 -----------
+tmpl
+License: BSD-3-Clause
+License File: node_modules/tmpl/license
+Copyright: Copyright (c) 2014, Naitik Shah. All rights reserved.
+Source: https://github.com/daaku/nodejs-tmpl
+Link: https://github.com/daaku/nodejs-tmpl
+-----------
+to-fast-properties
+License: MIT
+License File: node_modules/to-fast-properties/license
+Copyright: Copyright (c) 2014 Petka Antonov
+              2015 Sindre Sorhus
+Source: sindresorhus/to-fast-properties
+Link: sindresorhus/to-fast-properties
+-----------
 to-regex-range
 License: MIT
 License File: node_modules/to-regex-range/LICENSE
@@ -1555,6 +2549,34 @@ Copyright: Copyright (c) 2015-present, Jon Schlinkert.
 Source: micromatch/to-regex-range
 Link: https://github.com/micromatch/to-regex-range
 -----------
+tough-cookie
+License: BSD-3-Clause
+License File: node_modules/tough-cookie/LICENSE
+Copyright: Copyright (c) 2015, Salesforce.com, Inc.
+Source: git://github.com/salesforce/tough-cookie.git
+Link: https://github.com/salesforce/tough-cookie
+-----------
+tr46
+License: MIT
+License File: node_modules/tr46/LICENSE.md
+Copyright: Copyright (c) Sebastian Mayr
+Source: https://github.com/jsdom/tr46
+Link: https://github.com/jsdom/tr46
+-----------
+ts-jest
+License: MIT
+License File: node_modules/ts-jest/LICENSE.md
+Copyright: Copyright (c) 2016-2018
+Source: git+https://github.com/kulshekhar/ts-jest.git
+Link: https://kulshekhar.github.io/ts-jest
+-----------
+ts-node
+License: MIT
+License File: node_modules/ts-node/LICENSE
+Copyright: Copyright (c) 2014 Blake Embrey (*****@***********.***)
+Source: git://github.com/TypeStrong/ts-node.git
+Link: https://typestrong.org/ts-node
+-----------
 tsconfig-paths
 License: MIT
 License File: node_modules/tsconfig-paths/LICENSE
@@ -1569,6 +2591,13 @@ Copyright: Copyright (c) George Zahariev
 Source: git://github.com/gkz/type-check.git
 Link: https://github.com/gkz/type-check
 -----------
+type-detect
+License: MIT
+License File: node_modules/type-detect/LICENSE
+Copyright: Copyright (c) 2013 Jake Luer <****@***************.***> (http://alogicalparadox.com)
+Source: git+ssh://git@github.com/chaijs/type-detect.git
+Link: git+ssh://git@github.com/chaijs/type-detect.git
+-----------
 type-fest
 License: (MIT OR CC0-1.0)
 License File: node_modules/type-fest/license
@@ -1604,6 +2633,12 @@ Copyright: Copyright (c) 2020 Inspect JS
 Source: git+https://github.com/inspect-js/typed-array-length.git
 Link: https://github.com/inspect-js/typed-array-length#readme
 -----------
+typescript
+License: Apache-2.0
+License File: node_modules/typescript/LICENSE.txt
+Source: https://github.com/microsoft/TypeScript.git
+Link: https://www.typescriptlang.org/
+-----------
 uc.micro
 License: MIT
 License File: node_modules/uc.micro/LICENSE.txt
@@ -1617,6 +2652,27 @@ Copyright: Copyright (c) 2019 Jordan Harband
 Source: git+https://github.com/ljharb/unbox-primitive.git
 Link: https://github.com/ljharb/unbox-primitive#readme
 -----------
+undici-types
+License: MIT
+License File: node_modules/undici-types/LICENSE
+Copyright: Copyright (c) Matteo Collina and Undici contributors
+Source: git+https://github.com/nodejs/undici.git
+Link: https://undici.nodejs.org
+-----------
+universalify
+License: MIT
+License File: node_modules/universalify/LICENSE
+Copyright: Copyright (c) 2017, Ryan Zimmerman <*******@*******.***>
+Source: git+https://github.com/RyanZim/universalify.git
+Link: https://github.com/RyanZim/universalify#readme
+-----------
+update-browserslist-db
+License: MIT
+License File: node_modules/update-browserslist-db/LICENSE
+Copyright: Copyright 2022 Andrey Sitnik <******@******.**> and other contributors
+Source: browserslist/update-db
+Link: browserslist/update-db
+-----------
 uri-js
 License: BSD-2-Clause
 License File: node_modules/uri-js/LICENSE
@@ -1624,6 +2680,27 @@ Copyright: Copyright 2011 Gary Court. All rights reserved.
 Source: http://github.com/garycourt/uri-js
 Link: https://github.com/garycourt/uri-js
 -----------
+url-parse
+License: MIT
+License File: node_modules/url-parse/LICENSE
+Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
+Source: https://github.com/unshiftio/url-parse.git
+Link: https://github.com/unshiftio/url-parse.git
+-----------
+v8-compile-cache-lib
+License: MIT
+License File: node_modules/v8-compile-cache-lib/LICENSE
+Copyright: Copyright (c) 2019 Andres Suarez
+Source: https://github.com/cspotcode/v8-compile-cache-lib.git
+Link: https://github.com/cspotcode/v8-compile-cache-lib.git
+-----------
+v8-to-istanbul
+License: ISC
+License File: node_modules/v8-to-istanbul/LICENSE.txt
+Copyright: Copyright (c) 2017, Contributors
+Source: istanbuljs/v8-to-istanbul
+Link: istanbuljs/v8-to-istanbul
+-----------
 validate-npm-package-license
 License: Apache-2.0
 License File: node_modules/validate-npm-package-license/LICENSE
@@ -1637,6 +2714,46 @@ Copyright: Copyright (C) 2016 by Marijn Haverbeke <******@*********.******> and
 Source: git+https://github.com/marijnh/w3c-keyname.git
 Link: https://github.com/marijnh/w3c-keyname#readme
 -----------
+w3c-xmlserializer
+License: MIT
+License File: node_modules/w3c-xmlserializer/LICENSE.md
+Source: jsdom/w3c-xmlserializer
+Link: jsdom/w3c-xmlserializer
+-----------
+walker
+License: Apache-2.0
+License File: node_modules/walker/LICENSE
+Copyright: Copyright 2013 Naitik Shah
+Source: https://github.com/daaku/nodejs-walker
+Link: https://github.com/daaku/nodejs-walker
+-----------
+webidl-conversions
+License: BSD-2-Clause
+License File: node_modules/webidl-conversions/LICENSE.md
+Copyright: Copyright (c) 2014, Domenic Denicola
+All rights reserved.
+Source: jsdom/webidl-conversions
+Link: jsdom/webidl-conversions
+-----------
+whatwg-encoding
+License: MIT
+License File: node_modules/whatwg-encoding/LICENSE.txt
+Source: jsdom/whatwg-encoding
+Link: jsdom/whatwg-encoding
+-----------
+whatwg-mimetype
+License: MIT
+License File: node_modules/whatwg-mimetype/LICENSE.txt
+Source: jsdom/whatwg-mimetype
+Link: jsdom/whatwg-mimetype
+-----------
+whatwg-url
+License: MIT
+License File: node_modules/whatwg-url/LICENSE.txt
+Copyright: Copyright (c) Sebastian Mayr
+Source: jsdom/whatwg-url
+Link: jsdom/whatwg-url
+-----------
 which-boxed-primitive
 License: MIT
 License File: node_modules/which-boxed-primitive/LICENSE
@@ -1686,13 +2803,34 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: https://github.com/npm/wrappy
 Link: https://github.com/npm/wrappy
 -----------
+write-file-atomic
+License: ISC
+License File: node_modules/write-file-atomic/LICENSE.md
+Copyright: Copyright (c) 2015, Rebecca Turner
+Source: https://github.com/npm/write-file-atomic.git
+Link: https://github.com/npm/write-file-atomic
+-----------
 ws
 License: MIT
 License File: node_modules/ws/LICENSE
 Copyright: Copyright (c) 2011 Einar Otto Stangvik <*******@*****.***>
-Source: websockets/ws
+Copyright (c) 2013 Arnout Kazemier and contributors
+Copyright (c) 2016 Luigi Pinca and contributors
+Source: git+https://github.com/websockets/ws.git
 Link: https://github.com/websockets/ws
 -----------
+xml-name-validator
+License: Apache-2.0
+License File: node_modules/xml-name-validator/LICENSE.txt
+Source: jsdom/xml-name-validator
+Link: jsdom/xml-name-validator
+-----------
+xmlchars
+License: MIT
+License File: node_modules/xmlchars/LICENSE
+Source: https://github.com/lddubeau/xmlchars.git
+Link: https://github.com/lddubeau/xmlchars.git
+-----------
 y18n
 License: ISC
 License File: node_modules/y18n/LICENSE
@@ -1700,12 +2838,19 @@ Copyright: Copyright (c) 2015, Contributors
 Source: git@github.com:yargs/y18n.git
 Link: https://github.com/yargs/y18n
 -----------
+yallist
+License: ISC
+License File: node_modules/yallist/LICENSE
+Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
+Source: git+https://github.com/isaacs/yallist.git
+Link: git+https://github.com/isaacs/yallist.git
+-----------
 yargs-parser
 License: ISC
 License File: node_modules/yargs-parser/LICENSE.txt
 Copyright: Copyright (c) 2016, Contributors
-Source: git@github.com:yargs/yargs-parser.git
-Link: git@github.com:yargs/yargs-parser.git
+Source: https://github.com/yargs/yargs-parser.git
+Link: https://github.com/yargs/yargs-parser.git
 -----------
 yargs
 License: MIT
@@ -1715,6 +2860,13 @@ Modified work Copyright 2014 Contributors (***@*****.***)
 Source: https://github.com/yargs/yargs.git
 Link: https://yargs.js.org/
 -----------
+yn
+License: MIT
+License File: node_modules/yn/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/yn
+Link: sindresorhus/yn
+-----------
 yocto-queue
 License: MIT
 License File: node_modules/yocto-queue/license
@@ -1722,6 +2874,263 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/yocto-queue
 Link: sindresorhus/yocto-queue
 -----------
+@ampproject/remapping
+License: Apache-2.0
+License File: node_modules/@ampproject/remapping/LICENSE
+Source: git+https://github.com/ampproject/remapping.git
+Link: git+https://github.com/ampproject/remapping.git
+-----------
+@babel/code-frame
+License: MIT
+License File: node_modules/@babel/code-frame/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-code-frame
+-----------
+@babel/compat-data
+License: MIT
+License File: node_modules/@babel/compat-data/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/core
+License: MIT
+License File: node_modules/@babel/core/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-core
+-----------
+@babel/generator
+License: MIT
+License File: node_modules/@babel/generator/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-generator
+-----------
+@babel/helper-compilation-targets
+License: MIT
+License File: node_modules/@babel/helper-compilation-targets/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/helper-module-imports
+License: MIT
+License File: node_modules/@babel/helper-module-imports/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helper-module-imports
+-----------
+@babel/helper-module-transforms
+License: MIT
+License File: node_modules/@babel/helper-module-transforms/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helper-module-transforms
+-----------
+@babel/helper-plugin-utils
+License: MIT
+License File: node_modules/@babel/helper-plugin-utils/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helper-plugin-utils
+-----------
+@babel/helper-simple-access
+License: MIT
+License File: node_modules/@babel/helper-simple-access/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helper-simple-access
+-----------
+@babel/helper-string-parser
+License: MIT
+License File: node_modules/@babel/helper-string-parser/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helper-string-parser
+-----------
+@babel/helper-validator-identifier
+License: MIT
+License File: node_modules/@babel/helper-validator-identifier/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/helper-validator-option
+License: MIT
+License File: node_modules/@babel/helper-validator-option/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/helpers
+License: MIT
+License File: node_modules/@babel/helpers/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-helpers
+-----------
+@babel/highlight
+License: MIT
+License File: node_modules/@babel/highlight/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-highlight
+-----------
+@babel/parser
+License: MIT
+License File: node_modules/@babel/parser/LICENSE
+Copyright: Copyright (C) 2012-2014 by various contributors (see AUTHORS)
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-parser
+-----------
+@babel/plugin-syntax-async-generators
+License: MIT
+License File: node_modules/@babel/plugin-syntax-async-generators/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators
+-----------
+@babel/plugin-syntax-bigint
+License: MIT
+License File: node_modules/@babel/plugin-syntax-bigint/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-bigint
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-bigint
+-----------
+@babel/plugin-syntax-class-properties
+License: MIT
+License File: node_modules/@babel/plugin-syntax-class-properties/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-class-properties
+-----------
+@babel/plugin-syntax-class-static-block
+License: MIT
+License File: node_modules/@babel/plugin-syntax-class-static-block/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-class-static-block
+-----------
+@babel/plugin-syntax-import-attributes
+License: MIT
+License File: node_modules/@babel/plugin-syntax-import-attributes/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/plugin-syntax-import-meta
+License: MIT
+License File: node_modules/@babel/plugin-syntax-import-meta/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/plugin-syntax-json-strings
+License: MIT
+License File: node_modules/@babel/plugin-syntax-json-strings/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings
+-----------
+@babel/plugin-syntax-jsx
+License: MIT
+License File: node_modules/@babel/plugin-syntax-jsx/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-jsx
+-----------
+@babel/plugin-syntax-logical-assignment-operators
+License: MIT
+License File: node_modules/@babel/plugin-syntax-logical-assignment-operators/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/plugin-syntax-nullish-coalescing-operator
+License: MIT
+License File: node_modules/@babel/plugin-syntax-nullish-coalescing-operator/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator
+-----------
+@babel/plugin-syntax-numeric-separator
+License: MIT
+License File: node_modules/@babel/plugin-syntax-numeric-separator/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
+@babel/plugin-syntax-object-rest-spread
+License: MIT
+License File: node_modules/@babel/plugin-syntax-object-rest-spread/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread
+-----------
+@babel/plugin-syntax-optional-catch-binding
+License: MIT
+License File: node_modules/@babel/plugin-syntax-optional-catch-binding/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding
+-----------
+@babel/plugin-syntax-optional-chaining
+License: MIT
+License File: node_modules/@babel/plugin-syntax-optional-chaining/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining
+Link: https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining
+-----------
+@babel/plugin-syntax-private-property-in-object
+License: MIT
+License File: node_modules/@babel/plugin-syntax-private-property-in-object/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-private-property-in-object
+-----------
+@babel/plugin-syntax-top-level-await
+License: MIT
+License File: node_modules/@babel/plugin-syntax-top-level-await/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-top-level-await
+-----------
+@babel/plugin-syntax-typescript
+License: MIT
+License File: node_modules/@babel/plugin-syntax-typescript/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-plugin-syntax-typescript
+-----------
+@babel/template
+License: MIT
+License File: node_modules/@babel/template/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-template
+-----------
+@babel/traverse
+License: MIT
+License File: node_modules/@babel/traverse/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-traverse
+-----------
+@babel/types
+License: MIT
+License File: node_modules/@babel/types/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://babel.dev/docs/en/next/babel-types
+-----------
+@bcoe/v8-coverage
+License: MIT
+License File: node_modules/@bcoe/v8-coverage/LICENSE.md
+Source: git://github.com/demurgos/v8-coverage.git
+Link: https://demurgos.github.io/v8-coverage
+-----------
 @codemirror/autocomplete
 License: MIT
 License File: node_modules/@codemirror/autocomplete/LICENSE
@@ -1834,6 +3243,13 @@ Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******>
 Source: https://github.com/codemirror/view.git
 Link: https://github.com/codemirror/view.git
 -----------
+@cspotcode/source-map-support
+License: MIT
+License File: node_modules/@cspotcode/source-map-support/LICENSE.md
+Copyright: Copyright (c) 2014 Evan Wallace
+Source: https://github.com/cspotcode/node-source-map-support
+Link: https://github.com/cspotcode/node-source-map-support
+-----------
 @esbuild/linux-x64
 License: MIT
 Source: git+https://github.com/evanw/esbuild.git
@@ -1885,6 +3301,153 @@ All rights reserved.
 Source: git+https://github.com/humanwhocodes/object-schema.git
 Link: https://github.com/humanwhocodes/object-schema#readme
 -----------
+@istanbuljs/load-nyc-config
+License: ISC
+License File: node_modules/@istanbuljs/load-nyc-config/LICENSE
+Copyright: Copyright (c) 2019, Contributors
+Source: git+https://github.com/istanbuljs/load-nyc-config.git
+Link: https://github.com/istanbuljs/load-nyc-config#readme
+-----------
+@istanbuljs/schema
+License: MIT
+License File: node_modules/@istanbuljs/schema/LICENSE
+Copyright: Copyright (c) 2019 CFWare, LLC
+Source: git+https://github.com/istanbuljs/schema.git
+Link: https://github.com/istanbuljs/schema#readme
+-----------
+@jest/console
+License: MIT
+License File: node_modules/@jest/console/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/core
+License: MIT
+License File: node_modules/@jest/core/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://jestjs.io/
+-----------
+@jest/environment
+License: MIT
+License File: node_modules/@jest/environment/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/expect-utils
+License: MIT
+License File: node_modules/@jest/expect-utils/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/expect
+License: MIT
+License File: node_modules/@jest/expect/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/fake-timers
+License: MIT
+License File: node_modules/@jest/fake-timers/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/globals
+License: MIT
+License File: node_modules/@jest/globals/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/reporters
+License: MIT
+License File: node_modules/@jest/reporters/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://jestjs.io/
+-----------
+@jest/schemas
+License: MIT
+License File: node_modules/@jest/schemas/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/source-map
+License: MIT
+License File: node_modules/@jest/source-map/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/test-result
+License: MIT
+License File: node_modules/@jest/test-result/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/test-sequencer
+License: MIT
+License File: node_modules/@jest/test-sequencer/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/transform
+License: MIT
+License File: node_modules/@jest/transform/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/types
+License: MIT
+License File: node_modules/@jest/types/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jridgewell/gen-mapping
+License: MIT
+License File: node_modules/@jridgewell/gen-mapping/LICENSE
+Copyright: Copyright 2022 Justin Ridgewell <**********@******.***>
+Source: https://github.com/jridgewell/gen-mapping
+Link: https://github.com/jridgewell/gen-mapping
+-----------
+@jridgewell/resolve-uri
+License: MIT
+License File: node_modules/@jridgewell/resolve-uri/LICENSE
+Copyright: Copyright 2019 Justin Ridgewell <**********@******.***>
+Source: https://github.com/jridgewell/resolve-uri
+Link: https://github.com/jridgewell/resolve-uri
+-----------
+@jridgewell/set-array
+License: MIT
+License File: node_modules/@jridgewell/set-array/LICENSE
+Copyright: Copyright 2022 Justin Ridgewell <**********@******.***>
+Source: https://github.com/jridgewell/set-array
+Link: https://github.com/jridgewell/set-array
+-----------
+@jridgewell/sourcemap-codec
+License: MIT
+License File: node_modules/@jridgewell/sourcemap-codec/LICENSE
+Copyright: Copyright (c) 2015 Rich Harris
+Source: git+https://github.com/jridgewell/sourcemap-codec.git
+Link: git+https://github.com/jridgewell/sourcemap-codec.git
+-----------
+@jridgewell/trace-mapping
+License: MIT
+License File: node_modules/@jridgewell/trace-mapping/LICENSE
+Copyright: Copyright 2022 Justin Ridgewell <******@*********.****>
+Source: git+https://github.com/jridgewell/trace-mapping.git
+Link: git+https://github.com/jridgewell/trace-mapping.git
+-----------
 @lezer/common
 License: MIT
 License File: node_modules/@lezer/common/LICENSE
@@ -1983,6 +3546,34 @@ Copyright: Copyright (c) Denis Malinochkin
 Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
 Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
 -----------
+@rtsao/scc
+License: MIT
+License File: node_modules/@rtsao/scc/LICENSE
+Copyright: Copyright (c) 2019 Ryan Tsao
+Source: rtsao/scc
+Link: rtsao/scc
+-----------
+@sinclair/typebox
+License: MIT
+License File: node_modules/@sinclair/typebox/license
+Source: https://github.com/sinclairzx81/typebox
+Link: https://github.com/sinclairzx81/typebox
+-----------
+@sinonjs/commons
+License: BSD-3-Clause
+License File: node_modules/@sinonjs/commons/LICENSE
+Copyright: Copyright (c) 2018, Sinon.JS
+All rights reserved.
+Source: git+https://github.com/sinonjs/commons.git
+Link: https://github.com/sinonjs/commons#readme
+-----------
+@sinonjs/fake-timers
+License: BSD-3-Clause
+License File: node_modules/@sinonjs/fake-timers/LICENSE
+Copyright: Copyright (c) 2010-2014, Christian Johansen, *********@*********.**. All rights reserved.
+Source: https://github.com/sinonjs/fake-timers.git
+Link: https://github.com/sinonjs/fake-timers
+-----------
 @ssddanbrown/codemirror-lang-smarty
 License: MIT
 License File: node_modules/@ssddanbrown/codemirror-lang-smarty/LICENSE
@@ -1993,11 +3584,151 @@ License: MIT
 License File: node_modules/@ssddanbrown/codemirror-lang-twig/LICENSE
 Copyright: Copyright (C) 2023 by Dan Brown, Marijn Haverbeke and others
 -----------
+@tootallnate/once
+License: MIT
+License File: node_modules/@tootallnate/once/LICENSE
+Copyright: Copyright (c) 2020 Nathan Rajlich
+Source: git://github.com/TooTallNate/once.git
+Link: git://github.com/TooTallNate/once.git
+-----------
+@tsconfig/node10
+License: MIT
+License File: node_modules/@tsconfig/node10/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/tsconfig/bases.git
+Link: https://github.com/tsconfig/bases.git
+-----------
+@tsconfig/node12
+License: MIT
+License File: node_modules/@tsconfig/node12/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/tsconfig/bases.git
+Link: https://github.com/tsconfig/bases.git
+-----------
+@tsconfig/node14
+License: MIT
+License File: node_modules/@tsconfig/node14/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/tsconfig/bases.git
+Link: https://github.com/tsconfig/bases.git
+-----------
+@tsconfig/node16
+License: MIT
+License File: node_modules/@tsconfig/node16/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/tsconfig/bases.git
+Link: https://github.com/tsconfig/bases.git
+-----------
+@types/babel__core
+License: MIT
+License File: node_modules/@types/babel__core/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__core
+-----------
+@types/babel__generator
+License: MIT
+License File: node_modules/@types/babel__generator/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__generator
+-----------
+@types/babel__template
+License: MIT
+License File: node_modules/@types/babel__template/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__template
+-----------
+@types/babel__traverse
+License: MIT
+License File: node_modules/@types/babel__traverse/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__traverse
+-----------
+@types/graceful-fs
+License: MIT
+License File: node_modules/@types/graceful-fs/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/graceful-fs
+-----------
+@types/istanbul-lib-coverage
+License: MIT
+License File: node_modules/@types/istanbul-lib-coverage/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/istanbul-lib-coverage
+-----------
+@types/istanbul-lib-report
+License: MIT
+License File: node_modules/@types/istanbul-lib-report/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/istanbul-lib-report
+-----------
+@types/istanbul-reports
+License: MIT
+License File: node_modules/@types/istanbul-reports/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/istanbul-reports
+-----------
+@types/jest
+License: MIT
+License File: node_modules/@types/jest/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/jest
+-----------
+@types/jsdom
+License: MIT
+License File: node_modules/@types/jsdom/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/jsdom
+-----------
 @types/json5
 License: MIT
 Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 -----------
+@types/node
+License: MIT
+License File: node_modules/@types/node/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node
+-----------
+@types/stack-utils
+License: MIT
+License File: node_modules/@types/stack-utils/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/stack-utils
+-----------
+@types/tough-cookie
+License: MIT
+License File: node_modules/@types/tough-cookie/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/tough-cookie
+-----------
+@types/yargs-parser
+License: MIT
+License File: node_modules/@types/yargs-parser/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs-parser
+-----------
+@types/yargs
+License: MIT
+License File: node_modules/@types/yargs/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs
+-----------
 @ungap/structured-clone
 License: ISC
 License File: node_modules/@ungap/structured-clone/LICENSE
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index a2d172e12c5..0a0321e2cac 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -128,7 +128,7 @@ Link: https://github.com/fruitcake/php-cors
 graham-campbell/result-type
 License: MIT
 License File: vendor/graham-campbell/result-type/LICENSE
-Copyright: Copyright (c) 2020-2023 Graham Campbell <*****@**********.**.**>
+Copyright: Copyright (c) 2020-2024 Graham Campbell <*****@**********.**.**>
 Source: https://github.com/GrahamCampbell/Result-Type.git
 Link: https://github.com/GrahamCampbell/Result-Type.git
 -----------
@@ -676,13 +676,6 @@ Copyright: Copyright (c) 2015-present Fabien Potencier
 Source: https://github.com/symfony/polyfill-mbstring.git
 Link: https://symfony.com
 -----------
-symfony/polyfill-php72
-License: MIT
-License File: vendor/symfony/polyfill-php72/LICENSE
-Copyright: Copyright (c) 2015-present Fabien Potencier
-Source: https://github.com/symfony/polyfill-php72.git
-Link: https://symfony.com
------------
 symfony/polyfill-php80
 License: MIT
 License File: vendor/symfony/polyfill-php80/LICENSE
diff --git a/package-lock.json b/package-lock.json
index cdc1f3ee0d5..68ec85fff8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,6 @@
       },
       "devDependencies": {
         "@lezer/generator": "^1.5.1",
-        "babel-jest": "^29.7.0",
         "chokidar-cli": "^3.0",
         "esbuild": "^0.23.0",
         "eslint": "^8.55.0",
@@ -44,7 +43,7 @@
         "sass": "^1.69.5",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
-        "typescript": "^5.4.5"
+        "typescript": "5.6.*"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -111,18 +110,6 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@babel/generator": {
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
@@ -623,9 +610,9 @@
       "dev": true
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
-      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
+      "version": "6.18.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz",
+      "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -640,9 +627,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
-      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
+      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -741,9 +728,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
-      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
+      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -762,9 +749,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
-      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
+      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -798,9 +785,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.33.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
-      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
+      "version": "6.34.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.1.tgz",
+      "integrity": "sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -829,6 +816,262 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
+      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
+      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
+      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
+      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
+      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
+      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
+      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
+      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
+      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
+      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
+      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
+      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
+      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
+      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
+      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.23.1",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
@@ -845,6 +1088,118 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
+      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
+      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
+      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
+      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
+      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
+      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -861,9 +1216,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
+      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -893,22 +1248,22 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -1373,9 +1728,9 @@
       "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
-      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.9.tgz",
+      "integrity": "sha512-TYwgljcDv+YrV0MZFFvYFQHCfGgbPMR6nuqLabBdmZoFH3EP1gvw8t0vae326Ne3PszQkbXfVBjCnf3ZVCr0bA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -1414,9 +1769,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
-      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
+      "version": "1.4.18",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.18.tgz",
+      "integrity": "sha512-Y8BeHOt4LtcxJgXwadtfSeWPrh0XzklcCHnCVT+vOsxqH4gWmunP2ykX+VVOlM/dusyVyiNfG3lv0f10UK+mgA==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -1680,9 +2035,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.5.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
-      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==",
+      "version": "22.7.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz",
+      "integrity": "sha512-qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA==",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -2160,9 +2515,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
       "dev": true,
       "funding": [
         {
@@ -2179,8 +2534,8 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
+        "caniuse-lite": "^1.0.30001663",
+        "electron-to-chromium": "^1.5.28",
         "node-releases": "^2.0.18",
         "update-browserslist-db": "^1.1.0"
       },
@@ -2256,9 +2611,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001660",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
-      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
+      "version": "1.0.30001664",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
       "dev": true,
       "funding": [
         {
@@ -2775,9 +3130,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.25",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz",
-      "integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==",
+      "version": "1.5.29",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
+      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
       "dev": true
     },
     "node_modules/emittery": {
@@ -3033,16 +3388,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -3127,9 +3482,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
-      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -3518,6 +3873,20 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -4570,15 +4939,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/jest-cli/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/jest-config": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
@@ -4624,24 +4984,6 @@
         }
       }
     },
-    "node_modules/jest-config/node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/jest-diff": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
@@ -4945,15 +5287,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-snapshot": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
@@ -5153,27 +5486,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -5217,15 +5529,15 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
       "bin": {
         "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/keyv": {
@@ -5306,6 +5618,27 @@
       "integrity": "sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==",
       "dev": true
     },
+    "node_modules/livereload/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -5321,6 +5654,28 @@
         "node": ">=4"
       }
     },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -5957,16 +6312,21 @@
       }
     },
     "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parse5": {
@@ -6473,12 +6833,12 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.78.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
-      "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
+      "version": "1.79.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
+      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
       "dev": true,
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
+        "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
@@ -6489,6 +6849,34 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dev": true,
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
+      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/saxes": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
@@ -6639,9 +7027,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6842,12 +7230,12 @@
       }
     },
     "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/strip-final-newline": {
@@ -7026,18 +7414,6 @@
         }
       }
     },
-    "node_modules/ts-jest/node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ts-jest/node_modules/semver": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -7050,15 +7426,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/ts-jest/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -7114,6 +7481,27 @@
         "strip-bom": "^3.0.0"
       }
     },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -7221,9 +7609,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -7268,9 +7656,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -7287,8 +7675,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -7562,16 +7950,16 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -7628,13 +8016,12 @@
       }
     },
     "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/yargs/node_modules/find-up": {
@@ -7698,6 +8085,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/yargs/node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
diff --git a/package.json b/package.json
index 46a41218351..42531194ec3 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
   },
   "devDependencies": {
     "@lezer/generator": "^1.5.1",
-    "babel-jest": "^29.7.0",
     "chokidar-cli": "^3.0",
     "esbuild": "^0.23.0",
     "eslint": "^8.55.0",
@@ -33,7 +32,7 @@
     "sass": "^1.69.5",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "5.6.*"
   },
   "dependencies": {
     "@codemirror/commands": "^6.3.2",
diff --git a/resources/js/wysiwyg/lexical/selection/lexical-node.ts b/resources/js/wysiwyg/lexical/selection/lexical-node.ts
index 82f7d330ed1..1f7e4c6dad6 100644
--- a/resources/js/wysiwyg/lexical/selection/lexical-node.ts
+++ b/resources/js/wysiwyg/lexical/selection/lexical-node.ts
@@ -262,7 +262,7 @@ function $patchStyle(
       }
       return styles;
     },
-    {...prevStyles} || {},
+    {...prevStyles},
   );
   const newCSSText = getCSSFromStyleObject(newStyles);
   target.setStyle(newCSSText);
diff --git a/version b/version
index 522220af0c3..baf91f15e00 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v24.03-dev
+v24.10-dev

From eec639d84ea4396d91a0291c72f78e4c877a956b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 13:57:39 +0100
Subject: [PATCH 286/666] Maintenance: Fixed js lint and SCSS build warnings

---
 resources/js/markdown/actions.js |  2 +-
 resources/sass/_content.scss     | 16 ++++++++--------
 resources/sass/_text.scss        |  7 +------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/resources/js/markdown/actions.js b/resources/js/markdown/actions.js
index 73040a57b1e..86e25532802 100644
--- a/resources/js/markdown/actions.js
+++ b/resources/js/markdown/actions.js
@@ -1,4 +1,4 @@
-import * as DrawIO from '../services/drawio';
+import * as DrawIO from '../services/drawio.ts';
 
 export class Actions {
 
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index 0a1a49151a9..7d130bb0c24 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -163,29 +163,29 @@ body .page-content img,
   }
   &.success {
     @include lightDark(border-color, $positive, $positive-dark);
-    @include lightDark(background-color, lighten($positive, 68%), darken($positive-dark, 36%));
-    @include lightDark(color, darken($positive, 16%), $positive-dark);
+    @include lightDark(background-color, #eafdeb, #122913);
+    @include lightDark(color, #063409, $positive-dark);
   }
   &.success:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMzNzZjMzkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEyIDJDNi40OCAyIDIgNi40OCAyIDEyczQuNDggMTAgMTAgMTAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDJ6bS0yIDE1bC01LTUgMS40MS0xLjQxTDEwIDE0LjE3bDcuNTktNy41OUwxOSA4bC05IDl6Ii8+PC9zdmc+");
   }
   &.danger {
     @include lightDark(border-color, $negative, $negative-dark);
-    @include lightDark(background-color, lighten($negative, 56%), darken($negative-dark, 55%));
-    @include lightDark(color, darken($negative, 20%), $negative-dark);
+    @include lightDark(background-color, #fcdbdb, #250505);
+    @include lightDark(color, #4d0706, $negative-dark);
   }
   &.danger:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiOTE4MTgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0xNS43MyAzSDguMjdMMyA4LjI3djcuNDZMOC4yNyAyMWg3LjQ2TDIxIDE1LjczVjguMjdMMTUuNzMgM3pNMTIgMTcuM2MtLjcyIDAtMS4zLS41OC0xLjMtMS4zIDAtLjcyLjU4LTEuMyAxLjMtMS4zLjcyIDAgMS4zLjU4IDEuMyAxLjMgMCAuNzItLjU4IDEuMy0xLjMgMS4zem0xLTQuM2gtMlY3aDJ2NnoiLz4gICAgPHBhdGggZD0iTTAgMGgyNHYyNEgweiIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
   }
   &.info {
     @include lightDark(border-color, $info, $info-dark);
-    @include lightDark(color, darken($info, 20%), $info-dark);
-    @include lightDark(background-color, lighten($info, 50%), darken($info-dark, 34%));
+    @include lightDark(background-color, #d3efff, #001825);
+    @include lightDark(color, #01466c, $info-dark);
   }
   &.warning {
     @include lightDark(border-color, $warning, $warning-dark);
-    @include lightDark(background-color, lighten($warning, 50%), darken($warning-dark, 50%));
-    @include lightDark(color, darken($warning, 20%), $warning-dark);
+    @include lightDark(background-color, #fee3d3, #30170a);
+    @include lightDark(color, #6a2802, $warning-dark);
   }
   &.warning:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiNjUzMWMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEgMjFoMjJMMTIgMiAxIDIxem0xMi0zaC0ydi0yaDJ2MnptMC00aC0ydi00aDJ2NHoiLz48L3N2Zz4=");
diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 9acfe2ceed3..56e66195c38 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -44,11 +44,6 @@ h1, h2, h3, h4, h5, h6 {
   display: block;
   font-family: var(--font-heading, var(--font-body));
   @include lightDark(color, #222, #BBB);
-  .subheader {
-    font-size: 0.5em;
-    line-height: 1em;
-    color: lighten($text-dark, 32%);
-  }
 }
 
 h5 {
@@ -223,7 +218,7 @@ blockquote {
     position: absolute;
     top: $-s;
     left: $-s;
-    color: lighten($text-dark, 20%);
+    color: #777;
   }
 }
 

From abda9bc00a6d64a352ff8896887d95b1768c6961 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 14:21:12 +0100
Subject: [PATCH 287/666] PHP Dependancies: Updated packages pending major
 version changes

Closes #5222
---
 composer.json |   4 +-
 composer.lock | 227 +++++++++++++++++++++++++-------------------------
 2 files changed, 117 insertions(+), 114 deletions(-)

diff --git a/composer.json b/composer.json
index b90ab224eaa..5c54774f1e2 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,9 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
-        "bacon/bacon-qr-code": "^2.0",
+        "bacon/bacon-qr-code": "^3.0",
         "doctrine/dbal": "^3.5",
-        "dompdf/dompdf": "^2.0",
+        "dompdf/dompdf": "^3.0",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
diff --git a/composer.lock b/composer.lock
index 1abbf7e9483..d86ec0b33d6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "97259e40ffe5518cfcdf1e32eacbb175",
+    "content-hash": "b24a1daf815b6910b51a2acc5e2d38e7",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -160,28 +160,28 @@
         },
         {
             "name": "bacon/bacon-qr-code",
-            "version": "2.0.8",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22"
+                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/510de6eca6248d77d31b339d62437cc995e2fb41",
+                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41",
                 "shasum": ""
             },
             "require": {
                 "dasprid/enum": "^1.0.3",
                 "ext-iconv": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "phly/keep-a-changelog": "^2.1",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "spatie/phpunit-snapshot-assertions": "^4.2.9",
-                "squizlabs/php_codesniffer": "^3.4"
+                "phly/keep-a-changelog": "^2.12",
+                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
                 "ext-imagick": "to generate QR code images"
@@ -208,9 +208,9 @@
             "homepage": "https://github.com/Bacon/BaconQrCode",
             "support": {
                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.0"
             },
-            "time": "2022-12-07T17:46:57+00:00"
+            "time": "2024-04-18T11:16:25+00:00"
         },
         {
             "name": "brick/math",
@@ -980,32 +980,34 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v2.0.8",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "c20247574601700e1f7c8dab39310fca1964dc52"
+                "reference": "fbc7c5ee5d94f7a910b78b43feb7931b7f971b59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c20247574601700e1f7c8dab39310fca1964dc52",
-                "reference": "c20247574601700e1f7c8dab39310fca1964dc52",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/fbc7c5ee5d94f7a910b78b43feb7931b7f971b59",
+                "reference": "fbc7c5ee5d94f7a910b78b43feb7931b7f971b59",
                 "shasum": ""
             },
             "require": {
+                "dompdf/php-font-lib": "^1.0.0",
+                "dompdf/php-svg-lib": "^1.0.0",
                 "ext-dom": "*",
                 "ext-mbstring": "*",
                 "masterminds/html5": "^2.0",
-                "phenx/php-font-lib": ">=0.5.4 <1.0.0",
-                "phenx/php-svg-lib": ">=0.5.2 <1.0.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
+                "ext-gd": "*",
                 "ext-json": "*",
                 "ext-zip": "*",
                 "mockery/mockery": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8 || ^9",
-                "squizlabs/php_codesniffer": "^3.5"
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/process": "^4.4 || ^5.4 || ^6.2 || ^7.0"
             },
             "suggest": {
                 "ext-gd": "Needed to process images",
@@ -1036,9 +1038,100 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v2.0.8"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.0.0"
+            },
+            "time": "2024-04-29T14:01:28+00:00"
+        },
+        {
+            "name": "dompdf/php-font-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-font-lib.git",
+                "reference": "991d6a954f6bbd7e41022198f00586b230731441"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/991d6a954f6bbd7e41022198f00586b230731441",
+                "reference": "991d6a954f6bbd7e41022198f00586b230731441",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "FontLib\\": "src/FontLib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The FontLib Community",
+                    "homepage": "https://github.com/dompdf/php-font-lib/blob/master/AUTHORS.md"
+                }
+            ],
+            "description": "A library to read, parse, export and make subsets of different types of font files.",
+            "homepage": "https://github.com/dompdf/php-font-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-font-lib/issues",
+                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.0"
+            },
+            "time": "2024-04-29T13:40:38+00:00"
+        },
+        {
+            "name": "dompdf/php-svg-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-svg-lib.git",
+                "reference": "eb045e518185298eb6ff8d80d0d0c6b17aecd9af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/eb045e518185298eb6ff8d80d0d0c6b17aecd9af",
+                "reference": "eb045e518185298eb6ff8d80d0d0c6b17aecd9af",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.1 || ^8.0",
+                "sabberworm/php-css-parser": "^8.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Svg\\": "src/Svg"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The SvgLib Community",
+                    "homepage": "https://github.com/dompdf/php-svg-lib/blob/master/AUTHORS.md"
+                }
+            ],
+            "description": "A library to read, parse and export to PDF SVG files.",
+            "homepage": "https://github.com/dompdf/php-svg-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-svg-lib/issues",
+                "source": "https://github.com/dompdf/php-svg-lib/tree/1.0.0"
             },
-            "time": "2024-04-29T13:06:17+00:00"
+            "time": "2024-04-29T13:26:35+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -3930,96 +4023,6 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
-        {
-            "name": "phenx/php-font-lib",
-            "version": "0.5.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "a1681e9793040740a405ac5b189275059e2a9863"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
-                "reference": "a1681e9793040740a405ac5b189275059e2a9863",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "FontLib\\": "src/FontLib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Ménager",
-                    "email": "fabien.menager@gmail.com"
-                }
-            ],
-            "description": "A library to read, parse, export and make subsets of different types of font files.",
-            "homepage": "https://github.com/PhenX/php-font-lib",
-            "support": {
-                "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6"
-            },
-            "time": "2024-01-29T14:45:26+00:00"
-        },
-        {
-            "name": "phenx/php-svg-lib",
-            "version": "0.5.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/46b25da81613a9cf43c83b2a8c2c1bdab27df691",
-                "reference": "46b25da81613a9cf43c83b2a8c2c1bdab27df691",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": "^7.1 || ^8.0",
-                "sabberworm/php-css-parser": "^8.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Svg\\": "src/Svg"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Ménager",
-                    "email": "fabien.menager@gmail.com"
-                }
-            ],
-            "description": "A library to read, parse and export to PDF SVG files.",
-            "homepage": "https://github.com/PhenX/php-svg-lib",
-            "support": {
-                "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.4"
-            },
-            "time": "2024-04-08T12:52:34+00:00"
-        },
         {
             "name": "phpoption/phpoption",
             "version": "1.9.3",

From 42264f402d2733fdf7e1260c6731455d85da12b1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 16:01:01 +0100
Subject: [PATCH 288/666] CSS: Fixed floating search icon on mobile

Also updated styles to use logical elements instead of conditional rules
for altered search boxes.
Related to #2504
---
 resources/sass/_forms.scss           | 8 ++------
 resources/views/search/all.blade.php | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index a6f890e3cc4..67df4171499 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -441,12 +441,8 @@ input[type=color] {
     padding: 0;
     cursor: pointer;
     position: absolute;
-    left: 8px;
-    top: 9px;
-    @include rtl {
-      right: 8px;
-      left: auto;
-    }
+    inset-inline-start: 8px;
+    top: 10px;
   }
   input {
     display: block;
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 64325d4c1bf..2d410dbd1b0 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -79,7 +79,9 @@
 
                     <form action="{{ url('/search') }}" method="GET"  class="search-box flexible hide-over-l">
                         <input value="{{$searchTerm}}" type="text" name="term" placeholder="{{ trans('common.search') }}">
-                        <button type="submit">@icon('search')</button>
+                        <button type="submit"
+                                aria-label="{{ trans('common.search') }}"
+                                tabindex="-1">@icon('search')</button>
                     </form>
 
                     <h6 class="text-muted">{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}</h6>

From 6103a22febd839fa76a3f9a54058b66a14906b35 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Sep 2024 16:33:58 +0100
Subject: [PATCH 289/666] Exports: Made pdf command timeout configurable

Added test to cover.
For #5119
---
 .env.example.complete               |  5 +++++
 app/Config/exports.php              |  4 ++++
 app/Entities/Tools/PdfGenerator.php | 11 +++++++++--
 tests/Entity/ExportTest.php         | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/.env.example.complete b/.env.example.complete
index 1a4f421f024..6b4936648f0 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -334,6 +334,11 @@ EXPORT_PAGE_SIZE=a4
 # Example: EXPORT_PDF_COMMAND="/scripts/convert.sh {input_html_path} {output_pdf_path}"
 EXPORT_PDF_COMMAND=false
 
+# Export PDF Command Timeout
+# The number of seconds that the export PDF command will run before a timeout occurs.
+# Only applies for the EXPORT_PDF_COMMAND option, not for DomPDF or wkhtmltopdf.
+EXPORT_PDF_COMMAND_TIMEOUT=15
+
 # Set path to wkhtmltopdf binary for PDF generation.
 # Can be 'false' or a path path like: '/home/bins/wkhtmltopdf'
 # When false, BookStack will attempt to find a wkhtmltopdf in the application
diff --git a/app/Config/exports.php b/app/Config/exports.php
index 88dc08cba35..ba535ca7e4e 100644
--- a/app/Config/exports.php
+++ b/app/Config/exports.php
@@ -29,6 +29,10 @@
     // Example: EXPORT_PDF_COMMAND="/scripts/convert.sh {input_html_path} {output_pdf_path}"
     'pdf_command' => env('EXPORT_PDF_COMMAND', false),
 
+    // The amount of time allowed for PDF generation command to run
+    // before the process times out and is stopped.
+    'pdf_command_timeout' => env('EXPORT_PDF_COMMAND_TIMEOUT', 15),
+
     // 2024-04: Snappy/WKHTMLtoPDF now considered deprecated in regard to BookStack support.
     'snappy' => [
         'pdf_binary' => env('WKHTMLTOPDF', false),
diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Entities/Tools/PdfGenerator.php
index 7c6dfaa6e8b..79cd1b02f7f 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Entities/Tools/PdfGenerator.php
@@ -5,6 +5,7 @@
 use BookStack\Exceptions\PdfExportException;
 use Knp\Snappy\Pdf as SnappyPdf;
 use Dompdf\Dompdf;
+use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
 
 class PdfGenerator
@@ -85,9 +86,15 @@ protected function renderUsingCommand(string $html): string
 
         file_put_contents($inputHtml, $html);
 
+        $timeout = intval(config('exports.pdf_command_timeout'));
         $process = Process::fromShellCommandline($command);
-        $process->setTimeout(15);
-        $process->run();
+        $process->setTimeout($timeout);
+
+        try {
+            $process->run();
+        } catch (ProcessTimedOutException $e) {
+            throw new PdfExportException("PDF Export via command failed due to timeout at {$timeout} second(s)");
+        }
 
         if (!$process->isSuccessful()) {
             throw new PdfExportException("PDF Export via command failed with exit code {$process->getExitCode()}, stdout: {$process->getOutput()}, stderr: {$process->getErrorOutput()}");
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 040f69013a5..7aafa3b7927 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -529,6 +529,22 @@ public function test_pdf_command_option_errors_if_command_returns_error_status()
         }, PdfExportException::class);
     }
 
+    public function test_pdf_command_timout_option_limits_export_time()
+    {
+        $page = $this->entities->page();
+        $command = 'php -r \'sleep(4);\'';
+        config()->set('exports.pdf_command', $command);
+        config()->set('exports.pdf_command_timeout', 1);
+
+        $this->assertThrows(function () use ($page) {
+            $start = time();
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+
+            $this->assertTrue(time() < ($start + 3));
+        }, PdfExportException::class,
+            "PDF Export via command failed due to timeout at 1 second(s)");
+    }
+
     public function test_html_exports_contain_csp_meta_tag()
     {
         $entities = [

From 89f84c9a95babfa5bf8b3d38809375e59cab80ce Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 29 Sep 2024 14:36:41 +0100
Subject: [PATCH 290/666] Pages: Updated editor field to always be set

- Migration for setting on existing pages
- Added test to cover simple new page scenario

For #5117
---
 app/Entities/Repos/PageRepo.php               |  6 ++-
 ...4_09_29_140340_ensure_editor_value_set.php | 48 +++++++++++++++++++
 tests/Entity/PageEditorTest.php               | 15 ++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2024_09_29_140340_ensure_editor_value_set.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index ce7e34ae1ec..1bc15392cec 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -11,7 +11,6 @@
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
@@ -44,6 +43,7 @@ public function getNewDraftPage(Entity $parent)
             'owned_by'   => user()->id,
             'updated_by' => user()->id,
             'draft'      => true,
+            'editor'     => PageEditorType::getSystemDefault()->value,
         ]);
 
         if ($parent instanceof Chapter) {
@@ -146,8 +146,10 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
             $pageContent->setNewHTML($input['html'], user());
         }
 
-        if ($newEditor !== $currentEditor && userCan('editor-change')) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {
             $page->editor = $newEditor->value;
+        } elseif (empty($page->editor)) {
+            $page->editor = $defaultEditor->value;
         }
     }
 
diff --git a/database/migrations/2024_09_29_140340_ensure_editor_value_set.php b/database/migrations/2024_09_29_140340_ensure_editor_value_set.php
new file mode 100644
index 00000000000..786322b3c63
--- /dev/null
+++ b/database/migrations/2024_09_29_140340_ensure_editor_value_set.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Ensure we have an "editor" value set for pages
+
+        // Get default
+        $default = DB::table('settings')
+            ->where('setting_key', '=', 'app-editor')
+            ->first()
+            ->value ?? 'wysiwyg';
+        $default = ($default === 'markdown') ? 'markdown' : 'wysiwyg';
+
+        // We set it to 'markdown' for pages currently with markdown content
+        DB::table('pages')
+            ->where('editor', '=', '')
+            ->where('markdown', '!=', '')
+            ->update(['editor' => 'markdown']);
+
+        // We set it to 'wysiwyg' where we have HTML but no markdown
+        DB::table('pages')
+            ->where('editor', '=', '')
+            ->where('markdown', '=', '')
+            ->where('html', '!=', '')
+            ->update(['editor' => 'wysiwyg']);
+
+        // Otherwise, where still empty, set to the current default
+        DB::table('pages')
+            ->where('editor', '=', '')
+            ->update(['editor' => $default]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Can't reverse due to not knowing what would have been empty before
+    }
+};
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index 9340249568c..21abd4ba1e6 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -24,6 +24,21 @@ public function test_default_editor_is_wysiwyg_for_new_pages()
         $this->withHtml($this->followRedirects($resp))->assertElementExists('#html-editor');
     }
 
+    public function test_editor_set_for_new_pages()
+    {
+        $book = $this->page->book;
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $newPage = $book->pages()->orderBy('id', 'desc')->first();
+        $this->assertEquals('wysiwyg', $newPage->editor);
+
+        $this->setSettings(['app-editor' => PageEditorType::Markdown->value]);
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $newPage = $book->pages()->orderBy('id', 'desc')->first();
+        $this->assertEquals('markdown', $newPage->editor);
+    }
+
     public function test_markdown_setting_shows_markdown_editor_for_new_pages()
     {
         $this->setSettings(['app-editor' => PageEditorType::Markdown->value]);

From d12e8ec92369959ce2f3f43c4e047ab28e735538 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 29 Sep 2024 16:41:18 +0100
Subject: [PATCH 291/666] Users: Improved user response for failed invite
 sending

Added specific handling to show relevant error message when user
creation fails due to invite sending errors, while also returning user
to the form with previous input.
Includes test to cover.

For #5195
---
 app/Access/UserInviteException.php       | 10 ++++++++
 app/Access/UserInviteService.php         |  8 ++++++-
 app/Users/Controllers/UserController.php | 15 +++++++++---
 app/Users/UserRepo.php                   |  2 ++
 lang/en/errors.php                       |  1 +
 tests/User/UserManagementTest.php        | 29 ++++++++++++++++++++----
 6 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 app/Access/UserInviteException.php

diff --git a/app/Access/UserInviteException.php b/app/Access/UserInviteException.php
new file mode 100644
index 00000000000..70e7a787241
--- /dev/null
+++ b/app/Access/UserInviteException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BookStack\Access;
+
+use Exception;
+
+class UserInviteException extends Exception
+{
+    //
+}
diff --git a/app/Access/UserInviteService.php b/app/Access/UserInviteService.php
index 7d955f3851d..0b24eb0d9eb 100644
--- a/app/Access/UserInviteService.php
+++ b/app/Access/UserInviteService.php
@@ -13,11 +13,17 @@ class UserInviteService extends UserTokenService
     /**
      * Send an invitation to a user to sign into BookStack
      * Removes existing invitation tokens.
+     * @throws UserInviteException
      */
     public function sendInvitation(User $user)
     {
         $this->deleteByUser($user);
         $token = $this->createTokenForUser($user);
-        $user->notify(new UserInviteNotification($token));
+
+        try {
+            $user->notify(new UserInviteNotification($token));
+        } catch (\Exception $exception) {
+            throw new UserInviteException($exception->getMessage(), $exception->getCode(), $exception);
+        }
     }
 }
diff --git a/app/Users/Controllers/UserController.php b/app/Users/Controllers/UserController.php
index 185d6101c61..00bbe61186e 100644
--- a/app/Users/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Users\Controllers;
 
 use BookStack\Access\SocialDriverManager;
+use BookStack\Access\UserInviteException;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Http\Controller;
@@ -14,6 +15,7 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rules\Password;
 use Illuminate\Validation\ValidationException;
 
@@ -91,9 +93,16 @@ public function store(Request $request)
 
         $validated = $this->validate($request, array_filter($validationRules));
 
-        DB::transaction(function () use ($validated, $sendInvite) {
-            $this->userRepo->create($validated, $sendInvite);
-        });
+        try {
+            DB::transaction(function () use ($validated, $sendInvite) {
+                $this->userRepo->create($validated, $sendInvite);
+                dd('post-create');
+            });
+        } catch (UserInviteException $e) {
+            Log::error("Failed to send user invite with error: {$e->getMessage()}");
+            $this->showErrorNotification(trans('errors.users_could_not_send_invite'));
+            return redirect('/settings/users/create')->withInput();
+        }
 
         return redirect('/settings/users');
     }
diff --git a/app/Users/UserRepo.php b/app/Users/UserRepo.php
index 32e23ecdec1..5c8ace8faca 100644
--- a/app/Users/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Users;
 
+use BookStack\Access\UserInviteException;
 use BookStack\Access\UserInviteService;
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\EntityProvider;
@@ -83,6 +84,7 @@ public function createWithoutActivity(array $data, bool $emailConfirmed = false)
      * As per "createWithoutActivity" but records a "create" activity.
      *
      * @param array{name: string, email: string, password: ?string, external_auth_id: ?string, language: ?string, roles: ?array} $data
+     * @throws UserInviteException
      */
     public function create(array $data, bool $sendInvite = false): User
     {
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 752eb5672f1..9c40aa9ed33 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
     'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'This role cannot be edited',
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 93d35f5d047..8fe855afa77 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\User;
 
+use BookStack\Access\UserInviteException;
 use BookStack\Access\UserInviteService;
 use BookStack\Activity\ActivityType;
 use BookStack\Uploads\Image;
@@ -229,7 +230,7 @@ public function test_user_creation_is_not_performed_if_the_invitation_sending_fa
 
         // Simulate an invitation sending failure
         $this->mock(UserInviteService::class, function (MockInterface $mock) {
-            $mock->shouldReceive('sendInvitation')->once()->andThrow(RuntimeException::class);
+            $mock->shouldReceive('sendInvitation')->once()->andThrow(UserInviteException::class);
         });
 
         $this->asAdmin()->post('/settings/users/create', [
@@ -247,22 +248,42 @@ public function test_user_create_activity_is_not_persisted_if_the_invitation_sen
     {
         /** @var User $user */
         $user = User::factory()->make();
-        $adminRole = Role::getRole('admin');
 
         $this->mock(UserInviteService::class, function (MockInterface $mock) {
-            $mock->shouldReceive('sendInvitation')->once()->andThrow(RuntimeException::class);
+            $mock->shouldReceive('sendInvitation')->once()->andThrow(UserInviteException::class);
         });
 
         $this->asAdmin()->post('/settings/users/create', [
             'name'                          => $user->name,
             'email'                         => $user->email,
             'send_invite'                   => 'true',
-            'roles[' . $adminRole->id . ']' => 'true',
         ]);
 
         $this->assertDatabaseMissing('activities', ['type' => 'USER_CREATE']);
     }
 
+    public function test_return_to_form_with_warning_if_the_invitation_sending_fails()
+    {
+        $logger = $this->withTestLogger();
+        /** @var User $user */
+        $user = User::factory()->make();
+
+        $this->mock(UserInviteService::class, function (MockInterface $mock) {
+            $mock->shouldReceive('sendInvitation')->once()->andThrow(UserInviteException::class);
+        });
+
+        $resp = $this->asAdmin()->post('/settings/users/create', [
+            'name'                          => $user->name,
+            'email'                         => $user->email,
+            'send_invite'                   => 'true',
+        ]);
+
+        $resp->assertRedirect('/settings/users/create');
+        $this->assertSessionError('Could not create user since invite email failed to send');
+        $this->assertEquals($user->email, session()->getOldInput('email'));
+        $this->assertTrue($logger->hasErrorThatContains('Failed to send user invite with error:'));
+    }
+
     public function test_user_create_update_fails_if_locale_is_invalid()
     {
         $user = $this->users->editor();

From f58335474846aeb06922560bab7303d14298d1cf Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 29 Sep 2024 16:50:48 +0100
Subject: [PATCH 292/666] Maintenance: Removed stray dd from last commit

---
 app/Users/Controllers/UserController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Users/Controllers/UserController.php b/app/Users/Controllers/UserController.php
index 00bbe61186e..b5dbaa83286 100644
--- a/app/Users/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -96,7 +96,6 @@ public function store(Request $request)
         try {
             DB::transaction(function () use ($validated, $sendInvite) {
                 $this->userRepo->create($validated, $sendInvite);
-                dd('post-create');
             });
         } catch (UserInviteException $e) {
             Log::error("Failed to send user invite with error: {$e->getMessage()}");

From a5b031f9060141364ed9152eacdb9b494cfa76a7 Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Sat, 14 Sep 2024 15:43:46 +0200
Subject: [PATCH 293/666] Translatable description for OpenSearch XML

---
 lang/en/common.php                        | 3 +++
 resources/views/misc/opensearch.blade.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lang/en/common.php b/lang/en/common.php
index 266174eed9d..b05169bb2c4 100644
--- a/lang/en/common.php
+++ b/lang/en/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privacy Policy',
     'terms_of_service' => 'Terms of Service',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
index e83e83c12fe..366c237b22a 100644
--- a/resources/views/misc/opensearch.blade.php
+++ b/resources/views/misc/opensearch.blade.php
@@ -1,6 +1,6 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
   <ShortName>{{ mb_strimwidth(setting('app-name'), 0, 16) }}</ShortName>
-  <Description>Search {{ setting('app-name') }}</Description>
+  <Description>{{ trans('common.opensearch_description', ['appName' => setting('app-name')]) }}</Description>
   <Image width="256" height="256" type="image/png">{{ setting('app-icon') ?: url('/icon.png') }}</Image>
   <Image width="180" height="180" type="image/png">{{ setting('app-icon-180') ?: url('/icon-180.png') }}</Image>
   <Image width="128" height="128" type="image/png">{{ setting('app-icon-128') ?: url('/icon-128.png') }}</Image>

From 1302e3c959158be0e5a2a3b34343f9cd828544a3 Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Sat, 14 Sep 2024 16:13:17 +0200
Subject: [PATCH 294/666] Add missing XML declaration to OpenSearch endpoint

---
 resources/views/misc/opensearch.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
index 366c237b22a..5c1503fc487 100644
--- a/resources/views/misc/opensearch.blade.php
+++ b/resources/views/misc/opensearch.blade.php
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
   <ShortName>{{ mb_strimwidth(setting('app-name'), 0, 16) }}</ShortName>
   <Description>{{ trans('common.opensearch_description', ['appName' => setting('app-name')]) }}</Description>

From 2f74cfb42c90785f9f1735319af28727cdec407a Mon Sep 17 00:00:00 2001
From: Maximilian Walter <maximilian-walter@users.noreply.github.com>
Date: Sat, 14 Sep 2024 16:21:01 +0200
Subject: [PATCH 295/666] Add test for OpenSearch endpoint

---
 tests/OpensearchTest.php | 42 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 tests/OpensearchTest.php

diff --git a/tests/OpensearchTest.php b/tests/OpensearchTest.php
new file mode 100644
index 00000000000..a68076b437d
--- /dev/null
+++ b/tests/OpensearchTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Tests;
+
+class OpensearchTest extends TestCase
+{
+    public function test_opensearch_endpoint()
+    {
+        $appName = setting('app-name');
+        $resultUrl = url('/search') . '?term={searchTerms}';
+        $selfUrl = url('/opensearch.xml');
+
+        $resp = $this->get('/opensearch.xml');
+        $resp->assertOk();
+
+        $html = $this->withHtml($resp);
+
+        $html->assertElementExists('OpenSearchDescription > ShortName');
+        $html->assertElementContains('OpenSearchDescription > ShortName', mb_strimwidth($appName, 0, 16));
+
+        $html->assertElementExists('OpenSearchDescription > Description');
+        $html->assertElementContains('OpenSearchDescription > Description', trans('common.opensearch_description', [
+            'appName' => $appName,
+        ]));
+
+        $html->assertElementExists('OpenSearchDescription > Image');
+
+        $html->assertElementExists('OpenSearchDescription > Url[rel="results"][template="' . htmlspecialchars($resultUrl) . '"]');
+        $html->assertElementExists('OpenSearchDescription > Url[rel="self"][template="' . htmlspecialchars($selfUrl) . '"]');
+    }
+
+    public function test_opensearch_linked_to_from_home()
+    {
+        $appName = setting('app-name');
+        $endpointUrl = url('/opensearch.xml');
+
+        $resp = $this->asViewer()->get('/');
+        $html = $this->withHtml($resp);
+
+        $html->assertElementExists('head > link[rel="search"][type="application/opensearchdescription+xml"][title="' . htmlspecialchars($appName) . '"][href="' . htmlspecialchars($endpointUrl) . '"]');
+    }
+}

From 8bc6e75319583298e1f19df5441dc820772f3666 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 30 Sep 2024 16:47:55 +0100
Subject: [PATCH 296/666] Code Blocks: Added SAS and R language options

For #5206
---
 resources/js/code/languages.js                    | 2 ++
 resources/js/code/legacy-modes.mjs                | 2 ++
 resources/views/pages/parts/code-editor.blade.php | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/code/languages.js b/resources/js/code/languages.js
index ef317334c2b..da9631a138a 100644
--- a/resources/js/code/languages.js
+++ b/resources/js/code/languages.js
@@ -71,10 +71,12 @@ const modeMap = {
     ocaml: () => legacyLoad('oCaml'),
     py: () => legacyLoad('python'),
     python: () => legacyLoad('python'),
+    r: () => legacyLoad('r'),
     rb: () => legacyLoad('ruby'),
     rs: () => legacyLoad('rust'),
     ruby: () => legacyLoad('ruby'),
     rust: () => legacyLoad('rust'),
+    sas: () => legacyLoad('sas'),
     scala: () => legacyLoad('scala'),
     scheme: () => legacyLoad('scheme'),
     shell: () => legacyLoad('shell'),
diff --git a/resources/js/code/legacy-modes.mjs b/resources/js/code/legacy-modes.mjs
index 55a804bf97e..7b70bec10a1 100644
--- a/resources/js/code/legacy-modes.mjs
+++ b/resources/js/code/legacy-modes.mjs
@@ -16,8 +16,10 @@ export {pascal} from '@codemirror/legacy-modes/mode/pascal';
 export {powerShell} from '@codemirror/legacy-modes/mode/powershell';
 export {properties} from '@codemirror/legacy-modes/mode/properties';
 export {python} from '@codemirror/legacy-modes/mode/python';
+export {r} from '@codemirror/legacy-modes/mode/r';
 export {ruby} from '@codemirror/legacy-modes/mode/ruby';
 export {rust} from '@codemirror/legacy-modes/mode/rust';
+export {sas} from '@codemirror/legacy-modes/mode/sas';
 export {scheme} from '@codemirror/legacy-modes/mode/scheme';
 export {shell} from '@codemirror/legacy-modes/mode/shell';
 export {
diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index 688fe67ef67..fc8852a32b8 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -26,7 +26,7 @@ class="popup-background code-editor">
                                 'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI',
                                 'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'MSSQL', 'MySQL',
                                 'Nginx', 'OCaml', 'Octave', 'Pascal', 'Perl', 'PHP', 'PL/SQL', 'PostgreSQL', 'Powershell', 'Python',
-                                'Ruby', 'Rust', 'Scala', 'Scheme', 'Shell', 'Smarty', 'SQL', 'SQLite', 'Swift',
+                                'R', 'Ruby', 'Rust', 'SAS', 'Scala', 'Scheme', 'Shell', 'Smarty', 'SQL', 'SQLite', 'Swift',
                                 'Twig', 'TypeScript', 'VBScript', 'VB.NET', 'XML', 'YAML',
                             ];
                         @endphp

From 514db60617780de889645513ad613d8ff0ba3108 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 30 Sep 2024 17:07:53 +0100
Subject: [PATCH 297/666] Tests: Categorised up meta tests

Extracted robots.txt tests into its own file to fit into new folder.
Also tweaked open search tests a tad to specifically check long app
names.
---
 tests/{ => Meta}/HelpTest.php        |  4 +++-
 tests/{ => Meta}/LicensesTest.php    |  4 +++-
 tests/{ => Meta}/OpenGraphTest.php   |  3 ++-
 tests/{ => Meta}/OpensearchTest.php  | 14 +++++------
 tests/{ => Meta}/PwaManifestTest.php |  4 +++-
 tests/Meta/RobotsTest.php            | 35 ++++++++++++++++++++++++++++
 tests/PublicActionTest.php           | 27 ---------------------
 7 files changed, 53 insertions(+), 38 deletions(-)
 rename tests/{ => Meta}/HelpTest.php (94%)
 rename tests/{ => Meta}/LicensesTest.php (94%)
 rename tests/{ => Meta}/OpenGraphTest.php (98%)
 rename tests/{ => Meta}/OpensearchTest.php (84%)
 rename tests/{ => Meta}/PwaManifestTest.php (98%)
 create mode 100644 tests/Meta/RobotsTest.php

diff --git a/tests/HelpTest.php b/tests/Meta/HelpTest.php
similarity index 94%
rename from tests/HelpTest.php
rename to tests/Meta/HelpTest.php
index 9cf80717fe0..e1de96bc8df 100644
--- a/tests/HelpTest.php
+++ b/tests/Meta/HelpTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Tests;
+namespace Tests\Meta;
+
+use Tests\TestCase;
 
 class HelpTest extends TestCase
 {
diff --git a/tests/LicensesTest.php b/tests/Meta/LicensesTest.php
similarity index 94%
rename from tests/LicensesTest.php
rename to tests/Meta/LicensesTest.php
index a7fb803c087..4bee6f682b9 100644
--- a/tests/LicensesTest.php
+++ b/tests/Meta/LicensesTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Tests;
+namespace Tests\Meta;
+
+use Tests\TestCase;
 
 class LicensesTest extends TestCase
 {
diff --git a/tests/OpenGraphTest.php b/tests/Meta/OpenGraphTest.php
similarity index 98%
rename from tests/OpenGraphTest.php
rename to tests/Meta/OpenGraphTest.php
index 545fa4c864c..96e622da052 100644
--- a/tests/OpenGraphTest.php
+++ b/tests/Meta/OpenGraphTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Tests;
+namespace Tests\Meta;
 
 use BookStack\Entities\Repos\BaseRepo;
 use BookStack\Entities\Repos\BookRepo;
 use Illuminate\Support\Str;
 use Illuminate\Testing\TestResponse;
+use Tests\TestCase;
 
 class OpenGraphTest extends TestCase
 {
diff --git a/tests/OpensearchTest.php b/tests/Meta/OpensearchTest.php
similarity index 84%
rename from tests/OpensearchTest.php
rename to tests/Meta/OpensearchTest.php
index a68076b437d..38e1587168b 100644
--- a/tests/OpensearchTest.php
+++ b/tests/Meta/OpensearchTest.php
@@ -1,12 +1,15 @@
 <?php
 
-namespace Tests;
+namespace Tests\Meta;
+
+use Tests\TestCase;
 
 class OpensearchTest extends TestCase
 {
     public function test_opensearch_endpoint()
     {
-        $appName = setting('app-name');
+        $appName = 'MyAppNameThatsReallyLongLikeThis';
+        setting()->put('app-name', $appName);
         $resultUrl = url('/search') . '?term={searchTerms}';
         $selfUrl = url('/opensearch.xml');
 
@@ -17,14 +20,11 @@ public function test_opensearch_endpoint()
 
         $html->assertElementExists('OpenSearchDescription > ShortName');
         $html->assertElementContains('OpenSearchDescription > ShortName', mb_strimwidth($appName, 0, 16));
+        $html->assertElementNotContains('OpenSearchDescription > ShortName', $appName);
 
         $html->assertElementExists('OpenSearchDescription > Description');
-        $html->assertElementContains('OpenSearchDescription > Description', trans('common.opensearch_description', [
-            'appName' => $appName,
-        ]));
-
+        $html->assertElementContains('OpenSearchDescription > Description', "Search {$appName}");
         $html->assertElementExists('OpenSearchDescription > Image');
-
         $html->assertElementExists('OpenSearchDescription > Url[rel="results"][template="' . htmlspecialchars($resultUrl) . '"]');
         $html->assertElementExists('OpenSearchDescription > Url[rel="self"][template="' . htmlspecialchars($selfUrl) . '"]');
     }
diff --git a/tests/PwaManifestTest.php b/tests/Meta/PwaManifestTest.php
similarity index 98%
rename from tests/PwaManifestTest.php
rename to tests/Meta/PwaManifestTest.php
index c66f8b36052..fc6d19b5459 100644
--- a/tests/PwaManifestTest.php
+++ b/tests/Meta/PwaManifestTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Tests;
+namespace Tests\Meta;
+
+use Tests\TestCase;
 
 class PwaManifestTest extends TestCase
 {
diff --git a/tests/Meta/RobotsTest.php b/tests/Meta/RobotsTest.php
new file mode 100644
index 00000000000..04496c375bc
--- /dev/null
+++ b/tests/Meta/RobotsTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Meta;
+
+use Tests\TestCase;
+
+class RobotsTest extends TestCase
+{
+    public function test_robots_effected_by_public_status()
+    {
+        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
+
+        $this->setSettings(['app-public' => 'true']);
+
+        $resp = $this->get('/robots.txt');
+        $resp->assertSee("User-agent: *\nDisallow:");
+        $resp->assertDontSee('Disallow: /');
+    }
+
+    public function test_robots_effected_by_setting()
+    {
+        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
+
+        config()->set('app.allow_robots', true);
+
+        $resp = $this->get('/robots.txt');
+        $resp->assertSee("User-agent: *\nDisallow:");
+        $resp->assertDontSee('Disallow: /');
+
+        // Check config overrides app-public setting
+        config()->set('app.allow_robots', false);
+        $this->setSettings(['app-public' => 'true']);
+        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
+    }
+}
diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 875b279a81c..76745aaac72 100644
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -128,33 +128,6 @@ public function test_content_not_listed_on_404_for_public_users()
         $resp->assertDontSee($page->name);
     }
 
-    public function test_robots_effected_by_public_status()
-    {
-        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
-
-        $this->setSettings(['app-public' => 'true']);
-
-        $resp = $this->get('/robots.txt');
-        $resp->assertSee("User-agent: *\nDisallow:");
-        $resp->assertDontSee('Disallow: /');
-    }
-
-    public function test_robots_effected_by_setting()
-    {
-        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
-
-        config()->set('app.allow_robots', true);
-
-        $resp = $this->get('/robots.txt');
-        $resp->assertSee("User-agent: *\nDisallow:");
-        $resp->assertDontSee('Disallow: /');
-
-        // Check config overrides app-public setting
-        config()->set('app.allow_robots', false);
-        $this->setSettings(['app-public' => 'true']);
-        $this->get('/robots.txt')->assertSee("User-agent: *\nDisallow: /");
-    }
-
     public function test_default_favicon_file_created_upon_access()
     {
         $faviconPath = public_path('favicon.ico');

From 34ade5018186b0acc01205dd1ed3c6b1043f835e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 1 Oct 2024 10:37:31 +0100
Subject: [PATCH 298/666] Base layout: Changed main app script to be module
 loaded

Prevents polluting global scope with variables since we're using the
module format bundler in esbuild.
Also cleaned up unused yields.
Fixed bad reference in our tinymce fixes.

For #5232
---
 resources/js/wysiwyg-tinymce/fixes.js       |  8 +++++---
 resources/views/comments/comments.blade.php |  6 ++----
 resources/views/layouts/base.blade.php      | 10 ++--------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/resources/js/wysiwyg-tinymce/fixes.js b/resources/js/wysiwyg-tinymce/fixes.js
index b6d627ff796..9e5cce43c50 100644
--- a/resources/js/wysiwyg-tinymce/fixes.js
+++ b/resources/js/wysiwyg-tinymce/fixes.js
@@ -144,11 +144,13 @@ export function handleTableCellRangeEvents(editor) {
             cell.removeAttribute('align');
             cleanChildAlignment(cell);
         },
-        JustifyRight: this.JustifyLeft,
-        JustifyCenter: this.JustifyLeft,
-        JustifyFull: this.JustifyLeft,
     };
 
+    // Copy justify left action to other alignment actions
+    actionByCommand.JustifyRight = actionByCommand.JustifyLeft;
+    actionByCommand.JustifyCenter = actionByCommand.JustifyLeft;
+    actionByCommand.JustifyFull = actionByCommand.JustifyLeft;
+
     editor.on('ExecCommand', event => {
         const action = actionByCommand[event.command];
         if (action) {
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 37329c42cf8..48bf885fff5 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -36,11 +36,9 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
     @endif
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
-        @push('post-app-scripts')
-            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
+        @push('body-end')
+            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
             @include('form.editor-translations')
-        @endpush
-        @push('post-app-html')
             @include('entities.selector-popup')
         @endpush
     @endif
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index ddecb8e76e1..a6d908fc06c 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -35,8 +35,6 @@ class="{{ setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : ''
     <!-- OpenSearch -->
     <link rel="search" type="application/opensearchdescription+xml" title="{{ setting('app-name') }}" href="{{ url('/opensearch.xml') }}">
 
-    @yield('head')
-
     <!-- Custom Styles & Head Content -->
     @include('layouts.parts.custom-styles')
     @include('layouts.parts.custom-head')
@@ -70,14 +68,10 @@ class="@stack('body-class')">
         </div>
     </div>
 
-    @yield('bottom')
-    @stack('post-app-html')
-
     @if($cspNonce ?? false)
-        <script src="{{ versioned_asset('dist/app.js') }}" nonce="{{ $cspNonce }}"></script>
+        <script src="{{ versioned_asset('dist/app.js') }}" type="module" nonce="{{ $cspNonce }}"></script>
     @endif
-    @yield('scripts')
-    @stack('post-app-scripts')
+    @stack('body-end')
 
     @include('layouts.parts.base-body-end')
 </body>

From 177cfd72bf22c78823cc46dc5c44df542f5f1fd2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Oct 2024 17:31:45 +0100
Subject: [PATCH 299/666] Search: Added structure for search term inputs

Sets things up to allow more complex terms ready to handle negation.
---
 app/Search/SearchOption.php           |  12 +++
 app/Search/SearchOptionSet.php        |  56 +++++++++++++
 app/Search/SearchOptions.php          | 114 +++++++++++++++++---------
 app/Search/SearchResultsFormatter.php |   5 +-
 app/Search/SearchRunner.php           |  22 ++---
 resources/views/search/all.blade.php  |  42 +++++-----
 tests/Entity/SearchOptionsTest.php    |  31 +++----
 7 files changed, 195 insertions(+), 87 deletions(-)
 create mode 100644 app/Search/SearchOption.php
 create mode 100644 app/Search/SearchOptionSet.php

diff --git a/app/Search/SearchOption.php b/app/Search/SearchOption.php
new file mode 100644
index 00000000000..74fc7be3859
--- /dev/null
+++ b/app/Search/SearchOption.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Search;
+
+class SearchOption
+{
+    public function __construct(
+        public string $value,
+        public bool $negated = false,
+    ) {
+    }
+}
diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
new file mode 100644
index 00000000000..a54b1d33a69
--- /dev/null
+++ b/app/Search/SearchOptionSet.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace BookStack\Search;
+
+class SearchOptionSet
+{
+    /**
+     * @var SearchOption[]
+     */
+    public array $options = [];
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function toValueArray(): array
+    {
+        return array_map(fn(SearchOption $option) => $option->value, $this->options);
+    }
+
+    public function toValueMap(): array
+    {
+        $map = [];
+        foreach ($this->options as $key => $option) {
+            $map[$key] = $option->value;
+        }
+        return $map;
+    }
+
+    public function merge(SearchOptionSet $set): self
+    {
+        return new self(array_merge($this->options, $set->options));
+    }
+
+    public function filterEmpty(): self
+    {
+        $filteredOptions = array_filter($this->options, fn (SearchOption $option) => !empty($option->value));
+        return new self($filteredOptions);
+    }
+
+    public static function fromValueArray(array $values): self
+    {
+        $options = array_map(fn($val) => new SearchOption($val), $values);
+        return new self($options);
+    }
+
+    public static function fromMapArray(array $values): self
+    {
+        $options = [];
+        foreach ($values as $key => $value) {
+            $options[$key] = new SearchOption($value);
+        }
+        return new self($options);
+    }
+}
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index fffa03db094..09981c75dff 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -6,22 +6,26 @@
 
 class SearchOptions
 {
-    public array $searches = [];
-    public array $exacts = [];
-    public array $tags = [];
-    public array $filters = [];
+    public SearchOptionSet $searches;
+    public SearchOptionSet $exacts;
+    public SearchOptionSet $tags;
+    public SearchOptionSet $filters;
+
+    public function __construct()
+    {
+        $this->searches = new SearchOptionSet();
+        $this->exacts = new SearchOptionSet();
+        $this->tags = new SearchOptionSet();
+        $this->filters = new SearchOptionSet();
+    }
 
     /**
      * Create a new instance from a search string.
      */
     public static function fromString(string $search): self
     {
-        $decoded = static::decode($search);
-        $instance = new SearchOptions();
-        foreach ($decoded as $type => $value) {
-            $instance->$type = $value;
-        }
-
+        $instance = new self();
+        $instance->addOptionsFromString($search);
         return $instance;
     }
 
@@ -44,34 +48,37 @@ public static function fromRequest(Request $request): self
         $inputs = $request->only(['search', 'types', 'filters', 'exact', 'tags']);
 
         $parsedStandardTerms = static::parseStandardTermString($inputs['search'] ?? '');
-        $instance->searches = array_filter($parsedStandardTerms['terms']);
-        $instance->exacts = array_filter($parsedStandardTerms['exacts']);
-
-        array_push($instance->exacts, ...array_filter($inputs['exact'] ?? []));
-
-        $instance->tags = array_filter($inputs['tags'] ?? []);
+        $inputExacts = array_filter($inputs['exact'] ?? []);
+        $instance->searches = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['terms']));
+        $instance->exacts = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['exacts']));
+        $instance->exacts = $instance->exacts->merge(SearchOptionSet::fromValueArray($inputExacts));
+        $instance->tags = SearchOptionSet::fromValueArray(array_filter($inputs['tags'] ?? []));
 
+        $keyedFilters = [];
         foreach (($inputs['filters'] ?? []) as $filterKey => $filterVal) {
             if (empty($filterVal)) {
                 continue;
             }
-            $instance->filters[$filterKey] = $filterVal === 'true' ? '' : $filterVal;
+            $cleanedFilterVal = $filterVal === 'true' ? '' : $filterVal;
+            $keyedFilters[$filterKey] = new SearchOption($cleanedFilterVal);
         }
 
         if (isset($inputs['types']) && count($inputs['types']) < 4) {
-            $instance->filters['type'] = implode('|', $inputs['types']);
+            $keyedFilters['type'] = new SearchOption(implode('|', $inputs['types']));
         }
 
+        $instance->filters = new SearchOptionSet($keyedFilters);
+
         return $instance;
     }
 
     /**
-     * Decode a search string into an array of terms.
+     * Decode a search string and add its contents to this instance.
      */
-    protected static function decode(string $searchString): array
+    protected function addOptionsFromString(string $searchString): void
     {
+        /** @var array<string, string[]> $terms */
         $terms = [
-            'searches' => [],
             'exacts'   => [],
             'tags'     => [],
             'filters'  => [],
@@ -94,28 +101,30 @@ protected static function decode(string $searchString): array
         }
 
         // Unescape exacts and backslash escapes
-        foreach ($terms['exacts'] as $index => $exact) {
-            $terms['exacts'][$index] = static::decodeEscapes($exact);
-        }
+        $escapedExacts = array_map(fn(string $term) => static::decodeEscapes($term), $terms['exacts']);
 
         // Parse standard terms
         $parsedStandardTerms = static::parseStandardTermString($searchString);
-        array_push($terms['searches'], ...$parsedStandardTerms['terms']);
-        array_push($terms['exacts'], ...$parsedStandardTerms['exacts']);
+        $this->searches = $this->searches
+            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['terms']))
+            ->filterEmpty();
+        $this->exacts = $this->exacts
+            ->merge(SearchOptionSet::fromValueArray($escapedExacts))
+            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['exacts']))
+            ->filterEmpty();
+
+        // Add tags
+        $this->tags = $this->tags->merge(SearchOptionSet::fromValueArray($terms['tags']));
 
         // Split filter values out
+        /** @var array<string, SearchOption> $splitFilters */
         $splitFilters = [];
         foreach ($terms['filters'] as $filter) {
             $explodedFilter = explode(':', $filter, 2);
-            $splitFilters[$explodedFilter[0]] = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
+            $filterValue = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
+            $splitFilters[$explodedFilter[0]] = new SearchOption($filterValue);
         }
-        $terms['filters'] = $splitFilters;
-
-        // Filter down terms where required
-        $terms['exacts'] = array_filter($terms['exacts']);
-        $terms['searches'] = array_filter($terms['searches']);
-
-        return $terms;
+        $this->filters = $this->filters->merge(new SearchOptionSet($splitFilters));
     }
 
     /**
@@ -175,7 +184,9 @@ protected static function parseStandardTermString(string $termString): array
      */
     public function setFilter(string $filterName, string $filterValue = ''): void
     {
-        $this->filters[$filterName] = $filterValue;
+        $this->filters = $this->filters->merge(
+            new SearchOptionSet([$filterName => new SearchOption($filterValue)])
+        );
     }
 
     /**
@@ -183,22 +194,47 @@ public function setFilter(string $filterName, string $filterValue = ''): void
      */
     public function toString(): string
     {
-        $parts = $this->searches;
+        $parts = $this->searches->toValueArray();
 
-        foreach ($this->exacts as $term) {
+        foreach ($this->exacts->toValueArray() as $term) {
             $escaped = str_replace('\\', '\\\\', $term);
             $escaped = str_replace('"', '\"', $escaped);
             $parts[] = '"' . $escaped . '"';
         }
 
-        foreach ($this->tags as $term) {
+        foreach ($this->tags->toValueArray() as $term) {
             $parts[] = "[{$term}]";
         }
 
-        foreach ($this->filters as $filterName => $filterVal) {
+        foreach ($this->filters->toValueMap() as $filterName => $filterVal) {
             $parts[] = '{' . $filterName . ($filterVal ? ':' . $filterVal : '') . '}';
         }
 
         return implode(' ', $parts);
     }
+
+    /**
+     * Get the search options that don't have UI controls provided for.
+     * Provided back as a key => value array with the keys being expected
+     * input names for a search form, and values being the option value.
+     *
+     * @return array<string, string>
+     */
+    public function getHiddenInputValuesByFieldName(): array
+    {
+        $options = [];
+
+        // Non-[created/updated]-by-me options
+        $filterMap = $this->filters->toValueMap();
+        foreach (['updated_by', 'created_by', 'owned_by'] as $filter) {
+            $value = $filterMap[$filter] ?? null;
+            if ($value !== null && $value !== 'me') {
+                $options["filters[$filter]"] = $value;
+            }
+        }
+
+        // TODO - Negated
+
+        return $options;
+    }
 }
diff --git a/app/Search/SearchResultsFormatter.php b/app/Search/SearchResultsFormatter.php
index 02a40632e22..b06f81e0e05 100644
--- a/app/Search/SearchResultsFormatter.php
+++ b/app/Search/SearchResultsFormatter.php
@@ -25,11 +25,12 @@ public function format(array $results, SearchOptions $options): void
      * Update the given entity model to set attributes used for previews of the item
      * primarily within search result lists.
      */
-    protected function setSearchPreview(Entity $entity, SearchOptions $options)
+    protected function setSearchPreview(Entity $entity, SearchOptions $options): void
     {
         $textProperty = $entity->textField;
         $textContent = $entity->$textProperty;
-        $terms = array_merge($options->exacts, $options->searches);
+        $relevantSearchOptions = $options->exacts->merge($options->searches);
+        $terms = $relevantSearchOptions->toValueArray();
 
         $originalContentByNewAttribute = [
             'preview_name'    => $entity->name,
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 94518dbf7b2..855140508f8 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -55,10 +55,11 @@ public function searchEntities(SearchOptions $searchOpts, string $entityType = '
         $entityTypes = array_keys($this->entityProvider->all());
         $entityTypesToSearch = $entityTypes;
 
+        $filterMap = $searchOpts->filters->toValueMap();
         if ($entityType !== 'all') {
             $entityTypesToSearch = [$entityType];
-        } elseif (isset($searchOpts->filters['type'])) {
-            $entityTypesToSearch = explode('|', $searchOpts->filters['type']);
+        } elseif (isset($filterMap['type'])) {
+            $entityTypesToSearch = explode('|', $filterMap['type']);
         }
 
         $results = collect();
@@ -97,7 +98,8 @@ public function searchBook(int $bookId, string $searchString): Collection
     {
         $opts = SearchOptions::fromString($searchString);
         $entityTypes = ['page', 'chapter'];
-        $entityTypesToSearch = isset($opts->filters['type']) ? explode('|', $opts->filters['type']) : $entityTypes;
+        $filterMap = $opts->filters->toValueMap();
+        $entityTypesToSearch = isset($filterMap['type']) ? explode('|', $filterMap['type']) : $entityTypes;
 
         $results = collect();
         foreach ($entityTypesToSearch as $entityType) {
@@ -161,7 +163,7 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
         $this->applyTermSearch($entityQuery, $searchOpts, $entityType);
 
         // Handle exact term matching
-        foreach ($searchOpts->exacts as $inputTerm) {
+        foreach ($searchOpts->exacts->toValueArray() as $inputTerm) {
             $entityQuery->where(function (EloquentBuilder $query) use ($inputTerm, $entityModelInstance) {
                 $inputTerm = str_replace('\\', '\\\\', $inputTerm);
                 $query->where('name', 'like', '%' . $inputTerm . '%')
@@ -170,12 +172,12 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
         }
 
         // Handle tag searches
-        foreach ($searchOpts->tags as $inputTerm) {
+        foreach ($searchOpts->tags->toValueArray() as $inputTerm) {
             $this->applyTagSearch($entityQuery, $inputTerm);
         }
 
         // Handle filters
-        foreach ($searchOpts->filters as $filterTerm => $filterValue) {
+        foreach ($searchOpts->filters->toValueMap() as $filterTerm => $filterValue) {
             $functionName = Str::camel('filter_' . $filterTerm);
             if (method_exists($this, $functionName)) {
                 $this->$functionName($entityQuery, $entityModelInstance, $filterValue);
@@ -190,7 +192,7 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
      */
     protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $options, string $entityType): void
     {
-        $terms = $options->searches;
+        $terms = $options->searches->toValueArray();
         if (count($terms) === 0) {
             return;
         }
@@ -209,8 +211,8 @@ protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $
         $subQuery->where('entity_type', '=', $entityType);
         $subQuery->where(function (Builder $query) use ($terms) {
             foreach ($terms as $inputTerm) {
-                $inputTerm = str_replace('\\', '\\\\', $inputTerm);
-                $query->orWhere('term', 'like', $inputTerm . '%');
+                $escapedTerm = str_replace('\\', '\\\\', $inputTerm);
+                $query->orWhere('term', 'like', $escapedTerm . '%');
             }
         });
         $subQuery->groupBy('entity_type', 'entity_id');
@@ -264,7 +266,7 @@ protected function getTermAdjustments(SearchOptions $options): array
         $whenStatements = [];
         $whenBindings = [];
 
-        foreach ($options->searches as $term) {
+        foreach ($options->searches->toValueArray() as $term) {
             $whenStatements[] = 'WHEN term LIKE ? THEN ?';
             $whenBindings[] = $term . '%';
             $whenBindings[] = $term;
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 2d410dbd1b0..aa7ae0aff81 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -8,15 +8,18 @@
                 <div>
                     <h5>{{ trans('entities.search_advanced') }}</h5>
 
+                    @php
+                        $filterMap = $options->filters->toValueMap();
+                    @endphp
                     <form method="get" action="{{ url('/search') }}">
                         <h6>{{ trans('entities.search_terms') }}</h6>
-                        <input type="text" name="search" value="{{ implode(' ', $options->searches) }}">
+                        <input type="text" name="search" value="{{ implode(' ', $options->searches->toValueArray()) }}">
 
                         <h6>{{ trans('entities.search_content_type') }}</h6>
                         <div class="form-group">
 
                             <?php
-                            $types = explode('|', $options->filters['type'] ?? '');
+                            $types = explode('|', $filterMap['type'] ?? '');
                             $hasTypes = $types[0] !== '';
                             ?>
                             @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('page', $types), 'entity' => 'page', 'transKey' => 'page'])
@@ -27,46 +30,43 @@
                         </div>
 
                         <h6>{{ trans('entities.search_exact_matches') }}</h6>
-                        @include('search.parts.term-list', ['type' => 'exact', 'currentList' => $options->exacts])
+                        @include('search.parts.term-list', ['type' => 'exact', 'currentList' => $options->exacts->toValueArray()])
 
                         <h6>{{ trans('entities.search_tags') }}</h6>
-                        @include('search.parts.term-list', ['type' => 'tags', 'currentList' => $options->tags])
+                        @include('search.parts.term-list', ['type' => 'tags', 'currentList' => $options->tags->toValueArray()])
 
                         @if(!user()->isGuest())
                             <h6>{{ trans('entities.search_options') }}</h6>
 
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'viewed_by_me', 'value' => null])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'viewed_by_me', 'value' => null])
                                 {{ trans('entities.search_viewed_by_me') }}
                             @endcomponent
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'not_viewed_by_me', 'value' => null])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'not_viewed_by_me', 'value' => null])
                                 {{ trans('entities.search_not_viewed_by_me') }}
                             @endcomponent
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'is_restricted', 'value' => null])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'is_restricted', 'value' => null])
                                 {{ trans('entities.search_permissions_set') }}
                             @endcomponent
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'created_by', 'value' => 'me'])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'created_by', 'value' => 'me'])
                                 {{ trans('entities.search_created_by_me') }}
                             @endcomponent
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'updated_by', 'value' => 'me'])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'updated_by', 'value' => 'me'])
                                 {{ trans('entities.search_updated_by_me') }}
                             @endcomponent
-                            @component('search.parts.boolean-filter', ['filters' => $options->filters, 'name' => 'owned_by', 'value' => 'me'])
+                            @component('search.parts.boolean-filter', ['filters' => $filterMap, 'name' => 'owned_by', 'value' => 'me'])
                                 {{ trans('entities.search_owned_by_me') }}
                             @endcomponent
                         @endif
 
                         <h6>{{ trans('entities.search_date_options') }}</h6>
-                        @include('search.parts.date-filter', ['name' => 'updated_after', 'filters' => $options->filters])
-                        @include('search.parts.date-filter', ['name' => 'updated_before', 'filters' => $options->filters])
-                        @include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $options->filters])
-                        @include('search.parts.date-filter', ['name' => 'created_before', 'filters' => $options->filters])
-
-                        @if(isset($options->filters['created_by']) && $options->filters['created_by'] !== "me")
-                            <input type="hidden" name="filters[created_by]" value="{{ $options->filters['created_by'] }}">
-                        @endif
-                        @if(isset($options->filters['updated_by']) && $options->filters['updated_by'] !== "me")
-                            <input type="hidden" name="filters[updated_by]" value="{{ $options->filters['updated_by'] }}">
-                        @endif
+                        @include('search.parts.date-filter', ['name' => 'updated_after', 'filters' => $filterMap])
+                        @include('search.parts.date-filter', ['name' => 'updated_before', 'filters' => $filterMap])
+                        @include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $filterMap])
+                        @include('search.parts.date-filter', ['name' => 'created_before', 'filters' => $filterMap])
+
+                        @foreach($options->getHiddenInputValuesByFieldName() as $fieldName => $value)
+                            <input type="hidden" name="{{ $fieldName }}" value="{{ $value }}">
+                        @endforeach
 
                         <button type="submit" class="button">{{ trans('entities.search_update') }}</button>
                     </form>
diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Entity/SearchOptionsTest.php
index ea4d727a428..7ab150e914b 100644
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Entity/SearchOptionsTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Entity;
 
 use BookStack\Search\SearchOptions;
+use BookStack\Search\SearchOptionSet;
 use Illuminate\Http\Request;
 use Tests\TestCase;
 
@@ -12,27 +13,27 @@ public function test_from_string_parses_a_search_string_properly()
     {
         $options = SearchOptions::fromString('cat "dog" [tag=good] {is_tree}');
 
-        $this->assertEquals(['cat'], $options->searches);
-        $this->assertEquals(['dog'], $options->exacts);
-        $this->assertEquals(['tag=good'], $options->tags);
-        $this->assertEquals(['is_tree' => ''], $options->filters);
+        $this->assertEquals(['cat'], $options->searches->toValueArray());
+        $this->assertEquals(['dog'], $options->exacts->toValueArray());
+        $this->assertEquals(['tag=good'], $options->tags->toValueArray());
+        $this->assertEquals(['is_tree' => ''], $options->filters->toValueMap());
     }
 
     public function test_from_string_properly_parses_escaped_quotes()
     {
         $options = SearchOptions::fromString('"\"cat\"" surprise "\"\"" "\"donkey" "\"" "\\\\"');
 
-        $this->assertEquals(['"cat"', '""', '"donkey', '"', '\\'], $options->exacts);
+        $this->assertEquals(['"cat"', '""', '"donkey', '"', '\\'], $options->exacts->toValueArray());
     }
 
     public function test_to_string_includes_all_items_in_the_correct_format()
     {
         $expected = 'cat "dog" [tag=good] {is_tree}';
         $options = new SearchOptions();
-        $options->searches = ['cat'];
-        $options->exacts = ['dog'];
-        $options->tags = ['tag=good'];
-        $options->filters = ['is_tree' => ''];
+        $options->searches = SearchOptionSet::fromValueArray(['cat']);
+        $options->exacts = SearchOptionSet::fromValueArray(['dog']);
+        $options->tags = SearchOptionSet::fromValueArray(['tag=good']);
+        $options->filters = SearchOptionSet::fromMapArray(['is_tree' => '']);
 
         $output = $options->toString();
         foreach (explode(' ', $expected) as $term) {
@@ -43,7 +44,7 @@ public function test_to_string_includes_all_items_in_the_correct_format()
     public function test_to_string_escapes_as_expected()
     {
         $options = new SearchOptions();
-        $options->exacts = ['"cat"', '""', '"donkey', '"', '\\', '\\"'];
+        $options->exacts = SearchOptionSet::fromValueArray(['"cat"', '""', '"donkey', '"', '\\', '\\"']);
 
         $output = $options->toString();
         $this->assertEquals('"\"cat\"" "\"\"" "\"donkey" "\"" "\\\\" "\\\\\""', $output);
@@ -57,14 +58,14 @@ public function test_correct_filter_values_are_set_from_string()
             'is_tree' => '',
             'name'    => 'dan',
             'cat'     => 'happy',
-        ], $opts->filters);
+        ], $opts->filters->toValueMap());
     }
     public function test_it_cannot_parse_out_empty_exacts()
     {
         $options = SearchOptions::fromString('"" test ""');
 
-        $this->assertEmpty($options->exacts);
-        $this->assertCount(1, $options->searches);
+        $this->assertEmpty($options->exacts->toValueArray());
+        $this->assertCount(1, $options->searches->toValueArray());
     }
 
     public function test_from_request_properly_parses_exacts_from_search_terms()
@@ -74,7 +75,7 @@ public function test_from_request_properly_parses_exacts_from_search_terms()
         ]);
 
         $options = SearchOptions::fromRequest($request);
-        $this->assertEquals(["biscuits"], $options->searches);
-        $this->assertEquals(['"cheese"', '""', '"baked',  'beans"'], $options->exacts);
+        $this->assertEquals(["biscuits"], $options->searches->toValueArray());
+        $this->assertEquals(['"cheese"', '""', '"baked',  'beans"'], $options->exacts->toValueArray());
     }
 }

From 93c677a6a955c75318c184d167737836c8c36cd5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 3 Oct 2024 15:59:50 +0100
Subject: [PATCH 300/666] Searching: Added negation support to UI and term
 handling

Updated/added tests to cover.
Support for actual search queries still remains.
---
 app/Search/Options/ExactSearchOption.php  |  13 +++
 app/Search/Options/FilterSearchOption.php |  37 +++++++
 app/Search/Options/SearchOption.php       |  26 +++++
 app/Search/Options/TagSearchOption.php    |  11 ++
 app/Search/Options/TermSearchOption.php   |  11 ++
 app/Search/SearchOption.php               |  12 ---
 app/Search/SearchOptionSet.php            |  35 +++++--
 app/Search/SearchOptions.php              | 119 ++++++++++++----------
 resources/views/search/all.blade.php      |  14 ++-
 tests/Entity/EntitySearchTest.php         |   7 +-
 tests/Entity/SearchOptionsTest.php        |  63 ++++++++++--
 11 files changed, 252 insertions(+), 96 deletions(-)
 create mode 100644 app/Search/Options/ExactSearchOption.php
 create mode 100644 app/Search/Options/FilterSearchOption.php
 create mode 100644 app/Search/Options/SearchOption.php
 create mode 100644 app/Search/Options/TagSearchOption.php
 create mode 100644 app/Search/Options/TermSearchOption.php
 delete mode 100644 app/Search/SearchOption.php

diff --git a/app/Search/Options/ExactSearchOption.php b/app/Search/Options/ExactSearchOption.php
new file mode 100644
index 00000000000..5651fb99b09
--- /dev/null
+++ b/app/Search/Options/ExactSearchOption.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace BookStack\Search\Options;
+
+class ExactSearchOption extends SearchOption
+{
+    public function toString(): string
+    {
+        $escaped = str_replace('\\', '\\\\', $this->value);
+        $escaped = str_replace('"', '\"', $escaped);
+        return ($this->negated ? '-' : '') . '"' . $escaped . '"';
+    }
+}
diff --git a/app/Search/Options/FilterSearchOption.php b/app/Search/Options/FilterSearchOption.php
new file mode 100644
index 00000000000..1f64f4f9e04
--- /dev/null
+++ b/app/Search/Options/FilterSearchOption.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\Search\Options;
+
+class FilterSearchOption extends SearchOption
+{
+    protected string $name;
+
+    public function __construct(
+        string $value,
+        string $name,
+        bool $negated = false,
+    ) {
+        parent::__construct($value, $negated);
+        $this->name = $name;
+    }
+
+    public function toString(): string
+    {
+        $valueText = ($this->value ? ':' . $this->value : '');
+        $filterBrace = '{' . $this->name .  $valueText . '}';
+        return ($this->negated ? '-' : '') . $filterBrace;
+    }
+
+    public function getKey(): string
+    {
+        return $this->name;
+    }
+
+    public static function fromContentString(string $value, bool $negated = false): self
+    {
+        $explodedFilter = explode(':', $value, 2);
+        $filterValue = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
+        $filterName = $explodedFilter[0];
+        return new self($filterValue, $filterName, $negated);
+    }
+}
diff --git a/app/Search/Options/SearchOption.php b/app/Search/Options/SearchOption.php
new file mode 100644
index 00000000000..483f2123fb1
--- /dev/null
+++ b/app/Search/Options/SearchOption.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\Search\Options;
+
+abstract class SearchOption
+{
+    public function __construct(
+        public string $value,
+        public bool $negated = false,
+    ) {
+    }
+
+    /**
+     * Get the key used for this option when used in a map.
+     * Null indicates to use the index of the containing array.
+     */
+    public function getKey(): string|null
+    {
+        return null;
+    }
+
+    /**
+     * Get the search string representation for this search option.
+     */
+    abstract public function toString(): string;
+}
diff --git a/app/Search/Options/TagSearchOption.php b/app/Search/Options/TagSearchOption.php
new file mode 100644
index 00000000000..e61c55ae48c
--- /dev/null
+++ b/app/Search/Options/TagSearchOption.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BookStack\Search\Options;
+
+class TagSearchOption extends SearchOption
+{
+    public function toString(): string
+    {
+        return ($this->negated ? '-' : '') . "[{$this->value}]";
+    }
+}
diff --git a/app/Search/Options/TermSearchOption.php b/app/Search/Options/TermSearchOption.php
new file mode 100644
index 00000000000..c78829fc87e
--- /dev/null
+++ b/app/Search/Options/TermSearchOption.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BookStack\Search\Options;
+
+class TermSearchOption extends SearchOption
+{
+    public function toString(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/app/Search/SearchOption.php b/app/Search/SearchOption.php
deleted file mode 100644
index 74fc7be3859..00000000000
--- a/app/Search/SearchOption.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace BookStack\Search;
-
-class SearchOption
-{
-    public function __construct(
-        public string $value,
-        public bool $negated = false,
-    ) {
-    }
-}
diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
index a54b1d33a69..467dc9f5ae1 100644
--- a/app/Search/SearchOptionSet.php
+++ b/app/Search/SearchOptionSet.php
@@ -2,12 +2,14 @@
 
 namespace BookStack\Search;
 
+use BookStack\Search\Options\SearchOption;
+
 class SearchOptionSet
 {
     /**
      * @var SearchOption[]
      */
-    public array $options = [];
+    protected array $options = [];
 
     public function __construct(array $options = [])
     {
@@ -22,7 +24,8 @@ public function toValueArray(): array
     public function toValueMap(): array
     {
         $map = [];
-        foreach ($this->options as $key => $option) {
+        foreach ($this->options as $index => $option) {
+            $key = $option->getKey() ?? $index;
             $map[$key] = $option->value;
         }
         return $map;
@@ -35,22 +38,32 @@ public function merge(SearchOptionSet $set): self
 
     public function filterEmpty(): self
     {
-        $filteredOptions = array_filter($this->options, fn (SearchOption $option) => !empty($option->value));
+        $filteredOptions = array_values(array_filter($this->options, fn (SearchOption $option) => !empty($option->value)));
         return new self($filteredOptions);
     }
 
-    public static function fromValueArray(array $values): self
+    /**
+     * @param class-string<SearchOption> $class
+     */
+    public static function fromValueArray(array $values, string $class): self
     {
-        $options = array_map(fn($val) => new SearchOption($val), $values);
+        $options = array_map(fn($val) => new $class($val), $values);
         return new self($options);
     }
 
-    public static function fromMapArray(array $values): self
+    /**
+     * @return SearchOption[]
+     */
+    public function all(): array
     {
-        $options = [];
-        foreach ($values as $key => $value) {
-            $options[$key] = new SearchOption($value);
-        }
-        return new self($options);
+        return $this->options;
+    }
+
+    /**
+     * @return SearchOption[]
+     */
+    public function negated(): array
+    {
+        return array_values(array_filter($this->options, fn (SearchOption $option) => $option->negated));
     }
 }
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index 09981c75dff..98f731ee75f 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -2,6 +2,11 @@
 
 namespace BookStack\Search;
 
+use BookStack\Search\Options\ExactSearchOption;
+use BookStack\Search\Options\FilterSearchOption;
+use BookStack\Search\Options\SearchOption;
+use BookStack\Search\Options\TagSearchOption;
+use BookStack\Search\Options\TermSearchOption;
 use Illuminate\Http\Request;
 
 class SearchOptions
@@ -45,29 +50,38 @@ public static function fromRequest(Request $request): self
         }
 
         $instance = new SearchOptions();
-        $inputs = $request->only(['search', 'types', 'filters', 'exact', 'tags']);
+        $inputs = $request->only(['search', 'types', 'filters', 'exact', 'tags', 'extras']);
 
         $parsedStandardTerms = static::parseStandardTermString($inputs['search'] ?? '');
         $inputExacts = array_filter($inputs['exact'] ?? []);
-        $instance->searches = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['terms']));
-        $instance->exacts = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['exacts']));
-        $instance->exacts = $instance->exacts->merge(SearchOptionSet::fromValueArray($inputExacts));
-        $instance->tags = SearchOptionSet::fromValueArray(array_filter($inputs['tags'] ?? []));
+        $instance->searches = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['terms']), TermSearchOption::class);
+        $instance->exacts = SearchOptionSet::fromValueArray(array_filter($parsedStandardTerms['exacts']), ExactSearchOption::class);
+        $instance->exacts = $instance->exacts->merge(SearchOptionSet::fromValueArray($inputExacts, ExactSearchOption::class));
+        $instance->tags = SearchOptionSet::fromValueArray(array_filter($inputs['tags'] ?? []), TagSearchOption::class);
 
-        $keyedFilters = [];
+        $cleanedFilters = [];
         foreach (($inputs['filters'] ?? []) as $filterKey => $filterVal) {
             if (empty($filterVal)) {
                 continue;
             }
             $cleanedFilterVal = $filterVal === 'true' ? '' : $filterVal;
-            $keyedFilters[$filterKey] = new SearchOption($cleanedFilterVal);
+            $cleanedFilters[] = new FilterSearchOption($cleanedFilterVal, $filterKey);
         }
 
         if (isset($inputs['types']) && count($inputs['types']) < 4) {
-            $keyedFilters['type'] = new SearchOption(implode('|', $inputs['types']));
+            $cleanedFilters[] = new FilterSearchOption(implode('|', $inputs['types']), 'types');
         }
 
-        $instance->filters = new SearchOptionSet($keyedFilters);
+        $instance->filters = new SearchOptionSet($cleanedFilters);
+
+        // Parse and merge in extras if provided
+        if (!empty($inputs['extras'])) {
+            $extras = static::fromString($inputs['extras']);
+            $instance->searches = $instance->searches->merge($extras->searches);
+            $instance->exacts = $instance->exacts->merge($extras->exacts);
+            $instance->tags = $instance->tags->merge($extras->tags);
+            $instance->filters = $instance->filters->merge($extras->filters);
+        }
 
         return $instance;
     }
@@ -77,7 +91,7 @@ public static function fromRequest(Request $request): self
      */
     protected function addOptionsFromString(string $searchString): void
     {
-        /** @var array<string, string[]> $terms */
+        /** @var array<string, SearchOption[]> $terms */
         $terms = [
             'exacts'   => [],
             'tags'     => [],
@@ -85,9 +99,15 @@ protected function addOptionsFromString(string $searchString): void
         ];
 
         $patterns = [
-            'exacts'  => '/"((?:\\\\.|[^"\\\\])*)"/',
-            'tags'    => '/\[(.*?)\]/',
-            'filters' => '/\{(.*?)\}/',
+            'exacts'  => '/-?"((?:\\\\.|[^"\\\\])*)"/',
+            'tags'    => '/-?\[(.*?)\]/',
+            'filters' => '/-?\{(.*?)\}/',
+        ];
+
+        $constructors = [
+            'exacts'   => fn(string $value, bool $negated) => new ExactSearchOption($value, $negated),
+            'tags'     => fn(string $value, bool $negated) => new TagSearchOption($value, $negated),
+            'filters'  => fn(string $value, bool $negated) => FilterSearchOption::fromContentString($value, $negated),
         ];
 
         // Parse special terms
@@ -95,36 +115,32 @@ protected function addOptionsFromString(string $searchString): void
             $matches = [];
             preg_match_all($pattern, $searchString, $matches);
             if (count($matches) > 0) {
-                $terms[$termType] = $matches[1];
+                foreach ($matches[1] as $index => $value) {
+                    $negated = str_starts_with($matches[0][$index], '-');
+                    $terms[$termType][] = $constructors[$termType]($value, $negated);
+                }
                 $searchString = preg_replace($pattern, '', $searchString);
             }
         }
 
         // Unescape exacts and backslash escapes
-        $escapedExacts = array_map(fn(string $term) => static::decodeEscapes($term), $terms['exacts']);
+        foreach ($terms['exacts'] as $exact) {
+            $exact->value = static::decodeEscapes($exact->value);
+        }
 
         // Parse standard terms
         $parsedStandardTerms = static::parseStandardTermString($searchString);
         $this->searches = $this->searches
-            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['terms']))
+            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['terms'], TermSearchOption::class))
             ->filterEmpty();
         $this->exacts = $this->exacts
-            ->merge(SearchOptionSet::fromValueArray($escapedExacts))
-            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['exacts']))
+            ->merge(new SearchOptionSet($terms['exacts']))
+            ->merge(SearchOptionSet::fromValueArray($parsedStandardTerms['exacts'], ExactSearchOption::class))
             ->filterEmpty();
 
-        // Add tags
-        $this->tags = $this->tags->merge(SearchOptionSet::fromValueArray($terms['tags']));
-
-        // Split filter values out
-        /** @var array<string, SearchOption> $splitFilters */
-        $splitFilters = [];
-        foreach ($terms['filters'] as $filter) {
-            $explodedFilter = explode(':', $filter, 2);
-            $filterValue = (count($explodedFilter) > 1) ? $explodedFilter[1] : '';
-            $splitFilters[$explodedFilter[0]] = new SearchOption($filterValue);
-        }
-        $this->filters = $this->filters->merge(new SearchOptionSet($splitFilters));
+        // Add tags & filters
+        $this->tags = $this->tags->merge(new SearchOptionSet($terms['tags']));
+        $this->filters = $this->filters->merge(new SearchOptionSet($terms['filters']));
     }
 
     /**
@@ -185,7 +201,7 @@ protected static function parseStandardTermString(string $termString): array
     public function setFilter(string $filterName, string $filterValue = ''): void
     {
         $this->filters = $this->filters->merge(
-            new SearchOptionSet([$filterName => new SearchOption($filterValue)])
+            new SearchOptionSet([new FilterSearchOption($filterValue, $filterName)])
         );
     }
 
@@ -194,21 +210,14 @@ public function setFilter(string $filterName, string $filterValue = ''): void
      */
     public function toString(): string
     {
-        $parts = $this->searches->toValueArray();
-
-        foreach ($this->exacts->toValueArray() as $term) {
-            $escaped = str_replace('\\', '\\\\', $term);
-            $escaped = str_replace('"', '\"', $escaped);
-            $parts[] = '"' . $escaped . '"';
-        }
-
-        foreach ($this->tags->toValueArray() as $term) {
-            $parts[] = "[{$term}]";
-        }
+        $options = [
+            ...$this->searches->all(),
+            ...$this->exacts->all(),
+            ...$this->tags->all(),
+            ...$this->filters->all(),
+        ];
 
-        foreach ($this->filters->toValueMap() as $filterName => $filterVal) {
-            $parts[] = '{' . $filterName . ($filterVal ? ':' . $filterVal : '') . '}';
-        }
+        $parts = array_map(fn(SearchOption $o) => $o->toString(), $options);
 
         return implode(' ', $parts);
     }
@@ -217,24 +226,24 @@ public function toString(): string
      * Get the search options that don't have UI controls provided for.
      * Provided back as a key => value array with the keys being expected
      * input names for a search form, and values being the option value.
-     *
-     * @return array<string, string>
      */
-    public function getHiddenInputValuesByFieldName(): array
+    public function getAdditionalOptionsString(): string
     {
         $options = [];
 
         // Non-[created/updated]-by-me options
-        $filterMap = $this->filters->toValueMap();
-        foreach (['updated_by', 'created_by', 'owned_by'] as $filter) {
-            $value = $filterMap[$filter] ?? null;
-            if ($value !== null && $value !== 'me') {
-                $options["filters[$filter]"] = $value;
+        $userFilters = ['updated_by', 'created_by', 'owned_by'];
+        foreach ($this->filters->all() as $filter) {
+            if (in_array($filter->getKey(), $userFilters, true) && $filter->value !== null && $filter->value !== 'me') {
+                $options[] = $filter;
             }
         }
 
-        // TODO - Negated
+        // Negated items
+        array_push($options, ...$this->exacts->negated());
+        array_push($options, ...$this->tags->negated());
+        array_push($options, ...$this->filters->negated());
 
-        return $options;
+        return implode(' ', array_map(fn(SearchOption $o) => $o->toString(), $options));
     }
 }
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index aa7ae0aff81..2a0d63a6ed6 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -25,8 +25,8 @@
                             @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('page', $types), 'entity' => 'page', 'transKey' => 'page'])
                             @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('chapter', $types), 'entity' => 'chapter', 'transKey' => 'chapter'])
                             <br>
-                                @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('book', $types), 'entity' => 'book', 'transKey' => 'book'])
-                                @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('bookshelf', $types), 'entity' => 'bookshelf', 'transKey' => 'shelf'])
+                            @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('book', $types), 'entity' => 'book', 'transKey' => 'book'])
+                            @include('search.parts.type-filter', ['checked' => !$hasTypes || in_array('bookshelf', $types), 'entity' => 'bookshelf', 'transKey' => 'shelf'])
                         </div>
 
                         <h6>{{ trans('entities.search_exact_matches') }}</h6>
@@ -64,10 +64,7 @@
                         @include('search.parts.date-filter', ['name' => 'created_after', 'filters' => $filterMap])
                         @include('search.parts.date-filter', ['name' => 'created_before', 'filters' => $filterMap])
 
-                        @foreach($options->getHiddenInputValuesByFieldName() as $fieldName => $value)
-                            <input type="hidden" name="{{ $fieldName }}" value="{{ $value }}">
-                        @endforeach
-
+                        <input type="hidden" name="extras" value="{{ $options->getAdditionalOptionsString() }}">
                         <button type="submit" class="button">{{ trans('entities.search_update') }}</button>
                     </form>
 
@@ -77,8 +74,9 @@
                 <div class="card content-wrap">
                     <h1 class="list-heading">{{ trans('entities.search_results') }}</h1>
 
-                    <form action="{{ url('/search') }}" method="GET"  class="search-box flexible hide-over-l">
-                        <input value="{{$searchTerm}}" type="text" name="term" placeholder="{{ trans('common.search') }}">
+                    <form action="{{ url('/search') }}" method="GET" class="search-box flexible hide-over-l">
+                        <input value="{{$searchTerm}}" type="text" name="term"
+                               placeholder="{{ trans('common.search') }}">
                         <button type="submit"
                                 aria-label="{{ trans('common.search') }}"
                                 tabindex="-1">@icon('search')</button>
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 4b032bfc331..c3e9593453f 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -545,11 +545,10 @@ public function test_backslashes_can_be_searched_upon()
         $search->assertSee($page->getUrl(), false);
     }
 
-    public function test_searches_with_user_filters_adds_them_into_advanced_search_form()
+    public function test_searches_with_terms_without_controls_includes_them_in_extras()
     {
-        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:dan} {created_by:dan}'));
-        $this->withHtml($resp)->assertElementExists('form input[name="filters[updated_by]"][value="dan"]');
-        $this->withHtml($resp)->assertElementExists('form input[name="filters[created_by]"][value="dan"]');
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:dan} {created_by:dan} -{viewed_by_me} -[a=b] -"dog"'));
+        $this->withHtml($resp)->assertFieldHasValue('extras', '{updated_by:dan} {created_by:dan} -"dog" -[a=b] -{viewed_by_me}');
     }
 
     public function test_searches_with_user_filters_using_me_adds_them_into_advanced_search_form()
diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Entity/SearchOptionsTest.php
index 7ab150e914b..543badcef95 100644
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Entity/SearchOptionsTest.php
@@ -2,6 +2,10 @@
 
 namespace Tests\Entity;
 
+use BookStack\Search\Options\ExactSearchOption;
+use BookStack\Search\Options\FilterSearchOption;
+use BookStack\Search\Options\TagSearchOption;
+use BookStack\Search\Options\TermSearchOption;
 use BookStack\Search\SearchOptions;
 use BookStack\Search\SearchOptionSet;
 use Illuminate\Http\Request;
@@ -19,6 +23,16 @@ public function test_from_string_parses_a_search_string_properly()
         $this->assertEquals(['is_tree' => ''], $options->filters->toValueMap());
     }
 
+    public function test_from_string_parses_negations()
+    {
+        $options = SearchOptions::fromString('cat -"dog" -[tag=good] -{is_tree}');
+
+        $this->assertEquals(['cat'], $options->searches->toValueArray());
+        $this->assertTrue($options->exacts->all()[0]->negated);
+        $this->assertTrue($options->tags->all()[0]->negated);
+        $this->assertTrue($options->filters->all()[0]->negated);
+    }
+
     public function test_from_string_properly_parses_escaped_quotes()
     {
         $options = SearchOptions::fromString('"\"cat\"" surprise "\"\"" "\"donkey" "\"" "\\\\"');
@@ -28,12 +42,32 @@ public function test_from_string_properly_parses_escaped_quotes()
 
     public function test_to_string_includes_all_items_in_the_correct_format()
     {
-        $expected = 'cat "dog" [tag=good] {is_tree}';
+        $expected = 'cat "dog" [tag=good] {is_tree} {beans:valid}';
         $options = new SearchOptions();
-        $options->searches = SearchOptionSet::fromValueArray(['cat']);
-        $options->exacts = SearchOptionSet::fromValueArray(['dog']);
-        $options->tags = SearchOptionSet::fromValueArray(['tag=good']);
-        $options->filters = SearchOptionSet::fromMapArray(['is_tree' => '']);
+        $options->searches = SearchOptionSet::fromValueArray(['cat'], TermSearchOption::class);
+        $options->exacts = SearchOptionSet::fromValueArray(['dog'], ExactSearchOption::class);
+        $options->tags = SearchOptionSet::fromValueArray(['tag=good'], TagSearchOption::class);
+        $options->filters = new SearchOptionSet([
+            new FilterSearchOption('', 'is_tree'),
+            new FilterSearchOption('valid', 'beans'),
+        ]);
+
+        $output = $options->toString();
+        foreach (explode(' ', $expected) as $term) {
+            $this->assertStringContainsString($term, $output);
+        }
+    }
+
+    public function test_to_string_handles_negations_as_expected()
+    {
+        $expected = 'cat -"dog" -[tag=good] -{is_tree}';
+        $options = new SearchOptions();
+        $options->searches = new SearchOptionSet([new TermSearchOption('cat')]);
+        $options->exacts = new SearchOptionSet([new ExactSearchOption('dog', true)]);
+        $options->tags = new SearchOptionSet([new TagSearchOption('tag=good', true)]);
+        $options->filters = new SearchOptionSet([
+            new FilterSearchOption('', 'is_tree', true),
+        ]);
 
         $output = $options->toString();
         foreach (explode(' ', $expected) as $term) {
@@ -44,7 +78,7 @@ public function test_to_string_includes_all_items_in_the_correct_format()
     public function test_to_string_escapes_as_expected()
     {
         $options = new SearchOptions();
-        $options->exacts = SearchOptionSet::fromValueArray(['"cat"', '""', '"donkey', '"', '\\', '\\"']);
+        $options->exacts = SearchOptionSet::fromValueArray(['"cat"', '""', '"donkey', '"', '\\', '\\"'], ExactSearchOption::class);
 
         $output = $options->toString();
         $this->assertEquals('"\"cat\"" "\"\"" "\"donkey" "\"" "\\\\" "\\\\\""', $output);
@@ -78,4 +112,21 @@ public function test_from_request_properly_parses_exacts_from_search_terms()
         $this->assertEquals(["biscuits"], $options->searches->toValueArray());
         $this->assertEquals(['"cheese"', '""', '"baked',  'beans"'], $options->exacts->toValueArray());
     }
+
+    public function test_from_request_properly_parses_out_extras_as_string()
+    {
+        $request = new Request([
+            'search' => '',
+            'tags' => ['a=b'],
+            'extras' => '-[b=c] -{viewed_by_me} -"dino"'
+        ]);
+
+        $options = SearchOptions::fromRequest($request);
+        $this->assertCount(2, $options->tags->all());
+        $this->assertEquals('b=c', $options->tags->negated()[0]->value);
+        $this->assertEquals('viewed_by_me', $options->filters->all()[0]->getKey());
+        $this->assertTrue($options->filters->all()[0]->negated);
+        $this->assertEquals('dino', $options->exacts->all()[0]->value);
+        $this->assertTrue($options->exacts->all()[0]->negated);
+    }
 }

From cd84d08157255dd2464a6dcc257355ffeca21c96 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 3 Oct 2024 19:27:03 +0100
Subject: [PATCH 301/666] Search: Added exact/filter/tag term negation support

---
 app/Search/Options/TagSearchOption.php |  26 ++++
 app/Search/SearchOptionSet.php         |   9 +-
 app/Search/SearchOptions.php           |   4 +
 app/Search/SearchRunner.php            | 203 +++++++++++--------------
 tests/Entity/EntitySearchTest.php      |  26 ++++
 5 files changed, 153 insertions(+), 115 deletions(-)

diff --git a/app/Search/Options/TagSearchOption.php b/app/Search/Options/TagSearchOption.php
index e61c55ae48c..dd2803db4f6 100644
--- a/app/Search/Options/TagSearchOption.php
+++ b/app/Search/Options/TagSearchOption.php
@@ -4,8 +4,34 @@
 
 class TagSearchOption extends SearchOption
 {
+    /**
+     * Acceptable operators to be used within a tag search option.
+     *
+     * @var string[]
+     */
+    protected array $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
+
     public function toString(): string
     {
         return ($this->negated ? '-' : '') . "[{$this->value}]";
     }
+
+    /**
+     * @return array{name: string, operator: string, value: string}
+     */
+    public function getParts(): array
+    {
+        $operatorRegex = implode('|', array_map(fn($op) => preg_quote($op), $this->queryOperators));
+        preg_match('/^(.*?)((' . $operatorRegex . ')(.*?))?$/', $this->value, $tagSplit);
+
+        $extractedOperator = count($tagSplit) > 2 ? $tagSplit[3] : '';
+        $tagOperator = in_array($extractedOperator, $this->queryOperators) ? $extractedOperator : '=';
+        $tagValue = count($tagSplit) > 3 ? $tagSplit[4] : '';
+
+        return [
+            'name' => $tagSplit[1],
+            'operator' => $tagOperator,
+            'value' => $tagValue,
+        ];
+    }
 }
diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
index 467dc9f5ae1..f421abe2c05 100644
--- a/app/Search/SearchOptionSet.php
+++ b/app/Search/SearchOptionSet.php
@@ -4,10 +4,13 @@
 
 use BookStack\Search\Options\SearchOption;
 
+/**
+ * @template T of SearchOption
+ */
 class SearchOptionSet
 {
     /**
-     * @var SearchOption[]
+     * @var T[]
      */
     protected array $options = [];
 
@@ -52,7 +55,7 @@ public static function fromValueArray(array $values, string $class): self
     }
 
     /**
-     * @return SearchOption[]
+     * @return T[]
      */
     public function all(): array
     {
@@ -60,7 +63,7 @@ public function all(): array
     }
 
     /**
-     * @return SearchOption[]
+     * @return T[]
      */
     public function negated(): array
     {
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index 98f731ee75f..e362a8a015f 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -11,9 +11,13 @@
 
 class SearchOptions
 {
+    /** @var SearchOptionSet<TermSearchOption> */
     public SearchOptionSet $searches;
+    /** @var SearchOptionSet<ExactSearchOption> */
     public SearchOptionSet $exacts;
+    /** @var SearchOptionSet<TagSearchOption> */
     public SearchOptionSet $tags;
+    /** @var SearchOptionSet<FilterSearchOption> */
     public SearchOptionSet $filters;
 
     public function __construct()
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 855140508f8..265b9eecc02 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Permissions\PermissionApplicator;
+use BookStack\Search\Options\TagSearchOption;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -16,31 +17,21 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
-use SplObjectStorage;
+use WeakMap;
 
 class SearchRunner
 {
-    /**
-     * Acceptable operators to be used in a query.
-     *
-     * @var string[]
-     */
-    protected array $queryOperators = ['<=', '>=', '=', '<', '>', 'like', '!='];
-
     /**
      * Retain a cache of score adjusted terms for specific search options.
-     * From PHP>=8 this can be made into a WeakMap instead.
-     *
-     * @var SplObjectStorage
      */
-    protected $termAdjustmentCache;
+    protected WeakMap $termAdjustmentCache;
 
     public function __construct(
         protected EntityProvider $entityProvider,
         protected PermissionApplicator $permissions,
         protected EntityQueries $entityQueries,
     ) {
-        $this->termAdjustmentCache = new SplObjectStorage();
+        $this->termAdjustmentCache = new WeakMap();
     }
 
     /**
@@ -163,24 +154,26 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
         $this->applyTermSearch($entityQuery, $searchOpts, $entityType);
 
         // Handle exact term matching
-        foreach ($searchOpts->exacts->toValueArray() as $inputTerm) {
-            $entityQuery->where(function (EloquentBuilder $query) use ($inputTerm, $entityModelInstance) {
-                $inputTerm = str_replace('\\', '\\\\', $inputTerm);
+        foreach ($searchOpts->exacts->all() as $exact) {
+            $filter = function (EloquentBuilder $query) use ($exact, $entityModelInstance) {
+                $inputTerm = str_replace('\\', '\\\\', $exact->value);
                 $query->where('name', 'like', '%' . $inputTerm . '%')
                     ->orWhere($entityModelInstance->textField, 'like', '%' . $inputTerm . '%');
-            });
+            };
+
+            $exact->negated ? $entityQuery->whereNot($filter) : $entityQuery->where($filter);
         }
 
         // Handle tag searches
-        foreach ($searchOpts->tags->toValueArray() as $inputTerm) {
-            $this->applyTagSearch($entityQuery, $inputTerm);
+        foreach ($searchOpts->tags->all() as $tagOption) {
+            $this->applyTagSearch($entityQuery, $tagOption);
         }
 
         // Handle filters
-        foreach ($searchOpts->filters->toValueMap() as $filterTerm => $filterValue) {
-            $functionName = Str::camel('filter_' . $filterTerm);
+        foreach ($searchOpts->filters->all() as $filterOption) {
+            $functionName = Str::camel('filter_' . $filterOption->getKey());
             if (method_exists($this, $functionName)) {
-                $this->$functionName($entityQuery, $entityModelInstance, $filterValue);
+                $this->$functionName($entityQuery, $entityModelInstance, $filterOption->value, $filterOption->negated);
             }
         }
 
@@ -312,179 +305,165 @@ protected function rawTermCountsToAdjustments(array $termCounts): array
     }
 
     /**
-     * Get the available query operators as a regex escaped list.
+     * Apply a tag search term onto an entity query.
      */
-    protected function getRegexEscapedOperators(): string
+    protected function applyTagSearch(EloquentBuilder $query, TagSearchOption $option): void
     {
-        $escapedOperators = [];
-        foreach ($this->queryOperators as $operator) {
-            $escapedOperators[] = preg_quote($operator);
-        }
+        $filter = function (EloquentBuilder $query) use ($option): void {
+            $tagParts = $option->getParts();
+            if (empty($tagParts['operator']) || empty($tagParts['value'])) {
+                $query->where('name', '=', $tagParts['name']);
+                return;
+            }
 
-        return implode('|', $escapedOperators);
-    }
+            if (!empty($tagParts['name'])) {
+                $query->where('name', '=', $tagParts['name']);
+            }
 
-    /**
-     * Apply a tag search term onto a entity query.
-     */
-    protected function applyTagSearch(EloquentBuilder $query, string $tagTerm): EloquentBuilder
-    {
-        preg_match('/^(.*?)((' . $this->getRegexEscapedOperators() . ')(.*?))?$/', $tagTerm, $tagSplit);
-        $query->whereHas('tags', function (EloquentBuilder $query) use ($tagSplit) {
-            $tagName = $tagSplit[1];
-            $tagOperator = count($tagSplit) > 2 ? $tagSplit[3] : '';
-            $tagValue = count($tagSplit) > 3 ? $tagSplit[4] : '';
-            $validOperator = in_array($tagOperator, $this->queryOperators);
-            if (!empty($tagOperator) && !empty($tagValue) && $validOperator) {
-                if (!empty($tagName)) {
-                    $query->where('name', '=', $tagName);
-                }
-                if (is_numeric($tagValue) && $tagOperator !== 'like') {
-                    // We have to do a raw sql query for this since otherwise PDO will quote the value and MySQL will
-                    // search the value as a string which prevents being able to do number-based operations
-                    // on the tag values. We ensure it has a numeric value and then cast it just to be sure.
-                    /** @var Connection $connection */
-                    $connection = $query->getConnection();
-                    $tagValue = (float) trim($connection->getPdo()->quote($tagValue), "'");
-                    $query->whereRaw("value {$tagOperator} {$tagValue}");
-                } else {
-                    if ($tagOperator === 'like') {
-                        $tagValue = str_replace('\\', '\\\\', $tagValue);
-                    }
-                    $query->where('value', $tagOperator, $tagValue);
-                }
+            if (is_numeric($tagParts['value']) && $tagParts['operator'] !== 'like') {
+                // We have to do a raw sql query for this since otherwise PDO will quote the value and MySQL will
+                // search the value as a string which prevents being able to do number-based operations
+                // on the tag values. We ensure it has a numeric value and then cast it just to be sure.
+                /** @var Connection $connection */
+                $connection = $query->getConnection();
+                $quotedValue = (float) trim($connection->getPdo()->quote($tagParts['value']), "'");
+                $query->whereRaw("value {$tagParts['operator']} {$quotedValue}");
+            } else if ($tagParts['operator'] === 'like') {
+                $query->where('value', $tagParts['operator'], str_replace('\\', '\\\\', $tagParts['value']));
             } else {
-                $query->where('name', '=', $tagName);
+                $query->where('value', $tagParts['operator'], $tagParts['value']);
             }
-        });
+        };
 
-        return $query;
+        $option->negated ? $query->whereDoesntHave('tags', $filter) : $query->whereHas('tags', $filter);
+    }
+
+    protected function applyNegatableWhere(EloquentBuilder $query, bool $negated, string $column, string $operator, mixed $value): void
+    {
+        if ($negated) {
+            $query->whereNot($column, $operator, $value);
+        } else {
+            $query->where($column, $operator, $value);
+        }
     }
 
     /**
      * Custom entity search filters.
      */
-    protected function filterUpdatedAfter(EloquentBuilder $query, Entity $model, $input): void
+    protected function filterUpdatedAfter(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
     {
-        try {
-            $date = date_create($input);
-            $query->where('updated_at', '>=', $date);
-        } catch (\Exception $e) {
-        }
+        $date = date_create($input);
+        $this->applyNegatableWhere($query, $negated, 'updated_at', '>=', $date);
     }
 
-    protected function filterUpdatedBefore(EloquentBuilder $query, Entity $model, $input): void
+    protected function filterUpdatedBefore(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
     {
-        try {
-            $date = date_create($input);
-            $query->where('updated_at', '<', $date);
-        } catch (\Exception $e) {
-        }
+        $date = date_create($input);
+        $this->applyNegatableWhere($query, $negated, 'updated_at', '<', $date);
     }
 
-    protected function filterCreatedAfter(EloquentBuilder $query, Entity $model, $input): void
+    protected function filterCreatedAfter(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
     {
-        try {
-            $date = date_create($input);
-            $query->where('created_at', '>=', $date);
-        } catch (\Exception $e) {
-        }
+        $date = date_create($input);
+        $this->applyNegatableWhere($query, $negated, 'created_at', '>=', $date);
     }
 
-    protected function filterCreatedBefore(EloquentBuilder $query, Entity $model, $input)
+    protected function filterCreatedBefore(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        try {
-            $date = date_create($input);
-            $query->where('created_at', '<', $date);
-        } catch (\Exception $e) {
-        }
+        $date = date_create($input);
+        $this->applyNegatableWhere($query, $negated, 'created_at', '<', $date);
     }
 
-    protected function filterCreatedBy(EloquentBuilder $query, Entity $model, $input)
+    protected function filterCreatedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
         if ($user) {
-            $query->where('created_by', '=', $user->id);
+            $this->applyNegatableWhere($query, $negated, 'created_by', '=', $user->id);
         }
     }
 
-    protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, $input)
+    protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
         if ($user) {
-            $query->where('updated_by', '=', $user->id);
+            $this->applyNegatableWhere($query, $negated, 'updated_by', '=', $user->id);
         }
     }
 
-    protected function filterOwnedBy(EloquentBuilder $query, Entity $model, $input)
+    protected function filterOwnedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
         if ($user) {
-            $query->where('owned_by', '=', $user->id);
+            $this->applyNegatableWhere($query, $negated, 'owned_by', '=', $user->id);
         }
     }
 
-    protected function filterInName(EloquentBuilder $query, Entity $model, $input)
+    protected function filterInName(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $query->where('name', 'like', '%' . $input . '%');
+        $this->applyNegatableWhere($query, $negated, 'name', 'like', '%' . $input . '%');
     }
 
-    protected function filterInTitle(EloquentBuilder $query, Entity $model, $input)
+    protected function filterInTitle(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $this->filterInName($query, $model, $input);
+        $this->filterInName($query, $model, $input, $negated);
     }
 
-    protected function filterInBody(EloquentBuilder $query, Entity $model, $input)
+    protected function filterInBody(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $query->where($model->textField, 'like', '%' . $input . '%');
+        $this->applyNegatableWhere($query, $negated, $model->textField, 'like', '%' . $input . '%');
     }
 
-    protected function filterIsRestricted(EloquentBuilder $query, Entity $model, $input)
+    protected function filterIsRestricted(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $query->whereHas('permissions');
+        $negated ? $query->whereDoesntHave('permissions') : $query->whereHas('permissions');
     }
 
-    protected function filterViewedByMe(EloquentBuilder $query, Entity $model, $input)
+    protected function filterViewedByMe(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $query->whereHas('views', function ($query) {
+        $filter = function ($query) {
             $query->where('user_id', '=', user()->id);
-        });
+        };
+
+        $negated ? $query->whereDoesntHave('views', $filter) : $query->whereHas('views', $filter);
     }
 
-    protected function filterNotViewedByMe(EloquentBuilder $query, Entity $model, $input)
+    protected function filterNotViewedByMe(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
-        $query->whereDoesntHave('views', function ($query) {
+        $filter = function ($query) {
             $query->where('user_id', '=', user()->id);
-        });
+        };
+
+        $negated ? $query->whereHas('views', $filter) : $query->whereDoesntHave('views', $filter);
     }
 
-    protected function filterIsTemplate(EloquentBuilder $query, Entity $model, $input)
+    protected function filterIsTemplate(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
         if ($model instanceof Page) {
-            $query->where('template', '=', true);
+            $this->applyNegatableWhere($query, $negated, 'template', '=', true);
         }
     }
 
-    protected function filterSortBy(EloquentBuilder $query, Entity $model, $input)
+    protected function filterSortBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
     {
         $functionName = Str::camel('sort_by_' . $input);
         if (method_exists($this, $functionName)) {
-            $this->$functionName($query, $model);
+            $this->$functionName($query, $model, $negated);
         }
     }
 
     /**
      * Sorting filter options.
      */
-    protected function sortByLastCommented(EloquentBuilder $query, Entity $model)
+    protected function sortByLastCommented(EloquentBuilder $query, Entity $model, bool $negated)
     {
         $commentsTable = DB::getTablePrefix() . 'comments';
         $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
         $commentQuery = DB::raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \'' . $morphClass . '\' AND c2.created_at IS NULL) as comments');
 
-        $query->join($commentQuery, $model->getTable() . '.id', '=', 'comments.entity_id')->orderBy('last_commented', 'desc');
+        $query->join($commentQuery, $model->getTable() . '.id', '=', 'comments.entity_id')
+            ->orderBy('last_commented', $negated ? 'asc' : 'desc');
     }
 }
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index c3e9593453f..bb1021a6791 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -118,6 +118,32 @@ public function test_exact_searches()
         $exactSearchB->assertStatus(200)->assertDontSee($page->name);
     }
 
+    public function test_negated_searches()
+    {
+        $page = $this->entities->newPage(['name' => 'My new test negation page', 'html' => '<p>An angry tortoise wore trumpeted plimsoles</p>']);
+        $page->tags()->saveMany([new Tag(['name' => 'DonkCount', 'value' => '500'])]);
+        $page->created_by = $this->users->admin()->id;
+        $page->save();
+
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $exactSearch = $this->get('/search?term=' . urlencode('negation -"tortoise"'));
+        $exactSearch->assertStatus(200)->assertDontSeeText($page->name);
+
+        $tagSearchA = $this->get('/search?term=' . urlencode('negation [DonkCount=500]'));
+        $tagSearchA->assertStatus(200)->assertSeeText($page->name);
+        $tagSearchB = $this->get('/search?term=' . urlencode('negation -[DonkCount=500]'));
+        $tagSearchB->assertStatus(200)->assertDontSeeText($page->name);
+
+        $filterSearchA = $this->get('/search?term=' . urlencode('negation -{created_by:me}'));
+        $filterSearchA->assertStatus(200)->assertSeeText($page->name);
+        $page->created_by = $editor->id;
+        $page->save();
+        $filterSearchB = $this->get('/search?term=' . urlencode('negation -{created_by:me}'));
+        $filterSearchB->assertStatus(200)->assertDontSeeText($page->name);
+    }
+
     public function test_search_terms_with_delimiters_are_converted_to_exact_matches()
     {
         $this->asEditor();

From 966ff9138632a47966c217089f0534ecf262d829 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 3 Oct 2024 19:38:07 +0100
Subject: [PATCH 302/666] Search: Prevented negated terms filling in UI inputs

Added test to cover.
---
 app/Search/SearchOptionSet.php       | 16 +++++++++++++---
 app/Search/SearchOptions.php         |  6 +++---
 resources/views/search/all.blade.php |  6 +++---
 tests/Entity/EntitySearchTest.php    |  8 ++++++++
 tests/Entity/SearchOptionsTest.php   |  2 +-
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
index f421abe2c05..bd5e5a5b222 100644
--- a/app/Search/SearchOptionSet.php
+++ b/app/Search/SearchOptionSet.php
@@ -63,10 +63,20 @@ public function all(): array
     }
 
     /**
-     * @return T[]
+     * @return self<T>
+     */
+    public function negated(): self
+    {
+        $values = array_values(array_filter($this->options, fn (SearchOption $option) => $option->negated));
+        return new self($values);
+    }
+
+    /**
+     * @return self<T>
      */
-    public function negated(): array
+    public function nonNegated(): self
     {
-        return array_values(array_filter($this->options, fn (SearchOption $option) => $option->negated));
+        $values = array_values(array_filter($this->options, fn (SearchOption $option) => !$option->negated));
+        return new self($values);
     }
 }
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index e362a8a015f..7f9db2a6430 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -244,9 +244,9 @@ public function getAdditionalOptionsString(): string
         }
 
         // Negated items
-        array_push($options, ...$this->exacts->negated());
-        array_push($options, ...$this->tags->negated());
-        array_push($options, ...$this->filters->negated());
+        array_push($options, ...$this->exacts->negated()->all());
+        array_push($options, ...$this->tags->negated()->all());
+        array_push($options, ...$this->filters->negated()->all());
 
         return implode(' ', array_map(fn(SearchOption $o) => $o->toString(), $options));
     }
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 2a0d63a6ed6..ad437604b1c 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -9,7 +9,7 @@
                     <h5>{{ trans('entities.search_advanced') }}</h5>
 
                     @php
-                        $filterMap = $options->filters->toValueMap();
+                        $filterMap = $options->filters->nonNegated()->toValueMap();
                     @endphp
                     <form method="get" action="{{ url('/search') }}">
                         <h6>{{ trans('entities.search_terms') }}</h6>
@@ -30,10 +30,10 @@
                         </div>
 
                         <h6>{{ trans('entities.search_exact_matches') }}</h6>
-                        @include('search.parts.term-list', ['type' => 'exact', 'currentList' => $options->exacts->toValueArray()])
+                        @include('search.parts.term-list', ['type' => 'exact', 'currentList' => $options->exacts->nonNegated()->toValueArray()])
 
                         <h6>{{ trans('entities.search_tags') }}</h6>
-                        @include('search.parts.term-list', ['type' => 'tags', 'currentList' => $options->tags->toValueArray()])
+                        @include('search.parts.term-list', ['type' => 'tags', 'currentList' => $options->tags->nonNegated()->toValueArray()])
 
                         @if(!user()->isGuest())
                             <h6>{{ trans('entities.search_options') }}</h6>
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index bb1021a6791..3a1a0a66200 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -577,6 +577,14 @@ public function test_searches_with_terms_without_controls_includes_them_in_extra
         $this->withHtml($resp)->assertFieldHasValue('extras', '{updated_by:dan} {created_by:dan} -"dog" -[a=b] -{viewed_by_me}');
     }
 
+    public function test_negated_searches_dont_show_in_inputs()
+    {
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('-{created_by:me} -[a=b] -"dog"'));
+        $this->withHtml($resp)->assertElementNotExists('input[name="tags[]"][value="a=b"]');
+        $this->withHtml($resp)->assertElementNotExists('input[name="exact[]"][value="dog"]');
+        $this->withHtml($resp)->assertElementNotExists('input[name="filters[created_by]"][value="me"][checked="checked"]');
+    }
+
     public function test_searches_with_user_filters_using_me_adds_them_into_advanced_search_form()
     {
         $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:me} {created_by:me}'));
diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Entity/SearchOptionsTest.php
index 543badcef95..ae0f1e56a9e 100644
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Entity/SearchOptionsTest.php
@@ -123,7 +123,7 @@ public function test_from_request_properly_parses_out_extras_as_string()
 
         $options = SearchOptions::fromRequest($request);
         $this->assertCount(2, $options->tags->all());
-        $this->assertEquals('b=c', $options->tags->negated()[0]->value);
+        $this->assertEquals('b=c', $options->tags->negated()->all()[0]->value);
         $this->assertEquals('viewed_by_me', $options->filters->all()[0]->getKey());
         $this->assertTrue($options->filters->all()[0]->negated);
         $this->assertEquals('dino', $options->exacts->all()[0]->value);

From b1a3ea1aa4bfb0d9d20470858e0f41fcb73a85e1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Oct 2024 10:59:34 +0100
Subject: [PATCH 303/666] Languages: Enabled Welsh option

---
 lang/en/settings.php   | 1 +
 tests/LanguageTest.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lang/en/settings.php b/lang/en/settings.php
index f4c84092c6f..5427cb9419e 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index 6b6856184c9..abe06407e1e 100644
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -35,7 +35,8 @@ public function do_test_locales_all_have_language_dropdown_entry()
         $diffs = array_diff($this->langs, $dropdownLocales);
         if (count($diffs) > 0) {
             $diffText = implode(',', $diffs);
-            $this->addWarning("Languages: {$diffText} found in files but not in language select dropdown.");
+            $warning = "Languages: {$diffText} found in files but not in language select dropdown.";
+            $this->fail($warning);
         }
         $this->assertTrue(true);
     }

From be6529d0a14eeb191da76d2ca019a0b5cb7f546f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Oct 2024 12:41:13 +0100
Subject: [PATCH 304/666] New WYSIWYG: Added mac shortcut support

---
 resources/js/wysiwyg/services/shortcuts.ts | 66 ++++++++++++++--------
 resources/js/wysiwyg/todo.md               |  2 +-
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
index b17ec1bf7a8..05bdb5dccd3 100644
--- a/resources/js/wysiwyg/services/shortcuts.ts
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -32,39 +32,43 @@ function toggleInlineCode(editor: LexicalEditor): boolean {
 
 type ShortcutAction = (editor: LexicalEditor, context: EditorUiContext) => boolean;
 
+/**
+ * List of action functions by their shortcut combo.
+ * We use "meta" as an abstraction for ctrl/cmd depending on platform.
+ */
 const actionsByKeys: Record<string, ShortcutAction> = {
-    'ctrl+s': () => {
+    'meta+s': () => {
         window.$events.emit('editor-save-draft');
         return true;
     },
-    'ctrl+enter': () => {
+    'meta+enter': () => {
         window.$events.emit('editor-save-page');
         return true;
     },
-    'ctrl+1': (editor) => headerHandler(editor, 'h1'),
-    'ctrl+2': (editor) => headerHandler(editor, 'h2'),
-    'ctrl+3': (editor) => headerHandler(editor, 'h3'),
-    'ctrl+4': (editor) => headerHandler(editor, 'h4'),
-    'ctrl+5': wrapFormatAction(toggleSelectionAsParagraph),
-    'ctrl+d': wrapFormatAction(toggleSelectionAsParagraph),
-    'ctrl+6': wrapFormatAction(toggleSelectionAsBlockquote),
-    'ctrl+q': wrapFormatAction(toggleSelectionAsBlockquote),
-    'ctrl+7': wrapFormatAction(formatCodeBlock),
-    'ctrl+e': wrapFormatAction(formatCodeBlock),
-    'ctrl+8': toggleInlineCode,
-    'ctrl+shift+e': toggleInlineCode,
-    'ctrl+9': wrapFormatAction(cycleSelectionCalloutFormats),
+    'meta+1': (editor) => headerHandler(editor, 'h1'),
+    'meta+2': (editor) => headerHandler(editor, 'h2'),
+    'meta+3': (editor) => headerHandler(editor, 'h3'),
+    'meta+4': (editor) => headerHandler(editor, 'h4'),
+    'meta+5': wrapFormatAction(toggleSelectionAsParagraph),
+    'meta+d': wrapFormatAction(toggleSelectionAsParagraph),
+    'meta+6': wrapFormatAction(toggleSelectionAsBlockquote),
+    'meta+q': wrapFormatAction(toggleSelectionAsBlockquote),
+    'meta+7': wrapFormatAction(formatCodeBlock),
+    'meta+e': wrapFormatAction(formatCodeBlock),
+    'meta+8': toggleInlineCode,
+    'meta+shift+e': toggleInlineCode,
+    'meta+9': wrapFormatAction(cycleSelectionCalloutFormats),
 
-    'ctrl+o': wrapFormatAction((e) => toggleSelectionAsList(e, 'number')),
-    'ctrl+p': wrapFormatAction((e) => toggleSelectionAsList(e, 'bullet')),
-    'ctrl+k': (editor, context) => {
+    'meta+o': wrapFormatAction((e) => toggleSelectionAsList(e, 'number')),
+    'meta+p': wrapFormatAction((e) => toggleSelectionAsList(e, 'bullet')),
+    'meta+k': (editor, context) => {
         editor.getEditorState().read(() => {
             const selectedLink = $getNodeFromSelection($getSelection(), $isLinkNode) as LinkNode | null;
             $showLinkForm(selectedLink, context);
         });
         return true;
     },
-    'ctrl+shift+k': (editor, context) => {
+    'meta+shift+k': (editor, context) => {
         showLinkSelector(entity => {
             insertOrUpdateLink(editor, {
                 text: entity.name,
@@ -79,8 +83,7 @@ const actionsByKeys: Record<string, ShortcutAction> = {
 
 function createKeyDownListener(context: EditorUiContext): (e: KeyboardEvent) => void {
     return (event: KeyboardEvent) => {
-        // TODO - Mac Cmd support
-        const combo = `${event.ctrlKey ? 'ctrl+' : ''}${event.shiftKey ? 'shift+' : ''}${event.key}`.toLowerCase();
+        const combo = keyboardEventToKeyComboString(event);
         // console.log(`pressed: ${combo}`);
         if (actionsByKeys[combo]) {
             const handled = actionsByKeys[combo](context.editor, context);
@@ -92,10 +95,29 @@ function createKeyDownListener(context: EditorUiContext): (e: KeyboardEvent) =>
     };
 }
 
+function keyboardEventToKeyComboString(event: KeyboardEvent): string {
+    const metaKeyPressed = isMac() ? event.metaKey : event.ctrlKey;
+
+    const parts = [
+        metaKeyPressed ? 'meta' : '',
+        event.shiftKey ? 'shift' : '',
+        event.key,
+    ];
+
+    return parts.filter(Boolean).join('+').toLowerCase();
+}
+
+function isMac(): boolean {
+    return window.navigator.userAgent.includes('Mac OS X');
+}
+
 function overrideDefaultCommands(editor: LexicalEditor) {
     // Prevent default ctrl+enter command
     editor.registerCommand(KEY_ENTER_COMMAND, (event) => {
-        return event?.ctrlKey ? true : false
+        if (isMac()) {
+            return event?.metaKey || false;
+        }
+        return event?.ctrlKey || false;
     }, COMMAND_PRIORITY_HIGH);
 }
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index bcd4851e805..d2213f76239 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -6,7 +6,7 @@
 
 ## Main Todo
 
-- Mac: Shortcut support via command.
+//
 
 ## Secondary Todo
 

From 2766c76491be9d004a2cbd8caa00cfb4d4c36320 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Oct 2024 12:46:22 +0100
Subject: [PATCH 305/666] TinyMCE: Updated version from 6.8.3 to 6.8.4

---
 public/libs/tinymce/models/dom/model.min.js              | 2 +-
 public/libs/tinymce/plugins/advlist/plugin.min.js        | 2 +-
 public/libs/tinymce/plugins/anchor/plugin.min.js         | 2 +-
 public/libs/tinymce/plugins/autolink/plugin.min.js       | 2 +-
 public/libs/tinymce/plugins/autoresize/plugin.min.js     | 2 +-
 public/libs/tinymce/plugins/autosave/plugin.min.js       | 2 +-
 public/libs/tinymce/plugins/charmap/plugin.min.js        | 2 +-
 public/libs/tinymce/plugins/code/plugin.min.js           | 2 +-
 public/libs/tinymce/plugins/codesample/plugin.min.js     | 2 +-
 public/libs/tinymce/plugins/directionality/plugin.min.js | 2 +-
 public/libs/tinymce/plugins/fullscreen/plugin.min.js     | 2 +-
 public/libs/tinymce/plugins/image/plugin.min.js          | 2 +-
 public/libs/tinymce/plugins/importcss/plugin.min.js      | 2 +-
 public/libs/tinymce/plugins/insertdatetime/plugin.min.js | 2 +-
 public/libs/tinymce/plugins/link/plugin.min.js           | 2 +-
 public/libs/tinymce/plugins/lists/plugin.min.js          | 2 +-
 public/libs/tinymce/plugins/media/plugin.min.js          | 2 +-
 public/libs/tinymce/plugins/nonbreaking/plugin.min.js    | 2 +-
 public/libs/tinymce/plugins/pagebreak/plugin.min.js      | 2 +-
 public/libs/tinymce/plugins/preview/plugin.min.js        | 2 +-
 public/libs/tinymce/plugins/quickbars/plugin.min.js      | 2 +-
 public/libs/tinymce/plugins/save/plugin.min.js           | 2 +-
 public/libs/tinymce/plugins/searchreplace/plugin.min.js  | 2 +-
 public/libs/tinymce/plugins/table/plugin.min.js          | 2 +-
 public/libs/tinymce/plugins/template/plugin.min.js       | 2 +-
 public/libs/tinymce/plugins/visualblocks/plugin.min.js   | 2 +-
 public/libs/tinymce/plugins/visualchars/plugin.min.js    | 2 +-
 public/libs/tinymce/plugins/wordcount/plugin.min.js      | 2 +-
 public/libs/tinymce/themes/silver/theme.min.js           | 2 +-
 public/libs/tinymce/tinymce.min.js                       | 4 ++--
 30 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/public/libs/tinymce/models/dom/model.min.js b/public/libs/tinymce/models/dom/model.min.js
index 268a4352bab..cbd12878816 100644
--- a/public/libs/tinymce/models/dom/model.min.js
+++ b/public/libs/tinymce/models/dom/model.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.ModelManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(o=n=e,(r=String).prototype.isPrototypeOf(o)||(null===(s=n.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var o,n,r,s})(t)===e,o=e=>t=>typeof t===e,n=e=>t=>e===t,r=t("string"),s=t("object"),l=t("array"),a=n(null),c=o("boolean"),i=n(void 0),m=e=>!(e=>null==e)(e),d=o("function"),u=o("number"),f=()=>{},g=e=>()=>e,h=e=>e,p=(e,t)=>e===t;function w(e,...t){return(...o)=>{const n=t.concat(o);return e.apply(null,n)}}const b=e=>t=>!e(t),v=e=>e(),y=g(!1),x=g(!0);class C{constructor(e,t){this.tag=e,this.value=t}static some(e){return new C(!0,e)}static none(){return C.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?C.some(e(this.value)):C.none()}bind(e){return this.tag?e(this.value):C.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:C.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return m(e)?C.some(e):C.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}C.singletonNone=new C(!1);const S=Array.prototype.slice,T=Array.prototype.indexOf,R=Array.prototype.push,D=(e,t)=>{return o=e,n=t,T.call(o,n)>-1;var o,n},O=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return!0;return!1},k=(e,t)=>{const o=[];for(let n=0;n<e;n++)o.push(t(n));return o},E=(e,t)=>{const o=e.length,n=new Array(o);for(let r=0;r<o;r++){const o=e[r];n[r]=t(o,r)}return n},N=(e,t)=>{for(let o=0,n=e.length;o<n;o++)t(e[o],o)},B=(e,t)=>{const o=[],n=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?o:n).push(s)}return{pass:o,fail:n}},_=(e,t)=>{const o=[];for(let n=0,r=e.length;n<r;n++){const r=e[n];t(r,n)&&o.push(r)}return o},z=(e,t,o)=>(((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(e,((e,n)=>{o=t(o,e,n)})),o),A=(e,t,o)=>(N(e,((e,n)=>{o=t(o,e,n)})),o),L=(e,t)=>((e,t,o)=>{for(let n=0,r=e.length;n<r;n++){const r=e[n];if(t(r,n))return C.some(r);if(o(r,n))break}return C.none()})(e,t,y),W=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return C.some(o);return C.none()},M=e=>{const t=[];for(let o=0,n=e.length;o<n;++o){if(!l(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);R.apply(t,e[o])}return t},j=(e,t)=>M(E(e,t)),P=(e,t)=>{for(let o=0,n=e.length;o<n;++o)if(!0!==t(e[o],o))return!1;return!0},I=(e,t)=>{const o={};for(let n=0,r=e.length;n<r;n++){const r=e[n];o[String(r)]=t(r,n)}return o},F=(e,t)=>t>=0&&t<e.length?C.some(e[t]):C.none(),H=e=>F(e,0),$=e=>F(e,e.length-1),V=(e,t)=>{for(let o=0;o<e.length;o++){const n=t(e[o],o);if(n.isSome())return n}return C.none()},q=Object.keys,U=Object.hasOwnProperty,G=(e,t)=>{const o=q(e);for(let n=0,r=o.length;n<r;n++){const r=o[n];t(e[r],r)}},K=(e,t)=>Y(e,((e,o)=>({k:o,v:t(e,o)}))),Y=(e,t)=>{const o={};return G(e,((e,n)=>{const r=t(e,n);o[r.k]=r.v})),o},J=(e,t)=>{const o=[];return G(e,((e,n)=>{o.push(t(e,n))})),o},Q=e=>J(e,h),X=(e,t)=>U.call(e,t),Z="undefined"!=typeof window?window:Function("return this;")(),ee=(e,t)=>((e,t)=>{let o=null!=t?t:Z;for(let t=0;t<e.length&&null!=o;++t)o=o[e[t]];return o})(e.split("."),t),te=Object.getPrototypeOf,oe=e=>{const t=ee("ownerDocument.defaultView",e);return s(e)&&((e=>((e,t)=>{const o=((e,t)=>ee(e,t))(e,t);if(null==o)throw new Error(e+" not available on this browser");return o})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(te(e).constructor.name))},ne=e=>e.dom.nodeName.toLowerCase(),re=e=>e.dom.nodeType,se=e=>t=>re(t)===e,le=e=>8===re(e)||"#comment"===ne(e),ae=e=>ce(e)&&oe(e.dom),ce=se(1),ie=se(3),me=se(9),de=se(11),ue=e=>t=>ce(t)&&ne(t)===e,fe=(e,t,o)=>{if(!(r(o)||c(o)||u(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},ge=(e,t,o)=>{fe(e.dom,t,o)},he=(e,t)=>{const o=e.dom;G(t,((e,t)=>{fe(o,t,e)}))},pe=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},we=(e,t)=>C.from(pe(e,t)),be=(e,t)=>{e.dom.removeAttribute(t)},ve=e=>A(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),ye=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},xe={fromHtml:(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return ye(o.childNodes[0])},fromTag:(e,t)=>{const o=(t||document).createElement(e);return ye(o)},fromText:(e,t)=>{const o=(t||document).createTextNode(e);return ye(o)},fromDom:ye,fromPoint:(e,t,o)=>C.from(e.dom.elementFromPoint(t,o)).map(ye)},Ce=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},Se=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,Te=(e,t)=>{const o=void 0===t?document:t.dom;return Se(o)?C.none():C.from(o.querySelector(e)).map(xe.fromDom)},Re=(e,t)=>e.dom===t.dom,De=(e,t)=>{const o=e.dom,n=t.dom;return o!==n&&o.contains(n)},Oe=Ce,ke=e=>xe.fromDom(e.dom.ownerDocument),Ee=e=>me(e)?e:ke(e),Ne=e=>C.from(e.dom.parentNode).map(xe.fromDom),Be=e=>C.from(e.dom.parentElement).map(xe.fromDom),_e=(e,t)=>{const o=d(t)?t:y;let n=e.dom;const r=[];for(;null!==n.parentNode&&void 0!==n.parentNode;){const e=n.parentNode,t=xe.fromDom(e);if(r.push(t),!0===o(t))break;n=e}return r},ze=e=>C.from(e.dom.previousSibling).map(xe.fromDom),Ae=e=>C.from(e.dom.nextSibling).map(xe.fromDom),Le=e=>E(e.dom.childNodes,xe.fromDom),We=(e,t)=>{const o=e.dom.childNodes;return C.from(o[t]).map(xe.fromDom)},Me=(e,t)=>{Ne(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},je=(e,t)=>{Ae(e).fold((()=>{Ne(e).each((e=>{Ie(e,t)}))}),(e=>{Me(e,t)}))},Pe=(e,t)=>{const o=(e=>We(e,0))(e);o.fold((()=>{Ie(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},Ie=(e,t)=>{e.dom.appendChild(t.dom)},Fe=(e,t)=>{Me(e,t),Ie(t,e)},He=(e,t)=>{N(t,((o,n)=>{const r=0===n?e:t[n-1];je(r,o)}))},$e=(e,t)=>{N(t,(t=>{Ie(e,t)}))},Ve=e=>{e.dom.textContent="",N(Le(e),(e=>{qe(e)}))},qe=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Ue=e=>{const t=Le(e);t.length>0&&He(e,t),qe(e)},Ge=(e,t)=>xe.fromDom(e.dom.cloneNode(t)),Ke=e=>Ge(e,!1),Ye=e=>Ge(e,!0),Je=(e,t)=>{const o=xe.fromTag(t),n=ve(e);return he(o,n),o},Qe=["tfoot","thead","tbody","colgroup"],Xe=(e,t,o)=>({element:e,rowspan:t,colspan:o}),Ze=(e,t,o)=>({element:e,cells:t,section:o}),et=(e,t,o)=>({element:e,isNew:t,isLocked:o}),tt=(e,t,o,n)=>({element:e,cells:t,section:o,isNew:n}),ot=d(Element.prototype.attachShadow)&&d(Node.prototype.getRootNode),nt=g(ot),rt=ot?e=>xe.fromDom(e.dom.getRootNode()):Ee,st=e=>xe.fromDom(e.dom.host),lt=e=>{const t=ie(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return(e=>{const t=rt(e);return de(o=t)&&m(o.dom.host)?C.some(t):C.none();var o})(xe.fromDom(t)).fold((()=>o.body.contains(t)),(n=lt,r=st,e=>n(r(e))));var n,r},at=e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return xe.fromDom(t)},ct=(e,t)=>{let o=[];return N(Le(e),(e=>{t(e)&&(o=o.concat([e])),o=o.concat(ct(e,t))})),o},it=(e,t,o)=>((e,o,n)=>_(_e(e,n),(e=>Ce(e,t))))(e,0,o),mt=(e,t)=>((e,o)=>_(Le(e),(e=>Ce(e,t))))(e),dt=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Se(o)?[]:E(o.querySelectorAll(e),xe.fromDom)})(t,e);var ut=(e,t,o,n,r)=>e(o,n)?C.some(o):d(r)&&r(o)?C.none():t(o,n,r);const ft=(e,t,o)=>{let n=e.dom;const r=d(o)?o:y;for(;n.parentNode;){n=n.parentNode;const e=xe.fromDom(n);if(t(e))return C.some(e);if(r(e))break}return C.none()},gt=(e,t,o)=>ut(((e,t)=>t(e)),ft,e,t,o),ht=(e,t,o)=>ft(e,(e=>Ce(e,t)),o),pt=(e,t)=>((e,o)=>L(e.dom.childNodes,(e=>{return o=xe.fromDom(e),Ce(o,t);var o})).map(xe.fromDom))(e),wt=(e,t)=>Te(t,e),bt=(e,t,o)=>ut(((e,t)=>Ce(e,t)),ht,e,t,o),vt=(e,t,o=p)=>e.exists((e=>o(e,t))),yt=e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t},xt=(e,t)=>e?C.some(t):C.none(),Ct=(e,t,o)=>""===t||e.length>=t.length&&e.substr(o,o+t.length)===t,St=(e,t,o=0,n)=>{const r=e.indexOf(t,o);return-1!==r&&(!!i(n)||r+t.length<=n)},Tt=(e,t)=>Ct(e,t,0),Rt=(e,t)=>Ct(e,t,e.length-t.length),Dt=(e=>t=>t.replace(e,""))(/^\s+|\s+$/g),Ot=e=>e.length>0,kt=e=>void 0!==e.style&&d(e.style.getPropertyValue),Et=(e,t,o)=>{if(!r(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);kt(e)&&e.style.setProperty(t,o)},Nt=(e,t,o)=>{const n=e.dom;Et(n,t,o)},Bt=(e,t)=>{const o=e.dom;G(t,((e,t)=>{Et(o,t,e)}))},_t=(e,t)=>{const o=e.dom,n=window.getComputedStyle(o).getPropertyValue(t);return""!==n||lt(e)?n:zt(o,t)},zt=(e,t)=>kt(e)?e.style.getPropertyValue(t):"",At=(e,t)=>{const o=e.dom,n=zt(o,t);return C.from(n).filter((e=>e.length>0))},Lt=(e,t)=>{((e,t)=>{kt(e)&&e.style.removeProperty(t)})(e.dom,t),vt(we(e,"style").map(Dt),"")&&be(e,"style")},Wt=(e,t,o=0)=>we(e,t).map((e=>parseInt(e,10))).getOr(o),Mt=(e,t)=>Wt(e,t,1),jt=e=>ue("col")(e)?Wt(e,"span",1)>1:Mt(e,"colspan")>1,Pt=e=>Mt(e,"rowspan")>1,It=(e,t)=>parseInt(_t(e,t),10),Ft=g(10),Ht=g(10),$t=(e,t)=>Vt(e,t,x),Vt=(e,t,o)=>j(Le(e),(e=>Ce(e,t)?o(e)?[e]:[]:Vt(e,t,o))),qt=(e,t)=>((e,t,o=y)=>o(t)?C.none():D(e,ne(t))?C.some(t):ht(t,e.join(","),(e=>Ce(e,"table")||o(e))))(["td","th"],e,t),Ut=e=>$t(e,"th,td"),Gt=e=>Ce(e,"colgroup")?mt(e,"col"):j(Jt(e),(e=>mt(e,"col"))),Kt=(e,t)=>bt(e,"table",t),Yt=e=>$t(e,"tr"),Jt=e=>Kt(e).fold(g([]),(e=>mt(e,"colgroup"))),Qt=(e,t)=>E(e,(e=>{if("colgroup"===ne(e)){const t=E(Gt(e),(e=>{const t=Wt(e,"span",1);return Xe(e,1,t)}));return Ze(e,t,"colgroup")}{const o=E(Ut(e),(e=>{const t=Wt(e,"rowspan",1),o=Wt(e,"colspan",1);return Xe(e,t,o)}));return Ze(e,o,t(e))}})),Xt=e=>Ne(e).map((e=>{const t=ne(e);return(e=>D(Qe,e))(t)?t:"tbody"})).getOr("tbody"),Zt=e=>{const t=Yt(e),o=[...Jt(e),...t];return Qt(o,Xt)},eo=e=>{let t,o=!1;return(...n)=>(o||(o=!0,t=e.apply(null,n)),t)},to=()=>oo(0,0),oo=(e,t)=>({major:e,minor:t}),no={nu:oo,detect:(e,t)=>{const o=String(t).toLowerCase();return 0===e.length?to():((e,t)=>{const o=((e,t)=>{for(let o=0;o<e.length;o++){const n=e[o];if(n.test(t))return n}})(e,t);if(!o)return{major:0,minor:0};const n=e=>Number(t.replace(o,"$"+e));return oo(n(1),n(2))})(e,o)},unknown:to},ro=(e,t)=>{const o=String(t).toLowerCase();return L(e,(e=>e.search(o)))},so=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,lo=e=>t=>St(t,e),ao=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>St(e,"edge/")&&St(e,"chrome")&&St(e,"safari")&&St(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,so],search:e=>St(e,"chrome")&&!St(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>St(e,"msie")||St(e,"trident")},{name:"Opera",versionRegexes:[so,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:lo("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:lo("firefox")},{name:"Safari",versionRegexes:[so,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(St(e,"safari")||St(e,"mobile/"))&&St(e,"applewebkit")}],co=[{name:"Windows",search:lo("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>St(e,"iphone")||St(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:lo("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:lo("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:lo("linux"),versionRegexes:[]},{name:"Solaris",search:lo("sunos"),versionRegexes:[]},{name:"FreeBSD",search:lo("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:lo("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],io={browsers:g(ao),oses:g(co)},mo="Edge",uo="Chromium",fo="Opera",go="Firefox",ho="Safari",po=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isEdge:n(mo),isChromium:n(uo),isIE:n("IE"),isOpera:n(fo),isFirefox:n(go),isSafari:n(ho)}},wo=()=>po({current:void 0,version:no.unknown()}),bo=po,vo=(g(mo),g(uo),g("IE"),g(fo),g(go),g(ho),"Windows"),yo="Android",xo="Linux",Co="macOS",So="Solaris",To="FreeBSD",Ro="ChromeOS",Do=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isWindows:n(vo),isiOS:n("iOS"),isAndroid:n(yo),isMacOS:n(Co),isLinux:n(xo),isSolaris:n(So),isFreeBSD:n(To),isChromeOS:n(Ro)}},Oo=()=>Do({current:void 0,version:no.unknown()}),ko=Do,Eo=(g(vo),g("iOS"),g(yo),g(xo),g(Co),g(So),g(To),g(Ro),e=>window.matchMedia(e).matches);let No=eo((()=>((e,t,o)=>{const n=io.browsers(),r=io.oses(),s=t.bind((e=>((e,t)=>V(t.brands,(t=>{const o=t.brand.toLowerCase();return L(e,(e=>{var t;return o===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:no.nu(parseInt(t.version,10),0)})))})))(n,e))).orThunk((()=>((e,t)=>ro(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(n,e))).fold(wo,bo),l=((e,t)=>ro(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(r,e).fold(Oo,ko),a=((e,t,o,n)=>{const r=e.isiOS()&&!0===/ipad/i.test(o),s=e.isiOS()&&!r,l=e.isiOS()||e.isAndroid(),a=l||n("(pointer:coarse)"),c=r||!s&&l&&n("(min-device-width:768px)"),i=s||l&&!c,m=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(o),d=!i&&!c&&!m;return{isiPad:g(r),isiPhone:g(s),isTablet:g(c),isPhone:g(i),isTouch:g(a),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:g(m),isDesktop:g(d)}})(l,s,e,o);return{browser:s,os:l,deviceType:a}})(navigator.userAgent,C.from(navigator.userAgentData),Eo)));const Bo=()=>No(),_o=(e,t)=>{const o=o=>{const n=t(o);if(n<=0||null===n){const t=_t(o,e);return parseFloat(t)||0}return n},n=(e,t)=>A(t,((t,o)=>{const n=_t(e,o),r=void 0===n?0:parseInt(n,10);return isNaN(r)?t:t+r}),0);return{set:(t,o)=>{if(!u(o)&&!o.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+o);const n=t.dom;kt(n)&&(n.style[e]=o+"px")},get:o,getOuter:o,aggregate:n,max:(e,t,o)=>{const r=n(e,o);return t>r?t-r:0}}},zo=(e,t,o)=>((e,t)=>(e=>{const t=parseFloat(e);return isNaN(t)?C.none():C.some(t)})(e).getOr(t))(_t(e,t),o),Ao=_o("width",(e=>e.dom.offsetWidth)),Lo=e=>Ao.get(e),Wo=e=>Ao.getOuter(e),Mo=e=>((e,t)=>{const o=e.dom,n=o.getBoundingClientRect().width||o.offsetWidth;return"border-box"===t?n:((e,t,o,n)=>t-zo(e,`padding-${o}`,0)-zo(e,`padding-${n}`,0)-zo(e,`border-${o}-width`,0)-zo(e,`border-${n}-width`,0))(e,n,"left","right")})(e,"content-box"),jo=(e,t,o)=>{const n=e.cells,r=n.slice(0,t),s=n.slice(t),l=r.concat(o).concat(s);return Fo(e,l)},Po=(e,t,o)=>jo(e,t,[o]),Io=(e,t,o)=>{e.cells[t]=o},Fo=(e,t)=>tt(e.element,t,e.section,e.isNew),Ho=(e,t)=>e.cells[t],$o=(e,t)=>Ho(e,t).element,Vo=e=>e.cells.length,qo=e=>{const t=B(e,(e=>"colgroup"===e.section));return{rows:t.fail,cols:t.pass}},Uo=(e,t,o)=>{const n=E(e.cells,o);return tt(t(e.element),n,e.section,!0)},Go="data-snooker-locked-cols",Ko=e=>we(e,Go).bind((e=>C.from(e.match(/\d+/g)))).map((e=>I(e,x))),Yo=e=>{const t=A(qo(e).rows,((e,t)=>(N(t.cells,((t,o)=>{t.isLocked&&(e[o]=!0)})),e)),{}),o=J(t,((e,t)=>parseInt(t,10)));return((e,t)=>{const o=S.call(e,0);return o.sort(void 0),o})(o)},Jo=(e,t)=>e+","+t,Qo=(e,t)=>{const o=j(e.all,(e=>e.cells));return _(o,t)},Xo=e=>{const t={},o=[],n=H(e).map((e=>e.element)).bind(Kt).bind(Ko).getOr({});let r=0,s=0,l=0;const{pass:a,fail:c}=B(e,(e=>"colgroup"===e.section));N(c,(e=>{const a=[];N(e.cells,(e=>{let o=0;for(;void 0!==t[Jo(l,o)];)o++;const r=((e,t)=>X(e,t)&&void 0!==e[t]&&null!==e[t])(n,o.toString()),c=((e,t,o,n,r,s)=>({element:e,rowspan:t,colspan:o,row:n,column:r,isLocked:s}))(e.element,e.rowspan,e.colspan,l,o,r);for(let n=0;n<e.colspan;n++)for(let r=0;r<e.rowspan;r++){const e=o+n,a=Jo(l+r,e);t[a]=c,s=Math.max(s,e+1)}a.push(c)})),r++,o.push(Ze(e.element,a,e.section)),l++}));const{columns:i,colgroups:m}=$(a).map((e=>{const t=(e=>{const t={};let o=0;return N(e.cells,(e=>{const n=e.colspan;k(n,(r=>{const s=o+r;t[s]=((e,t,o)=>({element:e,colspan:t,column:o}))(e.element,n,s)})),o+=n})),t})(e),o=((e,t)=>({element:e,columns:t}))(e.element,Q(t));return{colgroups:[o],columns:t}})).getOrThunk((()=>({colgroups:[],columns:{}}))),d=((e,t)=>({rows:e,columns:t}))(r,s);return{grid:d,access:t,all:o,columns:i,colgroups:m}},Zo=e=>{const t=Zt(e);return Xo(t)},en=Xo,tn=(e,t,o)=>C.from(e.access[Jo(t,o)]),on=(e,t,o)=>{const n=Qo(e,(e=>o(t,e.element)));return n.length>0?C.some(n[0]):C.none()},nn=Qo,rn=e=>j(e.all,(e=>e.cells)),sn=e=>Q(e.columns),ln=e=>q(e.columns).length>0,an=(e,t)=>C.from(e.columns[t]),cn=(e,t=x)=>{const o=e.grid,n=k(o.columns,h),r=k(o.rows,h);return E(n,(o=>mn((()=>j(r,(t=>tn(e,t,o).filter((e=>e.column===o)).toArray()))),(e=>1===e.colspan&&t(e.element)),(()=>tn(e,0,o)))))},mn=(e,t,o)=>{const n=e();return L(n,t).orThunk((()=>C.from(n[0]).orThunk(o))).map((e=>e.element))},dn=e=>{const t=e.grid,o=k(t.rows,h),n=k(t.columns,h);return E(o,(t=>mn((()=>j(n,(o=>tn(e,t,o).filter((e=>e.row===t)).fold(g([]),(e=>[e]))))),(e=>1===e.rowspan),(()=>tn(e,t,0)))))},un=(e,t)=>o=>"rtl"===fn(o)?t:e,fn=e=>"rtl"===_t(e,"direction")?"rtl":"ltr",gn=_o("height",(e=>{const t=e.dom;return lt(e)?t.getBoundingClientRect().height:t.offsetHeight})),hn=e=>gn.get(e),pn=e=>gn.getOuter(e),wn=(e,t)=>({left:e,top:t,translate:(o,n)=>wn(e+o,t+n)}),bn=wn,vn=(e,t)=>void 0!==e?e:void 0!==t?t:0,yn=e=>{const t=e.dom.ownerDocument,o=t.body,n=t.defaultView,r=t.documentElement;if(o===e.dom)return bn(o.offsetLeft,o.offsetTop);const s=vn(null==n?void 0:n.pageYOffset,r.scrollTop),l=vn(null==n?void 0:n.pageXOffset,r.scrollLeft),a=vn(r.clientTop,o.clientTop),c=vn(r.clientLeft,o.clientLeft);return xn(e).translate(l-c,s-a)},xn=e=>{const t=e.dom,o=t.ownerDocument.body;return o===t?bn(o.offsetLeft,o.offsetTop):lt(e)?(e=>{const t=e.getBoundingClientRect();return bn(t.left,t.top)})(t):bn(0,0)},Cn=(e,t)=>({row:e,y:t}),Sn=(e,t)=>({col:e,x:t}),Tn=e=>yn(e).left+Wo(e),Rn=e=>yn(e).left,Dn=(e,t)=>Sn(e,Rn(t)),On=(e,t)=>Sn(e,Tn(t)),kn=e=>yn(e).top,En=(e,t)=>Cn(e,kn(t)),Nn=(e,t)=>Cn(e,kn(t)+pn(t)),Bn=(e,t,o)=>{if(0===o.length)return[];const n=E(o.slice(1),((t,o)=>t.map((t=>e(o,t))))),r=o[o.length-1].map((e=>t(o.length-1,e)));return n.concat([r])},_n={delta:h,positions:e=>Bn(En,Nn,e),edge:kn},zn=un({delta:h,edge:Rn,positions:e=>Bn(Dn,On,e)},{delta:e=>-e,edge:Tn,positions:e=>Bn(On,Dn,e)}),An={delta:(e,t)=>zn(t).delta(e,t),positions:(e,t)=>zn(t).positions(e,t),edge:e=>zn(e).edge(e)},Ln={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},Wn=(()=>{const e="[0-9]+",t="[eE][+-]?"+e,o=e=>`(?:${e})?`,n=["Infinity",e+"\\."+o(e)+o(t),"\\."+e+o(t),e+o(t)].join("|");return new RegExp(`^([+-]?(?:${n}))(.*)$`)})(),Mn=/(\d+(\.\d+)?)%/,jn=/(\d+(\.\d+)?)px|em/,Pn=ue("col"),In=(e,t,o)=>{const n=Be(e).getOrThunk((()=>at(ke(e))));return t(e)/o(n)*100},Fn=(e,t)=>{Nt(e,"width",t+"px")},Hn=(e,t)=>{Nt(e,"width",t+"%")},$n=(e,t)=>{Nt(e,"height",t+"px")},Vn=e=>{const t=(e=>{return zo(t=e,"height",t.dom.offsetHeight)+"px";var t})(e);return t?((e,t,o,n)=>{const r=parseFloat(e);return Rt(e,"%")&&"table"!==ne(t)?((e,t,o,n)=>{const r=Kt(e).map((e=>{const n=o(e);return Math.floor(t/100*n)})).getOr(t);return n(e,r),r})(t,r,o,n):r})(t,e,hn,$n):hn(e)},qn=(e,t)=>At(e,t).orThunk((()=>we(e,t).map((e=>e+"px")))),Un=e=>qn(e,"width"),Gn=e=>In(e,Lo,Mo),Kn=e=>{return Pn(e)?Lo(e):zo(t=e,"width",t.dom.offsetWidth);var t},Yn=e=>((e,t,o)=>o(e)/Mt(e,"rowspan"))(e,0,Vn),Jn=(e,t,o)=>{Nt(e,"width",t+o)},Qn=e=>In(e,Lo,Mo)+"%",Xn=g(Mn),Zn=ue("col"),er=e=>Un(e).getOrThunk((()=>Kn(e)+"px")),tr=e=>{return(t=e,qn(t,"height")).getOrThunk((()=>Yn(e)+"px"));var t},or=(e,t,o,n,r,s)=>e.filter(n).fold((()=>s(((e,t)=>{if(t<0||t>=e.length-1)return C.none();const o=e[t].fold((()=>{const o=(e=>{const t=S.call(e,0);return t.reverse(),t})(e.slice(0,t));return V(o,((e,t)=>e.map((e=>({value:e,delta:t+1})))))}),(e=>C.some({value:e,delta:0}))),n=e[t+1].fold((()=>{const o=e.slice(t+1);return V(o,((e,t)=>e.map((e=>({value:e,delta:t+1})))))}),(e=>C.some({value:e,delta:1})));return o.bind((e=>n.map((t=>{const o=t.delta+e.delta;return Math.abs(t.value-e.value)/o}))))})(o,t))),(e=>r(e))),nr=(e,t,o,n)=>{const r=cn(e),s=ln(e)?(e=>E(sn(e),(e=>C.from(e.element))))(e):r,l=[C.some(An.edge(t))].concat(E(An.positions(r,t),(e=>e.map((e=>e.x))))),a=b(jt);return E(s,((e,t)=>or(e,t,l,a,(e=>{if((e=>{const t=Bo().browser,o=t.isChromium()||t.isFirefox();return!Zn(e)||o})(e))return o(e);{const e=null!=(s=r[t])?h(s):C.none();return or(e,t,l,a,(e=>n(C.some(Lo(e)))),n)}var s}),n)))},rr=e=>e.map((e=>e+"px")).getOr(""),sr=(e,t,o)=>nr(e,t,Kn,(e=>e.getOrThunk(o.minCellWidth))),lr=(e,t,o,n,r)=>{const s=dn(e),l=[C.some(o.edge(t))].concat(E(o.positions(s,t),(e=>e.map((e=>e.y)))));return E(s,((e,t)=>or(e,t,l,b(Pt),n,r)))},ar=(e,t)=>()=>lt(e)?t(e):parseFloat(At(e,"width").getOr("0")),cr=e=>{const t=ar(e,(e=>parseFloat(Qn(e)))),o=ar(e,Lo);return{width:t,pixelWidth:o,getWidths:(t,o)=>((e,t,o)=>nr(e,t,Gn,(e=>e.fold((()=>o.minCellWidth()),(e=>e/o.pixelWidth()*100)))))(t,e,o),getCellDelta:e=>e/o()*100,singleColumnWidth:(e,t)=>[100-e],minCellWidth:()=>Ft()/o()*100,setElementWidth:Hn,adjustTableWidth:o=>{const n=t();Hn(e,n+o/100*n)},isRelative:!0,label:"percent"}},ir=e=>{const t=ar(e,Lo);return{width:t,pixelWidth:t,getWidths:(t,o)=>sr(t,e,o),getCellDelta:h,singleColumnWidth:(e,t)=>[Math.max(Ft(),e+t)-e],minCellWidth:Ft,setElementWidth:Fn,adjustTableWidth:o=>{const n=t()+o;Fn(e,n)},isRelative:!1,label:"pixel"}},mr=e=>Un(e).fold((()=>(e=>{const t=ar(e,Lo),o=g(0);return{width:t,pixelWidth:t,getWidths:(t,o)=>sr(t,e,o),getCellDelta:o,singleColumnWidth:g([0]),minCellWidth:o,setElementWidth:f,adjustTableWidth:f,isRelative:!0,label:"none"}})(e)),(t=>((e,t)=>null!==Xn().exec(t)?cr(e):ir(e))(e,t))),dr=ir,ur=cr,fr=(e,t,o)=>{const n=e[o].element,r=xe.fromTag("td");Ie(r,xe.fromTag("br")),(t?Ie:Pe)(n,r)},gr=((e,t)=>{const o=t=>e(t)?C.from(t.dom.nodeValue):C.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(ie),hr=e=>gr.get(e),pr=e=>gr.getOption(e),wr=(e,t)=>gr.set(e,t),br=e=>"img"===ne(e)?1:pr(e).fold((()=>Le(e).length),(e=>e.length)),vr=["img","br"],yr=e=>pr(e).filter((e=>0!==e.trim().length||e.indexOf("\xa0")>-1)).isSome()||D(vr,ne(e))||(e=>ae(e)&&"false"===pe(e,"contenteditable"))(e),xr=e=>((e,t)=>{const o=e=>{for(let n=0;n<e.childNodes.length;n++){const r=xe.fromDom(e.childNodes[n]);if(t(r))return C.some(r);const s=o(e.childNodes[n]);if(s.isSome())return s}return C.none()};return o(e.dom)})(e,yr),Cr=e=>Sr(e,yr),Sr=(e,t)=>{const o=e=>{const n=Le(e);for(let e=n.length-1;e>=0;e--){const r=n[e];if(t(r))return C.some(r);const s=o(r);if(s.isSome())return s}return C.none()};return o(e)},Tr={scope:["row","col"]},Rr=e=>()=>{const t=xe.fromTag("td",e.dom);return Ie(t,xe.fromTag("br",e.dom)),t},Dr=e=>()=>xe.fromTag("col",e.dom),Or=e=>()=>xe.fromTag("colgroup",e.dom),kr=e=>()=>xe.fromTag("tr",e.dom),Er=(e,t,o)=>{const n=((e,t)=>{const o=Je(e,t),n=Le(Ye(e));return $e(o,n),o})(e,t);return G(o,((e,t)=>{null===e?be(n,t):ge(n,t,e)})),n},Nr=e=>e,Br=(e,t,o)=>{const n=(e,t)=>{((e,t)=>{const o=e.dom,n=t.dom;kt(o)&&kt(n)&&(n.style.cssText=o.style.cssText)})(e.element,t),Lt(t,"height"),1!==e.colspan&&Lt(t,"width")};return{col:o=>{const r=xe.fromTag(ne(o.element),t.dom);return n(o,r),e(o.element,r),r},colgroup:Or(t),row:kr(t),cell:r=>{const s=xe.fromTag(ne(r.element),t.dom),l=o.getOr(["strong","em","b","i","span","font","h1","h2","h3","h4","h5","h6","p","div"]),a=l.length>0?((e,t,o)=>xr(e).map((n=>{const r=o.join(","),s=it(n,r,(t=>Re(t,e)));return z(s,((e,t)=>{const o=Ke(t);return Ie(e,o),o}),t)})).getOr(t))(r.element,s,l):s;return Ie(a,xe.fromTag("br")),n(r,s),((e,t)=>{G(Tr,((o,n)=>we(e,n).filter((e=>D(o,e))).each((e=>ge(t,n,e)))))})(r.element,s),e(r.element,s),s},replace:Er,colGap:Dr(t),gap:Rr(t)}},_r=e=>({col:Dr(e),colgroup:Or(e),row:kr(e),cell:Rr(e),replace:Nr,colGap:Dr(e),gap:Rr(e)}),zr=e=>t=>t.options.get(e),Ar="100%",Lr=e=>{var t;const o=e.dom,n=null!==(t=o.getParent(e.selection.getStart(),o.isBlock))&&void 0!==t?t:e.getBody();return Mo(xe.fromDom(n))+"px"},Wr=e=>C.from(e.options.get("table_clone_elements")),Mr=zr("table_header_type"),jr=zr("table_column_resizing"),Pr=e=>"preservetable"===jr(e),Ir=e=>"resizetable"===jr(e),Fr=zr("table_sizing_mode"),Hr=e=>"relative"===Fr(e),$r=e=>"fixed"===Fr(e),Vr=e=>"responsive"===Fr(e),qr=zr("table_resize_bars"),Ur=zr("table_style_by_css"),Gr=zr("table_merge_content_on_paste"),Kr=e=>{const t=e.options,o=t.get("table_default_attributes");return t.isSet("table_default_attributes")?o:((e,t)=>Vr(e)||Ur(e)?t:$r(e)?{...t,width:Lr(e)}:{...t,width:Ar})(e,o)},Yr=zr("table_use_colgroups"),Jr=e=>bt(e,"[contenteditable]"),Qr=(e,t=!1)=>lt(e)?e.dom.isContentEditable:Jr(e).fold(g(t),(e=>"true"===Xr(e))),Xr=e=>e.dom.contentEditable,Zr=e=>xe.fromDom(e.getBody()),es=e=>t=>Re(t,Zr(e)),ts=e=>{be(e,"data-mce-style");const t=e=>be(e,"data-mce-style");N(Ut(e),t),N(Gt(e),t),N(Yt(e),t)},os=e=>xe.fromDom(e.selection.getStart()),ns=e=>e.getBoundingClientRect().width,rs=e=>e.getBoundingClientRect().height,ss=e=>gt(e,ue("table")).exists(Qr),ls=(e,t)=>{const o=t.column,n=t.column+t.colspan-1,r=t.row,s=t.row+t.rowspan-1;return o<=e.finishCol&&n>=e.startCol&&r<=e.finishRow&&s>=e.startRow},as=(e,t)=>t.column>=e.startCol&&t.column+t.colspan-1<=e.finishCol&&t.row>=e.startRow&&t.row+t.rowspan-1<=e.finishRow,cs=(e,t,o)=>{const n=on(e,t,Re),r=on(e,o,Re);return n.bind((e=>r.map((t=>{return o=e,n=t,{startRow:Math.min(o.row,n.row),startCol:Math.min(o.column,n.column),finishRow:Math.max(o.row+o.rowspan-1,n.row+n.rowspan-1),finishCol:Math.max(o.column+o.colspan-1,n.column+n.colspan-1)};var o,n}))))},is=(e,t,o)=>cs(e,t,o).map((t=>{const o=nn(e,w(ls,t));return E(o,(e=>e.element))})),ms=(e,t)=>on(e,t,((e,t)=>De(t,e))).map((e=>e.element)),ds=(e,t,o)=>{const n=fs(e);return is(n,t,o)},us=(e,t,o,n,r)=>{const s=fs(e),l=Re(e,o)?C.some(t):ms(s,t),a=Re(e,r)?C.some(n):ms(s,n);return l.bind((e=>a.bind((t=>is(s,e,t)))))},fs=Zo;var gs=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],hs=()=>({up:g({selector:ht,closest:bt,predicate:ft,all:_e}),down:g({selector:dt,predicate:ct}),styles:g({get:_t,getRaw:At,set:Nt,remove:Lt}),attrs:g({get:pe,set:ge,remove:be,copyTo:(e,t)=>{const o=ve(e);he(t,o)}}),insert:g({before:Me,after:je,afterAll:He,append:Ie,appendAll:$e,prepend:Pe,wrap:Fe}),remove:g({unwrap:Ue,remove:qe}),create:g({nu:xe.fromTag,clone:e=>xe.fromDom(e.dom.cloneNode(!1)),text:xe.fromText}),query:g({comparePosition:(e,t)=>e.dom.compareDocumentPosition(t.dom),prevSibling:ze,nextSibling:Ae}),property:g({children:Le,name:ne,parent:Ne,document:e=>Ee(e).dom,isText:ie,isComment:le,isElement:ce,isSpecial:e=>{const t=ne(e);return D(["script","noscript","iframe","noframes","noembed","title","style","textarea","xmp"],t)},getLanguage:e=>ce(e)?we(e,"lang"):C.none(),getText:hr,setText:wr,isBoundary:e=>!!ce(e)&&("body"===ne(e)||D(gs,ne(e))),isEmptyTag:e=>!!ce(e)&&D(["br","img","hr","input"],ne(e)),isNonEditable:e=>ce(e)&&"false"===pe(e,"contenteditable")}),eq:Re,is:Oe});const ps=(e,t,o,n)=>{const r=t(e,o);return z(n,((o,n)=>{const r=t(e,n);return ws(e,o,r)}),r)},ws=(e,t,o)=>t.bind((t=>o.filter(w(e.eq,t)))),bs=hs(),vs=(e,t)=>((e,t,o)=>o.length>0?((e,t,o,n)=>n(e,t,o[0],o.slice(1)))(e,t,o,ps):C.none())(bs,((t,o)=>e(o)),t),ys=e=>ht(e,"table"),xs=(e,t,o)=>{const n=e=>t=>void 0!==o&&o(t)||Re(t,e);return Re(e,t)?C.some({boxes:C.some([e]),start:e,finish:t}):ys(e).bind((r=>ys(t).bind((s=>{if(Re(r,s))return C.some({boxes:ds(r,e,t),start:e,finish:t});if(De(r,s)){const o=it(t,"td,th",n(r)),l=o.length>0?o[o.length-1]:t;return C.some({boxes:us(r,e,r,t,s),start:e,finish:l})}if(De(s,r)){const o=it(e,"td,th",n(s)),l=o.length>0?o[o.length-1]:e;return C.some({boxes:us(s,e,r,t,s),start:e,finish:l})}return((e,t,o)=>((e,t,o,n=y)=>{const r=[t].concat(e.up().all(t)),s=[o].concat(e.up().all(o)),l=e=>W(e,n).fold((()=>e),(t=>e.slice(0,t+1))),a=l(r),c=l(s),i=L(a,(t=>O(c,((e,t)=>w(e.eq,t))(e,t))));return{firstpath:a,secondpath:c,shared:i}})(bs,e,t,void 0))(e,t).shared.bind((l=>bt(l,"table",o).bind((o=>{const l=it(t,"td,th",n(o)),a=l.length>0?l[l.length-1]:t,c=it(e,"td,th",n(o)),i=c.length>0?c[c.length-1]:e;return C.some({boxes:us(o,e,r,t,s),start:i,finish:a})}))))}))))},Cs=(e,t)=>{const o=dt(e,t);return o.length>0?C.some(o):C.none()},Ss=(e,t,o)=>wt(e,t).bind((t=>wt(e,o).bind((e=>vs(ys,[t,e]).map((o=>({first:t,last:e,table:o}))))))),Ts=(e,t,o,n,r)=>((e,t)=>L(e,(e=>Ce(e,t))))(e,r).bind((e=>((e,t,o)=>Kt(e).bind((n=>((e,t,o,n)=>on(e,t,Re).bind((t=>{const r=o>0?t.row+t.rowspan-1:t.row,s=n>0?t.column+t.colspan-1:t.column;return tn(e,r+o,s+n).map((e=>e.element))})))(fs(n),e,t,o))))(e,t,o).bind((e=>((e,t)=>ht(e,"table").bind((o=>wt(o,t).bind((t=>xs(t,e).bind((e=>e.boxes.map((t=>({boxes:t,start:e.start,finish:e.finish}))))))))))(e,n))))),Rs=(e,t)=>Cs(e,t),Ds=(e,t,o)=>Ss(e,t,o).bind((t=>{const o=t=>Re(e,t),n="thead,tfoot,tbody,table",r=ht(t.first,n,o),s=ht(t.last,n,o);return r.bind((e=>s.bind((o=>Re(e,o)?((e,t,o)=>((e,t,o)=>cs(e,t,o).bind((t=>((e,t)=>{let o=!0;const n=w(as,t);for(let r=t.startRow;r<=t.finishRow;r++)for(let s=t.startCol;s<=t.finishCol;s++)o=o&&tn(e,r,s).exists(n);return o?C.some(t):C.none()})(e,t))))(fs(e),t,o))(t.table,t.first,t.last):C.none()))))})),Os=h,ks=e=>{const t=(e,t)=>we(e,t).exists((e=>parseInt(e,10)>1));return e.length>0&&P(e,(e=>t(e,"rowspan")||t(e,"colspan")))?C.some(e):C.none()},Es=(e,t,o)=>t.length<=1?C.none():Ds(e,o.firstSelectedSelector,o.lastSelectedSelector).map((e=>({bounds:e,cells:t}))),Ns="data-mce-selected",Bs="data-mce-first-selected",_s="data-mce-last-selected",zs="["+Ns+"]",As={selected:Ns,selectedSelector:"td["+Ns+"],th["+Ns+"]",firstSelected:Bs,firstSelectedSelector:"td["+Bs+"],th["+Bs+"]",lastSelected:_s,lastSelectedSelector:"td["+_s+"],th["+_s+"]"},Ls=(e,t,o)=>({element:o,mergable:Es(t,e,As),unmergable:ks(e),selection:Os(e)}),Ws=e=>(t,o)=>{const n=ne(t),r="col"===n||"colgroup"===n?Kt(s=t).bind((e=>Rs(e,As.firstSelectedSelector))).fold(g(s),(e=>e[0])):t;var s;return bt(r,e,o)},Ms=Ws("th,td,caption"),js=Ws("th,td"),Ps=e=>{return t=e.model.table.getSelectedCells(),E(t,xe.fromDom);var t},Is=(e,t)=>{e.on("BeforeGetContent",(t=>{const o=o=>{t.preventDefault(),(e=>Kt(e[0]).map((e=>{const t=((e,t)=>{const o=e=>Ce(e.element,t),n=Ye(e),r=Zt(n),s=mr(e),l=en(r),a=((e,t)=>{const o=e.grid.columns;let n=e.grid.rows,r=o,s=0,l=0;const a=[],c=[];return G(e.access,(e=>{if(a.push(e),t(e)){c.push(e);const t=e.row,o=t+e.rowspan-1,a=e.column,i=a+e.colspan-1;t<n?n=t:o>s&&(s=o),a<r?r=a:i>l&&(l=i)}})),((e,t,o,n,r,s)=>({minRow:e,minCol:t,maxRow:o,maxCol:n,allCells:r,selectedCells:s}))(n,r,s,l,a,c)})(l,o),c="th:not("+t+"),td:not("+t+")",i=Vt(n,"th,td",(e=>Ce(e,c)));N(i,qe),((e,t,o,n)=>{const r=_(e,(e=>"colgroup"!==e.section)),s=t.grid.columns,l=t.grid.rows;for(let e=0;e<l;e++){let l=!1;for(let a=0;a<s;a++)e<o.minRow||e>o.maxRow||a<o.minCol||a>o.maxCol||(tn(t,e,a).filter(n).isNone()?fr(r,l,e):l=!0)}})(r,l,a,o);const m=((e,t,o,n)=>{if(0===n.minCol&&t.grid.columns===n.maxCol+1)return 0;const r=sr(t,e,o),s=A(r,((e,t)=>e+t),0),l=A(r.slice(n.minCol,n.maxCol+1),((e,t)=>e+t),0),a=l/s*o.pixelWidth()-o.pixelWidth();return o.getCellDelta(a)})(e,Zo(e),s,a);return((e,t,o,n)=>{G(o.columns,(e=>{(e.column<t.minCol||e.column>t.maxCol)&&qe(e.element)}));const r=_($t(e,"tr"),(e=>0===e.dom.childElementCount));N(r,qe),t.minCol!==t.maxCol&&t.minRow!==t.maxRow||N($t(e,"th,td"),(e=>{be(e,"rowspan"),be(e,"colspan")})),be(e,Go),be(e,"data-snooker-col-series"),mr(e).adjustTableWidth(n)})(n,a,l,m),n})(e,zs);return ts(t),[t]})))(o).each((o=>{t.content="text"===t.format?(e=>E(e,(e=>e.dom.innerText)).join(""))(o):((e,t)=>E(t,(t=>e.selection.serializer.serialize(t.dom,{}))).join(""))(e,o)}))};if(!0===t.selection){const t=(e=>_(Ps(e),(e=>Ce(e,As.selectedSelector))))(e);t.length>=1&&o(t)}})),e.on("BeforeSetContent",(o=>{if(!0===o.selection&&!0===o.paste){const n=Ps(e);H(n).each((n=>{Kt(n).each((r=>{const s=_(((e,t)=>{const o=document.createElement("div");return o.innerHTML=e,Le(xe.fromDom(o))})(o.content),(e=>"meta"!==ne(e))),l=ue("table");if(Gr(e)&&1===s.length&&l(s[0])){o.preventDefault();const l=xe.fromDom(e.getDoc()),a=_r(l),c=((e,t,o)=>({element:e,clipboard:t,generators:o}))(n,s[0],a);t.pasteCells(r,c).each((()=>{e.focus()}))}}))}))}}))},Fs=(e,t)=>({element:e,offset:t}),Hs=(e,t,o)=>e.property().isText(t)&&0===e.property().getText(t).trim().length||e.property().isComment(t)?o(t).bind((t=>Hs(e,t,o).orThunk((()=>C.some(t))))):C.none(),$s=(e,t)=>e.property().isText(t)?e.property().getText(t).length:e.property().children(t).length,Vs=(e,t)=>{const o=Hs(e,t,e.query().prevSibling).getOr(t);if(e.property().isText(o))return Fs(o,$s(e,o));const n=e.property().children(o);return n.length>0?Vs(e,n[n.length-1]):Fs(o,$s(e,o))},qs=Vs,Us=hs(),Gs=(e,t)=>{if(!jt(e)){const o=(e=>Un(e).bind((e=>{return t=e,o=["fixed","relative","empty"],C.from(Wn.exec(t)).bind((e=>{const t=Number(e[1]),n=e[2];return((e,t)=>O(t,(t=>O(Ln[t],(t=>e===t)))))(n,o)?C.some({value:t,unit:n}):C.none()}));var t,o})))(e);o.each((o=>{const n=o.value/2;Jn(e,n,o.unit),Jn(t,n,o.unit)}))}},Ks=e=>E(e,g(0)),Ys=(e,t,o,n,r)=>r(e.slice(0,t)).concat(n).concat(r(e.slice(o))),Js=e=>(t,o,n,r)=>{if(e(n)){const e=Math.max(r,t[o]-Math.abs(n)),s=Math.abs(e-t[o]);return n>=0?s:-s}return n},Qs=Js((e=>e<0)),Xs=Js(x),Zs=()=>{const e=(e,t,o,n)=>{const r=(100+o)/100,s=Math.max(n,(e[t]+o)/r);return E(e,((e,o)=>(o===t?s:e/r)-e))},t=(t,o,n,r,s,l)=>l?e(t,o,r,s):((e,t,o,n,r)=>{const s=Qs(e,t,n,r);return Ys(e,t,o+1,[s,0],Ks)})(t,o,n,r,s);return{resizeTable:(e,t)=>e(t),clampTableDelta:Qs,calcLeftEdgeDeltas:t,calcMiddleDeltas:(e,o,n,r,s,l,a)=>t(e,n,r,s,l,a),calcRightEdgeDeltas:(t,o,n,r,s,l)=>{if(l)return e(t,n,r,s);{const e=Qs(t,n,r,s);return Ks(t.slice(0,n)).concat([e])}},calcRedestributedWidths:(e,t,o,n)=>{if(n){const n=(t+o)/t,r=E(e,(e=>e/n));return{delta:100*n-100,newSizes:r}}return{delta:o,newSizes:e}}}},el=()=>{const e=(e,t,o,n,r)=>{const s=Xs(e,n>=0?o:t,n,r);return Ys(e,t,o+1,[s,-s],Ks)};return{resizeTable:(e,t,o)=>{o&&e(t)},clampTableDelta:(e,t,o,n,r)=>{if(r){if(o>=0)return o;{const t=A(e,((e,t)=>e+t-n),0);return Math.max(-t,o)}}return Qs(e,t,o,n)},calcLeftEdgeDeltas:e,calcMiddleDeltas:(t,o,n,r,s,l)=>e(t,n,r,s,l),calcRightEdgeDeltas:(e,t,o,n,r,s)=>{if(s)return Ks(e);{const t=n/e.length;return E(e,g(t))}},calcRedestributedWidths:(e,t,o,n)=>({delta:0,newSizes:e})}},tl=e=>Zo(e).grid,ol=ue("th"),nl=e=>P(e,(e=>ol(e.element))),rl=(e,t)=>e&&t?"sectionCells":e?"section":"cells",sl=e=>{const t="thead"===e.section,o=vt(ll(e.cells),"th");return"tfoot"===e.section?{type:"footer"}:t||o?{type:"header",subType:rl(t,o)}:{type:"body"}},ll=e=>{const t=_(e,(e=>ol(e.element)));return 0===t.length?C.some("td"):t.length===e.length?C.some("th"):C.none()},al=(e,t,o)=>et(o(e.element,t),!0,e.isLocked),cl=(e,t)=>e.section!==t?tt(e.element,e.cells,t,e.isNew):e,il=()=>({transformRow:cl,transformCell:(e,t,o)=>{const n=o(e.element,t),r="td"!==ne(n)?((e,t)=>{const o=Je(e,"td");je(e,o);const n=Le(e);return $e(o,n),qe(e),o})(n):n;return et(r,e.isNew,e.isLocked)}}),ml=()=>({transformRow:cl,transformCell:al}),dl=()=>({transformRow:(e,t)=>cl(e,"thead"===t?"tbody":t),transformCell:al}),ul=il,fl=ml,gl=dl,hl=()=>({transformRow:h,transformCell:al}),pl=(e,t,o,n)=>{o===n?be(e,t):ge(e,t,o)},wl=(e,t,o)=>{$(mt(e,t)).fold((()=>Pe(e,o)),(e=>je(e,o)))},bl=(e,t)=>{const o=[],n=[],r=e=>E(e,(e=>{e.isNew&&o.push(e.element);const t=e.element;return Ve(t),N(e.cells,(e=>{e.isNew&&n.push(e.element),pl(e.element,"colspan",e.colspan,1),pl(e.element,"rowspan",e.rowspan,1),Ie(t,e.element)})),t})),s=e=>j(e,(e=>E(e.cells,(e=>(pl(e.element,"span",e.colspan,1),e.element))))),l=(t,o)=>{const n=((e,t)=>{const o=pt(e,t).getOrThunk((()=>{const o=xe.fromTag(t,ke(e).dom);return"thead"===t?wl(e,"caption,colgroup",o):"colgroup"===t?wl(e,"caption",o):Ie(e,o),o}));return Ve(o),o})(e,o),l=("colgroup"===o?s:r)(t);$e(n,l)},a=(t,o)=>{t.length>0?l(t,o):(t=>{pt(e,t).each(qe)})(o)},c=[],i=[],m=[],d=[];return N(t,(e=>{switch(e.section){case"thead":c.push(e);break;case"tbody":i.push(e);break;case"tfoot":m.push(e);break;case"colgroup":d.push(e)}})),a(d,"colgroup"),a(c,"thead"),a(i,"tbody"),a(m,"tfoot"),{newRows:o,newCells:n}},vl=(e,t)=>{if(0===e.length)return 0;const o=e[0];return W(e,(e=>!t(o.element,e.element))).getOr(e.length)},yl=(e,t)=>{const o=E(e,(e=>E(e.cells,y)));return E(e,((n,r)=>{const s=j(n.cells,((n,s)=>{if(!1===o[r][s]){const m=((e,t,o,n)=>{const r=((e,t)=>e[t])(e,t),s="colgroup"===r.section,l=vl(r.cells.slice(o),n),a=s?1:vl(((e,t)=>E(e,(e=>Ho(e,t))))(e.slice(t),o),n);return{colspan:l,rowspan:a}})(e,r,s,t);return((e,t,n,r)=>{for(let s=e;s<e+n;s++)for(let e=t;e<t+r;e++)o[s][e]=!0})(r,s,m.rowspan,m.colspan),[(l=n.element,a=m.rowspan,c=m.colspan,i=n.isNew,{element:l,rowspan:a,colspan:c,isNew:i})]}return[];var l,a,c,i}));return((e,t,o,n)=>({element:e,cells:t,section:o,isNew:n}))(n.element,s,n.section,n.isNew)}))},xl=(e,t,o)=>{const n=[];N(e.colgroups,(r=>{const s=[];for(let n=0;n<e.grid.columns;n++){const r=an(e,n).map((e=>et(e.element,o,!1))).getOrThunk((()=>et(t.colGap(),!0,!1)));s.push(r)}n.push(tt(r.element,s,"colgroup",o))}));for(let r=0;r<e.grid.rows;r++){const s=[];for(let n=0;n<e.grid.columns;n++){const l=tn(e,r,n).map((e=>et(e.element,o,e.isLocked))).getOrThunk((()=>et(t.gap(),!0,!1)));s.push(l)}const l=e.all[r],a=tt(l.element,s,l.section,o);n.push(a)}return n},Cl=e=>yl(e,Re),Sl=(e,t)=>V(e.all,(e=>L(e.cells,(e=>Re(t,e.element))))),Tl=(e,t,o)=>{const n=E(t.selection,(t=>qt(t).bind((t=>Sl(e,t))).filter(o))),r=yt(n);return xt(r.length>0,r)},Rl=(e,t,o,n,r)=>(s,l,a,c)=>{const i=Zo(s),m=C.from(null==c?void 0:c.section).getOrThunk(hl);return t(i,l).map((t=>{const o=((e,t)=>xl(e,t,!1))(i,a),n=e(o,t,Re,r(a),m),s=Yo(n.grid);return{info:t,grid:Cl(n.grid),cursor:n.cursor,lockedColumns:s}})).bind((e=>{const t=bl(s,e.grid),r=C.from(null==c?void 0:c.sizing).getOrThunk((()=>mr(s))),l=C.from(null==c?void 0:c.resize).getOrThunk(el);return o(s,e.grid,e.info,{sizing:r,resize:l,section:m}),n(s),be(s,Go),e.lockedColumns.length>0&&ge(s,Go,e.lockedColumns.join(",")),C.some({cursor:e.cursor,newRows:t.newRows,newCells:t.newCells})}))},Dl=(e,t)=>Tl(e,t,x).map((e=>({cells:e,generators:t.generators,clipboard:t.clipboard}))),Ol=(e,t)=>Tl(e,t,x),kl=(e,t)=>Tl(e,t,(e=>!e.isLocked)),El=(e,t)=>P(t,(t=>((e,t)=>Sl(e,t).exists((e=>!e.isLocked)))(e,t))),Nl=(e,t,o,n)=>{const r=qo(e).rows;let s=!0;for(let e=0;e<r.length;e++)for(let l=0;l<Vo(r[0]);l++){const a=r[e],c=Ho(a,l),i=o(c.element,t);i&&!s?Io(a,l,et(n(),!0,c.isLocked)):i&&(s=!1)}return e},Bl=e=>{const t=t=>t(e),o=g(e),n=()=>r,r={tag:!0,inner:e,fold:(t,o)=>o(e),isValue:x,isError:y,map:t=>zl.value(t(e)),mapError:n,bind:t,exists:t,forall:t,getOr:o,or:n,getOrThunk:o,orThunk:n,getOrDie:o,each:t=>{t(e)},toOptional:()=>C.some(e)};return r},_l=e=>{const t=()=>o,o={tag:!1,inner:e,fold:(t,o)=>t(e),isValue:y,isError:x,map:t,mapError:t=>zl.error(t(e)),bind:t,exists:y,forall:x,getOr:h,or:h,getOrThunk:v,orThunk:v,getOrDie:(n=String(e),()=>{throw new Error(n)}),each:f,toOptional:C.none};var n;return o},zl={value:Bl,error:_l,fromOption:(e,t)=>e.fold((()=>_l(t)),Bl)},Al=(e,t)=>({rowDelta:0,colDelta:Vo(e[0])-Vo(t[0])}),Ll=(e,t)=>({rowDelta:e.length-t.length,colDelta:0}),Wl=(e,t,o,n)=>{const r="colgroup"===t.section?o.col:o.cell;return k(e,(e=>et(r(),!0,n(e))))},Ml=(e,t,o,n)=>{const r=e[e.length-1];return e.concat(k(t,(()=>{const e="colgroup"===r.section?o.colgroup:o.row,t=Uo(r,e,h),s=Wl(t.cells.length,t,o,(e=>X(n,e.toString())));return Fo(t,s)})))},jl=(e,t,o,n)=>E(e,(e=>{const r=Wl(t,e,o,y);return jo(e,n,r)})),Pl=(e,t,o)=>{const n=t.colDelta<0?jl:h,r=t.rowDelta<0?Ml:h,s=Yo(e),l=Vo(e[0]),a=O(s,(e=>e===l-1)),c=n(e,Math.abs(t.colDelta),o,a?l-1:l),i=Yo(c);return r(c,Math.abs(t.rowDelta),o,I(i,x))},Il=(e,t,o,n)=>{const r=w(n,Ho(e[t],o).element),s=e[t];return e.length>1&&Vo(s)>1&&(o>0&&r($o(s,o-1))||o<s.cells.length-1&&r($o(s,o+1))||t>0&&r($o(e[t-1],o))||t<e.length-1&&r($o(e[t+1],o)))},Fl=(e,t,o)=>_(o,(o=>o>=e.column&&o<=Vo(t[0])+e.column)),Hl=(e,t,o,n,r)=>{((e,t,o,n)=>{t>0&&t<e[0].cells.length&&N(e,(e=>{const r=e.cells[t-1];let s=0;const l=n();for(;e.cells.length>t+s&&o(r.element,e.cells[t+s].element);)Io(e,t+s,et(l,!0,e.cells[t+s].isLocked)),s++}))})(t,e,r,n.cell);const s=Ll(o,t),l=Pl(o,s,n),a=Ll(t,l),c=Pl(t,a,n);return E(c,((t,o)=>jo(t,e,l[o].cells)))},$l=(e,t,o,n,r)=>{((e,t,o,n)=>{const r=qo(e).rows;if(t>0&&t<r.length){const e=((e,t)=>A(e,((e,o)=>O(e,(e=>t(e.element,o.element)))?e:e.concat([o])),[]))(r[t-1].cells,o);N(e,(e=>{let s=C.none();for(let l=t;l<r.length;l++)for(let t=0;t<Vo(r[0]);t++){const a=r[l],c=Ho(a,t);o(c.element,e.element)&&(s.isNone()&&(s=C.some(n())),s.each((e=>{Io(a,t,et(e,!0,c.isLocked))})))}}))}})(t,e,r,n.cell);const s=Yo(t),l=Al(t,o),a={...l,colDelta:l.colDelta-s.length},c=Pl(t,a,n),{cols:i,rows:m}=qo(c),d=Yo(c),u=Al(o,t),f={...u,colDelta:u.colDelta+d.length},g=(p=n,w=d,E(o,(e=>A(w,((t,o)=>{const n=Wl(1,e,p,x)[0];return Po(t,o,n)}),e)))),h=Pl(g,f,n);var p,w;return[...i,...m.slice(0,e),...h,...m.slice(e,m.length)]},Vl=(e,t,o,n,r)=>{const{rows:s,cols:l}=qo(e),a=s.slice(0,t),c=s.slice(t);return[...l,...a,((e,t,o,n)=>Uo(e,(e=>n(e,o)),t))(s[o],((e,o)=>t>0&&t<s.length&&n($o(s[t-1],o),$o(s[t],o))?Ho(s[t],o):et(r(e.element,n),!0,e.isLocked)),n,r),...c]},ql=(e,t,o,n,r)=>E(e,(e=>{const s=t>0&&t<Vo(e)&&n($o(e,t-1),$o(e,t)),l=((e,t,o,n,r,s,l)=>{if("colgroup"!==o&&n)return Ho(e,t);{const t=Ho(e,r);return et(l(t.element,s),!0,!1)}})(e,t,e.section,s,o,n,r);return Po(e,t,l)})),Ul=(e,t,o,n)=>((e,t,o,n)=>void 0!==$o(e[t],o)&&t>0&&n($o(e[t-1],o),$o(e[t],o)))(e,t,o,n)||((e,t,o)=>t>0&&o($o(e,t-1),$o(e,t)))(e[t],o,n),Gl=(e,t,o,n)=>{const r=e=>(e=>"row"===e?Pt(t):jt(t))(e)?`${e}group`:e;return e?ol(t)?r(o):null:n&&ol(t)?r("row"===o?"col":"row"):null},Kl=(e,t,o)=>et(o(e.element,t),!0,e.isLocked),Yl=(e,t,o,n,r,s,l)=>E(e,((e,a)=>((e,c)=>{const i=e.cells,m=E(i,((e,c)=>{if((e=>O(t,(t=>o(e.element,t.element))))(e)){const t=l(e,a,c)?r(e,o,n):e;return s(t,a,c).each((e=>{var o,n;o=t.element,n={scope:C.from(e)},G(n,((e,t)=>{e.fold((()=>{be(o,t)}),(e=>{fe(o.dom,t,e)}))}))})),t}return e}));return tt(e.element,m,e.section,e.isNew)})(e))),Jl=(e,t,o)=>j(e,((n,r)=>Ul(e,r,t,o)?[]:[Ho(n,t)])),Ql=(e,t,o,n,r)=>{const s=qo(e).rows,l=j(t,(e=>Jl(s,e,n))),a=E(s,(e=>nl(e.cells))),c=((e,t)=>P(t,h)&&nl(e)?x:(e,o,n)=>!("th"===ne(e.element)&&t[o]))(l,a),i=((e,t)=>(o,n)=>C.some(Gl(e,o.element,"row",t[n])))(o,a);return Yl(e,l,n,r,Kl,i,c)},Xl=(e,t,o,n)=>{const r=qo(e).rows,s=E(t,(e=>Ho(r[e.row],e.column)));return Yl(e,s,o,n,Kl,C.none,x)},Zl=e=>{if(!l(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};return N(e,((n,r)=>{const s=q(n);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],c=n[a];if(void 0!==o[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!l(c))throw new Error("case arguments must be an array");t.push(a),o[a]=(...o)=>{const n=o.length;if(n!==c.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+c.length+" ("+c+"), got "+n);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,o)},match:e=>{const n=q(e);if(t.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+n.join(","));if(!P(t,(e=>D(n,e))))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:a,params:o})}}}})),o},ea={...Zl([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}])},ta=(e,t,o)=>{let n=0;for(let r=e;r<t;r++)n+=void 0!==o[r]?o[r]:0;return n},oa=(e,t)=>{const o=rn(e);return E(o,(e=>{const o=ta(e.row,e.row+e.rowspan,t);return{element:e.element,height:o,rowspan:e.rowspan}}))},na=(e,t,o)=>{const n=((e,t)=>ln(e)?((e,t)=>{const o=sn(e);return E(o,((e,o)=>({element:e.element,width:t[o],colspan:e.colspan})))})(e,t):((e,t)=>{const o=rn(e);return E(o,(e=>{const o=ta(e.column,e.column+e.colspan,t);return{element:e.element,width:o,colspan:e.colspan}}))})(e,t))(e,t);N(n,(e=>{o.setElementWidth(e.element,e.width)}))},ra=(e,t,o,n,r)=>{const s=Zo(e),l=r.getCellDelta(t),a=r.getWidths(s,r),c=o===s.grid.columns-1,i=n.clampTableDelta(a,o,l,r.minCellWidth(),c),m=((e,t,o,n,r)=>{const s=e.slice(0),l=((e,t)=>0===e.length?ea.none():1===e.length?ea.only(0):0===t?ea.left(0,1):t===e.length-1?ea.right(t-1,t):t>0&&t<e.length-1?ea.middle(t-1,t,t+1):ea.none())(e,t),a=g(E(s,g(0)));return l.fold(a,(e=>n.singleColumnWidth(s[e],o)),((e,t)=>r.calcLeftEdgeDeltas(s,e,t,o,n.minCellWidth(),n.isRelative)),((e,t,l)=>r.calcMiddleDeltas(s,e,t,l,o,n.minCellWidth(),n.isRelative)),((e,t)=>r.calcRightEdgeDeltas(s,e,t,o,n.minCellWidth(),n.isRelative)))})(a,o,i,r,n),d=E(m,((e,t)=>e+a[t]));na(s,d,r),n.resizeTable(r.adjustTableWidth,i,c)},sa=e=>A(e,((e,t)=>O(e,(e=>e.column===t.column))?e:e.concat([t])),[]).sort(((e,t)=>e.column-t.column)),la=ue("col"),aa=ue("colgroup"),ca=e=>"tr"===ne(e)||aa(e),ia=e=>({element:e,colspan:Wt(e,"colspan",1),rowspan:Wt(e,"rowspan",1)}),ma=e=>we(e,"scope").map((e=>e.substr(0,3))),da=(e,t=ia)=>{const o=o=>{if(ca(o))return aa((r={element:o}).element)?e.colgroup(r):e.row(r);{const r=o,s=(t=>la(t.element)?e.col(t):e.cell(t))(t(r));return n=C.some({item:r,replacement:s}),s}var r};let n=C.none();return{getOrInit:(e,t)=>n.fold((()=>o(e)),(n=>t(e,n.item)?n.replacement:o(e)))}},ua=e=>t=>{const o=[],n=n=>{const r="td"===e?{scope:null}:{},s=t.replace(n,e,r);return o.push({item:n,sub:s}),s};return{replaceOrInit:(e,t)=>{if(ca(e)||la(e))return e;{const r=e;return((e,t)=>L(o,(o=>t(o.item,e))))(r,t).fold((()=>n(r)),(o=>t(e,o.item)?o.sub:n(r)))}}}},fa=e=>({unmerge:t=>{const o=ma(t);return o.each((e=>ge(t,"scope",e))),()=>{const n=e.cell({element:t,colspan:1,rowspan:1});return Lt(n,"width"),Lt(t,"width"),o.each((e=>ge(n,"scope",e))),n}},merge:e=>(Lt(e[0],"width"),(()=>{const t=yt(E(e,ma));if(0===t.length)return C.none();{const e=t[0],o=["row","col"];return O(t,(t=>t!==e&&D(o,t)))?C.none():C.from(e)}})().fold((()=>be(e[0],"scope")),(t=>ge(e[0],"scope",t+"group"))),g(e[0]))}),ga=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","table","thead","tfoot","tbody","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],ha=hs(),pa=e=>((e,t)=>{const o=e.property().name(t);return D(ga,o)})(ha,e),wa=e=>((e,t)=>{const o=e.property().name(t);return D(["ol","ul"],o)})(ha,e),ba=e=>{const t=ue("br"),o=e=>Cr(e).bind((o=>{const n=Ae(o).map((e=>!!pa(e)||!!((e,t)=>D(["br","img","hr","input"],e.property().name(t)))(ha,e)&&"img"!==ne(e))).getOr(!1);return Ne(o).map((r=>{return!0===n||("li"===ne(s=r)||ft(s,wa).isSome())||t(o)||pa(r)&&!Re(e,r)?[]:[xe.fromTag("br")];var s}))})).getOr([]),n=(()=>{const n=j(e,(e=>{const n=Le(e);return(e=>P(e,(e=>t(e)||ie(e)&&0===hr(e).trim().length)))(n)?[]:n.concat(o(e))}));return 0===n.length?[xe.fromTag("br")]:n})();Ve(e[0]),$e(e[0],n)},va=e=>Qr(e,!0),ya=e=>{0===Ut(e).length&&qe(e)},xa=(e,t)=>({grid:e,cursor:t}),Ca=(e,t,o)=>{const n=((e,t,o)=>{var n,r;const s=qo(e).rows;return C.from(null===(r=null===(n=s[t])||void 0===n?void 0:n.cells[o])||void 0===r?void 0:r.element).filter(va).orThunk((()=>(e=>V(e,(e=>V(e.cells,(e=>{const t=e.element;return xt(va(t),t)})))))(s)))})(e,t,o);return xa(e,n)},Sa=e=>A(e,((e,t)=>O(e,(e=>e.row===t.row))?e:e.concat([t])),[]).sort(((e,t)=>e.row-t.row)),Ta=(e,t)=>(o,n,r,s,l)=>{const a=Sa(n),c=E(a,(e=>e.row)),i=((e,t,o,n,r,s,l)=>{const{cols:a,rows:c}=qo(e),i=c[t[0]],m=j(t,(e=>((e,t,o)=>{const n=e[t];return j(n.cells,((n,r)=>Ul(e,t,r,o)?[]:[n]))})(c,e,r))),d=E(i.cells,((e,t)=>nl(Jl(c,t,r)))),u=[...c];N(t,(e=>{u[e]=l.transformRow(c[e],o)}));const f=[...a,...u],g=((e,t)=>P(t,h)&&nl(e.cells)?x:(e,o,n)=>!("th"===ne(e.element)&&t[n]))(i,d),p=((e,t)=>(o,n,r)=>C.some(Gl(e,o.element,"col",t[r])))(n,d);return Yl(f,m,r,s,l.transformCell,p,g)})(o,c,e,t,r,s.replaceOrInit,l);return Ca(i,n[0].row,n[0].column)},Ra=Ta("thead",!0),Da=Ta("tbody",!1),Oa=Ta("tfoot",!1),ka=(e,t,o)=>{const n=((e,t)=>Qt(e,(()=>t)))(e,o.section),r=en(n);return xl(r,t,!0)},Ea=(e,t,o,n)=>((e,t,o,n)=>{const r=en(t),s=n.getWidths(r,n);na(r,s,n)})(0,t,0,n.sizing),Na=(e,t,o,n)=>((e,t,o,n,r)=>{const s=en(t),l=n.getWidths(s,n),a=n.pixelWidth(),{newSizes:c,delta:i}=r.calcRedestributedWidths(l,a,o.pixelDelta,n.isRelative);na(s,c,n),n.adjustTableWidth(i)})(0,t,o,n.sizing,n.resize),Ba=(e,t)=>O(t,(e=>0===e.column&&e.isLocked)),_a=(e,t)=>O(t,(t=>t.column+t.colspan>=e.grid.columns&&t.isLocked)),za=(e,t)=>{const o=cn(e),n=sa(t);return A(n,((e,t)=>e+o[t.column].map(Wo).getOr(0)),0)},Aa=e=>(t,o)=>Ol(t,o).filter((o=>!(e?Ba:_a)(t,o))).map((e=>({details:e,pixelDelta:za(t,e)}))),La=e=>(t,o)=>Dl(t,o).filter((o=>!(e?Ba:_a)(t,o.cells))),Wa=ua("th"),Ma=ua("td"),ja=Rl(((e,t,o,n)=>{const r=t[0].row,s=Sa(t),l=z(s,((e,t)=>({grid:Vl(e.grid,r,t.row+e.delta,o,n.getOrInit),delta:e.delta+1})),{grid:e,delta:0}).grid;return Ca(l,r,t[0].column)}),Ol,f,f,da),Pa=Rl(((e,t,o,n)=>{const r=Sa(t),s=r[r.length-1],l=s.row+s.rowspan,a=z(r,((e,t)=>Vl(e,l,t.row,o,n.getOrInit)),e);return Ca(a,l,t[0].column)}),Ol,f,f,da),Ia=Rl(((e,t,o,n)=>{const r=t.details,s=sa(r),l=s[0].column,a=z(s,((e,t)=>({grid:ql(e.grid,l,t.column+e.delta,o,n.getOrInit),delta:e.delta+1})),{grid:e,delta:0}).grid;return Ca(a,r[0].row,l)}),Aa(!0),Na,f,da),Fa=Rl(((e,t,o,n)=>{const r=t.details,s=r[r.length-1],l=s.column+s.colspan,a=sa(r),c=z(a,((e,t)=>ql(e,l,t.column,o,n.getOrInit)),e);return Ca(c,r[0].row,l)}),Aa(!1),Na,f,da),Ha=Rl(((e,t,o,n)=>{const r=sa(t.details),s=((e,t)=>j(e,(e=>{const o=e.cells,n=z(t,((e,t)=>t>=0&&t<e.length?e.slice(0,t).concat(e.slice(t+1)):e),o);return n.length>0?[tt(e.element,n,e.section,e.isNew)]:[]})))(e,E(r,(e=>e.column))),l=s.length>0?s[0].cells.length-1:0;return Ca(s,r[0].row,Math.min(r[0].column,l))}),((e,t)=>kl(e,t).map((t=>({details:t,pixelDelta:-za(e,t)})))),Na,ya,da),$a=Rl(((e,t,o,n)=>{const r=Sa(t),s=((e,t,o)=>{const{rows:n,cols:r}=qo(e);return[...r,...n.slice(0,t),...n.slice(o+1)]})(e,r[0].row,r[r.length-1].row),l=s.length>0?s.length-1:0;return Ca(s,Math.min(t[0].row,l),t[0].column)}),Ol,f,ya,da),Va=Rl(((e,t,o,n)=>{const r=sa(t),s=E(r,(e=>e.column)),l=Ql(e,s,!0,o,n.replaceOrInit);return Ca(l,t[0].row,t[0].column)}),kl,f,f,Wa),qa=Rl(((e,t,o,n)=>{const r=sa(t),s=E(r,(e=>e.column)),l=Ql(e,s,!1,o,n.replaceOrInit);return Ca(l,t[0].row,t[0].column)}),kl,f,f,Ma),Ua=Rl(Ra,kl,f,f,Wa),Ga=Rl(Da,kl,f,f,Ma),Ka=Rl(Oa,kl,f,f,Ma),Ya=Rl(((e,t,o,n)=>{const r=Xl(e,t,o,n.replaceOrInit);return Ca(r,t[0].row,t[0].column)}),kl,f,f,Wa),Ja=Rl(((e,t,o,n)=>{const r=Xl(e,t,o,n.replaceOrInit);return Ca(r,t[0].row,t[0].column)}),kl,f,f,Ma),Qa=Rl(((e,t,o,n)=>{const r=t.cells;ba(r);const s=((e,t,o,n)=>{const r=qo(e).rows;if(0===r.length)return e;for(let e=t.startRow;e<=t.finishRow;e++)for(let o=t.startCol;o<=t.finishCol;o++){const t=r[e],s=Ho(t,o).isLocked;Io(t,o,et(n(),!1,s))}return e})(e,t.bounds,0,n.merge(r));return xa(s,C.from(r[0]))}),((e,t)=>((e,t)=>t.mergable)(0,t).filter((t=>El(e,t.cells)))),Ea,f,fa),Xa=Rl(((e,t,o,n)=>{const r=z(t,((e,t)=>Nl(e,t,o,n.unmerge(t))),e);return xa(r,C.from(t[0]))}),((e,t)=>((e,t)=>t.unmergable)(0,t).filter((t=>El(e,t)))),Ea,f,fa),Za=Rl(((e,t,o,n)=>{const r=((e,t)=>{const o=Zo(e);return xl(o,t,!0)})(t.clipboard,t.generators);var s,l;return((e,t,o,n,r)=>{const s=Yo(t),l=((e,t,o)=>{const n=Vo(t[0]),r=qo(t).cols.length+e.row,s=k(n-e.column,(t=>t+e.column));return{row:r,column:L(s,(e=>P(o,(t=>t!==e)))).getOr(n-1)}})(e,t,s),a=qo(o).rows,c=Fl(l,a,s),i=((e,t,o)=>{if(e.row>=t.length||e.column>Vo(t[0]))return zl.error("invalid start address out of table bounds, row: "+e.row+", column: "+e.column);const n=t.slice(e.row),r=n[0].cells.slice(e.column),s=Vo(o[0]),l=o.length;return zl.value({rowDelta:n.length-l,colDelta:r.length-s})})(l,t,a);return i.map((e=>{const o={...e,colDelta:e.colDelta-c.length},s=Pl(t,o,n),i=Yo(s),m=Fl(l,a,i);return((e,t,o,n,r,s)=>{const l=e.row,a=e.column,c=l+o.length,i=a+Vo(o[0])+s.length,m=I(s,x);for(let e=l;e<c;e++){let s=0;for(let c=a;c<i;c++){if(m[c]){s++;continue}Il(t,e,c,r)&&Nl(t,$o(t[e],c),r,n.cell);const i=c-a-s,d=Ho(o[e-l],i),u=d.element,f=n.replace(u);Io(t[e],c,et(f,!0,d.isLocked))}}return t})(l,s,a,n,r,m)}))})((s=t.row,l=t.column,{row:s,column:l}),e,r,t.generators,o).fold((()=>xa(e,C.some(t.element))),(e=>Ca(e,t.row,t.column)))}),((e,t)=>qt(t.element).bind((o=>Sl(e,o).map((e=>({...e,generators:t.generators,clipboard:t.clipboard})))))),Ea,f,da),ec=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[0].column,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=Hl(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),La(!0),f,f,da),tc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[t.cells.length-1].column+t.cells[t.cells.length-1].colspan,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=Hl(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),La(!1),f,f,da),oc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[0].row,l=r[s],a=ka(t.clipboard,t.generators,l),c=$l(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),Dl,f,f,da),nc=Rl(((e,t,o,n)=>{const r=qo(e).rows,s=t.cells[t.cells.length-1].row+t.cells[t.cells.length-1].rowspan,l=r[t.cells[0].row],a=ka(t.clipboard,t.generators,l),c=$l(s,e,a,t.generators,o);return Ca(c,t.cells[0].row,t.cells[0].column)}),Dl,f,f,da),rc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind((e=>{const t=e[e.length-1],n=e[0].column,r=t.column+t.colspan,s=M(E(o.all,(e=>_(e.cells,(e=>e.column>=n&&e.column<r)))));return ll(s)})).getOr("")},sc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind(ll).getOr("")},lc=(e,t)=>{const o=Zo(e);return Ol(o,t).bind((e=>{const t=e[e.length-1],n=e[0].row,r=t.row+t.rowspan;return(e=>{const t=E(e,(e=>sl(e).type)),o=D(t,"header"),n=D(t,"footer");if(o||n){const e=D(t,"body");return!o||e||n?o||e||!n?C.none():C.some("footer"):C.some("header")}return C.some("body")})(o.all.slice(n,r))})).getOr("")},ac=(e,t)=>e.dispatch("NewRow",{node:t}),cc=(e,t)=>e.dispatch("NewCell",{node:t}),ic=(e,t,o)=>{e.dispatch("TableModified",{...o,table:t})},mc={structure:!1,style:!0},dc={structure:!0,style:!1},uc={structure:!0,style:!0},fc=(e,t)=>Hr(e)?ur(t):$r(e)?dr(t):mr(t),gc=(e,t,o)=>{const n=e=>"table"===ne(Zr(e)),r=Wr(e),s=Ir(e)?f:Gs,l=t=>{switch(Mr(e)){case"section":return ul();case"sectionCells":return fl();case"cells":return gl();default:return((e,t)=>{var o;switch((o=Zo(e),V(o.all,(e=>{const t=sl(e);return"header"===t.type?C.from(t.subType):C.none()}))).getOr(t)){case"section":return il();case"sectionCells":return ml();case"cells":return dl()}})(t,"section")}},a=(n,s,a,c)=>(i,m,d=!1)=>{ts(i);const u=xe.fromDom(e.getDoc()),f=Br(a,u,r),g={sizing:fc(e,i),resize:Ir(e)?Zs():el(),section:l(i)};return s(i)?n(i,m,f,g).bind((n=>{t.refresh(i.dom),N(n.newRows,(t=>{ac(e,t.dom)})),N(n.newCells,(t=>{cc(e,t.dom)}));const r=((t,n)=>n.cursor.fold((()=>{const n=Ut(t);return H(n).filter(lt).map((n=>{o.clearSelectedCells(t.dom);const r=e.dom.createRng();return r.selectNode(n.dom),e.selection.setRng(r),ge(n,"data-mce-selected","1"),r}))}),(n=>{const r=qs(Us,n),s=e.dom.createRng();return s.setStart(r.element.dom,r.offset),s.setEnd(r.element.dom,r.offset),e.selection.setRng(s),o.clearSelectedCells(t.dom),C.some(s)})))(i,n);return lt(i)&&(ts(i),d||ic(e,i.dom,c)),r.map((e=>({rng:e,effect:c})))})):C.none()},c=a($a,(t=>!n(e)||tl(t).rows>1),f,dc),i=a(Ha,(t=>!n(e)||tl(t).columns>1),f,dc);return{deleteRow:c,deleteColumn:i,insertRowsBefore:a(ja,x,f,dc),insertRowsAfter:a(Pa,x,f,dc),insertColumnsBefore:a(Ia,x,s,dc),insertColumnsAfter:a(Fa,x,s,dc),mergeCells:a(Qa,x,f,dc),unmergeCells:a(Xa,x,f,dc),pasteColsBefore:a(ec,x,f,dc),pasteColsAfter:a(tc,x,f,dc),pasteRowsBefore:a(oc,x,f,dc),pasteRowsAfter:a(nc,x,f,dc),pasteCells:a(Za,x,f,uc),makeCellsHeader:a(Ya,x,f,dc),unmakeCellsHeader:a(Ja,x,f,dc),makeColumnsHeader:a(Va,x,f,dc),unmakeColumnsHeader:a(qa,x,f,dc),makeRowsHeader:a(Ua,x,f,dc),makeRowsBody:a(Ga,x,f,dc),makeRowsFooter:a(Ka,x,f,dc),getTableRowType:lc,getTableCellType:sc,getTableColType:rc}},hc=(e,t,o)=>{const n=Wt(e,t,1);1===o||n<=1?be(e,t):ge(e,t,Math.min(o,n))},pc=(e,t)=>o=>{const n=o.column+o.colspan-1,r=o.column;return n>=e&&r<t},wc=Zl([{invalid:["raw"]},{pixels:["value"]},{percent:["value"]}]),bc=(e,t,o)=>{const n=o.substring(0,o.length-e.length),r=parseFloat(n);return n===r.toString()?t(r):wc.invalid(o)},vc={...wc,from:e=>Rt(e,"%")?bc("%",wc.percent,e):Rt(e,"px")?bc("px",wc.pixels,e):wc.invalid(e)},yc=(e,t,o)=>{const n=vc.from(o),r=P(e,(e=>"0px"===e))?((e,t)=>{const o=e.fold((()=>g("")),(e=>g(e/t+"px")),(()=>g(100/t+"%")));return k(t,o)})(n,e.length):((e,t,o)=>e.fold((()=>t),(e=>((e,t,o)=>{const n=o/t;return E(e,(e=>vc.from(e).fold((()=>e),(e=>e*n+"px"),(e=>e/100*o+"px"))))})(t,o,e)),(e=>((e,t)=>E(e,(e=>vc.from(e).fold((()=>e),(e=>e/t*100+"%"),(e=>e+"%")))))(t,o))))(n,e,t);return Sc(r)},xc=(e,t)=>0===e.length?t:z(e,((e,t)=>vc.from(t).fold(g(0),h,h)+e),0),Cc=(e,t)=>vc.from(e).fold(g(e),(e=>e+t+"px"),(e=>e+t+"%")),Sc=e=>{if(0===e.length)return e;const t=z(e,((e,t)=>{const o=vc.from(t).fold((()=>({value:t,remainder:0})),(e=>((e,t)=>{const o=Math.floor(e);return{value:o+"px",remainder:e-o}})(e)),(e=>({value:e+"%",remainder:0})));return{output:[o.value].concat(e.output),remainder:e.remainder+o.remainder}}),{output:[],remainder:0}),o=t.output;return o.slice(0,o.length-1).concat([Cc(o[o.length-1],Math.round(t.remainder))])},Tc=vc.from,Rc=e=>Tc(e).fold(g("px"),g("px"),g("%")),Dc=(e,t,o)=>{const n=Zo(e),r=n.all,s=rn(n),l=sn(n);t.each((t=>{const o=Rc(t),r=Lo(e),a=((e,t)=>nr(e,t,er,rr))(n,e),c=yc(a,r,t);ln(n)?((e,t,o)=>{N(t,((t,n)=>{const r=xc([e[n]],Ft());Nt(t.element,"width",r+o)}))})(c,l,o):((e,t,o)=>{N(t,(t=>{const n=e.slice(t.column,t.colspan+t.column),r=xc(n,Ft());Nt(t.element,"width",r+o)}))})(c,s,o),Nt(e,"width",t)})),o.each((t=>{const o=Rc(t),l=hn(e),a=((e,t,o)=>lr(e,t,o,tr,rr))(n,e,_n);((e,t,o,n)=>{N(o,(t=>{const o=e.slice(t.row,t.rowspan+t.row),r=xc(o,Ht());Nt(t.element,"height",r+n)})),N(t,((t,o)=>{Nt(t.element,"height",e[o])}))})(yc(a,l,t),r,s,o),Nt(e,"height",t)}))},Oc=e=>Un(e).exists((e=>Mn.test(e))),kc=e=>Un(e).exists((e=>jn.test(e))),Ec=e=>Un(e).isNone(),Nc=e=>{be(e,"width")},Bc=e=>{const t=Qn(e);Dc(e,C.some(t),C.none()),Nc(e)},_c=e=>{const t=(e=>Lo(e)+"px")(e);Dc(e,C.some(t),C.none()),Nc(e)},zc=e=>{Lt(e,"width");const t=Gt(e),o=t.length>0?t:Ut(e);N(o,(e=>{Lt(e,"width"),Nc(e)})),Nc(e)},Ac={styles:{"border-collapse":"collapse",width:"100%"},attributes:{border:"1"},colGroups:!1},Lc=(e,t,o,n)=>k(e,(e=>((e,t,o,n)=>{const r=xe.fromTag("tr");for(let s=0;s<e;s++){const e=xe.fromTag(n<t||s<o?"th":"td");s<o&&ge(e,"scope","row"),n<t&&ge(e,"scope","col"),Ie(e,xe.fromTag("br")),Ie(r,e)}return r})(t,o,n,e))),Wc=(e,t)=>{e.selection.select(t.dom,!0),e.selection.collapse(!0)},Mc=(e,t,o,n,s)=>{const l=(e=>{const t=e.options,o=t.get("table_default_styles");return t.isSet("table_default_styles")?o:((e,t)=>Vr(e)||!Ur(e)?t:$r(e)?{...t,width:Lr(e)}:{...t,width:Ar})(e,o)})(e),a={styles:l,attributes:Kr(e),colGroups:Yr(e)};return e.undoManager.ignore((()=>{const r=((e,t,o,n,r,s=Ac)=>{const l=xe.fromTag("table"),a="cells"!==r;Bt(l,s.styles),he(l,s.attributes),s.colGroups&&Ie(l,(e=>{const t=xe.fromTag("colgroup");return k(e,(()=>Ie(t,xe.fromTag("col")))),t})(t));const c=Math.min(e,o);if(a&&o>0){const e=xe.fromTag("thead");Ie(l,e);const s=Lc(o,t,"sectionCells"===r?c:0,n);$e(e,s)}const i=xe.fromTag("tbody");Ie(l,i);const m=Lc(a?e-c:e,t,a?0:o,n);return $e(i,m),l})(o,t,s,n,Mr(e),a);ge(r,"data-mce-id","__mce");const l=(e=>{const t=xe.fromTag("div"),o=xe.fromDom(e.dom.cloneNode(!0));return Ie(t,o),(e=>e.dom.innerHTML)(t)})(r);e.insertContent(l),e.addVisual()})),wt(Zr(e),'table[data-mce-id="__mce"]').map((t=>($r(e)?_c(t):Vr(e)?zc(t):(Hr(e)||(e=>r(e)&&-1!==e.indexOf("%"))(l.width))&&Bc(t),ts(t),be(t,"data-mce-id"),((e,t)=>{N(dt(t,"tr"),(t=>{ac(e,t.dom),N(dt(t,"th,td"),(t=>{cc(e,t.dom)}))}))})(e,t),((e,t)=>{wt(t,"td,th").each(w(Wc,e))})(e,t),t.dom))).getOrNull()};var jc=tinymce.util.Tools.resolve("tinymce.FakeClipboard");const Pc="x-tinymce/dom-table-",Ic=Pc+"rows",Fc=Pc+"columns",Hc=e=>{const t=jc.FakeClipboardItem(e);jc.write([t])},$c=e=>{var t;const o=null!==(t=jc.read())&&void 0!==t?t:[];return V(o,(t=>C.from(t.getType(e))))},Vc=e=>{$c(e).isSome()&&jc.clear()},qc=e=>{e.fold(Gc,(e=>Hc({[Ic]:e})))},Uc=()=>$c(Ic),Gc=()=>Vc(Ic),Kc=e=>{e.fold(Jc,(e=>Hc({[Fc]:e})))},Yc=()=>$c(Fc),Jc=()=>Vc(Fc),Qc=e=>Ms(os(e),es(e)).filter(ss),Xc=(e,t)=>{const o=es(e),n=e=>Kt(e,o),l=t=>(e=>js(os(e),es(e)).filter(ss))(e).bind((e=>n(e).map((o=>t(o,e))))),a=t=>{e.focus()},c=(t,o=!1)=>l(((n,r)=>{const s=Ls(Ps(e),n,r);t(n,s,o).each(a)})),i=()=>l(((t,o)=>((e,t,o)=>{const n=Zo(e);return Ol(n,t).bind((e=>{const t=xl(n,o,!1),r=qo(t).rows.slice(e[0].row,e[e.length-1].row+e[e.length-1].rowspan),s=j(r,(e=>{const t=_(e.cells,(e=>!e.isLocked));return t.length>0?[{...e,cells:t}]:[]})),l=Cl(s);return xt(l.length>0,l)})).map((e=>E(e,(e=>{const t=Ke(e.element);return N(e.cells,(e=>{const o=Ye(e.element);pl(o,"colspan",e.colspan,1),pl(o,"rowspan",e.rowspan,1),Ie(t,o)})),t}))))})(t,Ls(Ps(e),t,o),Br(f,xe.fromDom(e.getDoc()),C.none())))),m=()=>l(((t,o)=>((e,t)=>{const o=Zo(e);return kl(o,t).map((e=>{const t=e[e.length-1],n=e[0].column,r=t.column+t.colspan,s=((e,t,o)=>{if(ln(e)){const n=_(sn(e),pc(t,o)),r=E(n,(e=>{const n=Ye(e.element);return hc(n,"span",o-t),n})),s=xe.fromTag("colgroup");return $e(s,r),[s]}return[]})(o,n,r),l=((e,t,o)=>E(e.all,(e=>{const n=_(e.cells,pc(t,o)),r=E(n,(e=>{const n=Ye(e.element);return hc(n,"colspan",o-t),n})),s=xe.fromTag("tr");return $e(s,r),s})))(o,n,r);return[...s,...l]}))})(t,Ls(Ps(e),t,o)))),d=(t,o)=>o().each((o=>{const n=E(o,(e=>Ye(e)));l(((o,r)=>{const s=_r(xe.fromDom(e.getDoc())),l=((e,t,o,n)=>({selection:Os(e),clipboard:o,generators:n}))(Ps(e),0,n,s);t(o,l).each(a)}))})),g=e=>(t,o)=>((e,t)=>X(e,t)?C.from(e[t]):C.none())(o,"type").each((t=>{c(e(t),o.no_events)}));G({mceTableSplitCells:()=>c(t.unmergeCells),mceTableMergeCells:()=>c(t.mergeCells),mceTableInsertRowBefore:()=>c(t.insertRowsBefore),mceTableInsertRowAfter:()=>c(t.insertRowsAfter),mceTableInsertColBefore:()=>c(t.insertColumnsBefore),mceTableInsertColAfter:()=>c(t.insertColumnsAfter),mceTableDeleteCol:()=>c(t.deleteColumn),mceTableDeleteRow:()=>c(t.deleteRow),mceTableCutCol:()=>m().each((e=>{Kc(e),c(t.deleteColumn)})),mceTableCutRow:()=>i().each((e=>{qc(e),c(t.deleteRow)})),mceTableCopyCol:()=>m().each((e=>Kc(e))),mceTableCopyRow:()=>i().each((e=>qc(e))),mceTablePasteColBefore:()=>d(t.pasteColsBefore,Yc),mceTablePasteColAfter:()=>d(t.pasteColsAfter,Yc),mceTablePasteRowBefore:()=>d(t.pasteRowsBefore,Uc),mceTablePasteRowAfter:()=>d(t.pasteRowsAfter,Uc),mceTableDelete:()=>Qc(e).each((t=>{Kt(t,o).filter(b(o)).each((t=>{const o=xe.fromText("");if(je(t,o),qe(t),e.dom.isEmpty(e.getBody()))e.setContent(""),e.selection.setCursorLocation();else{const t=e.dom.createRng();t.setStart(o.dom,0),t.setEnd(o.dom,0),e.selection.setRng(t),e.nodeChanged()}}))})),mceTableCellToggleClass:(t,o)=>{l((t=>{const n=Ps(e),r=P(n,(t=>e.formatter.match("tablecellclass",{value:o},t.dom))),s=r?e.formatter.remove:e.formatter.apply;N(n,(e=>s("tablecellclass",{value:o},e.dom))),ic(e,t.dom,mc)}))},mceTableToggleClass:(t,o)=>{l((t=>{e.formatter.toggle("tableclass",{value:o},t.dom),ic(e,t.dom,mc)}))},mceTableToggleCaption:()=>{Qc(e).each((t=>{Kt(t,o).each((o=>{pt(o,"caption").fold((()=>{const t=xe.fromTag("caption");Ie(t,xe.fromText("Caption")),((e,t,o)=>{We(e,0).fold((()=>{Ie(e,t)}),(e=>{Me(e,t)}))})(o,t),e.selection.setCursorLocation(t.dom,0)}),(n=>{ue("caption")(t)&&Te("td",o).each((t=>e.selection.setCursorLocation(t.dom,0))),qe(n)})),ic(e,o.dom,dc)}))}))},mceTableSizingMode:(t,n)=>(t=>Qc(e).each((n=>{Vr(e)||$r(e)||Hr(e)||Kt(n,o).each((o=>{"relative"!==t||Oc(o)?"fixed"!==t||kc(o)?"responsive"!==t||Ec(o)||zc(o):_c(o):Bc(o),ts(o),ic(e,o.dom,dc)}))})))(n),mceTableCellType:g((e=>"th"===e?t.makeCellsHeader:t.unmakeCellsHeader)),mceTableColType:g((e=>"th"===e?t.makeColumnsHeader:t.unmakeColumnsHeader)),mceTableRowType:g((e=>{switch(e){case"header":return t.makeRowsHeader;case"footer":return t.makeRowsFooter;default:return t.makeRowsBody}}))},((t,o)=>e.addCommand(o,t))),e.addCommand("mceInsertTable",((t,o)=>{((e,t,o,n={})=>{const r=e=>u(e)&&e>0;if(r(t)&&r(o)){const r=n.headerRows||0,s=n.headerColumns||0;return Mc(e,o,t,s,r)}console.error("Invalid values for mceInsertTable - rows and columns values are required to insert a table.")})(e,o.rows,o.columns,o.options)})),e.addCommand("mceTableApplyCellStyle",((t,o)=>{const l=e=>"tablecell"+e.toLowerCase().replace("-","");if(!s(o))return;const a=_(Ps(e),ss);if(0===a.length)return;const c=((e,t)=>{const o={};return((e,t,o,n)=>{G(e,((e,r)=>{(t(e,r)?o:n)(e,r)}))})(e,t,(e=>(t,o)=>{e[o]=t})(o),f),o})(o,((t,o)=>e.formatter.has(l(o))&&r(t)));(e=>{for(const t in e)if(U.call(e,t))return!1;return!0})(c)||(G(c,((t,o)=>{const n=l(o);N(a,(o=>{""===t?e.formatter.remove(n,{value:null},o.dom,!0):e.formatter.apply(n,{value:t},o.dom)}))})),n(a[0]).each((t=>ic(e,t.dom,mc))))}))},Zc=Zl([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),ei={before:Zc.before,on:Zc.on,after:Zc.after,cata:(e,t,o,n)=>e.fold(t,o,n),getStart:e=>e.fold(h,h,h)},ti=(e,t)=>({selection:e,kill:t}),oi=(e,t)=>{const o=e.document.createRange();return o.selectNode(t.dom),o},ni=(e,t)=>{const o=e.document.createRange();return ri(o,t),o},ri=(e,t)=>e.selectNodeContents(t.dom),si=(e,t,o)=>{const n=e.document.createRange();var r;return r=n,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,o)=>{e.setEnd(t.dom,o)}),(t=>{e.setEndAfter(t.dom)}))})(n,o),n},li=(e,t,o,n,r)=>{const s=e.document.createRange();return s.setStart(t.dom,o),s.setEnd(n.dom,r),s},ai=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom,width:e.width,height:e.height}),ci=Zl([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),ii=(e,t,o)=>t(xe.fromDom(o.startContainer),o.startOffset,xe.fromDom(o.endContainer),o.endOffset),mi=(e,t)=>{const o=((e,t)=>t.match({domRange:e=>({ltr:g(e),rtl:C.none}),relative:(t,o)=>({ltr:eo((()=>si(e,t,o))),rtl:eo((()=>C.some(si(e,o,t))))}),exact:(t,o,n,r)=>({ltr:eo((()=>li(e,t,o,n,r))),rtl:eo((()=>C.some(li(e,n,r,t,o))))})}))(e,t);return((e,t)=>{const o=t.ltr();return o.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>ci.rtl(xe.fromDom(e.endContainer),e.endOffset,xe.fromDom(e.startContainer),e.startOffset))).getOrThunk((()=>ii(0,ci.ltr,o))):ii(0,ci.ltr,o)})(0,o)},di=(e,t)=>mi(e,t).match({ltr:(t,o,n,r)=>{const s=e.document.createRange();return s.setStart(t.dom,o),s.setEnd(n.dom,r),s},rtl:(t,o,n,r)=>{const s=e.document.createRange();return s.setStart(n.dom,r),s.setEnd(t.dom,o),s}});ci.ltr,ci.rtl;const ui=(e,t,o,n)=>({start:e,soffset:t,finish:o,foffset:n}),fi=(e,t,o,n)=>({start:ei.on(e,t),finish:ei.on(o,n)}),gi=(e,t)=>{const o=di(e,t);return ui(xe.fromDom(o.startContainer),o.startOffset,xe.fromDom(o.endContainer),o.endOffset)},hi=fi,pi=(e,t,o,n,r)=>Re(o,n)?C.none():xs(o,n,t).bind((t=>{const n=t.boxes.getOr([]);return n.length>1?(r(e,n,t.start,t.finish),C.some(ti(C.some(hi(o,0,o,br(o))),!0))):C.none()})),wi=(e,t)=>({item:e,mode:t}),bi=(e,t,o,n=vi)=>e.property().parent(t).map((e=>wi(e,n))),vi=(e,t,o,n=yi)=>o.sibling(e,t).map((e=>wi(e,n))),yi=(e,t,o,n=yi)=>{const r=e.property().children(t);return o.first(r).map((e=>wi(e,n)))},xi=[{current:bi,next:vi,fallback:C.none()},{current:vi,next:yi,fallback:C.some(bi)},{current:yi,next:yi,fallback:C.some(vi)}],Ci=(e,t,o,n,r=xi)=>L(r,(e=>e.current===o)).bind((o=>o.current(e,t,n,o.next).orThunk((()=>o.fallback.bind((o=>Ci(e,t,o,n))))))),Si=(e,t,o,n,r,s)=>Ci(e,t,n,r).bind((t=>s(t.item)?C.none():o(t.item)?C.some(t.item):Si(e,t.item,o,t.mode,r,s))),Ti=e=>t=>0===e.property().children(t).length,Ri=(e,t,o,n)=>Si(e,t,o,vi,{sibling:(e,t)=>e.query().prevSibling(t),first:e=>e.length>0?C.some(e[e.length-1]):C.none()},n),Di=(e,t,o,n)=>Si(e,t,o,vi,{sibling:(e,t)=>e.query().nextSibling(t),first:e=>e.length>0?C.some(e[0]):C.none()},n),Oi=hs(),ki=(e,t)=>((e,t,o)=>Ri(e,t,Ti(e),o))(Oi,e,t),Ei=(e,t)=>((e,t,o)=>Di(e,t,Ti(e),o))(Oi,e,t),Ni=Zl([{none:["message"]},{success:[]},{failedUp:["cell"]},{failedDown:["cell"]}]),Bi=e=>bt(e,"tr"),_i={...Ni,verify:(e,t,o,n,r,s,l)=>bt(n,"td,th",l).bind((o=>bt(t,"td,th",l).map((t=>Re(o,t)?Re(n,o)&&br(o)===r?s(t):Ni.none("in same cell"):vs(Bi,[o,t]).fold((()=>((e,t,o)=>{const n=e.getRect(t),r=e.getRect(o);return r.right>n.left&&r.left<n.right})(e,t,o)?Ni.success():s(t)),(e=>s(t))))))).getOr(Ni.none("default")),cata:(e,t,o,n,r)=>e.fold(t,o,n,r)},zi=ue("br"),Ai=(e,t,o)=>t(e,o).bind((e=>ie(e)&&0===hr(e).trim().length?Ai(e,t,o):C.some(e))),Li=(e,t,o,n)=>((e,t)=>We(e,t).filter(zi).orThunk((()=>We(e,t-1).filter(zi))))(t,o).bind((t=>n.traverse(t).fold((()=>Ai(t,n.gather,e).map(n.relative)),(e=>(e=>Ne(e).bind((t=>{const o=Le(t);return((e,t)=>W(e,w(Re,t)))(o,e).map((n=>((e,t,o,n)=>({parent:e,children:t,element:o,index:n}))(t,o,e,n)))})))(e).map((e=>ei.on(e.parent,e.index))))))),Wi=(e,t)=>({left:e.left,top:e.top+t,right:e.right,bottom:e.bottom+t}),Mi=(e,t)=>({left:e.left,top:e.top-t,right:e.right,bottom:e.bottom-t}),ji=(e,t,o)=>({left:e.left+t,top:e.top+o,right:e.right+t,bottom:e.bottom+o}),Pi=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom}),Ii=(e,t)=>C.some(e.getRect(t)),Fi=(e,t,o)=>ce(t)?Ii(e,t).map(Pi):ie(t)?((e,t,o)=>o>=0&&o<br(t)?e.getRangedRect(t,o,t,o+1):o>0?e.getRangedRect(t,o-1,t,o):C.none())(e,t,o).map(Pi):C.none(),Hi=(e,t)=>ce(t)?Ii(e,t).map(Pi):ie(t)?e.getRangedRect(t,0,t,br(t)).map(Pi):C.none(),$i=Zl([{none:[]},{retry:["caret"]}]),Vi=(e,t,o)=>gt(t,pa).fold(y,(t=>Hi(e,t).exists((e=>((e,t)=>e.left<t.left||Math.abs(t.right-e.left)<1||e.left>t.right)(o,e))))),qi={point:e=>e.bottom,adjuster:(e,t,o,n,r)=>{const s=Wi(r,5);return Math.abs(o.bottom-n.bottom)<1||o.top>r.bottom?$i.retry(s):o.top===r.bottom?$i.retry(Wi(r,1)):Vi(e,t,r)?$i.retry(ji(s,5,0)):$i.none()},move:Wi,gather:Ei},Ui=(e,t,o,n,r)=>0===r?C.some(n):((e,t,o)=>e.elementFromPoint(t,o).filter((e=>"table"===ne(e))).isSome())(e,n.left,t.point(n))?((e,t,o,n,r)=>Ui(e,t,o,t.move(n,5),r))(e,t,o,n,r-1):e.situsFromPoint(n.left,t.point(n)).bind((s=>s.start.fold(C.none,(s=>Hi(e,s).bind((l=>t.adjuster(e,s,l,o,n).fold(C.none,(n=>Ui(e,t,o,n,r-1))))).orThunk((()=>C.some(n)))),C.none))),Gi=(e,t,o)=>{const n=e.move(o,5),r=Ui(t,e,o,n,100).getOr(n);return((e,t,o)=>e.point(t)>o.getInnerHeight()?C.some(e.point(t)-o.getInnerHeight()):e.point(t)<0?C.some(-e.point(t)):C.none())(e,r,t).fold((()=>t.situsFromPoint(r.left,e.point(r))),(o=>(t.scrollBy(0,o),t.situsFromPoint(r.left,e.point(r)-o))))},Ki={tryUp:w(Gi,{point:e=>e.top,adjuster:(e,t,o,n,r)=>{const s=Mi(r,5);return Math.abs(o.top-n.top)<1||o.bottom<r.top?$i.retry(s):o.bottom===r.top?$i.retry(Mi(r,1)):Vi(e,t,r)?$i.retry(ji(s,5,0)):$i.none()},move:Mi,gather:ki}),tryDown:w(Gi,qi),getJumpSize:g(5)},Yi=(e,t,o)=>e.getSelection().bind((n=>((e,t,o,n)=>{const r=zi(t)?((e,t,o)=>o.traverse(t).orThunk((()=>Ai(t,o.gather,e))).map(o.relative))(e,t,n):Li(e,t,o,n);return r.map((e=>({start:e,finish:e})))})(t,n.finish,n.foffset,o).fold((()=>C.some(Fs(n.finish,n.foffset))),(r=>{const s=e.fromSitus(r);return l=_i.verify(e,n.finish,n.foffset,s.finish,s.foffset,o.failure,t),_i.cata(l,(e=>C.none()),(()=>C.none()),(e=>C.some(Fs(e,0))),(e=>C.some(Fs(e,br(e)))));var l})))),Ji=(e,t,o,n,r,s)=>0===s?C.none():Zi(e,t,o,n,r).bind((l=>{const a=e.fromSitus(l),c=_i.verify(e,o,n,a.finish,a.foffset,r.failure,t);return _i.cata(c,(()=>C.none()),(()=>C.some(l)),(l=>Re(o,l)&&0===n?Qi(e,o,n,Mi,r):Ji(e,t,l,0,r,s-1)),(l=>Re(o,l)&&n===br(l)?Qi(e,o,n,Wi,r):Ji(e,t,l,br(l),r,s-1)))})),Qi=(e,t,o,n,r)=>Fi(e,t,o).bind((t=>Xi(e,r,n(t,Ki.getJumpSize())))),Xi=(e,t,o)=>{const n=Bo().browser;return n.isChromium()||n.isSafari()||n.isFirefox()?t.retry(e,o):C.none()},Zi=(e,t,o,n,r)=>Fi(e,o,n).bind((t=>Xi(e,r,t))),em=(e,t,o,n,r)=>bt(n,"td,th",t).bind((n=>bt(n,"table",t).bind((s=>((e,t)=>ft(e,(e=>Ne(e).exists((e=>Re(e,t)))),void 0).isSome())(r,s)?((e,t,o)=>Yi(e,t,o).bind((n=>Ji(e,t,n.element,n.offset,o,20).map(e.fromSitus))))(e,t,o).bind((e=>bt(e.finish,"td,th",t).map((t=>({start:n,finish:t,range:e}))))):C.none())))),tm=(e,t,o,n,r,s)=>s(n,t).orThunk((()=>em(e,t,o,n,r).map((e=>{const t=e.range;return ti(C.some(hi(t.start,t.soffset,t.finish,t.foffset)),!0)})))),om=(e,t)=>bt(e,"tr",t).bind((e=>bt(e,"table",t).bind((o=>{const n=dt(o,"tr");return Re(e,n[0])?((e,t,o)=>Ri(Oi,e,(e=>Cr(e).isSome()),o))(o,0,t).map((e=>{const t=br(e);return ti(C.some(hi(e,t,e,t)),!0)})):C.none()})))),nm=(e,t)=>bt(e,"tr",t).bind((e=>bt(e,"table",t).bind((o=>{const n=dt(o,"tr");return Re(e,n[n.length-1])?((e,t,o)=>Di(Oi,e,(e=>xr(e).isSome()),o))(o,0,t).map((e=>ti(C.some(hi(e,0,e,0)),!0))):C.none()})))),rm=(e,t,o,n,r,s,l)=>em(e,o,n,r,s).bind((e=>pi(t,o,e.start,e.finish,l))),sm=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},lm=()=>{const e=(e=>{const t=sm(C.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(C.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(C.some(e))}}})(f);return{...e,on:t=>e.get().each(t)}},am=(e,t)=>bt(e,"td,th",t),cm=e=>Be(e).exists(Qr),im={traverse:Ae,gather:Ei,relative:ei.before,retry:Ki.tryDown,failure:_i.failedDown},mm={traverse:ze,gather:ki,relative:ei.before,retry:Ki.tryUp,failure:_i.failedUp},dm=e=>t=>t===e,um=dm(38),fm=dm(40),gm=e=>e>=37&&e<=40,hm={isBackward:dm(37),isForward:dm(39)},pm={isBackward:dm(39),isForward:dm(37)},wm=Zl([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),bm={domRange:wm.domRange,relative:wm.relative,exact:wm.exact,exactFromRange:e=>wm.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>xe.fromDom(e.startContainer),relative:(e,t)=>ei.getStart(e),exact:(e,t,o,n)=>e}))(e);return xe.fromDom(Ee(t).dom.defaultView)},range:ui},vm=document.caretPositionFromPoint?(e,t,o)=>{var n,r;return C.from(null===(r=(n=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(n,t,o)).bind((t=>{if(null===t.offsetNode)return C.none();const o=e.dom.createRange();return o.setStart(t.offsetNode,t.offset),o.collapse(),C.some(o)}))}:document.caretRangeFromPoint?(e,t,o)=>{var n,r;return C.from(null===(r=(n=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(n,t,o))}:C.none,ym=(e,t)=>{const o=ne(e);return"input"===o?ei.after(e):D(["br","img"],o)?0===t?ei.before(e):ei.after(e):ei.on(e,t)},xm=e=>C.from(e.getSelection()),Cm=(e,t)=>{xm(e).each((e=>{e.removeAllRanges(),e.addRange(t)}))},Sm=(e,t,o,n,r)=>{const s=li(e,t,o,n,r);Cm(e,s)},Tm=(e,t)=>mi(e,t).match({ltr:(t,o,n,r)=>{Sm(e,t,o,n,r)},rtl:(t,o,n,r)=>{xm(e).each((s=>{if(s.setBaseAndExtent)s.setBaseAndExtent(t.dom,o,n.dom,r);else if(s.extend)try{((e,t,o,n,r,s)=>{t.collapse(o.dom,n),t.extend(r.dom,s)})(0,s,t,o,n,r)}catch(s){Sm(e,n,r,t,o)}else Sm(e,n,r,t,o)}))}}),Rm=(e,t,o,n,r)=>{const s=((e,t,o,n)=>{const r=ym(e,t),s=ym(o,n);return bm.relative(r,s)})(t,o,n,r);Tm(e,s)},Dm=(e,t,o)=>{const n=((e,t)=>{const o=e.fold(ei.before,ym,ei.after),n=t.fold(ei.before,ym,ei.after);return bm.relative(o,n)})(t,o);Tm(e,n)},Om=e=>{if(e.rangeCount>0){const t=e.getRangeAt(0),o=e.getRangeAt(e.rangeCount-1);return C.some(ui(xe.fromDom(t.startContainer),t.startOffset,xe.fromDom(o.endContainer),o.endOffset))}return C.none()},km=e=>{if(null===e.anchorNode||null===e.focusNode)return Om(e);{const t=xe.fromDom(e.anchorNode),o=xe.fromDom(e.focusNode);return((e,t,o,n)=>{const r=((e,t,o,n)=>{const r=ke(e).dom.createRange();return r.setStart(e.dom,t),r.setEnd(o.dom,n),r})(e,t,o,n),s=Re(e,o)&&t===n;return r.collapsed&&!s})(t,e.anchorOffset,o,e.focusOffset)?C.some(ui(t,e.anchorOffset,o,e.focusOffset)):Om(e)}},Em=(e,t,o=!0)=>{const n=(o?ni:oi)(e,t);Cm(e,n)},Nm=e=>(e=>xm(e).filter((e=>e.rangeCount>0)).bind(km))(e).map((e=>bm.exact(e.start,e.soffset,e.finish,e.foffset))),Bm=e=>({elementFromPoint:(t,o)=>xe.fromPoint(xe.fromDom(e.document),t,o),getRect:e=>e.dom.getBoundingClientRect(),getRangedRect:(t,o,n,r)=>{const s=bm.exact(t,o,n,r);return((e,t)=>(e=>{const t=e.getClientRects(),o=t.length>0?t[0]:e.getBoundingClientRect();return o.width>0||o.height>0?C.some(o).map(ai):C.none()})(di(e,t)))(e,s)},getSelection:()=>Nm(e).map((t=>gi(e,t))),fromSitus:t=>{const o=bm.relative(t.start,t.finish);return gi(e,o)},situsFromPoint:(t,o)=>((e,t,o)=>((e,t,o)=>{const n=xe.fromDom(e.document);return vm(n,t,o).map((e=>ui(xe.fromDom(e.startContainer),e.startOffset,xe.fromDom(e.endContainer),e.endOffset)))})(e,t,o))(e,t,o).map((e=>fi(e.start,e.soffset,e.finish,e.foffset))),clearSelection:()=>{(e=>{xm(e).each((e=>e.removeAllRanges()))})(e)},collapseSelection:(t=!1)=>{Nm(e).each((o=>o.fold((e=>e.collapse(t)),((o,n)=>{const r=t?o:n;Dm(e,r,r)}),((o,n,r,s)=>{const l=t?o:r,a=t?n:s;Rm(e,l,a,l,a)}))))},setSelection:t=>{Rm(e,t.start,t.soffset,t.finish,t.foffset)},setRelativeSelection:(t,o)=>{Dm(e,t,o)},selectNode:t=>{Em(e,t,!1)},selectContents:t=>{Em(e,t)},getInnerHeight:()=>e.innerHeight,getScrollY:()=>(e=>{const t=void 0!==e?e.dom:document,o=t.body.scrollLeft||t.documentElement.scrollLeft,n=t.body.scrollTop||t.documentElement.scrollTop;return bn(o,n)})(xe.fromDom(e.document)).top,scrollBy:(t,o)=>{((e,t,o)=>{const n=(void 0!==o?o.dom:document).defaultView;n&&n.scrollBy(e,t)})(t,o,xe.fromDom(e.document))}}),_m=(e,t)=>({rows:e,cols:t}),zm=e=>gt(e,ae).exists(Qr),Am=(e,t)=>zm(e)||zm(t),Lm=e=>void 0!==e.dom.classList,Wm=(e,t)=>((e,t,o)=>{const n=((e,t)=>{const o=pe(e,t);return void 0===o||""===o?[]:o.split(" ")})(e,t).concat([o]);return ge(e,t,n.join(" ")),!0})(e,"class",t),Mm=(e,t)=>{Lm(e)?e.dom.classList.add(t):Wm(e,t)},jm=(e,t)=>Lm(e)&&e.dom.classList.contains(t),Pm=()=>({tag:"none"}),Im=e=>({tag:"multiple",elements:e}),Fm=e=>({tag:"single",element:e}),Hm=e=>{const t=xe.fromDom((e=>{if(nt()&&m(e.target)){const t=xe.fromDom(e.target);if(ce(t)&&m(t.dom.shadowRoot)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return H(t)}}return C.from(e.target)})(e).getOr(e.target)),o=()=>e.stopPropagation(),n=()=>e.preventDefault(),r=(s=n,l=o,(...e)=>s(l.apply(null,e)));var s,l;return((e,t,o,n,r,s,l)=>({target:e,x:t,y:o,stop:n,prevent:r,kill:s,raw:l}))(t,e.clientX,e.clientY,o,n,r,e)},$m=(e,t,o,n)=>{e.dom.removeEventListener(t,o,n)},Vm=x,qm=(e,t,o)=>((e,t,o,n)=>((e,t,o,n,r)=>{const s=((e,t)=>o=>{e(o)&&t(Hm(o))})(o,n);return e.dom.addEventListener(t,s,r),{unbind:w($m,e,t,s,r)}})(e,t,o,n,!1))(e,t,Vm,o),Um=Hm,Gm=e=>!jm(xe.fromDom(e.target),"ephox-snooker-resizer-bar"),Km=(e,t)=>{const o=(r=As.selectedSelector,{get:()=>Rs(xe.fromDom(e.getBody()),r).fold((()=>js(os(e),es(e)).fold(Pm,Fm)),Im)}),n=((e,t,o)=>{const n=t=>{be(t,e.selected),be(t,e.firstSelected),be(t,e.lastSelected)},r=t=>{ge(t,e.selected,"1")},s=e=>{l(e),o()},l=t=>{const o=dt(t,`${e.selectedSelector},${e.firstSelectedSelector},${e.lastSelectedSelector}`);N(o,n)};return{clearBeforeUpdate:l,clear:s,selectRange:(o,n,l,a)=>{s(o),N(n,r),ge(l,e.firstSelected,"1"),ge(a,e.lastSelected,"1"),t(n,l,a)},selectedSelector:e.selectedSelector,firstSelectedSelector:e.firstSelectedSelector,lastSelectedSelector:e.lastSelectedSelector}})(As,((t,o,n)=>{Kt(o).each((r=>{const s=Wr(e),l=Br(f,xe.fromDom(e.getDoc()),s),a=((e,t,o)=>{const n=Zo(e);return Ol(n,t).map((e=>{const t=xl(n,o,!1),{rows:r}=qo(t),s=((e,t)=>{const o=e.slice(0,t[t.length-1].row+1),n=Cl(o);return j(n,(e=>{const o=e.cells.slice(0,t[t.length-1].column+1);return E(o,(e=>e.element))}))})(r,e),l=((e,t)=>{const o=e.slice(t[0].row+t[0].rowspan-1,e.length),n=Cl(o);return j(n,(e=>{const o=e.cells.slice(t[0].column+t[0].colspan-1,e.cells.length);return E(o,(e=>e.element))}))})(r,e);return{upOrLeftCells:s,downOrRightCells:l}}))})(r,{selection:Ps(e)},l);((e,t,o,n,r)=>{e.dispatch("TableSelectionChange",{cells:t,start:o,finish:n,otherCells:r})})(e,t,o,n,a)}))}),(()=>(e=>{e.dispatch("TableSelectionClear")})(e)));var r;return e.on("init",(o=>{const r=e.getWin(),s=Zr(e),l=es(e),a=((e,t,o,n)=>{const r=((e,t,o,n)=>{const r=lm(),s=r.clear,l=s=>{r.on((r=>{n.clearBeforeUpdate(t),am(s.target,o).each((l=>{xs(r,l,o).each((o=>{const r=o.boxes.getOr([]);if(1===r.length){const o=r[0],l="false"===Xr(o),a=vt(Jr(s.target),o,Re);l&&a&&(n.selectRange(t,r,o,o),e.selectContents(o))}else r.length>1&&(n.selectRange(t,r,o.start,o.finish),e.selectContents(l))}))}))}))};return{clearstate:s,mousedown:e=>{n.clear(t),am(e.target,o).filter(cm).each(r.set)},mouseover:e=>{l(e)},mouseup:e=>{l(e),s()}}})(Bm(e),t,o,n);return{clearstate:r.clearstate,mousedown:r.mousedown,mouseover:r.mouseover,mouseup:r.mouseup}})(r,s,l,n),c=((e,t,o,n)=>{const r=Bm(e),s=()=>(n.clear(t),C.none());return{keydown:(e,l,a,c,i,m)=>{const d=e.raw,u=d.which,f=!0===d.shiftKey,g=Cs(t,n.selectedSelector).fold((()=>(gm(u)&&!f&&n.clearBeforeUpdate(t),gm(u)&&f&&!Am(l,c)?C.none:fm(u)&&f?w(rm,r,t,o,im,c,l,n.selectRange):um(u)&&f?w(rm,r,t,o,mm,c,l,n.selectRange):fm(u)?w(tm,r,o,im,c,l,nm):um(u)?w(tm,r,o,mm,c,l,om):C.none)),(e=>{const o=o=>()=>{const s=V(o,(o=>((e,t,o,n,r)=>Ts(n,e,t,r.firstSelectedSelector,r.lastSelectedSelector).map((e=>(r.clearBeforeUpdate(o),r.selectRange(o,e.boxes,e.start,e.finish),e.boxes))))(o.rows,o.cols,t,e,n)));return s.fold((()=>Ss(t,n.firstSelectedSelector,n.lastSelectedSelector).map((e=>{const o=fm(u)||m.isForward(u)?ei.after:ei.before;return r.setRelativeSelection(ei.on(e.first,0),o(e.table)),n.clear(t),ti(C.none(),!0)}))),(e=>C.some(ti(C.none(),!0))))};return gm(u)&&f&&!Am(l,c)?C.none:fm(u)&&f?o([_m(1,0)]):um(u)&&f?o([_m(-1,0)]):m.isBackward(u)&&f?o([_m(0,-1),_m(-1,0)]):m.isForward(u)&&f?o([_m(0,1),_m(1,0)]):gm(u)&&!f?s:C.none}));return g()},keyup:(e,r,s,l,a)=>Cs(t,n.selectedSelector).fold((()=>{const c=e.raw,i=c.which;return!0===c.shiftKey&&gm(i)&&Am(r,l)?((e,t,o,n,r,s,l)=>Re(o,r)&&n===s?C.none():bt(o,"td,th",t).bind((o=>bt(r,"td,th",t).bind((n=>pi(e,t,o,n,l))))))(t,o,r,s,l,a,n.selectRange):C.none()}),C.none)}})(r,s,l,n),i=((e,t,o,n)=>{const r=Bm(e);return(e,s)=>{n.clearBeforeUpdate(t),xs(e,s,o).each((e=>{const o=e.boxes.getOr([]);n.selectRange(t,o,e.start,e.finish),r.selectContents(s),r.collapseSelection()}))}})(r,s,l,n);e.on("TableSelectorChange",(e=>i(e.start,e.finish)));const m=(t,o)=>{(e=>!0===e.raw.shiftKey)(t)&&(o.kill&&t.kill(),o.selection.each((t=>{const o=bm.relative(t.start,t.finish),n=di(r,o);e.selection.setRng(n)})))},d=e=>0===e.button,u=(()=>{const e=sm(xe.fromDom(s)),t=sm(0);return{touchEnd:o=>{const n=xe.fromDom(o.target);if(ue("td")(n)||ue("th")(n)){const r=e.get(),s=t.get();Re(r,n)&&o.timeStamp-s<300&&(o.preventDefault(),i(n,n))}e.set(n),t.set(o.timeStamp)}}})();e.on("dragstart",(e=>{a.clearstate()})),e.on("mousedown",(e=>{d(e)&&Gm(e)&&a.mousedown(Um(e))})),e.on("mouseover",(e=>{var t;void 0!==(t=e).buttons&&0==(1&t.buttons)||!Gm(e)||a.mouseover(Um(e))})),e.on("mouseup",(e=>{d(e)&&Gm(e)&&a.mouseup(Um(e))})),e.on("touchend",u.touchEnd),e.on("keyup",(t=>{const o=Um(t);if(o.raw.shiftKey&&gm(o.raw.which)){const t=e.selection.getRng(),n=xe.fromDom(t.startContainer),r=xe.fromDom(t.endContainer);c.keyup(o,n,t.startOffset,r,t.endOffset).each((e=>{m(o,e)}))}})),e.on("keydown",(o=>{const n=Um(o);t.hide();const r=e.selection.getRng(),s=xe.fromDom(r.startContainer),l=xe.fromDom(r.endContainer),a=un(hm,pm)(xe.fromDom(e.selection.getStart()));c.keydown(n,s,r.startOffset,l,r.endOffset,a).each((e=>{m(n,e)})),t.show()})),e.on("NodeChange",(()=>{const t=e.selection,o=xe.fromDom(t.getStart()),r=xe.fromDom(t.getEnd());vs(Kt,[o,r]).fold((()=>n.clear(s)),f)}))})),e.on("PreInit",(()=>{e.serializer.addTempAttr(As.firstSelected),e.serializer.addTempAttr(As.lastSelected)})),{getSelectedCells:()=>((e,t,o,n)=>{switch(e.tag){case"none":return t();case"single":return(e=>[e.dom])(e.element);case"multiple":return(e=>E(e,(e=>e.dom)))(e.elements)}})(o.get(),g([])),clearSelectedCells:e=>n.clear(xe.fromDom(e))}},Ym=e=>{let t=[];return{bind:e=>{if(void 0===e)throw new Error("Event bind error: undefined handler");t.push(e)},unbind:e=>{t=_(t,(t=>t!==e))},trigger:(...o)=>{const n={};N(e,((e,t)=>{n[e]=o[t]})),N(t,(e=>{e(n)}))}}},Jm=e=>({registry:K(e,(e=>({bind:e.bind,unbind:e.unbind}))),trigger:K(e,(e=>e.trigger))}),Qm=e=>e.slice(0).sort(),Xm=(e,t)=>{const o=_(t,(t=>!D(e,t)));o.length>0&&(e=>{throw new Error("Unsupported keys for object: "+Qm(e).join(", "))})(o)},Zm=e=>((e,t)=>((e,t,o)=>{if(0===t.length)throw new Error("You must specify at least one required field.");return((e,t)=>{if(!l(t))throw new Error("The "+e+" fields must be an array. Was: "+t+".");N(t,(t=>{if(!r(t))throw new Error("The value "+t+" in the "+e+" fields was not a string.")}))})("required",t),(e=>{const t=Qm(e);L(t,((e,o)=>o<t.length-1&&e===t[o+1])).each((e=>{throw new Error("The field: "+e+" occurs more than once in the combined fields: ["+t.join(", ")+"].")}))})(t),n=>{const r=q(n);P(t,(e=>D(r,e)))||((e,t)=>{throw new Error("All required keys ("+Qm(e).join(", ")+") were not specified. Specified keys were: "+Qm(t).join(", ")+".")})(t,r),e(t,r);const s=_(t,(e=>!o.validate(n[e],e)));return s.length>0&&((e,t)=>{throw new Error("All values need to be of type: "+t+". Keys ("+Qm(e).join(", ")+") were not.")})(s,o.label),n}})(e,t,{validate:d,label:"function"}))(Xm,e),ed=Zm(["compare","extract","mutate","sink"]),td=Zm(["element","start","stop","destroy"]),od=Zm(["forceDrop","drop","move","delayDrop"]),nd=()=>{const e=(()=>{const e=Jm({move:Ym(["info"])});return{onEvent:f,reset:f,events:e.registry}})(),t=(()=>{let e=C.none();const t=Jm({move:Ym(["info"])});return{onEvent:(o,n)=>{n.extract(o).each((o=>{const r=((t,o)=>{const n=e.map((e=>t.compare(e,o)));return e=C.some(o),n})(n,o);r.each((e=>{t.trigger.move(e)}))}))},reset:()=>{e=C.none()},events:t.registry}})();let o=e;return{on:()=>{o.reset(),o=t},off:()=>{o.reset(),o=e},isOn:()=>o===t,onEvent:(e,t)=>{o.onEvent(e,t)},events:t.events}},rd=e=>{const t=e.replace(/\./g,"-");return{resolve:e=>t+"-"+e}},sd=rd("ephox-dragster").resolve;var ld=ed({compare:(e,t)=>bn(t.left-e.left,t.top-e.top),extract:e=>C.some(bn(e.x,e.y)),sink:(e,t)=>{const o=(e=>{const t={layerClass:sd("blocker"),...e},o=xe.fromTag("div");return ge(o,"role","presentation"),Bt(o,{position:"fixed",left:"0px",top:"0px",width:"100%",height:"100%"}),Mm(o,sd("blocker")),Mm(o,t.layerClass),{element:g(o),destroy:()=>{qe(o)}}})(t),n=qm(o.element(),"mousedown",e.forceDrop),r=qm(o.element(),"mouseup",e.drop),s=qm(o.element(),"mousemove",e.move),l=qm(o.element(),"mouseout",e.delayDrop);return td({element:o.element,start:e=>{Ie(e,o.element())},stop:()=>{qe(o.element())},destroy:()=>{o.destroy(),r.unbind(),s.unbind(),l.unbind(),n.unbind()}})},mutate:(e,t)=>{e.mutate(t.left,t.top)}});const ad=rd("ephox-snooker").resolve,cd=ad("resizer-bar"),id=ad("resizer-rows"),md=ad("resizer-cols"),dd=e=>{const t=dt(e.parent(),"."+cd);N(t,qe)},ud=(e,t,o)=>{const n=e.origin();N(t,(t=>{t.each((t=>{const r=o(n,t);Mm(r,cd),Ie(e.parent(),r)}))}))},fd=(e,t,o,n,r)=>{const s=yn(o),l=t.isResizable,a=n.length>0?_n.positions(n,o):[],c=a.length>0?((e,t)=>j(e.all,((e,o)=>t(e.element)?[o]:[])))(e,l):[];((e,t,o,n)=>{ud(e,t,((e,t)=>{const r=((e,t,o,n,r)=>{const s=xe.fromTag("div");return Bt(s,{position:"absolute",left:t+"px",top:o-3.5+"px",height:"7px",width:n+"px"}),he(s,{"data-row":e,role:"presentation"}),s})(t.row,o.left-e.left,t.y-e.top,n);return Mm(r,id),r}))})(t,_(a,((e,t)=>O(c,(e=>t===e)))),s,Wo(o));const i=r.length>0?An.positions(r,o):[],m=i.length>0?((e,t)=>{const o=[];return k(e.grid.columns,(n=>{an(e,n).map((e=>e.element)).forall(t)&&o.push(n)})),_(o,(o=>{const n=nn(e,(e=>e.column===o));return P(n,(e=>t(e.element)))}))})(e,l):[];((e,t,o,n)=>{ud(e,t,((e,t)=>{const r=((e,t,o,n,r)=>{const s=xe.fromTag("div");return Bt(s,{position:"absolute",left:t-3.5+"px",top:o+"px",height:r+"px",width:"7px"}),he(s,{"data-column":e,role:"presentation"}),s})(t.col,t.x-e.left,o.top-e.top,0,n);return Mm(r,md),r}))})(t,_(i,((e,t)=>O(m,(e=>t===e)))),s,pn(o))},gd=(e,t)=>{if(dd(e),e.isResizable(t)){const o=Zo(t),n=dn(o),r=cn(o);fd(o,e,t,n,r)}},hd=(e,t)=>{const o=dt(e.parent(),"."+cd);N(o,t)},pd=e=>{hd(e,(e=>{Nt(e,"display","none")}))},wd=e=>{hd(e,(e=>{Nt(e,"display","block")}))},bd=ad("resizer-bar-dragging"),vd=e=>{const t=(()=>{const e=Jm({drag:Ym(["xDelta","yDelta","target"])});let t=C.none();const o=(()=>{const e=Jm({drag:Ym(["xDelta","yDelta"])});return{mutate:(t,o)=>{e.trigger.drag(t,o)},events:e.registry}})();return o.events.drag.bind((o=>{t.each((t=>{e.trigger.drag(o.xDelta,o.yDelta,t)}))})),{assign:e=>{t=C.some(e)},get:()=>t,mutate:o.mutate,events:e.registry}})(),o=((e,t={})=>{var o;return((e,t,o)=>{let n=!1;const r=Jm({start:Ym([]),stop:Ym([])}),s=nd(),l=()=>{m.stop(),s.isOn()&&(s.off(),r.trigger.stop())},c=((e,t)=>{let o=null;const n=()=>{a(o)||(clearTimeout(o),o=null)};return{cancel:n,throttle:(...t)=>{n(),o=setTimeout((()=>{o=null,e.apply(null,t)}),200)}}})(l);s.events.move.bind((o=>{t.mutate(e,o.info)}));const i=e=>(...t)=>{n&&e.apply(null,t)},m=t.sink(od({forceDrop:l,drop:i(l),move:i((e=>{c.cancel(),s.onEvent(e,t)})),delayDrop:i(c.throttle)}),o);return{element:m.element,go:e=>{m.start(e),s.on(),r.trigger.start()},on:()=>{n=!0},off:()=>{n=!1},isActive:()=>n,destroy:()=>{m.destroy()},events:r.registry}})(e,null!==(o=t.mode)&&void 0!==o?o:ld,t)})(t,{});let n=C.none();const r=(e,t)=>C.from(pe(e,t));t.events.drag.bind((e=>{r(e.target,"data-row").each((t=>{const o=It(e.target,"top");Nt(e.target,"top",o+e.yDelta+"px")})),r(e.target,"data-column").each((t=>{const o=It(e.target,"left");Nt(e.target,"left",o+e.xDelta+"px")}))}));const s=(e,t)=>It(e,t)-Wt(e,"data-initial-"+t,0);o.events.stop.bind((()=>{t.get().each((t=>{n.each((o=>{r(t,"data-row").each((e=>{const n=s(t,"top");be(t,"data-initial-top"),d.trigger.adjustHeight(o,n,parseInt(e,10))})),r(t,"data-column").each((e=>{const n=s(t,"left");be(t,"data-initial-left"),d.trigger.adjustWidth(o,n,parseInt(e,10))})),gd(e,o)}))}))}));const l=(n,r)=>{d.trigger.startAdjust(),t.assign(n),ge(n,"data-initial-"+r,It(n,r)),Mm(n,bd),Nt(n,"opacity","0.2"),o.go(e.parent())},c=qm(e.parent(),"mousedown",(e=>{var t;t=e.target,jm(t,id)&&l(e.target,"top"),(e=>jm(e,md))(e.target)&&l(e.target,"left")})),i=t=>Re(t,e.view()),m=qm(e.view(),"mouseover",(t=>{var r;(r=t.target,bt(r,"table",i).filter(Qr)).fold((()=>{lt(t.target)&&dd(e)}),(t=>{o.isActive()&&(n=C.some(t),gd(e,t))}))})),d=Jm({adjustHeight:Ym(["table","delta","row"]),adjustWidth:Ym(["table","delta","column"]),startAdjust:Ym([])});return{destroy:()=>{c.unbind(),m.unbind(),o.destroy(),dd(e)},refresh:t=>{gd(e,t)},on:o.on,off:o.off,hideBars:w(pd,e),showBars:w(wd,e),events:d.registry}},yd=(e,t,o)=>{const n=_n,r=An,s=vd(e),l=Jm({beforeResize:Ym(["table","type"]),afterResize:Ym(["table","type"]),startDrag:Ym([])});return s.events.adjustHeight.bind((e=>{const t=e.table;l.trigger.beforeResize(t,"row");((e,t,o,n)=>{const r=Zo(e),s=((e,t,o)=>lr(e,t,o,Yn,(e=>e.getOrThunk(Ht))))(r,e,n),l=E(s,((e,n)=>o===n?Math.max(t+e,Ht()):e)),a=oa(r,l),c=((e,t)=>E(e.all,((e,o)=>({element:e.element,height:t[o]}))))(r,l);N(c,(e=>{$n(e.element,e.height)})),N(a,(e=>{$n(e.element,e.height)}));const i=z(l,((e,t)=>e+t),0);$n(e,i)})(t,n.delta(e.delta,t),e.row,n),l.trigger.afterResize(t,"row")})),s.events.startAdjust.bind((e=>{l.trigger.startDrag()})),s.events.adjustWidth.bind((e=>{const n=e.table;l.trigger.beforeResize(n,"col");const s=r.delta(e.delta,n),a=o(n);ra(n,s,e.column,t,a),l.trigger.afterResize(n,"col")})),{on:s.on,off:s.off,refreshBars:s.refresh,hideBars:s.hideBars,showBars:s.showBars,destroy:s.destroy,events:l.registry}},xd=e=>m(e)&&"TABLE"===e.nodeName,Cd="bar-",Sd=e=>"false"!==pe(e,"data-mce-resize"),Td=e=>{const t=lm(),o=lm(),n=lm();let r,s;const l=t=>fc(e,t),a=()=>Pr(e)?el():Zs();return e.on("init",(()=>{const r=((e,t)=>e.inline?((e,t,o)=>({parent:g(t),view:g(e),origin:g(bn(0,0)),isResizable:o}))(xe.fromDom(e.getBody()),(()=>{const e=xe.fromTag("div");return Bt(e,{position:"static",height:"0",width:"0",padding:"0",margin:"0",border:"0"}),Ie(at(xe.fromDom(document)),e),e})(),t):((e,t)=>{const o=me(e)?(e=>xe.fromDom(Ee(e).dom.documentElement))(e):e;return{parent:g(o),view:g(e),origin:g(bn(0,0)),isResizable:t}})(xe.fromDom(e.getDoc()),t))(e,Sd);if(n.set(r),(e=>{const t=e.options.get("object_resizing");return D(t.split(","),"table")})(e)&&qr(e)){const n=a(),s=yd(r,n,l);s.on(),s.events.startDrag.bind((o=>{t.set(e.selection.getRng())})),s.events.beforeResize.bind((t=>{const o=t.table.dom;((e,t,o,n,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:o,height:n,origin:r})})(e,o,ns(o),rs(o),Cd+t.type)})),s.events.afterResize.bind((o=>{const n=o.table,r=n.dom;ts(n),t.on((t=>{e.selection.setRng(t),e.focus()})),((e,t,o,n,r)=>{e.dispatch("ObjectResized",{target:t,width:o,height:n,origin:r})})(e,r,ns(r),rs(r),Cd+o.type),e.undoManager.add()})),o.set(s)}})),e.on("ObjectResizeStart",(t=>{const o=t.target;if(xd(o)){const n=xe.fromDom(o);N(e.dom.select(".mce-clonedresizable"),(t=>{e.dom.addClass(t,"mce-"+jr(e)+"-columns")})),!kc(n)&&$r(e)?_c(n):!Oc(n)&&Hr(e)&&Bc(n),Ec(n)&&Tt(t.origin,Cd)&&Bc(n),r=t.width,s=Vr(e)?"":((e,t)=>{const o=e.dom.getStyle(t,"width")||e.dom.getAttrib(t,"width");return C.from(o).filter(Ot)})(e,o).getOr("")}})),e.on("ObjectResized",(t=>{const o=t.target;if(xd(o)){const n=xe.fromDom(o),c=t.origin;Tt(c,"corner-")&&((t,o,n)=>{const c=Rt(o,"e");if(""===s&&Bc(t),n!==r&&""!==s){Nt(t,"width",s);const o=a(),i=l(t),m=Pr(e)||c?(e=>tl(e).columns)(t)-1:0;ra(t,n-r,m,o,i)}else if((e=>/^(\d+(\.\d+)?)%$/.test(e))(s)){const e=parseFloat(s.replace("%",""));Nt(t,"width",n*e/r+"%")}(e=>/^(\d+(\.\d+)?)px$/.test(e))(s)&&(e=>{const t=Zo(e);ln(t)||N(Ut(e),(e=>{const t=_t(e,"width");Nt(e,"width",t),be(e,"width")}))})(t)})(n,c,t.width),ts(n),ic(e,n.dom,mc)}})),e.on("SwitchMode",(()=>{o.on((t=>{e.mode.isReadOnly()?t.hideBars():t.showBars()}))})),e.on("dragstart dragend",(e=>{o.on((t=>{"dragstart"===e.type?(t.hideBars(),t.off()):(t.on(),t.showBars())}))})),e.on("remove",(()=>{o.on((e=>{e.destroy()})),n.on((t=>{((e,t)=>{e.inline&&qe(t.parent())})(e,t)}))})),{refresh:e=>{o.on((t=>t.refreshBars(xe.fromDom(e))))},hide:()=>{o.on((e=>e.hideBars()))},show:()=>{o.on((e=>e.showBars()))}}},Rd=e=>{(e=>{const t=e.options.register;t("table_clone_elements",{processor:"string[]"}),t("table_use_colgroups",{processor:"boolean",default:!0}),t("table_header_type",{processor:e=>{const t=D(["section","cells","sectionCells","auto"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: section, cells, sectionCells or auto."}},default:"section"}),t("table_sizing_mode",{processor:"string",default:"auto"}),t("table_default_attributes",{processor:"object",default:{border:"1"}}),t("table_default_styles",{processor:"object",default:{"border-collapse":"collapse"}}),t("table_column_resizing",{processor:e=>{const t=D(["preservetable","resizetable"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be preservetable, or resizetable."}},default:"preservetable"}),t("table_resize_bars",{processor:"boolean",default:!0}),t("table_style_by_css",{processor:"boolean",default:!0}),t("table_merge_content_on_paste",{processor:"boolean",default:!0})})(e);const t=Td(e),o=Km(e,t),n=gc(e,t,o);return Xc(e,n),((e,t)=>{const o=es(e),n=t=>js(os(e)).bind((n=>Kt(n,o).map((o=>{const r=Ls(Ps(e),o,n);return t(o,r)})))).getOr("");G({mceTableRowType:()=>n(t.getTableRowType),mceTableCellType:()=>n(t.getTableCellType),mceTableColType:()=>n(t.getTableColType)},((t,o)=>e.addQueryValueHandler(o,t)))})(e,n),Is(e,n),{getSelectedCells:o.getSelectedCells,clearSelectedCells:o.clearSelectedCells}};e.add("dom",(e=>({table:Rd(e)})))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/advlist/plugin.min.js b/public/libs/tinymce/plugins/advlist/plugin.min.js
index ef5c0141bc2..8be78ea4211 100644
--- a/public/libs/tinymce/plugins/advlist/plugin.min.js
+++ b/public/libs/tinymce/plugins/advlist/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=(t,e,s)=>{const r="UL"===e?"InsertUnorderedList":"InsertOrderedList";t.execCommand(r,!1,!1===s?null:{"list-style-type":s})},s=t=>e=>e.options.get(t),r=s("advlist_number_styles"),n=s("advlist_bullet_styles"),i=t=>null==t,l=t=>!i(t);var o=tinymce.util.Tools.resolve("tinymce.util.Tools");class a{constructor(t,e){this.tag=t,this.value=e}static some(t){return new a(!0,t)}static none(){return a.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?a.some(t(this.value)):a.none()}bind(t){return this.tag?t(this.value):a.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:a.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return l(t)?a.some(t):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);const u=t=>e=>l(e)&&t.test(e.nodeName),d=u(/^(OL|UL|DL)$/),g=u(/^(TH|TD)$/),c=t=>i(t)||"default"===t?"":t,h=(t,e)=>s=>((t,e)=>{const s=t.selection.getNode();return e({parents:t.dom.getParents(s),element:s}),t.on("NodeChange",e),()=>t.off("NodeChange",e)})(t,(r=>((t,r)=>{const n=t.selection.getStart(!0);s.setActive(((t,e,s)=>((t,e,s)=>{for(let e=0,n=t.length;e<n;e++){const n=t[e];if(d(r=n)&&!/\btox\-/.test(r.className))return a.some(n);if(s(n,e))break}var r;return a.none()})(e,0,g).exists((e=>e.nodeName===s&&((t,e)=>t.dom.isChildOf(e,t.getBody()))(t,e))))(t,r,e)),s.setEnabled(!((t,e)=>{const s=t.dom.getParent(e,"ol,ul,dl");return((t,e)=>null!==e&&!t.dom.isEditable(e))(t,s)&&t.selection.isEditable()})(t,n)&&t.selection.isEditable())})(t,r.parents))),m=(t,s,r,n,i,l)=>{l.length>1?((t,s,r,n,i,l)=>{t.ui.registry.addSplitButton(s,{tooltip:r,icon:"OL"===i?"ordered-list":"unordered-list",presets:"listpreview",columns:3,fetch:t=>{t(o.map(l,(t=>{const e="OL"===i?"num":"bull",s="disc"===t||"decimal"===t?"default":t,r=c(t),n=(t=>t.replace(/\-/g," ").replace(/\b\w/g,(t=>t.toUpperCase())))(t);return{type:"choiceitem",value:r,icon:"list-"+e+"-"+s,text:n}})))},onAction:()=>t.execCommand(n),onItemAction:(s,r)=>{e(t,i,r)},select:e=>{const s=(t=>{const e=t.dom.getParent(t.selection.getNode(),"ol,ul"),s=t.dom.getStyle(e,"listStyleType");return a.from(s)})(t);return s.map((t=>e===t)).getOr(!1)},onSetup:h(t,i)})})(t,s,r,n,i,l):((t,s,r,n,i,l)=>{t.ui.registry.addToggleButton(s,{active:!1,tooltip:r,icon:"OL"===i?"ordered-list":"unordered-list",onSetup:h(t,i),onAction:()=>t.queryCommandState(n)||""===l?t.execCommand(n):e(t,i,l)})})(t,s,r,n,i,c(l[0]))};t.add("advlist",(t=>{t.hasPlugin("lists")?((t=>{const e=t.options.register;e("advlist_number_styles",{processor:"string[]",default:"default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman".split(",")}),e("advlist_bullet_styles",{processor:"string[]",default:"default,circle,square".split(",")})})(t),(t=>{m(t,"numlist","Numbered list","InsertOrderedList","OL",r(t)),m(t,"bullist","Bullet list","InsertUnorderedList","UL",n(t))})(t),(t=>{t.addCommand("ApplyUnorderedListStyle",((s,r)=>{e(t,"UL",r["list-style-type"])})),t.addCommand("ApplyOrderedListStyle",((s,r)=>{e(t,"OL",r["list-style-type"])}))})(t)):console.error("Please use the Lists plugin together with the Advanced List plugin.")}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/anchor/plugin.min.js b/public/libs/tinymce/plugins/anchor/plugin.min.js
index cf19304ed5f..8049b4d3ae5 100644
--- a/public/libs/tinymce/plugins/anchor/plugin.min.js
+++ b/public/libs/tinymce/plugins/anchor/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),o=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=("allow_html_in_named_anchor",e=>e.options.get("allow_html_in_named_anchor"));const a="a:not([href])",r=e=>!e,i=e=>e.getAttribute("id")||e.getAttribute("name")||"",l=e=>(e=>"a"===e.nodeName.toLowerCase())(e)&&!e.getAttribute("href")&&""!==i(e),s=e=>e.dom.getParent(e.selection.getStart(),a),d=(e,a)=>{const r=s(e);r?((e,t,o)=>{o.removeAttribute("name"),o.id=t,e.addVisual(),e.undoManager.add()})(e,a,r):((e,a)=>{e.undoManager.transact((()=>{n(e)||e.selection.collapse(!0),e.selection.isCollapsed()?e.insertContent(e.dom.createHTML("a",{id:a})):((e=>{const n=e.dom;t(n).walk(e.selection.getRng(),(e=>{o.each(e,(e=>{var t;l(t=e)&&!t.firstChild&&n.remove(e,!1)}))}))})(e),e.formatter.remove("namedAnchor",void 0,void 0,!0),e.formatter.apply("namedAnchor",{value:a}),e.addVisual())}))})(e,a),e.focus()},c=e=>(e=>r(e.attr("href"))&&!r(e.attr("id")||e.attr("name")))(e)&&!e.firstChild,m=e=>t=>{for(let o=0;o<t.length;o++){const n=t[o];c(n)&&n.attr("contenteditable",e)}},u=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}};e.add("anchor",(e=>{(e=>{(0,e.options.register)("allow_html_in_named_anchor",{processor:"boolean",default:!1})})(e),(e=>{e.on("PreInit",(()=>{e.parser.addNodeFilter("a",m("false")),e.serializer.addNodeFilter("a",m(null))}))})(e),(e=>{e.addCommand("mceAnchor",(()=>{(e=>{const t=(e=>{const t=s(e);return t?i(t):""})(e);e.windowManager.open({title:"Anchor",size:"normal",body:{type:"panel",items:[{name:"id",type:"input",label:"ID",placeholder:"example"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{id:t},onSubmit:t=>{((e,t)=>/^[A-Za-z][A-Za-z0-9\-:._]*$/.test(t)?(d(e,t),!0):(e.windowManager.alert("ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores."),!1))(e,t.getData().id)&&t.close()}})})(e)}))})(e),(e=>{const t=()=>e.execCommand("mceAnchor");e.ui.registry.addToggleButton("anchor",{icon:"bookmark",tooltip:"Anchor",onAction:t,onSetup:t=>{const o=e.selection.selectorChangedWithUnbind("a:not([href])",t.setActive).unbind,n=u(e)(t);return()=>{o(),n()}}}),e.ui.registry.addMenuItem("anchor",{icon:"bookmark",text:"Anchor...",onAction:t,onSetup:u(e)})})(e),e.on("PreInit",(()=>{(e=>{e.formatter.register("namedAnchor",{inline:"a",selector:a,remove:"all",split:!0,deep:!0,attributes:{id:"%value"},onmatch:(e,t,o)=>l(e)})})(e)}))}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autolink/plugin.min.js b/public/libs/tinymce/plugins/autolink/plugin.min.js
index df56de1f648..32772191f62 100644
--- a/public/libs/tinymce/plugins/autolink/plugin.min.js
+++ b/public/libs/tinymce/plugins/autolink/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>t.options.get(e),n=t("autolink_pattern"),o=t("link_default_target"),r=t("link_default_protocol"),a=t("allow_unsafe_link_target"),s=("string",e=>"string"===(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(a=o.constructor)||void 0===a?void 0:a.name)===r.name)?"string":t;var n,o,r,a})(e));const l=(void 0,e=>undefined===e);const i=e=>!(e=>null==e)(e),c=Object.hasOwnProperty,d=e=>"\ufeff"===e;var u=tinymce.util.Tools.resolve("tinymce.dom.TextSeeker");const f=e=>/^[(\[{ \u00a0]$/.test(e),g=(e,t,n)=>{for(let o=t-1;o>=0;o--){const t=e.charAt(o);if(!d(t)&&n(t))return o}return-1},m=(e,t)=>{var o;const a=e.schema.getVoidElements(),s=n(e),{dom:i,selection:d}=e;if(null!==i.getParent(d.getNode(),"a[href]"))return null;const m=d.getRng(),k=u(i,(e=>{return i.isBlock(e)||(t=a,n=e.nodeName.toLowerCase(),c.call(t,n))||"false"===i.getContentEditable(e);var t,n})),{container:p,offset:y}=((e,t)=>{let n=e,o=t;for(;1===n.nodeType&&n.childNodes[o];)n=n.childNodes[o],o=3===n.nodeType?n.data.length:n.childNodes.length;return{container:n,offset:o}})(m.endContainer,m.endOffset),w=null!==(o=i.getParent(p,i.isBlock))&&void 0!==o?o:i.getRoot(),h=k.backwards(p,y+t,((e,t)=>{const n=e.data,o=g(n,t,(r=f,e=>!r(e)));var r,a;return-1===o||(a=n[o],/[?!,.;:]/.test(a))?o:o+1}),w);if(!h)return null;let v=h.container;const _=k.backwards(h.container,h.offset,((e,t)=>{v=e;const n=g(e.data,t,f);return-1===n?n:n+1}),w),A=i.createRng();_?A.setStart(_.container,_.offset):A.setStart(v,0),A.setEnd(h.container,h.offset);const C=A.toString().replace(/\uFEFF/g,"").match(s);if(C){let t=C[0];return $="www.",(b=t).length>=4&&b.substr(0,4)===$?t=r(e)+"://"+t:((e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!l(o)||r+t.length<=o)})(t,"@")&&!(e=>/^([A-Za-z][A-Za-z\d.+-]*:\/\/)|mailto:/.test(e))(t)&&(t="mailto:"+t),{rng:A,url:t}}var b,$;return null},k=(e,t)=>{const{dom:n,selection:r}=e,{rng:l,url:i}=t,c=r.getBookmark();r.setRng(l);const d="createlink",u={command:d,ui:!1,value:i};if(!e.dispatch("BeforeExecCommand",u).isDefaultPrevented()){e.getDoc().execCommand(d,!1,i),e.dispatch("ExecCommand",u);const t=o(e);if(s(t)){const o=r.getNode();n.setAttrib(o,"target",t),"_blank"!==t||a(e)||n.setAttrib(o,"rel","noopener")}}r.moveToBookmark(c),e.nodeChanged()},p=e=>{const t=m(e,-1);i(t)&&k(e,t)},y=p;e.add("autolink",(e=>{(e=>{const t=e.options.register;t("autolink_pattern",{processor:"regexp",default:new RegExp("^"+/(?:[A-Za-z][A-Za-z\d.+-]{0,14}:\/\/(?:[-.~*+=!&;:'%@?^${}(),\w]+@)?|www\.|[-;:&=+$,.\w]+@)[A-Za-z\d-]+(?:\.[A-Za-z\d-]+)*(?::\d+)?(?:\/(?:[-.~*+=!;:'%@$(),\/\w]*[-~*+=%@$()\/\w])?)?(?:\?(?:[-.~*+=!&;:'%@?^${}(),\/\w]+))?(?:#(?:[-.~*+=!&;:'%@?^${}(),\/\w]+))?/g.source+"$","i")}),t("link_default_target",{processor:"string"}),t("link_default_protocol",{processor:"string",default:"https"})})(e),(e=>{e.on("keydown",(t=>{13!==t.keyCode||t.isDefaultPrevented()||(e=>{const t=m(e,0);i(t)&&k(e,t)})(e)})),e.on("keyup",(t=>{32===t.keyCode?p(e):(48===t.keyCode&&t.shiftKey||221===t.keyCode)&&y(e)}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autoresize/plugin.min.js b/public/libs/tinymce/plugins/autoresize/plugin.min.js
index c4d6f877515..939bd27cad6 100644
--- a/public/libs/tinymce/plugins/autoresize/plugin.min.js
+++ b/public/libs/tinymce/plugins/autoresize/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.Env");const o=e=>t=>t.options.get(e),s=o("min_height"),i=o("max_height"),n=o("autoresize_overflow_padding"),r=o("autoresize_bottom_margin"),l=(e,t)=>{const o=e.getBody();o&&(o.style.overflowY=t?"":"hidden",t||(o.scrollTop=0))},g=(e,t,o,s)=>{var i;const n=parseInt(null!==(i=e.getStyle(t,o,s))&&void 0!==i?i:"",10);return isNaN(n)?0:n},a=(e,o,r,c)=>{var d;const f=e.dom,u=e.getDoc();if(!u)return;if((e=>e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen())(e))return void l(e,!0);const m=u.documentElement,h=c?c():n(e),p=null!==(d=s(e))&&void 0!==d?d:e.getElement().offsetHeight;let y=p;const S=g(f,m,"margin-top",!0),v=g(f,m,"margin-bottom",!0);let C=m.offsetHeight+S+v+h;C<0&&(C=0);const b=e.getContainer().offsetHeight-e.getContentAreaContainer().offsetHeight;C+b>p&&(y=C+b);const w=i(e);if(w&&y>w?(y=w,l(e,!0)):l(e,!1),y!==o.get()){const s=y-o.get();if(f.setStyle(e.getContainer(),"height",y+"px"),o.set(y),(e=>{e.dispatch("ResizeEditor")})(e),t.browser.isSafari()&&(t.os.isMacOS()||t.os.isiOS())){const t=e.getWin();t.scrollTo(t.pageXOffset,t.pageYOffset)}e.hasFocus()&&(e=>{if("setcontent"===(null==e?void 0:e.type.toLowerCase())){const t=e;return!0===t.selection||!0===t.paste}return!1})(r)&&e.selection.scrollIntoView(),(t.browser.isSafari()||t.browser.isChromium())&&s<0&&a(e,o,r,c)}};e.add("autoresize",(e=>{if((e=>{const t=e.options.register;t("autoresize_overflow_padding",{processor:"number",default:1}),t("autoresize_bottom_margin",{processor:"number",default:50})})(e),e.options.isSet("resize")||e.options.set("resize",!1),!e.inline){const o=(e=>{let t=0;return{get:()=>t,set:e=>{t=e}}})();((e,t)=>{e.addCommand("mceAutoResize",(()=>{a(e,t)}))})(e,o),((e,o)=>{let s,i,l=()=>r(e);e.on("init",(i=>{s=0;const r=n(e),g=e.dom;g.setStyles(e.getDoc().documentElement,{height:"auto"}),t.browser.isEdge()||t.browser.isIE()?g.setStyles(e.getBody(),{paddingLeft:r,paddingRight:r,"min-height":0}):g.setStyles(e.getBody(),{paddingLeft:r,paddingRight:r}),a(e,o,i,l),s+=1})),e.on("NodeChange SetContent keyup FullscreenStateChanged ResizeContent",(t=>{if(1===s)i=e.getContainer().offsetHeight,a(e,o,t,l),s+=1;else if(2===s){const t=i<e.getContainer().offsetHeight;if(t){const t=e.dom,o=e.getDoc();t.setStyles(o.documentElement,{"min-height":0}),t.setStyles(e.getBody(),{"min-height":"inherit"})}l=t?(0,()=>0):l,s+=1}else a(e,o,t,l)}))})(e,o)}}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/autosave/plugin.min.js b/public/libs/tinymce/plugins/autosave/plugin.min.js
index 110f508d65d..b8a68e4a62e 100644
--- a/public/libs/tinymce/plugins/autosave/plugin.min.js
+++ b/public/libs/tinymce/plugins/autosave/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=("string",t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(r=o=t,(a=String).prototype.isPrototypeOf(r)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===a.name)?"string":e;var r,o,a,s})(t));const r=(void 0,t=>undefined===t);var o=tinymce.util.Tools.resolve("tinymce.util.Delay"),a=tinymce.util.Tools.resolve("tinymce.util.LocalStorage"),s=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=t=>{const e=/^(\d+)([ms]?)$/.exec(t);return(e&&e[2]?{s:1e3,m:6e4}[e[2]]:1)*parseInt(t,10)},i=t=>e=>e.options.get(t),u=i("autosave_ask_before_unload"),l=i("autosave_restore_when_empty"),c=i("autosave_interval"),d=i("autosave_retention"),m=t=>{const e=document.location;return t.options.get("autosave_prefix").replace(/{path}/g,e.pathname).replace(/{query}/g,e.search).replace(/{hash}/g,e.hash).replace(/{id}/g,t.id)},v=(t,e)=>{if(r(e))return t.dom.isEmpty(t.getBody());{const r=s.trim(e);if(""===r)return!0;{const e=(new DOMParser).parseFromString(r,"text/html");return t.dom.isEmpty(e)}}},f=t=>{var e;const r=parseInt(null!==(e=a.getItem(m(t)+"time"))&&void 0!==e?e:"0",10)||0;return!((new Date).getTime()-r>d(t)&&(p(t,!1),1))},p=(t,e)=>{const r=m(t);a.removeItem(r+"draft"),a.removeItem(r+"time"),!1!==e&&(t=>{t.dispatch("RemoveDraft")})(t)},g=t=>{const e=m(t);!v(t)&&t.isDirty()&&(a.setItem(e+"draft",t.getContent({format:"raw",no_events:!0})),a.setItem(e+"time",(new Date).getTime().toString()),(t=>{t.dispatch("StoreDraft")})(t))},y=t=>{var e;const r=m(t);f(t)&&(t.setContent(null!==(e=a.getItem(r+"draft"))&&void 0!==e?e:"",{format:"raw"}),(t=>{t.dispatch("RestoreDraft")})(t))};var D=tinymce.util.Tools.resolve("tinymce.EditorManager");const h=t=>e=>{e.setEnabled(f(t));const r=()=>e.setEnabled(f(t));return t.on("StoreDraft RestoreDraft RemoveDraft",r),()=>t.off("StoreDraft RestoreDraft RemoveDraft",r)};t.add("autosave",(t=>((t=>{const r=t.options.register,o=t=>{const r=e(t);return r?{value:n(t),valid:r}:{valid:!1,message:"Must be a string."}};r("autosave_ask_before_unload",{processor:"boolean",default:!0}),r("autosave_prefix",{processor:"string",default:"tinymce-autosave-{path}{query}{hash}-{id}-"}),r("autosave_restore_when_empty",{processor:"boolean",default:!1}),r("autosave_interval",{processor:o,default:"30s"}),r("autosave_retention",{processor:o,default:"20m"})})(t),(t=>{t.editorManager.on("BeforeUnload",(t=>{let e;s.each(D.get(),(t=>{t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&u(t)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))})),e&&(t.preventDefault(),t.returnValue=e)}))})(t),(t=>{(t=>{const e=c(t);o.setEditorInterval(t,(()=>{g(t)}),e)})(t);const e=()=>{(t=>{t.undoManager.transact((()=>{y(t),p(t)})),t.focus()})(t)};t.ui.registry.addButton("restoredraft",{tooltip:"Restore last draft",icon:"restore-draft",onAction:e,onSetup:h(t)}),t.ui.registry.addMenuItem("restoredraft",{text:"Restore last draft",icon:"restore-draft",onAction:e,onSetup:h(t)})})(t),t.on("init",(()=>{l(t)&&t.dom.isEmpty(t.getBody())&&y(t)})),(t=>({hasDraft:()=>f(t),storeDraft:()=>g(t),restoreDraft:()=>y(t),removeDraft:e=>p(t,e),isEmpty:e=>v(t,e)}))(t))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/charmap/plugin.min.js b/public/libs/tinymce/plugins/charmap/plugin.min.js
index 9f7f1c161af..6c12ece2b23 100644
--- a/public/libs/tinymce/plugins/charmap/plugin.min.js
+++ b/public/libs/tinymce/plugins/charmap/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=(e,t)=>{const r=((e,t)=>e.dispatch("insertCustomChar",{chr:t}))(e,t).chr;e.execCommand("mceInsertContent",!1,r)},r=e=>t=>e===t,a=("array",e=>"array"===(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(r=a=e,(n=String).prototype.isPrototypeOf(r)||(null===(i=a.constructor)||void 0===i?void 0:i.name)===n.name)?"string":t;var r,a,n,i})(e));const n=r(null),i=r(void 0),o=e=>"function"==typeof e,s=(!1,()=>false);class l{constructor(e,t){this.tag=e,this.value=t}static some(e){return new l(!0,e)}static none(){return l.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?l.some(e(this.value)):l.none()}bind(e){return this.tag?e(this.value):l.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:l.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?l.none():l.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}l.singletonNone=new l(!1);const c=Array.prototype.push,u=(e,t)=>{const r=e.length,a=new Array(r);for(let n=0;n<r;n++){const r=e[n];a[n]=t(r,n)}return a};var g=tinymce.util.Tools.resolve("tinymce.util.Tools");const h=e=>t=>t.options.get(e),m=h("charmap"),p=h("charmap_append"),d=g.isArray,f="User Defined",y=e=>{return d(e)?(t=e,g.grep(t,(e=>d(e)&&2===e.length))):"function"==typeof e?e():[];var t},b=e=>{const t=((e,t)=>{const r=m(e);r&&(t=[{name:f,characters:y(r)}]);const a=p(e);if(a){const e=g.grep(t,(e=>e.name===f));return e.length?(e[0].characters=[...e[0].characters,...y(a)],t):t.concat({name:f,characters:y(a)})}return t})(e,[{name:"Currency",characters:[[36,"dollar sign"],[162,"cent sign"],[8364,"euro sign"],[163,"pound sign"],[165,"yen sign"],[164,"currency sign"],[8352,"euro-currency sign"],[8353,"colon sign"],[8354,"cruzeiro sign"],[8355,"french franc sign"],[8356,"lira sign"],[8357,"mill sign"],[8358,"naira sign"],[8359,"peseta sign"],[8360,"rupee sign"],[8361,"won sign"],[8362,"new sheqel sign"],[8363,"dong sign"],[8365,"kip sign"],[8366,"tugrik sign"],[8367,"drachma sign"],[8368,"german penny symbol"],[8369,"peso sign"],[8370,"guarani sign"],[8371,"austral sign"],[8372,"hryvnia sign"],[8373,"cedi sign"],[8374,"livre tournois sign"],[8375,"spesmilo sign"],[8376,"tenge sign"],[8377,"indian rupee sign"],[8378,"turkish lira sign"],[8379,"nordic mark sign"],[8380,"manat sign"],[8381,"ruble sign"],[20870,"yen character"],[20803,"yuan character"],[22291,"yuan character, in hong kong and taiwan"],[22278,"yen/yuan character variant one"]]},{name:"Text",characters:[[169,"copyright sign"],[174,"registered sign"],[8482,"trade mark sign"],[8240,"per mille sign"],[181,"micro sign"],[183,"middle dot"],[8226,"bullet"],[8230,"three dot leader"],[8242,"minutes / feet"],[8243,"seconds / inches"],[167,"section sign"],[182,"paragraph sign"],[223,"sharp s / ess-zed"]]},{name:"Quotations",characters:[[8249,"single left-pointing angle quotation mark"],[8250,"single right-pointing angle quotation mark"],[171,"left pointing guillemet"],[187,"right pointing guillemet"],[8216,"left single quotation mark"],[8217,"right single quotation mark"],[8220,"left double quotation mark"],[8221,"right double quotation mark"],[8218,"single low-9 quotation mark"],[8222,"double low-9 quotation mark"],[60,"less-than sign"],[62,"greater-than sign"],[8804,"less-than or equal to"],[8805,"greater-than or equal to"],[8211,"en dash"],[8212,"em dash"],[175,"macron"],[8254,"overline"],[164,"currency sign"],[166,"broken bar"],[168,"diaeresis"],[161,"inverted exclamation mark"],[191,"turned question mark"],[710,"circumflex accent"],[732,"small tilde"],[176,"degree sign"],[8722,"minus sign"],[177,"plus-minus sign"],[247,"division sign"],[8260,"fraction slash"],[215,"multiplication sign"],[185,"superscript one"],[178,"superscript two"],[179,"superscript three"],[188,"fraction one quarter"],[189,"fraction one half"],[190,"fraction three quarters"]]},{name:"Mathematical",characters:[[402,"function / florin"],[8747,"integral"],[8721,"n-ary sumation"],[8734,"infinity"],[8730,"square root"],[8764,"similar to"],[8773,"approximately equal to"],[8776,"almost equal to"],[8800,"not equal to"],[8801,"identical to"],[8712,"element of"],[8713,"not an element of"],[8715,"contains as member"],[8719,"n-ary product"],[8743,"logical and"],[8744,"logical or"],[172,"not sign"],[8745,"intersection"],[8746,"union"],[8706,"partial differential"],[8704,"for all"],[8707,"there exists"],[8709,"diameter"],[8711,"backward difference"],[8727,"asterisk operator"],[8733,"proportional to"],[8736,"angle"]]},{name:"Extended Latin",characters:[[192,"A - grave"],[193,"A - acute"],[194,"A - circumflex"],[195,"A - tilde"],[196,"A - diaeresis"],[197,"A - ring above"],[256,"A - macron"],[198,"ligature AE"],[199,"C - cedilla"],[200,"E - grave"],[201,"E - acute"],[202,"E - circumflex"],[203,"E - diaeresis"],[274,"E - macron"],[204,"I - grave"],[205,"I - acute"],[206,"I - circumflex"],[207,"I - diaeresis"],[298,"I - macron"],[208,"ETH"],[209,"N - tilde"],[210,"O - grave"],[211,"O - acute"],[212,"O - circumflex"],[213,"O - tilde"],[214,"O - diaeresis"],[216,"O - slash"],[332,"O - macron"],[338,"ligature OE"],[352,"S - caron"],[217,"U - grave"],[218,"U - acute"],[219,"U - circumflex"],[220,"U - diaeresis"],[362,"U - macron"],[221,"Y - acute"],[376,"Y - diaeresis"],[562,"Y - macron"],[222,"THORN"],[224,"a - grave"],[225,"a - acute"],[226,"a - circumflex"],[227,"a - tilde"],[228,"a - diaeresis"],[229,"a - ring above"],[257,"a - macron"],[230,"ligature ae"],[231,"c - cedilla"],[232,"e - grave"],[233,"e - acute"],[234,"e - circumflex"],[235,"e - diaeresis"],[275,"e - macron"],[236,"i - grave"],[237,"i - acute"],[238,"i - circumflex"],[239,"i - diaeresis"],[299,"i - macron"],[240,"eth"],[241,"n - tilde"],[242,"o - grave"],[243,"o - acute"],[244,"o - circumflex"],[245,"o - tilde"],[246,"o - diaeresis"],[248,"o slash"],[333,"o macron"],[339,"ligature oe"],[353,"s - caron"],[249,"u - grave"],[250,"u - acute"],[251,"u - circumflex"],[252,"u - diaeresis"],[363,"u - macron"],[253,"y - acute"],[254,"thorn"],[255,"y - diaeresis"],[563,"y - macron"],[913,"Alpha"],[914,"Beta"],[915,"Gamma"],[916,"Delta"],[917,"Epsilon"],[918,"Zeta"],[919,"Eta"],[920,"Theta"],[921,"Iota"],[922,"Kappa"],[923,"Lambda"],[924,"Mu"],[925,"Nu"],[926,"Xi"],[927,"Omicron"],[928,"Pi"],[929,"Rho"],[931,"Sigma"],[932,"Tau"],[933,"Upsilon"],[934,"Phi"],[935,"Chi"],[936,"Psi"],[937,"Omega"],[945,"alpha"],[946,"beta"],[947,"gamma"],[948,"delta"],[949,"epsilon"],[950,"zeta"],[951,"eta"],[952,"theta"],[953,"iota"],[954,"kappa"],[955,"lambda"],[956,"mu"],[957,"nu"],[958,"xi"],[959,"omicron"],[960,"pi"],[961,"rho"],[962,"final sigma"],[963,"sigma"],[964,"tau"],[965,"upsilon"],[966,"phi"],[967,"chi"],[968,"psi"],[969,"omega"]]},{name:"Symbols",characters:[[8501,"alef symbol"],[982,"pi symbol"],[8476,"real part symbol"],[978,"upsilon - hook symbol"],[8472,"Weierstrass p"],[8465,"imaginary part"]]},{name:"Arrows",characters:[[8592,"leftwards arrow"],[8593,"upwards arrow"],[8594,"rightwards arrow"],[8595,"downwards arrow"],[8596,"left right arrow"],[8629,"carriage return"],[8656,"leftwards double arrow"],[8657,"upwards double arrow"],[8658,"rightwards double arrow"],[8659,"downwards double arrow"],[8660,"left right double arrow"],[8756,"therefore"],[8834,"subset of"],[8835,"superset of"],[8836,"not a subset of"],[8838,"subset of or equal to"],[8839,"superset of or equal to"],[8853,"circled plus"],[8855,"circled times"],[8869,"perpendicular"],[8901,"dot operator"],[8968,"left ceiling"],[8969,"right ceiling"],[8970,"left floor"],[8971,"right floor"],[9001,"left-pointing angle bracket"],[9002,"right-pointing angle bracket"],[9674,"lozenge"],[9824,"black spade suit"],[9827,"black club suit"],[9829,"black heart suit"],[9830,"black diamond suit"],[8194,"en space"],[8195,"em space"],[8201,"thin space"],[8204,"zero width non-joiner"],[8205,"zero width joiner"],[8206,"left-to-right mark"],[8207,"right-to-left mark"]]}]);return t.length>1?[{name:"All",characters:(r=t,n=e=>e.characters,(e=>{const t=[];for(let r=0,n=e.length;r<n;++r){if(!a(e[r]))throw new Error("Arr.flatten item "+r+" was not an array, input: "+e);c.apply(t,e[r])}return t})(u(r,n)))}].concat(t):t;var r,n},w=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},v=(e,t,r=0,a)=>{const n=e.indexOf(t,r);return-1!==n&&(!!i(a)||n+t.length<=a)},k=String.fromCodePoint,C=(e,t)=>{const r=[],a=t.toLowerCase();return((e,t)=>{for(let t=0,i=e.length;t<i;t++)((e,t,r)=>!!v(k(e).toLowerCase(),r)||v(t.toLowerCase(),r)||v(t.toLowerCase().replace(/\s+/g,""),r))((n=e[t])[0],n[1],a)&&r.push(n);var n})(e.characters),u(r,(e=>({text:e[1],value:k(e[0]),icon:k(e[0])})))},x="pattern",A=(e,r)=>{const a=()=>[{label:"Search",type:"input",name:x},{type:"collection",name:"results"}],i=1===r.length?w(f):w("All"),o=((e,t)=>{let r=null;const a=()=>{n(r)||(clearTimeout(r),r=null)};return{cancel:a,throttle:(...t)=>{a(),r=setTimeout((()=>{r=null,e.apply(null,t)}),40)}}})((e=>{const t=e.getData().pattern;((e,t)=>{var a,n;(a=r,n=e=>e.name===i.get(),((e,t,r)=>{for(let a=0,n=e.length;a<n;a++){const n=e[a];if(t(n,a))return l.some(n);if(r(n,a))break}return l.none()})(a,n,s)).each((r=>{const a=C(r,t);e.setData({results:a})}))})(e,t)})),c={title:"Special Character",size:"normal",body:1===r.length?{type:"panel",items:a()}:{type:"tabpanel",tabs:u(r,(e=>({title:e.name,name:e.name,items:a()})))},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}],initialData:{pattern:"",results:C(r[0],"")},onAction:(r,a)=>{"results"===a.name&&(t(e,a.value),r.close())},onTabChange:(e,t)=>{i.set(t.newTabName),o.throttle(e)},onChange:(e,t)=>{t.name===x&&o.throttle(e)}};e.windowManager.open(c).focus(x)},q=e=>t=>{const r=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",r),r(),()=>{e.off("NodeChange",r)}};e.add("charmap",(e=>{(e=>{const t=e.options.register,r=e=>o(e)||a(e);t("charmap",{processor:r}),t("charmap_append",{processor:r})})(e);const r=b(e);return((e,t)=>{e.addCommand("mceShowCharmap",(()=>{A(e,t)}))})(e,r),(e=>{const t=()=>e.execCommand("mceShowCharmap");e.ui.registry.addButton("charmap",{icon:"insert-character",tooltip:"Special character",onAction:t,onSetup:q(e)}),e.ui.registry.addMenuItem("charmap",{icon:"insert-character",text:"Special character...",onAction:t,onSetup:q(e)})})(e),((e,t)=>{e.ui.registry.addAutocompleter("charmap",{trigger:":",columns:"auto",minChars:2,fetch:(e,r)=>new Promise(((r,a)=>{r(C(t,e))})),onAction:(t,r,a)=>{e.selection.setRng(r),e.insertContent(a),t.hide()}})})(e,r[0]),(e=>({getCharMap:()=>b(e),insertChar:r=>{t(e,r)}}))(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/code/plugin.min.js b/public/libs/tinymce/plugins/code/plugin.min.js
index a76b4982452..1928a12f774 100644
--- a/public/libs/tinymce/plugins/code/plugin.min.js
+++ b/public/libs/tinymce/plugins/code/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";tinymce.util.Tools.resolve("tinymce.PluginManager").add("code",(e=>((e=>{e.addCommand("mceCodeEditor",(()=>{(e=>{const o=(e=>e.getContent({source_view:!0}))(e);e.windowManager.open({title:"Source Code",size:"large",body:{type:"panel",items:[{type:"textarea",name:"code"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{code:o},onSubmit:o=>{((e,o)=>{e.focus(),e.undoManager.transact((()=>{e.setContent(o)})),e.selection.setCursorLocation(),e.nodeChanged()})(e,o.getData().code),o.close()}})})(e)}))})(e),(e=>{const o=()=>e.execCommand("mceCodeEditor");e.ui.registry.addButton("code",{icon:"sourcecode",tooltip:"Source code",onAction:o}),e.ui.registry.addMenuItem("code",{icon:"sourcecode",text:"Source code",onAction:o})})(e),{})))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/codesample/plugin.min.js b/public/libs/tinymce/plugins/codesample/plugin.min.js
index f3936a81051..504ea9e5213 100644
--- a/public/libs/tinymce/plugins/codesample/plugin.min.js
+++ b/public/libs/tinymce/plugins/codesample/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>!(e=>null==e)(e),n=()=>{};class a{constructor(e,t){this.tag=e,this.value=t}static some(e){return new a(!0,e)}static none(){return a.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?a.some(e(this.value)):a.none()}bind(e){return this.tag?e(this.value):a.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:a.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return t(e)?a.some(e):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);var s=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils");const r="undefined"!=typeof window?window:Function("return this;")(),i=function(e,t,n){const a=window.Prism;window.Prism={manual:!0};var s=function(e){var t=/(?:^|\s)lang(?:uage)?-([\w-]+)(?=\s|$)/i,n=0,a={},s={manual:e.Prism&&e.Prism.manual,disableWorkerMessageHandler:e.Prism&&e.Prism.disableWorkerMessageHandler,util:{encode:function e(t){return t instanceof r?new r(t.type,e(t.content),t.alias):Array.isArray(t)?t.map(e):t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).slice(8,-1)},objId:function(e){return e.__id||Object.defineProperty(e,"__id",{value:++n}),e.__id},clone:function e(t,n){var a,r;switch(n=n||{},s.util.type(t)){case"Object":if(r=s.util.objId(t),n[r])return n[r];for(var i in a={},n[r]=a,t)t.hasOwnProperty(i)&&(a[i]=e(t[i],n));return a;case"Array":return r=s.util.objId(t),n[r]?n[r]:(a=[],n[r]=a,t.forEach((function(t,s){a[s]=e(t,n)})),a);default:return t}},getLanguage:function(e){for(;e;){var n=t.exec(e.className);if(n)return n[1].toLowerCase();e=e.parentElement}return"none"},setLanguage:function(e,n){e.className=e.className.replace(RegExp(t,"gi"),""),e.classList.add("language-"+n)},currentScript:function(){if("undefined"==typeof document)return null;if("currentScript"in document)return document.currentScript;try{throw new Error}catch(a){var e=(/at [^(\r\n]*\((.*):[^:]+:[^:]+\)$/i.exec(a.stack)||[])[1];if(e){var t=document.getElementsByTagName("script");for(var n in t)if(t[n].src==e)return t[n]}return null}},isActive:function(e,t,n){for(var a="no-"+t;e;){var s=e.classList;if(s.contains(t))return!0;if(s.contains(a))return!1;e=e.parentElement}return!!n}},languages:{plain:a,plaintext:a,text:a,txt:a,extend:function(e,t){var n=s.util.clone(s.languages[e]);for(var a in t)n[a]=t[a];return n},insertBefore:function(e,t,n,a){var r=(a=a||s.languages)[e],i={};for(var o in r)if(r.hasOwnProperty(o)){if(o==t)for(var l in n)n.hasOwnProperty(l)&&(i[l]=n[l]);n.hasOwnProperty(o)||(i[o]=r[o])}var u=a[e];return a[e]=i,s.languages.DFS(s.languages,(function(t,n){n===u&&t!=e&&(this[t]=i)})),i},DFS:function e(t,n,a,r){r=r||{};var i=s.util.objId;for(var o in t)if(t.hasOwnProperty(o)){n.call(t,o,t[o],a||o);var l=t[o],u=s.util.type(l);"Object"!==u||r[i(l)]?"Array"!==u||r[i(l)]||(r[i(l)]=!0,e(l,n,o,r)):(r[i(l)]=!0,e(l,n,null,r))}}},plugins:{},highlightAll:function(e,t){s.highlightAllUnder(document,e,t)},highlightAllUnder:function(e,t,n){var a={callback:n,container:e,selector:'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'};s.hooks.run("before-highlightall",a),a.elements=Array.prototype.slice.apply(a.container.querySelectorAll(a.selector)),s.hooks.run("before-all-elements-highlight",a);for(var r,i=0;r=a.elements[i++];)s.highlightElement(r,!0===t,a.callback)},highlightElement:function(t,n,a){var r=s.util.getLanguage(t),i=s.languages[r];s.util.setLanguage(t,r);var o=t.parentElement;o&&"pre"===o.nodeName.toLowerCase()&&s.util.setLanguage(o,r);var l={element:t,language:r,grammar:i,code:t.textContent};function u(e){l.highlightedCode=e,s.hooks.run("before-insert",l),l.element.innerHTML=l.highlightedCode,s.hooks.run("after-highlight",l),s.hooks.run("complete",l),a&&a.call(l.element)}if(s.hooks.run("before-sanity-check",l),(o=l.element.parentElement)&&"pre"===o.nodeName.toLowerCase()&&!o.hasAttribute("tabindex")&&o.setAttribute("tabindex","0"),!l.code)return s.hooks.run("complete",l),void(a&&a.call(l.element));if(s.hooks.run("before-highlight",l),l.grammar)if(n&&e.Worker){var c=new Worker(s.filename);c.onmessage=function(e){u(e.data)},c.postMessage(JSON.stringify({language:l.language,code:l.code,immediateClose:!0}))}else u(s.highlight(l.code,l.grammar,l.language));else u(s.util.encode(l.code))},highlight:function(e,t,n){var a={code:e,grammar:t,language:n};if(s.hooks.run("before-tokenize",a),!a.grammar)throw new Error('The language "'+a.language+'" has no grammar.');return a.tokens=s.tokenize(a.code,a.grammar),s.hooks.run("after-tokenize",a),r.stringify(s.util.encode(a.tokens),a.language)},tokenize:function(e,t){var n=t.rest;if(n){for(var a in n)t[a]=n[a];delete t.rest}var s=new l;return u(s,s.head,e),o(e,s,t,s.head,0),function(e){for(var t=[],n=e.head.next;n!==e.tail;)t.push(n.value),n=n.next;return t}(s)},hooks:{all:{},add:function(e,t){var n=s.hooks.all;n[e]=n[e]||[],n[e].push(t)},run:function(e,t){var n=s.hooks.all[e];if(n&&n.length)for(var a,r=0;a=n[r++];)a(t)}},Token:r};function r(e,t,n,a){this.type=e,this.content=t,this.alias=n,this.length=0|(a||"").length}function i(e,t,n,a){e.lastIndex=t;var s=e.exec(n);if(s&&a&&s[1]){var r=s[1].length;s.index+=r,s[0]=s[0].slice(r)}return s}function o(e,t,n,a,l,d){for(var g in n)if(n.hasOwnProperty(g)&&n[g]){var p=n[g];p=Array.isArray(p)?p:[p];for(var b=0;b<p.length;++b){if(d&&d.cause==g+","+b)return;var h=p[b],f=h.inside,m=!!h.lookbehind,y=!!h.greedy,w=h.alias;if(y&&!h.pattern.global){var k=h.pattern.toString().match(/[imsuy]*$/)[0];h.pattern=RegExp(h.pattern.source,k+"g")}for(var v=h.pattern||h,_=a.next,x=l;_!==t.tail&&!(d&&x>=d.reach);x+=_.value.length,_=_.next){var F=_.value;if(t.length>e.length)return;if(!(F instanceof r)){var A,S=1;if(y){if(!(A=i(v,x,e,m))||A.index>=e.length)break;var $=A.index,z=A.index+A[0].length,E=x;for(E+=_.value.length;$>=E;)E+=(_=_.next).value.length;if(x=E-=_.value.length,_.value instanceof r)continue;for(var C=_;C!==t.tail&&(E<z||"string"==typeof C.value);C=C.next)S++,E+=C.value.length;S--,F=e.slice(x,E),A.index-=x}else if(!(A=i(v,0,F,m)))continue;$=A.index;var j=A[0],B=F.slice(0,$),T=F.slice($+j.length),O=x+F.length;d&&O>d.reach&&(d.reach=O);var P=_.prev;if(B&&(P=u(t,P,B),x+=B.length),c(t,P,S),_=u(t,P,new r(g,f?s.tokenize(j,f):j,w,j)),T&&u(t,_,T),S>1){var N={cause:g+","+b,reach:O};o(e,t,n,_.prev,x,N),d&&N.reach>d.reach&&(d.reach=N.reach)}}}}}}function l(){var e={value:null,prev:null,next:null},t={value:null,prev:e,next:null};e.next=t,this.head=e,this.tail=t,this.length=0}function u(e,t,n){var a=t.next,s={value:n,prev:t,next:a};return t.next=s,a.prev=s,e.length++,s}function c(e,t,n){for(var a=t.next,s=0;s<n&&a!==e.tail;s++)a=a.next;t.next=a,a.prev=t,e.length-=s}if(e.Prism=s,r.stringify=function e(t,n){if("string"==typeof t)return t;if(Array.isArray(t)){var a="";return t.forEach((function(t){a+=e(t,n)})),a}var r={type:t.type,content:e(t.content,n),tag:"span",classes:["token",t.type],attributes:{},language:n},i=t.alias;i&&(Array.isArray(i)?Array.prototype.push.apply(r.classes,i):r.classes.push(i)),s.hooks.run("wrap",r);var o="";for(var l in r.attributes)o+=" "+l+'="'+(r.attributes[l]||"").replace(/"/g,"&quot;")+'"';return"<"+r.tag+' class="'+r.classes.join(" ")+'"'+o+">"+r.content+"</"+r.tag+">"},!e.document)return e.addEventListener?(s.disableWorkerMessageHandler||e.addEventListener("message",(function(t){var n=JSON.parse(t.data),a=n.language,r=n.code,i=n.immediateClose;e.postMessage(s.highlight(r,s.languages[a],a)),i&&e.close()}),!1),s):s;var d=s.util.currentScript();function g(){s.manual||s.highlightAll()}if(d&&(s.filename=d.src,d.hasAttribute("data-manual")&&(s.manual=!0)),!s.manual){var p=document.readyState;"loading"===p||"interactive"===p&&d&&d.defer?document.addEventListener("DOMContentLoaded",g):window.requestAnimationFrame?window.requestAnimationFrame(g):window.setTimeout(g,16)}return s}("undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{});return s.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/(\b(?:class|extends|implements|instanceof|interface|new|trait)\s+|\bcatch\s+\()[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:break|catch|continue|do|else|finally|for|function|if|in|instanceof|new|null|return|throw|try|while)\b/,boolean:/\b(?:false|true)\b/,function:/\b\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,punctuation:/[{}[\];(),.:]/},function(e){function t(e,t){return"___"+e.toUpperCase()+t+"___"}Object.defineProperties(e.languages["markup-templating"]={},{buildPlaceholders:{value:function(n,a,s,r){if(n.language===a){var i=n.tokenStack=[];n.code=n.code.replace(s,(function(e){if("function"==typeof r&&!r(e))return e;for(var s,o=i.length;-1!==n.code.indexOf(s=t(a,o));)++o;return i[o]=e,s})),n.grammar=e.languages.markup}}},tokenizePlaceholders:{value:function(n,a){if(n.language===a&&n.tokenStack){n.grammar=e.languages[a];var s=0,r=Object.keys(n.tokenStack);!function i(o){for(var l=0;l<o.length&&!(s>=r.length);l++){var u=o[l];if("string"==typeof u||u.content&&"string"==typeof u.content){var c=r[s],d=n.tokenStack[c],g="string"==typeof u?u:u.content,p=t(a,c),b=g.indexOf(p);if(b>-1){++s;var h=g.substring(0,b),f=new e.Token(a,e.tokenize(d,n.grammar),"language-"+a,d),m=g.substring(b+p.length),y=[];h&&y.push.apply(y,i([h])),y.push(f),m&&y.push.apply(y,i([m])),"string"==typeof u?o.splice.apply(o,[l,1].concat(y)):u.content=y}}else u.content&&i(u.content)}return o}(n.tokens)}}}})}(s),s.languages.c=s.languages.extend("clike",{comment:{pattern:/\/\/(?:[^\r\n\\]|\\(?:\r\n?|\n|(?![\r\n])))*|\/\*[\s\S]*?(?:\*\/|$)/,greedy:!0},string:{pattern:/"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"/,greedy:!0},"class-name":{pattern:/(\b(?:enum|struct)\s+(?:__attribute__\s*\(\([\s\S]*?\)\)\s*)?)\w+|\b[a-z]\w*_t\b/,lookbehind:!0},keyword:/\b(?:_Alignas|_Alignof|_Atomic|_Bool|_Complex|_Generic|_Imaginary|_Noreturn|_Static_assert|_Thread_local|__attribute__|asm|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|inline|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|typeof|union|unsigned|void|volatile|while)\b/,function:/\b[a-z_]\w*(?=\s*\()/i,number:/(?:\b0x(?:[\da-f]+(?:\.[\da-f]*)?|\.[\da-f]+)(?:p[+-]?\d+)?|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?)[ful]{0,4}/i,operator:/>>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?/}),s.languages.insertBefore("c","string",{char:{pattern:/'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n]){0,32}'/,greedy:!0}}),s.languages.insertBefore("c","string",{macro:{pattern:/(^[\t ]*)#\s*[a-z](?:[^\r\n\\/]|\/(?!\*)|\/\*(?:[^*]|\*(?!\/))*\*\/|\\(?:\r\n|[\s\S]))*/im,lookbehind:!0,greedy:!0,alias:"property",inside:{string:[{pattern:/^(#\s*include\s*)<[^>]+>/,lookbehind:!0},s.languages.c.string],char:s.languages.c.char,comment:s.languages.c.comment,"macro-name":[{pattern:/(^#\s*define\s+)\w+\b(?!\()/i,lookbehind:!0},{pattern:/(^#\s*define\s+)\w+\b(?=\()/i,lookbehind:!0,alias:"function"}],directive:{pattern:/^(#\s*)[a-z]+/,lookbehind:!0,alias:"keyword"},"directive-hash":/^#/,punctuation:/##|\\(?=[\r\n])/,expression:{pattern:/\S[\s\S]*/,inside:s.languages.c}}}}),s.languages.insertBefore("c","function",{constant:/\b(?:EOF|NULL|SEEK_CUR|SEEK_END|SEEK_SET|__DATE__|__FILE__|__LINE__|__TIMESTAMP__|__TIME__|__func__|stderr|stdin|stdout)\b/}),delete s.languages.c.boolean,function(e){var t=/\b(?:alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|char8_t|class|co_await|co_return|co_yield|compl|concept|const|const_cast|consteval|constexpr|constinit|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|final|float|for|friend|goto|if|import|inline|int|int16_t|int32_t|int64_t|int8_t|long|module|mutable|namespace|new|noexcept|nullptr|operator|override|private|protected|public|register|reinterpret_cast|requires|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|uint16_t|uint32_t|uint64_t|uint8_t|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,n=/\b(?!<keyword>)\w+(?:\s*\.\s*\w+)*\b/.source.replace(/<keyword>/g,(function(){return t.source}));e.languages.cpp=e.languages.extend("c",{"class-name":[{pattern:RegExp(/(\b(?:class|concept|enum|struct|typename)\s+)(?!<keyword>)\w+/.source.replace(/<keyword>/g,(function(){return t.source}))),lookbehind:!0},/\b[A-Z]\w*(?=\s*::\s*\w+\s*\()/,/\b[A-Z_]\w*(?=\s*::\s*~\w+\s*\()/i,/\b\w+(?=\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>\s*::\s*\w+\s*\()/],keyword:t,number:{pattern:/(?:\b0b[01']+|\b0x(?:[\da-f']+(?:\.[\da-f']*)?|\.[\da-f']+)(?:p[+-]?[\d']+)?|(?:\b[\d']+(?:\.[\d']*)?|\B\.[\d']+)(?:e[+-]?[\d']+)?)[ful]{0,4}/i,greedy:!0},operator:/>>=?|<<=?|->|--|\+\+|&&|\|\||[?:~]|<=>|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,boolean:/\b(?:false|true)\b/}),e.languages.insertBefore("cpp","string",{module:{pattern:RegExp(/(\b(?:import|module)\s+)/.source+"(?:"+/"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|<[^<>\r\n]*>/.source+"|"+/<mod-name>(?:\s*:\s*<mod-name>)?|:\s*<mod-name>/.source.replace(/<mod-name>/g,(function(){return n}))+")"),lookbehind:!0,greedy:!0,inside:{string:/^[<"][\s\S]+/,operator:/:/,punctuation:/\./}},"raw-string":{pattern:/R"([^()\\ ]{0,16})\([\s\S]*?\)\1"/,alias:"string",greedy:!0}}),e.languages.insertBefore("cpp","keyword",{"generic-function":{pattern:/\b(?!operator\b)[a-z_]\w*\s*<(?:[^<>]|<[^<>]*>)*>(?=\s*\()/i,inside:{function:/^\w+/,generic:{pattern:/<[\s\S]+/,alias:"class-name",inside:e.languages.cpp}}}}),e.languages.insertBefore("cpp","operator",{"double-colon":{pattern:/::/,alias:"punctuation"}}),e.languages.insertBefore("cpp","class-name",{"base-clause":{pattern:/(\b(?:class|struct)\s+\w+\s*:\s*)[^;{}"'\s]+(?:\s+[^;{}"'\s]+)*(?=\s*[;{])/,lookbehind:!0,greedy:!0,inside:e.languages.extend("cpp",{})}}),e.languages.insertBefore("inside","double-colon",{"class-name":/\b[a-z_]\w*\b(?!\s*::)/i},e.languages.cpp["base-clause"])}(s),function(e){function t(e,t){return e.replace(/<<(\d+)>>/g,(function(e,n){return"(?:"+t[+n]+")"}))}function n(e,n,a){return RegExp(t(e,n),a||"")}function a(e,t){for(var n=0;n<t;n++)e=e.replace(/<<self>>/g,(function(){return"(?:"+e+")"}));return e.replace(/<<self>>/g,"[^\\s\\S]")}var s="bool byte char decimal double dynamic float int long object sbyte short string uint ulong ushort var void",r="class enum interface record struct",i="add alias and ascending async await by descending from(?=\\s*(?:\\w|$)) get global group into init(?=\\s*;) join let nameof not notnull on or orderby partial remove select set unmanaged value when where with(?=\\s*{)",o="abstract as base break case catch checked const continue default delegate do else event explicit extern finally fixed for foreach goto if implicit in internal is lock namespace new null operator out override params private protected public readonly ref return sealed sizeof stackalloc static switch this throw try typeof unchecked unsafe using virtual volatile while yield";function l(e){return"\\b(?:"+e.trim().replace(/ /g,"|")+")\\b"}var u=l(r),c=RegExp(l(s+" "+r+" "+i+" "+o)),d=l(r+" "+i+" "+o),g=l(s+" "+r+" "+o),p=a(/<(?:[^<>;=+\-*/%&|^]|<<self>>)*>/.source,2),b=a(/\((?:[^()]|<<self>>)*\)/.source,2),h=/@?\b[A-Za-z_]\w*\b/.source,f=t(/<<0>>(?:\s*<<1>>)?/.source,[h,p]),m=t(/(?!<<0>>)<<1>>(?:\s*\.\s*<<1>>)*/.source,[d,f]),y=/\[\s*(?:,\s*)*\]/.source,w=t(/<<0>>(?:\s*(?:\?\s*)?<<1>>)*(?:\s*\?)?/.source,[m,y]),k=t(/[^,()<>[\];=+\-*/%&|^]|<<0>>|<<1>>|<<2>>/.source,[p,b,y]),v=t(/\(<<0>>+(?:,<<0>>+)+\)/.source,[k]),_=t(/(?:<<0>>|<<1>>)(?:\s*(?:\?\s*)?<<2>>)*(?:\s*\?)?/.source,[v,m,y]),x={keyword:c,punctuation:/[<>()?,.:[\]]/},F=/'(?:[^\r\n'\\]|\\.|\\[Uux][\da-fA-F]{1,8})'/.source,A=/"(?:\\.|[^\\"\r\n])*"/.source,S=/@"(?:""|\\[\s\S]|[^\\"])*"(?!")/.source;e.languages.csharp=e.languages.extend("clike",{string:[{pattern:n(/(^|[^$\\])<<0>>/.source,[S]),lookbehind:!0,greedy:!0},{pattern:n(/(^|[^@$\\])<<0>>/.source,[A]),lookbehind:!0,greedy:!0}],"class-name":[{pattern:n(/(\busing\s+static\s+)<<0>>(?=\s*;)/.source,[m]),lookbehind:!0,inside:x},{pattern:n(/(\busing\s+<<0>>\s*=\s*)<<1>>(?=\s*;)/.source,[h,_]),lookbehind:!0,inside:x},{pattern:n(/(\busing\s+)<<0>>(?=\s*=)/.source,[h]),lookbehind:!0},{pattern:n(/(\b<<0>>\s+)<<1>>/.source,[u,f]),lookbehind:!0,inside:x},{pattern:n(/(\bcatch\s*\(\s*)<<0>>/.source,[m]),lookbehind:!0,inside:x},{pattern:n(/(\bwhere\s+)<<0>>/.source,[h]),lookbehind:!0},{pattern:n(/(\b(?:is(?:\s+not)?|as)\s+)<<0>>/.source,[w]),lookbehind:!0,inside:x},{pattern:n(/\b<<0>>(?=\s+(?!<<1>>|with\s*\{)<<2>>(?:\s*[=,;:{)\]]|\s+(?:in|when)\b))/.source,[_,g,h]),inside:x}],keyword:c,number:/(?:\b0(?:x[\da-f_]*[\da-f]|b[01_]*[01])|(?:\B\.\d+(?:_+\d+)*|\b\d+(?:_+\d+)*(?:\.\d+(?:_+\d+)*)?)(?:e[-+]?\d+(?:_+\d+)*)?)(?:[dflmu]|lu|ul)?\b/i,operator:/>>=?|<<=?|[-=]>|([-+&|])\1|~|\?\?=?|[-+*/%&|^!=<>]=?/,punctuation:/\?\.?|::|[{}[\];(),.:]/}),e.languages.insertBefore("csharp","number",{range:{pattern:/\.\./,alias:"operator"}}),e.languages.insertBefore("csharp","punctuation",{"named-parameter":{pattern:n(/([(,]\s*)<<0>>(?=\s*:)/.source,[h]),lookbehind:!0,alias:"punctuation"}}),e.languages.insertBefore("csharp","class-name",{namespace:{pattern:n(/(\b(?:namespace|using)\s+)<<0>>(?:\s*\.\s*<<0>>)*(?=\s*[;{])/.source,[h]),lookbehind:!0,inside:{punctuation:/\./}},"type-expression":{pattern:n(/(\b(?:default|sizeof|typeof)\s*\(\s*(?!\s))(?:[^()\s]|\s(?!\s)|<<0>>)*(?=\s*\))/.source,[b]),lookbehind:!0,alias:"class-name",inside:x},"return-type":{pattern:n(/<<0>>(?=\s+(?:<<1>>\s*(?:=>|[({]|\.\s*this\s*\[)|this\s*\[))/.source,[_,m]),inside:x,alias:"class-name"},"constructor-invocation":{pattern:n(/(\bnew\s+)<<0>>(?=\s*[[({])/.source,[_]),lookbehind:!0,inside:x,alias:"class-name"},"generic-method":{pattern:n(/<<0>>\s*<<1>>(?=\s*\()/.source,[h,p]),inside:{function:n(/^<<0>>/.source,[h]),generic:{pattern:RegExp(p),alias:"class-name",inside:x}}},"type-list":{pattern:n(/\b((?:<<0>>\s+<<1>>|record\s+<<1>>\s*<<5>>|where\s+<<2>>)\s*:\s*)(?:<<3>>|<<4>>|<<1>>\s*<<5>>|<<6>>)(?:\s*,\s*(?:<<3>>|<<4>>|<<6>>))*(?=\s*(?:where|[{;]|=>|$))/.source,[u,f,h,_,c.source,b,/\bnew\s*\(\s*\)/.source]),lookbehind:!0,inside:{"record-arguments":{pattern:n(/(^(?!new\s*\()<<0>>\s*)<<1>>/.source,[f,b]),lookbehind:!0,greedy:!0,inside:e.languages.csharp},keyword:c,"class-name":{pattern:RegExp(_),greedy:!0,inside:x},punctuation:/[,()]/}},preprocessor:{pattern:/(^[\t ]*)#.*/m,lookbehind:!0,alias:"property",inside:{directive:{pattern:/(#)\b(?:define|elif|else|endif|endregion|error|if|line|nullable|pragma|region|undef|warning)\b/,lookbehind:!0,alias:"keyword"}}}});var $=A+"|"+F,z=t(/\/(?![*/])|\/\/[^\r\n]*[\r\n]|\/\*(?:[^*]|\*(?!\/))*\*\/|<<0>>/.source,[$]),E=a(t(/[^"'/()]|<<0>>|\(<<self>>*\)/.source,[z]),2),C=/\b(?:assembly|event|field|method|module|param|property|return|type)\b/.source,j=t(/<<0>>(?:\s*\(<<1>>*\))?/.source,[m,E]);e.languages.insertBefore("csharp","class-name",{attribute:{pattern:n(/((?:^|[^\s\w>)?])\s*\[\s*)(?:<<0>>\s*:\s*)?<<1>>(?:\s*,\s*<<1>>)*(?=\s*\])/.source,[C,j]),lookbehind:!0,greedy:!0,inside:{target:{pattern:n(/^<<0>>(?=\s*:)/.source,[C]),alias:"keyword"},"attribute-arguments":{pattern:n(/\(<<0>>*\)/.source,[E]),inside:e.languages.csharp},"class-name":{pattern:RegExp(m),inside:{punctuation:/\./}},punctuation:/[:,]/}}});var B=/:[^}\r\n]+/.source,T=a(t(/[^"'/()]|<<0>>|\(<<self>>*\)/.source,[z]),2),O=t(/\{(?!\{)(?:(?![}:])<<0>>)*<<1>>?\}/.source,[T,B]),P=a(t(/[^"'/()]|\/(?!\*)|\/\*(?:[^*]|\*(?!\/))*\*\/|<<0>>|\(<<self>>*\)/.source,[$]),2),N=t(/\{(?!\{)(?:(?![}:])<<0>>)*<<1>>?\}/.source,[P,B]);function R(t,a){return{interpolation:{pattern:n(/((?:^|[^{])(?:\{\{)*)<<0>>/.source,[t]),lookbehind:!0,inside:{"format-string":{pattern:n(/(^\{(?:(?![}:])<<0>>)*)<<1>>(?=\}$)/.source,[a,B]),lookbehind:!0,inside:{punctuation:/^:/}},punctuation:/^\{|\}$/,expression:{pattern:/[\s\S]+/,alias:"language-csharp",inside:e.languages.csharp}}},string:/[\s\S]+/}}e.languages.insertBefore("csharp","string",{"interpolation-string":[{pattern:n(/(^|[^\\])(?:\$@|@\$)"(?:""|\\[\s\S]|\{\{|<<0>>|[^\\{"])*"/.source,[O]),lookbehind:!0,greedy:!0,inside:R(O,T)},{pattern:n(/(^|[^@\\])\$"(?:\\.|\{\{|<<0>>|[^\\"{])*"/.source,[N]),lookbehind:!0,greedy:!0,inside:R(N,P)}],char:{pattern:RegExp(F),greedy:!0}}),e.languages.dotnet=e.languages.cs=e.languages.csharp}(s),function(e){var t=/(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;e.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:RegExp("@[\\w-](?:"+/[^;{\s"']|\s+(?!\s)/.source+"|"+t.source+")*?"+/(?:;|(?=\s*\{))/.source),inside:{rule:/^@[\w-]+/,"selector-function-argument":{pattern:/(\bselector\s*\(\s*(?![\s)]))(?:[^()\s]|\s+(?![\s)])|\((?:[^()]|\([^()]*\))*\))+(?=\s*\))/,lookbehind:!0,alias:"selector"},keyword:{pattern:/(^|[^\w-])(?:and|not|only|or)(?![\w-])/,lookbehind:!0}}},url:{pattern:RegExp("\\burl\\((?:"+t.source+"|"+/(?:[^\\\r\n()"']|\\[\s\S])*/.source+")\\)","i"),greedy:!0,inside:{function:/^url/i,punctuation:/^\(|\)$/,string:{pattern:RegExp("^"+t.source+"$"),alias:"url"}}},selector:{pattern:RegExp("(^|[{}\\s])[^{}\\s](?:[^{};\"'\\s]|\\s+(?![\\s{])|"+t.source+")*(?=\\s*\\{)"),lookbehind:!0},string:{pattern:t,greedy:!0},property:{pattern:/(^|[^-\w\xA0-\uFFFF])(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,lookbehind:!0},important:/!important\b/i,function:{pattern:/(^|[^-a-z0-9])[-a-z0-9]+(?=\()/i,lookbehind:!0},punctuation:/[(){};:,]/},e.languages.css.atrule.inside.rest=e.languages.css;var n=e.languages.markup;n&&(n.tag.addInlined("style","css"),n.tag.addAttribute("style","css"))}(s),function(e){var t=/\b(?:abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|exports|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|module|native|new|non-sealed|null|open|opens|package|permits|private|protected|provides|public|record(?!\s*[(){}[\]<>=%~.:,;?+\-*/&|^])|requires|return|sealed|short|static|strictfp|super|switch|synchronized|this|throw|throws|to|transient|transitive|try|uses|var|void|volatile|while|with|yield)\b/,n=/(?:[a-z]\w*\s*\.\s*)*(?:[A-Z]\w*\s*\.\s*)*/.source,a={pattern:RegExp(/(^|[^\w.])/.source+n+/[A-Z](?:[\d_A-Z]*[a-z]\w*)?\b/.source),lookbehind:!0,inside:{namespace:{pattern:/^[a-z]\w*(?:\s*\.\s*[a-z]\w*)*(?:\s*\.)?/,inside:{punctuation:/\./}},punctuation:/\./}};e.languages.java=e.languages.extend("clike",{string:{pattern:/(^|[^\\])"(?:\\.|[^"\\\r\n])*"/,lookbehind:!0,greedy:!0},"class-name":[a,{pattern:RegExp(/(^|[^\w.])/.source+n+/[A-Z]\w*(?=\s+\w+\s*[;,=()]|\s*(?:\[[\s,]*\]\s*)?::\s*new\b)/.source),lookbehind:!0,inside:a.inside},{pattern:RegExp(/(\b(?:class|enum|extends|implements|instanceof|interface|new|record|throws)\s+)/.source+n+/[A-Z]\w*\b/.source),lookbehind:!0,inside:a.inside}],keyword:t,function:[e.languages.clike.function,{pattern:/(::\s*)[a-z_]\w*/,lookbehind:!0}],number:/\b0b[01][01_]*L?\b|\b0x(?:\.[\da-f_p+-]+|[\da-f_]+(?:\.[\da-f_p+-]+)?)\b|(?:\b\d[\d_]*(?:\.[\d_]*)?|\B\.\d[\d_]*)(?:e[+-]?\d[\d_]*)?[dfl]?/i,operator:{pattern:/(^|[^.])(?:<<=?|>>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,lookbehind:!0},constant:/\b[A-Z][A-Z_\d]+\b/}),e.languages.insertBefore("java","string",{"triple-quoted-string":{pattern:/"""[ \t]*[\r\n](?:(?:"|"")?(?:\\.|[^"\\]))*"""/,greedy:!0,alias:"string"},char:{pattern:/'(?:\\.|[^'\\\r\n]){1,6}'/,greedy:!0}}),e.languages.insertBefore("java","class-name",{annotation:{pattern:/(^|[^.])@\w+(?:\s*\.\s*\w+)*/,lookbehind:!0,alias:"punctuation"},generics:{pattern:/<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&)|<(?:[\w\s,.?]|&(?!&))*>)*>)*>)*>/,inside:{"class-name":a,keyword:t,punctuation:/[<>(),.:]/,operator:/[?&|]/}},import:[{pattern:RegExp(/(\bimport\s+)/.source+n+/(?:[A-Z]\w*|\*)(?=\s*;)/.source),lookbehind:!0,inside:{namespace:a.inside.namespace,punctuation:/\./,operator:/\*/,"class-name":/\w+/}},{pattern:RegExp(/(\bimport\s+static\s+)/.source+n+/(?:\w+|\*)(?=\s*;)/.source),lookbehind:!0,alias:"static",inside:{namespace:a.inside.namespace,static:/\b\w+$/,punctuation:/\./,operator:/\*/,"class-name":/\w+/}}],namespace:{pattern:RegExp(/(\b(?:exports|import(?:\s+static)?|module|open|opens|package|provides|requires|to|transitive|uses|with)\s+)(?!<keyword>)[a-z]\w*(?:\.[a-z]\w*)*\.?/.source.replace(/<keyword>/g,(function(){return t.source}))),lookbehind:!0,inside:{punctuation:/\./}}})}(s),s.languages.javascript=s.languages.extend("clike",{"class-name":[s.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:constructor|prototype))/,lookbehind:!0}],keyword:[{pattern:/((?:^|\})\s*)catch\b/,lookbehind:!0},{pattern:/(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],function:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,number:{pattern:RegExp(/(^|[^\w$])/.source+"(?:"+/NaN|Infinity/.source+"|"+/0[bB][01]+(?:_[01]+)*n?/.source+"|"+/0[oO][0-7]+(?:_[0-7]+)*n?/.source+"|"+/0[xX][\dA-Fa-f]+(?:_[\dA-Fa-f]+)*n?/.source+"|"+/\d+(?:_\d+)*n/.source+"|"+/(?:\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\.\d+(?:_\d+)*)(?:[Ee][+-]?\d+(?:_\d+)*)?/.source+")"+/(?![\w$])/.source),lookbehind:!0},operator:/--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/}),s.languages.javascript["class-name"][0].pattern=/(\b(?:class|extends|implements|instanceof|interface|new)\s+)[\w.\\]+/,s.languages.insertBefore("javascript","keyword",{regex:{pattern:RegExp(/((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)/.source+/\//.source+"(?:"+/(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}/.source+"|"+/(?:\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.)*\])*\])*\]|\\.|[^/\\\[\r\n])+\/[dgimyus]{0,7}v[dgimyus]{0,7}/.source+")"+/(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/.source),lookbehind:!0,greedy:!0,inside:{"regex-source":{pattern:/^(\/)[\s\S]+(?=\/[a-z]*$)/,lookbehind:!0,alias:"language-regex",inside:s.languages.regex},"regex-delimiter":/^\/|\/$/,"regex-flags":/^[a-z]+$/}},"function-variable":{pattern:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/,lookbehind:!0,inside:s.languages.javascript},{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,lookbehind:!0,inside:s.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/,lookbehind:!0,inside:s.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/,lookbehind:!0,inside:s.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),s.languages.insertBefore("javascript","string",{hashbang:{pattern:/^#!.*/,greedy:!0,alias:"comment"},"template-string":{pattern:/`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:s.languages.javascript}},string:/[\s\S]+/}},"string-property":{pattern:/((?:^|[,{])[ \t]*)(["'])(?:\\(?:\r\n|[\s\S])|(?!\2)[^\\\r\n])*\2(?=\s*:)/m,lookbehind:!0,greedy:!0,alias:"property"}}),s.languages.insertBefore("javascript","operator",{"literal-property":{pattern:/((?:^|[,{])[ \t]*)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*:)/m,lookbehind:!0,alias:"property"}}),s.languages.markup&&(s.languages.markup.tag.addInlined("script","javascript"),s.languages.markup.tag.addAttribute(/on(?:abort|blur|change|click|composition(?:end|start|update)|dblclick|error|focus(?:in|out)?|key(?:down|up)|load|mouse(?:down|enter|leave|move|out|over|up)|reset|resize|scroll|select|slotchange|submit|unload|wheel)/.source,"javascript")),s.languages.js=s.languages.javascript,s.languages.markup={comment:{pattern:/<!--(?:(?!<!--)[\s\S])*?-->/,greedy:!0},prolog:{pattern:/<\?[\s\S]+?\?>/,greedy:!0},doctype:{pattern:/<!DOCTYPE(?:[^>"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|<!--(?:[^-]|-(?!->))*-->)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(^[^\[]*\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^<!|>$|[[\]]/,"doctype-tag":/^DOCTYPE/i,name:/[^\s<>'"]+/}},cdata:{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,greedy:!0},tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"special-attr":[],"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{punctuation:[{pattern:/^=/,alias:"attr-equals"},{pattern:/^(\s*)["']|["']$/,lookbehind:!0}]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:[{pattern:/&[\da-z]{1,8};/i,alias:"named-entity"},/&#x?[\da-f]{1,8};/i]},s.languages.markup.tag.inside["attr-value"].inside.entity=s.languages.markup.entity,s.languages.markup.doctype.inside["internal-subset"].inside=s.languages.markup,s.hooks.add("wrap",(function(e){"entity"===e.type&&(e.attributes.title=e.content.replace(/&amp;/,"&"))})),Object.defineProperty(s.languages.markup.tag,"addInlined",{value:function(e,t){var n={};n["language-"+t]={pattern:/(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,lookbehind:!0,inside:s.languages[t]},n.cdata=/^<!\[CDATA\[|\]\]>$/i;var a={"included-cdata":{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,inside:n}};a["language-"+t]={pattern:/[\s\S]+/,inside:s.languages[t]};var r={};r[e]={pattern:RegExp(/(<__[^>]*>)(?:<!\[CDATA\[(?:[^\]]|\](?!\]>))*\]\]>|(?!<!\[CDATA\[)[\s\S])*?(?=<\/__>)/.source.replace(/__/g,(function(){return e})),"i"),lookbehind:!0,greedy:!0,inside:a},s.languages.insertBefore("markup","cdata",r)}}),Object.defineProperty(s.languages.markup.tag,"addAttribute",{value:function(e,t){s.languages.markup.tag.inside["special-attr"].push({pattern:RegExp(/(^|["'\s])/.source+"(?:"+e+")"+/\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))/.source,"i"),lookbehind:!0,inside:{"attr-name":/^[^\s=]+/,"attr-value":{pattern:/=[\s\S]+/,inside:{value:{pattern:/(^=\s*(["']|(?!["'])))\S[\s\S]*(?=\2$)/,lookbehind:!0,alias:[t,"language-"+t],inside:s.languages[t]},punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}}}})}}),s.languages.html=s.languages.markup,s.languages.mathml=s.languages.markup,s.languages.svg=s.languages.markup,s.languages.xml=s.languages.extend("markup",{}),s.languages.ssml=s.languages.xml,s.languages.atom=s.languages.xml,s.languages.rss=s.languages.xml,function(e){var t=/\/\*[\s\S]*?\*\/|\/\/.*|#(?!\[).*/,n=[{pattern:/\b(?:false|true)\b/i,alias:"boolean"},{pattern:/(::\s*)\b[a-z_]\w*\b(?!\s*\()/i,greedy:!0,lookbehind:!0},{pattern:/(\b(?:case|const)\s+)\b[a-z_]\w*(?=\s*[;=])/i,greedy:!0,lookbehind:!0},/\b(?:null)\b/i,/\b[A-Z_][A-Z0-9_]*\b(?!\s*\()/],a=/\b0b[01]+(?:_[01]+)*\b|\b0o[0-7]+(?:_[0-7]+)*\b|\b0x[\da-f]+(?:_[\da-f]+)*\b|(?:\b\d+(?:_\d+)*\.?(?:\d+(?:_\d+)*)?|\B\.\d+)(?:e[+-]?\d+)?/i,s=/<?=>|\?\?=?|\.{3}|\??->|[!=]=?=?|::|\*\*=?|--|\+\+|&&|\|\||<<|>>|[?~]|[/^|%*&<>.+-]=?/,r=/[{}\[\](),:;]/;e.languages.php={delimiter:{pattern:/\?>$|^<\?(?:php(?=\s)|=)?/i,alias:"important"},comment:t,variable:/\$+(?:\w+\b|(?=\{))/,package:{pattern:/(namespace\s+|use\s+(?:function\s+)?)(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,lookbehind:!0,inside:{punctuation:/\\/}},"class-name-definition":{pattern:/(\b(?:class|enum|interface|trait)\s+)\b[a-z_]\w*(?!\\)\b/i,lookbehind:!0,alias:"class-name"},"function-definition":{pattern:/(\bfunction\s+)[a-z_]\w*(?=\s*\()/i,lookbehind:!0,alias:"function"},keyword:[{pattern:/(\(\s*)\b(?:array|bool|boolean|float|int|integer|object|string)\b(?=\s*\))/i,alias:"type-casting",greedy:!0,lookbehind:!0},{pattern:/([(,?]\s*)\b(?:array(?!\s*\()|bool|callable|(?:false|null)(?=\s*\|)|float|int|iterable|mixed|object|self|static|string)\b(?=\s*\$)/i,alias:"type-hint",greedy:!0,lookbehind:!0},{pattern:/(\)\s*:\s*(?:\?\s*)?)\b(?:array(?!\s*\()|bool|callable|(?:false|null)(?=\s*\|)|float|int|iterable|mixed|never|object|self|static|string|void)\b/i,alias:"return-type",greedy:!0,lookbehind:!0},{pattern:/\b(?:array(?!\s*\()|bool|float|int|iterable|mixed|object|string|void)\b/i,alias:"type-declaration",greedy:!0},{pattern:/(\|\s*)(?:false|null)\b|\b(?:false|null)(?=\s*\|)/i,alias:"type-declaration",greedy:!0,lookbehind:!0},{pattern:/\b(?:parent|self|static)(?=\s*::)/i,alias:"static-context",greedy:!0},{pattern:/(\byield\s+)from\b/i,lookbehind:!0},/\bclass\b/i,{pattern:/((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|fn|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|match|namespace|never|new|or|parent|print|private|protected|public|readonly|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield|__halt_compiler)\b/i,lookbehind:!0}],"argument-name":{pattern:/([(,]\s*)\b[a-z_]\w*(?=\s*:(?!:))/i,lookbehind:!0},"class-name":[{pattern:/(\b(?:extends|implements|instanceof|new(?!\s+self|\s+static))\s+|\bcatch\s*\()\b[a-z_]\w*(?!\\)\b/i,greedy:!0,lookbehind:!0},{pattern:/(\|\s*)\b[a-z_]\w*(?!\\)\b/i,greedy:!0,lookbehind:!0},{pattern:/\b[a-z_]\w*(?!\\)\b(?=\s*\|)/i,greedy:!0},{pattern:/(\|\s*)(?:\\?\b[a-z_]\w*)+\b/i,alias:"class-name-fully-qualified",greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/(?:\\?\b[a-z_]\w*)+\b(?=\s*\|)/i,alias:"class-name-fully-qualified",greedy:!0,inside:{punctuation:/\\/}},{pattern:/(\b(?:extends|implements|instanceof|new(?!\s+self\b|\s+static\b))\s+|\bcatch\s*\()(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,alias:"class-name-fully-qualified",greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/\b[a-z_]\w*(?=\s*\$)/i,alias:"type-declaration",greedy:!0},{pattern:/(?:\\?\b[a-z_]\w*)+(?=\s*\$)/i,alias:["class-name-fully-qualified","type-declaration"],greedy:!0,inside:{punctuation:/\\/}},{pattern:/\b[a-z_]\w*(?=\s*::)/i,alias:"static-context",greedy:!0},{pattern:/(?:\\?\b[a-z_]\w*)+(?=\s*::)/i,alias:["class-name-fully-qualified","static-context"],greedy:!0,inside:{punctuation:/\\/}},{pattern:/([(,?]\s*)[a-z_]\w*(?=\s*\$)/i,alias:"type-hint",greedy:!0,lookbehind:!0},{pattern:/([(,?]\s*)(?:\\?\b[a-z_]\w*)+(?=\s*\$)/i,alias:["class-name-fully-qualified","type-hint"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}},{pattern:/(\)\s*:\s*(?:\?\s*)?)\b[a-z_]\w*(?!\\)\b/i,alias:"return-type",greedy:!0,lookbehind:!0},{pattern:/(\)\s*:\s*(?:\?\s*)?)(?:\\?\b[a-z_]\w*)+\b(?!\\)/i,alias:["class-name-fully-qualified","return-type"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}}],constant:n,function:{pattern:/(^|[^\\\w])\\?[a-z_](?:[\w\\]*\w)?(?=\s*\()/i,lookbehind:!0,inside:{punctuation:/\\/}},property:{pattern:/(->\s*)\w+/,lookbehind:!0},number:a,operator:s,punctuation:r};var i={pattern:/\{\$(?:\{(?:\{[^{}]+\}|[^{}]+)\}|[^{}])+\}|(^|[^\\{])\$+(?:\w+(?:\[[^\r\n\[\]]+\]|->\w+)?)/,lookbehind:!0,inside:e.languages.php},o=[{pattern:/<<<'([^']+)'[\r\n](?:.*[\r\n])*?\1;/,alias:"nowdoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<<'[^']+'|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<'?|[';]$/}}}},{pattern:/<<<(?:"([^"]+)"[\r\n](?:.*[\r\n])*?\1;|([a-z_]\w*)[\r\n](?:.*[\r\n])*?\2;)/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<<(?:"[^"]+"|[a-z_]\w*)|[a-z_]\w*;$/i,alias:"symbol",inside:{punctuation:/^<<<"?|[";]$/}},interpolation:i}},{pattern:/`(?:\\[\s\S]|[^\\`])*`/,alias:"backtick-quoted-string",greedy:!0},{pattern:/'(?:\\[\s\S]|[^\\'])*'/,alias:"single-quoted-string",greedy:!0},{pattern:/"(?:\\[\s\S]|[^\\"])*"/,alias:"double-quoted-string",greedy:!0,inside:{interpolation:i}}];e.languages.insertBefore("php","variable",{string:o,attribute:{pattern:/#\[(?:[^"'\/#]|\/(?![*/])|\/\/.*$|#(?!\[).*$|\/\*(?:[^*]|\*(?!\/))*\*\/|"(?:\\[\s\S]|[^\\"])*"|'(?:\\[\s\S]|[^\\'])*')+\](?=\s*[a-z$#])/im,greedy:!0,inside:{"attribute-content":{pattern:/^(#\[)[\s\S]+(?=\]$)/,lookbehind:!0,inside:{comment:t,string:o,"attribute-class-name":[{pattern:/([^:]|^)\b[a-z_]\w*(?!\\)\b/i,alias:"class-name",greedy:!0,lookbehind:!0},{pattern:/([^:]|^)(?:\\?\b[a-z_]\w*)+/i,alias:["class-name","class-name-fully-qualified"],greedy:!0,lookbehind:!0,inside:{punctuation:/\\/}}],constant:n,number:a,operator:s,punctuation:r}},delimiter:{pattern:/^#\[|\]$/,alias:"punctuation"}}}}),e.hooks.add("before-tokenize",(function(t){/<\?/.test(t.code)&&e.languages["markup-templating"].buildPlaceholders(t,"php",/<\?(?:[^"'/#]|\/(?![*/])|("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|(?:\/\/|#(?!\[))(?:[^?\n\r]|\?(?!>))*(?=$|\?>|[\r\n])|#\[|\/\*(?:[^*]|\*(?!\/))*(?:\*\/|$))*?(?:\?>|$)/g)})),e.hooks.add("after-tokenize",(function(t){e.languages["markup-templating"].tokenizePlaceholders(t,"php")}))}(s),s.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0,greedy:!0},"string-interpolation":{pattern:/(?:f|fr|rf)(?:("""|''')[\s\S]*?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2)/i,greedy:!0,inside:{interpolation:{pattern:/((?:^|[^{])(?:\{\{)*)\{(?!\{)(?:[^{}]|\{(?!\{)(?:[^{}]|\{(?!\{)(?:[^{}])+\})+\})+\}/,lookbehind:!0,inside:{"format-spec":{pattern:/(:)[^:(){}]+(?=\}$)/,lookbehind:!0},"conversion-option":{pattern:/![sra](?=[:}]$)/,alias:"punctuation"},rest:null}},string:/[\s\S]+/}},"triple-quoted-string":{pattern:/(?:[rub]|br|rb)?("""|''')[\s\S]*?\1/i,greedy:!0,alias:"string"},string:{pattern:/(?:[rub]|br|rb)?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/i,greedy:!0},function:{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_]\w*(?=\s*\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)\w+/i,lookbehind:!0},decorator:{pattern:/(^[\t ]*)@\w+(?:\.\w+)*/m,lookbehind:!0,alias:["annotation","punctuation"],inside:{punctuation:/\./}},keyword:/\b(?:_(?=\s*:)|and|as|assert|async|await|break|case|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|match|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b/,builtin:/\b(?:__import__|abs|all|any|apply|ascii|basestring|bin|bool|buffer|bytearray|bytes|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|memoryview|min|next|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|unichr|unicode|vars|xrange|zip)\b/,boolean:/\b(?:False|None|True)\b/,number:/\b0(?:b(?:_?[01])+|o(?:_?[0-7])+|x(?:_?[a-f0-9])+)\b|(?:\b\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\B\.\d+(?:_\d+)*)(?:e[+-]?\d+(?:_\d+)*)?j?(?!\w)/i,operator:/[-+%=]=?|!=|:=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/,punctuation:/[{}[\];(),.:]/},s.languages.python["string-interpolation"].inside.interpolation.inside.rest=s.languages.python,s.languages.py=s.languages.python,function(e){e.languages.ruby=e.languages.extend("clike",{comment:{pattern:/#.*|^=begin\s[\s\S]*?^=end/m,greedy:!0},"class-name":{pattern:/(\b(?:class|module)\s+|\bcatch\s+\()[\w.\\]+|\b[A-Z_]\w*(?=\s*\.\s*new\b)/,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:BEGIN|END|alias|and|begin|break|case|class|def|define_method|defined|do|each|else|elsif|end|ensure|extend|for|if|in|include|module|new|next|nil|not|or|prepend|private|protected|public|raise|redo|require|rescue|retry|return|self|super|then|throw|undef|unless|until|when|while|yield)\b/,operator:/\.{2,3}|&\.|===|<?=>|[!=]?~|(?:&&|\|\||<<|>>|\*\*|[+\-*/%<>!^&|=])=?|[?:]/,punctuation:/[(){}[\].,;]/}),e.languages.insertBefore("ruby","operator",{"double-colon":{pattern:/::/,alias:"punctuation"}});var t={pattern:/((?:^|[^\\])(?:\\{2})*)#\{(?:[^{}]|\{[^{}]*\})*\}/,lookbehind:!0,inside:{content:{pattern:/^(#\{)[\s\S]+(?=\}$)/,lookbehind:!0,inside:e.languages.ruby},delimiter:{pattern:/^#\{|\}$/,alias:"punctuation"}}};delete e.languages.ruby.function;var n="(?:"+[/([^a-zA-Z0-9\s{(\[<=])(?:(?!\1)[^\\]|\\[\s\S])*\1/.source,/\((?:[^()\\]|\\[\s\S]|\((?:[^()\\]|\\[\s\S])*\))*\)/.source,/\{(?:[^{}\\]|\\[\s\S]|\{(?:[^{}\\]|\\[\s\S])*\})*\}/.source,/\[(?:[^\[\]\\]|\\[\s\S]|\[(?:[^\[\]\\]|\\[\s\S])*\])*\]/.source,/<(?:[^<>\\]|\\[\s\S]|<(?:[^<>\\]|\\[\s\S])*>)*>/.source].join("|")+")",a=/(?:"(?:\\.|[^"\\\r\n])*"|(?:\b[a-zA-Z_]\w*|[^\s\0-\x7F]+)[?!]?|\$.)/.source;e.languages.insertBefore("ruby","keyword",{"regex-literal":[{pattern:RegExp(/%r/.source+n+/[egimnosux]{0,6}/.source),greedy:!0,inside:{interpolation:t,regex:/[\s\S]+/}},{pattern:/(^|[^/])\/(?!\/)(?:\[[^\r\n\]]+\]|\\.|[^[/\\\r\n])+\/[egimnosux]{0,6}(?=\s*(?:$|[\r\n,.;})#]))/,lookbehind:!0,greedy:!0,inside:{interpolation:t,regex:/[\s\S]+/}}],variable:/[@$]+[a-zA-Z_]\w*(?:[?!]|\b)/,symbol:[{pattern:RegExp(/(^|[^:]):/.source+a),lookbehind:!0,greedy:!0},{pattern:RegExp(/([\r\n{(,][ \t]*)/.source+a+/(?=:(?!:))/.source),lookbehind:!0,greedy:!0}],"method-definition":{pattern:/(\bdef\s+)\w+(?:\s*\.\s*\w+)?/,lookbehind:!0,inside:{function:/\b\w+$/,keyword:/^self\b/,"class-name":/^\w+/,punctuation:/\./}}}),e.languages.insertBefore("ruby","string",{"string-literal":[{pattern:RegExp(/%[qQiIwWs]?/.source+n),greedy:!0,inside:{interpolation:t,string:/[\s\S]+/}},{pattern:/("|')(?:#\{[^}]+\}|#(?!\{)|\\(?:\r\n|[\s\S])|(?!\1)[^\\#\r\n])*\1/,greedy:!0,inside:{interpolation:t,string:/[\s\S]+/}},{pattern:/<<[-~]?([a-z_]\w*)[\r\n](?:.*[\r\n])*?[\t ]*\1/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<[-~]?[a-z_]\w*|\b[a-z_]\w*$/i,inside:{symbol:/\b\w+/,punctuation:/^<<[-~]?/}},interpolation:t,string:/[\s\S]+/}},{pattern:/<<[-~]?'([a-z_]\w*)'[\r\n](?:.*[\r\n])*?[\t ]*\1/i,alias:"heredoc-string",greedy:!0,inside:{delimiter:{pattern:/^<<[-~]?'[a-z_]\w*'|\b[a-z_]\w*$/i,inside:{symbol:/\b\w+/,punctuation:/^<<[-~]?'|'$/}},string:/[\s\S]+/}}],"command-literal":[{pattern:RegExp(/%x/.source+n),greedy:!0,inside:{interpolation:t,command:{pattern:/[\s\S]+/,alias:"string"}}},{pattern:/`(?:#\{[^}]+\}|#(?!\{)|\\(?:\r\n|[\s\S])|[^\\`#\r\n])*`/,greedy:!0,inside:{interpolation:t,command:{pattern:/[\s\S]+/,alias:"string"}}}]}),delete e.languages.ruby.string,e.languages.insertBefore("ruby","number",{builtin:/\b(?:Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Fixnum|Float|Hash|IO|Integer|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|Stat|String|Struct|Symbol|TMS|Thread|ThreadGroup|Time|TrueClass)\b/,constant:/\b[A-Z][A-Z0-9_]*(?:[?!]|\b)/}),e.languages.rb=e.languages.ruby}(s),window.Prism=a,s}(),o=e=>t=>t.options.get(e),l=o("codesample_languages"),u=o("codesample_global_prismjs"),c=e=>r.Prism&&u(e)?r.Prism:i,d=e=>t(e)&&"PRE"===e.nodeName&&-1!==e.className.indexOf("language-"),g=e=>{const t=e.selection?e.selection.getNode():null;return d(t)?a.some(t):a.none()},p=e=>{const t=(e=>l(e)||[{text:"HTML/XML",value:"markup"},{text:"JavaScript",value:"javascript"},{text:"CSS",value:"css"},{text:"PHP",value:"php"},{text:"Ruby",value:"ruby"},{text:"Python",value:"python"},{text:"Java",value:"java"},{text:"C",value:"c"},{text:"C#",value:"csharp"},{text:"C++",value:"cpp"}])(e),n=(r=t,((e,t)=>0<e.length?a.some(e[0]):a.none())(r)).fold(("",()=>""),(e=>e.value));var r;const i=((e,t)=>g(e).fold((()=>t),(e=>{const n=e.className.match(/language-(\w+)/);return n?n[1]:t})))(e,n),o=(e=>g(e).bind((e=>a.from(e.textContent))).getOr(""))(e);e.windowManager.open({title:"Insert/Edit Code Sample",size:"large",body:{type:"panel",items:[{type:"listbox",name:"language",label:"Language",items:t},{type:"textarea",name:"code",label:"Code view"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:{language:i,code:o},onSubmit:t=>{const n=t.getData();((e,t,n)=>{const a=e.dom;e.undoManager.transact((()=>{const r=g(e);return n=s.DOM.encode(n),r.fold((()=>{e.insertContent('<pre id="__new" class="language-'+t+'">'+n+"</pre>");const s=a.select("#__new")[0];a.setAttrib(s,"id",null),e.selection.select(s)}),(s=>{a.setAttrib(s,"class","language-"+t),s.innerHTML=n,c(e).highlightElement(s),e.selection.select(s)}))}))})(e,n.language,n.code),t.close()}})},b=(h=/^\s+|\s+$/g,e=>e.replace(h,""));var h,f=tinymce.util.Tools.resolve("tinymce.util.Tools");const m=(e,t=n)=>n=>{const a=()=>{n.setEnabled(e.selection.isEditable()),t(n)};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("codesample",(e=>{(e=>{const t=e.options.register;t("codesample_languages",{processor:"object[]"}),t("codesample_global_prismjs",{processor:"boolean",default:!1})})(e),(e=>{e.on("PreProcess",(t=>{const n=e.dom,a=n.select("pre[contenteditable=false]",t.node);f.each(f.grep(a,d),(e=>{const t=e.textContent;let a;for(n.setAttrib(e,"class",b(n.getAttrib(e,"class"))),n.setAttrib(e,"contentEditable",null),n.setAttrib(e,"data-mce-highlighted",null);a=e.firstChild;)e.removeChild(a);n.add(e,"code").textContent=t}))})),e.on("SetContent",(()=>{const t=e.dom,n=f.grep(t.select("pre"),(e=>d(e)&&"true"!==t.getAttrib(e,"data-mce-highlighted")));n.length&&e.undoManager.transact((()=>{f.each(n,(n=>{var a;f.each(t.select("br",n),(n=>{t.replace(e.getDoc().createTextNode("\n"),n)})),n.innerHTML=t.encode(null!==(a=n.textContent)&&void 0!==a?a:""),c(e).highlightElement(n),t.setAttrib(n,"data-mce-highlighted",!0),n.className=b(n.className)}))}))})),e.on("PreInit",(()=>{e.parser.addNodeFilter("pre",(e=>{var t;for(let n=0,a=e.length;n<a;n++){const a=e[n];-1!==(null!==(t=a.attr("class"))&&void 0!==t?t:"").indexOf("language-")&&(a.attr("contenteditable","false"),a.attr("data-mce-highlighted","false"))}}))}))})(e),(e=>{const t=()=>e.execCommand("codesample");e.ui.registry.addToggleButton("codesample",{icon:"code-sample",tooltip:"Insert/edit code sample",onAction:t,onSetup:m(e,(t=>{t.setActive((e=>{const t=e.selection.getStart();return e.dom.is(t,'pre[class*="language-"]')})(e))}))}),e.ui.registry.addMenuItem("codesample",{text:"Code sample...",icon:"code-sample",onAction:t,onSetup:m(e)})})(e),(e=>{e.addCommand("codesample",(()=>{const t=e.selection.getNode();e.selection.isCollapsed()||d(t)?p(e):e.formatter.toggle("code")}))})(e),e.on("dblclick",(t=>{d(t.target)&&p(e)}))}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/directionality/plugin.min.js b/public/libs/tinymce/plugins/directionality/plugin.min.js
index c91d2bb2787..aa497696281 100644
--- a/public/libs/tinymce/plugins/directionality/plugin.min.js
+++ b/public/libs/tinymce/plugins/directionality/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>typeof e===t,o=t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(o=r=t,(n=String).prototype.isPrototypeOf(o)||(null===(i=r.constructor)||void 0===i?void 0:i.name)===n.name)?"string":e;var o,r,n,i})(t),r=e("boolean"),n=t=>!(t=>null==t)(t),i=e("function"),s=e("number"),l=(!1,()=>false);class a{constructor(t,e){this.tag=t,this.value=e}static some(t){return new a(!0,t)}static none(){return a.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?a.some(t(this.value)):a.none()}bind(t){return this.tag?t(this.value):a.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:a.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return n(t)?a.some(t):a.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}a.singletonNone=new a(!1);const u=(t,e)=>{for(let o=0,r=t.length;o<r;o++)e(t[o],o)},c=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},d=c,h=(t,e)=>{const o=t.dom;if(1!==o.nodeType)return!1;{const t=o;if(void 0!==t.matches)return t.matches(e);if(void 0!==t.msMatchesSelector)return t.msMatchesSelector(e);if(void 0!==t.webkitMatchesSelector)return t.webkitMatchesSelector(e);if(void 0!==t.mozMatchesSelector)return t.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")}};"undefined"!=typeof window?window:Function("return this;")();const m=t=>e=>(t=>t.dom.nodeType)(e)===t,g=m(1),f=m(3),v=m(9),y=m(11),p=(t,e)=>{t.dom.removeAttribute(e)},w=i(Element.prototype.attachShadow)&&i(Node.prototype.getRootNode)?t=>d(t.dom.getRootNode()):t=>v(t)?t:d(t.dom.ownerDocument),b=t=>d(t.dom.host),N=t=>{const e=f(t)?t.dom.parentNode:t.dom;if(null==e||null===e.ownerDocument)return!1;const o=e.ownerDocument;return(t=>{const e=w(t);return y(o=e)&&n(o.dom.host)?a.some(e):a.none();var o})(d(e)).fold((()=>o.body.contains(e)),(r=N,i=b,t=>r(i(t))));var r,i},S=t=>"rtl"===((t,e)=>{const o=t.dom,r=window.getComputedStyle(o).getPropertyValue(e);return""!==r||N(t)?r:((t,e)=>(t=>void 0!==t.style&&i(t.style.getPropertyValue))(t)?t.style.getPropertyValue(e):"")(o,e)})(t,"direction")?"rtl":"ltr",A=(t,e)=>((t,o)=>((t,e)=>{const o=[];for(let r=0,n=t.length;r<n;r++){const n=t[r];e(n,r)&&o.push(n)}return o})(((t,e)=>{const o=t.length,r=new Array(o);for(let n=0;n<o;n++){const o=t[n];r[n]=e(o,n)}return r})(t.dom.childNodes,d),(t=>h(t,e))))(t),E=("li",t=>g(t)&&"li"===t.dom.nodeName.toLowerCase());const T=(t,e,n)=>{u(e,(e=>{const c=d(e),m=E(c),f=((t,e)=>{return(e?(o=t,r="ol,ul",((t,e,o)=>{let n=t.dom;const s=i(o)?o:l;for(;n.parentNode;){n=n.parentNode;const t=d(n);if(h(t,r))return a.some(t);if(s(t))break}return a.none()})(o,0,n)):a.some(t)).getOr(t);var o,r,n})(c,m);var v;(v=f,(t=>a.from(t.dom.parentNode).map(d))(v).filter(g)).each((e=>{if(t.setStyle(f.dom,"direction",null),S(e)===n?p(f,"dir"):((t,e,n)=>{((t,e,n)=>{if(!(o(n)||r(n)||s(n)))throw console.error("Invalid call to Attribute.set. Key ",e,":: Value ",n,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(e,n+"")})(t.dom,e,n)})(f,"dir",n),S(f)!==n&&t.setStyle(f.dom,"direction",n),m){const e=A(f,"li[dir],li[style]");u(e,(e=>{p(e,"dir"),t.setStyle(e.dom,"direction",null)}))}}))}))},C=(t,e)=>{t.selection.isEditable()&&(T(t.dom,t.selection.getSelectedBlocks(),e),t.nodeChanged())},D=(t,e)=>o=>{const r=r=>{const n=d(r.element);o.setActive(S(n)===e),o.setEnabled(t.selection.isEditable())};return t.on("NodeChange",r),o.setEnabled(t.selection.isEditable()),()=>t.off("NodeChange",r)};t.add("directionality",(t=>{(t=>{t.addCommand("mceDirectionLTR",(()=>{C(t,"ltr")})),t.addCommand("mceDirectionRTL",(()=>{C(t,"rtl")}))})(t),(t=>{t.ui.registry.addToggleButton("ltr",{tooltip:"Left to right",icon:"ltr",onAction:()=>t.execCommand("mceDirectionLTR"),onSetup:D(t,"ltr")}),t.ui.registry.addToggleButton("rtl",{tooltip:"Right to left",icon:"rtl",onAction:()=>t.execCommand("mceDirectionRTL"),onSetup:D(t,"rtl")})})(t)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/fullscreen/plugin.min.js b/public/libs/tinymce/plugins/fullscreen/plugin.min.js
index c4d5cfc997e..9032e46bb46 100644
--- a/public/libs/tinymce/plugins/fullscreen/plugin.min.js
+++ b/public/libs/tinymce/plugins/fullscreen/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=r=e,(o=String).prototype.isPrototypeOf(n)||(null===(s=r.constructor)||void 0===s?void 0:s.name)===o.name)?"string":t;var n,r,o,s})(t)===e,r=e=>t=>typeof t===e,o=e=>t=>e===t,s=n("string"),i=n("object"),l=n("array"),a=o(null),c=r("boolean"),u=o(void 0),d=e=>!(e=>null==e)(e),m=r("function"),h=r("number"),g=()=>{},p=e=>()=>e;function f(e,...t){return(...n)=>{const r=t.concat(n);return e.apply(null,r)}}const v=p(!1),w=p(!0);class b{constructor(e,t){this.tag=e,this.value=t}static some(e){return new b(!0,e)}static none(){return b.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?b.some(e(this.value)):b.none()}bind(e){return this.tag?e(this.value):b.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:b.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return d(e)?b.some(e):b.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}b.singletonNone=new b(!1);const y=Array.prototype.push,S=(e,t)=>{const n=e.length,r=new Array(n);for(let o=0;o<n;o++){const n=e[o];r[o]=t(n,o)}return r},x=(e,t)=>{for(let n=0,r=e.length;n<r;n++)t(e[n],n)},E=(e,t)=>{const n=[];for(let r=0,o=e.length;r<o;r++){const o=e[r];t(o,r)&&n.push(o)}return n},F=(e,t)=>((e,t,n)=>{for(let r=0,o=e.length;r<o;r++){const o=e[r];if(t(o,r))return b.some(o);if(n(o,r))break}return b.none()})(e,t,v),O=t=>{const n=e(b.none()),r=()=>n.get().each(t);return{clear:()=>{r(),n.set(b.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{r(),n.set(b.some(e))}}},k=()=>O((e=>e.unbind())),T=Object.keys,C="undefined"!=typeof window?window:Function("return this;")(),A=(e,t)=>((e,t)=>{let n=null!=t?t:C;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),R=Object.getPrototypeOf,L=e=>{const t=A("ownerDocument.defaultView",e);return i(e)&&((e=>((e,t)=>{const n=((e,t)=>A(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(R(e).constructor.name))},M=e=>t=>(e=>e.dom.nodeType)(t)===e,P=M(1),D=M(3),N=M(9),H=M(11),W=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},q=(e,t)=>{e.dom.removeAttribute(t)},I=(e,t,n=0,r)=>{const o=e.indexOf(t,n);return-1!==o&&(!!u(r)||o+t.length<=r)},V=e=>void 0!==e.style&&m(e.style.getPropertyValue),j=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},B=j,_=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},z=e=>B(e.dom.ownerDocument),$=e=>S(e.dom.childNodes,B),U=m(Element.prototype.attachShadow)&&m(Node.prototype.getRootNode),K=p(U),X=U?e=>B(e.dom.getRootNode()):e=>N(e)?e:z(e),Y=e=>{const t=X(e);return H(n=t)&&d(n.dom.host)?b.some(t):b.none();var n},G=e=>B(e.dom.host),J=e=>{const t=D(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return Y(B(t)).fold((()=>n.body.contains(t)),(r=J,o=G,e=>r(o(e))));var r,o},Q=(e,t,n)=>{if(!s(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);V(e)&&e.style.setProperty(t,n)},Z=(e,t,n)=>{const r=e.dom;Q(r,t,n)},ee=(e,t)=>{const n=e.dom;((e,t)=>{const n=T(e);for(let r=0,o=n.length;r<o;r++){const o=n[r];t(e[o],o)}})(t,((e,t)=>{Q(n,t,e)}))},te=(e,t)=>{const n=e.dom,r=window.getComputedStyle(n).getPropertyValue(t);return""!==r||J(e)?r:ne(n,t)},ne=(e,t)=>V(e)?e.style.getPropertyValue(t):"",re=e=>{const t=B((e=>{if(K()&&d(e.target)){const t=B(e.target);if(P(t)&&d(t.dom.shadowRoot)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return((e,t)=>0<e.length?b.some(e[0]):b.none())(t)}}return b.from(e.target)})(e).getOr(e.target)),n=()=>e.stopPropagation(),r=()=>e.preventDefault(),o=(s=r,i=n,(...e)=>s(i.apply(null,e)));var s,i;return((e,t,n,r,o,s,i)=>({target:e,x:t,y:n,stop:r,prevent:o,kill:s,raw:i}))(t,e.clientX,e.clientY,n,r,o,e)},oe=(e,t,n,r)=>{e.dom.removeEventListener(t,n,r)},se=w,ie=(e,t,n)=>((e,t,n,r)=>((e,t,n,r,o)=>{const s=((e,t)=>n=>{e(n)&&t(re(n))})(n,r);return e.dom.addEventListener(t,s,o),{unbind:f(oe,e,t,s,o)}})(e,t,n,r,!1))(e,t,se,n),le=()=>ae(0,0),ae=(e,t)=>({major:e,minor:t}),ce={nu:ae,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const r=e[n];if(r.test(t))return r}})(e,t);if(!n)return{major:0,minor:0};const r=e=>Number(t.replace(n,"$"+e));return ae(r(1),r(2))})(e,n)},unknown:le},ue=(e,t)=>{const n=String(t).toLowerCase();return F(e,(e=>e.search(n)))},de=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,me=e=>t=>I(t,e),he=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>I(e,"edge/")&&I(e,"chrome")&&I(e,"safari")&&I(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,de],search:e=>I(e,"chrome")&&!I(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>I(e,"msie")||I(e,"trident")},{name:"Opera",versionRegexes:[de,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:me("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:me("firefox")},{name:"Safari",versionRegexes:[de,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(I(e,"safari")||I(e,"mobile/"))&&I(e,"applewebkit")}],ge=[{name:"Windows",search:me("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>I(e,"iphone")||I(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:me("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:me("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:me("linux"),versionRegexes:[]},{name:"Solaris",search:me("sunos"),versionRegexes:[]},{name:"FreeBSD",search:me("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:me("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],pe={browsers:p(he),oses:p(ge)},fe="Edge",ve="Chromium",we="Opera",be="Firefox",ye="Safari",Se=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isEdge:r(fe),isChromium:r(ve),isIE:r("IE"),isOpera:r(we),isFirefox:r(be),isSafari:r(ye)}},xe=()=>Se({current:void 0,version:ce.unknown()}),Ee=Se,Fe=(p(fe),p(ve),p("IE"),p(we),p(be),p(ye),"Windows"),Oe="Android",ke="Linux",Te="macOS",Ce="Solaris",Ae="FreeBSD",Re="ChromeOS",Le=e=>{const t=e.current,n=e.version,r=e=>()=>t===e;return{current:t,version:n,isWindows:r(Fe),isiOS:r("iOS"),isAndroid:r(Oe),isMacOS:r(Te),isLinux:r(ke),isSolaris:r(Ce),isFreeBSD:r(Ae),isChromeOS:r(Re)}},Me=()=>Le({current:void 0,version:ce.unknown()}),Pe=Le,De=(p(Fe),p("iOS"),p(Oe),p(ke),p(Te),p(Ce),p(Ae),p(Re),(e,t,n)=>{const r=pe.browsers(),o=pe.oses(),s=t.bind((e=>((e,t)=>((e,t)=>{for(let n=0;n<e.length;n++){const r=t(e[n]);if(r.isSome())return r}return b.none()})(t.brands,(t=>{const n=t.brand.toLowerCase();return F(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:ce.nu(parseInt(t.version,10),0)})))})))(r,e))).orThunk((()=>((e,t)=>ue(e,t).map((e=>{const n=ce.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e))).fold(xe,Ee),i=((e,t)=>ue(e,t).map((e=>{const n=ce.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e).fold(Me,Pe),l=((e,t,n,r)=>{const o=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!o,i=e.isiOS()||e.isAndroid(),l=i||r("(pointer:coarse)"),a=o||!s&&i&&r("(min-device-width:768px)"),c=s||i&&!a,u=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),d=!c&&!a&&!u;return{isiPad:p(o),isiPhone:p(s),isTablet:p(a),isPhone:p(c),isTouch:p(l),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:p(u),isDesktop:p(d)}})(i,s,e,n);return{browser:s,os:i,deviceType:l}}),Ne=e=>window.matchMedia(e).matches;let He=(e=>{let t,n=!1;return(...r)=>(n||(n=!0,t=e.apply(null,r)),t)})((()=>De(navigator.userAgent,b.from(navigator.userAgentData),Ne)));const We=(e,t)=>({left:e,top:t,translate:(n,r)=>We(e+n,t+r)}),qe=We,Ie=e=>{const t=void 0===e?window:e;return He().browser.isFirefox()?b.none():b.from(t.visualViewport)},Ve=(e,t,n,r)=>({x:e,y:t,width:n,height:r,right:e+n,bottom:t+r}),je=e=>{const t=void 0===e?window:e,n=t.document,r=(e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop;return qe(n,r)})(B(n));return Ie(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,o=e.clientHeight;return Ve(r.left,r.top,n,o)}),(e=>Ve(Math.max(e.pageLeft,r.left),Math.max(e.pageTop,r.top),e.width,e.height)))},Be=(e,t,n)=>Ie(n).map((n=>{const r=e=>t(re(e));return n.addEventListener(e,r),{unbind:()=>n.removeEventListener(e,r)}})).getOrThunk((()=>({unbind:g})));var _e=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),ze=tinymce.util.Tools.resolve("tinymce.Env");const $e=(e,t)=>{e.dispatch("FullscreenStateChanged",{state:t}),e.dispatch("ResizeEditor")},Ue=("fullscreen_native",e=>e.options.get("fullscreen_native"));const Ke=e=>{return e.dom===(void 0!==(t=z(e).dom).fullscreenElement?t.fullscreenElement:void 0!==t.msFullscreenElement?t.msFullscreenElement:void 0!==t.webkitFullscreenElement?t.webkitFullscreenElement:null);var t},Xe=(e,t,n)=>((e,t,n)=>E(((e,t)=>{const n=m(t)?t:v;let r=e.dom;const o=[];for(;null!==r.parentNode&&void 0!==r.parentNode;){const e=r.parentNode,t=B(e);if(o.push(t),!0===n(t))break;r=e}return o})(e,n),t))(e,(e=>_(e,t)),n),Ye=(e,t)=>((e,n)=>{return E((e=>b.from(e.dom.parentNode).map(B))(r=e).map($).map((e=>E(e,(e=>{return t=e,!(r.dom===t.dom);var t})))).getOr([]),(e=>_(e,t)));var r})(e),Ge="data-ephox-mobile-fullscreen-style",Je="position:absolute!important;",Qe="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",Ze=ze.os.isAndroid(),et=(e,t,n)=>{const r=t=>n=>{const r=W(n,"style"),o=void 0===r?"no-styles":r.trim();o!==t&&(((e,t,n)=>{((e,t,n)=>{if(!(s(n)||c(n)||h(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(n,Ge,o),ee(n,e.parseStyle(t)))},o=Xe(t,"*"),i=(e=>{const t=[];for(let n=0,r=e.length;n<r;++n){if(!l(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);y.apply(t,e[n])}return t})(S(o,(e=>Ye(e,"*:not(.tox-silver-sink)")))),a=(e=>{const t=te(e,"background-color");return void 0!==t&&""!==t?"background-color:"+t+"!important":"background-color:rgb(255,255,255)!important;"})(n);x(i,r("display:none!important;")),x(o,r(Je+Qe+a)),r((!0===Ze?"":Je)+Qe+a)(t)},tt=_e.DOM,nt=Ie().fold((()=>({bind:g,unbind:g})),(e=>{const t=(()=>{const e=O(g);return{...e,on:t=>e.get().each(t)}})(),n=k(),r=k(),o=((e,t)=>{let n=null;return{cancel:()=>{a(n)||(clearTimeout(n),n=null)},throttle:(...t)=>{a(n)&&(n=setTimeout((()=>{n=null,e.apply(null,t)}),50))}}})((()=>{document.body.scrollTop=0,document.documentElement.scrollTop=0,window.requestAnimationFrame((()=>{t.on((t=>ee(t,{top:e.offsetTop+"px",left:e.offsetLeft+"px",height:e.height+"px",width:e.width+"px"})))}))}));return{bind:e=>{t.set(e),o.throttle(),n.set(Be("resize",o.throttle)),r.set(Be("scroll",o.throttle))},unbind:()=>{t.on((()=>{n.clear(),r.clear()})),t.clear()}}})),rt=(e,t)=>{const n=document.body,r=document.documentElement,o=e.getContainer(),s=B(o),i=(l=s,b.from(l.dom.nextSibling).map(B)).filter((e=>(e=>P(e)&&L(e.dom))(e)&&((e,t)=>(e=>void 0!==e.dom.classList)(e)&&e.dom.classList.contains("tox-silver-sink"))(e)));var l;const a=(e=>{const t=B(e.getElement());return Y(t).map(G).getOrThunk((()=>(e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return B(t)})(z(t))))})(e),c=t.get(),u=B(e.getBody()),d=ze.deviceType.isTouch(),m=o.style,h=e.iframeElement,g=null==h?void 0:h.style,p=e=>{e(n,"tox-fullscreen"),e(r,"tox-fullscreen"),e(o,"tox-fullscreen"),Y(s).map((e=>G(e).dom)).each((t=>{e(t,"tox-fullscreen"),e(t,"tox-shadowhost")}))},f=()=>{d&&(e=>{const t=((e,t)=>{const n=document;return 1!==(r=n).nodeType&&9!==r.nodeType&&11!==r.nodeType||0===r.childElementCount?[]:S(n.querySelectorAll(e),B);var r})("["+Ge+"]");x(t,(t=>{const n=W(t,Ge);n&&"no-styles"!==n?ee(t,e.parseStyle(n)):q(t,"style"),q(t,Ge)}))})(e.dom),p(tt.removeClass),nt.unbind(),b.from(t.get()).each((e=>e.fullscreenChangeHandler.unbind()))};if(c)c.fullscreenChangeHandler.unbind(),Ue(e)&&Ke(a)&&(e=>{const t=e.dom;t.exitFullscreen?t.exitFullscreen():t.msExitFullscreen?t.msExitFullscreen():t.webkitCancelFullScreen&&t.webkitCancelFullScreen()})(z(a)),g.width=c.iframeWidth,g.height=c.iframeHeight,m.width=c.containerWidth,m.height=c.containerHeight,m.top=c.containerTop,m.left=c.containerLeft,w=i,y=c.sinkCssPosition,E=(e,t)=>{Z(e,"position",t)},w.isSome()&&y.isSome()?b.some(E(w.getOrDie(),y.getOrDie())):b.none(),f(),v=c.scrollPos,window.scrollTo(v.x,v.y),t.set(null),$e(e,!1),e.off("remove",f);else{const n=ie(z(a),void 0!==document.fullscreenElement?"fullscreenchange":void 0!==document.msFullscreenElement?"MSFullscreenChange":void 0!==document.webkitFullscreenElement?"webkitfullscreenchange":"fullscreenchange",(n=>{Ue(e)&&(Ke(a)||null===t.get()||rt(e,t))})),r={scrollPos:je(window),containerWidth:m.width,containerHeight:m.height,containerTop:m.top,containerLeft:m.left,iframeWidth:g.width,iframeHeight:g.height,fullscreenChangeHandler:n,sinkCssPosition:i.map((e=>te(e,"position")))};d&&et(e.dom,s,u),g.width=g.height="100%",m.width=m.height="",p(tt.addClass),i.each((e=>{Z(e,"position","fixed")})),nt.bind(s),e.on("remove",f),t.set(r),Ue(e)&&(e=>{const t=e.dom;t.requestFullscreen?t.requestFullscreen():t.msRequestFullscreen?t.msRequestFullscreen():t.webkitRequestFullScreen&&t.webkitRequestFullScreen()})(a),$e(e,!0)}var v,w,y,E},ot=(e,t)=>n=>{n.setActive(null!==t.get());const r=e=>n.setActive(e.state);return e.on("FullscreenStateChanged",r),()=>e.off("FullscreenStateChanged",r)};t.add("fullscreen",(t=>{const n=e(null);return t.inline||((e=>{(0,e.options.register)("fullscreen_native",{processor:"boolean",default:!1})})(t),((e,t)=>{e.addCommand("mceFullScreen",(()=>{rt(e,t)}))})(t,n),((e,t)=>{const n=()=>e.execCommand("mceFullScreen");e.ui.registry.addToggleMenuItem("fullscreen",{text:"Fullscreen",icon:"fullscreen",shortcut:"Meta+Shift+F",onAction:n,onSetup:ot(e,t)}),e.ui.registry.addToggleButton("fullscreen",{tooltip:"Fullscreen",icon:"fullscreen",onAction:n,onSetup:ot(e,t)})})(t,n),t.addShortcut("Meta+Shift+F","","mceFullScreen")),(e=>({isFullscreen:()=>null!==e.get()}))(n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/image/plugin.min.js b/public/libs/tinymce/plugins/image/plugin.min.js
index 0fa3f5f72dd..d8dfd216163 100644
--- a/public/libs/tinymce/plugins/image/plugin.min.js
+++ b/public/libs/tinymce/plugins/image/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=Object.getPrototypeOf,a=(e,t,a)=>{var i;return!!a(e,t.prototype)||(null===(i=e.constructor)||void 0===i?void 0:i.name)===t.name},i=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&a(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,s=e=>t=>typeof t===e,r=i("string"),o=i("object"),n=e=>((e,i)=>o(e)&&a(e,i,((e,a)=>t(e)===a)))(e,Object),l=i("array"),c=(null,e=>null===e);const m=s("boolean"),d=e=>!(e=>null==e)(e),g=s("function"),u=s("number"),p=()=>{};class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return d(e)?h.some(e):h.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const b=Object.keys,v=Object.hasOwnProperty,y=(e,t)=>v.call(e,t),f=Array.prototype.push,w=e=>{const t=[];for(let a=0,i=e.length;a<i;++a){if(!l(e[a]))throw new Error("Arr.flatten item "+a+" was not an array, input: "+e);f.apply(t,e[a])}return t};"undefined"!=typeof window?window:Function("return this;")();const A=(e,t,a)=>{((e,t,a)=>{if(!(r(a)||m(a)||u(a)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",a,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,a+"")})(e.dom,t,a)},D=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},_=D;var C=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),I=tinymce.util.Tools.resolve("tinymce.util.URI");const U=e=>e.length>0,x=e=>t=>t.options.get(e),S=x("image_dimensions"),N=x("image_advtab"),T=x("image_uploadtab"),O=x("image_prepend_url"),E=x("image_class_list"),L=x("image_description"),j=x("image_title"),M=x("image_caption"),R=x("image_list"),k=x("a11y_advanced_options"),z=x("automatic_uploads"),B=(e,t)=>Math.max(parseInt(e,10),parseInt(t,10)),P=e=>(e&&(e=e.replace(/px$/,"")),e),F=e=>(e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e),H=e=>"IMG"===e.nodeName&&(e.hasAttribute("data-mce-object")||e.hasAttribute("data-mce-placeholder")),G=(e,t)=>{const a=e.options.get;return I.isDomSafe(t,"img",{allow_html_data_urls:a("allow_html_data_urls"),allow_script_urls:a("allow_script_urls"),allow_svg_data_urls:a("allow_svg_data_urls")})},W=C.DOM,$=e=>e.style.marginLeft&&e.style.marginRight&&e.style.marginLeft===e.style.marginRight?P(e.style.marginLeft):"",V=e=>e.style.marginTop&&e.style.marginBottom&&e.style.marginTop===e.style.marginBottom?P(e.style.marginTop):"",K=e=>e.style.borderWidth?P(e.style.borderWidth):"",Z=(e,t)=>{var a;return e.hasAttribute(t)&&null!==(a=e.getAttribute(t))&&void 0!==a?a:""},q=e=>null!==e.parentNode&&"FIGURE"===e.parentNode.nodeName,J=(e,t,a)=>{""===a||null===a?e.removeAttribute(t):e.setAttribute(t,a)},Q=(e,t)=>{const a=e.getAttribute("style"),i=t(null!==a?a:"");i.length>0?(e.setAttribute("style",i),e.setAttribute("data-mce-style",i)):e.removeAttribute("style")},X=(e,t)=>(e,a,i)=>{const s=e.style;s[a]?(s[a]=F(i),Q(e,t)):J(e,a,i)},Y=(e,t)=>e.style[t]?P(e.style[t]):Z(e,t),ee=(e,t)=>{const a=F(t);e.style.marginLeft=a,e.style.marginRight=a},te=(e,t)=>{const a=F(t);e.style.marginTop=a,e.style.marginBottom=a},ae=(e,t)=>{const a=F(t);e.style.borderWidth=a},ie=(e,t)=>{e.style.borderStyle=t},se=e=>{var t;return null!==(t=e.style.borderStyle)&&void 0!==t?t:""},re=e=>d(e)&&"FIGURE"===e.nodeName,oe=e=>0===W.getAttrib(e,"alt").length&&"presentation"===W.getAttrib(e,"role"),ne=e=>oe(e)?"":Z(e,"alt"),le=(e,t)=>{var a;const i=document.createElement("img");return J(i,"style",t.style),($(i)||""!==t.hspace)&&ee(i,t.hspace),(V(i)||""!==t.vspace)&&te(i,t.vspace),(K(i)||""!==t.border)&&ae(i,t.border),(se(i)||""!==t.borderStyle)&&ie(i,t.borderStyle),e(null!==(a=i.getAttribute("style"))&&void 0!==a?a:"")},ce=(e,t)=>({src:Z(t,"src"),alt:ne(t),title:Z(t,"title"),width:Y(t,"width"),height:Y(t,"height"),class:Z(t,"class"),style:e(Z(t,"style")),caption:q(t),hspace:$(t),vspace:V(t),border:K(t),borderStyle:se(t),isDecorative:oe(t)}),me=(e,t,a,i,s)=>{a[i]!==t[i]&&s(e,i,String(a[i]))},de=(e,t,a)=>{if(a){W.setAttrib(e,"role","presentation");const t=_(e);A(t,"alt","")}else{if(c(t)){"alt",_(e).dom.removeAttribute("alt")}else{const a=_(e);A(a,"alt",t)}"presentation"===W.getAttrib(e,"role")&&W.setAttrib(e,"role","")}},ge=(e,t)=>(a,i,s)=>{e(a,s),Q(a,t)},ue=(e,t,a)=>{const i=ce(e,a);me(a,i,t,"caption",((e,t,a)=>(e=>{q(e)?(e=>{const t=e.parentNode;d(t)&&(W.insertAfter(e,t),W.remove(t))})(e):(e=>{const t=W.create("figure",{class:"image"});W.insertAfter(t,e),t.appendChild(e),t.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),t.contentEditable="false"})(e)})(e))),me(a,i,t,"src",J),me(a,i,t,"title",J),me(a,i,t,"width",X(0,e)),me(a,i,t,"height",X(0,e)),me(a,i,t,"class",J),me(a,i,t,"style",ge(((e,t)=>J(e,"style",t)),e)),me(a,i,t,"hspace",ge(ee,e)),me(a,i,t,"vspace",ge(te,e)),me(a,i,t,"border",ge(ae,e)),me(a,i,t,"borderStyle",ge(ie,e)),((e,t,a)=>{a.alt===t.alt&&a.isDecorative===t.isDecorative||de(e,a.alt,a.isDecorative)})(a,i,t)},pe=(e,t)=>{const a=(e=>{if(e.margin){const t=String(e.margin).split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e})(e.dom.styles.parse(t)),i=e.dom.styles.parse(e.dom.styles.serialize(a));return e.dom.styles.serialize(i)},he=e=>{const t=e.selection.getNode(),a=e.dom.getParent(t,"figure.image");return a?e.dom.select("img",a)[0]:t&&("IMG"!==t.nodeName||H(t))?null:t},be=(e,t)=>{var a;const i=e.dom,s=((t,a)=>{const i={};var s;return((e,t,a,i)=>{((e,t)=>{const a=b(e);for(let i=0,s=a.length;i<s;i++){const s=a[i];t(e[s],s)}})(e,((e,s)=>{(t(e,s)?a:i)(e,s)}))})(t,((t,a)=>!e.schema.isValidChild(a,"figure")),(s=i,(e,t)=>{s[t]=e}),p),i})(e.schema.getTextBlockElements()),r=i.getParent(t.parentNode,(e=>{return t=s,a=e.nodeName,y(t,a)&&void 0!==t[a]&&null!==t[a];var t,a}),e.getBody());return r&&null!==(a=i.split(r,t))&&void 0!==a?a:t},ve=(e,t)=>{const a=((t,a)=>{const i=document.createElement("img");if(ue((t=>pe(e,t)),{...a,caption:!1},i),de(i,a.alt,a.isDecorative),a.caption){const e=W.create("figure",{class:"image"});return e.appendChild(i),e.appendChild(W.create("figcaption",{contentEditable:"true"},"Caption")),e.contentEditable="false",e}return i})(0,t);e.dom.setAttrib(a,"data-mce-id","__mcenew"),e.focus(),e.selection.setContent(a.outerHTML);const i=e.dom.select('*[data-mce-id="__mcenew"]')[0];if(e.dom.setAttrib(i,"data-mce-id",null),re(i)){const t=be(e,i);e.selection.select(t)}else e.selection.select(i)},ye=(e,t)=>{const a=he(e);if(a){const i={...ce((t=>pe(e,t)),a),...t},s=((e,t)=>{const a=t.src;return{...t,src:G(e,a)?a:""}})(e,i);i.src?((e,t)=>{const a=he(e);if(a)if(ue((t=>pe(e,t)),t,a),((e,t)=>{e.dom.setAttrib(t,"src",t.getAttribute("src"))})(e,a),re(a.parentNode)){const t=a.parentNode;be(e,t),e.selection.select(a.parentNode)}else e.selection.select(a),((e,t,a)=>{const i=()=>{a.onload=a.onerror=null,e.selection&&(e.selection.select(a),e.nodeChanged())};a.onload=()=>{t.width||t.height||!S(e)||e.dom.setAttribs(a,{width:String(a.clientWidth),height:String(a.clientHeight)}),i()},a.onerror=i})(e,t,a)})(e,s):((e,t)=>{if(t){const a=e.dom.is(t.parentNode,"figure.image")?t.parentNode:t;e.dom.remove(a),e.focus(),e.nodeChanged(),e.dom.isEmpty(e.getBody())&&(e.setContent(""),e.selection.setCursorLocation())}})(e,a)}else t.src&&ve(e,{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1,...t})},fe=(we=(e,t)=>n(e)&&n(t)?fe(e,t):t,(...e)=>{if(0===e.length)throw new Error("Can't merge zero objects");const t={};for(let a=0;a<e.length;a++){const i=e[a];for(const e in i)y(i,e)&&(t[e]=we(t[e],i[e]))}return t});var we,Ae=tinymce.util.Tools.resolve("tinymce.util.ImageUploader"),De=tinymce.util.Tools.resolve("tinymce.util.Tools");const _e=e=>r(e.value)?e.value:"",Ce=(e,t)=>{const a=[];return De.each(e,(e=>{const i=(e=>r(e.text)?e.text:r(e.title)?e.title:"")(e);if(void 0!==e.menu){const s=Ce(e.menu,t);a.push({text:i,items:s})}else{const s=t(e);a.push({text:i,value:s})}})),a},Ie=(e=_e)=>t=>t?h.from(t).map((t=>Ce(t,e))):h.none(),Ue=(e,t)=>((e,a)=>{for(let a=0;a<e.length;a++){const s=(e=>y(e,"items"))(i=e[a])?Ue(i.items,t):i.value===t?h.some(i):h.none();if(s.isSome())return s}var i;return h.none()})(e),xe=Ie,Se=(e,t)=>e.bind((e=>Ue(e,t))),Ne=e=>{const t=xe((t=>e.convertURL(t.value||t.url||"","src"))),a=new Promise((a=>{((e,t)=>{const a=R(e);r(a)?fetch(a).then((e=>{e.ok&&e.json().then(t)})):g(a)?a(t):t(a)})(e,(e=>{a(t(e).map((e=>w([[{text:"None",value:""}],e]))))}))})),i=(A=E(e),Ie(_e)(A)),s=N(e),o=T(e),n=(e=>U(e.options.get("images_upload_url")))(e),l=(e=>d(e.options.get("images_upload_handler")))(e),c=(e=>{const t=he(e);return t?ce((t=>pe(e,t)),t):{src:"",alt:"",title:"",width:"",height:"",class:"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:"",isDecorative:!1}})(e),m=L(e),u=j(e),p=S(e),b=M(e),v=k(e),y=z(e),f=h.some(O(e)).filter((e=>r(e)&&e.length>0));var A;return a.then((e=>({image:c,imageList:e,classList:i,hasAdvTab:s,hasUploadTab:o,hasUploadUrl:n,hasUploadHandler:l,hasDescription:m,hasImageTitle:u,hasDimensions:p,hasImageCaption:b,prependURL:f,hasAccessibilityOptions:v,automaticUploads:y})))},Te=e=>{const t=e.imageList.map((e=>({name:"images",type:"listbox",label:"Image list",items:e}))),a={name:"alt",type:"input",label:"Alternative description",enabled:!(e.hasAccessibilityOptions&&e.image.isDecorative)},i=e.classList.map((e=>({name:"classes",type:"listbox",label:"Class",items:e})));return w([[{name:"src",type:"urlinput",filetype:"image",label:"Source",picker_text:"Browse files"}],t.toArray(),e.hasAccessibilityOptions&&e.hasDescription?[{type:"label",label:"Accessibility",items:[{name:"isDecorative",type:"checkbox",label:"Image is decorative"}]}]:[],e.hasDescription?[a]:[],e.hasImageTitle?[{name:"title",type:"input",label:"Image title"}]:[],e.hasDimensions?[{name:"dimensions",type:"sizeinput"}]:[],[{...(s=e.classList.isSome()&&e.hasImageCaption,s?{type:"grid",columns:2}:{type:"panel"}),items:w([i.toArray(),e.hasImageCaption?[{type:"label",label:"Caption",items:[{type:"checkbox",name:"caption",label:"Show caption"}]}]:[]])}]]);var s},Oe=e=>({title:"General",name:"general",items:Te(e)}),Ee=Te,Le=e=>({src:{value:e.src,meta:{}},images:e.src,alt:e.alt,title:e.title,dimensions:{width:e.width,height:e.height},classes:e.class,caption:e.caption,style:e.style,vspace:e.vspace,border:e.border,hspace:e.hspace,borderstyle:e.borderStyle,fileinput:[],isDecorative:e.isDecorative}),je=(e,t)=>({src:e.src.value,alt:null!==e.alt&&0!==e.alt.length||!t?e.alt:null,title:e.title,width:e.dimensions.width,height:e.dimensions.height,class:e.classes,style:e.style,caption:e.caption,hspace:e.hspace,vspace:e.vspace,border:e.border,borderStyle:e.borderstyle,isDecorative:e.isDecorative}),Me=(e,t,a,i)=>{((e,t)=>{const a=t.getData();((e,t)=>/^(?:[a-zA-Z]+:)?\/\//.test(t)?h.none():e.prependURL.bind((e=>t.substring(0,e.length)!==e?h.some(e+t):h.none())))(e,a.src.value).each((e=>{t.setData({src:{value:e,meta:a.src.meta}})}))})(t,i),((e,t)=>{const a=t.getData(),i=a.src.meta;if(void 0!==i){const s=fe({},a);((e,t,a)=>{e.hasDescription&&r(a.alt)&&(t.alt=a.alt),e.hasAccessibilityOptions&&(t.isDecorative=a.isDecorative||t.isDecorative||!1),e.hasImageTitle&&r(a.title)&&(t.title=a.title),e.hasDimensions&&(r(a.width)&&(t.dimensions.width=a.width),r(a.height)&&(t.dimensions.height=a.height)),r(a.class)&&Se(e.classList,a.class).each((e=>{t.classes=e.value})),e.hasImageCaption&&m(a.caption)&&(t.caption=a.caption),e.hasAdvTab&&(r(a.style)&&(t.style=a.style),r(a.vspace)&&(t.vspace=a.vspace),r(a.border)&&(t.border=a.border),r(a.hspace)&&(t.hspace=a.hspace),r(a.borderstyle)&&(t.borderstyle=a.borderstyle))})(e,s,i),t.setData(s)}})(t,i),((e,t,a,i)=>{const s=i.getData(),r=s.src.value,o=s.src.meta||{};o.width||o.height||!t.hasDimensions||(U(r)?e.imageSize(r).then((e=>{a.open&&i.setData({dimensions:e})})).catch((e=>console.error(e))):i.setData({dimensions:{width:"",height:""}}))})(e,t,a,i),((e,t,a)=>{const i=a.getData(),s=Se(e.imageList,i.src.value);t.prevImage=s,a.setData({images:s.map((e=>e.value)).getOr("")})})(t,a,i)},Re=(e,t,a,i)=>{const s=i.getData();var r;i.block("Uploading image"),(r=s.fileinput,((e,t)=>0<e.length?h.some(e[0]):h.none())(r)).fold((()=>{i.unblock()}),(s=>{const r=URL.createObjectURL(s),o=()=>{i.unblock(),URL.revokeObjectURL(r)},n=s=>{i.setData({src:{value:s,meta:{}}}),i.showTab("general"),Me(e,t,a,i)};var l;(l=s,new Promise(((e,t)=>{const a=new FileReader;a.onload=()=>{e(a.result)},a.onerror=()=>{var e;t(null===(e=a.error)||void 0===e?void 0:e.message)},a.readAsDataURL(l)}))).then((a=>{const l=e.createBlobCache(s,r,a);t.automaticUploads?e.uploadImage(l).then((e=>{n(e.url),o()})).catch((t=>{o(),e.alertErr(t)})):(e.addToBlobCache(l),n(l.blobUri()),i.unblock())}))}))},ke=(e,t,a)=>(i,s)=>{"src"===s.name?Me(e,t,a,i):"images"===s.name?((e,t,a,i)=>{const s=i.getData(),r=Se(t.imageList,s.images);r.each((e=>{const t=""===s.alt||a.prevImage.map((e=>e.text===s.alt)).getOr(!1);t?""===e.value?i.setData({src:e,alt:a.prevAlt}):i.setData({src:e,alt:e.text}):i.setData({src:e})})),a.prevImage=r,Me(e,t,a,i)})(e,t,a,i):"alt"===s.name?a.prevAlt=i.getData().alt:"fileinput"===s.name?Re(e,t,a,i):"isDecorative"===s.name&&i.setEnabled("alt",!i.getData().isDecorative)},ze=e=>()=>{e.open=!1},Be=e=>e.hasAdvTab||e.hasUploadUrl||e.hasUploadHandler?{type:"tabpanel",tabs:w([[Oe(e)],e.hasAdvTab?[{title:"Advanced",name:"advanced",items:[{type:"grid",columns:2,items:[{type:"input",label:"Vertical space",name:"vspace",inputMode:"numeric"},{type:"input",label:"Horizontal space",name:"hspace",inputMode:"numeric"},{type:"input",label:"Border width",name:"border",inputMode:"numeric"},{type:"listbox",name:"borderstyle",label:"Border style",items:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]}]}]}]:[],e.hasUploadTab&&(e.hasUploadUrl||e.hasUploadHandler)?[{title:"Upload",name:"upload",items:[{type:"dropzone",name:"fileinput"}]}]:[]])}:{type:"panel",items:Ee(e)},Pe=(e,t,a)=>i=>{const s=fe(Le(t.image),i.getData()),r={...s,style:le(a.normalizeCss,je(s,!1))};e.execCommand("mceUpdateImage",!1,je(r,t.hasAccessibilityOptions)),e.editorUpload.uploadImagesAuto(),i.close()},Fe=e=>t=>G(e,t)?(e=>new Promise((t=>{const a=document.createElement("img"),i=e=>{a.onload=a.onerror=null,a.parentNode&&a.parentNode.removeChild(a),t(e)};a.onload=()=>{const e={width:B(a.width,a.clientWidth),height:B(a.height,a.clientHeight)};i(Promise.resolve(e))},a.onerror=()=>{i(Promise.reject(`Failed to get image dimensions for: ${e}`))};const s=a.style;s.visibility="hidden",s.position="fixed",s.bottom=s.left="0px",s.width=s.height="auto",document.body.appendChild(a),a.src=e})))(e.documentBaseURI.toAbsolute(t)).then((e=>({width:String(e.width),height:String(e.height)}))):Promise.resolve({width:"",height:""}),He=e=>(t,a,i)=>{var s;return e.editorUpload.blobCache.create({blob:t,blobUri:a,name:null===(s=t.name)||void 0===s?void 0:s.replace(/\.[^\.]+$/,""),filename:t.name,base64:i.split(",")[1]})},Ge=e=>t=>{e.editorUpload.blobCache.add(t)},We=e=>t=>{e.windowManager.alert(t)},$e=e=>t=>pe(e,t),Ve=e=>t=>e.dom.parseStyle(t),Ke=e=>(t,a)=>e.dom.serializeStyle(t,a),Ze=e=>t=>Ae(e).upload([t],!1).then((e=>{var t;return 0===e.length?Promise.reject("Failed to upload image"):!1===e[0].status?Promise.reject(null===(t=e[0].error)||void 0===t?void 0:t.message):e[0]})),qe=e=>{const t={imageSize:Fe(e),addToBlobCache:Ge(e),createBlobCache:He(e),alertErr:We(e),normalizeCss:$e(e),parseStyle:Ve(e),serializeStyle:Ke(e),uploadImage:Ze(e)};return{open:()=>{Ne(e).then((a=>{const i=(e=>({prevImage:Se(e.imageList,e.image.src),prevAlt:e.image.alt,open:!0}))(a);return{title:"Insert/Edit Image",size:"normal",body:Be(a),buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:Le(a.image),onSubmit:Pe(e,a,t),onChange:ke(t,a,i),onClose:ze(i)}})).then(e.windowManager.open)}}},Je=e=>{const t=e.attr("class");return d(t)&&/\bimage\b/.test(t)},Qe=e=>t=>{let a=t.length;const i=t=>{t.attr("contenteditable",e?"true":null)};for(;a--;){const s=t[a];Je(s)&&(s.attr("contenteditable",e?"false":null),De.each(s.getAll("figcaption"),i))}},Xe=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("image",(e=>{(e=>{const t=e.options.register;t("image_dimensions",{processor:"boolean",default:!0}),t("image_advtab",{processor:"boolean",default:!1}),t("image_uploadtab",{processor:"boolean",default:!0}),t("image_prepend_url",{processor:"string",default:""}),t("image_class_list",{processor:"object[]"}),t("image_description",{processor:"boolean",default:!0}),t("image_title",{processor:"boolean",default:!1}),t("image_caption",{processor:"boolean",default:!1}),t("image_list",{processor:e=>{const t=!1===e||r(e)||((e,t)=>{if(l(e)){for(let a=0,i=e.length;a<i;++a)if(!t(e[a]))return!1;return!0}return!1})(e,o)||g(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be false, a string, an array or a function."}},default:!1})})(e),(e=>{e.on("PreInit",(()=>{e.parser.addNodeFilter("figure",Qe(!0)),e.serializer.addNodeFilter("figure",Qe(!1))}))})(e),(e=>{e.ui.registry.addToggleButton("image",{icon:"image",tooltip:"Insert/edit image",onAction:qe(e).open,onSetup:t=>{t.setActive(d(he(e)));const a=e.selection.selectorChangedWithUnbind("img:not([data-mce-object]):not([data-mce-placeholder]),figure.image",t.setActive).unbind,i=Xe(e)(t);return()=>{a(),i()}}}),e.ui.registry.addMenuItem("image",{icon:"image",text:"Image...",onAction:qe(e).open,onSetup:Xe(e)}),e.ui.registry.addContextMenu("image",{update:t=>e.selection.isEditable()&&(re(t)||"IMG"===t.nodeName&&!H(t))?["image"]:[]})})(e),(e=>{e.addCommand("mceImage",qe(e).open),e.addCommand("mceUpdateImage",((t,a)=>{e.undoManager.transact((()=>ye(e,a)))}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/importcss/plugin.min.js b/public/libs/tinymce/plugins/importcss/plugin.min.js
index 4b8006a4170..4175a248d04 100644
--- a/public/libs/tinymce/plugins/importcss/plugin.min.js
+++ b/public/libs/tinymce/plugins/importcss/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(s=r=e,(o=String).prototype.isPrototypeOf(s)||(null===(n=r.constructor)||void 0===n?void 0:n.name)===o.name)?"string":t;var s,r,o,n})(t)===e,s=t("string"),r=t("object"),o=t("array"),n=("function",e=>"function"==typeof e);var c=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),i=tinymce.util.Tools.resolve("tinymce.EditorManager"),l=tinymce.util.Tools.resolve("tinymce.Env"),a=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=e=>t=>t.options.get(e),u=p("importcss_merge_classes"),m=p("importcss_exclusive"),f=p("importcss_selector_converter"),y=p("importcss_selector_filter"),d=p("importcss_groups"),h=p("importcss_append"),_=p("importcss_file_filter"),g=p("skin"),v=p("skin_url"),b=Array.prototype.push,x=/^\.(?:ephox|tiny-pageembed|mce)(?:[.-]+\w+)+$/,T=e=>s(e)?t=>-1!==t.indexOf(e):e instanceof RegExp?t=>e.test(t):e,S=(e,t)=>{let s={};const r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(!r)return;const o=r[1],n=r[2].substr(1).split(".").join(" "),c=a.makeMap("a,img");return r[1]?(s={title:t},e.schema.getTextBlockElements()[o]?s.block=o:e.schema.getBlockElements()[o]||c[o.toLowerCase()]?s.selector=o:s.inline=o):r[2]&&(s={inline:"span",title:t.substr(1),classes:n}),u(e)?s.classes=n:s.attributes={class:n},s},k=(e,t)=>null===t||m(e),w=e=>{e.on("init",(()=>{const t=(()=>{const e=[],t=[],s={};return{addItemToGroup:(e,r)=>{s[e]?s[e].push(r):(t.push(e),s[e]=[r])},addItem:t=>{e.push(t)},toFormats:()=>{return(r=t,n=e=>{const t=s[e];return 0===t.length?[]:[{title:e,items:t}]},(e=>{const t=[];for(let s=0,r=e.length;s<r;++s){if(!o(e[s]))throw new Error("Arr.flatten item "+s+" was not an array, input: "+e);b.apply(t,e[s])}return t})(((e,t)=>{const s=e.length,r=new Array(s);for(let o=0;o<s;o++){const s=e[o];r[o]=t(s,o)}return r})(r,n))).concat(e);var r,n}}})(),r={},n=T(y(e)),p=(e=>a.map(e,(e=>a.extend({},e,{original:e,selectors:{},filter:T(e.filter)}))))(d(e)),u=(t,s)=>{if(((e,t,s,r)=>!(k(e,s)?t in r:t in s.selectors))(e,t,s,r)){((e,t,s,r)=>{k(e,s)?r[t]=!0:s.selectors[t]=!0})(e,t,s,r);const o=((e,t,s,r)=>{let o;const n=f(e);return o=r&&r.selector_converter?r.selector_converter:n||(()=>S(e,s)),o.call(t,s,r)})(e,e.plugins.importcss,t,s);if(o){const t=o.name||c.DOM.uniqueId();return e.formatter.register(t,o),{title:o.title,format:t}}}return null};a.each(((e,t,r)=>{const o=[],n={},c=(t,n)=>{let p,u=t.href;if(u=(e=>{const t=l.cacheSuffix;return s(e)&&(e=e.replace("?"+t,"").replace("&"+t,"")),e})(u),u&&(!r||r(u,n))&&!((e,t)=>{const s=g(e);if(s){const r=v(e),o=r?e.documentBaseURI.toAbsolute(r):i.baseURL+"/skins/ui/"+s,n=i.baseURL+"/skins/content/";return t===o+"/content"+(e.inline?".inline":"")+".min.css"||-1!==t.indexOf(n)}return!1})(e,u)){a.each(t.imports,(e=>{c(e,!0)}));try{p=t.cssRules||t.rules}catch(e){}a.each(p,(e=>{e.styleSheet&&e.styleSheet?c(e.styleSheet,!0):e.selectorText&&a.each(e.selectorText.split(","),(e=>{o.push(a.trim(e))}))}))}};a.each(e.contentCSS,(e=>{n[e]=!0})),r||(r=(e,t)=>t||n[e]);try{a.each(t.styleSheets,(e=>{c(e)}))}catch(e){}return o})(e,e.getDoc(),T(_(e))),(e=>{if(!x.test(e)&&(!n||n(e))){const s=((e,t)=>a.grep(e,(e=>!e.filter||e.filter(t))))(p,e);if(s.length>0)a.each(s,(s=>{const r=u(e,s);r&&t.addItemToGroup(s.title,r)}));else{const s=u(e,null);s&&t.addItem(s)}}}));const m=t.toFormats();e.dispatch("addStyleModifications",{items:m,replace:!h(e)})}))};e.add("importcss",(e=>((e=>{const t=e.options.register,o=e=>s(e)||n(e)||r(e);t("importcss_merge_classes",{processor:"boolean",default:!0}),t("importcss_exclusive",{processor:"boolean",default:!0}),t("importcss_selector_converter",{processor:"function"}),t("importcss_selector_filter",{processor:o}),t("importcss_file_filter",{processor:o}),t("importcss_groups",{processor:"object[]"}),t("importcss_append",{processor:"boolean",default:!1})})(e),w(e),(e=>({convertSelectorToFormat:t=>S(e,t)}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/insertdatetime/plugin.min.js b/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
index 19294c925ce..801cfe9d986 100644
--- a/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
+++ b/public/libs/tinymce/plugins/insertdatetime/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>t.options.get(e),a=t("insertdatetime_dateformat"),n=t("insertdatetime_timeformat"),r=t("insertdatetime_formats"),s=t("insertdatetime_element"),i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),o="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),l="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),m="January February March April May June July August September October November December".split(" "),c=(e,t)=>{if((e=""+e).length<t)for(let a=0;a<t-e.length;a++)e="0"+e;return e},d=(e,t,a=new Date)=>(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=t.replace("%D","%m/%d/%Y")).replace("%r","%I:%M:%S %p")).replace("%Y",""+a.getFullYear())).replace("%y",""+a.getYear())).replace("%m",c(a.getMonth()+1,2))).replace("%d",c(a.getDate(),2))).replace("%H",""+c(a.getHours(),2))).replace("%M",""+c(a.getMinutes(),2))).replace("%S",""+c(a.getSeconds(),2))).replace("%I",""+((a.getHours()+11)%12+1))).replace("%p",a.getHours()<12?"AM":"PM")).replace("%B",""+e.translate(m[a.getMonth()]))).replace("%b",""+e.translate(l[a.getMonth()]))).replace("%A",""+e.translate(o[a.getDay()]))).replace("%a",""+e.translate(i[a.getDay()]))).replace("%%","%"),u=(e,t)=>{if(s(e)){const a=d(e,t);let n;n=/%[HMSIp]/.test(t)?d(e,"%Y-%m-%dT%H:%M"):d(e,"%Y-%m-%d");const r=e.dom.getParent(e.selection.getStart(),"time");r?((e,t,a,n)=>{const r=e.dom.create("time",{datetime:a},n);e.dom.replace(r,t),e.selection.select(r,!0),e.selection.collapse(!1)})(e,r,n,a):e.insertContent('<time datetime="'+n+'">'+a+"</time>")}else e.insertContent(d(e,t))};var p=tinymce.util.Tools.resolve("tinymce.util.Tools");const g=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("insertdatetime",(e=>{(e=>{const t=e.options.register;t("insertdatetime_dateformat",{processor:"string",default:e.translate("%Y-%m-%d")}),t("insertdatetime_timeformat",{processor:"string",default:e.translate("%H:%M:%S")}),t("insertdatetime_formats",{processor:"string[]",default:["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"]}),t("insertdatetime_element",{processor:"boolean",default:!1})})(e),(e=>{e.addCommand("mceInsertDate",((t,n)=>{u(e,null!=n?n:a(e))})),e.addCommand("mceInsertTime",((t,a)=>{u(e,null!=a?a:n(e))}))})(e),(e=>{const t=r(e),a=(e=>{let t=e;return{get:()=>t,set:e=>{t=e}}})((e=>{const t=r(e);return t.length>0?t[0]:n(e)})(e)),s=t=>e.execCommand("mceInsertDate",!1,t);e.ui.registry.addSplitButton("insertdatetime",{icon:"insert-time",tooltip:"Insert date/time",select:e=>e===a.get(),fetch:a=>{a(p.map(t,(t=>({type:"choiceitem",text:d(e,t),value:t}))))},onAction:e=>{s(a.get())},onItemAction:(e,t)=>{a.set(t),s(t)},onSetup:g(e)});const i=e=>()=>{a.set(e),s(e)};e.ui.registry.addNestedMenuItem("insertdatetime",{icon:"insert-time",text:"Date/time",getSubmenuItems:()=>p.map(t,(t=>({type:"menuitem",text:d(e,t),onAction:i(t)}))),onSetup:g(e)})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/link/plugin.min.js b/public/libs/tinymce/plugins/link/plugin.min.js
index 51deeec63fc..ab5bfdbf984 100644
--- a/public/libs/tinymce/plugins/link/plugin.min.js
+++ b/public/libs/tinymce/plugins/link/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(l=o.constructor)||void 0===l?void 0:l.name)===r.name)?"string":t;var n,o,r,l})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),l=t("array"),i=(null,e=>null===e);const a=n("boolean"),s=e=>!(e=>null==e)(e),c=n("function"),u=(e,t)=>{if(l(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},g=()=>{},d=(e,t)=>e===t;class m{constructor(e,t){this.tag=e,this.value=t}static some(e){return new m(!0,e)}static none(){return m.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?m.some(e(this.value)):m.none()}bind(e){return this.tag?e(this.value):m.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:m.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?m.some(e):m.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}m.singletonNone=new m(!1);const h=Array.prototype.indexOf,f=Array.prototype.push,p=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!l(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);f.apply(t,e[n])}return t},k=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return m.none()},v=(e,t,n=d)=>e.exists((e=>n(e,t))),x=e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t},y=(e,t)=>e?m.some(t):m.none(),b=e=>t=>t.options.get(e),_=b("link_assume_external_targets"),w=b("link_context_toolbar"),C=b("link_list"),O=b("link_default_target"),N=b("link_default_protocol"),A=b("link_target_list"),S=b("link_rel_list"),E=b("link_class_list"),T=b("link_title"),R=b("allow_unsafe_link_target"),P=b("link_quicklink");var L=tinymce.util.Tools.resolve("tinymce.util.Tools");const M=e=>o(e.value)?e.value:"",D=(e,t)=>{const n=[];return L.each(e,(e=>{const r=(e=>o(e.text)?e.text:o(e.title)?e.title:"")(e);if(void 0!==e.menu){const o=D(e.menu,t);n.push({text:r,items:o})}else{const o=t(e);n.push({text:r,value:o})}})),n},B=(e=M)=>t=>m.from(t).map((t=>D(t,e))),I=e=>B(M)(e),j=B,K=(e,t)=>n=>({name:e,type:"listbox",label:t,items:n}),U=M,q=Object.keys,F=Object.hasOwnProperty,V=(e,t)=>F.call(e,t);var $=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),z=tinymce.util.Tools.resolve("tinymce.util.URI");const G=e=>s(e)&&"a"===e.nodeName.toLowerCase(),H=e=>G(e)&&!!Q(e),J=(e,t)=>{if(e.collapsed)return[];{const n=e.cloneContents(),o=n.firstChild,r=new $(o,n),l=[];let i=o;do{t(i)&&l.push(i)}while(i=r.next());return l}},W=e=>/^\w+:/i.test(e),Q=e=>{var t,n;return null!==(n=null!==(t=e.getAttribute("data-mce-href"))&&void 0!==t?t:e.getAttribute("href"))&&void 0!==n?n:""},X=(e,t)=>{const n=["noopener"],o=e?e.split(/\s+/):[],r=e=>e.filter((e=>-1===L.inArray(n,e))),l=t?(e=>(e=r(e)).length>0?e.concat(n):n)(o):r(o);return l.length>0?(e=>L.trim(e.sort().join(" ")))(l):""},Y=(e,t)=>(t=t||te(e.selection.getRng())[0]||e.selection.getNode(),le(t)?m.from(e.dom.select("a[href]",t)[0]):m.from(e.dom.getParent(t,"a[href]"))),Z=(e,t)=>Y(e,t).isSome(),ee=(e,t)=>t.fold((()=>e.getContent({format:"text"})),(e=>e.innerText||e.textContent||"")).replace(/\uFEFF/g,""),te=e=>J(e,H),ne=e=>L.grep(e,H),oe=e=>ne(e).length>0,re=e=>{const t=e.schema.getTextInlineElements();if(Y(e).exists((e=>e.hasAttribute("data-mce-block"))))return!1;const n=e.selection.getRng();return!!n.collapsed||0===J(n,(e=>1===e.nodeType&&!G(e)&&!V(t,e.nodeName.toLowerCase()))).length},le=e=>s(e)&&"FIGURE"===e.nodeName&&/\bimage\b/i.test(e.className),ie=(e,t,n)=>{const o=e.selection.getNode(),r=Y(e,o),l=((e,t)=>{const n={...t};if(0===S(e).length&&!R(e)){const e=X(n.rel,"_blank"===n.target);n.rel=e||null}return m.from(n.target).isNone()&&!1===A(e)&&(n.target=O(e)),n.href=((e,t)=>"http"!==t&&"https"!==t||W(e)?e:t+"://"+e)(n.href,_(e)),n})(e,(e=>{return t=["title","rel","class","target"],n=(t,n)=>(e[n].each((e=>{t[n]=e.length>0?e:null})),t),o={href:e.href},((e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)})(t,((e,t)=>{o=n(o,e)})),o;var t,n,o})(n));e.undoManager.transact((()=>{n.href===t.href&&t.attach(),r.fold((()=>{((e,t,n,o)=>{const r=e.dom;le(t)?ge(r,t,o):n.fold((()=>{e.execCommand("mceInsertLink",!1,o)}),(t=>{e.insertContent(r.createHTML("a",o,r.encode(t)))}))})(e,o,n.text,l)}),(t=>{e.focus(),((e,t,n,o)=>{n.each((e=>{V(t,"innerText")?t.innerText=e:t.textContent=e})),e.dom.setAttribs(t,o),e.selection.select(t)})(e,t,n.text,l)}))}))},ae=e=>{const{class:t,href:n,rel:o,target:r,text:l,title:a}=e;return((e,t)=>{const n={};var o;return((e,t,n,o)=>{((e,t)=>{const n=q(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}})(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,((e,t)=>!1===i(e)),(o=n,(e,t)=>{o[t]=e}),g),n})({class:t.getOrNull(),href:n,rel:o.getOrNull(),target:r.getOrNull(),text:l.getOrNull(),title:a.getOrNull()})},se=(e,t,n)=>{const o=((e,t)=>{const n=e.options.get,o={allow_html_data_urls:n("allow_html_data_urls"),allow_script_urls:n("allow_script_urls"),allow_svg_data_urls:n("allow_svg_data_urls")},r=t.href;return{...t,href:z.isDomSafe(r,"a",o)?r:""}})(e,n);e.hasPlugin("rtc",!0)?e.execCommand("createlink",!1,ae(o)):ie(e,t,o)},ce=e=>{e.hasPlugin("rtc",!0)?e.execCommand("unlink"):(e=>{e.undoManager.transact((()=>{const t=e.selection.getNode();le(t)?ue(e,t):(e=>{const t=e.dom,n=e.selection,o=n.getBookmark(),r=n.getRng().cloneRange(),l=t.getParent(r.startContainer,"a[href]",e.getBody()),i=t.getParent(r.endContainer,"a[href]",e.getBody());l&&r.setStartBefore(l),i&&r.setEndAfter(i),n.setRng(r),e.execCommand("unlink"),n.moveToBookmark(o)})(e),e.focus()}))})(e)},ue=(e,t)=>{var n;const o=e.dom.select("img",t)[0];if(o){const r=e.dom.getParents(o,"a[href]",t)[0];r&&(null===(n=r.parentNode)||void 0===n||n.insertBefore(o,r),e.dom.remove(r))}},ge=(e,t,n)=>{var o;const r=e.select("img",t)[0];if(r){const t=e.create("a",n);null===(o=r.parentNode)||void 0===o||o.insertBefore(t,r),t.appendChild(r)}},de=(e,t)=>k(t,(t=>(e=>{return V(t=e,n="items")&&void 0!==t[n]&&null!==t[n];var t,n})(t)?de(e,t.items):y(t.value===e,t))),me=(e,t)=>{const n={text:e.text,title:e.title},o=(e,o)=>{const r=(l=t,i=o,"link"===i?l.link:"anchor"===i?l.anchor:m.none()).getOr([]);var l,i;return((e,t,n,o)=>{const r=o[t],l=e.length>0;return void 0!==r?de(r,n).map((t=>({url:{value:t.value,meta:{text:l?e:t.text,attach:g}},text:l?e:t.text}))):m.none()})(n.text,o,r,e)};return{onChange:(e,t)=>{const r=t.name;return"url"===r?(e=>{const t=(o=e.url,y(n.text.length<=0,m.from(null===(r=o.meta)||void 0===r?void 0:r.text).getOr(o.value)));var o,r;const l=(e=>{var t;return y(n.title.length<=0,m.from(null===(t=e.meta)||void 0===t?void 0:t.title).getOr(""))})(e.url);return t.isSome()||l.isSome()?m.some({...t.map((e=>({text:e}))).getOr({}),...l.map((e=>({title:e}))).getOr({})}):m.none()})(e()):((e,t)=>h.call(e,t))(["anchor","link"],r)>-1?o(e(),r):"text"===r||"title"===r?(n[r]=e()[r],m.none()):m.none()}}};var he=tinymce.util.Tools.resolve("tinymce.util.Delay");const fe=e=>{const t=e.href;return t.indexOf("@")>0&&-1===t.indexOf("/")&&-1===t.indexOf("mailto:")?m.some({message:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",preprocess:e=>({...e,href:"mailto:"+t})}):m.none()},pe=(e,t)=>n=>{const o=n.href;return 1===e&&!W(o)||0===e&&/^\s*www(\.|\d\.)/i.test(o)?m.some({message:`The URL you entered seems to be an external link. Do you want to add the required ${t}:// prefix?`,preprocess:e=>({...e,href:t+"://"+o})}):m.none()},ke=e=>{const t=e.dom.select("a:not([href])"),n=p(((e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o})(t,(e=>{const t=e.name||e.id;return t?[{text:t,value:"#"+t}]:[]})));return n.length>0?m.some([{text:"None",value:""}].concat(n)):m.none()},ve=e=>{const t=E(e);return t.length>0?I(t):m.none()},xe=e=>{try{return m.some(JSON.parse(e))}catch(e){return m.none()}},ye=(e,t)=>{const n=S(e);if(n.length>0){const o=v(t,"_blank"),r=e=>X(U(e),o);return(!1===R(e)?j(r):I)(n)}return m.none()},be=[{text:"Current window",value:""},{text:"New window",value:"_blank"}],_e=e=>{const t=A(e);return l(t)?I(t).orThunk((()=>m.some(be))):!1===t?m.none():m.some(be)},we=(e,t,n)=>{const o=e.getAttrib(t,n);return null!==o&&o.length>0?m.some(o):m.none()},Ce=(e,t)=>(e=>{const t=t=>e.convertURL(t.value||t.url||"","href"),n=C(e);return new Promise((e=>{o(n)?fetch(n).then((e=>e.ok?e.text().then(xe):Promise.reject())).then(e,(()=>e(m.none()))):c(n)?n((t=>e(m.some(t)))):e(m.from(n))})).then((e=>e.bind(j(t)).map((e=>e.length>0?[{text:"None",value:""}].concat(e):e))))})(e).then((n=>{const o=((e,t)=>{const n=e.dom,o=re(e)?m.some(ee(e.selection,t)):m.none(),r=t.bind((e=>m.from(n.getAttrib(e,"href")))),l=t.bind((e=>m.from(n.getAttrib(e,"target")))),i=t.bind((e=>we(n,e,"rel"))),a=t.bind((e=>we(n,e,"class")));return{url:r,text:o,title:t.bind((e=>we(n,e,"title"))),target:l,rel:i,linkClass:a}})(e,t);return{anchor:o,catalogs:{targets:_e(e),rels:ye(e,o.target),classes:ve(e),anchor:ke(e),link:n},optNode:t,flags:{titleEnabled:T(e)}}})),Oe=e=>{const t=(e=>{const t=Y(e);return Ce(e,t)})(e);t.then((t=>{const n=((e,t)=>n=>{const o=n.getData();if(!o.url.value)return ce(e),void n.close();const r=e=>m.from(o[e]).filter((n=>!v(t.anchor[e],n))),l={href:o.url.value,text:r("text"),target:r("target"),rel:r("rel"),class:r("linkClass"),title:r("title")},i={href:o.url.value,attach:void 0!==o.url.meta&&o.url.meta.attach?o.url.meta.attach:g};((e,t)=>k([fe,pe(_(e),N(e))],(e=>e(t))).fold((()=>Promise.resolve(t)),(n=>new Promise((o=>{((e,t,n)=>{const o=e.selection.getRng();he.setEditorTimeout(e,(()=>{e.windowManager.confirm(t,(t=>{e.selection.setRng(o),n(t)}))}))})(e,n.message,(e=>{o(e?n.preprocess(t):t)}))})))))(e,l).then((t=>{se(e,i,t)})),n.close()})(e,t);return((e,t,n)=>{const o=e.anchor.text.map((()=>({name:"text",type:"input",label:"Text to display"}))).toArray(),r=e.flags.titleEnabled?[{name:"title",type:"input",label:"Title"}]:[],l=((e,t)=>{const n=e.anchor,o=n.url.getOr("");return{url:{value:o,meta:{original:{value:o}}},text:n.text.getOr(""),title:n.title.getOr(""),anchor:o,link:o,rel:n.rel.getOr(""),target:n.target.or(t).getOr(""),linkClass:n.linkClass.getOr("")}})(e,m.from(O(n))),i=e.catalogs,a=me(l,i);return{title:"Insert/Edit Link",size:"normal",body:{type:"panel",items:p([[{name:"url",type:"urlinput",filetype:"file",label:"URL",picker_text:"Browse links"}],o,r,x([i.anchor.map(K("anchor","Anchors")),i.rels.map(K("rel","Rel")),i.targets.map(K("target","Open link in...")),i.link.map(K("link","Link list")),i.classes.map(K("linkClass","Class"))])])},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:l,onChange:(e,{name:t})=>{a.onChange(e.getData,{name:t}).each((t=>{e.setData(t)}))},onSubmit:t}})(t,n,e)})).then((t=>{e.windowManager.open(t)}))};var Ne=tinymce.util.Tools.resolve("tinymce.util.VK");const Ae=(e,t)=>e.dom.getParent(t,"a[href]"),Se=e=>Ae(e,e.selection.getStart()),Ee=(e,t)=>{if(t){const n=Q(t);if(/^#/.test(n)){const t=e.dom.select(n);t.length&&e.selection.scrollIntoView(t[0],!0)}else(e=>{const t=document.createElement("a");t.target="_blank",t.href=e,t.rel="noreferrer noopener";const n=document.createEvent("MouseEvents");n.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),((e,t)=>{document.body.appendChild(e),e.dispatchEvent(t),document.body.removeChild(e)})(t,n)})(t.href)}},Te=e=>()=>{e.execCommand("mceLink",!1,{dialog:!0})},Re=e=>()=>{Ee(e,Se(e))},Pe=(e,t)=>(e.on("NodeChange",t),()=>e.off("NodeChange",t)),Le=e=>t=>{const n=()=>{t.setActive(!e.mode.isReadOnly()&&Z(e,e.selection.getNode())),t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},Me=e=>t=>{const n=()=>{t.setEnabled(e.selection.isEditable())};return n(),Pe(e,n)},De=e=>t=>{const n=()=>t.setEnabled((e=>1===(e.selection.isCollapsed()?ne(e.dom.getParents(e.selection.getStart())):te(e.selection.getRng())).length)(e));return n(),Pe(e,n)},Be=e=>t=>{const n=e.dom.getParents(e.selection.getStart()),o=n=>{t.setEnabled((t=>{return oe(t)||(n=e.selection.getRng(),te(n).length>0);var n})(n)&&e.selection.isEditable())};return o(n),Pe(e,(e=>o(e.parents)))};e.add("link",(e=>{(e=>{const t=e.options.register;t("link_assume_external_targets",{processor:e=>{const t=o(e)||a(e);return t?!0===e?{value:1,valid:t}:"http"===e||"https"===e?{value:e,valid:t}:{value:0,valid:t}:{valid:!1,message:"Must be a string or a boolean."}},default:!1}),t("link_context_toolbar",{processor:"boolean",default:!1}),t("link_list",{processor:e=>o(e)||c(e)||u(e,r)}),t("link_default_target",{processor:"string"}),t("link_default_protocol",{processor:"string",default:"https"}),t("link_target_list",{processor:e=>a(e)||u(e,r),default:!0}),t("link_rel_list",{processor:"object[]",default:[]}),t("link_class_list",{processor:"object[]",default:[]}),t("link_title",{processor:"boolean",default:!0}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("link_quicklink",{processor:"boolean",default:!1})})(e),(e=>{e.ui.registry.addToggleButton("link",{icon:"link",tooltip:"Insert/edit link",onAction:Te(e),onSetup:Le(e)}),e.ui.registry.addButton("openlink",{icon:"new-tab",tooltip:"Open link",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addButton("unlink",{icon:"unlink",tooltip:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addMenuItem("openlink",{text:"Open link",icon:"new-tab",onAction:Re(e),onSetup:De(e)}),e.ui.registry.addMenuItem("link",{icon:"link",text:"Link...",shortcut:"Meta+K",onSetup:Me(e),onAction:Te(e)}),e.ui.registry.addMenuItem("unlink",{icon:"unlink",text:"Remove link",onAction:()=>ce(e),onSetup:Be(e)})})(e),(e=>{e.ui.registry.addContextMenu("link",{update:t=>e.dom.isEditable(t)?oe(e.dom.getParents(t,"a"))?"link unlink openlink":"link":""})})(e),(e=>{const t=t=>{const n=e.selection.getNode();return t.setEnabled(Z(e,n)),g};e.ui.registry.addContextForm("quicklink",{launch:{type:"contextformtogglebutton",icon:"link",tooltip:"Link",onSetup:Le(e)},label:"Link",predicate:t=>w(e)&&Z(e,t),initValue:()=>Y(e).fold((()=>""),Q),commands:[{type:"contextformtogglebutton",icon:"link",tooltip:"Link",primary:!0,onSetup:t=>{const n=e.selection.getNode();return t.setActive(Z(e,n)),Le(e)(t)},onAction:t=>{const n=t.getValue(),o=(t=>{const n=Y(e),o=re(e);if(n.isNone()&&o){const o=ee(e.selection,n);return y(0===o.length,t)}return m.none()})(n);se(e,{href:n,attach:g},{href:n,text:o,title:m.none(),rel:m.none(),target:m.none(),class:m.none()}),(e=>{e.selection.collapse(!1)})(e),t.hide()}},{type:"contextformbutton",icon:"unlink",tooltip:"Remove link",onSetup:t,onAction:t=>{ce(e),t.hide()}},{type:"contextformbutton",icon:"new-tab",tooltip:"Open link",onSetup:t,onAction:t=>{Re(e)(),t.hide()}}]})})(e),(e=>{e.on("click",(t=>{const n=Ae(e,t.target);n&&Ne.metaKeyPressed(t)&&(t.preventDefault(),Ee(e,n))})),e.on("keydown",(t=>{if(!t.isDefaultPrevented()&&13===t.keyCode&&(e=>!0===e.altKey&&!1===e.shiftKey&&!1===e.ctrlKey&&!1===e.metaKey)(t)){const n=Se(e);n&&(t.preventDefault(),Ee(e,n))}}))})(e),(e=>{e.addCommand("mceLink",((t,n)=>{!0!==(null==n?void 0:n.dialog)&&P(e)?e.dispatch("contexttoolbar-show",{toolbarKey:"quicklink"}):Oe(e)}))})(e),(e=>{e.addShortcut("Meta+K","",(()=>{e.execCommand("mceLink")}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/lists/plugin.min.js b/public/libs/tinymce/plugins/lists/plugin.min.js
index 5d3b73577ad..33edd00017d 100644
--- a/public/libs/tinymce/plugins/lists/plugin.min.js
+++ b/public/libs/tinymce/plugins/lists/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=o=e,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var n,o,r,s})(t)===e,n=e=>t=>typeof t===e,o=t("string"),r=t("object"),s=t("array"),i=n("boolean"),l=e=>!(e=>null==e)(e),a=n("function"),d=n("number"),c=()=>{},m=e=>()=>e,u=(e,t)=>e===t,p=e=>t=>!e(t),g=m(!1);class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return l(e)?h.some(e):h.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const f=Array.prototype.slice,y=Array.prototype.indexOf,v=Array.prototype.push,C=(e,t)=>{return n=e,o=t,y.call(n,o)>-1;var n,o},b=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},N=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},S=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},L=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},O=(e,t,n)=>(S(e,((e,o)=>{n=t(n,e,o)})),n),A=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return h.some(r);if(n(r,o))break}return h.none()},T=(e,t)=>A(e,t,g),x=(e,t)=>(e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);v.apply(t,e[n])}return t})(N(e,t)),E=e=>{const t=f.call(e,0);return t.reverse(),t},w=(e,t)=>t>=0&&t<e.length?h.some(e[t]):h.none(),k=e=>w(e,0),D=e=>w(e,e.length-1),B=(e,t)=>{const n=[],o=a(t)?e=>b(n,(n=>t(n,e))):e=>C(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n},M=(e,t,n=u)=>e.exists((e=>n(e,t))),P=(e,t,n)=>e.isSome()&&t.isSome()?h.some(n(e.getOrDie(),t.getOrDie())):h.none(),I=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},R=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return I(n.childNodes[0])},U=(e,t)=>{const n=(t||document).createElement(e);return I(n)},$=I,_=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},H=(e,t)=>e.dom===t.dom,F=_,V="undefined"!=typeof window?window:Function("return this;")(),j=(e,t)=>((e,t)=>{let n=null!=t?t:V;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),K=Object.getPrototypeOf,z=e=>{const t=j("ownerDocument.defaultView",e);return r(e)&&((e=>((e,t)=>{const n=((e,t)=>j(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(K(e).constructor.name))},Q=e=>e.dom.nodeName.toLowerCase(),W=e=>e.dom.nodeType,q=e=>t=>W(t)===e,Z=e=>G(e)&&z(e.dom),G=q(1),J=q(3),X=q(9),Y=q(11),ee=e=>t=>G(t)&&Q(t)===e,te=e=>h.from(e.dom.parentNode).map($),ne=e=>N(e.dom.childNodes,$),oe=(e,t)=>{const n=e.dom.childNodes;return h.from(n[t]).map($)},re=e=>oe(e,0),se=e=>oe(e,e.dom.childNodes.length-1),ie=a(Element.prototype.attachShadow)&&a(Node.prototype.getRootNode)?e=>$(e.dom.getRootNode()):e=>X(e)?e:$(e.dom.ownerDocument),le=e=>$(e.dom.host),ae=e=>{const t=J(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=ie(e);return Y(n=t)&&l(n.dom.host)?h.some(t):h.none();var n})($(t)).fold((()=>n.body.contains(t)),(o=ae,r=le,e=>o(r(e))));var o,r};var de=(e,t,n,o,r)=>e(n,o)?h.some(n):a(r)&&r(n)?h.none():t(n,o,r);const ce=(e,t,n)=>{let o=e.dom;const r=a(n)?n:g;for(;o.parentNode;){o=o.parentNode;const e=$(o);if(t(e))return h.some(e);if(r(e))break}return h.none()},me=(e,t,n)=>de(((e,t)=>t(e)),ce,e,t,n),ue=(e,t,n)=>ce(e,(e=>_(e,t)),n),pe=(e,t)=>{te(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},ge=(e,t)=>{e.dom.appendChild(t.dom)},he=(e,t)=>{S(t,(t=>{ge(e,t)}))},fe=e=>{e.dom.textContent="",S(ne(e),(e=>{ye(e)}))},ye=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)};var ve=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),Ce=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),be=tinymce.util.Tools.resolve("tinymce.util.VK");const Ne=e=>N(e,$),Se=Object.keys,Le=(e,t)=>{const n=Se(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},Oe=(e,t)=>{const n=e.dom;Le(t,((e,t)=>{((e,t,n)=>{if(!(o(n)||i(n)||d(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(n,t,e)}))},Ae=e=>O(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),Te=e=>((e,t)=>$(e.dom.cloneNode(!0)))(e),xe=(e,t)=>{const n=((e,t)=>{const n=U(t),o=Ae(e);return Oe(n,o),n})(e,t);var o,r;r=n,(e=>h.from(e.dom.nextSibling).map($))(o=e).fold((()=>{te(o).each((e=>{ge(e,r)}))}),(e=>{pe(e,r)}));const s=ne(e);return he(n,s),ye(e),n};var Ee=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),we=tinymce.util.Tools.resolve("tinymce.util.Tools");const ke=e=>t=>l(t)&&t.nodeName.toLowerCase()===e,De=e=>t=>l(t)&&e.test(t.nodeName),Be=e=>l(e)&&3===e.nodeType,Me=e=>l(e)&&1===e.nodeType,Pe=De(/^(OL|UL|DL)$/),Ie=De(/^(OL|UL)$/),Re=ke("ol"),Ue=De(/^(LI|DT|DD)$/),$e=De(/^(DT|DD)$/),_e=De(/^(TH|TD)$/),He=ke("br"),Fe=(e,t)=>l(t)&&t.nodeName in e.schema.getTextBlockElements(),Ve=(e,t)=>l(e)&&e.nodeName in t,je=(e,t)=>l(t)&&t.nodeName in e.schema.getVoidElements(),Ke=(e,t,n)=>{const o=e.isEmpty(t);return!(n&&e.select("span[data-mce-type=bookmark]",t).length>0)&&o},ze=(e,t)=>e.isChildOf(t,e.getRoot()),Qe=e=>t=>t.options.get(e),We=Qe("lists_indent_on_tab"),qe=Qe("forced_root_block"),Ze=Qe("forced_root_block_attrs"),Ge=(e,t)=>{const n=e.dom,o=e.schema.getBlockElements(),r=n.createFragment(),s=qe(e),i=Ze(e);let l,a,d=!1;for(a=n.create(s,i),Ve(t.firstChild,o)||r.appendChild(a);l=t.firstChild;){const e=l.nodeName;d||"SPAN"===e&&"bookmark"===l.getAttribute("data-mce-type")||(d=!0),Ve(l,o)?(r.appendChild(l),a=null):(a||(a=n.create(s,i),r.appendChild(a)),a.appendChild(l))}return!d&&a&&a.appendChild(n.create("br",{"data-mce-bogus":"1"})),r},Je=Ee.DOM,Xe=ee("dd"),Ye=ee("dt"),et=(e,t)=>{var n;Xe(t)?xe(t,"dt"):Ye(t)&&(n=t,h.from(n.dom.parentElement).map($)).each((n=>((e,t,n)=>{const o=Je.select('span[data-mce-type="bookmark"]',t),r=Ge(e,n),s=Je.createRng();s.setStartAfter(n),s.setEndAfter(t);const i=s.extractContents();for(let t=i.firstChild;t;t=t.firstChild)if("LI"===t.nodeName&&e.dom.isEmpty(t)){Je.remove(t);break}e.dom.isEmpty(i)||Je.insertAfter(i,t),Je.insertAfter(r,t);const l=n.parentElement;l&&Ke(e.dom,l)&&(e=>{const t=e.parentNode;t&&we.each(o,(e=>{t.insertBefore(e,n.parentNode)})),Je.remove(e)})(l),Je.remove(n),Ke(e.dom,t)&&Je.remove(t)})(e,n.dom,t.dom)))},tt=e=>{Ye(e)&&xe(e,"dd")},nt=(e,t)=>{if(Be(e))return{container:e,offset:t};const n=ve.getNode(e,t);return Be(n)?{container:n,offset:t>=e.childNodes.length?n.data.length:0}:n.previousSibling&&Be(n.previousSibling)?{container:n.previousSibling,offset:n.previousSibling.data.length}:n.nextSibling&&Be(n.nextSibling)?{container:n.nextSibling,offset:0}:{container:e,offset:t}},ot=e=>{const t=e.cloneRange(),n=nt(e.startContainer,e.startOffset);t.setStart(n.container,n.offset);const o=nt(e.endContainer,e.endOffset);return t.setEnd(o.container,o.offset),t},rt=["OL","UL","DL"],st=rt.join(","),it=(e,t)=>{const n=t||e.selection.getStart(!0);return e.dom.getParent(n,st,dt(e,n))},lt=e=>{const t=e.selection.getSelectedBlocks();return L(((e,t)=>{const n=we.map(t,(t=>e.dom.getParent(t,"li,dd,dt",dt(e,t))||t));return B(n)})(e,t),Ue)},at=(e,t)=>{const n=e.dom.getParents(t,"TD,TH");return n.length>0?n[0]:e.getBody()},dt=(e,t)=>{const n=e.dom.getParents(t,e.dom.isBlock),o=T(n,(t=>{return n=e.schema,!Pe(o=t)&&!Ue(o)&&b(rt,(e=>n.isValidChild(o.nodeName,e)));var n,o}));return o.getOr(e.getBody())},ct=(e,t)=>{const n=e.dom.getParents(t,"ol,ul",dt(e,t));return D(n)},mt=(e,t)=>{const n=N(t,(t=>ct(e,t).getOr(t)));return B(n)},ut=e=>/\btox\-/.test(e.className),pt=(e,t)=>A(e,Pe,_e).exists((e=>e.nodeName===t&&!ut(e))),gt=(e,t)=>null!==t&&!e.dom.isEditable(t),ht=(e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return gt(e,n)},ft=(e,t)=>{const n=e.selection.getNode();return t({parents:e.dom.getParents(n),element:n}),e.on("NodeChange",t),()=>e.off("NodeChange",t)},yt=(e,t)=>{const n=(t||document).createDocumentFragment();return S(e,(e=>{n.appendChild(e.dom)})),$(n)},vt=(e,t,n)=>e.dispatch("ListMutation",{action:t,element:n}),Ct=(bt=/^\s+|\s+$/g,e=>e.replace(bt,""));var bt;const Nt=(e,t,n)=>{((e,t,n)=>{if(!o(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);(e=>void 0!==e.style&&a(e.style.getPropertyValue))(e)&&e.style.setProperty(t,n)})(e.dom,t,n)},St=e=>F(e,"OL,UL"),Lt=e=>re(e).exists(St),Ot=e=>"listAttributes"in e,At=e=>"isComment"in e,Tt=e=>e.depth>0,xt=e=>e.isSelected,Et=e=>{const t=ne(e),n=se(e).exists(St)?t.slice(0,-1):t;return N(n,Te)},wt=(e,t)=>{ge(e.item,t.list)},kt=(e,t)=>{const n={list:U(t,e),item:U("li",e)};return ge(n.list,n.item),n},Dt=(e,t,n)=>{const o=t.slice(0,n.depth);return D(o).each((t=>{if(Ot(n)){const o=((e,t,n)=>{const o=U("li",e);return Oe(o,t),he(o,n),o})(e,n.itemAttributes,n.content);((e,t)=>{ge(e.list,t),e.item=t})(t,o),((e,t)=>{Q(e.list)!==t.listType&&(e.list=xe(e.list,t.listType)),Oe(e.list,t.listAttributes)})(t,n)}else if((e=>"isFragment"in e)(n))he(t.item,n.content);else{const e=R(`\x3c!--${n.content}--\x3e`);ge(t.list,e)}})),o},Bt=(e,t)=>{let n=h.none();const o=O(t,((t,o,r)=>At(o)?0===r?(n=h.some(o),t):Dt(e,t,o):o.depth>t.length?((e,t,n)=>{const o=((e,t,n)=>{const o=[];for(let r=0;r<n;r++)o.push(kt(e,Ot(t)?t.listType:t.parentListType));return o})(e,n,n.depth-t.length);var r;return(e=>{for(let t=1;t<e.length;t++)wt(e[t-1],e[t])})(o),((e,t)=>{for(let t=0;t<e.length-1;t++)Nt(e[t].item,"list-style-type","none");D(e).each((e=>{Ot(t)&&(Oe(e.list,t.listAttributes),Oe(e.item,t.itemAttributes)),he(e.item,t.content)}))})(o,n),r=o,P(D(t),k(r),wt),t.concat(o)})(e,t,o):Dt(e,t,o)),[]);return n.each((e=>{const t=R(`\x3c!--${e.content}--\x3e`);k(o).each((e=>{((e,t)=>{re(e).fold((()=>{ge(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))})(e.list,t)}))})),k(o).map((e=>e.list))},Mt=e=>(S(e,((t,n)=>{((e,t)=>{const n=e[t].depth,o=e=>e.depth===n&&!e.dirty,r=e=>e.depth<n;return A(E(e.slice(0,t)),o,r).orThunk((()=>A(e.slice(t+1),o,r)))})(e,n).fold((()=>{t.dirty&&Ot(t)&&(e=>{e.listAttributes=((e,t)=>{const n={};var o;return((e,t,n,o)=>{Le(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))})(e,t,(o=n,(e,t)=>{o[t]=e}),c),n})(e.listAttributes,((e,t)=>"start"!==t))})(t)}),(e=>{return o=e,void(Ot(n=t)&&Ot(o)&&(n.listType=o.listType,n.listAttributes={...o.listAttributes}));var n,o}))})),e),Pt=(e,t,n,o)=>{var r,s;if(8===W(s=o)||"#comment"===Q(s))return[{depth:e+1,content:null!==(r=o.dom.nodeValue)&&void 0!==r?r:"",dirty:!1,isSelected:!1,isComment:!0}];t.each((e=>{H(e.start,o)&&n.set(!0)}));const i=((e,t,n)=>te(e).filter(G).map((o=>({depth:t,dirty:!1,isSelected:n,content:Et(e),itemAttributes:Ae(e),listAttributes:Ae(o),listType:Q(o),isInPreviousLi:!1}))))(o,e,n.get());t.each((e=>{H(e.end,o)&&n.set(!1)}));const l=se(o).filter(St).map((o=>Rt(e,t,n,o))).getOr([]);return i.toArray().concat(l)},It=(e,t,n,o)=>re(o).filter(St).fold((()=>Pt(e,t,n,o)),(r=>{const s=O(ne(o),((o,s,i)=>{if(0===i)return o;if(F(s,"LI"))return o.concat(Pt(e,t,n,s));{const t={isFragment:!0,depth:e,content:[s],isSelected:!1,dirty:!1,parentListType:Q(r)};return o.concat(t)}}),[]);return Rt(e,t,n,r).concat(s)})),Rt=(e,t,n,o)=>x(ne(o),(o=>(St(o)?Rt:It)(e+1,t,n,o))),Ut=(e,t,n)=>{const o=((e,t)=>{const n=(e=>{let t=!1;return{get:()=>t,set:e=>{t=e}}})();return N(e,(e=>({sourceList:e,entries:Rt(0,t,n,e)})))})(t,(e=>{const t=N(lt(e),$);return P(T(t,p(Lt)),T(E(t),p(Lt)),((e,t)=>({start:e,end:t})))})(e));S(o,(t=>{((e,t)=>{S(L(e,xt),(e=>((e,t)=>{switch(e){case"Indent":t.depth++;break;case"Outdent":t.depth--;break;case"Flatten":t.depth=0}t.dirty=!0})(t,e)))})(t.entries,n);const o=((e,t)=>x(((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const o=[];let r=[];for(let s=0,i=e.length;s<i;s++){const i=e[s],l=t(i);l!==n&&(o.push(r),r=[]),n=l,r.push(i)}return 0!==r.length&&o.push(r),o}})(t,Tt),(t=>k(t).exists(Tt)?((e,t)=>{const n=Mt(t);return Bt(e.contentDocument,n).toArray()})(e,t):((e,t)=>{const n=Mt(t);return N(n,(t=>{const n=At(t)?yt([R(`\x3c!--${t.content}--\x3e`)]):yt(t.content);return $(Ge(e,n.dom))}))})(e,t))))(e,t.entries);var r;S(o,(t=>{vt(e,"Indent"===n?"IndentList":"OutdentList",t.dom)})),r=t.sourceList,S(o,(e=>{pe(r,e)})),ye(t.sourceList)}))},$t=(e,t)=>{const n=Ne((e=>{const t=(e=>{const t=ct(e,e.selection.getStart()),n=L(e.selection.getSelectedBlocks(),Ie);return t.toArray().concat(n)})(e),n=(e=>{const t=e.selection.getStart();return e.dom.getParents(t,"ol,ul",dt(e,t))})(e);return T(n,(e=>{return t=$(e),te(t).exists((e=>Ue(e.dom)&&re(e).exists((e=>!Pe(e.dom)))&&se(e).exists((e=>!Pe(e.dom)))));var t})).fold((()=>mt(e,t)),(e=>[e]))})(e)),o=Ne((e=>L(lt(e),$e))(e));let r=!1;if(n.length||o.length){const s=e.selection.getBookmark();Ut(e,n,t),((e,t,n)=>{S(n,"Indent"===t?tt:t=>et(e,t))})(e,t,o),e.selection.moveToBookmark(s),e.selection.setRng(ot(e.selection.getRng())),e.nodeChanged(),r=!0}return r},_t=(e,t)=>!(e=>{const t=it(e);return gt(e,t)})(e)&&$t(e,t),Ht=e=>_t(e,"Indent"),Ft=e=>_t(e,"Outdent"),Vt=e=>_t(e,"Flatten"),jt=e=>"\ufeff"===e;var Kt=tinymce.util.Tools.resolve("tinymce.dom.BookmarkManager");const zt=Ee.DOM,Qt=e=>{const t={},n=n=>{let o=e[n?"startContainer":"endContainer"],r=e[n?"startOffset":"endOffset"];if(Me(o)){const e=zt.create("span",{"data-mce-type":"bookmark"});o.hasChildNodes()?(r=Math.min(r,o.childNodes.length-1),n?o.insertBefore(e,o.childNodes[r]):zt.insertAfter(e,o.childNodes[r])):o.appendChild(e),o=e,r=0}t[n?"startContainer":"endContainer"]=o,t[n?"startOffset":"endOffset"]=r};return n(!0),e.collapsed||n(),t},Wt=e=>{const t=t=>{let n=e[t?"startContainer":"endContainer"],o=e[t?"startOffset":"endOffset"];if(n){if(Me(n)&&n.parentNode){const e=n;o=(e=>{var t;let n=null===(t=e.parentNode)||void 0===t?void 0:t.firstChild,o=0;for(;n;){if(n===e)return o;Me(n)&&"bookmark"===n.getAttribute("data-mce-type")||o++,n=n.nextSibling}return-1})(n),n=n.parentNode,zt.remove(e),!n.hasChildNodes()&&zt.isBlock(n)&&n.appendChild(zt.create("br"))}e[t?"startContainer":"endContainer"]=n,e[t?"startOffset":"endOffset"]=o}};t(!0),t();const n=zt.createRng();return n.setStart(e.startContainer,e.startOffset),e.endContainer&&n.setEnd(e.endContainer,e.endOffset),ot(n)},qt=e=>{switch(e){case"UL":return"ToggleUlList";case"OL":return"ToggleOlList";case"DL":return"ToggleDLList"}},Zt=(e,t)=>{we.each(t,((t,n)=>{e.setAttribute(n,t)}))},Gt=(e,t,n)=>{((e,t,n)=>{const o=n["list-style-type"]?n["list-style-type"]:null;e.setStyle(t,"list-style-type",o)})(e,t,n),((e,t,n)=>{Zt(t,n["list-attributes"]),we.each(e.select("li",t),(e=>{Zt(e,n["list-item-attributes"])}))})(e,t,n)},Jt=(e,t)=>l(t)&&!Ve(t,e.schema.getBlockElements()),Xt=(e,t,n,o)=>{let r=t[n?"startContainer":"endContainer"];const s=t[n?"startOffset":"endOffset"];Me(r)&&(r=r.childNodes[Math.min(s,r.childNodes.length-1)]||r),!n&&He(r.nextSibling)&&(r=r.nextSibling);const i=(t,n)=>{var r;const s=new Ce(t,(t=>{for(;!e.dom.isBlock(t)&&t.parentNode&&o!==t;)t=t.parentNode;return t})(t)),i=n?"next":"prev";let l;for(;l=s[i]();)if(!je(e,l)&&!jt(l.textContent)&&0!==(null===(r=l.textContent)||void 0===r?void 0:r.length))return h.some(l);return h.none()};if(n&&Be(r))if(jt(r.textContent))r=i(r,!1).getOr(r);else for(null!==r.parentNode&&Jt(e,r.parentNode)&&(r=r.parentNode);null!==r.previousSibling&&(Jt(e,r.previousSibling)||Be(r.previousSibling));)r=r.previousSibling;if(!n&&Be(r))if(jt(r.textContent))r=i(r,!0).getOr(r);else for(null!==r.parentNode&&Jt(e,r.parentNode)&&(r=r.parentNode);null!==r.nextSibling&&(Jt(e,r.nextSibling)||Be(r.nextSibling));)r=r.nextSibling;for(;r.parentNode!==o;){const t=r.parentNode;if(Fe(e,r))return r;if(/^(TD|TH)$/.test(t.nodeName))return r;r=t}return r},Yt=(e,t,n)=>{const o=e.selection.getRng();let r="LI";const s=dt(e,((e,t)=>{const n=e.selection.getStart(!0),o=Xt(e,t,!0,e.getBody());return r=$(o),s=$(t.commonAncestorContainer),i=r,l=function(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}(H,s),ce(i,l,void 0).isSome()?t.commonAncestorContainer:n;var r,s,i,l})(e,o)),i=e.dom;if("false"===i.getContentEditable(e.selection.getNode()))return;"DL"===(t=t.toUpperCase())&&(r="DT");const l=Qt(o),a=L(((e,t,n)=>{const o=[],r=e.dom,s=Xt(e,t,!0,n),i=Xt(e,t,!1,n);let l;const a=[];for(let e=s;e&&(a.push(e),e!==i);e=e.nextSibling);return we.each(a,(t=>{var s;if(Fe(e,t))return o.push(t),void(l=null);if(r.isBlock(t)||He(t))return He(t)&&r.remove(t),void(l=null);const i=t.nextSibling;Kt.isBookmarkNode(t)&&(Pe(i)||Fe(e,i)||!i&&t.parentNode===n)?l=null:(l||(l=r.create("p"),null===(s=t.parentNode)||void 0===s||s.insertBefore(l,t),o.push(l)),l.appendChild(t))})),o})(e,o,s),e.dom.isEditable);we.each(a,(o=>{let s;const l=o.previousSibling,a=o.parentNode;Ue(a)||(l&&Pe(l)&&l.nodeName===t&&((e,t,n)=>{const o=e.getStyle(t,"list-style-type");let r=n?n["list-style-type"]:"";return r=null===r?"":r,o===r})(i,l,n)?(s=l,o=i.rename(o,r),l.appendChild(o)):(s=i.create(t),a.insertBefore(s,o),s.appendChild(o),o=i.rename(o,r)),((e,t,n)=>{we.each(["margin","margin-right","margin-bottom","margin-left","margin-top","padding","padding-right","padding-bottom","padding-left","padding-top"],(n=>e.setStyle(t,n,"")))})(i,o),Gt(i,s,n),tn(e.dom,s))})),e.selection.setRng(Wt(l))},en=(e,t,n)=>{return((e,t)=>Pe(e)&&e.nodeName===(null==t?void 0:t.nodeName))(t,n)&&((e,t,n)=>e.getStyle(t,"list-style-type",!0)===e.getStyle(n,"list-style-type",!0))(e,t,n)&&(o=n,t.className===o.className);var o},tn=(e,t)=>{let n,o=t.nextSibling;if(en(e,t,o)){const r=o;for(;n=r.firstChild;)t.appendChild(n);e.remove(r)}if(o=t.previousSibling,en(e,t,o)){const r=o;for(;n=r.lastChild;)t.insertBefore(n,t.firstChild);e.remove(r)}},nn=(e,t,n,o)=>{if(t.nodeName!==n){const r=e.dom.rename(t,n);Gt(e.dom,r,o),vt(e,qt(n),r)}else Gt(e.dom,t,o),vt(e,qt(n),t)},on=(e,t,n,o)=>{if(t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),t.nodeName!==n){const r=e.dom.rename(t,n);Gt(e.dom,r,o),vt(e,qt(n),r)}else Gt(e.dom,t,o),vt(e,qt(n),t)},rn=e=>"list-style-type"in e,sn=(e,t,n)=>{const o=it(e);if(ht(e,o))return;const s=(e=>{const t=it(e),n=e.selection.getSelectedBlocks();return((e,t)=>l(e)&&1===t.length&&t[0]===e)(t,n)?(e=>L(e.querySelectorAll(st),Pe))(t):L(n,(e=>Pe(e)&&t!==e))})(e),i=r(n)?n:{};s.length>0?((e,t,n,o,r)=>{const s=Pe(t);if(!s||t.nodeName!==o||rn(r)||ut(t)){Yt(e,o,r);const i=Qt(e.selection.getRng()),l=s?[t,...n]:n,a=s&&ut(t)?on:nn;we.each(l,(t=>{a(e,t,o,r)})),e.selection.setRng(Wt(i))}else Vt(e)})(e,o,s,t,i):((e,t,n,o)=>{if(t!==e.getBody())if(t)if(t.nodeName!==n||rn(o)||ut(t)){const r=Qt(e.selection.getRng());ut(t)&&t.classList.forEach(((e,n,o)=>{e.startsWith("tox-")&&(o.remove(e),0===o.length&&t.removeAttribute("class"))})),Gt(e.dom,t,o);const s=e.dom.rename(t,n);tn(e.dom,s),e.selection.setRng(Wt(r)),Yt(e,n,o),vt(e,qt(n),s)}else Vt(e);else Yt(e,n,o),vt(e,qt(n),t)})(e,o,t,i)},ln=Ee.DOM,an=(e,t)=>{const n=we.grep(e.select("ol,ul",t));we.each(n,(t=>{((e,t)=>{const n=t.parentElement;if(n&&"LI"===n.nodeName&&n.firstChild===t){const o=n.previousSibling;o&&"LI"===o.nodeName?(o.appendChild(t),Ke(e,n)&&ln.remove(n)):ln.setStyle(n,"listStyleType","none")}if(Pe(n)){const e=n.previousSibling;e&&"LI"===e.nodeName&&e.appendChild(t)}})(e,t)}))},dn=(e,t,n,o)=>{let r=t.startContainer;const s=t.startOffset;if(Be(r)&&(n?s<r.data.length:s>0))return r;const i=e.schema.getNonEmptyElements();Me(r)&&(r=ve.getNode(r,s));const l=new Ce(r,o);n&&((e,t)=>!!He(t)&&e.isBlock(t.nextSibling)&&!He(t.previousSibling))(e.dom,r)&&l.next();const a=n?l.next.bind(l):l.prev2.bind(l);for(;r=a();){if("LI"===r.nodeName&&!r.hasChildNodes())return r;if(i[r.nodeName])return r;if(Be(r)&&r.data.length>0)return r}return null},cn=(e,t)=>{const n=t.childNodes;return 1===n.length&&!Pe(n[0])&&e.isBlock(n[0])},mn=e=>h.from(e).map($).filter(Z).exists((e=>((e,t=!1)=>{return ae(e)?e.dom.isContentEditable:(n=e,de(((e,t)=>_(e,t)),ue,n,"[contenteditable]",void 0)).fold(m(t),(e=>"true"===(e=>e.dom.contentEditable)(e)));var n})(e)&&!C(["details"],Q(e)))),un=(e,t,n)=>{let o;const r=cn(e,n)?n.firstChild:n;if(((e,t)=>{cn(e,t)&&mn(t.firstChild)&&e.remove(t.firstChild,!0)})(e,t),!Ke(e,t,!0))for(;o=t.firstChild;)r.appendChild(o)},pn=(e,t,n)=>{let o;const r=t.parentNode;if(!ze(e,t)||!ze(e,n))return;Pe(n.lastChild)&&(o=n.lastChild),r===n.lastChild&&He(r.previousSibling)&&e.remove(r.previousSibling);const s=n.lastChild;s&&He(s)&&t.hasChildNodes()&&e.remove(s),Ke(e,n,!0)&&fe($(n)),un(e,t,n),o&&n.appendChild(o);const i=((e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)})($(n),$(t))?e.getParents(t,Pe,n):[];e.remove(t),S(i,(t=>{Ke(e,t)&&t!==e.getRoot()&&e.remove(t)}))},gn=(e,t)=>{const n=e.dom,o=e.selection,r=o.getStart(),s=at(e,r),i=n.getParent(o.getStart(),"LI",s);if(i){const r=i.parentElement;if(r===e.getBody()&&Ke(n,r))return!0;const l=ot(o.getRng()),a=n.getParent(dn(e,l,t,s),"LI",s),d=a&&(t?n.isChildOf(i,a):n.isChildOf(a,i));if(a&&a!==i&&!d)return e.undoManager.transact((()=>{var n,o;t?((e,t,n,o)=>{const r=e.dom;if(r.isEmpty(o))((e,t,n)=>{fe($(n)),pn(e.dom,t,n),e.selection.setCursorLocation(n,0)})(e,n,o);else{const s=Qt(t);pn(r,n,o),e.selection.setRng(Wt(s))}})(e,l,a,i):(null===(o=(n=i).parentNode)||void 0===o?void 0:o.firstChild)===n?Ft(e):((e,t,n,o)=>{const r=Qt(t);pn(e.dom,n,o);const s=Wt(r);e.selection.setRng(s)})(e,l,i,a)})),!0;if(d&&!t&&a!==i)return e.undoManager.transact((()=>{if(l.commonAncestorContainer.parentElement){const t=Qt(l),o=l.commonAncestorContainer.parentElement;un(n,l.commonAncestorContainer.parentElement,a),o.remove();const r=Wt(t);e.selection.setRng(r)}})),!0;if(!a&&!t&&0===l.startOffset&&0===l.endOffset)return e.undoManager.transact((()=>{Vt(e)})),!0}return!1},hn=e=>{const t=e.selection.getStart(),n=at(e,t);return e.dom.getParent(t,"LI,DT,DD",n)||lt(e).length>0},fn=(e,t)=>{const n=e.selection;return!ht(e,n.getNode())&&(n.isCollapsed()?((e,t)=>gn(e,t)||((e,t)=>{const n=e.dom,o=e.selection.getStart(),r=at(e,o),s=n.getParent(o,n.isBlock,r);if(s&&n.isEmpty(s)){const o=ot(e.selection.getRng()),i=n.getParent(dn(e,o,t,r),"LI",r);if(i){const l=e=>C(["td","th","caption"],Q(e)),a=e=>e.dom===r;return!!((e,t,n=u)=>P(e,t,n).getOr(e.isNone()&&t.isNone()))(me($(i),l,a),me($(o.startContainer),l,a),H)&&(e.undoManager.transact((()=>{const o=i.parentNode;((e,t,n)=>{const o=e.getParent(t.parentNode,e.isBlock,n);e.remove(t),o&&e.isEmpty(o)&&e.remove(o)})(n,s,r),tn(n,o),e.selection.select(i,!0),e.selection.collapse(t)})),!0)}}return!1})(e,t))(e,t):(e=>!!hn(e)&&(e.undoManager.transact((()=>{e.execCommand("Delete"),an(e.dom,e.getBody())})),!0))(e))},yn=e=>{const t=E(Ct(e).split("")),n=N(t,((e,t)=>{const n=e.toUpperCase().charCodeAt(0)-"A".charCodeAt(0)+1;return Math.pow(26,t)*n}));return O(n,((e,t)=>e+t),0)},vn=e=>{if(--e<0)return"";{const t=e%26,n=Math.floor(e/26);return vn(n)+String.fromCharCode("A".charCodeAt(0)+t)}},Cn=e=>{const t=parseInt(e.start,10);return M(e.listStyleType,"upper-alpha")?vn(t):M(e.listStyleType,"lower-alpha")?vn(t).toLowerCase():e.start},bn=(e,t)=>()=>{const n=it(e);return l(n)&&n.nodeName===t},Nn=e=>{e.addCommand("mceListProps",(()=>{(e=>{const t=it(e);Re(t)&&!ht(e,t)&&e.windowManager.open({title:"List Properties",body:{type:"panel",items:[{type:"input",name:"start",label:"Start list at number",inputMode:"numeric"}]},initialData:{start:Cn({start:e.dom.getAttrib(t,"start","1"),listStyleType:h.from(e.dom.getStyle(t,"list-style-type"))})},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{(e=>{switch((e=>/^[0-9]+$/.test(e)?2:/^[A-Z]+$/.test(e)?0:/^[a-z]+$/.test(e)?1:e.length>0?4:3)(e)){case 2:return h.some({listStyleType:h.none(),start:e});case 0:return h.some({listStyleType:h.some("upper-alpha"),start:yn(e).toString()});case 1:return h.some({listStyleType:h.some("lower-alpha"),start:yn(e).toString()});case 3:return h.some({listStyleType:h.none(),start:""});case 4:return h.none()}})(t.getData().start).each((t=>{e.execCommand("mceListUpdate",!1,{attrs:{start:"1"===t.start?"":t.start},styles:{"list-style-type":t.listStyleType.getOr("")}})})),t.close()}})})(e)}))};var Sn=tinymce.util.Tools.resolve("tinymce.html.Node");const Ln=e=>3===e.type,On=e=>0===e.length,An=e=>{const t=(t,n)=>{const o=Sn.create("li");S(t,(e=>o.append(e))),n?e.insert(o,n,!0):e.append(o)},n=O(e.children(),((e,n)=>Ln(n)?[...e,n]:On(e)||Ln(n)?e:(t(e,n),[])),[]);On(n)||t(n)},Tn=(e,t)=>n=>(n.setEnabled(e.selection.isEditable()),ft(e,(o=>{n.setActive(pt(o.parents,t)),n.setEnabled(!ht(e,o.element)&&e.selection.isEditable())}))),xn=(e,t)=>n=>ft(e,(o=>n.setEnabled(pt(o.parents,t)&&!ht(e,o.element))));e.add("lists",(e=>((e=>{(0,e.options.register)("lists_indent_on_tab",{processor:"boolean",default:!0})})(e),(e=>{e.on("PreInit",(()=>{const{parser:t}=e;t.addNodeFilter("ul,ol",(e=>S(e,An)))}))})(e),e.hasPlugin("rtc",!0)?Nn(e):((e=>{We(e)&&(e=>{e.on("keydown",(t=>{t.keyCode!==be.TAB||be.metaKeyPressed(t)||e.undoManager.transact((()=>{(t.shiftKey?Ft(e):Ht(e))&&t.preventDefault()}))}))})(e),(e=>{e.on("ExecCommand",(t=>{const n=t.command.toLowerCase();"delete"!==n&&"forwarddelete"!==n||!hn(e)||an(e.dom,e.getBody())})),e.on("keydown",(t=>{t.keyCode===be.BACKSPACE?fn(e,!1)&&t.preventDefault():t.keyCode===be.DELETE&&fn(e,!0)&&t.preventDefault()}))})(e)})(e),(e=>{e.on("BeforeExecCommand",(t=>{const n=t.command.toLowerCase();"indent"===n?Ht(e):"outdent"===n&&Ft(e)})),e.addCommand("InsertUnorderedList",((t,n)=>{sn(e,"UL",n)})),e.addCommand("InsertOrderedList",((t,n)=>{sn(e,"OL",n)})),e.addCommand("InsertDefinitionList",((t,n)=>{sn(e,"DL",n)})),e.addCommand("RemoveList",(()=>{Vt(e)})),Nn(e),e.addCommand("mceListUpdate",((t,n)=>{r(n)&&((e,t)=>{const n=it(e);null===n||ht(e,n)||e.undoManager.transact((()=>{r(t.styles)&&e.dom.setStyles(n,t.styles),r(t.attrs)&&Le(t.attrs,((t,o)=>e.dom.setAttrib(n,o,t)))}))})(e,n)})),e.addQueryStateHandler("InsertUnorderedList",bn(e,"UL")),e.addQueryStateHandler("InsertOrderedList",bn(e,"OL")),e.addQueryStateHandler("InsertDefinitionList",bn(e,"DL"))})(e)),(e=>{const t=t=>()=>e.execCommand(t);e.hasPlugin("advlist")||(e.ui.registry.addToggleButton("numlist",{icon:"ordered-list",active:!1,tooltip:"Numbered list",onAction:t("InsertOrderedList"),onSetup:Tn(e,"OL")}),e.ui.registry.addToggleButton("bullist",{icon:"unordered-list",active:!1,tooltip:"Bullet list",onAction:t("InsertUnorderedList"),onSetup:Tn(e,"UL")}))})(e),(e=>{const t={text:"List properties...",icon:"ordered-list",onAction:()=>e.execCommand("mceListProps"),onSetup:xn(e,"OL")};e.ui.registry.addMenuItem("listprops",t),e.ui.registry.addContextMenu("lists",{update:t=>{const n=it(e,t);return Re(n)?["listprops"]:[]}})})(e),(e=>({backspaceDelete:t=>{fn(e,t)}}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/media/plugin.min.js b/public/libs/tinymce/plugins/media/plugin.min.js
index 498cefafcf1..28cc7bdae32 100644
--- a/public/libs/tinymce/plugins/media/plugin.min.js
+++ b/public/libs/tinymce/plugins/media/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(r=o=e,(a=String).prototype.isPrototypeOf(r)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===a.name)?"string":t;var r,o,a,s})(t)===e,r=t("string"),o=t("object"),a=t("array"),s=e=>!(e=>null==e)(e);class i{constructor(e,t){this.tag=e,this.value=t}static some(e){return new i(!0,e)}static none(){return i.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?i.some(e(this.value)):i.none()}bind(e){return this.tag?e(this.value):i.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:i.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?i.some(e):i.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}i.singletonNone=new i(!1);const n=Array.prototype.push,l=(e,t)=>{for(let r=0,o=e.length;r<o;r++)t(e[r],r)},c=e=>{const t=[];for(let r=0,o=e.length;r<o;++r){if(!a(e[r]))throw new Error("Arr.flatten item "+r+" was not an array, input: "+e);n.apply(t,e[r])}return t},m=Object.keys,u=Object.hasOwnProperty,d=(e,t)=>h(e,t)?i.from(e[t]):i.none(),h=(e,t)=>u.call(e,t),p=e=>t=>t.options.get(e),g=p("audio_template_callback"),b=p("video_template_callback"),w=p("iframe_template_callback"),v=p("media_live_embeds"),f=p("media_filter_html"),y=p("media_url_resolver"),x=p("media_alt_source"),_=p("media_poster"),k=p("media_dimensions");var j=tinymce.util.Tools.resolve("tinymce.util.Tools"),O=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),A=tinymce.util.Tools.resolve("tinymce.html.DomParser");const S=O.DOM,$=e=>e.replace(/px$/,""),C=e=>{const t=e.attr("style"),r=t?S.parseStyle(t):{};return{type:"ephox-embed-iri",source:e.attr("data-ephox-embed-iri"),altsource:"",poster:"",width:d(r,"max-width").map($).getOr(""),height:d(r,"max-height").map($).getOr("")}},T=(e,t)=>{let r={};for(let o=A({validate:!1,forced_root_block:!1},t).parse(e);o;o=o.walk())if(1===o.type){const e=o.name;if(o.attr("data-ephox-embed-iri")){r=C(o);break}r.source||"param"!==e||(r.source=o.attr("movie")),"iframe"!==e&&"object"!==e&&"embed"!==e&&"video"!==e&&"audio"!==e||(r.type||(r.type=e),r=j.extend(o.attributes.map,r)),"source"===e&&(r.source?r.altsource||(r.altsource=o.attr("src")):r.source=o.attr("src")),"img"!==e||r.poster||(r.poster=o.attr("src"))}return r.source=r.source||r.src||"",r.altsource=r.altsource||"",r.poster=r.poster||"",r},z=e=>{var t;const r=null!==(t=e.toLowerCase().split(".").pop())&&void 0!==t?t:"";return d({mp3:"audio/mpeg",m4a:"audio/x-m4a",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"},r).getOr("")};var D=tinymce.util.Tools.resolve("tinymce.html.Node"),F=tinymce.util.Tools.resolve("tinymce.html.Serializer");const M=(e,t={})=>A({forced_root_block:!1,validate:!1,allow_conditional_comments:!0,...t},e),N=O.DOM,R=e=>/^[0-9.]+$/.test(e)?e+"px":e,E=(e,t)=>{const r=t.attr("style"),o=r?N.parseStyle(r):{};s(e.width)&&(o["max-width"]=R(e.width)),s(e.height)&&(o["max-height"]=R(e.height)),t.attr("style",N.serializeStyle(o))},U=["source","altsource"],P=(e,t,r,o)=>{let a=0,s=0;const i=M(o);i.addNodeFilter("source",(e=>a=e.length));const n=i.parse(e);for(let e=n;e;e=e.walk())if(1===e.type){const o=e.name;if(e.attr("data-ephox-embed-iri")){E(t,e);break}switch(o){case"video":case"object":case"embed":case"img":case"iframe":void 0!==t.height&&void 0!==t.width&&(e.attr("width",t.width),e.attr("height",t.height))}if(r)switch(o){case"video":e.attr("poster",t.poster),e.attr("src",null);for(let r=a;r<2;r++)if(t[U[r]]){const o=new D("source",1);o.attr("src",t[U[r]]),o.attr("type",t[U[r]+"mime"]||null),e.append(o)}break;case"iframe":e.attr("src",t.source);break;case"object":const r=e.getAll("img").length>0;if(t.poster&&!r){e.attr("src",t.poster);const r=new D("img",1);r.attr("src",t.poster),r.attr("width",t.width),r.attr("height",t.height),e.append(r)}break;case"source":if(s<2&&(e.attr("src",t[U[s]]),e.attr("type",t[U[s]+"mime"]||null),!t[U[s]])){e.remove();continue}s++;break;case"img":t.poster||e.remove()}}return F({},o).serialize(n)},L=[{regex:/youtu\.be\/([\w\-_\?&=.]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$2?$4",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,type:"iframe",w:560,h:314,url:"www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?h=$2&title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)\?h=(\w+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?h=$3&title=0&amp;byline=0",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"player.vimeo.com/video/$2?title=0&amp;byline=0",allowFullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0},{regex:/dai\.ly\/([^_]+)/,type:"iframe",w:480,h:270,url:"www.dailymotion.com/embed/video/$1",allowFullscreen:!0}],I=(e,t)=>{const r=(e=>{const t=e.match(/^(https?:\/\/|www\.)(.+)$/i);return t&&t.length>1?"www."===t[1]?"https://":t[1]:"https://"})(t),o=e.regex.exec(t);let a=r+e.url;if(s(o))for(let e=0;e<o.length;e++)a=a.replace("$"+e,(()=>o[e]?o[e]:""));return a.replace(/\?$/,"")},B=e=>{const t=L.filter((t=>t.regex.test(e)));return t.length>0?j.extend({},t[0],{url:I(t[0],e)}):null},G=(e,t)=>{var r;const o=j.extend({},t);if(!o.source&&(j.extend(o,T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema)),!o.source))return"";o.altsource||(o.altsource=""),o.poster||(o.poster=""),o.source=e.convertURL(o.source,"source"),o.altsource=e.convertURL(o.altsource,"source"),o.sourcemime=z(o.source),o.altsourcemime=z(o.altsource),o.poster=e.convertURL(o.poster,"poster");const a=B(o.source);if(a&&(o.source=a.url,o.type=a.type,o.allowfullscreen=a.allowFullscreen,o.width=o.width||String(a.w),o.height=o.height||String(a.h)),o.embed)return P(o.embed,o,!0,e.schema);{const t=g(e),r=b(e),a=w(e);return o.width=o.width||"300",o.height=o.height||"150",j.each(o,((t,r)=>{o[r]=e.dom.encode(""+t)})),"iframe"===o.type?((e,t)=>{if(t)return t(e);{const t=e.allowfullscreen?' allowFullscreen="1"':"";return'<iframe src="'+e.source+'" width="'+e.width+'" height="'+e.height+'"'+t+"></iframe>"}})(o,a):"application/x-shockwave-flash"===o.sourcemime?(e=>{let t='<object data="'+e.source+'" width="'+e.width+'" height="'+e.height+'" type="application/x-shockwave-flash">';return e.poster&&(t+='<img src="'+e.poster+'" width="'+e.width+'" height="'+e.height+'" />'),t+="</object>",t})(o):-1!==o.sourcemime.indexOf("audio")?((e,t)=>t?t(e):'<audio controls="controls" src="'+e.source+'">'+(e.altsource?'\n<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</audio>")(o,t):((e,t)=>t?t(e):'<video width="'+e.width+'" height="'+e.height+'"'+(e.poster?' poster="'+e.poster+'"':"")+' controls="controls">\n<source src="'+e.source+'"'+(e.sourcemime?' type="'+e.sourcemime+'"':"")+" />\n"+(e.altsource?'<source src="'+e.altsource+'"'+(e.altsourcemime?' type="'+e.altsourcemime+'"':"")+" />\n":"")+"</video>")(o,r)}},W=e=>e.hasAttribute("data-mce-object")||e.hasAttribute("data-ephox-embed-iri"),q={},H=e=>t=>G(e,t),J=(e,t)=>{const r=y(e);return r?((e,t,r)=>new Promise(((o,a)=>{const s=r=>(r.html&&(q[e.source]=r),o({url:e.source,html:r.html?r.html:t(e)}));q[e.source]?s(q[e.source]):r({url:e.source},s,a)})))(t,H(e),r):((e,t)=>Promise.resolve({html:t(e),url:e.source}))(t,H(e))},K=(e,t)=>{const r={};return d(e,"dimensions").each((e=>{l(["width","height"],(o=>{d(t,o).orThunk((()=>d(e,o))).each((e=>r[o]=e))}))})),r},Q=(e,t)=>{const r=t&&"dimensions"!==t?((e,t)=>d(t,e).bind((e=>d(e,"meta"))))(t,e).getOr({}):{},a=((e,t,r)=>a=>{const s=()=>d(e,a),n=()=>d(t,a),l=e=>d(e,"value").bind((e=>e.length>0?i.some(e):i.none()));return{[a]:(a===r?s().bind((e=>o(e)?l(e).orThunk(n):n().orThunk((()=>i.from(e))))):n().orThunk((()=>s().bind((e=>o(e)?l(e):i.from(e)))))).getOr("")}})(e,r,t);return{...a("source"),...a("altsource"),...a("poster"),...a("embed"),...K(e,r)}},V=e=>{const t={...e,source:{value:d(e,"source").getOr("")},altsource:{value:d(e,"altsource").getOr("")},poster:{value:d(e,"poster").getOr("")}};return l(["width","height"],(r=>{d(e,r).each((e=>{const o=t.dimensions||{};o[r]=e,t.dimensions=o}))})),t},X=e=>t=>{const r=t&&t.msg?"Media embed handler error: "+t.msg:"Media embed handler threw unknown error.";e.notificationManager.open({type:"error",text:r})},Y=(e,t)=>o=>{if(r(o.url)&&o.url.trim().length>0){const r=o.html,a={...T(r,t.schema),source:o.url,embed:r};e.setData(V(a))}},Z=(e,t)=>{const r=e.dom.select("*[data-mce-object]");e.insertContent(t),((e,t)=>{const r=e.dom.select("*[data-mce-object]");for(let e=0;e<t.length;e++)for(let o=r.length-1;o>=0;o--)t[e]===r[o]&&r.splice(o,1);e.selection.select(r[0])})(e,r),e.nodeChanged()},ee=(e,t)=>s(t)&&"ephox-embed-iri"===t&&s(B(e)),te=(e,t)=>((e,t)=>e.width!==t.width||e.height!==t.height)(e,t)&&ee(t.source,e.type),re=e=>{const t=(e=>{const t=e.selection.getNode(),r=W(t)?e.serializer.serialize(t,{selection:!0}):"",o=T(r,e.schema),a=(()=>{if(ee(o.source,o.type)){const r=e.dom.getRect(t);return{width:r.w.toString().replace(/px$/,""),height:r.h.toString().replace(/px$/,"")}}return{}})();return{embed:r,...o,...a}})(e),r=(e=>{let t=e;return{get:()=>t,set:e=>{t=e}}})(t),o=V(t),a=k(e)?[{type:"sizeinput",name:"dimensions",label:"Constrain proportions",constrain:!0}]:[],s={title:"General",name:"general",items:c([[{name:"source",type:"urlinput",filetype:"media",label:"Source",picker_text:"Browse files"}],a])},i=[];x(e)&&i.push({name:"altsource",type:"urlinput",filetype:"media",label:"Alternative source URL"}),_(e)&&i.push({name:"poster",type:"urlinput",filetype:"image",label:"Media poster (Image URL)"});const n={title:"Advanced",name:"advanced",items:i},l=[s,{title:"Embed",items:[{type:"textarea",name:"embed",label:"Paste your embed code below:"}]}];i.length>0&&l.push(n);const m={type:"tabpanel",tabs:l},u=e.windowManager.open({title:"Insert/Edit Media",size:"normal",body:m,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:t=>{const o=Q(t.getData());((e,t,r)=>{var o,a;t.embed=te(e,t)&&k(r)?G(r,{...t,embed:""}):P(null!==(o=t.embed)&&void 0!==o?o:"",t,!1,r.schema),t.embed&&(e.source===t.source||(a=t.source,h(q,a)))?Z(r,t.embed):J(r,t).then((e=>{Z(r,e.html)})).catch(X(r))})(r.get(),o,e),t.close()},onChange:(t,o)=>{switch(o.name){case"source":((t,r)=>{const o=Q(r.getData(),"source");t.source!==o.source&&(Y(u,e)({url:o.source,html:""}),J(e,o).then(Y(u,e)).catch(X(e)))})(r.get(),t);break;case"embed":(t=>{var r;const o=Q(t.getData()),a=T(null!==(r=o.embed)&&void 0!==r?r:"",e.schema);t.setData(V(a))})(t);break;case"dimensions":case"altsource":case"poster":((t,r,o)=>{const a=Q(t.getData(),r),s=te(o,a)&&k(e)?{...a,embed:""}:a,i=G(e,s);t.setData(V({...s,embed:i}))})(t,o.name,r.get())}r.set(Q(t.getData()))},initialData:o})};var oe=tinymce.util.Tools.resolve("tinymce.Env");const ae=e=>{const t=e.name;return"iframe"===t||"video"===t||"audio"===t},se=(e,t,r,o=null)=>{const a=e.attr(r);return s(a)?a:h(t,r)?null:o},ie=(e,t,r)=>{const o="img"===t.name||"video"===e.name,a=o?"300":null,s="audio"===e.name?"30":"150",i=o?s:null;t.attr({width:se(e,r,"width",a),height:se(e,r,"height",i)})},ne=(e,t)=>{const r=t.name,o=new D("img",1);return ce(e,t,o),ie(t,o,{}),o.attr({style:t.attr("style"),src:oe.transparentSrc,"data-mce-object":r,class:"mce-object mce-object-"+r}),o},le=(e,t)=>{var r;const o=t.name,a=new D("span",1);a.attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":o,class:"mce-preview-object mce-object-"+o}),ce(e,t,a);const i=e.dom.parseStyle(null!==(r=t.attr("style"))&&void 0!==r?r:""),n=new D(o,1);if(ie(t,n,i),n.attr({src:t.attr("src"),style:t.attr("style"),class:t.attr("class")}),"iframe"===o)n.attr({allowfullscreen:t.attr("allowfullscreen"),frameborder:"0",sandbox:t.attr("sandbox")});else{l(["controls","crossorigin","currentTime","loop","muted","poster","preload"],(e=>{n.attr(e,t.attr(e))}));const r=a.attr("data-mce-html");s(r)&&((e,t,r,o)=>{const a=M(e.schema).parse(o,{context:t});for(;a.firstChild;)r.append(a.firstChild)})(e,o,n,unescape(r))}const c=new D("span",1);return c.attr("class","mce-shim"),a.append(n),a.append(c),a},ce=(e,t,r)=>{var o;const a=null!==(o=t.attributes)&&void 0!==o?o:[];let s=a.length;for(;s--;){const t=a[s].name;let o=a[s].value;"width"===t||"height"===t||"style"===t||(n="data-mce-",(i=t).length>=9&&i.substr(0,9)===n)||("data"!==t&&"src"!==t||(o=e.convertURL(o,t)),r.attr("data-mce-p-"+t,o))}var i,n;const c=F({inner:!0},e.schema),m=new D("div",1);l(t.children(),(e=>m.append(e)));const u=c.serialize(m);u&&(r.attr("data-mce-html",escape(u)),r.empty())},me=e=>{const t=e.attr("class");return r(t)&&/\btiny-pageembed\b/.test(t)},ue=e=>{let t=e;for(;t=t.parent;)if(t.attr("data-ephox-embed-iri")||me(t))return!0;return!1},de=(e,t,r)=>{const o=(0,e.options.get)("xss_sanitization"),a=f(e);return M(e.schema,{sanitize:o,validate:a}).parse(r,{context:t})},he=e=>t=>{const r=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",r),r(),()=>{e.off("NodeChange",r)}};e.add("media",(e=>((e=>{const t=e.options.register;t("audio_template_callback",{processor:"function"}),t("video_template_callback",{processor:"function"}),t("iframe_template_callback",{processor:"function"}),t("media_live_embeds",{processor:"boolean",default:!0}),t("media_filter_html",{processor:"boolean",default:!0}),t("media_url_resolver",{processor:"function"}),t("media_alt_source",{processor:"boolean",default:!0}),t("media_poster",{processor:"boolean",default:!0}),t("media_dimensions",{processor:"boolean",default:!0})})(e),(e=>{e.addCommand("mceMedia",(()=>{re(e)}))})(e),(e=>{const t=()=>e.execCommand("mceMedia");e.ui.registry.addToggleButton("media",{tooltip:"Insert/edit media",icon:"embed",onAction:t,onSetup:t=>{const r=e.selection;t.setActive(W(r.getNode()));const o=r.selectorChangedWithUnbind("img[data-mce-object],span[data-mce-object],div[data-ephox-embed-iri]",t.setActive).unbind,a=he(e)(t);return()=>{o(),a()}}}),e.ui.registry.addMenuItem("media",{icon:"embed",text:"Media...",onAction:t,onSetup:he(e)})})(e),(e=>{e.on("ResolveName",(e=>{let t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}))})(e),(e=>{e.on("PreInit",(()=>{const{schema:t,serializer:r,parser:o}=e,a=t.getBoolAttrs();l("webkitallowfullscreen mozallowfullscreen".split(" "),(e=>{a[e]={}})),((e,t)=>{const r=m(e);for(let o=0,a=r.length;o<a;o++){const a=r[o];t(e[a],a)}})({embed:["wmode"]},((e,r)=>{const o=t.getElementRule(r);o&&l(e,(e=>{o.attributes[e]={},o.attributesOrder.push(e)}))})),o.addNodeFilter("iframe,video,audio,object,embed",(e=>t=>{let r,o=t.length;for(;o--;)r=t[o],r.parent&&(r.parent.attr("data-mce-object")||(ae(r)&&v(e)?ue(r)||r.replace(le(e,r)):ue(r)||r.replace(ne(e,r))))})(e)),r.addAttributeFilter("data-mce-object",((t,r)=>{var o;let a=t.length;for(;a--;){const s=t[a];if(!s.parent)continue;const i=s.attr(r),n=new D(i,1);if("audio"!==i){const e=s.attr("class");e&&-1!==e.indexOf("mce-preview-object")&&s.firstChild?n.attr({width:s.firstChild.attr("width"),height:s.firstChild.attr("height")}):n.attr({width:s.attr("width"),height:s.attr("height")})}n.attr({style:s.attr("style")});const c=null!==(o=s.attributes)&&void 0!==o?o:[];let m=c.length;for(;m--;){const e=c[m].name;0===e.indexOf("data-mce-p-")&&n.attr(e.substr(11),c[m].value)}const u=s.attr("data-mce-html");if(u){const t=de(e,i,unescape(u));l(t.children(),(e=>n.append(e)))}s.replace(n)}}))})),e.on("SetContent",(()=>{const t=e.dom;l(t.select("span.mce-preview-object"),(e=>{0===t.select("span.mce-shim",e).length&&t.add(e,"span",{class:"mce-shim"})}))}))})(e),(e=>{e.on("click keyup touchend",(()=>{const t=e.selection.getNode();t&&e.dom.hasClass(t,"mce-preview-object")&&e.dom.getAttrib(t,"data-mce-selected")&&t.setAttribute("data-mce-selected","2")})),e.on("ObjectResized",(t=>{const r=t.target;if(r.getAttribute("data-mce-object")){let o=r.getAttribute("data-mce-html");o&&(o=unescape(o),r.setAttribute("data-mce-html",escape(P(o,{width:String(t.width),height:String(t.height)},!1,e.schema))))}}))})(e),(e=>({showDialog:()=>{re(e)}}))(e))))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/nonbreaking/plugin.min.js b/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
index 6112af0efdb..4baee129054 100644
--- a/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
+++ b/public/libs/tinymce/plugins/nonbreaking/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var n=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=n=>e=>typeof e===n,o=e("boolean"),a=e("number"),t=n=>e=>e.options.get(n),i=t("nonbreaking_force_tab"),s=t("nonbreaking_wrap"),r=(n,e)=>{let o="";for(let a=0;a<e;a++)o+=n;return o},c=(n,e)=>{const o=s(n)||n.plugins.visualchars?`<span class="${(n=>!!n.plugins.visualchars&&n.plugins.visualchars.isEnabled())(n)?"mce-nbsp-wrap mce-nbsp":"mce-nbsp-wrap"}" contenteditable="false">${r("&nbsp;",e)}</span>`:r("&nbsp;",e);n.undoManager.transact((()=>n.insertContent(o)))};var l=tinymce.util.Tools.resolve("tinymce.util.VK");const u=n=>e=>{const o=()=>{e.setEnabled(n.selection.isEditable())};return n.on("NodeChange",o),o(),()=>{n.off("NodeChange",o)}};n.add("nonbreaking",(n=>{(n=>{const e=n.options.register;e("nonbreaking_force_tab",{processor:n=>o(n)?{value:n?3:0,valid:!0}:a(n)?{value:n,valid:!0}:{valid:!1,message:"Must be a boolean or number."},default:!1}),e("nonbreaking_wrap",{processor:"boolean",default:!0})})(n),(n=>{n.addCommand("mceNonBreaking",(()=>{c(n,1)}))})(n),(n=>{const e=()=>n.execCommand("mceNonBreaking");n.ui.registry.addButton("nonbreaking",{icon:"non-breaking",tooltip:"Nonbreaking space",onAction:e,onSetup:u(n)}),n.ui.registry.addMenuItem("nonbreaking",{icon:"non-breaking",text:"Nonbreaking space",onAction:e,onSetup:u(n)})})(n),(n=>{const e=i(n);e>0&&n.on("keydown",(o=>{if(o.keyCode===l.TAB&&!o.isDefaultPrevented()){if(o.shiftKey)return;o.preventDefault(),o.stopImmediatePropagation(),c(n,e)}}))})(n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/pagebreak/plugin.min.js b/public/libs/tinymce/plugins/pagebreak/plugin.min.js
index 1621d834d32..6ed62f51ed9 100644
--- a/public/libs/tinymce/plugins/pagebreak/plugin.min.js
+++ b/public/libs/tinymce/plugins/pagebreak/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),a=tinymce.util.Tools.resolve("tinymce.Env");const t=e=>a=>a.options.get(e),n=t("pagebreak_separator"),o=t("pagebreak_split_block"),r="mce-pagebreak",s=e=>{const t=`<img src="${a.transparentSrc}" class="${r}" data-mce-resize="false" data-mce-placeholder />`;return e?`<p>${t}</p>`:t},c=e=>a=>{const t=()=>{a.setEnabled(e.selection.isEditable())};return e.on("NodeChange",t),t(),()=>{e.off("NodeChange",t)}};e.add("pagebreak",(e=>{(e=>{const a=e.options.register;a("pagebreak_separator",{processor:"string",default:"\x3c!-- pagebreak --\x3e"}),a("pagebreak_split_block",{processor:"boolean",default:!1})})(e),(e=>{e.addCommand("mcePageBreak",(()=>{e.insertContent(s(o(e)))}))})(e),(e=>{const a=()=>e.execCommand("mcePageBreak");e.ui.registry.addButton("pagebreak",{icon:"page-break",tooltip:"Page break",onAction:a,onSetup:c(e)}),e.ui.registry.addMenuItem("pagebreak",{text:"Page break",icon:"page-break",onAction:a,onSetup:c(e)})})(e),(e=>{const a=n(e),t=()=>o(e),c=new RegExp(a.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,(e=>"\\"+e)),"gi");e.on("BeforeSetContent",(e=>{e.content=e.content.replace(c,s(t()))})),e.on("PreInit",(()=>{e.serializer.addNodeFilter("img",(n=>{let o,s,c=n.length;for(;c--;)if(o=n[c],s=o.attr("class"),s&&-1!==s.indexOf(r)){const n=o.parent;if(n&&e.schema.getBlockElements()[n.name]&&t()){n.type=3,n.value=a,n.raw=!0,o.remove();continue}o.type=3,o.value=a,o.raw=!0}}))}))})(e),(e=>{e.on("ResolveName",(a=>{"IMG"===a.target.nodeName&&e.dom.hasClass(a.target,r)&&(a.name="pagebreak")}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/preview/plugin.min.js b/public/libs/tinymce/plugins/preview/plugin.min.js
index 76885123d1d..14b0af4beb0 100644
--- a/public/libs/tinymce/plugins/preview/plugin.min.js
+++ b/public/libs/tinymce/plugins/preview/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=tinymce.util.Tools.resolve("tinymce.Env"),o=tinymce.util.Tools.resolve("tinymce.util.Tools");const n=e=>t=>t.options.get(e),i=n("content_style"),s=n("content_css_cors"),c=n("body_class"),r=n("body_id");e.add("preview",(e=>{(e=>{e.addCommand("mcePreview",(()=>{(e=>{const n=(e=>{var n;let l="";const a=e.dom.encode,d=null!==(n=i(e))&&void 0!==n?n:"";l+='<base href="'+a(e.documentBaseURI.getURI())+'">';const m=s(e)?' crossorigin="anonymous"':"";o.each(e.contentCSS,(t=>{l+='<link type="text/css" rel="stylesheet" href="'+a(e.documentBaseURI.toAbsolute(t))+'"'+m+">"})),d&&(l+='<style type="text/css">'+d+"</style>");const y=r(e),u=c(e),v='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A" && !('+(t.os.isMacOS()||t.os.isiOS()?"e.metaKey":"e.ctrlKey && !e.altKey")+")) {e.preventDefault();}}}, false);<\/script> ",p=e.getBody().dir,w=p?' dir="'+a(p)+'"':"";return"<!DOCTYPE html><html><head>"+l+'</head><body id="'+a(y)+'" class="mce-content-body '+a(u)+'"'+w+">"+e.getContent()+v+"</body></html>"})(e);e.windowManager.open({title:"Preview",size:"large",body:{type:"panel",items:[{name:"preview",type:"iframe",sandboxed:!0,transparent:!1}]},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}],initialData:{preview:n}}).focus("close")})(e)}))})(e),(e=>{const t=()=>e.execCommand("mcePreview");e.ui.registry.addButton("preview",{icon:"preview",tooltip:"Preview",onAction:t}),e.ui.registry.addMenuItem("preview",{icon:"preview",text:"Preview",onAction:t})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/quickbars/plugin.min.js b/public/libs/tinymce/plugins/quickbars/plugin.min.js
index 72087175832..cc0282b8d52 100644
--- a/public/libs/tinymce/plugins/quickbars/plugin.min.js
+++ b/public/libs/tinymce/plugins/quickbars/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>typeof e===t,o=("string",t=>"string"===(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(o=n=t,(r=String).prototype.isPrototypeOf(o)||(null===(i=n.constructor)||void 0===i?void 0:i.name)===r.name)?"string":e;var o,n,r,i})(t));const n=e("boolean"),r=e("function"),i=t=>e=>e.options.get(t),s=i("quickbars_selection_toolbar"),a=i("quickbars_insert_toolbar"),l=i("quickbars_image_toolbar");let c=0;var u=tinymce.util.Tools.resolve("tinymce.util.Delay");const d=t=>{t.ui.registry.addButton("quickimage",{icon:"image",tooltip:"Insert image",onAction:()=>{(t=>new Promise((e=>{let o=!1;const n=document.createElement("input");n.type="file",n.accept="image/*",n.style.position="fixed",n.style.left="0",n.style.top="0",n.style.opacity="0.001",document.body.appendChild(n);const r=t=>{var r;o||(null===(r=n.parentNode)||void 0===r||r.removeChild(n),o=!0,e(t))},i=t=>{r(Array.prototype.slice.call(t.target.files))};n.addEventListener("input",i),n.addEventListener("change",i);const s=e=>{const n=()=>{r([])};o||("focusin"===e.type?u.setEditorTimeout(t,n,1e3):n()),t.off("focusin remove",s)};t.on("focusin remove",s),n.click()})))(t).then((e=>{if(e.length>0){const o=e[0];(t=>new Promise((e=>{const o=new FileReader;o.onloadend=()=>{e(o.result.split(",")[1])},o.readAsDataURL(t)})))(o).then((e=>{((t,e,o)=>{const n=t.editorUpload.blobCache,r=n.create((t=>{const e=(new Date).getTime(),o=Math.floor(1e9*Math.random());return c++,"mceu_"+o+c+String(e)})(),o,e);n.add(r),t.insertContent(t.dom.createHTML("img",{src:r.blobUri()}))})(t,e,o)}))}}))}}),t.ui.registry.addButton("quicktable",{icon:"table",tooltip:"Insert table",onAction:()=>{((t,e,o)=>{t.execCommand("mceInsertTable",!1,{rows:2,columns:2})})(t)}})},m=(!1,()=>false);class g{constructor(t,e){this.tag=t,this.value=e}static some(t){return new g(!0,t)}static none(){return g.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?g.some(t(this.value)):g.none()}bind(t){return this.tag?t(this.value):g.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:g.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return null==t?g.none():g.some(t)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}g.singletonNone=new g(!1),"undefined"!=typeof window?window:Function("return this;")();var h=(t,e,o,n,i)=>t(o,n)?g.some(o):r(i)&&i(o)?g.none():e(o,n,i);const b=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},p=b,v=(t,e)=>{const o=t.dom;if(1!==o.nodeType)return!1;{const t=o;if(void 0!==t.matches)return t.matches(e);if(void 0!==t.msMatchesSelector)return t.msMatchesSelector(e);if(void 0!==t.webkitMatchesSelector)return t.webkitMatchesSelector(e);if(void 0!==t.mozMatchesSelector)return t.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")}},f=(t,e,o)=>{let n=t.dom;const i=r(o)?o:m;for(;n.parentNode;){n=n.parentNode;const t=p(n);if(e(t))return g.some(t);if(i(t))break}return g.none()},y=(t,e,o)=>f(t,(t=>v(t,e)),o),k=t=>{const e=a(t);e.length>0&&t.ui.registry.addContextToolbar("quickblock",{predicate:e=>{const o=p(e),n=t.schema.getTextBlockElements(),r=e=>e.dom===t.getBody();return!((t,e)=>{const o=t.dom;return!(!o||!o.hasAttribute)&&o.hasAttribute("data-mce-bogus")})(o)&&((t,e,o)=>h(((t,e)=>v(t,e)),y,t,'table,[data-mce-bogus="all"]',o))(o,0,r).fold((()=>((t,e,o)=>((t,e,o)=>h(((t,e)=>e(t)),f,t,e,o))(t,e,o).isSome())(o,(e=>e.dom.nodeName.toLowerCase()in n&&t.dom.isEmpty(e.dom)),r)),m)},items:e,position:"line",scope:"editor"})};t.add("quickbars",(t=>{(t=>{const e=t.options.register,r=t=>e=>{const r=n(e)||o(e);return r?n(e)?{value:e?t:"",valid:r}:{value:e.trim(),valid:r}:{valid:!1,message:"Must be a boolean or string."}},i="bold italic | quicklink h2 h3 blockquote";e("quickbars_selection_toolbar",{processor:r(i),default:i});const s="quickimage quicktable";e("quickbars_insert_toolbar",{processor:r(s),default:s});const a="alignleft aligncenter alignright";e("quickbars_image_toolbar",{processor:r(a),default:a})})(t),d(t),k(t),(t=>{const e=e=>t.dom.isEditable(e),o=t=>{const o="FIGURE"===t.nodeName&&/image/i.test(t.className),n="IMG"===t.nodeName||o,r=(t=>void 0!==t.dom.classList)(i=p(t))&&i.dom.classList.contains("mce-pagebreak");var i;return n&&e(t.parentElement)&&!r},n=l(t);n.length>0&&t.ui.registry.addContextToolbar("imageselection",{predicate:o,items:n,position:"node"});const r=s(t);r.length>0&&t.ui.registry.addContextToolbar("textselection",{predicate:n=>!o(n)&&!t.selection.isCollapsed()&&e(n),items:r,position:"selection",scope:"editor"})})(t)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/save/plugin.min.js b/public/libs/tinymce/plugins/save/plugin.min.js
index b8775442d0f..55758b86689 100644
--- a/public/libs/tinymce/plugins/save/plugin.min.js
+++ b/public/libs/tinymce/plugins/save/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=("function",e=>"function"==typeof e);var o=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),t=tinymce.util.Tools.resolve("tinymce.util.Tools");const a=e=>n=>n.options.get(e),c=a("save_enablewhendirty"),i=a("save_onsavecallback"),s=a("save_oncancelcallback"),r=(e,n)=>{e.notificationManager.open({text:n,type:"error"})},l=e=>n=>{const o=()=>{n.setEnabled(!c(e)||e.isDirty())};return o(),e.on("NodeChange dirty",o),()=>e.off("NodeChange dirty",o)};e.add("save",(e=>{(e=>{const n=e.options.register;n("save_enablewhendirty",{processor:"boolean",default:!0}),n("save_onsavecallback",{processor:"function"}),n("save_oncancelcallback",{processor:"function"})})(e),(e=>{e.ui.registry.addButton("save",{icon:"save",tooltip:"Save",enabled:!1,onAction:()=>e.execCommand("mceSave"),onSetup:l(e)}),e.ui.registry.addButton("cancel",{icon:"cancel",tooltip:"Cancel",enabled:!1,onAction:()=>e.execCommand("mceCancel"),onSetup:l(e)}),e.addShortcut("Meta+S","","mceSave")})(e),(e=>{e.addCommand("mceSave",(()=>{(e=>{const t=o.DOM.getParent(e.id,"form");if(c(e)&&!e.isDirty())return;e.save();const a=i(e);if(n(a))return a.call(e,e),void e.nodeChanged();t?(e.setDirty(!1),t.onsubmit&&!t.onsubmit()||("function"==typeof t.submit?t.submit():r(e,"Error: Form submit field collision.")),e.nodeChanged()):r(e,"Error: No form element found.")})(e)})),e.addCommand("mceCancel",(()=>{(e=>{const o=t.trim(e.startContent),a=s(e);n(a)?a.call(e,e):e.resetContent(o)})(e)}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/searchreplace/plugin.min.js b/public/libs/tinymce/plugins/searchreplace/plugin.min.js
index d80595a84c4..164e7e8cadc 100644
--- a/public/libs/tinymce/plugins/searchreplace/plugin.min.js
+++ b/public/libs/tinymce/plugins/searchreplace/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";const e=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}};var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const n=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(n=r=e,(o=String).prototype.isPrototypeOf(n)||(null===(s=r.constructor)||void 0===s?void 0:s.name)===o.name)?"string":t;var n,r,o,s})(t)===e,r=e=>t=>typeof t===e,o=n("string"),s=n("array"),a=r("boolean"),l=r("number"),i=()=>{},c=e=>()=>e,d=c(!0),u=c("[~\u2116|!-*+-\\/:;?@\\[-`{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]");class h{constructor(e,t){this.tag=e,this.value=t}static some(e){return new h(!0,e)}static none(){return h.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?h.some(e(this.value)):h.none()}bind(e){return this.tag?e(this.value):h.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:h.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?h.none():h.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}h.singletonNone=new h(!1);const m=u;var g=tinymce.util.Tools.resolve("tinymce.Env"),f=tinymce.util.Tools.resolve("tinymce.util.Tools");const p=Array.prototype.slice,x=Array.prototype.push,y=(e,t)=>{const n=e.length,r=new Array(n);for(let o=0;o<n;o++){const n=e[o];r[o]=t(n,o)}return r},w=(e,t)=>{for(let n=0,r=e.length;n<r;n++)t(e[n],n)},b=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},v=(e,t)=>(e=>{const t=[];for(let n=0,r=e.length;n<r;++n){if(!s(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);x.apply(t,e[n])}return t})(y(e,t)),C=Object.hasOwnProperty,E=(e,t)=>C.call(e,t);"undefined"!=typeof window?window:Function("return this;")();const O=(3,e=>3===(e=>e.dom.nodeType)(e));const N=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},T=N,k=(e,t)=>({element:e,offset:t}),A=(e,t)=>{((e,t)=>{const n=(e=>h.from(e.dom.parentNode).map(T))(e);n.each((n=>{n.dom.insertBefore(t.dom,e.dom)}))})(e,t),((e,t)=>{e.dom.appendChild(t.dom)})(t,e)},S=((e,t)=>{const n=t=>e(t)?h.from(t.dom.nodeValue):h.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(O),B=e=>S.get(e);var F=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker");const I=(e,t)=>e.isBlock(t)||E(e.schema.getVoidElements(),t.nodeName),R=(e,t)=>!e.isEditable(t),M=(e,t)=>!e.isBlock(t)&&E(e.schema.getWhitespaceElements(),t.nodeName),D=(e,t)=>((e,t)=>{const n=(e=>y(e.dom.childNodes,T))(e);return n.length>0&&t<n.length?k(n[t],0):k(e,t)})(T(e),t),P=(e,t,n,r,o,s=!0)=>{let a=s?t(!1):n;for(;a;){const n=R(e,a);if(n||M(e,a)){if(n?r.cef(a):r.boundary(a))break;a=t(!0)}else{if(I(e,a)){if(r.boundary(a))break}else 3===a.nodeType&&r.text(a);if(a===o)break;a=t(!1)}}},W=(e,t,n,r,o)=>{var s;if(((e,t)=>I(e,t)||R(e,t)||M(e,t)||((e,t)=>"true"===e.getContentEditable(t)&&t.parentNode&&!e.isEditable(t.parentNode))(e,t))(e,n))return;const a=null!==(s=e.getParent(r,e.isBlock))&&void 0!==s?s:e.getRoot(),l=new F(n,a),i=o?l.next.bind(l):l.prev.bind(l);P(e,i,n,{boundary:d,cef:d,text:e=>{o?t.fOffset+=e.length:t.sOffset+=e.length,t.elements.push(T(e))}})},$=(e,t,n,r,o,s=!0)=>{const a=new F(n,t),l=[];let i={sOffset:0,fOffset:0,elements:[]};W(e,i,n,t,!1);const c=()=>(i.elements.length>0&&(l.push(i),i={sOffset:0,fOffset:0,elements:[]}),!1);return P(e,a.next.bind(a),n,{boundary:c,cef:e=>(c(),o&&l.push(...o.cef(e)),!1),text:e=>{i.elements.push(T(e)),o&&o.text(e,i)}},r,s),r&&W(e,i,r,t,!0),c(),l},V=(e,t)=>{const n=D(t.startContainer,t.startOffset),r=n.element.dom,o=D(t.endContainer,t.endOffset),s=o.element.dom;return $(e,t.commonAncestorContainer,r,s,{text:(e,t)=>{e===s?t.fOffset+=e.length-o.offset:e===r&&(t.sOffset+=n.offset)},cef:t=>{return((e,t)=>{const n=p.call(e,0);return n.sort(((e,t)=>((e,t)=>((e,t,n)=>0!=(e.compareDocumentPosition(t)&n))(e,t,Node.DOCUMENT_POSITION_PRECEDING))(e.elements[0].dom,t.elements[0].dom)?1:-1)),n})(v((n=T(t),((e,t)=>{const n=void 0===t?document:t.dom;return 1!==(r=n).nodeType&&9!==r.nodeType&&11!==r.nodeType||0===r.childElementCount?[]:y(n.querySelectorAll(e),T);var r})("*[contenteditable=true]",n)),(t=>{const n=t.dom;return $(e,n,n)})));var n}},!1)},j=(e,t)=>t.collapsed?[]:V(e,t),z=(e,t)=>{const n=e.createRng();return n.selectNode(t),j(e,n)},U=(e,t)=>v(t,(t=>{const n=t.elements,r=y(n,B).join(""),o=((e,t,n=0,r=e.length)=>{const o=t.regex;o.lastIndex=n;const s=[];let a;for(;a=o.exec(e);){const e=a[t.matchIndex],n=a.index+a[0].indexOf(e),l=n+e.length;if(l>r)break;s.push({start:n,finish:l}),o.lastIndex=l}return s})(r,e,t.sOffset,r.length-t.fOffset);return((e,t)=>{const n=(r=e,o=(e,n)=>{const r=B(n),o=e.last,s=o+r.length,a=v(t,((e,t)=>e.start<s&&e.finish>o?[{element:n,start:Math.max(o,e.start)-o,finish:Math.min(s,e.finish)-o,matchId:t}]:[]));return{results:e.results.concat(a),last:s}},s={results:[],last:0},w(r,((e,t)=>{s=o(s,e)})),s).results;var r,o,s;return((e,t)=>{if(0===e.length)return[];{let n=t(e[0]);const r=[];let o=[];for(let s=0,a=e.length;s<a;s++){const a=e[s],l=t(a);l!==n&&(r.push(o),o=[]),n=l,o.push(a)}return 0!==o.length&&r.push(o),r}})(n,(e=>e.matchId))})(n,o)})),_=(e,t)=>{b(e,((e,n)=>{b(e,(e=>{const r=T(t.cloneNode(!1));((e,t,n)=>{((e,t,n)=>{if(!(o(n)||a(n)||l(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")})(e.dom,t,n)})(r,"data-mce-index",n);const s=e.element.dom;if(s.length===e.finish&&0===e.start)A(e.element,r);else{s.length!==e.finish&&s.splitText(e.finish);const t=s.splitText(e.start);A(T(t),r)}}))}))},q=e=>e.getAttribute("data-mce-index"),G=(e,t,n,r)=>{const o=e.dom.create("span",{"data-mce-bogus":1});o.className="mce-match-marker";const s=e.getBody();return te(e,t,!1),r?((e,t,n,r)=>{const o=n.getBookmark(),s=e.select("td[data-mce-selected],th[data-mce-selected]"),a=s.length>0?((e,t)=>v(t,(t=>z(e,t))))(e,s):j(e,n.getRng()),l=U(t,a);return _(l,r),n.moveToBookmark(o),l.length})(e.dom,n,e.selection,o):((e,t,n,r)=>{const o=z(e,n),s=U(t,o);return _(s,r),s.length})(e.dom,n,s,o)},K=e=>{var t;const n=e.parentNode;e.firstChild&&n.insertBefore(e.firstChild,e),null===(t=e.parentNode)||void 0===t||t.removeChild(e)},H=(e,t)=>{const n=[],r=f.toArray(e.getBody().getElementsByTagName("span"));if(r.length)for(let e=0;e<r.length;e++){const o=q(r[e]);null!==o&&o.length&&o===t.toString()&&n.push(r[e])}return n},J=(e,t,n)=>{const r=t.get();let o=r.index;const s=e.dom;n?o+1===r.count?o=0:o++:o-1==-1?o=r.count-1:o--,s.removeClass(H(e,r.index),"mce-match-marker-selected");const a=H(e,o);return a.length?(s.addClass(H(e,o),"mce-match-marker-selected"),e.selection.scrollIntoView(a[0]),o):-1},L=(e,t)=>{const n=t.parentNode;e.remove(t),n&&e.isEmpty(n)&&e.remove(n)},Q=(e,t,n,r,o,s)=>{const a=e.selection,l=((e,t)=>{const n="("+e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&").replace(/\s/g,"[^\\S\\r\\n\\uFEFF]")+")";return t?`(?:^|\\s|${m()})`+n+`(?=$|\\s|${m()})`:n})(n,o),i=a.isForward(),c={regex:new RegExp(l,r?"g":"gi"),matchIndex:1},d=G(e,t,c,s);if(g.browser.isSafari()&&a.setRng(a.getRng(),i),d){const a=J(e,t,!0);t.set({index:a,count:d,text:n,matchCase:r,wholeWord:o,inSelection:s})}return d},X=(e,t)=>{const n=J(e,t,!0);t.set({...t.get(),index:n})},Y=(e,t)=>{const n=J(e,t,!1);t.set({...t.get(),index:n})},Z=e=>{const t=q(e);return null!==t&&t.length>0},ee=(e,t,n,r,o)=>{const s=t.get(),a=s.index;let l,i=a;r=!1!==r;const c=e.getBody(),d=f.grep(f.toArray(c.getElementsByTagName("span")),Z);for(let t=0;t<d.length;t++){const c=q(d[t]);let u=l=parseInt(c,10);if(o||u===s.index){for(n.length?(d[t].innerText=n,K(d[t])):L(e.dom,d[t]);d[++t];){if(u=parseInt(q(d[t]),10),u!==l){t--;break}L(e.dom,d[t])}r&&i--}else l>a&&d[t].setAttribute("data-mce-index",String(l-1))}return t.set({...s,count:o?0:s.count-1,index:i}),r?X(e,t):Y(e,t),!o&&t.get().count>0},te=(e,t,n)=>{let r,o;const s=t.get(),a=f.toArray(e.getBody().getElementsByTagName("span"));for(let e=0;e<a.length;e++){const t=q(a[e]);null!==t&&t.length&&(t===s.index.toString()&&(r||(r=a[e].firstChild),o=a[e].firstChild),K(a[e]))}if(t.set({...s,index:-1,count:0,text:""}),r&&o){const t=e.dom.createRng();return t.setStart(r,0),t.setEnd(o,o.data.length),!1!==n&&e.selection.setRng(t),t}},ne=(t,n)=>{const r=(()=>{const t=(t=>{const n=e(h.none()),r=()=>n.get().each(t);return{clear:()=>{r(),n.set(h.none())},isSet:()=>n.get().isSome(),get:()=>n.get(),set:e=>{r(),n.set(h.some(e))}}})(i);return{...t,on:e=>t.get().each(e)}})();t.undoManager.add();const o=f.trim(t.selection.getContent({format:"text"})),s=e=>{e.setEnabled("next",((e,t)=>t.get().count>1)(0,n)),e.setEnabled("prev",((e,t)=>t.get().count>1)(0,n))},a=(e,t)=>{w(["replace","replaceall","prev","next"],(n=>e.setEnabled(n,!t)))},l=(e,t)=>{t.redial(y(e,t.getData()))},c=(e,t)=>{g.browser.isSafari()&&g.deviceType.isTouch()&&("find"===t||"replace"===t||"replaceall"===t)&&e.focus(t)},d=e=>{te(t,n,!1),a(e,!0),s(e)},u=e=>{const r=e.getData(),o=n.get();if(r.findtext.length){if(o.text===r.findtext&&o.matchCase===r.matchcase&&o.wholeWord===r.wholewords)X(t,n);else{const o=Q(t,n,r.findtext,r.matchcase,r.wholewords,r.inselection);o<=0&&l(!0,e),a(e,0===o)}s(e)}else d(e)},m=n.get(),p={findtext:o,replacetext:"",wholewords:m.wholeWord,matchcase:m.matchCase,inselection:m.inSelection},x=e=>{const t=[{type:"bar",items:[{type:"input",name:"findtext",placeholder:"Find",maximized:!0,inputMode:"search"},{type:"button",name:"prev",text:"Previous",icon:"action-prev",enabled:!1,borderless:!0},{type:"button",name:"next",text:"Next",icon:"action-next",enabled:!1,borderless:!0}]},{type:"input",name:"replacetext",placeholder:"Replace with",inputMode:"search"}];return e&&t.push({type:"alertbanner",level:"error",text:"Could not find the specified string.",icon:"warning"}),t},y=(e,r)=>({title:"Find and Replace",size:"normal",body:{type:"panel",items:x(e)},buttons:[{type:"menu",name:"options",icon:"preferences",tooltip:"Preferences",align:"start",items:[{type:"togglemenuitem",name:"matchcase",text:"Match case"},{type:"togglemenuitem",name:"wholewords",text:"Find whole words only"},{type:"togglemenuitem",name:"inselection",text:"Find in selection"}]},{type:"custom",name:"find",text:"Find",primary:!0},{type:"custom",name:"replace",text:"Replace",enabled:!1},{type:"custom",name:"replaceall",text:"Replace all",enabled:!1}],initialData:r,onChange:(t,r)=>{e&&l(!1,t),"findtext"===r.name&&n.get().count>0&&d(t)},onAction:(e,r)=>{const o=e.getData();switch(r.name){case"find":u(e);break;case"replace":ee(t,n,o.replacetext)?s(e):d(e);break;case"replaceall":ee(t,n,o.replacetext,!0,!0),d(e);break;case"prev":Y(t,n),s(e);break;case"next":X(t,n),s(e);break;case"matchcase":case"wholewords":case"inselection":l(!1,e),(e=>{const t=e.getData(),r=n.get();n.set({...r,matchCase:t.matchcase,wholeWord:t.wholewords,inSelection:t.inselection})})(e),d(e)}c(e,r.name)},onSubmit:e=>{u(e),c(e,"find")},onClose:()=>{t.focus(),te(t,n),t.undoManager.add()}});r.set(t.windowManager.open(y(!1,p),{inline:"toolbar"}))},re=(e,t)=>()=>{ne(e,t)};t.add("searchreplace",(t=>{const n=e({index:-1,count:0,text:"",matchCase:!1,wholeWord:!1,inSelection:!1});return((e,t)=>{e.addCommand("SearchReplace",(()=>{ne(e,t)}))})(t,n),((e,t)=>{e.ui.registry.addMenuItem("searchreplace",{text:"Find and replace...",shortcut:"Meta+F",onAction:re(e,t),icon:"search"}),e.ui.registry.addButton("searchreplace",{tooltip:"Find and replace",onAction:re(e,t),icon:"search"}),e.shortcuts.add("Meta+F","",re(e,t))})(t,n),((e,t)=>({done:n=>te(e,t,n),find:(n,r,o,s=!1)=>Q(e,t,n,r,o,s),next:()=>X(e,t),prev:()=>Y(e,t),replace:(n,r,o)=>ee(e,t,n,r,o)}))(t,n)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/table/plugin.min.js b/public/libs/tinymce/plugins/table/plugin.min.js
index 63748a19c29..c993c8207be 100644
--- a/public/libs/tinymce/plugins/table/plugin.min.js
+++ b/public/libs/tinymce/plugins/table/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(o=l=e,(n=String).prototype.isPrototypeOf(o)||(null===(r=l.constructor)||void 0===r?void 0:r.name)===n.name)?"string":t;var o,l,n,r})(t)===e,o=e=>t=>typeof t===e,l=t("string"),n=t("array"),r=o("boolean"),a=(void 0,e=>undefined===e);const s=e=>!(e=>null==e)(e),c=o("function"),i=o("number"),m=()=>{},d=e=>()=>e,u=e=>e,p=(e,t)=>e===t;function b(e,...t){return(...o)=>{const l=t.concat(o);return e.apply(null,l)}}const g=e=>{e()},h=d(!1),f=d(!0);class y{constructor(e,t){this.tag=e,this.value=t}static some(e){return new y(!0,e)}static none(){return y.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?y.some(e(this.value)):y.none()}bind(e){return this.tag?e(this.value):y.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:y.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return s(e)?y.some(e):y.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}y.singletonNone=new y(!1);const w=Object.keys,S=Object.hasOwnProperty,C=(e,t)=>{const o=w(e);for(let l=0,n=o.length;l<n;l++){const n=o[l];t(e[n],n)}},v=(e,t)=>{const o={};var l;return((e,t,o,l)=>{C(e,((e,n)=>{(t(e,n)?o:l)(e,n)}))})(e,t,(l=o,(e,t)=>{l[t]=e}),m),o},T=e=>w(e).length,x=(e,t)=>A(e,t)?y.from(e[t]):y.none(),A=(e,t)=>S.call(e,t),R=(e,t)=>A(e,t)&&void 0!==e[t]&&null!==e[t],O=Array.prototype.indexOf,_=Array.prototype.push,D=(e,t)=>((e,t)=>O.call(e,t))(e,t)>-1,N=(e,t)=>{for(let o=0,l=e.length;o<l;o++)if(t(e[o],o))return!0;return!1},I=(e,t)=>{const o=[];for(let l=0;l<e;l++)o.push(t(l));return o},M=(e,t)=>{const o=e.length,l=new Array(o);for(let n=0;n<o;n++){const o=e[n];l[n]=t(o,n)}return l},P=(e,t)=>{for(let o=0,l=e.length;o<l;o++)t(e[o],o)},k=(e,t)=>{const o=[];for(let l=0,n=e.length;l<n;l++){const n=e[l];t(n,l)&&o.push(n)}return o},E=(e,t,o)=>(P(e,((e,l)=>{o=t(o,e,l)})),o),B=(e,t)=>((e,t,o)=>{for(let l=0,n=e.length;l<n;l++){const n=e[l];if(t(n,l))return y.some(n);if(o(n,l))break}return y.none()})(e,t,h),F=(e,t)=>(e=>{const t=[];for(let o=0,l=e.length;o<l;++o){if(!n(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);_.apply(t,e[o])}return t})(M(e,t)),q=(e,t)=>{for(let o=0,l=e.length;o<l;++o)if(!0!==t(e[o],o))return!1;return!0},L=(e,t)=>t>=0&&t<e.length?y.some(e[t]):y.none(),H=(e,t)=>{for(let o=0;o<e.length;o++){const l=t(e[o],o);if(l.isSome())return l}return y.none()},j=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},V={fromHtml:(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return j(o.childNodes[0])},fromTag:(e,t)=>{const o=(t||document).createElement(e);return j(o)},fromText:(e,t)=>{const o=(t||document).createTextNode(e);return j(o)},fromDom:j,fromPoint:(e,t,o)=>y.from(e.dom.elementFromPoint(t,o)).map(j)},$=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},W=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,z=(e,t)=>e.dom===t.dom,U=$;"undefined"!=typeof window?window:Function("return this;")();const G=e=>e.dom.nodeName.toLowerCase(),K=e=>e.dom.nodeType,J=e=>t=>K(t)===e,Q=J(1),X=J(3),Y=J(9),Z=J(11),ee=e=>t=>Q(t)&&G(t)===e,te=e=>Y(e)?e:V.fromDom(e.dom.ownerDocument),oe=e=>y.from(e.dom.parentNode).map(V.fromDom),le=e=>y.from(e.dom.nextSibling).map(V.fromDom),ne=e=>M(e.dom.childNodes,V.fromDom),re=c(Element.prototype.attachShadow)&&c(Node.prototype.getRootNode)?e=>V.fromDom(e.dom.getRootNode()):te,ae=e=>V.fromDom(e.dom.host),se=e=>{const t=X(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return(e=>{const t=re(e);return Z(o=t)&&s(o.dom.host)?y.some(t):y.none();var o})(V.fromDom(t)).fold((()=>o.body.contains(t)),(l=se,n=ae,e=>l(n(e))));var l,n};var ce=(e,t,o,l,n)=>e(o,l)?y.some(o):c(n)&&n(o)?y.none():t(o,l,n);const ie=(e,t,o)=>{let l=e.dom;const n=c(o)?o:h;for(;l.parentNode;){l=l.parentNode;const e=V.fromDom(l);if(t(e))return y.some(e);if(n(e))break}return y.none()},me=(e,t,o)=>ie(e,(e=>$(e,t)),o),de=(e,t)=>((e,o)=>B(e.dom.childNodes,(e=>{return o=V.fromDom(e),$(o,t);var o})).map(V.fromDom))(e),ue=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return W(o)?y.none():y.from(o.querySelector(e)).map(V.fromDom)})(t,e),pe=(e,t,o)=>ce(((e,t)=>$(e,t)),me,e,t,o),be=(e,t=!1)=>{return se(e)?e.dom.isContentEditable:(o=e,pe(o,"[contenteditable]")).fold(d(t),(e=>"true"===ge(e)));var o},ge=e=>e.dom.contentEditable,he=e=>t=>z(t,(e=>V.fromDom(e.getBody()))(e)),fe=e=>/^\d+(\.\d+)?$/.test(e)?e+"px":e,ye=e=>V.fromDom(e.selection.getStart()),we=(e,t)=>{let o=[];return P(ne(e),(e=>{t(e)&&(o=o.concat([e])),o=o.concat(we(e,t))})),o},Se=(e,t)=>((e,o)=>k(ne(e),(e=>$(e,t))))(e),Ce=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return W(o)?[]:M(o.querySelectorAll(e),V.fromDom)})(t,e),ve=(e,t,o)=>{if(!(l(o)||r(o)||i(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},Te=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},xe=(e,t)=>y.from(Te(e,t)),Ae=(e,t)=>{e.dom.removeAttribute(t)},Re=(e,t,o=p)=>e.exists((e=>o(e,t))),Oe=(e,t,o)=>e.isSome()&&t.isSome()?y.some(o(e.getOrDie(),t.getOrDie())):y.none(),_e=(e,t)=>((e,t,o)=>""===t||e.length>=t.length&&e.substr(0,0+t.length)===t)(e,t),De=(Ne=/^\s+|\s+$/g,e=>e.replace(Ne,""));var Ne;const Ie=e=>e.length>0,Me=(e,t=10)=>{const o=parseInt(e,t);return isNaN(o)?y.none():y.some(o)},Pe=e=>void 0!==e.style&&c(e.style.getPropertyValue),ke=(e,t)=>{const o=e.dom,l=window.getComputedStyle(o).getPropertyValue(t);return""!==l||se(e)?l:Ee(o,t)},Ee=(e,t)=>Pe(e)?e.style.getPropertyValue(t):"",Be=(e,t)=>{const o=e.dom,l=Ee(o,t);return y.from(l).filter((e=>e.length>0))},Fe=(e,t,o=0)=>xe(e,t).map((e=>parseInt(e,10))).getOr(o),qe=(e,t)=>Le(e,t,f),Le=(e,t,o)=>F(ne(e),(e=>$(e,t)?o(e)?[e]:[]:Le(e,t,o))),He=["tfoot","thead","tbody","colgroup"],je=(e,t,o)=>({element:e,rowspan:t,colspan:o}),Ve=(e,t,o)=>({element:e,cells:t,section:o}),$e=(e,t)=>pe(e,"table",t),We=e=>qe(e,"tr"),ze=e=>$e(e).fold(d([]),(e=>Se(e,"colgroup"))),Ue=e=>oe(e).map((e=>{const t=G(e);return(e=>D(He,e))(t)?t:"tbody"})).getOr("tbody"),Ge=e=>xe(e,"data-snooker-locked-cols").bind((e=>y.from(e.match(/\d+/g)))).map((e=>((e,t)=>{const o={};for(let l=0,n=e.length;l<n;l++){const n=e[l];o[String(n)]=t(n,l)}return o})(e,f))),Ke=(e,t)=>e+","+t,Je=e=>{const t={},o=[];var l;const n=(l=e,L(l,0)).map((e=>e.element)).bind($e).bind(Ge).getOr({});let r=0,a=0,s=0;const{pass:c,fail:i}=((e,t)=>{const o=[],l=[];for(let t=0,r=e.length;t<r;t++){const r=e[t];(n=r,"colgroup"===n.section?o:l).push(r)}var n;return{pass:o,fail:l}})(e);P(i,(e=>{const l=[];P(e.cells,(e=>{let o=0;for(;void 0!==t[Ke(s,o)];)o++;const r=R(n,o.toString()),c=((e,t,o,l,n,r)=>({element:e,rowspan:t,colspan:o,row:l,column:n,isLocked:r}))(e.element,e.rowspan,e.colspan,s,o,r);for(let l=0;l<e.colspan;l++)for(let n=0;n<e.rowspan;n++){const e=o+l,r=Ke(s+n,e);t[r]=c,a=Math.max(a,e+1)}l.push(c)})),r++,o.push(Ve(e.element,l,e.section)),s++}));const{columns:m,colgroups:d}=(e=>L(e,e.length-1))(c).map((e=>{const t=(e=>{const t={};let o=0;return P(e.cells,(e=>{const l=e.colspan;I(l,(n=>{const r=o+n;t[r]=((e,t,o)=>({element:e,colspan:t,column:o}))(e.element,l,r)})),o+=l})),t})(e),o=((e,t)=>({element:e,columns:t}))(e.element,((e,t)=>{const o=[];return C(e,((e,l)=>{o.push(t(e,l))})),o})(t,u));return{colgroups:[o],columns:t}})).getOrThunk((()=>({colgroups:[],columns:{}}))),p=((e,t)=>({rows:e,columns:t}))(r,a);return{grid:p,access:t,all:o,columns:m,colgroups:d}},Qe=e=>{const t=(e=>{const t=We(e);return((e,t)=>M(e,(e=>{if("colgroup"===G(e)){const t=M((e=>$(e,"colgroup")?Se(e,"col"):F(ze(e),(e=>Se(e,"col"))))(e),(e=>{const t=Fe(e,"span",1);return je(e,1,t)}));return Ve(e,t,"colgroup")}{const o=M((e=>qe(e,"th,td"))(e),(e=>{const t=Fe(e,"rowspan",1),o=Fe(e,"colspan",1);return je(e,t,o)}));return Ve(e,o,t(e))}})))([...ze(e),...t],Ue)})(e);return Je(t)},Xe=(e,t,o)=>y.from(e.access[Ke(t,o)]),Ye=(e,t,o)=>{const l=((e,t)=>{const o=F(e.all,(e=>e.cells));return k(o,t)})(e,(e=>o(t,e.element)));return l.length>0?y.some(l[0]):y.none()},Ze=(e,t)=>y.from(e.columns[t]);var et=tinymce.util.Tools.resolve("tinymce.util.Tools");const tt=(e,t,o)=>{const l=e.select("td,th",t);let n;for(let t=0;t<l.length;t++){const r=e.getStyle(l[t],o);if(a(n)&&(n=r),n!==r)return""}return n},ot=(e,t,o)=>{et.each("left center right".split(" "),(l=>{l!==o&&e.formatter.remove("align"+l,{},t)})),o&&e.formatter.apply("align"+o,{},t)},lt=(e,t,o)=>{e.dispatch("TableModified",{...o,table:t})},nt=(e,t,o)=>((e,t)=>(e=>{const t=parseFloat(e);return isNaN(t)?y.none():y.some(t)})(e).getOr(t))(ke(e,t),o),rt=e=>((e,t)=>{const o=e.dom,l=o.getBoundingClientRect().width||o.offsetWidth;return"border-box"===t?l:((e,t,o,l)=>t-nt(e,`padding-${o}`,0)-nt(e,`padding-${l}`,0)-nt(e,`border-${o}-width`,0)-nt(e,`border-${l}-width`,0))(e,l,"left","right")})(e,"content-box");var at=tinymce.util.Tools.resolve("tinymce.Env");const st=I(5,(e=>{const t=`${e+1}px`;return{title:t,value:t}})),ct=M(["Solid","Dotted","Dashed","Double","Groove","Ridge","Inset","Outset","None","Hidden"],(e=>({title:e,value:e.toLowerCase()}))),it="100%",mt=e=>{var t;const o=e.dom,l=null!==(t=o.getParent(e.selection.getStart(),o.isBlock))&&void 0!==t?t:e.getBody();return rt(V.fromDom(l))+"px"},dt=e=>t=>t.options.get(e),ut=dt("table_sizing_mode"),pt=dt("table_border_widths"),bt=dt("table_border_styles"),gt=dt("table_cell_advtab"),ht=dt("table_row_advtab"),ft=dt("table_advtab"),yt=dt("table_appearance_options"),wt=dt("table_grid"),St=dt("table_style_by_css"),Ct=dt("table_cell_class_list"),vt=dt("table_row_class_list"),Tt=dt("table_class_list"),xt=dt("table_toolbar"),At=dt("table_background_color_map"),Rt=dt("table_border_color_map"),Ot=e=>"fixed"===ut(e),_t=e=>"responsive"===ut(e),Dt=e=>{const t=e.options,o=t.get("table_default_styles");return t.isSet("table_default_styles")?o:((e,t)=>_t(e)||!St(e)?t:Ot(e)?{...t,width:mt(e)}:{...t,width:it})(e,o)},Nt=e=>{const t=e.options,o=t.get("table_default_attributes");return t.isSet("table_default_attributes")?o:((e,t)=>_t(e)||St(e)?t:Ot(e)?{...t,width:mt(e)}:{...t,width:it})(e,o)},It=(e,t)=>t.column>=e.startCol&&t.column+t.colspan-1<=e.finishCol&&t.row>=e.startRow&&t.row+t.rowspan-1<=e.finishRow,Mt=(e,t,o)=>((e,t,o)=>{const l=Ye(e,t,z),n=Ye(e,o,z);return l.bind((e=>n.map((t=>{return o=e,l=t,{startRow:Math.min(o.row,l.row),startCol:Math.min(o.column,l.column),finishRow:Math.max(o.row+o.rowspan-1,l.row+l.rowspan-1),finishCol:Math.max(o.column+o.colspan-1,l.column+l.colspan-1)};var o,l}))))})(e,t,o).bind((t=>((e,t)=>{let o=!0;const l=b(It,t);for(let n=t.startRow;n<=t.finishRow;n++)for(let r=t.startCol;r<=t.finishCol;r++)o=o&&Xe(e,n,r).exists(l);return o?y.some(t):y.none()})(e,t))),Pt=Qe,kt=(e,t)=>{oe(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},Et=(e,t)=>{le(e).fold((()=>{oe(e).each((e=>{Bt(e,t)}))}),(e=>{kt(e,t)}))},Bt=(e,t)=>{e.dom.appendChild(t.dom)},Ft=(e,t)=>{P(t,((o,l)=>{const n=0===l?e:t[l-1];Et(n,o)}))},qt=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Lt=((e,t)=>{const o=t=>e(t)?y.from(t.dom.nodeValue):y.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(X);var Ht=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"];const jt=(e,t,o,l)=>{const n=t(e,o);return r=(o,l)=>{const n=t(e,l);return Vt(e,o,n)},a=n,((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(l,((e,t)=>{a=r(a,e)})),a;var r,a},Vt=(e,t,o)=>t.bind((t=>o.filter(b(e.eq,t)))),$t={up:d({selector:me,closest:pe,predicate:ie,all:(e,t)=>{const o=c(t)?t:h;let l=e.dom;const n=[];for(;null!==l.parentNode&&void 0!==l.parentNode;){const e=l.parentNode,t=V.fromDom(e);if(n.push(t),!0===o(t))break;l=e}return n}}),down:d({selector:Ce,predicate:we}),styles:d({get:ke,getRaw:Be,set:(e,t,o)=>{((e,t,o)=>{if(!l(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);Pe(e)&&e.style.setProperty(t,o)})(e.dom,t,o)},remove:(e,t)=>{((e,t)=>{Pe(e)&&e.style.removeProperty(t)})(e.dom,t),Re(xe(e,"style").map(De),"")&&Ae(e,"style")}}),attrs:d({get:Te,set:(e,t,o)=>{ve(e.dom,t,o)},remove:Ae,copyTo:(e,t)=>{((e,t)=>{const o=e.dom;C(t,((e,t)=>{ve(o,t,e)}))})(t,E(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}))}}),insert:d({before:kt,after:Et,afterAll:Ft,append:Bt,appendAll:(e,t)=>{P(t,(t=>{Bt(e,t)}))},prepend:(e,t)=>{(e=>((e,t)=>{const o=e.dom.childNodes;return y.from(o[0]).map(V.fromDom)})(e))(e).fold((()=>{Bt(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},wrap:(e,t)=>{kt(e,t),Bt(t,e)}}),remove:d({unwrap:e=>{const t=ne(e);t.length>0&&Ft(e,t),qt(e)},remove:qt}),create:d({nu:V.fromTag,clone:e=>V.fromDom(e.dom.cloneNode(!1)),text:V.fromText}),query:d({comparePosition:(e,t)=>e.dom.compareDocumentPosition(t.dom),prevSibling:e=>y.from(e.dom.previousSibling).map(V.fromDom),nextSibling:le}),property:d({children:ne,name:G,parent:oe,document:e=>te(e).dom,isText:X,isComment:e=>8===K(e)||"#comment"===G(e),isElement:Q,isSpecial:e=>{const t=G(e);return D(["script","noscript","iframe","noframes","noembed","title","style","textarea","xmp"],t)},getLanguage:e=>Q(e)?xe(e,"lang"):y.none(),getText:e=>Lt.get(e),setText:(e,t)=>Lt.set(e,t),isBoundary:e=>!!Q(e)&&("body"===G(e)||D(Ht,G(e))),isEmptyTag:e=>!!Q(e)&&D(["br","img","hr","input"],G(e)),isNonEditable:e=>Q(e)&&"false"===Te(e,"contenteditable")}),eq:z,is:U},Wt=e=>me(e,"table"),zt=(e,t,o)=>ue(e,t).bind((t=>ue(e,o).bind((e=>{return(o=Wt,l=[t,e],((e,t,o)=>o.length>0?((e,t,o,l)=>l(e,t,o[0],o.slice(1)))(e,t,o,jt):y.none())($t,((e,t)=>o(t)),l)).map((o=>({first:t,last:e,table:o})));var o,l})))),Ut=e=>M(e,V.fromDom),Gt="data-mce-selected",Kt="data-mce-first-selected",Jt="data-mce-last-selected",Qt={selected:Gt,selectedSelector:"td["+Gt+"],th["+Gt+"]",firstSelected:Kt,firstSelectedSelector:"td["+Kt+"],th["+Kt+"]",lastSelected:Jt,lastSelectedSelector:"td["+Jt+"],th["+Jt+"]"},Xt=e=>(t,o)=>{const l=G(t),n="col"===l||"colgroup"===l?$e(r=t).bind((e=>((e,t)=>((e,t)=>{const o=Ce(e,t);return o.length>0?y.some(o):y.none()})(e,t))(e,Qt.firstSelectedSelector))).fold(d(r),(e=>e[0])):t;var r;return pe(n,e,o)},Yt=Xt("th,td,caption"),Zt=Xt("th,td"),eo=e=>Ut(e.model.table.getSelectedCells()),to=(e,t)=>{const o=Zt(e),l=o.bind((e=>$e(e))).map((e=>We(e)));return Oe(o,l,((e,o)=>k(o,(o=>N(Ut(o.dom.cells),(o=>"1"===Te(o,t)||z(o,e))))))).getOr([])},oo=[{text:"None",value:""},{text:"Top",value:"top"},{text:"Middle",value:"middle"},{text:"Bottom",value:"bottom"}],lo=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,no=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,ro=e=>{return(t=e,"#",_e(t,"#")?((e,t)=>e.substring(1))(t):t).toUpperCase();var t},ao=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},so=e=>{return t=ao(e.red)+ao(e.green)+ao(e.blue),{value:ro(t)};var t},co=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,io=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,mo=(e,t,o,l)=>({red:e,green:t,blue:o,alpha:l}),uo=(e,t,o,l)=>{const n=parseInt(e,10),r=parseInt(t,10),a=parseInt(o,10),s=parseFloat(l);return mo(n,r,a,s)},po=e=>{if("transparent"===e)return y.some(mo(0,0,0,0));const t=co.exec(e);if(null!==t)return y.some(uo(t[1],t[2],t[3],"1"));const o=io.exec(e);return null!==o?y.some(uo(o[1],o[2],o[3],o[4])):y.none()},bo=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},go=(e,t,o)=>l=>{const n=(e=>{const t=bo(y.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(y.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(y.some(e))}}})((e=>e.unbind())),r=!Ie(o),a=()=>{const a=eo(e),s=l=>e.formatter.match(t,{value:o},l.dom,r);r?(l.setActive(!N(a,s)),n.set(e.formatter.formatChanged(t,(e=>l.setActive(!e)),!0))):(l.setActive(q(a,s)),n.set(e.formatter.formatChanged(t,l.setActive,!1,{value:o})))};return e.initialized?a():e.on("init",a),n.clear},ho=e=>R(e,"menu"),fo=e=>M(e,(e=>{const t=e.text||e.title||"";return ho(e)?{text:t,items:fo(e.menu)}:{text:t,value:e.value}})),yo=(e,t,o,l)=>M(t,(t=>{const n=t.text||t.title;return ho(t)?{type:"nestedmenuitem",text:n,getSubmenuItems:()=>yo(e,t.menu,o,l)}:{text:n,type:"togglemenuitem",onAction:()=>l(t.value),onSetup:go(e,o,t.value)}})),wo=(e,t)=>o=>{e.execCommand("mceTableApplyCellStyle",!1,{[t]:o})},So=e=>F(e,(e=>ho(e)?[{...e,menu:So(e.menu)}]:Ie(e.value)?[e]:[])),Co=(e,t,o,l)=>n=>n(yo(e,t,o,l)),vo=(e,t,o)=>{const l=M(t,(e=>{return{text:e.title,value:"#"+(o=e.value,(t=o,(e=>lo.test(e)||no.test(e))(t)?y.some({value:ro(t)}):y.none()).orThunk((()=>po(o).map(so))).getOrThunk((()=>{const e=document.createElement("canvas");e.height=1,e.width=1;const t=e.getContext("2d");t.clearRect(0,0,e.width,e.height),t.fillStyle="#FFFFFF",t.fillStyle=o,t.fillRect(0,0,1,1);const l=t.getImageData(0,0,1,1).data,n=l[0],r=l[1],a=l[2],s=l[3];return so(mo(n,r,a,s))}))).value,type:"choiceitem"};var t,o}));return[{type:"fancymenuitem",fancytype:"colorswatch",initData:{colors:l.length>0?l:void 0,allowCustomColors:!1},onAction:t=>{const l="remove"===t.value?"":t.value;e.execCommand("mceTableApplyCellStyle",!1,{[o]:l})}}]},To=e=>()=>{const t="header"===e.queryCommandValue("mceTableRowType")?"body":"header";e.execCommand("mceTableRowType",!1,{type:t})},xo=e=>()=>{const t="th"===e.queryCommandValue("mceTableColType")?"td":"th";e.execCommand("mceTableColType",!1,{type:t})},Ao=[{name:"width",type:"input",label:"Width"},{name:"height",type:"input",label:"Height"},{name:"celltype",type:"listbox",label:"Cell type",items:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{name:"scope",type:"listbox",label:"Scope",items:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{name:"halign",type:"listbox",label:"Horizontal align",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{name:"valign",type:"listbox",label:"Vertical align",items:oo}],Ro=e=>Ao.concat((e=>{const t=fo(Ct(e));return t.length>0?y.some({name:"class",type:"listbox",label:"Class",items:t}):y.none()})(e).toArray()),Oo=(e,t)=>{const o=[{name:"borderstyle",type:"listbox",label:"Border style",items:[{text:"Select...",value:""}].concat(fo(bt(e)))},{name:"bordercolor",type:"colorinput",label:"Border color"},{name:"backgroundcolor",type:"colorinput",label:"Background color"}];return{title:"Advanced",name:"advanced",items:"cell"===t?[{name:"borderwidth",type:"input",label:"Border width"}].concat(o):o}},_o=(e,t)=>{const o=e.dom;return{setAttrib:(e,l)=>{o.setAttrib(t,e,l)},setStyle:(e,l)=>{o.setStyle(t,e,l)},setFormat:(o,l)=>{""===l?e.formatter.remove(o,{value:null},t,!0):e.formatter.apply(o,{value:l},t)}}},Do=ee("th"),No=(e,t)=>e&&t?"sectionCells":e?"section":"cells",Io=e=>{const t=M(e,(e=>(e=>{const t="thead"===e.section,o=Re((e=>{const t=k(e,(e=>Do(e.element)));return 0===t.length?y.some("td"):t.length===e.length?y.some("th"):y.none()})(e.cells),"th");return"tfoot"===e.section?{type:"footer"}:t||o?{type:"header",subType:No(t,o)}:{type:"body"}})(e).type)),o=D(t,"header"),l=D(t,"footer");if(o||l){const e=D(t,"body");return!o||e||l?o||e||!l?y.none():y.some("footer"):y.some("header")}return y.some("body")},Mo=(e,t)=>H(e.all,(e=>B(e.cells,(e=>z(t,e.element))))),Po=(e,t,o)=>{const l=(e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t})(M(t.selection,(t=>{return(l=t,((e,t,o=h)=>o(t)?y.none():D(e,G(t))?y.some(t):me(t,e.join(","),(e=>$(e,"table")||o(e))))(["td","th"],l,n)).bind((t=>Mo(e,t))).filter(o);var l,n})));return n=l,l.length>0?y.some(n):y.none();var n},ko=(e,t)=>Po(e,t,f),Eo=(e,t)=>q(t,(t=>((e,t)=>Mo(e,t).exists((e=>!e.isLocked)))(e,t))),Bo=(e,t)=>((e,t)=>t.mergable)(0,t).filter((t=>Eo(e,t.cells))),Fo=(e,t)=>((e,t)=>t.unmergable)(0,t).filter((t=>Eo(e,t))),qo=((e=>{if(!n(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};P(e,((l,r)=>{const a=w(l);if(1!==a.length)throw new Error("one and only one name per case");const s=a[0],c=l[s];if(void 0!==o[s])throw new Error("duplicate key detected:"+s);if("cata"===s)throw new Error("cannot have a case named cata (sorry)");if(!n(c))throw new Error("case arguments must be an array");t.push(s),o[s]=(...o)=>{const l=o.length;if(l!==c.length)throw new Error("Wrong number of arguments to case "+s+". Expected "+c.length+" ("+c+"), got "+l);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,o)},match:e=>{const l=w(e);if(t.length!==l.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+l.join(","));if(!q(t,(e=>D(l,e))))throw new Error("Not all branches were specified when using match. Specified: "+l.join(", ")+"\nRequired: "+t.join(", "));return e[s].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:s,params:o})}}}}))})([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}]),(e,t)=>{const o=Qe(e);return ko(o,t).bind((e=>{const t=e[e.length-1],l=e[0].row,n=t.row+t.rowspan,r=o.all.slice(l,n);return Io(r)})).getOr("")}),Lo=e=>{return _e(e,"rgb")?po(t=e).map(so).map((e=>"#"+e.value)).getOr(t):e;var t},Ho=e=>{const t=V.fromDom(e);return{borderwidth:Be(t,"border-width").getOr(""),borderstyle:Be(t,"border-style").getOr(""),bordercolor:Be(t,"border-color").map(Lo).getOr(""),backgroundcolor:Be(t,"background-color").map(Lo).getOr("")}},jo=e=>{const t=e[0],o=e.slice(1);return P(o,(e=>{P(w(t),(o=>{C(e,((e,l)=>{const n=t[o];""!==n&&o===l&&n!==e&&(t[o]="")}))}))})),t},Vo=(e,t,o,l)=>B(e,(e=>!a(o.formatter.matchNode(l,t+e)))).getOr(""),$o=b(Vo,["left","center","right"],"align"),Wo=b(Vo,["top","middle","bottom"],"valign"),zo=e=>$e(V.fromDom(e)).map((t=>{const o={selection:Ut(e.cells)};return qo(t,o)})).getOr(""),Uo=(e,t)=>{const o=Qe(e),l=(e=>F(e.all,(e=>e.cells)))(o),n=k(l,(e=>N(t,(t=>z(e.element,t)))));return M(n,(e=>({element:e.element.dom,column:Ze(o,e.column).map((e=>e.element.dom))})))},Go=(e,t,o,l)=>{const n=l.getData();l.close(),e.undoManager.transact((()=>{((e,t,o,l)=>{const n=v(l,((e,t)=>o[t]!==e));T(n)>0&&t.length>=1&&$e(t[0]).each((o=>{const r=Uo(o,t),a=T(v(n,((e,t)=>"scope"!==t&&"celltype"!==t)))>0,s=A(n,"celltype");(a||A(n,"scope"))&&((e,t,o,l)=>{const n=1===t.length;P(t,(t=>{const r=t.element,a=n?f:l,s=_o(e,r);((e,t,o,l)=>{l("scope")&&e.setAttrib("scope",o.scope),l("class")&&e.setAttrib("class",o.class),l("height")&&e.setStyle("height",fe(o.height)),l("width")&&t.setStyle("width",fe(o.width))})(s,t.column.map((t=>_o(e,t))).getOr(s),o,a),gt(e)&&((e,t,o)=>{o("backgroundcolor")&&e.setFormat("tablecellbackgroundcolor",t.backgroundcolor),o("bordercolor")&&e.setFormat("tablecellbordercolor",t.bordercolor),o("borderstyle")&&e.setFormat("tablecellborderstyle",t.borderstyle),o("borderwidth")&&e.setFormat("tablecellborderwidth",fe(t.borderwidth))})(s,o,a),l("halign")&&ot(e,r,o.halign),l("valign")&&((e,t,o)=>{et.each("top middle bottom".split(" "),(l=>{l!==o&&e.formatter.remove("valign"+l,{},t)})),o&&e.formatter.apply("valign"+o,{},t)})(e,r,o.valign)}))})(e,r,l,b(A,n)),s&&((e,t)=>{e.execCommand("mceTableCellType",!1,{type:t.celltype,no_events:!0})})(e,l),lt(e,o.dom,{structure:s,style:a})}))})(e,t,o,n),e.focus()}))},Ko=e=>{const t=eo(e);if(0===t.length)return;const o=((e,t)=>{const o=$e(t[0]).map((o=>M(Uo(o,t),(t=>((e,t,o,l)=>{const n=e.dom,r=(e,t)=>n.getStyle(e,t)||n.getAttrib(e,t);return{width:r(l.getOr(t),"width"),height:r(t,"height"),scope:n.getAttrib(t,"scope"),celltype:(a=t,a.nodeName.toLowerCase()),class:n.getAttrib(t,"class",""),halign:$o(e,t),valign:Wo(e,t),...o?Ho(t):{}};var a})(e,t.element,gt(e),t.column)))));return jo(o.getOrDie())})(e,t),l={type:"tabpanel",tabs:[{title:"General",name:"general",items:Ro(e)},Oo(e,"cell")]},n={type:"panel",items:[{type:"grid",columns:2,items:Ro(e)}]};e.windowManager.open({title:"Cell Properties",size:"normal",body:gt(e)?l:n,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:o,onSubmit:b(Go,e,t,o)})},Jo=[{type:"listbox",name:"type",label:"Row type",items:[{text:"Header",value:"header"},{text:"Body",value:"body"},{text:"Footer",value:"footer"}]},{type:"listbox",name:"align",label:"Alignment",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height",type:"input"}],Qo=e=>Jo.concat((e=>{const t=fo(vt(e));return t.length>0?y.some({name:"class",type:"listbox",label:"Class",items:t}):y.none()})(e).toArray()),Xo=(e,t,o,l)=>{const n=l.getData();l.close(),e.undoManager.transact((()=>{((e,t,o,l)=>{const n=v(l,((e,t)=>o[t]!==e));if(T(n)>0){const o=A(n,"type"),r=!o||T(n)>1;r&&((e,t,o,l)=>{const n=1===t.length?f:l;P(t,(t=>{const r=_o(e,t);((e,t,o)=>{o("class")&&e.setAttrib("class",t.class),o("height")&&e.setStyle("height",fe(t.height))})(r,o,n),ht(e)&&((e,t,o)=>{o("backgroundcolor")&&e.setStyle("background-color",t.backgroundcolor),o("bordercolor")&&e.setStyle("border-color",t.bordercolor),o("borderstyle")&&e.setStyle("border-style",t.borderstyle)})(r,o,n),l("align")&&ot(e,t,o.align)}))})(e,t,l,b(A,n)),o&&((e,t)=>{e.execCommand("mceTableRowType",!1,{type:t.type,no_events:!0})})(e,l),$e(V.fromDom(t[0])).each((t=>lt(e,t.dom,{structure:o,style:r})))}})(e,t,o,n),e.focus()}))},Yo=e=>{const t=to(ye(e),Qt.selected);if(0===t.length)return;const o=M(t,(t=>((e,t,o)=>{const l=e.dom;return{height:l.getStyle(t,"height")||l.getAttrib(t,"height"),class:l.getAttrib(t,"class",""),type:zo(t),align:$o(e,t),...o?Ho(t):{}}})(e,t.dom,ht(e)))),l=jo(o),n={type:"tabpanel",tabs:[{title:"General",name:"general",items:Qo(e)},Oo(e,"row")]},r={type:"panel",items:[{type:"grid",columns:2,items:Qo(e)}]};e.windowManager.open({title:"Row Properties",size:"normal",body:ht(e)?n:r,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:l,onSubmit:b(Xo,e,M(t,(e=>e.dom)),l)})},Zo=(e,t,o)=>{const l=o?[{type:"input",name:"cols",label:"Cols",inputMode:"numeric"},{type:"input",name:"rows",label:"Rows",inputMode:"numeric"}]:[],n=yt(e)?[{type:"input",name:"cellspacing",label:"Cell spacing",inputMode:"numeric"},{type:"input",name:"cellpadding",label:"Cell padding",inputMode:"numeric"},{type:"input",name:"border",label:"Border width"},{type:"label",label:"Caption",items:[{type:"checkbox",name:"caption",label:"Show caption"}]}]:[],r=t.length>0?[{type:"listbox",name:"class",label:"Class",items:t}]:[];return l.concat([{type:"input",name:"width",label:"Width"},{type:"input",name:"height",label:"Height"}]).concat(n).concat([{type:"listbox",name:"align",label:"Alignment",items:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]).concat(r)},el=(e,t,o,n)=>{if("TD"===t.tagName||"TH"===t.tagName)l(o)&&s(n)?e.setStyle(t,o,n):e.setStyles(t,o);else if(t.children)for(let l=0;l<t.children.length;l++)el(e,t.children[l],o,n)},tl=(e,t,o,l)=>{const n=e.dom,r=l.getData(),s=v(r,((e,t)=>o[t]!==e));l.close(),""===r.class&&delete r.class,e.undoManager.transact((()=>{if(!t){const o=Me(r.cols).getOr(1),l=Me(r.rows).getOr(1);e.execCommand("mceInsertTable",!1,{rows:l,columns:o}),t=Zt(ye(e),he(e)).bind((t=>$e(t,he(e)))).map((e=>e.dom)).getOrDie()}if(T(s)>0){const o={border:A(s,"border"),bordercolor:A(s,"bordercolor"),cellpadding:A(s,"cellpadding")};((e,t,o,l)=>{const n=e.dom,r={},s={},c=St(e),i=ft(e);if(a(o.class)||(r.class=o.class),s.height=fe(o.height),c?s.width=fe(o.width):n.getAttrib(t,"width")&&(r.width=(e=>e?e.replace(/px$/,""):"")(o.width)),c?(s["border-width"]=fe(o.border),s["border-spacing"]=fe(o.cellspacing)):(r.border=o.border,r.cellpadding=o.cellpadding,r.cellspacing=o.cellspacing),c&&t.children){const e={};if(l.border&&(e["border-width"]=fe(o.border)),l.cellpadding&&(e.padding=fe(o.cellpadding)),i&&l.bordercolor&&(e["border-color"]=o.bordercolor),!(e=>{for(const t in e)if(S.call(e,t))return!1;return!0})(e))for(let o=0;o<t.children.length;o++)el(n,t.children[o],e)}if(i){const e=o;s["background-color"]=e.backgroundcolor,s["border-color"]=e.bordercolor,s["border-style"]=e.borderstyle}n.setStyles(t,{...Dt(e),...s}),n.setAttribs(t,{...Nt(e),...r})})(e,t,r,o);const l=n.select("caption",t)[0];(l&&!r.caption||!l&&r.caption)&&e.execCommand("mceTableToggleCaption"),ot(e,t,r.align)}if(e.focus(),e.addVisual(),T(s)>0){const o=A(s,"caption"),l=!o||T(s)>1;lt(e,t,{structure:o,style:l})}}))},ol=(e,t)=>{const o=e.dom;let l,n=((e,t)=>{const o=Dt(e),l=Nt(e),n=t?{borderstyle:x(o,"border-style").getOr(""),bordercolor:Lo(x(o,"border-color").getOr("")),backgroundcolor:Lo(x(o,"background-color").getOr(""))}:{};return{height:"",width:"100%",cellspacing:"",cellpadding:"",caption:!1,class:"",align:"",border:"",...o,...l,...n,...(()=>{const t=o["border-width"];return St(e)&&t?{border:t}:x(l,"border").fold((()=>({})),(e=>({border:e})))})(),...{...x(o,"border-spacing").or(x(l,"cellspacing")).fold((()=>({})),(e=>({cellspacing:e}))),...x(o,"border-padding").or(x(l,"cellpadding")).fold((()=>({})),(e=>({cellpadding:e})))}}})(e,ft(e));t?(n.cols="1",n.rows="1",ft(e)&&(n.borderstyle="",n.bordercolor="",n.backgroundcolor="")):(l=o.getParent(e.selection.getStart(),"table",e.getBody()),l?n=((e,t,o)=>{const l=e.dom,n=St(e)?l.getStyle(t,"border-spacing")||l.getAttrib(t,"cellspacing"):l.getAttrib(t,"cellspacing")||l.getStyle(t,"border-spacing"),r=St(e)?tt(l,t,"padding")||l.getAttrib(t,"cellpadding"):l.getAttrib(t,"cellpadding")||tt(l,t,"padding");return{width:l.getStyle(t,"width")||l.getAttrib(t,"width"),height:l.getStyle(t,"height")||l.getAttrib(t,"height"),cellspacing:null!=n?n:"",cellpadding:null!=r?r:"",border:((t,o)=>{const l=Be(V.fromDom(o),"border-width");return St(e)&&l.isSome()?l.getOr(""):t.getAttrib(o,"border")||tt(e.dom,o,"border-width")||tt(e.dom,o,"border")||""})(l,t),caption:!!l.select("caption",t)[0],class:l.getAttrib(t,"class",""),align:$o(e,t),...o?Ho(t):{}}})(e,l,ft(e)):ft(e)&&(n.borderstyle="",n.bordercolor="",n.backgroundcolor=""));const r=fo(Tt(e));r.length>0&&n.class&&(n.class=n.class.replace(/\s*mce\-item\-table\s*/g,""));const a={type:"grid",columns:2,items:Zo(e,r,t)},s=ft(e)?{type:"tabpanel",tabs:[{title:"General",name:"general",items:[a]},Oo(e,"table")]}:{type:"panel",items:[a]};e.windowManager.open({title:"Table Properties",size:"normal",body:s,onSubmit:b(tl,e,l,n),buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:n})},ll=e=>{C({mceTableProps:b(ol,e,!1),mceTableRowProps:b(Yo,e),mceTableCellProps:b(Ko,e),mceInsertTableDialog:b(ol,e,!0)},((t,o)=>e.addCommand(o,(()=>{return o=t,void((e=>{return(t=e,o=ee("table"),ce(((e,t)=>t(e)),ie,t,o,void 0)).forall(be);var t,o})(ye(e))&&o());var o}))))},nl=u,rl=e=>{const t=(e,t)=>xe(e,t).exists((e=>parseInt(e,10)>1));return e.length>0&&q(e,(e=>t(e,"rowspan")||t(e,"colspan")))?y.some(e):y.none()},al=(e,t,o)=>{return t.length<=1?y.none():(l=e,n=o.firstSelectedSelector,r=o.lastSelectedSelector,zt(l,n,r).bind((e=>{const t=e=>z(l,e),o="thead,tfoot,tbody,table",n=me(e.first,o,t),r=me(e.last,o,t);return n.bind((t=>r.bind((o=>z(t,o)?((e,t,o)=>{const l=Pt(e);return Mt(l,t,o)})(e.table,e.first,e.last):y.none()))))}))).map((e=>({bounds:e,cells:t})));var l,n,r},sl=e=>{const t=bo(y.none()),o=bo([]);let l=y.none();const n=ee("caption"),r=e=>l.forall((t=>!t[e])),a=()=>Yt(ye(e),he(e)).bind((t=>{return o=Oe($e(t),Yt((e=>V.fromDom(e.selection.getEnd()))(e),he(e)).bind($e),((o,l)=>z(o,l)?n(t)?y.some((e=>({element:e,mergable:y.none(),unmergable:y.none(),selection:[e]}))(t)):y.some(((e,t,o)=>({element:o,mergable:al(t,e,Qt),unmergable:rl(e),selection:nl(e)}))(eo(e),o,t)):y.none())),o.bind(u);var o})),s=e=>$e(e.element).map((t=>{const o=Qe(t),l=ko(o,e).getOr([]),n=E(l,((e,t)=>(t.isLocked&&(e.onAny=!0,0===t.column?e.onFirst=!0:t.column+t.colspan>=o.grid.columns&&(e.onLast=!0)),e)),{onAny:!1,onFirst:!1,onLast:!1});return{mergeable:Bo(o,e).isSome(),unmergeable:Fo(o,e).isSome(),locked:n}})),c=()=>{t.set((e=>{let t,o=!1;return(...l)=>(o||(o=!0,t=e.apply(null,l)),t)})(a)()),l=t.get().bind(s),P(o.get(),g)},i=e=>(e(),o.set(o.get().concat([e])),()=>{o.set(k(o.get(),(t=>t!==e)))}),m=(o,l)=>i((()=>t.get().fold((()=>{o.setEnabled(!1)}),(t=>{o.setEnabled(!l(t)&&e.selection.isEditable())})))),d=(o,l,n)=>i((()=>t.get().fold((()=>{o.setEnabled(!1),o.setActive(!1)}),(t=>{o.setEnabled(!l(t)&&e.selection.isEditable()),o.setActive(n(t))})))),p=e=>l.exists((t=>t.locked[e])),b=(t,o)=>l=>d(l,(e=>n(e.element)),(()=>e.queryCommandValue(t)===o)),f=b("mceTableRowType","header"),w=b("mceTableColType","th");return e.on("NodeChange ExecCommand TableSelectorChange",c),{onSetupTable:e=>m(e,(e=>!1)),onSetupCellOrRow:e=>m(e,(e=>n(e.element))),onSetupColumn:e=>t=>m(t,(t=>n(t.element)||p(e))),onSetupPasteable:e=>t=>m(t,(t=>n(t.element)||e().isNone())),onSetupPasteableColumn:(e,t)=>o=>m(o,(o=>n(o.element)||e().isNone()||p(t))),onSetupMergeable:e=>m(e,(e=>r("mergeable"))),onSetupUnmergeable:e=>m(e,(e=>r("unmergeable"))),resetTargets:c,onSetupTableWithCaption:t=>d(t,h,(t=>$e(t.element,he(e)).exists((e=>de(e,"caption").isSome())))),onSetupTableRowHeaders:f,onSetupTableColumnHeaders:w,targets:t.get}};var cl=tinymce.util.Tools.resolve("tinymce.FakeClipboard");const il="x-tinymce/dom-table-",ml=il+"rows",dl=il+"columns",ul=e=>{var t;const o=null!==(t=cl.read())&&void 0!==t?t:[];return H(o,(t=>y.from(t.getType(e))))},pl=()=>ul(ml),bl=()=>ul(dl),gl=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}},hl=e=>t=>{const o=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",o),o(),()=>{e.off("NodeChange",o)}};e.add("table",(e=>{const t=sl(e);(e=>{const t=e.options.register;t("table_border_widths",{processor:"object[]",default:st}),t("table_border_styles",{processor:"object[]",default:ct}),t("table_cell_advtab",{processor:"boolean",default:!0}),t("table_row_advtab",{processor:"boolean",default:!0}),t("table_advtab",{processor:"boolean",default:!0}),t("table_appearance_options",{processor:"boolean",default:!0}),t("table_grid",{processor:"boolean",default:!at.deviceType.isTouch()}),t("table_cell_class_list",{processor:"object[]",default:[]}),t("table_row_class_list",{processor:"object[]",default:[]}),t("table_class_list",{processor:"object[]",default:[]}),t("table_toolbar",{processor:"string",default:"tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol"}),t("table_background_color_map",{processor:"object[]",default:[]}),t("table_border_color_map",{processor:"object[]",default:[]})})(e),ll(e),((e,t)=>{const o=t=>()=>e.execCommand(t),l=(t,l)=>!!e.queryCommandSupported(l.command)&&(e.ui.registry.addMenuItem(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)}),!0),n=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addToggleMenuItem(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})},r=t=>{e.execCommand("mceInsertTable",!1,{rows:t.numRows,columns:t.numColumns})},a=[l("tableinsertrowbefore",{text:"Insert row before",icon:"table-insert-row-above",command:"mceTableInsertRowBefore",onSetup:t.onSetupCellOrRow}),l("tableinsertrowafter",{text:"Insert row after",icon:"table-insert-row-after",command:"mceTableInsertRowAfter",onSetup:t.onSetupCellOrRow}),l("tabledeleterow",{text:"Delete row",icon:"table-delete-row",command:"mceTableDeleteRow",onSetup:t.onSetupCellOrRow}),l("tablerowprops",{text:"Row properties",icon:"table-row-properties",command:"mceTableRowProps",onSetup:t.onSetupCellOrRow}),l("tablecutrow",{text:"Cut row",icon:"cut-row",command:"mceTableCutRow",onSetup:t.onSetupCellOrRow}),l("tablecopyrow",{text:"Copy row",icon:"duplicate-row",command:"mceTableCopyRow",onSetup:t.onSetupCellOrRow}),l("tablepasterowbefore",{text:"Paste row before",icon:"paste-row-before",command:"mceTablePasteRowBefore",onSetup:t.onSetupPasteable(pl)}),l("tablepasterowafter",{text:"Paste row after",icon:"paste-row-after",command:"mceTablePasteRowAfter",onSetup:t.onSetupPasteable(pl)})],s=[l("tableinsertcolumnbefore",{text:"Insert column before",icon:"table-insert-column-before",command:"mceTableInsertColBefore",onSetup:t.onSetupColumn("onFirst")}),l("tableinsertcolumnafter",{text:"Insert column after",icon:"table-insert-column-after",command:"mceTableInsertColAfter",onSetup:t.onSetupColumn("onLast")}),l("tabledeletecolumn",{text:"Delete column",icon:"table-delete-column",command:"mceTableDeleteCol",onSetup:t.onSetupColumn("onAny")}),l("tablecutcolumn",{text:"Cut column",icon:"cut-column",command:"mceTableCutCol",onSetup:t.onSetupColumn("onAny")}),l("tablecopycolumn",{text:"Copy column",icon:"duplicate-column",command:"mceTableCopyCol",onSetup:t.onSetupColumn("onAny")}),l("tablepastecolumnbefore",{text:"Paste column before",icon:"paste-column-before",command:"mceTablePasteColBefore",onSetup:t.onSetupPasteableColumn(bl,"onFirst")}),l("tablepastecolumnafter",{text:"Paste column after",icon:"paste-column-after",command:"mceTablePasteColAfter",onSetup:t.onSetupPasteableColumn(bl,"onLast")})],i=[l("tablecellprops",{text:"Cell properties",icon:"table-cell-properties",command:"mceTableCellProps",onSetup:t.onSetupCellOrRow}),l("tablemergecells",{text:"Merge cells",icon:"table-merge-cells",command:"mceTableMergeCells",onSetup:t.onSetupMergeable}),l("tablesplitcells",{text:"Split cell",icon:"table-split-cells",command:"mceTableSplitCells",onSetup:t.onSetupUnmergeable})];wt(e)?e.ui.registry.addNestedMenuItem("inserttable",{text:"Table",icon:"table",getSubmenuItems:()=>[{type:"fancymenuitem",fancytype:"inserttable",onAction:r}],onSetup:hl(e)}):e.ui.registry.addMenuItem("inserttable",{text:"Table",icon:"table",onAction:o("mceInsertTableDialog"),onSetup:hl(e)}),e.ui.registry.addMenuItem("inserttabledialog",{text:"Insert table",icon:"table",onAction:o("mceInsertTableDialog"),onSetup:hl(e)}),l("tableprops",{text:"Table properties",onSetup:t.onSetupTable,command:"mceTableProps"}),l("deletetable",{text:"Delete table",icon:"table-delete-table",onSetup:t.onSetupTable,command:"mceTableDelete"}),D(a,!0)&&e.ui.registry.addNestedMenuItem("row",{type:"nestedmenuitem",text:"Row",getSubmenuItems:d("tableinsertrowbefore tableinsertrowafter tabledeleterow tablerowprops | tablecutrow tablecopyrow tablepasterowbefore tablepasterowafter")}),D(s,!0)&&e.ui.registry.addNestedMenuItem("column",{type:"nestedmenuitem",text:"Column",getSubmenuItems:d("tableinsertcolumnbefore tableinsertcolumnafter tabledeletecolumn | tablecutcolumn tablecopycolumn tablepastecolumnbefore tablepastecolumnafter")}),D(i,!0)&&e.ui.registry.addNestedMenuItem("cell",{type:"nestedmenuitem",text:"Cell",getSubmenuItems:d("tablecellprops tablemergecells tablesplitcells")}),e.ui.registry.addContextMenu("table",{update:()=>(t.resetTargets(),t.targets().fold(d(""),(e=>"caption"===G(e.element)?"tableprops deletetable":"cell row column | advtablesort | tableprops deletetable")))});const m=So(Tt(e));0!==m.length&&e.queryCommandSupported("mceTableToggleClass")&&e.ui.registry.addNestedMenuItem("tableclass",{icon:"table-classes",text:"Table styles",getSubmenuItems:()=>yo(e,m,"tableclass",(t=>e.execCommand("mceTableToggleClass",!1,t))),onSetup:t.onSetupTable});const u=So(Ct(e));0!==u.length&&e.queryCommandSupported("mceTableCellToggleClass")&&e.ui.registry.addNestedMenuItem("tablecellclass",{icon:"table-cell-classes",text:"Cell styles",getSubmenuItems:()=>yo(e,u,"tablecellclass",(t=>e.execCommand("mceTableCellToggleClass",!1,t))),onSetup:t.onSetupCellOrRow}),e.queryCommandSupported("mceTableApplyCellStyle")&&(e.ui.registry.addNestedMenuItem("tablecellvalign",{icon:"vertical-align",text:"Vertical align",getSubmenuItems:()=>yo(e,oo,"tablecellverticalalign",wo(e,"vertical-align")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellborderwidth",{icon:"border-width",text:"Border width",getSubmenuItems:()=>yo(e,pt(e),"tablecellborderwidth",wo(e,"border-width")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellborderstyle",{icon:"border-style",text:"Border style",getSubmenuItems:()=>yo(e,bt(e),"tablecellborderstyle",wo(e,"border-style")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellbackgroundcolor",{icon:"cell-background-color",text:"Background color",getSubmenuItems:()=>vo(e,At(e),"background-color"),onSetup:t.onSetupCellOrRow}),e.ui.registry.addNestedMenuItem("tablecellbordercolor",{icon:"cell-border-color",text:"Border color",getSubmenuItems:()=>vo(e,Rt(e),"border-color"),onSetup:t.onSetupCellOrRow})),n("tablecaption",{icon:"table-caption",text:"Table caption",command:"mceTableToggleCaption",onSetup:t.onSetupTableWithCaption}),n("tablerowheader",{text:"Row header",icon:"table-top-header",command:"mceTableRowType",onAction:To(e),onSetup:t.onSetupTableRowHeaders}),n("tablecolheader",{text:"Column header",icon:"table-left-header",command:"mceTableColType",onAction:xo(e),onSetup:t.onSetupTableRowHeaders})})(e,t),((e,t)=>{e.ui.registry.addMenuButton("table",{tooltip:"Table",icon:"table",onSetup:gl(e),fetch:e=>e("inserttable | cell row column | advtablesort | tableprops deletetable")});const o=t=>()=>e.execCommand(t),l=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addButton(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})},n=(t,l)=>{e.queryCommandSupported(l.command)&&e.ui.registry.addToggleButton(t,{...l,onAction:c(l.onAction)?l.onAction:o(l.command)})};l("tableprops",{tooltip:"Table properties",command:"mceTableProps",icon:"table",onSetup:t.onSetupTable}),l("tabledelete",{tooltip:"Delete table",command:"mceTableDelete",icon:"table-delete-table",onSetup:t.onSetupTable}),l("tablecellprops",{tooltip:"Cell properties",command:"mceTableCellProps",icon:"table-cell-properties",onSetup:t.onSetupCellOrRow}),l("tablemergecells",{tooltip:"Merge cells",command:"mceTableMergeCells",icon:"table-merge-cells",onSetup:t.onSetupMergeable}),l("tablesplitcells",{tooltip:"Split cell",command:"mceTableSplitCells",icon:"table-split-cells",onSetup:t.onSetupUnmergeable}),l("tableinsertrowbefore",{tooltip:"Insert row before",command:"mceTableInsertRowBefore",icon:"table-insert-row-above",onSetup:t.onSetupCellOrRow}),l("tableinsertrowafter",{tooltip:"Insert row after",command:"mceTableInsertRowAfter",icon:"table-insert-row-after",onSetup:t.onSetupCellOrRow}),l("tabledeleterow",{tooltip:"Delete row",command:"mceTableDeleteRow",icon:"table-delete-row",onSetup:t.onSetupCellOrRow}),l("tablerowprops",{tooltip:"Row properties",command:"mceTableRowProps",icon:"table-row-properties",onSetup:t.onSetupCellOrRow}),l("tableinsertcolbefore",{tooltip:"Insert column before",command:"mceTableInsertColBefore",icon:"table-insert-column-before",onSetup:t.onSetupColumn("onFirst")}),l("tableinsertcolafter",{tooltip:"Insert column after",command:"mceTableInsertColAfter",icon:"table-insert-column-after",onSetup:t.onSetupColumn("onLast")}),l("tabledeletecol",{tooltip:"Delete column",command:"mceTableDeleteCol",icon:"table-delete-column",onSetup:t.onSetupColumn("onAny")}),l("tablecutrow",{tooltip:"Cut row",command:"mceTableCutRow",icon:"cut-row",onSetup:t.onSetupCellOrRow}),l("tablecopyrow",{tooltip:"Copy row",command:"mceTableCopyRow",icon:"duplicate-row",onSetup:t.onSetupCellOrRow}),l("tablepasterowbefore",{tooltip:"Paste row before",command:"mceTablePasteRowBefore",icon:"paste-row-before",onSetup:t.onSetupPasteable(pl)}),l("tablepasterowafter",{tooltip:"Paste row after",command:"mceTablePasteRowAfter",icon:"paste-row-after",onSetup:t.onSetupPasteable(pl)}),l("tablecutcol",{tooltip:"Cut column",command:"mceTableCutCol",icon:"cut-column",onSetup:t.onSetupColumn("onAny")}),l("tablecopycol",{tooltip:"Copy column",command:"mceTableCopyCol",icon:"duplicate-column",onSetup:t.onSetupColumn("onAny")}),l("tablepastecolbefore",{tooltip:"Paste column before",command:"mceTablePasteColBefore",icon:"paste-column-before",onSetup:t.onSetupPasteableColumn(bl,"onFirst")}),l("tablepastecolafter",{tooltip:"Paste column after",command:"mceTablePasteColAfter",icon:"paste-column-after",onSetup:t.onSetupPasteableColumn(bl,"onLast")}),l("tableinsertdialog",{tooltip:"Insert table",command:"mceInsertTableDialog",icon:"table",onSetup:gl(e)});const r=So(Tt(e));0!==r.length&&e.queryCommandSupported("mceTableToggleClass")&&e.ui.registry.addMenuButton("tableclass",{icon:"table-classes",tooltip:"Table styles",fetch:Co(e,r,"tableclass",(t=>e.execCommand("mceTableToggleClass",!1,t))),onSetup:t.onSetupTable});const a=So(Ct(e));0!==a.length&&e.queryCommandSupported("mceTableCellToggleClass")&&e.ui.registry.addMenuButton("tablecellclass",{icon:"table-cell-classes",tooltip:"Cell styles",fetch:Co(e,a,"tablecellclass",(t=>e.execCommand("mceTableCellToggleClass",!1,t))),onSetup:t.onSetupCellOrRow}),e.queryCommandSupported("mceTableApplyCellStyle")&&(e.ui.registry.addMenuButton("tablecellvalign",{icon:"vertical-align",tooltip:"Vertical align",fetch:Co(e,oo,"tablecellverticalalign",wo(e,"vertical-align")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellborderwidth",{icon:"border-width",tooltip:"Border width",fetch:Co(e,pt(e),"tablecellborderwidth",wo(e,"border-width")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellborderstyle",{icon:"border-style",tooltip:"Border style",fetch:Co(e,bt(e),"tablecellborderstyle",wo(e,"border-style")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellbackgroundcolor",{icon:"cell-background-color",tooltip:"Background color",fetch:t=>t(vo(e,At(e),"background-color")),onSetup:t.onSetupCellOrRow}),e.ui.registry.addMenuButton("tablecellbordercolor",{icon:"cell-border-color",tooltip:"Border color",fetch:t=>t(vo(e,Rt(e),"border-color")),onSetup:t.onSetupCellOrRow})),n("tablecaption",{tooltip:"Table caption",icon:"table-caption",command:"mceTableToggleCaption",onSetup:t.onSetupTableWithCaption}),n("tablerowheader",{tooltip:"Row header",icon:"table-top-header",command:"mceTableRowType",onAction:To(e),onSetup:t.onSetupTableRowHeaders}),n("tablecolheader",{tooltip:"Column header",icon:"table-left-header",command:"mceTableColType",onAction:xo(e),onSetup:t.onSetupTableColumnHeaders})})(e,t),(e=>{const t=xt(e);t.length>0&&e.ui.registry.addContextToolbar("table",{predicate:t=>e.dom.is(t,"table")&&e.getBody().contains(t)&&e.dom.isEditable(t.parentNode),items:t,scope:"node",position:"node"})})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/template/plugin.min.js b/public/libs/tinymce/plugins/template/plugin.min.js
index c5a21fadb59..5f07fd45238 100644
--- a/public/libs/tinymce/plugins/template/plugin.min.js
+++ b/public/libs/tinymce/plugins/template/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager");const t=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&(a=n=e,(r=String).prototype.isPrototypeOf(a)||(null===(s=n.constructor)||void 0===s?void 0:s.name)===r.name)?"string":t;var a,n,r,s})(t)===e,a=t("string"),n=t("object"),r=t("array"),s=("function",e=>"function"==typeof e);const l=(!1,()=>false);var o=tinymce.util.Tools.resolve("tinymce.util.Tools");const c=e=>t=>t.options.get(e),i=c("template_cdate_classes"),u=c("template_mdate_classes"),m=c("template_selected_content_classes"),p=c("template_preview_replace_values"),d=c("template_replace_values"),h=c("templates"),g=c("template_cdate_format"),v=c("template_mdate_format"),f=c("content_style"),y=c("content_css_cors"),b=c("body_class"),_=(e,t)=>{if((e=""+e).length<t)for(let a=0;a<t-e.length;a++)e="0"+e;return e},M=(e,t,a=new Date)=>{const n="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),s="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),l="January February March April May June July August September October November December".split(" ");return(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=(t=t.replace("%D","%m/%d/%Y")).replace("%r","%I:%M:%S %p")).replace("%Y",""+a.getFullYear())).replace("%y",""+a.getYear())).replace("%m",_(a.getMonth()+1,2))).replace("%d",_(a.getDate(),2))).replace("%H",""+_(a.getHours(),2))).replace("%M",""+_(a.getMinutes(),2))).replace("%S",""+_(a.getSeconds(),2))).replace("%I",""+((a.getHours()+11)%12+1))).replace("%p",a.getHours()<12?"AM":"PM")).replace("%B",""+e.translate(l[a.getMonth()]))).replace("%b",""+e.translate(s[a.getMonth()]))).replace("%A",""+e.translate(r[a.getDay()]))).replace("%a",""+e.translate(n[a.getDay()]))).replace("%%","%")};class T{constructor(e,t){this.tag=e,this.value=t}static some(e){return new T(!0,e)}static none(){return T.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?T.some(e(this.value)):T.none()}bind(e){return this.tag?e(this.value):T.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:T.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return null==e?T.none():T.some(e)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}T.singletonNone=new T(!1);const S=Object.hasOwnProperty;var x=tinymce.util.Tools.resolve("tinymce.html.Serializer");const C={'"':"&quot;","<":"&lt;",">":"&gt;","&":"&amp;","'":"&#039;"},w=e=>e.replace(/["'<>&]/g,(e=>{return(t=C,a=e,((e,t)=>S.call(e,t))(t,a)?T.from(t[a]):T.none()).getOr(e);var t,a})),O=(e,t,a)=>((a,n)=>{for(let n=0,s=a.length;n<s;n++)if(r=a[n],e.hasClass(t,r))return!0;var r;return!1})(a.split(/\s+/)),A=(e,t)=>x({validate:!0},e.schema).serialize(e.parser.parse(t,{insert:!0})),D=(e,t)=>(o.each(t,((t,a)=>{s(t)&&(t=t(a)),e=e.replace(new RegExp("\\{\\$"+a.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")+"\\}","g"),t)})),e),N=(e,t)=>{const a=e.dom,n=d(e);o.each(a.select("*",t),(e=>{o.each(n,((t,n)=>{a.hasClass(e,n)&&s(t)&&t(e)}))}))},I=(e,t,a)=>{const n=e.dom,r=e.selection.getContent();a=D(a,d(e));let s=n.create("div",{},A(e,a));const l=n.select(".mceTmpl",s);l&&l.length>0&&(s=n.create("div"),s.appendChild(l[0].cloneNode(!0))),o.each(n.select("*",s),(t=>{O(n,t,i(e))&&(t.innerHTML=M(e,g(e))),O(n,t,u(e))&&(t.innerHTML=M(e,v(e))),O(n,t,m(e))&&(t.innerHTML=r)})),N(e,s),e.execCommand("mceInsertContent",!1,s.innerHTML),e.addVisual()};var E=tinymce.util.Tools.resolve("tinymce.Env");const k=(e,t)=>{const a=(e,t)=>((e,t,a)=>{for(let n=0,r=e.length;n<r;n++){const r=e[n];if(t(r,n))return T.some(r);if(a(r,n))break}return T.none()})(e,(e=>e.text===t),l),n=t=>{e.windowManager.alert("Could not load the specified template.",(()=>t.focus("template")))},r=e=>e.value.url.fold((()=>Promise.resolve(e.value.content.getOr(""))),(e=>fetch(e).then((e=>e.ok?e.text():Promise.reject())))),s=(e,t)=>(s,l)=>{if("template"===l.name){const l=s.getData().template;a(e,l).each((e=>{s.block("Loading..."),r(e).then((a=>{t(s,e,a)})).catch((()=>{t(s,e,""),s.setEnabled("save",!1),n(s)}))}))}},c=t=>s=>{const l=s.getData();a(t,l.template).each((t=>{r(t).then((t=>{e.execCommand("mceInsertTemplate",!1,t),s.close()})).catch((()=>{s.setEnabled("save",!1),n(s)}))}))};(()=>{if(!t||0===t.length){const t=e.translate("No templates defined.");return e.notificationManager.open({text:t,type:"info"}),T.none()}return T.from(o.map(t,((e,t)=>{const a=e=>void 0!==e.url;return{selected:0===t,text:e.title,value:{url:a(e)?T.from(e.url):T.none(),content:a(e)?T.none():T.from(e.content),description:e.description}}})))})().each((t=>{const a=(e=>((e,t)=>{const a=e.length,n=new Array(a);for(let t=0;t<a;t++){const a=e[t];n[t]={text:(r=a).text,value:r.text}}var r;return n})(e))(t),l=(e,a)=>({title:"Insert Template",size:"large",body:{type:"panel",items:e},initialData:a,buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],onSubmit:c(t),onChange:s(t,i)}),i=(t,n,r)=>{const s=((e,t)=>{var a;let n=A(e,t);if(-1===t.indexOf("<html>")){let t="";const r=null!==(a=f(e))&&void 0!==a?a:"",s=y(e)?' crossorigin="anonymous"':"";o.each(e.contentCSS,(a=>{t+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(a)+'"'+s+">"})),r&&(t+='<style type="text/css">'+r+"</style>");const l=b(e),c=e.dom.encode,i='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A" && !('+(E.os.isMacOS()||E.os.isiOS()?"e.metaKey":"e.ctrlKey && !e.altKey")+")) {e.preventDefault();}}}, false);<\/script> ",u=e.getBody().dir,m=u?' dir="'+c(u)+'"':"";n='<!DOCTYPE html><html><head><base href="'+c(e.documentBaseURI.getURI())+'">'+t+i+'</head><body class="'+c(l)+'"'+m+">"+n+"</body></html>"}return D(n,p(e))})(e,r),c=[{type:"listbox",name:"template",label:"Templates",items:a},{type:"htmlpanel",html:`<p aria-live="polite">${w(n.value.description)}</p>`},{label:"Preview",type:"iframe",name:"preview",sandboxed:!1,transparent:!1}],i={template:n.text,preview:s};t.unblock(),t.redial(l(c,i)),t.focus("template")},u=e.windowManager.open(l([],{template:"",preview:""}));u.block("Loading..."),r(t[0]).then((e=>{i(u,t[0],e)})).catch((()=>{i(u,t[0],""),u.setEnabled("save",!1),n(u)}))}))},P=e=>t=>{const a=()=>{t.setEnabled(e.selection.isEditable())};return e.on("NodeChange",a),a(),()=>{e.off("NodeChange",a)}};e.add("template",(e=>{(e=>{const t=e.options.register;t("template_cdate_classes",{processor:"string",default:"cdate"}),t("template_mdate_classes",{processor:"string",default:"mdate"}),t("template_selected_content_classes",{processor:"string",default:"selcontent"}),t("template_preview_replace_values",{processor:"object"}),t("template_replace_values",{processor:"object"}),t("templates",{processor:e=>a(e)||((e,t)=>{if(r(e)){for(let a=0,n=e.length;a<n;++a)if(!t(e[a]))return!1;return!0}return!1})(e,n)||s(e),default:[]}),t("template_cdate_format",{processor:"string",default:e.translate("%Y-%m-%d")}),t("template_mdate_format",{processor:"string",default:e.translate("%Y-%m-%d")})})(e),(e=>{const t=()=>e.execCommand("mceTemplate");e.ui.registry.addButton("template",{icon:"template",tooltip:"Insert template",onSetup:P(e),onAction:t}),e.ui.registry.addMenuItem("template",{icon:"template",text:"Insert template...",onSetup:P(e),onAction:t})})(e),(e=>{e.addCommand("mceInsertTemplate",function(e,...t){return(...a)=>{const n=t.concat(a);return e.apply(null,n)}}(I,e)),e.addCommand("mceTemplate",((e,t)=>()=>{const n=h(e);s(n)?n(t):a(n)?fetch(n).then((e=>{e.ok&&e.json().then(t)})):t(n)})(e,(e=>t=>{k(e,t)})(e)))})(e),(e=>{e.on("PreProcess",(t=>{const a=e.dom,n=v(e);o.each(a.select("div",t.node),(t=>{a.hasClass(t,"mceTmpl")&&(o.each(a.select("*",t),(t=>{O(a,t,u(e))&&(t.innerHTML=M(e,n))})),N(e,t))}))}))})(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/visualblocks/plugin.min.js b/public/libs/tinymce/plugins/visualblocks/plugin.min.js
index c665a872b28..0b280031e9b 100644
--- a/public/libs/tinymce/plugins/visualblocks/plugin.min.js
+++ b/public/libs/tinymce/plugins/visualblocks/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const s=(t,s,o)=>{t.dom.toggleClass(t.getBody(),"mce-visualblocks"),o.set(!o.get()),((t,s)=>{t.dispatch("VisualBlocks",{state:s})})(t,o.get())},o=("visualblocks_default_state",t=>t.options.get("visualblocks_default_state"));const e=(t,s)=>o=>{o.setActive(s.get());const e=t=>o.setActive(t.state);return t.on("VisualBlocks",e),()=>t.off("VisualBlocks",e)};t.add("visualblocks",((t,l)=>{(t=>{(0,t.options.register)("visualblocks_default_state",{processor:"boolean",default:!1})})(t);const a=(t=>{let s=!1;return{get:()=>s,set:t=>{s=t}}})();((t,o,e)=>{t.addCommand("mceVisualBlocks",(()=>{s(t,0,e)}))})(t,0,a),((t,s)=>{const o=()=>t.execCommand("mceVisualBlocks");t.ui.registry.addToggleButton("visualblocks",{icon:"visualblocks",tooltip:"Show blocks",onAction:o,onSetup:e(t,s)}),t.ui.registry.addToggleMenuItem("visualblocks",{text:"Show blocks",icon:"visualblocks",onAction:o,onSetup:e(t,s)})})(t,a),((t,e,l)=>{t.on("PreviewFormats AfterPreviewFormats",(s=>{l.get()&&t.dom.toggleClass(t.getBody(),"mce-visualblocks","afterpreviewformats"===s.type)})),t.on("init",(()=>{o(t)&&s(t,0,l)}))})(t,0,a)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/visualchars/plugin.min.js b/public/libs/tinymce/plugins/visualchars/plugin.min.js
index d6e884798d9..4cd5ac76de9 100644
--- a/public/libs/tinymce/plugins/visualchars/plugin.min.js
+++ b/public/libs/tinymce/plugins/visualchars/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=t=>e=>(t=>{const e=typeof t;return null===t?"null":"object"===e&&Array.isArray(t)?"array":"object"===e&&(n=o=t,(r=String).prototype.isPrototypeOf(n)||(null===(s=o.constructor)||void 0===s?void 0:s.name)===r.name)?"string":e;var n,o,r,s})(e)===t,n=t=>e=>typeof e===t,o=e("string"),r=e("object"),s=(null,t=>null===t);const a=n("boolean"),l=n("number");class i{constructor(t,e){this.tag=t,this.value=e}static some(t){return new i(!0,t)}static none(){return i.singletonNone}fold(t,e){return this.tag?e(this.value):t()}isSome(){return this.tag}isNone(){return!this.tag}map(t){return this.tag?i.some(t(this.value)):i.none()}bind(t){return this.tag?t(this.value):i.none()}exists(t){return this.tag&&t(this.value)}forall(t){return!this.tag||t(this.value)}filter(t){return!this.tag||t(this.value)?this:i.none()}getOr(t){return this.tag?this.value:t}or(t){return this.tag?this:t}getOrThunk(t){return this.tag?this.value:t()}orThunk(t){return this.tag?this:t()}getOrDie(t){if(this.tag)return this.value;throw new Error(null!=t?t:"Called getOrDie on None")}static from(t){return null==t?i.none():i.some(t)}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(t){this.tag&&t(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}i.singletonNone=new i(!1);const u=(t,e)=>{for(let n=0,o=t.length;n<o;n++)e(t[n],n)},c=Object.keys,d=(t,e)=>{const n=c(t);for(let o=0,r=n.length;o<r;o++){const r=n[o];e(t[r],r)}},h="undefined"!=typeof window?window:Function("return this;")(),m=(t,e)=>((t,e)=>{let n=null!=e?e:h;for(let e=0;e<t.length&&null!=n;++e)n=n[t[e]];return n})(t.split("."),e),g=Object.getPrototypeOf,v=t=>{const e=m("ownerDocument.defaultView",t);return r(t)&&((t=>((t,e)=>{const n=((t,e)=>m(t,e))(t,e);if(null==n)throw new Error(t+" not available on this browser");return n})("HTMLElement",t))(e).prototype.isPrototypeOf(t)||/^HTML\w*Element$/.test(g(t).constructor.name))},f=t=>t.dom.nodeValue,p=t=>e=>(t=>t.dom.nodeType)(e)===t,b=t=>w(t)&&v(t.dom),w=p(1),y=p(3),A=(t,e,n)=>{((t,e,n)=>{if(!(o(n)||a(n)||l(n)))throw console.error("Invalid call to Attribute.set. Key ",e,":: Value ",n,":: Element ",t),new Error("Attribute value was not simple");t.setAttribute(e,n+"")})(t.dom,e,n)},k=(t,e)=>{t.dom.removeAttribute(e)},N=(t,e)=>{const n=((t,e)=>{const n=t.dom.getAttribute(e);return null===n?void 0:n})(t,e);return void 0===n||""===n?[]:n.split(" ")},T=t=>void 0!==t.dom.classList,C=t=>{if(null==t)throw new Error("Node cannot be null or undefined");return{dom:t}},E=C,O={"\xa0":"nbsp","\xad":"shy"},L=(t,e)=>{let n="";return d(t,((t,e)=>{n+=e})),new RegExp("["+n+"]",e?"g":"")},V=L(O),j=L(O,!0),B=(t=>{let e="";return d(t,(t=>{e&&(e+=","),e+="span.mce-"+t})),e})(O),S="mce-nbsp",_=t=>t.dom.contentEditable,x=t=>'<span data-mce-bogus="1" class="mce-'+O[t]+'">'+t+"</span>",M=t=>"span"===t.nodeName.toLowerCase()&&t.classList.contains("mce-nbsp-wrap"),P=t=>{const e=f(t);return y(t)&&o(e)&&V.test(e)},D=(t,e,n)=>{let o=[];const r=((t,e)=>{const n=t.length,o=new Array(n);for(let r=0;r<n;r++){const n=t[r];o[r]=e(n,r)}return o})(t.dom.childNodes,E);return u(r,(t=>{var r;n&&(M((r=t).dom)||!(t=>b(t)&&"false"===_(t))(r))&&e(t)&&(o=o.concat([t])),o=o.concat(D(t,e,((t,e)=>{if(b(t)&&!M(t.dom)){const e=_(t);if("true"===e)return!0;if("false"===e)return!1}return e})(t,n)))})),o},H=(t,e)=>{const n=t.dom,o=D(E(e),P,t.dom.isEditable(e));u(o,(e=>{var o;const r=e.dom.parentNode;if(M(r))s=E(r),a=S,T(s)?s.dom.classList.add(a):((t,e)=>{((t,e,n)=>{const o=N(t,e).concat([n]);A(t,e,o.join(" "))})(t,"class",e)})(s,a);else{const r=n.encode(null!==(o=f(e))&&void 0!==o?o:"").replace(j,x),s=n.create("div",{},r);let a;for(;a=s.lastChild;)n.insertAfter(a,e.dom);t.dom.remove(e.dom)}var s,a}))},I=(t,e)=>{const n=t.dom.select(B,e);u(n,(e=>{var n,o;M(e)?(n=E(e),o=S,T(n)?n.dom.classList.remove(o):((t,e)=>{((t,e,n)=>{const o=((t,e)=>{const o=[];for(let e=0,r=t.length;e<r;e++){const r=t[e];r!==n&&o.push(r)}return o})(N(t,e));o.length>0?A(t,e,o.join(" ")):k(t,e)})(t,"class",e)})(n,o),(t=>{const e=T(t)?t.dom.classList:(t=>N(t,"class"))(t);0===e.length&&k(t,"class")})(n)):t.dom.remove(e,!0)}))},$=t=>{const e=t.getBody(),n=t.selection.getBookmark();let o=((t,e)=>{for(;t.parentNode;){if(t.parentNode===e)return e;t=t.parentNode}})(t.selection.getNode(),e);o=void 0!==o?o:e,I(t,o),H(t,o),t.selection.moveToBookmark(n)},F=(t,e)=>{((t,e)=>{t.dispatch("VisualChars",{state:e})})(t,e.get());const n=t.getBody();!0===e.get()?H(t,n):I(t,n)},K=("visualchars_default_state",t=>t.options.get("visualchars_default_state"));const R=(t,e)=>{const n=((t,e)=>{let n=null;return{cancel:()=>{s(n)||(clearTimeout(n),n=null)},throttle:(...e)=>{s(n)&&(n=setTimeout((()=>{n=null,t.apply(null,e)}),300))}}})((()=>{$(t)}));t.on("keydown",(o=>{!0===e.get()&&(13===o.keyCode?$(t):n.throttle())})),t.on("remove",n.cancel)},U=(t,e)=>n=>{n.setActive(e.get());const o=t=>n.setActive(t.state);return t.on("VisualChars",o),()=>t.off("VisualChars",o)};t.add("visualchars",(t=>{(t=>{(0,t.options.register)("visualchars_default_state",{processor:"boolean",default:!1})})(t);const e=(t=>{let e=t;return{get:()=>e,set:t=>{e=t}}})(K(t));return((t,e)=>{t.addCommand("mceVisualChars",(()=>{((t,e)=>{e.set(!e.get());const n=t.selection.getBookmark();F(t,e),t.selection.moveToBookmark(n)})(t,e)}))})(t,e),((t,e)=>{const n=()=>t.execCommand("mceVisualChars");t.ui.registry.addToggleButton("visualchars",{tooltip:"Show invisible characters",icon:"visualchars",onAction:n,onSetup:U(t,e)}),t.ui.registry.addToggleMenuItem("visualchars",{text:"Show invisible characters",icon:"visualchars",onAction:n,onSetup:U(t,e)})})(t,e),R(t,e),((t,e)=>{t.on("init",(()=>{F(t,e)}))})(t,e),(t=>({isEnabled:()=>t.get()}))(e)}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/plugins/wordcount/plugin.min.js b/public/libs/tinymce/plugins/wordcount/plugin.min.js
index 41e0cb6c1b4..86e945e3826 100644
--- a/public/libs/tinymce/plugins/wordcount/plugin.min.js
+++ b/public/libs/tinymce/plugins/wordcount/plugin.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";var t=tinymce.util.Tools.resolve("tinymce.PluginManager");const e=(null,t=>null===t);const n=t=>t,o=(t,e)=>{const n=t.length,o=new Array(n);for(let r=0;r<n;r++){const n=t[r];o[r]=e(n,r)}return o},r="[-'\\.\u2018\u2019\u2024\ufe52\uff07\uff0e]",c="[:\xb7\xb7\u05f4\u2027\ufe13\ufe55\uff1a]",u="[\xb1+*/,;;\u0589\u060c\u060d\u066c\u07f8\u2044\ufe10\ufe14\ufe50\ufe54\uff0c\uff1b]",s="[0-9\u0660-\u0669\u066b\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u1090-\u1099\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1a80-\u1a89\u1a90-\u1a99\u1b50-\u1b59\u1bb0-\u1bb9\u1c40-\u1c49\u1c50-\u1c59\ua620-\ua629\ua8d0-\ua8d9\ua900-\ua909\ua9d0-\ua9d9\uaa50-\uaa59\uabf0-\uabf9]",a="\\r",l="\\n",i="[\v\f\x85\u2028\u2029]",d="[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f\u109a-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b6-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u192b\u1930-\u193b\u19b0-\u19c0\u19c8\u19c9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f\u1b00-\u1b04\u1b34-\u1b44\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1baa\u1be6-\u1bf3\u1c24-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe3-\uabea\uabec\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]",g="[\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200e\u200f\u202a-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb]",p="[\u3031-\u3035\u309b\u309c\u30a0-\u30fa\u30fc-\u30ff\u31f0-\u31ff\u32d0-\u32fe\u3300-\u3357\uff66-\uff9d]",h="[=_\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f\u2200-\u22ff<>]",C="[~\u2116|!-*+-\\/:;?@\\[-`{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]",y=10,m=[new RegExp("[A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f3\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bc0-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u24b6-\u24e9\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005\u303b\u303c\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790\ua791\ua7a0-\ua7a9\ua7fa-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]"),new RegExp(r),new RegExp(c),new RegExp(u),new RegExp(s),new RegExp(a),new RegExp(l),new RegExp(i),new RegExp(d),new RegExp(g),new RegExp(p),new RegExp(h),new RegExp("@")],w=new RegExp("^"+C+"$"),W=m,f=t=>{let e=13;const n=W.length;for(let o=0;o<n;++o){const n=W[o];if(n&&n.test(t)){e=o;break}}return e},x=(t,e)=>{const n=t[e],o=t[e+1];if(e<0||e>t.length-1&&0!==e)return!1;if(0===n&&0===o)return!1;const r=t[e+2];if(0===n&&(2===o||1===o||12===o)&&0===r)return!1;const c=t[e-1];return(2!==n&&1!==n&&12!==o||0!==o||0!==c)&&(4!==n&&0!==n||4!==o&&0!==o)&&(3!==n&&1!==n||4!==o||4!==c)&&(4!==n||3!==o&&1!==o||4!==r)&&(8!==n&&9!==n||0!==o&&4!==o&&o!==y&&8!==o&&9!==o)&&(8!==o&&(9!==o||0!==r&&4!==r&&r!==y&&8!==r&&9!==r)||0!==n&&4!==n&&n!==y&&8!==n&&9!==n)&&(5!==n||6!==o)&&(7===n||5===n||6===n||7===o||5===o||6===o||(n!==y||o!==y)&&(11!==o||0!==n&&4!==n&&n!==y&&11!==n)&&(11!==n||0!==o&&4!==o&&o!==y)&&12!==n)},E=/^\s+$/,R=w,S=t=>"http"===t||"https"===t,b=(t,e)=>{const n=((t,e)=>{let n;for(n=e;n<t.length&&!E.test(t[n]);n++);return n})(t,e+1);return"://"===t.slice(e+1,n).join("").substr(0,3)?n:e},v=(t,e,n)=>((t,e,n)=>{n={includeWhitespace:!1,includePunctuation:!1,...n};const r=o(t,e);return((t,e,n,o)=>{const r=[],c=[];let u=[];for(let s=0;s<n.length;++s)if(u.push(t[s]),x(n,s)){const n=e[s];if((o.includeWhitespace||!E.test(n))&&(o.includePunctuation||!R.test(n))){const n=s-u.length+1,o=s+1,a=e.slice(n,o).join("");if(S(a)){const n=b(e,s),r=t.slice(o,n);Array.prototype.push.apply(u,r),s=n}r.push(u),c.push({start:n,end:o})}u=[]}return{words:r,indices:c}})(t,r,(t=>{const e=(t=>{const e={};return n=>{if(e[n])return e[n];{const o=t(n);return e[n]=o,o}}})(f);return o(t,e)})(r),n)})(t,e,n).words;var F=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker");const T=(t,e)=>{const n=e.getBlockElements(),o=e.getVoidElements(),r=t=>n[t.nodeName]||o[t.nodeName],c=[];let u="";const s=new F(t,t);let a;for(;a=s.next();)3===a.nodeType?u+=a.data.replace(/\uFEFF/g,""):r(a)&&u.length&&(c.push(u),u="");return u.length&&c.push(u),c},A=t=>t.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,"_").length,B=(t,e)=>{const o=(t=>t.replace(/\u200B/g,""))(T(t,e).join("\n"));return v(o.split(""),n).length},D=(t,e)=>{const n=T(t,e).join("");return A(n)},j=(t,e)=>{const n=T(t,e).join("").replace(/\s/g,"");return A(n)},k=(t,e)=>()=>e(t.getBody(),t.schema),U=(t,e)=>()=>e(t.selection.getRng().cloneContents(),t.schema),M=t=>k(t,B);var P=tinymce.util.Tools.resolve("tinymce.util.Delay");const N=(t,e)=>{((t,e)=>{t.dispatch("wordCountUpdate",{wordCount:{words:e.body.getWordCount(),characters:e.body.getCharacterCount(),charactersWithoutSpaces:e.body.getCharacterCountWithoutSpaces()}})})(t,e)},V=(t,n,o)=>{const r=((t,n)=>{let o=null;return{cancel:()=>{e(o)||(clearTimeout(o),o=null)},throttle:(...r)=>{e(o)&&(o=setTimeout((()=>{o=null,t.apply(null,r)}),n))}}})((()=>N(t,n)),o);t.on("init",(()=>{N(t,n),P.setEditorTimeout(t,(()=>{t.on("SetContent BeforeAddUndo Undo Redo ViewUpdate keyup",r.throttle)}),0),t.on("remove",r.cancel)}))};((e=300)=>{t.add("wordcount",(t=>{const n=(t=>({body:{getWordCount:M(t),getCharacterCount:k(t,D),getCharacterCountWithoutSpaces:k(t,j)},selection:{getWordCount:U(t,B),getCharacterCount:U(t,D),getCharacterCountWithoutSpaces:U(t,j)},getCount:M(t)}))(t);return((t,e)=>{t.addCommand("mceWordCount",(()=>((t,e)=>{t.windowManager.open({title:"Word Count",body:{type:"panel",items:[{type:"table",header:["Count","Document","Selection"],cells:[["Words",String(e.body.getWordCount()),String(e.selection.getWordCount())],["Characters (no spaces)",String(e.body.getCharacterCountWithoutSpaces()),String(e.selection.getCharacterCountWithoutSpaces())],["Characters",String(e.body.getCharacterCount()),String(e.selection.getCharacterCount())]]}]},buttons:[{type:"cancel",name:"close",text:"Close",primary:!0}]})})(t,e)))})(t,n),(t=>{const e=()=>t.execCommand("mceWordCount");t.ui.registry.addButton("wordcount",{tooltip:"Word count",icon:"character-count",onAction:e}),t.ui.registry.addMenuItem("wordcount",{text:"Word count",icon:"character-count",onAction:e})})(t),V(t,n,e),n}))})()}();
\ No newline at end of file
diff --git a/public/libs/tinymce/themes/silver/theme.min.js b/public/libs/tinymce/themes/silver/theme.min.js
index 6f37cfb56cc..42807bf9ba2 100644
--- a/public/libs/tinymce/themes/silver/theme.min.js
+++ b/public/libs/tinymce/themes/silver/theme.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
 !function(){"use strict";const e=Object.getPrototypeOf,t=(e,t,o)=>{var n;return!!o(e,t.prototype)||(null===(n=e.constructor)||void 0===n?void 0:n.name)===t.name},o=e=>o=>(e=>{const o=typeof e;return null===e?"null":"object"===o&&Array.isArray(e)?"array":"object"===o&&t(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":o})(o)===e,n=e=>t=>typeof t===e,s=e=>t=>e===t,r=o("string"),a=o("object"),i=o=>((o,n)=>a(o)&&t(o,n,((t,o)=>e(t)===o)))(o,Object),l=o("array"),c=s(null),d=n("boolean"),u=s(void 0),m=e=>null==e,g=e=>!m(e),p=n("function"),h=n("number"),f=(e,t)=>{if(l(e)){for(let o=0,n=e.length;o<n;++o)if(!t(e[o]))return!1;return!0}return!1},b=()=>{},v=e=>()=>e(),y=(e,t)=>(...o)=>e(t.apply(null,o)),x=e=>()=>e,w=e=>e,S=(e,t)=>e===t;function k(e,...t){return(...o)=>{const n=t.concat(o);return e.apply(null,n)}}const C=e=>t=>!e(t),O=e=>()=>{throw new Error(e)},_=e=>e(),T=x(!1),E=x(!0);class A{constructor(e,t){this.tag=e,this.value=t}static some(e){return new A(!0,e)}static none(){return A.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?A.some(e(this.value)):A.none()}bind(e){return this.tag?e(this.value):A.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:A.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return g(e)?A.some(e):A.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}A.singletonNone=new A(!1);const M=Array.prototype.slice,D=Array.prototype.indexOf,B=Array.prototype.push,I=(e,t)=>D.call(e,t),F=(e,t)=>{const o=I(e,t);return-1===o?A.none():A.some(o)},R=(e,t)=>I(e,t)>-1,N=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return!0;return!1},V=(e,t)=>{const o=[];for(let n=0;n<e;n++)o.push(t(n));return o},z=(e,t)=>{const o=[];for(let n=0;n<e.length;n+=t){const s=M.call(e,n,n+t);o.push(s)}return o},L=(e,t)=>{const o=e.length,n=new Array(o);for(let s=0;s<o;s++){const o=e[s];n[s]=t(o,s)}return n},H=(e,t)=>{for(let o=0,n=e.length;o<n;o++)t(e[o],o)},P=(e,t)=>{const o=[],n=[];for(let s=0,r=e.length;s<r;s++){const r=e[s];(t(r,s)?o:n).push(r)}return{pass:o,fail:n}},U=(e,t)=>{const o=[];for(let n=0,s=e.length;n<s;n++){const s=e[n];t(s,n)&&o.push(s)}return o},W=(e,t,o)=>(((e,t)=>{for(let o=e.length-1;o>=0;o--)t(e[o],o)})(e,((e,n)=>{o=t(o,e,n)})),o),j=(e,t,o)=>(H(e,((e,n)=>{o=t(o,e,n)})),o),G=(e,t)=>((e,t,o)=>{for(let n=0,s=e.length;n<s;n++){const s=e[n];if(t(s,n))return A.some(s);if(o(s,n))break}return A.none()})(e,t,T),$=(e,t)=>{for(let o=0,n=e.length;o<n;o++)if(t(e[o],o))return A.some(o);return A.none()},q=e=>{const t=[];for(let o=0,n=e.length;o<n;++o){if(!l(e[o]))throw new Error("Arr.flatten item "+o+" was not an array, input: "+e);B.apply(t,e[o])}return t},Y=(e,t)=>q(L(e,t)),X=(e,t)=>{for(let o=0,n=e.length;o<n;++o)if(!0!==t(e[o],o))return!1;return!0},K=e=>{const t=M.call(e,0);return t.reverse(),t},J=(e,t)=>U(e,(e=>!R(t,e))),Z=(e,t)=>{const o={};for(let n=0,s=e.length;n<s;n++){const s=e[n];o[String(s)]=t(s,n)}return o},Q=e=>[e],ee=(e,t)=>{const o=M.call(e,0);return o.sort(t),o},te=(e,t)=>t>=0&&t<e.length?A.some(e[t]):A.none(),oe=e=>te(e,0),ne=e=>te(e,e.length-1),se=p(Array.from)?Array.from:e=>M.call(e),re=(e,t)=>{for(let o=0;o<e.length;o++){const n=t(e[o],o);if(n.isSome())return n}return A.none()},ae=Object.keys,ie=Object.hasOwnProperty,le=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n];t(e[s],s)}},ce=(e,t)=>de(e,((e,o)=>({k:o,v:t(e,o)}))),de=(e,t)=>{const o={};return le(e,((e,n)=>{const s=t(e,n);o[s.k]=s.v})),o},ue=e=>(t,o)=>{e[o]=t},me=(e,t,o,n)=>{le(e,((e,s)=>{(t(e,s)?o:n)(e,s)}))},ge=(e,t)=>{const o={};return me(e,t,ue(o),b),o},pe=(e,t)=>{const o=[];return le(e,((e,n)=>{o.push(t(e,n))})),o},he=(e,t)=>{const o=ae(e);for(let n=0,s=o.length;n<s;n++){const s=o[n],r=e[s];if(t(r,s,e))return A.some(r)}return A.none()},fe=e=>pe(e,w),be=(e,t)=>ve(e,t)?A.from(e[t]):A.none(),ve=(e,t)=>ie.call(e,t),ye=(e,t)=>ve(e,t)&&void 0!==e[t]&&null!==e[t],xe=(e,t,o=S)=>e.exists((e=>o(e,t))),we=e=>{const t=[],o=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(o);return t},Se=(e,t,o)=>e.isSome()&&t.isSome()?A.some(o(e.getOrDie(),t.getOrDie())):A.none(),ke=(e,t)=>null!=e?A.some(t(e)):A.none(),Ce=(e,t)=>e?A.some(t):A.none(),Oe=(e,t,o)=>""===t||e.length>=t.length&&e.substr(o,o+t.length)===t,_e=(e,t)=>Ee(e,t)?((e,t)=>e.substring(t))(e,t.length):e,Te=(e,t,o=0,n)=>{const s=e.indexOf(t,o);return-1!==s&&(!!u(n)||s+t.length<=n)},Ee=(e,t)=>Oe(e,t,0),Ae=(e,t)=>Oe(e,t,e.length-t.length),Me=(Mo=/^\s+|\s+$/g,e=>e.replace(Mo,"")),De=e=>e.length>0,Be=e=>!De(e),Ie=e=>void 0!==e.style&&p(e.style.getPropertyValue),Fe=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},Re=(e,t)=>{const o=(t||document).createElement("div");if(o.innerHTML=e,!o.hasChildNodes()||o.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return Fe(o.childNodes[0])},Ne=(e,t)=>{const o=(t||document).createElement(e);return Fe(o)},Ve=(e,t)=>{const o=(t||document).createTextNode(e);return Fe(o)},ze=Fe,Le="undefined"!=typeof window?window:Function("return this;")(),He=(e,t)=>((e,t)=>{let o=null!=t?t:Le;for(let t=0;t<e.length&&null!=o;++t)o=o[e[t]];return o})(e.split("."),t),Pe=Object.getPrototypeOf,Ue=e=>{const t=He("ownerDocument.defaultView",e);return a(e)&&((e=>((e,t)=>{const o=((e,t)=>He(e,t))(e,t);if(null==o)throw new Error(e+" not available on this browser");return o})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(Pe(e).constructor.name))},We=e=>e.dom.nodeName.toLowerCase(),je=e=>t=>(e=>e.dom.nodeType)(t)===e,Ge=e=>$e(e)&&Ue(e.dom),$e=je(1),qe=je(3),Ye=je(9),Xe=je(11),Ke=e=>t=>$e(t)&&We(t)===e,Je=(e,t)=>{const o=e.dom;if(1!==o.nodeType)return!1;{const e=o;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},Ze=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,Qe=(e,t)=>e.dom===t.dom,et=(e,t)=>{const o=e.dom,n=t.dom;return o!==n&&o.contains(n)},tt=e=>ze(e.dom.ownerDocument),ot=e=>Ye(e)?e:tt(e),nt=e=>ze(ot(e).dom.documentElement),st=e=>ze(ot(e).dom.defaultView),rt=e=>A.from(e.dom.parentNode).map(ze),at=e=>A.from(e.dom.parentElement).map(ze),it=e=>A.from(e.dom.offsetParent).map(ze),lt=e=>L(e.dom.childNodes,ze),ct=(e,t)=>{const o=e.dom.childNodes;return A.from(o[t]).map(ze)},dt=e=>ct(e,0),ut=(e,t)=>({element:e,offset:t}),mt=(e,t)=>{const o=lt(e);return o.length>0&&t<o.length?ut(o[t],0):ut(e,t)},gt=e=>Xe(e)&&g(e.dom.host),pt=p(Element.prototype.attachShadow)&&p(Node.prototype.getRootNode),ht=x(pt),ft=pt?e=>ze(e.dom.getRootNode()):ot,bt=e=>gt(e)?e:ze(ot(e).dom.body),vt=e=>{const t=ft(e);return gt(t)?A.some(t):A.none()},yt=e=>ze(e.dom.host),xt=e=>{const t=qe(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const o=t.ownerDocument;return vt(ze(t)).fold((()=>o.body.contains(t)),(n=xt,s=yt,e=>n(s(e))));var n,s},wt=()=>St(ze(document)),St=e=>{const t=e.dom.body;if(null==t)throw new Error("Body is not available yet");return ze(t)},kt=(e,t,o)=>{if(!(r(o)||d(o)||h(o)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",o,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,o+"")},Ct=(e,t,o)=>{kt(e.dom,t,o)},Ot=(e,t)=>{const o=e.dom;le(t,((e,t)=>{kt(o,t,e)}))},_t=(e,t)=>{const o=e.dom.getAttribute(t);return null===o?void 0:o},Tt=(e,t)=>A.from(_t(e,t)),Et=(e,t)=>{const o=e.dom;return!(!o||!o.hasAttribute)&&o.hasAttribute(t)},At=(e,t)=>{e.dom.removeAttribute(t)},Mt=(e,t,o)=>{if(!r(o))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",o,":: Element ",e),new Error("CSS value must be a string: "+o);Ie(e)&&e.style.setProperty(t,o)},Dt=(e,t)=>{Ie(e)&&e.style.removeProperty(t)},Bt=(e,t,o)=>{const n=e.dom;Mt(n,t,o)},It=(e,t)=>{const o=e.dom;le(t,((e,t)=>{Mt(o,t,e)}))},Ft=(e,t)=>{const o=e.dom;le(t,((e,t)=>{e.fold((()=>{Dt(o,t)}),(e=>{Mt(o,t,e)}))}))},Rt=(e,t)=>{const o=e.dom,n=window.getComputedStyle(o).getPropertyValue(t);return""!==n||xt(e)?n:Nt(o,t)},Nt=(e,t)=>Ie(e)?e.style.getPropertyValue(t):"",Vt=(e,t)=>{const o=e.dom,n=Nt(o,t);return A.from(n).filter((e=>e.length>0))},zt=e=>{const t={},o=e.dom;if(Ie(o))for(let e=0;e<o.style.length;e++){const n=o.style.item(e);t[n]=o.style[n]}return t},Lt=(e,t,o)=>{const n=Ne(e);return Bt(n,t,o),Vt(n,t).isSome()},Ht=(e,t)=>{const o=e.dom;Dt(o,t),xe(Tt(e,"style").map(Me),"")&&At(e,"style")},Pt=e=>e.dom.offsetWidth,Ut=(e,t)=>{const o=o=>{const n=t(o);if(n<=0||null===n){const t=Rt(o,e);return parseFloat(t)||0}return n},n=(e,t)=>j(t,((t,o)=>{const n=Rt(e,o),s=void 0===n?0:parseInt(n,10);return isNaN(s)?t:t+s}),0);return{set:(t,o)=>{if(!h(o)&&!o.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+o);const n=t.dom;Ie(n)&&(n.style[e]=o+"px")},get:o,getOuter:o,aggregate:n,max:(e,t,o)=>{const s=n(e,o);return t>s?t-s:0}}},Wt=Ut("height",(e=>{const t=e.dom;return xt(e)?t.getBoundingClientRect().height:t.offsetHeight})),jt=e=>Wt.get(e),Gt=e=>Wt.getOuter(e),$t=(e,t)=>({left:e,top:t,translate:(o,n)=>$t(e+o,t+n)}),qt=$t,Yt=(e,t)=>void 0!==e?e:void 0!==t?t:0,Xt=e=>{const t=e.dom.ownerDocument,o=t.body,n=t.defaultView,s=t.documentElement;if(o===e.dom)return qt(o.offsetLeft,o.offsetTop);const r=Yt(null==n?void 0:n.pageYOffset,s.scrollTop),a=Yt(null==n?void 0:n.pageXOffset,s.scrollLeft),i=Yt(s.clientTop,o.clientTop),l=Yt(s.clientLeft,o.clientLeft);return Kt(e).translate(a-l,r-i)},Kt=e=>{const t=e.dom,o=t.ownerDocument.body;return o===t?qt(o.offsetLeft,o.offsetTop):xt(e)?(e=>{const t=e.getBoundingClientRect();return qt(t.left,t.top)})(t):qt(0,0)},Jt=Ut("width",(e=>e.dom.offsetWidth)),Zt=e=>Jt.get(e),Qt=e=>Jt.getOuter(e),eo=e=>{let t,o=!1;return(...n)=>(o||(o=!0,t=e.apply(null,n)),t)},to=()=>oo(0,0),oo=(e,t)=>({major:e,minor:t}),no={nu:oo,detect:(e,t)=>{const o=String(t).toLowerCase();return 0===e.length?to():((e,t)=>{const o=((e,t)=>{for(let o=0;o<e.length;o++){const n=e[o];if(n.test(t))return n}})(e,t);if(!o)return{major:0,minor:0};const n=e=>Number(t.replace(o,"$"+e));return oo(n(1),n(2))})(e,o)},unknown:to},so=(e,t)=>{const o=String(t).toLowerCase();return G(e,(e=>e.search(o)))},ro=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,ao=e=>t=>Te(t,e),io=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>Te(e,"edge/")&&Te(e,"chrome")&&Te(e,"safari")&&Te(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,ro],search:e=>Te(e,"chrome")&&!Te(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>Te(e,"msie")||Te(e,"trident")},{name:"Opera",versionRegexes:[ro,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:ao("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:ao("firefox")},{name:"Safari",versionRegexes:[ro,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(Te(e,"safari")||Te(e,"mobile/"))&&Te(e,"applewebkit")}],lo=[{name:"Windows",search:ao("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>Te(e,"iphone")||Te(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:ao("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:ao("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:ao("linux"),versionRegexes:[]},{name:"Solaris",search:ao("sunos"),versionRegexes:[]},{name:"FreeBSD",search:ao("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:ao("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],co={browsers:x(io),oses:x(lo)},uo="Edge",mo="Chromium",go="Opera",po="Firefox",ho="Safari",fo=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isEdge:n(uo),isChromium:n(mo),isIE:n("IE"),isOpera:n(go),isFirefox:n(po),isSafari:n(ho)}},bo=()=>fo({current:void 0,version:no.unknown()}),vo=fo,yo=(x(uo),x(mo),x("IE"),x(go),x(po),x(ho),"Windows"),xo="Android",wo="Linux",So="macOS",ko="Solaris",Co="FreeBSD",Oo="ChromeOS",_o=e=>{const t=e.current,o=e.version,n=e=>()=>t===e;return{current:t,version:o,isWindows:n(yo),isiOS:n("iOS"),isAndroid:n(xo),isMacOS:n(So),isLinux:n(wo),isSolaris:n(ko),isFreeBSD:n(Co),isChromeOS:n(Oo)}},To=()=>_o({current:void 0,version:no.unknown()}),Eo=_o,Ao=(x(yo),x("iOS"),x(xo),x(wo),x(So),x(ko),x(Co),x(Oo),e=>window.matchMedia(e).matches);var Mo;let Do=eo((()=>((e,t,o)=>{const n=co.browsers(),s=co.oses(),r=t.bind((e=>((e,t)=>re(t.brands,(t=>{const o=t.brand.toLowerCase();return G(e,(e=>{var t;return o===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:no.nu(parseInt(t.version,10),0)})))})))(n,e))).orThunk((()=>((e,t)=>so(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(n,e))).fold(bo,vo),a=((e,t)=>so(e,t).map((e=>{const o=no.detect(e.versionRegexes,t);return{current:e.name,version:o}})))(s,e).fold(To,Eo),i=((e,t,o,n)=>{const s=e.isiOS()&&!0===/ipad/i.test(o),r=e.isiOS()&&!s,a=e.isiOS()||e.isAndroid(),i=a||n("(pointer:coarse)"),l=s||!r&&a&&n("(min-device-width:768px)"),c=r||a&&!l,d=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(o),u=!c&&!l&&!d;return{isiPad:x(s),isiPhone:x(r),isTablet:x(l),isPhone:x(c),isTouch:x(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:x(d),isDesktop:x(u)}})(a,r,e,o);return{browser:r,os:a,deviceType:i}})(navigator.userAgent,A.from(navigator.userAgentData),Ao)));const Bo=()=>Do(),Io=e=>{const t=ze((e=>{if(ht()&&g(e.target)){const t=ze(e.target);if($e(t)&&(e=>g(e.dom.shadowRoot))(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return oe(t)}}return A.from(e.target)})(e).getOr(e.target)),o=()=>e.stopPropagation(),n=()=>e.preventDefault(),s=y(n,o);return((e,t,o,n,s,r,a)=>({target:e,x:t,y:o,stop:n,prevent:s,kill:r,raw:a}))(t,e.clientX,e.clientY,o,n,s,e)},Fo=(e,t,o,n,s)=>{const r=((e,t)=>o=>{e(o)&&t(Io(o))})(o,n);return e.dom.addEventListener(t,r,s),{unbind:k(Ro,e,t,r,s)}},Ro=(e,t,o,n)=>{e.dom.removeEventListener(t,o,n)},No=(e,t)=>{rt(e).each((o=>{o.dom.insertBefore(t.dom,e.dom)}))},Vo=(e,t)=>{const o=(e=>A.from(e.dom.nextSibling).map(ze))(e);o.fold((()=>{rt(e).each((e=>{Lo(e,t)}))}),(e=>{No(e,t)}))},zo=(e,t)=>{dt(e).fold((()=>{Lo(e,t)}),(o=>{e.dom.insertBefore(t.dom,o.dom)}))},Lo=(e,t)=>{e.dom.appendChild(t.dom)},Ho=(e,t)=>{H(t,(t=>{Lo(e,t)}))},Po=e=>{e.dom.textContent="",H(lt(e),(e=>{Uo(e)}))},Uo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Wo=e=>{const t=void 0!==e?e.dom:document,o=t.body.scrollLeft||t.documentElement.scrollLeft,n=t.body.scrollTop||t.documentElement.scrollTop;return qt(o,n)},jo=(e,t,o)=>{const n=(void 0!==o?o.dom:document).defaultView;n&&n.scrollTo(e,t)},Go=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),$o=e=>{const t=void 0===e?window:e,o=t.document,n=Wo(ze(o));return(e=>{const t=void 0===e?window:e;return Bo().browser.isFirefox()?A.none():A.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,o=e.clientWidth,s=e.clientHeight;return Go(n.left,n.top,o,s)}),(e=>Go(Math.max(e.pageLeft,n.left),Math.max(e.pageTop,n.top),e.width,e.height)))},qo=()=>ze(document),Yo=(e,t)=>e.view(t).fold(x([]),(t=>{const o=e.owner(t),n=Yo(e,o);return[t].concat(n)}));var Xo=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?A.none():A.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(ze)},owner:e=>tt(e)});const Ko=e=>{const t=qo(),o=Wo(t),n=((e,t)=>{const o=t.owner(e),n=Yo(t,o);return A.some(n)})(e,Xo);return n.fold(k(Xt,e),(t=>{const n=Kt(e),s=W(t,((e,t)=>{const o=Kt(t);return{left:e.left+o.left,top:e.top+o.top}}),{left:0,top:0});return qt(s.left+n.left+o.left,s.top+n.top+o.top)}))},Jo=(e,t,o,n)=>({x:e,y:t,width:o,height:n,right:e+o,bottom:t+n}),Zo=e=>{const t=Xt(e),o=Qt(e),n=Gt(e);return Jo(t.left,t.top,o,n)},Qo=e=>{const t=Ko(e),o=Qt(e),n=Gt(e);return Jo(t.left,t.top,o,n)},en=(e,t)=>{const o=Math.max(e.x,t.x),n=Math.max(e.y,t.y),s=Math.min(e.right,t.right),r=Math.min(e.bottom,t.bottom);return Jo(o,n,s-o,r-n)},tn=()=>$o(window);var on=tinymce.util.Tools.resolve("tinymce.ThemeManager");const nn=e=>{const t=t=>t(e),o=x(e),n=()=>s,s={tag:!0,inner:e,fold:(t,o)=>o(e),isValue:E,isError:T,map:t=>rn.value(t(e)),mapError:n,bind:t,exists:t,forall:t,getOr:o,or:n,getOrThunk:o,orThunk:n,getOrDie:o,each:t=>{t(e)},toOptional:()=>A.some(e)};return s},sn=e=>{const t=()=>o,o={tag:!1,inner:e,fold:(t,o)=>t(e),isValue:T,isError:E,map:t,mapError:t=>rn.error(t(e)),bind:t,exists:T,forall:E,getOr:w,or:w,getOrThunk:_,orThunk:_,getOrDie:O(String(e)),each:b,toOptional:A.none};return o},rn={value:nn,error:sn,fromOption:(e,t)=>e.fold((()=>sn(t)),nn)};var an;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}(an||(an={}));const ln=(e,t,o)=>e.stype===an.Error?t(e.serror):o(e.svalue),cn=e=>({stype:an.Value,svalue:e}),dn=e=>({stype:an.Error,serror:e}),un=cn,mn=dn,gn=ln,pn=(e,t,o,n)=>({tag:"field",key:e,newKey:t,presence:o,prop:n}),hn=(e,t,o)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return o(e.newKey,e.instantiator)}},fn=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const o={};for(let n=0;n<t.length;n++){const s=t[n];for(const t in s)ve(s,t)&&(o[t]=e(o[t],s[t]))}return o},bn=fn(((e,t)=>i(e)&&i(t)?bn(e,t):t)),vn=fn(((e,t)=>t)),yn=e=>({tag:"defaultedThunk",process:e}),xn=e=>yn(x(e)),wn=e=>({tag:"mergeWithThunk",process:e}),Sn=e=>{const t=(e=>{const t=[],o=[];return H(e,(e=>{ln(e,(e=>o.push(e)),(e=>t.push(e)))})),{values:t,errors:o}})(e);return t.errors.length>0?(o=t.errors,y(mn,q)(o)):un(t.values);var o},kn=e=>a(e)&&ae(e).length>100?" removed due to size":JSON.stringify(e,null,2),Cn=(e,t)=>mn([{path:e,getErrorInfo:t}]),On=e=>({extract:(t,o)=>((e,t)=>e.stype===an.Error?t(e.serror):e)(e(o),(e=>((e,t)=>Cn(e,x(t)))(t,e))),toString:x("val")}),_n=On(un),Tn=(e,t,o,n)=>n(be(e,t).getOrThunk((()=>o(e)))),En=(e,t,o,n,s)=>{const r=e=>s.extract(t.concat([n]),e),a=e=>e.fold((()=>un(A.none())),(e=>((e,t)=>e.stype===an.Value?{stype:an.Value,svalue:t(e.svalue)}:e)(s.extract(t.concat([n]),e),A.some)));switch(e.tag){case"required":return((e,t,o,n)=>be(t,o).fold((()=>((e,t,o)=>Cn(e,(()=>'Could not find valid *required* value for "'+t+'" in '+kn(o))))(e,o,t)),n))(t,o,n,r);case"defaultedThunk":return Tn(o,n,e.process,r);case"option":return((e,t,o)=>o(be(e,t)))(o,n,a);case"defaultedOptionThunk":return((e,t,o,n)=>n(be(e,t).map((t=>!0===t?o(e):t))))(o,n,e.process,a);case"mergeWithThunk":return Tn(o,n,x({}),(t=>{const n=bn(e.process(o),t);return r(n)}))}},An=e=>({extract:(t,o)=>e().extract(t,o),toString:()=>e().toString()}),Mn=e=>ae(ge(e,g)),Dn=e=>{const t=Bn(e),o=W(e,((e,t)=>hn(t,(t=>bn(e,{[t]:!0})),x(e))),{});return{extract:(e,n)=>{const s=d(n)?[]:Mn(n),r=U(s,(e=>!ye(o,e)));return 0===r.length?t.extract(e,n):((e,t)=>Cn(e,(()=>"There are unsupported fields: ["+t.join(", ")+"] specified")))(e,r)},toString:t.toString}},Bn=e=>({extract:(t,o)=>((e,t,o)=>{const n={},s=[];for(const r of o)hn(r,((o,r,a,i)=>{const l=En(a,e,t,o,i);gn(l,(e=>{s.push(...e)}),(e=>{n[r]=e}))}),((e,o)=>{n[e]=o(t)}));return s.length>0?mn(s):un(n)})(t,o,e),toString:()=>{const t=L(e,(e=>hn(e,((e,t,o,n)=>e+" -> "+n.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),In=e=>({extract:(t,o)=>{const n=L(o,((o,n)=>e.extract(t.concat(["["+n+"]"]),o)));return Sn(n)},toString:()=>"array("+e.toString()+")"}),Fn=(e,t)=>{const o=void 0!==t?t:w;return{extract:(t,n)=>{const s=[];for(const r of e){const e=r.extract(t,n);if(e.stype===an.Value)return{stype:an.Value,svalue:o(e.svalue)};s.push(e)}return Sn(s)},toString:()=>"oneOf("+L(e,(e=>e.toString())).join(", ")+")"}},Rn=(e,t)=>({extract:(o,n)=>{const s=ae(n),r=((t,o)=>In(On(e)).extract(t,o))(o,s);return((e,t)=>e.stype===an.Value?t(e.svalue):e)(r,(e=>{const s=L(e,(e=>pn(e,e,{tag:"required",process:{}},t)));return Bn(s).extract(o,n)}))},toString:()=>"setOf("+t.toString()+")"}),Nn=y(In,Bn),Vn=x(_n),zn=(e,t)=>On((o=>{const n=typeof o;return e(o)?un(o):mn(`Expected type: ${t} but got: ${n}`)})),Ln=zn(h,"number"),Hn=zn(r,"string"),Pn=zn(d,"boolean"),Un=zn(p,"function"),Wn=e=>{if(Object(e)!==e)return!0;switch({}.toString.call(e).slice(8,-1)){case"Boolean":case"Number":case"String":case"Date":case"RegExp":case"Blob":case"FileList":case"ImageData":case"ImageBitmap":case"ArrayBuffer":return!0;case"Array":case"Object":return Object.keys(e).every((t=>Wn(e[t])));default:return!1}},jn=On((e=>Wn(e)?un(e):mn("Expected value to be acceptable for sending via postMessage"))),Gn=(e,t)=>({extract:(o,n)=>be(n,e).fold((()=>((e,t)=>Cn(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(o,e)),(e=>((e,t,o,n)=>be(o,n).fold((()=>((e,t,o)=>Cn(e,(()=>'The chosen schema: "'+o+'" did not exist in branches: '+kn(t))))(e,o,n)),(o=>o.extract(e.concat(["branch: "+n]),t))))(o,n,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+ae(t)}),$n=e=>On((t=>e(t).fold(mn,un))),qn=(e,t)=>Rn((t=>e(t).fold(dn,cn)),t),Yn=(e,t,o)=>{return n=((e,t,o)=>((e,t)=>e.stype===an.Error?{stype:an.Error,serror:t(e.serror)}:e)(t.extract([e],o),(e=>({input:o,errors:e}))))(e,t,o),ln(n,rn.error,rn.value);var n},Xn=e=>e.fold((e=>{throw new Error(Jn(e))}),w),Kn=(e,t,o)=>Xn(Yn(e,t,o)),Jn=e=>"Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:x("... (only showing first ten failures)")}]):e;return L(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})(e.errors).join("\n")+"\n\nInput object: "+kn(e.input),Zn=(e,t)=>Gn(e,ce(t,Bn)),Qn=(e,t)=>((e,t)=>{const o=eo(t);return{extract:(e,t)=>o().extract(e,t),toString:()=>o().toString()}})(0,t),es=pn,ts=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),os=e=>$n((t=>R(e,t)?rn.value(t):rn.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`))),ns=e=>es(e,e,{tag:"required",process:{}},Vn()),ss=(e,t)=>es(e,e,{tag:"required",process:{}},t),rs=e=>ss(e,Ln),as=e=>ss(e,Hn),is=(e,t)=>es(e,e,{tag:"required",process:{}},os(t)),ls=e=>ss(e,Un),cs=(e,t)=>es(e,e,{tag:"required",process:{}},Bn(t)),ds=(e,t)=>es(e,e,{tag:"required",process:{}},Nn(t)),us=(e,t)=>es(e,e,{tag:"required",process:{}},In(t)),ms=e=>es(e,e,{tag:"option",process:{}},Vn()),gs=(e,t)=>es(e,e,{tag:"option",process:{}},t),ps=e=>gs(e,Ln),hs=e=>gs(e,Hn),fs=(e,t)=>gs(e,os(t)),bs=e=>gs(e,Un),vs=(e,t)=>gs(e,In(t)),ys=(e,t)=>gs(e,Bn(t)),xs=(e,t)=>es(e,e,xn(t),Vn()),ws=(e,t,o)=>es(e,e,xn(t),o),Ss=(e,t)=>ws(e,t,Ln),ks=(e,t)=>ws(e,t,Hn),Cs=(e,t,o)=>ws(e,t,os(o)),Os=(e,t)=>ws(e,t,Pn),_s=(e,t)=>ws(e,t,Un),Ts=(e,t,o)=>ws(e,t,In(o)),Es=(e,t,o)=>ws(e,t,Bn(o)),As=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},Ms=e=>{if(!l(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],o={};return H(e,((n,s)=>{const r=ae(n);if(1!==r.length)throw new Error("one and only one name per case");const a=r[0],i=n[a];if(void 0!==o[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!l(i))throw new Error("case arguments must be an array");t.push(a),o[a]=(...o)=>{const n=o.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+n);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[s].apply(null,o)},match:e=>{const n=ae(e);if(t.length!==n.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+n.join(","));if(!X(t,(e=>R(n,e))))throw new Error("Not all branches were specified when using match. Specified: "+n.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,o)},log:e=>{console.log(e,{constructors:t,constructor:a,params:o})}}}})),o};Ms([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const Ds=(e,t)=>((e,t)=>({[e]:t}))(e,t),Bs=e=>(e=>{const t={};return H(e,(e=>{t[e.key]=e.value})),t})(e),Is=e=>p(e)?e:T,Fs=(e,t,o)=>{let n=e.dom;const s=Is(o);for(;n.parentNode;){n=n.parentNode;const e=ze(n),o=t(e);if(o.isSome())return o;if(s(e))break}return A.none()},Rs=(e,t,o)=>{const n=t(e),s=Is(o);return n.orThunk((()=>s(e)?A.none():Fs(e,t,s)))},Ns=(e,t)=>Qe(e.element,t.event.target),Vs={can:E,abort:T,run:b},zs=e=>{if(!ye(e,"can")&&!ye(e,"abort")&&!ye(e,"run"))throw new Error("EventHandler defined by: "+JSON.stringify(e,null,2)+" does not have can, abort, or run!");return{...Vs,...e}},Ls=x,Hs=Ls("touchstart"),Ps=Ls("touchmove"),Us=Ls("touchend"),Ws=Ls("touchcancel"),js=Ls("mousedown"),Gs=Ls("mousemove"),$s=Ls("mouseout"),qs=Ls("mouseup"),Ys=Ls("mouseover"),Xs=Ls("focusin"),Ks=Ls("focusout"),Js=Ls("keydown"),Zs=Ls("keyup"),Qs=Ls("input"),er=Ls("change"),tr=Ls("click"),or=Ls("transitioncancel"),nr=Ls("transitionend"),sr=Ls("transitionstart"),rr=Ls("selectstart"),ar=e=>x("alloy."+e),ir={tap:ar("tap")},lr=ar("focus"),cr=ar("blur.post"),dr=ar("paste.post"),ur=ar("receive"),mr=ar("execute"),gr=ar("focus.item"),pr=ir.tap,hr=ar("longpress"),fr=ar("sandbox.close"),br=ar("typeahead.cancel"),vr=ar("system.init"),yr=ar("system.touchmove"),xr=ar("system.touchend"),wr=ar("system.scroll"),Sr=ar("system.resize"),kr=ar("system.attached"),Cr=ar("system.detached"),Or=ar("system.dismissRequested"),_r=ar("system.repositionRequested"),Tr=ar("focusmanager.shifted"),Er=ar("slotcontainer.visibility"),Ar=ar("system.external.element.scroll"),Mr=ar("change.tab"),Dr=ar("dismiss.tab"),Br=ar("highlight"),Ir=ar("dehighlight"),Fr=(e,t)=>{zr(e,e.element,t,{})},Rr=(e,t,o)=>{zr(e,e.element,t,o)},Nr=e=>{Fr(e,mr())},Vr=(e,t,o)=>{zr(e,t,o,{})},zr=(e,t,o,n)=>{const s={target:t,...n};e.getSystem().triggerEvent(o,t,s)},Lr=(e,t,o,n)=>{e.getSystem().triggerEvent(o,t,n.event)},Hr=e=>Bs(e),Pr=(e,t)=>({key:e,value:zs({abort:t})}),Ur=e=>({key:e,value:zs({run:(e,t)=>{t.event.prevent()}})}),Wr=(e,t)=>({key:e,value:zs({run:t})}),jr=(e,t,o)=>({key:e,value:zs({run:(e,n)=>{t.apply(void 0,[e,n].concat(o))}})}),Gr=e=>t=>({key:e,value:zs({run:(e,o)=>{Ns(e,o)&&t(e,o)}})}),$r=(e,t,o)=>((e,t)=>Wr(e,((o,n)=>{o.getSystem().getByUid(t).each((t=>{Lr(t,t.element,e,n)}))})))(e,t.partUids[o]),qr=(e,t)=>Wr(e,((e,o)=>{const n=o.event,s=e.getSystem().getByDom(n.target).getOrThunk((()=>Rs(n.target,(t=>e.getSystem().getByDom(t).toOptional()),T).getOr(e)));t(e,s,o)})),Yr=e=>Wr(e,((e,t)=>{t.cut()})),Xr=e=>Wr(e,((e,t)=>{t.stop()})),Kr=(e,t)=>Gr(e)(t),Jr=Gr(kr()),Zr=Gr(Cr()),Qr=Gr(vr()),ea=(aa=mr(),e=>Wr(aa,e)),ta=e=>e.dom.innerHTML,oa=(e,t)=>{const o=tt(e).dom,n=ze(o.createDocumentFragment()),s=((e,t)=>{const o=(t||document).createElement("div");return o.innerHTML=e,lt(ze(o))})(t,o);Ho(n,s),Po(e),Lo(e,n)},na=(e,t)=>ze(e.dom.cloneNode(t)),sa=e=>(e=>{if(gt(e))return"#shadow-root";{const t=(e=>na(e,!1))(e);return(e=>{const t=Ne("div"),o=ze(e.dom.cloneNode(!0));return Lo(t,o),ta(t)})(t)}})(e),ra=Hr([((e,t)=>({key:e,value:zs({can:(e,t)=>{const o=t.event,n=o.originator,s=o.target;return!((e,t,o)=>Qe(t,e.element)&&!Qe(t,o))(e,n,s)||(console.warn(lr()+" did not get interpreted by the desired target. \nOriginator: "+sa(n)+"\nTarget: "+sa(s)+"\nCheck the "+lr()+" event handlers"),!1)}})}))(lr())]);var aa,ia=Object.freeze({__proto__:null,events:ra});let la=0;const ca=e=>{const t=(new Date).getTime(),o=Math.floor(1e9*Math.random());return la++,e+"_"+o+la+String(t)},da=x("alloy-id-"),ua=x("data-alloy-id"),ma=da(),ga=ua(),pa=(e,t)=>{Object.defineProperty(e.dom,ga,{value:t,writable:!0})},ha=e=>{const t=$e(e)?e.dom[ga]:null;return A.from(t)},fa=e=>ca(e),ba=w,va=e=>{const t=t=>`The component must be in a context to execute: ${t}`+(e?"\n"+sa(e().element)+" is not in context.":""),o=e=>()=>{throw new Error(t(e))},n=e=>()=>{console.warn(t(e))};return{debugInfo:x("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),broadcastEvent:n("broadcastEvent"),build:o("build"),buildOrPatch:o("buildOrPatch"),addToWorld:o("addToWorld"),removeFromWorld:o("removeFromWorld"),addToGui:o("addToGui"),removeFromGui:o("removeFromGui"),getByUid:o("getByUid"),getByDom:o("getByDom"),isConnected:T}},ya=va(),xa=e=>L(e,(e=>Ae(e,"/*")?e.substring(0,e.length-2):e)),wa=(e,t)=>{const o=e.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:xa(r)}),e},Sa=ca("alloy-premade"),ka=e=>(Object.defineProperty(e.element.dom,Sa,{value:e.uid,writable:!0}),Ds(Sa,e)),Ca=e=>be(e,Sa),Oa=e=>((e,t)=>{const o=t.toString(),n=o.indexOf(")")+1,s=o.indexOf("("),r=o.substring(s+1,n-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:"OVERRIDE",parameters:xa(r.slice(1))}),e})(((t,...o)=>e(t.getApis(),t,...o)),e),_a={init:()=>Ta({readState:x("No State required")})},Ta=e=>e,Ea=(e,t)=>{const o={};return le(e,((e,n)=>{le(e,((e,s)=>{const r=be(o,s).getOr([]);o[s]=r.concat([t(n,e)])}))})),o},Aa=e=>({classes:u(e.classes)?[]:e.classes,attributes:u(e.attributes)?{}:e.attributes,styles:u(e.styles)?{}:e.styles}),Ma=e=>e.cHandler,Da=(e,t)=>({name:e,handler:t}),Ba=(e,t)=>{const o={};return H(e,(e=>{o[e.name()]=e.handlers(t)})),o},Ia=(e,t,o)=>{const n=t[o];return n?((e,t,o,n)=>{try{const s=ee(o,((o,s)=>{const r=o[t],a=s[t],i=n.indexOf(r),l=n.indexOf(a);if(-1===i)throw new Error("The ordering for "+e+" does not have an entry for "+r+".\nOrder specified: "+JSON.stringify(n,null,2));if(-1===l)throw new Error("The ordering for "+e+" does not have an entry for "+a+".\nOrder specified: "+JSON.stringify(n,null,2));return i<l?-1:l<i?1:0}));return rn.value(s)}catch(e){return rn.error([e])}})("Event: "+o,"name",e,n).map((e=>(e=>{const t=((e,t)=>(...t)=>j(e,((e,o)=>e&&(e=>e.can)(o).apply(void 0,t)),!0))(e),o=((e,t)=>(...t)=>j(e,((e,o)=>e||(e=>e.abort)(o).apply(void 0,t)),!1))(e);return{can:t,abort:o,run:(...t)=>{H(e,(e=>{e.run.apply(void 0,t)}))}}})(L(e,(e=>e.handler))))):((e,t)=>rn.error(["The event ("+e+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+JSON.stringify(L(t,(e=>e.name)),null,2)]))(o,e)},Fa=(e,t)=>((e,t)=>{const o=(e=>{const t=[],o=[];return H(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{o.push(e)}))})),{errors:t,values:o}})(e);return o.errors.length>0?(n=o.errors,rn.error(q(n))):((e,t)=>0===e.length?rn.value(t):rn.value(bn(t,vn.apply(void 0,e))))(o.values,t);var n})(pe(e,((e,o)=>(1===e.length?rn.value(e[0].handler):Ia(e,t,o)).map((n=>{const s=(e=>{const t=(e=>p(e)?{can:E,abort:T,run:e}:e)(e);return(e,o,...n)=>{const s=[e,o].concat(n);t.abort.apply(void 0,s)?o.stop():t.can.apply(void 0,s)&&t.run.apply(void 0,s)}})(n),r=e.length>1?U(t[o],(t=>N(e,(e=>e.name===t)))).join(" > "):e[0].name;return Ds(o,((e,t)=>({handler:e,purpose:t}))(s,r))})))),{}),Ra="alloy.base.behaviour",Na=Bn([es("dom","dom",{tag:"required",process:{}},Bn([ns("tag"),xs("styles",{}),xs("classes",[]),xs("attributes",{}),ms("value"),ms("innerHtml")])),ns("components"),ns("uid"),xs("events",{}),xs("apis",{}),es("eventOrder","eventOrder",(ui={[mr()]:["disabling",Ra,"toggling","typeaheadevents"],[lr()]:[Ra,"focusing","keying"],[vr()]:[Ra,"disabling","toggling","representing"],[Qs()]:[Ra,"representing","streaming","invalidating"],[Cr()]:[Ra,"representing","item-events","tooltipping"],[js()]:["focusing",Ra,"item-type-events"],[Hs()]:["focusing",Ra,"item-type-events"],[Ys()]:["item-type-events","tooltipping"],[ur()]:["receiving","reflecting","tooltipping"]},wn(x(ui))),Vn()),ms("domModification")]),Va=e=>e.events,za=(e,t)=>{const o=_t(e,t);return void 0===o||""===o?[]:o.split(" ")},La=e=>void 0!==e.dom.classList,Ha=e=>za(e,"class"),Pa=(e,t)=>((e,t,o)=>{const n=za(e,t).concat([o]);return Ct(e,t,n.join(" ")),!0})(e,"class",t),Ua=(e,t)=>((e,t,o)=>{const n=U(za(e,t),(e=>e!==o));return n.length>0?Ct(e,t,n.join(" ")):At(e,t),!1})(e,"class",t),Wa=(e,t)=>{La(e)?e.dom.classList.add(t):Pa(e,t)},ja=e=>{0===(La(e)?e.dom.classList:Ha(e)).length&&At(e,"class")},Ga=(e,t)=>{La(e)?e.dom.classList.remove(t):Ua(e,t),ja(e)},$a=(e,t)=>La(e)&&e.dom.classList.contains(t),qa=(e,t)=>{H(t,(t=>{Wa(e,t)}))},Ya=(e,t)=>{H(t,(t=>{Ga(e,t)}))},Xa=e=>La(e)?(e=>{const t=e.dom.classList,o=new Array(t.length);for(let e=0;e<t.length;e++){const n=t.item(e);null!==n&&(o[e]=n)}return o})(e):Ha(e),Ka=e=>e.dom.value,Ja=(e,t)=>{if(void 0===t)throw new Error("Value.set was undefined");e.dom.value=t},Za=(e,t,o)=>{o.fold((()=>Lo(e,t)),(e=>{Qe(e,t)||(No(e,t),Uo(e))}))},Qa=(e,t,o)=>{const n=L(t,o),s=lt(e);return H(s.slice(n.length),Uo),n},ei=(e,t,o,n)=>{const s=ct(e,t),r=n(o,s),a=((e,t,o)=>ct(e,t).map((e=>{if(o.exists((t=>!Qe(t,e)))){const t=o.map(We).getOr("span"),n=Ne(t);return No(e,n),n}return e})))(e,t,s);return Za(e,r.element,a),r},ti=(e,t)=>{const o=ae(e),n=ae(t),s=J(n,o),r=((e,o)=>{const n={},s={};return me(e,((e,o)=>!ve(t,o)||e!==t[o]),ue(n),ue(s)),{t:n,f:s}})(e).t;return{toRemove:s,toSet:r}},oi=(e,t)=>{const o=t.filter((t=>We(t)===e.tag&&!(e=>e.innerHtml.isSome()&&e.domChildren.length>0)(e)&&!(e=>ve(e.dom,Sa))(t))).bind((t=>((e,t)=>{try{const o=((e,t)=>{const{class:o,style:n,...s}=(e=>j(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}))(t),{toSet:r,toRemove:a}=ti(e.attributes,s),i=zt(t),{toSet:l,toRemove:c}=ti(e.styles,i),d=Xa(t),u=J(d,e.classes),m=J(e.classes,d);return H(a,(e=>At(t,e))),Ot(t,r),qa(t,m),Ya(t,u),H(c,(e=>Ht(t,e))),It(t,l),e.innerHtml.fold((()=>{const o=e.domChildren;((e,t)=>{Qa(e,t,((t,o)=>{const n=ct(e,o);return Za(e,t,n),t}))})(t,o)}),(e=>{oa(t,e)})),(()=>{const o=t,n=e.value.getOrUndefined();n!==Ka(o)&&Ja(o,null!=n?n:"")})(),t})(e,t);return A.some(o)}catch(e){return A.none()}})(e,t))).getOrThunk((()=>(e=>{const t=Ne(e.tag);Ot(t,e.attributes),qa(t,e.classes),It(t,e.styles),e.innerHtml.each((e=>oa(t,e)));const o=e.domChildren;return Ho(t,o),e.value.each((e=>{Ja(t,e)})),t})(e)));return pa(o,e.uid),o},ni=e=>{const t=(e=>{const t=be(e,"behaviours").getOr({});return Y(ae(t),(e=>{const o=t[e];return g(o)?[o.me]:[]}))})(e);return((e,t)=>((e,t)=>{const o=L(t,(e=>ys(e.name(),[ns("config"),xs("state",_a)]))),n=Yn("component.behaviours",Bn(o),e.behaviours).fold((t=>{throw new Error(Jn(t)+"\nComplete spec:\n"+JSON.stringify(e,null,2))}),w);return{list:t,data:ce(n,(e=>{const t=e.map((e=>({config:e.config,state:e.state.init(e.config)})));return x(t)}))}})(e,t))(e,t)},si=(e,t)=>{const o=()=>m,n=As(ya),s=Xn((e=>Yn("custom.definition",Na,e))(e)),r=ni(e),a=(e=>e.list)(r),i=(e=>e.data)(r),l=((e,t,o)=>{const n={...(s=e).dom,uid:s.uid,domChildren:L(s.components,(e=>e.element))};var s;const r=(e=>e.domModification.fold((()=>Aa({})),Aa))(e),a={"alloy.base.modification":r},i=t.length>0?((e,t,o,n)=>{const s={...t};H(o,(t=>{s[t.name()]=t.exhibit(e,n)}));const r=Ea(s,((e,t)=>({name:e,modification:t}))),a=e=>W(e,((e,t)=>({...t.modification,...e})),{}),i=W(r.classes,((e,t)=>t.modification.concat(e)),[]),l=a(r.attributes),c=a(r.styles);return Aa({classes:i,attributes:l,styles:c})})(o,a,t,n):r;return l=n,c=i,{...l,attributes:{...l.attributes,...c.attributes},styles:{...l.styles,...c.styles},classes:l.classes.concat(c.classes)};var l,c})(s,a,i),c=oi(l,t),d=((e,t,o)=>{const n={"alloy.base.behaviour":Va(e)};return((e,t,o,n)=>{const s=((e,t,o)=>{const n={...o,...Ba(t,e)};return Ea(n,Da)})(e,o,n);return Fa(s,t)})(o,e.eventOrder,t,n).getOrDie()})(s,a,i),u=As(s.components),m={uid:e.uid,getSystem:n.get,config:t=>{const o=i;return(p(o[t.name()])?o[t.name()]:()=>{throw new Error("Could not find "+t.name()+" in "+JSON.stringify(e,null,2))})()},hasConfigured:e=>p(i[e.name()]),spec:e,readState:e=>i[e]().map((e=>e.state.readState())).getOr("not enabled"),getApis:()=>s.apis,connect:e=>{n.set(e)},disconnect:()=>{n.set(va(o))},element:c,syncComponents:()=>{const e=lt(c),t=Y(e,(e=>n.get().getByDom(e).fold((()=>[]),Q)));u.set(t)},components:u.get,events:d};return m},ri=e=>{const t=Ve(e);return ai({element:t})},ai=e=>{const t=Kn("external.component",Dn([ns("element"),ms("uid")]),e),o=As(va()),n=t.uid.getOrThunk((()=>fa("external")));pa(t.element,n);const s={uid:n,getSystem:o.get,config:A.none,hasConfigured:T,connect:e=>{o.set(e)},disconnect:()=>{o.set(va((()=>s)))},getApis:()=>({}),element:t.element,spec:e,readState:x("No state"),syncComponents:b,components:x([]),events:{}};return ka(s)},ii=fa,li=(e,t)=>Ca(e).getOrThunk((()=>((e,t)=>{const{events:o,...n}=ba(e),s=((e,t)=>{const o=be(e,"components").getOr([]);return t.fold((()=>L(o,ci)),(e=>L(o,((t,o)=>li(t,ct(e,o))))))})(n,t),r={...n,events:{...ia,...o},components:s};return rn.value(si(r,t))})((e=>ve(e,"uid"))(e)?e:{uid:ii(""),...e},t).getOrDie())),ci=e=>li(e,A.none()),di=ka;var ui,mi=(e,t,o,n,s)=>e(o,n)?A.some(o):p(s)&&s(o)?A.none():t(o,n,s);const gi=(e,t,o)=>{let n=e.dom;const s=p(o)?o:T;for(;n.parentNode;){n=n.parentNode;const e=ze(n);if(t(e))return A.some(e);if(s(e))break}return A.none()},pi=(e,t,o)=>mi(((e,t)=>t(e)),gi,e,t,o),hi=(e,t,o)=>pi(e,t,o).isSome(),fi=(e,t,o)=>gi(e,(e=>Je(e,t)),o),bi=(e,t)=>((e,o)=>G(e.dom.childNodes,(e=>{return o=ze(e),Je(o,t);var o})).map(ze))(e),vi=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Ze(o)?A.none():A.from(o.querySelector(e)).map(ze)})(t,e),yi=(e,t,o)=>mi(((e,t)=>Je(e,t)),fi,e,t,o),xi="aria-controls",wi=()=>{const e=ca(xi);return{id:e,link:t=>{Ct(t,xi,e)},unlink:e=>{At(e,xi)}}},Si=(e,t)=>hi(t,(t=>Qe(t,e.element)),T)||((e,t)=>(e=>pi(e,(e=>{if(!$e(e))return!1;const t=_t(e,"id");return void 0!==t&&t.indexOf(xi)>-1})).bind((e=>{const t=_t(e,"id"),o=ft(e);return vi(o,`[${xi}="${t}"]`)})))(t).exists((t=>Si(e,t))))(e,t);var ki;!function(e){e[e.STOP=0]="STOP",e[e.NORMAL=1]="NORMAL",e[e.LOGGING=2]="LOGGING"}(ki||(ki={}));const Ci=As({}),Oi=["alloy/data/Fields","alloy/debugging/Debugging"],_i=(e,t,o)=>((e,t,o)=>{switch(be(Ci.get(),e).orThunk((()=>{const t=ae(Ci.get());return re(t,(t=>e.indexOf(t)>-1?A.some(Ci.get()[t]):A.none()))})).getOr(ki.NORMAL)){case ki.NORMAL:return o(Ti());case ki.LOGGING:{const n=((e,t)=>{const o=[],n=(new Date).getTime();return{logEventCut:(e,t,n)=>{o.push({outcome:"cut",target:t,purpose:n})},logEventStopped:(e,t,n)=>{o.push({outcome:"stopped",target:t,purpose:n})},logNoParent:(e,t,n)=>{o.push({outcome:"no-parent",target:t,purpose:n})},logEventNoHandlers:(e,t)=>{o.push({outcome:"no-handlers-left",target:t})},logEventResponse:(e,t,n)=>{o.push({outcome:"response",purpose:n,target:t})},write:()=>{const s=(new Date).getTime();R(["mousemove","mouseover","mouseout",vr()],e)||console.log(e,{event:e,time:s-n,target:t.dom,sequence:L(o,(e=>R(["cut","stopped","response"],e.outcome)?"{"+e.purpose+"} "+e.outcome+" at ("+sa(e.target)+")":e.outcome))})}}})(e,t),s=o(n);return n.write(),s}case ki.STOP:return!0}})(e,t,o),Ti=x({logEventCut:b,logEventStopped:b,logNoParent:b,logEventNoHandlers:b,logEventResponse:b,write:b}),Ei=x([ns("menu"),ns("selectedMenu")]),Ai=x([ns("item"),ns("selectedItem")]);x(Bn(Ai().concat(Ei())));const Mi=x(Bn(Ai())),Di=cs("initSize",[ns("numColumns"),ns("numRows")]),Bi=()=>cs("markers",[ns("backgroundMenu")].concat(Ei()).concat(Ai())),Ii=e=>cs("markers",L(e,ns)),Fi=(e,t,o)=>((()=>{const e=new Error;if(void 0!==e.stack){const t=e.stack.split("\n");G(t,(e=>e.indexOf("alloy")>0&&!N(Oi,(t=>e.indexOf(t)>-1)))).getOr("unknown")}})(),es(t,t,o,$n((e=>rn.value(((...t)=>e.apply(void 0,t))))))),Ri=e=>Fi(0,e,xn(b)),Ni=e=>Fi(0,e,xn(A.none)),Vi=e=>Fi(0,e,{tag:"required",process:{}}),zi=e=>Fi(0,e,{tag:"required",process:{}}),Li=(e,t)=>ts(e,x(t)),Hi=e=>ts(e,w),Pi=x(Di),Ui=(e,t,o,n,s,r,a,i=!1)=>({x:e,y:t,bubble:o,direction:n,placement:s,restriction:r,label:`${a}-${s}`,alwaysFit:i}),Wi=Ms([{southeast:[]},{southwest:[]},{northeast:[]},{northwest:[]},{south:[]},{north:[]},{east:[]},{west:[]}]),ji=Wi.southeast,Gi=Wi.southwest,$i=Wi.northeast,qi=Wi.northwest,Yi=Wi.south,Xi=Wi.north,Ki=Wi.east,Ji=Wi.west,Zi=(e,t,o,n)=>{const s=e+t;return s>n?o:s<o?n:s},Qi=(e,t,o)=>Math.min(Math.max(e,t),o),el=(e,t)=>Z(["left","right","top","bottom"],(o=>be(t,o).map((t=>((e,t)=>{switch(t){case 1:return e.x;case 0:return e.x+e.width;case 2:return e.y;case 3:return e.y+e.height}})(e,t))))),tl="layout",ol=e=>e.x,nl=(e,t)=>e.x+e.width/2-t.width/2,sl=(e,t)=>e.x+e.width-t.width,rl=(e,t)=>e.y-t.height,al=e=>e.y+e.height,il=(e,t)=>e.y+e.height/2-t.height/2,ll=(e,t,o)=>Ui(ol(e),al(e),o.southeast(),ji(),"southeast",el(e,{left:1,top:3}),tl),cl=(e,t,o)=>Ui(sl(e,t),al(e),o.southwest(),Gi(),"southwest",el(e,{right:0,top:3}),tl),dl=(e,t,o)=>Ui(ol(e),rl(e,t),o.northeast(),$i(),"northeast",el(e,{left:1,bottom:2}),tl),ul=(e,t,o)=>Ui(sl(e,t),rl(e,t),o.northwest(),qi(),"northwest",el(e,{right:0,bottom:2}),tl),ml=(e,t,o)=>Ui(nl(e,t),rl(e,t),o.north(),Xi(),"north",el(e,{bottom:2}),tl),gl=(e,t,o)=>Ui(nl(e,t),al(e),o.south(),Yi(),"south",el(e,{top:3}),tl),pl=(e,t,o)=>Ui((e=>e.x+e.width)(e),il(e,t),o.east(),Ki(),"east",el(e,{left:0}),tl),hl=(e,t,o)=>Ui(((e,t)=>e.x-t.width)(e,t),il(e,t),o.west(),Ji(),"west",el(e,{right:1}),tl),fl=()=>[ll,cl,dl,ul,gl,ml,pl,hl],bl=()=>[cl,ll,ul,dl,gl,ml,pl,hl],vl=()=>[dl,ul,ll,cl,ml,gl],yl=()=>[ul,dl,cl,ll,ml,gl],xl=()=>[ll,cl,dl,ul,gl,ml],wl=()=>[cl,ll,ul,dl,gl,ml];var Sl=Object.freeze({__proto__:null,events:e=>Hr([Wr(ur(),((t,o)=>{const n=e.channels,s=ae(n),r=o,a=((e,t)=>t.universal?e:U(e,(e=>R(t.channels,e))))(s,r);H(a,(e=>{const o=n[e],s=o.schema,a=Kn("channel["+e+"] data\nReceiver: "+sa(t.element),s,r.data);o.onReceive(t,a)}))}))])}),kl=[ss("channels",qn(rn.value,Dn([Vi("onReceive"),xs("schema",Vn())])))];const Cl=(e,t,o)=>Qr(((n,s)=>{o(n,e,t)})),Ol=e=>({key:e,value:void 0}),_l=(e,t,o,n,s,r,a)=>{const i=e=>ye(e,o)?e[o]():A.none(),l=ce(s,((e,t)=>((e,t,o)=>((e,t,o)=>{const n=o.toString(),s=n.indexOf(")")+1,r=n.indexOf("("),a=n.substring(r+1,s-1).split(/,\s*/);return e.toFunctionAnnotation=()=>({name:t,parameters:xa(a.slice(0,1).concat(a.slice(3)))}),e})(((n,...s)=>{const r=[n].concat(s);return n.config({name:x(e)}).fold((()=>{throw new Error("We could not find any behaviour configuration for: "+e+". Using API: "+o)}),(e=>{const o=Array.prototype.slice.call(r,1);return t.apply(void 0,[n,e.config,e.state].concat(o))}))}),o,t))(o,e,t))),c={...ce(r,((e,t)=>wa(e,t))),...l,revoke:k(Ol,o),config:t=>{const n=Kn(o+"-config",e,t);return{key:o,value:{config:n,me:c,configAsRaw:eo((()=>Kn(o+"-config",e,t))),initialConfig:t,state:a}}},schema:x(t),exhibit:(e,t)=>Se(i(e),be(n,"exhibit"),((e,o)=>o(t,e.config,e.state))).getOrThunk((()=>Aa({}))),name:x(o),handlers:e=>i(e).map((e=>be(n,"events").getOr((()=>({})))(e.config,e.state))).getOr({})};return c},Tl=e=>Bs(e),El=Dn([ns("fields"),ns("name"),xs("active",{}),xs("apis",{}),xs("state",_a),xs("extra",{})]),Al=e=>{const t=Kn("Creating behaviour: "+e.name,El,e);return((e,t,o,n,s,r)=>{const a=Dn(e),i=ys(t,[("config",l=e,gs("config",Dn(l)))]);var l;return _l(a,i,t,o,n,s,r)})(t.fields,t.name,t.active,t.apis,t.extra,t.state)},Ml=Dn([ns("branchKey"),ns("branches"),ns("name"),xs("active",{}),xs("apis",{}),xs("state",_a),xs("extra",{})]),Dl=e=>{const t=Kn("Creating behaviour: "+e.name,Ml,e);return((e,t,o,n,s,r)=>{const a=e,i=ys(t,[gs("config",e)]);return _l(a,i,t,o,n,s,r)})(Zn(t.branchKey,t.branches),t.name,t.active,t.apis,t.extra,t.state)},Bl=x(void 0),Il=Al({fields:kl,name:"receiving",active:Sl});var Fl=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({classes:[],styles:t.useFixed()?{}:{position:"relative"}})});const Rl=(e,t=!1)=>e.dom.focus({preventScroll:t}),Nl=e=>e.dom.blur(),Vl=e=>{const t=ft(e).dom;return e.dom===t.activeElement},zl=(e=qo())=>A.from(e.dom.activeElement).map(ze),Ll=e=>zl(ft(e)).filter((t=>e.dom.contains(t.dom))),Hl=(e,t)=>{const o=ft(t),n=zl(o).bind((e=>{const o=t=>Qe(e,t);return o(t)?A.some(t):((e,t)=>{const o=e=>{for(let n=0;n<e.childNodes.length;n++){const s=ze(e.childNodes[n]);if(t(s))return A.some(s);const r=o(e.childNodes[n]);if(r.isSome())return r}return A.none()};return o(e.dom)})(t,o)})),s=e(t);return n.each((e=>{zl(o).filter((t=>Qe(t,e))).fold((()=>{Rl(e)}),b)})),s},Pl=(e,t,o,n,s)=>{const r=e=>e+"px";return{position:e,left:t.map(r),top:o.map(r),right:n.map(r),bottom:s.map(r)}},Ul=(e,t)=>{Ft(e,(e=>({...e,position:A.some(e.position)}))(t))},Wl=Ms([{none:[]},{relative:["x","y","width","height"]},{fixed:["x","y","width","height"]}]),jl=(e,t,o,n,s,r)=>{const a=t.rect,i=a.x-o,l=a.y-n,c=s-(i+a.width),d=r-(l+a.height),u=A.some(i),m=A.some(l),g=A.some(c),p=A.some(d),h=A.none();return t.direction.fold((()=>Pl(e,u,m,h,h)),(()=>Pl(e,h,m,g,h)),(()=>Pl(e,u,h,h,p)),(()=>Pl(e,h,h,g,p)),(()=>Pl(e,u,m,h,h)),(()=>Pl(e,u,h,h,p)),(()=>Pl(e,u,m,h,h)),(()=>Pl(e,h,m,g,h)))},Gl=(e,t)=>e.fold((()=>{const e=t.rect;return Pl("absolute",A.some(e.x),A.some(e.y),A.none(),A.none())}),((e,o,n,s)=>jl("absolute",t,e,o,n,s)),((e,o,n,s)=>jl("fixed",t,e,o,n,s))),$l=(e,t)=>{const o=k(Ko,t),n=e.fold(o,o,(()=>{const e=Wo();return Ko(t).translate(-e.left,-e.top)})),s=Qt(t),r=Gt(t);return Jo(n.left,n.top,s,r)},ql=(e,t)=>t.fold((()=>e.fold(tn,tn,Jo)),(t=>e.fold(x(t),x(t),(()=>{const o=Yl(e,t.x,t.y);return Jo(o.left,o.top,t.width,t.height)})))),Yl=(e,t,o)=>{const n=qt(t,o);return e.fold(x(n),x(n),(()=>{const e=Wo();return n.translate(-e.left,-e.top)}))};Wl.none;const Xl=Wl.relative,Kl=Wl.fixed,Jl="data-alloy-placement",Zl=e=>Tt(e,Jl),Ql=Ms([{fit:["reposition"]},{nofit:["reposition","visibleW","visibleH","isVisible"]}]),ec=(e,t,o,n)=>{const s=e.bubble,r=s.offset,a=((e,t,o)=>{const n=(n,s)=>t[n].map((t=>{const r="top"===n||"bottom"===n,a=r?o.top:o.left,i=("left"===n||"top"===n?Math.max:Math.min)(t,s)+a;return r?Qi(i,e.y,e.bottom):Qi(i,e.x,e.right)})).getOr(s),s=n("left",e.x),r=n("top",e.y),a=n("right",e.right),i=n("bottom",e.bottom);return Jo(s,r,a-s,i-r)})(n,e.restriction,r),i=e.x+r.left,l=e.y+r.top,c=Jo(i,l,t,o),{originInBounds:d,sizeInBounds:u,visibleW:m,visibleH:g}=((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,right:l,bottom:c,width:d,height:u}=e;return{originInBounds:a>=o&&a<=s&&i>=n&&i<=r,sizeInBounds:l<=s&&l>=o&&c<=r&&c>=n,visibleW:Math.min(d,a>=o?s-a:l-o),visibleH:Math.min(u,i>=n?r-i:c-n)}})(c,a),p=d&&u,h=p?c:((e,t)=>{const{x:o,y:n,right:s,bottom:r}=t,{x:a,y:i,width:l,height:c}=e,d=Math.max(o,s-l),u=Math.max(n,r-c),m=Qi(a,o,d),g=Qi(i,n,u),p=Math.min(m+l,s)-m,h=Math.min(g+c,r)-g;return Jo(m,g,p,h)})(c,a),f=h.width>0&&h.height>0,{maxWidth:b,maxHeight:v}=((e,t,o)=>{const n=x(t.bottom-o.y),s=x(o.bottom-t.y),r=((e,t,o,n)=>e.fold(t,t,n,n,t,n,o,o))(e,s,s,n),a=x(t.right-o.x),i=x(o.right-t.x),l=((e,t,o,n)=>e.fold(t,n,t,n,o,o,t,n))(e,i,i,a);return{maxWidth:l,maxHeight:r}})(e.direction,h,n),y={rect:h,maxHeight:v,maxWidth:b,direction:e.direction,placement:e.placement,classes:{on:s.classesOn,off:s.classesOff},layout:e.label,testY:l};return p||e.alwaysFit?Ql.fit(y):Ql.nofit(y,m,g,f)},tc=e=>{const t=As(A.none()),o=()=>t.get().each(e);return{clear:()=>{o(),t.set(A.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{o(),t.set(A.some(e))}}},oc=()=>tc((e=>e.unbind())),nc=()=>{const e=tc(b);return{...e,on:t=>e.get().each(t)}},sc=E,rc=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!1))(e,t,sc,o),ac=(e,t,o)=>((e,t,o,n)=>Fo(e,t,o,n,!0))(e,t,sc,o),ic=Io,lc=["top","bottom","right","left"],cc="data-alloy-transition-timer",dc=(e,t,o,n,s,a)=>{const i=((e,t,o)=>o.exists((o=>{const n=e.mode;return"all"===n||o[n]!==t[n]})))(n,s,a);if(i||((e,t)=>((e,t)=>X(t,(t=>$a(e,t))))(e,t.classes))(e,n)){Bt(e,"position",o.position);const a=$l(t,e),l=Gl(t,{...s,rect:a}),c=Z(lc,(e=>l[e]));((e,t)=>{const o=e=>parseFloat(e).toFixed(3);return he(t,((t,n)=>!((e,t,o=S)=>Se(e,t,o).getOr(e.isNone()&&t.isNone()))(e[n].map(o),t.map(o)))).isSome()})(o,c)&&(Ft(e,c),i&&((e,t)=>{qa(e,t.classes),Tt(e,cc).each((t=>{clearTimeout(parseInt(t,10)),At(e,cc)})),((e,t)=>{const o=oc(),n=oc();let s;const a=t=>{var o;const n=null!==(o=t.raw.pseudoElement)&&void 0!==o?o:"";return Qe(t.target,e)&&Be(n)&&R(lc,t.raw.propertyName)},i=r=>{if(m(r)||a(r)){o.clear(),n.clear();const a=null==r?void 0:r.raw.type;(m(a)||a===nr())&&(clearTimeout(s),At(e,cc),Ya(e,t.classes))}},l=rc(e,sr(),(t=>{a(t)&&(l.unbind(),o.set(rc(e,nr(),i)),n.set(rc(e,or(),i)))})),c=(e=>{const t=t=>{const o=Rt(e,t).split(/\s*,\s*/);return U(o,De)},o=e=>{if(r(e)&&/^[\d.]+/.test(e)){const t=parseFloat(e);return Ae(e,"ms")?t:1e3*t}return 0},n=t("transition-delay"),s=t("transition-duration");return j(s,((e,t,s)=>{const r=o(n[s])+o(t);return Math.max(e,r)}),0)})(e);requestAnimationFrame((()=>{s=setTimeout(i,c+17),Ct(e,cc,s)}))})(e,t)})(e,n),Pt(e))}else Ya(e,n.classes)},uc=(e,t)=>{((e,t)=>{const o=Wt.max(e,t,["margin-top","border-top-width","padding-top","padding-bottom","border-bottom-width","margin-bottom"]);Bt(e,"max-height",o+"px")})(e,Math.floor(t))},mc=x(((e,t)=>{uc(e,t),It(e,{"overflow-x":"hidden","overflow-y":"auto"})})),gc=x(((e,t)=>{uc(e,t)})),pc=(e,t,o)=>void 0===e[t]?o:e[t],hc=(e,t,o,n)=>{const s=((e,t,o,n)=>{Ht(t,"max-height"),Ht(t,"max-width");const s={width:Qt(r=t),height:Gt(r)};var r;return((e,t,o,n,s,r)=>{const a=n.width,i=n.height,l=(t,l,c,d,u)=>{const m=t(o,n,s,e,r),g=ec(m,a,i,r);return g.fold(x(g),((e,t,o,n)=>(u===n?o>d||t>c:!u&&n)?g:Ql.nofit(l,c,d,u)))};return j(t,((e,t)=>{const o=k(l,t);return e.fold(x(e),o)}),Ql.nofit({rect:o,maxHeight:n.height,maxWidth:n.width,direction:ji(),placement:"southeast",classes:{on:[],off:[]},layout:"none",testY:o.y},-1,-1,!1)).fold(w,w)})(t,n.preference,e,s,o,n.bounds)})(e,t,o,n);return((e,t,o)=>{const n=Gl(o.origin,t);o.transition.each((s=>{dc(e,o.origin,n,s,t,o.lastPlacement)})),Ul(e,n)})(t,s,n),((e,t)=>{((e,t)=>{Ct(e,Jl,t)})(e,t.placement)})(t,s),((e,t)=>{const o=t.classes;Ya(e,o.off),qa(e,o.on)})(t,s),((e,t,o)=>{(0,o.maxHeightFunction)(e,t.maxHeight)})(t,s,n),((e,t,o)=>{(0,o.maxWidthFunction)(e,t.maxWidth)})(t,s,n),{layout:s.layout,placement:s.placement}},fc=["valignCentre","alignLeft","alignRight","alignCentre","top","bottom","left","right","inset"],bc=(e,t,o,n=1)=>{const s=e*n,r=t*n,a=e=>be(o,e).getOr([]),i=(e,t,o)=>{const n=J(fc,o);return{offset:qt(e,t),classesOn:Y(o,a),classesOff:Y(n,a)}};return{southeast:()=>i(-e,t,["top","alignLeft"]),southwest:()=>i(e,t,["top","alignRight"]),south:()=>i(-e/2,t,["top","alignCentre"]),northeast:()=>i(-e,-t,["bottom","alignLeft"]),northwest:()=>i(e,-t,["bottom","alignRight"]),north:()=>i(-e/2,-t,["bottom","alignCentre"]),east:()=>i(e,-t/2,["valignCentre","left"]),west:()=>i(-e,-t/2,["valignCentre","right"]),insetNortheast:()=>i(s,r,["top","alignLeft","inset"]),insetNorthwest:()=>i(-s,r,["top","alignRight","inset"]),insetNorth:()=>i(-s/2,r,["top","alignCentre","inset"]),insetSoutheast:()=>i(s,-r,["bottom","alignLeft","inset"]),insetSouthwest:()=>i(-s,-r,["bottom","alignRight","inset"]),insetSouth:()=>i(-s/2,-r,["bottom","alignCentre","inset"]),insetEast:()=>i(-s,-r/2,["valignCentre","right","inset"]),insetWest:()=>i(s,-r/2,["valignCentre","left","inset"])}},vc=()=>bc(0,0,{}),yc=w,xc=(e,t)=>o=>"rtl"===wc(o)?t:e,wc=e=>"rtl"===Rt(e,"direction")?"rtl":"ltr";var Sc;!function(e){e.TopToBottom="toptobottom",e.BottomToTop="bottomtotop"}(Sc||(Sc={}));const kc="data-alloy-vertical-dir",Cc=e=>hi(e,(e=>$e(e)&&_t(e,"data-alloy-vertical-dir")===Sc.BottomToTop)),Oc=()=>ys("layouts",[ns("onLtr"),ns("onRtl"),ms("onBottomLtr"),ms("onBottomRtl")]),_c=(e,t,o,n,s,r,a)=>{const i=a.map(Cc).getOr(!1),l=t.layouts.map((t=>t.onLtr(e))),c=t.layouts.map((t=>t.onRtl(e))),d=i?t.layouts.bind((t=>t.onBottomLtr.map((t=>t(e))))).or(l).getOr(s):l.getOr(o),u=i?t.layouts.bind((t=>t.onBottomRtl.map((t=>t(e))))).or(c).getOr(r):c.getOr(n);return xc(d,u)(e)};var Tc=[ns("hotspot"),ms("bubble"),xs("overrides",{}),Oc(),Li("placement",((e,t,o)=>{const n=t.hotspot,s=$l(o,n.element),r=_c(e.element,t,xl(),wl(),vl(),yl(),A.some(t.hotspot.element));return A.some(yc({anchorBox:s,bubble:t.bubble.getOr(vc()),overrides:t.overrides,layouts:r}))}))],Ec=[ns("x"),ns("y"),xs("height",0),xs("width",0),xs("bubble",vc()),xs("overrides",{}),Oc(),Li("placement",((e,t,o)=>{const n=Yl(o,t.x,t.y),s=Jo(n.left,n.top,t.width,t.height),r=_c(e.element,t,fl(),bl(),fl(),bl(),A.none());return A.some(yc({anchorBox:s,bubble:t.bubble,overrides:t.overrides,layouts:r}))}))];const Ac=Ms([{screen:["point"]},{absolute:["point","scrollLeft","scrollTop"]}]),Mc=e=>e.fold(w,((e,t,o)=>e.translate(-t,-o))),Dc=e=>e.fold(w,w),Bc=e=>j(e,((e,t)=>e.translate(t.left,t.top)),qt(0,0)),Ic=e=>{const t=L(e,Dc);return Bc(t)},Fc=Ac.screen,Rc=Ac.absolute,Nc=(e,t,o)=>{const n=tt(e.element),s=Wo(n),r=((e,t,o)=>{const n=st(o.root).dom;return A.from(n.frameElement).map(ze).filter((t=>{const o=tt(t),n=tt(e.element);return Qe(o,n)})).map(Xt)})(e,0,o).getOr(s);return Rc(r,s.left,s.top)},Vc=(e,t,o,n)=>{const s=Fc(qt(e,t));return A.some(((e,t,o)=>({point:e,width:t,height:o}))(s,o,n))},zc=(e,t,o,n,s)=>e.map((e=>{const r=[t,e.point],a=(i=()=>Ic(r),l=()=>Ic(r),c=()=>(e=>{const t=L(e,Mc);return Bc(t)})(r),n.fold(i,l,c));var i,l,c;const d=(p=a.left,h=a.top,f=e.width,b=e.height,{x:p,y:h,width:f,height:b}),u=o.showAbove?vl():xl(),m=o.showAbove?yl():wl(),g=_c(s,o,u,m,u,m,A.none());var p,h,f,b;return yc({anchorBox:d,bubble:o.bubble.getOr(vc()),overrides:o.overrides,layouts:g})}));var Lc=[ns("node"),ns("root"),ms("bubble"),Oc(),xs("overrides",{}),xs("showAbove",!1),Li("placement",((e,t,o)=>{const n=Nc(e,0,t);return t.node.filter(xt).bind((s=>{const r=s.dom.getBoundingClientRect(),a=Vc(r.left,r.top,r.width,r.height),i=t.node.getOr(e.element);return zc(a,n,t,o,i)}))}))];const Hc=(e,t,o,n)=>({start:e,soffset:t,finish:o,foffset:n}),Pc=Ms([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Uc=(Pc.before,Pc.on,Pc.after,e=>e.fold(w,w,w)),Wc=Ms([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),jc={domRange:Wc.domRange,relative:Wc.relative,exact:Wc.exact,exactFromRange:e=>Wc.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>ze(e.startContainer),relative:(e,t)=>Uc(e),exact:(e,t,o,n)=>e}))(e);return st(t)},range:Hc},Gc=(e,t,o)=>{const n=e.document.createRange();var s;return s=n,t.fold((e=>{s.setStartBefore(e.dom)}),((e,t)=>{s.setStart(e.dom,t)}),(e=>{s.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,o)=>{e.setEnd(t.dom,o)}),(t=>{e.setEndAfter(t.dom)}))})(n,o),n},$c=(e,t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},qc=e=>({left:e.left,top:e.top,right:e.right,bottom:e.bottom,width:e.width,height:e.height}),Yc=Ms([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Xc=(e,t,o)=>t(ze(o.startContainer),o.startOffset,ze(o.endContainer),o.endOffset),Kc=(e,t)=>((e,t)=>{const o=((e,t)=>t.match({domRange:e=>({ltr:x(e),rtl:A.none}),relative:(t,o)=>({ltr:eo((()=>Gc(e,t,o))),rtl:eo((()=>A.some(Gc(e,o,t))))}),exact:(t,o,n,s)=>({ltr:eo((()=>$c(e,t,o,n,s))),rtl:eo((()=>A.some($c(e,n,s,t,o))))})}))(e,t);return((e,t)=>{const o=t.ltr();return o.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>Yc.rtl(ze(e.endContainer),e.endOffset,ze(e.startContainer),e.startOffset))).getOrThunk((()=>Xc(0,Yc.ltr,o))):Xc(0,Yc.ltr,o)})(0,o)})(e,t).match({ltr:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(t.dom,o),r.setEnd(n.dom,s),r},rtl:(t,o,n,s)=>{const r=e.document.createRange();return r.setStart(n.dom,s),r.setEnd(t.dom,o),r}});Yc.ltr,Yc.rtl;const Jc=(e,t,o)=>U(((e,t)=>{const o=p(t)?t:T;let n=e.dom;const s=[];for(;null!==n.parentNode&&void 0!==n.parentNode;){const e=n.parentNode,t=ze(e);if(s.push(t),!0===o(t))break;n=e}return s})(e,o),t),Zc=(e,t)=>((e,t)=>{const o=void 0===t?document:t.dom;return Ze(o)?[]:L(o.querySelectorAll(e),ze)})(t,e),Qc=e=>{if(e.rangeCount>0){const t=e.getRangeAt(0),o=e.getRangeAt(e.rangeCount-1);return A.some(Hc(ze(t.startContainer),t.startOffset,ze(o.endContainer),o.endOffset))}return A.none()},ed=e=>{if(null===e.anchorNode||null===e.focusNode)return Qc(e);{const t=ze(e.anchorNode),o=ze(e.focusNode);return((e,t,o,n)=>{const s=((e,t,o,n)=>{const s=tt(e).dom.createRange();return s.setStart(e.dom,t),s.setEnd(o.dom,n),s})(e,t,o,n),r=Qe(e,o)&&t===n;return s.collapsed&&!r})(t,e.anchorOffset,o,e.focusOffset)?A.some(Hc(t,e.anchorOffset,o,e.focusOffset)):Qc(e)}},td=(e,t)=>(e=>{const t=e.getClientRects(),o=t.length>0?t[0]:e.getBoundingClientRect();return o.width>0||o.height>0?A.some(o).map(qc):A.none()})(Kc(e,t)),od=((e,t)=>{const o=t=>e(t)?A.from(t.dom.nodeValue):A.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return o(t).getOr("")},getOption:o,set:(t,o)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=o}}})(qe),nd=(e,t)=>({element:e,offset:t}),sd=(e,t)=>qe(e)?nd(e,t):((e,t)=>{const o=lt(e);if(0===o.length)return nd(e,t);if(t<o.length)return nd(o[t],0);{const e=o[o.length-1],t=qe(e)?(e=>od.get(e))(e).length:lt(e).length;return nd(e,t)}})(e,t),rd=e=>void 0!==e.foffset,ad=(e,t)=>t.getSelection.getOrThunk((()=>()=>(e=>(e=>A.from(e.getSelection()))(e).filter((e=>e.rangeCount>0)).bind(ed))(e)))().map((e=>{if(rd(e)){const t=sd(e.start,e.soffset),o=sd(e.finish,e.foffset);return jc.range(t.element,t.offset,o.element,o.offset)}return e}));var id=[ms("getSelection"),ns("root"),ms("bubble"),Oc(),xs("overrides",{}),xs("showAbove",!1),Li("placement",((e,t,o)=>{const n=st(t.root).dom,s=Nc(e,0,t),r=ad(n,t).bind((e=>{if(rd(e)){const t=((e,t)=>(e=>{const t=e.getBoundingClientRect();return t.width>0||t.height>0?A.some(t).map(qc):A.none()})(Kc(e,t)))(n,jc.exactFromRange(e)).orThunk((()=>{const t=Ve("\ufeff");No(e.start,t);const o=td(n,jc.exact(t,0,t,1));return Uo(t),o}));return t.bind((e=>Vc(e.left,e.top,e.width,e.height)))}{const t=ce(e,(e=>e.dom.getBoundingClientRect())),o={left:Math.min(t.firstCell.left,t.lastCell.left),right:Math.max(t.firstCell.right,t.lastCell.right),top:Math.min(t.firstCell.top,t.lastCell.top),bottom:Math.max(t.firstCell.bottom,t.lastCell.bottom)};return Vc(o.left,o.top,o.right-o.left,o.bottom-o.top)}})),a=ad(n,t).bind((e=>rd(e)?$e(e.start)?A.some(e.start):at(e.start):A.some(e.firstCell))).getOr(e.element);return zc(r,s,t,o,a)}))];const ld="link-layout",cd=e=>e.x+e.width,dd=(e,t)=>e.x-t.width,ud=(e,t)=>e.y-t.height+e.height,md=e=>e.y,gd=(e,t,o)=>Ui(cd(e),md(e),o.southeast(),ji(),"southeast",el(e,{left:0,top:2}),ld),pd=(e,t,o)=>Ui(dd(e,t),md(e),o.southwest(),Gi(),"southwest",el(e,{right:1,top:2}),ld),hd=(e,t,o)=>Ui(cd(e),ud(e,t),o.northeast(),$i(),"northeast",el(e,{left:0,bottom:3}),ld),fd=(e,t,o)=>Ui(dd(e,t),ud(e,t),o.northwest(),qi(),"northwest",el(e,{right:1,bottom:3}),ld),bd=()=>[gd,pd,hd,fd],vd=()=>[pd,gd,fd,hd];var yd=[ns("item"),Oc(),xs("overrides",{}),Li("placement",((e,t,o)=>{const n=$l(o,t.item.element),s=_c(e.element,t,bd(),vd(),bd(),vd(),A.none());return A.some(yc({anchorBox:n,bubble:vc(),overrides:t.overrides,layouts:s}))}))],xd=Zn("type",{selection:id,node:Lc,hotspot:Tc,submenu:yd,makeshift:Ec});const wd=[us("classes",Hn),Cs("mode","all",["all","layout","placement"])],Sd=[xs("useFixed",T),ms("getBounds")],kd=[ss("anchor",xd),ys("transition",wd)],Cd=(e,t,o,n,s,r)=>{const a=Kn("placement.info",Bn(kd),s),i=a.anchor,l=n.element,c=o.get(n.uid);Hl((()=>{Bt(l,"position","fixed");const s=Vt(l,"visibility");Bt(l,"visibility","hidden");const d=t.useFixed()?(()=>{const e=document.documentElement;return Kl(0,0,e.clientWidth,e.clientHeight)})():(e=>{const t=Xt(e.element),o=e.element.dom.getBoundingClientRect();return Xl(t.left,t.top,o.width,o.height)})(e);i.placement(e,i,d).each((e=>{const s=r.orThunk((()=>t.getBounds.map(_))),i=((e,t,o,n,s,r)=>((e,t,o,n,s,r,a,i)=>{const l=pc(a,"maxHeightFunction",mc()),c=pc(a,"maxWidthFunction",b),d=e.anchorBox,u=e.origin,m={bounds:ql(u,r),origin:u,preference:n,maxHeightFunction:l,maxWidthFunction:c,lastPlacement:s,transition:i};return hc(d,t,o,m)})(((e,t)=>((e,t)=>({anchorBox:e,origin:t}))(e,t))(t.anchorBox,e),n.element,t.bubble,t.layouts,s,o,t.overrides,r))(d,e,s,n,c,a.transition);o.set(n.uid,i)})),s.fold((()=>{Ht(l,"visibility")}),(e=>{Bt(l,"visibility",e)})),Vt(l,"left").isNone()&&Vt(l,"top").isNone()&&Vt(l,"right").isNone()&&Vt(l,"bottom").isNone()&&xe(Vt(l,"position"),"fixed")&&Ht(l,"position")}),l)};var Od=Object.freeze({__proto__:null,position:(e,t,o,n,s)=>{const r=A.none();Cd(e,t,o,n,s,r)},positionWithinBounds:Cd,getMode:(e,t,o)=>t.useFixed()?"fixed":"absolute",reset:(e,t,o,n)=>{const s=n.element;H(["position","left","right","top","bottom"],(e=>Ht(s,e))),(e=>{At(e,Jl)})(s),o.clear(n.uid)}});const _d=Al({fields:Sd,name:"positioning",active:Fl,apis:Od,state:Object.freeze({__proto__:null,init:()=>{let e={};return Ta({readState:()=>e,clear:t=>{g(t)?delete e[t]:e={}},set:(t,o)=>{e[t]=o},get:t=>be(e,t)})}})}),Td=e=>e.getSystem().isConnected(),Ed=e=>{Fr(e,Cr());const t=e.components();H(t,Ed)},Ad=e=>{const t=e.components();H(t,Ad),Fr(e,kr())},Md=(e,t)=>{e.getSystem().addToWorld(t),xt(e.element)&&Ad(t)},Dd=e=>{Ed(e),e.getSystem().removeFromWorld(e)},Bd=(e,t)=>{Lo(e.element,t.element)},Id=(e,t)=>{Fd(e,t,Lo)},Fd=(e,t,o)=>{e.getSystem().addToWorld(t),o(e.element,t.element),xt(e.element)&&Ad(t),e.syncComponents()},Rd=e=>{Ed(e),Uo(e.element),e.getSystem().removeFromWorld(e)},Nd=e=>{const t=rt(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()));Rd(e),t.each((e=>{e.syncComponents()}))},Vd=e=>{const t=e.components();H(t,Rd),Po(e.element),e.syncComponents()},zd=(e,t)=>{Hd(e,t,Lo)},Ld=(e,t)=>{Hd(e,t,Vo)},Hd=(e,t,o)=>{o(e,t.element);const n=lt(t.element);H(n,(e=>{t.getByDom(e).each(Ad)}))},Pd=e=>{const t=lt(e.element);H(t,(t=>{e.getByDom(t).each(Ed)})),Uo(e.element)},Ud=(e,t,o,n)=>{o.get().each((t=>{Vd(e)}));const s=t.getAttachPoint(e);Id(s,e);const r=e.getSystem().build(n);return Id(e,r),o.set(r),r},Wd=(e,t,o,n)=>{const s=Ud(e,t,o,n);return t.onOpen(e,s),s},jd=(e,t,o)=>{o.get().each((n=>{Vd(e),Nd(e),t.onClose(e,n),o.clear()}))},Gd=(e,t,o)=>o.isOpen(),$d=(e,t,o)=>{const n=t.getAttachPoint(e);Bt(e.element,"position",_d.getMode(n)),((e,t,o,n)=>{Vt(e.element,t).fold((()=>{At(e.element,o)}),(t=>{Ct(e.element,o,t)})),Bt(e.element,t,"hidden")})(e,"visibility",t.cloakVisibilityAttr)},qd=(e,t,o)=>{(e=>N(["top","left","right","bottom"],(t=>Vt(e,t).isSome())))(e.element)||Ht(e.element,"position"),((e,t,o)=>{Tt(e.element,o).fold((()=>Ht(e.element,t)),(o=>Bt(e.element,t,o)))})(e,"visibility",t.cloakVisibilityAttr)};var Yd=Object.freeze({__proto__:null,cloak:$d,decloak:qd,open:Wd,openWhileCloaked:(e,t,o,n,s)=>{$d(e,t),Wd(e,t,o,n),s(),qd(e,t)},close:jd,isOpen:Gd,isPartOf:(e,t,o,n)=>Gd(0,0,o)&&o.get().exists((o=>t.isPartOf(e,o,n))),getState:(e,t,o)=>o.get(),setContent:(e,t,o,n)=>o.get().map((()=>Ud(e,t,o,n)))}),Xd=Object.freeze({__proto__:null,events:(e,t)=>Hr([Wr(fr(),((o,n)=>{jd(o,e,t)}))])}),Kd=[Ri("onOpen"),Ri("onClose"),ns("isPartOf"),ns("getAttachPoint"),xs("cloakVisibilityAttr","data-precloak-visibility")],Jd=Object.freeze({__proto__:null,init:()=>{const e=nc(),t=x("not-implemented");return Ta({readState:t,isOpen:e.isSet,clear:e.clear,set:e.set,get:e.get})}});const Zd=Al({fields:Kd,name:"sandboxing",active:Xd,apis:Yd,state:Jd}),Qd=x("dismiss.popups"),eu=x("reposition.popups"),tu=x("mouse.released"),ou=Dn([xs("isExtraPart",T),ys("fireEventInstead",[xs("event",Or())])]),nu=e=>{const t=Kn("Dismissal",ou,e);return{[Qd()]:{schema:Dn([ns("target")]),onReceive:(e,o)=>{Zd.isOpen(e)&&(Zd.isPartOf(e,o.target)||t.isExtraPart(e,o.target)||t.fireEventInstead.fold((()=>Zd.close(e)),(t=>Fr(e,t.event))))}}}},su=Dn([ys("fireEventInstead",[xs("event",_r())]),ls("doReposition")]),ru=e=>{const t=Kn("Reposition",su,e);return{[eu()]:{onReceive:e=>{Zd.isOpen(e)&&t.fireEventInstead.fold((()=>t.doReposition(e)),(t=>Fr(e,t.event)))}}}},au=(e,t,o)=>{t.store.manager.onLoad(e,t,o)},iu=(e,t,o)=>{t.store.manager.onUnload(e,t,o)};var lu=Object.freeze({__proto__:null,onLoad:au,onUnload:iu,setValue:(e,t,o,n)=>{t.store.manager.setValue(e,t,o,n)},getValue:(e,t,o)=>t.store.manager.getValue(e,t,o),getState:(e,t,o)=>o}),cu=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.resetOnDom?[Jr(((o,n)=>{au(o,e,t)})),Zr(((o,n)=>{iu(o,e,t)}))]:[Cl(e,t,au)];return Hr(o)}});const du=()=>{const e=As(null);return Ta({set:e.set,get:e.get,isNotSet:()=>null===e.get(),clear:()=>{e.set(null)},readState:()=>({mode:"memory",value:e.get()})})},uu=()=>{const e=As({}),t=As({});return Ta({readState:()=>({mode:"dataset",dataByValue:e.get(),dataByText:t.get()}),lookup:o=>be(e.get(),o).orThunk((()=>be(t.get(),o))),update:o=>{const n=e.get(),s=t.get(),r={},a={};H(o,(e=>{r[e.value]=e,be(e,"meta").each((t=>{be(t,"text").each((t=>{a[t]=e}))}))})),e.set({...n,...r}),t.set({...s,...a})},clear:()=>{e.set({}),t.set({})}})};var mu=Object.freeze({__proto__:null,memory:du,dataset:uu,manual:()=>Ta({readState:b}),init:e=>e.store.manager.state(e)});const gu=(e,t,o,n)=>{const s=t.store;o.update([n]),s.setValue(e,n),t.onSetValue(e,n)};var pu=[ms("initialValue"),ns("getFallbackEntry"),ns("getDataKey"),ns("setValue"),Li("manager",{setValue:gu,getValue:(e,t,o)=>{const n=t.store,s=n.getDataKey(e);return o.lookup(s).getOrThunk((()=>n.getFallbackEntry(s)))},onLoad:(e,t,o)=>{t.store.initialValue.each((n=>{gu(e,t,o,n)}))},onUnload:(e,t,o)=>{o.clear()},state:uu})],hu=[ns("getValue"),xs("setValue",b),ms("initialValue"),Li("manager",{setValue:(e,t,o,n)=>{t.store.setValue(e,n),t.onSetValue(e,n)},getValue:(e,t,o)=>t.store.getValue(e),onLoad:(e,t,o)=>{t.store.initialValue.each((o=>{t.store.setValue(e,o)}))},onUnload:b,state:_a.init})],fu=[ms("initialValue"),Li("manager",{setValue:(e,t,o,n)=>{o.set(n),t.onSetValue(e,n)},getValue:(e,t,o)=>o.get(),onLoad:(e,t,o)=>{t.store.initialValue.each((e=>{o.isNotSet()&&o.set(e)}))},onUnload:(e,t,o)=>{o.clear()},state:du})],bu=[ws("store",{mode:"memory"},Zn("mode",{memory:fu,manual:hu,dataset:pu})),Ri("onSetValue"),xs("resetOnDom",!1)];const vu=Al({fields:bu,name:"representing",active:cu,apis:lu,extra:{setValueFrom:(e,t)=>{const o=vu.getValue(t);vu.setValue(e,o)}},state:mu}),yu=(e,t)=>Es(e,{},L(t,(t=>{return o=t.name(),n="Cannot configure "+t.name()+" for "+e,es(o,o,{tag:"option",process:{}},On((e=>mn("The field: "+o+" is forbidden. "+n))));var o,n})).concat([ts("dump",w)])),xu=e=>e.dump,wu=(e,t)=>({...Tl(t),...e.dump}),Su=yu,ku=wu,Cu="placeholder",Ou=Ms([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),_u=e=>ve(e,"uiType"),Tu=(e,t,o,n)=>((e,t,o,n)=>_u(o)&&o.uiType===Cu?((e,t,o,n)=>e.exists((e=>e!==o.owner))?Ou.single(!0,x(o)):be(n,o.name).fold((()=>{throw new Error("Unknown placeholder component: "+o.name+"\nKnown: ["+ae(n)+"]\nNamespace: "+e.getOr("none")+"\nSpec: "+JSON.stringify(o,null,2))}),(e=>e.replace())))(e,0,o,n):Ou.single(!1,x(o)))(e,0,o,n).fold(((s,r)=>{const a=_u(o)?r(t,o.config,o.validated):r(t),i=be(a,"components").getOr([]),l=Y(i,(o=>Tu(e,t,o,n)));return[{...a,components:l}]}),((e,n)=>{if(_u(o)){const e=n(t,o.config,o.validated);return o.validated.preprocess.getOr(w)(e)}return n(t)})),Eu=Ou.single,Au=Ou.multiple,Mu=x(Cu),Du=Ms([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Bu=xs("factory",{sketch:w}),Iu=xs("schema",[]),Fu=ns("name"),Ru=es("pname","pname",yn((e=>"<alloy."+ca(e.name)+">")),Vn()),Nu=ts("schema",(()=>[ms("preprocess")])),Vu=xs("defaults",x({})),zu=xs("overrides",x({})),Lu=Bn([Bu,Iu,Fu,Ru,Vu,zu]),Hu=Bn([Bu,Iu,Fu,Vu,zu]),Pu=Bn([Bu,Iu,Fu,Ru,Vu,zu]),Uu=Bn([Bu,Nu,Fu,ns("unit"),Ru,Vu,zu]),Wu=e=>e.fold(A.some,A.none,A.some,A.some),ju=e=>{const t=e=>e.name;return e.fold(t,t,t,t)},Gu=(e,t)=>o=>{const n=Kn("Converting part type",t,o);return e(n)},$u=Gu(Du.required,Lu),qu=Gu(Du.external,Hu),Yu=Gu(Du.optional,Pu),Xu=Gu(Du.group,Uu),Ku=x("entirety");var Ju=Object.freeze({__proto__:null,required:$u,external:qu,optional:Yu,group:Xu,asNamedPart:Wu,name:ju,asCommon:e=>e.fold(w,w,w,w),original:Ku});const Zu=(e,t,o,n)=>bn(t.defaults(e,o,n),o,{uid:e.partUids[t.name]},t.overrides(e,o,n)),Qu=(e,t)=>{const o={};return H(t,(t=>{Wu(t).each((t=>{const n=em(e,t.pname);o[t.name]=o=>{const s=Kn("Part: "+t.name+" in "+e,Bn(t.schema),o);return{...n,config:o,validated:s}}}))})),o},em=(e,t)=>({uiType:Mu(),owner:e,name:t}),tm=(e,t,o)=>({uiType:Mu(),owner:e,name:t,config:o,validated:{}}),om=e=>Y(e,(e=>e.fold(A.none,A.some,A.none,A.none).map((e=>cs(e.name,e.schema.concat([Hi(Ku())])))).toArray())),nm=e=>L(e,ju),sm=(e,t,o)=>((e,t,o)=>{const n={},s={};return H(o,(e=>{e.fold((e=>{n[e.pname]=Eu(!0,((t,o,n)=>e.factory.sketch(Zu(t,e,o,n))))}),(e=>{const o=t.parts[e.name];s[e.name]=x(e.factory.sketch(Zu(t,e,o[Ku()]),o))}),(e=>{n[e.pname]=Eu(!1,((t,o,n)=>e.factory.sketch(Zu(t,e,o,n))))}),(e=>{n[e.pname]=Au(!0,((t,o,n)=>{const s=t[e.name];return L(s,(o=>e.factory.sketch(bn(e.defaults(t,o,n),o,e.overrides(t,o)))))}))}))})),{internals:x(n),externals:x(s)}})(0,t,o),rm=(e,t,o)=>((e,t,o,n)=>{const s=ce(n,((e,t)=>((e,t)=>{let o=!1;return{name:x(e),required:()=>t.fold(((e,t)=>e),((e,t)=>e)),used:()=>o,replace:()=>{if(o)throw new Error("Trying to use the same placeholder more than once: "+e);return o=!0,t}}})(t,e))),r=((e,t,o,n)=>Y(o,(o=>Tu(e,t,o,n))))(e,t,o,s);return le(s,(o=>{if(!1===o.used()&&o.required())throw new Error("Placeholder: "+o.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+JSON.stringify(t.components,null,2))})),r})(A.some(e),t,t.components,o),am=(e,t,o)=>{const n=t.partUids[o];return e.getSystem().getByUid(n).toOptional()},im=(e,t,o)=>am(e,t,o).getOrDie("Could not find part: "+o),lm=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return H(o,(e=>{n[e]=x(r.getByUid(s[e]))})),n},cm=(e,t)=>{const o=e.getSystem();return ce(t.partUids,((e,t)=>x(o.getByUid(e))))},dm=e=>ae(e.partUids),um=(e,t,o)=>{const n={},s=t.partUids,r=e.getSystem();return H(o,(e=>{n[e]=x(r.getByUid(s[e]).getOrDie())})),n},mm=(e,t)=>{const o=nm(t);return Bs(L(o,(t=>({key:t,value:e+"-"+t}))))},gm=e=>es("partUids","partUids",wn((t=>mm(t.uid,e))),Vn());var pm=Object.freeze({__proto__:null,generate:Qu,generateOne:tm,schemas:om,names:nm,substitutes:sm,components:rm,defaultUids:mm,defaultUidsSchema:gm,getAllParts:cm,getAllPartNames:dm,getPart:am,getPartOrDie:im,getParts:lm,getPartsOrDie:um});const hm=(e,t,o,n,s)=>{const r=((e,t)=>(e.length>0?[cs("parts",e)]:[]).concat([ns("uid"),xs("dom",{}),xs("components",[]),Hi("originalSpec"),xs("debug.sketcher",{})]).concat(t))(n,s);return Kn(e+" [SpecSchema]",Dn(r.concat(t)),o)},fm=(e,t,o,n,s)=>{const r=bm(s),a=om(o),i=gm(o),l=hm(e,t,r,a,[i]),c=sm(0,l,o);return n(l,rm(e,l,c.internals()),r,c.externals())},bm=e=>(e=>ve(e,"uid"))(e)?e:{...e,uid:fa("uid")},vm=Dn([ns("name"),ns("factory"),ns("configFields"),xs("apis",{}),xs("extraApis",{})]),ym=Dn([ns("name"),ns("factory"),ns("configFields"),ns("partFields"),xs("apis",{}),xs("extraApis",{})]),xm=e=>{const t=Kn("Sketcher for "+e.name,vm,e),o=ce(t.apis,Oa),n=ce(t.extraApis,((e,t)=>wa(e,t)));return{name:t.name,configFields:t.configFields,sketch:e=>((e,t,o,n)=>{const s=bm(n);return o(hm(e,t,s,[],[]),s)})(t.name,t.configFields,t.factory,e),...o,...n}},wm=e=>{const t=Kn("Sketcher for "+e.name,ym,e),o=Qu(t.name,t.partFields),n=ce(t.apis,Oa),s=ce(t.extraApis,((e,t)=>wa(e,t)));return{name:t.name,partFields:t.partFields,configFields:t.configFields,sketch:e=>fm(t.name,t.configFields,t.partFields,t.factory,e),parts:o,...n,...s}},Sm=e=>Ke("input")(e)&&"radio"!==_t(e,"type")||Ke("textarea")(e);var km=Object.freeze({__proto__:null,getCurrent:(e,t,o)=>t.find(e)});const Cm=[ns("find")],Om=Al({fields:Cm,name:"composing",apis:km}),_m=["input","button","textarea","select"],Tm=(e,t,o)=>{(t.disabled()?Im:Fm)(e,t)},Em=(e,t)=>!0===t.useNative&&R(_m,We(e.element)),Am=e=>{Ct(e.element,"disabled","disabled")},Mm=e=>{At(e.element,"disabled")},Dm=e=>{Ct(e.element,"aria-disabled","true")},Bm=e=>{Ct(e.element,"aria-disabled","false")},Im=(e,t,o)=>{t.disableClass.each((t=>{Wa(e.element,t)})),(Em(e,t)?Am:Dm)(e),t.onDisabled(e)},Fm=(e,t,o)=>{t.disableClass.each((t=>{Ga(e.element,t)})),(Em(e,t)?Mm:Bm)(e),t.onEnabled(e)},Rm=(e,t)=>Em(e,t)?(e=>Et(e.element,"disabled"))(e):(e=>"true"===_t(e.element,"aria-disabled"))(e);var Nm=Object.freeze({__proto__:null,enable:Fm,disable:Im,isDisabled:Rm,onLoad:Tm,set:(e,t,o,n)=>{(n?Im:Fm)(e,t)}}),Vm=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({classes:t.disabled()?t.disableClass.toArray():[]}),events:(e,t)=>Hr([Pr(mr(),((t,o)=>Rm(t,e))),Cl(e,t,Tm)])}),zm=[_s("disabled",T),xs("useNative",!0),ms("disableClass"),Ri("onDisabled"),Ri("onEnabled")];const Lm=Al({fields:zm,name:"disabling",active:Vm,apis:Nm}),Hm=(e,t,o,n)=>{const s=Zc(e.element,"."+t.highlightClass);H(s,(o=>{N(n,(e=>Qe(e.element,o)))||(Ga(o,t.highlightClass),e.getSystem().getByDom(o).each((o=>{t.onDehighlight(e,o),Fr(o,Ir())})))}))},Pm=(e,t,o,n)=>{Hm(e,t,0,[n]),Um(e,t,o,n)||(Wa(n.element,t.highlightClass),t.onHighlight(e,n),Fr(n,Br()))},Um=(e,t,o,n)=>$a(n.element,t.highlightClass),Wm=(e,t,o)=>vi(e.element,"."+t.itemClass).bind((t=>e.getSystem().getByDom(t).toOptional())),jm=(e,t,o)=>{const n=Zc(e.element,"."+t.itemClass);return(n.length>0?A.some(n[n.length-1]):A.none()).bind((t=>e.getSystem().getByDom(t).toOptional()))},Gm=(e,t,o,n)=>{const s=Zc(e.element,"."+t.itemClass);return $(s,(e=>$a(e,t.highlightClass))).bind((t=>{const o=Zi(t,n,0,s.length-1);return e.getSystem().getByDom(s[o]).toOptional()}))},$m=(e,t,o)=>{const n=Zc(e.element,"."+t.itemClass);return we(L(n,(t=>e.getSystem().getByDom(t).toOptional())))};var qm=Object.freeze({__proto__:null,dehighlightAll:(e,t,o)=>Hm(e,t,0,[]),dehighlight:(e,t,o,n)=>{Um(e,t,o,n)&&(Ga(n.element,t.highlightClass),t.onDehighlight(e,n),Fr(n,Ir()))},highlight:Pm,highlightFirst:(e,t,o)=>{Wm(e,t).each((n=>{Pm(e,t,o,n)}))},highlightLast:(e,t,o)=>{jm(e,t).each((n=>{Pm(e,t,o,n)}))},highlightAt:(e,t,o,n)=>{((e,t,o,n)=>{const s=Zc(e.element,"."+t.itemClass);return A.from(s[n]).fold((()=>rn.error(new Error("No element found with index "+n))),e.getSystem().getByDom)})(e,t,0,n).fold((e=>{throw e}),(n=>{Pm(e,t,o,n)}))},highlightBy:(e,t,o,n)=>{const s=$m(e,t);G(s,n).each((n=>{Pm(e,t,o,n)}))},isHighlighted:Um,getHighlighted:(e,t,o)=>vi(e.element,"."+t.highlightClass).bind((t=>e.getSystem().getByDom(t).toOptional())),getFirst:Wm,getLast:jm,getPrevious:(e,t,o)=>Gm(e,t,0,-1),getNext:(e,t,o)=>Gm(e,t,0,1),getCandidates:$m}),Ym=[ns("highlightClass"),ns("itemClass"),Ri("onHighlight"),Ri("onDehighlight")];const Xm=Al({fields:Ym,name:"highlighting",apis:qm}),Km=[8],Jm=[9],Zm=[13],Qm=[27],eg=[32],tg=[37],og=[38],ng=[39],sg=[40],rg=(e,t,o)=>{const n=K(e.slice(0,t)),s=K(e.slice(t+1));return G(n.concat(s),o)},ag=(e,t,o)=>{const n=K(e.slice(0,t));return G(n,o)},ig=(e,t,o)=>{const n=e.slice(0,t),s=e.slice(t+1);return G(s.concat(n),o)},lg=(e,t,o)=>{const n=e.slice(t+1);return G(n,o)},cg=e=>t=>{const o=t.raw;return R(e,o.which)},dg=e=>t=>X(e,(e=>e(t))),ug=e=>!0===e.raw.shiftKey,mg=e=>!0===e.raw.ctrlKey,gg=C(ug),pg=(e,t)=>({matches:e,classification:t}),hg=(e,t,o)=>{t.exists((e=>o.exists((t=>Qe(t,e)))))||Rr(e,Tr(),{prevFocus:t,newFocus:o})},fg=()=>{const e=e=>Ll(e.element);return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().triggerFocus(o,t.element);const s=e(t);hg(t,n,s)}}},bg=()=>{const e=e=>Xm.getHighlighted(e).map((e=>e.element));return{get:e,set:(t,o)=>{const n=e(t);t.getSystem().getByDom(o).fold(b,(e=>{Xm.highlight(t,e)}));const s=e(t);hg(t,n,s)}}};var vg;!function(e){e.OnFocusMode="onFocus",e.OnEnterOrSpaceMode="onEnterOrSpace",e.OnApiMode="onApi"}(vg||(vg={}));const yg=(e,t,o,n,s)=>{const r=(e,t,o,n,s)=>{return(r=o(e,t,n,s),a=t.event,G(r,(e=>e.matches(a))).map((e=>e.classification))).bind((o=>o(e,t,n,s)));var r,a},a={schema:()=>e.concat([xs("focusManager",fg()),ws("focusInside","onFocus",$n((e=>R(["onFocus","onEnterOrSpace","onApi"],e)?rn.value(e):rn.error("Invalid value for focusInside")))),Li("handler",a),Li("state",t),Li("sendFocusIn",s)]),processKey:r,toEvents:(e,t)=>{const a=e.focusInside!==vg.OnFocusMode?A.none():s(e).map((o=>Wr(lr(),((n,s)=>{o(n,e,t),s.stop()})))),i=[Wr(Js(),((n,a)=>{r(n,a,o,e,t).fold((()=>{((o,n)=>{const r=cg(eg.concat(Zm))(n.event);e.focusInside===vg.OnEnterOrSpaceMode&&r&&Ns(o,n)&&s(e).each((s=>{s(o,e,t),n.stop()}))})(n,a)}),(e=>{a.stop()}))})),Wr(Zs(),((o,s)=>{r(o,s,n,e,t).each((e=>{s.stop()}))}))];return Hr(a.toArray().concat(i))}};return a},xg=e=>{const t=[ms("onEscape"),ms("onEnter"),xs("selector",'[data-alloy-tabstop="true"]:not(:disabled)'),xs("firstTabstop",0),xs("useTabstopAt",E),ms("visibilitySelector")].concat([e]),o=(e,t)=>{const o=e.visibilitySelector.bind((e=>yi(t,e))).getOr(t);return jt(o)>0},n=(e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))),s=(e,t,n)=>{((e,t)=>{const n=Zc(e.element,t.selector),s=U(n,(e=>o(t,e)));return A.from(s[t.firstTabstop])})(e,t).each((o=>{t.focusManager.set(e,o)}))},r=(e,t,s,r)=>{const a=Zc(e.element,s.selector);return n(e,s).bind((t=>$(a,k(Qe,t)).bind((t=>((e,t,n,s,r)=>r(t,n,(e=>((e,t)=>o(e,t)&&e.useTabstopAt(t))(s,e))).fold((()=>s.cyclic?A.some(!0):A.none()),(t=>(s.focusManager.set(e,t),A.some(!0)))))(e,a,t,s,r)))))},a=(e,t,o)=>{const n=o.cyclic?rg:ag;return r(e,0,o,n)},i=(e,t,o)=>{const n=o.cyclic?ig:lg;return r(e,0,o,n)},l=x([pg(dg([ug,cg(Jm)]),a),pg(cg(Jm),i),pg(dg([gg,cg(Zm)]),((e,t,o)=>o.onEnter.bind((o=>o(e,t)))))]),c=x([pg(cg(Qm),((e,t,o)=>o.onEscape.bind((o=>o(e,t))))),pg(cg(Jm),((e,t,o)=>n(e,o).filter((e=>!o.useTabstopAt(e))).bind((n=>((e=>(e=>rt(e))(e).bind(dt).exists((t=>Qe(t,e))))(n)?a:i)(e,t,o)))))]);return yg(t,_a.init,l,c,(()=>A.some(s)))};var wg=xg(ts("cyclic",T)),Sg=xg(ts("cyclic",E));const kg=(e,t,o)=>Sm(o)&&cg(eg)(t.event)?A.none():((e,t,o)=>(Vr(e,o,mr()),A.some(!0)))(e,0,o),Cg=(e,t)=>A.some(!0),Og=[xs("execute",kg),xs("useSpace",!1),xs("useEnter",!0),xs("useControlEnter",!1),xs("useDown",!1)],_g=(e,t,o)=>o.execute(e,t,e.element);var Tg=yg(Og,_a.init,((e,t,o,n)=>{const s=o.useSpace&&!Sm(e.element)?eg:[],r=o.useEnter?Zm:[],a=o.useDown?sg:[],i=s.concat(r).concat(a);return[pg(cg(i),_g)].concat(o.useControlEnter?[pg(dg([mg,cg(Zm)]),_g)]:[])}),((e,t,o,n)=>o.useSpace&&!Sm(e.element)?[pg(cg(eg),Cg)]:[]),(()=>A.none()));const Eg=()=>{const e=nc();return Ta({readState:()=>e.get().map((e=>({numRows:String(e.numRows),numColumns:String(e.numColumns)}))).getOr({numRows:"?",numColumns:"?"}),setGridSize:(t,o)=>{e.set({numRows:t,numColumns:o})},getNumRows:()=>e.get().map((e=>e.numRows)),getNumColumns:()=>e.get().map((e=>e.numColumns))})};var Ag=Object.freeze({__proto__:null,flatgrid:Eg,init:e=>e.state(e)});const Mg=e=>(t,o,n,s)=>{const r=e(t.element);return Fg(r,t,o,n,s)},Dg=(e,t)=>{const o=xc(e,t);return Mg(o)},Bg=(e,t)=>{const o=xc(t,e);return Mg(o)},Ig=e=>(t,o,n,s)=>Fg(e,t,o,n,s),Fg=(e,t,o,n,s)=>n.focusManager.get(t).bind((o=>e(t.element,o,n,s))).map((e=>(n.focusManager.set(t,e),!0))),Rg=Ig,Ng=Ig,Vg=Ig,zg=e=>!(e=>e.offsetWidth<=0&&e.offsetHeight<=0)(e.dom),Lg=(e,t,o)=>{const n=Zc(e,o);return((e,o)=>$(e,(e=>Qe(e,t))).map((t=>({index:t,candidates:e}))))(U(n,zg))},Hg=(e,t)=>$(e,(e=>Qe(t,e))),Pg=(e,t,o,n)=>n(Math.floor(t/o),t%o).bind((t=>{const n=t.row*o+t.column;return n>=0&&n<e.length?A.some(e[n]):A.none()})),Ug=(e,t,o,n,s)=>Pg(e,t,n,((t,r)=>{const a=t===o-1?e.length-t*n:n,i=Zi(r,s,0,a-1);return A.some({row:t,column:i})})),Wg=(e,t,o,n,s)=>Pg(e,t,n,((t,r)=>{const a=Zi(t,s,0,o-1),i=a===o-1?e.length-a*n:n,l=Qi(r,0,i-1);return A.some({row:a,column:l})})),jg=[ns("selector"),xs("execute",kg),Ni("onEscape"),xs("captureTab",!1),Pi()],Gg=(e,t,o)=>{vi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},$g=e=>(t,o,n,s)=>Lg(t,o,n.selector).bind((t=>e(t.candidates,t.index,s.getNumRows().getOr(n.initSize.numRows),s.getNumColumns().getOr(n.initSize.numColumns)))),qg=(e,t,o)=>o.captureTab?A.some(!0):A.none(),Yg=$g(((e,t,o,n)=>Ug(e,t,o,n,-1))),Xg=$g(((e,t,o,n)=>Ug(e,t,o,n,1))),Kg=$g(((e,t,o,n)=>Wg(e,t,o,n,-1))),Jg=$g(((e,t,o,n)=>Wg(e,t,o,n,1))),Zg=x([pg(cg(tg),Dg(Yg,Xg)),pg(cg(ng),Bg(Yg,Xg)),pg(cg(og),Rg(Kg)),pg(cg(sg),Ng(Jg)),pg(dg([ug,cg(Jm)]),qg),pg(dg([gg,cg(Jm)]),qg),pg(cg(eg.concat(Zm)),((e,t,o,n)=>((e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n)))))]),Qg=x([pg(cg(Qm),((e,t,o)=>o.onEscape(e,t))),pg(cg(eg),Cg)]);var ep=yg(jg,Eg,Zg,Qg,(()=>A.some(Gg)));const tp=(e,t,o,n,s)=>{const r=(e,t,o)=>s(e,t,n,0,o.length-1,o[t],(t=>{return n=o[t],"button"===We(n)&&"disabled"===_t(n,"disabled")?r(e,t,o):A.from(o[t]);var n}));return Lg(e,o,t).bind((e=>{const t=e.index,o=e.candidates;return r(t,t,o)}))},op=(e,t,o,n)=>tp(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Qi(t+o,n,s);return i===e?A.from(r):a(i)})),np=(e,t,o,n)=>tp(e,t,o,n,((e,t,o,n,s,r,a)=>{const i=Zi(t,o,n,s);return i===e?A.none():a(i)})),sp=[ns("selector"),xs("getInitial",A.none),xs("execute",kg),Ni("onEscape"),xs("executeOnMove",!1),xs("allowVertical",!0),xs("allowHorizontal",!0),xs("cycles",!0)],rp=(e,t,o)=>((e,t)=>t.focusManager.get(e).bind((e=>yi(e,t.selector))))(e,o).bind((n=>o.execute(e,t,n))),ap=(e,t,o)=>{t.getInitial(e).orThunk((()=>vi(e.element,t.selector))).each((o=>{t.focusManager.set(e,o)}))},ip=(e,t,o)=>(o.cycles?np:op)(e,o.selector,t,-1),lp=(e,t,o)=>(o.cycles?np:op)(e,o.selector,t,1),cp=e=>(t,o,n,s)=>e(t,o,n,s).bind((()=>n.executeOnMove?rp(t,o,n):A.some(!0))),dp=x([pg(cg(eg),Cg),pg(cg(Qm),((e,t,o)=>o.onEscape(e,t)))]);var up=yg(sp,_a.init,((e,t,o,n)=>{const s=[...o.allowHorizontal?tg:[]].concat(o.allowVertical?og:[]),r=[...o.allowHorizontal?ng:[]].concat(o.allowVertical?sg:[]);return[pg(cg(s),cp(Dg(ip,lp))),pg(cg(r),cp(Bg(ip,lp))),pg(cg(Zm),rp),pg(cg(eg),rp)]}),dp,(()=>A.some(ap)));const mp=(e,t,o)=>A.from(e[t]).bind((e=>A.from(e[o]).map((e=>({rowIndex:t,columnIndex:o,cell:e}))))),gp=(e,t,o,n)=>{const s=e[t].length,r=Zi(o,n,0,s-1);return mp(e,t,r)},pp=(e,t,o,n)=>{const s=Zi(o,n,0,e.length-1),r=e[s].length,a=Qi(t,0,r-1);return mp(e,s,a)},hp=(e,t,o,n)=>{const s=e[t].length,r=Qi(o+n,0,s-1);return mp(e,t,r)},fp=(e,t,o,n)=>{const s=Qi(o+n,0,e.length-1),r=e[s].length,a=Qi(t,0,r-1);return mp(e,s,a)},bp=[cs("selectors",[ns("row"),ns("cell")]),xs("cycles",!0),xs("previousSelector",A.none),xs("execute",kg)],vp=(e,t,o)=>{t.previousSelector(e).orThunk((()=>{const o=t.selectors;return vi(e.element,o.cell)})).each((o=>{t.focusManager.set(e,o)}))},yp=(e,t)=>(o,n,s)=>{const r=s.cycles?e:t;return yi(n,s.selectors.row).bind((e=>{const t=Zc(e,s.selectors.cell);return Hg(t,n).bind((t=>{const n=Zc(o,s.selectors.row);return Hg(n,e).bind((e=>{const o=((e,t)=>L(e,(e=>Zc(e,t.selectors.cell))))(n,s);return r(o,e,t).map((e=>e.cell))}))}))}))},xp=yp(((e,t,o)=>gp(e,t,o,-1)),((e,t,o)=>hp(e,t,o,-1))),wp=yp(((e,t,o)=>gp(e,t,o,1)),((e,t,o)=>hp(e,t,o,1))),Sp=yp(((e,t,o)=>pp(e,o,t,-1)),((e,t,o)=>fp(e,o,t,-1))),kp=yp(((e,t,o)=>pp(e,o,t,1)),((e,t,o)=>fp(e,o,t,1))),Cp=x([pg(cg(tg),Dg(xp,wp)),pg(cg(ng),Bg(xp,wp)),pg(cg(og),Rg(Sp)),pg(cg(sg),Ng(kp)),pg(cg(eg.concat(Zm)),((e,t,o)=>Ll(e.element).bind((n=>o.execute(e,t,n)))))]),Op=x([pg(cg(eg),Cg)]);var _p=yg(bp,_a.init,Cp,Op,(()=>A.some(vp)));const Tp=[ns("selector"),xs("execute",kg),xs("moveOnTab",!1)],Ep=(e,t,o)=>o.focusManager.get(e).bind((n=>o.execute(e,t,n))),Ap=(e,t,o)=>{vi(e.element,t.selector).each((o=>{t.focusManager.set(e,o)}))},Mp=(e,t,o)=>np(e,o.selector,t,-1),Dp=(e,t,o)=>np(e,o.selector,t,1),Bp=x([pg(cg(og),Vg(Mp)),pg(cg(sg),Vg(Dp)),pg(dg([ug,cg(Jm)]),((e,t,o,n)=>o.moveOnTab?Vg(Mp)(e,t,o,n):A.none())),pg(dg([gg,cg(Jm)]),((e,t,o,n)=>o.moveOnTab?Vg(Dp)(e,t,o,n):A.none())),pg(cg(Zm),Ep),pg(cg(eg),Ep)]),Ip=x([pg(cg(eg),Cg)]);var Fp=yg(Tp,_a.init,Bp,Ip,(()=>A.some(Ap)));const Rp=[Ni("onSpace"),Ni("onEnter"),Ni("onShiftEnter"),Ni("onLeft"),Ni("onRight"),Ni("onTab"),Ni("onShiftTab"),Ni("onUp"),Ni("onDown"),Ni("onEscape"),xs("stopSpaceKeyup",!1),ms("focusIn")];var Np=yg(Rp,_a.init,((e,t,o)=>[pg(cg(eg),o.onSpace),pg(dg([gg,cg(Zm)]),o.onEnter),pg(dg([ug,cg(Zm)]),o.onShiftEnter),pg(dg([ug,cg(Jm)]),o.onShiftTab),pg(dg([gg,cg(Jm)]),o.onTab),pg(cg(og),o.onUp),pg(cg(sg),o.onDown),pg(cg(tg),o.onLeft),pg(cg(ng),o.onRight),pg(cg(eg),o.onSpace)]),((e,t,o)=>[...o.stopSpaceKeyup?[pg(cg(eg),Cg)]:[],pg(cg(Qm),o.onEscape)]),(e=>e.focusIn));const Vp=wg.schema(),zp=Sg.schema(),Lp=up.schema(),Hp=ep.schema(),Pp=_p.schema(),Up=Tg.schema(),Wp=Fp.schema(),jp=Np.schema(),Gp=Dl({branchKey:"mode",branches:Object.freeze({__proto__:null,acyclic:Vp,cyclic:zp,flow:Lp,flatgrid:Hp,matrix:Pp,execution:Up,menu:Wp,special:jp}),name:"keying",active:{events:(e,t)=>e.handler.toEvents(e,t)},apis:{focusIn:(e,t,o)=>{t.sendFocusIn(t).fold((()=>{e.getSystem().triggerFocus(e.element,e.element)}),(n=>{n(e,t,o)}))},setGridSize:(e,t,o,n,s)=>{(e=>ye(e,"setGridSize"))(o)?o.setGridSize(n,s):console.error("Layout does not support setGridSize")}},state:Ag}),$p=(e,t)=>{Hl((()=>{((e,t,o)=>{const n=e.components();(e=>{H(e.components(),(e=>Uo(e.element))),Po(e.element),e.syncComponents()})(e);const s=o(t),r=J(n,s);H(r,(t=>{Ed(t),e.getSystem().removeFromWorld(t)})),H(s,(t=>{Td(t)?Bd(e,t):(e.getSystem().addToWorld(t),Bd(e,t),xt(e.element)&&Ad(t))})),e.syncComponents()})(e,t,(()=>L(t,e.getSystem().build)))}),e.element)},qp=(e,t)=>{Hl((()=>{((o,n,s)=>{const r=o.components(),a=Y(n,(e=>Ca(e).toArray()));H(r,(e=>{R(a,e)||Dd(e)}));const i=((e,t,o)=>Qa(e,t,((t,n)=>ei(e,n,t,o))))(e.element,t,e.getSystem().buildOrPatch),l=J(r,i);H(l,(e=>{Td(e)&&Dd(e)})),H(i,(e=>{Td(e)||Md(o,e)})),o.syncComponents()})(e,t)}),e.element)},Yp=(e,t,o,n)=>{Dd(t);const s=ei(e.element,o,n,e.getSystem().buildOrPatch);Md(e,s),e.syncComponents()},Xp=(e,t,o)=>{const n=e.getSystem().build(o);Fd(e,n,t)},Kp=(e,t,o,n)=>{Nd(t),Xp(e,((e,t)=>((e,t,o)=>{ct(e,o).fold((()=>{Lo(e,t)}),(e=>{No(e,t)}))})(e,t,o)),n)},Jp=(e,t)=>e.components(),Zp=(e,t,o,n,s)=>{const r=Jp(e);return A.from(r[n]).map((o=>(s.fold((()=>Nd(o)),(s=>{(t.reuseDom?Yp:Kp)(e,o,n,s)})),o)))};var Qp=Object.freeze({__proto__:null,append:(e,t,o,n)=>{Xp(e,Lo,n)},prepend:(e,t,o,n)=>{Xp(e,zo,n)},remove:(e,t,o,n)=>{const s=Jp(e),r=G(s,(e=>Qe(n.element,e.element)));r.each(Nd)},replaceAt:Zp,replaceBy:(e,t,o,n,s)=>{const r=Jp(e);return $(r,n).bind((o=>Zp(e,t,0,o,s)))},set:(e,t,o,n)=>(t.reuseDom?qp:$p)(e,n),contents:Jp});const eh=Al({fields:[Os("reuseDom",!0)],name:"replacing",apis:Qp}),th=(e,t)=>{const o=((e,t)=>{const o=Hr(t);return Al({fields:[ns("enabled")],name:e,active:{events:x(o)}})})(e,t);return{key:e,value:{config:{},me:o,configAsRaw:x({}),initialConfig:{},state:_a}}},oh=(e,t)=>{t.ignore||(Rl(e.element),t.onFocus(e))};var nh=Object.freeze({__proto__:null,focus:oh,blur:(e,t)=>{t.ignore||Nl(e.element)},isFocused:e=>Vl(e.element)}),sh=Object.freeze({__proto__:null,exhibit:(e,t)=>{const o=t.ignore?{}:{attributes:{tabindex:"-1"}};return Aa(o)},events:e=>Hr([Wr(lr(),((t,o)=>{oh(t,e),o.stop()}))].concat(e.stopMousedown?[Wr(js(),((e,t)=>{t.event.prevent()}))]:[]))}),rh=[Ri("onFocus"),xs("stopMousedown",!1),xs("ignore",!1)];const ah=Al({fields:rh,name:"focusing",active:sh,apis:nh}),ih=(e,t,o,n)=>{const s=o.get();o.set(n),((e,t,o)=>{t.toggleClass.each((t=>{o.get()?Wa(e.element,t):Ga(e.element,t)}))})(e,t,o),((e,t,o)=>{const n=t.aria;n.update(e,n,o.get())})(e,t,o),s!==n&&t.onToggled(e,n)},lh=(e,t,o)=>{ih(e,t,o,!o.get())},ch=(e,t,o)=>{ih(e,t,o,t.selected)};var dh=Object.freeze({__proto__:null,onLoad:ch,toggle:lh,isOn:(e,t,o)=>o.get(),on:(e,t,o)=>{ih(e,t,o,!0)},off:(e,t,o)=>{ih(e,t,o,!1)},set:ih}),uh=Object.freeze({__proto__:null,exhibit:()=>Aa({}),events:(e,t)=>{const o=(n=e,s=t,r=lh,ea((e=>{r(e,n,s)})));var n,s,r;const a=Cl(e,t,ch);return Hr(q([e.toggleOnExecute?[o]:[],[a]]))}});const mh=(e,t,o)=>{Ct(e.element,"aria-expanded",o)};var gh=[xs("selected",!1),ms("toggleClass"),xs("toggleOnExecute",!0),Ri("onToggled"),ws("aria",{mode:"none"},Zn("mode",{pressed:[xs("syncWithExpanded",!1),Li("update",((e,t,o)=>{Ct(e.element,"aria-pressed",o),t.syncWithExpanded&&mh(e,0,o)}))],checked:[Li("update",((e,t,o)=>{Ct(e.element,"aria-checked",o)}))],expanded:[Li("update",mh)],selected:[Li("update",((e,t,o)=>{Ct(e.element,"aria-selected",o)}))],none:[Li("update",b)]}))];const ph=Al({fields:gh,name:"toggling",active:uh,apis:dh,state:(!1,{init:()=>{const e=As(false);return{get:()=>e.get(),set:t=>e.set(t),clear:()=>e.set(false),readState:()=>e.get()}}})});const hh=()=>{const e=(e,t)=>{t.stop(),Nr(e)};return[Wr(tr(),e),Wr(pr(),e),Yr(Hs()),Yr(js())]},fh=e=>Hr(q([e.map((e=>ea(((t,o)=>{e(t),o.stop()})))).toArray(),hh()])),bh="alloy.item-hover",vh="alloy.item-focus",yh="alloy.item-toggled",xh=e=>{(Ll(e.element).isNone()||ah.isFocused(e))&&(ah.isFocused(e)||ah.focus(e),Rr(e,bh,{item:e}))},wh=e=>{Rr(e,vh,{item:e})},Sh=x(bh),kh=x(vh),Ch=x(yh),Oh=e=>e.toggling.map((e=>e.exclusive?"menuitemradio":"menuitemcheckbox")).getOr("menuitem"),_h=[ns("data"),ns("components"),ns("dom"),xs("hasSubmenu",!1),ms("toggling"),Su("itemBehaviours",[ph,ah,Gp,vu]),xs("ignoreFocus",!1),xs("domModification",{}),Li("builder",(e=>({dom:e.dom,domModification:{...e.domModification,attributes:{role:Oh(e),...e.domModification.attributes,"aria-haspopup":e.hasSubmenu,...e.hasSubmenu?{"aria-expanded":!1}:{}}},behaviours:ku(e.itemBehaviours,[e.toggling.fold(ph.revoke,(e=>ph.config((e=>({aria:{mode:"checked"},...ge(e,((e,t)=>"exclusive"!==t)),onToggled:(t,o)=>{p(e.onToggled)&&e.onToggled(t,o),((e,t)=>{Rr(e,yh,{item:e,state:t})})(t,o)}}))(e)))),ah.config({ignore:e.ignoreFocus,stopMousedown:e.ignoreFocus,onFocus:e=>{wh(e)}}),Gp.config({mode:"execution"}),vu.config({store:{mode:"memory",initialValue:e.data}}),th("item-type-events",[...hh(),Wr(Ys(),xh),Wr(gr(),ah.focus)])]),components:e.components,eventOrder:e.eventOrder}))),xs("eventOrder",{})],Th=[ns("dom"),ns("components"),Li("builder",(e=>({dom:e.dom,components:e.components,events:Hr([Xr(gr())])})))],Eh=x("item-widget"),Ah=x([$u({name:"widget",overrides:e=>({behaviours:Tl([vu.config({store:{mode:"manual",getValue:t=>e.data,setValue:b}})])})})]),Mh=[ns("uid"),ns("data"),ns("components"),ns("dom"),xs("autofocus",!1),xs("ignoreFocus",!1),Su("widgetBehaviours",[vu,ah,Gp]),xs("domModification",{}),gm(Ah()),Li("builder",(e=>{const t=sm(Eh(),e,Ah()),o=rm(Eh(),e,t.internals()),n=t=>am(t,e,"widget").map((e=>(Gp.focusIn(e),e))),s=(t,o)=>Sm(o.event.target)?A.none():e.autofocus?(o.setSource(t.element),A.none()):A.none();return{dom:e.dom,components:o,domModification:e.domModification,events:Hr([ea(((e,t)=>{n(e).each((e=>{t.stop()}))})),Wr(Ys(),xh),Wr(gr(),((t,o)=>{e.autofocus?n(t):ah.focus(t)}))]),behaviours:ku(e.widgetBehaviours,[vu.config({store:{mode:"memory",initialValue:e.data}}),ah.config({ignore:e.ignoreFocus,onFocus:e=>{wh(e)}}),Gp.config({mode:"special",focusIn:e.autofocus?e=>{n(e)}:Bl(),onLeft:s,onRight:s,onEscape:(t,o)=>ah.isFocused(t)||e.autofocus?e.autofocus?(o.setSource(t.element),A.none()):A.none():(ah.focus(t),A.some(!0))})])}}))],Dh=Zn("type",{widget:Mh,item:_h,separator:Th}),Bh=x([Xu({factory:{sketch:e=>{const t=Kn("menu.spec item",Dh,e);return t.builder(t)}},name:"items",unit:"item",defaults:(e,t)=>ve(t,"uid")?t:{...t,uid:fa("item")},overrides:(e,t)=>({type:t.type,ignoreFocus:e.fakeFocus,domModification:{classes:[e.markers.item]}})})]),Ih=x([ns("value"),ns("items"),ns("dom"),ns("components"),xs("eventOrder",{}),yu("menuBehaviours",[Xm,vu,Om,Gp]),ws("movement",{mode:"menu",moveOnTab:!0},Zn("mode",{grid:[Pi(),Li("config",((e,t)=>({mode:"flatgrid",selector:"."+e.markers.item,initSize:{numColumns:t.initSize.numColumns,numRows:t.initSize.numRows},focusManager:e.focusManager})))],matrix:[Li("config",((e,t)=>({mode:"matrix",selectors:{row:t.rowSelector,cell:"."+e.markers.item},previousSelector:t.previousSelector,focusManager:e.focusManager}))),ns("rowSelector"),xs("previousSelector",A.none)],menu:[xs("moveOnTab",!0),Li("config",((e,t)=>({mode:"menu",selector:"."+e.markers.item,moveOnTab:t.moveOnTab,focusManager:e.focusManager})))]})),ss("markers",Mi()),xs("fakeFocus",!1),xs("focusManager",fg()),Ri("onHighlight"),Ri("onDehighlight")]),Fh=x("alloy.menu-focus"),Rh=wm({name:"Menu",configFields:Ih(),partFields:Bh(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,markers:e.markers,behaviours:wu(e.menuBehaviours,[Xm.config({highlightClass:e.markers.selectedItem,itemClass:e.markers.item,onHighlight:e.onHighlight,onDehighlight:e.onDehighlight}),vu.config({store:{mode:"memory",initialValue:e.value}}),Om.config({find:A.some}),Gp.config(e.movement.config(e,e.movement))]),events:Hr([Wr(kh(),((e,t)=>{const o=t.event;e.getSystem().getByDom(o.target).each((o=>{Xm.highlight(e,o),t.stop(),Rr(e,Fh(),{menu:e,item:o})}))})),Wr(Sh(),((e,t)=>{const o=t.event.item;Xm.highlight(e,o)})),Wr(Ch(),((e,t)=>{const{item:o,state:n}=t.event;n&&"menuitemradio"===_t(o.element,"role")&&((e,t)=>{const o=Zc(e.element,'[role="menuitemradio"][aria-checked="true"]');H(o,(o=>{Qe(o,t.element)||e.getSystem().getByDom(o).each((e=>{ph.off(e)}))}))})(e,o)}))]),components:t,eventOrder:e.eventOrder,domModification:{attributes:{role:"menu"}}})}),Nh=(e,t,o,n)=>be(o,n).bind((n=>be(e,n).bind((n=>{const s=Nh(e,t,o,n);return A.some([n].concat(s))})))).getOr([]),Vh=e=>"prepared"===e.type?A.some(e.menu):A.none(),zh=()=>{const e=As({}),t=As({}),o=As({}),n=nc(),s=As({}),r=e=>a(e).bind(Vh),a=e=>be(t.get(),e),i=t=>be(e.get(),t);return{setMenuBuilt:(e,o)=>{t.set({...t.get(),[e]:{type:"prepared",menu:o}})},setContents:(r,a,i,l)=>{n.set(r),e.set(i),t.set(a),s.set(l);const c=((e,t)=>{const o={};le(e,((e,t)=>{H(e,(e=>{o[e]=t}))}));const n=t,s=de(t,((e,t)=>({k:e,v:t}))),r=ce(s,((e,t)=>[t].concat(Nh(o,n,s,t))));return ce(o,(e=>be(r,e).getOr([e])))})(l,i);o.set(c)},expand:t=>be(e.get(),t).map((e=>{const n=be(o.get(),t).getOr([]);return[e].concat(n)})),refresh:e=>be(o.get(),e),collapse:e=>be(o.get(),e).bind((e=>e.length>1?A.some(e.slice(1)):A.none())),lookupMenu:a,lookupItem:i,otherMenus:e=>{const t=s.get();return J(ae(t),e)},getPrimary:()=>n.get().bind(r),getMenus:()=>t.get(),clear:()=>{e.set({}),t.set({}),o.set({}),n.clear()},isClear:()=>n.get().isNone(),getTriggeringPath:(t,s)=>{const a=U(i(t).toArray(),(e=>r(e).isSome()));return be(o.get(),t).bind((t=>{const o=K(a.concat(t));return(e=>{const t=[];for(let o=0;o<e.length;o++){const n=e[o];if(!n.isSome())return A.none();t.push(n.getOrDie())}return A.some(t)})(Y(o,((t,a)=>((t,o,n)=>r(t).bind((s=>(t=>he(e.get(),((e,o)=>e===t)))(t).bind((e=>o(e).map((e=>({triggeredMenu:s,triggeringItem:e,triggeringPath:n}))))))))(t,s,o.slice(0,a+1)).fold((()=>xe(n.get(),t)?[]:[A.none()]),(e=>[A.some(e)])))))}))}}},Lh=Vh,Hh=ca("tiered-menu-item-highlight"),Ph=ca("tiered-menu-item-dehighlight");var Uh;!function(e){e[e.HighlightMenuAndItem=0]="HighlightMenuAndItem",e[e.HighlightJustMenu=1]="HighlightJustMenu",e[e.HighlightNone=2]="HighlightNone"}(Uh||(Uh={}));const Wh=x("collapse-item"),jh=xm({name:"TieredMenu",configFields:[zi("onExecute"),zi("onEscape"),Vi("onOpenMenu"),Vi("onOpenSubmenu"),Ri("onRepositionMenu"),Ri("onCollapseMenu"),xs("highlightOnOpen",Uh.HighlightMenuAndItem),cs("data",[ns("primary"),ns("menus"),ns("expansions")]),xs("fakeFocus",!1),Ri("onHighlightItem"),Ri("onDehighlightItem"),Ri("onHover"),Bi(),ns("dom"),xs("navigateOnHover",!0),xs("stayInDom",!1),yu("tmenuBehaviours",[Gp,Xm,Om,eh]),xs("eventOrder",{})],apis:{collapseMenu:(e,t)=>{e.collapseMenu(t)},highlightPrimary:(e,t)=>{e.highlightPrimary(t)},repositionMenus:(e,t)=>{e.repositionMenus(t)}},factory:(e,t)=>{const o=nc(),n=zh(),s=e=>vu.getValue(e).value,r=t=>ce(e.data.menus,((e,t)=>Y(e.items,(e=>"separator"===e.type?[]:[e.data.value])))),a=Xm.highlight,i=(t,o)=>{a(t,o),Xm.getHighlighted(o).orThunk((()=>Xm.getFirst(o))).each((n=>{e.fakeFocus?Xm.highlight(o,n):Vr(t,n.element,gr())}))},l=(e,t)=>we(L(t,(t=>e.lookupMenu(t).bind((e=>"prepared"===e.type?A.some(e.menu):A.none()))))),c=(t,o,n)=>{const s=l(o,o.otherMenus(n));H(s,(o=>{Ya(o.element,[e.markers.backgroundMenu]),e.stayInDom||eh.remove(t,o)}))},d=(t,n)=>{const r=(t=>o.get().getOrThunk((()=>{const n={},r=Zc(t.element,`.${e.markers.item}`),a=U(r,(e=>"true"===_t(e,"aria-haspopup")));return H(a,(e=>{t.getSystem().getByDom(e).each((e=>{const t=s(e);n[t]=e}))})),o.set(n),n})))(t);le(r,((e,t)=>{const o=R(n,t);Ct(e.element,"aria-expanded",o)}))},u=(t,o,n)=>A.from(n[0]).bind((s=>o.lookupMenu(s).bind((s=>{if("notbuilt"===s.type)return A.none();{const r=s.menu,a=l(o,n.slice(1));return H(a,(t=>{Wa(t.element,e.markers.backgroundMenu)})),xt(r.element)||eh.append(t,di(r)),Ya(r.element,[e.markers.backgroundMenu]),i(t,r),c(t,o,n),A.some(r)}}))));let m;!function(e){e[e.HighlightSubmenu=0]="HighlightSubmenu",e[e.HighlightParent=1]="HighlightParent"}(m||(m={}));const g=(t,o,r=m.HighlightSubmenu)=>{if(o.hasConfigured(Lm)&&Lm.isDisabled(o))return A.some(o);{const a=s(o);return n.expand(a).bind((s=>(d(t,s),A.from(s[0]).bind((a=>n.lookupMenu(a).bind((i=>{const l=((e,t,o)=>{if("notbuilt"===o.type){const s=e.getSystem().build(o.nbMenu());return n.setMenuBuilt(t,s),s}return o.menu})(t,a,i);return xt(l.element)||eh.append(t,di(l)),e.onOpenSubmenu(t,o,l,K(s)),r===m.HighlightSubmenu?(Xm.highlightFirst(l),u(t,n,s)):(Xm.dehighlightAll(l),A.some(o))})))))))}},p=(t,o)=>{const r=s(o);return n.collapse(r).bind((s=>(d(t,s),u(t,n,s).map((n=>(e.onCollapseMenu(t,o,n),n))))))},h=t=>(o,n)=>yi(n.getSource(),`.${e.markers.item}`).bind((e=>o.getSystem().getByDom(e).toOptional().bind((e=>t(o,e).map(E))))),f=Hr([Wr(Fh(),((e,t)=>{const o=t.event.item;n.lookupItem(s(o)).each((()=>{const o=t.event.menu;Xm.highlight(e,o);const r=s(t.event.item);n.refresh(r).each((t=>c(e,n,t)))}))})),ea(((t,o)=>{const n=o.event.target;t.getSystem().getByDom(n).each((o=>{0===s(o).indexOf("collapse-item")&&p(t,o),g(t,o,m.HighlightSubmenu).fold((()=>{e.onExecute(t,o)}),b)}))})),Jr(((t,o)=>{(t=>{const o=((t,o,n)=>ce(n,((n,s)=>{const r=()=>Rh.sketch({...n,value:s,markers:e.markers,fakeFocus:e.fakeFocus,onHighlight:(e,t)=>{Rr(e,Hh,{menuComp:e,itemComp:t})},onDehighlight:(e,t)=>{Rr(e,Ph,{menuComp:e,itemComp:t})},focusManager:e.fakeFocus?bg():fg()});return s===o?{type:"prepared",menu:t.getSystem().build(r())}:{type:"notbuilt",nbMenu:r}})))(t,e.data.primary,e.data.menus),s=r();return n.setContents(e.data.primary,o,e.data.expansions,s),n.getPrimary()})(t).each((o=>{eh.append(t,di(o)),e.onOpenMenu(t,o),e.highlightOnOpen===Uh.HighlightMenuAndItem?i(t,o):e.highlightOnOpen===Uh.HighlightJustMenu&&a(t,o)}))})),Wr(Hh,((t,o)=>{e.onHighlightItem(t,o.event.menuComp,o.event.itemComp)})),Wr(Ph,((t,o)=>{e.onDehighlightItem(t,o.event.menuComp,o.event.itemComp)})),...e.navigateOnHover?[Wr(Sh(),((t,o)=>{const r=o.event.item;((e,t)=>{const o=s(t);n.refresh(o).bind((t=>(d(e,t),u(e,n,t))))})(t,r),g(t,r,m.HighlightParent),e.onHover(t,r)}))]:[]]),v=e=>Xm.getHighlighted(e).bind(Xm.getHighlighted),y={collapseMenu:e=>{v(e).each((t=>{p(e,t)}))},highlightPrimary:e=>{n.getPrimary().each((t=>{i(e,t)}))},repositionMenus:t=>{const o=n.getPrimary().bind((e=>v(t).bind((e=>{const t=s(e),o=fe(n.getMenus()),r=we(L(o,Lh));return n.getTriggeringPath(t,(e=>((e,t,o)=>re(t,(e=>{if(!e.getSystem().isConnected())return A.none();const t=Xm.getCandidates(e);return G(t,(e=>s(e)===o))})))(0,r,e)))})).map((t=>({primary:e,triggeringPath:t})))));o.fold((()=>{(e=>A.from(e.components()[0]).filter((e=>"menu"===_t(e.element,"role"))))(t).each((o=>{e.onRepositionMenu(t,o,[])}))}),(({primary:o,triggeringPath:n})=>{e.onRepositionMenu(t,o,n)}))}};return{uid:e.uid,dom:e.dom,markers:e.markers,behaviours:wu(e.tmenuBehaviours,[Gp.config({mode:"special",onRight:h(((e,t)=>Sm(t.element)?A.none():g(e,t,m.HighlightSubmenu))),onLeft:h(((e,t)=>Sm(t.element)?A.none():p(e,t))),onEscape:h(((t,o)=>p(t,o).orThunk((()=>e.onEscape(t,o).map((()=>t)))))),focusIn:(e,t)=>{n.getPrimary().each((t=>{Vr(e,t.element,gr())}))}}),Xm.config({highlightClass:e.markers.selectedMenu,itemClass:e.markers.menu}),Om.config({find:e=>Xm.getHighlighted(e)}),eh.config({})]),eventOrder:e.eventOrder,apis:y,events:f}},extraApis:{tieredData:(e,t,o)=>({primary:e,menus:t,expansions:o}),singleData:(e,t)=>({primary:e,menus:Ds(e,t),expansions:{}}),collapseItem:e=>({value:ca(Wh()),meta:{text:e}})}}),Gh=xm({name:"InlineView",configFields:[ns("lazySink"),Ri("onShow"),Ri("onHide"),bs("onEscape"),yu("inlineBehaviours",[Zd,vu,Il]),ys("fireDismissalEventInstead",[xs("event",Or())]),ys("fireRepositionEventInstead",[xs("event",_r())]),xs("getRelated",A.none),xs("isExtraPart",T),xs("eventOrder",A.none)],factory:(e,t)=>{const o=(t,o,n,s)=>{const r=e.lazySink(t).getOrDie();Zd.openWhileCloaked(t,o,(()=>_d.positionWithinBounds(r,t,n,s()))),vu.setValue(t,A.some({mode:"position",config:n,getBounds:s}))},n=(t,o,n,s)=>{const r=((e,t,o,n,s)=>{const r=()=>e.lazySink(t),a="horizontal"===n.type?{layouts:{onLtr:()=>xl(),onRtl:()=>wl()}}:{},i=e=>(e=>2===e.length)(e)?a:{};return jh.sketch({dom:{tag:"div"},data:n.data,markers:n.menu.markers,highlightOnOpen:n.menu.highlightOnOpen,fakeFocus:n.menu.fakeFocus,onEscape:()=>(Zd.close(t),e.onEscape.map((e=>e(t))),A.some(!0)),onExecute:()=>A.some(!0),onOpenMenu:(e,t)=>{_d.positionWithinBounds(r().getOrDie(),t,o,s())},onOpenSubmenu:(e,t,o,n)=>{const s=r().getOrDie();_d.position(s,o,{anchor:{type:"submenu",item:t,...i(n)}})},onRepositionMenu:(e,t,n)=>{const a=r().getOrDie();_d.positionWithinBounds(a,t,o,s()),H(n,(e=>{const t=i(e.triggeringPath);_d.position(a,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem,...t}})}))}})})(e,t,o,n,s);Zd.open(t,r),vu.setValue(t,A.some({mode:"menu",menu:r}))},s=t=>{Zd.isOpen(t)&&vu.getValue(t).each((o=>{switch(o.mode){case"menu":Zd.getState(t).each(jh.repositionMenus);break;case"position":const n=e.lazySink(t).getOrDie();_d.positionWithinBounds(n,t,o.config,o.getBounds())}}))},r={setContent:(e,t)=>{Zd.setContent(e,t)},showAt:(e,t,n)=>{const s=A.none;o(e,t,n,s)},showWithinBounds:o,showMenuAt:(e,t,o)=>{n(e,t,o,A.none)},showMenuWithinBounds:n,hide:e=>{Zd.isOpen(e)&&(vu.setValue(e,A.none()),Zd.close(e))},getContent:e=>Zd.getState(e),reposition:s,isOpen:Zd.isOpen};return{uid:e.uid,dom:e.dom,behaviours:wu(e.inlineBehaviours,[Zd.config({isPartOf:(t,o,n)=>Si(o,n)||((t,o)=>e.getRelated(t).exists((e=>Si(e,o))))(t,n),getAttachPoint:t=>e.lazySink(t).getOrDie(),onOpen:t=>{e.onShow(t)},onClose:t=>{e.onHide(t)}}),vu.config({store:{mode:"memory",initialValue:A.none()}}),Il.config({channels:{...nu({isExtraPart:t.isExtraPart,...e.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...ru({...e.fireRepositionEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({}),doReposition:s})}})]),eventOrder:e.eventOrder,apis:r}},apis:{showAt:(e,t,o,n)=>{e.showAt(t,o,n)},showWithinBounds:(e,t,o,n,s)=>{e.showWithinBounds(t,o,n,s)},showMenuAt:(e,t,o,n)=>{e.showMenuAt(t,o,n)},showMenuWithinBounds:(e,t,o,n,s)=>{e.showMenuWithinBounds(t,o,n,s)},hide:(e,t)=>{e.hide(t)},isOpen:(e,t)=>e.isOpen(t),getContent:(e,t)=>e.getContent(t),setContent:(e,t,o)=>{e.setContent(t,o)},reposition:(e,t)=>{e.reposition(t)}}});var $h=tinymce.util.Tools.resolve("tinymce.util.Delay");const qh=xm({name:"Button",factory:e=>{const t=fh(e.action),o=e.dom.tag,n=t=>be(e.dom,"attributes").bind((e=>be(e,t)));return{uid:e.uid,dom:e.dom,components:e.components,events:t,behaviours:ku(e.buttonBehaviours,[ah.config({}),Gp.config({mode:"execution",useSpace:!0,useEnter:!0})]),domModification:{attributes:"button"===o?{type:n("type").getOr("button"),...n("role").map((e=>({role:e}))).getOr({})}:{role:e.role.getOr(n("role").getOr("button"))}},eventOrder:e.eventOrder}},configFields:[xs("uid",void 0),ns("dom"),xs("components",[]),Su("buttonBehaviours",[ah,Gp]),ms("action"),ms("role"),xs("eventOrder",{})]}),Yh=e=>{const t=Re(e),o=lt(t),n=(e=>{const t=void 0!==e.dom.attributes?e.dom.attributes:[];return j(t,((e,t)=>"class"===t.name?e:{...e,[t.name]:t.value}),{})})(t),s=(e=>Array.prototype.slice.call(e.dom.classList,0))(t),r=0===o.length?{}:{innerHtml:ta(t)};return{tag:We(t),classes:s,attributes:n,...r}},Xh=e=>{const t=(e=>void 0!==e.uid)(e)&&ye(e,"uid")?e.uid:fa("memento");return{get:e=>e.getSystem().getByUid(t).getOrDie(),getOpt:e=>e.getSystem().getByUid(t).toOptional(),asSpec:()=>({...e,uid:t})}},{entries:Kh,setPrototypeOf:Jh,isFrozen:Zh,getPrototypeOf:Qh,getOwnPropertyDescriptor:ef}=Object;let{freeze:tf,seal:of,create:nf}=Object,{apply:sf,construct:rf}="undefined"!=typeof Reflect&&Reflect;sf||(sf=function(e,t,o){return e.apply(t,o)}),tf||(tf=function(e){return e}),of||(of=function(e){return e}),rf||(rf=function(e,t){return new e(...t)});const af=yf(Array.prototype.forEach),lf=yf(Array.prototype.pop),cf=yf(Array.prototype.push),df=yf(String.prototype.toLowerCase),uf=yf(String.prototype.toString),mf=yf(String.prototype.match),gf=yf(String.prototype.replace),pf=yf(String.prototype.indexOf),hf=yf(String.prototype.trim),ff=yf(RegExp.prototype.test),bf=(vf=TypeError,function(){for(var e=arguments.length,t=new Array(e),o=0;o<e;o++)t[o]=arguments[o];return rf(vf,t)});var vf;function yf(e){return function(t){for(var o=arguments.length,n=new Array(o>1?o-1:0),s=1;s<o;s++)n[s-1]=arguments[s];return sf(e,t,n)}}function xf(e,t,o){var n;o=null!==(n=o)&&void 0!==n?n:df,Jh&&Jh(e,null);let s=t.length;for(;s--;){let n=t[s];if("string"==typeof n){const e=o(n);e!==n&&(Zh(t)||(t[s]=e),n=e)}e[n]=!0}return e}function wf(e){const t=nf(null);for(const[o,n]of Kh(e))t[o]=n;return t}function Sf(e,t){for(;null!==e;){const o=ef(e,t);if(o){if(o.get)return yf(o.get);if("function"==typeof o.value)return yf(o.value)}e=Qh(e)}return function(e){return console.warn("fallback value for",e),null}}const kf=tf(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Cf=tf(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),Of=tf(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),_f=tf(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),Tf=tf(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),Ef=tf(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Af=tf(["#text"]),Mf=tf(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),Df=tf(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Bf=tf(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),If=tf(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Ff=of(/\{\{[\w\W]*|[\w\W]*\}\}/gm),Rf=of(/<%[\w\W]*|[\w\W]*%>/gm),Nf=of(/\${[\w\W]*}/gm),Vf=of(/^data-[\-\w.\u00B7-\uFFFF]/),zf=of(/^aria-[\-\w]+$/),Lf=of(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Hf=of(/^(?:\w+script|data):/i),Pf=of(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Uf=of(/^html$/i);var Wf=Object.freeze({__proto__:null,MUSTACHE_EXPR:Ff,ERB_EXPR:Rf,TMPLIT_EXPR:Nf,DATA_ATTR:Vf,ARIA_ATTR:zf,IS_ALLOWED_URI:Lf,IS_SCRIPT_OR_DATA:Hf,ATTR_WHITESPACE:Pf,DOCTYPE_NAME:Uf});const jf=()=>"undefined"==typeof window?null:window;var Gf=function e(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:jf();const o=t=>e(t);if(o.version="3.0.5",o.removed=[],!t||!t.document||9!==t.document.nodeType)return o.isSupported=!1,o;const n=t.document,s=n.currentScript;let{document:r}=t;const{DocumentFragment:a,HTMLTemplateElement:i,Node:l,Element:c,NodeFilter:d,NamedNodeMap:u=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:m,DOMParser:g,trustedTypes:p}=t,h=c.prototype,f=Sf(h,"cloneNode"),b=Sf(h,"nextSibling"),v=Sf(h,"childNodes"),y=Sf(h,"parentNode");if("function"==typeof i){const e=r.createElement("template");e.content&&e.content.ownerDocument&&(r=e.content.ownerDocument)}let x,w="";const{implementation:S,createNodeIterator:k,createDocumentFragment:C,getElementsByTagName:O}=r,{importNode:_}=n;let T={};o.isSupported="function"==typeof Kh&&"function"==typeof y&&S&&void 0!==S.createHTMLDocument;const{MUSTACHE_EXPR:E,ERB_EXPR:A,TMPLIT_EXPR:M,DATA_ATTR:D,ARIA_ATTR:B,IS_SCRIPT_OR_DATA:I,ATTR_WHITESPACE:F}=Wf;let{IS_ALLOWED_URI:R}=Wf,N=null;const V=xf({},[...kf,...Cf,...Of,...Tf,...Af]);let z=null;const L=xf({},[...Mf,...Df,...Bf,...If]);let H=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),P=null,U=null,W=!0,j=!0,G=!1,$=!0,q=!1,Y=!1,X=!1,K=!1,J=!1,Z=!1,Q=!1,ee=!0,te=!1,oe=!0,ne=!1,se={},re=null;const ae=xf({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]);let ie=null;const le=xf({},["audio","video","img","source","image","track"]);let ce=null;const de=xf({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ue="http://www.w3.org/1998/Math/MathML",me="http://www.w3.org/2000/svg",ge="http://www.w3.org/1999/xhtml";let pe=ge,he=!1,fe=null;const be=xf({},[ue,me,ge],uf);let ve;const ye=["application/xhtml+xml","text/html"];let xe,we=null;const Se=r.createElement("form"),ke=function(e){return e instanceof RegExp||e instanceof Function},Ce=function(e){if(!we||we!==e){if(e&&"object"==typeof e||(e={}),e=wf(e),ve=ve=-1===ye.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,xe="application/xhtml+xml"===ve?uf:df,N="ALLOWED_TAGS"in e?xf({},e.ALLOWED_TAGS,xe):V,z="ALLOWED_ATTR"in e?xf({},e.ALLOWED_ATTR,xe):L,fe="ALLOWED_NAMESPACES"in e?xf({},e.ALLOWED_NAMESPACES,uf):be,ce="ADD_URI_SAFE_ATTR"in e?xf(wf(de),e.ADD_URI_SAFE_ATTR,xe):de,ie="ADD_DATA_URI_TAGS"in e?xf(wf(le),e.ADD_DATA_URI_TAGS,xe):le,re="FORBID_CONTENTS"in e?xf({},e.FORBID_CONTENTS,xe):ae,P="FORBID_TAGS"in e?xf({},e.FORBID_TAGS,xe):{},U="FORBID_ATTR"in e?xf({},e.FORBID_ATTR,xe):{},se="USE_PROFILES"in e&&e.USE_PROFILES,W=!1!==e.ALLOW_ARIA_ATTR,j=!1!==e.ALLOW_DATA_ATTR,G=e.ALLOW_UNKNOWN_PROTOCOLS||!1,$=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,q=e.SAFE_FOR_TEMPLATES||!1,Y=e.WHOLE_DOCUMENT||!1,J=e.RETURN_DOM||!1,Z=e.RETURN_DOM_FRAGMENT||!1,Q=e.RETURN_TRUSTED_TYPE||!1,K=e.FORCE_BODY||!1,ee=!1!==e.SANITIZE_DOM,te=e.SANITIZE_NAMED_PROPS||!1,oe=!1!==e.KEEP_CONTENT,ne=e.IN_PLACE||!1,R=e.ALLOWED_URI_REGEXP||Lf,pe=e.NAMESPACE||ge,H=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&ke(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(H.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&ke(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(H.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(H.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),q&&(j=!1),Z&&(J=!0),se&&(N=xf({},[...Af]),z=[],!0===se.html&&(xf(N,kf),xf(z,Mf)),!0===se.svg&&(xf(N,Cf),xf(z,Df),xf(z,If)),!0===se.svgFilters&&(xf(N,Of),xf(z,Df),xf(z,If)),!0===se.mathMl&&(xf(N,Tf),xf(z,Bf),xf(z,If))),e.ADD_TAGS&&(N===V&&(N=wf(N)),xf(N,e.ADD_TAGS,xe)),e.ADD_ATTR&&(z===L&&(z=wf(z)),xf(z,e.ADD_ATTR,xe)),e.ADD_URI_SAFE_ATTR&&xf(ce,e.ADD_URI_SAFE_ATTR,xe),e.FORBID_CONTENTS&&(re===ae&&(re=wf(re)),xf(re,e.FORBID_CONTENTS,xe)),oe&&(N["#text"]=!0),Y&&xf(N,["html","head","body"]),N.table&&(xf(N,["tbody"]),delete P.tbody),e.TRUSTED_TYPES_POLICY){if("function"!=typeof e.TRUSTED_TYPES_POLICY.createHTML)throw bf('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if("function"!=typeof e.TRUSTED_TYPES_POLICY.createScriptURL)throw bf('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');x=e.TRUSTED_TYPES_POLICY,w=x.createHTML("")}else void 0===x&&(x=function(e,t){if("object"!=typeof e||"function"!=typeof e.createPolicy)return null;let o=null;const n="data-tt-policy-suffix";t&&t.hasAttribute(n)&&(o=t.getAttribute(n));const s="dompurify"+(o?"#"+o:"");try{return e.createPolicy(s,{createHTML:e=>e,createScriptURL:e=>e})}catch(e){return console.warn("TrustedTypes policy "+s+" could not be created."),null}}(p,s)),null!==x&&"string"==typeof w&&(w=x.createHTML(""));tf&&tf(e),we=e}},Oe=xf({},["mi","mo","mn","ms","mtext"]),_e=xf({},["foreignobject","desc","title","annotation-xml"]),Te=xf({},["title","style","font","a","script"]),Ee=xf({},Cf);xf(Ee,Of),xf(Ee,_f);const Ae=xf({},Tf);xf(Ae,Ef);const Me=function(e){cf(o.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){e.remove()}},De=function(e,t){try{cf(o.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){cf(o.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!z[e])if(J||Z)try{Me(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Be=function(e){let t,o;if(K)e="<remove></remove>"+e;else{const t=mf(e,/^[\r\n\t ]+/);o=t&&t[0]}"application/xhtml+xml"===ve&&pe===ge&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");const n=x?x.createHTML(e):e;if(pe===ge)try{t=(new g).parseFromString(n,ve)}catch(e){}if(!t||!t.documentElement){t=S.createDocument(pe,"template",null);try{t.documentElement.innerHTML=he?w:n}catch(e){}}const s=t.body||t.documentElement;return e&&o&&s.insertBefore(r.createTextNode(o),s.childNodes[0]||null),pe===ge?O.call(t,Y?"html":"body")[0]:Y?t.documentElement:s},Ie=function(e){return k.call(e.ownerDocument||e,e,d.SHOW_ELEMENT|d.SHOW_COMMENT|d.SHOW_TEXT,null,!1)},Fe=function(e){return"object"==typeof l?e instanceof l:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Re=function(e,t,n){T[e]&&af(T[e],(e=>{e.call(o,t,n,we)}))},Ne=function(e){let t;if(Re("beforeSanitizeElements",e,null),(n=e)instanceof m&&("string"!=typeof n.nodeName||"string"!=typeof n.textContent||"function"!=typeof n.removeChild||!(n.attributes instanceof u)||"function"!=typeof n.removeAttribute||"function"!=typeof n.setAttribute||"string"!=typeof n.namespaceURI||"function"!=typeof n.insertBefore||"function"!=typeof n.hasChildNodes))return Me(e),!0;var n;const s=xe(e.nodeName);if(Re("uponSanitizeElement",e,{tagName:s,allowedTags:N}),e.hasChildNodes()&&!Fe(e.firstElementChild)&&(!Fe(e.content)||!Fe(e.content.firstElementChild))&&ff(/<[/\w]/g,e.innerHTML)&&ff(/<[/\w]/g,e.textContent))return Me(e),!0;if(!N[s]||P[s]){if(!P[s]&&ze(s)){if(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,s))return!1;if(H.tagNameCheck instanceof Function&&H.tagNameCheck(s))return!1}if(oe&&!re[s]){const t=y(e)||e.parentNode,o=v(e)||e.childNodes;if(o&&t)for(let n=o.length-1;n>=0;--n)t.insertBefore(f(o[n],!0),b(e))}return Me(e),!0}return e instanceof c&&!function(e){let t=y(e);t&&t.tagName||(t={namespaceURI:pe,tagName:"template"});const o=df(e.tagName),n=df(t.tagName);return!!fe[e.namespaceURI]&&(e.namespaceURI===me?t.namespaceURI===ge?"svg"===o:t.namespaceURI===ue?"svg"===o&&("annotation-xml"===n||Oe[n]):Boolean(Ee[o]):e.namespaceURI===ue?t.namespaceURI===ge?"math"===o:t.namespaceURI===me?"math"===o&&_e[n]:Boolean(Ae[o]):e.namespaceURI===ge?!(t.namespaceURI===me&&!_e[n])&&!(t.namespaceURI===ue&&!Oe[n])&&!Ae[o]&&(Te[o]||!Ee[o]):!("application/xhtml+xml"!==ve||!fe[e.namespaceURI]))}(e)?(Me(e),!0):"noscript"!==s&&"noembed"!==s&&"noframes"!==s||!ff(/<\/no(script|embed|frames)/i,e.innerHTML)?(q&&3===e.nodeType&&(t=e.textContent,t=gf(t,E," "),t=gf(t,A," "),t=gf(t,M," "),e.textContent!==t&&(cf(o.removed,{element:e.cloneNode()}),e.textContent=t)),Re("afterSanitizeElements",e,null),!1):(Me(e),!0)},Ve=function(e,t,o){if(ee&&("id"===t||"name"===t)&&(o in r||o in Se))return!1;if(j&&!U[t]&&ff(D,t));else if(W&&ff(B,t));else if(!z[t]||U[t]){if(!(ze(e)&&(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,e)||H.tagNameCheck instanceof Function&&H.tagNameCheck(e))&&(H.attributeNameCheck instanceof RegExp&&ff(H.attributeNameCheck,t)||H.attributeNameCheck instanceof Function&&H.attributeNameCheck(t))||"is"===t&&H.allowCustomizedBuiltInElements&&(H.tagNameCheck instanceof RegExp&&ff(H.tagNameCheck,o)||H.tagNameCheck instanceof Function&&H.tagNameCheck(o))))return!1}else if(ce[t]);else if(ff(R,gf(o,F,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==pf(o,"data:")||!ie[e])if(G&&!ff(I,gf(o,F,"")));else if(o)return!1;return!0},ze=function(e){return e.indexOf("-")>0},Le=function(e){let t,o,n,s;Re("beforeSanitizeAttributes",e,null);const{attributes:r}=e;if(!r)return;const a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:z};for(s=r.length;s--;){t=r[s];const{name:i,namespaceURI:l}=t;o="value"===i?t.value:hf(t.value);const c=o;if(n=xe(i),a.attrName=n,a.attrValue=o,a.keepAttr=!0,a.forceKeepAttr=void 0,Re("uponSanitizeAttribute",e,a),o=a.attrValue,a.forceKeepAttr)continue;if(!a.keepAttr){De(i,e);continue}if(!$&&ff(/\/>/i,o)){De(i,e);continue}q&&(o=gf(o,E," "),o=gf(o,A," "),o=gf(o,M," "));const d=xe(e.nodeName);if(Ve(d,n,o)){if(!te||"id"!==n&&"name"!==n||(De(i,e),o="user-content-"+o),x&&"object"==typeof p&&"function"==typeof p.getAttributeType)if(l);else switch(p.getAttributeType(d,n)){case"TrustedHTML":o=x.createHTML(o);break;case"TrustedScriptURL":o=x.createScriptURL(o)}if(o!==c)try{l?e.setAttributeNS(l,i,o):e.setAttribute(i,o)}catch(t){De(i,e)}}else De(i,e)}Re("afterSanitizeAttributes",e,null)},He=function e(t){let o;const n=Ie(t);for(Re("beforeSanitizeShadowDOM",t,null);o=n.nextNode();)Re("uponSanitizeShadowNode",o,null),Ne(o)||(o.content instanceof a&&e(o.content),Le(o));Re("afterSanitizeShadowDOM",t,null)};return o.sanitize=function(e){let t,s,r,i,c=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(he=!e,he&&(e="\x3c!--\x3e"),"string"!=typeof e&&!Fe(e)){if("function"!=typeof e.toString)throw bf("toString is not a function");if("string"!=typeof(e=e.toString()))throw bf("dirty is not a string, aborting")}if(!o.isSupported)return e;if(X||Ce(c),o.removed=[],"string"==typeof e&&(ne=!1),ne){if(e.nodeName){const t=xe(e.nodeName);if(!N[t]||P[t])throw bf("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof l)t=Be("\x3c!----\x3e"),s=t.ownerDocument.importNode(e,!0),1===s.nodeType&&"BODY"===s.nodeName||"HTML"===s.nodeName?t=s:t.appendChild(s);else{if(!J&&!q&&!Y&&-1===e.indexOf("<"))return x&&Q?x.createHTML(e):e;if(t=Be(e),!t)return J?null:Q?w:""}t&&K&&Me(t.firstChild);const d=Ie(ne?e:t);for(;r=d.nextNode();)Ne(r)||(r.content instanceof a&&He(r.content),Le(r));if(ne)return e;if(J){if(Z)for(i=C.call(t.ownerDocument);t.firstChild;)i.appendChild(t.firstChild);else i=t;return(z.shadowroot||z.shadowrootmode)&&(i=_.call(n,i,!0)),i}let u=Y?t.outerHTML:t.innerHTML;return Y&&N["!doctype"]&&t.ownerDocument&&t.ownerDocument.doctype&&t.ownerDocument.doctype.name&&ff(Uf,t.ownerDocument.doctype.name)&&(u="<!DOCTYPE "+t.ownerDocument.doctype.name+">\n"+u),q&&(u=gf(u,E," "),u=gf(u,A," "),u=gf(u,M," ")),x&&Q?x.createHTML(u):u},o.setConfig=function(e){Ce(e),X=!0},o.clearConfig=function(){we=null,X=!1},o.isValidAttribute=function(e,t,o){we||Ce({});const n=xe(e),s=xe(t);return Ve(n,s,o)},o.addHook=function(e,t){"function"==typeof t&&(T[e]=T[e]||[],cf(T[e],t))},o.removeHook=function(e){if(T[e])return lf(T[e])},o.removeHooks=function(e){T[e]&&(T[e]=[])},o.removeAllHooks=function(){T={}},o}();const $f=e=>Gf().sanitize(e);var qf=tinymce.util.Tools.resolve("tinymce.util.I18n");const Yf={indent:!0,outdent:!0,"table-insert-column-after":!0,"table-insert-column-before":!0,"paste-column-after":!0,"paste-column-before":!0,"unordered-list":!0,"list-bull-circle":!0,"list-bull-default":!0,"list-bull-square":!0},Xf="temporary-placeholder",Kf=e=>()=>be(e,Xf).getOr("!not found!"),Jf=(e,t)=>{const o=e.toLowerCase();if(qf.isRtl()){const e=((e,t)=>Ae(e,t)?e:((e,t)=>e+t)(e,t))(o,"-rtl");return ve(t,e)?e:o}return o},Zf=(e,t)=>be(t,Jf(e,t)),Qf=(e,t)=>{const o=t();return Zf(e,o).getOrThunk(Kf(o))},eb=()=>th("add-focusable",[Jr((e=>{bi(e.element,"svg").each((e=>Ct(e,"focusable","false")))}))]),tb=(e,t,o,n)=>{var s,r;const a=(e=>!!qf.isRtl()&&ve(Yf,e))(t)?["tox-icon--flip"]:[],i=be(o,Jf(t,o)).or(n).getOrThunk(Kf(o));return{dom:{tag:e.tag,attributes:null!==(s=e.attributes)&&void 0!==s?s:{},classes:e.classes.concat(a),innerHtml:i},behaviours:Tl([...null!==(r=e.behaviours)&&void 0!==r?r:[],eb()])}},ob=(e,t,o,n=A.none())=>tb(t,e,o(),n),nb={success:"checkmark",error:"warning",err:"error",warning:"warning",warn:"warning",info:"info"},sb=xm({name:"Notification",factory:e=>{const t=Xh({dom:Yh(`<p>${$f(e.translationProvider(e.text))}</p>`),behaviours:Tl([eh.config({})])}),o=e=>({dom:{tag:"div",classes:["tox-bar"],styles:{width:`${e}%`}}}),n=e=>({dom:{tag:"div",classes:["tox-text"],innerHtml:`${e}%`}}),s=Xh({dom:{tag:"div",classes:e.progress?["tox-progress-bar","tox-progress-indicator"]:["tox-progress-bar"]},components:[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(0)]},n(0)],behaviours:Tl([eh.config({})])}),r={updateProgress:(e,t)=>{e.getSystem().isConnected()&&s.getOpt(e).each((e=>{eh.set(e,[{dom:{tag:"div",classes:["tox-bar-container"]},components:[o(t)]},n(t)])}))},updateText:(e,o)=>{if(e.getSystem().isConnected()){const n=t.get(e);eh.set(n,[ri(o)])}}},a=q([e.icon.toArray(),e.level.toArray(),e.level.bind((e=>A.from(nb[e]))).toArray()]),i=Xh(qh.sketch({dom:{tag:"button",classes:["tox-notification__dismiss","tox-button","tox-button--naked","tox-button--icon"]},components:[ob("close",{tag:"span",classes:["tox-icon"],attributes:{"aria-label":e.translationProvider("Close")}},e.iconProvider)],action:t=>{e.onAction(t)}})),l=((e,t,o)=>{const n=o(),s=G(e,(e=>ve(n,Jf(e,n))));return tb({tag:"div",classes:["tox-notification__icon"]},s.getOr(Xf),n,A.none())})(a,0,e.iconProvider),c=[l,{dom:{tag:"div",classes:["tox-notification__body"]},components:[t.asSpec()],behaviours:Tl([eh.config({})])}];return{uid:e.uid,dom:{tag:"div",attributes:{role:"alert"},classes:e.level.map((e=>["tox-notification","tox-notification--in",`tox-notification--${e}`])).getOr(["tox-notification","tox-notification--in"])},behaviours:Tl([ah.config({}),th("notification-events",[Wr(Xs(),(e=>{i.getOpt(e).each(ah.focus)}))])]),components:c.concat(e.progress?[s.asSpec()]:[]).concat(e.closeButton?[i.asSpec()]:[]),apis:r}},configFields:[ms("level"),ns("progress"),ms("icon"),ns("onAction"),ns("text"),ns("iconProvider"),ns("translationProvider"),Os("closeButton",!0)],apis:{updateProgress:(e,t,o)=>{e.updateProgress(t,o)},updateText:(e,t,o)=>{e.updateText(t,o)}}});var rb,ab,ib=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),lb=tinymce.util.Tools.resolve("tinymce.EditorManager"),cb=tinymce.util.Tools.resolve("tinymce.Env");!function(e){e.default="wrap",e.floating="floating",e.sliding="sliding",e.scrolling="scrolling"}(rb||(rb={})),function(e){e.auto="auto",e.top="top",e.bottom="bottom"}(ab||(ab={}));const db=e=>t=>t.options.get(e),ub=e=>t=>A.from(e(t)),mb=e=>{const t=cb.deviceType.isPhone(),o=cb.deviceType.isTablet()||t,n=e.options.register,s=e=>r(e)||!1===e,a=e=>r(e)||h(e);n("skin",{processor:e=>r(e)||!1===e,default:"oxide"}),n("skin_url",{processor:"string"}),n("height",{processor:a,default:Math.max(e.getElement().offsetHeight,400)}),n("width",{processor:a,default:ib.DOM.getStyle(e.getElement(),"width")}),n("min_height",{processor:"number",default:100}),n("min_width",{processor:"number"}),n("max_height",{processor:"number"}),n("max_width",{processor:"number"}),n("style_formats",{processor:"object[]"}),n("style_formats_merge",{processor:"boolean",default:!1}),n("style_formats_autohide",{processor:"boolean",default:!1}),n("line_height_formats",{processor:"string",default:"1 1.1 1.2 1.3 1.4 1.5 2"}),n("font_family_formats",{processor:"string",default:"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"}),n("font_size_formats",{processor:"string",default:"8pt 10pt 12pt 14pt 18pt 24pt 36pt"}),n("font_size_input_default_unit",{processor:"string",default:"pt"}),n("block_formats",{processor:"string",default:"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre"}),n("content_langs",{processor:"object[]"}),n("removed_menuitems",{processor:"string",default:""}),n("menubar",{processor:e=>r(e)||d(e),default:!t}),n("menu",{processor:"object",default:{}}),n("toolbar",{processor:e=>d(e)||r(e)||l(e)?{value:e,valid:!0}:{valid:!1,message:"Must be a boolean, string or array."},default:!0}),V(9,(e=>{n("toolbar"+(e+1),{processor:"string"})})),n("toolbar_mode",{processor:"string",default:o?"scrolling":"floating"}),n("toolbar_groups",{processor:"object",default:{}}),n("toolbar_location",{processor:"string",default:ab.auto}),n("toolbar_persist",{processor:"boolean",default:!1}),n("toolbar_sticky",{processor:"boolean",default:e.inline}),n("toolbar_sticky_offset",{processor:"number",default:0}),n("fixed_toolbar_container",{processor:"string",default:""}),n("fixed_toolbar_container_target",{processor:"object"}),n("ui_mode",{processor:"string",default:"combined"}),n("file_picker_callback",{processor:"function"}),n("file_picker_validator_handler",{processor:"function"}),n("file_picker_types",{processor:"string"}),n("typeahead_urls",{processor:"boolean",default:!0}),n("anchor_top",{processor:s,default:"#top"}),n("anchor_bottom",{processor:s,default:"#bottom"}),n("draggable_modal",{processor:"boolean",default:!1}),n("statusbar",{processor:"boolean",default:!0}),n("elementpath",{processor:"boolean",default:!0}),n("branding",{processor:"boolean",default:!0}),n("promotion",{processor:"boolean",default:!0}),n("resize",{processor:e=>"both"===e||d(e),default:!cb.deviceType.isTouch()}),n("sidebar_show",{processor:"string"}),n("help_accessibility",{processor:"boolean",default:e.hasPlugin("help")}),n("default_font_stack",{processor:"string[]",default:[]})},gb=db("readonly"),pb=db("height"),hb=db("width"),fb=ub(db("min_width")),bb=ub(db("min_height")),vb=ub(db("max_width")),yb=ub(db("max_height")),xb=ub(db("style_formats")),wb=db("style_formats_merge"),Sb=db("style_formats_autohide"),kb=db("content_langs"),Cb=db("removed_menuitems"),Ob=db("toolbar_mode"),_b=db("toolbar_groups"),Tb=db("toolbar_location"),Eb=db("fixed_toolbar_container"),Ab=db("fixed_toolbar_container_target"),Mb=db("toolbar_persist"),Db=db("toolbar_sticky_offset"),Bb=db("menubar"),Ib=db("toolbar"),Fb=db("file_picker_callback"),Rb=db("file_picker_validator_handler"),Nb=db("font_size_input_default_unit"),Vb=db("file_picker_types"),zb=db("typeahead_urls"),Lb=db("anchor_top"),Hb=db("anchor_bottom"),Pb=db("draggable_modal"),Ub=db("statusbar"),Wb=db("elementpath"),jb=db("branding"),Gb=db("resize"),$b=db("paste_as_text"),qb=db("sidebar_show"),Yb=db("promotion"),Xb=db("help_accessibility"),Kb=db("default_font_stack"),Jb=e=>!1===e.options.get("skin"),Zb=e=>!1!==e.options.get("menubar"),Qb=e=>{const t=e.options.get("skin_url");if(Jb(e))return t;if(t)return e.documentBaseURI.toAbsolute(t);{const t=e.options.get("skin");return lb.baseURL+"/skins/ui/"+t}},ev=e=>A.from(e.options.get("skin_url")),tv=e=>e.options.get("line_height_formats").split(" "),ov=e=>{const t=Ib(e),o=r(t),n=l(t)&&t.length>0;return!sv(e)&&(n||o||!0===t)},nv=e=>{const t=V(9,(t=>e.options.get("toolbar"+(t+1)))),o=U(t,r);return Ce(o.length>0,o)},sv=e=>nv(e).fold((()=>{const t=Ib(e);return f(t,r)&&t.length>0}),E),rv=e=>Tb(e)===ab.bottom,av=e=>{var t;if(!e.inline)return A.none();const o=null!==(t=Eb(e))&&void 0!==t?t:"";if(o.length>0)return vi(wt(),o);const n=Ab(e);return g(n)?A.some(ze(n)):A.none()},iv=e=>e.inline&&av(e).isSome(),lv=e=>av(e).getOrThunk((()=>bt(ft(ze(e.getElement()))))),cv=e=>e.inline&&!Zb(e)&&!ov(e)&&!sv(e),dv=e=>(e.options.get("toolbar_sticky")||e.inline)&&!iv(e)&&!cv(e),uv=e=>!iv(e)&&"split"===e.options.get("ui_mode"),mv=e=>{const t=e.options.get("menu");return ce(t,(e=>({...e,items:e.items})))};var gv=Object.freeze({__proto__:null,get ToolbarMode(){return rb},get ToolbarLocation(){return ab},register:mb,getSkinUrl:Qb,getSkinUrlOption:ev,isReadOnly:gb,isSkinDisabled:Jb,getHeightOption:pb,getWidthOption:hb,getMinWidthOption:fb,getMinHeightOption:bb,getMaxWidthOption:vb,getMaxHeightOption:yb,getUserStyleFormats:xb,shouldMergeStyleFormats:wb,shouldAutoHideStyleFormats:Sb,getLineHeightFormats:tv,getContentLanguages:kb,getRemovedMenuItems:Cb,isMenubarEnabled:Zb,isMultipleToolbars:sv,isToolbarEnabled:ov,isToolbarPersist:Mb,getMultipleToolbarsOption:nv,getUiContainer:lv,useFixedContainer:iv,isSplitUiMode:uv,getToolbarMode:Ob,isDraggableModal:Pb,isDistractionFree:cv,isStickyToolbar:dv,getStickyToolbarOffset:Db,getToolbarLocation:Tb,isToolbarLocationBottom:rv,getToolbarGroups:_b,getMenus:mv,getMenubar:Bb,getToolbar:Ib,getFilePickerCallback:Fb,getFilePickerTypes:Vb,useTypeaheadUrls:zb,getAnchorTop:Lb,getAnchorBottom:Hb,getFilePickerValidatorHandler:Rb,getFontSizeInputDefaultUnit:Nb,useStatusBar:Ub,useElementPath:Wb,promotionEnabled:Yb,useBranding:jb,getResize:Gb,getPasteAsText:$b,getSidebarShow:qb,useHelpAccessibility:Xb,getDefaultFontStack:Kb});const pv="[data-mce-autocompleter]",hv=e=>yi(e,pv);var fv;!function(e){e[e.CLOSE_ON_EXECUTE=0]="CLOSE_ON_EXECUTE",e[e.BUBBLE_TO_SANDBOX=1]="BUBBLE_TO_SANDBOX"}(fv||(fv={}));var bv=fv;const vv="tox-menu-nav__js",yv="tox-collection__item",xv="tox-swatch",wv={normal:vv,color:xv},Sv="tox-collection__item--enabled",kv="tox-collection__item-icon",Cv="tox-collection__item-label",Ov="tox-collection__item-caret",_v="tox-collection__item--active",Tv="tox-collection__item-container",Ev="tox-collection__item-container--row",Av=e=>be(wv,e).getOr(vv),Mv=e=>"color"===e?"tox-swatches":"tox-menu",Dv=e=>({backgroundMenu:"tox-background-menu",selectedMenu:"tox-selected-menu",selectedItem:"tox-collection__item--active",hasIcons:"tox-menu--has-icons",menu:Mv(e),tieredMenu:"tox-tiered-menu"}),Bv=e=>{const t=Dv(e);return{backgroundMenu:t.backgroundMenu,selectedMenu:t.selectedMenu,menu:t.menu,selectedItem:t.selectedItem,item:Av(e)}},Iv=(e,t,o)=>{const n=Dv(o);return{tag:"div",classes:q([[n.menu,`tox-menu-${t}-column`],e?[n.hasIcons]:[]])}},Fv=[Rh.parts.items({})],Rv=(e,t,o)=>{const n=Dv(o);return{dom:{tag:"div",classes:q([[n.tieredMenu]])},markers:Bv(o)}},Nv=x([ms("data"),xs("inputAttributes",{}),xs("inputStyles",{}),xs("tag","input"),xs("inputClasses",[]),Ri("onSetValue"),xs("styles",{}),xs("eventOrder",{}),yu("inputBehaviours",[vu,ah]),xs("selectOnFocus",!0)]),Vv=e=>Tl([ah.config({onFocus:e.selectOnFocus?e=>{const t=e.element,o=Ka(t);t.dom.setSelectionRange(0,o.length)}:b})]),zv=e=>({...Vv(e),...wu(e.inputBehaviours,[vu.config({store:{mode:"manual",...e.data.map((e=>({initialValue:e}))).getOr({}),getValue:e=>Ka(e.element),setValue:(e,t)=>{Ka(e.element)!==t&&Ja(e.element,t)}},onSetValue:e.onSetValue})])}),Lv=e=>({tag:e.tag,attributes:{type:"text",...e.inputAttributes},styles:e.inputStyles,classes:e.inputClasses}),Hv=xm({name:"Input",configFields:Nv(),factory:(e,t)=>({uid:e.uid,dom:Lv(e),components:[],behaviours:zv(e),eventOrder:e.eventOrder})}),Pv=ca("refetch-trigger-event"),Uv=ca("redirect-menu-item-interaction"),Wv="tox-menu__searcher",jv=e=>vi(e.element,`.${Wv}`).bind((t=>e.getSystem().getByDom(t).toOptional())),Gv=jv,$v=e=>({fetchPattern:vu.getValue(e),selectionStart:e.element.dom.selectionStart,selectionEnd:e.element.dom.selectionEnd}),qv=e=>{const t=(e,t)=>(t.cut(),A.none()),o=(e,t)=>{const o={interactionEvent:t.event,eventType:t.event.raw.type};return Rr(e,Uv,o),A.some(!0)},n="searcher-events";return{dom:{tag:"div",classes:[yv]},components:[Hv.sketch({inputClasses:[Wv,"tox-textfield"],inputAttributes:{...e.placeholder.map((t=>({placeholder:e.i18n(t)}))).getOr({}),type:"search","aria-autocomplete":"list"},inputBehaviours:Tl([th(n,[Wr(Qs(),(e=>{Fr(e,Pv)})),Wr(Js(),((e,t)=>{"Escape"===t.event.raw.key&&t.stop()}))]),Gp.config({mode:"special",onLeft:t,onRight:t,onSpace:t,onEnter:o,onEscape:o,onUp:o,onDown:o})]),eventOrder:{keydown:[n,Gp.name()]}})]}},Yv="tox-collection--results__js",Xv=e=>{var t;return e.dom?{...e,dom:{...e.dom,attributes:{...null!==(t=e.dom.attributes)&&void 0!==t?t:{},id:ca("aria-item-search-result-id"),"aria-selected":"false"}}}:e},Kv=(e,t)=>o=>{const n=z(o,t);return L(n,(t=>({dom:e,components:t})))},Jv=(e,t)=>{const o=[];let n=[];return H(e,((e,s)=>{t(e,s)?(n.length>0&&o.push(n),n=[],(ve(e.dom,"innerHtml")||e.components&&e.components.length>0)&&n.push(e)):n.push(e)})),n.length>0&&o.push(n),L(o,(e=>({dom:{tag:"div",classes:["tox-collection__group"]},components:e})))},Zv=(e,t,o)=>Rh.parts.items({preprocess:n=>{const s=L(n,o);return"auto"!==e&&e>1?Kv({tag:"div",classes:["tox-collection__group"]},e)(s):Jv(s,((e,o)=>"separator"===t[o].type))}}),Qv=(e,t,o=!0)=>({dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[Zv(e,t,w)]}),ey=e=>N(e,(e=>"icon"in e&&void 0!==e.icon)),ty=e=>(console.error(Jn(e)),console.log(e),A.none()),oy=(e,t,o,n,s)=>{const r=(a=o,{dom:{tag:"div",classes:["tox-collection","tox-collection--horizontal"]},components:[Rh.parts.items({preprocess:e=>Jv(e,((e,t)=>"separator"===a[t].type))})]});var a;return{value:e,dom:r.dom,components:r.components,items:o}},ny=(e,t,o,n,s)=>{if("color"===s.menuType){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-swatches-menu"]},components:[{dom:{tag:"div",classes:["tox-swatches"]},components:[Rh.parts.items({preprocess:"auto"!==e?Kv({tag:"div",classes:["tox-swatches__row"]},e):w})]}]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType&&"auto"===n){const t=Qv(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("normal"===s.menuType||"searchable"===s.menuType){const t="searchable"!==s.menuType?Qv(n,o):"search-with-field"===s.searchMode.searchMode?((e,t,o)=>{const n=ca("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection"].concat(1===e?["tox-collection--list"]:["tox-collection--grid"])},components:[qv({i18n:qf.translate,placeholder:o.placeholder}),{dom:{tag:"div",classes:[...1===e?["tox-collection--list"]:["tox-collection--grid"],Yv],attributes:{id:n}},components:[Zv(e,t,Xv)]}]}})(n,o,s.searchMode):((e,t,o=!0)=>{const n=ca("aria-controls-search-results");return{dom:{tag:"div",classes:["tox-menu","tox-collection",Yv].concat(1===e?["tox-collection--list"]:["tox-collection--grid"]),attributes:{id:n}},components:[Zv(e,t,Xv)]}})(n,o);return{value:e,dom:t.dom,components:t.components,items:o}}if("listpreview"===s.menuType&&"auto"!==n){const t=(e=>({dom:{tag:"div",classes:["tox-menu","tox-collection","tox-collection--toolbar","tox-collection--toolbar-lg"]},components:[Rh.parts.items({preprocess:Kv({tag:"div",classes:["tox-collection__group"]},e)})]}))(n);return{value:e,dom:t.dom,components:t.components,items:o}}return{value:e,dom:Iv(t,n,s.menuType),components:Fv,items:o}},sy=as("type"),ry=as("name"),ay=as("label"),iy=as("text"),ly=as("title"),cy=as("icon"),dy=as("value"),uy=ls("fetch"),my=ls("getSubmenuItems"),gy=ls("onAction"),py=ls("onItemAction"),hy=_s("onSetup",(()=>b)),fy=hs("name"),by=hs("text"),vy=hs("icon"),yy=hs("tooltip"),xy=hs("label"),wy=hs("shortcut"),Sy=bs("select"),ky=Os("active",!1),Cy=Os("borderless",!1),Oy=Os("enabled",!0),_y=Os("primary",!1),Ty=e=>xs("columns",e),Ey=xs("meta",{}),Ay=_s("onAction",b),My=e=>ks("type",e),Dy=e=>es("name","name",yn((()=>ca(`${e}-name`))),Hn),By=Bn([sy,by]),Iy=Bn([My("autocompleteitem"),ky,Oy,Ey,dy,by,vy]),Fy=[Oy,yy,vy,by,hy],Ry=Bn([sy,gy].concat(Fy)),Ny=e=>Yn("toolbarbutton",Ry,e),Vy=[ky].concat(Fy),zy=Bn(Vy.concat([sy,gy])),Ly=e=>Yn("ToggleButton",zy,e),Hy=[_s("predicate",T),Cs("scope","node",["node","editor"]),Cs("position","selection",["node","selection","line"])],Py=Fy.concat([My("contextformbutton"),_y,gy,ts("original",w)]),Uy=Vy.concat([My("contextformbutton"),_y,gy,ts("original",w)]),Wy=Fy.concat([My("contextformbutton")]),jy=Vy.concat([My("contextformtogglebutton")]),Gy=Zn("type",{contextformbutton:Py,contextformtogglebutton:Uy}),$y=Bn([My("contextform"),_s("initValue",x("")),xy,us("commands",Gy),gs("launch",Zn("type",{contextformbutton:Wy,contextformtogglebutton:jy}))].concat(Hy)),qy=Bn([My("contexttoolbar"),as("items")].concat(Hy)),Yy=[sy,as("src"),hs("alt"),Ts("classes",[],Hn)],Xy=Bn(Yy),Ky=[sy,iy,fy,Ts("classes",["tox-collection__item-label"],Hn)],Jy=Bn(Ky),Zy=An((()=>Gn("type",{cardimage:Xy,cardtext:Jy,cardcontainer:Qy}))),Qy=Bn([sy,ks("direction","horizontal"),ks("align","left"),ks("valign","middle"),us("items",Zy)]),ex=[Oy,by,wy,("menuitem",es("value","value",yn((()=>ca("menuitem-value"))),Vn())),Ey];const tx=Bn([sy,xy,us("items",Zy),hy,Ay].concat(ex)),ox=Bn([sy,ky,vy].concat(ex)),nx=[sy,as("fancytype"),Ay],sx=[xs("initData",{})].concat(nx),rx=[bs("select"),Es("initData",{},[Os("allowCustomColors",!0),ks("storageKey","default"),vs("colors",Vn())])].concat(nx),ax=Zn("fancytype",{inserttable:sx,colorswatch:rx}),ix=Bn([sy,hy,Ay,vy].concat(ex)),lx=Bn([sy,my,hy,vy].concat(ex)),cx=Bn([sy,vy,ky,hy,gy].concat(ex)),dx=(e,t,o)=>{const n=Zc(e.element,"."+o);if(n.length>0){const e=$(n,(e=>{const o=e.dom.getBoundingClientRect().top,s=n[0].dom.getBoundingClientRect().top;return Math.abs(o-s)>t})).getOr(n.length);return A.some({numColumns:e,numRows:Math.ceil(n.length/e)})}return A.none()},ux=e=>((e,t)=>Tl([th(e,t)]))(ca("unnamed-events"),e),mx=ca("tooltip.exclusive"),gx=ca("tooltip.show"),px=ca("tooltip.hide"),hx=(e,t,o)=>{e.getSystem().broadcastOn([mx],{})};var fx=Object.freeze({__proto__:null,hideAllExclusive:hx,setComponents:(e,t,o,n)=>{o.getTooltip().each((e=>{e.getSystem().isConnected()&&eh.set(e,n)}))}}),bx=Object.freeze({__proto__:null,events:(e,t)=>{const o=o=>{t.getTooltip().each((n=>{Nd(n),e.onHide(o,n),t.clearTooltip()})),t.clearTimer()};return Hr(q([[Wr(gx,(o=>{t.resetTimer((()=>{(o=>{if(!t.isShowing()){hx(o);const n=e.lazySink(o).getOrDie(),s=o.getSystem().build({dom:e.tooltipDom,components:e.tooltipComponents,events:Hr("normal"===e.mode?[Wr(Ys(),(e=>{Fr(o,gx)})),Wr($s(),(e=>{Fr(o,px)}))]:[]),behaviours:Tl([eh.config({})])});t.setTooltip(s),Id(n,s),e.onShow(o,s),_d.position(n,s,{anchor:e.anchor(o)})}})(o)}),e.delay)})),Wr(px,(n=>{t.resetTimer((()=>{o(n)}),e.delay)})),Wr(ur(),((e,t)=>{const n=t;n.universal||R(n.channels,mx)&&o(e)})),Zr((e=>{o(e)}))],"normal"===e.mode?[Wr(Xs(),(e=>{Fr(e,gx)})),Wr(cr(),(e=>{Fr(e,px)})),Wr(Ys(),(e=>{Fr(e,gx)})),Wr($s(),(e=>{Fr(e,px)}))]:[Wr(Br(),((e,t)=>{Fr(e,gx)})),Wr(Ir(),(e=>{Fr(e,px)}))]]))}}),vx=[ns("lazySink"),ns("tooltipDom"),xs("exclusive",!0),xs("tooltipComponents",[]),xs("delay",300),Cs("mode","normal",["normal","follow-highlight"]),xs("anchor",(e=>({type:"hotspot",hotspot:e,layouts:{onLtr:x([gl,ml,ll,dl,cl,ul]),onRtl:x([gl,ml,ll,dl,cl,ul])}}))),Ri("onHide"),Ri("onShow")],yx=Object.freeze({__proto__:null,init:()=>{const e=nc(),t=nc(),o=()=>{e.on(clearTimeout)},n=x("not-implemented");return Ta({getTooltip:t.get,isShowing:t.isSet,setTooltip:t.set,clearTooltip:t.clear,clearTimer:o,resetTimer:(t,n)=>{o(),e.set(setTimeout(t,n))},readState:n})}});const xx=Al({fields:vx,name:"tooltipping",active:bx,state:yx,apis:fx}),wx="silver.readonly",Sx=Bn([("readonly",ss("readonly",Pn))]);const kx=(e,t)=>{const o=e.mainUi.outerContainer.element,n=[e.mainUi.mothership,...e.uiMotherships];t&&H(n,(e=>{e.broadcastOn([Qd()],{target:o})})),H(n,(e=>{e.broadcastOn([wx],{readonly:t})}))},Cx=(e,t)=>{e.on("init",(()=>{e.mode.isReadOnly()&&kx(t,!0)})),e.on("SwitchMode",(()=>kx(t,e.mode.isReadOnly()))),gb(e)&&e.mode.set("readonly")},Ox=()=>Il.config({channels:{[wx]:{schema:Sx,onReceive:(e,t)=>{Lm.set(e,t.readonly)}}}}),_x=e=>Lm.config({disabled:e}),Tx=e=>Lm.config({disabled:e,disableClass:"tox-tbtn--disabled"}),Ex=e=>Lm.config({disabled:e,disableClass:"tox-tbtn--disabled",useNative:!1}),Ax=(e,t)=>{const o=e.getApi(t);return e=>{e(o)}},Mx=(e,t)=>Jr((o=>{Ax(e,o)((o=>{const n=e.onSetup(o);p(n)&&t.set(n)}))})),Dx=(e,t)=>Zr((o=>Ax(e,o)(t.get()))),Bx=(e,t)=>ea(((o,n)=>{Ax(e,o)(e.onAction),e.triggersSubmenu||t!==bv.CLOSE_ON_EXECUTE||(o.getSystem().isConnected()&&Fr(o,fr()),n.stop())})),Ix={[mr()]:["disabling","alloy.base.behaviour","toggling","item-events"]},Fx=we,Rx=(e,t,o,n)=>{const s=As(b);return{type:"item",dom:t.dom,components:Fx(t.optComponents),data:e.data,eventOrder:Ix,hasSubmenu:e.triggersSubmenu,itemBehaviours:Tl([th("item-events",[Bx(e,o),Mx(e,s),Dx(e,s)]),(r=()=>!e.enabled||n.isDisabled(),Lm.config({disabled:r,disableClass:"tox-collection__item--state-disabled"})),Ox(),eh.config({})].concat(e.itemBehaviours))};var r},Nx=e=>({value:e.value,meta:{text:e.text.getOr(""),...e.meta}}),Vx=e=>{const t=cb.os.isMacOS()||cb.os.isiOS(),o=t?{alt:"\u2325",ctrl:"\u2303",shift:"\u21e7",meta:"\u2318",access:"\u2303\u2325"}:{meta:"Ctrl",access:"Shift+Alt"},n=e.split("+"),s=L(n,(e=>{const t=e.toLowerCase().trim();return ve(o,t)?o[t]:e}));return t?s.join(""):s.join("+")},zx=(e,t,o=[kv])=>ob(e,{tag:"div",classes:o},t),Lx=e=>({dom:{tag:"div",classes:[Cv]},components:[ri(qf.translate(e))]}),Hx=(e,t)=>({dom:{tag:"div",classes:t,innerHtml:e}}),Px=(e,t)=>({dom:{tag:"div",classes:[Cv]},components:[{dom:{tag:e.tag,styles:e.styles},components:[ri(qf.translate(t))]}]}),Ux=e=>({dom:{tag:"div",classes:["tox-collection__item-accessory"]},components:[ri(Vx(e))]}),Wx=e=>zx("checkmark",e,["tox-collection__item-checkmark"]),jx=e=>{const t=e.map((e=>({attributes:{title:qf.translate(e),id:ca("menu-item")}}))).getOr({});return{tag:"div",classes:[vv,yv],...t}},Gx=(e,t,o,n=A.none())=>"color"===e.presets?((e,t,o)=>{const n=e.ariaLabel,s=e.value,r=e.iconContent.map((e=>((e,t,o)=>{const n=t();return Zf(e,n).or(o).getOrThunk(Kf(n))})(e,t.icons,o)));return{dom:(()=>{const e=xv,o=r.getOr(""),a=n.map((e=>({title:t.translate(e)}))).getOr({}),i={tag:"div",attributes:a,classes:[e]};return"custom"===s?{...i,tag:"button",classes:[...i.classes,"tox-swatches__picker-btn"],innerHtml:o}:"remove"===s?{...i,classes:[...i.classes,"tox-swatch--remove"],innerHtml:o}:g(s)?{...i,attributes:{...i.attributes,"data-mce-color":s},styles:{"background-color":s},innerHtml:o}:i})(),optComponents:[]}})(e,t,n):((e,t,o,n)=>{const s={tag:"div",classes:[kv]},r=o?e.iconContent.map((e=>ob(e,s,t.icons,n))).orThunk((()=>A.some({dom:s}))):A.none(),a=e.checkMark,i=A.from(e.meta).fold((()=>Lx),(e=>ve(e,"style")?k(Px,e.style):Lx)),l=e.htmlContent.fold((()=>e.textContent.map(i)),(e=>A.some(Hx(e,[Cv]))));return{dom:jx(e.ariaLabel),optComponents:[r,l,e.shortcutContent.map(Ux),a,e.caret]}})(e,t,o,n),$x=(e,t)=>be(e,"tooltipWorker").map((e=>[xx.config({lazySink:t.getSink,tooltipDom:{tag:"div",classes:["tox-tooltip-worker-container"]},tooltipComponents:[],anchor:e=>({type:"submenu",item:e,overrides:{maxHeightFunction:gc}}),mode:"follow-highlight",onShow:(t,o)=>{e((e=>{xx.setComponents(t,[ai({element:ze(e)})])}))}})])).getOr([]),qx=(e,t)=>{const o=(e=>ib.DOM.encode(e))(qf.translate(e));if(t.length>0){const e=new RegExp((e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"))(t),"gi");return o.replace(e,(e=>`<span class="tox-autocompleter-highlight">${e}</span>`))}return o},Yx=(e,t)=>L(e,(e=>{switch(e.type){case"cardcontainer":return((e,t)=>{const o="vertical"===e.direction?"tox-collection__item-container--column":Ev,n="left"===e.align?"tox-collection__item-container--align-left":"tox-collection__item-container--align-right";return{dom:{tag:"div",classes:[Tv,o,n,(()=>{switch(e.valign){case"top":return"tox-collection__item-container--valign-top";case"middle":return"tox-collection__item-container--valign-middle";case"bottom":return"tox-collection__item-container--valign-bottom"}})()]},components:t}})(e,Yx(e.items,t));case"cardimage":return((e,t,o)=>({dom:{tag:"img",classes:t,attributes:{src:e,alt:o.getOr("")}}}))(e.src,e.classes,e.alt);case"cardtext":const o=e.name.exists((e=>R(t.cardText.highlightOn,e))),n=o?A.from(t.cardText.matchText).getOr(""):"";return Hx(qx(e.text,n),e.classes)}})),Xx=Qu(Eh(),Ah()),Kx=e=>({value:ew(e)}),Jx=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,Zx=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,Qx=e=>Jx.test(e)||Zx.test(e),ew=e=>_e(e,"#").toUpperCase(),tw=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},ow=e=>{const t=tw(e.red)+tw(e.green)+tw(e.blue);return Kx(t)},nw=Math.min,sw=Math.max,rw=Math.round,aw=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,iw=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,lw=(e,t,o,n)=>({red:e,green:t,blue:o,alpha:n}),cw=e=>{const t=parseInt(e,10);return t.toString()===e&&t>=0&&t<=255},dw=e=>{let t,o,n;const s=(e.hue||0)%360;let r=e.saturation/100,a=e.value/100;if(r=sw(0,nw(r,1)),a=sw(0,nw(a,1)),0===r)return t=o=n=rw(255*a),lw(t,o,n,1);const i=s/60,l=a*r,c=l*(1-Math.abs(i%2-1)),d=a-l;switch(Math.floor(i)){case 0:t=l,o=c,n=0;break;case 1:t=c,o=l,n=0;break;case 2:t=0,o=l,n=c;break;case 3:t=0,o=c,n=l;break;case 4:t=c,o=0,n=l;break;case 5:t=l,o=0,n=c;break;default:t=o=n=0}return t=rw(255*(t+d)),o=rw(255*(o+d)),n=rw(255*(n+d)),lw(t,o,n,1)},uw=e=>{const t=(e=>{const t=(e=>{const t=e.value.replace(Jx,((e,t,o,n)=>t+t+o+o+n+n));return{value:t}})(e),o=Zx.exec(t.value);return null===o?["FFFFFF","FF","FF","FF"]:o})(e),o=parseInt(t[1],16),n=parseInt(t[2],16),s=parseInt(t[3],16);return lw(o,n,s,1)},mw=(e,t,o,n)=>{const s=parseInt(e,10),r=parseInt(t,10),a=parseInt(o,10),i=parseFloat(n);return lw(s,r,a,i)},gw=e=>{if("transparent"===e)return A.some(lw(0,0,0,0));const t=aw.exec(e);if(null!==t)return A.some(mw(t[1],t[2],t[3],"1"));const o=iw.exec(e);return null!==o?A.some(mw(o[1],o[2],o[3],o[4])):A.none()},pw=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,hw=lw(255,0,0,1),fw=(e,t)=>{e.dispatch("ResizeContent",t)},bw=(e,t)=>{e.dispatch("TextColorChange",t)},vw=(e,t)=>e.dispatch("ResolveName",{name:t.nodeName.toLowerCase(),target:t}),yw=(e,t)=>()=>{e(),t()},xw=e=>Sw(e,"NodeChange",(t=>{t.setEnabled(e.selection.isEditable())})),ww=(e,t)=>o=>{const n=xw(e)(o),s=((e,t)=>o=>{const n=oc(),s=()=>{o.setActive(e.formatter.match(t));const s=e.formatter.formatChanged(t,o.setActive);n.set(s)};return e.initialized?s():e.once("init",s),()=>{e.off("init",s),n.clear()}})(e,t)(o);return()=>{n(),s()}},Sw=(e,t,o)=>n=>{const s=()=>o(n),r=()=>{o(n),e.on(t,s)};return e.initialized?r():e.once("init",r),()=>{e.off("init",r),e.off(t,s)}},kw=e=>t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("mceToggleFormat",!1,t.format)}))},Cw=(e,t)=>()=>e.execCommand(t);var Ow=tinymce.util.Tools.resolve("tinymce.util.LocalStorage");const _w={},Tw=e=>be(_w,e).getOrThunk((()=>{const t=`tinymce-custom-colors-${e}`,o=Ow.getItem(t);if(m(o)){const e=Ow.getItem("tinymce-custom-colors");Ow.setItem(t,g(e)?e:"[]")}const n=((e,t=10)=>{const o=Ow.getItem(e),n=r(o)?JSON.parse(o):[],s=t-(a=n).length<0?a.slice(0,t):a;var a;const i=e=>{s.splice(e,1)};return{add:o=>{F(s,o).each(i),s.unshift(o),s.length>t&&s.pop(),Ow.setItem(e,JSON.stringify(s))},state:()=>s.slice(0)}})(t,10);return _w[e]=n,n})),Ew=(e,t)=>{Tw(e).add(t)},Aw=(e,t,o)=>({hue:e,saturation:t,value:o}),Mw=e=>{let t=0,o=0,n=0;const s=e.red/255,r=e.green/255,a=e.blue/255,i=Math.min(s,Math.min(r,a)),l=Math.max(s,Math.max(r,a));return i===l?(n=i,Aw(0,0,100*n)):(t=s===i?3:a===i?1:5,t=60*(t-(s===i?r-a:a===i?s-r:a-s)/(l-i)),o=(l-i)/l,n=l,Aw(Math.round(t),Math.round(100*o),Math.round(100*n)))},Dw=e=>ow(dw(e)),Bw=e=>{return(t=e,Qx(t)?A.some({value:ew(t)}):A.none()).orThunk((()=>gw(e).map(ow))).getOrThunk((()=>{const t=document.createElement("canvas");t.height=1,t.width=1;const o=t.getContext("2d");o.clearRect(0,0,t.width,t.height),o.fillStyle="#FFFFFF",o.fillStyle=e,o.fillRect(0,0,1,1);const n=o.getImageData(0,0,1,1).data,s=n[0],r=n[1],a=n[2],i=n[3];return ow(lw(s,r,a,i))}));var t},Iw="forecolor",Fw="hilitecolor",Rw=e=>{const t=[];for(let o=0;o<e.length;o+=2)t.push({text:e[o+1],value:"#"+Bw(e[o]).value,icon:"checkmark",type:"choiceitem"});return t},Nw=e=>t=>t.options.get(e),Vw="#000000",zw=(e,t)=>t===Iw&&e.options.isSet("color_map_foreground")?Nw("color_map_foreground")(e):t===Fw&&e.options.isSet("color_map_background")?Nw("color_map_background")(e):Nw("color_map")(e),Lw=(e,t="default")=>Math.max(5,Math.ceil(Math.sqrt(zw(e,t).length))),Hw=(e,t)=>{const o=Nw("color_cols")(e),n=Lw(e,t);return o===Lw(e)?n:o},Pw=(e,t="default")=>Math.round(t===Iw?Nw("color_cols_foreground")(e):t===Fw?Nw("color_cols_background")(e):Nw("color_cols")(e)),Uw=Nw("custom_colors"),Ww=Nw("color_default_foreground"),jw=Nw("color_default_background"),Gw=(e,t)=>{const o=ze(e.selection.getStart()),n="hilitecolor"===t?Rs(o,(e=>{if($e(e)){const t=Rt(e,"background-color");return Ce(gw(t).exists((e=>0!==e.alpha)),t)}return A.none()})).getOr("rgba(0, 0, 0, 0)"):Rt(o,"color");return gw(n).map((e=>"#"+ow(e).value))},$w=e=>{const t="choiceitem",o={type:t,text:"Remove color",icon:"color-swatch-remove-color",value:"remove"};return e?[o,{type:t,text:"Custom color",icon:"color-picker",value:"custom"}]:[o]},qw=(e,t,o,n)=>{"custom"===o?oS(e)((o=>{o.each((o=>{Ew(t,o),e.execCommand("mceApplyTextcolor",t,o),n(o)}))}),Gw(e,t).getOr(Vw)):"remove"===o?(n(""),e.execCommand("mceRemoveTextcolor",t)):(n(o),e.execCommand("mceApplyTextcolor",t,o))},Yw=(e,t,o)=>e.concat((e=>L(Tw(e).state(),(e=>({type:"choiceitem",text:e,icon:"checkmark",value:e}))))(t).concat($w(o))),Xw=(e,t,o)=>n=>{n(Yw(e,t,o))},Kw=(e,t,o)=>{const n="forecolor"===t?"tox-icon-text-color__color":"tox-icon-highlight-bg-color__color";e.setIconFill(n,o)},Jw=(e,t)=>{e.setTooltip(t)},Zw=(e,t)=>o=>{const n=Gw(e,t);return xe(n,o.toUpperCase())},Qw=(e,t,o)=>{if(Be(o))return"forecolor"===t?"Text color":"Background color";const n="forecolor"===t?"Text color {0}":"Background color {0}",s=Yw(zw(e,t),t,!1),r=G(s,(e=>e.value===o)).getOr({text:""}).text;return e.translate([n,e.translate(r)])},eS=(e,t,o,n)=>{e.ui.registry.addSplitButton(t,{tooltip:Qw(e,o,n.get()),presets:"color",icon:"forecolor"===t?"text-color":"highlight-bg-color",select:Zw(e,o),columns:Pw(e,o),fetch:Xw(zw(e,o),o,Uw(e)),onAction:t=>{qw(e,o,n.get(),b)},onItemAction:(s,r)=>{qw(e,o,r,(o=>{n.set(o),bw(e,{name:t,color:o})}))},onSetup:s=>{Kw(s,t,n.get());const r=n=>{n.name===t&&(Kw(s,n.name,n.color),Jw(s,Qw(e,o,n.color)))};return e.on("TextColorChange",r),yw(xw(e)(s),(()=>{e.off("TextColorChange",r)}))}})},tS=(e,t,o,n,s)=>{e.ui.registry.addNestedMenuItem(t,{text:n,icon:"forecolor"===t?"text-color":"highlight-bg-color",onSetup:n=>(Jw(n,Qw(e,o,s.get())),Kw(n,t,s.get()),xw(e)(n)),getSubmenuItems:()=>[{type:"fancymenuitem",fancytype:"colorswatch",select:Zw(e,o),initData:{storageKey:o},onAction:n=>{qw(e,o,n.value,(o=>{s.set(o),bw(e,{name:t,color:o})}))}}]})},oS=e=>(t,o)=>{let n=!1;const s={colorpicker:o};e.windowManager.open({title:"Color Picker",size:"normal",body:{type:"panel",items:[{type:"colorpicker",name:"colorpicker",label:"Color"}]},buttons:[{type:"cancel",name:"cancel",text:"Cancel"},{type:"submit",name:"save",text:"Save",primary:!0}],initialData:s,onAction:(e,t)=>{"hex-valid"===t.name&&(n=t.value)},onSubmit:o=>{const s=o.getData().colorpicker;n?(t(A.from(s)),o.close()):e.windowManager.alert(e.translate(["Invalid hex color code: {0}",s]))},onClose:b,onCancel:()=>{t(A.none())}})},nS=(e,t,o,n,s,r,a,i)=>{const l=ey(t),c=sS(t,o,n,"color"!==s?"normal":"color",r,a,i);return ny(e,l,c,n,{menuType:s})},sS=(e,t,o,n,s,r,a)=>we(L(e,(i=>{return"choiceitem"===i.type?(l=i,Yn("choicemenuitem",ox,l)).fold(ty,(i=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Gx({presets:o,textContent:t?e.text:A.none(),htmlContent:A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:t?e.shortcut:A.none(),checkMark:t?A.some(Wx(a.icons)):A.none(),caret:A.none(),value:e.value},a,i);return bn(Rx({data:Nx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),onAction:t=>n(e.value),onSetup:e=>(e.setActive(s),b),triggersSubmenu:!1,itemBehaviours:[]},l,r,a),{toggling:{toggleClass:Sv,toggleOnExecute:!1,selected:e.active,exclusive:!0}})})(i,1===o,n,t,r(i.value),s,a,ey(e))))):A.none();var l}))),rS=(e,t)=>{const o=Bv(t);return 1===e?{mode:"menu",moveOnTab:!0}:"auto"===e?{mode:"grid",selector:"."+o.item,initSize:{numColumns:1,numRows:1}}:{mode:"matrix",rowSelector:"."+("color"===t?"tox-swatches__row":"tox-collection__group"),previousSelector:e=>"color"===t?vi(e.element,"[aria-checked=true]"):A.none()}},aS=ca("cell-over"),iS=ca("cell-execute"),lS=(e,t,o)=>{const n=o=>Rr(o,iS,{row:e,col:t}),s=(e,t)=>{t.stop(),n(e)};return ci({dom:{tag:"div",attributes:{role:"button","aria-label":o}},behaviours:Tl([th("insert-table-picker-cell",[Wr(Ys(),ah.focus),Wr(mr(),n),Wr(tr(),s),Wr(pr(),s)]),ph.config({toggleClass:"tox-insert-table-picker__selected",toggleOnExecute:!1}),ah.config({onFocus:o=>Rr(o,aS,{row:e,col:t})})])})},cS=e=>Y(e,(e=>L(e,di))),dS=(e,t)=>ri(`${t}x${e}`),uS={inserttable:(e,t)=>{const o=(e=>(t,o)=>e.shared.providers.translate(["{0} columns, {1} rows",o,t]))(t),n=((e,t,o)=>{const n=[];for(let t=0;t<10;t++){const o=[];for(let n=0;n<10;n++){const s=e(t+1,n+1);o.push(lS(t,n,s))}n.push(o)}return n})(o),s=dS(0,0),r=Xh({dom:{tag:"span",classes:["tox-insert-table-picker__label"]},components:[s],behaviours:Tl([eh.config({})])});return{type:"widget",data:{value:ca("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[Xx.widget({dom:{tag:"div",classes:["tox-insert-table-picker"]},components:cS(n).concat(r.asSpec()),behaviours:Tl([th("insert-table-picker",[Jr((e=>{eh.set(r.get(e),[s])})),qr(aS,((e,t,o)=>{const{row:s,col:a}=o.event;((e,t,o,n,s)=>{for(let n=0;n<10;n++)for(let s=0;s<10;s++)ph.set(e[n][s],n<=t&&s<=o)})(n,s,a),eh.set(r.get(e),[dS(s+1,a+1)])})),qr(iS,((t,o,n)=>{const{row:s,col:r}=n.event;e.onAction({numRows:s+1,numColumns:r+1}),Fr(t,fr())}))]),Gp.config({initSize:{numRows:10,numColumns:10},mode:"flatgrid",selector:'[role="button"]'})])})]}},colorswatch:(e,t)=>{const o=((e,t)=>{const o=e.initData.allowCustomColors&&t.colorinput.hasCustomColors();return e.initData.colors.fold((()=>Yw(t.colorinput.getColors(e.initData.storageKey),e.initData.storageKey,o)),(e=>e.concat($w(o))))})(e,t),n=t.colorinput.getColorCols(e.initData.storageKey),s="color",r={...nS(ca("menu-value"),o,(t=>{e.onAction({value:t})}),n,s,bv.CLOSE_ON_EXECUTE,e.select.getOr(T),t.shared.providers),markers:Bv(s),movement:rS(n,s)};return{type:"widget",data:{value:ca("widget-id")},dom:{tag:"div",classes:["tox-fancymenuitem"]},autofocus:!0,components:[Xx.widget(Rh.sketch(r))]}}},mS=e=>({type:"separator",dom:{tag:"div",classes:[yv,"tox-collection__group-heading"]},components:e.text.map(ri).toArray()});var gS=Object.freeze({__proto__:null,getCoupled:(e,t,o,n)=>o.getOrCreate(e,t,n),getExistingCoupled:(e,t,o,n)=>o.getExisting(e,t,n)}),pS=[ss("others",qn(rn.value,Vn()))],hS=Object.freeze({__proto__:null,init:()=>{const e={},t=(t,o)=>{if(0===ae(t.others).length)throw new Error("Cannot find any known coupled components");return be(e,o)},o=x({});return Ta({readState:o,getExisting:(e,o,n)=>t(o,n).orThunk((()=>(be(o.others,n).getOrDie("No information found for coupled component: "+n),A.none()))),getOrCreate:(o,n,s)=>t(n,s).getOrThunk((()=>{const t=be(n.others,s).getOrDie("No information found for coupled component: "+s)(o),r=o.getSystem().build(t);return e[s]=r,r}))})}});const fS=Al({fields:pS,name:"coupling",apis:gS,state:hS}),bS=e=>{let t=A.none(),o=[];const n=e=>{s()?r(e):o.push(e)},s=()=>t.isSome(),r=e=>{t.each((t=>{setTimeout((()=>{e(t)}),0)}))};return e((e=>{s()||(t=A.some(e),H(o,r),o=[])})),{get:n,map:e=>bS((t=>{n((o=>{t(e(o))}))})),isReady:s}},vS={nu:bS,pure:e=>bS((t=>{t(e)}))},yS=e=>{setTimeout((()=>{throw e}),0)},xS=e=>{const t=t=>{e().then(t,yS)};return{map:t=>xS((()=>e().then(t))),bind:t=>xS((()=>e().then((e=>t(e).toPromise())))),anonBind:t=>xS((()=>e().then((()=>t.toPromise())))),toLazy:()=>vS.nu(t),toCached:()=>{let t=null;return xS((()=>(null===t&&(t=e()),t)))},toPromise:e,get:t}},wS=e=>xS((()=>new Promise(e))),SS=e=>xS((()=>Promise.resolve(e))),kS=x("sink"),CS=x(Yu({name:kS(),overrides:x({dom:{tag:"div"},behaviours:Tl([_d.config({useFixed:E})]),events:Hr([Yr(Js()),Yr(js()),Yr(tr())])})})),OS=(e,t)=>{const o=e.getHotspot(t).getOr(t),n="hotspot",s=e.getAnchorOverrides();return e.layouts.fold((()=>({type:n,hotspot:o,overrides:s})),(e=>({type:n,hotspot:o,overrides:s,layouts:e})))},_S=(e,t,o,n,s,r,a)=>{const i=((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>(0,e.fetch)(o).map(t))(e,t,n),l=AS(n,e);return i.map((e=>e.bind((e=>A.from(jh.sketch({...r.menu(),uid:fa(""),data:e,highlightOnOpen:a,onOpenMenu:(e,t)=>{const n=l().getOrDie();_d.position(n,t,{anchor:o}),Zd.decloak(s)},onOpenSubmenu:(e,t,o)=>{const n=l().getOrDie();_d.position(n,o,{anchor:{type:"submenu",item:t}}),Zd.decloak(s)},onRepositionMenu:(e,t,n)=>{const s=l().getOrDie();_d.position(s,t,{anchor:o}),H(n,(e=>{_d.position(s,e.triggeredMenu,{anchor:{type:"submenu",item:e.triggeringItem}})}))},onEscape:()=>(ah.focus(n),Zd.close(s),A.some(!0))}))))))})(e,t,OS(e,o),o,n,s,a);return i.map((e=>(e.fold((()=>{Zd.isOpen(n)&&Zd.close(n)}),(e=>{Zd.cloak(n),Zd.open(n,e),r(n)})),n)))},TS=(e,t,o,n,s,r,a)=>(Zd.close(n),SS(n)),ES=(e,t,o,n,s,r)=>{const a=fS.getCoupled(o,"sandbox");return(Zd.isOpen(a)?TS:_S)(e,t,o,a,n,s,r)},AS=(e,t)=>e.getSystem().getByUid(t.uid+"-"+kS()).map((e=>()=>rn.value(e))).getOrThunk((()=>t.lazySink.fold((()=>()=>rn.error(new Error("No internal sink is specified, nor could an external sink be found"))),(t=>()=>t(e))))),MS=e=>{Zd.getState(e).each((e=>{jh.repositionMenus(e)}))},DS=(e,t,o)=>{const n=wi(),s=AS(t,e);return{dom:{tag:"div",classes:e.sandboxClasses,attributes:{id:n.id,role:"listbox"}},behaviours:ku(e.sandboxBehaviours,[vu.config({store:{mode:"memory",initialValue:t}}),Zd.config({onOpen:(s,r)=>{const a=OS(e,t);n.link(t.element),e.matchWidth&&((e,t,o)=>{const n=Om.getCurrent(t).getOr(t),s=Zt(e.element);o?Bt(n.element,"min-width",s+"px"):((e,t)=>{Jt.set(e,t)})(n.element,s)})(a.hotspot,r,e.useMinWidth),e.onOpen(a,s,r),void 0!==o&&void 0!==o.onOpen&&o.onOpen(s,r)},onClose:(e,s)=>{n.unlink(t.element),void 0!==o&&void 0!==o.onClose&&o.onClose(e,s)},isPartOf:(e,o,n)=>Si(o,n)||Si(t,n),getAttachPoint:()=>s().getOrDie()}),Om.config({find:e=>Zd.getState(e).bind((e=>Om.getCurrent(e)))}),Il.config({channels:{...nu({isExtraPart:T}),...ru({doReposition:MS})}})])}},BS=e=>{const t=fS.getCoupled(e,"sandbox");MS(t)},IS=()=>[xs("sandboxClasses",[]),Su("sandboxBehaviours",[Om,Il,Zd,vu])],FS=x([ns("dom"),ns("fetch"),Ri("onOpen"),Ni("onExecute"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),Oc(),yu("dropdownBehaviours",[ph,fS,Gp,ah]),ns("toggleClass"),xs("eventOrder",{}),ms("lazySink"),xs("matchWidth",!1),xs("useMinWidth",!1),ms("role")].concat(IS())),RS=x([qu({schema:[Bi(),xs("fakeFocus",!1)],name:"menu",defaults:e=>({onExecute:e.onExecute})}),CS()]),NS=wm({name:"Dropdown",configFields:FS(),partFields:RS(),factory:(e,t,o,n)=>{const s=e=>{Zd.getState(e).each((e=>{jh.highlightPrimary(e)}))},r=(t,o,s)=>ES(e,w,t,n,o,s),a={expand:e=>{ph.isOn(e)||r(e,b,Uh.HighlightNone).get(b)},open:e=>{ph.isOn(e)||r(e,b,Uh.HighlightMenuAndItem).get(b)},refetch:t=>fS.getExistingCoupled(t,"sandbox").fold((()=>r(t,b,Uh.HighlightMenuAndItem).map(b)),(o=>_S(e,w,t,o,n,b,Uh.HighlightMenuAndItem).map(b))),isOpen:ph.isOn,close:e=>{ph.isOn(e)&&r(e,b,Uh.HighlightMenuAndItem).get(b)},repositionMenus:e=>{ph.isOn(e)&&BS(e)}},i=(e,t)=>(Nr(e),A.some(!0));return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.dropdownBehaviours,[ph.config({toggleClass:e.toggleClass,aria:{mode:"expanded"}}),fS.config({others:{sandbox:t=>DS(e,t,{onOpen:()=>ph.on(t),onClose:()=>ph.off(t)})}}),Gp.config({mode:"special",onSpace:i,onEnter:i,onDown:(e,t)=>{if(NS.isOpen(e)){const t=fS.getCoupled(e,"sandbox");s(t)}else NS.open(e);return A.some(!0)},onEscape:(e,t)=>NS.isOpen(e)?(NS.close(e),A.some(!0)):A.none()}),ah.config({})]),events:fh(A.some((e=>{r(e,s,Uh.HighlightMenuAndItem).get(b)}))),eventOrder:{...e.eventOrder,[mr()]:["disabling","toggling","alloy.base.behaviour"]},apis:a,domModification:{attributes:{"aria-haspopup":"true",...e.role.fold((()=>({})),(e=>({role:e}))),..."button"===e.dom.tag?{type:("type",be(e.dom,"attributes").bind((e=>be(e,"type")))).getOr("button")}:{}}}}},apis:{open:(e,t)=>e.open(t),refetch:(e,t)=>e.refetch(t),expand:(e,t)=>e.expand(t),close:(e,t)=>e.close(t),isOpen:(e,t)=>e.isOpen(t),repositionMenus:(e,t)=>e.repositionMenus(t)}}),VS=(e,t,o)=>{Gv(e).each((e=>{var n;((e,t)=>{Tt(t.element,"id").each((t=>Ct(e.element,"aria-activedescendant",t)))})(e,o),($a((n=t).element,Yv)?A.some(n.element):vi(n.element,"."+Yv)).each((t=>{Tt(t,"id").each((t=>Ct(e.element,"aria-controls",t)))}))})),Ct(o.element,"aria-selected","true")},zS=(e,t,o)=>{Ct(o.element,"aria-selected","false")},LS=e=>fS.getExistingCoupled(e,"sandbox").bind(jv).map($v).map((e=>e.fetchPattern)).getOr("");var HS;!function(e){e[e.ContentFocus=0]="ContentFocus",e[e.UiFocus=1]="UiFocus"}(HS||(HS={}));const PS=(e,t,o,n,s)=>{const r=o.shared.providers,a=e=>s?{...e,shortcut:A.none(),icon:e.text.isSome()?A.none():e.icon}:e;switch(e.type){case"menuitem":return(i=e,Yn("menuitem",ix,i)).fold(ty,(e=>A.some(((e,t,o,n=!0)=>{const s=Gx({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.none(),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Rx({data:Nx(e),getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),enabled:e.enabled,onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o)})(a(e),t,r,n))));case"nestedmenuitem":return(e=>Yn("nestedmenuitem",lx,e))(e).fold(ty,(e=>A.some(((e,t,o,n=!0,s=!1)=>{const r=s?(a=o.icons,zx("chevron-down",a,[Ov])):(e=>zx("chevron-right",e,[Ov]))(o.icons);var a;const i=Gx({presets:"normal",iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,caret:A.some(r),checkMark:A.none(),shortcutContent:e.shortcut},o,n);return Rx({data:Nx(e),getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setIconFill:(t,o)=>{vi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{Ct(e,"fill",o)}))},setTooltip:t=>{const n=o.translate(t);Ot(e.element,{"aria-label":n,title:n})}}),enabled:e.enabled,onAction:b,onSetup:e.onSetup,triggersSubmenu:!0,itemBehaviours:[]},i,t,o)})(a(e),t,r,n,s))));case"togglemenuitem":return(e=>Yn("togglemenuitem",cx,e))(e).fold(ty,(e=>A.some(((e,t,o,n=!0)=>{const s=Gx({iconContent:e.icon,textContent:e.text,htmlContent:A.none(),ariaLabel:e.text,checkMark:A.some(Wx(o.icons)),caret:A.none(),shortcutContent:e.shortcut,presets:"normal",meta:e.meta},o,n);return bn(Rx({data:Nx(e),enabled:e.enabled,getApi:e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t)}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:[]},s,t,o),{toggling:{toggleClass:Sv,toggleOnExecute:!1,selected:e.active}})})(a(e),t,r,n))));case"separator":return(e=>Yn("separatormenuitem",By,e))(e).fold(ty,(e=>A.some(mS(e))));case"fancymenuitem":return(e=>Yn("fancymenuitem",ax,e))(e).fold(ty,(e=>((e,t)=>be(uS,e.fancytype).map((o=>o(e,t))))(e,o)));default:return console.error("Unknown item in general menu",e),A.none()}var i},US=(e,t,o,n,s,r,a)=>{const i=1===n,l=!i||ey(e);return we(L(e,(e=>{switch(e.type){case"separator":return(n=e,Yn("Autocompleter.Separator",By,n)).fold(ty,(e=>A.some(mS(e))));case"cardmenuitem":return(e=>Yn("cardmenuitem",tx,e))(e).fold(ty,(e=>A.some(((e,t,o,n)=>{const s={dom:jx(e.label),optComponents:[A.some({dom:{tag:"div",classes:[Tv,Ev]},components:Yx(e.items,n)})]};return Rx({data:Nx({text:A.none(),...e}),enabled:e.enabled,getApi:e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>{Lm.set(e,!t),H(Zc(e.element,"*"),(o=>{e.getSystem().getByDom(o).each((e=>{e.hasConfigured(Lm)&&Lm.set(e,!t)}))}))}}),onAction:e.onAction,onSetup:e.onSetup,triggersSubmenu:!1,itemBehaviours:A.from(n.itemBehaviours).getOr([])},s,t,o.providers)})({...e,onAction:t=>{e.onAction(t),o(e.value,e.meta)}},s,r,{itemBehaviours:$x(e.meta,r),cardText:{matchText:t,highlightOn:a}}))));default:return(e=>Yn("Autocompleter.Item",Iy,e))(e).fold(ty,(e=>A.some(((e,t,o,n,s,r,a,i=!0)=>{const l=Gx({presets:n,textContent:A.none(),htmlContent:o?e.text.map((e=>qx(e,t))):A.none(),ariaLabel:e.text,iconContent:e.icon,shortcutContent:A.none(),checkMark:A.none(),caret:A.none(),value:e.value},a.providers,i,e.icon);return Rx({data:Nx(e),enabled:e.enabled,getApi:x({}),onAction:t=>s(e.value,e.meta),onSetup:x(b),triggersSubmenu:!1,itemBehaviours:$x(e.meta,a)},l,r,a.providers)})(e,t,i,"normal",o,s,r,l))))}var n})))},WS=(e,t,o,n,s,r)=>{const a=ey(t),i=we(L(t,(e=>{const t=e=>PS(e,o,n,(e=>s?!ve(e,"text"):a)(e),s);return"nestedmenuitem"===e.type&&e.getSubmenuItems().length<=0?t({...e,enabled:!1}):t(e)}))),l=(e=>"no-search"===e.searchMode?{menuType:"normal"}:{menuType:"searchable",searchMode:e})(r);return(s?oy:ny)(e,a,i,1,l)},jS=e=>jh.singleData(e.value,e),GS=(e,t)=>{const o=ca("autocompleter"),n=As(!1),s=As(!1),r=ci(Gh.sketch({dom:{tag:"div",classes:["tox-autocompleter"],attributes:{id:o}},components:[],fireDismissalEventInstead:{},inlineBehaviours:Tl([th("dismissAutocompleter",[Wr(Or(),(()=>d())),Wr(Br(),((t,o)=>{Tt(o.event.target,"id").each((t=>Ct(ze(e.getBody()),"aria-activedescendant",t)))}))])]),lazySink:t.getSink})),a=()=>Gh.isOpen(r),i=s.get,l=()=>{if(a()){Gh.hide(r),e.dom.remove(o,!1);const t=ze(e.getBody());Tt(t,"aria-owns").filter((e=>e===o)).each((()=>{At(t,"aria-owns"),At(t,"aria-activedescendant")}))}},c=()=>Gh.getContent(r).bind((e=>te(e.components(),0))),d=()=>e.execCommand("mceAutocompleterClose"),u=s=>{const a=(o=>{const s=re(o,(e=>A.from(e.columns))).getOr(1);return Y(o,(o=>{const r=o.items;return US(r,o.matchText,((t,s)=>{const r=e.selection.getRng();((e,t)=>hv(ze(t.startContainer)).map((t=>{const o=e.createRng();return o.selectNode(t.dom),o})))(e.dom,r).each((r=>{const a={hide:()=>d(),reload:t=>{l(),e.execCommand("mceAutocompleterReload",!1,{fetchOptions:t})}};n.set(!0),o.onAction(a,r,t,s),n.set(!1)}))}),s,bv.BUBBLE_TO_SANDBOX,t,o.highlightOn)}))})(s);a.length>0?(((t,o)=>{var n;(n=ze(e.getBody()),vi(n,pv)).each((n=>{const s=re(t,(e=>A.from(e.columns))).getOr(1);Gh.showMenuAt(r,{anchor:{type:"node",root:ze(e.getBody()),node:A.from(n)}},((e,t,o,n)=>{const s=rS(t,n),r=Bv(n);return{data:jS({...e,movement:s,menuBehaviours:ux("auto"!==t?[]:[Jr(((e,t)=>{dx(e,4,r.item).each((({numColumns:t,numRows:o})=>{Gp.setGridSize(e,o,t)}))}))])}),menu:{markers:Bv(n),fakeFocus:o===HS.ContentFocus}}})(ny("autocompleter-value",!0,o,s,{menuType:"normal"}),s,HS.ContentFocus,"normal"))})),c().each(Xm.highlightFirst)})(s,a),Ct(ze(e.getBody()),"aria-owns",o),e.inline||m()):l()},m=()=>{e.dom.get(o)&&e.dom.remove(o,!1);const t=e.getDoc().documentElement,n=e.selection.getNode(),s=(e=>na(e,!0))(r.element);It(s,{border:"0",clip:"rect(0 0 0 0)",height:"1px",margin:"-1px",overflow:"hidden",padding:"0",position:"absolute",width:"1px",top:`${n.offsetTop}px`,left:`${n.offsetLeft}px`}),e.dom.add(t,s.dom),vi(s,'[role="menu"]').each((e=>{Ht(e,"position"),Ht(e,"max-height")}))};e.on("AutocompleterStart",(({lookupData:e})=>{s.set(!0),n.set(!1),u(e)})),e.on("AutocompleterUpdate",(({lookupData:e})=>u(e))),e.on("AutocompleterEnd",(()=>{l(),s.set(!1),n.set(!1)}));((e,t)=>{const o=(e,t)=>{Rr(e,Js(),{raw:t})},n=()=>e.getMenu().bind(Xm.getHighlighted);t.on("keydown",(t=>{const s=t.which;e.isActive()&&(e.isMenuOpen()?13===s?(n().each(Nr),t.preventDefault()):40===s?(n().fold((()=>{e.getMenu().each(Xm.highlightFirst)}),(e=>{o(e,t)})),t.preventDefault(),t.stopImmediatePropagation()):37!==s&&38!==s&&39!==s||n().each((e=>{o(e,t),t.preventDefault(),t.stopImmediatePropagation()})):13!==s&&38!==s&&40!==s||e.cancelIfNecessary())})),t.on("NodeChange",(t=>{e.isActive()&&!e.isProcessingAction()&&hv(ze(t.element)).isNone()&&e.cancelIfNecessary()}))})({cancelIfNecessary:d,isMenuOpen:a,isActive:i,isProcessingAction:n.get,getMenu:c},e)},$S=["visible","hidden","clip"],qS=e=>Me(e).length>0&&!R($S,e),YS=e=>{if(Ge(e)){const t=Rt(e,"overflow-x"),o=Rt(e,"overflow-y");return qS(t)||qS(o)}return!1},XS=(e,t)=>uv(e)?(e=>{const t=Jc(e,YS),o=0===t.length?vt(e).map(yt).map((e=>Jc(e,YS))).getOr([]):t;return oe(o).map((e=>({element:e,others:o.slice(1)})))})(t):A.none(),KS=e=>{const t=[...L(e.others,Zo),tn()];return((e,t)=>j(t,((e,t)=>en(e,t)),e))(Zo(e.element),t)},JS=(e,t,o)=>yi(e,t,o).isSome(),ZS=(e,t)=>{let o=null;return{cancel:()=>{null!==o&&(clearTimeout(o),o=null)},schedule:(...n)=>{o=setTimeout((()=>{e.apply(null,n),o=null}),t)}}},QS=e=>{const t=e.raw;return void 0===t.touches||1!==t.touches.length?A.none():A.some(t.touches[0])},ek=(e,t)=>{const o={stopBackspace:!0,...t},n=(e=>{const t=nc(),o=As(!1),n=ZS((t=>{e.triggerEvent(hr(),t),o.set(!0)}),400),s=Bs([{key:Hs(),value:e=>(QS(e).each((s=>{n.cancel();const r={x:s.clientX,y:s.clientY,target:e.target};n.schedule(e),o.set(!1),t.set(r)})),A.none())},{key:Ps(),value:e=>(n.cancel(),QS(e).each((e=>{t.on((o=>{((e,t)=>{const o=Math.abs(e.clientX-t.x),n=Math.abs(e.clientY-t.y);return o>5||n>5})(e,o)&&t.clear()}))})),A.none())},{key:Us(),value:s=>(n.cancel(),t.get().filter((e=>Qe(e.target,s.target))).map((t=>o.get()?(s.prevent(),!1):e.triggerEvent(pr(),s))))}]);return{fireIfReady:(e,t)=>be(s,t).bind((t=>t(e)))}})(o),s=L(["touchstart","touchmove","touchend","touchcancel","gesturestart","mousedown","mouseup","mouseover","mousemove","mouseout","click"].concat(["selectstart","input","contextmenu","change","transitionend","transitioncancel","drag","dragstart","dragend","dragenter","dragleave","dragover","drop","keyup"]),(t=>rc(e,t,(e=>{n.fireIfReady(e,t).each((t=>{t&&e.kill()})),o.triggerEvent(t,e)&&e.kill()})))),r=nc(),a=rc(e,"paste",(e=>{n.fireIfReady(e,"paste").each((t=>{t&&e.kill()})),o.triggerEvent("paste",e)&&e.kill(),r.set(setTimeout((()=>{o.triggerEvent(dr(),e)}),0))})),i=rc(e,"keydown",(e=>{o.triggerEvent("keydown",e)?e.kill():o.stopBackspace&&(e=>e.raw.which===Km[0]&&!R(["input","textarea"],We(e.target))&&!JS(e.target,'[contenteditable="true"]'))(e)&&e.prevent()})),l=rc(e,"focusin",(e=>{o.triggerEvent("focusin",e)&&e.kill()})),c=nc(),d=rc(e,"focusout",(e=>{o.triggerEvent("focusout",e)&&e.kill(),c.set(setTimeout((()=>{o.triggerEvent(cr(),e)}),0))}));return{unbind:()=>{H(s,(e=>{e.unbind()})),i.unbind(),l.unbind(),d.unbind(),a.unbind(),r.on(clearTimeout),c.on(clearTimeout)}}},tk=(e,t)=>{const o=be(e,"target").getOr(t);return As(o)},ok=Ms([{stopped:[]},{resume:["element"]},{complete:[]}]),nk=(e,t,o,n,s,r)=>{const a=e(t,n),i=((e,t)=>{const o=As(!1),n=As(!1);return{stop:()=>{o.set(!0)},cut:()=>{n.set(!0)},isStopped:o.get,isCut:n.get,event:e,setSource:t.set,getSource:t.get}})(o,s);return a.fold((()=>(r.logEventNoHandlers(t,n),ok.complete())),(e=>{const o=e.descHandler;return Ma(o)(i),i.isStopped()?(r.logEventStopped(t,e.element,o.purpose),ok.stopped()):i.isCut()?(r.logEventCut(t,e.element,o.purpose),ok.complete()):rt(e.element).fold((()=>(r.logNoParent(t,e.element,o.purpose),ok.complete())),(n=>(r.logEventResponse(t,e.element,o.purpose),ok.resume(n))))}))},sk=(e,t,o,n,s,r)=>nk(e,t,o,n,s,r).fold(E,(n=>sk(e,t,o,n,s,r)),T),rk=(e,t,o,n,s)=>{const r=tk(o,n);return sk(e,t,o,n,r,s)},ak=()=>{const e=(()=>{const e={};return{registerId:(t,o,n)=>{le(n,((n,s)=>{const r=void 0!==e[s]?e[s]:{};r[o]=((e,t)=>({cHandler:k.apply(void 0,[e.handler].concat(t)),purpose:e.purpose}))(n,t),e[s]=r}))},unregisterId:t=>{le(e,((e,o)=>{ve(e,t)&&delete e[t]}))},filterByType:t=>be(e,t).map((e=>pe(e,((e,t)=>((e,t)=>({id:e,descHandler:t}))(t,e))))).getOr([]),find:(t,o,n)=>be(e,o).bind((e=>Rs(n,(t=>((e,t)=>ha(t).bind((t=>be(e,t))).map((e=>((e,t)=>({element:e,descHandler:t}))(t,e))))(e,t)),t)))}})(),t={},o=o=>{ha(o.element).each((o=>{delete t[o],e.unregisterId(o)}))};return{find:(t,o,n)=>e.find(t,o,n),filter:t=>e.filterByType(t),register:n=>{const s=(e=>{const t=e.element;return ha(t).getOrThunk((()=>((e,t)=>{const o=ca(ma+"uid-");return pa(t,o),o})(0,e.element)))})(n);ye(t,s)&&((e,n)=>{const s=t[n];if(s!==e)throw new Error('The tagId "'+n+'" is already used by: '+sa(s.element)+"\nCannot use it for: "+sa(e.element)+"\nThe conflicting element is"+(xt(s.element)?" ":" not ")+"already in the DOM");o(e)})(n,s);const r=[n];e.registerId(r,s,n.events),t[s]=n},unregister:o,getById:e=>be(t,e)}},ik=xm({name:"Container",factory:e=>{const{attributes:t,...o}=e.dom;return{uid:e.uid,dom:{tag:"div",attributes:{role:"presentation",...t},...o},components:e.components,behaviours:xu(e.containerBehaviours),events:e.events,domModification:e.domModification,eventOrder:e.eventOrder}},configFields:[xs("components",[]),yu("containerBehaviours",[]),xs("events",{}),xs("domModification",{}),xs("eventOrder",{})]}),lk=e=>{const t=t=>rt(e.element).fold(E,(e=>Qe(t,e))),o=ak(),n=(e,n)=>o.find(t,e,n),s=ek(e.element,{triggerEvent:(e,t)=>_i(e,t.target,(o=>((e,t,o,n)=>rk(e,t,o,o.target,n))(n,e,t,o)))}),r={debugInfo:x("real"),triggerEvent:(e,t,o)=>{_i(e,t,(s=>rk(n,e,o,t,s)))},triggerFocus:(e,t)=>{ha(e).fold((()=>{Rl(e)}),(o=>{_i(lr(),e,(o=>(((e,t,o,n,s)=>{const r=tk(o,n);nk(e,t,o,n,r,s)})(n,lr(),{originator:t,kill:b,prevent:b,target:e},e,o),!1)))}))},triggerEscape:(e,t)=>{r.triggerEvent("keydown",e.element,t.event)},getByUid:e=>p(e),getByDom:e=>h(e),build:ci,buildOrPatch:li,addToGui:e=>{l(e)},removeFromGui:e=>{c(e)},addToWorld:e=>{a(e)},removeFromWorld:e=>{i(e)},broadcast:e=>{u(e)},broadcastOn:(e,t)=>{m(e,t)},broadcastEvent:(e,t)=>{g(e,t)},isConnected:E},a=e=>{e.connect(r),qe(e.element)||(o.register(e),H(e.components(),a),r.triggerEvent(vr(),e.element,{target:e.element}))},i=e=>{qe(e.element)||(H(e.components(),i),o.unregister(e)),e.disconnect()},l=t=>{Id(e,t)},c=e=>{Nd(e)},d=e=>{const t=o.filter(ur());H(t,(t=>{const o=t.descHandler;Ma(o)(e)}))},u=e=>{d({universal:!0,data:e})},m=(e,t)=>{d({universal:!1,channels:e,data:t})},g=(e,t)=>((e,t,o)=>{const n=(e=>{const t=As(!1);return{stop:()=>{t.set(!0)},cut:b,isStopped:t.get,isCut:T,event:e,setSource:O("Cannot set source of a broadcasted event"),getSource:O("Cannot get source of a broadcasted event")}})(t);return H(e,(e=>{const t=e.descHandler;Ma(t)(n)})),n.isStopped()})(o.filter(e),t),p=e=>o.getById(e).fold((()=>rn.error(new Error('Could not find component with uid: "'+e+'" in system.'))),rn.value),h=e=>{const t=ha(e).getOr("not found");return p(t)};return a(e),{root:e,element:e.element,destroy:()=>{s.unbind(),Uo(e.element)},add:l,remove:c,getByUid:p,getByDom:h,addToWorld:a,removeFromWorld:i,broadcast:u,broadcastOn:m,broadcastEvent:g}},ck=x([xs("prefix","form-field"),yu("fieldBehaviours",[Om,vu])]),dk=x([Yu({schema:[ns("dom")],name:"label"}),Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[ns("text")],name:"aria-descriptor"}),$u({factory:{sketch:e=>{const t=((e,t)=>{const o={};return le(e,((e,n)=>{R(t,n)||(o[n]=e)})),o})(e,["factory"]);return e.factory.sketch(t)}},schema:[ns("factory")],name:"field"})]),uk=wm({name:"FormField",configFields:ck(),partFields:dk(),factory:(e,t,o,n)=>{const s=wu(e.fieldBehaviours,[Om.config({find:t=>am(t,e,"field")}),vu.config({store:{mode:"manual",getValue:e=>Om.getCurrent(e).bind(vu.getValue),setValue:(e,t)=>{Om.getCurrent(e).each((e=>{vu.setValue(e,t)}))}}})]),r=Hr([Jr(((t,o)=>{const n=lm(t,e,["label","field","aria-descriptor"]);n.field().each((t=>{const o=ca(e.prefix);n.label().each((e=>{Ct(e.element,"for",o),Ct(t.element,"id",o)})),n["aria-descriptor"]().each((o=>{const n=ca(e.prefix);Ct(o.element,"id",n),Ct(t.element,"aria-describedby",n)}))}))}))]),a={getField:t=>am(t,e,"field"),getLabel:t=>am(t,e,"label")};return{uid:e.uid,dom:e.dom,components:t,behaviours:s,events:r,apis:a}},apis:{getField:(e,t)=>e.getField(t),getLabel:(e,t)=>e.getLabel(t)}});var mk=Object.freeze({__proto__:null,exhibit:(e,t)=>Aa({attributes:Bs([{key:t.tabAttr,value:"true"}])})}),gk=[xs("tabAttr","data-alloy-tabstop")];const pk=Al({fields:gk,name:"tabstopping",active:mk});var hk=tinymce.util.Tools.resolve("tinymce.html.Entities");const fk=(e,t,o,n)=>{const s=bk(e,t,o,n);return uk.sketch(s)},bk=(e,t,o,n)=>({dom:vk(o),components:e.toArray().concat([t]),fieldBehaviours:Tl(n)}),vk=e=>({tag:"div",classes:["tox-form__group"].concat(e)}),yk=(e,t)=>uk.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e))]}),xk=ca("form-component-change"),wk=ca("form-close"),Sk=ca("form-cancel"),kk=ca("form-action"),Ck=ca("form-submit"),Ok=ca("form-block"),_k=ca("form-unblock"),Tk=ca("form-tabchange"),Ek=ca("form-resize"),Ak=(e,t,o)=>{const n=e.label.map((e=>yk(e,t))),s=t.icons(),r=e=>(t,o)=>{yi(o.event.target,"[data-collection-item-value]").each((n=>{e(t,o,n,_t(n,"data-collection-item-value"))}))},a=r(((o,n,s,r)=>{n.stop(),t.isDisabled()||Rr(o,kk,{name:e.name,value:r})})),i=[Wr(Ys(),r(((e,t,o)=>{Rl(o)}))),Wr(tr(),a),Wr(pr(),a),Wr(Xs(),r(((e,t,o)=>{vi(e.element,"."+_v).each((e=>{Ga(e,_v)})),Wa(o,_v)}))),Wr(Ks(),r((e=>{vi(e.element,"."+_v).each((e=>{Ga(e,_v)}))}))),ea(r(((t,o,n,s)=>{Rr(t,kk,{name:e.name,value:s})})))],l=(e,t)=>L(Zc(e.element,".tox-collection__item"),t),c=uk.parts.field({dom:{tag:"div",classes:["tox-collection"].concat(1!==e.columns?["tox-collection--grid"]:["tox-collection--list"])},components:[],factory:{sketch:w},behaviours:Tl([Lm.config({disabled:t.isDisabled,onDisabled:e=>{l(e,(e=>{Wa(e,"tox-collection__item--state-disabled"),Ct(e,"aria-disabled",!0)}))},onEnabled:e=>{l(e,(e=>{Ga(e,"tox-collection__item--state-disabled"),At(e,"aria-disabled")}))}}),Ox(),eh.config({}),vu.config({store:{mode:"memory",initialValue:o.getOr([])},onSetValue:(o,n)=>{((o,n)=>{const r=L(n,(o=>{const n=qf.translate(o.text),r=1===e.columns?`<div class="tox-collection__item-label">${n}</div>`:"",a=`<div class="tox-collection__item-icon">${(e=>{var t;return null!==(t=s[e])&&void 0!==t?t:e})(o.icon)}</div>`,i={_:" "," - ":" ","-":" "},l=n.replace(/\_| \- |\-/g,(e=>i[e]));return`<div class="tox-collection__item${t.isDisabled()?" tox-collection__item--state-disabled":""}" tabindex="-1" data-collection-item-value="${hk.encodeAllRaw(o.value)}" title="${l}" aria-label="${l}">${a}${r}</div>`})),a="auto"!==e.columns&&e.columns>1?z(r,e.columns):[r],i=L(a,(e=>`<div class="tox-collection__group">${e.join("")}</div>`));oa(o.element,i.join(""))})(o,n),"auto"===e.columns&&dx(o,5,"tox-collection__item").each((({numRows:e,numColumns:t})=>{Gp.setGridSize(o,e,t)})),Fr(o,Ek)}}),pk.config({}),Gp.config((d=e.columns,"normal",1===d?{mode:"menu",moveOnTab:!1,selector:".tox-collection__item"}:"auto"===d?{mode:"flatgrid",selector:".tox-collection__item",initSize:{numColumns:1,numRows:1}}:{mode:"matrix",selectors:{row:".tox-collection__group",cell:`.${yv}`}})),th("collection-events",i)]),eventOrder:{[mr()]:["disabling","alloy.base.behaviour","collection-events"]}});var d;return fk(n,c,["tox-form__group--collection"],[])},Mk=["input","textarea"],Dk=e=>{const t=We(e);return R(Mk,t)},Bk=(e,t)=>{const o=t.getRoot(e).getOr(e.element);Ga(o,t.invalidClass),t.notify.each((t=>{Dk(e.element)&&Ct(e.element,"aria-invalid",!1),t.getContainer(e).each((e=>{oa(e,t.validHtml)})),t.onValid(e)}))},Ik=(e,t,o,n)=>{const s=t.getRoot(e).getOr(e.element);Wa(s,t.invalidClass),t.notify.each((t=>{Dk(e.element)&&Ct(e.element,"aria-invalid",!0),t.getContainer(e).each((e=>{oa(e,n)})),t.onInvalid(e,n)}))},Fk=(e,t,o)=>t.validator.fold((()=>SS(rn.value(!0))),(t=>t.validate(e))),Rk=(e,t,o)=>(t.notify.each((t=>{t.onValidate(e)})),Fk(e,t).map((o=>e.getSystem().isConnected()?o.fold((o=>(Ik(e,t,0,o),rn.error(o))),(o=>(Bk(e,t),rn.value(o)))):rn.error("No longer in system"))));var Nk=Object.freeze({__proto__:null,markValid:Bk,markInvalid:Ik,query:Fk,run:Rk,isInvalid:(e,t)=>{const o=t.getRoot(e).getOr(e.element);return $a(o,t.invalidClass)}}),Vk=Object.freeze({__proto__:null,events:(e,t)=>e.validator.map((t=>Hr([Wr(t.onEvent,(t=>{Rk(t,e).get(w)}))].concat(t.validateOnLoad?[Jr((t=>{Rk(t,e).get(b)}))]:[])))).getOr({})}),zk=[ns("invalidClass"),xs("getRoot",A.none),ys("notify",[xs("aria","alert"),xs("getContainer",A.none),xs("validHtml",""),Ri("onValid"),Ri("onInvalid"),Ri("onValidate")]),ys("validator",[ns("validate"),xs("onEvent","input"),xs("validateOnLoad",!0)])];const Lk=Al({fields:zk,name:"invalidating",active:Vk,apis:Nk,extra:{validation:e=>t=>{const o=vu.getValue(t);return SS(e(o))}}}),Hk=Al({fields:[],name:"unselecting",active:Object.freeze({__proto__:null,events:()=>Hr([Pr(rr(),E)]),exhibit:()=>Aa({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})})}),Pk=ca("color-input-change"),Uk=ca("color-swatch-change"),Wk=ca("color-picker-cancel"),jk=Yu({schema:[ns("dom")],name:"label"}),Gk=e=>Yu({name:e+"-edge",overrides:t=>t.model.manager.edgeActions[e].fold((()=>({})),(e=>({events:Hr([jr(Hs(),((t,o,n)=>e(t,n)),[t]),jr(js(),((t,o,n)=>e(t,n)),[t]),jr(Gs(),((t,o,n)=>{n.mouseIsDown.get()&&e(t,n)}),[t])])})))}),$k=Gk("top-left"),qk=Gk("top"),Yk=Gk("top-right"),Xk=Gk("right"),Kk=Gk("bottom-right"),Jk=Gk("bottom"),Zk=Gk("bottom-left"),Qk=Gk("left"),eC=$u({name:"thumb",defaults:x({dom:{styles:{position:"absolute"}}}),overrides:e=>({events:Hr([$r(Hs(),e,"spectrum"),$r(Ps(),e,"spectrum"),$r(Us(),e,"spectrum"),$r(js(),e,"spectrum"),$r(Gs(),e,"spectrum"),$r(qs(),e,"spectrum")])})}),tC=e=>ug(e.event);var oC=[jk,Qk,Xk,qk,Jk,$k,Yk,Zk,Kk,eC,$u({schema:[ts("mouseIsDown",(()=>As(!1)))],name:"spectrum",overrides:e=>{const t=e.model.manager,o=(o,n)=>t.getValueFromEvent(n).map((n=>t.setValueFrom(o,e,n)));return{behaviours:Tl([Gp.config({mode:"special",onLeft:(o,n)=>t.onLeft(o,e,tC(n)),onRight:(o,n)=>t.onRight(o,e,tC(n)),onUp:(o,n)=>t.onUp(o,e,tC(n)),onDown:(o,n)=>t.onDown(o,e,tC(n))}),pk.config({}),ah.config({})]),events:Hr([Wr(Hs(),o),Wr(Ps(),o),Wr(js(),o),Wr(Gs(),((t,n)=>{e.mouseIsDown.get()&&o(t,n)}))])}}})];const nC=x("slider.change.value"),sC=e=>{const t=e.event.raw;if((e=>-1!==e.type.indexOf("touch"))(t)){const e=t;return void 0!==e.touches&&1===e.touches.length?A.some(e.touches[0]).map((e=>qt(e.clientX,e.clientY))):A.none()}{const e=t;return void 0!==e.clientX?A.some(e).map((e=>qt(e.clientX,e.clientY))):A.none()}},rC=e=>e.model.minX,aC=e=>e.model.minY,iC=e=>e.model.minX-1,lC=e=>e.model.minY-1,cC=e=>e.model.maxX,dC=e=>e.model.maxY,uC=e=>e.model.maxX+1,mC=e=>e.model.maxY+1,gC=(e,t,o)=>t(e)-o(e),pC=e=>gC(e,cC,rC),hC=e=>gC(e,dC,aC),fC=e=>pC(e)/2,bC=e=>hC(e)/2,vC=(e,t)=>t?e.stepSize*e.speedMultiplier:e.stepSize,yC=e=>e.snapToGrid,xC=e=>e.snapStart,wC=e=>e.rounded,SC=(e,t)=>void 0!==e[t+"-edge"],kC=e=>SC(e,"left"),CC=e=>SC(e,"right"),OC=e=>SC(e,"top"),_C=e=>SC(e,"bottom"),TC=e=>e.model.value.get(),EC=(e,t)=>({x:e,y:t}),AC=(e,t)=>{Rr(e,nC(),{value:t})},MC=(e,t,o,n)=>e<t?e:e>o?o:e===t?t-1:Math.max(t,e-n),DC=(e,t,o,n)=>e>o?e:e<t?t:e===o?o+1:Math.min(o,e+n),BC=(e,t,o)=>Math.max(t,Math.min(o,e)),IC=e=>{const{min:t,max:o,range:n,value:s,step:r,snap:a,snapStart:i,rounded:l,hasMinEdge:c,hasMaxEdge:d,minBound:u,maxBound:m,screenRange:g}=e,p=c?t-1:t,h=d?o+1:o;if(s<u)return p;if(s>m)return h;{const e=((e,t,o)=>Math.min(o,Math.max(e,t))-t)(s,u,m),c=BC(e/g*n+t,p,h);return a&&c>=t&&c<=o?((e,t,o,n,s)=>s.fold((()=>{const s=e-t,r=Math.round(s/n)*n;return BC(t+r,t-1,o+1)}),(t=>{const s=(e-t)%n,r=Math.round(s/n),a=Math.floor((e-t)/n),i=Math.floor((o-t)/n),l=t+Math.min(i,a+r)*n;return Math.max(t,l)})))(c,t,o,r,i):l?Math.round(c):c}},FC=e=>{const{min:t,max:o,range:n,value:s,hasMinEdge:r,hasMaxEdge:a,maxBound:i,maxOffset:l,centerMinEdge:c,centerMaxEdge:d}=e;return s<t?r?0:c:s>o?a?i:d:(s-t)/n*l},RC="top",NC="right",VC="bottom",zC="left",LC=e=>e.element.dom.getBoundingClientRect(),HC=(e,t)=>e[t],PC=e=>{const t=LC(e);return HC(t,zC)},UC=e=>{const t=LC(e);return HC(t,NC)},WC=e=>{const t=LC(e);return HC(t,RC)},jC=e=>{const t=LC(e);return HC(t,VC)},GC=e=>{const t=LC(e);return HC(t,"width")},$C=e=>{const t=LC(e);return HC(t,"height")},qC=(e,t,o)=>(e+t)/2-o,YC=(e,t)=>{const o=LC(e),n=LC(t),s=HC(o,zC),r=HC(o,NC),a=HC(n,zC);return qC(s,r,a)},XC=(e,t)=>{const o=LC(e),n=LC(t),s=HC(o,RC),r=HC(o,VC),a=HC(n,RC);return qC(s,r,a)},KC=(e,t)=>{Rr(e,nC(),{value:t})},JC=(e,t,o)=>{const n={min:rC(t),max:cC(t),range:pC(t),value:o,step:vC(t),snap:yC(t),snapStart:xC(t),rounded:wC(t),hasMinEdge:kC(t),hasMaxEdge:CC(t),minBound:PC(e),maxBound:UC(e),screenRange:GC(e)};return IC(n)},ZC=e=>(t,o,n)=>((e,t,o,n)=>{const s=(e>0?DC:MC)(TC(o),rC(o),cC(o),vC(o,n));return KC(t,s),A.some(s)})(e,t,o,n).map(E),QC=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=GC(e),a=n.bind((t=>A.some(YC(t,e)))).getOr(0),i=s.bind((t=>A.some(YC(t,e)))).getOr(r),l={min:rC(t),max:cC(t),range:pC(t),value:o,hasMinEdge:kC(t),hasMaxEdge:CC(t),minBound:PC(e),minOffset:0,maxBound:UC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return FC(l)})(t,r,o,n,s);return PC(t)-PC(e)+a},eO=ZC(-1),tO=ZC(1),oO=A.none,nO=A.none,sO={"top-left":A.none(),top:A.none(),"top-right":A.none(),right:A.some(((e,t)=>{AC(e,uC(t))})),"bottom-right":A.none(),bottom:A.none(),"bottom-left":A.none(),left:A.some(((e,t)=>{AC(e,iC(t))}))};var rO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=JC(e,t,o);return KC(e,n),n},setToMin:(e,t)=>{const o=rC(t);KC(e,o)},setToMax:(e,t)=>{const o=cC(t);KC(e,o)},findValueOfOffset:JC,getValueFromEvent:e=>sC(e).map((e=>e.left)),findPositionOfValue:QC,setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=QC(e,n.getSpectrum(e),s,n.getLeftEdge(e),n.getRightEdge(e),o),a=Zt(t.element)/2;Bt(t.element,"left",r-a+"px")},onLeft:eO,onRight:tO,onUp:oO,onDown:nO,edgeActions:sO});const aO=(e,t)=>{Rr(e,nC(),{value:t})},iO=(e,t,o)=>{const n={min:aC(t),max:dC(t),range:hC(t),value:o,step:vC(t),snap:yC(t),snapStart:xC(t),rounded:wC(t),hasMinEdge:OC(t),hasMaxEdge:_C(t),minBound:WC(e),maxBound:jC(e),screenRange:$C(e)};return IC(n)},lO=e=>(t,o,n)=>((e,t,o,n)=>{const s=(e>0?DC:MC)(TC(o),aC(o),dC(o),vC(o,n));return aO(t,s),A.some(s)})(e,t,o,n).map(E),cO=(e,t,o,n,s,r)=>{const a=((e,t,o,n,s)=>{const r=$C(e),a=n.bind((t=>A.some(XC(t,e)))).getOr(0),i=s.bind((t=>A.some(XC(t,e)))).getOr(r),l={min:aC(t),max:dC(t),range:hC(t),value:o,hasMinEdge:OC(t),hasMaxEdge:_C(t),minBound:WC(e),minOffset:0,maxBound:jC(e),maxOffset:r,centerMinEdge:a,centerMaxEdge:i};return FC(l)})(t,r,o,n,s);return WC(t)-WC(e)+a},dO=A.none,uO=A.none,mO=lO(-1),gO=lO(1),pO={"top-left":A.none(),top:A.some(((e,t)=>{AC(e,lC(t))})),"top-right":A.none(),right:A.none(),"bottom-right":A.none(),bottom:A.some(((e,t)=>{AC(e,mC(t))})),"bottom-left":A.none(),left:A.none()};var hO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=iO(e,t,o);return aO(e,n),n},setToMin:(e,t)=>{const o=aC(t);aO(e,o)},setToMax:(e,t)=>{const o=dC(t);aO(e,o)},findValueOfOffset:iO,getValueFromEvent:e=>sC(e).map((e=>e.top)),findPositionOfValue:cO,setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=cO(e,n.getSpectrum(e),s,n.getTopEdge(e),n.getBottomEdge(e),o),a=jt(t.element)/2;Bt(t.element,"top",r-a+"px")},onLeft:dO,onRight:uO,onUp:mO,onDown:gO,edgeActions:pO});const fO=(e,t)=>{Rr(e,nC(),{value:t})},bO=(e,t)=>({x:e,y:t}),vO=(e,t)=>(o,n,s)=>((e,t,o,n,s)=>{const r=e>0?DC:MC,a=t?TC(n).x:r(TC(n).x,rC(n),cC(n),vC(n,s)),i=t?r(TC(n).y,aC(n),dC(n),vC(n,s)):TC(n).y;return fO(o,bO(a,i)),A.some(a)})(e,t,o,n,s).map(E),yO=vO(-1,!1),xO=vO(1,!1),wO=vO(-1,!0),SO=vO(1,!0),kO={"top-left":A.some(((e,t)=>{AC(e,EC(iC(t),lC(t)))})),top:A.some(((e,t)=>{AC(e,EC(fC(t),lC(t)))})),"top-right":A.some(((e,t)=>{AC(e,EC(uC(t),lC(t)))})),right:A.some(((e,t)=>{AC(e,EC(uC(t),bC(t)))})),"bottom-right":A.some(((e,t)=>{AC(e,EC(uC(t),mC(t)))})),bottom:A.some(((e,t)=>{AC(e,EC(fC(t),mC(t)))})),"bottom-left":A.some(((e,t)=>{AC(e,EC(iC(t),mC(t)))})),left:A.some(((e,t)=>{AC(e,EC(iC(t),bC(t)))}))};var CO=Object.freeze({__proto__:null,setValueFrom:(e,t,o)=>{const n=JC(e,t,o.left),s=iO(e,t,o.top),r=bO(n,s);return fO(e,r),r},setToMin:(e,t)=>{const o=rC(t),n=aC(t);fO(e,bO(o,n))},setToMax:(e,t)=>{const o=cC(t),n=dC(t);fO(e,bO(o,n))},getValueFromEvent:e=>sC(e),setPositionFromValue:(e,t,o,n)=>{const s=TC(o),r=QC(e,n.getSpectrum(e),s.x,n.getLeftEdge(e),n.getRightEdge(e),o),a=cO(e,n.getSpectrum(e),s.y,n.getTopEdge(e),n.getBottomEdge(e),o),i=Zt(t.element)/2,l=jt(t.element)/2;Bt(t.element,"left",r-i+"px"),Bt(t.element,"top",a-l+"px")},onLeft:yO,onRight:xO,onUp:wO,onDown:SO,edgeActions:kO});const OO=wm({name:"Slider",configFields:[xs("stepSize",1),xs("speedMultiplier",10),xs("onChange",b),xs("onChoose",b),xs("onInit",b),xs("onDragStart",b),xs("onDragEnd",b),xs("snapToGrid",!1),xs("rounded",!0),ms("snapStart"),ss("model",Zn("mode",{x:[xs("minX",0),xs("maxX",100),ts("value",(e=>As(e.mode.minX))),ns("getInitialValue"),Li("manager",rO)],y:[xs("minY",0),xs("maxY",100),ts("value",(e=>As(e.mode.minY))),ns("getInitialValue"),Li("manager",hO)],xy:[xs("minX",0),xs("maxX",100),xs("minY",0),xs("maxY",100),ts("value",(e=>As({x:e.mode.minX,y:e.mode.minY}))),ns("getInitialValue"),Li("manager",CO)]})),yu("sliderBehaviours",[Gp,vu]),ts("mouseIsDown",(()=>As(!1)))],partFields:oC,factory:(e,t,o,n)=>{const s=t=>im(t,e,"thumb"),r=t=>im(t,e,"spectrum"),a=t=>am(t,e,"left-edge"),i=t=>am(t,e,"right-edge"),l=t=>am(t,e,"top-edge"),c=t=>am(t,e,"bottom-edge"),d=e.model,u=d.manager,m=(t,o)=>{u.setPositionFromValue(t,o,e,{getLeftEdge:a,getRightEdge:i,getTopEdge:l,getBottomEdge:c,getSpectrum:r})},g=(e,t)=>{d.value.set(t);const o=s(e);m(e,o)},p=t=>{const o=e.mouseIsDown.get();e.mouseIsDown.set(!1),o&&am(t,e,"thumb").each((o=>{const n=d.value.get();e.onChoose(t,o,n)}))},h=(t,o)=>{o.stop(),e.mouseIsDown.set(!0),e.onDragStart(t,s(t))},f=(t,o)=>{o.stop(),e.onDragEnd(t,s(t)),p(t)},b=t=>{am(t,e,"spectrum").map(Gp.focusIn)};return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.sliderBehaviours,[Gp.config({mode:"special",focusIn:b}),vu.config({store:{mode:"manual",getValue:e=>d.value.get(),setValue:g}}),Il.config({channels:{[tu()]:{onReceive:p}}})]),events:Hr([Wr(nC(),((t,o)=>{((t,o)=>{g(t,o);const n=s(t);e.onChange(t,n,o),A.some(!0)})(t,o.event.value)})),Jr(((t,o)=>{const n=d.getInitialValue();d.value.set(n);const a=s(t);m(t,a);const i=r(t);e.onInit(t,a,i,d.value.get())})),Wr(Hs(),h),Wr(Us(),f),Wr(js(),((e,t)=>{b(e),h(e,t)})),Wr(qs(),f)]),apis:{resetToMin:t=>{u.setToMin(t,e)},resetToMax:t=>{u.setToMax(t,e)},setValue:g,refresh:m},domModification:{styles:{position:"relative"}}}},apis:{setValue:(e,t,o)=>{e.setValue(t,o)},resetToMin:(e,t)=>{e.resetToMin(t)},resetToMax:(e,t)=>{e.resetToMax(t)},refresh:(e,t)=>{e.refresh(t)}}}),_O=ca("rgb-hex-update"),TO=ca("slider-update"),EO=ca("palette-update"),AO="form",MO=[yu("formBehaviours",[vu])],DO=e=>"<alloy.field."+e+">",BO=(e,t)=>({uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.formBehaviours,[vu.config({store:{mode:"manual",getValue:t=>{const o=cm(t,e);return ce(o,((e,t)=>e().bind((e=>{return o=Om.getCurrent(e),n=new Error(`Cannot find a current component to extract the value from for form part '${t}': `+sa(e.element)),o.fold((()=>rn.error(n)),rn.value);var o,n})).map(vu.getValue)))},setValue:(t,o)=>{le(o,((o,n)=>{am(t,e,n).each((e=>{Om.getCurrent(e).each((e=>{vu.setValue(e,o)}))}))}))}}})]),apis:{getField:(t,o)=>am(t,e,o).bind(Om.getCurrent)}}),IO={getField:Oa(((e,t,o)=>e.getField(t,o))),sketch:e=>{const t=(()=>{const e=[];return{field:(t,o)=>(e.push(t),tm(AO,DO(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=L(n,(e=>$u({name:e,pname:DO(e)})));return fm(AO,MO,s,BO,o)}},FO=ca("valid-input"),RO=ca("invalid-input"),NO=ca("validating-input"),VO="colorcustom.rgb.",zO=(e,t,o,n)=>{const s=(o,n)=>Lk.config({invalidClass:t("invalid"),notify:{onValidate:e=>{Rr(e,NO,{type:o})},onValid:e=>{Rr(e,FO,{type:o,value:vu.getValue(e)})},onInvalid:e=>{Rr(e,RO,{type:o,value:vu.getValue(e)})}},validator:{validate:t=>{const o=vu.getValue(t),s=n(o)?rn.value(!0):rn.error(e("aria.input.invalid"));return SS(s)},validateOnLoad:!1}}),r=(o,n,r,a,i)=>{const l=e(VO+"range"),c=uk.parts.label({dom:{tag:"label",attributes:{"aria-label":a}},components:[ri(r)]}),d=uk.parts.field({data:i,factory:Hv,inputAttributes:{type:"text",..."hex"===n?{"aria-live":"polite"}:{}},inputClasses:[t("textfield")],inputBehaviours:Tl([s(n,o),pk.config({})]),onSetValue:e=>{Lk.isInvalid(e)&&Lk.run(e).get(b)}}),u=[c,d],m="hex"!==n?[uk.parts["aria-descriptor"]({text:l})]:[];return{dom:{tag:"div",attributes:{role:"presentation"}},components:u.concat(m)}},a=(e,t)=>{const o=t.red,n=t.green,s=t.blue;vu.setValue(e,{red:o,green:n,blue:s})},i=Xh({dom:{tag:"div",classes:[t("rgba-preview")],styles:{"background-color":"white"},attributes:{role:"presentation"}}}),l=(e,t)=>{i.getOpt(e).each((e=>{Bt(e.element,"background-color","#"+t.value)}))},c=xm({factory:()=>{const s={red:As(A.some(255)),green:As(A.some(255)),blue:As(A.some(255)),hex:As(A.some("ffffff"))},c=e=>s[e].get(),d=(e,t)=>{s[e].set(t)},u=e=>{const t=e.red,o=e.green,n=e.blue;d("red",A.some(t)),d("green",A.some(o)),d("blue",A.some(n))},m=(e,t)=>{const o=t.event;"hex"!==o.type?d(o.type,A.none()):n(e)},g=(e,t)=>{const n=t.event;(e=>"hex"===e.type)(n)?((e,t)=>{o(e);const n=Kx(t);d("hex",A.some(n.value));const s=uw(n);a(e,s),u(s),Rr(e,_O,{hex:n}),l(e,n)})(e,n.value):((e,t,o)=>{const n=parseInt(o,10);d(t,A.some(n)),c("red").bind((e=>c("green").bind((t=>c("blue").map((o=>lw(e,t,o,1))))))).each((t=>{const o=((e,t)=>{const o=ow(t);return IO.getField(e,"hex").each((t=>{ah.isFocused(t)||vu.setValue(e,{hex:o.value})})),o})(e,t);Rr(e,_O,{hex:o}),l(e,o)}))})(e,n.type,n.value)},p=t=>({label:e(VO+t+".label"),description:e(VO+t+".description")}),h=p("red"),f=p("green"),b=p("blue"),v=p("hex");return bn(IO.sketch((o=>({dom:{tag:"form",classes:[t("rgb-form")],attributes:{"aria-label":e("aria.color.picker")}},components:[o.field("red",uk.sketch(r(cw,"red",h.label,h.description,255))),o.field("green",uk.sketch(r(cw,"green",f.label,f.description,255))),o.field("blue",uk.sketch(r(cw,"blue",b.label,b.description,255))),o.field("hex",uk.sketch(r(Qx,"hex",v.label,v.description,"ffffff"))),i.asSpec()],formBehaviours:Tl([Lk.config({invalidClass:t("form-invalid")}),th("rgb-form-events",[Wr(FO,g),Wr(RO,m),Wr(NO,m)])])}))),{apis:{updateHex:(e,t)=>{vu.setValue(e,{hex:t.value}),((e,t)=>{const o=uw(t);a(e,o),u(o)})(e,t),l(e,t)}}})},name:"RgbForm",configFields:[],apis:{updateHex:(e,t,o)=>{e.updateHex(t,o)}},extraApis:{}});return c},LO=(e,t)=>{const o=xm({name:"ColourPicker",configFields:[ns("dom"),xs("onValidHex",b),xs("onInvalidHex",b)],factory:o=>{const n=zO(e,t,o.onValidHex,o.onInvalidHex),s=((e,t)=>{const o=OO.parts.spectrum({dom:{tag:"canvas",attributes:{role:"presentation"},classes:[t("sv-palette-spectrum")]}}),n=OO.parts.thumb({dom:{tag:"div",attributes:{role:"presentation"},classes:[t("sv-palette-thumb")],innerHtml:`<div class=${t("sv-palette-inner-thumb")} role="presentation"></div>`}}),s=(e,t)=>{const{width:o,height:n}=e,s=e.getContext("2d");if(null===s)return;s.fillStyle=t,s.fillRect(0,0,o,n);const r=s.createLinearGradient(0,0,o,0);r.addColorStop(0,"rgba(255,255,255,1)"),r.addColorStop(1,"rgba(255,255,255,0)"),s.fillStyle=r,s.fillRect(0,0,o,n);const a=s.createLinearGradient(0,0,0,n);a.addColorStop(0,"rgba(0,0,0,0)"),a.addColorStop(1,"rgba(0,0,0,1)"),s.fillStyle=a,s.fillRect(0,0,o,n)};return xm({factory:r=>{const a=x({x:0,y:0}),i=Tl([Om.config({find:A.some}),ah.config({})]);return OO.sketch({dom:{tag:"div",attributes:{role:"slider","aria-valuetext":e(["Saturation {0}%, Brightness {1}%",0,0])},classes:[t("sv-palette")]},model:{mode:"xy",getInitialValue:a},rounded:!1,components:[o,n],onChange:(t,o,n)=>{h(n)||Ct(t.element,"aria-valuetext",e(["Saturation {0}%, Brightness {1}%",Math.floor(n.x),Math.floor(100-n.y)])),Rr(t,EO,{value:n})},onInit:(e,t,o,n)=>{s(o.element.dom,pw(hw))},sliderBehaviours:i})},name:"SaturationBrightnessPalette",configFields:[],apis:{setHue:(e,t,o)=>{((e,t)=>{const o=e.components()[0].element.dom,n=Aw(t,100,100),r=dw(n);s(o,pw(r))})(t,o)},setThumb:(t,o,n)=>{((t,o)=>{const n=Mw(uw(o));OO.setValue(t,{x:n.saturation,y:100-n.value}),Ct(t.element,"aria-valuetext",e(["Saturation {0}%, Brightness {1}%",n.saturation,n.value]))})(o,n)}},extraApis:{}})})(e,t),r={paletteRgba:As(hw),paletteHue:As(0)},a=Xh(((e,t)=>{const o=OO.parts.spectrum({dom:{tag:"div",classes:[t("hue-slider-spectrum")],attributes:{role:"presentation"}}}),n=OO.parts.thumb({dom:{tag:"div",classes:[t("hue-slider-thumb")],attributes:{role:"presentation"}}});return OO.sketch({dom:{tag:"div",classes:[t("hue-slider")],attributes:{role:"slider","aria-valuemin":0,"aria-valuemax":360,"aria-valuenow":120}},rounded:!1,model:{mode:"y",getInitialValue:x(0)},components:[o,n],sliderBehaviours:Tl([ah.config({})]),onChange:(e,t,o)=>{Ct(e.element,"aria-valuenow",Math.floor(360-3.6*o)),Rr(e,TO,{value:o})}})})(0,t)),i=Xh(s.sketch({})),l=Xh(n.sketch({})),c=(e,t,o)=>{i.getOpt(e).each((e=>{s.setHue(e,o)}))},d=(e,t)=>{l.getOpt(e).each((e=>{n.updateHex(e,t)}))},u=(e,t,o)=>{a.getOpt(e).each((e=>{OO.setValue(e,(e=>100-e/360*100)(o))}))},m=(e,t)=>{i.getOpt(e).each((e=>{s.setThumb(e,t)}))},g=(e,t,o,n)=>{((e,t)=>{const o=uw(e);r.paletteRgba.set(o),r.paletteHue.set(t)})(t,o),H(n,(n=>{n(e,t,o)}))};return{uid:o.uid,dom:o.dom,components:[i.asSpec(),a.asSpec(),l.asSpec()],behaviours:Tl([th("colour-picker-events",[Wr(_O,(()=>{const e=[c,u,m];return(t,o)=>{const n=o.event.hex,s=(e=>Mw(uw(e)))(n);g(t,n,s.hue,e)}})()),Wr(EO,(()=>{const e=[d];return(t,o)=>{const n=o.event.value,s=r.paletteHue.get(),a=Aw(s,n.x,100-n.y),i=Dw(a);g(t,i,s,e)}})()),Wr(TO,(()=>{const e=[c,d];return(t,o)=>{const n=(e=>(100-e)/100*360)(o.event.value),s=r.paletteRgba.get(),a=Mw(s),i=Aw(n,a.saturation,a.value),l=Dw(i);g(t,l,n,e)}})())]),Om.config({find:e=>l.getOpt(e)}),Gp.config({mode:"acyclic"})])}}});return o},HO=()=>Om.config({find:A.some}),PO=e=>Om.config({find:t=>ct(t.element,e).bind((e=>t.getSystem().getByDom(e).toOptional()))}),UO=Bn([xs("preprocess",w),xs("postprocess",w)]),WO=(e,t)=>{const o=Kn("RepresentingConfigs.memento processors",UO,t);return vu.config({store:{mode:"manual",getValue:t=>{const n=e.get(t),s=vu.getValue(n);return o.postprocess(s)},setValue:(t,n)=>{const s=o.preprocess(n),r=e.get(t);vu.setValue(r,s)}}})},jO=(e,t,o)=>vu.config({store:{mode:"manual",...e.map((e=>({initialValue:e}))).getOr({}),getValue:t,setValue:o}}),GO=(e,t,o)=>jO(e,(e=>t(e.element)),((e,t)=>o(e.element,t))),$O=e=>vu.config({store:{mode:"memory",initialValue:e}}),qO={"colorcustom.rgb.red.label":"R","colorcustom.rgb.red.description":"Red component","colorcustom.rgb.green.label":"G","colorcustom.rgb.green.description":"Green component","colorcustom.rgb.blue.label":"B","colorcustom.rgb.blue.description":"Blue component","colorcustom.rgb.hex.label":"#","colorcustom.rgb.hex.description":"Hex color code","colorcustom.rgb.range":"Range 0 to 255","aria.color.picker":"Color Picker","aria.input.invalid":"Invalid input"};var YO=tinymce.util.Tools.resolve("tinymce.Resource"),XO=tinymce.util.Tools.resolve("tinymce.util.Tools");const KO=(e,t)=>{let o=null;const n=()=>{c(o)||(clearTimeout(o),o=null)};return{cancel:n,throttle:(...s)=>{n(),o=setTimeout((()=>{o=null,e.apply(null,s)}),t)}}},JO=ca("alloy-fake-before-tabstop"),ZO=ca("alloy-fake-after-tabstop"),QO=e=>({dom:{tag:"div",styles:{width:"1px",height:"1px",outline:"none"},attributes:{tabindex:"0"},classes:e},behaviours:Tl([ah.config({ignore:!0}),pk.config({})])}),e_=(e,t)=>({dom:{tag:"div",classes:["tox-navobj",...e.getOr([])]},components:[QO([JO]),t,QO([ZO])],behaviours:Tl([PO(1)])}),t_=(e,t)=>{Rr(e,Js(),{raw:{which:9,shiftKey:t}})},o_=(e,t)=>{const o=t.element;$a(o,JO)?t_(e,!0):$a(o,ZO)&&t_(e,!1)},n_=e=>JS(e,["."+JO,"."+ZO].join(","),T),s_=ca("update-dialog"),r_=ca("update-title"),a_=ca("update-body"),i_=ca("update-footer"),l_=ca("body-send-message"),c_=ca("dialog-focus-shifted"),d_=Bo().browser,u_=d_.isSafari(),m_=d_.isFirefox(),g_=u_||m_,p_=d_.isChromium(),h_=({scrollTop:e,scrollHeight:t,clientHeight:o})=>Math.ceil(e)+o>=t,f_=(e,t)=>e.scrollTo(0,"bottom"===t?99999999:t),b_=(e,t,o)=>{const n=e.dom;A.from(n.contentDocument).fold(o,(e=>{let o=0;const s=((e,t)=>{const o=e.body;return A.from(!/^<!DOCTYPE (html|HTML)/.test(t)&&(!p_&&!u_||g(o)&&(0!==o.scrollTop||Math.abs(o.scrollHeight-o.clientHeight)>1))?o:e.documentElement)})(e,t).map((e=>(o=e.scrollTop,e))).forall(h_),r=()=>{const e=n.contentWindow;g(e)&&(s?f_(e,"bottom"):!s&&g_&&0!==o&&f_(e,o))};u_&&n.addEventListener("load",r,{once:!0}),e.open(),e.write(t),e.close(),u_||r()}))},v_=Ce(g_,u_?500:200).map((e=>((e,t)=>{let o=null,n=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null,n=null)},throttle:(...s)=>{n=s,c(o)&&(o=setTimeout((()=>{const t=n;o=null,n=null,e.apply(null,t)}),t))}}})(b_,e))),y_=ca("toolbar.button.execute"),x_=ca("common-button-display-events"),w_={[mr()]:["disabling","alloy.base.behaviour","toggling","toolbar-button-events"],[kr()]:["toolbar-button-events",x_],[js()]:["focusing","alloy.base.behaviour",x_]},S_=e=>Bt(e.element,"width",Rt(e.element,"width")),k_=(e,t,o)=>ob(e,{tag:"span",classes:["tox-icon","tox-tbtn__icon-wrap"],behaviours:o},t),C_=(e,t)=>k_(e,t,[]),O_=(e,t)=>k_(e,t,[eh.config({})]),__=(e,t,o)=>({dom:{tag:"span",classes:[`${t}__select-label`]},components:[ri(o.translate(e))],behaviours:Tl([eh.config({})])}),T_=ca("update-menu-text"),E_=ca("update-menu-icon"),A_=(e,t,o)=>{const n=As(b),s=e.text.map((e=>Xh(__(e,t,o.providers)))),r=e.icon.map((e=>Xh(O_(e,o.providers.icons)))),a=(e,t)=>{const o=vu.getValue(e);return ah.focus(o),Rr(o,"keydown",{raw:t.event.raw}),NS.close(o),A.some(!0)},i=e.role.fold((()=>({})),(e=>({role:e}))),l=e.tooltip.fold((()=>({})),(e=>{const t=o.providers.translate(e);return{title:t,"aria-label":t}})),c=ob("chevron-down",{tag:"div",classes:[`${t}__select-chevron`]},o.providers.icons),d=ca("common-button-display-events"),u=Xh(NS.sketch({...e.uid?{uid:e.uid}:{},...i,dom:{tag:"button",classes:[t,`${t}--select`].concat(L(e.classes,(e=>`${t}--${e}`))),attributes:{...l}},components:Fx([r.map((e=>e.asSpec())),s.map((e=>e.asSpec())),A.some(c)]),matchWidth:!0,useMinWidth:!0,onOpen:(t,o,n)=>{e.searchable&&(e=>{Gv(e).each((e=>ah.focus(e)))})(n)},dropdownBehaviours:Tl([...e.dropdownBehaviours,_x((()=>e.disabled||o.providers.isDisabled())),Ox(),Hk.config({}),eh.config({}),th("dropdown-events",[Mx(e,n),Dx(e,n)]),th(d,[Jr(((e,t)=>S_(e)))]),th("menubutton-update-display-text",[Wr(T_,((e,t)=>{s.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[ri(o.providers.translate(t.event.text))])}))})),Wr(E_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[O_(t.event.icon,o.providers.icons)])}))}))])]),eventOrder:bn(w_,{mousedown:["focusing","alloy.base.behaviour","item-type-events","normal-dropdown-events"],[kr()]:["toolbar-button-events","dropdown-events",d]}),sandboxBehaviours:Tl([Gp.config({mode:"special",onLeft:a,onRight:a}),th("dropdown-sandbox-events",[Wr(Pv,((e,t)=>{(e=>{const t=vu.getValue(e),o=jv(e).map($v);NS.refetch(t).get((()=>{const e=fS.getCoupled(t,"sandbox");o.each((t=>jv(e).each((e=>((e,t)=>{vu.setValue(e,t.fetchPattern),e.element.dom.selectionStart=t.selectionStart,e.element.dom.selectionEnd=t.selectionEnd})(e,t)))))}))})(e),t.stop()})),Wr(Uv,((e,t)=>{((e,t)=>{(e=>Zd.getState(e).bind(Xm.getHighlighted).bind(Xm.getHighlighted))(e).each((o=>{((e,t,o,n)=>{const s={...n,target:t};e.getSystem().triggerEvent(o,t,s)})(e,o.element,t.event.eventType,t.event.interactionEvent)}))})(e,t),t.stop()}))])]),lazySink:o.getSink,toggleClass:`${t}--active`,parts:{menu:{...Rv(0,e.columns,e.presets),fakeFocus:e.searchable,onHighlightItem:VS,onCollapseMenu:(e,t,o)=>{Xm.getHighlighted(o).each((t=>{VS(e,o,t)}))},onDehighlightItem:zS}},getAnchorOverrides:()=>({maxHeightFunction:(e,t)=>{mc()(e,t-10)}}),fetch:t=>wS(k(e.fetch,t))}));return u.asSpec()},M_=e=>"separator"===e.type,D_={type:"separator"},B_=(e,t)=>{const o=((e,t)=>{const o=j(e,((e,o)=>(e=>r(e))(o)?""===o?e:"|"===o?e.length>0&&!M_(e[e.length-1])?e.concat([D_]):e:ve(t,o.toLowerCase())?e.concat([t[o.toLowerCase()]]):e:e.concat([o])),[]);return o.length>0&&M_(o[o.length-1])&&o.pop(),o})(r(e)?e.split(" "):e,t);return W(o,((e,o)=>{if((e=>ve(e,"getSubmenuItems"))(o)){const n=(e=>{const t=be(e,"value").getOrThunk((()=>ca("generated-menu-item")));return bn({value:t},e)})(o),s=((e,t)=>{const o=e.getSubmenuItems(),n=B_(o,t);return{item:e,menus:bn(n.menus,{[e.value]:n.items}),expansions:bn(n.expansions,{[e.value]:e.value})}})(n,t);return{menus:bn(e.menus,s.menus),items:[s.item,...e.items],expansions:bn(e.expansions,s.expansions)}}return{...e,items:[o,...e.items]}}),{menus:{},expansions:{},items:[]})},I_=(e,t,o,n)=>{const s=ca("primary-menu"),r=B_(e,o.shared.providers.menuItems());if(0===r.items.length)return A.none();const a=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-field",placeholder:e.placeholder}))))(n),i=WS(s,r.items,t,o,n.isHorizontalMenu,a),l=(e=>e.search.fold((()=>({searchMode:"no-search"})),(e=>({searchMode:"search-with-results"}))))(n),c=ce(r.menus,((e,n)=>WS(n,e,t,o,!1,l))),d=bn(c,Ds(s,i));return A.from(jh.tieredData(s,d,r.expansions))},F_=e=>!ve(e,"items"),R_="data-value",N_=(e,t,o,n)=>L(o,(o=>F_(o)?{type:"togglemenuitem",text:o.text,value:o.value,active:o.value===n,onAction:()=>{vu.setValue(e,o.value),Rr(e,xk,{name:t}),ah.focus(e)}}:{type:"nestedmenuitem",text:o.text,getSubmenuItems:()=>N_(e,t,o.items,n)})),V_=(e,t)=>re(e,(e=>F_(e)?Ce(e.value===t,e):V_(e.items,t))),z_=xm({name:"HtmlSelect",configFields:[ns("options"),yu("selectBehaviours",[ah,vu]),xs("selectClasses",[]),xs("selectAttributes",{}),ms("data")],factory:(e,t)=>{const o=L(e.options,(e=>({dom:{tag:"option",value:e.value,innerHtml:e.text}}))),n=e.data.map((e=>Ds("initialValue",e))).getOr({});return{uid:e.uid,dom:{tag:"select",classes:e.selectClasses,attributes:e.selectAttributes},components:o,behaviours:wu(e.selectBehaviours,[ah.config({}),vu.config({store:{mode:"manual",getValue:e=>Ka(e.element),setValue:(t,o)=>{const n=oe(e.options);G(e.options,(e=>e.value===o)).isSome()?Ja(t.element,o):-1===t.element.dom.selectedIndex&&""===o&&n.each((e=>Ja(t.element,e.value)))},...n}})])}}}),L_=x([xs("field1Name","field1"),xs("field2Name","field2"),Vi("onLockedChange"),Ii(["lockClass"]),xs("locked",!1),Su("coupledFieldBehaviours",[Om,vu])]),H_=(e,t)=>$u({factory:uk,name:e,overrides:e=>({fieldBehaviours:Tl([th("coupled-input-behaviour",[Wr(Qs(),(o=>{((e,t,o)=>am(e,t,o).bind(Om.getCurrent))(o,e,t).each((t=>{am(o,e,"lock").each((n=>{ph.isOn(n)&&e.onLockedChange(o,t,n)}))}))}))])])})}),P_=x([H_("field1","field2"),H_("field2","field1"),$u({factory:qh,schema:[ns("dom")],name:"lock",overrides:e=>({buttonBehaviours:Tl([ph.config({selected:e.locked,toggleClass:e.markers.lockClass,aria:{mode:"pressed"}})])})})]),U_=wm({name:"FormCoupledInputs",configFields:L_(),partFields:P_(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:ku(e.coupledFieldBehaviours,[Om.config({find:A.some}),vu.config({store:{mode:"manual",getValue:t=>{const o=um(t,e,["field1","field2"]);return{[e.field1Name]:vu.getValue(o.field1()),[e.field2Name]:vu.getValue(o.field2())}},setValue:(t,o)=>{const n=um(t,e,["field1","field2"]);ye(o,e.field1Name)&&vu.setValue(n.field1(),o[e.field1Name]),ye(o,e.field2Name)&&vu.setValue(n.field2(),o[e.field2Name])}}})]),apis:{getField1:t=>am(t,e,"field1"),getField2:t=>am(t,e,"field2"),getLock:t=>am(t,e,"lock")}}),apis:{getField1:(e,t)=>e.getField1(t),getField2:(e,t)=>e.getField2(t),getLock:(e,t)=>e.getLock(t)}}),W_=e=>{const t=/^\s*(\d+(?:\.\d+)?)\s*(|cm|mm|in|px|pt|pc|em|ex|ch|rem|vw|vh|vmin|vmax|%)\s*$/.exec(e);if(null!==t){const e=parseFloat(t[1]),o=t[2];return rn.value({value:e,unit:o})}return rn.error(e)},j_=(e,t)=>{const o={"":96,px:96,pt:72,cm:2.54,pc:12,mm:25.4,in:1},n=e=>ve(o,e);return e.unit===t?A.some(e.value):n(e.unit)&&n(t)?o[e.unit]===o[t]?A.some(e.value):A.some(e.value/o[e.unit]*o[t]):A.none()},G_=e=>A.none(),$_=(e,t)=>{const o=e.label.map((e=>yk(e,t))),n=[Lm.config({disabled:()=>e.disabled||t.isDisabled()}),Ox(),Gp.config({mode:"execution",useEnter:!0!==e.multiline,useControlEnter:!0===e.multiline,execute:e=>(Fr(e,Ck),A.some(!0))}),th("textfield-change",[Wr(Qs(),((t,o)=>{Rr(t,xk,{name:e.name})})),Wr(dr(),((t,o)=>{Rr(t,xk,{name:e.name})}))]),pk.config({})],s=e.validation.map((e=>Lk.config({getRoot:e=>at(e.element),invalidClass:"tox-invalid",validator:{validate:t=>{const o=vu.getValue(t),n=e.validator(o);return SS(!0===n?rn.value(o):rn.error(n))},validateOnLoad:e.validateOnLoad}}))).toArray(),r={...e.placeholder.fold(x({}),(e=>({placeholder:t.translate(e)}))),...e.inputMode.fold(x({}),(e=>({inputmode:e})))},a=uk.parts.field({tag:!0===e.multiline?"textarea":"input",...e.data.map((e=>({data:e}))).getOr({}),inputAttributes:r,inputClasses:[e.classname],inputBehaviours:Tl(q([n,s])),selectOnFocus:!1,factory:Hv}),i=e.multiline?{dom:{tag:"div",classes:["tox-textarea-wrap"]},components:[a]}:a,l=(e.flex?["tox-form__group--stretched"]:[]).concat(e.maximized?["tox-form-group--maximize"]:[]),c=[Lm.config({disabled:()=>e.disabled||t.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}}),Ox()];return fk(o,i,l,c)},q_=(e,t)=>t.getAnimationRoot.fold((()=>e.element),(t=>t(e))),Y_=e=>e.dimension.property,X_=(e,t)=>e.dimension.getDimension(t),K_=(e,t)=>{const o=q_(e,t);Ya(o,[t.shrinkingClass,t.growingClass])},J_=(e,t)=>{Ga(e.element,t.openClass),Wa(e.element,t.closedClass),Bt(e.element,Y_(t),"0px"),Pt(e.element)},Z_=(e,t)=>{Ga(e.element,t.closedClass),Wa(e.element,t.openClass),Ht(e.element,Y_(t))},Q_=(e,t,o,n)=>{o.setCollapsed(),Bt(e.element,Y_(t),X_(t,e.element)),K_(e,t),J_(e,t),t.onStartShrink(e),t.onShrunk(e)},eT=(e,t,o,n)=>{const s=n.getOrThunk((()=>X_(t,e.element)));o.setCollapsed(),Bt(e.element,Y_(t),s),Pt(e.element);const r=q_(e,t);Ga(r,t.growingClass),Wa(r,t.shrinkingClass),J_(e,t),t.onStartShrink(e)},tT=(e,t,o)=>{const n=X_(t,e.element);("0px"===n?Q_:eT)(e,t,o,A.some(n))},oT=(e,t,o)=>{const n=q_(e,t),s=$a(n,t.shrinkingClass),r=X_(t,e.element);Z_(e,t);const a=X_(t,e.element);(s?()=>{Bt(e.element,Y_(t),r),Pt(e.element)}:()=>{J_(e,t)})(),Ga(n,t.shrinkingClass),Wa(n,t.growingClass),Z_(e,t),Bt(e.element,Y_(t),a),o.setExpanded(),t.onStartGrow(e)},nT=(e,t,o)=>{const n=q_(e,t);return!0===$a(n,t.growingClass)},sT=(e,t,o)=>{const n=q_(e,t);return!0===$a(n,t.shrinkingClass)};var rT=Object.freeze({__proto__:null,refresh:(e,t,o)=>{if(o.isExpanded()){Ht(e.element,Y_(t));const o=X_(t,e.element);Bt(e.element,Y_(t),o)}},grow:(e,t,o)=>{o.isExpanded()||oT(e,t,o)},shrink:(e,t,o)=>{o.isExpanded()&&tT(e,t,o)},immediateShrink:(e,t,o)=>{o.isExpanded()&&Q_(e,t,o)},hasGrown:(e,t,o)=>o.isExpanded(),hasShrunk:(e,t,o)=>o.isCollapsed(),isGrowing:nT,isShrinking:sT,isTransitioning:(e,t,o)=>nT(e,t)||sT(e,t),toggleGrow:(e,t,o)=>{(o.isExpanded()?tT:oT)(e,t,o)},disableTransitions:K_,immediateGrow:(e,t,o)=>{o.isExpanded()||(Z_(e,t),Bt(e.element,Y_(t),X_(t,e.element)),K_(e,t),o.setExpanded(),t.onStartGrow(e),t.onGrown(e))}}),aT=Object.freeze({__proto__:null,exhibit:(e,t,o)=>{const n=t.expanded;return Aa(n?{classes:[t.openClass],styles:{}}:{classes:[t.closedClass],styles:Ds(t.dimension.property,"0px")})},events:(e,t)=>Hr([Kr(nr(),((o,n)=>{n.event.raw.propertyName===e.dimension.property&&(K_(o,e),t.isExpanded()&&Ht(o.element,e.dimension.property),(t.isExpanded()?e.onGrown:e.onShrunk)(o))}))])}),iT=[ns("closedClass"),ns("openClass"),ns("shrinkingClass"),ns("growingClass"),ms("getAnimationRoot"),Ri("onShrunk"),Ri("onStartShrink"),Ri("onGrown"),Ri("onStartGrow"),xs("expanded",!1),ss("dimension",Zn("property",{width:[Li("property","width"),Li("getDimension",(e=>Zt(e)+"px"))],height:[Li("property","height"),Li("getDimension",(e=>jt(e)+"px"))]}))];const lT=Al({fields:iT,name:"sliding",active:aT,apis:rT,state:Object.freeze({__proto__:null,init:e=>{const t=As(e.expanded);return Ta({isExpanded:()=>!0===t.get(),isCollapsed:()=>!1===t.get(),setCollapsed:k(t.set,!1),setExpanded:k(t.set,!0),readState:()=>"expanded: "+t.get()})}})}),cT=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setActive:t=>{const o=e.element;t?(Wa(o,"tox-tbtn--enabled"),Ct(o,"aria-pressed",!0)):(Ga(o,"tox-tbtn--enabled"),At(o,"aria-pressed"))},isActive:()=>$a(e.element,"tox-tbtn--enabled"),setText:t=>{Rr(e,T_,{text:t})},setIcon:t=>Rr(e,E_,{icon:t})}),dT=(e,t,o,n,s=!0)=>A_({text:e.text,icon:e.icon,tooltip:e.tooltip,searchable:e.search.isSome(),role:n,fetch:(t,n)=>{const s={pattern:e.search.isSome()?LS(t):""};e.fetch((t=>{n(I_(t,bv.CLOSE_ON_EXECUTE,o,{isHorizontalMenu:!1,search:e.search}))}),s,cT(t))},onSetup:e.onSetup,getApi:cT,columns:1,presets:"normal",classes:[],dropdownBehaviours:[...s?[pk.config({})]:[]]},t,o.shared),uT=(e,t,o)=>{const n=e=>n=>{const s=!n.isActive();n.setActive(s),e.storage.set(s),o.shared.getSink().each((o=>{t().getOpt(o).each((t=>{Rl(t.element),Rr(t,kk,{name:e.name,value:e.storage.get()})}))}))},s=e=>t=>{t.setActive(e.storage.get())};return t=>{t(L(e,(e=>{const t=e.text.fold((()=>({})),(e=>({text:e})));return{type:e.type,active:!1,...t,onAction:n(e),onSetup:s(e)}})))}},mT=e=>({dom:{tag:"span",classes:["tox-tree__label"],attributes:{title:e,"aria-label":e}},components:[ri(e)]}),gT=ca("leaf-label-event-id"),pT=({leaf:e,onLeafAction:t,visible:o,treeId:n,selectedId:s,backstage:r})=>{const a=e.menu.map((e=>dT(e,"tox-mbtn",r,A.none(),o))),i=[mT(e.title)];return a.each((e=>i.push(e))),qh.sketch({dom:{tag:"div",classes:["tox-tree--leaf__label","tox-trbtn"].concat(o?["tox-tree--leaf__label--visible"]:[])},components:i,role:"treeitem",action:o=>{t(e.id),o.getSystem().broadcastOn([`update-active-item-${n}`],{value:e.id})},eventOrder:{[Js()]:[gT,"keying"]},buttonBehaviours:Tl([...o?[pk.config({})]:[],ph.config({toggleClass:"tox-trbtn--enabled",toggleOnExecute:!1,aria:{mode:"selected"}}),Il.config({channels:{[`update-active-item-${n}`]:{onReceive:(t,o)=>{(o.value===e.id?ph.on:ph.off)(t)}}}}),th(gT,[Jr(((t,o)=>{s.each((o=>{(o===e.id?ph.on:ph.off)(t)}))})),Wr(Js(),((e,t)=>{const o="ArrowLeft"===t.event.raw.code,n="ArrowRight"===t.event.raw.code;o?(fi(e.element,".tox-tree--directory").each((t=>{e.getSystem().getByDom(t).each((e=>{bi(t,".tox-tree--directory__label").each((t=>{e.getSystem().getByDom(t).each(ah.focus)}))}))})),t.stop()):n&&t.stop()}))])])})},hT=ca("directory-label-event-id"),fT=({directory:e,visible:t,noChildren:o,backstage:n})=>{const s=e.menu.map((e=>dT(e,"tox-mbtn",n,A.none()))),r=[{dom:{tag:"div",classes:["tox-chevron"]},components:[(a="chevron-right",i=n.shared.providers.icons,((e,t,o)=>ob(e,{tag:"span",classes:["tox-tree__icon-wrap","tox-icon"],behaviours:[]},t))(a,i))]},mT(e.title)];var a,i;s.each((e=>{r.push(e)}));const l=t=>{fi(t.element,".tox-tree--directory").each((o=>{t.getSystem().getByDom(o).each((o=>{const n=!ph.isOn(o);ph.toggle(o),Rr(t,"expand-tree-node",{expanded:n,node:e.id})}))}))};return qh.sketch({dom:{tag:"div",classes:["tox-tree--directory__label","tox-trbtn"].concat(t?["tox-tree--directory__label--visible"]:[])},components:r,action:l,eventOrder:{[Js()]:[hT,"keying"]},buttonBehaviours:Tl([...t?[pk.config({})]:[],th(hT,[Wr(Js(),((e,t)=>{const n="ArrowRight"===t.event.raw.code,s="ArrowLeft"===t.event.raw.code;n&&o&&t.stop(),(n||s)&&fi(e.element,".tox-tree--directory").each((o=>{e.getSystem().getByDom(o).each((o=>{!ph.isOn(o)&&n||ph.isOn(o)&&s?(l(e),t.stop()):s&&!ph.isOn(o)&&(fi(o.element,".tox-tree--directory").each((e=>{bi(e,".tox-tree--directory__label").each((e=>{o.getSystem().getByDom(e).each(ah.focus)}))})),t.stop())}))}))}))])])})},bT=({children:e,onLeafAction:t,visible:o,treeId:n,expandedIds:s,selectedId:r,backstage:a})=>({dom:{tag:"div",classes:["tox-tree--directory__children"]},components:e.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:r,onLeafAction:t,visible:o,treeId:n,backstage:a}):yT({directory:e,expandedIds:s,selectedId:r,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:a}))),behaviours:Tl([lT.config({dimension:{property:"height"},closedClass:"tox-tree--directory__children--closed",openClass:"tox-tree--directory__children--open",growingClass:"tox-tree--directory__children--growing",shrinkingClass:"tox-tree--directory__children--shrinking",expanded:o}),eh.config({})])}),vT=ca("directory-event-id"),yT=({directory:e,onLeafAction:t,labelTabstopping:o,treeId:n,backstage:s,expandedIds:r,selectedId:a})=>{const{children:i}=e,l=As(r),c=r.includes(e.id);return{dom:{tag:"div",classes:["tox-tree--directory"],attributes:{role:"treeitem"}},components:[fT({directory:e,visible:o,noChildren:0===e.children.length,backstage:s}),bT({children:i,expandedIds:r,selectedId:a,onLeafAction:t,visible:c,treeId:n,backstage:s})],behaviours:Tl([th(vT,[Jr(((e,t)=>{ph.set(e,c)})),Wr("expand-tree-node",((e,t)=>{const{expanded:o,node:n}=t.event;l.set(o?[...l.get(),n]:l.get().filter((e=>e!==n)))}))]),ph.config({...e.children.length>0?{aria:{mode:"expanded"}}:{},toggleClass:"tox-tree--directory--expanded",onToggled:(e,o)=>{const r=e.components()[1],c=(d=o,i.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:a,onLeafAction:t,visible:d,treeId:n,backstage:s}):yT({directory:e,expandedIds:l.get(),selectedId:a,onLeafAction:t,labelTabstopping:d,treeId:n,backstage:s}))));var d;o?lT.grow(r):lT.shrink(r),eh.set(r,c)}})])}},xT=ca("tree-event-id");var wT=Object.freeze({__proto__:null,events:(e,t)=>{const o=e.stream.streams.setup(e,t);return Hr([Wr(e.event,o),Zr((()=>t.cancel()))].concat(e.cancelEvent.map((e=>[Wr(e,(()=>t.cancel()))])).getOr([])))}});const ST=e=>{const t=As(null);return Ta({readState:()=>({timer:null!==t.get()?"set":"unset"}),setTimer:e=>{t.set(e)},cancel:()=>{const e=t.get();null!==e&&e.cancel()}})};var kT=Object.freeze({__proto__:null,throttle:ST,init:e=>e.stream.streams.state(e)}),CT=[ss("stream",Zn("mode",{throttle:[ns("delay"),xs("stopEvent",!0),Li("streams",{setup:(e,t)=>{const o=e.stream,n=KO(e.onStream,o.delay);return t.setTimer(n),(e,t)=>{n.throttle(e,t),o.stopEvent&&t.stop()}},state:ST})]})),xs("event","input"),ms("cancelEvent"),Vi("onStream")];const OT=Al({fields:CT,name:"streaming",active:wT,state:kT}),_T=(e,t,o)=>{const n=vu.getValue(o);vu.setValue(t,n),ET(t)},TT=(e,t)=>{const o=e.element,n=Ka(o),s=o.dom;"number"!==_t(o,"type")&&t(s,n)},ET=e=>{TT(e,((e,t)=>e.setSelectionRange(t.length,t.length)))},AT=x("alloy.typeahead.itemexecute"),MT=x([ms("lazySink"),ns("fetch"),xs("minChars",5),xs("responseTime",1e3),Ri("onOpen"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),xs("layouts",A.none()),xs("eventOrder",{}),Es("model",{},[xs("getDisplayText",(e=>void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.value)),xs("selectsOver",!0),xs("populateFromBrowse",!0)]),Ri("onSetValue"),Ni("onExecute"),Ri("onItemExecute"),xs("inputClasses",[]),xs("inputAttributes",{}),xs("inputStyles",{}),xs("matchWidth",!0),xs("useMinWidth",!1),xs("dismissOnBlur",!0),Ii(["openClass"]),ms("initialData"),yu("typeaheadBehaviours",[ah,vu,OT,Gp,ph,fS]),ts("lazyTypeaheadComp",(()=>As(A.none))),ts("previewing",(()=>As(!0)))].concat(Nv()).concat(IS())),DT=x([qu({schema:[Bi()],name:"menu",overrides:e=>({fakeFocus:!0,onHighlightItem:(t,o,n)=>{e.previewing.get()?e.lazyTypeaheadComp.get().each((t=>{((e,t,o)=>{if(e.selectsOver){const n=vu.getValue(t),s=e.getDisplayText(n),r=vu.getValue(o);return 0===e.getDisplayText(r).indexOf(s)?A.some((()=>{_T(0,t,o),((e,t)=>{TT(e,((e,o)=>e.setSelectionRange(t,o.length)))})(t,s.length)})):A.none()}return A.none()})(e.model,t,n).fold((()=>{e.model.selectsOver?(Xm.dehighlight(o,n),e.previewing.set(!0)):e.previewing.set(!1)}),(t=>{t(),e.previewing.set(!1)}))})):e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&_T(e.model,t,n),Tt(n.element,"id").each((e=>Ct(t.element,"aria-activedescendant",e)))}))},onExecute:(t,o)=>e.lazyTypeaheadComp.get().map((e=>(Rr(e,AT(),{item:o}),!0))),onHover:(t,o)=>{e.previewing.set(!1),e.lazyTypeaheadComp.get().each((t=>{e.model.populateFromBrowse&&_T(e.model,t,o)}))}})})]),BT=wm({name:"Typeahead",configFields:MT(),partFields:DT(),factory:(e,t,o,n)=>{const s=(t,o,s)=>{e.previewing.set(!1);const r=fS.getCoupled(t,"sandbox");if(Zd.isOpen(r))Om.getCurrent(r).each((e=>{Xm.getHighlighted(e).fold((()=>{s(e)}),(()=>{Lr(r,e.element,"keydown",o)}))}));else{const o=e=>{Om.getCurrent(e).each(s)};_S(e,a(t),t,r,n,o,Uh.HighlightMenuAndItem).get(b)}},r=Vv(e),a=e=>t=>t.map((t=>{const o=fe(t.menus),n=Y(o,(e=>U(e.items,(e=>"item"===e.type))));return vu.getState(e).update(L(n,(e=>e.data))),t})),i=e=>Om.getCurrent(e),l="typeaheadevents",c=[ah.config({}),vu.config({onSetValue:e.onSetValue,store:{mode:"dataset",getDataKey:e=>Ka(e.element),getFallbackEntry:e=>({value:e,meta:{}}),setValue:(t,o)=>{Ja(t.element,e.model.getDisplayText(o))},...e.initialData.map((e=>Ds("initialValue",e))).getOr({})}}),OT.config({stream:{mode:"throttle",delay:e.responseTime,stopEvent:!1},onStream:(t,o)=>{const s=fS.getCoupled(t,"sandbox");if(ah.isFocused(t)&&Ka(t.element).length>=e.minChars){const o=i(s).bind((e=>Xm.getHighlighted(e).map(vu.getValue)));e.previewing.set(!0);const r=t=>{i(s).each((t=>{o.fold((()=>{e.model.selectsOver&&Xm.highlightFirst(t)}),(e=>{Xm.highlightBy(t,(t=>vu.getValue(t).value===e.value)),Xm.getHighlighted(t).orThunk((()=>(Xm.highlightFirst(t),A.none())))}))}))};_S(e,a(t),t,s,n,r,Uh.HighlightJustMenu).get(b)}},cancelEvent:br()}),Gp.config({mode:"special",onDown:(e,t)=>(s(e,t,Xm.highlightFirst),A.some(!0)),onEscape:e=>{const t=fS.getCoupled(e,"sandbox");return Zd.isOpen(t)?(Zd.close(t),A.some(!0)):A.none()},onUp:(e,t)=>(s(e,t,Xm.highlightLast),A.some(!0)),onEnter:t=>{const o=fS.getCoupled(t,"sandbox"),n=Zd.isOpen(o);if(n&&!e.previewing.get())return i(o).bind((e=>Xm.getHighlighted(e))).map((e=>(Rr(t,AT(),{item:e}),!0)));{const s=vu.getValue(t);return Fr(t,br()),e.onExecute(o,t,s),n&&Zd.close(o),A.some(!0)}}}),ph.config({toggleClass:e.markers.openClass,aria:{mode:"expanded"}}),fS.config({others:{sandbox:t=>DS(e,t,{onOpen:()=>ph.on(t),onClose:()=>{e.lazyTypeaheadComp.get().each((e=>At(e.element,"aria-activedescendant"))),ph.off(t)}})}}),th(l,[Jr((t=>{e.lazyTypeaheadComp.set(A.some(t))})),Zr((t=>{e.lazyTypeaheadComp.set(A.none())})),ea((t=>{const o=b;ES(e,a(t),t,n,o,Uh.HighlightMenuAndItem).get(b)})),Wr(AT(),((t,o)=>{const n=fS.getCoupled(t,"sandbox");_T(e.model,t,o.event.item),Fr(t,br()),e.onItemExecute(t,n,o.event.item,vu.getValue(t)),Zd.close(n),ET(t)}))].concat(e.dismissOnBlur?[Wr(cr(),(e=>{const t=fS.getCoupled(e,"sandbox");Ll(t.element).isNone()&&Zd.close(t)}))]:[]))],d={[Cr()]:[vu.name(),OT.name(),l],...e.eventOrder};return{uid:e.uid,dom:Lv(bn(e,{inputAttributes:{role:"combobox","aria-autocomplete":"list","aria-haspopup":"true"}})),behaviours:{...r,...wu(e.typeaheadBehaviours,c)},eventOrder:d}}}),IT=e=>({...e,toCached:()=>IT(e.toCached()),bindFuture:t=>IT(e.bind((e=>e.fold((e=>SS(rn.error(e))),(e=>t(e)))))),bindResult:t=>IT(e.map((e=>e.bind(t)))),mapResult:t=>IT(e.map((e=>e.map(t)))),mapError:t=>IT(e.map((e=>e.mapError(t)))),foldResult:(t,o)=>e.map((e=>e.fold(t,o))),withTimeout:(t,o)=>IT(wS((n=>{let s=!1;const r=setTimeout((()=>{s=!0,n(rn.error(o()))}),t);e.get((e=>{s||(clearTimeout(r),n(e))}))})))}),FT=e=>IT(wS(e)),RT=(e,t,o=[],n,s,r)=>{const a=t.fold((()=>({})),(e=>({action:e}))),i={buttonBehaviours:Tl([_x((()=>!e.enabled||r.isDisabled())),Ox(),pk.config({}),th("button press",[Ur("click"),Ur("mousedown")])].concat(o)),eventOrder:{click:["button press","alloy.base.behaviour"],mousedown:["button press","alloy.base.behaviour"]},...a},l=bn(i,{dom:n});return bn(l,{components:s})},NT=(e,t,o,n=[])=>{const s={tag:"button",classes:["tox-tbtn"],attributes:e.tooltip.map((e=>({"aria-label":o.translate(e),title:o.translate(e)}))).getOr({})},r=e.icon.map((e=>C_(e,o.icons))),a=Fx([r]);return RT(e,t,n,s,a,o)},VT=e=>{switch(e){case"primary":return["tox-button"];case"toolbar":return["tox-tbtn"];default:return["tox-button","tox-button--secondary"]}},zT=(e,t,o,n=[],s=[])=>{const r=o.translate(e.text),a=e.icon.map((e=>C_(e,o.icons))),i=[a.getOrThunk((()=>ri(r)))],l=e.buttonType.getOr(e.primary||e.borderless?"primary":"secondary"),c=[...VT(l),...a.isSome()?["tox-button--icon"]:[],...e.borderless?["tox-button--naked"]:[],...s];return RT(e,t,n,{tag:"button",classes:c,attributes:{title:r}},i,o)},LT=(e,t,o,n=[],s=[])=>{const r=zT(e,A.some(t),o,n,s);return qh.sketch(r)},HT=(e,t)=>o=>{"custom"===t?Rr(o,kk,{name:e,value:{}}):"submit"===t?Fr(o,Ck):"cancel"===t?Fr(o,Sk):console.error("Unknown button type: ",t)},PT=(e,t,o)=>{if(((e,t)=>"menu"===t)(0,t)){const t=()=>r,n=e,s={...e,type:"menubutton",search:A.none(),onSetup:t=>(t.setEnabled(e.enabled),b),fetch:uT(n.items,t,o)},r=Xh(dT(s,"tox-tbtn",o,A.none()));return r.asSpec()}if(((e,t)=>"custom"===t||"cancel"===t||"submit"===t)(0,t)){const n=HT(e.name,t),s={...e,borderless:!1};return LT(s,n,o.shared.providers,[])}if(((e,t)=>"togglebutton"===t)(0,t))return((e,t)=>{var o,n;const s=e.icon.map((e=>O_(e,t.icons))).map(Xh),r=e.buttonType.getOr(e.primary?"primary":"secondary"),a={...e,name:null!==(o=e.name)&&void 0!==o?o:"",primary:"primary"===r,tooltip:A.from(e.tooltip),enabled:null!==(n=e.enabled)&&void 0!==n&&n,borderless:!1},i=a.tooltip.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),l=VT(null!=r?r:"secondary"),c=e.icon.isSome()&&e.text.isSome(),d={tag:"button",classes:[...l.concat(e.icon.isSome()?["tox-button--icon"]:[]),...e.active?["tox-button--enabled"]:[],...c?["tox-button--icon-and-text"]:[]],attributes:i},u=t.translate(e.text.getOr("")),m=ri(u),g=[...Fx([s.map((e=>e.asSpec()))]),...e.text.isSome()?[m]:[]],p=RT(a,A.some((o=>{Rr(o,kk,{name:e.name,value:{setIcon:e=>{s.map((n=>n.getOpt(o).each((o=>{eh.set(o,[O_(e,t.icons)])}))))}}})})),[],d,g,t);return qh.sketch(p)})(e,o.shared.providers);throw console.error("Unknown footer button type: ",t),new Error("Unknown footer button type")},UT={type:"separator"},WT=e=>({type:"menuitem",value:e.url,text:e.title,meta:{attach:e.attach},onAction:b}),jT=(e,t)=>({type:"menuitem",value:t,text:e,meta:{attach:void 0},onAction:b}),GT=(e,t)=>(e=>L(e,WT))(((e,t)=>U(t,(t=>t.type===e)))(e,t)),$T=e=>GT("header",e.targets),qT=e=>GT("anchor",e.targets),YT=e=>A.from(e.anchorTop).map((e=>jT("<top>",e))).toArray(),XT=e=>A.from(e.anchorBottom).map((e=>jT("<bottom>",e))).toArray(),KT=(e,t)=>{const o=e.toLowerCase();return U(t,(e=>{var t;const n=void 0!==e.meta&&void 0!==e.meta.text?e.meta.text:e.text,s=null!==(t=e.value)&&void 0!==t?t:"";return Te(n.toLowerCase(),o)||Te(s.toLowerCase(),o)}))},JT=ca("aria-invalid"),ZT=(e,t)=>{e.dom.checked=t},QT=e=>e.dom.checked,eE=e=>(t,o,n,s)=>be(o,"name").fold((()=>e(o,s,A.none())),(r=>t.field(r,e(o,s,be(n,r))))),tE={bar:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-bar","tox-form__controls-h-stack"]},components:L(e.items,t.interpreter)}))(e,t.shared))),collection:eE(((e,t,o)=>Ak(e,t.shared.providers,o))),alertbanner:eE(((e,t)=>((e,t)=>{const o=Qf(e.icon,t.icons);return ik.sketch({dom:{tag:"div",attributes:{role:"alert"},classes:["tox-notification","tox-notification--in",`tox-notification--${e.level}`]},components:[{dom:{tag:"div",classes:["tox-notification__icon"],innerHtml:e.url?void 0:o},components:e.url?[qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--naked","tox-button--icon"],innerHtml:o,attributes:{title:t.translate(e.iconTooltip)}},action:t=>Rr(t,kk,{name:"alert-banner",value:e.url}),buttonBehaviours:Tl([eb()])})]:void 0},{dom:{tag:"div",classes:["tox-notification__body"],innerHtml:t.translate(e.text)}}]})})(e,t.shared.providers))),input:eE(((e,t,o)=>((e,t,o)=>$_({name:e.name,multiline:!1,label:e.label,inputMode:e.inputMode,placeholder:e.placeholder,flex:!1,disabled:!e.enabled,classname:"tox-textfield",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),textarea:eE(((e,t,o)=>((e,t,o)=>$_({name:e.name,multiline:!0,label:e.label,inputMode:A.none(),placeholder:e.placeholder,flex:!0,disabled:!e.enabled,classname:"tox-textarea",validation:A.none(),maximized:e.maximized,data:o},t))(e,t.shared.providers,o))),label:eE(((e,t)=>((e,t)=>{const o="tox-label";return{dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"label",classes:[o,..."center"===e.align?[`${o}--center`]:[],..."end"===e.align?[`${o}--end`]:[]]},components:[ri(t.providers.translate(e.label))]},...L(e.items,t.interpreter)],behaviours:Tl([HO(),eh.config({}),(n=A.none(),GO(n,ta,oa)),Gp.config({mode:"acyclic"})])};var n})(e,t.shared))),iframe:(TA=(e,t,o)=>((e,t,o)=>{const n="tox-dialog__iframe",s=e.transparent?[]:[`${n}--opaque`],r=e.border?["tox-navobj-bordered"]:[],a={...e.label.map((e=>({title:e}))).getOr({}),...o.map((e=>({srcdoc:e}))).getOr({}),...e.sandboxed?{sandbox:"allow-scripts allow-same-origin"}:{}},i=((e,t)=>{const o=As(e.getOr(""));return{getValue:e=>o.get(),setValue:(e,n)=>{if(o.get()!==n){const o=e.element,s=()=>Ct(o,"srcdoc",n);t?v_.fold(x(b_),(e=>e.throttle))(o,n,s):s()}o.set(n)}}})(o,e.streamContent),l=e.label.map((e=>yk(e,t))),c=uk.parts.field({factory:{sketch:e=>e_(A.from(r),{uid:e.uid,dom:{tag:"iframe",attributes:a,classes:[n,...s]},behaviours:Tl([pk.config({}),ah.config({}),jO(o,i.getValue,i.setValue),Il.config({channels:{[c_]:{onReceive:(e,t)=>{t.newFocus.each((t=>{at(e.element).each((o=>{(Qe(e.element,t)?Wa:Ga)(o,"tox-navobj-bordered-focus")}))}))}}}})])})}});return fk(l,c,["tox-form__group--stretched"],[])})(e,t.shared.providers,o),(e,t,o,n)=>{const s=bn(t,{source:"dynamic"});return eE(TA)(e,s,o,n)}),button:eE(((e,t)=>((e,t)=>{const o=HT(e.name,"custom");return n=A.none(),s=uk.parts.field({factory:qh,...zT(e,A.some(o),t,[$O(""),HO()])}),fk(n,s,[],[]);var n,s})(e,t.shared.providers))),checkbox:eE(((e,t,o)=>((e,t,o)=>{const n=e=>(e.element.dom.click(),A.some(!0)),s=uk.parts.field({factory:{sketch:w},dom:{tag:"input",classes:["tox-checkbox__input"],attributes:{type:"checkbox"}},behaviours:Tl([HO(),Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{at(e.element).each((e=>Wa(e,"tox-checkbox--disabled")))},onEnabled:e=>{at(e.element).each((e=>Ga(e,"tox-checkbox--disabled")))}}),pk.config({}),ah.config({}),GO(o,QT,ZT),Gp.config({mode:"special",onEnter:n,onSpace:n,stopSpaceKeyup:!0}),th("checkbox-events",[Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])])}),r=uk.parts.label({dom:{tag:"span",classes:["tox-checkbox__label"]},components:[ri(t.translate(e.label))],behaviours:Tl([Hk.config({})])}),a=e=>ob("checked"===e?"selected":"unselected",{tag:"span",classes:["tox-icon","tox-checkbox-icon__"+e]},t.icons),i=Xh({dom:{tag:"div",classes:["tox-checkbox__icons"]},components:[a("checked"),a("unchecked")]});return uk.sketch({dom:{tag:"label",classes:["tox-checkbox"]},components:[s,i.asSpec(),r],fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox()])})})(e,t.shared.providers,o))),colorinput:eE(((e,t,o)=>((e,t,o,n)=>{const s=uk.parts.field({factory:Hv,inputClasses:["tox-textfield"],data:n,onSetValue:e=>Lk.run(e).get(b),inputBehaviours:Tl([Lm.config({disabled:t.providers.isDisabled}),Ox(),pk.config({}),Lk.config({invalidClass:"tox-textbox-field-invalid",getRoot:e=>at(e.element),notify:{onValid:e=>{const t=vu.getValue(e);Rr(e,Pk,{color:t})}},validator:{validateOnLoad:!1,validate:e=>{const t=vu.getValue(e);if(0===t.length)return SS(rn.value(!0));{const e=Ne("span");Bt(e,"background-color",t);const o=Vt(e,"background-color").fold((()=>rn.error("blah")),(e=>rn.value(t)));return SS(o)}}}})]),selectOnFocus:!1}),r=e.label.map((e=>yk(e,t.providers))),a=(e,t)=>{Rr(e,Uk,{value:t})},i=Xh(((e,t)=>NS.sketch({dom:e.dom,components:e.components,toggleClass:"mce-active",dropdownBehaviours:Tl([_x(t.providers.isDisabled),Ox(),Hk.config({}),pk.config({})]),layouts:e.layouts,sandboxClasses:["tox-dialog__popups"],lazySink:t.getSink,fetch:o=>wS((t=>e.fetch(t))).map((n=>A.from(jS(bn(nS(ca("menu-value"),n,(t=>{e.onItemAction(o,t)}),e.columns,e.presets,bv.CLOSE_ON_EXECUTE,T,t.providers),{movement:rS(e.columns,e.presets)}))))),parts:{menu:Rv(0,0,e.presets)}}))({dom:{tag:"span",attributes:{"aria-label":t.providers.translate("Color swatch")}},layouts:{onRtl:()=>[cl,ll,gl],onLtr:()=>[ll,cl,gl]},components:[],fetch:Xw(o.getColors(e.storageKey),e.storageKey,o.hasCustomColors()),columns:o.getColorCols(e.storageKey),presets:"color",onItemAction:(t,n)=>{i.getOpt(t).each((t=>{"custom"===n?o.colorPicker((o=>{o.fold((()=>Fr(t,Wk)),(o=>{a(t,o),Ew(e.storageKey,o)}))}),"#ffffff"):a(t,"remove"===n?"":n)}))}},t));return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:r.toArray().concat([{dom:{tag:"div",classes:["tox-color-input"]},components:[s,i.asSpec()]}]),fieldBehaviours:Tl([th("form-field-events",[Wr(Pk,((t,o)=>{i.getOpt(t).each((e=>{Bt(e.element,"background-color",o.event.color)})),Rr(t,xk,{name:e.name})})),Wr(Uk,((e,t)=>{uk.getField(e).each((o=>{vu.setValue(o,t.event.value),Om.getCurrent(e).each(ah.focus)}))})),Wr(Wk,((e,t)=>{uk.getField(e).each((t=>{Om.getCurrent(e).each(ah.focus)}))}))])])})})(e,t.shared,t.colorinput,o))),colorpicker:eE(((e,t,o)=>((e,t,o)=>{const n=e=>"tox-"+e,s=LO((e=>t=>r(t)?e.translate(qO[t]):e.translate(t))(t),n),a=Xh(s.sketch({dom:{tag:"div",classes:[n("color-picker-container")],attributes:{role:"presentation"}},onValidHex:e=>{Rr(e,kk,{name:"hex-valid",value:!0})},onInvalidHex:e=>{Rr(e,kk,{name:"hex-valid",value:!1})}}));return{dom:{tag:"div"},components:[a.asSpec()],behaviours:Tl([jO(o,(e=>{const t=a.get(e);return Om.getCurrent(t).bind((e=>vu.getValue(e).hex)).map((e=>"#"+_e(e,"#"))).getOr("")}),((e,t)=>{const o=A.from(/^#([a-fA-F0-9]{3}(?:[a-fA-F0-9]{3})?)/.exec(t)).bind((e=>te(e,1))),n=a.get(e);Om.getCurrent(n).fold((()=>{console.log("Can not find form")}),(e=>{vu.setValue(e,{hex:o.getOr("")}),IO.getField(e,"hex").each((e=>{Fr(e,Qs())}))}))})),HO()])}})(0,t.shared.providers,o))),dropzone:eE(((e,t,o)=>((e,t,o)=>{const n=(e,t)=>{t.stop()},s=e=>(t,o)=>{H(e,(e=>{e(t,o)}))},r=(e,t)=>{var o;if(!Lm.isDisabled(e)){const n=t.event.raw;i(e,null===(o=n.dataTransfer)||void 0===o?void 0:o.files)}},a=(e,t)=>{const o=t.event.raw.target;i(e,o.files)},i=(o,n)=>{n&&(vu.setValue(o,((e,t)=>{const o=XO.explode(t.getOption("images_file_types"));return U(se(e),(e=>N(o,(t=>Ae(e.name.toLowerCase(),`.${t.toLowerCase()}`)))))})(n,t)),Rr(o,xk,{name:e.name}))},l=Xh({dom:{tag:"input",attributes:{type:"file",accept:"image/*"},styles:{display:"none"}},behaviours:Tl([th("input-file-events",[Yr(tr()),Yr(pr())])])}),c=e.label.map((e=>yk(e,t))),d=uk.parts.field({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-dropzone-container"]},behaviours:Tl([$O(o.getOr([])),HO(),Lm.config({}),ph.config({toggleClass:"dragenter",toggleOnExecute:!1}),th("dropzone-events",[Wr("dragenter",s([n,ph.toggle])),Wr("dragleave",s([n,ph.toggle])),Wr("dragover",n),Wr("drop",s([n,r])),Wr(er(),a)])]),components:[{dom:{tag:"div",classes:["tox-dropzone"],styles:{}},components:[{dom:{tag:"p"},components:[ri(t.translate("Drop an image here"))]},qh.sketch({dom:{tag:"button",styles:{position:"relative"},classes:["tox-button","tox-button--secondary"]},components:[ri(t.translate("Browse for an image")),l.asSpec()],action:e=>{l.get(e).element.dom.click()},buttonBehaviours:Tl([pk.config({}),_x(t.isDisabled),Ox()])})]}]})}});return fk(c,d,["tox-form__group--stretched"],[])})(e,t.shared.providers,o))),grid:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:["tox-form__grid",`tox-form__grid--${e.columns}col`]},components:L(e.items,t.interpreter)}))(e,t.shared))),listbox:eE(((e,t,o)=>((e,t,o)=>{const n=t.shared.providers,s=o.bind((t=>V_(e.items,t))).orThunk((()=>oe(e.items).filter(F_))),r=e.label.map((e=>yk(e,n))),a=uk.parts.field({dom:{},factory:{sketch:o=>A_({uid:o.uid,text:s.map((e=>e.text)),icon:A.none(),tooltip:e.label,role:A.none(),fetch:(o,n)=>{const s=N_(o,e.name,e.items,vu.getValue(o));n(I_(s,bv.CLOSE_ON_EXECUTE,t,{isHorizontalMenu:!1,search:A.none()}))},onSetup:x(b),getApi:x({}),columns:1,presets:"normal",classes:[],dropdownBehaviours:[pk.config({}),jO(s.map((e=>e.value)),(e=>_t(e.element,R_)),((t,o)=>{V_(e.items,o).each((e=>{Ct(t.element,R_,e.value),Rr(t,T_,{text:e.text})}))}))]},"tox-listbox",t.shared)}}),i={dom:{tag:"div",classes:["tox-listboxfield"]},components:[a]};return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([r.toArray(),[i]]),fieldBehaviours:Tl([Lm.config({disabled:x(!e.enabled),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}})])})})(e,t,o))),selectbox:eE(((e,t,o)=>((e,t,o)=>{const n=L(e.items,(e=>({text:t.translate(e.text),value:e.value}))),s=e.label.map((e=>yk(e,t))),r=uk.parts.field({dom:{},...o.map((e=>({data:e}))).getOr({}),selectAttributes:{size:e.size},options:n,factory:z_,selectBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),pk.config({}),th("selectbox-change",[Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])])}),a=e.size>1?A.none():A.some(ob("chevron-down",{tag:"div",classes:["tox-selectfield__icon-js"]},t.icons)),i={dom:{tag:"div",classes:["tox-selectfield"]},components:q([[r],a.toArray()])};return uk.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:q([s.toArray(),[i]]),fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable)}}),Ox()])})})(e,t.shared.providers,o))),sizeinput:eE(((e,t)=>((e,t)=>{let o=G_;const n=ca("ratio-event"),s=e=>ob(e,{tag:"span",classes:["tox-icon","tox-lock-icon__"+e]},t.icons),r=U_.parts.lock({dom:{tag:"button",classes:["tox-lock","tox-button","tox-button--naked","tox-button--icon"],attributes:{title:t.translate(e.label.getOr("Constrain proportions"))}},components:[s("lock"),s("unlock")],buttonBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox(),pk.config({})])}),a=e=>({dom:{tag:"div",classes:["tox-form__group"]},components:e}),i=o=>uk.parts.field({factory:Hv,inputClasses:["tox-textfield"],inputBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled()}),Ox(),pk.config({}),th("size-input-events",[Wr(Xs(),((e,t)=>{Rr(e,n,{isField1:o})})),Wr(er(),((t,o)=>{Rr(t,xk,{name:e.name})}))])]),selectOnFocus:!1}),l=e=>({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e))]}),c=U_.parts.field1(a([uk.parts.label(l("Width")),i(!0)])),d=U_.parts.field2(a([uk.parts.label(l("Height")),i(!1)]));return U_.sketch({dom:{tag:"div",classes:["tox-form__group"]},components:[{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:[c,d,a([l("\xa0"),r])]}],field1Name:"width",field2Name:"height",locked:!0,markers:{lockClass:"tox-locked"},onLockedChange:(e,t,n)=>{W_(vu.getValue(e)).each((e=>{o(e).each((e=>{vu.setValue(t,(e=>{const t={"":0,px:0,pt:1,mm:1,pc:2,ex:2,em:2,ch:2,rem:2,cm:3,in:4,"%":4};let o=e.value.toFixed((n=e.unit)in t?t[n]:1);var n;return-1!==o.indexOf(".")&&(o=o.replace(/\.?0*$/,"")),o+e.unit})(e))}))}))},coupledFieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||t.isDisabled(),onDisabled:e=>{U_.getField1(e).bind(uk.getField).each(Lm.disable),U_.getField2(e).bind(uk.getField).each(Lm.disable),U_.getLock(e).each(Lm.disable)},onEnabled:e=>{U_.getField1(e).bind(uk.getField).each(Lm.enable),U_.getField2(e).bind(uk.getField).each(Lm.enable),U_.getLock(e).each(Lm.enable)}}),Ox(),th("size-input-events2",[Wr(n,((e,t)=>{const n=t.event.isField1,s=n?U_.getField1(e):U_.getField2(e),r=n?U_.getField2(e):U_.getField1(e),a=s.map(vu.getValue).getOr(""),i=r.map(vu.getValue).getOr("");o=((e,t)=>{const o=W_(e).toOptional(),n=W_(t).toOptional();return Se(o,n,((e,t)=>j_(e,t.unit).map((e=>t.value/e)).map((e=>{return o=e,n=t.unit,e=>j_(e,n).map((e=>({value:e*o,unit:n})));var o,n})).getOr(G_))).getOr(G_)})(a,i)}))])])})})(e,t.shared.providers))),slider:eE(((e,t,o)=>((e,t,o)=>{const n=OO.parts.label({dom:{tag:"label",classes:["tox-label"]},components:[ri(t.translate(e.label))]}),s=OO.parts.spectrum({dom:{tag:"div",classes:["tox-slider__rail"],attributes:{role:"presentation"}}}),r=OO.parts.thumb({dom:{tag:"div",classes:["tox-slider__handle"],attributes:{role:"presentation"}}});return OO.sketch({dom:{tag:"div",classes:["tox-slider"],attributes:{role:"presentation"}},model:{mode:"x",minX:e.min,maxX:e.max,getInitialValue:x(o.getOrThunk((()=>(Math.abs(e.max)-Math.abs(e.min))/2)))},components:[n,s,r],sliderBehaviours:Tl([HO(),ah.config({})]),onChoose:(t,o,n)=>{Rr(t,xk,{name:e.name,value:n})}})})(e,t.shared.providers,o))),urlinput:eE(((e,t,o)=>((e,t,o,n)=>{const s=t.shared.providers,r=t=>{const n=vu.getValue(t);o.addToHistory(n.value,e.filetype)},a={...n.map((e=>({initialData:e}))).getOr({}),dismissOnBlur:!0,inputClasses:["tox-textfield"],sandboxClasses:["tox-dialog__popups"],inputAttributes:{"aria-errormessage":JT,type:"url"},minChars:0,responseTime:0,fetch:n=>{const s=((e,t,o)=>{var n,s;const r=vu.getValue(t),a=null!==(s=null===(n=null==r?void 0:r.meta)||void 0===n?void 0:n.text)&&void 0!==s?s:r.value;return o.getLinkInformation().fold((()=>[]),(t=>{const n=KT(a,(e=>L(e,(e=>jT(e,e))))(o.getHistory(e)));return"file"===e?(s=[n,KT(a,$T(t)),KT(a,q([YT(t),qT(t),XT(t)]))],j(s,((e,t)=>0===e.length||0===t.length?e.concat(t):e.concat(UT,t)),[])):n;var s}))})(e.filetype,n,o),r=I_(s,bv.BUBBLE_TO_SANDBOX,t,{isHorizontalMenu:!1,search:A.none()});return SS(r)},getHotspot:e=>g.getOpt(e),onSetValue:(e,t)=>{e.hasConfigured(Lk)&&Lk.run(e).get(b)},typeaheadBehaviours:Tl([...o.getValidationHandler().map((t=>Lk.config({getRoot:e=>at(e.element),invalidClass:"tox-control-wrap--status-invalid",notify:{onInvalid:(e,t)=>{c.getOpt(e).each((e=>{Ct(e.element,"title",s.translate(t))}))}},validator:{validate:o=>{const n=vu.getValue(o);return FT((o=>{t({type:e.filetype,url:n.value},(e=>{if("invalid"===e.status){const t=rn.error(e.message);o(t)}else{const t=rn.value(e.message);o(t)}}))}))},validateOnLoad:!1}}))).toArray(),Lm.config({disabled:()=>!e.enabled||s.isDisabled()}),pk.config({}),th("urlinput-events",[Wr(Qs(),(t=>{const o=Ka(t.element),n=o.trim();n!==o&&Ja(t.element,n),"file"===e.filetype&&Rr(t,xk,{name:e.name})})),Wr(er(),(t=>{Rr(t,xk,{name:e.name}),r(t)})),Wr(dr(),(t=>{Rr(t,xk,{name:e.name}),r(t)}))])]),eventOrder:{[Qs()]:["streaming","urlinput-events","invalidating"]},model:{getDisplayText:e=>e.value,selectsOver:!1,populateFromBrowse:!1},markers:{openClass:"tox-textfield--popup-open"},lazySink:t.shared.getSink,parts:{menu:Rv(0,0,"normal")},onExecute:(e,t,o)=>{Rr(t,Ck,{})},onItemExecute:(t,o,n,s)=>{r(t),Rr(t,xk,{name:e.name})}},i=uk.parts.field({...a,factory:BT}),l=e.label.map((e=>yk(e,s))),c=Xh(((e,t,o=e,n=e)=>ob(o,{tag:"div",classes:["tox-icon","tox-control-wrap__status-icon-"+e],attributes:{title:s.translate(n),"aria-live":"polite",...t.fold((()=>({})),(e=>({id:e})))}},s.icons))("invalid",A.some(JT),"warning")),d=Xh({dom:{tag:"div",classes:["tox-control-wrap__status-icon-wrap"]},components:[c.asSpec()]}),u=o.getUrlPicker(e.filetype),m=ca("browser.url.event"),g=Xh({dom:{tag:"div",classes:["tox-control-wrap"]},components:[i,d.asSpec()],behaviours:Tl([Lm.config({disabled:()=>!e.enabled||s.isDisabled()})])}),p=Xh(LT({name:e.name,icon:A.some("browse"),text:e.picker_text.or(e.label).getOr(""),enabled:e.enabled,primary:!1,buttonType:A.none(),borderless:!0},(e=>Fr(e,m)),s,[],["tox-browse-url"]));return uk.sketch({dom:vk([]),components:l.toArray().concat([{dom:{tag:"div",classes:["tox-form__controls-h-stack"]},components:q([[g.asSpec()],u.map((()=>p.asSpec())).toArray()])}]),fieldBehaviours:Tl([Lm.config({disabled:()=>!e.enabled||s.isDisabled(),onDisabled:e=>{uk.getField(e).each(Lm.disable),p.getOpt(e).each(Lm.disable)},onEnabled:e=>{uk.getField(e).each(Lm.enable),p.getOpt(e).each(Lm.enable)}}),Ox(),th("url-input-events",[Wr(m,(t=>{Om.getCurrent(t).each((o=>{const n=vu.getValue(o),s={fieldname:e.name,...n};u.each((n=>{n(s).get((n=>{vu.setValue(o,n),Rr(t,xk,{name:e.name})}))}))}))}))])])})})(e,t,t.urlinput,o))),customeditor:eE((e=>{const t=nc(),o=Xh({dom:{tag:e.tag}}),n=nc();return{dom:{tag:"div",classes:["tox-custom-editor"]},behaviours:Tl([th("custom-editor-events",[Jr((s=>{o.getOpt(s).each((o=>{((e=>ve(e,"init"))(e)?e.init(o.element.dom):YO.load(e.scriptId,e.scriptUrl).then((t=>t(o.element.dom,e.settings)))).then((e=>{n.on((t=>{e.setValue(t)})),n.clear(),t.set(e)}))}))}))]),jO(A.none(),(()=>t.get().fold((()=>n.get().getOr("")),(e=>e.getValue()))),((e,o)=>{t.get().fold((()=>n.set(o)),(e=>e.setValue(o)))})),HO()]),components:[o.asSpec()]}})),htmlpanel:eE((e=>"presentation"===e.presets?ik.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html}}):ik.sketch({dom:{tag:"div",classes:["tox-form__group"],innerHtml:e.html,attributes:{role:"document"}},containerBehaviours:Tl([pk.config({}),ah.config({})])}))),imagepreview:eE(((e,t,o)=>((e,t)=>{const o=As(t.getOr({url:""})),n=Xh({dom:{tag:"img",classes:["tox-imagepreview__image"],attributes:t.map((e=>({src:e.url}))).getOr({})}}),s=Xh({dom:{tag:"div",classes:["tox-imagepreview__container"],attributes:{role:"presentation"}},components:[n.asSpec()]}),r={};e.height.each((e=>r.height=e));const a=t.map((e=>({url:e.url,zoom:A.from(e.zoom),cachedWidth:A.from(e.cachedWidth),cachedHeight:A.from(e.cachedHeight)})));return{dom:{tag:"div",classes:["tox-imagepreview"],styles:r,attributes:{role:"presentation"}},components:[s.asSpec()],behaviours:Tl([HO(),jO(a,(()=>o.get()),((e,t)=>{const r={url:t.url};t.zoom.each((e=>r.zoom=e)),t.cachedWidth.each((e=>r.cachedWidth=e)),t.cachedHeight.each((e=>r.cachedHeight=e)),o.set(r);const a=()=>{const{cachedWidth:t,cachedHeight:o,zoom:n}=r;if(!u(t)&&!u(o)){if(u(n)){const n=((e,t,o)=>{const n=Zt(e),s=jt(e);return Math.min(n/t,s/o,1)})(e.element,t,o);r.zoom=n}const a=((e,t,o,n,s)=>{const r=o*s,a=n*s,i=Math.max(0,e/2-r/2),l=Math.max(0,t/2-a/2);return{left:i.toString()+"px",top:l.toString()+"px",width:r.toString()+"px",height:a.toString()+"px"}})(Zt(e.element),jt(e.element),t,o,r.zoom);s.getOpt(e).each((e=>{It(e.element,a)}))}};n.getOpt(e).each((o=>{const n=o.element;var s;t.url!==_t(n,"src")&&(Ct(n,"src",t.url),Ga(e.element,"tox-imagepreview__loaded")),a(),(s=n,new Promise(((e,t)=>{const o=()=>{r(),e(s)},n=[rc(s,"load",o),rc(s,"error",(()=>{r(),t("Unable to load data from image: "+s.dom.src)}))],r=()=>H(n,(e=>e.unbind()));s.dom.complete&&o()}))).then((t=>{e.getSystem().isConnected()&&(Wa(e.element,"tox-imagepreview__loaded"),r.cachedWidth=t.dom.naturalWidth,r.cachedHeight=t.dom.naturalHeight,a())}))}))}))])}})(e,o))),table:eE(((e,t)=>((e,t)=>{const o=e=>({dom:{tag:"td",innerHtml:t.translate(e)}});return{dom:{tag:"table",classes:["tox-dialog__table"]},components:[(s=e.header,{dom:{tag:"thead"},components:[{dom:{tag:"tr"},components:L(s,(e=>({dom:{tag:"th",innerHtml:t.translate(e)}})))}]}),(n=e.cells,{dom:{tag:"tbody"},components:L(n,(e=>({dom:{tag:"tr"},components:L(e,o)})))})],behaviours:Tl([pk.config({}),ah.config({})])};var n,s})(e,t.shared.providers))),tree:eE(((e,t)=>((e,t)=>{const o=e.onLeafAction.getOr(b),n=e.onToggleExpand.getOr(b),s=e.defaultExpandedIds,r=As(s),a=As(e.defaultSelectedId),i=ca("tree-id"),l=(n,s)=>e.items.map((e=>"leaf"===e.type?pT({leaf:e,selectedId:n,onLeafAction:o,visible:!0,treeId:i,backstage:t}):yT({directory:e,selectedId:n,onLeafAction:o,expandedIds:s,labelTabstopping:!0,treeId:i,backstage:t})));return{dom:{tag:"div",classes:["tox-tree"],attributes:{role:"tree"}},components:l(a.get(),r.get()),behaviours:Tl([Gp.config({mode:"flow",selector:".tox-tree--leaf__label--visible, .tox-tree--directory__label--visible",cycles:!1}),th(xT,[Wr("expand-tree-node",((e,t)=>{const{expanded:o,node:s}=t.event;r.set(o?[...r.get(),s]:r.get().filter((e=>e!==s))),n(r.get(),{expanded:o,node:s})}))]),Il.config({channels:{[`update-active-item-${i}`]:{onReceive:(e,t)=>{a.set(A.some(t.value)),eh.set(e,l(A.some(t.value),r.get()))}}}}),eh.config({})])}})(e,t))),panel:eE(((e,t)=>((e,t)=>({dom:{tag:"div",classes:e.classes},components:L(e.items,t.shared.interpreter)}))(e,t)))},oE={field:(e,t)=>t,record:x([])},nE=(e,t,o,n)=>{const s=bn(n,{shared:{interpreter:t=>sE(e,t,o,s)}});return sE(e,t,o,s)},sE=(e,t,o,n)=>be(tE,t.type).fold((()=>(console.error(`Unknown factory type "${t.type}", defaulting to container: `,t),t)),(s=>s(e,t,o,n))),rE=(e,t,o)=>sE(oE,e,t,o),aE="layout-inset",iE=e=>e.x,lE=(e,t)=>e.x+e.width/2-t.width/2,cE=(e,t)=>e.x+e.width-t.width,dE=e=>e.y,uE=(e,t)=>e.y+e.height-t.height,mE=(e,t)=>e.y+e.height/2-t.height/2,gE=(e,t,o)=>Ui(cE(e,t),uE(e,t),o.insetSouthwest(),qi(),"southwest",el(e,{right:0,bottom:3}),aE),pE=(e,t,o)=>Ui(iE(e),uE(e,t),o.insetSoutheast(),$i(),"southeast",el(e,{left:1,bottom:3}),aE),hE=(e,t,o)=>Ui(cE(e,t),dE(e),o.insetNorthwest(),Gi(),"northwest",el(e,{right:0,top:2}),aE),fE=(e,t,o)=>Ui(iE(e),dE(e),o.insetNortheast(),ji(),"northeast",el(e,{left:1,top:2}),aE),bE=(e,t,o)=>Ui(lE(e,t),dE(e),o.insetNorth(),Yi(),"north",el(e,{top:2}),aE),vE=(e,t,o)=>Ui(lE(e,t),uE(e,t),o.insetSouth(),Xi(),"south",el(e,{bottom:3}),aE),yE=(e,t,o)=>Ui(cE(e,t),mE(e,t),o.insetEast(),Ji(),"east",el(e,{right:0}),aE),xE=(e,t,o)=>Ui(iE(e),mE(e,t),o.insetWest(),Ki(),"west",el(e,{left:1}),aE),wE=e=>{switch(e){case"north":return bE;case"northeast":return fE;case"northwest":return hE;case"south":return vE;case"southeast":return pE;case"southwest":return gE;case"east":return yE;case"west":return xE}},SE=(e,t,o,n,s)=>Zl(n).map(wE).getOr(bE)(e,t,o,n,s),kE=e=>{switch(e){case"north":return vE;case"northeast":return pE;case"northwest":return gE;case"south":return bE;case"southeast":return fE;case"southwest":return hE;case"east":return xE;case"west":return yE}},CE=(e,t,o,n,s)=>Zl(n).map(kE).getOr(bE)(e,t,o,n,s),OE={valignCentre:[],alignCentre:[],alignLeft:[],alignRight:[],right:[],left:[],bottom:[],top:[]},_E=(e,t,o)=>{const n={maxHeightFunction:gc()};return()=>o()?{type:"node",root:bt(ft(e())),node:A.from(e()),bubble:bc(12,12,OE),layouts:{onRtl:()=>[fE],onLtr:()=>[hE]},overrides:n}:{type:"hotspot",hotspot:t(),bubble:bc(-12,12,OE),layouts:{onRtl:()=>[ll,cl,gl],onLtr:()=>[cl,ll,gl]},overrides:n}},TE=(e,t,o,n)=>{const s={maxHeightFunction:gc()};return()=>n()?{type:"node",root:bt(ft(t())),node:A.from(t()),bubble:bc(12,12,OE),layouts:{onRtl:()=>[bE],onLtr:()=>[bE]},overrides:s}:e?{type:"node",root:bt(ft(t())),node:A.from(t()),bubble:bc(0,-Gt(t()),OE),layouts:{onRtl:()=>[ml],onLtr:()=>[ml]},overrides:s}:{type:"hotspot",hotspot:o(),bubble:bc(0,0,OE),layouts:{onRtl:()=>[ml],onLtr:()=>[ml]},overrides:s}},EE=(e,t,o)=>()=>o()?{type:"node",root:bt(ft(e())),node:A.from(e()),layouts:{onRtl:()=>[bE],onLtr:()=>[bE]}}:{type:"hotspot",hotspot:t(),layouts:{onRtl:()=>[gl],onLtr:()=>[gl]}},AE=(e,t)=>()=>({type:"selection",root:t(),getSelection:()=>{const t=e.selection.getRng(),o=e.model.table.getSelectedCells();if(o.length>1){const e=o[0],t=o[o.length-1],n={firstCell:ze(e),lastCell:ze(t)};return A.some(n)}return A.some(jc.range(ze(t.startContainer),t.startOffset,ze(t.endContainer),t.endOffset))}}),ME=e=>t=>({type:"node",root:e(),node:t}),DE=(e,t,o,n)=>{const s=iv(e),r=()=>ze(e.getBody()),a=()=>ze(e.getContentAreaContainer()),i=()=>s||!n();return{inlineDialog:_E(a,t,i),inlineBottomDialog:TE(e.inline,a,o,i),banner:EE(a,t,i),cursor:AE(e,r),node:ME(r)}},BE=e=>(t,o)=>{oS(e)(t,o)},IE=e=>()=>Uw(e),FE=e=>t=>zw(e,t),RE=e=>t=>Pw(e,t),NE=e=>()=>Pb(e),VE=e=>ye(e,"items"),zE=e=>ye(e,"format"),LE=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",format:"bold"},{title:"Italic",format:"italic"},{title:"Underline",format:"underline"},{title:"Strikethrough",format:"strikethrough"},{title:"Superscript",format:"superscript"},{title:"Subscript",format:"subscript"},{title:"Code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Align",items:[{title:"Left",format:"alignleft"},{title:"Center",format:"aligncenter"},{title:"Right",format:"alignright"},{title:"Justify",format:"alignjustify"}]}],HE=e=>j(e,((e,t)=>{if(ve(t,"items")){const o=HE(t.items);return{customFormats:e.customFormats.concat(o.customFormats),formats:e.formats.concat([{title:t.title,items:o.formats}])}}if(ve(t,"inline")||(e=>ve(e,"block"))(t)||(e=>ve(e,"selector"))(t)){const o=`custom-${r(t.name)?t.name:t.title.toLowerCase()}`;return{customFormats:e.customFormats.concat([{name:o,format:t}]),formats:e.formats.concat([{title:t.title,format:o,icon:t.icon}])}}return{...e,formats:e.formats.concat(t)}}),{customFormats:[],formats:[]}),PE=e=>xb(e).map((t=>{const o=((e,t)=>{const o=HE(t),n=t=>{H(t,(t=>{e.formatter.has(t.name)||e.formatter.register(t.name,t.format)}))};return e.formatter?n(o.customFormats):e.on("init",(()=>{n(o.customFormats)})),o.formats})(e,t);return wb(e)?LE.concat(o):o})).getOr(LE),UE=(e,t,o)=>({...e,type:"formatter",isSelected:t(e.format),getStylePreview:o(e.format)}),WE=(e,t,o,n)=>{const s=t=>L(t,(t=>VE(t)?(e=>{const t=s(e.items);return{...e,type:"submenu",getStyleItems:x(t)}})(t):zE(t)?(e=>UE(e,o,n))(t):(e=>{const t=ae(e);return 1===t.length&&R(t,"title")})(t)?{...t,type:"separator"}:(t=>{const s=r(t.name)?t.name:ca(t.title),a=`custom-${s}`,i={...t,type:"formatter",format:a,isSelected:o(a),getStylePreview:n(a)};return e.formatter.register(s,i),i})(t)));return s(t)},jE=XO.trim,GE=e=>t=>{if((e=>g(e)&&1===e.nodeType)(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},$E=GE("true"),qE=GE("false"),YE=(e,t,o,n,s)=>({type:e,title:t,url:o,level:n,attach:s}),XE=e=>e.innerText||e.textContent,KE=e=>(e=>e&&"A"===e.nodeName&&void 0!==(e.id||e.name))(e)&&ZE(e),JE=e=>e&&/^(H[1-6])$/.test(e.nodeName),ZE=e=>(e=>{let t=e;for(;t=t.parentNode;){const e=t.contentEditable;if(e&&"inherit"!==e)return $E(t)}return!1})(e)&&!qE(e),QE=e=>JE(e)&&ZE(e),eA=e=>{var t;const o=(e=>e.id?e.id:ca("h"))(e);return YE("header",null!==(t=XE(e))&&void 0!==t?t:"","#"+o,(e=>JE(e)?parseInt(e.nodeName.substr(1),10):0)(e),(()=>{e.id=o}))},tA=e=>{const t=e.id||e.name,o=XE(e);return YE("anchor",o||"#"+t,"#"+t,0,b)},oA=e=>jE(e.title).length>0,nA=e=>{const t=(e=>{const t=L(Zc(ze(e),"h1,h2,h3,h4,h5,h6,a:not([href])"),(e=>e.dom));return t})(e);return U((e=>L(U(e,QE),eA))(t).concat((e=>L(U(e,KE),tA))(t)),oA)},sA="tinymce-url-history",rA=e=>r(e)&&/^https?/.test(e),aA=e=>a(e)&&he(e,(e=>{return!(l(t=e)&&t.length<=5&&X(t,rA));var t})).isNone(),iA=()=>{const e=Ow.getItem(sA);if(null===e)return{};let t;try{t=JSON.parse(e)}catch(e){if(e instanceof SyntaxError)return console.log("Local storage "+sA+" was not valid JSON",e),{};throw e}return aA(t)?t:(console.log("Local storage "+sA+" was not valid format",t),{})},lA=e=>{const t=iA();return be(t,e).getOr([])},cA=(e,t)=>{if(!rA(e))return;const o=iA(),n=be(o,t).getOr([]),s=U(n,(t=>t!==e));o[t]=[e].concat(s).slice(0,5),(e=>{if(!aA(e))throw new Error("Bad format for history:\n"+JSON.stringify(e));Ow.setItem(sA,JSON.stringify(e))})(o)},dA=e=>!!e,uA=e=>ce(XO.makeMap(e,/[, ]/),dA),mA=e=>A.from(Fb(e)),gA=e=>A.from(e).filter(r).getOrUndefined(),pA=e=>({getHistory:lA,addToHistory:cA,getLinkInformation:()=>(e=>zb(e)?A.some({targets:nA(e.getBody()),anchorTop:gA(Lb(e)),anchorBottom:gA(Hb(e))}):A.none())(e),getValidationHandler:()=>(e=>A.from(Rb(e)))(e),getUrlPicker:t=>((e,t)=>((e,t)=>{const o=(e=>{const t=A.from(Vb(e)).filter(dA).map(uA);return mA(e).fold(T,(e=>t.fold(E,(e=>ae(e).length>0&&e))))})(e);return d(o)?o?mA(e):A.none():o[t]?mA(e):A.none()})(e,t).map((o=>n=>wS((s=>{const i={filetype:t,fieldname:n.fieldname,...A.from(n.meta).getOr({})};o.call(e,((e,t)=>{if(!r(e))throw new Error("Expected value to be string");if(void 0!==t&&!a(t))throw new Error("Expected meta to be a object");s({value:e,meta:t})}),n.value,i)})))))(e,t)}),hA=pm,fA=Ju,bA=x([xs("shell",!1),ns("makeItem"),xs("setupItem",b),Su("listBehaviours",[eh])]),vA=Yu({name:"items",overrides:()=>({behaviours:Tl([eh.config({})])})}),yA=x([vA]),xA=wm({name:x("CustomList")(),configFields:bA(),partFields:yA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[eh.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:wu(e.listBehaviours,s.behaviours),apis:{setItems:(t,o)=>{var n;(n=t,e.shell?A.some(n):am(n,e,"items")).fold((()=>{throw console.error("Custom List was defined to not be a shell, but no item container was specified in components"),new Error("Custom List was defined to not be a shell, but no item container was specified in components")}),(n=>{const s=eh.contents(n),r=o.length,a=r-s.length,i=a>0?V(a,(()=>e.makeItem())):[],l=s.slice(r);H(l,(e=>eh.remove(n,e))),H(i,(e=>eh.append(n,e)));const c=eh.contents(n);H(c,((n,s)=>{e.setupItem(t,n,o[s],s)}))}))}}}},apis:{setItems:(e,t,o)=>{e.setItems(t,o)}}}),wA=x([ns("dom"),xs("shell",!0),yu("toolbarBehaviours",[eh])]),SA=x([Yu({name:"groups",overrides:()=>({behaviours:Tl([eh.config({})])})})]),kA=wm({name:"Toolbar",configFields:wA(),partFields:SA(),factory:(e,t,o,n)=>{const s=e.shell?{behaviours:[eh.config({})],components:[]}:{behaviours:[],components:t};return{uid:e.uid,dom:e.dom,components:s.components,behaviours:wu(e.toolbarBehaviours,s.behaviours),apis:{setGroups:(t,o)=>{var n;(n=t,e.shell?A.some(n):am(n,e,"groups")).fold((()=>{throw console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")}),(e=>{eh.set(e,o)}))},refresh:b},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)}}}),CA=b,OA=T,_A=x([]);var TA,EA=Object.freeze({__proto__:null,setup:CA,isDocked:OA,getBehaviours:_A});const AA=e=>(xe(Vt(e,"position"),"fixed")?A.none():it(e)).orThunk((()=>{const t=Ne("span");return rt(e).bind((e=>{Lo(e,t);const o=it(t);return Uo(t),o}))})),MA=e=>AA(e).map(Xt).getOrThunk((()=>qt(0,0))),DA=(e,t)=>{const o=e.element;Wa(o,t.transitionClass),Ga(o,t.fadeOutClass),Wa(o,t.fadeInClass),t.onShow(e)},BA=(e,t)=>{const o=e.element;Wa(o,t.transitionClass),Ga(o,t.fadeInClass),Wa(o,t.fadeOutClass),t.onHide(e)},IA=(e,t)=>e.y>=t.y,FA=(e,t)=>e.bottom<=t.bottom,RA=(e,t,o)=>({location:"top",leftX:t,topY:o.bounds.y-e.y}),NA=(e,t,o)=>({location:"bottom",leftX:t,bottomY:e.bottom-o.bounds.bottom}),VA=e=>e.box.x-e.win.x,zA=(e,t,o)=>o.getInitialPos().map((o=>{const n=((e,t)=>{const o=t.optScrollEnv.fold(x(e.bounds.y),(t=>t.scrollElmTop+(e.bounds.y-t.currentScrollTop)));return qt(e.bounds.x,o)})(o,t);return{box:Jo(n.left,n.top,Zt(e),jt(e)),location:o.location}})),LA=(e,t,o,n,s)=>{const r=((e,t)=>{const o=t.optScrollEnv.fold(x(e.y),(t=>e.y+t.currentScrollTop-t.scrollElmTop));return qt(e.x,o)})(t,o),a=Jo(r.left,r.top,t.width,t.height);n.setInitialPos({style:zt(e),position:Rt(e,"position")||"static",bounds:a,location:s.location})},HA=(e,t,o)=>o.getInitialPos().bind((n=>{var s;switch(o.clearInitialPos(),n.position){case"static":return A.some({morph:"static"});case"absolute":const o=AA(e).getOr(wt()),r=Zo(o),a=null!==(s=o.dom.scrollTop)&&void 0!==s?s:0;return A.some({morph:"absolute",positionCss:Pl("absolute",be(n.style,"left").map((e=>t.x-r.x)),be(n.style,"top").map((e=>t.y-r.y+a)),be(n.style,"right").map((e=>r.right-t.right)),be(n.style,"bottom").map((e=>r.bottom-t.bottom)))});default:return A.none()}})),PA=e=>{switch(e.location){case"top":return A.some({morph:"fixed",positionCss:Pl("fixed",A.some(e.leftX),A.some(e.topY),A.none(),A.none())});case"bottom":return A.some({morph:"fixed",positionCss:Pl("fixed",A.some(e.leftX),A.none(),A.none(),A.some(e.bottomY))});default:return A.none()}},UA=(e,t,o)=>{const n=e.element;return xe(Vt(n,"position"),"fixed")?((e,t,o)=>((e,t,o)=>zA(e,t,o).filter((({box:e})=>((e,t,o)=>X(e,(e=>{switch(e){case"bottom":return FA(t,o.bounds);case"top":return IA(t,o.bounds)}})))(o.getModes(),e,t))).bind((({box:t})=>HA(e,t,o))))(e,t,o).orThunk((()=>t.optScrollEnv.bind((n=>zA(e,t,o))).bind((({box:e,location:o})=>{const n=tn(),s=VA({win:n,box:e}),r="top"===o?RA(n,s,t):NA(n,s,t);return PA(r)})))))(n,t,o):((e,t,o)=>{const n=Zo(e),s=tn(),r=((e,t,o)=>{const n=t.win,s=t.box,r=VA(t);return re(e,(e=>{switch(e){case"bottom":return FA(s,o.bounds)?A.none():A.some(NA(n,r,o));case"top":return IA(s,o.bounds)?A.none():A.some(RA(n,r,o));default:return A.none()}})).getOr({location:"no-dock"})})(o.getModes(),{win:s,box:n},t);return"top"===r.location||"bottom"===r.location?(LA(e,n,t,o,r),PA(r)):A.none()})(n,t,o)},WA=(e,t,o)=>{o.setDocked(!1),H(["left","right","top","bottom","position"],(t=>Ht(e.element,t))),t.onUndocked(e)},jA=(e,t,o,n)=>{const s="fixed"===n.position;o.setDocked(s),Ul(e.element,n),(s?t.onDocked:t.onUndocked)(e)},GA=(e,t,o,n,s=!1)=>{t.contextual.each((t=>{t.lazyContext(e).each((r=>{const a=((e,t)=>e.y<t.bottom&&e.bottom>t.y)(r,n.bounds);a!==o.isVisible()&&(o.setVisible(a),s&&!a?(qa(e.element,[t.fadeOutClass]),t.onHide(e)):(a?DA:BA)(e,t))}))}))},$A=(e,t,o,n,s)=>{GA(e,t,o,n,!0),jA(e,t,o,s.positionCss)},qA=(e,t,o)=>{e.getSystem().isConnected()&&((e,t,o)=>{const n=t.lazyViewport(e);GA(e,t,o,n),UA(e,n,o).each((s=>{((e,t,o,n,s)=>{switch(s.morph){case"static":return WA(e,t,o);case"absolute":return jA(e,t,o,s.positionCss);case"fixed":$A(e,t,o,n,s)}})(e,t,o,n,s)}))})(e,t,o)},YA=(e,t,o)=>{o.isDocked()&&((e,t,o)=>{const n=e.element;o.setDocked(!1);const s=t.lazyViewport(e);((e,t,o)=>{const n=e.element;return zA(n,t,o).bind((({box:e})=>HA(n,e,o)))})(e,s,o).each((n=>{switch(n.morph){case"static":WA(e,t,o);break;case"absolute":jA(e,t,o,n.positionCss)}})),o.setVisible(!0),t.contextual.each((t=>{Ya(n,[t.fadeInClass,t.fadeOutClass,t.transitionClass]),t.onShow(e)})),qA(e,t,o)})(e,t,o)},XA=e=>(t,o,n)=>{const s=o.lazyViewport(t);((e,t,o,n)=>{const s=Zo(e),r=tn(),a=n(r,VA({win:r,box:s}),t);return"bottom"===a.location||"top"===a.location?(((e,t,o,n,s)=>{n.getInitialPos().fold((()=>LA(e,t,o,n,s)),(()=>b))})(e,s,t,o,a),PA(a)):A.none()})(t.element,s,n,e).each((e=>{$A(t,o,n,s,e)}))},KA=XA(RA),JA=XA(NA);var ZA=Object.freeze({__proto__:null,refresh:qA,reset:YA,isDocked:(e,t,o)=>o.isDocked(),getModes:(e,t,o)=>o.getModes(),setModes:(e,t,o,n)=>o.setModes(n),forceDockToTop:KA,forceDockToBottom:JA}),QA=Object.freeze({__proto__:null,events:(e,t)=>Hr([Kr(nr(),((o,n)=>{e.contextual.each((e=>{$a(o.element,e.transitionClass)&&(Ya(o.element,[e.transitionClass,e.fadeInClass]),(t.isVisible()?e.onShown:e.onHidden)(o)),n.stop()}))})),Wr(wr(),((o,n)=>{qA(o,e,t)})),Wr(Ar(),((o,n)=>{qA(o,e,t)})),Wr(Sr(),((o,n)=>{YA(o,e,t)}))])}),eM=[ys("contextual",[as("fadeInClass"),as("fadeOutClass"),as("transitionClass"),ls("lazyContext"),Ri("onShow"),Ri("onShown"),Ri("onHide"),Ri("onHidden")]),_s("lazyViewport",(()=>({bounds:tn(),optScrollEnv:A.none()}))),Ts("modes",["top","bottom"],Hn),Ri("onDocked"),Ri("onUndocked")];const tM=Al({fields:eM,name:"docking",active:QA,apis:ZA,state:Object.freeze({__proto__:null,init:e=>{const t=As(!1),o=As(!0),n=nc(),s=As(e.modes);return Ta({isDocked:t.get,setDocked:t.set,getInitialPos:n.get,setInitialPos:n.set,clearInitialPos:n.clear,isVisible:o.get,setVisible:o.set,getModes:s.get,setModes:s.set,readState:()=>`docked:  ${t.get()}, visible: ${o.get()}, modes: ${s.get().join(",")}`})}})}),oM=x(ca("toolbar-height-change")),nM={fadeInClass:"tox-editor-dock-fadein",fadeOutClass:"tox-editor-dock-fadeout",transitionClass:"tox-editor-dock-transition"},sM="tox-tinymce--toolbar-sticky-on",rM="tox-tinymce--toolbar-sticky-off",aM=(e,t)=>R(tM.getModes(e),t),iM=e=>{const t=e.element;at(t).each((o=>{const n="padding-"+tM.getModes(e)[0];if(tM.isDocked(e)){const e=Zt(o);Bt(t,"width",e+"px"),Bt(o,n,(e=>Gt(e)+(parseInt(Rt(e,"margin-top"),10)||0)+(parseInt(Rt(e,"margin-bottom"),10)||0))(t)+"px")}else Ht(t,"width"),Ht(o,n)}))},lM=(e,t)=>{t?(Ga(e,nM.fadeOutClass),qa(e,[nM.transitionClass,nM.fadeInClass])):(Ga(e,nM.fadeInClass),qa(e,[nM.fadeOutClass,nM.transitionClass]))},cM=(e,t)=>{const o=ze(e.getContainer());t?(Wa(o,sM),Ga(o,rM)):(Wa(o,rM),Ga(o,sM))},dM=(e,t)=>{const o=nc(),n=t.getSink,s=e=>{n().each((t=>e(t.element)))},r=t=>{e.inline||iM(t),cM(e,tM.isDocked(t)),t.getSystem().broadcastOn([eu()],{}),n().each((e=>e.getSystem().broadcastOn([eu()],{})))},a=e.inline?[]:[Il.config({channels:{[oM()]:{onReceive:iM}}})];return[ah.config({}),tM.config({contextual:{lazyContext:t=>{const o=Gt(t.element),n=e.inline?e.getContentAreaContainer():e.getContainer();return A.from(n).map((n=>{const s=Zo(ze(n));return XS(e,t.element).fold((()=>{const e=s.height-o,n=s.y+(aM(t,"top")?0:o);return Jo(s.x,n,s.width,e)}),(e=>{const n=en(s,KS(e)),r=aM(t,"top")?n.y:n.y+o;return Jo(n.x,r,n.width,n.height-o)}))}))},onShow:()=>{s((e=>lM(e,!0)))},onShown:e=>{s((e=>Ya(e,[nM.transitionClass,nM.fadeInClass]))),o.get().each((t=>{((e,t)=>{const o=tt(t);zl(o).filter((e=>!Qe(t,e))).filter((t=>Qe(t,ze(o.dom.body))||et(e,t))).each((()=>Rl(t)))})(e.element,t),o.clear()}))},onHide:e=>{((e,t)=>Ll(e).orThunk((()=>t().toOptional().bind((e=>Ll(e.element))))))(e.element,n).fold(o.clear,o.set),s((e=>lM(e,!1)))},onHidden:()=>{s((e=>Ya(e,[nM.transitionClass])))},...nM},lazyViewport:t=>XS(e,t.element).fold((()=>{const o=tn(),n=Db(e),s=o.y+(aM(t,"top")?n:0),r=o.height-(aM(t,"bottom")?n:0);return{bounds:Jo(o.x,s,o.width,r),optScrollEnv:A.none()}}),(e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))),modes:[t.header.getDockingMode()],onDocked:r,onUndocked:r}),...a]};var uM=Object.freeze({__proto__:null,setup:(e,t,o)=>{e.inline||(t.header.isPositionedAtTop()||e.on("ResizeEditor",(()=>{o().each(tM.reset)})),e.on("ResizeWindow ResizeEditor",(()=>{o().each(iM)})),e.on("SkinLoaded",(()=>{o().each((e=>{tM.isDocked(e)?tM.reset(e):tM.refresh(e)}))})),e.on("FullscreenStateChanged",(()=>{o().each(tM.reset)}))),e.on("AfterScrollIntoView",(e=>{o().each((t=>{tM.refresh(t);const o=t.element;zg(o)&&((e,t)=>{const o=tt(t),n=st(t).dom.innerHeight,s=Wo(o),r=ze(e.elm),a=Qo(r),i=jt(r),l=a.y,c=l+i,d=Xt(t),u=jt(t),m=d.top,g=m+u,p=Math.abs(m-s.top)<2,h=Math.abs(g-(s.top+n))<2;if(p&&l<g)jo(s.left,l-u,o);else if(h&&c>m){const e=l-n+i+u;jo(s.left,e,o)}})(e,o)}))})),e.on("PostRender",(()=>{cM(e,!1)}))},isDocked:e=>e().map(tM.isDocked).getOr(!1),getBehaviours:dM});const mM=Bn([sy,ss("items",Fn([Nn([ry,us("items",Hn)]),Hn]))].concat(Fy)),gM=[hs("text"),hs("tooltip"),hs("icon"),ws("search",!1,Fn([Pn,Bn([hs("placeholder")])],(e=>d(e)?e?A.some({placeholder:A.none()}):A.none():A.some(e)))),ls("fetch"),_s("onSetup",(()=>b))],pM=Bn([sy,...gM]),hM=e=>Yn("menubutton",pM,e),fM=Bn([sy,yy,vy,by,Sy,uy,hy,Cs("presets","normal",["normal","color","listpreview"]),Ty(1),gy,py]);var bM=xm({factory:(e,t)=>{const o={focus:Gp.focusIn,setMenus:(e,o)=>{const n=L(o,(e=>{const o={type:"menubutton",text:e.text,fetch:t=>{t(e.getItems())}},n=hM(o).mapError((e=>Jn(e))).getOrDie();return dT(n,"tox-mbtn",t.backstage,A.some("menuitem"))}));eh.set(e,n)}};return{uid:e.uid,dom:e.dom,components:[],behaviours:Tl([eh.config({}),th("menubar-events",[Jr((t=>{e.onSetup(t)})),Wr(Ys(),((e,t)=>{vi(e.element,".tox-mbtn--active").each((o=>{yi(t.event.target,".tox-mbtn").each((t=>{Qe(o,t)||e.getSystem().getByDom(o).each((o=>{e.getSystem().getByDom(t).each((e=>{NS.expand(e),NS.close(o),ah.focus(e)}))}))}))}))})),Wr(Tr(),((e,t)=>{t.event.prevFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((o=>{t.event.newFocus.bind((t=>e.getSystem().getByDom(t).toOptional())).each((e=>{NS.isOpen(o)&&(NS.expand(e),NS.close(o))}))}))}))]),Gp.config({mode:"flow",selector:".tox-mbtn",onEscape:t=>(e.onEscape(t),A.some(!0))}),pk.config({})]),apis:o,domModification:{attributes:{role:"menubar"}}}},name:"silver.Menubar",configFields:[ns("dom"),ns("uid"),ns("onEscape"),ns("backstage"),xs("onSetup",b)],apis:{focus:(e,t)=>{e.focus(t)},setMenus:(e,t,o)=>{e.setMenus(t,o)}}});const vM="container",yM=[yu("slotBehaviours",[])],xM=e=>"<alloy.field."+e+">",wM=(e,t)=>{const o=t=>dm(e),n=(t,o)=>(n,s)=>am(n,e,s).map((e=>t(e,s))).getOr(o),s=(e,t)=>"true"!==_t(e.element,"aria-hidden"),r=n(s,!1),a=n(((e,t)=>{if(s(e)){const o=e.element;Bt(o,"display","none"),Ct(o,"aria-hidden","true"),Rr(e,Er(),{name:t,visible:!1})}})),i=(e=>(t,o)=>{H(o,(o=>e(t,o)))})(a),l=n(((e,t)=>{if(!s(e)){const o=e.element;Ht(o,"display"),At(o,"aria-hidden"),Rr(e,Er(),{name:t,visible:!0})}})),c={getSlotNames:o,getSlot:(t,o)=>am(t,e,o),isShowing:r,hideSlot:a,hideAllSlots:e=>i(e,o()),showSlot:l};return{uid:e.uid,dom:e.dom,components:t,behaviours:xu(e.slotBehaviours),apis:c}},SM=ce({getSlotNames:(e,t)=>e.getSlotNames(t),getSlot:(e,t,o)=>e.getSlot(t,o),isShowing:(e,t,o)=>e.isShowing(t,o),hideSlot:(e,t,o)=>e.hideSlot(t,o),hideAllSlots:(e,t)=>e.hideAllSlots(t),showSlot:(e,t,o)=>e.showSlot(t,o)},(e=>Oa(e))),kM={...SM,sketch:e=>{const t=(()=>{const e=[];return{slot:(t,o)=>(e.push(t),tm(vM,xM(t),o)),record:x(e)}})(),o=e(t),n=t.record(),s=L(n,(e=>$u({name:e,pname:xM(e)})));return fm(vM,yM,s,wM,o)}},CM=Bn([vy,yy,_s("onShow",b),_s("onHide",b),hy]),OM=e=>({element:()=>e.element.dom}),_M=(e,t)=>{const o=L(ae(t),(e=>{const o=t[e],n=Xn((e=>Yn("sidebar",CM,e))(o));return{name:e,getApi:OM,onSetup:n.onSetup,onShow:n.onShow,onHide:n.onHide}}));return L(o,(t=>{const n=As(b);return e.slot(t.name,{dom:{tag:"div",classes:["tox-sidebar__pane"]},behaviours:ux([Mx(t,n),Dx(t,n),Wr(Er(),((e,t)=>{const n=t.event,s=G(o,(e=>e.name===n.name));s.each((t=>{(n.visible?t.onShow:t.onHide)(t.getApi(e))}))}))])})}))},TM=e=>kM.sketch((t=>({dom:{tag:"div",classes:["tox-sidebar__pane-container"]},components:_M(t,e),slotBehaviours:ux([Jr((e=>kM.hideAllSlots(e)))])}))),EM=(e,t)=>{Ct(e,"role",t)},AM=e=>Om.getCurrent(e).bind((e=>lT.isGrowing(e)||lT.hasGrown(e)?Om.getCurrent(e).bind((e=>G(kM.getSlotNames(e),(t=>kM.isShowing(e,t))))):A.none())),MM=ca("FixSizeEvent"),DM=ca("AutoSizeEvent");var BM=Object.freeze({__proto__:null,block:(e,t,o,n)=>{Ct(e.element,"aria-busy",!0);const s=t.getRoot(e).getOr(e),r=Tl([Gp.config({mode:"special",onTab:()=>A.some(!0),onShiftTab:()=>A.some(!0)}),ah.config({})]),a=n(s,r),i=s.getSystem().build(a);eh.append(s,di(i)),i.hasConfigured(Gp)&&t.focus&&Gp.focusIn(i),o.isBlocked()||t.onBlock(e),o.blockWith((()=>eh.remove(s,i)))},unblock:(e,t,o)=>{At(e.element,"aria-busy"),o.isBlocked()&&t.onUnblock(e),o.clear()},isBlocked:(e,t,o)=>o.isBlocked()}),IM=[_s("getRoot",A.none),Os("focus",!0),Ri("onBlock"),Ri("onUnblock")];const FM=Al({fields:IM,name:"blocking",apis:BM,state:Object.freeze({__proto__:null,init:()=>{const e=tc((e=>e.destroy()));return Ta({readState:e.isSet,blockWith:t=>{e.set({destroy:t})},clear:e.clear,isBlocked:e.isSet})}})}),RM=e=>Om.getCurrent(e).each((e=>Rl(e.element,!0))),NM=(e,t,o)=>{const n=As(!1),s=nc(),r=o=>{var s;n.get()&&(!(e=>"focusin"===e.type)(s=o)||!(s.composed?oe(s.composedPath()):A.from(s.target)).map(ze).filter($e).exists((e=>$a(e,"mce-pastebin"))))&&(o.preventDefault(),RM(t()),e.editorManager.setActive(e))};e.inline||e.on("PreInit",(()=>{e.dom.bind(e.getWin(),"focusin",r),e.on("BeforeExecCommand",(e=>{"mcefocus"===e.command.toLowerCase()&&!0!==e.value&&r(e)}))}));const a=s=>{s!==n.get()&&(n.set(s),((e,t,o,n)=>{const s=t.element;if(((e,t)=>{const o="tabindex",n=`data-mce-${o}`;A.from(e.iframeElement).map(ze).each((e=>{t?(Tt(e,o).each((t=>Ct(e,n,t))),Ct(e,o,-1)):(At(e,o),Tt(e,n).each((t=>{Ct(e,o,t),At(e,n)})))}))})(e,o),o)FM.block(t,(e=>(t,o)=>({dom:{tag:"div",attributes:{"aria-label":e.translate("Loading..."),tabindex:"0"},classes:["tox-throbber__busy-spinner"]},components:[{dom:Yh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}))(n)),Ht(s,"display"),At(s,"aria-hidden"),e.hasFocus()&&RM(t);else{const o=Om.getCurrent(t).exists((e=>Vl(e.element)));FM.unblock(t),Bt(s,"display","none"),Ct(s,"aria-hidden","true"),o&&e.focus()}})(e,t(),s,o.providers),((e,t)=>{e.dispatch("AfterProgressState",{state:t})})(e,s))};e.on("ProgressState",(t=>{if(s.on(clearTimeout),h(t.time)){const o=$h.setEditorTimeout(e,(()=>a(t.state)),t.time);s.set(o)}else a(t.state),s.clear()}))},VM=(e,t,o)=>({within:e,extra:t,withinWidth:o}),zM=(e,t,o)=>{const n=j(e,((e,t)=>((e,t)=>{const n=o(e);return A.some({element:e,start:t,finish:t+n,width:n})})(t,e.len).fold(x(e),(t=>({len:t.finish,list:e.list.concat([t])})))),{len:0,list:[]}).list,s=U(n,(e=>e.finish<=t)),r=W(s,((e,t)=>e+t.width),0);return{within:s,extra:n.slice(s.length),withinWidth:r}},LM=e=>L(e,(e=>e.element)),HM=(e,t)=>{const o=L(t,(e=>di(e)));kA.setGroups(e,o)},PM=(e,t,o)=>{const n=t.builtGroups.get();if(0===n.length)return;const s=im(e,t,"primary"),r=fS.getCoupled(e,"overflowGroup");Bt(s.element,"visibility","hidden");const a=n.concat([r]),i=re(a,(e=>Ll(e.element).bind((t=>e.getSystem().getByDom(t).toOptional()))));o([]),HM(s,a);const l=((e,t,o,n)=>{const s=((e,t,o)=>{const n=zM(t,e,o);return 0===n.extra.length?A.some(n):A.none()})(e,t,o).getOrThunk((()=>zM(t,e-o(n),o))),r=s.within,a=s.extra,i=s.withinWidth;return 1===a.length&&a[0].width<=o(n)?((e,t,o)=>{const n=LM(e.concat(t));return VM(n,[],o)})(r,a,i):a.length>=1?((e,t,o,n)=>{const s=LM(e).concat([o]);return VM(s,LM(t),n)})(r,a,n,i):((e,t,o)=>VM(LM(e),[],o))(r,0,i)})(Zt(s.element),t.builtGroups.get(),(e=>Zt(e.element)),r);0===l.extra.length?(eh.remove(s,r),o([])):(HM(s,l.within),o(l.extra)),Ht(s.element,"visibility"),Pt(s.element),i.each(ah.focus)},UM=x([yu("splitToolbarBehaviours",[fS]),ts("builtGroups",(()=>As([])))]),WM=x([Ii(["overflowToggledClass"]),bs("getOverflowBounds"),ns("lazySink"),ts("overflowGroups",(()=>As([]))),Ri("onOpened"),Ri("onClosed")].concat(UM())),jM=x([$u({factory:kA,schema:wA(),name:"primary"}),qu({schema:wA(),name:"overflow"}),qu({name:"overflow-button"}),qu({name:"overflow-group"})]),GM=x(((e,t)=>{((e,t)=>{const o=Jt.max(e,t,["margin-left","border-left-width","padding-left","padding-right","border-right-width","margin-right"]);Bt(e,"max-width",o+"px")})(e,Math.floor(t))})),$M=x([Ii(["toggledClass"]),ns("lazySink"),ls("fetch"),bs("getBounds"),ys("fireDismissalEventInstead",[xs("event",Or())]),Oc(),Ri("onToggled")]),qM=x([qu({name:"button",overrides:e=>({dom:{attributes:{"aria-haspopup":"true"}},buttonBehaviours:Tl([ph.config({toggleClass:e.markers.toggledClass,aria:{mode:"expanded"},toggleOnExecute:!1,onToggled:e.onToggled})])})}),qu({factory:kA,schema:wA(),name:"toolbar",overrides:e=>({toolbarBehaviours:Tl([Gp.config({mode:"cyclic",onEscape:t=>(am(t,e,"button").each(ah.focus),A.none())})])})})]),YM=nc(),XM=(e,t)=>{const o=fS.getCoupled(e,"toolbarSandbox");Zd.isOpen(o)?Zd.close(o):Zd.open(o,t.toolbar())},KM=(e,t,o,n)=>{const s=o.getBounds.map((e=>e())),r=o.lazySink(e).getOrDie();_d.positionWithinBounds(r,t,{anchor:{type:"hotspot",hotspot:e,layouts:n,overrides:{maxWidthFunction:GM()}}},s)},JM=(e,t,o,n,s)=>{kA.setGroups(t,s),KM(e,t,o,n),ph.on(e)},ZM=wm({name:"FloatingToolbarButton",factory:(e,t,o,n)=>({...qh.sketch({...n.button(),action:e=>{XM(e,n)},buttonBehaviours:ku({dump:n.button().buttonBehaviours},[fS.config({others:{toolbarSandbox:t=>((e,t,o)=>{const n=wi();return{dom:{tag:"div",attributes:{id:n.id}},behaviours:Tl([Gp.config({mode:"special",onEscape:e=>(Zd.close(e),A.some(!0))}),Zd.config({onOpen:(s,r)=>{const a=YM.get().getOr(!1);o.fetch().get((s=>{JM(e,r,o,t.layouts,s),n.link(e.element),a||Gp.focusIn(r)}))},onClose:()=>{ph.off(e),YM.get().getOr(!1)||ah.focus(e),n.unlink(e.element)},isPartOf:(t,o,n)=>Si(o,n)||Si(e,n),getAttachPoint:()=>o.lazySink(e).getOrDie()}),Il.config({channels:{...nu({isExtraPart:T,...o.fireDismissalEventInstead.map((e=>({fireEventInstead:{event:e.event}}))).getOr({})}),...ru({doReposition:()=>{Zd.getState(fS.getCoupled(e,"toolbarSandbox")).each((n=>{KM(e,n,o,t.layouts)}))}})}})])}})(t,o,e)}})])}),apis:{setGroups:(t,n)=>{Zd.getState(fS.getCoupled(t,"toolbarSandbox")).each((s=>{JM(t,s,e,o.layouts,n)}))},reposition:t=>{Zd.getState(fS.getCoupled(t,"toolbarSandbox")).each((n=>{KM(t,n,e,o.layouts)}))},toggle:e=>{XM(e,n)},toggleWithoutFocusing:e=>{((e,t)=>{YM.set(!0),XM(e,t),YM.clear()})(e,n)},getToolbar:e=>Zd.getState(fS.getCoupled(e,"toolbarSandbox")),isOpen:e=>Zd.isOpen(fS.getCoupled(e,"toolbarSandbox"))}}),configFields:$M(),partFields:qM(),apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggleWithoutFocusing(t)},getToolbar:(e,t)=>e.getToolbar(t),isOpen:(e,t)=>e.isOpen(t)}}),QM=x([ns("items"),Ii(["itemSelector"]),yu("tgroupBehaviours",[Gp])]),eD=x([Xu({name:"items",unit:"item"})]),tD=wm({name:"ToolbarGroup",configFields:QM(),partFields:eD(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.tgroupBehaviours,[Gp.config({mode:"flow",selector:e.markers.itemSelector})]),domModification:{attributes:{role:"toolbar"}}})}),oD=e=>L(e,(e=>di(e))),nD=(e,t,o)=>{PM(e,o,(n=>{o.overflowGroups.set(n),t.getOpt(e).each((e=>{ZM.setGroups(e,oD(n))}))}))},sD=wm({name:"SplitFloatingToolbar",configFields:WM(),partFields:jM(),factory:(e,t,o,n)=>{const s=Xh(ZM.sketch({fetch:()=>wS((t=>{t(oD(e.overflowGroups.get()))})),layouts:{onLtr:()=>[cl,ll],onRtl:()=>[ll,cl],onBottomLtr:()=>[ul,dl],onBottomRtl:()=>[dl,ul]},getBounds:o.getOverflowBounds,lazySink:e.lazySink,fireDismissalEventInstead:{},markers:{toggledClass:e.markers.overflowToggledClass},parts:{button:n["overflow-button"](),toolbar:n.overflow()},onToggled:(t,o)=>e[o?"onOpened":"onClosed"](t)}));return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.splitToolbarBehaviours,[fS.config({others:{overflowGroup:()=>tD.sketch({...n["overflow-group"](),items:[s.asSpec()]})}})]),apis:{setGroups:(t,o)=>{e.builtGroups.set(L(o,t.getSystem().build)),nD(t,s,e)},refresh:t=>nD(t,s,e),toggle:e=>{s.getOpt(e).each((e=>{ZM.toggle(e)}))},toggleWithoutFocusing:e=>{s.getOpt(e).each(ZM.toggleWithoutFocusing)},isOpen:e=>s.getOpt(e).map(ZM.isOpen).getOr(!1),reposition:e=>{s.getOpt(e).each((e=>{ZM.reposition(e)}))},getOverflow:e=>s.getOpt(e).bind(ZM.getToolbar)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},reposition:(e,t)=>{e.reposition(t)},toggle:(e,t)=>{e.toggle(t)},toggleWithoutFocusing:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t),getOverflow:(e,t)=>e.getOverflow(t)}}),rD=x([Ii(["closedClass","openClass","shrinkingClass","growingClass","overflowToggledClass"]),Ri("onOpened"),Ri("onClosed")].concat(UM())),aD=x([$u({factory:kA,schema:wA(),name:"primary"}),$u({factory:kA,schema:wA(),name:"overflow",overrides:e=>({toolbarBehaviours:Tl([lT.config({dimension:{property:"height"},closedClass:e.markers.closedClass,openClass:e.markers.openClass,shrinkingClass:e.markers.shrinkingClass,growingClass:e.markers.growingClass,onShrunk:t=>{am(t,e,"overflow-button").each((e=>{ph.off(e),ah.focus(e)})),e.onClosed(t)},onGrown:t=>{Gp.focusIn(t),e.onOpened(t)},onStartGrow:t=>{am(t,e,"overflow-button").each(ph.on)}}),Gp.config({mode:"acyclic",onEscape:t=>(am(t,e,"overflow-button").each(ah.focus),A.some(!0))})])})}),qu({name:"overflow-button",overrides:e=>({buttonBehaviours:Tl([ph.config({toggleClass:e.markers.overflowToggledClass,aria:{mode:"pressed"},toggleOnExecute:!1})])})}),qu({name:"overflow-group"})]),iD=(e,t)=>{am(e,t,"overflow-button").bind((()=>am(e,t,"overflow"))).each((o=>{lD(e,t),lT.toggleGrow(o)}))},lD=(e,t)=>{am(e,t,"overflow").each((o=>{PM(e,t,(e=>{const t=L(e,(e=>di(e)));kA.setGroups(o,t)})),am(e,t,"overflow-button").each((e=>{lT.hasGrown(o)&&ph.on(e)})),lT.refresh(o)}))},cD=wm({name:"SplitSlidingToolbar",configFields:rD(),partFields:aD(),factory:(e,t,o,n)=>{const s="alloy.toolbar.toggle";return{uid:e.uid,dom:e.dom,components:t,behaviours:wu(e.splitToolbarBehaviours,[fS.config({others:{overflowGroup:e=>tD.sketch({...n["overflow-group"](),items:[qh.sketch({...n["overflow-button"](),action:t=>{Fr(e,s)}})]})}}),th("toolbar-toggle-events",[Wr(s,(t=>{iD(t,e)}))])]),apis:{setGroups:(t,o)=>{((t,o)=>{const n=L(o,t.getSystem().build);e.builtGroups.set(n)})(t,o),lD(t,e)},refresh:t=>lD(t,e),toggle:t=>iD(t,e),isOpen:t=>((e,t)=>am(e,t,"overflow").map(lT.hasGrown).getOr(!1))(t,e)},domModification:{attributes:{role:"group"}}}},apis:{setGroups:(e,t,o)=>{e.setGroups(t,o)},refresh:(e,t)=>{e.refresh(t)},toggle:(e,t)=>{e.toggle(t)},isOpen:(e,t)=>e.isOpen(t)}}),dD=e=>{const t=e.title.fold((()=>({})),(e=>({attributes:{title:e}})));return{dom:{tag:"div",classes:["tox-toolbar__group"],...t},components:[tD.parts.items({})],items:e.items,markers:{itemSelector:"*:not(.tox-split-button) > .tox-tbtn:not([disabled]), .tox-split-button:not([disabled]), .tox-toolbar-nav-js:not([disabled]), .tox-number-input:not([disabled])"},tgroupBehaviours:Tl([pk.config({}),ah.config({})])}},uD=e=>tD.sketch(dD(e)),mD=(e,t)=>{const o=Jr((t=>{const o=L(e.initGroups,uD);kA.setGroups(t,o)}));return Tl([Ex(e.providers.isDisabled),Ox(),Gp.config({mode:t,onEscape:e.onEscape,selector:".tox-toolbar__group"}),th("toolbar-events",[o])])},gD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return{uid:e.uid,dom:{tag:"div",classes:["tox-toolbar-overlord"]},parts:{"overflow-group":dD({title:A.none(),items:[]}),"overflow-button":NT({name:"more",icon:A.some("more-drawer"),enabled:!0,tooltip:A.some("Reveal or hide additional toolbar items"),primary:!1,buttonType:A.none(),borderless:!1},A.none(),e.providers)},splitToolbarBehaviours:mD(e,t)}},pD=e=>{const t=gD(e),o=sD.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}});return sD.sketch({...t,lazySink:e.getSink,getOverflowBounds:()=>{const t=e.moreDrawerData.lazyHeader().element,o=Qo(t),n=nt(t),s=Qo(n),r=Math.max(n.dom.scrollHeight,s.height);return Jo(o.x+4,s.y,o.width-8,r)},parts:{...t.parts,overflow:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:e.attributes}}},components:[o],markers:{overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>e.onToggled(t,!0),onClosed:t=>e.onToggled(t,!1)})},hD=e=>{const t=cD.parts.primary({dom:{tag:"div",classes:["tox-toolbar__primary"]}}),o=cD.parts.overflow({dom:{tag:"div",classes:["tox-toolbar__overflow"]}}),n=gD(e);return cD.sketch({...n,components:[t,o],markers:{openClass:"tox-toolbar__overflow--open",closedClass:"tox-toolbar__overflow--closed",growingClass:"tox-toolbar__overflow--growing",shrinkingClass:"tox-toolbar__overflow--shrinking",overflowToggledClass:"tox-tbtn--enabled"},onOpened:t=>{t.getSystem().broadcastOn([oM()],{type:"opened"}),e.onToggled(t,!0)},onClosed:t=>{t.getSystem().broadcastOn([oM()],{type:"closed"}),e.onToggled(t,!1)}})},fD=e=>{const t=e.cyclicKeying?"cyclic":"acyclic";return kA.sketch({uid:e.uid,dom:{tag:"div",classes:["tox-toolbar"].concat(e.type===rb.scrolling?["tox-toolbar--scrolling"]:[])},components:[kA.parts.groups({})],toolbarBehaviours:mD(e,t)})},bD=[by,vy,hs("tooltip"),Cs("buttonType","secondary",["primary","secondary"]),Os("borderless",!1),ls("onAction")],vD={button:[...bD,iy,is("type",["button"])],togglebutton:[...bD,Os("active",!1),is("type",["togglebutton"])]},yD=[is("type",["group"]),Ts("buttons",[],Zn("type",vD))],xD=Zn("type",{...vD,group:yD}),wD=Bn([Ts("buttons",[],xD),ls("onShow"),ls("onHide")]),SD=(e,t)=>((e,t)=>{var o,n;const s="togglebutton"===e.type,r=e.icon.map((e=>O_(e,t.icons))).map(Xh),a={...e,name:s?e.text.getOr(e.icon.getOr("")):null!==(o=e.text)&&void 0!==o?o:e.icon.getOr(""),primary:"primary"===e.buttonType,buttonType:A.from(e.buttonType),tooltip:e.tooltip,icon:e.icon,enabled:!0,borderless:e.borderless},i=VT(null!==(n=e.buttonType)&&void 0!==n?n:"secondary"),l=s?e.text.map(t.translate):A.some(t.translate(e.text)),c=l.map(ri),d=a.tooltip.or(l).map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),u=r.map((e=>e.asSpec())),m=Fx([u,c]),g=e.icon.isSome()&&c.isSome(),p={tag:"button",classes:i.concat(...e.icon.isSome()&&!g?["tox-button--icon"]:[]).concat(...g?["tox-button--icon-and-text"]:[]).concat(...e.borderless?["tox-button--naked"]:[]).concat(..."togglebutton"===e.type&&e.active?["tox-button--enabled"]:[]),attributes:d},h=RT(a,A.some((o=>{const n=e=>{r.map((n=>n.getOpt(o).each((o=>{eh.set(o,[O_(e,t.icons)])}))))};return s?e.onAction({setIcon:n,setActive:e=>{const t=o.element;e?(Wa(t,"tox-button--enabled"),Ct(t,"aria-pressed",!0)):(Ga(t,"tox-button--enabled"),At(t,"aria-pressed"))},isActive:()=>$a(o.element,"tox-button--enabled")}):"button"===e.type?e.onAction({setIcon:n}):void 0})),[],p,m,t);return qh.sketch(h)})(e,t),kD=Bo().deviceType,CD=kD.isPhone(),OD=kD.isTablet();var _D=wm({name:"silver.View",configFields:[ns("viewConfig")],partFields:[Yu({factory:{sketch:e=>{let t=!1;const o=L(e.buttons,(o=>"group"===o.type?(t=!0,((e,t)=>({dom:{tag:"div",classes:["tox-view__toolbar__group"]},components:L(e.buttons,(e=>SD(e,t)))}))(o,e.providers)):SD(o,e.providers)));return{uid:e.uid,dom:{tag:"div",classes:[t?"tox-view__toolbar":"tox-view__header",...CD||OD?["tox-view--mobile","tox-view--scrolling"]:[]]},behaviours:Tl([ah.config({}),Gp.config({mode:"flow",selector:"button, .tox-button",focusInside:vg.OnEnterOrSpaceMode})]),components:t?o:[ik.sketch({dom:{tag:"div",classes:["tox-view__header-start"]},components:[]}),ik.sketch({dom:{tag:"div",classes:["tox-view__header-end"]},components:o})]}}},schema:[ns("buttons"),ns("providers")],name:"header"}),Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-view__pane"]}})},schema:[],name:"pane"})],factory:(e,t,o,n)=>{const s={getPane:t=>hA.getPart(t,e,"pane"),getOnShow:t=>e.viewConfig.onShow,getOnHide:t=>e.viewConfig.onHide};return{uid:e.uid,dom:e.dom,components:t,apis:s}},apis:{getPane:(e,t)=>e.getPane(t),getOnShow:(e,t)=>e.getOnShow(t),getOnHide:(e,t)=>e.getOnHide(t)}});const TD=(e,t,o)=>pe(t,((t,n)=>{const s=Xn(Yn("view",wD,t));return e.slot(n,_D.sketch({dom:{tag:"div",classes:["tox-view"]},viewConfig:s,components:[...s.buttons.length>0?[_D.parts.header({buttons:s.buttons,providers:o})]:[],_D.parts.pane({})]}))})),ED=(e,t)=>kM.sketch((o=>({dom:{tag:"div",classes:["tox-view-wrap__slot-container"]},components:TD(o,e,t),slotBehaviours:ux([Jr((e=>kM.hideAllSlots(e)))])}))),AD=e=>G(kM.getSlotNames(e),(t=>kM.isShowing(e,t))),MD=(e,t,o)=>{kM.getSlot(e,t).each((e=>{_D.getPane(e).each((t=>{var n;o(e)((n=t.element.dom,{getContainer:x(n)}))}))}))};var DD=xm({factory:(e,t)=>{const o={setViews:(e,o)=>{eh.set(e,[ED(o,t.backstage.shared.providers)])},whichView:e=>Om.getCurrent(e).bind(AD),toggleView:(e,t,o,n)=>Om.getCurrent(e).exists((s=>{const r=AD(s),a=r.exists((e=>n===e)),i=kM.getSlot(s,n).isSome();return i&&(kM.hideAllSlots(s),a?((e=>{const t=e.element;Bt(t,"display","none"),Ct(t,"aria-hidden","true")})(e),t()):(o(),(e=>{const t=e.element;Ht(t,"display"),At(t,"aria-hidden")})(e),kM.showSlot(s,n),((e,t)=>{MD(e,t,_D.getOnShow)})(s,n)),r.each((e=>((e,t)=>MD(e,t,_D.getOnHide))(s,e)))),i}))};return{uid:e.uid,dom:{tag:"div",classes:["tox-view-wrap"],attributes:{"aria-hidden":"true"},styles:{display:"none"}},components:[],behaviours:Tl([eh.config({}),Om.config({find:e=>{const t=eh.contents(e);return oe(t)}})]),apis:o}},name:"silver.ViewWrapper",configFields:[ns("backstage")],apis:{setViews:(e,t,o)=>e.setViews(t,o),toggleView:(e,t,o,n,s)=>e.toggleView(t,o,n,s),whichView:(e,t)=>e.whichView(t)}});const BD=fA.optional({factory:bM,name:"menubar",schema:[ns("backstage")]}),ID=fA.optional({factory:{sketch:e=>xA.sketch({uid:e.uid,dom:e.dom,listBehaviours:Tl([Gp.config({mode:"acyclic",selector:".tox-toolbar"})]),makeItem:()=>fD({type:e.type,uid:ca("multiple-toolbar-item"),cyclicKeying:!1,initGroups:[],providers:e.providers,onEscape:()=>(e.onEscape(),A.some(!0))}),setupItem:(e,t,o,n)=>{kA.setGroups(t,o)},shell:!0})},name:"multiple-toolbar",schema:[ns("dom"),ns("onEscape")]}),FD=fA.optional({factory:{sketch:e=>{const t=(e=>e.type===rb.sliding?hD:e.type===rb.floating?pD:fD)(e);return t({type:e.type,uid:e.uid,onEscape:()=>(e.onEscape(),A.some(!0)),onToggled:(t,o)=>e.onToolbarToggled(o),cyclicKeying:!1,initGroups:[],getSink:e.getSink,providers:e.providers,moreDrawerData:{lazyToolbar:e.lazyToolbar,lazyMoreButton:e.lazyMoreButton,lazyHeader:e.lazyHeader},attributes:e.attributes})}},name:"toolbar",schema:[ns("dom"),ns("onEscape"),ns("getSink")]}),RD=fA.optional({factory:{sketch:e=>{const t=e.editor,o=e.sticky?dM:_A;return{uid:e.uid,dom:e.dom,components:e.components,behaviours:Tl(o(t,e.sharedBackstage))}}},name:"header",schema:[ns("dom")]}),ND=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:e.dom,components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/tinymce-self-hosted-premium-features/?utm_campaign=self_hosted_upgrade_promo&utm_source=tiny&utm_medium=referral",rel:"noopener",target:"_blank","aria-hidden":"true"},classes:["tox-promotion-link"],innerHtml:"\u26a1\ufe0fUpgrade"}}]})},name:"promotion",schema:[ns("dom")]}),VD=fA.optional({name:"socket",schema:[ns("dom")]}),zD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-sidebar"],attributes:{role:"presentation"}},components:[{dom:{tag:"div",classes:["tox-sidebar__slider"]},components:[],behaviours:Tl([pk.config({}),ah.config({}),lT.config({dimension:{property:"width"},closedClass:"tox-sidebar--sliding-closed",openClass:"tox-sidebar--sliding-open",shrinkingClass:"tox-sidebar--sliding-shrinking",growingClass:"tox-sidebar--sliding-growing",onShrunk:e=>{Om.getCurrent(e).each(kM.hideAllSlots),Fr(e,DM)},onGrown:e=>{Fr(e,DM)},onStartGrow:e=>{Rr(e,MM,{width:Vt(e.element,"width").getOr("")})},onStartShrink:e=>{Rr(e,MM,{width:Zt(e.element)+"px"})}}),eh.config({}),Om.config({find:e=>{const t=eh.contents(e);return oe(t)}})])}],behaviours:Tl([PO(0),th("sidebar-sliding-events",[Wr(MM,((e,t)=>{Bt(e.element,"width",t.event.width)})),Wr(DM,((e,t)=>{Ht(e.element,"width")}))])])})},name:"sidebar",schema:[ns("dom")]}),LD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",attributes:{"aria-hidden":"true"},classes:["tox-throbber"],styles:{display:"none"}},behaviours:Tl([eh.config({}),FM.config({focus:!1}),Om.config({find:e=>oe(e.components())})]),components:[]})},name:"throbber",schema:[ns("dom")]}),HD=fA.optional({factory:DD,name:"viewWrapper",schema:[ns("backstage")]}),PD=fA.optional({factory:{sketch:e=>({uid:e.uid,dom:{tag:"div",classes:["tox-editor-container"]},components:e.components})},name:"editorContainer",schema:[]});var UD=wm({name:"OuterContainer",factory:(e,t,o)=>{let n=!1;const s={getSocket:t=>hA.getPart(t,e,"socket"),setSidebar:(t,o,n)=>{hA.getPart(t,e,"sidebar").each((e=>((e,t,o)=>{Om.getCurrent(e).each((n=>{eh.set(n,[TM(t)]);const s=null==o?void 0:o.toLowerCase();r(s)&&ve(t,s)&&Om.getCurrent(n).each((t=>{kM.showSlot(t,s),lT.immediateGrow(n),Ht(n.element,"width"),EM(e.element,"region")}))}))})(e,o,n)))},toggleSidebar:(t,o)=>{hA.getPart(t,e,"sidebar").each((e=>((e,t)=>{Om.getCurrent(e).each((o=>{Om.getCurrent(o).each((n=>{lT.hasGrown(o)?kM.isShowing(n,t)?(lT.shrink(o),EM(e.element,"presentation")):(kM.hideAllSlots(n),kM.showSlot(n,t),EM(e.element,"region")):(kM.hideAllSlots(n),kM.showSlot(n,t),lT.grow(o),EM(e.element,"region"))}))}))})(e,o)))},whichSidebar:t=>hA.getPart(t,e,"sidebar").bind(AM).getOrNull(),getHeader:t=>hA.getPart(t,e,"header"),getToolbar:t=>hA.getPart(t,e,"toolbar"),setToolbar:(t,o)=>{hA.getPart(t,e,"toolbar").each((e=>{const t=L(o,uD);e.getApis().setGroups(e,t)}))},setToolbars:(t,o)=>{hA.getPart(t,e,"multiple-toolbar").each((e=>{const t=L(o,(e=>L(e,uD)));xA.setItems(e,t)}))},refreshToolbar:t=>{hA.getPart(t,e,"toolbar").each((e=>e.getApis().refresh(e)))},toggleToolbarDrawer:t=>{hA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggle,(t=>t(e)))}))},toggleToolbarDrawerWithoutFocusing:t=>{hA.getPart(t,e,"toolbar").each((e=>{ke(e.getApis().toggleWithoutFocusing,(t=>t(e)))}))},isToolbarDrawerToggled:t=>hA.getPart(t,e,"toolbar").bind((e=>A.from(e.getApis().isOpen).map((t=>t(e))))).getOr(!1),getThrobber:t=>hA.getPart(t,e,"throbber"),focusToolbar:t=>{hA.getPart(t,e,"toolbar").orThunk((()=>hA.getPart(t,e,"multiple-toolbar"))).each((e=>{Gp.focusIn(e)}))},setMenubar:(t,o)=>{hA.getPart(t,e,"menubar").each((e=>{bM.setMenus(e,o)}))},focusMenubar:t=>{hA.getPart(t,e,"menubar").each((e=>{bM.focus(e)}))},setViews:(t,o)=>{hA.getPart(t,e,"viewWrapper").each((e=>{DD.setViews(e,o)}))},toggleView:(t,o)=>hA.getPart(t,e,"viewWrapper").exists((e=>DD.toggleView(e,(()=>s.showMainView(t)),(()=>s.hideMainView(t)),o))),whichView:t=>hA.getPart(t,e,"viewWrapper").bind(DD.whichView).getOrNull(),hideMainView:t=>{n=s.isToolbarDrawerToggled(t),n&&s.toggleToolbarDrawer(t),hA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Bt(t,"display","none"),Ct(t,"aria-hidden","true")}))},showMainView:t=>{n&&s.toggleToolbarDrawer(t),hA.getPart(t,e,"editorContainer").each((e=>{const t=e.element;Ht(t,"display"),At(t,"aria-hidden")}))}};return{uid:e.uid,dom:e.dom,components:t,apis:s,behaviours:e.behaviours}},configFields:[ns("dom"),ns("behaviours")],partFields:[RD,BD,FD,ID,VD,zD,ND,LD,HD,PD],apis:{getSocket:(e,t)=>e.getSocket(t),setSidebar:(e,t,o,n)=>{e.setSidebar(t,o,n)},toggleSidebar:(e,t,o)=>{e.toggleSidebar(t,o)},whichSidebar:(e,t)=>e.whichSidebar(t),getHeader:(e,t)=>e.getHeader(t),getToolbar:(e,t)=>e.getToolbar(t),setToolbar:(e,t,o)=>{e.setToolbar(t,o)},setToolbars:(e,t,o)=>{e.setToolbars(t,o)},refreshToolbar:(e,t)=>e.refreshToolbar(t),toggleToolbarDrawer:(e,t)=>{e.toggleToolbarDrawer(t)},toggleToolbarDrawerWithoutFocusing:(e,t)=>{e.toggleToolbarDrawerWithoutFocusing(t)},isToolbarDrawerToggled:(e,t)=>e.isToolbarDrawerToggled(t),getThrobber:(e,t)=>e.getThrobber(t),setMenubar:(e,t,o)=>{e.setMenubar(t,o)},focusMenubar:(e,t)=>{e.focusMenubar(t)},focusToolbar:(e,t)=>{e.focusToolbar(t)},setViews:(e,t,o)=>{e.setViews(t,o)},toggleView:(e,t,o)=>e.toggleView(t,o),whichView:(e,t)=>e.whichView(t)}});const WD={file:{title:"File",items:"newdocument restoredraft | preview | export print | deleteallconversations"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall | searchreplace"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen | showcomments"},insert:{title:"Insert",items:"image link media addcomment pageembed template inserttemplate codesample inserttable accordion | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents footnotes | mergetags | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | styles blocks fontfamily fontsize align lineheight | forecolor backcolor | language | removeformat"},tools:{title:"Tools",items:"aidialog aishortcuts | spellchecker spellcheckerlanguage | autocorrect capitalization | a11ycheck code typography wordcount addtemplate"},table:{title:"Table",items:"inserttable | cell row column | advtablesort | tableprops deletetable"},help:{title:"Help",items:"help"}},jD=e=>e.split(" "),GD=(e,t)=>{const o={...WD,...t.menus},n=ae(t.menus).length>0,s=void 0===t.menubar||!0===t.menubar?jD("file edit view insert format tools table help"):jD(!1===t.menubar?"":t.menubar),a=U(s,(e=>{const o=ve(WD,e);return n?o||be(t.menus,e).exists((e=>ve(e,"items"))):o})),i=L(a,(n=>{const s=o[n];return((e,t,o)=>{const n=Cb(o).split(/[ ,]/);return{text:e.title,getItems:()=>Y(e.items,(e=>{const o=e.toLowerCase();return 0===o.trim().length||N(n,(e=>e===o))?[]:"separator"===o||"|"===o?[{type:"separator"}]:t.menuItems[o]?[t.menuItems[o]]:[]}))}})({title:s.title,items:jD(s.items)},t,e)}));return U(i,(e=>e.getItems().length>0&&N(e.getItems(),(e=>r(e)||"separator"!==e.type))))},$D=(e,t,o)=>(e.on("remove",(()=>o.unload(t))),o.load(t)),qD=(e,t,o,n)=>(e.on("remove",(()=>n.unloadRawCss(t))),n.loadRawCss(t,o)),YD=async(e,t)=>{const o="ui/"+ev(e).getOr("default")+"/skin.css",n=tinymce.Resource.get(o);return r(n)?Promise.resolve(qD(e,o,n,e.ui.styleSheetLoader)):$D(e,t+"/skin.min.css",e.ui.styleSheetLoader)},XD=async(e,t)=>{var o;if(o=ze(e.getElement()),vt(o).isSome()){const o="ui/"+ev(e).getOr("default")+"/skin.shadowdom.css",n=tinymce.Resource.get(o);return r(n)?(qD(e,o,n,ib.DOM.styleSheetLoader),Promise.resolve()):$D(e,t+"/skin.shadowdom.min.css",ib.DOM.styleSheetLoader)}},KD=(e,t)=>(async(e,t)=>{ev(t).fold((()=>{const o=Qb(t);o&&t.contentCSS.push(o+(e?"/content.inline":"/content")+".min.css")}),(o=>{const n="ui/"+o+(e?"/content.inline":"/content")+".css",s=tinymce.Resource.get(n);if(r(s))qD(t,n,s,t.ui.styleSheetLoader);else{const o=Qb(t);o&&t.contentCSS.push(o+(e?"/content.inline":"/content")+".min.css")}}));const o=Qb(t);if(!Jb(t)&&r(o))return Promise.all([YD(t,o),XD(t,o)]).then()})(e,t).then((e=>{const t=()=>{e._skinLoaded=!0,(e=>{e.dispatch("SkinLoaded")})(e)};return()=>{e.initialized?t():e.on("init",t)}})(t),((e,t)=>()=>((e,t)=>{e.dispatch("SkinLoadError",t)})(e,{message:"Skin could not be loaded"}))(t)),JD=k(KD,!1),ZD=k(KD,!0),QD=(e,t,o)=>e.translate([t,e.translate(o)]),eB=(e,t)=>{const o=(o,s,r,a)=>{const i=e.shared.providers.translate(o.title);if("separator"===o.type)return A.some({type:"separator",text:i});if("submenu"===o.type){const e=Y(o.getStyleItems(),(e=>n(e,s,a)));return 0===s&&e.length<=0?A.none():A.some({type:"nestedmenuitem",text:i,enabled:e.length>0,getSubmenuItems:()=>Y(o.getStyleItems(),(e=>n(e,s,a)))})}return A.some({type:"togglemenuitem",text:i,icon:o.icon,active:o.isSelected(a),enabled:!r,onAction:t.onAction(o),...o.getStylePreview().fold((()=>({})),(e=>({meta:{style:e}})))})},n=(e,n,s)=>{const r="formatter"===e.type&&t.isInvalid(e);return 0===n?r?[]:o(e,n,!1,s).toArray():o(e,n,r,s).toArray()},s=e=>{const o=t.getCurrentValue(),s=t.shouldHide?0:1;return Y(e,(e=>n(e,s,o)))};return{validateItems:s,getFetch:(e,t)=>(o,n)=>{const r=t(),a=s(r);n(I_(a,bv.CLOSE_ON_EXECUTE,e,{isHorizontalMenu:!1,search:A.none()}))}}},tB=(e,t,o)=>{const n=o.dataset,s="basic"===n.type?()=>L(n.data,(e=>UE(e,o.isSelectedFor,o.getPreviewFor))):n.getData;return{items:eB(t,o),getStyleItems:s}},oB=(e,t,o,n,s)=>{const{items:r,getStyleItems:a}=tB(0,t,o);return A_({text:o.icon.isSome()?A.none():o.text,icon:o.icon,tooltip:A.from(o.tooltip),role:A.none(),fetch:r.getFetch(t,a),onSetup:t=>{const r=o=>t.setTooltip(QD(e,n,o.value));return e.on(s,r),yw(Sw(e,"NodeChange",(t=>{const n=t.getComponent();o.updateText(n),Lm.set(t.getComponent(),!e.selection.isEditable())}))(t),(()=>e.off(s,r)))},getApi:e=>({getComponent:x(e),setTooltip:o=>{const n=t.shared.providers.translate(o);Ot(e.element,{"aria-label":n,title:n})}}),columns:1,presets:"normal",classes:o.icon.isSome()?[]:["bespoke"],dropdownBehaviours:[]},"tox-tbtn",t.shared)};var nB;!function(e){e[e.SemiColon=0]="SemiColon",e[e.Space=1]="Space"}(nB||(nB={}));const sB=(e,t,o)=>{const n=(s=((e,t)=>t===nB.SemiColon?e.replace(/;$/,"").split(";"):e.split(" "))(e.options.get(t),o),L(s,(e=>{let t=e,o=e;const n=e.split("=");return n.length>1&&(t=n[0],o=n[1]),{title:t,format:o}})));var s;return{type:"basic",data:n}},rB="Alignment {0}",aB="left",iB=[{title:"Left",icon:"align-left",format:"alignleft",command:"JustifyLeft"},{title:"Center",icon:"align-center",format:"aligncenter",command:"JustifyCenter"},{title:"Right",icon:"align-right",format:"alignright",command:"JustifyRight"},{title:"Justify",icon:"align-justify",format:"alignjustify",command:"JustifyFull"}],lB=e=>{const t={type:"basic",data:iB};return{tooltip:QD(e,rB,aB),text:A.none(),icon:A.some("align-left"),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:e=>A.none,onAction:t=>()=>G(iB,(e=>e.format===t.format)).each((t=>e.execCommand(t.command))),updateText:t=>{const o=G(iB,(t=>e.formatter.match(t.format))).fold(x(aB),(e=>e.title.toLowerCase()));Rr(t,E_,{icon:`align-${o}`}),((e,t)=>{e.dispatch("AlignTextUpdate",t)})(e,{value:o})},dataset:t,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},cB=(e,t)=>{const o=t(),n=L(o,(e=>e.format));return A.from(e.formatter.closest(n)).bind((e=>G(o,(t=>t.format===e)))).orThunk((()=>Ce(e.formatter.match("p"),{title:"Paragraph",format:"p"})))},dB="Block {0}",uB="Paragraph",mB=e=>{const t=sB(e,"block_formats",nB.SemiColon);return{tooltip:QD(e,dB,uB),text:A.some(uB),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:kw(e),updateText:o=>{const n=cB(e,(()=>t.data)).fold(x(uB),(e=>e.title));Rr(o,T_,{text:n}),((e,t)=>{e.dispatch("BlocksTextUpdate",t)})(e,{value:n})},dataset:t,shouldHide:!1,isInvalid:t=>!e.formatter.canApply(t.format)}},gB="Font {0}",pB="System Font",hB=["-apple-system","Segoe UI","Roboto","Helvetica Neue","sans-serif"],fB=e=>{const t=e.split(/\s*,\s*/);return L(t,(e=>e.replace(/^['"]+|['"]+$/g,"")))},bB=(e,t)=>t.length>0&&X(t,(t=>e.indexOf(t.toLowerCase())>-1)),vB=e=>{const t=()=>{const t=e=>e?fB(e)[0]:"",n=e.queryCommandValue("FontName"),s=o.data,r=n?n.toLowerCase():"",a=Kb(e),i=G(s,(e=>{const o=e.format;return o.toLowerCase()===r||t(o).toLowerCase()===t(r).toLowerCase()})).orThunk((()=>Ce(((e,t)=>{if(0===e.indexOf("-apple-system")||t.length>0){const o=fB(e.toLowerCase());return bB(o,hB)||bB(o,t)}return!1})(r,a),{title:pB,format:r})));return{matchOpt:i,font:n}},o=sB(e,"font_family_formats",nB.SemiColon);return{tooltip:QD(e,gB,pB),text:A.some(pB),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getCurrentValue:()=>{const{matchOpt:e}=t();return e},getPreviewFor:e=>()=>A.some({tag:"div",styles:-1===e.indexOf("dings")?{"font-family":e}:{}}),onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontName",!1,t.format)}))},updateText:o=>{const{matchOpt:n,font:s}=t(),r=n.fold(x(s),(e=>e.title));Rr(o,T_,{text:r}),((e,t)=>{e.dispatch("FontFamilyTextUpdate",t)})(e,{value:r})},dataset:o,shouldHide:!1,isInvalid:T}},yB={unsupportedLength:["em","ex","cap","ch","ic","rem","lh","rlh","vw","vh","vi","vb","vmin","vmax","cm","mm","Q","in","pc","pt","px"],fixed:["px","pt"],relative:["%"],empty:[""]},xB=(()=>{const e="[0-9]+",t="[eE][+-]?"+e,o=e=>`(?:${e})?`,n=["Infinity",e+"\\."+o(e)+o(t),"\\."+e+o(t),e+o(t)].join("|");return new RegExp(`^([+-]?(?:${n}))(.*)$`)})(),wB=(e,t)=>A.from(xB.exec(e)).bind((e=>{const o=Number(e[1]),n=e[2];return((e,t)=>N(t,(t=>N(yB[t],(t=>e===t)))))(n,t)?A.some({value:o,unit:n}):A.none()})),SB={tab:x(9),escape:x(27),enter:x(13),backspace:x(8),delete:x(46),left:x(37),up:x(38),right:x(39),down:x(40),space:x(32),home:x(36),end:x(35),pageUp:x(33),pageDown:x(34)},kB="Font size {0}",CB="12pt",OB={"8pt":"1","10pt":"2","12pt":"3","14pt":"4","18pt":"5","24pt":"6","36pt":"7"},_B={"xx-small":"7pt","x-small":"8pt",small:"10pt",medium:"12pt",large:"14pt","x-large":"18pt","xx-large":"24pt"},TB=(e,t)=>/[0-9.]+px$/.test(e)?((e,t)=>{const o=Math.pow(10,t);return Math.round(e*o)/o})(72*parseInt(e,10)/96,t||0)+"pt":be(_B,e).getOr(e),EB=e=>be(OB,e).getOr(""),AB=e=>{const t=()=>{let t=A.none();const o=n.data,s=e.queryCommandValue("FontSize");if(s)for(let e=3;t.isNone()&&e>=0;e--){const n=TB(s,e),r=EB(n);t=G(o,(e=>e.format===s||e.format===n||e.format===r))}return{matchOpt:t,size:s}},o=x(A.none),n=sB(e,"font_size_formats",nB.Space);return{tooltip:QD(e,kB,CB),text:A.some(CB),icon:A.none(),isSelectedFor:e=>t=>t.exists((t=>t.format===e)),getPreviewFor:o,getCurrentValue:()=>{const{matchOpt:e}=t();return e},onAction:t=>()=>{e.undoManager.transact((()=>{e.focus(),e.execCommand("FontSize",!1,t.format)}))},updateText:o=>{const{matchOpt:n,size:s}=t(),r=n.fold(x(s),(e=>e.title));Rr(o,T_,{text:r}),((e,t)=>{e.dispatch("FontSizeTextUpdate",t)})(e,{value:r})},dataset:n,shouldHide:!1,isInvalid:T}},MB="Format {0}",DB=(e,t)=>{const o="Paragraph";return{tooltip:QD(e,MB,o),text:A.some(o),icon:A.none(),isSelectedFor:t=>()=>e.formatter.match(t),getCurrentValue:A.none,getPreviewFor:t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},onAction:kw(e),updateText:t=>{const n=e=>VE(e)?Y(e.items,n):zE(e)?[{title:e.title,format:e.format}]:[],s=Y(PE(e),n),r=cB(e,x(s)).fold(x(o),(e=>e.title));Rr(t,T_,{text:r}),((e,t)=>{e.dispatch("StylesTextUpdate",t)})(e,{value:r})},shouldHide:Sb(e),isInvalid:t=>!e.formatter.canApply(t.format),dataset:t}},BB=x([ns("toggleClass"),ns("fetch"),Vi("onExecute"),xs("getHotspot",A.some),xs("getAnchorOverrides",x({})),Oc(),Vi("onItemExecute"),ms("lazySink"),ns("dom"),Ri("onOpen"),yu("splitDropdownBehaviours",[fS,Gp,ah]),xs("matchWidth",!1),xs("useMinWidth",!1),xs("eventOrder",{}),ms("role")].concat(IS())),IB=$u({factory:qh,schema:[ns("dom")],name:"arrow",defaults:()=>({buttonBehaviours:Tl([ah.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each(Nr)},buttonBehaviours:Tl([ph.config({toggleOnExecute:!1,toggleClass:e.toggleClass})])})}),FB=$u({factory:qh,schema:[ns("dom")],name:"button",defaults:()=>({buttonBehaviours:Tl([ah.revoke()])}),overrides:e=>({dom:{tag:"span",attributes:{role:"presentation"}},action:t=>{t.getSystem().getByUid(e.uid).each((o=>{e.onExecute(o,t)}))}})}),RB=x([IB,FB,Yu({factory:{sketch:e=>({uid:e.uid,dom:{tag:"span",styles:{display:"none"},attributes:{"aria-hidden":"true"},innerHtml:e.text}})},schema:[ns("text")],name:"aria-descriptor"}),qu({schema:[Bi()],name:"menu",defaults:e=>({onExecute:(t,o)=>{t.getSystem().getByUid(e.uid).each((n=>{e.onItemExecute(n,t,o)}))}})}),CS()]),NB=wm({name:"SplitDropdown",configFields:BB(),partFields:RB(),factory:(e,t,o,n)=>{const s=e=>{Om.getCurrent(e).each((e=>{Xm.highlightFirst(e),Gp.focusIn(e)}))},r=t=>{ES(e,w,t,n,s,Uh.HighlightMenuAndItem).get(b)},a=t=>{const o=im(t,e,"button");return Nr(o),A.some(!0)},i={...Hr([Jr(((t,o)=>{am(t,e,"aria-descriptor").each((e=>{const o=ca("aria");Ct(e.element,"id",o),Ct(t.element,"aria-describedby",o)}))}))]),...fh(A.some(r))},l={repositionMenus:e=>{ph.isOn(e)&&BS(e)}};return{uid:e.uid,dom:e.dom,components:t,apis:l,eventOrder:{...e.eventOrder,[mr()]:["disabling","toggling","alloy.base.behaviour"]},events:i,behaviours:wu(e.splitDropdownBehaviours,[fS.config({others:{sandbox:t=>{const o=im(t,e,"arrow");return DS(e,t,{onOpen:()=>{ph.on(o),ph.on(t)},onClose:()=>{ph.off(o),ph.off(t)}})}}}),Gp.config({mode:"special",onSpace:a,onEnter:a,onDown:e=>(r(e),A.some(!0))}),ah.config({}),ph.config({toggleOnExecute:!1,aria:{mode:"expanded"}})]),domModification:{attributes:{role:e.role.getOr("button"),"aria-haspopup":!0}}}},apis:{repositionMenus:(e,t)=>e.repositionMenus(t)}}),VB=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setText:t=>Rr(e,T_,{text:t}),setIcon:t=>Rr(e,E_,{icon:t})}),zB=e=>({setActive:t=>{ph.set(e,t)},isActive:()=>ph.isOn(e),isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setText:t=>Rr(e,T_,{text:t}),setIcon:t=>Rr(e,E_,{icon:t})}),LB=(e,t)=>e.map((e=>({"aria-label":t.translate(e),title:t.translate(e)}))).getOr({}),HB=ca("focus-button"),PB=(e,t,o,n,s)=>{const r=t.map((e=>Xh(__(e,"tox-tbtn",s)))),a=e.map((e=>Xh(O_(e,s.icons))));return{dom:{tag:"button",classes:["tox-tbtn"].concat(t.isSome()?["tox-tbtn--select"]:[]),attributes:LB(o,s)},components:Fx([a.map((e=>e.asSpec())),r.map((e=>e.asSpec()))]),eventOrder:{[js()]:["focusing","alloy.base.behaviour",x_],[kr()]:[x_,"toolbar-group-button-events"]},buttonBehaviours:Tl([Ex(s.isDisabled),Ox(),th(x_,[Jr(((e,t)=>S_(e))),Wr(T_,((e,t)=>{r.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[ri(s.translate(t.event.text))])}))})),Wr(E_,((e,t)=>{a.bind((t=>t.getOpt(e))).each((e=>{eh.set(e,[O_(t.event.icon,s.icons)])}))})),Wr(js(),((e,t)=>{t.event.prevent(),Fr(e,HB)}))])].concat(n.getOr([])))}},UB=(e,t,o)=>{var n;const s=As(b),r=PB(e.icon,e.text,e.tooltip,A.none(),o);return qh.sketch({dom:r.dom,components:r.components,eventOrder:w_,buttonBehaviours:{...Tl([th("toolbar-button-events",[(a={onAction:e.onAction,getApi:t.getApi},ea(((e,t)=>{Ax(a,e)((t=>{Rr(e,y_,{buttonApi:t}),a.onAction(t)}))}))),Mx(t,s),Dx(t,s)]),Ex((()=>!e.enabled||o.isDisabled())),Ox()].concat(t.toolbarButtonBehaviours)),[x_]:null===(n=r.buttonBehaviours)||void 0===n?void 0:n[x_]}});var a},WB=(e,t,o)=>UB(e,{toolbarButtonBehaviours:o.length>0?[th("toolbarButtonWith",o)]:[],getApi:VB,onSetup:e.onSetup},t),jB=(e,t,o)=>UB(e,{toolbarButtonBehaviours:[eh.config({}),ph.config({toggleClass:"tox-tbtn--enabled",aria:{mode:"pressed"},toggleOnExecute:!1})].concat(o.length>0?[th("toolbarToggleButtonWith",o)]:[]),getApi:zB,onSetup:e.onSetup},t),GB=(e,t,o)=>n=>wS((e=>t.fetch(e))).map((s=>A.from(jS(bn(nS(ca("menu-value"),s,(o=>{t.onItemAction(e(n),o)}),t.columns,t.presets,bv.CLOSE_ON_EXECUTE,t.select.getOr(T),o),{movement:rS(t.columns,t.presets),menuBehaviours:ux("auto"!==t.columns?[]:[Jr(((e,o)=>{dx(e,4,Av(t.presets)).each((({numRows:t,numColumns:o})=>{Gp.setGridSize(e,t,o)}))}))])}))))),$B=[{name:"history",items:["undo","redo"]},{name:"ai",items:["aidialog","aishortcuts"]},{name:"styles",items:["styles"]},{name:"formatting",items:["bold","italic"]},{name:"alignment",items:["alignleft","aligncenter","alignright","alignjustify"]},{name:"indentation",items:["outdent","indent"]},{name:"permanent pen",items:["permanentpen"]},{name:"comments",items:["addcomment"]}],qB=(e,t)=>(o,n,s)=>{const r=e(o).mapError((e=>Jn(e))).getOrDie();return t(r,n,s)},YB={button:qB(Ny,((e,t)=>{return o=e,n=t.shared.providers,WB(o,n,[]);var o,n})),togglebutton:qB(Ly,((e,t)=>{return o=e,n=t.shared.providers,jB(o,n,[]);var o,n})),menubutton:qB(hM,((e,t)=>dT(e,"tox-tbtn",t,A.none(),!1))),splitbutton:qB((e=>Yn("SplitButton",fM,e)),((e,t)=>((e,t)=>{const o=e=>({isEnabled:()=>!Lm.isDisabled(e),setEnabled:t=>Lm.set(e,!t),setIconFill:(t,o)=>{vi(e.element,`svg path[class="${t}"], rect[class="${t}"]`).each((e=>{Ct(e,"fill",o)}))},setActive:t=>{Ct(e.element,"aria-pressed",t),vi(e.element,"span").each((o=>{e.getSystem().getByDom(o).each((e=>ph.set(e,t)))}))},isActive:()=>vi(e.element,"span").exists((t=>e.getSystem().getByDom(t).exists(ph.isOn))),setText:t=>vi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Rr(e,T_,{text:t}))))),setIcon:t=>vi(e.element,"span").each((o=>e.getSystem().getByDom(o).each((e=>Rr(e,E_,{icon:t}))))),setTooltip:o=>{const n=t.providers.translate(o);Ot(e.element,{"aria-label":n,title:n})}}),n=As(b),s={getApi:o,onSetup:e.onSetup};return NB.sketch({dom:{tag:"div",classes:["tox-split-button"],attributes:{"aria-pressed":!1,...LB(e.tooltip,t.providers)}},onExecute:t=>{const n=o(t);n.isEnabled()&&e.onAction(n)},onItemExecute:(e,t,o)=>{},splitDropdownBehaviours:Tl([Tx(t.providers.isDisabled),Ox(),th("split-dropdown-events",[Jr(((e,t)=>S_(e))),Wr(HB,ah.focus),Mx(s,n),Dx(s,n)]),Hk.config({})]),eventOrder:{[kr()]:["alloy.base.behaviour","split-dropdown-events"]},toggleClass:"tox-tbtn--enabled",lazySink:t.getSink,fetch:GB(o,e,t.providers),parts:{menu:Rv(0,e.columns,e.presets)},components:[NB.parts.button(PB(e.icon,e.text,A.none(),A.some([ph.config({toggleClass:"tox-tbtn--enabled",toggleOnExecute:!1})]),t.providers)),NB.parts.arrow({dom:{tag:"button",classes:["tox-tbtn","tox-split-button__chevron"],innerHtml:Qf("chevron-down",t.providers.icons)},buttonBehaviours:Tl([Tx(t.providers.isDisabled),Ox(),eb()])}),NB.parts["aria-descriptor"]({text:t.providers.translate("To open the popup, press Shift+Enter")})]})})(e,t.shared))),grouptoolbarbutton:qB((e=>Yn("GroupToolbarButton",mM,e)),((e,t,o)=>{const n=o.ui.registry.getAll().buttons,s={[kc]:t.shared.header.isPositionedAtTop()?Sc.TopToBottom:Sc.BottomToTop};if(Ob(o)===rb.floating)return((e,t,o,n)=>{const s=t.shared,r=As(b),a={toolbarButtonBehaviours:[],getApi:VB,onSetup:e.onSetup},i=[th("toolbar-group-button-events",[Mx(a,r),Dx(a,r)])];return ZM.sketch({lazySink:s.getSink,fetch:()=>wS((t=>{t(L(o(e.items),uD))})),markers:{toggledClass:"tox-tbtn--enabled"},parts:{button:PB(e.icon,e.text,e.tooltip,A.some(i),s.providers),toolbar:{dom:{tag:"div",classes:["tox-toolbar__overflow"],attributes:n}}}})})(e,t,(e=>KB(o,{buttons:n,toolbar:e,allowToolbarGroups:!1},t,A.none())),s);throw new Error("Toolbar groups are only supported when using floating toolbar mode")}))},XB={styles:(e,t)=>{const o={type:"advanced",...t.styles};return oB(e,t,DB(e,o),MB,"StylesTextUpdate")},fontsize:(e,t)=>oB(e,t,AB(e),kB,"FontSizeTextUpdate"),fontsizeinput:(e,t)=>((e,t,o)=>{let n=A.none();const s=Sw(e,"NodeChange SwitchMode",(t=>{const s=t.getComponent();n=A.some(s),o.updateInputValue(s),Lm.set(s,!e.selection.isEditable())})),r=e=>({getComponent:x(e)}),a=As(b),i=ca("custom-number-input-events"),l=(e,t,s)=>{const r=n.map((e=>vu.getValue(e))).getOr(""),a=o.getNewValue(r,e),i=r.length-`${a}`.length,l=n.map((e=>e.element.dom.selectionStart-i)),c=n.map((e=>e.element.dom.selectionEnd-i));o.onAction(a,s),n.each((e=>{vu.setValue(e,a),t&&(l.each((t=>e.element.dom.selectionStart=t)),c.each((t=>e.element.dom.selectionEnd=t)))}))},c=(e,t)=>l(((e,t)=>e-t),e,t),d=(e,t)=>l(((e,t)=>e+t),e,t),u=e=>at(e.element).fold(A.none,(e=>(Rl(e),A.some(!0)))),m=e=>Vl(e.element)?(dt(e.element).each((e=>Rl(e))),A.some(!0)):A.none(),g=(o,n,s,a)=>{const i=As(b),l=t.shared.providers.translate(s),c=ca("altExecuting"),d=Sw(e,"NodeChange SwitchMode",(t=>{Lm.set(t.getComponent(),!e.selection.isEditable())})),u=e=>{Lm.isDisabled(e)||o(!0)};return qh.sketch({dom:{tag:"button",attributes:{title:l,"aria-label":l},classes:a.concat(n)},components:[C_(n,t.shared.providers.icons)],buttonBehaviours:Tl([Lm.config({}),th(c,[Mx({onSetup:d,getApi:r},i),Dx({getApi:r},i),Wr(Js(),((e,t)=>{t.event.raw.keyCode!==SB.space()&&t.event.raw.keyCode!==SB.enter()||Lm.isDisabled(e)||o(!1)})),Wr(tr(),u),Wr(Us(),u)])]),eventOrder:{[Js()]:[c,"keying"],[tr()]:[c,"alloy.base.behaviour"],[Us()]:[c,"alloy.base.behaviour"]}})},p=Xh(g((e=>c(!1,e)),"minus","Decrease font size",[])),h=Xh(g((e=>d(!1,e)),"plus","Increase font size",[])),f=Xh({dom:{tag:"div",classes:["tox-input-wrapper"]},components:[Hv.sketch({inputBehaviours:Tl([Lm.config({}),th(i,[Mx({onSetup:s,getApi:r},a),Dx({getApi:r},a)]),th("input-update-display-text",[Wr(T_,((e,t)=>{vu.setValue(e,t.event.text)})),Wr(Ks(),(e=>{o.onAction(vu.getValue(e))})),Wr(er(),(e=>{o.onAction(vu.getValue(e))}))]),Gp.config({mode:"special",onEnter:e=>(l(w,!0,!0),A.some(!0)),onEscape:u,onUp:e=>(d(!0,!1),A.some(!0)),onDown:e=>(c(!0,!1),A.some(!0)),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})],behaviours:Tl([ah.config({}),Gp.config({mode:"special",onEnter:m,onSpace:m,onEscape:u}),th("input-wrapper-events",[Wr(Ys(),(e=>{H([p,h],(t=>{const o=ze(t.get(e).element.dom);Vl(o)&&Nl(o)}))}))])])});return{dom:{tag:"div",classes:["tox-number-input"]},components:[p.asSpec(),f.asSpec(),h.asSpec()],behaviours:Tl([ah.config({}),Gp.config({mode:"flow",focusInside:vg.OnEnterOrSpaceMode,cycles:!1,selector:"button, .tox-input-wrapper",onEscape:e=>Vl(e.element)?A.none():(Rl(e.element),A.some(!0))})])}})(e,t,(e=>{const t=()=>e.queryCommandValue("FontSize");return{updateInputValue:e=>Rr(e,T_,{text:t()}),onAction:(t,o)=>e.execCommand("FontSize",!1,t,{skip_focus:!o}),getNewValue:(o,n)=>{wB(o,["unsupportedLength","empty"]);const s=t(),r=wB(o,["unsupportedLength","empty"]).or(wB(s,["unsupportedLength","empty"])),a=r.map((e=>e.value)).getOr(16),i=Nb(e),l=r.map((e=>e.unit)).filter((e=>""!==e)).getOr(i),c=n(a,(e=>{var t;return null!==(t={em:{step:.1},cm:{step:.1},in:{step:.1},pc:{step:.1},ch:{step:.1},rem:{step:.1}}[e])&&void 0!==t?t:{step:1}})(l).step),d=`${(e=>e>=0)(c)?c:a}${l}`;return d!==s&&((e,t)=>{e.dispatch("FontSizeInputTextUpdate",t)})(e,{value:d}),d}}})(e)),fontfamily:(e,t)=>oB(e,t,vB(e),gB,"FontFamilyTextUpdate"),blocks:(e,t)=>oB(e,t,mB(e),dB,"BlocksTextUpdate"),align:(e,t)=>oB(e,t,lB(e),rB,"AlignTextUpdate")},KB=(e,t,o,n)=>{const s=(e=>{const t=e.toolbar,o=e.buttons;return!1===t?[]:void 0===t||!0===t?(e=>{const t=L($B,(t=>{const o=U(t.items,(t=>ve(e,t)||ve(XB,t)));return{name:t.name,items:o}}));return U(t,(e=>e.items.length>0))})(o):r(t)?(e=>{const t=e.split("|");return L(t,(e=>({items:e.trim().split(" ")})))})(t):(e=>f(e,(e=>ve(e,"name")&&ve(e,"items"))))(t)?t:(console.error("Toolbar type should be string, string[], boolean or ToolbarGroup[]"),[])})(t),a=L(s,(s=>{const r=Y(s.items,(s=>0===s.trim().length?[]:((e,t,o,n,s,r)=>be(t,o.toLowerCase()).orThunk((()=>r.bind((e=>re(e,(e=>be(t,e+o.toLowerCase()))))))).fold((()=>be(XB,o.toLowerCase()).map((t=>t(e,s)))),(t=>"grouptoolbarbutton"!==t.type||n?((e,t,o)=>be(YB,e.type).fold((()=>(console.error("skipping button defined by",e),A.none())),(n=>A.some(n(e,t,o)))))(t,s,e):(console.warn(`Ignoring the '${o}' toolbar button. Group toolbar buttons are only supported when using floating toolbar mode and cannot be nested.`),A.none()))))(e,t.buttons,s,t.allowToolbarGroups,o,n).toArray()));return{title:A.from(e.translate(s.name)),items:r}}));return U(a,(e=>e.items.length>0))},JB=(e,t,o,n)=>{const s=t.mainUi.outerContainer,a=o.toolbar,i=o.buttons;if(f(a,r)){const t=a.map((t=>{const s={toolbar:t,buttons:i,allowToolbarGroups:o.allowToolbarGroups};return KB(e,s,n,A.none())}));UD.setToolbars(s,t)}else UD.setToolbar(s,KB(e,o,n,A.none()))},ZB=Bo(),QB=ZB.os.isiOS()&&ZB.os.version.major<=12;var eI=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=t,i=As(0),l=r.outerContainer;JD(e);const d=ze(s.targetNode),u=bt(ft(d));Ld(d,r.mothership),((e,t,o)=>{uv(e)&&Ld(o.mainUi.mothership.element,o.popupUi.mothership),zd(t,o.dialogUi.mothership)})(e,u,t),e.on("SkinLoaded",(()=>{UD.setSidebar(l,o.sidebar,qb(e)),JB(e,t,o,n),i.set(e.getWin().innerWidth),UD.setMenubar(l,GD(e,o)),UD.setViews(l,o.views),((e,t)=>{const{uiMotherships:o}=t,n=e.dom;let s=e.getWin();const r=e.getDoc().documentElement,a=As(qt(s.innerWidth,s.innerHeight)),i=As(qt(r.offsetWidth,r.offsetHeight)),l=()=>{const t=a.get();t.left===s.innerWidth&&t.top===s.innerHeight||(a.set(qt(s.innerWidth,s.innerHeight)),fw(e))},c=()=>{const t=e.getDoc().documentElement,o=i.get();o.left===t.offsetWidth&&o.top===t.offsetHeight||(i.set(qt(t.offsetWidth,t.offsetHeight)),fw(e))},d=t=>{((e,t)=>{e.dispatch("ScrollContent",t)})(e,t)};n.bind(s,"resize",l),n.bind(s,"scroll",d);const u=ac(ze(e.getBody()),"load",c);e.on("hide",(()=>{H(o,(e=>{Bt(e.element,"display","none")}))})),e.on("show",(()=>{H(o,(e=>{Ht(e.element,"display")}))})),e.on("NodeChange",c),e.on("remove",(()=>{u.unbind(),n.unbind(s,"resize",l),n.unbind(s,"scroll",d),s=null}))})(e,t)}));const m=UD.getSocket(l).getOrDie("Could not find expected socket element");if(QB){It(m.element,{overflow:"scroll","-webkit-overflow-scrolling":"touch"});const t=((e,t)=>{let o=null;return{cancel:()=>{c(o)||(clearTimeout(o),o=null)},throttle:(...t)=>{c(o)&&(o=setTimeout((()=>{o=null,e.apply(null,t)}),20))}}})((()=>{e.dispatch("ScrollContent")})),o=rc(m.element,"scroll",t.throttle);e.on("remove",o.unbind)}Cx(e,t),e.addCommand("ToggleSidebar",((t,o)=>{UD.toggleSidebar(l,o),e.dispatch("ToggleSidebar")})),e.addQueryValueHandler("ToggleSidebar",(()=>{var e;return null!==(e=UD.whichSidebar(l))&&void 0!==e?e:""})),e.addCommand("ToggleView",((t,o)=>{if(UD.toggleView(l,o)){const t=l.element;r.mothership.broadcastOn([Qd()],{target:t}),H(a,(e=>{e.broadcastOn([Qd()],{target:t})})),c(UD.whichView(l))&&(e.focus(),e.nodeChanged(),UD.refreshToolbar(l))}})),e.addQueryValueHandler("ToggleView",(()=>{var e;return null!==(e=UD.whichView(l))&&void 0!==e?e:""}));const g=Ob(e);g!==rb.sliding&&g!==rb.floating||e.on("ResizeWindow ResizeEditor ResizeContent",(()=>{const o=e.getWin().innerWidth;o!==i.get()&&(UD.refreshToolbar(t.mainUi.outerContainer),i.set(o))}));const p={setEnabled:e=>{kx(t,!e)},isEnabled:()=>!Lm.isDisabled(l)};return{iframeContainer:m.element.dom,editorContainer:l.element.dom,api:p}}});const tI=e=>/^[0-9\.]+(|px)$/i.test(""+e)?A.some(parseInt(""+e,10)):A.none(),oI=e=>h(e)?e+"px":e,nI=(e,t,o)=>{const n=t.filter((t=>e<t)),s=o.filter((t=>e>t));return n.or(s).getOr(e)},sI=e=>{const t=hb(e),o=fb(e),n=vb(e);return tI(t).map((e=>nI(e,o,n)))},{ToolbarLocation:rI,ToolbarMode:aI}=gv,iI=(e,t,o,n,s)=>{const{mainUi:r,uiMotherships:a}=o,i=ib.DOM,l=iv(e),c=dv(e),d=vb(e).or(sI(e)),u=n.shared.header,m=u.isPositionedAtTop,g=Ob(e),p=g===aI.sliding||g===aI.floating,h=As(!1),f=()=>h.get()&&!e.removed,b=e=>p?e.fold(x(0),(e=>e.components().length>1?jt(e.components()[1].element):0)):0,v=()=>{H(a,(e=>{e.broadcastOn([eu()],{})}))},y=o=>{if(!f())return;l||s.on((e=>{const o=d.getOrThunk((()=>{const e=tI(Rt(wt(),"margin-left")).getOr(0);return Zt(wt())-Xt(t).left+e}));Bt(e.element,"max-width",o+"px")}));const n=l?A.none():(()=>{if(l)return A.none();if(Xt(r.outerContainer.element).left+Qt(r.outerContainer.element)>=window.innerWidth-40||Vt(r.outerContainer.element,"width").isSome()){Bt(r.outerContainer.element,"position","absolute"),Bt(r.outerContainer.element,"left","0px"),Ht(r.outerContainer.element,"width");const e=Qt(r.outerContainer.element);return A.some(e)}return A.none()})();p&&UD.refreshToolbar(r.outerContainer),l||(o=>{s.on((n=>{const s=UD.getToolbar(r.outerContainer),a=b(s),i=Zo(t),{top:l,left:c}=((e,t)=>uv(e)?AA(t):A.none())(e,r.outerContainer.element).fold((()=>({top:m()?Math.max(i.y-jt(n.element)+a,0):i.bottom,left:i.x})),(e=>{var t;const o=Zo(e),s=null!==(t=e.dom.scrollTop)&&void 0!==t?t:0,r=Qe(e,wt()),l=r?Math.max(i.y-jt(n.element)+a,0):i.y-o.y+s-jt(n.element)+a;return{top:m()?l:i.bottom,left:r?i.x:i.x-o.x}})),d={position:"absolute",left:Math.round(c)+"px",top:Math.round(l)+"px"},u=o.map((e=>{const t=Wo(),o=window.innerWidth-(c-t.left);return{width:Math.max(Math.min(e,o),150)+"px"}})).getOr({});It(r.outerContainer.element,{...d,...u})}))})(n),c&&s.on(o),v()},w=()=>!(l||!c||!f())&&s.get().exists((o=>{const n=u.getDockingMode(),a=(o=>{switch(Tb(e)){case rI.auto:const e=UD.getToolbar(r.outerContainer),n=b(e),s=jt(o.element)-n,a=Zo(t);if(a.y>s)return"top";{const e=nt(t),o=Math.max(e.dom.scrollHeight,jt(e));return a.bottom<o-s||tn().bottom<a.bottom-s?"bottom":"top"}case rI.bottom:return"bottom";case rI.top:default:return"top"}})(o);return a!==n&&(i=a,s.on((e=>{tM.setModes(e,[i]),u.setDockingMode(i);const t=m()?Sc.TopToBottom:Sc.BottomToTop;Ct(e.element,kc,t)})),!0);var i}));return{isVisible:f,isPositionedAtTop:m,show:()=>{h.set(!0),Bt(r.outerContainer.element,"display","flex"),i.addClass(e.getBody(),"mce-edit-focus"),H(a,(e=>{Ht(e.element,"display")})),w(),uv(e)?y((e=>tM.isDocked(e)?tM.reset(e):tM.refresh(e))):y(tM.refresh)},hide:()=>{h.set(!1),Bt(r.outerContainer.element,"display","none"),i.removeClass(e.getBody(),"mce-edit-focus"),H(a,(e=>{Bt(e.element,"display","none")}))},update:y,updateMode:()=>{w()&&y(tM.reset)},repositionPopups:v}},lI=(e,t)=>{const o=Zo(e);return{pos:t?o.y:o.bottom,bounds:o}};var cI=Object.freeze({__proto__:null,render:(e,t,o,n,s)=>{const{mainUi:r}=t,a=nc(),i=ze(s.targetNode),l=iI(e,i,t,n,a),c=Mb(e);ZD(e);const d=()=>{if(a.isSet())return void l.show();a.set(UD.getHeader(r.outerContainer).getOrDie());const s=lv(e);uv(e)?(Ld(i,r.mothership),Ld(i,t.popupUi.mothership)):zd(s,r.mothership),zd(s,t.dialogUi.mothership),JB(e,t,o,n),UD.setMenubar(r.outerContainer,GD(e,o)),l.show(),((e,t,o,n)=>{const s=As(lI(t,o.isPositionedAtTop())),r=n=>{const{pos:r,bounds:a}=lI(t,o.isPositionedAtTop()),{pos:i,bounds:l}=s.get(),c=a.height!==l.height||a.width!==l.width;s.set({pos:r,bounds:a}),c&&fw(e,n),o.isVisible()&&(i!==r?o.update(tM.reset):c&&(o.updateMode(),o.repositionPopups()))};n||(e.on("activate",o.show),e.on("deactivate",o.hide)),e.on("SkinLoaded ResizeWindow",(()=>o.update(tM.reset))),e.on("NodeChange keydown",(e=>{requestAnimationFrame((()=>r(e)))}));let a=0;const i=KO((()=>o.update(tM.refresh)),33);e.on("ScrollWindow",(()=>{const e=Wo().left;e!==a&&(a=e,i.throttle()),o.updateMode()})),uv(e)&&e.on("ElementScroll",(e=>{o.update(tM.refresh)}));const l=oc();l.set(ac(ze(e.getBody()),"load",(e=>r(e.raw)))),e.on("remove",(()=>{l.clear()}))})(e,i,l,c),e.nodeChanged()};e.on("show",d),e.on("hide",l.hide),c||(e.on("focus",d),e.on("blur",l.hide)),e.on("init",(()=>{(e.hasFocus()||c)&&d()})),Cx(e,t);const u={show:d,hide:l.hide,setEnabled:e=>{kx(t,!e)},isEnabled:()=>!Lm.isDisabled(r.outerContainer)};return{editorContainer:r.outerContainer.element.dom,api:u}}});const dI="contexttoolbar-hide",uI=(e,t)=>Wr(y_,((o,n)=>{const s=(e=>({hide:()=>Fr(e,fr()),getValue:()=>vu.getValue(e)}))(e.get(o));t.onAction(s,n.event.buttonApi)})),mI=(e,t)=>{const o=e.label.fold((()=>({})),(e=>({"aria-label":e}))),n=Xh(Hv.sketch({inputClasses:["tox-toolbar-textfield","tox-toolbar-nav-js"],data:e.initValue(),inputAttributes:o,selectOnFocus:!0,inputBehaviours:Tl([Gp.config({mode:"special",onEnter:e=>s.findPrimary(e).map((e=>(Nr(e),!0))),onLeft:(e,t)=>(t.cut(),A.none()),onRight:(e,t)=>(t.cut(),A.none())})])})),s=((e,t,o)=>{const n=L(t,(t=>Xh(((e,t,o)=>(e=>"contextformtogglebutton"===e.type)(t)?((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Ly({...s,type:"togglebutton",onAction:b}));return jB(r,o,[uI(e,t)])})(e,t,o):((e,t,o)=>{const{primary:n,...s}=t.original,r=Xn(Ny({...s,type:"button",onAction:b}));return WB(r,o,[uI(e,t)])})(e,t,o))(e,t,o))));return{asSpecs:()=>L(n,(e=>e.asSpec())),findPrimary:e=>re(t,((t,o)=>t.primary?A.from(n[o]).bind((t=>t.getOpt(e))).filter(C(Lm.isDisabled)):A.none()))}})(n,e.commands,t);return[{title:A.none(),items:[n.asSpec()]},{title:A.none(),items:s.asSpecs()}]},gI=(e,t,o)=>t.bottom-e.y>=o&&e.bottom-t.y>=o,pI=e=>{const t=(e=>{const t=e.getBoundingClientRect();if(t.height<=0&&t.width<=0){const o=mt(ze(e.startContainer),e.startOffset).element;return(qe(o)?rt(o):A.some(o)).filter($e).map((e=>e.dom.getBoundingClientRect())).getOr(t)}return t})(e.selection.getRng());if(e.inline){const e=Wo();return Jo(e.left+t.left,e.top+t.top,t.width,t.height)}{const o=Qo(ze(e.getBody()));return Jo(o.x+t.left,o.y+t.top,t.width,t.height)}},hI=(e,t,o,n=0)=>{const s=$o(window),r=Zo(ze(e.getContentAreaContainer())),a=Zb(e)||ov(e)||sv(e),{x:i,width:l}=((e,t,o)=>{const n=Math.max(e.x+o,t.x);return{x:n,width:Math.min(e.right-o,t.right)-n}})(r,s,n);if(e.inline&&!a)return Jo(i,s.y,l,s.height);{const a=t.header.isPositionedAtTop(),{y:c,bottom:d}=((e,t,o,n,s,r)=>{const a=ze(e.getContainer()),i=vi(a,".tox-editor-header").getOr(a),l=Zo(i),c=l.y>=t.bottom,d=n&&!c;if(e.inline&&d)return{y:Math.max(l.bottom+r,o.y),bottom:o.bottom};if(e.inline&&!d)return{y:o.y,bottom:Math.min(l.y-r,o.bottom)};const u="line"===s?Zo(a):t;return d?{y:Math.max(l.bottom+r,o.y),bottom:Math.min(u.bottom-r,o.bottom)}:{y:Math.max(u.y+r,o.y),bottom:Math.min(l.y-r,o.bottom)}})(e,r,s,a,o,n);return Jo(i,c,l,d-c)}},fI={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"],inset:["tox-pop--inset"]},bI={maxHeightFunction:gc(),maxWidthFunction:GM()},vI=e=>"node"===e,yI=(e,t,o,n,s)=>{const r=pI(e),a=n.lastElement().exists((e=>Qe(o,e)));return((e,t)=>{const o=e.selection.getRng(),n=mt(ze(o.startContainer),o.startOffset);return o.startContainer===o.endContainer&&o.startOffset===o.endOffset-1&&Qe(n.element,t)})(e,o)?a?SE:bE:a?((e,o,s)=>{const a=Vt(e,"position");Bt(e,"position",o);const i=gI(r,Zo(t),-20)&&!n.isReposition()?CE:SE;return a.each((t=>Bt(e,"position",t))),i})(t,n.getMode()):("fixed"===n.getMode()?s.y+Wo().top:s.y)+(jt(t)+12)<=r.y?bE:vE},xI=(e,t,o,n)=>{const s=t=>(n,s,r,a,i)=>({...yI(e,a,t,o,i)({...n,y:i.y,height:i.height},s,r,a,i),alwaysFit:!0}),r=e=>vI(n)?[s(e)]:[];return t?{onLtr:e=>[gl,ll,cl,dl,ul,ml].concat(r(e)),onRtl:e=>[gl,cl,ll,ul,dl,ml].concat(r(e))}:{onLtr:e=>[ml,gl,dl,ll,ul,cl].concat(r(e)),onRtl:e=>[ml,gl,ul,cl,dl,ll].concat(r(e))}},wI=(e,t)=>{const o=U(t,(t=>t.predicate(e.dom))),{pass:n,fail:s}=P(o,(e=>"contexttoolbar"===e.type));return{contextToolbars:n,contextForms:s}},SI=(e,t)=>{const o={},n=[],s=[],r={},a={},i=ae(e);return H(i,(i=>{const l=e[i];"contextform"===l.type?((e,i)=>{const l=Xn(Yn("ContextForm",$y,i));o[e]=l,l.launch.map((o=>{r["form:"+e]={...i.launch,type:"contextformtogglebutton"===o.type?"togglebutton":"button",onAction:()=>{t(l)}}})),"editor"===l.scope?s.push(l):n.push(l),a[e]=l})(i,l):"contexttoolbar"===l.type&&((e,t)=>{var o;(o=t,Yn("ContextToolbar",qy,o)).each((o=>{"editor"===t.scope?s.push(o):n.push(o),a[e]=o}))})(i,l)})),{forms:o,inNodeScope:n,inEditorScope:s,lookupTable:a,formNavigators:r}},kI=ca("forward-slide"),CI=ca("backward-slide"),OI=ca("change-slide-event"),_I="tox-pop--resizing",TI="tox-pop--transition",EI=(e,t,o,n)=>{const s=n.backstage,r=s.shared,a=Bo().deviceType.isTouch,i=nc(),l=nc(),c=nc(),d=ci((e=>{const t=As([]);return Gh.sketch({dom:{tag:"div",classes:["tox-pop"]},fireDismissalEventInstead:{event:"doNotDismissYet"},onShow:e=>{t.set([]),Gh.getContent(e).each((e=>{Ht(e.element,"visibility")})),Ga(e.element,_I),Ht(e.element,"width")},inlineBehaviours:Tl([th("context-toolbar-events",[Kr(nr(),((e,t)=>{"width"===t.event.raw.propertyName&&(Ga(e.element,_I),Ht(e.element,"width"))})),Wr(OI,((e,t)=>{const o=e.element;Ht(o,"width");const n=Zt(o);Gh.setContent(e,t.event.contents),Wa(o,_I);const s=Zt(o);Bt(o,"width",n+"px"),Gh.getContent(e).each((e=>{t.event.focus.bind((e=>(Rl(e),Ll(o)))).orThunk((()=>(Gp.focusIn(e),zl(ft(o)))))})),setTimeout((()=>{Bt(e.element,"width",s+"px")}),0)})),Wr(kI,((e,o)=>{Gh.getContent(e).each((o=>{t.set(t.get().concat([{bar:o,focus:zl(ft(e.element))}]))})),Rr(e,OI,{contents:o.event.forwardContents,focus:A.none()})})),Wr(CI,((e,o)=>{ne(t.get()).each((o=>{t.set(t.get().slice(0,t.get().length-1)),Rr(e,OI,{contents:di(o.bar),focus:o.focus})}))}))]),Gp.config({mode:"special",onEscape:o=>ne(t.get()).fold((()=>e.onEscape()),(e=>(Fr(o,CI),A.some(!0))))})]),lazySink:()=>rn.value(e.sink)})})({sink:o,onEscape:()=>(e.focus(),A.some(!0))})),u=()=>{const t=c.get().getOr("node"),o=vI(t)?1:0;return hI(e,r,t,o)},m=()=>!(e.removed||a()&&s.isContextMenuOpen()),g=()=>{if(m()){const t=u(),o=xe(c.get(),"node")?((e,t)=>t.filter((e=>xt(e)&&Ge(e))).map(Qo).getOrThunk((()=>pI(e))))(e,i.get()):pI(e);return t.height<=0||!gI(o,t,.01)}return!0},p=()=>{i.clear(),l.clear(),c.clear(),Gh.hide(d)},h=()=>{if(Gh.isOpen(d)){const e=d.element;Ht(e,"display"),g()?Bt(e,"display","none"):(l.set(0),Gh.reposition(d))}},f=t=>({dom:{tag:"div",classes:["tox-pop__dialog"]},components:[t],behaviours:Tl([Gp.config({mode:"acyclic"}),th("pop-dialog-wrap-events",[Jr((t=>{e.shortcuts.add("ctrl+F9","focus statusbar",(()=>Gp.focusIn(t)))})),Zr((t=>{e.shortcuts.remove("ctrl+F9")}))])])}),v=eo((()=>SI(t,(e=>{const t=y([e]);Rr(d,kI,{forwardContents:f(t)})})))),y=t=>{const{buttons:o}=e.ui.registry.getAll(),s={...o,...v().formNavigators},a=Ob(e)===rb.scrolling?rb.scrolling:rb.default,i=q(L(t,(t=>"contexttoolbar"===t.type?((t,o)=>KB(e,{buttons:t,toolbar:o.items,allowToolbarGroups:!1},n.backstage,A.some(["form:"])))(s,t):((e,t)=>mI(e,t))(t,r.providers))));return fD({type:a,uid:ca("context-toolbar"),initGroups:i,onEscape:A.none,cyclicKeying:!0,providers:r.providers})},x=(t,n)=>{if(S.cancel(),!m())return;const s=y(t),p=t[0].position,h=((t,n)=>{const s="node"===t?r.anchors.node(n):r.anchors.cursor(),c=((e,t,o,n)=>"line"===t?{bubble:bc(12,0,fI),layouts:{onLtr:()=>[pl],onRtl:()=>[hl]},overrides:bI}:{bubble:bc(0,12,fI,1/12),layouts:xI(e,o,n,t),overrides:bI})(e,t,a(),{lastElement:i.get,isReposition:()=>xe(l.get(),0),getMode:()=>_d.getMode(o)});return bn(s,c)})(p,n);c.set(p),l.set(1);const b=d.element;Ht(b,"display"),(e=>xe(Se(e,i.get(),Qe),!0))(n)||(Ga(b,TI),_d.reset(o,d)),Gh.showWithinBounds(d,f(s),{anchor:h,transition:{classes:[TI],mode:"placement"}},(()=>A.some(u()))),n.fold(i.clear,i.set),g()&&Bt(b,"display","none")};let w=!1;const S=KO((()=>{!e.hasFocus()||e.removed||w||($a(d.element,TI)?S.throttle():((e,t)=>{const o=ze(t.getBody()),n=e=>Qe(e,o),s=ze(t.selection.getNode());return(e=>!n(e)&&!et(o,e))(s)?A.none():((e,t,o)=>{const n=wI(e,t);if(n.contextForms.length>0)return A.some({elem:e,toolbars:[n.contextForms[0]]});{const t=wI(e,o);if(t.contextForms.length>0)return A.some({elem:e,toolbars:[t.contextForms[0]]});if(n.contextToolbars.length>0||t.contextToolbars.length>0){const o=(e=>{if(e.length<=1)return e;{const t=t=>N(e,(e=>e.position===t)),o=t=>U(e,(e=>e.position===t)),n=t("selection"),s=t("node");if(n||s){if(s&&n){const e=o("node"),t=L(o("selection"),(e=>({...e,position:"node"})));return e.concat(t)}return o(n?"selection":"node")}return o("line")}})(n.contextToolbars.concat(t.contextToolbars));return A.some({elem:e,toolbars:o})}return A.none()}})(s,e.inNodeScope,e.inEditorScope).orThunk((()=>((e,t,o)=>e(t)?A.none():Fs(t,(e=>{if($e(e)){const{contextToolbars:t,contextForms:n}=wI(e,o.inNodeScope),s=n.length>0?n:(e=>{if(e.length<=1)return e;{const t=t=>G(e,(e=>e.position===t));return t("selection").orThunk((()=>t("node"))).orThunk((()=>t("line"))).map((e=>e.position)).fold((()=>[]),(t=>U(e,(e=>e.position===t))))}})(t);return s.length>0?A.some({elem:e,toolbars:s}):A.none()}return A.none()}),e))(n,s,e)))})(v(),e).fold(p,(e=>{x(e.toolbars,A.some(e.elem))})))}),17);e.on("init",(()=>{e.on("remove",p),e.on("ScrollContent ScrollWindow ObjectResized ResizeEditor longpress",h),e.on("click keyup focus SetContent",S.throttle),e.on(dI,p),e.on("contexttoolbar-show",(t=>{const o=v();be(o.lookupTable,t.toolbarKey).each((o=>{x([o],Ce(t.target!==e,t.target)),Gh.getContent(d).each(Gp.focusIn)}))})),e.on("focusout",(t=>{$h.setEditorTimeout(e,(()=>{Ll(o.element).isNone()&&Ll(d.element).isNone()&&p()}),0)})),e.on("SwitchMode",(()=>{e.mode.isReadOnly()&&p()})),e.on("AfterProgressState",(t=>{t.state?p():e.hasFocus()&&S.throttle()})),e.on("dragstart",(()=>{w=!0})),e.on("dragend drop",(()=>{w=!1})),e.on("NodeChange",(e=>{Ll(d.element).fold(S.throttle,b)}))}))},AI=(e,t)=>{const o=()=>{const o=t.getOptions(e),n=t.getCurrent(e).map(t.hash),s=nc();return L(o,(o=>({type:"togglemenuitem",text:t.display(o),onSetup:r=>{const a=e=>{e&&(s.on((e=>e.setActive(!1))),s.set(r)),r.setActive(e)};a(xe(n,t.hash(o)));const i=t.watcher(e,o,a);return()=>{s.clear(),i()}},onAction:()=>t.setCurrent(e,o)})))};e.ui.registry.addMenuButton(t.name,{tooltip:t.text,icon:t.icon,fetch:e=>e(o()),onSetup:t.onToolbarSetup}),e.ui.registry.addNestedMenuItem(t.name,{type:"nestedmenuitem",text:t.text,getSubmenuItems:o,onSetup:t.onMenuSetup})},MI=e=>{AI(e,(e=>({name:"lineheight",text:"Line height",icon:"line-height",getOptions:tv,hash:e=>((e,t)=>wB(e,["fixed","relative","empty"]).map((({value:e,unit:t})=>e+t)))(e).getOr(e),display:w,watcher:(e,t,o)=>e.formatter.formatChanged("lineheight",o,!1,{value:t}).unbind,getCurrent:e=>A.from(e.queryCommandValue("LineHeight")),setCurrent:(e,t)=>e.execCommand("LineHeight",!1,t),onToolbarSetup:xw(e),onMenuSetup:xw(e)}))(e)),(e=>A.from(kb(e)).map((t=>({name:"language",text:"Language",icon:"language",getOptions:x(t),hash:e=>u(e.customCode)?e.code:`${e.code}/${e.customCode}`,display:e=>e.title,watcher:(e,t,o)=>{var n;return e.formatter.formatChanged("lang",o,!1,{value:t.code,customValue:null!==(n=t.customCode)&&void 0!==n?n:null}).unbind},getCurrent:e=>{const t=ze(e.selection.getNode());return Rs(t,(e=>A.some(e).filter($e).bind((e=>Tt(e,"lang").map((t=>({code:t,customCode:Tt(e,"data-mce-lang").getOrUndefined(),title:""})))))))},setCurrent:(e,t)=>e.execCommand("Lang",!1,t),onToolbarSetup:t=>{const o=oc();return t.setActive(e.formatter.match("lang",{},void 0,!0)),o.set(e.formatter.formatChanged("lang",t.setActive,!0)),yw(o.clear,xw(e)(t))},onMenuSetup:xw(e)}))))(e).each((t=>AI(e,t)))},DI=e=>Sw(e,"NodeChange",(t=>{t.setEnabled(e.queryCommandState("outdent")&&e.selection.isEditable())})),BI=(e,t)=>o=>{o.setActive(t.get());const n=e=>{t.set(e.state),o.setActive(e.state)};return e.on("PastePlainTextToggle",n),yw((()=>e.off("PastePlainTextToggle",n)),xw(e)(o))},II=(e,t)=>()=>{e.execCommand("mceToggleFormat",!1,t)},FI=e=>{(e=>{(e=>{XO.each([{name:"bold",text:"Bold",icon:"bold"},{name:"italic",text:"Italic",icon:"italic"},{name:"underline",text:"Underline",icon:"underline"},{name:"strikethrough",text:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",icon:"superscript"}],((t,o)=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:ww(e,t.name),onAction:II(e,t.name)})}));for(let t=1;t<=6;t++){const o="h"+t;e.ui.registry.addToggleButton(o,{text:o.toUpperCase(),tooltip:"Heading "+t,onSetup:ww(e,o),onAction:II(e,o)})}})(e),(e=>{XO.each([{name:"copy",text:"Copy",action:"Copy",icon:"copy"},{name:"help",text:"Help",action:"mceHelp",icon:"help"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all"},{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"print",text:"Print",action:"mcePrint",icon:"print"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.action)})})),XO.each([{name:"cut",text:"Cut",action:"Cut",icon:"cut"},{name:"paste",text:"Paste",action:"Paste",icon:"paste"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"remove",text:"Remove",action:"Delete",icon:"remove"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addButton(t.name,{tooltip:t.text,icon:t.icon,onSetup:xw(e),onAction:Cw(e,t.action)})}))})(e),(e=>{XO.each([{name:"blockquote",text:"Blockquote",action:"mceBlockQuote",icon:"quote"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.action),onSetup:ww(e,t.name)})}))})(e)})(e),(e=>{XO.each([{name:"newdocument",text:"New document",action:"mceNewDocument",icon:"new-document"},{name:"copy",text:"Copy",action:"Copy",icon:"copy",shortcut:"Meta+C"},{name:"selectall",text:"Select all",action:"SelectAll",icon:"select-all",shortcut:"Meta+A"},{name:"print",text:"Print...",action:"mcePrint",icon:"print",shortcut:"Meta+P"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onAction:Cw(e,t.action)})})),XO.each([{name:"bold",text:"Bold",action:"Bold",icon:"bold",shortcut:"Meta+B"},{name:"italic",text:"Italic",action:"Italic",icon:"italic",shortcut:"Meta+I"},{name:"underline",text:"Underline",action:"Underline",icon:"underline",shortcut:"Meta+U"},{name:"strikethrough",text:"Strikethrough",action:"Strikethrough",icon:"strike-through"},{name:"subscript",text:"Subscript",action:"Subscript",icon:"subscript"},{name:"superscript",text:"Superscript",action:"Superscript",icon:"superscript"},{name:"removeformat",text:"Clear formatting",action:"RemoveFormat",icon:"remove-formatting"},{name:"cut",text:"Cut",action:"Cut",icon:"cut",shortcut:"Meta+X"},{name:"paste",text:"Paste",action:"Paste",icon:"paste",shortcut:"Meta+V"},{name:"hr",text:"Horizontal line",action:"InsertHorizontalRule",icon:"horizontal-rule"}],(t=>{e.ui.registry.addMenuItem(t.name,{text:t.text,icon:t.icon,shortcut:t.shortcut,onSetup:xw(e),onAction:Cw(e,t.action)})})),e.ui.registry.addMenuItem("codeformat",{text:"Code",icon:"sourcecode",onSetup:xw(e),onAction:II(e,"code")})})(e)},RI=(e,t)=>Sw(e,"Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",(o=>{o.setEnabled(!e.mode.isReadOnly()&&e.undoManager[t]())})),NI=e=>Sw(e,"VisualAid",(t=>{t.setActive(e.hasVisual)})),VI=(e,t)=>{(e=>{H([{name:"alignleft",text:"Align left",cmd:"JustifyLeft",icon:"align-left"},{name:"aligncenter",text:"Align center",cmd:"JustifyCenter",icon:"align-center"},{name:"alignright",text:"Align right",cmd:"JustifyRight",icon:"align-right"},{name:"alignjustify",text:"Justify",cmd:"JustifyFull",icon:"align-justify"}],(t=>{e.ui.registry.addToggleButton(t.name,{tooltip:t.text,icon:t.icon,onAction:Cw(e,t.cmd),onSetup:ww(e,t.name)})})),e.ui.registry.addButton("alignnone",{tooltip:"No alignment",icon:"align-none",onSetup:xw(e),onAction:Cw(e,"JustifyNone")})})(e),FI(e),((e,t)=>{((e,t)=>{const o=tB(0,t,lB(e));e.ui.registry.addNestedMenuItem("align",{text:t.shared.providers.translate("Align"),onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,vB(e));e.ui.registry.addNestedMenuItem("fontfamily",{text:t.shared.providers.translate("Fonts"),onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o={type:"advanced",...t.styles},n=tB(0,t,DB(e,o));e.ui.registry.addNestedMenuItem("styles",{text:"Formats",onSetup:xw(e),getSubmenuItems:()=>n.items.validateItems(n.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,mB(e));e.ui.registry.addNestedMenuItem("blocks",{text:"Blocks",onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t),((e,t)=>{const o=tB(0,t,AB(e));e.ui.registry.addNestedMenuItem("fontsize",{text:"Font sizes",onSetup:xw(e),getSubmenuItems:()=>o.items.validateItems(o.getStyleItems())})})(e,t)})(e,t),(e=>{(e=>{e.ui.registry.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onSetup:RI(e,"hasUndo"),onAction:Cw(e,"undo")}),e.ui.registry.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onSetup:RI(e,"hasRedo"),onAction:Cw(e,"redo")})})(e),(e=>{e.ui.registry.addButton("undo",{tooltip:"Undo",icon:"undo",enabled:!1,onSetup:RI(e,"hasUndo"),onAction:Cw(e,"undo")}),e.ui.registry.addButton("redo",{tooltip:"Redo",icon:"redo",enabled:!1,onSetup:RI(e,"hasRedo"),onAction:Cw(e,"redo")})})(e)})(e),(e=>{(e=>{e.addCommand("mceApplyTextcolor",((t,o)=>{((e,t,o)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.apply(t,{value:o}),e.nodeChanged()}))})(e,t,o)})),e.addCommand("mceRemoveTextcolor",(t=>{((e,t)=>{e.undoManager.transact((()=>{e.focus(),e.formatter.remove(t,{value:null},void 0,!0),e.nodeChanged()}))})(e,t)}))})(e);const t=Ww(e),o=jw(e),n=As(t),s=As(o);eS(e,"forecolor","forecolor",n),eS(e,"backcolor","hilitecolor",s),tS(e,"forecolor","forecolor","Text color",n),tS(e,"backcolor","hilitecolor","Background color",s)})(e),(e=>{(e=>{e.ui.registry.addButton("visualaid",{tooltip:"Visual aids",text:"Visual aids",onAction:Cw(e,"mceToggleVisualAid")})})(e),(e=>{e.ui.registry.addToggleMenuItem("visualaid",{text:"Visual aids",onSetup:NI(e),onAction:Cw(e,"mceToggleVisualAid")})})(e)})(e),(e=>{(e=>{e.ui.registry.addButton("outdent",{tooltip:"Decrease indent",icon:"outdent",onSetup:DI(e),onAction:Cw(e,"outdent")}),e.ui.registry.addButton("indent",{tooltip:"Increase indent",icon:"indent",onSetup:xw(e),onAction:Cw(e,"indent")})})(e)})(e),MI(e),(e=>{const t=As($b(e)),o=()=>e.execCommand("mceTogglePlainTextPaste");e.ui.registry.addToggleButton("pastetext",{active:!1,icon:"paste-text",tooltip:"Paste as text",onAction:o,onSetup:BI(e,t)}),e.ui.registry.addToggleMenuItem("pastetext",{text:"Paste as text",icon:"paste-text",onAction:o,onSetup:BI(e,t)})})(e)},zI=e=>r(e)?e.split(/[ ,]/):e,LI=e=>t=>t.options.get(e),HI=LI("contextmenu_never_use_native"),PI=LI("contextmenu_avoid_overlap"),UI=e=>{const t=e.ui.registry.getAll().contextMenus,o=e.options.get("contextmenu");return e.options.isSet("contextmenu")?o:U(o,(e=>ve(t,e)))},WI=(e,t)=>({type:"makeshift",x:e,y:t}),jI=e=>"longpress"===e.type||0===e.type.indexOf("touch"),GI=(e,t)=>"contextmenu"===t.type||"longpress"===t.type?e.inline?(e=>{if(jI(e)){const t=e.touches[0];return WI(t.pageX,t.pageY)}return WI(e.pageX,e.pageY)})(t):((e,t)=>{const o=ib.DOM.getPos(e);return((e,t,o)=>WI(e.x+t,e.y+o))(t,o.x,o.y)})(e.getContentAreaContainer(),(e=>{if(jI(e)){const t=e.touches[0];return WI(t.clientX,t.clientY)}return WI(e.clientX,e.clientY)})(t)):$I(e),$I=e=>({type:"selection",root:ze(e.selection.getNode())}),qI=(e,t,o)=>{switch(o){case"node":return(e=>({type:"node",node:A.some(ze(e.selection.getNode())),root:ze(e.getBody())}))(e);case"point":return GI(e,t);case"selection":return $I(e)}},YI=(e,t,o,n,s,r)=>{const a=o(),i=qI(e,t,r);I_(a,bv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!1,search:A.none()}).map((e=>{t.preventDefault(),Gh.showMenuAt(s,{anchor:i},{menu:{markers:Bv("normal")},data:e})}))},XI={onLtr:()=>[gl,ll,cl,dl,ul,ml,bE,vE,fE,pE,hE,gE],onRtl:()=>[gl,cl,ll,ul,dl,ml,bE,vE,hE,gE,fE,pE]},KI={valignCentre:[],alignCentre:[],alignLeft:["tox-pop--align-left"],alignRight:["tox-pop--align-right"],right:["tox-pop--right"],left:["tox-pop--left"],bottom:["tox-pop--bottom"],top:["tox-pop--top"]},JI=(e,t,o,n,s,r)=>{const a=Bo(),i=a.os.isiOS(),l=a.os.isMacOS(),c=a.os.isAndroid(),d=a.deviceType.isTouch(),u=()=>{const a=o();((e,t,o,n,s,r,a)=>{const i=((e,t,o)=>{const n=qI(e,t,o);return{bubble:bc(0,"point"===o?12:0,KI),layouts:XI,overrides:{maxWidthFunction:GM(),maxHeightFunction:gc()},...n}})(e,t,r);I_(o,bv.CLOSE_ON_EXECUTE,n,{isHorizontalMenu:!0,search:A.none()}).map((o=>{t.preventDefault();const l=a?Uh.HighlightMenuAndItem:Uh.HighlightNone;Gh.showMenuWithinBounds(s,{anchor:i},{menu:{markers:Bv("normal"),highlightOnOpen:l},data:o,type:"horizontal"},(()=>A.some(hI(e,n.shared,"node"===r?"node":"selection")))),e.dispatch(dI)}))})(e,t,a,n,s,r,!(c||i||l&&d))};if((l||i)&&"node"!==r){const o=()=>{(e=>{const t=e.selection.getRng(),o=()=>{$h.setEditorTimeout(e,(()=>{e.selection.setRng(t)}),10),r()};e.once("touchend",o);const n=e=>{e.preventDefault(),e.stopImmediatePropagation()};e.on("mousedown",n,!0);const s=()=>r();e.once("longpresscancel",s);const r=()=>{e.off("touchend",o),e.off("longpresscancel",s),e.off("mousedown",n)}})(e),u()};((e,t)=>{const o=e.selection;if(o.isCollapsed()||t.touches.length<1)return!1;{const n=t.touches[0],s=o.getRng();return td(e.getWin(),jc.domRange(s)).exists((e=>e.left<=n.clientX&&e.right>=n.clientX&&e.top<=n.clientY&&e.bottom>=n.clientY))}})(e,t)?o():(e.once("selectionchange",o),e.once("touchend",(()=>e.off("selectionchange",o))))}else u()},ZI=e=>r(e)?"|"===e:"separator"===e.type,QI={type:"separator"},eF=e=>{const t=e=>({text:e.text,icon:e.icon,enabled:e.enabled,shortcut:e.shortcut});if(r(e))return e;switch(e.type){case"separator":return QI;case"submenu":return{type:"nestedmenuitem",...t(e),getSubmenuItems:()=>{const t=e.getSubmenuItems();return r(t)?t:L(t,eF)}};default:const o=e;return{type:"menuitem",...t(o),onAction:v(o.onAction)}}},tF=(e,t)=>{if(0===t.length)return e;const o=ne(e).filter((e=>!ZI(e))).fold((()=>[]),(e=>[QI]));return e.concat(o).concat(t).concat([QI])},oF=(e,t)=>!(e=>"longpress"===e.type||ve(e,"touches"))(t)&&(2!==t.button||t.target===e.getBody()&&""===t.pointerType),nF=(e,t)=>oF(e,t)?e.selection.getStart(!0):t.target,sF=(e,t,o)=>{const n=Bo().deviceType.isTouch,s=ci(Gh.sketch({dom:{tag:"div"},lazySink:t,onEscape:()=>e.focus(),onShow:()=>o.setContextMenuState(!0),onHide:()=>o.setContextMenuState(!1),fireDismissalEventInstead:{},inlineBehaviours:Tl([th("dismissContextMenu",[Wr(Or(),((t,o)=>{Zd.close(t),e.focus()}))])])})),a=()=>Gh.hide(s),i=t=>{if(HI(e)&&t.preventDefault(),((e,t)=>t.ctrlKey&&!HI(e))(e,t)||(e=>0===UI(e).length)(e))return;const a=((e,t)=>{const o=PI(e),n=oF(e,t)?"selection":"point";if(De(o)){const s=nF(e,t);return JS(ze(s),o)?"node":n}return n})(e,t);(n()?JI:YI)(e,t,(()=>{const o=nF(e,t),n=e.ui.registry.getAll(),s=UI(e);return((e,t,o)=>{const n=j(t,((t,n)=>be(e,n.toLowerCase()).map((e=>{const n=e.update(o);if(r(n)&&De(Me(n)))return tF(t,n.split(" "));if(l(n)&&n.length>0){const e=L(n,eF);return tF(t,e)}return t})).getOrThunk((()=>t.concat([n])))),[]);return n.length>0&&ZI(n[n.length-1])&&n.pop(),n})(n.contextMenus,s,o)}),o,s,a)};e.on("init",(()=>{const t="ResizeEditor ScrollContent ScrollWindow longpresscancel"+(n()?"":" ResizeWindow");e.on(t,a),e.on("longpress contextmenu",i)}))},rF=Ms([{offset:["x","y"]},{absolute:["x","y"]},{fixed:["x","y"]}]),aF=e=>t=>t.translate(-e.left,-e.top),iF=e=>t=>t.translate(e.left,e.top),lF=e=>(t,o)=>j(e,((e,t)=>t(e)),qt(t,o)),cF=(e,t,o)=>e.fold(lF([iF(o),aF(t)]),lF([aF(t)]),lF([])),dF=(e,t,o)=>e.fold(lF([iF(o)]),lF([]),lF([iF(t)])),uF=(e,t,o)=>e.fold(lF([]),lF([aF(o)]),lF([iF(t),aF(o)])),mF=(e,t,o)=>{const n=e.fold(((e,t)=>({position:A.some("absolute"),left:A.some(e+"px"),top:A.some(t+"px")})),((e,t)=>({position:A.some("absolute"),left:A.some(e-o.left+"px"),top:A.some(t-o.top+"px")})),((e,t)=>({position:A.some("fixed"),left:A.some(e+"px"),top:A.some(t+"px")})));return{right:A.none(),bottom:A.none(),...n}},gF=(e,t,o,n)=>{const s=(e,s)=>(r,a)=>{const i=e(t,o,n);return s(r.getOr(i.left),a.getOr(i.top))};return e.fold(s(uF,pF),s(dF,hF),s(cF,fF))},pF=rF.offset,hF=rF.absolute,fF=rF.fixed,bF=(e,t)=>{const o=_t(e,t);return u(o)?NaN:parseInt(o,10)},vF=(e,t,o,n,s,r)=>{const a=((e,t,o,n)=>((e,t)=>{const o=e.element,n=bF(o,t.leftAttr),s=bF(o,t.topAttr);return isNaN(n)||isNaN(s)?A.none():A.some(qt(n,s))})(e,t).fold((()=>o),(e=>fF(e.left+n.left,e.top+n.top))))(e,t,o,n),i=t.mustSnap?xF(e,t,a,s,r):wF(e,t,a,s,r),l=cF(a,s,r);return((e,t,o)=>{const n=e.element;Ct(n,t.leftAttr,o.left+"px"),Ct(n,t.topAttr,o.top+"px")})(e,t,l),i.fold((()=>({coord:fF(l.left,l.top),extra:A.none()})),(e=>({coord:e.output,extra:e.extra})))},yF=(e,t,o,n)=>re(e,(e=>{const s=e.sensor,r=((e,t,o,n,s,r)=>{const a=dF(e,s,r),i=dF(t,s,r);return Math.abs(a.left-i.left)<=o&&Math.abs(a.top-i.top)<=n})(t,s,e.range.left,e.range.top,o,n);return r?A.some({output:gF(e.output,t,o,n),extra:e.extra}):A.none()})),xF=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return yF(r,o,n,s).orThunk((()=>{const e=j(r,((e,t)=>{const r=t.sensor,a=((e,t,o,n,s,r)=>{const a=dF(e,s,r),i=dF(t,s,r),l=Math.abs(a.left-i.left),c=Math.abs(a.top-i.top);return qt(l,c)})(o,r,t.range.left,t.range.top,n,s);return e.deltas.fold((()=>({deltas:A.some(a),snap:A.some(t)})),(o=>(a.left+a.top)/2<=(o.left+o.top)/2?{deltas:A.some(a),snap:A.some(t)}:e))}),{deltas:A.none(),snap:A.none()});return e.snap.map((e=>({output:gF(e.output,o,n,s),extra:e.extra})))}))},wF=(e,t,o,n,s)=>{const r=t.getSnapPoints(e);return yF(r,o,n,s)};var SF=Object.freeze({__proto__:null,snapTo:(e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const t=tt(e.element),o=Wo(t),r=MA(s),a=((e,t,o)=>({coord:gF(e.output,e.output,t,o),extra:e.extra}))(n,o,r),i=mF(a.coord,0,r);Ft(s,i)}}});const kF="data-initial-z-index",CF=(e,t)=>{e.getSystem().addToGui(t),(e=>{rt(e.element).filter($e).each((t=>{Vt(t,"z-index").each((e=>{Ct(t,kF,e)})),Bt(t,"z-index",Rt(e.element,"z-index"))}))})(t)},OF=e=>{(e=>{rt(e.element).filter($e).each((e=>{Tt(e,kF).fold((()=>Ht(e,"z-index")),(t=>Bt(e,"z-index",t))),At(e,kF)}))})(e),e.getSystem().removeFromGui(e)},_F=(e,t,o)=>e.getSystem().build(ik.sketch({dom:{styles:{left:"0px",top:"0px",width:"100%",height:"100%",position:"fixed","z-index":"1000000000000000"},classes:[t]},events:o}));var TF=ys("snaps",[ns("getSnapPoints"),Ri("onSensor"),ns("leftAttr"),ns("topAttr"),xs("lazyViewport",tn),xs("mustSnap",!1)]);const EF=[xs("useFixed",T),ns("blockerClass"),xs("getTarget",w),xs("onDrag",b),xs("repositionTarget",!0),xs("onDrop",b),_s("getBounds",tn),TF],AF=e=>{return(t=Vt(e,"left"),o=Vt(e,"top"),n=Vt(e,"position"),t.isSome()&&o.isSome()&&n.isSome()?A.some(((e,t,o)=>("fixed"===o?fF:pF)(parseInt(e,10),parseInt(t,10)))(t.getOrDie(),o.getOrDie(),n.getOrDie())):A.none()).getOrThunk((()=>{const t=Xt(e);return hF(t.left,t.top)}));var t,o,n},MF=(e,t)=>({bounds:e.getBounds(),height:Gt(t.element),width:Qt(t.element)}),DF=(e,t,o,n,s)=>{const r=o.update(n,s),a=o.getStartData().getOrThunk((()=>MF(t,e)));r.each((o=>{((e,t,o,n)=>{const s=t.getTarget(e.element);if(t.repositionTarget){const r=tt(e.element),a=Wo(r),i=MA(s),l=AF(s),c=((e,t,o,n,s,r,a)=>((e,t,o,n,s)=>{const r=s.bounds,a=dF(t,o,n),i=Qi(a.left,r.x,r.x+r.width-s.width),l=Qi(a.top,r.y,r.y+r.height-s.height),c=hF(i,l);return t.fold((()=>{const e=uF(c,o,n);return pF(e.left,e.top)}),x(c),(()=>{const e=cF(c,o,n);return fF(e.left,e.top)}))})(0,t.fold((()=>{const e=(t=o,a=r.left,i=r.top,t.fold(((e,t)=>pF(e+a,t+i)),((e,t)=>hF(e+a,t+i)),((e,t)=>fF(e+a,t+i))));var t,a,i;const l=cF(e,n,s);return fF(l.left,l.top)}),(t=>{const a=vF(e,t,o,r,n,s);return a.extra.each((o=>{t.onSensor(e,o)})),a.coord})),n,s,a))(e,t.snaps,l,a,i,n,o),d=mF(c,0,i);Ft(s,d)}t.onDrag(e,s,n)})(e,t,a,o)}))},BF=(e,t,o,n)=>{t.each(OF),o.snaps.each((t=>{((e,t)=>{((e,t)=>{const o=e.element;At(o,t.leftAttr),At(o,t.topAttr)})(e,t)})(e,t)}));const s=o.getTarget(e.element);n.reset(),o.onDrop(e,s)},IF=e=>(t,o)=>{const n=e=>{o.setStartData(MF(t,e))};return Hr([Wr(wr(),(e=>{o.getStartData().each((()=>n(e)))})),...e(t,o,n)])};var FF=Object.freeze({__proto__:null,getData:e=>A.from(qt(e.x,e.y)),getDelta:(e,t)=>qt(t.left-e.left,t.top-e.top)});const RF=(e,t,o)=>[Wr(js(),((n,s)=>{if(0!==s.event.raw.button)return;s.stop();const r=()=>BF(n,A.some(l),e,t),a=ZS(r,200),i={drop:r,delayDrop:a.schedule,forceDrop:r,move:o=>{a.cancel(),DF(n,e,t,FF,o)}},l=_F(n,e.blockerClass,(e=>Hr([Wr(js(),e.forceDrop),Wr(qs(),e.drop),Wr(Gs(),((t,o)=>{e.move(o.event)})),Wr($s(),e.delayDrop)]))(i));o(n),CF(n,l)}))],NF=[...EF,Li("dragger",{handlers:IF(RF)})];var VF=Object.freeze({__proto__:null,getData:e=>{const t=e.raw.touches;return 1===t.length?(e=>{const t=e[0];return A.some(qt(t.clientX,t.clientY))})(t):A.none()},getDelta:(e,t)=>qt(t.left-e.left,t.top-e.top)});const zF=(e,t,o)=>{const n=nc(),s=o=>{BF(o,n.get(),e,t),n.clear()};return[Wr(Hs(),((r,a)=>{a.stop();const i=()=>s(r),l={drop:i,delayDrop:b,forceDrop:i,move:o=>{DF(r,e,t,VF,o)}},c=_F(r,e.blockerClass,(e=>Hr([Wr(Hs(),e.forceDrop),Wr(Us(),e.drop),Wr(Ws(),e.drop),Wr(Ps(),((t,o)=>{e.move(o.event)}))]))(l));n.set(c),o(r),CF(r,c)})),Wr(Ps(),((o,n)=>{n.stop(),DF(o,e,t,VF,n.event)})),Wr(Us(),((e,t)=>{t.stop(),s(e)})),Wr(Ws(),s)]},LF=NF,HF=[...EF,Li("dragger",{handlers:IF(zF)})],PF=[...EF,Li("dragger",{handlers:IF(((e,t,o)=>[...RF(e,t,o),...zF(e,t,o)]))})];var UF=Object.freeze({__proto__:null,mouse:LF,touch:HF,mouseOrTouch:PF}),WF=Object.freeze({__proto__:null,init:()=>{let e=A.none(),t=A.none();const o=x({});return Ta({readState:o,reset:()=>{e=A.none(),t=A.none()},update:(t,o)=>t.getData(o).bind((o=>((t,o)=>{const n=e.map((e=>t.getDelta(e,o)));return e=A.some(o),n})(t,o))),getStartData:()=>t,setStartData:e=>{t=A.some(e)}})}});const jF=Dl({branchKey:"mode",branches:UF,name:"dragging",active:{events:(e,t)=>e.dragger.handlers(e,t)},extra:{snap:e=>({sensor:e.sensor,range:e.range,output:e.output,extra:A.from(e.extra)})},state:WF,apis:SF}),GF=(e,t,o,n,s,r)=>e.fold((()=>jF.snap({sensor:hF(o-20,n-20),range:qt(s,r),output:hF(A.some(o),A.some(n)),extra:{td:t}})),(e=>{const s=o-20,r=n-20,a=e.element.dom.getBoundingClientRect();return jF.snap({sensor:hF(s,r),range:qt(40,40),output:hF(A.some(o-a.width/2),A.some(n-a.height/2)),extra:{td:t}})})),$F=(e,t,o)=>({getSnapPoints:e,leftAttr:"data-drag-left",topAttr:"data-drag-top",onSensor:(e,n)=>{const s=n.td;((e,t)=>e.exists((e=>Qe(e,t))))(t.get(),s)||(t.set(s),o(s))},mustSnap:!0}),qF=e=>Xh(qh.sketch({dom:{tag:"div",classes:["tox-selector"]},buttonBehaviours:Tl([jF.config({mode:"mouseOrTouch",blockerClass:"blocker",snaps:e}),Hk.config({})]),eventOrder:{mousedown:["dragging","alloy.base.behaviour"],touchstart:["dragging","alloy.base.behaviour"]}})),YF=(e,t)=>{const o=As([]),n=As([]),s=As(!1),r=nc(),a=nc(),i=e=>{const o=Qo(e);return GF(u.getOpt(t),e,o.x,o.y,o.width,o.height)},l=e=>{const o=Qo(e);return GF(m.getOpt(t),e,o.right,o.bottom,o.width,o.height)},c=$F((()=>L(o.get(),(e=>i(e)))),r,(t=>{a.get().each((o=>{e.dispatch("TableSelectorChange",{start:t,finish:o})}))})),d=$F((()=>L(n.get(),(e=>l(e)))),a,(t=>{r.get().each((o=>{e.dispatch("TableSelectorChange",{start:o,finish:t})}))})),u=qF(c),m=qF(d),g=ci(u.asSpec()),p=ci(m.asSpec()),h=(t,o,n,s)=>{const r=n(o);jF.snapTo(t,r),((t,o,n,r)=>{const a=o.dom.getBoundingClientRect();Ht(t.element,"display");const i=st(ze(e.getBody())).dom.innerHeight,l=a[s]<0,c=((e,t)=>e[s]>t)(a,i);(l||c)&&Bt(t.element,"display","none")})(t,o)},f=e=>h(g,e,i,"top"),b=e=>h(p,e,l,"bottom");Bo().deviceType.isTouch()&&(e.on("TableSelectionChange",(e=>{s.get()||(Id(t,g),Id(t,p),s.set(!0)),r.set(e.start),a.set(e.finish),e.otherCells.each((t=>{o.set(t.upOrLeftCells),n.set(t.downOrRightCells),f(e.start),b(e.finish)}))})),e.on("ResizeEditor ResizeWindow ScrollContent",(()=>{r.get().each(f),a.get().each(b)})),e.on("TableSelectionClear",(()=>{s.get()&&(Nd(g),Nd(p),s.set(!1)),r.clear(),a.clear()})))},XF=(e,t,o)=>{var n;const s=null!==(n=t.delimiter)&&void 0!==n?n:"\u203a";return{dom:{tag:"div",classes:["tox-statusbar__path"],attributes:{role:"navigation"}},behaviours:Tl([Gp.config({mode:"flow",selector:"div[role=button]"}),Lm.config({disabled:o.isDisabled}),Ox(),pk.config({}),eh.config({}),th("elementPathEvents",[Jr(((t,n)=>{e.shortcuts.add("alt+F11","focus statusbar elementpath",(()=>Gp.focusIn(t))),e.on("NodeChange",(n=>{const r=(t=>{const o=[];let n=t.length;for(;n-- >0;){const r=t[n];if(1===r.nodeType&&"BR"!==(s=r).nodeName&&!s.getAttribute("data-mce-bogus")&&"bookmark"!==s.getAttribute("data-mce-type")){const t=vw(e,r);if(t.isDefaultPrevented()||o.push({name:t.name,element:r}),t.isPropagationStopped())break}}var s;return o})(n.parents),a=r.length>0?j(r,((t,n,r)=>{const a=((t,n,s)=>qh.sketch({dom:{tag:"div",classes:["tox-statusbar__path-item"],attributes:{"data-index":s,"aria-level":s+1}},components:[ri(t)],action:t=>{e.focus(),e.selection.select(n),e.nodeChanged()},buttonBehaviours:Tl([_x(o.isDisabled),Ox()])}))(n.name,n.element,r);return 0===r?t.concat([a]):t.concat([{dom:{tag:"div",classes:["tox-statusbar__path-divider"],attributes:{"aria-hidden":!0}},components:[ri(` ${s} `)]},a])}),[]):[];eh.set(t,a)}))}))])]),components:[]}};var KF;!function(e){e[e.None=0]="None",e[e.Both=1]="Both",e[e.Vertical=2]="Vertical"}(KF||(KF={}));const JF=(e,t,o)=>{const n=ze(e.getContainer()),s=((e,t,o,n,s)=>{const r={height:nI(n+t.top,bb(e),yb(e))};return o===KF.Both&&(r.width=nI(s+t.left,fb(e),vb(e))),r})(e,t,o,jt(n),Zt(n));le(s,((e,t)=>{h(e)&&Bt(n,t,oI(e))})),(e=>{e.dispatch("ResizeEditor")})(e)},ZF=(e,t,o,n)=>{const s=qt(20*o,20*n);return JF(e,s,t),A.some(!0)},QF=(e,t)=>{const o=()=>{const o=[],n=Xb(e),s=Wb(e),r=jb(e)||e.hasPlugin("wordcount");return s&&o.push(XF(e,{},t)),n&&o.push((()=>{const e=Vx("Alt+0");return{dom:{tag:"div",classes:["tox-statusbar__help-text"]},components:[ri(qf.translate(["Press {0} for help",e]))]}})()),r&&o.push((()=>{const o=[];return e.hasPlugin("wordcount")&&o.push(((e,t)=>{const o=(e,o,n)=>eh.set(e,[ri(t.translate(["{0} "+n,o[n]]))]);return qh.sketch({dom:{tag:"button",classes:["tox-statusbar__wordcount"]},components:[],buttonBehaviours:Tl([_x(t.isDisabled),Ox(),pk.config({}),eh.config({}),vu.config({store:{mode:"memory",initialValue:{mode:"words",count:{words:0,characters:0}}}}),th("wordcount-events",[ea((e=>{const t=vu.getValue(e),n="words"===t.mode?"characters":"words";vu.setValue(e,{mode:n,count:t.count}),o(e,t.count,n)})),Jr((t=>{e.on("wordCountUpdate",(e=>{const{mode:n}=vu.getValue(t);vu.setValue(t,{mode:n,count:e.wordCount}),o(t,e.wordCount,n)}))}))])]),eventOrder:{[mr()]:["disabling","alloy.base.behaviour","wordcount-events"]}})})(e,t)),jb(e)&&o.push({dom:{tag:"span",classes:["tox-statusbar__branding"]},components:[{dom:{tag:"a",attributes:{href:"https://www.tiny.cloud/powered-by-tiny?utm_campaign=poweredby&utm_source=tiny&utm_medium=referral&utm_content=v6",rel:"noopener",target:"_blank","aria-label":qf.translate(["Powered by {0}","Tiny"])},innerHtml:'<svg width="50px" height="16px" viewBox="0 0 50 16" xmlns="http://www.w3.org/2000/svg">\n  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.143 0c2.608.015 5.186 2.178 5.186 5.331 0 0 .077 3.812-.084 4.87-.361 2.41-2.164 4.074-4.65 4.496-1.453.284-2.523.49-3.212.623-.373.071-.634.122-.785.152-.184.038-.997.145-1.35.145-2.732 0-5.21-2.04-5.248-5.33 0 0 0-3.514.03-4.442.093-2.4 1.758-4.342 4.926-4.963 0 0 3.875-.752 4.036-.782.368-.07.775-.1 1.15-.1Zm1.826 2.8L5.83 3.989v2.393l-2.455.475v5.968l6.137-1.189V9.243l2.456-.476V2.8ZM5.83 6.382l3.682-.713v3.574l-3.682.713V6.382Zm27.173-1.64-.084-1.066h-2.226v9.132h2.456V7.743c-.008-1.151.998-2.064 2.149-2.072 1.15-.008 1.987.92 1.995 2.072v5.065h2.455V7.359c-.015-2.18-1.657-3.929-3.837-3.913a3.993 3.993 0 0 0-2.908 1.296Zm-6.3-4.266L29.16 0v2.387l-2.456.475V.476Zm0 3.2v9.132h2.456V3.676h-2.456Zm18.179 11.787L49.11 3.676H46.58l-1.612 4.527-.46 1.382-.384-1.382-1.611-4.527H39.98l3.3 9.132L42.15 16l2.732-.537ZM22.867 9.738c0 .752.568 1.075.921 1.075.353 0 .668-.047.998-.154l.537 1.765c-.23.154-.92.537-2.225.537-1.305 0-2.655-.997-2.686-2.686a136.877 136.877 0 0 1 0-4.374H18.8V3.676h1.612v-1.98l2.455-.476v2.456h2.302V5.9h-2.302v3.837Z"/>\n</svg>\n'.trim()},behaviours:Tl([ah.config({})])}]}),{dom:{tag:"div",classes:["tox-statusbar__right-container"]},components:o}})()),o.length>0?[{dom:{tag:"div",classes:["tox-statusbar__text-container",...(()=>{const e="tox-statusbar__text-container--flex-start",t="tox-statusbar__text-container--flex-end";if(n){const o="tox-statusbar__text-container-3-cols";return r||s?r&&!s?[o,t]:[o,e]:[o,"tox-statusbar__text-container--space-around"]}return[r&&!s?t:e]})()]},components:o}]:[]};return{dom:{tag:"div",classes:["tox-statusbar"]},components:(()=>{const n=o(),s=((e,t)=>{const o=(e=>{const t=Gb(e);return!1===t?KF.None:"both"===t?KF.Both:KF.Vertical})(e);if(o===KF.None)return A.none();const n=o===KF.Both?"Press the arrow keys to resize the editor.":"Press the Up and Down arrow keys to resize the editor.";return A.some(ob("resize-handle",{tag:"div",classes:["tox-statusbar__resize-handle"],attributes:{title:t.translate("Resize"),"aria-label":t.translate(n)},behaviours:[jF.config({mode:"mouse",repositionTarget:!1,onDrag:(t,n,s)=>JF(e,s,o),blockerClass:"tox-blocker"}),Gp.config({mode:"special",onLeft:()=>ZF(e,o,-1,0),onRight:()=>ZF(e,o,1,0),onUp:()=>ZF(e,o,0,-1),onDown:()=>ZF(e,o,0,1)}),pk.config({}),ah.config({})]},t.icons))})(e,t);return n.concat(s.toArray())})()}},eR=(e,t)=>t.get().getOrDie(`UI for ${e} has not been rendered`),tR=(e,t)=>{const o=e.inline,n=o?cI:eI,s=dv(e)?uM:EA,r=(()=>{const e=nc(),t=nc(),o=nc();return{dialogUi:e,popupUi:t,mainUi:o,getUiMotherships:()=>{const o=e.get().map((e=>e.mothership)),n=t.get().map((e=>e.mothership));return o.fold((()=>n.toArray()),(e=>n.fold((()=>[e]),(t=>Qe(e.element,t.element)?[e]:[e,t]))))},lazyGetInOuterOrDie:(e,t)=>()=>o.get().bind((e=>t(e.outerContainer))).getOrDie(`Could not find ${e} element in OuterContainer`)}})(),a=nc(),i=nc(),l=nc(),c=Bo().deviceType.isTouch()?["tox-platform-touch"]:[],d=rv(e),u=Ob(e),m=Xh({dom:{tag:"div",classes:["tox-anchorbar"]}}),g=Xh({dom:{tag:"div",classes:["tox-bottom-anchorbar"]}}),p=()=>r.mainUi.get().map((e=>e.outerContainer)).bind(UD.getHeader),h=r.lazyGetInOuterOrDie("anchor bar",m.getOpt),f=r.lazyGetInOuterOrDie("bottom anchor bar",g.getOpt),b=r.lazyGetInOuterOrDie("toolbar",UD.getToolbar),v=r.lazyGetInOuterOrDie("throbber",UD.getThrobber),y=((e,t,o,n)=>{const s=As(!1),r=(e=>{const t=As(rv(e)?"bottom":"top");return{isPositionedAtTop:()=>"top"===t.get(),getDockingMode:t.get,setDockingMode:t.set}})(t),a={icons:()=>t.ui.registry.getAll().icons,menuItems:()=>t.ui.registry.getAll().menuItems,translate:qf.translate,isDisabled:()=>t.mode.isReadOnly()||!t.ui.isEnabled(),getOption:t.options.get},i=pA(t),l=(e=>{const t=t=>()=>e.formatter.match(t),o=t=>()=>{const o=e.formatter.get(t);return void 0!==o?A.some({tag:o.length>0&&(o[0].inline||o[0].block)||"div",styles:e.dom.parseStyle(e.formatter.getCssText(t))}):A.none()},n=As([]),s=As([]),r=As(!1);return e.on("PreInit",(s=>{const r=PE(e),a=WE(e,r,t,o);n.set(a)})),e.on("addStyleModifications",(n=>{const a=WE(e,n.items,t,o);s.set(a),r.set(n.replace)})),{getData:()=>{const e=r.get()?[]:n.get(),t=s.get();return e.concat(t)}}})(t),c=(e=>({colorPicker:BE(e),hasCustomColors:IE(e),getColors:FE(e),getColorCols:RE(e)}))(t),d=(e=>({isDraggableModal:NE(e)}))(t),u={shared:{providers:a,anchors:DE(t,o,n,r.isPositionedAtTop),header:r},urlinput:i,styles:l,colorinput:c,dialog:d,isContextMenuOpen:()=>s.get(),setContextMenuState:e=>s.set(e)},m={...u,shared:{...u.shared,interpreter:e=>rE(e,{},m),getSink:e.popup}},g={...u,shared:{...u.shared,interpreter:e=>rE(e,{},g),getSink:e.dialog}};return{popup:m,dialog:g}})({popup:()=>rn.fromOption(r.popupUi.get().map((e=>e.sink)),"(popup) UI has not been rendered"),dialog:()=>rn.fromOption(r.dialogUi.get().map((e=>e.sink)),"UI has not been rendered")},e,h,f),x=()=>{const t=(()=>{const t={attributes:{[kc]:d?Sc.BottomToTop:Sc.TopToBottom}},o=UD.parts.menubar({dom:{tag:"div",classes:["tox-menubar"]},backstage:y.popup,onEscape:()=>{e.focus()}}),n=UD.parts.toolbar({dom:{tag:"div",classes:["tox-toolbar"]},getSink:y.popup.shared.getSink,providers:y.popup.shared.providers,onEscape:()=>{e.focus()},onToolbarToggled:t=>{((e,t)=>{e.dispatch("ToggleToolbarDrawer",{state:t})})(e,t)},type:u,lazyToolbar:b,lazyHeader:()=>p().getOrDie("Could not find header element"),...t}),s=UD.parts["multiple-toolbar"]({dom:{tag:"div",classes:["tox-toolbar-overlord"]},providers:y.popup.shared.providers,onEscape:()=>{e.focus()},type:u}),r=sv(e),a=ov(e),i=Zb(e),l=Yb(e),c=UD.parts.promotion({dom:{tag:"div",classes:["tox-promotion"]}}),g=r||a||i,h=l?[c,o]:[o];return UD.parts.header({dom:{tag:"div",classes:["tox-editor-header"].concat(g?[]:["tox-editor-header--empty"]),...t},components:q([i?h:[],r?[s]:a?[n]:[],iv(e)?[]:[m.asSpec()]]),sticky:dv(e),editor:e,sharedBackstage:y.popup.shared})})(),n={dom:{tag:"div",classes:["tox-sidebar-wrap"]},components:[UD.parts.socket({dom:{tag:"div",classes:["tox-edit-area"]}}),UD.parts.sidebar({dom:{tag:"div",classes:["tox-sidebar"]}})]},s=UD.parts.throbber({dom:{tag:"div",classes:["tox-throbber"]},backstage:y.popup}),r=UD.parts.viewWrapper({backstage:y.popup}),i=Ub(e)&&!o?A.some(QF(e,y.popup.shared.providers)):A.none(),l=q([d?[]:[t],o?[]:[n],d?[t]:[]]),h=UD.parts.editorContainer({components:q([l,o?[]:[g.asSpec(),...i.toArray()]])}),f=cv(e),v={role:"application",...qf.isRtl()?{dir:"rtl"}:{},...f?{"aria-hidden":"true"}:{}},x=ci(UD.sketch({dom:{tag:"div",classes:["tox","tox-tinymce"].concat(o?["tox-tinymce-inline"]:[]).concat(d?["tox-tinymce--toolbar-bottom"]:[]).concat(c),styles:{visibility:"hidden",...f?{opacity:"0",border:"0"}:{}},attributes:v},components:[h,...o?[]:[r],s],behaviours:Tl([Ox(),Lm.config({disableClass:"tox-tinymce--disabled"}),Gp.config({mode:"cyclic",selector:".tox-menubar, .tox-toolbar, .tox-toolbar__primary, .tox-toolbar__overflow--open, .tox-sidebar__overflow--open, .tox-statusbar__path, .tox-statusbar__wordcount, .tox-statusbar__branding a, .tox-statusbar__resize-handle"})])})),w=lk(x);return a.set(w),{mothership:w,outerContainer:x}},w=t=>{const o=oI((e=>{const t=(e=>{const t=pb(e),o=bb(e),n=yb(e);return tI(t).map((e=>nI(e,o,n)))})(e);return t.getOr(pb(e))})(e)),n=oI((e=>sI(e).getOr(hb(e)))(e));return e.inline||(Lt("div","width",n)&&Bt(t.element,"width",n),Lt("div","height",o)?Bt(t.element,"height",o):Bt(t.element,"height","400px")),o};return{popups:{backstage:y.popup,getMothership:()=>eR("popups",l)},dialogs:{backstage:y.dialog,getMothership:()=>eR("dialogs",i)},renderUI:()=>{const o=x(),a=(()=>{const t=lv(e),o=Qe(wt(),t)&&"grid"===Rt(t,"display"),n={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-tinymce-aux"].concat(c),attributes:{...qf.isRtl()?{dir:"rtl"}:{}}},behaviours:Tl([_d.config({useFixed:()=>s.isDocked(p)})])},r={dom:{styles:{width:document.body.clientWidth+"px"}},events:Hr([Wr(Sr(),(e=>{Bt(e.element,"width",document.body.clientWidth+"px")}))])},a=ci(bn(n,o?r:{})),l=lk(a);return i.set(l),{sink:a,mothership:l}})(),d=uv(e)?(()=>{const e={dom:{tag:"div",classes:["tox","tox-silver-sink","tox-silver-popup-sink","tox-tinymce-aux"].concat(c),attributes:{...qf.isRtl()?{dir:"rtl"}:{}}},behaviours:Tl([_d.config({useFixed:()=>s.isDocked(p),getBounds:()=>t.getPopupSinkBounds()})])},o=ci(e),n=lk(o);return l.set(n),{sink:o,mothership:n}})():(e=>(l.set(e.mothership),e))(a);r.dialogUi.set(a),r.popupUi.set(d),r.mainUi.set(o);return(t=>{const{mainUi:o,popupUi:r,uiMotherships:a}=t;ce(_b(e),((t,o)=>{e.ui.registry.addGroupToolbarButton(o,t)}));const{buttons:i,menuItems:l,contextToolbars:c,sidebars:d,views:m}=e.ui.registry.getAll(),g=nv(e),h={menuItems:l,menus:mv(e),menubar:Bb(e),toolbar:g.getOrThunk((()=>Ib(e))),allowToolbarGroups:u===rb.floating,buttons:i,sidebar:d,views:m};var f;f=o.outerContainer,e.addShortcut("alt+F9","focus menubar",(()=>{UD.focusMenubar(f)})),e.addShortcut("alt+F10","focus toolbar",(()=>{UD.focusToolbar(f)})),e.addCommand("ToggleToolbarDrawer",((e,t)=>{(null==t?void 0:t.skipFocus)?UD.toggleToolbarDrawerWithoutFocusing(f):UD.toggleToolbarDrawer(f)})),e.addQueryStateHandler("ToggleToolbarDrawer",(()=>UD.isToolbarDrawerToggled(f))),((e,t,o)=>{const n=(e,n)=>{H([t,...o],(t=>{t.broadcastEvent(e,n)}))},s=(e,n)=>{H([t,...o],(t=>{t.broadcastOn([e],n)}))},r=e=>s(Qd(),{target:e.target}),a=qo(),i=rc(a,"touchstart",r),l=rc(a,"touchmove",(e=>n(yr(),e))),c=rc(a,"touchend",(e=>n(xr(),e))),d=rc(a,"mousedown",r),u=rc(a,"mouseup",(e=>{0===e.raw.button&&s(tu(),{target:e.target})})),m=e=>s(Qd(),{target:ze(e.target)}),g=e=>{0===e.button&&s(tu(),{target:ze(e.target)})},p=()=>{H(e.editorManager.get(),(t=>{e!==t&&t.dispatch("DismissPopups",{relatedTarget:e})}))},h=e=>n(wr(),ic(e)),f=e=>{s(eu(),{}),n(Sr(),ic(e))},b=ft(ze(e.getElement())),v=ac(b,"scroll",(o=>{requestAnimationFrame((()=>{if(null!=e.getContainer()){const s=XS(e,t.element).map((e=>[e.element,...e.others])).getOr([]);N(s,(e=>Qe(e,o.target)))&&(e.dispatch("ElementScroll",{target:o.target.dom}),n(Ar(),o))}}))})),y=()=>s(eu(),{}),x=t=>{t.state&&s(Qd(),{target:ze(e.getContainer())})},w=e=>{s(Qd(),{target:ze(e.relatedTarget.getContainer())})};e.on("PostRender",(()=>{e.on("click",m),e.on("tap",m),e.on("mouseup",g),e.on("mousedown",p),e.on("ScrollWindow",h),e.on("ResizeWindow",f),e.on("ResizeEditor",y),e.on("AfterProgressState",x),e.on("DismissPopups",w)})),e.on("remove",(()=>{e.off("click",m),e.off("tap",m),e.off("mouseup",g),e.off("mousedown",p),e.off("ScrollWindow",h),e.off("ResizeWindow",f),e.off("ResizeEditor",y),e.off("AfterProgressState",x),e.off("DismissPopups",w),d.unbind(),i.unbind(),l.unbind(),c.unbind(),u.unbind(),v.unbind()})),e.on("detach",(()=>{H([t,...o],Pd),H([t,...o],(e=>e.destroy()))}))})(e,o.mothership,a),s.setup(e,y.popup.shared,p),VI(e,y.popup),sF(e,y.popup.shared.getSink,y.popup),(e=>{const{sidebars:t}=e.ui.registry.getAll();H(ae(t),(o=>{const n=t[o],s=()=>xe(A.from(e.queryCommandValue("ToggleSidebar")),o);e.ui.registry.addToggleButton(o,{icon:n.icon,tooltip:n.tooltip,onAction:t=>{e.execCommand("ToggleSidebar",!1,o),t.setActive(s())},onSetup:t=>{t.setActive(s());const o=()=>t.setActive(s());return e.on("ToggleSidebar",o),()=>{e.off("ToggleSidebar",o)}}})}))})(e),NM(e,v,y.popup.shared),EI(e,c,r.sink,{backstage:y.popup}),YF(e,r.sink);const b={targetNode:e.getElement(),height:w(o.outerContainer)};return n.render(e,t,h,y.popup,b)})({popupUi:d,dialogUi:a,mainUi:o,uiMotherships:r.getUiMotherships()})}}},oR=x([ns("lazySink"),ms("dragBlockClass"),_s("getBounds",tn),xs("useTabstopAt",E),xs("firstTabstop",0),xs("eventOrder",{}),yu("modalBehaviours",[Gp]),Ni("onExecute"),zi("onEscape")]),nR={sketch:w},sR=x([Yu({name:"draghandle",overrides:(e,t)=>({behaviours:Tl([jF.config({mode:"mouse",getTarget:e=>fi(e,'[role="dialog"]').getOr(e),blockerClass:e.dragBlockClass.getOrDie(new Error("The drag blocker class was not specified for a dialog with a drag handle: \n"+JSON.stringify(t,null,2)).message),getBounds:e.getDragBounds})])})}),$u({schema:[ns("dom")],name:"title"}),$u({factory:nR,schema:[ns("dom")],name:"close"}),$u({factory:nR,schema:[ns("dom")],name:"body"}),Yu({factory:nR,schema:[ns("dom")],name:"footer"}),qu({factory:{sketch:(e,t)=>({...e,dom:t.dom,components:t.components})},schema:[xs("dom",{tag:"div",styles:{position:"fixed",left:"0px",top:"0px",right:"0px",bottom:"0px"}}),xs("components",[])],name:"blocker"})]),rR=wm({name:"ModalDialog",configFields:oR(),partFields:sR(),factory:(e,t,o,n)=>{const s=nc(),r=ca("modal-events"),a={...e.eventOrder,[kr()]:[r].concat(e.eventOrder["alloy.system.attached"]||[])};return{uid:e.uid,dom:e.dom,components:t,apis:{show:t=>{s.set(t);const o=e.lazySink(t).getOrDie(),r=n.blocker(),a=o.getSystem().build({...r,components:r.components.concat([di(t)]),behaviours:Tl([ah.config({}),th("dialog-blocker-events",[Kr(Xs(),(()=>{FM.isBlocked(t)||Gp.focusIn(t)}))])])});Id(o,a),Gp.focusIn(t)},hide:e=>{s.clear(),rt(e.element).each((t=>{e.getSystem().getByDom(t).each((e=>{Nd(e)}))}))},getBody:t=>im(t,e,"body"),getFooter:t=>am(t,e,"footer"),setIdle:e=>{FM.unblock(e)},setBusy:(e,t)=>{FM.block(e,t)}},eventOrder:a,domModification:{attributes:{role:"dialog","aria-modal":"true"}},behaviours:wu(e.modalBehaviours,[eh.config({}),Gp.config({mode:"cyclic",onEnter:e.onExecute,onEscape:e.onEscape,useTabstopAt:e.useTabstopAt,firstTabstop:e.firstTabstop}),FM.config({getRoot:s.get}),th(r,[Jr((t=>{((e,t)=>{const o=Tt(e,"id").fold((()=>{const e=ca("dialog-label");return Ct(t,"id",e),e}),w);Ct(e,"aria-labelledby",o)})(t.element,im(t,e,"title").element)}))])])}},apis:{show:(e,t)=>{e.show(t)},hide:(e,t)=>{e.hide(t)},getBody:(e,t)=>e.getBody(t),getFooter:(e,t)=>e.getFooter(t),setBusy:(e,t,o)=>{e.setBusy(t,o)},setIdle:(e,t)=>{e.setIdle(t)}}}),aR=Bn([sy,ry].concat(ex)),iR=Pn,lR=[Dy("button"),vy,Cs("align","end",["start","end"]),_y,Oy,fs("buttonType",["primary","secondary"])],cR=[...lR,iy],dR=[is("type",["submit","cancel","custom"]),...cR],uR=[is("type",["menu"]),by,yy,vy,us("items",aR),...lR],mR=[...lR,is("type",["togglebutton"]),as("tooltip"),vy,by,Os("active",!1)],gR=Zn("type",{submit:dR,cancel:dR,custom:dR,menu:uR,togglebutton:mR}),pR=[sy,iy,is("level",["info","warn","error","success"]),cy,xs("url","")],hR=Bn(pR),fR=[sy,iy,Oy,Dy("button"),vy,Cy,fs("buttonType",["primary","secondary","toolbar"]),_y],bR=Bn(fR),vR=[sy,ry],yR=vR.concat([xy]),xR=vR.concat([ay,Oy]),wR=Bn(xR),SR=Pn,kR=yR.concat([Ty("auto")]),CR=Bn(kR),OR=Nn([dy,iy,cy]),_R=yR.concat([ks("storageKey","default")]),TR=Bn(_R),ER=Hn,AR=Bn(yR),MR=Hn,DR=vR.concat([ks("tag","textarea"),as("scriptId"),as("scriptUrl"),ws("settings",void 0,jn)]),BR=vR.concat([ks("tag","textarea"),ls("init")]),IR=$n((e=>Yn("customeditor.old",Dn(BR),e).orThunk((()=>Yn("customeditor.new",Dn(DR),e))))),FR=Hn,RR=Bn(yR),NR=In(_n),VR=e=>[sy,rs("columns"),e],zR=[sy,as("html"),Cs("presets","presentation",["presentation","document"])],LR=Bn(zR),HR=yR.concat([Os("border",!1),Os("sandboxed",!0),Os("streamContent",!1),Os("transparent",!0)]),PR=Bn(HR),UR=Hn,WR=Bn(vR.concat([hs("height")])),jR=Bn([as("url"),ps("zoom"),ps("cachedWidth"),ps("cachedHeight")]),GR=yR.concat([hs("inputMode"),hs("placeholder"),Os("maximized",!1),Oy]),$R=Bn(GR),qR=Hn,YR=e=>[sy,ay,e,Cs("align","start",["start","center","end"])],XR=[iy,dy],KR=[iy,us("items",Qn(0,(()=>JR)))],JR=Fn([Bn(XR),Bn(KR)]),ZR=yR.concat([us("items",JR),Oy]),QR=Bn(ZR),eN=Hn,tN=yR.concat([ds("items",[iy,dy]),Ss("size",1),Oy]),oN=Bn(tN),nN=Hn,sN=yR.concat([Os("constrain",!0),Oy]),rN=Bn(sN),aN=Bn([as("width"),as("height")]),iN=vR.concat([ay,Ss("min",0),Ss("max",0)]),lN=Bn(iN),cN=Ln,dN=[sy,us("header",Hn),us("cells",In(Hn))],uN=Bn(dN),mN=yR.concat([hs("placeholder"),Os("maximized",!1),Oy]),gN=Bn(mN),pN=Hn,hN=[is("type",["directory","leaf"]),ly,as("id"),gs("menu",pM)],fN=Bn(hN),bN=hN.concat([us("children",Qn(0,(()=>Gn("type",{directory:vN,leaf:fN}))))]),vN=Bn(bN),yN=Gn("type",{directory:vN,leaf:fN}),xN=[sy,us("items",yN),bs("onLeafAction"),bs("onToggleExpand"),Ts("defaultExpandedIds",[],Hn),hs("defaultSelectedId")],wN=Bn(xN),SN=yR.concat([Cs("filetype","file",["image","media","file"]),Oy,hs("picker_text")]),kN=Bn(SN),CN=Bn([dy,Ey]),ON=e=>es("items","items",{tag:"required",process:{}},In($n((t=>Yn(`Checking item of ${e}`,_N,t).fold((e=>rn.error(Jn(e))),(e=>rn.value(e))))))),_N=An((()=>{return Gn("type",{alertbanner:hR,bar:Bn((e=ON("bar"),[sy,e])),button:bR,checkbox:wR,colorinput:TR,colorpicker:AR,dropzone:RR,grid:Bn(VR(ON("grid"))),iframe:PR,input:$R,listbox:QR,selectbox:oN,sizeinput:rN,slider:lN,textarea:gN,urlinput:kN,customeditor:IR,htmlpanel:LR,imagepreview:WR,collection:CR,label:Bn(YR(ON("label"))),table:uN,tree:wN,panel:EN});var e})),TN=[sy,xs("classes",[]),us("items",_N)],EN=Bn(TN),AN=[Dy("tab"),ly,us("items",_N)],MN=[sy,ds("tabs",AN)],DN=Bn(MN),BN=cR,IN=gR,FN=Bn([as("title"),ss("body",Gn("type",{panel:EN,tabpanel:DN})),ks("size","normal"),Ts("buttons",[],IN),xs("initialData",{}),_s("onAction",b),_s("onChange",b),_s("onSubmit",b),_s("onClose",b),_s("onCancel",b),_s("onTabChange",b)]),RN=Bn([is("type",["cancel","custom"]),...BN]),NN=Bn([as("title"),as("url"),ps("height"),ps("width"),vs("buttons",RN),_s("onAction",b),_s("onCancel",b),_s("onClose",b),_s("onMessage",b)]),VN=e=>a(e)?[e].concat(Y(fe(e),VN)):l(e)?Y(e,VN):[],zN=e=>r(e.type)&&r(e.name),LN={checkbox:SR,colorinput:ER,colorpicker:MR,dropzone:NR,input:qR,iframe:UR,imagepreview:jR,selectbox:nN,sizeinput:aN,slider:cN,listbox:eN,size:aN,textarea:pN,urlinput:CN,customeditor:FR,collection:OR,togglemenuitem:iR},HN=e=>{const t=(e=>U(VN(e),zN))(e),o=Y(t,(e=>(e=>A.from(LN[e.type]))(e).fold((()=>[]),(t=>[ss(e.name,t)]))));return Bn(o)},PN=e=>{var t;return{internalDialog:Xn(Yn("dialog",FN,e)),dataValidator:HN(e),initialData:null!==(t=e.initialData)&&void 0!==t?t:{}}},UN={open:(e,t)=>{const o=PN(t);return e(o.internalDialog,o.initialData,o.dataValidator)},openUrl:(e,t)=>e(Xn(Yn("dialog",NN,t))),redial:e=>PN(e)};var WN=Object.freeze({__proto__:null,events:(e,t)=>{const o=(o,n)=>{e.updateState.each((e=>{const s=e(o,n);t.set(s)})),e.renderComponents.each((s=>{const r=s(n,t.get());(e.reuseDom?qp:$p)(o,r)}))};return Hr([Wr(ur(),((t,n)=>{const s=n;if(!s.universal){const n=e.channel;R(s.channels,n)&&o(t,s.data)}})),Jr(((t,n)=>{e.initialData.each((e=>{o(t,e)}))}))])}}),jN=Object.freeze({__proto__:null,getState:(e,t,o)=>o}),GN=[ns("channel"),ms("renderComponents"),ms("updateState"),ms("initialData"),Os("reuseDom",!0)];const $N=Al({fields:GN,name:"reflecting",active:WN,apis:jN,state:Object.freeze({__proto__:null,init:()=>{const e=As(A.none());return{readState:()=>e.get().getOr("none"),get:e.get,set:e.set,clear:()=>e.set(A.none())}}})}),qN=e=>{const t=[],o={};return le(e,((e,n)=>{e.fold((()=>{t.push(n)}),(e=>{o[n]=e}))})),t.length>0?rn.error(t):rn.value(o)},YN=(e,t,o)=>{const n=Xh(IO.sketch((n=>({dom:{tag:"div",classes:["tox-form"].concat(e.classes)},components:L(e.items,(e=>nE(n,e,t,o)))}))));return{dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[n.asSpec()]}],behaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)}),(s=n,Om.config({find:s.getOpt})),WO(n,{postprocess:e=>qN(e).fold((e=>(console.error(e),{})),w)}),th("dialog-body-panel",[Wr(Xs(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:A.some(t.event.target)})}))])])};var s},XN=xm({name:"TabButton",configFields:[xs("uid",void 0),ns("value"),es("dom","dom",wn((()=>({attributes:{role:"tab",id:ca("aria"),"aria-selected":"false"}}))),Vn()),ms("action"),xs("domModification",{}),yu("tabButtonBehaviours",[ah,Gp,vu]),ns("view")],factory:(e,t)=>({uid:e.uid,dom:e.dom,components:e.components,events:fh(e.action),behaviours:wu(e.tabButtonBehaviours,[ah.config({}),Gp.config({mode:"execution",useSpace:!0,useEnter:!0}),vu.config({store:{mode:"memory",initialValue:e.value}})]),domModification:e.domModification})}),KN=x([ns("tabs"),ns("dom"),xs("clickToDismiss",!1),yu("tabbarBehaviours",[Xm,Gp]),Ii(["tabClass","selectedClass"])]),JN=Xu({factory:XN,name:"tabs",unit:"tab",overrides:e=>{const t=(e,t)=>{Xm.dehighlight(e,t),Rr(e,Dr(),{tabbar:e,button:t})},o=(e,t)=>{Xm.highlight(e,t),Rr(e,Mr(),{tabbar:e,button:t})};return{action:n=>{const s=n.getSystem().getByUid(e.uid).getOrDie(),r=Xm.isHighlighted(s,n);(r&&e.clickToDismiss?t:r?b:o)(s,n)},domModification:{classes:[e.markers.tabClass]}}}}),ZN=x([JN]),QN=wm({name:"Tabbar",configFields:KN(),partFields:ZN(),factory:(e,t,o,n)=>({uid:e.uid,dom:e.dom,components:t,"debug.sketcher":"Tabbar",domModification:{attributes:{role:"tablist"}},behaviours:wu(e.tabbarBehaviours,[Xm.config({highlightClass:e.markers.selectedClass,itemClass:e.markers.tabClass,onHighlight:(e,t)=>{Ct(t.element,"aria-selected","true")},onDehighlight:(e,t)=>{Ct(t.element,"aria-selected","false")}}),Gp.config({mode:"flow",getInitial:e=>Xm.getHighlighted(e).map((e=>e.element)),selector:"."+e.markers.tabClass,executeOnMove:!0})])})}),eV=xm({name:"Tabview",configFields:[yu("tabviewBehaviours",[eh])],factory:(e,t)=>({uid:e.uid,dom:e.dom,behaviours:wu(e.tabviewBehaviours,[eh.config({})]),domModification:{attributes:{role:"tabpanel"}}})}),tV=x([xs("selectFirst",!0),Ri("onChangeTab"),Ri("onDismissTab"),xs("tabs",[]),yu("tabSectionBehaviours",[])]),oV=$u({factory:QN,schema:[ns("dom"),cs("markers",[ns("tabClass"),ns("selectedClass")])],name:"tabbar",defaults:e=>({tabs:e.tabs})}),nV=$u({factory:eV,name:"tabview"}),sV=x([oV,nV]),rV=wm({name:"TabSection",configFields:tV(),partFields:sV(),factory:(e,t,o,n)=>{const s=(t,o)=>{am(t,e,"tabbar").each((e=>{o(e).each(Nr)}))};return{uid:e.uid,dom:e.dom,components:t,behaviours:xu(e.tabSectionBehaviours),events:Hr(q([e.selectFirst?[Jr(((e,t)=>{s(e,Xm.getFirst)}))]:[],[Wr(Mr(),((t,o)=>{(t=>{const o=vu.getValue(t);am(t,e,"tabview").each((n=>{G(e.tabs,(e=>e.value===o)).each((o=>{const s=o.view();Tt(t.element,"id").each((e=>{Ct(n.element,"aria-labelledby",e)})),eh.set(n,s),e.onChangeTab(n,t,s)}))}))})(o.event.button)})),Wr(Dr(),((t,o)=>{const n=o.event.button;e.onDismissTab(t,n)}))]])),apis:{getViewItems:t=>am(t,e,"tabview").map((e=>eh.contents(e))).getOr([]),showTab:(e,t)=>{s(e,(e=>{const o=Xm.getCandidates(e);return G(o,(e=>vu.getValue(e)===t)).filter((t=>!Xm.isHighlighted(e,t)))}))}}}},apis:{getViewItems:(e,t)=>e.getViewItems(t),showTab:(e,t,o)=>{e.showTab(t,o)}}}),aV=(e,t)=>{Bt(e,"height",t+"px"),Bt(e,"flex-basis",t+"px")},iV=(e,t,o)=>{fi(e,'[role="dialog"]').each((e=>{vi(e,'[role="tablist"]').each((n=>{o.get().map((o=>(Bt(t,"height","0"),Bt(t,"flex-basis","0"),Math.min(o,((e,t,o)=>{const n=nt(e).dom,s=fi(e,".tox-dialog-wrap").getOr(e);let r;r="fixed"===Rt(s,"position")?Math.max(n.clientHeight,window.innerHeight):Math.max(n.offsetHeight,n.scrollHeight);const a=jt(t),i=t.dom.offsetLeft>=o.dom.offsetLeft+Zt(o)?Math.max(jt(o),a):a,l=parseInt(Rt(e,"margin-top"),10)||0,c=parseInt(Rt(e,"margin-bottom"),10)||0;return r-(jt(e)+l+c-i)})(e,t,n))))).each((e=>{aV(t,e)}))}))}))},lV=e=>vi(e,'[role="tabpanel"]'),cV="send-data-to-section",dV="send-data-to-view",uV=(e,t,o)=>{const n=As({}),s=e=>{const t=vu.getValue(e),o=qN(t).getOr({}),s=n.get(),r=bn(s,o);n.set(r)},r=e=>{const t=n.get();vu.setValue(e,t)},a=As(null),i=L(e.tabs,(e=>({value:e.name,dom:{tag:"div",classes:["tox-dialog__body-nav-item"]},components:[ri(o.shared.providers.translate(e.title))],view:()=>[IO.sketch((n=>({dom:{tag:"div",classes:["tox-form"]},components:L(e.items,(e=>nE(n,e,t,o))),formBehaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)}),th("TabView.form.events",[Jr(r),Zr(s)]),Il.config({channels:Bs([{key:cV,value:{onReceive:s}},{key:dV,value:{onReceive:r}}])})])})))]}))),l=(e=>{const t=nc(),o=[Jr((o=>{const n=o.element;lV(n).each((s=>{Bt(s,"visibility","hidden"),o.getSystem().getByDom(s).toOptional().each((o=>{const n=((e,t,o)=>L(e,((n,s)=>{eh.set(o,e[s].view());const r=t.dom.getBoundingClientRect();return eh.set(o,[]),r.height})))(e,s,o),r=(e=>oe(ee(e,((e,t)=>e>t?-1:e<t?1:0))))(n);r.fold(t.clear,t.set)})),iV(n,s,t),Ht(s,"visibility"),((e,t)=>{oe(e).each((e=>rV.showTab(t,e.value)))})(e,o),requestAnimationFrame((()=>{iV(n,s,t)}))}))})),Wr(Sr(),(e=>{const o=e.element;lV(o).each((e=>{iV(o,e,t)}))})),Wr(Ek,((e,o)=>{const n=e.element;lV(n).each((e=>{const o=zl(ft(e));Bt(e,"visibility","hidden");const s=Vt(e,"height").map((e=>parseInt(e,10)));Ht(e,"height"),Ht(e,"flex-basis");const r=e.dom.getBoundingClientRect().height;s.forall((e=>r>e))?(t.set(r),iV(n,e,t)):s.each((t=>{aV(e,t)})),Ht(e,"visibility"),o.each(Rl)}))}))];return{extraEvents:o,selectFirst:!1}})(i);return rV.sketch({dom:{tag:"div",classes:["tox-dialog__body"]},onChangeTab:(e,t,o)=>{const n=vu.getValue(t);Rr(e,Tk,{name:n,oldName:a.get()}),a.set(n)},tabs:i,components:[rV.parts.tabbar({dom:{tag:"div",classes:["tox-dialog__body-nav"]},components:[QN.parts.tabs({})],markers:{tabClass:"tox-tab",selectedClass:"tox-dialog__body-nav-item--active"},tabbarBehaviours:Tl([pk.config({})])}),rV.parts.tabview({dom:{tag:"div",classes:["tox-dialog__body-content"]}})],selectFirst:l.selectFirst,tabSectionBehaviours:Tl([th("tabpanel",l.extraEvents),Gp.config({mode:"acyclic"}),Om.config({find:e=>oe(rV.getViewItems(e))}),jO(A.none(),(e=>(e.getSystem().broadcastOn([cV],{}),n.get())),((e,t)=>{n.set(t),e.getSystem().broadcastOn([dV],{})}))])})},mV=(e,t,o,n,s)=>({dom:{tag:"div",classes:["tox-dialog__content-js"],attributes:{...o.map((e=>({id:e}))).getOr({}),...s?{"aria-live":"polite"}:{}}},components:[],behaviours:Tl([PO(0),$N.config({channel:`${a_}-${t}`,updateState:(e,t)=>A.some({isTabPanel:()=>"tabpanel"===t.body.type}),renderComponents:e=>{const t=e.body;return"tabpanel"===t.type?[uV(t,e.initialData,n)]:[YN(t,e.initialData,n)]},initialData:e})])}),gV=cb.deviceType.isTouch(),pV=(e,t)=>({dom:{tag:"div",styles:{display:"none"},classes:["tox-dialog__header"]},components:[e,t]}),hV=(e,t)=>rR.parts.close(qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":t.translate("Close")}},action:e,buttonBehaviours:Tl([pk.config({})])})),fV=()=>rR.parts.title({dom:{tag:"div",classes:["tox-dialog__title"],innerHtml:"",styles:{display:"none"}}}),bV=(e,t)=>rR.parts.body({dom:{tag:"div",classes:["tox-dialog__body"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-content"]},components:[{dom:Yh(`<p>${$f(t.translate(e))}</p>`)}]}]}),vV=e=>rR.parts.footer({dom:{tag:"div",classes:["tox-dialog__footer"]},components:e}),yV=(e,t)=>[ik.sketch({dom:{tag:"div",classes:["tox-dialog__footer-start"]},components:e}),ik.sketch({dom:{tag:"div",classes:["tox-dialog__footer-end"]},components:t})],xV=e=>{const t="tox-dialog",o=t+"-wrap",n=o+"__backdrop",s=t+"__disable-scroll";return rR.sketch({lazySink:e.lazySink,onEscape:t=>(e.onEscape(t),A.some(!0)),useTabstopAt:e=>!n_(e),firstTabstop:e.firstTabstop,dom:{tag:"div",classes:[t].concat(e.extraClasses),styles:{position:"relative",...e.extraStyles}},components:[e.header,e.body,...e.footer.toArray()],parts:{blocker:{dom:Yh(`<div class="${o}"></div>`),components:[{dom:{tag:"div",classes:gV?[n,n+"--opaque"]:[n]}}]}},dragBlockClass:o,modalBehaviours:Tl([ah.config({}),th("dialog-events",e.dialogEvents.concat([Kr(Xs(),((e,t)=>{FM.isBlocked(e)||Gp.focusIn(e)})),Wr(Tr(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:t.event.newFocus})}))])),th("scroll-lock",[Jr((()=>{Wa(wt(),s)})),Zr((()=>{Ga(wt(),s)}))]),...e.extraBehaviours]),eventOrder:{[mr()]:["dialog-events"],[kr()]:["scroll-lock","dialog-events","alloy.base.behaviour"],[Cr()]:["alloy.base.behaviour","dialog-events","scroll-lock"],...e.eventOrder}})},wV=e=>qh.sketch({dom:{tag:"button",classes:["tox-button","tox-button--icon","tox-button--naked"],attributes:{type:"button","aria-label":e.translate("Close"),title:e.translate("Close")}},buttonBehaviours:Tl([pk.config({})]),components:[ob("close",{tag:"span",classes:["tox-icon"]},e.icons)],action:e=>{Fr(e,Sk)}}),SV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__title"],attributes:{...o.map((e=>({id:e}))).getOr({})}},components:[],behaviours:Tl([$N.config({channel:`${r_}-${t}`,initialData:e,renderComponents:e=>[ri(n.translate(e.title))]})])}),kV=()=>({dom:Yh('<div class="tox-dialog__draghandle"></div>')}),CV=(e,t,o)=>((e,t,o)=>{const n=rR.parts.title(SV(e,t,A.none(),o)),s=rR.parts.draghandle(kV()),r=rR.parts.close(wV(o)),a=[n].concat(e.draggable?[s]:[]).concat([r]);return ik.sketch({dom:Yh('<div class="tox-dialog__header"></div>'),components:a})})({title:o.shared.providers.translate(e),draggable:o.dialog.isDraggableModal()},t,o.shared.providers),OV=(e,t,o,n)=>({dom:{tag:"div",classes:["tox-dialog__busy-spinner"],attributes:{"aria-label":o.translate(e)},styles:{left:"0px",right:"0px",bottom:"0px",top:`${n.getOr(0)}px`,position:"absolute"}},behaviours:t,components:[{dom:Yh('<div class="tox-spinner"><div></div><div></div><div></div></div>')}]}),_V=(e,t,o)=>({onClose:()=>o.closeWindow(),onBlock:o=>{const n=vi(e().element,".tox-dialog__header").map((e=>jt(e)));rR.setBusy(e(),((e,s)=>OV(o.message,s,t,n)))},onUnblock:()=>{rR.setIdle(e())}}),TV="tox-dialog--fullscreen",EV="tox-dialog--width-lg",AV="tox-dialog--width-md",MV=e=>{switch(e){case"large":return A.some(EV);case"medium":return A.some(AV);default:return A.none()}},DV=(e,t)=>{const o=ze(t.element.dom);$a(o,TV)||(Ya(o,[EV,AV]),MV(e).each((e=>Wa(o,e))))},BV=(e,t)=>{const o=ze(e.element.dom),n=Xa(o),s=G(n,(e=>e===EV||e===AV)).or(MV(t));((e,t)=>{H(t,(t=>{((e,t)=>{const o=La(e)?e.dom.classList.toggle(t):((e,t)=>R(Ha(e),t)?Ua(e,t):Pa(e,t))(e,t);ja(e)})(e,t)}))})(o,[TV,...s.toArray()])},IV=(e,t,o)=>ci(xV({...e,firstTabstop:1,lazySink:o.shared.getSink,extraBehaviours:[$O({}),...e.extraBehaviours],onEscape:e=>{Fr(e,Sk)},dialogEvents:t,eventOrder:{[ur()]:[$N.name(),Il.name()],[kr()]:["scroll-lock",$N.name(),"messages","dialog-events","alloy.base.behaviour"],[Cr()]:["alloy.base.behaviour","dialog-events","messages",$N.name(),"scroll-lock"]}})),FV=(e,t={})=>L(e,(e=>"menu"===e.type?(e=>{const o=L(e.items,(e=>{const o=be(t,e.name).getOr(As(!1));return{...e,storage:o}}));return{...e,items:o}})(e):e)),RV=e=>j(e,((e,t)=>"menu"===t.type?j(t.items,((e,t)=>(e[t.name]=t.storage,e)),e):e),{}),NV=(e,t)=>[qr(Xs(),o_),e(wk,((e,o,n,s)=>{zl(ft(s.element)).fold(b,Nl),t.onClose(),o.onClose()})),e(Sk,((e,t,o,n)=>{t.onCancel(e),Fr(n,wk)})),Wr(_k,((e,o)=>t.onUnblock())),Wr(Ok,((e,o)=>t.onBlock(o.event)))],VV=(e,t,o)=>{const n=(t,o)=>Wr(t,((t,n)=>{s(t,((s,r)=>{o(e(),s,n.event,t)}))})),s=(e,t)=>{$N.getState(e).get().each((o=>{t(o.internalDialog,e)}))};return[...NV(n,t),n(Ck,((e,t)=>t.onSubmit(e))),n(xk,((e,t,o)=>{t.onChange(e,{name:o.name})})),n(kk,((e,t,n,s)=>{const r=()=>s.getSystem().isConnected()?Gp.focusIn(s):void 0,a=e=>Et(e,"disabled")||Tt(e,"aria-disabled").exists((e=>"true"===e)),i=ft(s.element),l=zl(i);t.onAction(e,{name:n.name,value:n.value}),zl(i).fold(r,(e=>{a(e)||l.exists((t=>et(e,t)&&a(t)))?r():o().toOptional().filter((t=>!et(t.element,e))).each(r)}))})),n(Tk,((e,t,o)=>{t.onTabChange(e,{newTabName:o.name,oldTabName:o.oldName})})),Zr((t=>{const o=e();vu.setValue(t,o.getData())}))]},zV=(e,t)=>{const o=t.map((e=>e.footerButtons)).getOr([]),n=P(o,(e=>"start"===e.align)),s=(e,t)=>ik.sketch({dom:{tag:"div",classes:[`tox-dialog__footer-${e}`]},components:L(t,(e=>e.memento.asSpec()))});return[s("start",n.pass),s("end",n.fail)]},LV=(e,t,o)=>({dom:Yh('<div class="tox-dialog__footer"></div>'),components:[],behaviours:Tl([$N.config({channel:`${i_}-${t}`,initialData:e,updateState:(e,t)=>{const n=L(t.buttons,(e=>{const t=Xh(((e,t)=>PT(e,e.type,t))(e,o));return{name:e.name,align:e.align,memento:t}}));return A.some({lookupByName:t=>((e,t,o)=>G(t,(e=>e.name===o)).bind((t=>t.memento.getOpt(e))))(e,n,t),footerButtons:n})},renderComponents:zV})])}),HV=(e,t,o)=>rR.parts.footer(LV(e,t,o)),PV=(e,t)=>{if(e.getRoot().getSystem().isConnected()){const o=Om.getCurrent(e.getFormWrapper()).getOr(e.getFormWrapper());return IO.getField(o,t).orThunk((()=>{const o=e.getFooter().bind((e=>$N.getState(e).get()));return o.bind((e=>e.lookupByName(t)))}))}return A.none()},UV=(e,t,o)=>{const n=t=>{const o=e.getRoot();o.getSystem().isConnected()&&t(o)},s={getData:()=>{const t=e.getRoot(),n=t.getSystem().isConnected()?e.getFormWrapper():t;return{...vu.getValue(n),...ce(o,(e=>e.get()))}},setData:t=>{n((n=>{const r=s.getData(),a=bn(r,t),i=((e,t)=>{const o=e.getRoot();return $N.getState(o).get().map((e=>Xn(Yn("data",e.dataValidator,t)))).getOr(t)})(e,a),l=e.getFormWrapper();vu.setValue(l,i),le(o,((e,t)=>{ve(a,t)&&e.set(a[t])}))}))},setEnabled:(t,o)=>{PV(e,t).each(o?Lm.enable:Lm.disable)},focus:t=>{PV(e,t).each(ah.focus)},block:e=>{if(!r(e))throw new Error("The dialogInstanceAPI.block function should be passed a blocking message of type string as an argument");n((t=>{Rr(t,Ok,{message:e})}))},unblock:()=>{n((e=>{Fr(e,_k)}))},showTab:t=>{n((o=>{const n=e.getBody();$N.getState(n).get().exists((e=>e.isTabPanel()))&&Om.getCurrent(n).each((e=>{rV.showTab(e,t)}))}))},redial:r=>{n((n=>{const a=e.getId(),i=t(r),l=FV(i.internalDialog.buttons,o);n.getSystem().broadcastOn([`${s_}-${a}`],i),n.getSystem().broadcastOn([`${r_}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${a_}-${a}`],i.internalDialog),n.getSystem().broadcastOn([`${i_}-${a}`],{...i.internalDialog,buttons:l}),s.setData(i.initialData)}))},close:()=>{n((e=>{Fr(e,wk)}))},toggleFullscreen:e.toggleFullscreen};return s},WV=(e,t,o,n=!1,s)=>{const r=ca("dialog"),a=ca("dialog-label"),i=ca("dialog-content"),l=e.internalDialog,c=As(l.size),d=MV(c.get()).toArray(),u=Xh(((e,t,o,n)=>ik.sketch({dom:Yh('<div class="tox-dialog__header"></div>'),components:[SV(e,t,A.some(o),n),kV(),wV(n)],containerBehaviours:Tl([jF.config({mode:"mouse",blockerClass:"blocker",getTarget:e=>yi(e,'[role="dialog"]').getOrDie(),snaps:{getSnapPoints:()=>[],leftAttr:"data-drag-left",topAttr:"data-drag-top"}})])}))({title:l.title,draggable:!0},r,a,o.shared.providers)),m=Xh(((e,t,o,n,s)=>mV(e,t,A.some(o),n,s))({body:l.body,initialData:l.initialData},r,i,o,n)),g=FV(l.buttons),p=RV(g),h=Ce(0!==g.length,Xh(((e,t,o)=>LV(e,t,o))({buttons:g},r,o))),f=VV((()=>v),{onBlock:e=>{FM.block(b,((t,n)=>{const s=u.getOpt(b).map((e=>jt(e.element)));return OV(e.message,n,o.shared.providers,s)}))},onUnblock:()=>{FM.unblock(b)},onClose:()=>t.closeWindow()},o.shared.getSink),b=ci({dom:{tag:"div",classes:["tox-dialog","tox-dialog-inline",...d],attributes:{role:"dialog","aria-labelledby":a}},eventOrder:{[ur()]:[$N.name(),Il.name()],[mr()]:["execute-on-form"],[kr()]:["reflecting","execute-on-form"]},behaviours:Tl([Gp.config({mode:"cyclic",onEscape:e=>(Fr(e,wk),A.some(!0)),useTabstopAt:e=>!n_(e)&&("button"!==We(e)||"disabled"!==_t(e,"disabled")),firstTabstop:1}),$N.config({channel:`${s_}-${r}`,updateState:(e,t)=>(c.set(t.internalDialog.size),DV(t.internalDialog.size,e),s(),A.some(t)),initialData:e}),ah.config({}),th("execute-on-form",f.concat([Kr(Xs(),((e,t)=>{Gp.focusIn(e)})),Wr(Tr(),((e,t)=>{e.getSystem().broadcastOn([c_],{newFocus:t.event.newFocus})}))])),FM.config({getRoot:()=>A.some(b)}),eh.config({}),$O({})]),components:[u.asSpec(),m.asSpec(),...h.map((e=>e.asSpec())).toArray()]}),v=UV({getId:x(r),getRoot:x(b),getFooter:()=>h.map((e=>e.get(b))),getBody:()=>m.get(b),getFormWrapper:()=>{const e=m.get(b);return Om.getCurrent(e).getOr(e)},toggleFullscreen:()=>{BV(b,c.get())}},t.redial,p);return{dialog:b,instanceApi:v}};var jV=tinymce.util.Tools.resolve("tinymce.util.URI");const GV=["insertContent","setContent","execCommand","close","block","unblock"],$V=e=>a(e)&&-1!==GV.indexOf(e.mceAction),qV=(e,t,o,n)=>{const s=ca("dialog"),i=CV(e.title,s,n),l=(e=>{const t={dom:{tag:"div",classes:["tox-dialog__content-js"]},components:[{dom:{tag:"div",classes:["tox-dialog__body-iframe"]},components:[e_(A.none(),{dom:{tag:"iframe",attributes:{src:e.url}},behaviours:Tl([pk.config({}),ah.config({})])})]}],behaviours:Tl([Gp.config({mode:"acyclic",useTabstopAt:C(n_)})])};return rR.parts.body(t)})(e),c=e.buttons.bind((e=>0===e.length?A.none():A.some(HV({buttons:e},s,n)))),u=((e,t)=>{const o=(e,t)=>Wr(e,((e,o)=>{n(e,((n,s)=>{t(x,n,o.event,e)}))})),n=(e,t)=>{$N.getState(e).get().each((o=>{t(o,e)}))};return[...NV(o,t),o(kk,((e,t,o)=>{t.onAction(e,{name:o.name})}))]})(0,_V((()=>y),n.shared.providers,t)),m={...e.height.fold((()=>({})),(e=>({height:e+"px","max-height":e+"px"}))),...e.width.fold((()=>({})),(e=>({width:e+"px","max-width":e+"px"})))},p=e.width.isNone()&&e.height.isNone()?["tox-dialog--width-lg"]:[],h=new jV(e.url,{base_uri:new jV(window.location.href)}),f=`${h.protocol}://${h.host}${h.port?":"+h.port:""}`,b=oc(),v=[$N.config({channel:`${s_}-${s}`,updateState:(e,t)=>A.some(t),initialData:e}),th("messages",[Jr((()=>{const t=rc(ze(window),"message",(t=>{if(h.isSameOrigin(new jV(t.raw.origin))){const n=t.raw.data;$V(n)?((e,t,o)=>{switch(o.mceAction){case"insertContent":e.insertContent(o.content);break;case"setContent":e.setContent(o.content);break;case"execCommand":const n=!!d(o.ui)&&o.ui;e.execCommand(o.cmd,n,o.value);break;case"close":t.close();break;case"block":t.block(o.message);break;case"unblock":t.unblock()}})(o,x,n):(e=>!$V(e)&&a(e)&&ve(e,"mceAction"))(n)&&e.onMessage(x,n)}}));b.set(t)})),Zr(b.clear)]),Il.config({channels:{[l_]:{onReceive:(e,t)=>{vi(e.element,"iframe").each((e=>{const o=e.dom.contentWindow;g(o)&&o.postMessage(t,f)}))}}}})],y=IV({id:s,header:i,body:l,footer:c,extraClasses:p,extraBehaviours:v,extraStyles:m},u,n),x=(e=>{const t=t=>{e.getSystem().isConnected()&&t(e)};return{block:e=>{if(!r(e))throw new Error("The urlDialogInstanceAPI.block function should be passed a blocking message of type string as an argument");t((t=>{Rr(t,Ok,{message:e})}))},unblock:()=>{t((e=>{Fr(e,_k)}))},close:()=>{t((e=>{Fr(e,wk)}))},sendMessage:e=>{t((t=>{t.getSystem().broadcastOn([l_],e)}))}}})(y);return{dialog:y,instanceApi:x}},YV=(e,t)=>Xn(Yn("data",t,e)),XV=e=>JS(e,".tox-alert-dialog")||JS(e,".tox-confirm-dialog"),KV=(e,t,o)=>t&&o?[]:[tM.config({contextual:{lazyContext:()=>A.some(Zo(ze(e.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top"],lazyViewport:t=>XS(e,t.element).map((e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:tn(),optScrollEnv:A.none()})))})],JV=e=>{const t=e.editor,o=dv(t),n=(e=>{const t=e.shared;return{open:(o,n)=>{const s=()=>{rR.hide(l),n()},r=Xh(PT({name:"close-alert",text:"OK",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"cancel",e)),a=fV(),i=hV(s,t.providers),l=ci(xV({lazySink:()=>t.getSink(),header:pV(a,i),body:bV(o,t.providers),footer:A.some(vV(yV([],[r.asSpec()]))),onEscape:s,extraClasses:["tox-alert-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Wr(Sk,s)],eventOrder:{}}));rR.show(l);const c=r.get(l);ah.focus(c)}}})(e.backstages.dialog),s=(e=>{const t=e.shared;return{open:(o,n)=>{const s=e=>{rR.hide(c),n(e)},r=Xh(PT({name:"yes",text:"Yes",primary:!0,buttonType:A.some("primary"),align:"end",enabled:!0,icon:A.none()},"submit",e)),a=PT({name:"no",text:"No",primary:!1,buttonType:A.some("secondary"),align:"end",enabled:!0,icon:A.none()},"cancel",e),i=fV(),l=hV((()=>s(!1)),t.providers),c=ci(xV({lazySink:()=>t.getSink(),header:pV(i,l),body:bV(o,t.providers),footer:A.some(vV(yV([],[a,r.asSpec()]))),onEscape:()=>s(!1),extraClasses:["tox-confirm-dialog"],extraBehaviours:[],extraStyles:{},dialogEvents:[Wr(Sk,(()=>s(!1))),Wr(Ck,(()=>s(!0)))],eventOrder:{}}));rR.show(c);const d=r.get(c);ah.focus(d)}}})(e.backstages.dialog),r=(t,o)=>UN.open(((t,n,s)=>{const r=n,a=((e,t,o)=>{const n=ca("dialog"),s=e.internalDialog,r=CV(s.title,n,o),a=As(s.size),i=MV(a.get()).toArray(),l=((e,t,o)=>{const n=mV(e,t,A.none(),o,!1);return rR.parts.body(n)})({body:s.body,initialData:s.initialData},n,o),c=FV(s.buttons),d=RV(c),u=Ce(0!==c.length,HV({buttons:c},n,o)),m=VV((()=>f),_V((()=>p),o.shared.providers,t),o.shared.getSink),g={id:n,header:r,body:l,footer:u,extraClasses:i,extraBehaviours:[$N.config({channel:`${s_}-${n}`,updateState:(e,t)=>(a.set(t.internalDialog.size),DV(t.internalDialog.size,e),A.some(t)),initialData:e})],extraStyles:{}},p=IV(g,m,o),h={getId:x(n),getRoot:x(p),getBody:()=>rR.getBody(p),getFooter:()=>rR.getFooter(p),getFormWrapper:()=>{const e=rR.getBody(p);return Om.getCurrent(e).getOr(e)},toggleFullscreen:()=>{BV(p,a.get())}},f=UV(h,t.redial,d);return{dialog:p,instanceApi:f}})({dataValidator:s,initialData:r,internalDialog:t},{redial:UN.redial,closeWindow:()=>{rR.hide(a.dialog),o(a.instanceApi)}},e.backstages.dialog);return rR.show(a.dialog),a.instanceApi.setData(r),a.instanceApi}),t),a=(n,s,r,a)=>UN.open(((n,i,l)=>{const c=YV(i,l),d=nc(),u=e.backstages.popup.shared.header.isPositionedAtTop(),m=()=>d.on((e=>{Gh.reposition(e),o&&u||tM.refresh(e)})),g=WV({dataValidator:l,initialData:c,internalDialog:n},{redial:UN.redial,closeWindow:()=>{d.on(Gh.hide),t.off("ResizeEditor",m),d.clear(),r(g.instanceApi)}},e.backstages.popup,a.ariaAttrs,m),p=ci(Gh.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:a.persistent?{event:"doNotDismissYet"}:{},...u?{}:{fireRepositionEventInstead:{}},inlineBehaviours:Tl([th("window-manager-inline-events",[Wr(Or(),((e,t)=>{Fr(g.dialog,Sk)}))]),...KV(t,o,u)]),isExtraPart:(e,t)=>XV(t)}));return d.set(p),Gh.showWithinBounds(p,di(g.dialog),{anchor:s},(()=>{const e=t.inline?wt():ze(t.getContainer()),o=Zo(e);return A.some(o)})),o&&u||(tM.refresh(p),t.on("ResizeEditor",m)),g.instanceApi.setData(c),Gp.focusIn(g.dialog),g.instanceApi}),n),i=(o,n,s,r)=>UN.open(((o,a,i)=>{const l=YV(a,i),c=nc(),d=e.backstages.popup.shared.header.isPositionedAtTop(),u=()=>c.on((e=>{Gh.reposition(e),tM.refresh(e)})),m=WV({dataValidator:i,initialData:l,internalDialog:o},{redial:UN.redial,closeWindow:()=>{c.on(Gh.hide),t.off("ResizeEditor ScrollWindow ElementScroll",u),c.clear(),s(m.instanceApi)}},e.backstages.popup,r.ariaAttrs,u),g=ci(Gh.sketch({lazySink:e.backstages.popup.shared.getSink,dom:{tag:"div",classes:[]},fireDismissalEventInstead:r.persistent?{event:"doNotDismissYet"}:{},...d?{}:{fireRepositionEventInstead:{}},inlineBehaviours:Tl([th("window-manager-inline-events",[Wr(Or(),((e,t)=>{Fr(m.dialog,Sk)}))]),tM.config({contextual:{lazyContext:()=>A.some(Zo(ze(t.getContentAreaContainer()))),fadeInClass:"tox-dialog-dock-fadein",fadeOutClass:"tox-dialog-dock-fadeout",transitionClass:"tox-dialog-dock-transition"},modes:["top","bottom"],lazyViewport:e=>XS(t,e.element).map((e=>({bounds:KS(e),optScrollEnv:A.some({currentScrollTop:e.element.dom.scrollTop,scrollElmTop:Xt(e.element).top})}))).getOrThunk((()=>({bounds:tn(),optScrollEnv:A.none()})))})]),isExtraPart:(e,t)=>XV(t)}));return c.set(g),Gh.showWithinBounds(g,di(m.dialog),{anchor:n},(()=>e.backstages.popup.shared.getSink().toOptional().bind((e=>{const o=XS(t,e.element).map((e=>KS(e))).getOr(tn()),n=Zo(ze(t.getContentAreaContainer())),s=en(n,o);return A.some(Jo(s.x,s.y,s.width,s.height-15))})))),tM.refresh(g),t.on("ResizeEditor ScrollWindow ElementScroll ResizeWindow",u),m.instanceApi.setData(l),Gp.focusIn(m.dialog),m.instanceApi}),o);return{open:(t,o,n)=>{if(!u(o)){if("toolbar"===o.inline)return a(t,e.backstages.popup.shared.anchors.inlineDialog(),n,o);if("bottom"===o.inline)return i(t,e.backstages.popup.shared.anchors.inlineBottomDialog(),n,o);if("cursor"===o.inline)return a(t,e.backstages.popup.shared.anchors.cursor(),n,o)}return r(t,n)},openUrl:(o,n)=>((o,n)=>UN.openUrl((o=>{const s=qV(o,{closeWindow:()=>{rR.hide(s.dialog),n(s.instanceApi)}},t,e.backstages.dialog);return rR.show(s.dialog),s.instanceApi}),o))(o,n),alert:(e,t)=>{n.open(e,t)},close:e=>{e.close()},confirm:(e,t)=>{s.open(e,t)}}};on.add("silver",(e=>{(e=>{mb(e),(e=>{const t=e.options.register,o=e=>f(e,r)?{value:Rw(e),valid:!0}:{valid:!1,message:"Must be an array of strings."},n=e=>h(e)&&e>0?{value:e,valid:!0}:{valid:!1,message:"Must be a positive number."};t("color_map",{processor:o,default:["#BFEDD2","Light Green","#FBEEB8","Light Yellow","#F8CAC6","Light Red","#ECCAFA","Light Purple","#C2E0F4","Light Blue","#2DC26B","Green","#F1C40F","Yellow","#E03E2D","Red","#B96AD9","Purple","#3598DB","Blue","#169179","Dark Turquoise","#E67E23","Orange","#BA372A","Dark Red","#843FA1","Dark Purple","#236FA1","Dark Blue","#ECF0F1","Light Gray","#CED4D9","Medium Gray","#95A5A6","Gray","#7E8C8D","Dark Gray","#34495E","Navy Blue","#000000","Black","#ffffff","White"]}),t("color_map_background",{processor:o}),t("color_map_foreground",{processor:o}),t("color_cols",{processor:n,default:Lw(e)}),t("color_cols_foreground",{processor:n,default:Hw(e,Iw)}),t("color_cols_background",{processor:n,default:Hw(e,Fw)}),t("custom_colors",{processor:"boolean",default:!0}),t("color_default_foreground",{processor:"string",default:Vw}),t("color_default_background",{processor:"string",default:Vw})})(e),(e=>{const t=e.options.register;t("contextmenu_avoid_overlap",{processor:"string",default:""}),t("contextmenu_never_use_native",{processor:"boolean",default:!1}),t("contextmenu",{processor:e=>!1===e?{value:[],valid:!0}:r(e)||f(e,r)?{value:zI(e),valid:!0}:{valid:!1,message:"Must be false or a string."},default:"link linkchecker image editimage table spellchecker configurepermanentpen"})})(e)})(e);let t=()=>tn();const{dialogs:o,popups:n,renderUI:s}=tR(e,{getPopupSinkBounds:()=>t()});GS(e,n.backstage.shared);const a=JV({editor:e,backstages:{popup:n.backstage,dialog:o.backstage}});return{renderUI:()=>{const o=s();return XS(e,n.getMothership().element).each((e=>{t=()=>KS(e)})),o},getWindowManagerImpl:x(a),getNotificationManagerImpl:()=>((e,t,o)=>{const n=t.backstage.shared,s=()=>{const t=Zo(ze(e.getContentAreaContainer())),o=tn(),n=Qi(o.x,t.x,t.right),s=Qi(o.y,t.y,t.bottom),r=Math.max(t.right,o.right),a=Math.max(t.bottom,o.bottom);return A.some(Jo(n,s,r-n,a-s))};return{open:(t,r)=>{const a=()=>{r(),Gh.hide(l)},i=ci(sb.sketch({text:t.text,level:R(["success","error","warning","warn","info"],t.type)?t.type:void 0,progress:!0===t.progressBar,icon:t.icon,closeButton:t.closeButton,onAction:a,iconProvider:n.providers.icons,translationProvider:n.providers.translate})),l=ci(Gh.sketch({dom:{tag:"div",classes:["tox-notifications-container"]},lazySink:n.getSink,fireDismissalEventInstead:{},...n.header.isPositionedAtTop()?{}:{fireRepositionEventInstead:{}}}));o.add(l),h(t.timeout)&&t.timeout>0&&$h.setEditorTimeout(e,(()=>{a()}),t.timeout);const c={close:a,reposition:()=>{const t=di(i),o={maxHeightFunction:gc()},r=e.notificationManager.getNotifications();if(r[0]===c){const e={...n.anchors.banner(),overrides:o};Gh.showWithinBounds(l,t,{anchor:e},s)}else F(r,c).each((e=>{const n=r[e-1].getEl(),a={type:"node",root:wt(),node:A.some(ze(n)),overrides:o,layouts:{onRtl:()=>[gl],onLtr:()=>[gl]}};Gh.showWithinBounds(l,t,{anchor:a},s)}))},text:e=>{sb.updateText(i,e)},settings:t,getEl:()=>i.element.dom,progressBar:{value:e=>{sb.updateProgress(i,e)}}};return c},close:e=>{e.close()},getArgs:e=>e.settings}})(e,{backstage:n.backstage},n.getMothership())}}))}();
\ No newline at end of file
diff --git a/public/libs/tinymce/tinymce.min.js b/public/libs/tinymce/tinymce.min.js
index 9807eab2c8f..39feaf5a316 100644
--- a/public/libs/tinymce/tinymce.min.js
+++ b/public/libs/tinymce/tinymce.min.js
@@ -1,4 +1,4 @@
 /**
- * TinyMCE version 6.8.3 (2024-02-08)
+ * TinyMCE version 6.8.4 (2024-06-19)
  */
-!function(){"use strict";var e=function(e){if(null===e)return"null";if(void 0===e)return"undefined";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t},t=function(e){return{eq:e}},n=t((function(e,t){return e===t})),o=function(e){return t((function(t,n){if(t.length!==n.length)return!1;for(var o=t.length,r=0;r<o;r++)if(!e.eq(t[r],n[r]))return!1;return!0}))},r=function(e){return t((function(r,s){var a=Object.keys(r),i=Object.keys(s);if(!function(e,n){return function(e,n){return t((function(t,o){return e.eq(n(t),n(o))}))}(o(e),(function(e){return function(e,t){return Array.prototype.slice.call(e).sort(t)}(e,n)}))}(n).eq(a,i))return!1;for(var l=a.length,d=0;d<l;d++){var c=a[d];if(!e.eq(r[c],s[c]))return!1}return!0}))},s=t((function(t,n){if(t===n)return!0;var a=e(t);return a===e(n)&&(function(e){return-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(e)}(a)?t===n:"array"===a?o(s).eq(t,n):"object"===a&&r(s).eq(t,n))}));const a=Object.getPrototypeOf,i=(e,t,n)=>{var o;return!!n(e,t.prototype)||(null===(o=e.constructor)||void 0===o?void 0:o.name)===t.name},l=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&i(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,d=e=>t=>typeof t===e,c=e=>t=>e===t,u=(e,t)=>f(e)&&i(e,t,((e,t)=>a(e)===t)),m=l("string"),f=l("object"),g=e=>u(e,Object),p=l("array"),h=c(null),b=d("boolean"),v=c(void 0),y=e=>null==e,C=e=>!y(e),w=d("function"),x=d("number"),E=(e,t)=>{if(p(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},_=()=>{},k=(e,t)=>(...n)=>e(t.apply(null,n)),S=(e,t)=>n=>e(t(n)),N=e=>()=>e,R=e=>e,A=(e,t)=>e===t;function T(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}const O=e=>t=>!e(t),B=e=>()=>{throw new Error(e)},P=e=>e(),D=e=>{e()},L=N(!1),M=N(!0);class I{constructor(e,t){this.tag=e,this.value=t}static some(e){return new I(!0,e)}static none(){return I.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?I.some(e(this.value)):I.none()}bind(e){return this.tag?e(this.value):I.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:I.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return C(e)?I.some(e):I.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}I.singletonNone=new I(!1);const F=Array.prototype.slice,U=Array.prototype.indexOf,z=Array.prototype.push,j=(e,t)=>U.call(e,t),H=(e,t)=>j(e,t)>-1,$=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},q=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},V=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},W=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},K=(e,t)=>{const n=[],o=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?n:o).push(s)}return{pass:n,fail:o}},Y=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},G=(e,t,n)=>(W(e,((e,o)=>{n=t(n,e,o)})),n),X=(e,t,n)=>(V(e,((e,o)=>{n=t(n,e,o)})),n),Q=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return I.some(r);if(n(r,o))break}return I.none()},J=(e,t)=>Q(e,t,L),Z=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return I.some(n);return I.none()},ee=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!p(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);z.apply(t,e[n])}return t},te=(e,t)=>ee(q(e,t)),ne=(e,t)=>{for(let n=0,o=e.length;n<o;++n)if(!0!==t(e[n],n))return!1;return!0},oe=e=>{const t=F.call(e,0);return t.reverse(),t},re=(e,t)=>Y(e,(e=>!H(t,e))),se=(e,t)=>{const n={};for(let o=0,r=e.length;o<r;o++){const r=e[o];n[String(r)]=t(r,o)}return n},ae=(e,t)=>{const n=F.call(e,0);return n.sort(t),n},ie=(e,t)=>t>=0&&t<e.length?I.some(e[t]):I.none(),le=e=>ie(e,0),de=e=>ie(e,e.length-1),ce=w(Array.from)?Array.from:e=>F.call(e),ue=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return I.none()},me=Object.keys,fe=Object.hasOwnProperty,ge=(e,t)=>{const n=me(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},pe=(e,t)=>he(e,((e,n)=>({k:n,v:t(e,n)}))),he=(e,t)=>{const n={};return ge(e,((e,o)=>{const r=t(e,o);n[r.k]=r.v})),n},be=e=>(t,n)=>{e[n]=t},ve=(e,t,n,o)=>{ge(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))},ye=(e,t)=>{const n={};return ve(e,t,be(n),_),n},Ce=(e,t)=>{const n=[];return ge(e,((e,o)=>{n.push(t(e,o))})),n},we=e=>Ce(e,R),xe=(e,t)=>Ee(e,t)?I.from(e[t]):I.none(),Ee=(e,t)=>fe.call(e,t),_e=(e,t)=>Ee(e,t)&&void 0!==e[t]&&null!==e[t],ke=e=>{const t={};return V(e,(e=>{t[e]={}})),me(t)},Se=e=>void 0!==e.length,Ne=Array.isArray,Re=(e,t,n)=>{if(!e)return!1;if(n=n||e,Se(e)){for(let o=0,r=e.length;o<r;o++)if(!1===t.call(n,e[o],o,e))return!1}else for(const o in e)if(Ee(e,o)&&!1===t.call(n,e[o],o,e))return!1;return!0},Ae=(e,t)=>{const n=[];return Re(e,((o,r)=>{n.push(t(o,r,e))})),n},Te=(e,t)=>{const n=[];return Re(e,((o,r)=>{t&&!t(o,r,e)||n.push(o)})),n},Oe=(e,t,n,o)=>{let r=v(n)?e[0]:n;for(let n=0;n<e.length;n++)r=t.call(o,r,e[n],n);return r},Be=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++)if(t.call(n,e[o],o,e))return o;return-1},Pe=e=>e[e.length-1],De=e=>{let t,n=!1;return(...o)=>(n||(n=!0,t=e.apply(null,o)),t)},Le=()=>Me(0,0),Me=(e,t)=>({major:e,minor:t}),Ie={nu:Me,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?Le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const o=e[n];if(o.test(t))return o}})(e,t);if(!n)return{major:0,minor:0};const o=e=>Number(t.replace(n,"$"+e));return Me(o(1),o(2))})(e,n)},unknown:Le},Fe=(e,t)=>{const n=String(t).toLowerCase();return J(e,(e=>e.search(n)))},Ue=(e,t,n)=>""===t||e.length>=t.length&&e.substr(n,n+t.length)===t,ze=(e,t)=>He(e,t)?((e,t)=>e.substring(t))(e,t.length):e,je=(e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!v(o)||r+t.length<=o)},He=(e,t)=>Ue(e,t,0),$e=(e,t)=>Ue(e,t,e.length-t.length),qe=e=>t=>t.replace(e,""),Ve=qe(/^\s+|\s+$/g),We=qe(/^\s+/g),Ke=qe(/\s+$/g),Ye=e=>e.length>0,Ge=e=>!Ye(e),Xe=(e,t=10)=>{const n=parseInt(e,t);return isNaN(n)?I.none():I.some(n)},Qe=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Je=e=>t=>je(t,e),Ze=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>je(e,"edge/")&&je(e,"chrome")&&je(e,"safari")&&je(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Qe],search:e=>je(e,"chrome")&&!je(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>je(e,"msie")||je(e,"trident")},{name:"Opera",versionRegexes:[Qe,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Je("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Je("firefox")},{name:"Safari",versionRegexes:[Qe,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(je(e,"safari")||je(e,"mobile/"))&&je(e,"applewebkit")}],et=[{name:"Windows",search:Je("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>je(e,"iphone")||je(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Je("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:Je("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Je("linux"),versionRegexes:[]},{name:"Solaris",search:Je("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Je("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Je("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],tt={browsers:N(Ze),oses:N(et)},nt="Edge",ot="Chromium",rt="Opera",st="Firefox",at="Safari",it=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isEdge:o(nt),isChromium:o(ot),isIE:o("IE"),isOpera:o(rt),isFirefox:o(st),isSafari:o(at)}},lt=()=>it({current:void 0,version:Ie.unknown()}),dt=it,ct=(N(nt),N(ot),N("IE"),N(rt),N(st),N(at),"Windows"),ut="Android",mt="Linux",ft="macOS",gt="Solaris",pt="FreeBSD",ht="ChromeOS",bt=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isWindows:o(ct),isiOS:o("iOS"),isAndroid:o(ut),isMacOS:o(ft),isLinux:o(mt),isSolaris:o(gt),isFreeBSD:o(pt),isChromeOS:o(ht)}},vt=()=>bt({current:void 0,version:Ie.unknown()}),yt=bt,Ct=(N(ct),N("iOS"),N(ut),N(mt),N(ft),N(gt),N(pt),N(ht),e=>window.matchMedia(e).matches);let wt=De((()=>((e,t,n)=>{const o=tt.browsers(),r=tt.oses(),s=t.bind((e=>((e,t)=>ue(t.brands,(t=>{const n=t.brand.toLowerCase();return J(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:Ie.nu(parseInt(t.version,10),0)})))})))(o,e))).orThunk((()=>((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e))).fold(lt,dt),a=((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e).fold(vt,yt),i=((e,t,n,o)=>{const r=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!r,a=e.isiOS()||e.isAndroid(),i=a||o("(pointer:coarse)"),l=r||!s&&a&&o("(min-device-width:768px)"),d=s||a&&!l,c=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),u=!d&&!l&&!c;return{isiPad:N(r),isiPhone:N(s),isTablet:N(l),isPhone:N(d),isTouch:N(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:N(c),isDesktop:N(u)}})(a,s,e,n);return{browser:s,os:a,deviceType:i}})(navigator.userAgent,I.from(navigator.userAgentData),Ct)));const xt=()=>wt(),Et=navigator.userAgent,_t=xt(),kt=_t.browser,St=_t.os,Nt=_t.deviceType,Rt=-1!==Et.indexOf("Windows Phone"),At={transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",documentMode:kt.isIE()?document.documentMode||7:10,cacheSuffix:null,container:null,canHaveCSP:!kt.isIE(),windowsPhone:Rt,browser:{current:kt.current,version:kt.version,isChromium:kt.isChromium,isEdge:kt.isEdge,isFirefox:kt.isFirefox,isIE:kt.isIE,isOpera:kt.isOpera,isSafari:kt.isSafari},os:{current:St.current,version:St.version,isAndroid:St.isAndroid,isChromeOS:St.isChromeOS,isFreeBSD:St.isFreeBSD,isiOS:St.isiOS,isLinux:St.isLinux,isMacOS:St.isMacOS,isSolaris:St.isSolaris,isWindows:St.isWindows},deviceType:{isDesktop:Nt.isDesktop,isiPad:Nt.isiPad,isiPhone:Nt.isiPhone,isPhone:Nt.isPhone,isTablet:Nt.isTablet,isTouch:Nt.isTouch,isWebView:Nt.isWebView}},Tt=/^\s*|\s*$/g,Ot=e=>y(e)?"":(""+e).replace(Tt,""),Bt=function(e,t,n,o){o=o||this,e&&(n&&(e=e[n]),Re(e,((e,r)=>!1!==t.call(o,e,r,n)&&(Bt(e,t,n,o),!0))))},Pt={trim:Ot,isArray:Ne,is:(e,t)=>t?!("array"!==t||!Ne(e))||typeof e===t:void 0!==e,toArray:e=>{if(Ne(e))return e;{const t=[];for(let n=0,o=e.length;n<o;n++)t[n]=e[n];return t}},makeMap:(e,t,n={})=>{const o=m(e)?e.split(t||","):e||[];let r=o.length;for(;r--;)n[o[r]]={};return n},each:Re,map:Ae,grep:Te,inArray:(e,t)=>{if(e)for(let n=0,o=e.length;n<o;n++)if(e[n]===t)return n;return-1},hasOwn:Ee,extend:(e,...t)=>{for(let n=0;n<t.length;n++){const o=t[n];for(const t in o)if(Ee(o,t)){const n=o[t];void 0!==n&&(e[t]=n)}}return e},walk:Bt,resolve:(e,t=window)=>{const n=e.split(".");for(let e=0,o=n.length;e<o&&(t=t[n[e]]);e++);return t},explode:(e,t)=>p(e)?e:""===e?[]:Ae(e.split(t||","),Ot),_addCacheSuffix:e=>{const t=At.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Dt=(e,t,n=A)=>e.exists((e=>n(e,t))),Lt=(e,t,n=A)=>Mt(e,t,n).getOr(e.isNone()&&t.isNone()),Mt=(e,t,n)=>e.isSome()&&t.isSome()?I.some(n(e.getOrDie(),t.getOrDie())):I.none(),It=(e,t)=>e?I.some(t):I.none(),Ft="undefined"!=typeof window?window:Function("return this;")(),Ut=(e,t)=>((e,t)=>{let n=null!=t?t:Ft;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),zt=Object.getPrototypeOf,jt=e=>{const t=Ut("ownerDocument.defaultView",e);return f(e)&&((e=>((e,t)=>{const n=((e,t)=>Ut(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(zt(e).constructor.name))},Ht=e=>e.dom.nodeName.toLowerCase(),$t=e=>e.dom.nodeType,qt=e=>t=>$t(t)===e,Vt=e=>Wt(e)&&jt(e.dom),Wt=qt(1),Kt=qt(3),Yt=qt(9),Gt=qt(11),Xt=e=>t=>Wt(t)&&Ht(t)===e,Qt=(e,t,n)=>{if(!(m(n)||b(n)||x(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},Jt=(e,t,n)=>{Qt(e.dom,t,n)},Zt=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{Qt(n,t,e)}))},en=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},tn=(e,t)=>I.from(en(e,t)),nn=(e,t)=>{const n=e.dom;return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},on=(e,t)=>{e.dom.removeAttribute(t)},rn=e=>X(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),sn=(e,t)=>{const n=en(e,t);return void 0===n||""===n?[]:n.split(" ")},an=e=>void 0!==e.dom.classList,ln=e=>sn(e,"class"),dn=(e,t)=>((e,t,n)=>{const o=sn(e,t).concat([n]);return Jt(e,t,o.join(" ")),!0})(e,"class",t),cn=(e,t)=>((e,t,n)=>{const o=Y(sn(e,t),(e=>e!==n));return o.length>0?Jt(e,t,o.join(" ")):on(e,t),!1})(e,"class",t),un=(e,t)=>{an(e)?e.dom.classList.add(t):dn(e,t)},mn=e=>{0===(an(e)?e.dom.classList:ln(e)).length&&on(e,"class")},fn=(e,t)=>{an(e)?e.dom.classList.remove(t):cn(e,t),mn(e)},gn=(e,t)=>an(e)&&e.dom.classList.contains(t),pn=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},hn=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return pn(n.childNodes[0])},bn=(e,t)=>{const n=(t||document).createElement(e);return pn(n)},vn=(e,t)=>{const n=(t||document).createTextNode(e);return pn(n)},yn=pn,Cn=(e,t,n)=>I.from(e.dom.elementFromPoint(t,n)).map(pn),wn=(e,t)=>{const n=[],o=e=>(n.push(e),t(e));let r=t(e);do{r=r.bind(o)}while(r.isSome());return n},xn=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},En=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,_n=(e,t)=>e.dom===t.dom,kn=(e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)},Sn=e=>yn(e.dom.ownerDocument),Nn=e=>Yt(e)?e:Sn(e),Rn=e=>yn(Nn(e).dom.defaultView),An=e=>I.from(e.dom.parentNode).map(yn),Tn=e=>I.from(e.dom.parentElement).map(yn),On=(e,t)=>{const n=w(t)?t:L;let o=e.dom;const r=[];for(;null!==o.parentNode&&void 0!==o.parentNode;){const e=o.parentNode,t=yn(e);if(r.push(t),!0===n(t))break;o=e}return r},Bn=e=>I.from(e.dom.previousSibling).map(yn),Pn=e=>I.from(e.dom.nextSibling).map(yn),Dn=e=>oe(wn(e,Bn)),Ln=e=>wn(e,Pn),Mn=e=>q(e.dom.childNodes,yn),In=(e,t)=>{const n=e.dom.childNodes;return I.from(n[t]).map(yn)},Fn=e=>In(e,0),Un=e=>In(e,e.dom.childNodes.length-1),zn=e=>e.dom.childNodes.length,jn=e=>Gt(e)&&C(e.dom.host),Hn=w(Element.prototype.attachShadow)&&w(Node.prototype.getRootNode),$n=N(Hn),qn=Hn?e=>yn(e.dom.getRootNode()):Nn,Vn=e=>jn(e)?e:(e=>{const t=e.dom.head;if(null==t)throw new Error("Head is not available yet");return yn(t)})(Nn(e)),Wn=e=>yn(e.dom.host),Kn=e=>{if($n()&&C(e.target)){const t=yn(e.target);if(Wt(t)&&Yn(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return le(t)}}return I.from(e.target)},Yn=e=>C(e.dom.shadowRoot),Gn=e=>{const t=Kt(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=qn(e);return jn(t)?I.some(t):I.none()})(yn(t)).fold((()=>n.body.contains(t)),S(Gn,Wn))};var Xn=(e,t,n,o,r)=>e(n,o)?I.some(n):w(r)&&r(n)?I.none():t(n,o,r);const Qn=(e,t,n)=>{let o=e.dom;const r=w(n)?n:L;for(;o.parentNode;){o=o.parentNode;const e=yn(o);if(t(e))return I.some(e);if(r(e))break}return I.none()},Jn=(e,t,n)=>Xn(((e,t)=>t(e)),Qn,e,t,n),Zn=(e,t)=>{const n=e=>{for(let o=0;o<e.childNodes.length;o++){const r=yn(e.childNodes[o]);if(t(r))return I.some(r);const s=n(e.childNodes[o]);if(s.isSome())return s}return I.none()};return n(e.dom)},eo=(e,t,n)=>Qn(e,(e=>xn(e,t)),n),to=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?I.none():I.from(n.querySelector(e)).map(yn)})(t,e),no=(e,t,n)=>Xn(((e,t)=>xn(e,t)),eo,e,t,n),oo=(e,t=!1)=>{return Gn(e)?e.dom.isContentEditable:(n=e,no(n,"[contenteditable]")).fold(N(t),(e=>"true"===ro(e)));var n},ro=e=>e.dom.contentEditable,so=e=>void 0!==e.style&&w(e.style.getPropertyValue),ao=(e,t,n)=>{if(!m(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);so(e)&&e.style.setProperty(t,n)},io=(e,t,n)=>{const o=e.dom;ao(o,t,n)},lo=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{ao(n,t,e)}))},co=(e,t)=>{const n=e.dom,o=window.getComputedStyle(n).getPropertyValue(t);return""!==o||Gn(e)?o:uo(n,t)},uo=(e,t)=>so(e)?e.style.getPropertyValue(t):"",mo=(e,t)=>{const n=e.dom,o=uo(n,t);return I.from(o).filter((e=>e.length>0))},fo=e=>{const t={},n=e.dom;if(so(n))for(let e=0;e<n.style.length;e++){const o=n.style.item(e);t[o]=n.style[o]}return t},go=(e,t)=>{((e,t)=>{so(e)&&e.style.removeProperty(t)})(e.dom,t),Dt(tn(e,"style").map(Ve),"")&&on(e,"style")},po=(e,t)=>{An(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},ho=(e,t)=>{Pn(e).fold((()=>{An(e).each((e=>{vo(e,t)}))}),(e=>{po(e,t)}))},bo=(e,t)=>{Fn(e).fold((()=>{vo(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))},vo=(e,t)=>{e.dom.appendChild(t.dom)},yo=(e,t)=>{po(e,t),vo(t,e)},Co=(e,t)=>{V(t,(t=>{vo(e,t)}))},wo=e=>{e.dom.textContent="",V(Mn(e),(e=>{xo(e)}))},xo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Eo=e=>{const t=Mn(e);var n,o;t.length>0&&(n=e,V(o=t,((e,t)=>{const r=0===t?n:o[t-1];ho(r,e)}))),xo(e)},_o=e=>q(e,yn),ko=e=>e.dom.innerHTML,So=(e,t)=>{const n=Sn(e).dom,o=yn(n.createDocumentFragment()),r=((e,t)=>{const n=(t||document).createElement("div");return n.innerHTML=e,Mn(yn(n))})(t,n);Co(o,r),wo(e),vo(e,o)},No=(e,t,n,o)=>((e,t,n,o,r)=>{const s=((e,t)=>n=>{e(n)&&t((e=>{const t=yn(Kn(e).getOr(e.target)),n=()=>e.stopPropagation(),o=()=>e.preventDefault(),r=k(o,n);return((e,t,n,o,r,s,a)=>({target:e,x:t,y:n,stop:o,prevent:r,kill:s,raw:a}))(t,e.clientX,e.clientY,n,o,r,e)})(n))})(n,o);return e.dom.addEventListener(t,s,false),{unbind:T(Ro,e,t,s,false)}})(e,t,n,o),Ro=(e,t,n,o)=>{e.dom.removeEventListener(t,n,o)},Ao=(e,t)=>({left:e,top:t,translate:(n,o)=>Ao(e+n,t+o)}),To=Ao,Oo=(e,t)=>void 0!==e?e:void 0!==t?t:0,Bo=e=>{const t=e.dom,n=t.ownerDocument.body;return n===t?To(n.offsetLeft,n.offsetTop):Gn(e)?(e=>{const t=e.getBoundingClientRect();return To(t.left,t.top)})(t):To(0,0)},Po=e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,o=t.body.scrollTop||t.documentElement.scrollTop;return To(n,o)},Do=(e,t,n)=>{const o=(void 0!==n?n.dom:document).defaultView;o&&o.scrollTo(e,t)},Lo=(e,t)=>{xt().browser.isSafari()&&w(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)},Mo=(e,t,n,o)=>({x:e,y:t,width:n,height:o,right:e+n,bottom:t+o}),Io=e=>{const t=void 0===e?window:e,n=t.document,o=Po(yn(n));return(e=>{const t=void 0===e?window:e;return xt().browser.isFirefox()?I.none():I.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,r=e.clientHeight;return Mo(o.left,o.top,n,r)}),(e=>Mo(Math.max(e.pageLeft,o.left),Math.max(e.pageTop,o.top),e.width,e.height)))},Fo=(e,t)=>{let n=[];return V(Mn(e),(e=>{t(e)&&(n=n.concat([e])),n=n.concat(Fo(e,t))})),n},Uo=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?[]:q(n.querySelectorAll(e),yn)})(t,e),zo=(e,t,n)=>eo(e,t,n).isSome();class jo{constructor(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}current(){return this.node}next(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node}prev(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node}prev2(e){return this.node=this.findPreviousNode(this.node,e),this.node}findSibling(e,t,n,o){if(e){if(!o&&e[t])return e[t];if(e!==this.rootNode){let t=e[n];if(t)return t;for(let o=e.parentNode;o&&o!==this.rootNode;o=o.parentNode)if(t=o[n],t)return t}}}findPreviousNode(e,t){if(e){const n=e.previousSibling;if(this.rootNode&&n===this.rootNode)return;if(n){if(!t)for(let e=n.lastChild;e;e=e.lastChild)if(!e.lastChild)return e;return n}const o=e.parentNode;if(o&&o!==this.rootNode)return o}}}const Ho=e=>t=>!!t&&t.nodeType===e,$o=e=>!!e&&!Object.getPrototypeOf(e),qo=Ho(1),Vo=e=>qo(e)&&Vt(yn(e)),Wo=e=>{const t=e.toLowerCase();return e=>C(e)&&e.nodeName.toLowerCase()===t},Ko=e=>{const t=e.map((e=>e.toLowerCase()));return e=>{if(e&&e.nodeName){const n=e.nodeName.toLowerCase();return H(t,n)}return!1}},Yo=(e,t)=>{const n=t.toLowerCase().split(" ");return t=>{if(qo(t)){const o=t.ownerDocument.defaultView;if(o)for(let r=0;r<n.length;r++){const s=o.getComputedStyle(t,null);if((s?s.getPropertyValue(e):null)===n[r])return!0}}return!1}},Go=e=>t=>qo(t)&&t.hasAttribute(e),Xo=e=>qo(e)&&e.hasAttribute("data-mce-bogus"),Qo=e=>qo(e)&&"TABLE"===e.tagName,Jo=e=>t=>{if(Vo(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},Zo=Ko(["textarea","input"]),er=Ho(3),tr=Ho(4),nr=Ho(7),or=Ho(8),rr=Ho(9),sr=Ho(11),ar=Wo("br"),ir=Wo("img"),lr=Jo("true"),dr=Jo("false"),cr=Ko(["td","th"]),ur=Ko(["td","th","caption"]),mr=Ko(["video","audio","object","embed"]),fr=Wo("li"),gr=Wo("details"),pr=Wo("summary"),hr="\ufeff",br="\xa0",vr=e=>e===hr,yr=((e,t)=>{const n=t=>e(t)?I.from(t.dom.nodeValue):I.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(Kt),Cr=e=>yr.get(e),wr=e=>yr.getOption(e),xr=e=>{let t;return n=>(t=t||se(e,M),Ee(t,Ht(n)))},Er=e=>Wt(e)&&"br"===Ht(e),_r=xr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),kr=xr(["ul","ol","dl"]),Sr=xr(["li","dd","dt"]),Nr=xr(["thead","tbody","tfoot"]),Rr=xr(["td","th"]),Ar=xr(["pre","script","textarea","style"]),Tr=()=>{const e=bn("br");return Jt(e,"data-mce-bogus","1"),e},Or=e=>{wo(e),vo(e,Tr())},Br=hr,Pr=vr,Dr=e=>e.replace(/\uFEFF/g,""),Lr=qo,Mr=er,Ir=e=>(Mr(e)&&(e=e.parentNode),Lr(e)&&e.hasAttribute("data-mce-caret")),Fr=e=>Mr(e)&&Pr(e.data),Ur=e=>Ir(e)||Fr(e),zr=e=>e.firstChild!==e.lastChild||!ar(e.firstChild),jr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset())===Br||e.isAtStart()&&Fr(t.previousSibling))},Hr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset()-1)===Br||e.isAtEnd()&&Fr(t.nextSibling))},$r=e=>Mr(e)&&e.data[0]===Br,qr=e=>Mr(e)&&e.data[e.data.length-1]===Br,Vr=e=>e&&e.hasAttribute("data-mce-caret")?((e=>{var t;const n=e.getElementsByTagName("br"),o=n[n.length-1];Xo(o)&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o))})(e),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("data-mce-style"),e.removeAttribute("_moz_abspos"),e):null,Wr=e=>Ir(e.startContainer),Kr=lr,Yr=dr,Gr=ar,Xr=er,Qr=Ko(["script","style","textarea"]),Jr=Ko(["img","input","textarea","hr","iframe","video","audio","object","embed"]),Zr=Ko(["table"]),es=Ur,ts=e=>!es(e)&&(Xr(e)?!Qr(e.parentNode):Jr(e)||Gr(e)||Zr(e)||ns(e)),ns=e=>!(e=>qo(e)&&"true"===e.getAttribute("unselectable"))(e)&&Yr(e),os=(e,t)=>ts(e)&&((e,t)=>{for(let n=e.parentNode;n&&n!==t;n=n.parentNode){if(ns(n))return!1;if(Kr(n))return!0}return!0})(e,t),rs=/^[ \t\r\n]*$/,ss=e=>rs.test(e),as=e=>{for(const t of e)if(!vr(t))return!1;return!0},is=e=>"\n"===e||"\r"===e,ls=(e,t=4,n=!0,o=!0)=>{const r=((e,t)=>t<=0?"":new Array(t+1).join(" "))(0,t),s=e.replace(/\t/g,r),a=X(s,((e,t)=>(e=>-1!==" \f\t\v".indexOf(e))(t)||t===br?e.pcIsSpace||""===e.str&&n||e.str.length===s.length-1&&o||((e,t)=>t<e.length&&t>=0&&is(e[t]))(s,e.str.length+1)?{pcIsSpace:!1,str:e.str+br}:{pcIsSpace:!0,str:e.str+" "}:{pcIsSpace:is(t),str:e.str+t}),{pcIsSpace:!1,str:""});return a.str},ds=(e,t)=>ts(e)&&!((e,t)=>er(e)&&ss(e.data)&&!((e,t)=>{const n=yn(t),o=yn(e);return zo(o,"pre,code",T(_n,n))})(e,t))(e,t)||(e=>qo(e)&&"A"===e.nodeName&&!e.hasAttribute("href")&&(e.hasAttribute("name")||e.hasAttribute("id")))(e)||cs(e),cs=Go("data-mce-bookmark"),us=Go("data-mce-bogus"),ms=("data-mce-bogus","all",e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"));const fs=e=>Tn(yn(e)).exists((e=>!oo(e))),gs=(e,t=!0)=>((e,t)=>{let n=0;if(ds(e,e))return!1;{let o=e.firstChild;if(!o)return!0;const r=new jo(o,e);do{if(t){if(ms(o)){o=r.next(!0);continue}if(us(o)){o=r.next();continue}}if(lr(o)&&fs(o))return!1;if(ar(o))n++,o=r.next();else{if(ds(o,e))return!1;o=r.next()}}while(o);return n<=1}})(e.dom,t),ps=e=>"svg"===e.toLowerCase(),hs=e=>ps(e.nodeName),bs=e=>"svg"===(null==e?void 0:e.nodeName)?"svg":"html",vs=["svg"],ys="data-mce-block",Cs=e=>q((e=>Y(me(e),(e=>!/[A-Z]/.test(e))))(e),(e=>`${e}:`+q(vs,(t=>`not(${t} ${e})`)).join(":"))).join(","),ws=(e,t)=>C(t.querySelector(e))?(t.setAttribute(ys,"true"),"inline-boundary"===t.getAttribute("data-mce-selected")&&t.removeAttribute("data-mce-selected"),!0):(t.removeAttribute(ys),!1),xs=(e,t)=>{const n=Cs(e.getTransparentElements()),o=Cs(e.getBlockElements());return Y(t.querySelectorAll(n),(e=>ws(o,e)))},Es=(e,t)=>{var n;const o=t?"lastChild":"firstChild";for(let t=e[o];t;t=t[o])if(gs(yn(t)))return void(null===(n=t.parentNode)||void 0===n||n.removeChild(t))},_s=(e,t,n)=>{const o=e.getBlockElements(),r=yn(t),s=e=>Ht(e)in o,a=e=>_n(e,r);V(_o(n),(t=>{Qn(t,s,a).each((n=>{const o=((t,o)=>Y(Mn(t),(t=>s(t)&&!e.isValidChild(Ht(n),Ht(t)))))(t);if(o.length>0){const t=Tn(n);V(o,(e=>{Qn(e,s,a).each((t=>{((e,t)=>{const n=document.createRange(),o=e.parentNode;if(o){n.setStartBefore(e),n.setEndBefore(t);const r=n.extractContents();Es(r,!0),n.setStartAfter(t),n.setEndAfter(e);const s=n.extractContents();Es(s,!1),gs(yn(r))||o.insertBefore(r,e),gs(yn(t))||o.insertBefore(t,e),gs(yn(s))||o.insertBefore(s,e),o.removeChild(e)}})(t.dom,e.dom)}))})),t.each((t=>xs(e,t.dom)))}}))}))},ks=(e,t)=>{const n=xs(e,t);_s(e,t,n),((e,t,n)=>{V([...n,...Ts(e,t)?[t]:[]],(t=>V(Uo(yn(t),t.nodeName.toLowerCase()),(t=>{Os(e,t.dom)&&Eo(t)}))))})(e,t,n)},Ss=(e,t)=>{if(As(e,t)){const n=Cs(e.getBlockElements());ws(n,t)}},Ns=e=>e.hasAttribute(ys),Rs=(e,t)=>Ee(e.getTransparentElements(),t),As=(e,t)=>qo(t)&&Rs(e,t.nodeName),Ts=(e,t)=>As(e,t)&&Ns(t),Os=(e,t)=>As(e,t)&&!Ns(t),Bs=(e,t)=>1===t.type&&Rs(e,t.name)&&m(t.attr(ys)),Ps=xt().browser,Ds=e=>J(e,Wt),Ls=(e,t)=>e.children&&H(e.children,t),Ms=(e,t={})=>{let n=0;const o={},r=yn(e),s=Nn(r),a=e=>{vo(Vn(r),e)},i=e=>{const t=Vn(r);to(t,"#"+e).each(xo)},l=e=>xe(o,e).getOrThunk((()=>({id:"mce-u"+n++,passed:[],failed:[],count:0}))),d=e=>new Promise(((n,r)=>{let i;const d=Pt._addCacheSuffix(e),c=l(d);o[d]=c,c.count++;const u=(e,t)=>{V(e,D),c.status=t,c.passed=[],c.failed=[],i&&(i.onload=null,i.onerror=null,i=null)},m=()=>u(c.passed,2),f=()=>u(c.failed,3);if(n&&c.passed.push(n),r&&c.failed.push(r),1===c.status)return;if(2===c.status)return void m();if(3===c.status)return void f();c.status=1;const g=bn("link",s.dom);Zt(g,{rel:"stylesheet",type:"text/css",id:c.id}),t.contentCssCors&&Jt(g,"crossOrigin","anonymous"),t.referrerPolicy&&Jt(g,"referrerpolicy",t.referrerPolicy),i=g.dom,i.onload=m,i.onerror=f,a(g),Jt(g,"href",d)})),c=e=>{const t=Pt._addCacheSuffix(e);xe(o,t).each((e=>{0==--e.count&&(delete o[t],i(e.id))}))};return{load:d,loadRawCss:(e,t)=>{const n=l(e);o[e]=n,n.count++;const r=bn("style",s.dom);Zt(r,{rel:"stylesheet",type:"text/css",id:n.id}),r.dom.innerHTML=t,a(r)},loadAll:e=>Promise.allSettled(q(e,(e=>d(e).then(N(e))))).then((e=>{const t=K(e,(e=>"fulfilled"===e.status));return t.fail.length>0?Promise.reject(q(t.fail,(e=>e.reason))):q(t.pass,(e=>e.value))})),unload:c,unloadRawCss:e=>{xe(o,e).each((t=>{0==--t.count&&(delete o[e],i(t.id))}))},unloadAll:e=>{V(e,(e=>{c(e)}))},_setReferrerPolicy:e=>{t.referrerPolicy=e},_setContentCssCors:e=>{t.contentCssCors=e}}},Is=(()=>{const e=new WeakMap;return{forElement:(t,n)=>{const o=qn(t).dom;return I.from(e.get(o)).getOrThunk((()=>{const t=Ms(o,n);return e.set(o,t),t}))}}})(),Fs=(e,t,n)=>C(e)&&(ds(e,t)||n.isInline(e.nodeName.toLowerCase())),Us=e=>(e=>"span"===e.nodeName.toLowerCase())(e)&&"bookmark"===e.getAttribute("data-mce-type"),zs=(e,t,n,o)=>{var r;const s=o||t;if(qo(t)&&Us(t))return t;const a=t.childNodes;for(let t=a.length-1;t>=0;t--)zs(e,a[t],n,s);if(qo(t)){const e=t.childNodes;1===e.length&&Us(e[0])&&(null===(r=t.parentNode)||void 0===r||r.insertBefore(e[0],t))}return(e=>sr(e)||rr(e))(t)||ds(t,s)||(e=>!!qo(e)&&e.childNodes.length>0)(t)||((e,t,n)=>er(e)&&e.data.length>0&&((e,t,n)=>{const o=new jo(e,t).prev(!1),r=new jo(e,t).next(!1),s=v(o)||Fs(o,t,n),a=v(r)||Fs(r,t,n);return s&&a})(e,t,n))(t,s,n)||e.remove(t),t},js=Pt.makeMap,Hs=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,$s=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,qs=/[<>&\"\']/g,Vs=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Ws={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},Ks={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},Ys={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},Gs=(e,t)=>{const n={};if(e){const o=e.split(",");t=t||10;for(let e=0;e<o.length;e+=2){const r=String.fromCharCode(parseInt(o[e],t));if(!Ks[r]){const t="&"+o[e+1]+";";n[r]=t,n[t]=r}}return n}},Xs=Gs("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),Qs=(e,t)=>e.replace(t?Hs:$s,(e=>Ks[e]||e)),Js=(e,t)=>e.replace(t?Hs:$s,(e=>e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":Ks[e]||"&#"+e.charCodeAt(0)+";")),Zs=(e,t,n)=>{const o=n||Xs;return e.replace(t?Hs:$s,(e=>Ks[e]||o[e]||e))},ea={encodeRaw:Qs,encodeAllRaw:e=>(""+e).replace(qs,(e=>Ks[e]||e)),encodeNumeric:Js,encodeNamed:Zs,getEncodeFunc:(e,t)=>{const n=Gs(t)||Xs,o=js(e.replace(/\+/g,","));return o.named&&o.numeric?(e,t)=>e.replace(t?Hs:$s,(e=>void 0!==Ks[e]?Ks[e]:void 0!==n[e]?n[e]:e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";")):o.named?t?(e,t)=>Zs(e,t,n):Zs:o.numeric?Js:Qs},decode:e=>e.replace(Vs,((e,t)=>t?(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))>65535?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Ws[t]||String.fromCharCode(t):Ys[e]||Xs[e]||(e=>{const t=bn("div").dom;return t.innerHTML=e,t.textContent||t.innerText||e})(e)))},ta=(e,t)=>(e=Pt.trim(e))?e.split(t||" "):[],na=e=>new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$"),oa={},ra=Pt.makeMap,sa=Pt.each,aa=Pt.extend,ia=Pt.explode,la=(e,t={})=>{const n=ra(e," ",ra(e.toUpperCase()," "));return aa(n,t)},da=e=>la("td th li dt dd figcaption caption details summary",e.getTextBlockElements()),ca=(e,t)=>{if(e){const n={};return m(e)&&(e={"*":e}),sa(e,((e,o)=>{n[o]=n[o.toUpperCase()]="map"===t?ra(e,/[, ]/):ia(e,/[, ]/)})),n}},ua=(e={})=>{var t;const n={},o={};let r=[];const s={},a={},i=(t,n,o)=>{const r=e[t];if(r)return ra(r,/[, ]/,ra(r.toUpperCase(),/[, ]/));{let e=oa[t];return e||(e=la(n,o),oa[t]=e),e}},l=null!==(t=e.schema)&&void 0!==t?t:"html5",d=(e=>{const{globalAttributes:t,phrasingContent:n,flowContent:o}=(e=>{let t,n,o;t="id accesskey class dir lang style tabindex title role",n="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",o="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(t+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",n+=" article aside details dialog figure main header footer hgroup section nav a ins del canvas map",o+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen svg"),"html5-strict"!==e&&(t+=" xml:lang",o=[o,"acronym applet basefont big font strike tt"].join(" "),n=[n,"center dir isindex noframes"].join(" "));const r=[n,o].join(" ");return{globalAttributes:t,blockContent:n,phrasingContent:o,flowContent:r}})(e),r={},s=(e,t,n)=>{r[e]={attributes:se(t,N({})),attributesOrder:t,children:se(n,N({}))}},a=(e,n="",o="")=>{const r=ta(o),a=ta(e);let i=a.length;const l=ta([t,n].join(" "));for(;i--;)s(a[i],l.slice(),r)},i=(e,t)=>{const n=ta(e),o=ta(t);let s=n.length;for(;s--;){const e=r[n[s]];for(let t=0,n=o.length;t<n;t++)e.attributes[o[t]]={},e.attributesOrder.push(o[t])}};return"html5-strict"!==e&&(V(ta("acronym applet basefont big font strike tt"),(e=>{a(e,"",n)})),V(ta("center dir isindex noframes"),(e=>{a(e,"",o)}))),a("html","manifest","head body"),a("head","","base command link meta noscript script style title"),a("title hr noscript br"),a("base","href target"),a("link","href rel media hreflang type sizes hreflang"),a("meta","name http-equiv content charset"),a("style","media type scoped"),a("script","src async defer type charset"),a("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",o),a("dd div","",o),a("address dt caption","","html4"===e?n:o),a("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),a("blockquote","cite",o),a("ol","reversed start type","li"),a("ul","","li"),a("li","value",o),a("dl","","dt dd"),a("a","href target rel media hreflang type","html4"===e?n:o),a("q","cite",n),a("ins del","cite datetime",o),a("img","src sizes srcset alt usemap ismap width height"),a("iframe","src name width height",o),a("embed","src type width height"),a("object","data type typemustmatch name usemap form width height",[o,"param"].join(" ")),a("param","name value"),a("map","name",[o,"area"].join(" ")),a("area","alt coords shape href target rel media hreflang type"),a("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),a("colgroup","span","col"),a("col","span"),a("tbody thead tfoot","","tr"),a("tr","","td th"),a("td","colspan rowspan headers",o),a("th","colspan rowspan headers scope abbr",o),a("form","accept-charset action autocomplete enctype method name novalidate target",o),a("fieldset","disabled form name",[o,"legend"].join(" ")),a("label","form for",n),a("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),a("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?o:n),a("select","disabled form multiple name required size","option optgroup"),a("optgroup","disabled label","option"),a("option","disabled label selected value"),a("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),a("menu","type label",[o,"li"].join(" ")),a("noscript","",o),"html4"!==e&&(a("wbr"),a("ruby","",[n,"rt rp"].join(" ")),a("figcaption","",o),a("mark rt rp bdi","",n),a("summary","",[n,"h1 h2 h3 h4 h5 h6"].join(" ")),a("canvas","width height",o),a("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[o,"track source"].join(" ")),a("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[o,"track source"].join(" ")),a("picture","","img source"),a("source","src srcset type media sizes"),a("track","kind src srclang label default"),a("datalist","",[n,"option"].join(" ")),a("article section nav aside main header footer","",o),a("hgroup","","h1 h2 h3 h4 h5 h6"),a("figure","",[o,"figcaption"].join(" ")),a("time","datetime",n),a("dialog","open",o),a("command","type label icon disabled checked radiogroup command"),a("output","for form name",n),a("progress","value max",n),a("meter","value min max low high optimum",n),a("details","open",[o,"summary"].join(" ")),a("keygen","autofocus challenge disabled form keytype name"),s("svg","id tabindex lang xml:space class style x y width height viewBox preserveAspectRatio zoomAndPan transform".split(" "),[])),"html5-strict"!==e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid code codebase codetype archive standby align border hspace vspace"),i("embed","align name hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!==e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("img","loading"),i("iframe","sandbox seamless allow allowfullscreen loading")),"html4"!==e&&V([r.video,r.audio],(e=>{delete e.children.audio,delete e.children.video})),V(ta("a form meter progress dfn"),(e=>{r[e]&&delete r[e].children[e]})),delete r.caption.children.table,delete r.script,r})(l);!1===e.verify_html&&(e.valid_elements="*[*]");const c=ca(e.valid_styles),u=ca(e.invalid_styles,"map"),m=ca(e.valid_classes,"map"),f=i("whitespace_elements","pre script noscript style textarea video audio iframe object code"),g=i("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),p=i("void_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),h=i("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls allowfullscreen"),b="td th iframe video audio object script code",v=i("non_empty_elements",b+" pre svg",p),y=i("move_caret_before_on_enter_elements",b+" table",p),C="h1 h2 h3 h4 h5 h6",w=i("text_block_elements",C+" p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),x=i("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary html body multicol listing",w),E=i("text_inline_elements","span strong b em i font s strike u var cite dfn code mark q sup sub samp"),_=i("transparent_elements","a ins del canvas map"),k=i("wrap_block_elements","pre "+C);sa("script noscript iframe noframes noembed title style textarea xmp plaintext".split(" "),(e=>{a[e]=new RegExp("</"+e+"[^>]*>","gi")}));const S=e=>{const t=I.from(n["@"]),o=/[*?+]/;V(((e,t)=>{const n=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/;return te(ta(t,","),(t=>{const o=n.exec(t);if(o){const t=o[1],n=o[2],r=o[3],s=o[4],a=o[5],i={attributes:{},attributesOrder:[]};if(e.each((e=>((e,t)=>{ge(e.attributes,((e,n)=>{t.attributes[n]=e})),t.attributesOrder.push(...e.attributesOrder)})(e,i))),"#"===t?i.paddEmpty=!0:"-"===t&&(i.removeEmpty=!0),"!"===s&&(i.removeEmptyAttrs=!0),a&&((e,t)=>{const n=/^([!\-])?(\w+[\\:]:\w+|[^=~<]+)?(?:([=~<])(.*))?$/,o=/[*?+]/,{attributes:r,attributesOrder:s}=t;V(ta(e,"|"),(e=>{const a=n.exec(e);if(a){const e={},n=a[1],i=a[2].replace(/[\\:]:/g,":"),l=a[3],d=a[4];if("!"===n&&(t.attributesRequired=t.attributesRequired||[],t.attributesRequired.push(i),e.required=!0),"-"===n)return delete r[i],void s.splice(Pt.inArray(s,i),1);if(l&&("="===l?(t.attributesDefault=t.attributesDefault||[],t.attributesDefault.push({name:i,value:d}),e.defaultValue=d):"~"===l?(t.attributesForced=t.attributesForced||[],t.attributesForced.push({name:i,value:d}),e.forcedValue=d):"<"===l&&(e.validValues=Pt.makeMap(d,"?"))),o.test(i)){const n=e;t.attributePatterns=t.attributePatterns||[],n.pattern=na(i),t.attributePatterns.push(n)}else r[i]||s.push(i),r[i]=e}}))})(a,i),r&&(i.outputName=n),"@"===n){if(!e.isNone())return[];e=I.some(i)}return[r?{name:n,element:i,aliasName:r}:{name:n,element:i}]}return[]}))})(t,null!=e?e:""),(({name:e,element:t,aliasName:s})=>{if(s&&(n[s]=t),o.test(e)){const n=t;n.pattern=na(e),r.push(n)}else n[e]=t}))},R=e=>{r=[],V(me(n),(e=>{delete n[e]})),S(e)},A=e=>{delete oa.text_block_elements,delete oa.block_elements,V((e=>{const t=/^(~)?(.+)$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e="~"===n[1];return[{inline:e,cloneName:e?"span":"div",name:n[2]}]}return[]}))})(null!=e?e:""),(({inline:e,name:t,cloneName:r})=>{if(o[t]=o[r],s[t]=r,v[t.toUpperCase()]={},v[t]={},e||(x[t.toUpperCase()]={},x[t]={}),!n[t]){let e=n[r];e=aa({},e),delete e.removeEmptyAttrs,delete e.removeEmpty,n[t]=e}ge(o,((e,n)=>{e[r]&&(o[n]=e=aa({},o[n]),e[t]=e[r])}))}))},T=e=>{V((e=>{const t=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e=n[1],t=e?(e=>"-"===e?"remove":"add")(e):"replace";return[{operation:t,name:n[2],validChildren:ta(n[3],"|")}]}return[]}))})(null!=e?e:""),(({operation:e,name:t,validChildren:n})=>{const r="replace"===e?{"#comment":{}}:o[t];V(n,(t=>{"remove"===e?delete r[t]:r[t]={}})),o[t]=r}))},O=e=>{const t=n[e];if(t)return t;let o=r.length;for(;o--;){const t=r[o];if(t.pattern.test(e))return t}};e.valid_elements?(R(e.valid_elements),sa(d,((e,t)=>{o[t]=e.children}))):(sa(d,((e,t)=>{n[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},o[t]=e.children})),sa(ta("strong/b em/i"),(e=>{const t=ta(e,"/");n[t[1]].outputName=t[0]})),sa(E,((t,o)=>{n[o]&&(e.padd_empty_block_inline_children&&(n[o].paddInEmptyBlock=!0),n[o].removeEmpty=!0)})),sa(ta("ol ul blockquote a table tbody"),(e=>{n[e]&&(n[e].removeEmpty=!0)})),sa(ta("p h1 h2 h3 h4 h5 h6 th td pre div address caption li summary"),(e=>{n[e]&&(n[e].paddEmpty=!0)})),sa(ta("span"),(e=>{n[e].removeEmptyAttrs=!0}))),delete n.svg,A(e.custom_elements),T(e.valid_children),S(e.extended_valid_elements),T("+ol[ul|ol],+ul[ul|ol]"),sa({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},((e,t)=>{n[t]&&(n[t].parentsRequired=ta(e))})),e.invalid_elements&&sa(ia(e.invalid_elements),(e=>{n[e]&&delete n[e]})),O("span")||S("span[!data-mce-type|*]");const B=N(c),P=N(u),D=N(m),L=N(h),M=N(x),F=N(w),U=N(E),z=N(Object.seal(p)),j=N(g),H=N(v),$=N(y),q=N(f),W=N(_),K=N(k),Y=N(Object.seal(a)),G=(e,t)=>{const n=O(e);if(n){if(!t)return!0;{if(n.attributes[t])return!0;const e=n.attributePatterns;if(e){let n=e.length;for(;n--;)if(e[n].pattern.test(t))return!0}}}return!1},X=e=>Ee(M(),e),Q=e=>!He(e,"#")&&G(e)&&!X(e),J=N(s);return{type:l,children:o,elements:n,getValidStyles:B,getValidClasses:D,getBlockElements:M,getInvalidStyles:P,getVoidElements:z,getTextBlockElements:F,getTextInlineElements:U,getBoolAttrs:L,getElementRule:O,getSelfClosingElements:j,getNonEmptyElements:H,getMoveCaretBeforeOnEnterElements:$,getWhitespaceElements:q,getTransparentElements:W,getSpecialElements:Y,isValidChild:(e,t)=>{const n=o[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:G,isBlock:X,isInline:Q,isWrapper:e=>Ee(K(),e)||Q(e),getCustomElements:J,addValidElements:S,setValidElements:R,addCustomElements:A,addValidChildren:T}},ma=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},fa=e=>(e=>{return{value:(t=e,ze(t,"#").toUpperCase())};var t})(ma(e.red)+ma(e.green)+ma(e.blue)),ga=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,pa=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,ha=(e,t,n,o)=>({red:e,green:t,blue:n,alpha:o}),ba=(e,t,n,o)=>{const r=parseInt(e,10),s=parseInt(t,10),a=parseInt(n,10),i=parseFloat(o);return ha(r,s,a,i)},va=e=>{if("transparent"===e)return I.some(ha(0,0,0,0));const t=ga.exec(e);if(null!==t)return I.some(ba(t[1],t[2],t[3],"1"));const n=pa.exec(e);return null!==n?I.some(ba(n[1],n[2],n[3],n[4])):I.none()},ya=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,Ca=e=>va(e).map(fa).map((e=>"#"+e.value)).getOr(e),wa=(e={},t)=>{const n=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,r=/\s+$/,s={};let a,i;const l=hr;t&&(a=t.getValidStyles(),i=t.getInvalidStyles());const d="\\\" \\' \\; \\: ; : \ufeff".split(" ");for(let e=0;e<d.length;e++)s[d[e]]=l+e,s[l+e]=d[e];const c={parse:t=>{const a={};let i=!1;const d=e.url_converter,u=e.url_converter_scope||c,f=(e,t,n)=>{const o=a[e+"-top"+t];if(!o)return;const r=a[e+"-right"+t];if(!r)return;const s=a[e+"-bottom"+t];if(!s)return;const i=a[e+"-left"+t];if(!i)return;const l=[o,r,s,i];let d=l.length-1;for(;d--&&l[d]===l[d+1];);d>-1&&n||(a[e+t]=-1===d?l[0]:l.join(" "),delete a[e+"-top"+t],delete a[e+"-right"+t],delete a[e+"-bottom"+t],delete a[e+"-left"+t])},g=e=>{const t=a[e];if(!t)return;const n=t.indexOf(",")>-1?[t]:t.split(" ");let o=n.length;for(;o--;)if(n[o]!==n[0])return!1;return a[e]=n[0],!0},p=e=>(i=!0,s[e]),h=(e,t)=>(i&&(e=e.replace(/\uFEFF[0-9]/g,(e=>s[e]))),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e),b=e=>String.fromCharCode(parseInt(e.slice(1),16)),v=e=>e.replace(/\\[0-9a-f]+/gi,b),y=(t,n,o,r,s,a)=>{if(s=s||a)return"'"+(s=h(s)).replace(/\'/g,"\\'")+"'";if(n=h(n||o||r||""),!e.allow_script_urls){const t=n.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(t))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(t))return""}return d&&(n=d.call(u,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"};if(t){let s;for(t=(t=t.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,p).replace(/\"[^\"]+\"|\'[^\']+\'/g,(e=>e.replace(/[;:]/g,p)));s=o.exec(t);){o.lastIndex=s.index+s[0].length;let t=s[1].replace(r,"").toLowerCase(),d=s[2].replace(r,"");if(t&&d){if(t=v(t),d=v(d),-1!==t.indexOf(l)||-1!==t.indexOf('"'))continue;if(!e.allow_script_urls&&("behavior"===t||/expression\s*\(|\/\*|\*\//.test(d)))continue;"font-weight"===t&&"700"===d?d="bold":"color"!==t&&"background-color"!==t||(d=d.toLowerCase()),m(e.force_hex_color)&&"off"!==e.force_hex_color&&va(d).each((t=>{"always"!==e.force_hex_color&&1!==t.alpha||(d=Ca(ya(t)))})),d=d.replace(n,y),a[t]=i?h(d,!0):d}}f("border","",!0),f("border","-width"),f("border","-color"),f("border","-style"),f("padding",""),f("margin",""),"border",w="border-style",x="border-color",g(C="border-width")&&g(w)&&g(x)&&(a.border=a[C]+" "+a[w]+" "+a[x],delete a[C],delete a[w],delete a[x]),"medium none"===a.border&&delete a.border,"none"===a["border-image"]&&delete a["border-image"]}var C,w,x;return a},serialize:(e,t)=>{let n="";const o=(t,o)=>{const r=o[t];if(r)for(let t=0,o=r.length;t<o;t++){const o=r[t],s=e[o];s&&(n+=(n.length>0?" ":"")+o+": "+s+";")}};return t&&a?(o("*",a),o(t,a)):ge(e,((e,o)=>{e&&((e,t)=>{if(!i||!t)return!0;let n=i["*"];return!(n&&n[e]||(n=i[t],n&&n[e]))})(o,t)&&(n+=(n.length>0?" ":"")+o+": "+e+";")})),n}};return c},xa={keyLocation:!0,layerX:!0,layerY:!0,returnValue:!0,webkitMovementX:!0,webkitMovementY:!0,keyIdentifier:!0,mozPressure:!0},Ea=(e,t)=>{const n=null!=t?t:{};for(const t in e)Ee(xa,t)||(n[t]=e[t]);return C(e.composedPath)&&(n.composedPath=()=>e.composedPath()),C(e.getModifierState)&&(n.getModifierState=t=>e.getModifierState(t)),C(e.getTargetRanges)&&(n.getTargetRanges=()=>e.getTargetRanges()),n},_a=(e,t,n,o)=>{var r;const s=Ea(t,o);return s.type=e,y(s.target)&&(s.target=null!==(r=s.srcElement)&&void 0!==r?r:n),(e=>y(e.preventDefault)||(e=>e instanceof Event||w(e.initEvent))(e))(t)&&(s.preventDefault=()=>{s.defaultPrevented=!0,s.isDefaultPrevented=M,w(t.preventDefault)&&t.preventDefault()},s.stopPropagation=()=>{s.cancelBubble=!0,s.isPropagationStopped=M,w(t.stopPropagation)&&t.stopPropagation()},s.stopImmediatePropagation=()=>{s.isImmediatePropagationStopped=M,s.stopPropagation()},(e=>e.isDefaultPrevented===M||e.isDefaultPrevented===L)(s)||(s.isDefaultPrevented=!0===s.defaultPrevented?M:L,s.isPropagationStopped=!0===s.cancelBubble?M:L,s.isImmediatePropagationStopped=L)),s},ka=/^(?:mouse|contextmenu)|click/,Sa=(e,t,n,o)=>{e.addEventListener(t,n,o||!1)},Na=(e,t,n,o)=>{e.removeEventListener(t,n,o||!1)},Ra=(e,t)=>{const n=_a(e.type,e,document,t);if((e=>C(e)&&ka.test(e.type))(e)&&v(e.pageX)&&!v(e.clientX)){const t=n.target.ownerDocument||document,o=t.documentElement,r=t.body,s=n;s.pageX=e.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),s.pageY=e.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)}return n},Aa=(e,t,n)=>{const o=e.document,r={type:"ready"};if(n.domLoaded)return void t(r);const s=()=>{Na(e,"DOMContentLoaded",s),Na(e,"load",s),n.domLoaded||(n.domLoaded=!0,t(r)),e=null};"complete"===o.readyState||"interactive"===o.readyState&&o.body?s():Sa(e,"DOMContentLoaded",s),n.domLoaded||Sa(e,"load",s)};class Ta{constructor(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}bind(e,t,n,o){const r=this;let s;const a=window,i=e=>{r.executeHandlers(Ra(e||a.event),l)};if(!e||er(e)||or(e))return n;let l;e[r.expando]?l=e[r.expando]:(l=r.count++,e[r.expando]=l,r.events[l]={}),o=o||e;const d=t.split(" ");let c=d.length;for(;c--;){let t=d[c],u=i,m=!1,f=!1;"DOMContentLoaded"===t&&(t="ready"),r.domLoaded&&"ready"===t&&"complete"===e.readyState?n.call(o,Ra({type:t})):(r.hasFocusIn||"focusin"!==t&&"focusout"!==t||(m=!0,f="focusin"===t?"focus":"blur",u=e=>{const t=Ra(e||a.event);t.type="focus"===t.type?"focusin":"focusout",r.executeHandlers(t,l)}),s=r.events[l][t],s?"ready"===t&&r.domLoaded?n(Ra({type:t})):s.push({func:n,scope:o}):(r.events[l][t]=s=[{func:n,scope:o}],s.fakeName=f,s.capture=m,s.nativeHandler=u,"ready"===t?Aa(e,u,r):Sa(e,f||t,u,m)))}return e=s=null,n}unbind(e,t,n){if(!e||er(e)||or(e))return this;const o=e[this.expando];if(o){let r=this.events[o];if(t){const o=t.split(" ");let s=o.length;for(;s--;){const t=o[s],a=r[t];if(a){if(n){let e=a.length;for(;e--;)if(a[e].func===n){const n=a.nativeHandler,o=a.fakeName,s=a.capture,i=a.slice(0,e).concat(a.slice(e+1));i.nativeHandler=n,i.fakeName=o,i.capture=s,r[t]=i}}n&&0!==a.length||(delete r[t],Na(e,a.fakeName||t,a.nativeHandler,a.capture))}}}else ge(r,((t,n)=>{Na(e,t.fakeName||n,t.nativeHandler,t.capture)})),r={};for(const e in r)if(Ee(r,e))return this;delete this.events[o];try{delete e[this.expando]}catch(t){e[this.expando]=null}}return this}fire(e,t,n){return this.dispatch(e,t,n)}dispatch(e,t,n){if(!e||er(e)||or(e))return this;const o=Ra({type:t,target:e},n);do{const t=e[this.expando];t&&this.executeHandlers(o,t),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow}while(e&&!o.isPropagationStopped());return this}clean(e){if(!e||er(e)||or(e))return this;if(e[this.expando]&&this.unbind(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName){this.unbind(e);const t=e.getElementsByTagName("*");let n=t.length;for(;n--;)(e=t[n])[this.expando]&&this.unbind(e)}return this}destroy(){this.events={}}cancel(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}executeHandlers(e,t){const n=this.events[t],o=n&&n[e.type];if(o)for(let t=0,n=o.length;t<n;t++){const n=o[t];if(n&&!1===n.func.call(n.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}}}Ta.Event=new Ta;const Oa=Pt.each,Ba=Pt.grep,Pa="data-mce-style",Da=Pt.makeMap("fill-opacity font-weight line-height opacity orphans widows z-index zoom"," "),La=(e,t,n)=>{y(n)||""===n?on(e,t):Jt(e,t,n)},Ma=e=>e.replace(/[A-Z]/g,(e=>"-"+e.toLowerCase())),Ia=(e,t)=>{let n=0;if(e)for(let o=e.nodeType,r=e.previousSibling;r;r=r.previousSibling){const e=r.nodeType;(!t||!er(r)||e!==o&&r.data.length)&&(n++,o=e)}return n},Fa=(e,t)=>{const n=en(t,"style"),o=e.serialize(e.parse(n),Ht(t));La(t,Pa,o)},Ua=(e,t,n)=>{const o=Ma(t);y(n)||""===n?go(e,o):io(e,o,((e,t)=>x(e)?Ee(Da,t)?e+"":e+"px":e)(n,o))},za=(e,t={})=>{const n={},o=window,r={};let s=0;const a=Is.forElement(yn(e),{contentCssCors:t.contentCssCors,referrerPolicy:t.referrerPolicy}),i=[],l=t.schema?t.schema:ua({}),d=wa({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope,force_hex_color:t.force_hex_color},t.schema),c=t.ownEvents?new Ta:Ta.Event,u=l.getBlockElements(),f=t=>t&&e&&m(t)?e.getElementById(t):t,g=e=>{const t=f(e);return C(t)?yn(t):null},h=(e,t,n="")=>{let o;const r=g(e);if(C(r)&&Wt(r)){const e=G[t];o=e&&e.get?e.get(r.dom,t):en(r,t)}return C(o)?o:n},b=e=>{const t=f(e);return y(t)?[]:t.attributes},v=(e,n,o)=>{O(e,(e=>{if(qo(e)){const r=yn(e),s=""===o?null:o,a=en(r,n),i=G[n];i&&i.set?i.set(r.dom,s,n):La(r,n,s),a!==s&&t.onSetAttrib&&t.onSetAttrib({attrElm:r.dom,attrName:n,attrValue:s})}}))},x=()=>t.root_element||e.body,E=(t,n)=>((e,t,n)=>{let o=0,r=0;const s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===co(yn(e),"position")){const n=t.getBoundingClientRect();return o=n.left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,r=n.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop,{x:o,y:r}}let a=t;for(;a&&a!==n&&a.nodeType&&!Ls(a,n);){const e=a;o+=e.offsetLeft||0,r+=e.offsetTop||0,a=e.offsetParent}for(a=t.parentNode;a&&a!==n&&a.nodeType&&!Ls(a,n);)o-=a.scrollLeft||0,r-=a.scrollTop||0,a=a.parentNode;r+=(e=>Ps.isFirefox()&&"table"===Ht(e)?Ds(Mn(e)).filter((e=>"caption"===Ht(e))).bind((e=>Ds(Ln(e)).map((t=>{const n=t.dom.offsetTop,o=e.dom.offsetTop,r=e.dom.offsetHeight;return n<=o?-r:0})))).getOr(0):0)(yn(t))}return{x:o,y:r}})(e.body,f(t),n),k=(e,t,n)=>{const o=f(e);var r;if(!y(o)&&(Vo(o)||qo(r=o)&&"http://www.w3.org/2000/svg"===r.namespaceURI))return n?co(yn(o),Ma(t)):("float"===(t=t.replace(/-(\D)/g,((e,t)=>t.toUpperCase())))&&(t="cssFloat"),o.style?o.style[t]:void 0)},S=e=>{const t=f(e);if(!t)return{w:0,h:0};let n=k(t,"width"),o=k(t,"height");return n&&-1!==n.indexOf("px")||(n="0"),o&&-1!==o.indexOf("px")||(o="0"),{w:parseInt(n,10)||t.offsetWidth||t.clientWidth,h:parseInt(o,10)||t.offsetHeight||t.clientHeight}},R=(e,t)=>{if(!e)return!1;const n=p(e)?e:[e];return $(n,(e=>xn(yn(e),t)))},A=(e,t,n,o)=>{const r=[];let s=f(e);o=void 0===o;const a=n||("BODY"!==x().nodeName?x().parentNode:null);if(m(t))if("*"===t)t=qo;else{const e=t;t=t=>R(t,e)}for(;s&&!(s===a||y(s.nodeType)||rr(s)||sr(s));){if(!t||t(s)){if(!o)return[s];r.push(s)}s=s.parentNode}return o?r:null},T=(e,t,n)=>{let o=t;if(e){m(t)&&(o=e=>R(e,t));for(let t=e[n];t;t=t[n])if(w(o)&&o(t))return t}return null},O=function(e,t,n){const o=null!=n?n:this;if(p(e)){const n=[];return Oa(e,((e,r)=>{const s=f(e);s&&n.push(t.call(o,s,r))})),n}{const n=f(e);return!!n&&t.call(o,n)}},B=(e,t)=>{O(e,(e=>{ge(t,((t,n)=>{v(e,n,t)}))}))},P=(e,t)=>{O(e,(e=>{const n=yn(e);So(n,t)}))},D=(t,n,o,r,s)=>O(t,(t=>{const a=m(n)?e.createElement(n):n;return C(o)&&B(a,o),r&&(!m(r)&&r.nodeType?a.appendChild(r):m(r)&&P(a,r)),s?a:t.appendChild(a)})),L=(t,n,o)=>D(e.createElement(t),t,n,o,!0),M=ea.encodeAllRaw,I=(e,t)=>O(e,(e=>{const n=yn(e);return t&&V(Mn(n),(e=>{Kt(e)&&0===e.dom.length?xo(e):po(n,e)})),xo(n),n.dom})),F=(e,t,n)=>{O(e,(e=>{if(qo(e)){const o=yn(e),r=t.split(" ");V(r,(e=>{C(n)?(n?un:fn)(o,e):((e,t)=>{const n=an(e)?e.dom.classList.toggle(t):((e,t)=>H(ln(e),t)?cn(e,t):dn(e,t))(e,t);mn(e)})(o,e)}))}}))},U=(e,t,n)=>O(t,(o=>{var r;const s=p(t)?e.cloneNode(!0):e;return n&&Oa(Ba(o.childNodes),(e=>{s.appendChild(e)})),null===(r=o.parentNode)||void 0===r||r.replaceChild(s,o),o})),z=e=>{if(qo(e)){const t="a"===e.nodeName.toLowerCase()&&!h(e,"href")&&h(e,"id");if(h(e,"name")||h(e,"data-mce-bookmark")||t)return!0}return!1},j=()=>e.createRange(),q=(n,r,s,a)=>{if(p(n)){let e=n.length;const t=[];for(;e--;)t[e]=q(n[e],r,s,a);return t}return!t.collect||n!==e&&n!==o||i.push([n,r,s,a]),c.bind(n,r,s,a||Y)},W=(t,n,r)=>{if(p(t)){let e=t.length;const o=[];for(;e--;)o[e]=W(t[e],n,r);return o}if(i.length>0&&(t===e||t===o)){let e=i.length;for(;e--;){const[o,s,a]=i[e];t!==o||n&&n!==s||r&&r!==a||c.unbind(o,s,a)}}return c.unbind(t,n,r)},K=e=>{if(e&&Vo(e)){const t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},Y={doc:e,settings:t,win:o,files:r,stdMode:!0,boxModel:!0,styleSheetLoader:a,boundEvents:i,styles:d,schema:l,events:c,isBlock:e=>m(e)?Ee(u,e):qo(e)&&(Ee(u,e.nodeName)||Ts(l,e)),root:null,clone:(e,t)=>e.cloneNode(t),getRoot:x,getViewPort:e=>{const t=Io(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:e=>{const t=f(e),n=E(t),o=S(t);return{x:n.x,y:n.y,w:o.w,h:o.h}},getSize:S,getParent:(e,t,n)=>{const o=A(e,t,n,!1);return o&&o.length>0?o[0]:null},getParents:A,get:f,getNext:(e,t)=>T(e,t,"nextSibling"),getPrev:(e,t)=>T(e,t,"previousSibling"),select:(n,o)=>{var r,s;const a=null!==(s=null!==(r=f(o))&&void 0!==r?r:t.root_element)&&void 0!==s?s:e;return w(a.querySelectorAll)?ce(a.querySelectorAll(n)):[]},is:R,add:D,create:L,createHTML:(e,t,n="")=>{let o="<"+e;for(const e in t)_e(t,e)&&(o+=" "+e+'="'+M(t[e])+'"');return Ge(n)&&Ee(l.getVoidElements(),e)?o+" />":o+">"+n+"</"+e+">"},createFragment:t=>{const n=e.createElement("div"),o=e.createDocumentFragment();let r;for(o.appendChild(n),t&&(n.innerHTML=t);r=n.firstChild;)o.appendChild(r);return o.removeChild(n),o},remove:I,setStyle:(e,n,o)=>{O(e,(e=>{const r=yn(e);Ua(r,n,o),t.update_styles&&Fa(d,r)}))},getStyle:k,setStyles:(e,n)=>{O(e,(e=>{const o=yn(e);ge(n,((e,t)=>{Ua(o,t,e)})),t.update_styles&&Fa(d,o)}))},removeAllAttribs:e=>O(e,(e=>{const t=e.attributes;for(let n=t.length-1;n>=0;n--)e.removeAttributeNode(t.item(n))})),setAttrib:v,setAttribs:B,getAttrib:h,getPos:E,parseStyle:e=>d.parse(e),serializeStyle:(e,t)=>d.serialize(e,t),addStyle:t=>{if(Y!==za.DOM&&e===document){if(n[t])return;n[t]=!0}let o=e.getElementById("mceDefaultStyles");if(!o){o=e.createElement("style"),o.id="mceDefaultStyles",o.type="text/css";const t=e.head;t.firstChild?t.insertBefore(o,t.firstChild):t.appendChild(o)}o.styleSheet?o.styleSheet.cssText+=t:o.appendChild(e.createTextNode(t))},loadCSS:e=>{e||(e=""),V(e.split(","),(e=>{r[e]=!0,a.load(e).catch(_)}))},addClass:(e,t)=>{F(e,t,!0)},removeClass:(e,t)=>{F(e,t,!1)},hasClass:(e,t)=>{const n=g(e),o=t.split(" ");return C(n)&&ne(o,(e=>gn(n,e)))},toggleClass:F,show:e=>{O(e,(e=>go(yn(e),"display")))},hide:e=>{O(e,(e=>io(yn(e),"display","none")))},isHidden:e=>{const t=g(e);return C(t)&&Dt(mo(t,"display"),"none")},uniqueId:e=>(e||"mce_")+s++,setHTML:P,getOuterHTML:e=>{const t=g(e);return C(t)?qo(t.dom)?t.dom.outerHTML:(e=>{const t=bn("div"),n=yn(e.dom.cloneNode(!0));return vo(t,n),ko(t)})(t):""},setOuterHTML:(e,t)=>{O(e,(e=>{qo(e)&&(e.outerHTML=t)}))},decode:ea.decode,encode:M,insertAfter:(e,t)=>{const n=f(t);return O(e,(e=>{const t=null==n?void 0:n.parentNode,o=null==n?void 0:n.nextSibling;return t&&(o?t.insertBefore(e,o):t.appendChild(e)),e}))},replace:U,rename:(e,t)=>{if(e.nodeName!==t.toUpperCase()){const n=L(t);return Oa(b(e),(t=>{v(n,t.nodeName,h(e,t.nodeName))})),U(n,e,!0),n}return e},findCommonAncestor:(e,t)=>{let n=e;for(;n;){let e=t;for(;e&&n!==e;)e=e.parentNode;if(n===e)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},run:O,getAttribs:b,isEmpty:(e,t,n)=>{let o=0;if(z(e))return!1;const r=e.firstChild;if(r){const s=new jo(r,e),a=l?l.getWhitespaceElements():{},i=t||(l?l.getNonEmptyElements():null);let d=r;do{if(qo(d)){const e=d.getAttribute("data-mce-bogus");if(e){d=s.next("all"===e);continue}const t=d.nodeName.toLowerCase();if(i&&i[t]){if("br"===t){o++,d=s.next();continue}return!1}if(z(d))return!1}if(or(d))return!1;if(er(d)&&!ss(d.data)&&(!(null==n?void 0:n.includeZwsp)||!as(d.data)))return!1;if(er(d)&&d.parentNode&&a[d.parentNode.nodeName]&&ss(d.data))return!1;d=s.next()}while(d)}return o<=1},createRng:j,nodeIndex:Ia,split:(e,t,n)=>{let o,r,s=j();if(e&&t&&e.parentNode&&t.parentNode){const a=e.parentNode;return s.setStart(a,Ia(e)),s.setEnd(t.parentNode,Ia(t)),o=s.extractContents(),s=j(),s.setStart(t.parentNode,Ia(t)+1),s.setEnd(a,Ia(e)+1),r=s.extractContents(),a.insertBefore(zs(Y,o,l),e),n?a.insertBefore(n,e):a.insertBefore(t,e),a.insertBefore(zs(Y,r,l),e),I(e),n||t}},bind:q,unbind:W,fire:(e,t,n)=>c.dispatch(e,t,n),dispatch:(e,t,n)=>c.dispatch(e,t,n),getContentEditable:K,getContentEditableParent:e=>{const t=x();let n=null;for(let o=e;o&&o!==t&&(n=K(o),null===n);o=o.parentNode);return n},isEditable:e=>{if(C(e)){const t=qo(e)?e:e.parentElement;return C(t)&&Vo(t)&&oo(yn(t))}return!1},destroy:()=>{if(i.length>0){let e=i.length;for(;e--;){const[t,n,o]=i[e];c.unbind(t,n,o)}}ge(r,((e,t)=>{a.unload(t),delete r[t]}))},isChildOf:(e,t)=>e===t||t.contains(e),dumpRng:e=>"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},G=((e,t,n)=>{const o=t.keep_values,r={set:(e,o,r)=>{const s=yn(e);w(t.url_converter)&&C(o)&&(o=t.url_converter.call(t.url_converter_scope||n(),String(o),r,e)),La(s,"data-mce-"+r,o),La(s,r,o)},get:(e,t)=>{const n=yn(e);return en(n,"data-mce-"+t)||en(n,t)}},s={style:{set:(t,n)=>{const r=yn(t);o&&La(r,Pa,n),on(r,"style"),m(n)&&lo(r,e.parse(n))},get:t=>{const n=yn(t),o=en(n,Pa)||en(n,"style");return e.serialize(e.parse(o),Ht(n))}}};return o&&(s.href=s.src=r),s})(d,t,N(Y));return Y};za.DOM=za(document),za.nodeIndex=Ia;const ja=za.DOM;class Ha{constructor(e={}){this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=!1,this.settings=e}_setReferrerPolicy(e){this.settings.referrerPolicy=e}loadScript(e){return new Promise(((t,n)=>{const o=ja;let r;const s=()=>{o.remove(a),r&&(r.onerror=r.onload=r=null)},a=o.uniqueId();r=document.createElement("script"),r.id=a,r.type="text/javascript",r.src=Pt._addCacheSuffix(e),this.settings.referrerPolicy&&o.setAttrib(r,"referrerpolicy",this.settings.referrerPolicy),r.onload=()=>{s(),t()},r.onerror=()=>{s(),n("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(r)}))}isDone(e){return 2===this.states[e]}markDone(e){this.states[e]=2}add(e){const t=this;return t.queue.push(e),void 0===t.states[e]&&(t.states[e]=0),new Promise(((n,o)=>{t.scriptLoadedCallbacks[e]||(t.scriptLoadedCallbacks[e]=[]),t.scriptLoadedCallbacks[e].push({resolve:n,reject:o})}))}load(e){return this.add(e)}remove(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]}loadQueue(){const e=this.queue;return this.queue=[],this.loadScripts(e)}loadScripts(e){const t=this,n=(e,n)=>{xe(t.scriptLoadedCallbacks,n).each((t=>{V(t,(t=>t[e](n)))})),delete t.scriptLoadedCallbacks[n]},o=e=>{const t=Y(e,(e=>"rejected"===e.status));return t.length>0?Promise.reject(te(t,(({reason:e})=>p(e)?e:[e]))):Promise.resolve()},r=e=>Promise.allSettled(q(e,(e=>2===t.states[e]?(n("resolve",e),Promise.resolve()):3===t.states[e]?(n("reject",e),Promise.reject(e)):(t.states[e]=1,t.loadScript(e).then((()=>{t.states[e]=2,n("resolve",e);const s=t.queue;return s.length>0?(t.queue=[],r(s).then(o)):Promise.resolve()}),(()=>(t.states[e]=3,n("reject",e),Promise.reject(e)))))))),s=e=>(t.loading=!0,r(e).then((e=>{t.loading=!1;const n=t.queueLoadedCallbacks.shift();return I.from(n).each(D),o(e)}))),a=ke(e);return t.loading?new Promise(((e,n)=>{t.queueLoadedCallbacks.push((()=>{s(a).then(e,n)}))})):s(a)}}Ha.ScriptLoader=new Ha;const $a=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},qa={},Va=$a("en"),Wa=()=>xe(qa,Va.get()),Ka={getData:()=>pe(qa,(e=>({...e}))),setCode:e=>{e&&Va.set(e)},getCode:()=>Va.get(),add:(e,t)=>{let n=qa[e];n||(qa[e]=n={});const o=q(me(t),(e=>e.toLowerCase()));ge(t,((e,r)=>{const s=r.toLowerCase();s!==r&&((e,t)=>{const n=e.indexOf(t);return-1!==n&&e.indexOf(t,n+1)>n})(o,s)?(Ee(t,s)||(n[s]=e),n[r]=e):n[s]=e}))},translate:e=>{const t=Wa().getOr({}),n=e=>w(e)?Object.prototype.toString.call(e):o(e)?"":""+e,o=e=>""===e||null==e,r=e=>{const o=n(e);return Ee(t,o)?n(t[o]):xe(t,o.toLowerCase()).map(n).getOr(o)},s=e=>e.replace(/{context:\w+}$/,"");if(o(e))return"";if(f(a=e)&&Ee(a,"raw"))return n(e.raw);var a;if((e=>p(e)&&e.length>1)(e)){const t=e.slice(1);return s(r(e[0]).replace(/\{([0-9]+)\}/g,((e,o)=>Ee(t,o)?n(t[o]):e)))}return s(r(e))},isRtl:()=>Wa().bind((e=>xe(e,"_dir"))).exists((e=>"rtl"===e)),hasCode:e=>Ee(qa,e)},Ya=()=>{const e=[],t={},n={},o=[],r=(e,t)=>{const n=Y(o,(n=>n.name===e&&n.state===t));V(n,(e=>e.resolve()))},s=e=>Ee(t,e),a=(e,n)=>{const o=Ka.getCode();!o||n&&-1===(","+(n||"")+",").indexOf(","+o+",")||Ha.ScriptLoader.add(t[e]+"/langs/"+o+".js")},i=(e,t="added")=>"added"===t&&(e=>Ee(n,e))(e)||"loaded"===t&&s(e)?Promise.resolve():new Promise((n=>{o.push({name:e,state:t,resolve:n})}));return{items:e,urls:t,lookup:n,get:e=>{if(n[e])return n[e].instance},requireLangPack:(e,t)=>{!1!==Ya.languageLoad&&(s(e)?a(e,t):i(e,"loaded").then((()=>a(e,t))))},add:(t,o)=>(e.push(o),n[t]={instance:o},r(t,"added"),o),remove:e=>{delete t[e],delete n[e]},createUrl:(e,t)=>m(t)?m(e)?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}:t,load:(e,o)=>{if(t[e])return Promise.resolve();let s=m(o)?o:o.prefix+o.resource+o.suffix;0!==s.indexOf("/")&&-1===s.indexOf("://")&&(s=Ya.baseURL+"/"+s),t[e]=s.substring(0,s.lastIndexOf("/"));const a=()=>(r(e,"loaded"),Promise.resolve());return n[e]?a():Ha.ScriptLoader.add(s).then(a)},waitFor:i}};Ya.languageLoad=!0,Ya.baseURL="",Ya.PluginManager=Ya(),Ya.ThemeManager=Ya(),Ya.ModelManager=Ya();const Ga=e=>{const t=$a(I.none()),n=()=>t.get().each((e=>clearInterval(e)));return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:o=>{n(),t.set(I.some(setInterval(o,e)))}}},Xa=()=>{const e=(e=>{const t=$a(I.none()),n=()=>t.get().each(e);return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{n(),t.set(I.some(e))}}})(_);return{...e,on:t=>e.get().each(t)}},Qa=(e,t)=>{let n=null;return{cancel:()=>{h(n)||(clearTimeout(n),n=null)},throttle:(...o)=>{h(n)&&(n=setTimeout((()=>{n=null,e.apply(null,o)}),t))}}},Ja=(e,t)=>{let n=null;const o=()=>{h(n)||(clearTimeout(n),n=null)};return{cancel:o,throttle:(...r)=>{o(),n=setTimeout((()=>{n=null,e.apply(null,r)}),t)}}},Za=N("mce-annotation"),ei=N("data-mce-annotation"),ti=N("data-mce-annotation-uid"),ni=N("data-mce-annotation-active"),oi=N("data-mce-annotation-classes"),ri=N("data-mce-annotation-attrs"),si=e=>t=>_n(t,e),ai=(e,t)=>{const n=e.selection.getRng(),o=yn(n.startContainer),r=yn(e.getBody()),s=t.fold((()=>"."+Za()),(e=>`[${ei()}="${e}"]`)),a=In(o,n.startOffset).getOr(o);return no(a,s,si(r)).bind((t=>tn(t,`${ti()}`).bind((n=>tn(t,`${ei()}`).map((t=>{const o=li(e,n);return{uid:n,name:t,elements:o}}))))))},ii=(e,t)=>nn(e,"data-mce-bogus")||zo(e,'[data-mce-bogus="all"]',si(t)),li=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ti()}="${t}"]`);return Y(o,(e=>!ii(e,n)))},di=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ei()}="${t}"]`),r={};return V(o,(e=>{if(!ii(e,n)){const t=en(e,ti()),n=xe(r,t).getOr([]);r[t]=n.concat([e])}})),r};let ci=0;const ui=e=>{const t=(new Date).getTime(),n=Math.floor(1e9*Math.random());return ci++,e+"_"+n+ci+String(t)},mi=(e,t)=>yn(e.dom.cloneNode(t)),fi=e=>mi(e,!1),gi=e=>mi(e,!0),pi=(e,t,n=L)=>{const o=new jo(e,t),r=e=>{let t;do{t=o[e]()}while(t&&!er(t)&&!n(t));return I.from(t).filter(er)};return{current:()=>I.from(o.current()).filter(er),next:()=>r("next"),prev:()=>r("prev"),prev2:()=>r("prev2")}},hi=(e,t)=>{const n=t||(t=>e.isBlock(t)||ar(t)||dr(t)),o=(e,t,n,r)=>{if(er(e)){const n=r(e,t,e.data);if(-1!==n)return I.some({container:e,offset:n})}return n().bind((e=>o(e.container,e.offset,n,r)))};return{backwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.prev().map((e=>({container:e,offset:e.length})))),s).getOrNull()},forwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.next().map((e=>({container:e,offset:0})))),s).getOrNull()}}},bi=Math.round,vi=e=>e?{left:bi(e.left),top:bi(e.top),bottom:bi(e.bottom),right:bi(e.right),width:bi(e.width),height:bi(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0},yi=(e,t)=>(e=vi(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e),Ci=(e,t,n)=>e>=0&&e<=Math.min(t.height,n.height)/2,wi=(e,t)=>{const n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&Ci(t.top-e.bottom,e,t)},xi=(e,t)=>e.top>t.bottom||!(e.bottom<t.top)&&Ci(t.bottom-e.top,e,t),Ei=(e,t,n)=>{const o=Math.max(Math.min(t,e.left+e.width),e.left),r=Math.max(Math.min(n,e.top+e.height),e.top);return Math.sqrt((t-o)*(t-o)+(n-r)*(n-r))},_i=e=>{const t=e.startContainer,n=e.startOffset;return t===e.endContainer&&t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},ki=(e,t)=>{if(qo(e)&&e.hasChildNodes()){const n=e.childNodes,o=((e,t,n)=>Math.min(Math.max(e,0),n))(t,0,n.length-1);return n[o]}return e},Si=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),Ni=e=>m(e)&&e.charCodeAt(0)>=768&&Si.test(e),Ri=qo,Ai=ts,Ti=Yo("display","block table"),Oi=Yo("float","left right"),Bi=((...e)=>t=>{for(let n=0;n<e.length;n++)if(!e[n](t))return!1;return!0})(Ri,Ai,O(Oi)),Pi=O(Yo("white-space","pre pre-line pre-wrap")),Di=er,Li=ar,Mi=za.nodeIndex,Ii=(e,t)=>t<0&&qo(e)&&e.hasChildNodes()?void 0:ki(e,t),Fi=e=>e?e.createRange():za.DOM.createRng(),Ui=e=>m(e)&&/[\r\n\t ]/.test(e),zi=e=>!!e.setStart&&!!e.setEnd,ji=e=>{const t=e.startContainer,n=e.startOffset;if(Ui(e.toString())&&Pi(t.parentNode)&&er(t)){const e=t.data;if(Ui(e[n-1])||Ui(e[n+1]))return!0}return!1},Hi=e=>0===e.left&&0===e.right&&0===e.top&&0===e.bottom,$i=e=>{var t;let n;const o=e.getClientRects();return n=o.length>0?vi(o[0]):vi(e.getBoundingClientRect()),!zi(e)&&Li(e)&&Hi(n)?(e=>{const t=e.ownerDocument,n=Fi(t),o=t.createTextNode(br),r=e.parentNode;r.insertBefore(o,e),n.setStart(o,0),n.setEnd(o,1);const s=vi(n.getBoundingClientRect());return r.removeChild(o),s})(e):Hi(n)&&zi(e)&&null!==(t=(e=>{const t=e.startContainer,n=e.endContainer,o=e.startOffset,r=e.endOffset;if(t===n&&er(n)&&0===o&&1===r){const t=e.cloneRange();return t.setEndAfter(n),$i(t)}return null})(e))&&void 0!==t?t:n},qi=(e,t)=>{const n=yi(e,t);return n.width=1,n.right=n.left+1,n},Vi=(e,t,n)=>{const o=()=>(n||(n=(e=>{const t=[],n=e=>{var n,o;0!==e.height&&(t.length>0&&(n=e,o=t[t.length-1],n.left===o.left&&n.top===o.top&&n.bottom===o.bottom&&n.right===o.right)||t.push(e))},o=(e,t)=>{const o=Fi(e.ownerDocument);if(t<e.data.length){if(Ni(e.data[t]))return;if(Ni(e.data[t-1])&&(o.setStart(e,t),o.setEnd(e,t+1),!ji(o)))return void n(qi($i(o),!1))}t>0&&(o.setStart(e,t-1),o.setEnd(e,t),ji(o)||n(qi($i(o),!1))),t<e.data.length&&(o.setStart(e,t),o.setEnd(e,t+1),ji(o)||n(qi($i(o),!0)))},r=e.container(),s=e.offset();if(Di(r))return o(r,s),t;if(Ri(r))if(e.isAtEnd()){const e=Ii(r,s);Di(e)&&o(e,e.data.length),Bi(e)&&!Li(e)&&n(qi($i(e),!1))}else{const a=Ii(r,s);if(Di(a)&&o(a,0),Bi(a)&&e.isAtEnd())return n(qi($i(a),!1)),t;const i=Ii(e.container(),e.offset()-1);Bi(i)&&!Li(i)&&(Ti(i)||Ti(a)||!Bi(a))&&n(qi($i(i),!1)),Bi(a)&&n(qi($i(a),!0))}return t})(Vi(e,t))),n);return{container:N(e),offset:N(t),toRange:()=>{const n=Fi(e.ownerDocument);return n.setStart(e,t),n.setEnd(e,t),n},getClientRects:o,isVisible:()=>o().length>0,isAtStart:()=>(Di(e),0===t),isAtEnd:()=>Di(e)?t>=e.data.length:t>=e.childNodes.length,isEqual:n=>n&&e===n.container()&&t===n.offset(),getNode:n=>Ii(e,n?t-1:t)}};Vi.fromRangeStart=e=>Vi(e.startContainer,e.startOffset),Vi.fromRangeEnd=e=>Vi(e.endContainer,e.endOffset),Vi.after=e=>Vi(e.parentNode,Mi(e)+1),Vi.before=e=>Vi(e.parentNode,Mi(e)),Vi.isAbove=(e,t)=>Mt(le(t.getClientRects()),de(e.getClientRects()),wi).getOr(!1),Vi.isBelow=(e,t)=>Mt(de(t.getClientRects()),le(e.getClientRects()),xi).getOr(!1),Vi.isAtStart=e=>!!e&&e.isAtStart(),Vi.isAtEnd=e=>!!e&&e.isAtEnd(),Vi.isTextPosition=e=>!!e&&er(e.container()),Vi.isElementPosition=e=>!Vi.isTextPosition(e);const Wi=(e,t)=>{er(t)&&0===t.data.length&&e.remove(t)},Ki=(e,t,n)=>{sr(n)?((e,t,n)=>{const o=I.from(n.firstChild),r=I.from(n.lastChild);t.insertNode(n),o.each((t=>Wi(e,t.previousSibling))),r.each((t=>Wi(e,t.nextSibling)))})(e,t,n):((e,t,n)=>{t.insertNode(n),Wi(e,n.previousSibling),Wi(e,n.nextSibling)})(e,t,n)},Yi=er,Gi=Xo,Xi=za.nodeIndex,Qi=e=>{const t=e.parentNode;return Gi(t)?Qi(t):t},Ji=e=>e?Oe(e.childNodes,((e,t)=>(Gi(t)&&"BR"!==t.nodeName?e=e.concat(Ji(t)):e.push(t),e)),[]):[],Zi=e=>t=>e===t,el=e=>(Yi(e)?"text()":e.nodeName.toLowerCase())+"["+(e=>{let t,n;t=Ji(Qi(e)),n=Be(t,Zi(e),e),t=t.slice(0,n+1);const o=Oe(t,((e,n,o)=>(Yi(n)&&Yi(t[o-1])&&e++,e)),0);return t=Te(t,Ko([e.nodeName])),n=Be(t,Zi(e),e),n-o})(e)+"]",tl=(e,t)=>{let n,o=[],r=t.container(),s=t.offset();if(Yi(r))n=((e,t)=>{let n=e;for(;(n=n.previousSibling)&&Yi(n);)t+=n.data.length;return t})(r,s);else{const e=r.childNodes;s>=e.length?(n="after",s=e.length-1):n="before",r=e[s]}o.push(el(r));let a=((e,t,n)=>{const o=[];for(let n=t.parentNode;n&&n!==e;n=n.parentNode)o.push(n);return o})(e,r);return a=Te(a,O(Xo)),o=o.concat(Ae(a,(e=>el(e)))),o.reverse().join("/")+","+n},nl=(e,t)=>{if(!t)return null;const n=t.split(","),o=n[0].split("/"),r=n.length>1?n[1]:"before",s=Oe(o,((e,t)=>{const n=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return n?("text()"===n[1]&&(n[1]="#text"),((e,t,n)=>{let o=Ji(e);return o=Te(o,((e,t)=>!Yi(e)||!Yi(o[t-1]))),o=Te(o,Ko([t])),o[n]})(e,n[1],parseInt(n[2],10))):null}),e);if(!s)return null;if(!Yi(s)&&s.parentNode){let e;return e="after"===r?Xi(s)+1:Xi(s),Vi(s.parentNode,e)}return((e,t)=>{let n=e,o=0;for(;Yi(n);){const r=n.data.length;if(t>=o&&t<=o+r){e=n,t-=o;break}if(!Yi(n.nextSibling)){e=n,t=r;break}o+=r,n=n.nextSibling}return Yi(e)&&t>e.data.length&&(t=e.data.length),Vi(e,t)})(s,parseInt(r,10))},ol=dr,rl=(e,t,n,o,r)=>{const s=r?o.startContainer:o.endContainer;let a=r?o.startOffset:o.endOffset;const i=[],l=e.getRoot();if(er(s))i.push(n?((e,t,n)=>{let o=e(t.data.slice(0,n)).length;for(let n=t.previousSibling;n&&er(n);n=n.previousSibling)o+=e(n.data).length;return o})(t,s,a):a);else{let t=0;const o=s.childNodes;a>=o.length&&o.length&&(t=1,a=Math.max(0,o.length-1)),i.push(e.nodeIndex(o[a],n)+t)}for(let t=s;t&&t!==l;t=t.parentNode)i.push(e.nodeIndex(t,n));return i},sl=(e,t,n)=>{let o=0;return Pt.each(e.select(t),(e=>"all"===e.getAttribute("data-mce-bogus")?void 0:e!==n&&void o++)),o},al=(e,t)=>{let n=t?e.startContainer:e.endContainer,o=t?e.startOffset:e.endOffset;if(qo(n)&&"TR"===n.nodeName){const r=n.childNodes;n=r[Math.min(t?o:o-1,r.length-1)],n&&(o=t?0:n.childNodes.length,t?e.setStart(n,o):e.setEnd(n,o))}},il=e=>(al(e,!0),al(e,!1),e),ll=(e,t)=>{if(qo(e)&&(e=ki(e,t),ol(e)))return e;if(Ur(e)){er(e)&&Ir(e)&&(e=e.parentNode);let t=e.previousSibling;if(ol(t))return t;if(t=e.nextSibling,ol(t))return t}},dl=(e,t,n)=>{const o=n.getNode(),r=n.getRng();if("IMG"===o.nodeName||ol(o)){const e=o.nodeName;return{name:e,index:sl(n.dom,e,o)}}const s=(e=>ll(e.startContainer,e.startOffset)||ll(e.endContainer,e.endOffset))(r);if(s){const e=s.tagName;return{name:e,index:sl(n.dom,e,s)}}return((e,t,n,o)=>{const r=t.dom,s=rl(r,e,n,o,!0),a=t.isForward(),i=Wr(o)?{isFakeCaret:!0}:{};return t.isCollapsed()?{start:s,forward:a,...i}:{start:s,end:rl(r,e,n,o,!1),forward:a,...i}})(e,n,t,r)},cl=(e,t,n)=>{const o={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",o,"&#xFEFF;"):e.create("span",o)},ul=(e,t)=>{const n=e.dom;let o=e.getRng();const r=n.uniqueId(),s=e.isCollapsed(),a=e.getNode(),i=a.nodeName,l=e.isForward();if("IMG"===i)return{name:i,index:sl(n,i,a)};const d=il(o.cloneRange());if(!s){d.collapse(!1);const e=cl(n,r+"_end",t);Ki(n,d,e)}o=il(o),o.collapse(!0);const c=cl(n,r+"_start",t);return Ki(n,o,c),e.moveToBookmark({id:r,keep:!0,forward:l}),{id:r,forward:l}},ml=T(dl,R,!0),fl=e=>{const t=t=>t(e),n=N(e),o=()=>r,r={tag:!0,inner:e,fold:(t,n)=>n(e),isValue:M,isError:L,map:t=>pl.value(t(e)),mapError:o,bind:t,exists:t,forall:t,getOr:n,or:o,getOrThunk:n,orThunk:o,getOrDie:n,each:t=>{t(e)},toOptional:()=>I.some(e)};return r},gl=e=>{const t=()=>n,n={tag:!1,inner:e,fold:(t,n)=>t(e),isValue:L,isError:M,map:t,mapError:t=>pl.error(t(e)),bind:t,exists:L,forall:M,getOr:R,or:R,getOrThunk:P,orThunk:P,getOrDie:B(String(e)),each:_,toOptional:I.none};return n},pl={value:fl,error:gl,fromOption:(e,t)=>e.fold((()=>gl(t)),fl)},hl=e=>{if(!p(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],n={};return V(e,((o,r)=>{const s=me(o);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],i=o[a];if(void 0!==n[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!p(i))throw new Error("case arguments must be an array");t.push(a),n[a]=(...n)=>{const o=n.length;if(o!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+o);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,n)},match:e=>{const o=me(e);if(t.length!==o.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+o.join(","));if(!ne(t,(e=>H(o,e))))throw new Error("Not all branches were specified when using match. Specified: "+o.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,n)},log:e=>{console.log(e,{constructors:t,constructor:a,params:n})}}}})),n};hl([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const bl=e=>"inline-command"===e.type||"inline-format"===e.type,vl=e=>"block-command"===e.type||"block-format"===e.type,yl=e=>{const t=t=>pl.error({message:t,pattern:e}),n=(n,o,r)=>{if(void 0!==e.format){let r;if(p(e.format)){if(!ne(e.format,m))return t(n+" pattern has non-string items in the `format` array");r=e.format}else{if(!m(e.format))return t(n+" pattern has non-string `format` parameter");r=[e.format]}return pl.value(o(r))}return void 0!==e.cmd?m(e.cmd)?pl.value(r(e.cmd,e.value)):t(n+" pattern has non-string `cmd` parameter"):t(n+" pattern is missing both `format` and `cmd` parameters")};if(!f(e))return t("Raw pattern is not an object");if(!m(e.start))return t("Raw pattern is missing `start` parameter");if(void 0!==e.end){if(!m(e.end))return t("Inline pattern has non-string `end` parameter");if(0===e.start.length&&0===e.end.length)return t("Inline pattern has empty `start` and `end` parameters");let o=e.start,r=e.end;return 0===r.length&&(r=o,o=""),n("Inline",(e=>({type:"inline-format",start:o,end:r,format:e})),((e,t)=>({type:"inline-command",start:o,end:r,cmd:e,value:t})))}return void 0!==e.replacement?m(e.replacement)?0===e.start.length?t("Replacement pattern has empty `start` parameter"):pl.value({type:"inline-command",start:"",end:e.start,cmd:"mceInsertContent",value:e.replacement}):t("Replacement pattern has non-string `replacement` parameter"):0===e.start.length?t("Block pattern has empty `start` parameter"):n("Block",(t=>({type:"block-format",start:e.start,format:t[0]})),((t,n)=>({type:"block-command",start:e.start,cmd:t,value:n})))},Cl=e=>Y(e,vl),wl=e=>Y(e,bl),xl=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{n.push(e)}))})),{errors:t,values:n}})(q(e,yl));return V(t.errors,(e=>console.error(e.message,e.pattern))),t.values},El=xt().deviceType,_l=El.isTouch(),kl=za.DOM,Sl=e=>u(e,RegExp),Nl=e=>t=>t.options.get(e),Rl=e=>m(e)||f(e),Al=(e,t="")=>n=>{const o=m(n);if(o){if(-1!==n.indexOf("=")){const r=(e=>{const t=e.indexOf("=")>0?e.split(/[;,](?![^=;,]*(?:[;,]|$))/):e.split(",");return X(t,((e,t)=>{const n=t.split("="),o=n[0],r=n.length>1?n[1]:o;return e[Ve(o)]=Ve(r),e}),{})})(n);return{value:xe(r,e.id).getOr(t),valid:o}}return{value:n,valid:o}}return{valid:!1,message:"Must be a string."}},Tl=Nl("iframe_attrs"),Ol=Nl("doctype"),Bl=Nl("document_base_url"),Pl=Nl("body_id"),Dl=Nl("body_class"),Ll=Nl("content_security_policy"),Ml=Nl("br_in_pre"),Il=Nl("forced_root_block"),Fl=Nl("forced_root_block_attrs"),Ul=Nl("newline_behavior"),zl=Nl("br_newline_selector"),jl=Nl("no_newline_selector"),Hl=Nl("keep_styles"),$l=Nl("end_container_on_empty_block"),ql=Nl("automatic_uploads"),Vl=Nl("images_reuse_filename"),Wl=Nl("images_replace_blob_uris"),Kl=Nl("icons"),Yl=Nl("icons_url"),Gl=Nl("images_upload_url"),Xl=Nl("images_upload_base_path"),Ql=Nl("images_upload_credentials"),Jl=Nl("images_upload_handler"),Zl=Nl("content_css_cors"),ed=Nl("referrer_policy"),td=Nl("language"),nd=Nl("language_url"),od=Nl("indent_use_margin"),rd=Nl("indentation"),sd=Nl("content_css"),ad=Nl("content_style"),id=Nl("font_css"),ld=Nl("directionality"),dd=Nl("inline_boundaries_selector"),cd=Nl("object_resizing"),ud=Nl("resize_img_proportional"),md=Nl("placeholder"),fd=Nl("event_root"),gd=Nl("service_message"),pd=Nl("theme"),hd=Nl("theme_url"),bd=Nl("model"),vd=Nl("model_url"),yd=Nl("inline_boundaries"),Cd=Nl("formats"),wd=Nl("preview_styles"),xd=Nl("format_empty_lines"),Ed=Nl("format_noneditable_selector"),_d=Nl("custom_ui_selector"),kd=Nl("inline"),Sd=Nl("hidden_input"),Nd=Nl("submit_patch"),Rd=Nl("add_form_submit_trigger"),Ad=Nl("add_unload_trigger"),Td=Nl("custom_undo_redo_levels"),Od=Nl("disable_nodechange"),Bd=Nl("readonly"),Pd=Nl("editable_root"),Dd=Nl("content_css_cors"),Ld=Nl("plugins"),Md=Nl("external_plugins"),Id=Nl("block_unsupported_drop"),Fd=Nl("visual"),Ud=Nl("visual_table_class"),zd=Nl("visual_anchor_class"),jd=Nl("iframe_aria_text"),Hd=Nl("setup"),$d=Nl("init_instance_callback"),qd=Nl("urlconverter_callback"),Vd=Nl("auto_focus"),Wd=Nl("browser_spellcheck"),Kd=Nl("protect"),Yd=Nl("paste_block_drop"),Gd=Nl("paste_data_images"),Xd=Nl("paste_preprocess"),Qd=Nl("paste_postprocess"),Jd=Nl("newdocument_content"),Zd=Nl("paste_webkit_styles"),ec=Nl("paste_remove_styles_if_webkit"),tc=Nl("paste_merge_formats"),nc=Nl("smart_paste"),oc=Nl("paste_as_text"),rc=Nl("paste_tab_spaces"),sc=Nl("allow_html_data_urls"),ac=Nl("text_patterns"),ic=Nl("text_patterns_lookup"),lc=Nl("noneditable_class"),dc=Nl("editable_class"),cc=Nl("noneditable_regexp"),uc=Nl("preserve_cdata"),mc=Nl("highlight_on_focus"),fc=Nl("xss_sanitization"),gc=Nl("init_content_sync"),pc=e=>Pt.explode(e.options.get("images_file_types")),hc=Nl("table_tab_navigation"),bc=Nl("details_initial_state"),vc=Nl("details_serialized_state"),yc=Nl("force_hex_color"),Cc=Nl("sandbox_iframes"),wc=qo,xc=er,Ec=e=>{const t=e.parentNode;t&&t.removeChild(e)},_c=e=>{const t=Dr(e);return{count:e.length-t.length,text:t}},kc=e=>{let t;for(;-1!==(t=e.data.lastIndexOf(Br));)e.deleteData(t,1)},Sc=(e,t)=>(Rc(e),t),Nc=(e,t)=>Vi.isTextPosition(t)?((e,t)=>xc(e)&&t.container()===e?((e,t)=>{const n=_c(e.data.substr(0,t.offset())),o=_c(e.data.substr(t.offset()));return(n.text+o.text).length>0?(kc(e),Vi(e,t.offset()-n.count)):t})(e,t):Sc(e,t))(e,t):((e,t)=>t.container()===e.parentNode?((e,t)=>{const n=t.container(),o=((e,t)=>{const n=j(e,t);return-1===n?I.none():I.some(n)})(ce(n.childNodes),e).map((e=>e<t.offset()?Vi(n,t.offset()-1):t)).getOr(t);return Rc(e),o})(e,t):Sc(e,t))(e,t),Rc=e=>{wc(e)&&Ur(e)&&(zr(e)?e.removeAttribute("data-mce-caret"):Ec(e)),xc(e)&&(kc(e),0===e.data.length&&Ec(e))},Ac=dr,Tc=mr,Oc=cr,Bc=(e,t,n)=>{const o=yi(t.getBoundingClientRect(),n);let r,s;if("BODY"===e.tagName){const t=e.ownerDocument.documentElement;r=e.scrollLeft||t.scrollLeft,s=e.scrollTop||t.scrollTop}else{const t=e.getBoundingClientRect();r=e.scrollLeft-t.left,s=e.scrollTop-t.top}o.left+=r,o.right+=r,o.top+=s,o.bottom+=s,o.width=1;let a=t.offsetWidth-t.clientWidth;return a>0&&(n&&(a*=-1),o.left+=a,o.right+=a),o},Pc=(e,t,n,o)=>{const r=Xa();let s,a;const i=Il(e),l=e.dom,d=()=>{(e=>{var t,n;const o=Uo(yn(e),"*[contentEditable=false],video,audio,embed,object");for(let e=0;e<o.length;e++){const r=o[e].dom;let s=r.previousSibling;if(qr(s)){const e=s.data;1===e.length?null===(t=s.parentNode)||void 0===t||t.removeChild(s):s.deleteData(e.length-1,1)}s=r.nextSibling,$r(s)&&(1===s.data.length?null===(n=s.parentNode)||void 0===n||n.removeChild(s):s.deleteData(0,1))}})(t),a&&(Rc(a),a=null),r.on((e=>{l.remove(e.caret),r.clear()})),s&&(clearInterval(s),s=void 0)};return{show:(e,c)=>{let u;if(d(),Oc(c))return null;if(!n(c))return a=((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br),r=e.parentNode;if(t){const t=e.previousSibling;if(Mr(t)){if(Ur(t))return t;if(qr(t))return t.splitText(t.data.length-1)}null==r||r.insertBefore(o,e)}else{const t=e.nextSibling;if(Mr(t)){if(Ur(t))return t;if($r(t))return t.splitText(1),t}e.nextSibling?null==r||r.insertBefore(o,e.nextSibling):null==r||r.appendChild(o)}return o})(c,e),u=c.ownerDocument.createRange(),Lc(a.nextSibling)?(u.setStart(a,0),u.setEnd(a,0)):(u.setStart(a,1),u.setEnd(a,1)),u;{const n=((e,t,n)=>{var o;const r=(null!==(o=t.ownerDocument)&&void 0!==o?o:document).createElement(e);r.setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(Tr().dom);const s=t.parentNode;return n?null==s||s.insertBefore(r,t):t.nextSibling?null==s||s.insertBefore(r,t.nextSibling):null==s||s.appendChild(r),r})(i,c,e),d=Bc(t,c,e);l.setStyle(n,"top",d.top),a=n;const m=l.create("div",{class:"mce-visual-caret","data-mce-bogus":"all"});l.setStyles(m,{...d}),l.add(t,m),r.set({caret:m,element:c,before:e}),e&&l.addClass(m,"mce-visual-caret-before"),s=setInterval((()=>{r.on((e=>{o()?l.toggleClass(e.caret,"mce-visual-caret-hidden"):l.addClass(e.caret,"mce-visual-caret-hidden")}))}),500),u=c.ownerDocument.createRange(),u.setStart(n,0),u.setEnd(n,0)}return u},hide:d,getCss:()=>".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}",reposition:()=>{r.on((e=>{const n=Bc(t,e.element,e.before);l.setStyles(e.caret,{...n})}))},destroy:()=>clearInterval(s)}},Dc=()=>At.browser.isFirefox(),Lc=e=>Ac(e)||Tc(e),Mc=e=>(Lc(e)||Qo(e)&&Dc())&&Tn(yn(e)).exists(oo),Ic=lr,Fc=dr,Uc=mr,zc=Yo("display","block table table-cell table-caption list-item"),jc=Ur,Hc=Ir,$c=qo,qc=er,Vc=ts,Wc=e=>e>0,Kc=e=>e<0,Yc=(e,t)=>{let n;for(;n=e(t);)if(!Hc(n))return n;return null},Gc=(e,t,n,o,r)=>{const s=new jo(e,o),a=Fc(e)||Hc(e);let i;if(Kc(t)){if(a&&(i=Yc(s.prev.bind(s),!0),n(i)))return i;for(;i=Yc(s.prev.bind(s),r);)if(n(i))return i}if(Wc(t)){if(a&&(i=Yc(s.next.bind(s),!0),n(i)))return i;for(;i=Yc(s.next.bind(s),r);)if(n(i))return i}return null},Xc=(e,t)=>{for(;e&&e!==t;){if(zc(e))return e;e=e.parentNode}return null},Qc=(e,t,n)=>Xc(e.container(),n)===Xc(t.container(),n),Jc=(e,t)=>{if(!t)return I.none();const n=t.container(),o=t.offset();return $c(n)?I.from(n.childNodes[o+e]):I.none()},Zc=(e,t)=>{var n;const o=(null!==(n=t.ownerDocument)&&void 0!==n?n:document).createRange();return e?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),o},eu=(e,t,n)=>Xc(t,e)===Xc(n,e),tu=(e,t,n)=>{const o=e?"previousSibling":"nextSibling";let r=n;for(;r&&r!==t;){let e=r[o];if(e&&jc(e)&&(e=e[o]),Fc(e)||Uc(e)){if(eu(t,e,r))return e;break}if(Vc(e))break;r=r.parentNode}return null},nu=T(Zc,!0),ou=T(Zc,!1),ru=(e,t,n)=>{let o;const r=T(tu,!0,t),s=T(tu,!1,t),a=n.startContainer,i=n.startOffset;if(Ir(a)){const e=qc(a)?a.parentNode:a,t=e.getAttribute("data-mce-caret");if("before"===t&&(o=e.nextSibling,Mc(o)))return nu(o);if("after"===t&&(o=e.previousSibling,Mc(o)))return ou(o)}if(!n.collapsed)return n;if(er(a)){if(jc(a)){if(1===e){if(o=s(a),o)return nu(o);if(o=r(a),o)return ou(o)}if(-1===e){if(o=r(a),o)return ou(o);if(o=s(a),o)return nu(o)}return n}if(qr(a)&&i>=a.data.length-1)return 1===e&&(o=s(a),o)?nu(o):n;if($r(a)&&i<=1)return-1===e&&(o=r(a),o)?ou(o):n;if(i===a.data.length)return o=s(a),o?nu(o):n;if(0===i)return o=r(a),o?ou(o):n}return n},su=(e,t)=>Jc(e?0:-1,t).filter(Fc),au=(e,t,n)=>{const o=ru(e,t,n);return-1===e?Vi.fromRangeStart(o):Vi.fromRangeEnd(o)},iu=e=>I.from(e.getNode()).map(yn),lu=(e,t)=>{let n=t;for(;n=e(n);)if(n.isVisible())return n;return n},du=(e,t)=>{const n=Qc(e,t);return!(n||!ar(e.getNode()))||n};var cu;!function(e){e[e.Backwards=-1]="Backwards",e[e.Forwards=1]="Forwards"}(cu||(cu={}));const uu=dr,mu=er,fu=qo,gu=ar,pu=ts,hu=e=>Jr(e)||(e=>!!ns(e)&&!X(ce(e.getElementsByTagName("*")),((e,t)=>e||Kr(t)),!1))(e),bu=os,vu=(e,t)=>e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null,yu=(e,t)=>{if(Wc(e)){if(pu(t.previousSibling)&&!mu(t.previousSibling))return Vi.before(t);if(mu(t))return Vi(t,0)}if(Kc(e)){if(pu(t.nextSibling)&&!mu(t.nextSibling))return Vi.after(t);if(mu(t))return Vi(t,t.data.length)}return Kc(e)?gu(t)?Vi.before(t):Vi.after(t):Vi.before(t)},Cu=(e,t,n)=>{let o,r,s,a;if(!fu(n)||!t)return null;if(t.isEqual(Vi.after(n))&&n.lastChild){if(a=Vi.after(n.lastChild),Kc(e)&&pu(n.lastChild)&&fu(n.lastChild))return gu(n.lastChild)?Vi.before(n.lastChild):a}else a=t;const i=a.container();let l=a.offset();if(mu(i)){if(Kc(e)&&l>0)return Vi(i,--l);if(Wc(e)&&l<i.length)return Vi(i,++l);o=i}else{if(Kc(e)&&l>0&&(r=vu(i,l-1),pu(r)))return!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,s.data.length):Vi.after(s):mu(r)?Vi(r,r.data.length):Vi.before(r);if(Wc(e)&&l<i.childNodes.length&&(r=vu(i,l),pu(r)))return gu(r)?((e,t)=>{const n=t.nextSibling;return n&&pu(n)?mu(n)?Vi(n,0):Vi.before(n):Cu(cu.Forwards,Vi.after(t),e)})(n,r):!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,0):Vi.before(s):mu(r)?Vi(r,0):Vi.after(r);o=r||a.getNode()}if(o&&(Wc(e)&&a.isAtEnd()||Kc(e)&&a.isAtStart())&&(o=Gc(o,e,M,n,!0),bu(o,n)))return yu(e,o);r=o?Gc(o,e,bu,n):o;const d=Pe(Y(((e,t)=>{const n=[];let o=e;for(;o&&o!==t;)n.push(o),o=o.parentNode;return n})(i,n),uu));return!d||r&&d.contains(r)?r?yu(e,r):null:(a=Wc(e)?Vi.after(d):Vi.before(d),a)},wu=e=>({next:t=>Cu(cu.Forwards,t,e),prev:t=>Cu(cu.Backwards,t,e)}),xu=e=>Vi.isTextPosition(e)?0===e.offset():ts(e.getNode()),Eu=e=>{if(Vi.isTextPosition(e)){const t=e.container();return e.offset()===t.data.length}return ts(e.getNode(!0))},_u=(e,t)=>!Vi.isTextPosition(e)&&!Vi.isTextPosition(t)&&e.getNode()===t.getNode(!0),ku=(e,t,n)=>{const o=wu(t);return I.from(e?o.next(n):o.prev(n))},Su=(e,t,n)=>ku(e,t,n).bind((o=>Qc(n,o,t)&&((e,t,n)=>{return e?!_u(t,n)&&(o=t,!(!Vi.isTextPosition(o)&&ar(o.getNode())))&&Eu(t)&&xu(n):!_u(n,t)&&xu(t)&&Eu(n);var o})(e,n,o)?ku(e,t,o):I.some(o))),Nu=(e,t,n,o)=>Su(e,t,n).bind((n=>o(n)?Nu(e,t,n,o):I.some(n))),Ru=(e,t)=>{const n=e?t.firstChild:t.lastChild;return er(n)?I.some(Vi(n,e?0:n.data.length)):n?ts(n)?I.some(e?Vi.before(n):ar(o=n)?Vi.before(o):Vi.after(o)):((e,t,n)=>{const o=e?Vi.before(n):Vi.after(n);return ku(e,t,o)})(e,t,n):I.none();var o},Au=T(ku,!0),Tu=T(ku,!1),Ou=T(Ru,!0),Bu=T(Ru,!1),Pu="_mce_caret",Du=e=>qo(e)&&e.id===Pu,Lu=(e,t)=>{let n=t;for(;n&&n!==e;){if(Du(n))return n;n=n.parentNode}return null},Mu=e=>Ee(e,"name"),Iu=e=>Pt.isArray(e.start),Fu=e=>!(!Mu(e)&&b(e.forward))||e.forward,Uu=(e,t)=>(qo(t)&&e.isBlock(t)&&!t.innerHTML&&(t.innerHTML='<br data-mce-bogus="1" />'),t),zu=(e,t)=>Bu(e).fold(L,(e=>(t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0))),ju=(e,t,n)=>!(!(e=>!e.hasChildNodes())(t)||!Lu(e,t)||(((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br);e.appendChild(o),t.setStart(o,0),t.setEnd(o,0)})(t,n),0)),Hu=(e,t,n,o)=>{const r=n[t?"start":"end"],s=e.getRoot();if(r){let e=s,n=r[0];for(let t=r.length-1;e&&t>=1;t--){const n=e.childNodes;if(ju(s,e,o))return!0;if(r[t]>n.length-1)return!!ju(s,e,o)||zu(e,o);e=n[r[t]]}er(e)&&(n=Math.min(r[0],e.data.length)),qo(e)&&(n=Math.min(r[0],e.childNodes.length)),t?o.setStart(e,n):o.setEnd(e,n)}return!0},$u=e=>er(e)&&e.data.length>0,qu=(e,t,n)=>{const o=e.get(n.id+"_"+t),r=null==o?void 0:o.parentNode,s=n.keep;if(o&&r){let a,i;if("start"===t?s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.nextSibling)?(a=o.nextSibling,i=0):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)+1):(a=r,i=e.nodeIndex(o)):s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)):(a=r,i=e.nodeIndex(o)),!s){const r=o.previousSibling,s=o.nextSibling;let l;for(Pt.each(Pt.grep(o.childNodes),(e=>{er(e)&&(e.data=e.data.replace(/\uFEFF/g,""))}));l=e.get(n.id+"_"+t);)e.remove(l,!0);if(er(s)&&er(r)&&!At.browser.isOpera()){const t=r.data.length;r.appendData(s.data),e.remove(s),a=r,i=t}}return I.some(Vi(a,i))}return I.none()},Vu=(e,t,n)=>((e,t,n=!1)=>2===t?dl(Dr,n,e):3===t?(e=>{const t=e.getRng();return{start:tl(e.dom.getRoot(),Vi.fromRangeStart(t)),end:tl(e.dom.getRoot(),Vi.fromRangeEnd(t)),forward:e.isForward()}})(e):t?(e=>({rng:e.getRng(),forward:e.isForward()}))(e):ul(e,!1))(e,t,n),Wu=(e,t)=>{((e,t)=>{const n=e.dom;if(t){if(Iu(t))return((e,t)=>{const n=e.createRng();return Hu(e,!0,t,n)&&Hu(e,!1,t,n)?I.some({range:n,forward:Fu(t)}):I.none()})(n,t);if((e=>m(e.start))(t))return((e,t)=>{const n=I.from(nl(e.getRoot(),t.start)),o=I.from(nl(e.getRoot(),t.end));return Mt(n,o,((n,o)=>{const r=e.createRng();return r.setStart(n.container(),n.offset()),r.setEnd(o.container(),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if((e=>Ee(e,"id"))(t))return((e,t)=>{const n=qu(e,"start",t),o=qu(e,"end",t);return Mt(n,o.or(n),((n,o)=>{const r=e.createRng();return r.setStart(Uu(e,n.container()),n.offset()),r.setEnd(Uu(e,o.container()),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if(Mu(t))return((e,t)=>I.from(e.select(t.name)[t.index]).map((t=>{const n=e.createRng();return n.selectNode(t),{range:n,forward:!0}})))(n,t);if((e=>Ee(e,"rng"))(t))return I.some({range:t.rng,forward:Fu(t)})}return I.none()})(e,t).each((({range:t,forward:n})=>{e.setRng(t,n)}))},Ku=e=>qo(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type"),Yu=(Gu=br,e=>Gu===e);var Gu;const Xu=e=>""!==e&&-1!==" \f\n\r\t\v".indexOf(e),Qu=e=>!Xu(e)&&!Yu(e)&&!vr(e),Ju=e=>{const t=[];if(e)for(let n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},Zu=(e,t)=>{const n=Uo(t,"td[data-mce-selected],th[data-mce-selected]");return n.length>0?n:(e=>Y((e=>te(e,(e=>{const t=_i(e);return t?[yn(t)]:[]})))(e),Rr))(e)},em=e=>Zu(Ju(e.selection.getSel()),yn(e.getBody())),tm=(e,t)=>eo(e,"table",t),nm=e=>Fn(e).fold(N([e]),(t=>[e].concat(nm(t)))),om=e=>Un(e).fold(N([e]),(t=>"br"===Ht(t)?Bn(t).map((t=>[e].concat(om(t)))).getOr([]):[e].concat(om(t)))),rm=(e,t)=>Mt((e=>{const t=e.startContainer,n=e.startOffset;return er(t)?0===n?I.some(yn(t)):I.none():I.from(t.childNodes[n]).map(yn)})(t),(e=>{const t=e.endContainer,n=e.endOffset;return er(t)?n===t.data.length?I.some(yn(t)):I.none():I.from(t.childNodes[n-1]).map(yn)})(t),((t,n)=>{const o=J(nm(e),T(_n,t)),r=J(om(e),T(_n,n));return o.isSome()&&r.isSome()})).getOr(!1),sm=(e,t,n,o)=>{const r=n,s=new jo(n,r),a=ye(e.schema.getMoveCaretBeforeOnEnterElements(),((e,t)=>!H(["td","th","table"],t.toLowerCase())));let i=n;do{if(er(i)&&0!==Pt.trim(i.data).length)return void(o?t.setStart(i,0):t.setEnd(i,i.data.length));if(a[i.nodeName])return void(o?t.setStartBefore(i):"BR"===i.nodeName?t.setEndBefore(i):t.setEndAfter(i))}while(i=o?s.next():s.prev());"BODY"===r.nodeName&&(o?t.setStart(r,0):t.setEnd(r,r.childNodes.length))},am=e=>{const t=e.selection.getSel();return C(t)&&t.rangeCount>0},im=(e,t)=>{const n=em(e);n.length>0?V(n,(n=>{const o=n.dom,r=e.dom.createRng();r.setStartBefore(o),r.setEndAfter(o),t(r,!0)})):t(e.selection.getRng(),!1)},lm=(e,t,n)=>{const o=ul(e,t);n(o),e.moveToBookmark(o)},dm=e=>x(null==e?void 0:e.nodeType),cm=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),um=(e,t,n)=>{const{selection:o,dom:r}=e,s=o.getNode(),a=dr(s);lm(o,!0,(()=>{t()})),a&&dr(s)&&r.isChildOf(s,e.getBody())?e.selection.select(s):n(o.getStart())&&mm(r,o)},mm=(e,t)=>{var n,o;const r=t.getRng(),{startContainer:s,startOffset:a}=r;if(!((e,t)=>{if(cm(t)&&!/^(TD|TH)$/.test(t.nodeName)){const n=e.getAttrib(t,"data-mce-selected"),o=parseInt(n,10);return!isNaN(o)&&o>0}return!1})(e,t.getNode())&&qo(s)){const i=s.childNodes,l=e.getRoot();let d;if(a<i.length){const t=i[a];d=new jo(t,null!==(n=e.getParent(t,e.isBlock))&&void 0!==n?n:l)}else{const t=i[i.length-1];d=new jo(t,null!==(o=e.getParent(t,e.isBlock))&&void 0!==o?o:l),d.next(!0)}for(let n=d.current();n;n=d.next()){if("false"===e.getContentEditable(n))return;if(er(n)&&!hm(n))return r.setStart(n,0),void t.setRng(r)}}},fm=(e,t,n)=>{if(e){const o=t?"nextSibling":"previousSibling";for(e=n?e:e[o];e;e=e[o])if(qo(e)||!hm(e))return e}},gm=(e,t)=>!!e.getTextBlockElements()[t.nodeName.toLowerCase()]||Ts(e,t),pm=(e,t,n)=>e.schema.isValidChild(t,n),hm=(e,t=!1)=>{if(C(e)&&er(e)){const n=t?e.data.replace(/ /g,"\xa0"):e.data;return ss(n)}return!1},bm=(e,t)=>{const n=e.dom;return cm(t)&&"false"===n.getContentEditable(t)&&((e,t)=>{const n="[data-mce-cef-wrappable]",o=Ed(e),r=Ge(o)?n:`${n},${o}`;return xn(yn(t),r)})(e,t)&&0===n.select('[contenteditable="true"]',t).length},vm=(e,t)=>w(e)?e(t):(C(t)&&(e=e.replace(/%(\w+)/g,((e,n)=>t[n]||e))),e),ym=(e,t)=>(t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()),Cm=(e,t)=>{if(y(e))return null;{let n=String(e);return"color"!==t&&"backgroundColor"!==t||(n=Ca(n)),"fontWeight"===t&&700===e&&(n="bold"),"fontFamily"===t&&(n=n.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),n}},wm=(e,t,n)=>{const o=e.getStyle(t,n);return Cm(o,n)},xm=(e,t)=>{let n;return e.getParent(t,(t=>!!qo(t)&&(n=e.getStyle(t,"text-decoration"),!!n&&"none"!==n))),n},Em=(e,t,n)=>e.getParents(t,n,e.getRoot()),_m=(e,t,n)=>{const o=e.formatter.get(t);return C(o)&&$(o,n)},km=e=>_e(e,"block"),Sm=e=>_e(e,"selector"),Nm=e=>_e(e,"inline"),Rm=e=>Sm(e)&&!1!==e.expand&&!Nm(e),Am=e=>(e=>{const t=[];let n=e;for(;n;){if(er(n)&&n.data!==Br||n.childNodes.length>1)return[];qo(n)&&t.push(n),n=n.firstChild}return t})(e).length>0,Tm=e=>Du(e.dom)&&Am(e.dom),Om=Ku,Bm=Em,Pm=hm,Dm=gm,Lm=(e,t)=>{let n=t;for(;n;){if(qo(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Mm=(e,t,n,o)=>{const r=t.data;if(e){for(let e=n;e>0;e--)if(o(r.charAt(e-1)))return e}else for(let e=n;e<r.length;e++)if(o(r.charAt(e)))return e;return-1},Im=(e,t,n)=>Mm(e,t,n,(e=>Yu(e)||Xu(e))),Fm=(e,t,n)=>Mm(e,t,n,Qu),Um=(e,t,n,o,r,s)=>{let a;const i=e.getParent(n,e.isBlock)||t,l=(t,n,o)=>{const s=hi(e),l=r?s.backwards:s.forwards;return I.from(l(t,n,((e,t)=>Om(e.parentNode)?-1:(a=e,o(r,e,t))),i))};return l(n,o,Im).bind((e=>s?l(e.container,e.offset+(r?-1:0),Fm):I.some(e))).orThunk((()=>a?I.some({container:a,offset:r?0:a.length}):I.none()))},zm=(e,t,n,o,r)=>{const s=o[r];er(o)&&Ge(o.data)&&s&&(o=s);const a=Bm(e,o);for(let o=0;o<a.length;o++)for(let r=0;r<t.length;r++){const s=t[r];if((!C(s.collapsed)||s.collapsed===n.collapsed)&&Sm(s)&&e.is(a[o],s.selector))return a[o]}return o},jm=(e,t,n,o)=>{var r;let s=n;const a=e.getRoot(),i=t[0];if(km(i)&&(s=i.wrapper?null:e.getParent(n,i.block,a)),!s){const t=null!==(r=e.getParent(n,"LI,TD,TH,SUMMARY"))&&void 0!==r?r:a;s=e.getParent(er(n)?n.parentNode:n,(t=>t!==a&&Dm(e.schema,t)),t)}if(s&&km(i)&&i.wrapper&&(s=Bm(e,s,"ul,ol").reverse()[0]||s),!s)for(s=n;s&&s[o]&&!e.isBlock(s[o])&&(s=s[o],!ym(s,"br")););return s||n},Hm=(e,t,n,o)=>{const r=n.parentNode;return!C(n[o])&&(!(r!==t&&!y(r)&&!e.isBlock(r))||Hm(e,t,r,o))},$m=(e,t,n,o,r)=>{let s=n;const a=r?"previousSibling":"nextSibling",i=e.getRoot();if(er(n)&&!Pm(n)&&(r?o>0:o<n.data.length))return n;for(;s;){if(!t[0].block_expand&&e.isBlock(s))return s;for(let t=s[a];t;t=t[a]){const n=er(t)&&!Hm(e,i,t,a);if(!Om(t)&&(!ar(l=t)||!l.getAttribute("data-mce-bogus")||l.nextSibling)&&!Pm(t,n))return s}if(s===i||s.parentNode===i){n=s;break}s=s.parentNode}var l;return n},qm=e=>Om(e.parentNode)||Om(e),Vm=(e,t,n,o=!1)=>{let{startContainer:r,startOffset:s,endContainer:a,endOffset:i}=t;const l=n[0];return qo(r)&&r.hasChildNodes()&&(r=ki(r,s),er(r)&&(s=0)),qo(a)&&a.hasChildNodes()&&(a=ki(a,t.collapsed?i:i-1),er(a)&&(i=a.data.length)),r=Lm(e,r),a=Lm(e,a),qm(r)&&(r=Om(r)?r:r.parentNode,r=t.collapsed?r.previousSibling||r:r.nextSibling||r,er(r)&&(s=t.collapsed?r.length:0)),qm(a)&&(a=Om(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,er(a)&&(i=t.collapsed?0:a.length)),t.collapsed&&(Um(e,e.getRoot(),r,s,!0,o).each((({container:e,offset:t})=>{r=e,s=t})),Um(e,e.getRoot(),a,i,!1,o).each((({container:e,offset:t})=>{a=e,i=t}))),(Nm(l)||l.block_expand)&&(Nm(l)&&er(r)&&0!==s||(r=$m(e,n,r,s,!0)),Nm(l)&&er(a)&&i!==a.data.length||(a=$m(e,n,a,i,!1))),Rm(l)&&(r=zm(e,n,t,r,"previousSibling"),a=zm(e,n,t,a,"nextSibling")),(km(l)||Sm(l))&&(r=jm(e,n,r,"previousSibling"),a=jm(e,n,a,"nextSibling"),km(l)&&(e.isBlock(r)||(r=$m(e,n,r,s,!0)),e.isBlock(a)||(a=$m(e,n,a,i,!1)))),qo(r)&&r.parentNode&&(s=e.nodeIndex(r),r=r.parentNode),qo(a)&&a.parentNode&&(i=e.nodeIndex(a)+1,a=a.parentNode),{startContainer:r,startOffset:s,endContainer:a,endOffset:i}},Wm=(e,t,n)=>{var o;const r=t.startOffset,s=ki(t.startContainer,r),a=t.endOffset,i=ki(t.endContainer,a-1),l=e=>{const t=e[0];er(t)&&t===s&&r>=t.data.length&&e.splice(0,1);const n=e[e.length-1];return 0===a&&e.length>0&&n===i&&er(n)&&e.splice(e.length-1,1),e},d=(e,t,n)=>{const o=[];for(;e&&e!==n;e=e[t])o.push(e);return o},c=(t,n)=>e.getParent(t,(e=>e.parentNode===n),n),u=(e,t,o)=>{const r=o?"nextSibling":"previousSibling";for(let s=e,a=s.parentNode;s&&s!==t;s=a){a=s.parentNode;const t=d(s===e?s:s[r],r);t.length&&(o||t.reverse(),n(l(t)))}};if(s===i)return n(l([s]));const m=null!==(o=e.findCommonAncestor(s,i))&&void 0!==o?o:e.getRoot();if(e.isChildOf(s,i))return u(s,m,!0);if(e.isChildOf(i,s))return u(i,m);const f=c(s,m)||s,g=c(i,m)||i;u(s,f,!0);const p=d(f===s?f:f.nextSibling,"nextSibling",g===i?g.nextSibling:g);p.length&&n(l(p)),u(i,g)},Km=['pre[class*=language-][contenteditable="false"]',"figure.image","div[data-ephox-embed-iri]","div.tiny-pageembed","div.mce-toc","div[data-mce-toc]"],Ym=(e,t,n,o,r,s)=>{const{uid:a=t,...i}=n;un(e,Za()),Jt(e,`${ti()}`,a),Jt(e,`${ei()}`,o);const{attributes:l={},classes:d=[]}=r(a,i);if(Zt(e,l),((e,t)=>{V(t,(t=>{un(e,t)}))})(e,d),s){d.length>0&&Jt(e,`${oi()}`,d.join(","));const t=me(l);t.length>0&&Jt(e,`${ri()}`,t.join(","))}},Gm=(e,t,n,o,r)=>{const s=bn("span",e);return Ym(s,t,n,o,r,!1),s},Xm=(e,t,n,o,r,s)=>{const a=[],i=Gm(e.getDoc(),n,s,o,r),l=Xa(),d=()=>{l.clear()},c=e=>{V(e,u)},u=t=>{switch(((e,t,n,o)=>An(t).fold((()=>"skipping"),(r=>"br"===o||(e=>Kt(e)&&Cr(e)===Br)(t)?"valid":(e=>Wt(e)&&gn(e,Za()))(t)?"existing":Du(t.dom)?"caret":$(Km,(e=>xn(t,e)))?"valid-block":pm(e,n,o)&&pm(e,Ht(r),n)?"valid":"invalid-child")))(e,t,"span",Ht(t))){case"invalid-child":{d();const e=Mn(t);c(e),d();break}case"valid-block":d(),Ym(t,n,s,o,r,!0);break;case"valid":{const e=l.get().getOrThunk((()=>{const e=fi(i);return a.push(e),l.set(e),e}));yo(t,e);break}}};return Wm(e.dom,t,(e=>{d(),(e=>{const t=q(e,yn);c(t)})(e)})),a},Qm=e=>{const t=(()=>{const e={};return{register:(t,n)=>{e[t]={name:t,settings:n}},lookup:t=>xe(e,t).map((e=>e.settings)),getNames:()=>me(e)}})();((e,t)=>{const n=ei(),o=e=>I.from(e.attr(n)).bind(t.lookup),r=e=>{var t,n;e.attr(ti(),null),e.attr(ei(),null),e.attr(ni(),null);const o=I.from(e.attr(ri())).map((e=>e.split(","))).getOr([]),r=I.from(e.attr(oi())).map((e=>e.split(","))).getOr([]);V(o,(t=>e.attr(t,null)));const s=null!==(n=null===(t=e.attr("class"))||void 0===t?void 0:t.split(" "))&&void 0!==n?n:[],a=re(s,[Za()].concat(r));e.attr("class",a.length>0?a.join(" "):null),e.attr(oi(),null),e.attr(ri(),null)};e.serializer.addTempAttr(ni()),e.serializer.addAttributeFilter(n,(e=>{for(const t of e)o(t).each((e=>{!1===e.persistent&&("span"===t.name?t.unwrap():r(t))}))}))})(e,t);const n=((e,t)=>{const n=$a({}),o=()=>({listeners:[],previous:Xa()}),r=(e,t)=>{s(e,(e=>(t(e),e)))},s=(e,t)=>{const r=n.get(),s=t(xe(r,e).getOrThunk(o));r[e]=s,n.set(r)},a=(t,n)=>{V(li(e,t),(e=>{n?Jt(e,ni(),"true"):on(e,ni())}))},i=Ja((()=>{const n=ae(t.getNames());V(n,(t=>{s(t,(n=>{const o=n.previous.get();return ai(e,I.some(t)).fold((()=>{o.each((e=>{(e=>{r(e,(t=>{V(t.listeners,(t=>t(!1,e)))}))})(t),n.previous.clear(),a(e,!1)}))}),(({uid:e,name:t,elements:s})=>{Dt(o,e)||(o.each((e=>a(e,!1))),((e,t,n)=>{r(e,(o=>{V(o.listeners,(o=>o(!0,e,{uid:t,nodes:q(n,(e=>e.dom))})))}))})(t,e,s),n.previous.set(e),a(e,!0))})),{previous:n.previous,listeners:n.listeners}}))}))}),30);return e.on("remove",(()=>{i.cancel()})),e.on("NodeChange",(()=>{i.throttle()})),{addListener:(e,t)=>{s(e,(e=>({previous:e.previous,listeners:e.listeners.concat([t])})))}}})(e,t),o=Xt("span"),r=e=>{V(e,(e=>{o(e)?Eo(e):(e=>{fn(e,Za()),on(e,`${ti()}`),on(e,`${ei()}`),on(e,`${ni()}`);const t=tn(e,`${ri()}`).map((e=>e.split(","))).getOr([]),n=tn(e,`${oi()}`).map((e=>e.split(","))).getOr([]);var o;V(t,(t=>on(e,t))),o=e,V(n,(e=>{fn(o,e)})),on(e,`${oi()}`),on(e,`${ri()}`)})(e)}))};return{register:(e,n)=>{t.register(e,n)},annotate:(n,o)=>{t.lookup(n).each((t=>{((e,t,n,o)=>{e.undoManager.transact((()=>{const r=e.selection,s=r.getRng(),a=em(e).length>0,i=ui("mce-annotation");if(s.collapsed&&!a&&((e,t)=>{const n=Vm(e.dom,t,[{inline:"span"}]);t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)})(e,s),r.getRng().collapsed&&!a){const s=Gm(e.getDoc(),i,o,t,n.decorate);So(s,br),r.getRng().insertNode(s.dom),r.select(s.dom)}else lm(r,!1,(()=>{im(e,(r=>{Xm(e,r,i,t,n.decorate,o)}))}))}))})(e,n,t,o)}))},annotationChanged:(e,t)=>{n.addListener(e,t)},remove:t=>{ai(e,I.some(t)).each((({elements:t})=>{const n=e.selection.getBookmark();r(t),e.selection.moveToBookmark(n)}))},removeAll:t=>{const n=e.selection.getBookmark();ge(di(e,t),((e,t)=>{r(e)})),e.selection.moveToBookmark(n)},getAll:t=>{const n=di(e,t);return pe(n,(e=>q(e,(e=>e.dom))))}}},Jm=e=>({getBookmark:T(Vu,e),moveToBookmark:T(Wu,e)});Jm.isBookmarkNode=Ku;const Zm=(e,t,n)=>!n.collapsed&&$(n.getClientRects(),(n=>((e,t,n)=>t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom)(n,e,t))),ef=(e,t,n)=>{e.dispatch(t,n)},tf=(e,t,n,o)=>{e.dispatch("FormatApply",{format:t,node:n,vars:o})},nf=(e,t,n,o)=>{e.dispatch("FormatRemove",{format:t,node:n,vars:o})},of=(e,t)=>e.dispatch("SetContent",t),rf=(e,t)=>e.dispatch("GetContent",t),sf=(e,t)=>e.dispatch("PastePlainTextToggle",{state:t}),af={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,modifierPressed:e=>e.shiftKey||e.ctrlKey||e.altKey||af.metaKeyPressed(e),metaKeyPressed:e=>At.os.isMacOS()||At.os.isiOS()?e.metaKey:e.ctrlKey&&!e.altKey},lf="data-mce-selected",df=Math.abs,cf=Math.round,uf={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},mf=(e,t)=>{const n=t.dom,o=t.getDoc(),r=document,s=t.getBody();let a,i,l,d,c,u,m,f,g,p,h,b,v,y,w;const x=e=>C(e)&&(ir(e)||n.is(e,"figure.image")),E=e=>mr(e)||n.hasClass(e,"mce-preview-object"),_=e=>{const n=e.target;((e,t)=>{if((e=>"longpress"===e.type||0===e.type.indexOf("touch"))(e)){const n=e.touches[0];return x(e.target)&&!Zm(n.clientX,n.clientY,t)}return x(e.target)&&!Zm(e.clientX,e.clientY,t)})(e,t.selection.getRng())&&!e.isDefaultPrevented()&&t.selection.select(n)},k=e=>n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?[e,e.firstElementChild]:n.is(e,"figure.image")?[e.querySelector("img")]:[e],S=e=>{const o=cd(t);return!!o&&"false"!==e.getAttribute("data-mce-resize")&&e!==t.getBody()&&(n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?xn(yn(e.firstElementChild),o):xn(yn(e),o))},N=(e,o,r)=>{if(C(r)){const s=k(e);V(s,(e=>{e.style[o]||!t.schema.isValid(e.nodeName.toLowerCase(),o)?n.setStyle(e,o,r):n.setAttrib(e,o,""+r)}))}},R=(e,t,n)=>{N(e,"width",t),N(e,"height",n)},A=e=>{let o,r,c,C,_;o=e.screenX-u,r=e.screenY-m,b=o*d[2]+f,v=r*d[3]+g,b=b<5?5:b,v=v<5?5:v,c=(x(a)||E(a))&&!1!==ud(t)?!af.modifierPressed(e):af.modifierPressed(e),c&&(df(o)>df(r)?(v=cf(b*p),b=cf(v/p)):(b=cf(v/p),v=cf(b*p))),R(i,b,v),C=d.startPos.x+o,_=d.startPos.y+r,C=C>0?C:0,_=_>0?_:0,n.setStyles(l,{left:C,top:_,display:"block"}),l.innerHTML=b+" &times; "+v,d[2]<0&&i.clientWidth<=b&&n.setStyle(i,"left",void 0+(f-b)),d[3]<0&&i.clientHeight<=v&&n.setStyle(i,"top",void 0+(g-v)),o=s.scrollWidth-y,r=s.scrollHeight-w,o+r!==0&&n.setStyles(l,{left:C-o,top:_-r}),h||(((e,t,n,o,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:n,height:o,origin:r})})(t,a,f,g,"corner-"+d.name),h=!0)},T=()=>{const e=h;h=!1,e&&(N(a,"width",b),N(a,"height",v)),n.unbind(o,"mousemove",A),n.unbind(o,"mouseup",T),r!==o&&(n.unbind(r,"mousemove",A),n.unbind(r,"mouseup",T)),n.remove(i),n.remove(l),n.remove(c),O(a),e&&(((e,t,n,o,r)=>{e.dispatch("ObjectResized",{target:t,width:n,height:o,origin:r})})(t,a,b,v,"corner-"+d.name),n.setAttrib(a,"style",n.getAttrib(a,"style"))),t.nodeChanged()},O=e=>{M();const h=n.getPos(e,s),C=h.x,x=h.y,_=e.getBoundingClientRect(),N=_.width||_.right-_.left,O=_.height||_.bottom-_.top;a!==e&&(P(),a=e,b=v=0);const B=t.dispatch("ObjectSelected",{target:e});S(e)&&!B.isDefaultPrevented()?ge(uf,((e,t)=>{let h=n.get("mceResizeHandle"+t);h&&n.remove(h),h=n.add(s,"div",{id:"mceResizeHandle"+t,"data-mce-bogus":"all",class:"mce-resizehandle",unselectable:!0,style:"cursor:"+t+"-resize; margin:0; padding:0"}),n.bind(h,"mousedown",(h=>{h.stopImmediatePropagation(),h.preventDefault(),(h=>{const b=k(a)[0];var v;u=h.screenX,m=h.screenY,f=b.clientWidth,g=b.clientHeight,p=g/f,d=e,d.name=t,d.startPos={x:N*e[0]+C,y:O*e[1]+x},y=s.scrollWidth,w=s.scrollHeight,c=n.add(s,"div",{class:"mce-resize-backdrop","data-mce-bogus":"all"}),n.setStyles(c,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),i=E(v=a)?n.create("img",{src:At.transparentSrc}):v.cloneNode(!0),n.addClass(i,"mce-clonedresizable"),n.setAttrib(i,"data-mce-bogus","all"),i.contentEditable="false",n.setStyles(i,{left:C,top:x,margin:0}),R(i,N,O),i.removeAttribute(lf),s.appendChild(i),n.bind(o,"mousemove",A),n.bind(o,"mouseup",T),r!==o&&(n.bind(r,"mousemove",A),n.bind(r,"mouseup",T)),l=n.add(s,"div",{class:"mce-resize-helper","data-mce-bogus":"all"},f+" &times; "+g)})(h)})),e.elm=h,n.setStyles(h,{left:N*e[0]+C-h.offsetWidth/2,top:O*e[1]+x-h.offsetHeight/2})})):P(!1)},B=Qa(O,0),P=(e=!0)=>{B.cancel(),M(),a&&e&&a.removeAttribute(lf),ge(uf,((e,t)=>{const o=n.get("mceResizeHandle"+t);o&&(n.unbind(o),n.remove(o))}))},D=(e,t)=>n.isChildOf(e,t),L=o=>{if(h||t.removed||t.composing)return;const r="mousedown"===o.type?o.target:e.getNode(),a=no(yn(r),"table,img,figure.image,hr,video,span.mce-preview-object,details").map((e=>e.dom)).filter((e=>n.isEditable(e.parentElement)||"IMG"===e.nodeName&&n.isEditable(e))).getOrUndefined(),i=C(a)?n.getAttrib(a,lf,"1"):"1";if(V(n.select(`img[${lf}],hr[${lf}]`),(e=>{e.removeAttribute(lf)})),C(a)&&D(a,s)&&t.hasFocus()){I();const t=e.getStart(!0);if(D(t,a)&&D(e.getEnd(!0),a))return n.setAttrib(a,lf,i),void B.throttle(a)}P()},M=()=>{ge(uf,(e=>{e.elm&&(n.unbind(e.elm),delete e.elm)}))},I=()=>{try{t.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}};return t.on("init",(()=>{I(),t.on("NodeChange ResizeEditor ResizeWindow ResizeContent drop",L),t.on("keyup compositionend",(e=>{a&&"TABLE"===a.nodeName&&L(e)})),t.on("hide blur",P),t.on("contextmenu longpress",_,!0)})),t.on("remove",M),{isResizable:S,showResizeRect:O,hideResizeRect:P,updateResizeRect:L,destroy:()=>{B.cancel(),a=i=c=null}}},ff=(e,t,n)=>{const o=e.document.createRange();var r;return r=o,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,n)=>{e.setEnd(t.dom,n)}),(t=>{e.setEndAfter(t.dom)}))})(o,n),o},gf=(e,t,n,o,r)=>{const s=e.document.createRange();return s.setStart(t.dom,n),s.setEnd(o.dom,r),s},pf=hl([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),hf=(e,t,n)=>t(yn(n.startContainer),n.startOffset,yn(n.endContainer),n.endOffset);pf.ltr,pf.rtl;const bf=(e,t,n,o)=>({start:e,soffset:t,finish:n,foffset:o}),vf=document.caretPositionFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(o,t,n)).bind((t=>{if(null===t.offsetNode)return I.none();const n=e.dom.createRange();return n.setStart(t.offsetNode,t.offset),n.collapse(),I.some(n)}))}:document.caretRangeFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(o,t,n))}:I.none,yf=hl([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Cf={before:yf.before,on:yf.on,after:yf.after,cata:(e,t,n,o)=>e.fold(t,n,o),getStart:e=>e.fold(R,R,R)},wf=hl([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),xf={domRange:wf.domRange,relative:wf.relative,exact:wf.exact,exactFromRange:e=>wf.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>yn(e.startContainer),relative:(e,t)=>Cf.getStart(e),exact:(e,t,n,o)=>e}))(e);return Rn(t)},range:bf},Ef=(e,t)=>{const n=Ht(e);return"input"===n?Cf.after(e):H(["br","img"],n)?0===t?Cf.before(e):Cf.after(e):Cf.on(e,t)},_f=(e,t)=>{const n=e.fold(Cf.before,Ef,Cf.after),o=t.fold(Cf.before,Ef,Cf.after);return xf.relative(n,o)},kf=(e,t,n,o)=>{const r=Ef(e,t),s=Ef(n,o);return xf.relative(r,s)},Sf=(e,t)=>{const n=(t||document).createDocumentFragment();return V(e,(e=>{n.appendChild(e.dom)})),yn(n)},Nf=e=>{const t=xf.getWin(e).dom,n=(e,n,o,r)=>gf(t,e,n,o,r),o=(e=>e.match({domRange:e=>{const t=yn(e.startContainer),n=yn(e.endContainer);return kf(t,e.startOffset,n,e.endOffset)},relative:_f,exact:kf}))(e);return((e,t)=>{const n=((e,t)=>t.match({domRange:e=>({ltr:N(e),rtl:I.none}),relative:(t,n)=>({ltr:De((()=>ff(e,t,n))),rtl:De((()=>I.some(ff(e,n,t))))}),exact:(t,n,o,r)=>({ltr:De((()=>gf(e,t,n,o,r))),rtl:De((()=>I.some(gf(e,o,r,t,n))))})}))(e,t);return((e,t)=>{const n=t.ltr();return n.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>pf.rtl(yn(e.endContainer),e.endOffset,yn(e.startContainer),e.startOffset))).getOrThunk((()=>hf(0,pf.ltr,n))):hf(0,pf.ltr,n)})(0,n)})(t,o).match({ltr:n,rtl:n})},Rf=(e,t,n)=>((e,t,n)=>((e,t,n)=>{const o=yn(e.document);return vf(o,t,n).map((e=>bf(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset)))})(e,t,n))(Rn(yn(n)).dom,e,t).map((e=>{const t=n.createRange();return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),t})).getOrUndefined(),Af=(e,t)=>C(e)&&C(t)&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset,Tf=(e,t,n)=>null!==((e,t,n)=>{let o=e;for(;o&&o!==t;){if(n(o))return o;o=o.parentNode}return null})(e,t,n),Of=(e,t,n)=>Tf(e,t,(e=>e.nodeName===n)),Bf=(e,t)=>Ur(e)&&!Tf(e,t,Du),Pf=(e,t,n)=>{const o=t.parentNode;if(o){const r=new jo(t,e.getParent(o,e.isBlock)||e.getRoot());let s;for(;s=r[n?"prev":"next"]();)if(ar(s))return!0}return!1},Df=(e,t,n,o,r)=>{const s=e.getRoot(),a=e.schema.getNonEmptyElements(),i=r.parentNode;let l,d;if(!i)return I.none();const c=e.getParent(i,e.isBlock)||s;if(o&&ar(r)&&t&&e.isEmpty(c))return I.some(Vi(i,e.nodeIndex(r)));const u=new jo(r,c);for(;d=u[o?"prev":"next"]();){if("false"===e.getContentEditableParent(d)||Bf(d,s))return I.none();if(er(d)&&d.data.length>0)return Of(d,s,"A")?I.none():I.some(Vi(d,o?d.data.length:0));if(e.isBlock(d)||a[d.nodeName.toLowerCase()])return I.none();l=d}return or(l)?I.none():n&&l?I.some(Vi(l,0)):I.none()},Lf=(e,t,n,o)=>{const r=e.getRoot();let s,a=!1,i=n?o.startContainer:o.endContainer,l=n?o.startOffset:o.endOffset;const d=qo(i)&&l===i.childNodes.length,c=e.schema.getNonEmptyElements();let u=n;if(Ur(i))return I.none();if(qo(i)&&l>i.childNodes.length-1&&(u=!1),rr(i)&&(i=r,l=0),i===r){if(u&&(s=i.childNodes[l>0?l-1:0],s)){if(Ur(s))return I.none();if(c[s.nodeName]||Qo(s))return I.none()}if(i.hasChildNodes()){if(l=Math.min(!u&&l>0?l-1:l,i.childNodes.length-1),i=i.childNodes[l],l=er(i)&&d?i.data.length:0,!t&&i===r.lastChild&&Qo(i))return I.none();if(((e,t)=>{let n=t;for(;n&&n!==e;){if(dr(n))return!0;n=n.parentNode}return!1})(r,i)||Ur(i))return I.none();if(gr(i))return I.none();if(i.hasChildNodes()&&!Qo(i)){s=i;const t=new jo(i,r);do{if(dr(s)||Ur(s)){a=!1;break}if(er(s)&&s.data.length>0){l=u?0:s.data.length,i=s,a=!0;break}if(c[s.nodeName.toLowerCase()]&&!ur(s)){l=e.nodeIndex(s),i=s.parentNode,u||l++,a=!0;break}}while(s=u?t.next():t.prev())}}}return t&&(er(i)&&0===l&&Df(e,d,t,!0,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),qo(i)&&(s=i.childNodes[l],s||(s=i.childNodes[l-1]),!s||!ar(s)||((e,t)=>{var n;return"A"===(null===(n=e.previousSibling)||void 0===n?void 0:n.nodeName)})(s)||Pf(e,s,!1)||Pf(e,s,!0)||Df(e,d,t,!0,s).each((e=>{i=e.container(),l=e.offset(),a=!0})))),u&&!t&&er(i)&&l===i.data.length&&Df(e,d,t,!1,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),a&&i?I.some(Vi(i,l)):I.none()},Mf=(e,t)=>{const n=t.collapsed,o=t.cloneRange(),r=Vi.fromRangeStart(t);return Lf(e,n,!0,o).each((e=>{n&&Vi.isAbove(r,e)||o.setStart(e.container(),e.offset())})),n||Lf(e,n,!1,o).each((e=>{o.setEnd(e.container(),e.offset())})),n&&o.collapse(!0),Af(t,o)?I.none():I.some(o)},If=(e,t)=>e.splitText(t),Ff=e=>{let t=e.startContainer,n=e.startOffset,o=e.endContainer,r=e.endOffset;if(t===o&&er(t)){if(n>0&&n<t.data.length)if(o=If(t,n),t=o.previousSibling,r>n){r-=n;const e=If(o,r).previousSibling;t=o=e,r=e.data.length,n=0}else r=0}else if(er(t)&&n>0&&n<t.data.length&&(t=If(t,n),n=0),er(o)&&r>0&&r<o.data.length){const e=If(o,r).previousSibling;o=e,r=e.data.length}return{startContainer:t,startOffset:n,endContainer:o,endOffset:r}},Uf=e=>({walk:(t,n)=>Wm(e,t,n),split:Ff,expand:(t,n={type:"word"})=>{if("word"===n.type){const n=Vm(e,t,[{inline:"span"}]),o=e.createRng();return o.setStart(n.startContainer,n.startOffset),o.setEnd(n.endContainer,n.endOffset),o}return t},normalize:t=>Mf(e,t).fold(L,(e=>(t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0)))});Uf.compareRanges=Af,Uf.getCaretRangeFromPoint=Rf,Uf.getSelectedNode=_i,Uf.getNode=ki;const zf=((e,t)=>{const n=t=>{const n=(e=>{const t=e.dom;return Gn(e)?t.getBoundingClientRect().height:t.offsetHeight})(t);if(n<=0||null===n){const n=co(t,e);return parseFloat(n)||0}return n},o=(e,t)=>X(t,((t,n)=>{const o=co(e,n),r=void 0===o?0:parseInt(o,10);return isNaN(r)?t:t+r}),0);return{set:(t,n)=>{if(!x(n)&&!n.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+n);const o=t.dom;so(o)&&(o.style[e]=n+"px")},get:n,getOuter:n,aggregate:o,max:(e,t,n)=>{const r=o(e,n);return t>r?t-r:0}}})("height"),jf=()=>yn(document),Hf=(e,t)=>e.view(t).fold(N([]),(t=>{const n=e.owner(t),o=Hf(e,n);return[t].concat(o)}));var $f=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?I.none():I.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(yn)},owner:e=>Nn(e)});const qf=e=>"textarea"===Ht(e),Vf=(e,t)=>{const n=(e=>{const t=e.dom.ownerDocument,n=t.body,o=t.defaultView,r=t.documentElement;if(n===e.dom)return To(n.offsetLeft,n.offsetTop);const s=Oo(null==o?void 0:o.pageYOffset,r.scrollTop),a=Oo(null==o?void 0:o.pageXOffset,r.scrollLeft),i=Oo(r.clientTop,n.clientTop),l=Oo(r.clientLeft,n.clientLeft);return Bo(e).translate(a-l,s-i)})(e),o=(e=>zf.get(e))(e);return{element:e,bottom:n.top+o,height:o,pos:n,cleanup:t}},Wf=(e,t,n,o)=>{Xf(e,((r,s)=>Yf(e,t,n,o)),n)},Kf=(e,t,n,o,r)=>{const s={elm:o.element.dom,alignToTop:r};((e,t)=>e.dispatch("ScrollIntoView",t).isDefaultPrevented())(e,s)||(n(e,t,Po(t).top,o,r),((e,t)=>{e.dispatch("AfterScrollIntoView",t)})(e,s))},Yf=(e,t,n,o)=>{const r=yn(e.getBody()),s=yn(e.getDoc());r.dom.offsetWidth;const a=((e,t)=>{const n=((e,t)=>{const n=Mn(e);if(0===n.length||qf(e))return{element:e,offset:t};if(t<n.length&&!qf(n[t]))return{element:n[t],offset:0};{const o=n[n.length-1];return qf(o)?{element:e,offset:t}:"img"===Ht(o)?{element:o,offset:1}:Kt(o)?{element:o,offset:Cr(o).length}:{element:o,offset:Mn(o).length}}})(e,t),o=hn('<span data-mce-bogus="all" style="display: inline-block;">\ufeff</span>');return po(n.element,o),Vf(o,(()=>xo(o)))})(yn(n.startContainer),n.startOffset);Kf(e,s,t,a,o),a.cleanup()},Gf=(e,t,n,o)=>{const r=yn(e.getDoc());Kf(e,r,n,(e=>Vf(yn(e),_))(t),o)},Xf=(e,t,n)=>{const o=n.startContainer,r=n.startOffset,s=n.endContainer,a=n.endOffset;t(yn(o),yn(s));const i=e.dom.createRng();i.setStart(o,r),i.setEnd(s,a),e.selection.setRng(n)},Qf=(e,t,n,o,r)=>{const s=t.pos;if(o)Do(s.left,s.top,r);else{const o=s.top-n+t.height;Do(-e.getBody().getBoundingClientRect().left,o,r)}},Jf=(e,t,n,o,r,s)=>{const a=o+n,i=r.pos.top,l=r.bottom,d=l-i>=o;i<n?Qf(e,r,o,!1!==s,t):i>a?Qf(e,r,o,d?!1!==s:!0===s,t):l>a&&!d&&Qf(e,r,o,!0===s,t)},Zf=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r)},eg=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r);const a=(e=>{const t=jf(),n=Po(t),o=((e,t)=>{const n=t.owner(e);return Hf(t,n)})(e,$f),r=Bo(e),s=G(o,((e,t)=>{const n=Bo(t);return{left:e.left+n.left,top:e.top+n.top}}),{left:0,top:0});return To(s.left+r.left+n.left,s.top+r.top+n.top)})(o.element),i=Io(window);a.top<i.y?Lo(o.element,!1!==r):a.top>i.bottom&&Lo(o.element,!0===r)},tg=(e,t,n)=>Wf(e,Zf,t,n),ng=(e,t,n)=>Gf(e,t,Zf,n),og=(e,t,n)=>Wf(e,eg,t,n),rg=(e,t,n)=>Gf(e,t,eg,n),sg=(e,t,n)=>{(e.inline?tg:og)(e,t,n)},ag=(e,t=!1)=>e.dom.focus({preventScroll:t}),ig=e=>{const t=qn(e).dom;return e.dom===t.activeElement},lg=(e=jf())=>I.from(e.dom.activeElement).map(yn),dg=(e,t)=>{const n=Kt(t)?Cr(t).length:Mn(t).length+1;return e>n?n:e<0?0:e},cg=e=>xf.range(e.start,dg(e.soffset,e.start),e.finish,dg(e.foffset,e.finish)),ug=(e,t)=>!$o(t.dom)&&(kn(e,t)||_n(e,t)),mg=e=>t=>ug(e,t.start)&&ug(e,t.finish),fg=e=>xf.range(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset),gg=e=>{const t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),I.some(t)}catch(e){return I.none()}},pg=e=>{const t=(e=>e.inline||At.browser.isFirefox())(e)?(n=yn(e.getBody()),(e=>{const t=e.getSelection();return(t&&0!==t.rangeCount?I.from(t.getRangeAt(0)):I.none()).map(fg)})(Rn(n).dom).filter(mg(n))):I.none();var n;e.bookmark=t.isSome()?t:e.bookmark},hg=e=>(e.bookmark?e.bookmark:I.none()).bind((t=>{return n=yn(e.getBody()),o=t,I.from(o).filter(mg(n)).map(cg);var n,o})).bind(gg),bg={isEditorUIElement:e=>{const t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},vg={setEditorTimeout:(e,t,n)=>((e,t)=>(x(t)||(t=0),setTimeout(e,t)))((()=>{e.removed||t()}),n),setEditorInterval:(e,t,n)=>{const o=((e,t)=>(x(t)||(t=0),setInterval(e,t)))((()=>{e.removed?clearInterval(o):t()}),n);return o}};let yg;const Cg=za.DOM,wg=e=>{const t=e.classList;return void 0!==t&&(t.contains("tox-edit-area")||t.contains("tox-edit-area__iframe")||t.contains("mce-content-body"))},xg=(e,t)=>{const n=_d(e),o=Cg.getParent(t,(t=>(e=>qo(e)&&bg.isEditorUIElement(e))(t)||!!n&&e.dom.is(t,n)));return null!==o},Eg=e=>{try{const t=qn(yn(e.getElement()));return lg(t).fold((()=>document.body),(e=>e.dom))}catch(e){return document.body}},_g=(e,t)=>{const n=t.editor;(e=>{const t=Qa((()=>{pg(e)}),0);e.on("init",(()=>{e.inline&&((e,t)=>{const n=()=>{t.throttle()};za.DOM.bind(document,"mouseup",n),e.on("remove",(()=>{za.DOM.unbind(document,"mouseup",n)}))})(e,t),((e,t)=>{((e,t)=>{e.on("mouseup touchend",(e=>{t.throttle()}))})(e,t),e.on("keyup NodeChange AfterSetSelectionRange",(t=>{(e=>"nodechange"===e.type&&e.selectionChange)(t)||pg(e)}))})(e,t)})),e.on("remove",(()=>{t.cancel()}))})(n);const o=(e,t)=>{mc(e)&&!0!==e.inline&&t(yn(e.getContainer()),"tox-edit-focus")};n.on("focusin",(()=>{const t=e.focusedEditor;wg(Eg(n))&&o(n,un),t!==n&&(t&&t.dispatch("blur",{focusedEditor:n}),e.setActive(n),e.focusedEditor=n,n.dispatch("focus",{blurredEditor:t}),n.focus(!0))})),n.on("focusout",(()=>{vg.setEditorTimeout(n,(()=>{const t=e.focusedEditor;wg(Eg(n))&&t===n||o(n,fn),xg(n,Eg(n))||t!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null)}))})),yg||(yg=t=>{const n=e.activeEditor;n&&Kn(t).each((t=>{const o=t;o.ownerDocument===document&&(o===document.body||xg(n,o)||e.focusedEditor!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null))}))},Cg.bind(document,"focusin",yg))},kg=(e,t)=>{e.focusedEditor===t.editor&&(e.focusedEditor=null),!e.activeEditor&&yg&&(Cg.unbind(document,"focusin",yg),yg=null)},Sg=(e,t)=>{((e,t)=>(e=>e.collapsed?I.from(ki(e.startContainer,e.startOffset)).map(yn):I.none())(t).bind((t=>Nr(t)?I.some(t):kn(e,t)?I.none():I.some(e))))(yn(e.getBody()),t).bind((e=>Ou(e.dom))).fold((()=>{e.selection.normalize()}),(t=>e.selection.setRng(t.toRange())))},Ng=e=>{if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},Rg=e=>e.inline?(e=>{const t=e.getBody();return t&&(n=yn(t),ig(n)||(o=n,lg(qn(o)).filter((e=>o.dom.contains(e.dom)))).isSome());var n,o})(e):(e=>C(e.iframeElement)&&ig(yn(e.iframeElement)))(e),Ag=e=>Rg(e)||(e=>{const t=qn(yn(e.getElement()));return lg(t).filter((t=>!wg(t.dom)&&xg(e,t.dom))).isSome()})(e),Tg=e=>e.editorManager.setActive(e),Og=(e,t)=>t.collapsed?e.isEditable(t.startContainer):e.isEditable(t.startContainer)&&e.isEditable(t.endContainer),Bg=(e,t,n,o,r)=>{const s=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return I.from(s).map(yn).map((e=>o&&t.collapsed?e:In(e,r(e,a)).getOr(e))).bind((e=>Wt(e)?I.some(e):An(e).filter(Wt))).map((e=>e.dom)).getOr(e)},Pg=(e,t,n=!1)=>Bg(e,t,!0,n,((e,t)=>Math.min(zn(e),t))),Dg=(e,t,n=!1)=>Bg(e,t,!1,n,((e,t)=>t>0?t-1:t)),Lg=(e,t)=>{const n=e;for(;e&&er(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Mg=(e,t)=>q(t,(t=>{const n=e.dispatch("GetSelectionRange",{range:t});return n.range!==t?n.range:t})),Ig=["img","br"],Fg=e=>{const t=wr(e).filter((e=>0!==e.trim().length||e.indexOf(br)>-1)).isSome();return t||H(Ig,Ht(e))||(e=>Vt(e)&&"false"===en(e,"contenteditable"))(e)},Ug="[data-mce-autocompleter]",zg=(e,t)=>{if(jg(yn(e.getBody())).isNone()){const o=hn('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());vo(o,yn(t.extractContents())),t.insertNode(o.dom),An(o).each((e=>e.dom.normalize())),(n=o,((e,t)=>{const n=e=>{const o=Mn(e);for(let e=o.length-1;e>=0;e--){const r=o[e];if(t(r))return I.some(r);const s=n(r);if(s.isSome())return s}return I.none()};return n(e)})(n,Fg)).map((t=>{e.selection.setCursorLocation(t.dom,(e=>"img"===Ht(e)?1:wr(e).fold((()=>Mn(e).length),(e=>e.length)))(t))}))}var n},jg=e=>to(e,Ug),Hg={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},$g=(e,t,n)=>{const o=n?"lastChild":"firstChild",r=n?"prev":"next";if(e[o])return e[o];if(e!==t){let n=e[r];if(n)return n;for(let o=e.parent;o&&o!==t;o=o.parent)if(n=o[r],n)return n}},qg=e=>{var t;const n=null!==(t=e.value)&&void 0!==t?t:"";if(!ss(n))return!1;const o=e.parent;return!o||"span"===o.name&&!o.attr("style")||!/^[ ]+$/.test(n)},Vg=e=>{const t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t};class Wg{static create(e,t){const n=new Wg(e,Hg[e]||1);return t&&ge(t,((e,t)=>{n.attr(t,e)})),n}constructor(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}replace(e){const t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t}attr(e,t){const n=this;if(!m(e))return C(e)&&ge(e,((e,t)=>{n.attr(t,e)})),n;const o=n.attributes;if(o){if(void 0!==t){if(null===t){if(e in o.map){delete o.map[e];let t=o.length;for(;t--;)if(o[t].name===e)return o.splice(t,1),n}return n}if(e in o.map){let n=o.length;for(;n--;)if(o[n].name===e){o[n].value=t;break}}else o.push({name:e,value:t});return o.map[e]=t,n}return o.map[e]}}clone(){const e=this,t=new Wg(e.name,e.type),n=e.attributes;if(n){const e=[];e.map={};for(let t=0,o=n.length;t<o;t++){const o=n[t];"id"!==o.name&&(e[e.length]={name:o.name,value:o.value},e.map[o.name]=o.value)}t.attributes=e}return t.value=e.value,t}wrap(e){const t=this;return t.parent&&(t.parent.insert(e,t),e.append(t)),t}unwrap(){const e=this;for(let t=e.firstChild;t;){const n=t.next;e.insert(t,e,!0),t=n}e.remove()}remove(){const e=this,t=e.parent,n=e.next,o=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):o&&(o.next=n),t.lastChild===e?(t.lastChild=o,o&&(o.next=null)):n&&(n.prev=o),e.parent=e.next=e.prev=null),e}append(e){const t=this;e.parent&&e.remove();const n=t.lastChild;return n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e}insert(e,t,n){e.parent&&e.remove();const o=t.parent||this;return n?(t===o.firstChild?o.firstChild=e:t.prev&&(t.prev.next=e),e.prev=t.prev,e.next=t,t.prev=e):(t===o.lastChild?o.lastChild=e:t.next&&(t.next.prev=e),e.next=t.next,e.prev=t,t.next=e),e.parent=o,e}getAll(e){const t=this,n=[];for(let o=t.firstChild;o;o=$g(o,t))o.name===e&&n.push(o);return n}children(){const e=[];for(let t=this.firstChild;t;t=t.next)e.push(t);return e}empty(){const e=this;if(e.firstChild){const t=[];for(let n=e.firstChild;n;n=$g(n,e))t.push(n);let n=t.length;for(;n--;){const e=t[n];e.parent=e.firstChild=e.lastChild=e.next=e.prev=null}}return e.firstChild=e.lastChild=null,e}isEmpty(e,t={},n){var o;const r=this;let s=r.firstChild;if(Vg(r))return!1;if(s)do{if(1===s.type){if(s.attr("data-mce-bogus"))continue;if(e[s.name])return!1;if(Vg(s))return!1}if(8===s.type)return!1;if(3===s.type&&!qg(s))return!1;if(3===s.type&&s.parent&&t[s.parent.name]&&ss(null!==(o=s.value)&&void 0!==o?o:""))return!1;if(n&&n(s))return!1}while(s=$g(s,r));return!0}walk(e){return $g(this,null,e)}}const Kg=Pt.makeMap("NOSCRIPT STYLE SCRIPT XMP IFRAME NOEMBED NOFRAMES PLAINTEXT"," "),Yg=e=>m(e.nodeValue)&&e.nodeValue.includes(Br),Gg=e=>(0===e.length?"":`${q(e,(e=>`[${e}]`)).join(",")},`)+'[data-mce-bogus="all"]',Xg=e=>document.createTreeWalker(e,NodeFilter.SHOW_COMMENT,(e=>Yg(e)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP)),Qg=e=>document.createTreeWalker(e,NodeFilter.SHOW_TEXT,(e=>{if(Yg(e)){const t=e.parentNode;return t&&Ee(Kg,t.nodeName)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP}return NodeFilter.FILTER_SKIP})),Jg=e=>null!==Xg(e).nextNode(),Zg=e=>null!==Qg(e).nextNode(),ep=(e,t)=>null!==t.querySelector(Gg(e)),tp=(e,t)=>{V(((e,t)=>t.querySelectorAll(Gg(e)))(e,t),(t=>{const n=yn(t);"all"===en(n,"data-mce-bogus")?xo(n):V(e,(e=>{nn(n,e)&&on(n,e)}))}))},np=e=>{let t=e.nextNode();for(;null!==t;)t.nodeValue=null,t=e.nextNode()},op=k(np,Xg),rp=k(np,Qg),sp=(e,t)=>{const n=[{condition:T(ep,t),action:T(tp,t)},{condition:Jg,action:op},{condition:Zg,action:rp}];let o=e,r=!1;return V(n,(({condition:t,action:n})=>{t(o)&&(r||(o=e.cloneNode(!0),r=!0),n(o))})),o},ap=e=>{const t=Uo(e,"[data-mce-bogus]");V(t,(e=>{"all"===en(e,"data-mce-bogus")?xo(e):Er(e)?(po(e,vn(hr)),xo(e)):Eo(e)}))},ip=e=>{const t=Uo(e,"input");V(t,(e=>{on(e,"name")}))},lp=(e,t,n)=>{let o;return o="raw"===t.format?Pt.trim(Dr(sp(n,e.serializer.getTempAttrs()).innerHTML)):"text"===t.format?((e,t)=>{const n=e.getDoc(),o=qn(yn(e.getBody())),r=bn("div",n);Jt(r,"data-mce-bogus","all"),lo(r,{position:"fixed",left:"-9999999px",top:"0"}),So(r,t.innerHTML),ap(r),ip(r);const s=(e=>jn(e)?e:yn(Nn(e).dom.body))(o);vo(s,r);const a=Dr(r.dom.innerText);return xo(r),a})(e,n):"tree"===t.format?e.serializer.serialize(n,t):((e,t)=>{const n=Il(e),o=new RegExp(`^(<${n}[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/${n}>[\r\n]*|<br \\/>[\r\n]*)$`);return t.replace(o,"")})(e,e.serializer.serialize(n,t)),"text"!==t.format&&!Ar(yn(n))&&m(o)?Pt.trim(o):o},dp=Pt.makeMap,cp=e=>{const t=[],n=(e=e||{}).indent,o=dp(e.indent_before||""),r=dp(e.indent_after||""),s=ea.getEncodeFunc(e.entity_encoding||"raw",e.entities),a="xhtml"!==e.element_format;return{start:(e,i,l)=>{if(n&&o[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}if(t.push("<",e),i)for(let e=0,n=i.length;e<n;e++){const n=i[e];t.push(" ",n.name,'="',s(n.value,!0),'"')}if(t[t.length]=!l||a?">":" />",l&&n&&r[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}},end:e=>{let o;t.push("</",e,">"),n&&r[e]&&t.length>0&&(o=t[t.length-1],o.length>0&&"\n"!==o&&t.push("\n"))},text:(e,n)=>{e.length>0&&(t[t.length]=n?e:s(e))},cdata:e=>{t.push("<![CDATA[",e,"]]>")},comment:e=>{t.push("\x3c!--",e,"--\x3e")},pi:(e,o)=>{o?t.push("<?",e," ",s(o),"?>"):t.push("<?",e,"?>"),n&&t.push("\n")},doctype:e=>{t.push("<!DOCTYPE",e,">",n?"\n":"")},reset:()=>{t.length=0},getContent:()=>t.join("").replace(/\n$/,"")}},up=(e={},t=ua())=>{const n=cp(e);return e.validate=!("validate"in e)||e.validate,{serialize:o=>{const r=e.validate,s={3:e=>{var t;n.text(null!==(t=e.value)&&void 0!==t?t:"",e.raw)},8:e=>{var t;n.comment(null!==(t=e.value)&&void 0!==t?t:"")},7:e=>{n.pi(e.name,e.value)},10:e=>{var t;n.doctype(null!==(t=e.value)&&void 0!==t?t:"")},4:e=>{var t;n.cdata(null!==(t=e.value)&&void 0!==t?t:"")},11:e=>{let t=e;if(t=t.firstChild)do{a(t)}while(t=t.next)}};n.reset();const a=e=>{var o;const i=s[e.type];if(i)i(e);else{const s=e.name,i=s in t.getVoidElements();let l=e.attributes;if(r&&l&&l.length>1){const n=[];n.map={};const o=t.getElementRule(e.name);if(o){for(let e=0,t=o.attributesOrder.length;e<t;e++){const t=o.attributesOrder[e];if(t in l.map){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}for(let e=0,t=l.length;e<t;e++){const t=l[e].name;if(!(t in n.map)){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}l=n}}if(n.start(s,l,i),ps(s))m(e.value)&&n.text(e.value,!0),n.end(s);else if(!i){let t=e.firstChild;if(t){"pre"!==s&&"textarea"!==s||3!==t.type||"\n"!==(null===(o=t.value)||void 0===o?void 0:o[0])||n.text("\n",!0);do{a(t)}while(t=t.next)}n.end(s)}}};return 1!==o.type||e.inner?3===o.type?s[3](o):s[11](o):a(o),n.getContent()}}},mp=new Set;V(["margin","margin-left","margin-right","margin-top","margin-bottom","padding","padding-left","padding-right","padding-top","padding-bottom","border","border-width","border-style","border-color","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","float","position","left","right","top","bottom","z-index","display","transform","width","max-width","min-width","height","max-height","min-height","overflow","overflow-x","overflow-y","text-overflow","vertical-align","transition","transition-delay","transition-duration","transition-property","transition-timing-function"],(e=>{mp.add(e)}));const fp=["font","text-decoration","text-emphasis"],gp=(e,t)=>me(e.parseStyle(e.getAttrib(t,"style"))),pp=(e,t,n)=>{const o=gp(e,t),r=gp(e,n),s=o=>{var r,s;const a=null!==(r=e.getStyle(t,o))&&void 0!==r?r:"",i=null!==(s=e.getStyle(n,o))&&void 0!==s?s:"";return Ye(a)&&Ye(i)&&a!==i};return $(o,(e=>{const t=t=>$(t,(t=>t===e));if(!t(r)&&t(fp)){const e=Y(r,(e=>$(fp,(t=>He(e,t)))));return $(e,s)}return s(e)}))},hp=(e,t,n)=>I.from(n.container()).filter(er).exists((o=>{const r=e?0:-1;return t(o.data.charAt(n.offset()+r))})),bp=T(hp,!0,Xu),vp=T(hp,!1,Xu),yp=e=>{const t=e.container();return er(t)&&(0===t.data.length||Pr(t.data)&&Jm.isBookmarkNode(t.parentNode))},Cp=(e,t)=>n=>Jc(e?0:-1,n).filter(t).isSome(),wp=e=>ir(e)&&"block"===co(yn(e),"display"),xp=e=>dr(e)&&!(e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"))(e),Ep=Cp(!0,wp),_p=Cp(!1,wp),kp=Cp(!0,mr),Sp=Cp(!1,mr),Np=Cp(!0,Qo),Rp=Cp(!1,Qo),Ap=Cp(!0,xp),Tp=Cp(!1,xp),Op=(e,t)=>((e,t,n)=>kn(t,e)?On(e,(e=>n(e)||_n(e,t))).slice(0,-1):[])(e,t,L),Bp=(e,t)=>[e].concat(Op(e,t)),Pp=(e,t,n)=>Nu(e,t,n,yp),Dp=(e,t,n)=>J(Bp(yn(t.container()),e),(e=>t=>e.isBlock(Ht(t)))(n)),Lp=(e,t,n,o)=>Pp(e,t.dom,n).forall((e=>Dp(t,n,o).fold((()=>!Qc(e,n,t.dom)),(o=>!Qc(e,n,t.dom)&&kn(o,yn(e.container())))))),Mp=(e,t,n,o)=>Dp(t,n,o).fold((()=>Pp(e,t.dom,n).forall((e=>!Qc(e,n,t.dom)))),(t=>Pp(e,t.dom,n).isNone())),Ip=T(Mp,!1),Fp=T(Mp,!0),Up=T(Lp,!1),zp=T(Lp,!0),jp=e=>iu(e).exists(Er),Hp=(e,t,n,o)=>{const r=Y(Bp(yn(n.container()),t),(e=>o.isBlock(Ht(e)))),s=le(r).getOr(t);return ku(e,s.dom,n).filter(jp)},$p=(e,t,n)=>iu(t).exists(Er)||Hp(!0,e,t,n).isSome(),qp=(e,t,n)=>(e=>I.from(e.getNode(!0)).map(yn))(t).exists(Er)||Hp(!1,e,t,n).isSome(),Vp=T(Hp,!1),Wp=T(Hp,!0),Kp=e=>Vi.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd(),Yp=(e,t,n)=>{const o=Y(Bp(yn(t.container()),e),(e=>n.isBlock(Ht(e))));return le(o).getOr(e)},Gp=(e,t,n)=>Kp(t)?vp(t):vp(t)||Tu(Yp(e,t,n).dom,t).exists(vp),Xp=(e,t,n)=>Kp(t)?bp(t):bp(t)||Au(Yp(e,t,n).dom,t).exists(bp),Qp=e=>iu(e).bind((e=>Jn(e,Wt))).exists((e=>(e=>H(["pre","pre-wrap"],e))(co(e,"white-space")))),Jp=(e,t)=>n=>{return o=new jo(n,e)[t](),C(o)&&dr(o)&&zc(o);var o},Zp=(e,t,n)=>!Qp(t)&&(((e,t,n)=>((e,t)=>Tu(e.dom,t).isNone())(e,t)||((e,t)=>Au(e.dom,t).isNone())(e,t)||Ip(e,t,n)||Fp(e,t,n)||qp(e,t,n)||$p(e,t,n))(e,t,n)||Gp(e,t,n)||Xp(e,t,n)),eh=(e,t,n)=>!Qp(t)&&(Ip(e,t,n)||Up(e,t,n)||qp(e,t,n)||Gp(e,t,n)||((e,t)=>{const n=Tu(e.dom,t).getOr(t),o=Jp(e.dom,"prev");return t.isAtStart()&&(o(t.container())||o(n.container()))})(e,t)),th=(e,t,n)=>!Qp(t)&&(Fp(e,t,n)||zp(e,t,n)||$p(e,t,n)||Xp(e,t,n)||((e,t)=>{const n=Au(e.dom,t).getOr(t),o=Jp(e.dom,"next");return t.isAtEnd()&&(o(t.container())||o(n.container()))})(e,t)),nh=(e,t,n)=>eh(e,t,n)||th(e,(e=>{const t=e.container(),n=e.offset();return er(t)&&n<t.data.length?Vi(t,n+1):e})(t),n),oh=(e,t)=>Yu(e.charAt(t)),rh=(e,t)=>Xu(e.charAt(t)),sh=(e,t,n,o)=>{const r=t.data,s=Vi(t,0);return n||!oh(r,0)||nh(e,s,o)?!!(n&&rh(r,0)&&eh(e,s,o))&&(t.data=br+r.slice(1),!0):(t.data=" "+r.slice(1),!0)},ah=(e,t,n,o)=>{const r=t.data,s=Vi(t,r.length-1);return n||!oh(r,r.length-1)||nh(e,s,o)?!!(n&&rh(r,r.length-1)&&th(e,s,o))&&(t.data=r.slice(0,-1)+br,!0):(t.data=r.slice(0,-1)+" ",!0)},ih=(e,t,n)=>{const o=t.container();if(!er(o))return I.none();if((e=>{const t=e.container();return er(t)&&je(t.data,br)})(t)){const r=sh(e,o,!1,n)||(e=>{const t=e.data,n=(e=>{const t=e.split("");return q(t,((e,n)=>Yu(e)&&n>0&&n<t.length-1&&Qu(t[n-1])&&Qu(t[n+1])?" ":e)).join("")})(t);return n!==t&&(e.data=n,!0)})(o)||ah(e,o,!1,n);return It(r,t)}if(nh(e,t,n)){const r=sh(e,o,!0,n)||ah(e,o,!0,n);return It(r,t)}return I.none()},lh=(e,t,n,o)=>{if(0===n)return;const r=yn(e),s=Qn(r,(e=>o.isBlock(Ht(e)))).getOr(r),a=e.data.slice(t,t+n),i=t+n>=e.data.length&&th(s,Vi(e,e.data.length),o),l=0===t&&eh(s,Vi(e,0),o);e.replaceData(t,n,ls(a,4,l,i))},dh=(e,t,n)=>{const o=e.data.slice(t),r=o.length-We(o).length;lh(e,t,r,n)},ch=(e,t,n)=>{const o=e.data.slice(0,t),r=o.length-Ke(o).length;lh(e,t-r,r,n)},uh=(e,t,n,o,r=!0)=>{const s=Ke(e.data).length,a=r?e:t,i=r?t:e;return r?a.appendData(i.data):a.insertData(0,i.data),xo(yn(i)),o&&dh(a,s,n),a},mh=(e,t)=>((e,t)=>{const n=e.container(),o=e.offset();return!Vi.isTextPosition(e)&&n===t.parentNode&&o>Vi.before(t).offset()})(t,e)?Vi(t.container(),t.offset()-1):t,fh=e=>{return ts(e.previousSibling)?I.some((t=e.previousSibling,er(t)?Vi(t,t.data.length):Vi.after(t))):e.previousSibling?Bu(e.previousSibling):I.none();var t},gh=e=>{return ts(e.nextSibling)?I.some((t=e.nextSibling,er(t)?Vi(t,0):Vi.before(t))):e.nextSibling?Ou(e.nextSibling):I.none();var t},ph=(e,t,n)=>((e,t,n)=>e?((e,t)=>gh(t).orThunk((()=>fh(t))).orThunk((()=>((e,t)=>Au(e,Vi.after(t)).orThunk((()=>Tu(e,Vi.before(t)))))(e,t))))(t,n):((e,t)=>fh(t).orThunk((()=>gh(t))).orThunk((()=>((e,t)=>I.from(t.previousSibling?t.previousSibling:t.parentNode).bind((t=>Tu(e,Vi.before(t)))).orThunk((()=>Au(e,Vi.after(t)))))(e,t))))(t,n))(e,t,n).map(T(mh,n)),hh=(e,t,n)=>{n.fold((()=>{e.focus()}),(n=>{e.selection.setRng(n.toRange(),t)}))},bh=(e,t)=>t&&Ee(e.schema.getBlockElements(),Ht(t)),vh=(e,t,n,o=!0,r=!1)=>{const s=ph(t,e.getBody(),n.dom),a=Qn(n,T(bh,e),(i=e.getBody(),e=>e.dom===i));var i;const l=((e,t,n,o)=>{const r=Bn(e).filter(Kt),s=Pn(e).filter(Kt);return xo(e),(a=r,i=s,l=t,d=(e,t,r)=>{const s=e.dom,a=t.dom,i=s.data.length;return uh(s,a,n,o),r.container()===a?Vi(s,i):r},a.isSome()&&i.isSome()&&l.isSome()?I.some(d(a.getOrDie(),i.getOrDie(),l.getOrDie())):I.none()).orThunk((()=>(o&&(r.each((e=>ch(e.dom,e.dom.length,n))),s.each((e=>dh(e.dom,0,n)))),t)));var a,i,l,d})(n,s,e.schema,((e,t)=>Ee(e.schema.getTextInlineElements(),Ht(t)))(e,n));e.dom.isEmpty(e.getBody())?(e.setContent(""),e.selection.setCursorLocation()):a.bind((e=>((e,t)=>{if(gs(e)){const n=hn('<br data-mce-bogus="1">');return t?V(Mn(e),(e=>{Tm(e)||xo(e)})):wo(e),vo(e,n),I.some(Vi.before(n.dom))}return I.none()})(e,r))).fold((()=>{o&&hh(e,t,l)}),(n=>{o&&hh(e,t,I.some(n))}))},yh=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,Ch=(e,t)=>xn(yn(t),dd(e))&&!Ts(e.schema,t)&&e.dom.isEditable(t),wh=e=>{var t;return"rtl"===za.DOM.getStyle(e,"direction",!0)||(e=>yh.test(e))(null!==(t=e.textContent)&&void 0!==t?t:"")},xh=(e,t,n)=>{const o=((e,t,n)=>Y(za.DOM.getParents(n.container(),"*",t),e))(e,t,n);return I.from(o[o.length-1])},Eh=(e,t)=>{const n=t.container(),o=t.offset();return e?Fr(n)?er(n.nextSibling)?Vi(n.nextSibling,0):Vi.after(n):jr(t)?Vi(n,o+1):t:Fr(n)?er(n.previousSibling)?Vi(n.previousSibling,n.previousSibling.data.length):Vi.before(n):Hr(t)?Vi(n,o-1):t},_h=T(Eh,!0),kh=T(Eh,!1),Sh=(e,t)=>{const n=e=>e.stopImmediatePropagation();e.on("beforeinput input",n,!0),e.getDoc().execCommand(t),e.off("beforeinput input",n)},Nh=e=>Sh(e,"Delete"),Rh=e=>_r(e)||Sr(e),Ah=(e,t)=>kn(e,t)?Jn(t,Rh,(e=>t=>Dt(An(t),e,_n))(e)):I.none(),Th=(e,t=!0)=>{e.dom.isEmpty(e.getBody())&&e.setContent("",{no_selection:!t})},Oh=(e,t,n)=>Mt(Ou(n),Bu(n),((o,r)=>{const s=Eh(!0,o),a=Eh(!1,r),i=Eh(!1,t);return e?Au(n,i).exists((e=>e.isEqual(a)&&t.isEqual(s))):Tu(n,i).exists((e=>e.isEqual(s)&&t.isEqual(a)))})).getOr(!0),Bh=e=>{var t;return(8===$t(t=e)||"#comment"===Ht(t)?Bn(e):Un(e)).bind(Bh).orThunk((()=>I.some(e)))},Ph=(e,t,n,o=!0)=>{var r;t.deleteContents();const s=Bh(n).getOr(n),a=yn(null!==(r=e.dom.getParent(s.dom,e.dom.isBlock))&&void 0!==r?r:n.dom);if(a.dom===e.getBody()?Th(e,o):gs(a)&&(Or(a),o&&e.selection.setCursorLocation(a.dom,0)),!_n(n,a)){const e=Dt(An(a),n)?[]:An(i=a).map(Mn).map((e=>Y(e,(e=>!_n(i,e))))).getOr([]);V(e.concat(Mn(n)),(e=>{_n(e,a)||kn(e,a)||!gs(e)||xo(e)}))}var i},Dh=(e,t)=>((e,t)=>{const n=e.dom;return n.parentNode?((e,t)=>J(e.dom.childNodes,(e=>t(yn(e)))).map(yn))(yn(n.parentNode),(n=>!_n(e,n)&&t(n))):I.none()})(e,t).isSome(),Lh=(e,t)=>Zn(e,t).isSome(),Mh=e=>Uo(e,"td,th"),Ih=(e,t)=>tm(yn(e),t),Fh=(e,t)=>({start:e,end:t}),Uh=hl([{singleCellTable:["rng","cell"]},{fullTable:["table"]},{partialTable:["cells","outsideDetails"]},{multiTable:["startTableCells","endTableCells","betweenRng"]}]),zh=(e,t)=>no(yn(e),"td,th",t),jh=e=>!_n(e.start,e.end),Hh=(e,t)=>tm(e.start,t).bind((n=>tm(e.end,t).bind((e=>It(_n(n,e),n))))),$h=e=>t=>Hh(t,e).map((e=>((e,t,n)=>({rng:e,table:t,cells:n}))(t,e,Mh(e)))),qh=(e,t,n,o)=>{if(n.collapsed||!e.forall(jh))return I.none();if(t.isSameTable){const t=e.bind($h(o));return I.some({start:t,end:t})}{const e=zh(n.startContainer,o),t=zh(n.endContainer,o),r=e.bind((e=>t=>tm(t,e).bind((e=>de(Mh(e)).map((e=>Fh(t,e))))))(o)).bind($h(o)),s=t.bind((e=>t=>tm(t,e).bind((e=>le(Mh(e)).map((e=>Fh(e,t))))))(o)).bind($h(o));return I.some({start:r,end:s})}},Vh=(e,t)=>Z(e,(e=>_n(e,t))),Wh=e=>Mt(Vh(e.cells,e.rng.start),Vh(e.cells,e.rng.end),((t,n)=>e.cells.slice(t,n+1))),Kh=(e,t)=>{const{startTable:n,endTable:o}=t,r=e.cloneRange();return n.each((e=>r.setStartAfter(e.dom))),o.each((e=>r.setEndBefore(e.dom))),r},Yh=(e,t)=>{const n=(e=>t=>_n(e,t))(e),o=((e,t)=>{const n=zh(e.startContainer,t),o=zh(e.endContainer,t);return Mt(n,o,Fh)})(t,n),r=((e,t)=>{const n=Ih(e.startContainer,t),o=Ih(e.endContainer,t),r=n.isSome(),s=o.isSome(),a=Mt(n,o,_n).getOr(!1);return(e=>Mt(e.startTable,e.endTable,((t,n)=>{const o=Lh(t,(e=>_n(e,n))),r=Lh(n,(e=>_n(e,t)));return o||r?{...e,startTable:o?I.none():e.startTable,endTable:r?I.none():e.endTable,isSameTable:!1,isMultiTable:!1}:e})).getOr(e))({startTable:n,endTable:o,isStartInTable:r,isEndInTable:s,isSameTable:a,isMultiTable:!a&&r&&s})})(t,n);return((e,t,n)=>e.exists((e=>((e,t)=>!jh(e)&&Hh(e,t).exists((e=>{const t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})))(e,n)&&rm(e.start,t))))(o,t,n)?o.map((e=>Uh.singleCellTable(t,e.start))):r.isMultiTable?((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:o})=>{const r=e.bind(Wh).getOr([]),s=o.bind(Wh).getOr([]);if(r.length>0&&s.length>0){const e=Kh(n,t);return I.some(Uh.multiTable(r,s,e))}return I.none()})))(o,r,t,n):((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:t})=>e.or(t))).bind((e=>{const{isSameTable:o}=t,r=Wh(e).getOr([]);if(o&&e.cells.length===r.length)return I.some(Uh.fullTable(e.table));if(r.length>0){if(o)return I.some(Uh.partialTable(r,I.none()));{const e=Kh(n,t);return I.some(Uh.partialTable(r,I.some({...t,rng:e})))}}return I.none()})))(o,r,t,n)},Gh=e=>V(e,(e=>{on(e,"contenteditable"),Or(e)})),Xh=(e,t,n,o)=>{const r=n.cloneRange();o?(r.setStart(n.startContainer,n.startOffset),r.setEndAfter(t.dom.lastChild)):(r.setStartBefore(t.dom.firstChild),r.setEnd(n.endContainer,n.endOffset)),eb(e,r,t,!1).each((e=>e()))},Qh=e=>{const t=em(e),n=yn(e.selection.getNode());cr(n.dom)&&gs(n)?e.selection.setCursorLocation(n.dom,0):e.selection.collapse(!0),t.length>1&&$(t,(e=>_n(e,n)))&&Jt(n,"data-mce-selected","1")},Jh=(e,t,n)=>I.some((()=>{const o=e.selection.getRng(),r=n.bind((({rng:n,isStartInTable:r})=>{const s=((e,t)=>I.from(e.dom.getParent(t,e.dom.isBlock)).map(yn))(e,r?n.endContainer:n.startContainer);n.deleteContents(),((e,t,n)=>{n.each((n=>{t?xo(n):(Or(n),e.selection.setCursorLocation(n.dom,0))}))})(e,r,s.filter(gs));const a=r?t[0]:t[t.length-1];return Xh(e,a,o,r),gs(a)?I.none():I.some(r?t.slice(1):t.slice(0,-1))})).getOr(t);Gh(r),Qh(e)})),Zh=(e,t,n,o)=>I.some((()=>{const r=e.selection.getRng(),s=t[0],a=n[n.length-1];Xh(e,s,r,!0),Xh(e,a,r,!1);const i=gs(s)?t:t.slice(1),l=gs(a)?n:n.slice(0,-1);Gh(i.concat(l)),o.deleteContents(),Qh(e)})),eb=(e,t,n,o=!0)=>I.some((()=>{Ph(e,t,n,o)})),tb=(e,t)=>I.some((()=>vh(e,!1,t))),nb=(e,t)=>J(Bp(t,e),Rr),ob=(e,t)=>J(Bp(t,e),Xt("caption")),rb=(e,t)=>I.some((()=>{Or(t),e.selection.setCursorLocation(t.dom,0)})),sb=(e,t)=>e?Np(t):Rp(t),ab=(e,t,n)=>{const o=yn(e.getBody());return ob(o,n).fold((()=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return nb(n,o).bind((o=>gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).bind((e=>nb(t,yn(e.getNode())).bind((e=>_n(e,o)?I.none():I.some(_))))))(e,n,t,o,r)))})(e,t,o,n).orThunk((()=>It(((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return sb(t,n)||ku(t,e.getBody(),n).exists((e=>sb(t,e)))})(e,t),_)))),(n=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).fold((()=>I.some(_)),(s=>((e,t,n,o)=>Ou(e.dom).bind((r=>Bu(e.dom).map((e=>t?n.isEqual(r)&&o.isEqual(e):n.isEqual(e)&&o.isEqual(r))))).getOr(!0))(o,n,r,s)?((e,t)=>rb(e,t))(e,o):((e,t,n)=>ob(e,yn(n.getNode())).fold((()=>I.some(_)),(e=>It(!_n(e,t),_))))(t,o,s))))(e,n,t,o,r)})(e,t,o,n)))},ib=(e,t)=>{const n=yn(e.selection.getStart(!0)),o=em(e);return e.selection.isCollapsed()&&0===o.length?ab(e,t,n):((e,t,n)=>{const o=yn(e.getBody()),r=e.selection.getRng();return 0!==n.length?Jh(e,n,I.none()):((e,t,n,o)=>ob(t,o).fold((()=>((e,t,n)=>Yh(t,n).bind((t=>t.fold(T(eb,e),T(tb,e),T(Jh,e),T(Zh,e)))))(e,t,n)),(t=>((e,t)=>rb(e,t))(e,t))))(e,o,r,t)})(e,n,o)},lb=(e,t)=>{let n=t;for(;n&&n!==e;){if(lr(n)||dr(n))return n;n=n.parentNode}return null},db=["data-ephox-","data-mce-","data-alloy-","data-snooker-","_"],cb=Pt.each,ub=e=>{const t=e.dom,n=new Set(e.serializer.getTempAttrs()),o=e=>$(db,(t=>He(e,t)))||n.has(e);return{compare:(e,n)=>{if(e.nodeName!==n.nodeName||e.nodeType!==n.nodeType)return!1;const r=e=>{const n={};return cb(t.getAttribs(e),(r=>{const s=r.nodeName.toLowerCase();"style"===s||o(s)||(n[s]=t.getAttrib(e,s))})),n},s=(e,t)=>{for(const n in e)if(Ee(e,n)){const o=t[n];if(v(o))return!1;if(e[n]!==o)return!1;delete t[n]}for(const e in t)if(Ee(t,e))return!1;return!0};if(qo(e)&&qo(n)){if(!s(r(e),r(n)))return!1;if(!s(t.parseStyle(t.getAttrib(e,"style")),t.parseStyle(t.getAttrib(n,"style"))))return!1}return!Ku(e)&&!Ku(n)},isAttributeInternal:o}},mb=e=>["h1","h2","h3","h4","h5","h6"].includes(e.name),fb=(e,t,n,o)=>{const r=n.name;for(let t=0,s=e.length;t<s;t++){const s=e[t];if(s.name===r){const e=o.nodes[r];e?e.nodes.push(n):o.nodes[r]={filter:s,nodes:[n]}}}if(n.attributes)for(let e=0,r=t.length;e<r;e++){const r=t[e],s=r.name;if(s in n.attributes.map){const e=o.attributes[s];e?e.nodes.push(n):o.attributes[s]={filter:r,nodes:[n]}}}},gb=(e,t)=>{const n=(e,n)=>{ge(e,(e=>{const o=ce(e.nodes);V(e.filter.callbacks,(r=>{for(let t=o.length-1;t>=0;t--){const r=o[t];(n?void 0!==r.attr(e.filter.name):r.name===e.filter.name)&&!y(r.parent)||o.splice(t,1)}o.length>0&&r(o,e.filter.name,t)}))}))};n(e.nodes,!1),n(e.attributes,!0)},pb=(e,t,n,o={})=>{const r=((e,t,n)=>{const o={nodes:{},attributes:{}};return n.firstChild&&((n,r)=>{let s=n;for(;s=s.walk();)fb(e,t,s,o)})(n),o})(e,t,n);gb(r,o)},hb=(e,t,n,o)=>{if((e.pad_empty_with_br||t.insert)&&n(o)){const e=new Wg("br",1);t.insert&&e.attr("data-mce-bogus","1"),o.empty().append(e)}else o.empty().append(new Wg("#text",3)).value=br},bb=(e,t)=>{const n=null==e?void 0:e.firstChild;return C(n)&&n===e.lastChild&&n.name===t},vb=(e,t,n,o)=>o.isEmpty(t,n,(t=>((e,t)=>{const n=e.getElementRule(t.name);return!0===(null==n?void 0:n.paddEmpty)})(e,t))),yb=e=>{let t;for(let n=e;n;n=n.parent){const e=n.attr("contenteditable");if("false"===e)break;"true"===e&&(t=n)}return I.from(t)},Cb=(e,t,n=e.parent)=>{if(t.getSpecialElements()[e.name])e.empty().remove();else{const o=e.children();for(const e of o)n&&!t.isValidChild(n.name,e.name)&&Cb(e,t,n);e.unwrap()}},wb=(e,t,n,o=_)=>{const r=t.getTextBlockElements(),s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=Pt.makeMap("tr,td,th,tbody,thead,tfoot,table,summary"),l=new Set,d=e=>e!==n&&!i[e.name];for(let n=0;n<e.length;n++){const i=e[n];let c,u,m;if(!i.parent||l.has(i))continue;if(r[i.name]&&"li"===i.parent.name){let e=i.next;for(;e&&r[e.name];)e.name="li",l.add(e),i.parent.insert(e,i.parent),e=e.next;i.unwrap();continue}const f=[i];for(c=i.parent;c&&!t.isValidChild(c.name,i.name)&&d(c);c=c.parent)f.push(c);if(c&&f.length>1)if(xb(t,i,c))Cb(i,t);else{f.reverse(),u=f[0].clone(),o(u);let e=u;for(let n=0;n<f.length-1;n++){t.isValidChild(e.name,f[n].name)&&n>0?(m=f[n].clone(),o(m),e.append(m)):m=e;for(let e=f[n].firstChild;e&&e!==f[n+1];){const t=e.next;m.append(e),e=t}e=m}vb(t,s,a,u)?c.insert(i,f[0],!0):(c.insert(u,f[0],!0),c.insert(i,u)),c=f[0],(vb(t,s,a,c)||bb(c,"br"))&&c.empty().remove()}else if(i.parent){if("li"===i.name){let e=i.prev;if(e&&("ul"===e.name||"ol"===e.name)){e.append(i);continue}if(e=i.next,e&&("ul"===e.name||"ol"===e.name)&&e.firstChild){e.insert(i,e.firstChild,!0);continue}const t=new Wg("ul",1);o(t),i.wrap(t);continue}if(t.isValidChild(i.parent.name,"div")&&t.isValidChild("div",i.name)){const e=new Wg("div",1);o(e),i.wrap(e)}else Cb(i,t)}}},xb=(e,t,n=t.parent)=>!(!n||(!e.children[t.name]||e.isValidChild(n.name,t.name))&&("a"!==t.name||!((e,t)=>{let n=e;for(;n;){if("a"===n.name)return!0;n=n.parent}return!1})(n))&&(!(e=>"summary"===e.name)(n)||!mb(t)||(null==n?void 0:n.firstChild)===t&&(null==n?void 0:n.lastChild)===t)),Eb=e=>e.collapsed?e:(e=>{const t=Vi.fromRangeStart(e),n=Vi.fromRangeEnd(e),o=e.commonAncestorContainer;return ku(!1,o,n).map((r=>!Qc(t,n,o)&&Qc(t,r,o)?((e,t,n,o)=>{const r=document.createRange();return r.setStart(e,t),r.setEnd(n,o),r})(t.container(),t.offset(),r.container(),r.offset()):e)).getOr(e)})(e),_b=(e,t)=>{let n=t.firstChild,o=t.lastChild;return n&&"meta"===n.name&&(n=n.next),o&&"mce_marker"===o.attr("id")&&(o=o.prev),((e,t)=>{const n=e.getNonEmptyElements();return C(t)&&(t.isEmpty(n)||((e,t)=>e.getBlockElements()[t.name]&&(e=>C(e.firstChild)&&e.firstChild===e.lastChild)(t)&&(e=>"br"===e.name||e.value===br)(t.firstChild))(e,t))})(e,o)&&(o=null==o?void 0:o.prev),!(!n||n!==o||"ul"!==n.name&&"ol"!==n.name)},kb=e=>{return e.length>0&&(!(n=e[e.length-1]).firstChild||C(null==(t=n)?void 0:t.firstChild)&&t.firstChild===t.lastChild&&(e=>e.data===br||ar(e))(t.firstChild))?e.slice(0,-1):e;var t,n},Sb=(e,t)=>{const n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Nb=(e,t)=>{const n=Vi.after(e),o=wu(t).prev(n);return o?o.toRange():null},Rb=(e,t,n,o)=>{const r=((e,t,n)=>{const o=t.serialize(n);return(e=>{var t,n;const o=e.firstChild,r=e.lastChild;return o&&"META"===o.nodeName&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o)),r&&"mce_marker"===r.id&&(null===(n=r.parentNode)||void 0===n||n.removeChild(r)),e})(e.createFragment(o))})(t,e,o),s=Sb(t,n.startContainer),a=kb((i=r.firstChild,Y(null!==(l=null==i?void 0:i.childNodes)&&void 0!==l?l:[],(e=>"LI"===e.nodeName))));var i,l;const d=t.getRoot(),c=e=>{const o=Vi.fromRangeStart(n),r=wu(t.getRoot()),a=1===e?r.prev(o):r.next(o),i=null==a?void 0:a.getNode();return!i||Sb(t,i)!==s};return s?c(1)?((e,t,n)=>{const o=e.parentNode;return o&&Pt.each(t,(t=>{o.insertBefore(t,e)})),((e,t)=>{const n=Vi.before(e),o=wu(t).next(n);return o?o.toRange():null})(e,n)})(s,a,d):c(2)?((e,t,n,o)=>(o.insertAfter(t.reverse(),e),Nb(t[0],n)))(s,a,d,t):((e,t,n,o)=>{const r=((e,t)=>{const n=t.cloneRange(),o=t.cloneRange();return n.setStartBefore(e),o.setEndAfter(e),[n.cloneContents(),o.cloneContents()]})(e,o),s=e.parentNode;return s&&(s.insertBefore(r[0],e),Pt.each(t,(t=>{s.insertBefore(t,e)})),s.insertBefore(r[1],e),s.removeChild(e)),Nb(t[t.length-1],n)})(s,a,d,n):null},Ab=["pre"],Tb=cr,Ob=(e,t,n)=>{var o,r;const s=e.selection,a=e.dom,i=e.parser,l=n.merge,d=up({validate:!0},e.schema),c='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>';n.preserve_zwsp||(t=Dr(t)),-1===t.indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,c);let u=s.getRng();const m=u.startContainer,f=e.getBody();m===f&&s.isCollapsed()&&a.isBlock(f.firstChild)&&((e,t)=>C(t)&&!e.schema.getVoidElements()[t.nodeName])(e,f.firstChild)&&a.isEmpty(f.firstChild)&&(u=a.createRng(),u.setStart(f.firstChild,0),u.setEnd(f.firstChild,0),s.setRng(u)),s.isCollapsed()||(e=>{const t=e.dom,n=Eb(e.selection.getRng());e.selection.setRng(n);const o=t.getParent(n.startContainer,Tb);((e,t,n)=>!!C(n)&&n===e.getParent(t.endContainer,Tb)&&rm(yn(n),t))(t,n,o)?eb(e,n,yn(o)):n.startContainer===n.endContainer&&n.endOffset-n.startOffset==1&&er(n.startContainer.childNodes[n.startOffset])?n.deleteContents():e.getDoc().execCommand("Delete",!1)})(e);const g=s.getNode(),p={context:g.nodeName.toLowerCase(),data:n.data,insert:!0},h=i.parse(t,p);if(!0===n.paste&&_b(e.schema,h)&&((e,t)=>!!Sb(e,t))(a,g))return u=Rb(d,a,s.getRng(),h),u&&s.setRng(u),t;!0===n.paste&&((e,t,n,o)=>{var r;const s=t.firstChild,a=t.lastChild,i=s===("bookmark"===a.attr("data-mce-type")?a.prev:a),l=H(Ab,s.name);if(i&&l){const t="false"!==s.attr("contenteditable"),a=(null===(r=e.getParent(n,e.isBlock))||void 0===r?void 0:r.nodeName.toLowerCase())===s.name,i=I.from(lb(o,n)).forall(lr);return t&&a&&i}return!1})(a,h,g,e.getBody())&&(null===(o=h.firstChild)||void 0===o||o.unwrap()),(e=>{let t=e;for(;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")})(h);let b=h.lastChild;if(b&&"mce_marker"===b.attr("id")){const t=b;for(b=b.prev;b;b=b.walk(!0))if(3===b.type||!a.isBlock(b.name)){b.parent&&e.schema.isValidChild(b.parent.name,"span")&&b.parent.insert(t,b,"br"===b.name);break}}if(e._selectionOverrides.showBlockCaretContainer(g),p.invalid||((e,t,n)=>{var o;return $(n.children(),mb)&&"SUMMARY"===(null===(o=e.getParent(t,e.isBlock))||void 0===o?void 0:o.nodeName)})(a,g,h)){e.selection.setContent(c);let n,o=s.getNode();const l=e.getBody();for(rr(o)?o=n=l:n=o;n&&n!==l;)o=n,n=n.parentNode;t=o===l?l.innerHTML:a.getOuterHTML(o);const u=i.parse(t),m=(e=>{for(let t=e;t;t=t.walk())if("mce_marker"===t.attr("id"))return I.some(t);return I.none()})(u),f=m.bind(yb).getOr(u);m.each((e=>e.replace(h)));const g=h.children(),p=null!==(r=h.parent)&&void 0!==r?r:u;h.unwrap();const b=Y(g,(t=>xb(e.schema,t,p)));wb(b,e.schema,f),pb(i.getNodeFilters(),i.getAttributeFilters(),u),t=d.serialize(u),o===l?a.setHTML(l,t):a.setOuterHTML(o,t)}else t=d.serialize(h),((e,t,n)=>{var o;if("all"===n.getAttribute("data-mce-bogus"))null===(o=n.parentNode)||void 0===o||o.insertBefore(e.dom.createFragment(t),n);else{const o=n.firstChild,r=n.lastChild;!o||o===r&&"BR"===o.nodeName?e.dom.setHTML(n,t):e.selection.setContent(t,{no_events:!0})}})(e,t,g);var v;return((e,t)=>{const n=e.schema.getTextInlineElements(),o=e.dom;if(t){const t=e.getBody(),r=ub(e);Pt.each(o.select("*[data-mce-fragment]"),(e=>{if(C(n[e.nodeName.toLowerCase()])&&((e,t)=>ne(gp(e,t),(e=>!(e=>mp.has(e))(e))))(o,e))for(let n=e.parentElement;C(n)&&n!==t&&!pp(o,e,n);n=n.parentElement)if(r.compare(n,e)){o.remove(e,!0);break}}))}})(e,l),((e,t)=>{var n,o,r;let s;const a=e.dom,i=e.selection;if(!t)return;i.scrollIntoView(t);const l=lb(e.getBody(),t);if(l&&"false"===a.getContentEditable(l))return a.remove(t),void i.select(l);let d=a.createRng();const c=t.previousSibling;if(er(c)){d.setStart(c,null!==(o=null===(n=c.nodeValue)||void 0===n?void 0:n.length)&&void 0!==o?o:0);const e=t.nextSibling;er(e)&&(c.appendData(e.data),null===(r=e.parentNode)||void 0===r||r.removeChild(e))}else d.setStartBefore(t),d.setEndBefore(t);const u=a.getParent(t,a.isBlock);if(a.remove(t),u&&a.isEmpty(u)){const t=Tb(u);wo(yn(u)),d.setStart(u,0),d.setEnd(u,0),t||(e=>!!e.getAttribute("data-mce-fragment"))(u)||!(s=(t=>{let n=Vi.fromRangeStart(t);return n=wu(e.getBody()).next(n),null==n?void 0:n.toRange()})(d))?a.add(u,a.create("br",t?{}:{"data-mce-bogus":"1"})):(d=s,a.remove(u))}i.setRng(d)})(e,a.get("mce_marker")),v=e.getBody(),Pt.each(v.getElementsByTagName("*"),(e=>{e.removeAttribute("data-mce-fragment")})),((e,t,n)=>{I.from(e.getParent(t,"td,th")).map(yn).each((e=>((e,t)=>{Un(e).each((n=>{Bn(n).each((o=>{t.isBlock(Ht(e))&&Er(n)&&t.isBlock(Ht(o))&&xo(n)}))}))})(e,n)))})(a,s.getStart(),e.schema),((e,t,n)=>{const o=On(yn(n),(e=>_n(e,yn(t))));ie(o,o.length-2).filter(Wt).fold((()=>ks(e,t)),(t=>ks(e,t.dom)))})(e.schema,e.getBody(),s.getStart()),t},Bb=e=>e instanceof Wg,Pb=(e,t,n)=>{e.dom.setHTML(e.getBody(),t),!0!==n&&(e=>{Rg(e)&&Ou(e.getBody()).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e)},Db=e=>w(e)?e:L,Lb=(e,t,n)=>{const o=t(e),r=Db(n);return o.orThunk((()=>r(e)?I.none():((e,t,n)=>{let o=e.dom;const r=Db(n);for(;o.parentNode;){o=o.parentNode;const e=yn(o),n=t(e);if(n.isSome())return n;if(r(e))break}return I.none()})(e,t,r)))},Mb=ym,Ib=(e,t,n)=>{const o=e.formatter.get(n);if(o)for(let n=0;n<o.length;n++){const r=o[n];if(Sm(r)&&!1===r.inherit&&e.dom.is(t,r.selector))return!0}return!1},Fb=(e,t,n,o,r)=>{const s=e.dom.getRoot();if(t===s)return!1;const a=e.dom.getParent(t,(t=>!!Ib(e,t,n)||t.parentNode===s||!!jb(e,t,n,o,!0)));return!!jb(e,a,n,o,r)},Ub=(e,t,n)=>!(!Nm(n)||!Mb(t,n.inline))||!(!km(n)||!Mb(t,n.block))||!!Sm(n)&&qo(t)&&e.is(t,n.selector),zb=(e,t,n,o,r,s)=>{const a=n[o],i="attributes"===o;if(w(n.onmatch))return n.onmatch(t,n,o);if(a)if(Se(a)){for(let n=0;n<a.length;n++)if(i?e.getAttrib(t,a[n]):wm(e,t,a[n]))return!0}else for(const o in a)if(Ee(a,o)){const l=i?e.getAttrib(t,o):wm(e,t,o),d=vm(a[o],s),c=y(l)||Ge(l);if(c&&y(d))continue;if(r&&c&&!n.exact)return!1;if((!r||n.exact)&&!Mb(l,Cm(d,o)))return!1}return!0},jb=(e,t,n,o,r)=>{const s=e.formatter.get(n),a=e.dom;if(s&&qo(t))for(let n=0;n<s.length;n++){const i=s[n];if(Ub(e.dom,t,i)&&zb(a,t,i,"attributes",r,o)&&zb(a,t,i,"styles",r,o)){const n=i.classes;if(n)for(let r=0;r<n.length;r++)if(!e.dom.hasClass(t,vm(n[r],o)))return;return i}}},Hb=(e,t,n,o,r)=>{if(o)return Fb(e,o,t,n,r);if(o=e.selection.getNode(),Fb(e,o,t,n,r))return!0;const s=e.selection.getStart();return!(s===o||!Fb(e,s,t,n,r))},$b=Br,qb=e=>{if(e){const t=new jo(e,e);for(let e=t.current();e;e=t.next())if(er(e))return e}return null},Vb=e=>{const t=bn("span");return Zt(t,{id:Pu,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&vo(t,vn($b)),t},Wb=(e,t,n)=>{const o=e.dom,r=e.selection;if(Am(t))vh(e,!1,yn(t),n,!0);else{const e=r.getRng(),n=o.getParent(t,o.isBlock),s=e.startContainer,a=e.startOffset,i=e.endContainer,l=e.endOffset,d=(e=>{const t=qb(e);return t&&t.data.charAt(0)===$b&&t.deleteData(0,1),t})(t);o.remove(t,!0),s===d&&a>0&&e.setStart(d,a-1),i===d&&l>0&&e.setEnd(d,l-1),n&&o.isEmpty(n)&&Or(yn(n)),r.setRng(e)}},Kb=(e,t,n)=>{const o=e.dom,r=e.selection;if(t)Wb(e,t,n);else if(!(t=Lu(e.getBody(),r.getStart())))for(;t=o.get(Pu);)Wb(e,t,n)},Yb=(e,t)=>(e.appendChild(t),t),Gb=(e,t)=>{var n;const o=G(e,((e,t)=>Yb(e,t.cloneNode(!1))),t),r=null!==(n=o.ownerDocument)&&void 0!==n?n:document;return Yb(o,r.createTextNode($b))},Xb=(e,t,n,o)=>{const a=e.dom,i=e.selection;let l=!1;const d=e.formatter.get(t);if(!d)return;const c=i.getRng(),u=c.startContainer,m=c.startOffset;let f=u;er(u)&&(m!==u.data.length&&(l=!0),f=f.parentNode);const g=[];let h;for(;f;){if(jb(e,f,t,n,o)){h=f;break}f.nextSibling&&(l=!0),g.push(f),f=f.parentNode}if(h)if(l){const r=i.getBookmark();c.collapse(!0);let s=Vm(a,c,d,!0);s=Ff(s),e.formatter.remove(t,n,s,o),i.moveToBookmark(r)}else{const l=Lu(e.getBody(),h),d=C(l)?a.getParents(h.parentNode,M,l):[],c=Vb(!1).dom;((e,t,n)=>{var o,r;const s=e.dom,a=s.getParent(n,T(gm,e.schema));a&&s.isEmpty(a)?null===(o=n.parentNode)||void 0===o||o.replaceChild(t,n):((e=>{const t=Uo(e,"br"),n=Y((e=>{const t=[];let n=e.dom;for(;n;)t.push(yn(n)),n=n.lastChild;return t})(e).slice(-1),Er);t.length===n.length&&V(n,xo)})(yn(n)),s.isEmpty(n)?null===(r=n.parentNode)||void 0===r||r.replaceChild(t,n):s.insertAfter(t,n))})(e,c,null!=l?l:h);const u=((e,t,n,o,a,i)=>{const l=e.formatter,d=e.dom,c=Y(me(l.get()),(e=>e!==o&&!je(e,"removeformat"))),u=((e,t,n)=>X(n,((n,o)=>{const r=((e,t)=>_m(e,t,(e=>{const t=e=>w(e)||e.length>1&&"%"===e.charAt(0);return $(["styles","attributes"],(n=>xe(e,n).exists((e=>{const n=p(e)?e:we(e);return $(n,t)}))))})))(e,o);return e.formatter.matchNode(t,o,{},r)?n.concat([o]):n}),[]))(e,n,c);if(Y(u,(t=>!((e,t,n)=>{const o=["inline","block","selector","attributes","styles","classes"],a=e=>ye(e,((e,t)=>$(o,(e=>e===t))));return _m(e,t,(t=>{const o=a(t);return _m(e,n,(e=>{const t=a(e);return((e,t,n=s)=>r(n).eq(e,t))(o,t)}))}))})(e,t,o))).length>0){const e=n.cloneNode(!1);return d.add(t,e),l.remove(o,a,e,i),d.remove(e),I.some(e)}return I.none()})(e,c,h,t,n,o),m=Gb([...g,...u.toArray(),...d],c);l&&Wb(e,l,C(l)),i.setCursorLocation(m,1),a.isEmpty(h)&&a.remove(h)}},Qb=e=>{const t=Vb(!1),n=Gb(e,t.dom);return{caretContainer:t,caretPosition:Vi(n,0)}},Jb=(e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return po(yn(e),n),xo(yn(e)),o},Zb=(e,t)=>{if(Du(t.dom))return!1;const n=e.schema.getTextInlineElements();return Ee(n,Ht(t))&&!Du(t.dom)&&!Xo(t.dom)},ev={},tv=Ko(["pre"]);((e,t)=>{ev[e]||(ev[e]=[]),ev[e].push((e=>{if(!e.selection.getRng().collapsed){const t=e.selection.getSelectedBlocks(),n=Y(Y(t,tv),(e=>t=>{const n=t.previousSibling;return tv(n)&&H(e,n)})(t));V(n,(e=>{((e,t)=>{const n=yn(t),o=Nn(n).dom;xo(n),Co(yn(e),[bn("br",o),bn("br",o),...Mn(n)])})(e.previousSibling,e)}))}}))})("pre");const nv=["fontWeight","fontStyle","color","fontSize","fontFamily"],ov=(e,t)=>{const n=e.get(t);return p(n)?J(n,(e=>Nm(e)&&"span"===e.inline&&(e=>f(e.styles)&&$(me(e.styles),(e=>H(nv,e))))(e))):I.none()},rv=(e,t)=>Tu(t,Vi.fromRangeStart(e)).isNone(),sv=(e,t)=>!1===Au(t,Vi.fromRangeEnd(e)).exists((e=>!ar(e.getNode())||Au(t,e).isSome())),av=e=>t=>fr(t)&&e.isEditable(t),iv=e=>Y(e.getSelectedBlocks(),av(e.dom)),lv=Pt.each,dv=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),cv=(e,t)=>{for(let n=e;n;n=n[t]){if(er(n)&&Ye(n.data))return e;if(qo(n)&&!Ku(n))return n}return e},uv=(e,t,n)=>{const o=ub(e),r=Vo(t)&&e.dom.isEditable(t),s=Vo(n)&&e.dom.isEditable(n);if(r&&s){const r=cv(t,"previousSibling"),s=cv(n,"nextSibling");if(o.compare(r,s)){for(let e=r.nextSibling;e&&e!==s;){const t=e;e=e.nextSibling,r.appendChild(t)}return e.dom.remove(s),Pt.each(Pt.grep(s.childNodes),(e=>{r.appendChild(e)})),r}}return n},mv=(e,t,n,o)=>{var r;if(o&&!1!==t.merge_siblings){const t=null!==(r=uv(e,fm(o),o))&&void 0!==r?r:o;uv(e,t,fm(t,!0))}},fv=(e,t,n)=>{lv(e.childNodes,(e=>{dv(e)&&(t(e)&&n(e),e.hasChildNodes()&&fv(e,t,n))}))},gv=(e,t)=>n=>!(!n||!wm(e,n,t)),pv=(e,t,n)=>o=>{e.setStyle(o,t,n),""===o.getAttribute("style")&&o.removeAttribute("style"),((e,t)=>{"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)})(e,o)},hv=hl([{keep:[]},{rename:["name"]},{removed:[]}]),bv=/^(src|href|style)$/,vv=Pt.each,yv=ym,Cv=(e,t,n)=>e.isChildOf(t,n)&&t!==n&&!e.isBlock(n),wv=(e,t,n)=>{let o=t[n?"startContainer":"endContainer"],r=t[n?"startOffset":"endOffset"];if(qo(o)){const e=o.childNodes.length-1;!n&&r&&r--,o=o.childNodes[r>e?e:r]}return er(o)&&n&&r>=o.data.length&&(o=new jo(o,e.getBody()).next()||o),er(o)&&!n&&0===r&&(o=new jo(o,e.getBody()).prev()||o),o},xv=(e,t)=>{const n=t?"firstChild":"lastChild",o=e[n];return(e=>/^(TR|TH|TD)$/.test(e.nodeName))(e)&&o?"TR"===e.nodeName&&o[n]||o:e},Ev=(e,t,n,o)=>{var r;const s=e.create(n,o);return null===(r=t.parentNode)||void 0===r||r.insertBefore(s,t),s.appendChild(t),s},_v=(e,t,n,o,r)=>{const s=yn(t),a=yn(e.create(o,r)),i=n?Ln(s):Dn(s);return Co(a,i),n?(po(s,a),bo(a,s)):(ho(s,a),vo(a,s)),a.dom},kv=(e,t,n)=>{const o=t.parentNode;let r;const s=e.dom,a=Il(e);km(n)&&o===s.getRoot()&&(n.list_block&&yv(t,n.list_block)||V(ce(t.childNodes),(t=>{pm(e,a,t.nodeName.toLowerCase())?r?r.appendChild(t):(r=Ev(s,t,a),s.setAttribs(r,Fl(e))):r=null}))),(e=>Sm(e)&&Nm(e)&&Dt(xe(e,"mixed"),!0))(n)&&!yv(n.inline,t)||s.remove(t,!0)},Sv=(e,t,n)=>x(e)?{name:t,value:null}:{name:e,value:vm(t,n)},Nv=(e,t)=>{""===e.getAttrib(t,"style")&&(t.removeAttribute("style"),t.removeAttribute("data-mce-style"))},Rv=(e,t,n,o,r)=>{let s=!1;vv(n.styles,((a,i)=>{const{name:l,value:d}=Sv(i,a,o),c=Cm(d,l);(n.remove_similar||h(d)||!qo(r)||yv(wm(e,r,l),c))&&e.setStyle(t,l,""),s=!0})),s&&Nv(e,t)},Av=(e,t,n,o,r)=>{const s=e.dom,a=ub(e),i=e.schema;if(Nm(t)&&Rs(i,t.inline)&&Ts(i,o)&&o.parentElement===e.getBody())return kv(e,o,t),hv.removed();if(!t.ceFalseOverride&&o&&"false"===s.getContentEditableParent(o))return hv.keep();if(o&&!Ub(s,o,t)&&!((e,t)=>t.links&&"A"===e.nodeName)(o,t))return hv.keep();const l=o,d=t.preserve_attributes;if(Nm(t)&&"all"===t.remove&&p(d)){const e=Y(s.getAttribs(l),(e=>H(d,e.name.toLowerCase())));if(s.removeAllAttribs(l),V(e,(e=>s.setAttrib(l,e.name,e.value))),e.length>0)return hv.rename("span")}if("all"!==t.remove){Rv(s,l,t,n,r),vv(t.attributes,((e,o)=>{const{name:a,value:i}=Sv(o,e,n);if(t.remove_similar||h(i)||!qo(r)||yv(s.getAttrib(r,a),i)){if("class"===a){const e=s.getAttrib(l,a);if(e){let t="";if(V(e.split(/\s+/),(e=>{/mce\-\w+/.test(e)&&(t+=(t?" ":"")+e)})),t)return void s.setAttrib(l,a,t)}}if(bv.test(a)&&l.removeAttribute("data-mce-"+a),"style"===a&&Ko(["li"])(l)&&"none"===s.getStyle(l,"list-style-type"))return l.removeAttribute(a),void s.setStyle(l,"list-style-type","none");"class"===a&&l.removeAttribute("className"),l.removeAttribute(a)}})),vv(t.classes,(e=>{e=vm(e,n),qo(r)&&!s.hasClass(r,e)||s.removeClass(l,e)}));const e=s.getAttribs(l);for(let t=0;t<e.length;t++){const n=e[t].nodeName;if(!a.isAttributeInternal(n))return hv.keep()}}return"none"!==t.remove?(kv(e,l,t),hv.removed()):hv.keep()},Tv=(e,t,n,o)=>Av(e,t,n,o,o).fold(N(o),(t=>(e.dom.createFragment().appendChild(o),e.dom.rename(o,t))),N(null)),Ov=(e,t,n,o,r)=>{(o||e.selection.isEditable())&&((e,t,n,o,r)=>{const s=e.formatter.get(t),a=s[0],i=e.dom,l=e.selection,d=o=>{const i=((e,t,n,o,r)=>{let s;return t.parentNode&&V(Em(e.dom,t.parentNode).reverse(),(t=>{if(!s&&qo(t)&&"_start"!==t.id&&"_end"!==t.id){const a=jb(e,t,n,o,r);a&&!1!==a.split&&(s=t)}})),s})(e,o,t,n,r);return((e,t,n,o,r,s,a,i)=>{var l,d;let c,u;const m=e.dom;if(n){const s=n.parentNode;for(let n=o.parentNode;n&&n!==s;n=n.parentNode){let o=m.clone(n,!1);for(let n=0;n<t.length&&(o=Tv(e,t[n],i,o),null!==o);n++);o&&(c&&o.appendChild(c),u||(u=o),c=o)}a.mixed&&m.isBlock(n)||(o=null!==(l=m.split(n,o))&&void 0!==l?l:o),c&&u&&(null===(d=r.parentNode)||void 0===d||d.insertBefore(c,r),u.appendChild(r),Nm(a)&&mv(e,a,0,c))}return o})(e,s,i,o,o,0,a,n)},c=t=>$(s,(o=>Bv(e,o,n,t,t))),u=t=>{const n=ce(t.childNodes),o=c(t)||$(s,(e=>Ub(i,t,e))),r=t.parentNode;if(!o&&C(r)&&Rm(a)&&c(r),a.deep&&n.length)for(let e=0;e<n.length;e++)u(n[e]);V(["underline","line-through","overline"],(n=>{qo(t)&&e.dom.getStyle(t,"text-decoration")===n&&t.parentNode&&xm(i,t.parentNode)===n&&Bv(e,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:n}},void 0,t)}))},m=e=>{const t=i.get(e?"_start":"_end");if(t){let n=t[e?"firstChild":"lastChild"];return(e=>Ku(e)&&qo(e)&&("_start"===e.id||"_end"===e.id))(n)&&(n=n[e?"firstChild":"lastChild"]),er(n)&&0===n.data.length&&(n=e?t.previousSibling||t.nextSibling:t.nextSibling||t.previousSibling),i.remove(t,!0),n}return null},f=t=>{let n,o,r=Vm(i,t,s,t.collapsed);if(a.split){if(r=Ff(r),n=wv(e,r,!0),o=wv(e,r),n!==o){if(n=xv(n,!0),o=xv(o,!1),Cv(i,n,o)){const e=I.from(n.firstChild).getOr(n);return d(_v(i,e,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void m(!0)}if(Cv(i,o,n)){const e=I.from(o.lastChild).getOr(o);return d(_v(i,e,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void m(!1)}n=Ev(i,n,"span",{id:"_start","data-mce-type":"bookmark"}),o=Ev(i,o,"span",{id:"_end","data-mce-type":"bookmark"});const e=i.createRng();e.setStartAfter(n),e.setEndBefore(o),Wm(i,e,(e=>{V(e,(e=>{Ku(e)||Ku(e.parentNode)||d(e)}))})),d(n),d(o),n=m(!0),o=m()}else n=o=d(n);r.startContainer=n.parentNode?n.parentNode:n,r.startOffset=i.nodeIndex(n),r.endContainer=o.parentNode?o.parentNode:o,r.endOffset=i.nodeIndex(o)+1}Wm(i,r,(e=>{V(e,u)}))};if(o){if(dm(o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(e)}else f(o);nf(e,t,o,n)}else l.isCollapsed()&&Nm(a)&&!em(e).length?Xb(e,t,n,r):(um(e,(()=>im(e,f)),(o=>Nm(a)&&Hb(e,t,n,o))),e.nodeChanged()),((e,t,n)=>{"removeformat"===t?V(iv(e.selection),(t=>{V(nv,(n=>e.dom.setStyle(t,n,""))),Nv(e.dom,t)})):ov(e.formatter,t).each((t=>{V(iv(e.selection),(o=>Rv(e.dom,o,t,n,null)))}))})(e,t,n),nf(e,t,o,n)})(e,t,n,o,r)},Bv=(e,t,n,o,r)=>Av(e,t,n,o,r).fold(L,(t=>(e.dom.rename(o,t),!0)),M),Pv=Pt.each,Dv=Pt.each,Lv=(e,t,n,o)=>{if(Dv(n.styles,((n,r)=>{e.setStyle(t,r,vm(n,o))})),n.styles){const n=e.getAttrib(t,"style");n&&e.setAttrib(t,"data-mce-style",n)}},Mv=(e,t,n,o)=>{const r=e.formatter.get(t),s=r[0],a=!o&&e.selection.isCollapsed(),i=e.dom,l=e.selection,d=(e,t=s)=>{w(t.onformat)&&t.onformat(e,t,n,o),Lv(i,e,t,n),Dv(t.attributes,((t,o)=>{i.setAttrib(e,o,vm(t,n))})),Dv(t.classes,(t=>{const o=vm(t,n);i.hasClass(e,o)||i.addClass(e,o)}))},c=(e,t)=>{let n=!1;return Dv(e,(e=>!(!Sm(e)||("false"!==i.getContentEditable(t)||e.ceFalseOverride)&&(!C(e.collapsed)||e.collapsed===a)&&i.is(t,e.selector)&&!Du(t)&&(d(t,e),n=!0,1)))),n},u=e=>{if(m(e)){const t=i.create(e);return d(t),t}return null},f=(o,a,i)=>{const l=[];let m=!0;const f=s.inline||s.block,g=u(f);Wm(o,a,(a=>{let u;const p=a=>{let h=!1,b=m,v=!1;const y=a.parentNode,w=y.nodeName.toLowerCase(),x=o.getContentEditable(a);C(x)&&(b=m,m="true"===x,h=!0,v=bm(e,a));const E=m&&!h;if(ar(a)&&!((e,t,n,o)=>{if(xd(e)&&Nm(t)&&n.parentNode){const t=da(e.schema),r=Dh(yn(n),(e=>Du(e.dom)));return _e(t,o)&&gs(yn(n.parentNode),!1)&&!r}return!1})(e,s,a,w))return u=null,void(km(s)&&o.remove(a));if((o=>(e=>km(e)&&!0===e.wrapper)(s)&&jb(e,o,t,n))(a))u=null;else{if(((t,n,o)=>{const r=(e=>km(e)&&!0!==e.wrapper)(s)&&gm(e.schema,t)&&pm(e,n,f);return o&&r})(a,w,E)){const e=o.rename(a,f);return d(e),l.push(e),void(u=null)}if(Sm(s)){let e=c(r,a);if(!e&&C(y)&&Rm(s)&&(e=c(r,y)),!Nm(s)||e)return void(u=null)}C(g)&&((t,n,r,a)=>{const l=t.nodeName.toLowerCase(),d=pm(e,f,l)&&pm(e,n,f),c=!i&&er(t)&&Pr(t.data),u=Du(t),m=!Nm(s)||!o.isBlock(t);return(r||a)&&d&&!c&&!u&&m})(a,w,E,v)?(u||(u=o.clone(g,!1),y.insertBefore(u,a),l.push(u)),v&&h&&(m=b),u.appendChild(a)):(u=null,V(ce(a.childNodes),p),h&&(m=b),u=null)}};V(a,p)})),!0===s.links&&V(l,(e=>{const t=e=>{"A"===e.nodeName&&d(e,s),V(ce(e.childNodes),t)};t(e)})),V(l,(a=>{const i=(e=>{let t=0;return V(e.childNodes,(e=>{(e=>C(e)&&er(e)&&0===e.length)(e)||Ku(e)||t++})),t})(a);!(l.length>1)&&o.isBlock(a)||0!==i?(Nm(s)||km(s)&&s.wrapper)&&(s.exact||1!==i||(a=(e=>{const t=J(e.childNodes,cm).filter((e=>"false"!==o.getContentEditable(e)&&Ub(o,e,s)));return t.map((t=>{const n=o.clone(t,!1);return d(n),o.replace(n,e,!0),o.remove(t,!0),n})).getOr(e)})(a)),((e,t,n,o)=>{Pv(t,(t=>{Nm(t)&&Pv(e.dom.select(t.inline,o),(o=>{dv(o)&&Bv(e,t,n,o,t.exact?o:null)})),((e,t,n)=>{if(t.clear_child_styles){const o=t.links?"*:not(a)":"*";lv(e.select(o,n),(n=>{dv(n)&&e.isEditable(n)&&lv(t.styles,((t,o)=>{e.setStyle(n,o,"")}))}))}})(e.dom,t,o)}))})(e,r,n,a),((e,t,n,o,r)=>{const s=r.parentNode;jb(e,s,n,o)&&Bv(e,t,o,r)||t.merge_with_parents&&s&&e.dom.getParent(s,(s=>!!jb(e,s,n,o)&&(Bv(e,t,o,r),!0)))})(e,s,t,n,a),((e,t,n,o)=>{if(t.styles&&t.styles.backgroundColor){const r=gv(e,"fontSize");fv(o,(t=>r(t)&&e.isEditable(t)),pv(e,"backgroundColor",vm(t.styles.backgroundColor,n)))}})(o,s,n,a),((e,t,n,o)=>{const r=t=>{if(Vo(t)&&qo(t.parentNode)&&e.isEditable(t)){const n=xm(e,t.parentNode);e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null)}};t.styles&&(t.styles.color||t.styles.textDecoration)&&(Pt.walk(o,r,"childNodes"),r(o))})(o,s,0,a),((e,t,n,o)=>{if(Nm(t)&&("sub"===t.inline||"sup"===t.inline)){const n=gv(e,"fontSize");fv(o,(t=>n(t)&&e.isEditable(t)),pv(e,"fontSize",""));const r=Y(e.select("sup"===t.inline?"sub":"sup",o),e.isEditable);e.remove(r,!0)}})(o,s,0,a),mv(e,s,0,a)):o.remove(a,!0)}))},g=dm(o)?o:l.getNode();if("false"===i.getContentEditable(g)&&!bm(e,g))return c(r,o=g),void tf(e,t,o,n);if(s){if(o)if(dm(o)){if(!c(r,o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(i,Vm(i,e,r),!0)}}else f(i,o,!0);else a&&Nm(s)&&!em(e).length?((e,t,n)=>{let o;const r=e.selection,s=e.formatter.get(t);if(!s)return;const a=r.getRng();let i=a.startOffset;const l=a.startContainer.nodeValue;o=Lu(e.getBody(),r.getStart());const d=/[^\s\u00a0\u00ad\u200b\ufeff]/;if(l&&i>0&&i<l.length&&d.test(l.charAt(i))&&d.test(l.charAt(i-1))){const o=r.getBookmark();a.collapse(!0);let i=Vm(e.dom,a,s);i=Ff(i),e.formatter.apply(t,n,i),r.moveToBookmark(o)}else{let s=o?qb(o):null;o&&(null==s?void 0:s.data)===$b||(c=e.getDoc(),u=Vb(!0).dom,o=c.importNode(u,!0),s=o.firstChild,a.insertNode(o),i=1),e.formatter.apply(t,n,o),r.setCursorLocation(s,i)}var c,u})(e,t,n):(l.setRng(Eb(l.getRng())),um(e,(()=>{im(e,((e,t)=>{const n=t?e:Vm(i,e,r);f(i,n,!1)}))}),M),e.nodeChanged()),ov(e.formatter,t).each((t=>{V((e=>Y((e=>{const t=e.getSelectedBlocks(),n=e.getRng();if(e.isCollapsed())return[];if(1===t.length)return rv(n,t[0])&&sv(n,t[0])?t:[];{const e=le(t).filter((e=>rv(n,e))).toArray(),o=de(t).filter((e=>sv(n,e))).toArray(),r=t.slice(1,-1);return e.concat(r).concat(o)}})(e),av(e.dom)))(e.selection),(e=>Lv(i,e,t,n)))}));((e,t)=>{Ee(ev,e)&&V(ev[e],(e=>{e(t)}))})(t,e)}tf(e,t,o,n)},Iv=(e,t,n,o)=>{(o||e.selection.isEditable())&&Mv(e,t,n,o)},Fv=e=>Ee(e,"vars"),Uv=e=>e.selection.getStart(),zv=(e,t,n,o,r)=>Q(t,(t=>{const s=e.formatter.matchNode(t,n,null!=r?r:{},o);return!v(s)}),(t=>!!Ib(e,t,n)||!o&&C(e.formatter.matchNode(t,n,r,!0)))),jv=(e,t)=>{const n=null!=t?t:Uv(e);return Y(Em(e.dom,n),(e=>qo(e)&&!Xo(e)))},Hv=(e,t,n)=>{const o=jv(e,t);ge(n,((n,r)=>{const s=n=>{const s=zv(e,o,r,n.similar,Fv(n)?n.vars:void 0),a=s.isSome();if(n.state.get()!==a){n.state.set(a);const e=s.getOr(t);Fv(n)?n.callback(a,{node:e,format:r,parents:o}):V(n.callbacks,(t=>t(a,{node:e,format:r,parents:o})))}};V([n.withSimilar,n.withoutSimilar],s),V(n.withVars,s)}))},$v=Pt.explode,qv=()=>{const e={};return{addFilter:(t,n)=>{V($v(t),(t=>{Ee(e,t)||(e[t]={name:t,callbacks:[]}),e[t].callbacks.push(n)}))},getFilters:()=>we(e),removeFilter:(t,n)=>{V($v(t),(t=>{if(Ee(e,t))if(C(n)){const o=e[t],r=Y(o.callbacks,(e=>e!==n));r.length>0?o.callbacks=r:delete e[t]}else delete e[t]}))}}},Vv=(e,t,n)=>{var o;const r=wa();t.convert_fonts_to_spans&&((e,t,n)=>{e.addNodeFilter("font",(e=>{V(e,(e=>{const o=t.parse(e.attr("style")),r=e.attr("color"),s=e.attr("face"),a=e.attr("size");r&&(o.color=r),s&&(o["font-family"]=s),a&&Xe(a).each((e=>{o["font-size"]=n[e-1]})),e.name="span",e.attr("style",t.serialize(o)),((e,t)=>{V(["color","face","size"],(t=>{e.attr(t,null)}))})(e)}))}))})(e,r,Pt.explode(null!==(o=t.font_size_legacy_values)&&void 0!==o?o:"")),((e,t,n)=>{e.addNodeFilter("strike",(e=>{const o="html4"!==t.type;V(e,(e=>{if(o)e.name="s";else{const t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))}}))}))})(e,n,r)},Wv=(e,t,n)=>{t.addNodeFilter("br",((t,o,r)=>{const s=Pt.extend({},n.getBlockElements()),a=n.getNonEmptyElements(),i=n.getWhitespaceElements();s.body=1;const l=e=>e.name in s||Bs(n,e);for(let o=0,d=t.length;o<d;o++){let d=t[o],c=d.parent;if(c&&l(c)&&d===c.lastChild){let t=d.prev;for(;t;){const e=t.name;if("span"!==e||"bookmark"!==t.attr("data-mce-type")){"br"===e&&(d=null);break}t=t.prev}if(d&&(d.remove(),vb(n,a,i,c))){const t=n.getElementRule(c.name);t&&(t.removeEmpty?c.remove():t.paddEmpty&&hb(e,r,l,c))}}else{let e=d;for(;c&&c.firstChild===e&&c.lastChild===e&&(e=c,!s[c.name]);)c=c.parent;if(e===c){const e=new Wg("#text",3);e.value=br,d.replace(e)}}}}))},Kv=e=>{const[t,...n]=e.split(","),o=n.join(","),r=/data:([^/]+\/[^;]+)(;.+)?/.exec(t);if(r){const e=";base64"===r[2],t=e?(e=>{const t=/([a-z0-9+\/=\s]+)/i.exec(e);return t?t[1]:""})(o):decodeURIComponent(o);return I.some({type:r[1],data:t,base64Encoded:e})}return I.none()},Yv=(e,t,n=!0)=>{let o=t;if(n)try{o=atob(t)}catch(e){return I.none()}const r=new Uint8Array(o.length);for(let e=0;e<r.length;e++)r[e]=o.charCodeAt(e);return I.some(new Blob([r],{type:e}))},Gv=e=>new Promise(((t,n)=>{const o=new FileReader;o.onloadend=()=>{t(o.result)},o.onerror=()=>{var e;n(null===(e=o.error)||void 0===e?void 0:e.message)},o.readAsDataURL(e)}));let Xv=0;const Qv=(e,t,n)=>Kv(e).bind((({data:e,type:o,base64Encoded:r})=>{if(t&&!r)return I.none();{const t=r?e:btoa(e);return n(t,o)}})),Jv=(e,t,n)=>{const o=e.create("blobid"+Xv++,t,n);return e.add(o),o},Zv=(e,t,n=!1)=>Qv(t,n,((t,n)=>I.from(e.getByData(t,n)).orThunk((()=>Yv(n,t).map((n=>Jv(e,n,t))))))),ey=(e,t)=>He(e,`${t}/`),ty=(e,t)=>{const n=e.schema;t.remove_trailing_brs&&Wv(t,e,n),e.addAttributeFilter("href",(e=>{let n=e.length;const o=e=>{const t=e?Pt.trim(e):"";return/\b(noopener)\b/g.test(t)?t:(e=>e.split(" ").filter((e=>e.length>0)).concat(["noopener"]).sort().join(" "))(t)};if(!t.allow_unsafe_link_target)for(;n--;){const t=e[n];"a"===t.name&&"_blank"===t.attr("target")&&t.attr("rel",o(t.attr("rel")))}})),t.allow_html_in_named_anchor||e.addAttributeFilter("id,name",(e=>{let t,n,o,r,s=e.length;for(;s--;)if(r=e[s],"a"===r.name&&r.firstChild&&!r.attr("href"))for(o=r.parent,t=r.lastChild;t&&o;)n=t.prev,o.insert(t,r),t=n})),t.fix_list_elements&&e.addNodeFilter("ul,ol",(e=>{let t,n,o=e.length;for(;o--;)if(t=e[o],n=t.parent,n&&("ul"===n.name||"ol"===n.name))if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{const e=new Wg("li",1);e.attr("style","list-style-type: none"),t.wrap(e)}}));const o=n.getValidClasses();t.validate&&o&&e.addAttributeFilter("class",(e=>{var t;let n=e.length;for(;n--;){const r=e[n],s=null!==(t=r.attr("class"))&&void 0!==t?t:"",a=Pt.explode(s," ");let i="";for(let e=0;e<a.length;e++){const t=a[e];let n=!1,s=o["*"];s&&s[t]&&(n=!0),s=o[r.name],!n&&s&&s[t]&&(n=!0),n&&(i&&(i+=" "),i+=t)}i.length||(i=null),r.attr("class",i)}})),((e,t)=>{const{blob_cache:n}=t;if(n){const t=e=>{const t=e.attr("src");(e=>e.attr("src")===At.transparentSrc||C(e.attr("data-mce-placeholder")))(e)||(e=>C(e.attr("data-mce-bogus")))(e)||y(t)||Zv(n,t,!0).each((t=>{e.attr("src",t.blobUri())}))};e.addAttributeFilter("src",(e=>V(e,t)))}})(e,t),t.convert_unsafe_embeds&&e.addNodeFilter("object,embed",(e=>V(e,(e=>{e.replace(((e,t,n,o,r)=>{let s;s=v(e)?"iframe":ey(e,"image")?"img":ey(e,"video")?"video":ey(e,"audio")?"audio":"iframe";const a=new Wg(s,1);return a.attr("audio"===s?{src:t}:{src:t,width:n,height:o}),"audio"!==s&&"video"!==s||a.attr("controls",""),"iframe"===s&&r&&a.attr("sandbox",""),a})(e.attr("type"),"object"===e.name?e.attr("data"):e.attr("src"),e.attr("width"),e.attr("height"),t.sandbox_iframes))})))),t.sandbox_iframes&&e.addNodeFilter("iframe",(e=>V(e,(e=>e.attr("sandbox","")))))},{entries:ny,setPrototypeOf:oy,isFrozen:ry,getPrototypeOf:sy,getOwnPropertyDescriptor:ay}=Object;let{freeze:iy,seal:ly,create:dy}=Object,{apply:cy,construct:uy}="undefined"!=typeof Reflect&&Reflect;cy||(cy=function(e,t,n){return e.apply(t,n)}),iy||(iy=function(e){return e}),ly||(ly=function(e){return e}),uy||(uy=function(e,t){return new e(...t)});const my=_y(Array.prototype.forEach),fy=_y(Array.prototype.pop),gy=_y(Array.prototype.push),py=_y(String.prototype.toLowerCase),hy=_y(String.prototype.toString),by=_y(String.prototype.match),vy=_y(String.prototype.replace),yy=_y(String.prototype.indexOf),Cy=_y(String.prototype.trim),wy=_y(RegExp.prototype.test),xy=(Ey=TypeError,function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];return uy(Ey,t)});var Ey;function _y(e){return function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return cy(e,t,o)}}function ky(e,t,n){var o;n=null!==(o=n)&&void 0!==o?o:py,oy&&oy(e,null);let r=t.length;for(;r--;){let o=t[r];if("string"==typeof o){const e=n(o);e!==o&&(ry(t)||(t[r]=e),o=e)}e[o]=!0}return e}function Sy(e){const t=dy(null);for(const[n,o]of ny(e))t[n]=o;return t}function Ny(e,t){for(;null!==e;){const n=ay(e,t);if(n){if(n.get)return _y(n.get);if("function"==typeof n.value)return _y(n.value)}e=sy(e)}return function(e){return console.warn("fallback value for",e),null}}const Ry=iy(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Ay=iy(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),Ty=iy(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),Oy=iy(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),By=iy(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),Py=iy(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Dy=iy(["#text"]),Ly=iy(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),My=iy(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Iy=iy(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),Fy=iy(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Uy=ly(/\{\{[\w\W]*|[\w\W]*\}\}/gm),zy=ly(/<%[\w\W]*|[\w\W]*%>/gm),jy=ly(/\${[\w\W]*}/gm),Hy=ly(/^data-[\-\w.\u00B7-\uFFFF]/),$y=ly(/^aria-[\-\w]+$/),qy=ly(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Vy=ly(/^(?:\w+script|data):/i),Wy=ly(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Ky=ly(/^html$/i);var Yy=Object.freeze({__proto__:null,MUSTACHE_EXPR:Uy,ERB_EXPR:zy,TMPLIT_EXPR:jy,DATA_ATTR:Hy,ARIA_ATTR:$y,IS_ALLOWED_URI:qy,IS_SCRIPT_OR_DATA:Vy,ATTR_WHITESPACE:Wy,DOCTYPE_NAME:Ky});const Gy=()=>"undefined"==typeof window?null:window;var Xy=function e(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Gy();const n=t=>e(t);if(n.version="3.0.5",n.removed=[],!t||!t.document||9!==t.document.nodeType)return n.isSupported=!1,n;const o=t.document,r=o.currentScript;let{document:s}=t;const{DocumentFragment:a,HTMLTemplateElement:i,Node:l,Element:d,NodeFilter:c,NamedNodeMap:u=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:m,DOMParser:f,trustedTypes:g}=t,p=d.prototype,h=Ny(p,"cloneNode"),b=Ny(p,"nextSibling"),v=Ny(p,"childNodes"),y=Ny(p,"parentNode");if("function"==typeof i){const e=s.createElement("template");e.content&&e.content.ownerDocument&&(s=e.content.ownerDocument)}let C,w="";const{implementation:x,createNodeIterator:E,createDocumentFragment:_,getElementsByTagName:k}=s,{importNode:S}=o;let N={};n.isSupported="function"==typeof ny&&"function"==typeof y&&x&&void 0!==x.createHTMLDocument;const{MUSTACHE_EXPR:R,ERB_EXPR:A,TMPLIT_EXPR:T,DATA_ATTR:O,ARIA_ATTR:B,IS_SCRIPT_OR_DATA:P,ATTR_WHITESPACE:D}=Yy;let{IS_ALLOWED_URI:L}=Yy,M=null;const I=ky({},[...Ry,...Ay,...Ty,...By,...Dy]);let F=null;const U=ky({},[...Ly,...My,...Iy,...Fy]);let z=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),j=null,H=null,$=!0,q=!0,V=!1,W=!0,K=!1,Y=!1,G=!1,X=!1,Q=!1,J=!1,Z=!1,ee=!0,te=!1,ne=!0,oe=!1,re={},se=null;const ae=ky({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]);let ie=null;const le=ky({},["audio","video","img","source","image","track"]);let de=null;const ce=ky({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ue="http://www.w3.org/1998/Math/MathML",me="http://www.w3.org/2000/svg",fe="http://www.w3.org/1999/xhtml";let ge=fe,pe=!1,he=null;const be=ky({},[ue,me,fe],hy);let ve;const ye=["application/xhtml+xml","text/html"];let Ce,we=null;const xe=s.createElement("form"),Ee=function(e){return e instanceof RegExp||e instanceof Function},_e=function(e){if(!we||we!==e){if(e&&"object"==typeof e||(e={}),e=Sy(e),ve=ve=-1===ye.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,Ce="application/xhtml+xml"===ve?hy:py,M="ALLOWED_TAGS"in e?ky({},e.ALLOWED_TAGS,Ce):I,F="ALLOWED_ATTR"in e?ky({},e.ALLOWED_ATTR,Ce):U,he="ALLOWED_NAMESPACES"in e?ky({},e.ALLOWED_NAMESPACES,hy):be,de="ADD_URI_SAFE_ATTR"in e?ky(Sy(ce),e.ADD_URI_SAFE_ATTR,Ce):ce,ie="ADD_DATA_URI_TAGS"in e?ky(Sy(le),e.ADD_DATA_URI_TAGS,Ce):le,se="FORBID_CONTENTS"in e?ky({},e.FORBID_CONTENTS,Ce):ae,j="FORBID_TAGS"in e?ky({},e.FORBID_TAGS,Ce):{},H="FORBID_ATTR"in e?ky({},e.FORBID_ATTR,Ce):{},re="USE_PROFILES"in e&&e.USE_PROFILES,$=!1!==e.ALLOW_ARIA_ATTR,q=!1!==e.ALLOW_DATA_ATTR,V=e.ALLOW_UNKNOWN_PROTOCOLS||!1,W=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,K=e.SAFE_FOR_TEMPLATES||!1,Y=e.WHOLE_DOCUMENT||!1,Q=e.RETURN_DOM||!1,J=e.RETURN_DOM_FRAGMENT||!1,Z=e.RETURN_TRUSTED_TYPE||!1,X=e.FORCE_BODY||!1,ee=!1!==e.SANITIZE_DOM,te=e.SANITIZE_NAMED_PROPS||!1,ne=!1!==e.KEEP_CONTENT,oe=e.IN_PLACE||!1,L=e.ALLOWED_URI_REGEXP||qy,ge=e.NAMESPACE||fe,z=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(z.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(z.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(z.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),K&&(q=!1),J&&(Q=!0),re&&(M=ky({},[...Dy]),F=[],!0===re.html&&(ky(M,Ry),ky(F,Ly)),!0===re.svg&&(ky(M,Ay),ky(F,My),ky(F,Fy)),!0===re.svgFilters&&(ky(M,Ty),ky(F,My),ky(F,Fy)),!0===re.mathMl&&(ky(M,By),ky(F,Iy),ky(F,Fy))),e.ADD_TAGS&&(M===I&&(M=Sy(M)),ky(M,e.ADD_TAGS,Ce)),e.ADD_ATTR&&(F===U&&(F=Sy(F)),ky(F,e.ADD_ATTR,Ce)),e.ADD_URI_SAFE_ATTR&&ky(de,e.ADD_URI_SAFE_ATTR,Ce),e.FORBID_CONTENTS&&(se===ae&&(se=Sy(se)),ky(se,e.FORBID_CONTENTS,Ce)),ne&&(M["#text"]=!0),Y&&ky(M,["html","head","body"]),M.table&&(ky(M,["tbody"]),delete j.tbody),e.TRUSTED_TYPES_POLICY){if("function"!=typeof e.TRUSTED_TYPES_POLICY.createHTML)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if("function"!=typeof e.TRUSTED_TYPES_POLICY.createScriptURL)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');C=e.TRUSTED_TYPES_POLICY,w=C.createHTML("")}else void 0===C&&(C=function(e,t){if("object"!=typeof e||"function"!=typeof e.createPolicy)return null;let n=null;const o="data-tt-policy-suffix";t&&t.hasAttribute(o)&&(n=t.getAttribute(o));const r="dompurify"+(n?"#"+n:"");try{return e.createPolicy(r,{createHTML:e=>e,createScriptURL:e=>e})}catch(e){return console.warn("TrustedTypes policy "+r+" could not be created."),null}}(g,r)),null!==C&&"string"==typeof w&&(w=C.createHTML(""));iy&&iy(e),we=e}},ke=ky({},["mi","mo","mn","ms","mtext"]),Se=ky({},["foreignobject","desc","title","annotation-xml"]),Ne=ky({},["title","style","font","a","script"]),Re=ky({},Ay);ky(Re,Ty),ky(Re,Oy);const Ae=ky({},By);ky(Ae,Py);const Te=function(e){gy(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){e.remove()}},Oe=function(e,t){try{gy(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){gy(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!F[e])if(Q||J)try{Te(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Be=function(e){let t,n;if(X)e="<remove></remove>"+e;else{const t=by(e,/^[\r\n\t ]+/);n=t&&t[0]}"application/xhtml+xml"===ve&&ge===fe&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");const o=C?C.createHTML(e):e;if(ge===fe)try{t=(new f).parseFromString(o,ve)}catch(e){}if(!t||!t.documentElement){t=x.createDocument(ge,"template",null);try{t.documentElement.innerHTML=pe?w:o}catch(e){}}const r=t.body||t.documentElement;return e&&n&&r.insertBefore(s.createTextNode(n),r.childNodes[0]||null),ge===fe?k.call(t,Y?"html":"body")[0]:Y?t.documentElement:r},Pe=function(e){return E.call(e.ownerDocument||e,e,c.SHOW_ELEMENT|c.SHOW_COMMENT|c.SHOW_TEXT,null,!1)},De=function(e){return"object"==typeof l?e instanceof l:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Le=function(e,t,o){N[e]&&my(N[e],(e=>{e.call(n,t,o,we)}))},Me=function(e){let t;if(Le("beforeSanitizeElements",e,null),(o=e)instanceof m&&("string"!=typeof o.nodeName||"string"!=typeof o.textContent||"function"!=typeof o.removeChild||!(o.attributes instanceof u)||"function"!=typeof o.removeAttribute||"function"!=typeof o.setAttribute||"string"!=typeof o.namespaceURI||"function"!=typeof o.insertBefore||"function"!=typeof o.hasChildNodes))return Te(e),!0;var o;const r=Ce(e.nodeName);if(Le("uponSanitizeElement",e,{tagName:r,allowedTags:M}),e.hasChildNodes()&&!De(e.firstElementChild)&&(!De(e.content)||!De(e.content.firstElementChild))&&wy(/<[/\w]/g,e.innerHTML)&&wy(/<[/\w]/g,e.textContent))return Te(e),!0;if(!M[r]||j[r]){if(!j[r]&&Fe(r)){if(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,r))return!1;if(z.tagNameCheck instanceof Function&&z.tagNameCheck(r))return!1}if(ne&&!se[r]){const t=y(e)||e.parentNode,n=v(e)||e.childNodes;if(n&&t)for(let o=n.length-1;o>=0;--o)t.insertBefore(h(n[o],!0),b(e))}return Te(e),!0}return e instanceof d&&!function(e){let t=y(e);t&&t.tagName||(t={namespaceURI:ge,tagName:"template"});const n=py(e.tagName),o=py(t.tagName);return!!he[e.namespaceURI]&&(e.namespaceURI===me?t.namespaceURI===fe?"svg"===n:t.namespaceURI===ue?"svg"===n&&("annotation-xml"===o||ke[o]):Boolean(Re[n]):e.namespaceURI===ue?t.namespaceURI===fe?"math"===n:t.namespaceURI===me?"math"===n&&Se[o]:Boolean(Ae[n]):e.namespaceURI===fe?!(t.namespaceURI===me&&!Se[o])&&!(t.namespaceURI===ue&&!ke[o])&&!Ae[n]&&(Ne[n]||!Re[n]):!("application/xhtml+xml"!==ve||!he[e.namespaceURI]))}(e)?(Te(e),!0):"noscript"!==r&&"noembed"!==r&&"noframes"!==r||!wy(/<\/no(script|embed|frames)/i,e.innerHTML)?(K&&3===e.nodeType&&(t=e.textContent,t=vy(t,R," "),t=vy(t,A," "),t=vy(t,T," "),e.textContent!==t&&(gy(n.removed,{element:e.cloneNode()}),e.textContent=t)),Le("afterSanitizeElements",e,null),!1):(Te(e),!0)},Ie=function(e,t,n){if(ee&&("id"===t||"name"===t)&&(n in s||n in xe))return!1;if(q&&!H[t]&&wy(O,t));else if($&&wy(B,t));else if(!F[t]||H[t]){if(!(Fe(e)&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,e)||z.tagNameCheck instanceof Function&&z.tagNameCheck(e))&&(z.attributeNameCheck instanceof RegExp&&wy(z.attributeNameCheck,t)||z.attributeNameCheck instanceof Function&&z.attributeNameCheck(t))||"is"===t&&z.allowCustomizedBuiltInElements&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,n)||z.tagNameCheck instanceof Function&&z.tagNameCheck(n))))return!1}else if(de[t]);else if(wy(L,vy(n,D,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==yy(n,"data:")||!ie[e])if(V&&!wy(P,vy(n,D,"")));else if(n)return!1;return!0},Fe=function(e){return e.indexOf("-")>0},Ue=function(e){let t,n,o,r;Le("beforeSanitizeAttributes",e,null);const{attributes:s}=e;if(!s)return;const a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:F};for(r=s.length;r--;){t=s[r];const{name:i,namespaceURI:l}=t;n="value"===i?t.value:Cy(t.value);const d=n;if(o=Ce(i),a.attrName=o,a.attrValue=n,a.keepAttr=!0,a.forceKeepAttr=void 0,Le("uponSanitizeAttribute",e,a),n=a.attrValue,a.forceKeepAttr)continue;if(!a.keepAttr){Oe(i,e);continue}if(!W&&wy(/\/>/i,n)){Oe(i,e);continue}K&&(n=vy(n,R," "),n=vy(n,A," "),n=vy(n,T," "));const c=Ce(e.nodeName);if(Ie(c,o,n)){if(!te||"id"!==o&&"name"!==o||(Oe(i,e),n="user-content-"+n),C&&"object"==typeof g&&"function"==typeof g.getAttributeType)if(l);else switch(g.getAttributeType(c,o)){case"TrustedHTML":n=C.createHTML(n);break;case"TrustedScriptURL":n=C.createScriptURL(n)}if(n!==d)try{l?e.setAttributeNS(l,i,n):e.setAttribute(i,n)}catch(t){Oe(i,e)}}else Oe(i,e)}Le("afterSanitizeAttributes",e,null)},ze=function e(t){let n;const o=Pe(t);for(Le("beforeSanitizeShadowDOM",t,null);n=o.nextNode();)Le("uponSanitizeShadowNode",n,null),Me(n)||(n.content instanceof a&&e(n.content),Ue(n));Le("afterSanitizeShadowDOM",t,null)};return n.sanitize=function(e){let t,r,s,i,d=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(pe=!e,pe&&(e="\x3c!--\x3e"),"string"!=typeof e&&!De(e)){if("function"!=typeof e.toString)throw xy("toString is not a function");if("string"!=typeof(e=e.toString()))throw xy("dirty is not a string, aborting")}if(!n.isSupported)return e;if(G||_e(d),n.removed=[],"string"==typeof e&&(oe=!1),oe){if(e.nodeName){const t=Ce(e.nodeName);if(!M[t]||j[t])throw xy("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof l)t=Be("\x3c!----\x3e"),r=t.ownerDocument.importNode(e,!0),1===r.nodeType&&"BODY"===r.nodeName||"HTML"===r.nodeName?t=r:t.appendChild(r);else{if(!Q&&!K&&!Y&&-1===e.indexOf("<"))return C&&Z?C.createHTML(e):e;if(t=Be(e),!t)return Q?null:Z?w:""}t&&X&&Te(t.firstChild);const c=Pe(oe?e:t);for(;s=c.nextNode();)Me(s)||(s.content instanceof a&&ze(s.content),Ue(s));if(oe)return e;if(Q){if(J)for(i=_.call(t.ownerDocument);t.firstChild;)i.appendChild(t.firstChild);else i=t;return(F.shadowroot||F.shadowrootmode)&&(i=S.call(o,i,!0)),i}let u=Y?t.outerHTML:t.innerHTML;return Y&&M["!doctype"]&&t.ownerDocument&&t.ownerDocument.doctype&&t.ownerDocument.doctype.name&&wy(Ky,t.ownerDocument.doctype.name)&&(u="<!DOCTYPE "+t.ownerDocument.doctype.name+">\n"+u),K&&(u=vy(u,R," "),u=vy(u,A," "),u=vy(u,T," ")),C&&Z?C.createHTML(u):u},n.setConfig=function(e){_e(e),G=!0},n.clearConfig=function(){we=null,G=!1},n.isValidAttribute=function(e,t,n){we||_e({});const o=Ce(e),r=Ce(t);return Ie(o,r,n)},n.addHook=function(e,t){"function"==typeof t&&(N[e]=N[e]||[],gy(N[e],t))},n.removeHook=function(e){if(N[e])return fy(N[e])},n.removeHooks=function(e){N[e]&&(N[e]=[])},n.removeAllHooks=function(){N={}},n}();const Qy=Pt.each,Jy=Pt.trim,Zy=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],eC={ftp:21,http:80,https:443,mailto:25},tC=["img","video"],nC=(e,t,n)=>{const o=(e=>{try{return decodeURIComponent(e)}catch(t){return unescape(e)}})(t).replace(/\s/g,"");return!e.allow_script_urls&&(!!/((java|vb)script|mhtml):/i.test(o)||!e.allow_html_data_urls&&(/^data:image\//i.test(o)?((e,t)=>C(e)?!e:!C(t)||!H(tC,t))(e.allow_svg_data_urls,n)&&/^data:image\/svg\+xml/i.test(o):/^data:/i.test(o)))};class oC{static parseDataUri(e){let t;const n=decodeURIComponent(e).split(","),o=/data:([^;]+)/.exec(n[0]);return o&&(t=o[1]),{type:t,data:n[1]}}static isDomSafe(e,t,n={}){if(n.allow_script_urls)return!0;{const o=ea.decode(e).replace(/[\s\u0000-\u001F]+/g,"");return!nC(n,o,t)}}static getDocumentBaseUrl(e){var t;let n;return n=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?null!==(t=e.href)&&void 0!==t?t:"":e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/")),n}constructor(e,t={}){this.path="",this.directory="",e=Jy(e),this.settings=t;const n=t.base_uri,o=this;if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(o.source=e);const r=0===e.indexOf("//");if(0!==e.indexOf("/")||r||(e=(n&&n.protocol||"http")+"://mce_host"+e),!/^[\w\-]*:?\/\//.test(e)){const t=n?n.path:new oC(document.location.href).directory;if(""===(null==n?void 0:n.protocol))e="//mce_host"+o.toAbsPath(t,e);else{const r=/([^#?]*)([#?]?.*)/.exec(e);r&&(e=(n&&n.protocol||"http")+"://mce_host"+o.toAbsPath(t,r[1])+r[2])}}e=e.replace(/@@/g,"(mce_at)");const s=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);s&&Qy(Zy,((e,t)=>{let n=s[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n})),n&&(o.protocol||(o.protocol=n.protocol),o.userInfo||(o.userInfo=n.userInfo),o.port||"mce_host"!==o.host||(o.port=n.port),o.host&&"mce_host"!==o.host||(o.host=n.host),o.source=""),r&&(o.protocol="")}setPath(e){const t=/^(.*?)\/?(\w+)?$/.exec(e);t&&(this.path=t[0],this.directory=t[1],this.file=t[2]),this.source="",this.getURI()}toRelative(e){if("./"===e)return e;const t=new oC(e,{base_uri:this});if("mce_host"!==t.host&&this.host!==t.host&&t.host||this.port!==t.port||this.protocol!==t.protocol&&""!==t.protocol)return t.getURI();const n=this.getURI(),o=t.getURI();if(n===o||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===o)return n;let r=this.toRelPath(this.path,t.path);return t.query&&(r+="?"+t.query),t.anchor&&(r+="#"+t.anchor),r}toAbsolute(e,t){const n=new oC(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))}isSameOrigin(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;const t=this.protocol?eC[this.protocol]:null;if(t&&(this.port||t)==(e.port||t))return!0}return!1}toRelPath(e,t){let n,o,r=0,s="";const a=e.substring(0,e.lastIndexOf("/")).split("/"),i=t.split("/");if(a.length>=i.length)for(n=0,o=a.length;n<o;n++)if(n>=i.length||a[n]!==i[n]){r=n+1;break}if(a.length<i.length)for(n=0,o=i.length;n<o;n++)if(n>=a.length||a[n]!==i[n]){r=n+1;break}if(1===r)return t;for(n=0,o=a.length-(r-1);n<o;n++)s+="../";for(n=r-1,o=i.length;n<o;n++)s+=n!==r-1?"/"+i[n]:i[n];return s}toAbsPath(e,t){let n=0;const o=/\/$/.test(t)?"/":"",r=e.split("/"),s=t.split("/"),a=[];Qy(r,(e=>{e&&a.push(e)}));const i=[];for(let e=s.length-1;e>=0;e--)0!==s[e].length&&"."!==s[e]&&(".."!==s[e]?n>0?n--:i.push(s[e]):n++);const l=a.length-n;let d;return d=l<=0?oe(i).join("/"):a.slice(0,l).join("/")+"/"+oe(i).join("/"),0!==d.indexOf("/")&&(d="/"+d),o&&d.lastIndexOf("/")!==d.length-1&&(d+=o),d}getURI(e=!1){let t;return this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source}}const rC=Pt.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),sC="data-mce-type";let aC=0;const iC=(e,t,n,o,r)=>{var s,a,i,l;const d=t.validate,c=n.getSpecialElements();8===e.nodeType&&!t.allow_conditional_comments&&/^\[if/i.test(null!==(s=e.nodeValue)&&void 0!==s?s:"")&&(e.nodeValue=" "+e.nodeValue);const u=null!==(a=null==r?void 0:r.tagName)&&void 0!==a?a:e.nodeName.toLowerCase();if("html"!==o&&n.isValid(o))return void(C(r)&&(r.allowedTags[u]=!0));if(1!==e.nodeType||"body"===u)return;const f=yn(e),g=nn(f,sC),p=en(f,"data-mce-bogus");if(!g&&m(p))return void("all"===p?xo(f):Eo(f));const h=n.getElementRule(u);if(!d||h){if(C(r)&&(r.allowedTags[u]=!0),d&&h&&!g){if(V(null!==(i=h.attributesForced)&&void 0!==i?i:[],(e=>{Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),V(null!==(l=h.attributesDefault)&&void 0!==l?l:[],(e=>{nn(f,e.name)||Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),h.attributesRequired&&!$(h.attributesRequired,(e=>nn(f,e))))return void Eo(f);if(h.removeEmptyAttrs&&(e=>{const t=e.dom.attributes;return null==t||0===t.length})(f))return void Eo(f);h.outputName&&h.outputName!==u&&((e,t)=>{const n=((e,t)=>{const n=bn(t),o=rn(e);return Zt(n,o),n})(e,t);ho(e,n);const o=Mn(e);Co(n,o),xo(e)})(f,h.outputName)}}else Ee(c,u)?xo(f):Eo(f)},lC=(e,t,n,o,r,s)=>"html"!==n&&!ps(o)||!(r in rC&&nC(e,s,o))&&(!e.validate||t.isValid(o,r)||He(r,"data-")||He(r,"aria-")),dC=(e,t)=>e.hasAttribute(sC)&&("id"===t||"class"===t||"style"===t),cC=(e,t)=>e in t.getBoolAttrs(),uC=(e,t,n,o)=>{const{attributes:r}=e;for(let s=r.length-1;s>=0;s--){const a=r[s],i=a.name,l=a.value;lC(t,n,o,e.tagName.toLowerCase(),i,l)||dC(e,i)?cC(i,n)&&e.setAttribute(i,i):e.removeAttribute(i)}},mC=(e,t,n)=>{const o=Xy();return o.addHook("uponSanitizeElement",((o,r)=>{iC(o,e,t,n.track(o),r)})),o.addHook("uponSanitizeAttribute",((o,r)=>{((e,t,n,o,r)=>{const s=e.tagName.toLowerCase(),{attrName:a,attrValue:i}=r;r.keepAttr=lC(t,n,o,s,a,i),r.keepAttr?(r.allowedAttributes[a]=!0,cC(a,n)&&(r.attrValue=a),t.allow_svg_data_urls&&He(i,"data:image/svg+xml")&&(r.forceKeepAttr=!0)):dC(e,a)&&(r.forceKeepAttr=!0)})(o,e,t,n.current(),r)})),o},fC=e=>{const t=["type","href","role","arcrole","title","show","actuate","label","from","to"].map((e=>`xlink:${e}`)),n={IN_PLACE:!0,USE_PROFILES:{html:!0,svg:!0,svgFilters:!0},ALLOWED_ATTR:t};return Xy().sanitize(e,n),e.innerHTML},gC=Pt.makeMap,pC=Pt.extend,hC=(e,t,n,o)=>{const r=e.name,s=r in n&&"title"!==r&&"textarea"!==r,a=t.childNodes;for(let t=0,r=a.length;t<r;t++){const r=a[t],i=new Wg(r.nodeName.toLowerCase(),r.nodeType);if(qo(r)){const e=r.attributes;for(let t=0,n=e.length;t<n;t++){const n=e[t];i.attr(n.name,n.value)}ps(i.name)&&(o(r),i.value=r.innerHTML)}else er(r)?(i.value=r.data,s&&(i.raw=!0)):(or(r)||tr(r)||nr(r))&&(i.value=r.data);ps(i.name)||hC(i,r,n,o),e.append(i)}},bC=(e={},t=ua())=>{const n=qv(),o=qv(),r={validate:!0,root_name:"body",sanitize:!0,...e},s=new DOMParser,a=((e,t)=>{const n=(()=>{let e=[];const t=()=>e[e.length-1];return{track:n=>{hs(n)&&e.push(n);let o=t();return o&&!o.contains(n)&&(e.pop(),o=t()),bs(o)},current:()=>bs(t()),reset:()=>{e=[]}}})();if(e.sanitize){const o=mC(e,t,n),r=(t,r)=>{o.sanitize(t,((e,t)=>{const n={IN_PLACE:!0,ALLOW_UNKNOWN_PROTOCOLS:!0,ALLOWED_TAGS:["#comment","#cdata-section","body"],ALLOWED_ATTR:[]};return n.PARSER_MEDIA_TYPE=t,e.allow_script_urls?n.ALLOWED_URI_REGEXP=/.*/:e.allow_html_data_urls&&(n.ALLOWED_URI_REGEXP=/^(?!(\w+script|mhtml):)/i),n})(e,r)),o.removed=[],n.reset()};return{sanitizeHtmlElement:r,sanitizeNamespaceElement:fC}}return{sanitizeHtmlElement:(o,r)=>{const s=document.createNodeIterator(o,NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_COMMENT|NodeFilter.SHOW_TEXT);let a;for(;a=s.nextNode();){const o=n.track(a);iC(a,e,t,o),qo(a)&&uC(a,e,t,o)}n.reset()},sanitizeNamespaceElement:_}})(r,t),i=n.addFilter,l=n.getFilters,d=n.removeFilter,c=o.addFilter,u=o.getFilters,f=o.removeFilter,g=(e,n)=>{const o=m(n.attr(sC)),r=1===n.type&&!Ee(e,n.name)&&!Bs(t,n)&&!ps(n.name);return 3===n.type||r&&!o},p={schema:t,addAttributeFilter:c,getAttributeFilters:u,removeAttributeFilter:f,addNodeFilter:i,getNodeFilters:l,removeNodeFilter:d,parse:(e,n={})=>{var o;const i=r.validate,d=null!==(o=n.context)&&void 0!==o?o:r.root_name,c=((e,n,o="html")=>{const r="xhtml"===o?"application/xhtml+xml":"text/html",i=Ee(t.getSpecialElements(),n.toLowerCase()),l=i?`<${n}>${e}</${n}>`:e,d="xhtml"===o?`<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>${l}</body></html>`:`<body>${l}</body>`,c=s.parseFromString(d,r).body;return a.sanitizeHtmlElement(c,r),i?c.firstChild:c})(e,d,n.format);ks(t,c);const m=new Wg(d,11);hC(m,c,t.getSpecialElements(),a.sanitizeNamespaceElement),c.innerHTML="";const[f,p]=((e,t,n,o)=>{const r=n.validate,s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),l=da(t),d=/[ \t\r\n]+/g,c=/^[ \t\r\n]+/,u=/[ \t\r\n]+$/,m=e=>{let t=e.parent;for(;C(t);){if(t.name in a)return!0;t=t.parent}return!1},f=n=>n.name in i||Bs(t,n)||ps(n.name)&&n.parent===e,g=(t,n)=>{const r=n?t.prev:t.next;return!C(r)&&!y(t.parent)&&f(t.parent)&&(t.parent!==e||!0===o.isRootContent)};return[e=>{var t;if(3===e.type&&!m(e)){let n=null!==(t=e.value)&&void 0!==t?t:"";n=n.replace(d," "),(((e,t)=>C(e)&&(t(e)||"br"===e.name))(e.prev,f)||g(e,!0))&&(n=n.replace(c,"")),0===n.length?e.remove():e.value=n}},e=>{var i;if(1===e.type){const i=t.getElementRule(e.name);if(r&&i){const r=vb(t,s,a,e);i.paddInEmptyBlock&&r&&(e=>{let n=e;for(;C(n);){if(n.name in l)return vb(t,s,a,n);n=n.parent}return!1})(e)?hb(n,o,f,e):i.removeEmpty&&r?f(e)?e.remove():e.unwrap():i.paddEmpty&&(r||(e=>{var t;return bb(e,"#text")&&(null===(t=null==e?void 0:e.firstChild)||void 0===t?void 0:t.value)===br})(e))&&hb(n,o,f,e)}}else if(3===e.type&&!m(e)){let t=null!==(i=e.value)&&void 0!==i?i:"";(e.next&&f(e.next)||g(e,!1))&&(t=t.replace(u,"")),0===t.length?e.remove():e.value=t}}]})(m,t,r,n),h=[],b=i?e=>((e,n)=>{xb(t,e)&&n.push(e)})(e,h):_,v={nodes:{},attributes:{}},w=e=>fb(l(),u(),e,v);if(((e,t,n)=>{const o=[];for(let n=e,r=n;n;r=n,n=n.walk()){const s=n;V(t,(e=>e(s))),y(s.parent)&&s!==e?n=r:o.push(s)}for(let e=o.length-1;e>=0;e--){const t=o[e];V(n,(e=>e(t)))}})(m,[f,w],[p,b]),h.reverse(),i&&h.length>0)if(n.context){const{pass:e,fail:o}=K(h,(e=>e.parent===m));wb(o,t,m,w),n.invalid=e.length>0}else wb(h,t,m,w);const x=((e,t)=>{var n;const o=null!==(n=t.forced_root_block)&&void 0!==n?n:e.forced_root_block;return!1===o?"":!0===o?"p":o})(r,n);return x&&("body"===m.name||n.isRootContent)&&((e,n)=>{const o=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),s=/^[ \t\r\n]+/,a=/[ \t\r\n]+$/;let i=e.firstChild,l=null;const d=e=>{var t,n;e&&(i=e.firstChild,i&&3===i.type&&(i.value=null===(t=i.value)||void 0===t?void 0:t.replace(s,"")),i=e.lastChild,i&&3===i.type&&(i.value=null===(n=i.value)||void 0===n?void 0:n.replace(a,"")))};if(t.isValidChild(e.name,n.toLowerCase())){for(;i;){const t=i.next;g(o,i)?(l||(l=new Wg(n,1),l.attr(r.forced_root_block_attrs),e.insert(l,i)),l.append(i)):(d(l),l=null),i=t}d(l)}})(m,x),n.invalid||gb(v,n),m}};return ty(p,r),((e,t,n)=>{t.inline_styles&&Vv(e,t,n)})(p,r,t),p},vC=(e,t,n)=>{const o=(e=>Bb(e)?up({validate:!1}).serialize(e):e)(e),r=t(o);if(r.isDefaultPrevented())return r;if(Bb(e)){if(r.content!==o){const t=bC({validate:!1,forced_root_block:!1,...n}).parse(r.content,{context:e.name});return{...r,content:t}}return{...r,content:e}}return r},yC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=((e,t)=>e.dispatch("BeforeGetContent",t))(e,t);return n.isDefaultPrevented()?pl.error(rf(e,{content:"",...n}).content):pl.value(n)}},CC=(e,t,n)=>{if(n.no_events)return t;{const o=vC(t,(t=>rf(e,{...n,content:t})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return o.content}},wC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=vC(t.content,(n=>((e,t)=>e.dispatch("BeforeSetContent",t))(e,{...t,content:n})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return n.isDefaultPrevented()?(of(e,n),pl.error(void 0)):pl.value(n)}},xC=(e,t,n)=>{n.no_events||of(e,{...n,content:t})},EC=(e,t,n)=>({element:e,width:t,rows:n}),_C=(e,t)=>({element:e,cells:t}),kC=(e,t)=>({x:e,y:t}),SC=(e,t)=>tn(e,t).bind(Xe).getOr(1),NC=(e,t,n)=>{const o=e.rows;return!!(o[n]?o[n].cells:[])[t]},RC=e=>X(e,((e,t)=>t.cells.length>e?t.cells.length:e),0),AC=(e,t)=>{const n=e.rows;for(let e=0;e<n.length;e++){const o=n[e].cells;for(let n=0;n<o.length;n++)if(_n(o[n],t))return I.some(kC(n,e))}return I.none()},TC=(e,t,n,o,r)=>{const s=[],a=e.rows;for(let e=n;e<=r;e++){const n=a[e].cells,r=t<o?n.slice(t,o+1):n.slice(o,t+1);s.push(_C(a[e].element,r))}return s},OC=e=>((e,t)=>{const n=fi(e.element),o=bn("tbody");return Co(o,t),vo(n,o),n})(e,(e=>q(e.rows,(e=>{const t=q(e.cells,(e=>{const t=gi(e);return on(t,"colspan"),on(t,"rowspan"),t})),n=fi(e.element);return Co(n,t),n})))(e)),BC=(e,t,n)=>{const o=yn(t.commonAncestorContainer),r=Bp(o,e),s=Y(r,(e=>n.isWrapper(Ht(e)))),a=((e,t)=>J(e,(e=>"li"===Ht(e)&&rm(e,t))).fold(N([]),(t=>(e=>J(e,(e=>"ul"===Ht(e)||"ol"===Ht(e))))(e).map((e=>{const t=bn(Ht(e)),n=ye(fo(e),((e,t)=>He(t,"list-style")));return lo(t,n),[bn("li"),t]})).getOr([]))))(r,t),i=s.concat(a.length?a:(e=>Sr(e)?An(e).filter(kr).fold(N([]),(t=>[e,t])):kr(e)?[e]:[])(o));return q(i,fi)},PC=()=>Sf([]),DC=(e,t)=>((e,t)=>eo(t,"table",T(_n,e)))(e,t[0]).bind((e=>{const n=t[0],o=t[t.length-1],r=(e=>{const t=EC(fi(e),0,[]);return V(Uo(e,"tr"),((e,n)=>{V(Uo(e,"td,th"),((o,r)=>{((e,t,n,o,r)=>{const s=SC(r,"rowspan"),a=SC(r,"colspan"),i=e.rows;for(let e=n;e<n+s;e++){i[e]||(i[e]=_C(gi(o),[]));for(let o=t;o<t+a;o++)i[e].cells[o]=e===n&&o===t?r:fi(r)}})(t,((e,t,n)=>{for(;NC(e,t,n);)t++;return t})(t,r,n),n,e,o)}))})),EC(t.element,RC(t.rows),t.rows)})(e);return((e,t,n)=>AC(e,t).bind((t=>AC(e,n).map((n=>((e,t,n)=>{const o=t.x,r=t.y,s=n.x,a=n.y,i=r<a?TC(e,o,r,s,a):TC(e,o,a,s,r);return EC(e.element,RC(i),i)})(e,t,n))))))(r,n,o).map((e=>Sf([OC(e)])))})).getOrThunk(PC),LC=(e,t,n)=>{const o=Zu(t,e);return o.length>0?DC(e,o):((e,t,n)=>t.length>0&&t[0].collapsed?PC():((e,t,n)=>((e,t)=>{const n=X(t,((e,t)=>(vo(t,e),t)),e);return t.length>0?Sf([n]):n})(yn(t.cloneContents()),BC(e,t,n)))(e,t[0],n))(e,t,n)},MC=(e,t)=>t>=0&&t<e.length&&Xu(e.charAt(t)),IC=e=>Dr(e.innerText),FC=e=>qo(e)?e.outerHTML:er(e)?ea.encodeRaw(e.data,!1):or(e)?"\x3c!--"+e.data+"--\x3e":"",UC=(e,t)=>(((e,t)=>{let n=0;V(e,(e=>{0===e[0]?n++:1===e[0]?(((e,t,n)=>{const o=(e=>{let t;const n=document.createElement("div"),o=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)o.appendChild(t);return o})(t);if(e.hasChildNodes()&&n<e.childNodes.length){const t=e.childNodes[n];e.insertBefore(o,t)}else e.appendChild(o)})(t,e[1],n),n++):2===e[0]&&((e,t)=>{if(e.hasChildNodes()&&t<e.childNodes.length){const n=e.childNodes[t];e.removeChild(n)}})(t,n)}))})(((e,t)=>{const n=e.length+t.length+2,o=new Array(n),r=new Array(n),s=(n,o,r,a,l)=>{const d=i(n,o,r,a);if(null===d||d.start===o&&d.diag===o-a||d.end===n&&d.diag===n-r){let s=n,i=r;for(;s<o||i<a;)s<o&&i<a&&e[s]===t[i]?(l.push([0,e[s]]),++s,++i):o-n>a-r?(l.push([2,e[s]]),++s):(l.push([1,t[i]]),++i)}else{s(n,d.start,r,d.start-d.diag,l);for(let t=d.start;t<d.end;++t)l.push([0,e[t]]);s(d.end,o,d.end-d.diag,a,l)}},a=(n,o,r,s)=>{let a=n;for(;a-o<s&&a<r&&e[a]===t[a-o];)++a;return((e,t,n)=>({start:e,end:t,diag:n}))(n,a,o)},i=(n,s,i,l)=>{const d=s-n,c=l-i;if(0===d||0===c)return null;const u=d-c,m=c+d,f=(m%2==0?m:m+1)/2;let g,p,h,b,v;for(o[1+f]=n,r[1+f]=s+1,g=0;g<=f;++g){for(p=-g;p<=g;p+=2){for(h=p+f,p===-g||p!==g&&o[h-1]<o[h+1]?o[h]=o[h+1]:o[h]=o[h-1]+1,b=o[h],v=b-n+i-p;b<s&&v<l&&e[b]===t[v];)o[h]=++b,++v;if(u%2!=0&&u-g<=p&&p<=u+g&&r[h-u]<=o[h])return a(r[h-u],p+n-i,s,l)}for(p=u-g;p<=u+g;p+=2){for(h=p+f-u,p===u-g||p!==u+g&&r[h+1]<=r[h-1]?r[h]=r[h+1]-1:r[h]=r[h-1],b=r[h]-1,v=b-n+i-p;b>=n&&v>=i&&e[b]===t[v];)r[h]=b--,v--;if(u%2==0&&-g<=p&&p<=g&&r[h]<=o[h+u])return a(r[h],p+n-i,s,l)}}return null},l=[];return s(0,e.length,0,t.length,l),l})(q(ce(t.childNodes),FC),e),t),t),zC=De((()=>document.implementation.createHTMLDocument("undo"))),jC=e=>{const t=e.serializer.getTempAttrs(),n=sp(e.getBody(),t);return(e=>null!==e.querySelector("iframe"))(n)?{type:"fragmented",fragments:Y(q(ce(n.childNodes),k(Dr,FC)),(e=>e.length>0)),content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:Dr(n.innerHTML),bookmark:null,beforeBookmark:null}},HC=(e,t,n)=>{const o=n?t.beforeBookmark:t.bookmark;"fragmented"===t.type?UC(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw",no_selection:!C(o)||!Iu(o)||!o.isFakeCaret}),o&&(e.selection.moveToBookmark(o),e.selection.scrollIntoView())},$C=e=>"fragmented"===e.type?e.fragments.join(""):e.content,qC=e=>{const t=bn("body",zC());return So(t,$C(e)),V(Uo(t,"*[data-mce-bogus]"),Eo),ko(t)},VC=(e,t)=>!(!e||!t)&&(!!((e,t)=>$C(e)===$C(t))(e,t)||((e,t)=>qC(e)===qC(t))(e,t)),WC=e=>0===e.get(),KC=(e,t,n)=>{WC(n)&&(e.typing=t)},YC=(e,t)=>{e.typing&&(KC(e,!1,t),e.add())},GC=e=>({init:{bindEvents:_},undoManager:{beforeChange:(t,n)=>((e,t,n)=>{WC(t)&&n.set(ml(e.selection))})(e,t,n),add:(t,n,o,r,s,a)=>((e,t,n,o,r,s,a)=>{const i=jC(e),l=Pt.extend(s||{},i);if(!WC(o)||e.removed)return null;const d=t.data[n.get()];if(e.dispatch("BeforeAddUndo",{level:l,lastLevel:d,originalEvent:a}).isDefaultPrevented())return null;if(d&&VC(d,l))return null;t.data[n.get()]&&r.get().each((e=>{t.data[n.get()].beforeBookmark=e}));const c=Td(e);if(c&&t.data.length>c){for(let e=0;e<t.data.length-1;e++)t.data[e]=t.data[e+1];t.data.length--,n.set(t.data.length)}l.bookmark=ml(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(l),n.set(t.data.length-1);const u={level:l,lastLevel:d,originalEvent:a};return n.get()>0?(e.setDirty(!0),e.dispatch("AddUndo",u),e.dispatch("change",u)):e.dispatch("AddUndo",u),l})(e,t,n,o,r,s,a),undo:(t,n,o)=>((e,t,n,o)=>{let r;return t.typing&&(t.add(),t.typing=!1,KC(t,!1,n)),o.get()>0&&(o.set(o.get()-1),r=t.data[o.get()],HC(e,r,!0),e.setDirty(!0),e.dispatch("Undo",{level:r})),r})(e,t,n,o),redo:(t,n)=>((e,t,n)=>{let o;return t.get()<n.length-1&&(t.set(t.get()+1),o=n[t.get()],HC(e,o,!1),e.setDirty(!0),e.dispatch("Redo",{level:o})),o})(e,t,n),clear:(t,n)=>((e,t,n)=>{t.data=[],n.set(0),t.typing=!1,e.dispatch("ClearUndos")})(e,t,n),reset:e=>(e=>{e.clear(),e.add()})(e),hasUndo:(t,n)=>((e,t,n)=>n.get()>0||t.typing&&t.data[0]&&!VC(jC(e),t.data[0]))(e,t,n),hasRedo:(e,t)=>((e,t)=>t.get()<e.data.length-1&&!e.typing)(e,t),transact:(e,t,n)=>((e,t,n)=>(YC(e,t),e.beforeChange(),e.ignore(n),e.add()))(e,t,n),ignore:(e,t)=>((e,t)=>{try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}})(e,t),extra:(t,n,o,r)=>((e,t,n,o,r)=>{if(t.transact(o)){const o=t.data[n.get()].bookmark,s=t.data[n.get()-1];HC(e,s,!0),t.transact(r)&&(t.data[n.get()-1].beforeBookmark=o)}})(e,t,n,o,r)},formatter:{match:(t,n,o,r)=>Hb(e,t,n,o,r),matchAll:(t,n)=>((e,t,n)=>{const o=[],r={},s=e.selection.getStart();return e.dom.getParent(s,(s=>{for(let a=0;a<t.length;a++){const i=t[a];!r[i]&&jb(e,s,i,n)&&(r[i]=!0,o.push(i))}}),e.dom.getRoot()),o})(e,t,n),matchNode:(t,n,o,r)=>jb(e,t,n,o,r),canApply:t=>((e,t)=>{const n=e.formatter.get(t),o=e.dom;if(n&&e.selection.isEditable()){const t=e.selection.getStart(),r=Em(o,t);for(let e=n.length-1;e>=0;e--){const t=n[e];if(!Sm(t))return!0;for(let e=r.length-1;e>=0;e--)if(o.is(r[e],t.selector))return!0}}return!1})(e,t),closest:t=>((e,t)=>{const n=t=>_n(t,yn(e.getBody()));return I.from(e.selection.getStart(!0)).bind((o=>Lb(yn(o),(n=>ue(t,(t=>((t,n)=>jb(e,t.dom,n)?I.some(n):I.none())(n,t)))),n))).getOrNull()})(e,t),apply:(t,n,o)=>Iv(e,t,n,o),remove:(t,n,o,r)=>Ov(e,t,n,o,r),toggle:(t,n,o)=>((e,t,n,o)=>{const r=e.formatter.get(t);r&&(!Hb(e,t,n,o)||"toggle"in r[0]&&!r[0].toggle?Iv(e,t,n,o):Ov(e,t,n,o))})(e,t,n,o),formatChanged:(t,n,o,r,s)=>((e,t,n,o,r,s)=>(((e,t,n,o,r,s)=>{const a=t.get();V(n.split(","),(t=>{const n=xe(a,t).getOrThunk((()=>{const e={withSimilar:{state:$a(!1),similar:!0,callbacks:[]},withoutSimilar:{state:$a(!1),similar:!1,callbacks:[]},withVars:[]};return a[t]=e,e})),i=()=>{const n=jv(e);return zv(e,n,t,r,s).isSome()};if(v(s)){const e=r?n.withSimilar:n.withoutSimilar;e.callbacks.push(o),1===e.callbacks.length&&e.state.set(i())}else n.withVars.push({state:$a(i()),similar:r,vars:s,callback:o})})),t.set(a)})(e,t,n,o,r,s),{unbind:()=>((e,t,n)=>{const o=e.get();V(t.split(","),(e=>xe(o,e).each((t=>{o[e]={withSimilar:{...t.withSimilar,callbacks:Y(t.withSimilar.callbacks,(e=>e!==n))},withoutSimilar:{...t.withoutSimilar,callbacks:Y(t.withoutSimilar.callbacks,(e=>e!==n))},withVars:Y(t.withVars,(e=>e.callback!==n))}})))),e.set(o)})(t,n,o)}))(e,t,n,o,r,s)},editor:{getContent:t=>((e,t)=>I.from(e.getBody()).fold(N("tree"===t.format?new Wg("body",11):""),(n=>lp(e,t,n))))(e,t),setContent:(t,n)=>((e,t,n)=>I.from(e.getBody()).map((o=>Bb(t)?((e,t,n,o)=>{pb(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);const r=up({validate:!1},e.schema).serialize(n),s=Dr(Ar(yn(t))?r:Pt.trim(r));return Pb(e,s,o.no_selection),{content:n,html:s}})(e,o,t,n):((e,t,n,o)=>{if(0===(n=Dr(n)).length||/^\s+$/.test(n)){const r='<br data-mce-bogus="1">';"TABLE"===t.nodeName?n="<tr><td>"+r+"</td></tr>":/^(UL|OL)$/.test(t.nodeName)&&(n="<li>"+r+"</li>");const s=Il(e);return e.schema.isValidChild(t.nodeName.toLowerCase(),s.toLowerCase())?(n=r,n=e.dom.createHTML(s,Fl(e),n)):n||(n=r),Pb(e,n,o.no_selection),{content:n,html:n}}{"raw"!==o.format&&(n=up({validate:!1},e.schema).serialize(e.parser.parse(n,{isRootContent:!0,insert:!0})));const r=Ar(yn(t))?n:Pt.trim(n);return Pb(e,r,o.no_selection),{content:r,html:r}}})(e,o,t,n))).getOr({content:t,html:Bb(n.content)?"":n.content}))(e,t,n),insertContent:(t,n)=>Ob(e,t,n),addVisual:t=>((e,t)=>{const n=e.dom,o=C(t)?t:e.getBody();V(n.select("table,a",o),(t=>{switch(t.nodeName){case"TABLE":const o=Ud(e),r=n.getAttrib(t,"border");r&&"0"!==r||!e.hasVisual?n.removeClass(t,o):n.addClass(t,o);break;case"A":if(!n.getAttrib(t,"href")){const o=n.getAttrib(t,"name")||t.id,r=zd(e);o&&e.hasVisual?n.addClass(t,r):n.removeClass(t,r)}}})),e.dispatch("VisualAid",{element:t,hasVisual:e.hasVisual})})(e,t)},selection:{getContent:(t,n)=>((e,t,n={})=>{const o=((e,t)=>({...e,format:t,get:!0,selection:!0,getInner:!0}))(n,t);return yC(e,o).fold(R,(t=>{const n=((e,t)=>{if("text"===t.format)return(e=>I.from(e.selection.getRng()).map((t=>{var n;const o=I.from(e.dom.getParent(t.commonAncestorContainer,e.dom.isBlock)),r=e.getBody(),s=(e=>e.map((e=>e.nodeName)).getOr("div").toLowerCase())(o),a=yn(t.cloneContents());ap(a),ip(a);const i=e.dom.add(r,s,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},a.dom),l=IC(i),d=Dr(null!==(n=i.textContent)&&void 0!==n?n:"");if(e.dom.remove(i),MC(d,0)||MC(d,d.length-1)){const e=o.getOr(r),t=IC(e),n=t.indexOf(l);return-1===n?l:(MC(t,n-1)?" ":"")+l+(MC(t,n+l.length)?" ":"")}return l})).getOr(""))(e);{const n=((e,t)=>{const n=e.selection.getRng(),o=e.dom.create("body"),r=e.selection.getSel(),s=Mg(e,Ju(r)),a=t.contextual?LC(yn(e.getBody()),s,e.schema).dom:n.cloneContents();return a&&o.appendChild(a),e.selection.serializer.serialize(o,t)})(e,t);return"tree"===t.format?n:e.selection.isCollapsed()?"":n}})(e,t);return CC(e,n,t)}))})(e,t,n)},autocompleter:{addDecoration:t=>zg(e,t),removeDecoration:()=>((e,t)=>jg(t).each((t=>{const n=e.selection.getBookmark();Eo(t),e.selection.moveToBookmark(n)})))(e,yn(e.getBody()))},raw:{getModel:()=>I.none()}}),XC=e=>Ee(e.plugins,"rtc"),QC=e=>e.rtcInstance?e.rtcInstance:GC(e),JC=e=>{const t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")},ZC=e=>JC(e).init.bindEvents(),ew=e=>0===e.dom.length?(xo(e),I.none()):I.some(e),tw=(e,t,n,o,r)=>{e.bind((e=>((o?ch:dh)(e.dom,o?e.dom.length:0,r),t.filter(Kt).map((t=>((e,t,n,o,r)=>{const s=e.dom,a=t.dom,i=o?s.length:a.length;o?(uh(s,a,r,!1,!o),n.setStart(a,i)):(uh(a,s,r,!1,!o),n.setEnd(a,i))})(e,t,n,o,r)))))).orThunk((()=>{const e=((e,t)=>e.filter((e=>Jm.isBookmarkNode(e.dom))).bind(t?Pn:Bn))(t,o).or(t).filter(Kt);return e.map((e=>((e,t,n)=>{An(e).each((o=>{const r=e.dom;t&&eh(o,Vi(r,0),n)?dh(r,0,n):!t&&th(o,Vi(r,r.length),n)&&ch(r,r.length,n)}))})(e,o,r)))}))},nw=(e,t,n)=>{if(Ee(e,t)){const o=Y(e[t],(e=>e!==n));0===o.length?delete e[t]:e[t]=o}};const ow=e=>!(!e||!e.ownerDocument)&&kn(yn(e.ownerDocument),yn(e)),rw=(e,t,n,o)=>{let r,s;const{selectorChangedWithUnbind:a}=((e,t)=>{let n,o;const r=(t,n)=>J(n,(n=>e.is(n,t))),s=t=>e.getParents(t,void 0,e.getRoot());return{selectorChangedWithUnbind:(e,a)=>(n||(n={},o={},t.on("NodeChange",(e=>{const t=e.element,a=s(t),i={};ge(n,((e,t)=>{r(t,a).each((n=>{o[t]||(V(e,(e=>{e(!0,{node:n,selector:t,parents:a})})),o[t]=e),i[t]=e}))})),ge(o,((e,n)=>{i[n]||(delete o[n],V(e,(e=>{e(!1,{node:t,selector:n,parents:a})})))}))}))),n[e]||(n[e]=[]),n[e].push(a),r(e,s(t.selection.getStart())).each((()=>{o[e]=n[e]})),{unbind:()=>{nw(n,e,a),nw(o,e,a)}})}})(e,o),i=(e,t)=>((e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,selection:!0,content:t}))(n,t);wC(e,o).each((t=>{const n=((e,t)=>{if("raw"!==t.format){const n=e.selection.getRng(),o=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),r=o?{context:o.nodeName.toLowerCase()}:{},s=e.parser.parse(t.content,{forced_root_block:!1,...r,...t});return up({validate:!1},e.schema).serialize(s)}return t.content})(e,t),o=e.selection.getRng();((e,t,n)=>{const o=I.from(t.firstChild).map(yn),r=I.from(t.lastChild).map(yn);e.deleteContents(),e.insertNode(t);const s=o.bind(Bn).filter(Kt).bind(ew),a=r.bind(Pn).filter(Kt).bind(ew);tw(s,o,e,!0,n),tw(a,r,e,!1,n),e.collapse(!1)})(o,o.createContextualFragment(n),e.schema),e.selection.setRng(o),sg(e,o),xC(e,n,t)}))})(o,e,t),l=e=>{const t=c();t.collapse(!!e),u(t)},d=()=>t.getSelection?t.getSelection():t.document.selection,c=()=>{let n;const a=(e,t,n)=>{try{return t.compareBoundaryPoints(e,n)}catch(e){return-1}},i=t.document;if(C(o.bookmark)&&!Rg(o)){const e=hg(o);if(e.isSome())return e.map((e=>Mg(o,[e])[0])).getOr(i.createRange())}try{const e=d();e&&!$o(e.anchorNode)&&(n=e.rangeCount>0?e.getRangeAt(0):i.createRange(),n=Mg(o,[n])[0])}catch(e){}if(n||(n=i.createRange()),rr(n.startContainer)&&n.collapsed){const t=e.getRoot();n.setStart(t,0),n.setEnd(t,0)}return r&&s&&(0===a(n.START_TO_START,n,r)&&0===a(n.END_TO_END,n,r)?n=s:(r=null,s=null)),n},u=(e,t)=>{if(!(e=>!!e&&ow(e.startContainer)&&ow(e.endContainer))(e))return;const n=d();if(e=o.dispatch("SetSelectionRange",{range:e,forward:t}).range,n){s=e;try{n.removeAllRanges(),n.addRange(e)}catch(e){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),r=n.rangeCount>0?n.getRangeAt(0):null}if(!e.collapsed&&e.startContainer===e.endContainer&&(null==n?void 0:n.setBaseAndExtent)&&e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()){const t=e.startContainer.childNodes[e.startOffset];t&&"IMG"===t.nodeName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(t,0,t,1))}o.dispatch("AfterSetSelectionRange",{range:e,forward:t})},m=()=>{const t=d(),n=null==t?void 0:t.anchorNode,o=null==t?void 0:t.focusNode;if(!t||!n||!o||$o(n)||$o(o))return!0;const r=e.createRng(),s=e.createRng();try{r.setStart(n,t.anchorOffset),r.collapse(!0),s.setStart(o,t.focusOffset),s.collapse(!0)}catch(e){return!0}return r.compareBoundaryPoints(r.START_TO_START,s)<=0},f={dom:e,win:t,serializer:n,editor:o,expand:(t={type:"word"})=>u(Uf(e).expand(c(),t)),collapse:l,setCursorLocation:(t,n)=>{const r=e.createRng();C(t)&&C(n)?(r.setStart(t,n),r.setEnd(t,n),u(r),l(!1)):(sm(e,r,o.getBody(),!0),u(r))},getContent:e=>((e,t={})=>((e,t,n)=>JC(e).selection.getContent(t,n))(e,t.format?t.format:"html",t))(o,e),setContent:i,getBookmark:(e,t)=>g.getBookmark(e,t),moveToBookmark:e=>g.moveToBookmark(e),select:(t,n)=>(((e,t,n)=>I.from(t).bind((t=>I.from(t.parentNode).map((o=>{const r=e.nodeIndex(t),s=e.createRng();return s.setStart(o,r),s.setEnd(o,r+1),n&&(sm(e,s,t,!0),sm(e,s,t,!1)),s})))))(e,t,n).each(u),t),isCollapsed:()=>{const e=c(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isEditable:()=>{const t=c(),n=o.getBody().querySelectorAll('[data-mce-selected="1"]');return n.length>0?ne(n,(t=>e.isEditable(t.parentElement))):Og(e,t)},isForward:m,setNode:t=>(i(e.getOuterHTML(t)),t),getNode:()=>((e,t)=>{if(!t)return e;let n=t.startContainer,o=t.endContainer;const r=t.startOffset,s=t.endOffset;let a=t.commonAncestorContainer;t.collapsed||(n===o&&s-r<2&&n.hasChildNodes()&&(a=n.childNodes[r]),er(n)&&er(o)&&(n=n.length===r?Lg(n.nextSibling,!0):n.parentNode,o=0===s?Lg(o.previousSibling,!1):o.parentNode,n&&n===o&&(a=n)));const i=er(a)?a.parentNode:a;return Vo(i)?i:e})(o.getBody(),c()),getSel:d,setRng:u,getRng:c,getStart:e=>Pg(o.getBody(),c(),e),getEnd:e=>Dg(o.getBody(),c(),e),getSelectedBlocks:(t,n)=>((e,t,n,o)=>{const r=[],s=e.getRoot(),a=e.getParent(n||Pg(s,t,t.collapsed),e.isBlock),i=e.getParent(o||Dg(s,t,t.collapsed),e.isBlock);if(a&&a!==s&&r.push(a),a&&i&&a!==i){let t;const n=new jo(a,s);for(;(t=n.next())&&t!==i;)e.isBlock(t)&&r.push(t)}return i&&a!==i&&i!==s&&r.push(i),r})(e,c(),t,n),normalize:()=>{const t=c(),n=d();if(!(Ju(n).length>1)&&am(o)){const n=Mf(e,t);return n.each((e=>{u(e,m())})),n.getOr(t)}return t},selectorChanged:(e,t)=>(a(e,t),f),selectorChangedWithUnbind:a,getScrollContainer:()=>{let t,n=e.getRoot();for(;n&&"BODY"!==n.nodeName;){if(n.scrollHeight>n.clientHeight){t=n;break}n=n.parentNode}return t},scrollIntoView:(e,t)=>{C(e)?((e,t,n)=>{(e.inline?ng:rg)(e,t,n)})(o,e,t):sg(o,c(),t)},placeCaretAt:(e,t)=>u(Rf(e,t,o.getDoc())),getBoundingClientRect:()=>{const e=c();return e.collapsed?Vi.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:()=>{t=r=s=null,p.destroy()}},g=Jm(f),p=mf(f,o);return f.bookmarkManager=g,f.controlSelection=p,f},sw=(e,t,n)=>{-1===Pt.inArray(t,n)&&(e.addAttributeFilter(n,((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.push(n))},aw=(e,t)=>{const n=["data-mce-selected"],o={entity_encoding:"named",remove_trailing_brs:!0,pad_empty_with_br:!1,...e},r=t&&t.dom?t.dom:za.DOM,s=t&&t.schema?t.schema:ua(o),a=bC(o,s);return((e,t,n)=>{e.addAttributeFilter("data-mce-tabindex",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];o.attr("tabindex",o.attr("data-mce-tabindex")),o.attr(t,null)}})),e.addAttributeFilter("src,href,style",((e,o)=>{const r="data-mce-"+o,s=t.url_converter,a=t.url_converter_scope;let i=e.length;for(;i--;){const t=e[i];let l=t.attr(r);void 0!==l?(t.attr(o,l.length>0?l:null),t.attr(r,null)):(l=t.attr(o),"style"===o?l=n.serializeStyle(n.parseStyle(l),t.name):s&&(l=s.call(a,l,o,t.name)),t.attr(o,l.length>0?l:null))}})),e.addAttributeFilter("class",(e=>{let t=e.length;for(;t--;){const n=e[t];let o=n.attr("class");o&&(o=o.replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",o.length>0?o:null))}})),e.addAttributeFilter("data-mce-type",((e,t,n)=>{let o=e.length;for(;o--;){const t=e[o];if("bookmark"===t.attr("data-mce-type")&&!n.cleanup){const e=I.from(t.firstChild).exists((e=>{var t;return!Pr(null!==(t=e.value)&&void 0!==t?t:"")}));e?t.unwrap():t.remove()}}})),e.addNodeFilter("noscript",(e=>{var t;let n=e.length;for(;n--;){const o=e[n].firstChild;o&&(o.value=ea.decode(null!==(t=o.value)&&void 0!==t?t:""))}})),e.addNodeFilter("script,style",((e,n)=>{var o;const r=e=>e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"");let s=e.length;for(;s--;){const a=e[s],i=a.firstChild,l=null!==(o=null==i?void 0:i.value)&&void 0!==o?o:"";if("script"===n){const e=a.attr("type");e&&a.attr("type","mce-no/type"===e?null:e.replace(/^mce\-/,"")),"xhtml"===t.element_format&&i&&l.length>0&&(i.value="// <![CDATA[\n"+r(l)+"\n// ]]>")}else"xhtml"===t.element_format&&i&&l.length>0&&(i.value="\x3c!--\n"+r(l)+"\n--\x3e")}})),e.addNodeFilter("#comment",(e=>{let o=e.length;for(;o--;){const r=e[o],s=r.value;t.preserve_cdata&&0===(null==s?void 0:s.indexOf("[CDATA["))?(r.name="#cdata",r.type=4,r.value=n.decode(s.replace(/^\[CDATA\[|\]\]$/g,""))):0===(null==s?void 0:s.indexOf("mce:protected "))&&(r.name="#text",r.type=3,r.raw=!0,r.value=unescape(s).substr(14))}})),e.addNodeFilter("xml:namespace,input",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];7===o.type?o.remove():1===o.type&&("input"!==t||o.attr("type")||o.attr("type","text"))}})),e.addAttributeFilter("data-mce-type",(t=>{V(t,(t=>{"format-caret"===t.attr("data-mce-type")&&(t.isEmpty(e.schema.getNonEmptyElements())?t.remove():t.unwrap())}))})),e.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-block,data-mce-type,data-mce-resize,data-mce-placeholder",((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.remove_trailing_brs&&Wv(t,e,e.schema)})(a,o,r),{schema:s,addNodeFilter:a.addNodeFilter,addAttributeFilter:a.addAttributeFilter,serialize:(e,n={})=>{const i={format:"html",...n},l=((e,t,n)=>((e,t)=>C(e)&&e.hasEventListeners("PreProcess")&&!t.no_events)(e,n)?((e,t,n)=>{let o;const r=e.dom;let s=t.cloneNode(!0);const a=document.implementation;if(a.createHTMLDocument){const e=a.createHTMLDocument("");Pt.each("BODY"===s.nodeName?s.childNodes:[s],(t=>{e.body.appendChild(e.importNode(t,!0))})),s="BODY"!==s.nodeName?e.body.firstChild:e.body,o=r.doc,r.doc=e}return((e,t)=>{e.dispatch("PreProcess",t)})(e,{...n,node:s}),o&&(r.doc=o),s})(e,t,n):t)(t,e,i),d=((e,t,n)=>{const o=Dr(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||Ar(yn(t))?o:Pt.trim(o)})(r,l,i),c=((e,t,n)=>{const o=n.selection?{forced_root_block:!1,...n}:n,r=e.parse(t,o);return(e=>{const t=e=>"br"===(null==e?void 0:e.name),n=e.lastChild;if(t(n)){const e=n.prev;t(e)&&(n.remove(),e.remove())}})(r),r})(a,d,i);return"tree"===i.format?c:((e,t,n,o,r)=>{const s=((e,t,n)=>up(e,t).serialize(n))(t,n,o);return((e,t,n)=>{if(!t.no_events&&e){const o=((e,t)=>e.dispatch("PostProcess",t))(e,{...t,content:n});return o.content}return n})(e,r,s)})(t,o,s,c,i)},addRules:s.addValidElements,setRules:s.setValidElements,addTempAttr:T(sw,a,n),getTempAttrs:N(n),getNodeFilters:a.getNodeFilters,getAttributeFilters:a.getAttributeFilters,removeNodeFilter:a.removeNodeFilter,removeAttributeFilter:a.removeAttributeFilter}},iw=(e,t)=>{const n=aw(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters,removeNodeFilter:n.removeNodeFilter,removeAttributeFilter:n.removeAttributeFilter}},lw=(e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,content:t}))(n,t);return wC(e,o).map((t=>{const n=((e,t,n)=>QC(e).editor.setContent(t,n))(e,t.content,t);return xC(e,n.html,t),n.content})).getOr(t)},dw="autoresize_on_init,content_editable_state,padd_empty_with_br,block_elements,boolean_attributes,editor_deselector,editor_selector,elements,file_browser_callback_types,filepicker_validator_handler,force_hex_style_colors,force_p_newlines,gecko_spellcheck,images_dataimg_filter,media_scripts,mode,move_caret_before_on_enter_elements,non_empty_elements,self_closing_elements,short_ended_elements,special,spellchecker_select_languages,spellchecker_whitelist,tab_focus,tabfocus_elements,table_responsive_width,text_block_elements,text_inline_elements,toolbar_drawer,types,validate,whitespace_elements,paste_enable_default_filters,paste_filter_drop,paste_word_valid_elements,paste_retain_style_properties,paste_convert_word_fake_lists".split(","),cw="template_cdate_classes,template_mdate_classes,template_selected_content_classes,template_preview_replace_values,template_replace_values,templates,template_cdate_format,template_mdate_format".split(","),uw="bbcode,colorpicker,contextmenu,fullpage,legacyoutput,spellchecker,textcolor".split(","),mw=[{name:"template",replacedWith:"Advanced Template"},{name:"rtc"}],fw=(e,t)=>{const n=Y(t,(t=>Ee(e,t)));return ae(n)},gw=e=>{const t=fw(e,dw),n=e.forced_root_block;return!1!==n&&""!==n||t.push("forced_root_block (false only)"),ae(t)},pw=e=>fw(e,cw),hw=(e,t)=>{const n=Pt.makeMap(e.plugins," "),o=Y(t,(e=>Ee(n,e)));return ae(o)},bw=e=>hw(e,uw),vw=e=>hw(e,mw.map((e=>e.name))),yw=e=>J(mw,(t=>t.name===e)).fold((()=>e),(t=>t.replacedWith?`${e}, replaced by ${t.replacedWith}`:e)),Cw=za.DOM,ww=e=>I.from(e).each((e=>e.destroy())),xw=(()=>{const e={};return{add:(t,n)=>{e[t]=n},get:t=>e[t]?e[t]:{icons:{}},has:t=>Ee(e,t)}})(),Ew=Ya.ModelManager,_w=(e,t)=>t.dom[e],kw=(e,t)=>parseInt(co(t,e),10),Sw=T(_w,"clientWidth"),Nw=T(_w,"clientHeight"),Rw=T(kw,"margin-top"),Aw=T(kw,"margin-left"),Tw=e=>{const t=[],n=()=>{const t=e.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a NotificationManager implementation.")};return{open:e,close:e,getArgs:e}})()},o=()=>I.from(t[0]),r=()=>{V(t,(e=>{e.reposition()}))},s=e=>{Z(t,(t=>t===e)).each((e=>{t.splice(e,1)}))},a=(a,i=!0)=>e.removed||!(e=>{return(t=e.inline?e.getBody():e.getContentAreaContainer(),I.from(t).map(yn)).map(Gn).getOr(!1);var t})(e)?{}:(i&&e.dispatch("BeforeOpenNotification",{notification:a}),J(t,(e=>{return t=n().getArgs(e),o=a,!(t.type!==o.type||t.text!==o.text||t.progressBar||t.timeout||o.progressBar||o.timeout);var t,o})).getOrThunk((()=>{e.editorManager.setActive(e);const i=n().open(a,(()=>{s(i),r(),Ag(e)&&o().fold((()=>e.focus()),(e=>ag(yn(e.getEl()))))}));return(e=>{t.push(e)})(i),r(),e.dispatch("OpenNotification",{notification:{...i}}),i}))),i=N(t);return(e=>{e.on("SkinLoaded",(()=>{const t=gd(e);t&&a({text:t,type:"warning",timeout:0},!1),r()})),e.on("show ResizeEditor ResizeWindow NodeChange",(()=>{requestAnimationFrame(r)})),e.on("remove",(()=>{V(t.slice(),(e=>{n().close(e)}))}))})(e),{open:a,close:()=>{o().each((e=>{n().close(e),s(e),r()}))},getNotifications:i}},Ow=Ya.PluginManager,Bw=Ya.ThemeManager,Pw=e=>{let t=[];const n=()=>{const t=e.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a WindowManager implementation.")};return{open:e,openUrl:e,alert:e,confirm:e,close:e}})()},o=(e,t)=>(...n)=>t?t.apply(e,n):void 0,r=n=>{(t=>{e.dispatch("CloseWindow",{dialog:t})})(n),t=Y(t,(e=>e!==n)),0===t.length&&e.focus()},s=n=>{e.editorManager.setActive(e),pg(e),e.ui.show();const o=n();return(n=>{t.push(n),(t=>{e.dispatch("OpenWindow",{dialog:t})})(n)})(o),o};return e.on("remove",(()=>{V(t,(e=>{n().close(e)}))})),{open:(e,t)=>s((()=>n().open(e,t,r))),openUrl:e=>s((()=>n().openUrl(e,r))),alert:(e,t,r)=>{const s=n();s.alert(e,o(r||s,t))},confirm:(e,t,r)=>{const s=n();s.confirm(e,o(r||s,t))},close:()=>{I.from(t[t.length-1]).each((e=>{n().close(e),r(e)}))}}},Dw=(e,t)=>{e.notificationManager.open({type:"error",text:t})},Lw=(e,t)=>{e._skinLoaded?Dw(e,t):e.on("SkinLoaded",(()=>{Dw(e,t)}))},Mw=(e,t,n)=>{ef(e,t,{message:n}),console.error(n)},Iw=(e,t,n)=>n?`Failed to load ${e}: ${n} from url ${t}`:`Failed to load ${e} url: ${t}`,Fw=(e,...t)=>{const n=window.console;n&&(n.error?n.error(e,...t):n.log(e,...t))},Uw=e=>"content/"+e+"/content.css",zw=(e,t)=>{const n=e.editorManager.baseURL+"/skins/content",o=`content${e.editorManager.suffix}.css`;return q(t,(t=>(e=>tinymce.Resource.has(Uw(e)))(t)?t:(e=>/^[a-z0-9\-]+$/i.test(e))(t)&&!e.inline?`${n}/${t}/${o}`:e.documentBaseURI.toAbsolute(t)))},jw=(e,t)=>{const n={};return{findAll:(o,r=M)=>{const s=Y((e=>e?ce(e.getElementsByTagName("img")):[])(o),(t=>{const n=t.src;return!t.hasAttribute("data-mce-bogus")&&!t.hasAttribute("data-mce-placeholder")&&!(!n||n===At.transparentSrc)&&(He(n,"blob:")?!e.isUploaded(n)&&r(t):!!He(n,"data:")&&r(t))})),a=q(s,(e=>{const o=e.src;if(Ee(n,o))return n[o].then((t=>m(t)?t:{image:e,blobInfo:t.blobInfo}));{const r=((e,t)=>{const n=()=>Promise.reject("Invalid data URI");if(He(t,"blob:")){const s=e.getByUri(t);return C(s)?Promise.resolve(s):(o=t,He(o,"blob:")?(e=>fetch(e).then((e=>e.ok?e.blob():Promise.reject())).catch((()=>Promise.reject({message:`Cannot convert ${e} to Blob. Resource might not exist or is inaccessible.`,uriType:"blob"}))))(o):He(o,"data:")?(r=o,new Promise(((e,t)=>{Kv(r).bind((({type:e,data:t,base64Encoded:n})=>Yv(e,t,n))).fold((()=>t("Invalid data URI")),e)}))):Promise.reject("Unknown URI format")).then((t=>Gv(t).then((o=>Qv(o,!1,(n=>I.some(Jv(e,t,n)))).getOrThunk(n)))))}var o,r;return He(t,"data:")?Zv(e,t).fold(n,(e=>Promise.resolve(e))):Promise.reject("Unknown image data format")})(t,o).then((t=>(delete n[o],{image:e,blobInfo:t}))).catch((e=>(delete n[o],e)));return n[o]=r,r}}));return Promise.all(a)}}},Hw=()=>{let e={};const t=(e,t)=>({status:e,resultUri:t}),n=t=>t in e;return{hasBlobUri:n,getResultUri:t=>{const n=e[t];return n?n.resultUri:null},isPending:t=>!!n(t)&&1===e[t].status,isUploaded:t=>!!n(t)&&2===e[t].status,markPending:n=>{e[n]=t(1,null)},markUploaded:(n,o)=>{e[n]=t(2,o)},removeFailed:t=>{delete e[t]},destroy:()=>{e={}}}};let $w=0;const qw=(e,t)=>{const n={},o=(e,n)=>new Promise(((o,r)=>{const s=new XMLHttpRequest;s.open("POST",t.url),s.withCredentials=t.credentials,s.upload.onprogress=e=>{n(e.loaded/e.total*100)},s.onerror=()=>{r("Image upload failed due to a XHR Transport error. Code: "+s.status)},s.onload=()=>{if(s.status<200||s.status>=300)return void r("HTTP Error: "+s.status);const e=JSON.parse(s.responseText);var n,a;e&&m(e.location)?o((n=t.basePath,a=e.location,n?n.replace(/\/$/,"")+"/"+a.replace(/^\//,""):a)):r("Invalid JSON: "+s.responseText)};const a=new FormData;a.append("file",e.blob(),e.filename()),s.send(a)})),r=w(t.handler)?t.handler:o,s=(e,t)=>({url:t,blobInfo:e,status:!0}),a=(e,t)=>({url:"",blobInfo:e,status:!1,error:t}),i=(e,t)=>{Pt.each(n[e],(e=>{e(t)})),delete n[e]};return{upload:(l,d)=>t.url||r!==o?((t,o)=>(t=Pt.grep(t,(t=>!e.isUploaded(t.blobUri()))),Promise.all(Pt.map(t,(t=>e.isPending(t.blobUri())?(e=>{const t=e.blobUri();return new Promise((e=>{n[t]=n[t]||[],n[t].push(e)}))})(t):((t,n,o)=>(e.markPending(t.blobUri()),new Promise((r=>{let l,d;try{const c=()=>{l&&(l.close(),d=_)},u=n=>{c(),e.markUploaded(t.blobUri(),n),i(t.blobUri(),s(t,n)),r(s(t,n))},f=n=>{c(),e.removeFailed(t.blobUri()),i(t.blobUri(),a(t,n)),r(a(t,n))};d=e=>{e<0||e>100||I.from(l).orThunk((()=>I.from(o).map(P))).each((t=>{l=t,t.progressBar.value(e)}))},n(t,d).then(u,(e=>{f(m(e)?{message:e}:e)}))}catch(e){r(a(t,e))}}))))(t,r,o))))))(l,d):new Promise((e=>{e([])}))}},Vw=e=>()=>e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0}),Ww=(e,t)=>qw(t,{url:Gl(e),basePath:Xl(e),credentials:Ql(e),handler:Jl(e)}),Kw=e=>{const t=(()=>{let e=[];const t=e=>{if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");const t=e.id||"blobid"+$w+++(()=>{const e=()=>Math.round(4294967295*Math.random()).toString(36);return"s"+(new Date).getTime().toString(36)+e()+e()+e()})(),n=e.name||t,o=e.blob;var r;return{id:N(t),name:N(n),filename:N(e.filename||n+"."+(r=o.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.toLowerCase()]||"dat")),blob:N(o),base64:N(e.base64),blobUri:N(e.blobUri||URL.createObjectURL(o)),uri:N(e.uri)}},n=t=>J(e,t).getOrUndefined(),o=e=>n((t=>t.id()===e));return{create:(e,n,o,r,s)=>{if(m(e))return t({id:e,name:r,filename:s,blob:n,base64:o});if(f(e))return t(e);throw new Error("Unknown input type")},add:t=>{o(t.id())||e.push(t)},get:o,getByUri:e=>n((t=>t.blobUri()===e)),getByData:(e,t)=>n((n=>n.base64()===e&&n.blob().type===t)),findFirst:n,removeByUri:t=>{e=Y(e,(e=>e.blobUri()!==t||(URL.revokeObjectURL(e.blobUri()),!1)))},destroy:()=>{V(e,(e=>{URL.revokeObjectURL(e.blobUri())})),e=[]}}})();let n,o;const r=Hw(),s=[],a=t=>n=>e.selection?t(n):[],i=(e,t,n)=>{let o=0;do{o=e.indexOf(t,o),-1!==o&&(e=e.substring(0,o)+n+e.substr(o+t.length),o+=n.length-t.length+1)}while(-1!==o);return e},l=(e,t,n)=>{const o=`src="${n}"${n===At.transparentSrc?' data-mce-placeholder="1"':""}`;return e=i(e,`src="${t}"`,o),i(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},d=(t,n)=>{V(e.undoManager.data,(e=>{"fragmented"===e.type?e.fragments=q(e.fragments,(e=>l(e,t,n))):e.content=l(e.content,t,n)}))},c=()=>(n||(n=Ww(e,r)),p().then(a((o=>{const r=q(o,(e=>e.blobInfo));return n.upload(r,Vw(e)).then(a((n=>{const r=[];let s=!1;const a=q(n,((n,a)=>{const{blobInfo:i,image:l}=o[a];let c=!1;return n.status&&Wl(e)?(n.url&&!je(l.src,n.url)&&(s=!0),t.removeByUri(l.src),XC(e)||((t,n)=>{const o=e.convertURL(n,"src");var r;d(t.src,n),Zt(yn(t),{src:Vl(e)?(r=n,r+(-1===r.indexOf("?")?"?":"&")+(new Date).getTime()):n,"data-mce-src":o})})(l,n.url)):n.error&&(n.error.remove&&(d(l.src,At.transparentSrc),r.push(l),c=!0),((e,t)=>{Lw(e,Ka.translate(["Failed to upload image: {0}",t]))})(e,n.error.message)),{element:l,status:n.status,uploadUri:n.url,blobInfo:i,removed:c}}));return r.length>0&&!XC(e)?e.undoManager.transact((()=>{V(_o(r),(n=>{const o=An(n);xo(n),o.each((e=>t=>{((e,t)=>e.dom.isEmpty(t.dom)&&C(e.schema.getTextBlockElements()[Ht(t)]))(e,t)&&vo(t,hn('<br data-mce-bogus="1" />'))})(e)),t.removeByUri(n.dom.src)}))})):s&&e.undoManager.dispatchChange(),a})))})))),u=()=>ql(e)?c():Promise.resolve([]),g=e=>ne(s,(t=>t(e))),p=()=>(o||(o=jw(r,t)),o.findAll(e.getBody(),g).then(a((t=>{const n=Y(t,(t=>m(t)?(Lw(e,t),!1):"blob"!==t.uriType));return XC(e)||V(n,(e=>{d(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")})),n})))),h=n=>n.replace(/src="(blob:[^"]+)"/g,((n,o)=>{const s=r.getResultUri(o);if(s)return'src="'+s+'"';let a=t.getByUri(o);return a||(a=X(e.editorManager.get(),((e,t)=>e||t.editorUpload&&t.editorUpload.blobCache.getByUri(o)),void 0)),a?'src="data:'+a.blob().type+";base64,"+a.base64()+'"':n}));return e.on("SetContent",(()=>{ql(e)?u():p()})),e.on("RawSaveContent",(e=>{e.content=h(e.content)})),e.on("GetContent",(e=>{e.source_view||"raw"===e.format||"tree"===e.format||(e.content=h(e.content))})),e.on("PostRender",(()=>{e.parser.addNodeFilter("img",(e=>{V(e,(e=>{const n=e.attr("src");if(!n||t.getByUri(n))return;const o=r.getResultUri(n);o&&e.attr("src",o)}))}))})),{blobCache:t,addFilter:e=>{s.push(e)},uploadImages:c,uploadImagesAuto:u,scanForImages:p,destroy:()=>{t.destroy(),r.destroy(),o=n=null}}},Yw={remove_similar:!0,inherit:!1},Gw={selector:"td,th",...Yw},Xw={tablecellbackgroundcolor:{styles:{backgroundColor:"%value"},...Gw},tablecellverticalalign:{styles:{"vertical-align":"%value"},...Gw},tablecellbordercolor:{styles:{borderColor:"%value"},...Gw},tablecellclass:{classes:["%value"],...Gw},tableclass:{selector:"table",classes:["%value"],...Yw},tablecellborderstyle:{styles:{borderStyle:"%value"},...Gw},tablecellborderwidth:{styles:{borderWidth:"%value"},...Gw}},Qw=N(Xw),Jw=Pt.each,Zw=za.DOM,ex=e=>C(e)&&f(e),tx=(e,t)=>{const n=t&&t.schema||ua({}),o=e=>{const t=m(e)?{name:e,classes:[],attrs:{}}:e,n=Zw.create(t.name);return((e,t)=>{t.classes.length>0&&Zw.addClass(e,t.classes.join(" ")),Zw.setAttribs(e,t.attrs)})(n,t),n},r=(e,t,s)=>{let a;const i=t[0],l=ex(i)?i.name:void 0,d=((e,t)=>{const o=n.getElementRule(e.nodeName.toLowerCase()),r=null==o?void 0:o.parentsRequired;return!(!r||!r.length)&&(t&&H(r,t)?t:r[0])})(e,l);if(d)l===d?(a=i,t=t.slice(1)):a=d;else if(i)a=i,t=t.slice(1);else if(!s)return e;const c=a?o(a):Zw.create("div");c.appendChild(e),s&&Pt.each(s,(t=>{const n=o(t);c.insertBefore(n,e)}));const u=ex(a)?a.siblings:void 0;return r(c,t,u)},s=Zw.create("div");if(e.length>0){const t=e[0],n=o(t),a=ex(t)?t.siblings:void 0;s.appendChild(r(n,e.slice(1),a))}return s},nx=e=>{let t="div";const n={name:t,classes:[],attrs:{},selector:e=Pt.trim(e)};return"*"!==e&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,((e,t,o,r,s)=>{switch(t){case"#":n.attrs.id=o;break;case".":n.classes.push(o);break;case":":-1!==Pt.inArray("checked disabled enabled read-only required".split(" "),o)&&(n.attrs[o]=o)}if("["===r){const e=s.match(/([\w\-]+)(?:\=\"([^\"]+))?/);e&&(n.attrs[e[1]]=e[2])}return""}))),n.name=t||"div",n},ox=(e,t)=>{let n="",o=wd(e);if(""===o)return"";const r=e=>m(e)?e.replace(/%(\w+)/g,""):"",s=(t,n)=>Zw.getStyle(null!=n?n:e.getBody(),t,!0);if(m(t)){const n=e.formatter.get(t);if(!n)return"";t=n[0]}if("preview"in t){const e=t.preview;if(!1===e)return"";o=e||o}let a,i=t.block||t.inline||"span";const l=(d=t.selector,m(d)?(d=(d=d.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Pt.map(d.split(/(?:>|\s+(?![^\[\]]+\]))/),(e=>{const t=Pt.map(e.split(/(?:~\+|~|\+)/),nx),n=t.pop();return t.length&&(n.siblings=t),n})).reverse()):[]);var d;l.length>0?(l[0].name||(l[0].name=i),i=t.selector,a=tx(l,e)):a=tx([i],e);const c=Zw.select(i,a)[0]||a.firstChild;Jw(t.styles,((e,t)=>{const n=r(e);n&&Zw.setStyle(c,t,n)})),Jw(t.attributes,((e,t)=>{const n=r(e);n&&Zw.setAttrib(c,t,n)})),Jw(t.classes,(e=>{const t=r(e);Zw.hasClass(c,t)||Zw.addClass(c,t)})),e.dispatch("PreviewFormats"),Zw.setStyles(a,{position:"absolute",left:-65535}),e.getBody().appendChild(a);const u=s("fontSize"),f=/px$/.test(u)?parseInt(u,10):0;return Jw(o.split(" "),(e=>{let t=s(e,c);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=s(e),"#ffffff"===Ca(t).toLowerCase())||"color"===e&&"#000000"===Ca(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===f)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*f+"px"}"border"===e&&t&&(n+="padding:0 2px;"),n+=e+":"+t+";"}})),e.dispatch("AfterPreviewFormats"),Zw.remove(a),n},rx=e=>{const t=(e=>{const t={},n=(e,o)=>{e&&(m(e)?(p(o)||(o=[o]),V(o,(e=>{v(e.deep)&&(e.deep=!Sm(e)),v(e.split)&&(e.split=!Sm(e)||Nm(e)),v(e.remove)&&Sm(e)&&!Nm(e)&&(e.remove="none"),Sm(e)&&Nm(e)&&(e.mixed=!0,e.block_expand=!0),m(e.classes)&&(e.classes=e.classes.split(/\s+/))})),t[e]=o):ge(e,((e,t)=>{n(t,e)})))};return n((e=>{const t=e.dom,n=e.schema.type,o={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"left"},inherit:!1,preview:!1},{selector:"img,audio,video",collapsed:!1,styles:{float:"left"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginLeft:"0px",marginRight:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"},{selector:".mce-preview-object",ceFalseOverride:!0,styles:{display:"table",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{marginLeft:"auto",marginRight:"auto"},preview:!1}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{float:"right"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginRight:"0px",marginLeft:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"right"},preview:!1}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"justify"},inherit:!1,preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:(()=>{const e={inline:"span",styles:{textDecoration:"line-through"},exact:!0},t={inline:"strike",remove:"all",preserve_attributes:["class","style"]},o={inline:"s",remove:"all",preserve_attributes:["class","style"]};return"html4"!==n?[o,e,t]:[e,o,t]})(),forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{class:"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:(e,t,n)=>qo(e)&&e.hasAttribute("href"),onformat:(e,n,o)=>{Pt.each(o,((n,o)=>{t.setAttrib(e,o,n)}))}},lang:{inline:"span",clear_child_styles:!0,remove_similar:!0,attributes:{lang:"%value","data-mce-lang":e=>{var t;return null!==(t=null==e?void 0:e.customValue)&&void 0!==t?t:null}}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins,small",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Pt.each("p h1 h2 h3 h4 h5 h6 div address pre dt dd samp".split(/\s/),(e=>{o[e]={block:e,remove:"all"}})),o})(e)),n(Qw()),n(Cd(e)),{get:e=>C(e)?t[e]:t,has:e=>Ee(t,e),register:n,unregister:e=>(e&&t[e]&&delete t[e],t)}})(e),n=$a({});return(e=>{e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(let t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])})(e),(e=>{e.on("mouseup keydown",(t=>{var n;((e,t,n)=>{const o=e.selection,r=e.getBody();Kb(e,null,n),8!==t&&46!==t||!o.isCollapsed()||o.getStart().innerHTML!==$b||Kb(e,Lu(r,o.getStart()),!0),37!==t&&39!==t||Kb(e,Lu(r,o.getStart()),!0)})(e,t.keyCode,(n=e.selection.getRng().endContainer,er(n)&&$e(n.data,br)))}))})(e),XC(e)||((e,t)=>{e.set({}),t.on("NodeChange",(n=>{Hv(t,n.element,e.get())})),t.on("FormatApply FormatRemove",(n=>{const o=I.from(n.node).map((e=>dm(e)?e:e.startContainer)).bind((e=>qo(e)?I.some(e):I.from(e.parentElement))).getOrThunk((()=>Uv(t)));Hv(t,o,e.get())}))})(n,e),{get:t.get,has:t.has,register:t.register,unregister:t.unregister,apply:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.apply(t,n,o)})(e,t,n,o)},remove:(t,n,o,r)=>{((e,t,n,o,r)=>{JC(e).formatter.remove(t,n,o,r)})(e,t,n,o,r)},toggle:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.toggle(t,n,o)})(e,t,n,o)},match:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.match(t,n,o,r))(e,t,n,o,r),closest:t=>((e,t)=>JC(e).formatter.closest(t))(e,t),matchAll:(t,n)=>((e,t,n)=>JC(e).formatter.matchAll(t,n))(e,t,n),matchNode:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.matchNode(t,n,o,r))(e,t,n,o,r),canApply:t=>((e,t)=>JC(e).formatter.canApply(t))(e,t),formatChanged:(t,o,r,s)=>((e,t,n,o,r,s)=>JC(e).formatter.formatChanged(t,n,o,r,s))(e,n,t,o,r,s),getCssText:T(ox,e)}},sx=e=>{switch(e.toLowerCase()){case"undo":case"redo":case"mcefocus":return!0;default:return!1}},ax=e=>{const t=Xa(),n=$a(0),o=$a(0),r={data:[],typing:!1,beforeChange:()=>{((e,t,n)=>{JC(e).undoManager.beforeChange(t,n)})(e,n,t)},add:(s,a)=>((e,t,n,o,r,s,a)=>JC(e).undoManager.add(t,n,o,r,s,a))(e,r,o,n,t,s,a),dispatchChange:()=>{e.setDirty(!0);const t=jC(e);t.bookmark=ml(e.selection),e.dispatch("change",{level:t,lastLevel:ie(r.data,o.get()).getOrUndefined()})},undo:()=>((e,t,n,o)=>JC(e).undoManager.undo(t,n,o))(e,r,n,o),redo:()=>((e,t,n)=>JC(e).undoManager.redo(t,n))(e,o,r.data),clear:()=>{((e,t,n)=>{JC(e).undoManager.clear(t,n)})(e,r,o)},reset:()=>{((e,t)=>{JC(e).undoManager.reset(t)})(e,r)},hasUndo:()=>((e,t,n)=>JC(e).undoManager.hasUndo(t,n))(e,r,o),hasRedo:()=>((e,t,n)=>JC(e).undoManager.hasRedo(t,n))(e,r,o),transact:t=>((e,t,n,o)=>JC(e).undoManager.transact(t,n,o))(e,r,n,t),ignore:t=>{((e,t,n)=>{JC(e).undoManager.ignore(t,n)})(e,n,t)},extra:(t,n)=>{((e,t,n,o,r)=>{JC(e).undoManager.extra(t,n,o,r)})(e,r,o,t,n)}};return XC(e)||((e,t,n)=>{const o=$a(!1),r=e=>{KC(t,!1,n),t.add({},e)};e.on("init",(()=>{t.add()})),e.on("BeforeExecCommand",(e=>{const o=e.command;sx(o)||(YC(t,n),t.beforeChange())})),e.on("ExecCommand",(e=>{const t=e.command;sx(t)||r(e)})),e.on("ObjectResizeStart cut",(()=>{t.beforeChange()})),e.on("SaveContent ObjectResized blur",r),e.on("dragend",r),e.on("keyup",(n=>{const s=n.keyCode;if(n.isDefaultPrevented())return;const a=At.os.isMacOS()&&"Meta"===n.key;(s>=33&&s<=36||s>=37&&s<=40||45===s||n.ctrlKey||a)&&(r(),e.nodeChanged()),46!==s&&8!==s||e.nodeChanged(),o.get()&&t.typing&&!VC(jC(e),t.data[0])&&(e.isDirty()||e.setDirty(!0),e.dispatch("TypingUndo"),o.set(!1),e.nodeChanged())})),e.on("keydown",(e=>{const s=e.keyCode;if(e.isDefaultPrevented())return;if(s>=33&&s<=36||s>=37&&s<=40||45===s)return void(t.typing&&r(e));const a=e.ctrlKey&&!e.altKey||e.metaKey;if((s<16||s>20)&&224!==s&&91!==s&&!t.typing&&!a)return t.beforeChange(),KC(t,!0,n),t.add({},e),void o.set(!0);(At.os.isMacOS()?e.metaKey:e.ctrlKey&&!e.altKey)&&t.beforeChange()})),e.on("mousedown",(e=>{t.typing&&r(e)})),e.on("input",(e=>{var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data||(e=>"insertFromPaste"===e.inputType||"insertFromDrop"===e.inputType)(e))&&r(e)})),e.on("AddUndo Undo Redo ClearUndos",(t=>{t.isDefaultPrevented()||e.nodeChanged()}))})(e,r,n),(e=>{e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo")})(e),r},ix=[9,27,af.HOME,af.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,af.DOWN,af.UP,af.LEFT,af.RIGHT].concat(At.browser.isFirefox()?[224]:[]),lx="data-mce-placeholder",dx=e=>"keydown"===e.type||"keyup"===e.type,cx=e=>{const t=e.keyCode;return t===af.BACKSPACE||t===af.DELETE},ux=(e,t)=>({from:e,to:t}),mx=(e,t)=>{const n=yn(e),o=yn(t.container());return Ah(n,o).map((e=>((e,t)=>({block:e,position:t}))(e,t)))},fx=(e,t)=>Jn(t,(e=>Rr(e)||lr(e.dom)),(t=>_n(t,e))).filter(Wt).getOr(e),gx=(e,t)=>{const n=((e,t)=>{const n=Mn(e);return Z(n,(e=>t.isBlock(Ht(e)))).fold(N(n),(e=>n.slice(0,e)))})(e,t);return V(n,xo),n},px=(e,t)=>{const n=Bp(t,e);return J(n.reverse(),(e=>gs(e))).each(xo)},hx=(e,t,n,o,r)=>{if(gs(n))return Or(n),Ou(n.dom);0===Y(Dn(r),(e=>!gs(e))).length&&gs(t)&&po(r,bn("br"));const s=Tu(n.dom,Vi.before(r.dom));return V(gx(t,o),(e=>{po(r,e)})),px(e,t),s},bx=(e,t,n,o)=>{if(gs(n)){if(gs(t)){const e=e=>{const t=(e,n)=>Fn(e).fold((()=>n),(e=>((e,t)=>e.isInline(Ht(t)))(o,e)?t(e,n.concat(fi(e))):n));return t(e,[])},r=G(e(n),((e,t)=>(yo(e,t),t)),Tr());wo(t),vo(t,r)}return xo(n),Ou(t.dom)}const r=Bu(n.dom);return V(gx(t,o),(e=>{vo(n,e)})),px(e,t),r},vx=(e,t)=>{Ru(e,t.dom).bind((e=>I.from(e.getNode()))).map(yn).filter(Er).each(xo)},yx=(e,t,n,o)=>(vx(!0,t),vx(!1,n),((e,t)=>kn(t,e)?((e,t)=>{const n=Bp(t,e);return I.from(n[n.length-1])})(t,e):I.none())(t,n).fold(T(bx,e,t,n,o),T(hx,e,t,n,o))),Cx=(e,t,n,o,r)=>t?yx(e,o,n,r):yx(e,n,o,r),wx=(e,t)=>{const n=yn(e.getBody()),o=((e,t,n)=>n.collapsed?((e,t,n)=>{const o=mx(e,Vi.fromRangeStart(n)),r=o.bind((n=>ku(t,e,n.position).bind((n=>mx(e,n).map((n=>((e,t,n)=>ar(n.position.getNode())&&!gs(n.block)?Ru(!1,n.block.dom).bind((o=>o.isEqual(n.position)?ku(t,e,o).bind((t=>mx(e,t))):I.some(n))).getOr(n):n)(e,t,n)))))));return Mt(o,r,ux).filter((t=>(e=>!_n(e.from.block,e.to.block))(t)&&((e,t)=>{const n=yn(e);return _n(fx(n,t.from.block),fx(n,t.to.block))})(e,t)&&(e=>!1===dr(e.from.block.dom)&&!1===dr(e.to.block.dom))(t)&&(e=>{const t=e=>_r(e)||Ns(e.dom);return t(e.from.block)&&t(e.to.block)})(t)))})(e,t,n):I.none())(n.dom,t,e.selection.getRng()).map((o=>()=>{Cx(n,t,o.from.block,o.to.block,e.schema).each((t=>{e.selection.setRng(t.toRange())}))}));return o},xx=(e,t)=>{const n=yn(t),o=T(_n,e);return Qn(n,Rr,o).isSome()},Ex=e=>{const t=yn(e.getBody());return((e,t)=>{const n=Tu(e.dom,Vi.fromRangeStart(t)).isNone(),o=Au(e.dom,Vi.fromRangeEnd(t)).isNone();return!((e,t)=>xx(e,t.startContainer)||xx(e,t.endContainer))(e,t)&&n&&o})(t,e.selection.getRng())?(e=>I.some((()=>{e.setContent(""),e.selection.setCursorLocation()})))(e):((e,t,n)=>{const o=t.getRng();return Mt(Ah(e,yn(o.startContainer)),Ah(e,yn(o.endContainer)),((r,s)=>_n(r,s)?I.none():I.some((()=>{o.deleteContents(),Cx(e,!0,r,s,n).each((e=>{t.setRng(e.toRange())}))})))).getOr(I.none())})(t,e.selection,e.schema)},_x=(e,t)=>e.selection.isCollapsed()?I.none():Ex(e),kx=(e,t,n,o,r)=>I.from(t._selectionOverrides.showCaret(e,n,o,r)),Sx=(e,t)=>e.dispatch("BeforeObjectSelected",{target:t}).isDefaultPrevented()?I.none():I.some((e=>{const t=e.ownerDocument.createRange();return t.selectNode(e),t})(t)),Nx=(e,t,n)=>t.collapsed?((e,t,n)=>{const o=ru(1,e.getBody(),t),r=Vi.fromRangeStart(o),s=r.getNode();if(Lc(s))return kx(1,e,s,!r.isAtEnd(),!1);const a=r.getNode(!0);if(Lc(a))return kx(1,e,a,!1,!1);const i=lb(e.dom.getRoot(),r.getNode());return Lc(i)?kx(1,e,i,!1,n):I.none()})(e,t,n).getOr(t):t,Rx=e=>Ap(e)||kp(e),Ax=e=>Tp(e)||Sp(e),Tx=(e,t,n,o,r,s)=>{kx(o,e,s.getNode(!r),r,!0).each((n=>{if(t.collapsed){const e=t.cloneRange();r?e.setEnd(n.startContainer,n.startOffset):e.setStart(n.endContainer,n.endOffset),e.deleteContents()}else t.deleteContents();e.selection.setRng(n)})),((e,t)=>{er(t)&&0===t.data.length&&e.remove(t)})(e.dom,n)},Ox=(e,t)=>((e,t)=>{const n=e.selection.getRng();if(!er(n.commonAncestorContainer))return I.none();const o=t?cu.Forwards:cu.Backwards,r=wu(e.getBody()),s=T(lu,t?r.next:r.prev),a=t?Rx:Ax,i=au(o,e.getBody(),n),l=s(i),d=l?Eh(t,l):l;if(!d||!du(i,d))return I.none();if(a(d))return I.some((()=>Tx(e,n,i.getNode(),o,t,d)));const c=s(d);return c&&a(c)&&du(d,c)?I.some((()=>Tx(e,n,i.getNode(),o,t,c))):I.none()})(e,t),Bx=(e,t)=>{const n=e.getBody();return t?Ou(n).filter(Ap):Bu(n).filter(Tp)},Px=e=>{const t=e.selection.getRng();return!t.collapsed&&(Bx(e,!0).exists((e=>e.isEqual(Vi.fromRangeStart(t))))||Bx(e,!1).exists((e=>e.isEqual(Vi.fromRangeEnd(t)))))},Dx=hl([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Lx=(e,t,n,o)=>ku(t,e,n).bind((r=>{return s=r.getNode(),C(s)&&(Rr(yn(s))||Sr(yn(s)))||((e,t,n,o,r)=>{const s=t=>r.isInline(t.nodeName.toLowerCase())&&!Qc(n,o,e);return su(!t,n).fold((()=>su(t,o).fold(L,s)),s)})(e,t,n,r,o)?I.none():t&&dr(r.getNode())||!t&&dr(r.getNode(!0))?((e,t,n,o)=>{const r=o.getNode(!t);return Ah(yn(e),yn(n.getNode())).map((e=>gs(e)?Dx.remove(e.dom):Dx.moveToElement(r))).orThunk((()=>I.some(Dx.moveToElement(r))))})(e,t,n,r):t&&Tp(n)||!t&&Ap(n)?I.some(Dx.moveToPosition(r)):I.none();var s})),Mx=(e,t)=>I.from(lb(e.getBody(),t)),Ix=(e,t)=>{const n=e.selection.getNode();return Mx(e,n).filter(dr).fold((()=>((e,t,n,o)=>{const r=ru(t?1:-1,e,n),s=Vi.fromRangeStart(r),a=yn(e);return!t&&Tp(s)?I.some(Dx.remove(s.getNode(!0))):t&&Ap(s)?I.some(Dx.remove(s.getNode())):!t&&Ap(s)&&qp(a,s,o)?Vp(a,s,o).map((e=>Dx.remove(e.getNode()))):t&&Tp(s)&&$p(a,s,o)?Wp(a,s,o).map((e=>Dx.remove(e.getNode()))):((e,t,n,o)=>((e,t)=>{const n=t.getNode(!e),o=e?"after":"before";return qo(n)&&n.getAttribute("data-mce-caret")===o})(t,n)?((e,t)=>y(t)?I.none():e&&dr(t.nextSibling)?I.some(Dx.moveToElement(t.nextSibling)):!e&&dr(t.previousSibling)?I.some(Dx.moveToElement(t.previousSibling)):I.none())(t,n.getNode(!t)).orThunk((()=>Lx(e,t,n,o))):Lx(e,t,n,o).bind((t=>((e,t,n)=>n.fold((e=>I.some(Dx.remove(e))),(e=>I.some(Dx.moveToElement(e))),(n=>Qc(t,n,e)?I.none():I.some(Dx.moveToPosition(n)))))(e,n,t))))(e,t,s,o)})(e.getBody(),t,e.selection.getRng(),e.schema).map((n=>()=>n.fold(((e,t)=>n=>(e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n)),!0))(e,t),((e,t)=>n=>{const o=t?Vi.before(n):Vi.after(n);return e.selection.setRng(o.toRange()),!0})(e,t),(e=>t=>(e.selection.setRng(t.toRange()),!0))(e))))),(()=>I.some(_)))},Fx=e=>{const t=e.dom,n=e.selection,o=lb(e.getBody(),n.getNode());if(lr(o)&&t.isBlock(o)&&t.isEmpty(o)){const e=t.create("br",{"data-mce-bogus":"1"});t.setHTML(o,""),o.appendChild(e),n.setRng(Vi.before(e).toRange())}return!0},Ux=(e,t)=>e.selection.isCollapsed()?Ix(e,t):((e,t)=>{const n=e.selection.getNode();return dr(n)&&!cr(n)?Mx(e,n.parentNode).filter(dr).fold((()=>I.some((()=>{var n;n=yn(e.getBody()),V(Uo(n,".mce-offscreen-selection"),xo),vh(e,t,yn(e.selection.getNode())),Th(e)}))),(()=>I.some(_))):Px(e)?I.some((()=>{Ph(e,e.selection.getRng(),yn(e.getBody()))})):I.none()})(e,t),zx=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return ku(t,e.getBody(),n).filter((e=>t?Ep(e):_p(e))).bind((e=>Jc(t?0:-1,e))).map((t=>()=>e.selection.select(t)))})(e,t):I.none(),jx=er,Hx=e=>jx(e)&&e.data[0]===Br,$x=e=>jx(e)&&e.data[e.data.length-1]===Br,qx=e=>{var t;return(null!==(t=e.ownerDocument)&&void 0!==t?t:document).createTextNode(Br)},Vx=(e,t)=>e?(e=>{var t;if(jx(e.previousSibling))return $x(e.previousSibling)||e.previousSibling.appendData(Br),e.previousSibling;if(jx(e))return Hx(e)||e.insertData(0,Br),e;{const n=qx(e);return null===(t=e.parentNode)||void 0===t||t.insertBefore(n,e),n}})(t):(e=>{var t,n;if(jx(e.nextSibling))return Hx(e.nextSibling)||e.nextSibling.insertData(0,Br),e.nextSibling;if(jx(e))return $x(e)||e.appendData(Br),e;{const o=qx(e);return e.nextSibling?null===(t=e.parentNode)||void 0===t||t.insertBefore(o,e.nextSibling):null===(n=e.parentNode)||void 0===n||n.appendChild(o),o}})(t),Wx=T(Vx,!0),Kx=T(Vx,!1),Yx=(e,t)=>er(e.container())?Vx(t,e.container()):Vx(t,e.getNode()),Gx=(e,t)=>{const n=t.get();return n&&e.container()===n&&Fr(n)},Xx=(e,t)=>t.fold((t=>{Rc(e.get());const n=Wx(t);return e.set(n),I.some(Vi(n,n.length-1))}),(t=>Ou(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,1)}{Rc(e.get());const n=Yx(t,!0);return e.set(n),Vi(n,1)}}))),(t=>Bu(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,t.length-1)}{Rc(e.get());const n=Yx(t,!1);return e.set(n),Vi(n,n.length-1)}}))),(t=>{Rc(e.get());const n=Kx(t);return e.set(n),I.some(Vi(n,1))})),Qx=(e,t)=>{for(let n=0;n<e.length;n++){const o=e[n].apply(null,t);if(o.isSome())return o}return I.none()},Jx=hl([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Zx=(e,t)=>Xc(t,e)||e,eE=(e,t,n)=>{const o=_h(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Au(r,o).bind(T(xh,e,r)).map((e=>Jx.before(e)))),I.none)},tE=(e,t)=>null===Lu(e,t),nE=(e,t,n)=>xh(e,t,n).filter(T(tE,t)),oE=(e,t,n)=>{const o=kh(n);return nE(e,t,o).bind((e=>Tu(e,o).isNone()?I.some(Jx.start(e)):I.none()))},rE=(e,t,n)=>{const o=_h(n);return nE(e,t,o).bind((e=>Au(e,o).isNone()?I.some(Jx.end(e)):I.none()))},sE=(e,t,n)=>{const o=kh(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Tu(r,o).bind(T(xh,e,r)).map((e=>Jx.after(e)))),I.none)},aE=e=>!wh(lE(e)),iE=(e,t,n)=>Qx([eE,oE,rE,sE],[e,t,n]).filter(aE),lE=e=>e.fold(R,R,R,R),dE=e=>e.fold(N("before"),N("start"),N("end"),N("after")),cE=e=>e.fold(Jx.before,Jx.before,Jx.after,Jx.after),uE=e=>e.fold(Jx.start,Jx.start,Jx.end,Jx.end),mE=(e,t,n,o,r,s)=>Mt(xh(t,n,o),xh(t,n,r),((t,o)=>t!==o&&((e,t,n)=>{const o=Xc(t,e),r=Xc(n,e);return C(o)&&o===r})(n,t,o)?Jx.after(e?t:o):s)).getOr(s),fE=(e,t)=>e.fold(M,(e=>{return o=t,!(dE(n=e)===dE(o)&&lE(n)===lE(o));var n,o})),gE=(e,t)=>e?t.fold(k(I.some,Jx.start),I.none,k(I.some,Jx.after),I.none):t.fold(I.none,k(I.some,Jx.before),I.none,k(I.some,Jx.end)),pE=(e,t,n)=>{const o=e?1:-1;return t.setRng(Vi(n.container(),n.offset()+o).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0};var hE;!function(e){e[e.Br=0]="Br",e[e.Block=1]="Block",e[e.Wrap=2]="Wrap",e[e.Eol=3]="Eol"}(hE||(hE={}));const bE=(e,t)=>e===cu.Backwards?oe(t):t,vE=(e,t,n)=>e===cu.Forwards?t.next(n):t.prev(n),yE=(e,t,n,o)=>ar(o.getNode(t===cu.Forwards))?hE.Br:!1===Qc(n,o)?hE.Block:hE.Wrap,CE=(e,t,n,o)=>{const r=wu(n);let s=o;const a=[];for(;s;){const n=vE(t,r,s);if(!n)break;if(ar(n.getNode(!1)))return t===cu.Forwards?{positions:bE(t,a).concat([n]),breakType:hE.Br,breakAt:I.some(n)}:{positions:bE(t,a),breakType:hE.Br,breakAt:I.some(n)};if(n.isVisible()){if(e(s,n)){const e=yE(0,t,s,n);return{positions:bE(t,a),breakType:e,breakAt:I.some(n)}}a.push(n),s=n}else s=n}return{positions:bE(t,a),breakType:hE.Eol,breakAt:I.none()}},wE=(e,t,n,o)=>t(n,o).breakAt.map((o=>{const r=t(n,o).positions;return e===cu.Backwards?r.concat(o):[o].concat(r)})).getOr([]),xE=(e,t)=>X(e,((e,n)=>e.fold((()=>I.some(n)),(o=>Mt(le(o.getClientRects()),le(n.getClientRects()),((e,r)=>{const s=Math.abs(t-e.left);return Math.abs(t-r.left)<=s?n:o})).or(e)))),I.none()),EE=(e,t)=>le(t.getClientRects()).bind((t=>xE(e,t.left))),_E=T(CE,Vi.isAbove,-1),kE=T(CE,Vi.isBelow,1),SE=T(wE,-1,_E),NE=T(wE,1,kE),RE=(e,t)=>_E(e,t).breakAt.isNone(),AE=(e,t)=>kE(e,t).breakAt.isNone(),TE=(e,t)=>EE(SE(e,t),t),OE=(e,t)=>EE(NE(e,t),t),BE=dr,PE=(e,t)=>Math.abs(e.left-t),DE=(e,t)=>Math.abs(e.right-t),LE=(e,t)=>Oe(e,((e,n)=>{const o=Math.min(PE(e,t),DE(e,t)),r=Math.min(PE(n,t),DE(n,t));return r===o&&_e(n,"node")&&BE(n.node)||r<o?n:e})),ME=e=>{const t=t=>q(t,(t=>{const n=vi(t);return n.node=e,n}));if(qo(e))return t(e.getClientRects());if(er(e)){const n=e.ownerDocument.createRange();return n.setStart(e,0),n.setEnd(e,e.data.length),t(n.getClientRects())}return[]},IE=e=>te(e,ME);var FE;!function(e){e[e.Up=-1]="Up",e[e.Down=1]="Down"}(FE||(FE={}));const UE=(e,t,n,o,r,s)=>{let a=0;const i=[],l=o=>{let s=IE([o]);-1===e&&(s=s.reverse());for(let e=0;e<s.length;e++){const o=s[e];if(!n(o,d)){if(i.length>0&&t(o,Pe(i))&&a++,o.line=a,r(o))return!0;i.push(o)}}return!1},d=Pe(s.getClientRects());if(!d)return i;const c=s.getNode();return c&&(l(c),((e,t,n,o)=>{let r=o;for(;r=Gc(r,e,os,t);)if(n(r))return})(e,o,l,c)),i},zE=T(UE,FE.Up,wi,xi),jE=T(UE,FE.Down,xi,wi),HE=e=>Pe(e.getClientRects()),$E=e=>t=>((e,t)=>t.line>e)(e,t),qE=e=>t=>((e,t)=>t.line===e)(e,t),VE=(e,t)=>{e.selection.setRng(t),sg(e,e.selection.getRng())},WE=(e,t,n)=>I.some(Nx(e,t,n)),KE=(e,t,n,o,r,s)=>{const a=t===cu.Forwards,i=wu(e.getBody()),l=T(lu,a?i.next:i.prev),d=a?o:r;if(!n.collapsed){const o=_i(n);if(s(o))return kx(t,e,o,t===cu.Backwards,!1);if(Px(e)){const e=n.cloneRange();return e.collapse(t===cu.Backwards),I.from(e)}}const c=au(t,e.getBody(),n);if(d(c))return Sx(e,c.getNode(!a));let u=l(c);const m=Wr(n);if(!u)return m?I.some(n):I.none();if(u=Eh(a,u),d(u))return kx(t,e,u.getNode(!a),a,!1);const f=l(u);return f&&d(f)&&du(u,f)?kx(t,e,f.getNode(!a),a,!1):m?WE(e,u.toRange(),!1):I.none()},YE=(e,t,n,o,r,s)=>{const a=au(t,e.getBody(),n),i=Pe(a.getClientRects()),l=t===FE.Down,d=e.getBody();if(!i)return I.none();if(Px(e)){const e=l?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return(l?OE:TE)(d,e).orThunk((()=>I.from(e))).map((e=>e.toRange()))}const c=(l?jE:zE)(d,$E(1),a),u=Y(c,qE(1)),m=i.left,f=LE(u,m);if(f&&s(f.node)){const n=Math.abs(m-f.left),o=Math.abs(m-f.right);return kx(t,e,f.node,n<o,!1)}let g;if(g=o(a)?a.getNode():r(a)?a.getNode(!0):_i(n),g){const n=((e,t,n,o)=>{const r=wu(t);let s,a,i,l;const d=[];let c=0;1===e?(s=r.next,a=xi,i=wi,l=Vi.after(o)):(s=r.prev,a=wi,i=xi,l=Vi.before(o));const u=HE(l);do{if(!l.isVisible())continue;const e=HE(l);if(i(e,u))continue;d.length>0&&a(e,Pe(d))&&c++;const t=vi(e);if(t.position=l,t.line=c,n(t))return d;d.push(t)}while(l=s(l));return d})(t,d,$E(1),g);let o=LE(Y(n,qE(1)),m);if(o)return WE(e,o.position.toRange(),!1);if(o=Pe(Y(n,qE(0))),o)return WE(e,o.position.toRange(),!1)}return 0===u.length?GE(e,l).filter(l?r:o).map((t=>Nx(e,t.toRange(),!1))):I.none()},GE=(e,t)=>{const n=e.selection.getRng(),o=t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n),r=(s=o.container(),a=e.getBody(),Qn(yn(s),(e=>Ic(e.dom)),(e=>e.dom===a)).map((e=>e.dom)).getOr(a));var s,a;if(t){const e=kE(r,o);return de(e.positions)}{const e=_E(r,o);return le(e.positions)}},XE=(e,t,n)=>GE(e,t).filter(n).exists((t=>(e.selection.setRng(t.toRange()),!0))),QE=(e,t)=>{const n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},JE=(e,t)=>{e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},ZE=(e,t,n)=>Xx(t,n).map((t=>(QE(e,t),n))),e_=(e,t,n)=>{const o=e.getBody(),r=((e,t,n)=>{const o=Vi.fromRangeStart(e);if(e.collapsed)return o;{const r=Vi.fromRangeEnd(e);return n?Tu(t,r).getOr(r):Au(t,o).getOr(o)}})(e.selection.getRng(),o,n);return((e,t,n,o)=>{const r=Eh(e,o),s=iE(t,n,r);return iE(t,n,r).bind(T(gE,e)).orThunk((()=>((e,t,n,o,r)=>{const s=Eh(e,r);return ku(e,n,s).map(T(Eh,e)).fold((()=>o.map(cE)),(r=>iE(t,n,r).map(T(mE,e,t,n,s,r)).filter(T(fE,o)))).filter(aE)})(e,t,n,s,o)))})(n,T(Ch,e),o,r).bind((n=>ZE(e,t,n)))},t_=(e,t,n)=>!!yd(e)&&e_(e,t,n).isSome(),n_=(e,t,n)=>!!yd(t)&&((e,t)=>{const n=t.selection.getRng(),o=e?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return!!(e=>w(e.selection.getSel().modify))(t)&&(e&&jr(o)?pE(!0,t.selection,o):!(e||!Hr(o))&&pE(!1,t.selection,o))})(e,t),o_=e=>{const t=$a(null),n=T(Ch,e);return e.on("NodeChange",(o=>{yd(e)&&(((e,t,n)=>{const o=q(Uo(yn(t.getRoot()),'*[data-mce-selected="inline-boundary"]'),(e=>e.dom)),r=Y(o,e),s=Y(n,e);V(re(r,s),T(JE,!1)),V(re(s,r),T(JE,!0))})(n,e.dom,o.parents),((e,t)=>{const n=t.get();if(e.selection.isCollapsed()&&!e.composing&&n){const o=Vi.fromRangeStart(e.selection.getRng());Vi.isTextPosition(o)&&!(e=>jr(e)||Hr(e))(o)&&(QE(e,Nc(n,o)),t.set(null))}})(e,t),((e,t,n,o)=>{if(t.selection.isCollapsed()){const r=Y(o,e);V(r,(o=>{const r=Vi.fromRangeStart(t.selection.getRng());iE(e,t.getBody(),r).bind((e=>ZE(t,n,e)))}))}})(n,e,t,o.parents))})),t},r_=T(n_,!0),s_=T(n_,!1),a_=(e,t,n)=>{if(yd(e)){const o=GE(e,t).getOrThunk((()=>{const n=e.selection.getRng();return t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n)}));return iE(T(Ch,e),e.getBody(),o).exists((t=>{const o=cE(t);return Xx(n,o).exists((t=>(QE(e,t),!0)))}))}return!1},i_=(e,t)=>n=>Xx(t,n).map((t=>()=>QE(e,t))),l_=(e,t,n,o)=>{const r=e.getBody(),s=T(Ch,e);e.undoManager.ignore((()=>{e.selection.setRng(((e,t)=>{const n=document.createRange();return n.setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n})(n,o)),Nh(e),iE(s,r,Vi.fromRangeStart(e.selection.getRng())).map(uE).bind(i_(e,t)).each(D)})),e.nodeChanged()},d_=(e,t,n)=>{if(e.selection.isCollapsed()&&yd(e)){const o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n,o)=>{const r=((e,t)=>Xc(t,e)||e)(e.getBody(),o.container()),s=T(Ch,e),a=iE(s,r,o);return a.bind((e=>n?e.fold(N(I.some(uE(e))),I.none,N(I.some(cE(e))),I.none):e.fold(I.none,N(I.some(cE(e))),I.none,N(I.some(uE(e)))))).map(i_(e,t)).getOrThunk((()=>{const i=Su(n,r,o),l=i.bind((e=>iE(s,r,e)));return Mt(a,l,(()=>xh(s,r,o).bind((t=>(e=>Mt(Ou(e),Bu(e),((t,n)=>{const o=Eh(!0,t),r=Eh(!1,n);return Au(e,o).forall((e=>e.isEqual(r)))})).getOr(!0))(t)?I.some((()=>{vh(e,n,yn(t))})):I.none())))).getOrThunk((()=>l.bind((()=>i.map((r=>()=>{n?l_(e,t,o,r):l_(e,t,r,o)}))))))}))})(e,t,n,o)}return I.none()},c_=(e,t)=>{const n=yn(e.getBody()),o=yn(e.selection.getStart()),r=Bp(o,n);return Z(r,t).fold(N(r),(e=>r.slice(0,e)))},u_=e=>1===zn(e),m_=(e,t)=>{const n=T(Zb,e);return te(t,(e=>n(e)?[e.dom]:[]))},f_=e=>{const t=(e=>c_(e,(t=>e.schema.isBlock(Ht(t)))))(e);return m_(e,t)},g_=(e,t)=>{const n=Y((e=>c_(e,(t=>e.schema.isBlock(Ht(t))||(e=>zn(e)>1)(t))))(e),u_);return de(n).bind((o=>{const r=Vi.fromRangeStart(e.selection.getRng());return Oh(t,r,o.dom)&&!Tm(o)?I.some((()=>((e,t,n,o)=>{const r=m_(t,o);if(0===r.length)vh(t,e,n);else{const e=Jb(n.dom,r);t.selection.setRng(e.toRange())}})(t,e,o,n))):I.none()}))},p_=(e,t)=>{const n=e.selection.getStart(),o=((e,t)=>{const n=t.parentElement;return ar(t)&&!h(n)&&e.dom.isEmpty(n)})(e,n)||Tm(yn(n))?Jb(n,t):((e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return e.insertNode(n.dom),o})(e.selection.getRng(),t);e.selection.setRng(o.toRange())},h_=e=>er(e.startContainer),b_=e=>{const t=e.selection.getRng();return(e=>0===e.startOffset&&h_(e))(t)&&((e,t)=>{const n=t.startContainer.parentElement;return!h(n)&&Zb(e,yn(n))})(e,t)&&(e=>(e=>(e=>{const t=e.startContainer.parentNode,n=e.endContainer.parentNode;return!h(t)&&!h(n)&&t.isEqualNode(n)})(e)&&(e=>{const t=e.endContainer;return e.endOffset===(er(t)?t.length:t.childNodes.length)})(e))(e)||(e=>!e.endContainer.isEqualNode(e.commonAncestorContainer))(e))(t)},v_=(e,t)=>e.selection.isCollapsed()?g_(e,t):(e=>{if(b_(e)){const t=f_(e);return I.some((()=>{Nh(e),((e,t)=>{const n=re(t,f_(e));n.length>0&&p_(e,n)})(e,t)}))}return I.none()})(e),y_=(e,t)=>Qn(e,(e=>Du(e.dom)),(e=>t.isBlock(Ht(e)))).isSome(),C_=e=>((e=>{const t=e.selection.getRng();return t.collapsed&&(h_(t)||e.dom.isEmpty(t.startContainer))&&!(e=>y_(yn(e.selection.getStart()),e.schema))(e)})(e)&&p_(e,[]),!0),w_=(e,t,n)=>C(n)?I.some((()=>{e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n))})):I.none(),x_=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=t?kp:Sp,o=t?cu.Forwards:cu.Backwards,r=au(o,e.getBody(),e.selection.getRng());return n(r)?w_(e,t,r.getNode(!t)):I.from(Eh(t,r)).filter((e=>n(e)&&du(r,e))).bind((n=>w_(e,t,n.getNode(!t))))})(e,t):((e,t)=>{const n=e.selection.getNode();return mr(n)?w_(e,t,n):I.none()})(e,t),E_=e=>Xe(null!=e?e:"").getOr(0),__=(e,t)=>(e||"table"===Ht(t)?"margin":"padding")+("rtl"===co(t,"direction")?"-right":"-left"),k_=e=>{const t=N_(e);return!e.mode.isReadOnly()&&(t.length>1||((e,t)=>ne(t,(t=>{const n=__(od(e),t),o=mo(t,n).map(E_).getOr(0);return"false"!==e.dom.getContentEditable(t.dom)&&o>0})))(e,t))},S_=e=>kr(e)||Sr(e),N_=e=>Y(_o(e.selection.getSelectedBlocks()),(e=>!S_(e)&&!(e=>An(e).exists(S_))(e)&&Jn(e,(e=>lr(e.dom)||dr(e.dom))).exists((e=>lr(e.dom))))),R_=(e,t)=>{var n,o;const{dom:r}=e,s=rd(e),a=null!==(o=null===(n=/[a-z%]+$/i.exec(s))||void 0===n?void 0:n[0])&&void 0!==o?o:"px",i=E_(s),l=od(e);V(N_(e),(e=>{((e,t,n,o,r,s)=>{const a=__(n,yn(s)),i=E_(e.getStyle(s,a));if("outdent"===t){const t=Math.max(0,i-o);e.setStyle(s,a,t?t+r:"")}else{const t=i+o+r;e.setStyle(s,a,t)}})(r,t,l,i,a,e.dom)}))},A_=e=>R_(e,"outdent"),T_=e=>{if(e.selection.isCollapsed()&&k_(e)){const t=e.dom,n=e.selection.getRng(),o=Vi.fromRangeStart(n),r=t.getParent(n.startContainer,t.isBlock);if(null!==r&&Ip(yn(r),o,e.schema))return I.some((()=>A_(e)))}return I.none()},O_=(e,t,n)=>ue([T_,Ux,Ox,(e,n)=>d_(e,t,n),wx,ib,zx,x_,_x,v_],(t=>t(e,n))).filter((t=>e.selection.isEditable())),B_=(e,t)=>{e.addCommand("delete",(()=>{((e,t)=>{O_(e,t,!1).fold((()=>{e.selection.isEditable()&&(Nh(e),Th(e))}),D)})(e,t)})),e.addCommand("forwardDelete",(()=>{((e,t)=>{O_(e,t,!0).fold((()=>{e.selection.isEditable()&&(e=>{Sh(e,"ForwardDelete")})(e)}),D)})(e,t)}))},P_=e=>void 0===e.touches||1!==e.touches.length?I.none():I.some(e.touches[0]),D_=(e,t)=>Ee(e,t.nodeName),L_=(e,t)=>!!er(t)||!!qo(t)&&!(D_(e.getBlockElements(),t)||Ku(t)||Ts(e,t)||hs(t)),M_=(e,t)=>{if(er(t)){if(0===t.data.length)return!0;if(/^\s+$/.test(t.data))return!t.nextSibling||D_(e,t.nextSibling)||hs(t.nextSibling)}return!1},I_=e=>e.dom.create(Il(e),Fl(e)),F_=e=>{const t=e.dom,n=e.selection,o=e.schema,r=o.getBlockElements(),s=n.getStart(),a=e.getBody();let i,l,d=!1;const c=Il(e);if(!s||!qo(s))return;const u=a.nodeName.toLowerCase();if(!o.isValidChild(u,c.toLowerCase())||((e,t,n)=>$(Op(yn(n),yn(t)),(t=>D_(e,t.dom))))(r,a,s))return;const m=n.getRng(),{startContainer:f,startOffset:g,endContainer:p,endOffset:h}=m,b=Rg(e);let v=a.firstChild;for(;v;)if(qo(v)&&Ss(o,v),L_(o,v)){if(M_(r,v)){l=v,v=v.nextSibling,t.remove(l);continue}i||(i=I_(e),a.insertBefore(i,v),d=!0),l=v,v=v.nextSibling,i.appendChild(l)}else i=null,v=v.nextSibling;d&&b&&(m.setStart(f,g),m.setEnd(p,h),n.setRng(m),e.nodeChanged())},U_=(e,t,n)=>{const o=yn(I_(e)),r=Tr();vo(o,r),n(t,o);const s=document.createRange();return s.setStartBefore(r.dom),s.setEndBefore(r.dom),s},z_=e=>t=>-1!==(" "+t.attr("class")+" ").indexOf(e),j_=(e,t,n)=>function(o){const r=arguments,s=r[r.length-2],a=s>0?t.charAt(s-1):"";if('"'===a)return o;if(">"===a){const e=t.lastIndexOf("<",s);if(-1!==e&&-1!==t.substring(e,s).indexOf('contenteditable="false"'))return o}return'<span class="'+n+'" data-mce-content="'+e.dom.encode(r[0])+'">'+e.dom.encode("string"==typeof r[1]?r[1]:r[0])+"</span>"},H_=(e,t)=>{t.hasAttribute("data-mce-caret")&&(Vr(t),e.selection.setRng(e.selection.getRng()),e.selection.scrollIntoView(t))},$_=(e,t)=>{const n=(e=>to(yn(e.getBody()),"*[data-mce-caret]").map((e=>e.dom)).getOrNull())(e);if(n)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void H_(e,n)):void(zr(n)&&(H_(e,n),e.undoManager.add()))},q_=dr,V_=(e,t,n)=>{const o=wu(e.getBody()),r=T(lu,1===t?o.next:o.prev);if(n.collapsed){const o=e.dom.getParent(n.startContainer,"PRE");if(!o)return;if(!r(Vi.fromRangeStart(n))){const n=yn((e=>{const t=e.dom.create(Il(e));return t.innerHTML='<br data-mce-bogus="1">',t})(e));1===t?ho(yn(o),n):po(yn(o),n),e.selection.select(n.dom,!0),e.selection.collapse()}}},W_=(e,t)=>((e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return((e,t,n)=>KE(t,e,n,Ap,Tp,q_))(n,e,o).orThunk((()=>(V_(e,n,o),I.none())))})(e,((e,t)=>{const n=t?e.getEnd(!0):e.getStart(!0);return wh(n)?!t:t})(e.selection,t)).exists((t=>(VE(e,t),!0))),K_=(e,t)=>((e,t)=>{const n=t?1:-1,o=e.selection.getRng();return((e,t,n)=>YE(t,e,n,(e=>Ap(e)||Np(e)),(e=>Tp(e)||Rp(e)),q_))(n,e,o).orThunk((()=>(V_(e,n,o),I.none())))})(e,t).exists((t=>(VE(e,t),!0))),Y_=(e,t)=>XE(e,t,t?Tp:Ap),G_=(e,t)=>Bx(e,!t).map((n=>{const o=n.toRange(),r=e.selection.getRng();return t?o.setStart(r.startContainer,r.startOffset):o.setEnd(r.endContainer,r.endOffset),o})).exists((t=>(VE(e,t),!0))),X_=e=>H(["figcaption"],Ht(e)),Q_=(e,t)=>!!e.selection.isCollapsed()&&((e,t)=>{const n=yn(e.getBody()),o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n)=>{const o=T(_n,t);return Jn(yn(e.container()),(e=>n.isBlock(Ht(e))),o).filter(X_)})(o,n,e.schema).exists((()=>{if(((e,t,n)=>t?AE(e.dom,n):RE(e.dom,n))(n,t,o)){const o=U_(e,n,t?vo:bo);return e.selection.setRng(o),!0}return!1}))})(e,t),J_=(e,t)=>((e,t)=>t?I.from(e.dom.getParent(e.selection.getNode(),"details")).map((t=>((e,t)=>{const n=e.selection.getRng(),o=Vi.fromRangeStart(n);return!(e.getBody().lastChild!==t||!AE(t,o)||(e.execCommand("InsertNewBlockAfter"),0))})(e,t))).getOr(!1):I.from(e.dom.getParent(e.selection.getNode(),"summary")).bind((t=>I.from(e.dom.getParent(t,"details")).map((n=>((e,t,n)=>{const o=e.selection.getRng(),r=Vi.fromRangeStart(o);return!(e.getBody().firstChild!==t||!RE(n,r)||(e.execCommand("InsertNewBlockBefore"),0))})(e,n,t))))).getOr(!1))(e,t),Z_={shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0},ek=(e,t)=>t.keyCode===e.keyCode&&t.shiftKey===e.shiftKey&&t.altKey===e.altKey&&t.ctrlKey===e.ctrlKey&&t.metaKey===e.metaKey,tk=(e,...t)=>()=>e.apply(null,t),nk=(e,t)=>J(((e,t)=>te((e=>q(e,(e=>({...Z_,...e}))))(e),(e=>ek(e,t)?[e]:[])))(e,t),(e=>e.action())),ok=(e,t)=>ue(((e,t)=>te((e=>q(e,(e=>({...Z_,...e}))))(e),(e=>ek(e,t)?[e]:[])))(e,t),(e=>e.action())),rk=(e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return KE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},sk=(e,t)=>{const n=t?1:-1,o=e.selection.getRng();return YE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},ak=(e,t)=>XE(e,t,t?Sp:kp),ik=hl([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),lk={...ik,none:e=>ik.none(e)},dk=(e,t,n)=>te(Mn(e),(e=>xn(e,t)?n(e)?[e]:[]:dk(e,t,n))),ck=(e,t)=>no(e,"table",t),uk=(e,t,n,o,r=M)=>{const s=1===o;if(!s&&n<=0)return lk.first(e[0]);if(s&&n>=e.length-1)return lk.last(e[e.length-1]);{const s=n+o,a=e[s];return r(a)?lk.middle(t,a):uk(e,t,s,o,r)}},mk=(e,t)=>ck(e,t).bind((t=>{const n=dk(t,"th,td",M);return Z(n,(t=>_n(e,t))).map((e=>({index:e,all:n})))})),fk=(e,t,n,o,r)=>{const s=Uo(yn(n),"td,th,caption").map((e=>e.dom)),a=Y(((e,t)=>te(t,(t=>{const n=((e,t)=>({left:e.left-t,top:e.top-t,right:e.right+-2,bottom:e.bottom+-2,width:e.width+t,height:e.height+t}))(vi(t.getBoundingClientRect()),-1);return[{x:n.left,y:e(n),cell:t},{x:n.right,y:e(n),cell:t}]})))(e,s),(e=>t(e,r)));return((e,t,n)=>X(e,((e,o)=>e.fold((()=>I.some(o)),(e=>{const r=Math.sqrt(Math.abs(e.x-t)+Math.abs(e.y-n)),s=Math.sqrt(Math.abs(o.x-t)+Math.abs(o.y-n));return I.some(s<r?o:e)}))),I.none()))(a,o,r).map((e=>e.cell))},gk=T(fk,(e=>e.bottom),((e,t)=>e.y<t)),pk=T(fk,(e=>e.top),((e,t)=>e.y>t)),hk=(e,t,n)=>{const o=e(t,n);return(e=>e.breakType===hE.Wrap&&0===e.positions.length)(o)||!ar(n.getNode())&&(e=>e.breakType===hE.Br&&1===e.positions.length)(o)?!((e,t,n)=>n.breakAt.exists((n=>e(t,n).breakAt.isSome())))(e,t,o):o.breakAt.isNone()},bk=T(hk,_E),vk=T(hk,kE),yk=(e,t,n,o)=>{const r=e.selection.getRng(),s=t?1:-1;return!(!Dc()||!((e,t,n)=>{const o=Vi.fromRangeStart(t);return Ru(!e,n).exists((e=>e.isEqual(o)))})(t,r,n)||(kx(s,e,n,!t,!1).each((t=>{VE(e,t)})),0))},Ck=(e,t,n)=>{const o=((e,t)=>{const n=t.getNode(e);return Qo(n)?I.some(n):I.none()})(!!t,n),r=!1===t;o.fold((()=>VE(e,n.toRange())),(o=>Ru(r,e.getBody()).filter((e=>e.isEqual(n))).fold((()=>VE(e,n.toRange())),(n=>((e,t,n)=>{t.undoManager.transact((()=>{const o=e?ho:po,r=U_(t,yn(n),o);VE(t,r)}))})(t,e,o)))))},wk=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();if(!t&&bk(o,s)){const o=((e,t,n)=>((e,t)=>le(t.getClientRects()).bind((t=>gk(e,t.left,t.top))).bind((e=>{return EE(Bu(n=e).map((e=>_E(n,e).positions.concat(e))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(SE(e,Vi.before(t)),n.left))))).getOr(Vi.before(t)))(a,n,s);return Ck(e,t,o),!0}if(t&&vk(o,s)){const o=((e,t,n)=>((e,t)=>de(t.getClientRects()).bind((t=>pk(e,t.left,t.top))).bind((e=>{return EE(Ou(n=e).map((e=>[e].concat(kE(n,e).positions))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(NE(e,Vi.after(t)),n.left))))).getOr(Vi.after(t)))(a,n,s);return Ck(e,t,o),!0}return!1},xk=(e,t,n)=>I.from(e.dom.getParent(e.selection.getNode(),"td,th")).bind((o=>I.from(e.dom.getParent(o,"table")).map((r=>n(e,t,r,o))))).getOr(!1),Ek=(e,t)=>xk(e,t,yk),_k=(e,t)=>xk(e,t,wk),kk=(e,t,n)=>n.fold(I.none,I.none,((e,t)=>{return(n=t,Zn(n,Fg)).map((e=>(e=>{const t=xf.exact(e,0,e,0);return Nf(t)})(e)));var n}),(n=>(e.execCommand("mceTableInsertRowAfter"),Sk(e,t,n)))),Sk=(e,t,n)=>{return kk(e,t,(r=oo,mk(o=n,void 0).fold((()=>lk.none(o)),(e=>uk(e.all,o,e.index,1,r)))));var o,r},Nk=(e,t,n)=>{return kk(e,t,(r=oo,mk(o=n,void 0).fold((()=>lk.none()),(e=>uk(e.all,o,e.index,-1,r)))));var o,r},Rk=(e,t)=>{const n=["table","li","dl"],o=yn(e.getBody()),r=e=>{const t=Ht(e);return _n(e,o)||H(n,t)},s=e.selection.getRng();return((e,t)=>((e,t,n=L)=>n(t)?I.none():H(e,Ht(t))?I.some(t):eo(t,e.join(","),(e=>xn(e,"table")||n(e))))(["td","th"],e,t))(yn(t?s.endContainer:s.startContainer),r).map((n=>(ck(n,r).each((t=>{e.model.table.clearSelectedCells(t.dom)})),e.selection.collapse(!t),(t?Sk:Nk)(e,r,n).each((t=>{e.selection.setRng(t)})),!0))).getOr(!1)},Ak=(e,t)=>({container:e,offset:t}),Tk=za.DOM,Ok=e=>t=>e===t?-1:0,Bk=(e,t,n)=>{if(er(e)&&t>=0)return I.some(Ak(e,t));{const o=hi(Tk);return I.from(o.backwards(e,t,Ok(e),n)).map((e=>Ak(e.container,e.container.data.length)))}},Pk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t>=0&&t<=o.length)return I.some(Ak(e,t));{const o=hi(Tk);return I.from(o.backwards(e,t,Ok(e),n)).bind((e=>{const o=e.container.data;return Pk(e.container,t+o.length,n)}))}},Dk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t<=o.length)return I.some(Ak(e,t));{const r=hi(Tk);return I.from(r.forwards(e,t,Ok(e),n)).bind((e=>Dk(e.container,t-o.length,n)))}},Lk=(e,t,n,o,r)=>{const s=hi(e,(e=>t=>e.isBlock(t)||H(["BR","IMG","HR","INPUT"],t.nodeName)||"false"===e.getContentEditable(t))(e));return I.from(s.backwards(t,n,o,r))},Mk=e=>Dr(e.toString().replace(/\u00A0/g," ")),Ik=e=>""!==e&&-1!==" \xa0\f\n\r\t\v".indexOf(e),Fk=(e,t)=>e.substring(t.length),Uk=(e,t,n,o=0)=>{return(r=yn(t.startContainer),no(r,Ug)).fold((()=>((e,t,n,o=0)=>{if(!(r=t).collapsed||!er(r.startContainer))return I.none();var r;const s={text:"",offset:0},a=e.getParent(t.startContainer,e.isBlock)||e.getRoot();return Lk(e,t.startContainer,t.startOffset,((e,t,o)=>(s.text=o+s.text,s.offset+=t,((e,t,n)=>{let o;const r=n.charAt(0);for(o=t-1;o>=0;o--){const s=e.charAt(o);if(Ik(s))return I.none();if(r===s&&je(e,n,o,t))break}return I.some(o)})(s.text,s.offset,n).getOr(t))),a).bind((e=>{const r=t.cloneRange();if(r.setStart(e.container,e.offset),r.setEnd(t.endContainer,t.endOffset),r.collapsed)return I.none();const s=Mk(r);return 0!==s.lastIndexOf(n)||Fk(s,n).length<o?I.none():I.some({text:Fk(s,n),range:r,trigger:n})}))})(e,t,n,o)),(t=>{const o=e.createRng();o.selectNode(t.dom);const r=Mk(o);return I.some({range:o,text:Fk(r,n),trigger:n})}));var r},zk=e=>{if((e=>3===e.nodeType)(e))return Ak(e,e.data.length);{const t=e.childNodes;return t.length>0?zk(t[t.length-1]):Ak(e,t.length)}},jk=(e,t)=>{const n=e.childNodes;return n.length>0&&t<n.length?jk(n[t],0):n.length>0&&(e=>1===e.nodeType)(e)&&n.length===t?zk(n[n.length-1]):Ak(e,t)},Hk=(e,t,n,o={})=>{var r;const s=t(),a=null!==(r=e.selection.getRng().startContainer.nodeValue)&&void 0!==r?r:"",i=Y(s.lookupByTrigger(n.trigger),(t=>n.text.length>=t.minChars&&t.matches.getOrThunk((()=>(e=>t=>{const n=jk(t.startContainer,t.startOffset);return!((e,t)=>{var n;const o=null!==(n=e.getParent(t.container,e.isBlock))&&void 0!==n?n:e.getRoot();return Lk(e,t.container,t.offset,((e,t)=>0===t?-1:t),o).filter((e=>{const t=e.container.data.charAt(e.offset-1);return!Ik(t)})).isSome()})(e,n)})(e.dom)))(n.range,a,n.text)));if(0===i.length)return I.none();const l=Promise.all(q(i,(e=>e.fetch(n.text,e.maxResults,o).then((t=>({matchText:n.text,items:t,columns:e.columns,onAction:e.onAction,highlightOn:e.highlightOn}))))));return I.some({lookupData:l,context:n})};var $k;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}($k||($k={}));const qk=(e,t,n)=>e.stype===$k.Error?t(e.serror):n(e.svalue),Vk=e=>({stype:$k.Value,svalue:e}),Wk=e=>({stype:$k.Error,serror:e}),Kk=qk,Yk=e=>f(e)&&me(e).length>100?" removed due to size":JSON.stringify(e,null,2),Gk=(e,t)=>Wk([{path:e,getErrorInfo:t}]),Xk=(e,t)=>({extract:(n,o)=>xe(o,e).fold((()=>((e,t)=>Gk(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(n,e)),(e=>((e,t,n,o)=>xe(n,o).fold((()=>((e,t,n)=>Gk(e,(()=>'The chosen schema: "'+n+'" did not exist in branches: '+Yk(t))))(e,n,o)),(n=>n.extract(e.concat(["branch: "+o]),t))))(n,o,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+me(t)}),Qk=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const n={};for(let o=0;o<t.length;o++){const r=t[o];for(const t in r)Ee(r,t)&&(n[t]=e(n[t],r[t]))}return n},Jk=Qk(((e,t)=>g(e)&&g(t)?Jk(e,t):t)),Zk=(Qk(((e,t)=>t)),e=>({tag:"defaultedThunk",process:N(e)})),eS=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{qk(e,(e=>n.push(e)),(e=>t.push(e)))})),{values:t,errors:n}})(e);return t.errors.length>0?(n=t.errors,k(Wk,ee)(n)):Vk(t.values);var n},tS=(e,t,n)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return n(e.newKey,e.instantiator)}},nS=e=>({extract:(t,n)=>{return o=e(n),r=e=>((e,t)=>Gk(e,N(t)))(t,e),o.stype===$k.Error?r(o.serror):o;var o,r},toString:N("val")}),oS=nS(Vk),rS=(e,t,n,o)=>o(xe(e,t).getOrThunk((()=>n(e)))),sS=(e,t,n,o,r)=>{const s=e=>r.extract(t.concat([o]),e),a=e=>e.fold((()=>Vk(I.none())),(e=>{const n=r.extract(t.concat([o]),e);return s=n,a=I.some,s.stype===$k.Value?{stype:$k.Value,svalue:a(s.svalue)}:s;var s,a}));switch(e.tag){case"required":return((e,t,n,o)=>xe(t,n).fold((()=>((e,t,n)=>Gk(e,(()=>'Could not find valid *required* value for "'+t+'" in '+Yk(n))))(e,n,t)),o))(t,n,o,s);case"defaultedThunk":return rS(n,o,e.process,s);case"option":return((e,t,n)=>n(xe(e,t)))(n,o,a);case"defaultedOptionThunk":return((e,t,n,o)=>o(xe(e,t).map((t=>!0===t?n(e):t))))(n,o,e.process,a);case"mergeWithThunk":return rS(n,o,N({}),(t=>{const o=Jk(e.process(n),t);return s(o)}))}},aS=e=>({extract:(t,n)=>((e,t,n)=>{const o={},r=[];for(const s of n)tS(s,((n,s,a,i)=>{const l=sS(a,e,t,n,i);Kk(l,(e=>{r.push(...e)}),(e=>{o[s]=e}))}),((e,n)=>{o[e]=n(t)}));return r.length>0?Wk(r):Vk(o)})(t,n,e),toString:()=>{const t=q(e,(e=>tS(e,((e,t,n,o)=>e+" -> "+o.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),iS=e=>({extract:(t,n)=>{const o=q(n,((n,o)=>e.extract(t.concat(["["+o+"]"]),n)));return eS(o)},toString:()=>"array("+e.toString()+")"}),lS=(e,t,n)=>{return o=((e,t,n)=>((e,t)=>e.stype===$k.Error?{stype:$k.Error,serror:t(e.serror)}:e)(t.extract([e],n),(e=>({input:n,errors:e}))))(e,t,n),qk(o,pl.error,pl.value);var o},dS=(e,t)=>Xk(e,pe(t,aS)),cS=N(oS),uS=(e,t)=>nS((n=>{const o=typeof n;return e(n)?Vk(n):Wk(`Expected type: ${t} but got: ${o}`)})),mS=uS(x,"number"),fS=uS(m,"string"),gS=uS(b,"boolean"),pS=uS(w,"function"),hS=(e,t,n,o)=>({tag:"field",key:e,newKey:t,presence:n,prop:o}),bS=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),vS=(e,t)=>hS(e,e,{tag:"required",process:{}},t),yS=e=>vS(e,fS),CS=e=>vS(e,pS),wS=(e,t)=>hS(e,e,{tag:"option",process:{}},t),xS=e=>wS(e,fS),ES=(e,t,n)=>hS(e,e,Zk(t),n),_S=(e,t)=>ES(e,t,mS),kS=(e,t,n)=>ES(e,t,(e=>{return t=t=>H(e,t)?pl.value(t):pl.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`),nS((e=>t(e).fold(Wk,Vk)));var t})(n)),SS=(e,t)=>ES(e,t,gS),NS=(e,t)=>ES(e,t,pS),RS=yS("type"),AS=CS("fetch"),TS=CS("onAction"),OS=NS("onSetup",(()=>_)),BS=xS("text"),PS=xS("icon"),DS=xS("tooltip"),LS=xS("label"),MS=SS("active",!1),IS=SS("enabled",!0),FS=SS("primary",!1),US=e=>((e,t)=>ES("type",t,fS))(0,e),zS=aS([RS,yS("trigger"),_S("minChars",1),(1,((e,t)=>hS(e,e,Zk(1),cS()))("columns")),_S("maxResults",10),("matches",wS("matches",pS)),AS,TS,(jS=fS,ES("highlightOn",[],iS(jS)))]);var jS;const HS=[IS,DS,PS,BS,OS],$S=[MS].concat(HS),qS=[NS("predicate",L),kS("scope","node",["node","editor"]),kS("position","selection",["node","selection","line"])],VS=HS.concat([US("contextformbutton"),FS,TS,bS("original",R)]),WS=$S.concat([US("contextformbutton"),FS,TS,bS("original",R)]),KS=HS.concat([US("contextformbutton")]),YS=$S.concat([US("contextformtogglebutton")]),GS=dS("type",{contextformbutton:VS,contextformtogglebutton:WS});aS([US("contextform"),NS("initValue",N("")),LS,((e,t)=>hS(e,e,{tag:"required",process:{}},iS(t)))("commands",GS),wS("launch",dS("type",{contextformbutton:KS,contextformtogglebutton:YS}))].concat(qS));const XS=e=>{const t=e.ui.registry.getAll().popups,n=pe(t,(e=>{return(t=e,lS("Autocompleter",zS,{trigger:t.ch,...t})).fold((e=>{throw new Error("Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:N("... (only showing first ten failures)")}]):e;return q(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})((t=e).errors).join("\n")+"\n\nInput object: "+Yk(t.input));var t}),R);var t})),o=ke(Ce(n,(e=>e.trigger))),r=we(n);return{dataset:n,triggers:o,lookupByTrigger:e=>Y(r,(t=>t.trigger===e))}},QS=e=>{const t=Xa(),n=$a(!1),o=t.isSet,r=()=>{o()&&((e=>{JC(e).autocompleter.removeDecoration()})(e),(e=>{e.dispatch("AutocompleterEnd")})(e),n.set(!1),t.clear())},s=De((()=>XS(e))),a=a=>{(n=>t.get().map((t=>Uk(e.dom,e.selection.getRng(),t.trigger).bind((t=>Hk(e,s,t,n))))).getOrThunk((()=>((e,t)=>{const n=t(),o=e.selection.getRng();return((e,t,n)=>ue(n.triggers,(n=>Uk(e,t,n))))(e.dom,o,n).bind((n=>Hk(e,t,n)))})(e,s))))(a).fold(r,(s=>{(n=>{o()||(((e,t)=>{JC(e).autocompleter.addDecoration(t)})(e,n.range),t.set({trigger:n.trigger,matchLength:n.text.length}))})(s.context),s.lookupData.then((o=>{t.get().map((a=>{const i=s.context;a.trigger===i.trigger&&(i.text.length-a.matchLength>=10?r():(t.set({...a,matchLength:i.text.length}),n.get()?((e,t)=>{e.dispatch("AutocompleterUpdate",t)})(e,{lookupData:o}):(n.set(!0),((e,t)=>{e.dispatch("AutocompleterStart",t)})(e,{lookupData:o}))))}))}))}))};e.addCommand("mceAutocompleterReload",((e,t)=>{const n=f(t)?t.fetchOptions:{};a(n)})),e.addCommand("mceAutocompleterClose",r),((e,t)=>{const n=Ja(t.load,50);e.on("keypress compositionend",(e=>{27!==e.which&&n.throttle()})),e.on("keydown",(e=>{const o=e.which;8===o?n.throttle():27===o&&t.cancelIfNecessary()})),e.on("remove",n.cancel)})(e,{cancelIfNecessary:r,load:a})},JS=xt().browser.isSafari(),ZS=e=>Or(yn(e)),eN=(e,t)=>{var n;return 0===e.startOffset&&e.endOffset===(null===(n=t.textContent)||void 0===n?void 0:n.length)},tN=(e,t)=>I.from(e.getParent(t.container(),"details")),nN=(e,t)=>tN(e,t).isSome(),oN=(e,t)=>{const n=t.getNode();v(n)||e.selection.setCursorLocation(n,t.offset())},rN=(e,t,n)=>{const o=e.dom.getParent(t.container(),"details");if(o&&!o.open){const t=e.dom.select("summary",o)[0];t&&(n?Ou(t):Bu(t)).each((t=>oN(e,t)))}else oN(e,t)},sN=(e,t,n)=>{const{dom:o,selection:r}=e,s=e.getBody();if("character"===n){const n=Vi.fromRangeStart(r.getRng()),a=o.getParent(n.container(),o.isBlock),i=tN(o,n),l=a&&o.isEmpty(a),d=h(null==a?void 0:a.previousSibling),c=h(null==a?void 0:a.nextSibling);return!!(l&&(t?c:d)&&Su(!t,s,n).exists((e=>nN(o,e)&&!Lt(i,tN(o,e)))))||Su(t,s,n).fold(L,(n=>{const r=tN(o,n);if(nN(o,n)&&!Lt(i,r)){if(t||rN(e,n,!1),a&&l){if(t&&d)return!0;if(!t&&c)return!0;rN(e,n,t),e.dom.remove(a)}return!0}return!1}))}return!1},aN=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();return"selection"===o?((e,t)=>{const n=t.startSummary.exists((t=>t.contains(e.startContainer))),o=t.startSummary.exists((t=>t.contains(e.endContainer))),r=t.startDetails.forall((e=>t.endDetails.forall((t=>e!==t))));return(n||o)&&!(n&&o)||r})(r,t):n?((e,t)=>t.startSummary.exists((t=>((e,t)=>Bu(t).exists((n=>ar(n.getNode())&&Tu(t,n).exists((t=>t.isEqual(e)))||n.isEqual(e))))(e,t))))(s,t)||((e,t,n)=>n.startDetails.exists((n=>Au(e,t).forall((e=>!n.contains(e.container()))))))(a,s,t):((e,t)=>t.startSummary.exists((t=>((e,t)=>Ou(t).exists((t=>t.isEqual(e))))(e,t))))(s,t)||((e,t)=>t.startDetails.exists((n=>Tu(n,e).forall((n=>t.startSummary.exists((t=>!t.contains(e.container())&&t.contains(n.container()))))))))(s,t)},iN=(e,t,n)=>((e,t,n)=>((e,t)=>{const n=I.from(e.getParent(t.startContainer,"details")),o=I.from(e.getParent(t.endContainer,"details"));if(n.isSome()||o.isSome()){const t=n.bind((t=>I.from(e.select("summary",t)[0])));return I.some({startSummary:t,startDetails:n,endDetails:o})}return I.none()})(e.dom,e.selection.getRng()).fold((()=>sN(e,t,n)),(o=>aN(e,o,t,n)||sN(e,t,n))))(e,t,n)||JS&&((e,t,n)=>{const o=e.selection,r=o.getNode(),s=o.getRng(),a=Vi.fromRangeStart(s);return!!pr(r)&&("selection"===n&&eN(s,r)||Oh(t,a,r)?ZS(r):e.undoManager.transact((()=>{const s=o.getSel();let{anchorNode:a,anchorOffset:i,focusNode:l,focusOffset:d}=null!=s?s:{};const c=()=>{C(a)&&C(i)&&C(l)&&C(d)&&(null==s||s.setBaseAndExtent(a,i,l,d))},u=(e,t)=>{V(e.childNodes,(e=>{dm(e)&&t.appendChild(e)}))},m=e.dom.create("span",{"data-mce-bogus":"1"});u(r,m),r.appendChild(m),c(),"word"!==n&&"line"!==n||null==s||s.modify("extend",t?"right":"left",n),!o.isCollapsed()&&eN(o.getRng(),m)?ZS(r):(e.execCommand(t?"ForwardDelete":"Delete"),a=null==s?void 0:s.anchorNode,i=null==s?void 0:s.anchorOffset,l=null==s?void 0:s.focusNode,d=null==s?void 0:s.focusOffset,u(m,r),c()),e.dom.remove(m)})),!0)})(e,t,n)?I.some(_):I.none(),lN=e=>(t,n,o={})=>{const r=t.getBody(),s={bubbles:!0,composed:!0,data:null,isComposing:!1,detail:0,view:null,target:r,currentTarget:r,eventPhase:Event.AT_TARGET,originalTarget:r,explicitOriginalTarget:r,isTrusted:!1,srcElement:r,cancelable:!1,preventDefault:_,inputType:n},a=Ea(new InputEvent(e));return t.dispatch(e,{...a,...s,...o})},dN=lN("input"),cN=lN("beforeinput"),uN=xt(),mN=uN.os,fN=mN.isMacOS()||mN.isiOS(),gN=uN.browser.isFirefox(),pN=(e,t)=>{const n=e.dom,o=e.schema.getMoveCaretBeforeOnEnterElements();if(!t)return;if(/^(LI|DT|DD)$/.test(t.nodeName)){const e=(e=>{for(;e;){if(qo(e)||er(e)&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}return null})(t.firstChild);e&&/^(UL|OL|DL)$/.test(e.nodeName)&&t.insertBefore(n.doc.createTextNode(br),t.firstChild)}const r=n.createRng();if(t.normalize(),t.hasChildNodes()){const e=new jo(t,t);let n,s=t;for(;n=e.current();){if(er(n)){r.setStart(n,0),r.setEnd(n,0);break}if(o[n.nodeName.toLowerCase()]){r.setStartBefore(n),r.setEndBefore(n);break}s=n,n=e.next()}n||(r.setStart(s,0),r.setEnd(s,0))}else ar(t)?t.nextSibling&&n.isBlock(t.nextSibling)?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)):(r.setStart(t,0),r.setEnd(t,0));e.selection.setRng(r),sg(e,r)},hN=(e,t)=>{const n=e.getRoot();let o,r=t;for(;r!==n&&r&&"false"!==e.getContentEditable(r);){if("true"===e.getContentEditable(r)){o=r;break}r=r.parentNode}return r!==n?o:n},bN=e=>I.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock)),vN=e=>{e.innerHTML='<br data-mce-bogus="1">'},yN=(e,t)=>{Il(e).toLowerCase()===t.tagName.toLowerCase()&&((e,t,n)=>{const o=e.dom;I.from(n.style).map(o.parseStyle).each((e=>{const n={...fo(yn(t)),...e};o.setStyles(t,n)}));const r=I.from(n.class).map((e=>e.split(/\s+/))),s=I.from(t.className).map((e=>Y(e.split(/\s+/),(e=>""!==e))));Mt(r,s,((e,n)=>{const r=Y(n,(t=>!H(e,t))),s=[...e,...r];o.setAttrib(t,"class",s.join(" "))}));const a=["style","class"],i=ye(n,((e,t)=>!H(a,t)));o.setAttribs(t,i)})(e,t,Fl(e))},CN=(e,t,n,o,r=!0,s,a)=>{const i=e.dom,l=e.schema,d=Il(e),c=n?n.nodeName.toUpperCase():"";let u=t;const m=l.getTextInlineElements();let f;f=s||"TABLE"===c||"HR"===c?i.create(s||d,a||{}):n.cloneNode(!1);let g=f;if(r){do{if(m[u.nodeName]){if(Du(u)||Ku(u))continue;const e=u.cloneNode(!1);i.setAttrib(e,"id",""),f.hasChildNodes()?(e.appendChild(f.firstChild),f.appendChild(e)):(g=e,f.appendChild(e))}}while((u=u.parentNode)&&u!==o)}else i.setAttrib(f,"style",null),i.setAttrib(f,"class",null);return yN(e,f),vN(g),f},wN=(e,t)=>{const n=null==e?void 0:e.parentNode;return C(n)&&n.nodeName===t},xN=e=>C(e)&&/^(OL|UL|LI)$/.test(e.nodeName),EN=e=>C(e)&&/^(LI|DT|DD)$/.test(e.nodeName),_N=e=>{const t=e.parentNode;return EN(t)?t:e},kN=(e,t,n)=>{let o=e[n?"firstChild":"lastChild"];for(;o&&!qo(o);)o=o[n?"nextSibling":"previousSibling"];return o===t},SN=e=>X(Ce(fo(yn(e)),((e,t)=>`${t}: ${e};`)),((e,t)=>e+t),""),NN=(e,t)=>t&&"A"===t.nodeName&&e.isEmpty(t),RN=(e,t)=>e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t,AN=(e,t)=>C(t)&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&e.isEditable(t.parentNode)&&"false"!==e.getContentEditable(t),TN=(e,t,n)=>er(t)?e?1===n&&t.data.charAt(n-1)===Br?0:n:n===t.data.length-1&&t.data.charAt(n)===Br?t.data.length:n:n,ON={insert:(e,t)=>{let n,o,r,s,a=!1;const i=e.dom,l=e.schema.getNonEmptyElements(),d=e.selection.getRng(),c=Il(e),u=yn(d.startContainer),f=In(u,d.startOffset),g=f.exists((e=>Vt(e)&&!oo(e))),p=d.collapsed&&g,b=(t,o)=>CN(e,n,k,_,Hl(e),t,o),v=e=>{const t=TN(e,n,o);if(er(n)&&(e?t>0:t<n.data.length))return!1;if(n.parentNode===k&&a&&!e)return!0;if(e&&qo(n)&&n===k.firstChild)return!0;if(RN(n,"TABLE")||RN(n,"HR"))return a&&!e||!a&&e;const r=new jo(n,k);let s;for(er(n)&&(e&&0===t?r.prev():e||t!==n.data.length||r.next());s=r.current();){if(qo(s)){if(!s.getAttribute("data-mce-bogus")){const e=s.nodeName.toLowerCase();if(l[e]&&"br"!==e)return!1}}else if(er(s)&&!ss(s.data))return!1;e?r.prev():r.next()}return!0},w=()=>{let t;return t=/^(H[1-6]|PRE|FIGURE)$/.test(r)&&"HGROUP"!==S?b(c):b(),((e,t)=>{const n=$l(e);return!y(t)&&(m(n)?H(Pt.explode(n),t.nodeName.toLowerCase()):n)})(e,s)&&AN(i,s)&&i.isEmpty(k,void 0,{includeZwsp:!0})?t=i.split(s,k):i.insertAfter(t,k),pN(e,t),t};Mf(i,d).each((e=>{d.setStart(e.startContainer,e.startOffset),d.setEnd(e.endContainer,e.endOffset)})),n=d.startContainer,o=d.startOffset;const x=!(!t||!t.shiftKey),E=!(!t||!t.ctrlKey);qo(n)&&n.hasChildNodes()&&!p&&(a=o>n.childNodes.length-1,n=n.childNodes[Math.min(o,n.childNodes.length-1)]||n,o=a&&er(n)?n.data.length:0);const _=hN(i,n);if(!_||((e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return null!==n&&"false"===e.dom.getContentEditableParent(n)})(e,n))return;x||(n=((e,t,n,o,r)=>{var s,a;const i=e.dom,l=null!==(s=hN(i,o))&&void 0!==s?s:i.getRoot();let d=i.getParent(o,i.isBlock);if(!d||!AN(i,d)){if(d=d||l,!d.hasChildNodes()){const o=i.create(t);return yN(e,o),d.appendChild(o),n.setStart(o,0),n.setEnd(o,0),o}let s,c=o;for(;c&&c.parentNode!==d;)c=c.parentNode;for(;c&&!i.isBlock(c);)s=c,c=c.previousSibling;const u=null===(a=null==s?void 0:s.parentElement)||void 0===a?void 0:a.nodeName;if(s&&u&&e.schema.isValidChild(u,t.toLowerCase())){const a=s.parentNode,l=i.create(t);for(yN(e,l),a.insertBefore(l,s),c=s;c&&!i.isBlock(c);){const e=c.nextSibling;l.appendChild(c),c=e}n.setStart(o,r),n.setEnd(o,r)}}return o})(e,c,d,n,o));let k=i.getParent(n,i.isBlock)||i.getRoot();s=C(null==k?void 0:k.parentNode)?i.getParent(k.parentNode,i.isBlock):null,r=k?k.nodeName.toUpperCase():"";const S=s?s.nodeName.toUpperCase():"";if("LI"!==S||E||(k=s,s=s.parentNode,r=S),qo(s)&&((e,t,n)=>!t&&n.nodeName.toLowerCase()===Il(e)&&e.dom.isEmpty(n)&&((t,n,o)=>{let r=n;for(;r&&r!==t&&h(r.nextSibling);){const t=r.parentElement;if(!t||(s=t,!Ee(e.schema.getTextBlockElements(),s.nodeName.toLowerCase())))return gr(t);r=t}var s;return!1})(e.getBody(),n))(e,x,k))return((e,t,n)=>{var o,r,s;const a=t(Il(e)),i=((e,t)=>e.dom.getParent(t,gr))(e,n);i&&(e.dom.insertAfter(a,i),pN(e,a),(null!==(s=null===(r=null===(o=n.parentElement)||void 0===o?void 0:o.childNodes)||void 0===r?void 0:r.length)&&void 0!==s?s:0)>1&&e.dom.remove(n))})(e,b,k);if(/^(LI|DT|DD)$/.test(r)&&qo(s)&&i.isEmpty(k))return void((e,t,n,o,r)=>{const s=e.dom,a=e.selection.getRng(),i=n.parentNode;if(n===e.getBody()||!i)return;var l;xN(l=n)&&xN(l.parentNode)&&(r="LI");const d=EN(o)?SN(o):void 0;let c=EN(o)&&d?t(r,{style:SN(o)}):t(r);if(kN(n,o,!0)&&kN(n,o,!1))if(wN(n,"LI")){const e=_N(n);s.insertAfter(c,e),(e=>{var t;return(null===(t=e.parentNode)||void 0===t?void 0:t.firstChild)===e})(n)?s.remove(e):s.remove(n)}else s.replace(c,n);else if(kN(n,o,!0))wN(n,"LI")?(s.insertAfter(c,_N(n)),c.appendChild(s.doc.createTextNode(" ")),c.appendChild(n)):i.insertBefore(c,n),s.remove(o);else if(kN(n,o,!1))s.insertAfter(c,_N(n)),s.remove(o);else{n=_N(n);const e=a.cloneRange();e.setStartAfter(o),e.setEndAfter(n);const t=e.extractContents();if("LI"===r&&((e,t)=>e.firstChild&&"LI"===e.firstChild.nodeName)(t)){const e=Y(q(c.children,yn),O(Xt("br")));c=t.firstChild,s.insertAfter(t,n),V(e,(e=>bo(yn(c),e))),d&&c.setAttribute("style",d)}else s.insertAfter(t,n),s.insertAfter(c,n);s.remove(o)}pN(e,c)})(e,b,s,k,c);if(!(p||k!==e.getBody()&&AN(i,k)))return;const N=k.parentNode;let R;if(p)R=b(c),f.fold((()=>{vo(u,yn(R))}),(e=>{po(e,yn(R))})),e.selection.setCursorLocation(R,0);else if(Ir(k))R=Vr(k),i.isEmpty(k)&&vN(k),yN(e,R),pN(e,R);else if(v(!1))R=w();else if(v(!0)&&N){R=N.insertBefore(b(),k);const t=yn(d.startContainer).dom.hasChildNodes()&&d.collapsed;pN(e,RN(k,"HR")||t?R:k)}else{const t=(e=>{const t=e.cloneRange();return t.setStart(e.startContainer,TN(!0,e.startContainer,e.startOffset)),t.setEnd(e.endContainer,TN(!1,e.endContainer,e.endOffset)),t})(d).cloneRange();t.setEndAfter(k);const n=t.extractContents();(e=>{V(Fo(yn(e),Kt),(e=>{const t=e.dom;t.nodeValue=Dr(t.data)}))})(n),(e=>{let t=e;do{er(t)&&(t.data=t.data.replace(/^[\r\n]+/,"")),t=t.firstChild}while(t)})(n),R=n.firstChild,i.insertAfter(n,k),((e,t,n)=>{var o;const r=[];if(!n)return;let s=n;for(;s=s.firstChild;){if(e.isBlock(s))return;qo(s)&&!t[s.nodeName.toLowerCase()]&&r.push(s)}let a=r.length;for(;a--;)s=r[a],(!s.hasChildNodes()||s.firstChild===s.lastChild&&""===(null===(o=s.firstChild)||void 0===o?void 0:o.nodeValue)||NN(e,s))&&e.remove(s)})(i,l,R),((e,t)=>{t.normalize();const n=t.lastChild;(!n||qo(n)&&/^(left|right)$/gi.test(e.getStyle(n,"float",!0)))&&e.add(t,"br")})(i,k),i.isEmpty(k)&&vN(k),R.normalize(),i.isEmpty(R)?(i.remove(R),w()):(yN(e,R),pN(e,R))}i.setAttrib(R,"id",""),e.dispatch("NewBlock",{newBlock:R})},fakeEventName:"insertParagraph"},BN=(e,t,n)=>{const o=e.dom.createRng();n?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),e.selection.setRng(o),sg(e,o)},PN=(e,t)=>{const n=bn("br");po(yn(t),n),e.undoManager.add()},DN=(e,t)=>{LN(e.getBody(),t)||ho(yn(t),bn("br"));const n=bn("br");ho(yn(t),n),BN(e,n.dom,!1),e.undoManager.add()},LN=(e,t)=>{return n=Vi.after(t),!!ar(n.getNode())||Au(e,Vi.after(t)).map((e=>ar(e.getNode()))).getOr(!1);var n},MN=e=>e&&"A"===e.nodeName&&"href"in e,IN=e=>e.fold(L,MN,MN,L),FN=(e,t)=>{t.fold(_,T(PN,e),T(DN,e),_)},UN={insert:(e,t)=>{const n=(e=>{const t=T(Ch,e),n=Vi.fromRangeStart(e.selection.getRng());return iE(t,e.getBody(),n).filter(IN)})(e);n.isSome()?n.each(T(FN,e)):((e,t)=>{const n=e.selection,o=e.dom,r=n.getRng();let s,a=!1;Mf(o,r).each((e=>{r.setStart(e.startContainer,e.startOffset),r.setEnd(e.endContainer,e.endOffset)}));let i=r.startOffset,l=r.startContainer;if(qo(l)&&l.hasChildNodes()){const e=i>l.childNodes.length-1;l=l.childNodes[Math.min(i,l.childNodes.length-1)]||l,i=e&&er(l)?l.data.length:0}let d=o.getParent(l,o.isBlock);const c=d&&d.parentNode?o.getParent(d.parentNode,o.isBlock):null,u=c?c.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==u||m||(d=c),er(l)&&i>=l.data.length&&(((e,t,n)=>{const o=new jo(t,n);let r;const s=e.getNonEmptyElements();for(;r=o.next();)if(s[r.nodeName.toLowerCase()]||er(r)&&r.length>0)return!0;return!1})(e.schema,l,d||o.getRoot())||(s=o.create("br"),r.insertNode(s),r.setStartAfter(s),r.setEndAfter(s),a=!0)),s=o.create("br"),Ki(o,r,s),BN(e,s,a),e.undoManager.add()})(e,t)},fakeEventName:"insertLineBreak"},zN=(e,t)=>bN(e).filter((e=>t.length>0&&xn(yn(e),t))).isSome(),jN=hl([{br:[]},{block:[]},{none:[]}]),HN=(e,t)=>(e=>zN(e,jl(e)))(e),$N=e=>(t,n)=>(e=>bN(e).filter((e=>Sr(yn(e)))).isSome())(t)===e,qN=(e,t)=>(n,o)=>{const r=(e=>bN(e).fold(N(""),(e=>e.nodeName.toUpperCase())))(n)===e.toUpperCase();return r===t},VN=e=>{const t=hN(e.dom,e.selection.getStart());return y(t)},WN=e=>qN("pre",e),KN=e=>(t,n)=>Ml(t)===e,YN=(e,t)=>(e=>zN(e,zl(e)))(e),GN=(e,t)=>t,XN=e=>{const t=Il(e),n=hN(e.dom,e.selection.getStart());return C(n)&&e.schema.isValidChild(n.nodeName,t)},QN=e=>{const t=e.selection.getRng(),n=yn(t.startContainer),o=In(n,t.startOffset).map((e=>Vt(e)&&!oo(e)));return t.collapsed&&o.getOr(!0)},JN=(e,t)=>(n,o)=>X(e,((e,t)=>e&&t(n,o)),!0)?I.some(t):I.none(),ZN=(e,t,n)=>{t.selection.isCollapsed()||(e=>{e.execCommand("delete")})(t),C(n)&&cN(t,e.fakeEventName).isDefaultPrevented()||(e.insert(t,n),C(n)&&dN(t,e.fakeEventName))},eR=(e,t)=>{const n=()=>ZN(UN,e,t),o=()=>ZN(ON,e,t),r=((e,t)=>Qx([JN([HN],jN.none()),JN([WN(!0),VN],jN.none()),JN([qN("summary",!0)],jN.br()),JN([WN(!0),KN(!1),GN],jN.br()),JN([WN(!0),KN(!1)],jN.block()),JN([WN(!0),KN(!0),GN],jN.block()),JN([WN(!0),KN(!0)],jN.br()),JN([$N(!0),GN],jN.br()),JN([$N(!0)],jN.block()),JN([YN],jN.br()),JN([GN],jN.br()),JN([XN],jN.block()),JN([QN],jN.block())],[e,!(!t||!t.shiftKey)]).getOr(jN.none()))(e,t);switch(Ul(e)){case"linebreak":r.fold(n,n,_);break;case"block":r.fold(o,o,_);break;case"invert":r.fold(o,n,_);break;default:r.fold(n,o,_)}},tR=xt(),nR=tR.os.isiOS()&&tR.browser.isSafari(),oR=(e,t)=>{var n;t.isDefaultPrevented()||(t.preventDefault(),(n=e.undoManager).typing&&(n.typing=!1,n.add()),e.undoManager.transact((()=>{eR(e,t)})))},rR=xt(),sR=e=>e.stopImmediatePropagation(),aR=e=>e.keyCode===af.PAGE_UP||e.keyCode===af.PAGE_DOWN,iR=(e,t,n)=>{n&&!e.get()?t.on("NodeChange",sR,!0):!n&&e.get()&&t.off("NodeChange",sR),e.set(n)},lR=(e,t)=>{const n=t.container(),o=t.offset();return er(n)?(n.insertData(o,e),I.some(Vi(n,o+e.length))):iu(t).map((n=>{const o=vn(e);return t.isAtEnd()?ho(n,o):po(n,o),Vi(o.dom,e.length)}))},dR=T(lR,br),cR=T(lR," "),uR=e=>t=>{e.selection.setRng(t.toRange()),e.nodeChanged()},mR=e=>{const t=Vi.fromRangeStart(e.selection.getRng()),n=yn(e.getBody());if(e.selection.isCollapsed()){const o=T(Ch,e),r=Vi.fromRangeStart(e.selection.getRng());return iE(o,e.getBody(),r).bind((e=>t=>t.fold((t=>Tu(e.dom,Vi.before(t))),(e=>Ou(e)),(e=>Bu(e)),(t=>Au(e.dom,Vi.after(t)))))(n)).map((o=>()=>((e,t,n)=>o=>Zp(e,o,n)?dR(t):cR(t))(n,t,e.schema)(o).each(uR(e))))}return I.none()},fR=e=>{return It(At.browser.isFirefox()&&e.selection.isEditable()&&(t=e.dom,n=e.selection.getRng().startContainer,t.isEditable(t.getParent(n,"summary"))),(()=>{const t=yn(e.getBody());e.selection.isCollapsed()||e.getDoc().execCommand("Delete"),((e,t,n)=>Zp(e,t,n)?dR(t):cR(t))(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each(uR(e))}));var t,n},gR=e=>hc(e)?[{keyCode:af.TAB,action:tk(Rk,e,!0)},{keyCode:af.TAB,shiftKey:!0,action:tk(Rk,e,!1)}]:[],pR=e=>{if(e.addShortcut("Meta+P","","mcePrint"),QS(e),XC(e))return $a(null);{const t=o_(e);return(e=>{e.on("beforeinput",(t=>{e.selection.isEditable()&&!$(t.getTargetRanges(),(t=>!Og(e.dom,t)))||t.preventDefault()}))})(e),(e=>{e.on("keyup compositionstart",T($_,e))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();nk([{keyCode:af.RIGHT,action:tk(W_,e,!0)},{keyCode:af.LEFT,action:tk(W_,e,!1)},{keyCode:af.UP,action:tk(K_,e,!1)},{keyCode:af.DOWN,action:tk(K_,e,!0)},...o?[{keyCode:af.UP,action:tk(G_,e,!1),metaKey:!0,shiftKey:!0},{keyCode:af.DOWN,action:tk(G_,e,!0),metaKey:!0,shiftKey:!0}]:[],{keyCode:af.RIGHT,action:tk(Ek,e,!0)},{keyCode:af.LEFT,action:tk(Ek,e,!1)},{keyCode:af.UP,action:tk(_k,e,!1)},{keyCode:af.DOWN,action:tk(_k,e,!0)},{keyCode:af.UP,action:tk(_k,e,!1)},{keyCode:af.UP,action:tk(J_,e,!1)},{keyCode:af.DOWN,action:tk(J_,e,!0)},{keyCode:af.RIGHT,action:tk(rk,e,!0)},{keyCode:af.LEFT,action:tk(rk,e,!1)},{keyCode:af.UP,action:tk(sk,e,!1)},{keyCode:af.DOWN,action:tk(sk,e,!0)},{keyCode:af.RIGHT,action:tk(t_,e,t,!0)},{keyCode:af.LEFT,action:tk(t_,e,t,!1)},{keyCode:af.RIGHT,ctrlKey:!o,altKey:o,action:tk(r_,e,t)},{keyCode:af.LEFT,ctrlKey:!o,altKey:o,action:tk(s_,e,t)},{keyCode:af.UP,action:tk(Q_,e,!1)},{keyCode:af.DOWN,action:tk(Q_,e,!0)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{let n=!1;e.on("keydown",(o=>{n=o.keyCode===af.BACKSPACE,o.isDefaultPrevented()||((e,t,n)=>{const o=n.keyCode===af.BACKSPACE?"deleteContentBackward":"deleteContentForward",r=e.selection.isCollapsed(),s=r?"character":"selection",a=e=>r?e?"word":"line":"selection";ok([{keyCode:af.BACKSPACE,action:tk(T_,e)},{keyCode:af.BACKSPACE,action:tk(Ux,e,!1)},{keyCode:af.DELETE,action:tk(Ux,e,!0)},{keyCode:af.BACKSPACE,action:tk(Ox,e,!1)},{keyCode:af.DELETE,action:tk(Ox,e,!0)},{keyCode:af.BACKSPACE,action:tk(d_,e,t,!1)},{keyCode:af.DELETE,action:tk(d_,e,t,!0)},{keyCode:af.BACKSPACE,action:tk(ib,e,!1)},{keyCode:af.DELETE,action:tk(ib,e,!0)},{keyCode:af.BACKSPACE,action:tk(iN,e,!1,s)},{keyCode:af.DELETE,action:tk(iN,e,!0,s)},...fN?[{keyCode:af.BACKSPACE,altKey:!0,action:tk(iN,e,!1,a(!0))},{keyCode:af.DELETE,altKey:!0,action:tk(iN,e,!0,a(!0))},{keyCode:af.BACKSPACE,metaKey:!0,action:tk(iN,e,!1,a(!1))}]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:tk(iN,e,!1,a(!0))},{keyCode:af.DELETE,ctrlKey:!0,action:tk(iN,e,!0,a(!0))}],{keyCode:af.BACKSPACE,action:tk(zx,e,!1)},{keyCode:af.DELETE,action:tk(zx,e,!0)},{keyCode:af.BACKSPACE,action:tk(x_,e,!1)},{keyCode:af.DELETE,action:tk(x_,e,!0)},{keyCode:af.BACKSPACE,action:tk(_x,e,!1)},{keyCode:af.DELETE,action:tk(_x,e,!0)},{keyCode:af.BACKSPACE,action:tk(wx,e,!1)},{keyCode:af.DELETE,action:tk(wx,e,!0)},{keyCode:af.BACKSPACE,action:tk(v_,e,!1)},{keyCode:af.DELETE,action:tk(v_,e,!0)}],n).filter((t=>e.selection.isEditable())).each((t=>{n.preventDefault(),cN(e,o).isDefaultPrevented()||(t(),dN(e,o))}))})(e,t,o)})),e.on("keyup",(t=>{t.isDefaultPrevented()||((e,t,n)=>{nk([{keyCode:af.BACKSPACE,action:tk(Fx,e)},{keyCode:af.DELETE,action:tk(Fx,e)},...fN?[{keyCode:af.BACKSPACE,altKey:!0,action:tk(C_,e)},{keyCode:af.DELETE,altKey:!0,action:tk(C_,e)},...n?[{keyCode:gN?224:91,action:tk(C_,e)}]:[]]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:tk(C_,e)},{keyCode:af.DELETE,ctrlKey:!0,action:tk(C_,e)}]],t)})(e,t,n),n=!1}))})(e,t),(e=>{let t=I.none();e.on("keydown",(n=>{n.keyCode===af.ENTER&&(nR&&(e=>{if(!e.collapsed)return!1;const t=e.startContainer;if(er(t)){const n=/^[\uAC00-\uD7AF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uD7B0-\uD7FF]$/,o=t.data.charAt(e.startOffset-1);return n.test(o)}return!1})(e.selection.getRng())?(e=>{t=I.some(e.selection.getBookmark()),e.undoManager.add()})(e):oR(e,n))})),e.on("keyup",(n=>{n.keyCode===af.ENTER&&t.each((()=>((e,n)=>{e.undoManager.undo(),t.fold(_,(t=>e.selection.moveToBookmark(t))),oR(e,n),t=I.none()})(e,n)))}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{ok([{keyCode:af.SPACEBAR,action:tk(mR,e)},{keyCode:af.SPACEBAR,action:tk(fR,e)}],t).each((n=>{t.preventDefault(),cN(e,"insertText",{data:" "}).isDefaultPrevented()||(n(),dN(e,"insertText",{data:" "}))}))})(e,t)}))})(e),(e=>{e.on("input",(t=>{t.isComposing||(e=>{const t=yn(e.getBody());e.selection.isCollapsed()&&ih(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each((t=>{e.selection.setRng(t.toRange())}))})(e)}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{nk([...gR(e)],t).each((e=>{t.preventDefault()}))})(e,t)}))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();nk([{keyCode:af.END,action:tk(Y_,e,!0)},{keyCode:af.HOME,action:tk(Y_,e,!1)},...o?[]:[{keyCode:af.HOME,action:tk(G_,e,!1),ctrlKey:!0,shiftKey:!0},{keyCode:af.END,action:tk(G_,e,!0),ctrlKey:!0,shiftKey:!0}],{keyCode:af.END,action:tk(ak,e,!0)},{keyCode:af.HOME,action:tk(ak,e,!1)},{keyCode:af.END,action:tk(a_,e,!0,t)},{keyCode:af.HOME,action:tk(a_,e,!1,t)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{if(rR.os.isMacOS())return;const n=$a(!1);e.on("keydown",(t=>{aR(t)&&iR(n,e,!0)})),e.on("keyup",(o=>{o.isDefaultPrevented()||((e,t,n)=>{nk([{keyCode:af.PAGE_UP,action:tk(a_,e,!1,t)},{keyCode:af.PAGE_DOWN,action:tk(a_,e,!0,t)}],n)})(e,t,o),aR(o)&&n.get()&&(iR(n,e,!1),e.nodeChanged())}))})(e,t),t}};class hR{constructor(e){let t;this.lastPath=[],this.editor=e;const n=this;"onselectionchange"in e.getDoc()||e.on("NodeChange click mouseup keyup focus",(n=>{const o=e.selection.getRng(),r={startContainer:o.startContainer,startOffset:o.startOffset,endContainer:o.endContainer,endOffset:o.endOffset};"nodechange"!==n.type&&Af(r,t)||e.dispatch("SelectionChange"),t=r})),e.on("contextmenu",(()=>{e.dispatch("SelectionChange")})),e.on("SelectionChange",(()=>{const t=e.selection.getStart(!0);t&&am(e)&&!n.isSameElementPath(t)&&e.dom.isChildOf(t,e.getBody())&&e.nodeChanged({selectionChange:!0})})),e.on("mouseup",(t=>{!t.isDefaultPrevented()&&am(e)&&("IMG"===e.selection.getNode().nodeName?vg.setEditorTimeout(e,(()=>{e.nodeChanged()})):e.nodeChanged())}))}nodeChanged(e={}){const t=this.editor.selection;let n;if(this.editor.initialized&&t&&!Od(this.editor)&&!this.editor.mode.isReadOnly()){const o=this.editor.getBody();n=t.getStart(!0)||o,n.ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(n,o)||(n=o);const r=[];this.editor.dom.getParent(n,(e=>e===o||(r.push(e),!1))),this.editor.dispatch("NodeChange",{...e,element:n,parents:r})}}isSameElementPath(e){let t;const n=this.editor,o=oe(n.dom.getParents(e,M,n.getBody()));if(o.length===this.lastPath.length){for(t=o.length;t>=0&&o[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=o,!0}return this.lastPath=o,!1}}const bR=ui("image"),vR=ui("event"),yR=e=>t=>{t[vR]=e},CR=yR(0),wR=yR(2),xR=yR(1),ER=(0,e=>{const t=e;return I.from(t[vR]).exists((e=>0===e))});const _R=ui("mode"),kR=e=>t=>{t[_R]=e},SR=(e,t)=>kR(t)(e),NR=kR(0),RR=kR(2),AR=kR(1),TR=e=>t=>{const n=t;return I.from(n[_R]).exists((t=>t===e))},OR=TR(0),BR=TR(1),PR=["none","copy","link","move"],DR=["none","copy","copyLink","copyMove","link","linkMove","move","all","uninitialized"],LR=()=>{const e=new window.DataTransfer;let t="move",n="all";const o={get dropEffect(){return t},set dropEffect(e){H(PR,e)&&(t=e)},get effectAllowed(){return n},set effectAllowed(e){ER(o)&&H(DR,e)&&(n=e)},get items(){return((e,t)=>({...t,get length(){return t.length},add:(n,o)=>{if(OR(e)){if(!m(n))return t.add(n);if(!v(o))return t.add(n,o)}return null},remove:n=>{OR(e)&&t.remove(n)},clear:()=>{OR(e)&&t.clear()}}))(o,e.items)},get files(){return BR(o)?Object.freeze({length:0,item:e=>null}):e.files},get types(){return e.types},setDragImage:(t,n,r)=>{var s;OR(o)&&(s={image:t,x:n,y:r},o[bR]=s,e.setDragImage(t,n,r))},getData:t=>BR(o)?"":e.getData(t),setData:(t,n)=>{OR(o)&&e.setData(t,n)},clearData:t=>{OR(o)&&e.clearData(t)}};return NR(o),o},MR=(e,t)=>e.setData("text/html",t),IR="x-tinymce/html",FR=N(IR),UR="\x3c!-- "+IR+" --\x3e",zR=e=>UR+e,jR=e=>-1!==e.indexOf(UR),HR="%MCEPASTEBIN%",$R=e=>e.dom.get("mcepastebin"),qR=e=>C(e)&&"mcepastebin"===e.id,VR=e=>e===HR,WR=(e,t)=>(Pt.each(t,(t=>{e=u(t,RegExp)?e.replace(t,""):e.replace(t[0],t[1])})),e),KR=e=>WR(e,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,(e,t,n)=>t||n?br:" "],/<br class="Apple-interchange-newline">/g,/<br>$/i]),YR=(e,t)=>({content:e,cancelled:t}),GR=(e,t)=>(e.insertContent(t,{merge:tc(e),paste:!0}),!0),XR=e=>/^https?:\/\/[\w\-\/+=.,!;:&%@^~(){}?#]+$/i.test(e),QR=(e,t,n)=>!(e.selection.isCollapsed()||!XR(t))&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.execCommand("mceInsertLink",!1,t)})),!0))(e,t,n),JR=(e,t,n)=>!!((e,t)=>XR(t)&&$(pc(e),(e=>$e(t.toLowerCase(),`.${e.toLowerCase()}`))))(e,t)&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.insertContent('<img src="'+t+'">')})),!0))(e,t,n),ZR=(e=>{let t=0;return()=>"mceclip"+t++})(),eA=e=>{const t=LR();return MR(t,e),RR(t),t},tA=(e,t,n,o,r)=>{const s=((e,t,n)=>((e,t,n)=>{const o=((e,t,n)=>e.dispatch("PastePreProcess",{content:t,internal:n}))(e,t,n),r=((e,t)=>{const n=bC({sanitize:fc(e),sandbox_iframes:Cc(e)},e.schema);n.addNodeFilter("meta",(e=>{Pt.each(e,(e=>{e.remove()}))}));const o=n.parse(t,{forced_root_block:!1,isRootContent:!0});return up({validate:!0},e.schema).serialize(o)})(e,o.content);return e.hasEventListeners("PastePostProcess")&&!o.isDefaultPrevented()?((e,t,n)=>{const o=e.dom.create("div",{style:"display:none"},t),r=((e,t,n)=>e.dispatch("PastePostProcess",{node:t,internal:n}))(e,o,n);return YR(r.node.innerHTML,r.isDefaultPrevented())})(e,r,n):YR(r,o.isDefaultPrevented())})(e,t,n))(e,t,n);if(!s.cancelled){const t=s.content,n=()=>((e,t,n)=>{n||!nc(e)?GR(e,t):((e,t)=>{Pt.each([QR,JR,GR],(n=>!n(e,t,GR)))})(e,t)})(e,t,o);r?cN(e,"insertFromPaste",{dataTransfer:eA(t)}).isDefaultPrevented()||(n(),dN(e,"insertFromPaste")):n()}},nA=(e,t,n,o)=>{const r=n||jR(t);tA(e,(e=>e.replace(UR,""))(t),r,!1,o)},oA=(e,t,n)=>{const o=e.dom.encode(t).replace(/\r\n/g,"\n"),r=((e,t,n)=>{const o=e.split(/\n\n/),r=((e,t)=>{let n="<"+e;const o=Ce(t,((e,t)=>t+'="'+ea.encodeAllRaw(e)+'"'));return o.length&&(n+=" "+o.join(" ")),n+">"})(t,n),s="</"+t+">",a=q(o,(e=>e.split(/\n/).join("<br />")));return 1===a.length?a[0]:q(a,(e=>r+e+s)).join("")})(ls(o,rc(e)),Il(e),Fl(e));tA(e,r,!1,!0,n)},rA=e=>{const t={};if(e&&e.types)for(let n=0;n<e.types.length;n++){const o=e.types[n];try{t[o]=e.getData(o)}catch(e){t[o]=""}}return t},sA=(e,t)=>t in e&&e[t].length>0,aA=e=>sA(e,"text/html")||sA(e,"text/plain"),iA=(e,t,n)=>{const o="paste"===t.type?t.clipboardData:t.dataTransfer;var r;if(Gd(e)&&o){const s=((e,t)=>{const n=t.items?te(ce(t.items),(e=>"file"===e.kind?[e.getAsFile()]:[])):[],o=t.files?ce(t.files):[];return Y(n.length>0?n:o,(e=>{const t=pc(e);return e=>He(e.type,"image/")&&$(t,(t=>(e=>{const t=e.toLowerCase(),n={jpg:"jpeg",jpe:"jpeg",jfi:"jpeg",jif:"jpeg",jfif:"jpeg",pjpeg:"jpeg",pjp:"jpeg",svg:"svg+xml"};return Pt.hasOwn(n,t)?"image/"+n[t]:"image/"+t})(t)===e.type))})(e))})(e,o);if(s.length>0)return t.preventDefault(),(r=s,Promise.all(q(r,(e=>Gv(e).then((t=>({file:e,uri:t}))))))).then((t=>{n&&e.selection.setRng(n),V(t,(t=>{((e,t)=>{Kv(t.uri).each((({data:n,type:o,base64Encoded:r})=>{const s=r?n:btoa(n),a=t.file,i=e.editorUpload.blobCache,l=i.getByData(s,o),d=null!=l?l:((e,t,n,o)=>{const r=ZR(),s=Vl(e)&&C(n.name),a=s?((e,t)=>{const n=t.match(/([\s\S]+?)(?:\.[a-z0-9.]+)$/i);return C(n)?e.dom.encode(n[1]):void 0})(e,n.name):r,i=s?n.name:void 0,l=t.create(r,n,o,a,i);return t.add(l),l})(e,i,a,s);nA(e,`<img src="${d.blobUri()}">`,!1,!0)}))})(e,t)}))})),!0}return!1},lA=(e,t,n,o,r)=>{let s=KR(n);const a=sA(t,FR())||jR(n),i=!a&&(e=>!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(e))(s),l=XR(s);(VR(s)||!s.length||i&&!l)&&(o=!0),(o||l)&&(s=sA(t,"text/plain")&&i?t["text/plain"]:(e=>{const t=ua(),n=bC({},t);let o="";const r=t.getVoidElements(),s=Pt.makeMap("script noscript style textarea video audio iframe object"," "),a=t.getBlockElements(),i=e=>{const n=e.name,l=e;if("br"!==n){if("wbr"!==n)if(r[n]&&(o+=" "),s[n])o+=" ";else{if(3===e.type&&(o+=e.value),!(e.name in t.getVoidElements())){let t=e.firstChild;if(t)do{i(t)}while(t=t.next)}a[n]&&l.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"};return e=WR(e,[/<!\[[^\]]+\]>/g]),i(n.parse(e)),o})(s)),VR(s)||(o?oA(e,s,r):nA(e,s,a,r))},dA=(e,t,n)=>{((e,t,n)=>{let o;e.on("keydown",(e=>{(e=>af.metaKeyPressed(e)&&86===e.keyCode||e.shiftKey&&45===e.keyCode)(e)&&!e.isDefaultPrevented()&&(o=e.shiftKey&&86===e.keyCode)})),e.on("paste",(r=>{if(r.isDefaultPrevented()||(e=>{var t,n;return At.os.isAndroid()&&0===(null===(n=null===(t=e.clipboardData)||void 0===t?void 0:t.items)||void 0===n?void 0:n.length)})(r))return;const s="text"===n.get()||o;o=!1;const a=rA(r.clipboardData);!aA(a)&&iA(e,r,t.getLastRng()||e.selection.getRng())||(sA(a,"text/html")?(r.preventDefault(),lA(e,a,a["text/html"],s,!0)):sA(a,"text/plain")&&sA(a,"text/uri-list")?(r.preventDefault(),lA(e,a,a["text/plain"],s,!0)):(t.create(),vg.setEditorTimeout(e,(()=>{const n=t.getHtml();t.remove(),lA(e,a,n,s,!1)}),0)))}))})(e,t,n),(e=>{const t=e=>He(e,"webkit-fake-url"),n=e=>He(e,"data:");e.parser.addNodeFilter("img",((o,r,s)=>{if(!Gd(e)&&(e=>{var t;return!0===(null===(t=e.data)||void 0===t?void 0:t.paste)})(s))for(const r of o){const o=r.attr("src");m(o)&&!r.attr("data-mce-object")&&o!==At.transparentSrc&&(t(o)||!sc(e)&&n(o))&&r.remove()}}))})(e)},cA=(e,t,n,o)=>{((e,t,n)=>{if(!e)return!1;try{return e.clearData(),e.setData("text/html",t),e.setData("text/plain",n),e.setData(FR(),t),!0}catch(e){return!1}})(e.clipboardData,t.html,t.text)?(e.preventDefault(),o()):n(t.html,o)},uA=e=>(t,n)=>{const{dom:o,selection:r}=e,s=o.create("div",{contenteditable:"false","data-mce-bogus":"all"}),a=o.create("div",{contenteditable:"true"},t);o.setStyles(s,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),s.appendChild(a),o.add(e.getBody(),s);const i=r.getRng();a.focus();const l=o.createRng();l.selectNodeContents(a),r.setRng(l),vg.setEditorTimeout(e,(()=>{r.setRng(i),o.remove(s),n()}),0)},mA=e=>({html:zR(e.selection.getContent({contextual:!0})),text:e.selection.getContent({format:"text"})}),fA=e=>!e.selection.isCollapsed()||(e=>!!e.dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody()))(e),gA=(e,t)=>{var n,o;return Uf.getCaretRangeFromPoint(null!==(n=t.clientX)&&void 0!==n?n:0,null!==(o=t.clientY)&&void 0!==o?o:0,e.getDoc())},pA=(e,t)=>{e.focus(),t&&e.selection.setRng(t)},hA=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,bA=e=>Pt.trim(e).replace(hA,Ca).toLowerCase(),vA=(e,t,n)=>{const o=Zd(e);if(n||"all"===o||!ec(e))return t;const r=o?o.split(/[, ]/):[];if(r&&"none"!==o){const n=e.dom,o=e.selection.getNode();t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,((e,t,s,a)=>{const i=n.parseStyle(n.decode(s)),l={};for(let e=0;e<r.length;e++){const t=i[r[e]];let s=t,a=n.getStyle(o,r[e],!0);/color/.test(r[e])&&(s=bA(s),a=bA(a)),a!==s&&(l[r[e]]=t)}const d=n.serializeStyle(l,"span");return d?t+' style="'+d+'"'+a:t+a}))}else t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return t=t.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,((e,t,n,o)=>t+' style="'+n+'"'+o)),t},yA=e=>{const t=$a(!1),n=$a(oc(e)?"text":"html"),o=(e=>{const t=$a(null);return{create:()=>((e,t)=>{const{dom:n,selection:o}=e,r=e.getBody();t.set(o.getRng());const s=n.add(e.getBody(),"div",{id:"mcepastebin",class:"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},HR);At.browser.isFirefox()&&n.setStyle(s,"left","rtl"===n.getStyle(r,"direction",!0)?65535:-65535),n.bind(s,"beforedeactivate focusin focusout",(e=>{e.stopPropagation()})),s.focus(),o.select(s,!0)})(e,t),remove:()=>((e,t)=>{const n=e.dom;if($R(e)){let o;const r=t.get();for(;o=$R(e);)n.remove(o),n.unbind(o);r&&e.selection.setRng(r)}t.set(null)})(e,t),getEl:()=>$R(e),getHtml:()=>(e=>{const t=e.dom,n=(e,n)=>{e.appendChild(n),t.remove(n,!0)},[o,...r]=Y(e.getBody().childNodes,qR);V(r,(e=>{n(o,e)}));const s=t.select("div[id=mcepastebin]",o);for(let e=s.length-1;e>=0;e--){const r=t.create("div");o.insertBefore(r,s[e]),n(r,s[e])}return o?o.innerHTML:""})(e),getLastRng:t.get}})(e);(e=>{(At.browser.isChromium()||At.browser.isSafari())&&((e,t)=>{e.on("PastePreProcess",(n=>{n.content=t(e,n.content,n.internal)}))})(e,vA)})(e),((e,t)=>{e.addCommand("mceTogglePlainTextPaste",(()=>{((e,t)=>{"text"===t.get()?(t.set("html"),sf(e,!1)):(t.set("text"),sf(e,!0)),e.focus()})(e,t)})),e.addCommand("mceInsertClipboardContent",((t,n)=>{n.html&&nA(e,n.html,n.internal,!1),n.text&&oA(e,n.text,!1)}))})(e,n),(e=>{const t=t=>n=>{t(e,n)},n=Xd(e);w(n)&&e.on("PastePreProcess",t(n));const o=Qd(e);w(o)&&e.on("PastePostProcess",t(o))})(e),e.on("PreInit",(()=>{(e=>{e.on("cut",(e=>t=>{!t.isDefaultPrevented()&&fA(e)&&e.selection.isEditable()&&cA(t,mA(e),uA(e),(()=>{if(At.browser.isChromium()||At.browser.isFirefox()){const t=e.selection.getRng();vg.setEditorTimeout(e,(()=>{e.selection.setRng(t),e.execCommand("Delete")}),0)}else e.execCommand("Delete")}))})(e)),e.on("copy",(e=>t=>{!t.isDefaultPrevented()&&fA(e)&&cA(t,mA(e),uA(e),_)})(e))})(e),((e,t)=>{Yd(e)&&e.on("dragend dragover draggesture dragdrop drop drag",(e=>{e.preventDefault(),e.stopPropagation()})),Gd(e)||e.on("drop",(e=>{const t=e.dataTransfer;t&&(e=>$(e.files,(e=>/^image\//.test(e.type))))(t)&&e.preventDefault()})),e.on("drop",(n=>{if(n.isDefaultPrevented())return;const o=gA(e,n);if(y(o))return;const r=rA(n.dataTransfer),s=sA(r,FR());if((!aA(r)||(e=>{const t=e["text/plain"];return!!t&&0===t.indexOf("file://")})(r))&&iA(e,n,o))return;const a=r[FR()],i=a||r["text/html"]||r["text/plain"],l=((e,t,n,o)=>{const r=e.getParent(n,(e=>Ts(t,e)));if(!h(e.getParent(n,"summary")))return!0;if(r&&Ee(o,"text/html")){const e=(new DOMParser).parseFromString(o["text/html"],"text/html").body;return!h(e.querySelector(r.nodeName.toLowerCase()))}return!1})(e.dom,e.schema,o.startContainer,r),d=t.get();d&&!l||i&&(n.preventDefault(),vg.setEditorTimeout(e,(()=>{e.undoManager.transact((()=>{(a||d&&l)&&e.execCommand("Delete"),pA(e,o);const t=KR(i);r["text/html"]?nA(e,t,s,!0):oA(e,t,!0)}))})))})),e.on("dragstart",(e=>{t.set(!0)})),e.on("dragover dragend",(n=>{Gd(e)&&!t.get()&&(n.preventDefault(),pA(e,gA(e,n))),"dragend"===n.type&&t.set(!1)})),(e=>{e.on("input",(t=>{const n=e=>h(e.querySelector("summary"));if("deleteByDrag"===t.inputType){const t=Y(e.dom.select("details"),n);V(t,(t=>{ar(t.firstChild)&&t.firstChild.remove();const n=e.dom.create("summary");n.appendChild(Tr().dom),t.prepend(n)}))}}))})(e)})(e,t),dA(e,o,n)}))},CA=ar,wA=er,xA=e=>dr(e.dom),EA=e=>t=>_n(yn(e),t),_A=(e,t)=>Jn(yn(e),xA,EA(t)),kA=(e,t,n)=>{const o=new jo(e,t),r=n?o.next.bind(o):o.prev.bind(o);let s=e;for(let t=n?e:r();t&&!CA(t);t=r())ts(t)&&(s=t);return s},SA=e=>{const t=((e,t,n)=>{const o=Vi.fromRangeStart(e).getNode(),r=((e,t,n)=>Jn(yn(e),(e=>(e=>lr(e.dom))(e)||n.isBlock(Ht(e))),EA(t)).getOr(yn(t)).dom)(o,t,n),s=kA(o,r,!1),a=kA(o,r,!0),i=document.createRange();return _A(s,r).fold((()=>{wA(s)?i.setStart(s,0):i.setStartBefore(s)}),(e=>i.setStartBefore(e.dom))),_A(a,r).fold((()=>{wA(a)?i.setEnd(a,a.data.length):i.setEndAfter(a)}),(e=>i.setEndAfter(e.dom))),i})(e.selection.getRng(),e.getBody(),e.schema);e.selection.setRng(Eb(t))};var NA;!function(e){e.Before="before",e.After="after"}(NA||(NA={}));const RA=(e,t)=>Math.abs(e.left-t),AA=(e,t)=>Math.abs(e.right-t),TA=(e,t)=>(e=>X(e,((e,t)=>e.fold((()=>I.some(t)),(e=>{const n=Math.min(t.left,e.left),o=Math.min(t.top,e.top),r=Math.max(t.right,e.right),s=Math.max(t.bottom,e.bottom);return I.some({top:o,right:r,bottom:s,left:n,width:r-n,height:s-o})}))),I.none()))(Y(e,(e=>{return(n=t)>=(o=e).top&&n<=o.bottom;var n,o}))).fold((()=>[[],e]),(t=>{const{pass:n,fail:o}=K(e,(e=>((e,t)=>{const n=((e,t)=>Math.max(0,Math.min(e.bottom,t.bottom)-Math.max(e.top,t.top)))(e,t)/Math.min(e.height,t.height);return((e,t)=>e.top<t.bottom&&e.bottom>t.top)(e,t)&&n>.5})(e,t)));return[n,o]})),OA=(e,t,n)=>t>e.left&&t<e.right?0:Math.min(Math.abs(e.left-t),Math.abs(e.right-t)),BA=(e,t,n,o)=>{const r=e=>ts(e.node)?I.some(e):qo(e.node)?BA(ce(e.node.childNodes),t,n,!1):I.none(),s=(e,s)=>{const a=ae(e,((e,o)=>s(e,t,n)-s(o,t,n)));return ue(a,r).map((e=>o&&!er(e.node)&&a.length>1?((e,o,s)=>r(o).filter((o=>Math.abs(s(e,t,n)-s(o,t,n))<2&&er(o.node))))(e,a[1],s).getOr(e):e))},[a,i]=TA(IE(e),n),{pass:l,fail:d}=K(i,(e=>e.top<n));return s(a,OA).orThunk((()=>s(d,Ei))).orThunk((()=>s(l,Ei)))},PA=(e,t,n)=>((e,t,n)=>{const o=yn(e),r=Nn(o),s=Cn(r,t,n).filter((e=>kn(o,e))).getOr(o);return((e,t,n,o)=>{const r=(t,s)=>{const a=Y(t.dom.childNodes,O((e=>qo(e)&&e.classList.contains("mce-drag-container"))));return s.fold((()=>BA(a,n,o,!0)),(e=>{const t=Y(a,(t=>t!==e.dom));return BA(t,n,o,!0)})).orThunk((()=>(_n(t,e)?I.none():Tn(t)).bind((e=>r(e,I.some(t))))))};return r(t,I.none())})(o,s,t,n)})(e,t,n).filter((e=>Mc(e.node))).map((e=>((e,t)=>({node:e.node,position:RA(e,t)<AA(e,t)?NA.Before:NA.After}))(e,t))),DA=e=>{var t,n;const o=e.getBoundingClientRect(),r=e.ownerDocument,s=r.documentElement,a=r.defaultView;return{top:o.top+(null!==(t=null==a?void 0:a.scrollY)&&void 0!==t?t:0)-s.clientTop,left:o.left+(null!==(n=null==a?void 0:a.scrollX)&&void 0!==n?n:0)-s.clientLeft}},LA=e=>({target:e,srcElement:e}),MA=(e,t,n,o)=>{const r=((e,t)=>{const n=(e=>{const t=LR(),n=(e=>{const t=e;return I.from(t[_R])})(e);return RR(e),CR(t),t.dropEffect=e.dropEffect,t.effectAllowed=e.effectAllowed,(e=>{const t=e;return I.from(t[bR])})(e).each((e=>t.setDragImage(e.image,e.x,e.y))),V(e.types,(n=>{"Files"!==n&&t.setData(n,e.getData(n))})),V(e.files,(e=>t.items.add(e))),(e=>{const t=e;return I.from(t[vR])})(e).each((e=>{((e,t)=>{yR(t)(e)})(t,e)})),n.each((n=>{SR(e,n),SR(t,n)})),t})(e);return"dragstart"===t?(CR(n),NR(n)):"drop"===t?(wR(n),RR(n)):(xR(n),AR(n)),n})(n,e);return v(o)?((e,t,n)=>{const o=B("Function not supported on simulated event.");return{bubbles:!0,cancelBubble:!1,cancelable:!0,composed:!1,currentTarget:null,defaultPrevented:!1,eventPhase:0,isTrusted:!0,returnValue:!1,timeStamp:0,type:e,composedPath:o,initEvent:o,preventDefault:_,stopImmediatePropagation:_,stopPropagation:_,AT_TARGET:window.Event.AT_TARGET,BUBBLING_PHASE:window.Event.BUBBLING_PHASE,CAPTURING_PHASE:window.Event.CAPTURING_PHASE,NONE:window.Event.NONE,altKey:!1,button:0,buttons:0,clientX:0,clientY:0,ctrlKey:!1,metaKey:!1,movementX:0,movementY:0,offsetX:0,offsetY:0,pageX:0,pageY:0,relatedTarget:null,screenX:0,screenY:0,shiftKey:!1,x:0,y:0,detail:0,view:null,which:0,initUIEvent:o,initMouseEvent:o,getModifierState:o,dataTransfer:n,...LA(t)}})(e,t,r):((e,t,n,o)=>({...t,dataTransfer:o,type:e,...LA(n)}))(e,o,t,r)},IA=dr,FA=((...e)=>t=>{for(let n=0;n<e.length;n++)if(e[n](t))return!0;return!1})(IA,lr),UA=(e,t,n,o)=>{const r=e.dom,s=t.cloneNode(!0);r.setStyles(s,{width:n,height:o}),r.setAttrib(s,"data-mce-selected",null);const a=r.create("div",{class:"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return r.setStyles(a,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:o}),r.setStyles(s,{margin:0,boxSizing:"border-box"}),a.appendChild(s),a},zA=(e,t)=>n=>()=>{const o="left"===e?n.scrollX:n.scrollY;n.scroll({[e]:o+t,behavior:"smooth"})},jA=zA("left",-32),HA=zA("left",32),$A=zA("top",-32),qA=zA("top",32),VA=e=>{e&&e.parentNode&&e.parentNode.removeChild(e)},WA=(e,t,n,o,r)=>{"dragstart"===t&&MR(o,e.dom.getOuterHTML(n));const s=MA(t,n,o,r);return e.dispatch(t,s)},KA=(e,t)=>{const n=Qa(((e,n)=>((e,t,n)=>{e._selectionOverrides.hideFakeCaret(),PA(e.getBody(),t,n).fold((()=>e.selection.placeCaretAt(t,n)),(o=>{const r=e._selectionOverrides.showCaret(1,o.node,o.position===NA.Before,!1);r?e.selection.setRng(r):e.selection.placeCaretAt(t,n)}))})(t,e,n)),0);t.on("remove",n.cancel);const o=e;return r=>e.on((e=>{const s=Math.max(Math.abs(r.screenX-e.screenX),Math.abs(r.screenY-e.screenY));if(!e.dragging&&s>10){const n=WA(t,"dragstart",e.element,e.dataTransfer,r);if(C(n.dataTransfer)&&(e.dataTransfer=n.dataTransfer),n.isDefaultPrevented())return;e.dragging=!0,t.focus()}if(e.dragging){const s=r.currentTarget===t.getDoc().documentElement,l=((e,t)=>({pageX:t.pageX-e.relX,pageY:t.pageY+5}))(e,((e,t)=>{return n=(e=>e.inline?DA(e.getBody()):{left:0,top:0})(e),o=(e=>{const t=e.getBody();return e.inline?{left:t.scrollLeft,top:t.scrollTop}:{left:0,top:0}})(e),r=((e,t)=>{if(t.target.ownerDocument!==e.getDoc()){const n=DA(e.getContentAreaContainer()),o=(e=>{const t=e.getBody(),n=e.getDoc().documentElement,o={left:t.scrollLeft,top:t.scrollTop},r={left:t.scrollLeft||n.scrollLeft,top:t.scrollTop||n.scrollTop};return e.inline?o:r})(e);return{left:t.pageX-n.left+o.left,top:t.pageY-n.top+o.top}}return{left:t.pageX,top:t.pageY}})(e,t),{pageX:r.left-n.left+o.left,pageY:r.top-n.top+o.top};var n,o,r})(t,r));a=e.ghost,i=t.getBody(),a.parentNode!==i&&i.appendChild(a),((e,t,n,o,r,s,a,i,l,d,c,u)=>{let m=0,f=0;e.style.left=t.pageX+"px",e.style.top=t.pageY+"px",t.pageX+n>r&&(m=t.pageX+n-r),t.pageY+o>s&&(f=t.pageY+o-s),e.style.width=n-m+"px",e.style.height=o-f+"px";const g=l.clientHeight,p=l.clientWidth,h=a+l.getBoundingClientRect().top,b=i+l.getBoundingClientRect().left;c.on((e=>{e.intervalId.clear(),e.dragging&&u&&(a+8>=g?e.intervalId.set(qA(d)):a-8<=0?e.intervalId.set($A(d)):i+8>=p?e.intervalId.set(HA(d)):i-8<=0?e.intervalId.set(jA(d)):h+16>=window.innerHeight?e.intervalId.set(qA(window)):h-16<=0?e.intervalId.set($A(window)):b+16>=window.innerWidth?e.intervalId.set(HA(window)):b-16<=0&&e.intervalId.set(jA(window)))}))})(e.ghost,l,e.width,e.height,e.maxX,e.maxY,r.clientY,r.clientX,t.getContentAreaContainer(),t.getWin(),o,s),n.throttle(r.clientX,r.clientY)}var a,i}))},YA=(e,t,n)=>{e.on((e=>{e.intervalId.clear(),e.dragging&&n.fold((()=>WA(t,"dragend",e.element,e.dataTransfer)),(n=>WA(t,"dragend",e.element,e.dataTransfer,n)))})),GA(e)},GA=e=>{e.on((e=>{e.intervalId.clear(),VA(e.ghost)})),e.clear()},XA=e=>{const t=Xa(),n=za.DOM,o=document,r=((e,t)=>n=>{if((e=>0===e.button)(n)){const o=J(t.dom.getParents(n.target),FA).getOr(null);if(C(o)&&((e,t,n)=>IA(n)&&n!==t&&e.isEditable(n.parentElement))(t.dom,t.getBody(),o)){const r=t.dom.getPos(o),s=t.getBody(),a=t.getDoc().documentElement;e.set({element:o,dataTransfer:LR(),dragging:!1,screenX:n.screenX,screenY:n.screenY,maxX:(t.inline?s.scrollWidth:a.offsetWidth)-2,maxY:(t.inline?s.scrollHeight:a.offsetHeight)-2,relX:n.pageX-r.x,relY:n.pageY-r.y,width:o.offsetWidth,height:o.offsetHeight,ghost:UA(t,o,o.offsetWidth,o.offsetHeight),intervalId:Ga(100)})}}})(t,e),s=KA(t,e),a=((e,t)=>n=>{e.on((e=>{var o;if(e.intervalId.clear(),e.dragging){if(((e,t,n)=>!y(t)&&t!==n&&!e.dom.isChildOf(t,n)&&e.dom.isEditable(t))(t,(e=>{const t=e.getSel();if(C(t)){const e=t.getRangeAt(0).startContainer;return er(e)?e.parentNode:e}return null})(t.selection),e.element)){const r=null!==(o=t.getDoc().elementFromPoint(n.clientX,n.clientY))&&void 0!==o?o:t.getBody();WA(t,"drop",r,e.dataTransfer,n).isDefaultPrevented()||t.undoManager.transact((()=>{((e,t)=>{const n=e.getParent(t.parentNode,e.isBlock);VA(t),n&&n!==e.getRoot()&&e.isEmpty(n)&&Or(yn(n))})(t.dom,e.element),(e=>{const t=e.getData("text/html");return""===t?I.none():I.some(t)})(e.dataTransfer).each((e=>t.insertContent(e))),t._selectionOverrides.hideFakeCaret()}))}WA(t,"dragend",t.getBody(),e.dataTransfer,n)}})),GA(e)})(t,e),i=((e,t)=>n=>YA(e,t,I.some(n)))(t,e);e.on("mousedown",r),e.on("mousemove",s),e.on("mouseup",a),n.bind(o,"mousemove",s),n.bind(o,"mouseup",i),e.on("remove",(()=>{n.unbind(o,"mousemove",s),n.unbind(o,"mouseup",i)})),e.on("keydown",(n=>{n.keyCode===af.ESC&&YA(t,e,I.none())}))},QA=dr,JA=(e,t)=>lb(e.getBody(),t),ZA=e=>{const t=e.selection,n=e.dom,o=e.getBody(),r=Pc(e,o,n.isBlock,(()=>Rg(e))),s="sel-"+n.uniqueId(),a="data-mce-selected";let i;const l=e=>e!==o&&(QA(e)||mr(e))&&n.isChildOf(e,o)&&n.isEditable(e.parentNode),d=(n,o,s,a=!0)=>e.dispatch("ShowCaret",{target:o,direction:n,before:s}).isDefaultPrevented()?null:(a&&t.scrollIntoView(o,-1===n),r.show(s,o)),c=e=>Ur(e)||$r(e)||qr(e),u=e=>c(e.startContainer)||c(e.endContainer),m=t=>{const o=e.schema.getVoidElements(),r=n.createRng(),s=t.startContainer,a=t.startOffset,i=t.endContainer,l=t.endOffset;return Ee(o,s.nodeName.toLowerCase())?0===a?r.setStartBefore(s):r.setStartAfter(s):r.setStart(s,a),Ee(o,i.nodeName.toLowerCase())?0===l?r.setEndBefore(i):r.setEndAfter(i):r.setEnd(i,l),r},f=(r,c)=>{if(!r)return null;if(r.collapsed){if(!u(r)){const e=c?1:-1,t=au(e,o,r),s=t.getNode(!c);if(C(s)){if(Mc(s))return d(e,s,!!c&&!t.isAtEnd(),!1);if(Fr(s)&&dr(s.nextSibling)){const e=n.createRng();return e.setStart(s,0),e.setEnd(s,0),e}}const a=t.getNode(c);if(C(a)){if(Mc(a))return d(e,a,!c&&!t.isAtEnd(),!1);if(Fr(a)&&dr(a.previousSibling)){const e=n.createRng();return e.setStart(a,1),e.setEnd(a,1),e}}}return null}let m=r.startContainer,f=r.startOffset;const g=r.endOffset;if(er(m)&&0===f&&QA(m.parentNode)&&(m=m.parentNode,f=n.nodeIndex(m),m=m.parentNode),!qo(m))return null;if(g===f+1&&m===r.endContainer){const o=m.childNodes[f];if(l(o))return(o=>{const r=o.cloneNode(!0),l=e.dispatch("ObjectSelected",{target:o,targetClone:r});if(l.isDefaultPrevented())return null;const d=((o,r)=>{const a=yn(e.getBody()),i=e.getDoc(),l=to(a,"#"+s).getOrThunk((()=>{const e=hn('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>',i);return Jt(e,"id",s),vo(a,e),e})),d=n.createRng();wo(l),Co(l,[vn(br,i),yn(r),vn(br,i)]),d.setStart(l.dom.firstChild,1),d.setEnd(l.dom.lastChild,0),lo(l,{top:n.getPos(o,e.getBody()).y+"px"}),ag(l);const c=t.getSel();return c&&(c.removeAllRanges(),c.addRange(d)),d})(o,l.targetClone),c=yn(o);return V(Uo(yn(e.getBody()),`*[${a}]`),(e=>{_n(c,e)||on(e,a)})),n.getAttrib(o,a)||o.setAttribute(a,"1"),i=o,p(),d})(o)}return null},g=()=>{i&&i.removeAttribute(a),to(yn(e.getBody()),"#"+s).each(xo),i=null},p=()=>{r.hide()};return XC(e)||(e.on("click",(t=>{n.isEditable(t.target)||(t.preventDefault(),e.focus())})),e.on("blur NewBlock",g),e.on("ResizeWindow FullscreenStateChanged",r.reposition),e.on("tap",(t=>{const n=t.target,o=JA(e,n);QA(o)?(t.preventDefault(),Sx(e,o).each(f)):l(n)&&Sx(e,n).each(f)}),!0),e.on("mousedown",(r=>{const s=r.target;if(s!==o&&"HTML"!==s.nodeName&&!n.isChildOf(s,o))return;if(!((e,t,n)=>{const o=yn(e.getBody()),r=e.inline?o:yn(Nn(o).dom.documentElement),s=((e,t,n,o)=>{const r=(e=>e.dom.getBoundingClientRect())(t);return{x:n-(e?r.left+t.dom.clientLeft+Aw(t):0),y:o-(e?r.top+t.dom.clientTop+Rw(t):0)}})(e.inline,r,t,n);return((e,t,n)=>{const o=Sw(e),r=Nw(e);return t>=0&&n>=0&&t<=o&&n<=r})(r,s.x,s.y)})(e,r.clientX,r.clientY))return;g(),p();const a=JA(e,s);QA(a)?(r.preventDefault(),Sx(e,a).each(f)):PA(o,r.clientX,r.clientY).each((n=>{var o;r.preventDefault(),(o=d(1,n.node,n.position===NA.Before,!1))&&t.setRng(o),Vo(a)?a.focus():e.getBody().focus()}))})),e.on("keypress",(e=>{af.modifierPressed(e)||QA(t.getNode())&&e.preventDefault()})),e.on("GetSelectionRange",(e=>{let t=e.range;if(i){if(!i.parentNode)return void(i=null);t=t.cloneRange(),t.selectNode(i),e.range=t}})),e.on("SetSelectionRange",(e=>{e.range=m(e.range);const t=f(e.range,e.forward);t&&(e.range=t)})),e.on("AfterSetSelectionRange",(e=>{const t=e.range,o=t.startContainer.parentElement;var r;u(t)||qo(r=o)&&"mcepastebin"===r.id||p(),(e=>C(e)&&n.hasClass(e,"mce-offscreen-selection"))(o)||g()})),(e=>{XA(e),Id(e)&&(e=>{const t=t=>{if(!t.isDefaultPrevented()){const n=t.dataTransfer;n&&(H(n.types,"Files")||n.files.length>0)&&(t.preventDefault(),"drop"===t.type&&Lw(e,"Dropped file type is not supported"))}},n=n=>{xg(e,n.target)&&t(n)},o=()=>{const o=za.DOM,r=e.dom,s=document,a=e.inline?e.getBody():e.getDoc(),i=["drop","dragover"];V(i,(e=>{o.bind(s,e,n),r.bind(a,e,t)})),e.on("remove",(()=>{V(i,(e=>{o.unbind(s,e,n),r.unbind(a,e,t)}))}))};e.on("init",(()=>{vg.setEditorTimeout(e,o,0)}))})(e)})(e),(e=>{const t=Qa((()=>{if(!e.removed&&e.getBody().contains(document.activeElement)){const t=e.selection.getRng();if(t.collapsed){const n=Nx(e,t,!1);e.selection.setRng(n)}}}),0);e.on("focus",(()=>{t.throttle()})),e.on("blur",(()=>{t.cancel()}))})(e),(e=>{e.on("init",(()=>{e.on("focusin",(t=>{const n=t.target;if(mr(n)){const t=lb(e.getBody(),n),o=dr(t)?t:n;e.selection.getNode()!==o&&Sx(e,o).each((t=>e.selection.setRng(t)))}}))}))})(e)),{showCaret:d,showBlockCaretContainer:e=>{e.hasAttribute("data-mce-caret")&&(Vr(e),t.scrollIntoView(e))},hideFakeCaret:p,destroy:()=>{r.destroy(),i=null}}},eT=(e,t)=>{let n=t;for(let t=e.previousSibling;er(t);t=t.previousSibling)n+=t.data.length;return n},tT=(e,t,n,o,r)=>{if(er(n)&&(o<0||o>n.data.length))return[];const s=r&&er(n)?[eT(n,o)]:[o];let a=n;for(;a!==t&&a.parentNode;)s.push(e.nodeIndex(a,r)),a=a.parentNode;return a===t?s.reverse():[]},nT=(e,t,n,o,r,s,a=!1)=>({start:tT(e,t,n,o,a),end:tT(e,t,r,s,a)}),oT=(e,t)=>{const n=t.slice(),o=n.pop();return x(o)?X(n,((e,t)=>e.bind((e=>I.from(e.childNodes[t])))),I.some(e)).bind((e=>er(e)&&(o<0||o>e.data.length)?I.none():I.some({node:e,offset:o}))):I.none()},rT=(e,t)=>oT(e,t.start).bind((({node:n,offset:o})=>oT(e,t.end).map((({node:e,offset:t})=>{const r=document.createRange();return r.setStart(n,o),r.setEnd(e,t),r})))),sT=(e,t,n)=>{if(t&&e.isEmpty(t)&&!n(t)){const o=t.parentNode;e.remove(t,er(t.firstChild)&&ss(t.firstChild.data)),sT(e,o,n)}},aT=(e,t,n,o=!0)=>{const r=t.startContainer.parentNode,s=t.endContainer.parentNode;t.deleteContents(),o&&!n(t.startContainer)&&(er(t.startContainer)&&0===t.startContainer.data.length&&e.remove(t.startContainer),er(t.endContainer)&&0===t.endContainer.data.length&&e.remove(t.endContainer),sT(e,r,n),r!==s&&sT(e,s,n))},iT=(e,t)=>I.from(e.dom.getParent(t.startContainer,e.dom.isBlock)),lT=(e,t,n)=>{const o=e.dynamicPatternsLookup({text:n,block:t});return{...e,blockPatterns:Cl(o).concat(e.blockPatterns),inlinePatterns:wl(o).concat(e.inlinePatterns)}},dT=(e,t,n,o)=>{const r=e.createRng();return r.setStart(t,0),r.setEnd(n,o),r.toString()},cT=(e,t,n)=>{((e,t,n)=>{if(er(e)&&0>=e.length)return I.some(Ak(e,0));{const t=hi(Tk);return I.from(t.forwards(e,0,Ok(e),n)).map((e=>Ak(e.container,0)))}})(t,0,t).each((o=>{const r=o.container;Dk(r,n.start.length,t).each((n=>{const o=e.createRng();o.setStart(r,0),o.setEnd(n.container,n.offset),aT(e,o,(e=>e===t))}));const s=yn(r),a=Cr(s);/^\s[^\s]/.test(a)&&((e,t)=>{yr.set(e,t)})(s,a.slice(1))}))},uT=(e,t)=>e.create("span",{"data-mce-type":"bookmark",id:t}),mT=(e,t)=>{const n=e.createRng();return n.setStartAfter(t.start),n.setEndBefore(t.end),n},fT=(e,t,n)=>{const o=rT(e.getRoot(),n).getOrDie("Unable to resolve path range"),r=o.startContainer,s=o.endContainer,a=0===o.endOffset?s:s.splitText(o.endOffset),i=0===o.startOffset?r:r.splitText(o.startOffset),l=i.parentNode;return{prefix:t,end:a.parentNode.insertBefore(uT(e,t+"-end"),a),start:l.insertBefore(uT(e,t+"-start"),i)}},gT=(e,t,n)=>{sT(e,e.get(t.prefix+"-end"),n),sT(e,e.get(t.prefix+"-start"),n)},pT=e=>0===e.start.length,hT=(e,t,n,o)=>{const r=t.start;var s;return Lk(e,o.container,o.offset,(s=r,(e,t)=>{const n=e.data.substring(0,t),o=n.lastIndexOf(s.charAt(s.length-1)),r=n.lastIndexOf(s);return-1!==r?r+s.length:-1!==o?o+1:-1}),n).bind((o=>{var s,a;const i=null!==(a=null===(s=n.textContent)||void 0===s?void 0:s.indexOf(r))&&void 0!==a?a:-1;if(-1!==i&&o.offset>=i+r.length){const t=e.createRng();return t.setStart(o.container,o.offset-r.length),t.setEnd(o.container,o.offset),I.some(t)}{const s=o.offset-r.length;return Pk(o.container,s,n).map((t=>{const n=e.createRng();return n.setStart(t.container,t.offset),n.setEnd(o.container,o.offset),n})).filter((e=>e.toString()===r)).orThunk((()=>hT(e,t,n,Ak(o.container,0))))}}))},bT=(e,t,n,o)=>{const r=e.dom,s=r.getRoot(),a=n.pattern,i=n.position.container,l=n.position.offset;return Pk(i,l-n.pattern.end.length,t).bind((d=>{const c=nT(r,s,d.container,d.offset,i,l,o);if(pT(a))return I.some({matches:[{pattern:a,startRng:c,endRng:c}],position:d});{const i=vT(e,n.remainingPatterns,d.container,d.offset,t,o),l=i.getOr({matches:[],position:d}),u=l.position,m=((e,t,n,o,r,s=!1)=>{if(0===t.start.length&&!s){const t=e.createRng();return t.setStart(n,o),t.setEnd(n,o),I.some(t)}return Bk(n,o,r).bind((n=>hT(e,t,r,n).bind((e=>{var t;if(s){if(e.endContainer===n.container&&e.endOffset===n.offset)return I.none();if(0===n.offset&&(null===(t=e.endContainer.textContent)||void 0===t?void 0:t.length)===e.endOffset)return I.none()}return I.some(e)}))))})(r,a,u.container,u.offset,t,i.isNone());return m.map((e=>{const t=((e,t,n,o=!1)=>nT(e,t,n.startContainer,n.startOffset,n.endContainer,n.endOffset,o))(r,s,e,o);return{matches:l.matches.concat([{pattern:a,startRng:t,endRng:c}]),position:Ak(e.startContainer,e.startOffset)}}))}}))},vT=(e,t,n,o,r,s)=>{const a=e.dom;return Bk(n,o,a.getRoot()).bind((i=>{const l=dT(a,r,n,o);for(let a=0;a<t.length;a++){const d=t[a];if(!$e(l,d.end))continue;const c=t.slice();c.splice(a,1);const u=bT(e,r,{pattern:d,remainingPatterns:c,position:i},s);if(u.isNone()&&o>0)return vT(e,t,n,o-1,r,s);if(u.isSome())return u}return I.none()}))},yT=(e,t,n)=>{e.selection.setRng(n),"inline-format"===t.type?V(t.format,(t=>{e.formatter.apply(t)})):e.execCommand(t.cmd,!1,t.value)},CT=(e,t,n,o,r,s)=>{var a;return((e,t)=>{const n=ne(e,(e=>$(t,(t=>e.pattern.start===t.pattern.start&&e.pattern.end===t.pattern.end))));return e.length===t.length?n?e:t:e.length>t.length?e:t})(vT(e,r.inlinePatterns,n,o,t,s).fold((()=>[]),(e=>e.matches)),vT(e,(a=r.inlinePatterns,ae(a,((e,t)=>t.end.length-e.end.length))),n,o,t,s).fold((()=>[]),(e=>e.matches)))},wT=(e,t)=>{if(0===t.length)return;const n=e.dom,o=e.selection.getBookmark(),r=((e,t)=>{const n=ui("mce_textpattern"),o=G(t,((t,o)=>{const r=fT(e,n+`_end${t.length}`,o.endRng);return t.concat([{...o,endMarker:r}])}),[]);return G(o,((t,r)=>{const s=o.length-t.length-1,a=pT(r.pattern)?r.endMarker:fT(e,n+`_start${s}`,r.startRng);return t.concat([{...r,startMarker:a}])}),[])})(n,t);V(r,(t=>{const o=n.getParent(t.startMarker.start,n.isBlock),r=e=>e===o;pT(t.pattern)?((e,t,n,o)=>{const r=mT(e.dom,n);aT(e.dom,r,o),yT(e,t,r)})(e,t.pattern,t.endMarker,r):((e,t,n,o,r)=>{const s=e.dom,a=mT(s,o),i=mT(s,n);aT(s,i,r),aT(s,a,r);const l={prefix:n.prefix,start:n.end,end:o.start},d=mT(s,l);yT(e,t,d)})(e,t.pattern,t.startMarker,t.endMarker,r),gT(n,t.endMarker,r),gT(n,t.startMarker,r)})),e.selection.moveToBookmark(o)},xT=(e,t)=>{const n=e.selection.getRng();return iT(e,n).map((o=>{var r;const s=Math.max(0,n.startOffset),a=lT(t,o,null!==(r=o.textContent)&&void 0!==r?r:""),i=CT(e,o,n.startContainer,s,a,!0),l=((e,t,n,o)=>{var r;const s=e.dom,a=Il(e);if(!s.is(t,a))return[];const i=null!==(r=t.textContent)&&void 0!==r?r:"";return((e,t)=>{const n=(e=>ae(e,((e,t)=>t.start.length-e.start.length)))(e),o=t.replace(br," ");return J(n,(e=>0===t.indexOf(e.start)||0===o.indexOf(e.start)))})(n.blockPatterns,i).map((e=>Pt.trim(i).length===e.start.length?[]:[{pattern:e,range:nT(s,s.getRoot(),t,0,t,0,true)}])).getOr([])})(e,o,a);return(l.length>0||i.length>0)&&(e.undoManager.add(),e.undoManager.extra((()=>{e.execCommand("mceInsertNewLine")}),(()=>{(e=>{e.insertContent(Br,{preserve_zwsp:!0})})(e),wT(e,i),((e,t)=>{if(0===t.length)return;const n=e.selection.getBookmark();V(t,(t=>((e,t)=>{const n=e.dom,o=t.pattern,r=rT(n.getRoot(),t.range).getOrDie("Unable to resolve path range");return iT(e,r).each((t=>{"block-format"===o.type?((e,t)=>{const n=t.get(e);return p(n)&&le(n).exists((e=>Ee(e,"block")))})(o.format,e.formatter)&&e.undoManager.transact((()=>{cT(e.dom,t,o),e.formatter.apply(o.format)})):"block-command"===o.type&&e.undoManager.transact((()=>{cT(e.dom,t,o),e.execCommand(o.cmd,!1,o.value)}))})),!0})(e,t))),e.selection.moveToBookmark(n)})(e,l);const t=e.selection.getRng(),n=Bk(t.startContainer,t.startOffset,e.dom.getRoot());e.execCommand("mceInsertNewLine"),n.each((t=>{const n=t.container;n.data.charAt(t.offset-1)===hr&&(n.deleteData(t.offset-1,1),sT(e.dom,n.parentNode,(t=>t===e.dom.getRoot())))}))})),!0)})).getOr(!1)},ET=(e,t,n)=>{for(let o=0;o<e.length;o++)if(n(e[o],t))return!0;return!1},_T=e=>{const t=Pt.each,n=af.BACKSPACE,o=af.DELETE,r=e.dom,s=e.selection,a=e.parser,i=At.browser,l=i.isFirefox(),d=i.isChromium()||i.isSafari(),c=At.deviceType.isiPhone()||At.deviceType.isiPad(),u=At.os.isMacOS()||At.os.isiOS(),f=(t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},g=e=>e.isDefaultPrevented(),p=()=>{e.shortcuts.add("meta+a",null,"SelectAll")},h=()=>{e.inline||r.bind(e.getDoc(),"mousedown mouseup",(t=>{let n;if(t.target===e.getDoc().documentElement)if(n=s.getRng(),e.getBody().focus(),"mousedown"===t.type){if(Ur(n.startContainer))return;s.placeCaretAt(t.clientX,t.clientY)}else s.setRng(n)}))},b=()=>{Range.prototype.getClientRects||e.on("mousedown",(t=>{if(!g(t)&&"HTML"===t.target.nodeName){const t=e.getBody();t.blur(),vg.setEditorTimeout(e,(()=>{t.focus()}))}}))},v=()=>{const t=zd(e);e.on("click",(n=>{const o=n.target;/^(IMG|HR)$/.test(o.nodeName)&&r.isEditable(o)&&(n.preventDefault(),e.selection.select(o),e.nodeChanged()),"A"===o.nodeName&&r.hasClass(o,t)&&0===o.childNodes.length&&r.isEditable(o.parentNode)&&(n.preventDefault(),s.select(o))}))},y=()=>{e.on("keydown",(e=>{if(!g(e)&&e.keyCode===n&&s.isCollapsed()&&0===s.getRng().startOffset){const t=s.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}return!0}))},C=()=>{Bd(e)||e.on("BeforeExecCommand mousedown",(()=>{f("StyleWithCSS",!1),f("enableInlineTableEditing",!1),cd(e)||f("enableObjectResizing",!1)}))},w=()=>{e.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")},x=()=>{e.inline||e.on("keydown",(()=>{document.activeElement===document.body&&e.getWin().focus()}))},E=()=>{e.inline||(e.contentStyles.push("body {min-height: 150px}"),e.on("click",(t=>{let n;"HTML"===t.target.nodeName&&(n=e.selection.getRng(),e.getBody().focus(),e.selection.setRng(n),e.selection.normalize(),e.nodeChanged())})))},k=()=>{u&&e.on("keydown",(t=>{!af.metaKeyPressed(t)||t.shiftKey||37!==t.keyCode&&39!==t.keyCode||(t.preventDefault(),e.selection.getSel().modify("move",37===t.keyCode?"backward":"forward","lineboundary"))}))},S=()=>{e.on("click",(e=>{let t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)})),e.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")},N=()=>{e.on("init",(()=>{e.dom.bind(e.getBody(),"submit",(e=>{e.preventDefault()}))}))},R=_;return XC(e)?(d&&(h(),v(),N(),p(),c&&(x(),E(),S())),l&&(b(),C(),w(),k())):(e.on("keydown",(t=>{if(g(t)||t.keyCode!==af.BACKSPACE)return;let n=s.getRng();const o=n.startContainer,a=n.startOffset,i=r.getRoot();let l=o;if(n.collapsed&&0===a){for(;l.parentNode&&l.parentNode.firstChild===l&&l.parentNode!==i;)l=l.parentNode;"BLOCKQUOTE"===l.nodeName&&(e.formatter.toggle("blockquote",void 0,l),n=r.createRng(),n.setStart(o,0),n.setEnd(o,0),s.setRng(n))}})),(()=>{const t=e=>{const t=r.create("body"),n=e.cloneContents();return t.appendChild(n),s.serializer.serialize(t,{format:"html"})};e.on("keydown",(s=>{const a=s.keyCode;if(!g(s)&&(a===o||a===n)&&e.selection.isEditable()){const n=e.selection.isCollapsed(),o=e.getBody();if(n&&!gs(yn(o)))return;if(!n&&!(n=>{const o=t(n),s=r.createRng();return s.selectNode(e.getBody()),o===t(s)})(e.selection.getRng()))return;s.preventDefault(),e.setContent(""),o.firstChild&&r.isBlock(o.firstChild)?e.selection.setCursorLocation(o.firstChild,0):e.selection.setCursorLocation(o,0),e.nodeChanged()}}))})(),At.windowsPhone||e.on("keyup focusin mouseup",(t=>{af.modifierPressed(t)||(e=>{const t=e.getBody(),n=e.selection.getRng();return n.startContainer===n.endContainer&&n.startContainer===t&&0===n.startOffset&&n.endOffset===t.childNodes.length})(e)||s.normalize()}),!0),d&&(h(),v(),e.on("init",(()=>{f("DefaultParagraphSeparator",Il(e))})),N(),y(),a.addNodeFilter("br",(e=>{let t=e.length;for(;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()})),c?(x(),E(),S()):p()),l&&(e.on("keydown",(t=>{if(!g(t)&&t.keyCode===n){if(!e.getBody().getElementsByTagName("hr").length)return;if(s.isCollapsed()&&0===s.getRng().startOffset){const e=s.getNode(),n=e.previousSibling;if("HR"===e.nodeName)return r.remove(e),void t.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(r.remove(n),t.preventDefault())}}})),b(),(()=>{const n=()=>{const n=r.getAttribs(s.getStart().cloneNode(!1));return()=>{const o=s.getStart();o!==e.getBody()&&(r.setAttrib(o,"style",null),t(n,(e=>{o.setAttributeNode(e.cloneNode(!0))})))}},o=()=>!s.isCollapsed()&&r.getParent(s.getStart(),r.isBlock)!==r.getParent(s.getEnd(),r.isBlock);e.on("keypress",(t=>{let r;return!(!(g(t)||8!==t.keyCode&&46!==t.keyCode)&&o()&&(r=n(),e.getDoc().execCommand("delete",!1),r(),t.preventDefault(),1))})),r.bind(e.getDoc(),"cut",(t=>{if(!g(t)&&o()){const t=n();vg.setEditorTimeout(e,(()=>{t()}))}}))})(),C(),e.on("SetContent ExecCommand",(e=>{"setcontent"!==e.type&&"mceInsertLink"!==e.command||t(r.select("a:not([data-mce-block])"),(e=>{var t;let n=e.parentNode;const o=r.getRoot();if((null==n?void 0:n.lastChild)===e){for(;n&&!r.isBlock(n);){if((null===(t=n.parentNode)||void 0===t?void 0:t.lastChild)!==n||n===o)return;n=n.parentNode}r.add(n,"br",{"data-mce-bogus":1})}}))})),w(),k(),y(),e.on("drop",(t=>{var n;const o=null===(n=t.dataTransfer)||void 0===n?void 0:n.getData("text/html");m(o)&&/^<img[^>]*>$/.test(o)&&e.dispatch("dragend",new window.DragEvent("dragend",t))})))),{refreshContentEditable:R,isHidden:()=>{if(!l||e.removed)return!1;const t=e.selection.getSel();return!t||!t.rangeCount||0===t.rangeCount}}},kT=za.DOM,ST=e=>e.inline?e.getElement().nodeName.toLowerCase():void 0,NT=e=>ye(e,(e=>!1===v(e))),RT=e=>{const t=e.options.get,n=e.editorUpload.blobCache;return NT({allow_conditional_comments:t("allow_conditional_comments"),allow_html_data_urls:t("allow_html_data_urls"),allow_svg_data_urls:t("allow_svg_data_urls"),allow_html_in_named_anchor:t("allow_html_in_named_anchor"),allow_script_urls:t("allow_script_urls"),allow_unsafe_link_target:t("allow_unsafe_link_target"),convert_unsafe_embeds:t("convert_unsafe_embeds"),convert_fonts_to_spans:t("convert_fonts_to_spans"),fix_list_elements:t("fix_list_elements"),font_size_legacy_values:t("font_size_legacy_values"),forced_root_block:t("forced_root_block"),forced_root_block_attrs:t("forced_root_block_attrs"),preserve_cdata:t("preserve_cdata"),inline_styles:t("inline_styles"),root_name:ST(e),sandbox_iframes:t("sandbox_iframes"),sanitize:t("xss_sanitization"),validate:!0,blob_cache:n,document:e.getDoc()})},AT=e=>{const t=e.options.get;return NT({custom_elements:t("custom_elements"),extended_valid_elements:t("extended_valid_elements"),invalid_elements:t("invalid_elements"),invalid_styles:t("invalid_styles"),schema:t("schema"),valid_children:t("valid_children"),valid_classes:t("valid_classes"),valid_elements:t("valid_elements"),valid_styles:t("valid_styles"),verify_html:t("verify_html"),padd_empty_block_inline_children:t("format_empty_lines")})},TT=e=>e.inline?e.ui.styleSheetLoader:e.dom.styleSheetLoader,OT=e=>{const t=TT(e),n=id(e),o=e.contentCSS,r=()=>{t.unloadAll(o),e.inline||e.ui.styleSheetLoader.unloadAll(n)},s=()=>{e.removed?r():e.on("remove",r)};if(e.contentStyles.length>0){let t="";Pt.each(e.contentStyles,(e=>{t+=e+"\r\n"})),e.dom.addStyle(t)}const a=Promise.all(((e,t,n)=>{const{pass:o,fail:r}=K(t,(e=>tinymce.Resource.has(Uw(e)))),s=o.map((t=>{const n=tinymce.Resource.get(Uw(t));return m(n)?Promise.resolve(TT(e).loadRawCss(t,n)):Promise.resolve()})),a=[...s,TT(e).loadAll(r)];return e.inline?a:a.concat([e.ui.styleSheetLoader.loadAll(n)])})(e,o,n)).then(s).catch(s),i=ad(e);return i&&((e,t)=>{const n=yn(e.getBody()),o=Vn(qn(n)),r=bn("style");Jt(r,"type","text/css"),vo(r,vn(t)),vo(o,r),e.on("remove",(()=>{xo(r)}))})(e,i),a},BT=e=>{!0!==e.removed&&((e=>{XC(e)||e.load({initial:!0,format:"html"}),e.startContent=e.getContent({format:"raw"})})(e),(e=>{e.bindPendingEventDelegates(),e.initialized=!0,(e=>{e.dispatch("Init")})(e),e.focus(!0),(e=>{const t=e.dom.getRoot();e.inline||am(e)&&e.selection.getStart(!0)!==t||Ou(t).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e),e.nodeChanged({initial:!0});const t=$d(e);w(t)&&t.call(e,e),(e=>{const t=Vd(e);t&&vg.setEditorTimeout(e,(()=>{let n;n=!0===t?e:e.editorManager.get(t),n&&!n.destroyed&&(n.focus(),n.selection.scrollIntoView())}),100)})(e)})(e))},PT=e=>{const t=e.getElement();let n=e.getDoc();e.inline&&(kT.addClass(t,"mce-content-body"),e.contentDocument=n=document,e.contentWindow=window,e.bodyElement=t,e.contentAreaContainer=t);const o=e.getBody();o.disabled=!0,e.readonly=Bd(e),e._editableRoot=Pd(e),!e.readonly&&e.hasEditableRoot()&&(e.inline&&"static"===kT.getStyle(o,"position",!0)&&(o.style.position="relative"),o.contentEditable="true"),o.disabled=!1,e.editorUpload=Kw(e),e.schema=ua(AT(e)),e.dom=za(n,{keep_values:!0,url_converter:e.convertURL,url_converter_scope:e,update_styles:!0,root_element:e.inline?e.getBody():null,collect:e.inline,schema:e.schema,contentCssCors:Zl(e),referrerPolicy:ed(e),onSetAttrib:t=>{e.dispatch("SetAttrib",t)},force_hex_color:yc(e)}),e.parser=(e=>{const t=bC(RT(e),e.schema);return t.addAttributeFilter("src,href,style,tabindex",((t,n)=>{const o=e.dom,r="data-mce-"+n;let s=t.length;for(;s--;){const a=t[s];let i=a.attr(n);if(i&&!a.attr(r)){if(0===i.indexOf("data:")||0===i.indexOf("blob:"))continue;"style"===n?(i=o.serializeStyle(o.parseStyle(i),a.name),i.length||(i=null),a.attr(r,i),a.attr(n,i)):"tabindex"===n?(a.attr(r,i),a.attr(n,null)):a.attr(r,e.convertURL(i,n,a.name))}}})),t.addNodeFilter("script",(e=>{let t=e.length;for(;t--;){const n=e[t],o=n.attr("type")||"no/type";0!==o.indexOf("mce-")&&n.attr("type","mce-"+o)}})),uc(e)&&t.addNodeFilter("#cdata",(t=>{var n;let o=t.length;for(;o--;){const r=t[o];r.type=8,r.name="#comment",r.value="[CDATA["+e.dom.encode(null!==(n=r.value)&&void 0!==n?n:"")+"]]"}})),t.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",(t=>{let n=t.length;const o=e.schema.getNonEmptyElements();for(;n--;){const e=t[n];e.isEmpty(o)&&0===e.getAll("br").length&&e.append(new Wg("br",1))}})),t})(e),e.serializer=iw((e=>{const t=e.options.get;return{...RT(e),...AT(e),...NT({remove_trailing_brs:t("remove_trailing_brs"),pad_empty_with_br:t("pad_empty_with_br"),url_converter:t("url_converter"),url_converter_scope:t("url_converter_scope"),element_format:t("element_format"),entities:t("entities"),entity_encoding:t("entity_encoding"),indent:t("indent"),indent_after:t("indent_after"),indent_before:t("indent_before")})}})(e),e),e.selection=rw(e.dom,e.getWin(),e.serializer,e),e.annotator=Qm(e),e.formatter=rx(e),e.undoManager=ax(e),e._nodeChangeDispatcher=new hR(e),e._selectionOverrides=ZA(e),(e=>{const t=Xa(),n=$a(!1),o=Ja((t=>{e.dispatch("longpress",{...t,type:"longpress"}),n.set(!0)}),400);e.on("touchstart",(e=>{P_(e).each((r=>{o.cancel();const s={x:r.clientX,y:r.clientY,target:e.target};o.throttle(e),n.set(!1),t.set(s)}))}),!0),e.on("touchmove",(r=>{o.cancel(),P_(r).each((o=>{t.on((r=>{((e,t)=>{const n=Math.abs(e.clientX-t.x),o=Math.abs(e.clientY-t.y);return n>5||o>5})(o,r)&&(t.clear(),n.set(!1),e.dispatch("longpresscancel"))}))}))}),!0),e.on("touchend touchcancel",(r=>{o.cancel(),"touchcancel"!==r.type&&t.get().filter((e=>e.target.isEqualNode(r.target))).each((()=>{n.get()?r.preventDefault():e.dispatch("tap",{...r,type:"tap"})}))}),!0)})(e),(e=>{(e=>{e.on("click",(t=>{e.dom.getParent(t.target,"details")&&t.preventDefault()}))})(e),(e=>{e.parser.addNodeFilter("details",(t=>{const n=bc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))})),e.serializer.addNodeFilter("details",(t=>{const n=vc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))}))})(e)})(e),(e=>{const t="contenteditable",n=" "+Pt.trim(dc(e))+" ",o=" "+Pt.trim(lc(e))+" ",r=z_(n),s=z_(o),a=cc(e);a.length>0&&e.on("BeforeSetContent",(t=>{((e,t,n)=>{let o=t.length,r=n.content;if("raw"!==n.format){for(;o--;)r=r.replace(t[o],j_(e,r,lc(e)));n.content=r}})(e,a,t)})),e.parser.addAttributeFilter("class",(e=>{let n=e.length;for(;n--;){const o=e[n];r(o)?o.attr(t,"true"):s(o)&&o.attr(t,"false")}})),e.serializer.addAttributeFilter(t,(e=>{let n=e.length;for(;n--;){const o=e[n];(r(o)||s(o))&&(a.length>0&&o.attr("data-mce-content")?(o.name="#text",o.type=3,o.raw=!0,o.value=o.attr("data-mce-content")):o.attr(t,null))}}))})(e),XC(e)||((e=>{e.on("mousedown",(t=>{t.detail>=3&&(t.preventDefault(),SA(e))}))})(e),(e=>{(e=>{const t=[",",".",";",":","!","?"],n=[32],o=()=>{return t=ac(e),n=ic(e),{inlinePatterns:wl(t),blockPatterns:Cl(t),dynamicPatternsLookup:n};var t,n},r=()=>(e=>e.options.isSet("text_patterns_lookup"))(e);e.on("keydown",(t=>{if(13===t.keyCode&&!af.modifierPressed(t)&&e.selection.isCollapsed()){const n=o();(n.inlinePatterns.length>0||n.blockPatterns.length>0||r())&&xT(e,n)&&t.preventDefault()}}),!0);const s=()=>{if(e.selection.isCollapsed()){const t=o();(t.inlinePatterns.length>0||r())&&((e,t)=>{const n=e.selection.getRng();iT(e,n).map((o=>{const r=Math.max(0,n.startOffset-1),s=dT(e.dom,o,n.startContainer,r),a=lT(t,o,s),i=CT(e,o,n.startContainer,r,a,!1);i.length>0&&e.undoManager.transact((()=>{wT(e,i)}))}))})(e,t)}};e.on("keyup",(e=>{ET(n,e,((e,t)=>e===t.keyCode&&!af.modifierPressed(t)))&&s()})),e.on("keypress",(n=>{ET(t,n,((e,t)=>e.charCodeAt(0)===t.charCode))&&vg.setEditorTimeout(e,s)}))})(e)})(e));const r=pR(e);B_(e,r),(e=>{e.on("NodeChange",T(F_,e))})(e),(e=>{var t;const n=e.dom,o=Il(e),r=null!==(t=md(e))&&void 0!==t?t:"",s=(t,a)=>{if((e=>{if(dx(e)){const t=e.keyCode;return!cx(e)&&(af.metaKeyPressed(e)||e.altKey||t>=112&&t<=123||H(ix,t))}return!1})(t))return;const i=e.getBody(),l=!(e=>dx(e)&&!(cx(e)||"keyup"===e.type&&229===e.keyCode))(t)&&((e,t,n)=>{if(gs(yn(t),!1)){const o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&n===o.nodeName.toLowerCase()}return!1})(n,i,o);(""!==n.getAttrib(i,lx)!==l||a)&&(n.setAttrib(i,lx,l?r:null),n.setAttrib(i,"aria-placeholder",l?r:null),((e,t)=>{e.dispatch("PlaceholderToggle",{state:t})})(e,l),e.on(l?"keydown":"keyup",s),e.off(l?"keyup":"keydown",s))};Ye(r)&&e.on("init",(t=>{s(t,!0),e.on("change SetContent ExecCommand",s),e.on("paste",(t=>vg.setEditorTimeout(e,(()=>s(t)))))}))})(e),yA(e);const s=(e=>{const t=e;return(e=>xe(e.plugins,"rtc").bind((e=>I.from(e.setup))))(e).fold((()=>(t.rtcInstance=GC(e),I.none())),(e=>(t.rtcInstance=(()=>{const e=N(null),t=N("");return{init:{bindEvents:_},undoManager:{beforeChange:_,add:e,undo:e,redo:e,clear:_,reset:_,hasUndo:L,hasRedo:L,transact:e,ignore:_,extra:_},formatter:{match:L,matchAll:N([]),matchNode:N(void 0),canApply:L,closest:t,apply:_,remove:_,toggle:_,formatChanged:N({unbind:_})},editor:{getContent:t,setContent:N({content:"",html:""}),insertContent:N(""),addVisual:_},selection:{getContent:t},autocompleter:{addDecoration:_,removeDecoration:_},raw:{getModel:N(I.none())}}})(),I.some((()=>e().then((e=>(t.rtcInstance=(e=>{const t=e=>f(e)?e:{},{init:n,undoManager:o,formatter:r,editor:s,selection:a,autocompleter:i,raw:l}=e;return{init:{bindEvents:n.bindEvents},undoManager:{beforeChange:o.beforeChange,add:o.add,undo:o.undo,redo:o.redo,clear:o.clear,reset:o.reset,hasUndo:o.hasUndo,hasRedo:o.hasRedo,transact:(e,t,n)=>o.transact(n),ignore:(e,t)=>o.ignore(t),extra:(e,t,n,r)=>o.extra(n,r)},formatter:{match:(e,n,o,s)=>r.match(e,t(n),s),matchAll:r.matchAll,matchNode:r.matchNode,canApply:e=>r.canApply(e),closest:e=>r.closest(e),apply:(e,n,o)=>r.apply(e,t(n)),remove:(e,n,o,s)=>r.remove(e,t(n)),toggle:(e,n,o)=>r.toggle(e,t(n)),formatChanged:(e,t,n,o,s)=>r.formatChanged(t,n,o,s)},editor:{getContent:e=>s.getContent(e),setContent:(e,t)=>({content:s.setContent(e,t),html:""}),insertContent:(e,t)=>(s.insertContent(e),""),addVisual:s.addVisual},selection:{getContent:(e,t)=>a.getContent(t)},autocompleter:{addDecoration:i.addDecoration,removeDecoration:i.removeDecoration},raw:{getModel:()=>I.some(l.getRawModel())}}})(e),e.rtc.isRemote))))))))})(e);(e=>{const t=e.getDoc(),n=e.getBody();(e=>{e.dispatch("PreInit")})(e),Wd(e)||(t.body.spellcheck=!1,kT.setAttrib(n,"spellcheck","false")),e.quirks=_T(e),(e=>{e.dispatch("PostRender")})(e);const o=ld(e);void 0!==o&&(n.dir=o);const r=Kd(e);r&&e.on("BeforeSetContent",(e=>{Pt.each(r,(t=>{e.content=e.content.replace(t,(e=>"\x3c!--mce:protected "+escape(e)+"--\x3e"))}))})),e.on("SetContent",(()=>{e.addVisual(e.getBody())})),e.on("compositionstart compositionend",(t=>{e.composing="compositionstart"===t.type}))})(e),s.fold((()=>{const t=(e=>{let t=!1;const n=setTimeout((()=>{t||e.setProgressState(!0)}),500);return()=>{clearTimeout(n),t=!0,e.setProgressState(!1)}})(e);OT(e).then((()=>{BT(e),t()}))}),(t=>{e.setProgressState(!0),OT(e).then((()=>{t().then((t=>{e.setProgressState(!1),BT(e),ZC(e)}),(t=>{e.notificationManager.open({type:"error",text:String(t)}),BT(e),ZC(e)}))}))}))},DT=M,LT=za.DOM,MT=za.DOM,IT=(e,t)=>({editorContainer:e,iframeContainer:t,api:{}}),FT=e=>{const t=e.getElement();return e.inline?IT(null):(e=>{const t=MT.create("div");return MT.insertAfter(t,e),IT(t,t)})(t)},UT=async e=>{e.dispatch("ScriptsLoaded"),(e=>{const t=Pt.trim(Kl(e)),n=e.ui.registry.getAll().icons,o={...xw.get("default").icons,...xw.get(t).icons};ge(o,((t,o)=>{Ee(n,o)||e.ui.registry.addIcon(o,t)}))})(e),(e=>{const t=pd(e);if(m(t)){const n=Bw.get(t);e.theme=n(e,Bw.urls[t])||{},w(e.theme.init)&&e.theme.init(e,Bw.urls[t]||e.documentBaseUrl.replace(/\/$/,""))}else e.theme={}})(e),(e=>{const t=bd(e),n=Ew.get(t);e.model=n(e,Ew.urls[t])})(e),(e=>{const t=[];V(Ld(e),(n=>{((e,t,n)=>{const o=Ow.get(n),r=Ow.urls[n]||e.documentBaseUrl.replace(/\/$/,"");if(n=Pt.trim(n),o&&-1===Pt.inArray(t,n)){if(e.plugins[n])return;try{const s=o(e,r)||{};e.plugins[n]=s,w(s.init)&&(s.init(e,r),t.push(n))}catch(t){((e,t,n)=>{const o=Ka.translate(["Failed to initialize plugin: {0}",t]);ef(e,"PluginLoadError",{message:o}),Fw(o,n),Lw(e,o)})(e,n,t)}}})(e,t,(e=>e.replace(/^\-/,""))(n))}))})(e);const t=await(e=>{const t=e.getElement();return e.orgDisplay=t.style.display,m(pd(e))?(e=>{const t=e.theme.renderUI;return t?t():FT(e)})(e):w(pd(e))?(e=>{const t=e.getElement(),n=pd(e)(e,t);return n.editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||e.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||e.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:t.offsetHeight,n})(e):FT(e)})(e);((e,t)=>{const n={show:I.from(t.show).getOr(_),hide:I.from(t.hide).getOr(_),isEnabled:I.from(t.isEnabled).getOr(M),setEnabled:n=>{e.mode.isReadOnly()||I.from(t.setEnabled).each((e=>e(n)))}};e.ui={...e.ui,...n}})(e,I.from(t.api).getOr({})),e.editorContainer=t.editorContainer,(e=>{e.contentCSS=e.contentCSS.concat((e=>zw(e,sd(e)))(e),(e=>zw(e,id(e)))(e))})(e),e.inline?PT(e):((e,t)=>{((e,t)=>{const n=e.translate("Rich Text Area"),o=tn(yn(e.getElement()),"tabindex").bind(Xe),r=((e,t,n,o)=>{const r=bn("iframe");return o.each((e=>Jt(r,"tabindex",e))),Zt(r,n),Zt(r,{id:e+"_ifr",frameBorder:"0",allowTransparency:"true",title:t}),un(r,"tox-edit-area__iframe"),r})(e.id,n,Tl(e),o).dom;r.onload=()=>{r.onload=null,e.dispatch("load")},e.contentAreaContainer=t.iframeContainer,e.iframeElement=r,e.iframeHTML=(e=>{let t=Ol(e)+"<html><head>";Bl(e)!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';const n=Pl(e),o=Dl(e),r=e.translate(jd(e));return Ll(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+Ll(e)+'" />'),t+=`</head><body id="${n}" class="mce-content-body ${o}" data-id="${e.id}" aria-label="${r}"><br></body></html>`,t})(e),LT.add(t.iframeContainer,r)})(e,t),t.editorContainer&&(t.editorContainer.style.display=e.orgDisplay,e.hidden=LT.isHidden(t.editorContainer)),e.getElement().style.display="none",LT.setAttrib(e.id,"aria-hidden","true"),e.getElement().style.visibility=e.orgVisibility,(e=>{const t=e.iframeElement,n=()=>{e.contentDocument=t.contentDocument,PT(e)};if(gc(e)||At.browser.isFirefox()){const t=e.getDoc();t.open(),t.write(e.iframeHTML),t.close(),n()}else{const r=(o=yn(t),No(o,"load",DT,(()=>{r.unbind(),n()})));t.srcdoc=e.iframeHTML}var o})(e)})(e,{editorContainer:t.editorContainer,iframeContainer:t.iframeContainer})},zT=za.DOM,jT=e=>"-"===e.charAt(0),HT=(e,t,n)=>I.from(t).filter((e=>Ye(e)&&!xw.has(e))).map((t=>({url:`${e.editorManager.baseURL}/icons/${t}/icons${n}.js`,name:I.some(t)}))),$T=(e,t)=>{const n=Ha.ScriptLoader,o=()=>{!e.removed&&(e=>{const t=pd(e);return!m(t)||C(Bw.get(t))})(e)&&(e=>{const t=bd(e);return C(Ew.get(t))})(e)&&UT(e)};((e,t)=>{const n=pd(e);if(m(n)&&!jT(n)&&!Ee(Bw.urls,n)){const o=hd(e),r=o?e.documentBaseURI.toAbsolute(o):`themes/${n}/theme${t}.js`;Bw.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ThemeLoadError",Iw("theme",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=bd(e);if("plugin"!==n&&!Ee(Ew.urls,n)){const o=vd(e),r=m(o)?e.documentBaseURI.toAbsolute(o):`models/${n}/model${t}.js`;Ew.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ModelLoadError",Iw("model",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=td(t),o=nd(t);if(!Ka.hasCode(n)&&"en"!==n){const r=Ye(o)?o:`${t.editorManager.baseURL}/langs/${n}.js`;e.add(r).catch((()=>{((e,t,n)=>{Mw(e,"LanguageLoadError",Iw("language",t,n))})(t,r,n)}))}})(n,e),((e,t,n)=>{const o=HT(t,"default",n),r=(e=>I.from(Yl(e)).filter(Ye).map((e=>({url:e,name:I.none()}))))(t).orThunk((()=>HT(t,Kl(t),"")));V((e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t})([o,r]),(n=>{e.add(n.url).catch((()=>{((e,t,n)=>{Mw(e,"IconsLoadError",Iw("icons",t,n))})(t,n.url,n.name.getOrUndefined())}))}))})(n,e,t),((e,t)=>{const n=(t,n)=>{Ow.load(t,n).catch((()=>{((e,t,n)=>{Mw(e,"PluginLoadError",Iw("plugin",t,n))})(e,n,t)}))};ge(Md(e),((t,o)=>{n(o,t),e.options.set("plugins",Ld(e).concat(o))})),V(Ld(e),(e=>{!(e=Pt.trim(e))||Ow.urls[e]||jT(e)||n(e,`plugins/${e}/plugin${t}.js`)}))})(e,t),n.loadQueue().then(o,o)},qT=xt().deviceType,VT=qT.isPhone(),WT=qT.isTablet(),KT=e=>{if(y(e))return[];{const t=p(e)?e:e.split(/[ ,]/),n=q(t,Ve);return Y(n,Ye)}},YT=(e,t)=>{const n=((t,n)=>{const o={},r={};return ve(t,((t,n)=>H(e,n)),be(o),be(r)),{t:o,f:r}})(t);return o=n.t,r=n.f,{sections:N(o),options:N(r)};var o,r},GT=(e,t)=>Ee(e.sections(),t),XT=(e,t)=>({table_grid:!1,object_resizing:!1,resize:!1,toolbar_mode:xe(e,"toolbar_mode").getOr("scrolling"),toolbar_sticky:!1,...t?{menubar:!1}:{}}),QT=(e,t)=>{var n;const o=null!==(n=t.external_plugins)&&void 0!==n?n:{};return e&&e.external_plugins?Pt.extend({},e.external_plugins,o):o},JT=(e,t,n,o,r)=>{var s;const a=e?{mobile:XT(null!==(s=r.mobile)&&void 0!==s?s:{},t)}:{},i=YT(["mobile"],Jk(a,r)),l=Pt.extend(n,o,i.options(),((e,t)=>e&&GT(t,"mobile"))(e,i)?((e,t,n={})=>{const o=e.sections(),r=xe(o,t).getOr({});return Pt.extend({},n,r)})(i,"mobile"):{},{external_plugins:QT(o,i.options())});return((e,t,n,o)=>{const r=KT(n.forced_plugins),s=KT(o.plugins),a=((e,t)=>GT(e,t)?e.sections()[t]:{})(t,"mobile"),i=((e,t,n,o)=>e&&GT(t,"mobile")?o:n)(e,t,s,a.plugins?KT(a.plugins):s),l=((e,t)=>[...KT(e),...KT(t)])(r,i);return Pt.extend(o,{forced_plugins:r,plugins:l})})(e,i,o,l)},ZT=e=>{(e=>{const t=t=>()=>{V("left,center,right,justify".split(","),(n=>{t!==n&&e.formatter.remove("align"+n)})),"none"!==t&&((t,n)=>{e.formatter.toggle(t,void 0),e.nodeChanged()})("align"+t)};e.editorCommands.addCommands({JustifyLeft:t("left"),JustifyCenter:t("center"),JustifyRight:t("right"),JustifyFull:t("justify"),JustifyNone:t("none")})})(e),(e=>{const t=t=>()=>{const n=e.selection,o=n.isCollapsed()?[e.dom.getParent(n.getNode(),e.dom.isBlock)]:n.getSelectedBlocks();return $(o,(n=>C(e.formatter.matchNode(n,t))))};e.editorCommands.addCommands({JustifyLeft:t("alignleft"),JustifyCenter:t("aligncenter"),JustifyRight:t("alignright"),JustifyFull:t("alignjustify")},"state")})(e)},eO=(e,t)=>{const n=e.selection,o=e.dom;return/^ | $/.test(t)?((e,t,n,o)=>{const r=yn(e.getRoot());return n=eh(r,Vi.fromRangeStart(t),o)?n.replace(/^ /,"&nbsp;"):n.replace(/^&nbsp;/," "),th(r,Vi.fromRangeEnd(t),o)?n.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):n.replace(/&nbsp;(<br( \/)?>)?$/," ")})(o,n.getRng(),t,e.schema):t},tO=(e,t)=>{if(e.selection.isEditable()){const{content:n,details:o}=(e=>{if("string"!=typeof e){const t=Pt.extend({paste:e.paste,data:{paste:e.paste}},e);return{content:e.content,details:t}}return{content:e,details:{}}})(t);wC(e,{...o,content:eO(e,n),format:"html",set:!1,selection:!0}).each((t=>{const n=((e,t,n)=>QC(e).editor.insertContent(t,n))(e,t.content,o);xC(e,n,t),e.addVisual()}))}},nO={"font-size":"size","font-family":"face"},oO=Xt("font"),rO=e=>(t,n)=>I.from(n).map(yn).filter(Wt).bind((n=>((e,t,n)=>Lb(yn(n),(t=>(t=>mo(t,e).orThunk((()=>oO(t)?xe(nO,e).bind((e=>tn(t,e))):I.none())))(t)),(e=>_n(yn(t),e))))(e,t,n.dom).or(((e,t)=>I.from(za.DOM.getStyle(t,e,!0)))(e,n.dom)))).getOr(""),sO=rO("font-size"),aO=k((e=>e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")),rO("font-family")),iO=e=>Ou(e.getBody()).bind((e=>{const t=e.container();return I.from(er(t)?t.parentNode:t)})),lO=(e,t)=>((e,t)=>(e=>I.from(e.selection.getRng()).bind((t=>{const n=e.getBody();return t.startContainer===n&&0===t.startOffset?I.none():I.from(e.selection.getStart(!0))})))(e).orThunk(T(iO,e)).map(yn).filter(Wt).bind(t))(e,S(I.some,t)),dO=(e,t)=>{if(/^[0-9.]+$/.test(t)){const n=parseInt(t,10);if(n>=1&&n<=7){const o=(e=>Pt.explode(e.options.get("font_size_style_values")))(e),r=(e=>Pt.explode(e.options.get("font_size_classes")))(e);return r.length>0?r[n-1]||t:o[n-1]||t}return t}return t},cO=e=>{const t=e.split(/\s*,\s*/);return q(t,(e=>-1===e.indexOf(" ")||He(e,'"')||He(e,"'")?e:`'${e}'`)).join(",")},uO=(e,t)=>{const n=e.dom,o=e.selection.getRng(),r=t?e.selection.getStart():e.selection.getEnd(),s=t?o.startContainer:o.endContainer,a=hN(n,s);if(!a||!a.isContentEditable)return;const i=t?po:ho,l=Il(e);((e,t,n,o)=>{const r=e.dom,s=e=>r.isBlock(e)&&e.parentElement===n,a=s(t)?t:r.getParent(o,s,n);return I.from(a).map(yn)})(e,r,a,s).each((t=>{const n=CN(e,s,t.dom,a,!1,l);i(t,yn(n)),e.selection.setCursorLocation(n,0),e.dispatch("NewBlock",{newBlock:n}),dN(e,"insertParagraph")}))},mO=e=>{ZT(e),(e=>{e.editorCommands.addCommands({"Cut,Copy,Paste":t=>{const n=e.getDoc();let o;try{n.execCommand(t)}catch(e){o=!0}if("paste"!==t||n.queryCommandEnabled(t)||(o=!0),o||!n.queryCommandSupported(t)){let t=e.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");(At.os.isMacOS()||At.os.isiOS())&&(t=t.replace(/Ctrl\+/g,"\u2318+")),e.notificationManager.open({text:t,type:"error"})}}})})(e),(e=>{e.editorCommands.addCommands({mceAddUndoLevel:()=>{e.undoManager.add()},mceEndUndoLevel:()=>{e.undoManager.add()},Undo:()=>{e.undoManager.undo()},Redo:()=>{e.undoManager.redo()}})})(e),(e=>{e.editorCommands.addCommands({mceSelectNodeDepth:(t,n,o)=>{let r=0;e.dom.getParent(e.selection.getNode(),(t=>!qo(t)||r++!==o||(e.selection.select(t),!1)),e.getBody())},mceSelectNode:(t,n,o)=>{e.selection.select(o)},selectAll:()=>{const t=e.dom.getParent(e.selection.getStart(),lr);if(t){const n=e.dom.createRng();n.selectNodeContents(t),e.selection.setRng(n)}}})})(e),(e=>{e.editorCommands.addCommands({mceCleanup:()=>{const t=e.selection.getBookmark();e.setContent(e.getContent()),e.selection.moveToBookmark(t)},insertImage:(t,n,o)=>{tO(e,e.dom.createHTML("img",{src:o}))},insertHorizontalRule:()=>{e.execCommand("mceInsertContent",!1,"<hr>")},insertText:(t,n,o)=>{tO(e,e.dom.encode(o))},insertHTML:(t,n,o)=>{tO(e,o)},mceInsertContent:(t,n,o)=>{tO(e,o)},mceSetContent:(t,n,o)=>{e.setContent(o)},mceReplaceContent:(t,n,o)=>{e.execCommand("mceInsertContent",!1,o.replace(/\{\$selection\}/g,e.selection.getContent({format:"text"})))},mceNewDocument:()=>{e.setContent(Jd(e))}})})(e),(e=>{const t=(t,n,o)=>{const r=m(o)?{href:o}:o,s=e.dom.getParent(e.selection.getNode(),"a");f(r)&&m(r.href)&&(r.href=r.href.replace(/ /g,"%20"),s&&r.href||e.formatter.remove("link"),r.href&&e.formatter.apply("link",r,s))};e.editorCommands.addCommands({unlink:()=>{if(e.selection.isEditable()){if(e.selection.isCollapsed()){const t=e.dom.getParent(e.selection.getStart(),"a");return void(t&&e.dom.remove(t,!0))}e.formatter.remove("link")}},mceInsertLink:t,createLink:t})})(e),(e=>{e.editorCommands.addCommands({Indent:()=>{(e=>{R_(e,"indent")})(e)},Outdent:()=>{A_(e)}}),e.editorCommands.addCommands({Outdent:()=>k_(e)},"state")})(e),(e=>{e.editorCommands.addCommands({InsertNewBlockBefore:()=>{(e=>{uO(e,!0)})(e)},InsertNewBlockAfter:()=>{(e=>{uO(e,!1)})(e)}})})(e),(e=>{e.editorCommands.addCommands({insertParagraph:()=>{ZN(ON,e)},mceInsertNewLine:(t,n,o)=>{eR(e,o)},InsertLineBreak:(t,n,o)=>{ZN(UN,e)}})})(e),(e=>{(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{e.getDoc().execCommand(t);const n=e.dom.getParent(e.selection.getNode(),"ol,ul");if(n){const t=n.parentNode;if(t&&/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)){const o=e.selection.getBookmark();e.dom.split(t,n),e.selection.moveToBookmark(o)}}}})})(e),(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{const n=e.dom.getParent(e.selection.getNode(),"ul,ol");return n&&("insertunorderedlist"===t&&"UL"===n.tagName||"insertorderedlist"===t&&"OL"===n.tagName)}},"state")})(e)})(e),(e=>{(e=>{const t=(t,n)=>{e.formatter.toggle(t,n),e.nodeChanged()};e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>{t(e)},"ForeColor,HiliteColor":(e,n,o)=>{t(e,{value:o})},BackColor:(e,n,o)=>{t("hilitecolor",{value:o})},FontName:(t,n,o)=>{((e,t)=>{const n=dO(e,t);e.formatter.toggle("fontname",{value:cO(n)}),e.nodeChanged()})(e,o)},FontSize:(t,n,o)=>{((e,t)=>{e.formatter.toggle("fontsize",{value:dO(e,t)}),e.nodeChanged()})(e,o)},LineHeight:(t,n,o)=>{((e,t)=>{e.formatter.toggle("lineheight",{value:String(t)}),e.nodeChanged()})(e,o)},Lang:(e,n,o)=>{var r;t(e,{value:o.code,customValue:null!==(r=o.customCode)&&void 0!==r?r:null})},RemoveFormat:t=>{e.formatter.remove(t)},mceBlockQuote:()=>{t("blockquote")},FormatBlock:(e,n,o)=>{t(m(o)?o:"p")},mceToggleFormat:(e,n,o)=>{t(o)}})})(e),(e=>{const t=t=>e.formatter.match(t);e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>t(e),mceBlockQuote:()=>t("blockquote")},"state"),e.editorCommands.addQueryValueHandler("FontName",(()=>(e=>lO(e,(t=>aO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("FontSize",(()=>(e=>lO(e,(t=>sO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("LineHeight",(()=>(e=>lO(e,(t=>{const n=yn(e.getBody()),o=Lb(t,(e=>mo(e,"line-height")),T(_n,n));return o.getOrThunk((()=>{const e=parseFloat(co(t,"line-height")),n=parseFloat(co(t,"font-size"));return String(e/n)}))})).getOr(""))(e)))})(e)})(e),(e=>{e.editorCommands.addCommands({mceRemoveNode:(t,n,o)=>{const r=null!=o?o:e.selection.getNode();if(r!==e.getBody()){const t=e.selection.getBookmark();e.dom.remove(r,!0),e.selection.moveToBookmark(t)}},mcePrint:()=>{e.getWin().print()},mceFocus:(t,n,o)=>{((e,t)=>{e.removed||(t?Tg(e):(e=>{const t=e.selection,n=e.getBody();let o=t.getRng();e.quirks.refreshContentEditable(),C(e.bookmark)&&!Rg(e)&&hg(e).each((t=>{e.selection.setRng(t),o=t}));const r=((e,t)=>e.dom.getParent(t,(t=>"true"===e.dom.getContentEditable(t))))(e,t.getNode());if(r&&e.dom.isChildOf(r,n))return Ng(r),Sg(e,o),void Tg(e);e.inline||(At.browser.isOpera()||Ng(n),e.getWin().focus()),(At.browser.isFirefox()||e.inline)&&(Ng(n),Sg(e,o)),Tg(e)})(e))})(e,!0===o)},mceToggleVisualAid:()=>{e.hasVisual=!e.hasVisual,e.addVisual()}})})(e)},fO=["toggleview"],gO=e=>H(fO,e.toLowerCase());class pO{constructor(e){this.commands={state:{},exec:{},value:{}},this.editor=e}execCommand(e,t=!1,n,o){const r=this.editor,s=e.toLowerCase(),a=null==o?void 0:o.skip_focus;if(r.removed)return!1;if("mcefocus"!==s&&(/^(mceAddUndoLevel|mceEndUndoLevel)$/i.test(s)||a?(e=>{hg(e).each((t=>e.selection.setRng(t)))})(r):r.focus()),r.dispatch("BeforeExecCommand",{command:e,ui:t,value:n}).isDefaultPrevented())return!1;const i=this.commands.exec[s];return!!w(i)&&(i(s,t,n),r.dispatch("ExecCommand",{command:e,ui:t,value:n}),!0)}queryCommandState(e){if(!gO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return!1;const t=e.toLowerCase(),n=this.commands.state[t];return!!w(n)&&n(t)}queryCommandValue(e){if(!gO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return"";const t=e.toLowerCase(),n=this.commands.value[t];return w(n)?n(t):""}addCommands(e,t="exec"){const n=this.commands;ge(e,((e,o)=>{V(o.toLowerCase().split(","),(o=>{n[t][o]=e}))}))}addCommand(e,t,n){const o=e.toLowerCase();this.commands.exec[o]=(e,o,r)=>t.call(null!=n?n:this.editor,o,r)}queryCommandSupported(e){const t=e.toLowerCase();return!!this.commands.exec[t]}addQueryStateHandler(e,t,n){this.commands.state[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}addQueryValueHandler(e,t,n){this.commands.value[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}}const hO="data-mce-contenteditable",bO=(e,t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},vO=(e,t)=>{e.dom.contentEditable=t?"true":"false"},yO=e=>e.readonly,CO=e=>{e.parser.addAttributeFilter("contenteditable",(t=>{yO(e)&&V(t,(e=>{e.attr(hO,e.attr("contenteditable")),e.attr("contenteditable","false")}))})),e.serializer.addAttributeFilter(hO,(t=>{yO(e)&&V(t,(e=>{e.attr("contenteditable",e.attr(hO))}))})),e.serializer.addTempAttr(hO)},wO=["copy"],xO=Pt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," ");class EO{static isNative(e){return!!xO[e.toLowerCase()]}constructor(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||L}fire(e,t){return this.dispatch(e,t)}dispatch(e,t){const n=e.toLowerCase(),o=_a(n,null!=t?t:{},this.scope);this.settings.beforeFire&&this.settings.beforeFire(o);const r=this.bindings[n];if(r)for(let e=0,t=r.length;e<t;e++){const t=r[e];if(!t.removed){if(t.once&&this.off(n,t.func),o.isImmediatePropagationStopped())return o;if(!1===t.func.call(this.scope,o))return o.preventDefault(),o}}return o}on(e,t,n,o){if(!1===t&&(t=L),t){const r={func:t,removed:!1};o&&Pt.extend(r,o);const s=e.toLowerCase().split(" ");let a=s.length;for(;a--;){const e=s[a];let t=this.bindings[e];t||(t=[],this.toggleEvent(e,!0)),t=n?[r,...t]:[...t,r],this.bindings[e]=t}}return this}off(e,t){if(e){const n=e.toLowerCase().split(" ");let o=n.length;for(;o--;){const r=n[o];let s=this.bindings[r];if(!r)return ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1),delete this.bindings[t]})),this;if(s){if(t){const e=K(s,(e=>e.func===t));s=e.fail,this.bindings[r]=s,V(e.pass,(e=>{e.removed=!0}))}else s.length=0;s.length||(this.toggleEvent(e,!1),delete this.bindings[r])}}}else ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1)})),this.bindings={};return this}once(e,t,n){return this.on(e,t,n,{once:!0})}has(e){e=e.toLowerCase();const t=this.bindings[e];return!(!t||0===t.length)}}const _O=e=>(e._eventDispatcher||(e._eventDispatcher=new EO({scope:e,toggleEvent:(t,n)=>{EO.isNative(t)&&e.toggleNativeEvent&&e.toggleNativeEvent(t,n)}})),e._eventDispatcher),kO={fire(e,t,n){return this.dispatch(e,t,n)},dispatch(e,t,n){const o=this;if(o.removed&&"remove"!==e&&"detach"!==e)return _a(e.toLowerCase(),null!=t?t:{},o);const r=_O(o).dispatch(e,t);if(!1!==n&&o.parent){let t=o.parent();for(;t&&!r.isPropagationStopped();)t.dispatch(e,r,!1),t=t.parent?t.parent():void 0}return r},on(e,t,n){return _O(this).on(e,t,n)},off(e,t){return _O(this).off(e,t)},once(e,t){return _O(this).once(e,t)},hasEventListeners(e){return _O(this).has(e)}},SO=za.DOM;let NO;const RO=(e,t)=>{if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^(?:mouse|touch|click|contextmenu|drop|dragover|dragend)/.test(t))return e.getDoc().documentElement;const n=fd(e);return n?(e.eventRoot||(e.eventRoot=SO.select(n)[0]),e.eventRoot):e.getBody()},AO=(e,t,n)=>{(e=>!e.hidden&&!yO(e))(e)?e.dispatch(t,n):yO(e)&&((e,t)=>{if((e=>"click"===e.type)(t)&&!af.metaKeyPressed(t)){const n=yn(t.target);((e,t)=>no(t,"a",(t=>_n(t,yn(e.getBody())))).bind((e=>tn(e,"href"))))(e,n).each((n=>{if(t.preventDefault(),/^#/.test(n)){const t=e.dom.select(`${n},[name="${ze(n,"#")}"]`);t.length&&e.selection.scrollIntoView(t[0],!0)}else window.open(n,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))}else(e=>H(wO,e.type))(t)&&e.dispatch(t.type,t)})(e,n)},TO=(e,t)=>{if(e.delegates||(e.delegates={}),e.delegates[t]||e.removed)return;const n=RO(e,t);if(fd(e)){if(NO||(NO={},e.editorManager.on("removeEditor",(()=>{e.editorManager.activeEditor||NO&&(ge(NO,((t,n)=>{e.dom.unbind(RO(e,n))})),NO=null)}))),NO[t])return;const o=n=>{const o=n.target,r=e.editorManager.get();let s=r.length;for(;s--;){const e=r[s].getBody();(e===o||SO.isChildOf(o,e))&&AO(r[s],t,n)}};NO[t]=o,SO.bind(n,t,o)}else{const o=n=>{AO(e,t,n)};SO.bind(n,t,o),e.delegates[t]=o}},OO={...kO,bindPendingEventDelegates(){const e=this;Pt.each(e._pendingNativeEvents,(t=>{TO(e,t)}))},toggleNativeEvent(e,t){const n=this;"focus"!==e&&"blur"!==e&&(n.removed||(t?n.initialized?TO(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&n.delegates&&(n.dom.unbind(RO(n,e),e,n.delegates[e]),delete n.delegates[e])))},unbindAllNativeEvents(){const e=this,t=e.getBody(),n=e.dom;e.delegates&&(ge(e.delegates,((t,n)=>{e.dom.unbind(RO(e,n),n,t)})),delete e.delegates),!e.inline&&t&&n&&(t.onload=null,n.unbind(e.getWin()),n.unbind(e.getDoc())),n&&(n.unbind(t),n.unbind(e.getContainer()))}},BO=e=>m(e)?{value:e.split(/[ ,]/),valid:!0}:E(e,m)?{value:e,valid:!0}:{valid:!1,message:"The value must be a string[] or a comma/space separated string."},PO=(e,t)=>e+(Ge(t.message)?"":`. ${t.message}`),DO=e=>e.valid,LO=(e,t,n="")=>{const o=t(e);return b(o)?o?{value:e,valid:!0}:{valid:!1,message:n}:o},MO=["design","readonly"],IO=(e,t,n,o)=>{const r=n[t.get()],s=n[o];try{s.activate()}catch(e){return void console.error(`problem while activating editor mode ${o}:`,e)}r.deactivate(),r.editorReadOnly!==s.editorReadOnly&&((e,t)=>{const n=yn(e.getBody());((e,t,n)=>{gn(e,t)&&!n?fn(e,t):n&&un(e,t)})(n,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),(e=>{I.from(e.selection.getNode()).each((e=>{e.removeAttribute("data-mce-selected")}))})(e),e.readonly=!0,vO(n,!1),V(Uo(n,'*[contenteditable="true"]'),(e=>{Jt(e,hO,"true"),vO(e,!1)}))):(e.readonly=!1,e.hasEditableRoot()&&vO(n,!0),V(Uo(n,`*[${hO}="true"]`),(e=>{on(e,hO),vO(e,!0)})),bO(e,"StyleWithCSS",!1),bO(e,"enableInlineTableEditing",!1),bO(e,"enableObjectResizing",!1),Ag(e)&&e.focus(),(e=>{e.selection.setRng(e.selection.getRng())})(e),e.nodeChanged())})(e,s.editorReadOnly),t.set(o),((e,t)=>{e.dispatch("SwitchMode",{mode:t})})(e,o)},FO=Pt.each,UO=Pt.explode,zO={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},jO=Pt.makeMap("alt,ctrl,shift,meta,access"),HO=e=>{const t={},n=At.os.isMacOS()||At.os.isiOS();FO(UO(e.toLowerCase(),"+"),(e=>{(e=>e in jO)(e)?t[e]=!0:/^[0-9]{2,}$/.test(e)?t.keyCode=parseInt(e,10):(t.charCode=e.charCodeAt(0),t.keyCode=zO[e]||e.toUpperCase().charCodeAt(0))}));const o=[t.keyCode];let r;for(r in jO)t[r]?o.push(r):t[r]=!1;return t.id=o.join(","),t.access&&(t.alt=!0,n?t.ctrl=!0:t.shift=!0),t.meta&&(n?t.meta=!0:(t.ctrl=!0,t.meta=!1)),t};class $O{constructor(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;const t=this;e.on("keyup keypress keydown",(e=>{!t.hasModifier(e)&&!t.isFunctionKey(e)||e.isDefaultPrevented()||(FO(t.shortcuts,(n=>{t.matchShortcut(e,n)&&(t.pendingPatterns=n.subpatterns.slice(0),"keydown"===e.type&&t.executeShortcutAction(n))})),t.matchShortcut(e,t.pendingPatterns[0])&&(1===t.pendingPatterns.length&&"keydown"===e.type&&t.executeShortcutAction(t.pendingPatterns[0]),t.pendingPatterns.shift()))}))}add(e,t,n,o){const r=this,s=r.normalizeCommandFunc(n);return FO(UO(Pt.trim(e)),(e=>{const n=r.createShortcut(e,t,s,o);r.shortcuts[n.id]=n})),!0}remove(e){const t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)}normalizeCommandFunc(e){const t=this,n=e;return"string"==typeof n?()=>{t.editor.execCommand(n,!1,null)}:Pt.isArray(n)?()=>{t.editor.execCommand(n[0],n[1],n[2])}:n}createShortcut(e,t,n,o){const r=Pt.map(UO(e,">"),HO);return r[r.length-1]=Pt.extend(r[r.length-1],{func:n,scope:o||this.editor}),Pt.extend(r[0],{desc:this.editor.translate(t),subpatterns:r.slice(1)})}hasModifier(e){return e.altKey||e.ctrlKey||e.metaKey}isFunctionKey(e){return"keydown"===e.type&&e.keyCode>=112&&e.keyCode<=123}matchShortcut(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)}executeShortcutAction(e){return e.func?e.func.call(e.scope):null}}const qO=()=>{const e=(()=>{const e={},t={},n={},o={},r={},s={},a={},i={},l=(e,t)=>(n,o)=>{e[n.toLowerCase()]={...o,type:t}};return{addButton:l(e,"button"),addGroupToolbarButton:l(e,"grouptoolbarbutton"),addToggleButton:l(e,"togglebutton"),addMenuButton:l(e,"menubutton"),addSplitButton:l(e,"splitbutton"),addMenuItem:l(t,"menuitem"),addNestedMenuItem:l(t,"nestedmenuitem"),addToggleMenuItem:l(t,"togglemenuitem"),addAutocompleter:l(n,"autocompleter"),addContextMenu:l(r,"contextmenu"),addContextToolbar:l(s,"contexttoolbar"),addContextForm:l(s,"contextform"),addSidebar:l(a,"sidebar"),addView:l(i,"views"),addIcon:(e,t)=>o[e.toLowerCase()]=t,getAll:()=>({buttons:e,menuItems:t,icons:o,popups:n,contextMenus:r,contextToolbars:s,sidebars:a,views:i})}})();return{addAutocompleter:e.addAutocompleter,addButton:e.addButton,addContextForm:e.addContextForm,addContextMenu:e.addContextMenu,addContextToolbar:e.addContextToolbar,addIcon:e.addIcon,addMenuButton:e.addMenuButton,addMenuItem:e.addMenuItem,addNestedMenuItem:e.addNestedMenuItem,addSidebar:e.addSidebar,addSplitButton:e.addSplitButton,addToggleButton:e.addToggleButton,addGroupToolbarButton:e.addGroupToolbarButton,addToggleMenuItem:e.addToggleMenuItem,addView:e.addView,getAll:e.getAll}},VO=za.DOM,WO=Pt.extend,KO=Pt.each;class YO{constructor(e,t,n){this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.composing=!1,this.destroyed=!1,this.hasHiddenInput=!1,this.iframeElement=null,this.initialized=!1,this.readonly=!1,this.removed=!1,this.startContent="",this._pendingNativeEvents=[],this._skinLoaded=!1,this._editableRoot=!0,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,WO(this,OO);const o=this;this.id=e,this.hidden=!1;const r=((e,t)=>JT(VT||WT,VT,t,e,t))(n.defaultOptions,t);this.options=((e,t)=>{const n={},o={},r=(e,t,n)=>{const r=LO(t,n);return DO(r)?(o[e]=r.value,!0):(console.warn(PO(`Invalid value passed for the ${e} option`,r)),!1)},s=e=>Ee(n,e);return{register:(e,s)=>{const a=(e=>m(e.processor))(s)?(e=>{const t=(()=>{switch(e){case"array":return p;case"boolean":return b;case"function":return w;case"number":return x;case"object":return f;case"string":return m;case"string[]":return BO;case"object[]":return e=>E(e,f);case"regexp":return e=>u(e,RegExp);default:return M}})();return n=>LO(n,t,`The value must be a ${e}.`)})(s.processor):s.processor,i=((e,t,n)=>{if(!v(t)){const o=LO(t,n);if(DO(o))return o.value;console.error(PO(`Invalid default value passed for the "${e}" option`,o))}})(e,s.default,a);n[e]={...s,default:i,processor:a},xe(o,e).orThunk((()=>xe(t,e))).each((t=>r(e,t,a)))},isRegistered:s,get:e=>xe(o,e).orThunk((()=>xe(n,e).map((e=>e.default)))).getOrUndefined(),set:(e,t)=>{if(s(e)){const o=n[e];return o.immutable?(console.error(`"${e}" is an immutable option and cannot be updated`),!1):r(e,t,o.processor)}return console.warn(`"${e}" is not a registered option. Ensure the option has been registered before setting a value.`),!1},unset:e=>{const t=s(e);return t&&delete o[e],t},isSet:e=>Ee(o,e)}})(0,r),(e=>{const t=e.options.register;t("id",{processor:"string",default:e.id}),t("selector",{processor:"string"}),t("target",{processor:"object"}),t("suffix",{processor:"string"}),t("cache_suffix",{processor:"string"}),t("base_url",{processor:"string"}),t("referrer_policy",{processor:"string",default:""}),t("language_load",{processor:"boolean",default:!0}),t("inline",{processor:"boolean",default:!1}),t("iframe_attrs",{processor:"object",default:{}}),t("doctype",{processor:"string",default:"<!DOCTYPE html>"}),t("document_base_url",{processor:"string",default:e.documentBaseUrl}),t("body_id",{processor:Al(e,"tinymce"),default:"tinymce"}),t("body_class",{processor:Al(e),default:""}),t("content_security_policy",{processor:"string",default:""}),t("br_in_pre",{processor:"boolean",default:!0}),t("forced_root_block",{processor:e=>{const t=m(e)&&Ye(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be a non-empty string."}},default:"p"}),t("forced_root_block_attrs",{processor:"object",default:{}}),t("newline_behavior",{processor:e=>{const t=H(["block","linebreak","invert","default"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: block, linebreak, invert or default."}},default:"default"}),t("br_newline_selector",{processor:"string",default:".mce-toc h2,figcaption,caption"}),t("no_newline_selector",{processor:"string",default:""}),t("keep_styles",{processor:"boolean",default:!0}),t("end_container_on_empty_block",{processor:e=>b(e)||m(e)?{valid:!0,value:e}:{valid:!1,message:"Must be boolean or a string"},default:"blockquote"}),t("font_size_style_values",{processor:"string",default:"xx-small,x-small,small,medium,large,x-large,xx-large"}),t("font_size_legacy_values",{processor:"string",default:"xx-small,small,medium,large,x-large,xx-large,300%"}),t("font_size_classes",{processor:"string",default:""}),t("automatic_uploads",{processor:"boolean",default:!0}),t("images_reuse_filename",{processor:"boolean",default:!1}),t("images_replace_blob_uris",{processor:"boolean",default:!0}),t("icons",{processor:"string",default:""}),t("icons_url",{processor:"string",default:""}),t("images_upload_url",{processor:"string",default:""}),t("images_upload_base_path",{processor:"string",default:""}),t("images_upload_credentials",{processor:"boolean",default:!1}),t("images_upload_handler",{processor:"function"}),t("language",{processor:"string",default:"en"}),t("language_url",{processor:"string",default:""}),t("entity_encoding",{processor:"string",default:"named"}),t("indent",{processor:"boolean",default:!0}),t("indent_before",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_after",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_use_margin",{processor:"boolean",default:!1}),t("indentation",{processor:"string",default:"40px"}),t("content_css",{processor:e=>{const t=!1===e||m(e)||E(e,m);return t?m(e)?{value:q(e.split(","),Ve),valid:t}:p(e)?{value:e,valid:t}:!1===e?{value:[],valid:t}:{value:e,valid:t}:{valid:!1,message:"Must be false, a string or an array of strings."}},default:kd(e)?[]:["default"]}),t("content_style",{processor:"string"}),t("content_css_cors",{processor:"boolean",default:!1}),t("font_css",{processor:e=>{const t=m(e)||E(e,m);return t?{value:p(e)?e:q(e.split(","),Ve),valid:t}:{valid:!1,message:"Must be a string or an array of strings."}},default:[]}),t("inline_boundaries",{processor:"boolean",default:!0}),t("inline_boundaries_selector",{processor:"string",default:"a[href],code,span.mce-annotation"}),t("object_resizing",{processor:e=>{const t=b(e)||m(e);return t?!1===e||El.isiPhone()||El.isiPad()?{value:"",valid:t}:{value:!0===e?"table,img,figure.image,div,video,iframe":e,valid:t}:{valid:!1,message:"Must be boolean or a string"}},default:!_l}),t("resize_img_proportional",{processor:"boolean",default:!0}),t("event_root",{processor:"object"}),t("service_message",{processor:"string"}),t("theme",{processor:e=>!1===e||m(e)||w(e),default:"silver"}),t("theme_url",{processor:"string"}),t("formats",{processor:"object"}),t("format_empty_lines",{processor:"boolean",default:!1}),t("format_noneditable_selector",{processor:"string",default:""}),t("preview_styles",{processor:e=>{const t=!1===e||m(e);return t?{value:!1===e?"":e,valid:t}:{valid:!1,message:"Must be false or a string"}},default:"font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"}),t("custom_ui_selector",{processor:"string",default:""}),t("hidden_input",{processor:"boolean",default:!0}),t("submit_patch",{processor:"boolean",default:!0}),t("encoding",{processor:"string"}),t("add_form_submit_trigger",{processor:"boolean",default:!0}),t("add_unload_trigger",{processor:"boolean",default:!0}),t("custom_undo_redo_levels",{processor:"number",default:0}),t("disable_nodechange",{processor:"boolean",default:!1}),t("readonly",{processor:"boolean",default:!1}),t("editable_root",{processor:"boolean",default:!0}),t("plugins",{processor:"string[]",default:[]}),t("external_plugins",{processor:"object"}),t("forced_plugins",{processor:"string[]"}),t("model",{processor:"string",default:e.hasPlugin("rtc")?"plugin":"dom"}),t("model_url",{processor:"string"}),t("block_unsupported_drop",{processor:"boolean",default:!0}),t("visual",{processor:"boolean",default:!0}),t("visual_table_class",{processor:"string",default:"mce-item-table"}),t("visual_anchor_class",{processor:"string",default:"mce-item-anchor"}),t("iframe_aria_text",{processor:"string",default:"Rich Text Area. Press ALT-0 for help."}),t("setup",{processor:"function"}),t("init_instance_callback",{processor:"function"}),t("url_converter",{processor:"function",default:e.convertURL}),t("url_converter_scope",{processor:"object",default:e}),t("urlconverter_callback",{processor:"function"}),t("allow_conditional_comments",{processor:"boolean",default:!1}),t("allow_html_data_urls",{processor:"boolean",default:!1}),t("allow_svg_data_urls",{processor:"boolean"}),t("allow_html_in_named_anchor",{processor:"boolean",default:!1}),t("allow_script_urls",{processor:"boolean",default:!1}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("convert_fonts_to_spans",{processor:"boolean",default:!0,deprecated:!0}),t("fix_list_elements",{processor:"boolean",default:!1}),t("preserve_cdata",{processor:"boolean",default:!1}),t("remove_trailing_brs",{processor:"boolean",default:!0}),t("pad_empty_with_br",{processor:"boolean",default:!1}),t("inline_styles",{processor:"boolean",default:!0,deprecated:!0}),t("element_format",{processor:"string",default:"html"}),t("entities",{processor:"string"}),t("schema",{processor:"string",default:"html5"}),t("convert_urls",{processor:"boolean",default:!0}),t("relative_urls",{processor:"boolean",default:!0}),t("remove_script_host",{processor:"boolean",default:!0}),t("custom_elements",{processor:"string"}),t("extended_valid_elements",{processor:"string"}),t("invalid_elements",{processor:"string"}),t("invalid_styles",{processor:Rl}),t("valid_children",{processor:"string"}),t("valid_classes",{processor:Rl}),t("valid_elements",{processor:"string"}),t("valid_styles",{processor:Rl}),t("verify_html",{processor:"boolean",default:!0}),t("auto_focus",{processor:e=>m(e)||!0===e}),t("browser_spellcheck",{processor:"boolean",default:!1}),t("protect",{processor:"array"}),t("images_file_types",{processor:"string",default:"jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp"}),t("deprecation_warnings",{processor:"boolean",default:!0}),t("a11y_advanced_options",{processor:"boolean",default:!1}),t("api_key",{processor:"string"}),t("paste_block_drop",{processor:"boolean",default:!1}),t("paste_data_images",{processor:"boolean",default:!0}),t("paste_preprocess",{processor:"function"}),t("paste_postprocess",{processor:"function"}),t("paste_webkit_styles",{processor:"string",default:"none"}),t("paste_remove_styles_if_webkit",{processor:"boolean",default:!0}),t("paste_merge_formats",{processor:"boolean",default:!0}),t("smart_paste",{processor:"boolean",default:!0}),t("paste_as_text",{processor:"boolean",default:!1}),t("paste_tab_spaces",{processor:"number",default:4}),t("text_patterns",{processor:e=>E(e,f)||!1===e?{value:xl(!1===e?[]:e),valid:!0}:{valid:!1,message:"Must be an array of objects or false."},default:[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}]}),t("text_patterns_lookup",{processor:e=>{return w(e)?{value:(t=e,e=>{const n=t(e);return xl(n)}),valid:!0}:{valid:!1,message:"Must be a single function"};var t},default:e=>[]}),t("noneditable_class",{processor:"string",default:"mceNonEditable"}),t("editable_class",{processor:"string",default:"mceEditable"}),t("noneditable_regexp",{processor:e=>E(e,Sl)?{value:e,valid:!0}:Sl(e)?{value:[e],valid:!0}:{valid:!1,message:"Must be a RegExp or an array of RegExp."},default:[]}),t("table_tab_navigation",{processor:"boolean",default:!0}),t("highlight_on_focus",{processor:"boolean",default:!1}),t("xss_sanitization",{processor:"boolean",default:!0}),t("details_initial_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("details_serialized_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("init_content_sync",{processor:"boolean",default:!1}),t("newdocument_content",{processor:"string",default:""}),t("force_hex_color",{processor:e=>{const t=["always","rgb_only","off"],n=H(t,e);return n?{value:e,valid:n}:{valid:!1,message:`Must be one of: ${t.join(", ")}.`}},default:"off"}),t("sandbox_iframes",{processor:"boolean",default:!1}),t("convert_unsafe_embeds",{processor:"boolean",default:!1}),e.on("ScriptsLoaded",(()=>{t("directionality",{processor:"string",default:Ka.isRtl()?"rtl":void 0}),t("placeholder",{processor:"string",default:kl.getAttrib(e.getElement(),"placeholder")})}))})(o);const s=this.options.get;s("deprecation_warnings")&&((e,t)=>{((e,t)=>{const n=gw(e),o=bw(t),r=o.length>0,s=n.length>0,a="mobile"===t.theme;if(r||s||a){const e="\n- ",t=a?`\n\nThemes:${e}mobile`:"",i=r?`\n\nPlugins:${e}${o.join(e)}`:"",l=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled and have been removed in TinyMCE 6.0. These features will no longer work and should be removed from the TinyMCE configuration. See https://www.tiny.cloud/docs/tinymce/6/migration-from-5x/ for more information."+t+i+l)}})(e,t),((e,t)=>{const n=pw(e),o=vw(t),r=o.length>0,s=n.length>0;if(r||s){const e="\n- ",t=r?`\n\nPlugins:${e}${o.map(yw).join(e)}`:"",a=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled but will be removed soon."+t+a)}})(e,t)})(t,r);const a=s("suffix");a&&(n.suffix=a),this.suffix=n.suffix;const i=s("base_url");i&&n._setBaseUrl(i),this.baseUri=n.baseURI;const l=ed(o);l&&(Ha.ScriptLoader._setReferrerPolicy(l),za.DOM.styleSheetLoader._setReferrerPolicy(l));const d=Dd(o);C(d)&&za.DOM.styleSheetLoader._setContentCssCors(d),Ya.languageLoad=s("language_load"),Ya.baseURL=n.baseURL,this.setDirty(!1),this.documentBaseURI=new oC(Bl(o),{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=kd(o),this.hasVisual=Fd(o),this.shortcuts=new $O(this),this.editorCommands=new pO(this),mO(this);const c=s("cache_suffix");c&&(At.cacheSuffix=c.replace(/^[\?\&]+/,"")),this.ui={registry:qO(),styleSheetLoader:void 0,show:_,hide:_,setEnabled:_,isEnabled:M},this.mode=(e=>{const t=$a("design"),n=$a({design:{activate:_,deactivate:_,editorReadOnly:!1},readonly:{activate:_,deactivate:_,editorReadOnly:!0}});return(e=>{e.serializer?CO(e):e.on("PreInit",(()=>{CO(e)}))})(e),(e=>{e.on("ShowCaret",(t=>{yO(e)&&t.preventDefault()})),e.on("ObjectSelected",(t=>{yO(e)&&t.preventDefault()}))})(e),{isReadOnly:()=>yO(e),set:o=>((e,t,n,o)=>{if(o!==n.get()){if(!Ee(t,o))throw new Error(`Editor mode '${o}' is invalid`);e.initialized?IO(e,n,t,o):e.on("init",(()=>IO(e,n,t,o)))}})(e,n.get(),t,o),get:()=>t.get(),register:(e,t)=>{n.set(((e,t,n)=>{if(H(MO,t))throw new Error(`Cannot override default mode ${t}`);return{...e,[t]:{...n,deactivate:()=>{try{n.deactivate()}catch(e){console.error(`problem while deactivating editor mode ${t}:`,e)}}}}})(n.get(),e,t))}}})(o),n.dispatch("SetupEditor",{editor:this});const g=Hd(o);w(g)&&g.call(o,o)}render(){(e=>{const t=e.id;Ka.setCode(td(e));const n=()=>{zT.unbind(window,"ready",n),e.render()};if(!Ta.Event.domLoaded)return void zT.bind(window,"ready",n);if(!e.getElement())return;const o=yn(e.getElement()),r=rn(o);e.on("remove",(()=>{W(o.dom.attributes,(e=>on(o,e.name))),Zt(o,r)})),e.ui.styleSheetLoader=((e,t)=>Is.forElement(e,{contentCssCors:Dd(t),referrerPolicy:ed(t)}))(o,e),kd(e)?e.inline=!0:(e.orgVisibility=e.getElement().style.visibility,e.getElement().style.visibility="hidden");const s=e.getElement().form||zT.getParent(t,"form");s&&(e.formElement=s,Sd(e)&&!Zo(e.getElement())&&(zT.insertAfter(zT.create("input",{type:"hidden",name:t}),t),e.hasHiddenInput=!0),e.formEventDelegate=t=>{e.dispatch(t.type,t)},zT.bind(s,"submit reset",e.formEventDelegate),e.on("reset",(()=>{e.resetContent()})),!Nd(e)||s.submit.nodeType||s.submit.length||s._mceOldSubmit||(s._mceOldSubmit=s.submit,s.submit=()=>(e.editorManager.triggerSave(),e.setDirty(!1),s._mceOldSubmit(s)))),e.windowManager=Pw(e),e.notificationManager=Tw(e),(e=>"xml"===e.options.get("encoding"))(e)&&e.on("GetContent",(e=>{e.save&&(e.content=zT.encode(e.content))})),Rd(e)&&e.on("submit",(()=>{e.initialized&&e.save()})),Ad(e)&&(e._beforeUnload=()=>{!e.initialized||e.destroyed||e.isHidden()||e.save({format:"raw",no_events:!0,set_dirty:!1})},e.editorManager.on("BeforeUnload",e._beforeUnload)),e.editorManager.add(e),$T(e,e.suffix)})(this)}focus(e){this.execCommand("mceFocus",!1,e)}hasFocus(){return Rg(this)}translate(e){return Ka.translate(e)}getParam(e,t,n){const o=this.options;return o.isRegistered(e)||(C(n)?o.register(e,{processor:n,default:t}):o.register(e,{processor:M,default:t})),o.isSet(e)||v(t)?o.get(e):t}hasPlugin(e,t){return!(!H(Ld(this),e)||t&&void 0===Ow.get(e))}nodeChanged(e){this._nodeChangeDispatcher.nodeChanged(e)}addCommand(e,t,n){this.editorCommands.addCommand(e,t,n)}addQueryStateHandler(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)}addQueryValueHandler(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)}addShortcut(e,t,n,o){this.shortcuts.add(e,t,n,o)}execCommand(e,t,n,o){return this.editorCommands.execCommand(e,t,n,o)}queryCommandState(e){return this.editorCommands.queryCommandState(e)}queryCommandValue(e){return this.editorCommands.queryCommandValue(e)}queryCommandSupported(e){return this.editorCommands.queryCommandSupported(e)}show(){const e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable="true":(VO.show(e.getContainer()),VO.hide(e.id)),e.load(),e.dispatch("show"))}hide(){const e=this;e.hidden||(e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(VO.hide(e.getContainer()),VO.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.dispatch("hide"))}isHidden(){return this.hidden}setProgressState(e,t){this.dispatch("ProgressState",{state:e,time:t})}load(e={}){const t=this,n=t.getElement();if(t.removed)return"";if(n){const o={...e,load:!0},r=Zo(n)?n.value:n.innerHTML,s=t.setContent(r,o);return o.no_events||t.dispatch("LoadContent",{...o,element:n}),s}return""}save(e={}){const t=this;let n=t.getElement();if(!n||!t.initialized||t.removed)return"";const o={...e,save:!0,element:n};let r=t.getContent(o);const s={...o,content:r};if(s.no_events||t.dispatch("SaveContent",s),"raw"===s.format&&t.dispatch("RawSaveContent",s),r=s.content,Zo(n))n.value=r;else{!e.is_removing&&t.inline||(n.innerHTML=r);const o=VO.getParent(t.id,"form");o&&KO(o.elements,(e=>e.name!==t.id||(e.value=r,!1)))}return s.element=o.element=n=null,!1!==s.set_dirty&&t.setDirty(!1),r}setContent(e,t){return lw(this,e,t)}getContent(e){return((e,t={})=>{const n=((e,t)=>({...e,format:t,get:!0,getInner:!0}))(t,t.format?t.format:"html");return yC(e,n).fold(R,(t=>{const n=((e,t)=>QC(e).editor.getContent(t))(e,t);return CC(e,n,t)}))})(this,e)}insertContent(e,t){t&&(e=WO({content:e},t)),this.execCommand("mceInsertContent",!1,e)}resetContent(e){void 0===e?lw(this,this.startContent,{format:"raw"}):lw(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()}isDirty(){return!this.isNotDirty}setDirty(e){const t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.dispatch("dirty")}getContainer(){const e=this;return e.container||(e.container=e.editorContainer||VO.get(e.id+"_parent")),e.container}getContentAreaContainer(){return this.contentAreaContainer}getElement(){return this.targetElm||(this.targetElm=VO.get(this.id)),this.targetElm}getWin(){const e=this;if(!e.contentWindow){const t=e.iframeElement;t&&(e.contentWindow=t.contentWindow)}return e.contentWindow}getDoc(){const e=this;if(!e.contentDocument){const t=e.getWin();t&&(e.contentDocument=t.document)}return e.contentDocument}getBody(){var e,t;const n=this.getDoc();return null!==(t=null!==(e=this.bodyElement)&&void 0!==e?e:null==n?void 0:n.body)&&void 0!==t?t:null}convertURL(e,t,n){const o=this,r=o.options.get,s=qd(o);if(w(s))return s.call(o,e,n,!0,t);if(!r("convert_urls")||"link"===n||f(n)&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length)return e;const a=new oC(e);return"http"!==a.protocol&&"https"!==a.protocol&&""!==a.protocol?e:r("relative_urls")?o.documentBaseURI.toRelative(e):e=o.documentBaseURI.toAbsolute(e,r("remove_script_host"))}addVisual(e){((e,t)=>{((e,t)=>{JC(e).editor.addVisual(t)})(e,t)})(this,e)}setEditableRoot(e){((e,t)=>{e._editableRoot!==t&&(e._editableRoot=t,e.readonly||(e.getBody().contentEditable=String(e.hasEditableRoot()),e.nodeChanged()),((e,t)=>{e.dispatch("EditableRootStateChange",{state:t})})(e,t))})(this,e)}hasEditableRoot(){return this._editableRoot}remove(){(e=>{if(!e.removed){const{_selectionOverrides:t,editorUpload:n}=e,o=e.getBody(),r=e.getElement();o&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&C(null==r?void 0:r.nextSibling)&&Cw.remove(r.nextSibling),(e=>{e.dispatch("remove")})(e),e.editorManager.remove(e),!e.inline&&o&&(e=>{Cw.setStyle(e.id,"display",e.orgDisplay)})(e),(e=>{e.dispatch("detach")})(e),Cw.remove(e.getContainer()),ww(t),ww(n),e.destroy()}})(this)}destroy(e){((e,t)=>{const{selection:n,dom:o}=e;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),ww(n),ww(o)),(e=>{const t=e.formElement;t&&(t._mceOldSubmit&&(t.submit=t._mceOldSubmit,delete t._mceOldSubmit),Cw.unbind(t,"submit reset",e.formEventDelegate))})(e),(e=>{const t=e;t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null;const n=e.selection;if(n){const e=n.dom;t.selection=n.win=n.dom=e.doc=null}})(e),e.destroyed=!0):e.remove())})(this,e)}uploadImages(){return this.editorUpload.uploadImages()}_scanForImages(){return this.editorUpload.scanForImages()}}const GO=za.DOM,XO=Pt.each;let QO,JO=!1,ZO=[];const eB=e=>{const t=e.type;XO(rB.get(),(n=>{switch(t){case"scroll":n.dispatch("ScrollWindow",e);break;case"resize":n.dispatch("ResizeWindow",e)}}))},tB=e=>{if(e!==JO){const t=za.DOM;e?(t.bind(window,"resize",eB),t.bind(window,"scroll",eB)):(t.unbind(window,"resize",eB),t.unbind(window,"scroll",eB)),JO=e}},nB=e=>{const t=ZO;return ZO=Y(ZO,(t=>e!==t)),rB.activeEditor===e&&(rB.activeEditor=ZO.length>0?ZO[0]:null),rB.focusedEditor===e&&(rB.focusedEditor=null),t.length!==ZO.length},oB="CSS1Compat"!==document.compatMode,rB={...kO,baseURI:null,baseURL:null,defaultOptions:{},documentBaseURL:null,suffix:null,majorVersion:"6",minorVersion:"8.3",releaseDate:"2024-02-08",i18n:Ka,activeEditor:null,focusedEditor:null,setup(){const e=this;let t="",n="",o=oC.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(o)&&(o=o.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(o)||(o+="/"));const r=window.tinymce||window.tinyMCEPreInit;if(r)t=r.base||r.baseURL,n=r.suffix;else{const e=document.getElementsByTagName("script");for(let o=0;o<e.length;o++){const r=e[o].src||"";if(""===r)continue;const s=r.substring(r.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(r)){-1!==s.indexOf(".min")&&(n=".min"),t=r.substring(0,r.lastIndexOf("/"));break}}if(!t&&document.currentScript){const e=document.currentScript.src;-1!==e.indexOf(".min")&&(n=".min"),t=e.substring(0,e.lastIndexOf("/"))}}var s;e.baseURL=new oC(o).toAbsolute(t),e.documentBaseURL=o,e.baseURI=new oC(e.baseURL),e.suffix=n,(s=e).on("AddEditor",T(_g,s)),s.on("RemoveEditor",T(kg,s))},overrideDefaults(e){const t=e.base_url;t&&this._setBaseUrl(t);const n=e.suffix;n&&(this.suffix=n),this.defaultOptions=e;const o=e.plugin_base_urls;void 0!==o&&ge(o,((e,t)=>{Ya.PluginManager.urls[t]=e}))},init(e){const t=this;let n;const o=Pt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," ");let r=e=>{n=e};const s=()=>{let n=0;const a=[];let i;GO.unbind(window,"ready",s),(n=>{const o=e.onpageload;o&&o.apply(t,[])})(),i=((e,t)=>{const n=[],o=w(t)?e=>$(n,(n=>t(n,e))):e=>H(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n})((e=>At.browser.isIE()||At.browser.isEdge()?(Fw("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tiny.cloud/docs/tinymce/6/support/#supportedwebbrowsers"),[]):oB?(Fw("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[]):m(e.selector)?GO.select(e.selector):C(e.target)?[e.target]:[])(e)),Pt.each(i,(e=>{var n;(n=t.get(e.id))&&n.initialized&&!(n.getContainer()||n.getBody()).parentNode&&(nB(n),n.unbindAllNativeEvents(),n.destroy(!0),n.removed=!0)})),i=Pt.grep(i,(e=>!t.get(e.id))),0===i.length?r([]):XO(i,(s=>{((e,t)=>e.inline&&t.tagName.toLowerCase()in o)(e,s)?Fw("Could not initialize inline editor on invalid inline target element",s):((e,o,s)=>{const l=new YO(e,o,t);a.push(l),l.on("init",(()=>{++n===i.length&&r(a)})),l.targetElm=l.targetElm||s,l.render()})((e=>{let t=e.id;return t||(t=xe(e,"name").filter((e=>!GO.get(e))).getOrThunk(GO.uniqueId),e.setAttribute("id",t)),t})(s),e,s)}))};return GO.bind(window,"ready",s),new Promise((e=>{n?e(n):r=t=>{e(t)}}))},get(e){return 0===arguments.length?ZO.slice(0):m(e)?J(ZO,(t=>t.id===e)).getOr(null):x(e)&&ZO[e]?ZO[e]:null},add(e){const t=this,n=t.get(e.id);return n===e||(null===n&&ZO.push(e),tB(!0),t.activeEditor=e,t.dispatch("AddEditor",{editor:e}),QO||(QO=e=>{const n=t.dispatch("BeforeUnload");if(n.returnValue)return e.preventDefault(),e.returnValue=n.returnValue,n.returnValue},window.addEventListener("beforeunload",QO))),e},createEditor(e,t){return this.add(new YO(e,t,this))},remove(e){const t=this;let n;if(e){if(!m(e))return n=e,h(t.get(n.id))?null:(nB(n)&&t.dispatch("RemoveEditor",{editor:n}),0===ZO.length&&window.removeEventListener("beforeunload",QO),n.remove(),tB(ZO.length>0),n);XO(GO.select(e),(e=>{n=t.get(e.id),n&&t.remove(n)}))}else for(let e=ZO.length-1;e>=0;e--)t.remove(ZO[e])},execCommand(e,t,n){var o;const r=this,s=f(n)?null!==(o=n.id)&&void 0!==o?o:n.index:n;switch(e){case"mceAddEditor":if(!r.get(s)){const e=n.options;new YO(s,e,r).render()}return!0;case"mceRemoveEditor":{const e=r.get(s);return e&&e.remove(),!0}case"mceToggleEditor":{const e=r.get(s);return e?(e.isHidden()?e.show():e.hide(),!0):(r.execCommand("mceAddEditor",!1,n),!0)}}return!!r.activeEditor&&r.activeEditor.execCommand(e,t,n)},triggerSave:()=>{XO(ZO,(e=>{e.save()}))},addI18n:(e,t)=>{Ka.add(e,t)},translate:e=>Ka.translate(e),setActive(e){const t=this.activeEditor;this.activeEditor!==e&&(t&&t.dispatch("deactivate",{relatedTarget:e}),e.dispatch("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl(e){this.baseURL=new oC(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new oC(this.baseURL)}};rB.setup();const sB=(()=>{const e=Xa();return{FakeClipboardItem:e=>({items:e,types:me(e),getType:t=>xe(e,t).getOrUndefined()}),write:t=>{e.set(t)},read:()=>e.get().getOrUndefined(),clear:e.clear}})(),aB=Math.min,iB=Math.max,lB=Math.round,dB=(e,t,n)=>{let o=t.x,r=t.y;const s=e.w,a=e.h,i=t.w,l=t.h,d=(n||"").split("");return"b"===d[0]&&(r+=l),"r"===d[1]&&(o+=i),"c"===d[0]&&(r+=lB(l/2)),"c"===d[1]&&(o+=lB(i/2)),"b"===d[3]&&(r-=a),"r"===d[4]&&(o-=s),"c"===d[3]&&(r-=lB(a/2)),"c"===d[4]&&(o-=lB(s/2)),cB(o,r,s,a)},cB=(e,t,n,o)=>({x:e,y:t,w:n,h:o}),uB={inflate:(e,t,n)=>cB(e.x-t,e.y-n,e.w+2*t,e.h+2*n),relativePosition:dB,findBestRelativePosition:(e,t,n,o)=>{for(let r=0;r<o.length;r++){const s=dB(e,t,o[r]);if(s.x>=n.x&&s.x+s.w<=n.w+n.x&&s.y>=n.y&&s.y+s.h<=n.h+n.y)return o[r]}return null},intersect:(e,t)=>{const n=iB(e.x,t.x),o=iB(e.y,t.y),r=aB(e.x+e.w,t.x+t.w),s=aB(e.y+e.h,t.y+t.h);return r-n<0||s-o<0?null:cB(n,o,r-n,s-o)},clamp:(e,t,n)=>{let o=e.x,r=e.y,s=e.x+e.w,a=e.y+e.h;const i=t.x+t.w,l=t.y+t.h,d=iB(0,t.x-o),c=iB(0,t.y-r),u=iB(0,s-i),m=iB(0,a-l);return o+=d,r+=c,n&&(s+=d,a+=c,o-=u,r-=m),s-=u,a-=m,cB(o,r,s-o,a-r)},create:cB,fromClientRect:e=>cB(e.left,e.top,e.width,e.height)},mB=(()=>{const e={},t={},n={};return{load:(n,o)=>{const r=`Script at URL "${o}" failed to load`,s=`Script at URL "${o}" did not call \`tinymce.Resource.add('${n}', data)\` within 1 second`;if(void 0!==e[n])return e[n];{const a=new Promise(((e,a)=>{const i=((e,t,n=1e3)=>{let o=!1,r=null;const s=e=>(...t)=>{o||(o=!0,null!==r&&(clearTimeout(r),r=null),e.apply(null,t))},a=s(e),i=s(t);return{start:(...e)=>{o||null!==r||(r=setTimeout((()=>i.apply(null,e)),n))},resolve:a,reject:i}})(e,a);t[n]=i.resolve,Ha.ScriptLoader.loadScript(o).then((()=>i.start(s)),(()=>i.reject(r)))}));return e[n]=a,a}},add:(o,r)=>{void 0!==t[o]&&(t[o](r),delete t[o]),e[o]=Promise.resolve(r),n[o]=r},has:e=>e in n,get:e=>n[e],unload:t=>{delete e[t]}}})();let fB;try{const e="__storage_test__";fB=window.localStorage,fB.setItem(e,e),fB.removeItem(e)}catch(e){fB=(()=>{let e={},t=[];const n={getItem:t=>e[t]||null,setItem:(n,o)=>{t.push(n),e[n]=String(o)},key:e=>t[e],removeItem:n=>{t=t.filter((e=>e===n)),delete e[n]},clear:()=>{t=[],e={}},length:0};return Object.defineProperty(n,"length",{get:()=>t.length,configurable:!1,enumerable:!1}),n})()}const gB={geom:{Rect:uB},util:{Delay:vg,Tools:Pt,VK:af,URI:oC,EventDispatcher:EO,Observable:kO,I18n:Ka,LocalStorage:fB,ImageUploader:e=>{const t=Hw(),n=Ww(e,t);return{upload:(t,o=!0)=>n.upload(t,o?Vw(e):void 0)}}},dom:{EventUtils:Ta,TreeWalker:jo,TextSeeker:hi,DOMUtils:za,ScriptLoader:Ha,RangeUtils:Uf,Serializer:iw,StyleSheetLoader:Ms,ControlSelection:mf,BookmarkManager:Jm,Selection:rw,Event:Ta.Event},html:{Styles:wa,Entities:ea,Node:Wg,Schema:ua,DomParser:bC,Writer:cp,Serializer:up},Env:At,AddOnManager:Ya,Annotator:Qm,Formatter:rx,UndoManager:ax,EditorCommands:pO,WindowManager:Pw,NotificationManager:Tw,EditorObservable:OO,Shortcuts:$O,Editor:YO,FocusManager:bg,EditorManager:rB,DOM:za.DOM,ScriptLoader:Ha.ScriptLoader,PluginManager:Ow,ThemeManager:Bw,ModelManager:Ew,IconManager:xw,Resource:mB,FakeClipboard:sB,trim:Pt.trim,isArray:Pt.isArray,is:Pt.is,toArray:Pt.toArray,makeMap:Pt.makeMap,each:Pt.each,map:Pt.map,grep:Pt.grep,inArray:Pt.inArray,extend:Pt.extend,walk:Pt.walk,resolve:Pt.resolve,explode:Pt.explode,_addCacheSuffix:Pt._addCacheSuffix},pB=Pt.extend(rB,gB);(e=>{window.tinymce=e,window.tinyMCE=e})(pB),(e=>{if("object"==typeof module)try{module.exports=e}catch(e){}})(pB)}();
\ No newline at end of file
+!function(){"use strict";var e=function(e){if(null===e)return"null";if(void 0===e)return"undefined";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t},t=function(e){return{eq:e}},n=t((function(e,t){return e===t})),o=function(e){return t((function(t,n){if(t.length!==n.length)return!1;for(var o=t.length,r=0;r<o;r++)if(!e.eq(t[r],n[r]))return!1;return!0}))},r=function(e){return t((function(r,s){var a=Object.keys(r),i=Object.keys(s);if(!function(e,n){return function(e,n){return t((function(t,o){return e.eq(n(t),n(o))}))}(o(e),(function(e){return function(e,t){return Array.prototype.slice.call(e).sort(t)}(e,n)}))}(n).eq(a,i))return!1;for(var l=a.length,d=0;d<l;d++){var c=a[d];if(!e.eq(r[c],s[c]))return!1}return!0}))},s=t((function(t,n){if(t===n)return!0;var a=e(t);return a===e(n)&&(function(e){return-1!==["undefined","boolean","number","string","function","xml","null"].indexOf(e)}(a)?t===n:"array"===a?o(s).eq(t,n):"object"===a&&r(s).eq(t,n))}));const a=Object.getPrototypeOf,i=(e,t,n)=>{var o;return!!n(e,t.prototype)||(null===(o=e.constructor)||void 0===o?void 0:o.name)===t.name},l=e=>t=>(e=>{const t=typeof e;return null===e?"null":"object"===t&&Array.isArray(e)?"array":"object"===t&&i(e,String,((e,t)=>t.isPrototypeOf(e)))?"string":t})(t)===e,d=e=>t=>typeof t===e,c=e=>t=>e===t,u=(e,t)=>f(e)&&i(e,t,((e,t)=>a(e)===t)),m=l("string"),f=l("object"),g=e=>u(e,Object),p=l("array"),h=c(null),b=d("boolean"),v=c(void 0),y=e=>null==e,C=e=>!y(e),w=d("function"),x=d("number"),E=(e,t)=>{if(p(e)){for(let n=0,o=e.length;n<o;++n)if(!t(e[n]))return!1;return!0}return!1},_=()=>{},k=(e,t)=>(...n)=>e(t.apply(null,n)),S=(e,t)=>n=>e(t(n)),N=e=>()=>e,R=e=>e,A=(e,t)=>e===t;function T(e,...t){return(...n)=>{const o=t.concat(n);return e.apply(null,o)}}const O=e=>t=>!e(t),B=e=>()=>{throw new Error(e)},P=e=>e(),D=e=>{e()},L=N(!1),M=N(!0);class I{constructor(e,t){this.tag=e,this.value=t}static some(e){return new I(!0,e)}static none(){return I.singletonNone}fold(e,t){return this.tag?t(this.value):e()}isSome(){return this.tag}isNone(){return!this.tag}map(e){return this.tag?I.some(e(this.value)):I.none()}bind(e){return this.tag?e(this.value):I.none()}exists(e){return this.tag&&e(this.value)}forall(e){return!this.tag||e(this.value)}filter(e){return!this.tag||e(this.value)?this:I.none()}getOr(e){return this.tag?this.value:e}or(e){return this.tag?this:e}getOrThunk(e){return this.tag?this.value:e()}orThunk(e){return this.tag?this:e()}getOrDie(e){if(this.tag)return this.value;throw new Error(null!=e?e:"Called getOrDie on None")}static from(e){return C(e)?I.some(e):I.none()}getOrNull(){return this.tag?this.value:null}getOrUndefined(){return this.value}each(e){this.tag&&e(this.value)}toArray(){return this.tag?[this.value]:[]}toString(){return this.tag?`some(${this.value})`:"none()"}}I.singletonNone=new I(!1);const F=Array.prototype.slice,U=Array.prototype.indexOf,z=Array.prototype.push,j=(e,t)=>U.call(e,t),H=(e,t)=>j(e,t)>-1,$=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return!0;return!1},q=(e,t)=>{const n=e.length,o=new Array(n);for(let r=0;r<n;r++){const n=e[r];o[r]=t(n,r)}return o},V=(e,t)=>{for(let n=0,o=e.length;n<o;n++)t(e[n],n)},W=(e,t)=>{for(let n=e.length-1;n>=0;n--)t(e[n],n)},K=(e,t)=>{const n=[],o=[];for(let r=0,s=e.length;r<s;r++){const s=e[r];(t(s,r)?n:o).push(s)}return{pass:n,fail:o}},Y=(e,t)=>{const n=[];for(let o=0,r=e.length;o<r;o++){const r=e[o];t(r,o)&&n.push(r)}return n},G=(e,t,n)=>(W(e,((e,o)=>{n=t(n,e,o)})),n),X=(e,t,n)=>(V(e,((e,o)=>{n=t(n,e,o)})),n),Q=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++){const r=e[o];if(t(r,o))return I.some(r);if(n(r,o))break}return I.none()},J=(e,t)=>Q(e,t,L),Z=(e,t)=>{for(let n=0,o=e.length;n<o;n++)if(t(e[n],n))return I.some(n);return I.none()},ee=e=>{const t=[];for(let n=0,o=e.length;n<o;++n){if(!p(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);z.apply(t,e[n])}return t},te=(e,t)=>ee(q(e,t)),ne=(e,t)=>{for(let n=0,o=e.length;n<o;++n)if(!0!==t(e[n],n))return!1;return!0},oe=e=>{const t=F.call(e,0);return t.reverse(),t},re=(e,t)=>Y(e,(e=>!H(t,e))),se=(e,t)=>{const n={};for(let o=0,r=e.length;o<r;o++){const r=e[o];n[String(r)]=t(r,o)}return n},ae=(e,t)=>{const n=F.call(e,0);return n.sort(t),n},ie=(e,t)=>t>=0&&t<e.length?I.some(e[t]):I.none(),le=e=>ie(e,0),de=e=>ie(e,e.length-1),ce=w(Array.from)?Array.from:e=>F.call(e),ue=(e,t)=>{for(let n=0;n<e.length;n++){const o=t(e[n],n);if(o.isSome())return o}return I.none()},me=Object.keys,fe=Object.hasOwnProperty,ge=(e,t)=>{const n=me(e);for(let o=0,r=n.length;o<r;o++){const r=n[o];t(e[r],r)}},pe=(e,t)=>he(e,((e,n)=>({k:n,v:t(e,n)}))),he=(e,t)=>{const n={};return ge(e,((e,o)=>{const r=t(e,o);n[r.k]=r.v})),n},be=e=>(t,n)=>{e[n]=t},ve=(e,t,n,o)=>{ge(e,((e,r)=>{(t(e,r)?n:o)(e,r)}))},ye=(e,t)=>{const n={};return ve(e,t,be(n),_),n},Ce=(e,t)=>{const n=[];return ge(e,((e,o)=>{n.push(t(e,o))})),n},we=e=>Ce(e,R),xe=(e,t)=>Ee(e,t)?I.from(e[t]):I.none(),Ee=(e,t)=>fe.call(e,t),_e=(e,t)=>Ee(e,t)&&void 0!==e[t]&&null!==e[t],ke=e=>{const t={};return V(e,(e=>{t[e]={}})),me(t)},Se=e=>void 0!==e.length,Ne=Array.isArray,Re=(e,t,n)=>{if(!e)return!1;if(n=n||e,Se(e)){for(let o=0,r=e.length;o<r;o++)if(!1===t.call(n,e[o],o,e))return!1}else for(const o in e)if(Ee(e,o)&&!1===t.call(n,e[o],o,e))return!1;return!0},Ae=(e,t)=>{const n=[];return Re(e,((o,r)=>{n.push(t(o,r,e))})),n},Te=(e,t)=>{const n=[];return Re(e,((o,r)=>{t&&!t(o,r,e)||n.push(o)})),n},Oe=(e,t,n,o)=>{let r=v(n)?e[0]:n;for(let n=0;n<e.length;n++)r=t.call(o,r,e[n],n);return r},Be=(e,t,n)=>{for(let o=0,r=e.length;o<r;o++)if(t.call(n,e[o],o,e))return o;return-1},Pe=e=>e[e.length-1],De=e=>{let t,n=!1;return(...o)=>(n||(n=!0,t=e.apply(null,o)),t)},Le=()=>Me(0,0),Me=(e,t)=>({major:e,minor:t}),Ie={nu:Me,detect:(e,t)=>{const n=String(t).toLowerCase();return 0===e.length?Le():((e,t)=>{const n=((e,t)=>{for(let n=0;n<e.length;n++){const o=e[n];if(o.test(t))return o}})(e,t);if(!n)return{major:0,minor:0};const o=e=>Number(t.replace(n,"$"+e));return Me(o(1),o(2))})(e,n)},unknown:Le},Fe=(e,t)=>{const n=String(t).toLowerCase();return J(e,(e=>e.search(n)))},Ue=(e,t,n)=>""===t||e.length>=t.length&&e.substr(n,n+t.length)===t,ze=(e,t)=>He(e,t)?((e,t)=>e.substring(t))(e,t.length):e,je=(e,t,n=0,o)=>{const r=e.indexOf(t,n);return-1!==r&&(!!v(o)||r+t.length<=o)},He=(e,t)=>Ue(e,t,0),$e=(e,t)=>Ue(e,t,e.length-t.length),qe=e=>t=>t.replace(e,""),Ve=qe(/^\s+|\s+$/g),We=qe(/^\s+/g),Ke=qe(/\s+$/g),Ye=e=>e.length>0,Ge=e=>!Ye(e),Xe=(e,t=10)=>{const n=parseInt(e,t);return isNaN(n)?I.none():I.some(n)},Qe=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Je=e=>t=>je(t,e),Ze=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:e=>je(e,"edge/")&&je(e,"chrome")&&je(e,"safari")&&je(e,"applewebkit")},{name:"Chromium",brand:"Chromium",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Qe],search:e=>je(e,"chrome")&&!je(e,"chromeframe")},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:e=>je(e,"msie")||je(e,"trident")},{name:"Opera",versionRegexes:[Qe,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Je("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Je("firefox")},{name:"Safari",versionRegexes:[Qe,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:e=>(je(e,"safari")||je(e,"mobile/"))&&je(e,"applewebkit")}],et=[{name:"Windows",search:Je("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:e=>je(e,"iphone")||je(e,"ipad"),versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Je("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"macOS",search:Je("mac os x"),versionRegexes:[/.*?mac\ os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Je("linux"),versionRegexes:[]},{name:"Solaris",search:Je("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Je("freebsd"),versionRegexes:[]},{name:"ChromeOS",search:Je("cros"),versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/]}],tt={browsers:N(Ze),oses:N(et)},nt="Edge",ot="Chromium",rt="Opera",st="Firefox",at="Safari",it=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isEdge:o(nt),isChromium:o(ot),isIE:o("IE"),isOpera:o(rt),isFirefox:o(st),isSafari:o(at)}},lt=()=>it({current:void 0,version:Ie.unknown()}),dt=it,ct=(N(nt),N(ot),N("IE"),N(rt),N(st),N(at),"Windows"),ut="Android",mt="Linux",ft="macOS",gt="Solaris",pt="FreeBSD",ht="ChromeOS",bt=e=>{const t=e.current,n=e.version,o=e=>()=>t===e;return{current:t,version:n,isWindows:o(ct),isiOS:o("iOS"),isAndroid:o(ut),isMacOS:o(ft),isLinux:o(mt),isSolaris:o(gt),isFreeBSD:o(pt),isChromeOS:o(ht)}},vt=()=>bt({current:void 0,version:Ie.unknown()}),yt=bt,Ct=(N(ct),N("iOS"),N(ut),N(mt),N(ft),N(gt),N(pt),N(ht),e=>window.matchMedia(e).matches);let wt=De((()=>((e,t,n)=>{const o=tt.browsers(),r=tt.oses(),s=t.bind((e=>((e,t)=>ue(t.brands,(t=>{const n=t.brand.toLowerCase();return J(e,(e=>{var t;return n===(null===(t=e.brand)||void 0===t?void 0:t.toLowerCase())})).map((e=>({current:e.name,version:Ie.nu(parseInt(t.version,10),0)})))})))(o,e))).orThunk((()=>((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(o,e))).fold(lt,dt),a=((e,t)=>Fe(e,t).map((e=>{const n=Ie.detect(e.versionRegexes,t);return{current:e.name,version:n}})))(r,e).fold(vt,yt),i=((e,t,n,o)=>{const r=e.isiOS()&&!0===/ipad/i.test(n),s=e.isiOS()&&!r,a=e.isiOS()||e.isAndroid(),i=a||o("(pointer:coarse)"),l=r||!s&&a&&o("(min-device-width:768px)"),d=s||a&&!l,c=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(n),u=!d&&!l&&!c;return{isiPad:N(r),isiPhone:N(s),isTablet:N(l),isPhone:N(d),isTouch:N(i),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:N(c),isDesktop:N(u)}})(a,s,e,n);return{browser:s,os:a,deviceType:i}})(navigator.userAgent,I.from(navigator.userAgentData),Ct)));const xt=()=>wt(),Et=navigator.userAgent,_t=xt(),kt=_t.browser,St=_t.os,Nt=_t.deviceType,Rt=-1!==Et.indexOf("Windows Phone"),At={transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",documentMode:kt.isIE()?document.documentMode||7:10,cacheSuffix:null,container:null,canHaveCSP:!kt.isIE(),windowsPhone:Rt,browser:{current:kt.current,version:kt.version,isChromium:kt.isChromium,isEdge:kt.isEdge,isFirefox:kt.isFirefox,isIE:kt.isIE,isOpera:kt.isOpera,isSafari:kt.isSafari},os:{current:St.current,version:St.version,isAndroid:St.isAndroid,isChromeOS:St.isChromeOS,isFreeBSD:St.isFreeBSD,isiOS:St.isiOS,isLinux:St.isLinux,isMacOS:St.isMacOS,isSolaris:St.isSolaris,isWindows:St.isWindows},deviceType:{isDesktop:Nt.isDesktop,isiPad:Nt.isiPad,isiPhone:Nt.isiPhone,isPhone:Nt.isPhone,isTablet:Nt.isTablet,isTouch:Nt.isTouch,isWebView:Nt.isWebView}},Tt=/^\s*|\s*$/g,Ot=e=>y(e)?"":(""+e).replace(Tt,""),Bt=function(e,t,n,o){o=o||this,e&&(n&&(e=e[n]),Re(e,((e,r)=>!1!==t.call(o,e,r,n)&&(Bt(e,t,n,o),!0))))},Pt={trim:Ot,isArray:Ne,is:(e,t)=>t?!("array"!==t||!Ne(e))||typeof e===t:void 0!==e,toArray:e=>{if(Ne(e))return e;{const t=[];for(let n=0,o=e.length;n<o;n++)t[n]=e[n];return t}},makeMap:(e,t,n={})=>{const o=m(e)?e.split(t||","):e||[];let r=o.length;for(;r--;)n[o[r]]={};return n},each:Re,map:Ae,grep:Te,inArray:(e,t)=>{if(e)for(let n=0,o=e.length;n<o;n++)if(e[n]===t)return n;return-1},hasOwn:Ee,extend:(e,...t)=>{for(let n=0;n<t.length;n++){const o=t[n];for(const t in o)if(Ee(o,t)){const n=o[t];void 0!==n&&(e[t]=n)}}return e},walk:Bt,resolve:(e,t=window)=>{const n=e.split(".");for(let e=0,o=n.length;e<o&&(t=t[n[e]]);e++);return t},explode:(e,t)=>p(e)?e:""===e?[]:Ae(e.split(t||","),Ot),_addCacheSuffix:e=>{const t=At.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Dt=(e,t,n=A)=>e.exists((e=>n(e,t))),Lt=(e,t,n=A)=>Mt(e,t,n).getOr(e.isNone()&&t.isNone()),Mt=(e,t,n)=>e.isSome()&&t.isSome()?I.some(n(e.getOrDie(),t.getOrDie())):I.none(),It=(e,t)=>e?I.some(t):I.none(),Ft="undefined"!=typeof window?window:Function("return this;")(),Ut=(e,t)=>((e,t)=>{let n=null!=t?t:Ft;for(let t=0;t<e.length&&null!=n;++t)n=n[e[t]];return n})(e.split("."),t),zt=Object.getPrototypeOf,jt=e=>{const t=Ut("ownerDocument.defaultView",e);return f(e)&&((e=>((e,t)=>{const n=((e,t)=>Ut(e,t))(e,t);if(null==n)throw new Error(e+" not available on this browser");return n})("HTMLElement",e))(t).prototype.isPrototypeOf(e)||/^HTML\w*Element$/.test(zt(e).constructor.name))},Ht=e=>e.dom.nodeName.toLowerCase(),$t=e=>e.dom.nodeType,qt=e=>t=>$t(t)===e,Vt=e=>Wt(e)&&jt(e.dom),Wt=qt(1),Kt=qt(3),Yt=qt(9),Gt=qt(11),Xt=e=>t=>Wt(t)&&Ht(t)===e,Qt=(e,t,n)=>{if(!(m(n)||b(n)||x(n)))throw console.error("Invalid call to Attribute.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},Jt=(e,t,n)=>{Qt(e.dom,t,n)},Zt=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{Qt(n,t,e)}))},en=(e,t)=>{const n=e.dom.getAttribute(t);return null===n?void 0:n},tn=(e,t)=>I.from(en(e,t)),nn=(e,t)=>{const n=e.dom;return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},on=(e,t)=>{e.dom.removeAttribute(t)},rn=e=>X(e.dom.attributes,((e,t)=>(e[t.name]=t.value,e)),{}),sn=(e,t)=>{const n=en(e,t);return void 0===n||""===n?[]:n.split(" ")},an=e=>void 0!==e.dom.classList,ln=e=>sn(e,"class"),dn=(e,t)=>((e,t,n)=>{const o=sn(e,t).concat([n]);return Jt(e,t,o.join(" ")),!0})(e,"class",t),cn=(e,t)=>((e,t,n)=>{const o=Y(sn(e,t),(e=>e!==n));return o.length>0?Jt(e,t,o.join(" ")):on(e,t),!1})(e,"class",t),un=(e,t)=>{an(e)?e.dom.classList.add(t):dn(e,t)},mn=e=>{0===(an(e)?e.dom.classList:ln(e)).length&&on(e,"class")},fn=(e,t)=>{an(e)?e.dom.classList.remove(t):cn(e,t),mn(e)},gn=(e,t)=>an(e)&&e.dom.classList.contains(t),pn=e=>{if(null==e)throw new Error("Node cannot be null or undefined");return{dom:e}},hn=(e,t)=>{const n=(t||document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||n.childNodes.length>1){const t="HTML does not have a single root node";throw console.error(t,e),new Error(t)}return pn(n.childNodes[0])},bn=(e,t)=>{const n=(t||document).createElement(e);return pn(n)},vn=(e,t)=>{const n=(t||document).createTextNode(e);return pn(n)},yn=pn,Cn=(e,t,n)=>I.from(e.dom.elementFromPoint(t,n)).map(pn),wn=(e,t)=>{const n=[],o=e=>(n.push(e),t(e));let r=t(e);do{r=r.bind(o)}while(r.isSome());return n},xn=(e,t)=>{const n=e.dom;if(1!==n.nodeType)return!1;{const e=n;if(void 0!==e.matches)return e.matches(t);if(void 0!==e.msMatchesSelector)return e.msMatchesSelector(t);if(void 0!==e.webkitMatchesSelector)return e.webkitMatchesSelector(t);if(void 0!==e.mozMatchesSelector)return e.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")}},En=e=>1!==e.nodeType&&9!==e.nodeType&&11!==e.nodeType||0===e.childElementCount,_n=(e,t)=>e.dom===t.dom,kn=(e,t)=>{const n=e.dom,o=t.dom;return n!==o&&n.contains(o)},Sn=e=>yn(e.dom.ownerDocument),Nn=e=>Yt(e)?e:Sn(e),Rn=e=>yn(Nn(e).dom.defaultView),An=e=>I.from(e.dom.parentNode).map(yn),Tn=e=>I.from(e.dom.parentElement).map(yn),On=(e,t)=>{const n=w(t)?t:L;let o=e.dom;const r=[];for(;null!==o.parentNode&&void 0!==o.parentNode;){const e=o.parentNode,t=yn(e);if(r.push(t),!0===n(t))break;o=e}return r},Bn=e=>I.from(e.dom.previousSibling).map(yn),Pn=e=>I.from(e.dom.nextSibling).map(yn),Dn=e=>oe(wn(e,Bn)),Ln=e=>wn(e,Pn),Mn=e=>q(e.dom.childNodes,yn),In=(e,t)=>{const n=e.dom.childNodes;return I.from(n[t]).map(yn)},Fn=e=>In(e,0),Un=e=>In(e,e.dom.childNodes.length-1),zn=e=>e.dom.childNodes.length,jn=e=>Gt(e)&&C(e.dom.host),Hn=w(Element.prototype.attachShadow)&&w(Node.prototype.getRootNode),$n=N(Hn),qn=Hn?e=>yn(e.dom.getRootNode()):Nn,Vn=e=>jn(e)?e:(e=>{const t=e.dom.head;if(null==t)throw new Error("Head is not available yet");return yn(t)})(Nn(e)),Wn=e=>yn(e.dom.host),Kn=e=>{if($n()&&C(e.target)){const t=yn(e.target);if(Wt(t)&&Yn(t)&&e.composed&&e.composedPath){const t=e.composedPath();if(t)return le(t)}}return I.from(e.target)},Yn=e=>C(e.dom.shadowRoot),Gn=e=>{const t=Kt(e)?e.dom.parentNode:e.dom;if(null==t||null===t.ownerDocument)return!1;const n=t.ownerDocument;return(e=>{const t=qn(e);return jn(t)?I.some(t):I.none()})(yn(t)).fold((()=>n.body.contains(t)),S(Gn,Wn))};var Xn=(e,t,n,o,r)=>e(n,o)?I.some(n):w(r)&&r(n)?I.none():t(n,o,r);const Qn=(e,t,n)=>{let o=e.dom;const r=w(n)?n:L;for(;o.parentNode;){o=o.parentNode;const e=yn(o);if(t(e))return I.some(e);if(r(e))break}return I.none()},Jn=(e,t,n)=>Xn(((e,t)=>t(e)),Qn,e,t,n),Zn=(e,t)=>{const n=e=>{for(let o=0;o<e.childNodes.length;o++){const r=yn(e.childNodes[o]);if(t(r))return I.some(r);const s=n(e.childNodes[o]);if(s.isSome())return s}return I.none()};return n(e.dom)},eo=(e,t,n)=>Qn(e,(e=>xn(e,t)),n),to=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?I.none():I.from(n.querySelector(e)).map(yn)})(t,e),no=(e,t,n)=>Xn(((e,t)=>xn(e,t)),eo,e,t,n),oo=(e,t=!1)=>{return Gn(e)?e.dom.isContentEditable:(n=e,no(n,"[contenteditable]")).fold(N(t),(e=>"true"===ro(e)));var n},ro=e=>e.dom.contentEditable,so=e=>void 0!==e.style&&w(e.style.getPropertyValue),ao=(e,t,n)=>{if(!m(n))throw console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);so(e)&&e.style.setProperty(t,n)},io=(e,t,n)=>{const o=e.dom;ao(o,t,n)},lo=(e,t)=>{const n=e.dom;ge(t,((e,t)=>{ao(n,t,e)}))},co=(e,t)=>{const n=e.dom,o=window.getComputedStyle(n).getPropertyValue(t);return""!==o||Gn(e)?o:uo(n,t)},uo=(e,t)=>so(e)?e.style.getPropertyValue(t):"",mo=(e,t)=>{const n=e.dom,o=uo(n,t);return I.from(o).filter((e=>e.length>0))},fo=e=>{const t={},n=e.dom;if(so(n))for(let e=0;e<n.style.length;e++){const o=n.style.item(e);t[o]=n.style[o]}return t},go=(e,t)=>{((e,t)=>{so(e)&&e.style.removeProperty(t)})(e.dom,t),Dt(tn(e,"style").map(Ve),"")&&on(e,"style")},po=(e,t)=>{An(e).each((n=>{n.dom.insertBefore(t.dom,e.dom)}))},ho=(e,t)=>{Pn(e).fold((()=>{An(e).each((e=>{vo(e,t)}))}),(e=>{po(e,t)}))},bo=(e,t)=>{Fn(e).fold((()=>{vo(e,t)}),(n=>{e.dom.insertBefore(t.dom,n.dom)}))},vo=(e,t)=>{e.dom.appendChild(t.dom)},yo=(e,t)=>{po(e,t),vo(t,e)},Co=(e,t)=>{V(t,(t=>{vo(e,t)}))},wo=e=>{e.dom.textContent="",V(Mn(e),(e=>{xo(e)}))},xo=e=>{const t=e.dom;null!==t.parentNode&&t.parentNode.removeChild(t)},Eo=e=>{const t=Mn(e);var n,o;t.length>0&&(n=e,V(o=t,((e,t)=>{const r=0===t?n:o[t-1];ho(r,e)}))),xo(e)},_o=e=>q(e,yn),ko=e=>e.dom.innerHTML,So=(e,t)=>{const n=Sn(e).dom,o=yn(n.createDocumentFragment()),r=((e,t)=>{const n=(t||document).createElement("div");return n.innerHTML=e,Mn(yn(n))})(t,n);Co(o,r),wo(e),vo(e,o)},No=(e,t,n,o)=>((e,t,n,o,r)=>{const s=((e,t)=>n=>{e(n)&&t((e=>{const t=yn(Kn(e).getOr(e.target)),n=()=>e.stopPropagation(),o=()=>e.preventDefault(),r=k(o,n);return((e,t,n,o,r,s,a)=>({target:e,x:t,y:n,stop:o,prevent:r,kill:s,raw:a}))(t,e.clientX,e.clientY,n,o,r,e)})(n))})(n,o);return e.dom.addEventListener(t,s,false),{unbind:T(Ro,e,t,s,false)}})(e,t,n,o),Ro=(e,t,n,o)=>{e.dom.removeEventListener(t,n,o)},Ao=(e,t)=>({left:e,top:t,translate:(n,o)=>Ao(e+n,t+o)}),To=Ao,Oo=(e,t)=>void 0!==e?e:void 0!==t?t:0,Bo=e=>{const t=e.dom,n=t.ownerDocument.body;return n===t?To(n.offsetLeft,n.offsetTop):Gn(e)?(e=>{const t=e.getBoundingClientRect();return To(t.left,t.top)})(t):To(0,0)},Po=e=>{const t=void 0!==e?e.dom:document,n=t.body.scrollLeft||t.documentElement.scrollLeft,o=t.body.scrollTop||t.documentElement.scrollTop;return To(n,o)},Do=(e,t,n)=>{const o=(void 0!==n?n.dom:document).defaultView;o&&o.scrollTo(e,t)},Lo=(e,t)=>{xt().browser.isSafari()&&w(e.dom.scrollIntoViewIfNeeded)?e.dom.scrollIntoViewIfNeeded(!1):e.dom.scrollIntoView(t)},Mo=(e,t,n,o)=>({x:e,y:t,width:n,height:o,right:e+n,bottom:t+o}),Io=e=>{const t=void 0===e?window:e,n=t.document,o=Po(yn(n));return(e=>{const t=void 0===e?window:e;return xt().browser.isFirefox()?I.none():I.from(t.visualViewport)})(t).fold((()=>{const e=t.document.documentElement,n=e.clientWidth,r=e.clientHeight;return Mo(o.left,o.top,n,r)}),(e=>Mo(Math.max(e.pageLeft,o.left),Math.max(e.pageTop,o.top),e.width,e.height)))},Fo=(e,t)=>{let n=[];return V(Mn(e),(e=>{t(e)&&(n=n.concat([e])),n=n.concat(Fo(e,t))})),n},Uo=(e,t)=>((e,t)=>{const n=void 0===t?document:t.dom;return En(n)?[]:q(n.querySelectorAll(e),yn)})(t,e),zo=(e,t,n)=>eo(e,t,n).isSome();class jo{constructor(e,t){this.node=e,this.rootNode=t,this.current=this.current.bind(this),this.next=this.next.bind(this),this.prev=this.prev.bind(this),this.prev2=this.prev2.bind(this)}current(){return this.node}next(e){return this.node=this.findSibling(this.node,"firstChild","nextSibling",e),this.node}prev(e){return this.node=this.findSibling(this.node,"lastChild","previousSibling",e),this.node}prev2(e){return this.node=this.findPreviousNode(this.node,e),this.node}findSibling(e,t,n,o){if(e){if(!o&&e[t])return e[t];if(e!==this.rootNode){let t=e[n];if(t)return t;for(let o=e.parentNode;o&&o!==this.rootNode;o=o.parentNode)if(t=o[n],t)return t}}}findPreviousNode(e,t){if(e){const n=e.previousSibling;if(this.rootNode&&n===this.rootNode)return;if(n){if(!t)for(let e=n.lastChild;e;e=e.lastChild)if(!e.lastChild)return e;return n}const o=e.parentNode;if(o&&o!==this.rootNode)return o}}}const Ho=e=>t=>!!t&&t.nodeType===e,$o=e=>!!e&&!Object.getPrototypeOf(e),qo=Ho(1),Vo=e=>qo(e)&&Vt(yn(e)),Wo=e=>{const t=e.toLowerCase();return e=>C(e)&&e.nodeName.toLowerCase()===t},Ko=e=>{const t=e.map((e=>e.toLowerCase()));return e=>{if(e&&e.nodeName){const n=e.nodeName.toLowerCase();return H(t,n)}return!1}},Yo=(e,t)=>{const n=t.toLowerCase().split(" ");return t=>{if(qo(t)){const o=t.ownerDocument.defaultView;if(o)for(let r=0;r<n.length;r++){const s=o.getComputedStyle(t,null);if((s?s.getPropertyValue(e):null)===n[r])return!0}}return!1}},Go=e=>t=>qo(t)&&t.hasAttribute(e),Xo=e=>qo(e)&&e.hasAttribute("data-mce-bogus"),Qo=e=>qo(e)&&"TABLE"===e.tagName,Jo=e=>t=>{if(Vo(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1},Zo=Ko(["textarea","input"]),er=Ho(3),tr=Ho(4),nr=Ho(7),or=Ho(8),rr=Ho(9),sr=Ho(11),ar=Wo("br"),ir=Wo("img"),lr=Jo("true"),dr=Jo("false"),cr=Ko(["td","th"]),ur=Ko(["td","th","caption"]),mr=Ko(["video","audio","object","embed"]),fr=Wo("li"),gr=Wo("details"),pr=Wo("summary"),hr="\ufeff",br="\xa0",vr=e=>e===hr,yr=((e,t)=>{const n=t=>e(t)?I.from(t.dom.nodeValue):I.none();return{get:t=>{if(!e(t))throw new Error("Can only get text value of a text node");return n(t).getOr("")},getOption:n,set:(t,n)=>{if(!e(t))throw new Error("Can only set raw text value of a text node");t.dom.nodeValue=n}}})(Kt),Cr=e=>yr.get(e),wr=e=>yr.getOption(e),xr=e=>{let t;return n=>(t=t||se(e,M),Ee(t,Ht(n)))},Er=e=>Wt(e)&&"br"===Ht(e),_r=xr(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),kr=xr(["ul","ol","dl"]),Sr=xr(["li","dd","dt"]),Nr=xr(["thead","tbody","tfoot"]),Rr=xr(["td","th"]),Ar=xr(["pre","script","textarea","style"]),Tr=()=>{const e=bn("br");return Jt(e,"data-mce-bogus","1"),e},Or=e=>{wo(e),vo(e,Tr())},Br=hr,Pr=vr,Dr=e=>e.replace(/\uFEFF/g,""),Lr=qo,Mr=er,Ir=e=>(Mr(e)&&(e=e.parentNode),Lr(e)&&e.hasAttribute("data-mce-caret")),Fr=e=>Mr(e)&&Pr(e.data),Ur=e=>Ir(e)||Fr(e),zr=e=>e.firstChild!==e.lastChild||!ar(e.firstChild),jr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset())===Br||e.isAtStart()&&Fr(t.previousSibling))},Hr=e=>{const t=e.container();return!!er(t)&&(t.data.charAt(e.offset()-1)===Br||e.isAtEnd()&&Fr(t.nextSibling))},$r=e=>Mr(e)&&e.data[0]===Br,qr=e=>Mr(e)&&e.data[e.data.length-1]===Br,Vr=e=>e&&e.hasAttribute("data-mce-caret")?((e=>{var t;const n=e.getElementsByTagName("br"),o=n[n.length-1];Xo(o)&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o))})(e),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("data-mce-style"),e.removeAttribute("_moz_abspos"),e):null,Wr=e=>Ir(e.startContainer),Kr=lr,Yr=dr,Gr=ar,Xr=er,Qr=Ko(["script","style","textarea"]),Jr=Ko(["img","input","textarea","hr","iframe","video","audio","object","embed"]),Zr=Ko(["table"]),es=Ur,ts=e=>!es(e)&&(Xr(e)?!Qr(e.parentNode):Jr(e)||Gr(e)||Zr(e)||ns(e)),ns=e=>!(e=>qo(e)&&"true"===e.getAttribute("unselectable"))(e)&&Yr(e),os=(e,t)=>ts(e)&&((e,t)=>{for(let n=e.parentNode;n&&n!==t;n=n.parentNode){if(ns(n))return!1;if(Kr(n))return!0}return!0})(e,t),rs=/^[ \t\r\n]*$/,ss=e=>rs.test(e),as=e=>{for(const t of e)if(!vr(t))return!1;return!0},is=e=>"\n"===e||"\r"===e,ls=(e,t=4,n=!0,o=!0)=>{const r=((e,t)=>t<=0?"":new Array(t+1).join(" "))(0,t),s=e.replace(/\t/g,r),a=X(s,((e,t)=>(e=>-1!==" \f\t\v".indexOf(e))(t)||t===br?e.pcIsSpace||""===e.str&&n||e.str.length===s.length-1&&o||((e,t)=>t<e.length&&t>=0&&is(e[t]))(s,e.str.length+1)?{pcIsSpace:!1,str:e.str+br}:{pcIsSpace:!0,str:e.str+" "}:{pcIsSpace:is(t),str:e.str+t}),{pcIsSpace:!1,str:""});return a.str},ds=(e,t)=>ts(e)&&!((e,t)=>er(e)&&ss(e.data)&&!((e,t)=>{const n=yn(t),o=yn(e);return zo(o,"pre,code",T(_n,n))})(e,t))(e,t)||(e=>qo(e)&&"A"===e.nodeName&&!e.hasAttribute("href")&&(e.hasAttribute("name")||e.hasAttribute("id")))(e)||cs(e),cs=Go("data-mce-bookmark"),us=Go("data-mce-bogus"),ms=("data-mce-bogus","all",e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"));const fs=e=>Tn(yn(e)).exists((e=>!oo(e))),gs=(e,t=!0)=>((e,t)=>{let n=0;if(ds(e,e))return!1;{let o=e.firstChild;if(!o)return!0;const r=new jo(o,e);do{if(t){if(ms(o)){o=r.next(!0);continue}if(us(o)){o=r.next();continue}}if(lr(o)&&fs(o))return!1;if(ar(o))n++,o=r.next();else{if(ds(o,e))return!1;o=r.next()}}while(o);return n<=1}})(e.dom,t),ps=e=>"svg"===e.toLowerCase(),hs=e=>ps(e.nodeName),bs=e=>"svg"===(null==e?void 0:e.nodeName)?"svg":"html",vs=["svg"],ys="data-mce-block",Cs=e=>q((e=>Y(me(e),(e=>!/[A-Z]/.test(e))))(e),(e=>`${e}:`+q(vs,(t=>`not(${t} ${e})`)).join(":"))).join(","),ws=(e,t)=>C(t.querySelector(e))?(t.setAttribute(ys,"true"),"inline-boundary"===t.getAttribute("data-mce-selected")&&t.removeAttribute("data-mce-selected"),!0):(t.removeAttribute(ys),!1),xs=(e,t)=>{const n=Cs(e.getTransparentElements()),o=Cs(e.getBlockElements());return Y(t.querySelectorAll(n),(e=>ws(o,e)))},Es=(e,t)=>{var n;const o=t?"lastChild":"firstChild";for(let t=e[o];t;t=t[o])if(gs(yn(t)))return void(null===(n=t.parentNode)||void 0===n||n.removeChild(t))},_s=(e,t,n)=>{const o=e.getBlockElements(),r=yn(t),s=e=>Ht(e)in o,a=e=>_n(e,r);V(_o(n),(t=>{Qn(t,s,a).each((n=>{const o=((t,o)=>Y(Mn(t),(t=>s(t)&&!e.isValidChild(Ht(n),Ht(t)))))(t);if(o.length>0){const t=Tn(n);V(o,(e=>{Qn(e,s,a).each((t=>{((e,t)=>{const n=document.createRange(),o=e.parentNode;if(o){n.setStartBefore(e),n.setEndBefore(t);const r=n.extractContents();Es(r,!0),n.setStartAfter(t),n.setEndAfter(e);const s=n.extractContents();Es(s,!1),gs(yn(r))||o.insertBefore(r,e),gs(yn(t))||o.insertBefore(t,e),gs(yn(s))||o.insertBefore(s,e),o.removeChild(e)}})(t.dom,e.dom)}))})),t.each((t=>xs(e,t.dom)))}}))}))},ks=(e,t)=>{const n=xs(e,t);_s(e,t,n),((e,t,n)=>{V([...n,...Ts(e,t)?[t]:[]],(t=>V(Uo(yn(t),t.nodeName.toLowerCase()),(t=>{Os(e,t.dom)&&Eo(t)}))))})(e,t,n)},Ss=(e,t)=>{if(As(e,t)){const n=Cs(e.getBlockElements());ws(n,t)}},Ns=e=>e.hasAttribute(ys),Rs=(e,t)=>Ee(e.getTransparentElements(),t),As=(e,t)=>qo(t)&&Rs(e,t.nodeName),Ts=(e,t)=>As(e,t)&&Ns(t),Os=(e,t)=>As(e,t)&&!Ns(t),Bs=(e,t)=>1===t.type&&Rs(e,t.name)&&m(t.attr(ys)),Ps=xt().browser,Ds=e=>J(e,Wt),Ls=(e,t)=>e.children&&H(e.children,t),Ms=(e,t={})=>{let n=0;const o={},r=yn(e),s=Nn(r),a=e=>{vo(Vn(r),e)},i=e=>{const t=Vn(r);to(t,"#"+e).each(xo)},l=e=>xe(o,e).getOrThunk((()=>({id:"mce-u"+n++,passed:[],failed:[],count:0}))),d=e=>new Promise(((n,r)=>{let i;const d=Pt._addCacheSuffix(e),c=l(d);o[d]=c,c.count++;const u=(e,t)=>{V(e,D),c.status=t,c.passed=[],c.failed=[],i&&(i.onload=null,i.onerror=null,i=null)},m=()=>u(c.passed,2),f=()=>u(c.failed,3);if(n&&c.passed.push(n),r&&c.failed.push(r),1===c.status)return;if(2===c.status)return void m();if(3===c.status)return void f();c.status=1;const g=bn("link",s.dom);Zt(g,{rel:"stylesheet",type:"text/css",id:c.id}),t.contentCssCors&&Jt(g,"crossOrigin","anonymous"),t.referrerPolicy&&Jt(g,"referrerpolicy",t.referrerPolicy),i=g.dom,i.onload=m,i.onerror=f,a(g),Jt(g,"href",d)})),c=e=>{const t=Pt._addCacheSuffix(e);xe(o,t).each((e=>{0==--e.count&&(delete o[t],i(e.id))}))};return{load:d,loadRawCss:(e,t)=>{const n=l(e);o[e]=n,n.count++;const r=bn("style",s.dom);Zt(r,{rel:"stylesheet",type:"text/css",id:n.id}),r.dom.innerHTML=t,a(r)},loadAll:e=>Promise.allSettled(q(e,(e=>d(e).then(N(e))))).then((e=>{const t=K(e,(e=>"fulfilled"===e.status));return t.fail.length>0?Promise.reject(q(t.fail,(e=>e.reason))):q(t.pass,(e=>e.value))})),unload:c,unloadRawCss:e=>{xe(o,e).each((t=>{0==--t.count&&(delete o[e],i(t.id))}))},unloadAll:e=>{V(e,(e=>{c(e)}))},_setReferrerPolicy:e=>{t.referrerPolicy=e},_setContentCssCors:e=>{t.contentCssCors=e}}},Is=(()=>{const e=new WeakMap;return{forElement:(t,n)=>{const o=qn(t).dom;return I.from(e.get(o)).getOrThunk((()=>{const t=Ms(o,n);return e.set(o,t),t}))}}})(),Fs=(e,t,n)=>C(e)&&(ds(e,t)||n.isInline(e.nodeName.toLowerCase())),Us=e=>(e=>"span"===e.nodeName.toLowerCase())(e)&&"bookmark"===e.getAttribute("data-mce-type"),zs=(e,t,n,o)=>{var r;const s=o||t;if(qo(t)&&Us(t))return t;const a=t.childNodes;for(let t=a.length-1;t>=0;t--)zs(e,a[t],n,s);if(qo(t)){const e=t.childNodes;1===e.length&&Us(e[0])&&(null===(r=t.parentNode)||void 0===r||r.insertBefore(e[0],t))}return(e=>sr(e)||rr(e))(t)||ds(t,s)||(e=>!!qo(e)&&e.childNodes.length>0)(t)||((e,t,n)=>er(e)&&e.data.length>0&&((e,t,n)=>{const o=new jo(e,t).prev(!1),r=new jo(e,t).next(!1),s=v(o)||Fs(o,t,n),a=v(r)||Fs(r,t,n);return s&&a})(e,t,n))(t,s,n)||e.remove(t),t},js=Pt.makeMap,Hs=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,$s=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,qs=/[<>&\"\']/g,Vs=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Ws={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"},Ks={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},Ys={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},Gs=(e,t)=>{const n={};if(e){const o=e.split(",");t=t||10;for(let e=0;e<o.length;e+=2){const r=String.fromCharCode(parseInt(o[e],t));if(!Ks[r]){const t="&"+o[e+1]+";";n[r]=t,n[t]=r}}return n}},Xs=Gs("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32),Qs=(e,t)=>e.replace(t?Hs:$s,(e=>Ks[e]||e)),Js=(e,t)=>e.replace(t?Hs:$s,(e=>e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":Ks[e]||"&#"+e.charCodeAt(0)+";")),Zs=(e,t,n)=>{const o=n||Xs;return e.replace(t?Hs:$s,(e=>Ks[e]||o[e]||e))},ea={encodeRaw:Qs,encodeAllRaw:e=>(""+e).replace(qs,(e=>Ks[e]||e)),encodeNumeric:Js,encodeNamed:Zs,getEncodeFunc:(e,t)=>{const n=Gs(t)||Xs,o=js(e.replace(/\+/g,","));return o.named&&o.numeric?(e,t)=>e.replace(t?Hs:$s,(e=>void 0!==Ks[e]?Ks[e]:void 0!==n[e]?n[e]:e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";")):o.named?t?(e,t)=>Zs(e,t,n):Zs:o.numeric?Js:Qs},decode:e=>e.replace(Vs,((e,t)=>t?(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))>65535?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Ws[t]||String.fromCharCode(t):Ys[e]||Xs[e]||(e=>{const t=bn("div").dom;return t.innerHTML=e,t.textContent||t.innerText||e})(e)))},ta=(e,t)=>(e=Pt.trim(e))?e.split(t||" "):[],na=e=>new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$"),oa={},ra=Pt.makeMap,sa=Pt.each,aa=Pt.extend,ia=Pt.explode,la=(e,t={})=>{const n=ra(e," ",ra(e.toUpperCase()," "));return aa(n,t)},da=e=>la("td th li dt dd figcaption caption details summary",e.getTextBlockElements()),ca=(e,t)=>{if(e){const n={};return m(e)&&(e={"*":e}),sa(e,((e,o)=>{n[o]=n[o.toUpperCase()]="map"===t?ra(e,/[, ]/):ia(e,/[, ]/)})),n}},ua=(e={})=>{var t;const n={},o={};let r=[];const s={},a={},i=(t,n,o)=>{const r=e[t];if(r)return ra(r,/[, ]/,ra(r.toUpperCase(),/[, ]/));{let e=oa[t];return e||(e=la(n,o),oa[t]=e),e}},l=null!==(t=e.schema)&&void 0!==t?t:"html5",d=(e=>{const{globalAttributes:t,phrasingContent:n,flowContent:o}=(e=>{let t,n,o;t="id accesskey class dir lang style tabindex title role",n="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",o="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(t+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",n+=" article aside details dialog figure main header footer hgroup section nav a ins del canvas map",o+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen svg"),"html5-strict"!==e&&(t+=" xml:lang",o=[o,"acronym applet basefont big font strike tt"].join(" "),n=[n,"center dir isindex noframes"].join(" "));const r=[n,o].join(" ");return{globalAttributes:t,blockContent:n,phrasingContent:o,flowContent:r}})(e),r={},s=(e,t,n)=>{r[e]={attributes:se(t,N({})),attributesOrder:t,children:se(n,N({}))}},a=(e,n="",o="")=>{const r=ta(o),a=ta(e);let i=a.length;const l=ta([t,n].join(" "));for(;i--;)s(a[i],l.slice(),r)},i=(e,t)=>{const n=ta(e),o=ta(t);let s=n.length;for(;s--;){const e=r[n[s]];for(let t=0,n=o.length;t<n;t++)e.attributes[o[t]]={},e.attributesOrder.push(o[t])}};return"html5-strict"!==e&&(V(ta("acronym applet basefont big font strike tt"),(e=>{a(e,"",n)})),V(ta("center dir isindex noframes"),(e=>{a(e,"",o)}))),a("html","manifest","head body"),a("head","","base command link meta noscript script style title"),a("title hr noscript br"),a("base","href target"),a("link","href rel media hreflang type sizes hreflang"),a("meta","name http-equiv content charset"),a("style","media type scoped"),a("script","src async defer type charset"),a("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",o),a("dd div","",o),a("address dt caption","","html4"===e?n:o),a("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),a("blockquote","cite",o),a("ol","reversed start type","li"),a("ul","","li"),a("li","value",o),a("dl","","dt dd"),a("a","href target rel media hreflang type","html4"===e?n:o),a("q","cite",n),a("ins del","cite datetime",o),a("img","src sizes srcset alt usemap ismap width height"),a("iframe","src name width height",o),a("embed","src type width height"),a("object","data type typemustmatch name usemap form width height",[o,"param"].join(" ")),a("param","name value"),a("map","name",[o,"area"].join(" ")),a("area","alt coords shape href target rel media hreflang type"),a("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),a("colgroup","span","col"),a("col","span"),a("tbody thead tfoot","","tr"),a("tr","","td th"),a("td","colspan rowspan headers",o),a("th","colspan rowspan headers scope abbr",o),a("form","accept-charset action autocomplete enctype method name novalidate target",o),a("fieldset","disabled form name",[o,"legend"].join(" ")),a("label","form for",n),a("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),a("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?o:n),a("select","disabled form multiple name required size","option optgroup"),a("optgroup","disabled label","option"),a("option","disabled label selected value"),a("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),a("menu","type label",[o,"li"].join(" ")),a("noscript","",o),"html4"!==e&&(a("wbr"),a("ruby","",[n,"rt rp"].join(" ")),a("figcaption","",o),a("mark rt rp bdi","",n),a("summary","",[n,"h1 h2 h3 h4 h5 h6"].join(" ")),a("canvas","width height",o),a("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[o,"track source"].join(" ")),a("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[o,"track source"].join(" ")),a("picture","","img source"),a("source","src srcset type media sizes"),a("track","kind src srclang label default"),a("datalist","",[n,"option"].join(" ")),a("article section nav aside main header footer","",o),a("hgroup","","h1 h2 h3 h4 h5 h6"),a("figure","",[o,"figcaption"].join(" ")),a("time","datetime",n),a("dialog","open",o),a("command","type label icon disabled checked radiogroup command"),a("output","for form name",n),a("progress","value max",n),a("meter","value min max low high optimum",n),a("details","open",[o,"summary"].join(" ")),a("keygen","autofocus challenge disabled form keytype name"),s("svg","id tabindex lang xml:space class style x y width height viewBox preserveAspectRatio zoomAndPan transform".split(" "),[])),"html5-strict"!==e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid code codebase codetype archive standby align border hspace vspace"),i("embed","align name hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!==e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("img","loading"),i("iframe","sandbox seamless allow allowfullscreen loading")),"html4"!==e&&V([r.video,r.audio],(e=>{delete e.children.audio,delete e.children.video})),V(ta("a form meter progress dfn"),(e=>{r[e]&&delete r[e].children[e]})),delete r.caption.children.table,delete r.script,r})(l);!1===e.verify_html&&(e.valid_elements="*[*]");const c=ca(e.valid_styles),u=ca(e.invalid_styles,"map"),m=ca(e.valid_classes,"map"),f=i("whitespace_elements","pre script noscript style textarea video audio iframe object code"),g=i("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),p=i("void_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),h=i("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls allowfullscreen"),b="td th iframe video audio object script code",v=i("non_empty_elements",b+" pre svg",p),y=i("move_caret_before_on_enter_elements",b+" table",p),C="h1 h2 h3 h4 h5 h6",w=i("text_block_elements",C+" p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),x=i("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary html body multicol listing",w),E=i("text_inline_elements","span strong b em i font s strike u var cite dfn code mark q sup sub samp"),_=i("transparent_elements","a ins del canvas map"),k=i("wrap_block_elements","pre "+C);sa("script noscript iframe noframes noembed title style textarea xmp plaintext".split(" "),(e=>{a[e]=new RegExp("</"+e+"[^>]*>","gi")}));const S=e=>{const t=I.from(n["@"]),o=/[*?+]/;V(((e,t)=>{const n=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)])?$/;return te(ta(t,","),(t=>{const o=n.exec(t);if(o){const t=o[1],n=o[2],r=o[3],s=o[4],a=o[5],i={attributes:{},attributesOrder:[]};if(e.each((e=>((e,t)=>{ge(e.attributes,((e,n)=>{t.attributes[n]=e})),t.attributesOrder.push(...e.attributesOrder)})(e,i))),"#"===t?i.paddEmpty=!0:"-"===t&&(i.removeEmpty=!0),"!"===s&&(i.removeEmptyAttrs=!0),a&&((e,t)=>{const n=/^([!\-])?(\w+[\\:]:\w+|[^=~<]+)?(?:([=~<])(.*))?$/,o=/[*?+]/,{attributes:r,attributesOrder:s}=t;V(ta(e,"|"),(e=>{const a=n.exec(e);if(a){const e={},n=a[1],i=a[2].replace(/[\\:]:/g,":"),l=a[3],d=a[4];if("!"===n&&(t.attributesRequired=t.attributesRequired||[],t.attributesRequired.push(i),e.required=!0),"-"===n)return delete r[i],void s.splice(Pt.inArray(s,i),1);if(l&&("="===l?(t.attributesDefault=t.attributesDefault||[],t.attributesDefault.push({name:i,value:d}),e.defaultValue=d):"~"===l?(t.attributesForced=t.attributesForced||[],t.attributesForced.push({name:i,value:d}),e.forcedValue=d):"<"===l&&(e.validValues=Pt.makeMap(d,"?"))),o.test(i)){const n=e;t.attributePatterns=t.attributePatterns||[],n.pattern=na(i),t.attributePatterns.push(n)}else r[i]||s.push(i),r[i]=e}}))})(a,i),r&&(i.outputName=n),"@"===n){if(!e.isNone())return[];e=I.some(i)}return[r?{name:n,element:i,aliasName:r}:{name:n,element:i}]}return[]}))})(t,null!=e?e:""),(({name:e,element:t,aliasName:s})=>{if(s&&(n[s]=t),o.test(e)){const n=t;n.pattern=na(e),r.push(n)}else n[e]=t}))},R=e=>{r=[],V(me(n),(e=>{delete n[e]})),S(e)},A=e=>{delete oa.text_block_elements,delete oa.block_elements,V((e=>{const t=/^(~)?(.+)$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e="~"===n[1];return[{inline:e,cloneName:e?"span":"div",name:n[2]}]}return[]}))})(null!=e?e:""),(({inline:e,name:t,cloneName:r})=>{if(o[t]=o[r],s[t]=r,v[t.toUpperCase()]={},v[t]={},e||(x[t.toUpperCase()]={},x[t]={}),!n[t]){let e=n[r];e=aa({},e),delete e.removeEmptyAttrs,delete e.removeEmpty,n[t]=e}ge(o,((e,n)=>{e[r]&&(o[n]=e=aa({},o[n]),e[t]=e[r])}))}))},T=e=>{V((e=>{const t=/^([+\-]?)([A-Za-z0-9_\-.\u00b7\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u037d\u037f-\u1fff\u200c-\u200d\u203f-\u2040\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd]+)\[([^\]]+)]$/;return te(ta(e,","),(e=>{const n=t.exec(e);if(n){const e=n[1],t=e?(e=>"-"===e?"remove":"add")(e):"replace";return[{operation:t,name:n[2],validChildren:ta(n[3],"|")}]}return[]}))})(null!=e?e:""),(({operation:e,name:t,validChildren:n})=>{const r="replace"===e?{"#comment":{}}:o[t];V(n,(t=>{"remove"===e?delete r[t]:r[t]={}})),o[t]=r}))},O=e=>{const t=n[e];if(t)return t;let o=r.length;for(;o--;){const t=r[o];if(t.pattern.test(e))return t}};e.valid_elements?(R(e.valid_elements),sa(d,((e,t)=>{o[t]=e.children}))):(sa(d,((e,t)=>{n[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},o[t]=e.children})),sa(ta("strong/b em/i"),(e=>{const t=ta(e,"/");n[t[1]].outputName=t[0]})),sa(E,((t,o)=>{n[o]&&(e.padd_empty_block_inline_children&&(n[o].paddInEmptyBlock=!0),n[o].removeEmpty=!0)})),sa(ta("ol ul blockquote a table tbody"),(e=>{n[e]&&(n[e].removeEmpty=!0)})),sa(ta("p h1 h2 h3 h4 h5 h6 th td pre div address caption li summary"),(e=>{n[e]&&(n[e].paddEmpty=!0)})),sa(ta("span"),(e=>{n[e].removeEmptyAttrs=!0}))),delete n.svg,A(e.custom_elements),T(e.valid_children),S(e.extended_valid_elements),T("+ol[ul|ol],+ul[ul|ol]"),sa({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},((e,t)=>{n[t]&&(n[t].parentsRequired=ta(e))})),e.invalid_elements&&sa(ia(e.invalid_elements),(e=>{n[e]&&delete n[e]})),O("span")||S("span[!data-mce-type|*]");const B=N(c),P=N(u),D=N(m),L=N(h),M=N(x),F=N(w),U=N(E),z=N(Object.seal(p)),j=N(g),H=N(v),$=N(y),q=N(f),W=N(_),K=N(k),Y=N(Object.seal(a)),G=(e,t)=>{const n=O(e);if(n){if(!t)return!0;{if(n.attributes[t])return!0;const e=n.attributePatterns;if(e){let n=e.length;for(;n--;)if(e[n].pattern.test(t))return!0}}}return!1},X=e=>Ee(M(),e),Q=e=>!He(e,"#")&&G(e)&&!X(e),J=N(s);return{type:l,children:o,elements:n,getValidStyles:B,getValidClasses:D,getBlockElements:M,getInvalidStyles:P,getVoidElements:z,getTextBlockElements:F,getTextInlineElements:U,getBoolAttrs:L,getElementRule:O,getSelfClosingElements:j,getNonEmptyElements:H,getMoveCaretBeforeOnEnterElements:$,getWhitespaceElements:q,getTransparentElements:W,getSpecialElements:Y,isValidChild:(e,t)=>{const n=o[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:G,isBlock:X,isInline:Q,isWrapper:e=>Ee(K(),e)||Q(e),getCustomElements:J,addValidElements:S,setValidElements:R,addCustomElements:A,addValidChildren:T}},ma=e=>{const t=e.toString(16);return(1===t.length?"0"+t:t).toUpperCase()},fa=e=>(e=>{return{value:(t=e,ze(t,"#").toUpperCase())};var t})(ma(e.red)+ma(e.green)+ma(e.blue)),ga=/^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/i,pa=/^\s*rgba\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?(?:\.\d+)?)\s*\)\s*$/i,ha=(e,t,n,o)=>({red:e,green:t,blue:n,alpha:o}),ba=(e,t,n,o)=>{const r=parseInt(e,10),s=parseInt(t,10),a=parseInt(n,10),i=parseFloat(o);return ha(r,s,a,i)},va=e=>{if("transparent"===e)return I.some(ha(0,0,0,0));const t=ga.exec(e);if(null!==t)return I.some(ba(t[1],t[2],t[3],"1"));const n=pa.exec(e);return null!==n?I.some(ba(n[1],n[2],n[3],n[4])):I.none()},ya=e=>`rgba(${e.red},${e.green},${e.blue},${e.alpha})`,Ca=e=>va(e).map(fa).map((e=>"#"+e.value)).getOr(e),wa=(e={},t)=>{const n=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,r=/\s+$/,s={};let a,i;const l=hr;t&&(a=t.getValidStyles(),i=t.getInvalidStyles());const d="\\\" \\' \\; \\: ; : \ufeff".split(" ");for(let e=0;e<d.length;e++)s[d[e]]=l+e,s[l+e]=d[e];const c={parse:t=>{const a={};let i=!1;const d=e.url_converter,u=e.url_converter_scope||c,f=(e,t,n)=>{const o=a[e+"-top"+t];if(!o)return;const r=a[e+"-right"+t];if(!r)return;const s=a[e+"-bottom"+t];if(!s)return;const i=a[e+"-left"+t];if(!i)return;const l=[o,r,s,i];let d=l.length-1;for(;d--&&l[d]===l[d+1];);d>-1&&n||(a[e+t]=-1===d?l[0]:l.join(" "),delete a[e+"-top"+t],delete a[e+"-right"+t],delete a[e+"-bottom"+t],delete a[e+"-left"+t])},g=e=>{const t=a[e];if(!t)return;const n=t.indexOf(",")>-1?[t]:t.split(" ");let o=n.length;for(;o--;)if(n[o]!==n[0])return!1;return a[e]=n[0],!0},p=e=>(i=!0,s[e]),h=(e,t)=>(i&&(e=e.replace(/\uFEFF[0-9]/g,(e=>s[e]))),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e),b=e=>String.fromCharCode(parseInt(e.slice(1),16)),v=e=>e.replace(/\\[0-9a-f]+/gi,b),y=(t,n,o,r,s,a)=>{if(s=s||a)return"'"+(s=h(s)).replace(/\'/g,"\\'")+"'";if(n=h(n||o||r||""),!e.allow_script_urls){const t=n.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(t))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(t))return""}return d&&(n=d.call(u,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"};if(t){let s;for(t=(t=t.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,p).replace(/\"[^\"]+\"|\'[^\']+\'/g,(e=>e.replace(/[;:]/g,p)));s=o.exec(t);){o.lastIndex=s.index+s[0].length;let t=s[1].replace(r,"").toLowerCase(),d=s[2].replace(r,"");if(t&&d){if(t=v(t),d=v(d),-1!==t.indexOf(l)||-1!==t.indexOf('"'))continue;if(!e.allow_script_urls&&("behavior"===t||/expression\s*\(|\/\*|\*\//.test(d)))continue;"font-weight"===t&&"700"===d?d="bold":"color"!==t&&"background-color"!==t||(d=d.toLowerCase()),m(e.force_hex_color)&&"off"!==e.force_hex_color&&va(d).each((t=>{"always"!==e.force_hex_color&&1!==t.alpha||(d=Ca(ya(t)))})),d=d.replace(n,y),a[t]=i?h(d,!0):d}}f("border","",!0),f("border","-width"),f("border","-color"),f("border","-style"),f("padding",""),f("margin",""),"border",w="border-style",x="border-color",g(C="border-width")&&g(w)&&g(x)&&(a.border=a[C]+" "+a[w]+" "+a[x],delete a[C],delete a[w],delete a[x]),"medium none"===a.border&&delete a.border,"none"===a["border-image"]&&delete a["border-image"]}var C,w,x;return a},serialize:(e,t)=>{let n="";const o=(t,o)=>{const r=o[t];if(r)for(let t=0,o=r.length;t<o;t++){const o=r[t],s=e[o];s&&(n+=(n.length>0?" ":"")+o+": "+s+";")}};return t&&a?(o("*",a),o(t,a)):ge(e,((e,o)=>{e&&((e,t)=>{if(!i||!t)return!0;let n=i["*"];return!(n&&n[e]||(n=i[t],n&&n[e]))})(o,t)&&(n+=(n.length>0?" ":"")+o+": "+e+";")})),n}};return c},xa={keyLocation:!0,layerX:!0,layerY:!0,returnValue:!0,webkitMovementX:!0,webkitMovementY:!0,keyIdentifier:!0,mozPressure:!0},Ea=(e,t)=>{const n=null!=t?t:{};for(const t in e)Ee(xa,t)||(n[t]=e[t]);return C(e.composedPath)&&(n.composedPath=()=>e.composedPath()),C(e.getModifierState)&&(n.getModifierState=t=>e.getModifierState(t)),C(e.getTargetRanges)&&(n.getTargetRanges=()=>e.getTargetRanges()),n},_a=(e,t,n,o)=>{var r;const s=Ea(t,o);return s.type=e,y(s.target)&&(s.target=null!==(r=s.srcElement)&&void 0!==r?r:n),(e=>y(e.preventDefault)||(e=>e instanceof Event||w(e.initEvent))(e))(t)&&(s.preventDefault=()=>{s.defaultPrevented=!0,s.isDefaultPrevented=M,w(t.preventDefault)&&t.preventDefault()},s.stopPropagation=()=>{s.cancelBubble=!0,s.isPropagationStopped=M,w(t.stopPropagation)&&t.stopPropagation()},s.stopImmediatePropagation=()=>{s.isImmediatePropagationStopped=M,s.stopPropagation()},(e=>e.isDefaultPrevented===M||e.isDefaultPrevented===L)(s)||(s.isDefaultPrevented=!0===s.defaultPrevented?M:L,s.isPropagationStopped=!0===s.cancelBubble?M:L,s.isImmediatePropagationStopped=L)),s},ka=/^(?:mouse|contextmenu)|click/,Sa=(e,t,n,o)=>{e.addEventListener(t,n,o||!1)},Na=(e,t,n,o)=>{e.removeEventListener(t,n,o||!1)},Ra=(e,t)=>{const n=_a(e.type,e,document,t);if((e=>C(e)&&ka.test(e.type))(e)&&v(e.pageX)&&!v(e.clientX)){const t=n.target.ownerDocument||document,o=t.documentElement,r=t.body,s=n;s.pageX=e.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),s.pageY=e.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)}return n},Aa=(e,t,n)=>{const o=e.document,r={type:"ready"};if(n.domLoaded)return void t(r);const s=()=>{Na(e,"DOMContentLoaded",s),Na(e,"load",s),n.domLoaded||(n.domLoaded=!0,t(r)),e=null};"complete"===o.readyState||"interactive"===o.readyState&&o.body?s():Sa(e,"DOMContentLoaded",s),n.domLoaded||Sa(e,"load",s)};class Ta{constructor(){this.domLoaded=!1,this.events={},this.count=1,this.expando="mce-data-"+(+new Date).toString(32),this.hasFocusIn="onfocusin"in document.documentElement,this.count=1}bind(e,t,n,o){const r=this;let s;const a=window,i=e=>{r.executeHandlers(Ra(e||a.event),l)};if(!e||er(e)||or(e))return n;let l;e[r.expando]?l=e[r.expando]:(l=r.count++,e[r.expando]=l,r.events[l]={}),o=o||e;const d=t.split(" ");let c=d.length;for(;c--;){let t=d[c],u=i,m=!1,f=!1;"DOMContentLoaded"===t&&(t="ready"),r.domLoaded&&"ready"===t&&"complete"===e.readyState?n.call(o,Ra({type:t})):(r.hasFocusIn||"focusin"!==t&&"focusout"!==t||(m=!0,f="focusin"===t?"focus":"blur",u=e=>{const t=Ra(e||a.event);t.type="focus"===t.type?"focusin":"focusout",r.executeHandlers(t,l)}),s=r.events[l][t],s?"ready"===t&&r.domLoaded?n(Ra({type:t})):s.push({func:n,scope:o}):(r.events[l][t]=s=[{func:n,scope:o}],s.fakeName=f,s.capture=m,s.nativeHandler=u,"ready"===t?Aa(e,u,r):Sa(e,f||t,u,m)))}return e=s=null,n}unbind(e,t,n){if(!e||er(e)||or(e))return this;const o=e[this.expando];if(o){let r=this.events[o];if(t){const o=t.split(" ");let s=o.length;for(;s--;){const t=o[s],a=r[t];if(a){if(n){let e=a.length;for(;e--;)if(a[e].func===n){const n=a.nativeHandler,o=a.fakeName,s=a.capture,i=a.slice(0,e).concat(a.slice(e+1));i.nativeHandler=n,i.fakeName=o,i.capture=s,r[t]=i}}n&&0!==a.length||(delete r[t],Na(e,a.fakeName||t,a.nativeHandler,a.capture))}}}else ge(r,((t,n)=>{Na(e,t.fakeName||n,t.nativeHandler,t.capture)})),r={};for(const e in r)if(Ee(r,e))return this;delete this.events[o];try{delete e[this.expando]}catch(t){e[this.expando]=null}}return this}fire(e,t,n){return this.dispatch(e,t,n)}dispatch(e,t,n){if(!e||er(e)||or(e))return this;const o=Ra({type:t,target:e},n);do{const t=e[this.expando];t&&this.executeHandlers(o,t),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow}while(e&&!o.isPropagationStopped());return this}clean(e){if(!e||er(e)||or(e))return this;if(e[this.expando]&&this.unbind(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName){this.unbind(e);const t=e.getElementsByTagName("*");let n=t.length;for(;n--;)(e=t[n])[this.expando]&&this.unbind(e)}return this}destroy(){this.events={}}cancel(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}executeHandlers(e,t){const n=this.events[t],o=n&&n[e.type];if(o)for(let t=0,n=o.length;t<n;t++){const n=o[t];if(n&&!1===n.func.call(n.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return}}}Ta.Event=new Ta;const Oa=Pt.each,Ba=Pt.grep,Pa="data-mce-style",Da=Pt.makeMap("fill-opacity font-weight line-height opacity orphans widows z-index zoom"," "),La=(e,t,n)=>{y(n)||""===n?on(e,t):Jt(e,t,n)},Ma=e=>e.replace(/[A-Z]/g,(e=>"-"+e.toLowerCase())),Ia=(e,t)=>{let n=0;if(e)for(let o=e.nodeType,r=e.previousSibling;r;r=r.previousSibling){const e=r.nodeType;(!t||!er(r)||e!==o&&r.data.length)&&(n++,o=e)}return n},Fa=(e,t)=>{const n=en(t,"style"),o=e.serialize(e.parse(n),Ht(t));La(t,Pa,o)},Ua=(e,t,n)=>{const o=Ma(t);y(n)||""===n?go(e,o):io(e,o,((e,t)=>x(e)?Ee(Da,t)?e+"":e+"px":e)(n,o))},za=(e,t={})=>{const n={},o=window,r={};let s=0;const a=Is.forElement(yn(e),{contentCssCors:t.contentCssCors,referrerPolicy:t.referrerPolicy}),i=[],l=t.schema?t.schema:ua({}),d=wa({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope,force_hex_color:t.force_hex_color},t.schema),c=t.ownEvents?new Ta:Ta.Event,u=l.getBlockElements(),f=t=>t&&e&&m(t)?e.getElementById(t):t,g=e=>{const t=f(e);return C(t)?yn(t):null},h=(e,t,n="")=>{let o;const r=g(e);if(C(r)&&Wt(r)){const e=G[t];o=e&&e.get?e.get(r.dom,t):en(r,t)}return C(o)?o:n},b=e=>{const t=f(e);return y(t)?[]:t.attributes},v=(e,n,o)=>{O(e,(e=>{if(qo(e)){const r=yn(e),s=""===o?null:o,a=en(r,n),i=G[n];i&&i.set?i.set(r.dom,s,n):La(r,n,s),a!==s&&t.onSetAttrib&&t.onSetAttrib({attrElm:r.dom,attrName:n,attrValue:s})}}))},x=()=>t.root_element||e.body,E=(t,n)=>((e,t,n)=>{let o=0,r=0;const s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===co(yn(e),"position")){const n=t.getBoundingClientRect();return o=n.left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,r=n.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop,{x:o,y:r}}let a=t;for(;a&&a!==n&&a.nodeType&&!Ls(a,n);){const e=a;o+=e.offsetLeft||0,r+=e.offsetTop||0,a=e.offsetParent}for(a=t.parentNode;a&&a!==n&&a.nodeType&&!Ls(a,n);)o-=a.scrollLeft||0,r-=a.scrollTop||0,a=a.parentNode;r+=(e=>Ps.isFirefox()&&"table"===Ht(e)?Ds(Mn(e)).filter((e=>"caption"===Ht(e))).bind((e=>Ds(Ln(e)).map((t=>{const n=t.dom.offsetTop,o=e.dom.offsetTop,r=e.dom.offsetHeight;return n<=o?-r:0})))).getOr(0):0)(yn(t))}return{x:o,y:r}})(e.body,f(t),n),k=(e,t,n)=>{const o=f(e);var r;if(!y(o)&&(Vo(o)||qo(r=o)&&"http://www.w3.org/2000/svg"===r.namespaceURI))return n?co(yn(o),Ma(t)):("float"===(t=t.replace(/-(\D)/g,((e,t)=>t.toUpperCase())))&&(t="cssFloat"),o.style?o.style[t]:void 0)},S=e=>{const t=f(e);if(!t)return{w:0,h:0};let n=k(t,"width"),o=k(t,"height");return n&&-1!==n.indexOf("px")||(n="0"),o&&-1!==o.indexOf("px")||(o="0"),{w:parseInt(n,10)||t.offsetWidth||t.clientWidth,h:parseInt(o,10)||t.offsetHeight||t.clientHeight}},R=(e,t)=>{if(!e)return!1;const n=p(e)?e:[e];return $(n,(e=>xn(yn(e),t)))},A=(e,t,n,o)=>{const r=[];let s=f(e);o=void 0===o;const a=n||("BODY"!==x().nodeName?x().parentNode:null);if(m(t))if("*"===t)t=qo;else{const e=t;t=t=>R(t,e)}for(;s&&!(s===a||y(s.nodeType)||rr(s)||sr(s));){if(!t||t(s)){if(!o)return[s];r.push(s)}s=s.parentNode}return o?r:null},T=(e,t,n)=>{let o=t;if(e){m(t)&&(o=e=>R(e,t));for(let t=e[n];t;t=t[n])if(w(o)&&o(t))return t}return null},O=function(e,t,n){const o=null!=n?n:this;if(p(e)){const n=[];return Oa(e,((e,r)=>{const s=f(e);s&&n.push(t.call(o,s,r))})),n}{const n=f(e);return!!n&&t.call(o,n)}},B=(e,t)=>{O(e,(e=>{ge(t,((t,n)=>{v(e,n,t)}))}))},P=(e,t)=>{O(e,(e=>{const n=yn(e);So(n,t)}))},D=(t,n,o,r,s)=>O(t,(t=>{const a=m(n)?e.createElement(n):n;return C(o)&&B(a,o),r&&(!m(r)&&r.nodeType?a.appendChild(r):m(r)&&P(a,r)),s?a:t.appendChild(a)})),L=(t,n,o)=>D(e.createElement(t),t,n,o,!0),M=ea.encodeAllRaw,I=(e,t)=>O(e,(e=>{const n=yn(e);return t&&V(Mn(n),(e=>{Kt(e)&&0===e.dom.length?xo(e):po(n,e)})),xo(n),n.dom})),F=(e,t,n)=>{O(e,(e=>{if(qo(e)){const o=yn(e),r=t.split(" ");V(r,(e=>{C(n)?(n?un:fn)(o,e):((e,t)=>{const n=an(e)?e.dom.classList.toggle(t):((e,t)=>H(ln(e),t)?cn(e,t):dn(e,t))(e,t);mn(e)})(o,e)}))}}))},U=(e,t,n)=>O(t,(o=>{var r;const s=p(t)?e.cloneNode(!0):e;return n&&Oa(Ba(o.childNodes),(e=>{s.appendChild(e)})),null===(r=o.parentNode)||void 0===r||r.replaceChild(s,o),o})),z=e=>{if(qo(e)){const t="a"===e.nodeName.toLowerCase()&&!h(e,"href")&&h(e,"id");if(h(e,"name")||h(e,"data-mce-bookmark")||t)return!0}return!1},j=()=>e.createRange(),q=(n,r,s,a)=>{if(p(n)){let e=n.length;const t=[];for(;e--;)t[e]=q(n[e],r,s,a);return t}return!t.collect||n!==e&&n!==o||i.push([n,r,s,a]),c.bind(n,r,s,a||Y)},W=(t,n,r)=>{if(p(t)){let e=t.length;const o=[];for(;e--;)o[e]=W(t[e],n,r);return o}if(i.length>0&&(t===e||t===o)){let e=i.length;for(;e--;){const[o,s,a]=i[e];t!==o||n&&n!==s||r&&r!==a||c.unbind(o,s,a)}}return c.unbind(t,n,r)},K=e=>{if(e&&Vo(e)){const t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},Y={doc:e,settings:t,win:o,files:r,stdMode:!0,boxModel:!0,styleSheetLoader:a,boundEvents:i,styles:d,schema:l,events:c,isBlock:e=>m(e)?Ee(u,e):qo(e)&&(Ee(u,e.nodeName)||Ts(l,e)),root:null,clone:(e,t)=>e.cloneNode(t),getRoot:x,getViewPort:e=>{const t=Io(e);return{x:t.x,y:t.y,w:t.width,h:t.height}},getRect:e=>{const t=f(e),n=E(t),o=S(t);return{x:n.x,y:n.y,w:o.w,h:o.h}},getSize:S,getParent:(e,t,n)=>{const o=A(e,t,n,!1);return o&&o.length>0?o[0]:null},getParents:A,get:f,getNext:(e,t)=>T(e,t,"nextSibling"),getPrev:(e,t)=>T(e,t,"previousSibling"),select:(n,o)=>{var r,s;const a=null!==(s=null!==(r=f(o))&&void 0!==r?r:t.root_element)&&void 0!==s?s:e;return w(a.querySelectorAll)?ce(a.querySelectorAll(n)):[]},is:R,add:D,create:L,createHTML:(e,t,n="")=>{let o="<"+e;for(const e in t)_e(t,e)&&(o+=" "+e+'="'+M(t[e])+'"');return Ge(n)&&Ee(l.getVoidElements(),e)?o+" />":o+">"+n+"</"+e+">"},createFragment:t=>{const n=e.createElement("div"),o=e.createDocumentFragment();let r;for(o.appendChild(n),t&&(n.innerHTML=t);r=n.firstChild;)o.appendChild(r);return o.removeChild(n),o},remove:I,setStyle:(e,n,o)=>{O(e,(e=>{const r=yn(e);Ua(r,n,o),t.update_styles&&Fa(d,r)}))},getStyle:k,setStyles:(e,n)=>{O(e,(e=>{const o=yn(e);ge(n,((e,t)=>{Ua(o,t,e)})),t.update_styles&&Fa(d,o)}))},removeAllAttribs:e=>O(e,(e=>{const t=e.attributes;for(let n=t.length-1;n>=0;n--)e.removeAttributeNode(t.item(n))})),setAttrib:v,setAttribs:B,getAttrib:h,getPos:E,parseStyle:e=>d.parse(e),serializeStyle:(e,t)=>d.serialize(e,t),addStyle:t=>{if(Y!==za.DOM&&e===document){if(n[t])return;n[t]=!0}let o=e.getElementById("mceDefaultStyles");if(!o){o=e.createElement("style"),o.id="mceDefaultStyles",o.type="text/css";const t=e.head;t.firstChild?t.insertBefore(o,t.firstChild):t.appendChild(o)}o.styleSheet?o.styleSheet.cssText+=t:o.appendChild(e.createTextNode(t))},loadCSS:e=>{e||(e=""),V(e.split(","),(e=>{r[e]=!0,a.load(e).catch(_)}))},addClass:(e,t)=>{F(e,t,!0)},removeClass:(e,t)=>{F(e,t,!1)},hasClass:(e,t)=>{const n=g(e),o=t.split(" ");return C(n)&&ne(o,(e=>gn(n,e)))},toggleClass:F,show:e=>{O(e,(e=>go(yn(e),"display")))},hide:e=>{O(e,(e=>io(yn(e),"display","none")))},isHidden:e=>{const t=g(e);return C(t)&&Dt(mo(t,"display"),"none")},uniqueId:e=>(e||"mce_")+s++,setHTML:P,getOuterHTML:e=>{const t=g(e);return C(t)?qo(t.dom)?t.dom.outerHTML:(e=>{const t=bn("div"),n=yn(e.dom.cloneNode(!0));return vo(t,n),ko(t)})(t):""},setOuterHTML:(e,t)=>{O(e,(e=>{qo(e)&&(e.outerHTML=t)}))},decode:ea.decode,encode:M,insertAfter:(e,t)=>{const n=f(t);return O(e,(e=>{const t=null==n?void 0:n.parentNode,o=null==n?void 0:n.nextSibling;return t&&(o?t.insertBefore(e,o):t.appendChild(e)),e}))},replace:U,rename:(e,t)=>{if(e.nodeName!==t.toUpperCase()){const n=L(t);return Oa(b(e),(t=>{v(n,t.nodeName,h(e,t.nodeName))})),U(n,e,!0),n}return e},findCommonAncestor:(e,t)=>{let n=e;for(;n;){let e=t;for(;e&&n!==e;)e=e.parentNode;if(n===e)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},run:O,getAttribs:b,isEmpty:(e,t,n)=>{let o=0;if(z(e))return!1;const r=e.firstChild;if(r){const s=new jo(r,e),a=l?l.getWhitespaceElements():{},i=t||(l?l.getNonEmptyElements():null);let d=r;do{if(qo(d)){const e=d.getAttribute("data-mce-bogus");if(e){d=s.next("all"===e);continue}const t=d.nodeName.toLowerCase();if(i&&i[t]){if("br"===t){o++,d=s.next();continue}return!1}if(z(d))return!1}if(or(d))return!1;if(er(d)&&!ss(d.data)&&(!(null==n?void 0:n.includeZwsp)||!as(d.data)))return!1;if(er(d)&&d.parentNode&&a[d.parentNode.nodeName]&&ss(d.data))return!1;d=s.next()}while(d)}return o<=1},createRng:j,nodeIndex:Ia,split:(e,t,n)=>{let o,r,s=j();if(e&&t&&e.parentNode&&t.parentNode){const a=e.parentNode;return s.setStart(a,Ia(e)),s.setEnd(t.parentNode,Ia(t)),o=s.extractContents(),s=j(),s.setStart(t.parentNode,Ia(t)+1),s.setEnd(a,Ia(e)+1),r=s.extractContents(),a.insertBefore(zs(Y,o,l),e),n?a.insertBefore(n,e):a.insertBefore(t,e),a.insertBefore(zs(Y,r,l),e),I(e),n||t}},bind:q,unbind:W,fire:(e,t,n)=>c.dispatch(e,t,n),dispatch:(e,t,n)=>c.dispatch(e,t,n),getContentEditable:K,getContentEditableParent:e=>{const t=x();let n=null;for(let o=e;o&&o!==t&&(n=K(o),null===n);o=o.parentNode);return n},isEditable:e=>{if(C(e)){const t=qo(e)?e:e.parentElement;return C(t)&&Vo(t)&&oo(yn(t))}return!1},destroy:()=>{if(i.length>0){let e=i.length;for(;e--;){const[t,n,o]=i[e];c.unbind(t,n,o)}}ge(r,((e,t)=>{a.unload(t),delete r[t]}))},isChildOf:(e,t)=>e===t||t.contains(e),dumpRng:e=>"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},G=((e,t,n)=>{const o=t.keep_values,r={set:(e,o,r)=>{const s=yn(e);w(t.url_converter)&&C(o)&&(o=t.url_converter.call(t.url_converter_scope||n(),String(o),r,e)),La(s,"data-mce-"+r,o),La(s,r,o)},get:(e,t)=>{const n=yn(e);return en(n,"data-mce-"+t)||en(n,t)}},s={style:{set:(t,n)=>{const r=yn(t);o&&La(r,Pa,n),on(r,"style"),m(n)&&lo(r,e.parse(n))},get:t=>{const n=yn(t),o=en(n,Pa)||en(n,"style");return e.serialize(e.parse(o),Ht(n))}}};return o&&(s.href=s.src=r),s})(d,t,N(Y));return Y};za.DOM=za(document),za.nodeIndex=Ia;const ja=za.DOM;class Ha{constructor(e={}){this.states={},this.queue=[],this.scriptLoadedCallbacks={},this.queueLoadedCallbacks=[],this.loading=!1,this.settings=e}_setReferrerPolicy(e){this.settings.referrerPolicy=e}loadScript(e){return new Promise(((t,n)=>{const o=ja;let r;const s=()=>{o.remove(a),r&&(r.onerror=r.onload=r=null)},a=o.uniqueId();r=document.createElement("script"),r.id=a,r.type="text/javascript",r.src=Pt._addCacheSuffix(e),this.settings.referrerPolicy&&o.setAttrib(r,"referrerpolicy",this.settings.referrerPolicy),r.onload=()=>{s(),t()},r.onerror=()=>{s(),n("Failed to load script: "+e)},(document.getElementsByTagName("head")[0]||document.body).appendChild(r)}))}isDone(e){return 2===this.states[e]}markDone(e){this.states[e]=2}add(e){const t=this;return t.queue.push(e),void 0===t.states[e]&&(t.states[e]=0),new Promise(((n,o)=>{t.scriptLoadedCallbacks[e]||(t.scriptLoadedCallbacks[e]=[]),t.scriptLoadedCallbacks[e].push({resolve:n,reject:o})}))}load(e){return this.add(e)}remove(e){delete this.states[e],delete this.scriptLoadedCallbacks[e]}loadQueue(){const e=this.queue;return this.queue=[],this.loadScripts(e)}loadScripts(e){const t=this,n=(e,n)=>{xe(t.scriptLoadedCallbacks,n).each((t=>{V(t,(t=>t[e](n)))})),delete t.scriptLoadedCallbacks[n]},o=e=>{const t=Y(e,(e=>"rejected"===e.status));return t.length>0?Promise.reject(te(t,(({reason:e})=>p(e)?e:[e]))):Promise.resolve()},r=e=>Promise.allSettled(q(e,(e=>2===t.states[e]?(n("resolve",e),Promise.resolve()):3===t.states[e]?(n("reject",e),Promise.reject(e)):(t.states[e]=1,t.loadScript(e).then((()=>{t.states[e]=2,n("resolve",e);const s=t.queue;return s.length>0?(t.queue=[],r(s).then(o)):Promise.resolve()}),(()=>(t.states[e]=3,n("reject",e),Promise.reject(e)))))))),s=e=>(t.loading=!0,r(e).then((e=>{t.loading=!1;const n=t.queueLoadedCallbacks.shift();return I.from(n).each(D),o(e)}))),a=ke(e);return t.loading?new Promise(((e,n)=>{t.queueLoadedCallbacks.push((()=>{s(a).then(e,n)}))})):s(a)}}Ha.ScriptLoader=new Ha;const $a=e=>{let t=e;return{get:()=>t,set:e=>{t=e}}},qa={},Va=$a("en"),Wa=()=>xe(qa,Va.get()),Ka={getData:()=>pe(qa,(e=>({...e}))),setCode:e=>{e&&Va.set(e)},getCode:()=>Va.get(),add:(e,t)=>{let n=qa[e];n||(qa[e]=n={});const o=q(me(t),(e=>e.toLowerCase()));ge(t,((e,r)=>{const s=r.toLowerCase();s!==r&&((e,t)=>{const n=e.indexOf(t);return-1!==n&&e.indexOf(t,n+1)>n})(o,s)?(Ee(t,s)||(n[s]=e),n[r]=e):n[s]=e}))},translate:e=>{const t=Wa().getOr({}),n=e=>w(e)?Object.prototype.toString.call(e):o(e)?"":""+e,o=e=>""===e||null==e,r=e=>{const o=n(e);return Ee(t,o)?n(t[o]):xe(t,o.toLowerCase()).map(n).getOr(o)},s=e=>e.replace(/{context:\w+}$/,"");if(o(e))return"";if(f(a=e)&&Ee(a,"raw"))return n(e.raw);var a;if((e=>p(e)&&e.length>1)(e)){const t=e.slice(1);return s(r(e[0]).replace(/\{([0-9]+)\}/g,((e,o)=>Ee(t,o)?n(t[o]):e)))}return s(r(e))},isRtl:()=>Wa().bind((e=>xe(e,"_dir"))).exists((e=>"rtl"===e)),hasCode:e=>Ee(qa,e)},Ya=()=>{const e=[],t={},n={},o=[],r=(e,t)=>{const n=Y(o,(n=>n.name===e&&n.state===t));V(n,(e=>e.resolve()))},s=e=>Ee(t,e),a=(e,n)=>{const o=Ka.getCode();!o||n&&-1===(","+(n||"")+",").indexOf(","+o+",")||Ha.ScriptLoader.add(t[e]+"/langs/"+o+".js")},i=(e,t="added")=>"added"===t&&(e=>Ee(n,e))(e)||"loaded"===t&&s(e)?Promise.resolve():new Promise((n=>{o.push({name:e,state:t,resolve:n})}));return{items:e,urls:t,lookup:n,get:e=>{if(n[e])return n[e].instance},requireLangPack:(e,t)=>{!1!==Ya.languageLoad&&(s(e)?a(e,t):i(e,"loaded").then((()=>a(e,t))))},add:(t,o)=>(e.push(o),n[t]={instance:o},r(t,"added"),o),remove:e=>{delete t[e],delete n[e]},createUrl:(e,t)=>m(t)?m(e)?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}:t,load:(e,o)=>{if(t[e])return Promise.resolve();let s=m(o)?o:o.prefix+o.resource+o.suffix;0!==s.indexOf("/")&&-1===s.indexOf("://")&&(s=Ya.baseURL+"/"+s),t[e]=s.substring(0,s.lastIndexOf("/"));const a=()=>(r(e,"loaded"),Promise.resolve());return n[e]?a():Ha.ScriptLoader.add(s).then(a)},waitFor:i}};Ya.languageLoad=!0,Ya.baseURL="",Ya.PluginManager=Ya(),Ya.ThemeManager=Ya(),Ya.ModelManager=Ya();const Ga=e=>{const t=$a(I.none()),n=()=>t.get().each((e=>clearInterval(e)));return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:o=>{n(),t.set(I.some(setInterval(o,e)))}}},Xa=()=>{const e=(e=>{const t=$a(I.none()),n=()=>t.get().each(e);return{clear:()=>{n(),t.set(I.none())},isSet:()=>t.get().isSome(),get:()=>t.get(),set:e=>{n(),t.set(I.some(e))}}})(_);return{...e,on:t=>e.get().each(t)}},Qa=(e,t)=>{let n=null;return{cancel:()=>{h(n)||(clearTimeout(n),n=null)},throttle:(...o)=>{h(n)&&(n=setTimeout((()=>{n=null,e.apply(null,o)}),t))}}},Ja=(e,t)=>{let n=null;const o=()=>{h(n)||(clearTimeout(n),n=null)};return{cancel:o,throttle:(...r)=>{o(),n=setTimeout((()=>{n=null,e.apply(null,r)}),t)}}},Za=N("mce-annotation"),ei=N("data-mce-annotation"),ti=N("data-mce-annotation-uid"),ni=N("data-mce-annotation-active"),oi=N("data-mce-annotation-classes"),ri=N("data-mce-annotation-attrs"),si=e=>t=>_n(t,e),ai=(e,t)=>{const n=e.selection.getRng(),o=yn(n.startContainer),r=yn(e.getBody()),s=t.fold((()=>"."+Za()),(e=>`[${ei()}="${e}"]`)),a=In(o,n.startOffset).getOr(o);return no(a,s,si(r)).bind((t=>tn(t,`${ti()}`).bind((n=>tn(t,`${ei()}`).map((t=>{const o=li(e,n);return{uid:n,name:t,elements:o}}))))))},ii=(e,t)=>nn(e,"data-mce-bogus")||zo(e,'[data-mce-bogus="all"]',si(t)),li=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ti()}="${t}"]`);return Y(o,(e=>!ii(e,n)))},di=(e,t)=>{const n=yn(e.getBody()),o=Uo(n,`[${ei()}="${t}"]`),r={};return V(o,(e=>{if(!ii(e,n)){const t=en(e,ti()),n=xe(r,t).getOr([]);r[t]=n.concat([e])}})),r};let ci=0;const ui=e=>{const t=(new Date).getTime(),n=Math.floor(1e9*Math.random());return ci++,e+"_"+n+ci+String(t)},mi=(e,t)=>yn(e.dom.cloneNode(t)),fi=e=>mi(e,!1),gi=e=>mi(e,!0),pi=(e,t,n=L)=>{const o=new jo(e,t),r=e=>{let t;do{t=o[e]()}while(t&&!er(t)&&!n(t));return I.from(t).filter(er)};return{current:()=>I.from(o.current()).filter(er),next:()=>r("next"),prev:()=>r("prev"),prev2:()=>r("prev2")}},hi=(e,t)=>{const n=t||(t=>e.isBlock(t)||ar(t)||dr(t)),o=(e,t,n,r)=>{if(er(e)){const n=r(e,t,e.data);if(-1!==n)return I.some({container:e,offset:n})}return n().bind((e=>o(e.container,e.offset,n,r)))};return{backwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.prev().map((e=>({container:e,offset:e.length})))),s).getOrNull()},forwards:(t,r,s,a)=>{const i=pi(t,null!=a?a:e.getRoot(),n);return o(t,r,(()=>i.next().map((e=>({container:e,offset:0})))),s).getOrNull()}}},bi=Math.round,vi=e=>e?{left:bi(e.left),top:bi(e.top),bottom:bi(e.bottom),right:bi(e.right),width:bi(e.width),height:bi(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0},yi=(e,t)=>(e=vi(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e),Ci=(e,t,n)=>e>=0&&e<=Math.min(t.height,n.height)/2,wi=(e,t)=>{const n=Math.min(t.height/2,e.height/2);return e.bottom-n<t.top||!(e.top>t.bottom)&&Ci(t.top-e.bottom,e,t)},xi=(e,t)=>e.top>t.bottom||!(e.bottom<t.top)&&Ci(t.bottom-e.top,e,t),Ei=(e,t,n)=>{const o=Math.max(Math.min(t,e.left+e.width),e.left),r=Math.max(Math.min(n,e.top+e.height),e.top);return Math.sqrt((t-o)*(t-o)+(n-r)*(n-r))},_i=e=>{const t=e.startContainer,n=e.startOffset;return t===e.endContainer&&t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},ki=(e,t)=>{if(qo(e)&&e.hasChildNodes()){const n=e.childNodes,o=((e,t,n)=>Math.min(Math.max(e,0),n))(t,0,n.length-1);return n[o]}return e},Si=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),Ni=e=>m(e)&&e.charCodeAt(0)>=768&&Si.test(e),Ri=qo,Ai=ts,Ti=Yo("display","block table"),Oi=Yo("float","left right"),Bi=((...e)=>t=>{for(let n=0;n<e.length;n++)if(!e[n](t))return!1;return!0})(Ri,Ai,O(Oi)),Pi=O(Yo("white-space","pre pre-line pre-wrap")),Di=er,Li=ar,Mi=za.nodeIndex,Ii=(e,t)=>t<0&&qo(e)&&e.hasChildNodes()?void 0:ki(e,t),Fi=e=>e?e.createRange():za.DOM.createRng(),Ui=e=>m(e)&&/[\r\n\t ]/.test(e),zi=e=>!!e.setStart&&!!e.setEnd,ji=e=>{const t=e.startContainer,n=e.startOffset;if(Ui(e.toString())&&Pi(t.parentNode)&&er(t)){const e=t.data;if(Ui(e[n-1])||Ui(e[n+1]))return!0}return!1},Hi=e=>0===e.left&&0===e.right&&0===e.top&&0===e.bottom,$i=e=>{var t;let n;const o=e.getClientRects();return n=o.length>0?vi(o[0]):vi(e.getBoundingClientRect()),!zi(e)&&Li(e)&&Hi(n)?(e=>{const t=e.ownerDocument,n=Fi(t),o=t.createTextNode(br),r=e.parentNode;r.insertBefore(o,e),n.setStart(o,0),n.setEnd(o,1);const s=vi(n.getBoundingClientRect());return r.removeChild(o),s})(e):Hi(n)&&zi(e)&&null!==(t=(e=>{const t=e.startContainer,n=e.endContainer,o=e.startOffset,r=e.endOffset;if(t===n&&er(n)&&0===o&&1===r){const t=e.cloneRange();return t.setEndAfter(n),$i(t)}return null})(e))&&void 0!==t?t:n},qi=(e,t)=>{const n=yi(e,t);return n.width=1,n.right=n.left+1,n},Vi=(e,t,n)=>{const o=()=>(n||(n=(e=>{const t=[],n=e=>{var n,o;0!==e.height&&(t.length>0&&(n=e,o=t[t.length-1],n.left===o.left&&n.top===o.top&&n.bottom===o.bottom&&n.right===o.right)||t.push(e))},o=(e,t)=>{const o=Fi(e.ownerDocument);if(t<e.data.length){if(Ni(e.data[t]))return;if(Ni(e.data[t-1])&&(o.setStart(e,t),o.setEnd(e,t+1),!ji(o)))return void n(qi($i(o),!1))}t>0&&(o.setStart(e,t-1),o.setEnd(e,t),ji(o)||n(qi($i(o),!1))),t<e.data.length&&(o.setStart(e,t),o.setEnd(e,t+1),ji(o)||n(qi($i(o),!0)))},r=e.container(),s=e.offset();if(Di(r))return o(r,s),t;if(Ri(r))if(e.isAtEnd()){const e=Ii(r,s);Di(e)&&o(e,e.data.length),Bi(e)&&!Li(e)&&n(qi($i(e),!1))}else{const a=Ii(r,s);if(Di(a)&&o(a,0),Bi(a)&&e.isAtEnd())return n(qi($i(a),!1)),t;const i=Ii(e.container(),e.offset()-1);Bi(i)&&!Li(i)&&(Ti(i)||Ti(a)||!Bi(a))&&n(qi($i(i),!1)),Bi(a)&&n(qi($i(a),!0))}return t})(Vi(e,t))),n);return{container:N(e),offset:N(t),toRange:()=>{const n=Fi(e.ownerDocument);return n.setStart(e,t),n.setEnd(e,t),n},getClientRects:o,isVisible:()=>o().length>0,isAtStart:()=>(Di(e),0===t),isAtEnd:()=>Di(e)?t>=e.data.length:t>=e.childNodes.length,isEqual:n=>n&&e===n.container()&&t===n.offset(),getNode:n=>Ii(e,n?t-1:t)}};Vi.fromRangeStart=e=>Vi(e.startContainer,e.startOffset),Vi.fromRangeEnd=e=>Vi(e.endContainer,e.endOffset),Vi.after=e=>Vi(e.parentNode,Mi(e)+1),Vi.before=e=>Vi(e.parentNode,Mi(e)),Vi.isAbove=(e,t)=>Mt(le(t.getClientRects()),de(e.getClientRects()),wi).getOr(!1),Vi.isBelow=(e,t)=>Mt(de(t.getClientRects()),le(e.getClientRects()),xi).getOr(!1),Vi.isAtStart=e=>!!e&&e.isAtStart(),Vi.isAtEnd=e=>!!e&&e.isAtEnd(),Vi.isTextPosition=e=>!!e&&er(e.container()),Vi.isElementPosition=e=>!Vi.isTextPosition(e);const Wi=(e,t)=>{er(t)&&0===t.data.length&&e.remove(t)},Ki=(e,t,n)=>{sr(n)?((e,t,n)=>{const o=I.from(n.firstChild),r=I.from(n.lastChild);t.insertNode(n),o.each((t=>Wi(e,t.previousSibling))),r.each((t=>Wi(e,t.nextSibling)))})(e,t,n):((e,t,n)=>{t.insertNode(n),Wi(e,n.previousSibling),Wi(e,n.nextSibling)})(e,t,n)},Yi=er,Gi=Xo,Xi=za.nodeIndex,Qi=e=>{const t=e.parentNode;return Gi(t)?Qi(t):t},Ji=e=>e?Oe(e.childNodes,((e,t)=>(Gi(t)&&"BR"!==t.nodeName?e=e.concat(Ji(t)):e.push(t),e)),[]):[],Zi=e=>t=>e===t,el=e=>(Yi(e)?"text()":e.nodeName.toLowerCase())+"["+(e=>{let t,n;t=Ji(Qi(e)),n=Be(t,Zi(e),e),t=t.slice(0,n+1);const o=Oe(t,((e,n,o)=>(Yi(n)&&Yi(t[o-1])&&e++,e)),0);return t=Te(t,Ko([e.nodeName])),n=Be(t,Zi(e),e),n-o})(e)+"]",tl=(e,t)=>{let n,o=[],r=t.container(),s=t.offset();if(Yi(r))n=((e,t)=>{let n=e;for(;(n=n.previousSibling)&&Yi(n);)t+=n.data.length;return t})(r,s);else{const e=r.childNodes;s>=e.length?(n="after",s=e.length-1):n="before",r=e[s]}o.push(el(r));let a=((e,t,n)=>{const o=[];for(let n=t.parentNode;n&&n!==e;n=n.parentNode)o.push(n);return o})(e,r);return a=Te(a,O(Xo)),o=o.concat(Ae(a,(e=>el(e)))),o.reverse().join("/")+","+n},nl=(e,t)=>{if(!t)return null;const n=t.split(","),o=n[0].split("/"),r=n.length>1?n[1]:"before",s=Oe(o,((e,t)=>{const n=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t);return n?("text()"===n[1]&&(n[1]="#text"),((e,t,n)=>{let o=Ji(e);return o=Te(o,((e,t)=>!Yi(e)||!Yi(o[t-1]))),o=Te(o,Ko([t])),o[n]})(e,n[1],parseInt(n[2],10))):null}),e);if(!s)return null;if(!Yi(s)&&s.parentNode){let e;return e="after"===r?Xi(s)+1:Xi(s),Vi(s.parentNode,e)}return((e,t)=>{let n=e,o=0;for(;Yi(n);){const r=n.data.length;if(t>=o&&t<=o+r){e=n,t-=o;break}if(!Yi(n.nextSibling)){e=n,t=r;break}o+=r,n=n.nextSibling}return Yi(e)&&t>e.data.length&&(t=e.data.length),Vi(e,t)})(s,parseInt(r,10))},ol=dr,rl=(e,t,n,o,r)=>{const s=r?o.startContainer:o.endContainer;let a=r?o.startOffset:o.endOffset;const i=[],l=e.getRoot();if(er(s))i.push(n?((e,t,n)=>{let o=e(t.data.slice(0,n)).length;for(let n=t.previousSibling;n&&er(n);n=n.previousSibling)o+=e(n.data).length;return o})(t,s,a):a);else{let t=0;const o=s.childNodes;a>=o.length&&o.length&&(t=1,a=Math.max(0,o.length-1)),i.push(e.nodeIndex(o[a],n)+t)}for(let t=s;t&&t!==l;t=t.parentNode)i.push(e.nodeIndex(t,n));return i},sl=(e,t,n)=>{let o=0;return Pt.each(e.select(t),(e=>"all"===e.getAttribute("data-mce-bogus")?void 0:e!==n&&void o++)),o},al=(e,t)=>{let n=t?e.startContainer:e.endContainer,o=t?e.startOffset:e.endOffset;if(qo(n)&&"TR"===n.nodeName){const r=n.childNodes;n=r[Math.min(t?o:o-1,r.length-1)],n&&(o=t?0:n.childNodes.length,t?e.setStart(n,o):e.setEnd(n,o))}},il=e=>(al(e,!0),al(e,!1),e),ll=(e,t)=>{if(qo(e)&&(e=ki(e,t),ol(e)))return e;if(Ur(e)){er(e)&&Ir(e)&&(e=e.parentNode);let t=e.previousSibling;if(ol(t))return t;if(t=e.nextSibling,ol(t))return t}},dl=(e,t,n)=>{const o=n.getNode(),r=n.getRng();if("IMG"===o.nodeName||ol(o)){const e=o.nodeName;return{name:e,index:sl(n.dom,e,o)}}const s=(e=>ll(e.startContainer,e.startOffset)||ll(e.endContainer,e.endOffset))(r);if(s){const e=s.tagName;return{name:e,index:sl(n.dom,e,s)}}return((e,t,n,o)=>{const r=t.dom,s=rl(r,e,n,o,!0),a=t.isForward(),i=Wr(o)?{isFakeCaret:!0}:{};return t.isCollapsed()?{start:s,forward:a,...i}:{start:s,end:rl(r,e,n,o,!1),forward:a,...i}})(e,n,t,r)},cl=(e,t,n)=>{const o={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",o,"&#xFEFF;"):e.create("span",o)},ul=(e,t)=>{const n=e.dom;let o=e.getRng();const r=n.uniqueId(),s=e.isCollapsed(),a=e.getNode(),i=a.nodeName,l=e.isForward();if("IMG"===i)return{name:i,index:sl(n,i,a)};const d=il(o.cloneRange());if(!s){d.collapse(!1);const e=cl(n,r+"_end",t);Ki(n,d,e)}o=il(o),o.collapse(!0);const c=cl(n,r+"_start",t);return Ki(n,o,c),e.moveToBookmark({id:r,keep:!0,forward:l}),{id:r,forward:l}},ml=T(dl,R,!0),fl=e=>{const t=t=>t(e),n=N(e),o=()=>r,r={tag:!0,inner:e,fold:(t,n)=>n(e),isValue:M,isError:L,map:t=>pl.value(t(e)),mapError:o,bind:t,exists:t,forall:t,getOr:n,or:o,getOrThunk:n,orThunk:o,getOrDie:n,each:t=>{t(e)},toOptional:()=>I.some(e)};return r},gl=e=>{const t=()=>n,n={tag:!1,inner:e,fold:(t,n)=>t(e),isValue:L,isError:M,map:t,mapError:t=>pl.error(t(e)),bind:t,exists:L,forall:M,getOr:R,or:R,getOrThunk:P,orThunk:P,getOrDie:B(String(e)),each:_,toOptional:I.none};return n},pl={value:fl,error:gl,fromOption:(e,t)=>e.fold((()=>gl(t)),fl)},hl=e=>{if(!p(e))throw new Error("cases must be an array");if(0===e.length)throw new Error("there must be at least one case");const t=[],n={};return V(e,((o,r)=>{const s=me(o);if(1!==s.length)throw new Error("one and only one name per case");const a=s[0],i=o[a];if(void 0!==n[a])throw new Error("duplicate key detected:"+a);if("cata"===a)throw new Error("cannot have a case named cata (sorry)");if(!p(i))throw new Error("case arguments must be an array");t.push(a),n[a]=(...n)=>{const o=n.length;if(o!==i.length)throw new Error("Wrong number of arguments to case "+a+". Expected "+i.length+" ("+i+"), got "+o);return{fold:(...t)=>{if(t.length!==e.length)throw new Error("Wrong number of arguments to fold. Expected "+e.length+", got "+t.length);return t[r].apply(null,n)},match:e=>{const o=me(e);if(t.length!==o.length)throw new Error("Wrong number of arguments to match. Expected: "+t.join(",")+"\nActual: "+o.join(","));if(!ne(t,(e=>H(o,e))))throw new Error("Not all branches were specified when using match. Specified: "+o.join(", ")+"\nRequired: "+t.join(", "));return e[a].apply(null,n)},log:e=>{console.log(e,{constructors:t,constructor:a,params:n})}}}})),n};hl([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]);const bl=e=>"inline-command"===e.type||"inline-format"===e.type,vl=e=>"block-command"===e.type||"block-format"===e.type,yl=e=>{const t=t=>pl.error({message:t,pattern:e}),n=(n,o,r)=>{if(void 0!==e.format){let r;if(p(e.format)){if(!ne(e.format,m))return t(n+" pattern has non-string items in the `format` array");r=e.format}else{if(!m(e.format))return t(n+" pattern has non-string `format` parameter");r=[e.format]}return pl.value(o(r))}return void 0!==e.cmd?m(e.cmd)?pl.value(r(e.cmd,e.value)):t(n+" pattern has non-string `cmd` parameter"):t(n+" pattern is missing both `format` and `cmd` parameters")};if(!f(e))return t("Raw pattern is not an object");if(!m(e.start))return t("Raw pattern is missing `start` parameter");if(void 0!==e.end){if(!m(e.end))return t("Inline pattern has non-string `end` parameter");if(0===e.start.length&&0===e.end.length)return t("Inline pattern has empty `start` and `end` parameters");let o=e.start,r=e.end;return 0===r.length&&(r=o,o=""),n("Inline",(e=>({type:"inline-format",start:o,end:r,format:e})),((e,t)=>({type:"inline-command",start:o,end:r,cmd:e,value:t})))}return void 0!==e.replacement?m(e.replacement)?0===e.start.length?t("Replacement pattern has empty `start` parameter"):pl.value({type:"inline-command",start:"",end:e.start,cmd:"mceInsertContent",value:e.replacement}):t("Replacement pattern has non-string `replacement` parameter"):0===e.start.length?t("Block pattern has empty `start` parameter"):n("Block",(t=>({type:"block-format",start:e.start,format:t[0]})),((t,n)=>({type:"block-command",start:e.start,cmd:t,value:n})))},Cl=e=>Y(e,vl),wl=e=>Y(e,bl),xl=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{e.fold((e=>{t.push(e)}),(e=>{n.push(e)}))})),{errors:t,values:n}})(q(e,yl));return V(t.errors,(e=>console.error(e.message,e.pattern))),t.values},El=xt().deviceType,_l=El.isTouch(),kl=za.DOM,Sl=e=>u(e,RegExp),Nl=e=>t=>t.options.get(e),Rl=e=>m(e)||f(e),Al=(e,t="")=>n=>{const o=m(n);if(o){if(-1!==n.indexOf("=")){const r=(e=>{const t=e.indexOf("=")>0?e.split(/[;,](?![^=;,]*(?:[;,]|$))/):e.split(",");return X(t,((e,t)=>{const n=t.split("="),o=n[0],r=n.length>1?n[1]:o;return e[Ve(o)]=Ve(r),e}),{})})(n);return{value:xe(r,e.id).getOr(t),valid:o}}return{value:n,valid:o}}return{valid:!1,message:"Must be a string."}},Tl=Nl("iframe_attrs"),Ol=Nl("doctype"),Bl=Nl("document_base_url"),Pl=Nl("body_id"),Dl=Nl("body_class"),Ll=Nl("content_security_policy"),Ml=Nl("br_in_pre"),Il=Nl("forced_root_block"),Fl=Nl("forced_root_block_attrs"),Ul=Nl("newline_behavior"),zl=Nl("br_newline_selector"),jl=Nl("no_newline_selector"),Hl=Nl("keep_styles"),$l=Nl("end_container_on_empty_block"),ql=Nl("automatic_uploads"),Vl=Nl("images_reuse_filename"),Wl=Nl("images_replace_blob_uris"),Kl=Nl("icons"),Yl=Nl("icons_url"),Gl=Nl("images_upload_url"),Xl=Nl("images_upload_base_path"),Ql=Nl("images_upload_credentials"),Jl=Nl("images_upload_handler"),Zl=Nl("content_css_cors"),ed=Nl("referrer_policy"),td=Nl("language"),nd=Nl("language_url"),od=Nl("indent_use_margin"),rd=Nl("indentation"),sd=Nl("content_css"),ad=Nl("content_style"),id=Nl("font_css"),ld=Nl("directionality"),dd=Nl("inline_boundaries_selector"),cd=Nl("object_resizing"),ud=Nl("resize_img_proportional"),md=Nl("placeholder"),fd=Nl("event_root"),gd=Nl("service_message"),pd=Nl("theme"),hd=Nl("theme_url"),bd=Nl("model"),vd=Nl("model_url"),yd=Nl("inline_boundaries"),Cd=Nl("formats"),wd=Nl("preview_styles"),xd=Nl("format_empty_lines"),Ed=Nl("format_noneditable_selector"),_d=Nl("custom_ui_selector"),kd=Nl("inline"),Sd=Nl("hidden_input"),Nd=Nl("submit_patch"),Rd=Nl("add_form_submit_trigger"),Ad=Nl("add_unload_trigger"),Td=Nl("custom_undo_redo_levels"),Od=Nl("disable_nodechange"),Bd=Nl("readonly"),Pd=Nl("editable_root"),Dd=Nl("content_css_cors"),Ld=Nl("plugins"),Md=Nl("external_plugins"),Id=Nl("block_unsupported_drop"),Fd=Nl("visual"),Ud=Nl("visual_table_class"),zd=Nl("visual_anchor_class"),jd=Nl("iframe_aria_text"),Hd=Nl("setup"),$d=Nl("init_instance_callback"),qd=Nl("urlconverter_callback"),Vd=Nl("auto_focus"),Wd=Nl("browser_spellcheck"),Kd=Nl("protect"),Yd=Nl("paste_block_drop"),Gd=Nl("paste_data_images"),Xd=Nl("paste_preprocess"),Qd=Nl("paste_postprocess"),Jd=Nl("newdocument_content"),Zd=Nl("paste_webkit_styles"),ec=Nl("paste_remove_styles_if_webkit"),tc=Nl("paste_merge_formats"),nc=Nl("smart_paste"),oc=Nl("paste_as_text"),rc=Nl("paste_tab_spaces"),sc=Nl("allow_html_data_urls"),ac=Nl("text_patterns"),ic=Nl("text_patterns_lookup"),lc=Nl("noneditable_class"),dc=Nl("editable_class"),cc=Nl("noneditable_regexp"),uc=Nl("preserve_cdata"),mc=Nl("highlight_on_focus"),fc=Nl("xss_sanitization"),gc=Nl("init_content_sync"),pc=e=>Pt.explode(e.options.get("images_file_types")),hc=Nl("table_tab_navigation"),bc=Nl("details_initial_state"),vc=Nl("details_serialized_state"),yc=Nl("force_hex_color"),Cc=Nl("sandbox_iframes"),wc=qo,xc=er,Ec=e=>{const t=e.parentNode;t&&t.removeChild(e)},_c=e=>{const t=Dr(e);return{count:e.length-t.length,text:t}},kc=e=>{let t;for(;-1!==(t=e.data.lastIndexOf(Br));)e.deleteData(t,1)},Sc=(e,t)=>(Rc(e),t),Nc=(e,t)=>Vi.isTextPosition(t)?((e,t)=>xc(e)&&t.container()===e?((e,t)=>{const n=_c(e.data.substr(0,t.offset())),o=_c(e.data.substr(t.offset()));return(n.text+o.text).length>0?(kc(e),Vi(e,t.offset()-n.count)):t})(e,t):Sc(e,t))(e,t):((e,t)=>t.container()===e.parentNode?((e,t)=>{const n=t.container(),o=((e,t)=>{const n=j(e,t);return-1===n?I.none():I.some(n)})(ce(n.childNodes),e).map((e=>e<t.offset()?Vi(n,t.offset()-1):t)).getOr(t);return Rc(e),o})(e,t):Sc(e,t))(e,t),Rc=e=>{wc(e)&&Ur(e)&&(zr(e)?e.removeAttribute("data-mce-caret"):Ec(e)),xc(e)&&(kc(e),0===e.data.length&&Ec(e))},Ac=dr,Tc=mr,Oc=cr,Bc=(e,t,n)=>{const o=yi(t.getBoundingClientRect(),n);let r,s;if("BODY"===e.tagName){const t=e.ownerDocument.documentElement;r=e.scrollLeft||t.scrollLeft,s=e.scrollTop||t.scrollTop}else{const t=e.getBoundingClientRect();r=e.scrollLeft-t.left,s=e.scrollTop-t.top}o.left+=r,o.right+=r,o.top+=s,o.bottom+=s,o.width=1;let a=t.offsetWidth-t.clientWidth;return a>0&&(n&&(a*=-1),o.left+=a,o.right+=a),o},Pc=(e,t,n,o)=>{const r=Xa();let s,a;const i=Il(e),l=e.dom,d=()=>{(e=>{var t,n;const o=Uo(yn(e),"*[contentEditable=false],video,audio,embed,object");for(let e=0;e<o.length;e++){const r=o[e].dom;let s=r.previousSibling;if(qr(s)){const e=s.data;1===e.length?null===(t=s.parentNode)||void 0===t||t.removeChild(s):s.deleteData(e.length-1,1)}s=r.nextSibling,$r(s)&&(1===s.data.length?null===(n=s.parentNode)||void 0===n||n.removeChild(s):s.deleteData(0,1))}})(t),a&&(Rc(a),a=null),r.on((e=>{l.remove(e.caret),r.clear()})),s&&(clearInterval(s),s=void 0)};return{show:(e,c)=>{let u;if(d(),Oc(c))return null;if(!n(c))return a=((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br),r=e.parentNode;if(t){const t=e.previousSibling;if(Mr(t)){if(Ur(t))return t;if(qr(t))return t.splitText(t.data.length-1)}null==r||r.insertBefore(o,e)}else{const t=e.nextSibling;if(Mr(t)){if(Ur(t))return t;if($r(t))return t.splitText(1),t}e.nextSibling?null==r||r.insertBefore(o,e.nextSibling):null==r||r.appendChild(o)}return o})(c,e),u=c.ownerDocument.createRange(),Lc(a.nextSibling)?(u.setStart(a,0),u.setEnd(a,0)):(u.setStart(a,1),u.setEnd(a,1)),u;{const n=((e,t,n)=>{var o;const r=(null!==(o=t.ownerDocument)&&void 0!==o?o:document).createElement(e);r.setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(Tr().dom);const s=t.parentNode;return n?null==s||s.insertBefore(r,t):t.nextSibling?null==s||s.insertBefore(r,t.nextSibling):null==s||s.appendChild(r),r})(i,c,e),d=Bc(t,c,e);l.setStyle(n,"top",d.top),a=n;const m=l.create("div",{class:"mce-visual-caret","data-mce-bogus":"all"});l.setStyles(m,{...d}),l.add(t,m),r.set({caret:m,element:c,before:e}),e&&l.addClass(m,"mce-visual-caret-before"),s=setInterval((()=>{r.on((e=>{o()?l.toggleClass(e.caret,"mce-visual-caret-hidden"):l.addClass(e.caret,"mce-visual-caret-hidden")}))}),500),u=c.ownerDocument.createRange(),u.setStart(n,0),u.setEnd(n,0)}return u},hide:d,getCss:()=>".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}",reposition:()=>{r.on((e=>{const n=Bc(t,e.element,e.before);l.setStyles(e.caret,{...n})}))},destroy:()=>clearInterval(s)}},Dc=()=>At.browser.isFirefox(),Lc=e=>Ac(e)||Tc(e),Mc=e=>(Lc(e)||Qo(e)&&Dc())&&Tn(yn(e)).exists(oo),Ic=lr,Fc=dr,Uc=mr,zc=Yo("display","block table table-cell table-caption list-item"),jc=Ur,Hc=Ir,$c=qo,qc=er,Vc=ts,Wc=e=>e>0,Kc=e=>e<0,Yc=(e,t)=>{let n;for(;n=e(t);)if(!Hc(n))return n;return null},Gc=(e,t,n,o,r)=>{const s=new jo(e,o),a=Fc(e)||Hc(e);let i;if(Kc(t)){if(a&&(i=Yc(s.prev.bind(s),!0),n(i)))return i;for(;i=Yc(s.prev.bind(s),r);)if(n(i))return i}if(Wc(t)){if(a&&(i=Yc(s.next.bind(s),!0),n(i)))return i;for(;i=Yc(s.next.bind(s),r);)if(n(i))return i}return null},Xc=(e,t)=>{for(;e&&e!==t;){if(zc(e))return e;e=e.parentNode}return null},Qc=(e,t,n)=>Xc(e.container(),n)===Xc(t.container(),n),Jc=(e,t)=>{if(!t)return I.none();const n=t.container(),o=t.offset();return $c(n)?I.from(n.childNodes[o+e]):I.none()},Zc=(e,t)=>{var n;const o=(null!==(n=t.ownerDocument)&&void 0!==n?n:document).createRange();return e?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),o},eu=(e,t,n)=>Xc(t,e)===Xc(n,e),tu=(e,t,n)=>{const o=e?"previousSibling":"nextSibling";let r=n;for(;r&&r!==t;){let e=r[o];if(e&&jc(e)&&(e=e[o]),Fc(e)||Uc(e)){if(eu(t,e,r))return e;break}if(Vc(e))break;r=r.parentNode}return null},nu=T(Zc,!0),ou=T(Zc,!1),ru=(e,t,n)=>{let o;const r=T(tu,!0,t),s=T(tu,!1,t),a=n.startContainer,i=n.startOffset;if(Ir(a)){const e=qc(a)?a.parentNode:a,t=e.getAttribute("data-mce-caret");if("before"===t&&(o=e.nextSibling,Mc(o)))return nu(o);if("after"===t&&(o=e.previousSibling,Mc(o)))return ou(o)}if(!n.collapsed)return n;if(er(a)){if(jc(a)){if(1===e){if(o=s(a),o)return nu(o);if(o=r(a),o)return ou(o)}if(-1===e){if(o=r(a),o)return ou(o);if(o=s(a),o)return nu(o)}return n}if(qr(a)&&i>=a.data.length-1)return 1===e&&(o=s(a),o)?nu(o):n;if($r(a)&&i<=1)return-1===e&&(o=r(a),o)?ou(o):n;if(i===a.data.length)return o=s(a),o?nu(o):n;if(0===i)return o=r(a),o?ou(o):n}return n},su=(e,t)=>Jc(e?0:-1,t).filter(Fc),au=(e,t,n)=>{const o=ru(e,t,n);return-1===e?Vi.fromRangeStart(o):Vi.fromRangeEnd(o)},iu=e=>I.from(e.getNode()).map(yn),lu=(e,t)=>{let n=t;for(;n=e(n);)if(n.isVisible())return n;return n},du=(e,t)=>{const n=Qc(e,t);return!(n||!ar(e.getNode()))||n};var cu;!function(e){e[e.Backwards=-1]="Backwards",e[e.Forwards=1]="Forwards"}(cu||(cu={}));const uu=dr,mu=er,fu=qo,gu=ar,pu=ts,hu=e=>Jr(e)||(e=>!!ns(e)&&!X(ce(e.getElementsByTagName("*")),((e,t)=>e||Kr(t)),!1))(e),bu=os,vu=(e,t)=>e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null,yu=(e,t)=>{if(Wc(e)){if(pu(t.previousSibling)&&!mu(t.previousSibling))return Vi.before(t);if(mu(t))return Vi(t,0)}if(Kc(e)){if(pu(t.nextSibling)&&!mu(t.nextSibling))return Vi.after(t);if(mu(t))return Vi(t,t.data.length)}return Kc(e)?gu(t)?Vi.before(t):Vi.after(t):Vi.before(t)},Cu=(e,t,n)=>{let o,r,s,a;if(!fu(n)||!t)return null;if(t.isEqual(Vi.after(n))&&n.lastChild){if(a=Vi.after(n.lastChild),Kc(e)&&pu(n.lastChild)&&fu(n.lastChild))return gu(n.lastChild)?Vi.before(n.lastChild):a}else a=t;const i=a.container();let l=a.offset();if(mu(i)){if(Kc(e)&&l>0)return Vi(i,--l);if(Wc(e)&&l<i.length)return Vi(i,++l);o=i}else{if(Kc(e)&&l>0&&(r=vu(i,l-1),pu(r)))return!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,s.data.length):Vi.after(s):mu(r)?Vi(r,r.data.length):Vi.before(r);if(Wc(e)&&l<i.childNodes.length&&(r=vu(i,l),pu(r)))return gu(r)?((e,t)=>{const n=t.nextSibling;return n&&pu(n)?mu(n)?Vi(n,0):Vi.before(n):Cu(cu.Forwards,Vi.after(t),e)})(n,r):!hu(r)&&(s=Gc(r,e,bu,r),s)?mu(s)?Vi(s,0):Vi.before(s):mu(r)?Vi(r,0):Vi.after(r);o=r||a.getNode()}if(o&&(Wc(e)&&a.isAtEnd()||Kc(e)&&a.isAtStart())&&(o=Gc(o,e,M,n,!0),bu(o,n)))return yu(e,o);r=o?Gc(o,e,bu,n):o;const d=Pe(Y(((e,t)=>{const n=[];let o=e;for(;o&&o!==t;)n.push(o),o=o.parentNode;return n})(i,n),uu));return!d||r&&d.contains(r)?r?yu(e,r):null:(a=Wc(e)?Vi.after(d):Vi.before(d),a)},wu=e=>({next:t=>Cu(cu.Forwards,t,e),prev:t=>Cu(cu.Backwards,t,e)}),xu=e=>Vi.isTextPosition(e)?0===e.offset():ts(e.getNode()),Eu=e=>{if(Vi.isTextPosition(e)){const t=e.container();return e.offset()===t.data.length}return ts(e.getNode(!0))},_u=(e,t)=>!Vi.isTextPosition(e)&&!Vi.isTextPosition(t)&&e.getNode()===t.getNode(!0),ku=(e,t,n)=>{const o=wu(t);return I.from(e?o.next(n):o.prev(n))},Su=(e,t,n)=>ku(e,t,n).bind((o=>Qc(n,o,t)&&((e,t,n)=>{return e?!_u(t,n)&&(o=t,!(!Vi.isTextPosition(o)&&ar(o.getNode())))&&Eu(t)&&xu(n):!_u(n,t)&&xu(t)&&Eu(n);var o})(e,n,o)?ku(e,t,o):I.some(o))),Nu=(e,t,n,o)=>Su(e,t,n).bind((n=>o(n)?Nu(e,t,n,o):I.some(n))),Ru=(e,t)=>{const n=e?t.firstChild:t.lastChild;return er(n)?I.some(Vi(n,e?0:n.data.length)):n?ts(n)?I.some(e?Vi.before(n):ar(o=n)?Vi.before(o):Vi.after(o)):((e,t,n)=>{const o=e?Vi.before(n):Vi.after(n);return ku(e,t,o)})(e,t,n):I.none();var o},Au=T(ku,!0),Tu=T(ku,!1),Ou=T(Ru,!0),Bu=T(Ru,!1),Pu="_mce_caret",Du=e=>qo(e)&&e.id===Pu,Lu=(e,t)=>{let n=t;for(;n&&n!==e;){if(Du(n))return n;n=n.parentNode}return null},Mu=e=>Ee(e,"name"),Iu=e=>Pt.isArray(e.start),Fu=e=>!(!Mu(e)&&b(e.forward))||e.forward,Uu=(e,t)=>(qo(t)&&e.isBlock(t)&&!t.innerHTML&&(t.innerHTML='<br data-mce-bogus="1" />'),t),zu=(e,t)=>Bu(e).fold(L,(e=>(t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0))),ju=(e,t,n)=>!(!(e=>!e.hasChildNodes())(t)||!Lu(e,t)||(((e,t)=>{var n;const o=(null!==(n=e.ownerDocument)&&void 0!==n?n:document).createTextNode(Br);e.appendChild(o),t.setStart(o,0),t.setEnd(o,0)})(t,n),0)),Hu=(e,t,n,o)=>{const r=n[t?"start":"end"],s=e.getRoot();if(r){let e=s,n=r[0];for(let t=r.length-1;e&&t>=1;t--){const n=e.childNodes;if(ju(s,e,o))return!0;if(r[t]>n.length-1)return!!ju(s,e,o)||zu(e,o);e=n[r[t]]}er(e)&&(n=Math.min(r[0],e.data.length)),qo(e)&&(n=Math.min(r[0],e.childNodes.length)),t?o.setStart(e,n):o.setEnd(e,n)}return!0},$u=e=>er(e)&&e.data.length>0,qu=(e,t,n)=>{const o=e.get(n.id+"_"+t),r=null==o?void 0:o.parentNode,s=n.keep;if(o&&r){let a,i;if("start"===t?s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.nextSibling)?(a=o.nextSibling,i=0):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)+1):(a=r,i=e.nodeIndex(o)):s?o.hasChildNodes()?(a=o.firstChild,i=1):$u(o.previousSibling)?(a=o.previousSibling,i=o.previousSibling.data.length):(a=r,i=e.nodeIndex(o)):(a=r,i=e.nodeIndex(o)),!s){const r=o.previousSibling,s=o.nextSibling;let l;for(Pt.each(Pt.grep(o.childNodes),(e=>{er(e)&&(e.data=e.data.replace(/\uFEFF/g,""))}));l=e.get(n.id+"_"+t);)e.remove(l,!0);if(er(s)&&er(r)&&!At.browser.isOpera()){const t=r.data.length;r.appendData(s.data),e.remove(s),a=r,i=t}}return I.some(Vi(a,i))}return I.none()},Vu=(e,t,n)=>((e,t,n=!1)=>2===t?dl(Dr,n,e):3===t?(e=>{const t=e.getRng();return{start:tl(e.dom.getRoot(),Vi.fromRangeStart(t)),end:tl(e.dom.getRoot(),Vi.fromRangeEnd(t)),forward:e.isForward()}})(e):t?(e=>({rng:e.getRng(),forward:e.isForward()}))(e):ul(e,!1))(e,t,n),Wu=(e,t)=>{((e,t)=>{const n=e.dom;if(t){if(Iu(t))return((e,t)=>{const n=e.createRng();return Hu(e,!0,t,n)&&Hu(e,!1,t,n)?I.some({range:n,forward:Fu(t)}):I.none()})(n,t);if((e=>m(e.start))(t))return((e,t)=>{const n=I.from(nl(e.getRoot(),t.start)),o=I.from(nl(e.getRoot(),t.end));return Mt(n,o,((n,o)=>{const r=e.createRng();return r.setStart(n.container(),n.offset()),r.setEnd(o.container(),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if((e=>Ee(e,"id"))(t))return((e,t)=>{const n=qu(e,"start",t),o=qu(e,"end",t);return Mt(n,o.or(n),((n,o)=>{const r=e.createRng();return r.setStart(Uu(e,n.container()),n.offset()),r.setEnd(Uu(e,o.container()),o.offset()),{range:r,forward:Fu(t)}}))})(n,t);if(Mu(t))return((e,t)=>I.from(e.select(t.name)[t.index]).map((t=>{const n=e.createRng();return n.selectNode(t),{range:n,forward:!0}})))(n,t);if((e=>Ee(e,"rng"))(t))return I.some({range:t.rng,forward:Fu(t)})}return I.none()})(e,t).each((({range:t,forward:n})=>{e.setRng(t,n)}))},Ku=e=>qo(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type"),Yu=(Gu=br,e=>Gu===e);var Gu;const Xu=e=>""!==e&&-1!==" \f\n\r\t\v".indexOf(e),Qu=e=>!Xu(e)&&!Yu(e)&&!vr(e),Ju=e=>{const t=[];if(e)for(let n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},Zu=(e,t)=>{const n=Uo(t,"td[data-mce-selected],th[data-mce-selected]");return n.length>0?n:(e=>Y((e=>te(e,(e=>{const t=_i(e);return t?[yn(t)]:[]})))(e),Rr))(e)},em=e=>Zu(Ju(e.selection.getSel()),yn(e.getBody())),tm=(e,t)=>eo(e,"table",t),nm=e=>Fn(e).fold(N([e]),(t=>[e].concat(nm(t)))),om=e=>Un(e).fold(N([e]),(t=>"br"===Ht(t)?Bn(t).map((t=>[e].concat(om(t)))).getOr([]):[e].concat(om(t)))),rm=(e,t)=>Mt((e=>{const t=e.startContainer,n=e.startOffset;return er(t)?0===n?I.some(yn(t)):I.none():I.from(t.childNodes[n]).map(yn)})(t),(e=>{const t=e.endContainer,n=e.endOffset;return er(t)?n===t.data.length?I.some(yn(t)):I.none():I.from(t.childNodes[n-1]).map(yn)})(t),((t,n)=>{const o=J(nm(e),T(_n,t)),r=J(om(e),T(_n,n));return o.isSome()&&r.isSome()})).getOr(!1),sm=(e,t,n,o)=>{const r=n,s=new jo(n,r),a=ye(e.schema.getMoveCaretBeforeOnEnterElements(),((e,t)=>!H(["td","th","table"],t.toLowerCase())));let i=n;do{if(er(i)&&0!==Pt.trim(i.data).length)return void(o?t.setStart(i,0):t.setEnd(i,i.data.length));if(a[i.nodeName])return void(o?t.setStartBefore(i):"BR"===i.nodeName?t.setEndBefore(i):t.setEndAfter(i))}while(i=o?s.next():s.prev());"BODY"===r.nodeName&&(o?t.setStart(r,0):t.setEnd(r,r.childNodes.length))},am=e=>{const t=e.selection.getSel();return C(t)&&t.rangeCount>0},im=(e,t)=>{const n=em(e);n.length>0?V(n,(n=>{const o=n.dom,r=e.dom.createRng();r.setStartBefore(o),r.setEndAfter(o),t(r,!0)})):t(e.selection.getRng(),!1)},lm=(e,t,n)=>{const o=ul(e,t);n(o),e.moveToBookmark(o)},dm=e=>x(null==e?void 0:e.nodeType),cm=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),um=(e,t,n)=>{const{selection:o,dom:r}=e,s=o.getNode(),a=dr(s);lm(o,!0,(()=>{t()})),a&&dr(s)&&r.isChildOf(s,e.getBody())?e.selection.select(s):n(o.getStart())&&mm(r,o)},mm=(e,t)=>{var n,o;const r=t.getRng(),{startContainer:s,startOffset:a}=r;if(!((e,t)=>{if(cm(t)&&!/^(TD|TH)$/.test(t.nodeName)){const n=e.getAttrib(t,"data-mce-selected"),o=parseInt(n,10);return!isNaN(o)&&o>0}return!1})(e,t.getNode())&&qo(s)){const i=s.childNodes,l=e.getRoot();let d;if(a<i.length){const t=i[a];d=new jo(t,null!==(n=e.getParent(t,e.isBlock))&&void 0!==n?n:l)}else{const t=i[i.length-1];d=new jo(t,null!==(o=e.getParent(t,e.isBlock))&&void 0!==o?o:l),d.next(!0)}for(let n=d.current();n;n=d.next()){if("false"===e.getContentEditable(n))return;if(er(n)&&!hm(n))return r.setStart(n,0),void t.setRng(r)}}},fm=(e,t,n)=>{if(e){const o=t?"nextSibling":"previousSibling";for(e=n?e:e[o];e;e=e[o])if(qo(e)||!hm(e))return e}},gm=(e,t)=>!!e.getTextBlockElements()[t.nodeName.toLowerCase()]||Ts(e,t),pm=(e,t,n)=>e.schema.isValidChild(t,n),hm=(e,t=!1)=>{if(C(e)&&er(e)){const n=t?e.data.replace(/ /g,"\xa0"):e.data;return ss(n)}return!1},bm=(e,t)=>{const n=e.dom;return cm(t)&&"false"===n.getContentEditable(t)&&((e,t)=>{const n="[data-mce-cef-wrappable]",o=Ed(e),r=Ge(o)?n:`${n},${o}`;return xn(yn(t),r)})(e,t)&&0===n.select('[contenteditable="true"]',t).length},vm=(e,t)=>w(e)?e(t):(C(t)&&(e=e.replace(/%(\w+)/g,((e,n)=>t[n]||e))),e),ym=(e,t)=>(t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()),Cm=(e,t)=>{if(y(e))return null;{let n=String(e);return"color"!==t&&"backgroundColor"!==t||(n=Ca(n)),"fontWeight"===t&&700===e&&(n="bold"),"fontFamily"===t&&(n=n.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),n}},wm=(e,t,n)=>{const o=e.getStyle(t,n);return Cm(o,n)},xm=(e,t)=>{let n;return e.getParent(t,(t=>!!qo(t)&&(n=e.getStyle(t,"text-decoration"),!!n&&"none"!==n))),n},Em=(e,t,n)=>e.getParents(t,n,e.getRoot()),_m=(e,t,n)=>{const o=e.formatter.get(t);return C(o)&&$(o,n)},km=e=>_e(e,"block"),Sm=e=>_e(e,"selector"),Nm=e=>_e(e,"inline"),Rm=e=>Sm(e)&&!1!==e.expand&&!Nm(e),Am=e=>(e=>{const t=[];let n=e;for(;n;){if(er(n)&&n.data!==Br||n.childNodes.length>1)return[];qo(n)&&t.push(n),n=n.firstChild}return t})(e).length>0,Tm=e=>Du(e.dom)&&Am(e.dom),Om=Ku,Bm=Em,Pm=hm,Dm=gm,Lm=(e,t)=>{let n=t;for(;n;){if(qo(n)&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Mm=(e,t,n,o)=>{const r=t.data;if(e){for(let e=n;e>0;e--)if(o(r.charAt(e-1)))return e}else for(let e=n;e<r.length;e++)if(o(r.charAt(e)))return e;return-1},Im=(e,t,n)=>Mm(e,t,n,(e=>Yu(e)||Xu(e))),Fm=(e,t,n)=>Mm(e,t,n,Qu),Um=(e,t,n,o,r,s)=>{let a;const i=e.getParent(n,e.isBlock)||t,l=(t,n,o)=>{const s=hi(e),l=r?s.backwards:s.forwards;return I.from(l(t,n,((e,t)=>Om(e.parentNode)?-1:(a=e,o(r,e,t))),i))};return l(n,o,Im).bind((e=>s?l(e.container,e.offset+(r?-1:0),Fm):I.some(e))).orThunk((()=>a?I.some({container:a,offset:r?0:a.length}):I.none()))},zm=(e,t,n,o,r)=>{const s=o[r];er(o)&&Ge(o.data)&&s&&(o=s);const a=Bm(e,o);for(let o=0;o<a.length;o++)for(let r=0;r<t.length;r++){const s=t[r];if((!C(s.collapsed)||s.collapsed===n.collapsed)&&Sm(s)&&e.is(a[o],s.selector))return a[o]}return o},jm=(e,t,n,o)=>{var r;let s=n;const a=e.getRoot(),i=t[0];if(km(i)&&(s=i.wrapper?null:e.getParent(n,i.block,a)),!s){const t=null!==(r=e.getParent(n,"LI,TD,TH,SUMMARY"))&&void 0!==r?r:a;s=e.getParent(er(n)?n.parentNode:n,(t=>t!==a&&Dm(e.schema,t)),t)}if(s&&km(i)&&i.wrapper&&(s=Bm(e,s,"ul,ol").reverse()[0]||s),!s)for(s=n;s&&s[o]&&!e.isBlock(s[o])&&(s=s[o],!ym(s,"br")););return s||n},Hm=(e,t,n,o)=>{const r=n.parentNode;return!C(n[o])&&(!(r!==t&&!y(r)&&!e.isBlock(r))||Hm(e,t,r,o))},$m=(e,t,n,o,r)=>{let s=n;const a=r?"previousSibling":"nextSibling",i=e.getRoot();if(er(n)&&!Pm(n)&&(r?o>0:o<n.data.length))return n;for(;s;){if(!t[0].block_expand&&e.isBlock(s))return s;for(let t=s[a];t;t=t[a]){const n=er(t)&&!Hm(e,i,t,a);if(!Om(t)&&(!ar(l=t)||!l.getAttribute("data-mce-bogus")||l.nextSibling)&&!Pm(t,n))return s}if(s===i||s.parentNode===i){n=s;break}s=s.parentNode}var l;return n},qm=e=>Om(e.parentNode)||Om(e),Vm=(e,t,n,o=!1)=>{let{startContainer:r,startOffset:s,endContainer:a,endOffset:i}=t;const l=n[0];return qo(r)&&r.hasChildNodes()&&(r=ki(r,s),er(r)&&(s=0)),qo(a)&&a.hasChildNodes()&&(a=ki(a,t.collapsed?i:i-1),er(a)&&(i=a.data.length)),r=Lm(e,r),a=Lm(e,a),qm(r)&&(r=Om(r)?r:r.parentNode,r=t.collapsed?r.previousSibling||r:r.nextSibling||r,er(r)&&(s=t.collapsed?r.length:0)),qm(a)&&(a=Om(a)?a:a.parentNode,a=t.collapsed?a.nextSibling||a:a.previousSibling||a,er(a)&&(i=t.collapsed?0:a.length)),t.collapsed&&(Um(e,e.getRoot(),r,s,!0,o).each((({container:e,offset:t})=>{r=e,s=t})),Um(e,e.getRoot(),a,i,!1,o).each((({container:e,offset:t})=>{a=e,i=t}))),(Nm(l)||l.block_expand)&&(Nm(l)&&er(r)&&0!==s||(r=$m(e,n,r,s,!0)),Nm(l)&&er(a)&&i!==a.data.length||(a=$m(e,n,a,i,!1))),Rm(l)&&(r=zm(e,n,t,r,"previousSibling"),a=zm(e,n,t,a,"nextSibling")),(km(l)||Sm(l))&&(r=jm(e,n,r,"previousSibling"),a=jm(e,n,a,"nextSibling"),km(l)&&(e.isBlock(r)||(r=$m(e,n,r,s,!0)),e.isBlock(a)||(a=$m(e,n,a,i,!1)))),qo(r)&&r.parentNode&&(s=e.nodeIndex(r),r=r.parentNode),qo(a)&&a.parentNode&&(i=e.nodeIndex(a)+1,a=a.parentNode),{startContainer:r,startOffset:s,endContainer:a,endOffset:i}},Wm=(e,t,n)=>{var o;const r=t.startOffset,s=ki(t.startContainer,r),a=t.endOffset,i=ki(t.endContainer,a-1),l=e=>{const t=e[0];er(t)&&t===s&&r>=t.data.length&&e.splice(0,1);const n=e[e.length-1];return 0===a&&e.length>0&&n===i&&er(n)&&e.splice(e.length-1,1),e},d=(e,t,n)=>{const o=[];for(;e&&e!==n;e=e[t])o.push(e);return o},c=(t,n)=>e.getParent(t,(e=>e.parentNode===n),n),u=(e,t,o)=>{const r=o?"nextSibling":"previousSibling";for(let s=e,a=s.parentNode;s&&s!==t;s=a){a=s.parentNode;const t=d(s===e?s:s[r],r);t.length&&(o||t.reverse(),n(l(t)))}};if(s===i)return n(l([s]));const m=null!==(o=e.findCommonAncestor(s,i))&&void 0!==o?o:e.getRoot();if(e.isChildOf(s,i))return u(s,m,!0);if(e.isChildOf(i,s))return u(i,m);const f=c(s,m)||s,g=c(i,m)||i;u(s,f,!0);const p=d(f===s?f:f.nextSibling,"nextSibling",g===i?g.nextSibling:g);p.length&&n(l(p)),u(i,g)},Km=['pre[class*=language-][contenteditable="false"]',"figure.image","div[data-ephox-embed-iri]","div.tiny-pageembed","div.mce-toc","div[data-mce-toc]"],Ym=(e,t,n,o,r,s)=>{const{uid:a=t,...i}=n;un(e,Za()),Jt(e,`${ti()}`,a),Jt(e,`${ei()}`,o);const{attributes:l={},classes:d=[]}=r(a,i);if(Zt(e,l),((e,t)=>{V(t,(t=>{un(e,t)}))})(e,d),s){d.length>0&&Jt(e,`${oi()}`,d.join(","));const t=me(l);t.length>0&&Jt(e,`${ri()}`,t.join(","))}},Gm=(e,t,n,o,r)=>{const s=bn("span",e);return Ym(s,t,n,o,r,!1),s},Xm=(e,t,n,o,r,s)=>{const a=[],i=Gm(e.getDoc(),n,s,o,r),l=Xa(),d=()=>{l.clear()},c=e=>{V(e,u)},u=t=>{switch(((e,t,n,o)=>An(t).fold((()=>"skipping"),(r=>"br"===o||(e=>Kt(e)&&Cr(e)===Br)(t)?"valid":(e=>Wt(e)&&gn(e,Za()))(t)?"existing":Du(t.dom)?"caret":$(Km,(e=>xn(t,e)))?"valid-block":pm(e,n,o)&&pm(e,Ht(r),n)?"valid":"invalid-child")))(e,t,"span",Ht(t))){case"invalid-child":{d();const e=Mn(t);c(e),d();break}case"valid-block":d(),Ym(t,n,s,o,r,!0);break;case"valid":{const e=l.get().getOrThunk((()=>{const e=fi(i);return a.push(e),l.set(e),e}));yo(t,e);break}}};return Wm(e.dom,t,(e=>{d(),(e=>{const t=q(e,yn);c(t)})(e)})),a},Qm=e=>{const t=(()=>{const e={};return{register:(t,n)=>{e[t]={name:t,settings:n}},lookup:t=>xe(e,t).map((e=>e.settings)),getNames:()=>me(e)}})();((e,t)=>{const n=ei(),o=e=>I.from(e.attr(n)).bind(t.lookup),r=e=>{var t,n;e.attr(ti(),null),e.attr(ei(),null),e.attr(ni(),null);const o=I.from(e.attr(ri())).map((e=>e.split(","))).getOr([]),r=I.from(e.attr(oi())).map((e=>e.split(","))).getOr([]);V(o,(t=>e.attr(t,null)));const s=null!==(n=null===(t=e.attr("class"))||void 0===t?void 0:t.split(" "))&&void 0!==n?n:[],a=re(s,[Za()].concat(r));e.attr("class",a.length>0?a.join(" "):null),e.attr(oi(),null),e.attr(ri(),null)};e.serializer.addTempAttr(ni()),e.serializer.addAttributeFilter(n,(e=>{for(const t of e)o(t).each((e=>{!1===e.persistent&&("span"===t.name?t.unwrap():r(t))}))}))})(e,t);const n=((e,t)=>{const n=$a({}),o=()=>({listeners:[],previous:Xa()}),r=(e,t)=>{s(e,(e=>(t(e),e)))},s=(e,t)=>{const r=n.get(),s=t(xe(r,e).getOrThunk(o));r[e]=s,n.set(r)},a=(t,n)=>{V(li(e,t),(e=>{n?Jt(e,ni(),"true"):on(e,ni())}))},i=Ja((()=>{const n=ae(t.getNames());V(n,(t=>{s(t,(n=>{const o=n.previous.get();return ai(e,I.some(t)).fold((()=>{o.each((e=>{(e=>{r(e,(t=>{V(t.listeners,(t=>t(!1,e)))}))})(t),n.previous.clear(),a(e,!1)}))}),(({uid:e,name:t,elements:s})=>{Dt(o,e)||(o.each((e=>a(e,!1))),((e,t,n)=>{r(e,(o=>{V(o.listeners,(o=>o(!0,e,{uid:t,nodes:q(n,(e=>e.dom))})))}))})(t,e,s),n.previous.set(e),a(e,!0))})),{previous:n.previous,listeners:n.listeners}}))}))}),30);return e.on("remove",(()=>{i.cancel()})),e.on("NodeChange",(()=>{i.throttle()})),{addListener:(e,t)=>{s(e,(e=>({previous:e.previous,listeners:e.listeners.concat([t])})))}}})(e,t),o=Xt("span"),r=e=>{V(e,(e=>{o(e)?Eo(e):(e=>{fn(e,Za()),on(e,`${ti()}`),on(e,`${ei()}`),on(e,`${ni()}`);const t=tn(e,`${ri()}`).map((e=>e.split(","))).getOr([]),n=tn(e,`${oi()}`).map((e=>e.split(","))).getOr([]);var o;V(t,(t=>on(e,t))),o=e,V(n,(e=>{fn(o,e)})),on(e,`${oi()}`),on(e,`${ri()}`)})(e)}))};return{register:(e,n)=>{t.register(e,n)},annotate:(n,o)=>{t.lookup(n).each((t=>{((e,t,n,o)=>{e.undoManager.transact((()=>{const r=e.selection,s=r.getRng(),a=em(e).length>0,i=ui("mce-annotation");if(s.collapsed&&!a&&((e,t)=>{const n=Vm(e.dom,t,[{inline:"span"}]);t.setStart(n.startContainer,n.startOffset),t.setEnd(n.endContainer,n.endOffset),e.selection.setRng(t)})(e,s),r.getRng().collapsed&&!a){const s=Gm(e.getDoc(),i,o,t,n.decorate);So(s,br),r.getRng().insertNode(s.dom),r.select(s.dom)}else lm(r,!1,(()=>{im(e,(r=>{Xm(e,r,i,t,n.decorate,o)}))}))}))})(e,n,t,o)}))},annotationChanged:(e,t)=>{n.addListener(e,t)},remove:t=>{ai(e,I.some(t)).each((({elements:t})=>{const n=e.selection.getBookmark();r(t),e.selection.moveToBookmark(n)}))},removeAll:t=>{const n=e.selection.getBookmark();ge(di(e,t),((e,t)=>{r(e)})),e.selection.moveToBookmark(n)},getAll:t=>{const n=di(e,t);return pe(n,(e=>q(e,(e=>e.dom))))}}},Jm=e=>({getBookmark:T(Vu,e),moveToBookmark:T(Wu,e)});Jm.isBookmarkNode=Ku;const Zm=(e,t,n)=>!n.collapsed&&$(n.getClientRects(),(n=>((e,t,n)=>t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom)(n,e,t))),ef=(e,t,n)=>{e.dispatch(t,n)},tf=(e,t,n,o)=>{e.dispatch("FormatApply",{format:t,node:n,vars:o})},nf=(e,t,n,o)=>{e.dispatch("FormatRemove",{format:t,node:n,vars:o})},of=(e,t)=>e.dispatch("SetContent",t),rf=(e,t)=>e.dispatch("GetContent",t),sf=(e,t)=>e.dispatch("PastePlainTextToggle",{state:t}),af={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,ESC:27,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,modifierPressed:e=>e.shiftKey||e.ctrlKey||e.altKey||af.metaKeyPressed(e),metaKeyPressed:e=>At.os.isMacOS()||At.os.isiOS()?e.metaKey:e.ctrlKey&&!e.altKey},lf="data-mce-selected",df=Math.abs,cf=Math.round,uf={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]},mf=(e,t)=>{const n=t.dom,o=t.getDoc(),r=document,s=t.getBody();let a,i,l,d,c,u,m,f,g,p,h,b,v,y,w;const x=e=>C(e)&&(ir(e)||n.is(e,"figure.image")),E=e=>mr(e)||n.hasClass(e,"mce-preview-object"),_=e=>{const n=e.target;((e,t)=>{if((e=>"longpress"===e.type||0===e.type.indexOf("touch"))(e)){const n=e.touches[0];return x(e.target)&&!Zm(n.clientX,n.clientY,t)}return x(e.target)&&!Zm(e.clientX,e.clientY,t)})(e,t.selection.getRng())&&!e.isDefaultPrevented()&&t.selection.select(n)},k=e=>n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?[e,e.firstElementChild]:n.is(e,"figure.image")?[e.querySelector("img")]:[e],S=e=>{const o=cd(t);return!!o&&"false"!==e.getAttribute("data-mce-resize")&&e!==t.getBody()&&(n.hasClass(e,"mce-preview-object")&&C(e.firstElementChild)?xn(yn(e.firstElementChild),o):xn(yn(e),o))},N=(e,o,r)=>{if(C(r)){const s=k(e);V(s,(e=>{e.style[o]||!t.schema.isValid(e.nodeName.toLowerCase(),o)?n.setStyle(e,o,r):n.setAttrib(e,o,""+r)}))}},R=(e,t,n)=>{N(e,"width",t),N(e,"height",n)},A=e=>{let o,r,c,C,_;o=e.screenX-u,r=e.screenY-m,b=o*d[2]+f,v=r*d[3]+g,b=b<5?5:b,v=v<5?5:v,c=(x(a)||E(a))&&!1!==ud(t)?!af.modifierPressed(e):af.modifierPressed(e),c&&(df(o)>df(r)?(v=cf(b*p),b=cf(v/p)):(b=cf(v/p),v=cf(b*p))),R(i,b,v),C=d.startPos.x+o,_=d.startPos.y+r,C=C>0?C:0,_=_>0?_:0,n.setStyles(l,{left:C,top:_,display:"block"}),l.innerHTML=b+" &times; "+v,d[2]<0&&i.clientWidth<=b&&n.setStyle(i,"left",void 0+(f-b)),d[3]<0&&i.clientHeight<=v&&n.setStyle(i,"top",void 0+(g-v)),o=s.scrollWidth-y,r=s.scrollHeight-w,o+r!==0&&n.setStyles(l,{left:C-o,top:_-r}),h||(((e,t,n,o,r)=>{e.dispatch("ObjectResizeStart",{target:t,width:n,height:o,origin:r})})(t,a,f,g,"corner-"+d.name),h=!0)},T=()=>{const e=h;h=!1,e&&(N(a,"width",b),N(a,"height",v)),n.unbind(o,"mousemove",A),n.unbind(o,"mouseup",T),r!==o&&(n.unbind(r,"mousemove",A),n.unbind(r,"mouseup",T)),n.remove(i),n.remove(l),n.remove(c),O(a),e&&(((e,t,n,o,r)=>{e.dispatch("ObjectResized",{target:t,width:n,height:o,origin:r})})(t,a,b,v,"corner-"+d.name),n.setAttrib(a,"style",n.getAttrib(a,"style"))),t.nodeChanged()},O=e=>{M();const h=n.getPos(e,s),C=h.x,x=h.y,_=e.getBoundingClientRect(),N=_.width||_.right-_.left,O=_.height||_.bottom-_.top;a!==e&&(P(),a=e,b=v=0);const B=t.dispatch("ObjectSelected",{target:e});S(e)&&!B.isDefaultPrevented()?ge(uf,((e,t)=>{let h=n.get("mceResizeHandle"+t);h&&n.remove(h),h=n.add(s,"div",{id:"mceResizeHandle"+t,"data-mce-bogus":"all",class:"mce-resizehandle",unselectable:!0,style:"cursor:"+t+"-resize; margin:0; padding:0"}),n.bind(h,"mousedown",(h=>{h.stopImmediatePropagation(),h.preventDefault(),(h=>{const b=k(a)[0];var v;u=h.screenX,m=h.screenY,f=b.clientWidth,g=b.clientHeight,p=g/f,d=e,d.name=t,d.startPos={x:N*e[0]+C,y:O*e[1]+x},y=s.scrollWidth,w=s.scrollHeight,c=n.add(s,"div",{class:"mce-resize-backdrop","data-mce-bogus":"all"}),n.setStyles(c,{position:"fixed",left:"0",top:"0",width:"100%",height:"100%"}),i=E(v=a)?n.create("img",{src:At.transparentSrc}):v.cloneNode(!0),n.addClass(i,"mce-clonedresizable"),n.setAttrib(i,"data-mce-bogus","all"),i.contentEditable="false",n.setStyles(i,{left:C,top:x,margin:0}),R(i,N,O),i.removeAttribute(lf),s.appendChild(i),n.bind(o,"mousemove",A),n.bind(o,"mouseup",T),r!==o&&(n.bind(r,"mousemove",A),n.bind(r,"mouseup",T)),l=n.add(s,"div",{class:"mce-resize-helper","data-mce-bogus":"all"},f+" &times; "+g)})(h)})),e.elm=h,n.setStyles(h,{left:N*e[0]+C-h.offsetWidth/2,top:O*e[1]+x-h.offsetHeight/2})})):P(!1)},B=Qa(O,0),P=(e=!0)=>{B.cancel(),M(),a&&e&&a.removeAttribute(lf),ge(uf,((e,t)=>{const o=n.get("mceResizeHandle"+t);o&&(n.unbind(o),n.remove(o))}))},D=(e,t)=>n.isChildOf(e,t),L=o=>{if(h||t.removed||t.composing)return;const r="mousedown"===o.type?o.target:e.getNode(),a=no(yn(r),"table,img,figure.image,hr,video,span.mce-preview-object,details").map((e=>e.dom)).filter((e=>n.isEditable(e.parentElement)||"IMG"===e.nodeName&&n.isEditable(e))).getOrUndefined(),i=C(a)?n.getAttrib(a,lf,"1"):"1";if(V(n.select(`img[${lf}],hr[${lf}]`),(e=>{e.removeAttribute(lf)})),C(a)&&D(a,s)&&t.hasFocus()){I();const t=e.getStart(!0);if(D(t,a)&&D(e.getEnd(!0),a))return n.setAttrib(a,lf,i),void B.throttle(a)}P()},M=()=>{ge(uf,(e=>{e.elm&&(n.unbind(e.elm),delete e.elm)}))},I=()=>{try{t.getDoc().execCommand("enableObjectResizing",!1,"false")}catch(e){}};return t.on("init",(()=>{I(),t.on("NodeChange ResizeEditor ResizeWindow ResizeContent drop",L),t.on("keyup compositionend",(e=>{a&&"TABLE"===a.nodeName&&L(e)})),t.on("hide blur",P),t.on("contextmenu longpress",_,!0)})),t.on("remove",M),{isResizable:S,showResizeRect:O,hideResizeRect:P,updateResizeRect:L,destroy:()=>{B.cancel(),a=i=c=null}}},ff=(e,t,n)=>{const o=e.document.createRange();var r;return r=o,t.fold((e=>{r.setStartBefore(e.dom)}),((e,t)=>{r.setStart(e.dom,t)}),(e=>{r.setStartAfter(e.dom)})),((e,t)=>{t.fold((t=>{e.setEndBefore(t.dom)}),((t,n)=>{e.setEnd(t.dom,n)}),(t=>{e.setEndAfter(t.dom)}))})(o,n),o},gf=(e,t,n,o,r)=>{const s=e.document.createRange();return s.setStart(t.dom,n),s.setEnd(o.dom,r),s},pf=hl([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),hf=(e,t,n)=>t(yn(n.startContainer),n.startOffset,yn(n.endContainer),n.endOffset);pf.ltr,pf.rtl;const bf=(e,t,n,o)=>({start:e,soffset:t,finish:n,foffset:o}),vf=document.caretPositionFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretPositionFromPoint)||void 0===r?void 0:r.call(o,t,n)).bind((t=>{if(null===t.offsetNode)return I.none();const n=e.dom.createRange();return n.setStart(t.offsetNode,t.offset),n.collapse(),I.some(n)}))}:document.caretRangeFromPoint?(e,t,n)=>{var o,r;return I.from(null===(r=(o=e.dom).caretRangeFromPoint)||void 0===r?void 0:r.call(o,t,n))}:I.none,yf=hl([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Cf={before:yf.before,on:yf.on,after:yf.after,cata:(e,t,n,o)=>e.fold(t,n,o),getStart:e=>e.fold(R,R,R)},wf=hl([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),xf={domRange:wf.domRange,relative:wf.relative,exact:wf.exact,exactFromRange:e=>wf.exact(e.start,e.soffset,e.finish,e.foffset),getWin:e=>{const t=(e=>e.match({domRange:e=>yn(e.startContainer),relative:(e,t)=>Cf.getStart(e),exact:(e,t,n,o)=>e}))(e);return Rn(t)},range:bf},Ef=(e,t)=>{const n=Ht(e);return"input"===n?Cf.after(e):H(["br","img"],n)?0===t?Cf.before(e):Cf.after(e):Cf.on(e,t)},_f=(e,t)=>{const n=e.fold(Cf.before,Ef,Cf.after),o=t.fold(Cf.before,Ef,Cf.after);return xf.relative(n,o)},kf=(e,t,n,o)=>{const r=Ef(e,t),s=Ef(n,o);return xf.relative(r,s)},Sf=(e,t)=>{const n=(t||document).createDocumentFragment();return V(e,(e=>{n.appendChild(e.dom)})),yn(n)},Nf=e=>{const t=xf.getWin(e).dom,n=(e,n,o,r)=>gf(t,e,n,o,r),o=(e=>e.match({domRange:e=>{const t=yn(e.startContainer),n=yn(e.endContainer);return kf(t,e.startOffset,n,e.endOffset)},relative:_f,exact:kf}))(e);return((e,t)=>{const n=((e,t)=>t.match({domRange:e=>({ltr:N(e),rtl:I.none}),relative:(t,n)=>({ltr:De((()=>ff(e,t,n))),rtl:De((()=>I.some(ff(e,n,t))))}),exact:(t,n,o,r)=>({ltr:De((()=>gf(e,t,n,o,r))),rtl:De((()=>I.some(gf(e,o,r,t,n))))})}))(e,t);return((e,t)=>{const n=t.ltr();return n.collapsed?t.rtl().filter((e=>!1===e.collapsed)).map((e=>pf.rtl(yn(e.endContainer),e.endOffset,yn(e.startContainer),e.startOffset))).getOrThunk((()=>hf(0,pf.ltr,n))):hf(0,pf.ltr,n)})(0,n)})(t,o).match({ltr:n,rtl:n})},Rf=(e,t,n)=>((e,t,n)=>((e,t,n)=>{const o=yn(e.document);return vf(o,t,n).map((e=>bf(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset)))})(e,t,n))(Rn(yn(n)).dom,e,t).map((e=>{const t=n.createRange();return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),t})).getOrUndefined(),Af=(e,t)=>C(e)&&C(t)&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset,Tf=(e,t,n)=>null!==((e,t,n)=>{let o=e;for(;o&&o!==t;){if(n(o))return o;o=o.parentNode}return null})(e,t,n),Of=(e,t,n)=>Tf(e,t,(e=>e.nodeName===n)),Bf=(e,t)=>Ur(e)&&!Tf(e,t,Du),Pf=(e,t,n)=>{const o=t.parentNode;if(o){const r=new jo(t,e.getParent(o,e.isBlock)||e.getRoot());let s;for(;s=r[n?"prev":"next"]();)if(ar(s))return!0}return!1},Df=(e,t,n,o,r)=>{const s=e.getRoot(),a=e.schema.getNonEmptyElements(),i=r.parentNode;let l,d;if(!i)return I.none();const c=e.getParent(i,e.isBlock)||s;if(o&&ar(r)&&t&&e.isEmpty(c))return I.some(Vi(i,e.nodeIndex(r)));const u=new jo(r,c);for(;d=u[o?"prev":"next"]();){if("false"===e.getContentEditableParent(d)||Bf(d,s))return I.none();if(er(d)&&d.data.length>0)return Of(d,s,"A")?I.none():I.some(Vi(d,o?d.data.length:0));if(e.isBlock(d)||a[d.nodeName.toLowerCase()])return I.none();l=d}return or(l)?I.none():n&&l?I.some(Vi(l,0)):I.none()},Lf=(e,t,n,o)=>{const r=e.getRoot();let s,a=!1,i=n?o.startContainer:o.endContainer,l=n?o.startOffset:o.endOffset;const d=qo(i)&&l===i.childNodes.length,c=e.schema.getNonEmptyElements();let u=n;if(Ur(i))return I.none();if(qo(i)&&l>i.childNodes.length-1&&(u=!1),rr(i)&&(i=r,l=0),i===r){if(u&&(s=i.childNodes[l>0?l-1:0],s)){if(Ur(s))return I.none();if(c[s.nodeName]||Qo(s))return I.none()}if(i.hasChildNodes()){if(l=Math.min(!u&&l>0?l-1:l,i.childNodes.length-1),i=i.childNodes[l],l=er(i)&&d?i.data.length:0,!t&&i===r.lastChild&&Qo(i))return I.none();if(((e,t)=>{let n=t;for(;n&&n!==e;){if(dr(n))return!0;n=n.parentNode}return!1})(r,i)||Ur(i))return I.none();if(gr(i))return I.none();if(i.hasChildNodes()&&!Qo(i)){s=i;const t=new jo(i,r);do{if(dr(s)||Ur(s)){a=!1;break}if(er(s)&&s.data.length>0){l=u?0:s.data.length,i=s,a=!0;break}if(c[s.nodeName.toLowerCase()]&&!ur(s)){l=e.nodeIndex(s),i=s.parentNode,u||l++,a=!0;break}}while(s=u?t.next():t.prev())}}}return t&&(er(i)&&0===l&&Df(e,d,t,!0,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),qo(i)&&(s=i.childNodes[l],s||(s=i.childNodes[l-1]),!s||!ar(s)||((e,t)=>{var n;return"A"===(null===(n=e.previousSibling)||void 0===n?void 0:n.nodeName)})(s)||Pf(e,s,!1)||Pf(e,s,!0)||Df(e,d,t,!0,s).each((e=>{i=e.container(),l=e.offset(),a=!0})))),u&&!t&&er(i)&&l===i.data.length&&Df(e,d,t,!1,i).each((e=>{i=e.container(),l=e.offset(),a=!0})),a&&i?I.some(Vi(i,l)):I.none()},Mf=(e,t)=>{const n=t.collapsed,o=t.cloneRange(),r=Vi.fromRangeStart(t);return Lf(e,n,!0,o).each((e=>{n&&Vi.isAbove(r,e)||o.setStart(e.container(),e.offset())})),n||Lf(e,n,!1,o).each((e=>{o.setEnd(e.container(),e.offset())})),n&&o.collapse(!0),Af(t,o)?I.none():I.some(o)},If=(e,t)=>e.splitText(t),Ff=e=>{let t=e.startContainer,n=e.startOffset,o=e.endContainer,r=e.endOffset;if(t===o&&er(t)){if(n>0&&n<t.data.length)if(o=If(t,n),t=o.previousSibling,r>n){r-=n;const e=If(o,r).previousSibling;t=o=e,r=e.data.length,n=0}else r=0}else if(er(t)&&n>0&&n<t.data.length&&(t=If(t,n),n=0),er(o)&&r>0&&r<o.data.length){const e=If(o,r).previousSibling;o=e,r=e.data.length}return{startContainer:t,startOffset:n,endContainer:o,endOffset:r}},Uf=e=>({walk:(t,n)=>Wm(e,t,n),split:Ff,expand:(t,n={type:"word"})=>{if("word"===n.type){const n=Vm(e,t,[{inline:"span"}]),o=e.createRng();return o.setStart(n.startContainer,n.startOffset),o.setEnd(n.endContainer,n.endOffset),o}return t},normalize:t=>Mf(e,t).fold(L,(e=>(t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0)))});Uf.compareRanges=Af,Uf.getCaretRangeFromPoint=Rf,Uf.getSelectedNode=_i,Uf.getNode=ki;const zf=((e,t)=>{const n=t=>{const n=(e=>{const t=e.dom;return Gn(e)?t.getBoundingClientRect().height:t.offsetHeight})(t);if(n<=0||null===n){const n=co(t,e);return parseFloat(n)||0}return n},o=(e,t)=>X(t,((t,n)=>{const o=co(e,n),r=void 0===o?0:parseInt(o,10);return isNaN(r)?t:t+r}),0);return{set:(t,n)=>{if(!x(n)&&!n.match(/^[0-9]+$/))throw new Error(e+".set accepts only positive integer values. Value was "+n);const o=t.dom;so(o)&&(o.style[e]=n+"px")},get:n,getOuter:n,aggregate:o,max:(e,t,n)=>{const r=o(e,n);return t>r?t-r:0}}})("height"),jf=()=>yn(document),Hf=(e,t)=>e.view(t).fold(N([]),(t=>{const n=e.owner(t),o=Hf(e,n);return[t].concat(o)}));var $f=Object.freeze({__proto__:null,view:e=>{var t;return(e.dom===document?I.none():I.from(null===(t=e.dom.defaultView)||void 0===t?void 0:t.frameElement)).map(yn)},owner:e=>Nn(e)});const qf=e=>"textarea"===Ht(e),Vf=(e,t)=>{const n=(e=>{const t=e.dom.ownerDocument,n=t.body,o=t.defaultView,r=t.documentElement;if(n===e.dom)return To(n.offsetLeft,n.offsetTop);const s=Oo(null==o?void 0:o.pageYOffset,r.scrollTop),a=Oo(null==o?void 0:o.pageXOffset,r.scrollLeft),i=Oo(r.clientTop,n.clientTop),l=Oo(r.clientLeft,n.clientLeft);return Bo(e).translate(a-l,s-i)})(e),o=(e=>zf.get(e))(e);return{element:e,bottom:n.top+o,height:o,pos:n,cleanup:t}},Wf=(e,t,n,o)=>{Xf(e,((r,s)=>Yf(e,t,n,o)),n)},Kf=(e,t,n,o,r)=>{const s={elm:o.element.dom,alignToTop:r};((e,t)=>e.dispatch("ScrollIntoView",t).isDefaultPrevented())(e,s)||(n(e,t,Po(t).top,o,r),((e,t)=>{e.dispatch("AfterScrollIntoView",t)})(e,s))},Yf=(e,t,n,o)=>{const r=yn(e.getBody()),s=yn(e.getDoc());r.dom.offsetWidth;const a=((e,t)=>{const n=((e,t)=>{const n=Mn(e);if(0===n.length||qf(e))return{element:e,offset:t};if(t<n.length&&!qf(n[t]))return{element:n[t],offset:0};{const o=n[n.length-1];return qf(o)?{element:e,offset:t}:"img"===Ht(o)?{element:o,offset:1}:Kt(o)?{element:o,offset:Cr(o).length}:{element:o,offset:Mn(o).length}}})(e,t),o=hn('<span data-mce-bogus="all" style="display: inline-block;">\ufeff</span>');return po(n.element,o),Vf(o,(()=>xo(o)))})(yn(n.startContainer),n.startOffset);Kf(e,s,t,a,o),a.cleanup()},Gf=(e,t,n,o)=>{const r=yn(e.getDoc());Kf(e,r,n,(e=>Vf(yn(e),_))(t),o)},Xf=(e,t,n)=>{const o=n.startContainer,r=n.startOffset,s=n.endContainer,a=n.endOffset;t(yn(o),yn(s));const i=e.dom.createRng();i.setStart(o,r),i.setEnd(s,a),e.selection.setRng(n)},Qf=(e,t,n,o,r)=>{const s=t.pos;if(o)Do(s.left,s.top,r);else{const o=s.top-n+t.height;Do(-e.getBody().getBoundingClientRect().left,o,r)}},Jf=(e,t,n,o,r,s)=>{const a=o+n,i=r.pos.top,l=r.bottom,d=l-i>=o;i<n?Qf(e,r,o,!1!==s,t):i>a?Qf(e,r,o,d?!1!==s:!0===s,t):l>a&&!d&&Qf(e,r,o,!0===s,t)},Zf=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r)},eg=(e,t,n,o,r)=>{const s=Rn(t).dom.innerHeight;Jf(e,t,n,s,o,r);const a=(e=>{const t=jf(),n=Po(t),o=((e,t)=>{const n=t.owner(e);return Hf(t,n)})(e,$f),r=Bo(e),s=G(o,((e,t)=>{const n=Bo(t);return{left:e.left+n.left,top:e.top+n.top}}),{left:0,top:0});return To(s.left+r.left+n.left,s.top+r.top+n.top)})(o.element),i=Io(window);a.top<i.y?Lo(o.element,!1!==r):a.top>i.bottom&&Lo(o.element,!0===r)},tg=(e,t,n)=>Wf(e,Zf,t,n),ng=(e,t,n)=>Gf(e,t,Zf,n),og=(e,t,n)=>Wf(e,eg,t,n),rg=(e,t,n)=>Gf(e,t,eg,n),sg=(e,t,n)=>{(e.inline?tg:og)(e,t,n)},ag=(e,t=!1)=>e.dom.focus({preventScroll:t}),ig=e=>{const t=qn(e).dom;return e.dom===t.activeElement},lg=(e=jf())=>I.from(e.dom.activeElement).map(yn),dg=(e,t)=>{const n=Kt(t)?Cr(t).length:Mn(t).length+1;return e>n?n:e<0?0:e},cg=e=>xf.range(e.start,dg(e.soffset,e.start),e.finish,dg(e.foffset,e.finish)),ug=(e,t)=>!$o(t.dom)&&(kn(e,t)||_n(e,t)),mg=e=>t=>ug(e,t.start)&&ug(e,t.finish),fg=e=>xf.range(yn(e.startContainer),e.startOffset,yn(e.endContainer),e.endOffset),gg=e=>{const t=document.createRange();try{return t.setStart(e.start.dom,e.soffset),t.setEnd(e.finish.dom,e.foffset),I.some(t)}catch(e){return I.none()}},pg=e=>{const t=(e=>e.inline||At.browser.isFirefox())(e)?(n=yn(e.getBody()),(e=>{const t=e.getSelection();return(t&&0!==t.rangeCount?I.from(t.getRangeAt(0)):I.none()).map(fg)})(Rn(n).dom).filter(mg(n))):I.none();var n;e.bookmark=t.isSome()?t:e.bookmark},hg=e=>(e.bookmark?e.bookmark:I.none()).bind((t=>{return n=yn(e.getBody()),o=t,I.from(o).filter(mg(n)).map(cg);var n,o})).bind(gg),bg={isEditorUIElement:e=>{const t=e.className.toString();return-1!==t.indexOf("tox-")||-1!==t.indexOf("mce-")}},vg={setEditorTimeout:(e,t,n)=>((e,t)=>(x(t)||(t=0),setTimeout(e,t)))((()=>{e.removed||t()}),n),setEditorInterval:(e,t,n)=>{const o=((e,t)=>(x(t)||(t=0),setInterval(e,t)))((()=>{e.removed?clearInterval(o):t()}),n);return o}};let yg;const Cg=za.DOM,wg=e=>{const t=e.classList;return void 0!==t&&(t.contains("tox-edit-area")||t.contains("tox-edit-area__iframe")||t.contains("mce-content-body"))},xg=(e,t)=>{const n=_d(e),o=Cg.getParent(t,(t=>(e=>qo(e)&&bg.isEditorUIElement(e))(t)||!!n&&e.dom.is(t,n)));return null!==o},Eg=e=>{try{const t=qn(yn(e.getElement()));return lg(t).fold((()=>document.body),(e=>e.dom))}catch(e){return document.body}},_g=(e,t)=>{const n=t.editor;(e=>{const t=Qa((()=>{pg(e)}),0);e.on("init",(()=>{e.inline&&((e,t)=>{const n=()=>{t.throttle()};za.DOM.bind(document,"mouseup",n),e.on("remove",(()=>{za.DOM.unbind(document,"mouseup",n)}))})(e,t),((e,t)=>{((e,t)=>{e.on("mouseup touchend",(e=>{t.throttle()}))})(e,t),e.on("keyup NodeChange AfterSetSelectionRange",(t=>{(e=>"nodechange"===e.type&&e.selectionChange)(t)||pg(e)}))})(e,t)})),e.on("remove",(()=>{t.cancel()}))})(n);const o=(e,t)=>{mc(e)&&!0!==e.inline&&t(yn(e.getContainer()),"tox-edit-focus")};n.on("focusin",(()=>{const t=e.focusedEditor;wg(Eg(n))&&o(n,un),t!==n&&(t&&t.dispatch("blur",{focusedEditor:n}),e.setActive(n),e.focusedEditor=n,n.dispatch("focus",{blurredEditor:t}),n.focus(!0))})),n.on("focusout",(()=>{vg.setEditorTimeout(n,(()=>{const t=e.focusedEditor;wg(Eg(n))&&t===n||o(n,fn),xg(n,Eg(n))||t!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null)}))})),yg||(yg=t=>{const n=e.activeEditor;n&&Kn(t).each((t=>{const o=t;o.ownerDocument===document&&(o===document.body||xg(n,o)||e.focusedEditor!==n||(n.dispatch("blur",{focusedEditor:null}),e.focusedEditor=null))}))},Cg.bind(document,"focusin",yg))},kg=(e,t)=>{e.focusedEditor===t.editor&&(e.focusedEditor=null),!e.activeEditor&&yg&&(Cg.unbind(document,"focusin",yg),yg=null)},Sg=(e,t)=>{((e,t)=>(e=>e.collapsed?I.from(ki(e.startContainer,e.startOffset)).map(yn):I.none())(t).bind((t=>Nr(t)?I.some(t):kn(e,t)?I.none():I.some(e))))(yn(e.getBody()),t).bind((e=>Ou(e.dom))).fold((()=>{e.selection.normalize()}),(t=>e.selection.setRng(t.toRange())))},Ng=e=>{if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},Rg=e=>e.inline?(e=>{const t=e.getBody();return t&&(n=yn(t),ig(n)||(o=n,lg(qn(o)).filter((e=>o.dom.contains(e.dom)))).isSome());var n,o})(e):(e=>C(e.iframeElement)&&ig(yn(e.iframeElement)))(e),Ag=e=>Rg(e)||(e=>{const t=qn(yn(e.getElement()));return lg(t).filter((t=>!wg(t.dom)&&xg(e,t.dom))).isSome()})(e),Tg=e=>e.editorManager.setActive(e),Og=(e,t)=>t.collapsed?e.isEditable(t.startContainer):e.isEditable(t.startContainer)&&e.isEditable(t.endContainer),Bg=(e,t,n,o,r)=>{const s=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return I.from(s).map(yn).map((e=>o&&t.collapsed?e:In(e,r(e,a)).getOr(e))).bind((e=>Wt(e)?I.some(e):An(e).filter(Wt))).map((e=>e.dom)).getOr(e)},Pg=(e,t,n=!1)=>Bg(e,t,!0,n,((e,t)=>Math.min(zn(e),t))),Dg=(e,t,n=!1)=>Bg(e,t,!1,n,((e,t)=>t>0?t-1:t)),Lg=(e,t)=>{const n=e;for(;e&&er(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Mg=(e,t)=>q(t,(t=>{const n=e.dispatch("GetSelectionRange",{range:t});return n.range!==t?n.range:t})),Ig=["img","br"],Fg=e=>{const t=wr(e).filter((e=>0!==e.trim().length||e.indexOf(br)>-1)).isSome();return t||H(Ig,Ht(e))||(e=>Vt(e)&&"false"===en(e,"contenteditable"))(e)},Ug="[data-mce-autocompleter]",zg=(e,t)=>{if(jg(yn(e.getBody())).isNone()){const o=hn('<span data-mce-autocompleter="1" data-mce-bogus="1"></span>',e.getDoc());vo(o,yn(t.extractContents())),t.insertNode(o.dom),An(o).each((e=>e.dom.normalize())),(n=o,((e,t)=>{const n=e=>{const o=Mn(e);for(let e=o.length-1;e>=0;e--){const r=o[e];if(t(r))return I.some(r);const s=n(r);if(s.isSome())return s}return I.none()};return n(e)})(n,Fg)).map((t=>{e.selection.setCursorLocation(t.dom,(e=>"img"===Ht(e)?1:wr(e).fold((()=>Mn(e).length),(e=>e.length)))(t))}))}var n},jg=e=>to(e,Ug),Hg={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},$g=(e,t,n)=>{const o=n?"lastChild":"firstChild",r=n?"prev":"next";if(e[o])return e[o];if(e!==t){let n=e[r];if(n)return n;for(let o=e.parent;o&&o!==t;o=o.parent)if(n=o[r],n)return n}},qg=e=>{var t;const n=null!==(t=e.value)&&void 0!==t?t:"";if(!ss(n))return!1;const o=e.parent;return!o||"span"===o.name&&!o.attr("style")||!/^[ ]+$/.test(n)},Vg=e=>{const t="a"===e.name&&!e.attr("href")&&e.attr("id");return e.attr("name")||e.attr("id")&&!e.firstChild||e.attr("data-mce-bookmark")||t};class Wg{static create(e,t){const n=new Wg(e,Hg[e]||1);return t&&ge(t,((e,t)=>{n.attr(t,e)})),n}constructor(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}replace(e){const t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t}attr(e,t){const n=this;if(!m(e))return C(e)&&ge(e,((e,t)=>{n.attr(t,e)})),n;const o=n.attributes;if(o){if(void 0!==t){if(null===t){if(e in o.map){delete o.map[e];let t=o.length;for(;t--;)if(o[t].name===e)return o.splice(t,1),n}return n}if(e in o.map){let n=o.length;for(;n--;)if(o[n].name===e){o[n].value=t;break}}else o.push({name:e,value:t});return o.map[e]=t,n}return o.map[e]}}clone(){const e=this,t=new Wg(e.name,e.type),n=e.attributes;if(n){const e=[];e.map={};for(let t=0,o=n.length;t<o;t++){const o=n[t];"id"!==o.name&&(e[e.length]={name:o.name,value:o.value},e.map[o.name]=o.value)}t.attributes=e}return t.value=e.value,t}wrap(e){const t=this;return t.parent&&(t.parent.insert(e,t),e.append(t)),t}unwrap(){const e=this;for(let t=e.firstChild;t;){const n=t.next;e.insert(t,e,!0),t=n}e.remove()}remove(){const e=this,t=e.parent,n=e.next,o=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):o&&(o.next=n),t.lastChild===e?(t.lastChild=o,o&&(o.next=null)):n&&(n.prev=o),e.parent=e.next=e.prev=null),e}append(e){const t=this;e.parent&&e.remove();const n=t.lastChild;return n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e}insert(e,t,n){e.parent&&e.remove();const o=t.parent||this;return n?(t===o.firstChild?o.firstChild=e:t.prev&&(t.prev.next=e),e.prev=t.prev,e.next=t,t.prev=e):(t===o.lastChild?o.lastChild=e:t.next&&(t.next.prev=e),e.next=t.next,e.prev=t,t.next=e),e.parent=o,e}getAll(e){const t=this,n=[];for(let o=t.firstChild;o;o=$g(o,t))o.name===e&&n.push(o);return n}children(){const e=[];for(let t=this.firstChild;t;t=t.next)e.push(t);return e}empty(){const e=this;if(e.firstChild){const t=[];for(let n=e.firstChild;n;n=$g(n,e))t.push(n);let n=t.length;for(;n--;){const e=t[n];e.parent=e.firstChild=e.lastChild=e.next=e.prev=null}}return e.firstChild=e.lastChild=null,e}isEmpty(e,t={},n){var o;const r=this;let s=r.firstChild;if(Vg(r))return!1;if(s)do{if(1===s.type){if(s.attr("data-mce-bogus"))continue;if(e[s.name])return!1;if(Vg(s))return!1}if(8===s.type)return!1;if(3===s.type&&!qg(s))return!1;if(3===s.type&&s.parent&&t[s.parent.name]&&ss(null!==(o=s.value)&&void 0!==o?o:""))return!1;if(n&&n(s))return!1}while(s=$g(s,r));return!0}walk(e){return $g(this,null,e)}}const Kg=Pt.makeMap("NOSCRIPT STYLE SCRIPT XMP IFRAME NOEMBED NOFRAMES PLAINTEXT"," "),Yg=e=>m(e.nodeValue)&&e.nodeValue.includes(Br),Gg=e=>(0===e.length?"":`${q(e,(e=>`[${e}]`)).join(",")},`)+'[data-mce-bogus="all"]',Xg=e=>document.createTreeWalker(e,NodeFilter.SHOW_COMMENT,(e=>Yg(e)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP)),Qg=e=>document.createTreeWalker(e,NodeFilter.SHOW_TEXT,(e=>{if(Yg(e)){const t=e.parentNode;return t&&Ee(Kg,t.nodeName)?NodeFilter.FILTER_ACCEPT:NodeFilter.FILTER_SKIP}return NodeFilter.FILTER_SKIP})),Jg=e=>null!==Xg(e).nextNode(),Zg=e=>null!==Qg(e).nextNode(),ep=(e,t)=>null!==t.querySelector(Gg(e)),tp=(e,t)=>{V(((e,t)=>t.querySelectorAll(Gg(e)))(e,t),(t=>{const n=yn(t);"all"===en(n,"data-mce-bogus")?xo(n):V(e,(e=>{nn(n,e)&&on(n,e)}))}))},np=e=>{let t=e.nextNode();for(;null!==t;)t.nodeValue=null,t=e.nextNode()},op=k(np,Xg),rp=k(np,Qg),sp=(e,t)=>{const n=[{condition:T(ep,t),action:T(tp,t)},{condition:Jg,action:op},{condition:Zg,action:rp}];let o=e,r=!1;return V(n,(({condition:t,action:n})=>{t(o)&&(r||(o=e.cloneNode(!0),r=!0),n(o))})),o},ap=e=>{const t=Uo(e,"[data-mce-bogus]");V(t,(e=>{"all"===en(e,"data-mce-bogus")?xo(e):Er(e)?(po(e,vn(hr)),xo(e)):Eo(e)}))},ip=e=>{const t=Uo(e,"input");V(t,(e=>{on(e,"name")}))},lp=(e,t,n)=>{let o;return o="raw"===t.format?Pt.trim(Dr(sp(n,e.serializer.getTempAttrs()).innerHTML)):"text"===t.format?((e,t)=>{const n=e.getDoc(),o=qn(yn(e.getBody())),r=bn("div",n);Jt(r,"data-mce-bogus","all"),lo(r,{position:"fixed",left:"-9999999px",top:"0"}),So(r,t.innerHTML),ap(r),ip(r);const s=(e=>jn(e)?e:yn(Nn(e).dom.body))(o);vo(s,r);const a=Dr(r.dom.innerText);return xo(r),a})(e,n):"tree"===t.format?e.serializer.serialize(n,t):((e,t)=>{const n=Il(e),o=new RegExp(`^(<${n}[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/${n}>[\r\n]*|<br \\/>[\r\n]*)$`);return t.replace(o,"")})(e,e.serializer.serialize(n,t)),"text"!==t.format&&!Ar(yn(n))&&m(o)?Pt.trim(o):o},dp=Pt.makeMap,cp=e=>{const t=[],n=(e=e||{}).indent,o=dp(e.indent_before||""),r=dp(e.indent_after||""),s=ea.getEncodeFunc(e.entity_encoding||"raw",e.entities),a="xhtml"!==e.element_format;return{start:(e,i,l)=>{if(n&&o[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}if(t.push("<",e),i)for(let e=0,n=i.length;e<n;e++){const n=i[e];t.push(" ",n.name,'="',s(n.value,!0),'"')}if(t[t.length]=!l||a?">":" />",l&&n&&r[e]&&t.length>0){const e=t[t.length-1];e.length>0&&"\n"!==e&&t.push("\n")}},end:e=>{let o;t.push("</",e,">"),n&&r[e]&&t.length>0&&(o=t[t.length-1],o.length>0&&"\n"!==o&&t.push("\n"))},text:(e,n)=>{e.length>0&&(t[t.length]=n?e:s(e))},cdata:e=>{t.push("<![CDATA[",e,"]]>")},comment:e=>{t.push("\x3c!--",e,"--\x3e")},pi:(e,o)=>{o?t.push("<?",e," ",s(o),"?>"):t.push("<?",e,"?>"),n&&t.push("\n")},doctype:e=>{t.push("<!DOCTYPE",e,">",n?"\n":"")},reset:()=>{t.length=0},getContent:()=>t.join("").replace(/\n$/,"")}},up=(e={},t=ua())=>{const n=cp(e);return e.validate=!("validate"in e)||e.validate,{serialize:o=>{const r=e.validate,s={3:e=>{var t;n.text(null!==(t=e.value)&&void 0!==t?t:"",e.raw)},8:e=>{var t;n.comment(null!==(t=e.value)&&void 0!==t?t:"")},7:e=>{n.pi(e.name,e.value)},10:e=>{var t;n.doctype(null!==(t=e.value)&&void 0!==t?t:"")},4:e=>{var t;n.cdata(null!==(t=e.value)&&void 0!==t?t:"")},11:e=>{let t=e;if(t=t.firstChild)do{a(t)}while(t=t.next)}};n.reset();const a=e=>{var o;const i=s[e.type];if(i)i(e);else{const s=e.name,i=s in t.getVoidElements();let l=e.attributes;if(r&&l&&l.length>1){const n=[];n.map={};const o=t.getElementRule(e.name);if(o){for(let e=0,t=o.attributesOrder.length;e<t;e++){const t=o.attributesOrder[e];if(t in l.map){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}for(let e=0,t=l.length;e<t;e++){const t=l[e].name;if(!(t in n.map)){const e=l.map[t];n.map[t]=e,n.push({name:t,value:e})}}l=n}}if(n.start(s,l,i),ps(s))m(e.value)&&n.text(e.value,!0),n.end(s);else if(!i){let t=e.firstChild;if(t){"pre"!==s&&"textarea"!==s||3!==t.type||"\n"!==(null===(o=t.value)||void 0===o?void 0:o[0])||n.text("\n",!0);do{a(t)}while(t=t.next)}n.end(s)}}};return 1!==o.type||e.inner?3===o.type?s[3](o):s[11](o):a(o),n.getContent()}}},mp=new Set;V(["margin","margin-left","margin-right","margin-top","margin-bottom","padding","padding-left","padding-right","padding-top","padding-bottom","border","border-width","border-style","border-color","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","float","position","left","right","top","bottom","z-index","display","transform","width","max-width","min-width","height","max-height","min-height","overflow","overflow-x","overflow-y","text-overflow","vertical-align","transition","transition-delay","transition-duration","transition-property","transition-timing-function"],(e=>{mp.add(e)}));const fp=["font","text-decoration","text-emphasis"],gp=(e,t)=>me(e.parseStyle(e.getAttrib(t,"style"))),pp=(e,t,n)=>{const o=gp(e,t),r=gp(e,n),s=o=>{var r,s;const a=null!==(r=e.getStyle(t,o))&&void 0!==r?r:"",i=null!==(s=e.getStyle(n,o))&&void 0!==s?s:"";return Ye(a)&&Ye(i)&&a!==i};return $(o,(e=>{const t=t=>$(t,(t=>t===e));if(!t(r)&&t(fp)){const e=Y(r,(e=>$(fp,(t=>He(e,t)))));return $(e,s)}return s(e)}))},hp=(e,t,n)=>I.from(n.container()).filter(er).exists((o=>{const r=e?0:-1;return t(o.data.charAt(n.offset()+r))})),bp=T(hp,!0,Xu),vp=T(hp,!1,Xu),yp=e=>{const t=e.container();return er(t)&&(0===t.data.length||Pr(t.data)&&Jm.isBookmarkNode(t.parentNode))},Cp=(e,t)=>n=>Jc(e?0:-1,n).filter(t).isSome(),wp=e=>ir(e)&&"block"===co(yn(e),"display"),xp=e=>dr(e)&&!(e=>qo(e)&&"all"===e.getAttribute("data-mce-bogus"))(e),Ep=Cp(!0,wp),_p=Cp(!1,wp),kp=Cp(!0,mr),Sp=Cp(!1,mr),Np=Cp(!0,Qo),Rp=Cp(!1,Qo),Ap=Cp(!0,xp),Tp=Cp(!1,xp),Op=(e,t)=>((e,t,n)=>kn(t,e)?On(e,(e=>n(e)||_n(e,t))).slice(0,-1):[])(e,t,L),Bp=(e,t)=>[e].concat(Op(e,t)),Pp=(e,t,n)=>Nu(e,t,n,yp),Dp=(e,t,n)=>J(Bp(yn(t.container()),e),(e=>t=>e.isBlock(Ht(t)))(n)),Lp=(e,t,n,o)=>Pp(e,t.dom,n).forall((e=>Dp(t,n,o).fold((()=>!Qc(e,n,t.dom)),(o=>!Qc(e,n,t.dom)&&kn(o,yn(e.container())))))),Mp=(e,t,n,o)=>Dp(t,n,o).fold((()=>Pp(e,t.dom,n).forall((e=>!Qc(e,n,t.dom)))),(t=>Pp(e,t.dom,n).isNone())),Ip=T(Mp,!1),Fp=T(Mp,!0),Up=T(Lp,!1),zp=T(Lp,!0),jp=e=>iu(e).exists(Er),Hp=(e,t,n,o)=>{const r=Y(Bp(yn(n.container()),t),(e=>o.isBlock(Ht(e)))),s=le(r).getOr(t);return ku(e,s.dom,n).filter(jp)},$p=(e,t,n)=>iu(t).exists(Er)||Hp(!0,e,t,n).isSome(),qp=(e,t,n)=>(e=>I.from(e.getNode(!0)).map(yn))(t).exists(Er)||Hp(!1,e,t,n).isSome(),Vp=T(Hp,!1),Wp=T(Hp,!0),Kp=e=>Vi.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd(),Yp=(e,t,n)=>{const o=Y(Bp(yn(t.container()),e),(e=>n.isBlock(Ht(e))));return le(o).getOr(e)},Gp=(e,t,n)=>Kp(t)?vp(t):vp(t)||Tu(Yp(e,t,n).dom,t).exists(vp),Xp=(e,t,n)=>Kp(t)?bp(t):bp(t)||Au(Yp(e,t,n).dom,t).exists(bp),Qp=e=>iu(e).bind((e=>Jn(e,Wt))).exists((e=>(e=>H(["pre","pre-wrap"],e))(co(e,"white-space")))),Jp=(e,t)=>n=>{return o=new jo(n,e)[t](),C(o)&&dr(o)&&zc(o);var o},Zp=(e,t,n)=>!Qp(t)&&(((e,t,n)=>((e,t)=>Tu(e.dom,t).isNone())(e,t)||((e,t)=>Au(e.dom,t).isNone())(e,t)||Ip(e,t,n)||Fp(e,t,n)||qp(e,t,n)||$p(e,t,n))(e,t,n)||Gp(e,t,n)||Xp(e,t,n)),eh=(e,t,n)=>!Qp(t)&&(Ip(e,t,n)||Up(e,t,n)||qp(e,t,n)||Gp(e,t,n)||((e,t)=>{const n=Tu(e.dom,t).getOr(t),o=Jp(e.dom,"prev");return t.isAtStart()&&(o(t.container())||o(n.container()))})(e,t)),th=(e,t,n)=>!Qp(t)&&(Fp(e,t,n)||zp(e,t,n)||$p(e,t,n)||Xp(e,t,n)||((e,t)=>{const n=Au(e.dom,t).getOr(t),o=Jp(e.dom,"next");return t.isAtEnd()&&(o(t.container())||o(n.container()))})(e,t)),nh=(e,t,n)=>eh(e,t,n)||th(e,(e=>{const t=e.container(),n=e.offset();return er(t)&&n<t.data.length?Vi(t,n+1):e})(t),n),oh=(e,t)=>Yu(e.charAt(t)),rh=(e,t)=>Xu(e.charAt(t)),sh=(e,t,n,o)=>{const r=t.data,s=Vi(t,0);return n||!oh(r,0)||nh(e,s,o)?!!(n&&rh(r,0)&&eh(e,s,o))&&(t.data=br+r.slice(1),!0):(t.data=" "+r.slice(1),!0)},ah=(e,t,n,o)=>{const r=t.data,s=Vi(t,r.length-1);return n||!oh(r,r.length-1)||nh(e,s,o)?!!(n&&rh(r,r.length-1)&&th(e,s,o))&&(t.data=r.slice(0,-1)+br,!0):(t.data=r.slice(0,-1)+" ",!0)},ih=(e,t,n)=>{const o=t.container();if(!er(o))return I.none();if((e=>{const t=e.container();return er(t)&&je(t.data,br)})(t)){const r=sh(e,o,!1,n)||(e=>{const t=e.data,n=(e=>{const t=e.split("");return q(t,((e,n)=>Yu(e)&&n>0&&n<t.length-1&&Qu(t[n-1])&&Qu(t[n+1])?" ":e)).join("")})(t);return n!==t&&(e.data=n,!0)})(o)||ah(e,o,!1,n);return It(r,t)}if(nh(e,t,n)){const r=sh(e,o,!0,n)||ah(e,o,!0,n);return It(r,t)}return I.none()},lh=(e,t,n,o)=>{if(0===n)return;const r=yn(e),s=Qn(r,(e=>o.isBlock(Ht(e)))).getOr(r),a=e.data.slice(t,t+n),i=t+n>=e.data.length&&th(s,Vi(e,e.data.length),o),l=0===t&&eh(s,Vi(e,0),o);e.replaceData(t,n,ls(a,4,l,i))},dh=(e,t,n)=>{const o=e.data.slice(t),r=o.length-We(o).length;lh(e,t,r,n)},ch=(e,t,n)=>{const o=e.data.slice(0,t),r=o.length-Ke(o).length;lh(e,t-r,r,n)},uh=(e,t,n,o,r=!0)=>{const s=Ke(e.data).length,a=r?e:t,i=r?t:e;return r?a.appendData(i.data):a.insertData(0,i.data),xo(yn(i)),o&&dh(a,s,n),a},mh=(e,t)=>((e,t)=>{const n=e.container(),o=e.offset();return!Vi.isTextPosition(e)&&n===t.parentNode&&o>Vi.before(t).offset()})(t,e)?Vi(t.container(),t.offset()-1):t,fh=e=>{return ts(e.previousSibling)?I.some((t=e.previousSibling,er(t)?Vi(t,t.data.length):Vi.after(t))):e.previousSibling?Bu(e.previousSibling):I.none();var t},gh=e=>{return ts(e.nextSibling)?I.some((t=e.nextSibling,er(t)?Vi(t,0):Vi.before(t))):e.nextSibling?Ou(e.nextSibling):I.none();var t},ph=(e,t,n)=>((e,t,n)=>e?((e,t)=>gh(t).orThunk((()=>fh(t))).orThunk((()=>((e,t)=>Au(e,Vi.after(t)).orThunk((()=>Tu(e,Vi.before(t)))))(e,t))))(t,n):((e,t)=>fh(t).orThunk((()=>gh(t))).orThunk((()=>((e,t)=>I.from(t.previousSibling?t.previousSibling:t.parentNode).bind((t=>Tu(e,Vi.before(t)))).orThunk((()=>Au(e,Vi.after(t)))))(e,t))))(t,n))(e,t,n).map(T(mh,n)),hh=(e,t,n)=>{n.fold((()=>{e.focus()}),(n=>{e.selection.setRng(n.toRange(),t)}))},bh=(e,t)=>t&&Ee(e.schema.getBlockElements(),Ht(t)),vh=(e,t,n,o=!0,r=!1)=>{const s=ph(t,e.getBody(),n.dom),a=Qn(n,T(bh,e),(i=e.getBody(),e=>e.dom===i));var i;const l=((e,t,n,o)=>{const r=Bn(e).filter(Kt),s=Pn(e).filter(Kt);return xo(e),(a=r,i=s,l=t,d=(e,t,r)=>{const s=e.dom,a=t.dom,i=s.data.length;return uh(s,a,n,o),r.container()===a?Vi(s,i):r},a.isSome()&&i.isSome()&&l.isSome()?I.some(d(a.getOrDie(),i.getOrDie(),l.getOrDie())):I.none()).orThunk((()=>(o&&(r.each((e=>ch(e.dom,e.dom.length,n))),s.each((e=>dh(e.dom,0,n)))),t)));var a,i,l,d})(n,s,e.schema,((e,t)=>Ee(e.schema.getTextInlineElements(),Ht(t)))(e,n));e.dom.isEmpty(e.getBody())?(e.setContent(""),e.selection.setCursorLocation()):a.bind((e=>((e,t)=>{if(gs(e)){const n=hn('<br data-mce-bogus="1">');return t?V(Mn(e),(e=>{Tm(e)||xo(e)})):wo(e),vo(e,n),I.some(Vi.before(n.dom))}return I.none()})(e,r))).fold((()=>{o&&hh(e,t,l)}),(n=>{o&&hh(e,t,I.some(n))}))},yh=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,Ch=(e,t)=>xn(yn(t),dd(e))&&!Ts(e.schema,t)&&e.dom.isEditable(t),wh=e=>{var t;return"rtl"===za.DOM.getStyle(e,"direction",!0)||(e=>yh.test(e))(null!==(t=e.textContent)&&void 0!==t?t:"")},xh=(e,t,n)=>{const o=((e,t,n)=>Y(za.DOM.getParents(n.container(),"*",t),e))(e,t,n);return I.from(o[o.length-1])},Eh=(e,t)=>{const n=t.container(),o=t.offset();return e?Fr(n)?er(n.nextSibling)?Vi(n.nextSibling,0):Vi.after(n):jr(t)?Vi(n,o+1):t:Fr(n)?er(n.previousSibling)?Vi(n.previousSibling,n.previousSibling.data.length):Vi.before(n):Hr(t)?Vi(n,o-1):t},_h=T(Eh,!0),kh=T(Eh,!1),Sh=(e,t)=>{const n=e=>e.stopImmediatePropagation();e.on("beforeinput input",n,!0),e.getDoc().execCommand(t),e.off("beforeinput input",n)},Nh=e=>Sh(e,"Delete"),Rh=e=>_r(e)||Sr(e),Ah=(e,t)=>kn(e,t)?Jn(t,Rh,(e=>t=>Dt(An(t),e,_n))(e)):I.none(),Th=(e,t=!0)=>{e.dom.isEmpty(e.getBody())&&e.setContent("",{no_selection:!t})},Oh=(e,t,n)=>Mt(Ou(n),Bu(n),((o,r)=>{const s=Eh(!0,o),a=Eh(!1,r),i=Eh(!1,t);return e?Au(n,i).exists((e=>e.isEqual(a)&&t.isEqual(s))):Tu(n,i).exists((e=>e.isEqual(s)&&t.isEqual(a)))})).getOr(!0),Bh=e=>{var t;return(8===$t(t=e)||"#comment"===Ht(t)?Bn(e):Un(e)).bind(Bh).orThunk((()=>I.some(e)))},Ph=(e,t,n,o=!0)=>{var r;t.deleteContents();const s=Bh(n).getOr(n),a=yn(null!==(r=e.dom.getParent(s.dom,e.dom.isBlock))&&void 0!==r?r:n.dom);if(a.dom===e.getBody()?Th(e,o):gs(a)&&(Or(a),o&&e.selection.setCursorLocation(a.dom,0)),!_n(n,a)){const e=Dt(An(a),n)?[]:An(i=a).map(Mn).map((e=>Y(e,(e=>!_n(i,e))))).getOr([]);V(e.concat(Mn(n)),(e=>{_n(e,a)||kn(e,a)||!gs(e)||xo(e)}))}var i},Dh=(e,t)=>((e,t)=>{const n=e.dom;return n.parentNode?((e,t)=>J(e.dom.childNodes,(e=>t(yn(e)))).map(yn))(yn(n.parentNode),(n=>!_n(e,n)&&t(n))):I.none()})(e,t).isSome(),Lh=(e,t)=>Zn(e,t).isSome(),Mh=e=>Uo(e,"td,th"),Ih=(e,t)=>tm(yn(e),t),Fh=(e,t)=>({start:e,end:t}),Uh=hl([{singleCellTable:["rng","cell"]},{fullTable:["table"]},{partialTable:["cells","outsideDetails"]},{multiTable:["startTableCells","endTableCells","betweenRng"]}]),zh=(e,t)=>no(yn(e),"td,th",t),jh=e=>!_n(e.start,e.end),Hh=(e,t)=>tm(e.start,t).bind((n=>tm(e.end,t).bind((e=>It(_n(n,e),n))))),$h=e=>t=>Hh(t,e).map((e=>((e,t,n)=>({rng:e,table:t,cells:n}))(t,e,Mh(e)))),qh=(e,t,n,o)=>{if(n.collapsed||!e.forall(jh))return I.none();if(t.isSameTable){const t=e.bind($h(o));return I.some({start:t,end:t})}{const e=zh(n.startContainer,o),t=zh(n.endContainer,o),r=e.bind((e=>t=>tm(t,e).bind((e=>de(Mh(e)).map((e=>Fh(t,e))))))(o)).bind($h(o)),s=t.bind((e=>t=>tm(t,e).bind((e=>le(Mh(e)).map((e=>Fh(e,t))))))(o)).bind($h(o));return I.some({start:r,end:s})}},Vh=(e,t)=>Z(e,(e=>_n(e,t))),Wh=e=>Mt(Vh(e.cells,e.rng.start),Vh(e.cells,e.rng.end),((t,n)=>e.cells.slice(t,n+1))),Kh=(e,t)=>{const{startTable:n,endTable:o}=t,r=e.cloneRange();return n.each((e=>r.setStartAfter(e.dom))),o.each((e=>r.setEndBefore(e.dom))),r},Yh=(e,t)=>{const n=(e=>t=>_n(e,t))(e),o=((e,t)=>{const n=zh(e.startContainer,t),o=zh(e.endContainer,t);return Mt(n,o,Fh)})(t,n),r=((e,t)=>{const n=Ih(e.startContainer,t),o=Ih(e.endContainer,t),r=n.isSome(),s=o.isSome(),a=Mt(n,o,_n).getOr(!1);return(e=>Mt(e.startTable,e.endTable,((t,n)=>{const o=Lh(t,(e=>_n(e,n))),r=Lh(n,(e=>_n(e,t)));return o||r?{...e,startTable:o?I.none():e.startTable,endTable:r?I.none():e.endTable,isSameTable:!1,isMultiTable:!1}:e})).getOr(e))({startTable:n,endTable:o,isStartInTable:r,isEndInTable:s,isSameTable:a,isMultiTable:!a&&r&&s})})(t,n);return((e,t,n)=>e.exists((e=>((e,t)=>!jh(e)&&Hh(e,t).exists((e=>{const t=e.dom.rows;return 1===t.length&&1===t[0].cells.length})))(e,n)&&rm(e.start,t))))(o,t,n)?o.map((e=>Uh.singleCellTable(t,e.start))):r.isMultiTable?((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:o})=>{const r=e.bind(Wh).getOr([]),s=o.bind(Wh).getOr([]);if(r.length>0&&s.length>0){const e=Kh(n,t);return I.some(Uh.multiTable(r,s,e))}return I.none()})))(o,r,t,n):((e,t,n,o)=>qh(e,t,n,o).bind((({start:e,end:t})=>e.or(t))).bind((e=>{const{isSameTable:o}=t,r=Wh(e).getOr([]);if(o&&e.cells.length===r.length)return I.some(Uh.fullTable(e.table));if(r.length>0){if(o)return I.some(Uh.partialTable(r,I.none()));{const e=Kh(n,t);return I.some(Uh.partialTable(r,I.some({...t,rng:e})))}}return I.none()})))(o,r,t,n)},Gh=e=>V(e,(e=>{on(e,"contenteditable"),Or(e)})),Xh=(e,t,n,o)=>{const r=n.cloneRange();o?(r.setStart(n.startContainer,n.startOffset),r.setEndAfter(t.dom.lastChild)):(r.setStartBefore(t.dom.firstChild),r.setEnd(n.endContainer,n.endOffset)),eb(e,r,t,!1).each((e=>e()))},Qh=e=>{const t=em(e),n=yn(e.selection.getNode());cr(n.dom)&&gs(n)?e.selection.setCursorLocation(n.dom,0):e.selection.collapse(!0),t.length>1&&$(t,(e=>_n(e,n)))&&Jt(n,"data-mce-selected","1")},Jh=(e,t,n)=>I.some((()=>{const o=e.selection.getRng(),r=n.bind((({rng:n,isStartInTable:r})=>{const s=((e,t)=>I.from(e.dom.getParent(t,e.dom.isBlock)).map(yn))(e,r?n.endContainer:n.startContainer);n.deleteContents(),((e,t,n)=>{n.each((n=>{t?xo(n):(Or(n),e.selection.setCursorLocation(n.dom,0))}))})(e,r,s.filter(gs));const a=r?t[0]:t[t.length-1];return Xh(e,a,o,r),gs(a)?I.none():I.some(r?t.slice(1):t.slice(0,-1))})).getOr(t);Gh(r),Qh(e)})),Zh=(e,t,n,o)=>I.some((()=>{const r=e.selection.getRng(),s=t[0],a=n[n.length-1];Xh(e,s,r,!0),Xh(e,a,r,!1);const i=gs(s)?t:t.slice(1),l=gs(a)?n:n.slice(0,-1);Gh(i.concat(l)),o.deleteContents(),Qh(e)})),eb=(e,t,n,o=!0)=>I.some((()=>{Ph(e,t,n,o)})),tb=(e,t)=>I.some((()=>vh(e,!1,t))),nb=(e,t)=>J(Bp(t,e),Rr),ob=(e,t)=>J(Bp(t,e),Xt("caption")),rb=(e,t)=>I.some((()=>{Or(t),e.selection.setCursorLocation(t.dom,0)})),sb=(e,t)=>e?Np(t):Rp(t),ab=(e,t,n)=>{const o=yn(e.getBody());return ob(o,n).fold((()=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return nb(n,o).bind((o=>gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).bind((e=>nb(t,yn(e.getNode())).bind((e=>_n(e,o)?I.none():I.some(_))))))(e,n,t,o,r)))})(e,t,o,n).orThunk((()=>It(((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return sb(t,n)||ku(t,e.getBody(),n).exists((e=>sb(t,e)))})(e,t),_)))),(n=>((e,t,n,o)=>{const r=Vi.fromRangeStart(e.selection.getRng());return gs(o)?rb(e,o):((e,t,n,o,r)=>Su(n,e.getBody(),r).fold((()=>I.some(_)),(s=>((e,t,n,o)=>Ou(e.dom).bind((r=>Bu(e.dom).map((e=>t?n.isEqual(r)&&o.isEqual(e):n.isEqual(e)&&o.isEqual(r))))).getOr(!0))(o,n,r,s)?((e,t)=>rb(e,t))(e,o):((e,t,n)=>ob(e,yn(n.getNode())).fold((()=>I.some(_)),(e=>It(!_n(e,t),_))))(t,o,s))))(e,n,t,o,r)})(e,t,o,n)))},ib=(e,t)=>{const n=yn(e.selection.getStart(!0)),o=em(e);return e.selection.isCollapsed()&&0===o.length?ab(e,t,n):((e,t,n)=>{const o=yn(e.getBody()),r=e.selection.getRng();return 0!==n.length?Jh(e,n,I.none()):((e,t,n,o)=>ob(t,o).fold((()=>((e,t,n)=>Yh(t,n).bind((t=>t.fold(T(eb,e),T(tb,e),T(Jh,e),T(Zh,e)))))(e,t,n)),(t=>((e,t)=>rb(e,t))(e,t))))(e,o,r,t)})(e,n,o)},lb=(e,t)=>{let n=t;for(;n&&n!==e;){if(lr(n)||dr(n))return n;n=n.parentNode}return null},db=["data-ephox-","data-mce-","data-alloy-","data-snooker-","_"],cb=Pt.each,ub=e=>{const t=e.dom,n=new Set(e.serializer.getTempAttrs()),o=e=>$(db,(t=>He(e,t)))||n.has(e);return{compare:(e,n)=>{if(e.nodeName!==n.nodeName||e.nodeType!==n.nodeType)return!1;const r=e=>{const n={};return cb(t.getAttribs(e),(r=>{const s=r.nodeName.toLowerCase();"style"===s||o(s)||(n[s]=t.getAttrib(e,s))})),n},s=(e,t)=>{for(const n in e)if(Ee(e,n)){const o=t[n];if(v(o))return!1;if(e[n]!==o)return!1;delete t[n]}for(const e in t)if(Ee(t,e))return!1;return!0};if(qo(e)&&qo(n)){if(!s(r(e),r(n)))return!1;if(!s(t.parseStyle(t.getAttrib(e,"style")),t.parseStyle(t.getAttrib(n,"style"))))return!1}return!Ku(e)&&!Ku(n)},isAttributeInternal:o}},mb=e=>["h1","h2","h3","h4","h5","h6"].includes(e.name),fb=(e,t,n,o)=>{const r=n.name;for(let t=0,s=e.length;t<s;t++){const s=e[t];if(s.name===r){const e=o.nodes[r];e?e.nodes.push(n):o.nodes[r]={filter:s,nodes:[n]}}}if(n.attributes)for(let e=0,r=t.length;e<r;e++){const r=t[e],s=r.name;if(s in n.attributes.map){const e=o.attributes[s];e?e.nodes.push(n):o.attributes[s]={filter:r,nodes:[n]}}}},gb=(e,t)=>{const n=(e,n)=>{ge(e,(e=>{const o=ce(e.nodes);V(e.filter.callbacks,(r=>{for(let t=o.length-1;t>=0;t--){const r=o[t];(n?void 0!==r.attr(e.filter.name):r.name===e.filter.name)&&!y(r.parent)||o.splice(t,1)}o.length>0&&r(o,e.filter.name,t)}))}))};n(e.nodes,!1),n(e.attributes,!0)},pb=(e,t,n,o={})=>{const r=((e,t,n)=>{const o={nodes:{},attributes:{}};return n.firstChild&&((n,r)=>{let s=n;for(;s=s.walk();)fb(e,t,s,o)})(n),o})(e,t,n);gb(r,o)},hb=(e,t,n,o)=>{if((e.pad_empty_with_br||t.insert)&&n(o)){const e=new Wg("br",1);t.insert&&e.attr("data-mce-bogus","1"),o.empty().append(e)}else o.empty().append(new Wg("#text",3)).value=br},bb=(e,t)=>{const n=null==e?void 0:e.firstChild;return C(n)&&n===e.lastChild&&n.name===t},vb=(e,t,n,o)=>o.isEmpty(t,n,(t=>((e,t)=>{const n=e.getElementRule(t.name);return!0===(null==n?void 0:n.paddEmpty)})(e,t))),yb=e=>{let t;for(let n=e;n;n=n.parent){const e=n.attr("contenteditable");if("false"===e)break;"true"===e&&(t=n)}return I.from(t)},Cb=(e,t,n=e.parent)=>{if(t.getSpecialElements()[e.name])e.empty().remove();else{const o=e.children();for(const e of o)n&&!t.isValidChild(n.name,e.name)&&Cb(e,t,n);e.unwrap()}},wb=(e,t,n,o=_)=>{const r=t.getTextBlockElements(),s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=Pt.makeMap("tr,td,th,tbody,thead,tfoot,table,summary"),l=new Set,d=e=>e!==n&&!i[e.name];for(let n=0;n<e.length;n++){const i=e[n];let c,u,m;if(!i.parent||l.has(i))continue;if(r[i.name]&&"li"===i.parent.name){let e=i.next;for(;e&&r[e.name];)e.name="li",l.add(e),i.parent.insert(e,i.parent),e=e.next;i.unwrap();continue}const f=[i];for(c=i.parent;c&&!t.isValidChild(c.name,i.name)&&d(c);c=c.parent)f.push(c);if(c&&f.length>1)if(xb(t,i,c))Cb(i,t);else{f.reverse(),u=f[0].clone(),o(u);let e=u;for(let n=0;n<f.length-1;n++){t.isValidChild(e.name,f[n].name)&&n>0?(m=f[n].clone(),o(m),e.append(m)):m=e;for(let e=f[n].firstChild;e&&e!==f[n+1];){const t=e.next;m.append(e),e=t}e=m}vb(t,s,a,u)?c.insert(i,f[0],!0):(c.insert(u,f[0],!0),c.insert(i,u)),c=f[0],(vb(t,s,a,c)||bb(c,"br"))&&c.empty().remove()}else if(i.parent){if("li"===i.name){let e=i.prev;if(e&&("ul"===e.name||"ol"===e.name)){e.append(i);continue}if(e=i.next,e&&("ul"===e.name||"ol"===e.name)&&e.firstChild){e.insert(i,e.firstChild,!0);continue}const t=new Wg("ul",1);o(t),i.wrap(t);continue}if(t.isValidChild(i.parent.name,"div")&&t.isValidChild("div",i.name)){const e=new Wg("div",1);o(e),i.wrap(e)}else Cb(i,t)}}},xb=(e,t,n=t.parent)=>!(!n||(!e.children[t.name]||e.isValidChild(n.name,t.name))&&("a"!==t.name||!((e,t)=>{let n=e;for(;n;){if("a"===n.name)return!0;n=n.parent}return!1})(n))&&(!(e=>"summary"===e.name)(n)||!mb(t)||(null==n?void 0:n.firstChild)===t&&(null==n?void 0:n.lastChild)===t)),Eb=e=>e.collapsed?e:(e=>{const t=Vi.fromRangeStart(e),n=Vi.fromRangeEnd(e),o=e.commonAncestorContainer;return ku(!1,o,n).map((r=>!Qc(t,n,o)&&Qc(t,r,o)?((e,t,n,o)=>{const r=document.createRange();return r.setStart(e,t),r.setEnd(n,o),r})(t.container(),t.offset(),r.container(),r.offset()):e)).getOr(e)})(e),_b=(e,t)=>{let n=t.firstChild,o=t.lastChild;return n&&"meta"===n.name&&(n=n.next),o&&"mce_marker"===o.attr("id")&&(o=o.prev),((e,t)=>{const n=e.getNonEmptyElements();return C(t)&&(t.isEmpty(n)||((e,t)=>e.getBlockElements()[t.name]&&(e=>C(e.firstChild)&&e.firstChild===e.lastChild)(t)&&(e=>"br"===e.name||e.value===br)(t.firstChild))(e,t))})(e,o)&&(o=null==o?void 0:o.prev),!(!n||n!==o||"ul"!==n.name&&"ol"!==n.name)},kb=e=>{return e.length>0&&(!(n=e[e.length-1]).firstChild||C(null==(t=n)?void 0:t.firstChild)&&t.firstChild===t.lastChild&&(e=>e.data===br||ar(e))(t.firstChild))?e.slice(0,-1):e;var t,n},Sb=(e,t)=>{const n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Nb=(e,t)=>{const n=Vi.after(e),o=wu(t).prev(n);return o?o.toRange():null},Rb=(e,t,n,o)=>{const r=((e,t,n)=>{const o=t.serialize(n);return(e=>{var t,n;const o=e.firstChild,r=e.lastChild;return o&&"META"===o.nodeName&&(null===(t=o.parentNode)||void 0===t||t.removeChild(o)),r&&"mce_marker"===r.id&&(null===(n=r.parentNode)||void 0===n||n.removeChild(r)),e})(e.createFragment(o))})(t,e,o),s=Sb(t,n.startContainer),a=kb((i=r.firstChild,Y(null!==(l=null==i?void 0:i.childNodes)&&void 0!==l?l:[],(e=>"LI"===e.nodeName))));var i,l;const d=t.getRoot(),c=e=>{const o=Vi.fromRangeStart(n),r=wu(t.getRoot()),a=1===e?r.prev(o):r.next(o),i=null==a?void 0:a.getNode();return!i||Sb(t,i)!==s};return s?c(1)?((e,t,n)=>{const o=e.parentNode;return o&&Pt.each(t,(t=>{o.insertBefore(t,e)})),((e,t)=>{const n=Vi.before(e),o=wu(t).next(n);return o?o.toRange():null})(e,n)})(s,a,d):c(2)?((e,t,n,o)=>(o.insertAfter(t.reverse(),e),Nb(t[0],n)))(s,a,d,t):((e,t,n,o)=>{const r=((e,t)=>{const n=t.cloneRange(),o=t.cloneRange();return n.setStartBefore(e),o.setEndAfter(e),[n.cloneContents(),o.cloneContents()]})(e,o),s=e.parentNode;return s&&(s.insertBefore(r[0],e),Pt.each(t,(t=>{s.insertBefore(t,e)})),s.insertBefore(r[1],e),s.removeChild(e)),Nb(t[t.length-1],n)})(s,a,d,n):null},Ab=["pre"],Tb=cr,Ob=(e,t,n)=>{var o,r;const s=e.selection,a=e.dom,i=e.parser,l=n.merge,d=up({validate:!0},e.schema),c='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>';n.preserve_zwsp||(t=Dr(t)),-1===t.indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,c);let u=s.getRng();const m=u.startContainer,f=e.getBody();m===f&&s.isCollapsed()&&a.isBlock(f.firstChild)&&((e,t)=>C(t)&&!e.schema.getVoidElements()[t.nodeName])(e,f.firstChild)&&a.isEmpty(f.firstChild)&&(u=a.createRng(),u.setStart(f.firstChild,0),u.setEnd(f.firstChild,0),s.setRng(u)),s.isCollapsed()||(e=>{const t=e.dom,n=Eb(e.selection.getRng());e.selection.setRng(n);const o=t.getParent(n.startContainer,Tb);((e,t,n)=>!!C(n)&&n===e.getParent(t.endContainer,Tb)&&rm(yn(n),t))(t,n,o)?eb(e,n,yn(o)):n.startContainer===n.endContainer&&n.endOffset-n.startOffset==1&&er(n.startContainer.childNodes[n.startOffset])?n.deleteContents():e.getDoc().execCommand("Delete",!1)})(e);const g=s.getNode(),p={context:g.nodeName.toLowerCase(),data:n.data,insert:!0},h=i.parse(t,p);if(!0===n.paste&&_b(e.schema,h)&&((e,t)=>!!Sb(e,t))(a,g))return u=Rb(d,a,s.getRng(),h),u&&s.setRng(u),t;!0===n.paste&&((e,t,n,o)=>{var r;const s=t.firstChild,a=t.lastChild,i=s===("bookmark"===a.attr("data-mce-type")?a.prev:a),l=H(Ab,s.name);if(i&&l){const t="false"!==s.attr("contenteditable"),a=(null===(r=e.getParent(n,e.isBlock))||void 0===r?void 0:r.nodeName.toLowerCase())===s.name,i=I.from(lb(o,n)).forall(lr);return t&&a&&i}return!1})(a,h,g,e.getBody())&&(null===(o=h.firstChild)||void 0===o||o.unwrap()),(e=>{let t=e;for(;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")})(h);let b=h.lastChild;if(b&&"mce_marker"===b.attr("id")){const t=b;for(b=b.prev;b;b=b.walk(!0))if(3===b.type||!a.isBlock(b.name)){b.parent&&e.schema.isValidChild(b.parent.name,"span")&&b.parent.insert(t,b,"br"===b.name);break}}if(e._selectionOverrides.showBlockCaretContainer(g),p.invalid||((e,t,n)=>{var o;return $(n.children(),mb)&&"SUMMARY"===(null===(o=e.getParent(t,e.isBlock))||void 0===o?void 0:o.nodeName)})(a,g,h)){e.selection.setContent(c);let n,o=s.getNode();const l=e.getBody();for(rr(o)?o=n=l:n=o;n&&n!==l;)o=n,n=n.parentNode;t=o===l?l.innerHTML:a.getOuterHTML(o);const u=i.parse(t),m=(e=>{for(let t=e;t;t=t.walk())if("mce_marker"===t.attr("id"))return I.some(t);return I.none()})(u),f=m.bind(yb).getOr(u);m.each((e=>e.replace(h)));const g=h.children(),p=null!==(r=h.parent)&&void 0!==r?r:u;h.unwrap();const b=Y(g,(t=>xb(e.schema,t,p)));wb(b,e.schema,f),pb(i.getNodeFilters(),i.getAttributeFilters(),u),t=d.serialize(u),o===l?a.setHTML(l,t):a.setOuterHTML(o,t)}else t=d.serialize(h),((e,t,n)=>{var o;if("all"===n.getAttribute("data-mce-bogus"))null===(o=n.parentNode)||void 0===o||o.insertBefore(e.dom.createFragment(t),n);else{const o=n.firstChild,r=n.lastChild;!o||o===r&&"BR"===o.nodeName?e.dom.setHTML(n,t):e.selection.setContent(t,{no_events:!0})}})(e,t,g);var v;return((e,t)=>{const n=e.schema.getTextInlineElements(),o=e.dom;if(t){const t=e.getBody(),r=ub(e);Pt.each(o.select("*[data-mce-fragment]"),(e=>{if(C(n[e.nodeName.toLowerCase()])&&((e,t)=>ne(gp(e,t),(e=>!(e=>mp.has(e))(e))))(o,e))for(let n=e.parentElement;C(n)&&n!==t&&!pp(o,e,n);n=n.parentElement)if(r.compare(n,e)){o.remove(e,!0);break}}))}})(e,l),((e,t)=>{var n,o,r;let s;const a=e.dom,i=e.selection;if(!t)return;i.scrollIntoView(t);const l=lb(e.getBody(),t);if(l&&"false"===a.getContentEditable(l))return a.remove(t),void i.select(l);let d=a.createRng();const c=t.previousSibling;if(er(c)){d.setStart(c,null!==(o=null===(n=c.nodeValue)||void 0===n?void 0:n.length)&&void 0!==o?o:0);const e=t.nextSibling;er(e)&&(c.appendData(e.data),null===(r=e.parentNode)||void 0===r||r.removeChild(e))}else d.setStartBefore(t),d.setEndBefore(t);const u=a.getParent(t,a.isBlock);if(a.remove(t),u&&a.isEmpty(u)){const t=Tb(u);wo(yn(u)),d.setStart(u,0),d.setEnd(u,0),t||(e=>!!e.getAttribute("data-mce-fragment"))(u)||!(s=(t=>{let n=Vi.fromRangeStart(t);return n=wu(e.getBody()).next(n),null==n?void 0:n.toRange()})(d))?a.add(u,a.create("br",t?{}:{"data-mce-bogus":"1"})):(d=s,a.remove(u))}i.setRng(d)})(e,a.get("mce_marker")),v=e.getBody(),Pt.each(v.getElementsByTagName("*"),(e=>{e.removeAttribute("data-mce-fragment")})),((e,t,n)=>{I.from(e.getParent(t,"td,th")).map(yn).each((e=>((e,t)=>{Un(e).each((n=>{Bn(n).each((o=>{t.isBlock(Ht(e))&&Er(n)&&t.isBlock(Ht(o))&&xo(n)}))}))})(e,n)))})(a,s.getStart(),e.schema),((e,t,n)=>{const o=On(yn(n),(e=>_n(e,yn(t))));ie(o,o.length-2).filter(Wt).fold((()=>ks(e,t)),(t=>ks(e,t.dom)))})(e.schema,e.getBody(),s.getStart()),t},Bb=e=>e instanceof Wg,Pb=(e,t,n)=>{e.dom.setHTML(e.getBody(),t),!0!==n&&(e=>{Rg(e)&&Ou(e.getBody()).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e)},Db=e=>w(e)?e:L,Lb=(e,t,n)=>{const o=t(e),r=Db(n);return o.orThunk((()=>r(e)?I.none():((e,t,n)=>{let o=e.dom;const r=Db(n);for(;o.parentNode;){o=o.parentNode;const e=yn(o),n=t(e);if(n.isSome())return n;if(r(e))break}return I.none()})(e,t,r)))},Mb=ym,Ib=(e,t,n)=>{const o=e.formatter.get(n);if(o)for(let n=0;n<o.length;n++){const r=o[n];if(Sm(r)&&!1===r.inherit&&e.dom.is(t,r.selector))return!0}return!1},Fb=(e,t,n,o,r)=>{const s=e.dom.getRoot();if(t===s)return!1;const a=e.dom.getParent(t,(t=>!!Ib(e,t,n)||t.parentNode===s||!!jb(e,t,n,o,!0)));return!!jb(e,a,n,o,r)},Ub=(e,t,n)=>!(!Nm(n)||!Mb(t,n.inline))||!(!km(n)||!Mb(t,n.block))||!!Sm(n)&&qo(t)&&e.is(t,n.selector),zb=(e,t,n,o,r,s)=>{const a=n[o],i="attributes"===o;if(w(n.onmatch))return n.onmatch(t,n,o);if(a)if(Se(a)){for(let n=0;n<a.length;n++)if(i?e.getAttrib(t,a[n]):wm(e,t,a[n]))return!0}else for(const o in a)if(Ee(a,o)){const l=i?e.getAttrib(t,o):wm(e,t,o),d=vm(a[o],s),c=y(l)||Ge(l);if(c&&y(d))continue;if(r&&c&&!n.exact)return!1;if((!r||n.exact)&&!Mb(l,Cm(d,o)))return!1}return!0},jb=(e,t,n,o,r)=>{const s=e.formatter.get(n),a=e.dom;if(s&&qo(t))for(let n=0;n<s.length;n++){const i=s[n];if(Ub(e.dom,t,i)&&zb(a,t,i,"attributes",r,o)&&zb(a,t,i,"styles",r,o)){const n=i.classes;if(n)for(let r=0;r<n.length;r++)if(!e.dom.hasClass(t,vm(n[r],o)))return;return i}}},Hb=(e,t,n,o,r)=>{if(o)return Fb(e,o,t,n,r);if(o=e.selection.getNode(),Fb(e,o,t,n,r))return!0;const s=e.selection.getStart();return!(s===o||!Fb(e,s,t,n,r))},$b=Br,qb=e=>{if(e){const t=new jo(e,e);for(let e=t.current();e;e=t.next())if(er(e))return e}return null},Vb=e=>{const t=bn("span");return Zt(t,{id:Pu,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&vo(t,vn($b)),t},Wb=(e,t,n)=>{const o=e.dom,r=e.selection;if(Am(t))vh(e,!1,yn(t),n,!0);else{const e=r.getRng(),n=o.getParent(t,o.isBlock),s=e.startContainer,a=e.startOffset,i=e.endContainer,l=e.endOffset,d=(e=>{const t=qb(e);return t&&t.data.charAt(0)===$b&&t.deleteData(0,1),t})(t);o.remove(t,!0),s===d&&a>0&&e.setStart(d,a-1),i===d&&l>0&&e.setEnd(d,l-1),n&&o.isEmpty(n)&&Or(yn(n)),r.setRng(e)}},Kb=(e,t,n)=>{const o=e.dom,r=e.selection;if(t)Wb(e,t,n);else if(!(t=Lu(e.getBody(),r.getStart())))for(;t=o.get(Pu);)Wb(e,t,n)},Yb=(e,t)=>(e.appendChild(t),t),Gb=(e,t)=>{var n;const o=G(e,((e,t)=>Yb(e,t.cloneNode(!1))),t),r=null!==(n=o.ownerDocument)&&void 0!==n?n:document;return Yb(o,r.createTextNode($b))},Xb=(e,t,n,o)=>{const a=e.dom,i=e.selection;let l=!1;const d=e.formatter.get(t);if(!d)return;const c=i.getRng(),u=c.startContainer,m=c.startOffset;let f=u;er(u)&&(m!==u.data.length&&(l=!0),f=f.parentNode);const g=[];let h;for(;f;){if(jb(e,f,t,n,o)){h=f;break}f.nextSibling&&(l=!0),g.push(f),f=f.parentNode}if(h)if(l){const r=i.getBookmark();c.collapse(!0);let s=Vm(a,c,d,!0);s=Ff(s),e.formatter.remove(t,n,s,o),i.moveToBookmark(r)}else{const l=Lu(e.getBody(),h),d=C(l)?a.getParents(h.parentNode,M,l):[],c=Vb(!1).dom;((e,t,n)=>{var o,r;const s=e.dom,a=s.getParent(n,T(gm,e.schema));a&&s.isEmpty(a)?null===(o=n.parentNode)||void 0===o||o.replaceChild(t,n):((e=>{const t=Uo(e,"br"),n=Y((e=>{const t=[];let n=e.dom;for(;n;)t.push(yn(n)),n=n.lastChild;return t})(e).slice(-1),Er);t.length===n.length&&V(n,xo)})(yn(n)),s.isEmpty(n)?null===(r=n.parentNode)||void 0===r||r.replaceChild(t,n):s.insertAfter(t,n))})(e,c,null!=l?l:h);const u=((e,t,n,o,a,i)=>{const l=e.formatter,d=e.dom,c=Y(me(l.get()),(e=>e!==o&&!je(e,"removeformat"))),u=((e,t,n)=>X(n,((n,o)=>{const r=((e,t)=>_m(e,t,(e=>{const t=e=>w(e)||e.length>1&&"%"===e.charAt(0);return $(["styles","attributes"],(n=>xe(e,n).exists((e=>{const n=p(e)?e:we(e);return $(n,t)}))))})))(e,o);return e.formatter.matchNode(t,o,{},r)?n.concat([o]):n}),[]))(e,n,c);if(Y(u,(t=>!((e,t,n)=>{const o=["inline","block","selector","attributes","styles","classes"],a=e=>ye(e,((e,t)=>$(o,(e=>e===t))));return _m(e,t,(t=>{const o=a(t);return _m(e,n,(e=>{const t=a(e);return((e,t,n=s)=>r(n).eq(e,t))(o,t)}))}))})(e,t,o))).length>0){const e=n.cloneNode(!1);return d.add(t,e),l.remove(o,a,e,i),d.remove(e),I.some(e)}return I.none()})(e,c,h,t,n,o),m=Gb([...g,...u.toArray(),...d],c);l&&Wb(e,l,C(l)),i.setCursorLocation(m,1),a.isEmpty(h)&&a.remove(h)}},Qb=e=>{const t=Vb(!1),n=Gb(e,t.dom);return{caretContainer:t,caretPosition:Vi(n,0)}},Jb=(e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return po(yn(e),n),xo(yn(e)),o},Zb=(e,t)=>{if(Du(t.dom))return!1;const n=e.schema.getTextInlineElements();return Ee(n,Ht(t))&&!Du(t.dom)&&!Xo(t.dom)},ev={},tv=Ko(["pre"]);((e,t)=>{ev[e]||(ev[e]=[]),ev[e].push((e=>{if(!e.selection.getRng().collapsed){const t=e.selection.getSelectedBlocks(),n=Y(Y(t,tv),(e=>t=>{const n=t.previousSibling;return tv(n)&&H(e,n)})(t));V(n,(e=>{((e,t)=>{const n=yn(t),o=Nn(n).dom;xo(n),Co(yn(e),[bn("br",o),bn("br",o),...Mn(n)])})(e.previousSibling,e)}))}}))})("pre");const nv=["fontWeight","fontStyle","color","fontSize","fontFamily"],ov=(e,t)=>{const n=e.get(t);return p(n)?J(n,(e=>Nm(e)&&"span"===e.inline&&(e=>f(e.styles)&&$(me(e.styles),(e=>H(nv,e))))(e))):I.none()},rv=(e,t)=>Tu(t,Vi.fromRangeStart(e)).isNone(),sv=(e,t)=>!1===Au(t,Vi.fromRangeEnd(e)).exists((e=>!ar(e.getNode())||Au(t,e).isSome())),av=e=>t=>fr(t)&&e.isEditable(t),iv=e=>Y(e.getSelectedBlocks(),av(e.dom)),lv=Pt.each,dv=e=>qo(e)&&!Ku(e)&&!Du(e)&&!Xo(e),cv=(e,t)=>{for(let n=e;n;n=n[t]){if(er(n)&&Ye(n.data))return e;if(qo(n)&&!Ku(n))return n}return e},uv=(e,t,n)=>{const o=ub(e),r=Vo(t)&&e.dom.isEditable(t),s=Vo(n)&&e.dom.isEditable(n);if(r&&s){const r=cv(t,"previousSibling"),s=cv(n,"nextSibling");if(o.compare(r,s)){for(let e=r.nextSibling;e&&e!==s;){const t=e;e=e.nextSibling,r.appendChild(t)}return e.dom.remove(s),Pt.each(Pt.grep(s.childNodes),(e=>{r.appendChild(e)})),r}}return n},mv=(e,t,n,o)=>{var r;if(o&&!1!==t.merge_siblings){const t=null!==(r=uv(e,fm(o),o))&&void 0!==r?r:o;uv(e,t,fm(t,!0))}},fv=(e,t,n)=>{lv(e.childNodes,(e=>{dv(e)&&(t(e)&&n(e),e.hasChildNodes()&&fv(e,t,n))}))},gv=(e,t)=>n=>!(!n||!wm(e,n,t)),pv=(e,t,n)=>o=>{e.setStyle(o,t,n),""===o.getAttribute("style")&&o.removeAttribute("style"),((e,t)=>{"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)})(e,o)},hv=hl([{keep:[]},{rename:["name"]},{removed:[]}]),bv=/^(src|href|style)$/,vv=Pt.each,yv=ym,Cv=(e,t,n)=>e.isChildOf(t,n)&&t!==n&&!e.isBlock(n),wv=(e,t,n)=>{let o=t[n?"startContainer":"endContainer"],r=t[n?"startOffset":"endOffset"];if(qo(o)){const e=o.childNodes.length-1;!n&&r&&r--,o=o.childNodes[r>e?e:r]}return er(o)&&n&&r>=o.data.length&&(o=new jo(o,e.getBody()).next()||o),er(o)&&!n&&0===r&&(o=new jo(o,e.getBody()).prev()||o),o},xv=(e,t)=>{const n=t?"firstChild":"lastChild",o=e[n];return(e=>/^(TR|TH|TD)$/.test(e.nodeName))(e)&&o?"TR"===e.nodeName&&o[n]||o:e},Ev=(e,t,n,o)=>{var r;const s=e.create(n,o);return null===(r=t.parentNode)||void 0===r||r.insertBefore(s,t),s.appendChild(t),s},_v=(e,t,n,o,r)=>{const s=yn(t),a=yn(e.create(o,r)),i=n?Ln(s):Dn(s);return Co(a,i),n?(po(s,a),bo(a,s)):(ho(s,a),vo(a,s)),a.dom},kv=(e,t,n)=>{const o=t.parentNode;let r;const s=e.dom,a=Il(e);km(n)&&o===s.getRoot()&&(n.list_block&&yv(t,n.list_block)||V(ce(t.childNodes),(t=>{pm(e,a,t.nodeName.toLowerCase())?r?r.appendChild(t):(r=Ev(s,t,a),s.setAttribs(r,Fl(e))):r=null}))),(e=>Sm(e)&&Nm(e)&&Dt(xe(e,"mixed"),!0))(n)&&!yv(n.inline,t)||s.remove(t,!0)},Sv=(e,t,n)=>x(e)?{name:t,value:null}:{name:e,value:vm(t,n)},Nv=(e,t)=>{""===e.getAttrib(t,"style")&&(t.removeAttribute("style"),t.removeAttribute("data-mce-style"))},Rv=(e,t,n,o,r)=>{let s=!1;vv(n.styles,((a,i)=>{const{name:l,value:d}=Sv(i,a,o),c=Cm(d,l);(n.remove_similar||h(d)||!qo(r)||yv(wm(e,r,l),c))&&e.setStyle(t,l,""),s=!0})),s&&Nv(e,t)},Av=(e,t,n,o,r)=>{const s=e.dom,a=ub(e),i=e.schema;if(Nm(t)&&Rs(i,t.inline)&&Ts(i,o)&&o.parentElement===e.getBody())return kv(e,o,t),hv.removed();if(!t.ceFalseOverride&&o&&"false"===s.getContentEditableParent(o))return hv.keep();if(o&&!Ub(s,o,t)&&!((e,t)=>t.links&&"A"===e.nodeName)(o,t))return hv.keep();const l=o,d=t.preserve_attributes;if(Nm(t)&&"all"===t.remove&&p(d)){const e=Y(s.getAttribs(l),(e=>H(d,e.name.toLowerCase())));if(s.removeAllAttribs(l),V(e,(e=>s.setAttrib(l,e.name,e.value))),e.length>0)return hv.rename("span")}if("all"!==t.remove){Rv(s,l,t,n,r),vv(t.attributes,((e,o)=>{const{name:a,value:i}=Sv(o,e,n);if(t.remove_similar||h(i)||!qo(r)||yv(s.getAttrib(r,a),i)){if("class"===a){const e=s.getAttrib(l,a);if(e){let t="";if(V(e.split(/\s+/),(e=>{/mce\-\w+/.test(e)&&(t+=(t?" ":"")+e)})),t)return void s.setAttrib(l,a,t)}}if(bv.test(a)&&l.removeAttribute("data-mce-"+a),"style"===a&&Ko(["li"])(l)&&"none"===s.getStyle(l,"list-style-type"))return l.removeAttribute(a),void s.setStyle(l,"list-style-type","none");"class"===a&&l.removeAttribute("className"),l.removeAttribute(a)}})),vv(t.classes,(e=>{e=vm(e,n),qo(r)&&!s.hasClass(r,e)||s.removeClass(l,e)}));const e=s.getAttribs(l);for(let t=0;t<e.length;t++){const n=e[t].nodeName;if(!a.isAttributeInternal(n))return hv.keep()}}return"none"!==t.remove?(kv(e,l,t),hv.removed()):hv.keep()},Tv=(e,t,n,o)=>Av(e,t,n,o,o).fold(N(o),(t=>(e.dom.createFragment().appendChild(o),e.dom.rename(o,t))),N(null)),Ov=(e,t,n,o,r)=>{(o||e.selection.isEditable())&&((e,t,n,o,r)=>{const s=e.formatter.get(t),a=s[0],i=e.dom,l=e.selection,d=o=>{const i=((e,t,n,o,r)=>{let s;return t.parentNode&&V(Em(e.dom,t.parentNode).reverse(),(t=>{if(!s&&qo(t)&&"_start"!==t.id&&"_end"!==t.id){const a=jb(e,t,n,o,r);a&&!1!==a.split&&(s=t)}})),s})(e,o,t,n,r);return((e,t,n,o,r,s,a,i)=>{var l,d;let c,u;const m=e.dom;if(n){const s=n.parentNode;for(let n=o.parentNode;n&&n!==s;n=n.parentNode){let o=m.clone(n,!1);for(let n=0;n<t.length&&(o=Tv(e,t[n],i,o),null!==o);n++);o&&(c&&o.appendChild(c),u||(u=o),c=o)}a.mixed&&m.isBlock(n)||(o=null!==(l=m.split(n,o))&&void 0!==l?l:o),c&&u&&(null===(d=r.parentNode)||void 0===d||d.insertBefore(c,r),u.appendChild(r),Nm(a)&&mv(e,a,0,c))}return o})(e,s,i,o,o,0,a,n)},c=t=>$(s,(o=>Bv(e,o,n,t,t))),u=t=>{const n=ce(t.childNodes),o=c(t)||$(s,(e=>Ub(i,t,e))),r=t.parentNode;if(!o&&C(r)&&Rm(a)&&c(r),a.deep&&n.length)for(let e=0;e<n.length;e++)u(n[e]);V(["underline","line-through","overline"],(n=>{qo(t)&&e.dom.getStyle(t,"text-decoration")===n&&t.parentNode&&xm(i,t.parentNode)===n&&Bv(e,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:n}},void 0,t)}))},m=e=>{const t=i.get(e?"_start":"_end");if(t){let n=t[e?"firstChild":"lastChild"];return(e=>Ku(e)&&qo(e)&&("_start"===e.id||"_end"===e.id))(n)&&(n=n[e?"firstChild":"lastChild"]),er(n)&&0===n.data.length&&(n=e?t.previousSibling||t.nextSibling:t.nextSibling||t.previousSibling),i.remove(t,!0),n}return null},f=t=>{let n,o,r=Vm(i,t,s,t.collapsed);if(a.split){if(r=Ff(r),n=wv(e,r,!0),o=wv(e,r),n!==o){if(n=xv(n,!0),o=xv(o,!1),Cv(i,n,o)){const e=I.from(n.firstChild).getOr(n);return d(_v(i,e,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void m(!0)}if(Cv(i,o,n)){const e=I.from(o.lastChild).getOr(o);return d(_v(i,e,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void m(!1)}n=Ev(i,n,"span",{id:"_start","data-mce-type":"bookmark"}),o=Ev(i,o,"span",{id:"_end","data-mce-type":"bookmark"});const e=i.createRng();e.setStartAfter(n),e.setEndBefore(o),Wm(i,e,(e=>{V(e,(e=>{Ku(e)||Ku(e.parentNode)||d(e)}))})),d(n),d(o),n=m(!0),o=m()}else n=o=d(n);r.startContainer=n.parentNode?n.parentNode:n,r.startOffset=i.nodeIndex(n),r.endContainer=o.parentNode?o.parentNode:o,r.endOffset=i.nodeIndex(o)+1}Wm(i,r,(e=>{V(e,u)}))};if(o){if(dm(o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(e)}else f(o);nf(e,t,o,n)}else l.isCollapsed()&&Nm(a)&&!em(e).length?Xb(e,t,n,r):(um(e,(()=>im(e,f)),(o=>Nm(a)&&Hb(e,t,n,o))),e.nodeChanged()),((e,t,n)=>{"removeformat"===t?V(iv(e.selection),(t=>{V(nv,(n=>e.dom.setStyle(t,n,""))),Nv(e.dom,t)})):ov(e.formatter,t).each((t=>{V(iv(e.selection),(o=>Rv(e.dom,o,t,n,null)))}))})(e,t,n),nf(e,t,o,n)})(e,t,n,o,r)},Bv=(e,t,n,o,r)=>Av(e,t,n,o,r).fold(L,(t=>(e.dom.rename(o,t),!0)),M),Pv=Pt.each,Dv=Pt.each,Lv=(e,t,n,o)=>{if(Dv(n.styles,((n,r)=>{e.setStyle(t,r,vm(n,o))})),n.styles){const n=e.getAttrib(t,"style");n&&e.setAttrib(t,"data-mce-style",n)}},Mv=(e,t,n,o)=>{const r=e.formatter.get(t),s=r[0],a=!o&&e.selection.isCollapsed(),i=e.dom,l=e.selection,d=(e,t=s)=>{w(t.onformat)&&t.onformat(e,t,n,o),Lv(i,e,t,n),Dv(t.attributes,((t,o)=>{i.setAttrib(e,o,vm(t,n))})),Dv(t.classes,(t=>{const o=vm(t,n);i.hasClass(e,o)||i.addClass(e,o)}))},c=(e,t)=>{let n=!1;return Dv(e,(e=>!(!Sm(e)||("false"!==i.getContentEditable(t)||e.ceFalseOverride)&&(!C(e.collapsed)||e.collapsed===a)&&i.is(t,e.selector)&&!Du(t)&&(d(t,e),n=!0,1)))),n},u=e=>{if(m(e)){const t=i.create(e);return d(t),t}return null},f=(o,a,i)=>{const l=[];let m=!0;const f=s.inline||s.block,g=u(f);Wm(o,a,(a=>{let u;const p=a=>{let h=!1,b=m,v=!1;const y=a.parentNode,w=y.nodeName.toLowerCase(),x=o.getContentEditable(a);C(x)&&(b=m,m="true"===x,h=!0,v=bm(e,a));const E=m&&!h;if(ar(a)&&!((e,t,n,o)=>{if(xd(e)&&Nm(t)&&n.parentNode){const t=da(e.schema),r=Dh(yn(n),(e=>Du(e.dom)));return _e(t,o)&&gs(yn(n.parentNode),!1)&&!r}return!1})(e,s,a,w))return u=null,void(km(s)&&o.remove(a));if((o=>(e=>km(e)&&!0===e.wrapper)(s)&&jb(e,o,t,n))(a))u=null;else{if(((t,n,o)=>{const r=(e=>km(e)&&!0!==e.wrapper)(s)&&gm(e.schema,t)&&pm(e,n,f);return o&&r})(a,w,E)){const e=o.rename(a,f);return d(e),l.push(e),void(u=null)}if(Sm(s)){let e=c(r,a);if(!e&&C(y)&&Rm(s)&&(e=c(r,y)),!Nm(s)||e)return void(u=null)}C(g)&&((t,n,r,a)=>{const l=t.nodeName.toLowerCase(),d=pm(e,f,l)&&pm(e,n,f),c=!i&&er(t)&&Pr(t.data),u=Du(t),m=!Nm(s)||!o.isBlock(t);return(r||a)&&d&&!c&&!u&&m})(a,w,E,v)?(u||(u=o.clone(g,!1),y.insertBefore(u,a),l.push(u)),v&&h&&(m=b),u.appendChild(a)):(u=null,V(ce(a.childNodes),p),h&&(m=b),u=null)}};V(a,p)})),!0===s.links&&V(l,(e=>{const t=e=>{"A"===e.nodeName&&d(e,s),V(ce(e.childNodes),t)};t(e)})),V(l,(a=>{const i=(e=>{let t=0;return V(e.childNodes,(e=>{(e=>C(e)&&er(e)&&0===e.length)(e)||Ku(e)||t++})),t})(a);!(l.length>1)&&o.isBlock(a)||0!==i?(Nm(s)||km(s)&&s.wrapper)&&(s.exact||1!==i||(a=(e=>{const t=J(e.childNodes,cm).filter((e=>"false"!==o.getContentEditable(e)&&Ub(o,e,s)));return t.map((t=>{const n=o.clone(t,!1);return d(n),o.replace(n,e,!0),o.remove(t,!0),n})).getOr(e)})(a)),((e,t,n,o)=>{Pv(t,(t=>{Nm(t)&&Pv(e.dom.select(t.inline,o),(o=>{dv(o)&&Bv(e,t,n,o,t.exact?o:null)})),((e,t,n)=>{if(t.clear_child_styles){const o=t.links?"*:not(a)":"*";lv(e.select(o,n),(n=>{dv(n)&&e.isEditable(n)&&lv(t.styles,((t,o)=>{e.setStyle(n,o,"")}))}))}})(e.dom,t,o)}))})(e,r,n,a),((e,t,n,o,r)=>{const s=r.parentNode;jb(e,s,n,o)&&Bv(e,t,o,r)||t.merge_with_parents&&s&&e.dom.getParent(s,(s=>!!jb(e,s,n,o)&&(Bv(e,t,o,r),!0)))})(e,s,t,n,a),((e,t,n,o)=>{if(t.styles&&t.styles.backgroundColor){const r=gv(e,"fontSize");fv(o,(t=>r(t)&&e.isEditable(t)),pv(e,"backgroundColor",vm(t.styles.backgroundColor,n)))}})(o,s,n,a),((e,t,n,o)=>{const r=t=>{if(Vo(t)&&qo(t.parentNode)&&e.isEditable(t)){const n=xm(e,t.parentNode);e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null)}};t.styles&&(t.styles.color||t.styles.textDecoration)&&(Pt.walk(o,r,"childNodes"),r(o))})(o,s,0,a),((e,t,n,o)=>{if(Nm(t)&&("sub"===t.inline||"sup"===t.inline)){const n=gv(e,"fontSize");fv(o,(t=>n(t)&&e.isEditable(t)),pv(e,"fontSize",""));const r=Y(e.select("sup"===t.inline?"sub":"sup",o),e.isEditable);e.remove(r,!0)}})(o,s,0,a),mv(e,s,0,a)):o.remove(a,!0)}))},g=dm(o)?o:l.getNode();if("false"===i.getContentEditable(g)&&!bm(e,g))return c(r,o=g),void tf(e,t,o,n);if(s){if(o)if(dm(o)){if(!c(r,o)){const e=i.createRng();e.setStartBefore(o),e.setEndAfter(o),f(i,Vm(i,e,r),!0)}}else f(i,o,!0);else a&&Nm(s)&&!em(e).length?((e,t,n)=>{let o;const r=e.selection,s=e.formatter.get(t);if(!s)return;const a=r.getRng();let i=a.startOffset;const l=a.startContainer.nodeValue;o=Lu(e.getBody(),r.getStart());const d=/[^\s\u00a0\u00ad\u200b\ufeff]/;if(l&&i>0&&i<l.length&&d.test(l.charAt(i))&&d.test(l.charAt(i-1))){const o=r.getBookmark();a.collapse(!0);let i=Vm(e.dom,a,s);i=Ff(i),e.formatter.apply(t,n,i),r.moveToBookmark(o)}else{let s=o?qb(o):null;o&&(null==s?void 0:s.data)===$b||(c=e.getDoc(),u=Vb(!0).dom,o=c.importNode(u,!0),s=o.firstChild,a.insertNode(o),i=1),e.formatter.apply(t,n,o),r.setCursorLocation(s,i)}var c,u})(e,t,n):(l.setRng(Eb(l.getRng())),um(e,(()=>{im(e,((e,t)=>{const n=t?e:Vm(i,e,r);f(i,n,!1)}))}),M),e.nodeChanged()),ov(e.formatter,t).each((t=>{V((e=>Y((e=>{const t=e.getSelectedBlocks(),n=e.getRng();if(e.isCollapsed())return[];if(1===t.length)return rv(n,t[0])&&sv(n,t[0])?t:[];{const e=le(t).filter((e=>rv(n,e))).toArray(),o=de(t).filter((e=>sv(n,e))).toArray(),r=t.slice(1,-1);return e.concat(r).concat(o)}})(e),av(e.dom)))(e.selection),(e=>Lv(i,e,t,n)))}));((e,t)=>{Ee(ev,e)&&V(ev[e],(e=>{e(t)}))})(t,e)}tf(e,t,o,n)},Iv=(e,t,n,o)=>{(o||e.selection.isEditable())&&Mv(e,t,n,o)},Fv=e=>Ee(e,"vars"),Uv=e=>e.selection.getStart(),zv=(e,t,n,o,r)=>Q(t,(t=>{const s=e.formatter.matchNode(t,n,null!=r?r:{},o);return!v(s)}),(t=>!!Ib(e,t,n)||!o&&C(e.formatter.matchNode(t,n,r,!0)))),jv=(e,t)=>{const n=null!=t?t:Uv(e);return Y(Em(e.dom,n),(e=>qo(e)&&!Xo(e)))},Hv=(e,t,n)=>{const o=jv(e,t);ge(n,((n,r)=>{const s=n=>{const s=zv(e,o,r,n.similar,Fv(n)?n.vars:void 0),a=s.isSome();if(n.state.get()!==a){n.state.set(a);const e=s.getOr(t);Fv(n)?n.callback(a,{node:e,format:r,parents:o}):V(n.callbacks,(t=>t(a,{node:e,format:r,parents:o})))}};V([n.withSimilar,n.withoutSimilar],s),V(n.withVars,s)}))},$v=Pt.explode,qv=()=>{const e={};return{addFilter:(t,n)=>{V($v(t),(t=>{Ee(e,t)||(e[t]={name:t,callbacks:[]}),e[t].callbacks.push(n)}))},getFilters:()=>we(e),removeFilter:(t,n)=>{V($v(t),(t=>{if(Ee(e,t))if(C(n)){const o=e[t],r=Y(o.callbacks,(e=>e!==n));r.length>0?o.callbacks=r:delete e[t]}else delete e[t]}))}}},Vv=(e,t,n)=>{var o;const r=wa();t.convert_fonts_to_spans&&((e,t,n)=>{e.addNodeFilter("font",(e=>{V(e,(e=>{const o=t.parse(e.attr("style")),r=e.attr("color"),s=e.attr("face"),a=e.attr("size");r&&(o.color=r),s&&(o["font-family"]=s),a&&Xe(a).each((e=>{o["font-size"]=n[e-1]})),e.name="span",e.attr("style",t.serialize(o)),((e,t)=>{V(["color","face","size"],(t=>{e.attr(t,null)}))})(e)}))}))})(e,r,Pt.explode(null!==(o=t.font_size_legacy_values)&&void 0!==o?o:"")),((e,t,n)=>{e.addNodeFilter("strike",(e=>{const o="html4"!==t.type;V(e,(e=>{if(o)e.name="s";else{const t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))}}))}))})(e,n,r)},Wv=(e,t,n)=>{t.addNodeFilter("br",((t,o,r)=>{const s=Pt.extend({},n.getBlockElements()),a=n.getNonEmptyElements(),i=n.getWhitespaceElements();s.body=1;const l=e=>e.name in s||Bs(n,e);for(let o=0,d=t.length;o<d;o++){let d=t[o],c=d.parent;if(c&&l(c)&&d===c.lastChild){let t=d.prev;for(;t;){const e=t.name;if("span"!==e||"bookmark"!==t.attr("data-mce-type")){"br"===e&&(d=null);break}t=t.prev}if(d&&(d.remove(),vb(n,a,i,c))){const t=n.getElementRule(c.name);t&&(t.removeEmpty?c.remove():t.paddEmpty&&hb(e,r,l,c))}}else{let e=d;for(;c&&c.firstChild===e&&c.lastChild===e&&(e=c,!s[c.name]);)c=c.parent;if(e===c){const e=new Wg("#text",3);e.value=br,d.replace(e)}}}}))},Kv=e=>{const[t,...n]=e.split(","),o=n.join(","),r=/data:([^/]+\/[^;]+)(;.+)?/.exec(t);if(r){const e=";base64"===r[2],t=e?(e=>{const t=/([a-z0-9+\/=\s]+)/i.exec(e);return t?t[1]:""})(o):decodeURIComponent(o);return I.some({type:r[1],data:t,base64Encoded:e})}return I.none()},Yv=(e,t,n=!0)=>{let o=t;if(n)try{o=atob(t)}catch(e){return I.none()}const r=new Uint8Array(o.length);for(let e=0;e<r.length;e++)r[e]=o.charCodeAt(e);return I.some(new Blob([r],{type:e}))},Gv=e=>new Promise(((t,n)=>{const o=new FileReader;o.onloadend=()=>{t(o.result)},o.onerror=()=>{var e;n(null===(e=o.error)||void 0===e?void 0:e.message)},o.readAsDataURL(e)}));let Xv=0;const Qv=(e,t,n)=>Kv(e).bind((({data:e,type:o,base64Encoded:r})=>{if(t&&!r)return I.none();{const t=r?e:btoa(e);return n(t,o)}})),Jv=(e,t,n)=>{const o=e.create("blobid"+Xv++,t,n);return e.add(o),o},Zv=(e,t,n=!1)=>Qv(t,n,((t,n)=>I.from(e.getByData(t,n)).orThunk((()=>Yv(n,t).map((n=>Jv(e,n,t))))))),ey=(e,t)=>He(e,`${t}/`),ty=(e,t)=>{const n=e.schema;t.remove_trailing_brs&&Wv(t,e,n),e.addAttributeFilter("href",(e=>{let n=e.length;const o=e=>{const t=e?Pt.trim(e):"";return/\b(noopener)\b/g.test(t)?t:(e=>e.split(" ").filter((e=>e.length>0)).concat(["noopener"]).sort().join(" "))(t)};if(!t.allow_unsafe_link_target)for(;n--;){const t=e[n];"a"===t.name&&"_blank"===t.attr("target")&&t.attr("rel",o(t.attr("rel")))}})),t.allow_html_in_named_anchor||e.addAttributeFilter("id,name",(e=>{let t,n,o,r,s=e.length;for(;s--;)if(r=e[s],"a"===r.name&&r.firstChild&&!r.attr("href"))for(o=r.parent,t=r.lastChild;t&&o;)n=t.prev,o.insert(t,r),t=n})),t.fix_list_elements&&e.addNodeFilter("ul,ol",(e=>{let t,n,o=e.length;for(;o--;)if(t=e[o],n=t.parent,n&&("ul"===n.name||"ol"===n.name))if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{const e=new Wg("li",1);e.attr("style","list-style-type: none"),t.wrap(e)}}));const o=n.getValidClasses();t.validate&&o&&e.addAttributeFilter("class",(e=>{var t;let n=e.length;for(;n--;){const r=e[n],s=null!==(t=r.attr("class"))&&void 0!==t?t:"",a=Pt.explode(s," ");let i="";for(let e=0;e<a.length;e++){const t=a[e];let n=!1,s=o["*"];s&&s[t]&&(n=!0),s=o[r.name],!n&&s&&s[t]&&(n=!0),n&&(i&&(i+=" "),i+=t)}i.length||(i=null),r.attr("class",i)}})),((e,t)=>{const{blob_cache:n}=t;if(n){const t=e=>{const t=e.attr("src");(e=>e.attr("src")===At.transparentSrc||C(e.attr("data-mce-placeholder")))(e)||(e=>C(e.attr("data-mce-bogus")))(e)||y(t)||Zv(n,t,!0).each((t=>{e.attr("src",t.blobUri())}))};e.addAttributeFilter("src",(e=>V(e,t)))}})(e,t),t.convert_unsafe_embeds&&e.addNodeFilter("object,embed",(e=>V(e,(e=>{e.replace(((e,t,n,o,r)=>{let s;s=v(e)?"iframe":ey(e,"image")?"img":ey(e,"video")?"video":ey(e,"audio")?"audio":"iframe";const a=new Wg(s,1);return a.attr("audio"===s?{src:t}:{src:t,width:n,height:o}),"audio"!==s&&"video"!==s||a.attr("controls",""),"iframe"===s&&r&&a.attr("sandbox",""),a})(e.attr("type"),"object"===e.name?e.attr("data"):e.attr("src"),e.attr("width"),e.attr("height"),t.sandbox_iframes))})))),t.sandbox_iframes&&e.addNodeFilter("iframe",(e=>V(e,(e=>e.attr("sandbox","")))))},{entries:ny,setPrototypeOf:oy,isFrozen:ry,getPrototypeOf:sy,getOwnPropertyDescriptor:ay}=Object;let{freeze:iy,seal:ly,create:dy}=Object,{apply:cy,construct:uy}="undefined"!=typeof Reflect&&Reflect;cy||(cy=function(e,t,n){return e.apply(t,n)}),iy||(iy=function(e){return e}),ly||(ly=function(e){return e}),uy||(uy=function(e,t){return new e(...t)});const my=_y(Array.prototype.forEach),fy=_y(Array.prototype.pop),gy=_y(Array.prototype.push),py=_y(String.prototype.toLowerCase),hy=_y(String.prototype.toString),by=_y(String.prototype.match),vy=_y(String.prototype.replace),yy=_y(String.prototype.indexOf),Cy=_y(String.prototype.trim),wy=_y(RegExp.prototype.test),xy=(Ey=TypeError,function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];return uy(Ey,t)});var Ey;function _y(e){return function(t){for(var n=arguments.length,o=new Array(n>1?n-1:0),r=1;r<n;r++)o[r-1]=arguments[r];return cy(e,t,o)}}function ky(e,t,n){var o;n=null!==(o=n)&&void 0!==o?o:py,oy&&oy(e,null);let r=t.length;for(;r--;){let o=t[r];if("string"==typeof o){const e=n(o);e!==o&&(ry(t)||(t[r]=e),o=e)}e[o]=!0}return e}function Sy(e){const t=dy(null);for(const[n,o]of ny(e))t[n]=o;return t}function Ny(e,t){for(;null!==e;){const n=ay(e,t);if(n){if(n.get)return _y(n.get);if("function"==typeof n.value)return _y(n.value)}e=sy(e)}return function(e){return console.warn("fallback value for",e),null}}const Ry=iy(["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dialog","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","picture","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr"]),Ay=iy(["svg","a","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","style","switch","symbol","text","textpath","title","tref","tspan","view","vkern"]),Ty=iy(["feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feDropShadow","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence"]),Oy=iy(["animate","color-profile","cursor","discard","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignobject","hatch","hatchpath","mesh","meshgradient","meshpatch","meshrow","missing-glyph","script","set","solidcolor","unknown","use"]),By=iy(["math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmultiscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mspace","msqrt","mstyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","mprescripts"]),Py=iy(["maction","maligngroup","malignmark","mlongdiv","mscarries","mscarry","msgroup","mstack","msline","msrow","semantics","annotation","annotation-xml","mprescripts","none"]),Dy=iy(["#text"]),Ly=iy(["accept","action","align","alt","autocapitalize","autocomplete","autopictureinpicture","autoplay","background","bgcolor","border","capture","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","controls","controlslist","coords","crossorigin","datetime","decoding","default","dir","disabled","disablepictureinpicture","disableremoteplayback","download","draggable","enctype","enterkeyhint","face","for","headers","height","hidden","high","href","hreflang","id","inputmode","integrity","ismap","kind","label","lang","list","loading","loop","low","max","maxlength","media","method","min","minlength","multiple","muted","name","nonce","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","playsinline","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","role","rows","rowspan","spellcheck","scope","selected","shape","size","sizes","span","srclang","start","src","srcset","step","style","summary","tabindex","title","translate","type","usemap","valign","value","width","xmlns","slot"]),My=iy(["accent-height","accumulate","additive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","class","clip","clippathunits","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","filterunits","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","height","href","id","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lang","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","media","method","mode","min","name","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","preserveaspectratio","primitiveunits","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","startoffset","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","style","surfacescale","systemlanguage","tabindex","targetx","targety","transform","transform-origin","text-anchor","text-decoration","text-rendering","textlength","type","u1","u2","unicode","values","viewbox","visibility","version","vert-adv-y","vert-origin-x","vert-origin-y","width","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","xmlns","y","y1","y2","z","zoomandpan"]),Iy=iy(["accent","accentunder","align","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","dir","display","displaystyle","encoding","fence","frame","height","href","id","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","width","xmlns"]),Fy=iy(["xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]),Uy=ly(/\{\{[\w\W]*|[\w\W]*\}\}/gm),zy=ly(/<%[\w\W]*|[\w\W]*%>/gm),jy=ly(/\${[\w\W]*}/gm),Hy=ly(/^data-[\-\w.\u00B7-\uFFFF]/),$y=ly(/^aria-[\-\w]+$/),qy=ly(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),Vy=ly(/^(?:\w+script|data):/i),Wy=ly(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),Ky=ly(/^html$/i);var Yy=Object.freeze({__proto__:null,MUSTACHE_EXPR:Uy,ERB_EXPR:zy,TMPLIT_EXPR:jy,DATA_ATTR:Hy,ARIA_ATTR:$y,IS_ALLOWED_URI:qy,IS_SCRIPT_OR_DATA:Vy,ATTR_WHITESPACE:Wy,DOCTYPE_NAME:Ky});const Gy=()=>"undefined"==typeof window?null:window;var Xy=function e(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Gy();const n=t=>e(t);if(n.version="3.0.5",n.removed=[],!t||!t.document||9!==t.document.nodeType)return n.isSupported=!1,n;const o=t.document,r=o.currentScript;let{document:s}=t;const{DocumentFragment:a,HTMLTemplateElement:i,Node:l,Element:d,NodeFilter:c,NamedNodeMap:u=t.NamedNodeMap||t.MozNamedAttrMap,HTMLFormElement:m,DOMParser:f,trustedTypes:g}=t,p=d.prototype,h=Ny(p,"cloneNode"),b=Ny(p,"nextSibling"),v=Ny(p,"childNodes"),y=Ny(p,"parentNode");if("function"==typeof i){const e=s.createElement("template");e.content&&e.content.ownerDocument&&(s=e.content.ownerDocument)}let C,w="";const{implementation:x,createNodeIterator:E,createDocumentFragment:_,getElementsByTagName:k}=s,{importNode:S}=o;let N={};n.isSupported="function"==typeof ny&&"function"==typeof y&&x&&void 0!==x.createHTMLDocument;const{MUSTACHE_EXPR:R,ERB_EXPR:A,TMPLIT_EXPR:T,DATA_ATTR:O,ARIA_ATTR:B,IS_SCRIPT_OR_DATA:P,ATTR_WHITESPACE:D}=Yy;let{IS_ALLOWED_URI:L}=Yy,M=null;const I=ky({},[...Ry,...Ay,...Ty,...By,...Dy]);let F=null;const U=ky({},[...Ly,...My,...Iy,...Fy]);let z=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),j=null,H=null,$=!0,q=!0,V=!1,W=!0,K=!1,Y=!1,G=!1,X=!1,Q=!1,J=!1,Z=!1,ee=!0,te=!1,ne=!0,oe=!1,re={},se=null;const ae=ky({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]);let ie=null;const le=ky({},["audio","video","img","source","image","track"]);let de=null;const ce=ky({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),ue="http://www.w3.org/1998/Math/MathML",me="http://www.w3.org/2000/svg",fe="http://www.w3.org/1999/xhtml";let ge=fe,pe=!1,he=null;const be=ky({},[ue,me,fe],hy);let ve;const ye=["application/xhtml+xml","text/html"];let Ce,we=null;const xe=s.createElement("form"),Ee=function(e){return e instanceof RegExp||e instanceof Function},_e=function(e){if(!we||we!==e){if(e&&"object"==typeof e||(e={}),e=Sy(e),ve=ve=-1===ye.indexOf(e.PARSER_MEDIA_TYPE)?"text/html":e.PARSER_MEDIA_TYPE,Ce="application/xhtml+xml"===ve?hy:py,M="ALLOWED_TAGS"in e?ky({},e.ALLOWED_TAGS,Ce):I,F="ALLOWED_ATTR"in e?ky({},e.ALLOWED_ATTR,Ce):U,he="ALLOWED_NAMESPACES"in e?ky({},e.ALLOWED_NAMESPACES,hy):be,de="ADD_URI_SAFE_ATTR"in e?ky(Sy(ce),e.ADD_URI_SAFE_ATTR,Ce):ce,ie="ADD_DATA_URI_TAGS"in e?ky(Sy(le),e.ADD_DATA_URI_TAGS,Ce):le,se="FORBID_CONTENTS"in e?ky({},e.FORBID_CONTENTS,Ce):ae,j="FORBID_TAGS"in e?ky({},e.FORBID_TAGS,Ce):{},H="FORBID_ATTR"in e?ky({},e.FORBID_ATTR,Ce):{},re="USE_PROFILES"in e&&e.USE_PROFILES,$=!1!==e.ALLOW_ARIA_ATTR,q=!1!==e.ALLOW_DATA_ATTR,V=e.ALLOW_UNKNOWN_PROTOCOLS||!1,W=!1!==e.ALLOW_SELF_CLOSE_IN_ATTR,K=e.SAFE_FOR_TEMPLATES||!1,Y=e.WHOLE_DOCUMENT||!1,Q=e.RETURN_DOM||!1,J=e.RETURN_DOM_FRAGMENT||!1,Z=e.RETURN_TRUSTED_TYPE||!1,X=e.FORCE_BODY||!1,ee=!1!==e.SANITIZE_DOM,te=e.SANITIZE_NAMED_PROPS||!1,ne=!1!==e.KEEP_CONTENT,oe=e.IN_PLACE||!1,L=e.ALLOWED_URI_REGEXP||qy,ge=e.NAMESPACE||fe,z=e.CUSTOM_ELEMENT_HANDLING||{},e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(z.tagNameCheck=e.CUSTOM_ELEMENT_HANDLING.tagNameCheck),e.CUSTOM_ELEMENT_HANDLING&&Ee(e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(z.attributeNameCheck=e.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),e.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(z.allowCustomizedBuiltInElements=e.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),K&&(q=!1),J&&(Q=!0),re&&(M=ky({},[...Dy]),F=[],!0===re.html&&(ky(M,Ry),ky(F,Ly)),!0===re.svg&&(ky(M,Ay),ky(F,My),ky(F,Fy)),!0===re.svgFilters&&(ky(M,Ty),ky(F,My),ky(F,Fy)),!0===re.mathMl&&(ky(M,By),ky(F,Iy),ky(F,Fy))),e.ADD_TAGS&&(M===I&&(M=Sy(M)),ky(M,e.ADD_TAGS,Ce)),e.ADD_ATTR&&(F===U&&(F=Sy(F)),ky(F,e.ADD_ATTR,Ce)),e.ADD_URI_SAFE_ATTR&&ky(de,e.ADD_URI_SAFE_ATTR,Ce),e.FORBID_CONTENTS&&(se===ae&&(se=Sy(se)),ky(se,e.FORBID_CONTENTS,Ce)),ne&&(M["#text"]=!0),Y&&ky(M,["html","head","body"]),M.table&&(ky(M,["tbody"]),delete j.tbody),e.TRUSTED_TYPES_POLICY){if("function"!=typeof e.TRUSTED_TYPES_POLICY.createHTML)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');if("function"!=typeof e.TRUSTED_TYPES_POLICY.createScriptURL)throw xy('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');C=e.TRUSTED_TYPES_POLICY,w=C.createHTML("")}else void 0===C&&(C=function(e,t){if("object"!=typeof e||"function"!=typeof e.createPolicy)return null;let n=null;const o="data-tt-policy-suffix";t&&t.hasAttribute(o)&&(n=t.getAttribute(o));const r="dompurify"+(n?"#"+n:"");try{return e.createPolicy(r,{createHTML:e=>e,createScriptURL:e=>e})}catch(e){return console.warn("TrustedTypes policy "+r+" could not be created."),null}}(g,r)),null!==C&&"string"==typeof w&&(w=C.createHTML(""));iy&&iy(e),we=e}},ke=ky({},["mi","mo","mn","ms","mtext"]),Se=ky({},["foreignobject","desc","title","annotation-xml"]),Ne=ky({},["title","style","font","a","script"]),Re=ky({},Ay);ky(Re,Ty),ky(Re,Oy);const Ae=ky({},By);ky(Ae,Py);const Te=function(e){gy(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){e.remove()}},Oe=function(e,t){try{gy(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){gy(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!F[e])if(Q||J)try{Te(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},Be=function(e){let t,n;if(X)e="<remove></remove>"+e;else{const t=by(e,/^[\r\n\t ]+/);n=t&&t[0]}"application/xhtml+xml"===ve&&ge===fe&&(e='<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>'+e+"</body></html>");const o=C?C.createHTML(e):e;if(ge===fe)try{t=(new f).parseFromString(o,ve)}catch(e){}if(!t||!t.documentElement){t=x.createDocument(ge,"template",null);try{t.documentElement.innerHTML=pe?w:o}catch(e){}}const r=t.body||t.documentElement;return e&&n&&r.insertBefore(s.createTextNode(n),r.childNodes[0]||null),ge===fe?k.call(t,Y?"html":"body")[0]:Y?t.documentElement:r},Pe=function(e){return E.call(e.ownerDocument||e,e,c.SHOW_ELEMENT|c.SHOW_COMMENT|c.SHOW_TEXT,null,!1)},De=function(e){return"object"==typeof l?e instanceof l:e&&"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},Le=function(e,t,o){N[e]&&my(N[e],(e=>{e.call(n,t,o,we)}))},Me=function(e){let t;if(Le("beforeSanitizeElements",e,null),(o=e)instanceof m&&("string"!=typeof o.nodeName||"string"!=typeof o.textContent||"function"!=typeof o.removeChild||!(o.attributes instanceof u)||"function"!=typeof o.removeAttribute||"function"!=typeof o.setAttribute||"string"!=typeof o.namespaceURI||"function"!=typeof o.insertBefore||"function"!=typeof o.hasChildNodes))return Te(e),!0;var o;const r=Ce(e.nodeName);if(Le("uponSanitizeElement",e,{tagName:r,allowedTags:M}),e.hasChildNodes()&&!De(e.firstElementChild)&&(!De(e.content)||!De(e.content.firstElementChild))&&wy(/<[/\w]/g,e.innerHTML)&&wy(/<[/\w]/g,e.textContent))return Te(e),!0;if(!M[r]||j[r]){if(!j[r]&&Fe(r)){if(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,r))return!1;if(z.tagNameCheck instanceof Function&&z.tagNameCheck(r))return!1}if(ne&&!se[r]){const t=y(e)||e.parentNode,n=v(e)||e.childNodes;if(n&&t)for(let o=n.length-1;o>=0;--o)t.insertBefore(h(n[o],!0),b(e))}return Te(e),!0}return e instanceof d&&!function(e){let t=y(e);t&&t.tagName||(t={namespaceURI:ge,tagName:"template"});const n=py(e.tagName),o=py(t.tagName);return!!he[e.namespaceURI]&&(e.namespaceURI===me?t.namespaceURI===fe?"svg"===n:t.namespaceURI===ue?"svg"===n&&("annotation-xml"===o||ke[o]):Boolean(Re[n]):e.namespaceURI===ue?t.namespaceURI===fe?"math"===n:t.namespaceURI===me?"math"===n&&Se[o]:Boolean(Ae[n]):e.namespaceURI===fe?!(t.namespaceURI===me&&!Se[o])&&!(t.namespaceURI===ue&&!ke[o])&&!Ae[n]&&(Ne[n]||!Re[n]):!("application/xhtml+xml"!==ve||!he[e.namespaceURI]))}(e)?(Te(e),!0):"noscript"!==r&&"noembed"!==r&&"noframes"!==r||!wy(/<\/no(script|embed|frames)/i,e.innerHTML)?(K&&3===e.nodeType&&(t=e.textContent,t=vy(t,R," "),t=vy(t,A," "),t=vy(t,T," "),e.textContent!==t&&(gy(n.removed,{element:e.cloneNode()}),e.textContent=t)),Le("afterSanitizeElements",e,null),!1):(Te(e),!0)},Ie=function(e,t,n){if(ee&&("id"===t||"name"===t)&&(n in s||n in xe))return!1;if(q&&!H[t]&&wy(O,t));else if($&&wy(B,t));else if(!F[t]||H[t]){if(!(Fe(e)&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,e)||z.tagNameCheck instanceof Function&&z.tagNameCheck(e))&&(z.attributeNameCheck instanceof RegExp&&wy(z.attributeNameCheck,t)||z.attributeNameCheck instanceof Function&&z.attributeNameCheck(t))||"is"===t&&z.allowCustomizedBuiltInElements&&(z.tagNameCheck instanceof RegExp&&wy(z.tagNameCheck,n)||z.tagNameCheck instanceof Function&&z.tagNameCheck(n))))return!1}else if(de[t]);else if(wy(L,vy(n,D,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==yy(n,"data:")||!ie[e])if(V&&!wy(P,vy(n,D,"")));else if(n)return!1;return!0},Fe=function(e){return e.indexOf("-")>0},Ue=function(e){let t,n,o,r;Le("beforeSanitizeAttributes",e,null);const{attributes:s}=e;if(!s)return;const a={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:F};for(r=s.length;r--;){t=s[r];const{name:i,namespaceURI:l}=t;n="value"===i?t.value:Cy(t.value);const d=n;if(o=Ce(i),a.attrName=o,a.attrValue=n,a.keepAttr=!0,a.forceKeepAttr=void 0,Le("uponSanitizeAttribute",e,a),n=a.attrValue,a.forceKeepAttr)continue;if(!a.keepAttr){Oe(i,e);continue}if(!W&&wy(/\/>/i,n)){Oe(i,e);continue}K&&(n=vy(n,R," "),n=vy(n,A," "),n=vy(n,T," "));const c=Ce(e.nodeName);if(Ie(c,o,n)){if(!te||"id"!==o&&"name"!==o||(Oe(i,e),n="user-content-"+n),C&&"object"==typeof g&&"function"==typeof g.getAttributeType)if(l);else switch(g.getAttributeType(c,o)){case"TrustedHTML":n=C.createHTML(n);break;case"TrustedScriptURL":n=C.createScriptURL(n)}if(n!==d)try{l?e.setAttributeNS(l,i,n):e.setAttribute(i,n)}catch(t){Oe(i,e)}}else Oe(i,e)}Le("afterSanitizeAttributes",e,null)},ze=function e(t){let n;const o=Pe(t);for(Le("beforeSanitizeShadowDOM",t,null);n=o.nextNode();)Le("uponSanitizeShadowNode",n,null),Me(n)||(n.content instanceof a&&e(n.content),Ue(n));Le("afterSanitizeShadowDOM",t,null)};return n.sanitize=function(e){let t,r,s,i,d=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(pe=!e,pe&&(e="\x3c!--\x3e"),"string"!=typeof e&&!De(e)){if("function"!=typeof e.toString)throw xy("toString is not a function");if("string"!=typeof(e=e.toString()))throw xy("dirty is not a string, aborting")}if(!n.isSupported)return e;if(G||_e(d),n.removed=[],"string"==typeof e&&(oe=!1),oe){if(e.nodeName){const t=Ce(e.nodeName);if(!M[t]||j[t])throw xy("root node is forbidden and cannot be sanitized in-place")}}else if(e instanceof l)t=Be("\x3c!----\x3e"),r=t.ownerDocument.importNode(e,!0),1===r.nodeType&&"BODY"===r.nodeName||"HTML"===r.nodeName?t=r:t.appendChild(r);else{if(!Q&&!K&&!Y&&-1===e.indexOf("<"))return C&&Z?C.createHTML(e):e;if(t=Be(e),!t)return Q?null:Z?w:""}t&&X&&Te(t.firstChild);const c=Pe(oe?e:t);for(;s=c.nextNode();)Me(s)||(s.content instanceof a&&ze(s.content),Ue(s));if(oe)return e;if(Q){if(J)for(i=_.call(t.ownerDocument);t.firstChild;)i.appendChild(t.firstChild);else i=t;return(F.shadowroot||F.shadowrootmode)&&(i=S.call(o,i,!0)),i}let u=Y?t.outerHTML:t.innerHTML;return Y&&M["!doctype"]&&t.ownerDocument&&t.ownerDocument.doctype&&t.ownerDocument.doctype.name&&wy(Ky,t.ownerDocument.doctype.name)&&(u="<!DOCTYPE "+t.ownerDocument.doctype.name+">\n"+u),K&&(u=vy(u,R," "),u=vy(u,A," "),u=vy(u,T," ")),C&&Z?C.createHTML(u):u},n.setConfig=function(e){_e(e),G=!0},n.clearConfig=function(){we=null,G=!1},n.isValidAttribute=function(e,t,n){we||_e({});const o=Ce(e),r=Ce(t);return Ie(o,r,n)},n.addHook=function(e,t){"function"==typeof t&&(N[e]=N[e]||[],gy(N[e],t))},n.removeHook=function(e){if(N[e])return fy(N[e])},n.removeHooks=function(e){N[e]&&(N[e]=[])},n.removeAllHooks=function(){N={}},n}();const Qy=Pt.each,Jy=Pt.trim,Zy=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],eC={ftp:21,http:80,https:443,mailto:25},tC=["img","video"],nC=(e,t,n)=>{const o=(e=>{try{return decodeURIComponent(e)}catch(t){return unescape(e)}})(t).replace(/\s/g,"");return!e.allow_script_urls&&(!!/((java|vb)script|mhtml):/i.test(o)||!e.allow_html_data_urls&&(/^data:image\//i.test(o)?((e,t)=>C(e)?!e:!C(t)||!H(tC,t))(e.allow_svg_data_urls,n)&&/^data:image\/svg\+xml/i.test(o):/^data:/i.test(o)))};class oC{static parseDataUri(e){let t;const n=decodeURIComponent(e).split(","),o=/data:([^;]+)/.exec(n[0]);return o&&(t=o[1]),{type:t,data:n[1]}}static isDomSafe(e,t,n={}){if(n.allow_script_urls)return!0;{const o=ea.decode(e).replace(/[\s\u0000-\u001F]+/g,"");return!nC(n,o,t)}}static getDocumentBaseUrl(e){var t;let n;return n=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?null!==(t=e.href)&&void 0!==t?t:"":e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/")),n}constructor(e,t={}){this.path="",this.directory="",e=Jy(e),this.settings=t;const n=t.base_uri,o=this;if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(o.source=e);const r=0===e.indexOf("//");if(0!==e.indexOf("/")||r||(e=(n&&n.protocol||"http")+"://mce_host"+e),!/^[\w\-]*:?\/\//.test(e)){const t=n?n.path:new oC(document.location.href).directory;if(""===(null==n?void 0:n.protocol))e="//mce_host"+o.toAbsPath(t,e);else{const r=/([^#?]*)([#?]?.*)/.exec(e);r&&(e=(n&&n.protocol||"http")+"://mce_host"+o.toAbsPath(t,r[1])+r[2])}}e=e.replace(/@@/g,"(mce_at)");const s=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?(\[[a-zA-Z0-9:.%]+\]|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);s&&Qy(Zy,((e,t)=>{let n=s[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n})),n&&(o.protocol||(o.protocol=n.protocol),o.userInfo||(o.userInfo=n.userInfo),o.port||"mce_host"!==o.host||(o.port=n.port),o.host&&"mce_host"!==o.host||(o.host=n.host),o.source=""),r&&(o.protocol="")}setPath(e){const t=/^(.*?)\/?(\w+)?$/.exec(e);t&&(this.path=t[0],this.directory=t[1],this.file=t[2]),this.source="",this.getURI()}toRelative(e){if("./"===e)return e;const t=new oC(e,{base_uri:this});if("mce_host"!==t.host&&this.host!==t.host&&t.host||this.port!==t.port||this.protocol!==t.protocol&&""!==t.protocol)return t.getURI();const n=this.getURI(),o=t.getURI();if(n===o||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===o)return n;let r=this.toRelPath(this.path,t.path);return t.query&&(r+="?"+t.query),t.anchor&&(r+="#"+t.anchor),r}toAbsolute(e,t){const n=new oC(e,{base_uri:this});return n.getURI(t&&this.isSameOrigin(n))}isSameOrigin(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;const t=this.protocol?eC[this.protocol]:null;if(t&&(this.port||t)==(e.port||t))return!0}return!1}toRelPath(e,t){let n,o,r=0,s="";const a=e.substring(0,e.lastIndexOf("/")).split("/"),i=t.split("/");if(a.length>=i.length)for(n=0,o=a.length;n<o;n++)if(n>=i.length||a[n]!==i[n]){r=n+1;break}if(a.length<i.length)for(n=0,o=i.length;n<o;n++)if(n>=a.length||a[n]!==i[n]){r=n+1;break}if(1===r)return t;for(n=0,o=a.length-(r-1);n<o;n++)s+="../";for(n=r-1,o=i.length;n<o;n++)s+=n!==r-1?"/"+i[n]:i[n];return s}toAbsPath(e,t){let n=0;const o=/\/$/.test(t)?"/":"",r=e.split("/"),s=t.split("/"),a=[];Qy(r,(e=>{e&&a.push(e)}));const i=[];for(let e=s.length-1;e>=0;e--)0!==s[e].length&&"."!==s[e]&&(".."!==s[e]?n>0?n--:i.push(s[e]):n++);const l=a.length-n;let d;return d=l<=0?oe(i).join("/"):a.slice(0,l).join("/")+"/"+oe(i).join("/"),0!==d.indexOf("/")&&(d="/"+d),o&&d.lastIndexOf("/")!==d.length-1&&(d+=o),d}getURI(e=!1){let t;return this.source&&!e||(t="",e||(this.protocol?t+=this.protocol+"://":t+="//",this.userInfo&&(t+=this.userInfo+"@"),this.host&&(t+=this.host),this.port&&(t+=":"+this.port)),this.path&&(t+=this.path),this.query&&(t+="?"+this.query),this.anchor&&(t+="#"+this.anchor),this.source=t),this.source}}const rC=Pt.makeMap("src,href,data,background,action,formaction,poster,xlink:href"),sC="data-mce-type";let aC=0;const iC=(e,t,n,o,r)=>{var s,a,i,l;const d=t.validate,c=n.getSpecialElements();8===e.nodeType&&!t.allow_conditional_comments&&/^\[if/i.test(null!==(s=e.nodeValue)&&void 0!==s?s:"")&&(e.nodeValue=" "+e.nodeValue);const u=null!==(a=null==r?void 0:r.tagName)&&void 0!==a?a:e.nodeName.toLowerCase();if("html"!==o&&n.isValid(o))return void(C(r)&&(r.allowedTags[u]=!0));if(1!==e.nodeType||"body"===u)return;const f=yn(e),g=nn(f,sC),p=en(f,"data-mce-bogus");if(!g&&m(p))return void("all"===p?xo(f):Eo(f));const h=n.getElementRule(u);if(!d||h){if(C(r)&&(r.allowedTags[u]=!0),d&&h&&!g){if(V(null!==(i=h.attributesForced)&&void 0!==i?i:[],(e=>{Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),V(null!==(l=h.attributesDefault)&&void 0!==l?l:[],(e=>{nn(f,e.name)||Jt(f,e.name,"{$uid}"===e.value?"mce_"+aC++:e.value)})),h.attributesRequired&&!$(h.attributesRequired,(e=>nn(f,e))))return void Eo(f);if(h.removeEmptyAttrs&&(e=>{const t=e.dom.attributes;return null==t||0===t.length})(f))return void Eo(f);h.outputName&&h.outputName!==u&&((e,t)=>{const n=((e,t)=>{const n=bn(t),o=rn(e);return Zt(n,o),n})(e,t);ho(e,n);const o=Mn(e);Co(n,o),xo(e)})(f,h.outputName)}}else Ee(c,u)?xo(f):Eo(f)},lC=(e,t,n,o,r,s)=>"html"!==n&&!ps(o)||!(r in rC&&nC(e,s,o))&&(!e.validate||t.isValid(o,r)||He(r,"data-")||He(r,"aria-")),dC=(e,t)=>e.hasAttribute(sC)&&("id"===t||"class"===t||"style"===t),cC=(e,t)=>e in t.getBoolAttrs(),uC=(e,t,n,o)=>{const{attributes:r}=e;for(let s=r.length-1;s>=0;s--){const a=r[s],i=a.name,l=a.value;lC(t,n,o,e.tagName.toLowerCase(),i,l)||dC(e,i)?cC(i,n)&&e.setAttribute(i,i):e.removeAttribute(i)}},mC=(e,t,n)=>{const o=Xy();return o.addHook("uponSanitizeElement",((o,r)=>{iC(o,e,t,n.track(o),r)})),o.addHook("uponSanitizeAttribute",((o,r)=>{((e,t,n,o,r)=>{const s=e.tagName.toLowerCase(),{attrName:a,attrValue:i}=r;r.keepAttr=lC(t,n,o,s,a,i),r.keepAttr?(r.allowedAttributes[a]=!0,cC(a,n)&&(r.attrValue=a),t.allow_svg_data_urls&&He(i,"data:image/svg+xml")&&(r.forceKeepAttr=!0)):dC(e,a)&&(r.forceKeepAttr=!0)})(o,e,t,n.current(),r)})),o},fC=e=>{const t=["type","href","role","arcrole","title","show","actuate","label","from","to"].map((e=>`xlink:${e}`)),n={IN_PLACE:!0,USE_PROFILES:{html:!0,svg:!0,svgFilters:!0},ALLOWED_ATTR:t};return Xy().sanitize(e,n),e.innerHTML},gC=Pt.makeMap,pC=Pt.extend,hC=(e,t,n,o)=>{const r=e.name,s=r in n&&"title"!==r&&"textarea"!==r&&"noscript"!==r,a=t.childNodes;for(let t=0,r=a.length;t<r;t++){const r=a[t],i=new Wg(r.nodeName.toLowerCase(),r.nodeType);if(qo(r)){const e=r.attributes;for(let t=0,n=e.length;t<n;t++){const n=e[t];i.attr(n.name,n.value)}ps(i.name)&&(o(r),i.value=r.innerHTML)}else er(r)?(i.value=r.data,s&&(i.raw=!0)):(or(r)||tr(r)||nr(r))&&(i.value=r.data);ps(i.name)||hC(i,r,n,o),e.append(i)}},bC=(e={},t=ua())=>{const n=qv(),o=qv(),r={validate:!0,root_name:"body",sanitize:!0,...e},s=new DOMParser,a=((e,t)=>{const n=(()=>{let e=[];const t=()=>e[e.length-1];return{track:n=>{hs(n)&&e.push(n);let o=t();return o&&!o.contains(n)&&(e.pop(),o=t()),bs(o)},current:()=>bs(t()),reset:()=>{e=[]}}})();if(e.sanitize){const o=mC(e,t,n),r=(t,r)=>{o.sanitize(t,((e,t)=>{const n={IN_PLACE:!0,ALLOW_UNKNOWN_PROTOCOLS:!0,ALLOWED_TAGS:["#comment","#cdata-section","body"],ALLOWED_ATTR:[]};return n.PARSER_MEDIA_TYPE=t,e.allow_script_urls?n.ALLOWED_URI_REGEXP=/.*/:e.allow_html_data_urls&&(n.ALLOWED_URI_REGEXP=/^(?!(\w+script|mhtml):)/i),n})(e,r)),o.removed=[],n.reset()};return{sanitizeHtmlElement:r,sanitizeNamespaceElement:fC}}return{sanitizeHtmlElement:(o,r)=>{const s=document.createNodeIterator(o,NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_COMMENT|NodeFilter.SHOW_TEXT);let a;for(;a=s.nextNode();){const o=n.track(a);iC(a,e,t,o),qo(a)&&uC(a,e,t,o)}n.reset()},sanitizeNamespaceElement:_}})(r,t),i=n.addFilter,l=n.getFilters,d=n.removeFilter,c=o.addFilter,u=o.getFilters,f=o.removeFilter,g=(e,n)=>{const o=m(n.attr(sC)),r=1===n.type&&!Ee(e,n.name)&&!Bs(t,n)&&!ps(n.name);return 3===n.type||r&&!o},p={schema:t,addAttributeFilter:c,getAttributeFilters:u,removeAttributeFilter:f,addNodeFilter:i,getNodeFilters:l,removeNodeFilter:d,parse:(e,n={})=>{var o;const i=r.validate,d=null!==(o=n.context)&&void 0!==o?o:r.root_name,c=((e,n,o="html")=>{const r="xhtml"===o?"application/xhtml+xml":"text/html",i=Ee(t.getSpecialElements(),n.toLowerCase()),l=i?`<${n}>${e}</${n}>`:e,d="xhtml"===o?`<html xmlns="http://www.w3.org/1999/xhtml"><head></head><body>${l}</body></html>`:`<body>${l}</body>`,c=s.parseFromString(d,r).body;return a.sanitizeHtmlElement(c,r),i?c.firstChild:c})(e,d,n.format);ks(t,c);const m=new Wg(d,11);hC(m,c,t.getSpecialElements(),a.sanitizeNamespaceElement),c.innerHTML="";const[f,p]=((e,t,n,o)=>{const r=n.validate,s=t.getNonEmptyElements(),a=t.getWhitespaceElements(),i=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),l=da(t),d=/[ \t\r\n]+/g,c=/^[ \t\r\n]+/,u=/[ \t\r\n]+$/,m=e=>{let t=e.parent;for(;C(t);){if(t.name in a)return!0;t=t.parent}return!1},f=n=>n.name in i||Bs(t,n)||ps(n.name)&&n.parent===e,g=(t,n)=>{const r=n?t.prev:t.next;return!C(r)&&!y(t.parent)&&f(t.parent)&&(t.parent!==e||!0===o.isRootContent)};return[e=>{var t;if(3===e.type&&!m(e)){let n=null!==(t=e.value)&&void 0!==t?t:"";n=n.replace(d," "),(((e,t)=>C(e)&&(t(e)||"br"===e.name))(e.prev,f)||g(e,!0))&&(n=n.replace(c,"")),0===n.length?e.remove():e.value=n}},e=>{var i;if(1===e.type){const i=t.getElementRule(e.name);if(r&&i){const r=vb(t,s,a,e);i.paddInEmptyBlock&&r&&(e=>{let n=e;for(;C(n);){if(n.name in l)return vb(t,s,a,n);n=n.parent}return!1})(e)?hb(n,o,f,e):i.removeEmpty&&r?f(e)?e.remove():e.unwrap():i.paddEmpty&&(r||(e=>{var t;return bb(e,"#text")&&(null===(t=null==e?void 0:e.firstChild)||void 0===t?void 0:t.value)===br})(e))&&hb(n,o,f,e)}}else if(3===e.type&&!m(e)){let t=null!==(i=e.value)&&void 0!==i?i:"";(e.next&&f(e.next)||g(e,!1))&&(t=t.replace(u,"")),0===t.length?e.remove():e.value=t}}]})(m,t,r,n),h=[],b=i?e=>((e,n)=>{xb(t,e)&&n.push(e)})(e,h):_,v={nodes:{},attributes:{}},w=e=>fb(l(),u(),e,v);if(((e,t,n)=>{const o=[];for(let n=e,r=n;n;r=n,n=n.walk()){const s=n;V(t,(e=>e(s))),y(s.parent)&&s!==e?n=r:o.push(s)}for(let e=o.length-1;e>=0;e--){const t=o[e];V(n,(e=>e(t)))}})(m,[f,w],[p,b]),h.reverse(),i&&h.length>0)if(n.context){const{pass:e,fail:o}=K(h,(e=>e.parent===m));wb(o,t,m,w),n.invalid=e.length>0}else wb(h,t,m,w);const x=((e,t)=>{var n;const o=null!==(n=t.forced_root_block)&&void 0!==n?n:e.forced_root_block;return!1===o?"":!0===o?"p":o})(r,n);return x&&("body"===m.name||n.isRootContent)&&((e,n)=>{const o=pC(gC("script,style,head,html,body,title,meta,param"),t.getBlockElements()),s=/^[ \t\r\n]+/,a=/[ \t\r\n]+$/;let i=e.firstChild,l=null;const d=e=>{var t,n;e&&(i=e.firstChild,i&&3===i.type&&(i.value=null===(t=i.value)||void 0===t?void 0:t.replace(s,"")),i=e.lastChild,i&&3===i.type&&(i.value=null===(n=i.value)||void 0===n?void 0:n.replace(a,"")))};if(t.isValidChild(e.name,n.toLowerCase())){for(;i;){const t=i.next;g(o,i)?(l||(l=new Wg(n,1),l.attr(r.forced_root_block_attrs),e.insert(l,i)),l.append(i)):(d(l),l=null),i=t}d(l)}})(m,x),n.invalid||gb(v,n),m}};return ty(p,r),((e,t,n)=>{t.inline_styles&&Vv(e,t,n)})(p,r,t),p},vC=(e,t,n)=>{const o=(e=>Bb(e)?up({validate:!1}).serialize(e):e)(e),r=t(o);if(r.isDefaultPrevented())return r;if(Bb(e)){if(r.content!==o){const t=bC({validate:!1,forced_root_block:!1,...n}).parse(r.content,{context:e.name});return{...r,content:t}}return{...r,content:e}}return r},yC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=((e,t)=>e.dispatch("BeforeGetContent",t))(e,t);return n.isDefaultPrevented()?pl.error(rf(e,{content:"",...n}).content):pl.value(n)}},CC=(e,t,n)=>{if(n.no_events)return t;{const o=vC(t,(t=>rf(e,{...n,content:t})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return o.content}},wC=(e,t)=>{if(t.no_events)return pl.value(t);{const n=vC(t.content,(n=>((e,t)=>e.dispatch("BeforeSetContent",t))(e,{...t,content:n})),{sanitize:fc(e),sandbox_iframes:Cc(e)});return n.isDefaultPrevented()?(of(e,n),pl.error(void 0)):pl.value(n)}},xC=(e,t,n)=>{n.no_events||of(e,{...n,content:t})},EC=(e,t,n)=>({element:e,width:t,rows:n}),_C=(e,t)=>({element:e,cells:t}),kC=(e,t)=>({x:e,y:t}),SC=(e,t)=>tn(e,t).bind(Xe).getOr(1),NC=(e,t,n)=>{const o=e.rows;return!!(o[n]?o[n].cells:[])[t]},RC=e=>X(e,((e,t)=>t.cells.length>e?t.cells.length:e),0),AC=(e,t)=>{const n=e.rows;for(let e=0;e<n.length;e++){const o=n[e].cells;for(let n=0;n<o.length;n++)if(_n(o[n],t))return I.some(kC(n,e))}return I.none()},TC=(e,t,n,o,r)=>{const s=[],a=e.rows;for(let e=n;e<=r;e++){const n=a[e].cells,r=t<o?n.slice(t,o+1):n.slice(o,t+1);s.push(_C(a[e].element,r))}return s},OC=e=>((e,t)=>{const n=fi(e.element),o=bn("tbody");return Co(o,t),vo(n,o),n})(e,(e=>q(e.rows,(e=>{const t=q(e.cells,(e=>{const t=gi(e);return on(t,"colspan"),on(t,"rowspan"),t})),n=fi(e.element);return Co(n,t),n})))(e)),BC=(e,t,n)=>{const o=yn(t.commonAncestorContainer),r=Bp(o,e),s=Y(r,(e=>n.isWrapper(Ht(e)))),a=((e,t)=>J(e,(e=>"li"===Ht(e)&&rm(e,t))).fold(N([]),(t=>(e=>J(e,(e=>"ul"===Ht(e)||"ol"===Ht(e))))(e).map((e=>{const t=bn(Ht(e)),n=ye(fo(e),((e,t)=>He(t,"list-style")));return lo(t,n),[bn("li"),t]})).getOr([]))))(r,t),i=s.concat(a.length?a:(e=>Sr(e)?An(e).filter(kr).fold(N([]),(t=>[e,t])):kr(e)?[e]:[])(o));return q(i,fi)},PC=()=>Sf([]),DC=(e,t)=>((e,t)=>eo(t,"table",T(_n,e)))(e,t[0]).bind((e=>{const n=t[0],o=t[t.length-1],r=(e=>{const t=EC(fi(e),0,[]);return V(Uo(e,"tr"),((e,n)=>{V(Uo(e,"td,th"),((o,r)=>{((e,t,n,o,r)=>{const s=SC(r,"rowspan"),a=SC(r,"colspan"),i=e.rows;for(let e=n;e<n+s;e++){i[e]||(i[e]=_C(gi(o),[]));for(let o=t;o<t+a;o++)i[e].cells[o]=e===n&&o===t?r:fi(r)}})(t,((e,t,n)=>{for(;NC(e,t,n);)t++;return t})(t,r,n),n,e,o)}))})),EC(t.element,RC(t.rows),t.rows)})(e);return((e,t,n)=>AC(e,t).bind((t=>AC(e,n).map((n=>((e,t,n)=>{const o=t.x,r=t.y,s=n.x,a=n.y,i=r<a?TC(e,o,r,s,a):TC(e,o,a,s,r);return EC(e.element,RC(i),i)})(e,t,n))))))(r,n,o).map((e=>Sf([OC(e)])))})).getOrThunk(PC),LC=(e,t,n)=>{const o=Zu(t,e);return o.length>0?DC(e,o):((e,t,n)=>t.length>0&&t[0].collapsed?PC():((e,t,n)=>((e,t)=>{const n=X(t,((e,t)=>(vo(t,e),t)),e);return t.length>0?Sf([n]):n})(yn(t.cloneContents()),BC(e,t,n)))(e,t[0],n))(e,t,n)},MC=(e,t)=>t>=0&&t<e.length&&Xu(e.charAt(t)),IC=e=>Dr(e.innerText),FC=e=>qo(e)?e.outerHTML:er(e)?ea.encodeRaw(e.data,!1):or(e)?"\x3c!--"+e.data+"--\x3e":"",UC=(e,t)=>(((e,t)=>{let n=0;V(e,(e=>{0===e[0]?n++:1===e[0]?(((e,t,n)=>{const o=(e=>{let t;const n=document.createElement("div"),o=document.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)o.appendChild(t);return o})(t);if(e.hasChildNodes()&&n<e.childNodes.length){const t=e.childNodes[n];e.insertBefore(o,t)}else e.appendChild(o)})(t,e[1],n),n++):2===e[0]&&((e,t)=>{if(e.hasChildNodes()&&t<e.childNodes.length){const n=e.childNodes[t];e.removeChild(n)}})(t,n)}))})(((e,t)=>{const n=e.length+t.length+2,o=new Array(n),r=new Array(n),s=(n,o,r,a,l)=>{const d=i(n,o,r,a);if(null===d||d.start===o&&d.diag===o-a||d.end===n&&d.diag===n-r){let s=n,i=r;for(;s<o||i<a;)s<o&&i<a&&e[s]===t[i]?(l.push([0,e[s]]),++s,++i):o-n>a-r?(l.push([2,e[s]]),++s):(l.push([1,t[i]]),++i)}else{s(n,d.start,r,d.start-d.diag,l);for(let t=d.start;t<d.end;++t)l.push([0,e[t]]);s(d.end,o,d.end-d.diag,a,l)}},a=(n,o,r,s)=>{let a=n;for(;a-o<s&&a<r&&e[a]===t[a-o];)++a;return((e,t,n)=>({start:e,end:t,diag:n}))(n,a,o)},i=(n,s,i,l)=>{const d=s-n,c=l-i;if(0===d||0===c)return null;const u=d-c,m=c+d,f=(m%2==0?m:m+1)/2;let g,p,h,b,v;for(o[1+f]=n,r[1+f]=s+1,g=0;g<=f;++g){for(p=-g;p<=g;p+=2){for(h=p+f,p===-g||p!==g&&o[h-1]<o[h+1]?o[h]=o[h+1]:o[h]=o[h-1]+1,b=o[h],v=b-n+i-p;b<s&&v<l&&e[b]===t[v];)o[h]=++b,++v;if(u%2!=0&&u-g<=p&&p<=u+g&&r[h-u]<=o[h])return a(r[h-u],p+n-i,s,l)}for(p=u-g;p<=u+g;p+=2){for(h=p+f-u,p===u-g||p!==u+g&&r[h+1]<=r[h-1]?r[h]=r[h+1]-1:r[h]=r[h-1],b=r[h]-1,v=b-n+i-p;b>=n&&v>=i&&e[b]===t[v];)r[h]=b--,v--;if(u%2==0&&-g<=p&&p<=g&&r[h]<=o[h+u])return a(r[h],p+n-i,s,l)}}return null},l=[];return s(0,e.length,0,t.length,l),l})(q(ce(t.childNodes),FC),e),t),t),zC=De((()=>document.implementation.createHTMLDocument("undo"))),jC=e=>{const t=e.serializer.getTempAttrs(),n=sp(e.getBody(),t);return(e=>null!==e.querySelector("iframe"))(n)?{type:"fragmented",fragments:Y(q(ce(n.childNodes),k(Dr,FC)),(e=>e.length>0)),content:"",bookmark:null,beforeBookmark:null}:{type:"complete",fragments:null,content:Dr(n.innerHTML),bookmark:null,beforeBookmark:null}},HC=(e,t,n)=>{const o=n?t.beforeBookmark:t.bookmark;"fragmented"===t.type?UC(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw",no_selection:!C(o)||!Iu(o)||!o.isFakeCaret}),o&&(e.selection.moveToBookmark(o),e.selection.scrollIntoView())},$C=e=>"fragmented"===e.type?e.fragments.join(""):e.content,qC=e=>{const t=bn("body",zC());return So(t,$C(e)),V(Uo(t,"*[data-mce-bogus]"),Eo),ko(t)},VC=(e,t)=>!(!e||!t)&&(!!((e,t)=>$C(e)===$C(t))(e,t)||((e,t)=>qC(e)===qC(t))(e,t)),WC=e=>0===e.get(),KC=(e,t,n)=>{WC(n)&&(e.typing=t)},YC=(e,t)=>{e.typing&&(KC(e,!1,t),e.add())},GC=e=>({init:{bindEvents:_},undoManager:{beforeChange:(t,n)=>((e,t,n)=>{WC(t)&&n.set(ml(e.selection))})(e,t,n),add:(t,n,o,r,s,a)=>((e,t,n,o,r,s,a)=>{const i=jC(e),l=Pt.extend(s||{},i);if(!WC(o)||e.removed)return null;const d=t.data[n.get()];if(e.dispatch("BeforeAddUndo",{level:l,lastLevel:d,originalEvent:a}).isDefaultPrevented())return null;if(d&&VC(d,l))return null;t.data[n.get()]&&r.get().each((e=>{t.data[n.get()].beforeBookmark=e}));const c=Td(e);if(c&&t.data.length>c){for(let e=0;e<t.data.length-1;e++)t.data[e]=t.data[e+1];t.data.length--,n.set(t.data.length)}l.bookmark=ml(e.selection),n.get()<t.data.length-1&&(t.data.length=n.get()+1),t.data.push(l),n.set(t.data.length-1);const u={level:l,lastLevel:d,originalEvent:a};return n.get()>0?(e.setDirty(!0),e.dispatch("AddUndo",u),e.dispatch("change",u)):e.dispatch("AddUndo",u),l})(e,t,n,o,r,s,a),undo:(t,n,o)=>((e,t,n,o)=>{let r;return t.typing&&(t.add(),t.typing=!1,KC(t,!1,n)),o.get()>0&&(o.set(o.get()-1),r=t.data[o.get()],HC(e,r,!0),e.setDirty(!0),e.dispatch("Undo",{level:r})),r})(e,t,n,o),redo:(t,n)=>((e,t,n)=>{let o;return t.get()<n.length-1&&(t.set(t.get()+1),o=n[t.get()],HC(e,o,!1),e.setDirty(!0),e.dispatch("Redo",{level:o})),o})(e,t,n),clear:(t,n)=>((e,t,n)=>{t.data=[],n.set(0),t.typing=!1,e.dispatch("ClearUndos")})(e,t,n),reset:e=>(e=>{e.clear(),e.add()})(e),hasUndo:(t,n)=>((e,t,n)=>n.get()>0||t.typing&&t.data[0]&&!VC(jC(e),t.data[0]))(e,t,n),hasRedo:(e,t)=>((e,t)=>t.get()<e.data.length-1&&!e.typing)(e,t),transact:(e,t,n)=>((e,t,n)=>(YC(e,t),e.beforeChange(),e.ignore(n),e.add()))(e,t,n),ignore:(e,t)=>((e,t)=>{try{e.set(e.get()+1),t()}finally{e.set(e.get()-1)}})(e,t),extra:(t,n,o,r)=>((e,t,n,o,r)=>{if(t.transact(o)){const o=t.data[n.get()].bookmark,s=t.data[n.get()-1];HC(e,s,!0),t.transact(r)&&(t.data[n.get()-1].beforeBookmark=o)}})(e,t,n,o,r)},formatter:{match:(t,n,o,r)=>Hb(e,t,n,o,r),matchAll:(t,n)=>((e,t,n)=>{const o=[],r={},s=e.selection.getStart();return e.dom.getParent(s,(s=>{for(let a=0;a<t.length;a++){const i=t[a];!r[i]&&jb(e,s,i,n)&&(r[i]=!0,o.push(i))}}),e.dom.getRoot()),o})(e,t,n),matchNode:(t,n,o,r)=>jb(e,t,n,o,r),canApply:t=>((e,t)=>{const n=e.formatter.get(t),o=e.dom;if(n&&e.selection.isEditable()){const t=e.selection.getStart(),r=Em(o,t);for(let e=n.length-1;e>=0;e--){const t=n[e];if(!Sm(t))return!0;for(let e=r.length-1;e>=0;e--)if(o.is(r[e],t.selector))return!0}}return!1})(e,t),closest:t=>((e,t)=>{const n=t=>_n(t,yn(e.getBody()));return I.from(e.selection.getStart(!0)).bind((o=>Lb(yn(o),(n=>ue(t,(t=>((t,n)=>jb(e,t.dom,n)?I.some(n):I.none())(n,t)))),n))).getOrNull()})(e,t),apply:(t,n,o)=>Iv(e,t,n,o),remove:(t,n,o,r)=>Ov(e,t,n,o,r),toggle:(t,n,o)=>((e,t,n,o)=>{const r=e.formatter.get(t);r&&(!Hb(e,t,n,o)||"toggle"in r[0]&&!r[0].toggle?Iv(e,t,n,o):Ov(e,t,n,o))})(e,t,n,o),formatChanged:(t,n,o,r,s)=>((e,t,n,o,r,s)=>(((e,t,n,o,r,s)=>{const a=t.get();V(n.split(","),(t=>{const n=xe(a,t).getOrThunk((()=>{const e={withSimilar:{state:$a(!1),similar:!0,callbacks:[]},withoutSimilar:{state:$a(!1),similar:!1,callbacks:[]},withVars:[]};return a[t]=e,e})),i=()=>{const n=jv(e);return zv(e,n,t,r,s).isSome()};if(v(s)){const e=r?n.withSimilar:n.withoutSimilar;e.callbacks.push(o),1===e.callbacks.length&&e.state.set(i())}else n.withVars.push({state:$a(i()),similar:r,vars:s,callback:o})})),t.set(a)})(e,t,n,o,r,s),{unbind:()=>((e,t,n)=>{const o=e.get();V(t.split(","),(e=>xe(o,e).each((t=>{o[e]={withSimilar:{...t.withSimilar,callbacks:Y(t.withSimilar.callbacks,(e=>e!==n))},withoutSimilar:{...t.withoutSimilar,callbacks:Y(t.withoutSimilar.callbacks,(e=>e!==n))},withVars:Y(t.withVars,(e=>e.callback!==n))}})))),e.set(o)})(t,n,o)}))(e,t,n,o,r,s)},editor:{getContent:t=>((e,t)=>I.from(e.getBody()).fold(N("tree"===t.format?new Wg("body",11):""),(n=>lp(e,t,n))))(e,t),setContent:(t,n)=>((e,t,n)=>I.from(e.getBody()).map((o=>Bb(t)?((e,t,n,o)=>{pb(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);const r=up({validate:!1},e.schema).serialize(n),s=Dr(Ar(yn(t))?r:Pt.trim(r));return Pb(e,s,o.no_selection),{content:n,html:s}})(e,o,t,n):((e,t,n,o)=>{if(0===(n=Dr(n)).length||/^\s+$/.test(n)){const r='<br data-mce-bogus="1">';"TABLE"===t.nodeName?n="<tr><td>"+r+"</td></tr>":/^(UL|OL)$/.test(t.nodeName)&&(n="<li>"+r+"</li>");const s=Il(e);return e.schema.isValidChild(t.nodeName.toLowerCase(),s.toLowerCase())?(n=r,n=e.dom.createHTML(s,Fl(e),n)):n||(n=r),Pb(e,n,o.no_selection),{content:n,html:n}}{"raw"!==o.format&&(n=up({validate:!1},e.schema).serialize(e.parser.parse(n,{isRootContent:!0,insert:!0})));const r=Ar(yn(t))?n:Pt.trim(n);return Pb(e,r,o.no_selection),{content:r,html:r}}})(e,o,t,n))).getOr({content:t,html:Bb(n.content)?"":n.content}))(e,t,n),insertContent:(t,n)=>Ob(e,t,n),addVisual:t=>((e,t)=>{const n=e.dom,o=C(t)?t:e.getBody();V(n.select("table,a",o),(t=>{switch(t.nodeName){case"TABLE":const o=Ud(e),r=n.getAttrib(t,"border");r&&"0"!==r||!e.hasVisual?n.removeClass(t,o):n.addClass(t,o);break;case"A":if(!n.getAttrib(t,"href")){const o=n.getAttrib(t,"name")||t.id,r=zd(e);o&&e.hasVisual?n.addClass(t,r):n.removeClass(t,r)}}})),e.dispatch("VisualAid",{element:t,hasVisual:e.hasVisual})})(e,t)},selection:{getContent:(t,n)=>((e,t,n={})=>{const o=((e,t)=>({...e,format:t,get:!0,selection:!0,getInner:!0}))(n,t);return yC(e,o).fold(R,(t=>{const n=((e,t)=>{if("text"===t.format)return(e=>I.from(e.selection.getRng()).map((t=>{var n;const o=I.from(e.dom.getParent(t.commonAncestorContainer,e.dom.isBlock)),r=e.getBody(),s=(e=>e.map((e=>e.nodeName)).getOr("div").toLowerCase())(o),a=yn(t.cloneContents());ap(a),ip(a);const i=e.dom.add(r,s,{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},a.dom),l=IC(i),d=Dr(null!==(n=i.textContent)&&void 0!==n?n:"");if(e.dom.remove(i),MC(d,0)||MC(d,d.length-1)){const e=o.getOr(r),t=IC(e),n=t.indexOf(l);return-1===n?l:(MC(t,n-1)?" ":"")+l+(MC(t,n+l.length)?" ":"")}return l})).getOr(""))(e);{const n=((e,t)=>{const n=e.selection.getRng(),o=e.dom.create("body"),r=e.selection.getSel(),s=Mg(e,Ju(r)),a=t.contextual?LC(yn(e.getBody()),s,e.schema).dom:n.cloneContents();return a&&o.appendChild(a),e.selection.serializer.serialize(o,t)})(e,t);return"tree"===t.format?n:e.selection.isCollapsed()?"":n}})(e,t);return CC(e,n,t)}))})(e,t,n)},autocompleter:{addDecoration:t=>zg(e,t),removeDecoration:()=>((e,t)=>jg(t).each((t=>{const n=e.selection.getBookmark();Eo(t),e.selection.moveToBookmark(n)})))(e,yn(e.getBody()))},raw:{getModel:()=>I.none()}}),XC=e=>Ee(e.plugins,"rtc"),QC=e=>e.rtcInstance?e.rtcInstance:GC(e),JC=e=>{const t=e.rtcInstance;if(t)return t;throw new Error("Failed to get RTC instance not yet initialized.")},ZC=e=>JC(e).init.bindEvents(),ew=e=>0===e.dom.length?(xo(e),I.none()):I.some(e),tw=(e,t,n,o,r)=>{e.bind((e=>((o?ch:dh)(e.dom,o?e.dom.length:0,r),t.filter(Kt).map((t=>((e,t,n,o,r)=>{const s=e.dom,a=t.dom,i=o?s.length:a.length;o?(uh(s,a,r,!1,!o),n.setStart(a,i)):(uh(a,s,r,!1,!o),n.setEnd(a,i))})(e,t,n,o,r)))))).orThunk((()=>{const e=((e,t)=>e.filter((e=>Jm.isBookmarkNode(e.dom))).bind(t?Pn:Bn))(t,o).or(t).filter(Kt);return e.map((e=>((e,t,n)=>{An(e).each((o=>{const r=e.dom;t&&eh(o,Vi(r,0),n)?dh(r,0,n):!t&&th(o,Vi(r,r.length),n)&&ch(r,r.length,n)}))})(e,o,r)))}))},nw=(e,t,n)=>{if(Ee(e,t)){const o=Y(e[t],(e=>e!==n));0===o.length?delete e[t]:e[t]=o}};const ow=e=>!(!e||!e.ownerDocument)&&kn(yn(e.ownerDocument),yn(e)),rw=(e,t,n,o)=>{let r,s;const{selectorChangedWithUnbind:a}=((e,t)=>{let n,o;const r=(t,n)=>J(n,(n=>e.is(n,t))),s=t=>e.getParents(t,void 0,e.getRoot());return{selectorChangedWithUnbind:(e,a)=>(n||(n={},o={},t.on("NodeChange",(e=>{const t=e.element,a=s(t),i={};ge(n,((e,t)=>{r(t,a).each((n=>{o[t]||(V(e,(e=>{e(!0,{node:n,selector:t,parents:a})})),o[t]=e),i[t]=e}))})),ge(o,((e,n)=>{i[n]||(delete o[n],V(e,(e=>{e(!1,{node:t,selector:n,parents:a})})))}))}))),n[e]||(n[e]=[]),n[e].push(a),r(e,s(t.selection.getStart())).each((()=>{o[e]=n[e]})),{unbind:()=>{nw(n,e,a),nw(o,e,a)}})}})(e,o),i=(e,t)=>((e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,selection:!0,content:t}))(n,t);wC(e,o).each((t=>{const n=((e,t)=>{if("raw"!==t.format){const n=e.selection.getRng(),o=e.dom.getParent(n.commonAncestorContainer,e.dom.isBlock),r=o?{context:o.nodeName.toLowerCase()}:{},s=e.parser.parse(t.content,{forced_root_block:!1,...r,...t});return up({validate:!1},e.schema).serialize(s)}return t.content})(e,t),o=e.selection.getRng();((e,t,n)=>{const o=I.from(t.firstChild).map(yn),r=I.from(t.lastChild).map(yn);e.deleteContents(),e.insertNode(t);const s=o.bind(Bn).filter(Kt).bind(ew),a=r.bind(Pn).filter(Kt).bind(ew);tw(s,o,e,!0,n),tw(a,r,e,!1,n),e.collapse(!1)})(o,o.createContextualFragment(n),e.schema),e.selection.setRng(o),sg(e,o),xC(e,n,t)}))})(o,e,t),l=e=>{const t=c();t.collapse(!!e),u(t)},d=()=>t.getSelection?t.getSelection():t.document.selection,c=()=>{let n;const a=(e,t,n)=>{try{return t.compareBoundaryPoints(e,n)}catch(e){return-1}},i=t.document;if(C(o.bookmark)&&!Rg(o)){const e=hg(o);if(e.isSome())return e.map((e=>Mg(o,[e])[0])).getOr(i.createRange())}try{const e=d();e&&!$o(e.anchorNode)&&(n=e.rangeCount>0?e.getRangeAt(0):i.createRange(),n=Mg(o,[n])[0])}catch(e){}if(n||(n=i.createRange()),rr(n.startContainer)&&n.collapsed){const t=e.getRoot();n.setStart(t,0),n.setEnd(t,0)}return r&&s&&(0===a(n.START_TO_START,n,r)&&0===a(n.END_TO_END,n,r)?n=s:(r=null,s=null)),n},u=(e,t)=>{if(!(e=>!!e&&ow(e.startContainer)&&ow(e.endContainer))(e))return;const n=d();if(e=o.dispatch("SetSelectionRange",{range:e,forward:t}).range,n){s=e;try{n.removeAllRanges(),n.addRange(e)}catch(e){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),r=n.rangeCount>0?n.getRangeAt(0):null}if(!e.collapsed&&e.startContainer===e.endContainer&&(null==n?void 0:n.setBaseAndExtent)&&e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()){const t=e.startContainer.childNodes[e.startOffset];t&&"IMG"===t.nodeName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(t,0,t,1))}o.dispatch("AfterSetSelectionRange",{range:e,forward:t})},m=()=>{const t=d(),n=null==t?void 0:t.anchorNode,o=null==t?void 0:t.focusNode;if(!t||!n||!o||$o(n)||$o(o))return!0;const r=e.createRng(),s=e.createRng();try{r.setStart(n,t.anchorOffset),r.collapse(!0),s.setStart(o,t.focusOffset),s.collapse(!0)}catch(e){return!0}return r.compareBoundaryPoints(r.START_TO_START,s)<=0},f={dom:e,win:t,serializer:n,editor:o,expand:(t={type:"word"})=>u(Uf(e).expand(c(),t)),collapse:l,setCursorLocation:(t,n)=>{const r=e.createRng();C(t)&&C(n)?(r.setStart(t,n),r.setEnd(t,n),u(r),l(!1)):(sm(e,r,o.getBody(),!0),u(r))},getContent:e=>((e,t={})=>((e,t,n)=>JC(e).selection.getContent(t,n))(e,t.format?t.format:"html",t))(o,e),setContent:i,getBookmark:(e,t)=>g.getBookmark(e,t),moveToBookmark:e=>g.moveToBookmark(e),select:(t,n)=>(((e,t,n)=>I.from(t).bind((t=>I.from(t.parentNode).map((o=>{const r=e.nodeIndex(t),s=e.createRng();return s.setStart(o,r),s.setEnd(o,r+1),n&&(sm(e,s,t,!0),sm(e,s,t,!1)),s})))))(e,t,n).each(u),t),isCollapsed:()=>{const e=c(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isEditable:()=>{const t=c(),n=o.getBody().querySelectorAll('[data-mce-selected="1"]');return n.length>0?ne(n,(t=>e.isEditable(t.parentElement))):Og(e,t)},isForward:m,setNode:t=>(i(e.getOuterHTML(t)),t),getNode:()=>((e,t)=>{if(!t)return e;let n=t.startContainer,o=t.endContainer;const r=t.startOffset,s=t.endOffset;let a=t.commonAncestorContainer;t.collapsed||(n===o&&s-r<2&&n.hasChildNodes()&&(a=n.childNodes[r]),er(n)&&er(o)&&(n=n.length===r?Lg(n.nextSibling,!0):n.parentNode,o=0===s?Lg(o.previousSibling,!1):o.parentNode,n&&n===o&&(a=n)));const i=er(a)?a.parentNode:a;return Vo(i)?i:e})(o.getBody(),c()),getSel:d,setRng:u,getRng:c,getStart:e=>Pg(o.getBody(),c(),e),getEnd:e=>Dg(o.getBody(),c(),e),getSelectedBlocks:(t,n)=>((e,t,n,o)=>{const r=[],s=e.getRoot(),a=e.getParent(n||Pg(s,t,t.collapsed),e.isBlock),i=e.getParent(o||Dg(s,t,t.collapsed),e.isBlock);if(a&&a!==s&&r.push(a),a&&i&&a!==i){let t;const n=new jo(a,s);for(;(t=n.next())&&t!==i;)e.isBlock(t)&&r.push(t)}return i&&a!==i&&i!==s&&r.push(i),r})(e,c(),t,n),normalize:()=>{const t=c(),n=d();if(!(Ju(n).length>1)&&am(o)){const n=Mf(e,t);return n.each((e=>{u(e,m())})),n.getOr(t)}return t},selectorChanged:(e,t)=>(a(e,t),f),selectorChangedWithUnbind:a,getScrollContainer:()=>{let t,n=e.getRoot();for(;n&&"BODY"!==n.nodeName;){if(n.scrollHeight>n.clientHeight){t=n;break}n=n.parentNode}return t},scrollIntoView:(e,t)=>{C(e)?((e,t,n)=>{(e.inline?ng:rg)(e,t,n)})(o,e,t):sg(o,c(),t)},placeCaretAt:(e,t)=>u(Rf(e,t,o.getDoc())),getBoundingClientRect:()=>{const e=c();return e.collapsed?Vi.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:()=>{t=r=s=null,p.destroy()}},g=Jm(f),p=mf(f,o);return f.bookmarkManager=g,f.controlSelection=p,f},sw=(e,t,n)=>{-1===Pt.inArray(t,n)&&(e.addAttributeFilter(n,((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.push(n))},aw=(e,t)=>{const n=["data-mce-selected"],o={entity_encoding:"named",remove_trailing_brs:!0,pad_empty_with_br:!1,...e},r=t&&t.dom?t.dom:za.DOM,s=t&&t.schema?t.schema:ua(o),a=bC(o,s);return((e,t,n)=>{e.addAttributeFilter("data-mce-tabindex",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];o.attr("tabindex",o.attr("data-mce-tabindex")),o.attr(t,null)}})),e.addAttributeFilter("src,href,style",((e,o)=>{const r="data-mce-"+o,s=t.url_converter,a=t.url_converter_scope;let i=e.length;for(;i--;){const t=e[i];let l=t.attr(r);void 0!==l?(t.attr(o,l.length>0?l:null),t.attr(r,null)):(l=t.attr(o),"style"===o?l=n.serializeStyle(n.parseStyle(l),t.name):s&&(l=s.call(a,l,o,t.name)),t.attr(o,l.length>0?l:null))}})),e.addAttributeFilter("class",(e=>{let t=e.length;for(;t--;){const n=e[t];let o=n.attr("class");o&&(o=o.replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",o.length>0?o:null))}})),e.addAttributeFilter("data-mce-type",((e,t,n)=>{let o=e.length;for(;o--;){const t=e[o];if("bookmark"===t.attr("data-mce-type")&&!n.cleanup){const e=I.from(t.firstChild).exists((e=>{var t;return!Pr(null!==(t=e.value)&&void 0!==t?t:"")}));e?t.unwrap():t.remove()}}})),e.addNodeFilter("script,style",((e,n)=>{var o;const r=e=>e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"");let s=e.length;for(;s--;){const a=e[s],i=a.firstChild,l=null!==(o=null==i?void 0:i.value)&&void 0!==o?o:"";if("script"===n){const e=a.attr("type");e&&a.attr("type","mce-no/type"===e?null:e.replace(/^mce\-/,"")),"xhtml"===t.element_format&&i&&l.length>0&&(i.value="// <![CDATA[\n"+r(l)+"\n// ]]>")}else"xhtml"===t.element_format&&i&&l.length>0&&(i.value="\x3c!--\n"+r(l)+"\n--\x3e")}})),e.addNodeFilter("#comment",(e=>{let o=e.length;for(;o--;){const r=e[o],s=r.value;t.preserve_cdata&&0===(null==s?void 0:s.indexOf("[CDATA["))?(r.name="#cdata",r.type=4,r.value=n.decode(s.replace(/^\[CDATA\[|\]\]$/g,""))):0===(null==s?void 0:s.indexOf("mce:protected "))&&(r.name="#text",r.type=3,r.raw=!0,r.value=unescape(s).substr(14))}})),e.addNodeFilter("xml:namespace,input",((e,t)=>{let n=e.length;for(;n--;){const o=e[n];7===o.type?o.remove():1===o.type&&("input"!==t||o.attr("type")||o.attr("type","text"))}})),e.addAttributeFilter("data-mce-type",(t=>{V(t,(t=>{"format-caret"===t.attr("data-mce-type")&&(t.isEmpty(e.schema.getNonEmptyElements())?t.remove():t.unwrap())}))})),e.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-block,data-mce-type,data-mce-resize,data-mce-placeholder",((e,t)=>{let n=e.length;for(;n--;)e[n].attr(t,null)})),t.remove_trailing_brs&&Wv(t,e,e.schema)})(a,o,r),{schema:s,addNodeFilter:a.addNodeFilter,addAttributeFilter:a.addAttributeFilter,serialize:(e,n={})=>{const i={format:"html",...n},l=((e,t,n)=>((e,t)=>C(e)&&e.hasEventListeners("PreProcess")&&!t.no_events)(e,n)?((e,t,n)=>{let o;const r=e.dom;let s=t.cloneNode(!0);const a=document.implementation;if(a.createHTMLDocument){const e=a.createHTMLDocument("");Pt.each("BODY"===s.nodeName?s.childNodes:[s],(t=>{e.body.appendChild(e.importNode(t,!0))})),s="BODY"!==s.nodeName?e.body.firstChild:e.body,o=r.doc,r.doc=e}return((e,t)=>{e.dispatch("PreProcess",t)})(e,{...n,node:s}),o&&(r.doc=o),s})(e,t,n):t)(t,e,i),d=((e,t,n)=>{const o=Dr(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||Ar(yn(t))?o:Pt.trim(o)})(r,l,i),c=((e,t,n)=>{const o=n.selection?{forced_root_block:!1,...n}:n,r=e.parse(t,o);return(e=>{const t=e=>"br"===(null==e?void 0:e.name),n=e.lastChild;if(t(n)){const e=n.prev;t(e)&&(n.remove(),e.remove())}})(r),r})(a,d,i);return"tree"===i.format?c:((e,t,n,o,r)=>{const s=((e,t,n)=>up(e,t).serialize(n))(t,n,o);return((e,t,n)=>{if(!t.no_events&&e){const o=((e,t)=>e.dispatch("PostProcess",t))(e,{...t,content:n});return o.content}return n})(e,r,s)})(t,o,s,c,i)},addRules:s.addValidElements,setRules:s.setValidElements,addTempAttr:T(sw,a,n),getTempAttrs:N(n),getNodeFilters:a.getNodeFilters,getAttributeFilters:a.getAttributeFilters,removeNodeFilter:a.removeNodeFilter,removeAttributeFilter:a.removeAttributeFilter}},iw=(e,t)=>{const n=aw(e,t);return{schema:n.schema,addNodeFilter:n.addNodeFilter,addAttributeFilter:n.addAttributeFilter,serialize:n.serialize,addRules:n.addRules,setRules:n.setRules,addTempAttr:n.addTempAttr,getTempAttrs:n.getTempAttrs,getNodeFilters:n.getNodeFilters,getAttributeFilters:n.getAttributeFilters,removeNodeFilter:n.removeNodeFilter,removeAttributeFilter:n.removeAttributeFilter}},lw=(e,t,n={})=>{const o=((e,t)=>({format:"html",...e,set:!0,content:t}))(n,t);return wC(e,o).map((t=>{const n=((e,t,n)=>QC(e).editor.setContent(t,n))(e,t.content,t);return xC(e,n.html,t),n.content})).getOr(t)},dw="autoresize_on_init,content_editable_state,padd_empty_with_br,block_elements,boolean_attributes,editor_deselector,editor_selector,elements,file_browser_callback_types,filepicker_validator_handler,force_hex_style_colors,force_p_newlines,gecko_spellcheck,images_dataimg_filter,media_scripts,mode,move_caret_before_on_enter_elements,non_empty_elements,self_closing_elements,short_ended_elements,special,spellchecker_select_languages,spellchecker_whitelist,tab_focus,tabfocus_elements,table_responsive_width,text_block_elements,text_inline_elements,toolbar_drawer,types,validate,whitespace_elements,paste_enable_default_filters,paste_filter_drop,paste_word_valid_elements,paste_retain_style_properties,paste_convert_word_fake_lists".split(","),cw="template_cdate_classes,template_mdate_classes,template_selected_content_classes,template_preview_replace_values,template_replace_values,templates,template_cdate_format,template_mdate_format".split(","),uw="bbcode,colorpicker,contextmenu,fullpage,legacyoutput,spellchecker,textcolor".split(","),mw=[{name:"template",replacedWith:"Advanced Template"},{name:"rtc"}],fw=(e,t)=>{const n=Y(t,(t=>Ee(e,t)));return ae(n)},gw=e=>{const t=fw(e,dw),n=e.forced_root_block;return!1!==n&&""!==n||t.push("forced_root_block (false only)"),ae(t)},pw=e=>fw(e,cw),hw=(e,t)=>{const n=Pt.makeMap(e.plugins," "),o=Y(t,(e=>Ee(n,e)));return ae(o)},bw=e=>hw(e,uw),vw=e=>hw(e,mw.map((e=>e.name))),yw=e=>J(mw,(t=>t.name===e)).fold((()=>e),(t=>t.replacedWith?`${e}, replaced by ${t.replacedWith}`:e)),Cw=za.DOM,ww=e=>I.from(e).each((e=>e.destroy())),xw=(()=>{const e={};return{add:(t,n)=>{e[t]=n},get:t=>e[t]?e[t]:{icons:{}},has:t=>Ee(e,t)}})(),Ew=Ya.ModelManager,_w=(e,t)=>t.dom[e],kw=(e,t)=>parseInt(co(t,e),10),Sw=T(_w,"clientWidth"),Nw=T(_w,"clientHeight"),Rw=T(kw,"margin-top"),Aw=T(kw,"margin-left"),Tw=e=>{const t=[],n=()=>{const t=e.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a NotificationManager implementation.")};return{open:e,close:e,getArgs:e}})()},o=()=>I.from(t[0]),r=()=>{V(t,(e=>{e.reposition()}))},s=e=>{Z(t,(t=>t===e)).each((e=>{t.splice(e,1)}))},a=(a,i=!0)=>e.removed||!(e=>{return(t=e.inline?e.getBody():e.getContentAreaContainer(),I.from(t).map(yn)).map(Gn).getOr(!1);var t})(e)?{}:(i&&e.dispatch("BeforeOpenNotification",{notification:a}),J(t,(e=>{return t=n().getArgs(e),o=a,!(t.type!==o.type||t.text!==o.text||t.progressBar||t.timeout||o.progressBar||o.timeout);var t,o})).getOrThunk((()=>{e.editorManager.setActive(e);const i=n().open(a,(()=>{s(i),r(),Ag(e)&&o().fold((()=>e.focus()),(e=>ag(yn(e.getEl()))))}));return(e=>{t.push(e)})(i),r(),e.dispatch("OpenNotification",{notification:{...i}}),i}))),i=N(t);return(e=>{e.on("SkinLoaded",(()=>{const t=gd(e);t&&a({text:t,type:"warning",timeout:0},!1),r()})),e.on("show ResizeEditor ResizeWindow NodeChange",(()=>{requestAnimationFrame(r)})),e.on("remove",(()=>{V(t.slice(),(e=>{n().close(e)}))}))})(e),{open:a,close:()=>{o().each((e=>{n().close(e),s(e),r()}))},getNotifications:i}},Ow=Ya.PluginManager,Bw=Ya.ThemeManager,Pw=e=>{let t=[];const n=()=>{const t=e.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():(()=>{const e=()=>{throw new Error("Theme did not provide a WindowManager implementation.")};return{open:e,openUrl:e,alert:e,confirm:e,close:e}})()},o=(e,t)=>(...n)=>t?t.apply(e,n):void 0,r=n=>{(t=>{e.dispatch("CloseWindow",{dialog:t})})(n),t=Y(t,(e=>e!==n)),0===t.length&&e.focus()},s=n=>{e.editorManager.setActive(e),pg(e),e.ui.show();const o=n();return(n=>{t.push(n),(t=>{e.dispatch("OpenWindow",{dialog:t})})(n)})(o),o};return e.on("remove",(()=>{V(t,(e=>{n().close(e)}))})),{open:(e,t)=>s((()=>n().open(e,t,r))),openUrl:e=>s((()=>n().openUrl(e,r))),alert:(e,t,r)=>{const s=n();s.alert(e,o(r||s,t))},confirm:(e,t,r)=>{const s=n();s.confirm(e,o(r||s,t))},close:()=>{I.from(t[t.length-1]).each((e=>{n().close(e),r(e)}))}}},Dw=(e,t)=>{e.notificationManager.open({type:"error",text:t})},Lw=(e,t)=>{e._skinLoaded?Dw(e,t):e.on("SkinLoaded",(()=>{Dw(e,t)}))},Mw=(e,t,n)=>{ef(e,t,{message:n}),console.error(n)},Iw=(e,t,n)=>n?`Failed to load ${e}: ${n} from url ${t}`:`Failed to load ${e} url: ${t}`,Fw=(e,...t)=>{const n=window.console;n&&(n.error?n.error(e,...t):n.log(e,...t))},Uw=e=>"content/"+e+"/content.css",zw=(e,t)=>{const n=e.editorManager.baseURL+"/skins/content",o=`content${e.editorManager.suffix}.css`;return q(t,(t=>(e=>tinymce.Resource.has(Uw(e)))(t)?t:(e=>/^[a-z0-9\-]+$/i.test(e))(t)&&!e.inline?`${n}/${t}/${o}`:e.documentBaseURI.toAbsolute(t)))},jw=(e,t)=>{const n={};return{findAll:(o,r=M)=>{const s=Y((e=>e?ce(e.getElementsByTagName("img")):[])(o),(t=>{const n=t.src;return!t.hasAttribute("data-mce-bogus")&&!t.hasAttribute("data-mce-placeholder")&&!(!n||n===At.transparentSrc)&&(He(n,"blob:")?!e.isUploaded(n)&&r(t):!!He(n,"data:")&&r(t))})),a=q(s,(e=>{const o=e.src;if(Ee(n,o))return n[o].then((t=>m(t)?t:{image:e,blobInfo:t.blobInfo}));{const r=((e,t)=>{const n=()=>Promise.reject("Invalid data URI");if(He(t,"blob:")){const s=e.getByUri(t);return C(s)?Promise.resolve(s):(o=t,He(o,"blob:")?(e=>fetch(e).then((e=>e.ok?e.blob():Promise.reject())).catch((()=>Promise.reject({message:`Cannot convert ${e} to Blob. Resource might not exist or is inaccessible.`,uriType:"blob"}))))(o):He(o,"data:")?(r=o,new Promise(((e,t)=>{Kv(r).bind((({type:e,data:t,base64Encoded:n})=>Yv(e,t,n))).fold((()=>t("Invalid data URI")),e)}))):Promise.reject("Unknown URI format")).then((t=>Gv(t).then((o=>Qv(o,!1,(n=>I.some(Jv(e,t,n)))).getOrThunk(n)))))}var o,r;return He(t,"data:")?Zv(e,t).fold(n,(e=>Promise.resolve(e))):Promise.reject("Unknown image data format")})(t,o).then((t=>(delete n[o],{image:e,blobInfo:t}))).catch((e=>(delete n[o],e)));return n[o]=r,r}}));return Promise.all(a)}}},Hw=()=>{let e={};const t=(e,t)=>({status:e,resultUri:t}),n=t=>t in e;return{hasBlobUri:n,getResultUri:t=>{const n=e[t];return n?n.resultUri:null},isPending:t=>!!n(t)&&1===e[t].status,isUploaded:t=>!!n(t)&&2===e[t].status,markPending:n=>{e[n]=t(1,null)},markUploaded:(n,o)=>{e[n]=t(2,o)},removeFailed:t=>{delete e[t]},destroy:()=>{e={}}}};let $w=0;const qw=(e,t)=>{const n={},o=(e,n)=>new Promise(((o,r)=>{const s=new XMLHttpRequest;s.open("POST",t.url),s.withCredentials=t.credentials,s.upload.onprogress=e=>{n(e.loaded/e.total*100)},s.onerror=()=>{r("Image upload failed due to a XHR Transport error. Code: "+s.status)},s.onload=()=>{if(s.status<200||s.status>=300)return void r("HTTP Error: "+s.status);const e=JSON.parse(s.responseText);var n,a;e&&m(e.location)?o((n=t.basePath,a=e.location,n?n.replace(/\/$/,"")+"/"+a.replace(/^\//,""):a)):r("Invalid JSON: "+s.responseText)};const a=new FormData;a.append("file",e.blob(),e.filename()),s.send(a)})),r=w(t.handler)?t.handler:o,s=(e,t)=>({url:t,blobInfo:e,status:!0}),a=(e,t)=>({url:"",blobInfo:e,status:!1,error:t}),i=(e,t)=>{Pt.each(n[e],(e=>{e(t)})),delete n[e]};return{upload:(l,d)=>t.url||r!==o?((t,o)=>(t=Pt.grep(t,(t=>!e.isUploaded(t.blobUri()))),Promise.all(Pt.map(t,(t=>e.isPending(t.blobUri())?(e=>{const t=e.blobUri();return new Promise((e=>{n[t]=n[t]||[],n[t].push(e)}))})(t):((t,n,o)=>(e.markPending(t.blobUri()),new Promise((r=>{let l,d;try{const c=()=>{l&&(l.close(),d=_)},u=n=>{c(),e.markUploaded(t.blobUri(),n),i(t.blobUri(),s(t,n)),r(s(t,n))},f=n=>{c(),e.removeFailed(t.blobUri()),i(t.blobUri(),a(t,n)),r(a(t,n))};d=e=>{e<0||e>100||I.from(l).orThunk((()=>I.from(o).map(P))).each((t=>{l=t,t.progressBar.value(e)}))},n(t,d).then(u,(e=>{f(m(e)?{message:e}:e)}))}catch(e){r(a(t,e))}}))))(t,r,o))))))(l,d):new Promise((e=>{e([])}))}},Vw=e=>()=>e.notificationManager.open({text:e.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0}),Ww=(e,t)=>qw(t,{url:Gl(e),basePath:Xl(e),credentials:Ql(e),handler:Jl(e)}),Kw=e=>{const t=(()=>{let e=[];const t=e=>{if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");const t=e.id||"blobid"+$w+++(()=>{const e=()=>Math.round(4294967295*Math.random()).toString(36);return"s"+(new Date).getTime().toString(36)+e()+e()+e()})(),n=e.name||t,o=e.blob;var r;return{id:N(t),name:N(n),filename:N(e.filename||n+"."+(r=o.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png","image/apng":"apng","image/avif":"avif","image/svg+xml":"svg","image/webp":"webp","image/bmp":"bmp","image/tiff":"tiff"}[r.toLowerCase()]||"dat")),blob:N(o),base64:N(e.base64),blobUri:N(e.blobUri||URL.createObjectURL(o)),uri:N(e.uri)}},n=t=>J(e,t).getOrUndefined(),o=e=>n((t=>t.id()===e));return{create:(e,n,o,r,s)=>{if(m(e))return t({id:e,name:r,filename:s,blob:n,base64:o});if(f(e))return t(e);throw new Error("Unknown input type")},add:t=>{o(t.id())||e.push(t)},get:o,getByUri:e=>n((t=>t.blobUri()===e)),getByData:(e,t)=>n((n=>n.base64()===e&&n.blob().type===t)),findFirst:n,removeByUri:t=>{e=Y(e,(e=>e.blobUri()!==t||(URL.revokeObjectURL(e.blobUri()),!1)))},destroy:()=>{V(e,(e=>{URL.revokeObjectURL(e.blobUri())})),e=[]}}})();let n,o;const r=Hw(),s=[],a=t=>n=>e.selection?t(n):[],i=(e,t,n)=>{let o=0;do{o=e.indexOf(t,o),-1!==o&&(e=e.substring(0,o)+n+e.substr(o+t.length),o+=n.length-t.length+1)}while(-1!==o);return e},l=(e,t,n)=>{const o=`src="${n}"${n===At.transparentSrc?' data-mce-placeholder="1"':""}`;return e=i(e,`src="${t}"`,o),i(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},d=(t,n)=>{V(e.undoManager.data,(e=>{"fragmented"===e.type?e.fragments=q(e.fragments,(e=>l(e,t,n))):e.content=l(e.content,t,n)}))},c=()=>(n||(n=Ww(e,r)),p().then(a((o=>{const r=q(o,(e=>e.blobInfo));return n.upload(r,Vw(e)).then(a((n=>{const r=[];let s=!1;const a=q(n,((n,a)=>{const{blobInfo:i,image:l}=o[a];let c=!1;return n.status&&Wl(e)?(n.url&&!je(l.src,n.url)&&(s=!0),t.removeByUri(l.src),XC(e)||((t,n)=>{const o=e.convertURL(n,"src");var r;d(t.src,n),Zt(yn(t),{src:Vl(e)?(r=n,r+(-1===r.indexOf("?")?"?":"&")+(new Date).getTime()):n,"data-mce-src":o})})(l,n.url)):n.error&&(n.error.remove&&(d(l.src,At.transparentSrc),r.push(l),c=!0),((e,t)=>{Lw(e,Ka.translate(["Failed to upload image: {0}",t]))})(e,n.error.message)),{element:l,status:n.status,uploadUri:n.url,blobInfo:i,removed:c}}));return r.length>0&&!XC(e)?e.undoManager.transact((()=>{V(_o(r),(n=>{const o=An(n);xo(n),o.each((e=>t=>{((e,t)=>e.dom.isEmpty(t.dom)&&C(e.schema.getTextBlockElements()[Ht(t)]))(e,t)&&vo(t,hn('<br data-mce-bogus="1" />'))})(e)),t.removeByUri(n.dom.src)}))})):s&&e.undoManager.dispatchChange(),a})))})))),u=()=>ql(e)?c():Promise.resolve([]),g=e=>ne(s,(t=>t(e))),p=()=>(o||(o=jw(r,t)),o.findAll(e.getBody(),g).then(a((t=>{const n=Y(t,(t=>m(t)?(Lw(e,t),!1):"blob"!==t.uriType));return XC(e)||V(n,(e=>{d(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")})),n})))),h=n=>n.replace(/src="(blob:[^"]+)"/g,((n,o)=>{const s=r.getResultUri(o);if(s)return'src="'+s+'"';let a=t.getByUri(o);return a||(a=X(e.editorManager.get(),((e,t)=>e||t.editorUpload&&t.editorUpload.blobCache.getByUri(o)),void 0)),a?'src="data:'+a.blob().type+";base64,"+a.base64()+'"':n}));return e.on("SetContent",(()=>{ql(e)?u():p()})),e.on("RawSaveContent",(e=>{e.content=h(e.content)})),e.on("GetContent",(e=>{e.source_view||"raw"===e.format||"tree"===e.format||(e.content=h(e.content))})),e.on("PostRender",(()=>{e.parser.addNodeFilter("img",(e=>{V(e,(e=>{const n=e.attr("src");if(!n||t.getByUri(n))return;const o=r.getResultUri(n);o&&e.attr("src",o)}))}))})),{blobCache:t,addFilter:e=>{s.push(e)},uploadImages:c,uploadImagesAuto:u,scanForImages:p,destroy:()=>{t.destroy(),r.destroy(),o=n=null}}},Yw={remove_similar:!0,inherit:!1},Gw={selector:"td,th",...Yw},Xw={tablecellbackgroundcolor:{styles:{backgroundColor:"%value"},...Gw},tablecellverticalalign:{styles:{"vertical-align":"%value"},...Gw},tablecellbordercolor:{styles:{borderColor:"%value"},...Gw},tablecellclass:{classes:["%value"],...Gw},tableclass:{selector:"table",classes:["%value"],...Yw},tablecellborderstyle:{styles:{borderStyle:"%value"},...Gw},tablecellborderwidth:{styles:{borderWidth:"%value"},...Gw}},Qw=N(Xw),Jw=Pt.each,Zw=za.DOM,ex=e=>C(e)&&f(e),tx=(e,t)=>{const n=t&&t.schema||ua({}),o=e=>{const t=m(e)?{name:e,classes:[],attrs:{}}:e,n=Zw.create(t.name);return((e,t)=>{t.classes.length>0&&Zw.addClass(e,t.classes.join(" ")),Zw.setAttribs(e,t.attrs)})(n,t),n},r=(e,t,s)=>{let a;const i=t[0],l=ex(i)?i.name:void 0,d=((e,t)=>{const o=n.getElementRule(e.nodeName.toLowerCase()),r=null==o?void 0:o.parentsRequired;return!(!r||!r.length)&&(t&&H(r,t)?t:r[0])})(e,l);if(d)l===d?(a=i,t=t.slice(1)):a=d;else if(i)a=i,t=t.slice(1);else if(!s)return e;const c=a?o(a):Zw.create("div");c.appendChild(e),s&&Pt.each(s,(t=>{const n=o(t);c.insertBefore(n,e)}));const u=ex(a)?a.siblings:void 0;return r(c,t,u)},s=Zw.create("div");if(e.length>0){const t=e[0],n=o(t),a=ex(t)?t.siblings:void 0;s.appendChild(r(n,e.slice(1),a))}return s},nx=e=>{let t="div";const n={name:t,classes:[],attrs:{},selector:e=Pt.trim(e)};return"*"!==e&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,((e,t,o,r,s)=>{switch(t){case"#":n.attrs.id=o;break;case".":n.classes.push(o);break;case":":-1!==Pt.inArray("checked disabled enabled read-only required".split(" "),o)&&(n.attrs[o]=o)}if("["===r){const e=s.match(/([\w\-]+)(?:\=\"([^\"]+))?/);e&&(n.attrs[e[1]]=e[2])}return""}))),n.name=t||"div",n},ox=(e,t)=>{let n="",o=wd(e);if(""===o)return"";const r=e=>m(e)?e.replace(/%(\w+)/g,""):"",s=(t,n)=>Zw.getStyle(null!=n?n:e.getBody(),t,!0);if(m(t)){const n=e.formatter.get(t);if(!n)return"";t=n[0]}if("preview"in t){const e=t.preview;if(!1===e)return"";o=e||o}let a,i=t.block||t.inline||"span";const l=(d=t.selector,m(d)?(d=(d=d.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Pt.map(d.split(/(?:>|\s+(?![^\[\]]+\]))/),(e=>{const t=Pt.map(e.split(/(?:~\+|~|\+)/),nx),n=t.pop();return t.length&&(n.siblings=t),n})).reverse()):[]);var d;l.length>0?(l[0].name||(l[0].name=i),i=t.selector,a=tx(l,e)):a=tx([i],e);const c=Zw.select(i,a)[0]||a.firstChild;Jw(t.styles,((e,t)=>{const n=r(e);n&&Zw.setStyle(c,t,n)})),Jw(t.attributes,((e,t)=>{const n=r(e);n&&Zw.setAttrib(c,t,n)})),Jw(t.classes,(e=>{const t=r(e);Zw.hasClass(c,t)||Zw.addClass(c,t)})),e.dispatch("PreviewFormats"),Zw.setStyles(a,{position:"absolute",left:-65535}),e.getBody().appendChild(a);const u=s("fontSize"),f=/px$/.test(u)?parseInt(u,10):0;return Jw(o.split(" "),(e=>{let t=s(e,c);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=s(e),"#ffffff"===Ca(t).toLowerCase())||"color"===e&&"#000000"===Ca(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===f)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*f+"px"}"border"===e&&t&&(n+="padding:0 2px;"),n+=e+":"+t+";"}})),e.dispatch("AfterPreviewFormats"),Zw.remove(a),n},rx=e=>{const t=(e=>{const t={},n=(e,o)=>{e&&(m(e)?(p(o)||(o=[o]),V(o,(e=>{v(e.deep)&&(e.deep=!Sm(e)),v(e.split)&&(e.split=!Sm(e)||Nm(e)),v(e.remove)&&Sm(e)&&!Nm(e)&&(e.remove="none"),Sm(e)&&Nm(e)&&(e.mixed=!0,e.block_expand=!0),m(e.classes)&&(e.classes=e.classes.split(/\s+/))})),t[e]=o):ge(e,((e,t)=>{n(t,e)})))};return n((e=>{const t=e.dom,n=e.schema.type,o={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"left"},inherit:!1,preview:!1},{selector:"img,audio,video",collapsed:!1,styles:{float:"left"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginLeft:"0px",marginRight:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"},{selector:".mce-preview-object",ceFalseOverride:!0,styles:{display:"table",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{marginLeft:"auto",marginRight:"auto"},preview:!1}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size"},{selector:"img,audio,video",collapsed:!1,styles:{float:"right"},preview:"font-family font-size"},{selector:"table",collapsed:!1,styles:{marginRight:"0px",marginLeft:"auto"},onformat:e=>{t.setStyle(e,"float",null)},preview:"font-family font-size"},{selector:".mce-preview-object,[data-ephox-embed-iri]",ceFalseOverride:!0,styles:{float:"right"},preview:!1}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li,pre",styles:{textAlign:"justify"},inherit:!1,preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all",preserve_attributes:["class","style"]}],italic:[{inline:"em",remove:"all",preserve_attributes:["class","style"]},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all",preserve_attributes:["class","style"]}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all",preserve_attributes:["class","style"]}],strikethrough:(()=>{const e={inline:"span",styles:{textDecoration:"line-through"},exact:!0},t={inline:"strike",remove:"all",preserve_attributes:["class","style"]},o={inline:"s",remove:"all",preserve_attributes:["class","style"]};return"html4"!==n?[o,e,t]:[e,o,t]})(),forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},lineheight:{selector:"h1,h2,h3,h4,h5,h6,p,li,td,th,div",styles:{lineHeight:"%value"}},fontsize_class:{inline:"span",attributes:{class:"%value"}},blockquote:{block:"blockquote",wrapper:!0,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:(e,t,n)=>qo(e)&&e.hasAttribute("href"),onformat:(e,n,o)=>{Pt.each(o,((n,o)=>{t.setAttrib(e,o,n)}))}},lang:{inline:"span",clear_child_styles:!0,remove_similar:!0,attributes:{lang:"%value","data-mce-lang":e=>{var t;return null!==(t=null==e?void 0:e.customValue)&&void 0!==t?t:null}}},removeformat:[{selector:"b,strong,em,i,font,u,strike,s,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins,small",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Pt.each("p h1 h2 h3 h4 h5 h6 div address pre dt dd samp".split(/\s/),(e=>{o[e]={block:e,remove:"all"}})),o})(e)),n(Qw()),n(Cd(e)),{get:e=>C(e)?t[e]:t,has:e=>Ee(t,e),register:n,unregister:e=>(e&&t[e]&&delete t[e],t)}})(e),n=$a({});return(e=>{e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(let t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])})(e),(e=>{e.on("mouseup keydown",(t=>{var n;((e,t,n)=>{const o=e.selection,r=e.getBody();Kb(e,null,n),8!==t&&46!==t||!o.isCollapsed()||o.getStart().innerHTML!==$b||Kb(e,Lu(r,o.getStart()),!0),37!==t&&39!==t||Kb(e,Lu(r,o.getStart()),!0)})(e,t.keyCode,(n=e.selection.getRng().endContainer,er(n)&&$e(n.data,br)))}))})(e),XC(e)||((e,t)=>{e.set({}),t.on("NodeChange",(n=>{Hv(t,n.element,e.get())})),t.on("FormatApply FormatRemove",(n=>{const o=I.from(n.node).map((e=>dm(e)?e:e.startContainer)).bind((e=>qo(e)?I.some(e):I.from(e.parentElement))).getOrThunk((()=>Uv(t)));Hv(t,o,e.get())}))})(n,e),{get:t.get,has:t.has,register:t.register,unregister:t.unregister,apply:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.apply(t,n,o)})(e,t,n,o)},remove:(t,n,o,r)=>{((e,t,n,o,r)=>{JC(e).formatter.remove(t,n,o,r)})(e,t,n,o,r)},toggle:(t,n,o)=>{((e,t,n,o)=>{JC(e).formatter.toggle(t,n,o)})(e,t,n,o)},match:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.match(t,n,o,r))(e,t,n,o,r),closest:t=>((e,t)=>JC(e).formatter.closest(t))(e,t),matchAll:(t,n)=>((e,t,n)=>JC(e).formatter.matchAll(t,n))(e,t,n),matchNode:(t,n,o,r)=>((e,t,n,o,r)=>JC(e).formatter.matchNode(t,n,o,r))(e,t,n,o,r),canApply:t=>((e,t)=>JC(e).formatter.canApply(t))(e,t),formatChanged:(t,o,r,s)=>((e,t,n,o,r,s)=>JC(e).formatter.formatChanged(t,n,o,r,s))(e,n,t,o,r,s),getCssText:T(ox,e)}},sx=e=>{switch(e.toLowerCase()){case"undo":case"redo":case"mcefocus":return!0;default:return!1}},ax=e=>{const t=Xa(),n=$a(0),o=$a(0),r={data:[],typing:!1,beforeChange:()=>{((e,t,n)=>{JC(e).undoManager.beforeChange(t,n)})(e,n,t)},add:(s,a)=>((e,t,n,o,r,s,a)=>JC(e).undoManager.add(t,n,o,r,s,a))(e,r,o,n,t,s,a),dispatchChange:()=>{e.setDirty(!0);const t=jC(e);t.bookmark=ml(e.selection),e.dispatch("change",{level:t,lastLevel:ie(r.data,o.get()).getOrUndefined()})},undo:()=>((e,t,n,o)=>JC(e).undoManager.undo(t,n,o))(e,r,n,o),redo:()=>((e,t,n)=>JC(e).undoManager.redo(t,n))(e,o,r.data),clear:()=>{((e,t,n)=>{JC(e).undoManager.clear(t,n)})(e,r,o)},reset:()=>{((e,t)=>{JC(e).undoManager.reset(t)})(e,r)},hasUndo:()=>((e,t,n)=>JC(e).undoManager.hasUndo(t,n))(e,r,o),hasRedo:()=>((e,t,n)=>JC(e).undoManager.hasRedo(t,n))(e,r,o),transact:t=>((e,t,n,o)=>JC(e).undoManager.transact(t,n,o))(e,r,n,t),ignore:t=>{((e,t,n)=>{JC(e).undoManager.ignore(t,n)})(e,n,t)},extra:(t,n)=>{((e,t,n,o,r)=>{JC(e).undoManager.extra(t,n,o,r)})(e,r,o,t,n)}};return XC(e)||((e,t,n)=>{const o=$a(!1),r=e=>{KC(t,!1,n),t.add({},e)};e.on("init",(()=>{t.add()})),e.on("BeforeExecCommand",(e=>{const o=e.command;sx(o)||(YC(t,n),t.beforeChange())})),e.on("ExecCommand",(e=>{const t=e.command;sx(t)||r(e)})),e.on("ObjectResizeStart cut",(()=>{t.beforeChange()})),e.on("SaveContent ObjectResized blur",r),e.on("dragend",r),e.on("keyup",(n=>{const s=n.keyCode;if(n.isDefaultPrevented())return;const a=At.os.isMacOS()&&"Meta"===n.key;(s>=33&&s<=36||s>=37&&s<=40||45===s||n.ctrlKey||a)&&(r(),e.nodeChanged()),46!==s&&8!==s||e.nodeChanged(),o.get()&&t.typing&&!VC(jC(e),t.data[0])&&(e.isDirty()||e.setDirty(!0),e.dispatch("TypingUndo"),o.set(!1),e.nodeChanged())})),e.on("keydown",(e=>{const s=e.keyCode;if(e.isDefaultPrevented())return;if(s>=33&&s<=36||s>=37&&s<=40||45===s)return void(t.typing&&r(e));const a=e.ctrlKey&&!e.altKey||e.metaKey;if((s<16||s>20)&&224!==s&&91!==s&&!t.typing&&!a)return t.beforeChange(),KC(t,!0,n),t.add({},e),void o.set(!0);(At.os.isMacOS()?e.metaKey:e.ctrlKey&&!e.altKey)&&t.beforeChange()})),e.on("mousedown",(e=>{t.typing&&r(e)})),e.on("input",(e=>{var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data||(e=>"insertFromPaste"===e.inputType||"insertFromDrop"===e.inputType)(e))&&r(e)})),e.on("AddUndo Undo Redo ClearUndos",(t=>{t.isDefaultPrevented()||e.nodeChanged()}))})(e,r,n),(e=>{e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo")})(e),r},ix=[9,27,af.HOME,af.END,19,20,44,144,145,33,34,45,16,17,18,91,92,93,af.DOWN,af.UP,af.LEFT,af.RIGHT].concat(At.browser.isFirefox()?[224]:[]),lx="data-mce-placeholder",dx=e=>"keydown"===e.type||"keyup"===e.type,cx=e=>{const t=e.keyCode;return t===af.BACKSPACE||t===af.DELETE},ux=(e,t)=>({from:e,to:t}),mx=(e,t)=>{const n=yn(e),o=yn(t.container());return Ah(n,o).map((e=>((e,t)=>({block:e,position:t}))(e,t)))},fx=(e,t)=>Jn(t,(e=>Rr(e)||lr(e.dom)),(t=>_n(t,e))).filter(Wt).getOr(e),gx=(e,t)=>{const n=((e,t)=>{const n=Mn(e);return Z(n,(e=>t.isBlock(Ht(e)))).fold(N(n),(e=>n.slice(0,e)))})(e,t);return V(n,xo),n},px=(e,t)=>{const n=Bp(t,e);return J(n.reverse(),(e=>gs(e))).each(xo)},hx=(e,t,n,o,r)=>{if(gs(n))return Or(n),Ou(n.dom);0===Y(Dn(r),(e=>!gs(e))).length&&gs(t)&&po(r,bn("br"));const s=Tu(n.dom,Vi.before(r.dom));return V(gx(t,o),(e=>{po(r,e)})),px(e,t),s},bx=(e,t,n,o)=>{if(gs(n)){if(gs(t)){const e=e=>{const t=(e,n)=>Fn(e).fold((()=>n),(e=>((e,t)=>e.isInline(Ht(t)))(o,e)?t(e,n.concat(fi(e))):n));return t(e,[])},r=G(e(n),((e,t)=>(yo(e,t),t)),Tr());wo(t),vo(t,r)}return xo(n),Ou(t.dom)}const r=Bu(n.dom);return V(gx(t,o),(e=>{vo(n,e)})),px(e,t),r},vx=(e,t)=>{Ru(e,t.dom).bind((e=>I.from(e.getNode()))).map(yn).filter(Er).each(xo)},yx=(e,t,n,o)=>(vx(!0,t),vx(!1,n),((e,t)=>kn(t,e)?((e,t)=>{const n=Bp(t,e);return I.from(n[n.length-1])})(t,e):I.none())(t,n).fold(T(bx,e,t,n,o),T(hx,e,t,n,o))),Cx=(e,t,n,o,r)=>t?yx(e,o,n,r):yx(e,n,o,r),wx=(e,t)=>{const n=yn(e.getBody()),o=((e,t,n)=>n.collapsed?((e,t,n)=>{const o=mx(e,Vi.fromRangeStart(n)),r=o.bind((n=>ku(t,e,n.position).bind((n=>mx(e,n).map((n=>((e,t,n)=>ar(n.position.getNode())&&!gs(n.block)?Ru(!1,n.block.dom).bind((o=>o.isEqual(n.position)?ku(t,e,o).bind((t=>mx(e,t))):I.some(n))).getOr(n):n)(e,t,n)))))));return Mt(o,r,ux).filter((t=>(e=>!_n(e.from.block,e.to.block))(t)&&((e,t)=>{const n=yn(e);return _n(fx(n,t.from.block),fx(n,t.to.block))})(e,t)&&(e=>!1===dr(e.from.block.dom)&&!1===dr(e.to.block.dom))(t)&&(e=>{const t=e=>_r(e)||Ns(e.dom);return t(e.from.block)&&t(e.to.block)})(t)))})(e,t,n):I.none())(n.dom,t,e.selection.getRng()).map((o=>()=>{Cx(n,t,o.from.block,o.to.block,e.schema).each((t=>{e.selection.setRng(t.toRange())}))}));return o},xx=(e,t)=>{const n=yn(t),o=T(_n,e);return Qn(n,Rr,o).isSome()},Ex=e=>{const t=yn(e.getBody());return((e,t)=>{const n=Tu(e.dom,Vi.fromRangeStart(t)).isNone(),o=Au(e.dom,Vi.fromRangeEnd(t)).isNone();return!((e,t)=>xx(e,t.startContainer)||xx(e,t.endContainer))(e,t)&&n&&o})(t,e.selection.getRng())?(e=>I.some((()=>{e.setContent(""),e.selection.setCursorLocation()})))(e):((e,t,n)=>{const o=t.getRng();return Mt(Ah(e,yn(o.startContainer)),Ah(e,yn(o.endContainer)),((r,s)=>_n(r,s)?I.none():I.some((()=>{o.deleteContents(),Cx(e,!0,r,s,n).each((e=>{t.setRng(e.toRange())}))})))).getOr(I.none())})(t,e.selection,e.schema)},_x=(e,t)=>e.selection.isCollapsed()?I.none():Ex(e),kx=(e,t,n,o,r)=>I.from(t._selectionOverrides.showCaret(e,n,o,r)),Sx=(e,t)=>e.dispatch("BeforeObjectSelected",{target:t}).isDefaultPrevented()?I.none():I.some((e=>{const t=e.ownerDocument.createRange();return t.selectNode(e),t})(t)),Nx=(e,t,n)=>t.collapsed?((e,t,n)=>{const o=ru(1,e.getBody(),t),r=Vi.fromRangeStart(o),s=r.getNode();if(Lc(s))return kx(1,e,s,!r.isAtEnd(),!1);const a=r.getNode(!0);if(Lc(a))return kx(1,e,a,!1,!1);const i=lb(e.dom.getRoot(),r.getNode());return Lc(i)?kx(1,e,i,!1,n):I.none()})(e,t,n).getOr(t):t,Rx=e=>Ap(e)||kp(e),Ax=e=>Tp(e)||Sp(e),Tx=(e,t,n,o,r,s)=>{kx(o,e,s.getNode(!r),r,!0).each((n=>{if(t.collapsed){const e=t.cloneRange();r?e.setEnd(n.startContainer,n.startOffset):e.setStart(n.endContainer,n.endOffset),e.deleteContents()}else t.deleteContents();e.selection.setRng(n)})),((e,t)=>{er(t)&&0===t.data.length&&e.remove(t)})(e.dom,n)},Ox=(e,t)=>((e,t)=>{const n=e.selection.getRng();if(!er(n.commonAncestorContainer))return I.none();const o=t?cu.Forwards:cu.Backwards,r=wu(e.getBody()),s=T(lu,t?r.next:r.prev),a=t?Rx:Ax,i=au(o,e.getBody(),n),l=s(i),d=l?Eh(t,l):l;if(!d||!du(i,d))return I.none();if(a(d))return I.some((()=>Tx(e,n,i.getNode(),o,t,d)));const c=s(d);return c&&a(c)&&du(d,c)?I.some((()=>Tx(e,n,i.getNode(),o,t,c))):I.none()})(e,t),Bx=(e,t)=>{const n=e.getBody();return t?Ou(n).filter(Ap):Bu(n).filter(Tp)},Px=e=>{const t=e.selection.getRng();return!t.collapsed&&(Bx(e,!0).exists((e=>e.isEqual(Vi.fromRangeStart(t))))||Bx(e,!1).exists((e=>e.isEqual(Vi.fromRangeEnd(t)))))},Dx=hl([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Lx=(e,t,n,o)=>ku(t,e,n).bind((r=>{return s=r.getNode(),C(s)&&(Rr(yn(s))||Sr(yn(s)))||((e,t,n,o,r)=>{const s=t=>r.isInline(t.nodeName.toLowerCase())&&!Qc(n,o,e);return su(!t,n).fold((()=>su(t,o).fold(L,s)),s)})(e,t,n,r,o)?I.none():t&&dr(r.getNode())||!t&&dr(r.getNode(!0))?((e,t,n,o)=>{const r=o.getNode(!t);return Ah(yn(e),yn(n.getNode())).map((e=>gs(e)?Dx.remove(e.dom):Dx.moveToElement(r))).orThunk((()=>I.some(Dx.moveToElement(r))))})(e,t,n,r):t&&Tp(n)||!t&&Ap(n)?I.some(Dx.moveToPosition(r)):I.none();var s})),Mx=(e,t)=>I.from(lb(e.getBody(),t)),Ix=(e,t)=>{const n=e.selection.getNode();return Mx(e,n).filter(dr).fold((()=>((e,t,n,o)=>{const r=ru(t?1:-1,e,n),s=Vi.fromRangeStart(r),a=yn(e);return!t&&Tp(s)?I.some(Dx.remove(s.getNode(!0))):t&&Ap(s)?I.some(Dx.remove(s.getNode())):!t&&Ap(s)&&qp(a,s,o)?Vp(a,s,o).map((e=>Dx.remove(e.getNode()))):t&&Tp(s)&&$p(a,s,o)?Wp(a,s,o).map((e=>Dx.remove(e.getNode()))):((e,t,n,o)=>((e,t)=>{const n=t.getNode(!e),o=e?"after":"before";return qo(n)&&n.getAttribute("data-mce-caret")===o})(t,n)?((e,t)=>y(t)?I.none():e&&dr(t.nextSibling)?I.some(Dx.moveToElement(t.nextSibling)):!e&&dr(t.previousSibling)?I.some(Dx.moveToElement(t.previousSibling)):I.none())(t,n.getNode(!t)).orThunk((()=>Lx(e,t,n,o))):Lx(e,t,n,o).bind((t=>((e,t,n)=>n.fold((e=>I.some(Dx.remove(e))),(e=>I.some(Dx.moveToElement(e))),(n=>Qc(t,n,e)?I.none():I.some(Dx.moveToPosition(n)))))(e,n,t))))(e,t,s,o)})(e.getBody(),t,e.selection.getRng(),e.schema).map((n=>()=>n.fold(((e,t)=>n=>(e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n)),!0))(e,t),((e,t)=>n=>{const o=t?Vi.before(n):Vi.after(n);return e.selection.setRng(o.toRange()),!0})(e,t),(e=>t=>(e.selection.setRng(t.toRange()),!0))(e))))),(()=>I.some(_)))},Fx=e=>{const t=e.dom,n=e.selection,o=lb(e.getBody(),n.getNode());if(lr(o)&&t.isBlock(o)&&t.isEmpty(o)){const e=t.create("br",{"data-mce-bogus":"1"});t.setHTML(o,""),o.appendChild(e),n.setRng(Vi.before(e).toRange())}return!0},Ux=(e,t)=>e.selection.isCollapsed()?Ix(e,t):((e,t)=>{const n=e.selection.getNode();return dr(n)&&!cr(n)?Mx(e,n.parentNode).filter(dr).fold((()=>I.some((()=>{var n;n=yn(e.getBody()),V(Uo(n,".mce-offscreen-selection"),xo),vh(e,t,yn(e.selection.getNode())),Th(e)}))),(()=>I.some(_))):Px(e)?I.some((()=>{Ph(e,e.selection.getRng(),yn(e.getBody()))})):I.none()})(e,t),zx=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=Vi.fromRangeStart(e.selection.getRng());return ku(t,e.getBody(),n).filter((e=>t?Ep(e):_p(e))).bind((e=>Jc(t?0:-1,e))).map((t=>()=>e.selection.select(t)))})(e,t):I.none(),jx=er,Hx=e=>jx(e)&&e.data[0]===Br,$x=e=>jx(e)&&e.data[e.data.length-1]===Br,qx=e=>{var t;return(null!==(t=e.ownerDocument)&&void 0!==t?t:document).createTextNode(Br)},Vx=(e,t)=>e?(e=>{var t;if(jx(e.previousSibling))return $x(e.previousSibling)||e.previousSibling.appendData(Br),e.previousSibling;if(jx(e))return Hx(e)||e.insertData(0,Br),e;{const n=qx(e);return null===(t=e.parentNode)||void 0===t||t.insertBefore(n,e),n}})(t):(e=>{var t,n;if(jx(e.nextSibling))return Hx(e.nextSibling)||e.nextSibling.insertData(0,Br),e.nextSibling;if(jx(e))return $x(e)||e.appendData(Br),e;{const o=qx(e);return e.nextSibling?null===(t=e.parentNode)||void 0===t||t.insertBefore(o,e.nextSibling):null===(n=e.parentNode)||void 0===n||n.appendChild(o),o}})(t),Wx=T(Vx,!0),Kx=T(Vx,!1),Yx=(e,t)=>er(e.container())?Vx(t,e.container()):Vx(t,e.getNode()),Gx=(e,t)=>{const n=t.get();return n&&e.container()===n&&Fr(n)},Xx=(e,t)=>t.fold((t=>{Rc(e.get());const n=Wx(t);return e.set(n),I.some(Vi(n,n.length-1))}),(t=>Ou(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,1)}{Rc(e.get());const n=Yx(t,!0);return e.set(n),Vi(n,1)}}))),(t=>Bu(t).map((t=>{if(Gx(t,e)){const t=e.get();return Vi(t,t.length-1)}{Rc(e.get());const n=Yx(t,!1);return e.set(n),Vi(n,n.length-1)}}))),(t=>{Rc(e.get());const n=Kx(t);return e.set(n),I.some(Vi(n,1))})),Qx=(e,t)=>{for(let n=0;n<e.length;n++){const o=e[n].apply(null,t);if(o.isSome())return o}return I.none()},Jx=hl([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Zx=(e,t)=>Xc(t,e)||e,eE=(e,t,n)=>{const o=_h(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Au(r,o).bind(T(xh,e,r)).map((e=>Jx.before(e)))),I.none)},tE=(e,t)=>null===Lu(e,t),nE=(e,t,n)=>xh(e,t,n).filter(T(tE,t)),oE=(e,t,n)=>{const o=kh(n);return nE(e,t,o).bind((e=>Tu(e,o).isNone()?I.some(Jx.start(e)):I.none()))},rE=(e,t,n)=>{const o=_h(n);return nE(e,t,o).bind((e=>Au(e,o).isNone()?I.some(Jx.end(e)):I.none()))},sE=(e,t,n)=>{const o=kh(n),r=Zx(t,o.container());return xh(e,r,o).fold((()=>Tu(r,o).bind(T(xh,e,r)).map((e=>Jx.after(e)))),I.none)},aE=e=>!wh(lE(e)),iE=(e,t,n)=>Qx([eE,oE,rE,sE],[e,t,n]).filter(aE),lE=e=>e.fold(R,R,R,R),dE=e=>e.fold(N("before"),N("start"),N("end"),N("after")),cE=e=>e.fold(Jx.before,Jx.before,Jx.after,Jx.after),uE=e=>e.fold(Jx.start,Jx.start,Jx.end,Jx.end),mE=(e,t,n,o,r,s)=>Mt(xh(t,n,o),xh(t,n,r),((t,o)=>t!==o&&((e,t,n)=>{const o=Xc(t,e),r=Xc(n,e);return C(o)&&o===r})(n,t,o)?Jx.after(e?t:o):s)).getOr(s),fE=(e,t)=>e.fold(M,(e=>{return o=t,!(dE(n=e)===dE(o)&&lE(n)===lE(o));var n,o})),gE=(e,t)=>e?t.fold(k(I.some,Jx.start),I.none,k(I.some,Jx.after),I.none):t.fold(I.none,k(I.some,Jx.before),I.none,k(I.some,Jx.end)),pE=(e,t,n)=>{const o=e?1:-1;return t.setRng(Vi(n.container(),n.offset()+o).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0};var hE;!function(e){e[e.Br=0]="Br",e[e.Block=1]="Block",e[e.Wrap=2]="Wrap",e[e.Eol=3]="Eol"}(hE||(hE={}));const bE=(e,t)=>e===cu.Backwards?oe(t):t,vE=(e,t,n)=>e===cu.Forwards?t.next(n):t.prev(n),yE=(e,t,n,o)=>ar(o.getNode(t===cu.Forwards))?hE.Br:!1===Qc(n,o)?hE.Block:hE.Wrap,CE=(e,t,n,o)=>{const r=wu(n);let s=o;const a=[];for(;s;){const n=vE(t,r,s);if(!n)break;if(ar(n.getNode(!1)))return t===cu.Forwards?{positions:bE(t,a).concat([n]),breakType:hE.Br,breakAt:I.some(n)}:{positions:bE(t,a),breakType:hE.Br,breakAt:I.some(n)};if(n.isVisible()){if(e(s,n)){const e=yE(0,t,s,n);return{positions:bE(t,a),breakType:e,breakAt:I.some(n)}}a.push(n),s=n}else s=n}return{positions:bE(t,a),breakType:hE.Eol,breakAt:I.none()}},wE=(e,t,n,o)=>t(n,o).breakAt.map((o=>{const r=t(n,o).positions;return e===cu.Backwards?r.concat(o):[o].concat(r)})).getOr([]),xE=(e,t)=>X(e,((e,n)=>e.fold((()=>I.some(n)),(o=>Mt(le(o.getClientRects()),le(n.getClientRects()),((e,r)=>{const s=Math.abs(t-e.left);return Math.abs(t-r.left)<=s?n:o})).or(e)))),I.none()),EE=(e,t)=>le(t.getClientRects()).bind((t=>xE(e,t.left))),_E=T(CE,Vi.isAbove,-1),kE=T(CE,Vi.isBelow,1),SE=T(wE,-1,_E),NE=T(wE,1,kE),RE=(e,t)=>_E(e,t).breakAt.isNone(),AE=(e,t)=>kE(e,t).breakAt.isNone(),TE=(e,t)=>EE(SE(e,t),t),OE=(e,t)=>EE(NE(e,t),t),BE=dr,PE=(e,t)=>Math.abs(e.left-t),DE=(e,t)=>Math.abs(e.right-t),LE=(e,t)=>Oe(e,((e,n)=>{const o=Math.min(PE(e,t),DE(e,t)),r=Math.min(PE(n,t),DE(n,t));return r===o&&_e(n,"node")&&BE(n.node)||r<o?n:e})),ME=e=>{const t=t=>q(t,(t=>{const n=vi(t);return n.node=e,n}));if(qo(e))return t(e.getClientRects());if(er(e)){const n=e.ownerDocument.createRange();return n.setStart(e,0),n.setEnd(e,e.data.length),t(n.getClientRects())}return[]},IE=e=>te(e,ME);var FE;!function(e){e[e.Up=-1]="Up",e[e.Down=1]="Down"}(FE||(FE={}));const UE=(e,t,n,o,r,s)=>{let a=0;const i=[],l=o=>{let s=IE([o]);-1===e&&(s=s.reverse());for(let e=0;e<s.length;e++){const o=s[e];if(!n(o,d)){if(i.length>0&&t(o,Pe(i))&&a++,o.line=a,r(o))return!0;i.push(o)}}return!1},d=Pe(s.getClientRects());if(!d)return i;const c=s.getNode();return c&&(l(c),((e,t,n,o)=>{let r=o;for(;r=Gc(r,e,os,t);)if(n(r))return})(e,o,l,c)),i},zE=T(UE,FE.Up,wi,xi),jE=T(UE,FE.Down,xi,wi),HE=e=>Pe(e.getClientRects()),$E=e=>t=>((e,t)=>t.line>e)(e,t),qE=e=>t=>((e,t)=>t.line===e)(e,t),VE=(e,t)=>{e.selection.setRng(t),sg(e,e.selection.getRng())},WE=(e,t,n)=>I.some(Nx(e,t,n)),KE=(e,t,n,o,r,s)=>{const a=t===cu.Forwards,i=wu(e.getBody()),l=T(lu,a?i.next:i.prev),d=a?o:r;if(!n.collapsed){const o=_i(n);if(s(o))return kx(t,e,o,t===cu.Backwards,!1);if(Px(e)){const e=n.cloneRange();return e.collapse(t===cu.Backwards),I.from(e)}}const c=au(t,e.getBody(),n);if(d(c))return Sx(e,c.getNode(!a));let u=l(c);const m=Wr(n);if(!u)return m?I.some(n):I.none();if(u=Eh(a,u),d(u))return kx(t,e,u.getNode(!a),a,!1);const f=l(u);return f&&d(f)&&du(u,f)?kx(t,e,f.getNode(!a),a,!1):m?WE(e,u.toRange(),!1):I.none()},YE=(e,t,n,o,r,s)=>{const a=au(t,e.getBody(),n),i=Pe(a.getClientRects()),l=t===FE.Down,d=e.getBody();if(!i)return I.none();if(Px(e)){const e=l?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return(l?OE:TE)(d,e).orThunk((()=>I.from(e))).map((e=>e.toRange()))}const c=(l?jE:zE)(d,$E(1),a),u=Y(c,qE(1)),m=i.left,f=LE(u,m);if(f&&s(f.node)){const n=Math.abs(m-f.left),o=Math.abs(m-f.right);return kx(t,e,f.node,n<o,!1)}let g;if(g=o(a)?a.getNode():r(a)?a.getNode(!0):_i(n),g){const n=((e,t,n,o)=>{const r=wu(t);let s,a,i,l;const d=[];let c=0;1===e?(s=r.next,a=xi,i=wi,l=Vi.after(o)):(s=r.prev,a=wi,i=xi,l=Vi.before(o));const u=HE(l);do{if(!l.isVisible())continue;const e=HE(l);if(i(e,u))continue;d.length>0&&a(e,Pe(d))&&c++;const t=vi(e);if(t.position=l,t.line=c,n(t))return d;d.push(t)}while(l=s(l));return d})(t,d,$E(1),g);let o=LE(Y(n,qE(1)),m);if(o)return WE(e,o.position.toRange(),!1);if(o=Pe(Y(n,qE(0))),o)return WE(e,o.position.toRange(),!1)}return 0===u.length?GE(e,l).filter(l?r:o).map((t=>Nx(e,t.toRange(),!1))):I.none()},GE=(e,t)=>{const n=e.selection.getRng(),o=t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n),r=(s=o.container(),a=e.getBody(),Qn(yn(s),(e=>Ic(e.dom)),(e=>e.dom===a)).map((e=>e.dom)).getOr(a));var s,a;if(t){const e=kE(r,o);return de(e.positions)}{const e=_E(r,o);return le(e.positions)}},XE=(e,t,n)=>GE(e,t).filter(n).exists((t=>(e.selection.setRng(t.toRange()),!0))),QE=(e,t)=>{const n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},JE=(e,t)=>{e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},ZE=(e,t,n)=>Xx(t,n).map((t=>(QE(e,t),n))),e_=(e,t,n)=>{const o=e.getBody(),r=((e,t,n)=>{const o=Vi.fromRangeStart(e);if(e.collapsed)return o;{const r=Vi.fromRangeEnd(e);return n?Tu(t,r).getOr(r):Au(t,o).getOr(o)}})(e.selection.getRng(),o,n);return((e,t,n,o)=>{const r=Eh(e,o),s=iE(t,n,r);return iE(t,n,r).bind(T(gE,e)).orThunk((()=>((e,t,n,o,r)=>{const s=Eh(e,r);return ku(e,n,s).map(T(Eh,e)).fold((()=>o.map(cE)),(r=>iE(t,n,r).map(T(mE,e,t,n,s,r)).filter(T(fE,o)))).filter(aE)})(e,t,n,s,o)))})(n,T(Ch,e),o,r).bind((n=>ZE(e,t,n)))},t_=(e,t,n)=>!!yd(e)&&e_(e,t,n).isSome(),n_=(e,t,n)=>!!yd(t)&&((e,t)=>{const n=t.selection.getRng(),o=e?Vi.fromRangeEnd(n):Vi.fromRangeStart(n);return!!(e=>w(e.selection.getSel().modify))(t)&&(e&&jr(o)?pE(!0,t.selection,o):!(e||!Hr(o))&&pE(!1,t.selection,o))})(e,t),o_=e=>{const t=$a(null),n=T(Ch,e);return e.on("NodeChange",(o=>{yd(e)&&(((e,t,n)=>{const o=q(Uo(yn(t.getRoot()),'*[data-mce-selected="inline-boundary"]'),(e=>e.dom)),r=Y(o,e),s=Y(n,e);V(re(r,s),T(JE,!1)),V(re(s,r),T(JE,!0))})(n,e.dom,o.parents),((e,t)=>{const n=t.get();if(e.selection.isCollapsed()&&!e.composing&&n){const o=Vi.fromRangeStart(e.selection.getRng());Vi.isTextPosition(o)&&!(e=>jr(e)||Hr(e))(o)&&(QE(e,Nc(n,o)),t.set(null))}})(e,t),((e,t,n,o)=>{if(t.selection.isCollapsed()){const r=Y(o,e);V(r,(o=>{const r=Vi.fromRangeStart(t.selection.getRng());iE(e,t.getBody(),r).bind((e=>ZE(t,n,e)))}))}})(n,e,t,o.parents))})),t},r_=T(n_,!0),s_=T(n_,!1),a_=(e,t,n)=>{if(yd(e)){const o=GE(e,t).getOrThunk((()=>{const n=e.selection.getRng();return t?Vi.fromRangeEnd(n):Vi.fromRangeStart(n)}));return iE(T(Ch,e),e.getBody(),o).exists((t=>{const o=cE(t);return Xx(n,o).exists((t=>(QE(e,t),!0)))}))}return!1},i_=(e,t)=>n=>Xx(t,n).map((t=>()=>QE(e,t))),l_=(e,t,n,o)=>{const r=e.getBody(),s=T(Ch,e);e.undoManager.ignore((()=>{e.selection.setRng(((e,t)=>{const n=document.createRange();return n.setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n})(n,o)),Nh(e),iE(s,r,Vi.fromRangeStart(e.selection.getRng())).map(uE).bind(i_(e,t)).each(D)})),e.nodeChanged()},d_=(e,t,n)=>{if(e.selection.isCollapsed()&&yd(e)){const o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n,o)=>{const r=((e,t)=>Xc(t,e)||e)(e.getBody(),o.container()),s=T(Ch,e),a=iE(s,r,o);return a.bind((e=>n?e.fold(N(I.some(uE(e))),I.none,N(I.some(cE(e))),I.none):e.fold(I.none,N(I.some(cE(e))),I.none,N(I.some(uE(e)))))).map(i_(e,t)).getOrThunk((()=>{const i=Su(n,r,o),l=i.bind((e=>iE(s,r,e)));return Mt(a,l,(()=>xh(s,r,o).bind((t=>(e=>Mt(Ou(e),Bu(e),((t,n)=>{const o=Eh(!0,t),r=Eh(!1,n);return Au(e,o).forall((e=>e.isEqual(r)))})).getOr(!0))(t)?I.some((()=>{vh(e,n,yn(t))})):I.none())))).getOrThunk((()=>l.bind((()=>i.map((r=>()=>{n?l_(e,t,o,r):l_(e,t,r,o)}))))))}))})(e,t,n,o)}return I.none()},c_=(e,t)=>{const n=yn(e.getBody()),o=yn(e.selection.getStart()),r=Bp(o,n);return Z(r,t).fold(N(r),(e=>r.slice(0,e)))},u_=e=>1===zn(e),m_=(e,t)=>{const n=T(Zb,e);return te(t,(e=>n(e)?[e.dom]:[]))},f_=e=>{const t=(e=>c_(e,(t=>e.schema.isBlock(Ht(t)))))(e);return m_(e,t)},g_=(e,t)=>{const n=Y((e=>c_(e,(t=>e.schema.isBlock(Ht(t))||(e=>zn(e)>1)(t))))(e),u_);return de(n).bind((o=>{const r=Vi.fromRangeStart(e.selection.getRng());return Oh(t,r,o.dom)&&!Tm(o)?I.some((()=>((e,t,n,o)=>{const r=m_(t,o);if(0===r.length)vh(t,e,n);else{const e=Jb(n.dom,r);t.selection.setRng(e.toRange())}})(t,e,o,n))):I.none()}))},p_=(e,t)=>{const n=e.selection.getStart(),o=((e,t)=>{const n=t.parentElement;return ar(t)&&!h(n)&&e.dom.isEmpty(n)})(e,n)||Tm(yn(n))?Jb(n,t):((e,t)=>{const{caretContainer:n,caretPosition:o}=Qb(t);return e.insertNode(n.dom),o})(e.selection.getRng(),t);e.selection.setRng(o.toRange())},h_=e=>er(e.startContainer),b_=e=>{const t=e.selection.getRng();return(e=>0===e.startOffset&&h_(e))(t)&&((e,t)=>{const n=t.startContainer.parentElement;return!h(n)&&Zb(e,yn(n))})(e,t)&&(e=>(e=>(e=>{const t=e.startContainer.parentNode,n=e.endContainer.parentNode;return!h(t)&&!h(n)&&t.isEqualNode(n)})(e)&&(e=>{const t=e.endContainer;return e.endOffset===(er(t)?t.length:t.childNodes.length)})(e))(e)||(e=>!e.endContainer.isEqualNode(e.commonAncestorContainer))(e))(t)},v_=(e,t)=>e.selection.isCollapsed()?g_(e,t):(e=>{if(b_(e)){const t=f_(e);return I.some((()=>{Nh(e),((e,t)=>{const n=re(t,f_(e));n.length>0&&p_(e,n)})(e,t)}))}return I.none()})(e),y_=(e,t)=>Qn(e,(e=>Du(e.dom)),(e=>t.isBlock(Ht(e)))).isSome(),C_=e=>((e=>{const t=e.selection.getRng();return t.collapsed&&(h_(t)||e.dom.isEmpty(t.startContainer))&&!(e=>y_(yn(e.selection.getStart()),e.schema))(e)})(e)&&p_(e,[]),!0),w_=(e,t,n)=>C(n)?I.some((()=>{e._selectionOverrides.hideFakeCaret(),vh(e,t,yn(n))})):I.none(),x_=(e,t)=>e.selection.isCollapsed()?((e,t)=>{const n=t?kp:Sp,o=t?cu.Forwards:cu.Backwards,r=au(o,e.getBody(),e.selection.getRng());return n(r)?w_(e,t,r.getNode(!t)):I.from(Eh(t,r)).filter((e=>n(e)&&du(r,e))).bind((n=>w_(e,t,n.getNode(!t))))})(e,t):((e,t)=>{const n=e.selection.getNode();return mr(n)?w_(e,t,n):I.none()})(e,t),E_=e=>Xe(null!=e?e:"").getOr(0),__=(e,t)=>(e||"table"===Ht(t)?"margin":"padding")+("rtl"===co(t,"direction")?"-right":"-left"),k_=e=>{const t=N_(e);return!e.mode.isReadOnly()&&(t.length>1||((e,t)=>ne(t,(t=>{const n=__(od(e),t),o=mo(t,n).map(E_).getOr(0);return"false"!==e.dom.getContentEditable(t.dom)&&o>0})))(e,t))},S_=e=>kr(e)||Sr(e),N_=e=>Y(_o(e.selection.getSelectedBlocks()),(e=>!S_(e)&&!(e=>An(e).exists(S_))(e)&&Jn(e,(e=>lr(e.dom)||dr(e.dom))).exists((e=>lr(e.dom))))),R_=(e,t)=>{var n,o;const{dom:r}=e,s=rd(e),a=null!==(o=null===(n=/[a-z%]+$/i.exec(s))||void 0===n?void 0:n[0])&&void 0!==o?o:"px",i=E_(s),l=od(e);V(N_(e),(e=>{((e,t,n,o,r,s)=>{const a=__(n,yn(s)),i=E_(e.getStyle(s,a));if("outdent"===t){const t=Math.max(0,i-o);e.setStyle(s,a,t?t+r:"")}else{const t=i+o+r;e.setStyle(s,a,t)}})(r,t,l,i,a,e.dom)}))},A_=e=>R_(e,"outdent"),T_=e=>{if(e.selection.isCollapsed()&&k_(e)){const t=e.dom,n=e.selection.getRng(),o=Vi.fromRangeStart(n),r=t.getParent(n.startContainer,t.isBlock);if(null!==r&&Ip(yn(r),o,e.schema))return I.some((()=>A_(e)))}return I.none()},O_=(e,t,n)=>ue([T_,Ux,Ox,(e,n)=>d_(e,t,n),wx,ib,zx,x_,_x,v_],(t=>t(e,n))).filter((t=>e.selection.isEditable())),B_=(e,t)=>{e.addCommand("delete",(()=>{((e,t)=>{O_(e,t,!1).fold((()=>{e.selection.isEditable()&&(Nh(e),Th(e))}),D)})(e,t)})),e.addCommand("forwardDelete",(()=>{((e,t)=>{O_(e,t,!0).fold((()=>{e.selection.isEditable()&&(e=>{Sh(e,"ForwardDelete")})(e)}),D)})(e,t)}))},P_=e=>void 0===e.touches||1!==e.touches.length?I.none():I.some(e.touches[0]),D_=(e,t)=>Ee(e,t.nodeName),L_=(e,t)=>!!er(t)||!!qo(t)&&!(D_(e.getBlockElements(),t)||Ku(t)||Ts(e,t)||hs(t)),M_=(e,t)=>{if(er(t)){if(0===t.data.length)return!0;if(/^\s+$/.test(t.data))return!t.nextSibling||D_(e,t.nextSibling)||hs(t.nextSibling)}return!1},I_=e=>e.dom.create(Il(e),Fl(e)),F_=e=>{const t=e.dom,n=e.selection,o=e.schema,r=o.getBlockElements(),s=n.getStart(),a=e.getBody();let i,l,d=!1;const c=Il(e);if(!s||!qo(s))return;const u=a.nodeName.toLowerCase();if(!o.isValidChild(u,c.toLowerCase())||((e,t,n)=>$(Op(yn(n),yn(t)),(t=>D_(e,t.dom))))(r,a,s))return;const m=n.getRng(),{startContainer:f,startOffset:g,endContainer:p,endOffset:h}=m,b=Rg(e);let v=a.firstChild;for(;v;)if(qo(v)&&Ss(o,v),L_(o,v)){if(M_(r,v)){l=v,v=v.nextSibling,t.remove(l);continue}i||(i=I_(e),a.insertBefore(i,v),d=!0),l=v,v=v.nextSibling,i.appendChild(l)}else i=null,v=v.nextSibling;d&&b&&(m.setStart(f,g),m.setEnd(p,h),n.setRng(m),e.nodeChanged())},U_=(e,t,n)=>{const o=yn(I_(e)),r=Tr();vo(o,r),n(t,o);const s=document.createRange();return s.setStartBefore(r.dom),s.setEndBefore(r.dom),s},z_=e=>t=>-1!==(" "+t.attr("class")+" ").indexOf(e),j_=(e,t,n)=>function(o){const r=arguments,s=r[r.length-2],a=s>0?t.charAt(s-1):"";if('"'===a)return o;if(">"===a){const e=t.lastIndexOf("<",s);if(-1!==e&&-1!==t.substring(e,s).indexOf('contenteditable="false"'))return o}return'<span class="'+n+'" data-mce-content="'+e.dom.encode(r[0])+'">'+e.dom.encode("string"==typeof r[1]?r[1]:r[0])+"</span>"},H_=(e,t)=>ne(e,(e=>{const n=t.match(e);return null!==n&&n[0].length===t.length})),$_=(e,t)=>{t.hasAttribute("data-mce-caret")&&(Vr(t),e.selection.setRng(e.selection.getRng()),e.selection.scrollIntoView(t))},q_=(e,t)=>{const n=(e=>to(yn(e.getBody()),"*[data-mce-caret]").map((e=>e.dom)).getOrNull())(e);if(n)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void $_(e,n)):void(zr(n)&&($_(e,n),e.undoManager.add()))},V_=dr,W_=(e,t,n)=>{const o=wu(e.getBody()),r=T(lu,1===t?o.next:o.prev);if(n.collapsed){const o=e.dom.getParent(n.startContainer,"PRE");if(!o)return;if(!r(Vi.fromRangeStart(n))){const n=yn((e=>{const t=e.dom.create(Il(e));return t.innerHTML='<br data-mce-bogus="1">',t})(e));1===t?ho(yn(o),n):po(yn(o),n),e.selection.select(n.dom,!0),e.selection.collapse()}}},K_=(e,t)=>((e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return((e,t,n)=>KE(t,e,n,Ap,Tp,V_))(n,e,o).orThunk((()=>(W_(e,n,o),I.none())))})(e,((e,t)=>{const n=t?e.getEnd(!0):e.getStart(!0);return wh(n)?!t:t})(e.selection,t)).exists((t=>(VE(e,t),!0))),Y_=(e,t)=>((e,t)=>{const n=t?1:-1,o=e.selection.getRng();return((e,t,n)=>YE(t,e,n,(e=>Ap(e)||Np(e)),(e=>Tp(e)||Rp(e)),V_))(n,e,o).orThunk((()=>(W_(e,n,o),I.none())))})(e,t).exists((t=>(VE(e,t),!0))),G_=(e,t)=>XE(e,t,t?Tp:Ap),X_=(e,t)=>Bx(e,!t).map((n=>{const o=n.toRange(),r=e.selection.getRng();return t?o.setStart(r.startContainer,r.startOffset):o.setEnd(r.endContainer,r.endOffset),o})).exists((t=>(VE(e,t),!0))),Q_=e=>H(["figcaption"],Ht(e)),J_=(e,t)=>!!e.selection.isCollapsed()&&((e,t)=>{const n=yn(e.getBody()),o=Vi.fromRangeStart(e.selection.getRng());return((e,t,n)=>{const o=T(_n,t);return Jn(yn(e.container()),(e=>n.isBlock(Ht(e))),o).filter(Q_)})(o,n,e.schema).exists((()=>{if(((e,t,n)=>t?AE(e.dom,n):RE(e.dom,n))(n,t,o)){const o=U_(e,n,t?vo:bo);return e.selection.setRng(o),!0}return!1}))})(e,t),Z_=(e,t)=>((e,t)=>t?I.from(e.dom.getParent(e.selection.getNode(),"details")).map((t=>((e,t)=>{const n=e.selection.getRng(),o=Vi.fromRangeStart(n);return!(e.getBody().lastChild!==t||!AE(t,o)||(e.execCommand("InsertNewBlockAfter"),0))})(e,t))).getOr(!1):I.from(e.dom.getParent(e.selection.getNode(),"summary")).bind((t=>I.from(e.dom.getParent(t,"details")).map((n=>((e,t,n)=>{const o=e.selection.getRng(),r=Vi.fromRangeStart(o);return!(e.getBody().firstChild!==t||!RE(n,r)||(e.execCommand("InsertNewBlockBefore"),0))})(e,n,t))))).getOr(!1))(e,t),ek={shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0},tk=(e,t)=>t.keyCode===e.keyCode&&t.shiftKey===e.shiftKey&&t.altKey===e.altKey&&t.ctrlKey===e.ctrlKey&&t.metaKey===e.metaKey,nk=(e,...t)=>()=>e.apply(null,t),ok=(e,t)=>J(((e,t)=>te((e=>q(e,(e=>({...ek,...e}))))(e),(e=>tk(e,t)?[e]:[])))(e,t),(e=>e.action())),rk=(e,t)=>ue(((e,t)=>te((e=>q(e,(e=>({...ek,...e}))))(e),(e=>tk(e,t)?[e]:[])))(e,t),(e=>e.action())),sk=(e,t)=>{const n=t?cu.Forwards:cu.Backwards,o=e.selection.getRng();return KE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},ak=(e,t)=>{const n=t?1:-1,o=e.selection.getRng();return YE(e,n,o,kp,Sp,mr).exists((t=>(VE(e,t),!0)))},ik=(e,t)=>XE(e,t,t?Sp:kp),lk=hl([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),dk={...lk,none:e=>lk.none(e)},ck=(e,t,n)=>te(Mn(e),(e=>xn(e,t)?n(e)?[e]:[]:ck(e,t,n))),uk=(e,t)=>no(e,"table",t),mk=(e,t,n,o,r=M)=>{const s=1===o;if(!s&&n<=0)return dk.first(e[0]);if(s&&n>=e.length-1)return dk.last(e[e.length-1]);{const s=n+o,a=e[s];return r(a)?dk.middle(t,a):mk(e,t,s,o,r)}},fk=(e,t)=>uk(e,t).bind((t=>{const n=ck(t,"th,td",M);return Z(n,(t=>_n(e,t))).map((e=>({index:e,all:n})))})),gk=(e,t,n,o,r)=>{const s=Uo(yn(n),"td,th,caption").map((e=>e.dom)),a=Y(((e,t)=>te(t,(t=>{const n=((e,t)=>({left:e.left-t,top:e.top-t,right:e.right+-2,bottom:e.bottom+-2,width:e.width+t,height:e.height+t}))(vi(t.getBoundingClientRect()),-1);return[{x:n.left,y:e(n),cell:t},{x:n.right,y:e(n),cell:t}]})))(e,s),(e=>t(e,r)));return((e,t,n)=>X(e,((e,o)=>e.fold((()=>I.some(o)),(e=>{const r=Math.sqrt(Math.abs(e.x-t)+Math.abs(e.y-n)),s=Math.sqrt(Math.abs(o.x-t)+Math.abs(o.y-n));return I.some(s<r?o:e)}))),I.none()))(a,o,r).map((e=>e.cell))},pk=T(gk,(e=>e.bottom),((e,t)=>e.y<t)),hk=T(gk,(e=>e.top),((e,t)=>e.y>t)),bk=(e,t,n)=>{const o=e(t,n);return(e=>e.breakType===hE.Wrap&&0===e.positions.length)(o)||!ar(n.getNode())&&(e=>e.breakType===hE.Br&&1===e.positions.length)(o)?!((e,t,n)=>n.breakAt.exists((n=>e(t,n).breakAt.isSome())))(e,t,o):o.breakAt.isNone()},vk=T(bk,_E),yk=T(bk,kE),Ck=(e,t,n,o)=>{const r=e.selection.getRng(),s=t?1:-1;return!(!Dc()||!((e,t,n)=>{const o=Vi.fromRangeStart(t);return Ru(!e,n).exists((e=>e.isEqual(o)))})(t,r,n)||(kx(s,e,n,!t,!1).each((t=>{VE(e,t)})),0))},wk=(e,t,n)=>{const o=((e,t)=>{const n=t.getNode(e);return Qo(n)?I.some(n):I.none()})(!!t,n),r=!1===t;o.fold((()=>VE(e,n.toRange())),(o=>Ru(r,e.getBody()).filter((e=>e.isEqual(n))).fold((()=>VE(e,n.toRange())),(n=>((e,t,n)=>{t.undoManager.transact((()=>{const o=e?ho:po,r=U_(t,yn(n),o);VE(t,r)}))})(t,e,o)))))},xk=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();if(!t&&vk(o,s)){const o=((e,t,n)=>((e,t)=>le(t.getClientRects()).bind((t=>pk(e,t.left,t.top))).bind((e=>{return EE(Bu(n=e).map((e=>_E(n,e).positions.concat(e))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(SE(e,Vi.before(t)),n.left))))).getOr(Vi.before(t)))(a,n,s);return wk(e,t,o),!0}if(t&&yk(o,s)){const o=((e,t,n)=>((e,t)=>de(t.getClientRects()).bind((t=>hk(e,t.left,t.top))).bind((e=>{return EE(Ou(n=e).map((e=>[e].concat(kE(n,e).positions))).getOr([]),t);var n})))(t,n).orThunk((()=>le(n.getClientRects()).bind((n=>xE(NE(e,Vi.after(t)),n.left))))).getOr(Vi.after(t)))(a,n,s);return wk(e,t,o),!0}return!1},Ek=(e,t,n)=>I.from(e.dom.getParent(e.selection.getNode(),"td,th")).bind((o=>I.from(e.dom.getParent(o,"table")).map((r=>n(e,t,r,o))))).getOr(!1),_k=(e,t)=>Ek(e,t,Ck),kk=(e,t)=>Ek(e,t,xk),Sk=(e,t,n)=>n.fold(I.none,I.none,((e,t)=>{return(n=t,Zn(n,Fg)).map((e=>(e=>{const t=xf.exact(e,0,e,0);return Nf(t)})(e)));var n}),(n=>(e.execCommand("mceTableInsertRowAfter"),Nk(e,t,n)))),Nk=(e,t,n)=>{return Sk(e,t,(r=oo,fk(o=n,void 0).fold((()=>dk.none(o)),(e=>mk(e.all,o,e.index,1,r)))));var o,r},Rk=(e,t,n)=>{return Sk(e,t,(r=oo,fk(o=n,void 0).fold((()=>dk.none()),(e=>mk(e.all,o,e.index,-1,r)))));var o,r},Ak=(e,t)=>{const n=["table","li","dl"],o=yn(e.getBody()),r=e=>{const t=Ht(e);return _n(e,o)||H(n,t)},s=e.selection.getRng();return((e,t)=>((e,t,n=L)=>n(t)?I.none():H(e,Ht(t))?I.some(t):eo(t,e.join(","),(e=>xn(e,"table")||n(e))))(["td","th"],e,t))(yn(t?s.endContainer:s.startContainer),r).map((n=>(uk(n,r).each((t=>{e.model.table.clearSelectedCells(t.dom)})),e.selection.collapse(!t),(t?Nk:Rk)(e,r,n).each((t=>{e.selection.setRng(t)})),!0))).getOr(!1)},Tk=(e,t)=>({container:e,offset:t}),Ok=za.DOM,Bk=e=>t=>e===t?-1:0,Pk=(e,t,n)=>{if(er(e)&&t>=0)return I.some(Tk(e,t));{const o=hi(Ok);return I.from(o.backwards(e,t,Bk(e),n)).map((e=>Tk(e.container,e.container.data.length)))}},Dk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t>=0&&t<=o.length)return I.some(Tk(e,t));{const o=hi(Ok);return I.from(o.backwards(e,t,Bk(e),n)).bind((e=>{const o=e.container.data;return Dk(e.container,t+o.length,n)}))}},Lk=(e,t,n)=>{if(!er(e))return I.none();const o=e.data;if(t<=o.length)return I.some(Tk(e,t));{const r=hi(Ok);return I.from(r.forwards(e,t,Bk(e),n)).bind((e=>Lk(e.container,t-o.length,n)))}},Mk=(e,t,n,o,r)=>{const s=hi(e,(e=>t=>e.isBlock(t)||H(["BR","IMG","HR","INPUT"],t.nodeName)||"false"===e.getContentEditable(t))(e));return I.from(s.backwards(t,n,o,r))},Ik=e=>Dr(e.toString().replace(/\u00A0/g," ")),Fk=e=>""!==e&&-1!==" \xa0\f\n\r\t\v".indexOf(e),Uk=(e,t)=>e.substring(t.length),zk=(e,t,n,o=0)=>{return(r=yn(t.startContainer),no(r,Ug)).fold((()=>((e,t,n,o=0)=>{if(!(r=t).collapsed||!er(r.startContainer))return I.none();var r;const s={text:"",offset:0},a=e.getParent(t.startContainer,e.isBlock)||e.getRoot();return Mk(e,t.startContainer,t.startOffset,((e,t,o)=>(s.text=o+s.text,s.offset+=t,((e,t,n)=>{let o;const r=n.charAt(0);for(o=t-1;o>=0;o--){const s=e.charAt(o);if(Fk(s))return I.none();if(r===s&&je(e,n,o,t))break}return I.some(o)})(s.text,s.offset,n).getOr(t))),a).bind((e=>{const r=t.cloneRange();if(r.setStart(e.container,e.offset),r.setEnd(t.endContainer,t.endOffset),r.collapsed)return I.none();const s=Ik(r);return 0!==s.lastIndexOf(n)||Uk(s,n).length<o?I.none():I.some({text:Uk(s,n),range:r,trigger:n})}))})(e,t,n,o)),(t=>{const o=e.createRng();o.selectNode(t.dom);const r=Ik(o);return I.some({range:o,text:Uk(r,n),trigger:n})}));var r},jk=e=>{if((e=>3===e.nodeType)(e))return Tk(e,e.data.length);{const t=e.childNodes;return t.length>0?jk(t[t.length-1]):Tk(e,t.length)}},Hk=(e,t)=>{const n=e.childNodes;return n.length>0&&t<n.length?Hk(n[t],0):n.length>0&&(e=>1===e.nodeType)(e)&&n.length===t?jk(n[n.length-1]):Tk(e,t)},$k=(e,t,n,o={})=>{var r;const s=t(),a=null!==(r=e.selection.getRng().startContainer.nodeValue)&&void 0!==r?r:"",i=Y(s.lookupByTrigger(n.trigger),(t=>n.text.length>=t.minChars&&t.matches.getOrThunk((()=>(e=>t=>{const n=Hk(t.startContainer,t.startOffset);return!((e,t)=>{var n;const o=null!==(n=e.getParent(t.container,e.isBlock))&&void 0!==n?n:e.getRoot();return Mk(e,t.container,t.offset,((e,t)=>0===t?-1:t),o).filter((e=>{const t=e.container.data.charAt(e.offset-1);return!Fk(t)})).isSome()})(e,n)})(e.dom)))(n.range,a,n.text)));if(0===i.length)return I.none();const l=Promise.all(q(i,(e=>e.fetch(n.text,e.maxResults,o).then((t=>({matchText:n.text,items:t,columns:e.columns,onAction:e.onAction,highlightOn:e.highlightOn}))))));return I.some({lookupData:l,context:n})};var qk;!function(e){e[e.Error=0]="Error",e[e.Value=1]="Value"}(qk||(qk={}));const Vk=(e,t,n)=>e.stype===qk.Error?t(e.serror):n(e.svalue),Wk=e=>({stype:qk.Value,svalue:e}),Kk=e=>({stype:qk.Error,serror:e}),Yk=Vk,Gk=e=>f(e)&&me(e).length>100?" removed due to size":JSON.stringify(e,null,2),Xk=(e,t)=>Kk([{path:e,getErrorInfo:t}]),Qk=(e,t)=>({extract:(n,o)=>xe(o,e).fold((()=>((e,t)=>Xk(e,(()=>'Choice schema did not contain choice key: "'+t+'"')))(n,e)),(e=>((e,t,n,o)=>xe(n,o).fold((()=>((e,t,n)=>Xk(e,(()=>'The chosen schema: "'+n+'" did not exist in branches: '+Gk(t))))(e,n,o)),(n=>n.extract(e.concat(["branch: "+o]),t))))(n,o,t,e))),toString:()=>"chooseOn("+e+"). Possible values: "+me(t)}),Jk=e=>(...t)=>{if(0===t.length)throw new Error("Can't merge zero objects");const n={};for(let o=0;o<t.length;o++){const r=t[o];for(const t in r)Ee(r,t)&&(n[t]=e(n[t],r[t]))}return n},Zk=Jk(((e,t)=>g(e)&&g(t)?Zk(e,t):t)),eS=(Jk(((e,t)=>t)),e=>({tag:"defaultedThunk",process:N(e)})),tS=e=>{const t=(e=>{const t=[],n=[];return V(e,(e=>{Vk(e,(e=>n.push(e)),(e=>t.push(e)))})),{values:t,errors:n}})(e);return t.errors.length>0?(n=t.errors,k(Kk,ee)(n)):Wk(t.values);var n},nS=(e,t,n)=>{switch(e.tag){case"field":return t(e.key,e.newKey,e.presence,e.prop);case"custom":return n(e.newKey,e.instantiator)}},oS=e=>({extract:(t,n)=>{return o=e(n),r=e=>((e,t)=>Xk(e,N(t)))(t,e),o.stype===qk.Error?r(o.serror):o;var o,r},toString:N("val")}),rS=oS(Wk),sS=(e,t,n,o)=>o(xe(e,t).getOrThunk((()=>n(e)))),aS=(e,t,n,o,r)=>{const s=e=>r.extract(t.concat([o]),e),a=e=>e.fold((()=>Wk(I.none())),(e=>{const n=r.extract(t.concat([o]),e);return s=n,a=I.some,s.stype===qk.Value?{stype:qk.Value,svalue:a(s.svalue)}:s;var s,a}));switch(e.tag){case"required":return((e,t,n,o)=>xe(t,n).fold((()=>((e,t,n)=>Xk(e,(()=>'Could not find valid *required* value for "'+t+'" in '+Gk(n))))(e,n,t)),o))(t,n,o,s);case"defaultedThunk":return sS(n,o,e.process,s);case"option":return((e,t,n)=>n(xe(e,t)))(n,o,a);case"defaultedOptionThunk":return((e,t,n,o)=>o(xe(e,t).map((t=>!0===t?n(e):t))))(n,o,e.process,a);case"mergeWithThunk":return sS(n,o,N({}),(t=>{const o=Zk(e.process(n),t);return s(o)}))}},iS=e=>({extract:(t,n)=>((e,t,n)=>{const o={},r=[];for(const s of n)nS(s,((n,s,a,i)=>{const l=aS(a,e,t,n,i);Yk(l,(e=>{r.push(...e)}),(e=>{o[s]=e}))}),((e,n)=>{o[e]=n(t)}));return r.length>0?Kk(r):Wk(o)})(t,n,e),toString:()=>{const t=q(e,(e=>nS(e,((e,t,n,o)=>e+" -> "+o.toString()),((e,t)=>"state("+e+")"))));return"obj{\n"+t.join("\n")+"}"}}),lS=e=>({extract:(t,n)=>{const o=q(n,((n,o)=>e.extract(t.concat(["["+o+"]"]),n)));return tS(o)},toString:()=>"array("+e.toString()+")"}),dS=(e,t,n)=>{return o=((e,t,n)=>((e,t)=>e.stype===qk.Error?{stype:qk.Error,serror:t(e.serror)}:e)(t.extract([e],n),(e=>({input:n,errors:e}))))(e,t,n),Vk(o,pl.error,pl.value);var o},cS=(e,t)=>Qk(e,pe(t,iS)),uS=N(rS),mS=(e,t)=>oS((n=>{const o=typeof n;return e(n)?Wk(n):Kk(`Expected type: ${t} but got: ${o}`)})),fS=mS(x,"number"),gS=mS(m,"string"),pS=mS(b,"boolean"),hS=mS(w,"function"),bS=(e,t,n,o)=>({tag:"field",key:e,newKey:t,presence:n,prop:o}),vS=(e,t)=>({tag:"custom",newKey:e,instantiator:t}),yS=(e,t)=>bS(e,e,{tag:"required",process:{}},t),CS=e=>yS(e,gS),wS=e=>yS(e,hS),xS=(e,t)=>bS(e,e,{tag:"option",process:{}},t),ES=e=>xS(e,gS),_S=(e,t,n)=>bS(e,e,eS(t),n),kS=(e,t)=>_S(e,t,fS),SS=(e,t,n)=>_S(e,t,(e=>{return t=t=>H(e,t)?pl.value(t):pl.error(`Unsupported value: "${t}", choose one of "${e.join(", ")}".`),oS((e=>t(e).fold(Kk,Wk)));var t})(n)),NS=(e,t)=>_S(e,t,pS),RS=(e,t)=>_S(e,t,hS),AS=CS("type"),TS=wS("fetch"),OS=wS("onAction"),BS=RS("onSetup",(()=>_)),PS=ES("text"),DS=ES("icon"),LS=ES("tooltip"),MS=ES("label"),IS=NS("active",!1),FS=NS("enabled",!0),US=NS("primary",!1),zS=e=>((e,t)=>_S("type",t,gS))(0,e),jS=iS([AS,CS("trigger"),kS("minChars",1),(1,((e,t)=>bS(e,e,eS(1),uS()))("columns")),kS("maxResults",10),("matches",xS("matches",hS)),TS,OS,(HS=gS,_S("highlightOn",[],lS(HS)))]);var HS;const $S=[FS,LS,DS,PS,BS],qS=[IS].concat($S),VS=[RS("predicate",L),SS("scope","node",["node","editor"]),SS("position","selection",["node","selection","line"])],WS=$S.concat([zS("contextformbutton"),US,OS,vS("original",R)]),KS=qS.concat([zS("contextformbutton"),US,OS,vS("original",R)]),YS=$S.concat([zS("contextformbutton")]),GS=qS.concat([zS("contextformtogglebutton")]),XS=cS("type",{contextformbutton:WS,contextformtogglebutton:KS});iS([zS("contextform"),RS("initValue",N("")),MS,((e,t)=>bS(e,e,{tag:"required",process:{}},lS(t)))("commands",XS),xS("launch",cS("type",{contextformbutton:YS,contextformtogglebutton:GS}))].concat(VS));const QS=e=>{const t=e.ui.registry.getAll().popups,n=pe(t,(e=>{return(t=e,dS("Autocompleter",jS,{trigger:t.ch,...t})).fold((e=>{throw new Error("Errors: \n"+(e=>{const t=e.length>10?e.slice(0,10).concat([{path:[],getErrorInfo:N("... (only showing first ten failures)")}]):e;return q(t,(e=>"Failed path: ("+e.path.join(" > ")+")\n"+e.getErrorInfo()))})((t=e).errors).join("\n")+"\n\nInput object: "+Gk(t.input));var t}),R);var t})),o=ke(Ce(n,(e=>e.trigger))),r=we(n);return{dataset:n,triggers:o,lookupByTrigger:e=>Y(r,(t=>t.trigger===e))}},JS=e=>{const t=Xa(),n=$a(!1),o=t.isSet,r=()=>{o()&&((e=>{JC(e).autocompleter.removeDecoration()})(e),(e=>{e.dispatch("AutocompleterEnd")})(e),n.set(!1),t.clear())},s=De((()=>QS(e))),a=a=>{(n=>t.get().map((t=>zk(e.dom,e.selection.getRng(),t.trigger).bind((t=>$k(e,s,t,n))))).getOrThunk((()=>((e,t)=>{const n=t(),o=e.selection.getRng();return((e,t,n)=>ue(n.triggers,(n=>zk(e,t,n))))(e.dom,o,n).bind((n=>$k(e,t,n)))})(e,s))))(a).fold(r,(s=>{(n=>{o()||(((e,t)=>{JC(e).autocompleter.addDecoration(t)})(e,n.range),t.set({trigger:n.trigger,matchLength:n.text.length}))})(s.context),s.lookupData.then((o=>{t.get().map((a=>{const i=s.context;a.trigger===i.trigger&&(i.text.length-a.matchLength>=10?r():(t.set({...a,matchLength:i.text.length}),n.get()?((e,t)=>{e.dispatch("AutocompleterUpdate",t)})(e,{lookupData:o}):(n.set(!0),((e,t)=>{e.dispatch("AutocompleterStart",t)})(e,{lookupData:o}))))}))}))}))};e.addCommand("mceAutocompleterReload",((e,t)=>{const n=f(t)?t.fetchOptions:{};a(n)})),e.addCommand("mceAutocompleterClose",r),((e,t)=>{const n=Ja(t.load,50);e.on("keypress compositionend",(e=>{27!==e.which&&n.throttle()})),e.on("keydown",(e=>{const o=e.which;8===o?n.throttle():27===o&&t.cancelIfNecessary()})),e.on("remove",n.cancel)})(e,{cancelIfNecessary:r,load:a})},ZS=xt().browser.isSafari(),eN=e=>Or(yn(e)),tN=(e,t)=>{var n;return 0===e.startOffset&&e.endOffset===(null===(n=t.textContent)||void 0===n?void 0:n.length)},nN=(e,t)=>I.from(e.getParent(t.container(),"details")),oN=(e,t)=>nN(e,t).isSome(),rN=(e,t)=>{const n=t.getNode();v(n)||e.selection.setCursorLocation(n,t.offset())},sN=(e,t,n)=>{const o=e.dom.getParent(t.container(),"details");if(o&&!o.open){const t=e.dom.select("summary",o)[0];t&&(n?Ou(t):Bu(t)).each((t=>rN(e,t)))}else rN(e,t)},aN=(e,t,n)=>{const{dom:o,selection:r}=e,s=e.getBody();if("character"===n){const n=Vi.fromRangeStart(r.getRng()),a=o.getParent(n.container(),o.isBlock),i=nN(o,n),l=a&&o.isEmpty(a),d=h(null==a?void 0:a.previousSibling),c=h(null==a?void 0:a.nextSibling);return!!(l&&(t?c:d)&&Su(!t,s,n).exists((e=>oN(o,e)&&!Lt(i,nN(o,e)))))||Su(t,s,n).fold(L,(n=>{const r=nN(o,n);if(oN(o,n)&&!Lt(i,r)){if(t||sN(e,n,!1),a&&l){if(t&&d)return!0;if(!t&&c)return!0;sN(e,n,t),e.dom.remove(a)}return!0}return!1}))}return!1},iN=(e,t,n,o)=>{const r=e.selection.getRng(),s=Vi.fromRangeStart(r),a=e.getBody();return"selection"===o?((e,t)=>{const n=t.startSummary.exists((t=>t.contains(e.startContainer))),o=t.startSummary.exists((t=>t.contains(e.endContainer))),r=t.startDetails.forall((e=>t.endDetails.forall((t=>e!==t))));return(n||o)&&!(n&&o)||r})(r,t):n?((e,t)=>t.startSummary.exists((t=>((e,t)=>Bu(t).exists((n=>ar(n.getNode())&&Tu(t,n).exists((t=>t.isEqual(e)))||n.isEqual(e))))(e,t))))(s,t)||((e,t,n)=>n.startDetails.exists((n=>Au(e,t).forall((e=>!n.contains(e.container()))))))(a,s,t):((e,t)=>t.startSummary.exists((t=>((e,t)=>Ou(t).exists((t=>t.isEqual(e))))(e,t))))(s,t)||((e,t)=>t.startDetails.exists((n=>Tu(n,e).forall((n=>t.startSummary.exists((t=>!t.contains(e.container())&&t.contains(n.container()))))))))(s,t)},lN=(e,t,n)=>((e,t,n)=>((e,t)=>{const n=I.from(e.getParent(t.startContainer,"details")),o=I.from(e.getParent(t.endContainer,"details"));if(n.isSome()||o.isSome()){const t=n.bind((t=>I.from(e.select("summary",t)[0])));return I.some({startSummary:t,startDetails:n,endDetails:o})}return I.none()})(e.dom,e.selection.getRng()).fold((()=>aN(e,t,n)),(o=>iN(e,o,t,n)||aN(e,t,n))))(e,t,n)||ZS&&((e,t,n)=>{const o=e.selection,r=o.getNode(),s=o.getRng(),a=Vi.fromRangeStart(s);return!!pr(r)&&("selection"===n&&tN(s,r)||Oh(t,a,r)?eN(r):e.undoManager.transact((()=>{const s=o.getSel();let{anchorNode:a,anchorOffset:i,focusNode:l,focusOffset:d}=null!=s?s:{};const c=()=>{C(a)&&C(i)&&C(l)&&C(d)&&(null==s||s.setBaseAndExtent(a,i,l,d))},u=(e,t)=>{V(e.childNodes,(e=>{dm(e)&&t.appendChild(e)}))},m=e.dom.create("span",{"data-mce-bogus":"1"});u(r,m),r.appendChild(m),c(),"word"!==n&&"line"!==n||null==s||s.modify("extend",t?"right":"left",n),!o.isCollapsed()&&tN(o.getRng(),m)?eN(r):(e.execCommand(t?"ForwardDelete":"Delete"),a=null==s?void 0:s.anchorNode,i=null==s?void 0:s.anchorOffset,l=null==s?void 0:s.focusNode,d=null==s?void 0:s.focusOffset,u(m,r),c()),e.dom.remove(m)})),!0)})(e,t,n)?I.some(_):I.none(),dN=e=>(t,n,o={})=>{const r=t.getBody(),s={bubbles:!0,composed:!0,data:null,isComposing:!1,detail:0,view:null,target:r,currentTarget:r,eventPhase:Event.AT_TARGET,originalTarget:r,explicitOriginalTarget:r,isTrusted:!1,srcElement:r,cancelable:!1,preventDefault:_,inputType:n},a=Ea(new InputEvent(e));return t.dispatch(e,{...a,...s,...o})},cN=dN("input"),uN=dN("beforeinput"),mN=xt(),fN=mN.os,gN=fN.isMacOS()||fN.isiOS(),pN=mN.browser.isFirefox(),hN=(e,t)=>{const n=e.dom,o=e.schema.getMoveCaretBeforeOnEnterElements();if(!t)return;if(/^(LI|DT|DD)$/.test(t.nodeName)){const e=(e=>{for(;e;){if(qo(e)||er(e)&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}return null})(t.firstChild);e&&/^(UL|OL|DL)$/.test(e.nodeName)&&t.insertBefore(n.doc.createTextNode(br),t.firstChild)}const r=n.createRng();if(t.normalize(),t.hasChildNodes()){const e=new jo(t,t);let n,s=t;for(;n=e.current();){if(er(n)){r.setStart(n,0),r.setEnd(n,0);break}if(o[n.nodeName.toLowerCase()]){r.setStartBefore(n),r.setEndBefore(n);break}s=n,n=e.next()}n||(r.setStart(s,0),r.setEnd(s,0))}else ar(t)?t.nextSibling&&n.isBlock(t.nextSibling)?(r.setStartBefore(t),r.setEndBefore(t)):(r.setStartAfter(t),r.setEndAfter(t)):(r.setStart(t,0),r.setEnd(t,0));e.selection.setRng(r),sg(e,r)},bN=(e,t)=>{const n=e.getRoot();let o,r=t;for(;r!==n&&r&&"false"!==e.getContentEditable(r);){if("true"===e.getContentEditable(r)){o=r;break}r=r.parentNode}return r!==n?o:n},vN=e=>I.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock)),yN=e=>{e.innerHTML='<br data-mce-bogus="1">'},CN=(e,t)=>{Il(e).toLowerCase()===t.tagName.toLowerCase()&&((e,t,n)=>{const o=e.dom;I.from(n.style).map(o.parseStyle).each((e=>{const n={...fo(yn(t)),...e};o.setStyles(t,n)}));const r=I.from(n.class).map((e=>e.split(/\s+/))),s=I.from(t.className).map((e=>Y(e.split(/\s+/),(e=>""!==e))));Mt(r,s,((e,n)=>{const r=Y(n,(t=>!H(e,t))),s=[...e,...r];o.setAttrib(t,"class",s.join(" "))}));const a=["style","class"],i=ye(n,((e,t)=>!H(a,t)));o.setAttribs(t,i)})(e,t,Fl(e))},wN=(e,t,n,o,r=!0,s,a)=>{const i=e.dom,l=e.schema,d=Il(e),c=n?n.nodeName.toUpperCase():"";let u=t;const m=l.getTextInlineElements();let f;f=s||"TABLE"===c||"HR"===c?i.create(s||d,a||{}):n.cloneNode(!1);let g=f;if(r){do{if(m[u.nodeName]){if(Du(u)||Ku(u))continue;const e=u.cloneNode(!1);i.setAttrib(e,"id",""),f.hasChildNodes()?(e.appendChild(f.firstChild),f.appendChild(e)):(g=e,f.appendChild(e))}}while((u=u.parentNode)&&u!==o)}else i.setAttrib(f,"style",null),i.setAttrib(f,"class",null);return CN(e,f),yN(g),f},xN=(e,t)=>{const n=null==e?void 0:e.parentNode;return C(n)&&n.nodeName===t},EN=e=>C(e)&&/^(OL|UL|LI)$/.test(e.nodeName),_N=e=>C(e)&&/^(LI|DT|DD)$/.test(e.nodeName),kN=e=>{const t=e.parentNode;return _N(t)?t:e},SN=(e,t,n)=>{let o=e[n?"firstChild":"lastChild"];for(;o&&!qo(o);)o=o[n?"nextSibling":"previousSibling"];return o===t},NN=e=>X(Ce(fo(yn(e)),((e,t)=>`${t}: ${e};`)),((e,t)=>e+t),""),RN=(e,t)=>t&&"A"===t.nodeName&&e.isEmpty(t),AN=(e,t)=>e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t,TN=(e,t)=>C(t)&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&e.isEditable(t.parentNode)&&"false"!==e.getContentEditable(t),ON=(e,t,n)=>er(t)?e?1===n&&t.data.charAt(n-1)===Br?0:n:n===t.data.length-1&&t.data.charAt(n)===Br?t.data.length:n:n,BN={insert:(e,t)=>{let n,o,r,s,a=!1;const i=e.dom,l=e.schema.getNonEmptyElements(),d=e.selection.getRng(),c=Il(e),u=yn(d.startContainer),f=In(u,d.startOffset),g=f.exists((e=>Vt(e)&&!oo(e))),p=d.collapsed&&g,b=(t,o)=>wN(e,n,k,_,Hl(e),t,o),v=e=>{const t=ON(e,n,o);if(er(n)&&(e?t>0:t<n.data.length))return!1;if(n.parentNode===k&&a&&!e)return!0;if(e&&qo(n)&&n===k.firstChild)return!0;if(AN(n,"TABLE")||AN(n,"HR"))return a&&!e||!a&&e;const r=new jo(n,k);let s;for(er(n)&&(e&&0===t?r.prev():e||t!==n.data.length||r.next());s=r.current();){if(qo(s)){if(!s.getAttribute("data-mce-bogus")){const e=s.nodeName.toLowerCase();if(l[e]&&"br"!==e)return!1}}else if(er(s)&&!ss(s.data))return!1;e?r.prev():r.next()}return!0},w=()=>{let t;return t=/^(H[1-6]|PRE|FIGURE)$/.test(r)&&"HGROUP"!==S?b(c):b(),((e,t)=>{const n=$l(e);return!y(t)&&(m(n)?H(Pt.explode(n),t.nodeName.toLowerCase()):n)})(e,s)&&TN(i,s)&&i.isEmpty(k,void 0,{includeZwsp:!0})?t=i.split(s,k):i.insertAfter(t,k),hN(e,t),t};Mf(i,d).each((e=>{d.setStart(e.startContainer,e.startOffset),d.setEnd(e.endContainer,e.endOffset)})),n=d.startContainer,o=d.startOffset;const x=!(!t||!t.shiftKey),E=!(!t||!t.ctrlKey);qo(n)&&n.hasChildNodes()&&!p&&(a=o>n.childNodes.length-1,n=n.childNodes[Math.min(o,n.childNodes.length-1)]||n,o=a&&er(n)?n.data.length:0);const _=bN(i,n);if(!_||((e,t)=>{const n=e.dom.getParent(t,"ol,ul,dl");return null!==n&&"false"===e.dom.getContentEditableParent(n)})(e,n))return;x||(n=((e,t,n,o,r)=>{var s,a;const i=e.dom,l=null!==(s=bN(i,o))&&void 0!==s?s:i.getRoot();let d=i.getParent(o,i.isBlock);if(!d||!TN(i,d)){if(d=d||l,!d.hasChildNodes()){const o=i.create(t);return CN(e,o),d.appendChild(o),n.setStart(o,0),n.setEnd(o,0),o}let s,c=o;for(;c&&c.parentNode!==d;)c=c.parentNode;for(;c&&!i.isBlock(c);)s=c,c=c.previousSibling;const u=null===(a=null==s?void 0:s.parentElement)||void 0===a?void 0:a.nodeName;if(s&&u&&e.schema.isValidChild(u,t.toLowerCase())){const a=s.parentNode,l=i.create(t);for(CN(e,l),a.insertBefore(l,s),c=s;c&&!i.isBlock(c);){const e=c.nextSibling;l.appendChild(c),c=e}n.setStart(o,r),n.setEnd(o,r)}}return o})(e,c,d,n,o));let k=i.getParent(n,i.isBlock)||i.getRoot();s=C(null==k?void 0:k.parentNode)?i.getParent(k.parentNode,i.isBlock):null,r=k?k.nodeName.toUpperCase():"";const S=s?s.nodeName.toUpperCase():"";if("LI"!==S||E||(k=s,s=s.parentNode,r=S),qo(s)&&((e,t,n)=>!t&&n.nodeName.toLowerCase()===Il(e)&&e.dom.isEmpty(n)&&((t,n,o)=>{let r=n;for(;r&&r!==t&&h(r.nextSibling);){const t=r.parentElement;if(!t||(s=t,!Ee(e.schema.getTextBlockElements(),s.nodeName.toLowerCase())))return gr(t);r=t}var s;return!1})(e.getBody(),n))(e,x,k))return((e,t,n)=>{var o,r,s;const a=t(Il(e)),i=((e,t)=>e.dom.getParent(t,gr))(e,n);i&&(e.dom.insertAfter(a,i),hN(e,a),(null!==(s=null===(r=null===(o=n.parentElement)||void 0===o?void 0:o.childNodes)||void 0===r?void 0:r.length)&&void 0!==s?s:0)>1&&e.dom.remove(n))})(e,b,k);if(/^(LI|DT|DD)$/.test(r)&&qo(s)&&i.isEmpty(k))return void((e,t,n,o,r)=>{const s=e.dom,a=e.selection.getRng(),i=n.parentNode;if(n===e.getBody()||!i)return;var l;EN(l=n)&&EN(l.parentNode)&&(r="LI");const d=_N(o)?NN(o):void 0;let c=_N(o)&&d?t(r,{style:NN(o)}):t(r);if(SN(n,o,!0)&&SN(n,o,!1))if(xN(n,"LI")){const e=kN(n);s.insertAfter(c,e),(e=>{var t;return(null===(t=e.parentNode)||void 0===t?void 0:t.firstChild)===e})(n)?s.remove(e):s.remove(n)}else s.replace(c,n);else if(SN(n,o,!0))xN(n,"LI")?(s.insertAfter(c,kN(n)),c.appendChild(s.doc.createTextNode(" ")),c.appendChild(n)):i.insertBefore(c,n),s.remove(o);else if(SN(n,o,!1))s.insertAfter(c,kN(n)),s.remove(o);else{n=kN(n);const e=a.cloneRange();e.setStartAfter(o),e.setEndAfter(n);const t=e.extractContents();if("LI"===r&&((e,t)=>e.firstChild&&"LI"===e.firstChild.nodeName)(t)){const e=Y(q(c.children,yn),O(Xt("br")));c=t.firstChild,s.insertAfter(t,n),V(e,(e=>bo(yn(c),e))),d&&c.setAttribute("style",d)}else s.insertAfter(t,n),s.insertAfter(c,n);s.remove(o)}hN(e,c)})(e,b,s,k,c);if(!(p||k!==e.getBody()&&TN(i,k)))return;const N=k.parentNode;let R;if(p)R=b(c),f.fold((()=>{vo(u,yn(R))}),(e=>{po(e,yn(R))})),e.selection.setCursorLocation(R,0);else if(Ir(k))R=Vr(k),i.isEmpty(k)&&yN(k),CN(e,R),hN(e,R);else if(v(!1))R=w();else if(v(!0)&&N){R=N.insertBefore(b(),k);const t=yn(d.startContainer).dom.hasChildNodes()&&d.collapsed;hN(e,AN(k,"HR")||t?R:k)}else{const t=(e=>{const t=e.cloneRange();return t.setStart(e.startContainer,ON(!0,e.startContainer,e.startOffset)),t.setEnd(e.endContainer,ON(!1,e.endContainer,e.endOffset)),t})(d).cloneRange();t.setEndAfter(k);const n=t.extractContents();(e=>{V(Fo(yn(e),Kt),(e=>{const t=e.dom;t.nodeValue=Dr(t.data)}))})(n),(e=>{let t=e;do{er(t)&&(t.data=t.data.replace(/^[\r\n]+/,"")),t=t.firstChild}while(t)})(n),R=n.firstChild,i.insertAfter(n,k),((e,t,n)=>{var o;const r=[];if(!n)return;let s=n;for(;s=s.firstChild;){if(e.isBlock(s))return;qo(s)&&!t[s.nodeName.toLowerCase()]&&r.push(s)}let a=r.length;for(;a--;)s=r[a],(!s.hasChildNodes()||s.firstChild===s.lastChild&&""===(null===(o=s.firstChild)||void 0===o?void 0:o.nodeValue)||RN(e,s))&&e.remove(s)})(i,l,R),((e,t)=>{t.normalize();const n=t.lastChild;(!n||qo(n)&&/^(left|right)$/gi.test(e.getStyle(n,"float",!0)))&&e.add(t,"br")})(i,k),i.isEmpty(k)&&yN(k),R.normalize(),i.isEmpty(R)?(i.remove(R),w()):(CN(e,R),hN(e,R))}i.setAttrib(R,"id",""),e.dispatch("NewBlock",{newBlock:R})},fakeEventName:"insertParagraph"},PN=(e,t,n)=>{const o=e.dom.createRng();n?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)),e.selection.setRng(o),sg(e,o)},DN=(e,t)=>{const n=bn("br");po(yn(t),n),e.undoManager.add()},LN=(e,t)=>{MN(e.getBody(),t)||ho(yn(t),bn("br"));const n=bn("br");ho(yn(t),n),PN(e,n.dom,!1),e.undoManager.add()},MN=(e,t)=>{return n=Vi.after(t),!!ar(n.getNode())||Au(e,Vi.after(t)).map((e=>ar(e.getNode()))).getOr(!1);var n},IN=e=>e&&"A"===e.nodeName&&"href"in e,FN=e=>e.fold(L,IN,IN,L),UN=(e,t)=>{t.fold(_,T(DN,e),T(LN,e),_)},zN={insert:(e,t)=>{const n=(e=>{const t=T(Ch,e),n=Vi.fromRangeStart(e.selection.getRng());return iE(t,e.getBody(),n).filter(FN)})(e);n.isSome()?n.each(T(UN,e)):((e,t)=>{const n=e.selection,o=e.dom,r=n.getRng();let s,a=!1;Mf(o,r).each((e=>{r.setStart(e.startContainer,e.startOffset),r.setEnd(e.endContainer,e.endOffset)}));let i=r.startOffset,l=r.startContainer;if(qo(l)&&l.hasChildNodes()){const e=i>l.childNodes.length-1;l=l.childNodes[Math.min(i,l.childNodes.length-1)]||l,i=e&&er(l)?l.data.length:0}let d=o.getParent(l,o.isBlock);const c=d&&d.parentNode?o.getParent(d.parentNode,o.isBlock):null,u=c?c.nodeName.toUpperCase():"",m=!(!t||!t.ctrlKey);"LI"!==u||m||(d=c),er(l)&&i>=l.data.length&&(((e,t,n)=>{const o=new jo(t,n);let r;const s=e.getNonEmptyElements();for(;r=o.next();)if(s[r.nodeName.toLowerCase()]||er(r)&&r.length>0)return!0;return!1})(e.schema,l,d||o.getRoot())||(s=o.create("br"),r.insertNode(s),r.setStartAfter(s),r.setEndAfter(s),a=!0)),s=o.create("br"),Ki(o,r,s),PN(e,s,a),e.undoManager.add()})(e,t)},fakeEventName:"insertLineBreak"},jN=(e,t)=>vN(e).filter((e=>t.length>0&&xn(yn(e),t))).isSome(),HN=hl([{br:[]},{block:[]},{none:[]}]),$N=(e,t)=>(e=>jN(e,jl(e)))(e),qN=e=>(t,n)=>(e=>vN(e).filter((e=>Sr(yn(e)))).isSome())(t)===e,VN=(e,t)=>(n,o)=>{const r=(e=>vN(e).fold(N(""),(e=>e.nodeName.toUpperCase())))(n)===e.toUpperCase();return r===t},WN=e=>{const t=bN(e.dom,e.selection.getStart());return y(t)},KN=e=>VN("pre",e),YN=e=>(t,n)=>Ml(t)===e,GN=(e,t)=>(e=>jN(e,zl(e)))(e),XN=(e,t)=>t,QN=e=>{const t=Il(e),n=bN(e.dom,e.selection.getStart());return C(n)&&e.schema.isValidChild(n.nodeName,t)},JN=e=>{const t=e.selection.getRng(),n=yn(t.startContainer),o=In(n,t.startOffset).map((e=>Vt(e)&&!oo(e)));return t.collapsed&&o.getOr(!0)},ZN=(e,t)=>(n,o)=>X(e,((e,t)=>e&&t(n,o)),!0)?I.some(t):I.none(),eR=(e,t,n)=>{t.selection.isCollapsed()||(e=>{e.execCommand("delete")})(t),C(n)&&uN(t,e.fakeEventName).isDefaultPrevented()||(e.insert(t,n),C(n)&&cN(t,e.fakeEventName))},tR=(e,t)=>{const n=()=>eR(zN,e,t),o=()=>eR(BN,e,t),r=((e,t)=>Qx([ZN([$N],HN.none()),ZN([KN(!0),WN],HN.none()),ZN([VN("summary",!0)],HN.br()),ZN([KN(!0),YN(!1),XN],HN.br()),ZN([KN(!0),YN(!1)],HN.block()),ZN([KN(!0),YN(!0),XN],HN.block()),ZN([KN(!0),YN(!0)],HN.br()),ZN([qN(!0),XN],HN.br()),ZN([qN(!0)],HN.block()),ZN([GN],HN.br()),ZN([XN],HN.br()),ZN([QN],HN.block()),ZN([JN],HN.block())],[e,!(!t||!t.shiftKey)]).getOr(HN.none()))(e,t);switch(Ul(e)){case"linebreak":r.fold(n,n,_);break;case"block":r.fold(o,o,_);break;case"invert":r.fold(o,n,_);break;default:r.fold(n,o,_)}},nR=xt(),oR=nR.os.isiOS()&&nR.browser.isSafari(),rR=(e,t)=>{var n;t.isDefaultPrevented()||(t.preventDefault(),(n=e.undoManager).typing&&(n.typing=!1,n.add()),e.undoManager.transact((()=>{tR(e,t)})))},sR=xt(),aR=e=>e.stopImmediatePropagation(),iR=e=>e.keyCode===af.PAGE_UP||e.keyCode===af.PAGE_DOWN,lR=(e,t,n)=>{n&&!e.get()?t.on("NodeChange",aR,!0):!n&&e.get()&&t.off("NodeChange",aR),e.set(n)},dR=(e,t)=>{const n=t.container(),o=t.offset();return er(n)?(n.insertData(o,e),I.some(Vi(n,o+e.length))):iu(t).map((n=>{const o=vn(e);return t.isAtEnd()?ho(n,o):po(n,o),Vi(o.dom,e.length)}))},cR=T(dR,br),uR=T(dR," "),mR=e=>t=>{e.selection.setRng(t.toRange()),e.nodeChanged()},fR=e=>{const t=Vi.fromRangeStart(e.selection.getRng()),n=yn(e.getBody());if(e.selection.isCollapsed()){const o=T(Ch,e),r=Vi.fromRangeStart(e.selection.getRng());return iE(o,e.getBody(),r).bind((e=>t=>t.fold((t=>Tu(e.dom,Vi.before(t))),(e=>Ou(e)),(e=>Bu(e)),(t=>Au(e.dom,Vi.after(t)))))(n)).map((o=>()=>((e,t,n)=>o=>Zp(e,o,n)?cR(t):uR(t))(n,t,e.schema)(o).each(mR(e))))}return I.none()},gR=e=>{return It(At.browser.isFirefox()&&e.selection.isEditable()&&(t=e.dom,n=e.selection.getRng().startContainer,t.isEditable(t.getParent(n,"summary"))),(()=>{const t=yn(e.getBody());e.selection.isCollapsed()||e.getDoc().execCommand("Delete"),((e,t,n)=>Zp(e,t,n)?cR(t):uR(t))(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each(mR(e))}));var t,n},pR=e=>hc(e)?[{keyCode:af.TAB,action:nk(Ak,e,!0)},{keyCode:af.TAB,shiftKey:!0,action:nk(Ak,e,!1)}]:[],hR=e=>{if(e.addShortcut("Meta+P","","mcePrint"),JS(e),XC(e))return $a(null);{const t=o_(e);return(e=>{e.on("beforeinput",(t=>{e.selection.isEditable()&&!$(t.getTargetRanges(),(t=>!Og(e.dom,t)))||t.preventDefault()}))})(e),(e=>{e.on("keyup compositionstart",T(q_,e))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();ok([{keyCode:af.RIGHT,action:nk(K_,e,!0)},{keyCode:af.LEFT,action:nk(K_,e,!1)},{keyCode:af.UP,action:nk(Y_,e,!1)},{keyCode:af.DOWN,action:nk(Y_,e,!0)},...o?[{keyCode:af.UP,action:nk(X_,e,!1),metaKey:!0,shiftKey:!0},{keyCode:af.DOWN,action:nk(X_,e,!0),metaKey:!0,shiftKey:!0}]:[],{keyCode:af.RIGHT,action:nk(_k,e,!0)},{keyCode:af.LEFT,action:nk(_k,e,!1)},{keyCode:af.UP,action:nk(kk,e,!1)},{keyCode:af.DOWN,action:nk(kk,e,!0)},{keyCode:af.UP,action:nk(kk,e,!1)},{keyCode:af.UP,action:nk(Z_,e,!1)},{keyCode:af.DOWN,action:nk(Z_,e,!0)},{keyCode:af.RIGHT,action:nk(sk,e,!0)},{keyCode:af.LEFT,action:nk(sk,e,!1)},{keyCode:af.UP,action:nk(ak,e,!1)},{keyCode:af.DOWN,action:nk(ak,e,!0)},{keyCode:af.RIGHT,action:nk(t_,e,t,!0)},{keyCode:af.LEFT,action:nk(t_,e,t,!1)},{keyCode:af.RIGHT,ctrlKey:!o,altKey:o,action:nk(r_,e,t)},{keyCode:af.LEFT,ctrlKey:!o,altKey:o,action:nk(s_,e,t)},{keyCode:af.UP,action:nk(J_,e,!1)},{keyCode:af.DOWN,action:nk(J_,e,!0)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{let n=!1;e.on("keydown",(o=>{n=o.keyCode===af.BACKSPACE,o.isDefaultPrevented()||((e,t,n)=>{const o=n.keyCode===af.BACKSPACE?"deleteContentBackward":"deleteContentForward",r=e.selection.isCollapsed(),s=r?"character":"selection",a=e=>r?e?"word":"line":"selection";rk([{keyCode:af.BACKSPACE,action:nk(T_,e)},{keyCode:af.BACKSPACE,action:nk(Ux,e,!1)},{keyCode:af.DELETE,action:nk(Ux,e,!0)},{keyCode:af.BACKSPACE,action:nk(Ox,e,!1)},{keyCode:af.DELETE,action:nk(Ox,e,!0)},{keyCode:af.BACKSPACE,action:nk(d_,e,t,!1)},{keyCode:af.DELETE,action:nk(d_,e,t,!0)},{keyCode:af.BACKSPACE,action:nk(ib,e,!1)},{keyCode:af.DELETE,action:nk(ib,e,!0)},{keyCode:af.BACKSPACE,action:nk(lN,e,!1,s)},{keyCode:af.DELETE,action:nk(lN,e,!0,s)},...gN?[{keyCode:af.BACKSPACE,altKey:!0,action:nk(lN,e,!1,a(!0))},{keyCode:af.DELETE,altKey:!0,action:nk(lN,e,!0,a(!0))},{keyCode:af.BACKSPACE,metaKey:!0,action:nk(lN,e,!1,a(!1))}]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:nk(lN,e,!1,a(!0))},{keyCode:af.DELETE,ctrlKey:!0,action:nk(lN,e,!0,a(!0))}],{keyCode:af.BACKSPACE,action:nk(zx,e,!1)},{keyCode:af.DELETE,action:nk(zx,e,!0)},{keyCode:af.BACKSPACE,action:nk(x_,e,!1)},{keyCode:af.DELETE,action:nk(x_,e,!0)},{keyCode:af.BACKSPACE,action:nk(_x,e,!1)},{keyCode:af.DELETE,action:nk(_x,e,!0)},{keyCode:af.BACKSPACE,action:nk(wx,e,!1)},{keyCode:af.DELETE,action:nk(wx,e,!0)},{keyCode:af.BACKSPACE,action:nk(v_,e,!1)},{keyCode:af.DELETE,action:nk(v_,e,!0)}],n).filter((t=>e.selection.isEditable())).each((t=>{n.preventDefault(),uN(e,o).isDefaultPrevented()||(t(),cN(e,o))}))})(e,t,o)})),e.on("keyup",(t=>{t.isDefaultPrevented()||((e,t,n)=>{ok([{keyCode:af.BACKSPACE,action:nk(Fx,e)},{keyCode:af.DELETE,action:nk(Fx,e)},...gN?[{keyCode:af.BACKSPACE,altKey:!0,action:nk(C_,e)},{keyCode:af.DELETE,altKey:!0,action:nk(C_,e)},...n?[{keyCode:pN?224:91,action:nk(C_,e)}]:[]]:[{keyCode:af.BACKSPACE,ctrlKey:!0,action:nk(C_,e)},{keyCode:af.DELETE,ctrlKey:!0,action:nk(C_,e)}]],t)})(e,t,n),n=!1}))})(e,t),(e=>{let t=I.none();e.on("keydown",(n=>{n.keyCode===af.ENTER&&(oR&&(e=>{if(!e.collapsed)return!1;const t=e.startContainer;if(er(t)){const n=/^[\uAC00-\uD7AF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uD7B0-\uD7FF]$/,o=t.data.charAt(e.startOffset-1);return n.test(o)}return!1})(e.selection.getRng())?(e=>{t=I.some(e.selection.getBookmark()),e.undoManager.add()})(e):rR(e,n))})),e.on("keyup",(n=>{n.keyCode===af.ENTER&&t.each((()=>((e,n)=>{e.undoManager.undo(),t.fold(_,(t=>e.selection.moveToBookmark(t))),rR(e,n),t=I.none()})(e,n)))}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{rk([{keyCode:af.SPACEBAR,action:nk(fR,e)},{keyCode:af.SPACEBAR,action:nk(gR,e)}],t).each((n=>{t.preventDefault(),uN(e,"insertText",{data:" "}).isDefaultPrevented()||(n(),cN(e,"insertText",{data:" "}))}))})(e,t)}))})(e),(e=>{e.on("input",(t=>{t.isComposing||(e=>{const t=yn(e.getBody());e.selection.isCollapsed()&&ih(t,Vi.fromRangeStart(e.selection.getRng()),e.schema).each((t=>{e.selection.setRng(t.toRange())}))})(e)}))})(e),(e=>{e.on("keydown",(t=>{t.isDefaultPrevented()||((e,t)=>{ok([...pR(e)],t).each((e=>{t.preventDefault()}))})(e,t)}))})(e),((e,t)=>{e.on("keydown",(n=>{n.isDefaultPrevented()||((e,t,n)=>{const o=At.os.isMacOS()||At.os.isiOS();ok([{keyCode:af.END,action:nk(G_,e,!0)},{keyCode:af.HOME,action:nk(G_,e,!1)},...o?[]:[{keyCode:af.HOME,action:nk(X_,e,!1),ctrlKey:!0,shiftKey:!0},{keyCode:af.END,action:nk(X_,e,!0),ctrlKey:!0,shiftKey:!0}],{keyCode:af.END,action:nk(ik,e,!0)},{keyCode:af.HOME,action:nk(ik,e,!1)},{keyCode:af.END,action:nk(a_,e,!0,t)},{keyCode:af.HOME,action:nk(a_,e,!1,t)}],n).each((e=>{n.preventDefault()}))})(e,t,n)}))})(e,t),((e,t)=>{if(sR.os.isMacOS())return;const n=$a(!1);e.on("keydown",(t=>{iR(t)&&lR(n,e,!0)})),e.on("keyup",(o=>{o.isDefaultPrevented()||((e,t,n)=>{ok([{keyCode:af.PAGE_UP,action:nk(a_,e,!1,t)},{keyCode:af.PAGE_DOWN,action:nk(a_,e,!0,t)}],n)})(e,t,o),iR(o)&&n.get()&&(lR(n,e,!1),e.nodeChanged())}))})(e,t),t}};class bR{constructor(e){let t;this.lastPath=[],this.editor=e;const n=this;"onselectionchange"in e.getDoc()||e.on("NodeChange click mouseup keyup focus",(n=>{const o=e.selection.getRng(),r={startContainer:o.startContainer,startOffset:o.startOffset,endContainer:o.endContainer,endOffset:o.endOffset};"nodechange"!==n.type&&Af(r,t)||e.dispatch("SelectionChange"),t=r})),e.on("contextmenu",(()=>{e.dispatch("SelectionChange")})),e.on("SelectionChange",(()=>{const t=e.selection.getStart(!0);t&&am(e)&&!n.isSameElementPath(t)&&e.dom.isChildOf(t,e.getBody())&&e.nodeChanged({selectionChange:!0})})),e.on("mouseup",(t=>{!t.isDefaultPrevented()&&am(e)&&("IMG"===e.selection.getNode().nodeName?vg.setEditorTimeout(e,(()=>{e.nodeChanged()})):e.nodeChanged())}))}nodeChanged(e={}){const t=this.editor.selection;let n;if(this.editor.initialized&&t&&!Od(this.editor)&&!this.editor.mode.isReadOnly()){const o=this.editor.getBody();n=t.getStart(!0)||o,n.ownerDocument===this.editor.getDoc()&&this.editor.dom.isChildOf(n,o)||(n=o);const r=[];this.editor.dom.getParent(n,(e=>e===o||(r.push(e),!1))),this.editor.dispatch("NodeChange",{...e,element:n,parents:r})}}isSameElementPath(e){let t;const n=this.editor,o=oe(n.dom.getParents(e,M,n.getBody()));if(o.length===this.lastPath.length){for(t=o.length;t>=0&&o[t]===this.lastPath[t];t--);if(-1===t)return this.lastPath=o,!0}return this.lastPath=o,!1}}const vR=ui("image"),yR=ui("event"),CR=e=>t=>{t[yR]=e},wR=CR(0),xR=CR(2),ER=CR(1),_R=(0,e=>{const t=e;return I.from(t[yR]).exists((e=>0===e))});const kR=ui("mode"),SR=e=>t=>{t[kR]=e},NR=(e,t)=>SR(t)(e),RR=SR(0),AR=SR(2),TR=SR(1),OR=e=>t=>{const n=t;return I.from(n[kR]).exists((t=>t===e))},BR=OR(0),PR=OR(1),DR=["none","copy","link","move"],LR=["none","copy","copyLink","copyMove","link","linkMove","move","all","uninitialized"],MR=()=>{const e=new window.DataTransfer;let t="move",n="all";const o={get dropEffect(){return t},set dropEffect(e){H(DR,e)&&(t=e)},get effectAllowed(){return n},set effectAllowed(e){_R(o)&&H(LR,e)&&(n=e)},get items(){return((e,t)=>({...t,get length(){return t.length},add:(n,o)=>{if(BR(e)){if(!m(n))return t.add(n);if(!v(o))return t.add(n,o)}return null},remove:n=>{BR(e)&&t.remove(n)},clear:()=>{BR(e)&&t.clear()}}))(o,e.items)},get files(){return PR(o)?Object.freeze({length:0,item:e=>null}):e.files},get types(){return e.types},setDragImage:(t,n,r)=>{var s;BR(o)&&(s={image:t,x:n,y:r},o[vR]=s,e.setDragImage(t,n,r))},getData:t=>PR(o)?"":e.getData(t),setData:(t,n)=>{BR(o)&&e.setData(t,n)},clearData:t=>{BR(o)&&e.clearData(t)}};return RR(o),o},IR=(e,t)=>e.setData("text/html",t),FR="x-tinymce/html",UR=N(FR),zR="\x3c!-- "+FR+" --\x3e",jR=e=>zR+e,HR=e=>-1!==e.indexOf(zR),$R="%MCEPASTEBIN%",qR=e=>e.dom.get("mcepastebin"),VR=e=>C(e)&&"mcepastebin"===e.id,WR=e=>e===$R,KR=(e,t)=>(Pt.each(t,(t=>{e=u(t,RegExp)?e.replace(t,""):e.replace(t[0],t[1])})),e),YR=e=>KR(e,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,(e,t,n)=>t||n?br:" "],/<br class="Apple-interchange-newline">/g,/<br>$/i]),GR=(e,t)=>({content:e,cancelled:t}),XR=(e,t)=>(e.insertContent(t,{merge:tc(e),paste:!0}),!0),QR=e=>/^https?:\/\/[\w\-\/+=.,!;:&%@^~(){}?#]+$/i.test(e),JR=(e,t,n)=>!(e.selection.isCollapsed()||!QR(t))&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.execCommand("mceInsertLink",!1,t)})),!0))(e,t,n),ZR=(e,t,n)=>!!((e,t)=>QR(t)&&$(pc(e),(e=>$e(t.toLowerCase(),`.${e.toLowerCase()}`))))(e,t)&&((e,t,n)=>(e.undoManager.extra((()=>{n(e,t)}),(()=>{e.insertContent('<img src="'+t+'">')})),!0))(e,t,n),eA=(e=>{let t=0;return()=>"mceclip"+t++})(),tA=e=>{const t=MR();return IR(t,e),AR(t),t},nA=(e,t,n,o,r)=>{const s=((e,t,n)=>((e,t,n)=>{const o=((e,t,n)=>e.dispatch("PastePreProcess",{content:t,internal:n}))(e,t,n),r=((e,t)=>{const n=bC({sanitize:fc(e),sandbox_iframes:Cc(e)},e.schema);n.addNodeFilter("meta",(e=>{Pt.each(e,(e=>{e.remove()}))}));const o=n.parse(t,{forced_root_block:!1,isRootContent:!0});return up({validate:!0},e.schema).serialize(o)})(e,o.content);return e.hasEventListeners("PastePostProcess")&&!o.isDefaultPrevented()?((e,t,n)=>{const o=e.dom.create("div",{style:"display:none"},t),r=((e,t,n)=>e.dispatch("PastePostProcess",{node:t,internal:n}))(e,o,n);return GR(r.node.innerHTML,r.isDefaultPrevented())})(e,r,n):GR(r,o.isDefaultPrevented())})(e,t,n))(e,t,n);if(!s.cancelled){const t=s.content,n=()=>((e,t,n)=>{n||!nc(e)?XR(e,t):((e,t)=>{Pt.each([JR,ZR,XR],(n=>!n(e,t,XR)))})(e,t)})(e,t,o);r?uN(e,"insertFromPaste",{dataTransfer:tA(t)}).isDefaultPrevented()||(n(),cN(e,"insertFromPaste")):n()}},oA=(e,t,n,o)=>{const r=n||HR(t);nA(e,(e=>e.replace(zR,""))(t),r,!1,o)},rA=(e,t,n)=>{const o=e.dom.encode(t).replace(/\r\n/g,"\n"),r=((e,t,n)=>{const o=e.split(/\n\n/),r=((e,t)=>{let n="<"+e;const o=Ce(t,((e,t)=>t+'="'+ea.encodeAllRaw(e)+'"'));return o.length&&(n+=" "+o.join(" ")),n+">"})(t,n),s="</"+t+">",a=q(o,(e=>e.split(/\n/).join("<br />")));return 1===a.length?a[0]:q(a,(e=>r+e+s)).join("")})(ls(o,rc(e)),Il(e),Fl(e));nA(e,r,!1,!0,n)},sA=e=>{const t={};if(e&&e.types)for(let n=0;n<e.types.length;n++){const o=e.types[n];try{t[o]=e.getData(o)}catch(e){t[o]=""}}return t},aA=(e,t)=>t in e&&e[t].length>0,iA=e=>aA(e,"text/html")||aA(e,"text/plain"),lA=(e,t,n)=>{const o="paste"===t.type?t.clipboardData:t.dataTransfer;var r;if(Gd(e)&&o){const s=((e,t)=>{const n=t.items?te(ce(t.items),(e=>"file"===e.kind?[e.getAsFile()]:[])):[],o=t.files?ce(t.files):[];return Y(n.length>0?n:o,(e=>{const t=pc(e);return e=>He(e.type,"image/")&&$(t,(t=>(e=>{const t=e.toLowerCase(),n={jpg:"jpeg",jpe:"jpeg",jfi:"jpeg",jif:"jpeg",jfif:"jpeg",pjpeg:"jpeg",pjp:"jpeg",svg:"svg+xml"};return Pt.hasOwn(n,t)?"image/"+n[t]:"image/"+t})(t)===e.type))})(e))})(e,o);if(s.length>0)return t.preventDefault(),(r=s,Promise.all(q(r,(e=>Gv(e).then((t=>({file:e,uri:t}))))))).then((t=>{n&&e.selection.setRng(n),V(t,(t=>{((e,t)=>{Kv(t.uri).each((({data:n,type:o,base64Encoded:r})=>{const s=r?n:btoa(n),a=t.file,i=e.editorUpload.blobCache,l=i.getByData(s,o),d=null!=l?l:((e,t,n,o)=>{const r=eA(),s=Vl(e)&&C(n.name),a=s?((e,t)=>{const n=t.match(/([\s\S]+?)(?:\.[a-z0-9.]+)$/i);return C(n)?e.dom.encode(n[1]):void 0})(e,n.name):r,i=s?n.name:void 0,l=t.create(r,n,o,a,i);return t.add(l),l})(e,i,a,s);oA(e,`<img src="${d.blobUri()}">`,!1,!0)}))})(e,t)}))})),!0}return!1},dA=(e,t,n,o,r)=>{let s=YR(n);const a=aA(t,UR())||HR(n),i=!a&&(e=>!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(e))(s),l=QR(s);(WR(s)||!s.length||i&&!l)&&(o=!0),(o||l)&&(s=aA(t,"text/plain")&&i?t["text/plain"]:(e=>{const t=ua(),n=bC({},t);let o="";const r=t.getVoidElements(),s=Pt.makeMap("script noscript style textarea video audio iframe object"," "),a=t.getBlockElements(),i=e=>{const n=e.name,l=e;if("br"!==n){if("wbr"!==n)if(r[n]&&(o+=" "),s[n])o+=" ";else{if(3===e.type&&(o+=e.value),!(e.name in t.getVoidElements())){let t=e.firstChild;if(t)do{i(t)}while(t=t.next)}a[n]&&l.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"};return e=KR(e,[/<!\[[^\]]+\]>/g]),i(n.parse(e)),o})(s)),WR(s)||(o?rA(e,s,r):oA(e,s,a,r))},cA=(e,t,n)=>{((e,t,n)=>{let o;e.on("keydown",(e=>{(e=>af.metaKeyPressed(e)&&86===e.keyCode||e.shiftKey&&45===e.keyCode)(e)&&!e.isDefaultPrevented()&&(o=e.shiftKey&&86===e.keyCode)})),e.on("paste",(r=>{if(r.isDefaultPrevented()||(e=>{var t,n;return At.os.isAndroid()&&0===(null===(n=null===(t=e.clipboardData)||void 0===t?void 0:t.items)||void 0===n?void 0:n.length)})(r))return;const s="text"===n.get()||o;o=!1;const a=sA(r.clipboardData);!iA(a)&&lA(e,r,t.getLastRng()||e.selection.getRng())||(aA(a,"text/html")?(r.preventDefault(),dA(e,a,a["text/html"],s,!0)):aA(a,"text/plain")&&aA(a,"text/uri-list")?(r.preventDefault(),dA(e,a,a["text/plain"],s,!0)):(t.create(),vg.setEditorTimeout(e,(()=>{const n=t.getHtml();t.remove(),dA(e,a,n,s,!1)}),0)))}))})(e,t,n),(e=>{const t=e=>He(e,"webkit-fake-url"),n=e=>He(e,"data:");e.parser.addNodeFilter("img",((o,r,s)=>{if(!Gd(e)&&(e=>{var t;return!0===(null===(t=e.data)||void 0===t?void 0:t.paste)})(s))for(const r of o){const o=r.attr("src");m(o)&&!r.attr("data-mce-object")&&o!==At.transparentSrc&&(t(o)||!sc(e)&&n(o))&&r.remove()}}))})(e)},uA=(e,t,n,o)=>{((e,t,n)=>{if(!e)return!1;try{return e.clearData(),e.setData("text/html",t),e.setData("text/plain",n),e.setData(UR(),t),!0}catch(e){return!1}})(e.clipboardData,t.html,t.text)?(e.preventDefault(),o()):n(t.html,o)},mA=e=>(t,n)=>{const{dom:o,selection:r}=e,s=o.create("div",{contenteditable:"false","data-mce-bogus":"all"}),a=o.create("div",{contenteditable:"true"},t);o.setStyles(s,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),s.appendChild(a),o.add(e.getBody(),s);const i=r.getRng();a.focus();const l=o.createRng();l.selectNodeContents(a),r.setRng(l),vg.setEditorTimeout(e,(()=>{r.setRng(i),o.remove(s),n()}),0)},fA=e=>({html:jR(e.selection.getContent({contextual:!0})),text:e.selection.getContent({format:"text"})}),gA=e=>!e.selection.isCollapsed()||(e=>!!e.dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody()))(e),pA=(e,t)=>{var n,o;return Uf.getCaretRangeFromPoint(null!==(n=t.clientX)&&void 0!==n?n:0,null!==(o=t.clientY)&&void 0!==o?o:0,e.getDoc())},hA=(e,t)=>{e.focus(),t&&e.selection.setRng(t)},bA=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,vA=e=>Pt.trim(e).replace(bA,Ca).toLowerCase(),yA=(e,t,n)=>{const o=Zd(e);if(n||"all"===o||!ec(e))return t;const r=o?o.split(/[, ]/):[];if(r&&"none"!==o){const n=e.dom,o=e.selection.getNode();t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,((e,t,s,a)=>{const i=n.parseStyle(n.decode(s)),l={};for(let e=0;e<r.length;e++){const t=i[r[e]];let s=t,a=n.getStyle(o,r[e],!0);/color/.test(r[e])&&(s=vA(s),a=vA(a)),a!==s&&(l[r[e]]=t)}const d=n.serializeStyle(l,"span");return d?t+' style="'+d+'"'+a:t+a}))}else t=t.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return t=t.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,((e,t,n,o)=>t+' style="'+n+'"'+o)),t},CA=e=>{const t=$a(!1),n=$a(oc(e)?"text":"html"),o=(e=>{const t=$a(null);return{create:()=>((e,t)=>{const{dom:n,selection:o}=e,r=e.getBody();t.set(o.getRng());const s=n.add(e.getBody(),"div",{id:"mcepastebin",class:"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},$R);At.browser.isFirefox()&&n.setStyle(s,"left","rtl"===n.getStyle(r,"direction",!0)?65535:-65535),n.bind(s,"beforedeactivate focusin focusout",(e=>{e.stopPropagation()})),s.focus(),o.select(s,!0)})(e,t),remove:()=>((e,t)=>{const n=e.dom;if(qR(e)){let o;const r=t.get();for(;o=qR(e);)n.remove(o),n.unbind(o);r&&e.selection.setRng(r)}t.set(null)})(e,t),getEl:()=>qR(e),getHtml:()=>(e=>{const t=e.dom,n=(e,n)=>{e.appendChild(n),t.remove(n,!0)},[o,...r]=Y(e.getBody().childNodes,VR);V(r,(e=>{n(o,e)}));const s=t.select("div[id=mcepastebin]",o);for(let e=s.length-1;e>=0;e--){const r=t.create("div");o.insertBefore(r,s[e]),n(r,s[e])}return o?o.innerHTML:""})(e),getLastRng:t.get}})(e);(e=>{(At.browser.isChromium()||At.browser.isSafari())&&((e,t)=>{e.on("PastePreProcess",(n=>{n.content=t(e,n.content,n.internal)}))})(e,yA)})(e),((e,t)=>{e.addCommand("mceTogglePlainTextPaste",(()=>{((e,t)=>{"text"===t.get()?(t.set("html"),sf(e,!1)):(t.set("text"),sf(e,!0)),e.focus()})(e,t)})),e.addCommand("mceInsertClipboardContent",((t,n)=>{n.html&&oA(e,n.html,n.internal,!1),n.text&&rA(e,n.text,!1)}))})(e,n),(e=>{const t=t=>n=>{t(e,n)},n=Xd(e);w(n)&&e.on("PastePreProcess",t(n));const o=Qd(e);w(o)&&e.on("PastePostProcess",t(o))})(e),e.on("PreInit",(()=>{(e=>{e.on("cut",(e=>t=>{!t.isDefaultPrevented()&&gA(e)&&e.selection.isEditable()&&uA(t,fA(e),mA(e),(()=>{if(At.browser.isChromium()||At.browser.isFirefox()){const t=e.selection.getRng();vg.setEditorTimeout(e,(()=>{e.selection.setRng(t),e.execCommand("Delete")}),0)}else e.execCommand("Delete")}))})(e)),e.on("copy",(e=>t=>{!t.isDefaultPrevented()&&gA(e)&&uA(t,fA(e),mA(e),_)})(e))})(e),((e,t)=>{Yd(e)&&e.on("dragend dragover draggesture dragdrop drop drag",(e=>{e.preventDefault(),e.stopPropagation()})),Gd(e)||e.on("drop",(e=>{const t=e.dataTransfer;t&&(e=>$(e.files,(e=>/^image\//.test(e.type))))(t)&&e.preventDefault()})),e.on("drop",(n=>{if(n.isDefaultPrevented())return;const o=pA(e,n);if(y(o))return;const r=sA(n.dataTransfer),s=aA(r,UR());if((!iA(r)||(e=>{const t=e["text/plain"];return!!t&&0===t.indexOf("file://")})(r))&&lA(e,n,o))return;const a=r[UR()],i=a||r["text/html"]||r["text/plain"],l=((e,t,n,o)=>{const r=e.getParent(n,(e=>Ts(t,e)));if(!h(e.getParent(n,"summary")))return!0;if(r&&Ee(o,"text/html")){const e=(new DOMParser).parseFromString(o["text/html"],"text/html").body;return!h(e.querySelector(r.nodeName.toLowerCase()))}return!1})(e.dom,e.schema,o.startContainer,r),d=t.get();d&&!l||i&&(n.preventDefault(),vg.setEditorTimeout(e,(()=>{e.undoManager.transact((()=>{(a||d&&l)&&e.execCommand("Delete"),hA(e,o);const t=YR(i);r["text/html"]?oA(e,t,s,!0):rA(e,t,!0)}))})))})),e.on("dragstart",(e=>{t.set(!0)})),e.on("dragover dragend",(n=>{Gd(e)&&!t.get()&&(n.preventDefault(),hA(e,pA(e,n))),"dragend"===n.type&&t.set(!1)})),(e=>{e.on("input",(t=>{const n=e=>h(e.querySelector("summary"));if("deleteByDrag"===t.inputType){const t=Y(e.dom.select("details"),n);V(t,(t=>{ar(t.firstChild)&&t.firstChild.remove();const n=e.dom.create("summary");n.appendChild(Tr().dom),t.prepend(n)}))}}))})(e)})(e,t),cA(e,o,n)}))},wA=ar,xA=er,EA=e=>dr(e.dom),_A=e=>t=>_n(yn(e),t),kA=(e,t)=>Jn(yn(e),EA,_A(t)),SA=(e,t,n)=>{const o=new jo(e,t),r=n?o.next.bind(o):o.prev.bind(o);let s=e;for(let t=n?e:r();t&&!wA(t);t=r())ts(t)&&(s=t);return s},NA=e=>{const t=((e,t,n)=>{const o=Vi.fromRangeStart(e).getNode(),r=((e,t,n)=>Jn(yn(e),(e=>(e=>lr(e.dom))(e)||n.isBlock(Ht(e))),_A(t)).getOr(yn(t)).dom)(o,t,n),s=SA(o,r,!1),a=SA(o,r,!0),i=document.createRange();return kA(s,r).fold((()=>{xA(s)?i.setStart(s,0):i.setStartBefore(s)}),(e=>i.setStartBefore(e.dom))),kA(a,r).fold((()=>{xA(a)?i.setEnd(a,a.data.length):i.setEndAfter(a)}),(e=>i.setEndAfter(e.dom))),i})(e.selection.getRng(),e.getBody(),e.schema);e.selection.setRng(Eb(t))};var RA;!function(e){e.Before="before",e.After="after"}(RA||(RA={}));const AA=(e,t)=>Math.abs(e.left-t),TA=(e,t)=>Math.abs(e.right-t),OA=(e,t)=>(e=>X(e,((e,t)=>e.fold((()=>I.some(t)),(e=>{const n=Math.min(t.left,e.left),o=Math.min(t.top,e.top),r=Math.max(t.right,e.right),s=Math.max(t.bottom,e.bottom);return I.some({top:o,right:r,bottom:s,left:n,width:r-n,height:s-o})}))),I.none()))(Y(e,(e=>{return(n=t)>=(o=e).top&&n<=o.bottom;var n,o}))).fold((()=>[[],e]),(t=>{const{pass:n,fail:o}=K(e,(e=>((e,t)=>{const n=((e,t)=>Math.max(0,Math.min(e.bottom,t.bottom)-Math.max(e.top,t.top)))(e,t)/Math.min(e.height,t.height);return((e,t)=>e.top<t.bottom&&e.bottom>t.top)(e,t)&&n>.5})(e,t)));return[n,o]})),BA=(e,t,n)=>t>e.left&&t<e.right?0:Math.min(Math.abs(e.left-t),Math.abs(e.right-t)),PA=(e,t,n,o)=>{const r=e=>ts(e.node)?I.some(e):qo(e.node)?PA(ce(e.node.childNodes),t,n,!1):I.none(),s=(e,s)=>{const a=ae(e,((e,o)=>s(e,t,n)-s(o,t,n)));return ue(a,r).map((e=>o&&!er(e.node)&&a.length>1?((e,o,s)=>r(o).filter((o=>Math.abs(s(e,t,n)-s(o,t,n))<2&&er(o.node))))(e,a[1],s).getOr(e):e))},[a,i]=OA(IE(e),n),{pass:l,fail:d}=K(i,(e=>e.top<n));return s(a,BA).orThunk((()=>s(d,Ei))).orThunk((()=>s(l,Ei)))},DA=(e,t,n)=>((e,t,n)=>{const o=yn(e),r=Nn(o),s=Cn(r,t,n).filter((e=>kn(o,e))).getOr(o);return((e,t,n,o)=>{const r=(t,s)=>{const a=Y(t.dom.childNodes,O((e=>qo(e)&&e.classList.contains("mce-drag-container"))));return s.fold((()=>PA(a,n,o,!0)),(e=>{const t=Y(a,(t=>t!==e.dom));return PA(t,n,o,!0)})).orThunk((()=>(_n(t,e)?I.none():Tn(t)).bind((e=>r(e,I.some(t))))))};return r(t,I.none())})(o,s,t,n)})(e,t,n).filter((e=>Mc(e.node))).map((e=>((e,t)=>({node:e.node,position:AA(e,t)<TA(e,t)?RA.Before:RA.After}))(e,t))),LA=e=>{var t,n;const o=e.getBoundingClientRect(),r=e.ownerDocument,s=r.documentElement,a=r.defaultView;return{top:o.top+(null!==(t=null==a?void 0:a.scrollY)&&void 0!==t?t:0)-s.clientTop,left:o.left+(null!==(n=null==a?void 0:a.scrollX)&&void 0!==n?n:0)-s.clientLeft}},MA=e=>({target:e,srcElement:e}),IA=(e,t,n,o)=>{const r=((e,t)=>{const n=(e=>{const t=MR(),n=(e=>{const t=e;return I.from(t[kR])})(e);return AR(e),wR(t),t.dropEffect=e.dropEffect,t.effectAllowed=e.effectAllowed,(e=>{const t=e;return I.from(t[vR])})(e).each((e=>t.setDragImage(e.image,e.x,e.y))),V(e.types,(n=>{"Files"!==n&&t.setData(n,e.getData(n))})),V(e.files,(e=>t.items.add(e))),(e=>{const t=e;return I.from(t[yR])})(e).each((e=>{((e,t)=>{CR(t)(e)})(t,e)})),n.each((n=>{NR(e,n),NR(t,n)})),t})(e);return"dragstart"===t?(wR(n),RR(n)):"drop"===t?(xR(n),AR(n)):(ER(n),TR(n)),n})(n,e);return v(o)?((e,t,n)=>{const o=B("Function not supported on simulated event.");return{bubbles:!0,cancelBubble:!1,cancelable:!0,composed:!1,currentTarget:null,defaultPrevented:!1,eventPhase:0,isTrusted:!0,returnValue:!1,timeStamp:0,type:e,composedPath:o,initEvent:o,preventDefault:_,stopImmediatePropagation:_,stopPropagation:_,AT_TARGET:window.Event.AT_TARGET,BUBBLING_PHASE:window.Event.BUBBLING_PHASE,CAPTURING_PHASE:window.Event.CAPTURING_PHASE,NONE:window.Event.NONE,altKey:!1,button:0,buttons:0,clientX:0,clientY:0,ctrlKey:!1,metaKey:!1,movementX:0,movementY:0,offsetX:0,offsetY:0,pageX:0,pageY:0,relatedTarget:null,screenX:0,screenY:0,shiftKey:!1,x:0,y:0,detail:0,view:null,which:0,initUIEvent:o,initMouseEvent:o,getModifierState:o,dataTransfer:n,...MA(t)}})(e,t,r):((e,t,n,o)=>({...t,dataTransfer:o,type:e,...MA(n)}))(e,o,t,r)},FA=dr,UA=((...e)=>t=>{for(let n=0;n<e.length;n++)if(e[n](t))return!0;return!1})(FA,lr),zA=(e,t,n,o)=>{const r=e.dom,s=t.cloneNode(!0);r.setStyles(s,{width:n,height:o}),r.setAttrib(s,"data-mce-selected",null);const a=r.create("div",{class:"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return r.setStyles(a,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:o}),r.setStyles(s,{margin:0,boxSizing:"border-box"}),a.appendChild(s),a},jA=(e,t)=>n=>()=>{const o="left"===e?n.scrollX:n.scrollY;n.scroll({[e]:o+t,behavior:"smooth"})},HA=jA("left",-32),$A=jA("left",32),qA=jA("top",-32),VA=jA("top",32),WA=e=>{e&&e.parentNode&&e.parentNode.removeChild(e)},KA=(e,t,n,o,r)=>{"dragstart"===t&&IR(o,e.dom.getOuterHTML(n));const s=IA(t,n,o,r);return e.dispatch(t,s)},YA=(e,t)=>{const n=Qa(((e,n)=>((e,t,n)=>{e._selectionOverrides.hideFakeCaret(),DA(e.getBody(),t,n).fold((()=>e.selection.placeCaretAt(t,n)),(o=>{const r=e._selectionOverrides.showCaret(1,o.node,o.position===RA.Before,!1);r?e.selection.setRng(r):e.selection.placeCaretAt(t,n)}))})(t,e,n)),0);t.on("remove",n.cancel);const o=e;return r=>e.on((e=>{const s=Math.max(Math.abs(r.screenX-e.screenX),Math.abs(r.screenY-e.screenY));if(!e.dragging&&s>10){const n=KA(t,"dragstart",e.element,e.dataTransfer,r);if(C(n.dataTransfer)&&(e.dataTransfer=n.dataTransfer),n.isDefaultPrevented())return;e.dragging=!0,t.focus()}if(e.dragging){const s=r.currentTarget===t.getDoc().documentElement,l=((e,t)=>({pageX:t.pageX-e.relX,pageY:t.pageY+5}))(e,((e,t)=>{return n=(e=>e.inline?LA(e.getBody()):{left:0,top:0})(e),o=(e=>{const t=e.getBody();return e.inline?{left:t.scrollLeft,top:t.scrollTop}:{left:0,top:0}})(e),r=((e,t)=>{if(t.target.ownerDocument!==e.getDoc()){const n=LA(e.getContentAreaContainer()),o=(e=>{const t=e.getBody(),n=e.getDoc().documentElement,o={left:t.scrollLeft,top:t.scrollTop},r={left:t.scrollLeft||n.scrollLeft,top:t.scrollTop||n.scrollTop};return e.inline?o:r})(e);return{left:t.pageX-n.left+o.left,top:t.pageY-n.top+o.top}}return{left:t.pageX,top:t.pageY}})(e,t),{pageX:r.left-n.left+o.left,pageY:r.top-n.top+o.top};var n,o,r})(t,r));a=e.ghost,i=t.getBody(),a.parentNode!==i&&i.appendChild(a),((e,t,n,o,r,s,a,i,l,d,c,u)=>{let m=0,f=0;e.style.left=t.pageX+"px",e.style.top=t.pageY+"px",t.pageX+n>r&&(m=t.pageX+n-r),t.pageY+o>s&&(f=t.pageY+o-s),e.style.width=n-m+"px",e.style.height=o-f+"px";const g=l.clientHeight,p=l.clientWidth,h=a+l.getBoundingClientRect().top,b=i+l.getBoundingClientRect().left;c.on((e=>{e.intervalId.clear(),e.dragging&&u&&(a+8>=g?e.intervalId.set(VA(d)):a-8<=0?e.intervalId.set(qA(d)):i+8>=p?e.intervalId.set($A(d)):i-8<=0?e.intervalId.set(HA(d)):h+16>=window.innerHeight?e.intervalId.set(VA(window)):h-16<=0?e.intervalId.set(qA(window)):b+16>=window.innerWidth?e.intervalId.set($A(window)):b-16<=0&&e.intervalId.set(HA(window)))}))})(e.ghost,l,e.width,e.height,e.maxX,e.maxY,r.clientY,r.clientX,t.getContentAreaContainer(),t.getWin(),o,s),n.throttle(r.clientX,r.clientY)}var a,i}))},GA=(e,t,n)=>{e.on((e=>{e.intervalId.clear(),e.dragging&&n.fold((()=>KA(t,"dragend",e.element,e.dataTransfer)),(n=>KA(t,"dragend",e.element,e.dataTransfer,n)))})),XA(e)},XA=e=>{e.on((e=>{e.intervalId.clear(),WA(e.ghost)})),e.clear()},QA=e=>{const t=Xa(),n=za.DOM,o=document,r=((e,t)=>n=>{if((e=>0===e.button)(n)){const o=J(t.dom.getParents(n.target),UA).getOr(null);if(C(o)&&((e,t,n)=>FA(n)&&n!==t&&e.isEditable(n.parentElement))(t.dom,t.getBody(),o)){const r=t.dom.getPos(o),s=t.getBody(),a=t.getDoc().documentElement;e.set({element:o,dataTransfer:MR(),dragging:!1,screenX:n.screenX,screenY:n.screenY,maxX:(t.inline?s.scrollWidth:a.offsetWidth)-2,maxY:(t.inline?s.scrollHeight:a.offsetHeight)-2,relX:n.pageX-r.x,relY:n.pageY-r.y,width:o.offsetWidth,height:o.offsetHeight,ghost:zA(t,o,o.offsetWidth,o.offsetHeight),intervalId:Ga(100)})}}})(t,e),s=YA(t,e),a=((e,t)=>n=>{e.on((e=>{var o;if(e.intervalId.clear(),e.dragging){if(((e,t,n)=>!y(t)&&t!==n&&!e.dom.isChildOf(t,n)&&e.dom.isEditable(t))(t,(e=>{const t=e.getSel();if(C(t)){const e=t.getRangeAt(0).startContainer;return er(e)?e.parentNode:e}return null})(t.selection),e.element)){const r=null!==(o=t.getDoc().elementFromPoint(n.clientX,n.clientY))&&void 0!==o?o:t.getBody();KA(t,"drop",r,e.dataTransfer,n).isDefaultPrevented()||t.undoManager.transact((()=>{((e,t)=>{const n=e.getParent(t.parentNode,e.isBlock);WA(t),n&&n!==e.getRoot()&&e.isEmpty(n)&&Or(yn(n))})(t.dom,e.element),(e=>{const t=e.getData("text/html");return""===t?I.none():I.some(t)})(e.dataTransfer).each((e=>t.insertContent(e))),t._selectionOverrides.hideFakeCaret()}))}KA(t,"dragend",t.getBody(),e.dataTransfer,n)}})),XA(e)})(t,e),i=((e,t)=>n=>GA(e,t,I.some(n)))(t,e);e.on("mousedown",r),e.on("mousemove",s),e.on("mouseup",a),n.bind(o,"mousemove",s),n.bind(o,"mouseup",i),e.on("remove",(()=>{n.unbind(o,"mousemove",s),n.unbind(o,"mouseup",i)})),e.on("keydown",(n=>{n.keyCode===af.ESC&&GA(t,e,I.none())}))},JA=dr,ZA=(e,t)=>lb(e.getBody(),t),eT=e=>{const t=e.selection,n=e.dom,o=e.getBody(),r=Pc(e,o,n.isBlock,(()=>Rg(e))),s="sel-"+n.uniqueId(),a="data-mce-selected";let i;const l=e=>e!==o&&(JA(e)||mr(e))&&n.isChildOf(e,o)&&n.isEditable(e.parentNode),d=(n,o,s,a=!0)=>e.dispatch("ShowCaret",{target:o,direction:n,before:s}).isDefaultPrevented()?null:(a&&t.scrollIntoView(o,-1===n),r.show(s,o)),c=e=>Ur(e)||$r(e)||qr(e),u=e=>c(e.startContainer)||c(e.endContainer),m=t=>{const o=e.schema.getVoidElements(),r=n.createRng(),s=t.startContainer,a=t.startOffset,i=t.endContainer,l=t.endOffset;return Ee(o,s.nodeName.toLowerCase())?0===a?r.setStartBefore(s):r.setStartAfter(s):r.setStart(s,a),Ee(o,i.nodeName.toLowerCase())?0===l?r.setEndBefore(i):r.setEndAfter(i):r.setEnd(i,l),r},f=(r,c)=>{if(!r)return null;if(r.collapsed){if(!u(r)){const e=c?1:-1,t=au(e,o,r),s=t.getNode(!c);if(C(s)){if(Mc(s))return d(e,s,!!c&&!t.isAtEnd(),!1);if(Fr(s)&&dr(s.nextSibling)){const e=n.createRng();return e.setStart(s,0),e.setEnd(s,0),e}}const a=t.getNode(c);if(C(a)){if(Mc(a))return d(e,a,!c&&!t.isAtEnd(),!1);if(Fr(a)&&dr(a.previousSibling)){const e=n.createRng();return e.setStart(a,1),e.setEnd(a,1),e}}}return null}let m=r.startContainer,f=r.startOffset;const g=r.endOffset;if(er(m)&&0===f&&JA(m.parentNode)&&(m=m.parentNode,f=n.nodeIndex(m),m=m.parentNode),!qo(m))return null;if(g===f+1&&m===r.endContainer){const o=m.childNodes[f];if(l(o))return(o=>{const r=o.cloneNode(!0),l=e.dispatch("ObjectSelected",{target:o,targetClone:r});if(l.isDefaultPrevented())return null;const d=((o,r)=>{const a=yn(e.getBody()),i=e.getDoc(),l=to(a,"#"+s).getOrThunk((()=>{const e=hn('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>',i);return Jt(e,"id",s),vo(a,e),e})),d=n.createRng();wo(l),Co(l,[vn(br,i),yn(r),vn(br,i)]),d.setStart(l.dom.firstChild,1),d.setEnd(l.dom.lastChild,0),lo(l,{top:n.getPos(o,e.getBody()).y+"px"}),ag(l);const c=t.getSel();return c&&(c.removeAllRanges(),c.addRange(d)),d})(o,l.targetClone),c=yn(o);return V(Uo(yn(e.getBody()),`*[${a}]`),(e=>{_n(c,e)||on(e,a)})),n.getAttrib(o,a)||o.setAttribute(a,"1"),i=o,p(),d})(o)}return null},g=()=>{i&&i.removeAttribute(a),to(yn(e.getBody()),"#"+s).each(xo),i=null},p=()=>{r.hide()};return XC(e)||(e.on("click",(t=>{n.isEditable(t.target)||(t.preventDefault(),e.focus())})),e.on("blur NewBlock",g),e.on("ResizeWindow FullscreenStateChanged",r.reposition),e.on("tap",(t=>{const n=t.target,o=ZA(e,n);JA(o)?(t.preventDefault(),Sx(e,o).each(f)):l(n)&&Sx(e,n).each(f)}),!0),e.on("mousedown",(r=>{const s=r.target;if(s!==o&&"HTML"!==s.nodeName&&!n.isChildOf(s,o))return;if(!((e,t,n)=>{const o=yn(e.getBody()),r=e.inline?o:yn(Nn(o).dom.documentElement),s=((e,t,n,o)=>{const r=(e=>e.dom.getBoundingClientRect())(t);return{x:n-(e?r.left+t.dom.clientLeft+Aw(t):0),y:o-(e?r.top+t.dom.clientTop+Rw(t):0)}})(e.inline,r,t,n);return((e,t,n)=>{const o=Sw(e),r=Nw(e);return t>=0&&n>=0&&t<=o&&n<=r})(r,s.x,s.y)})(e,r.clientX,r.clientY))return;g(),p();const a=ZA(e,s);JA(a)?(r.preventDefault(),Sx(e,a).each(f)):DA(o,r.clientX,r.clientY).each((n=>{var o;r.preventDefault(),(o=d(1,n.node,n.position===RA.Before,!1))&&t.setRng(o),Vo(a)?a.focus():e.getBody().focus()}))})),e.on("keypress",(e=>{af.modifierPressed(e)||JA(t.getNode())&&e.preventDefault()})),e.on("GetSelectionRange",(e=>{let t=e.range;if(i){if(!i.parentNode)return void(i=null);t=t.cloneRange(),t.selectNode(i),e.range=t}})),e.on("SetSelectionRange",(e=>{e.range=m(e.range);const t=f(e.range,e.forward);t&&(e.range=t)})),e.on("AfterSetSelectionRange",(e=>{const t=e.range,o=t.startContainer.parentElement;var r;u(t)||qo(r=o)&&"mcepastebin"===r.id||p(),(e=>C(e)&&n.hasClass(e,"mce-offscreen-selection"))(o)||g()})),(e=>{QA(e),Id(e)&&(e=>{const t=t=>{if(!t.isDefaultPrevented()){const n=t.dataTransfer;n&&(H(n.types,"Files")||n.files.length>0)&&(t.preventDefault(),"drop"===t.type&&Lw(e,"Dropped file type is not supported"))}},n=n=>{xg(e,n.target)&&t(n)},o=()=>{const o=za.DOM,r=e.dom,s=document,a=e.inline?e.getBody():e.getDoc(),i=["drop","dragover"];V(i,(e=>{o.bind(s,e,n),r.bind(a,e,t)})),e.on("remove",(()=>{V(i,(e=>{o.unbind(s,e,n),r.unbind(a,e,t)}))}))};e.on("init",(()=>{vg.setEditorTimeout(e,o,0)}))})(e)})(e),(e=>{const t=Qa((()=>{if(!e.removed&&e.getBody().contains(document.activeElement)){const t=e.selection.getRng();if(t.collapsed){const n=Nx(e,t,!1);e.selection.setRng(n)}}}),0);e.on("focus",(()=>{t.throttle()})),e.on("blur",(()=>{t.cancel()}))})(e),(e=>{e.on("init",(()=>{e.on("focusin",(t=>{const n=t.target;if(mr(n)){const t=lb(e.getBody(),n),o=dr(t)?t:n;e.selection.getNode()!==o&&Sx(e,o).each((t=>e.selection.setRng(t)))}}))}))})(e)),{showCaret:d,showBlockCaretContainer:e=>{e.hasAttribute("data-mce-caret")&&(Vr(e),t.scrollIntoView(e))},hideFakeCaret:p,destroy:()=>{r.destroy(),i=null}}},tT=(e,t)=>{let n=t;for(let t=e.previousSibling;er(t);t=t.previousSibling)n+=t.data.length;return n},nT=(e,t,n,o,r)=>{if(er(n)&&(o<0||o>n.data.length))return[];const s=r&&er(n)?[tT(n,o)]:[o];let a=n;for(;a!==t&&a.parentNode;)s.push(e.nodeIndex(a,r)),a=a.parentNode;return a===t?s.reverse():[]},oT=(e,t,n,o,r,s,a=!1)=>({start:nT(e,t,n,o,a),end:nT(e,t,r,s,a)}),rT=(e,t)=>{const n=t.slice(),o=n.pop();return x(o)?X(n,((e,t)=>e.bind((e=>I.from(e.childNodes[t])))),I.some(e)).bind((e=>er(e)&&(o<0||o>e.data.length)?I.none():I.some({node:e,offset:o}))):I.none()},sT=(e,t)=>rT(e,t.start).bind((({node:n,offset:o})=>rT(e,t.end).map((({node:e,offset:t})=>{const r=document.createRange();return r.setStart(n,o),r.setEnd(e,t),r})))),aT=(e,t,n)=>{if(t&&e.isEmpty(t)&&!n(t)){const o=t.parentNode;e.remove(t,er(t.firstChild)&&ss(t.firstChild.data)),aT(e,o,n)}},iT=(e,t,n,o=!0)=>{const r=t.startContainer.parentNode,s=t.endContainer.parentNode;t.deleteContents(),o&&!n(t.startContainer)&&(er(t.startContainer)&&0===t.startContainer.data.length&&e.remove(t.startContainer),er(t.endContainer)&&0===t.endContainer.data.length&&e.remove(t.endContainer),aT(e,r,n),r!==s&&aT(e,s,n))},lT=(e,t)=>I.from(e.dom.getParent(t.startContainer,e.dom.isBlock)),dT=(e,t,n)=>{const o=e.dynamicPatternsLookup({text:n,block:t});return{...e,blockPatterns:Cl(o).concat(e.blockPatterns),inlinePatterns:wl(o).concat(e.inlinePatterns)}},cT=(e,t,n,o)=>{const r=e.createRng();return r.setStart(t,0),r.setEnd(n,o),r.toString()},uT=(e,t,n)=>{((e,t,n)=>{if(er(e)&&0>=e.length)return I.some(Tk(e,0));{const t=hi(Ok);return I.from(t.forwards(e,0,Bk(e),n)).map((e=>Tk(e.container,0)))}})(t,0,t).each((o=>{const r=o.container;Lk(r,n.start.length,t).each((n=>{const o=e.createRng();o.setStart(r,0),o.setEnd(n.container,n.offset),iT(e,o,(e=>e===t))}));const s=yn(r),a=Cr(s);/^\s[^\s]/.test(a)&&((e,t)=>{yr.set(e,t)})(s,a.slice(1))}))},mT=(e,t)=>e.create("span",{"data-mce-type":"bookmark",id:t}),fT=(e,t)=>{const n=e.createRng();return n.setStartAfter(t.start),n.setEndBefore(t.end),n},gT=(e,t,n)=>{const o=sT(e.getRoot(),n).getOrDie("Unable to resolve path range"),r=o.startContainer,s=o.endContainer,a=0===o.endOffset?s:s.splitText(o.endOffset),i=0===o.startOffset?r:r.splitText(o.startOffset),l=i.parentNode;return{prefix:t,end:a.parentNode.insertBefore(mT(e,t+"-end"),a),start:l.insertBefore(mT(e,t+"-start"),i)}},pT=(e,t,n)=>{aT(e,e.get(t.prefix+"-end"),n),aT(e,e.get(t.prefix+"-start"),n)},hT=e=>0===e.start.length,bT=(e,t,n,o)=>{const r=t.start;var s;return Mk(e,o.container,o.offset,(s=r,(e,t)=>{const n=e.data.substring(0,t),o=n.lastIndexOf(s.charAt(s.length-1)),r=n.lastIndexOf(s);return-1!==r?r+s.length:-1!==o?o+1:-1}),n).bind((o=>{var s,a;const i=null!==(a=null===(s=n.textContent)||void 0===s?void 0:s.indexOf(r))&&void 0!==a?a:-1;if(-1!==i&&o.offset>=i+r.length){const t=e.createRng();return t.setStart(o.container,o.offset-r.length),t.setEnd(o.container,o.offset),I.some(t)}{const s=o.offset-r.length;return Dk(o.container,s,n).map((t=>{const n=e.createRng();return n.setStart(t.container,t.offset),n.setEnd(o.container,o.offset),n})).filter((e=>e.toString()===r)).orThunk((()=>bT(e,t,n,Tk(o.container,0))))}}))},vT=(e,t,n,o)=>{const r=e.dom,s=r.getRoot(),a=n.pattern,i=n.position.container,l=n.position.offset;return Dk(i,l-n.pattern.end.length,t).bind((d=>{const c=oT(r,s,d.container,d.offset,i,l,o);if(hT(a))return I.some({matches:[{pattern:a,startRng:c,endRng:c}],position:d});{const i=yT(e,n.remainingPatterns,d.container,d.offset,t,o),l=i.getOr({matches:[],position:d}),u=l.position,m=((e,t,n,o,r,s=!1)=>{if(0===t.start.length&&!s){const t=e.createRng();return t.setStart(n,o),t.setEnd(n,o),I.some(t)}return Pk(n,o,r).bind((n=>bT(e,t,r,n).bind((e=>{var t;if(s){if(e.endContainer===n.container&&e.endOffset===n.offset)return I.none();if(0===n.offset&&(null===(t=e.endContainer.textContent)||void 0===t?void 0:t.length)===e.endOffset)return I.none()}return I.some(e)}))))})(r,a,u.container,u.offset,t,i.isNone());return m.map((e=>{const t=((e,t,n,o=!1)=>oT(e,t,n.startContainer,n.startOffset,n.endContainer,n.endOffset,o))(r,s,e,o);return{matches:l.matches.concat([{pattern:a,startRng:t,endRng:c}]),position:Tk(e.startContainer,e.startOffset)}}))}}))},yT=(e,t,n,o,r,s)=>{const a=e.dom;return Pk(n,o,a.getRoot()).bind((i=>{const l=cT(a,r,n,o);for(let a=0;a<t.length;a++){const d=t[a];if(!$e(l,d.end))continue;const c=t.slice();c.splice(a,1);const u=vT(e,r,{pattern:d,remainingPatterns:c,position:i},s);if(u.isNone()&&o>0)return yT(e,t,n,o-1,r,s);if(u.isSome())return u}return I.none()}))},CT=(e,t,n)=>{e.selection.setRng(n),"inline-format"===t.type?V(t.format,(t=>{e.formatter.apply(t)})):e.execCommand(t.cmd,!1,t.value)},wT=(e,t,n,o,r,s)=>{var a;return((e,t)=>{const n=ne(e,(e=>$(t,(t=>e.pattern.start===t.pattern.start&&e.pattern.end===t.pattern.end))));return e.length===t.length?n?e:t:e.length>t.length?e:t})(yT(e,r.inlinePatterns,n,o,t,s).fold((()=>[]),(e=>e.matches)),yT(e,(a=r.inlinePatterns,ae(a,((e,t)=>t.end.length-e.end.length))),n,o,t,s).fold((()=>[]),(e=>e.matches)))},xT=(e,t)=>{if(0===t.length)return;const n=e.dom,o=e.selection.getBookmark(),r=((e,t)=>{const n=ui("mce_textpattern"),o=G(t,((t,o)=>{const r=gT(e,n+`_end${t.length}`,o.endRng);return t.concat([{...o,endMarker:r}])}),[]);return G(o,((t,r)=>{const s=o.length-t.length-1,a=hT(r.pattern)?r.endMarker:gT(e,n+`_start${s}`,r.startRng);return t.concat([{...r,startMarker:a}])}),[])})(n,t);V(r,(t=>{const o=n.getParent(t.startMarker.start,n.isBlock),r=e=>e===o;hT(t.pattern)?((e,t,n,o)=>{const r=fT(e.dom,n);iT(e.dom,r,o),CT(e,t,r)})(e,t.pattern,t.endMarker,r):((e,t,n,o,r)=>{const s=e.dom,a=fT(s,o),i=fT(s,n);iT(s,i,r),iT(s,a,r);const l={prefix:n.prefix,start:n.end,end:o.start},d=fT(s,l);CT(e,t,d)})(e,t.pattern,t.startMarker,t.endMarker,r),pT(n,t.endMarker,r),pT(n,t.startMarker,r)})),e.selection.moveToBookmark(o)},ET=(e,t)=>{const n=e.selection.getRng();return lT(e,n).map((o=>{var r;const s=Math.max(0,n.startOffset),a=dT(t,o,null!==(r=o.textContent)&&void 0!==r?r:""),i=wT(e,o,n.startContainer,s,a,!0),l=((e,t,n,o)=>{var r;const s=e.dom,a=Il(e);if(!s.is(t,a))return[];const i=null!==(r=t.textContent)&&void 0!==r?r:"";return((e,t)=>{const n=(e=>ae(e,((e,t)=>t.start.length-e.start.length)))(e),o=t.replace(br," ");return J(n,(e=>0===t.indexOf(e.start)||0===o.indexOf(e.start)))})(n.blockPatterns,i).map((e=>Pt.trim(i).length===e.start.length?[]:[{pattern:e,range:oT(s,s.getRoot(),t,0,t,0,true)}])).getOr([])})(e,o,a);return(l.length>0||i.length>0)&&(e.undoManager.add(),e.undoManager.extra((()=>{e.execCommand("mceInsertNewLine")}),(()=>{(e=>{e.insertContent(Br,{preserve_zwsp:!0})})(e),xT(e,i),((e,t)=>{if(0===t.length)return;const n=e.selection.getBookmark();V(t,(t=>((e,t)=>{const n=e.dom,o=t.pattern,r=sT(n.getRoot(),t.range).getOrDie("Unable to resolve path range");return lT(e,r).each((t=>{"block-format"===o.type?((e,t)=>{const n=t.get(e);return p(n)&&le(n).exists((e=>Ee(e,"block")))})(o.format,e.formatter)&&e.undoManager.transact((()=>{uT(e.dom,t,o),e.formatter.apply(o.format)})):"block-command"===o.type&&e.undoManager.transact((()=>{uT(e.dom,t,o),e.execCommand(o.cmd,!1,o.value)}))})),!0})(e,t))),e.selection.moveToBookmark(n)})(e,l);const t=e.selection.getRng(),n=Pk(t.startContainer,t.startOffset,e.dom.getRoot());e.execCommand("mceInsertNewLine"),n.each((t=>{const n=t.container;n.data.charAt(t.offset-1)===hr&&(n.deleteData(t.offset-1,1),aT(e.dom,n.parentNode,(t=>t===e.dom.getRoot())))}))})),!0)})).getOr(!1)},_T=(e,t,n)=>{for(let o=0;o<e.length;o++)if(n(e[o],t))return!0;return!1},kT=e=>{const t=Pt.each,n=af.BACKSPACE,o=af.DELETE,r=e.dom,s=e.selection,a=e.parser,i=At.browser,l=i.isFirefox(),d=i.isChromium()||i.isSafari(),c=At.deviceType.isiPhone()||At.deviceType.isiPad(),u=At.os.isMacOS()||At.os.isiOS(),f=(t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},g=e=>e.isDefaultPrevented(),p=()=>{e.shortcuts.add("meta+a",null,"SelectAll")},h=()=>{e.inline||r.bind(e.getDoc(),"mousedown mouseup",(t=>{let n;if(t.target===e.getDoc().documentElement)if(n=s.getRng(),e.getBody().focus(),"mousedown"===t.type){if(Ur(n.startContainer))return;s.placeCaretAt(t.clientX,t.clientY)}else s.setRng(n)}))},b=()=>{Range.prototype.getClientRects||e.on("mousedown",(t=>{if(!g(t)&&"HTML"===t.target.nodeName){const t=e.getBody();t.blur(),vg.setEditorTimeout(e,(()=>{t.focus()}))}}))},v=()=>{const t=zd(e);e.on("click",(n=>{const o=n.target;/^(IMG|HR)$/.test(o.nodeName)&&r.isEditable(o)&&(n.preventDefault(),e.selection.select(o),e.nodeChanged()),"A"===o.nodeName&&r.hasClass(o,t)&&0===o.childNodes.length&&r.isEditable(o.parentNode)&&(n.preventDefault(),s.select(o))}))},y=()=>{e.on("keydown",(e=>{if(!g(e)&&e.keyCode===n&&s.isCollapsed()&&0===s.getRng().startOffset){const t=s.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}return!0}))},C=()=>{Bd(e)||e.on("BeforeExecCommand mousedown",(()=>{f("StyleWithCSS",!1),f("enableInlineTableEditing",!1),cd(e)||f("enableObjectResizing",!1)}))},w=()=>{e.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")},x=()=>{e.inline||e.on("keydown",(()=>{document.activeElement===document.body&&e.getWin().focus()}))},E=()=>{e.inline||(e.contentStyles.push("body {min-height: 150px}"),e.on("click",(t=>{let n;"HTML"===t.target.nodeName&&(n=e.selection.getRng(),e.getBody().focus(),e.selection.setRng(n),e.selection.normalize(),e.nodeChanged())})))},k=()=>{u&&e.on("keydown",(t=>{!af.metaKeyPressed(t)||t.shiftKey||37!==t.keyCode&&39!==t.keyCode||(t.preventDefault(),e.selection.getSel().modify("move",37===t.keyCode?"backward":"forward","lineboundary"))}))},S=()=>{e.on("click",(e=>{let t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)})),e.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")},N=()=>{e.on("init",(()=>{e.dom.bind(e.getBody(),"submit",(e=>{e.preventDefault()}))}))},R=_;return XC(e)?(d&&(h(),v(),N(),p(),c&&(x(),E(),S())),l&&(b(),C(),w(),k())):(e.on("keydown",(t=>{if(g(t)||t.keyCode!==af.BACKSPACE)return;let n=s.getRng();const o=n.startContainer,a=n.startOffset,i=r.getRoot();let l=o;if(n.collapsed&&0===a){for(;l.parentNode&&l.parentNode.firstChild===l&&l.parentNode!==i;)l=l.parentNode;"BLOCKQUOTE"===l.nodeName&&(e.formatter.toggle("blockquote",void 0,l),n=r.createRng(),n.setStart(o,0),n.setEnd(o,0),s.setRng(n))}})),(()=>{const t=e=>{const t=r.create("body"),n=e.cloneContents();return t.appendChild(n),s.serializer.serialize(t,{format:"html"})};e.on("keydown",(s=>{const a=s.keyCode;if(!g(s)&&(a===o||a===n)&&e.selection.isEditable()){const n=e.selection.isCollapsed(),o=e.getBody();if(n&&!gs(yn(o)))return;if(!n&&!(n=>{const o=t(n),s=r.createRng();return s.selectNode(e.getBody()),o===t(s)})(e.selection.getRng()))return;s.preventDefault(),e.setContent(""),o.firstChild&&r.isBlock(o.firstChild)?e.selection.setCursorLocation(o.firstChild,0):e.selection.setCursorLocation(o,0),e.nodeChanged()}}))})(),At.windowsPhone||e.on("keyup focusin mouseup",(t=>{af.modifierPressed(t)||(e=>{const t=e.getBody(),n=e.selection.getRng();return n.startContainer===n.endContainer&&n.startContainer===t&&0===n.startOffset&&n.endOffset===t.childNodes.length})(e)||s.normalize()}),!0),d&&(h(),v(),e.on("init",(()=>{f("DefaultParagraphSeparator",Il(e))})),N(),y(),a.addNodeFilter("br",(e=>{let t=e.length;for(;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()})),c?(x(),E(),S()):p()),l&&(e.on("keydown",(t=>{if(!g(t)&&t.keyCode===n){if(!e.getBody().getElementsByTagName("hr").length)return;if(s.isCollapsed()&&0===s.getRng().startOffset){const e=s.getNode(),n=e.previousSibling;if("HR"===e.nodeName)return r.remove(e),void t.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(r.remove(n),t.preventDefault())}}})),b(),(()=>{const n=()=>{const n=r.getAttribs(s.getStart().cloneNode(!1));return()=>{const o=s.getStart();o!==e.getBody()&&(r.setAttrib(o,"style",null),t(n,(e=>{o.setAttributeNode(e.cloneNode(!0))})))}},o=()=>!s.isCollapsed()&&r.getParent(s.getStart(),r.isBlock)!==r.getParent(s.getEnd(),r.isBlock);e.on("keypress",(t=>{let r;return!(!(g(t)||8!==t.keyCode&&46!==t.keyCode)&&o()&&(r=n(),e.getDoc().execCommand("delete",!1),r(),t.preventDefault(),1))})),r.bind(e.getDoc(),"cut",(t=>{if(!g(t)&&o()){const t=n();vg.setEditorTimeout(e,(()=>{t()}))}}))})(),C(),e.on("SetContent ExecCommand",(e=>{"setcontent"!==e.type&&"mceInsertLink"!==e.command||t(r.select("a:not([data-mce-block])"),(e=>{var t;let n=e.parentNode;const o=r.getRoot();if((null==n?void 0:n.lastChild)===e){for(;n&&!r.isBlock(n);){if((null===(t=n.parentNode)||void 0===t?void 0:t.lastChild)!==n||n===o)return;n=n.parentNode}r.add(n,"br",{"data-mce-bogus":1})}}))})),w(),k(),y(),e.on("drop",(t=>{var n;const o=null===(n=t.dataTransfer)||void 0===n?void 0:n.getData("text/html");m(o)&&/^<img[^>]*>$/.test(o)&&e.dispatch("dragend",new window.DragEvent("dragend",t))})))),{refreshContentEditable:R,isHidden:()=>{if(!l||e.removed)return!1;const t=e.selection.getSel();return!t||!t.rangeCount||0===t.rangeCount}}},ST=za.DOM,NT=e=>e.inline?e.getElement().nodeName.toLowerCase():void 0,RT=e=>ye(e,(e=>!1===v(e))),AT=e=>{const t=e.options.get,n=e.editorUpload.blobCache;return RT({allow_conditional_comments:t("allow_conditional_comments"),allow_html_data_urls:t("allow_html_data_urls"),allow_svg_data_urls:t("allow_svg_data_urls"),allow_html_in_named_anchor:t("allow_html_in_named_anchor"),allow_script_urls:t("allow_script_urls"),allow_unsafe_link_target:t("allow_unsafe_link_target"),convert_unsafe_embeds:t("convert_unsafe_embeds"),convert_fonts_to_spans:t("convert_fonts_to_spans"),fix_list_elements:t("fix_list_elements"),font_size_legacy_values:t("font_size_legacy_values"),forced_root_block:t("forced_root_block"),forced_root_block_attrs:t("forced_root_block_attrs"),preserve_cdata:t("preserve_cdata"),inline_styles:t("inline_styles"),root_name:NT(e),sandbox_iframes:t("sandbox_iframes"),sanitize:t("xss_sanitization"),validate:!0,blob_cache:n,document:e.getDoc()})},TT=e=>{const t=e.options.get;return RT({custom_elements:t("custom_elements"),extended_valid_elements:t("extended_valid_elements"),invalid_elements:t("invalid_elements"),invalid_styles:t("invalid_styles"),schema:t("schema"),valid_children:t("valid_children"),valid_classes:t("valid_classes"),valid_elements:t("valid_elements"),valid_styles:t("valid_styles"),verify_html:t("verify_html"),padd_empty_block_inline_children:t("format_empty_lines")})},OT=e=>e.inline?e.ui.styleSheetLoader:e.dom.styleSheetLoader,BT=e=>{const t=OT(e),n=id(e),o=e.contentCSS,r=()=>{t.unloadAll(o),e.inline||e.ui.styleSheetLoader.unloadAll(n)},s=()=>{e.removed?r():e.on("remove",r)};if(e.contentStyles.length>0){let t="";Pt.each(e.contentStyles,(e=>{t+=e+"\r\n"})),e.dom.addStyle(t)}const a=Promise.all(((e,t,n)=>{const{pass:o,fail:r}=K(t,(e=>tinymce.Resource.has(Uw(e)))),s=o.map((t=>{const n=tinymce.Resource.get(Uw(t));return m(n)?Promise.resolve(OT(e).loadRawCss(t,n)):Promise.resolve()})),a=[...s,OT(e).loadAll(r)];return e.inline?a:a.concat([e.ui.styleSheetLoader.loadAll(n)])})(e,o,n)).then(s).catch(s),i=ad(e);return i&&((e,t)=>{const n=yn(e.getBody()),o=Vn(qn(n)),r=bn("style");Jt(r,"type","text/css"),vo(r,vn(t)),vo(o,r),e.on("remove",(()=>{xo(r)}))})(e,i),a},PT=e=>{!0!==e.removed&&((e=>{XC(e)||e.load({initial:!0,format:"html"}),e.startContent=e.getContent({format:"raw"})})(e),(e=>{e.bindPendingEventDelegates(),e.initialized=!0,(e=>{e.dispatch("Init")})(e),e.focus(!0),(e=>{const t=e.dom.getRoot();e.inline||am(e)&&e.selection.getStart(!0)!==t||Ou(t).each((t=>{const n=t.getNode(),o=Qo(n)?Ou(n).getOr(t):t;e.selection.setRng(o.toRange())}))})(e),e.nodeChanged({initial:!0});const t=$d(e);w(t)&&t.call(e,e),(e=>{const t=Vd(e);t&&vg.setEditorTimeout(e,(()=>{let n;n=!0===t?e:e.editorManager.get(t),n&&!n.destroyed&&(n.focus(),n.selection.scrollIntoView())}),100)})(e)})(e))},DT=e=>{const t=e.getElement();let n=e.getDoc();e.inline&&(ST.addClass(t,"mce-content-body"),e.contentDocument=n=document,e.contentWindow=window,e.bodyElement=t,e.contentAreaContainer=t);const o=e.getBody();o.disabled=!0,e.readonly=Bd(e),e._editableRoot=Pd(e),!e.readonly&&e.hasEditableRoot()&&(e.inline&&"static"===ST.getStyle(o,"position",!0)&&(o.style.position="relative"),o.contentEditable="true"),o.disabled=!1,e.editorUpload=Kw(e),e.schema=ua(TT(e)),e.dom=za(n,{keep_values:!0,url_converter:e.convertURL,url_converter_scope:e,update_styles:!0,root_element:e.inline?e.getBody():null,collect:e.inline,schema:e.schema,contentCssCors:Zl(e),referrerPolicy:ed(e),onSetAttrib:t=>{e.dispatch("SetAttrib",t)},force_hex_color:yc(e)}),e.parser=(e=>{const t=bC(AT(e),e.schema);return t.addAttributeFilter("src,href,style,tabindex",((t,n)=>{const o=e.dom,r="data-mce-"+n;let s=t.length;for(;s--;){const a=t[s];let i=a.attr(n);if(i&&!a.attr(r)){if(0===i.indexOf("data:")||0===i.indexOf("blob:"))continue;"style"===n?(i=o.serializeStyle(o.parseStyle(i),a.name),i.length||(i=null),a.attr(r,i),a.attr(n,i)):"tabindex"===n?(a.attr(r,i),a.attr(n,null)):a.attr(r,e.convertURL(i,n,a.name))}}})),t.addNodeFilter("script",(e=>{let t=e.length;for(;t--;){const n=e[t],o=n.attr("type")||"no/type";0!==o.indexOf("mce-")&&n.attr("type","mce-"+o)}})),uc(e)&&t.addNodeFilter("#cdata",(t=>{var n;let o=t.length;for(;o--;){const r=t[o];r.type=8,r.name="#comment",r.value="[CDATA["+e.dom.encode(null!==(n=r.value)&&void 0!==n?n:"")+"]]"}})),t.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",(t=>{let n=t.length;const o=e.schema.getNonEmptyElements();for(;n--;){const e=t[n];e.isEmpty(o)&&0===e.getAll("br").length&&e.append(new Wg("br",1))}})),t})(e),e.serializer=iw((e=>{const t=e.options.get;return{...AT(e),...TT(e),...RT({remove_trailing_brs:t("remove_trailing_brs"),pad_empty_with_br:t("pad_empty_with_br"),url_converter:t("url_converter"),url_converter_scope:t("url_converter_scope"),element_format:t("element_format"),entities:t("entities"),entity_encoding:t("entity_encoding"),indent:t("indent"),indent_after:t("indent_after"),indent_before:t("indent_before")})}})(e),e),e.selection=rw(e.dom,e.getWin(),e.serializer,e),e.annotator=Qm(e),e.formatter=rx(e),e.undoManager=ax(e),e._nodeChangeDispatcher=new bR(e),e._selectionOverrides=eT(e),(e=>{const t=Xa(),n=$a(!1),o=Ja((t=>{e.dispatch("longpress",{...t,type:"longpress"}),n.set(!0)}),400);e.on("touchstart",(e=>{P_(e).each((r=>{o.cancel();const s={x:r.clientX,y:r.clientY,target:e.target};o.throttle(e),n.set(!1),t.set(s)}))}),!0),e.on("touchmove",(r=>{o.cancel(),P_(r).each((o=>{t.on((r=>{((e,t)=>{const n=Math.abs(e.clientX-t.x),o=Math.abs(e.clientY-t.y);return n>5||o>5})(o,r)&&(t.clear(),n.set(!1),e.dispatch("longpresscancel"))}))}))}),!0),e.on("touchend touchcancel",(r=>{o.cancel(),"touchcancel"!==r.type&&t.get().filter((e=>e.target.isEqualNode(r.target))).each((()=>{n.get()?r.preventDefault():e.dispatch("tap",{...r,type:"tap"})}))}),!0)})(e),(e=>{(e=>{e.on("click",(t=>{e.dom.getParent(t.target,"details")&&t.preventDefault()}))})(e),(e=>{e.parser.addNodeFilter("details",(t=>{const n=bc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))})),e.serializer.addNodeFilter("details",(t=>{const n=vc(e);V(t,(e=>{"expanded"===n?e.attr("open","open"):"collapsed"===n&&e.attr("open",null)}))}))})(e)})(e),(e=>{const t="contenteditable",n=" "+Pt.trim(dc(e))+" ",o=" "+Pt.trim(lc(e))+" ",r=z_(n),s=z_(o),a=cc(e);a.length>0&&e.on("BeforeSetContent",(t=>{((e,t,n)=>{let o=t.length,r=n.content;if("raw"!==n.format){for(;o--;)r=r.replace(t[o],j_(e,r,lc(e)));n.content=r}})(e,a,t)})),e.parser.addAttributeFilter("class",(e=>{let n=e.length;for(;n--;){const o=e[n];r(o)?o.attr(t,"true"):s(o)&&o.attr(t,"false")}})),e.serializer.addAttributeFilter(t,(e=>{let n=e.length;for(;n--;){const o=e[n];if(!r(o)&&!s(o))continue;const i=o.attr("data-mce-content");a.length>0&&i?H_(a,i)?(o.name="#text",o.type=3,o.raw=!0,o.value=i):o.remove():o.attr(t,null)}}))})(e),XC(e)||((e=>{e.on("mousedown",(t=>{t.detail>=3&&(t.preventDefault(),NA(e))}))})(e),(e=>{(e=>{const t=[",",".",";",":","!","?"],n=[32],o=()=>{return t=ac(e),n=ic(e),{inlinePatterns:wl(t),blockPatterns:Cl(t),dynamicPatternsLookup:n};var t,n},r=()=>(e=>e.options.isSet("text_patterns_lookup"))(e);e.on("keydown",(t=>{if(13===t.keyCode&&!af.modifierPressed(t)&&e.selection.isCollapsed()){const n=o();(n.inlinePatterns.length>0||n.blockPatterns.length>0||r())&&ET(e,n)&&t.preventDefault()}}),!0);const s=()=>{if(e.selection.isCollapsed()){const t=o();(t.inlinePatterns.length>0||r())&&((e,t)=>{const n=e.selection.getRng();lT(e,n).map((o=>{const r=Math.max(0,n.startOffset-1),s=cT(e.dom,o,n.startContainer,r),a=dT(t,o,s),i=wT(e,o,n.startContainer,r,a,!1);i.length>0&&e.undoManager.transact((()=>{xT(e,i)}))}))})(e,t)}};e.on("keyup",(e=>{_T(n,e,((e,t)=>e===t.keyCode&&!af.modifierPressed(t)))&&s()})),e.on("keypress",(n=>{_T(t,n,((e,t)=>e.charCodeAt(0)===t.charCode))&&vg.setEditorTimeout(e,s)}))})(e)})(e));const r=hR(e);B_(e,r),(e=>{e.on("NodeChange",T(F_,e))})(e),(e=>{var t;const n=e.dom,o=Il(e),r=null!==(t=md(e))&&void 0!==t?t:"",s=(t,a)=>{if((e=>{if(dx(e)){const t=e.keyCode;return!cx(e)&&(af.metaKeyPressed(e)||e.altKey||t>=112&&t<=123||H(ix,t))}return!1})(t))return;const i=e.getBody(),l=!(e=>dx(e)&&!(cx(e)||"keyup"===e.type&&229===e.keyCode))(t)&&((e,t,n)=>{if(gs(yn(t),!1)){const o=t.firstElementChild;return!o||!e.getStyle(t.firstElementChild,"padding-left")&&!e.getStyle(t.firstElementChild,"padding-right")&&n===o.nodeName.toLowerCase()}return!1})(n,i,o);(""!==n.getAttrib(i,lx)!==l||a)&&(n.setAttrib(i,lx,l?r:null),n.setAttrib(i,"aria-placeholder",l?r:null),((e,t)=>{e.dispatch("PlaceholderToggle",{state:t})})(e,l),e.on(l?"keydown":"keyup",s),e.off(l?"keyup":"keydown",s))};Ye(r)&&e.on("init",(t=>{s(t,!0),e.on("change SetContent ExecCommand",s),e.on("paste",(t=>vg.setEditorTimeout(e,(()=>s(t)))))}))})(e),CA(e);const s=(e=>{const t=e;return(e=>xe(e.plugins,"rtc").bind((e=>I.from(e.setup))))(e).fold((()=>(t.rtcInstance=GC(e),I.none())),(e=>(t.rtcInstance=(()=>{const e=N(null),t=N("");return{init:{bindEvents:_},undoManager:{beforeChange:_,add:e,undo:e,redo:e,clear:_,reset:_,hasUndo:L,hasRedo:L,transact:e,ignore:_,extra:_},formatter:{match:L,matchAll:N([]),matchNode:N(void 0),canApply:L,closest:t,apply:_,remove:_,toggle:_,formatChanged:N({unbind:_})},editor:{getContent:t,setContent:N({content:"",html:""}),insertContent:N(""),addVisual:_},selection:{getContent:t},autocompleter:{addDecoration:_,removeDecoration:_},raw:{getModel:N(I.none())}}})(),I.some((()=>e().then((e=>(t.rtcInstance=(e=>{const t=e=>f(e)?e:{},{init:n,undoManager:o,formatter:r,editor:s,selection:a,autocompleter:i,raw:l}=e;return{init:{bindEvents:n.bindEvents},undoManager:{beforeChange:o.beforeChange,add:o.add,undo:o.undo,redo:o.redo,clear:o.clear,reset:o.reset,hasUndo:o.hasUndo,hasRedo:o.hasRedo,transact:(e,t,n)=>o.transact(n),ignore:(e,t)=>o.ignore(t),extra:(e,t,n,r)=>o.extra(n,r)},formatter:{match:(e,n,o,s)=>r.match(e,t(n),s),matchAll:r.matchAll,matchNode:r.matchNode,canApply:e=>r.canApply(e),closest:e=>r.closest(e),apply:(e,n,o)=>r.apply(e,t(n)),remove:(e,n,o,s)=>r.remove(e,t(n)),toggle:(e,n,o)=>r.toggle(e,t(n)),formatChanged:(e,t,n,o,s)=>r.formatChanged(t,n,o,s)},editor:{getContent:e=>s.getContent(e),setContent:(e,t)=>({content:s.setContent(e,t),html:""}),insertContent:(e,t)=>(s.insertContent(e),""),addVisual:s.addVisual},selection:{getContent:(e,t)=>a.getContent(t)},autocompleter:{addDecoration:i.addDecoration,removeDecoration:i.removeDecoration},raw:{getModel:()=>I.some(l.getRawModel())}}})(e),e.rtc.isRemote))))))))})(e);(e=>{const t=e.getDoc(),n=e.getBody();(e=>{e.dispatch("PreInit")})(e),Wd(e)||(t.body.spellcheck=!1,ST.setAttrib(n,"spellcheck","false")),e.quirks=kT(e),(e=>{e.dispatch("PostRender")})(e);const o=ld(e);void 0!==o&&(n.dir=o);const r=Kd(e);r&&e.on("BeforeSetContent",(e=>{Pt.each(r,(t=>{e.content=e.content.replace(t,(e=>"\x3c!--mce:protected "+escape(e)+"--\x3e"))}))})),e.on("SetContent",(()=>{e.addVisual(e.getBody())})),e.on("compositionstart compositionend",(t=>{e.composing="compositionstart"===t.type}))})(e),s.fold((()=>{const t=(e=>{let t=!1;const n=setTimeout((()=>{t||e.setProgressState(!0)}),500);return()=>{clearTimeout(n),t=!0,e.setProgressState(!1)}})(e);BT(e).then((()=>{PT(e),t()}))}),(t=>{e.setProgressState(!0),BT(e).then((()=>{t().then((t=>{e.setProgressState(!1),PT(e),ZC(e)}),(t=>{e.notificationManager.open({type:"error",text:String(t)}),PT(e),ZC(e)}))}))}))},LT=M,MT=za.DOM,IT=za.DOM,FT=(e,t)=>({editorContainer:e,iframeContainer:t,api:{}}),UT=e=>{const t=e.getElement();return e.inline?FT(null):(e=>{const t=IT.create("div");return IT.insertAfter(t,e),FT(t,t)})(t)},zT=async e=>{e.dispatch("ScriptsLoaded"),(e=>{const t=Pt.trim(Kl(e)),n=e.ui.registry.getAll().icons,o={...xw.get("default").icons,...xw.get(t).icons};ge(o,((t,o)=>{Ee(n,o)||e.ui.registry.addIcon(o,t)}))})(e),(e=>{const t=pd(e);if(m(t)){const n=Bw.get(t);e.theme=n(e,Bw.urls[t])||{},w(e.theme.init)&&e.theme.init(e,Bw.urls[t]||e.documentBaseUrl.replace(/\/$/,""))}else e.theme={}})(e),(e=>{const t=bd(e),n=Ew.get(t);e.model=n(e,Ew.urls[t])})(e),(e=>{const t=[];V(Ld(e),(n=>{((e,t,n)=>{const o=Ow.get(n),r=Ow.urls[n]||e.documentBaseUrl.replace(/\/$/,"");if(n=Pt.trim(n),o&&-1===Pt.inArray(t,n)){if(e.plugins[n])return;try{const s=o(e,r)||{};e.plugins[n]=s,w(s.init)&&(s.init(e,r),t.push(n))}catch(t){((e,t,n)=>{const o=Ka.translate(["Failed to initialize plugin: {0}",t]);ef(e,"PluginLoadError",{message:o}),Fw(o,n),Lw(e,o)})(e,n,t)}}})(e,t,(e=>e.replace(/^\-/,""))(n))}))})(e);const t=await(e=>{const t=e.getElement();return e.orgDisplay=t.style.display,m(pd(e))?(e=>{const t=e.theme.renderUI;return t?t():UT(e)})(e):w(pd(e))?(e=>{const t=e.getElement(),n=pd(e)(e,t);return n.editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||e.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||e.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:t.offsetHeight,n})(e):UT(e)})(e);((e,t)=>{const n={show:I.from(t.show).getOr(_),hide:I.from(t.hide).getOr(_),isEnabled:I.from(t.isEnabled).getOr(M),setEnabled:n=>{e.mode.isReadOnly()||I.from(t.setEnabled).each((e=>e(n)))}};e.ui={...e.ui,...n}})(e,I.from(t.api).getOr({})),e.editorContainer=t.editorContainer,(e=>{e.contentCSS=e.contentCSS.concat((e=>zw(e,sd(e)))(e),(e=>zw(e,id(e)))(e))})(e),e.inline?DT(e):((e,t)=>{((e,t)=>{const n=e.translate("Rich Text Area"),o=tn(yn(e.getElement()),"tabindex").bind(Xe),r=((e,t,n,o)=>{const r=bn("iframe");return o.each((e=>Jt(r,"tabindex",e))),Zt(r,n),Zt(r,{id:e+"_ifr",frameBorder:"0",allowTransparency:"true",title:t}),un(r,"tox-edit-area__iframe"),r})(e.id,n,Tl(e),o).dom;r.onload=()=>{r.onload=null,e.dispatch("load")},e.contentAreaContainer=t.iframeContainer,e.iframeElement=r,e.iframeHTML=(e=>{let t=Ol(e)+"<html><head>";Bl(e)!==e.documentBaseUrl&&(t+='<base href="'+e.documentBaseURI.getURI()+'" />'),t+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';const n=Pl(e),o=Dl(e),r=e.translate(jd(e));return Ll(e)&&(t+='<meta http-equiv="Content-Security-Policy" content="'+Ll(e)+'" />'),t+=`</head><body id="${n}" class="mce-content-body ${o}" data-id="${e.id}" aria-label="${r}"><br></body></html>`,t})(e),MT.add(t.iframeContainer,r)})(e,t),t.editorContainer&&(t.editorContainer.style.display=e.orgDisplay,e.hidden=MT.isHidden(t.editorContainer)),e.getElement().style.display="none",MT.setAttrib(e.id,"aria-hidden","true"),e.getElement().style.visibility=e.orgVisibility,(e=>{const t=e.iframeElement,n=()=>{e.contentDocument=t.contentDocument,DT(e)};if(gc(e)||At.browser.isFirefox()){const t=e.getDoc();t.open(),t.write(e.iframeHTML),t.close(),n()}else{const r=(o=yn(t),No(o,"load",LT,(()=>{r.unbind(),n()})));t.srcdoc=e.iframeHTML}var o})(e)})(e,{editorContainer:t.editorContainer,iframeContainer:t.iframeContainer})},jT=za.DOM,HT=e=>"-"===e.charAt(0),$T=(e,t,n)=>I.from(t).filter((e=>Ye(e)&&!xw.has(e))).map((t=>({url:`${e.editorManager.baseURL}/icons/${t}/icons${n}.js`,name:I.some(t)}))),qT=(e,t)=>{const n=Ha.ScriptLoader,o=()=>{!e.removed&&(e=>{const t=pd(e);return!m(t)||C(Bw.get(t))})(e)&&(e=>{const t=bd(e);return C(Ew.get(t))})(e)&&zT(e)};((e,t)=>{const n=pd(e);if(m(n)&&!HT(n)&&!Ee(Bw.urls,n)){const o=hd(e),r=o?e.documentBaseURI.toAbsolute(o):`themes/${n}/theme${t}.js`;Bw.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ThemeLoadError",Iw("theme",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=bd(e);if("plugin"!==n&&!Ee(Ew.urls,n)){const o=vd(e),r=m(o)?e.documentBaseURI.toAbsolute(o):`models/${n}/model${t}.js`;Ew.load(n,r).catch((()=>{((e,t,n)=>{Mw(e,"ModelLoadError",Iw("model",t,n))})(e,r,n)}))}})(e,t),((e,t)=>{const n=td(t),o=nd(t);if(!Ka.hasCode(n)&&"en"!==n){const r=Ye(o)?o:`${t.editorManager.baseURL}/langs/${n}.js`;e.add(r).catch((()=>{((e,t,n)=>{Mw(e,"LanguageLoadError",Iw("language",t,n))})(t,r,n)}))}})(n,e),((e,t,n)=>{const o=$T(t,"default",n),r=(e=>I.from(Yl(e)).filter(Ye).map((e=>({url:e,name:I.none()}))))(t).orThunk((()=>$T(t,Kl(t),"")));V((e=>{const t=[],n=e=>{t.push(e)};for(let t=0;t<e.length;t++)e[t].each(n);return t})([o,r]),(n=>{e.add(n.url).catch((()=>{((e,t,n)=>{Mw(e,"IconsLoadError",Iw("icons",t,n))})(t,n.url,n.name.getOrUndefined())}))}))})(n,e,t),((e,t)=>{const n=(t,n)=>{Ow.load(t,n).catch((()=>{((e,t,n)=>{Mw(e,"PluginLoadError",Iw("plugin",t,n))})(e,n,t)}))};ge(Md(e),((t,o)=>{n(o,t),e.options.set("plugins",Ld(e).concat(o))})),V(Ld(e),(e=>{!(e=Pt.trim(e))||Ow.urls[e]||HT(e)||n(e,`plugins/${e}/plugin${t}.js`)}))})(e,t),n.loadQueue().then(o,o)},VT=xt().deviceType,WT=VT.isPhone(),KT=VT.isTablet(),YT=e=>{if(y(e))return[];{const t=p(e)?e:e.split(/[ ,]/),n=q(t,Ve);return Y(n,Ye)}},GT=(e,t)=>{const n=((t,n)=>{const o={},r={};return ve(t,((t,n)=>H(e,n)),be(o),be(r)),{t:o,f:r}})(t);return o=n.t,r=n.f,{sections:N(o),options:N(r)};var o,r},XT=(e,t)=>Ee(e.sections(),t),QT=(e,t)=>({table_grid:!1,object_resizing:!1,resize:!1,toolbar_mode:xe(e,"toolbar_mode").getOr("scrolling"),toolbar_sticky:!1,...t?{menubar:!1}:{}}),JT=(e,t)=>{var n;const o=null!==(n=t.external_plugins)&&void 0!==n?n:{};return e&&e.external_plugins?Pt.extend({},e.external_plugins,o):o},ZT=(e,t,n,o,r)=>{var s;const a=e?{mobile:QT(null!==(s=r.mobile)&&void 0!==s?s:{},t)}:{},i=GT(["mobile"],Zk(a,r)),l=Pt.extend(n,o,i.options(),((e,t)=>e&&XT(t,"mobile"))(e,i)?((e,t,n={})=>{const o=e.sections(),r=xe(o,t).getOr({});return Pt.extend({},n,r)})(i,"mobile"):{},{external_plugins:JT(o,i.options())});return((e,t,n,o)=>{const r=YT(n.forced_plugins),s=YT(o.plugins),a=((e,t)=>XT(e,t)?e.sections()[t]:{})(t,"mobile"),i=((e,t,n,o)=>e&&XT(t,"mobile")?o:n)(e,t,s,a.plugins?YT(a.plugins):s),l=((e,t)=>[...YT(e),...YT(t)])(r,i);return Pt.extend(o,{forced_plugins:r,plugins:l})})(e,i,o,l)},eO=e=>{(e=>{const t=t=>()=>{V("left,center,right,justify".split(","),(n=>{t!==n&&e.formatter.remove("align"+n)})),"none"!==t&&((t,n)=>{e.formatter.toggle(t,void 0),e.nodeChanged()})("align"+t)};e.editorCommands.addCommands({JustifyLeft:t("left"),JustifyCenter:t("center"),JustifyRight:t("right"),JustifyFull:t("justify"),JustifyNone:t("none")})})(e),(e=>{const t=t=>()=>{const n=e.selection,o=n.isCollapsed()?[e.dom.getParent(n.getNode(),e.dom.isBlock)]:n.getSelectedBlocks();return $(o,(n=>C(e.formatter.matchNode(n,t))))};e.editorCommands.addCommands({JustifyLeft:t("alignleft"),JustifyCenter:t("aligncenter"),JustifyRight:t("alignright"),JustifyFull:t("alignjustify")},"state")})(e)},tO=(e,t)=>{const n=e.selection,o=e.dom;return/^ | $/.test(t)?((e,t,n,o)=>{const r=yn(e.getRoot());return n=eh(r,Vi.fromRangeStart(t),o)?n.replace(/^ /,"&nbsp;"):n.replace(/^&nbsp;/," "),th(r,Vi.fromRangeEnd(t),o)?n.replace(/(&nbsp;| )(<br( \/)>)?$/,"&nbsp;"):n.replace(/&nbsp;(<br( \/)?>)?$/," ")})(o,n.getRng(),t,e.schema):t},nO=(e,t)=>{if(e.selection.isEditable()){const{content:n,details:o}=(e=>{if("string"!=typeof e){const t=Pt.extend({paste:e.paste,data:{paste:e.paste}},e);return{content:e.content,details:t}}return{content:e,details:{}}})(t);wC(e,{...o,content:tO(e,n),format:"html",set:!1,selection:!0}).each((t=>{const n=((e,t,n)=>QC(e).editor.insertContent(t,n))(e,t.content,o);xC(e,n,t),e.addVisual()}))}},oO={"font-size":"size","font-family":"face"},rO=Xt("font"),sO=e=>(t,n)=>I.from(n).map(yn).filter(Wt).bind((n=>((e,t,n)=>Lb(yn(n),(t=>(t=>mo(t,e).orThunk((()=>rO(t)?xe(oO,e).bind((e=>tn(t,e))):I.none())))(t)),(e=>_n(yn(t),e))))(e,t,n.dom).or(((e,t)=>I.from(za.DOM.getStyle(t,e,!0)))(e,n.dom)))).getOr(""),aO=sO("font-size"),iO=k((e=>e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")),sO("font-family")),lO=e=>Ou(e.getBody()).bind((e=>{const t=e.container();return I.from(er(t)?t.parentNode:t)})),dO=(e,t)=>((e,t)=>(e=>I.from(e.selection.getRng()).bind((t=>{const n=e.getBody();return t.startContainer===n&&0===t.startOffset?I.none():I.from(e.selection.getStart(!0))})))(e).orThunk(T(lO,e)).map(yn).filter(Wt).bind(t))(e,S(I.some,t)),cO=(e,t)=>{if(/^[0-9.]+$/.test(t)){const n=parseInt(t,10);if(n>=1&&n<=7){const o=(e=>Pt.explode(e.options.get("font_size_style_values")))(e),r=(e=>Pt.explode(e.options.get("font_size_classes")))(e);return r.length>0?r[n-1]||t:o[n-1]||t}return t}return t},uO=e=>{const t=e.split(/\s*,\s*/);return q(t,(e=>-1===e.indexOf(" ")||He(e,'"')||He(e,"'")?e:`'${e}'`)).join(",")},mO=(e,t)=>{const n=e.dom,o=e.selection.getRng(),r=t?e.selection.getStart():e.selection.getEnd(),s=t?o.startContainer:o.endContainer,a=bN(n,s);if(!a||!a.isContentEditable)return;const i=t?po:ho,l=Il(e);((e,t,n,o)=>{const r=e.dom,s=e=>r.isBlock(e)&&e.parentElement===n,a=s(t)?t:r.getParent(o,s,n);return I.from(a).map(yn)})(e,r,a,s).each((t=>{const n=wN(e,s,t.dom,a,!1,l);i(t,yn(n)),e.selection.setCursorLocation(n,0),e.dispatch("NewBlock",{newBlock:n}),cN(e,"insertParagraph")}))},fO=e=>{eO(e),(e=>{e.editorCommands.addCommands({"Cut,Copy,Paste":t=>{const n=e.getDoc();let o;try{n.execCommand(t)}catch(e){o=!0}if("paste"!==t||n.queryCommandEnabled(t)||(o=!0),o||!n.queryCommandSupported(t)){let t=e.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");(At.os.isMacOS()||At.os.isiOS())&&(t=t.replace(/Ctrl\+/g,"\u2318+")),e.notificationManager.open({text:t,type:"error"})}}})})(e),(e=>{e.editorCommands.addCommands({mceAddUndoLevel:()=>{e.undoManager.add()},mceEndUndoLevel:()=>{e.undoManager.add()},Undo:()=>{e.undoManager.undo()},Redo:()=>{e.undoManager.redo()}})})(e),(e=>{e.editorCommands.addCommands({mceSelectNodeDepth:(t,n,o)=>{let r=0;e.dom.getParent(e.selection.getNode(),(t=>!qo(t)||r++!==o||(e.selection.select(t),!1)),e.getBody())},mceSelectNode:(t,n,o)=>{e.selection.select(o)},selectAll:()=>{const t=e.dom.getParent(e.selection.getStart(),lr);if(t){const n=e.dom.createRng();n.selectNodeContents(t),e.selection.setRng(n)}}})})(e),(e=>{e.editorCommands.addCommands({mceCleanup:()=>{const t=e.selection.getBookmark();e.setContent(e.getContent()),e.selection.moveToBookmark(t)},insertImage:(t,n,o)=>{nO(e,e.dom.createHTML("img",{src:o}))},insertHorizontalRule:()=>{e.execCommand("mceInsertContent",!1,"<hr>")},insertText:(t,n,o)=>{nO(e,e.dom.encode(o))},insertHTML:(t,n,o)=>{nO(e,o)},mceInsertContent:(t,n,o)=>{nO(e,o)},mceSetContent:(t,n,o)=>{e.setContent(o)},mceReplaceContent:(t,n,o)=>{e.execCommand("mceInsertContent",!1,o.replace(/\{\$selection\}/g,e.selection.getContent({format:"text"})))},mceNewDocument:()=>{e.setContent(Jd(e))}})})(e),(e=>{const t=(t,n,o)=>{const r=m(o)?{href:o}:o,s=e.dom.getParent(e.selection.getNode(),"a");f(r)&&m(r.href)&&(r.href=r.href.replace(/ /g,"%20"),s&&r.href||e.formatter.remove("link"),r.href&&e.formatter.apply("link",r,s))};e.editorCommands.addCommands({unlink:()=>{if(e.selection.isEditable()){if(e.selection.isCollapsed()){const t=e.dom.getParent(e.selection.getStart(),"a");return void(t&&e.dom.remove(t,!0))}e.formatter.remove("link")}},mceInsertLink:t,createLink:t})})(e),(e=>{e.editorCommands.addCommands({Indent:()=>{(e=>{R_(e,"indent")})(e)},Outdent:()=>{A_(e)}}),e.editorCommands.addCommands({Outdent:()=>k_(e)},"state")})(e),(e=>{e.editorCommands.addCommands({InsertNewBlockBefore:()=>{(e=>{mO(e,!0)})(e)},InsertNewBlockAfter:()=>{(e=>{mO(e,!1)})(e)}})})(e),(e=>{e.editorCommands.addCommands({insertParagraph:()=>{eR(BN,e)},mceInsertNewLine:(t,n,o)=>{tR(e,o)},InsertLineBreak:(t,n,o)=>{eR(zN,e)}})})(e),(e=>{(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{e.getDoc().execCommand(t);const n=e.dom.getParent(e.selection.getNode(),"ol,ul");if(n){const t=n.parentNode;if(t&&/^(H[1-6]|P|ADDRESS|PRE)$/.test(t.nodeName)){const o=e.selection.getBookmark();e.dom.split(t,n),e.selection.moveToBookmark(o)}}}})})(e),(e=>{e.editorCommands.addCommands({"InsertUnorderedList,InsertOrderedList":t=>{const n=e.dom.getParent(e.selection.getNode(),"ul,ol");return n&&("insertunorderedlist"===t&&"UL"===n.tagName||"insertorderedlist"===t&&"OL"===n.tagName)}},"state")})(e)})(e),(e=>{(e=>{const t=(t,n)=>{e.formatter.toggle(t,n),e.nodeChanged()};e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>{t(e)},"ForeColor,HiliteColor":(e,n,o)=>{t(e,{value:o})},BackColor:(e,n,o)=>{t("hilitecolor",{value:o})},FontName:(t,n,o)=>{((e,t)=>{const n=cO(e,t);e.formatter.toggle("fontname",{value:uO(n)}),e.nodeChanged()})(e,o)},FontSize:(t,n,o)=>{((e,t)=>{e.formatter.toggle("fontsize",{value:cO(e,t)}),e.nodeChanged()})(e,o)},LineHeight:(t,n,o)=>{((e,t)=>{e.formatter.toggle("lineheight",{value:String(t)}),e.nodeChanged()})(e,o)},Lang:(e,n,o)=>{var r;t(e,{value:o.code,customValue:null!==(r=o.customCode)&&void 0!==r?r:null})},RemoveFormat:t=>{e.formatter.remove(t)},mceBlockQuote:()=>{t("blockquote")},FormatBlock:(e,n,o)=>{t(m(o)?o:"p")},mceToggleFormat:(e,n,o)=>{t(o)}})})(e),(e=>{const t=t=>e.formatter.match(t);e.editorCommands.addCommands({"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":e=>t(e),mceBlockQuote:()=>t("blockquote")},"state"),e.editorCommands.addQueryValueHandler("FontName",(()=>(e=>dO(e,(t=>iO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("FontSize",(()=>(e=>dO(e,(t=>aO(e.getBody(),t.dom))).getOr(""))(e))),e.editorCommands.addQueryValueHandler("LineHeight",(()=>(e=>dO(e,(t=>{const n=yn(e.getBody()),o=Lb(t,(e=>mo(e,"line-height")),T(_n,n));return o.getOrThunk((()=>{const e=parseFloat(co(t,"line-height")),n=parseFloat(co(t,"font-size"));return String(e/n)}))})).getOr(""))(e)))})(e)})(e),(e=>{e.editorCommands.addCommands({mceRemoveNode:(t,n,o)=>{const r=null!=o?o:e.selection.getNode();if(r!==e.getBody()){const t=e.selection.getBookmark();e.dom.remove(r,!0),e.selection.moveToBookmark(t)}},mcePrint:()=>{e.getWin().print()},mceFocus:(t,n,o)=>{((e,t)=>{e.removed||(t?Tg(e):(e=>{const t=e.selection,n=e.getBody();let o=t.getRng();e.quirks.refreshContentEditable(),C(e.bookmark)&&!Rg(e)&&hg(e).each((t=>{e.selection.setRng(t),o=t}));const r=((e,t)=>e.dom.getParent(t,(t=>"true"===e.dom.getContentEditable(t))))(e,t.getNode());if(r&&e.dom.isChildOf(r,n))return Ng(r),Sg(e,o),void Tg(e);e.inline||(At.browser.isOpera()||Ng(n),e.getWin().focus()),(At.browser.isFirefox()||e.inline)&&(Ng(n),Sg(e,o)),Tg(e)})(e))})(e,!0===o)},mceToggleVisualAid:()=>{e.hasVisual=!e.hasVisual,e.addVisual()}})})(e)},gO=["toggleview"],pO=e=>H(gO,e.toLowerCase());class hO{constructor(e){this.commands={state:{},exec:{},value:{}},this.editor=e}execCommand(e,t=!1,n,o){const r=this.editor,s=e.toLowerCase(),a=null==o?void 0:o.skip_focus;if(r.removed)return!1;if("mcefocus"!==s&&(/^(mceAddUndoLevel|mceEndUndoLevel)$/i.test(s)||a?(e=>{hg(e).each((t=>e.selection.setRng(t)))})(r):r.focus()),r.dispatch("BeforeExecCommand",{command:e,ui:t,value:n}).isDefaultPrevented())return!1;const i=this.commands.exec[s];return!!w(i)&&(i(s,t,n),r.dispatch("ExecCommand",{command:e,ui:t,value:n}),!0)}queryCommandState(e){if(!pO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return!1;const t=e.toLowerCase(),n=this.commands.state[t];return!!w(n)&&n(t)}queryCommandValue(e){if(!pO(e)&&this.editor.quirks.isHidden()||this.editor.removed)return"";const t=e.toLowerCase(),n=this.commands.value[t];return w(n)?n(t):""}addCommands(e,t="exec"){const n=this.commands;ge(e,((e,o)=>{V(o.toLowerCase().split(","),(o=>{n[t][o]=e}))}))}addCommand(e,t,n){const o=e.toLowerCase();this.commands.exec[o]=(e,o,r)=>t.call(null!=n?n:this.editor,o,r)}queryCommandSupported(e){const t=e.toLowerCase();return!!this.commands.exec[t]}addQueryStateHandler(e,t,n){this.commands.state[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}addQueryValueHandler(e,t,n){this.commands.value[e.toLowerCase()]=()=>t.call(null!=n?n:this.editor)}}const bO="data-mce-contenteditable",vO=(e,t,n)=>{try{e.getDoc().execCommand(t,!1,String(n))}catch(e){}},yO=(e,t)=>{e.dom.contentEditable=t?"true":"false"},CO=e=>e.readonly,wO=e=>{e.parser.addAttributeFilter("contenteditable",(t=>{CO(e)&&V(t,(e=>{e.attr(bO,e.attr("contenteditable")),e.attr("contenteditable","false")}))})),e.serializer.addAttributeFilter(bO,(t=>{CO(e)&&V(t,(e=>{e.attr("contenteditable",e.attr(bO))}))})),e.serializer.addTempAttr(bO)},xO=["copy"],EO=Pt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input beforeinput contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend touchcancel"," ");class _O{static isNative(e){return!!EO[e.toLowerCase()]}constructor(e){this.bindings={},this.settings=e||{},this.scope=this.settings.scope||this,this.toggleEvent=this.settings.toggleEvent||L}fire(e,t){return this.dispatch(e,t)}dispatch(e,t){const n=e.toLowerCase(),o=_a(n,null!=t?t:{},this.scope);this.settings.beforeFire&&this.settings.beforeFire(o);const r=this.bindings[n];if(r)for(let e=0,t=r.length;e<t;e++){const t=r[e];if(!t.removed){if(t.once&&this.off(n,t.func),o.isImmediatePropagationStopped())return o;if(!1===t.func.call(this.scope,o))return o.preventDefault(),o}}return o}on(e,t,n,o){if(!1===t&&(t=L),t){const r={func:t,removed:!1};o&&Pt.extend(r,o);const s=e.toLowerCase().split(" ");let a=s.length;for(;a--;){const e=s[a];let t=this.bindings[e];t||(t=[],this.toggleEvent(e,!0)),t=n?[r,...t]:[...t,r],this.bindings[e]=t}}return this}off(e,t){if(e){const n=e.toLowerCase().split(" ");let o=n.length;for(;o--;){const r=n[o];let s=this.bindings[r];if(!r)return ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1),delete this.bindings[t]})),this;if(s){if(t){const e=K(s,(e=>e.func===t));s=e.fail,this.bindings[r]=s,V(e.pass,(e=>{e.removed=!0}))}else s.length=0;s.length||(this.toggleEvent(e,!1),delete this.bindings[r])}}}else ge(this.bindings,((e,t)=>{this.toggleEvent(t,!1)})),this.bindings={};return this}once(e,t,n){return this.on(e,t,n,{once:!0})}has(e){e=e.toLowerCase();const t=this.bindings[e];return!(!t||0===t.length)}}const kO=e=>(e._eventDispatcher||(e._eventDispatcher=new _O({scope:e,toggleEvent:(t,n)=>{_O.isNative(t)&&e.toggleNativeEvent&&e.toggleNativeEvent(t,n)}})),e._eventDispatcher),SO={fire(e,t,n){return this.dispatch(e,t,n)},dispatch(e,t,n){const o=this;if(o.removed&&"remove"!==e&&"detach"!==e)return _a(e.toLowerCase(),null!=t?t:{},o);const r=kO(o).dispatch(e,t);if(!1!==n&&o.parent){let t=o.parent();for(;t&&!r.isPropagationStopped();)t.dispatch(e,r,!1),t=t.parent?t.parent():void 0}return r},on(e,t,n){return kO(this).on(e,t,n)},off(e,t){return kO(this).off(e,t)},once(e,t){return kO(this).once(e,t)},hasEventListeners(e){return kO(this).has(e)}},NO=za.DOM;let RO;const AO=(e,t)=>{if("selectionchange"===t)return e.getDoc();if(!e.inline&&/^(?:mouse|touch|click|contextmenu|drop|dragover|dragend)/.test(t))return e.getDoc().documentElement;const n=fd(e);return n?(e.eventRoot||(e.eventRoot=NO.select(n)[0]),e.eventRoot):e.getBody()},TO=(e,t,n)=>{(e=>!e.hidden&&!CO(e))(e)?e.dispatch(t,n):CO(e)&&((e,t)=>{if((e=>"click"===e.type)(t)&&!af.metaKeyPressed(t)){const n=yn(t.target);((e,t)=>no(t,"a",(t=>_n(t,yn(e.getBody())))).bind((e=>tn(e,"href"))))(e,n).each((n=>{if(t.preventDefault(),/^#/.test(n)){const t=e.dom.select(`${n},[name="${ze(n,"#")}"]`);t.length&&e.selection.scrollIntoView(t[0],!0)}else window.open(n,"_blank","rel=noopener noreferrer,menubar=yes,toolbar=yes,location=yes,status=yes,resizable=yes,scrollbars=yes")}))}else(e=>H(xO,e.type))(t)&&e.dispatch(t.type,t)})(e,n)},OO=(e,t)=>{if(e.delegates||(e.delegates={}),e.delegates[t]||e.removed)return;const n=AO(e,t);if(fd(e)){if(RO||(RO={},e.editorManager.on("removeEditor",(()=>{e.editorManager.activeEditor||RO&&(ge(RO,((t,n)=>{e.dom.unbind(AO(e,n))})),RO=null)}))),RO[t])return;const o=n=>{const o=n.target,r=e.editorManager.get();let s=r.length;for(;s--;){const e=r[s].getBody();(e===o||NO.isChildOf(o,e))&&TO(r[s],t,n)}};RO[t]=o,NO.bind(n,t,o)}else{const o=n=>{TO(e,t,n)};NO.bind(n,t,o),e.delegates[t]=o}},BO={...SO,bindPendingEventDelegates(){const e=this;Pt.each(e._pendingNativeEvents,(t=>{OO(e,t)}))},toggleNativeEvent(e,t){const n=this;"focus"!==e&&"blur"!==e&&(n.removed||(t?n.initialized?OO(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&n.delegates&&(n.dom.unbind(AO(n,e),e,n.delegates[e]),delete n.delegates[e])))},unbindAllNativeEvents(){const e=this,t=e.getBody(),n=e.dom;e.delegates&&(ge(e.delegates,((t,n)=>{e.dom.unbind(AO(e,n),n,t)})),delete e.delegates),!e.inline&&t&&n&&(t.onload=null,n.unbind(e.getWin()),n.unbind(e.getDoc())),n&&(n.unbind(t),n.unbind(e.getContainer()))}},PO=e=>m(e)?{value:e.split(/[ ,]/),valid:!0}:E(e,m)?{value:e,valid:!0}:{valid:!1,message:"The value must be a string[] or a comma/space separated string."},DO=(e,t)=>e+(Ge(t.message)?"":`. ${t.message}`),LO=e=>e.valid,MO=(e,t,n="")=>{const o=t(e);return b(o)?o?{value:e,valid:!0}:{valid:!1,message:n}:o},IO=["design","readonly"],FO=(e,t,n,o)=>{const r=n[t.get()],s=n[o];try{s.activate()}catch(e){return void console.error(`problem while activating editor mode ${o}:`,e)}r.deactivate(),r.editorReadOnly!==s.editorReadOnly&&((e,t)=>{const n=yn(e.getBody());((e,t,n)=>{gn(e,t)&&!n?fn(e,t):n&&un(e,t)})(n,"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e._selectionOverrides.hideFakeCaret(),(e=>{I.from(e.selection.getNode()).each((e=>{e.removeAttribute("data-mce-selected")}))})(e),e.readonly=!0,yO(n,!1),V(Uo(n,'*[contenteditable="true"]'),(e=>{Jt(e,bO,"true"),yO(e,!1)}))):(e.readonly=!1,e.hasEditableRoot()&&yO(n,!0),V(Uo(n,`*[${bO}="true"]`),(e=>{on(e,bO),yO(e,!0)})),vO(e,"StyleWithCSS",!1),vO(e,"enableInlineTableEditing",!1),vO(e,"enableObjectResizing",!1),Ag(e)&&e.focus(),(e=>{e.selection.setRng(e.selection.getRng())})(e),e.nodeChanged())})(e,s.editorReadOnly),t.set(o),((e,t)=>{e.dispatch("SwitchMode",{mode:t})})(e,o)},UO=Pt.each,zO=Pt.explode,jO={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},HO=Pt.makeMap("alt,ctrl,shift,meta,access"),$O=e=>{const t={},n=At.os.isMacOS()||At.os.isiOS();UO(zO(e.toLowerCase(),"+"),(e=>{(e=>e in HO)(e)?t[e]=!0:/^[0-9]{2,}$/.test(e)?t.keyCode=parseInt(e,10):(t.charCode=e.charCodeAt(0),t.keyCode=jO[e]||e.toUpperCase().charCodeAt(0))}));const o=[t.keyCode];let r;for(r in HO)t[r]?o.push(r):t[r]=!1;return t.id=o.join(","),t.access&&(t.alt=!0,n?t.ctrl=!0:t.shift=!0),t.meta&&(n?t.meta=!0:(t.ctrl=!0,t.meta=!1)),t};class qO{constructor(e){this.shortcuts={},this.pendingPatterns=[],this.editor=e;const t=this;e.on("keyup keypress keydown",(e=>{!t.hasModifier(e)&&!t.isFunctionKey(e)||e.isDefaultPrevented()||(UO(t.shortcuts,(n=>{t.matchShortcut(e,n)&&(t.pendingPatterns=n.subpatterns.slice(0),"keydown"===e.type&&t.executeShortcutAction(n))})),t.matchShortcut(e,t.pendingPatterns[0])&&(1===t.pendingPatterns.length&&"keydown"===e.type&&t.executeShortcutAction(t.pendingPatterns[0]),t.pendingPatterns.shift()))}))}add(e,t,n,o){const r=this,s=r.normalizeCommandFunc(n);return UO(zO(Pt.trim(e)),(e=>{const n=r.createShortcut(e,t,s,o);r.shortcuts[n.id]=n})),!0}remove(e){const t=this.createShortcut(e);return!!this.shortcuts[t.id]&&(delete this.shortcuts[t.id],!0)}normalizeCommandFunc(e){const t=this,n=e;return"string"==typeof n?()=>{t.editor.execCommand(n,!1,null)}:Pt.isArray(n)?()=>{t.editor.execCommand(n[0],n[1],n[2])}:n}createShortcut(e,t,n,o){const r=Pt.map(zO(e,">"),$O);return r[r.length-1]=Pt.extend(r[r.length-1],{func:n,scope:o||this.editor}),Pt.extend(r[0],{desc:this.editor.translate(t),subpatterns:r.slice(1)})}hasModifier(e){return e.altKey||e.ctrlKey||e.metaKey}isFunctionKey(e){return"keydown"===e.type&&e.keyCode>=112&&e.keyCode<=123}matchShortcut(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)}executeShortcutAction(e){return e.func?e.func.call(e.scope):null}}const VO=()=>{const e=(()=>{const e={},t={},n={},o={},r={},s={},a={},i={},l=(e,t)=>(n,o)=>{e[n.toLowerCase()]={...o,type:t}};return{addButton:l(e,"button"),addGroupToolbarButton:l(e,"grouptoolbarbutton"),addToggleButton:l(e,"togglebutton"),addMenuButton:l(e,"menubutton"),addSplitButton:l(e,"splitbutton"),addMenuItem:l(t,"menuitem"),addNestedMenuItem:l(t,"nestedmenuitem"),addToggleMenuItem:l(t,"togglemenuitem"),addAutocompleter:l(n,"autocompleter"),addContextMenu:l(r,"contextmenu"),addContextToolbar:l(s,"contexttoolbar"),addContextForm:l(s,"contextform"),addSidebar:l(a,"sidebar"),addView:l(i,"views"),addIcon:(e,t)=>o[e.toLowerCase()]=t,getAll:()=>({buttons:e,menuItems:t,icons:o,popups:n,contextMenus:r,contextToolbars:s,sidebars:a,views:i})}})();return{addAutocompleter:e.addAutocompleter,addButton:e.addButton,addContextForm:e.addContextForm,addContextMenu:e.addContextMenu,addContextToolbar:e.addContextToolbar,addIcon:e.addIcon,addMenuButton:e.addMenuButton,addMenuItem:e.addMenuItem,addNestedMenuItem:e.addNestedMenuItem,addSidebar:e.addSidebar,addSplitButton:e.addSplitButton,addToggleButton:e.addToggleButton,addGroupToolbarButton:e.addGroupToolbarButton,addToggleMenuItem:e.addToggleMenuItem,addView:e.addView,getAll:e.getAll}},WO=za.DOM,KO=Pt.extend,YO=Pt.each;class GO{constructor(e,t,n){this.plugins={},this.contentCSS=[],this.contentStyles=[],this.loadedCSS={},this.isNotDirty=!1,this.composing=!1,this.destroyed=!1,this.hasHiddenInput=!1,this.iframeElement=null,this.initialized=!1,this.readonly=!1,this.removed=!1,this.startContent="",this._pendingNativeEvents=[],this._skinLoaded=!1,this._editableRoot=!0,this.editorManager=n,this.documentBaseUrl=n.documentBaseURL,KO(this,BO);const o=this;this.id=e,this.hidden=!1;const r=((e,t)=>ZT(WT||KT,WT,t,e,t))(n.defaultOptions,t);this.options=((e,t)=>{const n={},o={},r=(e,t,n)=>{const r=MO(t,n);return LO(r)?(o[e]=r.value,!0):(console.warn(DO(`Invalid value passed for the ${e} option`,r)),!1)},s=e=>Ee(n,e);return{register:(e,s)=>{const a=(e=>m(e.processor))(s)?(e=>{const t=(()=>{switch(e){case"array":return p;case"boolean":return b;case"function":return w;case"number":return x;case"object":return f;case"string":return m;case"string[]":return PO;case"object[]":return e=>E(e,f);case"regexp":return e=>u(e,RegExp);default:return M}})();return n=>MO(n,t,`The value must be a ${e}.`)})(s.processor):s.processor,i=((e,t,n)=>{if(!v(t)){const o=MO(t,n);if(LO(o))return o.value;console.error(DO(`Invalid default value passed for the "${e}" option`,o))}})(e,s.default,a);n[e]={...s,default:i,processor:a},xe(o,e).orThunk((()=>xe(t,e))).each((t=>r(e,t,a)))},isRegistered:s,get:e=>xe(o,e).orThunk((()=>xe(n,e).map((e=>e.default)))).getOrUndefined(),set:(e,t)=>{if(s(e)){const o=n[e];return o.immutable?(console.error(`"${e}" is an immutable option and cannot be updated`),!1):r(e,t,o.processor)}return console.warn(`"${e}" is not a registered option. Ensure the option has been registered before setting a value.`),!1},unset:e=>{const t=s(e);return t&&delete o[e],t},isSet:e=>Ee(o,e)}})(0,r),(e=>{const t=e.options.register;t("id",{processor:"string",default:e.id}),t("selector",{processor:"string"}),t("target",{processor:"object"}),t("suffix",{processor:"string"}),t("cache_suffix",{processor:"string"}),t("base_url",{processor:"string"}),t("referrer_policy",{processor:"string",default:""}),t("language_load",{processor:"boolean",default:!0}),t("inline",{processor:"boolean",default:!1}),t("iframe_attrs",{processor:"object",default:{}}),t("doctype",{processor:"string",default:"<!DOCTYPE html>"}),t("document_base_url",{processor:"string",default:e.documentBaseUrl}),t("body_id",{processor:Al(e,"tinymce"),default:"tinymce"}),t("body_class",{processor:Al(e),default:""}),t("content_security_policy",{processor:"string",default:""}),t("br_in_pre",{processor:"boolean",default:!0}),t("forced_root_block",{processor:e=>{const t=m(e)&&Ye(e);return t?{value:e,valid:t}:{valid:!1,message:"Must be a non-empty string."}},default:"p"}),t("forced_root_block_attrs",{processor:"object",default:{}}),t("newline_behavior",{processor:e=>{const t=H(["block","linebreak","invert","default"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: block, linebreak, invert or default."}},default:"default"}),t("br_newline_selector",{processor:"string",default:".mce-toc h2,figcaption,caption"}),t("no_newline_selector",{processor:"string",default:""}),t("keep_styles",{processor:"boolean",default:!0}),t("end_container_on_empty_block",{processor:e=>b(e)||m(e)?{valid:!0,value:e}:{valid:!1,message:"Must be boolean or a string"},default:"blockquote"}),t("font_size_style_values",{processor:"string",default:"xx-small,x-small,small,medium,large,x-large,xx-large"}),t("font_size_legacy_values",{processor:"string",default:"xx-small,small,medium,large,x-large,xx-large,300%"}),t("font_size_classes",{processor:"string",default:""}),t("automatic_uploads",{processor:"boolean",default:!0}),t("images_reuse_filename",{processor:"boolean",default:!1}),t("images_replace_blob_uris",{processor:"boolean",default:!0}),t("icons",{processor:"string",default:""}),t("icons_url",{processor:"string",default:""}),t("images_upload_url",{processor:"string",default:""}),t("images_upload_base_path",{processor:"string",default:""}),t("images_upload_credentials",{processor:"boolean",default:!1}),t("images_upload_handler",{processor:"function"}),t("language",{processor:"string",default:"en"}),t("language_url",{processor:"string",default:""}),t("entity_encoding",{processor:"string",default:"named"}),t("indent",{processor:"boolean",default:!0}),t("indent_before",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_after",{processor:"string",default:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,details,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist"}),t("indent_use_margin",{processor:"boolean",default:!1}),t("indentation",{processor:"string",default:"40px"}),t("content_css",{processor:e=>{const t=!1===e||m(e)||E(e,m);return t?m(e)?{value:q(e.split(","),Ve),valid:t}:p(e)?{value:e,valid:t}:!1===e?{value:[],valid:t}:{value:e,valid:t}:{valid:!1,message:"Must be false, a string or an array of strings."}},default:kd(e)?[]:["default"]}),t("content_style",{processor:"string"}),t("content_css_cors",{processor:"boolean",default:!1}),t("font_css",{processor:e=>{const t=m(e)||E(e,m);return t?{value:p(e)?e:q(e.split(","),Ve),valid:t}:{valid:!1,message:"Must be a string or an array of strings."}},default:[]}),t("inline_boundaries",{processor:"boolean",default:!0}),t("inline_boundaries_selector",{processor:"string",default:"a[href],code,span.mce-annotation"}),t("object_resizing",{processor:e=>{const t=b(e)||m(e);return t?!1===e||El.isiPhone()||El.isiPad()?{value:"",valid:t}:{value:!0===e?"table,img,figure.image,div,video,iframe":e,valid:t}:{valid:!1,message:"Must be boolean or a string"}},default:!_l}),t("resize_img_proportional",{processor:"boolean",default:!0}),t("event_root",{processor:"object"}),t("service_message",{processor:"string"}),t("theme",{processor:e=>!1===e||m(e)||w(e),default:"silver"}),t("theme_url",{processor:"string"}),t("formats",{processor:"object"}),t("format_empty_lines",{processor:"boolean",default:!1}),t("format_noneditable_selector",{processor:"string",default:""}),t("preview_styles",{processor:e=>{const t=!1===e||m(e);return t?{value:!1===e?"":e,valid:t}:{valid:!1,message:"Must be false or a string"}},default:"font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"}),t("custom_ui_selector",{processor:"string",default:""}),t("hidden_input",{processor:"boolean",default:!0}),t("submit_patch",{processor:"boolean",default:!0}),t("encoding",{processor:"string"}),t("add_form_submit_trigger",{processor:"boolean",default:!0}),t("add_unload_trigger",{processor:"boolean",default:!0}),t("custom_undo_redo_levels",{processor:"number",default:0}),t("disable_nodechange",{processor:"boolean",default:!1}),t("readonly",{processor:"boolean",default:!1}),t("editable_root",{processor:"boolean",default:!0}),t("plugins",{processor:"string[]",default:[]}),t("external_plugins",{processor:"object"}),t("forced_plugins",{processor:"string[]"}),t("model",{processor:"string",default:e.hasPlugin("rtc")?"plugin":"dom"}),t("model_url",{processor:"string"}),t("block_unsupported_drop",{processor:"boolean",default:!0}),t("visual",{processor:"boolean",default:!0}),t("visual_table_class",{processor:"string",default:"mce-item-table"}),t("visual_anchor_class",{processor:"string",default:"mce-item-anchor"}),t("iframe_aria_text",{processor:"string",default:"Rich Text Area. Press ALT-0 for help."}),t("setup",{processor:"function"}),t("init_instance_callback",{processor:"function"}),t("url_converter",{processor:"function",default:e.convertURL}),t("url_converter_scope",{processor:"object",default:e}),t("urlconverter_callback",{processor:"function"}),t("allow_conditional_comments",{processor:"boolean",default:!1}),t("allow_html_data_urls",{processor:"boolean",default:!1}),t("allow_svg_data_urls",{processor:"boolean"}),t("allow_html_in_named_anchor",{processor:"boolean",default:!1}),t("allow_script_urls",{processor:"boolean",default:!1}),t("allow_unsafe_link_target",{processor:"boolean",default:!1}),t("convert_fonts_to_spans",{processor:"boolean",default:!0,deprecated:!0}),t("fix_list_elements",{processor:"boolean",default:!1}),t("preserve_cdata",{processor:"boolean",default:!1}),t("remove_trailing_brs",{processor:"boolean",default:!0}),t("pad_empty_with_br",{processor:"boolean",default:!1}),t("inline_styles",{processor:"boolean",default:!0,deprecated:!0}),t("element_format",{processor:"string",default:"html"}),t("entities",{processor:"string"}),t("schema",{processor:"string",default:"html5"}),t("convert_urls",{processor:"boolean",default:!0}),t("relative_urls",{processor:"boolean",default:!0}),t("remove_script_host",{processor:"boolean",default:!0}),t("custom_elements",{processor:"string"}),t("extended_valid_elements",{processor:"string"}),t("invalid_elements",{processor:"string"}),t("invalid_styles",{processor:Rl}),t("valid_children",{processor:"string"}),t("valid_classes",{processor:Rl}),t("valid_elements",{processor:"string"}),t("valid_styles",{processor:Rl}),t("verify_html",{processor:"boolean",default:!0}),t("auto_focus",{processor:e=>m(e)||!0===e}),t("browser_spellcheck",{processor:"boolean",default:!1}),t("protect",{processor:"array"}),t("images_file_types",{processor:"string",default:"jpeg,jpg,jpe,jfi,jif,jfif,png,gif,bmp,webp"}),t("deprecation_warnings",{processor:"boolean",default:!0}),t("a11y_advanced_options",{processor:"boolean",default:!1}),t("api_key",{processor:"string"}),t("paste_block_drop",{processor:"boolean",default:!1}),t("paste_data_images",{processor:"boolean",default:!0}),t("paste_preprocess",{processor:"function"}),t("paste_postprocess",{processor:"function"}),t("paste_webkit_styles",{processor:"string",default:"none"}),t("paste_remove_styles_if_webkit",{processor:"boolean",default:!0}),t("paste_merge_formats",{processor:"boolean",default:!0}),t("smart_paste",{processor:"boolean",default:!0}),t("paste_as_text",{processor:"boolean",default:!1}),t("paste_tab_spaces",{processor:"number",default:4}),t("text_patterns",{processor:e=>E(e,f)||!1===e?{value:xl(!1===e?[]:e),valid:!0}:{valid:!1,message:"Must be an array of objects or false."},default:[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}]}),t("text_patterns_lookup",{processor:e=>{return w(e)?{value:(t=e,e=>{const n=t(e);return xl(n)}),valid:!0}:{valid:!1,message:"Must be a single function"};var t},default:e=>[]}),t("noneditable_class",{processor:"string",default:"mceNonEditable"}),t("editable_class",{processor:"string",default:"mceEditable"}),t("noneditable_regexp",{processor:e=>E(e,Sl)?{value:e,valid:!0}:Sl(e)?{value:[e],valid:!0}:{valid:!1,message:"Must be a RegExp or an array of RegExp."},default:[]}),t("table_tab_navigation",{processor:"boolean",default:!0}),t("highlight_on_focus",{processor:"boolean",default:!1}),t("xss_sanitization",{processor:"boolean",default:!0}),t("details_initial_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("details_serialized_state",{processor:e=>{const t=H(["inherited","collapsed","expanded"],e);return t?{value:e,valid:t}:{valid:!1,message:"Must be one of: inherited, collapsed, or expanded."}},default:"inherited"}),t("init_content_sync",{processor:"boolean",default:!1}),t("newdocument_content",{processor:"string",default:""}),t("force_hex_color",{processor:e=>{const t=["always","rgb_only","off"],n=H(t,e);return n?{value:e,valid:n}:{valid:!1,message:`Must be one of: ${t.join(", ")}.`}},default:"off"}),t("sandbox_iframes",{processor:"boolean",default:!1}),t("convert_unsafe_embeds",{processor:"boolean",default:!1}),e.on("ScriptsLoaded",(()=>{t("directionality",{processor:"string",default:Ka.isRtl()?"rtl":void 0}),t("placeholder",{processor:"string",default:kl.getAttrib(e.getElement(),"placeholder")})}))})(o);const s=this.options.get;s("deprecation_warnings")&&((e,t)=>{((e,t)=>{const n=gw(e),o=bw(t),r=o.length>0,s=n.length>0,a="mobile"===t.theme;if(r||s||a){const e="\n- ",t=a?`\n\nThemes:${e}mobile`:"",i=r?`\n\nPlugins:${e}${o.join(e)}`:"",l=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled and have been removed in TinyMCE 6.0. These features will no longer work and should be removed from the TinyMCE configuration. See https://www.tiny.cloud/docs/tinymce/6/migration-from-5x/ for more information."+t+i+l)}})(e,t),((e,t)=>{const n=pw(e),o=vw(t),r=o.length>0,s=n.length>0;if(r||s){const e="\n- ",t=r?`\n\nPlugins:${e}${o.map(yw).join(e)}`:"",a=s?`\n\nOptions:${e}${n.join(e)}`:"";console.warn("The following deprecated features are currently enabled but will be removed soon."+t+a)}})(e,t)})(t,r);const a=s("suffix");a&&(n.suffix=a),this.suffix=n.suffix;const i=s("base_url");i&&n._setBaseUrl(i),this.baseUri=n.baseURI;const l=ed(o);l&&(Ha.ScriptLoader._setReferrerPolicy(l),za.DOM.styleSheetLoader._setReferrerPolicy(l));const d=Dd(o);C(d)&&za.DOM.styleSheetLoader._setContentCssCors(d),Ya.languageLoad=s("language_load"),Ya.baseURL=n.baseURL,this.setDirty(!1),this.documentBaseURI=new oC(Bl(o),{base_uri:this.baseUri}),this.baseURI=this.baseUri,this.inline=kd(o),this.hasVisual=Fd(o),this.shortcuts=new qO(this),this.editorCommands=new hO(this),fO(this);const c=s("cache_suffix");c&&(At.cacheSuffix=c.replace(/^[\?\&]+/,"")),this.ui={registry:VO(),styleSheetLoader:void 0,show:_,hide:_,setEnabled:_,isEnabled:M},this.mode=(e=>{const t=$a("design"),n=$a({design:{activate:_,deactivate:_,editorReadOnly:!1},readonly:{activate:_,deactivate:_,editorReadOnly:!0}});return(e=>{e.serializer?wO(e):e.on("PreInit",(()=>{wO(e)}))})(e),(e=>{e.on("ShowCaret",(t=>{CO(e)&&t.preventDefault()})),e.on("ObjectSelected",(t=>{CO(e)&&t.preventDefault()}))})(e),{isReadOnly:()=>CO(e),set:o=>((e,t,n,o)=>{if(o!==n.get()){if(!Ee(t,o))throw new Error(`Editor mode '${o}' is invalid`);e.initialized?FO(e,n,t,o):e.on("init",(()=>FO(e,n,t,o)))}})(e,n.get(),t,o),get:()=>t.get(),register:(e,t)=>{n.set(((e,t,n)=>{if(H(IO,t))throw new Error(`Cannot override default mode ${t}`);return{...e,[t]:{...n,deactivate:()=>{try{n.deactivate()}catch(e){console.error(`problem while deactivating editor mode ${t}:`,e)}}}}})(n.get(),e,t))}}})(o),n.dispatch("SetupEditor",{editor:this});const g=Hd(o);w(g)&&g.call(o,o)}render(){(e=>{const t=e.id;Ka.setCode(td(e));const n=()=>{jT.unbind(window,"ready",n),e.render()};if(!Ta.Event.domLoaded)return void jT.bind(window,"ready",n);if(!e.getElement())return;const o=yn(e.getElement()),r=rn(o);e.on("remove",(()=>{W(o.dom.attributes,(e=>on(o,e.name))),Zt(o,r)})),e.ui.styleSheetLoader=((e,t)=>Is.forElement(e,{contentCssCors:Dd(t),referrerPolicy:ed(t)}))(o,e),kd(e)?e.inline=!0:(e.orgVisibility=e.getElement().style.visibility,e.getElement().style.visibility="hidden");const s=e.getElement().form||jT.getParent(t,"form");s&&(e.formElement=s,Sd(e)&&!Zo(e.getElement())&&(jT.insertAfter(jT.create("input",{type:"hidden",name:t}),t),e.hasHiddenInput=!0),e.formEventDelegate=t=>{e.dispatch(t.type,t)},jT.bind(s,"submit reset",e.formEventDelegate),e.on("reset",(()=>{e.resetContent()})),!Nd(e)||s.submit.nodeType||s.submit.length||s._mceOldSubmit||(s._mceOldSubmit=s.submit,s.submit=()=>(e.editorManager.triggerSave(),e.setDirty(!1),s._mceOldSubmit(s)))),e.windowManager=Pw(e),e.notificationManager=Tw(e),(e=>"xml"===e.options.get("encoding"))(e)&&e.on("GetContent",(e=>{e.save&&(e.content=jT.encode(e.content))})),Rd(e)&&e.on("submit",(()=>{e.initialized&&e.save()})),Ad(e)&&(e._beforeUnload=()=>{!e.initialized||e.destroyed||e.isHidden()||e.save({format:"raw",no_events:!0,set_dirty:!1})},e.editorManager.on("BeforeUnload",e._beforeUnload)),e.editorManager.add(e),qT(e,e.suffix)})(this)}focus(e){this.execCommand("mceFocus",!1,e)}hasFocus(){return Rg(this)}translate(e){return Ka.translate(e)}getParam(e,t,n){const o=this.options;return o.isRegistered(e)||(C(n)?o.register(e,{processor:n,default:t}):o.register(e,{processor:M,default:t})),o.isSet(e)||v(t)?o.get(e):t}hasPlugin(e,t){return!(!H(Ld(this),e)||t&&void 0===Ow.get(e))}nodeChanged(e){this._nodeChangeDispatcher.nodeChanged(e)}addCommand(e,t,n){this.editorCommands.addCommand(e,t,n)}addQueryStateHandler(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)}addQueryValueHandler(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)}addShortcut(e,t,n,o){this.shortcuts.add(e,t,n,o)}execCommand(e,t,n,o){return this.editorCommands.execCommand(e,t,n,o)}queryCommandState(e){return this.editorCommands.queryCommandState(e)}queryCommandValue(e){return this.editorCommands.queryCommandValue(e)}queryCommandSupported(e){return this.editorCommands.queryCommandSupported(e)}show(){const e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable="true":(WO.show(e.getContainer()),WO.hide(e.id)),e.load(),e.dispatch("show"))}hide(){const e=this;e.hidden||(e.save(),e.inline?(e.getBody().contentEditable="false",e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(WO.hide(e.getContainer()),WO.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.dispatch("hide"))}isHidden(){return this.hidden}setProgressState(e,t){this.dispatch("ProgressState",{state:e,time:t})}load(e={}){const t=this,n=t.getElement();if(t.removed)return"";if(n){const o={...e,load:!0},r=Zo(n)?n.value:n.innerHTML,s=t.setContent(r,o);return o.no_events||t.dispatch("LoadContent",{...o,element:n}),s}return""}save(e={}){const t=this;let n=t.getElement();if(!n||!t.initialized||t.removed)return"";const o={...e,save:!0,element:n};let r=t.getContent(o);const s={...o,content:r};if(s.no_events||t.dispatch("SaveContent",s),"raw"===s.format&&t.dispatch("RawSaveContent",s),r=s.content,Zo(n))n.value=r;else{!e.is_removing&&t.inline||(n.innerHTML=r);const o=WO.getParent(t.id,"form");o&&YO(o.elements,(e=>e.name!==t.id||(e.value=r,!1)))}return s.element=o.element=n=null,!1!==s.set_dirty&&t.setDirty(!1),r}setContent(e,t){return lw(this,e,t)}getContent(e){return((e,t={})=>{const n=((e,t)=>({...e,format:t,get:!0,getInner:!0}))(t,t.format?t.format:"html");return yC(e,n).fold(R,(t=>{const n=((e,t)=>QC(e).editor.getContent(t))(e,t);return CC(e,n,t)}))})(this,e)}insertContent(e,t){t&&(e=KO({content:e},t)),this.execCommand("mceInsertContent",!1,e)}resetContent(e){void 0===e?lw(this,this.startContent,{format:"raw"}):lw(this,e),this.undoManager.reset(),this.setDirty(!1),this.nodeChanged()}isDirty(){return!this.isNotDirty}setDirty(e){const t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.dispatch("dirty")}getContainer(){const e=this;return e.container||(e.container=e.editorContainer||WO.get(e.id+"_parent")),e.container}getContentAreaContainer(){return this.contentAreaContainer}getElement(){return this.targetElm||(this.targetElm=WO.get(this.id)),this.targetElm}getWin(){const e=this;if(!e.contentWindow){const t=e.iframeElement;t&&(e.contentWindow=t.contentWindow)}return e.contentWindow}getDoc(){const e=this;if(!e.contentDocument){const t=e.getWin();t&&(e.contentDocument=t.document)}return e.contentDocument}getBody(){var e,t;const n=this.getDoc();return null!==(t=null!==(e=this.bodyElement)&&void 0!==e?e:null==n?void 0:n.body)&&void 0!==t?t:null}convertURL(e,t,n){const o=this,r=o.options.get,s=qd(o);if(w(s))return s.call(o,e,n,!0,t);if(!r("convert_urls")||"link"===n||f(n)&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length)return e;const a=new oC(e);return"http"!==a.protocol&&"https"!==a.protocol&&""!==a.protocol?e:r("relative_urls")?o.documentBaseURI.toRelative(e):e=o.documentBaseURI.toAbsolute(e,r("remove_script_host"))}addVisual(e){((e,t)=>{((e,t)=>{JC(e).editor.addVisual(t)})(e,t)})(this,e)}setEditableRoot(e){((e,t)=>{e._editableRoot!==t&&(e._editableRoot=t,e.readonly||(e.getBody().contentEditable=String(e.hasEditableRoot()),e.nodeChanged()),((e,t)=>{e.dispatch("EditableRootStateChange",{state:t})})(e,t))})(this,e)}hasEditableRoot(){return this._editableRoot}remove(){(e=>{if(!e.removed){const{_selectionOverrides:t,editorUpload:n}=e,o=e.getBody(),r=e.getElement();o&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&C(null==r?void 0:r.nextSibling)&&Cw.remove(r.nextSibling),(e=>{e.dispatch("remove")})(e),e.editorManager.remove(e),!e.inline&&o&&(e=>{Cw.setStyle(e.id,"display",e.orgDisplay)})(e),(e=>{e.dispatch("detach")})(e),Cw.remove(e.getContainer()),ww(t),ww(n),e.destroy()}})(this)}destroy(e){((e,t)=>{const{selection:n,dom:o}=e;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),ww(n),ww(o)),(e=>{const t=e.formElement;t&&(t._mceOldSubmit&&(t.submit=t._mceOldSubmit,delete t._mceOldSubmit),Cw.unbind(t,"submit reset",e.formEventDelegate))})(e),(e=>{const t=e;t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null;const n=e.selection;if(n){const e=n.dom;t.selection=n.win=n.dom=e.doc=null}})(e),e.destroyed=!0):e.remove())})(this,e)}uploadImages(){return this.editorUpload.uploadImages()}_scanForImages(){return this.editorUpload.scanForImages()}}const XO=za.DOM,QO=Pt.each;let JO,ZO=!1,eB=[];const tB=e=>{const t=e.type;QO(sB.get(),(n=>{switch(t){case"scroll":n.dispatch("ScrollWindow",e);break;case"resize":n.dispatch("ResizeWindow",e)}}))},nB=e=>{if(e!==ZO){const t=za.DOM;e?(t.bind(window,"resize",tB),t.bind(window,"scroll",tB)):(t.unbind(window,"resize",tB),t.unbind(window,"scroll",tB)),ZO=e}},oB=e=>{const t=eB;return eB=Y(eB,(t=>e!==t)),sB.activeEditor===e&&(sB.activeEditor=eB.length>0?eB[0]:null),sB.focusedEditor===e&&(sB.focusedEditor=null),t.length!==eB.length},rB="CSS1Compat"!==document.compatMode,sB={...SO,baseURI:null,baseURL:null,defaultOptions:{},documentBaseURL:null,suffix:null,majorVersion:"6",minorVersion:"8.4",releaseDate:"2024-06-19",i18n:Ka,activeEditor:null,focusedEditor:null,setup(){const e=this;let t="",n="",o=oC.getDocumentBaseUrl(document.location);/^[^:]+:\/\/\/?[^\/]+\//.test(o)&&(o=o.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(o)||(o+="/"));const r=window.tinymce||window.tinyMCEPreInit;if(r)t=r.base||r.baseURL,n=r.suffix;else{const e=document.getElementsByTagName("script");for(let o=0;o<e.length;o++){const r=e[o].src||"";if(""===r)continue;const s=r.substring(r.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(r)){-1!==s.indexOf(".min")&&(n=".min"),t=r.substring(0,r.lastIndexOf("/"));break}}if(!t&&document.currentScript){const e=document.currentScript.src;-1!==e.indexOf(".min")&&(n=".min"),t=e.substring(0,e.lastIndexOf("/"))}}var s;e.baseURL=new oC(o).toAbsolute(t),e.documentBaseURL=o,e.baseURI=new oC(e.baseURL),e.suffix=n,(s=e).on("AddEditor",T(_g,s)),s.on("RemoveEditor",T(kg,s))},overrideDefaults(e){const t=e.base_url;t&&this._setBaseUrl(t);const n=e.suffix;n&&(this.suffix=n),this.defaultOptions=e;const o=e.plugin_base_urls;void 0!==o&&ge(o,((e,t)=>{Ya.PluginManager.urls[t]=e}))},init(e){const t=this;let n;const o=Pt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option table tbody tfoot thead tr th td script noscript style textarea video audio iframe object menu"," ");let r=e=>{n=e};const s=()=>{let n=0;const a=[];let i;XO.unbind(window,"ready",s),(n=>{const o=e.onpageload;o&&o.apply(t,[])})(),i=((e,t)=>{const n=[],o=w(t)?e=>$(n,(n=>t(n,e))):e=>H(n,e);for(let t=0,r=e.length;t<r;t++){const r=e[t];o(r)||n.push(r)}return n})((e=>At.browser.isIE()||At.browser.isEdge()?(Fw("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tiny.cloud/docs/tinymce/6/support/#supportedwebbrowsers"),[]):rB?(Fw("Failed to initialize the editor as the document is not in standards mode. TinyMCE requires standards mode."),[]):m(e.selector)?XO.select(e.selector):C(e.target)?[e.target]:[])(e)),Pt.each(i,(e=>{var n;(n=t.get(e.id))&&n.initialized&&!(n.getContainer()||n.getBody()).parentNode&&(oB(n),n.unbindAllNativeEvents(),n.destroy(!0),n.removed=!0)})),i=Pt.grep(i,(e=>!t.get(e.id))),0===i.length?r([]):QO(i,(s=>{((e,t)=>e.inline&&t.tagName.toLowerCase()in o)(e,s)?Fw("Could not initialize inline editor on invalid inline target element",s):((e,o,s)=>{const l=new GO(e,o,t);a.push(l),l.on("init",(()=>{++n===i.length&&r(a)})),l.targetElm=l.targetElm||s,l.render()})((e=>{let t=e.id;return t||(t=xe(e,"name").filter((e=>!XO.get(e))).getOrThunk(XO.uniqueId),e.setAttribute("id",t)),t})(s),e,s)}))};return XO.bind(window,"ready",s),new Promise((e=>{n?e(n):r=t=>{e(t)}}))},get(e){return 0===arguments.length?eB.slice(0):m(e)?J(eB,(t=>t.id===e)).getOr(null):x(e)&&eB[e]?eB[e]:null},add(e){const t=this,n=t.get(e.id);return n===e||(null===n&&eB.push(e),nB(!0),t.activeEditor=e,t.dispatch("AddEditor",{editor:e}),JO||(JO=e=>{const n=t.dispatch("BeforeUnload");if(n.returnValue)return e.preventDefault(),e.returnValue=n.returnValue,n.returnValue},window.addEventListener("beforeunload",JO))),e},createEditor(e,t){return this.add(new GO(e,t,this))},remove(e){const t=this;let n;if(e){if(!m(e))return n=e,h(t.get(n.id))?null:(oB(n)&&t.dispatch("RemoveEditor",{editor:n}),0===eB.length&&window.removeEventListener("beforeunload",JO),n.remove(),nB(eB.length>0),n);QO(XO.select(e),(e=>{n=t.get(e.id),n&&t.remove(n)}))}else for(let e=eB.length-1;e>=0;e--)t.remove(eB[e])},execCommand(e,t,n){var o;const r=this,s=f(n)?null!==(o=n.id)&&void 0!==o?o:n.index:n;switch(e){case"mceAddEditor":if(!r.get(s)){const e=n.options;new GO(s,e,r).render()}return!0;case"mceRemoveEditor":{const e=r.get(s);return e&&e.remove(),!0}case"mceToggleEditor":{const e=r.get(s);return e?(e.isHidden()?e.show():e.hide(),!0):(r.execCommand("mceAddEditor",!1,n),!0)}}return!!r.activeEditor&&r.activeEditor.execCommand(e,t,n)},triggerSave:()=>{QO(eB,(e=>{e.save()}))},addI18n:(e,t)=>{Ka.add(e,t)},translate:e=>Ka.translate(e),setActive(e){const t=this.activeEditor;this.activeEditor!==e&&(t&&t.dispatch("deactivate",{relatedTarget:e}),e.dispatch("activate",{relatedTarget:t})),this.activeEditor=e},_setBaseUrl(e){this.baseURL=new oC(this.documentBaseURL).toAbsolute(e.replace(/\/+$/,"")),this.baseURI=new oC(this.baseURL)}};sB.setup();const aB=(()=>{const e=Xa();return{FakeClipboardItem:e=>({items:e,types:me(e),getType:t=>xe(e,t).getOrUndefined()}),write:t=>{e.set(t)},read:()=>e.get().getOrUndefined(),clear:e.clear}})(),iB=Math.min,lB=Math.max,dB=Math.round,cB=(e,t,n)=>{let o=t.x,r=t.y;const s=e.w,a=e.h,i=t.w,l=t.h,d=(n||"").split("");return"b"===d[0]&&(r+=l),"r"===d[1]&&(o+=i),"c"===d[0]&&(r+=dB(l/2)),"c"===d[1]&&(o+=dB(i/2)),"b"===d[3]&&(r-=a),"r"===d[4]&&(o-=s),"c"===d[3]&&(r-=dB(a/2)),"c"===d[4]&&(o-=dB(s/2)),uB(o,r,s,a)},uB=(e,t,n,o)=>({x:e,y:t,w:n,h:o}),mB={inflate:(e,t,n)=>uB(e.x-t,e.y-n,e.w+2*t,e.h+2*n),relativePosition:cB,findBestRelativePosition:(e,t,n,o)=>{for(let r=0;r<o.length;r++){const s=cB(e,t,o[r]);if(s.x>=n.x&&s.x+s.w<=n.w+n.x&&s.y>=n.y&&s.y+s.h<=n.h+n.y)return o[r]}return null},intersect:(e,t)=>{const n=lB(e.x,t.x),o=lB(e.y,t.y),r=iB(e.x+e.w,t.x+t.w),s=iB(e.y+e.h,t.y+t.h);return r-n<0||s-o<0?null:uB(n,o,r-n,s-o)},clamp:(e,t,n)=>{let o=e.x,r=e.y,s=e.x+e.w,a=e.y+e.h;const i=t.x+t.w,l=t.y+t.h,d=lB(0,t.x-o),c=lB(0,t.y-r),u=lB(0,s-i),m=lB(0,a-l);return o+=d,r+=c,n&&(s+=d,a+=c,o-=u,r-=m),s-=u,a-=m,uB(o,r,s-o,a-r)},create:uB,fromClientRect:e=>uB(e.left,e.top,e.width,e.height)},fB=(()=>{const e={},t={},n={};return{load:(n,o)=>{const r=`Script at URL "${o}" failed to load`,s=`Script at URL "${o}" did not call \`tinymce.Resource.add('${n}', data)\` within 1 second`;if(void 0!==e[n])return e[n];{const a=new Promise(((e,a)=>{const i=((e,t,n=1e3)=>{let o=!1,r=null;const s=e=>(...t)=>{o||(o=!0,null!==r&&(clearTimeout(r),r=null),e.apply(null,t))},a=s(e),i=s(t);return{start:(...e)=>{o||null!==r||(r=setTimeout((()=>i.apply(null,e)),n))},resolve:a,reject:i}})(e,a);t[n]=i.resolve,Ha.ScriptLoader.loadScript(o).then((()=>i.start(s)),(()=>i.reject(r)))}));return e[n]=a,a}},add:(o,r)=>{void 0!==t[o]&&(t[o](r),delete t[o]),e[o]=Promise.resolve(r),n[o]=r},has:e=>e in n,get:e=>n[e],unload:t=>{delete e[t]}}})();let gB;try{const e="__storage_test__";gB=window.localStorage,gB.setItem(e,e),gB.removeItem(e)}catch(e){gB=(()=>{let e={},t=[];const n={getItem:t=>e[t]||null,setItem:(n,o)=>{t.push(n),e[n]=String(o)},key:e=>t[e],removeItem:n=>{t=t.filter((e=>e===n)),delete e[n]},clear:()=>{t=[],e={}},length:0};return Object.defineProperty(n,"length",{get:()=>t.length,configurable:!1,enumerable:!1}),n})()}const pB={geom:{Rect:mB},util:{Delay:vg,Tools:Pt,VK:af,URI:oC,EventDispatcher:_O,Observable:SO,I18n:Ka,LocalStorage:gB,ImageUploader:e=>{const t=Hw(),n=Ww(e,t);return{upload:(t,o=!0)=>n.upload(t,o?Vw(e):void 0)}}},dom:{EventUtils:Ta,TreeWalker:jo,TextSeeker:hi,DOMUtils:za,ScriptLoader:Ha,RangeUtils:Uf,Serializer:iw,StyleSheetLoader:Ms,ControlSelection:mf,BookmarkManager:Jm,Selection:rw,Event:Ta.Event},html:{Styles:wa,Entities:ea,Node:Wg,Schema:ua,DomParser:bC,Writer:cp,Serializer:up},Env:At,AddOnManager:Ya,Annotator:Qm,Formatter:rx,UndoManager:ax,EditorCommands:hO,WindowManager:Pw,NotificationManager:Tw,EditorObservable:BO,Shortcuts:qO,Editor:GO,FocusManager:bg,EditorManager:sB,DOM:za.DOM,ScriptLoader:Ha.ScriptLoader,PluginManager:Ow,ThemeManager:Bw,ModelManager:Ew,IconManager:xw,Resource:fB,FakeClipboard:aB,trim:Pt.trim,isArray:Pt.isArray,is:Pt.is,toArray:Pt.toArray,makeMap:Pt.makeMap,each:Pt.each,map:Pt.map,grep:Pt.grep,inArray:Pt.inArray,extend:Pt.extend,walk:Pt.walk,resolve:Pt.resolve,explode:Pt.explode,_addCacheSuffix:Pt._addCacheSuffix},hB=Pt.extend(sB,pB);(e=>{window.tinymce=e,window.tinyMCE=e})(hB),(e=>{if("object"==typeof module)try{module.exports=e}catch(e){}})(hB)}();
\ No newline at end of file

From 346b88ae4379eae209672918bcf470c0c2620698 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Oct 2024 14:36:20 +0100
Subject: [PATCH 306/666] JS: Converted a few extra services to TS

---
 resources/js/code/index.mjs                   |  2 +-
 resources/js/components/dropzone.js           |  2 +-
 resources/js/components/page-editor.js        |  4 +-
 resources/js/components/pointer.js            |  2 +-
 resources/js/markdown/codemirror.js           |  2 +-
 resources/js/markdown/display.js              |  2 +-
 .../services/{clipboard.js => clipboard.ts}   | 41 +++++--------------
 resources/js/services/dates.js                | 23 -----------
 resources/js/services/dates.ts                | 14 +++++++
 resources/js/services/{store.js => store.ts}  |  0
 resources/js/services/{vdom.js => vdom.ts}    | 16 +++-----
 .../js/wysiwyg-tinymce/drop-paste-handling.js |  2 +-
 12 files changed, 39 insertions(+), 71 deletions(-)
 rename resources/js/services/{clipboard.js => clipboard.ts} (54%)
 delete mode 100644 resources/js/services/dates.js
 create mode 100644 resources/js/services/dates.ts
 rename resources/js/services/{store.js => store.ts} (100%)
 rename resources/js/services/{vdom.js => vdom.ts} (54%)

diff --git a/resources/js/code/index.mjs b/resources/js/code/index.mjs
index d2ea12a4c93..a2850c06b23 100644
--- a/resources/js/code/index.mjs
+++ b/resources/js/code/index.mjs
@@ -1,6 +1,6 @@
 import {EditorView, keymap} from '@codemirror/view';
 
-import {copyTextToClipboard} from '../services/clipboard';
+import {copyTextToClipboard} from '../services/clipboard.ts';
 import {viewerExtensions, editorExtensions} from './setups';
 import {createView} from './views';
 import {SimpleEditorInterface} from './simple-editor-interface';
diff --git a/resources/js/components/dropzone.js b/resources/js/components/dropzone.js
index 93e93a251c7..920fe875f22 100644
--- a/resources/js/components/dropzone.js
+++ b/resources/js/components/dropzone.js
@@ -1,5 +1,5 @@
 import {Component} from './component';
-import {Clipboard} from '../services/clipboard';
+import {Clipboard} from '../services/clipboard.ts';
 import {
     elem, getLoading, onSelect, removeLoading,
 } from '../services/dom';
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index ecfc3546f4e..2160675529b 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -1,7 +1,7 @@
-import * as Dates from '../services/dates';
 import {onSelect} from '../services/dom';
 import {debounce} from '../services/util';
 import {Component} from './component';
+import {utcTimeStampToLocalTime} from '../services/dates.ts';
 
 export class PageEditor extends Component {
 
@@ -129,7 +129,7 @@ export class PageEditor extends Component {
                 this.deleteDraftWrap.toggleAttribute('hidden', false);
             }
 
-            this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
+            this.draftNotifyChange(`${resp.data.message} ${utcTimeStampToLocalTime(resp.data.timestamp)}`);
             this.autoSave.last = Date.now();
             if (resp.data.warning && !this.shownWarningsCache.has(resp.data.warning)) {
                 window.$events.emit('warning', resp.data.warning);
diff --git a/resources/js/components/pointer.js b/resources/js/components/pointer.js
index b16a50de643..607576cb9f9 100644
--- a/resources/js/components/pointer.js
+++ b/resources/js/components/pointer.js
@@ -1,6 +1,6 @@
 import * as DOM from '../services/dom';
 import {Component} from './component';
-import {copyTextToClipboard} from '../services/clipboard';
+import {copyTextToClipboard} from '../services/clipboard.ts';
 
 export class Pointer extends Component {
 
diff --git a/resources/js/markdown/codemirror.js b/resources/js/markdown/codemirror.js
index 2ea944865c1..a6332cbb844 100644
--- a/resources/js/markdown/codemirror.js
+++ b/resources/js/markdown/codemirror.js
@@ -1,6 +1,6 @@
 import {provideKeyBindings} from './shortcuts';
 import {debounce} from '../services/util';
-import {Clipboard} from '../services/clipboard';
+import {Clipboard} from '../services/clipboard.ts';
 
 /**
  * Initiate the codemirror instance for the markdown editor.
diff --git a/resources/js/markdown/display.js b/resources/js/markdown/display.js
index 487df1cabce..60be26b5fb7 100644
--- a/resources/js/markdown/display.js
+++ b/resources/js/markdown/display.js
@@ -1,4 +1,4 @@
-import {patchDomFromHtmlString} from '../services/vdom';
+import {patchDomFromHtmlString} from '../services/vdom.ts';
 
 export class Display {
 
diff --git a/resources/js/services/clipboard.js b/resources/js/services/clipboard.ts
similarity index 54%
rename from resources/js/services/clipboard.js
rename to resources/js/services/clipboard.ts
index 5f73c3020cf..9b8efa6c5ad 100644
--- a/resources/js/services/clipboard.js
+++ b/resources/js/services/clipboard.ts
@@ -1,62 +1,43 @@
 export class Clipboard {
 
-    /**
-     * Constructor
-     * @param {DataTransfer} clipboardData
-     */
-    constructor(clipboardData) {
+    protected data: DataTransfer;
+
+    constructor(clipboardData: DataTransfer) {
         this.data = clipboardData;
     }
 
     /**
      * Check if the clipboard has any items.
      */
-    hasItems() {
+    hasItems(): boolean {
         return Boolean(this.data) && Boolean(this.data.types) && this.data.types.length > 0;
     }
 
     /**
      * Check if the given event has tabular-looking data in the clipboard.
-     * @return {boolean}
      */
-    containsTabularData() {
+    containsTabularData(): boolean {
         const rtfData = this.data.getData('text/rtf');
-        return rtfData && rtfData.includes('\\trowd');
+        return !!rtfData && rtfData.includes('\\trowd');
     }
 
     /**
      * Get the images that are in the clipboard data.
-     * @return {Array<File>}
      */
-    getImages() {
-        const {types} = this.data;
-        const images = [];
-
-        for (const type of types) {
-            if (type.includes('image')) {
-                const item = this.data.getData(type);
-                images.push(item.getAsFile());
-            }
-        }
-
-        const imageFiles = this.getFiles().filter(f => f.type.includes('image'));
-        images.push(...imageFiles);
-
-        return images;
+    getImages(): File[] {
+        return this.getFiles().filter(f => f.type.includes('image'));
     }
 
     /**
      * Get the files included in the clipboard data.
-     * @return {File[]}
      */
-    getFiles() {
+    getFiles(): File[] {
         const {files} = this.data;
         return [...files];
     }
-
 }
 
-export async function copyTextToClipboard(text) {
+export async function copyTextToClipboard(text: string) {
     if (window.isSecureContext && navigator.clipboard) {
         await navigator.clipboard.writeText(text);
         return;
@@ -64,7 +45,7 @@ export async function copyTextToClipboard(text) {
 
     // Backup option where we can't use the navigator.clipboard API
     const tempInput = document.createElement('textarea');
-    tempInput.style = 'position: absolute; left: -1000px; top: -1000px;';
+    tempInput.setAttribute('style', 'position: absolute; left: -1000px; top: -1000px;');
     tempInput.value = text;
     document.body.appendChild(tempInput);
     tempInput.select();
diff --git a/resources/js/services/dates.js b/resources/js/services/dates.js
deleted file mode 100644
index 2e6b34aeede..00000000000
--- a/resources/js/services/dates.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export function getCurrentDay() {
-    const date = new Date();
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-
-    return `${date.getFullYear()}-${(month > 9 ? '' : '0') + month}-${(day > 9 ? '' : '0') + day}`;
-}
-
-export function utcTimeStampToLocalTime(timestamp) {
-    const date = new Date(timestamp * 1000);
-    const hours = date.getHours();
-    const mins = date.getMinutes();
-    return `${(hours > 9 ? '' : '0') + hours}:${(mins > 9 ? '' : '0') + mins}`;
-}
-
-export function formatDateTime(date) {
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-    const hours = date.getHours();
-    const mins = date.getMinutes();
-
-    return `${date.getFullYear()}-${(month > 9 ? '' : '0') + month}-${(day > 9 ? '' : '0') + day} ${(hours > 9 ? '' : '0') + hours}:${(mins > 9 ? '' : '0') + mins}`;
-}
diff --git a/resources/js/services/dates.ts b/resources/js/services/dates.ts
new file mode 100644
index 00000000000..a6118c2470d
--- /dev/null
+++ b/resources/js/services/dates.ts
@@ -0,0 +1,14 @@
+export function getCurrentDay(): string {
+    const date = new Date();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+
+    return `${date.getFullYear()}-${(month > 9 ? '' : '0') + month}-${(day > 9 ? '' : '0') + day}`;
+}
+
+export function utcTimeStampToLocalTime(timestamp: number): string {
+    const date = new Date(timestamp * 1000);
+    const hours = date.getHours();
+    const mins = date.getMinutes();
+    return `${(hours > 9 ? '' : '0') + hours}:${(mins > 9 ? '' : '0') + mins}`;
+}
diff --git a/resources/js/services/store.js b/resources/js/services/store.ts
similarity index 100%
rename from resources/js/services/store.js
rename to resources/js/services/store.ts
diff --git a/resources/js/services/vdom.js b/resources/js/services/vdom.ts
similarity index 54%
rename from resources/js/services/vdom.js
rename to resources/js/services/vdom.ts
index 2095cd2ca4f..c32f328f5e7 100644
--- a/resources/js/services/vdom.js
+++ b/resources/js/services/vdom.ts
@@ -3,13 +3,13 @@ import {
     attributesModule,
     toVNode,
 } from 'snabbdom';
+import {VNode} from "snabbdom/build/vnode";
 
-let patcher;
+type vDomPatcher = (oldVnode: VNode | Element | DocumentFragment, vnode: VNode) => VNode;
 
-/**
- * @returns {Function}
- */
-function getPatcher() {
+let patcher: vDomPatcher;
+
+function getPatcher(): vDomPatcher {
     if (patcher) return patcher;
 
     patcher = init([
@@ -19,11 +19,7 @@ function getPatcher() {
     return patcher;
 }
 
-/**
- * @param {Element} domTarget
- * @param {String} html
- */
-export function patchDomFromHtmlString(domTarget, html) {
+export function patchDomFromHtmlString(domTarget: Element, html: string): void {
     const contentDom = document.createElement('div');
     contentDom.innerHTML = html;
     getPatcher()(toVNode(domTarget), toVNode(contentDom));
diff --git a/resources/js/wysiwyg-tinymce/drop-paste-handling.js b/resources/js/wysiwyg-tinymce/drop-paste-handling.js
index 172ad970f0d..3557f9dbd15 100644
--- a/resources/js/wysiwyg-tinymce/drop-paste-handling.js
+++ b/resources/js/wysiwyg-tinymce/drop-paste-handling.js
@@ -1,4 +1,4 @@
-import {Clipboard} from '../services/clipboard';
+import {Clipboard} from '../services/clipboard.ts';
 
 let wrap;
 let draggedContentEditable;

From 9b2520aa0cff4ecdc43a03413817fc862b6ef5db Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 4 Oct 2024 15:11:09 +0100
Subject: [PATCH 307/666] WYSIWYG: Fixed list indenting selection & display
 bugs

- Fixed selection breaking on multiple indent changes
- Fixed multi-indent showing numbers on empty child list until the nodes
  are fully re-rendered.
---
 .../js/wysiwyg/nodes/custom-list-item.ts      |  2 ++
 resources/js/wysiwyg/todo.md                  |  2 +-
 resources/js/wysiwyg/utils/lists.ts           | 27 +++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
index 659a55a157a..11887b4364d 100644
--- a/resources/js/wysiwyg/nodes/custom-list-item.ts
+++ b/resources/js/wysiwyg/nodes/custom-list-item.ts
@@ -55,6 +55,8 @@ export class CustomListItemNode extends ListItemNode {
         if ($isListNode(parent) && parent.getListType() === 'check') {
             updateListItemChecked(dom, this);
         }
+
+        dom.style.listStyle = $hasNestedListWithoutLabel(this) ? 'none' : '';
         // @ts-expect-error - this is always HTMLListItemElement
         dom.value = this.__value;
 
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index d2213f76239..a49cccd26dc 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -20,4 +20,4 @@
 
 ## Bugs
 
-- List selection can get lost on nesting/unnesting
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index edde994e5a0..30a97cbc1f9 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -1,14 +1,14 @@
 import {$createCustomListItemNode, $isCustomListItemNode, CustomListItemNode} from "../nodes/custom-list-item";
 import {$createCustomListNode, $isCustomListNode} from "../nodes/custom-list";
-import {BaseSelection, LexicalEditor} from "lexical";
-import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection, getLastSelection} from "./selection";
+import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
+import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection} from "./selection";
 import {nodeHasInset} from "./nodes";
 
 
-export function $nestListItem(node: CustomListItemNode) {
+export function $nestListItem(node: CustomListItemNode): CustomListItemNode {
     const list = node.getParent();
     if (!$isCustomListNode(list)) {
-        return;
+        return node;
     }
 
     const listItems = list.getChildren() as CustomListItemNode[];
@@ -27,14 +27,16 @@ export function $nestListItem(node: CustomListItemNode) {
         prevListItem.append(newList);
         node.remove();
     }
+
+    return newListItem;
 }
 
-export function $unnestListItem(node: CustomListItemNode) {
+export function $unnestListItem(node: CustomListItemNode): CustomListItemNode {
     const list = node.getParent();
     const parentListItem = list?.getParent();
     const outerList = parentListItem?.getParent();
     if (!$isCustomListNode(list) || !$isCustomListNode(outerList) || !$isCustomListItemNode(parentListItem)) {
-        return;
+        return node;
     }
 
     parentListItem.insertAfter(node);
@@ -45,6 +47,8 @@ export function $unnestListItem(node: CustomListItemNode) {
     if (parentListItem.getChildren().length === 0) {
         parentListItem.remove();
     }
+
+    return node;
 }
 
 function getListItemsForSelection(selection: BaseSelection|null): (CustomListItemNode|null)[] {
@@ -89,24 +93,25 @@ function $reduceDedupeListItems(listItems: (CustomListItemNode|null)[]): CustomL
 }
 
 export function $setInsetForSelection(editor: LexicalEditor, change: number): void {
-    const selection = getLastSelection(editor);
-
+    const selection = $getSelection();
     const listItemsInSelection = getListItemsForSelection(selection);
     const isListSelection = listItemsInSelection.length > 0 && !listItemsInSelection.includes(null);
 
     if (isListSelection) {
+        const alteredListItems = [];
         const listItems = $reduceDedupeListItems(listItemsInSelection);
         if (change > 0) {
             for (const listItem of listItems) {
-                $nestListItem(listItem);
+                alteredListItems.push($nestListItem(listItem));
             }
         } else if (change < 0) {
             for (const listItem of [...listItems].reverse()) {
-                $unnestListItem(listItem);
+                alteredListItems.push($unnestListItem(listItem));
             }
+            alteredListItems.reverse();
         }
 
-        $selectNodes(listItems);
+        $selectNodes(alteredListItems);
         return;
     }
 

From c314a60a164a425733ebecabc0bbf4f095a34366 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Oct 2024 12:42:47 +0100
Subject: [PATCH 308/666] WYSIWYG: Code & table fixes

- Fixed new code block insertion to remove selection area instead of
  just adding after.
- Added default table column widths to not be collapsed
- Updated table dom export to not duplicate colgroups.
---
 .../wysiwyg/lexical/table/LexicalTableNode.ts | 34 ++++++++-----------
 .../ui/framework/blocks/table-creator.ts      |  4 +++
 resources/js/wysiwyg/utils/formats.ts         | 16 +++++++--
 resources/js/wysiwyg/utils/nodes.ts           |  4 +--
 resources/js/wysiwyg/utils/selection.ts       |  4 +--
 5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index 3e695eaa475..357ba3e738b 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -83,30 +83,26 @@ export class TableNode extends ElementNode {
     return {
       ...super.exportDOM(editor),
       after: (tableElement) => {
-        if (tableElement) {
-          const newElement = tableElement.cloneNode() as ParentNode;
-          const colGroup = document.createElement('colgroup');
-          const tBody = document.createElement('tbody');
-          if (isHTMLElement(tableElement)) {
-            tBody.append(...tableElement.children);
-          }
-          const firstRow = this.getFirstChildOrThrow<TableRowNode>();
-
-          if (!$isTableRowNode(firstRow)) {
-            throw new Error('Expected to find row node.');
-          }
+        if (!tableElement) {
+          return;
+        }
 
-          const colCount = firstRow.getChildrenSize();
+        const newElement = tableElement.cloneNode() as ParentNode;
+        const tBody = document.createElement('tbody');
 
-          for (let i = 0; i < colCount; i++) {
-            const col = document.createElement('col');
-            colGroup.append(col);
+        if (isHTMLElement(tableElement)) {
+          for (const child of Array.from(tableElement.children)) {
+            if (child.nodeName === 'TR') {
+              tBody.append(child);
+            } else {
+              newElement.append(child);
+            }
           }
+        }
 
-          newElement.replaceChildren(colGroup, tBody);
+        newElement.append(tBody);
 
-          return newElement as HTMLElement;
-        }
+        return newElement as HTMLElement;
       },
     };
   }
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index a8a142df5a1..30ff3abc56c 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -74,8 +74,12 @@ export class EditorTableCreator extends EditorUiElement {
             return;
         }
 
+        const targetColWidth = Math.min(Math.round(840 / columns), 240);
+        const colWidths = Array(columns).fill(targetColWidth + 'px');
+
         this.getContext().editor.update(() => {
             const table = $createTableNodeWithDimensions(rows, columns, false) as CustomTableNode;
+            table.setColWidths(colWidths);
             $insertNewBlockNodeAtSelection(table);
         });
     }
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 97038f07bad..0ec9220dd2e 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -3,7 +3,7 @@ import {$createTextNode, $getSelection, $insertNodes, LexicalEditor, LexicalNode
 import {
     $getBlockElementNodesInSelection,
     $getNodeFromSelection,
-    $insertNewBlockNodeAtSelection, $selectionContainsNodeType,
+    $insertNewBlockNodeAtSelection, $selectionContainsNodeType, $selectSingleNode,
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";
@@ -65,9 +65,19 @@ export function formatCodeBlock(editor: LexicalEditor) {
             editor.update(() => {
                 const codeBlock = $createCodeBlockNode();
                 codeBlock.setCode(selection?.getTextContent() || '');
-                $insertNewBlockNodeAtSelection(codeBlock, true);
+
+                const selectionNodes = $getBlockElementNodesInSelection(selection);
+                const firstSelectionNode = selectionNodes[0];
+                const extraNodes = selectionNodes.slice(1);
+                if (firstSelectionNode) {
+                    firstSelectionNode.replace(codeBlock);
+                    extraNodes.forEach(n => n.remove());
+                } else {
+                    $insertNewBlockNodeAtSelection(codeBlock, true);
+                }
+
                 $openCodeEditorForNode(editor, codeBlock);
-                codeBlock.selectStart();
+                $selectSingleNode(codeBlock);
             });
         } else {
             $openCodeEditorForNode(editor, codeBlock);
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 48fbe043f39..2dd99d369c7 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -1,7 +1,7 @@
 import {
     $getRoot,
     $isDecoratorNode,
-    $isElementNode,
+    $isElementNode, $isRootNode,
     $isTextNode,
     ElementNode,
     LexicalEditor,
@@ -84,7 +84,7 @@ export function $getNearestBlockNodeForCoords(editor: LexicalEditor, x: number,
 
 export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null {
     const isBlockNode = (node: LexicalNode): boolean => {
-        return ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline();
+        return ($isElementNode(node) || $isDecoratorNode(node)) && !node.isInline() && !$isRootNode(node);
     };
 
     if (isBlockNode(node)) {
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index f1055d98ac8..67c2d91b26c 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -82,8 +82,8 @@ export function $insertNewBlockNodeAtSelection(node: LexicalNode, insertAfter: b
 }
 
 export function $insertNewBlockNodesAtSelection(nodes: LexicalNode[], insertAfter: boolean = true) {
-    const selection = $getSelection();
-    const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
+    const selectionNodes = $getSelection()?.getNodes() || [];
+    const blockElement = selectionNodes.length > 0 ? $getNearestNodeBlockParent(selectionNodes[0]) : null;
 
     if (blockElement) {
         if (insertAfter) {

From 51287d545b1e6a7054726e5bccefae03839229ad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Oct 2024 14:47:00 +0100
Subject: [PATCH 309/666] Searching: Fixed some form search issues

- Form was not retaining certain filters
- Form request handling of entity type set wrong filter name
Added test to cover.
---
 app/Search/SearchOptions.php       |  7 +++++--
 tests/Entity/EntitySearchTest.php  |  4 ++--
 tests/Entity/SearchOptionsTest.php | 13 +++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index 7f9db2a6430..a6f82029920 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -73,7 +73,7 @@ public static function fromRequest(Request $request): self
         }
 
         if (isset($inputs['types']) && count($inputs['types']) < 4) {
-            $cleanedFilters[] = new FilterSearchOption(implode('|', $inputs['types']), 'types');
+            $cleanedFilters[] = new FilterSearchOption(implode('|', $inputs['types']), 'type');
         }
 
         $instance->filters = new SearchOptionSet($cleanedFilters);
@@ -235,11 +235,14 @@ public function getAdditionalOptionsString(): string
     {
         $options = [];
 
-        // Non-[created/updated]-by-me options
+        // Handle filters without UI support
         $userFilters = ['updated_by', 'created_by', 'owned_by'];
+        $unsupportedFilters = ['is_template', 'sort_by'];
         foreach ($this->filters->all() as $filter) {
             if (in_array($filter->getKey(), $userFilters, true) && $filter->value !== null && $filter->value !== 'me') {
                 $options[] = $filter;
+            } else if (in_array($filter->getKey(), $unsupportedFilters, true)) {
+                $options[] = $filter;
             }
         }
 
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 3a1a0a66200..57b7c3f6b88 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -573,8 +573,8 @@ public function test_backslashes_can_be_searched_upon()
 
     public function test_searches_with_terms_without_controls_includes_them_in_extras()
     {
-        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:dan} {created_by:dan} -{viewed_by_me} -[a=b] -"dog"'));
-        $this->withHtml($resp)->assertFieldHasValue('extras', '{updated_by:dan} {created_by:dan} -"dog" -[a=b] -{viewed_by_me}');
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:dan} {created_by:dan} -{viewed_by_me} -[a=b] -"dog" {is_template} {sort_by:last_commented}'));
+        $this->withHtml($resp)->assertFieldHasValue('extras', '{updated_by:dan} {created_by:dan} {is_template} {sort_by:last_commented} -"dog" -[a=b] -{viewed_by_me}');
     }
 
     public function test_negated_searches_dont_show_in_inputs()
diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Entity/SearchOptionsTest.php
index ae0f1e56a9e..0c2ad271c58 100644
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Entity/SearchOptionsTest.php
@@ -113,6 +113,19 @@ public function test_from_request_properly_parses_exacts_from_search_terms()
         $this->assertEquals(['"cheese"', '""', '"baked',  'beans"'], $options->exacts->toValueArray());
     }
 
+    public function test_from_request_properly_parses_provided_types()
+    {
+        $request = new Request([
+            'search' => '',
+            'types' => ['page', 'book'],
+        ]);
+
+        $options = SearchOptions::fromRequest($request);
+        $filters = $options->filters->toValueMap();
+        $this->assertCount(1, $filters);
+        $this->assertEquals('page|book', $filters['type'] ?? 'notfound');
+    }
+
     public function test_from_request_properly_parses_out_extras_as_string()
     {
         $request = new Request([

From 8b9bcc1768c00ccbc3a6a6ff81b58659df925ce0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Oct 2024 15:20:04 +0100
Subject: [PATCH 310/666] Search: Fixed last commented filter when using table
 prefixes

---
 app/Search/SearchRunner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 265b9eecc02..9716f8053be 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -463,7 +463,7 @@ protected function sortByLastCommented(EloquentBuilder $query, Entity $model, bo
         $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
         $commentQuery = DB::raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \'' . $morphClass . '\' AND c2.created_at IS NULL) as comments');
 
-        $query->join($commentQuery, $model->getTable() . '.id', '=', 'comments.entity_id')
+        $query->join($commentQuery, $model->getTable() . '.id', '=', DB::raw('comments.entity_id'))
             ->orderBy('last_commented', $negated ? 'asc' : 'desc');
     }
 }

From d22413b9317b40110fa2fd41134d1831dd760d0b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 7 Oct 2024 22:55:10 +0100
Subject: [PATCH 311/666] JS: Converted/updated translation code to TS, fixed
 some comment counts

- Migrated translation service to TS, stripping a lot of now unused code
  along the way.
- Added test to cover translation service.
- Fixed some comment count issues, where it was not showing correct
  value. or updating, on comment create or delete.
---
 dev/docs/javascript-code.md                   |   4 +-
 resources/js/app.js                           |  12 +-
 resources/js/components/page-comment.js       |   2 +-
 resources/js/components/page-comments.js      |  13 +-
 resources/js/global.d.ts                      |   2 +
 .../services/__tests__/translations.test.ts   |  67 +++++++++
 resources/js/services/translations.js         | 131 ------------------
 resources/js/services/translations.ts         |  67 +++++++++
 8 files changed, 152 insertions(+), 146 deletions(-)
 create mode 100644 resources/js/services/__tests__/translations.test.ts
 delete mode 100644 resources/js/services/translations.js
 create mode 100644 resources/js/services/translations.ts

diff --git a/dev/docs/javascript-code.md b/dev/docs/javascript-code.md
index ba7d7997248..e5f491839f0 100644
--- a/dev/docs/javascript-code.md
+++ b/dev/docs/javascript-code.md
@@ -137,8 +137,8 @@ window.$events.showValidationErrors(error);
 // Translator
 // Take the given plural text and count to decide on what plural option
 // to use, Similar to laravel's trans_choice function but instead
-// takes the direction directly instead of a translation key.
-window.trans_plural(translationString, count, replacements);
+// takes the translation text directly instead of a translation key.
+window.$trans.choice(translationString, count, replacements);
 
 // Component System
 // Parse and initialise any components from the given root el down.
diff --git a/resources/js/app.js b/resources/js/app.js
index 7f4bbe54d63..5f4902f866f 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,6 +1,6 @@
 import {EventManager} from './services/events.ts';
 import {HttpManager} from './services/http.ts';
-import Translations from './services/translations';
+import {Translator} from './services/translations.ts';
 import * as componentMap from './components';
 import {ComponentStore} from './services/components.ts';
 
@@ -22,16 +22,10 @@ window.importVersioned = function importVersioned(moduleName) {
     return import(importPath);
 };
 
-// Set events and http services on window
+// Set events, http & translation services on window
 window.$http = new HttpManager();
 window.$events = new EventManager();
-
-// Translation setup
-// Creates a global function with name 'trans' to be used in the same way as the Laravel translation system
-const translator = new Translations();
-window.trans = translator.get.bind(translator);
-window.trans_choice = translator.getPlural.bind(translator);
-window.trans_plural = translator.parsePlural.bind(translator);
+window.$trans = new Translator();
 
 // Load & initialise components
 window.$components = new ComponentStore();
diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.js
index cac20c9fb2c..fd8ad1f2e47 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.js
@@ -104,9 +104,9 @@ export class PageComment extends Component {
         this.showLoading();
 
         await window.$http.delete(`/comment/${this.commentId}`);
+        this.$emit('delete');
         this.container.closest('.comment-branch').remove();
         window.$events.success(this.deletedText);
-        this.$emit('delete');
     }
 
     showLoading() {
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index bd6dd3c82ff..1d6abfe2044 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -40,7 +40,7 @@ export class PageComments extends Component {
 
     setupListeners() {
         this.elem.addEventListener('page-comment-delete', () => {
-            this.updateCount();
+            setTimeout(() => this.updateCount(), 1);
             this.hideForm();
         });
 
@@ -72,7 +72,13 @@ export class PageComments extends Component {
 
         window.$http.post(`/comment/${this.pageId}`, reqData).then(resp => {
             const newElem = htmlToDom(resp.data);
-            this.formContainer.after(newElem);
+
+            if (reqData.parent_id) {
+                this.formContainer.after(newElem);
+            } else {
+                this.container.append(newElem);
+            }
+
             window.$events.success(this.createdText);
             this.hideForm();
             this.updateCount();
@@ -87,7 +93,8 @@ export class PageComments extends Component {
 
     updateCount() {
         const count = this.getCommentCount();
-        this.commentsTitle.textContent = window.trans_plural(this.countText, count, {count});
+        console.log('update count', count, this.container);
+        this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
     }
 
     resetForm() {
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index 0d7efc4d43c..e505c96e0d4 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -1,6 +1,7 @@
 import {ComponentStore} from "./services/components";
 import {EventManager} from "./services/events";
 import {HttpManager} from "./services/http";
+import {Translator} from "./services/translations";
 
 declare global {
     const __DEV__: boolean;
@@ -8,6 +9,7 @@ declare global {
     interface Window {
         $components: ComponentStore;
         $events: EventManager;
+        $trans: Translator;
         $http: HttpManager;
         baseUrl: (path: string) => string;
     }
diff --git a/resources/js/services/__tests__/translations.test.ts b/resources/js/services/__tests__/translations.test.ts
new file mode 100644
index 00000000000..043f1745ff6
--- /dev/null
+++ b/resources/js/services/__tests__/translations.test.ts
@@ -0,0 +1,67 @@
+import {Translator} from "../translations";
+
+
+describe('Translations Service', () => {
+
+    let $trans: Translator;
+
+    beforeEach(() => {
+        $trans = new Translator();
+    });
+
+    describe('choice()', () => {
+
+        test('it pluralises as expected', () => {
+
+            const cases = [
+                {
+                    translation: `cat`, count: 10000,
+                    expected: `cat`,
+                },
+                {
+                    translation: `cat|cats`, count: 1,
+                    expected: `cat`,
+                },
+                {
+                    translation: `cat|cats`, count: 0,
+                    expected: `cats`,
+                },
+                {
+                    translation: `cat|cats`, count: 2,
+                    expected: `cats`,
+                },
+                {
+                    translation: `{0} cat|[1,100] dog|[100,*] turtle`, count: 0,
+                    expected: `cat`,
+                },
+                {
+                    translation: `{0} cat|[1,100] dog|[100,*] turtle`, count: 40,
+                    expected: `dog`,
+                },
+                {
+                    translation: `{0} cat|[1,100] dog|[100,*] turtle`, count: 101,
+                    expected: `turtle`,
+                },
+            ];
+
+            for (const testCase of cases) {
+                const output = $trans.choice(testCase.translation, testCase.count, {});
+                expect(output).toEqual(testCase.expected);
+            }
+        });
+
+        test('it replaces as expected', () => {
+            const caseA = $trans.choice(`{0} cat|[1,100] :count dog|[100,*] turtle`, 4, {count: '5'});
+            expect(caseA).toEqual('5 dog');
+
+            const caseB = $trans.choice(`an :a :b :c dinosaur|many`, 1, {a: 'orange', b: 'angry', c: 'big'});
+            expect(caseB).toEqual('an orange angry big dinosaur');
+        });
+
+        test('not provided replacements are left as-is', () => {
+            const caseA = $trans.choice(`An :a dog`, 5, {});
+            expect(caseA).toEqual('An :a dog');
+        });
+
+    });
+});
\ No newline at end of file
diff --git a/resources/js/services/translations.js b/resources/js/services/translations.js
deleted file mode 100644
index e562a9152e9..00000000000
--- a/resources/js/services/translations.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- *  Translation Manager
- *  Handles the JavaScript side of translating strings
- *  in a way which fits with Laravel.
- */
-class Translator {
-
-    constructor() {
-        this.store = new Map();
-        this.parseTranslations();
-    }
-
-    /**
-     * Parse translations out of the page and place into the store.
-     */
-    parseTranslations() {
-        const translationMetaTags = document.querySelectorAll('meta[name="translation"]');
-        for (const tag of translationMetaTags) {
-            const key = tag.getAttribute('key');
-            const value = tag.getAttribute('value');
-            this.store.set(key, value);
-        }
-    }
-
-    /**
-     * Get a translation, Same format as Laravel's 'trans' helper
-     * @param key
-     * @param replacements
-     * @returns {*}
-     */
-    get(key, replacements) {
-        const text = this.getTransText(key);
-        return this.performReplacements(text, replacements);
-    }
-
-    /**
-     * Get pluralised text, Dependent on the given count.
-     * Same format at Laravel's 'trans_choice' helper.
-     * @param key
-     * @param count
-     * @param replacements
-     * @returns {*}
-     */
-    getPlural(key, count, replacements) {
-        const text = this.getTransText(key);
-        return this.parsePlural(text, count, replacements);
-    }
-
-    /**
-     * Parse the given translation and find the correct plural option
-     * to use. Similar format at Laravel's 'trans_choice' helper.
-     * @param {String} translation
-     * @param {Number} count
-     * @param {Object} replacements
-     * @returns {String}
-     */
-    parsePlural(translation, count, replacements) {
-        const splitText = translation.split('|');
-        const exactCountRegex = /^{([0-9]+)}/;
-        const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;
-        let result = null;
-
-        for (const t of splitText) {
-            // Parse exact matches
-            const exactMatches = t.match(exactCountRegex);
-            if (exactMatches !== null && Number(exactMatches[1]) === count) {
-                result = t.replace(exactCountRegex, '').trim();
-                break;
-            }
-
-            // Parse range matches
-            const rangeMatches = t.match(rangeRegex);
-            if (rangeMatches !== null) {
-                const rangeStart = Number(rangeMatches[1]);
-                if (rangeStart <= count && (rangeMatches[2] === '*' || Number(rangeMatches[2]) >= count)) {
-                    result = t.replace(rangeRegex, '').trim();
-                    break;
-                }
-            }
-        }
-
-        if (result === null && splitText.length > 1) {
-            result = (count === 1) ? splitText[0] : splitText[1];
-        }
-
-        if (result === null) {
-            result = splitText[0];
-        }
-
-        return this.performReplacements(result, replacements);
-    }
-
-    /**
-     * Fetched translation text from the store for the given key.
-     * @param key
-     * @returns {String|Object}
-     */
-    getTransText(key) {
-        const value = this.store.get(key);
-
-        if (value === undefined) {
-            console.warn(`Translation with key "${key}" does not exist`);
-        }
-
-        return value;
-    }
-
-    /**
-     * Perform replacements on a string.
-     * @param {String} string
-     * @param {Object} replacements
-     * @returns {*}
-     */
-    performReplacements(string, replacements) {
-        if (!replacements) return string;
-        const replaceMatches = string.match(/:(\S+)/g);
-        if (replaceMatches === null) return string;
-        let updatedString = string;
-
-        replaceMatches.forEach(match => {
-            const key = match.substring(1);
-            if (typeof replacements[key] === 'undefined') return;
-            updatedString = updatedString.replace(match, replacements[key]);
-        });
-
-        return updatedString;
-    }
-
-}
-
-export default Translator;
diff --git a/resources/js/services/translations.ts b/resources/js/services/translations.ts
new file mode 100644
index 00000000000..b37dbdfb074
--- /dev/null
+++ b/resources/js/services/translations.ts
@@ -0,0 +1,67 @@
+/**
+ *  Translation Manager
+ *  Helps with some of the JavaScript side of translating strings
+ *  in a way which fits with Laravel.
+ */
+export class Translator {
+
+    /**
+     * Parse the given translation and find the correct plural option
+     * to use. Similar format at Laravel's 'trans_choice' helper.
+     */
+    choice(translation: string, count: number, replacements: Record<string, string> = {}): string {
+        const splitText = translation.split('|');
+        const exactCountRegex = /^{([0-9]+)}/;
+        const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;
+        let result = null;
+
+        for (const t of splitText) {
+            // Parse exact matches
+            const exactMatches = t.match(exactCountRegex);
+            if (exactMatches !== null && Number(exactMatches[1]) === count) {
+                result = t.replace(exactCountRegex, '').trim();
+                break;
+            }
+
+            // Parse range matches
+            const rangeMatches = t.match(rangeRegex);
+            if (rangeMatches !== null) {
+                const rangeStart = Number(rangeMatches[1]);
+                if (rangeStart <= count && (rangeMatches[2] === '*' || Number(rangeMatches[2]) >= count)) {
+                    result = t.replace(rangeRegex, '').trim();
+                    break;
+                }
+            }
+        }
+
+        if (result === null && splitText.length > 1) {
+            result = (count === 1) ? splitText[0] : splitText[1];
+        }
+
+        if (result === null) {
+            result = splitText[0];
+        }
+
+        return this.performReplacements(result, replacements);
+    }
+
+    protected performReplacements(string: string, replacements: Record<string, string>): string {
+        const replaceMatches = string.match(/:(\S+)/g);
+        if (replaceMatches === null) {
+            return string;
+        }
+
+        let updatedString = string;
+
+        for (const match of replaceMatches) {
+            const key = match.substring(1);
+            if (typeof replacements[key] === 'undefined') {
+                continue;
+            }
+            updatedString = updatedString.replace(match, replacements[key]);
+        }
+
+        return updatedString;
+    }
+
+}

From 65453bd94e9aa07d579eb96b163359a0f890983e Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 9 Oct 2024 10:21:55 +0100
Subject: [PATCH 312/666] Updated translations with latest Crowdin changes
 (#5188)

---
 lang/ar/common.php            |   3 +
 lang/ar/entities.php          |   2 +
 lang/ar/errors.php            |   1 +
 lang/ar/settings.php          |   1 +
 lang/bg/common.php            |   3 +
 lang/bg/entities.php          |   2 +
 lang/bg/errors.php            |   1 +
 lang/bg/settings.php          |   1 +
 lang/bs/common.php            |   3 +
 lang/bs/entities.php          |   2 +
 lang/bs/errors.php            |   1 +
 lang/bs/settings.php          |   1 +
 lang/ca/common.php            |   3 +
 lang/ca/entities.php          |   2 +
 lang/ca/errors.php            |   1 +
 lang/ca/settings.php          |   1 +
 lang/cs/common.php            |   3 +
 lang/cs/entities.php          |   2 +
 lang/cs/errors.php            |   1 +
 lang/cs/settings.php          |   1 +
 lang/cy/activities.php        |  10 +-
 lang/cy/auth.php              |  74 ++--
 lang/cy/common.php            |  25 +-
 lang/cy/components.php        |  56 +--
 lang/cy/editor.php            | 224 +++++------
 lang/cy/entities.php          | 714 +++++++++++++++++-----------------
 lang/cy/errors.php            |  25 +-
 lang/cy/notifications.php     |  14 +-
 lang/cy/passwords.php         |  10 +-
 lang/cy/preferences.php       |  74 ++--
 lang/cy/settings.php          |  35 +-
 lang/da/activities.php        |   6 +-
 lang/da/common.php            |   3 +
 lang/da/entities.php          |   8 +-
 lang/da/errors.php            |   1 +
 lang/da/settings.php          |   1 +
 lang/de/common.php            |   3 +
 lang/de/entities.php          |   2 +
 lang/de/errors.php            |   1 +
 lang/de/settings.php          |   1 +
 lang/de_informal/common.php   |   3 +
 lang/de_informal/entities.php |   2 +
 lang/de_informal/errors.php   |   1 +
 lang/de_informal/settings.php |   1 +
 lang/el/common.php            |   3 +
 lang/el/entities.php          |   2 +
 lang/el/errors.php            |   1 +
 lang/el/settings.php          |   1 +
 lang/es/common.php            |   3 +
 lang/es/entities.php          |   2 +
 lang/es/errors.php            |   1 +
 lang/es/settings.php          |   1 +
 lang/es_AR/common.php         |   3 +
 lang/es_AR/entities.php       |   2 +
 lang/es_AR/errors.php         |   1 +
 lang/es_AR/settings.php       |   1 +
 lang/et/common.php            |   3 +
 lang/et/entities.php          |   2 +
 lang/et/errors.php            |   1 +
 lang/et/settings.php          |   1 +
 lang/eu/common.php            |   3 +
 lang/eu/entities.php          |   2 +
 lang/eu/errors.php            |   1 +
 lang/eu/settings.php          |   1 +
 lang/fa/common.php            |   3 +
 lang/fa/entities.php          |   2 +
 lang/fa/errors.php            |   1 +
 lang/fa/settings.php          |   1 +
 lang/fi/common.php            |   3 +
 lang/fi/entities.php          |   2 +
 lang/fi/errors.php            |   1 +
 lang/fi/settings.php          |   1 +
 lang/fr/common.php            |   3 +
 lang/fr/entities.php          |   2 +
 lang/fr/errors.php            |   1 +
 lang/fr/settings.php          |   1 +
 lang/he/activities.php        |   4 +-
 lang/he/auth.php              |   2 +-
 lang/he/common.php            |   3 +
 lang/he/entities.php          |   2 +
 lang/he/errors.php            |   1 +
 lang/he/settings.php          |   1 +
 lang/hr/common.php            |   3 +
 lang/hr/entities.php          |   2 +
 lang/hr/errors.php            |   1 +
 lang/hr/settings.php          |   1 +
 lang/hu/common.php            |   3 +
 lang/hu/entities.php          |   2 +
 lang/hu/errors.php            |   1 +
 lang/hu/settings.php          |   1 +
 lang/id/common.php            |   3 +
 lang/id/entities.php          |   2 +
 lang/id/errors.php            |   1 +
 lang/id/settings.php          |   1 +
 lang/it/common.php            |   3 +
 lang/it/entities.php          |   2 +
 lang/it/errors.php            |   1 +
 lang/it/settings.php          |   1 +
 lang/ja/common.php            |   3 +
 lang/ja/entities.php          |   2 +
 lang/ja/errors.php            |   1 +
 lang/ja/settings.php          |   1 +
 lang/ka/common.php            |   3 +
 lang/ka/entities.php          |   2 +
 lang/ka/errors.php            |   1 +
 lang/ka/settings.php          |   1 +
 lang/ko/common.php            |   3 +
 lang/ko/entities.php          |   2 +
 lang/ko/errors.php            |   1 +
 lang/ko/settings.php          |   1 +
 lang/lt/common.php            |   3 +
 lang/lt/entities.php          |   2 +
 lang/lt/errors.php            |   1 +
 lang/lt/settings.php          |   1 +
 lang/lv/common.php            |   3 +
 lang/lv/entities.php          |   2 +
 lang/lv/errors.php            |   1 +
 lang/lv/settings.php          |   1 +
 lang/nb/common.php            |   3 +
 lang/nb/entities.php          |   2 +
 lang/nb/errors.php            |   1 +
 lang/nb/settings.php          |   1 +
 lang/nl/common.php            |   3 +
 lang/nl/entities.php          |   2 +
 lang/nl/errors.php            |   1 +
 lang/nl/settings.php          |   1 +
 lang/nn/common.php            |   3 +
 lang/nn/entities.php          |   2 +
 lang/nn/errors.php            |   1 +
 lang/nn/settings.php          |   1 +
 lang/pl/common.php            |   3 +
 lang/pl/entities.php          |   2 +
 lang/pl/errors.php            |   1 +
 lang/pl/settings.php          |   1 +
 lang/pt/common.php            |   3 +
 lang/pt/entities.php          |   2 +
 lang/pt/errors.php            |   1 +
 lang/pt/settings.php          |   1 +
 lang/pt_BR/common.php         |  44 ++-
 lang/pt_BR/editor.php         |   2 +-
 lang/pt_BR/entities.php       |   2 +
 lang/pt_BR/errors.php         | 116 +++---
 lang/pt_BR/settings.php       |   1 +
 lang/ro/common.php            |   3 +
 lang/ro/entities.php          |   2 +
 lang/ro/errors.php            |   1 +
 lang/ro/settings.php          |   1 +
 lang/ru/common.php            |   3 +
 lang/ru/entities.php          |   2 +
 lang/ru/errors.php            |   1 +
 lang/ru/settings.php          |   1 +
 lang/sk/common.php            |   3 +
 lang/sk/entities.php          |   2 +
 lang/sk/errors.php            |   1 +
 lang/sk/settings.php          |   1 +
 lang/sl/common.php            |   3 +
 lang/sl/entities.php          |   2 +
 lang/sl/errors.php            |   1 +
 lang/sl/settings.php          |   1 +
 lang/sq/common.php            |   3 +
 lang/sq/entities.php          |   2 +
 lang/sq/errors.php            |   1 +
 lang/sq/settings.php          |   1 +
 lang/sr/common.php            |   3 +
 lang/sr/entities.php          |   2 +
 lang/sr/errors.php            |   1 +
 lang/sr/settings.php          |   1 +
 lang/sv/common.php            |   3 +
 lang/sv/entities.php          |   2 +
 lang/sv/errors.php            |   1 +
 lang/sv/settings.php          |   1 +
 lang/tr/activities.php        |   2 +-
 lang/tr/common.php            |   3 +
 lang/tr/entities.php          |   2 +
 lang/tr/errors.php            |   1 +
 lang/tr/notifications.php     |   2 +-
 lang/tr/settings.php          |   1 +
 lang/uk/auth.php              |   2 +-
 lang/uk/common.php            |   3 +
 lang/uk/entities.php          |   2 +
 lang/uk/errors.php            |   3 +-
 lang/uk/settings.php          |   1 +
 lang/uz/common.php            |   3 +
 lang/uz/entities.php          |   2 +
 lang/uz/errors.php            |   1 +
 lang/uz/settings.php          |   1 +
 lang/vi/common.php            |   3 +
 lang/vi/entities.php          |   2 +
 lang/vi/errors.php            |   1 +
 lang/vi/notifications.php     |  34 +-
 lang/vi/settings.php          |   1 +
 lang/zh_CN/auth.php           |   2 +-
 lang/zh_CN/common.php         |   3 +
 lang/zh_CN/entities.php       |   2 +
 lang/zh_CN/errors.php         |   1 +
 lang/zh_CN/settings.php       |   1 +
 lang/zh_TW/common.php         |   3 +
 lang/zh_TW/entities.php       |   2 +
 lang/zh_TW/errors.php         |   1 +
 lang/zh_TW/settings.php       |   1 +
 200 files changed, 1062 insertions(+), 734 deletions(-)

diff --git a/lang/ar/common.php b/lang/ar/common.php
index 02868b565ad..454b36a9448 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'سياسة الخصوصية',
     'terms_of_service' => 'اتفاقية شروط الخدمة',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 6cf92ace31f..1740ca9f999 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'تثبيت سجل التعديل',
     'pages_edit_enter_changelog_desc' => 'ضع وصف مختصر للتعديلات التي تمت',
     'pages_edit_enter_changelog' => 'أدخل سجل التعديل',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index 9ffc4c1759a..7788c54caca 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'لا يمكن حذف المشرف الوحيد',
     'users_cannot_delete_guest' => 'لا يمكن حذف المستخدم الضيف',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'لا يمكن تعديل هذا الدور',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index f2405e9d5e1..0d8ebcfea4a 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/bg/common.php b/lang/bg/common.php
index 96d36422d57..30298e63941 100644
--- a/lang/bg/common.php
+++ b/lang/bg/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Политика за поверителност',
     'terms_of_service' => 'Условия на услугата',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index eb0a05f5832..468256d7bac 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Задайте регистър на промените',
     'pages_edit_enter_changelog_desc' => 'Въведете кратко резюме на промените, които сте създали',
     'pages_edit_enter_changelog' => 'Въведи регистър на промените',
diff --git a/lang/bg/errors.php b/lang/bg/errors.php
index 8272683db11..73909b344a9 100644
--- a/lang/bg/errors.php
+++ b/lang/bg/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Не можеш да изтриеш единствения администратор',
     'users_cannot_delete_guest' => 'Не можеш да изтриеш потребителя на госта',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ролята не може да бъде редактирана',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index 97de55b366c..7faca69222a 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/bs/common.php b/lang/bs/common.php
index aca83898d51..4e4631a0d9d 100644
--- a/lang/bs/common.php
+++ b/lang/bs/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Pravila o privatnosti',
     'terms_of_service' => 'Uslovi korištenja',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index 7e484b60ce2..1b59ecac875 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/lang/bs/errors.php b/lang/bs/errors.php
index 2dd0f94ef28..be633b5894b 100644
--- a/lang/bs/errors.php
+++ b/lang/bs/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ne možete izbrisati jedinog administratora',
     'users_cannot_delete_guest' => 'Ne možete izbrisati gost korisnika',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ova uloga ne može biti mijenjana',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index f4c84092c6f..5427cb9419e 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ca/common.php b/lang/ca/common.php
index 34203e600f9..f4ad19230b7 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Política de privadesa',
     'terms_of_service' => 'Condicions del servei',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index b6e104fa4f7..0f241d9f24d 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Contingut net)',
     'pages_edit_switch_to_markdown_stable' => '(Contingut estable)',
     'pages_edit_switch_to_wysiwyg' => 'Canvia a l’editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Registre de canvis',
     'pages_edit_enter_changelog_desc' => 'Introduïu una descripció breu dels canvis que heu fet',
     'pages_edit_enter_changelog' => 'Registra un canvi',
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index e30ef3d9725..03a07bb335b 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'No podeu suprimir l’administrador únic.',
     'users_cannot_delete_guest' => 'No podeu suprimir l’usuari convidat.',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'No es pot editar aquest rol.',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 6bb1e8b6989..46f92571e95 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/cs/common.php b/lang/cs/common.php
index 20e03090fe2..1e20b17e7dc 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Zásady ochrany osobních údajů',
     'terms_of_service' => 'Podmínky služby',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 89ff7f2d59e..c73dd6f1f11 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Vytvořený obsah)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Nastavit protokol změn',
     'pages_edit_enter_changelog_desc' => 'Zadejte stručný popis změn, které jste provedli',
     'pages_edit_enter_changelog' => 'Zadejte protokol změn',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index e82be17d3fa..a1efdadb7ae 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nemůžete odstranit posledního administrátora',
     'users_cannot_delete_guest' => 'Uživatele Host není možno odstranit',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Tuto roli nelze editovat',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index a74822658a0..01ea3a1db5a 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index 84c4af9f70d..b7f1cadf323 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -59,22 +59,22 @@
     'favourite_remove_notification' => 'Mae ":name" wedi\'i tynnu o\'ch ffefrynnau',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Dewisiadau gwylio wedi’u diweddaru\'n llwyddiannus',
 
     // Auth
     'auth_login' => 'wedi\'u mewngofnodi',
     'auth_register' => 'wedi\'i cofrestru\'n ddefnyddiwr newydd',
     'auth_password_reset_request' => 'wedi ceisio ailosod gair pass defnyddiwr',
     'auth_password_reset_update' => 'ailosododd air pass defnyddiwr',
-    'mfa_setup_method' => 'configured MFA method',
+    'mfa_setup_method' => 'Dull Dilysu Aml-ffactor wedi’i ffurfweddu',
     'mfa_setup_method_notification' => 'Dull aml-ffactor wedi\'i ffurfweddu\'n llwyddiannus',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => 'Dull Dilysu Aml-ffactor wedi\'i ddileu',
     'mfa_remove_method_notification' => 'Llwyddwyd i ddileu dull aml-ffactor',
 
     // Settings
     'settings_update' => 'diweddarodd osodiadau',
     'settings_update_notification' => 'Gosodiadau wedi\'i diweddaru\'n llwyddiannus',
-    'maintenance_action_run' => 'ran maintenance action',
+    'maintenance_action_run' => 'rhedeg gweithred cynnal a chadw',
 
     // Webhooks
     'webhook_create' => 'webhook wedi creu',
@@ -111,7 +111,7 @@
     // Recycle Bin
     'recycle_bin_empty' => 'gwagodd fin ailgylchu',
     'recycle_bin_restore' => 'wedi\'i adfer o\'r bin ailgylchu',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_destroy' => 'symudwyd o’r bin ailgylchu',
 
     // Comments
     'commented_on'                => 'gwnaeth sylwadau ar',
diff --git a/lang/cy/auth.php b/lang/cy/auth.php
index 8cdb679c8c7..5c4034fcdd4 100644
--- a/lang/cy/auth.php
+++ b/lang/cy/auth.php
@@ -40,17 +40,17 @@
 
     // Login auto-initiation
     'auto_init_starting' => 'Wrthi\'n ceisio mewngofnodi',
-    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
+    'auto_init_starting_desc' => 'Rydym yn cysylltu â\'ch system ddilysu i ddechrau\'r broses fewngofnodi. Os nad oes cynnydd ar ôl 5 eiliad, gallwch geisio clicio ar y ddolen isod.',
     'auto_init_start_link' => 'Parhau gyda dilysu',
 
     // Password Reset
     'reset_password' => 'Ailosod cyfrinair',
     'reset_password_send_instructions' => 'Rhowch eich e-bost isod ac anfonir e-bost atoch gyda dolen ailosod cyfrinair.',
     'reset_password_send_button' => 'Anfon Dolen Ailosod',
-    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
-    'reset_password_success' => 'Your password has been successfully reset.',
+    'reset_password_sent' => 'Bydd dolen ailosod cyfrinair yn cael ei hanfon at :email os ceir hyd i’r cyfeiriad e-bost hwn yn y system.',
+    'reset_password_success' => 'Mae eich cyfrinair wedi\'i ailosod yn llwyddiannus.',
     'email_reset_subject' => 'Ailosod eich gair pass :appName',
-    'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
+    'email_reset_text' => 'Anfonwyd yr e-bost hwn atoch oherwydd ein bod wedi cael cais ailosod cyfrinair ar gyfer eich cyfrif.',
     'email_reset_not_requested' => 'Os nad oeddwch chi\'n ceisio ailosod eich gair pass, does dim byd arall i wneud.',
 
     // Email Confirmation
@@ -58,60 +58,60 @@
     'email_confirm_greeting' => 'Diolch am ymuno â :appName!',
     'email_confirm_text' => 'Os gwelwch yn dda cadarnhewch eich e-bost chi gan clicio ar y botwm isod:',
     'email_confirm_action' => 'Cadarnhau E-bost',
-    'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
-    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
-    'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
+    'email_confirm_send_error' => 'Mae angen cadarnhad e-bost ond ni allai\'r system anfon yr e-bost. Cysylltwch â\'r gweinyddwr i sicrhau bod yr e-bost wedi\'i osod yn gywir.',
+    'email_confirm_success' => 'Mae eich e-bost wedi\'i gadarnhau! Dylech nawr allu mewngofnodi gan ddefnyddio\'r cyfeiriad e-bost hwn.',
+    'email_confirm_resent' => 'Ail-anfonwyd cadarnhad e-bost, gwiriwch eich mewnflwch.',
     'email_confirm_thanks' => 'Diolch am gadarnhau!',
-    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+    'email_confirm_thanks_desc' => 'Arhoswch eiliad wrth i’ch cadarnhad gael ei drin. Os na chewch eich ailgyfeirio ar ôl 3 eiliad, pwyswch y ddolen "Parhau" isod i symud ymlaen.',
 
     'email_not_confirmed' => 'Cyfeiriad E-bost heb ei Gadarnhau',
     'email_not_confirmed_text' => 'Dyw eich cyfeiriad e-bost chi ddim wedi cael ei gadarnhau eto.',
-    'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
-    'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
-    'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
+    'email_not_confirmed_click_link' => 'Cliciwch ar y ddolen yn yr e-bost a anfonwyd yn fuan ar ôl i chi gofrestru.',
+    'email_not_confirmed_resend' => 'Os na allwch ddod o hyd i\'r e-bost, gallwch ail-anfon yr e-bost cadarnhad trwy gyflwyno\'r ffurflen isod.',
+    'email_not_confirmed_resend_button' => 'Ail-anfon E-bost Cadarnhad',
 
     // User Invite
-    'user_invite_email_subject' => 'You have been invited to join :appName!',
+    'user_invite_email_subject' => 'Rydych chi wedi cael gwahoddiad i ymuno :appName!',
     'user_invite_email_greeting' => 'Mae cyfrif wedi cae ei greu i chi ar :appName.',
-    'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
-    'user_invite_email_action' => 'Set Account Password',
+    'user_invite_email_text' => 'Cliciwch ar y botwm isod i osod cyfrinair cyfrif a chael mynediad:',
+    'user_invite_email_action' => 'Gosod Cyfrinair Cyfrif',
     'user_invite_page_welcome' => 'Croeso i :appName!',
-    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
+    'user_invite_page_text' => 'I gwblhau eich cyfrif a chael mynediad mae angen i chi osod cyfrinair a fydd yn cael ei ddefnyddio i fewngofnodi i :appName ar ymweliadau yn y dyfodol.',
     'user_invite_page_confirm_button' => 'Cadarnhau cyfrinair',
-    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+    'user_invite_success_login' => 'Cyfrinair wedi’i osod, dylech nawr allu mewngofnodi gan ddefnyddio\'r cyfrinair a osodwyd i gael mynediad i :appName!',
 
     // Multi-factor Authentication
-    'mfa_setup' => 'Setup Multi-Factor Authentication',
-    'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'mfa_setup' => 'Gosod Dilysu Aml-Ffactor',
+    'mfa_setup_desc' => 'Gosod dilysu aml-ffactor fel haen ychwanegol o ddiogelwch ar gyfer eich cyfrif defnyddiwr.',
     'mfa_setup_configured' => 'Wedi\'i ail-ffurfweddu\'n barod',
     'mfa_setup_reconfigure' => 'Ail-ffurfweddu',
-    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
+    'mfa_setup_remove_confirmation' => 'Ydych chi\'n siŵr eich bod am gael gwared ar y dull dilysu aml-ffactor hwn?',
     'mfa_setup_action' => 'Gosodiad',
-    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_backup_codes_usage_limit_warning' => 'Mae gennych lai na 5 cod wrth gefn yn weddill, crëwch a storio cyfres newydd cyn i chi redeg allan o godau i osgoi cael eich cloi allan o\'ch cyfrif.',
     'mfa_option_totp_title' => 'Ap Ffôn Symudol',
-    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'I ddefnyddio dilysu aml-ffactor bydd angen dyfais symudol arnoch sy\'n cefnogi TOTP megis Google Authenticator, Authy neu Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Codau wrth Gefn',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
-    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
+    'mfa_option_backup_codes_desc' => 'Mae’n cynhyrchu cyfres o godau wrth gefn un-amser y byddwch chi\'n eu defnyddio i fewngofnodi i wirio pwy ydych chi. Gwnewch yn siŵr eich bod yn storio\'r rhain mewn lle saff a diogel.',
+    'mfa_gen_confirm_and_enable' => 'Cadarnhau a Galluogi',
     'mfa_gen_backup_codes_title' => 'Gosodiad Codau wrth Gefn',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_desc' => 'Storiwch y rhestr isod o godau mewn lle diogel. Wrth ddefnyddio’r system bydd modd i chi ddefnyddio un o\'r codau fel ail fecanwaith dilysu.',
     'mfa_gen_backup_codes_download' => 'Llwytho Codau i Lawr',
-    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
-    'mfa_gen_totp_title' => 'Mobile App Setup',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
-    'mfa_gen_totp_verify_setup' => 'Verify Setup',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_gen_backup_codes_usage_warning' => 'Gellir defnyddio pob cod unwaith yn unig',
+    'mfa_gen_totp_title' => 'Gosod Ap Symudol',
+    'mfa_gen_totp_desc' => 'I ddefnyddio dilysu aml-ffactor bydd angen dyfais symudol arnoch sy\'n cefnogi TOTP megis Google Authenticator, Authy neu Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Sganiwch y cod QR isod gan ddefnyddio\'ch ap dilysu dewisol i ddechrau.',
+    'mfa_gen_totp_verify_setup' => 'Gwirio Gosodiad',
+    'mfa_gen_totp_verify_setup_desc' => 'Gwiriwch fod popeth yn gweithio trwy roi cod, a gynhyrchwyd gan eich ap dilysu, yn y blwch mewnbwn isod:',
+    'mfa_gen_totp_provide_code_here' => 'Rhowch y cod a gynhyrchwyd gan eich ap yma',
     'mfa_verify_access' => 'Gwirio Mynediad',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
-    'mfa_verify_no_methods' => 'No Methods Configured',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_access_desc' => 'Mae eich cyfrif defnyddiwr yn gofyn i chi gadarnhau pwy ydych chi trwy lefel ychwanegol o ddilysu cyn i chi gael mynediad. Gwiriwch gan ddefnyddio un o\'ch dulliau ffurfweddu i barhau.',
+    'mfa_verify_no_methods' => 'Dim Dulliau wedi\'u Ffurfweddu',
+    'mfa_verify_no_methods_desc' => 'Ni ellid dod o hyd i unrhyw ddulliau dilysu aml-ffactor ar gyfer eich cyfrif. Bydd angen i chi osod o leiaf un dull cyn i chi gael mynediad.',
     'mfa_verify_use_totp' => 'Gwirio gan ap ffôn',
     'mfa_verify_use_backup_codes' => 'Gwirio gan god wrth gefn',
     'mfa_verify_backup_code' => 'Cod wrth Gefn',
-    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_desc' => 'Rhowch un o\'ch codau wrth gefn sy\'n weddill isod:',
     'mfa_verify_backup_code_enter_here' => 'Cofnodi cod wrth gefn yma',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_verify_totp_desc' => 'Rhowch y cod, a gynhyrchwyd gan ddefnyddio\'ch ap symudol, isod:',
+    'mfa_setup_login_notification' => 'Dull aml-ffactor wedi\'i ffurfweddu, nawr mewngofnodwch eto gan ddefnyddio\'r dull wedi\'i ffurfweddu.',
 ];
diff --git a/lang/cy/common.php b/lang/cy/common.php
index ce1e188da68..c8c770b7118 100644
--- a/lang/cy/common.php
+++ b/lang/cy/common.php
@@ -19,8 +19,8 @@
     'name' => 'Enw',
     'description' => 'Disgrifiad',
     'role' => 'Rôl',
-    'cover_image' => 'Cover image',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image' => 'Delwedd y clawr',
+    'cover_image_description' => 'Dylai\'r ddelwedd hon fod oddeutu 440x250px er y bydd wedi\'i graddio a’i thocio i ffitio rhyngwyneb y defnyddiwr mewn gwahanol senarios yn ôl yr angen, felly bydd y dimensiynau arddangos gwirioneddol yn amrywio.',
 
     // Actions
     'actions' => 'Gweithredoedd',
@@ -56,7 +56,7 @@
 
     // Sort Options
     'sort_options' => 'Trefnu\'r opsiynau',
-    'sort_direction_toggle' => 'Sort Direction Toggle',
+    'sort_direction_toggle' => 'Trefnu Cyfeiriad Togl',
     'sort_ascending' => 'Trefnu\'n esgynnol',
     'sort_descending' => 'Trefnu\'n ddisgynnol',
     'sort_name' => 'Enw',
@@ -76,7 +76,7 @@
     'grid_view' => 'Golwg Grid',
     'list_view' => 'Golwg Rhestr',
     'default' => 'Diofyn',
-    'breadcrumb' => 'Breadcrumb',
+    'breadcrumb' => 'Briwsion bara',
     'status' => 'Statws',
     'status_active' => 'Gweithredol',
     'status_inactive' => 'Anweithredol',
@@ -85,26 +85,29 @@
 
     // Header
     'homepage' => 'Tudalen cartref',
-    'header_menu_expand' => 'Expand Header Menu',
+    'header_menu_expand' => 'Ehangu Dewislen Pennawd',
     'profile_menu' => 'Dewislen Proffil',
     'view_profile' => 'Gweld proffil',
     'edit_profile' => 'Golygu Proffil',
     'dark_mode' => 'Modd Tywyll',
     'light_mode' => 'Modd Golau',
-    'global_search' => 'Global Search',
+    'global_search' => 'Chwilio Byd-eang',
 
     // Layout tabs
     'tab_info' => 'Gwybodaeth',
-    'tab_info_label' => 'Tab: Show Secondary Information',
+    'tab_info_label' => 'Tab: Dangos Gwybodaeth Eilaidd',
     'tab_content' => 'Cynnwys',
-    'tab_content_label' => 'Tab: Show Primary Content',
+    'tab_content_label' => 'Tab: Dangos Prif Gynnwys',
 
     // Email Content
-    'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:',
-    'email_rights' => 'All rights reserved',
+    'email_action_help' => 'Os ydych chi\'n cael trafferth clicio ar y botwm ":actionText", copïwch a gludwch yr URL isod i\'ch porwr gwe:',
+    'email_rights' => 'Cedwir pob hawl',
 
     // Footer Link Options
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Polisi Preifatrwydd',
-    'terms_of_service' => 'Terms of Service',
+    'terms_of_service' => 'Telerau Gwasanaeth',
+
+    // OpenSearch
+    'opensearch_description' => 'Chwilio :appName',
 ];
diff --git a/lang/cy/components.php b/lang/cy/components.php
index 9286c456346..84ddbb5e643 100644
--- a/lang/cy/components.php
+++ b/lang/cy/components.php
@@ -5,42 +5,42 @@
 return [
 
     // Image Manager
-    'image_select' => 'Image Select',
+    'image_select' => 'Dewis Llun',
     'image_list' => 'Rhestr o Ddelweddau',
     'image_details' => 'Manylion Delwedd',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_upload' => 'Uwchlwytho Llun',
+    'image_intro' => 'Yma gallwch ddewis a rheoli lluniau sydd wedi\'u huwchlwytho i’r system o’r blaen.',
+    'image_intro_upload' => 'Uwchlwythwch lun newydd drwy lusgo ffeil llun i\'r ffenestr hon, neu drwy ddefnyddio\'r botwm "Uwchlwytho Llun" uchod.',
     'image_all' => 'Popeth',
     'image_all_title' => 'Gweld holl ddelweddau',
-    'image_book_title' => 'View images uploaded to this book',
-    'image_page_title' => 'View images uploaded to this page',
+    'image_book_title' => 'Gweld lluniau a uwchlwythwyd i’r llyfr hwn',
+    'image_page_title' => 'Gweld lluniau a uwchlwythwyd i’r dudalen hon',
     'image_search_hint' => 'Cwilio gan enw delwedd',
-    'image_uploaded' => 'Uploaded :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
-    'image_load_more' => 'Load More',
+    'image_uploaded' => 'Uwchlwythwyd am :uploadedDate',
+    'image_uploaded_by' => 'Uwchlwythwyd gan :userName',
+    'image_uploaded_to' => 'Uwchlwythwyd i :pageLink',
+    'image_updated' => 'Diweddarwyd am :updateDate',
+    'image_load_more' => 'Llwytho Mwy',
     'image_image_name' => 'Enw Delwedd',
-    'image_delete_used' => 'This image is used in the pages below.',
+    'image_delete_used' => 'Mae\'r llun hwn yn cael ei ddefnyddio ar y tudalennau isod.',
     'image_delete_confirm_text' => 'Wyt ti\'n bendant eisiau dileu\'r ddelwedd hwn?',
-    'image_select_image' => 'Select Image',
-    'image_dropzone' => 'Drop images or click here to upload',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_select_image' => 'Dewis Llun',
+    'image_dropzone' => 'Gollyngwch luniau neu cliciwch yma i uwchlwytho',
+    'image_dropzone_drop' => 'Gollyngwch luniau yma i uwchlwytho',
     'images_deleted' => 'Delweddau wedi\'u Dileu',
-    'image_preview' => 'Image Preview',
-    'image_upload_success' => 'Image uploaded successfully',
-    'image_update_success' => 'Image details successfully updated',
-    'image_delete_success' => 'Image successfully deleted',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_preview' => 'Rhagolwg o’r Llun',
+    'image_upload_success' => 'Uwchlwythwyd y llun yn llwyddiannus',
+    'image_update_success' => 'Diweddarwyd manylion y llun yn llwyddiannus',
+    'image_delete_success' => 'Dilëwyd y llun yn llwyddiannus',
+    'image_replace' => 'Newid y llun',
+    'image_replace_success' => 'Ffeil llun wedi\'i diweddaru’n llwyddiannus',
+    'image_rebuild_thumbs' => 'Atgynhyrchu Amrywiadau Maint',
+    'image_rebuild_thumbs_success' => 'Ailadeiladwyd amrywiadau maint y llun yn llwyddiannus!',
 
     // Code Editor
-    'code_editor' => 'Edit Code',
-    'code_language' => 'Code Language',
-    'code_content' => 'Code Content',
-    'code_session_history' => 'Session History',
-    'code_save' => 'Save Code',
+    'code_editor' => 'Golygu Cod',
+    'code_language' => 'Iaith y Cod',
+    'code_content' => 'Cynnwys y Cod',
+    'code_session_history' => 'Hanes y Sesiwn',
+    'code_save' => 'Cadw Cod',
 ];
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index ed8119b0538..c99a9bb00ea 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -8,7 +8,7 @@
 return [
     // General editor terms
     'general' => 'Cyffredin',
-    'advanced' => 'Advanced',
+    'advanced' => 'Datblygedig',
     'none' => 'Dim un',
     'cancel' => 'Canslo',
     'save' => 'Cadw',
@@ -33,144 +33,144 @@
     'header_small' => 'Pennyn Bach',
     'header_tiny' => 'Pennyn Mân',
     'paragraph' => 'Paragraff',
-    'blockquote' => 'Blockquote',
-    'inline_code' => 'Inline code',
-    'callouts' => 'Callouts',
+    'blockquote' => 'Dyfyniad bloc',
+    'inline_code' => 'Cod mewnol',
+    'callouts' => 'Galwadau',
     'callout_information' => 'Gwybodaeth',
     'callout_success' => 'Llwyddiant',
     'callout_warning' => 'Rhybudd',
     'callout_danger' => 'Perygl',
     'bold' => 'Trwm',
     'italic' => 'Italig',
-    'underline' => 'Underline',
-    'strikethrough' => 'Strikethrough',
-    'superscript' => 'Superscript',
-    'subscript' => 'Subscript',
+    'underline' => 'Tanlinellu',
+    'strikethrough' => 'Llinell Drwodd',
+    'superscript' => 'Uwchysgrif',
+    'subscript' => 'Isysgrif',
     'text_color' => 'Lliw testun',
     'custom_color' => 'Lliw addasu',
-    'remove_color' => 'Remove color',
+    'remove_color' => 'Dileu lliw',
     'background_color' => 'Lliw cefnder',
-    'align_left' => 'Align left',
-    'align_center' => 'Align center',
-    'align_right' => 'Align right',
-    'align_justify' => 'Justify',
-    'list_bullet' => 'Bullet list',
-    'list_numbered' => 'Numbered list',
-    'list_task' => 'Task list',
-    'indent_increase' => 'Increase indent',
-    'indent_decrease' => 'Decrease indent',
+    'align_left' => 'Alinio i\'r chwith',
+    'align_center' => 'Alinio i’r canol',
+    'align_right' => 'Alinio i\'r dde',
+    'align_justify' => 'Unioni',
+    'list_bullet' => 'Rhestr o Bwyntiau Bwled',
+    'list_numbered' => 'Rhestr wedi\'i rhifo',
+    'list_task' => 'Rhestr dasgau',
+    'indent_increase' => 'Cynyddu mewnoliad',
+    'indent_decrease' => 'Lleihau mewnoliad',
     'table' => 'Bwrdd',
-    'insert_image' => 'Insert image',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Insert code block',
-    'edit_code_block' => 'Edit code block',
-    'insert_drawing' => 'Insert/edit drawing',
-    'drawing_manager' => 'Drawing manager',
-    'insert_media' => 'Insert/edit media',
-    'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'insert_image' => 'Mewnosod llun',
+    'insert_image_title' => 'Mewnosod/Golygu Llun',
+    'insert_link' => 'Mewnosod/golygu dolen',
+    'insert_link_title' => 'Mewnosod/Golygu Dolen',
+    'insert_horizontal_line' => 'Mewnosod llinell lorweddol',
+    'insert_code_block' => 'Mewnosod bloc cod',
+    'edit_code_block' => 'Golygu bloc cod',
+    'insert_drawing' => 'Mewnosod/golygu dyluniad',
+    'drawing_manager' => 'Rheolwr dylunio',
+    'insert_media' => 'Mewnosod/golygu cyfryngau',
+    'insert_media_title' => 'Mewnosod/Golygu Cyfryngau',
+    'clear_formatting' => 'Clirio fformatio',
+    'source_code' => 'Cod ffynhonnell',
+    'source_code_title' => 'Cod Ffynhonnell',
+    'fullscreen' => 'Sgrin lawn',
+    'image_options' => 'Opsiynau llun',
 
     // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
+    'table_properties' => 'Priodweddau tabl',
+    'table_properties_title' => 'Priodweddau Tabl',
+    'delete_table' => 'Dileu tabl',
+    'table_clear_formatting' => 'Clirio fformatio tabl',
+    'resize_to_contents' => 'Newid maint i\'r cynnwys',
+    'row_header' => 'Pennyn rhes',
+    'insert_row_before' => 'Mewnosod rhes cyn',
+    'insert_row_after' => 'Mewnosod rhes ar ôl',
+    'delete_row' => 'Dileu rhes',
+    'insert_column_before' => 'Mewnosod colofn cyn',
+    'insert_column_after' => 'Mewnosod colofn ar ôl',
+    'delete_column' => 'Dileu colofn',
     'table_cell' => 'Cell',
-    'table_row' => 'Row',
-    'table_column' => 'Column',
-    'cell_properties' => 'Cell properties',
-    'cell_properties_title' => 'Cell Properties',
-    'cell_type' => 'Cell type',
+    'table_row' => 'Rhes',
+    'table_column' => 'Colofn',
+    'cell_properties' => 'Priodweddau cell',
+    'cell_properties_title' => 'Priodweddau Cell',
+    'cell_type' => 'Math o gell',
     'cell_type_cell' => 'Cell',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
-    'table_row_group' => 'Row Group',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
-    'border_style' => 'Border style',
-    'border_color' => 'Border color',
-    'row_properties' => 'Row properties',
-    'row_properties_title' => 'Row Properties',
-    'cut_row' => 'Cut row',
-    'copy_row' => 'Copy row',
-    'paste_row_before' => 'Paste row before',
-    'paste_row_after' => 'Paste row after',
-    'row_type' => 'Row type',
+    'cell_scope' => 'Cwmpas',
+    'cell_type_header' => 'Pennyn cell',
+    'merge_cells' => 'Uno celloedd',
+    'split_cell' => 'Hollti cell',
+    'table_row_group' => 'Grŵp Rhes',
+    'table_column_group' => 'Grŵp Colofn',
+    'horizontal_align' => 'Alinio llorweddol',
+    'vertical_align' => 'Alinio fertigol',
+    'border_width' => 'Lled y border',
+    'border_style' => 'Arddull y border',
+    'border_color' => 'Lliw y border',
+    'row_properties' => 'Priodweddau’r rhes',
+    'row_properties_title' => 'Priodweddau’r Rhes',
+    'cut_row' => 'Torri rhes',
+    'copy_row' => 'Copïo rhes',
+    'paste_row_before' => 'Gludo rhes cyn',
+    'paste_row_after' => 'Gludo rhes ar ôl',
+    'row_type' => 'Math o res',
     'row_type_header' => 'Pennyn',
-    'row_type_body' => 'Body',
+    'row_type_body' => 'Corff',
     'row_type_footer' => 'Troedyn',
     'alignment' => 'Aliniad',
-    'cut_column' => 'Cut column',
-    'copy_column' => 'Copy column',
-    'paste_column_before' => 'Paste column before',
-    'paste_column_after' => 'Paste column after',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
+    'cut_column' => 'Torri colofn',
+    'copy_column' => 'Copïo colofn',
+    'paste_column_before' => 'Gludo colofn cyn',
+    'paste_column_after' => 'Gludo colofn ar ôl',
+    'cell_padding' => 'Padio cell',
+    'cell_spacing' => 'Bylchau rhwng celloedd',
     'caption' => 'Pennawd',
     'show_caption' => 'Dangos pennawd',
-    'constrain' => 'Constrain proportions',
+    'constrain' => 'Cyfyngu cyfrannau',
     'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
+    'cell_border_dotted' => 'Dotiog',
+    'cell_border_dashed' => 'Llinell Doredig',
+    'cell_border_double' => 'Dwbl',
+    'cell_border_groove' => 'Rhigol',
+    'cell_border_ridge' => 'Crib',
+    'cell_border_inset' => 'Mewnosodiad',
+    'cell_border_outset' => 'Cychwyniad',
     'cell_border_none' => 'Dim un',
-    'cell_border_hidden' => 'Hidden',
+    'cell_border_hidden' => 'Cuddiedig',
 
     // Images, links, details/summary & embed
-    'source' => 'Source',
-    'alt_desc' => 'Alternative description',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
+    'source' => 'Ffynhonnell',
+    'alt_desc' => 'Disgrifiad amgen',
+    'embed' => 'Ymgorffori',
+    'paste_embed' => 'Gludwch eich cod ymgorffori isod:',
     'url' => 'URL',
-    'text_to_display' => 'Text to display',
+    'text_to_display' => 'Testun i\'w arddangos',
     'title' => 'Teitl',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
-    'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
-    'remove_link' => 'Remove link',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'open_link' => 'Agor dolen',
+    'open_link_in' => 'Agor dolen yn...',
+    'open_link_current' => 'Ffenestr bresennol',
+    'open_link_new' => 'Ffenestr newydd',
+    'remove_link' => 'Dileu dolen',
+    'insert_collapsible' => 'Mewnosod bloc cwympadwy',
+    'collapsible_unwrap' => 'Datod',
+    'edit_label' => 'Golygu label',
+    'toggle_open_closed' => 'Agor/cau Togl',
+    'collapsible_edit' => 'Golygu bloc cwympadwy',
+    'toggle_label' => 'Toglo label',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
-    'shortcuts' => 'Shortcuts',
-    'shortcut' => 'Shortcut',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'about' => 'Ynglŷn â\'r golygydd',
+    'about_title' => 'Ynglŷn â\'r Golygydd WYSIWYG',
+    'editor_license' => 'Trwydded a Hawlfraint Golygydd',
+    'editor_tiny_license' => 'Mae\'r golygydd hwn wedi\'i adeiladu gan ddefnyddio :tinyLink sy\'n cael ei ddarparu o dan y drwydded MIT.',
+    'editor_tiny_license_link' => 'Gellir dod o hyd i fanylion hawlfraint a thrwydded TinyMCE yma.',
+    'save_continue' => 'Cadw Tudalen a Pharhau',
+    'callouts_cycle' => '(Pwyswch i doglo drwy’r mathau)',
+    'link_selector' => 'Dolen i\'r cynnwys',
+    'shortcuts' => 'Llwybrau Byr',
+    'shortcut' => 'Llwybr Byr',
+    'shortcuts_intro' => 'Mae\'r llwybrau byr canlynol ar gael yn y golygydd:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
     'description' => 'Disgrifiad',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index 6f2e399f62a..1293231d0fb 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -6,165 +6,165 @@
 return [
 
     // Shared
-    'recently_created' => 'Recently Created',
-    'recently_created_pages' => 'Recently Created Pages',
-    'recently_updated_pages' => 'Recently Updated Pages',
-    'recently_created_chapters' => 'Recently Created Chapters',
-    'recently_created_books' => 'Recently Created Books',
-    'recently_created_shelves' => 'Recently Created Shelves',
-    'recently_update' => 'Recently Updated',
-    'recently_viewed' => 'Recently Viewed',
-    'recent_activity' => 'Recent Activity',
-    'create_now' => 'Create one now',
-    'revisions' => 'Revisions',
+    'recently_created' => 'Crëwyd yn Ddiweddar',
+    'recently_created_pages' => 'Tudalennau a Grëwyd yn Ddiweddar',
+    'recently_updated_pages' => 'Tudalennau a Ddiweddarwyd yn Ddiweddar',
+    'recently_created_chapters' => 'Penodau a Grëwyd yn Ddiweddar',
+    'recently_created_books' => 'Llyfrau a Grëwyd yn Ddiweddar',
+    'recently_created_shelves' => 'Silffoedd a Grëwyd yn Ddiweddar',
+    'recently_update' => 'Diweddarwyd yn Ddiweddar',
+    'recently_viewed' => 'Gwelwyd yn Ddiweddar',
+    'recent_activity' => 'Gweithgaredd Diweddar',
+    'create_now' => 'Creu un nawr',
+    'revisions' => 'Diwygiadau',
     'meta_revision' => 'Diwygiad #:revisionCount',
-    'meta_created' => 'Created :timeLength',
-    'meta_created_name' => 'Created :timeLength by :user',
-    'meta_updated' => 'Updated :timeLength',
-    'meta_updated_name' => 'Updated :timeLength by :user',
-    'meta_owned_name' => 'Owned by :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
-    'entity_select' => 'Entity Select',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'meta_created' => 'Crëwyd',
+    'meta_created_name' => 'Crëwyd :timeLength gan :user',
+    'meta_updated' => 'Diweddarwyd :timeLength',
+    'meta_updated_name' => 'Diweddarwyd :timeLength gan :user',
+    'meta_owned_name' => 'Mae\'n eiddo i :user',
+    'meta_reference_count' => 'Cyfeirir ato gan :count eitem|Cyfeirir ato gan :count o eitemau',
+    'entity_select' => 'Dewis Endid',
+    'entity_select_lack_permission' => 'Nid oes gennych y caniatâd angenrheidiol i ddewis yr eitem hon',
     'images' => 'Delweddau',
-    'my_recent_drafts' => 'My Recent Drafts',
-    'my_recently_viewed' => 'My Recently Viewed',
-    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
-    'my_favourites' => 'My Favourites',
-    'no_pages_viewed' => 'You have not viewed any pages',
-    'no_pages_recently_created' => 'No pages have been recently created',
-    'no_pages_recently_updated' => 'No pages have been recently updated',
-    'export' => 'Export',
-    'export_html' => 'Contained Web File',
+    'my_recent_drafts' => 'Fy Nrafftiau Diweddar',
+    'my_recently_viewed' => 'Edrych yn Ddiweddar',
+    'my_most_viewed_favourites' => 'Fy Ffefrynnau Mwyaf Poblogaidd',
+    'my_favourites' => 'Fy Ffefrynnau',
+    'no_pages_viewed' => 'Nid ydych wedi edrych ar unrhyw dudalennau',
+    'no_pages_recently_created' => 'Nid oes unrhyw dudalennau wedi\'u creu\'n ddiweddar',
+    'no_pages_recently_updated' => 'Nid oes unrhyw dudalennau wedi\'u diweddaru\'n ddiweddar',
+    'export' => 'Allforio',
+    'export_html' => 'Ffeil Gwe wedi\'i Chynnwys',
     'export_pdf' => 'Ffeil PDF',
-    'export_text' => 'Plain Text File',
-    'export_md' => 'Markdown File',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
+    'export_text' => 'Ffeil Testun Plaen',
+    'export_md' => 'Ffeil Markdown',
+    'default_template' => 'Templed Tudalen Diofyn',
+    'default_template_explain' => 'Clustnodwch dempled tudalen a fydd yn cael ei ddefnyddio fel y cynnwys diofyn ar gyfer pob tudalen a grëwyd yn yr eitem hon. Cofiwch y bydd hwn ond yn cael ei ddefnyddio os yw’r sawl a grëodd y dudalen â mynediad gweld i’r dudalen dempled a ddewiswyd.',
+    'default_template_select' => 'Dewiswch dudalen templed',
 
     // Permissions and restrictions
-    'permissions' => 'Permissions',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
-    'permissions_save' => 'Save Permissions',
-    'permissions_owner' => 'Owner',
-    'permissions_role_everyone_else' => 'Everyone Else',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions' => 'Caniatâd',
+    'permissions_desc' => 'Gosodwch ganiatâd yma i ddiystyru\'r caniatâd diofyn a ddarperir gan rolau defnyddwyr.',
+    'permissions_book_cascade' => 'Bydd caniatâd a osodir ar lyfrau yn rhaeadru’n awtomatig i benodau a thudalennau plant, oni bai bod ganddynt eu caniatâd diffiniedig eu hunain.',
+    'permissions_chapter_cascade' => 'Bydd caniatâd a osodir ar benodau yn rhaeadru’n awtomatig i dudalennau plant, oni bai bod ganddynt eu caniatâd diffiniedig eu hunain.',
+    'permissions_save' => 'Cadw Caniatâd',
+    'permissions_owner' => 'Perchennog',
+    'permissions_role_everyone_else' => 'Pawb arall',
+    'permissions_role_everyone_else_desc' => 'Gosod caniatâd ar gyfer pob rôl nad ydynt yn cael eu diystyru\'n benodol.',
+    'permissions_role_override' => 'Diystyru caniatâd ar gyfer rôl',
+    'permissions_inherit_defaults' => 'Etifeddu rhagosodiadau',
 
     // Search
-    'search_results' => 'Search Results',
-    'search_total_results_found' => ':count result found|:count total results found',
+    'search_results' => 'Canlyniadau Chwilio',
+    'search_total_results_found' => 'Cafwyd :count canlyniad|Cafwyd cyfanswm o :count canlyniad',
     'search_clear' => 'Clirio\'r Chwiliad',
-    'search_no_pages' => 'No pages matched this search',
-    'search_for_term' => 'Search for :term',
-    'search_more' => 'More Results',
-    'search_advanced' => 'Advanced Search',
-    'search_terms' => 'Search Terms',
-    'search_content_type' => 'Content Type',
-    'search_exact_matches' => 'Exact Matches',
-    'search_tags' => 'Tag Searches',
+    'search_no_pages' => 'Nid oedd unrhyw dudalennau yn cyfateb â\'r chwiliad hwn',
+    'search_for_term' => 'Chwilio am :term',
+    'search_more' => 'Mwy o Ganlyniadau',
+    'search_advanced' => 'Math o Gynnwys',
+    'search_terms' => 'Termau Chwilio',
+    'search_content_type' => 'Math o Gynnwys',
+    'search_exact_matches' => 'Union Gyfatebiaethau',
+    'search_tags' => 'Tagio Chwiliadau',
     'search_options' => 'Opsiynau',
-    'search_viewed_by_me' => 'Viewed by me',
-    'search_not_viewed_by_me' => 'Not viewed by me',
-    'search_permissions_set' => 'Permissions set',
-    'search_created_by_me' => 'Created by me',
-    'search_updated_by_me' => 'Updated by me',
-    'search_owned_by_me' => 'Owned by me',
-    'search_date_options' => 'Date Options',
-    'search_updated_before' => 'Updated before',
-    'search_updated_after' => 'Updated after',
-    'search_created_before' => 'Created before',
-    'search_created_after' => 'Created after',
-    'search_set_date' => 'Set Date',
-    'search_update' => 'Update Search',
+    'search_viewed_by_me' => 'Gwelwyd gennyf fi',
+    'search_not_viewed_by_me' => 'Nas gwelwyd gennyf fi',
+    'search_permissions_set' => 'Gosod Caniatâd',
+    'search_created_by_me' => 'Crëwyd gennyf fi',
+    'search_updated_by_me' => 'Diweddarwyd gennyf fi',
+    'search_owned_by_me' => 'Yn eiddo i mi',
+    'search_date_options' => 'Opsiynau Dyddiad',
+    'search_updated_before' => 'Diweddarwyd cyn',
+    'search_updated_after' => 'Diweddarwyd ar ôl',
+    'search_created_before' => 'Crëwyd cyn',
+    'search_created_after' => 'Crëwyd ar ôl',
+    'search_set_date' => 'Gosod Dyddiad',
+    'search_update' => 'Diweddaru Chwiliad',
 
     // Shelves
     'shelf' => 'Silff',
     'shelves' => 'Silffau',
     'x_shelves' => ':count Silff|:count Shelves',
-    'shelves_empty' => 'No shelves have been created',
-    'shelves_create' => 'Create New Shelf',
-    'shelves_popular' => 'Popular Shelves',
+    'shelves_empty' => 'Ni chrëwyd unrhyw silffoedd',
+    'shelves_create' => 'Creu Silff Newydd',
+    'shelves_popular' => 'Silffoedd Poblogaidd',
     'shelves_new' => 'Silffau Newydd',
     'shelves_new_action' => 'Silff Newydd',
-    'shelves_popular_empty' => 'The most popular shelves will appear here.',
-    'shelves_new_empty' => 'The most recently created shelves will appear here.',
-    'shelves_save' => 'Save Shelf',
-    'shelves_books' => 'Books on this shelf',
-    'shelves_add_books' => 'Add books to this shelf',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
-    'shelves_empty_contents' => 'This shelf has no books assigned to it',
-    'shelves_edit_and_assign' => 'Edit shelf to assign books',
-    'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
-    'shelves_delete_named' => 'Delete Shelf :name',
-    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
-    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
-    'shelves_copy_permissions' => 'Copy Permissions',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_popular_empty' => 'Bydd y silffoedd mwyaf poblogaidd yn ymddangos yma.',
+    'shelves_new_empty' => 'Bydd y silffoedd a grëwyd fwyaf diweddar yn ymddangos yma.',
+    'shelves_save' => 'Cadw Silff',
+    'shelves_books' => 'Llyfrau ar y silff hon',
+    'shelves_add_books' => 'Ychwanegu llyfrau i\'r silff hon',
+    'shelves_drag_books' => 'Llusgwch lyfrau isod i\'w hychwanegu at y silff hon',
+    'shelves_empty_contents' => 'Nid oes gan y silff hon unrhyw lyfrau wedi’u clustnodi iddi',
+    'shelves_edit_and_assign' => 'Golygu silff i glustnodi llyfrau',
+    'shelves_edit_named' => 'Golygu Silff :name',
+    'shelves_edit' => 'Golygu Silff',
+    'shelves_delete' => 'Dileu Silff',
+    'shelves_delete_named' => 'Dileu Silff :name',
+    'shelves_delete_explain' => "Bydd hyn yn dileu'r silff gyda'r enw ':name'. Ni fydd llyfrau wedi'u cynnwys yn cael eu dileu.",
+    'shelves_delete_confirmation' => 'Ydych chi\'n siŵr eich bod chi eisiau dileu\'r silff hon?',
+    'shelves_permissions' => 'Caniatâd Silffoedd',
+    'shelves_permissions_updated' => 'Diweddarwyd Caniatâd Silffoedd',
+    'shelves_permissions_active' => 'Caniatâd Silffoedd yn Weithredol',
+    'shelves_permissions_cascade_warning' => 'Nid yw caniatâd ar silffoedd yn rhaeadru’n awtomatig i lyfrau sydd wedi\'u cynnwys. Mae hyn oherwydd y gall llyfr fodoli ar silffoedd lluosog. Fodd bynnag, gellir copïo caniatâd i lawr i lyfrau plant gan ddefnyddio\'r opsiwn a geir isod.',
+    'shelves_permissions_create' => 'Dim ond ar gyfer copïo caniatâd i lyfrau plant y defnyddir caniatâd creu silff gan ddefnyddio\'r camau isod. Nid ydynt yn rheoli\'r gallu i greu llyfrau.',
+    'shelves_copy_permissions_to_books' => 'Copïo Caniatâd i Lyfrau',
+    'shelves_copy_permissions' => 'Copïo Caniatâd',
+    'shelves_copy_permissions_explain' => 'Bydd hyn yn cymhwyso gosodiadau caniatâd presennol y silff hon i bob llyfr sydd wedi\'u cynnwys ynddi. Cyn ysgogi, gwnewch yn siŵr bod unrhyw newidiadau i ganiatâd y silff hon wedi\'u cadw.',
+    'shelves_copy_permission_success' => 'Caniatâd silff wedi\'i gopïo i :count o lyfrau',
 
     // Books
     'book' => 'Llyfr',
     'books' => 'Llyfrau',
-    'x_books' => ':count Book|:count Books',
-    'books_empty' => 'No books have been created',
-    'books_popular' => 'Popular Books',
-    'books_recent' => 'Recent Books',
-    'books_new' => 'New Books',
-    'books_new_action' => 'New Book',
-    'books_popular_empty' => 'The most popular books will appear here.',
-    'books_new_empty' => 'The most recently created books will appear here.',
+    'x_books' => ':count Llyfr|:count o Lyfrau',
+    'books_empty' => 'Ni chrëwyd unrhyw llyfrau',
+    'books_popular' => 'Llyfrau Poblogaidd',
+    'books_recent' => 'Llyfrau Diweddar',
+    'books_new' => 'Llyfrau Newydd',
+    'books_new_action' => 'Llyfr Newydd',
+    'books_popular_empty' => 'Bydd y llyfrau mwyaf poblogaidd yn ymddangos yma.',
+    'books_new_empty' => 'Bydd y llyfrau a grëwyd fwyaf diweddar yn ymddangos yma.',
     'books_create' => 'Creu Llyfr Newydd',
     'books_delete' => 'Dileu Llyfr',
     'books_delete_named' => 'Dileu :bookName Llyfr',
-    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
-    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
+    'books_delete_explain' => 'Bydd hyn yn dileu\'r llyfr gyda\'r enw ‘:bookName’. Bydd yr holl dudalennau a phenodau yn cael eu dileu.',
+    'books_delete_confirmation' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r llyfr hwn?',
     'books_edit' => 'Golygu\'r Llyfr',
     'books_edit_named' => 'Golygu :bookName Llyfr',
     'books_form_book_name' => 'Enw\'r Llyfr',
-    'books_save' => 'Save Book',
-    'books_permissions' => 'Book Permissions',
-    'books_permissions_updated' => 'Book Permissions Updated',
-    'books_empty_contents' => 'No pages or chapters have been created for this book.',
+    'books_save' => 'Cadw Llyfr',
+    'books_permissions' => 'Caniatâd Llyfr',
+    'books_permissions_updated' => 'Diweddarwyd Caniatâd Llyfr',
+    'books_empty_contents' => 'Ni chrëwyd unrhyw dudalennau neu benodau ar gyfer y llyfr hwn.',
     'books_empty_create_page' => 'Creu tudalen newydd',
-    'books_empty_sort_current_book' => 'Sort the current book',
-    'books_empty_add_chapter' => 'Add a chapter',
-    'books_permissions_active' => 'Book Permissions Active',
-    'books_search_this' => 'Search this book',
-    'books_navigation' => 'Book Navigation',
-    'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
-    'books_sort_named' => 'Sort Book :bookName',
-    'books_sort_name' => 'Sort by Name',
-    'books_sort_created' => 'Sort by Created Date',
-    'books_sort_updated' => 'Sort by Updated Date',
-    'books_sort_chapters_first' => 'Chapters First',
-    'books_sort_chapters_last' => 'Chapters Last',
-    'books_sort_show_other' => 'Show Other Books',
-    'books_sort_save' => 'Save New Order',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_empty_sort_current_book' => 'Trefnu’r llyfr presennol',
+    'books_empty_add_chapter' => 'Ychwanegu pennod',
+    'books_permissions_active' => 'Caniatâd Llyfr yn Weithredol',
+    'books_search_this' => 'Chwilio\'r llyfr hwn',
+    'books_navigation' => 'Llywio Llyfr',
+    'books_sort' => 'Trefnu Cynnwys Llyfr',
+    'books_sort_desc' => 'Symudwch benodau a thudalennau o fewn llyfr i ad-drefnu ei gynnwys. Gellir ychwanegu llyfrau eraill sy\'n caniatáu symud penodau a thudalennau yn hawdd rhwng llyfrau.',
+    'books_sort_named' => 'Trefnu Llyfr :bookName',
+    'books_sort_name' => 'Trefnu yn ôl Enw',
+    'books_sort_created' => 'Trefnu yn ôl Dyddiad Creu',
+    'books_sort_updated' => 'Trefnu yn ôl Dyddiad Diweddaru',
+    'books_sort_chapters_first' => 'Penodau yn Gyntaf',
+    'books_sort_chapters_last' => 'Penodau yn Olaf',
+    'books_sort_show_other' => 'Dangos Llyfrau Eraill',
+    'books_sort_save' => 'Cadw’r Drefn Newydd',
+    'books_sort_show_other_desc' => 'Ychwanegwch lyfrau eraill yma i\'w cynnwys yn y gwaith didoli, a chaniatáu ad-drefnu hawdd rhwng llyfrau.',
+    'books_sort_move_up' => 'Symud i Fyny',
+    'books_sort_move_down' => 'Symud i Lawr',
+    'books_sort_move_prev_book' => 'Symud i\'r Llyfr Blaenorol',
+    'books_sort_move_next_book' => 'Symud i\'r Llyfr Nesaf',
+    'books_sort_move_prev_chapter' => 'Symud i\'r Bennod Flaenorol',
+    'books_sort_move_next_chapter' => 'Symud i\'r Bennod Nesaf',
+    'books_sort_move_book_start' => 'Symud i Ddechrau\'r Llyfr',
+    'books_sort_move_book_end' => 'Symud i Ddiwedd y Llyfr',
+    'books_sort_move_before_chapter' => 'Symud i’r Bennod Cynt',
+    'books_sort_move_after_chapter' => 'Symud i’r Bennod Ddilynol',
     'books_copy' => 'Copio Llyfr',
     'books_copy_success' => 'Llyfr wedi\'i copio\'n llwyddiannus',
 
@@ -172,266 +172,268 @@
     'chapter' => 'Pennod',
     'chapters' => 'Penodau',
     'x_chapters' => ':count Pennod|:count Penodau',
-    'chapters_popular' => 'Popular Chapters',
+    'chapters_popular' => 'Penodau Poblogaidd',
     'chapters_new' => 'Pennod Newydd',
     'chapters_create' => 'Creu Pennod Newydd',
     'chapters_delete' => 'Dileu Pennod',
     'chapters_delete_named' => 'Dileu :chapterName Pennod',
-    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
-    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
-    'chapters_edit' => 'Edit Chapter',
-    'chapters_edit_named' => 'Edit Chapter :chapterName',
-    'chapters_save' => 'Save Chapter',
-    'chapters_move' => 'Move Chapter',
-    'chapters_move_named' => 'Move Chapter :chapterName',
-    'chapters_copy' => 'Copy Chapter',
-    'chapters_copy_success' => 'Chapter successfully copied',
-    'chapters_permissions' => 'Chapter Permissions',
-    'chapters_empty' => 'No pages are currently in this chapter.',
-    'chapters_permissions_active' => 'Chapter Permissions Active',
-    'chapters_permissions_success' => 'Chapter Permissions Updated',
-    'chapters_search_this' => 'Search this chapter',
-    'chapter_sort_book' => 'Sort Book',
+    'chapters_delete_explain' => 'Bydd hyn yn dileu\'r bennod gyda\'r enw \':chapterName\'. Bydd yr holl dudalennau sy\'n bodoli yn y bennod hon hefyd yn cael eu dileu.',
+    'chapters_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r bennod hon?',
+    'chapters_edit' => 'Ychwanegu Pennod',
+    'chapters_edit_named' => 'Ychwanegu Pennod :chapterName',
+    'chapters_save' => 'Cadw Pennod',
+    'chapters_move' => 'Symud Pennod',
+    'chapters_move_named' => 'Symud Pennod :chapterName',
+    'chapters_copy' => 'Copïo Pennod',
+    'chapters_copy_success' => 'Pennod wedi\'i chopïo\'n llwyddiannus',
+    'chapters_permissions' => 'Pennau Taith Pennod',
+    'chapters_empty' => 'Does dim tudalennau yn y bennod hon ar hyn o bryd.',
+    'chapters_permissions_active' => 'Caniatâd Pennod yn Weithredol',
+    'chapters_permissions_success' => 'Diweddarwyd Caniatâd Pennod',
+    'chapters_search_this' => 'Chwilio yn y bennod hon',
+    'chapter_sort_book' => 'Trefnu Llyfr',
 
     // Pages
-    'page' => 'Page',
-    'pages' => 'Pages',
+    'page' => 'Tudalen',
+    'pages' => 'Tudalennau',
     'x_pages' => ':count Tudalen|:count Tudalennau',
-    'pages_popular' => 'Popular Pages',
+    'pages_popular' => 'Tudalennau Poblogaidd',
     'pages_new' => 'Tudalen Newydd',
-    'pages_attachments' => 'Attachments',
-    'pages_navigation' => 'Page Navigation',
+    'pages_attachments' => 'Atodiadau',
+    'pages_navigation' => 'Llywio Tudalen',
     'pages_delete' => 'Dileu Tudalen',
     'pages_delete_named' => 'Dileu :pageName Tudalen',
-    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
-    'pages_delete_draft' => 'Delete Draft Page',
-    'pages_delete_success' => 'Page deleted',
-    'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
-    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
-    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
-    'pages_editing_named' => 'Editing Page :pageName',
-    'pages_edit_draft_options' => 'Draft Options',
-    'pages_edit_save_draft' => 'Save Draft',
-    'pages_edit_draft' => 'Edit Page Draft',
-    'pages_editing_draft' => 'Editing Draft',
-    'pages_editing_page' => 'Editing Page',
-    'pages_edit_draft_save_at' => 'Draft saved at ',
-    'pages_edit_delete_draft' => 'Delete Draft',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
-    'pages_edit_discard_draft' => 'Discard Draft',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
-    'pages_edit_set_changelog' => 'Set Changelog',
-    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
-    'pages_edit_enter_changelog' => 'Enter Changelog',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
-    'pages_save' => 'Save Page',
+    'pages_delete_draft_named' => 'Dileu Tudalen Ddrafft :pageName',
+    'pages_delete_draft' => 'Dileu Tudalen Ddrafft',
+    'pages_delete_success' => 'Tudalen wedi\'i dileu',
+    'pages_delete_draft_success' => 'Tudalen ddrafft wedi’i dileu',
+    'pages_delete_warning_template' => 'Mae\'r dudalen hon yn cael ei defnyddio\'n weithredol fel templed tudalen diofyn llyfr neu bennod. Ni fydd gan y llyfrau neu\'r penodau hyn dempled tudalen diofyn wedi\'i glustnodi ar ôl dileu\'r dudalen hon.',
+    'pages_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r dudalen hon?',
+    'pages_delete_draft_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r dudalen ddrafft hon?',
+    'pages_editing_named' => 'Golygu Tudalen :pageName',
+    'pages_edit_draft_options' => 'Opsiynau Drafft',
+    'pages_edit_save_draft' => 'Cadw Drafft',
+    'pages_edit_draft' => 'Golygu Tudalen Ddrafft',
+    'pages_editing_draft' => 'Golygu Drafft',
+    'pages_editing_page' => 'Golygu Tudalen',
+    'pages_edit_draft_save_at' => 'Cadwyd drafft ar ',
+    'pages_edit_delete_draft' => 'Dileu Drafft',
+    'pages_edit_delete_draft_confirm' => 'Ydych chi\'n siŵr eich bod am ddileu eich newidiadau i’r dudalen ddrafft? Bydd eich holl newidiadau, ers eu cadw ddiwethaf, yn cael eu colli a bydd y golygydd yn cael ei ddiweddaru gyda\'r dudalen ddiweddaraf nad yw\'n ddrafft.',
+    'pages_edit_discard_draft' => 'Gwaredu Drafft',
+    'pages_edit_switch_to_markdown' => 'Newid i’r Golygydd Markdown',
+    'pages_edit_switch_to_markdown_clean' => '(Cynnwys Glân)',
+    'pages_edit_switch_to_markdown_stable' => '(Cynnwys Glân)',
+    'pages_edit_switch_to_wysiwyg' => 'Newid i Olygydd WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Newid i WYSIWYG newydd',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Mewn Profi Alpha)',
+    'pages_edit_set_changelog' => 'Gosod Changelog',
+    'pages_edit_enter_changelog_desc' => 'Rhowch ddisgrifiad byr o\'r newidiadau rydych wedi\'u gwneud',
+    'pages_edit_enter_changelog' => 'Cofnodwch Changelog',
+    'pages_editor_switch_title' => 'Newid Golygydd',
+    'pages_editor_switch_are_you_sure' => 'Ydych chi\'n siŵr eich bod eisiau newid y golygydd ar gyfer y dudalen hon?',
+    'pages_editor_switch_consider_following' => 'Ystyriwch y canlynol wrth newid golygyddion:',
+    'pages_editor_switch_consideration_a' => 'Ar ôl ei gadw, bydd yr opsiwn golygydd newydd yn cael ei ddefnyddio gan unrhyw olygydd yn y dyfodol, gan gynnwys y rhai na fyddant efallai\'n gallu newid y math o olygydd eu hunain.',
+    'pages_editor_switch_consideration_b' => 'Gall hyn arwain at golli manylion a Syntax mewn rhai amgylchiadau.',
+    'pages_editor_switch_consideration_c' => 'Ni fydd newidiadau tag neu changelog, a wnaed ers eu cadw ddiwethaf, yn parhau ar draws y newid hwn.',
+    'pages_save' => 'Cadw Tudalen',
     'pages_title' => 'Teitl y Dudalen',
     'pages_name' => 'Enw\'r Dudalen',
     'pages_md_editor' => 'Golygydd',
-    'pages_md_preview' => 'Preview',
-    'pages_md_insert_image' => 'Insert Image',
-    'pages_md_insert_link' => 'Insert Entity Link',
-    'pages_md_insert_drawing' => 'Insert Drawing',
-    'pages_md_show_preview' => 'Show preview',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
-    'pages_not_in_chapter' => 'Page is not in a chapter',
-    'pages_move' => 'Move Page',
-    'pages_copy' => 'Copy Page',
-    'pages_copy_desination' => 'Copy Destination',
-    'pages_copy_success' => 'Page successfully copied',
-    'pages_permissions' => 'Page Permissions',
-    'pages_permissions_success' => 'Page permissions updated',
-    'pages_revision' => 'Revision',
-    'pages_revisions' => 'Page Revisions',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
-    'pages_revisions_named' => 'Page Revisions for :pageName',
-    'pages_revision_named' => 'Page Revision for :pageName',
-    'pages_revision_restored_from' => 'Restored from #:id; :summary',
-    'pages_revisions_created_by' => 'Created By',
-    'pages_revisions_date' => 'Revision Date',
+    'pages_md_preview' => 'Rhagolwg',
+    'pages_md_insert_image' => 'Mewnosod Delwedd',
+    'pages_md_insert_link' => 'Mewnosod Dolen Endid',
+    'pages_md_insert_drawing' => 'Mewnosod Llun',
+    'pages_md_show_preview' => 'Dangos rhagolwg',
+    'pages_md_sync_scroll' => 'Cydamseru sgrôl ragolwg',
+    'pages_drawing_unsaved' => 'Canfuwyd Llun heb ei Gadw',
+    'pages_drawing_unsaved_confirm' => 'Canfuwyd data llun heb ei gadw o ymgais aflwyddiannus blaenorol i gadw llun. Hoffech chi adfer a pharhau i olygu\'r llun heb ei gadw?',
+    'pages_not_in_chapter' => 'Nid yw\'r dudalen mewn pennod',
+    'pages_move' => 'Symud Tudalen',
+    'pages_copy' => 'Copïo Tudalen',
+    'pages_copy_desination' => 'Copïo Cyrchfan',
+    'pages_copy_success' => 'Tudalen wedi\'i chreu\'n llwyddiannus',
+    'pages_permissions' => 'Pennau Taith Tudalen',
+    'pages_permissions_success' => 'Pennau taith tudalen wedi\'u diweddaru',
+    'pages_revision' => 'Diwygiad',
+    'pages_revisions' => 'Diwygiadau\'r Dudalen',
+    'pages_revisions_desc' => 'Isod ceir holl ddiwygiadau blaenorol y dudalen hon. Gallwch edrych yn ôl ar, cymharu, ac adfer hen fersiynau o’r dudalen os oes gennych y caniatâd priodol. Efallai na fydd hanes llawn y dudalen yn cael ei adlewyrchu\'n llawn yma oherwydd, gan ddibynnu ar ffurfweddiad y system, gallai hen fersiynau fod wedi’u dileu’n awtomatig.',
+    'pages_revisions_named' => 'Diwygiadau Tudalen ar gyfer :pageName',
+    'pages_revision_named' => 'Diwygiad Tudalen ar gyfer :pageName',
+    'pages_revision_restored_from' => 'Adferwyd o #:id; :summary',
+    'pages_revisions_created_by' => 'Crëwyd gan',
+    'pages_revisions_date' => 'Dyddiad Adolygu',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
-    'pages_revisions_numbered' => 'Revision #:id',
-    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_sort_number' => 'Rhif Diwygiad',
+    'pages_revisions_numbered' => 'Diwygiad #:id',
+    'pages_revisions_numbered_changes' => 'Diwygiad #:id Newidiadau',
+    'pages_revisions_editor' => 'Math o Olygydd',
     'pages_revisions_changelog' => 'Changelog',
-    'pages_revisions_changes' => 'Changes',
-    'pages_revisions_current' => 'Current Version',
-    'pages_revisions_preview' => 'Preview',
-    'pages_revisions_restore' => 'Restore',
-    'pages_revisions_none' => 'This page has no revisions',
-    'pages_copy_link' => 'Copy Link',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
-    'pages_permissions_active' => 'Page Permissions Active',
-    'pages_initial_revision' => 'Initial publish',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_revisions_changes' => 'Newidiadau',
+    'pages_revisions_current' => 'Fersiwn Bresennol',
+    'pages_revisions_preview' => 'Rhagolwg',
+    'pages_revisions_restore' => 'Adfer',
+    'pages_revisions_none' => 'Nid oes gan y dudalen hon unrhyw ddiwygiadau',
+    'pages_copy_link' => 'Copïo Dolen',
+    'pages_edit_content_link' => 'Neidio i\'r adran yn y golygydd',
+    'pages_pointer_enter_mode' => 'Rhowch y modd dethol adran',
+    'pages_pointer_label' => 'Dewisiadau Adran Tudalen',
+    'pages_pointer_permalink' => 'Dolen Barhaol Adran Tudalen',
+    'pages_pointer_include_tag' => 'Adran Tudalen Cynnwys Tag',
+    'pages_pointer_toggle_link' => 'Modd dolen barhaol, Pwyswch i ddangos cynnwys tag',
+    'pages_pointer_toggle_include' => 'Modd cynnwys tag, Pwyswch i ddangos dolen barhaol',
+    'pages_permissions_active' => 'Caniatâd Tudalen yn Weithredol',
+    'pages_initial_revision' => 'Cyhoeddi cychwynnol',
+    'pages_references_update_revision' => 'Diweddariad awtomatig y system o ddolenni mewnol',
     'pages_initial_name' => 'Tudalen Newydd',
-    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
-    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_editing_draft_notification' => 'Rydych chi wrthi’n golygu drafft a gafodd ei gadw ddiwethaf ar :timeDiff.',
+    'pages_draft_edited_notification' => 'Mae\'r dudalen hon wedi\'i diweddaru ers hynny. Argymhellir eich bod yn dileu\'r drafft hwn.',
+    'pages_draft_page_changed_since_creation' => 'Mae\'r dudalen hon wedi\'i diweddaru ers i\'r drafft hwn gael ei greu. Argymhellir eich bod yn dileu\'r drafft hwn neu\'n sicrhau nad ydych yn ysgrifennu unrhyw newidiadau i’r dudalen.',
     'pages_draft_edit_active' => [
-        'start_a' => ':count users have started editing this page',
-        'start_b' => ':userName has started editing this page',
-        'time_a' => 'since the page was last updated',
-        'time_b' => 'in the last :minCount minutes',
-        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+        'start_a' => 'Mae :count defnyddiwr wedi dechrau golygu\'r dudalen hon',
+        'start_b' => 'Mae :userName wedi dechrau golygu\'r dudalen hon',
+        'time_a' => 'ers i\'r dudalen gael ei diweddaru ddiwethaf',
+        'time_b' => 'yn y :minCount munud diwethaf',
+        'message' => ':start :time. Gofalwch beidio ag ysgrifennu dros ddiweddariadau eich gilydd!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
-    'pages_specific' => 'Specific Page',
-    'pages_is_template' => 'Page Template',
+    'pages_draft_discarded' => 'Drafft wedi\'i waredu! Mae\'r golygydd wedi\'i ddiweddaru gyda chynnwys presennol y dudalen',
+    'pages_draft_deleted' => 'Drafft wedi\'i ddileu! Mae\'r golygydd wedi\'i ddiweddaru gyda chynnwys presennol y dudalen',
+    'pages_specific' => 'Tudalen Benodol',
+    'pages_is_template' => 'Templed Tudalen',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
-    'page_tags' => 'Page Tags',
-    'chapter_tags' => 'Chapter Tags',
-    'book_tags' => 'Book Tags',
-    'shelf_tags' => 'Shelf Tags',
+    'toggle_sidebar' => 'Toglo Bar ochr',
+    'page_tags' => 'Tagiau Tudalennau',
+    'chapter_tags' => 'Tagiau Penodau',
+    'book_tags' => 'Tagiau Llyfrau',
+    'shelf_tags' => 'Tagiau Silffoedd',
     'tag' => 'Tag',
-    'tags' =>  'Tags',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
-    'tag_name' =>  'Tag Name',
-    'tag_value' => 'Tag Value (Optional)',
-    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
-    'tags_add' => 'Add another tag',
-    'tags_remove' => 'Remove this tag',
-    'tags_usages' => 'Total tag usages',
-    'tags_assigned_pages' => 'Assigned to Pages',
-    'tags_assigned_chapters' => 'Assigned to Chapters',
-    'tags_assigned_books' => 'Assigned to Books',
-    'tags_assigned_shelves' => 'Assigned to Shelves',
-    'tags_x_unique_values' => ':count unique values',
-    'tags_all_values' => 'All values',
-    'tags_view_tags' => 'View Tags',
-    'tags_view_existing_tags' => 'View existing tags',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
-    'attachments' => 'Attachments',
-    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
-    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
-    'attachments_upload' => 'Upload File',
-    'attachments_link' => 'Attach Link',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
-    'attachments_set_link' => 'Set Link',
-    'attachments_delete' => 'Are you sure you want to delete this attachment?',
-    'attachments_dropzone' => 'Drop files here to upload',
-    'attachments_no_files' => 'No files have been uploaded',
-    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
-    'attachments_link_name' => 'Link Name',
-    'attachment_link' => 'Attachment link',
-    'attachments_link_url' => 'Link to file',
-    'attachments_link_url_hint' => 'Url of site or file',
-    'attach' => 'Attach',
-    'attachments_insert_link' => 'Add Attachment Link to Page',
-    'attachments_edit_file' => 'Edit File',
+    'tags' =>  'Tagiau',
+    'tags_index_desc' => 'Gellir cymhwyso tagiau i gynnwys o fewn y system i sicrhau categoreiddio hyblyg. Gall tagiau fod ag allwedd a gwerth, gyda\'r gwerth yn ddewisol. Ar ôl ei gymhwyso, gellir cwestiynu’r cynnwys gan ddefnyddio enw a gwerth y tag.',
+    'tag_name' =>  'Enw’r Tag',
+    'tag_value' => 'Gwerth y Tag (Dewisol)',
+    'tags_explain' => "Ychwanegwch rai tagiau i gategoreiddio'ch cynnwys yn well. Gallwch glustnodi gwerth i dag i gael trefn fanylach.",
+    'tags_add' => 'Ychwanegu tag arall',
+    'tags_remove' => 'Tynnu’r tag hwn',
+    'tags_usages' => 'Cyfanswm y defnydd o’r tag',
+    'tags_assigned_pages' => 'Clustnodwyd i Dudalennau',
+    'tags_assigned_chapters' => 'Clustnodwyd i Benodau',
+    'tags_assigned_books' => 'Clustnodwyd i Lyfrau',
+    'tags_assigned_shelves' => 'Clustnodwyd i Silffoedd',
+    'tags_x_unique_values' => ':count gwerthoedd unigryw',
+    'tags_all_values' => 'Pob gwerth',
+    'tags_view_tags' => 'Gweld Tagiau',
+    'tags_view_existing_tags' => 'Gweld tagiau presennol',
+    'tags_list_empty_hint' => 'Gellir clustnodi tagiau trwy far ochr golygydd y dudalen neu wrth olygu manylion llyfr, pennod neu silff.',
+    'attachments' => 'Atodiadau',
+    'attachments_explain' => 'Uwchlwytho rhai ffeiliau neu atodi rhai dolenni i\'w harddangos ar eich tudalen. Mae\'r rhain i\'w gweld ym mar ochr y dudalen.',
+    'attachments_explain_instant_save' => 'Caiff y newidiadau yma eu cadw ar unwaith.',
+    'attachments_upload' => 'Uwchlwytho Ffeil',
+    'attachments_link' => 'Atodi Dolen',
+    'attachments_upload_drop' => 'Neu gallwch lusgo a gollwng ffeil yma i\'w huwchlwytho fel atodiad.',
+    'attachments_set_link' => 'Gosod Dolen',
+    'attachments_delete' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r atodiad hwn?',
+    'attachments_dropzone' => 'Gollyngwch ffeiliau yma i\'w huwchlwytho',
+    'attachments_no_files' => 'Nid oes unrhyw ffeiliau wedi\'u huwchlwytho',
+    'attachments_explain_link' => 'Gallwch atodi dolen pe bai’n well gennych beidio ag uwchlwytho ffeil. Gall hyn fod yn ddolen i dudalen arall neu\'n ddolen i ffeil yn y cwmwl.',
+    'attachments_link_name' => 'Enw’r Ddolen',
+    'attachment_link' => 'Dolen atodiad',
+    'attachments_link_url' => 'Dolen i ffeil',
+    'attachments_link_url_hint' => 'Url y safle neu ffeil',
+    'attach' => 'Atodi',
+    'attachments_insert_link' => 'Ychwanegu Dolen Atodiad i Dudalen',
+    'attachments_edit_file' => 'Golygu Ffeil',
     'attachments_edit_file_name' => 'Enw\'r Ffeil',
-    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
-    'attachments_order_updated' => 'Attachment order updated',
-    'attachments_updated_success' => 'Attachment details updated',
-    'attachments_deleted' => 'Attachment deleted',
-    'attachments_file_uploaded' => 'File successfully uploaded',
-    'attachments_file_updated' => 'File successfully updated',
-    'attachments_link_attached' => 'Link successfully attached to page',
-    'templates' => 'Templates',
-    'templates_set_as_template' => 'Page is a template',
-    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
-    'templates_replace_content' => 'Replace page content',
-    'templates_append_content' => 'Append to page content',
-    'templates_prepend_content' => 'Prepend to page content',
+    'attachments_edit_drop_upload' => 'Gollwng ffeiliau neu glicio yma i uwchlwytho ac arysgrifennu',
+    'attachments_order_updated' => 'Trefn atodiad wedi’i diweddaru',
+    'attachments_updated_success' => 'Manylion yr atodiad wedi\'u diweddaru',
+    'attachments_deleted' => 'Atodiad wedi’i ddileu',
+    'attachments_file_uploaded' => 'Ffeil wedi\'i huwchwytho\'n llwyddiannus',
+    'attachments_file_updated' => 'Ffeil wedi\'i diweddaru’n llwyddiannus',
+    'attachments_link_attached' => 'Dolen wedi\'i atodi’n llwyddiannus i\'r dudalen',
+    'templates' => 'Templedi',
+    'templates_set_as_template' => 'Mae\'r dudalen yn dempled',
+    'templates_explain_set_as_template' => 'Gallwch osod y dudalen hon fel templed er mwyn gallu defnyddio ei chynnwys wrth greu tudalennau eraill. Bydd modd i ddefnyddwyr eraill ddefnyddio\'r templed hwn os oes ganddynt ganiatâd gweld ar gyfer y dudalen hon.',
+    'templates_replace_content' => 'Disodli cynnwys tudalen',
+    'templates_append_content' => 'Atodi i gynnwys tudalen',
+    'templates_prepend_content' => 'Rhagarweiniad i gynnwys tudalen',
 
     // Profile View
-    'profile_user_for_x' => 'User for :time',
-    'profile_created_content' => 'Created Content',
-    'profile_not_created_pages' => ':userName has not created any pages',
-    'profile_not_created_chapters' => ':userName has not created any chapters',
-    'profile_not_created_books' => ':userName has not created any books',
-    'profile_not_created_shelves' => ':userName has not created any shelves',
+    'profile_user_for_x' => 'Defnyddiwr am :time',
+    'profile_created_content' => 'Cynnwys a Grëwyd',
+    'profile_not_created_pages' => 'Nid yw :userName wedi creu unrhyw dudalennau',
+    'profile_not_created_chapters' => 'Nid yw :userName wedi creu unrhyw benodau',
+    'profile_not_created_books' => 'Nid yw :userName wedi creu unrhyw lyfrau',
+    'profile_not_created_shelves' => 'Nid yw :userName wedi creu unrhyw silffoedd',
 
     // Comments
-    'comment' => 'Comment',
-    'comments' => 'Comments',
-    'comment_add' => 'Add Comment',
-    'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
-    'comment_save' => 'Save Comment',
-    'comment_new' => 'New Comment',
-    'comment_created' => 'commented :createDiff',
-    'comment_updated' => 'Updated :updateDiff by :username',
-    'comment_updated_indicator' => 'Updated',
-    'comment_deleted_success' => 'Comment deleted',
-    'comment_created_success' => 'Comment added',
-    'comment_updated_success' => 'Comment updated',
-    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
-    'comment_in_reply_to' => 'In reply to :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment' => 'Sylw',
+    'comments' => 'Sylwadau',
+    'comment_add' => 'Ychwanegu Sylw',
+    'comment_placeholder' => 'Gadewch sylw yma',
+    'comment_count' => '{0} Dim sylwadau|{1} 1 Sylw| [2,*] :count Sylwadau',
+    'comment_save' => 'Cadw Sylw',
+    'comment_new' => 'Sylw Newydd',
+    'comment_created' => 'sylwodd :createDiff',
+    'comment_updated' => 'Diweddarwyd :update gan :username',
+    'comment_updated_indicator' => 'Diweddarwyd',
+    'comment_deleted_success' => 'Dilëwyd sylw',
+    'comment_created_success' => 'Ychwanegwyd sylw',
+    'comment_updated_success' => 'Diweddarwyd sylw',
+    'comment_delete_confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r sylw hwn?',
+    'comment_in_reply_to' => 'Mewn ymateb i :commentId',
+    'comment_editor_explain' => 'Dyma\'r sylwadau sydd wedi eu gadael ar y dudalen hon. Gellir ychwanegu a rheoli sylwadau wrth edrych ar y dudalen a gadwyd.',
 
     // Revision
-    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
-    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
-    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+    'revision_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r adolygiad hwn?',
+    'revision_restore_confirm' => 'Ydych chi\'n siŵr eich bod eisiau adfer yr adolygiad hwn? Bydd cynnwys presennol y dudalen yn cael ei newid.',
+    'revision_cannot_delete_latest' => 'Ni ellir dileu\'r adolygiad diweddaraf.',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => 'Ystyriwch yr isod wrth gopïo cynnwys.',
+    'copy_consider_permissions' => 'Ni fydd gosodiadau caniatâd personol yn cael eu copïo.',
+    'copy_consider_owner' => 'Byddwch yn dod yn berchennog yr holl gynnwys sydd wedi’i gopïo.',
+    'copy_consider_images' => 'Ni fydd ffeiliau delwedd tudalen yn cael eu dyblygu a bydd y delweddau gwreiddiol yn cadw eu perthynas â\'r dudalen y cawsant eu huwchlwytho yn wreiddiol iddi.',
+    'copy_consider_attachments' => 'Ni fydd atodiadau tudalen yn cael eu copïo.',
+    'copy_consider_access' => 'Gall newid lleoliad, perchennog neu ganiatâd olygu bod y cynnwys hwn yn hygyrch i\'r rhai nad oedd ganddynt fynediad o\'r blaen.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => 'Trosi i Silff',
+    'convert_to_shelf_contents_desc' => 'Gallwch drosi\'r llyfr hwn i silff newydd gyda\'r un cynnwys. Bydd penodau yn y llyfr hwn yn cael eu trosi i lyfrau newydd. Os yw\'r llyfr hwn yn cynnwys unrhyw dudalennau, nad ydynt mewn pennod, bydd y llyfr hwn yn cael ei ailenwi ac yn cynnwys tudalennau o\'r fath, a bydd y llyfr hwn yn dod yn rhan o\'r silff newydd.',
+    'convert_to_shelf_permissions_desc' => 'Bydd unrhyw ganiatâd a osodir ar y llyfr hwn yn cael ei gopïo i\'r silff newydd ac i bob llyfr plentyn newydd nad oes ganddynt eu caniatâd eu hunain. Noder nad yw caniatâd ar silffoedd yn rhaeadru’n awtomatig i’r cynnwys oddi mewn, fel y maent ar gyfer llyfrau.',
+    'convert_book' => 'Trosi Llyfr',
+    'convert_book_confirm' => 'Ydych chi\'n siwr eich bod eisiau trosi’r llyfr hwn?',
+    'convert_undo_warning' => 'Ni ellir dad-wneud hyn mor hawdd.',
+    'convert_to_book' => 'Trosi i Lyfr',
+    'convert_to_book_desc' => 'Gallwch drosi\'r bennod hon i lyfr newydd gyda\'r un cynnwys. Bydd unrhyw ganiatâd a osodir ar y bennod hon yn cael ei gopïo i\'r llyfr newydd ond ni fydd unrhyw ganiatâd a etifeddir o\'r llyfr rhiant yn cael ei gopïo, a allai arwain at newid rheolaeth mynediad.',
+    'convert_chapter' => 'Trosi Pennod',
+    'convert_chapter_confirm' => 'Ydych chi\'n siŵr eich bod eisiau trosi’r bennod hon?',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'Cyfeirnodau',
+    'references_none' => 'Nid oes unrhyw gyfeirnodau wedi\'u holrhain ar gyfer yr eitem hon.',
+    'references_to_desc' => 'Isod ceir yr holl gynnwys hysbys yn y system sy\'n cysylltu â\'r eitem hon.',
 
     // Watch Options
     'watch' => 'Gwylio',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_default' => 'Dewisiadau Diofyn',
+    'watch_desc_default' => 'Newid i weld eich dewisiadau hysbysu diofyn yn unig.',
+    'watch_title_ignore' => 'Anwybyddu',
+    'watch_desc_ignore' => 'Anwybyddu pob hysbysiad, gan gynnwys y rhai o ddewisiadau lefel defnyddiwr.',
     'watch_title_new' => 'Tudalennau Newydd',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_desc_new' => 'Rhoi gwybod pan fydd unrhyw dudalen newydd yn cael ei chreu yn yr eitem hon.',
+    'watch_title_updates' => 'Diweddariadau Pob Tudalen',
+    'watch_desc_updates' => 'Hysbysu am bob tudalen newydd a newid i dudalennau.',
+    'watch_desc_updates_page' => 'Hysbysu am bob newid i dudalennau.',
+    'watch_title_comments' => 'Pob Diweddariad i Dualennau a Sylwadau',
+    'watch_desc_comments' => 'Hysbysu am bob tudalen newydd, newidiadau i dudalennau a sylwadau newydd.',
+    'watch_desc_comments_page' => 'Hysbysu am newidiadau i dudalennau a sylwadau newydd.',
+    'watch_change_default' => 'Newid dewisiadau hysbysu diofyn',
+    'watch_detail_ignore' => 'Anwybyddu hysbysiadau',
+    'watch_detail_new' => 'Gwylio am dudalennau newydd',
+    'watch_detail_updates' => 'Gwylio tudalennau a diweddariadau newydd',
+    'watch_detail_comments' => 'Gwylio tudalennau newydd, diweddariadau a sylwadau',
+    'watch_detail_parent_book' => 'Gwylio trwy lyfr rhiant',
+    'watch_detail_parent_book_ignore' => 'Anwybyddu trwy lyfr rhiant',
+    'watch_detail_parent_chapter' => 'Gwylio trwy bennod rhiant',
+    'watch_detail_parent_chapter_ignore' => 'Anwybyddu trwy bennod rhiant',
 ];
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index 71a47bc40cd..b6868c5cefe 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Mae defnyddiwr gyda\'r e-bost :email eisoes yn bodoli ond gyda nodweddion gwahanol.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Nid oedd modd cofrestru cyfrif defnyddiwr ar gyfer y manylion a ddarparwyd',
     'email_already_confirmed' => 'E-bost eisoes wedi\'i gadarnhau, Ceisiwch fewngofnodi.',
     'email_confirmation_invalid' => 'Nid yw\'r tocyn cadarnhau hwn yn ddilys neu mae eisoes wedi\'i ddefnyddio. Ceisiwch gofrestru eto.',
     'email_confirmation_expired' => 'Mae\'r tocyn cadarnhad wedi dod i ben, Mae e-bost cadarnhau newydd wedi\'i anfon.',
@@ -37,37 +37,37 @@
     'social_driver_not_found' => 'Gyrrwr cymdeithasol heb ei ganfod',
     'social_driver_not_configured' => 'Nid yw eich gosodiadau cymdeithasol :socialAccount wedi\'u ffurfweddu\'n gywir.',
     'invite_token_expired' => 'Mae\'r ddolen wahoddiad hon wedi dod i ben. Yn lle hynny, gallwch chi geisio ailosod cyfrinair eich cyfrif.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Nid oedd modd dod o hyd i ddefnyddiwr ar gyfer y weithred hon.',
 
     // System
     'path_not_writable' => 'Nid oedd modd uwchlwytho llwybr ffeil :filePath. Sicrhewch ei fod yn ysgrifenadwy i\'r gweinydd.',
     'cannot_get_image_from_url' => 'Methu cael delwedd o :url',
     'cannot_create_thumbs' => 'Ni all y gweinydd greu mân-luniau. Gwiriwch fod gennych yr estyniad GD PHP wedi\'i osod.',
     'server_upload_limit' => 'Nid yw\'r gweinydd yn caniatáu uwchlwythiadau o\'r maint hwn. Rhowch gynnig ar faint ffeil llai.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'Ni all y gweinydd dderbyn y swm o ddata a ddarparwyd. Rhowch gynnig arall arni eto gyda llai o ddata neu ffeil lai.',
     'uploaded'  => 'Nid yw\'r gweinydd yn caniatáu uwchlwythiadau o\'r maint hwn. Rhowch gynnig ar faint ffeil llai.',
 
     // Drawing & Images
     'image_upload_error' => 'Bu gwall wrth uwchlwytho\'r ddelwedd',
     'image_upload_type_error' => 'Mae\'r math o ddelwedd sy\'n cael ei huwchlwytho yn annilys',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_replace_type' => 'Rhaid i ffeiliau delwedd a newidir fod o\'r un math',
+    'image_upload_memory_limit' => 'Methwyd â thrin y llun a uwchlwythwyd a/neu greu mân-luniau oherwydd cyfyngiadau i adnoddau’r system.',
+    'image_thumbnail_memory_limit' => 'Methwyd â chreu amrywiadau i faint y llun oherwydd cyfyngiadau i adnoddau’r system.',
+    'image_gallery_thumbnail_memory_limit' => 'Methwyd â chreu oriel o fân-luniau oherwydd cyfyngiadau i adnoddau’r system.',
+    'drawing_data_not_found' => 'Nid oedd modd llwytho\'r data dylunio. Efallai nad yw’r ffeil ddylunio yn bodoli mwyach neu efallai nad oes gennych ganiatâd i\'w defnyddio.',
 
     // Attachments
     'attachment_not_found' => 'Ni chanfuwyd yr atodiad',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Digwyddodd gwall wrth uwchlwytho’r ffeil atodiad',
 
     // Pages
     'page_draft_autosave_fail' => 'Wedi methu cadw\'r drafft. Sicrhewch fod gennych gysylltiad rhyngrwyd cyn cadw\'r dudalen hon',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Methwyd â dileu’r dudalen ddrafft a chyrchu cynnwys y dudalen gyfredol',
     'page_custom_home_deletion' => 'Methu dileu tudalen tra ei bod wedi\'i gosod fel hafan',
 
     // Entities
     'entity_not_found' => 'Endid heb ei ganfod',
-    'bookshelf_not_found' => 'Shelf not found',
+    'bookshelf_not_found' => 'Ni chanfuwyd y silff',
     'book_not_found' => 'Ni chanfuwyd y llyfr',
     'page_not_found' => 'Heb ganfod y dudalen',
     'chapter_not_found' => 'Pennod heb ei chanfod',
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ni allwch ddileu\'r unig weinyddwr',
     'users_cannot_delete_guest' => 'Ni allwch ddileu\'r defnyddiwr gwadd',
+    'users_could_not_send_invite' => 'Methu creu defnyddiwr oherwydd ni fu modd anfon e-bost gwahodd',
 
     // Roles
     'role_cannot_be_edited' => 'Nid oes modd golygu\'r rôl hon',
@@ -116,5 +117,5 @@
     'maintenance_test_email_failure' => 'Gwall a daflwyd wrth anfon e-bost prawf:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'Nid yw\'r URL yn cyd-fynd â\'r gwesteion SSR ffurfweddu a ganiateir',
 ];
diff --git a/lang/cy/notifications.php b/lang/cy/notifications.php
index b9f58ac2576..26f65f1447d 100644
--- a/lang/cy/notifications.php
+++ b/lang/cy/notifications.php
@@ -10,18 +10,18 @@
     'new_page_intro' => 'Mae tudalen newydd wedi cael ei chreu yn :appName:',
     'updated_page_subject' => 'Tudalen wedi\'i diweddaru :pageName',
     'updated_page_intro' => 'Mae tudalen newydd wedi cael ei diweddaru yn :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'updated_page_debounce' => 'Er mwyn atal llu o hysbysiadau, am gyfnod ni fyddwch yn cael hysbysiadau am ragor o olygiadau i\'r dudalen hon gan yr un golygydd.',
 
     'detail_page_name' => 'Enw\'r dudalen:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
+    'detail_page_path' => 'Llwybr Tudalen:',
+    'detail_commenter' => 'Sylwebydd:',
     'detail_comment' => 'Sylw:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_created_by' => 'Crëwyd gan:',
+    'detail_updated_by' => 'Diweddarwyd Gan:',
 
     'action_view_comment' => 'Gweld y sylw',
     'action_view_page' => 'Gweld y dudalen',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Anfonwyd yr hysbysiad hwn atoch oherwydd bod y :ddolen yn ymdrin â’r math hwn o weithgaredd ar gyfer yr eitem hon.',
+    'footer_reason_link' => 'eich dewisiadau hysbysu',
 ];
diff --git a/lang/cy/passwords.php b/lang/cy/passwords.php
index b408f3c2fda..992c1d09321 100644
--- a/lang/cy/passwords.php
+++ b/lang/cy/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => 'Passwords must be at least eight characters and match the confirmation.',
-    'user' => "We can't find a user with that e-mail address.",
-    'token' => 'The password reset token is invalid for this email address.',
-    'sent' => 'We have e-mailed your password reset link!',
-    'reset' => 'Your password has been reset!',
+    'password' => 'Rhaid i gyfrineiriau fod yn 8 nod o leiaf ac yn cyd-fynd â\'r cadarnhad.',
+    'user' => "Ni allwn ddod o hyd i ddefnyddiwr gyda'r cyfeiriad e-bost hwn.",
+    'token' => 'Mae\'r tocyn ailosod cyfrinair yn annilys ar gyfer y cyfeiriad e-bost hwn.',
+    'sent' => 'Rydym wedi e-bostio eich dolen ailosod cyfrinair!',
+    'reset' => 'Mae eich cyfrinair wedi\'i ailosod!',
 
 ];
diff --git a/lang/cy/preferences.php b/lang/cy/preferences.php
index 89087c9deff..6e00adfe8ee 100644
--- a/lang/cy/preferences.php
+++ b/lang/cy/preferences.php
@@ -7,45 +7,45 @@
 return [
     'my_account' => 'Fy Nghyfrif',
 
-    'shortcuts' => 'Shortcuts',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts' => 'Llwybrau Byr',
+    'shortcuts_interface' => 'Dewisiadau Llwybr Byr UI',
+    'shortcuts_toggle_desc' => 'Yma gallwch alluogi neu analluogi llwybrau byr rhyngwyneb system ar y bysellfwrdd, a ddefnyddir ar gyfer llywio a gweithredoedd.',
+    'shortcuts_customize_desc' => 'Gallwch addasu pob un o\'r llwybrau byr isod. Pwyswch eich cyfuniad o fysellau ar ôl dewis y mewnbwn ar gyfer llwybr byr.',
+    'shortcuts_toggle_label' => 'Llwybrau byr bysellfwrdd wedi\'u galluogi',
+    'shortcuts_section_navigation' => 'Llywio',
+    'shortcuts_section_actions' => 'Gweithredoedd Cyffredin',
+    'shortcuts_save' => 'Cadw Llwybrau Byr',
+    'shortcuts_overlay_desc' => 'Noder: Pan fydd llwybrau byr yn cael eu galluogi, mae troshaen helpwr ar gael trwy bwyso "?" a fydd yn tynnu sylw at y llwybrau byr sydd ar gael ar gyfer camau gweithredu sydd i\'w gweld ar y sgrin ar hyn o bryd.',
+    'shortcuts_update_success' => 'Mae’r dewisiadau llwybr byr wedi\'u diweddaru!',
+    'shortcuts_overview_desc' => 'Rheoli llwybrau byr bysellfwrdd a gellir eu defnyddio i lywio trwy ryngwyneb defnyddiwr y system.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications' => 'Dewisiadau Hysbysu',
+    'notifications_desc' => 'Rheoli’r hysbysiadau e-bost a gewch pan fydd gweithgaredd penodol yn cael ei gyflawni o fewn y system.',
+    'notifications_opt_own_page_changes' => 'Hysbysu am newidiadau i dudalennau yr wyf yn berchen arnynt',
+    'notifications_opt_own_page_comments' => 'Hysbysu am sylwadau ar dudalennau yr wyf yn berchen arnynt',
+    'notifications_opt_comment_replies' => 'Hysbysu am atebion i\'m sylwadau',
+    'notifications_save' => 'Dewisiadau Cadw',
+    'notifications_update_success' => 'Mae’r dewisiadau hysbysu wedi\'u diweddaru!',
+    'notifications_watched' => 'Eitemau Gwylio ac Anwybyddu',
+    'notifications_watched_desc' => 'Isod ceir yr eitemau sydd â dewisiadau gwylio penodol wedi\'u cymhwyso. I ddiweddaru eich dewisiadau ar gyfer y rhain, edrychwch ar yr eitem yna dewch o hyd i\'r opsiynau gwylio yn y bar ochr.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'Mynediad a Diogelwch',
+    'auth_change_password' => 'Newid Cyfrinair',
+    'auth_change_password_desc' => 'Newidiwch y cyfrinair rydych chi’n ei ddefnyddio i fewngofnodi i’r rhaglen. Rhaid i gyfrineiriau fod yn 8 nod o leiaf.',
+    'auth_change_password_success' => 'Mae\'r cyfrinair wedi\'i ddiweddaru!',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => 'Manylion Proffil',
+    'profile_desc' => 'Rheoli manylion eich cyfrif sy\'n eich cynrychioli chi i ddefnyddwyr eraill, yn ogystal â manylion a ddefnyddir ar gyfer cyfathrebu a phersonoli systemau.',
+    'profile_view_public' => 'Gweld Proffil Cyhoeddus',
+    'profile_name_desc' => 'Ffurfweddwch eich enw arddangos a fydd yn weladwy i ddefnyddwyr eraill yn y system trwy\'r hyn yr ydych yn ei wneud, a\'r cynnwys rydych chi\'n berchen arno.',
+    'profile_email_desc' => 'Bydd yr e-bost hwn yn cael ei ddefnyddio ar gyfer hysbysiadau a, gan ddibynnu ar ddilysiad system gweithredol, mynediad i’r system.',
+    'profile_email_no_permission' => 'Yn anffodus, nid oes gennych ganiatâd i newid eich cyfeiriad e-bost. Os hoffech newid hwn, byddai angen i chi ofyn i weinyddwr newid hyn ar eich rhan.',
+    'profile_avatar_desc' => 'Dewiswch lun a fydd yn cael ei ddefnyddio i’ch cynrychioli chi i eraill yn y system. Yn ddelfrydol, dylai\'r llun hwn fod yn sgwâr a thua 256px o led ac uchder.',
+    'profile_admin_options' => 'Dewisiadau Gweinyddwr',
+    'profile_admin_options_desc' => 'Gellir dod o hyd i ddewisiadau lefel gweinyddwyr ychwanegol, fel y rhai i reoli aseiniadau rôl, ar gyfer eich cyfrif defnyddiwr yn yr ardal "Gosodiadau > Defnyddiwr” o’r rhaglen.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'Dileu Cyfrif',
+    'delete_my_account' => 'Dileu fy Nghyfrif',
+    'delete_my_account_desc' => 'Bydd hyn yn dileu eich cyfrif defnyddiwr o\'r system yn llwyr. Ni fydd modd i chi adfer y cyfrif hwn na gwrthdroi\'r weithred hon. Bydd cynnwys rydych chi wedi\'i greu, megis tudalennau wedi\'u creu a delweddau wedi\'u huwchlwytho, yn parhau.',
+    'delete_my_account_warning' => 'Ydych chi\'n siŵr eich bod eisiau dileu eich cyfrif?',
 ];
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index 52e03ff15d9..3b0fa5ed604 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -64,15 +64,15 @@
     'reg_settings' => 'Cofrestriad',
     'reg_enable' => 'Galluogi Cofrestru',
     'reg_enable_toggle' => 'Galluogi cofrestru',
-    'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
-    'reg_default_role' => 'Default user role after registration',
-    'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
-    'reg_email_confirmation' => 'Email Confirmation',
-    'reg_email_confirmation_toggle' => 'Require email confirmation',
-    'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.',
-    'reg_confirm_restrict_domain' => 'Domain Restriction',
-    'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
-    'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
+    'reg_enable_desc' => 'Pan fydd cofrestru wedi\'i alluogi bydd modd i ddefnyddwyr gofrestru fel defnyddwyr y rhaglen. Wrth gofrestru maent yn cael un rôl defnyddiwr diofyn.',
+    'reg_default_role' => 'Rôl defnyddiwr diofyn ar ôl cofrestru',
+    'reg_enable_external_warning' => 'Anwybyddir y dewis uchod tra bod dilysu LDAP neu SAML allanol yn weithredol. Bydd cyfrifon defnyddwyr ar gyfer aelodau nad ydynt yn bodoli yn cael eu creu\'n awtomatig os bydd dilysiad, yn erbyn y system allanol sy\'n cael ei defnyddio, yn llwyddiannus.',
+    'reg_email_confirmation' => 'Cadarnhad E-bost',
+    'reg_email_confirmation_toggle' => 'Angen cadarnhad e-bost',
+    'reg_confirm_email_desc' => 'Os defnyddir cyfyngiad parth, bydd angen cadarnhad e-bost a bydd yr opsiwn hwn yn cael ei anwybyddu.',
+    'reg_confirm_restrict_domain' => 'Cyfyngiad Parth',
+    'reg_confirm_restrict_domain_desc' => 'Rhowch restr wedi\'i gwahanu gan goma o barthau e-bost yr hoffech gyfyngu cofrestriad iddynt. Bydd defnyddwyr yn cael e-bost i gadarnhau eu cyfeiriad cyn cael caniatâd i ryngweithio â\'r rhaglen. <br> Noder y bydd modd i ddefnyddwyr newid eu cyfeiriadau e-bost ar ôl cofrestru\'n llwyddiannus.',
+    'reg_confirm_restrict_domain_placeholder' => 'Ni osodwyd cyfyngiad',
 
     // Maintenance settings
     'maint' => 'Cynnal',
@@ -130,17 +130,17 @@
     'audit_table_related' => 'Eitem neu Fanylion Cysylltiedig',
     'audit_table_ip' => 'Cyfeiriad IP',
     'audit_table_date' => 'Dyddiad Gweithgaredd',
-    'audit_date_from' => 'Date Range From',
-    'audit_date_to' => 'Date Range To',
+    'audit_date_from' => 'Amrediad Dyddiad O',
+    'audit_date_to' => 'Amrediad Dyddiad Tan',
 
     // Role Settings
     'roles' => 'Rolau',
     'role_user_roles' => 'Rolau Defnyddiwr',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_index_desc' => 'Defnyddir rolau i grwpio defnyddwyr a rhoi caniatâd system i\'w haelodau. Pan fydd defnyddiwr yn aelod o sawl rôl, bydd y breintiau a roddir yn pentyrru a bydd y defnyddiwr yn etifeddu pob gallu.',
+    'roles_x_users_assigned' => ':count defnyddiwr wedi\'u clustnodi|:count o ddefnyddwyr wedi\'u clustnodi',
     'roles_x_permissions_provided' => ':count caniatâd|:count caniatâd',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_assigned_users' => 'Clustnodi Defnyddwyr',
+    'roles_permissions_provided' => 'Darparu Caniatâd',
     'role_create' => 'Creu Rôl Newydd',
     'role_delete' => 'Dileu Rôl',
     'role_delete_confirm' => 'Bydd hyn yn dileu\'r rôl gyda\'r enw \':roleName\'.',
@@ -200,7 +200,7 @@
     'users_delete_named' => 'Dileu defnyddiwr :userName',
     'users_delete_warning' => 'Bydd hyn yn dileu\'r defnyddiwr hwn yn llawn gyda\'r enw \':userName\' o\'r system.',
     'users_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu’r defnyddiwr hwn?',
-    'users_migrate_ownership' => 'Migrate Ownership',
+    'users_migrate_ownership' => 'Mudo Perchnogaeth',
     'users_migrate_ownership_desc' => 'Dewiswch ddefnyddiwr yma os ydych chi am i ddefnyddiwr arall ddod yn berchennog ar yr holl eitemau sy\'n eiddo i\'r defnyddiwr hwn ar hyn o bryd.',
     'users_none_selected' => 'Ni ddewiswyd defnyddiwr',
     'users_edit' => 'Golygu Defnyddiwr',
@@ -256,7 +256,7 @@
     'webhooks_edit' => 'Golygu Gwe-fachyn',
     'webhooks_save' => 'Cadw Gwe-fachyn',
     'webhooks_details' => 'Manylion Gwe-fachyn',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_details_desc' => 'Darparu enw defnyddiwr cyfeillgar a chyfeiriad POST fel lleoliad ar gyfer anfon y data gwe-fachyn iddo.',
     'webhooks_events' => 'Digwyddiadau Gwe-fachyn',
     'webhooks_events_desc' => 'Dewiswch yr holl ddigwyddiadau a ddylai sbarduno\'r gwe-fachyn hwn i gael ei alw.',
     'webhooks_events_warning' => 'Cadwch mewn cof y bydd y digwyddiadau hyn yn cael eu sbarduno ar gyfer yr holl ddigwyddiadau a ddewiswyd, hyd yn oed os rhoddir caniatâd arferol ar waith. Gwnewch yn siŵr na fydd defnyddio\'r gwe-fachyn hwn yn datgelu cynnwys cyfrinachol.',
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/da/activities.php b/lang/da/activities.php
index f374d799ab5..6a99fec6f92 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -65,7 +65,7 @@
     'auth_login' => 'loggede ind',
     'auth_register' => 'registered as new user',
     'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
+    'auth_password_reset_update' => 'nulstil adgangskode',
     'mfa_setup_method' => 'configured MFA method',
     'mfa_setup_method_notification' => 'Multi-faktor metode konfigureret',
     'mfa_remove_method' => 'removed MFA method',
@@ -85,8 +85,8 @@
     'webhook_delete_notification' => 'Webhooken blev slettet',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
+    'user_create' => 'opret bruger',
+    'user_create_notification' => 'Bruger oprettet korrekt',
     'user_update' => 'updated user',
     'user_update_notification' => 'Brugeren blev opdateret',
     'user_delete' => 'deleted user',
diff --git a/lang/da/common.php b/lang/da/common.php
index 8c6fa105cc1..75060b28b3f 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privatlivspolitik',
     'terms_of_service' => 'Tjenestevilkår',
+
+    // OpenSearch
+    'opensearch_description' => 'Søg :appName',
 ];
diff --git a/lang/da/entities.php b/lang/da/entities.php
index 1e8b38fa9b5..47d2f1568d5 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -50,7 +50,7 @@
     'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
     'permissions_save' => 'Gem tilladelser',
     'permissions_owner' => 'Ejer',
-    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else' => 'Alle andre',
     'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
     'permissions_role_override' => 'Override permissions for role',
     'permissions_inherit_defaults' => 'Inherit defaults',
@@ -100,8 +100,8 @@
     'shelves_empty_contents' => 'Denne reol har ingen bøger tilknyttet til den',
     'shelves_edit_and_assign' => 'Rediger reol for at tilføje bøger',
     'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
+    'shelves_edit' => 'Rediger Reol',
+    'shelves_delete' => 'Slettede reoler',
     'shelves_delete_named' => 'Delete Shelf :name',
     'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
     'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Skift til WYSIWYG redigering',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Sæt ændringsoversigt',
     'pages_edit_enter_changelog_desc' => 'Indtast en kort beskrivelse af ændringer du har lavet',
     'pages_edit_enter_changelog' => 'Indtast ændringsoversigt',
diff --git a/lang/da/errors.php b/lang/da/errors.php
index dbee7125115..afa7b5824d7 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan ikke slette den eneste admin',
     'users_cannot_delete_guest' => 'Du kan ikke slette gæstebrugeren',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Denne rolle kan ikke redigeres',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index 276bb499595..5fa2d156f1e 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Catalansk',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/de/common.php b/lang/de/common.php
index 1e18deb7797..8ff91da0a25 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Datenschutzbestimmungen',
     'terms_of_service' => 'Allgemeine Geschäftsbedingungen',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/de/entities.php b/lang/de/entities.php
index dda99bacfec..6c67d9830dc 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(gesäuberter Output)',
     'pages_edit_switch_to_markdown_stable' => '(html beibehalten)',
     'pages_edit_switch_to_wysiwyg' => 'Wechseln Sie zum WYSIWYG-Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 90e325c6dd8..7d6e09935aa 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Sie können den einzigen Administrator nicht löschen',
     'users_cannot_delete_guest' => 'Sie können den Gast-Benutzer nicht löschen',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Diese Rolle kann nicht bearbeitet werden',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index f237ea53271..60fc2591469 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -296,6 +296,7 @@
         'bs' => 'Bosnisch',
         'ca' => 'Katalanisch',
         'cs' => 'Tschechisch',
+        'cy' => 'Cymraeg',
         'da' => 'Dänisch',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index 3d5a4d1e324..e033b63d22e 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Datenschutzerklärung',
     'terms_of_service' => 'Allgemeine Geschäftsbedingungen',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index f65e15ee832..e8a69167243 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Sauberer Inhalt)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG Editor wechseln',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index 63c90db1d34..dcfa6a2ffaf 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kannst den einzigen Administrator nicht löschen.',
     'users_cannot_delete_guest' => 'Du kannst den Gast-Benutzer nicht löschen',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Diese Rolle kann nicht bearbeitet werden.',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index e80c2e7b001..2eddefd4ad5 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -296,6 +296,7 @@
         'bs' => 'Bosnisch',
         'ca' => 'Katalanisch',
         'cs' => 'Tschechisch',
+        'cy' => 'Cymraeg',
         'da' => 'Dänisch',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/el/common.php b/lang/el/common.php
index a644bc4a1ce..d1b6bd9f790 100644
--- a/lang/el/common.php
+++ b/lang/el/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Πολιτική Απορρήτου',
     'terms_of_service' => 'Όροι χρήσης',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/el/entities.php b/lang/el/entities.php
index 2170d69cf47..d127a77c222 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Καθαρισμός Περιεχομένου)',
     'pages_edit_switch_to_markdown_stable' => '(Σταθερό Περιεχόμενο)',
     'pages_edit_switch_to_wysiwyg' => 'Εναλλαγή στον επεξεργαστή WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Ορισμός καταγραφής αλλαγών',
     'pages_edit_enter_changelog_desc' => 'Εισάγετε μια σύντομη περιγραφή των αλλαγών που κάνατε',
     'pages_edit_enter_changelog' => 'Εισαγωγή Αρχείου Καταγραφής Αλλαγών',
diff --git a/lang/el/errors.php b/lang/el/errors.php
index 2872402662f..1d57fe4a174 100644
--- a/lang/el/errors.php
+++ b/lang/el/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Δεν μπορείτε να διαγράψετε τον μοναδικό διαχειριστή',
     'users_cannot_delete_guest' => 'Δεν μπορείτε να διαγράψετε τον επισκέπτη',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Αυτός ο ρόλος δεν μπορεί να επεξεργαστεί',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 8f0e20bacd9..8c34fccba5d 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/es/common.php b/lang/es/common.php
index c0a1a75a751..14eee82d97c 100644
--- a/lang/es/common.php
+++ b/lang/es/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Política de privacidad',
     'terms_of_service' => 'Términos de Servicio',
+
+    // OpenSearch
+    'opensearch_description' => 'Buscar :appName',
 ];
diff --git a/lang/es/entities.php b/lang/es/entities.php
index d77323486ed..d197c20983f 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Limpiar Contenido)',
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En alfa)',
     'pages_edit_set_changelog' => 'Ajustar Log de cambios',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar al Log de cambios',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index 1323465000b..deb6c1bc51e 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'No se puede borrar el único administrador',
     'users_cannot_delete_guest' => 'No se puede borrar el usuario invitado',
+    'users_could_not_send_invite' => 'No se pudo crear el usuario porque no se pudo enviar el correo de invitación',
 
     // Roles
     'role_cannot_be_edited' => 'Este rol no puede ser editado',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index b040fda1217..62919fe4ac8 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosnio',
         'ca' => 'Català',
         'cs' => 'Checo',
+        'cy' => 'Cymraeg',
         'da' => 'Danés',
         'de' => 'Alemán (informal)',
         'de_informal' => 'Alemán (formal)',
diff --git a/lang/es_AR/common.php b/lang/es_AR/common.php
index bbda086acf1..ebac11119d3 100644
--- a/lang/es_AR/common.php
+++ b/lang/es_AR/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Política de privacidad',
     'terms_of_service' => 'Términos de Servicio',
+
+    // OpenSearch
+    'opensearch_description' => 'Buscar :appName',
 ];
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index 253feae042e..d35682d2fad 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Limpiar Contenido)',
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En alfa)',
     'pages_edit_set_changelog' => 'Establecer cambios de registro',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar en cambio de registro',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index a5dd84df16c..c25c793d04f 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'No se puede borrar el único administrador',
     'users_cannot_delete_guest' => 'No se puede borrar el usuario invitado',
+    'users_could_not_send_invite' => 'No se pudo crear el usuario porque no se pudo enviar el correo de invitación',
 
     // Roles
     'role_cannot_be_edited' => 'Este rol no puede ser editado',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 10da1a0a6fc..84ed4769468 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -296,6 +296,7 @@
         'bs' => 'Bosnio',
         'ca' => 'Català',
         'cs' => 'Checo',
+        'cy' => 'Cymraeg',
         'da' => 'Danés',
         'de' => 'Alemán (informal)',
         'de_informal' => 'Alemán (formal)',
diff --git a/lang/et/common.php b/lang/et/common.php
index 6fe7f49a9e3..a53060a00e6 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privaatsus',
     'terms_of_service' => 'Kasutustingimused',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/et/entities.php b/lang/et/entities.php
index b142d79ba94..0d90dd32f3c 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Puhas sisu)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiilne sisu)',
     'pages_edit_switch_to_wysiwyg' => 'Kasuta WYSIWYG redaktorit',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Muudatuste logi',
     'pages_edit_enter_changelog_desc' => 'Sisesta tehtud muudatuste lühikirjeldus',
     'pages_edit_enter_changelog' => 'Salvesta muudatuste logi',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index dd4df205191..a4c3cf2bdcb 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ainsat administraatorit ei saa kustutada',
     'users_cannot_delete_guest' => 'Külaliskasutajat ei saa kustutada',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Seda rolli ei saa muuta',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 899fcefa292..aa860c05081 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski (bosnia keel)',
         'ca' => 'Català (katalaani keel)',
         'cs' => 'Česky (tšehhi keel)',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk (taani keel)',
         'de' => 'Deutsch (saksa keel)',
         'de_informal' => 'Deutsch (Du) (mitteformaalne saksa keel)',
diff --git a/lang/eu/common.php b/lang/eu/common.php
index 694a210d496..35a67b349ab 100644
--- a/lang/eu/common.php
+++ b/lang/eu/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Pribatutasun politika',
     'terms_of_service' => 'Zerbitzu-baldintzak',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index b0abcb80846..7588561201c 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/lang/eu/errors.php b/lang/eu/errors.php
index b5eef6ff275..33f033a176a 100644
--- a/lang/eu/errors.php
+++ b/lang/eu/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
     'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'This role cannot be edited',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 0bd0d8257ea..1ee5843e8e7 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 18b80de92a5..765c1e6271d 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'سیاست حفظ حریم خصوصی',
     'terms_of_service' => 'شرایط خدمات',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index 38443cf339f..7d173e61e6a 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(مطالب تمیز)',
     'pages_edit_switch_to_markdown_stable' => '(محتوای پایدار)',
     'pages_edit_switch_to_wysiwyg' => 'به ویرایشگر WYSIWYG بروید',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'تنظیم تغییرات',
     'pages_edit_enter_changelog_desc' => 'توضیح مختصری از تغییراتی که ایجاد کرده اید وارد کنید',
     'pages_edit_enter_changelog' => 'وارد کردن تغییرات',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index e014ca83e3c..8a54f9d3784 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'شما نمی توانید تنها ادمین را حذف کنید',
     'users_cannot_delete_guest' => 'شما نمی توانید کاربر مهمان را حذف کنید',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'این نقش قابل ویرایش نیست',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index c6c4ddddd5e..4993c4671c5 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/fi/common.php b/lang/fi/common.php
index b94b82aae1b..d6efe8e0347 100644
--- a/lang/fi/common.php
+++ b/lang/fi/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Tietosuojaseloste',
     'terms_of_service' => 'Palvelun käyttöehdot',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index 54dfe9a5929..c10886fe00f 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Puhdas sisältö)',
     'pages_edit_switch_to_markdown_stable' => '(Vakaa sisältö)',
     'pages_edit_switch_to_wysiwyg' => 'Vaihda WYSIWYG-editoriin',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Aseta muutosloki',
     'pages_edit_enter_changelog_desc' => 'Kirjoita lyhyt kuvaus tekemistäsi muutoksista',
     'pages_edit_enter_changelog' => 'Syötä muutosloki',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index 73dc3946627..4ffb37e8a91 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -79,6 +79,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ainoaa ylläpitäjää ei voi poistaa',
     'users_cannot_delete_guest' => 'Vieraskäyttäjää ei voi poistaa',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Tätä roolia ei voi muokata',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index ee47d30d016..3365d87bc37 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/fr/common.php b/lang/fr/common.php
index e8fb2e92784..282a72e4569 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Politique de confidentialité',
     'terms_of_service' => 'Conditions d\'utilisation',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index c04ef24e3bb..1f826bb7ee7 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Contenu nettoyé)',
     'pages_edit_switch_to_markdown_stable' => '(Contenu stable)',
     'pages_edit_switch_to_wysiwyg' => 'Basculer vers l\'éditeur WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Remplir le journal des changements',
     'pages_edit_enter_changelog_desc' => 'Entrez une brève description des changements effectués',
     'pages_edit_enter_changelog' => 'Ouvrir le journal des changements',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 95434d400e8..f2c9b125f37 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Vous ne pouvez pas supprimer le dernier administrateur',
     'users_cannot_delete_guest' => 'Vous ne pouvez pas supprimer l\'utilisateur invité',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ce rôle ne peut pas être modifié',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index f5c2c6d2b20..eb8ca396cb6 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosniaque',
         'ca' => 'Catalan',
         'cs' => 'Tchèque',
+        'cy' => 'Cymraeg',
         'da' => 'Danois',
         'de' => 'Allemand',
         'de_informal' => 'Allemand (informel)',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 587e4bdddce..8ce859127a5 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '":name" הוסר מהמועדפים',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'העדפות צפייה עודכנו בהצלחה',
 
     // Auth
     'auth_login' => 'logged in',
@@ -117,7 +117,7 @@
     'commented_on'                => 'הגיב/ה על',
     'comment_create'              => 'added comment',
     'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_delete'              => 'תגובה נמחקה',
 
     // Other
     'permissions_update'          => 'הרשאות עודכנו',
diff --git a/lang/he/auth.php b/lang/he/auth.php
index 0a85bbaf841..04045e35758 100644
--- a/lang/he/auth.php
+++ b/lang/he/auth.php
@@ -7,7 +7,7 @@
 return [
 
     'failed' => 'פרטי ההתחברות אינם תואמים את הנתונים שלנו',
-    'throttle' => 'נסיונות התחברות רבים מדי, יש להמתין :seconds שניות ולנסות שנית',
+    'throttle' => 'נסיונות התחברות רבים מדי, יש להמתין :seconds שניות ולנסות שנית.',
 
     // Login & Register
     'sign_up' => 'הרשמה',
diff --git a/lang/he/common.php b/lang/he/common.php
index b02e11c6b47..a427df954fe 100644
--- a/lang/he/common.php
+++ b/lang/he/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'מדיניות הפרטיות',
     'terms_of_service' => 'תנאי שימוש',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 057af04d539..0dc6f882ea4 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'הגדר יומן שינויים',
     'pages_edit_enter_changelog_desc' => 'ציין תיאור קצר אודות השינויים שביצעת',
     'pages_edit_enter_changelog' => 'הכנס יומן שינויים',
diff --git a/lang/he/errors.php b/lang/he/errors.php
index af181b5a5bd..b11375dae39 100644
--- a/lang/he/errors.php
+++ b/lang/he/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'אינך יכול למחוק את המנהל היחיד',
     'users_cannot_delete_guest' => 'אינך יכול למחוק את משתמש האורח',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'לא ניתן לערוך תפקיד זה',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index b8bbfbe2669..3ad9da5ffbf 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/hr/common.php b/lang/hr/common.php
index 495966db6ac..3c9ed610bc6 100644
--- a/lang/hr/common.php
+++ b/lang/hr/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Politika privatnosti',
     'terms_of_service' => 'Uvjeti korištenja',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index eede312c495..01ceb054b1b 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Čisti Sadržaj)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilan Sadržaj)',
     'pages_edit_switch_to_wysiwyg' => 'Prebaci se na WYSIWYG uređivač',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Postavi dnevnik promjena',
     'pages_edit_enter_changelog_desc' => 'Ukratko opišite promjene koje ste napravili',
     'pages_edit_enter_changelog' => 'Unesi dnevnik promjena',
diff --git a/lang/hr/errors.php b/lang/hr/errors.php
index 8c1aad79fd0..31577863c4f 100644
--- a/lang/hr/errors.php
+++ b/lang/hr/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ne možete izbrisati',
     'users_cannot_delete_guest' => 'Ne možete izbrisati',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ne može se urediti',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index 4d010ba78f8..e58c3a6d45b 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/hu/common.php b/lang/hu/common.php
index 715d5e71c90..29a87e19edf 100644
--- a/lang/hu/common.php
+++ b/lang/hu/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Adatvédelmi irányelvek',
     'terms_of_service' => 'Felhasználási feltételek',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 2ef4de8fd49..174197827b1 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Tisztított tartalom)',
     'pages_edit_switch_to_markdown_stable' => '(Stabil tartalom)',
     'pages_edit_switch_to_wysiwyg' => 'Váltás a WYSIWYG szerkesztőre',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Változásnapló beállítása',
     'pages_edit_enter_changelog_desc' => 'A végrehajtott módosítások rövid leírása',
     'pages_edit_enter_changelog' => 'Változásnapló megadása',
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index cd65bfc8798..275eb65fe3d 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nem lehet törölni az egyetlen adminisztrátort',
     'users_cannot_delete_guest' => 'A vendég felhasználót nem lehet törölni',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ezt a szerepkört nem lehet szerkeszteni',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index bacb466aabe..7398de9e171 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/id/common.php b/lang/id/common.php
index a7f21589fd1..06e9421c87b 100644
--- a/lang/id/common.php
+++ b/lang/id/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Kebijakan Privasi',
     'terms_of_service' => 'Ketentuan Layanan',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 091f54e000b..cf87ab0253b 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Atur Changelog',
     'pages_edit_enter_changelog_desc' => 'Masukkan deskripsi singkat tentang perubahan yang Anda buat',
     'pages_edit_enter_changelog' => 'Masuk ke Changelog',
diff --git a/lang/id/errors.php b/lang/id/errors.php
index de388358085..8a4bc658f21 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Anda tidak dapat menghapus satu-satunya admin',
     'users_cannot_delete_guest' => 'Anda tidak dapat menghapus pengguna tamu',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Peran ini tidak dapat disunting',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 3b57776f030..21979ba60c4 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Katalan',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/it/common.php b/lang/it/common.php
index 6410081d2c5..113ddb01405 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Norme sulla privacy',
     'terms_of_service' => 'Condizioni del Servizio',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 22bc359ba7e..83ea85d266f 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Contenuto Chiaro)',
     'pages_edit_switch_to_markdown_stable' => '(Contenuto Stabile)',
     'pages_edit_switch_to_wysiwyg' => 'Passa all\'editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Imposta Changelog',
     'pages_edit_enter_changelog_desc' => 'Inserisci una breve descrizione dei cambiamenti che hai apportato',
     'pages_edit_enter_changelog' => 'Inserisci Changelog',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index 13c45c15254..fe8c4c17c33 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Non puoi eliminare l\'unico admin',
     'users_cannot_delete_guest' => 'Non puoi eliminare l\'utente ospite',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Questo ruolo non può essere modificato',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index ccbc505b7df..5d68fd26d1f 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosniaco',
         'ca' => 'Catalano',
         'cs' => 'Ceco',
+        'cy' => 'Cymraeg',
         'da' => 'Danese',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ja/common.php b/lang/ja/common.php
index 0d10e3cc9c6..097974d8e96 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'プライバシーポリシー',
     'terms_of_service' => '利用規約',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index bffcd410594..eda30371bac 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(クリーンなコンテンツ)',
     'pages_edit_switch_to_markdown_stable' => '(安定したコンテンツ)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYGエディタに切り替え',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => '編集内容についての説明',
     'pages_edit_enter_changelog_desc' => 'どのような変更を行ったのかを記録してください',
     'pages_edit_enter_changelog' => '編集内容を入力',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index 90a4f854ea8..e1d7709651c 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '唯一の管理者を削除することはできません',
     'users_cannot_delete_guest' => 'ゲストユーザを削除することはできません',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'この役割は編集できません',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 9e992d480e8..218eecf8c2c 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ka/common.php b/lang/ka/common.php
index 266174eed9d..b05169bb2c4 100644
--- a/lang/ka/common.php
+++ b/lang/ka/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privacy Policy',
     'terms_of_service' => 'Terms of Service',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index 9e620b24ed1..35e6f050bb8 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/lang/ka/errors.php b/lang/ka/errors.php
index 752eb5672f1..9c40aa9ed33 100644
--- a/lang/ka/errors.php
+++ b/lang/ka/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
     'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'This role cannot be edited',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index f4c84092c6f..5427cb9419e 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ko/common.php b/lang/ko/common.php
index 3a9a94bc8b7..246a3aebc36 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => '개인 정보 처리 방침',
     'terms_of_service' => '서비스 이용 약관',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 5b7d7143a92..4afd174f5f0 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG 편집기로 전환',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => '수정본 설명',
     'pages_edit_enter_changelog_desc' => '수정본 설명',
     'pages_edit_enter_changelog' => '설명',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index 074cec83b8b..7f2d8bb6a72 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Admin을 삭제할 수 없습니다.',
     'users_cannot_delete_guest' => 'Guest를 삭제할 수 없습니다.',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => '권한을 수정할 수 없습니다.',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 817791dc0d0..3a24e21a0c0 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/lt/common.php b/lang/lt/common.php
index 052b6cdecb6..e375c835ceb 100644
--- a/lang/lt/common.php
+++ b/lang/lt/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privatumo politika',
     'terms_of_service' => 'Paslaugų teikimo paslaugos',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 4db2ce2fab8..17601aa1687 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Nustatyti keitimo žurnalą',
     'pages_edit_enter_changelog_desc' => 'Įveskite trumpus, jūsų atliktus, pokyčių aprašymus',
     'pages_edit_enter_changelog' => 'Įeiti į keitimo žurnalą',
diff --git a/lang/lt/errors.php b/lang/lt/errors.php
index c7ecf824510..2209a00d7e0 100644
--- a/lang/lt/errors.php
+++ b/lang/lt/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Negalite ištrinti vienintelio administratoriaus',
     'users_cannot_delete_guest' => 'Negalite ištrinti svečio naudotojo',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Šio vaidmens negalima redaguoti',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index cd72051401c..3692bd2413b 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/lv/common.php b/lang/lv/common.php
index 657d9be64fd..584b24cb2e7 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privātuma politika',
     'terms_of_service' => 'Pakalpojuma noteikumi',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 147f5d28b28..771fffd4470 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Iztīrītais saturs)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilais saturs)',
     'pages_edit_switch_to_wysiwyg' => 'Pārslēgties uz WYSIWYG redaktoru',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Pievienot izmaiņu aprakstu',
     'pages_edit_enter_changelog_desc' => 'Ievadi nelielu aprakstu par vaiktajām izmaiņām',
     'pages_edit_enter_changelog' => 'Izmaiņu apraksts',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 192676f35a7..e705da6a02b 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Jūs nevarat dzēst vienīgo administratoru',
     'users_cannot_delete_guest' => 'Jūs nevarat dzēst lietotāju "viesis"',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Šo lomu nevar rediģēt',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index 895d9a89809..a94b45b3e42 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Katalāņu',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 64edee2f8c2..0e9e19b6e59 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Personvernregler',
     'terms_of_service' => 'Bruksvilkår',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index e15bb073dc6..a28f15fa660 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Renset innhold)',
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi en kort beskrivelse av endringene dine',
     'pages_edit_enter_changelog' => 'Se endringslogg',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 7b7f6e8a930..379483626c0 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan ikke slette den eneste administratoren',
     'users_cannot_delete_guest' => 'Du kan ikke slette gjestebrukeren (Du kan deaktivere offentlig visning istede)',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Denne rollen kan ikke endres',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index e426eca4ac3..539dc1902cd 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 210033298c0..844fe91d1af 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privacybeleid',
     'terms_of_service' => 'Algemene voorwaarden',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 69cefd233ec..9daec1c1fc4 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Opgeschoonde Inhoud)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiele Inhoud)',
     'pages_edit_switch_to_wysiwyg' => 'Schakel naar de WYSIWYG Bewerker',
+    'pages_edit_switch_to_new_wysiwyg' => 'Schakel naar de nieuwe WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alfa-testfase)',
     'pages_edit_set_changelog' => 'Logboek instellen',
     'pages_edit_enter_changelog_desc' => 'Geef een korte omschrijving van de wijzigingen die je gemaakt hebt',
     'pages_edit_enter_changelog' => 'Voeg toe aan logboek',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 896b7a71d09..a6ec53883ea 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Je kunt niet het enige admin account verwijderen',
     'users_cannot_delete_guest' => 'Je kunt het gastaccount niet verwijderen',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Deze rol kan niet bewerkt worden',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index a7d6fde9b18..3f997c404bc 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski (Bosnisch)',
         'ca' => 'Català (Catalaans)',
         'cs' => 'Česky (Tsjechisch)',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk (Deens)',
         'de' => 'Deutsch (Duits)',
         'de_informal' => 'Deutsch (Du) (Informeel Duits)',
diff --git a/lang/nn/common.php b/lang/nn/common.php
index 6155c9b6e70..3d623dbc492 100644
--- a/lang/nn/common.php
+++ b/lang/nn/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Personvernreglar',
     'terms_of_service' => 'Bruksvilkår',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 12764034828..790c6ec97b8 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Renset innhold)',
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi ei kort skildring av endringane dine',
     'pages_edit_enter_changelog' => 'Sjå endringslogg',
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index be1823db0ba..7be55a09177 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan ikke kaste ut den eneste administratoren',
     'users_cannot_delete_guest' => 'Du kan ikke slette gjestebrukeren (Du kan deaktivere offentlig visning istede)',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Denne rollen kan ikke endres',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index df5399f90e1..9eefaf3bb7e 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/pl/common.php b/lang/pl/common.php
index e3feb2f02e4..4d5a346b2b5 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Polityka prywatności',
     'terms_of_service' => 'Warunki usługi',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index b99de72be0f..0941a1fb992 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Czysta zawartość)',
     'pages_edit_switch_to_markdown_stable' => '(Statyczna zawartość)',
     'pages_edit_switch_to_wysiwyg' => 'Przełącz na edytor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Ustaw dziennik zmian',
     'pages_edit_enter_changelog_desc' => 'Opisz zmiany, które zostały wprowadzone',
     'pages_edit_enter_changelog' => 'Wyświetl dziennik zmian',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index 89e4349a590..5fb78a98334 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nie możesz usunąć jedynego administratora',
     'users_cannot_delete_guest' => 'Nie możesz usunąć użytkownika-gościa',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ta rola nie może być edytowana',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 89bbba37714..77c25ffa93a 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Kataloński',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/pt/common.php b/lang/pt/common.php
index 59abaea5c57..3e005700245 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Política de Privacidade',
     'terms_of_service' => 'Termos de Utilização',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index 4e2f8824ad3..792f80056d0 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Conteúdo Limitado)',
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por si',
     'pages_edit_enter_changelog' => 'Inserir Alterações',
diff --git a/lang/pt/errors.php b/lang/pt/errors.php
index b695caf9618..bed2bf5b779 100644
--- a/lang/pt/errors.php
+++ b/lang/pt/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Não pode excluir o único administrador',
     'users_cannot_delete_guest' => 'Não pode excluir o usuário convidado',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Este cargo não pode ser editado',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index 7a25d635ef4..8664884c0d5 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Catalão',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 88bb6de249f..f5e6d230d43 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -5,27 +5,32 @@
 return [
 
     // Buttons
-    'cancel' => 'Cancelar',
-    'close' => 'Fechar',
-    'confirm' => 'Confirmar',
-    'back' => 'Voltar',
-    'save' => 'Salvar',
-    'continue' => 'Continuar',
-    'select' => 'Selecionar',
-    'toggle_all' => 'Alternar Todos',
-    'more' => 'Mais',
+    'cancel' => 'Cancela',
+    'close' => 'Fecha',
+    'confirm' => 'Confirma',
+    'back' => 'Volta',
+    'save' => 'Salva',
+    'continue' => 'Continua',
+    'select' => 'Seleciona',
+    'toggle_all' => 'Alternar Tudo',
+    'more' => 'Mais
+',
 
     // Form Labels
-    'name' => 'Nome',
-    'description' => 'Descrição',
-    'role' => 'Cargo',
-    'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'Esta imagem deve ter aproximadamente 440x250px, embora seja dimensionada e cortada de forma flexível para se ajustar à interface do usuário em diferentes cenários, conforme necessário, portanto, as dimensões reais para exibição serão diferentes.',
+    'name' => 'Nome
+',
+    'description' => 'Descrição
+',
+    'role' => 'Função',
+    'cover_image' => 'Imagem da capa',
+    'cover_image_description' => 'Esta imagem deve ter cerca de 440x250px, embora seja dimensionada e cortada de forma flexível para se ajustar à "interface" do usuário em diferentes cenários, conforme necessário, portanto, as dimensões reais para exibição serão diferentes.',
 
     // Actions
-    'actions' => 'Ações',
+    'actions' => 'Ações
+',
     'view' => 'Visualizar',
-    'view_all' => 'Visualizar Tudo',
+    'view_all' => 'Visualizar Tudo
+',
     'new' => 'Novo',
     'create' => 'Criar',
     'update' => 'Atualizar',
@@ -44,13 +49,13 @@
     'configure' => 'Configurar',
     'manage' => 'Administrar',
     'fullscreen' => 'Tela cheia',
-    'favourite' => 'Favoritos',
+    'favourite' => 'Favorito',
     'unfavourite' => 'Remover dos Favoritos',
     'next' => 'Seguinte',
     'previous' => 'Anterior',
     'filter_active' => 'Filtro Ativo:',
     'filter_clear' => 'Limpar Filtro',
-    'download' => 'Baixar',
+    'download' => 'Baixar ',
     'open_in_tab' => 'Abrir na aba',
     'open' => 'Abrir',
 
@@ -107,4 +112,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Políticas de Privacidade',
     'terms_of_service' => 'Termos de Serviço',
+
+    // OpenSearch
+    'opensearch_description' => 'Procurar: nome do aplicativo',
 ];
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index c54d9eed938..80ca8e9a310 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -65,7 +65,7 @@
     'insert_link' => 'Inserir/editar link',
     'insert_link_title' => 'Inserir/Editar link',
     'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Inserir o bloco de endereço',
+    'insert_code_block' => 'Inserir/editar bloco de código',
     'edit_code_block' => 'Editar bloco de código',
     'insert_drawing' => 'Inserir/editar desenho',
     'drawing_manager' => 'Gerente de desenho',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index f4c43a415f0..41d4516b900 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Conteúdo Limpo)',
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o Editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por você',
     'pages_edit_enter_changelog' => 'Insira Alterações',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index 8946e851cba..3fa7d44c7de 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -5,68 +5,69 @@
 return [
 
     // Permissions
-    'permission' => 'Você não tem permissão para acessar a página requerida.',
-    'permissionJson' => 'Você não tem permissão para realizar a ação requerida.',
+    'permission' => 'Você não tem permissão para acessar a página solicitada.',
+    'permissionJson' => 'Você não tem permissão para realizar a ação solicitada.',
 
     // Auth
-    'error_user_exists_different_creds' => 'Um usuário com o e-mail :email já existe mas com credenciais diferentes.',
-    'auth_pre_register_theme_prevention' => 'A conta do usuário não pôde ser registrada com os detalhes fornecidos',
-    'email_already_confirmed' => 'E-mail já foi confirmado. Tente efetuar o login.',
-    'email_confirmation_invalid' => 'Esse token de confirmação não é válido ou já foi utilizado. Por favor, tente cadastrar-se novamente.',
-    'email_confirmation_expired' => 'O token de confirmação já expirou. Um novo e-mail foi enviado.',
-    'email_confirmation_awaiting' => 'O endereço de e-mail da conta em uso precisa ser confirmado',
+    'error_user_exists_different_creds' => 'Um usuário com o endereço eletrônico: endereço eletrônico já existe, mas com credenciais diferentes.',
+    'auth_pre_register_theme_prevention' => 'A conta do usuário não pôde ser registrada com os detalhes oferecidos',
+    'email_already_confirmed' => 'Endereço eletrônico já foi confirmado. Tente fazer o ‘login’.',
+    'email_confirmation_invalid' => 'Esse código de confirmação não é válido ou já foi utilizado. Por favor, tente cadastrar-se novamente.',
+    'email_confirmation_expired' => 'O código de confirmação já expirou. Uma nova mensagem eletrônica foi enviada.',
+    'email_confirmation_awaiting' => 'O endereço do correio eletrônico da conta em uso precisa ser confirmado',
     'ldap_fail_anonymous' => 'O acesso LDAP falhou ao tentar usar o anonymous bind',
     'ldap_fail_authed' => 'O acesso LDAP falhou ao tentar os detalhes do dn e senha fornecidos',
-    'ldap_extension_not_installed' => 'A extensão LDAP PHP não está instalada',
+    'ldap_extension_not_installed' => 'A extensão LDAP PHP não foi instalada',
     'ldap_cannot_connect' => 'Não foi possível conectar ao servidor LDAP. Conexão inicial falhou',
-    'saml_already_logged_in' => 'Login já efetuado',
-    'saml_no_email_address' => 'Não foi possível encontrar um endereço de e-mail para este usuário nos dados providos pelo sistema de autenticação externa',
-    'saml_invalid_response_id' => 'A requisição do sistema de autenticação externa não foi reconhecia por um processo iniciado por esta aplicação. Após o login, navegar para o caminho anterior pode causar um problema.',
-    'saml_fail_authed' => 'Login utilizando :system falhou. Sistema não forneceu autorização bem sucedida',
-    'oidc_already_logged_in' => 'Já está logado',
-    'oidc_no_email_address' => 'Não foi possível encontrar um endereço de e-mail para este usuário, nos dados fornecidos pelo sistema de autenticação externa',
-    'oidc_fail_authed' => 'Login usando :system falhou, o sistema não forneceu autorização com sucesso',
+    'saml_already_logged_in' => '\'Login\' já efetuado',
+    'saml_no_email_address' => 'Não foi possível encontrar um endereço de mensagem eletrônica para este usuário nos dados providos pelo sistema de autenticação externa',
+    'saml_invalid_response_id' => 'A requisição do sistema de autenticação externa não foi reconhecida por um processo iniciado por esta aplicação. Após o \'login\', navegar para o caminho anterior pode causar um problema.',
+    'saml_fail_authed' => '\'Login\' utilizando :sistema falhou. Sistema não forneceu autorização bem sucedida',
+    'oidc_already_logged_in' => '\'Login\' já efetuado',
+    'oidc_no_email_address' => 'Não foi possível encontrar um endereço de mensagem eletrônica para este usuário, nos dados fornecidos pelo sistema de autenticação externa',
+    'oidc_fail_authed' => '\'Login\' usando: sistema falhou, o sistema não forneceu autorização com sucesso',
     'social_no_action_defined' => 'Nenhuma ação definida',
-    'social_login_bad_response' => "Erro recebido durante o login :socialAccount: \n:error",
-    'social_account_in_use' => 'Essa conta :socialAccount já está em uso. Por favor, tente entrar utilizando a opção :socialAccount.',
-    'social_account_email_in_use' => 'O e-mail :email já está em uso. Se você já tem uma conta você poderá se conectar a conta :socialAccount a partir das configurações de seu perfil.',
-    'social_account_existing' => 'Essa conta :socialAccount já está vinculada a esse perfil.',
-    'social_account_already_used_existing' => 'Essa conta :socialAccount já está sendo utilizada por outro usuário.',
-    'social_account_not_used' => 'Essa conta :socialAccount não está vinculada a nenhum usuário. Por favor vincule a conta nas suas configurações de perfil. ',
-    'social_account_register_instructions' => 'Se você não tem uma conta, você poderá se cadastrar usando a opção :socialAccount.',
+    'social_login_bad_response' => "Erro recebido durante o 'login' :socialAccount: \n: error",
+    'social_account_in_use' => 'Essa conta: conta social já está em uso. Por favor, tente entrar utilizando a opção :conta social.',
+    'social_account_email_in_use' => 'O endereço eletrônico: endereço eletrônico já está em uso. Se você já tem uma conta você poderá se conectar a conta social a partir das configurações de seu perfil.',
+    'social_account_existing' => 'Essa conta: conta social já está vinculada a esse perfil.',
+    'social_account_already_used_existing' => 'Essa conta: conta social já está sendo utilizada por outro usuário.',
+    'social_account_not_used' => 'Essa conta: conta social não está vinculada a nenhum usuário. Por favor, vincule a conta nas suas configurações de perfil. ',
+    'social_account_register_instructions' => 'Se você não tem uma conta, você poderá se cadastrar usando a opção: conta social.',
     'social_driver_not_found' => 'Social driver não encontrado',
-    'social_driver_not_configured' => 'Seus parâmetros socials de :socialAccount não estão configurados corretamente.',
-    'invite_token_expired' => 'Esse link de convite expirou. Alternativamente, você pode tentar redefinir a senha da sua conta.',
+    'social_driver_not_configured' => 'Seus parâmetros sociais de: conta social não estão configurados corretamente.',
+    'invite_token_expired' => 'Este link de convite expirou. Alternativamente, você pode tentar redefinir a senha da sua conta.',
     'login_user_not_found' => 'Não foi possível encontrar um usuário para esta ação.',
 
     // System
-    'path_not_writable' => 'O caminho de destino (:filePath) de upload de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
-    'cannot_get_image_from_url' => 'Não foi possível obter a imagem a partir de :url',
+    'path_not_writable' => 'O caminho de destino de ‘upload’ de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
+    'cannot_get_image_from_url' => 'Não foi possível obter a imagem a partir de: URL',
     'cannot_create_thumbs' => 'O servidor não pôde criar as miniaturas de imagem. Por favor, verifique se a extensão GD PHP está instalada.',
-    'server_upload_limit' => 'O servidor não permite o upload de arquivos com esse tamanho. Por favor, tente fazer o upload de arquivos de menor tamanho.',
+    'server_upload_limit' => 'O servidor não permite o ‘upload’ de arquivos com esse tamanho. Por favor, tente um tamanho de arquivo menor.',
     'server_post_limit' => 'O servidor não pode receber a quantidade de dados fornecida. Tente novamente com menos dados ou um arquivo menor.',
-    'uploaded'  => 'O servidor não permite o upload de arquivos com esse tamanho. Por favor, tente fazer o upload de arquivos de menor tamanho.',
+    'uploaded'  => 'O servidor não permite o ‘upload’ de arquivos com esse tamanho. Por favor, tente fazer o ‘upload’ de arquivos de menor tamanho.',
 
     // Drawing & Images
-    'image_upload_error' => 'Um erro aconteceu enquanto o servidor tentava efetuar o upload da imagem',
-    'image_upload_type_error' => 'O tipo de imagem que está sendo enviada é inválido',
-    'image_upload_replace_type' => 'Substituições de arquivos de imagem devem ser do mesmo tipo',
-    'image_upload_memory_limit' => 'Falha ao processar o upload de imagem e/ou criar miniaturas devido a limites de recursos do sistema.',
-    'image_thumbnail_memory_limit' => 'Falha ao criar variações de tamanho da imagem devido a limites de recursos do sistema.',
-    'image_gallery_thumbnail_memory_limit' => 'Falha ao criar miniaturas da galeria devido a limites de recursos do sistema.',
-    'drawing_data_not_found' => 'Dados de desenho não puderam ser carregados. Talvez o arquivo de desenho não exista mais ou você não tenha permissão para acessá-lo.',
+    'image_upload_error' => 'Um erro ocorreu enquanto o servidor tentava efetuar o ‘upload’ da imagem',
+    'image_upload_type_error' => 'A categoria de imagem que está sendo enviada é inválida',
+    'image_upload_replace_type' => 'As substituições de arquivos de imagem devem ser do mesmo tipo',
+    'image_upload_memory_limit' => 'Falha ao processar o ‘upload’ de imagem e/ou criar miniaturas devido a limites de recursos do sistema.',
+    'image_thumbnail_memory_limit' => 'Falha ao criar variações de tamanho de imagem devido a limites de recursos do sistema.',
+    'image_gallery_thumbnail_memory_limit' => 'Falha ao criar miniaturas da galeria devido aos limites de recursos do sistema.',
+    'drawing_data_not_found' => 'Dados de desenho não puderam ser carregados. O arquivo de desenho pode não existir mais ou você não tenha permissão para acessá-lo.',
 
     // Attachments
-    'attachment_not_found' => 'Anexo não encontrado',
-    'attachment_upload_error' => 'Um erro ocorreu ao efetuar o upload do arquivo anexado',
+    'attachment_not_found' => 'Documento não encontrado',
+    'attachment_upload_error' => 'Um erro ocorreu ao efetuar o ‘upload’ do arquivo anexado',
 
     // Pages
-    'page_draft_autosave_fail' => 'Falha ao tentar salvar o rascunho. Certifique-se que a conexão de internet está funcional antes de tentar salvar essa página',
+    'page_draft_autosave_fail' => 'Falha ao tentar salvar o rascunho. Certifique-se de ter conexão de ‘internet’ antes de tentar salvar essa página',
     'page_draft_delete_fail' => 'Falha ao excluir o rascunho da página e buscar conteúdo salvo na página atual',
-    'page_custom_home_deletion' => 'Não é possível excluir uma página que está definida como página inicial',
+    'page_custom_home_deletion' => 'Não é possível deletar uma página definida como página inicial',
 
     // Entities
-    'entity_not_found' => 'Entidade não encontrada',
+    'entity_not_found' => 'Entidade não encontrada
+',
     'bookshelf_not_found' => 'Prateleira não encontrada',
     'book_not_found' => 'Livro não encontrado',
     'page_not_found' => 'Página não encontrada',
@@ -76,19 +77,20 @@
     'guests_cannot_save_drafts' => 'Convidados não podem salvar rascunhos',
 
     // Users
-    'users_cannot_delete_only_admin' => 'Você não pode excluir o único admin',
+    'users_cannot_delete_only_admin' => 'Você não pode excluir o único administrador',
     'users_cannot_delete_guest' => 'Você não pode excluir o usuário convidado',
+    'users_could_not_send_invite' => 'Não foi possível criar o usuário porque o endereço eletrônico de convite não foi enviado',
 
     // Roles
-    'role_cannot_be_edited' => 'Esse cargo não pode ser editado',
-    'role_system_cannot_be_deleted' => 'Esse cargo é um cargo do sistema e não pode ser excluído',
-    'role_registration_default_cannot_delete' => 'Esse cargo não poderá se excluído enquanto estiver registrado como o cargo padrão',
-    'role_cannot_remove_only_admin' => 'Este usuário é o único usuário vinculado ao cargo de administrador. Atribua o cargo de administrador a outro usuário antes de tentar removê-lo aqui.',
+    'role_cannot_be_edited' => 'Essa função não pode ser editada',
+    'role_system_cannot_be_deleted' => 'Essa é uma função do sistema e não pode ser excluída',
+    'role_registration_default_cannot_delete' => 'Essa função não poderá se excluída enquanto estiver registrada como função de registro padrão',
+    'role_cannot_remove_only_admin' => 'Este usuário é o único vinculado ao cargo de administrador. Atribua o cargo de administrador a outro usuário antes de tentar removê-lo aqui.',
 
     // Comments
     'comment_list' => 'Ocorreu um erro ao buscar os comentários.',
     'cannot_add_comment_to_draft' => 'Você não pode adicionar comentários a um rascunho.',
-    'comment_add' => 'Ocorreu um erro ao adicionar o comentário.',
+    'comment_add' => 'Ocorreu um erro ao adicionar / atualizar o comentário.',
     'comment_delete' => 'Ocorreu um erro ao excluir o comentário.',
     'empty_comment' => 'Não é possível adicionar um comentário vazio.',
 
@@ -101,20 +103,20 @@
     'image_not_found_details' => 'Se você esperava que esta imagem existisse, ela pode ter sido excluída.',
     'return_home' => 'Retornar à página inicial',
     'error_occurred' => 'Ocorreu um Erro',
-    'app_down' => ':appName está fora do ar no momento',
-    'back_soon' => 'Voltaremos em breve.',
+    'app_down' => 'Agora está baixo',
+    'back_soon' => 'Vai estar de volta em breve.',
 
     // API errors
-    'api_no_authorization_found' => 'Nenhum token de autorização encontrado na requisição',
-    'api_bad_authorization_format' => 'Um token de autorização foi encontrado na requisição, mas o formato parece incorreto',
-    'api_user_token_not_found' => 'Nenhum token de API correspondente foi encontrado para o token de autorização fornecido',
-    'api_incorrect_token_secret' => 'O segredo fornecido para o token de API usado está incorreto',
-    'api_user_no_api_permission' => 'O proprietário do token de API utilizado não tem permissão para fazer requisições de API',
-    'api_user_token_expired' => 'O token de autenticação expirou',
+    'api_no_authorization_found' => 'Nenhum código de autorização encontrado na requisição',
+    'api_bad_authorization_format' => 'Um código de autorização foi encontrado na requisição, mas o formato parece incorreto',
+    'api_user_token_not_found' => 'Nenhum código de API correspondente foi encontrado para o código de autorização fornecido',
+    'api_incorrect_token_secret' => 'O segredo fornecido para o código de API usado está incorreto',
+    'api_user_no_api_permission' => 'O proprietário do código de API utilizado não tem permissão para fazer requisições de API',
+    'api_user_token_expired' => 'O código de autenticação expirou',
 
     // Settings & Maintenance
-    'maintenance_test_email_failure' => 'Erro encontrado ao enviar um e-mail de teste:',
+    'maintenance_test_email_failure' => 'Erro encontrado ao enviar uma mensagem eletrônica de teste:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'A URL não corresponde aos hosts SSR configurados como permitidos',
+    'http_ssr_url_no_match' => 'A \'URL\' não corresponde aos anfitriões SSR configurados como permitidos ',
 ];
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 3e5341e4193..881604d4d71 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ro/common.php b/lang/ro/common.php
index 767f10955b7..1de631183f6 100644
--- a/lang/ro/common.php
+++ b/lang/ro/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Politică de confidențialitate',
     'terms_of_service' => 'Termeni și condiții',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index 6faf3043526..676562f465c 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Curăță conținut)',
     'pages_edit_switch_to_markdown_stable' => '(Conținut stabil)',
     'pages_edit_switch_to_wysiwyg' => 'Comută la editorul WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Setare jurnal modificări',
     'pages_edit_enter_changelog_desc' => 'Adaugă o scurtă descriere a modificărilor făcute',
     'pages_edit_enter_changelog' => 'Intră în jurnalul de modificări',
diff --git a/lang/ro/errors.php b/lang/ro/errors.php
index 71e994be05b..0989f797c01 100644
--- a/lang/ro/errors.php
+++ b/lang/ro/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nu poți șterge singurul administrator',
     'users_cannot_delete_guest' => 'Nu se poate șterge utilizatorul "Vizitator"',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Acest rol nu poate fi editat',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index 32954a8eabd..338f4920036 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/ru/common.php b/lang/ru/common.php
index 26b725ebc38..d3860bba461 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Политика конфиденциальности',
     'terms_of_service' => 'Условия использования',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index c18c00e795c..5de25a50deb 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => 'Только Markdown (с возможными потерями форматирования)',
     'pages_edit_switch_to_markdown_stable' => 'Полное сохранение форматирования (HTML)',
     'pages_edit_switch_to_wysiwyg' => 'Переключиться в WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Задать список изменений',
     'pages_edit_enter_changelog_desc' => 'Введите краткое описание внесенных изменений',
     'pages_edit_enter_changelog' => 'Введите список изменений',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index a234bd9c9cc..033a64840b8 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Вы не можете удалить единственного администратора',
     'users_cannot_delete_guest' => 'Вы не можете удалить гостевого пользователя',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Эта роль не может быть изменена',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 238a1da6ba4..4357cbddf38 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/sk/common.php b/lang/sk/common.php
index e2ef66af5e9..12828d6c2e5 100644
--- a/lang/sk/common.php
+++ b/lang/sk/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Zásady ochrany osobných údajov',
     'terms_of_service' => 'Podmienky používania',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 2842c90968b..b296f4f6778 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Vyčistiť obsah)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilný obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Prepnite na WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Nastaviť záznam zmien',
     'pages_edit_enter_changelog_desc' => 'Zadajte krátky popis zmien, ktoré ste urobili',
     'pages_edit_enter_changelog' => 'Zadať záznam zmien',
diff --git a/lang/sk/errors.php b/lang/sk/errors.php
index ae9575ca517..036f2b2d415 100644
--- a/lang/sk/errors.php
+++ b/lang/sk/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nemôžete zmazať posledného správcu',
     'users_cannot_delete_guest' => 'Nemôžete zmazať hosťa',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Táto rola nemôže byť upravovaná',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index d2190f851b0..40b256229a5 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/sl/common.php b/lang/sl/common.php
index f48b7f53337..4bad22048c6 100644
--- a/lang/sl/common.php
+++ b/lang/sl/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Pravilnik o zasebnosti',
     'terms_of_service' => 'Pogoji uporabe',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index 69e4e27e8dd..be58595cfe8 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Opiši spremembe na dokumentu',
     'pages_edit_enter_changelog_desc' => 'Vnesite kratek opis sprememb, ki ste jih naredili',
     'pages_edit_enter_changelog' => 'Vpišite vsebino sprememb',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index 6da88f14984..7269b755531 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ne morete odstraniti edinega administratorja',
     'users_cannot_delete_guest' => 'Ne morete odstraniti uporabnika gost',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Te vloge mi možno urejati',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 72a45a14b36..7de5f24e7a8 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -296,6 +296,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'danščina',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/sq/common.php b/lang/sq/common.php
index 266174eed9d..b05169bb2c4 100644
--- a/lang/sq/common.php
+++ b/lang/sq/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Privacy Policy',
     'terms_of_service' => 'Terms of Service',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index 9e620b24ed1..35e6f050bb8 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/lang/sq/errors.php b/lang/sq/errors.php
index 752eb5672f1..9c40aa9ed33 100644
--- a/lang/sq/errors.php
+++ b/lang/sq/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
     'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'This role cannot be edited',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index f4c84092c6f..5427cb9419e 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/sr/common.php b/lang/sr/common.php
index 3ef27e2962e..3eaf4fb50cf 100644
--- a/lang/sr/common.php
+++ b/lang/sr/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Правила о приватности',
     'terms_of_service' => 'Услови коришћења',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 0666a58ead9..a6964a1032b 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
index 44df0307a48..acf0d5f3650 100644
--- a/lang/sr/errors.php
+++ b/lang/sr/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Не можете обрисати јединог администратора',
     'users_cannot_delete_guest' => 'Не можете обрисати госта',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Ова улога се не може мењати',
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index 3ae7d760783..e2460191383 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/sv/common.php b/lang/sv/common.php
index ae0aded6225..8fe80899f0e 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Integritetspolicy',
     'terms_of_service' => 'Användarvillkor',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 6023c6cd3b4..d01de6380c4 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Rent innehåll)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilt innehåll)',
     'pages_edit_switch_to_wysiwyg' => 'Växla till WYSIWYG-redigerare',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Beskriv dina ändringar',
     'pages_edit_enter_changelog_desc' => 'Ange en kort beskrivning av de ändringar du har gjort',
     'pages_edit_enter_changelog' => 'Ändringslogg',
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index 79147f6c669..d6049b20cb4 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan inte ta bort den enda admin-användaren',
     'users_cannot_delete_guest' => 'Du kan inte ta bort gästanvändaren',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Den här rollen kan inte redigeras',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index ef1ee584eb8..c9f00a34059 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Katalanska',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Danska',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index c2a40c50a6a..bfafba4a4f4 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -89,7 +89,7 @@
     'user_create_notification' => 'Kullanıcı başarıyla oluşturuldu',
     'user_update' => 'updated user',
     'user_update_notification' => 'Kullanıcı başarıyla güncellendi',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'kullanıcı silindi',
     'user_delete_notification' => 'Kullanıcı başarıyla silindi',
 
     // API Tokens
diff --git a/lang/tr/common.php b/lang/tr/common.php
index e7a161b6e60..3e416d37bfc 100644
--- a/lang/tr/common.php
+++ b/lang/tr/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Gizlilik Politikası',
     'terms_of_service' => 'Hizmet Şartları',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index 95c4b7b9406..ae60e8d07b8 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Temiz İçerik)',
     'pages_edit_switch_to_markdown_stable' => '(Kararlı İçerik)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG düzenleyiciye geç',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Değişim Günlüğünü Ayarla',
     'pages_edit_enter_changelog_desc' => 'Yaptığınız değişiklikler hakkında kısa bir açıklama girin',
     'pages_edit_enter_changelog' => 'Değişim Günlüğünü Yazın',
diff --git a/lang/tr/errors.php b/lang/tr/errors.php
index f693a05f379..7087aca4738 100644
--- a/lang/tr/errors.php
+++ b/lang/tr/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Tek olan yöneticiyi silemezsiniz',
     'users_cannot_delete_guest' => 'Misafir kullanıyıcıyı silemezsiniz',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Bu rol düzenlenemez',
diff --git a/lang/tr/notifications.php b/lang/tr/notifications.php
index 1afd23f1dc4..c26a90b32cb 100644
--- a/lang/tr/notifications.php
+++ b/lang/tr/notifications.php
@@ -6,7 +6,7 @@
 
     'new_comment_subject' => 'New comment on page: :pageName',
     'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
+    'new_page_subject' => 'Yeni sayfa :pageName',
     'new_page_intro' => 'A new page has been created in :appName:',
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 36c52e52aa8..8b38e7b955c 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Danca',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/uk/auth.php b/lang/uk/auth.php
index 412f9c03fed..27aae39367e 100644
--- a/lang/uk/auth.php
+++ b/lang/uk/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Мобільний додаток',
     'mfa_option_totp_desc' => 'Для використання багатофакторної автентифікації вам потрібен мобільний додаток, який підтримує TOTP такі як Google Authenticator, Authy або Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервні коди',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Генерує набір резервних кодів для використання одноразового використання, які ви вводите в систему, щоб перевірити свою особу. Переконайтеся, що зберігайте їх в безпечному та безпечному місці.',
     'mfa_gen_confirm_and_enable' => 'Підтвердити та увімкнути',
     'mfa_gen_backup_codes_title' => 'Налаштування резервних кодів',
     'mfa_gen_backup_codes_desc' => 'Зберігайте список кодів в безпечному місці. Для доступу до системи ви зможете використовувати один з кодів як другий механізм аутентифікації.',
diff --git a/lang/uk/common.php b/lang/uk/common.php
index 6e372914c2e..d384e392447 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Політика приватності',
     'terms_of_service' => 'Умови використання',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index f2af677683a..664c6ed1725 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Очистити вміст)',
     'pages_edit_switch_to_markdown_stable' => '(Стабілізувати вміст)',
     'pages_edit_switch_to_wysiwyg' => 'Змінити редактор на WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Встановити журнал змін',
     'pages_edit_enter_changelog_desc' => 'Введіть короткий опис внесених вами змін',
     'pages_edit_enter_changelog' => 'Введіть список змін',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 6320a67cbae..602df64f8f5 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Драйвер для СоціальноїМережі не знайдено',
     'social_driver_not_configured' => 'Ваші соціальні настройки :socialAccount не правильно налаштовані.',
     'invite_token_expired' => 'Термін дії цього запрошення закінчився. Замість цього ви можете спробувати скинути пароль свого облікового запису.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Користувач для цієї дії не знайдений.',
 
     // System
     'path_not_writable' => 'Не вдається завантажити шлях до файлу :filePath. Переконайтеся, що він доступний для запису на сервер.',
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ви не можете видалити єдиного адміністратора',
     'users_cannot_delete_guest' => 'Ви не можете видалити гостьового користувача',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Цю роль не можна редагувати',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index fb04a2930fe..e26a2a8b829 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/uz/common.php b/lang/uz/common.php
index 01b682f8000..fcbb2ea84a8 100644
--- a/lang/uz/common.php
+++ b/lang/uz/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Maxfiylik siyosati',
     'terms_of_service' => 'Xizmat ko‘rsatish shartlari',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index 3f5eb6de920..f0818207121 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Toza tarkib)',
     'pages_edit_switch_to_markdown_stable' => '(Barqaror tarkib)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG muharririga o\'ting',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'O\'zgarishlar jurnalini o\'rnating',
     'pages_edit_enter_changelog_desc' => 'Siz kiritgan o\'zgarishlarning qisqacha tavsifini kiriting',
     'pages_edit_enter_changelog' => 'O\'zgarishlar jurnaliga kiring',
diff --git a/lang/uz/errors.php b/lang/uz/errors.php
index d2d8a9c0b52..63a61ef844a 100644
--- a/lang/uz/errors.php
+++ b/lang/uz/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Siz yagona administratorni oʻchira olmaysiz',
     'users_cannot_delete_guest' => 'Siz mehmon foydalanuvchini oʻchira olmaysiz',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Bu rolni tahrirlab bo‘lmaydi',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index 0d7c0415bf7..4ce7c06094a 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Dansk',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/vi/common.php b/lang/vi/common.php
index d514fc74e73..16929a2fbae 100644
--- a/lang/vi/common.php
+++ b/lang/vi/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Chính Sách Quyền Riêng Tư',
     'terms_of_service' => 'Điều khoản Dịch vụ',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 6d8cb13b0cd..c726920eaff 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Đặt Changelog',
     'pages_edit_enter_changelog_desc' => 'Viết mô tả ngắn gọn cho các thay đổi mà bạn tạo',
     'pages_edit_enter_changelog' => 'Viết Changelog',
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index da58c57a947..a2a7d491b4a 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Bạn không thể xóa quản trị viên duy nhất',
     'users_cannot_delete_guest' => 'Bạn không thể xóa người dùng khách',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => 'Không thể chỉnh sửa quyền này',
diff --git a/lang/vi/notifications.php b/lang/vi/notifications.php
index 1afd23f1dc4..a18695b2347 100644
--- a/lang/vi/notifications.php
+++ b/lang/vi/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Bình luận mới trên trang: :pageName',
+    'new_comment_intro' => 'Một người dùng đã bình luận trên một trang tại :appName:',
+    'new_page_subject' => 'Trang mới: :pageName',
+    'new_page_intro' => 'Một trang mới đã được khởi tạo trong :appName:',
+    'updated_page_subject' => 'Trang đã cập nhật: :pageName',
+    'updated_page_intro' => 'Một trang mới đã được cập nhật trong :appName:',
+    'updated_page_debounce' => 'Để tránh việc nhận quá nhiều thông báo, trong một thời gian, bạn sẽ không nhận được thông báo về những chỉnh sửa tiếp theo cho trang này từ cùng một biên tập viên.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Tên Trang:',
+    'detail_page_path' => 'Đường dẫn trang:',
+    'detail_commenter' => 'Người bình luận:',
+    'detail_comment' => 'Bình luận:',
+    'detail_created_by' => 'Tạo bởi:',
+    'detail_updated_by' => 'Cập nhật bởi:',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => 'Xem bình luận',
+    'action_view_page' => 'Xem Trang',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Đây là thông báo được gửi tới bạn bởi vì :link bao gồm hoạt động cho mục này.',
+    'footer_reason_link' => 'ưu tiên thông báo của bạn',
 ];
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index a15128c2b11..63024cbd39a 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => 'Català',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => 'Đan Mạch',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/zh_CN/auth.php b/lang/zh_CN/auth.php
index 811d2aecc20..603dcc8b38f 100644
--- a/lang/zh_CN/auth.php
+++ b/lang/zh_CN/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => '移动设备 App',
     'mfa_option_totp_desc' => '要使用多重身份认证功能，您需要一个支持 TOTP（基于时间的一次性密码算法） 的移动设备 App，如谷歌身份验证器（Google Authenticator）、Authy 或微软身份验证器（Microsoft Authenticator）。',
     'mfa_option_backup_codes_title' => '备用认证码',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => '生成一组一次性使用的备份码，您将在登录时输入以验证您的身份。 请确保将它们存储在一个安全可靠的地方。',
     'mfa_gen_confirm_and_enable' => '确认并启用',
     'mfa_gen_backup_codes_title' => '备用认证码设置',
     'mfa_gen_backup_codes_desc' => '将下面的认证码存放在一个安全的地方。访问系统时，您可以使用其中的一个验证码进行二次认证。',
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index 05c0c0b9135..bc391354e69 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => '隐私政策',
     'terms_of_service' => '服务条款',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index f6a93c8811c..5083b263e6f 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '（整理内容）',
     'pages_edit_switch_to_markdown_stable' => '（保留内容）',
     'pages_edit_switch_to_wysiwyg' => '切换到所见即所得编辑器',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => '更新说明',
     'pages_edit_enter_changelog_desc' => '输入对您所做更改的简要说明',
     'pages_edit_enter_changelog' => '输入更新说明',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index b0f90611fa4..b51be47c106 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '您不能删除唯一的管理员账户',
     'users_cannot_delete_guest' => '您不能删除访客用户',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => '无法编辑该角色',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index f5fcacdf15d..4eae4a98dfa 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -295,6 +295,7 @@
         'bs' => 'Bosanski',
         'ca' => '加泰罗尼亚语',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => '丹麦',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 1532d69dda8..8b003a7303b 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -107,4 +107,7 @@
     // Not directly used but available for convenience to users.
     'privacy_policy' => '隱私權政策',
     'terms_of_service' => '服務條款',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
 ];
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 8aa9255c511..2f96bea2e56 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -224,6 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(清除內容)',
     'pages_edit_switch_to_markdown_stable' => '(保留內容)',
     'pages_edit_switch_to_wysiwyg' => '切換到所見即所得編輯器',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => '設定變更日誌',
     'pages_edit_enter_changelog_desc' => '輸入對您所做變動的簡易描述',
     'pages_edit_enter_changelog' => '輸入變更日誌',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 6fec01ea0d4..172c8ad0f82 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -78,6 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '您不能刪除唯一的管理員帳號',
     'users_cannot_delete_guest' => '您不能刪除訪客使用者',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
 
     // Roles
     'role_cannot_be_edited' => '無法編輯這個角色',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index acfbe334d7b..9c893f1fae0 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -296,6 +296,7 @@
         'bs' => 'Bosanski',
         'ca' => '加泰隆尼亞語',
         'cs' => 'Česky',
+        'cy' => 'Cymraeg',
         'da' => '丹麥',
         'de' => 'Deutsch (Sie)',
         'de_informal' => 'Deutsch (Du)',

From a58102d6efe9c0c990e052cbd7acb6f2859c2013 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 9 Oct 2024 10:26:07 +0100
Subject: [PATCH 313/666] Attribution: Updated translator & license files
 before v24.10

---
 .github/translators.txt                | 20 +++++++++++++++-
 dev/licensing/php-library-licenses.txt | 32 +++++++++++++-------------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 46e2edfd4c5..d0ab518ebdc 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -141,7 +141,7 @@ Kauê Sena (kaue.sena.ks) :: Portuguese, Brazilian
 MatthieuParis :: French
 Douradinho :: Portuguese, Brazilian; Portuguese
 Gaku Yaguchi (tama11) :: Japanese
-johnroyer :: Chinese Traditional
+Zero Huang (johnroyer) :: Chinese Traditional
 jackaaa :: Chinese Traditional
 Irfan Hukama Arsyad (IrfanArsyad) :: Indonesian
 Jeff Huang (s8321414) :: Chinese Traditional
@@ -431,3 +431,21 @@ Michal Melich (michalmelich) :: Czech
 David (david-prv) :: German; German Informal
 Larry (lahoje) :: Swedish
 Marcia dos Santos (marciab80) :: Portuguese
+Ricard López Torres (richilpez.torres) :: Catalan
+sarahalves7 :: Portuguese, Brazilian
+petr.husak :: Czech
+javadataherian :: Persian
+Ludo-code :: French
+hollsten :: Swedish
+Ngoc Lan Phung (lanpncz) :: Vietnamese
+Worive :: Catalan
+Илья Скаба (skabailya) :: Russian
+Irjan Olsen (Irch) :: Norwegian Bokmal
+Aleksandar Jovanovic (jovanoviczaleksandar) :: Serbian (Cyrillic)
+Red (RedVortex) :: Hebrew
+xgrug :: Chinese Simplified
+HrCalmar :: Danish
+Avishay Rapp (AvishayRapp) :: Hebrew
+matthias4217 :: French
+Berke BOYLU2 (berkeboylu2) :: Turkish
+etwas7B :: German
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 0a0321e2cac..8507cb4cb61 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -96,6 +96,22 @@ Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 Source: https://github.com/dompdf/dompdf.git
 Link: https://github.com/dompdf/dompdf
 -----------
+dompdf/php-font-lib
+License: LGPL-2.1-or-later
+License File: vendor/dompdf/php-font-lib/LICENSE
+Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+Source: https://github.com/dompdf/php-font-lib.git
+Link: https://github.com/dompdf/php-font-lib
+-----------
+dompdf/php-svg-lib
+License: LGPL-3.0-or-later
+License File: vendor/dompdf/php-svg-lib/LICENSE
+Copyright: Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+Source: https://github.com/dompdf/php-svg-lib.git
+Link: https://github.com/dompdf/php-svg-lib
+-----------
 dragonmantank/cron-expression
 License: MIT
 License File: vendor/dragonmantank/cron-expression/LICENSE
@@ -375,22 +391,6 @@ Copyright: Copyright (c) 2015 Paragon Initiative Enterprises
 Source: https://github.com/paragonie/random_compat.git
 Link: https://github.com/paragonie/random_compat.git
 -----------
-phenx/php-font-lib
-License: LGPL-2.1-or-later
-License File: vendor/phenx/php-font-lib/LICENSE
-Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-Source: https://github.com/dompdf/php-font-lib.git
-Link: https://github.com/PhenX/php-font-lib
------------
-phenx/php-svg-lib
-License: LGPL-3.0-or-later
-License File: vendor/phenx/php-svg-lib/LICENSE
-Copyright: Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-Source: https://github.com/dompdf/php-svg-lib.git
-Link: https://github.com/PhenX/php-svg-lib
------------
 phpoption/phpoption
 License: Apache-2.0
 License File: vendor/phpoption/phpoption/LICENSE

From 2e8d6ce7d9aad7569cd8bfbdd1126c869a78d379 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 10 Oct 2024 12:03:24 +0100
Subject: [PATCH 314/666] TS: Coverted util service

---
 resources/js/components/add-remove-rows.js    |  2 +-
 resources/js/components/auto-suggest.js       |  2 +-
 resources/js/components/dropdown-search.js    |  2 +-
 resources/js/components/global-search.js      |  2 +-
 resources/js/components/page-display.js       |  2 +-
 resources/js/components/page-editor.js        |  2 +-
 resources/js/markdown/codemirror.js           |  2 +-
 resources/js/services/{util.js => util.ts}    | 54 +++++++++----------
 resources/js/wysiwyg-tinymce/plugin-drawio.js |  2 +-
 9 files changed, 32 insertions(+), 38 deletions(-)
 rename resources/js/services/{util.js => util.ts} (67%)

diff --git a/resources/js/components/add-remove-rows.js b/resources/js/components/add-remove-rows.js
index 3213c4835aa..488654279b4 100644
--- a/resources/js/components/add-remove-rows.js
+++ b/resources/js/components/add-remove-rows.js
@@ -1,5 +1,5 @@
 import {onChildEvent} from '../services/dom';
-import {uniqueId} from '../services/util';
+import {uniqueId} from '../services/util.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/auto-suggest.js b/resources/js/components/auto-suggest.js
index 2eede241c69..07711312f1d 100644
--- a/resources/js/components/auto-suggest.js
+++ b/resources/js/components/auto-suggest.js
@@ -1,4 +1,4 @@
-import {escapeHtml} from '../services/util';
+import {escapeHtml} from '../services/util.ts';
 import {onChildEvent} from '../services/dom';
 import {Component} from './component';
 import {KeyboardNavigationHandler} from '../services/keyboard-navigation';
diff --git a/resources/js/components/dropdown-search.js b/resources/js/components/dropdown-search.js
index 2344619f5e9..787e11c875d 100644
--- a/resources/js/components/dropdown-search.js
+++ b/resources/js/components/dropdown-search.js
@@ -1,4 +1,4 @@
-import {debounce} from '../services/util';
+import {debounce} from '../services/util.ts';
 import {transitionHeight} from '../services/animations';
 import {Component} from './component';
 
diff --git a/resources/js/components/global-search.js b/resources/js/components/global-search.js
index 798bd7aacb0..44c0d02f9d4 100644
--- a/resources/js/components/global-search.js
+++ b/resources/js/components/global-search.js
@@ -1,5 +1,5 @@
 import {htmlToDom} from '../services/dom';
-import {debounce} from '../services/util';
+import {debounce} from '../services/util.ts';
 import {KeyboardNavigationHandler} from '../services/keyboard-navigation';
 import {Component} from './component';
 
diff --git a/resources/js/components/page-display.js b/resources/js/components/page-display.js
index 1e13ae38800..ff9d68c7a5a 100644
--- a/resources/js/components/page-display.js
+++ b/resources/js/components/page-display.js
@@ -1,5 +1,5 @@
 import * as DOM from '../services/dom';
-import {scrollAndHighlightElement} from '../services/util';
+import {scrollAndHighlightElement} from '../services/util.ts';
 import {Component} from './component';
 
 function toggleAnchorHighlighting(elementId, shouldHighlight) {
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 2160675529b..9450444ca41 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -1,5 +1,5 @@
 import {onSelect} from '../services/dom';
-import {debounce} from '../services/util';
+import {debounce} from '../services/util.ts';
 import {Component} from './component';
 import {utcTimeStampToLocalTime} from '../services/dates.ts';
 
diff --git a/resources/js/markdown/codemirror.js b/resources/js/markdown/codemirror.js
index a6332cbb844..664767605b8 100644
--- a/resources/js/markdown/codemirror.js
+++ b/resources/js/markdown/codemirror.js
@@ -1,5 +1,5 @@
 import {provideKeyBindings} from './shortcuts';
-import {debounce} from '../services/util';
+import {debounce} from '../services/util.ts';
 import {Clipboard} from '../services/clipboard.ts';
 
 /**
diff --git a/resources/js/services/util.js b/resources/js/services/util.ts
similarity index 67%
rename from resources/js/services/util.js
rename to resources/js/services/util.ts
index 1264d105860..7f684dd4247 100644
--- a/resources/js/services/util.js
+++ b/resources/js/services/util.ts
@@ -4,37 +4,39 @@
  * N milliseconds. If `immediate` is passed, trigger the function on the
  * leading edge, instead of the trailing.
  * @attribution https://davidwalsh.name/javascript-debounce-function
- * @param {Function} func
- * @param {Number} waitMs
- * @param {Boolean} immediate
- * @returns {Function}
  */
-export function debounce(func, waitMs, immediate) {
-    let timeout;
-    return function debouncedWrapper(...args) {
-        const context = this;
+export function debounce(func: Function, waitMs: number, immediate: boolean): Function {
+    let timeout: number|null = null;
+    return function debouncedWrapper(this: any, ...args: any[]) {
+        const context: any = this;
         const later = function debouncedTimeout() {
             timeout = null;
             if (!immediate) func.apply(context, args);
         };
         const callNow = immediate && !timeout;
-        clearTimeout(timeout);
-        timeout = setTimeout(later, waitMs);
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+        timeout = window.setTimeout(later, waitMs);
         if (callNow) func.apply(context, args);
     };
 }
 
+function isDetailsElement(element: HTMLElement): element is HTMLDetailsElement {
+    return element.nodeName === 'DETAILS';
+}
+
 /**
- * Scroll and highlight an element.
- * @param {HTMLElement} element
+ * Scroll-to and highlight an element.
  */
-export function scrollAndHighlightElement(element) {
+export function scrollAndHighlightElement(element: HTMLElement): void {
     if (!element) return;
 
+    // Open up parent <details> elements if within
     let parent = element;
     while (parent.parentElement) {
         parent = parent.parentElement;
-        if (parent.nodeName === 'DETAILS' && !parent.open) {
+        if (isDetailsElement(parent) && !parent.open) {
             parent.open = true;
         }
     }
@@ -44,15 +46,15 @@ export function scrollAndHighlightElement(element) {
     const highlight = getComputedStyle(document.body).getPropertyValue('--color-link');
     element.style.outline = `2px dashed ${highlight}`;
     element.style.outlineOffset = '5px';
-    element.style.transition = null;
+    element.style.removeProperty('transition');
     setTimeout(() => {
         element.style.transition = 'outline linear 3s';
         element.style.outline = '2px dashed rgba(0, 0, 0, 0)';
         const listener = () => {
             element.removeEventListener('transitionend', listener);
-            element.style.transition = null;
-            element.style.outline = null;
-            element.style.outlineOffset = null;
+            element.style.removeProperty('transition');
+            element.style.removeProperty('outline');
+            element.style.removeProperty('outlineOffset');
         };
         element.addEventListener('transitionend', listener);
     }, 1000);
@@ -61,10 +63,8 @@ export function scrollAndHighlightElement(element) {
 /**
  * Escape any HTML in the given 'unsafe' string.
  * Take from https://stackoverflow.com/a/6234804.
- * @param {String} unsafe
- * @returns {string}
  */
-export function escapeHtml(unsafe) {
+export function escapeHtml(unsafe: string): string {
     return unsafe
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
@@ -75,10 +75,8 @@ export function escapeHtml(unsafe) {
 
 /**
  * Generate a random unique ID.
- *
- * @returns {string}
  */
-export function uniqueId() {
+export function uniqueId(): string {
     // eslint-disable-next-line no-bitwise
     const S4 = () => (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
     return (`${S4() + S4()}-${S4()}-${S4()}-${S4()}-${S4()}${S4()}${S4()}`);
@@ -86,10 +84,8 @@ export function uniqueId() {
 
 /**
  * Generate a random smaller unique ID.
- *
- * @returns {string}
  */
-export function uniqueIdSmall() {
+export function uniqueIdSmall(): string {
     // eslint-disable-next-line no-bitwise
     const S4 = () => (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
     return S4();
@@ -97,10 +93,8 @@ export function uniqueIdSmall() {
 
 /**
  * Create a promise that resolves after the given time.
- * @param {int} timeMs
- * @returns {Promise}
  */
-export function wait(timeMs) {
+export function wait(timeMs: number): Promise<any> {
     return new Promise(res => {
         setTimeout(res, timeMs);
     });
diff --git a/resources/js/wysiwyg-tinymce/plugin-drawio.js b/resources/js/wysiwyg-tinymce/plugin-drawio.js
index 342cac0af74..197c50b0e44 100644
--- a/resources/js/wysiwyg-tinymce/plugin-drawio.js
+++ b/resources/js/wysiwyg-tinymce/plugin-drawio.js
@@ -1,5 +1,5 @@
 import * as DrawIO from '../services/drawio.ts';
-import {wait} from '../services/util';
+import {wait} from '../services/util.ts';
 
 let pageEditor = null;
 let currentNode = null;

From b9b500323947f30ce8e7b2e19287ddefc27c4edb Mon Sep 17 00:00:00 2001
From: Lachlan Tripolone <lachlan@sol1.com.au>
Date: Fri, 11 Oct 2024 10:40:38 +1100
Subject: [PATCH 315/666] Refactor SettingController to validate categies by
 existing view files

---
 app/Settings/SettingController.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index bdbc3c78a39..6ecc2bd1de1 100644
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -9,8 +9,6 @@
 
 class SettingController extends Controller
 {
-    protected array $settingCategories = ['features', 'customization', 'registration'];
-
     /**
      * Handle requests to the settings index path.
      */
@@ -59,8 +57,8 @@ public function update(Request $request, AppSettingsStore $store, string $catego
 
     protected function ensureCategoryExists(string $category): void
     {
-        if (!in_array($category, $this->settingCategories)) {
-            abort(404);
+        if (!view()->exists('settings.' . $category)) {
+            abort(404, 'Category not found');
         }
     }
 }

From a3d0f7478f307bb979c9cb99953ef0856b9ba7ce Mon Sep 17 00:00:00 2001
From: Lachlan Tripolone <lachlan@sol1.com.au>
Date: Fri, 11 Oct 2024 10:42:48 +1100
Subject: [PATCH 316/666] Move settings category layouts into their own view
 folder

---
 app/Settings/SettingController.php                            | 4 ++--
 .../views/settings/{ => categories}/customization.blade.php   | 0
 resources/views/settings/{ => categories}/features.blade.php  | 0
 .../views/settings/{ => categories}/registration.blade.php    | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename resources/views/settings/{ => categories}/customization.blade.php (100%)
 rename resources/views/settings/{ => categories}/features.blade.php (100%)
 rename resources/views/settings/{ => categories}/registration.blade.php (100%)

diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index 6ecc2bd1de1..447bb205b53 100644
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -29,7 +29,7 @@ public function category(string $category)
         // Get application version
         $version = trim(file_get_contents(base_path('version')));
 
-        return view('settings.' . $category, [
+        return view('settings.categories.' . $category, [
             'category'  => $category,
             'version'   => $version,
             'guestUser' => User::getGuest(),
@@ -57,7 +57,7 @@ public function update(Request $request, AppSettingsStore $store, string $catego
 
     protected function ensureCategoryExists(string $category): void
     {
-        if (!view()->exists('settings.' . $category)) {
+        if (!view()->exists('settings.categories.' . $category)) {
             abort(404, 'Category not found');
         }
     }
diff --git a/resources/views/settings/customization.blade.php b/resources/views/settings/categories/customization.blade.php
similarity index 100%
rename from resources/views/settings/customization.blade.php
rename to resources/views/settings/categories/customization.blade.php
diff --git a/resources/views/settings/features.blade.php b/resources/views/settings/categories/features.blade.php
similarity index 100%
rename from resources/views/settings/features.blade.php
rename to resources/views/settings/categories/features.blade.php
diff --git a/resources/views/settings/registration.blade.php b/resources/views/settings/categories/registration.blade.php
similarity index 100%
rename from resources/views/settings/registration.blade.php
rename to resources/views/settings/categories/registration.blade.php

From 4dc75bad05558385832c6cca2133b569c3dccc79 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 11 Oct 2024 13:33:07 +0100
Subject: [PATCH 317/666] Settings: Added test to cover setting category by
 view

---
 app/Settings/SettingController.php |  2 +-
 tests/ThemeTest.php                | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index 447bb205b53..1c5f13bc67f 100644
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -58,7 +58,7 @@ public function update(Request $request, AppSettingsStore $store, string $catego
     protected function ensureCategoryExists(string $category): void
     {
         if (!view()->exists('settings.categories.' . $category)) {
-            abort(404, 'Category not found');
+            abort(404);
         }
     }
 }
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 8e12b88d85c..837b94eee72 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -451,6 +451,19 @@ public function test_header_links_start_template_file_can_be_used()
         });
     }
 
+    public function test_custom_settings_category_page_can_be_added_via_view_file()
+    {
+        $content = 'My SuperCustomSettings';
+
+        $this->usingThemeFolder(function (string $folder) use ($content) {
+            $viewDir = theme_path('settings/categories');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/beans.blade.php', $content);
+
+            $this->asAdmin()->get('/settings/beans')->assertSee($content);
+        });
+    }
+
     protected function usingThemeFolder(callable $callback)
     {
         // Create a folder and configure a theme

From f41c02cbd7e705155b5b4fdbf8dfb3dc09a445d1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 11 Oct 2024 15:19:19 +0100
Subject: [PATCH 318/666] TS: Converted app file and animations service

Extracted functions out of app file during changes to clean up.
Altered animation function to use normal css prop names instead of JS
CSS prop names.
---
 resources/js/app.js                           | 33 --------
 resources/js/app.ts                           | 23 ++++++
 resources/js/components/chapter-contents.js   |  2 +-
 resources/js/components/collapsible.js        |  2 +-
 resources/js/components/dropdown-search.js    |  2 +-
 resources/js/components/expand-toggle.js      |  2 +-
 .../js/components/{index.js => index.ts}      |  0
 resources/js/components/popup.js              |  2 +-
 resources/js/global.d.ts                      |  2 +
 .../services/{animations.js => animations.ts} | 78 ++++++++-----------
 resources/js/services/util.ts                 | 46 +++++++++++
 11 files changed, 108 insertions(+), 84 deletions(-)
 delete mode 100644 resources/js/app.js
 create mode 100644 resources/js/app.ts
 rename resources/js/components/{index.js => index.ts} (100%)
 rename resources/js/services/{animations.js => animations.ts} (63%)

diff --git a/resources/js/app.js b/resources/js/app.js
deleted file mode 100644
index 5f4902f866f..00000000000
--- a/resources/js/app.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {EventManager} from './services/events.ts';
-import {HttpManager} from './services/http.ts';
-import {Translator} from './services/translations.ts';
-import * as componentMap from './components';
-import {ComponentStore} from './services/components.ts';
-
-// eslint-disable-next-line no-underscore-dangle
-window.__DEV__ = false;
-
-// Url retrieval function
-window.baseUrl = function baseUrl(path) {
-    let targetPath = path;
-    let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');
-    if (basePath[basePath.length - 1] === '/') basePath = basePath.slice(0, basePath.length - 1);
-    if (targetPath[0] === '/') targetPath = targetPath.slice(1);
-    return `${basePath}/${targetPath}`;
-};
-
-window.importVersioned = function importVersioned(moduleName) {
-    const version = document.querySelector('link[href*="/dist/styles.css?version="]').href.split('?version=').pop();
-    const importPath = window.baseUrl(`dist/${moduleName}.js?version=${version}`);
-    return import(importPath);
-};
-
-// Set events, http & translation services on window
-window.$http = new HttpManager();
-window.$events = new EventManager();
-window.$trans = new Translator();
-
-// Load & initialise components
-window.$components = new ComponentStore();
-window.$components.register(componentMap);
-window.$components.init();
diff --git a/resources/js/app.ts b/resources/js/app.ts
new file mode 100644
index 00000000000..141a50ef5dc
--- /dev/null
+++ b/resources/js/app.ts
@@ -0,0 +1,23 @@
+import {EventManager} from './services/events';
+import {HttpManager} from './services/http';
+import {Translator} from './services/translations';
+import * as componentMap from './components/index';
+import {ComponentStore} from './services/components';
+import {baseUrl, importVersioned} from "./services/util";
+
+// eslint-disable-next-line no-underscore-dangle
+window.__DEV__ = false;
+
+// Make common important util functions global
+window.baseUrl = baseUrl;
+window.importVersioned = importVersioned;
+
+// Setup events, http & translation services
+window.$http = new HttpManager();
+window.$events = new EventManager();
+window.$trans = new Translator();
+
+// Load & initialise components
+window.$components = new ComponentStore();
+window.$components.register(componentMap);
+window.$components.init();
diff --git a/resources/js/components/chapter-contents.js b/resources/js/components/chapter-contents.js
index 7c6480a1af0..6b0707bdd05 100644
--- a/resources/js/components/chapter-contents.js
+++ b/resources/js/components/chapter-contents.js
@@ -1,4 +1,4 @@
-import {slideUp, slideDown} from '../services/animations';
+import {slideUp, slideDown} from '../services/animations.ts';
 import {Component} from './component';
 
 export class ChapterContents extends Component {
diff --git a/resources/js/components/collapsible.js b/resources/js/components/collapsible.js
index 6f740ed7163..7b6fa79fb3b 100644
--- a/resources/js/components/collapsible.js
+++ b/resources/js/components/collapsible.js
@@ -1,4 +1,4 @@
-import {slideDown, slideUp} from '../services/animations';
+import {slideDown, slideUp} from '../services/animations.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/dropdown-search.js b/resources/js/components/dropdown-search.js
index 787e11c875d..fcbabc022a7 100644
--- a/resources/js/components/dropdown-search.js
+++ b/resources/js/components/dropdown-search.js
@@ -1,5 +1,5 @@
 import {debounce} from '../services/util.ts';
-import {transitionHeight} from '../services/animations';
+import {transitionHeight} from '../services/animations.ts';
 import {Component} from './component';
 
 export class DropdownSearch extends Component {
diff --git a/resources/js/components/expand-toggle.js b/resources/js/components/expand-toggle.js
index 0d2018b9da2..29173a05829 100644
--- a/resources/js/components/expand-toggle.js
+++ b/resources/js/components/expand-toggle.js
@@ -1,4 +1,4 @@
-import {slideUp, slideDown} from '../services/animations';
+import {slideUp, slideDown} from '../services/animations.ts';
 import {Component} from './component';
 
 export class ExpandToggle extends Component {
diff --git a/resources/js/components/index.js b/resources/js/components/index.ts
similarity index 100%
rename from resources/js/components/index.js
rename to resources/js/components/index.ts
diff --git a/resources/js/components/popup.js b/resources/js/components/popup.js
index 6627365483e..edd42803733 100644
--- a/resources/js/components/popup.js
+++ b/resources/js/components/popup.js
@@ -1,4 +1,4 @@
-import {fadeIn, fadeOut} from '../services/animations';
+import {fadeIn, fadeOut} from '../services/animations.ts';
 import {onSelect} from '../services/dom';
 import {Component} from './component';
 
diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index e505c96e0d4..b637c97c1b9 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -7,10 +7,12 @@ declare global {
     const __DEV__: boolean;
 
     interface Window {
+        __DEV__: boolean;
         $components: ComponentStore;
         $events: EventManager;
         $trans: Translator;
         $http: HttpManager;
         baseUrl: (path: string) => string;
+        importVersioned: (module: string) => Promise<object>;
     }
 }
\ No newline at end of file
diff --git a/resources/js/services/animations.js b/resources/js/services/animations.ts
similarity index 63%
rename from resources/js/services/animations.js
rename to resources/js/services/animations.ts
index bc983c8072a..adf4cb3c932 100644
--- a/resources/js/services/animations.js
+++ b/resources/js/services/animations.ts
@@ -1,30 +1,30 @@
 /**
  * Used in the function below to store references of clean-up functions.
  * Used to ensure only one transitionend function exists at any time.
- * @type {WeakMap<object, any>}
  */
-const animateStylesCleanupMap = new WeakMap();
+const animateStylesCleanupMap: WeakMap<object, any> = new WeakMap();
 
 /**
  * Animate the css styles of an element using FLIP animation techniques.
- * Styles must be an object where the keys are style properties, camelcase, and the values
+ * Styles must be an object where the keys are style rule names and the values
  * are an array of two items in the format [initialValue, finalValue]
- * @param {Element} element
- * @param {Object} styles
- * @param {Number} animTime
- * @param {Function} onComplete
  */
-function animateStyles(element, styles, animTime = 400, onComplete = null) {
+function animateStyles(
+    element: HTMLElement,
+    styles: Record<string, string[]>,
+    animTime: number = 400,
+    onComplete: Function | null = null
+): void {
     const styleNames = Object.keys(styles);
     for (const style of styleNames) {
-        element.style[style] = styles[style][0];
+        element.style.setProperty(style, styles[style][0]);
     }
 
     const cleanup = () => {
         for (const style of styleNames) {
-            element.style[style] = null;
+            element.style.removeProperty(style);
         }
-        element.style.transition = null;
+        element.style.removeProperty('transition');
         element.removeEventListener('transitionend', cleanup);
         animateStylesCleanupMap.delete(element);
         if (onComplete) onComplete();
@@ -33,7 +33,7 @@ function animateStyles(element, styles, animTime = 400, onComplete = null) {
     setTimeout(() => {
         element.style.transition = `all ease-in-out ${animTime}ms`;
         for (const style of styleNames) {
-            element.style[style] = styles[style][1];
+            element.style.setProperty(style, styles[style][1]);
         }
 
         element.addEventListener('transitionend', cleanup);
@@ -43,9 +43,8 @@ function animateStyles(element, styles, animTime = 400, onComplete = null) {
 
 /**
  * Run the active cleanup action for the given element.
- * @param {Element} element
  */
-function cleanupExistingElementAnimation(element) {
+function cleanupExistingElementAnimation(element: Element) {
     if (animateStylesCleanupMap.has(element)) {
         const oldCleanup = animateStylesCleanupMap.get(element);
         oldCleanup();
@@ -54,15 +53,12 @@ function cleanupExistingElementAnimation(element) {
 
 /**
  * Fade in the given element.
- * @param {Element} element
- * @param {Number} animTime
- * @param {Function|null} onComplete
  */
-export function fadeIn(element, animTime = 400, onComplete = null) {
+export function fadeIn(element: HTMLElement, animTime: number = 400, onComplete: Function | null = null): void {
     cleanupExistingElementAnimation(element);
     element.style.display = 'block';
     animateStyles(element, {
-        opacity: ['0', '1'],
+        'opacity': ['0', '1'],
     }, animTime, () => {
         if (onComplete) onComplete();
     });
@@ -70,14 +66,11 @@ export function fadeIn(element, animTime = 400, onComplete = null) {
 
 /**
  * Fade out the given element.
- * @param {Element} element
- * @param {Number} animTime
- * @param {Function|null} onComplete
  */
-export function fadeOut(element, animTime = 400, onComplete = null) {
+export function fadeOut(element: HTMLElement, animTime: number = 400, onComplete: Function | null = null): void {
     cleanupExistingElementAnimation(element);
     animateStyles(element, {
-        opacity: ['1', '0'],
+        'opacity': ['1', '0'],
     }, animTime, () => {
         element.style.display = 'none';
         if (onComplete) onComplete();
@@ -86,20 +79,18 @@ export function fadeOut(element, animTime = 400, onComplete = null) {
 
 /**
  * Hide the element by sliding the contents upwards.
- * @param {Element} element
- * @param {Number} animTime
  */
-export function slideUp(element, animTime = 400) {
+export function slideUp(element: HTMLElement, animTime: number = 400) {
     cleanupExistingElementAnimation(element);
     const currentHeight = element.getBoundingClientRect().height;
     const computedStyles = getComputedStyle(element);
     const currentPaddingTop = computedStyles.getPropertyValue('padding-top');
     const currentPaddingBottom = computedStyles.getPropertyValue('padding-bottom');
     const animStyles = {
-        maxHeight: [`${currentHeight}px`, '0px'],
-        overflow: ['hidden', 'hidden'],
-        paddingTop: [currentPaddingTop, '0px'],
-        paddingBottom: [currentPaddingBottom, '0px'],
+        'max-height': [`${currentHeight}px`, '0px'],
+        'overflow': ['hidden', 'hidden'],
+        'padding-top': [currentPaddingTop, '0px'],
+        'padding-bottom': [currentPaddingBottom, '0px'],
     };
 
     animateStyles(element, animStyles, animTime, () => {
@@ -109,10 +100,8 @@ export function slideUp(element, animTime = 400) {
 
 /**
  * Show the given element by expanding the contents.
- * @param {Element} element - Element to animate
- * @param {Number} animTime - Animation time in ms
  */
-export function slideDown(element, animTime = 400) {
+export function slideDown(element: HTMLElement, animTime: number = 400) {
     cleanupExistingElementAnimation(element);
     element.style.display = 'block';
     const targetHeight = element.getBoundingClientRect().height;
@@ -120,10 +109,10 @@ export function slideDown(element, animTime = 400) {
     const targetPaddingTop = computedStyles.getPropertyValue('padding-top');
     const targetPaddingBottom = computedStyles.getPropertyValue('padding-bottom');
     const animStyles = {
-        maxHeight: ['0px', `${targetHeight}px`],
-        overflow: ['hidden', 'hidden'],
-        paddingTop: ['0px', targetPaddingTop],
-        paddingBottom: ['0px', targetPaddingBottom],
+        'max-height': ['0px', `${targetHeight}px`],
+        'overflow': ['hidden', 'hidden'],
+        'padding-top': ['0px', targetPaddingTop],
+        'padding-bottom': ['0px', targetPaddingBottom],
     };
 
     animateStyles(element, animStyles, animTime);
@@ -134,11 +123,8 @@ export function slideDown(element, animTime = 400) {
  * Call with first state, and you'll receive a function in return.
  * Call the returned function in the second state to animate between those two states.
  * If animating to/from 0-height use the slide-up/slide down as easier alternatives.
- * @param {Element} element - Element to animate
- * @param {Number} animTime - Animation time in ms
- * @returns {function} - Function to run in second state to trigger animation.
  */
-export function transitionHeight(element, animTime = 400) {
+export function transitionHeight(element: HTMLElement, animTime: number = 400): () => void {
     const startHeight = element.getBoundingClientRect().height;
     const initialComputedStyles = getComputedStyle(element);
     const startPaddingTop = initialComputedStyles.getPropertyValue('padding-top');
@@ -151,10 +137,10 @@ export function transitionHeight(element, animTime = 400) {
         const targetPaddingTop = computedStyles.getPropertyValue('padding-top');
         const targetPaddingBottom = computedStyles.getPropertyValue('padding-bottom');
         const animStyles = {
-            height: [`${startHeight}px`, `${targetHeight}px`],
-            overflow: ['hidden', 'hidden'],
-            paddingTop: [startPaddingTop, targetPaddingTop],
-            paddingBottom: [startPaddingBottom, targetPaddingBottom],
+            'height': [`${startHeight}px`, `${targetHeight}px`],
+            'overflow': ['hidden', 'hidden'],
+            'padding-top': [startPaddingTop, targetPaddingTop],
+            'padding-bottom': [startPaddingBottom, targetPaddingBottom],
         };
 
         animateStyles(element, animStyles, animTime);
diff --git a/resources/js/services/util.ts b/resources/js/services/util.ts
index 7f684dd4247..c5a5d2db804 100644
--- a/resources/js/services/util.ts
+++ b/resources/js/services/util.ts
@@ -99,3 +99,49 @@ export function wait(timeMs: number): Promise<any> {
         setTimeout(res, timeMs);
     });
 }
+
+/**
+ * Generate a full URL from the given relative URL, using a base
+ * URL defined in the head of the page.
+ */
+export function baseUrl(path: string): string {
+    let targetPath = path;
+    const baseUrlMeta = document.querySelector('meta[name="base-url"]');
+    if (!baseUrlMeta) {
+        throw new Error('Could not find expected base-url meta tag in document');
+    }
+
+    let basePath = baseUrlMeta.getAttribute('content') || '';
+    if (basePath[basePath.length - 1] === '/') {
+        basePath = basePath.slice(0, basePath.length - 1);
+    }
+
+    if (targetPath[0] === '/') {
+        targetPath = targetPath.slice(1);
+    }
+
+    return `${basePath}/${targetPath}`;
+}
+
+/**
+ * Get the current version of BookStack in use.
+ * Grabs this from the version query used on app assets.
+ */
+function getVersion(): string {
+    const styleLink = document.querySelector('link[href*="/dist/styles.css?version="]');
+    if (!styleLink) {
+        throw new Error('Could not find expected style link in document for version use');
+    }
+
+    const href = (styleLink.getAttribute('href') || '');
+    return href.split('?version=').pop() || '';
+}
+
+/**
+ * Perform a module import, Ensuring the import is fetched with the current
+ * app version as a cache-breaker.
+ */
+export function importVersioned(moduleName: string): Promise<object> {
+    const importPath = window.baseUrl(`dist/${moduleName}.js?version=${getVersion()}`);
+    return import(importPath);
+}
\ No newline at end of file

From 209fa04752905644166e441eccff832a7a9fab52 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 11 Oct 2024 21:55:51 +0100
Subject: [PATCH 319/666] TS: Converted dom and keyboard nav services

---
 dev/build/esbuild.js                          |  2 +-
 resources/js/components/add-remove-rows.js    |  2 +-
 resources/js/components/ajax-delete-row.js    |  2 +-
 resources/js/components/ajax-form.js          |  2 +-
 resources/js/components/attachments.js        |  2 +-
 resources/js/components/auto-suggest.js       |  4 +-
 resources/js/components/book-sort.js          |  2 +-
 resources/js/components/code-editor.js        |  2 +-
 resources/js/components/confirm-dialog.js     |  2 +-
 resources/js/components/dropdown.js           |  4 +-
 resources/js/components/dropzone.js           |  2 +-
 resources/js/components/entity-permissions.js |  2 +-
 resources/js/components/entity-search.js      |  2 +-
 resources/js/components/entity-selector.js    |  2 +-
 resources/js/components/event-emit-select.js  |  2 +-
 resources/js/components/global-search.js      |  4 +-
 resources/js/components/image-manager.js      |  2 +-
 resources/js/components/optional-input.js     |  2 +-
 resources/js/components/page-comment.js       |  2 +-
 resources/js/components/page-comments.js      |  2 +-
 resources/js/components/page-display.js       |  2 +-
 resources/js/components/page-editor.js        |  2 +-
 resources/js/components/pointer.js            |  2 +-
 resources/js/components/popup.js              |  2 +-
 resources/js/components/template-manager.js   |  2 +-
 resources/js/components/user-select.js        |  2 +-
 resources/js/services/{dom.js => dom.ts}      | 85 ++++++++-----------
 ...d-navigation.js => keyboard-navigation.ts} | 42 ++++-----
 28 files changed, 87 insertions(+), 98 deletions(-)
 rename resources/js/services/{dom.js => dom.ts} (63%)
 rename resources/js/services/{keyboard-navigation.js => keyboard-navigation.ts} (66%)

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index fea8c01e353..cd8bf279f28 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -10,7 +10,7 @@ const isProd = process.argv[2] === 'production';
 
 // Gather our input files
 const entryPoints = {
-    app: path.join(__dirname, '../../resources/js/app.js'),
+    app: path.join(__dirname, '../../resources/js/app.ts'),
     code: path.join(__dirname, '../../resources/js/code/index.mjs'),
     'legacy-modes': path.join(__dirname, '../../resources/js/code/legacy-modes.mjs'),
     markdown: path.join(__dirname, '../../resources/js/markdown/index.mjs'),
diff --git a/resources/js/components/add-remove-rows.js b/resources/js/components/add-remove-rows.js
index 488654279b4..e7de15ae5fa 100644
--- a/resources/js/components/add-remove-rows.js
+++ b/resources/js/components/add-remove-rows.js
@@ -1,4 +1,4 @@
-import {onChildEvent} from '../services/dom';
+import {onChildEvent} from '../services/dom.ts';
 import {uniqueId} from '../services/util.ts';
 import {Component} from './component';
 
diff --git a/resources/js/components/ajax-delete-row.js b/resources/js/components/ajax-delete-row.js
index aa2801f19e6..6ed3deedf4d 100644
--- a/resources/js/components/ajax-delete-row.js
+++ b/resources/js/components/ajax-delete-row.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 export class AjaxDeleteRow extends Component {
diff --git a/resources/js/components/ajax-form.js b/resources/js/components/ajax-form.js
index 583dde57244..de1a6db43a7 100644
--- a/resources/js/components/ajax-form.js
+++ b/resources/js/components/ajax-form.js
@@ -1,4 +1,4 @@
-import {onEnterPress, onSelect} from '../services/dom';
+import {onEnterPress, onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/attachments.js b/resources/js/components/attachments.js
index f45b25e36d0..2dc7313a880 100644
--- a/resources/js/components/attachments.js
+++ b/resources/js/components/attachments.js
@@ -1,4 +1,4 @@
-import {showLoading} from '../services/dom';
+import {showLoading} from '../services/dom.ts';
 import {Component} from './component';
 
 export class Attachments extends Component {
diff --git a/resources/js/components/auto-suggest.js b/resources/js/components/auto-suggest.js
index 07711312f1d..0b828e71bd1 100644
--- a/resources/js/components/auto-suggest.js
+++ b/resources/js/components/auto-suggest.js
@@ -1,7 +1,7 @@
 import {escapeHtml} from '../services/util.ts';
-import {onChildEvent} from '../services/dom';
+import {onChildEvent} from '../services/dom.ts';
 import {Component} from './component';
-import {KeyboardNavigationHandler} from '../services/keyboard-navigation';
+import {KeyboardNavigationHandler} from '../services/keyboard-navigation.ts';
 
 const ajaxCache = {};
 
diff --git a/resources/js/components/book-sort.js b/resources/js/components/book-sort.js
index 2ba7d5d36b0..48557141f6f 100644
--- a/resources/js/components/book-sort.js
+++ b/resources/js/components/book-sort.js
@@ -1,6 +1,6 @@
 import Sortable, {MultiDrag} from 'sortablejs';
 import {Component} from './component';
-import {htmlToDom} from '../services/dom';
+import {htmlToDom} from '../services/dom.ts';
 
 // Auto sort control
 const sortOperations = {
diff --git a/resources/js/components/code-editor.js b/resources/js/components/code-editor.js
index 091c3483f4d..12937d47293 100644
--- a/resources/js/components/code-editor.js
+++ b/resources/js/components/code-editor.js
@@ -1,4 +1,4 @@
-import {onChildEvent, onEnterPress, onSelect} from '../services/dom';
+import {onChildEvent, onEnterPress, onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 export class CodeEditor extends Component {
diff --git a/resources/js/components/confirm-dialog.js b/resources/js/components/confirm-dialog.js
index 184618fccfa..00f3cfed201 100644
--- a/resources/js/components/confirm-dialog.js
+++ b/resources/js/components/confirm-dialog.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/dropdown.js b/resources/js/components/dropdown.js
index 4efd428acf7..5dd5dd93b01 100644
--- a/resources/js/components/dropdown.js
+++ b/resources/js/components/dropdown.js
@@ -1,5 +1,5 @@
-import {onSelect} from '../services/dom';
-import {KeyboardNavigationHandler} from '../services/keyboard-navigation';
+import {onSelect} from '../services/dom.ts';
+import {KeyboardNavigationHandler} from '../services/keyboard-navigation.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/dropzone.js b/resources/js/components/dropzone.js
index 920fe875f22..598e0d8d48b 100644
--- a/resources/js/components/dropzone.js
+++ b/resources/js/components/dropzone.js
@@ -2,7 +2,7 @@ import {Component} from './component';
 import {Clipboard} from '../services/clipboard.ts';
 import {
     elem, getLoading, onSelect, removeLoading,
-} from '../services/dom';
+} from '../services/dom.ts';
 
 export class Dropzone extends Component {
 
diff --git a/resources/js/components/entity-permissions.js b/resources/js/components/entity-permissions.js
index 7ab99a2a70b..b020c5d85ba 100644
--- a/resources/js/components/entity-permissions.js
+++ b/resources/js/components/entity-permissions.js
@@ -1,4 +1,4 @@
-import {htmlToDom} from '../services/dom';
+import {htmlToDom} from '../services/dom.ts';
 import {Component} from './component';
 
 export class EntityPermissions extends Component {
diff --git a/resources/js/components/entity-search.js b/resources/js/components/entity-search.js
index 7a50444708d..9d45133266d 100644
--- a/resources/js/components/entity-search.js
+++ b/resources/js/components/entity-search.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 export class EntitySearch extends Component {
diff --git a/resources/js/components/entity-selector.js b/resources/js/components/entity-selector.js
index 561370d7a34..7491119a137 100644
--- a/resources/js/components/entity-selector.js
+++ b/resources/js/components/entity-selector.js
@@ -1,4 +1,4 @@
-import {onChildEvent} from '../services/dom';
+import {onChildEvent} from '../services/dom.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/event-emit-select.js b/resources/js/components/event-emit-select.js
index 2097c052886..f722a25e71b 100644
--- a/resources/js/components/event-emit-select.js
+++ b/resources/js/components/event-emit-select.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/global-search.js b/resources/js/components/global-search.js
index 44c0d02f9d4..2cdaf591ac4 100644
--- a/resources/js/components/global-search.js
+++ b/resources/js/components/global-search.js
@@ -1,6 +1,6 @@
-import {htmlToDom} from '../services/dom';
+import {htmlToDom} from '../services/dom.ts';
 import {debounce} from '../services/util.ts';
-import {KeyboardNavigationHandler} from '../services/keyboard-navigation';
+import {KeyboardNavigationHandler} from '../services/keyboard-navigation.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/image-manager.js b/resources/js/components/image-manager.js
index 47231477b68..c8108ab28c1 100644
--- a/resources/js/components/image-manager.js
+++ b/resources/js/components/image-manager.js
@@ -1,6 +1,6 @@
 import {
     onChildEvent, onSelect, removeLoading, showLoading,
-} from '../services/dom';
+} from '../services/dom.ts';
 import {Component} from './component';
 
 export class ImageManager extends Component {
diff --git a/resources/js/components/optional-input.js b/resources/js/components/optional-input.js
index 64cee12cd29..1b133047d00 100644
--- a/resources/js/components/optional-input.js
+++ b/resources/js/components/optional-input.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 export class OptionalInput extends Component {
diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.js
index fd8ad1f2e47..8c0a8b33e54 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.js
@@ -1,5 +1,5 @@
 import {Component} from './component';
-import {getLoading, htmlToDom} from '../services/dom';
+import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class PageComment extends Component {
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index 1d6abfe2044..3d7e1365f30 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -1,5 +1,5 @@
 import {Component} from './component';
-import {getLoading, htmlToDom} from '../services/dom';
+import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class PageComments extends Component {
diff --git a/resources/js/components/page-display.js b/resources/js/components/page-display.js
index ff9d68c7a5a..d3ac78a4ad1 100644
--- a/resources/js/components/page-display.js
+++ b/resources/js/components/page-display.js
@@ -1,4 +1,4 @@
-import * as DOM from '../services/dom';
+import * as DOM from '../services/dom.ts';
 import {scrollAndHighlightElement} from '../services/util.ts';
 import {Component} from './component';
 
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 9450444ca41..7ffceb0f904 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {debounce} from '../services/util.ts';
 import {Component} from './component';
 import {utcTimeStampToLocalTime} from '../services/dates.ts';
diff --git a/resources/js/components/pointer.js b/resources/js/components/pointer.js
index 607576cb9f9..292b923e551 100644
--- a/resources/js/components/pointer.js
+++ b/resources/js/components/pointer.js
@@ -1,4 +1,4 @@
-import * as DOM from '../services/dom';
+import * as DOM from '../services/dom.ts';
 import {Component} from './component';
 import {copyTextToClipboard} from '../services/clipboard.ts';
 
diff --git a/resources/js/components/popup.js b/resources/js/components/popup.js
index edd42803733..6bd8f9c722b 100644
--- a/resources/js/components/popup.js
+++ b/resources/js/components/popup.js
@@ -1,5 +1,5 @@
 import {fadeIn, fadeOut} from '../services/animations.ts';
-import {onSelect} from '../services/dom';
+import {onSelect} from '../services/dom.ts';
 import {Component} from './component';
 
 /**
diff --git a/resources/js/components/template-manager.js b/resources/js/components/template-manager.js
index 56ec876d48b..cf81990ab3f 100644
--- a/resources/js/components/template-manager.js
+++ b/resources/js/components/template-manager.js
@@ -1,4 +1,4 @@
-import * as DOM from '../services/dom';
+import * as DOM from '../services/dom.ts';
 import {Component} from './component';
 
 export class TemplateManager extends Component {
diff --git a/resources/js/components/user-select.js b/resources/js/components/user-select.js
index e6adc3c23c8..f9ec03ed366 100644
--- a/resources/js/components/user-select.js
+++ b/resources/js/components/user-select.js
@@ -1,4 +1,4 @@
-import {onChildEvent} from '../services/dom';
+import {onChildEvent} from '../services/dom.ts';
 import {Component} from './component';
 
 export class UserSelect extends Component {
diff --git a/resources/js/services/dom.js b/resources/js/services/dom.ts
similarity index 63%
rename from resources/js/services/dom.js
rename to resources/js/services/dom.ts
index bcfd0b565da..c88827bac40 100644
--- a/resources/js/services/dom.js
+++ b/resources/js/services/dom.ts
@@ -1,12 +1,15 @@
+/**
+ * Check if the given param is a HTMLElement
+ */
+export function isHTMLElement(el: any): el is HTMLElement {
+    return el instanceof HTMLElement;
+}
+
 /**
  * Create a new element with the given attrs and children.
  * Children can be a string for text nodes or other elements.
- * @param {String} tagName
- * @param {Object<String, String>} attrs
- * @param {Element[]|String[]}children
- * @return {*}
  */
-export function elem(tagName, attrs = {}, children = []) {
+export function elem(tagName: string, attrs: Record<string, string> = {}, children: Element[]|string[] = []): HTMLElement {
     const el = document.createElement(tagName);
 
     for (const [key, val] of Object.entries(attrs)) {
@@ -30,10 +33,8 @@ export function elem(tagName, attrs = {}, children = []) {
 
 /**
  * Run the given callback against each element that matches the given selector.
- * @param {String} selector
- * @param {Function<Element>} callback
  */
-export function forEach(selector, callback) {
+export function forEach(selector: string, callback: (el: Element) => any) {
     const elements = document.querySelectorAll(selector);
     for (const element of elements) {
         callback(element);
@@ -42,11 +43,8 @@ export function forEach(selector, callback) {
 
 /**
  * Helper to listen to multiple DOM events
- * @param {Element} listenerElement
- * @param {Array<String>} events
- * @param {Function<Event>} callback
  */
-export function onEvents(listenerElement, events, callback) {
+export function onEvents(listenerElement: Element, events: string[], callback: (e: Event) => any): void {
     for (const eventName of events) {
         listenerElement.addEventListener(eventName, callback);
     }
@@ -55,10 +53,8 @@ export function onEvents(listenerElement, events, callback) {
 /**
  * Helper to run an action when an element is selected.
  * A "select" is made to be accessible, So can be a click, space-press or enter-press.
- * @param {HTMLElement|Array} elements
- * @param {function} callback
  */
-export function onSelect(elements, callback) {
+export function onSelect(elements: HTMLElement|HTMLElement[], callback: (e: Event) => any): void {
     if (!Array.isArray(elements)) {
         elements = [elements];
     }
@@ -76,16 +72,13 @@ export function onSelect(elements, callback) {
 
 /**
  * Listen to key press on the given element(s).
- * @param {String} key
- * @param {HTMLElement|Array} elements
- * @param {function} callback
  */
-function onKeyPress(key, elements, callback) {
+function onKeyPress(key: string, elements: HTMLElement|HTMLElement[], callback: (e: KeyboardEvent) => any): void {
     if (!Array.isArray(elements)) {
         elements = [elements];
     }
 
-    const listener = event => {
+    const listener = (event: KeyboardEvent) => {
         if (event.key === key) {
             callback(event);
         }
@@ -96,19 +89,15 @@ function onKeyPress(key, elements, callback) {
 
 /**
  * Listen to enter press on the given element(s).
- * @param {HTMLElement|Array} elements
- * @param {function} callback
  */
-export function onEnterPress(elements, callback) {
+export function onEnterPress(elements: HTMLElement|HTMLElement[], callback: (e: KeyboardEvent) => any): void {
     onKeyPress('Enter', elements, callback);
 }
 
 /**
  * Listen to escape press on the given element(s).
- * @param {HTMLElement|Array} elements
- * @param {function} callback
  */
-export function onEscapePress(elements, callback) {
+export function onEscapePress(elements: HTMLElement|HTMLElement[], callback: (e: KeyboardEvent) => any): void {
     onKeyPress('Escape', elements, callback);
 }
 
@@ -116,14 +105,15 @@ export function onEscapePress(elements, callback) {
  * Set a listener on an element for an event emitted by a child
  * matching the given childSelector param.
  * Used in a similar fashion to jQuery's $('listener').on('eventName', 'childSelector', callback)
- * @param {Element} listenerElement
- * @param {String} childSelector
- * @param {String} eventName
- * @param {Function} callback
  */
-export function onChildEvent(listenerElement, childSelector, eventName, callback) {
-    listenerElement.addEventListener(eventName, event => {
-        const matchingChild = event.target.closest(childSelector);
+export function onChildEvent(
+    listenerElement: HTMLElement,
+    childSelector: string,
+    eventName: string,
+    callback: (this: HTMLElement, e: Event, child: HTMLElement) => any
+): void {
+    listenerElement.addEventListener(eventName, (event: Event) => {
+        const matchingChild = (event.target as HTMLElement|null)?.closest(childSelector) as HTMLElement;
         if (matchingChild) {
             callback.call(matchingChild, event, matchingChild);
         }
@@ -132,16 +122,13 @@ export function onChildEvent(listenerElement, childSelector, eventName, callback
 
 /**
  * Look for elements that match the given selector and contain the given text.
- * Is case insensitive and returns the first result or null if nothing is found.
- * @param {String} selector
- * @param {String} text
- * @returns {Element}
+ * Is case-insensitive and returns the first result or null if nothing is found.
  */
-export function findText(selector, text) {
+export function findText(selector: string, text: string): Element|null {
     const elements = document.querySelectorAll(selector);
     text = text.toLowerCase();
     for (const element of elements) {
-        if (element.textContent.toLowerCase().includes(text)) {
+        if ((element.textContent || '').toLowerCase().includes(text) && isHTMLElement(element)) {
             return element;
         }
     }
@@ -151,17 +138,15 @@ export function findText(selector, text) {
 /**
  * Show a loading indicator in the given element.
  * This will effectively clear the element.
- * @param {Element} element
  */
-export function showLoading(element) {
+export function showLoading(element: HTMLElement): void {
     element.innerHTML = '<div class="loading-container"><div></div><div></div><div></div></div>';
 }
 
 /**
  * Get a loading element indicator element.
- * @returns {Element}
  */
-export function getLoading() {
+export function getLoading(): HTMLElement {
     const wrap = document.createElement('div');
     wrap.classList.add('loading-container');
     wrap.innerHTML = '<div></div><div></div><div></div>';
@@ -170,9 +155,8 @@ export function getLoading() {
 
 /**
  * Remove any loading indicators within the given element.
- * @param {Element} element
  */
-export function removeLoading(element) {
+export function removeLoading(element: HTMLElement): void {
     const loadingEls = element.querySelectorAll('.loading-container');
     for (const el of loadingEls) {
         el.remove();
@@ -182,12 +166,15 @@ export function removeLoading(element) {
 /**
  * Convert the given html data into a live DOM element.
  * Initiates any components defined in the data.
- * @param {String} html
- * @returns {Element}
  */
-export function htmlToDom(html) {
+export function htmlToDom(html: string): HTMLElement {
     const wrap = document.createElement('div');
     wrap.innerHTML = html;
     window.$components.init(wrap);
-    return wrap.children[0];
+    const firstChild = wrap.children[0];
+    if (!isHTMLElement(firstChild)) {
+        throw new Error('Could not find child HTMLElement when creating DOM element from HTML');
+    }
+
+    return firstChild;
 }
diff --git a/resources/js/services/keyboard-navigation.js b/resources/js/services/keyboard-navigation.ts
similarity index 66%
rename from resources/js/services/keyboard-navigation.js
rename to resources/js/services/keyboard-navigation.ts
index 34111bb2d37..13fbdfecc9d 100644
--- a/resources/js/services/keyboard-navigation.js
+++ b/resources/js/services/keyboard-navigation.ts
@@ -1,14 +1,17 @@
+import {isHTMLElement} from "./dom";
+
+type OptionalKeyEventHandler = ((e: KeyboardEvent) => any)|null;
+
 /**
  * Handle common keyboard navigation events within a given container.
  */
 export class KeyboardNavigationHandler {
 
-    /**
-     * @param {Element} container
-     * @param {Function|null} onEscape
-     * @param {Function|null} onEnter
-     */
-    constructor(container, onEscape = null, onEnter = null) {
+    protected containers: HTMLElement[];
+    protected onEscape: OptionalKeyEventHandler;
+    protected onEnter: OptionalKeyEventHandler;
+
+    constructor(container: HTMLElement, onEscape: OptionalKeyEventHandler = null, onEnter: OptionalKeyEventHandler = null) {
         this.containers = [container];
         this.onEscape = onEscape;
         this.onEnter = onEnter;
@@ -18,9 +21,8 @@ export class KeyboardNavigationHandler {
     /**
      * Also share the keyboard event handling to the given element.
      * Only elements within the original container are considered focusable though.
-     * @param {Element} element
      */
-    shareHandlingToEl(element) {
+    shareHandlingToEl(element: HTMLElement) {
         this.containers.push(element);
         element.addEventListener('keydown', this.#keydownHandler.bind(this));
     }
@@ -30,7 +32,8 @@ export class KeyboardNavigationHandler {
      */
     focusNext() {
         const focusable = this.#getFocusable();
-        const currentIndex = focusable.indexOf(document.activeElement);
+        const activeEl = document.activeElement;
+        const currentIndex = isHTMLElement(activeEl) ? focusable.indexOf(activeEl) : -1;
         let newIndex = currentIndex + 1;
         if (newIndex >= focusable.length) {
             newIndex = 0;
@@ -44,7 +47,8 @@ export class KeyboardNavigationHandler {
      */
     focusPrevious() {
         const focusable = this.#getFocusable();
-        const currentIndex = focusable.indexOf(document.activeElement);
+        const activeEl = document.activeElement;
+        const currentIndex = isHTMLElement(activeEl) ? focusable.indexOf(activeEl) : -1;
         let newIndex = currentIndex - 1;
         if (newIndex < 0) {
             newIndex = focusable.length - 1;
@@ -53,12 +57,9 @@ export class KeyboardNavigationHandler {
         focusable[newIndex].focus();
     }
 
-    /**
-     * @param {KeyboardEvent} event
-     */
-    #keydownHandler(event) {
+    #keydownHandler(event: KeyboardEvent) {
         // Ignore certain key events in inputs to allow text editing.
-        if (event.target.matches('input') && (event.key === 'ArrowRight' || event.key === 'ArrowLeft')) {
+        if (isHTMLElement(event.target) && event.target.matches('input') && (event.key === 'ArrowRight' || event.key === 'ArrowLeft')) {
             return;
         }
 
@@ -71,7 +72,7 @@ export class KeyboardNavigationHandler {
         } else if (event.key === 'Escape') {
             if (this.onEscape) {
                 this.onEscape(event);
-            } else if (document.activeElement) {
+            } else if (isHTMLElement(document.activeElement)) {
                 document.activeElement.blur();
             }
         } else if (event.key === 'Enter' && this.onEnter) {
@@ -81,14 +82,15 @@ export class KeyboardNavigationHandler {
 
     /**
      * Get an array of focusable elements within the current containers.
-     * @returns {Element[]}
      */
-    #getFocusable() {
-        const focusable = [];
+    #getFocusable(): HTMLElement[] {
+        const focusable: HTMLElement[] = [];
         const selector = '[tabindex]:not([tabindex="-1"]),[href],button:not([tabindex="-1"],[disabled]),input:not([type=hidden])';
         for (const container of this.containers) {
-            focusable.push(...container.querySelectorAll(selector));
+            const toAdd = [...container.querySelectorAll(selector)].filter(e => isHTMLElement(e));
+            focusable.push(...toAdd);
         }
+
         return focusable;
     }
 

From e088d09e4705a4348444aaa8ec1b49a07128e063 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 13 Oct 2024 14:18:23 +0100
Subject: [PATCH 320/666] ZIP Export: Started defining format

---
 dev/docs/portable-zip-file-format.md | 82 ++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 dev/docs/portable-zip-file-format.md

diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
new file mode 100644
index 00000000000..260735c58cf
--- /dev/null
+++ b/dev/docs/portable-zip-file-format.md
@@ -0,0 +1,82 @@
+# Portable ZIP File Format
+
+BookStack provides exports in a "Portable ZIP" which allows the portable transfer, storage, import & export of BookStack content.
+This document details the format used, and is intended for our own internal development use in addition to detailing the format for potential external use-cases (readers, apps, import for other platforms etc...).
+
+**Note:** This is not a BookStack backup format! This format misses much of the data that would be needed to re-create/restore a BookStack instance. There are existing better alternative options for this use-case.
+
+## Stability
+
+Following the goals & ideals of BookStack, stability is very important. We aim for this defined format to be stable and forwards compatible, to prevent breakages in use-case due to changes. Here are the general rules we follow in regard to stability & changes:
+
+- New features & properties may be added with any release.
+- Where reasonably possible, we will attempt to avoid modifications/removals of existing features/properties.
+- Where potentially breaking changes do have to be made, these will be noted in BookStack release/update notes.
+
+The addition of new features/properties alone are not considered as a breaking change to the format. Breaking changes are considered as such where they could impact common/expected use of the existing properties and features we document, they are not considered based upon user assumptions or any possible breakage. For example if your application, using the format, breaks because we added a new property while you hard-coded your application to use the third property (instead of a property name), then that's on you.
+
+## Format Outline
+
+The format is intended to be very simple, readable and based on open standards that could be easily read/handled in most common programming languages.
+The below outlines the structure of the format:
+
+- **ZIP archive container**
+   - **data.json** - Application data.
+   - **files/** - Directory containing referenced files.
+     -  *...file.ext*
+
+## References
+
+TODO - Define how we reference across content:
+TODO - References to files from data.json
+TODO - References from in-content to file URLs
+TODO - References from in-content to in-export content (page cross links within same export).
+
+## Application Data - `data.json`
+
+The `data.json` file is a JSON format file which contains all structured data for the export. The properties are as follows:
+
+- `instance` - [Instance](#instance) Object, optional, details of the export source instance.
+- `exported_at` - String, optional, full ISO 8601 datetime of when the export was created.
+- `book` - [Book](#book) Object, optional, book export data.
+- `chapter` - [Chapter](#chapter) Object, optional, chapter export data.
+- `page` - [Page](#page) Object, optional, page export data.
+
+Either `book`, `chapter` or `page` will exist depending on export type. You'd want to check for each to check what kind of export this is, and if it's an export you can handle. It's possible that other options are added in the future (`books` for a range of books for example) so it'd be wise to specifically check for properties that can be handled, otherwise error to indicate lack of support.
+
+## Data Objects
+
+The below details the objects & their properties used in Application Data.
+
+#### Instance
+
+These details are mainly informational regarding the exporting BookStack instance from where an export was created from.
+
+- `version` - String, required, BookStack version of the export source instance.
+- `id_ciphertext` - String, required, identifier for the BookStack instance.
+
+The `id_ciphertext` is the ciphertext of encrypting the text `bookstack`. This is used as a simple & rough way for a BookStack instance to be able to identify if they were the source (by attempting to decrypt the ciphertext).
+
+#### Book
+
+TODO
+
+#### Chapter
+
+TODO
+
+#### Page
+
+TODO
+
+#### Image
+
+TODO
+
+#### Attachment
+
+TODO
+
+#### Tag
+
+TODO
\ No newline at end of file

From 1930af91cea9ab830562933f738b1c9d151b0640 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 13 Oct 2024 22:56:22 +0100
Subject: [PATCH 321/666] ZIP Export: Started types in format doc

---
 dev/docs/portable-zip-file-format.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index 260735c58cf..c4737309f48 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -59,11 +59,22 @@ The `id_ciphertext` is the ciphertext of encrypting the text `bookstack`. This i
 
 #### Book
 
-TODO
+- `id` - Number, optional, original ID for the book from exported system.
+- `name` - String, required, name/title of the book.
+- `description_html` - String, optional, HTML description content.
+- `chapters` - [Chapter](#chapter) array, optional, chapters within this book.
+- `pages` - [Page](#page) array, optional, direct child pages for this book.
+- `tags` - [Tag](#tag) array, optional, tags assigned to this book.
+
+The `pages` are not all pages within the book, just those that are direct children (not in a chapter). To build an ordered mixed chapter/page list for the book, as what you'd see in BookStack, you'd need to combine `chapters` and `pages` together and sort by their `priority` value (low to high).
 
 #### Chapter
 
-TODO
+- `id` - Number, optional, original ID for the chapter from exported system.
+- `name` - String, required, name/title of the chapter.
+- `description_html` - String, optional, HTML description content.
+- `pages` - [Page](#page) array, optional, pages within this chapter.
+- `tags` - [Tag](#tag) array, optional, tags assigned to this chapter.
 
 #### Page
 
@@ -79,4 +90,6 @@ TODO
 
 #### Tag
 
-TODO
\ No newline at end of file
+- `name` - String, required, name of the tag.
+- `value` - String, optional, value of the tag (can be empty).
+- `order` - Number, optional, integer order for the tags (shown low to high).
\ No newline at end of file

From 6f1c54d018f7d55301eb4c31055b04769f5924d7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 15 Oct 2024 11:07:41 +0100
Subject: [PATCH 322/666] Users: Changed name validation to min:1 instead of 2

Would cause scenarios where users could be created with 1 char, but then
fail to update due to validation differences.
Added test to cover.
For #5263
---
 app/Users/Controllers/UserApiController.php |  4 ++--
 app/Users/Controllers/UserController.php    |  2 +-
 tests/User/UserManagementTest.php           | 11 ++++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 6ee8f16d15e..c84f1531d6a 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -37,7 +37,7 @@ protected function rules(int $userId = null): array
     {
         return [
             'create' => [
-                'name'  => ['required', 'string', 'min:2', 'max:100'],
+                'name'  => ['required', 'string', 'min:1', 'max:100'],
                 'email' => [
                     'required', 'string', 'email', 'min:2', new Unique('users', 'email'),
                 ],
@@ -49,7 +49,7 @@ protected function rules(int $userId = null): array
                 'send_invite'      => ['boolean'],
             ],
             'update' => [
-                'name'  => ['string', 'min:2', 'max:100'],
+                'name'  => ['string', 'min:1', 'max:100'],
                 'email' => [
                     'string',
                     'email',
diff --git a/app/Users/Controllers/UserController.php b/app/Users/Controllers/UserController.php
index b5dbaa83286..c6e4326e99a 100644
--- a/app/Users/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -144,7 +144,7 @@ public function update(Request $request, int $id)
         $this->checkPermission('users-manage');
 
         $validated = $this->validate($request, [
-            'name'             => ['min:2', 'max:100'],
+            'name'             => ['min:1', 'max:100'],
             'email'            => ['min:2', 'email', 'unique:users,email,' . $id],
             'password'         => ['required_with:password_confirm', Password::default()],
             'password-confirm' => ['same:password', 'required_with:password'],
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 8fe855afa77..37d9b383544 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -11,7 +11,6 @@
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Mockery\MockInterface;
-use RuntimeException;
 use Tests\TestCase;
 
 class UserManagementTest extends TestCase
@@ -86,6 +85,16 @@ public function test_user_password_update()
         $this->assertTrue(Hash::check('newpassword', $userPassword));
     }
 
+    public function test_user_can_be_updated_with_single_char_name()
+    {
+        $user = $this->users->viewer();
+        $this->asAdmin()->put("/settings/users/{$user->id}", [
+            'name' => 'b'
+        ])->assertRedirect('/settings/users');
+
+        $this->assertEquals('b', $user->refresh()->name);
+    }
+
     public function test_user_cannot_be_deleted_if_last_admin()
     {
         $adminRole = Role::getRole('admin');

From 42bd07d73325ed468bae2658ba130314f6fe4a21 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 15 Oct 2024 13:57:16 +0100
Subject: [PATCH 323/666] ZIP Export: Continued expanding format doc types

---
 dev/docs/portable-zip-file-format.md | 57 ++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index c4737309f48..dc21bf8e58e 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -21,18 +21,38 @@ The format is intended to be very simple, readable and based on open standards t
 The below outlines the structure of the format:
 
 - **ZIP archive container**
-   - **data.json** - Application data.
+   - **data.json** - Export data.
    - **files/** - Directory containing referenced files.
-     -  *...file.ext*
+     - *file-a*
+     - *file-b*
+     - *...*
 
 ## References
 
+Some properties in the export data JSON are indicated as `String reference`, and these are direct references to a file name within the `files/` directory of the ZIP. For example, the below book cover is directly referencing a `files/4a5m4a.jpg` within the ZIP which would be expected to exist.
+
+```json
+{
+  "book": {
+    "cover": "4a5m4a.jpg"
+  }
+}
+```
+
+TODO - Jotting out idea below.
+Would need to validate image/attachment paths against image/attachments listed across all pages in export.
+Probably good to ensure filenames are ascii-alpha-num.
+`[[bsexport:image:an-image-path.png]]`
+`[[bsexport:attachment:an-image-path.png]]`
+`[[bsexport:page:1]]`
+`[[bsexport:chapter:2]]`
+`[[bsexport:book:3]]`
+
 TODO - Define how we reference across content:
-TODO - References to files from data.json
 TODO - References from in-content to file URLs
 TODO - References from in-content to in-export content (page cross links within same export).
 
-## Application Data - `data.json`
+## Export Data - `data.json`
 
 The `data.json` file is a JSON format file which contains all structured data for the export. The properties are as follows:
 
@@ -62,6 +82,7 @@ The `id_ciphertext` is the ciphertext of encrypting the text `bookstack`. This i
 - `id` - Number, optional, original ID for the book from exported system.
 - `name` - String, required, name/title of the book.
 - `description_html` - String, optional, HTML description content.
+- `cover` - String reference, options, reference to book cover image.
 - `chapters` - [Chapter](#chapter) array, optional, chapters within this book.
 - `pages` - [Page](#page) array, optional, direct child pages for this book.
 - `tags` - [Tag](#tag) array, optional, tags assigned to this book.
@@ -73,23 +94,43 @@ The `pages` are not all pages within the book, just those that are direct childr
 - `id` - Number, optional, original ID for the chapter from exported system.
 - `name` - String, required, name/title of the chapter.
 - `description_html` - String, optional, HTML description content.
+- `priority` - Number, optional, integer order for when shown within a book (shown low to high).
 - `pages` - [Page](#page) array, optional, pages within this chapter.
 - `tags` - [Tag](#tag) array, optional, tags assigned to this chapter.
 
 #### Page
 
-TODO
+- `id` - Number, optional, original ID for the page from exported system.
+- `name` - String, required, name/title of the page.
+- `html` - String, optional, page HTML content.
+- `markdown` - String, optional, user markdown content for this page.
+- `priority` - Number, optional, integer order for when shown within a book (shown low to high).
+- `attachments` - [Attachment](#attachment) array, optional, attachments uploaded to this page.
+- `images` - [Image](#image) array, optional, images used in this page.
+- `tags` - [Tag](#tag) array, optional, tags assigned to this page.
+
+To define the page content, either `markdown` or `html` should be provided. Ideally these should be limited to the range of markdown and HTML which BookStack supports.
+
+The page editor type, and edit content will be determined by what content is provided. If non-empty `markdown` is provided, the page will be assumed as a markdown editor page (where permissions allow) and the HTML will be rendered from the markdown content. Otherwise, the provided `html` will be used as editor and display content.
 
 #### Image
 
-TODO
+- `name` - String, required, name of image.
+- `file` - String reference, required, reference to image file.
+
+File must be an image type accepted by BookStack (png, jpg, gif, webp)
 
 #### Attachment
 
-TODO
+- `name` - String, required, name of attachment.
+- `link` - String, semi-optional, URL of attachment.
+- `file` - String reference, semi-optional, reference to attachment file.
+- `order` - Number, optional, integer order of the attachments (shown low to high).
+
+Either `link` or `file` must be present, as that will determine the type of attachment. 
 
 #### Tag
 
 - `name` - String, required, name of the tag.
 - `value` - String, optional, value of the tag (can be empty).
-- `order` - Number, optional, integer order for the tags (shown low to high).
\ No newline at end of file
+- `order` - Number, optional, integer order of the tags (shown low to high).
\ No newline at end of file

From 42b9700673e7b2e5a04c9f888a05d98261ed36e3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 15 Oct 2024 16:14:11 +0100
Subject: [PATCH 324/666] ZIP Exports: Finished up format doc, move files,
 started builder

Moved all existing export related app files into their new own dir.
---
 app/Exceptions/ZipExportException.php         |  7 +++
 .../Controllers/BookExportApiController.php   |  4 +-
 .../Controllers/BookExportController.php      |  4 +-
 .../ChapterExportApiController.php            |  4 +-
 .../Controllers/ChapterExportController.php   |  4 +-
 .../Controllers/PageExportApiController.php   |  4 +-
 .../Controllers/PageExportController.php      |  4 +-
 .../Tools => Exports}/ExportFormatter.php     |  4 +-
 .../Tools => Exports}/PdfGenerator.php        |  4 +-
 app/Exports/ZipExportBuilder.php              | 48 +++++++++++++++++++
 composer.json                                 |  1 +
 dev/docs/portable-zip-file-format.md          | 30 +++++++-----
 routes/api.php                                | 26 +++++-----
 routes/web.php                                | 27 ++++++-----
 tests/Entity/ExportTest.php                   |  2 +-
 15 files changed, 119 insertions(+), 54 deletions(-)
 create mode 100644 app/Exceptions/ZipExportException.php
 rename app/{Entities => Exports}/Controllers/BookExportApiController.php (95%)
 rename app/{Entities => Exports}/Controllers/BookExportController.php (95%)
 rename app/{Entities => Exports}/Controllers/ChapterExportApiController.php (95%)
 rename app/{Entities => Exports}/Controllers/ChapterExportController.php (96%)
 rename app/{Entities => Exports}/Controllers/PageExportApiController.php (95%)
 rename app/{Entities => Exports}/Controllers/PageExportController.php (96%)
 rename app/{Entities/Tools => Exports}/ExportFormatter.php (98%)
 rename app/{Entities/Tools => Exports}/PdfGenerator.php (99%)
 create mode 100644 app/Exports/ZipExportBuilder.php

diff --git a/app/Exceptions/ZipExportException.php b/app/Exceptions/ZipExportException.php
new file mode 100644
index 00000000000..b2c811e0b33
--- /dev/null
+++ b/app/Exceptions/ZipExportException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class ZipExportException extends \Exception
+{
+}
diff --git a/app/Entities/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
similarity index 95%
rename from app/Entities/Controllers/BookExportApiController.php
rename to app/Exports/Controllers/BookExportApiController.php
index 1161ddb8886..164946b0c78 100644
--- a/app/Entities/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\BookQueries;
-use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
diff --git a/app/Entities/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
similarity index 95%
rename from app/Entities/Controllers/BookExportController.php
rename to app/Exports/Controllers/BookExportController.php
index 5c1a964c1e1..36906b6ad7b 100644
--- a/app/Entities/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\BookQueries;
-use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\Controller;
 use Throwable;
 
diff --git a/app/Entities/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
similarity index 95%
rename from app/Entities/Controllers/ChapterExportApiController.php
rename to app/Exports/Controllers/ChapterExportApiController.php
index ceb2522b211..9914e2b7fbe 100644
--- a/app/Entities/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\ChapterQueries;
-use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
diff --git a/app/Entities/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
similarity index 96%
rename from app/Entities/Controllers/ChapterExportController.php
rename to app/Exports/Controllers/ChapterExportController.php
index ead601ab46b..d85b90dcb41 100644
--- a/app/Entities/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\ChapterQueries;
-use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\Controller;
 use Throwable;
 
diff --git a/app/Entities/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
similarity index 95%
rename from app/Entities/Controllers/PageExportApiController.php
rename to app/Exports/Controllers/PageExportApiController.php
index 693760bc8e7..c6e20b615d2 100644
--- a/app/Entities/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\PageQueries;
-use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\ApiController;
 use Throwable;
 
diff --git a/app/Entities/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
similarity index 96%
rename from app/Entities/Controllers/PageExportController.php
rename to app/Exports/Controllers/PageExportController.php
index be97f1930bd..a4e7aae879d 100644
--- a/app/Entities/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\PageQueries;
-use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Exports\ExportFormatter;
 use BookStack\Http\Controller;
 use Throwable;
 
diff --git a/app/Entities/Tools/ExportFormatter.php b/app/Exports/ExportFormatter.php
similarity index 98%
rename from app/Entities/Tools/ExportFormatter.php
rename to app/Exports/ExportFormatter.php
index beddfe8e6e0..4f78830b075 100644
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Exports/ExportFormatter.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace BookStack\Entities\Tools;
+namespace BookStack\Exports;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
+use BookStack\Entities\Tools\PageContent;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\CspService;
 use BookStack\Util\HtmlDocument;
diff --git a/app/Entities/Tools/PdfGenerator.php b/app/Exports/PdfGenerator.php
similarity index 99%
rename from app/Entities/Tools/PdfGenerator.php
rename to app/Exports/PdfGenerator.php
index 79cd1b02f7f..0524e063fb2 100644
--- a/app/Entities/Tools/PdfGenerator.php
+++ b/app/Exports/PdfGenerator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Entities\Tools;
+namespace BookStack\Exports;
 
 use BookStack\Exceptions\PdfExportException;
-use Knp\Snappy\Pdf as SnappyPdf;
 use Dompdf\Dompdf;
+use Knp\Snappy\Pdf as SnappyPdf;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
 
diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExportBuilder.php
new file mode 100644
index 00000000000..d1a7b6bd461
--- /dev/null
+++ b/app/Exports/ZipExportBuilder.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace BookStack\Exports;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\ZipExportException;
+use ZipArchive;
+
+class ZipExportBuilder
+{
+    protected array $data = [];
+
+    /**
+     * @throws ZipExportException
+     */
+    public function buildForPage(Page $page): string
+    {
+        $this->data['page'] = [
+            'id' => $page->id,
+        ];
+
+        return $this->build();
+    }
+
+    /**
+     * @throws ZipExportException
+     */
+    protected function build(): string
+    {
+        $this->data['exported_at'] = date(DATE_ATOM);
+        $this->data['instance'] = [
+            'version' => trim(file_get_contents(base_path('version'))),
+            'id_ciphertext' => encrypt('bookstack'),
+        ];
+
+        $zipFile = tempnam(sys_get_temp_dir(), 'bszip-');
+        $zip = new ZipArchive();
+        $opened = $zip->open($zipFile, ZipArchive::CREATE);
+        if ($opened !== true) {
+            throw new ZipExportException('Failed to create zip file for export.');
+        }
+
+        $zip->addFromString('data.json', json_encode($this->data));
+        $zip->addEmptyDir('files');
+
+        return $zipFile;
+    }
+}
diff --git a/composer.json b/composer.json
index 5c54774f1e2..3680a2c6aa2 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
+        "ext-zip": "*",
         "bacon/bacon-qr-code": "^3.0",
         "doctrine/dbal": "^3.5",
         "dompdf/dompdf": "^3.0",
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index dc21bf8e58e..d5635bd398d 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -39,18 +39,24 @@ Some properties in the export data JSON are indicated as `String reference`, and
 }
 ```
 
-TODO - Jotting out idea below.
-Would need to validate image/attachment paths against image/attachments listed across all pages in export.
-Probably good to ensure filenames are ascii-alpha-num.
-`[[bsexport:image:an-image-path.png]]`
-`[[bsexport:attachment:an-image-path.png]]`
-`[[bsexport:page:1]]`
-`[[bsexport:chapter:2]]`
-`[[bsexport:book:3]]`
-
-TODO - Define how we reference across content:
-TODO - References from in-content to file URLs
-TODO - References from in-content to in-export content (page cross links within same export).
+Within HTML and markdown content, you may require references across to other items within the export content.
+This can be done using the following format:
+
+```
+[[bsexport:<object>:<reference>]]
+```
+
+Images and attachments are referenced via their file name within the `files/` directory.
+Otherwise, other content types are referenced by `id`.
+Here's an example of each type of such reference that could be used:
+
+```
+[[bsexport:image:an-image-path.png]]
+[[bsexport:attachment:an-image-path.png]]
+[[bsexport:page:40]]
+[[bsexport:chapter:2]]
+[[bsexport:book:8]]
+```
 
 ## Export Data - `data.json`
 
diff --git a/routes/api.php b/routes/api.php
index c0919d3247b..71036485597 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -9,6 +9,7 @@
 use BookStack\Activity\Controllers\AuditLogApiController;
 use BookStack\Api\ApiDocsController;
 use BookStack\Entities\Controllers as EntityControllers;
+use BookStack\Exports\Controllers as ExportControllers;
 use BookStack\Permissions\ContentPermissionApiController;
 use BookStack\Search\SearchApiController;
 use BookStack\Uploads\Controllers\AttachmentApiController;
@@ -31,21 +32,20 @@
 Route::put('books/{id}', [EntityControllers\BookApiController::class, 'update']);
 Route::delete('books/{id}', [EntityControllers\BookApiController::class, 'delete']);
 
-Route::get('books/{id}/export/html', [EntityControllers\BookExportApiController::class, 'exportHtml']);
-Route::get('books/{id}/export/pdf', [EntityControllers\BookExportApiController::class, 'exportPdf']);
-Route::get('books/{id}/export/plaintext', [EntityControllers\BookExportApiController::class, 'exportPlainText']);
-Route::get('books/{id}/export/markdown', [EntityControllers\BookExportApiController::class, 'exportMarkdown']);
+Route::get('books/{id}/export/html', [ExportControllers\BookExportApiController::class, 'exportHtml']);
+Route::get('books/{id}/export/pdf', [ExportControllers\BookExportApiController::class, 'exportPdf']);
+Route::get('books/{id}/export/plaintext', [ExportControllers\BookExportApiController::class, 'exportPlainText']);
+Route::get('books/{id}/export/markdown', [ExportControllers\BookExportApiController::class, 'exportMarkdown']);
 
 Route::get('chapters', [EntityControllers\ChapterApiController::class, 'list']);
 Route::post('chapters', [EntityControllers\ChapterApiController::class, 'create']);
 Route::get('chapters/{id}', [EntityControllers\ChapterApiController::class, 'read']);
 Route::put('chapters/{id}', [EntityControllers\ChapterApiController::class, 'update']);
 Route::delete('chapters/{id}', [EntityControllers\ChapterApiController::class, 'delete']);
-
-Route::get('chapters/{id}/export/html', [EntityControllers\ChapterExportApiController::class, 'exportHtml']);
-Route::get('chapters/{id}/export/pdf', [EntityControllers\ChapterExportApiController::class, 'exportPdf']);
-Route::get('chapters/{id}/export/plaintext', [EntityControllers\ChapterExportApiController::class, 'exportPlainText']);
-Route::get('chapters/{id}/export/markdown', [EntityControllers\ChapterExportApiController::class, 'exportMarkdown']);
+Route::get('chapters/{id}/export/html', [ExportControllers\ChapterExportApiController::class, 'exportHtml']);
+Route::get('chapters/{id}/export/pdf', [ExportControllers\ChapterExportApiController::class, 'exportPdf']);
+Route::get('chapters/{id}/export/plaintext', [ExportControllers\ChapterExportApiController::class, 'exportPlainText']);
+Route::get('chapters/{id}/export/markdown', [ExportControllers\ChapterExportApiController::class, 'exportMarkdown']);
 
 Route::get('pages', [EntityControllers\PageApiController::class, 'list']);
 Route::post('pages', [EntityControllers\PageApiController::class, 'create']);
@@ -53,10 +53,10 @@
 Route::put('pages/{id}', [EntityControllers\PageApiController::class, 'update']);
 Route::delete('pages/{id}', [EntityControllers\PageApiController::class, 'delete']);
 
-Route::get('pages/{id}/export/html', [EntityControllers\PageExportApiController::class, 'exportHtml']);
-Route::get('pages/{id}/export/pdf', [EntityControllers\PageExportApiController::class, 'exportPdf']);
-Route::get('pages/{id}/export/plaintext', [EntityControllers\PageExportApiController::class, 'exportPlainText']);
-Route::get('pages/{id}/export/markdown', [EntityControllers\PageExportApiController::class, 'exportMarkdown']);
+Route::get('pages/{id}/export/html', [ExportControllers\PageExportApiController::class, 'exportHtml']);
+Route::get('pages/{id}/export/pdf', [ExportControllers\PageExportApiController::class, 'exportPdf']);
+Route::get('pages/{id}/export/plaintext', [ExportControllers\PageExportApiController::class, 'exportPlainText']);
+Route::get('pages/{id}/export/markdown', [ExportControllers\PageExportApiController::class, 'exportMarkdown']);
 
 Route::get('image-gallery', [ImageGalleryApiController::class, 'list']);
 Route::post('image-gallery', [ImageGalleryApiController::class, 'create']);
diff --git a/routes/web.php b/routes/web.php
index 81b938f32ec..5220684c0b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -7,6 +7,7 @@
 use BookStack\App\HomeController;
 use BookStack\App\MetaController;
 use BookStack\Entities\Controllers as EntityControllers;
+use BookStack\Exports\Controllers as ExportControllers;
 use BookStack\Http\Middleware\VerifyCsrfToken;
 use BookStack\Permissions\PermissionsController;
 use BookStack\References\ReferenceController;
@@ -74,11 +75,11 @@
     Route::get('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'show']);
     Route::put('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'update']);
     Route::get('/books/{slug}/references', [ReferenceController::class, 'book']);
-    Route::get('/books/{bookSlug}/export/html', [EntityControllers\BookExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/export/pdf', [EntityControllers\BookExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/export/markdown', [EntityControllers\BookExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/export/zip', [EntityControllers\BookExportController::class, 'zip']);
-    Route::get('/books/{bookSlug}/export/plaintext', [EntityControllers\BookExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/export/html', [ExportControllers\BookExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/export/pdf', [ExportControllers\BookExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/export/markdown', [ExportControllers\BookExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/export/zip', [ExportControllers\BookExportController::class, 'zip']);
+    Route::get('/books/{bookSlug}/export/plaintext', [ExportControllers\BookExportController::class, 'plainText']);
 
     // Pages
     Route::get('/books/{bookSlug}/create-page', [EntityControllers\PageController::class, 'create']);
@@ -86,10 +87,10 @@
     Route::get('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'editDraft']);
     Route::post('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'store']);
     Route::get('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'show']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/pdf', [EntityControllers\PageExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/html', [EntityControllers\PageExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/markdown', [EntityControllers\PageExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/plaintext', [EntityControllers\PageExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/pdf', [ExportControllers\PageExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/html', [ExportControllers\PageExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/markdown', [ExportControllers\PageExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/plaintext', [ExportControllers\PageExportController::class, 'plainText']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/edit', [EntityControllers\PageController::class, 'edit']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'showMove']);
     Route::put('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'move']);
@@ -126,10 +127,10 @@
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/edit', [EntityControllers\ChapterController::class, 'edit']);
     Route::post('/books/{bookSlug}/chapter/{chapterSlug}/convert-to-book', [EntityControllers\ChapterController::class, 'convertToBook']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/permissions', [PermissionsController::class, 'showForChapter']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/pdf', [EntityControllers\ChapterExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/html', [EntityControllers\ChapterExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/markdown', [EntityControllers\ChapterExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/plaintext', [EntityControllers\ChapterExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/pdf', [ExportControllers\ChapterExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/html', [ExportControllers\ChapterExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/markdown', [ExportControllers\ChapterExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/plaintext', [ExportControllers\ChapterExportController::class, 'plainText']);
     Route::put('/books/{bookSlug}/chapter/{chapterSlug}/permissions', [PermissionsController::class, 'updateForChapter']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/references', [ReferenceController::class, 'chapter']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/delete', [EntityControllers\ChapterController::class, 'showDelete']);
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 7aafa3b7927..11cfddb206e 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -5,8 +5,8 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Tools\PdfGenerator;
 use BookStack\Exceptions\PdfExportException;
+use BookStack\Exports\PdfGenerator;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 

From bf0262d7d178b494e256ff5164a8d75195cdc231 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 19 Oct 2024 13:59:42 +0100
Subject: [PATCH 325/666] Testing: Split export tests into multiple files

---
 tests/Entity/ExportTest.php          | 569 ---------------------------
 tests/Exports/ExportUiTest.php       |  33 ++
 tests/Exports/HtmlExportTest.php     | 253 ++++++++++++
 tests/Exports/MarkdownExportTest.php |  85 ++++
 tests/Exports/PdfExportTest.php      | 146 +++++++
 tests/Exports/TextExportTest.php     |  88 +++++
 6 files changed, 605 insertions(+), 569 deletions(-)
 delete mode 100644 tests/Entity/ExportTest.php
 create mode 100644 tests/Exports/ExportUiTest.php
 create mode 100644 tests/Exports/HtmlExportTest.php
 create mode 100644 tests/Exports/MarkdownExportTest.php
 create mode 100644 tests/Exports/PdfExportTest.php
 create mode 100644 tests/Exports/TextExportTest.php

diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
deleted file mode 100644
index 11cfddb206e..00000000000
--- a/tests/Entity/ExportTest.php
+++ /dev/null
@@ -1,569 +0,0 @@
-<?php
-
-namespace Tests\Entity;
-
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
-use BookStack\Exceptions\PdfExportException;
-use BookStack\Exports\PdfGenerator;
-use Illuminate\Support\Facades\Storage;
-use Tests\TestCase;
-
-class ExportTest extends TestCase
-{
-    public function test_page_text_export()
-    {
-        $page = $this->entities->page();
-        $this->asEditor();
-
-        $resp = $this->get($page->getUrl('/export/plaintext'));
-        $resp->assertStatus(200);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
-    }
-
-    public function test_page_pdf_export()
-    {
-        $page = $this->entities->page();
-        $this->asEditor();
-
-        $resp = $this->get($page->getUrl('/export/pdf'));
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
-    }
-
-    public function test_page_html_export()
-    {
-        $page = $this->entities->page();
-        $this->asEditor();
-
-        $resp = $this->get($page->getUrl('/export/html'));
-        $resp->assertStatus(200);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
-    }
-
-    public function test_book_text_export()
-    {
-        $book = $this->entities->bookHasChaptersAndPages();
-        $directPage = $book->directPages()->first();
-        $chapter = $book->chapters()->first();
-        $chapterPage = $chapter->pages()->first();
-        $this->entities->updatePage($directPage, ['html' => '<p>My awesome page</p>']);
-        $this->entities->updatePage($chapterPage, ['html' => '<p>My little nested page</p>']);
-        $this->asEditor();
-
-        $resp = $this->get($book->getUrl('/export/plaintext'));
-        $resp->assertStatus(200);
-        $resp->assertSee($book->name);
-        $resp->assertSee($chapterPage->name);
-        $resp->assertSee($chapter->name);
-        $resp->assertSee($directPage->name);
-        $resp->assertSee('My awesome page');
-        $resp->assertSee('My little nested page');
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
-    }
-
-    public function test_book_text_export_format()
-    {
-        $entities = $this->entities->createChainBelongingToUser($this->users->viewer());
-        $this->entities->updatePage($entities['page'], ['html' => '<p>My great page</p><p>Full of <strong>great</strong> stuff</p>', 'name' => 'My wonderful page!']);
-        $entities['chapter']->name = 'Export chapter';
-        $entities['chapter']->description = "A test chapter to be exported\nIt has loads of info within";
-        $entities['book']->name = 'Export Book';
-        $entities['book']->description = "This is a book with stuff to export";
-        $entities['chapter']->save();
-        $entities['book']->save();
-
-        $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
-
-        $expected = "Export Book\nThis is a book with stuff to export\n\nExport chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
-        $expected .= "My wonderful page!\nMy great page Full of great stuff";
-        $resp->assertSee($expected);
-    }
-
-    public function test_book_pdf_export()
-    {
-        $page = $this->entities->page();
-        $book = $page->book;
-        $this->asEditor();
-
-        $resp = $this->get($book->getUrl('/export/pdf'));
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
-    }
-
-    public function test_book_html_export()
-    {
-        $page = $this->entities->page();
-        $book = $page->book;
-        $this->asEditor();
-
-        $resp = $this->get($book->getUrl('/export/html'));
-        $resp->assertStatus(200);
-        $resp->assertSee($book->name);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
-    }
-
-    public function test_book_html_export_shows_html_descriptions()
-    {
-        $book = $this->entities->bookHasChaptersAndPages();
-        $chapter = $book->chapters()->first();
-        $book->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
-        $chapter->description_html = '<p>A chapter description with <strong>HTML</strong> within!</p>';
-        $book->save();
-        $chapter->save();
-
-        $resp = $this->asEditor()->get($book->getUrl('/export/html'));
-        $resp->assertSee($book->description_html, false);
-        $resp->assertSee($chapter->description_html, false);
-    }
-
-    public function test_chapter_text_export()
-    {
-        $chapter = $this->entities->chapter();
-        $page = $chapter->pages[0];
-        $this->entities->updatePage($page, ['html' => '<p>This is content within the page!</p>']);
-        $this->asEditor();
-
-        $resp = $this->get($chapter->getUrl('/export/plaintext'));
-        $resp->assertStatus(200);
-        $resp->assertSee($chapter->name);
-        $resp->assertSee($page->name);
-        $resp->assertSee('This is content within the page!');
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
-    }
-
-    public function test_chapter_text_export_format()
-    {
-        $entities = $this->entities->createChainBelongingToUser($this->users->viewer());
-        $this->entities->updatePage($entities['page'], ['html' => '<p>My great page</p><p>Full of <strong>great</strong> stuff</p>', 'name' => 'My wonderful page!']);
-        $entities['chapter']->name = 'Export chapter';
-        $entities['chapter']->description = "A test chapter to be exported\nIt has loads of info within";
-        $entities['chapter']->save();
-
-        $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
-
-        $expected = "Export chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
-        $expected .= "My wonderful page!\nMy great page Full of great stuff";
-        $resp->assertSee($expected);
-    }
-
-    public function test_chapter_pdf_export()
-    {
-        $chapter = $this->entities->chapter();
-        $this->asEditor();
-
-        $resp = $this->get($chapter->getUrl('/export/pdf'));
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
-    }
-
-    public function test_chapter_html_export()
-    {
-        $chapter = $this->entities->chapter();
-        $page = $chapter->pages[0];
-        $this->asEditor();
-
-        $resp = $this->get($chapter->getUrl('/export/html'));
-        $resp->assertStatus(200);
-        $resp->assertSee($chapter->name);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
-    }
-
-    public function test_chapter_html_export_shows_html_descriptions()
-    {
-        $chapter = $this->entities->chapter();
-        $chapter->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
-        $chapter->save();
-
-        $resp = $this->asEditor()->get($chapter->getUrl('/export/html'));
-        $resp->assertSee($chapter->description_html, false);
-    }
-
-    public function test_page_html_export_contains_custom_head_if_set()
-    {
-        $page = $this->entities->page();
-
-        $customHeadContent = '<style>p{color: red;}</style>';
-        $this->setSettings(['app-custom-head' => $customHeadContent]);
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertSee($customHeadContent, false);
-    }
-
-    public function test_page_html_export_does_not_break_with_only_comments_in_custom_head()
-    {
-        $page = $this->entities->page();
-
-        $customHeadContent = '<!-- A comment -->';
-        $this->setSettings(['app-custom-head' => $customHeadContent]);
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertStatus(200);
-        $resp->assertSee($customHeadContent, false);
-    }
-
-    public function test_page_html_export_use_absolute_dates()
-    {
-        $page = $this->entities->page();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertSee($page->created_at->isoFormat('D MMMM Y HH:mm:ss'));
-        $resp->assertDontSee($page->created_at->diffForHumans());
-        $resp->assertSee($page->updated_at->isoFormat('D MMMM Y HH:mm:ss'));
-        $resp->assertDontSee($page->updated_at->diffForHumans());
-    }
-
-    public function test_page_export_does_not_include_user_or_revision_links()
-    {
-        $page = $this->entities->page();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertDontSee($page->getUrl('/revisions'));
-        $resp->assertDontSee($page->createdBy->getProfileUrl());
-        $resp->assertSee($page->createdBy->name);
-    }
-
-    public function test_page_export_sets_right_data_type_for_svg_embeds()
-    {
-        $page = $this->entities->page();
-        Storage::disk('local')->makeDirectory('uploads/images/gallery');
-        Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
-        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg">';
-        $page->save();
-
-        $this->asEditor();
-        $resp = $this->get($page->getUrl('/export/html'));
-        Storage::disk('local')->delete('uploads/images/gallery/svg_test.svg');
-
-        $resp->assertStatus(200);
-        $resp->assertSee('<img src="data:image/svg+xml;base64', false);
-    }
-
-    public function test_page_image_containment_works_on_multiple_images_within_a_single_line()
-    {
-        $page = $this->entities->page();
-        Storage::disk('local')->makeDirectory('uploads/images/gallery');
-        Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
-        Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '<svg></svg>');
-        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg" class="a"><img src="http://localhost/uploads/images/gallery/svg_test2.svg" class="b">';
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        Storage::disk('local')->delete('uploads/images/gallery/svg_test.svg');
-        Storage::disk('local')->delete('uploads/images/gallery/svg_test2.svg');
-
-        $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test');
-    }
-
-    public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder()
-    {
-        $page = $this->entities->page();
-        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
-            . '<img src="http://localhost/uploads/svg_test.svg"/>'
-            . '<img src="/uploads/svg_test.svg"/>';
-        $storageDisk = Storage::disk('local');
-        $storageDisk->makeDirectory('uploads/images/gallery');
-        $storageDisk->put('uploads/images/gallery/svg_test.svg', '<svg>good</svg>');
-        $storageDisk->put('uploads/svg_test.svg', '<svg>bad</svg>');
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-
-        $storageDisk->delete('uploads/images/gallery/svg_test.svg');
-        $storageDisk->delete('uploads/svg_test.svg');
-
-        $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test.svg', false);
-        $resp->assertSee('http://localhost/uploads/svg_test.svg');
-        $resp->assertSee('src="/uploads/svg_test.svg"', false);
-    }
-
-    public function test_page_export_contained_html_does_not_allow_upward_traversal_with_local()
-    {
-        $contents = file_get_contents(public_path('.htaccess'));
-        config()->set('filesystems.images', 'local');
-
-        $page = $this->entities->page();
-        $page->html = '<img src="http://localhost/uploads/images/../../.htaccess"/>';
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertDontSee(base64_encode($contents));
-    }
-
-    public function test_page_export_contained_html_does_not_allow_upward_traversal_with_local_secure()
-    {
-        $testFilePath = storage_path('logs/test.txt');
-        config()->set('filesystems.images', 'local_secure');
-        file_put_contents($testFilePath, 'I am a cat');
-
-        $page = $this->entities->page();
-        $page->html = '<img src="http://localhost/uploads/images/../../logs/test.txt"/>';
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertDontSee(base64_encode('I am a cat'));
-        unlink($testFilePath);
-    }
-
-    public function test_exports_removes_scripts_from_custom_head()
-    {
-        $entities = [
-            Page::query()->first(), Chapter::query()->first(), Book::query()->first(),
-        ];
-        setting()->put('app-custom-head', '<script>window.donkey = "cat";</script><style>.my-test-class { color: red; }</style>');
-
-        foreach ($entities as $entity) {
-            $resp = $this->asEditor()->get($entity->getUrl('/export/html'));
-            $resp->assertDontSee('window.donkey');
-            $resp->assertDontSee('<script', false);
-            $resp->assertSee('.my-test-class { color: red; }');
-        }
-    }
-
-    public function test_page_export_with_deleted_creator_and_updater()
-    {
-        $user = $this->users->viewer(['name' => 'ExportWizardTheFifth']);
-        $page = $this->entities->page();
-        $page->created_by = $user->id;
-        $page->updated_by = $user->id;
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertSee('ExportWizardTheFifth');
-
-        $user->delete();
-        $resp = $this->get($page->getUrl('/export/html'));
-        $resp->assertStatus(200);
-        $resp->assertDontSee('ExportWizardTheFifth');
-    }
-
-    public function test_page_pdf_export_converts_iframes_to_links()
-    {
-        $page = Page::query()->first()->forceFill([
-            'html'     => '<iframe width="560" height="315" src="//www.youtube.com/embed/ShqUjt33uOs"></iframe>',
-        ]);
-        $page->save();
-
-        $pdfHtml = '';
-        $mockPdfGenerator = $this->mock(PdfGenerator::class);
-        $mockPdfGenerator->shouldReceive('fromHtml')
-            ->with(\Mockery::capture($pdfHtml))
-            ->andReturn('');
-        $mockPdfGenerator->shouldReceive('getActiveEngine')->andReturn(PdfGenerator::ENGINE_DOMPDF);
-
-        $this->asEditor()->get($page->getUrl('/export/pdf'));
-        $this->assertStringNotContainsString('iframe>', $pdfHtml);
-        $this->assertStringContainsString('<p><a href="https://www.youtube.com/embed/ShqUjt33uOs">https://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
-    }
-
-    public function test_page_pdf_export_opens_details_blocks()
-    {
-        $page = $this->entities->page()->forceFill([
-            'html'     => '<details><summary>Hello</summary><p>Content!</p></details>',
-        ]);
-        $page->save();
-
-        $pdfHtml = '';
-        $mockPdfGenerator = $this->mock(PdfGenerator::class);
-        $mockPdfGenerator->shouldReceive('fromHtml')
-            ->with(\Mockery::capture($pdfHtml))
-            ->andReturn('');
-        $mockPdfGenerator->shouldReceive('getActiveEngine')->andReturn(PdfGenerator::ENGINE_DOMPDF);
-
-        $this->asEditor()->get($page->getUrl('/export/pdf'));
-        $this->assertStringContainsString('<details open="open"', $pdfHtml);
-    }
-
-    public function test_page_markdown_export()
-    {
-        $page = $this->entities->page();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
-        $resp->assertStatus(200);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
-    }
-
-    public function test_page_markdown_export_uses_existing_markdown_if_apparent()
-    {
-        $page = $this->entities->page()->forceFill([
-            'markdown' => '# A header',
-            'html'     => '<h1>Dogcat</h1>',
-        ]);
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
-        $resp->assertSee('A header');
-        $resp->assertDontSee('Dogcat');
-    }
-
-    public function test_page_markdown_export_converts_html_where_no_markdown()
-    {
-        $page = $this->entities->page()->forceFill([
-            'markdown' => '',
-            'html'     => '<h1>Dogcat</h1><p>Some <strong>bold</strong> text</p>',
-        ]);
-        $page->save();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
-        $resp->assertSee("# Dogcat\n\nSome **bold** text");
-    }
-
-    public function test_chapter_markdown_export()
-    {
-        $chapter = $this->entities->chapter();
-        $page = $chapter->pages()->first();
-        $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown'));
-
-        $resp->assertSee('# ' . $chapter->name);
-        $resp->assertSee('# ' . $page->name);
-    }
-
-    public function test_book_markdown_export()
-    {
-        $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
-        $chapter = $book->chapters()->first();
-        $page = $chapter->pages()->first();
-        $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));
-
-        $resp->assertSee('# ' . $book->name);
-        $resp->assertSee('# ' . $chapter->name);
-        $resp->assertSee('# ' . $page->name);
-    }
-
-    public function test_book_markdown_export_concats_immediate_pages_with_newlines()
-    {
-        /** @var Book $book */
-        $book = Book::query()->whereHas('pages')->first();
-
-        $this->asEditor()->get($book->getUrl('/create-page'));
-        $this->get($book->getUrl('/create-page'));
-
-        [$pageA, $pageB] = $book->pages()->where('chapter_id', '=', 0)->get();
-        $pageA->html = '<p>hello tester</p>';
-        $pageA->save();
-        $pageB->name = 'The second page in this test';
-        $pageB->save();
-
-        $resp = $this->get($book->getUrl('/export/markdown'));
-        $resp->assertDontSee('hello tester# The second page in this test');
-        $resp->assertSee("hello tester\n\n# The second page in this test");
-    }
-
-    public function test_export_option_only_visible_and_accessible_with_permission()
-    {
-        $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
-        $chapter = $book->chapters()->first();
-        $page = $chapter->pages()->first();
-        $entities = [$book, $chapter, $page];
-        $user = $this->users->viewer();
-        $this->actingAs($user);
-
-        foreach ($entities as $entity) {
-            $resp = $this->get($entity->getUrl());
-            $resp->assertSee('/export/pdf');
-        }
-
-        $this->permissions->removeUserRolePermissions($user, ['content-export']);
-
-        foreach ($entities as $entity) {
-            $resp = $this->get($entity->getUrl());
-            $resp->assertDontSee('/export/pdf');
-            $resp = $this->get($entity->getUrl('/export/pdf'));
-            $this->assertPermissionError($resp);
-        }
-    }
-
-    public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true()
-    {
-        $page = $this->entities->page();
-
-        config()->set('exports.snappy.pdf_binary', '/abc123');
-        config()->set('app.allow_untrusted_server_fetching', false);
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
-        $resp->assertStatus(200); // Sucessful response with invalid snappy binary indicates dompdf usage.
-
-        config()->set('app.allow_untrusted_server_fetching', true);
-        $resp = $this->get($page->getUrl('/export/pdf'));
-        $resp->assertStatus(500); // Bad response indicates wkhtml usage
-    }
-
-    public function test_pdf_command_option_used_if_set()
-    {
-        $page = $this->entities->page();
-        $command = 'cp {input_html_path} {output_pdf_path}';
-        config()->set('exports.pdf_command', $command);
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
-        $download = $resp->getContent();
-
-        $this->assertStringContainsString(e($page->name), $download);
-        $this->assertStringContainsString('<html lang=', $download);
-    }
-
-    public function test_pdf_command_option_errors_if_output_path_not_written_to()
-    {
-        $page = $this->entities->page();
-        $command = 'echo "hi"';
-        config()->set('exports.pdf_command', $command);
-
-        $this->assertThrows(function () use ($page) {
-            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
-        }, PdfExportException::class);
-    }
-
-    public function test_pdf_command_option_errors_if_command_returns_error_status()
-    {
-        $page = $this->entities->page();
-        $command = 'exit 1';
-        config()->set('exports.pdf_command', $command);
-
-        $this->assertThrows(function () use ($page) {
-            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
-        }, PdfExportException::class);
-    }
-
-    public function test_pdf_command_timout_option_limits_export_time()
-    {
-        $page = $this->entities->page();
-        $command = 'php -r \'sleep(4);\'';
-        config()->set('exports.pdf_command', $command);
-        config()->set('exports.pdf_command_timeout', 1);
-
-        $this->assertThrows(function () use ($page) {
-            $start = time();
-            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
-
-            $this->assertTrue(time() < ($start + 3));
-        }, PdfExportException::class,
-            "PDF Export via command failed due to timeout at 1 second(s)");
-    }
-
-    public function test_html_exports_contain_csp_meta_tag()
-    {
-        $entities = [
-            $this->entities->page(),
-            $this->entities->book(),
-            $this->entities->chapter(),
-        ];
-
-        foreach ($entities as $entity) {
-            $resp = $this->asEditor()->get($entity->getUrl('/export/html'));
-            $this->withHtml($resp)->assertElementExists('head meta[http-equiv="Content-Security-Policy"][content*="script-src "]');
-        }
-    }
-
-    public function test_html_exports_contain_body_classes_for_export_identification()
-    {
-        $page = $this->entities->page();
-
-        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $this->withHtml($resp)->assertElementExists('body.export.export-format-html.export-engine-none');
-    }
-}
diff --git a/tests/Exports/ExportUiTest.php b/tests/Exports/ExportUiTest.php
new file mode 100644
index 00000000000..77b26ad8929
--- /dev/null
+++ b/tests/Exports/ExportUiTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Book;
+use Tests\TestCase;
+
+class ExportUiTest extends TestCase
+{
+    public function test_export_option_only_visible_and_accessible_with_permission()
+    {
+        $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
+        $chapter = $book->chapters()->first();
+        $page = $chapter->pages()->first();
+        $entities = [$book, $chapter, $page];
+        $user = $this->users->viewer();
+        $this->actingAs($user);
+
+        foreach ($entities as $entity) {
+            $resp = $this->get($entity->getUrl());
+            $resp->assertSee('/export/pdf');
+        }
+
+        $this->permissions->removeUserRolePermissions($user, ['content-export']);
+
+        foreach ($entities as $entity) {
+            $resp = $this->get($entity->getUrl());
+            $resp->assertDontSee('/export/pdf');
+            $resp = $this->get($entity->getUrl('/export/pdf'));
+            $this->assertPermissionError($resp);
+        }
+    }
+}
diff --git a/tests/Exports/HtmlExportTest.php b/tests/Exports/HtmlExportTest.php
new file mode 100644
index 00000000000..069cf280167
--- /dev/null
+++ b/tests/Exports/HtmlExportTest.php
@@ -0,0 +1,253 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class HtmlExportTest extends TestCase
+{
+    public function test_page_html_export()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        $resp = $this->get($page->getUrl('/export/html'));
+        $resp->assertStatus(200);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
+    }
+
+    public function test_book_html_export()
+    {
+        $page = $this->entities->page();
+        $book = $page->book;
+        $this->asEditor();
+
+        $resp = $this->get($book->getUrl('/export/html'));
+        $resp->assertStatus(200);
+        $resp->assertSee($book->name);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
+    }
+
+    public function test_book_html_export_shows_html_descriptions()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $book->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
+        $chapter->description_html = '<p>A chapter description with <strong>HTML</strong> within!</p>';
+        $book->save();
+        $chapter->save();
+
+        $resp = $this->asEditor()->get($book->getUrl('/export/html'));
+        $resp->assertSee($book->description_html, false);
+        $resp->assertSee($chapter->description_html, false);
+    }
+
+    public function test_chapter_html_export()
+    {
+        $chapter = $this->entities->chapter();
+        $page = $chapter->pages[0];
+        $this->asEditor();
+
+        $resp = $this->get($chapter->getUrl('/export/html'));
+        $resp->assertStatus(200);
+        $resp->assertSee($chapter->name);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
+    }
+
+    public function test_chapter_html_export_shows_html_descriptions()
+    {
+        $chapter = $this->entities->chapter();
+        $chapter->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
+        $chapter->save();
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/export/html'));
+        $resp->assertSee($chapter->description_html, false);
+    }
+
+    public function test_page_html_export_contains_custom_head_if_set()
+    {
+        $page = $this->entities->page();
+
+        $customHeadContent = '<style>p{color: red;}</style>';
+        $this->setSettings(['app-custom-head' => $customHeadContent]);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertSee($customHeadContent, false);
+    }
+
+    public function test_page_html_export_does_not_break_with_only_comments_in_custom_head()
+    {
+        $page = $this->entities->page();
+
+        $customHeadContent = '<!-- A comment -->';
+        $this->setSettings(['app-custom-head' => $customHeadContent]);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertStatus(200);
+        $resp->assertSee($customHeadContent, false);
+    }
+
+    public function test_page_html_export_use_absolute_dates()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertSee($page->created_at->isoFormat('D MMMM Y HH:mm:ss'));
+        $resp->assertDontSee($page->created_at->diffForHumans());
+        $resp->assertSee($page->updated_at->isoFormat('D MMMM Y HH:mm:ss'));
+        $resp->assertDontSee($page->updated_at->diffForHumans());
+    }
+
+    public function test_page_export_does_not_include_user_or_revision_links()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertDontSee($page->getUrl('/revisions'));
+        $resp->assertDontSee($page->createdBy->getProfileUrl());
+        $resp->assertSee($page->createdBy->name);
+    }
+
+    public function test_page_export_sets_right_data_type_for_svg_embeds()
+    {
+        $page = $this->entities->page();
+        Storage::disk('local')->makeDirectory('uploads/images/gallery');
+        Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
+        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg">';
+        $page->save();
+
+        $this->asEditor();
+        $resp = $this->get($page->getUrl('/export/html'));
+        Storage::disk('local')->delete('uploads/images/gallery/svg_test.svg');
+
+        $resp->assertStatus(200);
+        $resp->assertSee('<img src="data:image/svg+xml;base64', false);
+    }
+
+    public function test_page_image_containment_works_on_multiple_images_within_a_single_line()
+    {
+        $page = $this->entities->page();
+        Storage::disk('local')->makeDirectory('uploads/images/gallery');
+        Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
+        Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '<svg></svg>');
+        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg" class="a"><img src="http://localhost/uploads/images/gallery/svg_test2.svg" class="b">';
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        Storage::disk('local')->delete('uploads/images/gallery/svg_test.svg');
+        Storage::disk('local')->delete('uploads/images/gallery/svg_test2.svg');
+
+        $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test');
+    }
+
+    public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder()
+    {
+        $page = $this->entities->page();
+        $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
+            . '<img src="http://localhost/uploads/svg_test.svg"/>'
+            . '<img src="/uploads/svg_test.svg"/>';
+        $storageDisk = Storage::disk('local');
+        $storageDisk->makeDirectory('uploads/images/gallery');
+        $storageDisk->put('uploads/images/gallery/svg_test.svg', '<svg>good</svg>');
+        $storageDisk->put('uploads/svg_test.svg', '<svg>bad</svg>');
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+
+        $storageDisk->delete('uploads/images/gallery/svg_test.svg');
+        $storageDisk->delete('uploads/svg_test.svg');
+
+        $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test.svg', false);
+        $resp->assertSee('http://localhost/uploads/svg_test.svg');
+        $resp->assertSee('src="/uploads/svg_test.svg"', false);
+    }
+
+    public function test_page_export_contained_html_does_not_allow_upward_traversal_with_local()
+    {
+        $contents = file_get_contents(public_path('.htaccess'));
+        config()->set('filesystems.images', 'local');
+
+        $page = $this->entities->page();
+        $page->html = '<img src="http://localhost/uploads/images/../../.htaccess"/>';
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertDontSee(base64_encode($contents));
+    }
+
+    public function test_page_export_contained_html_does_not_allow_upward_traversal_with_local_secure()
+    {
+        $testFilePath = storage_path('logs/test.txt');
+        config()->set('filesystems.images', 'local_secure');
+        file_put_contents($testFilePath, 'I am a cat');
+
+        $page = $this->entities->page();
+        $page->html = '<img src="http://localhost/uploads/images/../../logs/test.txt"/>';
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertDontSee(base64_encode('I am a cat'));
+        unlink($testFilePath);
+    }
+
+    public function test_exports_removes_scripts_from_custom_head()
+    {
+        $entities = [
+            Page::query()->first(), Chapter::query()->first(), Book::query()->first(),
+        ];
+        setting()->put('app-custom-head', '<script>window.donkey = "cat";</script><style>.my-test-class { color: red; }</style>');
+
+        foreach ($entities as $entity) {
+            $resp = $this->asEditor()->get($entity->getUrl('/export/html'));
+            $resp->assertDontSee('window.donkey');
+            $resp->assertDontSee('<script', false);
+            $resp->assertSee('.my-test-class { color: red; }');
+        }
+    }
+
+    public function test_page_export_with_deleted_creator_and_updater()
+    {
+        $user = $this->users->viewer(['name' => 'ExportWizardTheFifth']);
+        $page = $this->entities->page();
+        $page->created_by = $user->id;
+        $page->updated_by = $user->id;
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertSee('ExportWizardTheFifth');
+
+        $user->delete();
+        $resp = $this->get($page->getUrl('/export/html'));
+        $resp->assertStatus(200);
+        $resp->assertDontSee('ExportWizardTheFifth');
+    }
+
+    public function test_html_exports_contain_csp_meta_tag()
+    {
+        $entities = [
+            $this->entities->page(),
+            $this->entities->book(),
+            $this->entities->chapter(),
+        ];
+
+        foreach ($entities as $entity) {
+            $resp = $this->asEditor()->get($entity->getUrl('/export/html'));
+            $this->withHtml($resp)->assertElementExists('head meta[http-equiv="Content-Security-Policy"][content*="script-src "]');
+        }
+    }
+
+    public function test_html_exports_contain_body_classes_for_export_identification()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $this->withHtml($resp)->assertElementExists('body.export.export-format-html.export-engine-none');
+    }
+}
diff --git a/tests/Exports/MarkdownExportTest.php b/tests/Exports/MarkdownExportTest.php
new file mode 100644
index 00000000000..05ebbc68d75
--- /dev/null
+++ b/tests/Exports/MarkdownExportTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Book;
+use Tests\TestCase;
+
+class MarkdownExportTest extends TestCase
+{
+    public function test_page_markdown_export()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
+        $resp->assertStatus(200);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
+    }
+
+    public function test_page_markdown_export_uses_existing_markdown_if_apparent()
+    {
+        $page = $this->entities->page()->forceFill([
+            'markdown' => '# A header',
+            'html'     => '<h1>Dogcat</h1>',
+        ]);
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
+        $resp->assertSee('A header');
+        $resp->assertDontSee('Dogcat');
+    }
+
+    public function test_page_markdown_export_converts_html_where_no_markdown()
+    {
+        $page = $this->entities->page()->forceFill([
+            'markdown' => '',
+            'html'     => '<h1>Dogcat</h1><p>Some <strong>bold</strong> text</p>',
+        ]);
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
+        $resp->assertSee("# Dogcat\n\nSome **bold** text");
+    }
+
+    public function test_chapter_markdown_export()
+    {
+        $chapter = $this->entities->chapter();
+        $page = $chapter->pages()->first();
+        $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown'));
+
+        $resp->assertSee('# ' . $chapter->name);
+        $resp->assertSee('# ' . $page->name);
+    }
+
+    public function test_book_markdown_export()
+    {
+        $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
+        $chapter = $book->chapters()->first();
+        $page = $chapter->pages()->first();
+        $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));
+
+        $resp->assertSee('# ' . $book->name);
+        $resp->assertSee('# ' . $chapter->name);
+        $resp->assertSee('# ' . $page->name);
+    }
+
+    public function test_book_markdown_export_concats_immediate_pages_with_newlines()
+    {
+        /** @var Book $book */
+        $book = Book::query()->whereHas('pages')->first();
+
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        $this->get($book->getUrl('/create-page'));
+
+        [$pageA, $pageB] = $book->pages()->where('chapter_id', '=', 0)->get();
+        $pageA->html = '<p>hello tester</p>';
+        $pageA->save();
+        $pageB->name = 'The second page in this test';
+        $pageB->save();
+
+        $resp = $this->get($book->getUrl('/export/markdown'));
+        $resp->assertDontSee('hello tester# The second page in this test');
+        $resp->assertSee("hello tester\n\n# The second page in this test");
+    }
+}
diff --git a/tests/Exports/PdfExportTest.php b/tests/Exports/PdfExportTest.php
new file mode 100644
index 00000000000..9d85c69e23a
--- /dev/null
+++ b/tests/Exports/PdfExportTest.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\PdfExportException;
+use BookStack\Exports\PdfGenerator;
+use Tests\TestCase;
+
+class PdfExportTest extends TestCase
+{
+    public function test_page_pdf_export()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        $resp = $this->get($page->getUrl('/export/pdf'));
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
+    }
+
+    public function test_book_pdf_export()
+    {
+        $page = $this->entities->page();
+        $book = $page->book;
+        $this->asEditor();
+
+        $resp = $this->get($book->getUrl('/export/pdf'));
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
+    }
+
+    public function test_chapter_pdf_export()
+    {
+        $chapter = $this->entities->chapter();
+        $this->asEditor();
+
+        $resp = $this->get($chapter->getUrl('/export/pdf'));
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
+    }
+
+
+    public function test_page_pdf_export_converts_iframes_to_links()
+    {
+        $page = Page::query()->first()->forceFill([
+            'html'     => '<iframe width="560" height="315" src="//www.youtube.com/embed/ShqUjt33uOs"></iframe>',
+        ]);
+        $page->save();
+
+        $pdfHtml = '';
+        $mockPdfGenerator = $this->mock(PdfGenerator::class);
+        $mockPdfGenerator->shouldReceive('fromHtml')
+            ->with(\Mockery::capture($pdfHtml))
+            ->andReturn('');
+        $mockPdfGenerator->shouldReceive('getActiveEngine')->andReturn(PdfGenerator::ENGINE_DOMPDF);
+
+        $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $this->assertStringNotContainsString('iframe>', $pdfHtml);
+        $this->assertStringContainsString('<p><a href="https://www.youtube.com/embed/ShqUjt33uOs">https://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
+    }
+
+    public function test_page_pdf_export_opens_details_blocks()
+    {
+        $page = $this->entities->page()->forceFill([
+            'html'     => '<details><summary>Hello</summary><p>Content!</p></details>',
+        ]);
+        $page->save();
+
+        $pdfHtml = '';
+        $mockPdfGenerator = $this->mock(PdfGenerator::class);
+        $mockPdfGenerator->shouldReceive('fromHtml')
+            ->with(\Mockery::capture($pdfHtml))
+            ->andReturn('');
+        $mockPdfGenerator->shouldReceive('getActiveEngine')->andReturn(PdfGenerator::ENGINE_DOMPDF);
+
+        $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $this->assertStringContainsString('<details open="open"', $pdfHtml);
+    }
+
+    public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true()
+    {
+        $page = $this->entities->page();
+
+        config()->set('exports.snappy.pdf_binary', '/abc123');
+        config()->set('app.allow_untrusted_server_fetching', false);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $resp->assertStatus(200); // Sucessful response with invalid snappy binary indicates dompdf usage.
+
+        config()->set('app.allow_untrusted_server_fetching', true);
+        $resp = $this->get($page->getUrl('/export/pdf'));
+        $resp->assertStatus(500); // Bad response indicates wkhtml usage
+    }
+
+    public function test_pdf_command_option_used_if_set()
+    {
+        $page = $this->entities->page();
+        $command = 'cp {input_html_path} {output_pdf_path}';
+        config()->set('exports.pdf_command', $command);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $download = $resp->getContent();
+
+        $this->assertStringContainsString(e($page->name), $download);
+        $this->assertStringContainsString('<html lang=', $download);
+    }
+
+    public function test_pdf_command_option_errors_if_output_path_not_written_to()
+    {
+        $page = $this->entities->page();
+        $command = 'echo "hi"';
+        config()->set('exports.pdf_command', $command);
+
+        $this->assertThrows(function () use ($page) {
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+        }, PdfExportException::class);
+    }
+
+    public function test_pdf_command_option_errors_if_command_returns_error_status()
+    {
+        $page = $this->entities->page();
+        $command = 'exit 1';
+        config()->set('exports.pdf_command', $command);
+
+        $this->assertThrows(function () use ($page) {
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+        }, PdfExportException::class);
+    }
+
+    public function test_pdf_command_timout_option_limits_export_time()
+    {
+        $page = $this->entities->page();
+        $command = 'php -r \'sleep(4);\'';
+        config()->set('exports.pdf_command', $command);
+        config()->set('exports.pdf_command_timeout', 1);
+
+        $this->assertThrows(function () use ($page) {
+            $start = time();
+            $this->withoutExceptionHandling()->asEditor()->get($page->getUrl('/export/pdf'));
+
+            $this->assertTrue(time() < ($start + 3));
+        }, PdfExportException::class,
+            "PDF Export via command failed due to timeout at 1 second(s)");
+    }
+}
diff --git a/tests/Exports/TextExportTest.php b/tests/Exports/TextExportTest.php
new file mode 100644
index 00000000000..c593a6585cb
--- /dev/null
+++ b/tests/Exports/TextExportTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Tests\Exports;
+
+use Tests\TestCase;
+
+class TextExportTest extends TestCase
+{
+    public function test_page_text_export()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        $resp = $this->get($page->getUrl('/export/plaintext'));
+        $resp->assertStatus(200);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
+    }
+
+    public function test_book_text_export()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $directPage = $book->directPages()->first();
+        $chapter = $book->chapters()->first();
+        $chapterPage = $chapter->pages()->first();
+        $this->entities->updatePage($directPage, ['html' => '<p>My awesome page</p>']);
+        $this->entities->updatePage($chapterPage, ['html' => '<p>My little nested page</p>']);
+        $this->asEditor();
+
+        $resp = $this->get($book->getUrl('/export/plaintext'));
+        $resp->assertStatus(200);
+        $resp->assertSee($book->name);
+        $resp->assertSee($chapterPage->name);
+        $resp->assertSee($chapter->name);
+        $resp->assertSee($directPage->name);
+        $resp->assertSee('My awesome page');
+        $resp->assertSee('My little nested page');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
+    }
+
+    public function test_book_text_export_format()
+    {
+        $entities = $this->entities->createChainBelongingToUser($this->users->viewer());
+        $this->entities->updatePage($entities['page'], ['html' => '<p>My great page</p><p>Full of <strong>great</strong> stuff</p>', 'name' => 'My wonderful page!']);
+        $entities['chapter']->name = 'Export chapter';
+        $entities['chapter']->description = "A test chapter to be exported\nIt has loads of info within";
+        $entities['book']->name = 'Export Book';
+        $entities['book']->description = "This is a book with stuff to export";
+        $entities['chapter']->save();
+        $entities['book']->save();
+
+        $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
+
+        $expected = "Export Book\nThis is a book with stuff to export\n\nExport chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
+        $expected .= "My wonderful page!\nMy great page Full of great stuff";
+        $resp->assertSee($expected);
+    }
+
+    public function test_chapter_text_export()
+    {
+        $chapter = $this->entities->chapter();
+        $page = $chapter->pages[0];
+        $this->entities->updatePage($page, ['html' => '<p>This is content within the page!</p>']);
+        $this->asEditor();
+
+        $resp = $this->get($chapter->getUrl('/export/plaintext'));
+        $resp->assertStatus(200);
+        $resp->assertSee($chapter->name);
+        $resp->assertSee($page->name);
+        $resp->assertSee('This is content within the page!');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
+    }
+
+    public function test_chapter_text_export_format()
+    {
+        $entities = $this->entities->createChainBelongingToUser($this->users->viewer());
+        $this->entities->updatePage($entities['page'], ['html' => '<p>My great page</p><p>Full of <strong>great</strong> stuff</p>', 'name' => 'My wonderful page!']);
+        $entities['chapter']->name = 'Export chapter';
+        $entities['chapter']->description = "A test chapter to be exported\nIt has loads of info within";
+        $entities['chapter']->save();
+
+        $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
+
+        $expected = "Export chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
+        $expected .= "My wonderful page!\nMy great page Full of great stuff";
+        $resp->assertSee($expected);
+    }
+}

From 21ccfa97ddfe6309ff735aafbc8138cf34782563 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 19 Oct 2024 15:41:07 +0100
Subject: [PATCH 326/666] ZIP Export: Expanded page & added base attachment
 handling

---
 .../Controllers/PageExportController.php      | 13 ++++
 app/Exports/ZipExportBuilder.php              | 66 +++++++++++++++++--
 app/Exports/ZipExportFiles.php                | 58 ++++++++++++++++
 app/Uploads/AttachmentService.php             | 11 +---
 lang/en/entities.php                          |  1 +
 .../views/entities/export-menu.blade.php      |  1 +
 routes/web.php                                |  1 +
 tests/Exports/ZipExportTest.php               | 15 +++++
 8 files changed, 154 insertions(+), 12 deletions(-)
 create mode 100644 app/Exports/ZipExportFiles.php
 create mode 100644 tests/Exports/ZipExportTest.php

diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index a4e7aae879d..01611fd2121 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExportBuilder;
 use BookStack\Http\Controller;
 use Throwable;
 
@@ -74,4 +75,16 @@ public function markdown(string $bookSlug, string $pageSlug)
 
         return $this->download()->directly($pageText, $pageSlug . '.md');
     }
+
+    /**
+     * Export a page to a contained ZIP export file.
+     * @throws NotFoundException
+     */
+    public function zip(string $bookSlug, string $pageSlug, ZipExportBuilder $builder)
+    {
+        $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $zip = $builder->buildForPage($page);
+
+        return $this->download()->streamedDirectly(fopen($zip, 'r'), $pageSlug . '.zip', filesize($zip));
+    }
 }
diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExportBuilder.php
index d1a7b6bd461..2b8b45d0d2a 100644
--- a/app/Exports/ZipExportBuilder.php
+++ b/app/Exports/ZipExportBuilder.php
@@ -2,24 +2,70 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;
+use BookStack\Uploads\Attachment;
 use ZipArchive;
 
 class ZipExportBuilder
 {
     protected array $data = [];
 
+    public function __construct(
+        protected ZipExportFiles $files
+    ) {
+    }
+
     /**
      * @throws ZipExportException
      */
     public function buildForPage(Page $page): string
     {
-        $this->data['page'] = [
-            'id' => $page->id,
+        $this->data['page'] = $this->convertPage($page);
+        return $this->build();
+    }
+
+    protected function convertPage(Page $page): array
+    {
+        $tags = array_map($this->convertTag(...), $page->tags()->get()->all());
+        $attachments = array_map($this->convertAttachment(...), $page->attachments()->get()->all());
+
+        return [
+            'id'          => $page->id,
+            'name'        => $page->name,
+            'html'        => '', // TODO
+            'markdown'    => '', // TODO
+            'priority'    => $page->priority,
+            'attachments' => $attachments,
+            'images'      => [], // TODO
+            'tags'        => $tags,
         ];
+    }
 
-        return $this->build();
+    protected function convertAttachment(Attachment $attachment): array
+    {
+        $data = [
+            'name'  => $attachment->name,
+            'order' => $attachment->order,
+        ];
+
+        if ($attachment->external) {
+            $data['link'] = $attachment->path;
+        } else {
+            $data['file'] = $this->files->referenceForAttachment($attachment);
+        }
+
+        return $data;
+    }
+
+    protected function convertTag(Tag $tag): array
+    {
+        return [
+            'name'  => $tag->name,
+            'value' => $tag->value,
+            'order' => $tag->order,
+        ];
     }
 
     /**
@@ -29,7 +75,7 @@ protected function build(): string
     {
         $this->data['exported_at'] = date(DATE_ATOM);
         $this->data['instance'] = [
-            'version' => trim(file_get_contents(base_path('version'))),
+            'version'       => trim(file_get_contents(base_path('version'))),
             'id_ciphertext' => encrypt('bookstack'),
         ];
 
@@ -43,6 +89,18 @@ protected function build(): string
         $zip->addFromString('data.json', json_encode($this->data));
         $zip->addEmptyDir('files');
 
+        $toRemove = [];
+        $this->files->extractEach(function ($filePath, $fileRef) use ($zip, &$toRemove) {
+            $zip->addFile($filePath, "files/$fileRef");
+            $toRemove[] = $filePath;
+        });
+
+        $zip->close();
+
+        foreach ($toRemove as $file) {
+            unlink($file);
+        }
+
         return $zipFile;
     }
 }
diff --git a/app/Exports/ZipExportFiles.php b/app/Exports/ZipExportFiles.php
new file mode 100644
index 00000000000..d3ee70e93f2
--- /dev/null
+++ b/app/Exports/ZipExportFiles.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace BookStack\Exports;
+
+use BookStack\Uploads\Attachment;
+use BookStack\Uploads\AttachmentService;
+use Illuminate\Support\Str;
+
+class ZipExportFiles
+{
+    /**
+     * References for attachments by attachment ID.
+     * @var array<int, string>
+     */
+    protected array $attachmentRefsById = [];
+
+    public function __construct(
+        protected AttachmentService $attachmentService,
+    ) {
+    }
+
+    /**
+     * Gain a reference to the given attachment instance.
+     * This is expected to be a file-based attachment that the user
+     * has visibility of, no permission/access checks are performed here.
+     */
+    public function referenceForAttachment(Attachment $attachment): string
+    {
+        if (isset($this->attachmentRefsById[$attachment->id])) {
+            return $this->attachmentRefsById[$attachment->id];
+        }
+
+        do {
+            $fileName = Str::random(20) . '.' . $attachment->extension;
+        } while (in_array($fileName, $this->attachmentRefsById));
+
+        $this->attachmentRefsById[$attachment->id] = $fileName;
+
+        return $fileName;
+    }
+
+    /**
+     * Extract each of the ZIP export tracked files.
+     * Calls the given callback for each tracked file, passing a temporary
+     * file reference of the file contents, and the zip-local tracked reference.
+     */
+    public function extractEach(callable $callback): void
+    {
+        foreach ($this->attachmentRefsById as $attachmentId => $ref) {
+            $attachment = Attachment::query()->find($attachmentId);
+            $stream = $this->attachmentService->streamAttachmentFromStorage($attachment);
+            $tmpFile = tempnam(sys_get_temp_dir(), 'bszipfile-');
+            $tmpFileStream = fopen($tmpFile, 'w');
+            stream_copy_to_stream($stream, $tmpFileStream);
+            $callback($tmpFile, $ref);
+        }
+    }
+}
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index bd319fbd795..227649d8f00 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -13,14 +13,9 @@
 
 class AttachmentService
 {
-    protected FilesystemManager $fileSystem;
-
-    /**
-     * AttachmentService constructor.
-     */
-    public function __construct(FilesystemManager $fileSystem)
-    {
-        $this->fileSystem = $fileSystem;
+    public function __construct(
+        protected FilesystemManager $fileSystem
+    ) {
     }
 
     /**
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 35e6f050bb8..7e5a708ef62 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -39,6 +39,7 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
diff --git a/resources/views/entities/export-menu.blade.php b/resources/views/entities/export-menu.blade.php
index a55ab56d199..e58c842ba42 100644
--- a/resources/views/entities/export-menu.blade.php
+++ b/resources/views/entities/export-menu.blade.php
@@ -18,6 +18,7 @@ class="icon-list-item"
         <li><a href="{{ $entity->getUrl('/export/pdf') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_pdf') }}</span><span>.pdf</span></a></li>
         <li><a href="{{ $entity->getUrl('/export/plaintext') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_text') }}</span><span>.txt</span></a></li>
         <li><a href="{{ $entity->getUrl('/export/markdown') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_md') }}</span><span>.md</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/zip') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_zip') }}</span><span>.zip</span></a></li>
     </ul>
 
 </div>
diff --git a/routes/web.php b/routes/web.php
index 5220684c0b0..6ae70983d52 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -91,6 +91,7 @@
     Route::get('/books/{bookSlug}/page/{pageSlug}/export/html', [ExportControllers\PageExportController::class, 'html']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/export/markdown', [ExportControllers\PageExportController::class, 'markdown']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/export/plaintext', [ExportControllers\PageExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/zip', [ExportControllers\PageExportController::class, 'zip']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/edit', [EntityControllers\PageController::class, 'edit']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'showMove']);
     Route::put('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'move']);
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
new file mode 100644
index 00000000000..d8ce00be33f
--- /dev/null
+++ b/tests/Exports/ZipExportTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Book;
+use Tests\TestCase;
+
+class ZipExportTest extends TestCase
+{
+    public function test_page_export()
+    {
+        $page = $this->entities->page();
+        // TODO
+    }
+}

From 7c39dd5cba7b72184adb96a8236ca1a3c99f03e3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 20 Oct 2024 19:56:56 +0100
Subject: [PATCH 327/666] ZIP Export: Started building link/ref handling

---
 app/Exports/ZipExportBuilder.php              | 54 +++----------
 .../ZipExportModels/ZipExportAttachment.php   | 37 +++++++++
 .../ZipExportModels/ZipExportImage.php        | 11 +++
 .../ZipExportModels/ZipExportModel.php        | 11 +++
 app/Exports/ZipExportModels/ZipExportPage.php | 39 ++++++++++
 app/Exports/ZipExportModels/ZipExportTag.php  | 27 +++++++
 app/Exports/ZipExportReferences.php           | 55 ++++++++++++++
 app/Exports/ZipReferenceParser.php            | 75 +++++++++++++++++++
 dev/docs/portable-zip-file-format.md          |  1 +
 9 files changed, 265 insertions(+), 45 deletions(-)
 create mode 100644 app/Exports/ZipExportModels/ZipExportAttachment.php
 create mode 100644 app/Exports/ZipExportModels/ZipExportImage.php
 create mode 100644 app/Exports/ZipExportModels/ZipExportModel.php
 create mode 100644 app/Exports/ZipExportModels/ZipExportPage.php
 create mode 100644 app/Exports/ZipExportModels/ZipExportTag.php
 create mode 100644 app/Exports/ZipExportReferences.php
 create mode 100644 app/Exports/ZipReferenceParser.php

diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExportBuilder.php
index 2b8b45d0d2a..720b4997d4a 100644
--- a/app/Exports/ZipExportBuilder.php
+++ b/app/Exports/ZipExportBuilder.php
@@ -2,10 +2,9 @@
 
 namespace BookStack\Exports;
 
-use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;
-use BookStack\Uploads\Attachment;
+use BookStack\Exports\ZipExportModels\ZipExportPage;
 use ZipArchive;
 
 class ZipExportBuilder
@@ -13,7 +12,8 @@ class ZipExportBuilder
     protected array $data = [];
 
     public function __construct(
-        protected ZipExportFiles $files
+        protected ZipExportFiles $files,
+        protected ZipExportReferences $references,
     ) {
     }
 
@@ -22,50 +22,12 @@ public function __construct(
      */
     public function buildForPage(Page $page): string
     {
-        $this->data['page'] = $this->convertPage($page);
-        return $this->build();
-    }
+        $exportPage = ZipExportPage::fromModel($page, $this->files);
+        $this->data['page'] = $exportPage;
 
-    protected function convertPage(Page $page): array
-    {
-        $tags = array_map($this->convertTag(...), $page->tags()->get()->all());
-        $attachments = array_map($this->convertAttachment(...), $page->attachments()->get()->all());
-
-        return [
-            'id'          => $page->id,
-            'name'        => $page->name,
-            'html'        => '', // TODO
-            'markdown'    => '', // TODO
-            'priority'    => $page->priority,
-            'attachments' => $attachments,
-            'images'      => [], // TODO
-            'tags'        => $tags,
-        ];
-    }
-
-    protected function convertAttachment(Attachment $attachment): array
-    {
-        $data = [
-            'name'  => $attachment->name,
-            'order' => $attachment->order,
-        ];
+        $this->references->addPage($exportPage);
 
-        if ($attachment->external) {
-            $data['link'] = $attachment->path;
-        } else {
-            $data['file'] = $this->files->referenceForAttachment($attachment);
-        }
-
-        return $data;
-    }
-
-    protected function convertTag(Tag $tag): array
-    {
-        return [
-            'name'  => $tag->name,
-            'value' => $tag->value,
-            'order' => $tag->order,
-        ];
+        return $this->build();
     }
 
     /**
@@ -73,6 +35,8 @@ protected function convertTag(Tag $tag): array
      */
     protected function build(): string
     {
+        $this->references->buildReferences();
+
         $this->data['exported_at'] = date(DATE_ATOM);
         $this->data['instance'] = [
             'version'       => trim(file_get_contents(base_path('version'))),
diff --git a/app/Exports/ZipExportModels/ZipExportAttachment.php b/app/Exports/ZipExportModels/ZipExportAttachment.php
new file mode 100644
index 00000000000..d6d674a913f
--- /dev/null
+++ b/app/Exports/ZipExportModels/ZipExportAttachment.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\Exports\ZipExportModels;
+
+use BookStack\Exports\ZipExportFiles;
+use BookStack\Uploads\Attachment;
+
+class ZipExportAttachment implements ZipExportModel
+{
+    public ?int $id = null;
+    public string $name;
+    public ?int $order = null;
+    public ?string $link = null;
+    public ?string $file = null;
+
+    public static function fromModel(Attachment $model, ZipExportFiles $files): self
+    {
+        $instance = new self();
+        $instance->id = $model->id;
+        $instance->name = $model->name;
+
+        if ($model->external) {
+            $instance->link = $model->path;
+        } else {
+            $instance->file = $files->referenceForAttachment($model);
+        }
+
+        return $instance;
+    }
+
+    public static function fromModelArray(array $attachmentArray, ZipExportFiles $files): array
+    {
+        return array_values(array_map(function (Attachment $attachment) use ($files) {
+            return self::fromModel($attachment, $files);
+        }, $attachmentArray));
+    }
+}
diff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExportModels/ZipExportImage.php
new file mode 100644
index 00000000000..73fe3bbf594
--- /dev/null
+++ b/app/Exports/ZipExportModels/ZipExportImage.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BookStack\Exports\ZipExportModels;
+
+use BookStack\Activity\Models\Tag;
+
+class ZipExportImage implements ZipExportModel
+{
+    public string $name;
+    public string $file;
+}
diff --git a/app/Exports/ZipExportModels/ZipExportModel.php b/app/Exports/ZipExportModels/ZipExportModel.php
new file mode 100644
index 00000000000..e1cb616de52
--- /dev/null
+++ b/app/Exports/ZipExportModels/ZipExportModel.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BookStack\Exports\ZipExportModels;
+
+use BookStack\App\Model;
+use BookStack\Exports\ZipExportFiles;
+
+interface ZipExportModel
+{
+//    public static function fromModel(Model $model, ZipExportFiles $files): self;
+}
diff --git a/app/Exports/ZipExportModels/ZipExportPage.php b/app/Exports/ZipExportModels/ZipExportPage.php
new file mode 100644
index 00000000000..6589ce60ae1
--- /dev/null
+++ b/app/Exports/ZipExportModels/ZipExportPage.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace BookStack\Exports\ZipExportModels;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\Exports\ZipExportFiles;
+
+class ZipExportPage implements ZipExportModel
+{
+    public ?int $id = null;
+    public string $name;
+    public ?string $html = null;
+    public ?string $markdown = null;
+    public ?int $priority = null;
+    /** @var ZipExportAttachment[] */
+    public array $attachments = [];
+    /** @var ZipExportImage[] */
+    public array $images = [];
+    /** @var ZipExportTag[] */
+    public array $tags = [];
+
+    public static function fromModel(Page $model, ZipExportFiles $files): self
+    {
+        $instance = new self();
+        $instance->id = $model->id;
+        $instance->name = $model->name;
+        $instance->html = (new PageContent($model))->render();
+
+        if (!empty($model->markdown)) {
+            $instance->markdown = $model->markdown;
+        }
+
+        $instance->tags = ZipExportTag::fromModelArray($model->tags()->get()->all());
+        $instance->attachments = ZipExportAttachment::fromModelArray($model->attachments()->get()->all(), $files);
+
+        return $instance;
+    }
+}
diff --git a/app/Exports/ZipExportModels/ZipExportTag.php b/app/Exports/ZipExportModels/ZipExportTag.php
new file mode 100644
index 00000000000..636c9ff6dc4
--- /dev/null
+++ b/app/Exports/ZipExportModels/ZipExportTag.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace BookStack\Exports\ZipExportModels;
+
+use BookStack\Activity\Models\Tag;
+
+class ZipExportTag implements ZipExportModel
+{
+    public string $name;
+    public ?string $value = null;
+    public ?int $order = null;
+
+    public static function fromModel(Tag $model): self
+    {
+        $instance = new self();
+        $instance->name = $model->name;
+        $instance->value = $model->value;
+        $instance->order = $model->order;
+
+        return $instance;
+    }
+
+    public static function fromModelArray(array $tagArray): array
+    {
+        return array_values(array_map(self::fromModel(...), $tagArray));
+    }
+}
diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExportReferences.php
new file mode 100644
index 00000000000..89deb7edad3
--- /dev/null
+++ b/app/Exports/ZipExportReferences.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace BookStack\Exports;
+
+use BookStack\App\Model;
+use BookStack\Exports\ZipExportModels\ZipExportAttachment;
+use BookStack\Exports\ZipExportModels\ZipExportPage;
+
+class ZipExportReferences
+{
+    /** @var ZipExportPage[] */
+    protected array $pages = [];
+    protected array $books = [];
+    protected array $chapters = [];
+
+    /** @var ZipExportAttachment[] */
+    protected array $attachments = [];
+
+    public function __construct(
+        protected ZipReferenceParser $parser,
+    ) {
+    }
+
+    public function addPage(ZipExportPage $page): void
+    {
+        if ($page->id) {
+            $this->pages[$page->id] = $page;
+        }
+
+        foreach ($page->attachments as $attachment) {
+            if ($attachment->id) {
+                $this->attachments[$attachment->id] = $attachment;
+            }
+        }
+    }
+
+    public function buildReferences(): void
+    {
+        // TODO - References to images, attachments, other entities
+
+        // TODO - Parse page MD & HTML
+        foreach ($this->pages as $page) {
+            $page->html = $this->parser->parse($page->html ?? '', function (Model $model): ?string {
+                // TODO - Handle found link to $model
+                //   - Validate we can see/access $model, or/and that it's
+                //     part of the export in progress.
+                return '[CAT]';
+            });
+            // TODO - markdown
+        }
+
+        // TODO - Parse chapter desc html
+        // TODO - Parse book desc html
+    }
+}
diff --git a/app/Exports/ZipReferenceParser.php b/app/Exports/ZipReferenceParser.php
new file mode 100644
index 00000000000..6ca826bc3f4
--- /dev/null
+++ b/app/Exports/ZipReferenceParser.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace BookStack\Exports;
+
+use BookStack\App\Model;
+use BookStack\Entities\Queries\EntityQueries;
+use BookStack\References\ModelResolvers\BookLinkModelResolver;
+use BookStack\References\ModelResolvers\ChapterLinkModelResolver;
+use BookStack\References\ModelResolvers\CrossLinkModelResolver;
+use BookStack\References\ModelResolvers\PageLinkModelResolver;
+use BookStack\References\ModelResolvers\PagePermalinkModelResolver;
+
+class ZipReferenceParser
+{
+    /**
+     * @var CrossLinkModelResolver[]
+     */
+    protected array $modelResolvers;
+
+    public function __construct(EntityQueries $queries)
+    {
+        $this->modelResolvers = [
+            new PagePermalinkModelResolver($queries->pages),
+            new PageLinkModelResolver($queries->pages),
+            new ChapterLinkModelResolver($queries->chapters),
+            new BookLinkModelResolver($queries->books),
+            // TODO - Image
+            // TODO - Attachment
+        ];
+    }
+
+    /**
+     * Parse and replace references in the given content.
+     * @param callable(Model):(string|null) $handler
+     */
+    public function parse(string $content, callable $handler): string
+    {
+        $escapedBase = preg_quote(url('/'), '/');
+        $linkRegex = "/({$escapedBase}.*?)[\\t\\n\\f>\"'=?#]/";
+        $matches = [];
+        preg_match_all($linkRegex, $content, $matches);
+
+        if (count($matches) < 2) {
+            return $content;
+        }
+
+        foreach ($matches[1] as $link) {
+            $model = $this->linkToModel($link);
+            if ($model) {
+                $result = $handler($model);
+                if ($result !== null) {
+                    $content = str_replace($link, $result, $content);
+                }
+            }
+        }
+
+        return $content;
+    }
+
+
+    /**
+     * Attempt to resolve the given link to a model using the instance model resolvers.
+     */
+    protected function linkToModel(string $link): ?Model
+    {
+        foreach ($this->modelResolvers as $resolver) {
+            $model = $resolver->resolve($link);
+            if (!is_null($model)) {
+                return $model;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index d5635bd398d..7a99563d14b 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -128,6 +128,7 @@ File must be an image type accepted by BookStack (png, jpg, gif, webp)
 
 #### Attachment
 
+- `id` - Number, optional, original ID for the attachment from exported system.
 - `name` - String, required, name of attachment.
 - `link` - String, semi-optional, URL of attachment.
 - `file` - String reference, semi-optional, reference to attachment file.

From 3e656efb0088b180665e224a68adde061e86786b Mon Sep 17 00:00:00 2001
From: Rashad <rashadkhan359@gmail.com>
Date: Mon, 21 Oct 2024 02:42:49 +0530
Subject: [PATCH 328/666] Added include func for search api

---
 app/Api/ApiEntityListFormatter.php |  42 ++++++++++-
 app/Search/SearchApiController.php |  69 ++++++++++++++---
 dev/api/requests/search-all.http   |   2 +-
 dev/api/responses/search-all.json  |   7 +-
 tests/Api/SearchApiTest.php        | 117 ++++++++++++++++++++++++++++-
 5 files changed, 217 insertions(+), 20 deletions(-)

diff --git a/app/Api/ApiEntityListFormatter.php b/app/Api/ApiEntityListFormatter.php
index 436d66d598e..23fa8e6ea72 100644
--- a/app/Api/ApiEntityListFormatter.php
+++ b/app/Api/ApiEntityListFormatter.php
@@ -3,6 +3,7 @@
 namespace BookStack\Api;
 
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
 
 class ApiEntityListFormatter
 {
@@ -12,6 +13,11 @@ class ApiEntityListFormatter
      */
     protected array $list = [];
 
+    /**
+     * Whether to include related titles in the response.
+     */
+    protected bool $includeRelatedTitles = false;
+
     /**
      * The fields to show in the formatted data.
      * Can be a plain string array item for a direct model field (If existing on model).
@@ -20,8 +26,16 @@ class ApiEntityListFormatter
      * @var array<string|int, string|callable>
      */
     protected array $fields = [
-        'id', 'name', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'priority', 'created_at', 'updated_at',
+        'id',
+        'name',
+        'slug',
+        'book_id',
+        'chapter_id',
+        'draft',
+        'template',
+        'priority',
+        'created_at',
+        'updated_at',
     ];
 
     public function __construct(array $list)
@@ -62,6 +76,30 @@ public function withTags(): self
         return $this;
     }
 
+    /**
+     * Enable the inclusion of related book and chapter titles in the response.
+     */
+    public function withRelatedTitles(): self
+    {
+        $this->includeRelatedTitles = true;
+
+        $this->withField('book_title', function (Entity $entity) {
+            if (method_exists($entity, 'book')) {
+                return $entity->book?->name;
+            }
+            return null;
+        });
+
+        $this->withField('chapter_title', function (Entity $entity) {
+            if ($entity instanceof Page && $entity->chapter_id) {
+                return optional($entity->getAttribute('chapter'))->name;
+            }
+            return null;
+        });
+
+        return $this;
+    }
+
     /**
      * Format the data and return an array of formatted content.
      * @return array[]
diff --git a/app/Search/SearchApiController.php b/app/Search/SearchApiController.php
index d1619e11867..5072bd3b463 100644
--- a/app/Search/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -14,12 +14,23 @@ class SearchApiController extends ApiController
 
     protected $rules = [
         'all' => [
-            'query'  => ['required'],
-            'page'   => ['integer', 'min:1'],
-            'count'  => ['integer', 'min:1', 'max:100'],
+            'query' => ['required'],
+            'page' => ['integer', 'min:1'],
+            'count' => ['integer', 'min:1', 'max:100'],
+            'include' => ['string', 'regex:/^[a-zA-Z,]*$/'],
         ],
     ];
 
+    /**
+     * Valid include parameters and their corresponding formatter methods.
+     * These parameters allow for additional related data, like titles or tags,
+     * to be included in the search results when requested via the API.
+     */
+    protected const VALID_INCLUDES = [
+        'titles' => 'withRelatedTitles',
+        'tags' => 'withTags',
+    ];
+
     public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $resultsFormatter)
     {
         $this->searchRunner = $searchRunner;
@@ -33,6 +44,13 @@ public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $
      * for a full list of search term options. Results contain a 'type' property to distinguish
      * between: bookshelf, book, chapter & page.
      *
+     * This method now supports the 'include' parameter, which allows API clients to specify related
+     * fields (such as titles or tags) that should be included in the search results.
+     *
+     * The 'include' parameter is a comma-separated string. For example, adding `include=titles,tags`
+     * will include both titles and tags in the API response. If the parameter is not provided, only
+     * basic entity data will be returned.
+     *
      * The paging parameters and response format emulates a standard listing endpoint
      * but standard sorting and filtering cannot be done on this endpoint. If a count value
      * is provided this will only be taken as a suggestion. The results in the response
@@ -45,22 +63,49 @@ public function all(Request $request)
         $options = SearchOptions::fromString($request->get('query') ?? '');
         $page = intval($request->get('page', '0')) ?: 1;
         $count = min(intval($request->get('count', '0')) ?: 20, 100);
+        $includes = $this->parseIncludes($request->get('include', ''));
 
         $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
         $this->resultsFormatter->format($results['results']->all(), $options);
 
-        $data = (new ApiEntityListFormatter($results['results']->all()))
-            ->withType()->withTags()
-            ->withField('preview_html', function (Entity $entity) {
-                return [
-                    'name'    => (string) $entity->getAttribute('preview_name'),
-                    'content' => (string) $entity->getAttribute('preview_content'),
-                ];
-            })->format();
+        $formatter = new ApiEntityListFormatter($results['results']->all());
+        $formatter->withType(); // Always include type as it's essential for search results
+
+        foreach ($includes as $include) {
+            if (isset(self::VALID_INCLUDES[$include])) {
+                $method = self::VALID_INCLUDES[$include];
+                $formatter->$method();
+            }
+        }
+
+        $formatter->withField('preview_html', function (Entity $entity) {
+            return [
+                'name' => (string) $entity->getAttribute('preview_name'),
+                'content' => (string) $entity->getAttribute('preview_content'),
+            ];
+        });
 
         return response()->json([
-            'data'  => $data,
+            'data' => $formatter->format(),
             'total' => $results['total'],
         ]);
     }
+
+    /**
+     * Parse and validate the include parameter.
+     *
+     * @param string $includeString Comma-separated list of includes
+     * @return array<string>
+     */
+    protected function parseIncludes(string $includeString): array
+    {
+        if (empty($includeString)) {
+            return [];
+        }
+
+        return array_filter(
+            explode(',', strtolower($includeString)),
+            fn($include) => isset (self::VALID_INCLUDES[$include])
+        );
+    }
 }
diff --git a/dev/api/requests/search-all.http b/dev/api/requests/search-all.http
index ee522381641..7fa1a304e21 100644
--- a/dev/api/requests/search-all.http
+++ b/dev/api/requests/search-all.http
@@ -1 +1 @@
-GET /api/search?query=cats+{created_by:me}&page=1&count=2
\ No newline at end of file
+GET /api/search?query=cats+{created_by:me}&page=1&count=2&include=titles,tags
diff --git a/dev/api/responses/search-all.json b/dev/api/responses/search-all.json
index 2c7584e3fd0..bb45b795903 100644
--- a/dev/api/responses/search-all.json
+++ b/dev/api/responses/search-all.json
@@ -9,6 +9,7 @@
       "updated_at": "2021-11-14T15:57:35.000000Z",
       "type": "chapter",
       "url": "https://example.com/books/my-book/chapter/a-chapter-for-cats",
+      "book_title": "Cats",
       "preview_html": {
         "name": "A chapter for <strong>cats</strong>",
         "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
@@ -27,6 +28,8 @@
       "updated_at": "2021-11-14T15:56:49.000000Z",
       "type": "page",
       "url": "https://example.com/books/my-book/page/the-hows-and-whys-of-cats",
+      "book_title": "Cats",
+      "chapter_title": "A chapter for cats",
       "preview_html": {
         "name": "The hows and whys of <strong>cats</strong>",
         "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
@@ -56,6 +59,8 @@
       "updated_at": "2021-11-14T16:02:39.000000Z",
       "type": "page",
       "url": "https://example.com/books/my-book/page/how-advanced-are-cats",
+      "book_title": "Cats",
+      "chapter_title": "A chapter for cats",
       "preview_html": {
         "name": "How advanced are <strong>cats</strong>?",
         "content": "<strong>cats</strong> are some of the most advanced animals in the world."
@@ -64,4 +69,4 @@
     }
   ],
   "total": 3
-}
\ No newline at end of file
+}
diff --git a/tests/Api/SearchApiTest.php b/tests/Api/SearchApiTest.php
index 2a186e8d632..b80ed4530ba 100644
--- a/tests/Api/SearchApiTest.php
+++ b/tests/Api/SearchApiTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Api;
 
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
@@ -45,7 +46,7 @@ public function test_all_endpoint_returns_entity_url()
         $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
         $resp->assertJsonFragment([
             'type' => 'page',
-            'url'  => $page->getUrl(),
+            'url' => $page->getUrl(),
         ]);
     }
 
@@ -57,10 +58,10 @@ public function test_all_endpoint_returns_items_with_preview_html()
 
         $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?query=superuniquevalue');
         $resp->assertJsonFragment([
-            'type'         => 'book',
-            'url'          => $book->getUrl(),
+            'type' => 'book',
+            'url' => $book->getUrl(),
             'preview_html' => [
-                'name'    => 'name with <strong>superuniquevalue</strong> within',
+                'name' => 'name with <strong>superuniquevalue</strong> within',
                 'content' => 'Description with <strong>superuniquevalue</strong> within',
             ],
         ]);
@@ -74,4 +75,112 @@ public function test_all_endpoint_requires_query_parameter()
         $resp = $this->actingAsApiEditor()->get($this->baseEndpoint . '?query=myqueryvalue');
         $resp->assertOk();
     }
+
+    public function test_all_endpoint_includes_book_and_chapter_titles_when_requested()
+    {
+        $this->actingAsApiEditor();
+
+        $book = $this->entities->book();
+        $chapter = $this->entities->chapter();
+        $page = $this->entities->newPage();
+
+        $book->name = 'My Test Book';
+        $book->save();
+
+        $chapter->name = 'My Test Chapter';
+        $chapter->book_id = $book->id;
+        $chapter->save();
+
+        $page->name = 'My Test Page With UniqueSearchTerm';
+        $page->book_id = $book->id;
+        $page->chapter_id = $chapter->id;
+        $page->save();
+
+        $page->indexForSearch();
+
+        // Test without include parameter
+        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm');
+        $resp->assertOk();
+        $resp->assertDontSee('book_title');
+        $resp->assertDontSee('chapter_title');
+
+        // Test with include parameter
+        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm&include=titles');
+        $resp->assertOk();
+        $resp->assertJsonFragment([
+            'name' => 'My Test Page With UniqueSearchTerm',
+            'book_title' => 'My Test Book',
+            'chapter_title' => 'My Test Chapter',
+            'type' => 'page'
+        ]);
+    }
+
+    public function test_all_endpoint_validates_include_parameter()
+    {
+        $this->actingAsApiEditor();
+
+        // Test invalid include value
+        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=invalid');
+        $resp->assertOk();
+        $resp->assertDontSee('book_title');
+
+        // Test SQL injection attempt
+        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=titles;DROP TABLE users');
+        $resp->assertStatus(422);
+
+        // Test multiple includes
+        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=titles,tags');
+        $resp->assertOk();
+    }
+
+    public function test_all_endpoint_includes_tags_when_requested()
+    {
+        $this->actingAsApiEditor();
+
+        // Create a page and give it a unique name for search
+        $page = $this->entities->page();
+        $page->name = 'Page With UniqueSearchTerm';
+        $page->save();
+
+        // Save tags to the page using the existing saveTagsToEntity method
+        $tags = [
+            ['name' => 'SampleTag', 'value' => 'SampleValue']
+        ];
+        app(\BookStack\Activity\TagRepo::class)->saveTagsToEntity($page, $tags);
+
+        // Ensure the page is indexed for search
+        $page->indexForSearch();
+
+        // Test without the "tags" include
+        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm');
+        $resp->assertOk();
+        $resp->assertDontSee('tags');
+
+        // Test with the "tags" include
+        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm&include=tags');
+        $resp->assertOk();
+        
+        // Assert that tags are included in the response
+        $resp->assertJsonFragment([
+            'name' => 'SampleTag',
+            'value' => 'SampleValue',
+        ]);
+
+        // Optionally: check the structure to match the tag order as well
+        $resp->assertJsonStructure([
+            'data' => [
+                '*' => [
+                    'tags' => [
+                        '*' => [
+                            'name',
+                            'value',
+                            'order',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+
 }

From 90a80705180d003a1e896bc307d3abc1720366dc Mon Sep 17 00:00:00 2001
From: Rashad <rashadkhan359@gmail.com>
Date: Mon, 21 Oct 2024 03:01:33 +0530
Subject: [PATCH 329/666] Eager loading for titles

---
 app/Api/ApiEntityListFormatter.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/Api/ApiEntityListFormatter.php b/app/Api/ApiEntityListFormatter.php
index 23fa8e6ea72..2fd9b7c5507 100644
--- a/app/Api/ApiEntityListFormatter.php
+++ b/app/Api/ApiEntityListFormatter.php
@@ -106,6 +106,10 @@ public function withRelatedTitles(): self
      */
     public function format(): array
     {
+        if ($this->includeRelatedTitles) {
+            $this->loadRelatedTitles();
+        }
+
         $results = [];
 
         foreach ($this->list as $item) {
@@ -115,6 +119,23 @@ public function format(): array
         return $results;
     }
 
+    /**
+     * Eager load the related book and chapter data when needed.
+     */
+    protected function loadRelatedTitles(): void
+    {
+        $pages = collect($this->list)->filter(fn($item) => $item instanceof Page);
+
+        foreach ($this->list as $entity) {
+            if (method_exists($entity, 'book')) {
+                $entity->load('book');
+            }
+            if ($entity instanceof Page && $entity->chapter_id) {
+                $entity->load('chapter');
+            }
+        }
+    }
+
     /**
      * Format a single entity item to a plain array.
      */

From 06ffd8ee721a74dea9c584002b2793cc68c873a0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Oct 2024 12:13:41 +0100
Subject: [PATCH 330/666] Zip Exports: Added attachment/image link resolving &
 JSON null handling

---
 .../ZipExportModels/ZipExportAttachment.php   |  2 +-
 .../ZipExportModels/ZipExportImage.php        |  2 +-
 .../ZipExportModels/ZipExportModel.php        | 17 +++++++---
 app/Exports/ZipExportModels/ZipExportPage.php |  2 +-
 app/Exports/ZipExportModels/ZipExportTag.php  |  2 +-
 app/Exports/ZipExportReferences.php           |  3 ++
 app/Exports/ZipReferenceParser.php            |  6 ++--
 .../AttachmentModelResolver.php               | 22 +++++++++++++
 .../ModelResolvers/ImageModelResolver.php     | 33 +++++++++++++++++++
 9 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 app/References/ModelResolvers/AttachmentModelResolver.php
 create mode 100644 app/References/ModelResolvers/ImageModelResolver.php

diff --git a/app/Exports/ZipExportModels/ZipExportAttachment.php b/app/Exports/ZipExportModels/ZipExportAttachment.php
index d6d674a913f..d79a16cc109 100644
--- a/app/Exports/ZipExportModels/ZipExportAttachment.php
+++ b/app/Exports/ZipExportModels/ZipExportAttachment.php
@@ -5,7 +5,7 @@
 use BookStack\Exports\ZipExportFiles;
 use BookStack\Uploads\Attachment;
 
-class ZipExportAttachment implements ZipExportModel
+class ZipExportAttachment extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
diff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExportModels/ZipExportImage.php
index 73fe3bbf594..540d3d4e55d 100644
--- a/app/Exports/ZipExportModels/ZipExportImage.php
+++ b/app/Exports/ZipExportModels/ZipExportImage.php
@@ -4,7 +4,7 @@
 
 use BookStack\Activity\Models\Tag;
 
-class ZipExportImage implements ZipExportModel
+class ZipExportImage extends ZipExportModel
 {
     public string $name;
     public string $file;
diff --git a/app/Exports/ZipExportModels/ZipExportModel.php b/app/Exports/ZipExportModels/ZipExportModel.php
index e1cb616de52..26b994c018e 100644
--- a/app/Exports/ZipExportModels/ZipExportModel.php
+++ b/app/Exports/ZipExportModels/ZipExportModel.php
@@ -2,10 +2,19 @@
 
 namespace BookStack\Exports\ZipExportModels;
 
-use BookStack\App\Model;
-use BookStack\Exports\ZipExportFiles;
+use JsonSerializable;
 
-interface ZipExportModel
+abstract class ZipExportModel implements JsonSerializable
 {
-//    public static function fromModel(Model $model, ZipExportFiles $files): self;
+    /**
+     * Handle the serialization to JSON.
+     * For these exports, we filter out optional (represented as nullable) fields
+     * just to clean things up and prevent confusion to avoid null states in the
+     * resulting export format itself.
+     */
+    public function jsonSerialize(): array
+    {
+        $publicProps = get_object_vars(...)->__invoke($this);
+        return array_filter($publicProps, fn ($value) => $value !== null);
+    }
 }
diff --git a/app/Exports/ZipExportModels/ZipExportPage.php b/app/Exports/ZipExportModels/ZipExportPage.php
index 6589ce60ae1..c7a9503546f 100644
--- a/app/Exports/ZipExportModels/ZipExportPage.php
+++ b/app/Exports/ZipExportModels/ZipExportPage.php
@@ -6,7 +6,7 @@
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exports\ZipExportFiles;
 
-class ZipExportPage implements ZipExportModel
+class ZipExportPage extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
diff --git a/app/Exports/ZipExportModels/ZipExportTag.php b/app/Exports/ZipExportModels/ZipExportTag.php
index 636c9ff6dc4..09ae9f06cbe 100644
--- a/app/Exports/ZipExportModels/ZipExportTag.php
+++ b/app/Exports/ZipExportModels/ZipExportTag.php
@@ -4,7 +4,7 @@
 
 use BookStack\Activity\Models\Tag;
 
-class ZipExportTag implements ZipExportModel
+class ZipExportTag extends ZipExportModel
 {
     public string $name;
     public ?string $value = null;
diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExportReferences.php
index 89deb7edad3..76a7fedbec4 100644
--- a/app/Exports/ZipExportReferences.php
+++ b/app/Exports/ZipExportReferences.php
@@ -44,11 +44,14 @@ public function buildReferences(): void
                 // TODO - Handle found link to $model
                 //   - Validate we can see/access $model, or/and that it's
                 //     part of the export in progress.
+
+                // TODO - Add images after the above to files
                 return '[CAT]';
             });
             // TODO - markdown
         }
 
+//        dd('end');
         // TODO - Parse chapter desc html
         // TODO - Parse book desc html
     }
diff --git a/app/Exports/ZipReferenceParser.php b/app/Exports/ZipReferenceParser.php
index 6ca826bc3f4..820920da28d 100644
--- a/app/Exports/ZipReferenceParser.php
+++ b/app/Exports/ZipReferenceParser.php
@@ -4,9 +4,11 @@
 
 use BookStack\App\Model;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\References\ModelResolvers\AttachmentModelResolver;
 use BookStack\References\ModelResolvers\BookLinkModelResolver;
 use BookStack\References\ModelResolvers\ChapterLinkModelResolver;
 use BookStack\References\ModelResolvers\CrossLinkModelResolver;
+use BookStack\References\ModelResolvers\ImageModelResolver;
 use BookStack\References\ModelResolvers\PageLinkModelResolver;
 use BookStack\References\ModelResolvers\PagePermalinkModelResolver;
 
@@ -24,8 +26,8 @@ public function __construct(EntityQueries $queries)
             new PageLinkModelResolver($queries->pages),
             new ChapterLinkModelResolver($queries->chapters),
             new BookLinkModelResolver($queries->books),
-            // TODO - Image
-            // TODO - Attachment
+            new ImageModelResolver(),
+            new AttachmentModelResolver(),
         ];
     }
 
diff --git a/app/References/ModelResolvers/AttachmentModelResolver.php b/app/References/ModelResolvers/AttachmentModelResolver.php
new file mode 100644
index 00000000000..e870d515bbe
--- /dev/null
+++ b/app/References/ModelResolvers/AttachmentModelResolver.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BookStack\References\ModelResolvers;
+
+use BookStack\Uploads\Attachment;
+
+class AttachmentModelResolver implements CrossLinkModelResolver
+{
+    public function resolve(string $link): ?Attachment
+    {
+        $pattern = '/^' . preg_quote(url('/attachments'), '/') . '\/(\d+)/';
+        $matches = [];
+        $match = preg_match($pattern, $link, $matches);
+        if (!$match) {
+            return null;
+        }
+
+        $id = intval($matches[1]);
+
+        return Attachment::query()->find($id);
+    }
+}
diff --git a/app/References/ModelResolvers/ImageModelResolver.php b/app/References/ModelResolvers/ImageModelResolver.php
new file mode 100644
index 00000000000..331dd593b73
--- /dev/null
+++ b/app/References/ModelResolvers/ImageModelResolver.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace BookStack\References\ModelResolvers;
+
+use BookStack\Uploads\Image;
+
+class ImageModelResolver implements CrossLinkModelResolver
+{
+    public function resolve(string $link): ?Image
+    {
+        $pattern = '/^' . preg_quote(url('/uploads/images'), '/') . '\/(.+)/';
+        $matches = [];
+        $match = preg_match($pattern, $link, $matches);
+        if (!$match) {
+            return null;
+        }
+
+        $path = $matches[1];
+
+        // Strip thumbnail element from path if existing
+        $originalPathSplit = array_filter(explode('/', $path), function (string $part) {
+            $resizedDir = (str_starts_with($part, 'thumbs-') || str_starts_with($part, 'scaled-'));
+            $missingExtension = !str_contains($part, '.');
+
+            return !($resizedDir && $missingExtension);
+        });
+
+        // Build a database-format image path and search for the image entry
+        $fullPath = '/uploads/images/' . ltrim(implode('/', $originalPathSplit), '/');
+
+        return Image::query()->where('path', '=', $fullPath)->first();
+    }
+}

From 4fb4fe0931d220ffb9d7e173388351047b665f4c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Oct 2024 13:59:15 +0100
Subject: [PATCH 331/666] ZIP Exports: Added working image handling/inclusion

---
 app/Exports/ZipExportBuilder.php              |  2 +-
 app/Exports/ZipExportFiles.php                | 51 ++++++++++++++-
 .../ZipExportModels/ZipExportImage.php        | 16 ++++-
 app/Exports/ZipExportReferences.php           | 62 ++++++++++++++++---
 app/Uploads/ImageService.php                  | 13 ++++
 app/Uploads/ImageStorageDisk.php              |  9 +++
 dev/docs/portable-zip-file-format.md          | 13 ++--
 7 files changed, 148 insertions(+), 18 deletions(-)

diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExportBuilder.php
index 720b4997d4a..5c56e531b40 100644
--- a/app/Exports/ZipExportBuilder.php
+++ b/app/Exports/ZipExportBuilder.php
@@ -35,7 +35,7 @@ public function buildForPage(Page $page): string
      */
     protected function build(): string
     {
-        $this->references->buildReferences();
+        $this->references->buildReferences($this->files);
 
         $this->data['exported_at'] = date(DATE_ATOM);
         $this->data['instance'] = [
diff --git a/app/Exports/ZipExportFiles.php b/app/Exports/ZipExportFiles.php
index d3ee70e93f2..27b6f937a38 100644
--- a/app/Exports/ZipExportFiles.php
+++ b/app/Exports/ZipExportFiles.php
@@ -4,6 +4,8 @@
 
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
+use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageService;
 use Illuminate\Support\Str;
 
 class ZipExportFiles
@@ -14,8 +16,15 @@ class ZipExportFiles
      */
     protected array $attachmentRefsById = [];
 
+    /**
+     * References for images by image ID.
+     * @var array<int, string>
+     */
+    protected array $imageRefsById = [];
+
     public function __construct(
         protected AttachmentService $attachmentService,
+        protected ImageService $imageService,
     ) {
     }
 
@@ -30,15 +39,46 @@ public function referenceForAttachment(Attachment $attachment): string
             return $this->attachmentRefsById[$attachment->id];
         }
 
+        $existingFiles = $this->getAllFileNames();
         do {
             $fileName = Str::random(20) . '.' . $attachment->extension;
-        } while (in_array($fileName, $this->attachmentRefsById));
+        } while (in_array($fileName, $existingFiles));
 
         $this->attachmentRefsById[$attachment->id] = $fileName;
 
         return $fileName;
     }
 
+    /**
+     * Gain a reference to the given image instance.
+     * This is expected to be an image that the user has visibility of,
+     * no permission/access checks are performed here.
+     */
+    public function referenceForImage(Image $image): string
+    {
+        if (isset($this->imageRefsById[$image->id])) {
+            return $this->imageRefsById[$image->id];
+        }
+
+        $existingFiles = $this->getAllFileNames();
+        $extension = pathinfo($image->path, PATHINFO_EXTENSION);
+        do {
+            $fileName = Str::random(20) . '.' . $extension;
+        } while (in_array($fileName, $existingFiles));
+
+        $this->imageRefsById[$image->id] = $fileName;
+
+        return $fileName;
+    }
+
+    protected function getAllFileNames(): array
+    {
+        return array_merge(
+            array_values($this->attachmentRefsById),
+            array_values($this->imageRefsById),
+        );
+    }
+
     /**
      * Extract each of the ZIP export tracked files.
      * Calls the given callback for each tracked file, passing a temporary
@@ -54,5 +94,14 @@ public function extractEach(callable $callback): void
             stream_copy_to_stream($stream, $tmpFileStream);
             $callback($tmpFile, $ref);
         }
+
+        foreach ($this->imageRefsById as $imageId => $ref) {
+            $image = Image::query()->find($imageId);
+            $stream = $this->imageService->getImageStream($image);
+            $tmpFile = tempnam(sys_get_temp_dir(), 'bszipimage-');
+            $tmpFileStream = fopen($tmpFile, 'w');
+            stream_copy_to_stream($stream, $tmpFileStream);
+            $callback($tmpFile, $ref);
+        }
     }
 }
diff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExportModels/ZipExportImage.php
index 540d3d4e55d..39f1d101298 100644
--- a/app/Exports/ZipExportModels/ZipExportImage.php
+++ b/app/Exports/ZipExportModels/ZipExportImage.php
@@ -2,10 +2,24 @@
 
 namespace BookStack\Exports\ZipExportModels;
 
-use BookStack\Activity\Models\Tag;
+use BookStack\Exports\ZipExportFiles;
+use BookStack\Uploads\Image;
 
 class ZipExportImage extends ZipExportModel
 {
+    public ?int $id = null;
     public string $name;
     public string $file;
+    public string $type;
+
+    public static function fromModel(Image $model, ZipExportFiles $files): self
+    {
+        $instance = new self();
+        $instance->id = $model->id;
+        $instance->name = $model->name;
+        $instance->type = $model->type;
+        $instance->file = $files->referenceForImage($model);
+
+        return $instance;
+    }
 }
diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExportReferences.php
index 76a7fedbec4..19672db0a0e 100644
--- a/app/Exports/ZipExportReferences.php
+++ b/app/Exports/ZipExportReferences.php
@@ -3,8 +3,13 @@
 namespace BookStack\Exports;
 
 use BookStack\App\Model;
+use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExportModels\ZipExportAttachment;
+use BookStack\Exports\ZipExportModels\ZipExportImage;
+use BookStack\Exports\ZipExportModels\ZipExportModel;
 use BookStack\Exports\ZipExportModels\ZipExportPage;
+use BookStack\Uploads\Attachment;
+use BookStack\Uploads\Image;
 
 class ZipExportReferences
 {
@@ -16,6 +21,9 @@ class ZipExportReferences
     /** @var ZipExportAttachment[] */
     protected array $attachments = [];
 
+    /** @var ZipExportImage[] */
+    protected array $images = [];
+
     public function __construct(
         protected ZipReferenceParser $parser,
     ) {
@@ -34,19 +42,12 @@ public function addPage(ZipExportPage $page): void
         }
     }
 
-    public function buildReferences(): void
+    public function buildReferences(ZipExportFiles $files): void
     {
-        // TODO - References to images, attachments, other entities
-
         // TODO - Parse page MD & HTML
         foreach ($this->pages as $page) {
-            $page->html = $this->parser->parse($page->html ?? '', function (Model $model): ?string {
-                // TODO - Handle found link to $model
-                //   - Validate we can see/access $model, or/and that it's
-                //     part of the export in progress.
-
-                // TODO - Add images after the above to files
-                return '[CAT]';
+            $page->html = $this->parser->parse($page->html ?? '', function (Model $model) use ($files, $page) {
+                return $this->handleModelReference($model, $page, $files);
             });
             // TODO - markdown
         }
@@ -55,4 +56,45 @@ public function buildReferences(): void
         // TODO - Parse chapter desc html
         // TODO - Parse book desc html
     }
+
+    protected function handleModelReference(Model $model, ZipExportModel $exportModel, ZipExportFiles $files): ?string
+    {
+        // TODO - References to other entities
+
+        // Handle attachment references
+        // No permission check needed here since they would only already exist in this
+        // reference context if already allowed via their entity access.
+        if ($model instanceof Attachment) {
+            if (isset($this->attachments[$model->id])) {
+                return "[[bsexport:attachment:{$model->id}]]";
+            }
+            return null;
+        }
+
+        // Handle image references
+        if ($model instanceof Image) {
+            // Only handle gallery and drawio images
+            if ($model->type !== 'gallery' && $model->type !== 'drawio') {
+                return null;
+            }
+
+            // We don't expect images to be part of book/chapter content
+            if (!($exportModel instanceof ZipExportPage)) {
+                return null;
+            }
+
+            $page = $model->getPage();
+            if ($page && userCan('view', $page)) {
+                if (!isset($this->images[$model->id])) {
+                    $exportImage = ZipExportImage::fromModel($model, $files);
+                    $this->images[$model->id] = $exportImage;
+                    $exportModel->images[] = $exportImage;
+                }
+                return "[[bsexport:image:{$model->id}]]";
+            }
+            return null;
+        }
+
+        return null;
+    }
 }
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 8d8da61ec18..e501cc7b12d 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -133,6 +133,19 @@ public function getImageData(Image $image): string
         return $disk->get($image->path);
     }
 
+    /**
+     * Get the raw data content from an image.
+     *
+     * @throws Exception
+     * @returns ?resource
+     */
+    public function getImageStream(Image $image): mixed
+    {
+        $disk = $this->storage->getDisk();
+
+        return $disk->stream($image->path);
+    }
+
     /**
      * Destroy an image along with its revisions, thumbnails and remaining folders.
      *
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index 798b72abdbf..8df702e0d94 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -55,6 +55,15 @@ public function get(string $path): ?string
         return $this->filesystem->get($this->adjustPathForDisk($path));
     }
 
+    /**
+     * Get a stream to the file at the given path.
+     * @returns ?resource
+     */
+    public function stream(string $path): mixed
+    {
+        return $this->filesystem->readStream($this->adjustPathForDisk($path));
+    }
+
     /**
      * Save the given image data at the given path. Can choose to set
      * the image as public which will update its visibility after saving.
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index 7a99563d14b..1ba5872018c 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -46,13 +46,12 @@ This can be done using the following format:
 [[bsexport:<object>:<reference>]]
 ```
 
-Images and attachments are referenced via their file name within the `files/` directory.
-Otherwise, other content types are referenced by `id`.
+References are to the `id` for data objects.
 Here's an example of each type of such reference that could be used:
 
 ```
-[[bsexport:image:an-image-path.png]]
-[[bsexport:attachment:an-image-path.png]]
+[[bsexport:image:22]]
+[[bsexport:attachment:55]]
 [[bsexport:page:40]]
 [[bsexport:chapter:2]]
 [[bsexport:book:8]]
@@ -121,10 +120,14 @@ The page editor type, and edit content will be determined by what content is pro
 
 #### Image
 
+- `id` - Number, optional, original ID for the page from exported system.
 - `name` - String, required, name of image.
 - `file` - String reference, required, reference to image file.
+- `type` - String, required, must be 'gallery' or 'drawio'
 
-File must be an image type accepted by BookStack (png, jpg, gif, webp)
+File must be an image type accepted by BookStack (png, jpg, gif, webp).
+Images of type 'drawio' are expected to be png with draw.io drawing data
+embedded within it.
 
 #### Attachment
 

From f732ef05d5b60a48ce3b42e05155e9e91d92d927 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Oct 2024 10:48:26 +0100
Subject: [PATCH 332/666] ZIP Exports: Reorganised files, added page md parsing

---
 .../Controllers/PageExportController.php      |  2 +-
 .../Models}/ZipExportAttachment.php           |  4 ++--
 .../Models}/ZipExportImage.php                |  4 ++--
 .../Models}/ZipExportModel.php                |  2 +-
 .../Models}/ZipExportPage.php                 |  4 ++--
 .../Models}/ZipExportTag.php                  |  2 +-
 .../{ => ZipExports}/ZipExportBuilder.php     |  4 ++--
 .../{ => ZipExports}/ZipExportFiles.php       |  2 +-
 .../{ => ZipExports}/ZipExportReferences.php  | 23 +++++++++++--------
 .../{ => ZipExports}/ZipReferenceParser.php   |  2 +-
 10 files changed, 26 insertions(+), 23 deletions(-)
 rename app/Exports/{ZipExportModels => ZipExports/Models}/ZipExportAttachment.php (90%)
 rename app/Exports/{ZipExportModels => ZipExports/Models}/ZipExportImage.php (84%)
 rename app/Exports/{ZipExportModels => ZipExports/Models}/ZipExportModel.php (92%)
 rename app/Exports/{ZipExportModels => ZipExports/Models}/ZipExportPage.php (91%)
 rename app/Exports/{ZipExportModels => ZipExports/Models}/ZipExportTag.php (92%)
 rename app/Exports/{ => ZipExports}/ZipExportBuilder.php (94%)
 rename app/Exports/{ => ZipExports}/ZipExportFiles.php (98%)
 rename app/Exports/{ => ZipExports}/ZipExportReferences.php (83%)
 rename app/Exports/{ => ZipExports}/ZipReferenceParser.php (98%)

diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 01611fd2121..34e67ffcf70 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -6,7 +6,7 @@
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exports\ExportFormatter;
-use BookStack\Exports\ZipExportBuilder;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
 use Throwable;
 
diff --git a/app/Exports/ZipExportModels/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
similarity index 90%
rename from app/Exports/ZipExportModels/ZipExportAttachment.php
rename to app/Exports/ZipExports/Models/ZipExportAttachment.php
index d79a16cc109..8c89ae11f14 100644
--- a/app/Exports/ZipExportModels/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;
 
-use BookStack\Exports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipExportFiles;
 use BookStack\Uploads\Attachment;
 
 class ZipExportAttachment extends ZipExportModel
diff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
similarity index 84%
rename from app/Exports/ZipExportModels/ZipExportImage.php
rename to app/Exports/ZipExports/Models/ZipExportImage.php
index 39f1d101298..05d828734a0 100644
--- a/app/Exports/ZipExportModels/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;
 
-use BookStack\Exports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipExportFiles;
 use BookStack\Uploads\Image;
 
 class ZipExportImage extends ZipExportModel
diff --git a/app/Exports/ZipExportModels/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.php
similarity index 92%
rename from app/Exports/ZipExportModels/ZipExportModel.php
rename to app/Exports/ZipExports/Models/ZipExportModel.php
index 26b994c018e..8d0c0a4370b 100644
--- a/app/Exports/ZipExportModels/ZipExportModel.php
+++ b/app/Exports/ZipExports/Models/ZipExportModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;
 
 use JsonSerializable;
 
diff --git a/app/Exports/ZipExportModels/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
similarity index 91%
rename from app/Exports/ZipExportModels/ZipExportPage.php
rename to app/Exports/ZipExports/Models/ZipExportPage.php
index c7a9503546f..bae46ca8225 100644
--- a/app/Exports/ZipExportModels/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Exports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipExportFiles;
 
 class ZipExportPage extends ZipExportModel
 {
diff --git a/app/Exports/ZipExportModels/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
similarity index 92%
rename from app/Exports/ZipExportModels/ZipExportTag.php
rename to app/Exports/ZipExports/Models/ZipExportTag.php
index 09ae9f06cbe..d4e3c4290b3 100644
--- a/app/Exports/ZipExportModels/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;
 
 use BookStack\Activity\Models\Tag;
 
diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
similarity index 94%
rename from app/Exports/ZipExportBuilder.php
rename to app/Exports/ZipExports/ZipExportBuilder.php
index 5c56e531b40..15edebea574 100644
--- a/app/Exports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;
-use BookStack\Exports\ZipExportModels\ZipExportPage;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use ZipArchive;
 
 class ZipExportBuilder
diff --git a/app/Exports/ZipExportFiles.php b/app/Exports/ZipExports/ZipExportFiles.php
similarity index 98%
rename from app/Exports/ZipExportFiles.php
rename to app/Exports/ZipExports/ZipExportFiles.php
index 27b6f937a38..8f0a6bd4031 100644
--- a/app/Exports/ZipExportFiles.php
+++ b/app/Exports/ZipExports/ZipExportFiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;
 
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
similarity index 83%
rename from app/Exports/ZipExportReferences.php
rename to app/Exports/ZipExports/ZipExportReferences.php
index 19672db0a0e..c3565aaa383 100644
--- a/app/Exports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;
 
 use BookStack\App\Model;
-use BookStack\Entities\Models\Page;
-use BookStack\Exports\ZipExportModels\ZipExportAttachment;
-use BookStack\Exports\ZipExportModels\ZipExportImage;
-use BookStack\Exports\ZipExportModels\ZipExportModel;
-use BookStack\Exports\ZipExportModels\ZipExportPage;
+use BookStack\Exports\ZipExports\Models\ZipExportAttachment;
+use BookStack\Exports\ZipExports\Models\ZipExportImage;
+use BookStack\Exports\ZipExports\Models\ZipExportModel;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
 
@@ -44,12 +43,16 @@ public function addPage(ZipExportPage $page): void
 
     public function buildReferences(ZipExportFiles $files): void
     {
-        // TODO - Parse page MD & HTML
+        // Parse page content first
         foreach ($this->pages as $page) {
-            $page->html = $this->parser->parse($page->html ?? '', function (Model $model) use ($files, $page) {
+            $handler = function (Model $model) use ($files, $page) {
                 return $this->handleModelReference($model, $page, $files);
-            });
-            // TODO - markdown
+            };
+
+            $page->html = $this->parser->parse($page->html ?? '', $handler);
+            if ($page->markdown) {
+                $page->markdown = $this->parser->parse($page->markdown, $handler);
+            }
         }
 
 //        dd('end');
diff --git a/app/Exports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
similarity index 98%
rename from app/Exports/ZipReferenceParser.php
rename to app/Exports/ZipExports/ZipReferenceParser.php
index 820920da28d..4d16dbc6110 100644
--- a/app/Exports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;
 
 use BookStack\App\Model;
 use BookStack\Entities\Queries\EntityQueries;

From 42ada66fdda9c3eb35a163ae4584f77e226f0971 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Oct 2024 11:30:32 +0100
Subject: [PATCH 333/666] ZIP Exports: Added core logic for books/chapters

---
 app/Entities/Models/Chapter.php               |  1 +
 .../ZipExports/Models/ZipExportBook.php       | 53 ++++++++++++++++
 .../ZipExports/Models/ZipExportChapter.php    | 45 ++++++++++++++
 .../ZipExports/Models/ZipExportPage.php       | 12 ++++
 app/Exports/ZipExports/ZipExportBuilder.php   | 30 +++++++++
 .../ZipExports/ZipExportReferences.php        | 61 ++++++++++++++++---
 dev/docs/portable-zip-file-format.md          |  2 +-
 7 files changed, 195 insertions(+), 9 deletions(-)
 create mode 100644 app/Exports/ZipExports/Models/ZipExportBook.php
 create mode 100644 app/Exports/ZipExports/Models/ZipExportChapter.php

diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index c926aaa647a..088d199da67 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -60,6 +60,7 @@ public function defaultTemplate(): BelongsTo
 
     /**
      * Get the visible pages in this chapter.
+     * @returns Collection<Page>
      */
     public function getVisiblePages(): Collection
     {
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
new file mode 100644
index 00000000000..5a0c5806ba8
--- /dev/null
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace BookStack\Exports\ZipExports\Models;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exports\ZipExports\ZipExportFiles;
+
+class ZipExportBook extends ZipExportModel
+{
+    public ?int $id = null;
+    public string $name;
+    public ?string $description_html = null;
+    public ?string $cover = null;
+    /** @var ZipExportChapter[] */
+    public array $chapters = [];
+    /** @var ZipExportPage[] */
+    public array $pages = [];
+    /** @var ZipExportTag[] */
+    public array $tags = [];
+
+    public static function fromModel(Book $model, ZipExportFiles $files): self
+    {
+        $instance = new self();
+        $instance->id = $model->id;
+        $instance->name = $model->name;
+        $instance->description_html = $model->descriptionHtml();
+
+        if ($model->cover) {
+            $instance->cover = $files->referenceForImage($model->cover);
+        }
+
+        $instance->tags = ZipExportTag::fromModelArray($model->tags()->get()->all());
+
+        $chapters = [];
+        $pages = [];
+
+        $children = $model->getDirectVisibleChildren()->all();
+        foreach ($children as $child) {
+            if ($child instanceof Chapter) {
+                $chapters[] = $child;
+            } else if ($child instanceof Page) {
+                $pages[] = $child;
+            }
+        }
+
+        $instance->pages = ZipExportPage::fromModelArray($pages, $files);
+        $instance->chapters = ZipExportChapter::fromModelArray($chapters, $files);
+
+        return $instance;
+    }
+}
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
new file mode 100644
index 00000000000..cd5765f48bc
--- /dev/null
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace BookStack\Exports\ZipExports\Models;
+
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exports\ZipExports\ZipExportFiles;
+
+class ZipExportChapter extends ZipExportModel
+{
+    public ?int $id = null;
+    public string $name;
+    public ?string $description_html = null;
+    public ?int $priority = null;
+    /** @var ZipExportPage[] */
+    public array $pages = [];
+    /** @var ZipExportTag[] */
+    public array $tags = [];
+
+    public static function fromModel(Chapter $model, ZipExportFiles $files): self
+    {
+        $instance = new self();
+        $instance->id = $model->id;
+        $instance->name = $model->name;
+        $instance->description_html = $model->descriptionHtml();
+        $instance->priority = $model->priority;
+        $instance->tags = ZipExportTag::fromModelArray($model->tags()->get()->all());
+
+        $pages = $model->getVisiblePages()->filter(fn (Page $page) => !$page->draft)->all();
+        $instance->pages = ZipExportPage::fromModelArray($pages, $files);
+
+        return $instance;
+    }
+
+    /**
+     * @param Chapter[] $chapterArray
+     * @return self[]
+     */
+    public static function fromModelArray(array $chapterArray, ZipExportFiles $files): array
+    {
+        return array_values(array_map(function (Chapter $chapter) use ($files) {
+            return self::fromModel($chapter, $files);
+        }, $chapterArray));
+    }
+}
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index bae46ca8225..8075595f228 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -26,6 +26,7 @@ public static function fromModel(Page $model, ZipExportFiles $files): self
         $instance->id = $model->id;
         $instance->name = $model->name;
         $instance->html = (new PageContent($model))->render();
+        $instance->priority = $model->priority;
 
         if (!empty($model->markdown)) {
             $instance->markdown = $model->markdown;
@@ -36,4 +37,15 @@ public static function fromModel(Page $model, ZipExportFiles $files): self
 
         return $instance;
     }
+
+    /**
+     * @param Page[] $pageArray
+     * @return self[]
+     */
+    public static function fromModelArray(array $pageArray, ZipExportFiles $files): array
+    {
+        return array_values(array_map(function (Page $page) use ($files) {
+            return self::fromModel($page, $files);
+        }, $pageArray));
+    }
 }
diff --git a/app/Exports/ZipExports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
index 15edebea574..42fb03541c0 100644
--- a/app/Exports/ZipExports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -2,8 +2,12 @@
 
 namespace BookStack\Exports\ZipExports;
 
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use ZipArchive;
 
@@ -30,6 +34,32 @@ public function buildForPage(Page $page): string
         return $this->build();
     }
 
+    /**
+     * @throws ZipExportException
+     */
+    public function buildForChapter(Chapter $chapter): string
+    {
+        $exportChapter = ZipExportChapter::fromModel($chapter, $this->files);
+        $this->data['chapter'] = $exportChapter;
+
+        $this->references->addChapter($exportChapter);
+
+        return $this->build();
+    }
+
+    /**
+     * @throws ZipExportException
+     */
+    public function buildForBook(Book $book): string
+    {
+        $exportBook = ZipExportBook::fromModel($book, $this->files);
+        $this->data['book'] = $exportBook;
+
+        $this->references->addBook($exportBook);
+
+        return $this->build();
+    }
+
     /**
      * @throws ZipExportException
      */
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index c3565aaa383..1fce0fc972e 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -4,6 +4,8 @@
 
 use BookStack\App\Model;
 use BookStack\Exports\ZipExports\Models\ZipExportAttachment;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
@@ -14,8 +16,10 @@ class ZipExportReferences
 {
     /** @var ZipExportPage[] */
     protected array $pages = [];
-    protected array $books = [];
+    /** @var ZipExportChapter[] */
     protected array $chapters = [];
+    /** @var ZipExportBook[] */
+    protected array $books = [];
 
     /** @var ZipExportAttachment[] */
     protected array $attachments = [];
@@ -41,23 +45,64 @@ public function addPage(ZipExportPage $page): void
         }
     }
 
+    public function addChapter(ZipExportChapter $chapter): void
+    {
+        if ($chapter->id) {
+            $this->chapters[$chapter->id] = $chapter;
+        }
+
+        foreach ($chapter->pages as $page) {
+            $this->addPage($page);
+        }
+    }
+
+    public function addBook(ZipExportBook $book): void
+    {
+        if ($book->id) {
+            $this->chapters[$book->id] = $book;
+        }
+
+        foreach ($book->pages as $page) {
+            $this->addPage($page);
+        }
+
+        foreach ($book->chapters as $chapter) {
+            $this->addChapter($chapter);
+        }
+    }
+
     public function buildReferences(ZipExportFiles $files): void
     {
-        // Parse page content first
-        foreach ($this->pages as $page) {
-            $handler = function (Model $model) use ($files, $page) {
-                return $this->handleModelReference($model, $page, $files);
+        $createHandler = function (ZipExportModel $zipModel) use ($files) {
+            return function (Model $model) use ($files, $zipModel) {
+                return $this->handleModelReference($model, $zipModel, $files);
             };
+        };
 
+        // Parse page content first
+        foreach ($this->pages as $page) {
+            $handler = $createHandler($page);
             $page->html = $this->parser->parse($page->html ?? '', $handler);
             if ($page->markdown) {
                 $page->markdown = $this->parser->parse($page->markdown, $handler);
             }
         }
 
-//        dd('end');
-        // TODO - Parse chapter desc html
-        // TODO - Parse book desc html
+        // Parse chapter description HTML
+        foreach ($this->chapters as $chapter) {
+            if ($chapter->description_html) {
+                $handler = $createHandler($chapter);
+                $chapter->description_html = $this->parser->parse($chapter->description_html, $handler);
+            }
+        }
+
+        // Parse book description HTML
+        foreach ($this->books as $book) {
+            if ($book->description_html) {
+                $handler = $createHandler($book);
+                $book->description_html = $this->parser->parse($book->description_html, $handler);
+            }
+        }
     }
 
     protected function handleModelReference(Model $model, ZipExportModel $exportModel, ZipExportFiles $files): ?string
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index 1ba5872018c..6cee7356d23 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -87,7 +87,7 @@ The `id_ciphertext` is the ciphertext of encrypting the text `bookstack`. This i
 - `id` - Number, optional, original ID for the book from exported system.
 - `name` - String, required, name/title of the book.
 - `description_html` - String, optional, HTML description content.
-- `cover` - String reference, options, reference to book cover image.
+- `cover` - String reference, optional, reference to book cover image.
 - `chapters` - [Chapter](#chapter) array, optional, chapters within this book.
 - `pages` - [Page](#page) array, optional, direct child pages for this book.
 - `tags` - [Tag](#tag) array, optional, tags assigned to this book.

From 484342f26adab723b8c4625d22a8901f5bfe79af Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Oct 2024 15:59:58 +0100
Subject: [PATCH 334/666] ZIP Exports: Added entity cross refs, Started export
 tests

---
 .../Controllers/BookExportController.php      | 14 +++
 .../Controllers/ChapterExportController.php   | 13 +++
 .../ZipExports/ZipExportReferences.php        | 14 ++-
 routes/web.php                                |  1 +
 tests/Exports/ZipExportTest.php               | 85 ++++++++++++++++++-
 tests/Exports/ZipResultData.php               | 13 +++
 6 files changed, 136 insertions(+), 4 deletions(-)
 create mode 100644 tests/Exports/ZipResultData.php

diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index 36906b6ad7b..f726175a086 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -3,7 +3,9 @@
 namespace BookStack\Exports\Controllers;
 
 use BookStack\Entities\Queries\BookQueries;
+use BookStack\Exceptions\NotFoundException;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
 use Throwable;
 
@@ -63,4 +65,16 @@ public function markdown(string $bookSlug)
 
         return $this->download()->directly($textContent, $bookSlug . '.md');
     }
+
+    /**
+     * Export a book to a contained ZIP export file.
+     * @throws NotFoundException
+     */
+    public function zip(string $bookSlug, ZipExportBuilder $builder)
+    {
+        $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
+        $zip = $builder->buildForBook($book);
+
+        return $this->download()->streamedDirectly(fopen($zip, 'r'), $bookSlug . '.zip', filesize($zip));
+    }
 }
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index d85b90dcb41..0d7a5c0d195 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
 use Throwable;
 
@@ -70,4 +71,16 @@ public function markdown(string $bookSlug, string $chapterSlug)
 
         return $this->download()->directly($chapterText, $chapterSlug . '.md');
     }
+
+    /**
+     * Export a book to a contained ZIP export file.
+     * @throws NotFoundException
+     */
+    public function zip(string $bookSlug, string $chapterSlug, ZipExportBuilder $builder)
+    {
+        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        $zip = $builder->buildForChapter($chapter);
+
+        return $this->download()->streamedDirectly(fopen($zip, 'r'), $chapterSlug . '.zip', filesize($zip));
+    }
 }
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index 1fce0fc972e..8b3a4b612fe 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -3,6 +3,9 @@
 namespace BookStack\Exports\ZipExports;
 
 use BookStack\App\Model;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExports\Models\ZipExportAttachment;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
@@ -107,8 +110,6 @@ public function buildReferences(ZipExportFiles $files): void
 
     protected function handleModelReference(Model $model, ZipExportModel $exportModel, ZipExportFiles $files): ?string
     {
-        // TODO - References to other entities
-
         // Handle attachment references
         // No permission check needed here since they would only already exist in this
         // reference context if already allowed via their entity access.
@@ -143,6 +144,15 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
             return null;
         }
 
+        // Handle entity references
+        if ($model instanceof Book && isset($this->books[$model->id])) {
+            return "[[bsexport:book:{$model->id}]]";
+        } else if ($model instanceof Chapter && isset($this->chapters[$model->id])) {
+            return "[[bsexport:chapter:{$model->id}]]";
+        } else if ($model instanceof Page && isset($this->pages[$model->id])) {
+            return "[[bsexport:page:{$model->id}]]";
+        }
+
         return null;
     }
 }
diff --git a/routes/web.php b/routes/web.php
index 6ae70983d52..e6f3683c643 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -132,6 +132,7 @@
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/html', [ExportControllers\ChapterExportController::class, 'html']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/markdown', [ExportControllers\ChapterExportController::class, 'markdown']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/plaintext', [ExportControllers\ChapterExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/zip', [ExportControllers\ChapterExportController::class, 'zip']);
     Route::put('/books/{bookSlug}/chapter/{chapterSlug}/permissions', [PermissionsController::class, 'updateForChapter']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/references', [ReferenceController::class, 'chapter']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/delete', [EntityControllers\ChapterController::class, 'showDelete']);
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index d8ce00be33f..536e23806f6 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -2,14 +2,95 @@
 
 namespace Tests\Exports;
 
-use BookStack\Entities\Models\Book;
+use Illuminate\Support\Carbon;
+use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
+use ZipArchive;
 
 class ZipExportTest extends TestCase
 {
-    public function test_page_export()
+    public function test_export_results_in_zip_format()
+    {
+        $page = $this->entities->page();
+        $response = $this->asEditor()->get($page->getUrl("/export/zip"));
+
+        $zipData = $response->streamedContent();
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstesta-');
+        file_put_contents($zipFile, $zipData);
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::RDONLY);
+
+        $this->assertNotFalse($zip->locateName('data.json'));
+        $this->assertNotFalse($zip->locateName('files/'));
+
+        $data = json_decode($zip->getFromName('data.json'), true);
+        $this->assertIsArray($data);
+        $this->assertGreaterThan(0, count($data));
+
+        $zip->close();
+        unlink($zipFile);
+    }
+
+    public function test_export_metadata()
     {
         $page = $this->entities->page();
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $this->assertEquals($page->id, $zip->data['page']['id'] ?? null);
+        $this->assertArrayNotHasKey('book', $zip->data);
+        $this->assertArrayNotHasKey('chapter', $zip->data);
+
+        $now = time();
+        $date = Carbon::parse($zip->data['exported_at'])->unix();
+        $this->assertLessThan($now + 2, $date);
+        $this->assertGreaterThan($now - 2, $date);
+
+        $version = trim(file_get_contents(base_path('version')));
+        $this->assertEquals($version, $zip->data['instance']['version']);
+
+        $instanceId = decrypt($zip->data['instance']['id_ciphertext']);
+        $this->assertEquals('bookstack', $instanceId);
+    }
+
+    public function test_page_export()
+    {
+        // TODO
+    }
+
+    public function test_book_export()
+    {
+        // TODO
+    }
+
+    public function test_chapter_export()
+    {
         // TODO
     }
+
+    protected function extractZipResponse(TestResponse $response): ZipResultData
+    {
+        $zipData = $response->streamedContent();
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+
+        file_put_contents($zipFile, $zipData);
+        $extractDir = tempnam(sys_get_temp_dir(), 'bstestextracted-');
+        if (file_exists($extractDir)) {
+            unlink($extractDir);
+        }
+        mkdir($extractDir);
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::RDONLY);
+        $zip->extractTo($extractDir);
+
+        $dataJson = file_get_contents($extractDir . DIRECTORY_SEPARATOR . "data.json");
+        $data = json_decode($dataJson, true);
+
+        return new ZipResultData(
+            $zipFile,
+            $extractDir,
+            $data,
+        );
+    }
 }
diff --git a/tests/Exports/ZipResultData.php b/tests/Exports/ZipResultData.php
new file mode 100644
index 00000000000..b5cc2b4ca61
--- /dev/null
+++ b/tests/Exports/ZipResultData.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\Exports;
+
+class ZipResultData
+{
+    public function __construct(
+        public string $zipPath,
+        public string $extractedDirPath,
+        public array $data,
+    ) {
+    }
+}

From 7aaf8660646d54997543d9f5dd578de98fc97b3e Mon Sep 17 00:00:00 2001
From: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
Date: Sat, 26 Oct 2024 13:24:49 +0200
Subject: [PATCH 335/666] fix tests namespace definition

---
 tests/Activity/AuditLogApiTest.php       | 2 +-
 tests/Activity/AuditLogTest.php          | 2 +-
 tests/Activity/WebhookCallTest.php       | 2 +-
 tests/Activity/WebhookFormatTesting.php  | 2 +-
 tests/Activity/WebhookManagementTest.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Activity/AuditLogApiTest.php b/tests/Activity/AuditLogApiTest.php
index 75cc364f895..2212ae5991a 100644
--- a/tests/Activity/AuditLogApiTest.php
+++ b/tests/Activity/AuditLogApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Facades\Activity;
diff --git a/tests/Activity/AuditLogTest.php b/tests/Activity/AuditLogTest.php
index 350cd92871b..6b435544df7 100644
--- a/tests/Activity/AuditLogTest.php
+++ b/tests/Activity/AuditLogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Activity;
diff --git a/tests/Activity/WebhookCallTest.php b/tests/Activity/WebhookCallTest.php
index 37c87267a8a..162e05ec505 100644
--- a/tests/Activity/WebhookCallTest.php
+++ b/tests/Activity/WebhookCallTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\DispatchWebhookJob;
diff --git a/tests/Activity/WebhookFormatTesting.php b/tests/Activity/WebhookFormatTesting.php
index edd16ebbad7..f04f95b667e 100644
--- a/tests/Activity/WebhookFormatTesting.php
+++ b/tests/Activity/WebhookFormatTesting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;
diff --git a/tests/Activity/WebhookManagementTest.php b/tests/Activity/WebhookManagementTest.php
index eb7bb4c15a4..b55b5480d27 100644
--- a/tests/Activity/WebhookManagementTest.php
+++ b/tests/Activity/WebhookManagementTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Activity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;

From d1f69feb4ae771b62919809ce58401b8d067f728 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Oct 2024 14:33:43 +0000
Subject: [PATCH 336/666] ZIP Exports: Tested each type and model of export

---
 .../ZipExports/Models/ZipExportAttachment.php |   1 +
 .../ZipExports/ZipExportReferences.php        |   2 +-
 app/Exports/ZipExports/ZipReferenceParser.php |   2 +-
 tests/Exports/ZipExportTest.php               | 265 +++++++++++++++++-
 tests/Exports/ZipResultData.php               |   9 +
 5 files changed, 274 insertions(+), 5 deletions(-)

diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index 8c89ae11f14..283ffa751c9 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -18,6 +18,7 @@ public static function fromModel(Attachment $model, ZipExportFiles $files): self
         $instance = new self();
         $instance->id = $model->id;
         $instance->name = $model->name;
+        $instance->order = $model->order;
 
         if ($model->external) {
             $instance->link = $model->path;
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index 8b3a4b612fe..c630c832b37 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -62,7 +62,7 @@ public function addChapter(ZipExportChapter $chapter): void
     public function addBook(ZipExportBook $book): void
     {
         if ($book->id) {
-            $this->chapters[$book->id] = $book;
+            $this->books[$book->id] = $book;
         }
 
         foreach ($book->pages as $page) {
diff --git a/app/Exports/ZipExports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
index 4d16dbc6110..da43d1b366b 100644
--- a/app/Exports/ZipExports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -38,7 +38,7 @@ public function __construct(EntityQueries $queries)
     public function parse(string $content, callable $handler): string
     {
         $escapedBase = preg_quote(url('/'), '/');
-        $linkRegex = "/({$escapedBase}.*?)[\\t\\n\\f>\"'=?#]/";
+        $linkRegex = "/({$escapedBase}.*?)[\\t\\n\\f>\"'=?#()]/";
         $matches = [];
         preg_match_all($linkRegex, $content, $matches);
 
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 536e23806f6..ac07b33aef5 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -2,6 +2,11 @@
 
 namespace Tests\Exports;
 
+use BookStack\Activity\Models\Tag;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\Uploads\Attachment;
+use BookStack\Uploads\Image;
 use Illuminate\Support\Carbon;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
@@ -55,17 +60,271 @@ public function test_export_metadata()
 
     public function test_page_export()
     {
-        // TODO
+        $page = $this->entities->page();
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $pageData = $zip->data['page'];
+        $this->assertEquals([
+            'id' => $page->id,
+            'name' => $page->name,
+            'html' => (new PageContent($page))->render(),
+            'priority' => $page->priority,
+            'attachments' => [],
+            'images' => [],
+            'tags' => [],
+        ], $pageData);
+    }
+
+    public function test_page_export_with_markdown()
+    {
+        $page = $this->entities->page();
+        $markdown = "# My page\n\nwritten in markdown for export\n";
+        $page->markdown = $markdown;
+        $page->save();
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $pageData = $zip->data['page'];
+        $this->assertEquals($markdown, $pageData['markdown']);
+        $this->assertNotEmpty($pageData['html']);
+    }
+
+    public function test_page_export_with_tags()
+    {
+        $page = $this->entities->page();
+        $page->tags()->saveMany([
+            new Tag(['name' => 'Exporty', 'value' => 'Content', 'order' => 1]),
+            new Tag(['name' => 'Another', 'value' => '', 'order' => 2]),
+        ]);
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $pageData = $zip->data['page'];
+        $this->assertEquals([
+            [
+                'name' => 'Exporty',
+                'value' => 'Content',
+                'order' => 1,
+            ],
+            [
+                'name' => 'Another',
+                'value' => '',
+                'order' => 2,
+            ]
+        ], $pageData['tags']);
+    }
+
+    public function test_page_export_with_images()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $result = $this->files->uploadGalleryImageToPage($this, $page);
+        $displayThumb = $result['response']->thumbs->gallery ?? '';
+        $page->html = '<p><img src="' . $displayThumb . '" alt="My image"></p>';
+        $page->save();
+        $image = Image::findOrFail($result['response']->id);
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $this->assertCount(1, $pageData['images']);
+        $imageData = $pageData['images'][0];
+        $this->assertEquals($image->id, $imageData['id']);
+        $this->assertEquals($image->name, $imageData['name']);
+        $this->assertEquals('gallery', $imageData['type']);
+        $this->assertNotEmpty($imageData['file']);
+
+        $filePath = $zip->extractPath("files/{$imageData['file']}");
+        $this->assertFileExists($filePath);
+        $this->assertEquals(file_get_contents(public_path($image->path)), file_get_contents($filePath));
+
+        $this->assertEquals('<p><img src="[[bsexport:image:' . $imageData['id'] . ']]" alt="My image"></p>', $pageData['html']);
+    }
+
+    public function test_page_export_file_attachments()
+    {
+        $contents = 'My great attachment content!';
+
+        $page = $this->entities->page();
+        $this->asAdmin();
+        $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'PageAttachmentExport.txt', $contents, 'text/plain');
+
+        $zipResp = $this->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $pageData = $zip->data['page'];
+        $this->assertCount(1, $pageData['attachments']);
+
+        $attachmentData = $pageData['attachments'][0];
+        $this->assertEquals('PageAttachmentExport.txt', $attachmentData['name']);
+        $this->assertEquals($attachment->id, $attachmentData['id']);
+        $this->assertEquals(1, $attachmentData['order']);
+        $this->assertArrayNotHasKey('link', $attachmentData);
+        $this->assertNotEmpty($attachmentData['file']);
+
+        $fileRef = $attachmentData['file'];
+        $filePath = $zip->extractPath("/files/$fileRef");
+        $this->assertFileExists($filePath);
+        $this->assertEquals($contents, file_get_contents($filePath));
+    }
+
+    public function test_page_export_link_attachments()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+        $attachment = Attachment::factory()->create([
+            'name' => 'My link attachment for export',
+            'path' => 'https://example.com/cats',
+            'external' => true,
+            'uploaded_to' => $page->id,
+            'order' => 1,
+        ]);
+
+        $zipResp = $this->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $pageData = $zip->data['page'];
+        $this->assertCount(1, $pageData['attachments']);
+
+        $attachmentData = $pageData['attachments'][0];
+        $this->assertEquals('My link attachment for export', $attachmentData['name']);
+        $this->assertEquals($attachment->id, $attachmentData['id']);
+        $this->assertEquals(1, $attachmentData['order']);
+        $this->assertEquals('https://example.com/cats', $attachmentData['link']);
+        $this->assertArrayNotHasKey('file', $attachmentData);
     }
 
     public function test_book_export()
     {
-        // TODO
+        $book = $this->entities->book();
+        $book->tags()->saveMany(Tag::factory()->count(2)->make());
+
+        $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $this->assertArrayHasKey('book', $zip->data);
+
+        $bookData = $zip->data['book'];
+        $this->assertEquals($book->id, $bookData['id']);
+        $this->assertEquals($book->name, $bookData['name']);
+        $this->assertEquals($book->descriptionHtml(), $bookData['description_html']);
+        $this->assertCount(2, $bookData['tags']);
+        $this->assertCount($book->directPages()->count(), $bookData['pages']);
+        $this->assertCount($book->chapters()->count(), $bookData['chapters']);
+        $this->assertArrayNotHasKey('cover', $bookData);
+    }
+
+    public function test_book_export_with_cover_image()
+    {
+        $book = $this->entities->book();
+        $bookRepo = $this->app->make(BookRepo::class);
+        $coverImageFile = $this->files->uploadedImage('cover.png');
+        $bookRepo->updateCoverImage($book, $coverImageFile);
+        $coverImage = $book->cover()->first();
+
+        $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+
+        $this->assertArrayHasKey('cover', $zip->data['book']);
+        $coverRef = $zip->data['book']['cover'];
+        $coverPath = $zip->extractPath("/files/$coverRef");
+        $this->assertFileExists($coverPath);
+        $this->assertEquals(file_get_contents(public_path($coverImage->path)), file_get_contents($coverPath));
     }
 
     public function test_chapter_export()
     {
-        // TODO
+        $chapter = $this->entities->chapter();
+        $chapter->tags()->saveMany(Tag::factory()->count(2)->make());
+
+        $zipResp = $this->asEditor()->get($chapter->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $this->assertArrayHasKey('chapter', $zip->data);
+
+        $chapterData = $zip->data['chapter'];
+        $this->assertEquals($chapter->id, $chapterData['id']);
+        $this->assertEquals($chapter->name, $chapterData['name']);
+        $this->assertEquals($chapter->descriptionHtml(), $chapterData['description_html']);
+        $this->assertCount(2, $chapterData['tags']);
+        $this->assertEquals($chapter->priority, $chapterData['priority']);
+        $this->assertCount($chapter->pages()->count(), $chapterData['pages']);
+    }
+
+
+    public function test_cross_reference_links_are_converted()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $page = $chapter->pages()->first();
+
+        $book->description_html = '<p><a href="' . $chapter->getUrl() . '">Link to chapter</a></p>';
+        $book->save();
+        $chapter->description_html = '<p><a href="' . $page->getUrl() . '#section2">Link to page</a></p>';
+        $chapter->save();
+        $page->html = '<p><a href="' . $book->getUrl() . '?view=true">Link to book</a></p>';
+        $page->save();
+
+        $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $bookData = $zip->data['book'];
+        $chapterData = $bookData['chapters'][0];
+        $pageData = $chapterData['pages'][0];
+
+        $this->assertStringContainsString('href="[[bsexport:chapter:' . $chapter->id . ']]"', $bookData['description_html']);
+        $this->assertStringContainsString('href="[[bsexport:page:' . $page->id . ']]#section2"', $chapterData['description_html']);
+        $this->assertStringContainsString('href="[[bsexport:book:' . $book->id . ']]?view=true"', $pageData['html']);
+    }
+
+    public function test_cross_reference_links_external_to_export_are_not_converted()
+    {
+        $page = $this->entities->page();
+        $page->html = '<p><a href="' . $page->book->getUrl() . '">Link to book</a></p>';
+        $page->save();
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $this->assertStringContainsString('href="' . $page->book->getUrl() . '"', $pageData['html']);
+    }
+
+    public function test_attachments_links_are_converted()
+    {
+        $page = $this->entities->page();
+        $attachment = Attachment::factory()->create([
+            'name' => 'My link attachment for export reference',
+            'path' => 'https://example.com/cats/ref',
+            'external' => true,
+            'uploaded_to' => $page->id,
+            'order' => 1,
+        ]);
+
+        $page->html = '<p><a href="' . url("/attachments/{$attachment->id}") . '?open=true">Link to attachment</a></p>';
+        $page->save();
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $this->assertStringContainsString('href="[[bsexport:attachment:' . $attachment->id . ']]?open=true"', $pageData['html']);
+    }
+
+    public function test_links_in_markdown_are_parsed()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        $page = $chapter->pages()->first();
+
+        $page->markdown = "[Link to chapter]({$chapter->getUrl()})";
+        $page->save();
+
+        $zipResp = $this->asEditor()->get($chapter->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $pageData = $zip->data['chapter']['pages'][0];
+
+        $this->assertStringContainsString("[Link to chapter]([[bsexport:chapter:{$chapter->id}]])", $pageData['markdown']);
     }
 
     protected function extractZipResponse(TestResponse $response): ZipResultData
diff --git a/tests/Exports/ZipResultData.php b/tests/Exports/ZipResultData.php
index b5cc2b4ca61..7725004c7be 100644
--- a/tests/Exports/ZipResultData.php
+++ b/tests/Exports/ZipResultData.php
@@ -10,4 +10,13 @@ public function __construct(
         public array $data,
     ) {
     }
+
+    /**
+     * Build a path to a location the extracted content, using the given relative $path.
+     */
+    public function extractPath(string $path): string
+    {
+        $relPath = implode(DIRECTORY_SEPARATOR, explode('/', $path));
+        return $this->extractedDirPath . DIRECTORY_SEPARATOR . ltrim($relPath, DIRECTORY_SEPARATOR);
+    }
 }

From f60671146379e76550ce81f7a8738f848ebc63de Mon Sep 17 00:00:00 2001
From: Rashad <rashadkhan359@gmail.com>
Date: Sun, 27 Oct 2024 22:50:20 +0530
Subject: [PATCH 337/666] respective book and chapter structure added.

---
 app/Api/ApiEntityListFormatter.php |  23 ++---
 app/Search/SearchApiController.php |  63 ++----------
 dev/api/requests/search-all.http   |   2 +-
 dev/api/responses/search-all.json  | 152 ++++++++++++++++-------------
 tests/Api/SearchApiTest.php        | 109 ---------------------
 5 files changed, 103 insertions(+), 246 deletions(-)

diff --git a/app/Api/ApiEntityListFormatter.php b/app/Api/ApiEntityListFormatter.php
index 2fd9b7c5507..7c2d09d4f3a 100644
--- a/app/Api/ApiEntityListFormatter.php
+++ b/app/Api/ApiEntityListFormatter.php
@@ -13,11 +13,6 @@ class ApiEntityListFormatter
      */
     protected array $list = [];
 
-    /**
-     * Whether to include related titles in the response.
-     */
-    protected bool $includeRelatedTitles = false;
-
     /**
      * The fields to show in the formatted data.
      * Can be a plain string array item for a direct model field (If existing on model).
@@ -79,20 +74,18 @@ public function withTags(): self
     /**
      * Enable the inclusion of related book and chapter titles in the response.
      */
-    public function withRelatedTitles(): self
+    public function withRelatedData(): self
     {
-        $this->includeRelatedTitles = true;
-
-        $this->withField('book_title', function (Entity $entity) {
+        $this->withField('book', function (Entity $entity) {
             if (method_exists($entity, 'book')) {
-                return $entity->book?->name;
+                return $entity->book()->select(['id', 'name', 'slug'])->first();
             }
             return null;
         });
 
-        $this->withField('chapter_title', function (Entity $entity) {
+        $this->withField('chapter', function (Entity $entity) {
             if ($entity instanceof Page && $entity->chapter_id) {
-                return optional($entity->getAttribute('chapter'))->name;
+                return $entity->chapter()->select(['id', 'name', 'slug'])->first();
             }
             return null;
         });
@@ -106,9 +99,7 @@ public function withRelatedTitles(): self
      */
     public function format(): array
     {
-        if ($this->includeRelatedTitles) {
-            $this->loadRelatedTitles();
-        }
+        $this->loadRelatedData();
 
         $results = [];
 
@@ -122,7 +113,7 @@ public function format(): array
     /**
      * Eager load the related book and chapter data when needed.
      */
-    protected function loadRelatedTitles(): void
+    protected function loadRelatedData(): void
     {
         $pages = collect($this->list)->filter(fn($item) => $item instanceof Page);
 
diff --git a/app/Search/SearchApiController.php b/app/Search/SearchApiController.php
index 5072bd3b463..28a3b53e6c3 100644
--- a/app/Search/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -17,20 +17,9 @@ class SearchApiController extends ApiController
             'query' => ['required'],
             'page' => ['integer', 'min:1'],
             'count' => ['integer', 'min:1', 'max:100'],
-            'include' => ['string', 'regex:/^[a-zA-Z,]*$/'],
         ],
     ];
 
-    /**
-     * Valid include parameters and their corresponding formatter methods.
-     * These parameters allow for additional related data, like titles or tags,
-     * to be included in the search results when requested via the API.
-     */
-    protected const VALID_INCLUDES = [
-        'titles' => 'withRelatedTitles',
-        'tags' => 'withTags',
-    ];
-
     public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $resultsFormatter)
     {
         $this->searchRunner = $searchRunner;
@@ -44,13 +33,6 @@ public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $
      * for a full list of search term options. Results contain a 'type' property to distinguish
      * between: bookshelf, book, chapter & page.
      *
-     * This method now supports the 'include' parameter, which allows API clients to specify related
-     * fields (such as titles or tags) that should be included in the search results.
-     *
-     * The 'include' parameter is a comma-separated string. For example, adding `include=titles,tags`
-     * will include both titles and tags in the API response. If the parameter is not provided, only
-     * basic entity data will be returned.
-     *
      * The paging parameters and response format emulates a standard listing endpoint
      * but standard sorting and filtering cannot be done on this endpoint. If a count value
      * is provided this will only be taken as a suggestion. The results in the response
@@ -63,49 +45,22 @@ public function all(Request $request)
         $options = SearchOptions::fromString($request->get('query') ?? '');
         $page = intval($request->get('page', '0')) ?: 1;
         $count = min(intval($request->get('count', '0')) ?: 20, 100);
-        $includes = $this->parseIncludes($request->get('include', ''));
 
         $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
         $this->resultsFormatter->format($results['results']->all(), $options);
 
-        $formatter = new ApiEntityListFormatter($results['results']->all());
-        $formatter->withType(); // Always include type as it's essential for search results
-
-        foreach ($includes as $include) {
-            if (isset(self::VALID_INCLUDES[$include])) {
-                $method = self::VALID_INCLUDES[$include];
-                $formatter->$method();
-            }
-        }
-
-        $formatter->withField('preview_html', function (Entity $entity) {
-            return [
-                'name' => (string) $entity->getAttribute('preview_name'),
-                'content' => (string) $entity->getAttribute('preview_content'),
-            ];
-        });
+        $data = (new ApiEntityListFormatter($results['results']->all()))
+            ->withType()->withTags()->withRelatedData()
+            ->withField('preview_html', function (Entity $entity) {
+                return [
+                    'name' => (string) $entity->getAttribute('preview_name'),
+                    'content' => (string) $entity->getAttribute('preview_content'),
+                ];
+            })->format();
 
         return response()->json([
-            'data' => $formatter->format(),
+            'data' => $data,
             'total' => $results['total'],
         ]);
     }
-
-    /**
-     * Parse and validate the include parameter.
-     *
-     * @param string $includeString Comma-separated list of includes
-     * @return array<string>
-     */
-    protected function parseIncludes(string $includeString): array
-    {
-        if (empty($includeString)) {
-            return [];
-        }
-
-        return array_filter(
-            explode(',', strtolower($includeString)),
-            fn($include) => isset (self::VALID_INCLUDES[$include])
-        );
-    }
 }
diff --git a/dev/api/requests/search-all.http b/dev/api/requests/search-all.http
index 7fa1a304e21..f9c17fa1696 100644
--- a/dev/api/requests/search-all.http
+++ b/dev/api/requests/search-all.http
@@ -1 +1 @@
-GET /api/search?query=cats+{created_by:me}&page=1&count=2&include=titles,tags
+GET /api/search?query=cats+{created_by:me}&page=1&count=2
diff --git a/dev/api/responses/search-all.json b/dev/api/responses/search-all.json
index bb45b795903..f60a12f750d 100644
--- a/dev/api/responses/search-all.json
+++ b/dev/api/responses/search-all.json
@@ -1,72 +1,92 @@
 {
-  "data": [
-    {
-      "id": 84,
-      "book_id": 1,
-      "slug": "a-chapter-for-cats",
-      "name": "A chapter for cats",
-      "created_at": "2021-11-14T15:57:35.000000Z",
-      "updated_at": "2021-11-14T15:57:35.000000Z",
-      "type": "chapter",
-      "url": "https://example.com/books/my-book/chapter/a-chapter-for-cats",
-      "book_title": "Cats",
-      "preview_html": {
-        "name": "A chapter for <strong>cats</strong>",
-        "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
-      },
-      "tags": []
-    },
-    {
-      "name": "The hows and whys of cats",
-      "id": 396,
-      "slug": "the-hows-and-whys-of-cats",
-      "book_id": 1,
-      "chapter_id": 75,
-      "draft": false,
-      "template": false,
-      "created_at": "2021-05-15T16:28:10.000000Z",
-      "updated_at": "2021-11-14T15:56:49.000000Z",
-      "type": "page",
-      "url": "https://example.com/books/my-book/page/the-hows-and-whys-of-cats",
-      "book_title": "Cats",
-      "chapter_title": "A chapter for cats",
-      "preview_html": {
-        "name": "The hows and whys of <strong>cats</strong>",
-        "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
-      },
-      "tags": [
+    "data": [
         {
-          "name": "Animal",
-          "value": "Cat",
-          "order": 0
+            "id": 84,
+            "book_id": 1,
+            "slug": "a-chapter-for-cats",
+            "name": "A chapter for cats",
+            "created_at": "2021-11-14T15:57:35.000000Z",
+            "updated_at": "2021-11-14T15:57:35.000000Z",
+            "type": "chapter",
+            "url": "https://example.com/books/my-book/chapter/a-chapter-for-cats",
+            "book": {
+                "id": 1,
+                "name": "Cats",
+                "slug": "cats"
+            },
+            "preview_html": {
+                "name": "A chapter for <strong>cats</strong>",
+                "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
+            },
+            "tags": []
         },
         {
-          "name": "Category",
-          "value": "Top Content",
-          "order": 0
+            "name": "The hows and whys of cats",
+            "id": 396,
+            "slug": "the-hows-and-whys-of-cats",
+            "book_id": 1,
+            "chapter_id": 75,
+            "draft": false,
+            "template": false,
+            "created_at": "2021-05-15T16:28:10.000000Z",
+            "updated_at": "2021-11-14T15:56:49.000000Z",
+            "type": "page",
+            "url": "https://example.com/books/my-book/page/the-hows-and-whys-of-cats",
+            "book": {
+                "id": 1,
+                "name": "Cats",
+                "slug": "cats"
+            },
+            "chapter": {
+                "id": 84,
+                "name": "A chapter for cats",
+                "slug": "a-chapter-for-cats"
+            },
+            "preview_html": {
+                "name": "The hows and whys of <strong>cats</strong>",
+                "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
+            },
+            "tags": [
+                {
+                    "name": "Animal",
+                    "value": "Cat",
+                    "order": 0
+                },
+                {
+                    "name": "Category",
+                    "value": "Top Content",
+                    "order": 0
+                }
+            ]
+        },
+        {
+            "name": "How advanced are cats?",
+            "id": 362,
+            "slug": "how-advanced-are-cats",
+            "book_id": 13,
+            "chapter_id": 73,
+            "draft": false,
+            "template": false,
+            "created_at": "2020-11-29T21:55:07.000000Z",
+            "updated_at": "2021-11-14T16:02:39.000000Z",
+            "type": "page",
+            "url": "https://example.com/books/my-book/page/how-advanced-are-cats",
+            "book": {
+                "id": 1,
+                "name": "Cats",
+                "slug": "cats"
+            },
+            "chapter": {
+                "id": 84,
+                "name": "A chapter for cats",
+                "slug": "a-chapter-for-cats"
+            },
+            "preview_html": {
+                "name": "How advanced are <strong>cats</strong>?",
+                "content": "<strong>cats</strong> are some of the most advanced animals in the world."
+            },
+            "tags": []
         }
-      ]
-    },
-    {
-      "name": "How advanced are cats?",
-      "id": 362,
-      "slug": "how-advanced-are-cats",
-      "book_id": 13,
-      "chapter_id": 73,
-      "draft": false,
-      "template": false,
-      "created_at": "2020-11-29T21:55:07.000000Z",
-      "updated_at": "2021-11-14T16:02:39.000000Z",
-      "type": "page",
-      "url": "https://example.com/books/my-book/page/how-advanced-are-cats",
-      "book_title": "Cats",
-      "chapter_title": "A chapter for cats",
-      "preview_html": {
-        "name": "How advanced are <strong>cats</strong>?",
-        "content": "<strong>cats</strong> are some of the most advanced animals in the world."
-      },
-      "tags": []
-    }
-  ],
-  "total": 3
+    ],
+    "total": 3
 }
diff --git a/tests/Api/SearchApiTest.php b/tests/Api/SearchApiTest.php
index b80ed4530ba..3f2eb395c11 100644
--- a/tests/Api/SearchApiTest.php
+++ b/tests/Api/SearchApiTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Api;
 
-use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
@@ -75,112 +74,4 @@ public function test_all_endpoint_requires_query_parameter()
         $resp = $this->actingAsApiEditor()->get($this->baseEndpoint . '?query=myqueryvalue');
         $resp->assertOk();
     }
-
-    public function test_all_endpoint_includes_book_and_chapter_titles_when_requested()
-    {
-        $this->actingAsApiEditor();
-
-        $book = $this->entities->book();
-        $chapter = $this->entities->chapter();
-        $page = $this->entities->newPage();
-
-        $book->name = 'My Test Book';
-        $book->save();
-
-        $chapter->name = 'My Test Chapter';
-        $chapter->book_id = $book->id;
-        $chapter->save();
-
-        $page->name = 'My Test Page With UniqueSearchTerm';
-        $page->book_id = $book->id;
-        $page->chapter_id = $chapter->id;
-        $page->save();
-
-        $page->indexForSearch();
-
-        // Test without include parameter
-        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm');
-        $resp->assertOk();
-        $resp->assertDontSee('book_title');
-        $resp->assertDontSee('chapter_title');
-
-        // Test with include parameter
-        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm&include=titles');
-        $resp->assertOk();
-        $resp->assertJsonFragment([
-            'name' => 'My Test Page With UniqueSearchTerm',
-            'book_title' => 'My Test Book',
-            'chapter_title' => 'My Test Chapter',
-            'type' => 'page'
-        ]);
-    }
-
-    public function test_all_endpoint_validates_include_parameter()
-    {
-        $this->actingAsApiEditor();
-
-        // Test invalid include value
-        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=invalid');
-        $resp->assertOk();
-        $resp->assertDontSee('book_title');
-
-        // Test SQL injection attempt
-        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=titles;DROP TABLE users');
-        $resp->assertStatus(422);
-
-        // Test multiple includes
-        $resp = $this->getJson($this->baseEndpoint . '?query=test&include=titles,tags');
-        $resp->assertOk();
-    }
-
-    public function test_all_endpoint_includes_tags_when_requested()
-    {
-        $this->actingAsApiEditor();
-
-        // Create a page and give it a unique name for search
-        $page = $this->entities->page();
-        $page->name = 'Page With UniqueSearchTerm';
-        $page->save();
-
-        // Save tags to the page using the existing saveTagsToEntity method
-        $tags = [
-            ['name' => 'SampleTag', 'value' => 'SampleValue']
-        ];
-        app(\BookStack\Activity\TagRepo::class)->saveTagsToEntity($page, $tags);
-
-        // Ensure the page is indexed for search
-        $page->indexForSearch();
-
-        // Test without the "tags" include
-        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm');
-        $resp->assertOk();
-        $resp->assertDontSee('tags');
-
-        // Test with the "tags" include
-        $resp = $this->getJson($this->baseEndpoint . '?query=UniqueSearchTerm&include=tags');
-        $resp->assertOk();
-        
-        // Assert that tags are included in the response
-        $resp->assertJsonFragment([
-            'name' => 'SampleTag',
-            'value' => 'SampleValue',
-        ]);
-
-        // Optionally: check the structure to match the tag order as well
-        $resp->assertJsonStructure([
-            'data' => [
-                '*' => [
-                    'tags' => [
-                        '*' => [
-                            'name',
-                            'value',
-                            'order',
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-    }
-
-
 }

From 72d9ffd8b4a0680a858446c5f753db4f989f3989 Mon Sep 17 00:00:00 2001
From: Matthieu Leboeuf <contact@matthieul.dev>
Date: Mon, 28 Oct 2024 22:14:30 +0100
Subject: [PATCH 338/666] Added support for concatenating multiple LDAP
 attributes in displayName

---
 app/Access/LdapService.php | 30 ++++++++++++++++++++++++++----
 app/Config/services.php    |  2 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 365cb1db015..ef6d33f4db1 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -71,6 +71,28 @@ private function getUserWithAttributes(string $userName, array $attributes): ?ar
         return $users[0];
     }
 
+    /**
+     * Calculate the display name.
+     */
+    protected function getUserDisplayName(array $displayNameAttr, array $userDetails, string $defaultValue): string
+    {
+        $displayName = [];
+        foreach ($displayNameAttr as $dnAttr) {
+            $dnComponent = $this->getUserResponseProperty($userDetails, $dnAttr, null);
+            if ($dnComponent !== null) {
+                $displayName[] = $dnComponent;
+            }
+        }
+
+        if (count($displayName) == 0) {
+            $displayName = $defaultValue;
+        } else {
+            $displayName = implode(' ', $displayName);
+        }
+
+        return $displayName;
+    }
+
     /**
      * Get the details of a user from LDAP using the given username.
      * User found via configurable user filter.
@@ -84,9 +106,9 @@ public function getUserDetails(string $userName): ?array
         $displayNameAttr = $this->config['display_name_attribute'];
         $thumbnailAttr = $this->config['thumbnail_attribute'];
 
-        $user = $this->getUserWithAttributes($userName, array_filter([
-            'cn', 'dn', $idAttr, $emailAttr, $displayNameAttr, $thumbnailAttr,
-        ]));
+        $user = $this->getUserWithAttributes($userName, array_filter(array_merge($displayNameAttr, [
+            'cn', 'dn', $idAttr, $emailAttr, $thumbnailAttr,
+        ])));
 
         if (is_null($user)) {
             return null;
@@ -95,7 +117,7 @@ public function getUserDetails(string $userName): ?array
         $userCn = $this->getUserResponseProperty($user, 'cn', null);
         $formatted = [
             'uid'   => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
-            'name'  => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
+            'name'  => $this->getUserDisplayName($displayNameAttr, $user, $userCn),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
             'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
diff --git a/app/Config/services.php b/app/Config/services.php
index d7345823150..4e27896870a 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -127,7 +127,7 @@
         'version'                => env('LDAP_VERSION', false),
         'id_attribute'           => env('LDAP_ID_ATTRIBUTE', 'uid'),
         'email_attribute'        => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
-        'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'),
+        'display_name_attribute' => explode('|', env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn')),
         'follow_referrals'       => env('LDAP_FOLLOW_REFERRALS', false),
         'user_to_groups'         => env('LDAP_USER_TO_GROUPS', false),
         'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),

From 87242ce6cb462bc933e63d80e514ae5096ee2b67 Mon Sep 17 00:00:00 2001
From: Matthieu Leboeuf <contact@matthieul.dev>
Date: Mon, 28 Oct 2024 22:27:15 +0100
Subject: [PATCH 339/666] Adapt tests with displayName array

---
 tests/Auth/LdapTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index ef95bc2e8f4..27169a2becf 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
             'auth.defaults.guard'                  => 'ldap',
             'services.ldap.base_dn'                => 'dc=ldap,dc=local',
             'services.ldap.email_attribute'        => 'mail',
-            'services.ldap.display_name_attribute' => 'cn',
+            'services.ldap.display_name_attribute' => ['cn'],
             'services.ldap.id_attribute'           => 'uid',
             'services.ldap.user_to_groups'         => false,
             'services.ldap.version'                => '3',
@@ -581,7 +581,7 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
     public function test_login_uses_specified_display_name_attribute()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => 'displayName',
+            'services.ldap.display_name_attribute' => ['displayName'],
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
@@ -606,7 +606,7 @@ public function test_login_uses_specified_display_name_attribute()
     public function test_login_uses_default_display_name_attribute_if_specified_not_present()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => 'displayName',
+            'services.ldap.display_name_attribute' => ['displayName'],
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);

From 4051d5b8037119b382c576042bc668b8f00eee14 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 29 Oct 2024 12:11:51 +0000
Subject: [PATCH 340/666] ZIP Exports: Added new import permission

Also updated new route/view to new non-book-specific flow.
Also fixed down migration of old export permissions migration.
---
 app/Exports/Controllers/ImportController.php  | 24 ++++++++
 ...8_28_161743_add_export_role_permission.php |  7 ++-
 ...0_29_114420_add_import_role_permission.php | 61 +++++++++++++++++++
 lang/en/entities.php                          |  1 +
 lang/en/settings.php                          |  1 +
 resources/views/books/index.blade.php         |  7 +++
 resources/views/exports/import.blade.php      | 34 +++++++++++
 .../views/settings/roles/parts/form.blade.php |  1 +
 routes/web.php                                |  4 ++
 9 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 app/Exports/Controllers/ImportController.php
 create mode 100644 database/migrations/2024_10_29_114420_add_import_role_permission.php
 create mode 100644 resources/views/exports/import.blade.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
new file mode 100644
index 00000000000..acc803a0f0d
--- /dev/null
+++ b/app/Exports/Controllers/ImportController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\Exports\Controllers;
+
+use BookStack\Http\Controller;
+use Illuminate\Http\Request;
+
+class ImportController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('can:content-import');
+    }
+
+    public function start(Request $request)
+    {
+        return view('exports.import');
+    }
+
+    public function upload(Request $request)
+    {
+        // TODO
+    }
+}
diff --git a/database/migrations/2021_08_28_161743_add_export_role_permission.php b/database/migrations/2021_08_28_161743_add_export_role_permission.php
index 21f45aa0691..99416f9fcf6 100644
--- a/database/migrations/2021_08_28_161743_add_export_role_permission.php
+++ b/database/migrations/2021_08_28_161743_add_export_role_permission.php
@@ -11,8 +11,7 @@
      */
     public function up(): void
     {
-        // Create new templates-manage permission and assign to admin role
-        $roles = DB::table('roles')->get('id');
+        // Create new content-export permission
         $permissionId = DB::table('role_permissions')->insertGetId([
             'name'         => 'content-export',
             'display_name' => 'Export Content',
@@ -20,6 +19,7 @@ public function up(): void
             'updated_at'   => Carbon::now()->toDateTimeString(),
         ]);
 
+        $roles = DB::table('roles')->get('id');
         $permissionRoles = $roles->map(function ($role) use ($permissionId) {
             return [
                 'role_id'       => $role->id,
@@ -27,6 +27,7 @@ public function up(): void
             ];
         })->values()->toArray();
 
+        // Assign to all existing roles in the system
         DB::table('permission_role')->insert($permissionRoles);
     }
 
@@ -40,6 +41,6 @@ public function down(): void
             ->where('name', '=', 'content-export')->first();
 
         DB::table('permission_role')->where('permission_id', '=', $contentExportPermission->id)->delete();
-        DB::table('role_permissions')->where('id', '=', 'content-export')->delete();
+        DB::table('role_permissions')->where('id', '=', $contentExportPermission->id)->delete();
     }
 };
diff --git a/database/migrations/2024_10_29_114420_add_import_role_permission.php b/database/migrations/2024_10_29_114420_add_import_role_permission.php
new file mode 100644
index 00000000000..17bbe4cff26
--- /dev/null
+++ b/database/migrations/2024_10_29_114420_add_import_role_permission.php
@@ -0,0 +1,61 @@
+<?php
+
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create new content-import permission
+        $permissionId = DB::table('role_permissions')->insertGetId([
+            'name'         => 'content-import',
+            'display_name' => 'Import Content',
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
+        ]);
+
+        // Get existing admin-level role ids
+        $settingManagePermission = DB::table('role_permissions')
+            ->where('name', '=', 'settings-manage')->first();
+
+        if (!$settingManagePermission) {
+            return;
+        }
+
+        $adminRoleIds = DB::table('permission_role')
+            ->where('permission_id', '=', $settingManagePermission->id)
+            ->pluck('role_id')->all();
+
+        // Assign the new permission to all existing admins
+        $newPermissionRoles = array_values(array_map(function ($roleId) use ($permissionId) {
+            return [
+                'role_id'       => $roleId,
+                'permission_id' => $permissionId,
+            ];
+        }, $adminRoleIds));
+
+        DB::table('permission_role')->insert($newPermissionRoles);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Remove content-import permission
+        $importPermission = DB::table('role_permissions')
+            ->where('name', '=', 'content-import')->first();
+
+        if (!$importPermission) {
+            return;
+        }
+
+        DB::table('permission_role')->where('permission_id', '=', $importPermission->id)->delete();
+        DB::table('role_permissions')->where('id', '=', $importPermission->id)->delete();
+    }
+};
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 7e5a708ef62..1a61b629a72 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -43,6 +43,7 @@
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 5427cb9419e..c0b6b692a57 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 0b407a8609a..418c0fea8d1 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -49,6 +49,13 @@
                 <span>@icon('tag')</span>
                 <span>{{ trans('entities.tags_view_tags') }}</span>
             </a>
+
+            @if(userCan('content-import'))
+                <a href="{{ url('/import') }}" class="icon-list-item">
+                    <span>@icon('upload')</span>
+                    <span>{{ trans('entities.import') }}</span>
+                </a>
+            @endif
         </div>
     </div>
 
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
new file mode 100644
index 00000000000..df8f705cb45
--- /dev/null
+++ b/resources/views/exports/import.blade.php
@@ -0,0 +1,34 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container small">
+
+        <main class="card content-wrap auto-height mt-xxl">
+            <div class="grid half left-focus v-end gap-m wrap">
+                <div>
+                    <h1 class="list-heading">{{ trans('entities.import') }}</h1>
+                    <p class="text-muted mb-s">
+                        TODO - Desc
+{{--                        {{ trans('entities.permissions_desc') }}--}}
+                    </p>
+                </div>
+            </div>
+            <form action="{{ url('/import') }}" method="POST">
+                {{ csrf_field() }}
+                <div class="flex-container-row justify-flex-end">
+                    <div class="form-group mb-m">
+                        @include('form.checkbox', ['name' => 'images', 'label' => 'Include Images'])
+                        @include('form.checkbox', ['name' => 'attachments', 'label' => 'Include Attachments'])
+                    </div>
+                </div>
+
+                <div class="text-right">
+                    <a href="{{ url('/books') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <button type="submit" class="button">{{ trans('entities.import') }}</button>
+                </div>
+            </form>
+        </main>
+    </div>
+
+@stop
diff --git a/resources/views/settings/roles/parts/form.blade.php b/resources/views/settings/roles/parts/form.blade.php
index 9fa76f2bfd7..a77b80e4c69 100644
--- a/resources/views/settings/roles/parts/form.blade.php
+++ b/resources/views/settings/roles/parts/form.blade.php
@@ -37,6 +37,7 @@
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'templates-manage', 'label' => trans('settings.role_manage_page_templates')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'access-api', 'label' => trans('settings.role_access_api')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'content-export', 'label' => trans('settings.role_export_content')])</div>
+                <div>@include('settings.roles.parts.checkbox', ['permission' => 'content-import', 'label' => trans('settings.role_import_content')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'editor-change', 'label' => trans('settings.role_editor_change')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'receive-notifications', 'label' => trans('settings.role_notifications')])</div>
             </div>
diff --git a/routes/web.php b/routes/web.php
index e6f3683c643..91aab13fecf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -206,6 +206,10 @@
     // Watching
     Route::put('/watching/update', [ActivityControllers\WatchController::class, 'update']);
 
+    // Importing
+    Route::get('/import', [ExportControllers\ImportController::class, 'start']);
+    Route::post('/import', [ExportControllers\ImportController::class, 'upload']);
+
     // Other Pages
     Route::get('/', [HomeController::class, 'index']);
     Route::get('/home', [HomeController::class, 'index']);

From a56a28fbb7eaff40a639c2d06f56de255cd654ea Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 29 Oct 2024 14:21:32 +0000
Subject: [PATCH 341/666] ZIP Exports: Built out initial import view

Added syles for non-custom, non-image file inputs.
Started planning out back-end handling.
---
 app/Exports/Controllers/ImportController.php |  8 ++++-
 lang/en/entities.php                         |  1 +
 resources/sass/_forms.scss                   | 37 ++++++++++++++++++++
 resources/views/exports/import.blade.php     | 31 ++++++++--------
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index acc803a0f0d..9eefb097438 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -14,11 +14,17 @@ public function __construct()
 
     public function start(Request $request)
     {
+        // TODO - Show existing imports for user (or for all users if admin-level user)
+
         return view('exports.import');
     }
 
     public function upload(Request $request)
     {
-        // TODO
+        // TODO - Read existing ZIP upload and send through validator
+            // TODO - If invalid, return user with errors
+        // TODO - Upload to storage
+        // TODO - Store info/results from validator
+        // TODO - Send user to next import stage
     }
 }
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 1a61b629a72..45ca4cf6b31 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -44,6 +44,7 @@
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
     'import' => 'Import',
+    'import_validate' => 'Validate Import',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 67df4171499..1c679aaa0dd 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -545,6 +545,43 @@ input[type=color] {
   outline: 1px solid var(--color-primary);
 }
 
+.custom-simple-file-input {
+  max-width: 100%;
+  border: 1px solid;
+  @include lightDark(border-color, #DDD, #666);
+  border-radius: 4px;
+  padding: $-s $-m;
+}
+.custom-simple-file-input::file-selector-button {
+  background-color: transparent;
+  text-decoration: none;
+  font-size: 0.8rem;
+  line-height: 1.4em;
+  padding: $-xs $-s;
+  border: 1px solid;
+  font-weight: 400;
+  outline: 0;
+  border-radius: 4px;
+  cursor: pointer;
+  margin-right: $-m;
+  @include lightDark(color, #666, #AAA);
+  @include lightDark(border-color, #CCC, #666);
+  &:hover, &:focus, &:active {
+    @include lightDark(color, #444, #BBB);
+    border: 1px solid #CCC;
+    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
+    background-color: #F2F2F2;
+    @include lightDark(background-color, #f8f8f8, #444);
+    filter: none;
+  }
+  &:active {
+    border-color: #BBB;
+    background-color: #DDD;
+    color: #666;
+    box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.1);
+  }
+}
+
 input.shortcut-input {
   width: auto;
   max-width: 120px;
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
index df8f705cb45..b7030f11478 100644
--- a/resources/views/exports/import.blade.php
+++ b/resources/views/exports/import.blade.php
@@ -5,27 +5,30 @@
     <div class="container small">
 
         <main class="card content-wrap auto-height mt-xxl">
-            <div class="grid half left-focus v-end gap-m wrap">
-                <div>
-                    <h1 class="list-heading">{{ trans('entities.import') }}</h1>
-                    <p class="text-muted mb-s">
-                        TODO - Desc
-{{--                        {{ trans('entities.permissions_desc') }}--}}
-                    </p>
-                </div>
-            </div>
+            <h1 class="list-heading">{{ trans('entities.import') }}</h1>
             <form action="{{ url('/import') }}" method="POST">
                 {{ csrf_field() }}
-                <div class="flex-container-row justify-flex-end">
-                    <div class="form-group mb-m">
-                        @include('form.checkbox', ['name' => 'images', 'label' => 'Include Images'])
-                        @include('form.checkbox', ['name' => 'attachments', 'label' => 'Include Attachments'])
+                <div class="flex-container-row justify-space-between wrap gap-x-xl gap-y-s">
+                    <p class="flex min-width-l text-muted mb-s">
+                        Import content using a portable zip export from the same, or a different, instance.
+                        Select a ZIP file to import then press "Validate Import" to proceed.
+                        After the file has been uploaded and validated you'll be able to configure & confirm the import in the next view.
+                    </p>
+                    <div class="flex-none min-width-l flex-container-row justify-flex-end">
+                        <div class="mb-m">
+                            <label for="file">Select ZIP file to upload</label>
+                            <input type="file"
+                                   accept=".zip,application/zip,application/x-zip-compressed"
+                                   name="file"
+                                   id="file"
+                                   class="custom-simple-file-input">
+                        </div>
                     </div>
                 </div>
 
                 <div class="text-right">
                     <a href="{{ url('/books') }}" class="button outline">{{ trans('common.cancel') }}</a>
-                    <button type="submit" class="button">{{ trans('entities.import') }}</button>
+                    <button type="submit" class="button">{{ trans('entities.import_validate') }}</button>
                 </div>
             </form>
         </main>

From 4b60c03caa5ff990bf935b4b6ede7d8d32f0e8c5 Mon Sep 17 00:00:00 2001
From: Zero <john.royer@gmail.com>
Date: Tue, 29 Oct 2024 23:06:50 +0800
Subject: [PATCH 342/666] re-write Dockerfile

---
 dev/docker/Dockerfile | 52 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 50d528fafb8..5040298e052 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,34 +1,34 @@
 FROM php:8.3-apache
 
-ENV APACHE_DOCUMENT_ROOT /app/public
-WORKDIR /app
-
-RUN <<EOR
 # Install additional dependencies
-apt-get update
-apt-get install -y \
-	git \
-	zip \
-	unzip \
-	libpng-dev \
-	libldap2-dev \
-	libzip-dev \
-	wait-for-it
-rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get install -y \
+        git \
+        zip \
+        unzip \
+        libpng-dev \
+        libldap2-dev \
+        libzip-dev \
+        wait-for-it && \
+    rm -rf /var/lib/apt/lists/*
 
-# Configure apache
-docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)"
-docker-php-ext-install pdo_mysql gd ldap zip
-pecl install xdebug
-docker-php-ext-enable xdebug
-a2enmod rewrite
-sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+# Install PHP extensions
+RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
+    docker-php-ext-install pdo_mysql gd ldap zip && \
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug
 
 # Install composer
-curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Configure apache
+RUN a2enmod rewrite && \
+    sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf && \
+    sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
 
 # Use the default production configuration and update it as required
-mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
-sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
-EOR
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+    sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
+
+ENV APACHE_DOCUMENT_ROOT /app/public
+WORKDIR /app

From fbeb2e23d41b381d0cf15ab0e06f8109497fb2a1 Mon Sep 17 00:00:00 2001
From: Zero <john.royer@gmail.com>
Date: Tue, 29 Oct 2024 23:07:15 +0800
Subject: [PATCH 343/666] fix deprecated syntax

---
 dev/docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 5040298e052..9f283c75544 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -30,5 +30,6 @@ RUN a2enmod rewrite && \
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
     sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
 
-ENV APACHE_DOCUMENT_ROOT /app/public
+ENV APACHE_DOCUMENT_ROOT="/app/public"
+
 WORKDIR /app

From b50b7b667d2266950baa56457f2ed8b7eeda273d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 30 Oct 2024 13:13:41 +0000
Subject: [PATCH 344/666] ZIP Exports: Started import validation

---
 .../ZipExportValidationException.php          | 12 ++++
 app/Exports/Controllers/ImportController.php  |  6 ++
 .../ZipExports/Models/ZipExportAttachment.php | 14 +++++
 .../ZipExports/Models/ZipExportModel.php      |  9 +++
 .../ZipExports/Models/ZipExportTag.php        | 12 ++++
 app/Exports/ZipExports/ZipExportValidator.php | 63 +++++++++++++++++++
 .../ZipExports/ZipFileReferenceRule.php       | 26 ++++++++
 .../ZipExports/ZipValidationHelper.php        | 32 ++++++++++
 lang/en/validation.php                        |  2 +
 resources/views/exports/import.blade.php      |  2 +-
 10 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 app/Exceptions/ZipExportValidationException.php
 create mode 100644 app/Exports/ZipExports/ZipExportValidator.php
 create mode 100644 app/Exports/ZipExports/ZipFileReferenceRule.php
 create mode 100644 app/Exports/ZipExports/ZipValidationHelper.php

diff --git a/app/Exceptions/ZipExportValidationException.php b/app/Exceptions/ZipExportValidationException.php
new file mode 100644
index 00000000000..2ed567d6343
--- /dev/null
+++ b/app/Exceptions/ZipExportValidationException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class ZipExportValidationException extends \Exception
+{
+    public function __construct(
+        public array $errors,
+    ) {
+        parent::__construct();
+    }
+}
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 9eefb097438..4270828effd 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -21,6 +21,12 @@ public function start(Request $request)
 
     public function upload(Request $request)
     {
+        $this->validate($request, [
+            'file' => ['required', 'file']
+        ]);
+
+        $file = $request->file('file');
+        $file->getRealPath();
         // TODO - Read existing ZIP upload and send through validator
             // TODO - If invalid, return user with errors
         // TODO - Upload to storage
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index 283ffa751c9..ab1f5ab7559 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -3,6 +3,7 @@
 namespace BookStack\Exports\ZipExports\Models;
 
 use BookStack\Exports\ZipExports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 use BookStack\Uploads\Attachment;
 
 class ZipExportAttachment extends ZipExportModel
@@ -35,4 +36,17 @@ public static function fromModelArray(array $attachmentArray, ZipExportFiles $fi
             return self::fromModel($attachment, $files);
         }, $attachmentArray));
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'id'    => ['nullable', 'int'],
+            'name'  => ['required', 'string', 'min:1'],
+            'order' => ['nullable', 'integer'],
+            'link'  => ['required_without:file', 'nullable', 'string'],
+            'file'  => ['required_without:link', 'nullable', 'string', $context->fileReferenceRule()],
+        ];
+
+        return $context->validateArray($data, $rules);
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.php
index 8d0c0a4370b..4d66f010f86 100644
--- a/app/Exports/ZipExports/Models/ZipExportModel.php
+++ b/app/Exports/ZipExports/Models/ZipExportModel.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports\ZipExports\Models;
 
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 use JsonSerializable;
 
 abstract class ZipExportModel implements JsonSerializable
@@ -17,4 +18,12 @@ public function jsonSerialize(): array
         $publicProps = get_object_vars(...)->__invoke($this);
         return array_filter($publicProps, fn ($value) => $value !== null);
     }
+
+    /**
+     * Validate the given array of data intended for this model.
+     * Return an array of validation errors messages.
+     * Child items can be considered in the validation result by returning a keyed
+     * item in the array for its own validation messages.
+     */
+    abstract public static function validate(ZipValidationHelper $context, array $data): array;
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
index d4e3c4290b3..ad17d5a33c6 100644
--- a/app/Exports/ZipExports/Models/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -3,6 +3,7 @@
 namespace BookStack\Exports\ZipExports\Models;
 
 use BookStack\Activity\Models\Tag;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 
 class ZipExportTag extends ZipExportModel
 {
@@ -24,4 +25,15 @@ public static function fromModelArray(array $tagArray): array
     {
         return array_values(array_map(self::fromModel(...), $tagArray));
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'name'  => ['required', 'string', 'min:1'],
+            'value' => ['nullable', 'string'],
+            'order' => ['nullable', 'integer'],
+        ];
+
+        return $context->validateArray($data, $rules);
+    }
 }
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
new file mode 100644
index 00000000000..5ad9272de43
--- /dev/null
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use BookStack\Exceptions\ZipExportValidationException;
+use ZipArchive;
+
+class ZipExportValidator
+{
+    protected array $errors = [];
+
+    public function __construct(
+        protected string $zipPath,
+    ) {
+    }
+
+    /**
+     * @throws ZipExportValidationException
+     */
+    public function validate()
+    {
+        // TODO - Return type
+        // TODO - extract messages to translations?
+
+        // Validate file exists
+        if (!file_exists($this->zipPath) || !is_readable($this->zipPath)) {
+            $this->throwErrors("Could not read ZIP file");
+        }
+
+        // Validate file is valid zip
+        $zip = new \ZipArchive();
+        $opened = $zip->open($this->zipPath, ZipArchive::RDONLY);
+        if ($opened !== true) {
+            $this->throwErrors("Could not read ZIP file");
+        }
+
+        // Validate json data exists, including metadata
+        $jsonData = $zip->getFromName('data.json') ?: '';
+        $importData = json_decode($jsonData, true);
+        if (!$importData) {
+            $this->throwErrors("Could not decode ZIP data.json content");
+        }
+
+        if (isset($importData['book'])) {
+            // TODO - Validate book
+        } else if (isset($importData['chapter'])) {
+            // TODO - Validate chapter
+        } else if (isset($importData['page'])) {
+            // TODO - Validate page
+        } else {
+            $this->throwErrors("ZIP file has no book, chapter or page data");
+        }
+    }
+
+    /**
+     * @throws ZipExportValidationException
+     */
+    protected function throwErrors(...$errorsToAdd): never
+    {
+        array_push($this->errors, ...$errorsToAdd);
+        throw new ZipExportValidationException($this->errors);
+    }
+}
diff --git a/app/Exports/ZipExports/ZipFileReferenceRule.php b/app/Exports/ZipExports/ZipFileReferenceRule.php
new file mode 100644
index 00000000000..4f942e0e789
--- /dev/null
+++ b/app/Exports/ZipExports/ZipFileReferenceRule.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use ZipArchive;
+
+class ZipFileReferenceRule implements ValidationRule
+{
+    public function __construct(
+        protected ZipValidationHelper $context,
+    ) {
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (!$this->context->zipFileExists($value)) {
+            $fail('validation.zip_file')->translate();
+        }
+    }
+}
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
new file mode 100644
index 00000000000..dd41e6f8b25
--- /dev/null
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use Illuminate\Validation\Factory;
+use ZipArchive;
+
+class ZipValidationHelper
+{
+    protected Factory $validationFactory;
+
+    public function __construct(
+        protected ZipArchive $zip,
+    ) {
+        $this->validationFactory = app(Factory::class);
+    }
+
+    public function validateArray(array $data, array $rules): array
+    {
+        return $this->validationFactory->make($data, $rules)->errors()->messages();
+    }
+
+    public function zipFileExists(string $name): bool
+    {
+        return $this->zip->statName("files/{$name}") !== false;
+    }
+
+    public function fileReferenceRule(): ZipFileReferenceRule
+    {
+        return new ZipFileReferenceRule($this);
+    }
+}
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 2a676c7c4cc..6971edc023a 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -105,6 +105,8 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file'            => 'The :attribute needs to reference a file within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
index b7030f11478..9fe596d8888 100644
--- a/resources/views/exports/import.blade.php
+++ b/resources/views/exports/import.blade.php
@@ -10,7 +10,7 @@
                 {{ csrf_field() }}
                 <div class="flex-container-row justify-space-between wrap gap-x-xl gap-y-s">
                     <p class="flex min-width-l text-muted mb-s">
-                        Import content using a portable zip export from the same, or a different, instance.
+                        Import books, chapters & pages using a portable zip export from the same, or a different, instance.
                         Select a ZIP file to import then press "Validate Import" to proceed.
                         After the file has been uploaded and validated you'll be able to configure & confirm the import in the next view.
                     </p>

From c4ec50d437e52ccd831b6fb2e43baa5cf255fd1a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 30 Oct 2024 15:26:23 +0000
Subject: [PATCH 345/666] ZIP Exports: Got zip format validation functionally
 complete

---
 .../ZipExportValidationException.php          | 12 -----
 app/Exports/Controllers/ImportController.php  |  9 +++-
 .../ZipExports/Models/ZipExportAttachment.php |  2 +-
 .../ZipExports/Models/ZipExportBook.php       | 21 ++++++++
 .../ZipExports/Models/ZipExportChapter.php    | 19 +++++++
 .../ZipExports/Models/ZipExportImage.php      | 14 +++++
 .../ZipExports/Models/ZipExportPage.php       | 22 ++++++++
 .../ZipExports/Models/ZipExportTag.php        |  2 +-
 app/Exports/ZipExports/ZipExportValidator.php | 53 +++++++++++--------
 .../ZipExports/ZipValidationHelper.php        | 31 ++++++++++-
 lang/en/validation.php                        |  3 +-
 resources/views/exports/import.blade.php      |  3 +-
 12 files changed, 149 insertions(+), 42 deletions(-)
 delete mode 100644 app/Exceptions/ZipExportValidationException.php

diff --git a/app/Exceptions/ZipExportValidationException.php b/app/Exceptions/ZipExportValidationException.php
deleted file mode 100644
index 2ed567d6343..00000000000
--- a/app/Exceptions/ZipExportValidationException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace BookStack\Exceptions;
-
-class ZipExportValidationException extends \Exception
-{
-    public function __construct(
-        public array $errors,
-    ) {
-        parent::__construct();
-    }
-}
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 4270828effd..5885f7991cd 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports\Controllers;
 
+use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
@@ -26,7 +27,13 @@ public function upload(Request $request)
         ]);
 
         $file = $request->file('file');
-        $file->getRealPath();
+        $zipPath = $file->getRealPath();
+
+        $errors = (new ZipExportValidator($zipPath))->validate();
+        if ($errors) {
+            dd($errors);
+        }
+        dd('passed');
         // TODO - Read existing ZIP upload and send through validator
             // TODO - If invalid, return user with errors
         // TODO - Upload to storage
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index ab1f5ab7559..e586b91b0ee 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -47,6 +47,6 @@ public static function validate(ZipValidationHelper $context, array $data): arra
             'file'  => ['required_without:link', 'nullable', 'string', $context->fileReferenceRule()],
         ];
 
-        return $context->validateArray($data, $rules);
+        return $context->validateData($data, $rules);
     }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 5a0c5806ba8..7e1f2d8106e 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 
 class ZipExportBook extends ZipExportModel
 {
@@ -50,4 +51,24 @@ public static function fromModel(Book $model, ZipExportFiles $files): self
 
         return $instance;
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'id'    => ['nullable', 'int'],
+            'name'  => ['required', 'string', 'min:1'],
+            'description_html' => ['nullable', 'string'],
+            'cover' => ['nullable', 'string', $context->fileReferenceRule()],
+            'tags' => ['array'],
+            'pages' => ['array'],
+            'chapters' => ['array'],
+        ];
+
+        $errors = $context->validateData($data, $rules);
+        $errors['tags'] = $context->validateRelations($data['tags'] ?? [], ZipExportTag::class);
+        $errors['pages'] = $context->validateRelations($data['pages'] ?? [], ZipExportPage::class);
+        $errors['chapters'] = $context->validateRelations($data['chapters'] ?? [], ZipExportChapter::class);
+
+        return $errors;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index cd5765f48bc..03df31b7078 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 
 class ZipExportChapter extends ZipExportModel
 {
@@ -42,4 +43,22 @@ public static function fromModelArray(array $chapterArray, ZipExportFiles $files
             return self::fromModel($chapter, $files);
         }, $chapterArray));
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'id'    => ['nullable', 'int'],
+            'name'  => ['required', 'string', 'min:1'],
+            'description_html' => ['nullable', 'string'],
+            'priority' => ['nullable', 'int'],
+            'tags' => ['array'],
+            'pages' => ['array'],
+        ];
+
+        $errors = $context->validateData($data, $rules);
+        $errors['tags'] = $context->validateRelations($data['tags'] ?? [], ZipExportTag::class);
+        $errors['pages'] = $context->validateRelations($data['pages'] ?? [], ZipExportPage::class);
+
+        return $errors;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 05d828734a0..3388c66df36 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -3,7 +3,9 @@
 namespace BookStack\Exports\ZipExports\Models;
 
 use BookStack\Exports\ZipExports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 use BookStack\Uploads\Image;
+use Illuminate\Validation\Rule;
 
 class ZipExportImage extends ZipExportModel
 {
@@ -22,4 +24,16 @@ public static function fromModel(Image $model, ZipExportFiles $files): self
 
         return $instance;
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'id'    => ['nullable', 'int'],
+            'name'  => ['required', 'string', 'min:1'],
+            'file'  => ['required', 'string', $context->fileReferenceRule()],
+            'type'  => ['required', 'string', Rule::in(['gallery', 'drawio'])],
+        ];
+
+        return $context->validateData($data, $rules);
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 8075595f228..2c8b9a88abd 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exports\ZipExports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipValidationHelper;
 
 class ZipExportPage extends ZipExportModel
 {
@@ -48,4 +49,25 @@ public static function fromModelArray(array $pageArray, ZipExportFiles $files):
             return self::fromModel($page, $files);
         }, $pageArray));
     }
+
+    public static function validate(ZipValidationHelper $context, array $data): array
+    {
+        $rules = [
+            'id'    => ['nullable', 'int'],
+            'name'  => ['required', 'string', 'min:1'],
+            'html' => ['nullable', 'string'],
+            'markdown' => ['nullable', 'string'],
+            'priority' => ['nullable', 'int'],
+            'attachments' => ['array'],
+            'images' => ['array'],
+            'tags' => ['array'],
+        ];
+
+        $errors = $context->validateData($data, $rules);
+        $errors['attachments'] = $context->validateRelations($data['attachments'] ?? [], ZipExportAttachment::class);
+        $errors['images'] = $context->validateRelations($data['images'] ?? [], ZipExportImage::class);
+        $errors['tags'] = $context->validateRelations($data['tags'] ?? [], ZipExportTag::class);
+
+        return $errors;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
index ad17d5a33c6..99abb811c06 100644
--- a/app/Exports/ZipExports/Models/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -34,6 +34,6 @@ public static function validate(ZipValidationHelper $context, array $data): arra
             'order' => ['nullable', 'integer'],
         ];
 
-        return $context->validateArray($data, $rules);
+        return $context->validateData($data, $rules);
     }
 }
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
index 5ad9272de43..e56394acaeb 100644
--- a/app/Exports/ZipExports/ZipExportValidator.php
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -2,62 +2,69 @@
 
 namespace BookStack\Exports\ZipExports;
 
-use BookStack\Exceptions\ZipExportValidationException;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use ZipArchive;
 
 class ZipExportValidator
 {
-    protected array $errors = [];
-
     public function __construct(
         protected string $zipPath,
     ) {
     }
 
-    /**
-     * @throws ZipExportValidationException
-     */
-    public function validate()
+    public function validate(): array
     {
-        // TODO - Return type
-        // TODO - extract messages to translations?
-
         // Validate file exists
         if (!file_exists($this->zipPath) || !is_readable($this->zipPath)) {
-            $this->throwErrors("Could not read ZIP file");
+            return ['format' => "Could not read ZIP file"];
         }
 
         // Validate file is valid zip
         $zip = new \ZipArchive();
         $opened = $zip->open($this->zipPath, ZipArchive::RDONLY);
         if ($opened !== true) {
-            $this->throwErrors("Could not read ZIP file");
+            return ['format' => "Could not read ZIP file"];
         }
 
         // Validate json data exists, including metadata
         $jsonData = $zip->getFromName('data.json') ?: '';
         $importData = json_decode($jsonData, true);
         if (!$importData) {
-            $this->throwErrors("Could not decode ZIP data.json content");
+            return ['format' => "Could not find and decode ZIP data.json content"];
         }
 
+        $helper = new ZipValidationHelper($zip);
+
         if (isset($importData['book'])) {
-            // TODO - Validate book
+            $modelErrors = ZipExportBook::validate($helper, $importData['book']);
+            $keyPrefix = 'book';
         } else if (isset($importData['chapter'])) {
-            // TODO - Validate chapter
+            $modelErrors = ZipExportChapter::validate($helper, $importData['chapter']);
+            $keyPrefix = 'chapter';
         } else if (isset($importData['page'])) {
-            // TODO - Validate page
+            $modelErrors = ZipExportPage::validate($helper, $importData['page']);
+            $keyPrefix = 'page';
         } else {
-            $this->throwErrors("ZIP file has no book, chapter or page data");
+            return ['format' => "ZIP file has no book, chapter or page data"];
         }
+
+        return $this->flattenModelErrors($modelErrors, $keyPrefix);
     }
 
-    /**
-     * @throws ZipExportValidationException
-     */
-    protected function throwErrors(...$errorsToAdd): never
+    protected function flattenModelErrors(array $errors, string $keyPrefix): array
     {
-        array_push($this->errors, ...$errorsToAdd);
-        throw new ZipExportValidationException($this->errors);
+        $flattened = [];
+
+        foreach ($errors as $key => $error) {
+            if (is_array($error)) {
+                $flattened = array_merge($flattened, $this->flattenModelErrors($error, $keyPrefix . '.' . $key));
+            } else {
+                $flattened[$keyPrefix . '.' . $key] = $error;
+            }
+        }
+
+        return $flattened;
     }
 }
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index dd41e6f8b25..8c285deaf5d 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports\ZipExports;
 
+use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use Illuminate\Validation\Factory;
 use ZipArchive;
 
@@ -15,9 +16,15 @@ public function __construct(
         $this->validationFactory = app(Factory::class);
     }
 
-    public function validateArray(array $data, array $rules): array
+    public function validateData(array $data, array $rules): array
     {
-        return $this->validationFactory->make($data, $rules)->errors()->messages();
+        $messages = $this->validationFactory->make($data, $rules)->errors()->messages();
+
+        foreach ($messages as $key => $message) {
+            $messages[$key] = implode("\n", $message);
+        }
+
+        return $messages;
     }
 
     public function zipFileExists(string $name): bool
@@ -29,4 +36,24 @@ public function fileReferenceRule(): ZipFileReferenceRule
     {
         return new ZipFileReferenceRule($this);
     }
+
+    /**
+     * Validate an array of relation data arrays that are expected
+     * to be for the given ZipExportModel.
+     * @param class-string<ZipExportModel> $model
+     */
+    public function validateRelations(array $relations, string $model): array
+    {
+        $results = [];
+
+        foreach ($relations as $key => $relationData) {
+            if (is_array($relationData)) {
+                $results[$key] = $model::validate($this, $relationData);
+            } else {
+                $results[$key] = [trans('validation.zip_model_expected', ['type' => gettype($relationData)])];
+            }
+        }
+
+        return $results;
+    }
 }
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 6971edc023a..9cf5d78b6f6 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -105,7 +105,8 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
-    'zip_file'            => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_model_expected' => 'Data object expected but ":type" found',
 
     // Custom validation lines
     'custom' => [
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
index 9fe596d8888..15f33e6b7c1 100644
--- a/resources/views/exports/import.blade.php
+++ b/resources/views/exports/import.blade.php
@@ -6,7 +6,7 @@
 
         <main class="card content-wrap auto-height mt-xxl">
             <h1 class="list-heading">{{ trans('entities.import') }}</h1>
-            <form action="{{ url('/import') }}" method="POST">
+            <form action="{{ url('/import') }}" enctype="multipart/form-data" method="POST">
                 {{ csrf_field() }}
                 <div class="flex-container-row justify-space-between wrap gap-x-xl gap-y-s">
                     <p class="flex min-width-l text-muted mb-s">
@@ -22,6 +22,7 @@
                                    name="file"
                                    id="file"
                                    class="custom-simple-file-input">
+                            @include('form.errors', ['name' => 'file'])
                         </div>
                     </div>
                 </div>

From 259aa829d42b1cd93011d5b8b531c15804741cb5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 2 Nov 2024 14:51:04 +0000
Subject: [PATCH 346/666] ZIP Imports: Added validation message display, added
 testing

Testing covers main UI access, and main non-successfull import actions.
Started planning stored import model.
Extracted some text to language files.
---
 app/Exports/Controllers/ImportController.php  |  20 ++-
 app/Exports/ZipExports/ZipExportValidator.php |   9 +-
 lang/en/entities.php                          |   3 +
 lang/en/errors.php                            |   5 +
 lang/en/validation.php                        |   2 +-
 resources/views/exports/import.blade.php      |  17 ++-
 tests/Exports/ZipImportTest.php               | 124 ++++++++++++++++++
 7 files changed, 164 insertions(+), 16 deletions(-)
 create mode 100644 tests/Exports/ZipImportTest.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 5885f7991cd..323ecef268f 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -17,7 +17,9 @@ public function start(Request $request)
     {
         // TODO - Show existing imports for user (or for all users if admin-level user)
 
-        return view('exports.import');
+        return view('exports.import', [
+            'zipErrors' => session()->pull('validation_errors') ?? [],
+        ]);
     }
 
     public function upload(Request $request)
@@ -31,13 +33,21 @@ public function upload(Request $request)
 
         $errors = (new ZipExportValidator($zipPath))->validate();
         if ($errors) {
-            dd($errors);
+            session()->flash('validation_errors', $errors);
+            return redirect('/import');
         }
+
         dd('passed');
-        // TODO - Read existing ZIP upload and send through validator
-            // TODO - If invalid, return user with errors
         // TODO - Upload to storage
-        // TODO - Store info/results from validator
+        // TODO - Store info/results for display:
+          // - zip_path
+          // - name (From name of thing being imported)
+          // - size
+          // - book_count
+          // - chapter_count
+          // - page_count
+          // - created_by
+          // - created_at/updated_at
         // TODO - Send user to next import stage
     }
 }
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
index e56394acaeb..dd56f3e70a8 100644
--- a/app/Exports/ZipExports/ZipExportValidator.php
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -18,21 +18,21 @@ public function validate(): array
     {
         // Validate file exists
         if (!file_exists($this->zipPath) || !is_readable($this->zipPath)) {
-            return ['format' => "Could not read ZIP file"];
+            return ['format' => trans('errors.import_zip_cant_read')];
         }
 
         // Validate file is valid zip
         $zip = new \ZipArchive();
         $opened = $zip->open($this->zipPath, ZipArchive::RDONLY);
         if ($opened !== true) {
-            return ['format' => "Could not read ZIP file"];
+            return ['format' => trans('errors.import_zip_cant_read')];
         }
 
         // Validate json data exists, including metadata
         $jsonData = $zip->getFromName('data.json') ?: '';
         $importData = json_decode($jsonData, true);
         if (!$importData) {
-            return ['format' => "Could not find and decode ZIP data.json content"];
+            return ['format' => trans('errors.import_zip_cant_decode_data')];
         }
 
         $helper = new ZipValidationHelper($zip);
@@ -47,9 +47,10 @@ public function validate(): array
             $modelErrors = ZipExportPage::validate($helper, $importData['page']);
             $keyPrefix = 'page';
         } else {
-            return ['format' => "ZIP file has no book, chapter or page data"];
+            return ['format' => trans('errors.import_zip_no_data')];
         }
 
+
         return $this->flattenModelErrors($modelErrors, $keyPrefix);
     }
 
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 45ca4cf6b31..10614733533 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -45,6 +45,9 @@
     'default_template_select' => 'Select a template page',
     'import' => 'Import',
     'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to import then press "Validate Import" to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 9c40aa9ed33..3f2f303311e 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -105,6 +105,11 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/en/validation.php b/lang/en/validation.php
index 9cf5d78b6f6..bc01ac47b94 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -106,7 +106,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_model_expected' => 'Data object expected but ":type" found',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
 
     // Custom validation lines
     'custom' => [
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
index 15f33e6b7c1..c4d7c881845 100644
--- a/resources/views/exports/import.blade.php
+++ b/resources/views/exports/import.blade.php
@@ -9,14 +9,10 @@
             <form action="{{ url('/import') }}" enctype="multipart/form-data" method="POST">
                 {{ csrf_field() }}
                 <div class="flex-container-row justify-space-between wrap gap-x-xl gap-y-s">
-                    <p class="flex min-width-l text-muted mb-s">
-                        Import books, chapters & pages using a portable zip export from the same, or a different, instance.
-                        Select a ZIP file to import then press "Validate Import" to proceed.
-                        After the file has been uploaded and validated you'll be able to configure & confirm the import in the next view.
-                    </p>
+                    <p class="flex min-width-l text-muted mb-s">{{ trans('entities.import_desc') }}</p>
                     <div class="flex-none min-width-l flex-container-row justify-flex-end">
                         <div class="mb-m">
-                            <label for="file">Select ZIP file to upload</label>
+                            <label for="file">{{ trans('entities.import_zip_select') }}</label>
                             <input type="file"
                                    accept=".zip,application/zip,application/x-zip-compressed"
                                    name="file"
@@ -27,6 +23,15 @@ class="custom-simple-file-input">
                     </div>
                 </div>
 
+                @if(count($zipErrors) > 0)
+                    <p class="mb-xs"><strong class="text-neg">{{ trans('entities.import_zip_validation_errors') }}</strong></p>
+                    <ul class="mb-m">
+                        @foreach($zipErrors as $key => $error)
+                            <li><strong class="text-neg">[{{ $key }}]</strong>: {{ $error }}</li>
+                        @endforeach
+                    </ul>
+                @endif
+
                 <div class="text-right">
                     <a href="{{ url('/books') }}" class="button outline">{{ trans('common.cancel') }}</a>
                     <button type="submit" class="button">{{ trans('entities.import_validate') }}</button>
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
new file mode 100644
index 00000000000..c9d255b1e97
--- /dev/null
+++ b/tests/Exports/ZipImportTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Tests\Exports;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Testing\TestResponse;
+use Tests\TestCase;
+use ZipArchive;
+
+class ZipImportTest extends TestCase
+{
+    public function test_import_page_view()
+    {
+        $resp = $this->asAdmin()->get('/import');
+        $resp->assertSee('Import');
+        $this->withHtml($resp)->assertElementExists('form input[type="file"][name="file"]');
+    }
+
+    public function test_permissions_needed_for_import_page()
+    {
+        $user = $this->users->viewer();
+        $this->actingAs($user);
+
+        $resp = $this->get('/books');
+        $this->withHtml($resp)->assertLinkNotExists(url('/import'));
+        $resp = $this->get('/import');
+        $resp->assertRedirect('/');
+
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $resp = $this->get('/books');
+        $this->withHtml($resp)->assertLinkExists(url('/import'));
+        $resp = $this->get('/import');
+        $resp->assertOk();
+        $resp->assertSeeText('Select ZIP file to upload');
+    }
+
+    public function test_zip_read_errors_are_shown_on_validation()
+    {
+        $invalidUpload = $this->files->uploadedImage('image.zip');
+
+        $this->asAdmin();
+        $resp = $this->runImportFromFile($invalidUpload);
+        $resp->assertRedirect('/import');
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSeeText('Could not read ZIP file');
+    }
+
+    public function test_error_shown_if_missing_data()
+    {
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::CREATE);
+        $zip->addFromString('beans', 'cat');
+        $zip->close();
+
+        $this->asAdmin();
+        $upload = new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
+        $resp = $this->runImportFromFile($upload);
+        $resp->assertRedirect('/import');
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSeeText('Could not find and decode ZIP data.json content.');
+    }
+
+    public function test_error_shown_if_no_importable_key()
+    {
+        $this->asAdmin();
+        $resp = $this->runImportFromFile($this->zipUploadFromData([
+            'instance' => []
+        ]));
+
+        $resp->assertRedirect('/import');
+        $resp = $this->followRedirects($resp);
+        $resp->assertSeeText('ZIP file data has no expected book, chapter or page content.');
+    }
+
+    public function test_zip_data_validation_messages_shown()
+    {
+        $this->asAdmin();
+        $resp = $this->runImportFromFile($this->zipUploadFromData([
+            'book' => [
+                'id' => 4,
+                'pages' => [
+                    'cat',
+                    [
+                        'name' => 'My inner page',
+                        'tags' => [
+                            [
+                                'value' => 5
+                            ]
+                        ],
+                    ]
+                ],
+            ]
+        ]));
+
+        $resp->assertRedirect('/import');
+        $resp = $this->followRedirects($resp);
+
+        $resp->assertSeeText('[book.name]: The name field is required.');
+        $resp->assertSeeText('[book.pages.0.0]: Data object expected but "string" found.');
+        $resp->assertSeeText('[book.pages.1.tags.0.name]: The name field is required.');
+        $resp->assertSeeText('[book.pages.1.tags.0.value]: The value must be a string.');
+    }
+
+    protected function runImportFromFile(UploadedFile $file): TestResponse
+    {
+        return $this->call('POST', '/import', [], [], ['file' => $file]);
+    }
+
+    protected function zipUploadFromData(array $data): UploadedFile
+    {
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::CREATE);
+        $zip->addFromString('data.json', json_encode($data));
+        $zip->close();
+
+        return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
+    }
+}

From 74fce9640ef39a743bdb5a997724465c7c2b764c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 2 Nov 2024 17:17:34 +0000
Subject: [PATCH 347/666] ZIP Import: Added model+migration, and reader class

---
 app/Exports/Controllers/ImportController.php  |  24 +++--
 app/Exports/Import.php                        |  41 +++++++
 app/Exports/ZipExports/ZipExportReader.php    | 102 ++++++++++++++++++
 app/Exports/ZipExports/ZipExportValidator.php |  26 ++---
 .../ZipExports/ZipFileReferenceRule.php       |   2 +-
 .../ZipExports/ZipValidationHelper.php        |   8 +-
 database/factories/Exports/ImportFactory.php  |  32 ++++++
 ...2024_11_02_160700_create_imports_table.php |  34 ++++++
 8 files changed, 234 insertions(+), 35 deletions(-)
 create mode 100644 app/Exports/Import.php
 create mode 100644 app/Exports/ZipExports/ZipExportReader.php
 create mode 100644 database/factories/Exports/ImportFactory.php
 create mode 100644 database/migrations/2024_11_02_160700_create_imports_table.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 323ecef268f..bbf0ff57d8c 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -2,6 +2,8 @@
 
 namespace BookStack\Exports\Controllers;
 
+use BookStack\Exports\Import;
+use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
@@ -37,17 +39,23 @@ public function upload(Request $request)
             return redirect('/import');
         }
 
+        $zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
+        $import = new Import();
+        $import->name = $zipEntityInfo['name'];
+        $import->book_count = $zipEntityInfo['book_count'];
+        $import->chapter_count = $zipEntityInfo['chapter_count'];
+        $import->page_count = $zipEntityInfo['page_count'];
+        $import->created_by = user()->id;
+        $import->size = filesize($zipPath);
+        // TODO - Set path
+        // TODO - Save
+
+        // TODO - Split out attachment service to separate out core filesystem/disk stuff
+        //        To reuse for import handling
+
         dd('passed');
         // TODO - Upload to storage
         // TODO - Store info/results for display:
-          // - zip_path
-          // - name (From name of thing being imported)
-          // - size
-          // - book_count
-          // - chapter_count
-          // - page_count
-          // - created_by
-          // - created_at/updated_at
         // TODO - Send user to next import stage
     }
 }
diff --git a/app/Exports/Import.php b/app/Exports/Import.php
new file mode 100644
index 00000000000..c3ac3d52924
--- /dev/null
+++ b/app/Exports/Import.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\Exports;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property string $path
+ * @property string $name
+ * @property int $size - ZIP size in bytes
+ * @property int $book_count
+ * @property int $chapter_count
+ * @property int $page_count
+ * @property int $created_by
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
+class Import extends Model
+{
+    use HasFactory;
+
+    public const TYPE_BOOK = 'book';
+    public const TYPE_CHAPTER = 'chapter';
+    public const TYPE_PAGE = 'page';
+
+    /**
+     * Get the type (model) that this import is intended to be.
+     */
+    public function getType(): string
+    {
+        if ($this->book_count === 1) {
+            return self::TYPE_BOOK;
+        } elseif ($this->chapter_count === 1) {
+            return self::TYPE_CHAPTER;
+        }
+
+        return self::TYPE_PAGE;
+    }
+}
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
new file mode 100644
index 00000000000..7187a18897d
--- /dev/null
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use BookStack\Exceptions\ZipExportException;
+use ZipArchive;
+
+class ZipExportReader
+{
+    protected ZipArchive $zip;
+    protected bool $open = false;
+
+    public function __construct(
+        protected string $zipPath,
+    ) {
+        $this->zip = new ZipArchive();
+    }
+
+    /**
+     * @throws ZipExportException
+     */
+    protected function open(): void
+    {
+        if ($this->open) {
+            return;
+        }
+
+        // Validate file exists
+        if (!file_exists($this->zipPath) || !is_readable($this->zipPath)) {
+            throw new ZipExportException(trans('errors.import_zip_cant_read'));
+        }
+
+        // Validate file is valid zip
+        $opened = $this->zip->open($this->zipPath, ZipArchive::RDONLY);
+        if ($opened !== true) {
+            throw new ZipExportException(trans('errors.import_zip_cant_read'));
+        }
+
+        $this->open = true;
+    }
+
+    public function close(): void
+    {
+        if ($this->open) {
+            $this->zip->close();
+            $this->open = false;
+        }
+    }
+
+    /**
+     * @throws ZipExportException
+     */
+    public function readData(): array
+    {
+        $this->open();
+
+        // Validate json data exists, including metadata
+        $jsonData = $this->zip->getFromName('data.json') ?: '';
+        $importData = json_decode($jsonData, true);
+        if (!$importData) {
+            throw new ZipExportException(trans('errors.import_zip_cant_decode_data'));
+        }
+
+        return $importData;
+    }
+
+    public function fileExists(string $fileName): bool
+    {
+        return $this->zip->statName("files/{$fileName}") !== false;
+    }
+
+    /**
+     * @throws ZipExportException
+     * @returns array{name: string, book_count: int, chapter_count: int, page_count: int}
+     */
+    public function getEntityInfo(): array
+    {
+        $data = $this->readData();
+        $info = ['name' => '', 'book_count' => 0, 'chapter_count' => 0, 'page_count' => 0];
+
+        if (isset($data['book'])) {
+            $info['name'] = $data['book']['name'] ?? '';
+            $info['book_count']++;
+            $chapters = $data['book']['chapters'] ?? [];
+            $pages = $data['book']['pages'] ?? [];
+            $info['chapter_count'] += count($chapters);
+            $info['page_count'] += count($pages);
+            foreach ($chapters as $chapter) {
+                $info['page_count'] += count($chapter['pages'] ?? []);
+            }
+        } elseif (isset($data['chapter'])) {
+            $info['name'] = $data['chapter']['name'] ?? '';
+            $info['chapter_count']++;
+            $info['page_count'] += count($data['chapter']['pages'] ?? []);
+        } elseif (isset($data['page'])) {
+            $info['name'] = $data['page']['name'] ?? '';
+            $info['page_count']++;
+        }
+
+        return $info;
+    }
+}
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
index dd56f3e70a8..e476998c216 100644
--- a/app/Exports/ZipExports/ZipExportValidator.php
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -2,10 +2,10 @@
 
 namespace BookStack\Exports\ZipExports;
 
+use BookStack\Exceptions\ZipExportException;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
-use ZipArchive;
 
 class ZipExportValidator
 {
@@ -16,26 +16,14 @@ public function __construct(
 
     public function validate(): array
     {
-        // Validate file exists
-        if (!file_exists($this->zipPath) || !is_readable($this->zipPath)) {
-            return ['format' => trans('errors.import_zip_cant_read')];
+        $reader = new ZipExportReader($this->zipPath);
+        try {
+            $importData = $reader->readData();
+        } catch (ZipExportException $exception) {
+            return ['format' => $exception->getMessage()];
         }
 
-        // Validate file is valid zip
-        $zip = new \ZipArchive();
-        $opened = $zip->open($this->zipPath, ZipArchive::RDONLY);
-        if ($opened !== true) {
-            return ['format' => trans('errors.import_zip_cant_read')];
-        }
-
-        // Validate json data exists, including metadata
-        $jsonData = $zip->getFromName('data.json') ?: '';
-        $importData = json_decode($jsonData, true);
-        if (!$importData) {
-            return ['format' => trans('errors.import_zip_cant_decode_data')];
-        }
-
-        $helper = new ZipValidationHelper($zip);
+        $helper = new ZipValidationHelper($reader);
 
         if (isset($importData['book'])) {
             $modelErrors = ZipExportBook::validate($helper, $importData['book']);
diff --git a/app/Exports/ZipExports/ZipFileReferenceRule.php b/app/Exports/ZipExports/ZipFileReferenceRule.php
index 4f942e0e789..bcd3c39acf0 100644
--- a/app/Exports/ZipExports/ZipFileReferenceRule.php
+++ b/app/Exports/ZipExports/ZipFileReferenceRule.php
@@ -19,7 +19,7 @@ public function __construct(
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (!$this->context->zipFileExists($value)) {
+        if (!$this->context->zipReader->fileExists($value)) {
             $fail('validation.zip_file')->translate();
         }
     }
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index 8c285deaf5d..55c86b03b5b 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -4,14 +4,13 @@
 
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use Illuminate\Validation\Factory;
-use ZipArchive;
 
 class ZipValidationHelper
 {
     protected Factory $validationFactory;
 
     public function __construct(
-        protected ZipArchive $zip,
+        public ZipExportReader $zipReader,
     ) {
         $this->validationFactory = app(Factory::class);
     }
@@ -27,11 +26,6 @@ public function validateData(array $data, array $rules): array
         return $messages;
     }
 
-    public function zipFileExists(string $name): bool
-    {
-        return $this->zip->statName("files/{$name}") !== false;
-    }
-
     public function fileReferenceRule(): ZipFileReferenceRule
     {
         return new ZipFileReferenceRule($this);
diff --git a/database/factories/Exports/ImportFactory.php b/database/factories/Exports/ImportFactory.php
new file mode 100644
index 00000000000..55378d5832e
--- /dev/null
+++ b/database/factories/Exports/ImportFactory.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Database\Factories\Exports;
+
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+
+class ImportFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = \BookStack\Exports\Import::class;
+
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        return [
+            'path' => 'uploads/imports/' . Str::random(10) . '.zip',
+            'name' => $this->faker->words(3, true),
+            'book_count' => 1,
+            'chapter_count' => 5,
+            'page_count' => 15,
+            'created_at' => User::factory(),
+        ];
+    }
+}
diff --git a/database/migrations/2024_11_02_160700_create_imports_table.php b/database/migrations/2024_11_02_160700_create_imports_table.php
new file mode 100644
index 00000000000..ed188226981
--- /dev/null
+++ b/database/migrations/2024_11_02_160700_create_imports_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('imports', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('path');
+            $table->integer('size');
+            $table->integer('book_count');
+            $table->integer('chapter_count');
+            $table->integer('page_count');
+            $table->integer('created_by');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('imports');
+    }
+};

From 8ea3855e02aa5ff7782dc65e1eee8b8b24f28ce6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 2 Nov 2024 20:48:21 +0000
Subject: [PATCH 348/666] ZIP Import: Added upload handling

Split attachment service storage work out so it can be shared.
---
 app/Exceptions/ZipValidationException.php    |  12 ++
 app/Exports/Controllers/ImportController.php |  41 ++-----
 app/Exports/ImportRepo.php                   |  48 ++++++++
 app/Uploads/AttachmentService.php            |  86 ++------------
 app/Uploads/FileStorage.php                  | 111 +++++++++++++++++++
 5 files changed, 195 insertions(+), 103 deletions(-)
 create mode 100644 app/Exceptions/ZipValidationException.php
 create mode 100644 app/Exports/ImportRepo.php
 create mode 100644 app/Uploads/FileStorage.php

diff --git a/app/Exceptions/ZipValidationException.php b/app/Exceptions/ZipValidationException.php
new file mode 100644
index 00000000000..aaaee792ef0
--- /dev/null
+++ b/app/Exceptions/ZipValidationException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class ZipValidationException extends \Exception
+{
+    public function __construct(
+        public array $errors
+    ) {
+        parent::__construct();
+    }
+}
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index bbf0ff57d8c..640b4c10891 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -2,16 +2,17 @@
 
 namespace BookStack\Exports\Controllers;
 
-use BookStack\Exports\Import;
-use BookStack\Exports\ZipExports\ZipExportReader;
-use BookStack\Exports\ZipExports\ZipExportValidator;
+use BookStack\Exceptions\ZipValidationException;
+use BookStack\Exports\ImportRepo;
 use BookStack\Http\Controller;
+use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\Request;
 
 class ImportController extends Controller
 {
-    public function __construct()
-    {
+    public function __construct(
+        protected ImportRepo $imports,
+    ) {
         $this->middleware('can:content-import');
     }
 
@@ -27,35 +28,17 @@ public function start(Request $request)
     public function upload(Request $request)
     {
         $this->validate($request, [
-            'file' => ['required', 'file']
+            'file' => ['required', ...AttachmentService::getFileValidationRules()]
         ]);
 
         $file = $request->file('file');
-        $zipPath = $file->getRealPath();
-
-        $errors = (new ZipExportValidator($zipPath))->validate();
-        if ($errors) {
-            session()->flash('validation_errors', $errors);
+        try {
+            $import = $this->imports->storeFromUpload($file);
+        } catch (ZipValidationException $exception) {
+            session()->flash('validation_errors', $exception->errors);
             return redirect('/import');
         }
 
-        $zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
-        $import = new Import();
-        $import->name = $zipEntityInfo['name'];
-        $import->book_count = $zipEntityInfo['book_count'];
-        $import->chapter_count = $zipEntityInfo['chapter_count'];
-        $import->page_count = $zipEntityInfo['page_count'];
-        $import->created_by = user()->id;
-        $import->size = filesize($zipPath);
-        // TODO - Set path
-        // TODO - Save
-
-        // TODO - Split out attachment service to separate out core filesystem/disk stuff
-        //        To reuse for import handling
-
-        dd('passed');
-        // TODO - Upload to storage
-        // TODO - Store info/results for display:
-        // TODO - Send user to next import stage
+        return redirect("imports/{$import->id}");
     }
 }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
new file mode 100644
index 00000000000..c8157967bc3
--- /dev/null
+++ b/app/Exports/ImportRepo.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace BookStack\Exports;
+
+use BookStack\Exceptions\ZipValidationException;
+use BookStack\Exports\ZipExports\ZipExportReader;
+use BookStack\Exports\ZipExports\ZipExportValidator;
+use BookStack\Uploads\FileStorage;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class ImportRepo
+{
+    public function __construct(
+        protected FileStorage $storage,
+    ) {
+    }
+
+    public function storeFromUpload(UploadedFile $file): Import
+    {
+        $zipPath = $file->getRealPath();
+
+        $errors = (new ZipExportValidator($zipPath))->validate();
+        if ($errors) {
+            throw new ZipValidationException($errors);
+        }
+
+        $zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
+        $import = new Import();
+        $import->name = $zipEntityInfo['name'];
+        $import->book_count = $zipEntityInfo['book_count'];
+        $import->chapter_count = $zipEntityInfo['chapter_count'];
+        $import->page_count = $zipEntityInfo['page_count'];
+        $import->created_by = user()->id;
+        $import->size = filesize($zipPath);
+
+        $path = $this->storage->uploadFile(
+            $file,
+            'uploads/files/imports/',
+            '',
+            'zip'
+        );
+
+        $import->path = $path;
+        $import->save();
+
+        return $import;
+    }
+}
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 227649d8f00..fa53c4ae499 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -4,59 +4,15 @@
 
 use BookStack\Exceptions\FileUploadException;
 use Exception;
-use Illuminate\Contracts\Filesystem\Filesystem as Storage;
-use Illuminate\Filesystem\FilesystemManager;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-use League\Flysystem\WhitespacePathNormalizer;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService
 {
     public function __construct(
-        protected FilesystemManager $fileSystem
+        protected FileStorage $storage,
     ) {
     }
 
-    /**
-     * Get the storage that will be used for storing files.
-     */
-    protected function getStorageDisk(): Storage
-    {
-        return $this->fileSystem->disk($this->getStorageDiskName());
-    }
-
-    /**
-     * Get the name of the storage disk to use.
-     */
-    protected function getStorageDiskName(): string
-    {
-        $storageType = config('filesystems.attachments');
-
-        // Change to our secure-attachment disk if any of the local options
-        // are used to prevent escaping that location.
-        if ($storageType === 'local' || $storageType === 'local_secure' || $storageType === 'local_secure_restricted') {
-            $storageType = 'local_secure_attachments';
-        }
-
-        return $storageType;
-    }
-
-    /**
-     * Change the originally provided path to fit any disk-specific requirements.
-     * This also ensures the path is kept to the expected root folders.
-     */
-    protected function adjustPathForStorageDisk(string $path): string
-    {
-        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/files/', '', $path));
-
-        if ($this->getStorageDiskName() === 'local_secure_attachments') {
-            return $path;
-        }
-
-        return 'uploads/files/' . $path;
-    }
-
     /**
      * Stream an attachment from storage.
      *
@@ -64,7 +20,7 @@ protected function adjustPathForStorageDisk(string $path): string
      */
     public function streamAttachmentFromStorage(Attachment $attachment)
     {
-        return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($attachment->path));
+        return $this->storage->getReadStream($attachment->path);
     }
 
     /**
@@ -72,7 +28,7 @@ public function streamAttachmentFromStorage(Attachment $attachment)
      */
     public function getAttachmentFileSize(Attachment $attachment): int
     {
-        return $this->getStorageDisk()->size($this->adjustPathForStorageDisk($attachment->path));
+        return $this->storage->getSize($attachment->path);
     }
 
     /**
@@ -195,15 +151,9 @@ public function deleteFile(Attachment $attachment)
      * Delete a file from the filesystem it sits on.
      * Cleans any empty leftover folders.
      */
-    protected function deleteFileInStorage(Attachment $attachment)
+    protected function deleteFileInStorage(Attachment $attachment): void
     {
-        $storage = $this->getStorageDisk();
-        $dirPath = $this->adjustPathForStorageDisk(dirname($attachment->path));
-
-        $storage->delete($this->adjustPathForStorageDisk($attachment->path));
-        if (count($storage->allFiles($dirPath)) === 0) {
-            $storage->deleteDirectory($dirPath);
-        }
+        $this->storage->delete($attachment->path);
     }
 
     /**
@@ -213,32 +163,20 @@ protected function deleteFileInStorage(Attachment $attachment)
      */
     protected function putFileInStorage(UploadedFile $uploadedFile): string
     {
-        $storage = $this->getStorageDisk();
         $basePath = 'uploads/files/' . date('Y-m-M') . '/';
 
-        $uploadFileName = Str::random(16) . '-' . $uploadedFile->getClientOriginalExtension();
-        while ($storage->exists($this->adjustPathForStorageDisk($basePath . $uploadFileName))) {
-            $uploadFileName = Str::random(3) . $uploadFileName;
-        }
-
-        $attachmentStream = fopen($uploadedFile->getRealPath(), 'r');
-        $attachmentPath = $basePath . $uploadFileName;
-
-        try {
-            $storage->writeStream($this->adjustPathForStorageDisk($attachmentPath), $attachmentStream);
-        } catch (Exception $e) {
-            Log::error('Error when attempting file upload:' . $e->getMessage());
-
-            throw new FileUploadException(trans('errors.path_not_writable', ['filePath' => $attachmentPath]));
-        }
-
-        return $attachmentPath;
+        return $this->storage->uploadFile(
+            $uploadedFile,
+            $basePath,
+            $uploadedFile->getClientOriginalExtension(),
+            ''
+        );
     }
 
     /**
      * Get the file validation rules for attachments.
      */
-    public function getFileValidationRules(): array
+    public static function getFileValidationRules(): array
     {
         return ['file', 'max:' . (config('app.upload_limit') * 1000)];
     }
diff --git a/app/Uploads/FileStorage.php b/app/Uploads/FileStorage.php
new file mode 100644
index 00000000000..278484e519d
--- /dev/null
+++ b/app/Uploads/FileStorage.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace BookStack\Uploads;
+
+use BookStack\Exceptions\FileUploadException;
+use Exception;
+use Illuminate\Contracts\Filesystem\Filesystem as Storage;
+use Illuminate\Filesystem\FilesystemManager;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use League\Flysystem\WhitespacePathNormalizer;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+class FileStorage
+{
+    public function __construct(
+        protected FilesystemManager $fileSystem,
+    ) {
+    }
+
+    /**
+     * @return resource|null
+     */
+    public function getReadStream(string $path)
+    {
+        return $this->getStorageDisk()->readStream($this->adjustPathForStorageDisk($path));
+    }
+
+    public function getSize(string $path): int
+    {
+        return $this->getStorageDisk()->size($this->adjustPathForStorageDisk($path));
+    }
+
+    public function delete(string $path, bool $removeEmptyDir = false): void
+    {
+        $storage = $this->getStorageDisk();
+        $adjustedPath = $this->adjustPathForStorageDisk($path);
+        $dir = dirname($adjustedPath);
+
+        $storage->delete($adjustedPath);
+        if ($removeEmptyDir && count($storage->allFiles($dir)) === 0) {
+            $storage->deleteDirectory($dir);
+        }
+    }
+
+    /**
+     * @throws FileUploadException
+     */
+    public function uploadFile(UploadedFile $file, string $subDirectory, string $suffix, string $extension): string
+    {
+        $storage = $this->getStorageDisk();
+        $basePath = trim($subDirectory, '/') . '/';
+
+        $uploadFileName = Str::random(16) . ($suffix ? "-{$suffix}" : '') . ($extension ? ".{$extension}" : '');
+        while ($storage->exists($this->adjustPathForStorageDisk($basePath . $uploadFileName))) {
+            $uploadFileName = Str::random(3) . $uploadFileName;
+        }
+
+        $fileStream = fopen($file->getRealPath(), 'r');
+        $filePath = $basePath . $uploadFileName;
+
+        try {
+            $storage->writeStream($this->adjustPathForStorageDisk($filePath), $fileStream);
+        } catch (Exception $e) {
+            Log::error('Error when attempting file upload:' . $e->getMessage());
+
+            throw new FileUploadException(trans('errors.path_not_writable', ['filePath' => $filePath]));
+        }
+
+        return $filePath;
+    }
+
+    /**
+     * Get the storage that will be used for storing files.
+     */
+    protected function getStorageDisk(): Storage
+    {
+        return $this->fileSystem->disk($this->getStorageDiskName());
+    }
+
+    /**
+     * Get the name of the storage disk to use.
+     */
+    protected function getStorageDiskName(): string
+    {
+        $storageType = config('filesystems.attachments');
+
+        // Change to our secure-attachment disk if any of the local options
+        // are used to prevent escaping that location.
+        if ($storageType === 'local' || $storageType === 'local_secure' || $storageType === 'local_secure_restricted') {
+            $storageType = 'local_secure_attachments';
+        }
+
+        return $storageType;
+    }
+
+    /**
+     * Change the originally provided path to fit any disk-specific requirements.
+     * This also ensures the path is kept to the expected root folders.
+     */
+    protected function adjustPathForStorageDisk(string $path): string
+    {
+        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/files/', '', $path));
+
+        if ($this->getStorageDiskName() === 'local_secure_attachments') {
+            return $path;
+        }
+
+        return 'uploads/files/' . $path;
+    }
+}

From c6109c708735434fdb30333ff4c24b4a80b0b749 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 3 Nov 2024 14:13:05 +0000
Subject: [PATCH 349/666] ZIP Imports: Added listing, show view, delete,
 activity

---
 app/Activity/ActivityType.php                 |  4 ++
 app/Exports/Controllers/ImportController.php  | 50 ++++++++++++++++++-
 app/Exports/Import.php                        | 23 ++++++++-
 app/Exports/ImportRepo.php                    | 32 ++++++++++++
 app/Http/Controller.php                       |  4 +-
 lang/en/activities.php                        |  8 +++
 lang/en/entities.php                          |  6 +++
 resources/views/exports/import-show.blade.php | 38 ++++++++++++++
 resources/views/exports/import.blade.php      | 13 +++++
 .../views/exports/parts/import.blade.php      | 19 +++++++
 routes/web.php                                |  2 +
 11 files changed, 193 insertions(+), 6 deletions(-)
 create mode 100644 resources/views/exports/import-show.blade.php
 create mode 100644 resources/views/exports/parts/import.blade.php

diff --git a/app/Activity/ActivityType.php b/app/Activity/ActivityType.php
index 09b2ae73c56..5ec9b9cf0dc 100644
--- a/app/Activity/ActivityType.php
+++ b/app/Activity/ActivityType.php
@@ -67,6 +67,10 @@ class ActivityType
     const WEBHOOK_UPDATE = 'webhook_update';
     const WEBHOOK_DELETE = 'webhook_delete';
 
+    const IMPORT_CREATE = 'import_create';
+    const IMPORT_RUN = 'import_run';
+    const IMPORT_DELETE = 'import_delete';
+
     /**
      * Get all the possible values.
      */
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 640b4c10891..582fff975d2 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BookStack\Exports\Controllers;
 
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ImportRepo;
 use BookStack\Http\Controller;
@@ -16,15 +19,26 @@ public function __construct(
         $this->middleware('can:content-import');
     }
 
+    /**
+     * Show the view to start a new import, and also list out the existing
+     * in progress imports that are visible to the user.
+     */
     public function start(Request $request)
     {
-        // TODO - Show existing imports for user (or for all users if admin-level user)
+        // TODO - Test visibility access for listed items
+        $imports = $this->imports->getVisibleImports();
+
+        $this->setPageTitle(trans('entities.import'));
 
         return view('exports.import', [
+            'imports' => $imports,
             'zipErrors' => session()->pull('validation_errors') ?? [],
         ]);
     }
 
+    /**
+     * Upload, validate and store an import file.
+     */
     public function upload(Request $request)
     {
         $this->validate($request, [
@@ -39,6 +53,38 @@ public function upload(Request $request)
             return redirect('/import');
         }
 
-        return redirect("imports/{$import->id}");
+        $this->logActivity(ActivityType::IMPORT_CREATE, $import);
+
+        return redirect($import->getUrl());
+    }
+
+    /**
+     * Show a pending import, with a form to allow progressing
+     * with the import process.
+     */
+    public function show(int $id)
+    {
+        // TODO - Test visibility access
+        $import = $this->imports->findVisible($id);
+
+        $this->setPageTitle(trans('entities.import_continue'));
+
+        return view('exports.import-show', [
+            'import' => $import,
+        ]);
+    }
+
+    /**
+     * Delete an active pending import from the filesystem and database.
+     */
+    public function delete(int $id)
+    {
+        // TODO - Test visibility access
+        $import = $this->imports->findVisible($id);
+        $this->imports->deleteImport($import);
+
+        $this->logActivity(ActivityType::IMPORT_DELETE, $import);
+
+        return redirect('/import');
     }
 }
diff --git a/app/Exports/Import.php b/app/Exports/Import.php
index c3ac3d52924..520d8ea6cc8 100644
--- a/app/Exports/Import.php
+++ b/app/Exports/Import.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Activity\Models\Loggable;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -17,7 +18,7 @@
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
-class Import extends Model
+class Import extends Model implements Loggable
 {
     use HasFactory;
 
@@ -38,4 +39,24 @@ public function getType(): string
 
         return self::TYPE_PAGE;
     }
+
+    public function getSizeString(): string
+    {
+        $mb = round($this->size / 1000000, 2);
+        return "{$mb} MB";
+    }
+
+    /**
+     * Get the URL to view/continue this import.
+     */
+    public function getUrl(string $path = ''): string
+    {
+        $path = ltrim($path, '/');
+        return url("/import/{$this->id}" . ($path ? '/' . $path : ''));
+    }
+
+    public function logDescriptor(): string
+    {
+        return "({$this->id}) {$this->name}";
+    }
 }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index c8157967bc3..d7e169ad166 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -6,6 +6,7 @@
 use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Uploads\FileStorage;
+use Illuminate\Database\Eloquent\Collection;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImportRepo
@@ -15,6 +16,31 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return Collection<Import>
+     */
+    public function getVisibleImports(): Collection
+    {
+        $query = Import::query();
+
+        if (!userCan('settings-manage')) {
+            $query->where('created_by', user()->id);
+        }
+
+        return $query->get();
+    }
+
+    public function findVisible(int $id): Import
+    {
+        $query = Import::query();
+
+        if (!userCan('settings-manage')) {
+            $query->where('created_by', user()->id);
+        }
+
+        return $query->findOrFail($id);
+    }
+
     public function storeFromUpload(UploadedFile $file): Import
     {
         $zipPath = $file->getRealPath();
@@ -45,4 +71,10 @@ public function storeFromUpload(UploadedFile $file): Import
 
         return $import;
     }
+
+    public function deleteImport(Import $import): void
+    {
+        $this->storage->delete($import->path);
+        $import->delete();
+    }
 }
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 8facf5dab3c..090cf523ad2 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -152,10 +152,8 @@ protected function showErrorNotification(string $message): void
 
     /**
      * Log an activity in the system.
-     *
-     * @param string|Loggable $detail
      */
-    protected function logActivity(string $type, $detail = ''): void
+    protected function logActivity(string $type, string|Loggable $detail = ''): void
     {
         Activity::add($type, $detail);
     }
diff --git a/lang/en/activities.php b/lang/en/activities.php
index 092398ef0e1..7c3454d41ca 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'deleted webhook',
     'webhook_delete_notification' => 'Webhook successfully deleted',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 10614733533..e2d8e47c592 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -48,6 +48,12 @@
     'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to import then press "Validate Import" to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
     'import_zip_select' => 'Select ZIP file to upload',
     'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_run' => 'Run Import',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
new file mode 100644
index 00000000000..843a052468c
--- /dev/null
+++ b/resources/views/exports/import-show.blade.php
@@ -0,0 +1,38 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container small">
+
+        <main class="card content-wrap auto-height mt-xxl">
+            <h1 class="list-heading">{{ trans('entities.import_continue') }}</h1>
+            <form action="{{ url('/import') }}" enctype="multipart/form-data" method="POST">
+                {{ csrf_field() }}
+            </form>
+
+            <div class="text-right">
+                <a href="{{ url('/import') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                <div component="dropdown" class="inline block mx-s">
+                    <button refs="dropdown@toggle"
+                            type="button"
+                            title="{{ trans('common.delete') }}"
+                            class="button outline">{{ trans('common.delete') }}</button>
+                    <div refs="dropdown@menu" class="dropdown-menu">
+                        <p class="text-neg bold small px-m mb-xs">{{ trans('entities.import_delete_confirm') }}</p>
+                        <p class="small px-m mb-xs">{{ trans('entities.import_delete_desc') }}</p>
+                        <button type="submit" form="import-delete-form" class="text-link small text-item">{{ trans('common.confirm') }}</button>
+                    </div>
+                </div>
+                <button type="submit" class="button">{{ trans('entities.import_run') }}</button>
+            </div>
+        </main>
+    </div>
+
+    <form id="import-delete-form"
+          action="{{ $import->getUrl() }}"
+          method="post">
+        {{ method_field('DELETE') }}
+        {{ csrf_field() }}
+    </form>
+
+@stop
diff --git a/resources/views/exports/import.blade.php b/resources/views/exports/import.blade.php
index c4d7c881845..be9de4c0e91 100644
--- a/resources/views/exports/import.blade.php
+++ b/resources/views/exports/import.blade.php
@@ -38,6 +38,19 @@ class="custom-simple-file-input">
                 </div>
             </form>
         </main>
+
+        <main class="card content-wrap auto-height mt-xxl">
+            <h2 class="list-heading">{{ trans('entities.import_pending') }}</h2>
+            @if(count($imports) === 0)
+                <p>{{ trans('entities.import_pending_none') }}</p>
+            @else
+                <div class="item-list my-m">
+                    @foreach($imports as $import)
+                        @include('exports.parts.import', ['import' => $import])
+                    @endforeach
+                </div>
+            @endif
+        </main>
     </div>
 
 @stop
diff --git a/resources/views/exports/parts/import.blade.php b/resources/views/exports/parts/import.blade.php
new file mode 100644
index 00000000000..5ff6600f24b
--- /dev/null
+++ b/resources/views/exports/parts/import.blade.php
@@ -0,0 +1,19 @@
+@php
+    $type = $import->getType();
+@endphp
+<div class="item-list-row flex-container-row items-center justify-space-between wrap">
+    <div class="px-m py-s">
+        <a href="{{ $import->getUrl() }}"
+           class="text-{{ $type }}">@icon($type) {{ $import->name }}</a>
+    </div>
+    <div class="px-m py-s flex-container-row gap-m items-center">
+        @if($type === 'book')
+            <div class="text-chapter opacity-80 bold">@icon('chapter') {{ $import->chapter_count }}</div>
+        @endif
+        @if($type === 'book' || $type === 'chapter')
+            <div class="text-page opacity-80 bold">@icon('page') {{ $import->page_count }}</div>
+        @endif
+        <div class="bold opacity-80">{{ $import->getSizeString() }}</div>
+        <div class="bold opacity-80 text-muted" title="{{ $import->created_at->toISOString() }}">@icon('time'){{ $import->created_at->diffForHumans() }}</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 91aab13fecf..c490bb3b34e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -209,6 +209,8 @@
     // Importing
     Route::get('/import', [ExportControllers\ImportController::class, 'start']);
     Route::post('/import', [ExportControllers\ImportController::class, 'upload']);
+    Route::get('/import/{id}', [ExportControllers\ImportController::class, 'show']);
+    Route::delete('/import/{id}', [ExportControllers\ImportController::class, 'delete']);
 
     // Other Pages
     Route::get('/', [HomeController::class, 'index']);

From 8f6f81948e81b4d63251bee57da57aa5809eaad2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 3 Nov 2024 17:28:18 +0000
Subject: [PATCH 350/666] ZIP Imports: Fleshed out continue page, Added testing

---
 app/Exports/Controllers/ImportController.php  |  17 ++-
 app/Exports/Import.php                        |   9 ++
 lang/en/entities.php                          |   4 +
 resources/views/exports/import-show.blade.php |  41 ++++-
 routes/web.php                                |   1 +
 tests/Exports/ZipImportTest.php               | 140 ++++++++++++++++++
 6 files changed, 206 insertions(+), 6 deletions(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 582fff975d2..787fd1b27e0 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -23,9 +23,8 @@ public function __construct(
      * Show the view to start a new import, and also list out the existing
      * in progress imports that are visible to the user.
      */
-    public function start(Request $request)
+    public function start()
     {
-        // TODO - Test visibility access for listed items
         $imports = $this->imports->getVisibleImports();
 
         $this->setPageTitle(trans('entities.import'));
@@ -64,7 +63,6 @@ public function upload(Request $request)
      */
     public function show(int $id)
     {
-        // TODO - Test visibility access
         $import = $this->imports->findVisible($id);
 
         $this->setPageTitle(trans('entities.import_continue'));
@@ -74,12 +72,23 @@ public function show(int $id)
         ]);
     }
 
+    public function run(int $id)
+    {
+        // TODO - Test access/visibility
+
+        $import = $this->imports->findVisible($id);
+
+        // TODO  - Run import
+           // Validate again before
+        // TODO - Redirect to result
+        // TOOD - Or redirect back with errors
+    }
+
     /**
      * Delete an active pending import from the filesystem and database.
      */
     public function delete(int $id)
     {
-        // TODO - Test visibility access
         $import = $this->imports->findVisible($id);
         $this->imports->deleteImport($import);
 
diff --git a/app/Exports/Import.php b/app/Exports/Import.php
index 520d8ea6cc8..8400382fd0d 100644
--- a/app/Exports/Import.php
+++ b/app/Exports/Import.php
@@ -3,11 +3,14 @@
 namespace BookStack\Exports;
 
 use BookStack\Activity\Models\Loggable;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
+ * @property int $id
  * @property string $path
  * @property string $name
  * @property int $size - ZIP size in bytes
@@ -17,6 +20,7 @@
  * @property int $created_by
  * @property Carbon $created_at
  * @property Carbon $updated_at
+ * @property User $createdBy
  */
 class Import extends Model implements Loggable
 {
@@ -59,4 +63,9 @@ public function logDescriptor(): string
     {
         return "({$this->id}) {$this->name}";
     }
+
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
 }
diff --git a/lang/en/entities.php b/lang/en/entities.php
index e2d8e47c592..4f5a530049b 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -51,7 +51,11 @@
     'import_pending' => 'Pending Imports',
     'import_pending_none' => 'No imports have been started.',
     'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
     'import_run' => 'Run Import',
+    'import_size' => 'Import ZIP Size:',
+    'import_uploaded_at' => 'Uploaded:',
+    'import_uploaded_by' => 'Uploaded by:',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
 
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index 843a052468c..ac1b8a45d06 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -6,7 +6,44 @@
 
         <main class="card content-wrap auto-height mt-xxl">
             <h1 class="list-heading">{{ trans('entities.import_continue') }}</h1>
-            <form action="{{ url('/import') }}" enctype="multipart/form-data" method="POST">
+            <p class="text-muted">{{ trans('entities.import_continue_desc') }}</p>
+
+            <div class="mb-m">
+                @php
+                    $type = $import->getType();
+                @endphp
+                <div class="flex-container-row items-center justify-space-between wrap">
+                    <div class="py-s">
+                        <p class="text-{{ $type }} mb-xs bold">@icon($type) {{ $import->name }}</p>
+                        @if($type === 'book')
+                            <p class="text-chapter mb-xs ml-l">@icon('chapter') {{ trans_choice('entities.x_chapters', $import->chapter_count) }}</p>
+                        @endif
+                        @if($type === 'book' || $type === 'chapter')
+                            <p class="text-page mb-xs ml-l">@icon('page') {{ trans_choice('entities.x_pages', $import->page_count) }}</p>
+                        @endif
+                    </div>
+                    <div class="py-s">
+                        <div class="opacity-80">
+                            <strong>{{ trans('entities.import_size') }}</strong>
+                            <span>{{ $import->getSizeString() }}</span>
+                        </div>
+                        <div class="opacity-80">
+                            <strong>{{ trans('entities.import_uploaded_at') }}</strong>
+                            <span title="{{ $import->created_at->toISOString() }}">{{ $import->created_at->diffForHumans() }}</span>
+                        </div>
+                        @if($import->createdBy)
+                            <div class="opacity-80">
+                                <strong>{{ trans('entities.import_uploaded_by') }}</strong>
+                                <a href="{{ $import->createdBy->getProfileUrl() }}">{{ $import->createdBy->name }}</a>
+                            </div>
+                        @endif
+                    </div>
+                </div>
+            </div>
+
+            <form id="import-run-form"
+                  action="{{ $import->getUrl() }}"
+                  method="POST">
                 {{ csrf_field() }}
             </form>
 
@@ -23,7 +60,7 @@ class="button outline">{{ trans('common.delete') }}</button>
                         <button type="submit" form="import-delete-form" class="text-link small text-item">{{ trans('common.confirm') }}</button>
                     </div>
                 </div>
-                <button type="submit" class="button">{{ trans('entities.import_run') }}</button>
+                <button type="submit" form="import-run-form" class="button">{{ trans('entities.import_run') }}</button>
             </div>
         </main>
     </div>
diff --git a/routes/web.php b/routes/web.php
index c490bb3b34e..85f83352859 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -210,6 +210,7 @@
     Route::get('/import', [ExportControllers\ImportController::class, 'start']);
     Route::post('/import', [ExportControllers\ImportController::class, 'upload']);
     Route::get('/import/{id}', [ExportControllers\ImportController::class, 'show']);
+    Route::post('/import/{id}', [ExportControllers\ImportController::class, 'run']);
     Route::delete('/import/{id}', [ExportControllers\ImportController::class, 'delete']);
 
     // Other Pages
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
index c9d255b1e97..b9a8598fabe 100644
--- a/tests/Exports/ZipImportTest.php
+++ b/tests/Exports/ZipImportTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Exports;
 
+use BookStack\Activity\ActivityType;
+use BookStack\Exports\Import;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
@@ -35,6 +37,25 @@ public function test_permissions_needed_for_import_page()
         $resp->assertSeeText('Select ZIP file to upload');
     }
 
+    public function test_import_page_pending_import_visibility_limited()
+    {
+        $user = $this->users->viewer();
+        $admin = $this->users->admin();
+        $userImport = Import::factory()->create(['name' => 'MySuperUserImport', 'created_by' => $user->id]);
+        $adminImport = Import::factory()->create(['name' => 'MySuperAdminImport', 'created_by' => $admin->id]);
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $resp = $this->actingAs($user)->get('/import');
+        $resp->assertSeeText('MySuperUserImport');
+        $resp->assertDontSeeText('MySuperAdminImport');
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        $resp = $this->actingAs($user)->get('/import');
+        $resp->assertSeeText('MySuperUserImport');
+        $resp->assertSeeText('MySuperAdminImport');
+    }
+
     public function test_zip_read_errors_are_shown_on_validation()
     {
         $invalidUpload = $this->files->uploadedImage('image.zip');
@@ -105,6 +126,125 @@ public function test_zip_data_validation_messages_shown()
         $resp->assertSeeText('[book.pages.1.tags.0.value]: The value must be a string.');
     }
 
+    public function test_import_upload_success()
+    {
+        $admin = $this->users->admin();
+        $this->actingAs($admin);
+        $resp = $this->runImportFromFile($this->zipUploadFromData([
+            'book' => [
+                'name' => 'My great book name',
+                'chapters' => [
+                    [
+                        'name' => 'my chapter',
+                        'pages' => [
+                            [
+                                'name' => 'my chapter page',
+                            ]
+                        ]
+                    ]
+                ],
+                'pages' => [
+                    [
+                        'name' => 'My page',
+                    ]
+                ],
+            ],
+        ]));
+
+        $this->assertDatabaseHas('imports', [
+            'name' => 'My great book name',
+            'book_count' => 1,
+            'chapter_count' => 1,
+            'page_count' => 2,
+            'created_by' => $admin->id,
+        ]);
+
+        /** @var Import $import */
+        $import = Import::query()->latest()->first();
+        $resp->assertRedirect("/import/{$import->id}");
+        $this->assertFileExists(storage_path($import->path));
+        $this->assertActivityExists(ActivityType::IMPORT_CREATE);
+    }
+
+    public function test_import_show_page()
+    {
+        $import = Import::factory()->create(['name' => 'MySuperAdminImport']);
+
+        $resp = $this->asAdmin()->get("/import/{$import->id}");
+        $resp->assertOk();
+        $resp->assertSee('MySuperAdminImport');
+    }
+
+    public function test_import_show_page_access_limited()
+    {
+        $user = $this->users->viewer();
+        $admin = $this->users->admin();
+        $userImport = Import::factory()->create(['name' => 'MySuperUserImport', 'created_by' => $user->id]);
+        $adminImport = Import::factory()->create(['name' => 'MySuperAdminImport', 'created_by' => $admin->id]);
+        $this->actingAs($user);
+
+        $this->get("/import/{$userImport->id}")->assertRedirect('/');
+        $this->get("/import/{$adminImport->id}")->assertRedirect('/');
+
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $this->get("/import/{$userImport->id}")->assertOk();
+        $this->get("/import/{$adminImport->id}")->assertStatus(404);
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        $this->get("/import/{$userImport->id}")->assertOk();
+        $this->get("/import/{$adminImport->id}")->assertOk();
+    }
+
+    public function test_import_delete()
+    {
+        $this->asAdmin();
+        $this->runImportFromFile($this->zipUploadFromData([
+            'book' => [
+                'name' => 'My great book name'
+            ],
+        ]));
+
+        /** @var Import $import */
+        $import = Import::query()->latest()->first();
+        $this->assertDatabaseHas('imports', [
+            'id' => $import->id,
+            'name' => 'My great book name'
+        ]);
+        $this->assertFileExists(storage_path($import->path));
+
+        $resp = $this->delete("/import/{$import->id}");
+
+        $resp->assertRedirect('/import');
+        $this->assertActivityExists(ActivityType::IMPORT_DELETE);
+        $this->assertDatabaseMissing('imports', [
+            'id' => $import->id,
+        ]);
+        $this->assertFileDoesNotExist(storage_path($import->path));
+    }
+
+    public function test_import_delete_access_limited()
+    {
+        $user = $this->users->viewer();
+        $admin = $this->users->admin();
+        $userImport = Import::factory()->create(['name' => 'MySuperUserImport', 'created_by' => $user->id]);
+        $adminImport = Import::factory()->create(['name' => 'MySuperAdminImport', 'created_by' => $admin->id]);
+        $this->actingAs($user);
+
+        $this->delete("/import/{$userImport->id}")->assertRedirect('/');
+        $this->delete("/import/{$adminImport->id}")->assertRedirect('/');
+
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $this->delete("/import/{$userImport->id}")->assertRedirect('/import');
+        $this->delete("/import/{$adminImport->id}")->assertStatus(404);
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        $this->delete("/import/{$adminImport->id}")->assertRedirect('/import');
+    }
+
     protected function runImportFromFile(UploadedFile $file): TestResponse
     {
         return $this->call('POST', '/import', [], [], ['file' => $file]);

From 14578c22570d7f9ac197125ece1cf86d9d07be9b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 4 Nov 2024 16:21:22 +0000
Subject: [PATCH 351/666] ZIP Imports: Added parent selector for page/chapter
 imports

---
 app/Exports/Controllers/ImportController.php  | 14 ++++++++---
 lang/en/entities.php                          |  2 ++
 resources/sass/styles.scss                    | 18 +++++++++++++
 resources/views/entities/selector.blade.php   |  8 ++++++
 resources/views/exports/import-show.blade.php | 25 +++++++++++++++----
 resources/views/form/errors.blade.php         |  3 +++
 6 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 787fd1b27e0..a2389c725f3 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -72,14 +72,22 @@ public function show(int $id)
         ]);
     }
 
-    public function run(int $id)
+    public function run(int $id, Request $request)
     {
         // TODO - Test access/visibility
-
         $import = $this->imports->findVisible($id);
+        $parent = null;
+
+        if ($import->getType() === 'page' || $import->getType() === 'chapter') {
+            $data = $this->validate($request, [
+                'parent' => ['required', 'string']
+            ]);
+            $parent = $data['parent'];
+        }
 
         // TODO  - Run import
-           // Validate again before
+           // TODO - Validate again before
+           // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
         // TODO - Redirect to result
         // TOOD - Or redirect back with errors
     }
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 4f5a530049b..065eb043a11 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -56,6 +56,8 @@
     'import_size' => 'Import ZIP Size:',
     'import_uploaded_at' => 'Uploaded:',
     'import_uploaded_by' => 'Uploaded by:',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
 
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 636367e3aeb..942265d04d8 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -138,6 +138,11 @@ $loadingSize: 10px;
     font-size: 16px;
     padding: $-s $-m;
   }
+  input[type="text"]:focus {
+    outline: 1px solid var(--color-primary);
+    border-radius: 3px 3px 0 0;
+    outline-offset: -1px;
+  }
   .entity-list {
     overflow-y: scroll;
     height: 400px;
@@ -171,6 +176,19 @@ $loadingSize: 10px;
       font-size: 14px;
     }
   }
+  &.small {
+    .entity-list-item {
+      padding: $-xs $-m;
+    }
+    .entity-list, .loading {
+      height: 300px;
+    }
+    input[type="text"] {
+      font-size: 13px;
+      padding: $-xs $-m;
+      height: auto;
+    }
+  }
 }
 
 .fullscreen {
diff --git a/resources/views/entities/selector.blade.php b/resources/views/entities/selector.blade.php
index c1280cfb2f7..0cdf4376cc7 100644
--- a/resources/views/entities/selector.blade.php
+++ b/resources/views/entities/selector.blade.php
@@ -1,3 +1,11 @@
+{{--
+$name - string
+$autofocus - boolean, optional
+$entityTypes - string, optional
+$entityPermission - string, optional
+$selectorEndpoint - string, optional
+$selectorSize - string, optional (compact)
+--}}
 <div class="form-group entity-selector-container">
     <div component="entity-selector"
          refs="entity-selector-popup@selector"
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index ac1b8a45d06..63977947dba 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -2,6 +2,10 @@
 
 @section('body')
 
+    @php
+        $type = $import->getType();
+    @endphp
+
     <div class="container small">
 
         <main class="card content-wrap auto-height mt-xxl">
@@ -9,11 +13,9 @@
             <p class="text-muted">{{ trans('entities.import_continue_desc') }}</p>
 
             <div class="mb-m">
-                @php
-                    $type = $import->getType();
-                @endphp
+                <label class="setting-list-label">Import Details</label>
                 <div class="flex-container-row items-center justify-space-between wrap">
-                    <div class="py-s">
+                    <div>
                         <p class="text-{{ $type }} mb-xs bold">@icon($type) {{ $import->name }}</p>
                         @if($type === 'book')
                             <p class="text-chapter mb-xs ml-l">@icon('chapter') {{ trans_choice('entities.x_chapters', $import->chapter_count) }}</p>
@@ -22,7 +24,7 @@
                             <p class="text-page mb-xs ml-l">@icon('page') {{ trans_choice('entities.x_pages', $import->page_count) }}</p>
                         @endif
                     </div>
-                    <div class="py-s">
+                    <div>
                         <div class="opacity-80">
                             <strong>{{ trans('entities.import_size') }}</strong>
                             <span>{{ $import->getSizeString() }}</span>
@@ -45,6 +47,19 @@
                   action="{{ $import->getUrl() }}"
                   method="POST">
                 {{ csrf_field() }}
+
+                @if($type === 'page' || $type === 'chapter')
+                    <hr>
+                    <label class="setting-list-label">{{ trans('entities.import_location') }}</label>
+                    <p class="small mb-m">{{ trans('entities.import_location_desc') }}</p>
+                    @include('entities.selector', [
+                        'name' => 'parent',
+                        'entityTypes' => $type === 'page' ? 'chapter,book' : 'book',
+                        'entityPermission' => "{$type}-create",
+                        'selectorSize' => 'compact small',
+                    ])
+                    @include('form.errors', ['name' => 'parent'])
+                @endif
             </form>
 
             <div class="text-right">
diff --git a/resources/views/form/errors.blade.php b/resources/views/form/errors.blade.php
index 03cd4be88f0..72d41ee56c7 100644
--- a/resources/views/form/errors.blade.php
+++ b/resources/views/form/errors.blade.php
@@ -1,3 +1,6 @@
+{{--
+$name - string
+--}}
 @if($errors->has($name))
     <div class="text-neg text-small">{{ $errors->first($name) }}</div>
 @endif
\ No newline at end of file

From 92cfde495e0d3141af608ea3734b612402f257dd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 5 Nov 2024 13:17:31 +0000
Subject: [PATCH 352/666] ZIP Imports: Added full contents view to import
 display

Reduced import data will now be stored on the import itself, instead of
storing a set of totals.
---
 app/Exports/Controllers/ImportController.php  |  5 ++-
 app/Exports/Import.php                        | 37 ++++++++----------
 app/Exports/ImportRepo.php                    | 35 ++++++++++++++---
 .../ZipExports/Models/ZipExportAttachment.php | 18 +++++++++
 .../ZipExports/Models/ZipExportBook.php       | 30 ++++++++++++++
 .../ZipExports/Models/ZipExportChapter.php    | 26 +++++++++++++
 .../ZipExports/Models/ZipExportImage.php      | 17 ++++++++
 .../ZipExports/Models/ZipExportModel.php      | 28 +++++++++++++
 .../ZipExports/Models/ZipExportPage.php       | 31 +++++++++++++++
 .../ZipExports/Models/ZipExportTag.php        | 16 ++++++++
 app/Exports/ZipExports/ZipExportReader.php    | 32 ++++++---------
 app/Exports/ZipExports/ZipExportValidator.php |  1 -
 database/factories/Exports/ImportFactory.php  |  5 +--
 ...2024_11_02_160700_create_imports_table.php |  7 ++--
 lang/en/entities.php                          |  8 ++--
 resources/sass/styles.scss                    |  5 +++
 resources/views/exports/import-show.blade.php | 39 ++++++-------------
 .../views/exports/parts/import-item.blade.php | 26 +++++++++++++
 .../views/exports/parts/import.blade.php      | 11 +-----
 tests/Exports/ZipImportTest.php               | 31 +++++++++++----
 20 files changed, 303 insertions(+), 105 deletions(-)
 create mode 100644 resources/views/exports/parts/import-item.blade.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index a2389c725f3..3a56ed03456 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -65,10 +65,13 @@ public function show(int $id)
     {
         $import = $this->imports->findVisible($id);
 
+//        dd($import->decodeMetadata());
+
         $this->setPageTitle(trans('entities.import_continue'));
 
         return view('exports.import-show', [
             'import' => $import,
+            'data' => $import->decodeMetadata(),
         ]);
     }
 
@@ -89,7 +92,7 @@ public function run(int $id, Request $request)
            // TODO - Validate again before
            // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
         // TODO - Redirect to result
-        // TOOD - Or redirect back with errors
+        // TODO - Or redirect back with errors
     }
 
     /**
diff --git a/app/Exports/Import.php b/app/Exports/Import.php
index 8400382fd0d..9c1771c468f 100644
--- a/app/Exports/Import.php
+++ b/app/Exports/Import.php
@@ -3,6 +3,9 @@
 namespace BookStack\Exports;
 
 use BookStack\Activity\Models\Loggable;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -14,9 +17,8 @@
  * @property string $path
  * @property string $name
  * @property int $size - ZIP size in bytes
- * @property int $book_count
- * @property int $chapter_count
- * @property int $page_count
+ * @property string $type
+ * @property string $metadata
  * @property int $created_by
  * @property Carbon $created_at
  * @property Carbon $updated_at
@@ -26,24 +28,6 @@ class Import extends Model implements Loggable
 {
     use HasFactory;
 
-    public const TYPE_BOOK = 'book';
-    public const TYPE_CHAPTER = 'chapter';
-    public const TYPE_PAGE = 'page';
-
-    /**
-     * Get the type (model) that this import is intended to be.
-     */
-    public function getType(): string
-    {
-        if ($this->book_count === 1) {
-            return self::TYPE_BOOK;
-        } elseif ($this->chapter_count === 1) {
-            return self::TYPE_CHAPTER;
-        }
-
-        return self::TYPE_PAGE;
-    }
-
     public function getSizeString(): string
     {
         $mb = round($this->size / 1000000, 2);
@@ -68,4 +52,15 @@ public function createdBy(): BelongsTo
     {
         return $this->belongsTo(User::class, 'created_by');
     }
+
+    public function decodeMetadata(): ZipExportBook|ZipExportChapter|ZipExportPage|null
+    {
+        $metadataArray = json_decode($this->metadata, true);
+        return match ($this->type) {
+            'book' => ZipExportBook::fromArray($metadataArray),
+            'chapter' => ZipExportChapter::fromArray($metadataArray),
+            'page' => ZipExportPage::fromArray($metadataArray),
+            default => null,
+        };
+    }
 }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index d7e169ad166..3265e1c80dc 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -2,7 +2,12 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Exceptions\FileUploadException;
+use BookStack\Exceptions\ZipExportException;
 use BookStack\Exceptions\ZipValidationException;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Uploads\FileStorage;
@@ -41,6 +46,11 @@ public function findVisible(int $id): Import
         return $query->findOrFail($id);
     }
 
+    /**
+     * @throws FileUploadException
+     * @throws ZipValidationException
+     * @throws ZipExportException
+     */
     public function storeFromUpload(UploadedFile $file): Import
     {
         $zipPath = $file->getRealPath();
@@ -50,15 +60,23 @@ public function storeFromUpload(UploadedFile $file): Import
             throw new ZipValidationException($errors);
         }
 
-        $zipEntityInfo = (new ZipExportReader($zipPath))->getEntityInfo();
+        $reader = new ZipExportReader($zipPath);
+        $exportModel = $reader->decodeDataToExportModel();
+
         $import = new Import();
-        $import->name = $zipEntityInfo['name'];
-        $import->book_count = $zipEntityInfo['book_count'];
-        $import->chapter_count = $zipEntityInfo['chapter_count'];
-        $import->page_count = $zipEntityInfo['page_count'];
+        $import->type = match (get_class($exportModel)) {
+            ZipExportPage::class => 'page',
+            ZipExportChapter::class => 'chapter',
+            ZipExportBook::class => 'book',
+        };
+
+        $import->name = $exportModel->name;
         $import->created_by = user()->id;
         $import->size = filesize($zipPath);
 
+        $exportModel->metadataOnly();
+        $import->metadata = json_encode($exportModel);
+
         $path = $this->storage->uploadFile(
             $file,
             'uploads/files/imports/',
@@ -72,6 +90,13 @@ public function storeFromUpload(UploadedFile $file): Import
         return $import;
     }
 
+    public function runImport(Import $import, ?string $parent = null)
+    {
+        // TODO - Download import zip (if needed)
+        // TODO - Validate zip file again
+        // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
+    }
+
     public function deleteImport(Import $import): void
     {
         $this->storage->delete($import->path);
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index e586b91b0ee..1dbdc7333e8 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -14,6 +14,11 @@ class ZipExportAttachment extends ZipExportModel
     public ?string $link = null;
     public ?string $file = null;
 
+    public function metadataOnly(): void
+    {
+        $this->order = $this->link = $this->file = null;
+    }
+
     public static function fromModel(Attachment $model, ZipExportFiles $files): self
     {
         $instance = new self();
@@ -49,4 +54,17 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $context->validateData($data, $rules);
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->id = $data['id'] ?? null;
+        $model->name = $data['name'];
+        $model->order = isset($data['order']) ? intval($data['order']) : null;
+        $model->link = $data['link'] ?? null;
+        $model->file = $data['file'] ?? null;
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 7e1f2d8106e..0dc4e93d43c 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -21,6 +21,21 @@ class ZipExportBook extends ZipExportModel
     /** @var ZipExportTag[] */
     public array $tags = [];
 
+    public function metadataOnly(): void
+    {
+        $this->description_html = $this->cover = null;
+
+        foreach ($this->chapters as $chapter) {
+            $chapter->metadataOnly();
+        }
+        foreach ($this->pages as $page) {
+            $page->metadataOnly();
+        }
+        foreach ($this->tags as $tag) {
+            $tag->metadataOnly();
+        }
+    }
+
     public static function fromModel(Book $model, ZipExportFiles $files): self
     {
         $instance = new self();
@@ -71,4 +86,19 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $errors;
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->id = $data['id'] ?? null;
+        $model->name = $data['name'];
+        $model->description_html = $data['description_html'] ?? null;
+        $model->cover = $data['cover'] ?? null;
+        $model->tags = ZipExportTag::fromManyArray($data['tags'] ?? []);
+        $model->pages = ZipExportPage::fromManyArray($data['pages'] ?? []);
+        $model->chapters = ZipExportChapter::fromManyArray($data['chapters'] ?? []);
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index 03df31b7078..50440d61a5a 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -18,6 +18,18 @@ class ZipExportChapter extends ZipExportModel
     /** @var ZipExportTag[] */
     public array $tags = [];
 
+    public function metadataOnly(): void
+    {
+        $this->description_html = $this->priority = null;
+
+        foreach ($this->pages as $page) {
+            $page->metadataOnly();
+        }
+        foreach ($this->tags as $tag) {
+            $tag->metadataOnly();
+        }
+    }
+
     public static function fromModel(Chapter $model, ZipExportFiles $files): self
     {
         $instance = new self();
@@ -61,4 +73,18 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $errors;
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->id = $data['id'] ?? null;
+        $model->name = $data['name'];
+        $model->description_html = $data['description_html'] ?? null;
+        $model->priority = isset($data['priority']) ? intval($data['priority']) : null;
+        $model->tags = ZipExportTag::fromManyArray($data['tags'] ?? []);
+        $model->pages = ZipExportPage::fromManyArray($data['pages'] ?? []);
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 3388c66df36..691eb918fc6 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -25,6 +25,11 @@ public static function fromModel(Image $model, ZipExportFiles $files): self
         return $instance;
     }
 
+    public function metadataOnly(): void
+    {
+        //
+    }
+
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
@@ -36,4 +41,16 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $context->validateData($data, $rules);
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->id = $data['id'] ?? null;
+        $model->name = $data['name'];
+        $model->file = $data['file'];
+        $model->type = $data['type'];
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.php
index 4d66f010f86..d3a8c35674b 100644
--- a/app/Exports/ZipExports/Models/ZipExportModel.php
+++ b/app/Exports/ZipExports/Models/ZipExportModel.php
@@ -26,4 +26,32 @@ public function jsonSerialize(): array
      * item in the array for its own validation messages.
      */
     abstract public static function validate(ZipValidationHelper $context, array $data): array;
+
+    /**
+     * Decode the array of data into this export model.
+     */
+    abstract public static function fromArray(array $data): self;
+
+    /**
+     * Decode an array of array data into an array of export models.
+     * @param array[] $data
+     * @return self[]
+     */
+    public static function fromManyArray(array $data): array
+    {
+        $results = [];
+        foreach ($data as $item) {
+            $results[] = static::fromArray($item);
+        }
+        return $results;
+    }
+
+    /**
+     * Remove additional content in this model to reduce it down
+     * to just essential id/name values for identification.
+     *
+     * The result of this may be something that does not pass validation, but is
+     * simple for the purpose of creating a contents.
+     */
+    abstract public function metadataOnly(): void;
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 2c8b9a88abd..3a876e7aaff 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -21,6 +21,21 @@ class ZipExportPage extends ZipExportModel
     /** @var ZipExportTag[] */
     public array $tags = [];
 
+    public function metadataOnly(): void
+    {
+        $this->html = $this->markdown = $this->priority = null;
+
+        foreach ($this->attachments as $attachment) {
+            $attachment->metadataOnly();
+        }
+        foreach ($this->images as $image) {
+            $image->metadataOnly();
+        }
+        foreach ($this->tags as $tag) {
+            $tag->metadataOnly();
+        }
+    }
+
     public static function fromModel(Page $model, ZipExportFiles $files): self
     {
         $instance = new self();
@@ -70,4 +85,20 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $errors;
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->id = $data['id'] ?? null;
+        $model->name = $data['name'];
+        $model->html = $data['html'] ?? null;
+        $model->markdown = $data['markdown'] ?? null;
+        $model->priority = isset($data['priority']) ? intval($data['priority']) : null;
+        $model->attachments = ZipExportAttachment::fromManyArray($data['attachments'] ?? []);
+        $model->images = ZipExportImage::fromManyArray($data['images'] ?? []);
+        $model->tags = ZipExportTag::fromManyArray($data['tags'] ?? []);
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/Models/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
index 99abb811c06..b6c9e338aef 100644
--- a/app/Exports/ZipExports/Models/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -11,6 +11,11 @@ class ZipExportTag extends ZipExportModel
     public ?string $value = null;
     public ?int $order = null;
 
+    public function metadataOnly(): void
+    {
+        $this->value = $this->order = null;
+    }
+
     public static function fromModel(Tag $model): self
     {
         $instance = new self();
@@ -36,4 +41,15 @@ public static function validate(ZipValidationHelper $context, array $data): arra
 
         return $context->validateData($data, $rules);
     }
+
+    public static function fromArray(array $data): self
+    {
+        $model = new self();
+
+        $model->name = $data['name'];
+        $model->value = $data['value'] ?? null;
+        $model->order = isset($data['order']) ? intval($data['order']) : null;
+
+        return $model;
+    }
 }
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index 7187a18897d..c3e47da048d 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -3,6 +3,10 @@
 namespace BookStack\Exports\ZipExports;
 
 use BookStack\Exceptions\ZipExportException;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportModel;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use ZipArchive;
 
 class ZipExportReader
@@ -71,32 +75,18 @@ public function fileExists(string $fileName): bool
 
     /**
      * @throws ZipExportException
-     * @returns array{name: string, book_count: int, chapter_count: int, page_count: int}
      */
-    public function getEntityInfo(): array
+    public function decodeDataToExportModel(): ZipExportBook|ZipExportChapter|ZipExportPage
     {
         $data = $this->readData();
-        $info = ['name' => '', 'book_count' => 0, 'chapter_count' => 0, 'page_count' => 0];
-
         if (isset($data['book'])) {
-            $info['name'] = $data['book']['name'] ?? '';
-            $info['book_count']++;
-            $chapters = $data['book']['chapters'] ?? [];
-            $pages = $data['book']['pages'] ?? [];
-            $info['chapter_count'] += count($chapters);
-            $info['page_count'] += count($pages);
-            foreach ($chapters as $chapter) {
-                $info['page_count'] += count($chapter['pages'] ?? []);
-            }
-        } elseif (isset($data['chapter'])) {
-            $info['name'] = $data['chapter']['name'] ?? '';
-            $info['chapter_count']++;
-            $info['page_count'] += count($data['chapter']['pages'] ?? []);
-        } elseif (isset($data['page'])) {
-            $info['name'] = $data['page']['name'] ?? '';
-            $info['page_count']++;
+            return ZipExportBook::fromArray($data['book']);
+        } else if (isset($data['chapter'])) {
+            return ZipExportChapter::fromArray($data['chapter']);
+        } else if (isset($data['page'])) {
+            return ZipExportPage::fromArray($data['page']);
         }
 
-        return $info;
+        throw new ZipExportException("Could not identify content in ZIP file data.");
     }
 }
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
index e476998c216..e27ae53c774 100644
--- a/app/Exports/ZipExports/ZipExportValidator.php
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -38,7 +38,6 @@ public function validate(): array
             return ['format' => trans('errors.import_zip_no_data')];
         }
 
-
         return $this->flattenModelErrors($modelErrors, $keyPrefix);
     }
 
diff --git a/database/factories/Exports/ImportFactory.php b/database/factories/Exports/ImportFactory.php
index 55378d5832e..74a2bcd65f3 100644
--- a/database/factories/Exports/ImportFactory.php
+++ b/database/factories/Exports/ImportFactory.php
@@ -23,9 +23,8 @@ public function definition(): array
         return [
             'path' => 'uploads/imports/' . Str::random(10) . '.zip',
             'name' => $this->faker->words(3, true),
-            'book_count' => 1,
-            'chapter_count' => 5,
-            'page_count' => 15,
+            'type' => 'book',
+            'metadata' => '{"name": "My book"}',
             'created_at' => User::factory(),
         ];
     }
diff --git a/database/migrations/2024_11_02_160700_create_imports_table.php b/database/migrations/2024_11_02_160700_create_imports_table.php
index ed188226981..0784591b8e3 100644
--- a/database/migrations/2024_11_02_160700_create_imports_table.php
+++ b/database/migrations/2024_11_02_160700_create_imports_table.php
@@ -16,10 +16,9 @@ public function up(): void
             $table->string('name');
             $table->string('path');
             $table->integer('size');
-            $table->integer('book_count');
-            $table->integer('chapter_count');
-            $table->integer('page_count');
-            $table->integer('created_by');
+            $table->string('type');
+            $table->longText('metadata');
+            $table->integer('created_by')->index();
             $table->timestamps();
         });
     }
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 065eb043a11..ae1c1e8d4cc 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -45,7 +45,7 @@
     'default_template_select' => 'Select a template page',
     'import' => 'Import',
     'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to import then press "Validate Import" to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
     'import_zip_select' => 'Select ZIP file to upload',
     'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
     'import_pending' => 'Pending Imports',
@@ -53,9 +53,9 @@
     'import_continue' => 'Continue Import',
     'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
     'import_run' => 'Run Import',
-    'import_size' => 'Import ZIP Size:',
-    'import_uploaded_at' => 'Uploaded:',
-    'import_uploaded_by' => 'Uploaded by:',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
     'import_location' => 'Import Location',
     'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 942265d04d8..2cf3cbf8221 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -248,4 +248,9 @@ $loadingSize: 10px;
       transform: rotate(180deg);
     }
   }
+}
+
+.import-item {
+  border-inline-start: 2px solid currentColor;
+  padding-inline-start: $-xs;
 }
\ No newline at end of file
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index 63977947dba..40867377fb0 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -1,11 +1,6 @@
 @extends('layouts.simple')
 
 @section('body')
-
-    @php
-        $type = $import->getType();
-    @endphp
-
     <div class="container small">
 
         <main class="card content-wrap auto-height mt-xxl">
@@ -13,29 +8,17 @@
             <p class="text-muted">{{ trans('entities.import_continue_desc') }}</p>
 
             <div class="mb-m">
-                <label class="setting-list-label">Import Details</label>
-                <div class="flex-container-row items-center justify-space-between wrap">
+                <label class="setting-list-label mb-m">Import Details</label>
+                <div class="flex-container-row justify-space-between wrap">
                     <div>
-                        <p class="text-{{ $type }} mb-xs bold">@icon($type) {{ $import->name }}</p>
-                        @if($type === 'book')
-                            <p class="text-chapter mb-xs ml-l">@icon('chapter') {{ trans_choice('entities.x_chapters', $import->chapter_count) }}</p>
-                        @endif
-                        @if($type === 'book' || $type === 'chapter')
-                            <p class="text-page mb-xs ml-l">@icon('page') {{ trans_choice('entities.x_pages', $import->page_count) }}</p>
-                        @endif
+                        @include('exports.parts.import-item', ['type' => $import->type, 'model' => $data])
                     </div>
-                    <div>
-                        <div class="opacity-80">
-                            <strong>{{ trans('entities.import_size') }}</strong>
-                            <span>{{ $import->getSizeString() }}</span>
-                        </div>
-                        <div class="opacity-80">
-                            <strong>{{ trans('entities.import_uploaded_at') }}</strong>
-                            <span title="{{ $import->created_at->toISOString() }}">{{ $import->created_at->diffForHumans() }}</span>
-                        </div>
+                    <div class="text-right text-muted">
+                        <div>{{ trans('entities.import_size', ['size' => $import->getSizeString()]) }}</div>
+                        <div><span title="{{ $import->created_at->toISOString() }}">{{ trans('entities.import_uploaded_at', ['relativeTime' => $import->created_at->diffForHumans()]) }}</span></div>
                         @if($import->createdBy)
-                            <div class="opacity-80">
-                                <strong>{{ trans('entities.import_uploaded_by') }}</strong>
+                            <div>
+                                {{ trans('entities.import_uploaded_by') }}
                                 <a href="{{ $import->createdBy->getProfileUrl() }}">{{ $import->createdBy->name }}</a>
                             </div>
                         @endif
@@ -48,14 +31,14 @@
                   method="POST">
                 {{ csrf_field() }}
 
-                @if($type === 'page' || $type === 'chapter')
+                @if($import->type === 'page' || $import->type === 'chapter')
                     <hr>
                     <label class="setting-list-label">{{ trans('entities.import_location') }}</label>
                     <p class="small mb-m">{{ trans('entities.import_location_desc') }}</p>
                     @include('entities.selector', [
                         'name' => 'parent',
-                        'entityTypes' => $type === 'page' ? 'chapter,book' : 'book',
-                        'entityPermission' => "{$type}-create",
+                        'entityTypes' => $import->type === 'page' ? 'chapter,book' : 'book',
+                        'entityPermission' => "{$import->type}-create",
                         'selectorSize' => 'compact small',
                     ])
                     @include('form.errors', ['name' => 'parent'])
diff --git a/resources/views/exports/parts/import-item.blade.php b/resources/views/exports/parts/import-item.blade.php
new file mode 100644
index 00000000000..811a3b31bda
--- /dev/null
+++ b/resources/views/exports/parts/import-item.blade.php
@@ -0,0 +1,26 @@
+{{--
+$type - string
+$model - object
+--}}
+<div class="import-item text-{{ $type }} mb-xs">
+    <p class="mb-none">@icon($type){{ $model->name }}</p>
+    <div class="ml-s">
+        <div class="text-muted">
+            @if($model->attachments ?? [])
+                <span>@icon('attach'){{ count($model->attachments) }}</span>
+            @endif
+            @if($model->images ?? [])
+                <span>@icon('image'){{ count($model->images) }}</span>
+            @endif
+            @if($model->tags ?? [])
+                <span>@icon('tag'){{ count($model->tags) }}</span>
+            @endif
+        </div>
+        @foreach($model->chapters ?? [] as $chapter)
+            @include('exports.parts.import-item', ['type' => 'chapter', 'model' => $chapter])
+        @endforeach
+        @foreach($model->pages ?? [] as $page)
+            @include('exports.parts.import-item', ['type' => 'page', 'model' => $page])
+        @endforeach
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/exports/parts/import.blade.php b/resources/views/exports/parts/import.blade.php
index 5ff6600f24b..fd53095a422 100644
--- a/resources/views/exports/parts/import.blade.php
+++ b/resources/views/exports/parts/import.blade.php
@@ -1,18 +1,9 @@
-@php
-    $type = $import->getType();
-@endphp
 <div class="item-list-row flex-container-row items-center justify-space-between wrap">
     <div class="px-m py-s">
         <a href="{{ $import->getUrl() }}"
-           class="text-{{ $type }}">@icon($type) {{ $import->name }}</a>
+           class="text-{{ $import->type }}">@icon($import->type) {{ $import->name }}</a>
     </div>
     <div class="px-m py-s flex-container-row gap-m items-center">
-        @if($type === 'book')
-            <div class="text-chapter opacity-80 bold">@icon('chapter') {{ $import->chapter_count }}</div>
-        @endif
-        @if($type === 'book' || $type === 'chapter')
-            <div class="text-page opacity-80 bold">@icon('page') {{ $import->page_count }}</div>
-        @endif
         <div class="bold opacity-80">{{ $import->getSizeString() }}</div>
         <div class="bold opacity-80 text-muted" title="{{ $import->created_at->toISOString() }}">@icon('time'){{ $import->created_at->diffForHumans() }}</div>
     </div>
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
index b9a8598fabe..2b40100aabe 100644
--- a/tests/Exports/ZipImportTest.php
+++ b/tests/Exports/ZipImportTest.php
@@ -4,6 +4,9 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Exports\Import;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
@@ -130,7 +133,7 @@ public function test_import_upload_success()
     {
         $admin = $this->users->admin();
         $this->actingAs($admin);
-        $resp = $this->runImportFromFile($this->zipUploadFromData([
+        $data = [
             'book' => [
                 'name' => 'My great book name',
                 'chapters' => [
@@ -149,13 +152,13 @@ public function test_import_upload_success()
                     ]
                 ],
             ],
-        ]));
+        ];
+
+        $resp = $this->runImportFromFile($this->zipUploadFromData($data));
 
         $this->assertDatabaseHas('imports', [
             'name' => 'My great book name',
-            'book_count' => 1,
-            'chapter_count' => 1,
-            'page_count' => 2,
+            'type' => 'book',
             'created_by' => $admin->id,
         ]);
 
@@ -168,11 +171,25 @@ public function test_import_upload_success()
 
     public function test_import_show_page()
     {
-        $import = Import::factory()->create(['name' => 'MySuperAdminImport']);
+        $exportBook = new ZipExportBook();
+        $exportBook->name = 'My exported book';
+        $exportChapter = new ZipExportChapter();
+        $exportChapter->name = 'My exported chapter';
+        $exportPage = new ZipExportPage();
+        $exportPage->name = 'My exported page';
+        $exportBook->chapters = [$exportChapter];
+        $exportChapter->pages = [$exportPage];
+
+        $import = Import::factory()->create([
+            'name' => 'MySuperAdminImport',
+            'metadata' => json_encode($exportBook)
+        ]);
 
         $resp = $this->asAdmin()->get("/import/{$import->id}");
         $resp->assertOk();
-        $resp->assertSee('MySuperAdminImport');
+        $resp->assertSeeText('My exported book');
+        $resp->assertSeeText('My exported chapter');
+        $resp->assertSeeText('My exported page');
     }
 
     public function test_import_show_page_access_limited()

From 7b84558ca1deb0a605a2f632e60baaad325615e7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 5 Nov 2024 15:41:58 +0000
Subject: [PATCH 353/666] ZIP Imports: Added parent and permission check
 pre-import

---
 app/Exceptions/ZipImportException.php         |  12 ++
 app/Exports/Controllers/ImportController.php  |   2 -
 app/Exports/ImportRepo.php                    |  20 ++-
 app/Exports/ZipExports/ZipExportValidator.php |   7 +-
 app/Exports/ZipExports/ZipImportRunner.php    | 143 ++++++++++++++++++
 app/Uploads/FileStorage.php                   |  23 ++-
 6 files changed, 195 insertions(+), 12 deletions(-)
 create mode 100644 app/Exceptions/ZipImportException.php
 create mode 100644 app/Exports/ZipExports/ZipImportRunner.php

diff --git a/app/Exceptions/ZipImportException.php b/app/Exceptions/ZipImportException.php
new file mode 100644
index 00000000000..2403c514477
--- /dev/null
+++ b/app/Exceptions/ZipImportException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class ZipImportException extends \Exception
+{
+    public function __construct(
+        public array $errors
+    ) {
+        parent::__construct();
+    }
+}
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 3a56ed03456..ec5ac80808b 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -65,8 +65,6 @@ public function show(int $id)
     {
         $import = $this->imports->findVisible($id);
 
-//        dd($import->decodeMetadata());
-
         $this->setPageTitle(trans('entities.import_continue'));
 
         return view('exports.import-show', [
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 3265e1c80dc..b94563545a4 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\ZipExportException;
 use BookStack\Exceptions\ZipValidationException;
@@ -10,6 +11,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
+use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Uploads\FileStorage;
 use Illuminate\Database\Eloquent\Collection;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -18,6 +20,8 @@ class ImportRepo
 {
     public function __construct(
         protected FileStorage $storage,
+        protected ZipImportRunner $importer,
+        protected EntityQueries $entityQueries,
     ) {
     }
 
@@ -54,13 +58,13 @@ public function findVisible(int $id): Import
     public function storeFromUpload(UploadedFile $file): Import
     {
         $zipPath = $file->getRealPath();
+        $reader = new ZipExportReader($zipPath);
 
-        $errors = (new ZipExportValidator($zipPath))->validate();
+        $errors = (new ZipExportValidator($reader))->validate();
         if ($errors) {
             throw new ZipValidationException($errors);
         }
 
-        $reader = new ZipExportReader($zipPath);
         $exportModel = $reader->decodeDataToExportModel();
 
         $import = new Import();
@@ -90,11 +94,17 @@ public function storeFromUpload(UploadedFile $file): Import
         return $import;
     }
 
+    /**
+     * @throws ZipValidationException
+     */
     public function runImport(Import $import, ?string $parent = null)
     {
-        // TODO - Download import zip (if needed)
-        // TODO - Validate zip file again
-        // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
+        $parentModel = null;
+        if ($import->type === 'page' || $import->type === 'chapter') {
+            $parentModel = $parent ? $this->entityQueries->findVisibleByStringIdentifier($parent) : null;
+        }
+
+        return $this->importer->run($import, $parentModel);
     }
 
     public function deleteImport(Import $import): void
diff --git a/app/Exports/ZipExports/ZipExportValidator.php b/app/Exports/ZipExports/ZipExportValidator.php
index e27ae53c774..889804f2013 100644
--- a/app/Exports/ZipExports/ZipExportValidator.php
+++ b/app/Exports/ZipExports/ZipExportValidator.php
@@ -10,20 +10,19 @@
 class ZipExportValidator
 {
     public function __construct(
-        protected string $zipPath,
+        protected ZipExportReader $reader,
     ) {
     }
 
     public function validate(): array
     {
-        $reader = new ZipExportReader($this->zipPath);
         try {
-            $importData = $reader->readData();
+            $importData = $this->reader->readData();
         } catch (ZipExportException $exception) {
             return ['format' => $exception->getMessage()];
         }
 
-        $helper = new ZipValidationHelper($reader);
+        $helper = new ZipValidationHelper($this->reader);
 
         if (isset($importData['book'])) {
             $modelErrors = ZipExportBook::validate($helper, $importData['book']);
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
new file mode 100644
index 00000000000..2f784ebea6e
--- /dev/null
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Exceptions\ZipExportException;
+use BookStack\Exceptions\ZipImportException;
+use BookStack\Exports\Import;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Uploads\FileStorage;
+
+class ZipImportRunner
+{
+    public function __construct(
+        protected FileStorage $storage,
+    ) {
+    }
+
+    /**
+     * @throws ZipImportException
+     */
+    public function run(Import $import, ?Entity $parent = null): void
+    {
+        $zipPath = $this->getZipPath($import);
+        $reader = new ZipExportReader($zipPath);
+
+        $errors = (new ZipExportValidator($reader))->validate();
+        if ($errors) {
+            throw new ZipImportException(["ZIP failed to validate"]);
+        }
+
+        try {
+            $exportModel = $reader->decodeDataToExportModel();
+        } catch (ZipExportException $e) {
+            throw new ZipImportException([$e->getMessage()]);
+        }
+
+        // Validate parent type
+        if ($exportModel instanceof ZipExportBook && ($parent !== null)) {
+            throw new ZipImportException(["Must not have a parent set for a Book import"]);
+        } else if ($exportModel instanceof ZipExportChapter && (!$parent instanceof Book)) {
+            throw new ZipImportException(["Parent book required for chapter import"]);
+        } else if ($exportModel instanceof ZipExportPage && !($parent instanceof Book || $parent instanceof Chapter)) {
+            throw new ZipImportException(["Parent book or chapter required for page import"]);
+        }
+
+        $this->ensurePermissionsPermitImport($exportModel);
+
+        // TODO - Run import
+    }
+
+    /**
+     * @throws ZipImportException
+     */
+    protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|ZipExportBook $exportModel, Book|Chapter|null $parent = null): void
+    {
+        $errors = [];
+
+        // TODO - Extract messages to language files
+        // TODO - Ensure these are shown to users on failure
+
+        $chapters = [];
+        $pages = [];
+        $images = [];
+        $attachments = [];
+
+        if ($exportModel instanceof ZipExportBook) {
+            if (!userCan('book-create-all')) {
+                $errors[] = 'You are lacking the required permission to create books.';
+            }
+            array_push($pages, ...$exportModel->pages);
+            array_push($chapters, ...$exportModel->chapters);
+        } else if ($exportModel instanceof ZipExportChapter) {
+            $chapters[] = $exportModel;
+        } else if ($exportModel instanceof ZipExportPage) {
+            $pages[] = $exportModel;
+        }
+
+        foreach ($chapters as $chapter) {
+            array_push($pages, ...$chapter->pages);
+        }
+
+        if (count($chapters) > 0) {
+            $permission = 'chapter-create' . ($parent ? '' : '-all');
+            if (!userCan($permission, $parent)) {
+                $errors[] = 'You are lacking the required permission to create chapters.';
+            }
+        }
+
+        foreach ($pages as $page) {
+            array_push($attachments, ...$page->attachments);
+            array_push($images, ...$page->images);
+        }
+
+        if (count($pages) > 0) {
+            if ($parent) {
+                if (!userCan('page-create', $parent)) {
+                    $errors[] = 'You are lacking the required permission to create pages.';
+                }
+            } else {
+                $hasPermission = userCan('page-create-all') || userCan('page-create-own');
+                if (!$hasPermission) {
+                    $errors[] = 'You are lacking the required permission to create pages.';
+                }
+            }
+        }
+
+        if (count($images) > 0) {
+            if (!userCan('image-create-all')) {
+                $errors[] = 'You are lacking the required permissions to create images.';
+            }
+        }
+
+        if (count($attachments) > 0) {
+            if (userCan('attachment-create-all')) {
+                $errors[] = 'You are lacking the required permissions to create attachments.';
+            }
+        }
+
+        if (count($errors)) {
+            throw new ZipImportException($errors);
+        }
+    }
+
+    protected function getZipPath(Import $import): string
+    {
+        if (!$this->storage->isRemote()) {
+            return $this->storage->getSystemPath($import->path);
+        }
+
+        $tempFilePath = tempnam(sys_get_temp_dir(), 'bszip-import-');
+        $tempFile = fopen($tempFilePath, 'wb');
+        $stream = $this->storage->getReadStream($import->path);
+        stream_copy_to_stream($stream, $tempFile);
+        fclose($tempFile);
+
+        return $tempFilePath;
+    }
+}
diff --git a/app/Uploads/FileStorage.php b/app/Uploads/FileStorage.php
index 278484e519d..e6ac368d000 100644
--- a/app/Uploads/FileStorage.php
+++ b/app/Uploads/FileStorage.php
@@ -5,6 +5,7 @@
 use BookStack\Exceptions\FileUploadException;
 use Exception;
 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
+use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
@@ -70,6 +71,26 @@ public function uploadFile(UploadedFile $file, string $subDirectory, string $suf
         return $filePath;
     }
 
+    /**
+     * Check whether the configured storage is remote from the host of this app.
+     */
+    public function isRemote(): bool
+    {
+        return $this->getStorageDiskName() === 's3';
+    }
+
+    /**
+     * Get the actual path on system for the given relative file path.
+     */
+    public function getSystemPath(string $filePath): string
+    {
+        if ($this->isRemote()) {
+            return '';
+        }
+
+        return storage_path('uploads/files/' . ltrim($this->adjustPathForStorageDisk($filePath), '/'));
+    }
+
     /**
      * Get the storage that will be used for storing files.
      */
@@ -83,7 +104,7 @@ protected function getStorageDisk(): Storage
      */
     protected function getStorageDiskName(): string
     {
-        $storageType = config('filesystems.attachments');
+        $storageType = trim(strtolower(config('filesystems.attachments')));
 
         // Change to our secure-attachment disk if any of the local options
         // are used to prevent escaping that location.

From 45189d9517257cdcf599273a5f1a08fa60206564 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 7 Nov 2024 17:10:35 +0000
Subject: [PATCH 354/666] System CLI: Updated to 126de5599c state

---
 bookstack-system-cli | Bin 355805 -> 386055 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bookstack-system-cli b/bookstack-system-cli
index 0a643e1142e46b4d6bbf2c474b08d64e3b0ae9dd..6fbfd98745b8bac922648e0354b9d55c9b9245a2 100755
GIT binary patch
literal 386055
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%0D6EK8C}Q`r>G
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%0Du@KH=}M
z`l$e*%~`)W_MC4+y^$e%M5Z1?^cLrl-F0TtS={kvH=`tui%IDw*cM6>EQvFhnlcoF
zp{@a^Rvt<WKJk6wCQu}c$kRXkFtNPc!QGcd&LujWy!2CS+0IZpBN{_-x~>)y=c`)}
zlk#k(?%jB9TJH^c$2v8=!Txf^nE!S^zILCj)Nl0%rBz*T+c*$>*RR+LIZ(14Ik^IT
zu%kLb&Mg8Ixw|I89bh^EEw3!1GAWRh-Sm?GejqK`@<)Q8)r-W{%xY$rT%8Sytnj>U
z%Yzo&W?Vzca|EuTV9J0@!DI+GkMmTDM<`hGjm<Ffz~O@=gimb3QNUl)ph!3>I7?mR
zT(3A$BIh3~{3oegy0px5NM!M-_$)KP#1wL#pwI|hq*Be9;Zk&<$dPG;1;?f1eYv_E
zUf&FDDyPz9%)pXqm~w3tpOgltu;eBKW1VPOsstgCQ>VD=d4kPR7c5yjqL*@BNP)u8
zODVL>kzR?SG=0x2^=qi%_XG>8l3s}g%lY&|&B{3nvwqRHRdu#+jN)SE@`A!bp+;de
zFag}f3MChOic?@37-)yCOMIu<413kWUPmiV3<8(U%mGQIgyZ80Q?Z{)Ibq5tVZUOY
zv(jWzy}4UmFUgtKThj5nK{3^Ep=Jvg@&5CyBInXxEjXWAdkM3B&|GZl3?HJ?3e<J?
zqMYPBfkX;z;Op@7@ZX1<+pkyGpCJYkjP9u(w+CS`=u!O?49?zBN@?hC9w~V`3Q7N^
zTzA)h-~D+z{9`w%<=VtAGxvFeo*#_veMfCsMU>KL9SB>Y|3qDOvJ0srVJoD>esiy0
z1ygKZwY+ZaMZI3{6}zze-=Wc<(vT`Scd^SaSBDClmLjpc5FQ?!J5?qo*!oWB;Hwro
zB2y?#uh%4u#$hGeZ9RLcjz4NNxAGeb9aI5hSNsPCRpM|}+~+;Jw-s<}o4Z%*f|yLn
zrG}Rd75tN-fKsrDJ^s>)c0<F~Ezp@P^C<{ipn{AQ1&VOHHi|Ep!A)`2%C{@i1Ev&v
z+$qqJLu-g(H12PrIf|LdAO@<9%2Cu+Xh4!uX{jKFlm1RNdydOI--MT$9c)2OIji%B
z4I%d8DFlR40&yHyvPTtZyo+soE?R@z?HUe)0T9yPqpT78uM%lDWr^Ewp1nPZg~Hjx
zoS7sGNSEq%_kwgP1synYFFJ72sY?_dl5X?ZBEdUr)%iFCYqV%Ih8nrA{gvWxjBKp{
zbB%j$g3*2KQ&J78cn}68(wL{c-hn|9k#_hq-WzRmgwg3Zs-AuyM|Rg1iO!kMP}@EH
zps>hUg29ORl#mV(O8nJrwe)>5?tp#N<wP45RLS0tJ8;^8<I^w<`)_gos@Gq0y5nj~
z=gCIrPsrT)EBva^bxRIOIl%08;lPO6gSipte(x_$!9W*^3zG)q?%*U8$Q1Zd6v1yA
zqA2pCM#F2jD~laCJ=yR1_Cc<PQM)nY>UK1k4b~fu>}yB0kx8K`m8jA6kLB6>ADvh2
zZX!1n{m)a}MnpiC4{h_SB&5l*WQ&?55uv+U1r!-`XU2`ON45uok~~nKqc2w3X2?JW
z=msegnK}3C+<TAB>F;qA7YdD|0vy30Vj2R*5txRUC<8J86CvC#rhya-hzWflA=V4v
z@MT(oOEP9C;6@r0l%aytz&$zF-lk6F^lXX0l*+ja63&6jc%fJr86aW;oKX}Sfr&t>
zDKSinD#RR#Mwl_2JG-lHyVJYvSXVAf6A=S*qG7_cQEZ$ToWPu!2#l>n%S2HGDkm=E
zMxh|c6m?AKs-j_APGc!hm|<HAEjbRaWEi44DHIZoaHExdFuWLRqX;$W%j~<Zm=Vq<
z7b;AqC`{*(Vr=tYM_tMA3TMdu)9vA}6B8$^fBk=5VNeBx;{P;$V^wGzxdz<a_G`yL
z<uvAu2m{pH0e5AkZ9ON6iKK!*|NUpi1bj|J$ccv2iT`pQP6^}LzMgADh>VGKv(cE(
z=k+*>YXJ-EQiY9JEBjYFZnz#$PPB$)!k$jRM}uObVV&i|Qvm=VPR5*3m#Tqo@A4X2
zP_koEI(hrP)9+vREdZ60s&rED5XEN1AZ+jgMd==#tbvG9WC6t)s<G6}EL_*Vk{DWW
z=YaN;cC*>+eC_nVbb9R{&^p@;&}@F|^gmtSb_YN1d)NK17gyCB4;NRR{@~r#?S6OA
zZC_ly+rg5ucUphH==Zw4FYmVRT@SkL&K`6Bt&?Z(2V$S~P8Xj$pZ?lcfWvs>QSP{S
z)%uxP(a3`(`#Yy%4=&sPJ<wIB_uw);^+-$d?&j^rrA^w6TJ>QQw!!#VN)AQ0;5dO6
z1cYl$H{FXtkO*oe81C<#E~tc>@|Nwd?%eoMb$f?L6&LeqRZGzxJGC?K7h3E3k^$sJ
z$_f8rEB=kgH_2_L`yn6c9lhj}$7NV9a*M1&af(`#5La|iDGWXu&qEVtl1(<)U;&hW
zVOpapZ>!_ZyB}3589Vzik&<%|IEQVgYgxyN2@{k{gUB6V;9SAMp+10#L=8e3z(=M{
zy;KDss8V@lZdtS=@wH>w4xYRs8V&fam_abo-9+5<!P1NcAdp&q)WTh6$c!*f#vIqU
z$ZQ?7TCMzstQgrK#5!0XFDA4hf}#u{|FW>@Vxv<3t#%fo>DX$#bveV3XKBscXYjgv
zMkSa_X`|tIVu3xFC(O+gjgUS7)1qWDgw<-mOi4SqCQ}3{mN&aJ**W7JCK8yfOc2g3
z%ZoW#)YtlBE&0L$4FpmF1_7fC1zkXd3W4|_%Si@LykR1=*Ik927&b$`0DO#5Xg0(8
zTK}?)eM={~T!FLJ);-<U&6TUU9V(s~=F`KEMSXU6_-j#*;PAMpPaE!u9pPQ`l1}&v
z=E#aACkD%}%bTukrBdCWbhfdX_PV>I{Tx9bO`?Q$V*v9Ag>6hqu!e}t5XOkYUoa;?
z%yM&F1ij?<sF5o_5z!q#Xyr=Nss4t*C>MQWC{MPe+I{6iLn>Y~!V}bXu;kik#GFu!
zB%h#KC7C)(Z^t)(+`y$GQ=Cin;N8m@6&W+m%mThBnZ)b$Ezhr2f!P+>-!CHEDzlX)
zctoDYYNPBiX9yEI)9cbx>5Z<Ylr2H|YN*iFZ{=1yeSd`oQX!!clvnysG!!3jVbAU2
zjPN|&687hwQ@k1B@caxzrtdW+oT#$5d4BfqGMYBLb@f^m%@wk2l6MDBPd15{mxB@b
zFdHfc$Thkp-VF1Z7#y%E?v~9x(bBCfzjfDa_AlGV$H%{I3hOE*%Z42PjnsHHel~&9
zowtTk-P$*s?k85gG%Dpq{AuT<`Y=Re7BTwtavbMP(Q?wXQATA2C>yJiF6&F-KYftF
zY8){TMDO~FI_$wV#`^(Tk|l!;#<2-;jtfRB^~^NZbPK8F^%DH=VP=!yOMGjZS4CBA
zzT`1Gx4v+=z|WB@dQJqc$i5h~hmC~C<J7Ahk$rgf16?^R{8>21jo&i~zN?W0rh-ks
ze75zZxe7Xc{=?sBS?v0j5`yMq;bAm*iAWqsDuJcfGI?W_OXNhp5?+`Ni|*TPcm42q
zJzFg)ZS;nNuZUc&@V*&E9N0$K+@xwNfe<t<iPz4FpQvUZ{x#ZlI%O3S+jS~c6YcJ)
zR+53rr+Jno_trNXwcw6kSnyRPV)H!TdzH8yCeP__&9&=Ud_qXRR{Utv=`?wXor=+`
zxnB+da@!{k=$nMODW0B!O1090oh`sSsF05;>G;lUj_3!%YC0X4|JAS<R`kl&Y5V}2
z*OLJ&ZI+vzxO1GczPUH|8--EJZrd;ryz?vOkb@m0@jb7)HEba06HSi>0-9P`M5tYY
zT*h&O{CgqVb<iSdc@ZJb%+AbSzKdNnW^!zBj31rPXni2~jA)ZWT4+bO-S(~U7SXzU
zyQVXPiXXW#7Ix){@lBN2c}lo!>z`@fan79d*L(azQk82<2yha&$*((w<p#k!;!N<|
zO6sk8;S<C_HWMB^Z7T26&20YVc0Nc|m)cpy#%44=Yx1k2)L`SagAPful;j9bn(BCB
z4BMV^wC<2-Ig>sL6YFv&oF&lmGv!RYrgULU$^SymA05TP>GFHwne@HoW?_Ax=J0Yc
zR9mx8ZP88=KGK6{d=PGMc|Y7&!p(HuTOWQ`H8C#OobjSMc(QAP?_;2zSTmNlnmn)V
zDv)_H08j@F=NQvylkKq*2{_U&$>u8$&PpQSX17zflSXGVELiyTCnW(rdaae6pc3&k
z%|v)J;q$9AomJNzFd0?jeT>1oy4&;fOgj4$G#c-vCiNT3DtL#sup6Fncjtt&rs8z8
z1HOO~*+w{Qk!vY9@*Invya{`?m@8;1^gq(y$*$1akoUAPcB^<cZ$wbpt!*?u-+QgV
zr^C=hS`rW5d_KLdF)sF!&*m4UR9#QoFcf{yued`UB&daVN;@EGH8eIR3U8H=>)bRJ
z&b8%_mTKa^Pj){N*jT46FL83uJ@=erC+DAZrIY0JIDuohuY`qCNCaU)Gvh#&;3|a4
zsxB3+Kr{Zt=6I4o#HT!iF`Ee__^uoh7ii$TjBhUNy61$edbq)lm5FqvmlC+rD<kHW
z14ac%!I3P2pi-HdIiaWvS|YOu3xUhncXOSOzD-7fDyno9bFgF<3SpfQGw-l~rEnFv
z;KV9#I09EiRD7Bw#A>vf@tvb-u4=6a$xU-bR!N+GMQf4fX!=Rw?VpgBT1&yB*8U!7
zuIidmvAyqukDfW|z&pM3wCNc$A+gw1_EB7u_HH_HM$kO2_ch#l7dozdS)##W{n!sj
zBktV=^R7|`zTiR-Tq!Ex{3)zwii(SQ&4k=;^=VQHViLGy)<WYTB+KUbnNcCpBtH@W
z0PSZ|a40?TU<)1}xgzU~=PuPoESN(u$O=Vr1+B!P!<vUIQmqMJl6QCoEz}dHzvzKZ
zy<TKzEwQ;GhtIA>9IlQCQNjQSm(U6~-E#DX5s~$q78R4+^t_HY&H70L42QNiY}x7!
zExMdJUhTHswkGk{l{S|%tCs4>j?cp7sz4b0c9QXwuHALFl3ONTAP$3cdS4l}WHX7-
z!R*Zp7i!VwyT>-|VD}ATll0D57dC~nv+?Ei&BNVjr>Hk9(eWzHvbMIywkV;MPn2^@
zL4h|2hldUE<RQ;TlL>qn44P#A#g5fRkSo)pO&tzC+5-rT+h0-m{lvE?M_qVxOuDV%
z`(xQ*|2hwY&KvqK;{N8NdP#l)l~-+Z+BgvY&ac=@xnidjf+0Xd;My>0nw!hrP10}8
z&5bOtu^L(ONOBS;&40g<?0|X8Q4fRh?&{I*qtzpG`dgM{wOaeI28Zx9VH#q_5txRI
zC<8JElOWv8(^!f*WQ5+48MbQR;yvoaXA&|L@V7K5C_@FOv9o;C#h4bA>7<PRER}<c
zbIyUvY_8ZWF+fBFoKX}Sfr(hElo%#O6EcoOBiu85aO3{CoSy%Ab8ewrmH@>-I=?0%
z1|Eoph-sr(m>Z1Xftdu1twhUQQ3NU@mvOsR6C_2Q5xS`8b}G|M3KZscDutFDZ~w|o
zmYY$nmh0ET&L1geHqF~haZfmlKB-xrqA&}`$kOWS{z!6@NVPXtivhpq+zvRCd8FoW
z`rSQ#q*6puQ8cZ4X>j67Ly@QONoY2eT&gP>VeP2~0AN?vUWYK{L~BL~hu-^;85a%I
zhU+FUL3tiAF@qt{MPT7|3p9kVSS@F3K|vGfxiI9>_RGQf&GcLSDV7Q^l*~osGO^@8
zkLph$p?B-%^x!46t6Uoh?NX%~F)ZX*EF<9@462j~!izMRX=v9ADHALu9PUwRCI#p`
z%cL?GwMx*oyHndhw$k3Hw#LVBodxiM-VsDBj!~g7FV=U^=|hxfoKa%1u)3zwO+cY@
zWm&WJJrETwN?@Fsx&M;P23;owU)|y8c(jAGUg3M4xtm1hJle)xDz#aXw}X}81}niv
zbAWe!akft-!S+h7F?!zaxlo8=hwqH%1qZ=)4ocK5o(1X_pF^$m9hq;Xj)*y=GD0Q(
zm%(7!Sj(Lz#XTxxI~J}l&LF`@5+QZ{TC|Umu8FBs3Uwxh+j%ADPOU0aWqHUMg*X?~
z$_mf|{j-wk7kvCG7rTBcBlN5giW$@sd~`<t1PYVGDm1}fivSqgfPWQcoKW-{ZyHT#
zG@2EJvOs&W7`!fw$78tFMsXD0GR&`_ug|df{q5+V){ckH&WB+2VYHa$c{Q^>{IXYO
zCQ<SM1U|qn?e=u0m@u)|C?nwD&9C~P6u%XA{H^KKX<2!Kj}cODE1Pv2;FY1133U2C
zyoKQScnMjbt%eLYBSOn>5m34oK7}S%0#agV0$$yoitAix<nhUgQ%D$3pzI$XT=4rz
zrP;18&b+#6LVebRdgwQIzzi)+!)jNf<?Ro*6EARiE!M*d!mm;BvForzSS~|BPPrPH
zV)s_Jx9uOB0~5xfxcjWUhyIEEv9@P^p3buD2xp2!_@(TDV$b&WX7e?a;ck=&W0G@Y
z5%%c#1FKY&2qDX(*s+9>)vBj51N;8;+&b8s>K%3eJmpTsy?O|3+u=T(o<aaWz$@*u
zioN5*kC%8=+E=oy2=%4V8B-WRtYiv_F_}JTw`a^Gd1zn8+T=UortLOYN=(uYxeVLb
z>-X>|BAxK4)B7;!54wFCe;5SEM@Ri`&>O~dFbIb@sEpH!wy8{0DXs_;?K^2W6V_5r
zwlR@CeR$jT|8c){XWY2}-qq#Tmse$f?UdMy`{B=UZza`A)Oc)V=<Qo4M)o0G@A@+G
z)XLMUr?Q5f{%FNjQOgR(1cKgcC_%ULDohz>>-5Vuu(0oKYHbL51NV;O!#fDNK}EU&
zxyH3=7m35Wjdbkgb^G>TP-Uu@j)Oxu_WfPMHb%|%8C4w+Rt8khpW^$u_8)DL&5qhY
z5QOi3iaH=Ipk26!pP(R660NdGMA{2dG>m)jB=)p5(}tjk=gEWQ#iAKIESscn9#wUJ
zRi3`Bi#p53!wf@wE^L6YCBX*N$_v;)3c~hW8FpvXN`F%a8f8fOz8+w$_LdwrEabE$
zkEuy7i_m&TnyY!IU$al^OjDN7T%Wx?6awXPlva}q1nUg@N{MB6kGdok2uDk&<a_+E
zTz%TE;;KX`g%X@pKyHJ0yKjVYoU9a(m?UuHH9>Qph{svxR7Igy`kH9B<f>*zPIgOn
zflJywHBvV+iJc_qg=(Z=kB_9>!`dtN>nGcQt*zK$s@aLsviNF3d>9!&Pp5RLLcqJm
z81j_2J3-%tTprMVW<N3jsJ%TZA;bjkfZjfNFvH#5Buk0}5@(22Rg0y7P86H-B#n0g
zRstdoIT>~GaeJWImsZ0xPRCkdNOaL3yy-3`O^Xtz*X_Uzz1ZTzyuCGfQQSV?a>i+C
zu3K8y<)0jjPIqLRzlQZJq~m|Q^5*>Ptx*3@K^29d4s?$_bBUg#Q)wLy{?74=ax}a8
zZeXoJ|LVW-{@1_Tyx)9TJw3h@ap}Tcvfs5>-*4JT5Ps*cm`bQN6%Bp3CsLX;gzAvm
zCIZ@1)l})S9^<{5UEl5)g6{gipLW*<+W``(so$_?XTR^8A3MwIvn<J4t=@|kyntCE
z48$Tu5C$@)2~-S}AWS#QSji1!jQ?N@JZXWm4|xaPvAIAA*NRYbff`=N?#;RJYfiXY
zzA5bADec_Fd71)O*+z>+LcnAMso*FLf{?M&OGZM;E@UY(gRl~~cI)1chog_vk#*%z
zQo;z<%s?azX)(_UBUlScfGiWEa?KIAiX7rzt0mbIO~&|^(algTGbK^d%}`0BQoOm!
zDa+}!)ymB=vv&?Ap)M9|e~%@hjv2>OE34yOtnr3cTT3RwnB^$}Pnj_gD-A47VfcOw
z%GsU3m>@T3U^=_J`ZRMgO=p**$)wcZ#mlc31{iQ9S11Kag0*H@h8mbwxs2fZlr*xX
zNATV4HdmA!c5R=w2Lc0-xUQ23JEv6)!T|o0ixo@l-lX~my;O08vC2?}L6&6wUe8dZ
zatgW-tb>ko@0S~jMp{2+Ici;9Zati{oD!uUou$2&m$M!*yd#v6sqGG8nWeZyNe%05
z{9FIFEP+gm6(fYkS4RxBKCKxst=R_J+&i2iw}s$W8W_OWZ>KG1?-I*CFW@|5nk_*{
zg2PXHg?g@xpbg9tgx#+cSC~SmB$l=Qc{I7WnvQ2*Y&scYmY|SL_?^b~bEVS%q^;|{
z+egTiX0|;4N{|xNKnlv2uta0n0u6-DgR6y{)XPPV#t6A+Zg!~RJb-pwekcrK_d+;E
z9E+Vu*$Ug1V#9B_ZO?}&pQnODoJ$uJxV?4y=$un%#ji*_0E21V?{B5N{dhI`@b-Nd
z&a6&VIR;>Xbm8m}rz#z9>|y!ja=@5IN&S8mP}?@Zmv3x=c*j0<!%nw?vs(eut?bh&
zlFU9LE~FX^233>F{w^PTE@~G;(8!FErVB;gCd_~!P-_WWa-d|ofpvn?%C8|(G9VE0
zZ{!3FOom*<R_k)XNo})&oUfmKjiJJRq_xryk*^ZAk4DP1Jl($gx%=E^oN|_4RsvY;
zCd~Gw>yEz*Y`1i|z+Jk8ox?%f(QE{*god<3evjYt=XDAVqMfQr6|E`_YN(MB+VjbB
zFHQsFTieOe5-W_tPQPriwT{@R10S{OSyi(Rcd}I^_V4!g+p5r?%Scof)pR%<mHnce
z7id>XL=R|CiB6+?9O?x1h*r~lZ&o%_pt<1J(C^fEM2kDZXy>QasSYzbvf$Sk?UKRu
zeRqT&0lqUYOpk#+U|axhf>|KBo>2~E{pK;fzeH-=K7}Gx5clRBv>%)LG~1%LI)r87
zpco*XqwQ`y*H&IYxe{7QJB5MCvrK6+u-1ZvTtHFOWyc{^dh<hXqxEP-$Zf;h@=BPQ
zx|ww9JzIHg0q)l{W~o8naLe{E$)yx>aW(zp)vNGe<~=z#KgB<W8*2S~xeXKKKTM6)
z9rD~!sPYpA#upzzOi>Fv20FK$F02#5lhRqF(AYU4(<(!qZv1se6Yzv-#tHRHlw3tZ
zE)2|()`$|`PKV>Mo%2Q)!^`ooDU6@Gx3V;O?G>fXJ*xqHtsSQ~rJGy46NZetncU{~
z&KY#z47R_*zyuxWLlAUp4i-o#S7C59oqf3;1)ciWo9jQXZ?C4im)|NUel1YX1_QA7
z;Y^v(-cnSAVQ?CBOXQs{1dd?vU^~?4FVV+kyFX?&B(np_vm$rymsN8vDall?cRtaJ
z>)qbTtk;82_QvjSv~IY}lrds%|0qz9X<XS<i?v!hz%~a-DOfVO@qZ^oXt)*`DQ%j<
z-b5G+iBTAM|1O|6#a?{~&ktW^;jDjz$`eMQHa$KVfNJeObpS?_$!`t7XfoLb!0xp#
z0J}c}9vOh2t^WaiQbCRrF%Z1_6@B2aiBNK9BZw5TtCbKSg<~!ryC>5ckK1auHw471
zcmf|o<4JbeAn?UfxvRRW<kh>>C1aLz19SM&QHGWR0%b^66u1TL5O$}b<#>W*U2hM#
zFi_`j+zjq)Lm1&RD@I2suxcx^&J$<hczAoBzhkL#Z3zJ!r<2g3Q?SuPAcrv{P;6NS
ztHkj&q<}UfJQ5x&@594p`*F7&rK(HqtisV|@RU`kDT*GBq#fv(By$mm;MiBkOJkxP
zFemGt674rUB#sz$zu}lU;Qmw5RP=W2q?$hC6Z{Yrr5yz*S4;E^3@PA%arDrfUedq?
zoActSW9xnXGb-4Ii$Ye9BDIf<u0HU@&njq#OYdu2v}1wyR;c7}aR2M4pz8@%-U{}M
zUi$T6uoN!kFU_;hf8@chiqU7d!p(OB08qOa&m8Vir|8!TEeoIs%NVrIF6*626UaeZ
z;uPtCx*f+R{>|*owbHG*-nkakA`u>${C~CcOYLimud2V<dBNZ0dXJ9ICG95U@+E$l
z-=$gGaudxFzSmPUl!8~Vmdve<Z7A~-NcqQ9nS={WnbB@bnlL-FnVGe$3Orh_@?xo;
z!)i~GT|_sww9}{Q?ynE~>bzW)qtWd72%f{|6*sWp0)ZPSnYN%7U{?s&n_{8l21=Iw
zU`w2iz@1OB3A|%-juJj8i!$S=;nl+Z^4fTsX{L&^aQ>arj@_aX0y0%@G+(YPFqwnk
z8A^k|<wEI#S*~OXr9fs7?l`U;-Q|aiKR#anL9CpXcEv2LnSq=etNFaLn8TXe6<D&w
zs7hxDnaZ8Uv(ZSh0!_)X+M=5aRg_Aiv^N(@8YS@Ns<LHePe!B4>^t_(scBIMg8KUh
zX;Cj&h9?hjc#on)9sWFY_%rH)OD0apSMD-jv&ycNhEE)|M#wApB+wXc;8mHI0?q4X
z!MKR`U!VUgn`@2&u8h@6RN0UJ{s&$y{f|=>f84aGXQNCoV<4z=jTw2!TMl?{QRW7&
ztwvV(A4mTl0RWVm-!Y58v}PL^XG&U>7Ea;ox0BWZE-j1&muTP=j!uS%jTdU#597ta
z*w$CnV_dNN_vm8HF?R>tHPYufye^q$1!xQr)BcQ&v#WD>=qA2?+iDq(&%83#T<{DQ
zm2?l`_BK<}SY2f{3GCBg=ChhZ>UF<EJy(X?O$u|R1dMaclx7z56n2Fkj2H2@iBrIP
z!>PhFN_%`fs6ta%Q%-~3NzKXWds|7f;tS$Yt39UdYaDdn56|KOIBgi&I~BbMryy}%
zyEh5^e)XL978fpT7!>TD7gYhWD(0vOyL><`9PAJvc%jok8aaGfp@c$d4Ck3fV0li4
z6Y2yiSaTtORaOx^WlV?-m`p1nz$!Wz*`drK;ZvM~#zNhphdi#04g9TwOckZrM65zm
z9ab(vC)2%=W6=H?gE?u(_T(7u6wf>Up3PuQ_GK$3ms~CzqEg5NG7ZY7v06Y@X^M{8
zWI|?*xn^r%OUC6^Ve*aVvUOmo@s6v?{MpF1;MH2mp1+%^IUYKO_uN=6mlrj51j<sC
z9&y5xze~%-g|{H2Wip`CITU>8K^plwCr#kE{XL*YGlg>XMRSWuIJZRm4{rEeU{ENT
zq_AMZU?UfLv>o%>6#ZzwAdeY{+DG3#6ygE28Yug*lOz<B#Cr-K79cAjT<}ZhY?PL3
zY{W@Z6!i*@67#N5jkeNq8<o3)+L0&ctr|cobg_#sAi<)vn|S4+o=o89Pk0i3<K}Gy
zu4FQ4P}9e2v~|a?QH%LF_`Xf#fzFiFqjV&va5#?fQS$^820J`zyP83D(mvAS+^CTq
zMVlPp@HDV~I6fbhFWsaJ+0ywrh4D5^{C^Jx?$sUYHK}7<NOc3)0Sj}mQlK%u$^5-&
zQc+SuO`%-=<Q6rX3xsiC-Hoew^DYegh08G$GO5X1Hg?4?(boBY3|@tfykH40N}+O0
z4i3_e^B<JZ1)3d#D5j6#^t6w|!-)Y~D63fy#^8VjHz7@SWJy>4&Omw1sf&?J>~%8B
z^QfV>9L8Lhm5oi3#5KhwoPyOAPL2usx?W%N+^)7M89NVW{ug@IiiMcKc<*h#`SkwN
z?H^Z{X^`AI`-WPGZ8z&4WU6whedGSA@#YX-ZVxS#MwYE28UZsf=5TuE*<M7*Yx{3D
z1C56)&s}yo)8`u54@lgQv|<M4h%&S!IdG5cY)%cz_h{4PJ4x>{J_Ni&z42TfJ8nQK
z>qW89*Yv6QV(SNPK;yqEuBoeH!YJ|}a2tB39c&yXb9fam?&r^%WA_5;dyjp>^c13t
z+Bn+?<Djbf!Aox)ck`}BZy{K`w~#0e(F|W_nT2L^-PHErz^B_DSJ8(OgUbpZ(yX4C
z>-I5)Y=zm6py?JzoqCD8MwC`>s7!xvr{VWWm%T*HUFn}=tx{}WbA{f^)XxTZ-o{mI
zQyZoSpy54ZpFM-b6$g0Yu7(+V>2nih-Yw;mA@V22>RXyIZ%L7)W|7t|Zj%jN`D_L`
z=2d358RCOV4cufuv^qtXdhZEj$VH?5d&^BJ*ya-DvZ>_+W&vy_aDLoO^@eVlk{Poo
zX=bfeq5hjn;;>51Xm8x>wE19Amc~-hl(;`y+RZ-RmrN3%4eGMLMS7XS%e0*noxmSz
znS!#45^~KA!aplxAwnGK6eR3&R(SmN8?+O0Z_+if`^6*u+|2b|uHMzay*O=(Jn5C#
z)<gLJD&|LAQ-EA8K2X8BuI2@Iy~DuRIB<o1G=1@+-^~uFx3h86%3?-4yIRTEvc{So
zI<8Jt@AhxA8C>(C5|ld;spq(2cU)-)*|h55#wE&jU?K?Ta+v}n%}5;HTg^bICC^$d
z)RVf5J$nWnD5^EAk*Etk@d%uPspiJ&2GLOphd0J*fil@L=*$J}US{X;@~8o*HyhNd
z)R%kGPKZ4t(`*J8zh8`ot51{p;|dXckg#6yYy}xJm{L>G<cyjb3Nfmn+oI*u>a%k5
zG~q*z0xe!{Yg6(-p`!dgIG8-LJi$4<gyVYo*hQMU32pSX`(0Cyt29_Ggjx?QTi^_i
zNWT`~oIN-T5a{|biulGY5jl9hQUZ5xhZ3uH?7Z6Lxp(<Hmqbm}^p5<!HBeLF-dh~(
ztDT8)Q4{thp=$_t(KavU0mXp1S_CZ!Lif!`?G~eVDQVxmhs_x3phh>*Tf^qCf&=TS
zcCv>wuX}a(?j=kVDa{|HrX3EqCYENfYKc_9+s#CHI&Ctq>wM}9z2~))q6cK11U_#z
zL=l0H8x_UPh5HtB&2W2YyYa>Xm)vqDz*xsVtF%#?<_KoP5-q2o@vHVwhNk|NTY+|^
zawymjG?6gVY%QQF*G%UIDhg^swiUPW)k1e$OUzKxA*cG*2i$sYNS%{b)p9k3tCC1)
ziJdkm;yb_Y9@r|?SxbkvD|O+1OcuKRo?p&iEiM}w`A(~%eU`@NT}zEY7K8_nV|}t4
zQE1^dFot(tU(h@rzI4&T!AZQddhIeajkwyizY!fYliI}~U|>yGKXI^-4jpwXyY{)0
zo(%^FepCzR8kk#C4lJRD>~xJur#!Z~?&+NBtLW&lbF}x@*duTG*^dKlj$KC#xWu`3
z&?RSZG*C5M6%4stl^}iD*bC9dLEa*HdUOAB{`D{Uo2Th;6bt}$km@X@#wVgprV-^{
zsb1RA-=6M8|AB>{uVtEcL#B(Do%LQ1E_y>$Z1`#8GPtb^3i!9>$H#8QO5!(PgF@Te
z*kdno`*M`t#!w)J;Wv4DW1psQ5c#_uED7JL{%iC<y;V(b+b|5h`&aOgLsD$bJ?Yoh
zra*wMX`8gbfB=Oo)3GpF5=1ISw)MXcmh*)!&AP6bZYIdb_Z~_3=+qT1NxBCK9KfVd
z1i8`(ioglaU~}LCVZ11FYZl;y{3d32m_W>L%MM(MRH1<z%V?xR4@Y^7oKaJAC~bMN
z%)hig!sS70kk&1{niUMfWT2HqLkP;`)|Y~nH6Orf6ofEWSjD=l;rZZtJgA`}OD+UM
zB?vM_>{S{VGpH07z_k*x!Ak^bv&gucBu11-PRO;Q>A5YPHE4KxZVg$D(@|g-xSu3}
z_N84$nv8yW9kgzW*0KJpi=Pz^4WrM6#C|=KXxauIC^+Yl2nmGNU}JPOjQX{j5FCTS
zYOAu{=`XX+MBu{uSC4I7FtMo;1Y=nQ&EFA@3TD^qcG;%Nn!^lFqQz1RqHWHqbQ()E
zOwdHu5|bZE&DnW17mTpOMrh?5M`LpIq<#l*=8=OpFt;jO#<~q)NVSrX2P5k>0>TYq
z`z61(T6H2yLoW90LT15OE|i(Y=u@(@(QLa>rw1?f`W>GwNLxC+SZ!~82rFh4LK%o*
zsaNdBt=}@URbRo!leI87J$=3yTYUT5(%$Iv1xo7$W7bZs)zHdT-*5I*(FU{AgBtc3
z)RJB<G~s(_ctD?8QoLv@!_d+=NBu7=vBB%~>Z$IgPpI==?_qHFc{CnQzCPaG4+oR}
zerIljLf-ER`+$EyY53vay1Nr-@or!jn1<Q^n0VzCqc-jO2V!PF6{8oaMrf5tBxXn-
zAnt*6bvnWEa#W-H$<6)b@p^Rk<<r%x_v6hB_wj3P&0wXKK{#%Vc`w>e$uF%}ZBOGk
z5dNNDF(;wh1Qqz+Qp#I7A#uP$S#(-f$W11VwW*!8o%X6@|NF^y-s(1OVK<*z&&xB<
z%y?`c53(flyrX>&_F<Gz2{BC(sDz9N1w00oAUrOnF=q?NNcf#h@X!OJ?}q_gkugOE
z_go<hDGE4_&C02?Hisdfo)r35To`w8o~97;Y$50*Q9xJ(DGiZH1j=GArbJQBI*_GE
zB*Kj1+}Pb*Ukq;_huW2iQYA#eoJfeMRDzCkg%QlDN<e8QlIJ2s2zg{8KJq+9rYJKK
zR*YUQ_%!1TnR>b4O!5?8?sApos^@vR+@yA8!c-^<gX(|pqlVW^p@>O{JzWozuyaj6
zOo@~ba{=5K*aehj6-EgP1R@Y(IzvcthN;w*o1qwUN!6lTXu>`)jh1$Sap0NGGGy9W
z1iqCN7(t<KU0@duX5de`z*YI8sWbyWp_3$C0RF3xMHo2-5sveT(VT%#($p?EN<VUn
zstX4{bW{zQ7N3$_C0y*>cSjx>OC?BH<PB`rfljj&r^r;fQl;Pf&jSF+1f3D3J5s@3
zmCD|dtgV8u7uW4zEKEW5w-2Wo5oD_UzA?QK)_ygju5VpRTVC)v!*X+e89tofJzkIg
zfsiw)h^9oD%PMf-$DFr78~6xAE{NVw&k3po1t<>XB1}<AGC}G1Y)gmbS?8pzLA^jt
z;30x<R22uki6V?io+{UGN#)4aA|IzTgg9rR>F3v1lLnE8${#Ej5BeZ6jl10{Wv{n)
z4}YKCbZj~rtosm?RAL7PJJcBZpu@It+3qn()Klo-qzT`MWiV(7rsq0n;xs@917J9J
zlj8^N_6H{t)n&=iujv*xKUaHIpvnb<8K=?4tV?W!utUmPa<!i7Qgklzq=_7KTbs}U
zEQq<dzatTKhMlh3MtaBkxR6xVHbK|4@@`}gPL@o62lp>!fBR<ZnQ67lzA%d0>RdYy
zx_W+YWa*6T*4%y8ht1}^x%>3<)Aeu!{eJ(wSe5|356%7>!tqDo79WND72HdGroRvI
za(Mpq*H);HH04}Sg(>s(4UtXWs6s);DZ*ZPh;{4{Z?8kLIwS6$M)yynVkWn=u<`9T
zJSmZ5r}FjdJIVrV2;EK?hVzs%tWT}?Goms0e^B{ag4C>nprK~SmlEj1*Xqx=`rIi9
z+e9rgYzYD0mRBFnp53MUo3rcN-m*76F09u-YmS5NI)q*$kg}s_BOG^2zqK66YXs%)
zSS#5iHl5yEjce(8KwH?Y-W8S#*l>1I_UQ85bZcoFac${hE|7!?)SUoCR>gN6$vIU<
zS(nBY>Mzu98Rt^!l&ia9)ND8CuQ|Z%&nm>m<)`_L1(NTpqKzRvoIS6P=OfNcA8)0n
z_j&fJ$VB?vneI-tQB$aASHz!}rkB1?e)`m@hDp$D3RpYFi~|Xzd=Kb*yMB?_7u#W>
zwsq)L5422hg`vKFR|Bw&(vH9?S<c`Kdfrd(f6Z3WZre5#eb-l<2S3<BnlxD#3`xBu
zO`O6&mZXW(U_gL@qOL5W6seMw4P)KE52Pg9b!^4yFkpJJsB`Z*_gr3@?|&<@B8v8R
zBJ5z435!%ng0Lu<anLDTM!28lsa7)-jDKNc+KUkIUEaebiv=m%YDbC-GI*bcl~Y^A
z>~Wp{TH`OZ3F*>ON^o7wj2LGQOeK(lld=S%Qf+ePgjTyKBr!{v2%3httKs?J`hMV3
z1(hyi4pU~42<wc9OGgQ&!ewy2601wY30x;Z@qQF3mXj?QpI7vBuJb}GQts(oE2||v
z-IT5<-ANRcwheX}WI8f+!2Erv9GR4HI`OuKx+}!|gLl`LBNhvJAt@*2^~W<XDeD+;
z$*d*YIDX1Xmua)L>-*7yWJN{vR|Eh>8B4*zwXzPM2X`NC?uVm4{`~YX9E{M%!O=+@
z?E2>J_p>YX@zY@|uKG1VA4l(A0xqKu4u5HdUkpAxd_*6IKOdb$&w)1&quYnkLgm4l
zWHsjQ?9u1h47j~I8(yQ2cQsMyt$%j#XoMpRhMcTrV}jG6!8$m;SHl|gX~7K35o;~c
zQ8bl85gs#g85tkRk^~I(hm|0q9MI8)pAU;O#KPswe(`hKEOxb`W^OC#&}Ly-RTNXs
z_I8`(YoE7%n|iQF$WRjUS(X!+g(aCDAAj%ew|aGTbF5Zx$dyK6qD4}#?Js+tmWumA
zF!iQ({amZ@H{r;zSQ0w5#ddeaz&=tYE$s%2<_`7ow)fh8h4Y9diCuI7%mo0cWJ5Q<
zWBo7t^1o<{RBesfq67EjsxxpxCe~KCSz}G>%&eBOgN~#L$saAolKb2U=myy#-5S9k
z8^OFZhLqb{crE3b@>X5rWnH~v@91+$cOkRIv_3i(iiE}2QjkOU&DY*uE0eIFJkpc+
zd3q&F^+M>rnY_qT6+}PIG+U<Iif{JsI1`G?aUgq{?ZRU>^UU{qLR=f>|L0T5#+!D_
zHXHY%$<(b5!g=Pl-MgNCb5RY&#=>5scz#9dZn`p|lQwH>s%V<kj9`6S&qE->3CgLx
zuJN*x-Z3`c-~NvN0i9NDbK5o&{;prKnbVY{M;2|@NmIG1?NgP+Gq&ZC+@_hRRY7n`
z;!FV?0F=x-<-gwme6d7ZZCZXI3G6=m_Ur;boM%ba>G%g7IDq?vDTr8#z!YReY7i0V
z1YuSzBf$&E2z?+i_B&wZUFyL*5-{X&Cp2=(P{I$9UAa)DPM?b9kCps8AuU{#rzud8
z6_Uk?2Es!~8AYxT7>|Tp63qnfL6#y>2rGtbt9N}h8sE;w2FiM=6QW^F6ogD^$%0&C
z2y3Pj&?XWka!C=W2(8C{r^Cq-RYqtN(R?J9nc&Fvd?dIMDb6Rk&T@U$>E!Cq#Kw;l
zGvns`imyn@!b=(FOXRxQIQt8PcQ#OsvNGBHUvZ5xA{5U|VQl7RS|VANa<G<6qp}$h
z<%$+SAZ9D%psZwFp`R6raZvr3r(0<Zf#Z4y){R7l+;y@f8~DD`p~$t<1841c-dTlk
zso;-ooj-sQ4kk>(i^_Bl3X$7&k}6Sd+H(CpH~fs~#Mi<vCHtv}jW@*UK}1r8PflHs
zTqi<)H52^~O^H&wImJhfJXBErcK+8fUit?IaIqp1BvxEH@a;w>*@|d{ZW;1frxv$w
z<5NZ?Sw88#_*B~F^Rh}_qtOClT)&J_0<BO6LNQ&yeS+}xm*NUja0SP@lYbdc|2>&q
z-G2fqxYC4c1&mi=H^lQ=<^v(p4L4o;qWKW1ki<0K#{_kP(h#y<ge5A&LItixh=c@^
zYjGIos1)OI+t|KtC>`iV^+qKKPYcXOM6t4@OZJ5rkv!FH+}dnoT_;kk73^zg6B~z!
zNu_~Qn`TaOp@D!zl2$dW04t{CLCPpZIj0t6v9NiUIn{2rZWvSDtr`wNVHynvO|2HU
zlj+Unbq~%>A-3~91QTfw&i5s4J71-68Fxu=^RNiqS97KoHT7!0JlJf&DZd?fH5@{W
zx{+GwB6||`wgAmzb7^~fUpigKP<5vV%eLf*p#oAj1W~}WYURD}nC`EhFP-MIYv%sp
zkCp1M)t@b{o}UkEg@mY)NQIo`Stg`*y)BK5NaT7j*r{Aotlk!4Z!6iAe_x(WhWDt;
z(Ot)<HK7THhOPG0+DS>x=zg255_K+ldtAKCxfpc`>b7fNq3on>pX0U3m0;nnIVm(!
zlhMXvC_b7q$~C7lkD*(QfF6|m<+x56$CsGc?6nA0LqLBB^Scjsi}B?8MG9O*_IPx6
zV(K;e+m(%?G*`*4<leeXZS)GX%+YwdRYFy=MgcV(V*j<bmv+TQTYF|~giMhj#n51x
z5mJF*2tlz0K4`(%D;hIyF#1q{8B2_ZVy$`*ASGtrjf!~9cn@w=p-uob1zhH-nZ%jG
zJQOvQM!961qzYDyfVmolkg*I^50rp4+B016v;dkQeXvd;Uok1T?ZK93Q;bj|r#Jw6
z*HI|vzlIp(@dv`g6y^L*3W`b%26e)0PHO!`>r4%NKV~|~19MpWw8HTpEzV(50`2Jq
z%dM|1Pj!m`VUDXcQ}|buel{Wo)?kamz7Ow2nu>K34i|^kZePgQ-=Vrw4prCfE@tED
zFXQQF=XSCfO|B<X=QlV%H+_qI<vy)?-sdB`<2cVIZj}TZ)r*bc`|uN*s9>oI6*KKG
z8IRZY_Dz(^msrjpW`?iUMZ>4iYB9mLp+bS>(YF@z0jQ7?sZNU?D8xT4W%I$5%2D~>
zzxn=X_bj?7>$YHuXkE106TbNdUd<U_5GhGv28<SYmZ5a3VdFJvyP18O-H&e^&+EZw
z=jQ76{l{-l%pKBxzBzS%>sh+|{Z!iO&F2mbheMeEbTu81?kCevi`n?@a(a0`nHn!I
z6v^0PU3TYUrH_w}78Mm+G3~K$eA{pSLy@5@J*We|A5U)<chkxH>E(^%?Lcle72jWN
z$y-txrLPgbyq#T*Cb!Q;oyqO48zaHT%iPFs3IC%Q!+aT(*j+QMU<l8OT)O{Hnqjtw
zs0m3Q{CZ}Tz3T_52>kFgIz9dtBNDw0$<gU+`kDl%r$-o`9>2xt=p+n+lea;1>@yzX
zWB)(uU)RU4ziXehnZ$UpB$_6!<Nxluib_Pjc{BlTEK4>keR6WN$#SiWjeK0`4dIGy
zs2%H@l=1x0>mPU<w|{VW^7@TyUG&b~!+@f9?sa{qSLUlZ%f58}4~0|hZreBz{I91N
z6fPnMs?*<g+$2q%YYu4~G{GGXFksNs%HowG1#)G_IP`(?9C@(=C0ViK=8nIl<$lc0
z3{TI>yo{og;|Rxi$dyN?G(mZk!ZB<H&I$LMBC}?LQpg`-NrMP=ek}XA5(`BJcb3UW
zMGmJ~9Xa<+%|P1XQ=5NfUEMCLw1%|h#;Ik_5GI9Il8h%PlUY{?R@NjaH3?5xDO%Tc
zH`kYw+xtmqRiorwFxJ8&Ri2$%R7@$>igR$-#M{bAg0yLk_#}#qD9D#Wb{owuZBbf7
zhG&=7c&lkPt+=ds6h)Q)ue8adq%y#qU7MBAD!p*asvyJN#pr)JT-A#*xprjte{Gmt
zCM1o5Fg0@*_*`WfIZB({X7wLLrH3_oQ`4h`XWT;O!uhR4=c3}=I{g0p<es034Ze`8
zynlYe>EGn2*qo<zfVMiFL{bay@!(WZP}+=bhteaHNj;k1=${AxN~czWgK~^sAs%nY
zEIA+T-34{b61_#;4PzV~jiM%_T4*JaRYnHRFrQ0nJiAJAyx%dwSshrBTUf7ngE2hm
zY&iU5^8NGl{`%ps`R(-kw~Lzu3u`rcDM{-@@WdFI(4G>Uy+t*8**1nTOr>?d#@Fl^
zj>-_fpuy=FANxDk;c)Kk8iv+*%M-CLoid!oNAKSIxc?6HSdwH9QFA0&Z%~Hq)QZpz
z8{jv~c%KfA63pk{CJ$eyU*_{<hn#+Y)FJs9b)ThhWOz8-W%Y%?WQU?;hk%`4z3`Ae
ze0o`Xe4ueVt~P2o$Cwl)EAnX74$s>WSI&4S_K?;v86LFhC%^PTMlAEVKWwe@N{e3G
zBfx18HnR?Z9~v&422I!Htv$}$yp>hyK3Hd&WH45TH?@B{#T0LyUXb@<Nn0x#T5DzK
zwWsz`4#r*G4%pgv+xl0AJE))CeZ8AcrZ>NI!)s1_wealXy>Nn$_;4V5e@oHN=wG#1
z-*4MC5PsKRaShyB%Cs1Lb?P*QmktHmp=*QgAxQ(8I$1<0QX?t5!IJ-dASKGOBs=c9
z>ZOi!Kfn8UckHXzMOFmC<T!w1xXhS_lyL;6p&-hDOu=LbpYQWjihC#sy(3FJ3BbvR
zG=jHe!BD_QX;4sx3SOn|&AG00PN>Y!YWcTPIdf^rIZ#>LE4IuG5Rm|96op1$B9$s9
zhDi}a!I5Z$6~ndDd;e~J@yF*2Ysy7wGGbs&G$c$L#TKQ(1lG)CU~DE@mWm=!nYf52
zK_Ezux*)X4=z1>mLJAb-dM<^Q9IyW@QCs(?K~U;_f*0Q?7FP25omdghk~eBu<|s__
z;nV`_GXI2yLXE;`AV4$8D8k>hBah}eDNQET!H7-*%8Ax6cjkQ9fZq&?M1y}3{1X5G
z6pF2gK_E(zdl*$Q=+mul3n@8_@{${-ks~!QgOqTM+hP`Lv4l~fWL{XAF`U78SO%4n
z>H}&`mS`ov5MCl2J=aH;W2^#hd>S}q2bO(~;k+P<<lfBCGxGSsWwrqmj0B?Z>_3(<
zrAE~;SphI?vPK1*NzSx80AxiNCku{s;q+jP4;H)!Cd@<1B{2`ea(t9vN=j}jgZ>X9
z^cs~7QK2c7sO?QE0Luku6w*>qm(T4jl|ma;QWJVmeX?<<n(;xg%)tH~Id2s=?88zB
zpLs)3>w|qvrsNs~uHpK<Tr%1)JRHxr$qad^4P<16Kn&RPYv844e1qi4I67?{JO<6r
zf+!SbI&CN2%GRe4oo-Y{_Nf1Q<|{YrP`f3f(R{INBSxyQez!#PTV-?eDT;<v-;_pD
znHL-lD#v0SHgHu6k3ANDa`n}H3Z3k&`4UY9s}7@SRpU;zD&lmK-xbAYG#c8cS{8NR
zao@ezUm1!mG224XxTB;>jH_?OCJCTKzyfPNW70Kv-i~r_!WzwojpMM_hoUKHLky!G
z80!4DJ62oqhe$Ap_EV)^XJ|64=A6fgC~O0}zxYhIp@^ogEAK6TFW-K2zgr5}km{bD
zN_8+5KRT7r)xdU_y|GmG_cC#R82^bpb%@)8=?T&_(`)2o{;qmAskjLTc|GE6M)g#K
zmFp7S#4dX}8L?YI9elwF#Z2-96@<@q<Sbf0TULJvt&7%74u=Ny6UcRD`j+ZXK5%}$
zX!EmgY6_Ha*KfNCw8q3h>vSUB?D{#kggc#Q$9Z(3Oux}u(v4XCqCG{r05oZaqsks8
zk=<z^+>HFKfa9%@;>K%tpxbG`)nGf{9oZ)^&ye0Z1`^O{*B!fIQ<>+aW_M4^?Gc5-
z<!w$3&BF2I>($rz=9lpGG<H9t<I!XsLruI0n#^qMRt0r56b@|dA-h)YP#1~`lZIVb
z8vI(*-9N1jq$!t|pEr!bZv~eLhU0iJ{Epp6K(28hj{(b9&AXe9k)U5SPo7J~^4xMf
z9E2;C3JJ|x%<=w+hS43&&S13Kg>zTuYIJu4Gcbzf;U@FdAe4LJZ!@lyeJAPtkvrNA
z#XVA}OKyfNZd;{o9Pr*DQN7y*hr_+zVP~`1o*=rxTv^zxmwrHfv<49K-mj@Fg$cdc
z2+rW;|8Pjgm(?s@u>=!;FJT%;zF^Bzmih#$3!Bbl$rHQmNrCoKWN&aM;}}?8ABrQ8
z3XaBclX`UMNvq^xRxP@>8i}G=SYaH)P<L!2^K4g(YYVwcEIhNNtGpdhyVh0Ws(v*<
zD`<|o^~1DA6K>R84mUg7*)DID+QF1*+*fJNHfh3(7x0}iwc>G-2i0)U`A=x#)ww&2
zSCfhR|0ZI&!H8k2W*?8i-Y%IoC=9>%v)1ldwjB^%uVT|aRr~#`I^ce`zi!Qi8po;s
z^>k-{VjlaYs2{{$)3q8cmAzYs1M2O&xZk!OgMR^yQ(I5lFcf~zulR&2nxKxpQ_4Uc
zNJtaffX8Z;>z*_gj-A;Kr5pY4lbs7`3fue=#X0A@os;v=MOH-7_$0y!9y4K)3P}(a
z1v3shh06#J+dS23i-Pedwx-hvp+4pbZrD<g!Z+<maX|*>X}GzxRnIBc`9)oSqfLNI
zODVy1u{C0yIWV<?6r7YL2$gD+Gbgkfp^(HZ;aSio^nJaZUEe)id#Iq&Wz1p2ELOrg
zBbKG36*j_UaNdd4rQrmwS3&VOiWJMq7L2!!<};laT9I<|nO0Uyntw0Jdise^CCI*~
z!jL89EEu+A$4cX8UDZT!$x4@L^WSldBQBY>m}!-Y+Hk`RdU2#y7R^QUI|6{hh-c;q
z-m6+;;7mzZ%5KQq)0$o;QK$-{{W-y9!3@jW`bIPA^O#ZV15Sh4C;#wCmzGQqWvR6U
zFj!H_O6kx=Y3^81<3S9$(x?%<MrebSNlPE->iNJGOn5qtoH?EaMMqn*M>Ro>Gp<r8
zmr`(~rQ*TJV!^et&XnB6ednXfMeAW2^o>4LGR1KGV>=eZBv4gj2&BxAa%X2<vJOi_
zkkm8rXW)18)5Rgh;T(G{mfW5HDWv#CCay2n<i1oSoo`7}HSZ2q;Xcg6hA4Z}Qf>d~
zez5hrwaLCuc?Qm;WJ^iCj5;YFXpWPPOVbANUP7G+tEGAq6b~v3iQiYm4dJMUOgdux
z5h>!iunWHfZEL@%!&8?`_P+0;z1O<t);{`0pCb0)2?|5&MOfar(lTl)lgWXm@NZx`
zoxbhOKSkmAc%S>PD(l|iuwtnpUSB_g*fndki~a!JS>JElHV}UIUvVqESPonV-NPQz
zI&R>mYk{`g+MrJc44OXKL?lursr=Z||9v1SQIsspPSRn({9?;K9>4qU_>nxnnr54<
z*E>1x!7*HJn1Yxk2uwjnqy`a#-XMIrOJl+BAS3jOta01}Yah`eyd_J99R3g*Ib|r}
zRcya`t=yO~73o=F|5ixrF3yt#sL1XlTW>TFzJi2N<O+fDSjd!UCin=l1c^epW_V-A
zeRw~+`1Iw%xUwkqhG@7U3RX;M$(Fgs72Ghr0c|2tB9|0_ij_rt((7@OqRI&M5zS{J
z%>+lT=QF{TNO1mVj>=5`ve(O1m*K@N#mrdF-}7sdu+_O-=P7dSe|UMYhYw=SXfUpK
za%>s<jG07*Tq__@A}i^CO>(^v^57Jl^k_nq@_u@M_W%Gg$*ze;Fck7N^uKum!e6J1
zYv>cLG0n7s3Gh5g>LyDe66kN(YK0so5R*jVZi}}hNtT3O!34C-8-~;QED<V~2z`=k
zK}DJ+s8P<ULEG~OgKR#C7P8gQMS9P;zBh>Ojm3SO2%@3C!kFZV-szc}@=VxY*zVdz
zs3l8NvP`fwIA@dQiDn7oSW#uIZ061D7+z;YlC(@r+sh{lE;k7NK?@-2%DkCnlPi?1
zE?xA71{=KP!7~8XW%)q3x<P3?O4PaJz+&$kkZY6*xX>HM*TqyPF6MlhFbZ+bsYSL}
zP{Ea!In`0K;6?|*a;y)ncUQoc2(#j!pLqr*%{mT@Do^!nf8R>LXB(@sk$$UIUq^gv
z)aCMuhNne94Xg!&4akRJsApp@k~hx00@B88C%6Oox!IuJpsXrFqRNEPb3%=#Dd2cx
zYn^V0B-E5kH+rT%mg~d7H@G{2`qi`x>KD{qIMqhv$*O?cf!431aQe<j6zVFJ#?rTm
zA)3+lY7Ql$A4J&7!Q*q3=1Rj7!Rhk8yu7nk2PMThd}K!Is6a@gFNdVT|E4!m+$gB;
zt?-@$HKz(QV{LCShaQqBVQ{SWrL<rn+|YI<lf@7fgtYEu!@$<OENoMP4dl__yd=ZR
z93`9!Z4htAGad{p>HFSm7MI_r`(>IQR8}F4K4%3SpS4kyUtu;mw|5H;T=3`3Sn3(>
zF2C~d@PINbha6Up`{5QF;Lg~eq!^7TU73}L_Nd0z@yZW;V2Xb;j9il>M+I?lbgx&~
zz76O+wEk*6nT$=DMrn>m%>ZZs+6B{eGV_UV3C0hfR-dE6U<jwdNo_~w4~g^fs<SWO
zZA5vN>~S_n)g>@<rWQm>au=1xO<5_vuc&3}Tq!~Q0GNXHut-s^F>;@;@J@M)QDNX7
zgPBg-e+W|4Os@+BVh+&|CTAtOK(GK4g;qNY;EXFxI7Jb|{8Ex@l*+KP6=%yVCDYN+
zN@W#teW-aAL!8Bo&<!@C2n((<g6VVuHep)Gg%<T>jNA!7&|@27Gun<ws``bxn%AYS
zSxSDncwfWL)ox1P&+2J28{&^pfLWm0Q!`DA2Grwe-7q`X@na(>om__FZ5u?HvHpC*
zc$RA*3P^F=x9yAK_*j4^9Q@i9F;F4hF0nG#9hI-wZVP$Zp|YJ>PwQ6obg9P+ID@%y
zzTkPfAabpuE&b4vt=A|QE7Ovo#GOcr4#Np`9gV>V2EUGfF>eNu3HRC0DjGhsT^V7B
z<9D7pW%w=K;c8^LwpamgvxHHmlRLZYk*vmp5iAxTFD~Ex{${bLoovEL>W7=7Bj@g?
z$)w`rKRR!9^)X-)0)(mi@-*1R#^Z6@j@Pw)+vPx@YK4^b-@M5_s{Fo|Zo`smwq5@J
zHCH6J8MsSm^=*|=|J`F!>NR?QQg<qHmAHdd*w40Cc~f%B(mVy8r%RMZ{K}4Dv)Dcv
zK2juH8M(}P!cu11xBEvPa{AiUkp&i9Tehb%#lhUry?1(YdtQu+>b=pfqOa7*PkD3{
zJiLMzyX9$DP|@JyPTKu7nm{HL)9f1EQFotORgGSc?y<%CZx+SQG7s}(uN+)=pEP`s
zooX7if6J9u-T>Q95`j4-+~vW`Wkia$oH<wnEjr9X+6N;`%<L8>)kf473&yX-)z&l*
zQteM3PgJRP1#-{Lvex?!hCNBjp2#Tqag6S)rGT}AHM7FGi-9t6zJK8nNTHFMx)1su
z?yhEU70|bD%@%m!&Nd5%FsCBty12!~EYT=yS32in1OuiPj<dnAemB_ey<C=mYaG;e
z@qdEsBjBLQt>$k0#j>Yn!@pws0i@1i{oeZrby8hV8!-@kzh5zxPUH@y@J>hqLII&t
zgcACIn(DMTdlw6zZP|N-sNx6pcl3`{cgJ^IzgYI}%+8E`IQ46vB>TGwc5%Jd5v4W^
z9pNbmTnSk-7TdaXb_-AHjw;?u(Di33$0^-vwzzV_R%s46EW4Yd*kksTt0zzWr!I7K
zWn&DK^V^`SwSepjMk}_Fp>63xO`@G0!W*W@xYxYta2Mw%v&+S-rRr45ngkn)Sm`K1
z-!{T4Y_zN)t&`}Qpcu-nI>q}*VyWinNxe8)p19gO%T|^r&PHc=xzLp*Gv})1+>Y98
zI`K!;$l3**h2Os_rvu|kTc!qwW*hXw!%@HOwGJlTIAthC^n72*CqEMa@Il{`FrtuX
z1qy+-NNe(=q^~!(Myuy?*;v(vfr_PPx}=&jZ3SuU&iMhRt$SN_@P0_UbcyWKk{^U^
z)Xo;h(TZ2uz$+_ekmqk&+Z9-vU|}0$MlXfO<UO5^ktK_4%7cSe^It4!z!;V{SkAdL
z+-aXZOL&<*dXG^UBMqM?6-)aHLRMn-v8g7HaUWMvY9k!7R1HyDWa(Xw@dQyq5ru-p
zqWuI}dN;&iaeg+)v9p6u|0@@Re2C@oe13dWoSt7?&*sIq#jN-;yZIpD)%L3pqkYx|
z@z2bjGJOSpe|oeZm`>kB{g^x^e*l$JU2EGw5PZL1u>nIQli2h%j?#chXrY8s_bm=$
zeOg&d&UfPW<iwQx_o5F6$#xp52O;ieXJ>X+*I&z`RBAd_Foxd+3*>AFSfE57z~vAM
zg2ir=JG+At^)s$%qM*S?I)-~(F<JQO0$I)E;W}?lZl$f6Xt%lP@b}I)ba`bAXjkq$
zuZsX^Gcc^l3IW^P`3(kk_5w;nC<I%km!|H=_xat!;;yD@RE7cryr4kF5<IV}KpDJn
zC?M2M#8qAsXqPpLr%GAekd&z39WCc>Q#wmFEa%ROGqhar+M@YI>zZ>nQz~bR2DCvD
z7+$JB3IL$=yv0C(-s28N(qO)!%?x>g1RkGess&an!y59+>e?WrsdiR^uXKpw2GJ7M
z59bgq_sEo9S%O68rMAJOC_AguwvU|0aj&dta}0`tuPC0q!`@W;J}JvL_Q*$U!`{vX
zXfy^_h7JtISFm-Qolt+qA{3%goyFzNa4L@-$<vYeQR!*Ru97(#vqJq0NoT07NY@n7
zqNRyCmbjbmV0J9&UUGCqdepXQ{ZFNjPmmm|n+;grdIMJfLp!+ax#>HP-lOOk+bKko
z$t3Qg9R?}^LqAuRMOBv02g;)O3RcdUgV;QU%3Jto@7n(7!)DX*xUC<<E!#leqUjE%
zC)cZ!-CM5HJ2cX+vH=oUHXolYQg3Rx^Mty9Pf7p<MhwZ#;YuH_WP$QPueFpB!&#E-
zrCq|8Vg5s&USJ)=i9hg7{RN#=+iu%141M=k5QBkSkks32(p-uz9f}QU(QNHQTMUX!
z+rkvd&?OfP{h)over%9zH;&si!}MUm6iJ;!9_n<GXL%4r-2l4qHDekQ#u1o?oG1e_
z0h1vtcB@2+9pr@mASs>%;QiaQ0~ch;P{6e`C@4b(r-`>rbrEwy<!W5|Ur6QCC6;rb
zGT$kdW(J6efisFiBQTLjwIYT|(Sw{L(FkjX8z1-O@_aU5%v>su(qzQIhG>YHHi|8+
z!5B8oWMCW<Ev=#mRK^~06a<2-Q0Ig`GkQ3et6T~c=HXllEjbQ@!0I>7on=KtT<yan
z?w2CBrube8gDN2ukHuVB<ARE<78OKYU&kr2CX)(2so%d+$rQph6G$wa@||Ma?X=iV
zTrtO<IpsuaSTK=tEP<cpIcL;Y8gOe+#2U(@;Aa2;kSn$(2Eo-<q!6xAY3DtH*0=fR
z`PJRLH9T-!O35K4*2vkG85n_47GHBwRtT4J1PS5VF>^kiom*X)Dl}FJ2wfvfV^k!v
zOU@`HR!|RJqq!|`wHr7)1JH&TMtxjC$t|C=Ki;#c0!kQe)vqrIJiWx2FhO|v_g}!z
z%1X5l3wH!~t-jA8{{p=UKv~hA910Uc=Kf&>!gAh&Nkf7VN^d9~Is;(BG*Gex+9lGm
z&7In54Pj0c3Nsiu9L2r8Dt~AA9PqSf7DaG};6}$i2DH#BxS0l`y^Yi~?d<!~)lWts
za04~{S9nu2bF#vA2PT8P#(NFL)WFr#_Q&;(HhNWyi6XdQTMyT2l4AA7R(xWnb53^E
zOZKkc&yeTunkvvG*6{mcc5^$sxo;7bu3L}y?;rmPki>BT>@5l(F(H<l@+o*xnw}r(
zPEBx!%|4iVw~X2~`X4GR#9P1lhzh_D8-J0id3X7qyrQ0JF5Kml34Ew#<0<$9tyW!c
zn=ll8=U3cGd4MWyw%7DyUBA?6U7M}#o+3rYT!>X;Bm0sp+WOxo3?z`XA>G0gHuv0f
z&gBSm^f8-eo;TR@U=JRq!a^)0g0PS=L!e`zDZ>3CjkQ`p#`qIU@W2CC@ACkzSSV1z
zNE0e9(7;jbc1~@HIp8`ysp_w^aqZ$<O5i$M7?Df~n2JCOj>;kk6>F0+5?b{klgKQ>
zOyJz%Za$x1-rippt(;1lGJ-j?5D800ggIdZb3s#}!im+n;RswuPVvA1xIjn0^At<b
zW{fW#jn8$OX@!c$=UQ1UaePk;iHDw-+f7whP9>ok-{q9$v|N8ygeGPj4?8+sqs-8Z
zM@A<GtvzF=3sExF%W}0fT?PIN<qh`SySYHF4I{LmT?vo|7Dd2IJlJ9^kmMplm^$gU
zj=?F*X{rr;!I@BSrd0$-PsM$xRdkx9OvpL~1CNE44C4e`GHapK<7N&b%_OF%sNP=6
z?1QUVuDxF#06=EMj1jI^L$9=O=#^D@C<TW&SG<T7OeTdVGC3#z6=dLmB}sAhiahO~
zRFgSg5fl%fOBy%F;@X2#gOnQuGcBTOZ}6fNh4UMs&=-oJ$91lX<{vh)@1M+#AoMMn
ziNOpR`Qy>`XmWXX)3162K}*;=DL2Rn8@Vg#Q}z>%;e9ZK#-lYQl`n<!W|7|#*mtdh
z|DMg#rclXmL1<Vg5qc?F%M!GG2(^~bQ#hAGAsj=@q{TisGqlKxEsHW94(}cxMvo7Z
z+q>^yKizCK+y+Zc&@Y?r$d^=`obAAZR4o&`k#3QGpb51Vv?xO(afY%(PYYEcHU>0l
z0)k;Nj+b+|M%2db!fpLgjQlceQN8ZAyn;4R8*K}_!URJX@2zaNaJz85Jj?vo&Nk@9
z^<MWRR_z+7t^lk+!4O`Pv27|E%{tz|w_G5-arzaeqjQ-|d}Hq=s=NE*pBWb0vRq)8
zCvVQC!*u0x?I3PP)M!Fp{M$7Xa%qe<CCpzBp@_kM*FLm`vcwce9mC5%P(cI#nxVsG
zMdf5;>{<%z0X%zu0IilyZ`&{ohVT9rJoJzhL9<=^v1Th;tXQ!P=ngyd!bo&1M5a86
zN*ZkY?}KE!C<gb-Z7zu=@_iptAI|Y<Q#C~~-!EVvepDtvX)J*W(4ZG^B}heZy{k*d
zJ7`d?aYY9O<oJo2!UZl3F?@GItPFWLF7wDDv^fXL)gQX}3+J<38Lb87nw>YRN&s1d
zHHtV87%rW!QH<jmG?p+BYz%F4-qq#V`Pb|7B$X+pLV+y?&?bmC%P6E_Yor26l>`^P
zB2Z3e;(1Xp))X34cNN{7xw>&oEH`J4gR^vVEjvp`sU?~DTa+dWgft2j*@k@R>tA4$
z%6a%g8^iF)v4-Py`n`0l7poeL?aQARhJ}2Yy_42u|5*Gk006RG`s6m%C;<?ZtLxMq
zF=A5<dA<)@c#`NDHqPj7Y@WZHxU@z=8Cj)1w%L=^Azr~=O(EclrborYzJcy#j`r<T
zUgT^|kkN)I+3;$D-s2AT$Wl!#;Ss}o+YK!U-Hta;$z7>`I)G=jIx0mWfTs|xz!LrV
zez#IDhhQM@oqr34EHs8-i=NXic>{({YQ$o&69Uw=W0RCd6C|Ax_6lQ8e*=O}Y6OJf
z@-=r&%I*(fMX1S#8FbIyZHEry$FNSuzaoYEH4htLSl?YJeZ~w<`yovwru}mQ9Ic(f
zsX}WL6YOo!8ja$7H#t3o+T4<U5~zQr5X3+p45t@DWwfTJSwH8nA>z?srSqU1m!`Y8
z9%twx2MCtV+4~I>A8C4+haYT-s+>{u%%y6B2b{a@(9VZhTkZdA_edAC2BxhwOp`Dj
ze@JP2l_U%c>?s#HIlmv+pVxw3Lf!z4cPpQ+YnT5PjP~wzvUE#O<1L)PyP@-;H^_<x
z3E(FLp(ebVq%&z*lH>!;xG-!&H4O7=h*o?uJu3bd{{Y=P+fo}zvhRFFdV`tno@l`K
zIs33Og25g<CI*8Sn3>%Gf+=-pOBJ-L`&5+>I%|K##)&u|xL>kSx9;kTkTCY%^kAd9
z<~_4AQ@i`+q}<rp`ECQggNq3jkkK503MdJeP-Gw{2<MAwR<H$>B)KJH+};4aK1?Eb
zOGXqKd?+Ncgd&ICOpkmo%%1I}nC{v2Zws!E%Vv2FNl`919Zw_>mO@SwWCDS*tl(23
zX~AMBb0h-cj^bSJJ3e}IcyfNIj?z%d36U@-0#Yg@r=yv~6y{V;Kq^c`G2;nBQluK<
zosA7frYK61R2W^oDW+w?kjbkz1rtS%SLbq(<ExF0nRsZ`;eCRog7WH!-I1K82Yfu6
zB9qm`tF=!!n=whJxc1JsnnDu!)#*%@Gg*CKwecP1C35@Unv2a9zj9Kpzvlxl#vFxs
zP1fCE7yNOCLQ&vR5MGdxV%Yj?-(a3UX8k#qgcDh;1n7vBGim-kViI{ql9hlN`ns>?
z+h=Y*$3zj&46eEL^DeyLbUMZK^(@PfuXmqg?bVw}K@)Ue*WXsKj9Sa^=*{bHxIjLo
zjO4GBMbswCAO|TXg%$yrXu%MWSzG2zqc$7x<BX=2dHkNt<fP#66W&n<uM3vK?ydTJ
zRIv2>@s!ZqS;w7?Bqu_+)68LbFOj9f!l1`C{;~l8P|ij<O&}?lknsNCPdCR$Cx<u3
zhbKQ?yn`XUc=`O*hFQqz9gzr4nS@QsG|T)YElGgQ!t&K$)T^hk`9Cea^|yG&05(hC
zGWe?~ldzdnhR4Xpa?+ga5jWTz>2H`i@$(6j&6rjNxVh0Z;<H4Cy)=lI;T`Go47t^3
zQ@NC_J-rEr4GMbGO`u>14Cj5|hgUxwogKcpI6eFG&H3SngR_H+(=!+jhY(y{1+WkQ
z4Fh-?J7Bi<#wdS5J}Ly2i!h2IBe}pBlDuHpSXDWLFp6sMc6Q)b%F<#kAep8x=cE*%
z$Sr^<M_DlSzmjKZRRHERl@k>Ra3skD(-`IxloQlq&k+bm$cj8K=9G;gnGi0Z;J^yG
zT~oyzGK5gm!5$q(kp}fwH5o>*KLCMwHW;)dxkKGrK41t_%0heo7KD_^2p*<t6!%{f
zS=rI@LpU-y82EByFE1QRoq!ndKAFwhT&RzZa;8KIATUKC$QTuA35@b0xzzy`-a8Ui
zd%ou=XPm)ZK~p=n(<{*Wlu$)GZ2XaMP8P6fuMsiqn+e#IixQRe&GOtE722%0VK-WG
z%;-G~A%Gx;QBmZuS&}qWlS3zHW*9|6^udzPu%jUk4j94}6*n5Xuo{hEAN0`89m!`X
z{Fwn<R^P5Yc39GrnJhkVERm(JHU3dYH0GR2%$Z|W!jVWci#_^iy2O?cu|qws@Qodc
zQTGOh^JB^|T*~*gc_^vOF?8g&&@Hhyk3jvhnou86a>`^D2D?cyRe|Z=H)3~ZFK`C0
zvJ-=WLHU9cno~A@O_E!Y6EUd>7e(=!M+?bs6tF~w!7zxy_=CYft7+)Iahw)+_=9n&
zw5XWYv|e#dn#hOX`fIXAm=Nkeo;h3pj?Brakd%!>YxXclg`Zf>oC~~{4c@q|FtjFV
zO3E-}5W1NNhI=(B;XC+71aY-5ioM&r=Blzq-kPsxOcZXt{$PE&tZBlRTJVMezpjzZ
z3LQH@ZGx36tatsTA-OH;)zmk%ujH*h|I<njtaL!77pyLPw%fJ)A4TX<!~4Y6>zaRq
z-E2HeF(b2Fz8Y13?x{e{Xsh+R`oAw=*JeqALOcon;Pj^;h9DacM>$Du71(2r$kd>U
z9CS?ZWJr<of<Fz;!?Ux~GYjf`LM19tIi_D0&^h5uS)(U``s=~j$<fJ=ZMrT{#noRH
zURFqa8n7p)7l#&755Q*-tPX{lPVBjW__Nhe9r83Bj!xd5S{%ND@FryDg%6(z;+un?
zFOE)6mI?5)F9)tv*)8WzCrDD{A_n`N7xQJV)kN1iHx@<>8@{zCP`)!Kh3?3nC1=H4
zgx(ePBuAF22%{SA`q!1tv$p?}g46#km?XJD_Om6gKIq~r5v{r)tRGkZs$^A>n0m_I
z;$la~0v>(xMVrWnDhA-i91_A{grHIuMK*BL-$8I--b6t?bQ#>@B2ZCSpf3on>p7iE
zXe4GGUXSN%iWy~8{dr79)4zXg-T~X&+nWmU4u35_U<j99@T1t!8mi+VO+Xb3Y2@0G
z5X~SoGeDV;ge6#HEtK1Pd`K>@RhmK{@T$9r7xM=fBn6X{wP!wcAXEXOp_c_VS_xCd
zIhBI9yJENuk|Gx+VVd7B{WnAhXcazvKFH6!pmsUPa-vwLU|m+*34>oWcf_Qa<*AZs
z!i))UX_Z*z!nE5n{DTeyw}a>*a2s^H#R}l&o{BEXjH}F5ch#qkp0`a|ZNx6sao0`#
zZz~KDx7F*|rG32=lMQ6++*3mGTwSBZjiy?Y%w#lxDZR(EtxoP#D=#kB9D3KeYy5|m
zo7IN!7k5`!U+X_~ta)%xB5~WjWhEKj(KJQYM~tt4bK{lPK-GfbMFjr@awMiY(?blC
zIIP7&!#U8yEg~!jLXo7e{?jWGD*)Birye-112^*`Hf-w3vq5J%%OyR>924nMq)Rxf
ztd80V&xXSq#`eqCyr-*dM3&PsbfB~~zJ|zdyL3a>u)kl;_gesmuPMS=X=_&G8bqzg
z@sP%u{aVo8E5Zm(n9!%vBZbYJ`1AnRm7C5b;WE@UrYTXW?&nK_G_O9T2<%60UL7k`
zr*xA#-sY`6p|AXMC>*4B%8wW%gv3(S`IcZYM(INvZS4`eTkrgGK)t1mib=RO7@1wa
zG#~cTo0>6!RrSTA?Ft3&Fss4#fnSeogWcr5s|77(e?!T2-A*ZaZw>0>M+n|6O5}kq
zM~zV;y9<Mh!?X7{AI?sHJUe(FbYhXsra+-QoR)I&n(#Lh!bzeMvBBT||F1#xN~Mi*
z-Af}TBt>0~(+l8g_VV|Cc=7PD4mI!Cc5Kqw(}v>zEEFl>xBWo;SD!(0wxClN?h#Ib
zjbid(KqYb_u^aqLoR+yR9RGxio>3jVwKu7-Yzq3!QI5N6YiyV9!KNE;FK6<jHt)@k
z7B~GlnN3H?RrIGcPk<~`F0sr}qAs_N2#4^wk|4@bw8dA6QLKja$yCCe=D7+oDa(*^
zOd;dNv;$LHi~CVoORtYCW!(|=T`}x?`eZ|z1|YQzFDT{?)@7D7+S+q$^zLXY*b*zT
zJT|Lbiu<GXRu4F8zsA3{M}=+*Ac>@R7<RRDbq%N+dp8>;V1M6u;NG^1W@er+F-OlS
zHBZuhv;lu?7RJyULOvQ>Z-Xs_doR<z{-eH!)y@u(G}UsiuvX=K*J1dZ5!&CBf{58@
zN~In)?H01=y&{GYCPa1g^v$Z)g-Ma?GB(kA6xf!B?LNSC$Dr<Z$nlOask$8)5csX{
z?7<+(k?`Nt1{LgM+C8&DE#-mJ6C=K-neIe6*I0%RKLUF*Gp*TX&xtLdgulCDzv~x8
zXLF52Jv|TZ>NO^HQk#sr?5-__ZAmaK7^gp9eE9j|=H&G3{lRfNe9$j-DsJ3SUZ+4u
z3B7_<qlKUc@5fc6ocFJac~yc|W75wGz1Z~mcpKD{r@L)g@#=Aee~9ent-^4w6|HLJ
z__ybV&kKv)XK-ct)+cku>8qx6Qp}j_3)US@Znat2jg9;D+pFd)RgdjO(bC}lOarg7
zx61Zbd8zq?CKH&FTNI#7sg6`q<XkbH+!31ldGmgJ$0!d~*-p18hLLIK>VMs<yVY!;
zuhK6DeUNRETlJRrGwK7AUTcT+b=TGk=hbcl+;1Cj*BYXV-Hj=aVXnc-wB>1l27@u0
z-pwDXRC5^E=J+kWVQZ|qM*Wc69Hawnl_@ouf0KR>gI!ex(_J0<kD%vm9af3f&~>Xt
z`ZU8Kb9{@qw%5{UY9mm4=;hRW(wD7u?z6w|rB>Tb?_qE;X*P>ep=y?(AJUj^2P@$1
z24aI+Q$2|=or*&hWeCZg9_1v#@an_64>yOW$1zxy>Q}%FWikn)D2A<<?V#!z75dex
zZ@GMay)103UAhWBP(AEmLWL~2N+B08uae6efAgybQiV<18;wH^{o57{Ok`t;Qiois
zby?e9RxmhzYkN0C{p*h@5~k=5qnxl?vtIqe!s^WkmEDfoCaMa|Vaw9>Mq49G2Sd-c
zHb1~X)0ooFKTUm1Yn5KYo>vdjfM$>rAvNwm1q&n`o*oaH0kXU5+i&5S!bx>w-zZL0
zQx3CLOz!tB9TNDSs?~z#x$|S~wJJB>Pbby!tHNwdRrq|%in+o`#nctvLig}mnP1QA
zG~MTM$9*nC%<sqS3swGMjjJwKs}rql(Na%vCaVtP=bk|}cU4nQ?42{GHJVIKGq$N0
zHl(o59&0*xB+UkLu3PHz8*#13(Hjr75Nu-6yF-C>q<0ZppYYoV^+o=n{V$H49o=!R
zf9RzifHv|HwI#Bha&5nDe|BW^)Qz7a`AW4Umb}G<Dkv_CDYc5*cHh3jrR&}vE^ErH
z``_AcxGoL7Rzu`t47=CqRdHt=@5{VMec#lijnYg~cF*%s=$;C_P4!zXIp1nBxBr-{
zwgGXUsM&+ydrEL6Wa}mBPVhZ=q0Fu3-7a+Jx8OxDvo!T|B{T?@y{P?kOh&no$5y!S
zo64>Q!x<6<j15(V)oe_AvO%2#Uo^om%%3qap_vRVx1pP8?MI~d;Z*&8W0NX5|5gw5
zN%_Mjq`FqQ)HWJw6V<`+qQq^pY|t?aW@5D#s2hxg_3bcAw!0=~O76oxX?>y<*5ry}
zcpml1rVWxGAXeRK{f(%)tgGJ^=+oB_MHf43ZaOdeY2)wJSZ#0HI1>KuUoqV?R#M_x
zNzlDp*z3B1lUxI&Ns*T;4zbT*q_IU*A_bC)<J;!HFG#&ak|oFO9&mU5kXY6XXZXy_
zGeiD1j)S<<arZi~2e$#0u%ICVl@Jr5fG<D=2si6!!Py#O;(aAc?03M(+nxhw<bfiC
z&s-t%C<^#(VSf1_Q=PuYqxYHo85d@`MG}VK@pvuhGEhL64<YrCNd(FkTtq}s&Uz4s
zNF>4|#g);!IG>ze-kj>CjF&1P3RXmdPo)y{AyMeVimCvV-ihRi@DM!i8;{*ihmi<n
zOuS-8(+Q7a&XB3;gfq!Q9CkX1-12^Um8dvT(_<#-goj*w;=We$LLw#HqKGIXVdwV_
z06?5Pgwz9%GpXR@^z8WV;&wi{y12TYf4Vw3g%MPi84UE}yJ06)7W9!Q1gVIk9*irZ
z(DjP1BVb7w4jYvyQ_x*eUj?s=1!%&tP40p75V}&Sbs=Wt+`T>XANJt*fhWrB3yh1P
z)-lQf1WLtn;JV2AEBckj=u^_?V(IE9_xSSWe2&s1G0t_s{$h42^F?*$L|jzz1BkJt
zM1q+mnZz*{DocSZ6tb|qq$)@rbV9oNrBsCZMEI^zmTo^Y=9WX3ZG4e1&)8g|Dq>(e
zgKGSYVj6h^iVJrVVM08e^MXeZ3w)$JksuNVHW!dc6tLjJLmwjUqf;o;1=t#3crzM-
z#BebfyoB5-S<xSXDiLf$Y*+|AcgkMfigk)n*W}{u>GdaAP$5;t`jpDKE-SXQ(<L=%
zFwzhpd$g@W*K(Y?Llp(7gyJDzp(rin3_BGKZBZ&Q_c&98GFcMsfu)0No~;d2`jc*4
zmSfXUSV!;bMt8!lhTrSX9{uvyKke(Uf5O$*g05rM8tGb)+v3|0+TEi1{}Ryu-B>ml
zO@G>KFlEDA4L)zs_?adpAO($P6st)J1Tr6Wy6i-m6;E5cm@|M!PW>8%*1d%hyzctn
zQAsl|6uz4V*ywDT*uQ8gP3n}Xnjb|AEs@{dr^_458CEK3K|+a!vQv!~qP8hh4k$q*
zJCkdq>Y@jXUV1>|vgtd@s5+q$GD$g;cJrFmG)T8K9>A{$yQ7)T39rKW(TKI+S<D(a
zpcm(tr`zC66?VWg6Wkfl=7oP4(QISm0sPVm=?BUb3Oy$7P(A^XH%hIK9|;Y~LujTB
zJ%-f~ZJHPKoVI;b&=PG^g8WKj@B;L{>cwS%VK~PpEV)L_<gK0ZD}KD0<|1=^qEboQ
zdQsnG(#$0j>>Uu!rcYag;FSEbE%WB+Jy?C)nocbf<>|@!_37mH>iVDao72z7*T=V4
z*Dwa_^6tWd0a&h&kFEyJa-2%MYNPMVrfWIT$XgnPtuAadRKg_nI4f0z9*HMcm*tvh
zsEb_h=b!a-xtvEtd4X-Y|FWn4zVl@M+T#IC?a~iZ#~F8BtCy8bwuaM#u2DzX*zH^w
z@JR{cDY#$t;NvVEYJXZi1z>-9`sn=Bq{4-f4ocFSauqrnW%ZmpbALD+wrLbRLZw7y
z7b@>&4vg#Tyqm$G{@YP)?PtJHqRHaaL_p*})ZxLwO?tSn9SwEys#cmUuyGcy^{fvj
zLpg&ll=*xmbucT`>T{I9xGIh^kJ>cY*kASwrN6;GEU9|?KxE)FnNuhgWlMdqNG(zZ
zq)<ORNLPJ}%#^M<p7Ic3MZ*wi6o=HKDqQEao%xV^#2MV&o?PACwuGcwA9s?nr3T4%
z+HfvdtLqnPkaL(hZyEQ}6W0!T`6HS3V)_1Hhh*E-s;6jaax)v<p}jOh_1w}zt_>wh
zSOus86j?}gv#5p3mOR2z?DuuJ7j&5jbBLBst&g{`-bNKPHld8D8|a_JbiPWRm>UP@
znS)kZPp$9m1&@*0Rvg3w*OkiWiL!cNt?GPT0_U7jMM+5ijk-Y<IhAODO}%k*hof(|
z2umx(<6#mp2_a>;8zQa2Yi$UobKRJ8Ryn`5)+9B*ncrHk!s~*sWZ#hZu%9`dJ-Sp{
zJt!IZJ~}VTMq7YjSU|EGelK6wIdw}3wNd;FJydo-O!wN?KIY#uKmSwPA3^|Td06ET
z{5SUhIs+t3nyb^82#GR1nN6-Pb;?j>Ng#P!>KQT+C{6wowgwb}i>wOrY%hk>tcWR7
z_p@(?oR1k0A&9P$DCQFV{9ZWSzji`DWqaeo+zh6EfX9>2H!bY}Q&;_+%BxQN0~i}0
z>IVsZAy`zCK;oYX9(@+vLn&=52gNF%ge#|jbb)W*;7ujb-e#ZusTfaLe}A0LO&bq-
zh%!rT$+is8ms?e69B=P8vZ%M2C9^iptEYouwYTI)v*Fd?R9I^O<MjThxgRtK=ibcg
zn#<o3Yqs0)U0)-$`Yp}QuE(Q@Fu&EEma|DLxHs2bruAsj8oI8J(i1dRT*w$b7{Pr-
z{}4v+;ogdAjA_%F^(ya=w!EK}Qnu^GFnX=8dhuMMZm46Z|Gq>$xDMc;Rt9gnaf&32
z;6s6fog>++Z?Fel?W^n=Nb<k;R-RIGlS|Ul+tOEjv+qYVFK8u@MA~t4DTho+JGFg(
zI4ccE3oqmncX)MFer2|rzfKXTGep;mH!cM>(Kce+s@m))&+X^VAGK9oZ|XP@eb29$
zhf0L1E${TwZMVwRB6V+91$DJ5SI9UMu&%Kq&lrkU{P&feKtrG(FY70;&YYP!bH@4h
zTe&Ecq<5acIgA&Ipimk?5tPC)*aCQgFxo5&Yc@~{`Af|4DuIYkWf#7SnL-19Sw<rj
zI`~$^n_H@4uB2Vw)cEh#MY_Uk4bqkyr{)U=VRFz)q9Fuj3hS1Fl{FVoY7~U9Qn-$B
z55xQH$0!R_u}WSDhP5Eb6|qw@&zQqn@d7w>Le@KpAZ;Ei?j?y4OQcfBeMggfyDY6i
z!;^b!$ZDL7kr>@|l6d+Ec2|~K$yn(1C(xlOJx}hO6Px(+I_Mn*$pj(A))<MEnFqmT
z6$auh1ML+5dx2(;6{d-~fZUo6Lt)(<8Q2C@#4O5$AUs>ZSH)0hG4I!O;hZ%%U;qZ!
z(C97gUY`P9-VpMgXPdn$P79$4BQRiZh3AEJUv@?>ky;QnvsN=m{!K#OAZ~Rrc0vX9
z!fol)N-#E~4l3Ni{7fqeg*P%nrqduVJ1;qXFSHvYtK_lq;HJx)L!AzD1=zOA7)Kk<
zIb^RWJ=YU%;IC@H4tKW_O2<*zGLF070>C*a!{~%$wZc9eo)L1DLIrm<k#X1!k{qRV
zf-!GXG)S!Hz_N$7IacUqmK1M3=h#Er98#3*9ZrdJbZ$ymijYfh`tYatwU4(25a*A+
zdLoGP%sF@igV^cTlIzwXduM_YFkXZgV7Uwo(f{E&sDZtc7IEIBA}lMMML{p1{#OqN
z2JrH;+Yjt*qm&L;qXlaHyzhJfb7VBDv@`l6dw7^WXHUOBj)voZI^Ei$;jr5@cp9dw
zMq01s{sl>^%DUGFA*z5>5h16$QeQd^Gjx7-yR9VcL~*T$Zz1mz9VXr;M|Ct==}T!x
z>`*LILS6Lx(xG6iuMW9B&b`MfevBsCx6qV3oZ2IG0I^_C_cq6{+eZt3c@tdGEaYN`
zs=V5$Y72!jLhJTKdp&4bAbe&C8D^X2GuH1*YYH{@4u_9G7S;#`F%M6=H-y}C7@`!n
z>Dhu}g5W}BJ;6$7kKtCVtjfWf>O0e+#%8hwDjkYQA3x4kYr78Lmw=_C$;QVX27|#V
zyPukL2%7A+Yl^Rmn9@$^!&Y=oS~8s53UG35+Su*UP1Gqpn`S?rUyc~s_H71?vZv?l
z>GPN^V36Ve?sm|*I;HYgBzUiRI61gu#t*dk3dLJN+xqLcP5uL&Qp;}JFc7@+EA|k;
za$r06IC2BH36P>l3&iLp4h))FNo*vN;3KY4_=9@yALPdhQlc#>K?{@@QRL3-><q6y
zs8SJfaZcbIRwXx(^9q3*P*huxIoJ~6VPEG`>_JiXObeV52=xgY!!6x%6!2AA6pW*W
zt2~@sn+7vuvR<_Hw^9eX+*K7YsrH%|r3ET7s5nDm5V**tuBqixOh8pg4Z;h@UBG?5
zTi)D1+<2;>(w5Z1jvC0gv6^q4#SC`bmSFuPMmo(9n9PFW3qk~~(J0D}6RnrBR#Kp_
z>!lP%R=8fFv8d;SIP<r%rL1czviP0<yIfW1$LehFgmU)3kPogX(D<F1`}BgnH`JgB
zMp=I+3LhV9^!aa#jp<!eXG^K!)9Ww&`nyJ0(VA+kDuk==sAY}UHlEA`+C}h?Rn!=0
zr#=a4Tq8dT0D#i`g<6bNaK@rZ&9&QBoI&mc^HA7qm=wlp$80i$j02*f_3O+hJ6*)7
z(hj%3J~SPIA%301Qlpo08XwHbJIJ-Hf%_Q1%4Za2*5WSSRob#(LbaxQI19+}C4}Fh
zQs%TqVedqSKOluQlTO&A#mtX&Jcnd7f;3G5MHcVJ9VWj*hmDfzEy02Gi<~ee&ts>_
zz_RJ0KzmPXOvd9jk4A0(RYD4bcY1m0%~}PQPTbugJDP@c)5Vti;oeI5h&dPB7Y0E`
zf^JGF2;9NDuRrMxF`z%jHIy^y@%JdCiaj5nPI7Xok+Kq!E-vW*qTVP1Y9h}t#z_D8
z1SyQB)6uLw>BQ1a_PEt(ofd7vHC4&TSp7n)(IlRsE-;Dw{Q(2{H(ELD>5P6K$btL;
zja5x=<2Dez>sQPI!A1&_`0m7R0&f-#&}O%FdP;&|OpR<J6sdAX&Kkx3_kz@i6~*1H
zF1E-wZ)P5cPnW+`n<_~rCkdRu{YEns+7M`l3cY|UKsE%+U0FE0g9_CPuIW61h)-1p
zpK+zh!dE9`l_n3DMO?Y!CgxnZa^B)UJ0Iza+89u-+IhX+2%ycuXhoI@v@M)3QM9wC
zP#Hod*lK!>alhRzZtj*hfhtxh8x(j&hFr6Fy{d(Bc-68237xR3y&_O9j}=dn#9~QY
zq3Sz&T)47wmaIH3oMmU|@t#=7UnEJ*KY}e>S)$Fm-;1BXZ*5h}<F)s=i+?YI=24Uz
zWa8MK5R10!Ai8S8KsD^#DSm~uY@Gk!s`mkZx|O!D*q}j%OCR3OReZZzm#9q_FiDg_
zW@y`L#7O>0002UV&BDD$9a;#hmDgJo>LTDsb&53G^~z`kMQv3$RCs<4y@{`tq~nk*
zMl{L7a}<v8Y~Jp|Y``71zc(48j^R0hn{T9QY2|FO=j~>Px!$5SxH1G3(V-|;g&&@d
zpl|}(3VBqbw={*f&yu7`q{D#@kx&?14@h!S&ZAI1rWla8S^`TC9dm5SuN-UH{hXtR
zjyV)oQhR!4$;ta?rV2wYvzx;2_|nI_0$B1db#pUW@*D4A4+iWM9LaSR5G7z3ayV*K
z0l2p9N*wFvB+;+ylB{sd(5io!rrmr)^X}lrg?N(M+i)aszn=u4Z(5=qw7|*132oRZ
z9rkfLE@uW0PuVnN7|rZt0!%U-KnSh_Sc?n3rqGxj=*CyEs*G0A?ZDIDwf4kArf6fG
zSWzqM-qHs5tB{%UK28^qe$dP$X;b{eaT{{{l=Z0aeEbNh4PN|VHiM&KF|*O#JDaab
zuJ?d6d&e}4kMK`aXsa9a*?fb1-8Pc;_3TNqfrRnuH{&yFbbl_%uPNO(0<-y{3h%I_
zG<!O2!?TN?v-JwtyGob9(ktwJIeiy7nZRF6fMJ}@N-CY-wKtx{6P7?*vO#p~n)PsE
z6o-Ia^NISS4$kiEuVgCn(<$;xnnCV}!8!pSE|s%!B38z!m+%o--haBiJ3m<T*_=t1
zF?q^lis@8&LZNnP2<0rhNZw3FI~eU8KO7Hi>-Z^qcMRjSw|n@1k{nchIF)@|?{<e$
zA40(l3N%bVK3FYZqLcNRh9b1y(1KY|YF@aU4$Qo-?He^uJ49oYS@#+Gp8N}yQo(K-
zF%Z4`E9O82L@BvLfJPfokx+!XA(xPY@y@cNcx}s`4MA1@z49(>N|iRMFY6t@_vX#B
zucxkXLR?)4xPbeD0_3C-D1eim!REjPLV753YYyO~dX_sJ2&nNr)rYy<5*k=pMxzKl
zT<3M=TWB}~Wy{GCKexV?%PXxxS$FWXD;T87K$Aif5Xj`#my*evOK=)xKzJeC*SzH-
zncbzcC{?@ULNe@SfQ$lr+E$Di?1>BDI7zUTR|v{xwc{%xj4UxYsoIG)i7lNqXn2!Y
z6RgI~JqAW!|FV~4cqBv>5LVw;YeT%5ds*V%`sd#uXXpt2yL@8HQkv}a9SM<>ks6ei
zA;7V^2x+AhhLBep@RiYI@$A$?{1gBHuG(r+kXJ^<ynt=Wp3JV-A3~^iHLL;0<&i6I
zpc}Jk^}D0`{7p2P-ZH9~V=G%qRt1J$$8v$bKZLEd`eWsz{oycOC&?^LVLTo~!~3jD
zE=gA&Z!suOE|%UK{&Sf4FjUhQx`R%<`LC1rC_d{evy9?K>iPdV=#<hqGCLT<V_S@?
zjbVPXSgwD}U_62Du~-j^*`Ry*F=cW0aI;+8o>AfxC-WjTo$;PV;?FcrmL41DPcWTA
zaGnh3y;iQlVg~q141pzA0lq}(<6X6(y@_AdSZ#0HHW2>qUvUcpSkBz!yVJZab=ClB
z6U14Ep)LZNI$2yLQX@}s-68*dASua`Y}x770h>M~ws?Ga_weD}(XY?4IP3L}4tj6^
z53w*1i3C9y$e1Qj5m1aUS*DSaOUM}i%;tF517{!b0bH?}KnZt>P;!A9UPtcDx$$!j
zxk^t9`zxg#T$CpXaFs2!n8yT6hL8x3(jW*KDV;JBN)91QkQsz0feSb9=K6B{eloUD
z&P$3J!GakGg&{3wIbjG3K{1ex#Hd_z1g=8o@lmfQS&AlOyozXgsnSeIlr+6m(x?Qd
z4`>MWaj%yfguAzQzeqvTE6q||DE)bQVGL?IcB9=O*D}k=|Gk!kI$|7m&AH9VPAb0o
zZ!etV|9$I96Vk}imo4O3abHO@;YQMw$?)1ta?a71C{K>9klaq6vz%h3;Ud*4=P|-t
zmVRaMI=24~jYu=pk)ZQ=%0yC1<fvz%3H(|Q_H*yg9soe5#S<fhy2r4u3eW2nOl!7;
zePNk5Z~`AcHOFU4C9uy~M!7~0XRc+48OjhPB}+Jgh$RM_)0#V3;5SW#B-l5^C^wfX
z#N(bDb$r<80DeX?PR5}yS;Cf}k#a3DgxS))PnaRVFUWH%|MKi{&od|uEXxwX-QhSa
zP)qQ0inUr8nBM1-M2h1t95V-V9f6>}0nU=du7#1(=#c$V2q{vm!UE~Y2bIqf!6C{e
zcOY}5H{R>OGbrsTO~h9$`5KJCo<TWx^ZmBjM??_(AdEo@_U);Bb?UcmFsK>X#{~cq
z7wa(u{bI|dA`nuLa7%|n2t^1>l~<wE2`eJi_(zV0gq+vOKkE;UtL2}2)klpBA;YGt
zuTJMkUMs<1aJ(|!FL(09#*Qp~oFhGQB?%>&7lK%VR&=&mX)f`oF-sW7V0!oV?s0s3
zGladV+#6PAT|rr)RYu<Cxm%##V_0ZGgc3-><l)Wu{=O9IHXUY6vlQAQ`87t0QCq0h
zOSGzvAQ2Lc9hpiia;a#S6vtXC?IrQI<XCLXmMpMEoHuGNcukrQ_9R({O4@{RI%Q8x
zBy5%-EMiMyj6g22Sp%I*SEy7@uvhr;XedOj9}QX#36td>D1U|x(&4uXwocOE`$_m^
zu>V0(yOa$=8e)<o<mR6x-cE74QV|SBt(wu&Vd=f+w^mMeAIpC~gmQaF&}uBU22n4^
zTcYqK(sgD3vkEw=io2yoNZLxrsuh5<v+dPwQlsQMl(-thRhcU`q#YG=-Ry=|F7VkC
z_ER*5&23)o_Xi_*QX*`H?K|Sp$YVXktg7@Y3WhH9P3sJX)f$5??MzDT<i@5?*V}az
zo@W1dA&VC(D$0QYjhRM+($R&C#~!f6+4y8Ow$Rq7I{QAO__W#frmlspx-vz^FhRq0
zSHBnu-Xgo6Fl>KYm>;j_MQhka=yfHqMrO&h%23m?&Fw{1%6vUCqm}_2K!{w~suhmb
z*qgKxSY--P!sa!MC)6`#1TA-CRHki=&SE-(ckFXD-w7hT&He4uP&n2aR>rI9-Q2vQ
z*ROWZp41{+7TZ@awE3v)ZanOk77!o%ow4*k*_=|lr@-HDZ5r7dPTWDQ-?M^9WhjGw
z7H6ZQqZCu6m;E917yV(;YSrp<=||D<SCLd(-v6}L_^&zf>eL{;DQ9$`G}nCI=|Lr!
z7kluboY8^O<-s#xV(<klH*WgDx<{K<wfo+fHyV8y-~V(wxqkTV@%`=nyNjFQ7Ni=3
z7D?tw(y*@gaBe29+P&|gjXItq`O5v;L#Q{jnyay$Ftxo}gISI3gsF+H2_wvEXs||-
z#wbBf7&eHS-uu@=$=liQ$lDj-mM@0%SnInY1=~E(f_1@^<3Zmih5mLJPYz3RY%V@*
z#NHjy9n&bO(-}8<nJ{C54Spa?H-_V<t%YOlH-%G!=?>>xg!tT170aTn(f@L|G4=bZ
zys7|PBcmeGwn}(A`TJPx4Ry1#`p3%K+J@K;&vq$6+0-yotk6zlk-e~EP^>d7tPaa-
z)%N?NpETIeNcfSmm3Z#`1w~NJY63A3zUL|C*h<j{sI)>+u+$>xaW7+bVy12~A(`ze
zrSD#L)$MH<zW@1a^2wOl#J~jho(ni`2)IDPtRN256YMU*NxVQpd%`144Gj1P`v@yM
zFh$skQnXAN=5F{b%9S&<5?*fjmE=LrwM_$7(k1iJD`2dlVN0<PaCDLbDocEV)DRYe
zZ>DbGeXQS>pSxu*HKbIJ3LO@xxoGA?t5ieB>OuP^McQl$tkgr|nK2Oqm4tR|RJ}<^
z5-Do6&0?vPYI(MldjIEsmLc~B^NBL7qf&M~+ue%XI54W*mswz|UNXFk#~7)=W(qs&
z1FOQkT#qmDi(^1;?i0-nj}Bvse^WXu#kxSX_gOkTG-Q6vulWOYP|a$>KoGv~Q_QiI
zq7P7MEk!{nBDKd{#?2%dx;wM%PW++t-AhvS=Jn(IpTDLqIX9a)n7~)Z1sV<nTp(dK
z&<3m{*qvjea)yNd8(W$>82JzW5mvZo64<Jdc%}^VW<(a{Uo-U@UoQNW=FzU{LjbSo
zoVo1`P-+P5NeTf=qdB6n$`hnOSO^YG$5HpOeqU~O%fV`FX&o9Iu|UnmGVgn%8jfro
z*s!E%pFM%sdTcy%PB2nQ=x>Xvca2Gf#HwvpPo-4LlczM~KM%Kzz1MQU!1Y^h`$%Fp
z1~ivJ7cJb}t`9A+w@x#BYD5;;P;XfU<{VQdzi1<JxIQ#<K42;L)97R*b%E+GgJTLb
zKm~5#T8wgop4^Z7b$?w@&1wQM5WeRr=GaPcAE43-q9BM!?Qt(-cCtG($%JIKDy8pU
zcB^~v`tkiQ-cy&1sb&Ud@Y!(z$DV)-B+LrpKs$otH8_b^NNB&XrMZET|74$GgD0j4
z2T_WaDZ|2z$g=!v=2pVnjlYpR+PU6)u#&Es+fD&v1D-9#Lcq~U4yY{g1(GK$1m8^O
zQMcQ!*8Agnuo_!xhYDvb&~VYrr(UUnGiwJrEGg1wOJJoL8&}3e3{(=@X;HnBkR(#n
z`jEv^DfRkdDGm9r!!2X)owRHx9NcZjO#zd~{g);7+DV2F3CI!l)N7Uq3l1rhUA6()
z-+!r$^;pVd23?e5Q=oppIV4Ykq86CIZB)t*EtwzlYyJR@RLgGLFc7@!E4D@qOF?4a
z?Id;KI6#WD4e9{B7zk);C9#o6f?WE6Apc&Fdc<}Dqr8Y9XLfdHm%93@3mrwH^9au2
zsSp-2Q6dNnni&F>0Tl>~U6m=h1I_pg%W)V%z{fm+JGK%i;ZYGvF3`YL7EY$N<_x*2
zZW{cZG9g^%$`ZKJJ0tRffXNg}!BJWSAv0wvMncI8&?Pd9uok!pyodYQ{O4lsLxn7<
zU<4axAr+R4SUJKJHi8NuUx`)Da0IT>knt#rB&*PB#=DA^GgWCNQPT3!D2~=H=Ua~2
z>rbM{*;B~oJMs2~`Z_9P%0R|Mi7DtBg|>BV${ZESz;{(JDbd1@AuM=N2_m?%_2#cC
zrg_Cg+1fXXc*(4VM)NMje%He-p-e6Oc9KMe-9_{o0RU(t){L-a!<p_<57%y03J#f*
zJVbkb=1N*Jj#GS0Ndlt|>zBwNZtpH{gk3o9x0x&BB-z9HMTJotkhp<+xn`wEznR=s
zD5=Xg9?Z8Ix$h%8GVlUcj=~t^VvVvr4*j>C=x~rsI?cDJ+n%8@%D^>PZG@yO9y}F(
zG^)x^U$1X_joffB>@DR|&bNYKrcxY3-^P8L_`^TSya<^?DhzT`X6G+^7Y9YYn~@{U
zYJmqKF-}h4yqXvLFVGWi=_Ig8^R~@0PC9Hdi4I!#Wxsd79BD_l!m?F~>Bs&xCJx_S
z3|7^&@lswNt)=YS;ANnlgdLgqp`@C8T=hqbyi$ujfPOv}ni-Td9`8?lUFE(}Xa09`
zdDBkZ_1^p0ix++Zex1YAAUPx3_tqSbK7DLCQUi;R-&PalP`=fCi~a$HQA=wZF%Z7%
zR}3K~-jLXL+jR}WfkG*v_R$bz?d(caI}*~!jw$)?Wwnn4w@q~slIDAA`NeB5#OzkU
zE$p<3P#KG0B6t}XTm`HVw&$jDbOtZgPg&zsK%Sqd0v_eTAi<MkBxNwbvdTB>*kPv1
zHLHI9(S=M`C2K)Be-5VB43bK)Mj=H6LzN4SWaH=#yhRxijs{N|_wDP$=KFTjQe~H{
zCBsQZC{5&G4vDdZlVJ_qCW$Tug`ixS9nXXy*<kcijfwUTuJMkLc>fff!Wj3P7lppn
zUkH)nN0a@&XzR=QMrh~EL|`4<iQuG>K!Wc8pk;&uB0)4YNsHxB=vpS$F2FWfYmSm&
zi-bx`3(M&GJ4||AH`3Ul*_o&eNejx#7@;?{?U~;!;R_>`5q>0M)8P0ZehB~oAIwoQ
z4tTisW4ipD4%R5B5~<Ag{Hz>B4oUIk5>jMDN87IJ_BZZVL;BB`+?ihnB%aUT^F|*G
zaW%QwY5aG0-G_H4xcU^YrZ;z^!u_g7-eG9EJ|;y`EVAb7-(%IteVR!zAG)}R6OdD&
zi&Xz(9rWj5h(9EJZ{ZL7gUqY=4XspNPuoBceD|+dMWDneBx)ZM5>nBCr~*ZhK2(Z?
zF6VW8#on{-)`Y0yzgKsT-FyLk=)KsoXJ=+-@9yk8Px2t>o&<0L(?nT_Rf?c2<iarM
z7&t+ASY@%M734xbi3N57@c5Pt;Zn>M65MG<k_ru+#s164mNgxzv*8+lsg0+Li!=qP
z^OaGHgh5aQsgg(*K~bztCRk}|L!P3r2+s<azHV}TF}{5mJ1Xyz6Tz?)79wTYsCmH{
z!BTMo>^iZ!FcLxP$UE)^0f`K4E@a)&>_TU`CM2HS87<M;+4x0b?)3XXP}uj7>u2A^
z=liQmOJ~XgCq^#`mI)FF$jbs?m7xV)a24c86r5-S-*h5~(85gz9%Pa!W;nCu%P*ab
z7MW0Km1sARsjwE-Hl`}W=zGC`P2dY7MHcQ0a*Fkj;CBE3kQeh*NsyW>!}RCf`0;9d
zJHG!ifdPE#zX7@aIvK+NKKFwXVAQi<tUSO`US+cRR}sUJv!Dx}u5zr3OZK=R>HR)F
zdLdItZtW7b_ees|QMTgNk(>GHu*!I_<7ES~LE>Qh#=JRUkhs^|G-Y$6h~riba;rH_
zu%2w=*fs!PBw~b--?M9Wcan}RSd^L~+iAA9I4Y~B!v*q%&N4yKL=m>a9bDPK0{xVo
z#<Zkwg*7e=%Z6XeUi{W{>jXvyxiC}>YyG)<a25;XHLSH8^qOTm?~gR+TBq*{Dtm>5
zMx@&v?a5k9<6dujyAB2iM*ANeT}LVYyPfiAeC*{w)O*wH!Fil&!G}dN!7_o?zD~G-
zb?Z=A!=1_b?Nkf5->NUWJ6OCG(>6hbu_#h@h5jl8!X?ZmdZA=}9o5IG`GcOwU6<9F
zVRu3s$5ErxY#&H9+z@-MB7P120DVwPYa1~TzUx=aAqQ`8<9lpUQ)5HvgV6M72(mQ0
zJ48Dpq)}{B^54tKu@hR_+c5JzXYn!i(U{q_fou5LQ-+oT0%eFcDM$<2BRm|3R`>|f
zx+mM=je&}vxCS<MN62t5itGpzEZVwR<`d_}$#D0I-$<%*Z3zLK#ABkaSFr3MkVDQ0
z#I2;kDhW>^2DBOBnQ&iuUq7$b-yhbaR86V9RoL4Mp0Xy|6-5tw(jIhdlBFbv;KbL&
zGh^5en4@)<M%$GPQ5adb_emV)yj>q0#?gOnOv(R4e#4xRJ51Xjg<qE|Va0>a$CuX5
zOIx&;1Yhu(7(NMmSUipMPS`KI!BRNCXl7bs8^8sdGrVbTECuwJT!05f_7$Nt;N@U`
z832G-c7YtUg<XX|K04v7sW_edL-7jF<Md2VXuWVa!e8Cs%AJO$+MP_Ru}#Q&d;8w-
zP5HxJhdRE@b~tIK@W*8(9w$vRuWB#m#ry_kP|HpNK@hypSM*Vdfe(-<34sKohKR?#
zG_yTS>%21ED-h$qn_V6kZk_I`>Z+PP7hjB-j0}w6)3bo%K)?b8t3r05o?vr~E~g_D
zwBNX+v4H`9XYXN&Tc!l-tduNMg{d1hGdXd_Hpizkewpha=eiKU=5nmO^9q<+2y7_{
z0VkJhMCF_wpaeo8_+i=)yw}xy@xEE~QiDtNsIW(YmPIRXJEa!(tRA#aBDt%Uz~**v
zJTWF=Bq?aGiJEziB_~SStZTL;(ku>^O8@_{uVwK4(Iw?b*9*9FkTVCaDwk$v*s0GI
zUb4rONZ@S@8|x#h!c<PfSN5}AL=KmVCdLL7xqU|mrPK;EHy4g2P^6>+*X1fHRfm?$
zulY0otybG^+c*$?_g74TAd(8l+2^=!l1-g$7Hty5UZ9IOFlcdPaYK;;N%?{%|GpUN
zV%f1beONt+6g8YVXJ&Y$Pv?1>cRHsZJMa<4sj!d;i6AWG%s9{qxD;Wu&JwNGkhA!i
z&9T=3Zy&}HT(g-#1^3#aiUk_@l=zhkTkh$_I{RGNUu)ytC54m_>wIm*Jaxbn2PtAy
z7D1>)n~XW3RTpxJ%pxoVF8#i5H&?^k(U4qulrCismdpYd))_G?9CBC+mx3cERu?8l
zh&A_!PdgpOGPF618%C2Wo#k4ga+7<bW3;wU$?$0ZK!rxcfGdm($7T{C5sIU!>0hwI
zrP};*3Yran>Xa#k7QXjj6sMVR4nEm(@{dk0<{1;R-gVlEC9@WW4UB7#qVux@0FWE8
zV2)TS>)`79m+9|+-FzG0+>T%XkKTl?fLW{KpbNpwAbX}s%%t=q_xF?w<0sPkK}%ge
z>wHZkXAXnz#vw<)yV`|us{N?A)G_m~&@hXBvJ#HQr1Y4$b?(>a+Ud5-6lG59BB8rv
zvob{H0cOutsO(t^<r!pp;r-;yrR7-IEsVL&{odT@EcX!d!lr)7ly}U^K~)3GyhoE&
z!7RGALyNAVXH$`QpVl$sCr*^Rop7?8R74l(oh`JioIUkBTh(L6ur(anB1yywEtRe|
z@!d$*M|i+ovKTFJOjscuH1;}awP~-iueV(obcIo{(1KTMr)BhFCPfTMp<+64V9|{#
zkKqoY$Zz=BWa5ZU*vaP>;KsD?jb7iNzvSG4!X@O|T0zID+yPEQoMQY8i8lWS4aRv%
zBP3N&^BUSa93G!GEDmv?qi2DswkXWjKyC8|Zq5wLpn^~aB)f7tPO<I7zX(aXbm6?#
z;mV=1LaS)6!xu#wdQ>+;>9Brs8me501e9(EB7xV1;yX^uYF8+6<qZ2GjHQwZN-2}T
z>A9(tP)`464M-`Q^b@--oY#*v%mEOIZr%Kwu+;t0S-oMWYNw~L6pHJmg;^n_I}r+E
zon?$F<G%>ZAmj!uDhKp3<2_s<*i;vigVGLW2nMZ|3*=B(0(E~m{tAp7;2OC0R=5(@
z(IT$UHt|IQVKA8lFc=JA^5y1Xcs0Iz_<K4U-d{dkj_)4e_!uTaO+78jfzwhi(S$w^
zQ5P)A<m{|1)m?C=z$j|bq^l~T-`8*6R9)#y#mjX0P}2;}9K$USxXPvG7*2@a24WZH
z=uj=ffYyTu&d)Y0B&Jc+-SV?3PO}{KTR3)v>z8x2%lL?-e7K_CXd@i{7za^*+p;Y^
z+XwluVLMOFdUq4`{BXi*n+VR}F`$MbMeog+SN>jHex&H59Xv(tV(r5b1n^-n0CGt`
zJYjW0DCW)W_1$#%V?4Ya-Q3+qaJ~ilF$kWzEmelIL!8L6g(J}hS)9Vggc`dR#+@o`
zjD3HRAs1%Xswr?;-a{sJpAzj}(0}v(b+6M4VW;$u7asXPz0!SeUkmko@_G%G<Ky?v
z=gSL_`;97=L83S3ufFPYNLKp@>}BwQVsK%?GBL-;Fk{yLU{otUX>IIevkQzY--E@4
zc`vQ6`_$uoC3|^+50hHcr(O?j7!bZ7qL&lvj6_u_o9}7sOl)&iw{&nC?5)~Ct*br`
z`{j-zKcFo?9`q0fmGr~O0!~gK=%I~Sjy6RpnVDC}+FC`d!=p`(N$+3)wwPIG!d8eb
z{MIEpxwhNOll!mt)8XAWFProUi=us{+YWJ%@V41r-g|TN+Ij8#3#C=xZ{kJ}e)nH7
zInl&KDS3yGa7wv0QhSXq+|zMF!+MNYS?^lAV>nd!->Y34Vnd)+yHBvQGxL4l{P5jF
zkrh#NdmX_wOfu;pm5M+*D9|#P6gVSzS?8(IYba2>;(~e+g!i%N!Y7<d((r7Uw2)-s
zE)6#$SNZgW$?xm;pNtLR(o!i9rdV6K$QV#3prjz}2&7Jp&5@<iH&7@-N3fK%3Vy#o
zJ&r%WjD4tpk~3sjp@T#^wsKxFC9sm50edFSlvWT3lLW-KQKT^^SD@H4nm(GmFq$+^
zpREz(+#rfdcg8*){}5DoeA6$bW|`CeV&HWQM4zo$%7h#stZ)r%Kp4$Zm!@=T4J#{|
z{H-S?bx{VP5$Y7+<EmhM^2Qgogt@PYP{vWRlYfLIXU4*3DU3n~zgl`l2Y1DYMYb~b
zwW<9`=7pl1G&`6+F<E3|KQ0!Q7RYobHQ#_2Q7`U;Rzjh3?fmBgM1Ms90ELxHWP*q3
zqcX0v1RbNtdBJNKf-aRBw4R~0xQ0$8!4STEZ=2`FDCn4iGz@`lNrNcZgUbF~!wa!j
zS)fvL6t7iFc%@J&-wYY)AY>)^yi8NFFehPh0HQ!$zj8nxSg#JXi#W2xrPZ)BGO6!w
zD^%rNNdal8g|9Z$#Nr2^3+L*HYd5%6!uZqiUHS8U`w?6Whi{G#`=4>I*Xu&RA=>tc
z{Kujooj5>UcTwF^O|nPy3bdGmrD{4hRn0e2^CndWdE-UjOeYqXWSytA2{7v-P4*qj
z1~B9Ybl?Okv^TpX|MR%2;dU6oSZD(JuLTRT#JT)INloXlLNbLoupRoMR8Jaaf2w4I
z{oS_ZT$fn7$1tgJ_t2d)YgV9X1&7-sc7>Ii)A;JcPwqow+OPazB1_TlhoS6t-^;$s
z>@k1)4#V9t`N~qcet(HdCdd>9I-bq`7*Brt^OxD|W=Hc>j|C#`pWEu+79o&|PmM-3
z>M1HmrvObzDdz{9GqT6Cz1PimjW&D=sBiPLK;LS3fVB>A(ZJlodKhRyyjz!Xw}0Hp
zr&MSxJbzZ1|K!EZH=9kX?1#PP8}j1Z1Ao?%R03C5gCk4*$)dJp+xpiLrM0B}@(#Ov
z<}#Ub+)CQuupg71o79d`3o_~3H{~?S)S7&s@&Fc)a&*%3gwuJs;PSFnlFQ3?Humsf
zt-pu9eo^h8{elm-&0%gs+SWa_js6Cml1pnFF%*UO`W0v4g&mT3U%R%c>p<x%G+7#g
zthqBIqPbV-5yyo5_c9MVNeL}<rHk~PgU*rWOJ94Xre_LgxUFqOX&u2vcpVa?M5+ll
zho%%hz-x1_E4ozZ__3MbO7AQ&t|bv0O9At;+gZh4b7`bm4E&XZ&aTYP!H7QuTh$4g
z3pi_tBf)Yhq0z|-pTj%Sk?>$?-|4=6S#N&aY+9@CmZ{bWdmT~On1bEqL<ROX)ktlU
zC^;B{k)pftR4LXCMX${%(RMA37bZ^I>mY_=+<vDRi7N^-rE>fmIjpm`zAoQN=Tu9;
zS9-9FPr?P}_wBqBE>=~etvl8+Ri$O^V4RK-zcLSIYvDwXNj)h5@OkH~K_FcSy91V%
z6GrrC(^?9ez0b5&aD|cN<a7E5L?KA{Igqc>GP7x40e5#sIHr(I8h5~ZelG#q`gBDY
zHT`gY(hLAbz90IN37$^GsC~AJ#W5c~p4f{;MQJnak0-M~C4JU60vr2SpKa7TN5y!8
zCAj^0AKu#b*gK}Ly7@on&5Oa&{#iY%--VLRYa1~T#qatn-oX$%xOPrGG;U%V5-9y3
z)IA!4EY0qUNHdE*?3$4Oy{x<my`;Gb@tgPNJ!W;?cfC@}bA@yK?p#9SJi#UOI%Y_N
z+z~d%&<G#VYxAgES}0V0YG%08J4cLr$;8G{#Hy)3>vWn~7ztM+e<!iZHN|@v>5tL1
zU4~{0?+kGwIBp~cot^L;y(gUrdq;;l_x<b5?a$5aAXT@_oz6Ju1nW|cZdWo{99-^@
zha^c#Gz25IZoE{Ab)eL1^O|UTBcT^2&fEJahEm%8pp=MPikCwzb?>z<xs!-*w0Ddz
z!WOH?;k^^K>o#cTUt%tm@j4~^Dm)4fdb%aJ(0dBRIbplW(Q&JHp45{9fWGX!GiVB%
zAvzu&jBv`am^`h(KTsrXh5ZpaMt#J@NC=wk{7vpURXa?~!QwNxc>f=GR3+ZO%Ley{
zEGCZolHV6@yy%Qcc7dewA1@XcCw_)g4bSS0HnN;5o6bJrl%|4DuWpfYiCjw-OVcx)
z%`q9S;KS9}&+KxvcvgP_osms%+b|4<@A?%y<X{&`b6>J7Sdd`DK2Wqf1}GGnwuMNP
zAW?CHq5plblelg=Y{PVrrPt)kN96p2ue}h{8v!@)qt+2hZ4h(>F9U-sfop_^qb(gB
z!ArH572XQy;xm=QM(#8c+&M;48UxJBPFcoN&aHBGagN`((AkyA7*Nh1gRW`@Nd*|K
zkRpPn(giD7I~s#GC?mo_W7Fk*{k&R#e^|Fx9VOS2p^*^^9XaS-Vl1H1Tm!c+i7o|&
zpj^=rPlX_9F?y-`7j0M0dPhjSy$eoZjN5M*BT|K7CPa#Vid;V_^eyQ{*+^}$=;hfz
z=iev#Ka2Bs)=sc%@lqzPU4Som&;%bH6)@ko=bfWsSy`#gWg=5iYLW(&kukyxLfZgY
z;U`Ij!61GL005tMMk^>2sg?^KA2l7^9<w)jFtVpZ{%&Bpa>V$=o!7~+T_b<`3-5uj
zfpctjahNQWvsO|uhJn<)x*{EhS4}?gP+)D*CC+D}ugc*#U}#rBPJudxH^@EBxW}C=
zY>IrJD9iI%Z}bdGvZ^8b{U~9C`Bho2gKMs;US(w?9RHmQCyNUC(!Tr^l{oFs;upP@
z-*ehH5XayBS8Qh(3>gCNA*A?HGNE(VdVrTsoMD8#wsmJqsw5|2n*Q${$u=<rl0J0K
zFMzc_KKtEWarseZ((^`V9-P4{V;T~cBQOn;C<7t^lOZg(MI!hXB%%M26o(!-`yTDX
z4cRc{5DJ5wGE{JxxHnT>`3$Kju4?-mp<KA6%yXbZZWT*21BAzrGm2azFrEli5W@r?
zfXtC-ga?L?&hPK}_3X=XW<xnjlMw@tL_^H9QEXEhjNy@)42-Qri&9YpDq=@G@;puo
z)RNF$MbWh=q~OR+6e>Yc>#-HX(FPpw32AA_CPzpZk5Pe^NLj)t$@4A5s9DM}hNLbm
zybW7EjZ9NgnoOwQmTKqlS!9HB)bP&`mNYAvF>tA?FaL^cnihoRjn~MdInf%zOwM))
zH;&r-;Q;_h#U6-3I6Q_99=sWQl|#A78HJ?e)HVdxYbv-ls-&jZcNSG(`*f`2=U0c3
zU;-Q;U#0Bz$IkO-mB=Y>pEI!M8dk@|bOxiNWVSoKjSx9>7^is|W1vzE6ELd8{sq|a
z;OTQha*YSzEP-A}W)dclqCx)9^TXS4{nz|Uu=wWp`z_PP`~%bL7c%GFhi(@>)NxK|
zaen16o%vx{`zSP};@}|1d#ANbZH6h+>zJuO5Un<}fnMxdHXTw)SyyFi2vk}Y$c=9L
zxM$byK(|}J{|G+#LsrOK#Mtw}A5;f@xB%ZDzoZ+D;6?ui&Mp@%l|pVn6UkbGvDe6`
z<=X8+#Q2&hMYh$!G6?4bxbtbw`~ldHbB*c&mHj0%8E;bmeo)QKp`<lPE5Xq5AC>IH
zOohSf_QXU@kB!vxGyH#TKE*r>7VEm`<LpP#?Kb=_`#w^Ibpr56E|~0^@@c*p_WUUF
zVKSLO^l84BU9Y|_zO9$DFjxeuuM0bdQ6w`t#3%Ia=#6A1ZC&pIzq=+eQ+E9CS~U0L
zJ^DA%4)eKqclR&>|N0_&B88L|Jc|6I=^MN^uO2(({-7F`L6za1i}>}w8jxoB-@lSu
z_rwLbMLhi1*afr79m-X&WF=X%z^`=Lg{Z_j|E|>A673wC(tmot0F_ovZ{s!)z3W#D
z3@<DN+N7r*oH))RO^^k)U86})aUjst$RZ*Q36hFqwEN$Sp(I=Ora{V!C2~IBdqeqR
zZb}nHXD1Pyz(c7V6skf{4verKbOF9ZxZl==rY#sDpT!zaBMA1fOyE|m6cQ}7N0JIH
zTohsF%C$bHQrDNA{jIhkT+vh&NNu)OtxFGra;TI<atMkFZEN9`rW8zt!XdmU+yuXG
zU$1ZexWD00p-Nv04;$eiSI%3tYCPt!QN9GvojBcCi6C_zDn5%M5;Zy_<gTOTwXTgO
zB)?o(Ez!C2C~Dk0=gXT{iH7T2e$#6ucdzFk_WQFTuWB54MrS7hphamqbFd9L5U{vg
zfRk1k4~jq#D9X_w<wzb(YunSoYiwW!gquOAcyhrc1IkjvsL*<J4)e=Na=!QZd}$ks
z_dCWa@?n3C{(Iw1<KyIXw4~8_m+MM2zSQ=^^q)nt63z`f#8;1$JLuk{zavf^kl=L!
zS4LP-15-<DXiM#|fQJ%?*m%u=K`a=v)**Q_%s<518_P`|PC3j*+h<OYD~r-=y9I3_
zn0XD%sXsL8he9^iG7DTr$HY-eVXfG<8DWg{vP+5dqO7Kx-Cu-NVpXAgE3Fgtp|x-y
z%*_P$Ys_-fjSso|XGP#pYRccOnuWt_A$Y2ENX|)DiiF+vrG}Xkv;~ppiX|;75O&>g
z$$j{<@N1e?r6d#$Nw$M5lbW2jjr4IxbjNWD^L~Tbngwi9n1}LOIQzXI*1oS9{QAq@
zjO%aBT0OKP<E09SLzA=FEZ8N3!+;vTqHH{KbIVg__mg#VbP`5q=-Q_JDZ=N=LQx(U
zqH_4QOE}t<1oKuA)0UL1M!UxNk&m9z{|f)52R=>)Ier{8J~5@qSL;d0v|QXRvimQK
zuRkFWZrK@ltPP1ec3YRN(P#Xg<;uoM3KI@<)C;?1rt!?J50!*SX;1Buxy7||9&P5z
z#^-uNSuc-x(om)7d6KrZyn)%{69dhMM`zv5(2_sIVfSbR&(L%_)F6jUgW}Slv2-uT
zUSVAkU7$|T&I>=(bzyaVUt(2V>$(<{SBh{aaM|wt4~5t26>}IXGL7FG7L^u9%1@?U
zDMxDerPZ4t-@~s~?804N#1p<7MxR`qjG#te>KvpX(jHa_QdAXxT1zBo99KO0<VL5H
z6te91n}@sazhzkp4y$514flL<2-5IUx9A&7@S;`z?#<x5us)u1YF0Rm`DrEO^RE8`
zoF1RvA8`Ih5I$!eA>Wvg<XG{0n2tZv@#HTGb$AUtWxJbjKZK`~<XxS$9qsyP1-1j~
zNAxeXSZ#CLxDo!YU$Ljr4Ji*LCF$LDszkO^$G)VKG@e*DHyz8>K;%+H4FV_tO4c;_
z@0|r-M9GpbNvHf^OCYc>&+a~p)vGg|=}u>K(t#70X52!`1p>FAnQ@>}a2dkQCQp^z
zfM)SMTjH<-et#JE;fgIdO1M@IWz5mQtJJTY+w#mXR{3eQ|4JDzE-i$BSm}-7%gh0j
z2?!pev<O_L%H+&(B_q%RnMGJ}T>EqH-(6h({pONHc`IGU9ITmzgj;9$qHvhNn!5}f
zd16&zVuV;F-r`ZGBUz4Cv$*kScA;{uBuY2CHY!GIUv@f$ed7J>@*ze|_RZd_C6Al0
zFTeWSr$RcOW9wvRbm9TJ&h$;O(B%m*g|xun`t3EuD$fZfMhkYkWt|ZY_lTOyrN>Aa
zzT}b#(3u``$-$y?TrTZ!CkWg|z#S}6qG1k6tixO@!_1~RT7t~(Nw!*{0Vaf35*Nmx
zbd78u!h~D45NJt>P%NQSEJ--I$OJSJ?GXOTERUHGn+P_lFpYalbQZM1ls{ksg(VSP
zooN_I7{oAgxgL?3B&%CH^ebPXEalXO$4WZJrG;*exiXu%;5m1b!Sk-SbfXH$*b0F`
z_k-UsMeBw-)7?6K5K<+CT9XAN4W%1b`sjH@Wdkc_=1Gz3kV`&aq6>qzx}e{GSsj^X
zXc3q}FFE09iUwtj78dB%h|;ecTo!^Es4~Wzx|<QPVAi5-Thh}o0g3DSRCpWcOa~DJ
zgM|L>0Py1HUp~;{uG7JtH?$HrI5mX~w=3Fk>HPW<-N(Y|!iD`|cP6`A@3@6E7Xp-j
z4PB~6xeQ<Qp*wiqjbMQ>qv{|pYhS299W$+xMMyAZg>Xl6ch})IG~w+dry`Jr5cS_*
zo<;D7(EPuE_^A(FQqcVdEb4OPVgs>3MlX-ya?T2uDFgptlE?S(J9jqDIK0~U@56QZ
z{oJ9+i5q@;F^sd*_Q7jr9H)XLTIQJe+{=)yNIRESbAt(_M&(qiT3IxshXfbJa*#2Z
z2sE(Rz~59R;l|+#rBxDM{YzzXVC(Pa3sK-k$pp<XR>R`{)RVH$>AgJ12Zu7TbxwEw
z)1d%(lBDMZ&NVYE2WAZ0K>74)5}6V~RiB+A7WLk6XMvezk)w1L1h)hzvtW^AIRuo>
zaAK!vhMO{stZ<5&k>{#f_fyXj-Il+aP!fYLxMXItXMdR<pD9D37q1ilmh4|E<5@T1
z24knp29)uMOdi$Q)7n%w>YA8IV+H0R$V!dSL%C{HqFiyKB*8<(#yyuGQfpbhyPMgs
z)J^qMKRs%Js&HO+{h3R!7%Q1PX*E$VJ=cuzReKQErh4?5+_Za86aPy5$p6>HLhu;U
zLdLWY=JQxd>r4^5u*|SJw<0(zLsmv>QgO>!wTs}a*F0C$eoZ|6)Z57Za$Dc)FSDB-
zo<iuIoJ=NuU%&OzqlOO{7mi|c#i^3ETzI+n#xqy@XsPy*gu!XbWfG=LSUh~hziLc^
zvoa&bWl-ihnk9y}^y)4;CjNB|eAsX4_|o}$&s}EJ+WWeHeF}r$B<Z8Tlde`S41>ek
zdM?-RBquoNDl|A<8}4xG7sG04iSD%!?<BvXJ4@J)z-}yc`8hH3JmJRsvXxna)dq!@
zsOt=*Z#r=h)tc{Gb{Sj}8JW4w3YVz0oY$Ec289${-fz$CD6C2Dkka~P`+#OtpW|^m
zzqgr986Ei?u3KiEzLl*NepR(tN4&T#8tM%<847Vx3KU#o*c8h*mrw2)w8y3P<x_1;
zg<^YU)gM=;?3L0sUv{tQq4j+{4Fe*c?vFO?cOgfYsRUvsrE;)9Ai^gG&rsIa&>wAg
z7(_6if4H2!{rF}+kHDfx$7A2X`UgR3(DB_pJR`9_ReSVl!Q%VIw;c>_@A_j{DV{vZ
z4^5s{kiRF$`~O4X)I_?i;bR3<r&8%x<4u`Adr%m@qW0Qg(XO@1YhG1Z1a*G6T)*MQ
z2bUHO;Lu_vmuo+&OyHbqQ?fj)1Vj)7--$?h=W0zw_55-SlhJ7F2xK&=IiLa7fszQ^
zVP4%sAZHs&GR(Ex?D!M}r9-ut+h=$C#+RjTGoHGz*>{BHs=);&5CknANR>erXRtj_
zExbp*?Q0v2;3C8Lp3VT5ET*o`387}1+u2V}guR40M!}%>o-r#!Y*;GkdoRn5v#0Ru
z<71E|WW^YQVJUXEd3`zT2!+64u2xuGuK0@lPaPU~`|)O4PF=63Z|NpNIv+cz4KC+7
zb8!|1qkqoq$?P^f8`GK3B%wdECzDamiM0ud2zq`qrT6Um)8()8k5^YWm(%&h>+9)n
zpDrKer;lBQp)D5HnXnS{Y%A;b+1>5)yGK6n_U}3YhLciYJ*^x}-VfA1{N#?wcCzQv
zDWKW9o~u#1h+yE3#+DTm6-(6$Q@(@=5roA#&BfISRNK<BxL4_#Ks7(lnGj(~hxK*j
zSjkt4K7VfCPD**-SMJ_m@1zIn*u|lZXvx36>%RAzFT7D<Wk*z7*>+<zg5Q<7A26c|
znfS8GoYQtZ8ZC;YrO9<D(a{(Be8!W>pMU<#pI#iapsRGu;tYrA-I&LMPoDV*AAzl`
zNL{omvLer@k^G%}>1q8N=+dAojBLpJ>7MZz<f?Os)>_j<x#Z=_vHtPL%-ELe*^z!a
zgvlxNR!kI+Xp3O}Va9Ef?d7gRl})O-Ebz(7_42s2Sdx5c$E`Qwu1{J2Xcc~-3OHz7
zm3MDcu@E@;ccEz5wK3BO-dlg@F$1+zom32iNjDg>B#EtHHbYx^89^|cbp!e-WS3rG
zhlLM>zS8h?==bm8)!eZkQO#Ut>FQKnI{Wlvi6@{klyge5uzz>3HavEgu7946>XX%q
zKWZP}tQwuW*Kb;k>NTdrz!{zg5#WOsD#0*_s54Zu`$y)X8X_;P2Ix!YznxgyZreBz
zeb-k^3vVq4PTc1>PTU45HrPc`G+PwdCU9wLWD%iAfu!sjoBaENq^w9X<s{WZ5K}|W
z?aY~>&Mu0qh@#0+1V`{s#x$giBQOmGQ3hlRCPTQ{=BX50C<whLD?Ew7$;WgApU9G-
zfG^UZpbQn9rEX=e{hkvl^YcpnlT_}wwB#J9EVhcRG6O^;z!^oM5tvA&%86l8jG^F2
zG{TzU#_jw2`ts`Y&6PdMS!pt2U_&${OdG|PrNIO?%w%A!Ct8+@B2bw)iziVeNRGN7
zwD#!sQs#veD9r5_B`Ios`-K&#r%_buLsD12C>GYr+iS5VoFyOBs?1TC`o+{n)ww+<
zrOBj%uQDf0z-KItk^;_HUMQsVRZbXhhH1`(K_v)xMw6vBickZT6RqJx_0yRNEH5}(
zwHn;QwcVK#iqU@&06<YLIio<7B3l>~ZqE#U+)X3@TCp`T2sV0R1p_9E(tIq_6cx;1
zIGj4E$<Yza*F=FrAJPXe|8RS4P!S`QwX=DiKWN%oTT01cu;h~7V*)cUs>HU$#m)>)
zw7F7BS|dcsd1b8&r+toKUJym{0|t2uD)C7(7HKJ{%?~UVR0?fWNlom<M^4U1&OR)K
z_?GF#PR&jX9v&(Mz=SqLP?Rau%14bO>@%=vJU;guX071Z=Mj)=Jg}!uNbKDl?H>{O
zzd=7Kmm1^IDXb++Iv%D{A)y(>l|GLUqCHl+j_k+7Np;2C!CtEun6_R&M*IJ@)O&z7
zJZdEVE1FUX?a*WGA)vR~U=EaU4jIv~L=@mENR@@b<fIJ(B@I%`6LowtqHo+8mxS|=
zh~oNbvkjXCZYOLlgjTlKOVh4bJ#coOO>FHU$rl<qQUj{;FC`Wen+%0xzMuZ}&z84L
zH~oa=7Krtn%G_3wW-CV_)#DF#`r*xN)^y?ByGos1w-76&j-TF-Vc1mDuwXdqOVc;u
z3SC#;>1UHr`VBoWwZMB*MYCd%F6g{}&64;{kk|Pz3#W>Sm51>d-jBK^7p{s%?d}yv
z@c71tu9hyCo(R<CtS<rI6*IO!IL<K=v`LuQWuazKlPS5;(AUD?yTzXamE*b{xo#Qq
zL<0dK1?aLUq_W9e6JFwTiQZVlY??1zQwk-TX^p0ptRL_1_5#@ebSNu>nr<7xZB(As
z^a>952z2tt=Pp`tkoRh}ZM&f6`JSFq_l4tgS}KLY#G{~sAbtYKX=`l9w9!>Uk*)o;
zcKVjH>wF>6wm2o6sOQA(<FE$;H@)zSb)lFrX*_)Uhkol(hY1i5G&h@W3k3Ue49n7h
z6nqQb0_~<sAFO&z&_EPE0rq4#h83Dcg3EHXuxGVPcmHkWRVU1KxPz;8etWxj|Nh_<
z(6_xQe0(nOmx%+0J`2!Sf;vc5&P;4Ha<{s%3!SpQYd1rVW~d<}YXkyZ%6p3}Eps%P
z?P)Y4VucAXv1=@?diGsxHk-k`)m7tx8pB{ShJht<TPH6hlRyjExW?h=G{h0Ft+RpU
zLxaNdxu-^d_BfFHP&PvV(WSj31dJHh>H<goj`fYu1rpnpeC!}+FL=B0dSB5dv-iE&
zPJMlL3=(394WmMm)Rd@^r>Ccve}4P?*W%{-->aU|ZE~bN=a9qpSt=y=uVR7zJX?J|
zX6=01Wz_yWm_%qN@+Gc>ImYgsM!lO}p7d}?_E%i}qD)`XX<8SmmvrwwfBR_?4)I~=
zs31GOGyp*solHQ;rwPu&8l<S3nQeJ4TTBDyh1nh$qB^B)C;m6jM-eVM!K&sSIE8~F
z?z3UpT@E`FUR$UXp((I?ZT557riafD;Ik3vJ@VflryHMSp#O_PMnuBVU7BJh3=Hhl
zFs{F@<a!mp-URN6R(NO3WAs0blu>I_K@f%C@2{8#!M2nZQABL3DKWvKq@_^`S}Bv=
zxw%XC?kux&Q-k>5Wj9Stv?k^)%kDYfIWx)e+t|daI^3&Z4?Z<6LG3(&OAt{MxCU(q
z#`Cu3Fo%fd7N>MjLAk$Uc43GUM*%KaDHulr$8|aBrNx^A!|j{<`$Lu@S9jin;W!sJ
zZ4@wA@Xk<31TNGpEvn<N5784Qf|;Yc^6ukVe=r&kvQ(ke1{Llwfptm6O*$nDcTOA7
zoFs84hQP2b#D`TCu%#5yJS4jAa~nBO(CZ6fLn&QfxJc<JS5lbE*R!A`b$-`kz$qoL
zl#IBjEUECvd=2XRfL)?oT@*Gq94Rad>tUx23tV!GF2IO76%KIh+9+gt(-xgyEv)CV
zaX?@2-2=rsRQ00*0EpehI|GJ8Qs}?`Jo<1mKKn9&6L|LW`KuR4Rk>AS<<A~ml6Dd@
zKcEQCGxBP#4QYzN;i_%j1(T-+Q_^?8MRs;yFU0@PK998w30$!Boh(e|nZXGNdCc=o
zDugY#046VoHk9bT{tT+rMi!KL(Mn6!rD;!!YgTb#`t{qkD8nqWF$CHK78Ns5*~$ik
z^|Z1Ue=$T9Y+=Ie;mO3axpiR*R}E=H0?H-F!?{846R<#FeN@4CPL$7A6c%TTR$TcF
z&!5f+gwQl(VQ@a&(hHofOhpLoGUFdpsqMxF^UKp<uf!?stOwp-!#{x<eWLB#vPc7_
z6QQ7x6g5|#AaCaS09e-he;g5o&Lf39;|#RXc~K||0Z#J&4=<|WPGhH=Z5o_WUY2ne
zBa8mquAlozTUP0Dk5Xk;p0Tq>)z9h|rB-ck+DH)o&aar0P_Zi)TIudSkkY2*s2W|H
zqSET5OAuPtW4yxNUG0wJaF_h|)2<;H#}Kv0mnfdud7gQn*Kc*IJDtJv4m^i%sj!fU
z3_)1X%n+yqC`FiU@<hoEXvWuUh5ZhA{eXw?fh`3}m?}ca1sZsr_%G+Sdei4Bf3wy9
zpo}+{6j=sb>5UPqlz_<?GQm+=1R)b;az;YQ2y}+bBHRcp{ku;W<H_Z0;!Js#lrn;n
zS%`%tBbEhW45gqH$a!K_VK@R;v1dH!bR^5sYQ`Ttx*n@sD~Xb>r$%wK_IfHb+Otll
zuqU;uzh^FV-nZ{k-1?^=a-Ct0lDrpCShP?`aSPgunT3?eI77P&<2frRRR+GQoCyh+
zSddW?UW;5C<maoLiL4&Rb0G<hWSMu0XUy6fJl+z@*uuM|CBr!RubqE8007#E8%79k
zmr7;OCE9#eF`gaBDv>@eO4$v5MHbHrt(Bp(PNh>UGr=J#B=>GF7F<b7rr;DD!bOJ=
z5#-_)W9SO03yRu7LXS~7;eK70;1_SU7Gc!zrKY0yD*A{@1Iwwl`{?~-1|<!Lb^j{r
zVP*LKSUhZosDp3_%ow(5I7F#YB}gpc`aO$3Bc&=Hvn-q3a@5X1&>J%;6@f(~SSJ2K
z==B$i@uzpQ*<$e&cFERQc<>t~;-AJY<WHf;xDC{iH1bSY3{G2FA^m}t8=*-Vdn}A1
zf#8?+w1zb`k1dNVvt*FvFoHyBltFJ0<ITVcdJ*(^FRUfr{R~oJBwQVQbib>fYi{?*
z^ybkcaSiJSg!6r+-ggdMJS_jFXD3*?vFTWPKZ!O+8MmvJ|3mdjZ+4yf>=|sQ>u@OS
zls4N0VjP4&;HsugJKG--w3BW{Jy8OCk&6lp24E>x1wE~V#ylv^pX!efBEzGdvEzK&
zia{2?lks0h5C+vGUS^7~g<S0>vu{?{F)Xuq1Z<npLi)$M&i0bh4{I+jJxaaDx(?qd
zIDo5K@VjRJOjiqfCvr21g08uGIj@@<3?M`5xn+BUz#vm<?W)bH94QrY1w3VPg)s;T
zRrlG4#};XU#wfF>R<#KpW{UfF;zU8e-w$h^xk?VY2JY^lTZXQReS}~%8g1<_EN1A|
zg^8eBM$p9wUPk)}!`pq~f4lfR`SShSV)}J5zL;HnxrFENYVtb_;blt`SW*TXjBC`k
z@em0xup3L517}$VDYLLdl;95vQ)t3Cf<&1W60oHz2n0pjIFi`_TQMP<W)-DqN?|bq
zCc%>c#d%?jvsOJeXpyP|=-~O`ytXq>&h4J}i1K33>T&1S%B;Gp4hsejJGRyVzQ*cp
z{bU#)G!kWy@f2K|nT4(cZt@xo+_|I-Og~QHxBjpGaP>U`npul6kUFdfcWmb>7Ky;v
z-NH?CzTeik0cNe@VtX5xSXDMDNQ8`G$@to1t#Na>=bXP+UD{~ZRG!JgA~QS<yaUle
z7$YE4U^s^n^m>i$7pt}$#Eck>;5>0SJChc(WH=mu{C@f8Vs`QOq*06wUUTS=DnpF~
zLYcZdKM>aUxYKZL?wTvu4x+m|s7sr`@B&`V!?3x?ecf%})p$7LZH2a*F?-GMWU2YB
zR`GLl098^2rqy^-oj;Yr<2Y@xYdJbbp@q!jnm;o58^@B{B5vHbFOl{G>!f{V@Qb^!
zPTKVwCv2JX_nrIBf5li^Z`-&Me)q4K#k!T;dL4Ix76)<NlQwnHV!KI@3%WoY7_>CD
zh)5(sQgO0v{`<jDk}b=U-1Oz>#kM#Xa`?^6H-7tH6{$|=;6(>sz-7b@EO?B-4Jf89
z$OYI4;o>1#NbvxQ1-ER8gAO=(Kj^_HHs>hdOj;BHM-6Wm?#+?ObOwP;-sSS2q;}>O
zX&gf!)r02C$O01~#5_P@5V%-KoiNL#=!1%p8H78IE2sDM%kkvoVnU|eE^WjtteAn2
z8>{&|wHU&R+XyV3#K=?!2!RaUjt@E=!4foz1?v+{k7c5yKw+n6S_Wv$^o%PsqfRF^
zZBmo_02S?WdY%f)6I{O-?a|CXM-+4ym2X^xa%G%f;E9ScL1A48AT?;fVxpvG`oW#r
z05cFV5yohWi#Rff5Lv6t;laT?U7CT4)Igv;c>U@>!(qF~o7Zn%4+}#qwUN|tE)&KD
zoM39T6!4ZON@H-eOc;;LH+sZ{MJ-tD;v2-wnC<i6y+sikct1B*v%tEyo$nn00HygI
zvj|LU_5j`NaAUZ>88t0`&W_zI6wBatuaHI-et58%h!dbEzn8<qi_4FvSC=q;2g82t
z>g4>qv|8~omokQK#P0AMS$L5uCAA%OGMRK9^8gm92;A+?W`PvO>NK!^!tXJJE*C1b
z{dy}sXXN{OPhCR!AMYwsFm7^B4_|;^uh%PCrsv=QKJj~4NDXJ7&tRS|;dh6oL!bb1
zv4n+|3FP5YTp_`7X-Ea{P=gc&7RW6nuuQE=EmapQCCvG9P<8oD>RYB|DnjSk<+0Lo
z9%GWJQA+G&1Q*643#nWw2fLDM6*EgUrRu8cd2bGto^Ix)44)PltzVs9UG`fQa%8Pv
zP0r7^6>_j`5Rj;kT*Da5gPASS&L}dokZZqJk&KzK6Rjl)d#Sh;awX^@jTGLts6jhJ
zlAL8#M*C~P`d#~=un*nDEPL)I{O23XJ@~%uhr~wkSlJ5QtKa1?hT&)gFJE?f6?(Z8
zvLFIKk2Nz{)G0n)s^fJ^?xe0YjKL_)g<bgGGc%o<#Y|}#%$^PZ{AcjYc>N-DedzLj
zZm^Ul<%d${w{8SuSV)D!cMb;LfNG7`2XE!|n)Xttlg141xv^$jy;YN*Knlx6ity*C
zQSPyEMWeA&W92$~&8BRm<q8C@pxV}a?|mihAdqPsf{+&G2oxF&DM447TXgBJG92e=
ze+b^71eW?u)Sty&!Ga>@ccVT`zn&idHJkhcKk~09A6f&sFNn=fxiM&qf>~-V*A9y}
ztzPr}Ht80}xH@UMk3|qmgDo3)%7GfKxR%j|e!mL;0`@<Cz;DGKqwHsmsBXvk|1nVX
zq@w+fn>Bw8SGlJWpV_{KJvwD+`n{{L>vpb@-EIqR3+*iwj~jF-rcv0#!!moxcuOw-
z*u-{BjHvwHVMfF%Y-Uq>rXN`NH`+*s$1ILZ73i1=sx}5SXEFa5!5hqG$6w!HT+C+s
ze6QForq21D<l!&-Cb0a1_Ym_yHE_5Lz3o<(Xg{I}G*?z?(-g+6Tm2Nn>xwjvjn&AK
zb;^1tS6`{A1zxosYP6{qHH_!lBRqO8&u@15P07m>7H?{yM+6Z)jjrjWhB&C>1T}Pz
z2m`k{BlVkkU9Zi!YjgRml^YD0puQHSZnD%mRWx+w#I|j|+IYE;utLxna*cs4bZKto
z!u8ESCJ8y^0^M+|Xsn_Ik;V|>9S@KiZK=hs&DY*i%MD$7bVgdrFMjnjiJN_p{X`|J
z39R{U%hj#b9t|GvMfi;vhM&zybE?=}EQ^`RWfH-e#RePP=KfOQl*?tVyP~q1Eju2w
zwMg!1-EmvY2h8o!s@P67*WBW&t_vPz@Shoskt!)s(p4Y2*oR?%GYVXO`FnDDbvZjb
zpB#U=_;PvzFW}YWO{F_M0>%bQLtd%N)HzSHlI(L~d*JVNR`u4|{kGxlI~#Buo(2fV
z;WrCAbtz<)5rfYHLt_nfS`-C)&eZzw$E$vES?ihp+IhICR<9D7BkR}0dhXU>4PK66
zYOIcl)R2A+DRAg0<j2_|+FGu=B!|}8@yF^^1kB?0iH9|g3+ht}XpK-K$8sBP<ybA;
zs)%(}Ws6g7F`eAq&l)R3Y^Q8c#9Qk{r2$eIqAJl^g?9csX|c~Vo>JHR8N1mS`}}zg
z|7-P;Q-fOGQc$ri`T$SK!l*U_OX!Olkhf<2b%^^_v^@c78(`ENaa@D1(*J>voyX4q
z0PTHkR~tvN@OS@;whr+~wvfP%_hxZ0b}-Iz;us#l$+H(6oo1#b^<^|OJKX|n<NWvM
zRQ1br&zlCYcW<7ve6T_4*Q)Az>#FMS_p*8R;KBIu1M--h&AA{`9y7uP$!IP~Iwf+>
z$mwb^O_LSLXm~|uZ1jL&`+hheZ|Nmx2{}$BOG3_a^8FM)c_mbzQJ5}X>h^Eb9EY1O
z<CuhLw#xZzE(uK{67!HHf)Sof(|kcCPm>|ZVnzic*PPv8zjufG2k%c0U?^OroKs0|
zs2~v+GUt~|$s%&Y<(x>^iAa}u$Viw*xZ?4H2MJv;k<rlZ=wd%zWNE?@d2yVlArs=o
zg9l5|^8LlZr;uf^zKg@;n#MeOozIpFmPq@>i_RmwOJ_X1LqGk=Tgqb=-M#-QpC$BO
zBb@OCi;k9e+55>dk$k~A_dMnq6Bi#6{t18U*8EqVMCpytJsyl7BOU5CK;;xjB_TIC
z%`%n~ny1SoB3Yh>lgDJbOhQ<iATlM43LdYZyO3}+coMOUB@s&`IsV%*_F+OWVNS;@
zx|H)Y?|edRhm&+cc|zW^rOeZWe9sqI&cau-1?91OoL=!o7Be6{K`ss@%c)HB*Rxs9
zW>m88;YcL2AyNOo#1jz4RET2#ZT%no{(uldvgKvWLlUNmkmTUxgzS=l<$3U;`t8w&
zGx#=L%HYL=>er`dug^Z5PEHP9zxg|~%NdPUb>rxUr)RHE&JNx{Q-nB+S{k1nocw(F
z{<Ur|S-#*2RbA@(yg7VNcF9)lcyH7`w(GxCAb6^W9ghhdfpjU!an3?6c$yHN5W&JU
ziGUQ!L!2G{d~o#PY;t^Zuzz@Zc!cX1J*`{j;n~5-<o(h6$q(<2_J2Bj|0Avn=KNtr
zA~vPVSPltC#PMWC(rcEJbSbl?)U<sWr{NWR71B5!5;!r)8K*Iw0ZlLH6(d}dBuzF=
z+lF=gbZ~GyIr?yRjKF#Nf|S=`CZ;(fVa#X_ym*en#H_Gp1y_t^z}pu9wFO(G`Kn<7
zr#~Iy0?01;_65<v|4<%JT=C4{urzzyxC*P^tsfT}md8~C=lq&VM)ofD<5VnjMm7NG
zmo&U0yChl0@e8jV&2zf?tj;Fc2-C%aCQ-~2<~Q53EpDQk0mueRuE{Pr|ERtkKYmPJ
zUDKT8Oi4dI!)JTGKf_Xh6}V$<@FZKx(#+F1rIKvm*#k~pyA9JSra~Se1)QyGD)oVB
zYr~_Mowc>&i6k5B6PF;}n*mHVrWy&SlFFrUKvim|+4o_gfB4NV(=;X<ipbw^K`&z#
zkzF#Sv0x3buRvMIC^ca2)SBga6JBf4m>C_${nSv9Fc1(dp6=|p?AY&su;odZqimqD
z!t2p=DwuS*W<%?PJWuoXE((@Xu6zLcUuSYvi>NeHB6*jb2V$9JITK>SU{Vo~-Iqk>
zOEx6I<tn2>OvIeUvHkqx3;(dX>cMBLT39$5wV_IRF_lb6r9ZV0Xh_33s8?L>yJT8I
z50yM5durE$&%!y6Bfl-`E%5W0z+kA-3L<lwh!|;=NFd0OZe-ei5G>z}*pw$MA__!g
zu@n;7Fe?V)398qB`F3-A`x(h;GP6UCU9PE@isx=0d+w5R)sPUf1yBx-ehP;6qiy`?
zN0zXh#%cx5w@>lgpSghLq*H>pB9}`ZOP+{e_@Ef)>0hwzVRD^bv507PNkW<=sU++Z
z3zw3)6F>bg?69vJLaQmLc3zwB%%GsgD}Yd~%)7IX$3!5eh12)1*!OQVnJqJS&}UnE
zP|5OqnMv<E1&{x;<jUxYmWzypY3{B3nF7mU9J3jX2~UK~m#Bt%t)5}4vz&%(e3>(P
zm8C#(GN=A>zQuM%<D-`;DpGEX=h)(hrBDdkAw3#mW0{g=V#p^;b0oBMs>L)(FaL*y
zvgeJZ(DW9VIPe^`CT3Lp9nym-5|%DOPvCOCU_el5hN3i0{J|6of8udW`c|VOe6e5=
zr;^31f!ADN)1&!quYp3@DVrgq!rff+R2?9<;kR4Wk)C=D6dr%gxnuyPjAu;Qok>d4
zgb`3}c{20*D70#pky9>ML@rl^#x!4e4K-%<hGCWcoc&|TgoL>)Al%K5$7K84Z^<Uo
zxn8m}qQdY#@)gb6ig6;a5YjAT5$UHnXhxDJOBOx$p!@A#^m$U>5<WG(yjBWjr!vj-
zp#&<BY>}lo&3U}?8h__*G{*7tLGzj^wEaNCt65>4Au&rBSxu25%*ixQ7X$=LzsHlF
zw}a<f-Nv~wSXINMOIaF6A^$@@1IsU>k`j7Nc?=AgqzMsec*VS9|6HMd|M&wzJu2o4
zu1*DueE2<AxPJ@!rQrW;ZTf9JJ;4lsMX;`u8M)@UT+$dn-XT5r&z!JN8P8edox11G
z4a1o77(wDTEz#WbzckU@b43ZqX{-Rlt`$@DdVkm0+u%GRVkJP2)?GhV1>&oW=5(R8
z1N&n%YH~JbR$Ks;EE8nC94!^a>jjCq0M`)}L@*dmGQtv>b0$i&Xl)vmFP!Bj!UizQ
zO`4;v74e*f5;<g!LL3<>8Wdh5<6H}ud0uiN)a}hqs&sxcD@(3<o+hvla!qp%&=z$w
z3%c-IQ_*qy1^>h%2efD`=;_t(063X5y0H4`kO10f4lB7h%jq@CQD+|7rA^_NR1Hv?
zkSFpp8Ukw1)?$DO&F_Vg?QS+wnt4eNdL`$1dLxMMZX>_WS)yD$X~q(;n1L8U;L<oY
z<mhWa#v?=~6Eq<~GWWG&s;O+~*=$;m8<IWGUQ?ebz-oBfh7~jEFIxj#!|(Qh@G0p(
zyfBNIuuoh_(GToig2BLP4L=A0lCYZ+5c&ZC)u;!`J(RPU0}VOA8G_Lp&JBz_hPO(W
zIZ}^?9LlUwFnD1X@JFFbZGct1`O>j>$*u+6i%K&Dpt5~k)&a;<s{0UNfn<CWk#G*G
zYecR&CE+~cd4Di;5UgDlsMtUkID<EHmNQ)a4H7Z>nMzarm@LQdc(VL7#D<`tMncK^
z%}tg795%sYCn--@zWGn>1fj7=37t+^SQ_$`V2tdLxs;jM8ILcQGcn5M*(hOh{CxYn
zt*y?Dx1K-!)*}i$2fMqwE&v}rBK-@^V*9~=AH07vIr|%!eUsDIZx4b2`TUs#7Z(Bc
zyLfYWa<G4Pbn^Gf>A~^qlh<cQClzAyurp&ayovfAx+_b12uotgb;C%4$%Ev&k1g8B
zMlg8@ho!I1%%DOrf=TT*=$ivnZIqP_&p#?cWj|+N;SpN+N`bhOkO8lwMxtyY0n3zJ
zGL$SlAyk_&+M`@H$@ZO&icB(^8_^A18at;`b*hd|Nq>CFld+fsA%cav8S^VPB;g_&
zu}{o738R6T1Fvyt90SW+3gAR+G#jCoip&zYCWk``Hks1W(qu#q6Xo(+q!F-hW%1w=
z1;__=Xv`emCW$ezWUAJ!!6VAMKTJrPM=XbiJOT58M5}}@cu1~kyhKw}rXF;~kldgT
zBTZ)UisTHwWJ#oVmc=w=^E8fFZf8>fxB<IC&}&AR2x*4O5YAEJWnkDKD@)QGL<+d>
zXtKJYtDVy7iFFK+T|*Z;JD_r&0yOpup4JZ*tBKJ%dK<s*{QURHFRxGj=vl7lj<)$S
zUnYIU{m%o{6kQe@a?XB%HGj0-YW0!gIMr!AhDO03VpyLgGx+1^^gmk8f3zG@@$*<^
zr<TM^uIsO&_U!1Tl++*R7=lKl+Vsyq4sq@w&NkE&3`w0JuqUrc5wT5kCYO0qa;^U1
z-PSltp@<pF`hy)s%%x=)I@rYzH2Rszc^d80IChk=edW*+Eax-^127m(Cj0MRpPo)8
zgC=41O0V%c<?EEz8+yf-S--4Lc3;^t>9Dryyb;s7a-Alt#j<wno(CZc-$}x5P{~eX
z7JMXodrD$AXb`T)cJpNzr-FGZ31P8d4a$d1v;I~^e`(xH7^exVY(x*1Gr^>m4R5HV
z{YI>vEEC0=^wP_+5?Q#pLCRUk_%%}<<SIjdsk)3HeK;;@4&J)~NMb9Z(*+}!D^O#U
zTV&2m7oLE-B;JIRF(QZ3XbUnWbC8%*#v+*43}ySfm)_<OMoT>Qg(gw65q%>E;z(bj
z6&kX&CFoSL+yx22aFm3Lx#d%++e4EX)Avn%+%){{+&uILWPwy%0jp-d09lw+^Ii++
z*C-+EpW0(^GiM3AR*TCqItGASNb=Sn4Rg<C((p)g4UY06^@#@WDT+UEP3!v`aM?F-
z{&Gl#U4oSXXynl(kf5=~beV(>Xm2+R>X>+k4<Jg+1*<boQ;di|4onpRkQ%yIf>iwO
z#&@ZRN1YQON2R~6k&VUAVM0QPHKGOXAqFZ>uXzNcCy~M9oC<Quz?{^#fMsM%c`<Q4
z9|m=A&ro3Ho_JWk+8yiwA=L95v{?Ig2qpUlHS$X}zoA^-hb3{uJBRbnLmKPz(I03Z
zzlzABN#XK`<_P=580sbM3rJfV(-h+n{>k#RxSXmSUw1zZ$Dlqssx&`|cm(I5xL6QN
zy!L?LwAJl#3ioO!x5jI&dIK_XOPS1Cs4SBTiklrg_1jlcw%)pSVcJ9+r$A^Pb>N{;
zU4=e=;5$d3vDKMns-kUbNlCG26{R8waGe+=k&e$n*E+D;!ul+j2Cx8bS%z7Kip+2u
z=0MW=e)H10{_8}PbS_*{pHxDc0KcSgdQ60&I!RwlXqTn68L&ZU>z%sr2KPin^QZuP
z%}H*N_4gC<e=4!+D9USP-#ta=Ek$NUKHXm~)w3%lH*UkMniY30PSkGtEnKM#nSOBG
z2$eO?<0c)Ol*FPATGAg?B9s<9%u{I7htQDf7!E}AC+PXz*B=)g+3gxJ5#~IT5Ncuj
z&6s>seC~Keoe}B)TjwwZd_380ci56Wg}q6{r_;&uimjXxjd>ghnFDEsi!2zB9a6NY
zhyDE~Mi8L;9UQ%bHH#><E<xvliwREC-zb^ymCJ>y>)P)D5wK~*`T+?v#ZMMAv(N&^
zAv5va{n2Oy3-^Y1mS&cR5PI0;OE0a5C@(+oRX7MRFh#E#xOo_jm9P;kfp`LNF01=q
zpSxE^EbTJD;e$~%%&<VT{jJtgu7z{X(EEDqxL`euSY@<^oGhRkFC989A<N;umT4Eb
zc2B(n_f-2raFZSjJJo?#2Y8<oRax11On`+Hswv=0^WIb`7}Io_%ee{%QQ=8T$Zvq4
zf;7J}!R7YO$i#a2`*b+S`LmB0<^}@>LlWEsA4~K$9+OkX?CsDp;h#oA((sCXQkP*6
zFFwZL5%8^y|7-i{*7I?p2yGfi7)-J0cqtnQ>37oi$!HV|$oG$)k!RmO+9c0jjw5zG
zM*jAQ`~e?sy$D`3k2u;TLB^xqjfXD?3+E}>$aq9vK6>^7^(*z~(_+*Y2>9KNJ<}ZV
zfb9`2_;=9Azm6%--4IatnWj0T;hf;*6S#OcuF&;f;k-aC=z&tK`x@@m)Za+LJTW}!
z3cUC<pM`)jn$ND`|JNr!?(6@52|f-n8nHrR-a5|#_ZwHEU^f_TTsIz9|42RLVgmP`
z#SPtUM6$?op2(@X6Sg`AxO02oh#rYjrkuxk-#iM2#GR%d>V>EFmGwcF&!$81!+L)n
zUR}A<4GTEgkG21>EG-_IHQYuw`G6-BPOj4Qz&2$!R+|oLZ#(^^1NJ<pG4a%snowMw
z@K9Pm7lO%ti7hl;$@<aGz&WA-=%~*VIUv&+lcL`YVHmiPTkCF8uF7*Ot-4KPTV@fJ
zOf5<sq8fE;&cZ8mdE4xwV4`A(mTi$A7`dT2MD3wFqU2CS_iaQj8Jv7_$<SG(?*0Fq
zM$Ny~a<Rien1V7Y2Ia3hIK<fP?U5Ge$-mq#DULi+m+MI(-gQ%FcU|3elXDDyrQkK2
zroOw}4G;Yqo(VHn+jYX9&oiN-zulwU;5Kl*@u+yDbso(IZ{(lC3tm3+AnaF6`f*VW
zXBZt~%?G&6i4Eb+JZE~VhvHOC*Pl$@et5rsc6jt2Zx}mC6^{|rSlTsO-NRam2qbvI
zXmq;FAVj3fLrBXNVwKO7!|sl$(2)s_{D8lEHnIev-ZNfO2;2eZs4^auC&NTOINl+&
z7mG0fD?N{I5l?3!_w#o+OfX6tqQq+Cx^1EvYcZw6voUb3-QDo{bG^Pub9MxZ=Ab;E
zp*I>~%f4B_khEIuFwsNP*0UoOx9dCK*)PpkYlTq<KrK~Z!S>eH)>;j%n#pz^2+cl%
zj{wz{h9Ex#p9LS?`v*7MY3;p3g;RCCdDwhu7;C%KQ}+bYmuJfV4_4KG1fL%FcGtO$
z0_dK?V!a$RE^g_>JwY%o+T|UD&Ih1}epT=cb}*ChULvQ|YrVv|qbzBYBmXO82m-m+
zWcc1jbQHamZtX?ll7erdhvZ%&Wu2?KM&#_Qkte0OG#l8h?*;pNokW->c2`N`%~$xU
zjGZXR268d*Siya1osI%z`AoC(RaSv%1sxVyedC=_6%ot;WKX*-;L{!b`@zY{&@2I@
zG7eVNhYH8*L+#h7_gfV5s#fhH%^nXULmamUE~{oOEh-U;Q`|${^jc~Gg|_KciXRwU
zHjh)Hf8vWs(jxvzgO5Z@L&)sl5$Rhdjd2@O&hi1~P0%chd03Y@?3g^tU^;W1C=qnF
z^o-x9;O)5K!Z<qW+4YRcV;(_#<X+Vn@O1(ARPMEDEXu{T<K$r11TQd%prz#a==AXa
z*59Etn2ngmtvgs#(H*5P9RIsX%*et-La7$a8IYpl5$O=b(s&bGa%X|mZMaOX2!1m}
z<pu(M9iha8bakm*3V%?(qbu%246mOiosuc#@iK2G3I)i%1L?-NUquB`s&vf0ZmzxQ
z4M9&$G@*+)2r^|doMZhI%~TVeEN?!rS{P(Q=kW^j4jQPY17;iHRl@9TLj~YKCj=^I
z6yf6#JtJG8ucHM_*yLC9swr?gV6MjMaAEdZ<YoxLfj!mh9lnXLmseB{>7E0pH6dM2
z;F8%G3cbpDxULCPsMHEk^5RxRs%|6yY&2R=X|B@w6$uSN_GRd7Ek?EEz7<MO99tC(
zNDEeDQwmFcLw&($g==k94hvu|j=Tl->n$K(&iZ>=yJ#ns#@v1Tv2uN-E><Gr8rW71
z0Ga}snucf*j9vVeP9XV?&U|Vz8MW8wt&K8oa!?j`#i%vsSOiDq4ozlELRy1_#Phzj
z`=Bt;kZf)b$ySBhHNt}Wi*19>oXIZOvz`lEuqR&Cr0Ip}BBMDMU}LL-icZMAF(*|X
z9gT13N?4^B(!b`Z%}&x24pnZUDvnXC29B^^k>HSB2_IsZ1sEZJCK@^{*Gu|><fO|D
zb*CZ2LF;QcRs9;x#h#{;#j!s{3!$rZ-i>}$-*qGml2}(VGYWhy9~u^9tG`Fnl?rmj
zR)X}cbK~g4+4$h(q{^=x{U3_J3G$j;a!IC~#Su(qN5Cp_kFio*MV#u*U8oXBGR>=1
z8UH*KuHoKyV6safNw3)6ok(4aIgjG8g5Z&HuRPSQh)N~GM|vSHN!y|Ti$HY0hoydA
zCB?dqD?sg0bwXQtu(8uYp4WDQL?@?{?WJ8@W!=@f(LR4B{bD(f9+8JrmQG8@aNsn9
z1=KVHS9V35po(P%uf5b#`Ildc*Hp%LqFU0WJl|^e@!(P&QfO-D(3;b_?5;CEwIPl*
zL*14u*3MPkKKvl~9XA^I?`&y6zkkbU1tt&R&Y~`u3<<LxlPu4hFj=YPw+5Xo&%Xvb
zy~MsRhSR!2g=NIT0lG6{v8d=vM8X{q`><eSaI*aa<9^fv^cpe?f>uvs7Y}<!rf%2Y
z!DYD*X!f&<l$`5gyw*!Bj}bIjn^T!DlaPXY-e+vCn{_G}yJ~B&mR)S!)kJixEzjDo
zvAJq>nE%Dvgm<R@orafXe_z?~V#S8<YJE8{TVsNmvCtCpXs5*x^GM7$$IN(tVyo=y
z5L{Q&?3O~dnYDD6TK{?@?Q3!I3hFwtas+xCE3Y)@2Jidu^CEpj^(;z1t#Q|SS8?Tn
z0QweAr#K(`XQe3hxt1yG!oCeRbe*CgZWq#H?RrznC}&X7*%oLuA+EOuo10)<6tsg5
zP({lbPeakf>hOQ!#AX<9v@h_L5`8m}vzT4eMB>WOF>A`#Lb&BhNVaH1p<7q!b(am_
z8N+sFb33^+9?Lk&Mrl49zk72$rk7$omy3985F|$MXI(#*jBfZ9&!Flq_J_a50L6(H
zUb>d5&e$hBzk9X3*Dqh^ly)z20t@nN;9kWYa6SK0ns8CS`rOWg1!jT|$yEZS3RI=)
zMm7h^u_)IQfat8qD<ZJYTYqZXwtMQg+=_l47`ojt=mK0``CluF3(~=A#0dc|ifL;K
zxfSh1`r3vtcN9e-x^DVGi*WDAu;x_!z*u4e4jX{j5b$+o=V+AeJ|}ArtL(!1ljY))
z*@9>$3IS47Lb?<zszH+*(T_E28>9UW@#ZK^;uTpi3YS~cC9;bOlv<-D?-@I=2Is9&
z4Bf>P;7*4C+$OBN1IpV|Lc!|Z+;&f6YY6RaZY@z<K@NgFm|z3&*p!>7fPF+@JBEsi
zo9moG-QsH&HQi;dr)s-_FTh?*Vgm4%KMzMyi~e^o6kSvOEAkU8vwlBTV!+dhlYDU`
z&6tE0d>sbR4MnY|qh39L%tPhMiHm%)H41`_f2gHH;8k_`qwbA@QXm_&rBd8s$F$8`
zfJ$%kwxDvD2O9bIX$5$gERW2+pYe>r9@j=jnE38iMXUNS4tZDt<*kuk5cRqxI@H<9
zcsgOl+lu=*TF3qT$V$bYRP(yz3T>olr&2oI!KWBjLxa9yXBgng#%--}(A<VF+xH2a
zq&1niT&#6noz|Lus-&%nB89Z!QWz?f_wf8>?nzMIt~4W%%B-dvno{Nf^wYy1e>!~k
zj`aW96lPlS9BkHPFWUODd`h?s>H<rfDhZ`ozf!z)duyoQKoagFNlktQ)$eDh$WyJ%
zL!Q_c1-I%JC^jCG8NX%;KnYF(S<scS<jvDAD%_Py(!&Y`mRNg`7NMQ+I+9makS@wy
zyI*k$XAY}Xd&P($3*1{%If`}rd2s>mwyPx6k;X`H;^m^%X3~{m`n?bJx<WSV!K*?1
z8VYJTHUD7CJ1!H1ce+y4NKC186*_(iM@MQ03#L99eer*mLe@=XYJ_rub*-^#IZal0
zbcQ5mK)Hg)O3X%FgeWkK`yH{Pb>%39j_~@Yk;5%GGE}^`L;hNit;UiZ>!Ijepte+T
zs0BWh<6YCO=Ek<nAR*~!XoIi2q>5JR>)zG>_d3GBd{d)b7PVrPKfS_^IXtYj&gn#>
zNV|(oO=_&xv{O`mtB92K<-u%^`U}A!xi~#I_-S(R{*CK#zERmfeq*(qHCK$Cg1EXu
z6z-z$2~pPz|E~b6a?W=ID>hySR@JEU1x$-pgdvJ1unaa<e)F|O#d+s}1RbI%KI?VT
zS~#v<U%B@GB{PrYtyjU^Dq2l?n2BpEDzRzC;M7JVdv_|YRvpMm%c~SH>!7*T)Y9)S
z=%*2gA^2{v79utfq7$k-Ri(rF{LF&#B9Xe(WvoMV>(_i(<Uw>?x05;1oJZ9FTOXh`
zr@<Nw_Vofc-**V<6iTWq4NIn|F5V?|q3Kn2W1BfS90@#h&9B#_Cl&ZFy-~0xO{q|Z
z^#`~vDp}17HMJ<|j0KN^TFK_$ikZeta*dg40>r-nx9&OVh~HA$k)E@ttKg?pbk9OM
zbkSINbO8ZH5=#|GYm!#{r<A`iDVqGGG&jpplzDdccYH_ai{~Dhfo&X!%BWvg?Uu<i
zx$4_@hubjQo;8kGu9iS+b?rAT+3|40J4O;bXHCddmV{hk;Gc5taB(JAr)IF*B}v&e
zX&0#=SYr_;&?XwA(HN90x;`yRJ>(3lyCwDbPBRxy>at_K%S^61B{@m+mUII%J-!9G
zHd5HJr7-w+jc`zJkYUR^29v;=JGnlOI|3<d29niTDz87S)kA(&J>HlOT>}8LzIRjM
zpWxEbPtK_~zFcp%N`hT!Poxr(6urb|#SjQ$3t588p*%SB0qR%f_uxq|nul{mnS#k7
zK4ofey|fRycnu52_J-8UvuoblSsSKMY<{f@U>4Abm^+bj1!>OHPHPCe_Q}RBbZu#@
z_N}kAbcThZ>)%}}c_d7M>lUcCF2O?7dA3Za^?bfK#s8uGOI54z%mi1~4S63N!G?>P
zh-<K-swQsW-tUH$;vK}6cs}zk+Ghg}lQV?==d~saKJ8d8G+#1Opv_wR)h-gR*mY>8
z;vAO@AH`$#N~xMWU8>>KKm&TacKhyIaGyb1>#BpQ4wQPF57%*jExO@8wUg)GfZTnM
z?Mo$QSCrc%Ytd?}D_^J8>c`_WS$>c_7CSpetySBaOnyE%``ghQOhzydhTe+$k68{%
z8NT=lx(c~u@&==(9Ag9T5xDY_>B<>seU)y{>I%#n<gL=BdYRgJqoj!Lw;|v-iVkWV
z46&D(r_0#dNiyfNnemU?;K$iArg@B-9ZLkfZ&_o)H&9~BQyE{SpqHO`QbU9Hx$$n)
ztjmdbRh!Oy@_pqZWz(5iy*aV2xL3o8X@aLZcEiT+cXrPHeta<b@!<Wz$?JE`=0i)R
z3}>V6r!AZH{gMBk9Us1VchDiXXia{?-4Y8hp1}BT>wIf&F*qmupgY6FF50=QqjAbl
z<$2ttTfCPg(#Enlcq=N1uBKjoIJP7qRXz7=;!$l;B>M)biE%b_6c+L23WDIu!`YG^
zSlh1pJY-LgWa=nVB9@m<$P)-#o-A!vjIPvOyf+B1cNc-YpEyP>qzSo9<=mR+z}z1v
z{L^|)*(h$0)P{}TW-8X-Q`A<?`%@+{9^C-=i_}2TF$a1Ng)d1@;v`Yv`v5$d6;00r
zlMFb)O7rj(g2tm>(FCMk=6vow|LI;66-Ds$@c3v0Td8Loz)4wK<kx+nfvtv>Rkqdl
zO^ZGIP`E|KU;DU%c48Wu#itbtHMIAQ=nr}$a$0za%r<j|jq%|H+=8p%*sGS_ko1DO
z?RB}>HE*!O`1t+=!n1qHxtlq|lnC(UaN)bUyxK9Pl!;pNuKWyf+2K{|)6ktZ{KhqU
zpWlG&?d_6&Fm8AK=^QUEsFbVzg)Vgi-@M{tV%%l@z&O)_!P*dg1F_?;1F_@o5X+fZ
z#<H=3w)(mul+bprVH~%9>c=0mS|GGG2U9mi58S|gY$U*!Vzx=~icByh=jTBtSMU%^
z`4@OZ8d+2$=Jt_4DMQnJ?kiy|^3#%V0VPD`7%1=Q67Jhz%7HkiV!x<jTj$eoWkjM<
zO2JYMSvn=w>TXcWumeQL-tZ*qS2U<Q;mnT$#pFr-I=2>|y56?4f*~>bQK_yL)DLwb
z;MUu2e#W_GYRFOY=T#o#A_zb^M~CFT>sk{Ps|&)GaNS5@KS1$ZL6(_c+!tfIFIOF&
zo)i$TA@D8DG(-+!p9$1@oXA+nr#vK=%juNm`njq&w(*Oo><N|^)A#w5=v1{qk(R70
zYDZ0(p6#zMoS9inFka0w4CdgZl7+w+?a}dT47WZ#aIqh!!W5#ce|^05($4sp6KKE6
zn5lKE7%FHU)u#r~sIs+my>9gimM*(usx?$)mfg8O8pa!XkBX?vOI%t_?H8P<r5dn?
zND)L;UUcJ8^n1GjL$yOZsDtrc0oinzK47e{Fb)(5RW6r`0(ZZ_XWN>by!u|p6y*3-
z3vF9E+kOK>Apv)`5~_6VMK}91|4Td~jS>B1SBW*qaaW_3-W+f<sVh%AtjQ3tJ;!74
zAOR!zo_sfYHq>#s#iTuD4ZGzF!Ze4g3NLHcJj%y&znq+YHg9<;*guw_S|Q&v<hQvE
z_C(24(t)H5vaZ0j2DdHxHNOyiTB4ZAox|p0dFuk}7YrLN&=ajx7ks1`vg;MY6+^P%
z3$ADiK=Iw^8M$P0dd<^(<e~rK_;1IPUk*-AA(!Rw4FGNH+16IA4dg|c;>shFOsY!C
zSgff`w}<VSZbhx_7B=Ef(@qY>fUTUO5-{6gD{GSWI&G!Bqw@f%x10`f!Zu&2{4NQy
zK6Ci*S~}j5a(;-g>-Jm!0A?Fos2~1GbDu^_p|N0kbLcVYW?(fZSHj^9DjAl6vCtti
zB9&!5zQVR^K-ieKWrdv1NH=pf=pCh2&A_`btC^trFZw|?&v-ITgQk@E($KBeR(d(n
zPrMah>+$;+hwtAWIZo)Z?oypc$Q&!BP@af>dZ{X>#Ed4Okk_E2#gw+<+qxE~ITLec
z1K(Qj?UZuCazfN?Eo5zI6+z#jV0sAHcR~%UM=dA&psXg%dV>92NgPF2<(0L2tD7q6
zz+hcG*=6&yrqqoOlwn!-(F9T-_1#&aUR#U1vct8Hg4aLjqPMZ``LJ@avMQDRqVE=!
zBiL0wraYDmOe}p#)RYOkE_zXADmgKX)J8GtT;FzFmV^4L;f%FWz)sed%HtY1=~f<Q
zw??KEMSX#FXQWbyi}T*Hy<4iNC<RS4K}x+$Ylct(sf(q+3uUTbXUI~)5oD0p0GFX@
zt}bXa4A<V1w1+@D%w}j}>V-8~?_@r-u?2qw6n;d#y<|pEpH0ERKZnqGRvKa5!7o`D
zLwBl%)DG)ytMzjD&)yW{>LI-<ua$R$%qLC~hxPaCY1ck_)8WCJ`@V5gXA9r^Rhx!h
z-CneD^~!q61s4btR!W#)m7$^_;gJxAeHR6*!j{;`@~fEbWT(})mZW{3m@4XC^`W~m
zDA8I}{Ti*)>U>q6RbE)NBvDrr#xumruRa&a*(Gl48!cws+G@Vd%kdxn+rqTZ+gC0j
z%AQ3BU^z!$PcVc8eG4K;>@*Bnk2=KXhE}TlR+uK&@D`CNv{glm1MTgn-?f<%m4YP}
zgO1ecYUET2qY0e5HSa&I>0LaoxJx#-JJ^NeF?pLaP(v3GTZ)f-0P$?*Y|3&5*&UXJ
zs%ukp5PObMcd$1pULd8QPO92v7>D*rLN@IcBa=zQgv^&AK7@F=A~Tv_(i!+y;uu3g
zK`r44n@(9+WLK!c-={ZP35T0XJb=*<Ci9%wsGO2GO+Yj!3}8g_Rr#otJh=BLFNb^#
z*d<hMLjY+HxGvlXfdIZgaLt7cc)+DrGv822`>pwpHr}GbUz&E>d=6^AFPYr%G<Ky;
zt;t@~PGz2ghOchUvN_g`V~cFOpq~^G?gXR$_SVyH$zuZlfvI-$#8s)hbjvR@RuhZ1
zu}H=9q)lz=c`w%ZxLqON=C%!$BI^nBelL<0#U%94y`LuY^-R>ny{D#)wyAV<R<TR<
zl<?kHwFu$=|4*8gnS?DI;FQ1^)&h5pj|eq@j7MG_M0`W9K@srAt`Tm{hWEaT&BbCQ
z8l4bQMG|0o+8t>~v-+TPoo}hxlXUC*Ww5l05E@Cv6=05x-;(he86O|MA>Tyg>B~pk
z0p8z3c<hELcx>xEmKKc=Gv9f>(AI(%9RW?+W3=pEJ|rsVGDTYS>w1491`zGzrBUl`
zRpNPS(9nzu;%gjrcX_1%#!iY;3S#V)Uq+>*oi^5)u*zDE4>J|~(*(d%bz{2o+Gc$q
zf%P+~enqH=#R+0!^P7l#69vQK{A$8Fe+s52)Yr%u1gzb-Q6tUkD@rg=XAFu%V~6vn
zA6o;n6dKaX!}a9LQz8m59V-Z20Ch#h2yEP$hUgchy^3G1B+m7eYZRYW)x3*g?dszV
z?OpY~X025vwOEDTWkpV8IfMK(9V6pbUa(%+MWjn7kViJrr>-*A5{1Mv;s4-KKM3rj
zn6^Q<h>+UZY?8AqrXibHFNlYnVBG8P?er_?JpZlt&BNb5K7La9roXpSOLhId9rEzq
z+lS;cfgvw`JBI-Vdrx{~P}`w-iop~AvjO=Gtv^0~LI%C@r(o!P>qJT{bbJItZ-{WJ
zJ0vCw?waQN=`ty4dv&eglCPvkn;+K|v^d{xei6l3GmG=BnqmH^9axWRmT-=p*H2Mu
z-*q<cmPUnx0{O$PhNO3~)oXsB*))bBG{yCy$B+bjz)MuDZr6nr>{G}*yUefjYG4(;
zZysJG%_}jr?R&vU^%(`dpc4nH-NShRG!2};_uIps`u`jK|8MI59!3=QE)v)*HvI<v
z`3=8>?;1C6XN1+dhqWJ!`xh4%7mo+MF$}Y@y|I09(JKI1zbU{wAZ*E_(UT{ZylbjL
z!TC6c25#VQ6HhOb6D;^4f;S%p56f@N_=giXk^R8+2b<Fsri;^zg)hoC!}@a-52SzJ
zC4G=;2k40h-Q+EY6ovj^u=#Qd@r^;ah(_!atEvv;F*(2zG=zp>nxnjvDRH>)S^7Gk
zUH?k*Wn9YYb>^=k>UV{xCxhM}7E_2Q-DyC4T)8q(ap}GtAIg%4izpb30y6$(=jc5d
zAK<@l$atUhgOPu_kl;{F3>VR06bzhc3Qu}NaN=7YGtnQQhdtFM>`Sr%j$ybItz7rO
zT1UGu-$=I~1ux-{nI4VXG*lEW8dIDPFjcJ*ieoGhxaYNHC5J>CZnSc5S}iR~-P_Tw
zkC{}5(N^j@XHosFq>=8X;d=mY<BjTl@`$W<XA*eLeVHk)ddYw;&_M@F()kBKLEhpz
zL|imr?9OP?KAVV7(b)-QXlO!u#dy8DVNbglR;;<?@H#v?wOa3rO1IqW{juqm@&9rN
zMegW4&Y^09U>vf-(456Fq57J3jpMXb?rYBg&UA0mY|&SsJO#Eb#5xuJ5j#S|n>Ib4
z3wZ;#MN~D6*9&?+*Ht+;7Z(BiQmkgw3wllS`f8Qw(x6cl+iq5-?5s^QK13O{pfa5I
zgYkKP@Xf>Ddf&f%^!Y-39D5@)<ztuzwRdFB66>^<CxZ>EwUm}y778FweRZp6btlxK
zK%W9hhe;bfU-7bvm{QD8QTym2#fqdRn@rDp4FAm2IAXadtg)j0oUzK<j558WdYda4
z_bxUre&6YzPw3`9UvK{R$0twBuUngc{rLFF;NlO|^;~NP@W+IW`F7WXD`^S)MEy<=
zaK8QVBR(MNJPcL+zRi8u7^7i%)V^DU5E9b45CBE0BR3#c3%$+^!d}6}u!EXQv4p|M
z-C-x6qq#QmnN4+X4iOJY%`8pSfjJzQ0@zY<WJA^4m@&zq(TnmIYl=+m=~{_cnNzS(
zPL@|})z=2><n-X=mxGfb353kSD;+Mf0BR(bJ5~D(u>4Fz8IZ}r`(MbDu4@CS>@Vx!
z{V&xuAx#>H{_)`d0i{&iZWA#Oec!Jbs-h-UY2SOJs7gh|MO9mPiWE(}vsr`JUU_B{
z0?Io-#(yDu*C9zS6ycY|nVB<Z&K&3TbzRn3cC??tKHQa>q0ojvGt}q>Tme!N+%BrZ
z*#*?7zT%V)Gl=;;)rTvbXtHqagsjr!;k1aqTyR@+s9bg4<zG1;;flr>P_ABhJuL;$
z=3ulU%LLjM&Q~bf*#oEzArs6r&12pB;pO1t?I1u!mQtd?92s)W;`O8v%3-dh1PPO{
zYrG;*E{}|lvdm&dT%%e|G`e(E?JQXtU3;g9`6SC4ej+{^d{a~hexsqCq0#vpKW!?q
zvI?98J>$S#%_q@@gQf_R#;P*N+K4t<7EqCtF6Sg^T!Avk49ZzSZ5dclv`U%atXV|O
zG=p^l6`>Un2a_Nl3tG`AlqbjwY@~D^KA;zE;VrWJ^%G93cs(qUoxPY=s7+ecQPvVz
zXP^DZ0081#;cPJF(lsWJWbSi_*+=oS_IidA_HR`X3dUpQEQ@cH^!hQSZL`d_yL}Ey
zqY%f*ZSaWE-@`T01a0d^Qo~etQKQESf<5dMb`=^!9_~tl;DxY=R#pg+)=;xmtKhka
zx`kHhZ<GV<#u!Aj_N%y6^)?SFy_+*U<{21TP{Hi0o@u=?e^bV0Vzf%OSc#cB4?}ft
zbK--Jb4$5@++Nod4@Vc!v*BsJI6F(3YvGhK(meLmKCWJuww)J_CuzLxfKE2T%LhSO
zp+Wx)$Zoj)GqJlpwZ2s3ie#C;vVL_wB^e5N6qkq{9}n*aH{;uP!|U<j=BEGe-A4)W
zzg2qx`_AKxJmbXB6Y!Sie`stCcyFSOYxHrff6U4~uD!NW^!9dM@=o`6r9zOqcgP2@
zMiboR3n^i6KEw$tNcQ5xy@O=o{u-|}P7mm{%$C`2rB-co+BgvY&ac>Za<S>qwD+x(
zmn%t*w6rP75b})~kC4~44teE~<Z#?I|NTZX27)1QQ-8s%_t|~+MY}rxTx3P7_2FF$
z-oYpn1`;6=gn@!-3n~GdAw10UM9~}y#-}XBlNNaWkhkH6O#~9$D~rShYB*24q-!e7
z30L_a3;i3Vy}6{661XbnTBMl;Mlndikqm;MMCqJap{N6eL}n141kOC}wtw9lJoKC?
z&(dbh!i*V+g|S*pN{cbfgw4RZNQ^2qN8l><j6bwm#BwwR<I9M~_e#zaA?5f!D?WWZ
zbD8i|yR5XC($H4~SL`1~a4r;`Ox$ZX&6$vOU`y43;0o?grY>>kB)BrO_!V8r41Ccz
zWd_cRuI1TG>FIj9x`HffV$zdO1ThI*GGoA#ZT;H<04U0d6da6YR&Yp4;x2iR#NsJT
zq+%A1V(}zmq__iX0;6>Mv=Vqbl{NQhw52BKhD#uPSYgh*-gE0U=PBAK#z~n*c3xn3
z^u%O|?Ne}7qIAQZnF-4?2(2!$y(V`Lcl9UNE*BRUP}w=H2?p*%aMlEjg^4Cg$(7?8
z;iS6|6}cv+lJ7z>t=YT@^5R_>LAHqyWOwQNA~g|SybGfye<5E3O*FFU7Trn#1R2YS
zqe@^LMfYFtqdsw!7ZNQ-*RJVSez$+$AQEH3N@-7D2;CzR2v-$#{Q(!ybseLzI<YUB
zX0szUnlvbBN@_+M-eJ|Eo4$j`1!6^DmyeoVz@;)6ALe60>}?$lgq4rCEA$%bs5;OW
zFm@U6f9lB3R$7jC!lXgZ*;rjD6IRd;1l^#Kr3HyfWvk<bM(ErYOd~D5`=2&^K7}dH
zL;o)luF^S@U4HipfqxI$Cqb8yqIs^$x)1gbh-JA&93E*j?Nbo6Ig4E6Z(Kju+LbCC
zAFsy3w&rn4n@O>mRx==+!FV(;u&1@sp((T=n}oroPD>Xd{0;>(24k?Q!Lto{X)H{z
z-i*FOYK;#3W*`+$NI|DD13jbmtF;hh+u#%rNnxQejU+QRLKjGsn>5@vVmB~hBSqEt
zxF7buME$|2Hym8vM!n(iZrD7>^#SZJmK1oCTgQ>NcXjz^^f<ctw9noTCfyYPV|X0h
zy#E9|W14Y`+H{~$#)yfWgCMT7MsDRCklcpfJe}J--`(6i^hWy#j51f<#Gr*(#6Ze|
zcV-GjzA0SYCzuK%L8)s522V_iC1DjK6l&KzUr@UKJ{n$Le~)haKl*zqT`@kjn(-+}
zkqZm>cg9L%UkiHJyM7!#^zR0Tc^D!uwQ+rQu!nE`QS>mny#9WWgKzzjYvKPB!r*S7
z(Sh39bvt)Yja#gM2Kf1ab7!oMxFX90nXo!-aFnsR53U2Xgb-ut7q3!s`voglte{F2
ze*T1N#=lvc@hii%#Y1L;<7h0?)<o_){A)Bn)=P(YUTk61fw8e#B89cJgE=C_zr@h*
z^F|iyS1+y&?%0s-(z$geubbXu!&hzlcCVP+BBeHSOMW9!XN?{35^=r;S&=wCu4__G
zs&35P2H#qm_b&`C3-jFi50zBgZsJG~efL+?1Jc-8CYPO;RR{@DhRjB@Ly*F19w4$B
zyNpX|x~=YZGVCV*zUm8Lz=^bef$qAV)2Hg<sw%4}Iys8q2qq<ID2OAFhKeZzvH(*e
zJgk<56f3A$_QV!=9D(zXvjlG0oKV168Wb6!f{Vi44786q&gAkk_}@z9(iJu5kjZML
zXi*wqA_q<x3XMRbkZQ>cNzsLhBhv`agfA}cue+P!=wWD6xh_q~47@N6IccM4UK`Be
zg-i*?BGIx|8A2v=*YQad3ARLCv225AHkN!<5a+XTS^aU^vrM>F2dp-wRB(&A6s!6P
zu7!~TE^L1T6k2Li=Om9+y#_ZRVNeOiU8#&StzleN6ZwP!XjySwqA(g}4@Qw#usO%*
z-v|J}m9*ax44#<+5+<Ba+;3ISIc3nHyce|wXqT}y#^5jWPSks4I0^ipA(hl2BHR?U
z$m|<Jnr2dHqw37WB#Z^o4gLD&y5O#DQRu_xvv97YCYQk8B`&om%YGgEyq_;AhrVZJ
z&tUUflLx<N43z@RJ!2)cwXLgr`&&D-1seCbBeujiIftvpGi-aM0^(19kG_xYe~vyu
zzu$+BRU!1j*x=M2;tilAX@t7Ig7Zup#Zkl!gb7^28N9y2Osag>Z~<R_hbs_v&d!^x
zYyk&Q_ETtTC48wJ#Lefgm|{!&Hm@G$D^rTCpz}l`Z_~tvCepEUO3q;}CEuf`kP2B=
zLL9q%iBAYjL+6?C8u$6Ibk0bm&O7!#U6^hN>^9LpcEP9`4@hl*w)WnR@$CbO3dS{l
zC<@Yd3n7)A?zkOsNYwzb?R`3%q(A?>n+zYu*Ehp1%qHp0{f{5R(Zv1#dVjNXz8?=q
z>E!y`8s~?drKypA_1MN*wHjKBy)iiyPKz!=j5f?rHhpZ9g12oual)s6FkbHgyP?C}
z7o08Z2%aYA;ON;O{V={~jnQrFiqqyq+cJ7HXbUtc<2(-4e5Is!sKj-k)gXx+e?k8;
zWNTNWPCbwi*($e=TUKFGomcPBXS27g!=5SuxyF{n(~cLtTcwVj$M;g~E*6h+>LJ<~
zfiK~y;)9&sEz5h2Z`uE?xuxtH`f%C!@@rYWMgIYPkx^^gFcgK~^(zjn4@uY>ww5y5
zx~rBsYru7atv!q}jG{=fm?IfWZV03QeMm_|AC~G#Tz%)<BhKxYwr&X-j|fI!wRTXt
zk<bn;?>wx6uO-UeMp?5%%f%nQmgfYKABZ8Qe5s|u!g^_hmK|<YoZP#;=3Lm#-GQIl
zF50QSX&`L7>-4(z;AVwJ3u&B$Hp+Gz?zJ`V(KeDhi6<?$QJ2joX<nwmDyH-`_t<iW
zm3F?<%ihZsw%XV5;U~`aosbZA6%&sMdH0L@12{O|uCEy_zNf63WV9@YzlqX@HxLbX
z4o8aoB>>R&%SH<bYn;bx9TI%JIf+bv<P$cV=ScABH1(LWhxs=oxIE1)iuocf*iR(*
ze42`ps>wVr8O>S9cJ+oOE$Cy)(gF!C-iSxD3<<6-{zJ^lsz?_pW%O&72I%sJL~1-5
z;r@wt(8h-fUMbI1!`JS>9cHRGB6N?cipE_p{2)m8FcLV~sAFR^%Z5?DFDIO{Q2mFy
z7yM;OczPz!<R3MVO>06i5JmU-6?f%FDf*T!q%E{cg<>C7x_TfnnV7+tge2C!7XN$k
zS+_IiT<*;DG1@4^_)g#sYs(pi9f32VOa;N9Si-73nBZGPsrGV5BY}<|s3GQZ%j8jq
zLS8W?Oied=%2#Kk!r|ecpNG`NnWJ-1A-0Kkwm^Cf$BKL=us0zcWZ~fN5go})_+mPB
z-rM4Nwp`6FQC-VoWx+{iXwD_^_E<>c#KodqF3I7T6hQ^uH69DW27{)4tv8>ukJaLR
zxmmnmib+*f6?#3;cOjoS_>BuvlOFU-*pufUO8wywzXAZ1lR2Zdaedic9i4A4YU<!x
z!_GCejgzXmah-Y%IE%CR15Hm&OT$1Eyzj4=V-uvwQLt!1TP#Q|Mmz~&vw7P*On1ZX
zi={~ayJRcHcN*S&Ftd0Vx<RQTSIF_+afIcbz!8HE0&gK5p*kI`cP9+meCa*S6_S2t
zGOTsO<goKX&M*ZmZ2BzY#WOelaQ~-Y`;g-7*!M7gI0fE!0_|G#Y{*3dJL|(i3ww8i
zp(h;)-%Q8kd)Yj$w$*BiN-d?+f}@UTIZEJW6l!r~=^)dR=*M6P#<!_)p%h!pK6lT%
z`eXH0ZC<za<_QbjmStIH_)!4BPAFJy2$ckOd)@SuhzmVkk>^*89Lqp528WpR|Cr*6
zhq39|z>dyL%TU+iFY&YNE~(DytbPG4k3mZVF%X6C`4#Wj7HRkBp{Sr+ENCsRdJ;;S
zOq#)LvLsV$k^XmS>Tw?5_johE9sHowY@#s1o96<@fxrcW&VuA1p3oh8m*NqFHeY&2
zQ-#Wp%oq#3Wr|oQp=g*g=B_4p<>E|D>Tmw}Mas3#?L&Y`!!h&D3v{#yY$z52N0)N1
zg;Tu35J(roH`AedPs{su)wSoUx>CFr9CU%@BAK^)A&UcxhnzntX`c<jBwH8Hlwya`
z=lXHI`DkCe<;!Zbe83#nP17`E{3-x2L6?H}=ykM#?6Vf*+niGd{Rl-{P_N2fjFUR4
zKP`_zYr`-UgYW(oI<{rBIqnd)!J4wb=)y938Wh)gt{-#kU^~mg=zkw|ca-=fr1Ehv
zgAkjQzzQFRBQ#qAM+`C~c#UKT?c8hcW(-n&$uq45GQUtu?Bt2bq49~FVhSjAcAnxb
zvsS);_~&;%<T^cC3+0D7@Yy6t*TJ$P7YXdN54}w6-5mx?G7`R-rks1NpR0XaU90lS
zWMsl5BRY;L@M%ocVd7+vu1}&LgCZ#3<;5EzSYz?oyfnu{_1@NR`(wRDiTk1`iY0yp
z04OVC#6jATst|kt{UmZ-L{=HOffsQRf2EX9Z{jcz#qaqPvl42O3bpK>s?aUVZi5yH
z0V=2`B+De@#Hz6)+o2m(eD_rn{#8oof#cZkz4?vp<Z+Otnd98wI&cfilpA1NAaDa2
z)fN;3n<6ZV4O6m!j7D!X!8->ky%+f~qHB&4=E|asIBIxg)ygkZd+s8&dD`noN>_0#
z7Xl)c6`Cih1uA0@JVI#@xMWIisO3s_ArnXq!j|KE<(rKEgwsV>MpcwHr54_)ftVYs
z`8u~4!#lSr*m4r1avdQ=Dz1p{9Va)(Sypo;3dV(4&C~3m2h>2;cO1^ZTh0H@$!qws
z7|*6;{0vV&;i1>-^?dkn001=FT+6<*tL5KfWL#qGxufx98NQI$;bi<gT!!TLY&LOy
zxVeFgl5jY6{X=-IY{}}vswKcb;jmmr<@pi($Bi|f%VNGgH8^ZTx$H5asD+NqH{ZK(
zDt`FEzWUgY3t4?oK~VYjj#}G?owI9co@q>opvDr^T4}N|NdrrR%JTy#Z&fA@42}9r
z7{+Q6DQPK}rlJ4&wl~<f?WD9YmPT(~I4()VSfC%kS}D;0_9^HX0D}RzZuelX%P)D2
zrP>-&KIj(YGsV@^=UG>Rql_<NANQ|@J|$g&oS-E!uJeT0BEtse&jPQrr6R{m&$HR^
z6@$k5k41Rg0&%ABI)}m!fXk*2wcSyZ{0GID%WmU15JmU-3h&YZ+6s$rVqTls%yxdj
zC>D#c09n#diUAM$;|I2r9;fZZaoTnSEd<pSr8>7n7WnHQ{k)$P9v@3P!BTMb<z_OO
zOm0ipjklBEe&4;h3ADK2P2hGmTZ?A1+pqse`@-Y6nk~5ub=PiniI>v_*6ptDsGxA>
z!Yw_$3xmagXl0Iqq|=NxIO#PwhfaHqDhKP6-yLFH^-oVXbu3s`yTQ60Mr@i{kK=qJ
zn$7<F>+jiYQcZ5}t7?7j%CV_&;9-Zz-A**|audne47|Pn6n;*0ILPul!2`ilaJ~!a
znXn#3`vJVi5kF&|75?Y3F1+A&{1N#M_Kp0Z;2alI!bKmsY3>UTkIgv!{_XDtzJv-Y
z^(O9(q7p}FtB64u0#FVNNX#LHn38lUgy_7KV51G%oSpVtBrfejKkvJKth@I9`_)PG
zp$bRghj+kdm63duIvWe1vZEL*X3)WS5-EXIN@SzY4*w8<i$fpEJ$3Dfb<5=>+_Dmt
zd=vLZaTGT>U?O8vW}_j+6a*P%g?2he(!yk)Ot5>-{ygp%sb2$h(>+Y<Mc-^5z&8v0
z9iu-v(=F@7>9v8@hj=P}@l96Z+x`!5cle8k)gpK8YRzcqniFS2Tj>h+evucNt>kEZ
z_~1xt4V*MHdGshrxfrz4(j}==M3tqDXRnVR^S^Y3Jijk-Uzj%KF<sYZK^hNs1+UXr
zmD%U|Lb6dDWiMDH8HgcEkvQk5F+vnz(MjV-XJF?8!o}DhW^pYi`mR~!x@o5Lkyb##
z5f8SKqb8st@=<7wmeGJxASfp7IXk6PR9**dtU7<|^$Lco)34jHnLZTk=e+nd7h(XZ
zg0!rnizIXKBqS!Ivqc?+i~-PN+{1Hz7hdA{95>poEU>BnJ+WsvqaVsEm7Fw&NC{=M
z)yhz`Mkuf`XD2)YIYU?SV+Y999a+R-EOq<vSyp%h9wLSirP3w}&LD`jWI|HTf=nSN
zr7yQi?31{<2mQSF;<F5}LP^ic%A`q>7ZQ!m6tmDdB$cBNGHS|KSRu9;u13Ff#KVcb
z(fK-4X(VV&F^Uju0uLaK_KBq+=^=8+(n%Nc<*+~He=Xhvmt{@-*<EQ&kOG^49+J<f
zkrFYgY{8N7kezl0y|^6reGXT1-~$u=rkda07}-kRv*tP=E64#k8C9}6`Q&W25n}X!
zl1N$UE(iWPv-`4nBplYeFsU24U7p6<RJPh%>t0AUisOC12?)vs5YA;*N$VU0J5Y+F
z_3V<Aj5+V^!TdDsz4R~0`|j(_-7h!)0qtAcavL`ieb-lXvaSs2rAQ}v$VN6T+md$I
zTd71PJJ|<Gp~0CZiFi1e1u&#pvHpFlahod{%DE`6NDmS<12noD2d9BX^T~0($PW%i
z4-eoWyk2kxGoB)F1v!%%#0*ZvG8YQv@BmDsUfhRod8*)ff^x~S44!1nethOX3=@1x
zZRzJfLM9wui20neOu&<$hEw<XnZh&~PEAv4{ZAo5FA!!$nnEn{jpXx%29_m|@)$FP
zz_Xc<OQyNV29T%76vB$*+VuP8<;mH%ug*x6F+wkxhBZ@=aHS=m78(;+bG-mfhAL6W
z7$Fu3l5L}dgN!Xv<t)Zv^y7nrLY4nsJukFK1xv0@Ql`{5g6w@<Z}JM4E0kA1pj2FB
z=S*5Lqlcx7W9m#kjz!Kf0iFS_P;P<{;F;1aO)-I7ik~pHUSKQ6Q#K{j1h6!9etU%o
zEL8#)TIcF$G@7H1{j3Q&A0;9lJ^JcU7MbQt94?c;1^I_7tEY0ZUJH=;zk*8yt`+1G
z6=pFGU?U2MSr*>D@gsP#hb-st;}^q6Z=9%SGoG>3c-9*H(hvHBAM@t}LWpq<{XB$c
zD<)yd-(hlj{XQ$mME4?BEL|SbYbGVz{49mgNA5Gt+Y!(lXY&E+to3H%3@e|v9!Q*_
zB<uVmGvWaBCa;KduA1abFUqGZ<xHXS4=%3<kl^YFrb47QVJzh|d=k1Ded`(?w^Tgt
z(DArK$>VM<k6UUUH}ssiSzKbKt<E%3p0XH|TH9QT6;EmpZ=T+~w`SZ_XJ};p=8~_N
zMo^k*9>arxv&RRWQ%ytvvXq!*|3du(W{Hq$izK7c<@GkaG-lu)J$Hwmr~4u1#l}uJ
zjIG_hetYIGP!}>&z#!$yL@So2khAzLn<E%HhxLNT3t$o*ndt!_*9(*|-M|!iHZR$>
zv;%|;>bubbw4@m|nACurdrJzriE9{KOj90vduK%!Q#6A)>cEfZ)&SM(n;w=W>F0qn
zO;w%ZU(SR?7B8TuFr6J8RR#9?z*NPz{ff+*+{<e(dGZ!Fs#kWoj65o%>&l=v2jL^1
zLGN=IkH>Hoiz3s#Ahq8d&-thv_R)2xNY}2Sko`DIdEUE<39^MkIUz4jtV1H(Vu^B&
z(EutsIIV9!3`MkUV4!l0`HaVA0Rax@Lx@s7l}v7;CQNcB*%BN~$jQ{_j|b6<&Ff8$
zJu~`NJlRIArS>af6}ooA$aE(6!uV-Wr76QBiz|gCq%I>eC%W##XP-gyp~0ZFw?kNm
z-3IkWlgF**HwWGSwNcs-x(#h73yj|qEukSH+PKd73bOz>u1Z2`V9M+s%~nr3%xYO6
z`G>?*5o>nvj=zY@0<TRsz%pTmcI|iL)?4*0TVk^bQ9pT;XK`92c#5lwGBT(p)T#A8
zAm*wBSatNlwt--5+|UH~uK;cZaGl7#tm<{$qPHq2wy6C6J$$nN2$xYK>=N?dzlRU(
zYZl0irK*AVUFfbf{{T!Yrn#DNB$9QCLM$?+CF7ZHAkfh2%b7WHtXZb%wDUF->mc7t
z_+t3w--)jMC^I2OQzmOG$evu*qDT{<fN|6q49b&R>wI!_6!h+8xQ5!9ZUB)RFB(Af
z;}^p(qyCnqRO?48%KSAyZcOl}sgW|rM>2WARtPMPQ7QUYmnTO$3;N~4Qm!{!V@{3j
zx|VQdS4b_(IRSXyF;k>SOp{HkYe4ISyql9!B17|!QCkaGvbPATkl3<~D}RbKbhHsg
zlZ$T68Ra~6`g#BjA}K9ug~W=nW8eSqsrh>nUa4NsdahrSRW7FofqZuf3C!fQzF-+`
z`>M+JtFbsl8Ylel>5}PqL0wu}?AqsaOsqt=Jtp7~B54sz(x<2Tl}&V+nV1O)tiH}0
z_<yNsu8}Ej5lwj#1LGBEHJb1Hv<%k#&*Z!y#_~AJ5R-sFKZqv<uZp*gwsD;?bzs&{
zCN%t1C>{E94fu|$5Vvj<4{Mt_zuc?dEtE;y7%LmgVb6Wt4ut%+aqkvksWb4!f-qFH
zLQDO?VUX2%jDcIn-^-|eB#ycjb7R`g-Uo@@7A?KX;hZwDNa{uI1RV|b8gZA};ap};
zHa+)rKe?AdkL&*JZSY&iJ2xUI@*!4u%Di(cf+B4zy3WXanWrMbUPSvnQr?c%eFWDF
zDb_$+m8<Ux{oU+^D6&MIy^Ap?9_dByPzaw!FsxA-3?cfIXp(p_*b!}wC0#p>U#3R8
z&v;osu5jhjFkQJ9m=@ZrC6T4+rb^^S+?uB;Owl<E6QVfh{(%WO<>ph!7L_(*i`i)M
zSu31ypA6TxBkYf!s&6?^c(a9t9Uf@r_JRK`hrC}EfAUpvZbIr`c5UpnQTbh#$o9R=
z{Yq)ClyGsfC#)}g`@bHfgRA~XG*<?_2l6f;yEZ^KdqePd0(3YwHyBIQEZiyC8UmAb
zvI1+J_go1M(dSGrKKixbx8S!}4b_`eO41(h3Fvx1IBKkyyMcD~`mMx!^@8fpd4s+$
zX$zs9v)VVUWu9vcT@dZa%9RuSh$u=3?b&I2F3x7z*5z~z^F<B`)6C@8;zDV$G>1Tw
zyEm0jtqfH{xx1KAdDHg_$+YKbdcoGGOtW6!$VQg9B%Z%HqJ>T4DAda4^3oKTt8YRX
zHg;5<WLQcHN<|Ni=d5fHS-L5&qNsF>OQpS7Fp`pi8+ge!26<D2HC1NO{u1Bi80%pt
z;<jCi-dAwkbp^-1>&qjsv9_LR$>(#F6O>ZOUi3Qv>JL~4(E!dS-@iJ$n4F%SU!0vh
ze|>gZWd({-CW_K!n`MygA#F7BrrYW|8mLYQwk&gI^XI-s)A|Euk~l&uNQz~S38W&n
zC6diCeBwKFa5a#=gSRoHsQm}OM;U-ZEb9!pUKG<|ES95Ij}cd@KsEaM>o31*MQ>G1
zm6pB9<n-mmWHNxme+=OBK72ABLv#{##p|X6VGQnO6`T}`ZljvdqDF8BOcm}YyE7}j
z>w2^)V_)7kOz$dA>JwgGxx|H(nCWyA=6mnRun(V_B9nVky=zk4x4@@LX$@knVX?Vg
z>Bi$X#Ck-W5(!)emu^twR!bGWVuX070WnjO!j+}3LgB1PEj|Sy^BwR^<6K&F61_NB
zhq`9UFe!IA=w()}y6M!T7ns?@Nob7kFfKHfr7Tujq$<o!qdBr3c*#V7R8nAtWafH$
zD)hn&Q0-fH<g$9FSX-pShBKZMf_ThQh^aE&Rvk<c&i{S>ea1BfE;N<Z?v+okm3QUb
zobD23%e%ch(DDTL?lO~7dTC%?MCA=`9^H+qm+;2Nl?NyPJsqt~U1f!-t0ujHo{*sU
zlBZ1e?GZ9BbWO{uVtyXO)RF~7rcAMTIdkFa*G{WqGfX!FqogQ&^3Z@qy0r;Y)N91d
zJ1<g@V2)XWS!@bPvZSg&<8^ap{4w1zAv`b+r4ol7zOY_bsGEGc61-IvYB|*obI+!C
z&8BvO_n}m`U`+cap?2&HOuNThTXa<|cQfyOZ2oxAw6kQrv--9bo4bw!weK}FcfDP0
zU`!dig-F7+_Reo6QDK@%PS3g0C^4~*Rn&cZ+`R*?S+I}dA+uM}#B4`edbmWN<=|5;
zO&zce-n+|yx2?L%QdW1`uWqI(1=&YdM_I5rOjwO3v@PnD&4<yJcoJ>ZY4ouAHJ1Ce
zey5Qm6eqg%-U3i)Fb)UyeP+Lnq7Q^4g(0s)x6qx*2dbG@T58#iSz?W=EBZZ(`c{Bx
z98T-y+ih@$EwQsS)qO*xk`OtB&pXx`w90$hPdd-#_vx44GW~MTPag?Cb#c?a39@ag
zwwr2xpLAMflTivFU^)@4Z?5fT&t2atYbWb&4*m~S%drZBKnwuTJztT*!CUGFTuX(z
zbnOp>*b7zAOURuC|6ZI*=f}I=Z8CtaL*A+`%84?sQjFhHE;bqVAIaieCE>W^Ls!!x
z4$yohC-q@=ykVOCY%S67d=Z5R&B#Um@i#&QaH*STWOv?M2oVmIl*wwtFcd}i`U))q
zX`rsV=%SEL;6Ul3ZAiKl7)5@G1sWbtO2Ga4;vo}lon&XwJ?Cn8_~98#WGqd&Tt{!b
zEOHEVcY`JJmlZf58KK~dif7)U4?v6!HsA_R6HWY)7n+>3aFyqiw^^Q##%!>V0ge~<
z#AwVIL0psLl1NrpjC0P1^U5y0tAv<(Q!TYILQG4%zZGK0AD_DDLGKM8rlDn0?2rU&
zVmP|~SNXmOk+fS~WVIdCCw_C$2=U>`N~6DlE-KJ2n#Aqc(><>wu>=d3x2!s{uOo{U
zUZz$x@mraB7fGrZgqQ<uv^vWg+GwJ-^j~6&-hqok%+G$${~qx`HYKkhgtN}xMtgOc
zcfp&p4z1egPB#tI-k;R2f0{5*O}D``klH&+{KTle>%~j-P3Yh&kV<#(PWMW(ls1zV
z7f_GM48q#PuM@MfYN$kYSV|3*)B|(0*@=(fHhrdzSt}XpZ5B=T2+xc@X1Bkf=91gs
zXv}^9wVhpW+c+A9@AE5sF+iulcC?oZ%+BnlPSVMu>16G6x)>NJXo<18l_?ELrS<&!
z1wZsbiIU!z@?Kd|c+PV~QL;qQ%-{b}9?Pq%Bw3M46?s9j&uLDiJdyH;@>s6^d7zvM
zqG-0-pI7VRR2GtotE=x`D9;LU!^G;RRmKD-C;I*8&o}p*&!1oac=g?$Nb3KwRlNT3
z>Pk>m3BDpikn{IftJP}t>RKtm_LZWqRzLl`>HvONy-MWy^jz?BQWp97ndSML@>u@u
zugQkWq7o^UiB#2ICXI&<|LQN+c%8G|?z${<mJ-DZZvE?o#$BXIr@%nGE>0)HGr8Nn
zCFz%{bn9WGx^Uu^o$z!^w?Y(R#<E*<!ttIn1<TkeIpMdVQWb*2Ed9b0t{=;cD4?lV
zcHp_C;)SJDn#26QNQoM&$+~3H7MyYuib=vZ73Xx;uv>P*)3%D=Svlj^l$-FX&qvrU
z_exLr-Y`K^RR~7qjAy6hgx@WHVWQwC%GLXVWV3ZSC_mwS&lMFURqTbX3oeVC&X^Ac
z6YdY^?H@Vl_;*T9_&pMJoU2n)X39ep2SHAtR9@K$&kg;fVuI=#m%ovmWq|e+)OZZn
z;PgR~isU)XexpLNg3Hh~K6S;DLFumPO`#}%+3oCS$mb=mQX-S`SZ1b-No|XVjBdZB
zwA7dV&Z21}&m;|g7X|$rX)-jKq2BWsU3<4YEi%Rr&0iweV^**PcPytDpnEnjvTpJh
zAbU15WY=O@!IyvoE+MYHiq)TBjxC-HuYqA-e5>^UlkK%8={v6c1-}oqF68}4gt<!G
zawX1SW2;JxXx7!PM0wlgDZ+dD4exD4ldg=@;B|7+Rg0!v<0@jl4(uns1$uzV7Fd&h
zBYB1PH=>a1hL(k7su1Vh?m8o-qN3ddrnHh|U;?Bz3-~%5(v!XyJVZ&-BXz5b5_FB=
zc>O?l33|r|48P?s`i@XtfZwwMM|f8ek<sjvU<(6yMqvE?=~OAQ&*}02Ju7g8hbmWW
zLs8$80er^>hhDzt9UCzEvC@CMK*RHlz<66x7rFBEtPl~(oTQ8&mLGtg6*z)^vZ3Nq
zmw=%gIEc-Ck;Bomnv2jbzpYpvc@7Rt;M7I?9Iy$Ix4L_3x6_X)W)X}srISWC<Ly1{
zquhr*06}}?MY7{ReqD3`^MP#v7SNT>5%5R5!+;#)trCnMVvcf08S?+ASgw!2fqnxU
zYfWM#<BnSeuW#eGRl!>B_2B^Af;~9z1UZt^nw-i#&CL$WDpybElJ0h${%YU;U_@_H
zr%Hqoy;0|q+NbA!@AVYLF2`W363W?DX-Z}AY@Gu+X_xe&5GRteKf`Cw;AIBmDu2Tp
z&EU00YuAN59?M@{XU2Q-=lR#sK8*5M7Ph;hT{6!`wL#MAM*trR9z28Qt+jH*bV=gL
zwA<nonN}-%rccEe8Vm`1CskW`wo>Tcd#(uMw7UrFfh?s+(putPl#CjHxUo18<wK$F
zii&5kJ2$THQtcI6KXEKLSgna?ZN=_|3#VL}{nPIb0&f<>;MA5Md(SwHs9$UDcGuE-
zVK&36bx9)wGuQXK-8-g^)&4rwVfD?G7`Y|xbJzDtND5~cdHAbk0MZ2!wx$Z|u1s%r
zvPllH9c2>siBIL4zPCLlRmdkc)g94q`OXV7g<P<Sngs+tK{x&mtITQdEj5_gmEzeq
z)v0tQtl$v|f(G~;ztFslpm$_=roJJGV0L5?OeR$fvz0|Ki}Z{Bws{hS1@Cf4sa+wS
zyJZJXa&6!?#a#cAaTk1|CqYu$vBKo&YcX_pc668Td09aZhLa>c^}+<(>TsY^jlC%c
z<>+`srTMi|Wu^3h6?ts8+pWk@R+NOC7DeluVH<HT->BW9kaz4-^%rtl6z%s*B?}lu
z1#8<ZGDj;!aLvN)iyprM!*v93OeG}nX4aGh8{ZH`)<vG1@mI}-)Y}T7dV(b60#8Ku
z)nT_==S&X`q7u}Yj3{X}2wF*bMtOR^=l`XtZ9vyq<_fqyc_iUZonefDTM{%w<ddmj
zr8zjAhrW6<u#LAaN!TPRPrHoF&@L|IqAu0J0QjqOH_5+bTZ`yg@WoO52O_>?#n<=@
zLxZRs8@g4ZN>wFj_C&v_=se>_QMndnxd8t^r#u?(X~A>>UMiv0^Sz=UCaCE&Gri>X
zDkOlXPdqs;L$h9wHrE@$36g*~l5h4Qj^0XR*>TtfMEfum$L(k%=}%Og7$+)n$9*|G
zLpvVRwU<F(FDObg9&^kkCK0T=dOXWacQr7D8`^p;4wW8h9a%49E(;RbHzv#S^gLqH
zye|$cjZEQdW9Sb|O2!Z7nLjc_&>|+w2XdmaBq?2Z4vqW7q}o(<&*L3oIgJf9Y7?1B
zvD5Te_sJ-p8l2!xzs6N&gwKa6&+T(^vk?-aDVzihE|g=d&eN~ZKw*qaOrk}#a)BD@
zS)i`{qe1ZB0ON@wj?e$;*chM7RFH3Vscc(C(l5(%8Jn0)p9CpO-7kHaMm1{(&Zytb
zP~m!P8XvnAlF61#Lh^_V^`lY*-<RUq)d@*70yHPSikH?d8n}pqYS<nyz75;YEd@Qa
zc+4$@KdIC-bDMVkl?aNi*}fFbwx_+h3ZTHA4o!U&g&y99-d#@@Lp=y8<y(Se)~aaY
zJ<nJ=Hgs}^+i21Be^>VP1-hDjA)4z7MdO2dbc(0BVOu@w6KaH(M_JQ6$C9)ro(8^Q
z>mzaZX&!e|d<DJs=pwZyj<%&G5y(@<7e;bpY8F?k=Ax~Cmv(po4+}5_lSYDP335im
zY7Lf#1jRGzz9%HBmc=pkw=L?Xq)Yb1QT!YF%s7K~F?86iFp3+y%ggq5d_4CAayXD1
z!rLlA$w{BivHLsb5Rs(ry+grk5t#SBI2_ynQN6*gLXfs(;_1ND2P!4y2HbYR>9M8s
z8)$zUeKL?Q%b+)s1L%N<GC27~GW<e#mcx$4L=@)&PE-%#x#p6YanKJ%2C5D>X2;W^
zsc)<2XDVn0A2n1D0`r7uuG@gddb(v))Ws%*$6srDIkt9yN^B)~a&(5avll^bMQ9$H
zwTKgQaF-rc`&ESA&#ny3d=l(*qM1D#(dd90oS=SG-0jxKf~B-xhv4h7i7$;|7yOy&
zt~FNhxC8-%h#XODG|!F?*w6!$O8?;6u0N0xg7w8oqg_a^*P|oUtB4%@&<spL{%mVZ
z3y15+&iecVKe(ELNk@d`;os3%WaJB(nrh1+ceASk6Wz!YP@hg+7GW;ktT@d9x0_%z
zX(z(zY0>oNwz(eejLtCP5St{HA5G;_3Bv3j?GH_)`_=Vx1w8UDN9~jZjL^aCC-}EJ
zE<{H)M|6GY3x*|?)?v}Gq)>{OVM)U*vBQ!=iQof)hB<HpfkJe*4Kc=Lm?G@4AdUT=
zT$*R#vLMkDJDEqnWr+qZF^M)6zr;ZswTa9G9+(u2f*P3ANkCIOS=SxoGr#O@vAzZj
zGreB+*#*Ms6bB>x&KkEF&}mgOy<Qq$zAOWv(`qUMu+s{Z0nlj$hyv`iY7#vj%b3O%
zkYSK+8Ax)aF@SBgFHwwE0LQS>%t^l2cQC0kt00;#n0PWQ(|n+AH!RfGVW}TE`-a@h
zMuKI1VmvFpN+hnUf)f!91=~dIf}R)(<8R8(LF_Aww*A@lDT*{D5?_GDeB>-GGK!{o
zIw<t*S;0wdVW|DO$mnCiIK1w93MeT0X~AKaJS+q<#5^kulEgkL1oB|+vIaS@H(53R
zo<G+=)xG71oXKOe1;B60CVg=P|4vYzM&f(g2zs-KX_0M!p&Xh)PYwb;^V-5t`)yv?
z7qr(hWz4MsNUmhkm7$q#0aK+lw=adVu~%lu6`7lBw`~41g*Ww;`+pOYGlNL0dz02y
zojI^-eGGeB?e$ROJ<Z%-V?zv#z-cyAQrPRMA>Y@6k#51w1OWaL8Q{l#uu<Iqu9@v}
z8_m!)z``G>Iu@C14&j0rVJmE)M^U^m=;URiSq3iH80}sx3li{&j}m`uAP42qO(VG5
zt(BQS)O<|dbJr6Ore@+$Q+~$!o~wMfdnZVFq$k=gfiPxH(SuVYwG>2bryK1q!>OH_
zOv5vm2FMS4>AqL$B@plA3MaK{2J@(AeRLlnfSo4Nlm}a5XABL^5c-iHP1j2HKva4h
zoojc*u|KV4z^w~2{~co~qcw5XuYbJyAC=P2Y8x>S2Jrhng$@D7P-nH$uKwVrEi{*2
z^8#ih&DaaOlF-V9?b8?2(4^p+<T_%$A0MO7U-Kz9P1`a!*EA&v2O1|_9`Y%(Z%2$+
zpkiQdW#7}B(}JaG?tWqnsXUE^J+d&C2s7Rv4o^Rx4~Ol(xpT1KzmKmQ+kMj%tmhIL
zlmhF0!x&>5jw)zJJq)Jn9KqnJ=YH@$C<0WlVUJ(f8~1^2+GU+7#kI|8T4|i7-RzcH
z#&~R9N_D9P@}<V+(;q^iBtT)6?2v@vN^vKBfWQ@r0n9BTU@qvPjw$YZinV~ROH1eI
zFQd1L6x;_Cf|LrOry)oRN_0V@G0qx#R}o*=jMrNjBL)m;BncA6c0y|*LXV~wo;2QU
z@i%{rb=n;Z<P*;SaZp*(q!5MC&MMnk<E6JjX{}w5A8=wSGfd+zEY~IIq3bLR3I|Tk
z2`h!^f`#62u94%rq<qSTU(a{SS=+&&mEb7IDR(&zaY<-H@Zwhf%YS;tC7p}M*OM<V
z!gk;M2DP2<bDKCG#^2|!@Qa;kJF_j0?buHDcJERr>E<Ts=Hhhs=EgG}0m9Z53syjy
z?9Tr0Hxj==fb<oYH^zkLc|Hh%K*;d7zlVqL<ixTjD2W3<K<<|)Mlo^Tg@<tRk3FWC
zp%}Xp`(?5Tj$sgCc5*_|5l10%a4~Opk;#8JIdOaxMa6%%!tREW*!8fB?X%@#;hnnn
z*$U5B*qJTn_G~?!&oMsv^JFraOv1$Wi8DztCf|9)$I;}+31SSrOkRsc_}{B3Ub-vW
zTcES`>8b6ZGsjy@oioRAmmb1P^lI|sPm?cSE^i*be3`tPyt3ZCdnG=jm!lWZ7b^_>
z7mxV<+oK)DjL^Mh2SFUg4268{UwvO@E%Dq#cy_*=pJH#eo-UVDd+xZ%oi4rE8Cnl!
zxj1ClK`{yFTPL6~Lrxr7UP2u{s~I<+O&u4{X5Mn?x(n~joqO(bcIwXYdTpPtJ@r*{
z;+GJ2uh)7#JHsws&%K#9Tc4lKR;$^}UEuX%=6EYSyk12Rp|SsV&ro>4$DTmEJoi@K
z664u=WuGt4PtVuR+&OobtJTVO=emJ3U`OPWKQQZ#L<@9!dXCPP_-yLg_UwE<Tc5h;
zXtAD7S9prmBf~?uo^}V>OZ)u%6rHV>vnif=_R{7X(3{RZeD1o=Y%nORg%3Ci66WBt
zenge1H$R-nc9W1{k38REx{nXheZ&^BU1lo~ito+;r^}=;yWM@Z+PmF7U+>*ch-dTf
z2baIg_NQF39G2YB*x&6w6`M1Y&K1&9>Bp?<<-*fp;fC)UgR8a4_txERi`f%#@Zf5R
zLm$O7-tD%vf;dx9+_S*JQKS>H31}4fGOjn3>UpoQ@$Vy+t}!CC*a)YK2E+X!{3Yb|
zGGAaSPyDEm_>rLlI&RQ0v@zc(4>(Hv__4BOI#%aW!Td6aF@4I6R&t+>g3rb$naQGM
z(z`!i64t#l_U~xDL{q(E)+_m{5AV7oLF5grI!DLxU?iSK+o6lqIM$2_mA9bkNY$g*
zNF?H<VThpfxM&6urC#Mp(lCeoU~7n>R9`y}+lCt=_0mYMw*Y48PU_W>E^Q%TfnmgW
zSn6a&%;}13G&jJsLl_8`%2dQ0t8ni~A8eptID29H*2#P=CT!n|)AjD6s5NM?;3q$E
zP{a$t6=pqYWwWOnRaPpQc}J5et{d-AC~GV);+PRTiM7wx%aiFSPVC4kjGAZfVr4JF
z&?o6-nk1;YR#s(EsnsSp9uak;-R=W&z9wPzeaJSKSvA!_LN;~9SiqD6s-gjZe)X=)
zU(pP>Kj0`17}gD_%LXz&hc1e>BWfyXLe}&}qUziR4vL4jK(4V$$&fdTNrdP_LMhg;
zuc`(T(%SYP5-PhFiUH@mA4s=w8oGg$OTw@d2aMoIIiaE%aKEBYga!17X?z<XS7RHr
zlmkgOG{*e2hdkk|O;?U;O9!&<Ubescnsut88F0Tx@j-oCh^2=dS+Hm5s7YK?4J16^
z-xI<x-&)bH$S1B=jg_ifiFt?V?uJG&@_p?7idn=vc{-amC(~FhNz*+)KS)124Q1y5
zR;uZ8yn1$Ub`n-hiW=u3r@K*>1{Hd%?W7QYL!WrzUQs7-3Eda}fkJfosiRyIACHAm
z^HN9P`_EViH7^B(tge%Q8WTvYx&YF{Y5u7fm})Hf5m_Dptn0O;!CIb2@{?Bo3Ak3d
zxGUryF>(C4qA`2XOGu@bP%7D{U*I9>^ib3-eg=jJ<)A&G(z6N$d#)U^Hz*^u;z>V&
z6}Xl(Sb_7%Uy+}{f`qcm{sD(UMB;$G>~<F}3S-R5S$c7$&T2Vn#1|95;%#GCO+!7J
z5IF~&eKkj^y6JK73;5A6DrQ;~SM-UW3dduCH2kz!J|>8{*!_)>F-U4|S{ygWV-h3V
z$0Lz6{Ipo^5<eynSib?6a8$hX8Ad9LikB9{eZv1aRxPc$X>p{*H{PMF;it(G`p6-4
zKhm~o_-V25OFYa*J(RR9wTRM{7;j58{8U)V=?@9<O?KgylU}@eDM-A!5VpL}akt}_
zX<||@Q%I~rtPs-Ok)jkM?^u!MK#s$ep#DQ|mLxtv)g?`;>Q$nERihH7S|QSVkKig%
zk#_}sj)}Paw8zhS30!CiUBC4<*4!q-cpG<aiM}qh9^1~ov%Xt#UH3ke?zUOdn;?C0
z=`=VmmFom<6Gz+=h9+kEW@I_S0zUGtd5f*|Y^GK2<ldq`UViECD;m6GYn3KFNuL7R
zy-N;faCwir@j49hZ-b)=KbK3~AA_&B8(Z;aYVOnWZwwMBCN;W_TcZQ49v5W*qg>^<
zPeFVgB-Axp-ENa+eA;;MYcSIdS~|5d`bM4f-!_*HFX_8~-k+7<z~AjIqV5~I9ih3{
zDzsYRo15M4BZ&`*eIW+s@)JkacRA1m*xXn$y&gp1_cV2_M8349zbKfzGrIP5xFWan
zD{@P2W`>vTG`0C)JeipZ-ZkR4m|w<#lUYH~iV0l~3$)8rLPH<-4Z;`<uj*kCm&q~A
zj7UJCC{h;~(9hWK85-1&QPIM}`S}wxyrKn$lc;A<(Li{q1%?OCSKiD$GDNyh<2&Q4
zY8b$l>?!iONj3|7WVO1jU}%pFIk;k{4b(Ky#mM%n>hui_6Rqu(>8ysu2q@cRzsFJB
zJ7Pl#sA2@h`X!0OB<AC{qC+`9oeQB$m6puTn6YUHs__lbPETXnYcgty%Iu68|1&D0
z#0^YX)@=w-sn!G#6IV}s1eQi_MWvUQut?`jTr94YaEW5H34C9SQ!EbAwYkdiHI*f^
z(nG^`vfu4CKH=luaHL-IgwiU7nz13KE~d`Q4gD{6(%N?6y4eERYTcuruCg{y%hHlM
zYJx@%Bca%Cm22I6w$7eWT3K=@FjzSafhi|P0MKs@q$IEgpo;X*s4QDpxzruNAa{s;
zb%Sq)Fl`qw&;#DaEOFw5VfPU~$7W#NZeT!jsF6Vaee}&ZY6e;uq8;PcM_6=4iaQ(m
zS7nl#iB<E^hbg}2zc}GD^-wH{g8_(GAp?w3ZvtVEZy23kF&Y3=3=A+HF*_29Vw0k%
zd+5QGLzuIA)#`FrXDWs;cUeKvH0~jELn+)tP{hf`h+nXM!hh&sQc_)3hG^-1uMxl+
zMo_HVU{4$qoVo!N<BmiTp?lE_VnQSJfkJ)CA0#x!p4V*##d}Ed&fRN7d~8J5>16;H
zlcT~9PkNbZ7FsCR{5F3qMx%X7d_V0lC}t|t6beh?G9u76eo?qTszfEMplIghG*THg
zZ1kI#P9j(%(~Sn*bpOZACcH*0vbx`xklPqJUq=EIUQoE-7z#svS75}7H|VJa%kQUQ
zmUV3vUg=zAxO8z#<^hDsF9V?<bv+CsIYOd^3KVEq`ePJ4EZI0ve|M-Qo7MdEbBon4
z#%kePtak;L$BL85i*JZwSfMxdAc*u3B918f1T`@zK6`)=tN?0aX#AexDEfdP;knc(
z`i8os>lqPB0EGbv<6lX7%L%px>S_=`wvZWz)C7d{s5GFk5&x(?cCZ$=!M+cQ<U+Gp
zy_3vlw*I+g4d5a8rhdPwn$3mq*ewnbgY0p2wE+OQ(De&kG!p!msrx6r(IjGNtI)wh
z8G3=G=0Zp;B+)D^@63aQ=300-KLgM|f2tzX9Kax#*dvr^b;?vAN;Me3s1VH8f8a+E
zJ=yYKL#PCAV}{X@9~z8Gpvwk`l=qbCQ{+mm;M-uo&jv;F8R=K$>~wLfCf16-!%>8(
zASk;#`Iu__tX=|ziPiEjhv75PUcFMtU^0)<V17o_^))tA4^w8Pg_aK{yPy#fKNh$P
zT=fFV#*Wp*p!g4o=V69j&0%c$fW?{`1dz>u<=4dK@%l$E83*j()d1S2BchCorRD*G
zDSP2{5lST}7#3<A2(AEQZ27begspj13krW^<aoqxx<kVlBo<mI`Ni{Yw>bpF!TEP(
zj$B~X^-zd_dW839l7JeZNL+wGa0pOvI@sg^?@1K%CqJa$?~v?SrSkl`gH;%efRTSU
zW68g20?~ajBnt8q%q{~x3VtD;@4kB1^I~bMqJ#tk@5H6q2Djbv_;eY_idUst(b<?M
z^`5d^pqUb7j}$8^MmkF)HcFo&)-V8J6juWIuLNK)9X2LNMj%G<l)s0Fr2kBR`4wf)
zdGHdQ+K~a}c9z5qM3{c+{l+e%sYq3#i`OrhjhxHgykI<XPKE;>IoF0V8966I(;TAK
z2GSp*Cd0_)>5jE(<H(H+vC@`$6tI?+A=)E3ic8-S&{|edw1<R_wmmz&4B+&}&PkcH
z$Iewyu#-MD@tRPTCjylDb)i<O=ub>9(3Ar!8m+8)hgUXRwJR_Wul01*J<MTLy8`=Q
zG`a$nU{t#T6__--0t>YJLkO;!60L4_HmwtxNpzF8i5=>Pl`6eF5{j32@Ry(=Cl+7T
zWBJlnO$!MZANuD(X?k4@iT_N=Gi1FB9VGNOLfzn71j(&R^`doa6{J3;6a49W+Cf63
zl9s<qEw6d$_rbXA6{d9+B=0jNPT*o#Y)!0_{^2Foj4Ty8Ih(-6_W_}r#oCbRB${0p
zW%;I;MG_eBRZ$Dc<f2FdrhSUo0)m_&<{&rJ%YXELMfX054#gZ*kV0TJ9e^O$3{%I1
zqhSEVC?>V5Z%NYj(1GEPKGNH9ONCC()=$#g`4^ExNcK%NGF#lLYC+-Igm!7?08PCP
z1gI5IJ^HubUs`##VD>Vn;fEi!URYXr$Y5>)h1e!GAG~j4H~X&<P0LLS>j6ht<F;fQ
zq;8;<olRs9D$#4XS{&VG5T@+)bZUK^oiJ4w2*n+a4}lvMTiBFG?gt^eXTcNEdT?YX
zRLcs&Q?AkoL=rPICd199y1iO&j}{-p*AlfCL|a0nkkNc;c0Q$^S9>+KmFtzGtFI9s
z<AK-R54e^fly6ker__V<_oiF9R3R^WhrIYuPf8yLEJRuvpvOpeJvRC?J%~;#_YTF*
zq5p~Q9oEeU8cQsjsp5@OqlA@Cl??gIj=hA6wr8^EZ6b+DTAyBT_&bo(N4rkG^Tp>I
zA^)=gW;jk5o$NM#5G4%1e{U1&zAg-3znLTvp1jW06(#@6X21O@WY{Cmx0vqZLv$ap
z#pK6{I0K9Lk3Bgg=W;#lV*6~lSa_$deYV2$6?SHexjkD?=W~qTzyGdf^h00ZC1E3^
z<t`mjl{ZO)LUMh!>G<DY-%n`b``=G0Tj>3JvEZAO;;)mxPW}g_Qd^7DKoow@ulQVq
zNuW&A2SKdyf*WW-Y)GoGh=go%nhd6s@l3i>cK5$a(lnc86%o(Nz?pOTF6Z@IQyIsZ
z&tdAU-8H;V^NRBC(o_cTO47txO9ifv_|WW4V~HK-xw7^^76CHm?C5$+$5A`D&)jGg
zrC-80S#Lh2>r1=|@X}xSzUSfA0f3?N>o)`tSIvRPsVK;hE=cE!ESP>A6caK;s|Yv5
zRy7(I-8{LF{)NO<b3n!fK4`6U2?2@8c1Q>*md^bN*|7HvqX%12RuJ3Nl5X7*VHc+#
zSFE<%XugmOyzqUjbxW+X8VT_YF+%2sg}3ax?jOb~t<sWOR}{*cIy<J+6<YCVLs!|M
zP2NXq1VI3i*Gk~-4v({@GR1W%rmbD<ezI!GO}3X|9M2#oBDR!wehm&Ojbo?s+1yuW
znZnISIlPcids8<BxkF}#QLiV}1L2-DsJ8SMExVw+YW^RjZ8>E!b(WJWp4cxZ=1U>P
z3_{HQOzbzzCd4M5wyesM_~fEHmiz;o{xr`(1jGY~**GptKPO?FhH<=!`=r;M?k}}e
zVQ<qg5dH37aY&VtRAq&=V<;tKV~D9zB_zhTb+Vk~(ptDqupLlA{qIv8w@I_Ez$Eg)
zP2+p#_uk$4-TPu$5HcJBD@`tPmQsaGoD|CfE*B_KF@q_@Yq-u=MXpg1k_e{t?*Em;
zp_)o=(hO6K&)$s3+3PeuJIB#ECa2?3eERm)XoN_9699lh@gK|}Xu}LopjRiDkb1L>
z1y8nnSt%34a|u<<b#?U22KznBBe0M<YxVF9d~eHbz9lzr0X>MK2pqbFtR98mORf+o
z{W$$XDV%^eY(XnqyvYu+A@yp1hW&oM(T7Wgrc@H<M|rsD;W5n%G*0ayow5`HUPKXS
z6j>NL7awb~WcFg(8b}lPSbQOv$#S)#$r6)qPX7*}3qf0bv*6mG@|jX>-4x;98pIob
z*QvA@48W)o>osV&?@59Pnm36*|KPqqPq~t8g}##;v=g^=mGVC-3ns_?-?6AWqtk#1
z6M~i+6|FkPKcv`wxwY`Wp&5n?G*uvHg8!=K%(YdUs{8ixVrPvjO%suEf%<D+35Doj
zF`hxK&e|BzbDn+T0_`ax*QLTRjJZtx?lk!pK21>?o^e!znq_xjs?ow#Vb*@{X7>5R
z)$I1pqcm}Jo5rwQy!*RO*88BF&@z2iDu`^)w|wn3i$zTKwl~di51_gu>b2G1S+0;J
zOJ~ToN=!rNe26X%Th#XbDOaDkW9((LcMWaGhCBf68(nW3H}c)TVp159l**EO@KX}I
zaUBQsAx#Y1ZE=VLf!ZBud0vqVk}Jn|$$vi#$<=;wCE1SKmlKfK)^djPJ;UMb>z}hE
z+u0ev*nt;tm2eF+o+5A!8B+%23{K=ClN!}%2kfGLG=L90)o>i6S}-BtwP5boH^ncb
z7>{Tzef}v`%;6U~pK~T8y#DuS>VJQuF^xx4yOdVHlL}0NFw4^vBAMMOK2HoV5ktx&
z6dHkxnN$mAxD-RkQe+xo$??|0y+1oS{cw3os4NpEVFqrQhL~%k_%t^d!!0)n7-Ce*
zTtx_xjFEU7@9YS+K%KD&S4>|Y=SHTI#ji+4mdcZqY5iUjr@$9kiVGA*1B3I+i@p7!
z{c&K4j%ekAW$qV9EleRs`s})|;1C4f!gXuY>&jmJ!K(`7cnk{XTpLslJ8H+-iUr-+
zWbcT@aldzYx0p$B=k^jPOm7I2$=kDw$z;?UN2_n`Zr$*`A(WpIex}$0Z>75FHK}Eh
z;Y()FDvEjjP_;HGxN5O$B%ol^6hR|XQNqRC;^HDo^B5sxCV@WAM=+BL&QFgoAY;)D
zo1-4IcF|~l*LdbY&zVX3M&-EL@=Q1j!7q#yJOn<2JDGz~cSJ|75tvsh7nX{aSP4yO
zPEvssNZ!PahA81_tWZF|1$KQRg_bE=Cb-asi3kTn!d4d?-10Pq8CTjsD&>s@pe2s1
zT+kZ(cY%6LNMf!qGE&_Qt%Y*q@R$Sz%vhRES#(1zS~o0|IWECS5<*(;W-=EsOmQX^
z!kjNjA$eAqw+$s;L}dC>V|oWurZEOtlNtOj_!5<7X~o(LG;dgL5~<)Fn{pIzE)9x^
zqk`8n`^_8ekc=X^II03{7j@u`MkLEfjLG!N@%Z-kc9bRA-i*&jQq9MiR`hRge|(?S
z2V)yg9QzfncK*9#t@*_Zc(Y^*u1`{_bA^2hPhviJxs*I6NLrOC=P=qZ!z0-BhW?JH
z_-dz)$ANzp6gL~tyGs<YRByQ|fW|ID6&UPK@Q9dF?C!NgH*EaHg*iI%s~dY{3TOPw
zdlYk%=yR<O;LrhEFW$IM%C+%-tl!}+S6iX4A`IgzY(0drDyID={`XwltY{yCBa33K
zeOfHKG%Alwt}q6sJ>uRw=zDiXV^9rxaCo$OCgt@nOhMnKK8LlofTCM(2=?bcdV|5B
zvExSV)nvR@$VdX&|L!8*Z;QAv->H;syUlCy84f8t>5ApA;e0Jw)+v8u**(cAz>aNr
z;pCG`ycbo3wu7bx*P4s@iBII6l&$k~mPPrwRp53q!gLm<rieF1CdSwWuOMBk9Wtia
zqDEjDdFtEb)09Ur%SA+0984yW6xupWzXYL@C{I&o<}Pa51Wsvr@2I-08sLg$#N5l5
zTyVo#%KuXsQW0&vNq=i|q0r<?Y#*K)yv)&@dmrjIN#`@@Kf^_4?)sjKs=Eyam8JCY
zlte5|C%Hy7p-m<}8rUC`1*$pryrWN+EX`4eahH<uJXdz8dHIuygyL*VEFOK0>>?;{
zqNzIuwTXCFiAEcUXa=sQB4Z1AG}F}mwB%`mWBQhomJMQ5l~QJ*RI-WO6Cd?9kXZ!B
zPV!uI2vb)^WV;(xpLBY&WG-0NOmu!{s+87J&*FGRz1_InDCC+APMYr6cwB@+=Yvh)
zVP&g|>j9=3H{#u`3)2ZSEY=Gjq3Q6cu~L>4<vK@g&jpO?a}>U?7y@#WU=fyqWf_W?
z%6F+~N%5CI21tRLzFu;f>-5g<<PIBLdyJ!|lB(GNY9C)@09+;Lp&L+Dclzp4?2@r+
za8Qm%C8en{+Q4FyIJEaB=HSl+NdUxQ@fC5}#`X}a>+cp~c2p0`eSNvm%4&|gLvV&V
z@L#;D8R#>QwrQExc>M;=XB7+Us>Zwpx4=rehT&&nw5_!j2Y@aocr2M=&<?sSPaDbH
zsr~7+AIze=uBJaM4Exjm=Z4<6)@VX``ICeF{K<oUZWRIB0NJgbxon`hN>!J|Y`NoF
zophPaHn?j*TL#a^5xWJB04r@P8ay~&A9Tj+RRigJhU^v6$3^XNg*ew!Rg9+u*}J~(
zJtU?d*!Iw07t>9m<gJG5GqGeTkB`+nr&jLimk2Wo=8wn$wzT_e^T2q#vagmsksxfo
zZ0f#(_x?HL;AwKm!FSFf+mRUteOwNy6Wo;yioLqiz&h13dv(yE*WJ{%<lvB;Iz>^K
zWP?(ojGPvp9hP~lfZc<iK8I|=dXKxe=yIU`562*+*t4fz@8Uj?EOKptT)~D8R%w-M
zBxg5Ljeh79C^Q3irS<r!OvLph>G*lojijZBN@{JZvddqnap>K=r7Hm}RmkEyD4Q#t
zy4ytB<8yEe>%Fq?cnrtc-_GY+=qFCx8xL9qyuvJH5hXn)?m$wWdV(X>gHBZCfvO|<
z-aGx-09Q|a!CqKL9_u~`bY;cuYr}A4=*0W|%eV&_#A6D!C#cspmTOO5U}-d=0_*Ws
zc5rVi`+tIcWP-h~^IhdiXs|}mIR!wT<L+Lmk*GV|#-1h`*G!MF$i_TD198ViM(dKR
z0oK(}Jz)Z-NP`G59eAPyqZ_ia#*9Etw@EGW6aWRXmAC?;@&X`Ptrft$C4luE<L%h=
z%AU;{+V(b16AY`Ng=X;e92KbSEKtIhNaG7IMHJQA#191((-RAptu>n9W#A)h=Ol!$
zAKs?JlDh6E!$`UWewoNTjaTzZ@+Qw<#(3(-KK#swpLvOLrBIksW<NjFdbkctV7ps~
ztvEYAKgkQb@gqFs2P~pN7vgFxq}g-)dD9sd9)({F3hfB>LrC%3T<kAE%PZMO*v9b+
zNxy=y!wSj;)MM~iCisPGqx(I2I+>w~lHLHGKd0zuP)(Lh^||1aIU2iW<XP+uhVbs}
z{nhEk<d5U`XK#<MPA9*7{P_O#_`?8xuCfO&?QLzR8z)$kKNlqbA@#1Tp!m!^CT)<5
zQ_Ukyr=-2`Dx%&Lnkq6}Z&KAu^e``F@n>tZVnoZ%d5B8vT^m0(^sFiooJ2(9Ru40u
z)iB+r&Xdm4NwMo>1?8@Wt!ReOqi5Dl$u4MIu54%xD!pf_b*xqosn%)S*N1PpgN^ld
zXKZ)Bzh*+AJtuJFXc@qdozNR<y<E`ArVIE}bIZ?-;%a+9@N(N+4E-+DL(Oqp6Us$7
zk-5%jD(gDUCTJ$lwlI@Nh`vj71nX)ecSdtb%nn@|RI~2WR^_<ma;pt*_O@Ei${M06
zXmS{r7Oqr|#J*KbJai$@9szH;#<j{=$<o&b!HaA=`n;0qjEk5?1`CMRL8vlTNXHl_
z<JzoY*K)VjAb9U&`CT`5vMyh|<HGBvs8{VcDp7cwpu$R}#x=w^<6=WX-bPg&`NhUd
zcaA1v_{^0HLl;Q5R9sUF4ZV%WWfA4eu9{A3UE`wc`Q&i5+r{B3saW25Be<@P{Q4DY
zG}H&yHc{ed<ih(lgFvOmX_~6H?6QpMw_rw&lp*XU+yqYH_Upi5yO7zeW%1uaM%>|K
ze{z$Y7R6$}Af-n$!o8}WjK^?k4>b0q@+%!*>`9eKyhUINLFGc&`#k}_{`$vnHIX^X
zv-#E1@%(w=1pOW@p8Rooae4OfL$B@a_oF*Wdg0lz`zg*U%uYshtILOyj=dTj2QNq#
zxR~0RcV=8NbS@Q3^yMT~!NJ~h*qY&RV-TyDOQ=#b_V`*kDy6lCc<PIm8@$69rgyZG
zD~P00s59wqbX`)bo^HER`NsK97nA&WXSF=OXlB%|DtUe7)H(N6?@;d6^J8!celbn<
zs^PfKm!Dg01>3My6YfC#b<MLz?A=Y}oJTCB9))iYYNL!QUF7<@H-xum7pEszA20qj
zxja2TzBs=6crk#H-RV^=X81`F3)~tM30w`<x^8YLq3zN-pBBv{i?|-XZWHo&??BdD
zQ>M+i)Q%UGN!>3{IDT3?G<MPXRFeo+K>NcL(niE}kS@|4mN-UspZ3xYDU@wPhpH`u
z)n1gMPwg=$pc5FaXm9AXWB`7Ip8`zKhu(8xQ34x?qtbgfZr89)Mk#a@C-YTUj=3Vk
z@oaSRS$w*)R`v5O_@w=9{hMIkTRBR#?N(l=HAU2FuXo61gFM2zY$`D*t$XJ6;;oNR
z5ms@btnNOQU=X^yU$x$g#u|N5_u)D#`xP&1St@y3<_)#Q?#RcdZaXhPhtQjJgs#o^
zzVvq8UdnIqJ`B|ZXV>PdxEat+M|`MHZM8HI_S-s;HB8@~qE-P}b;z8Ef_+<uXj9XD
zaqrXRu_Y0N`a8skt$d>WT0!&kcSVr>heeS6r;H$BX+1Q8RIgn0sAj|A%b(}ZSLL}j
z3fW?!P|I|Q6OU?=*^8x3M287(7q695S@#PC?fy{xEupf7-}$mlphwZ}GT69k-}u?S
zL%1T>k$f4+j9y%qDWmtiJ@QJyUt4{yaOvLLjv{n#9ay!Di8h!ixhOEiwOhm%qDBF0
z#a?^fl4M1iP&NkZeVF3S(3dZ#T*Uo`wEMwRP+@UR&AS$p`+xPG&$pfb0fkasi`y^|
zeD|-|9tAs)IF9pi<&w~b#t=hjjGgvX$kEynxRSb-uY}(H_hRRq=AOC_0`1PQni;J=
zo3nA8@fdhxb)~uR&Dp@05)~4+C?LPUSN+rI8p&~F0ba68*pDd9;=?x<Z(#-VU=aiZ
z_~QTow1^L9<N~Q?H7e^3`cYfgiRbQ)$7DS5Com5Jh?PZByn+nr83`gHP3~aXv0l6L
zBND+H-2N#L`cppuLE0D;P&dYCvQTKc36ZJ<tsvPYu$ub|;7Y(nH^2#j8l~E~>))yI
z-65C?d5zGRlDNQ*tO=SL;cjyX`(p;rlEcHP@77oqqs9ns5k{lX4<CHk<eIEhrGH%$
z9rnwA9!VuxiPm$4tWCu)3|rN;`_8W3?`)IAuwJjhJyp_$mlt^7HD@F8(!Hm)Rs1Gt
z(aVn8C{2f*iEplU&H`37{wJ`u@O0K4`Hp*+jU`!@NLK;g4bl>Zw_C)%XHm+cG(DtU
zbFg$?9f$B&BMF&SCj`c}ampC@;EsD^$9<fPkXP;JbeAp7Hl%KuY~C<Pv65C4C@`Nd
zX0u`<^7$i9AMq5<rg``&m`)L&o=UX)4(<(>&R^b{Umhpmb7<)6qVy<|Zv8{9-BsD-
V7PkW<Z0~07HzWf9002iqO+wZDJ|_SG

literal 355805
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%0A3GUw*?ytoafZpp
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%0AbW<t2
zE2|k^Rr_#-`r=7Vl0#9(DIGWISLQ~6vzL%3KA9Q5l0Pw6T$(%}et=_X0US%$iqhor
zhy9Y1d_pRcXiehCA_95xLPEWSn_m;uhg#^YV;)@k*x`J8Ey&+R`#EyBjHV`CC5Fgg
z`}$iu=ybqKL*;iE;(N6TQ%(}OjYD>EDBpc1dt>XtfyhH{70j-VNSDSb3@KbB*9hLp
zd|J~_8F#{IzkROj)gCJ+y4#oPL)}fL6C&V43Z51zk|nNm!=%EMETJvjKan*r>tABF
znvkO5!Ejt4uN=>1#Zrn7L->VD=RzsxC3XIbJ3st)IAV0skqP>)2G~_9E=eflvVnfG
zmcBbvCH?R()JRZO=h={Ud~SP%GvF_WcV-H?zaOvuHvH2vU^IJwXU<@(g2{s|kbz(K
zR<FBhhAmwqujOdP?U8Rkq6B-618-%9_(<JR%wF6!75RjDGIb`xFXgwE|Fyh|J{y*Z
z+q+ECz8Sm~bc7bvniw__noKl~ph-JBvpt5atgLx@niG3;5?4>&AJk}**BB;Usf(xe
z#DV_@qCj20o$du4A*%(s!lUnS>g)qVsN+aLxNc{w^&%@X-(x*b%OoMI%&S<WiLDoT
z4mM=+RvVtm^8dL|sZ1!<YlSKxdka;D1fs|BWi7}&MQS-OW%fE>$4a3s$Mvn!Rb`c~
zdRFIBa%jwvMgb18AUV#Q{$0yU(VE6nS!-LjwttSI!agB3?hEl}J$y`0bhV$9Ws`bw
zQ#Z-#<9M9Yc<94e=fOMHlXv(>uSQ#s)YpSIwtC3?j~R265fjg=%x8$*5wqRWaz#^Q
zLI0Be<uzK!?9QN<Z^~SwaQ7S4SZ#9?HxT~rU$L2Ch)wM{FhffNp)tW}GsDnK68fPW
zy~=mGI}K;)M$-AEK!1C8_wJ0b3oW(B<N5>Pq}A?fpGUhZJ^7)?idL(CuLbwuHd77~
zl}o_Cg|Hq>0zQ*)Gan~L&v7hzD^huc!X)30I&dLIN@}<=Ug}6m3r`XrIdj#TqsWY(
z*76s|vbv<qbBIhaw<^s%2pvPNBB>o3)`_uW;g!){C~_%qY@+0p*S)wrAHKX9k}CGn
zXTrl&IEa<=R*gz8W0)$R;SBD;nbJlQ4aMwnztz%WEFErQv7_M1<a5-O2j_lX$j1~3
zc9lOtjnRd%)Sewet=5!j23DqW)&${9X)mo7dGjqwpW#M-lo-EQ!j(uph2<H>Zm8p1
zDbCWdP<a!Wek)P98lqe{SJ`d7YXSb)75d$SYw1g?9o$~O8iGndPNbbflnE;$(yq`s
zIrD^@#Qo!lfLwZ-GW7pgrOJ2VV({W-2!;fv%28BUePiX!NeP+vg*)l@krzi=`hG+n
z^+c}A@v1mdM2umqW*GK6WPeq_vfD5+Ca=f({I@7a2sk*3YlL*r5yzKJg>0(L`Z_FK
zMT34k2&dp=o}8RSMq?O!hyaA%gcOYs*%PvwN<kOG@Z#0W^V`dxUxr}^@oiMqt_8}4
z#2ua17UAw)I6Q=d)6?1-ejgNwc!;cwvi4#B^>2gTucG(Iaqs&#{lji0hN?;Hht>wj
zHIQwFQ;~^X;e@9C2RLmTB;1a-CSRIPtQm8Hib`uSTR?6ik;_eRjL=5D8ywlxUgH?d
zj*ol6?0yo=zDu?QC!$sPv4m_aBQ?fUym7W<1-n6yP3<*$ThEgPI^e|!8vyDYaJm$E
zj<Qw?FCDfEPSK<(eNlR7YXj3vdBmG4e`gb1Q!9#WH@LE?y~g#R_vhB@pP5P<QO{RZ
z!mogam+l4{HnrE#Y`5x7u|HltW{cCMbd;Ad<<U_t^jp_CTIj9L87gKiR5pde;kEkd
zs7GD;;<i3EppA!2Oz4=;8+#;KuV0{o(&*V&aD@}dZn(mx_L?iO?PI)1&t1S98R+^#
z()6}mun0%y%O=^lpiu7!M*7@q7!P_uKRD@~1+RO*2k*9uX;WC88DkMO)w94-NnOVf
zo=K-->A1~eoR`${-CX3(K$Sa4OpLlfaZ}hgS6{i(5)vunE=0mwB~sbMhpIlk67cj=
z;`j>cu;06(4x8F*>I81fbzDPP6#uo5^U~cw!>0Bc8oa@7yT{7pOf(mrLr%u1pG)rg
z9jJOdTDj=H9`r6mFL?u-<nGxHuSm1~zav#4{dYH|^U6sF^zfK+!(=GYs;Y^iJnC@s
z2xb%+%dMHGX37$*yb~Bn?5mV1u^b~^G^SA*uYz}(&_S+k;0iyLQbX_lgGZczA3S_m
z<!`4Z)qAlu6U_N>w^5*&QT#fJyQQaDQ5A&2&H3deOhjHvsw4s&`iK{{1<x7{Z7ov-
z6!o*PtGdAl55ENwqb1@sZjeffp$^bYm%GUNl0TezsY$r9YK2Z^r`anEsI%nuq}k}Y
z%c6NGs5@8=C~E%Xq`2m(yw<aJ6qczCcRu!?%}j0MPQ%^LFrO8CN`0#))R3=n|I1v)
z;qFIktH%Oa(LNw1bN7n>bUI73OKhjP$BT&%txq)2Bs{4&^Zq@{!c$_-XOy+8AauU0
zHMsieD*R=5eM2Yk@;N*`g-6HtkB?WCo}sc7p$Mh52Ge}A*Q3LB=L7~eE$L;SapSjs
zUEg#@a+Lu!HZ`M?5}lQJOoL(g>SlNyJ|A9P56=g;!{?oU3dNd}JpRook@|1fHc2JQ
zY=uLU6+X270*#c>YTGarhVS(hXD~=oM$*gDblsp$SzvUbDZ2_7MLv$j6iJih#b)%~
zcdRU%pg5{;g!O+u-;soT^U2nhvDpQK3wW-jhe|308ZCDLOa-AvSa<u%=#J*Z55B`G
z!970~6L{cTi5gZWpcWDx+*EPqvp;?_6=r|?mwzxWma7`2Kp5LOxvK+kU4oJVwI{Kz
zjN9`djs5^uA*Z=t5)bjaugkl|<9gATid}}92RLvKrS!qcZ4<DBgA6q#v;uD$Cy+#C
z?0Cjl<NvK?voflqDr$2VI*UM6?3^)K!FaR!vMRnWp4Q86kHzvHZa>1+B|Q`P&43<<
zp>djqpN(_~MRC7;DvIf7wlyYDBivqHPH9_5bM|tq_^xWS=+{(WORf6xNc7TzE8Xlz
zlT+an1xY%7AFvHXoV51X@b&d;XbvxAJTJ60KO>|xFZ>VXg+d3X28A)r2~#L9Eagsy
zL19dD!W7C2cXZzMpfIL6VG8Ai${f%Q3S*iRrchpJoz%ly8q=IGh29|Sr-z08YgU**
zd7-Bt8x9I%niHl_Uf5WB<_u$+6Q)pJ*q*-^?VBz}`}$`50hN?dOT#b}h2Qflt{}J#
zaqrtuVJHY9gZVfZS$ew$(<CIRYZ?3RriscxI+MPX-gD0VZdz^^54zHXOeX{;@Lq8X
zB^L<(uBmaLN^ljzx~oeiJ6~fTbdPu5-1|pt49|4OQNl_&l#HW+MHwoOHfHXas_(!3
z&&q^$Wg`SIr8~p-l>;gZ5S*d39xO{`YU;R>x1a@5U;E^E2)Wmn<<r~xsc#jgbQN`Q
zpcV>lo#DI2VF3s3DzEqxSk)MY9#n*hr-U^2_bi*05}ofNHcQuO1m8u^3E?G-uF6KT
zeu6EwzOfzMu->wzLN@iycnn7Z{`zsjnL4U@>u0!j*t+oyc1j62f<f092|A)?v-3c-
z&f!E(|G;%cFTlN;2k!%^a3-A*gYcl{z+)g4UhqA4gYcl{z+)g4zBg1?gYcl{z+)g4
zF4O_dAUvo!@EAyiYs2O6YY%D;JO+~CeR&w(KW4#0AQf)?Zw?3HLCt~3Kq|b^`ocF4
zY7RUGQsM38U2C(Kt^K=gU+o-gQ`<=LJHKMWc_Vo-gzVMcZSf2tW|J#IC?J))vMHA=
zkFh|OywZrrCH(j6o`*CVjby`y-OFA00P<+Mr>9@j-P2}kcQ%<VExq`0iTp^;CP7NZ
zK}ZSwop}i(@tCj)C8u}OaU9*jn1AJ6&^4Hh^IgA94!mJNBXS%w8u<ZD$kv#Tyh;Vk
znjcSh<ots;;poO$7!p68-6g@rgb^<qkudOSl)}Q%I8LS>3*x9lW+C-p>^h(~9PaSl
ze)s6Ki>Nr2Y~nF;<E3O2q$~-B8KWa|6R-)qfgPlAmiQDF8gYtWEG<Rel%}wWd`JEL
zcsh$C8nON<V2Ca@mzJ`${&l~5>(d!hS3JFo7){22baPSAchR*M2BW>?BAdd5{Kdiu
zPO^vvQ>p=i1UZXO=q#Zr0HwquDThNLdP8{jd`A3<hkt33Dj|N10^|@G(Qy#bl>C*j
zyBYiisO4hzGI57@jHVsVPBM!Fz640_BJpMuIt4z5S&CEJYq>7@p_itpOenpa2E<QT
zOmMRv(uo7B6TnDrCZJ0=IgBp?pWMY6$QQ<0j5vcSXasVMjAEKb4s6Fu5OJI_4n=Pf
z|FxF{2o%6P>V+v+3ANo<UdAS%hexn$ppN{S&@1?}HG9SU$xWPGDTU2vzRfOT^46Qi
z5!sr+^8_DXMKl|)jT5EXuh=AsZ&Fg#3a)tt|2aqY<VPXcVqYndvi61{?U4RI(l|P$
zu$wUWHx4a*ULx=_%Z6YtAc-ht<oKlf>)?3r?5uloH284xrh7uRNxwR}Sp$07Ju|@a
zkvfnM2M0K3fA9G0<4HG%D-YKJe>{4>ceekw`)06rIym}xc$mXi-hf)y(0qLO?hN48
zYd3`x21g$T-S@|5|0;G?8g2%D(>;9mzOqNlyJj>syt2Ji+fBfi`sm79(tx*#<7}Gm
zf{Q3l=sr5gZ88QmrxHHbHA&Jqi+t2bG8k~`lFVnW#H_E-mhjw@;1BwS8?bJ$U;y(X
zUw8#Wd53T&pfw9j=vFwaLh&l0EK4H!x_AD?OA_x+zI~yy4whg#xfx&F<?~4kJZ47I
z_68~7g)!g{oEg;fC&ZQ0(5<wt$o3AvwY7Qp6O3_Mz9raDO2e@^3x6cCUhC={7}UC6
z-5Cs6EVk{oH%s&H2?Yrt?tYLCIE^l@{rq_e&9iMp1lYu8H#X!ZVd^3j7;7#SPx+%{
zw}cb`_Z7i@;$n5te@A%Uf`0+#Dj5QEnnYeNV%*b1M7*$oTR~y%{PPvPOJOL2NMdv8
z(RzTg5_@)AS6o<*BV=^NC3hu0T*6AyV%j8vU_|T#VXRV<#EHMVyJANJ{G<pov?qt^
zwE`~bOH<N~q%Wd8I@#A>NqK*d>XtsPth9p725m+$OSy2CN{+%wJ%pIW<)fWkg~-M{
z^?wDytv8kG{zbVa(uyb@!6_?dl{7b3S#J#Ix>SZQ0X*ZmtROpN7{?)KYXrg2h#v7l
z<(@kPBb-(|9;cL{I)knYPMXRN*x|h&Li9&k7|L#z4WWPh_IU8_=xp$Q@1L6Xn`$9w
zsz^tU1D>9IJh$?`FeV9r#uQbt>BiBD%5vtW!?&=y6GS6=`(X^|I*JSJ&8lJ-vcBXB
zcuBTk*H#q^ET*CuxVn=cZ6;AxzsZ@W@s(^N36*t~dj;fHrXiYVW%*Y)7Lb)~Nn=Q(
z3pUXY6N@Vs>`O64a)F|!QtCr5Wq-0_8}9tuP-xD#2P^fCO}lbN6wLgZ`pv2MHuSnS
zi1lVO8jV!^y0*5~O0)4exXpF08pZw&!x&Ojn(yvj!}i_X8)%-;D%LyXX&k=L>+c?4
zV*Bp#?cjf&YD*AMv)*~LCSz4{kGYyc*5!~w7t6<vfas8yx(wywkPC9w>Ac@1U||yf
zKqMJ%7GYi7b@qRBI;Gj|1<y3!o6^v2I>C$#yTp-tw395l5{wbzf!)7U%qiE_3Ya(y
zy;({>O~4`WQn~vm+b-)X{GGb9gkB61Itvl$@(Xu&qeuEtKk2jn?fU-t=bt+FD_?rr
zNc+Wdhd9J!YKJUqaLX3K6*~P@ou(g0%nPD)FS@Jqn!qb`n+B&US*&?N3fPB|ECQcK
zk|9(|KLucz6?*fi$wIH`h2>n+{&~rp7Z&<wcQe{ek{B}M8Njfy>%6CI5|7C852@Q;
zCetisaO#lwnkGpw8d0=dSq+CN%UD6gV!gP&iQ;HACskP48mPfwaPaYH|Lom|qrsq)
zS0Ol(w%zj-2Y}cEKLAo|Nl?fnXIOC_q}KX|lqpLxx_DJimT9$@Re_~hLc2wTYlgQL
zQ9UzhuM=3=56eheO}6q+v2B}h>-{Z@8MQ#P;3dUb&S%$A5&4?a1{>EuuB^1~-#8X~
z6$DA&@ZMwo1l+1Xx~3$f)w_3z6FA_79S59&(|YN&7vSkB^OB<O4clqps(fvf%_NKw
zt|;!Oh+pzw&TQsCOcDaf@md8iCxDXBhcqfa=*MwB`(}byrmpFG1Oz{fYXSvzZVDeP
zj?H{gqmn2?g8X%3IPeHBEuNZP-ftOL*;#CHdBUO>b9wRr|E67@(Dk`4PciHda(T7!
z$~X>3bX19h%xQ%q_#L51>Gn+Q=nsk_l;zdtUDecT7l!8OYfYl`4d`oAiDSY1%~EyH
z(z&NBKQw8+rMv(q7hiCLsQZqmP_5>){{K<EYOe_&s8*b_k5{e7Rsb3=dV|K;CrG=~
z8M|{E6BCu_sz63GLTOlQUG`-hMCt-pULJQ;+ffUo!hQwGNde6B>z7)yi*)VzVP7Hn
z5wxn9Xah}PUav$L-_WEfC6`euZ#$A3&QgBd0*Mz{=p}^SVlP$-=*%1QV^n%e<4&BI
zJvpeE<IuZE(L63dJ3LUT*!Qy}q5O7!ige(*NXYz^RV6{lY!8r4<wgP+1S1VuusRB+
z5HkZbSfiL2CnK8B5%GK<9{F-H;dCulir|an!8Z@=XVMjk-GL{vxhB0-QHy-$jb6tf
zS*_AhC?UK&<-veM98;W47%>I=st85?@fA_Z^g+7`F_M}ZJ3}~6Qo`ju3j>-oC7A1E
zr!=+p6sT)#)Xsz)OMW2C;xu5vH5^SpjK~E%MCj@D^&XKLmFrLNFp%5U-;`HbAOfrv
zhAL|*iH?(aTF95h3rp3=fpvT*(rV<%?t>=~C;NlY!|AIB&hr37zQ=WiC%BrS<~2o|
zbFW7jc~=ivf5r(YJO^hFDwm|<K~ybTQngW0)DA{845k>Is3q}}T+wi9k_cNlx?G;;
z01Jgz&M6WDhBNW512`~v%dA{5NJV_9Oe=3J1=o$i)+7i=BILqw%5GL#W>_RimDnif
z0a@F|YK#>X`0)Wnq6ZT%f;bENX37m<uo4;}pkKs`z{E{*uNx{$?ktHd&p8EOc?~>O
z^(!GqU4W%Hq9bM5QSz|HY8cjVQ7Ei9Aol5+aUlNW(Iy<<1JPwY5}lY{#8MZN&vwt5
z`3ZH-n;O<i0@8>OU0K+>Ht3$5d^i!oT$-Utxvi@XS^b-JBULRk+sdV`G1U687lf+2
z-dSs1tvMwH(tqwNqxV&=JbYCUWE9^-gmYSS^_vuEfieL;gNHQL1HvK(@-WnL@dKu0
zCfGQ-u~Fab`@F`ki~K{XCrJIdc(!Vsarwt5_SVm<+|OSXWS6e@Odes|-xJVQN7!Oi
zRgYmo$wL!n5e+r_^`d55$(QqBYJqBDO}+OUNRJC~%aS)bAi16TlA*@8A{(w@f+ol(
zs~oa`h13-d3t;r0AV*16ufn`=n8mN}7(Eq|EF!jU1Rh2xwLHX&X@)kmhVr67L!=)B
zWo-Q*QZ2T{c!%_yjE#Q*8RFkn{_yea;1}n-!`arxOAi=;H&{I?APtvPL=@VhU%r%S
z-~k6jlp0lBuzFLxYWbF54-(r#O#H|b`JD6OMTVjJFu$8EQR#dNqEUR4uD<-~=bxNP
z2r<<CMme1~T(<B6!~dEXqdHRA&~%7LJlHZ&C%NpJv4$>w$+b#jwvUV^ZXLO#RSC_M
zCOqpa4h-mRkV2&41W1xo8w?2Uv}o0RTh8y&ZaHFC?!nkuY1dDBUK@&1QxRkFKIro?
zet}Kd>IN}}>@_FU8xz*HyV`||^&VH+s$wizCn7El)Ni8<*RY9tmy0bO%3b331kvFx
zlRo3E8SDMq_1D;*(a%2bt>44%gYLn>{qn+jAEMW9!5_WC*9jDmoMS%CopW_;e2YRI
zrRaj?39C8T{#oK-LXO9HeUPY~%#~1*n<6Vbs7`2V%SOa0p4;v-v+i5x9CGEfd57{R
zoA<U>X&w@5TexTY-d1sQpWlV+hQwF3g}nuw8PL=w$?B^@5)u-yK7fWaGVBS<{`niF
z4={UO%hT|yETEmVaz?1@`Snf(NA6m+G~IT0uh+q3QdnNZMBMCM7p{q+Dwdlrp3;aH
zXolhh@oDY?T{W5!%gNk`Wkbw^jku}*h)c>a;+)X`DI>0O&uYYZ*O7c$)QEF9t(Acf
z%{5{PxtI|veOT0p#rzIgH8FH#&G0K3^15Y-hZ%F#WZ=nT)P8S4!!VeoLCU{AtQyAs
zjLDXYrtS=YKU9@kxeH6rlF%7__SUu{qo%oPu8u0A^W~Ka<h$90G)imxQseD*K_g^0
z>n5GD^1Nj(Q4wW@g7sSUe1`0_CE`V%7aD9-9S}X<IlJ6XmhpGQf3sysCv!@7H^|F2
zS%qH>IlGmg2Bmyg66wmexxpq^QE3U6SXL`cwA{`ZeB6~rqC&@Z(c+kk5Oe2+53mfN
z8}EQmI3eN=m{)apIYw>)zpF$TO{SRFsB73c*Q7VW2((Ln@q#;py(kUdP(M!izeFhv
ztGL3h;E0nE|6(pTS&k9F{{C}ewnI3Ruofq@Lbuv-!NfG%kpF*>!e9iR-CT&GxXwqB
z(LGIdv|42z1@!d6sh3_6@qZ3V2Jn(AdEbw-2yk->)c3T7_Txxz{k-nvQ@Wz&%_)M3
zE#e^^@FF~Zw${PyZ5(`SJ^qDf&IU^%ly4O8O#b3D+EbaP)g95y-{!R8GV|8Q$Lg_J
zC4)HXqQuj`<$&WG#M!M7X(6}zZz}lcrSX-0tdj9Ym(`b5!RK1b2Rc%5JIJOE*G@|-
ztGMP7swggbXK|_!2*4p(vA8$jEphpG&XJ%ktQhdGpw|_+`ThE~VsGoxQhCp!lrlG;
zv9fYrDRoqpNE+g{jv9l^l2G`ljk1R>sqe(l&d1%VON489%NUQS>u^yaIg8w-SN}Un
z8d5rQYpzQrnw}#Tb<XD?;~Q|>rVp$1l5a22l&}BWk4MyQ?w9@p?LBLA8^@8~^()3K
z#sDl54?ZM?dQcDv%8V$I1yXimf<~6Wf`kd|!n+HRw4@ZR*ovIwocJBbapFg8Uvfz<
zPDm!UOtDH2SYYYoFLA!x`2qP0*N@o;77LJ+<lJ4IRmJJq-RYk0p6;3M*;(kwU}d4Q
zZ(r=8ec~Z8y-+kop;%G{z=~p6LN5qwK^0Rg<$|uQz`fj}GOtFVF}4rqB4R|DE2^59
z)GbxZ6;(qVDbStcCgVhNdij`aKcX8%u23zNL{6`)7{&PoODI}il!`f3GofRxpc`ey
zD(YI7sFYL%?wu{FON2KzI+PlpN+BuY(ppd~v80$HUo<VFI9IjQyjUt)3-AOaF!idD
zQ=y|gaU9#XPgBaO2|_p$Wrp-}Mb}i#%1i+TZT|4SeO0sd<4kHfr&f?Vw>GL-s!;%<
zhj)uQs-0Cz#eCA3ua=>K^I+Em(pAkWmQ@cTj3B8vtyT=x1SC@^!X!K#L}d=@O3o5z
zv?A(5<Q5dXRt?i0O#4Y*Efh7?6urV)sQ?7*4!3oO2+yrps@X+q6&1ZmUBL*>8%kwC
zEd%LN)x@TesAE&Pl46=@R5*$bFGyclx<H{7<QH#rF91ccv;a1RjZ6A`F(+2^DvUGS
zw{)agEQ4jB=8&Z1yIWaO3{`*)h`g?vTF4SPyrInLaLdc=S+ki}TM5UNs<i-CIu0~}
zXK~U{7Xcip9Jg`{OS-Y>HRt2jf}t;&qS+G2+8jAq`lP&+{PLIzbs797?>^<*`_AnX
z@UK#x1HS;~HPaH~BSYe-$c&?Vl!{NO#=rpFIvmt+xVhnQV8c@ZBu@p?JQYCn6i}tM
zv6xW6rIS-bqobmvTBuTRKLh=7ZUx7+m{UrkV5m=4VVYP$qtbJ^s$syD%H0{ovx=q4
z{+QBH(UDp1iD#A%^uymb;V+R{KG+K|1+WkPdZ0c6e?w5mHgK<h82(N`9os?uAmH~L
z%q+)~a1HPvv^{VL-~qS~bPfPK0CalbelN7?1)LtlgT8w45AgedRxh@J=Ldn0gMi-y
zum@lt;z7L++V(@c9^j`R`-Jv=$P?i70lhxtANcA;TF`GVJnIL3djY=>A<Bd80Pi5S
zL)yUGLEyO`?)5^w7wdr62e1!mK)XKV3I6&~9-!Tac*p~`1=xf4fww-SiTB}oKV0`<
z|G-l}^dCnEG<u-TL7>|Ye?7oYAL<_d4gy{rU>xw`z)KwZiNo_a(1-*5IO-SZ#sNQ$
z^gxa{(1-(G0`L-mmjJv3;3WVr0eA_(O8{O1@Dk8}0{Tw?egg0lfS&;T#7Kv0VK^O_
z)j3n8WvQT-@?c##Tp-Fyr2<}K@`3<!f~Et|VDeak1*xG)fUS*8j16Z;(i5k_-ey8K
z{ut^Kp=;|{-rRx`OmGO;In>_)cRss__dok7l`l~F3YD)?Nw}YVNF`DD;^Q}%L<%%;
zB87iQ=K8PjA$N82IV?Y=`W+&Chw6X-0TXzY!D|eD#^7}ZKWFeu0-HZ&@FIhk88G_Q
zRR&KpxX9r944z@|EQ3o7xc94<89c|}hYWti;KvO9jluH_e!_rxx%vVFX6fon44AX4
zuP~4dvV2!rzN;+XRhIAS8w`HI;7tZB^wnQ6c#FZ?4BlbzE`wh)c#pyR3_f7+?+kv!
z;I|C^gTe0@{GP!d82l%LKQZ_-gEa;l4F1C469QYT>n+yx7VCP8mAu7D-eN^=z37_2
z7h9~BEmq6cJFZ=PvBmOiu^?M4$QCoS#SCpRLtD(y7BjR(4E^(Ws|=oIaFN0H89c+_
zSq7IFyu{#T2Cp!9mBDMF*~6`TYI=e^s(72kyhGiaRQ-rNg!;TgjNkby-JuRYBL?q$
zOm*V&4*SwaZ@b7Q5t5|0Khc7H==1mfesL!+Qns(U1lu~%C#&4|7oR+BS1#I>@7tAU
z?8>ut<&s_bfnB*@bl$QnZ`+l3?8>`#<=1xQJ-hP0UHRZX)7iA?Y}#}-Z91DaolTq0
zrcGzlrn7n9>HLu^cRrNxck+Sls2h#Xzt~)pH~u2wALIkuUoSO2zc-iN{6zY}a}qvp
zQ<ZMJ(fGVjpt4A1iSO_QUzwI$e!lkkhJ^1)NR!&<SDpL6N6!sjTdS3df8FGz6|MxN
zB%W{@<M*-xsi7yr4ww(lOirfK?jp<U-=3!;UJ`ejkh<(O)jJdL+_0O~wCysw(O?eT
zWb37t!~ezByRF9`hB<KVWL?S0b7~6Pj*L(_O63^e;S0W+ns&>-t$$8@eg4enml*zS
zUBW8_pLgzWBHaFDoYeIC?aQ}$wtdg8ed{)@Ob_3th-UgW1p|-XrYPV$43a#10?tb|
zyuIqwY<e&K7me+m7bJX5LhN(Z*Zb@4Gg*7jY2|Qs=WV+`w~eg*24G9eUa+i+IS`A@
z7p;Zr942$Is>~mCV?LHE<&D@}NuP_A70e4`(4eeqF-Xlc6E`Nz*qCA!wQkB!qRZuy
zKjg%uC}2#d)5-CvvC(Od3(z23Cu6%#c6gm48g`BAWGUClXs^@Sc%AfogWBJqu<8c2
zxk1KsgGT5EwY;%KE<hT)N!q%3(RGTOG;B91gu6+Ga+5T9lc?P!YBj>G5pIoeYvhzQ
z^1m9HL5--@h+2)P)yP<C#9@s%tP%Yh(XWx4*2qa}<Rdkbx<<}dBj2l0XjdaW)X0Hq
z<UciXpBl|%HJZn26r0s3G^<f$R--tgM)6OL!k-$MeT`i9Q<_aarOD(|()_1H^HZXE
zivo*Vbmtb|AquyM!Y!h3i-M?Iq~TjMAK#(~<rX>BEedXKkwe|0k-9~rP$x~+NqcqT
zp-#QmNt1QbWSulwC+*cKn66VSU8hjGPTH%J_Ufd)I%%&?L2;d|rB2arousIf-s&`(
zbsEh&#kh5fZR@1HI%%&?+N+c0)Jc1F(q5fpuaneulB-T~)k&^xl4zT(Vw?EiCjPg{
z2DXXkZL)!FvVm<H-)-V{n<Dsa8s%-`e49AmrcvG|&2JOu+r;fQ2jXj-ysUBZvc{40
z8b{J=oVBd+jJ(DH^&00XYn-R7ad^GPdCD3mC~G|RuW@Rz#;L^`XAx_hMXd1@zRpan
zb2hNf*}yty1M8d(tn=cs{viVn#n(9$U*}MKokQ4lUO?7AW^jeUCIiy%7aJ_?21~oa
z@#_W)y}?3nu+SSU^acyP!KvB?r)nFlf(@2^gJs{~9BqSDu))dM2Crfpyozn`Dz?#>
zV6u8X=FCf`n^#zdD=fnm&UUV_C|6jNE93*$D7m^u8vF9%TMXV|@GgU2Gx&hP#|+5H
zzI^7#45-t8JpTa$BKD7;Tw?GV18(vYGOTOF&oyG_8gcXGvoA4tnZYXzUS;qagP$>Y
zox#r;yusiX4Blk$O9s^0KUQf7zFcMWRYqTB^i@V*W%N}>UuE>wUorR-gFiE|HyKcq
zYh-=bu5bfZ$to*o^`{J8VDKUX7IKw^T;<s4uOBj?ZvOd^<dP+S`WXh#GPuOxd1m2h
z1{WDzX7C(?A2Rq6gO?e+!r*5NUT5%g25&GEFEDtK!AA@}X0XZNDuXR%mxIKQ81JJu
z8IW@Rxyf<l=35NjW<b_-oksLJ&DvjHX60PwF~7``UuNUGOw-Pn&;6DG>HEv~Ssm|R
z3J%en<y=N-$rLsp#$p1C>4&l8lu}W#%wwTrVJ$dq=_WO$dlbw+i3J69rN&w&L`g0M
zYgC({PIV$rksn3=b6A{k3c4J^BIk5F+{gftp#YN-jFZIASu97L;uIE(4lf=i=&??$
zPhwGVIGJv&J%Yt|uvo$3F)W@UPN+Ie_54!~3-b<xZqt&}FVTI1nvjT3QoqSYX~&$-
zO@{<&<%}aYY42MOu{0J&Bd2o?y}VPX4#vDwoOA}#9nDdPYquynLbwCUV`(%NX@_%?
zwu;4BhqtF1MLOx&(i4v8Pr54Q(jsalE}wEV#^!s%QJ!lcDMvl09IB^@VQ0Xn9fi^e
zKkAHFRduwNcdW}5zS1bHD<^Zh;Ha<Sbl{^!T6c{yh_vbGY}p~LG>)R`3|7^7YB~ky
zUt{csB}Ynk7|2AzLlFXL0z;&=A!1;}h!O!RCt3f~L@jMPY^A9z$LNls<he2wTO<i9
zG^&rpNWLTkk%;w4*h8?_x$Y&{BVi)eFR%M$JBED{CSnH&_Dh(E9g^)1$@>fsN|=Zt
zh+~lnxn-AI?Qn{&E~n~$M8%OKSROk@b*f^~y_e$rc`S*i87yY8c*x->+DO{lq1!yD
z=3=||g4ykAY!nV-8HqUfT@FVvhij^3G9-X2g_piV#?EBz^~baz|ICR_%1BE^$Wawb
zH%wfGd@GgHQkg5MkEw><=JBJ&ylQvEul?lXLRHJ*n@v$L^zsm-$&<9h6ULpNXf)c1
znX?%gkj;qzzq-VKo$~$jQ4tDB>i7@xXjREAh%jU0t6!=`JgE4uSP<d(@}amm#?Qq!
zj*9qlPaOaG+j_f;9u=9~g2Ch?ha1{m5NgR(ZORVm-H?kf55>iK$;z=~;y@%S?;mpS
zKL{N5j<o4Cf!yz{+f+lhiJqW-ksrJBy|J|`7DgIbIMjlLL{A$Y?ux~IZq2D0s#P^K
zp{YyK?81^^i7cDafe8HfkT|JossYw~W_qOi5bjv=>t(MGfsIFHa~o?EB0YSojXOwS
z?<Ia$Z<06YhL}?!5HwV?TCz+(>hX$VC}ny6VrKSyX1c*$@y<|5H>-v^Gb=icY6;w6
zN>xS2L*2B$)FJpDdYx#*9T+GTO>1=63`b;dF|Xe`4y%~CVlk{3hO%P!fO7=;s#+=p
zcq%;3m2h*n6A#ZE_B?|p*r5BEDUZl_(d@f^FQ=ZfRn1%|7OXIHfa`N1AMy+`-v=cC
zc8PY@h;J_;^qY(=R#sgG>CJGcasJDCFIAW~eOB%5M$uNfsjJxBycRkfWMSUsT46CC
z3TAj_K!a?cqU2EgvSKU_%z{Cb^|Pv%|D^>ysua$Eno6n$wi*%LB7svt5s1KDvx0ZK
zXj}#c$TXV-pvglV5#8OL#a6S1GZNspxZ`OVL^j?9J^B2~8COrcrbZrx*epCi;sYL!
zu6JykSa!9=ixY0fCN-g!E7l5`H#(JS7}bi!=YllwFMPXT?!-l>#0K}&a;jbsKKBY%
z5Lz)Jb{}gn795aP({*!4(rerIup`MJbbLtOA&wrEbl5yBosKa`%pg?!r#T06vPCoN
zT;)BMH9j&N5rYHFsHeSC^|fs_8CMK;3zyY<V(Zji_&T)%V{M#rXLgB&ilNSD4Yg8I
za%wmf%T&&t)-LSdAEWdD{+dSD$ANbq+hvz9%ubIiXu}HwTYAs7!_I8rk+{9^&>(h4
zEIgAuGcg;<RL{kG<A*MU2akdx#!43=u_~Tm=}f4tR1qlEOow8V0`v~udr|dXB)u0C
z-itHN#cY?Dk^3sV{lTdwr?H$$pGk#gchu3nE-Uswq^04RR?>7M4b%e-o<C%tp&^+S
zgM&LXIO?C@1_p8vLF3fbc1o~0^R0M0n}aimauRY0gn~!gLHJjT-kKfXva#FI+DRpJ
z;*&zpR%dv_CS+KeRS1X9Xp5S@r1`^4Ui&(}VRm4CD2MQ_1Zkl=-*}@IeQkn!Yta+0
zYmEeUTtk^&!<FN84>Y@7F{f*1gZ(RLN}hQfk0W;Dxx`tXmIs3-qc#Z+&^+!Xn$1C^
zKd0mtgQ)v+VaP07&ZIe@9G2;bAhEy@FzuiT3S+xi%$~-P=iE$uHgY&v^W?nJUvuKY
z2Zg-YnQZ9VpIXmW_|LWD%ov`q4lrM|P=N<_i-t;vv*n0)<AwqA;2y-52lg#vg~O#%
z376lFd9B)AD$Y^k4wPp_uVzAqDyk+vPnIf0NI1rdT6H<<C>nem4@|dmiWX)nv%&-f
z$xf&Z!!#&LFc@X1(=OC^J0AaDC?W<(u@A6f2eBAH8wxVwAiE088GI3Vr+K(3WyLlP
zIjTQt%PD2G6mGYl(mG3PNX5KMZ%D|%rIo>F=Az-j2WFDpkIkOz>B1F0(CEt%I;kIi
zusH>Bl#k}Qe?Me4gP`FXf0V{s1|x?%bX*TKU7pK&<63-*D>j*PB*G2QVpPM*;vpov
zN#^v4>`-zlm7N})9!t3>o*b?#V5+E$#k;>bYX@+s4APygtw<!Yi;?o|CLEV-z)fam
z+veaoXTvOM(Uw`KUMQHV1p`b8RPgxP+~FrNVTsWt5)ofcY|jjyfp0M^_RgT+VqNy+
z_F?lD9ck07fZKyENrB$}x<q#ZhGjCHI+>lC#K3fXBAYrrIsKgo@9H(>;cl0dLc>7o
zMxLFsc`%zt#YJ!HMtn9rJg4g=#3@%43p%rms=61~YS8urHl6e5#RD1sMkXH)`9Gb=
z4vhrtJ~aAfixkJJR=cyo=8rSLJ^bH*_@*acca7fGoM|}6-|Z|zp567kN#GC#t+0C+
zw@FA)V|zo`X(D|BjKtpj;$AR?WR^N%b+JyCsu<d09C%kY(P=5gk|e+ji9;0@YFdSI
zdR4RRy-5?7BBxE1_fIN%#q)fCHqcsV5m#C;{&2&XbUDIBqQsEjXvuxcij`Xka^EIH
z-9>a8l27DbDiezC;I=!B7MtdMSoT`my8PIJ4~#b`!E4uh=A3nF8y09=U9NNqn(7NB
zWgaKixV+|x9B;Im{)rgIk71rtCzI3Dsq}buB0Zc+i}UtGo0{f35%Hkx1#K(jj&&B6
zc3fvYxBMHb(u|7p;F9VPtg+2IrX&kSGNEGdE-6TpRSg5u<OM~`mq_9Mm;n|pj2q7F
z#<ZZ}VR6Ab3K&i{?}HW;oO3v^AoWXLqx1sT?;z9!x1QyI*lIj8emXfl^l)l8o1Dsy
zpBWqLa#rWSGz48Yh0@yT2;N}%!$ASOvxLrrn&f(srPCt{zCfeJXeLyFbQUr+Tr3yG
z(PN_XY`Z-MFB2&KSxO4BsdRcG&C!6ppSuW4^MPGv0RE3j!=cltGqmUe%qjLKwV`O|
zVl)&D3X<6{n(s8-+H<E>nM0GF`Ac3u1D<GHfR@4b{YC@%3*@Y-&sf_}S<-CUI={P|
zvBSfqv*m%ya*O$lbKs(urAZ)6cwJ(~!Sn3FdbT}>yj!5NcQtjN(adV4!e3?Dyel$b
zGRmzc@pjX1o9*3(a0cniJ>ETsLWFx4Q*%YhpU|xZ9vesp=dA@d1b~NABo^cY?Z(Lt
zvSoV={sPuie)^R!r`S)+g%F;36f0Q@P#aH=@Hp%!1sg*UHZ`4wC1*H$Vq*H?$WE$F
zY5A`;yI0MoM^8RHy`yTUEXA<CR_<PvJC+*RLANp%Jk3+P6Sd(>_Oy)L_}+Qk9HDKl
zPD^j6=bghSmw3BSie5&*3@TRy=oH5c;BH<%c1pR>ECRQ9e7p8Y_Gt6|j?9+qT^?I<
z(osM>L`0yZu&sHemsUub5j2H31=l<?%LE+}gUk{hwTxVLW1DHI4qJRtuF^>jG9*Rp
zV7LLJ(`1XfF9Pu=#LdFDlJhHZy}+crg^~R43hmw3GVYXMXK)@@vLk)HX)EvR$o>Cq
z<i3Y(f=>G&)1HG$Lp`e+rg}g2D(oE{+?nU?Ae(r@rfWF!?Z_@RUWZd-qo=b&$;s(6
z>6E)y(6}kPtDSDY$fl+&?kKQyL;3z<m-{mfTlF(2YUSKm^}_y$tT+b_=*(<*hOcom
z-)@1=@ZCWsk<Ikn*Nq*kXq8mCgA9iGsBYwOGl%vb?ry`dR4f;9`^P0W2%{(lMB?zi
zR{Co5#wPeBjkAciSh}V7_ws_pm!6SWcco!`EoaAI_ybd@-wu(nGFryS#GN0Lsh&&5
zFF-kx8X39J(JmU>5m~<RqrO@!%JlF)tjk2l7ZE#yY)ec1KUvlB4LWyx_^#%&#-lsu
z9-m=qv-|g-cdMNjs>2=j2_}!5+~v?=0{HdleFdZUm5tb>0kO<-xU)jA?e5f$d5!G1
zq8OmYfq?+>yI!Lk6Dr2`AMV6;5%aO8)JHal)zmq%rQ2B)KkJfnc2JBS&>KtCx*u6<
zJ`3HD@H$-CYy5d<kuNKiaL6?sxX+Vz#72v>UOxSP9v&R9kuDTnTWJW1@6uR!6XI(J
z|7xe_`|IFS)dG2-N$|cqxR3l@IyhtR+QDV>KnLe%Z5_P1w-yfW^doES9o*$=PYy0M
zw`&JS|CTtN_tU}Y_kHf?`&K5{7#ZF}@V!*bTMIJyW)n?nW^q`}>GBArbC{#3S$^&b
z8DFz{xo$d*j7R)B=$HB8{SqF;bH#1->%M)&nF^j)bdwIJcVvu?fMXxcy&4&<gPYGH
zz>9|CWxhSZ2Li<p?8txa2@<5C+yy$s*y`-Mr!!~ILtSQrc6g&54m0R`lwI-Gia#)I
z{JBQ}fqN2}88L%Dz1fYwSvmXAe!S|zs~-ERk4|W&W&_dBi<!yH?6)7!&Wh+mgMxlo
z68^Pni$C7kf?DK!qb4J<<(A(8__j?THPZ0QO0q_2Q%gCMjl0wIZ$0rgk%MwfT5_O5
zZ5wynx7=B2_P!;zz3qSUn^5mt2<HU^zju_o?Q|1=rnmLvF{Wy+yu4Q*_B#>M6-SP8
z>lRB-;QZrztswiNmk4fGPK$z}s<H`o*v<WU8kG2<-R>JUQ4hN?UKV|<N>ck+rJqP^
ze7)0b&yBAz6qqVGbwY1Y6)Wt02SOUo7te-mp1N$7B9SPoZP0#cLgxeV>#h>&5Kj+9
z{5I9dAHE^kiM<Lk^*_WPzIbfr&l#QAQPC5yUE4`NBF@8{Q;Q{swV-d_<bXRUo)K?q
z+px2>+hMaQ-<w_}uLUVqp``1^Zsf92f(+R|-n3ZndblO!dlM_K7L;nqY98ag1n|&X
z9-|NR$AAdF`MmB4FtWUWSuNnl-=27~s+d-6DMyncgm7YV#ae*2jVIf^KOMKUv=q&i
zqB*4;RdUhlV(fe6`Nf|8ST$$bbfP)?gWy>3{OT+Nc7i2ijhzCT=Jh)GfbPAW&24os
zw`sYG%Wo4L#8^z=QL3i#J%3)rm*c&CBLN6Q6Q@s%j*pI?6erWk$%j*?Q{r0_qvNS`
z5S1|f0Kf@aJ6tLcKFB`|Fd~k5??;gQW2y9ncyx4l`e89OnH);t=if9@cTZ1r<BTXy
zC)1~bIqr$~917rg47d|hsmWwIIXw}`CZT>a02Oga%=Y*sW=}F$%$`($m?#NKM52k*
z=@Y5pVbp1pv=fh{(&^FRRLgD;#Dlv%&>PV0qZ8?2Ib7J)==dX}Q==!wTB#=}n91py
zRn)3#+gJ(>3*!>}HicfyyZ<9WlU4Ti*uSsf+E|>rF(9F6f#_-=esCm60r6zKfh>tX
zln9_p{~N+^YHUZz<xJe2Xe)Zddr|w7FZ(w=g2?*YfIG|2ctkckJetmCqoG(@<^LVS
zjO7(eiP;lUmawu<0a~=OPzmkGnMX~>n%SF)&*G;apg>Q%BLVF?t8;o)!($@y*mSd?
z-6AnNlb8*D#cN~7o7YD9{k`1-+Aue7`3+aOn0FT4uuXfvkQ89xMNhj=w!A6{kQAu5
zlA~E3;$^=`G>b*!;cj$z)Z41hc>6x94SjaE@3Rdd+n+I53nb8V_rhJ7KmKOTPUeqo
z?!x?`uHLKpW7oSee`?p({8`Zd`{vJ*{%g(O)91g){AIYdKR8*j|J`RN*}vbL)%zL*
z=KUA;{Wt9!X;a%s_B+3#ll4UM;0q5B1~7yWC$LKhYhW`ww&RlJmaVZYd88JGO!D9N
zz3$d6A2`fxs&-wKSoHDw-B-(p$J5btW25@x2KkZPj7*OhrbP*SPc@ej#~^G($@Rm;
zaO?*d)5qG7R$wu%SM?%!tMyH4lPiZ&TQ{jo4h=r?$`gAkx-&VF>)$#q2WR+}MRaHS
z;F`k`Bbq%RmZ?+QgM)3uaVHux9lJ!P7S&+v&ZING@8bNld3oJLP#jA((ioX(9vPS(
zbIrcb=zz>jHi8+Tz;k?8r*P1KV_e<Xu(b*GfQXQy&Z#q*IySXg=Ncf`!-I_t-<v<(
zY2NE}ir7U@=Qg9R0YDE{-Fj}{X_h%Safki{7K9Tk18Dg+Gbc2*5hTc2+@e#Lda%hO
z8tI$1=021?&7j2NFi@cV2S&X>gs(K8jX*4yrtVn4$#*Ut!`I>T71KvE#~laq3s;``
zLx-Gc6UQcpBX}O+<13r`M#XRgNxxzv*O_@F%Ooxc9ggzIYd}PhM(91L&%h%meZW)G
znHb*qV}rnF>Y8^NLqXaeBPSPEXD6?lH$DDvdHcTEIzJ^1qHNWF+TPiHx%czQ>(e*Q
zx9`sW{*R0ImskI6UEkdP>*Fu~{#EPi18NLM=5OPP?M#1nJ?7ud?jJrYz(0PF-v>Pe
z^|W=wne=-6NY~eyD*0EC-*BE%<eLPJ_$i>)m5;&|a_s?M@KqdvhK3(BHZTOovYZ*N
zo={-!KqxZ>dO?v5*O_qT4Xp4CtdCqXFc-}okPEZ#f^>;`w_Vw;kus^*>a}uhr(FA~
zD9;Fv8ZkEY_N&z)n1<g+iB?CWJNVDDs(s7pSNCe#c3rR4joMGU#>+bVVbr#_cIaMh
zu-o6;eras?jotcSr|P+S)dd6qf|N=H{KwxewsuoTo+93!-~Wy3j4+4e|Ni_Yv~zVS
zP7}=om8nXbFIF-K1nvX9P`y^$E+Yd<;E;6McbsvFoZEUOI%qbVRSY@Dj|;d|O$gs(
z;Cx~_fKq62idEBQq+n5d2o9z}wsuQ_Q57_6I@0=-!LSX!t+-D-Y8ff@Fb$#x+YcM0
zR*cQzhnozs!Pm|652^=Dx0#_TC;VugS>Tf$&t#x5M1ls#NAIV=b~-4L=RXXdlOfF7
z6{Qp)Uo0Mk2TQf&>KmgXdOkkpwCwNa+TB5R_qF+%0)!4A2*;`6c<j(Z-vs~EAjr`o
z(Wz;vmNQfnAWEcOsl_qn?Bg4edF0C%3Fe6G?5@E|1?^9=OxjmS^TY=~W7>SMUH`NN
zxP02#?Gn&@2!6^O_PLyMiW1GvMi`|+p&w;sUhsuAT?AScV@VyfJlOi9B(_TSfGY<{
z7z2%IuvI|nardq!0jGEPHb!zfcq4Y!=1jj9VoFUzfCidOK0)C7Fipja7bHgV0omLv
zm}$cCQ>~I)eiGRuNL^+@8c#JjaCk`eisTFFIPO5@Txb`}Zi?0{L7NS-cd(I%%||Y;
z86_hP?1|crKOAw)(1U>$pfA&iKGHBmL8`+&bX;>vWK8Ka4>Sf6e}c{e*9&$LL^-pV
zv-co{^HD=8K$^G7Wo5Z6kK3FPrahqdSx&wns=9^zl)KAhtC+*btW1sq#PSz&2?IgQ
zw;@zm52d7?dFU#@U)c@=W7VnWX|4$_O#`Pk1OB32&Ya3T&>tO$;6#TMu|!OUfa;&d
zWRrlsg5~KW2&$Uxp*(F0@l+jeZWV<%G2@)kd2qS(HP`WBl}2`IKcL8MoyXyc>3Jwc
zh|^;-qyWp(+#z*yVR4rwSbmsvkn;q@IgE~^67#`r0i&DGWBioMQYrG6e9ep|N51Cy
zGr+=kZSF)xOjHrEVj`PKCrsS;oG=k79mDWo!#=Rm)gIEh5`+hgGx3zEEw^+r=qSoT
z1{XykjfTjp$T4Ym$v$Zd<A;%AcOh!pbP5?}kj7Oim4fFRhIx;%nv<80pl(45F3>zk
z%!PR#NNNl1v!jE;Ff{-R2nNsXnxv=*2%D3s1-X%`U_6#<vy|cq3(3);lCjjsARkR)
zWruzp(gcAD0bGEXiR$Z+@((-}YKURarBe&?B~_`mKWXL9C*@yj<)1tEFO72N-Y~kG
zn^oAx_a>xREXG}jI1D*}Y<kv+B?iGv5uKXO9;USCgOJ?#%yA6BKCyJe1e1>~m?M)$
zlFfYiT3jCa_BfsQ&CzHyc2I;c$yzfd;YS9E2~R}&lnh;}VZecc*CwB->&#0+5Q)G_
z5<*E~BN@={=BF}?be|)L>VuoZVQ}(P1DA^i*7K&82~vt95G9}JIt7qSGL#gdSd>al
z#OdvBgkC7a6cK@p#g2ty#?td6)FIM4d@+I7THm5ylI19gTm}>oR$h897C`O@W(g4k
z0!9)<mSnM^5j+L-$4Da7@+d-o)-k=Fm=4{{9KnLdgKF*Xhm=LGW<IMxah^3oOwcMr
zTTSZHQOt@1cL%F$T<@UhLmhw$3z5iZfmmN6<urs6FP%bXVh(LksZ$8<i$f0m-PbJd
z##t^qf&2p5iG`1lU8>MuU3St@E|Fb8S+IVQ#XoC=Xz&~{!^Hfvq{x_yS(HAR24|&x
z`a%l}_>guw3*}}w)_@Kk6~W?jF+Twh%&{<GRO2)2_<NpbeK3~l66TW@W}Q)<gXItq
za|}ay$|ZI@Lb>FIM)0(<a*5^3lq;Y#Bqd1KmWCAxKOa1raDGTJqiiqIN{H`>_SEq*
zej<$*K}B&_S(%l)0d_<M_9h&ONCLQmxr#1aXde6D(FacL_n;GxQHsA*E4*7~?5X)-
zBvqy)+QDDG5S~>}G^URrr>^>$#ChStzd5F@^1L%}xL(wMv_Nd{ET6{ukB=`4m}XiM
zfCwicR0t?rP{D>3jyRrY=fRo^N3Az?rm^|`L^o_shMq|f<n9VbXbmSW@=O#_*7hWf
z{Jdr{R32cyuW%)FDNq8?E~x0F6EZAq$a{BrPARt_=fJQvq;{@a&3C=4lbf4n>$3Nu
z^`_avE*l@cZr+Fy$oS+bs0T`<+da*)6cl|l6ffnu_gj{oNLsMAR!k+=c>py%>bj2G
zgPI5|-Br__dpHKvX#%iUDZXIg0r?u20&^cyXd&(~uOZkU@;$A{e42ulN?`;nyuEyX
za&vmteA7F*?p@wqTtrSPuPww)tcjF@a5ztKK+vuha~hdpDK-Qa4X9z-bRaIWG@E%U
zbA4KDD^uO2N|zU7W72@K^=@8IO59sSNFeEV=o6G)v(@_0QetVpS{OrWzne=)$k$L9
z>1#|?d5=6pZ8pI6gUei{QW#g1M9CZf<aM_)LytZbibmU+L4CoA=6A?x1Y&J70$c{Y
zPb-W|JqFT9DeB^ETB^-L!=Gw{*ADo&SZ5*%1~7Tey^%tcr}0-k06C|eF9qk7Nay;d
z1zzJ#@AZe9vvu4V0BYKU@06(4`Ma~5HL1F0n#;aZx-Ob;*CWfN>4qu{Jw-#c!TV@Y
zLsf$14OQ_xzo9DELh=xUxCV7W?=uh+-t<I5W6oL`R=iY4fXn({`I&Lg43Lvp0XpeS
zQsl+G<qMb9^{X)Hy>M6wUbO(ZKt{i0Oq7L_4!#i!r$ww=Eis6IFG>yy5;eSshEj;<
zJ1U;duZ@`#ue&;@mgD&@4YL@zw}(jgHGLc<Gjb-L&iuF15T2zsVoje$NVJ-eK#tJ=
zpJn{-W*Lw0!i8_}o_Eys=o3{-0PUMAB@f>_5)s(LU>vKA!i$~9R?c%URs$a#=xV0E
zh4aIZjB%`Ub#~P|zr5+aKlx=X;%sfal-Uvud2hH%b(**YY%5i@eNz6lyIB<9ZLR#d
zTjW=OFav*d23<J?qg@#8Z1p;IrIa|KxE6g=F1@JE<tU-wlp_4IMJlf}LjRhQXab=>
zL%#evEg*kDEpvjM$beY<OVXMu{w4W~Z!6_?`H)6;ja$rXM3)F~!3Cxky`}~jLTGYV
zxxoxcT_24Q1b;7XGGz~o4vu<Xva_+UXDY8bV*(LO3@ZLLJaBlqn#qI`h#ZR$Ef7%t
zP%8Y--+hPC7(T^{^3{BkZZig0784Nn!?ytv^yF^LyY>w*he-e88*g`?^lFz|<7$_?
zVfixef>11YM9*GsXar9y_w0i*W{Lhqv;{j>x!#png%`HjtXmWsc6cY4(gFdX6nm2+
zKzCp4d(582T~}r@i>fFPd>zXAh;OF=KY0`G2^@O_^Oywhz9hmGP~-<MoqS^o!kk;%
z#0*a;OQKwA+Atwdl0G}JHbr3U&8#Fy$#mx6+t*hPc-mkhen@e(hIbaqVvJL((?aoa
zC19KeT1*wl9n%i#wfH$D(iQ<u@tLuwi0?9gxV?EBe8WH&UuA;Y1ND2^g-iBr+-&)s
zNrK}t_rIIgbasRj#39CHCA!z>1}1%|+8EUVRXLrp*@T?2-}2G42hPkZZ`F6|isW;u
zSRp#UMo{MwLkhX?J_-*Q@TW)bO%IAl1(e&qQ|8urf_DX)t=MvEvxIOtV09^lQm3+A
zlMM76jSzT5ocZ?RjdLj}({K3^fm}hJ|KL5Bof`ftfyG>z_v?W;dqKI7!PK3vT@h=S
z9GBy2{l$(8-((DY6~3&E5#u@Ou#VkvJGIVz?KS*6ef|XTgC7+iE6Eer3J?IS8Ff_u
zWYpa!$6a)}{~GMAC&ga8cKTFzyYeO0Z%h|v<^b|Kk@<+s?8NrWH&l0A{_9AteLl^-
z<&JuS%OW6N;U`{G*eB_Ce>?YkwQ}eF?b|Ld_Kz2NLrI*P7wE&c-pWUUwp_BpoaF1q
ze*ooK|4-XS6#qSc#j6z6P89;v)M*0JfGBN|D2+<0Z6YXgoO67_zH{w!2`l{Xdw0Hb
z9LIJ7quQqN3y1IB`}%ob?l>Goe$;C1zG}fM82K~-j|K$rcjUwZxCg=~aCsMcoZaC!
z_r{r%9uiA>+wH(RXG#f!As2+Xl*Dl8sV_%KcBbd@@QtQ_$799LOM?Jh9^J)s?hA0(
z3<ByBmY`tf@i=q@<*W-)Kpgz`jgnh+?)>cJ^y2bVvQk<K-w|-@Brv0ii0L#HWCpiX
z__%`>Bs`5>f`VpB<K0$^IUz~Vh}@#_2@fOA2ovK=<iO?!tyY@UZ;wwGE{UXe%heeZ
zB=(T$!L~=w*f%Gjv*UQ4hDeZa9LPW@Pkkm)OcLBnz=1@am$CT5sI*3z1QDllAKi|B
z%>do-W%O?6R}-8gClx+A`~r^zxcNRNH~8x?Iufpb%i|jpnVj-NI_L1g2|0s9AJ@KI
z9x;-7JufyfJQ9A)ZxdKIU%A*tQ3;%&MnkDyW;&1sqGOi8@f2-wT%qmAc3a<DfIm?>
zMGzo1m@C=BWa4s$<f$uc?SZ!b-3QC+s6*LN`9nRhEel@s`#IUmm+%7JIG-S%T;H~K
zcT=ltb~~NIVfmx%0)|kl3y*E-oy^fXE<LMrkTZH{<;%9j;Le*|Wi2<O)pTW>ohU*-
z8FPERUOP!Wk1jg<C=8RrEg3C&B5OB5pk)FNR`zo7y*~T|Z~8EHdCG)s*untJ`fBeQ
z1_S9>*asR$0mcU%D*ctw9<)|`UE^6J@rS!NCL)cQlG*4|*H77vjZlPkK-e5>1G)nJ
z>BO;fSAijPlc9Wy2_r01N+f7$VVVe-5}3!t!9<ZYi@~2H=5>Z?AonGZix4VnqaAQ{
zU5&nYA=6~nwwBwszAT#dFRx$!{2C7Htdu7aE>`cmB77(?P}|zBoj$1jqV#nZR!`IS
ztcT8Snpg!CHG)_9Fu`qUU;Y_;194m*Yz4j~3MgVZUUXMI)rFm(x-cGoK7BvA9G;(z
zCT~yA&pu90j)$W!pHJa_W$)tC<n-fk^hZZl&`j={ONyz~*F+_^WC~whFD=TESqhCo
zZg!#>yrzyO$0EZp_q>FN8vJUHY9dT-;}+RnZT-26@W&L_4liqEkXN*LfI+|$SK)NR
z<C$ID>w=|{)#_X~8X~LzZ`hc1X}hPG3eGej_ogFUnhI~~-IVj7B0V($&Iwo$nM<%K
zuCiE<U3Q>vRz~$gY=8s_QAKS`lS#In*T|Z@!|@0+e}6x>Y*{BOVqQ#Yt<e2_b$4o%
z>N%)stppuzI%k+CCpbFQ>0S_vDXRYbn&JeP8_~1c4>Wyil`^Zb6pxVxlie;=E!lO<
zj%hpCnfH`4l2ir{JAEkqX_wMi(_=oDIdq!Q_BBO6jreA?WjZ#XEhBsc+Dh$yd$d)z
z%`)1IW$mVbRL?@&qGRc6ZK4cRO>px-Vr`J$BA%=VQ7`tE#bQ%OS1v3!z{ZeMHY1Bq
z-o}VCLS_N!LZO&qu=WrF1N>A4f$YR1AfONQ&1!21WaOJ5U@Xl|F+E{p;nDo7*)zP8
zRZkKW`s>)irqB@bl4{GqV;jkiJ?hkYn^JW!vx=fBQhC|a=r$NRcM|dc!HKf=UxJmV
zg5@7UOE$OK81eOhYrdIwYh|%q=V}CC+b!Sr@Y8eL_WJ4?v%KwTw(7Q*t?O@lnzqv`
z)!zT)<qtg^I5_&6_X98HVb{E;v;}{Rrz_J$GOU~A<X&Bp)?N;Zty}QACk)j5N4t2d
zd9s8$10>Y13xz9MdB{|r!5d-KgxM*Vzh;qgdNfhi;Z@SNA6qwqD7!tWMu1?6RUgoe
zA%9VjCFL2?Ru&XB5myXRD7kASHWj<g_C(4clLgv)5-QrNCs|on77FZt{F7U=r!%Yc
zVvvutwNBq#`rWu&mdm{Y)7&*?wFTSSSgLDz_OTWr`ofe$zQlSZm?c57;E#tNhLf|4
z(d6Ut?@z_f@;P=!0vgH@$^b?FrE#J^d4V%eme6T_b<@Z7qO9%{z;h|pg^Znfh;sm^
z2`cC}IjadWC-F8fak;5aS0iU3|GPrMNZd6ERzr$v1ImRPhCTfhmW$|FD*4o3UBjYQ
zR#o0E4Sptz85ijLXG-S$d2p>ot*AO^>OxBkt6P!rUuT8oK9Gg(as~KTAFO)0G^#rZ
zy!@N5jnDejsA|P_Z*=*TTK8&_5j^55q!0AXYU`_znN~Ms$I>=)Vq?N<m1<_YX1UMv
zO1JT0B~xPShZX(eCSvA>Q7yClp~skLQ1j6G3q6lPYr`-Mh420qI&NjOKVW4WloSeM
z4ANsRjw8pSj$~|SX&C$ObFz_>;M3E4ddJt`f>MW_f*o8PC9vcX$_zSY5DVEM)bn74
z=fccQ_qZ?OMgL$P;jCLihEK`JhA_g>uH-HK-RzAFFaP?p#MRD@-h+`aN9tV$%^i3$
z$f*Rgl{n~3!cP!9>cYMVr}ggra;iS+YOz|s%uZ*Rbb^jjj?|7BJD4cDvMCLcjL~2T
z>ei1BO0ga=l@eQ{<|IQ9M$S!L9Jp_)yTP!;KPyF?G1^7G(aVPLUK)1^nyZU4>DHtA
zRzK<&b&tzx!!Qs<_xg%iwxJ{+(9j3L0YfPTcj=8HkL)4RNJw%VQ~K{6yCu7>1XpM7
zWB(k7sMKzwU<026Ww7KB<c&HN2o}nK(9GTjo<%cf-Q!l^g}*cRaMUM4hL2E?4Pk=4
zU6q&od$TpcKmGB?kXAc8ItM1iIZ;0p(A<F|gPbLpZAe}h3j6@kp%(2zIIVYY^`Uxi
zs>Nz;Sq5ET(iu9+CDCat*ug|)kRMr)!<Y<8P`5VTDaG1jmJzo_?IHLW7`e2KIB?%q
zSA%hhe^kmioio&Y(T=*;)Q?`k8vuBf&0U7}UxK_$SfmU$vF3uwN(c3&zSR$9Pfbh1
zKoGs}ub872X@7u4h0;PnM2yE=wwu{xFgv^KPE3RN-<?Fs#nZrhZ{ElLF?Gq9-NwKM
z-a9JbsYlS8Y!-+fq(i8t;3H3pxewdoR>iaa#@)inUI-apqaZuN412#IPv!S#>tcBL
z)1P8q?EKL8;9{CGwVi<F26}SHMT6PL9IQ~}J4iiR#Xbqg<?s1?IKEWJ*=lJiofQ~u
zfrg4?x(tF1j3k{hx}d}%JJg_NX}mLrZNQ=<)<yLph7=iD>Pj8Bt&dlSX^y`)#`U%o
zcpF$K;7R~qb!$_g{>M<z%0b-<tl*giv)4@XWxmZ1?OSbc+%^*a?q9(IMt7ZV<D~8N
z4oQ4TE|(k(xIs`icOM+1<x13wi6p9`v@b65-*1MbB)-YnBu+0aZa<hW8a^CyhQpbW
z{NQ1o*9Qm3w+_fH@>9+w$#}sClr?QyA~MqEjGXVvOjJAQOWx2GyA8xhKTnRxGrHug
zA}>VCs)VzKJjhhfBdN#SPDJ^4L;p-P3NGu4f+V8eHGGw~gjOjjc)}_P6IYpNO4@Q!
zEl6E33VmzNHfr42>653=&z~Zc;<C+YOEy%Jl*_i^%dTZ9+3+@pC$Iu3x+Y;TQK~pT
zJ~*go$s{adSkbE|qO3*5s`k}6AXKYYr&U(4q!rEmgM*A$6c{b2l;ml(D!9yt$Ap)_
zUI`;589Gm^mNgmRAN+Pe;CFoMmMVeaA86fUz`D8yfLlQ%OxYE*A+pOdzGd>Zq3?%1
zl8lkOZR>l-$4n3Z`U)7vZ9SGXD+)k3)`0SM-j;<Kd92F1;cMFB9#pa=FV0^6`1tJS
zA0EFTC*(pCBA3VH8E@b@ET-Ar>)F#REl9)GtdT6W>CYJ;ru~2dID<_GWpReu13<N!
zf&M=^1956y(4?fKJE$fJ0|`>H76~mJ{y>y4!@lEjxuT*~>#i{yA-s)WkP6kVIIssS
zX#(Qpl*~=7D~}c=X}IY%HBmutowG`SHb8e@h5iBUVn$~Ra(6-6repozi<zjPch;4&
z%gco`b;Xvz9V2sHv4I#Oed8hlx(6UxvxXxj$=uXz2+0z@ZkPn1zj;80+J`HlkIYNa
zNd}88RI5-eo3n%i;<pQufi8}aNao|M7=wd7UkTwsfVu<5cL9b7F|w{&aWcoElfV@%
zy0U@}RjMAjD+(}1um`H5`Wl*Y=)nTo*3>){(5#ceMu4rGmlQ?55vl<NbtGM}Qg4F;
z1w=kplJg>M5JS~mj3zC3o<t<1XniQLMHsPlF}A|lOH<6m)*sHRR4WTq*cSJ)u36t_
z>evnDM0Kgs*QkixK%iUHaIXKNUIltuWL&E$R$NRDW)+q6uYr;xt-pvXQ7#pfu6R((
zQd~u#G;JVdu~tZ`^nlg^#rwT4UZe~J3}&c?ivbP*fQ>D+lfrs5w%o~N*CwovD1jyp
zP6T5u90(y=8>VF})3R|OknDYq<q9zV;$f^}=Mv@vJ3DUyKes`0d=LRqgg!{cHWIDh
z#@&$(t0GH5vWNjRdWEGYLv8zf8ER4=Xi2qJLAmo_V%BcwkEd`cNhM`n!_$?*u{V9X
z3Y~Ab?!nU20%@<gKgBZOl!CXi)2OP(5f(j!T6OB0>hw&fyYU?;BU77?HAN2>t?I&3
zqn33}HL9v{4@KyQLO;PfQy&2+RYxwg;^*c@S!#MLTp-#O`jM)5`x2U2=$<J_s=r(Y
z_C_pU!_nbu#a&-lmj_(s6~z|bAVb5Oa?PU}41~Tg(ne3BN*|<2wfecLqey+6Lc<h1
zLpC?MwZWE$8M`)tEMnS>W%Ch~UGtZQbUs8bGzOFz@RV+7qn8SmOsU*j>l-$}h1UyU
z6q|`|VSyKPtD8_}na55{xM;^_YbD$)3uH^TN>R2-!}^9*^%lIPvD*<mHFa45xh^6~
zq;5(3x`cqG;i^a1yov0k^v5^2gMaP#)fGZu#Ra&!iWz{bz*2P$qa7Y2RdFyn8uhDy
zEOLne1pLKw->3!_`p_3*$IPi$RhLf|@q1XHJ}g}+2q@g)t2AQUfyxIk_6ZB%YDF8W
z0Ch#_7+BJ_)q19@u2I>*0ashCDrk;aBa}u%iPor-xiUvkqW(0AYGUaE$y^P?!d*(}
zqF>BVok9nwr7PTFx^e&_zG&z@LSRR`EqaftW&>>Zmv_ws1hU|RK#=E#EUc)7@;>~F
zQj;PO5?<avxGvZoA}t7ao$&Az2fOE|&;RxE?D3E940nT2@O=VaZ}8_F@_J!?B;Xwa
z+99@eB2Nl_Q_C9@lz2hKFgEn$CPP_>)RxMj`#yj(quwKA>f<H<2J43edOsD*OoXvW
z{a#V_7-Wa>iyrntcRkDE?5$($O$Jv(Y!y1eYRujdQ6CUR9ES+ZROUc-qR=4js)~2y
zB0P*ThEYZ^rUM-zqIQ#oan5x<tOFUz*T`^du45@0d&PLN-76bo9pNFOFq2Me@3RJ*
zt49Rsh>!8Ijg##=0&Q%f32)Xovp$5P4i3qb51M7Pm646t18&YKcBYKTDa$_5WU-87
zCTG2B_};bc1=(SJ65$z1L-*A3s%(Jh0f_)iCl)Z35edtXJ`Cq?FsWO1`{ZKx$r;jU
z&M<OoO?qpUkWI{6yD;vW609B`$o57zr4l@{7LFVQ`LV86&W0+b3sOfw>IjHr6jz6r
z99DGHV!BKXxfWb^>54iQQupYJx0R8}Wn}Uj-nf0Vi6uJdz|tNq@`Ocfo+b|rh#m0Q
zAPvhSAeubLH%;eez_!!Ki8LdE^s`A1Vd=m?M}!+q{^8lLNQ%obGy5dFybPD;Mcc_P
zXFXB9imc^hbB2yd9W#cJ+b?)U;$#h$w1BOQy(iM+A~xQbcn>GCZbciI1c)z8x?I&<
zm?Q#|L}5NM^WNv(!^l?;{KW5~Wb9rEHv6M<<P+};z^RD6FTm{mJ97|=>#|TfDdC4M
z_)4==w-Z8z8QaLKt*x<?!Hcc%!pwzE|6%DsP~lj*9z)Z=;{}<G!_taJJmZU*8pD<Q
zKQkG_@ZuGUx#hLXGXfBCzV^>VZf%EeNO$%u#@LI#2DA}*jL}$VJM|W2r+M-K!ts;Y
z(JS8l8k3_L;Ny6yKN~2Lb29))5Xo{qhHzG@Z)7&2NhR6jJjpR9*cB<ML`#<HdlvjO
zgr#Fzsn2@Fl2$LDpFV$f_Vme5PygxUtY$MWP@^p!A3`Jb2^ecef`&1l0FHACKFgbt
z=uJYGsd`uF5^|Z3M7iWX0e-SG5{L|sgBPU1Z97t6KwHjyCk|h|jWqo`I+rMCtR87<
z#`1s!473jfmK@0@g!tPdUV(eV+f*cPUCDIIf+uL&6Z{-$NcHh6HkaySA#$j5YDf1V
zI%?=n4f}1F+&uk}twEMB0u*50kGMZl6=K7h7cOZlRPTI*ut(_5Go6GyA+KOS!K%53
zbada@nkP9+-Vm-o=t70XkGw?1jM_p2Ro2nhwreWFXjANPoE)VLt@$fn{j65)&%020
zr+fD-UDgNc=*Zd}{Fxap%z`e*CBAi7{|Pu29XQgY5TYjNQd3OtLlCSpqL|@C^I|?%
z>%Xs}%YykhysCPf!`BfgxX2pi%KK<xf|pmpY?$OuL|M}YzfNOi|20|+7h0X0@?G&Y
z+;#E!GH}f)$Z4)O*ZP!;N^)4z+TYwmlO{e<PcQCRyK6ljlt>ZX^@(1?lRK6k^}1x1
zXe}zX8TetJS*&43w|qEf-Kdhw9TpB5Xeq|MhV6^P*O%nv<itNc*za$IndA(79as;<
ze^rZOLar*dZO26fqrUp;@U^#i19sjizZ^eg-1P!a6(j^W*FnPA$7u>XqqFj(et0hu
zdJc!~(ZJY0JcuYH+zDHtu{|);pGpL7P&&JjQMiX#!csJ9mbhG@YNPis3Tzm8;2NhX
zHt=_dn|~_*jqg1`%hbJ1zBp0luNHDXql^pmgJU9&NX6#l3#HB9T#_%pbmqB^AG1By
z%N4YT-U}M=Zrf37j0L?GatX)w&HYJ|xBD#QTeXlcZfYgNtD;Y^n)g^EENAl%{Js}N
z-Yr4u{cX1(cNX3y_qC_qaTXBq+_8G!T~27qa3OB27i*b%EjXSDPyJnk?4iNtb>Ja4
z2}Ku=oMvRl<YMfbm|zMnZW2U%*$Vb0&IIdD+Fi|lR`Xi!1DqPz#JiIxN8jkOztM+{
z4DM`a;+{i^&g#@w<8QdVED_<oHME|hHGG#+kMmtzqJ)hC-JaV!@Q`$gYR&`nd%=Vs
zbTEzEGIA3~nLrqvp1rwu89%xVr;ALbE-7uqCAd4)O6fS<JLvjddynj6z$fg0d;Z6k
z>&`uvvMbHk`{rz+r!c5HFw9f99=ZKSJnk#L{Rn?v1KHku&%u;G-#>Rf`eBss)1Uj~
zgI8|>*`xaI3D5rA8TEVm_SVcF;NADjx-tKL{G{Y&Jp5}u;xJc$JL64w`BQUxe!lY+
z%V*{3dt36czW)BszNL(RTzB8`DSG~TWB5mL^<8^)gU-G$;{Ut*e@b`1*B|Zhd$-^J
z)a9SD&K}<9>GVtI^n3!h-+Y1jJ30Mkw$H-lH@y709RB^x_)WX~_z$|huB&U2f*VOW
ze&S1hk-vnFe@}gTCTD~D|MuX&)mUF|8#fYv*QX!^1C|2YLi*@5z2p+7FklBk+~A7F
zNx|LaYUyyv4gV-o!hD%No!|Qn^u_ucu2z<8D^YwGTu-n#G&!7^-wZiJ>c@XHRnzN@
z?)BI`_DdxlE2R<)wBgn>Q!-x(b~dX^qh}b)-|?|H05kCq@*#W1GbuECVZ6|}6qfy1
zrjbXkU2~9|`lki|Gh>suGAPAz)6A?KSDtZQFeP)L9Te-**qVE3^d4)J;24`o@gc1{
zIev2V{OpKCB`bZ!J^R2NE2Q&QX2FYseUQGw3=lXIY%ZXvNEVNJJ<V(30Ah*g{E4X>
zqlNb8XON)B=f}EKBKO8VAg{D$TR^MGw05S0pWKxz?qGlsjv1|H9T(FkX!igF_=*dR
z$O%|9Jdl%0N0u5}I3Rx~Sl<~r<=Tt=LQeawwWZWtE#$W*ENx@5hHq+^?bveg7|U%5
zaJ^4GhEKAdKKIyTXmKf;9G<s9!4&uz4i1)Miu{u}y9JM&5UldPafhRk;`_PL7h%k$
zGx`9?CPJCaQD{e2j3I3_w!E&nv|^;hK8ck=?H9uBYg4=Z`#;=2pncX#A0^sYIpLnd
zqhZ>MlUFYvpB(>o^!v-BpO1ch!5*^LEju9@v1ihP3xMtHkU^)IHmlQT0%D4*`9{GH
z<e%Ou*T0g(;aBM@#Jb%oeb?V({b`@UAN`Mg#x3o_3Ad7GK(@O61a7O1Ux;vs7oCz7
z2_Z><ll-kBUhj?uE>7de;m%0z?y=qT`@3)UwlGof&>FS~*vD?4bJDwwiAh3(T||4G
zc@rE9IvLFaTf}S4PAs^xa=M+FU$l~mX)YQ%p?!rD58iF;UNifK#mw<g-joOX-wxWr
zD-4b>tRlPvK(QsjMuQW30?|)&ep!pJ;zbrs3cd>WE7B8s;)%o%)9e@AAnp)nwb2bc
ztT<u|z$6MO9+|6_33M7HA%t}uQ^r-yxz&8qc6d&-S`cH27)xY+>Cu+LA?u=J=a;#p
z5&W~+6I?B)V8C@xJa&z=T&g{mr52hJg?ke%fgp8IbvjOOVJdYdfQt?j9>vVlB+@Uy
zB0hE*Tp-_v;&sfN)W(c}Q6wX&iLHuA;v<QUBy<R=Ujpz?d0_(V2AfKqirTTzL@JpP
z0SErb%m(CrkZYT9x*=B}GV&rO!H7eI$Ow6ngvDlP!qO^p)2icTnrzGAy4+mq_kqe{
z?CN8zp+#)YpNm@UrN5SV-wtY{W6g&HC*k#2;3^OcQ5#f0NQ_R%G0u#IXp)S3!ub!^
zcgWkpDP){(E8}!c#+wJdZOgL5Q40!w`M501x7EzE<L5uWI(hu^J6FyB$<7~q%g!HS
z@zvIs>Tg|Cr{7rnzn*LxT>t*d$#%eNxS4BNM{XSsbY^m#aE)&xJ++8RUWrM}Ew*qR
z&oA}-(#FcrbT$8zh%Dxplm)DgN_yN-qk@z=)=1Ad$7um}G@cDjw7igcY%N<4=a$j@
z8{ItycZl-;%gutW3!AZR0B1IXb1UGott-?X)u(MjXs)An?OwmLE^@(_tKD>^+-+Z-
zP;Um;%E{0zN)c}zy~=*Nnf>$@c9PzftYwMngd2Uk^xN4_JN8vnPesXt@~MEW%5e)%
zY*hi<$MA<r!aokdP(^w>XQF#ii=wNA?ZZ1Ql#5q)p!ak(+qQDPdVc);*~!t9Uyh!l
zWTtyome2p~BF|fr1vDz--WqfeGdLM^tT@r&4KZXim|2m5;5zy~nACA}Cq-iv{cCiN
z3`iZ@P@DR*#*!N3$E2<h6R;N2wbKQ3iaO)C%A%w3w3bA@6{yeXP1B-MDm0{WJpUuF
zh$2--nCOszFUfF;HL&x7#xKx$hxAHIAqMP9jL}HquX)l@6JrfGrLp-XoCYd98q!l6
zOef@!-SFfKoHAtYL|fz0!L#25>dnxokaiM!Mi!~1Cct(|{a(}!^-R84W6e0ZrU}wh
z>rfdoQq-!kxUtxlghWf?5Xlsaqkuh>D2>Y86G0v_dFv0{Z~)8(3K(((HTW)Mp~^YB
zUl3*&+I@gGL!h>i)Y3PQ6|L1?3M>m+PKeS^A|X+mLI8?Pg!>61kglsYH~*(cQdh!C
zUzq&!`fd%Gk~u4b&gqx1)ond+>31r&(<am5A)|dVOUphjPoFH=V26GL+y6<r<L&@a
zb{=#Khb!##vBINLv)7Ax9M*2;^VMm`?No4_&;e3Td3bos4U{{!Ly6$J_}4q_{c{h~
z?M3qqj$UGY&|Bjq+wZf74<AzI9{-O0m{)_V)f>!Tg^<=Qv<z<Oy^^tlvBh}{;@jQw
z`9BEevI;Ik*@gEG!CWrg7|xDktAO748ScA>b0dIn3g}YGH-)rYb+C(9+FD?{a<L5B
zb;oz1qq2ptWyYv$QCn!a0ljtfN(I_mNa+mt-1`f?QNc<BF%Z4yE9M|ri?nwY6^ey|
zh*)pdLz<oK2D6ip%vx6Q-<?g`DjqzExddL`y!Yni;wm&jsp(k37#<s&ptcS{?w})s
zuYntcW#87Gdcn+#-rz*Y1Ak;rV6N8|3GO{38H*7v>Wo~cGBYv0z1;EVK4!VPa}JCT
zeYBf~K~n|J8l)t~RQuR!ww_KQIMjl@THNNj+r{kWZh13E<&@lLhOJIe*~HPVJH`sO
zmK%AI4U+GoK{2Xw;;B-kTTHUVVWZW|x4{z<ua=@fo7IA9hlYJTSIQD&tOxo5UF;$C
zu0YOoJkGa7dO+?XrJOX0ROfVrVVgA6s3B#8$&S9CT9k%c<i=NEG#xWkC?>5XENzKI
z*~(yKEus2TNcf6TI|x1{yLMlW33Nn=ISW=l-LA{SF3Z#N4xi>bbZhwr`5iJt{|8C?
zhNCh7N5OSsdvYc&QTNi(FC`T2|5Z@@{;+@|_<j9-C0_-6s86j|ZBN@s5dNNDF|AT;
zS0R-9bP5EhC|o(U6cN<>K#;X@)`^SbwRYFgw8?+J*%v!&$Km*J77~efUZ0tHc5-~0
z&+|^_;C%<)!`(a)5GN@G{GSspfyE%_6h_NM%(5lEiyq00_EA{L`%wUwWRlPfZkVK5
zlu!=Gv3_$Vj7~pdixVq<$+$Kb7ikI+%a=Tv%_Wd*3TYD2OrYZ|W_&?p!m=LZDJA&s
zDWT6=@5|Ns#r5bynbJ|pIg#*81WXelc`_*^ox*b>=Xin{2v+cjqNAyf_@L9t$bt$?
zqRMD|&K5b#XeP%aw2;k?6c#$zk0A6Lc%CyA1W5~x3+9t+M=AN0q)V7Afj~skbb{cN
z$efWv&N18TBw{HB_!p;-`0qGBlhOQ{@y8ODgHD9!0=|%6OA`Sk3(R|gAqlWSkx5E>
zF#cPxY(#lN(&U$V)%o24d~%*V5lLZuo-$Ezy0US1b;y{I64FVj2V=v^l7$XgSy>Uz
z$r8F{3Yd6#1egJVduz7`3yMiiA5`Yc{Zh!9JutBp6Rad6hZT&l&RL`?2{C7jb1U!f
za*XzqpNMO}-|rGWD>MYbz#7x$O~UF)V(`a_2(=BrvJt@E9=uTprI+TJzj<;0;Q>xh
zA;WGAu<_7O7E$c@5=dCB;14*4am0#DI);M4i9|he&e=0$*rwyVWlk?RXWSQ9m`ujL
z_t7Q;hd4k&V2YB#+jqhb-ol~~5+>BP(5pf3DgC!FOP*-f_j(Y9UoY-HfBO`MJ@D?m
zzUm=tdmoSRPlFULNbY+xD#IzA6thrbpm^qF)%PB}AULWrTX(9D-E`BRL!GFpitmU!
zGW#cHT!ven;0I9PH2Hf@+4nZ(R$sKLuDf<uM_Scg6%5`Chv2kHL#!0t)e3F$ItRBm
zhPAJ5s_iO=b(KTiU0xU_*%N!D-nROB>rJ=Btuo`+$6?#ZW^fU0n#O|x*7$}~DVNts
zcTUnRx|Ly7RfM%J;xvGI&}PB2GDek~lhgWWBU}n@8p6m~doPg0hVOh+{uPeUDoz=Z
zs|jQ2%3(xsI^_k1V3Qv-!s#`_&BEJIjfKIWMpXAkr>ANtnQ`nr{Lceo^9<^A{R$Kv
zM!%zJD)62{rl97A%{hBYrpPqLO++$9G7&+tLGCdw`!(i{lZ>RhN|OkuFovZo@KsqF
z(A&rr`o>j>zG76{J}%!nHAMlfhD}R&skSTcbIb>?c`YmS8X-28Ox?vMUr{DpU4)vp
zg~QqK&m4D|769?y&zN+~zaBeI1xuf(?_{}Z?QLi<UpuH}n{3Zh<#E%k{w`zXaFpdy
z`;zU+T_fVkw2pw}%m3C?9bfb24#*li6!#+x?M_w33^{Gaqhqg1HW-)%YKZs2Slw>=
ztFP4Xx(~z4t1lN}sE@mJ{{$s2adq@tZ-B146EQ;i)4e^d+E*$B?!JD|#-mnI6ca?$
zH}`GMa$g?=J^0Xr{V^V;H1j=+3!Qqcwzwsb@hy#0s!MulOIwHT<-4HEb=V`_j^7Ec
zjR+_19QR%+<UJg9woTB|eaj|uYYJ*AiIb~#7-y$>CmIYIRQrwnA)#?HP1i&53W>hE
ziS#Nu*0t;zc$-)?E+?~sb!)BZh;7e^NGZ+Lfaq#9=ELIbPSQ3r-+LMe1>*~zemGk@
z-8qo;QK|cNjoV${$s=OOq`bf@E^ur%<eQ{aUlFR+bF(YFk~elPRAoM;Kr3VHTH>3=
zx^~3Dz0aN1EPzv}FSd>2L2Z+(_fgj@*p1cAB_)~)szTjNSIduut(adNV`nGZ;<lKe
zKfT`~$~i+W!%0@ZT#=1_N5<RQ(|75c4Kg>MZ^G{vx1+0X*WuMCI2pp99}W)>5gAJa
zHcmC0bb78yQUg;v9pSHXY7g5OvMj5O=*5YwVlyAwG#u==EE?Q*b;7Q42fG}!?cwX~
zWlP)ddxL@3x4Py0tvmk$eOk+o95)QS?^pCWk?q#2DQ*Jfko<w2Q{clo9(xzCXN=u(
z0RMfYF}$N{v$zKXg({3ClA<WGfB)ml{g<1YSHIjWzbtR=AD)&E51$Up{oT{@?r=CR
zcVEw^7atGD!{gog@P2vsZ8_f`me=1te>fe#Ew9gy566$opQq1XPRGOXynHx4E)U1^
z;qiF)Y5Dqec-en;{PN$&hksA+56gdt$ESzW@pg&z<@$0R)L;FFZ<n;D^dhb=*7_#O
zZQO42_UoE%*CBazbMtsOe|<bI|J*G7@B6>wujHD-6_q02(c7>SHf>v&5fkdV#$X^z
zn1X?R7DmlsMjI2RbqxlxggF@KXQ8ATW<>vMDQy-OWx@t)Y>}F$)%m}EMut#8C|uYy
z7|0OnyqTs{s8Pa<8WpB83lm+VW)S{BhOo?bd`5<Fo5SoG8A5?y6zUn391LU$TQHCz
zZ1b6UMwU>6fefL79hDh8_H#EWCum8xHCWJ;reHx+Dkx=}>YT)2K|>mI4gk3YB5o@>
z+lup9o8ZsVxaL{fA<G?|Yb{vNlFqqsf`(Mr*|AX*wQEnXvt82~skG<H*|8}VYJrpl
zrH!t&b1hiVlqyJ-#z5zA0ZN0gb2(Vhl$KyYQ(A)sP3aaaXi6nm(3GNG)v>GY?8;*x
z&v)1aO=%1kG^Ht6(3Iw2K~q|S1x;xU7Br<BO1TU2+JXg5sRj#L(ugjIjte5XfR-GC
zLl;EH1rc2k9T!A&L3CUY(FM_QK|~iseqeHxU_n!g-f}WwPUwQ<xFDemcq&dg<F97N
zt{Lshuei>kvG`@wIW$&r!lhui6lbjk*IJwfl-&XxZx!@ban4r3vqdZP&Q)|lbsSsa
z6qL*tPzuCADg11eg1=h$fhnb;l-sqSUHMyYa4lHSl!9HWV}Y7?QtpCUzy;MYRz+h~
zCkX3qtxoAsu^!kOx9f(r%SMax&M9nbbE=FDs|<0jIKeAUoID_y2ZR^UNgDpDQx7z(
z2U_L_reXQmob1vtyEJF5t>FTivw#N2usJ1J!;(xBKQNjg1~fa;j8fr|r2;2bop@C!
zb$jVTx7E3MTiK}xGS&mCJP7;4dfHZ5wX$&O-2C3^ka}xyF<8))&Yi3j={t6C4Wx}_
zm(nlFd969qhe;{$GOCq#m9{MNZMc<43%$<Gh2DV70)tDlG|@6=a1Eq1T(-K-sdzvZ
zuY;3dK~vg-1x=|23tH0o#W_J!no-KaWpEXxjs*lQAdUqDEkL_NgF_35V}XX=qGxMx
zF<8))qFw2M864V`KKch&f(1<}x}Z7nIyb5(XiCvrw5dHf^cKwngF|o8dZ2TP-crX~
zir%7k!QjwawCyoC^cL-93=UmDFV4ZC3urH6aNvSSTM2`UDCLnA*Md^MfVhHVo%~uc
zzh0p!&B21E6xT{$$AhcEf~Ir}7Br>k0)B0DZf7ih3Sxv)5R+rqgmz7iT@%_hId)BG
zS30{H9BwN)+e*7_@xvW69PXI81rnxW-YFei2^KV^6{Xy<3DX<zzYb1=1uZG2x8$U^
zgz1fUbqAM%1x;xV7Br=3S0}wCOmDnTIJljZyC7pC;vK!gMU-+2WK2YvKF<fI!Ge|)
zYr;&YZ-c|N(g)w*Qm~*Y#ck0?|KLinpecm|lf~JV;I`=Fba1#Wrzp)>lx8|w92{=T
zsb90~w&ldDV7xk|ZpAycI;WuGDX7kMTvrJeG^H(A(3C=GS9-Rz#MuG^(hnUv*MbF2
zsRj#L(z$}4pe3C%;ed1!T@p+o*463Nc5?nGq?cWhcfmUeZSXZ#-v3(TmhqQ2nmPKr
zx6ZD(U_QZIEA({+rY)F3DvIgNbRiRn8*iKrazDzYoy$(@PRz%1am5zXnEX0xR+xTI
z*c9*9td(|zA~tV&WMtlHN}IM_ztd^VNo>$^y<)SEDZ8F0&3_kCQ0#PbrC>W(3XhE>
zb=P{WPE%bf9IKA`hX#XeJ2CISO5OEpoimt3a1<lrbRb1=+AiV@n?-PhEN!Fl+(}tc
z>~uFpcXn21&LPk7`;482xbEz%w4lC_d$F@YY{?Gn{W5+j(6QTY$9A{#b<H44FtII$
zmUm0l`Q=n$&CQ#uwv3;cv`jzkx{$bxOuNa0lom{Ei3`s7JLZAZ3Ql;h*b+nKGO#me
z?<CGPyiru!a2VDPj$;kMvG^66;@t*?KD{qw-H9D{%Wlr&4W*jkWU`4fZ){R`8}#CN
zcLsHJ#%P^v!Nit$_id5#m(?KAgX&G6HDmhH>X=S9oYd;(+$o(bD5g)5LE_zg{S?*`
zKgYrk?0mMMf`dI3CqJufyJa|cii+UGPIxl!?`!xxtrrRW3=R^-jdq?c<ZS10XVQ~0
z$cAEG_Q>^i`i@)T-zW`o+ll!y8a@zOR$gy(67KGf`I-kguUTWMG$Rdi4kRs=XZ}t?
zZ0NN^Y=}FVc49uv#0GL4r;6Hnkdx_Be*w|r<U$IHX|a7F(=4t+Uu_q1T65Y`oLVh!
zf4lh~eOt?JTt^Pw>nrX$bM4gop#;bx`GaIugDjj$I~I_%3|S7~zaN$|?t6}!r?n7p
zzysbY7K=r)s=xo?<A;xTci(<<w|%qy^5Nmr_Wt3|)Ar%rr|q}X>Ab!B{QUUlkJI_|
z^zQle`}W(H?fJuL`}xaX?;p=!wx6G$9?pMkKR*8T@$q~*KX30JpSFkd^XcjQ?$7P>
zr_)<gyEOm%{P5q$-%s1$r>9R3kLUX>*0<qpSfZay@%@%UN^fF#6Y4Lq-^X^J`@cfE
z4~z2c-QCma`Sa6x`_J8GfB*bnf4z<U0!E+zfM54lv>0pM5ouxzNNiCNOG1sMNsXn)
z-9a8P6R~JwBVyOYxjX2ZSZe}eZAlSZ#L2WQC)3K<9du3X6%F2N(?pz1Z_+%ybt39d
zclz{K^IsE3z)xS0LoBFqG&z}B(L7U*(RKw)CWTxjvDDo`4iRT<NX^<rq;Y8CV50Iz
z6HO#esWE1pb<E1(DFvL24OtQ^5%sJS%{m9QgekYQJIEuJ-9a7^&6B(S^oYBIJR(hI
zN@58(nG&RVO3u539O5L6Q<|qtT<iLEL9dAwcj18?V#c+uGDxM0yYN5`v7y0rd`vCj
zr!UAORwBx^zQox7BmL=28nfIAt&qkd&C@zAVbgo2^}ajEAyNQnQ<|sa@o^xBSkWJQ
zm7k{LBlV^~-RkZjhd3G%b=Vsbonl0(am2nm$RT0|a3GI3cLzB{3MpgAAT=f$eCQZH
z18ST>I_``ZAE!3YEI8{6x+3Nfz<Unl5L4V8<PdQy9LOWK-9gvHm{DVt``Sc>h+1PI
zjYTb?i5d}=Q{-4X5@meM5pxPd(vAt8;y?}&^Y8<C#JoGmA<`Hx$Rjo)s$H1VL^n%Q
z+A$|28dDMn8axka@Ql0AkaUU?AetS>Ats!4NpjYOoTA8xo9P%nkVi!G)S`*x;TLpG
zY?!4S$Rpyc+YOCaK;|Yh0L$9Y!@DdXbH}tWcO6ptAfh}p^B|2wo?Mw?c-Ar8M0IzN
zN9?<Uu89-RYx7&_xDzY;JhgddFGQ4MoOs0LDU)Fn!5A$wR=d#B<gq*Gniw(VDmpY5
z3e6=}HAWL<B5IAeU5k$4C8C=dQg$qH1|-VNz9dZ8ONyF^vFAV@ku=JXVxqn~$RUy)
zFX);$$&OQYkm?LD8AHn8b)xqe(i-vPGNhcM1+3x>smZi}o6C^;bPL$LGNkO-0w%);
z@`w|O^3ZG%z2`s<5kqr}@<3{_l190NEnz)lNG+k&X5c*sx+WIP_6(`*Y9btCk!N8m
z*w8qTN9;tDvu;=`v^J#1HuCPEYhuUq`amABAW=`ISJGIu#>yI{!8@5pw-v3b#jVh_
zc{-V=Yx4|piXmHeCThEbJR(kJ$SkGJh@aLqSDTnq9LOW$7^h6H+wAmdd9a&k><+pj
z_7K5wdyuJX57?eHqylLVm{W8e_IenkQFh{bK&R+Ip01s$xC42_Lc|*y=k6efSR)eU
zS=bYLk0GfsB_bxNF=NeTNUn7zgJ+q1m<Y{NWLvRQh17M0)C<kJ$aKa;jfm2F8WEf9
z&WwU>?x8<zqD({;DMrCo)6ioy5#F#B+0isnM51hH#8?9iazSPC7#jvOfDV<;5QDN1
zh$&-bx}d!INd+_a1$7eJ0_B`dUPdh0AZpZ!Y(uXzD0@^U!!vI|nZl=@DdX-sLCyiY
zmjGRA**)k|=k7s|iZ@#e%JLuwOb-A$)D&o}Njjm)GHFdRf)?&Zl^gA-Vm?S(vrKSJ
zmdOHH#(I-Y);jePltN>@K$qH>s>fP*35u?$a+y2;*@q~ZE?^eaK2RHZR+X8^l4Yi9
zV^!?T0raSoj8$cGuH;t837c*V<i=XtEv?v>EV;|GZ^<%K^#D4@fgWWbG8t=?b&<&`
zO-o<kn5;2X`+yynxM2?HQpfH=k4n=zpi^@tDu)kvO|2nehHYn~EYR$rY(&+afJQ+R
zphHcRkRQ;YmPFJdJ2h54PAWxi6#66LrNDx6045tml}>0fDiw!rkuBNWJ?NHfXjg;U
z0uz(A1*N;pG|>VEby1WtW-X{oH;UQ@<=dJzYapt=T(`KBX#l#pZnD7@oL<<;9e@M6
z)Xr4do|$y%YfyIMEo4Sof+2I4CF@Mp0~m?yI<&jY!NwZ0&)?=uG=M2zI4l{h)|3q;
zJ0${@sJeY<GAdjQ>H?Xb8!f2IcxnwA)Wx02>h3|eIe=BIK|QTF+wMV^I+!YJ;E)1o
zP4Y?6l5r<PZbLh_@s%4ukJ`xsH>&GEh30~~p;0Q0wa6>lB`doJ9csm_ctJhZ8ks7K
z-EIdZQM>L~gr1n1^jLdpy9YgLCA;bl=V}y@YmXZ{c2KYAfG)K&Roiv&ScklXvWyU~
zf)<o}D@O9H7`11aEHhOuL8Mm{3+e$R>JmnM%d}*#sJdmAGWE=oY<pM|oJnhziJr*{
zY0bJ*X|lr98(O))mv1a=sk8(|wi1?X5LKSBOU7Dt%!(b4ID_)x>yo{qO4qh1jeE<W
z_JK(O{(w%ClMl{x<KRpY-?bUkOOPUVa~6~qNc3nOphulF)+AFhlNF}wkdYF3mO;5=
z6Lm-cdeqKTeQu>RcmVR!rE~Mopbnae_g2z<7xUIio$fC0+57SK@GHEbl@9p>I#iC@
zX~^1e$!J<bUS%y=Vyd?5z_-Q=%Dt5Xr8zhHgiAJd4|>!@R|EPr-;!mf%AlD81^5Fx
z)QBy`1?9r#$QIDI+a`-N0A2F-%qdyEk&@+tMgM~OYNk?}bK@b`lD(p8AD~BH0I#Wo
zE-L}L)JasC53G_Kv@WQ|YBIc?GC0%#th_>Z0q9ZjFj`PqV3vrtUI4GCmH`dChk3#J
zCT3K8nYgh25zG=cCd&~=E4uLXc)|LX$87(KESt73!q;T|Yp$8FYx#op1SkEZ;|0qf
z86{4<7S`6VW1p_P49lB|CB$YoVwX&d0@x+bN#rV1l^0=UvaFgcLmq>!)NX|T7vUiC
zlo|euurpb&U^-rpU+|4#%=l^;dZ#2lG7x)YdP}#kZ04A-Hd?_Omm6{Y%!tOEZ~O!=
zl}JBFTUd{|#!SPg`sslQ6a8RtVHvz)r-Wy1S7?^}`rY0C0F_c*OT#b}eb2ABg3u4f
z`rfIXjtvA6Vfr>0X_~abHYxdV7Tte0Z8v9!Ma)ac%{k|ulbfrgE^36L5J3pf1=qlM
zNx|(kRt6*kQ&3np6_cWIHS&scI(6U{?~?#lIOSBplQdKiP8D3St}@p>XG&ysbHJ~p
z>g1R$OCYjt6weC-SY%LgLWOpX1(T}6hD$Mlx}@0E-Z<TLyodY6@^QUvr8<|Uzy@|$
zL&mjHJhg^qu;Zq1H!gveRuSqNWu4;)A%QEZU5M{Qn}w`uDX1`;wNnuJ3?a_Izt}J<
zNb6!t-<`PjZ5)#lYaImefxxXJ0IZ+rjtiHE{Te(kh~Y)>ws$Ywae8LE6g5@}5H8sO
z<{veZq!pQUggx4i*-A%krDL}48uO>86Xw5$^tquZ4Eqit%nuy~i9gT$w1XN1(PKew
zQ+LM1{2Jzj9RzUmJ&Ri_ns42YBZcopk@Y4=LIBD5d;*9^9_q&veF3#tTT>f16n^)w
zP#7lbO?=5~O#(QS5GD{ZU>;gbJ@Q)iDy$_}(n3t&zxU|2>_sM-wA~lm(z$**I_F!z
z-CL!rR;&N2g<hdiN+p`pj3D@2VWAM8Bb5?#v0lzOTf<s%gBPR+!dkwa#OMQ_Qo_&|
zt_Vvg5$NsQtn5px(@Xer*U5k2!kC-qS%wn6S_`^J6~b(WGMW%3!7-b2vBZjU)<LU`
zU|74Q<j&}w93LEhzBtsTOq43c3f*CeW>hLcr@10CbVpSRJCK3oxkv~&nwg0Etro*e
zA|Z()qwxV>t~eu1jW56gTZ}KVe6b*6r`5{kGh)Ljc*KdiWK`R?t2@u@JS)qLIXNB)
z%w%Q&7@zP2XJmMX1vzGlh&e<Kfzdf?zo33$LcT%vvK<m043Z2>8OP{*3&EpO!S4_Q
zIKlRUCWqe=veK^F(H}fV31*Bdqyy7%Z~X|Q@lYm|x*uBz4#KFplkcmiRJw^zaLX5w
zt}*S6GO2Kuky#Io#2Sg5F>ryl675t%K?(AAP6a{Fo9#vMPU}%uvMIHFoU0VdZA2B%
zF+)c<<15P0+lBq2?E3y<iD~9*wBIstp>kS?E};yUki0~0sereGLZG)S)+<48vC`!S
z38Is;gW<{HWOOzeoew`>oE(o1&xfP4^U3k==pDK;8v2RwGD7cmQ8ZkpSkR<<0*SJy
zQxXtPK)^i<?cclodm^Toe#MM7g{H&`y(bwKxulo{WEM^)&lV6$P=t9i3~&wjnK?f*
z(j8tL93PkWNM`qr1R*y~)j77?Ux*0Dmpa=Y$yAWL!2a3;1*aFZaN}GY5iS;Ci5n~N
z3E$(JG_db{e4=8J())k_cLH3Hkb|Xja0-Pp<KZxu4&_tM7CZ}za90#(g069MdnFx~
zSf+|M_eE~^&vO~ZS~~j|P*WQOCI@Sg{Xj~kR$!FkK(Q!?#V8jyaAZw^+zDLX2u#CR
z<*xcK@28=nx_1G5tm$4uTh*Wb((Xyq=+O3z%yFJ6d(U?&GUJ1c%UqBLECgPoZRk%^
zp2<_Zs@`Z~kMAnlx4yB8Iw*SSey~||U5&wXF#Wtj2RMO-s)w-Yc@#PfR$RbvhQ^ec
zn0ijutL)!mf!q}F@>kbxw_i!X#a*`z!547kQy9!JuUVqoEt*VBHxqfH+ChXsnZa=H
zSlbUCq8d0_BsLDd7cgz>k=@;`TMHdPNxWjV>|}4RDPpxB8z_I@rz|Ccsu@ont4P)I
zm&659WN#1QXOqcFS^S$g7DXKK0NGG#5eTAk!GeMO2Qa`KED*4t9aQ`#z#MfYLBdft
zdfLd!6#{VwDO4TEtcG3bU~5U0z^@dvt7pHf$&<JB@+E595%uoL!NUW3V-_GfARu12
zqlefeiVH5~pMD=*I>ID@ai}C$2skV{BEVxA&>K`qa4^7{U9@8z3D}o(3QpT|EFoS)
zg&FshN3#yZwGHL&%QHDX&Dc`5kBDTF=$yy?^gLgTswO7opCpPkIKH}T88@A`&2^9c
z$s{oA6sh(gk7Ha4u2nsi#+5eIkR=2fpzkCB^pEX3iqk_&t*BpLq=dHt;G`HOR=1<&
zgd?87f?->6GzaoI1xl*FYdcWA8g?6P-It@d&Y&jD=xYx2ZYB6Fok0*e6g5@323ndj
z0PD_{)Q#NGb|O`;ifFZug&UWD4AzsJ$&}7jyLK4*y1`s4UDo!tj18r4m%MZ~ovnU+
z?|2di)hCT=G>_o}-OkHJuS-O~byRLb+qI53?(W(<QOhOXsTRnX%85z7St^ZNxxFkV
zO*LL^h(c+orjaX`;dR4W$>L_M8ZPGMh3vQjg9byg`CtIO{EJy}9X$-Q58Z3S?cA7!
z6$xkYd?rq_>H4v?`IiX`OorUeHSJAOE1+-Bb^@<8n)z%CvdVz;ZVa+sK-GoruG4QD
zi_o1>)blob@FRfVrX)&b>q|dx%q0I5j!&@yat3|0fA!a}`zP++zv=#V{rYtuM&8p9
zjBCnZaM=!RSEjOOXvHNCcGMaN8KAuy@2d?{bBApAxFKsl2a5UT>Y+vl8&y<g7B%U>
zWhkKw0ER$$zYX;88%%uH5TRSHRxmNitOK1?GhIFYto`a_ptIt-Jo6%5IM*b>kc?jn
z9bDCL91JY}I*?w}e}D8D<|FucMl9SF0RTq^^*<j)`hM)&>({A_B+S-b{bxrNkrzMP
zMSdBAYUixxp#P_V(ER^Im5B-6mGt0!WsSCGWXp^|_%a!ewqlc}J?JS{sUM5KcGRv_
zZ93{ENBO_b^rsQsB;hl8*9h9>7HkdmF<&o$y=Hd^z9`sg3X=hsTD=s?s!*y>1%^L^
zd1P3#NK#Rv&6+efSzA%=A*Qv#aUFBRwo0zvbWnE;D;Z&iT*R@5?y>a`eNxMA8!-&L
z>nnIDkOv(5-ngv`BPjv|MGz-9Ut}${OH@k<dc-h_{Cl{Po#fK$qTS(RhC?lXgdr%k
zxKwZnPXi^e<PhWzI%e<|@_?{8jMno(F!M+EIG5xp|J+=_t=<tbJot=k2qP?QMOLZR
z%#9zvAM<a0tnF-Z4vY_nNd1sOa|ezLauQ;;K8`w*=NSZtTCf+weXYB{Ti^WN+)S;i
z$~@={d!3-8lq2m*#t!zB2Z_i8$(LwQh`OqHp%m*8lML}b(RS^};2Ak@H`0Oo?Z%b9
z$9Sz&N&iXvxf4ch@-x%azoFNYk#*8_M4d5#hUdroD;vd-&K)30bFk5m66ongd`q?P
zWavtlJcvn8lzq_*zqIp#7?yqe$PHihqb7H9cA+GI(bln=`nwaL{wk1DRZZu!vL@!Z
zlFw?|LcGxqXHZf_LWn*@l2VYlIXM!Bx+d5UQpt!NcJm|4qTZqGWUaDoHZ^e~JU>!=
zY4;4?|4|;C&LZa<oL!xL1ey>*SzgV>SNMnXuj&o$T5VI?#uonWU$LEGYPmHsv?S>O
z4xz+Jm<yBva&J0uMzfYzmWsU6l~w^-`0qXYsuxSP%+Mq=_xeL3v}ezr^PHDGdsh1g
zu^)FjgC9ER2Xy5JDe{7lAoxGV2}6;Gm`~8<-Q0`l9lUd|@r>9&%;_z+hu+{xKqxwo
z7@=-J614A$H?LAT$9ALnOGW=CN(4JE3q#~a@m&(ke1<TcqA+j?O<`f`MadkqAfkN~
zhXljB&jGm+^G=SBMrW5J&Pqthe9X`dPSG?-SrSY#MyBW{U_Ok125FQfE`f!nLgGQE
zL-CxXpoGzAd=$;&h!V=im%xF}_Bx#`Z5|$vZe0>{>GG#z%1Gh?)4jG+kLhO|2Ghf2
zmd$~{4D4}32&67ZoRAd8QiM?|=5t%TrvcXn%@Q2@WDdH8SqiJC2*8JdDFQIwU%lD<
zMVsglg@geG@}e+|Zh&HP2Z+ok0p&bhA1Bxq94zd*VnKEn2QCi7yB^}UKsOv^z4DZJ
z0VOGCjk#=9Np|6#VaiGTY>sJ)<^)p|Ft9JWNdl0FB1UdmYD=ecL!74QnnpL0^(4xe
zFu5C14vz4Vn}~K9O5+gtV67Jxe(ELB9N4D?)s#9mItJ=6jW}O$u?%p9ze9~GOaKl+
z8i9~Lj$;rkqI~HfK`y2dl~`<Yx+n$w5^Wmkq?~Oqqmf`n?3pdZj*=<J#+CI0*VnQj
zoDlHzRJf@RD;X_(KnifWQvo;E=6jVAf_%o}baybwqz&vSnGHaSC}HV<CEL#iniyxy
zhY&jhGQbnPO~^I;w;#V^u749H*E$vr<-2Sap?7!=8t?n??DNN0lw_XmB|2(fF+Tyj
zphbrlK_yM6{6o4r0?QIQP0`^5PzF~hjduR(Ao#`E1cDxN0d+Z3<Tzk!AkSQ8DcfwQ
z|A(mC?TJZpD*tWp5Z`=hC@4=GVeltOoFH|~UsFpl>7fI|Z?{No9t|agp<X5MkmZ5*
z5HuVP%WL)u!tkF!2~kK@P2p{I)rbsH<$-n=7Sv20I`ZFIgoJlaH8{3yZ={*$1-HFj
zU<KajRv`jPK*kLr4N2MeN@E4|N}Ac$HhMWkV>ikuv-Bc>pML(h^$8suaH9Z}!8{JZ
zwpO>>N1C>v(NeqQSRU+FMQSvWnbd5j66=4&Oy)5mEK8_Za&MXOTtB1NRzMlr2nn6R
z9yLVUU^$#5_^x6&t__$#Q$9w8E1o;~l1QyKhxCjleCr^XXB^l&DFSe#CdIfA-R^3?
zR{(tcRLf-}x#i(Iu)6s$<V4uKt>@34{rn8=H)+Xd+Awwe;V(h?P~afOm13JiB*v>j
zRN>LJ)daiy&>Ljkg7Ykm69Hlh!(2i08a76PA+cMq7t9>7C0VdozYJ9$ZEp9``21q@
z*10@CIlgjUk4}zHouk9^tM?ZpbYB`f`^_1ho?rdm<J+cOcL9@1)C!^sEK=Z)pK^_i
zYgTNdU02Rn>b*Rh{|5>ym3;04a3MSi$-U0-mpWtXj5LX&u*R(w0c?$svS4e6{jSVn
zQDr${sGqd{1(gti$miU@8$*tf!zOPv_$zGs5HY*EMl(%c@5Z7Mf~3SN*Fs2$ou3@>
zD)j)3&rHhN-93Br8j@q>)lsXwDCFqNHC1NR7&Iis(u}?O7*;&)?@=*Ps@z@+k)UhL
z4GRb~aM=<o%_qVxP(oR{WOSfP;C8nvF*Ak-2vuVcc=Pt+@ciBAbmWXaTwOS)haZ0Z
z{c3bsAT1}T%>^Dkvp4n8Rv&dmW?z-j73d)SR}p!6K>jxa>s&>v15z%qBp@Z>8Ubn2
zk9=w$kdoi3fYh4h<=EE_NM+?>K(4G(3Nsc1^1Goy4}Jf=3dqXKw(*twjWQQUqruC7
z?Ls(KT-nIpI!qK4)jDCR`v!DMZh!MudM_np8j?N|byMVdDPaKm7P#{PysC3&Ib#iX
zRuhK$skJ*x@>TAvH8rXzHNL)E8-a4SHdxfVb$Ld^KBIV)_Zfv%JycxTS~OU4SG87v
z>M=1Hy2-7p@B?VYIc=sCJ;KF|mw)4b<1izmB!R>9#@hN7_gRTk0ICSvgE4|O5p;r6
z_P-NFLfijG()y89*tE+zy0q{XKXdB%C@(M=Al^a3NtDs4=}1koS!&0AY*WGpFLr)<
zzEhf1;fa16mSRq9P!0Ak3!Tr(xEor<O={5#r0yk7xzpFf(<ZH`ywWzKB+IGyo+b_a
z5e3u|Jp>I`+SjekjS#}+E#xN^1}pkRI@ScsoSEVB#hW^9TPyNhZ-IJ?*-Y_RaJy1n
zw3K@;r%0bFt)wLMM1EMO`Bn<HaX=kmI7{&CqmPDX-?0DJ(WgFagV|z$v@$`pW?jb;
zd2%uVQ_SE^!oMyE|GG)|HXW?@G|gh(<R()itZ2E5TZwYlDi>@mSXQ)G9syC#rI1F3
zD=UDNE*>YO+WUo9Pt*G?cY76E(e0Jb&D~x_+p}v5|1Xy&zWv@W7%#*wG1nUWwkprk
zEP9L)o3Z8GC8*+7tO-p))^Icx6Uzrv$+Z$M3<n`9V_u1cgrr%>#0^emM3r<68*jH-
z(09T4x|NE(*u>>O)mYYA2<ggNh<)B1$v8n@sa9Wr@N4P1`a{m-)kjc?{-W0QP_cjj
ziE79cd}XHjd7jVgp&#=%QqXFlv$R7jC9wtX^29F_oZ7S61t|YLNsvlpYA{+eWKa1q
zkEEr@y&yAk8|(PJ=hwsh)YT%8b%j-7UgFBRe5-|)@JLw(ftrb^r`4&_+-bEaH0x`k
z>aL`9Ta3MGzX~Mj8wp^i`e}RT#m+B3Ki_%rC?#W|rM9@T6?Z_T>OZ2oWT_qwOvtZL
zeoO1$<9l=AY?BLRaB0hPIiP$UHPTp6NWPBV^{V_!h^{i<mkoq(zm$+yjoLY<Bn;-f
z?W0|h|D`-pz4AglOLOO3e%-95tB0~J9s$6m_*6$S)A!F9!Nwi1;4|+oF-Uqzn+s^8
z=;OsOEcnN5WFE7-Webbbw=8@(fGgTl>H^p-VRtiLAB(^Gnnmqe&3;`_nR|6Eev?n<
z6Pi8xsd1zc{}ijen=d_<=xVb5Fj2mVH*cS~j8rA$w)ieVIBtsqGDmgAiE@oPa@9S4
z5wWHMvY5UKWn@9zGQZ7DsdJ<0N?#0>D#|8t7ZO~Hj}63@(C%{sa|mv_-IN4tG_uu%
zp?+%J$kvD96`3N}P0#r1?Q1DVsaIrBs82QJ84c}g#iQK5*6oFF@`D2<T;uJ1&-6Un
zUyo`e*ZGQIr5sDc$8m1(HOXSD`pM*i%a)p;%{#*QS3Er>%#Wr=aMmeo2uGOm4IrZ_
zNdn;-sB1gU(aGWErQ@u-;gzqdxfeEn;#u&;_MKeE5t*qLm*zNY-*|mG1**wlA@+yG
zSb69?bp8fyQOj=IFc7@!D;DS_2@2<)7^#g^c>qac*t!&TQLM?8wFpHj<SMSv_TRgr
z?c|b^gyqca%<S|_*K|d3epbL4R1GJn*%9cs!zd7HkcMD2v~}=<&df7zX`<i}e_~GI
z1~*I|7D31xrU=tIPiAS)nV8UC9q>0HX1Tg|4ov8V$lFE$y#>dHeA30f4zWey;6Fp>
z2zB<#w9CAQ`|I-CsvM=VOKDJGhY2hviM;8BEbLesebEFd^wE$mvf1%@QFv@AX^6K(
z>+9epqLH*-QG8Vs>$x1HF2`E3?>R(z={c&prH;JSsKc>@TpAup8o;tap|p30(8bVE
zlmVLHtRg?uQWer3d=MNnym7R!mZS+5QWJV-VMF6i6MSMzS)`Bbx49nnNze=D_C^gu
zDIHI!6hZbQ);LV*Xn%&i>PMJ6`mKl113s#oKGHKxTbk)0;-*g%OINwWPe0xpI(h%S
zxTxmK+p_xgSXOsWU*Ru&@U~b!Ey`u}{q$#1vq!gg0?R`o#h>C|@gIFs!EW0y487|s
zh<3n|qG;}Ex~9w0t=QHUi+5UzK$huPh%Ffsoxo`G@1<nBy=>Ekgv9ss9?98tUDQHM
z&IFu6QfLpkE)h7^(h=Aks6be?Rc=kocWNiMc)`V?ex$~5D^raI9xb6!8Xe5?cr*7M
z=0e%(Q(u2;U8KvKvIJ%8*6D3QAWa6PR%kqbY;x-=N!pros7sW5x7T=xxF2_m<^5_I
zsG>?LB*8&?$h0S?(}pmEgQkLC*nzi=Q^+4>QSn3wBP;Z5;?2=|VGTK{$gfxE_AFw3
zLp{}{5RLy|Wgk~f>J>xKB~EI(4Bd=&e=|C&d7gV@qQ90Ofh<(g?Lb0>RM_mJ2Zz)+
z1Ju?Sh}fY7Kj1R(9n&y|xojBc;5+WMfzOuPIopLi<#fKSq%MakOvLG*cZZ|*bUICL
zetlggo1e?%+ryXflgPD^Jf%{44{w^Y-h_A-z$Y3Fhehzd$O^(7%=X2E34hpO%R7Y-
zBD)OT%=;DSEez;?ox2<Y)p^98EP|MOp5b)bwJPK%J;x-*x=DGJc*BeeI|Q4JvW7)9
zibi5!?TfBEv7OGV_)#nwL+9=&j^Y(nQ_F7LFbur=D~O!3!D90P3Hm^g00D|3=oaWD
z7h0lYC9>p-^lpu!|6Wq|ZV+D#Nz`ySGrIje_G8mrUo~(AKl{MYg-D?P5sN_XKzf4x
zJajqDy64{Tg?3tO^_Ok~57-7u@RWs;3sm5?t2<wKxwCV5__WqP<Wk|fDMoO4oJ)A=
z1u%Jt!BJvuoVr{Fl#tUF#z?4phd{@A@7v?u{rCO7K~<L0qredvd|)Y|orF9bgY<f$
z6L6l2BW>g><LjnLI1uX)=ZT*0a*~2h_<2v|pd@ZgjLP<@<U{bpfZAgQ$xw*N=t6E^
z$%$<RVdWeoU<4MFvo^naRmEY9A-z=c7xnh#<^l$iK6}XN9crsUz<r*ghn8TR1X|U4
z?O=Exn=DpMJZXbj0WmQ+RjXJxRHs4`DoN|xsq3h46<MV{V)0sIh(^i?)+VQNPa`E?
zt>hhi)zh)$k&5X0l!kTs4|EOi#Mo+Bm0q~oWId`cCP-NP>Ox^rInh^LCqBzo=UN4F
zCwyZ`erx=J{@|dw*e-s!S*KnJ@sbBDWPl#9>c)$$ywx}?1xjyL$YjX1P?36-M}e3Q
zR8)mRzbE2q?RgplQ!NyVA?7^7Wzx*A86-e|2%6Oa-^_wpqjzq-=n(B<NGv+FDp@_X
zNd`)?WF+w7LuUc4a*dfew2^k3n&0=+AC{%Z)3W*7fPUlD>NC>Um7KjFSOa&{{A>OL
zrB_>T;yMt1&##zMu_9RkeTSBIRki0-T2)osw^CKc8Hm+jN45h+tN!;LJ0VR%pnJ~Y
zh2YHPoAEan&MvYf3xd<{0epw2L>O3z6oI}orY)!i*aYEmyILr@r8EA<mN+6|Cm-?%
zZrEI)gnMOCa)BDo7XIYY6gnfWR?|}cMrm(uk*6tem2I_HCKi~CAr%~@A;)r|^om)b
z<N&f18J(>KZoJ;l+pFul$7^TGqqGULuwe#bVXPMO++qwHVH0{o5g3(gj^rrzh);t+
zvK1N%qKasCrKHu2TQhq^y(SQoAjrw*z0v+16B27r*Y6xN2kur{)C=b1_r>p&y-~T0
zyQG8DQ}_qd3{=J$PjHlJOcje=3|y@#fh^sytr<$hn8Kkn&Q)pxo-$)z@tq<y;SoIJ
zv6qY{O^w5lJ{5=s{+fOOr9@b;3KEA@tmq<EC@qvZy4PwgV$_w59U(4RZWFrX2Q?QG
zt`bI;;Y_<<Bkq4)E>}#XJ5p2%cY-S?`?tn7r;=S-o@|tU+ew}V1*Q_gPsN#4`pKOI
zzXG67rp20B1g16HLXTjPfIu_pdh0SS<Py%|`K41JD?*H)wwW{GMSObPhj3GMuoZBY
zrfi<#^GnTPDRWww&F4gIV!Y%o>+t%@l_av}+=gwWk=H1qai5-J@o-wbC$#ObKK79P
zx)d@&Eo`j#$5AK=GodRRN<&Y?(HQ1Rr7Z{=ZLTG?1A{hf<9Q~vm+1ckS(5Drkd=7H
zxP?S4ApGkXj;JQ=J~q*6v&$jZNSC`;1flacsnp6KcJ3P9O2%~iqC<B({z6~ZEX~oh
z^lDye3bR7PxbD|d7?jowGR+eQbl|n34ogJ8bN4U_zRJLr&^%9>e!vB4YS`FFMd_h4
zAsuPhIj#KZZ7VM&eL63!h_~*Hn!2QdY8%Prp=+oEt-<}TBrMxnT=p0f5*7U=d`ZPd
zx7cS#hfvvh8gexGkVXRR5ge!`_T21(^XaYyY};NcWHVu2ca15mq`SlqfqVAO-2L`1
z`jb7i55SaW-XVKrfiy!&LwiO%OVKCzrc87V(QryhfAAD>Zo{aRk3WN0IJ|IKqle*?
zB3B!8M=M4c(J@5;W9avzQ6WGZhOvy8PpeH0-W^%<mPw^FMBv;hSs52c?x8y&LHDm(
z`7|q`HC<}5yD?Pp@=)h$G|a=(y^Fd%meN~EOV%1c+twRy%^vgixl9X`p%u_^gH|kD
zWp+Cnjr#R6?qElchP$m?Whx6BAX+`mp=`eIAX^QIp{z-}2>VJ>_jr?Z|G?%dw|;9p
z`DRZ1j_DsvS=^)kz%Mqm9ESaq0i4k9rq4lvx`pi^`TrfB5{5(3>E+N&YE6~Hw^Lzw
zBA2DN!Zpo(U=U-5GNuu*1!5TkspQb_if+%V%a4k`1!=Ky!8b#YNwbZ_&yGQbAo_|B
z9Y`PRD5bL05Q)=cpERCpT}Re{bI|i%{kf*(*WIuZ2YjcPX&ldPC5>(o|Io|aZM#)5
zeJ;S}NTt;R{P>fSJ~E0wYkN@bqs%5$=tma+?#=Bp;3~~K$0SmECNfxRgY<8MMo{DO
z=|31b9v4K|Wx6UG7*4?*dT>!KlMlJHVuhU<JQ6}z3O|D1g;d{f+At7)_g``1g%(xt
z-m=14(Wz2bp|Q8p2gkW29*J$)4m92Nzwhh>2vpl5A`{<_@4oNOp3Y2R7@Le3jNp4A
z9b~dZpw)2eL1*9#gjG{zS~avMHay2MIS2m>aS0DRk*Hv)Jt`s5!ZeFJbJxa<g|2Qp
z{|9Yjx~wis5ZW|W=7k5YQYfWB<p@}1+E(04t**e7$Z2mYaTnvB9`6^=t3^l^tMmo;
zu;UI=>AaOm?J<R&^aWXnfz!1WNI+?<c*2<C6*?kuV6?v1%3ChHTd&Y=sfZiKYQkJP
z8*N-F?EQOG9&N^>+hi0;eTFV_Y4uj7Js-d~qaC_fJ6V*M87br<;jrf$Lsrt*wHZkC
zHb)9c1Dq=FVE2O0dF=}l@mUI867Me-H?&O6+>2tT?Pjm`!SgHkSi5&vNdwcW{TMrG
z=6S_sxp$v1c_{iHY^cSlgO6gcpA6`Uf`n%T-_X}q1*X8A(?U{5w+P%?-t-7}3T&`x
zDW40~mm}CjZ7o?(go%KA+{GKOXlmT`**^VVhNaGPv_trG3&YUgC!L2k?=cy^LWNwl
zEz`*l6n<X>kvWtd<|u_hn{d$1p$xzkRp;O@$xn*Ov~DYzonRiA9bx;RFrc_WP_S0c
zpa?ppQN@$w3GZmm?zmmw@%R5>9H|W`HUfmC(1rg}bYjmWo!i)B2q#bFFRyfa;IUyR
z4Zb>dxKGA)sU~qXbwZZ_-3>~F(+@fNZU)nCB;Cd3bvr^g>^J)ZrB+Q(+%OQm=U0rl
zKoKA66=>P2EiDqFs7p`4!Rt&CcN06coo=J5|Gm%7$1bo-QCR`eI^#EQ-n_9nIjxI2
zNe*`t+NJA4Im%SYgl8?RCzFvcn5J!&8Qo${&PC1#2oCW(@)ezlnPN>>#<P}+EuCa>
zW#YO$2hvn;`}i|sBV5*$B}r4aR^^2!p;IcAWbKexXU0~-E2H<QE?Hphr{YE2cX9sy
z<K^^YfQl@AAv`UFqf|L>)vWQH(n9$HZ%~0Vjg^c<X=HquBwAGLP{df#?R%rW71F!g
zDcheQaU8^mY~NA8G;L;10v^Tjui7|vq&$*x%{q-$J8%?{qVwP`>Gz~mdQLg}adX<E
zxj$5~FHAb9c#Umq1N%6#>>H~cbRuD`XhT<A7el_S5oq~Gqb!P_wd5LEKt>SJz}O2J
zOda$TW!ci4+b%4U?Lnd})Hu9R+Ov(J2SfRNjwm)z;fg3R*u-FK^4PABs1kNgTc=y#
z$z#?%S`=Nku!cXDj0Ro^snB}ijcrFNtD>$7r1W=|p}j+3X=K>xX!`lfw~G&S`Q@5G
z+bl>()D6A{6x%+d8zj{RMbs=+rj|O~@5i|h_D83?gt6|&P8b!2zqD&ArmN}K{nxMe
zXTq(cxgzX1YH=+Kc1%srEmaZ@;z+%#85#~o$h!G){0M#zwIig-i%7@YMq)W6T7szH
z6HH?j1RkrMhz1)iT`FlxjM68|b39J!iI>H~*!eKPhsl!eBRS58SIO^$@QEW7KD+ew
zCGP!C>-M<^3gO&YT5Z*0M-L+LbF*EVJZHO2Z{E`Om9w`OCJ(>)N}1bt=!wv-GxaP;
z99hKgTOGhwBsU_{3c+B`j3F?Iu@VdkzE_Qd{VJS%Xp^T6=?~WMbx#t$xqA*}_dL$<
z5>~|wLycx`$hhp{eYTqwg+U<)%;;s~gV~?8@98!@=x;m?7RvEI8-Kc)C%l8(E;@R!
z=h9T|=GJV2jJ;V0I;y+@{RxgQ&~h{C1I;Gg#YExm)%nd`JgCQEzBl9R2l?I*_o#>Q
zSvNEMM=;!`S);onZ0$9<^XjNOS&oxG$zQEjTXWht6n^)wIAzkoWC+=3HwkpvWQW<7
zW<vHUWEf!|V@+&{m1HQ>=D+Wee8FJS?M&A%5z@JR-?`;#xK7rdcX{r?IXos@L(EeI
z`nzVzfQ-Q;2(w)lOR=N7@P(~#K*Cnu4|{OOmK+7#OM@chsNgDgHzQr>3__XRl=62{
zIdgHIrVz^YPVrS@fQblF9-`3XSj19g%y23CuuhTD-G<}V>3y1vZ>O_cYsy7w5@uk_
zG(=n*#h1Ck2)5iL^g;-<%vFfwC~^^BdY)hzY64LsnvbP0iiJkcXQ(z5#0SsI$>+UR
z?u~JQjnhOJR57z+R_aYF^N*$sXg<rAI;1m3dk>fAj*m%32s0$x7Oy3{6sdLg4hygm
z($9<{A#}A}(1jM|PRYy~&d?+>0)-}50?clWdQjO09%*0-fo&L1*^+o920P=FX+0%=
zf}qg0=T4RB5zFaL!C$!H0)Cg2v8xw*Uea;2%E(fc=u3~N;HC}b(O!GsJfM#VfYF92
zXftaqSdq1&k_v4`&%#QGs4KPIUkdEoh>HXjH<1iq%ga(fUs6$lw&aFXaw2pjuh6tI
zqWxY#lqj}ynnj5AJFA(!E;(J`SE@DblbHo|2<2`OTIPI>X&eOZ+=F2N-EJQii@U$4
z<HyOD>0&{bP$&e!8!<otPtPSp`%xz#3ls2tK@Bi}z&J$*V%+lBySO2vpIwO75@qzP
z2)NgPV?Q24Qxo1@Uss~e#ve%cii=g@gbdrJIksXyn-wl{s^{kItJiY(?u=F40Ef=%
zF42CAkP6z<Z_h9sf}ol4OHtH*xt_V2Aez2^hsO2CrFLE1diWEm_Lz~X_2Q~lu=MDG
zpiT3PYW_?7fdAxNVRX+F@kr9d=_wp0QF03|(VygshqqrtT-#*(dQIstvELmtA*2C2
zcslQO2dJ9MMyH=a@SZGpXeKk7BqH6x60K-t#e@_WMI-dxnUzROeO(MqA#H`0QT7H@
zz;7j`4~-J)?{T|Q>HS1O6qD(Z2GdbRJk$^WKTQQpnbXE;jz-!!4FZ1*`vB<y3;zMT
znk19R0&c+Pf)XP_q~YJ_a65b>_daY&7nMbCZdmws>4{aZDe>V%;WzbJn#!%7QZt?A
z_aM&hushga{1iU@v~PA|3Ad9HpPeKxxU;R?U~SM10`k#h_1O}1!fC@{nY`L(A@tf>
z4kJ}I->Jn=Zv>5|-a`I~eY9Ucv?YdZf#aQF|M$4Ksg*38;{{fw=2v&haRy6bsy%an
ztO4Ukq}n-K@%ifg3)NO#PunmQeb2ABL)Dr9g=vp1bd$PvAOS;bd0O}2CO5<)u_N1|
zAE^I*H%>#-4@xy{L-R`#`=0A_&+$jjKBZCWIH!jW9Ks;t8bTf;&@*MqfDFMz2>odi
zN-?EA|AF1(2?gizuJ1vQjW`Opl?H{+QNdYgdp_#|bK=XSy@>BgWz&UO9D^^@sp9vM
z0VV>7xsO8A#3Ga`VTMa_3~7vv`W`usE$-^F)4l0;^Hi3liI{;g(-3fN6dz><0~m7?
z(Fj$bWu|<ji2}>`)Nuq$P*V}l6%9L57{z>}hkaC!L}EBVZCZ|#(ZshGw|9b@VNVfm
zEY*V@>=36`F|L(Oz_`H5+odq5LYk$BdU>kF^Gf>6NHtK5=QFdBwsGLcOlw#RA_9OD
z5<AdPvT>dqpq45!!Ot}aGvVhF!abT*yvvkgQ>YO=`r@d)CTtS7>58OzQ)n_JK#&cV
zlUsoUPspYOh0$9QRg&b*%CW8JGGJc3&Yhy5Y((o~S&gB3FPL_{HGZ|YNCxLn%bjnu
zH|zefLZlu_S%>rXGPmo&Q(0(z#8kZn^W#-a-n$Dk+r(@S4YDMet_J_~TF$bbq6ktN
zl^LiE-Lk?)JEHn6d(Ug_56G#%2<Wj`Zy*YeC1!^qU(x(0hP<qCpZ0el(lIP`AkMEy
zUE*e&xT@m2)%zk*-$-+fiR3ff)RL2mA6kD}+k7j!?`zy!+oE|pI;!!CRApN+V`cQ8
zi2Pf)kA&f`+c1cf9P4l5P6Qaz2^QEBOt5$%?1n2m1oz!i|L!EUCvSJ+W144my>($1
z!Du6wal_S1gcd?iW@4G>`6z8R?b++K_Q-mTTGKu4)(3QJ>Y@ZVAhiyFHa9Q`Fr^!W
zZtN+L0t|!{4V=&|O6T|zK$;(%6n_QfqLU(?!h;~OfQ@8k?7duMUcgT36^iq}v}_m2
zD%*YA_S>=hx2&VR7fFXJKZ}|Ajv*@2aLb<E%j@U2eawEv=#mr3u^>ermwyAK`iiIY
zXT?m^v>(uD107(+gY2%l_vW72l-o}E{Zr1ir<}dT%9=aB07XzuZ^AGPz2{f>xS<Jt
zz|e*?fy6W>BslgGQipgXah13$Xxe{YTA({6vfuOjn7=lzQEE0(FoC_J43<1Xc^jPs
z*n&8O-6dF#mohUaeZ*-2_xK0%2rGRcjId?FXb2O`?J!y7D`#pryxj0BPQy9ddJl%1
zOQNF_(6I(j24gP5(Q*n}h~pD99(9?06LtgdWBs=L+%5Z4gG+H*pwk&@%97~N3f9n(
zxUwk;GPlWK5vm8rGo_*qm`jK;QT4{5;fPVHZDNBtSIe`(rq_S&YZ-iRbUKw}>nNCP
z&$hQ9Hx7(f?#(Q8E3Sav+36TD!)6LQ;{u7mJYPRw>=wtM$=@rQDH;_<7yqJoE)~}q
zs=Z6x>4Qi0qkh#Nbx_M{0znYG&sX#@k)R(CNerSO1d*8IUdGv;-Ntz_)9Ztfe^2j5
z_vUG!rXF22e@|^vYBo_Yf$x?ISaJyRCY>3g1#S`cS8rpu3TBSF!KsjY{*!rzwLTCA
z*hR)*2s6y>fGo<tW@@5;yYbgC4|cY54opnfOijz6Lk*4$h9bei#_Tmy3@?xzYQau~
z=Rx<mS+2JGRc|$1$*pEM>jE_u&UEM)Yd90P@*@pO?6N@#s)vhbN(Jq)NQtpgwTwQ+
zfPt%Bjs{DqRu_Y*&wuS_8SdVMlXg^p<fijN9T{M6g>G6H-R=u5bjPibzM|I@V2d4R
z(ap)HjAqdY>h258lyO>29;V?%Hm(a)4;f<Xu!jna;3hC;E1lJk`c;2jP)%zBF%Z4y
zSIn`M;{Je2D~N(1BDKf8#O!2uXp#v@wkoCny|Y{0gQvjD`<V9@@3D(YRWk)M`0OZy
zC5Iqy)TsblC>_G_>Me(>VCGA=I2ZE3e=^Uo(I>(H2QC;4VS<Gnk!AkZ%nkdu8-K%T
zw6nc)U^reAwOs)n8gOJVWC;$Ilh=hfyg+oQ1^XsEkGkD<wca1sgVlIt>2!g!&d^XU
ziB5gN2F_GE`H=>h`(#jpn(^XFsh~Y(DKRywSL`DP45dCKHkfn0z8H){{_8Nyc=wK5
zG7}E=R^z6C$>YAuQun13(g%A@0ruFJB)SFpn9wX+LEU|qN*Slc<RJquvS*W_e!#`T
zp_i--6Sxfpla*HLNByclja1ui+b|4$*H>^sgV;suz9&uBAx(h}-Bv6G_F|w=WZBkg
zONJ!pf}#IDO1>m@hhTcKKpygthm@~BS9wLq)j5H4c+Q1^R1_TWTTyL6rC@Uot9_X&
zxknp&r5TS9?C=2#;hwGqm++)4mrQUC*QvMMnkFV<s=R6O_e%S8X<Zb+RJGS4%Pmlu
zKp_~H28m^=bV;pH@&c-YQ?zXa-}<=6hsE;yYUxt>Ds4_JY^i}n7^}s)wmgBYusM3L
z1EXrqI1(kk;wwTVExExa`i|m-Dk~+qwDFTxj2ja#cZ^q#e?~}cP9fXx%*p5b>q7yX
zfRtj52~-V=n@+V`TH74`UsX<}<OaS)uwr>Btc7dSTz;$kHY+hfC*Kue1vLg*&U>Hx
zz{htee`4TgEv+bd?;w8&;Hk9OP|M-0>Pz<KdX2i{I3)8~US61zsASD-&=U0_p^s?N
zxg$~tI^X4uFsqumD~>h@!y}wKHrHwk5~uheH?$DR7oF85O4-*LOqRQfGdDjv5bgqS
zu73QP*x;tMW<Ph+lSY$p)^om*{(8o>My=;yPy=bxVDg;1l_*QMb)&HvwRF)W8pSe}
z%bl>Wz?GT8*aTw}I^!>;UxmzY&omaP^xio~7w?)ph>>x-Xb2vK<Ux1>=hz(Ce}SHH
z$|r$snRi{4LD*x%8F@FlPsg+SQQNAvcf!y$D)DiCt%%V<MK4toHjU+caAG+&UP~W#
z5;hR=LrYEYu<MT!Ii?Q#4*Ku4z@Hng-*kGs@lBV<LY=wa$mLD9ar2}1bChrRim;sa
z@dU$1qq(iM9OUhiy^+6#Qr&CYFc5#&UvZR<+NDk2lQavI6b56IC69rk$Y)E;mV`d)
zhSC3hXZfQgTRXi7pYDEN=has$Eo1X*2G_8c%0sDY1iCGE0Za)&BJ560Y4nL|;uo)Q
zM$KJ+CUSV-M}-<5O+YOaI#`vdvhn@QOqgap^gkGv;L2FnAdEdZRmlKc7f>sK+7q!Z
zjca&NM&E#~kyGtiVVmZ@f4krQ*ljzgq%uezpyeJ4<%3hl7_fj=1xYXDz?<j<5>b&9
z&l%IaK~E+oM~8dUSff#g!=p0-y+3SU1lo>&$yoHCbq@Eki!b?`Mtfx>AxLLh4Xvbz
zIM{vwBuPFZmAtAnudx^d-S8MBg|wr9)HBzxLybc68dhYcuVIv%s^O|0lby3t5ekT!
z6ZRl#Hz2=B!WY_5;o)c0K{Yr%u-^>mSV!Oi;nGg7QaK)JHMB7;63Ww)Fq*=SB4h*A
zG?J%@9<Do=-4<@wqwBkK?1ax9MY>qL$MvK|hcdg`)6PH4tY38h1s7lZ#q8>4Vz^yb
z820FzK8GyN^JU_E{kJXZ9^7R4V$AT&j>8b0K6CXy)RBKde|Gp3@V$h;<c~D3><^Vx
z?@!w>5dEIN;#7f15EN}63uR0!Af}EX=srxUgp6~kJrX;zot0|hf8RO3XxhStKQxv7
z{O;Ym^PPMuL=gl>`vL63R7eY{%n;~XFyla{-~__mGEcQy(jI?ga~u-b<3k?71$&UF
z;6^)CT%v)KwAwkd^_?Nt`Duf{(59kG%Pa$~i=~ls;ee?GGRaX{3anCXa^|E~2T)|l
zXz#bgMRjj-bsk^e#h$8C=>&7IU=|W-oskcv!vq%62|A$+tS${l3Y1iekAgt494#f$
zWi&h2d7%|5H@h*KqqVd6iDTj89|u8c-$FLuV{c!TUw5@uMiQJbdZAz;$RY+seF2;#
z8K6to8hOS_C&-+yS}>*P?As9TxX7h*aANB}zqB};=S*g;qelVH7_l`nrbL>2FWrj>
ze4?5p7H&)BBX$SDp8#kT<pa4+_9*LM`tv5fzl^Wr+s_ji!-wNnAXi@|F`a*;q$_}t
zznMeWDOxXjyFM(XIb9amUZ@$<Qt?XT{e4AlO76lYk&f(uy215GqKc!I@7Ip6^Wkah
z>v&Da3S@=E!#0Ig;+UcOjz+7ZEG45{8g?MR_NLU0ZPdZ89gx=?F`@SJecG`5*RxA)
zh{TrI;od=yqm_DiI!8y%mD4krNQGgvhN}}GP~60r*7RZ2;i9Nc_<6g@bhq&~TzAl*
zD~(z+@=Y>nFHxakSzpEmrNt~Ajrx5x9&f3~KcZbF8UBB$x<B6^=T&=Of?1j@TtK+V
z9Ic@I;(lsv=0ECzUUk2!btht_J-1Q&eBZ;{b90S5!IYJm+oY?e7$};;vx%Nd-c6G3
zb?p66kIGNFw)LHVXoKBkKyAOJ7Hz}U6{&xpgTG}^%WlFj5WM><_Sm8dKA@;YLLgDK
z6)HXEVw`onZTyhEDWIzV-c5j9IN6$=o!OcBb8<<k*+jtvJ{=XX)FQ~6bY_Sa*dgpr
z-o|he%zWzxr$X-ecjg|}dQTW&8ySNk%rLhDvMA@BsfqsS!e7Tc$l0!K!NhdR)Hntm
zYG}z|C}JFJ%w99a@BpbrE!Yp?Vc2`!ELZQlRWCJM$xbsIbb*=*XWDm+H5`bYOe8^x
zT{b92^>Fb_sh~X;2{9(BmeHpeFmSca(O@an>S!?a{*Qev!`&ZUVDdOlz+Qq}c3@Pw
zHnY$jJ0ZP9r$fL3Z&TPA=ZP8S<^1`IZqay6?X{wrGOZT18#_Eoxpjf+W<p*%@?u<I
z1UG>(TM4Ot)t~wYjaJ)k<2Dd|*H_Ggv62E;E{dW+lX&AG>$F?+V#I!Eu?`GcqAYeL
zQXr|sMw5T<40W;M%kJt$6g4yF%*^3P*EeNWdfw>5g9}(>!ayo=4tOt_wxCk58Hf3<
zNR`~-Ui_JDc!b7eAH*Ttv$fz7X3BCI3$EchbvqMN`$VxS-Z%F5O1p4rmFEzva;L>6
zv%q8mxrn(m2rN^j3uc9qLnw33aPLX*XXp3($GhpD^C^XLEN#XtJTn7{Fjk9oWqAV6
z!e;meGcc;sF-M@pF&=rIWCb^vM3>R>P8Fq+T-xPKtC$;eMa6Jzf8mmA5d+`yxUy`G
zfT@rP*KPU}R@n?w`qmP34!^04Ny!cT5y3pp3Sli=n|krD$|jqFiM;h1d2!B+foVtM
z-m&oh^8l|>izj9|3`~`#Vv9k?@X3#mv_AwtS~KhJago$_RrrsXBe}Xf>AHXiUglU9
ztRzoam0Redp#t^=h#LD*4PC9VZP-m2Q@_A)J8#?qrZwB`Nrld#W=z+B8uZ=!9_P;V
z${D>LQM^qO0}_=`Dq{q7qxJx+AkKLF8BjUj%#|fc%{3t9$W4p?6{4RW_f*djrS=#U
zbzeB^9gy}~POa$#4;d?<p-=;oUA<hO<a;sPi-6><D(lVz-=g9SrW2kF_#)|?4ceC0
z0oy06n&!6B5=078^?_&zs7fXWLF<+_ED>6>4?-L2i=dLS9FHMBckK|;sxS6{PE%KY
z%5K<JqT@UU%3;`G_fS#fkKrZU)D8zt!;FHZkYcsrHt<!+<!X(C1nK!<*t2t)7|wK@
z%@|INagDPoxZd!9Z_6A<N3fjTE`D9jr?cCK+r?iGLpU3H*kc%8y@g3y)^GPwvz)~l
z1brSj(FP?h4!Js^jbM(m4+jm_iEWsW#zJOoX)Z^jb+s`O4)jQJJNoJ8AAbD)$e(I6
z5oU#af*Rx$N=LaCJlS0x8NC9}aXg>)CLF2^^|b+l@wk!qyLUhw_L}<&6}lR=p5fy7
z95eJzKb>UWwy3XxqljlkfqLNbDe!6E58>u=zk`HH97nPCVtMnbr<`WEIO8|--S5eW
zD(x?qK9+Y3%MTwPrgzBbpFO!F$x{iZTRL5R*3-Wi{-J7np#8FR5pK>Gq_qj*@^Fd{
zdmn~=vhAvOC|Z0v63v7@$YyWs`bUPiIHjak`t<J*4BQ{Y*cnHssunq^Mja|@_RD34
zmzN_|6G(Vg)~%$;>csInC*Hj%+5pYCY`;ja-v6alO>f&c5WVYHOp3ITi!{C4an?oZ
zwgLKujrUX+22G7DA`~f*lpUk?fA5fz97&0NSzZithMf1_yrHiDDY7Dp-oK6DEzB}u
zAr%sVehX$C=oDOraKFt{t+uqsAJ_`7DB0)7d;p)=QlNsL+M(hC4P2*TXJV@}S6t^e
zb^a%9!gXmWC2(DAjaX$4m`Xqjj>=MDm1>hSC$zeRLL#HRwZKg{_x0{}`u%?DuL>w#
z#vE*zg+y3q#Ikglz(%-?BE-Pz(r~0gNkIHQiWJMy5{Uz&`K`_itx&o7Pop_nJBp&x
zo`}z<j~ok+Z~kwooXGL8G4eVFqLjN930hzTZwpQn2+CEZF0I_c#t4Ug*OL;eD1*=p
z>Js4Zl_7ZNgZIuL%Y9F{)E1LQ{s}8xMv{IPTuV~nv%v@Yxh^J-XB%xE+S*S<PIBhN
z#KQc}p<zy&537~I6?1qkl)D5kqFUVqtvKCiyY)|95dDdO7V(G4ni=3sO16}^Q@+=9
zpN|$stSJ}HwVLLI+rk)pc+?G6f{fwU?_NL`WVA6jQzA)SmkYnd?;f3(+t*!^ODk`9
z$!Np7BBQfj(MtPenWp5`C6YqaCiG~o>Z@w3<&r!}R#n{h7HY_GL#$6?5KdJp_;v0r
z`0nN@smZTM?Vl0&P!PR@IH=kZwLjW`8;H%B2@NTA#$aXjUDd!HHFK9r&D?IOwcO2T
zhON=qr+(BL&kpvZS}fEDGLR*X%v?4_{^zoldm4;DhHV2nDSF@@=i-q%SYhtVEK-OA
zrSW*&q_o0*8FZylqr=|5bGYu4u(x5h;z9qo%Z%QDq9>?7@3AFoDwoC=uU^|%t@*t0
zqeO2Q9}dG94F)e&Zz_AtzkZWL>hb@NhTjf{YbHfPz7Hc9FBadXvoAkBE*6&!&0|Ii
zMC?)TysUIU9v?GtHFznL7LQe(p_JB-8Pzq<C+#4P@4wRSG@7Sw^Z-@8gtHc~4xs);
zD|F3M6%U5bjdzS{>y7billjk0+|JqUIt}c*##`&`RDxeyfii)Mi_x=4{kgzyWZ(IB
z&P!wHIVQNw7`9#5Or$RE6m4;6P#um5MJ81o>C<y~&yS-_jm{4xd$0h>7)MVYIdobs
zc=M*y68am){A@gKzr5X7_9gUnM)i_3Co7TKW7&nYuRXPo{sO&KO>f&c5WVYHOaY^k
z3xC|>xV1OypjmWV!_K9M0)wU~iCc-%l9W?p)BnChN^)dbj@wIhuqARn-n@B3UVq5r
z+;PV59C!!!F;@`sgaQ8NL~6)F&@qGcJ`FRm$2IzmL~Mk{#@?fSxFuW81S~Vn1m#S^
zb!b;+s`MGrEPY?u-)7Q=3yUNHn&o@RqgVqG0VJF<p)j!sGno?2GckZXVFcH9oIP2;
zPj@$q&+CN=Wl`#wXm}zD0<N^=+d{Jdp16*22P;rnAt}Q|fkixa96?g1u!uuN{!NzV
znP5WuOPNuo)Wncs(ar_1?~E3jY%y2JMS#_*oKYTfN|Iy`0aH8@m@}*jTYg+Nd}^9z
zq|h;1{47-mhrhCz2*DKmJ%TljQ?4~!tMcWaES^Ov;YsZ^c4$JBf@Pd94iIiFYUe)(
z@X00L5zU~-TKibD-7mJ-2JDWYhJV;>XeN-@f@-gCEy_6N=^2KH@7s}J3Idze2H^E4
z*7HZ1$P#QGlmzZ86kZ2+)?nO;%rwK>W?2F~E@)B&Y%U{($q_8;Ux87Bh@L}|DAoeb
zL-2a2c{Gj~He%<wn0fQZ-RJr0tK084Ol$KuTy0*ES??1&%L#TOHDaEE>-#QDr&I9%
zyjv}9?!T<QZq|$Cd^N{c_yF!x%p`N+3f$UhxN|2bAscA1CY^or3=pr*G;+ZmF-1wv
zRLqiu$f$xh0N<3g`0}X}>aUhoKa%M}BL9ZiQ?zA^Pga1T^_ifr2Rsf|si%p5hWG<6
z&jUXnzZI=AG=X018a6#rDy$N|Q6OrrNb%@UwY-n)n!<ehwpz!|W5;-!CwM4%_&z8%
z`bG)v<R#sB3@@^*!I>k57E)qPP$cJ#c{$Rz-*Cm$J{KDzCE1r7>-q9-01qyW_%OsD
z#Ng7T{u?SLcTAcuq$1cx?&F{wt2VtAs7A7pt)-K`Gh?@$-+w$abh8d=!t*oyzLuZE
zyqK>xRngtpJE3DE-ux`~V@M^eGXOhsA>O(vc>0XIi-(c#qt^(d*aK;dAEvI0fG>^=
zdYVyqXrOtV9HD;|T05VO_wZ<r*PAQ<J4y500LKuW>1%l1H&r>po)I}}-HK&UX1H)y
zo!;|6>Vx3&t<^X)uD}ju`(ix=Gt9N=sz$P;tRChQo(>^OvWEXk`8q`hhr0A1&i|cO
zO>g5i5WVYH3=9{N7FwsL9_%>DVw+$WNV`U}J;i}QQ<OzSA_bC)V{G%^J41a~@w!1!
z9c-B#&c}OihCaWni#iC-J_PUqz8BI$E=vLUT{GiA=imwfcl#>WYL9FDk!{5cjmbXZ
zG2F0?6be?_3B{!_aGv{>E8Cu#aa~<>_BYyicX?Bmz;(Sha$7iHDuYsTp)3Ygxi%GZ
zQmX{&QZQV5l49r2-G2Ri{pZ~^x$;@Mf;reR3z@Xe$W7x!20Q5r+`$U0ZVVR~DDxSg
z1%YCfuvo-U(fYHlYOREF>y^=5Si1;<#=fz?zJBJSru^2odMo+xbMfwTe>KX<N{mh-
z{vM!JQFrEG8fAgO>dOi&H?npJ4I+h~nWzPRC<k?G+tWeMw1y=p#OvTH3eSmT5WLVZ
z$+ey=;PN7j7l$(+FECtmSgDOf_q4th?px#P#zpaLvR0Et7wd{Ou0T59OaEEGONM2Q
zDiqInCc~xnckm;i&>jhTFa}DHRY26LEwrh2SfEtJ7#pVvFo+mo)*gsYy7@<u_NIK7
z`CW3e)8>%^WYP%kwAlmJ<;~D5aq3<h^-aMWV~7PxqhsPIBr}HX+lVj~>S+jx@6u>h
z(eWo{B-@n2o(gMGu&=DK!1u)_0{dr5a?_3TvHN$FlNDSe18-$b!l7rysH?OOPC++P
zF+{3M)%P630l~6NlB8LQZnh1j+`B*X-*vOWR>ujTIN3p(VhTu2!(G%7-Eo}s#Cx)q
z9-5?0t_8DS@>1=qTEcI?4px+WYt@RORTw=ohsamBTrRy`Jlgb-iD$tZN5tGv%b7!4
zT_5fEz8N2F!~W#q<3*0&QO-&$P9O1GLrQSj%3<D?lUBlPMRZSF56OSI|J0)%#iJN6
zuL=**L$=w5KGGW5Oz%FezW#)OAF)etqN;IjMs{ygoCYcVPO%N5IDwGd9MwX{QXCjW
ztn-<8Pf5?~k+~6D9NxmDwrE_YcPj0*5rvH^rFsmLHkT8a-9He}w0X4GjfIx{F%H8k
zY8{iC&&L8Jmx<R~;w6?GwAc%*OQLf$8dg89q$-4wSOb4KC3)-cRvRflH@dnjL|Nih
zQQ;McrHY{ic)RxQ9;oCqUVT%k>c$O=mwBn#QE$ZaE|H^#aD~x3ukhEmT4eoQkVhfS
zj>#{ms|i#BXMYBqDWx53a2&C+q^q~UtDv!zFj`J#$XuHKasB<vx8KtgYY}BWpZj|t
z{{J`*0Ad}+MHHHv03pJ+4gNtnjnn<Z+cSXvG5G7QqvMw7h>x4%0Mqd$9)*7^p9hXa
zYQ$ku9{O|^#&1foEoi8t)!+csOYkq9SZ#09Iu!oiUvY+dX^Ogy&l??sY3NQDA;d01
zx(pRJb((029of!GMfczDId+=m#c4Yt!I*t~UZ3+En>TOsI3Em7Uk%_D{2M14q9o;j
zKXaxG$Ouf#;dY%xQmk<;yk|>(g2E&pgk$)?<_Q<@SsE_Fge!Ox*_BJ}&YXlYyC~&9
zNM+SUMVdk=^R-Hru>mF)kR~A)8V!p`s*IULiV5T?XSnu|@RdFH@#gCK)9p2>vR;~)
z8CWq5i$oih%nQR8uu4pfI~akMg$g+uT3C-y2Lr(}t}%!zqPr`Z<x+5A?mjCSa;@(^
zCpp*WgF&HpNnQU6c}`y5-G~R4CX07!S!5_tZJbk9ZP=HrFfoSyMP@7!@QD{jNda$?
zELS|dT;gh4Pt#>03|E4s)@e4!*jQ*FOqtg3uKd-y38*6FWLAS+xS^8~1~~XV0Q~Y|
zj+q6f6kEeEw`ZpC{RcW{w^j1M42NMN^1{3?q6iB(h0*BTv)x*or!u_9d{4osg10u&
zRdcPBRHY%C3HmTP1QyFcaaW!VRZc8781p7dB{Q43l<DT~1_NP6s*ND9I1fq{r}faH
zLWGoVn9V{dP+1Y0AWMFsXYSD0O1pH>mqZZUC3?1XASlIPvnfv?2(@7%<cR*tk8w=}
zeM5rS@r64uZKR04N8qXETU##1t)*S6sv7te9&$2p*2Y~G1NV2kBEJ!EF;|IM$nbGz
zj>A-H9<(!x9m`o5Lr}WoV1{jJ0oRVUn|~|S7PE?-JtuJ9*nS*z|J5+>Q0@=-3pa%l
z+5(sSVW8LA@C-tRSc}o~IY&;jZK#SIS>>de7KLmV64_Ll!9%xJ#}%r0kEd^*4hQ2i
zAW*l`_S7U)Zs&WgZ(32+g{dXV#<G!}0+yV!Y^HgNeqnF9_##G-S;ZI&(dSRM{j(7*
z@?<Sen6HtJaRuoJF$6kUS{^Dtr`Xzuqv^CB!poPXIa((K=28bw`x6+|&D1;?jr+><
zRalPEWpsLP5ej#p15kq8QJKe*w%TxWk=1+U58+)^!py8G+xH|mf!E`9FK(S{_Cu|y
zJ8j`rUpvsY(uUC!Yujq|rT!bT0gV^SZbqWnMIyHOubAA#O0G2YO+fenPe8E0M#!^p
zvaDJ%DXbHoE--^2P(~MdE)|s#l@xqmiC5$pHPl->(|m<aG-jt!tnaUXbP`#Evac$`
zir8z(t@RvPdd9SH2(<FY7dBggm+>mIO~0&fjfv8lUe&-jz6cAYunMT(XTXae4|19o
zn>nqG8((Itc=u1ft~fFRQ~Si}v)BWHH^V;o1sbm-!bHL7#b5e`LmfhiIiT6A?K<Z`
zn-jphBS?|1!FizVrPL*>x~kx!;!l7*8BJh`d0g;$v7C{vX6tr$%cxpuuF~yYt?Ju5
z*89&Nbg}RWA72Rm3nAo@+6T~Qg4#<})=gd;;dXUJ3$3>P(Hw&*HzSR+_<>`YQz`EW
zSz2ZsPvJBRV<wge0lb8lBc;*LZhlR1eqA=^X)wg`HC*8zB5~@I1IffQLRNNgSUUA_
z#B=*>NPLJdFXD4YjZXK(Q+r=EeE`t~Juy5^Oe%98Re$1rEp?v4wk021$mt|+dy(%N
zTE+BS4Cubs=f`lt45Kt+r4|(>A^@VZv#Y<qe)?y2d-LCQPwUn>lJx8fn7%n0xqlW5
z^w*i}^|-Z-X<JeHb!QQ`u{<LbKgZC?^Fi;S!;9`uNq5EeFOJ|tCQak%cF6SZi?^R9
zt&@Fx=u_oo$3qj~Wl^L<A)jt=1Z$jd)i9%xXRCz|0G{P$z2g$qYGu0XAMMW~ylo|`
zy!XHv?7ZUcP0RLK*t+30g$m)j1^OQ7N5fSQpYOnDEzuqF?_Q^C|D$6U{I6@APK%V=
z=Td+NFcE8dHn_PD!%Q#R4;#<hki@obJP!T`jZ|H06G0Sx-(PVb1k+MlL=my6ro;q`
z(w0UkXr<hpy_+36J2T8j+eQ5E-kELML}TJSB;?NhIOp6m8NRoTEsBHP0(Rj`BR$ko
z5%9M~7r@jI8iHBZ)<$<66E`@geNImK1F-{BEG20;H-WT}<X~9m$jJ9K`@*#E9`dKg
z<#u&c3WTwplk+A3>I#$;q&*MTwQ(&5Y4jdgMaZ#RNq4#K^T~K}I-8_c8D(fNz#V$1
zqz_J(F;E3}GBkX{47`a>5D%&{;)9~l*pg=wkBqLyrnN?s4p-;S2=e~wTw3ynNs^2?
z|2)xwT%GD#)GPo`Brlw_!8o7s+mr_N1Hs6sSvt!tuZ<<W5Nw1oG@Nr`T9g`2DF$aW
z3}tH_iP4;+YFV(6OoKJ53|~H?SOr!5EP#)VC9BAEwGS}<`1SPD_3Y%^1diav>z8j{
zF{PB1X{ECZ7Zjq?2|u87*d@rzyf(1O4Gxya)=`VJHJDTQ@YH0m^R{pPf8*0y^OD#I
z72WeX%PwJ%4jd^=`{hj&wtNpFnS(F+vzI>s4a5s|=(^m?FR(6#j$EFax=20${$m@J
zX=<{O1Xk<@444pQS2pYiE_$-XUl{mlF@w?=1<y)l#0^7%%Z8W>D{eB6$GAYHJn$;C
z32QqDWjLSDQind)t0MCo?w;QgYlxy@4JT*QExN$*(pI>vT5$YhD|NL|!Blyyt4k*X
z4OR*7t-wEm8kMK*Zt2;8h|ck=WxQ+(mYfx0XRa=QHCxetJw$YL#-(Y;3DCyLy`WqH
zSf>9U(@SGwurX{N)8H*7v&^Dpe};dL8z(*d7Avivk)<5$92UQd->p||PuoZk{+?ek
zCq+$+QbMJ>`w&V?n+s}mEsY4(Ne5B1S&!ot_O7+NCgfWF`^~N$;ur_i7fT4SJ3G%a
z@5Af2S)8?6{eu=9z-259L?S_;-x<>uR0K9gn6A@E$u*tv8@9wl5_a-k9>5t}2$V2U
z79|&`;dSIsPEGOVkgN1fDSxK4R~O|;0$gQlEtatbCPPRBM`;LHMoOp53MG4xCCKRP
zR^ZCN`#2ts&Zi@%%CodFv#??YLSd{Hi`-%eD`8{0Aq$MkHAeypJ>!0>C0UAwjCio<
zdZ^M&NtE__q7_GDt|uZxbKGj>=1HmI_px)Gx9y7*cm64elz68k?5zOOV<4wn$ow_Y
zjmhE!&Bl$VEVnVa=0c@RNI1vbYI^vZ6lvtAOFB)eZafvzqLwW2M)8ChQ-Q}jibQDO
z-GY3=xb>&4uPvZ2)8dv{gtoQoPvn;4-P5e`G-kJWfh?TnS*Ellll^tRpqNo8CHH2|
z=Uhob%(?BpT_}}2fb^jFGu!-`iaUx^TgWW8o68zV;4uo)?rXb%zI;<^gp-;D6_IQ!
zlI;<xVL8!e8@-)OQz!?6s(l6Zpiq3j&mSg1%(}q<nAU7vGswnTtw2&@U%zMJC!_=j
zhb&1(cN{aPpxYTTDU}6-TCha?htN5k&xar1O{equbJ#0(gE@i!FlsJ;2sgyiMSB9s
z6J@ZwtHl?P`wrkMrFKlXHdOq+JnT0@Ez$mkhHH^orOiGsiwL^EHAg+Dh<SpNni7#m
zmQq4QDnoKcKg8R<yXf?w!#hDGFWjfm=32tl&Y}CRI<D5;Bi)(x9$i<kzT<MXP2~I5
zj)}X~QMc>~madCBmflW!zL#;c=;|j#pS5OF$S+<%*=z>`VJ3E61`xw;@ExX-x@NZD
zbJ0w?5%q}_*j_oWK)(-$5<a)j3!&BzLbG2|L}wJMz2&np>=!^$I*0FM_z%fqw`lo`
zMDZITmzxpbdxNVzmKfZ_sLYLA`p26_;%`=dD){S_N2yk8+u=I_2XIvhV_R>ZWyR#*
zT)7rVy<T4(&8n&>5((Olo8q?!3=*YoT;3X$Qa>eofYW?m(uAW~UevL9cuX4S6hx)x
z#SWmmS00?gTpWztWoK3~%#{SOfN$T(#=w<>cMzPMoRsS41`~8+N%u&EerU!X^|lU%
zx7!N39Df>p{&G2=T#Sa}>G<<GMe)_>PZ+>aLp2#{u2>^np;o$s7&0(xV=)Cz(}X-@
zV1cw1`b9<O85L`fda9;`1Gb=42SJm+aHG|0U`twj>S`6Oe0n7eS;HiF5}-KGwRYNy
z$3&4-`oQfx-);P6>dCoD_nv5tx2ztwkV=*n``T{4RO(>sCSN5!#j5?`SvNjNkY|wb
z7+jdib!`V+=S2>ojf`9{`7nV$4uAIxu`dx?QH-H<vuZaV+!CLvP(*?*3AL`ym)i}J
z_l;3plsoqdi^L{vk)XwVK`Xz<BFWu>>FlNKU1zSQJQD(Dn#WylKySy5J&JRV!Hh&Z
zo!S@;RZ|Q?W*JGJMh<7Ak}Qh`gW-oS=YP+q<9|oBWUTR;!Qn}vs1`t2#qR%yt}wpD
zorJ4$S6tn)4^g>QZ|lJD5?;-MpuQ3Kyer>TcsS)viMDAmTgl+bRP*Dp;OF`Ps;F>G
zqw=U&whDpAek!pmG1^C=fz0Ea|C!-XTg}`!awDO68a1zTKTm@8{LgObdlKA_uApIH
z+_&yq{{zKXdvDrE5dWV~vDMK6DFs@o)d`wj(v+ytrAZW0wNi+z#a{3#X4l$Xhj4Aa
z`^~IvFvfOXC!M7z;GLc4Z(e--EA+!!t-DhrJLJOWnoN1X2>cJJGDJ>^@fjH{=Tj+`
z@Xo!aGu8oOq;I+{a!4nf334V46E0_pe4N@hdpf?;apn9|LVqZgWjBq2fVeVTDn9cK
zp~52pcbU*2SWKmwQ^TcblQ3Wu-raDvu=kFS4u&VAA+oYs8lM`npqhAG8^tG)VIEm<
z<HHG9pk<_727)}Rako|zbj~ywv9f4<Am^bJOqlVRk}lJFe8xkj2en$HtEh&zE(=l1
z@p&W+pR?7A!96#V{{wWo^~w(}Jh{+TF5z=9dJgo~1q4`WVi@pHR4uL5nt;JR_zXU#
zf!NcG5#N|l_q*LmG}9f3YDX~BegF2)Uay+u!}|~KdnqFt86To_F6WdBa>62`K#h-}
zmSXPS4BiIWi0*M=m=ZLw{&fSY^`<@S7I5KdvOj?cQP<eFwO=&?PpJ3}HH_3_vv$el
z)nNPJYiw%KaUk96iets7_jzgJLwkfz;{Sesbn)f%`vuwkM0)MQ)8YAf<}}aUr#I{z
zB#fdEqGKSQ_BfgVlmX$wwE=V-R|+saa!qs2ZvmfmF2cyP$wbOvi%ZKg`L$A~jzE6%
zDMtnNl!(WNPf4@*UMs^HpKg~N@>>EKN6x;U5kLj`!vdyH(05$S$W+NWNjw!o>=1b~
zjaS$WBs*A`gd4?Tj>^b@d00S<lw`tZoxI2&Qe9IeBgp!xEeKd_l$-$W<7<feEzooD
zBItw_DYVGShz<j4ux#W-<t5*nCYh%mOUWXq0zs=+@V#AmApzCu6@1^kkl<{MfO+_Z
zD^Nr)wKHSJLC-iISIt(A60*+>m6Ax@h{Uy!3xR>uQZzP6HLzhw>BNOZHCKQI=qy9l
zCiS_VwQMAsuhyIaL7Q@rY(VaEs$g83bq?pf!GOGeUFUh|B~*;MK2XNKhPq}yp?~UF
zs*5gJOKtTBk3cdCGi^3r>hV}l9YB%myzIUE*?FlO?bLPffwvQenKa2hm@+TwKCqn1
zkcp-h&}nqAzyPDhqR}eTCB2R}9CizhNN--RyonDK2*X9h$h$!)-CgO4V%mTobKz{2
zvogMt3nHMU<~vujv7bvj&@Bo)BBUV`NNsQp6fj88h2n<UbPr=3Cu!d&jZOwE#Yz<0
zVnZ-Rk2ULln~aZ75B_$BKgsXp<H_erN8abea-m#9HlzhJ(@`!h7OyI$Ci<4$P0jdz
zQW1}-8%WJ66nKn5rCe;ws6u};5C0VQzkib#sg8d9wSZJr<NSYg6h4utj&b?Tr{OA*
zlo?+(!*I`?EH!@LzOXHJ0=4vdlW>#h-a>J=MhDFPFoO2`+36*oTN3)avS~*LjD^is
zpHQXfGB?evOV9W-^}aC}HN68G1epqSKm}GC%@n5r|A#?Aah!wW{n5yA?vuTs*DM0z
zPnL=>d4gPzB`zwN-eTNta<Q{NK0D+W4ADNwHJ)^nknMB}MM3xf!nCV+2$9rfUXGjD
zg9gC5fK3dPXLP>G=*G$SW9)fuBi}6*Gm#Pn1JPvz;o7ie;A(sP$w+y`;Z-3raeibC
z#cWTCG>)itWGI*hah~8N8CaX;V_&O^x$T0<wv{k+slc}9MRvDTDhhG!Oy=II4QnlB
z1TB<-KVgbvu1W9W<_b#}wpCcM<|vd4X4m5o7b`pfZxN5(z_yHiIMabw><gn*5uwWl
z+K5L<;1`dhxcX0UeTZeR4AF^6*$Vl5p}67f3-1SxGR=4yn_z2zsHe-BO<YV28faFc
zTcT7X?B#4dtuL^C$H#VH+Bih<cy5PimaMOvJ6x(xK5OmaqNv^O#fju-7BDQ?IQuT(
z4?1+Oz1}%4j=l|HQE|@BhX+Taqtg>`+}q)YTpPS249w1KlbLo_Bs_|1|6`@pwm+>G
zgDt^!Nx%)oE(z;{t;*(6Lvclj9fErkwsPod$#@=LYm+x`+i8$izZYCu30L|0mzfrk
z`(>|qI4t2tUhk4Is1xASg!c=k4vUJEem6Fvs;ArFSd<p-SJ0J&O96Nr7WWDSr?XYY
zp#?;xL!4E(a)_%K-cn!ZuWSr$8>3Vr?xD=G5ZkIL=<(+llU$$0LWU)zvW{*2g7aJ@
zU}!tV4*n3~@y7k?Rl%tGd_|IhC#OI<RBntz78?&ucfT;zGcfl{AimmPilF^eSU&>N
zYXlaUxLW|^%+Hy3wY%EC?R{%^+qSak_xuV(%Z;c;w(LB5TBmu{cDlWq#=f@G-X1&E
zq9w@Uu|(>SlpVF{f4?(>2LTcwX*=0__pYtA63HZ<GlO|yF!=uEV!F6@Z}9a!_BA`1
zMj4w#GtS_95vDmyCM=(FcD$NTl6VErMwj6Q-+;ncJ{a}boA5m1F*{6h9*-iPvhOGK
z<W(l>Y>blm3t9e6l2UV%<!r`A$zqj87t@@D@tDn`5sx$IIG!ZwJj|mc?z6>=hw$tw
z;@4E~?f%Z*yW>4<ibk1F!<=1*85>7go<`@(oR8UcluzLe%pgma>4-x|V;b?`-n}@S
z^9&}TXLPoc%oj<_<NWL}O-4M+p542*%xd1B?R^~a1&;4*KfVfQ(fD<Gv7AE*{o+~c
z7TzWo(dZWS<dZicKw*6Q`p3~l9NwvglW5Mz2g}>c{b(8IP`h=_!)U?f|NC*y(+Qxl
zU7h!F^pSqGEB<Q~kCW?6)_|o!v@6Tt$_SCXVs@Q|iv<vTm?lf0-~|*I0%0!W5l$y#
zdBT8vquC0pXE`n>XqhiK{1@l!@E?a%2O8y>T2ZgUWj=*f(sotp3P;I2gfYG2%REhD
z_I)&8q<r-10-nyyCHM+n%s7&3#?JNujA5RnuP-iAei7#Udt65GMW2c97qn_dvk>O3
z=U-R<-k<jvd=|@dSkJKV;w)!-M@Q^A>+&@1KC8Yxcz=R#lVuKXtFMnwUZ1=_9v<zz
z-u(^Br92$3T<yq$@O5;uw~Ivy;(T0F_+;<s=lyrDWqFv(Jc>h6#Z_l_{~eUubhfuE
z=CS2|DM0W@Hai$FTsAOe04g6v8BhyQ2Fo~97$Yf^n>gA3c@H`m9v<!O>>uwR&^R_8
zxrVt9lN!D|csKmv?ZM7Z`|p0FQDL7ytk{@O!sRUQvxpD}7-q>85El$(vCJiHpU;xf
zCB7Pkvss_viXm<~nS~cf)AR5W*mTa~Bwkl#J>&RkZ|`sj13x6-JbK2;<4_%kDX?i^
z_9^o3DG4AoLdOU$IbWbWm?PBYe4eB$&j5~p+NS|P?@yjF3H<lv_Oi=pp>SC0y{=t>
z)o+{I#e(H_MZ;-y1q8>|5Y*=&Tc6pFr(w1u-#|~3aF+2>30T>45TCOsuDrP(m!9zW
z3R*e+P<kB2fP&I9T06*{OV5E5<OhValj_S{5Oulv@r<81-|&x7j<UJ*cp_(foQL@`
zbB$PX&HX}EC>0Q7wHsyOIY>7T=(2oV9TPkRM&<6W3L`PTjL#<9+a{-~KzNiA%M51%
zcn6b7#&d(2I7;rNX_7V+&-0aMa*KRbhRH%mC4gr)TP{F4WZ95oCs~(0f5Gx}$@{E(
zzFGjcA7)cNo9X8to|WhomgF0t=YJsS@ys3r$V>L>DomLzs!@`-psK`diOzDK<w89v
zy+g3WVqD9jixI4;v0|zyrSbDM+XK2Hr4K}K8phd-NQC7`3>&hLDhq2iT?cjq>u1aa
zG}wFz%N&^wFB$?yg9_+3Pu91#9y4h5LN_%qd4w7rR^6eR0B=zcKAQ;8?!iypzJ9bt
zkACDaFou~Jf${bcz5O}La5$ig6I$5$GMWJs$)I4-&ZBRrEa;@kCCo)K24LcGoa8VS
zJ_7C7?D)}tQH32@5KB!^k+I5rs~SZ`R{$iG>aN*4aKDU@l^J!vqq;yN7t4j&=;KY<
zC{RYaT;$d}0gwN)jD%S*Ud|UVm(&{hV*!@^*$kA98Q=!Al_e=%R;kBS>Ldl?8=QmU
zaJfh#(7S*p?BP72a!S7m&l6G`%o0zj#1F9A2|?Se6OO1bFnNHOB%cLTL_z~R38BQ2
z^Z((aykoT`(DY`O2>C0<#FY{ZO=A}^uuGJRV9Lxn5>&Dv!I8vvV*-UgML-mR)?YwH
z1EoBIU$a%uDlV{T(fpQGK%nfHUl0$X*<3}5SU_gMC!5ul9$5th9)E=yaD>tVR=Kdu
z;)KEU7%Flwf2)o_t6250#-a>bJzueK7N&Enpv0`4Fpe@v`Ts6~Wnf<#5a#58Lbskg
zVe3Taa>z!D0>eAVP?S<$v@=G1I00RM%mPrgK@R}bE&2Fs3%XCfk?TpkWzj^{vPub*
z9m5;BD3J<s4yH&7_@1q-!rz(`ol$#op;^TQ+I|3`c~RIRM9ew1EV@Vt=4_HCbB2N=
z=tObHn!(e}cI{j%tcqqpik8|D$bX++pq(=g^N@vCV22<B2IPZXKDy-AvVSU2zjOGW
zp%%er(L55Xf{$(ZJr%e|=>w4XqqgW1H$7nwh()wNVM13?nlGUMK8EFI{+U9%iwKlb
zYt=n{su;#3nh{9Mq9vMp`i+m~o(f7hOlATw{7NuYtM<3v+6w1mmaQ_>A7#}KRe|_w
z5vJiB*hw0$nEoi;k)2Gr78gh*%a~YiM0&a4^%;OUL+47Efx3gu0Rh1CG~!vQ7hySm
ziqXYGy<Cr}0QPd7q-0r)0Z^lyIAqGGBr;M`pRGd5{WMypX~|@E%}sYIbY0ae{EmR7
z;yf7WB@se9bM>5sbGtOmwq5u0=p!E+pe3DJb}xP-;Br`ib6ADKF9l3xgscrmat2Zg
z3^CGI`+8^-{E>(TN*#jG_%uNoBIc}gZ|YF}E=)>uvSXnYm-L`l`7}+gGiE!a*soI_
z3&#cspcw5#Bt{gtKyZp2Z4F5IKiF_c1`|r=K#-oIIOSdt#POVl)|ccdtrYP{fK@_M
zJ$y;?E~fmPeY4r45&Wr_2k_qD{+Sxe5cHNT&w{R=Nw?QCO5=y-&tiUE0zuG4kSgUs
zxI$7si;#j0(Dc#38%-62EOxg7bQA4JxRJ!#==PrJ0sK{HQfp{IuD>wsI+&mW+_OqC
zf}gPUOvZtz6JD%7!h(nxijJnJxQ>D4h432|SkUVm=#^$UsWn&ySK#%OgKdtZza|nU
zpGv8#ALHfVEy%o&eJY6RDbO5A`}K7mBOKPzJC(yfP#FG@20v(v2@59^U<G!QuQJZr
zHk;=8BHJDe&X*V2#$vkIh<QGEy7lemX6wS6Pai$8h=NwZ^XJb^06uuYf-}irgYJLt
zz1tn0`~&T{;qmJ?d)*%U^oe!P&bn0ZY<K@?Z|CIT=(pkV-r?(`*YLAKOcr)7cn&`T
z3*D6=-NzvT>3doN^KUP{3aCUK*+98{Tr7cDGrbDIKmlot2WkOT3stPU+SymCFUnTw
zUlob81Dp^nJQfyiMO+&(n28}imGr(&^bgc{&Pgl*M+>D5B%QBidv3?5D5wnhrIP!|
z;;Ax-6<U-B$1E6}NAVz=A|0cj7;0Vu3m(nK8=#&U3u&XL`k-ABSjWgOml^UgzHzZZ
zDlTzaWVsQpaWv?JiU;eR?Z?79GzYV=ugoPHVur#+tU1+(HA$xIGblsjmf*?CvxhE{
zbPN@8lp1Jzu<<Gm=fIZ1fLoFs3$IM*0)x0lqZ&ls#cTzv4PSETPt0sF1M6v;%%D--
zn*hKy8XXx(Eyh8PEl881K1!?*ts>%tF@Of-(GpjFyt)oo+ojPn?Gpg<k#w=Wjr!^_
zLSv_3i9vV18Y-2gv-aoq&%X_Sd42R(M>AEkwe=T3JAn`$r(IE$TpK{I{1+Va2VKpn
z%oMB9r7|fRMZbySoSMw=kAvg?s7U`&k?_lQ5@}7zN#a^X`eHiMwj4-FcQO_sszaho
zaQdN7UH7TCzU-jSTv9}@JD(P#i>5qZrg6!``j@q>Vd#_DjPpeR<ECkshFvIdXJ8cl
z%=2k7M(4Sq$?XVVSjK_CXJ|WiH-^KVx37<nhr?b&-`C+KUqa`%?sXa8s^2k}Dzr<*
zl>%3~c2Bz_601WP4(Z;>jCVh<moJ4Z_NW%78x}A&OEPZhDvU#2k5-Z=i(s>&*m&mx
zjRRqqCn6hzHP3U&^>@QO40=B0;b<8PrXz=5mV(5b)wT(6Q661!Q6XO~$c-xY2Uvhh
z0oFZF(;muLEqoJTa_1{lP=vPxs>&+BFaXB0b)<R_>ABJafNM-q7EU-HW522?UEkdK
zRSRsqq!nH02#$%!Z7CEqawn-!owbn>PI8`_AYl~85l0}0^sG?n$0DGQifx5}CXIg^
zdkye#PE=e0t7NMPS?pADRSoFZ#QXK1(vbk>L(H$l;8F@JLEsiLy7nVsZW&V&9)L9g
zj`AQSM?t452{!at%bgnZ<a>B}ITk?=L34Mq{=&GMqb@oNfv648-mDqY9%&;RK@_W9
zMxz~HaE09tb~Q#Id8${UJM8Mpr74I<tP><hp_w*Fz2XBp=Lmyz!UFdgJd`F^(HL8g
z#|n>A5b)<5?M%5bS4PGpDmr%i6i|^<1ZdEnQyiXt07(IK;AS^u$p*R!A=Y{h(Ikpr
zhf#hPjua8vBV7K`D4faV0gFv|{zW8H7#AA>Se!r~D+9iyRv~3eBRizM_&<1>6kAr6
z)oaejvkKf%MWy}$dt+P%#dbrsq|Fcv>RR0#rMTO6bW^lC6&I9<o5GToA_bZ)W7zNa
zanD}JShvw_g49PE$4F-uanO<wRWrHx(4kI_WUUJWeNe!Olad637J(XIf&xj+P!7ou
z74o+uqb;n;f@L5Bh&01cqY%LfX2BFGT5fut>-_+ifXa<sn8c<O;FriPLtH#6Fi$L`
z&nB|VvRXCh5!rI4CcM$@Fb>mk0eHtku95V26Y+l!q3RQFca)Adl!_G*ba&C?W=TRe
z+<+nZRr4r25|asPI8PZcf!>U+0;R!k?9-x+B09E*X+~*>^}zFaG)faJ6JYp9wG9Iz
z@(DS8Rj^XQb*okFn5M${X@@{j1+aZaX|%{OC_{Gy>gsOsJTOJJ0e6=x718yu!I{Zk
z3giyQ(PT1QUh<XEqOyIvV3Hx>jpmDPk8QJ}gc~(?>zF1?j(Kze_ZkLKDqVukS(FW_
zn_#VEn^(3Ss!naY2F8Jco)L6eS1yR*JX{2))DjGjyn<ZCMt8}5V76|IOpT5Jbl>M>
zFAWDjg8^|?Tqf9XNd7W(-~hiD;s%5uh8dvSSZo8^{Jqj*X_8%PzPnM4vn%kde>p8>
zCzw-Ce$_+6xoROqYoiWo(tz^rMzk8jBE@Z7E}h%b@$?oQPxS+#Nz(S3d$Zud1EyKu
zu?*4Lqb;Cul?4L+ko6Q=D`HZz>_jLZlVq6!9w~lA#4|1N$N)wmB<ZD!z1G`IDk{u|
zfWb&kAAg__IBXCIw|m|FP@+T_)G_CJLunaDA2)z!jxIqrr~NYwryfwW33^=y|F!jK
z^XZ^alGc^`3%gi1Jd++0`xEeK5g4#|_Wgs$?D6*x*4g71gE7Av5TASi;D?8s&$`e2
zEp9-Qi)j3O?fx^yN7IC@!C&mfgU8QE_o6?a5wM@Hy;MaA_Ed&YL4S9vaQPKLE+IaV
zM>)=y7kyGl*x|{s7NOxR%2$X?ffl7W7A@87+I{oglP8bt2`=)?==(YJ4vJPV9KP9q
zyEhyH8dING1oAx$qtuKe#SaXhhodQ@Ej9E!uU*oPKt*aGsgwImNU19%aPc>-zbIDx
z^b$80!t`Q<R0ZEx`2G6m#~u0o3$j3xrY=sV$9an6xpukHeGWu%<>fUtKe!KU9d~n!
zeaD+<8`%PM)O;d#y0!L%ZsyKcS%-}iE_~Xwi@wqAGqamIWu$N<ztRr!GJ7$WX5a0S
zq<uBB(|!Rh{aCs{%ku6%3Ou!&5ZKM%NFjSqbc}3AXt!u{LqTOGbe+4qg~H_s6qY9y
zN&}8E(BFa*!}9Gf+mX`9)5cvSp8(L=V-rvXvcL~gY}hMdWVJkBmHQSpV;$O;3y{QI
z3`(pWhXOg}qf50D?f0wjtYSWwEvO&BoC{M7KqMbZ$q7m>XE2pHE_nDN2bTz9_>U=e
zV^d5wgWOwKNxkx`7EU~VV*{(k<MU59v<j|9#AUjF%=b5NF}ilYj8*V!h@L(raJ4JP
z2z31t?iAHl-44j#&z&OT*v*yf@spYx2&5e)E-$RdgZj5{+?SU;iue`J?HDi55+*O6
zcm3A+-7!u(O1Yfres(N+LtXCuyPcE$gLkwi+DfKae4y${aH(?lo$?SV@CX+F@p6IT
zDpeL@jHI&ZsXqP)!ox6=Q4)sqz`r{>%7uX5QJ!54B0`6*(4K{7Mnz#5&MvZWi#8A`
z9gA%Ve&U$KZTvR|4;&|+fH#L!*F_{>Z3-u2FIknP7yb<!abUq7pi)`xOVL_5rh<X$
zyw7TV3>fKmUzN42Ucu-B<DGt~UNy?07C>5x5QnYJ&CN#Lta=LWw3|uJ0cv1jh`S1+
z=zzjd&e$(8PhB<clT?^g+ntj27xuwFpTHCQ8o4dX#C`>uQU8&7vfZ0)K6_=)9pyx`
z2vpws+=#!zm|`--TgaRDNDmI71JdR^NoIEvH>Fz5(&m<Oq)vwXTgVRra>r-S-b8E^
zwS-!2MFitV@=bDy{F{pt$p)UgYvKG}$74F{c3Vkf^;bBjl!cf<&&b8lMTPsjF8u__
z^08#+P}Wt%LWf3Hp!^adiGgYWASYhn({1@1EYiLj0!%?PR@H?JH?j0+xIGqyymG2s
z1}&6pDj8xpJZM;svDBzTBu;4#uI{DOLJF<ZsRTbzxb(MEqJPm)EAej>wY(!z8sY&J
zuxbL$q$$i~67jT0$3Mcw0=TK`__JZ{2wUmIbf1i|vZiNxpP--PI?9xb!_BTQcn$-?
zNX?g3L%`Mr%vJfaPGb?yt!)~HH`sz>ByY$L503Z$uY1SGV=<z+w<arSE75Ev$c#M!
z<*8nb;vBQ9(AkANtN21%#N2o{wM&jHl)9dM@rvMAO;mP8$jt#L!h`f;f4mf~A-qPH
zkrBDv+zqH!lQ5bs(|V#1fD8;sdn1qq6^s+1V+OLgbf0@-w0txnvp{5^ZRG$2OnD-i
zYAjFus|Q*O!z114Y(?iEJXF&HvtD?WFniOe2VBswV#hNhj2)wW@>=N2zy}rN`NbS+
z0^A0etFc8<rsi6l5y`R$*^^uEu+4ipydteg`=fkP6OuU*&bbZ;k)w3OwISr9l59lC
ziyINC*dhJ9(Wsl!Or`S+5*mT*^Uzr%My2Gw5lW8?TNMpR4OV4SW}5o?az{}MS7&Mw
z4d5s{um%{oEg)OY+H-0gv~i?I?Z?}(eSuIHE0KI2w&ehTFDA>^M2%o<<FYiu-nZph
z8lTB1y+&_zOuWxIS!@oI)|^t39&v_g2>sz9j2utT2ioq#ltX>CzSU=&6>66V>vo;A
zsn7}EZLp_37doNPY~?sEI7;TA07V(v*dlMDaX>(slj1yIIJ*v4nO2JN7}_+^r=(<u
zeR0N7WcVmXgG*SBD2wovCqAUm4>UslPBgS%&gJwO$w{U?YEMIogSzueRs9<NL{yWU
z&t`TPHH0q4c{}<Qb(=^SC9zB{s1$f7AL<umE8mmp3S@D~fmj3W+yGuR0OPgFuMGVk
z^R{K6{+~x6Xd@2#GIXX}pu}%qQ*yVK%KX0v!AdX&#uT43JpFejvQELfTT!l*S{4CQ
z4!;BCEx9i}3zb}e59B~h3e{-`OZBW=hOUY$#MD8xL!JB2TWK#%ot5yEl~GC8k{+wF
zDyqF=pFV+7qlfe00lPop$)vQZdPXrEfTI|CrYq8cG$z%!bAL)4?EGA;qtd<+o&v3$
zZu(s|G*p8WeB}&UGfJ1eZ|dWWuXHqZQzqx^t2%xB5cmzR7`o$h4nezqO=|@v_izis
z6%0m%S&vC5<HKYnbzlQJp{Xx{PU}?RXTzy0FJc+7xPWerSW4^pf{<_v#NIC$8Ln)5
z!I+O~fbJl(ZYkum)N>n$c}u3Q$KS#Oxr1o74>t)p*TxogODu~Kc#Ovh*i`W-%z2ry
znO;*M4Srcyppji{-qzwXj3>)@cbHI4mE_-8o3PgOztWD<?C%TPQM{P&ZH*}dW(^jV
zYKsgji*{=4DvQKy>q@ovH#V}q48gUvv~DP5{j8<E)cWV!TwjWdS5ViIl@rkGSb3#D
zJ9yuPpBE=oM9m_jRD<``+F2`SBaoYF@__ZBy;h3!qm4{iCL8u_xU~vuxLJgbHq%vB
znv`QgX`M7y1*_f|Z07mqBF!FFz~o#;dlHH&^d|a)I#$h~-+WGYi%3U5w8gK&IH!@3
zpH-#Q#lXo`mh-t6g=V^@*KH<zYYgk2)n?=NV35zoi;X0`7`)v*9E9iDV4BZo1BIY$
z1OIf@<MGCIbP4Qm9EDUL{~90^hgP6yBUPR7kF<VYI(e_1R8L3Cn#VN@^7L@8VoTSc
zHsig}go~Wor@9}?Zqt1qU&fdyL1fSNvN=?avvM{A47M6uDGZvN@5j1qz2kk;%rj_#
zq1~2&%<E;PB-Wz1ARWq(95dvibTUpLx1ycowziR}Er%k%T|51tM!2_RSTKhlU<xXJ
z&;vwI{ML!?!z<fuPF5c!*@pGU%lSFidDc`=0iHDhh-ZB4K$97pPkD5`!F&6(5tPKU
z6>z-}_o{%d5cd@*)doM_F%+Ny=e0oz?Zp)0PVVU6BtpCe%B|hR%BfSdy4SbN)mR%5
zdy`E_5?6SdKrc+R0iv18c2NQQ2E*wnDk?Uj0l8_!ulU%vHQ7wndIFz;y{IDw$XotC
z97PQJU%^mhp7$@vPbl^K-B^hNPb*IH*^vYc07vj;7(hD|)vgY=dVog=g)3)PoD6GF
z5Og?$lMazrxekJwI|@R9^k_?^Fv6DSFK+-UInA4b%3vO3<m>Am@M^GhthVu#XAI}q
z80etFwQCiv>is(aOB<9oMtVWiO+z%OvzGC+!iqH&^LnzD^ZAjNa!rZiuCo%-NRdvZ
zWU@`yL#+A=ef`!jpp{M2YH-lpgfQ#piJYYNRB$;5Y*YHzYCSb{$)NH4Zz-x2bBkF1
zGIJ#eZx`@vJd-TC>#GFo2=wFqAAj0^`<4aY`JzTEo`ZGAIYgbd7DzbCyRJA<Uyh?>
z5md6mZf*9hP*{DQ&*@eW)qciYLDif=>>;yn1jA3eu&=>@T|`&FNdQQ=2-rMaDMMb}
zHY0*pVe}nJEud+&gNGcX4_?OQioDcC5^eJpNK{yIlmpvJag3+Atud8jQn#KK``>1{
z%F#IdxZ}EswEf4&P;D*4^m`lXt|U6m;FTbLeU;FaPD;e%l($VDh_{3#q>!it>>?2S
z99K>*{VQ~kNvVtfvs6B3yDOESG|DJjHswMO;}xx(KAUkQ+zh}#Qg$3=Ba#=&`%c)A
zsxp8VD(2Hd4A<aDQSr-d_MIDB-i#W}P&D>WYqBvofsd(x8>%@rY|H!+j}Y~BD0STd
z1-&U-&h2|!_uuO=h1sjj=XsH*R=CqE+&IF!zM6ba;dm^)#VXY`Wr}jklIE0Ux`ulv
zu+Pqp_x64o?!DVJUCr0x6pvk445VRiu~jfuTUg>I^c`Voy5GMnK!rcPB|xcg6F^0w
z)_X2BiVy`Es?ac;SoxyW8m;E71rqXslEieYp-wn9j<0-+z&TfU^)+i<X4WpB>Lmwf
zBz}|3z{thMUfw2~TeThITwNt!S_@s(k(57}haWdk^5DB(BS3WMLn};K+DVJ?*+&D)
zgCyb-+ph-AHII3}ILOd)+?5+uT?e5&u(bi|SPa@k(AOZC2X^~-9zqCmp;Q6IqK0^z
zvj@K0)0H)59Kwk4a%s>A>owW}|E22=8qOIN>aTo2;{sjMaZ`>HC9SbwQBW<}{7W(8
zJqj){Q$4}(Pr$9YPFmu(bZ$uYStLfV&qTC8Mzn9DvGCy{0*X^8RUkE-Ix&{@=O;yV
zzzEF6u{sckqdYnJjV>hm?1zU`!#eUq9EoqrybEhMUj^tzVR*Z79cJr~eG`_e*~@C3
z`Mx0=K5e`ZDMw$K51GPv$X68VC)_zv26H-Ajos{&lOB_Fie`+`L1G8eD&ygJfI3##
ze6C4c7mcI4A@$g9G80aAen-EP43OI9lv1v)t@bd}!yAyRm%<J;h2j4V!a-bSMkQ|<
zK7wOz<?K9c38aM|NLpv9TqD(}hx{sP?5YZFxBR8PcU|G1=*5v&--*k@O#ihw#k!Kd
zM<FCb@(ZgGW9WxYJ&9h1a^qMBsb6Hy!@I@8bTk!|30Usag{pd=OM0D)YqhX#t4TRL
zJ?59&je!Zp<Qr80H2^PSZbix!q#2h)H4wJ*>c}>9t!d18X;>qjQCe#E6;355gi5Df
z1J&9gXowp3pM5WbdCrdM8_T~Cc?M5ZIHjw}yWj{XT;wxsz>3ItxJGlo9aeOVQCt(j
zr&6MRQs7XhgvjIEXtK~1lVv|b$w<L6jrem8k~Y<4Fs9%f=bUcW<9ZXRdiuGPgvmn#
za=OLUaL8;wX=s>t%*ot=BBj%b@EPNX?ygUJ_EKAU?G^CNTi!m`8S9Fg8!u|~+v>=h
z^jmo&og~orc{Izmx0Qk`rZpV?ym#`CgIzj^psp~z(K<NfDXM35i709<F!21EBBl(p
zgEkQ&;V6?yFvt!o?VP!?#46;ilBKvQ+qfR3i0s$l-_(i>XzcZ=RyIwRGi@;eL0()a
z=eQ1hyjadcpl>919%p!Ero))`P}>(tz-6B-aS+;FwzR#9bor!R)r3<|zOQVRtQ$Rx
z`!1T2ae0=751xVajrrbhZ=d{jxHtT9@7><f>$iSup(eA1nN8n#S~FSO`}nV!@&4}H
zy%vXu8V(@b?&JUk3@C4{%avv(Z!_Wx+H*y!B3;Qc+@^dHpT$Dj1$1d5_3^b`+V_MG
zMWXZag|j7rC{nFgPZl|o7^(6)h*|Yf7{KQ%jB+bCr&DlHF1qUFlO5TT%6k|>i|0m6
z6H3%5Ug~2nGN*QNn;~8rUPS7Cj3_Jt+B;8xy()_wIr!Ic^sz~B9*9{fT})++zoXEs
zn(Uz5P*k~s;%7-rA|nUn918!C?8G<<L0S5t>7wXqR~_jaQsQ^KkU%0!j%bMTYhgUM
zZV)wheu~U=vU$2Xfv?2n3FvrqX5BUKN#Lt~Wt4RZcavhyHWZ#!YIs+zzT!YSCKX}Q
z1qX#{34aE?&IUU!JU?ohAcC<lU4KARFjW=3d(!E%PS-WPHv6;c8dq$eZh;_pHZxM?
zXt<toI@o~znJBZ}S5`uo(!mF($yUCjxa`Do`YB|kHM_7YQ8T#?>|zyRWxvKWf8?(*
zFO%rf^(9-ZxFiLje|p-Tz>-69R?f06T@msDujp{Sx~_eNn_aYU>KS=?((RCS_+^lF
z*dAG6{lJ>?X44k0J+X+ovI8zRzNpA<vzjo}d5BXMZBH5tz$;<f{!vD<!wE{PQP{2K
z&15m>WBXha4WNXmlp^gdUB$Y_%<T~|rBN)7prV~S;>m<*o86=3Q3Z^qy#_%UR1~sX
zp~#LJrNfr;ns6zNWx8!+1bwE|tx{SoOdl#<7+1ozym{I&06f`b_b$B7MI3=}u=d&K
z8C^p}t;`Kuy{*noTt8qQ-Ha_4V)3htA`}k}l+}D|W`-dj8C?UKjEH&Y%MYcBm@W7y
zn!t)bUrr{#dBkm6vzd;4Bt0_YY0-TE1R{^Q^@=0SGP(BHcS^MW4u%uei;CoPT*jc*
zOp@~v@<hFA>~zC*7Z9B7%#uu{q;xK*`rSX}tX4e-loMCyzQtg{pqzr*pZc|WIRTk=
zIs>oOcu7@oD}*xHi^>sE^^&w3d7oNxkDp*g{nVrsmcT4xx14kErTHjoo6$<nChob=
zb4$4X<y(gDDMC3@t{V)HF6W!VEr*Qmqw_hM<=&D?1M;hs^g92xeuGUB={J$R6*z4-
z|4;G7cn=Ez36j9W<MX1`@+Dh_Wm079Zg=>g+<o;r2ST=j#BDQf8!W+&#k|>FhIKG<
zH~-LI$E#3z^Gy3=Jl&LD(L?=**pU3Ym6L2;WkX>EdXksboeB**K<GUmqnEWj`K$W$
zFzHe$Kk&}fXoh5<WkGi_T|@x(uJ34asp(p!G&vv2JF$w_vi;y}|J|Dd!xvcQ*42Kp
zJf(~jA*g%-G));QW;~2hg>j&x=2Wp}SlYug0iizSI^3vsw?wd0AQ2|^$S^!!GDYdH
zrZ{|5gEP^vY_)u-f*2R`b4LA~v=T{I<&o7p4Sg9)u(37{#j=*}NGW0irC;Xul0a(Q
zO1F(VI`GV`@kVI(4H$9)O?NGo(?M0~>le9$V_$4fR2I#^L_ybza9sP&8a73XiNhd9
z%vh+S#^h<rdMuWMsH)*(&ZtY{T#Ps=(=$%ASeV`1P>2298L5qyN+AXMo`khxCu7r3
z6Fx|ZyE|1AA^>o{%xK##l<DjjNfr^vFn}DloM24|KnNH%I;!hKP7OBGS0T)qR_t%3
zD%CLry9E+^_}pkgJVT!jtQm1RvDHG;k}oM*eY2}d483+lIITeYhLEB~*_f3<vvS2s
z^<wnG3oE;AydR{+-5__p4#cJL-}wR%Ppx*Bf0&1R+%$_eB9MiW3@Q$wFK8#Th=&4f
zi)28fnkcmL-GTK4CsnqZ1JO1yRa886v3uKlZb@Sot$3C7$|bhd%q}kNy+F*fas%#L
zaEmjpC6;O@Y*6hwlcM^EV_%21Nyq2Bg}n(Nh-e0kd?Dqd&a#6(o^#e9!UJ-O>&jO9
zbP3B!WHAD@?h0>cQTd9h1aCll>(RG$mO>@(gT|mCTH4w$RhsjG^SR?zoQB%Pm2=P8
z`j&sG>Yo7fHz`LgbB+OfboBue&w9!ypjKeWyyli--->)?mXFA6Y&Rh{dV<=bNC8D5
zJs)#Cm3Yb7a5x5)I9-nDdN^q5B23T23yk~$O$p=cQ1^&pKAG@Q5wb2Ce+Lp;=-9Yb
zM5_y^B1>$49_gNJmc%H3V~#Ki(^Yw?l)PDY$kIhD3ppbuz#;%iXQ0e~huf{TgQLN1
zjn2Sa>XN(AZY36^yq{fBd3<y9uK?%!k}YlD?p|k$J6jWH`1Hl{Xcl7XEk0ii=HW*{
zfZN@TU~BWy696oJp%r%h(A1f%<7=O%EyZv=!!|E$^iR#jcPULmrEG03RDW4dvOPCZ
z-tCU2;yk|m-1)L5TahGH+q!pGsgptp=M|Gvc8ND2Rr9$0|9{C-nL+5o*G3wFz7x0&
z?jMr=i)d`6lA~M2JW7DownMP_E$bZ-;z;=%Bswu@1<(=eKn+Ej)$4U#ZX>^w=*C-a
zXi63F3wfAbBIelO4I7-W!QuWc`)bS{y?C(Ir5#L+GF($RV|B{B(x3@q>Ye50tW6rw
z63{lVD*-ZkF7IP;h%F&nw5T-rD(hjWg>@`dPOB13;Xs2Q6{4{I<=U7ig^0CMni3Rb
zuk2J5CC$`(R$nV>4)-M3>>q~+o~nn^>{k~HkOZ2067`DBa*Y$h#5z#aSL1HKSih36
zP9LF#i8%@uyb>JYA77Ehb^>cS3q*y}M;~gVVgwqJ$~E5V-Djjk5@0e=3%NjXn|cxS
zBO&@3X|LjVD~WU2WrONdtCqL1pG{rdQ{GhF9b>I3sKqGcEGu$ik#aonBf|#FlkD2T
zIv>lU=<I<$IpIn!v?L+1jHCYr>Co-!YXWtFt1#V30Qn_71|MVOb6I(Wj%ji53oxk{
zvv9<R+Bah1vODMmFSmmV_D_HBe0Bf#4_`m5yn*6QB8BJd{@XYA*(Zigp8bA`4fI|<
z?697*g1?L2L;G0|+Jw?jl=V7;kKMlY*4QPU%e`R&b{}A_;G=#c2>S$X-;z|mp84sP
z|2hd}!^}@NKe!f?t6|x$8qq0LZtkK~zHM*T){BV3L&C>d^;zd^v*W+4Ru#r3B=H1T
z1DNGY<RT(Ovh6?$#tH2$&eKad8XN`S|19>8L?s6AbT>qu4fxrLcRA;9+C}n2p5OWX
zen)(NCBJ_c-yMpk>cF7jFDm*K{`Wh*q>K^1$?G0*wC1`Cx`W^hK3@anVl!)7Yg=b$
zodS^VNg>`5VL+)H4<BmUb>!4RQa{B4X1t}3o0rK62YjEvn{L355}&u%88Q|9z;^f&
zx9Q^7;Fs-#cWkgn|L?NF4ycM7HYE{oNg09)F#Vp<ZQ&O7L?XQb`IZGeau+AkP<z4F
z(94OtdX-%Z9Mi^g>~BMs-{`(Tf>JeX@H_Slpaq{DxJTz&va$)J^ljXz)cNQ7OqwTQ
zW#g}!gD^C=_uAfiP;ExqVomN4_vV_CVXELe1h2!=xywlet-Yude`>==<zGDKND<_G
z!okSkW~3c!SS^ADJh-|wf}~Gk98JiPhj}Z)n01QwI=91{G@)1ApOv%;gGM^Xn<LT8
z1$lQonmN8dA1W!4kCC}wq!FM%LxGzq2NNKaJB$tPKszl^@KS+HRrl#^WCaTwSeL~B
zox<|hEqE@x=-8acYPc>8$kSe@+p#&V2<3;C@JBJ44S3<}*H#-;6_3VHOxv$4=w5w2
z-X~!>5A)F!MCIw(An1Ws*!lj&gHLDKhk@0GFWOoaaPIvWgLKK|hrKl|mrDaKivkqw
zwnEX-+5zbas4<{?qmb;5ty*YRL#Q64ihQupq6Lx9-jMws;(ya*Hs)zoSQ<sLDrIqy
z!BHYwITN>G0Jgx{+S#Am!Ratu|Ks)ge}8!RQ2pFo{|?me-q~NI#h5BLVh&7a6_ja?
zgGS);OsM<AP;-$DfMWWA?iDodi>bb^bBTEa3p97yF%y;HSydPZLNAoz1{hjIo>Y#f
zx6o|fCOxGXLT|&IVJknH+6=JSOm%Js@%EXc7avtncs89Ws!2<*CJyC8S&oICm0vVu
zqIoIvsZrj(jF0l+@{+FtVP&mB!J}XHj)1Cx8qw1_nlHMTNUdC{TBk=jDm=LYhI{XR
zVGrAm4JENXET~=`6VarC=wJ8#AFWi|ZW=KVec!K`MyUc3h4<V_6%iHnq9~z#LPB1z
zmv!s4SN1G~R=oGe`d=M;*A&R5saij<*mFB`=GbSitD;Jh!Epk|Fe#*iTq*(dt(ZkH
zIbb2+c2(v^ujq__WpmLdXYb$PUASVY6dJA#3eBakaF&OYp=)CL+>{rs|CO;JU0y2%
z+*B(o=LG`O87Rqxc2rpB#+D4F(LJb?V05;SVj1Gzk1t0bZ$~~=K#2uISTYBhbZBK-
zqsU+>u^<a|;7o0~ph8(dJV+AFO5v!9O-Iv9Q&vU`jnivuxNz<?Nox0meLA}1qVo8r
zW4&NXW^e4gF3DqKIQ4vnhTE7=D3$Y^GDvI93r}lJXA)OX3M@?KBBfyjTro$#MkAA&
z`at4?M^7+XtpaD{sSVOO(+FrF_4JXmM#+eYm~zN!3bgQn1}ZhYWzPKk0cT~{_6yqT
z;k;y0#Ze8C2EaD@<a+|NLSKIEAa#YQRTjY9#}K>+;agd`pi`Q^=AI~+&8SHlUCpu6
z4K7WYb+TXWvuB!OUFckUjVSreZzD{qTh$l~#<(HLn3dq=q33YOnNp<D35m&T!4IOL
z6}+Vp)M8W0Yc6En%T~%e5*i!^8-#4lUm8M;-p7H3HA@GNX@(30!HM5B<9LJrE{%0c
z*CongLuRZz_R*c)j(aWU26FeL*={lJm&~D~{ndPNejYuy%+X~k-OP&Sa&=m_eLugf
zz}o6I(dmwP{b14t^8Zaq?KAs~lr3M~XXb84-$<Pcl2NO|KcaqhF&8*SVHuhT?BrxT
z8Qsio-;J+lqnn%V-&dc;jQ`Bq1Gy)bErfL}RpN>CnjYy5jJ*c$b+oe$S0ltfb~`$b
zo(_$9=jh<2J7`}(?v1X!+O7v%Fu|l>1Scasdt?`MXQN_W|EL#lMRyC=7N!UIS|{t|
z7v(+uciT3Szvr(&^VCXeWI1kk-`y#7TsLtVzjK__cG}ysy;@p=EN&=LB`G^@lmGo@
z1_1FvfTEmqd+$y!FP2Dr3<fiUnZaQ2-QIG(eDGlV>j&&>b~cX-Hj5L^;O{cZOP0-8
zIp^&3ZZXT!J9svE7hUrq6vpzsNuRxlu410DH(ANkNz8Nh-He`mUx+%xNw#<@%fHBS
zYHqel5;n<}cX@n0FIkjMSrSipT0qC?EXx;B8E5H$EfXHWvzwUTQoW<YX9vfp2iO!r
zS<a)9-9`nQ#zmROSF4gw*==0T;SG$S$X59PRzRu0ghNMDf_VGEgEU(30tQiy=;B$n
zSY|0tOZb)+S;C(@c(5uO-s6)6K&<{gX<r<MQ}PX~Jzp)BvMQit!^$stvfQxBQS{s0
zrd0s>8&)}uuhS@rt`dcg!?fi23?`;!3rATr<+=T9lQtwijjxC4a#h}|=IQGCniu%3
zSXckx#`q<Hr)L{gJjnAb-@KYY`sVe{c)p0!sO0UczMt@=!Vr${I4fUdD;TGG(Y}T1
zTkEOSb&s;^cyf<EkClk{1h`LDX&Eng>zXe}<iQXxUav|Z!|M0Cipbzl>p8z#U00RF
z!<JR=SL+^yPx)HXk>%gy*@PFxMt%IW5**mB67l-Qetvz^itAPJJi6PUJpB)StQIY}
z#;kH1<-9e)8x^1PS)9gg=*_5fpN?L)B5Fa(>Zka1pE|7}l$AHEC8XjBzeW|}&iT2v
za(RdUi}&;+RD)#pOAv<%P^<aFt&o;^G${)qf}h7Aipt3x>)5}8<5Trdd42;r)x`-f
zxQPu=^+*@nPuc!*32GPVTBz`$hBbluQJjJr2Wl9L;CGVn36%g<a3Umnq4dAQQq@~P
zB?bWIpd)5+N{VB|B$`;HJ5p6i)tn?zQD74pP}Cy+4YW7WZBaruQ9fnQjt-&On>f!>
zWFuAkZ2?;7NdCZ22fARpECof;7*(&kxPuqn0qgDzAG01b3o1vy+kax#+j<&Jr#-BC
z8snNS*R5XPEtap+9zDay-$$!*4#2k6f43iq(OO8y?r>ZMv#067?+>usWgg$ay2~OI
zJ*=b94+A~Fd}5Wj%CdxYZlknB35X?TQBrWbPzMH(#_6>jAmR%Yak~ua(djkopr-79
zbHnq3*xzb;VrpXEmIa6tB;RUbL_o`Y#eF3KzuCe2xbzn3ObuaYy_oCO#;#DYju*O4
zDYTpbI-t8~m1s4$4sHSED%$bmUlb&;qlBp4KTU-rgFK`liWFy=k_aRoBw>gOt1F;0
zFtt*_zT+|QHng{zls$8jp-%Vh@qZq_{^c0>#F=FCWuKZAgh@PsHrCct*@i(d#!KCd
zO*Tdmg?GulQrS$1(d?4;93W^3AgHU$#WU8sAj06&Uib9y$HU{ZZl8Vi6|<%KXcQNx
ztK~Aw!CnM5HwI;NXU~EJ&u+*BvR2bKITr$`0mCn62Pdz@x3{M!JJq*uE_I_HABg|y
z4+(Dkfbf|ij^wXx?|g$e(W^x-w0f9)5tv|$ag5?mOxQfVTeexxZ>c$QBLIObTkJ}W
za9s1!owAWLiB6wLL|=GGz@?LNo@cj26|TMy#3x7q*p;(1D_Nn)ZOC3l??A4sa_PRn
z)$<?ANm?fVVEjESB86OzW8l^ZR^KW4N2u&WDmVW6VKqSA156AqZc}!3$L_LK&X)7#
z5M<3ow_p$D%W+lhA(YQ?VZY(SZr>!h>TAx+Ri65}Vcp!HdO4tniotL=3`noQ><76i
z(9Dwn&%h)}9cPv2*n+K<P@#&y<lqtD$4C+!#Md3b1G4cJ>!OSqFw|8*?Llphyi9H@
zL?H#!mLdCP4!VL|hC%knNik$U+$~WtAeYrGzW@FEBu?KE5810_um5q_$n>b8*lInl
zH}G4oc?0HX$E=gl1Nk191BUG3hzr%ln7;=KD0*F}1d3U=COy9wFM8dh!{dX~-R{tl
z^IK1WCtq@O{0R-qSNGZLqqnb)L$!a2r{&zLY>+KNi$h_%ySsAmH346t1l2`l1@_vs
zC$Lp(P$Lmqw5*pvs~w;~kX@QEcJ(CoF3yl{kYQPe_ZjN<y+F?ho$8$gMmpi3dixD1
zw=w}D@GHQn`t5aqx@EhBa<W*|h@4sb$T;XQ_iEd1Nu$bM)jJ@}q`d@~0>%I`l$aaO
z#q*wv(i&yvyePArd#XBM&=PPF7h_Vk%+CAl!w2?-@!<UNrHOabu=8S@8wD)I)<!0c
z*(q!H3UU!<MUCWTTO1G&Z5lE=56_Z8&}ykpXYn;GZilaXg3Zjiu1cdq<**RQ6;K(b
zq)ST0BLk7`X+@)oj0xZu%|@LXk(=weV|@6KBNp|JJ1Y-tU>!6Ay3Enl#>0t+@RyI&
zfY8#_g6Hw1SJm=QoY5w(rG5S6Nv*ITAywhKUG~`5q}%LHy`hgSnLXT!K`@LI*TkLu
z?QMh?7w3vOnPg5jfiKs5I$-ZOU$VG#D`rqFzl{r!DyuXn1qEukQ{<ruldbFH!7?oc
zjaV9LPyN_#Ersg1->AA4BwyIf?3+89mCZyAsS5$Jvzq&21LU+4O=jzBapo0P1f&oN
z%FEzgSSyl#%D(yQU)QlD6ls(iSk&O~My1>4>pxSO^(&e}HhWdgppNP4_lRO#01ZuT
z>*+iy-b8t{;80oknS1Bmtu5(2Ku_M*&)v%bt(<ksU1==0d0g@&Rg(<D_b5xRe-@39
z0^?`~grLXXDXFhjAau}(E41!78bKE?;=HIF{=GgU1+L6!a~g2Hii<g7I1}P+mS+q6
z8OaJmkBYkW^eRrL#wfIl-&TLsN?6}8^Q?#fKIth1TdazbU2z6>6vz}1v9vLdeFD7O
zH&GH#BPolQOR!8?5}|A*BSm<Ng)0UOmv?D)n+|>WQ(h)L3bio^&*k!NjAaw5Kwlq`
z#5_n6LI5HNUiMWUFlwnTOB_o<Z2&>%a_D1hpv!ij`khpl8>-5t1J|P)hGdz4fDYn)
zF3hT^cBfi1Wzt))28n4!_eGDC<}v6q*SuFBr&;aVtkxgY3ZHw|2!(pWI?ju=(blV8
z59}AC(d##7hp&(Kj|M>~bmhJrelf{oL2vzmK&S`KOY2F%F7>Fq(mV<~<<$o`)?_!D
z*H>>(&yaU1o(3fkkQVJFsF)ohUAx0c)rahRM&gBr<<qNeJJiEiu$<Xur+>#EU9ex+
zMZ??dWMl1++Hf&}H?U?#3GjUyp|`5g`t-i>6ur1)nn{5X7bF2A@^IB%ylMbs*pq_d
z`Z~kPvh+R~mcEY1aIKXA>u`^XV$8noQGf4=P6k!`_^TL=4o*&9pSWw6Ih@BrXi{xq
zwo5g_j{)_mFMsCeqrbn7uxxZ!hy=e5dru?Fn04&RBmz(lU3;s*-B;zMH#TG&3`nZy
zstnz(TVf_dB&I(k+2kGCUf72dH~|<2cA{rgtXC{^P`GBju43$mUltE>r6gyq*rXVC
zE1|-=q<MAaGPVXt2PU8YLLfw1<oQCw^E^ZUFvFz=wG$9O5;R~=9!>Wc0%af@V53c{
z{|`)5sox$BYDL+yftmr_N)DSy5Begj%7!pCg7#`kfYF!yYU*Gi_hevcQcW0pa{<4N
zYG2hDurMDsFN7Q0M!$a_r$7pEIn5>?8?BfeH{E-tT@v2XsG^v9)i-0aIk0z8y+`ag
zJJWT*f8=62NEF0QSyU9+B#w-@)=CX%-U+xiA?}Y@^}_+w-sREo?(I2xAnJ}ri|clP
z49(FAPBOKx(3Yd6jk;U?Uc?D&*zGFk3E>Xp9Br@c*RA9r`b^z-<hHyPZZH0vMtY_g
zGJFzND1m?T;<-m(ckvXe;ppoDW7w_LVvlhBMD0(f1uJyCEKW?v{5_Kq;>xWtsiJI!
zKFfN1cs*1$G`cM0IQq@=Dcj*aC*Ze|O5Si@3pOBvn=GDsoER4RoDN2#v%kGL81J9_
z`1aMo@!9z2{iC-BmTfD9v8;1;x8zbFsSoJRhRGAENXE3T7+MBM?Ka|v)Ccg+Bh>ko
zTP#V?gHb3W@@dtAZ%qgLq<9xE**u<3d0K^u(Z+R@#8Ck(s2>um-oXp#a(aiX#v-UU
z1#2eBZoMjoUb^DqC3VsxecxKr1PX*E5;FMlgE4M#>KfOAVBIGc-p()GRaA6YZ%Cul
zEWJ;tC=A2~6{LE%c6^N=V*8g#yukC~$Inr+;>t*$#i()gtlk37v7kQUr*~m%kB|3X
zttIvvsrtZvEjPgZt_gaeinJJjF$~`-f~z0{R21T<3%zYzWpRNJkyDMUtLuhrT+VLi
z95*&lLJD)7>!3N1dt^ndC|IlFEdHKPR_oWcDA$oH#j|KdJMklmPHP0;**yzEfBMHl
z?}>^Kadr4Vk3uR%J?>CdXgdqIQ-BAPCbWNrN+^qF=njo4$4oT@ImYIZ#Kpecd^kuc
zbf?uUs11v@=>P0sqw*kOXoYzrj<XfYkppSbk$x=C&PI?Kg*<M>j9Q)saOm_+Few1S
zs38c<_{!E{lMU!F!H_#4Yf({2nO4}aqBC0}q!lEEhQx_24Im~IGV0j_qY((W5|FD3
zpa#NGRn?Z5ftdzWT0+~S|5YKfrWd55MxWy}R73Ajc@zT$vvTBoS+MW$xa89>i|@AS
z3wmyx-Ur^+8{HGNMa$K4>IOhpMf#rsgLlIdCN}3m2PDr=D??W8=-W&+QoiP9St;ZC
zD`y1N4X(RnozRvX##rm~4lKL+C!dssOGSs`j6<~thN~JEqMU)eyN#2Co?UUF;MS;c
ziF;bA1yJ*Jg#UgWilTW@pH5{vQn}NOxg=XtPDv*Z>GuXIt0L=lDS=7{fnNNnB9(ii
zK*>nrQCSEg<Zw{o6!4h=ujgb442{;DJ;{ydLsE}K<OlRWtwXvBY}WYmi#60$EmK=t
z2DqRaXI7|!>lygMw16sgA!Oy%+LXZ>J~p>^n`#@2n|T|-5c~zPEFAo?cSa^zj*-Wp
zj2I^&hJkSe_aH-nHV9rFuWg?V)voa~16t{#2Ox!ed=jMy{XDwi6eqD*mUluY0I3Uo
zj;DACb6lcLQ_(_TFVK!_FU~!{Us~SQFz<Q{OR~5FY^=MaQkPzzuE)V+l?gA!Q6;Xm
z#g75$LZ8cpGhhwdxo>3<b#QNyLaMLh8|`=y-AywtMF5JAb!&VZovp^hW^Ca+D%AQC
zq`S}<{1ixJXOBW}82Jec`Ogi`0Ki~grtxgX$)!ffDd&+Wm8Bd5jHgT<MNqX8ao8f^
zH$1V&8yDy_uhA1Wd-=&@7px{>kSqt{dWKct%Ot{J=$MWj8kDxe;4-#YC1t!!#Ntty
z2Q6^FYnr7O-BLK!U2NRMxDLtFQ9!2f@1fG=`w!P4y}q5}V8!p{tzta_tm-+;XBV66
z><(7YMo&buxO<33aateT9h#6I*r@k8L<Gh5I4gr%;AxmTptD&qM22&8LXYtrVqFyz
z*F?<dVRYWfGe}>3<vp8ZN&%w`=}z9_I9rmmf?8=MTMd;EY<VF1_}7&rb_}E_1RsO6
zmCkcmVe8VkuEdsF#z>^#)LbXoRg~z~+3h@rbtg)0qq{;*ShH1iez{KORxuz2TB$TR
zclM0Y*-q=Q!#beHhTO<LOUv&ec6V_#Y{Ek;0O9ZH0QP>87{l{vCl0&adu87k7ST$J
z&@wrl!dHA_I*tYH*<NHb?(6(=KnJ}vSp5bHe-V=nVp6N7JD}%C>kk0U)m6?xV0+Da
zsVjtoi^TG%Tc>k&QX{1f7FY50DqA%hTew|c^<fDidJ=NE0OpN}V6Lk`v4XX^zQlNJ
zJSUDZ2;K9)k1oF+!FnW-9W8s^C7^Bm>nbZbJckOR<VY=A0-}C@C@LF4jy7{qGuJtX
z7JvVHcSv0iyB|d`hyk{%|Bxcwvu4^|&!j6IPwp6Nea_|CMePDMbna3q169LAdqfWV
z5PQ3EVmi3OiWSqX)CL!daoJ&kaI|1xRW<72E_-;9UZl_CDJdcgPO4X2>|LZ-@S$f{
zCln^SzG2kog#WAH4IR`YSIlM=y*-o-*a1Ox*%46r!fe=6y@gvg6)gT9q!>)-MVzWL
zS>_aK+N(uR(b+{gZ3c<5r))<CC1TTIt+inYik2Uq&5c!<T>#ZyP@q>OONPyJ^kp%8
zXpX{k+3g$B&e)jlSu)ucvjY}>*{Hw?EbkeRu#pUrF&kMY#oL;FB2`I#hno~I(t(K3
zP_;pRataSX?j>n(#Vae0Eoe^(CKqvvwjbIA&f*|ako@76r)6{Ae>u6A{VA66N;e8B
zM{WFkpQL}(3}I0+C>u9$MreZd|MDN}30vbe?{+=@*+Oul+^RM6PTB%{%+!2>dOk^#
zUd5g7_+8;n55PKVdi{A71HVo%(W7nF2%c%EeENVfCclrep@+EMg=cQWnL$&1AgKWA
z12En#XaB^*E$We$UyZ<`#V3~wKWrTVoH4rZ*pAQC5T-2c?kqDLEAV#?-vqS{7|es0
zJz!J-@Z=pf5*f>iu(&9qM&@WLoQ(k!$6E0*)YR1#z@YknJRrc<Yz6sLH|26@jA#B-
z?aU#70H$)j$UycxVMldzI6d3JFXqdEaSFdNKu1cEFKS}MG%Y<s%olk4e^S3}YV|Xz
zmqCxBRxWK#$i{0(s0g}X*{Wn}d7aUbNGWBcBP7@RQ<*SVlFH4@Y{gTHm#1}MQ6;m1
z+U=GYNxn(ET)W!n?OzSU$bIxAD4)Z|epRZ*F|YG|p(Rk-im%M!8G>`bzEa9dSf4Pe
zo||o7dd?iJi=^{3;zzc@%xWm@>?b3L&dgC%>(|;+_sJ^4N*z|CeNR2d3oD>dk&v<(
zIw57)P)1pEO>@|<A<s%X0$)+?Axhe!aqdg#!nW9sa|o#;G<r>pikAb>b{5h5BaYD{
zPD5I~RV|W2OW(a7wW=ZbB18U1qgw)0RU4>ML1&tG2&kMHOfy+bRgM>%R}8#WJt5y{
zZ2K9<COv5Wa-F{uKdY1sy-Ft+uogVZ@hlCrVv@+^ngcXORy!Lp9(pJ22nA`pjHaqD
zHQp}kf}YAi1M>{aJ);?B4F3!Qy;|hCSCv!Rk|-$jC9~uf`xd|&4gs{08iYdy?((CR
zMvr#Xij@dqX1M%rYga*~?FeG5!GNC)HtQZLE%1}v9RoYSz6oJA8F>h*z6*zPT)Hp3
zsBgO?@GsoIZMm0L1qN1Yb<gmfOYf=J5;t7kGqAU^n|R8neb*6!V2jNqG(1VUsq*ww
z3o-{CXJT&bxDL4(uXC@g*$~1VoSG|L<t1zB5V4bWX=ia$P9SsfZwR|<RGI<@{OUe~
zBD5;4QREs=44B*UwLMI|4H@={)Zmu2ZC-NyBzo`-sBkE{@RGeRvuy)<idF|xh`kL$
z+I6?Zv}r7bk&yXg*Ig`(b@mA4u~#5_kmmJbt@BwmQsTdeQa&@j{sijt;Mh-t?RMIi
zSy9B80l{=F7gD%J6ix!AM8ruz{Hg75zx)H)SvvdT=1N{gb5a+fZE~$*`q@Xy@Bn3?
zdE4tGr0re+wD3)#o6+N^piQ%_E&T4~0IkE-d`wAAJ2nA6mtQVJXPg@6Q#N8vXFYt_
zPCjVmv<Rmv@}Bkc<O-;@FdF@QaPq_J)5EjBjemN3cyMO<>#GCOjVTf9%b5`+Zl97~
zn*piPOzNTH&Rr9u5oprUl2=u{9TGF1-lf^HhzmQsT*ft^)1d`Y8li59Ser@|1>{-D
zCwS`D%vSXo$zYm=H@Jb-7d@Gu<dt|@3%92O0P-lOstJ~P!+6EF1I*%QCguE@=T}(~
zmv?@vt|Jo8@7AJIePXmz#${spc^NzZviP#NWRwts+5(m)QpClhp4qSu=2I7jHl(-1
zZXZpfS~?BtOvoC?CL;)1CrnCwR{qDjVI@{5;W0NngAc!t(k#7OfW30@_@N(vdRl2S
zAm_^jCT5H$sji~QyIyzuJlgtgf9t=;7w`XVwsrA-HoH8(fRA|kc<Vom7hgXzdVK%*
z@$l=ti{Wy<?Cp&nzu)^XI)~zyj~-og`uHu{n(c4BfZy9)%fq%<<B+ClQaO4%i}S~q
zDtiY^P7euT8DVVLm<oy#@M?s5e@|4_mlDX=^u9|k(G=IiAk%k2xma9qJ`O7Mt=VC?
zZQ&Q%Tjw<bKrY_Ad^0{gJ{!N<|1U?nByrk&=(#J;;iw7U6BAx66R<D3+ZQ>QtvC_Y
zkf1+Uv2Z=bwtaKr>TA^2DQN;f+zH63?m%H+i~XhF*dl(mw-K@}k^O~<af$77vdF}B
zYSM@T2DvWheoYH&9?|<c8;brPvA@)3Rb!LZ>vJ^%-JF}2N7t%+X-4Uwe$Z%As9Eq$
zsmyn2<>amB#QQ^}t%8bBqnBM&I)RyJ<yGHXEWX{tlzmyy6vJQKw7rT7jtY`mUS7nB
z5W2ve>2`$VDP9~wot}Q)54%t5aCc}&6kD(cLAi-&2;!T#DFP)TkAOpHg}|BovsStQ
z?iJV;;9{Mr4*+RXYOKJF-nD5BDmBjw&TQi5W{?@qJ+r_L5e)T!V%k3?FceW@=kk7Z
z;QH6iQr)f_lU_?yrOI!nC@bRm{FGADG%E(xaXo15@{xyK+XIgu5Y{@IvC2dP+9}Xg
z8FSyReJ(s+l8?{ur`M;g_T`FsJj3YqoUHD1ujK72?Sb+of?^#g1=2+1u{5QN7B2o;
zNLgkrNAv`0Mfr6>waza+$rOD978YuZ3LkAltSEb!@|n~4(N>Mwck=BM_UKV34tpA;
zW-O|ncjC))so-3)y*;99Z#~qXooe`KO|43Qvujopv!-^OxP8)OiCT!}hK1UxNb_Y@
z^w$g;kql)i9u-p7<j6XEER6&`;5~t|VfAF#?Mbs>AVwy&hs|w9{P^~hKGBpE%~s!V
zw?DzHIfF0XpmPS)-(EPP{h3OGU+7ev<U)6@YA9$`pQ;FgRl#*eBjIxwnT`tQC`{eN
zH52du>(VkuX%Vl_#!TtJCRvUGu;&Em>NMqT`%JU@bSsRY;7;}ioyRJ%s7yzlh9Qw{
zshizoHqr)AirbhnuXc(#Pm*datMdH=_0jz(r!NnVj>Z)g*F(uBcyIF7&M3?ug}GMV
zgZHjL*LnA(-s$J)Q?BhB^!m-`>GeKcfBPA_etz)7+aKHYDbqN6I<3)+C!wp;;61tE
z*Hz3*BK}`nvEjW5tv;r$9anbvwtd3jceieCZd8_4N+H%%7W2+S*L?R|v&y$_N~>_i
zu5`Zykn~xJrH-s`ea^HN2-+M!-<Vat`E&8JhL7uL`sRLU+8j$e8&~mF_%jgN8ke=q
zxB8nUYPNO+k=PA<`U-l_%gUSu6)zrhAai#c2)yyZ@z3YA)tC%uyZRHO&gsDkl-;0O
zi|aq+)}}ARO3FmGW#b-4ObKwsaRaj~BZ`lw1gTcaq=9OKY8Nu#wa9ckQ<cI^1i#Ms
z*5q!IRC&7sAbpnGNW5D-I_a<qPSVMTKTRd}pN%oH;gYLIB+vDRA;^rrhF8*a)wh>d
zMNP>8c=bf>!VH@v{h<Yc3l{^S$m;S+9mrrpF5cqSnMAWj-=3Yh<#ct0v3XZqwb&Dm
zbKl_rr)v;*o23<Re{HAwG+p2MHdU9m6lx6ggBq3`@xS~gPY*$uxH^+NDWeexgVVCS
z+rNoon$>WKXs3X3uf)zD$*D1B4(xUDG26QChJr#X_Nm{0D>hLCUYo8c@Xjn=Ehv+N
z$tDK1aEhLatyQo$^@5+;z;G#0b^V?eLUZ6<{Uk)=-p1zn^lKYU{_9fLquG~~U$CRh
z%3lf7dVYS{a>$?5cJhpkPW7k*<arF-q^6Pk1ed3?O|Aq0T0GuA3PF#b?QM3Pu?3)7
zT}xLC@Qhh0j;|K+VukKq_U7dqWuU<VJCAPSEDts+L{>GvX0nubQdY713P0zb`=c9l
zKlej-l09yqYy8w{xcQBb7aFO)w!T)^CpS`UYq~nuwA&T)CpzfX?q>?EqdKT`9Zx#J
zW)wfubcv;P_6V=u0>VLjNF9m@byy|J5%gPR)qx|PVm?KYm25KM1?>k5f1`9AZdVS)
zswdA~L>0Jn#>mJW*Kh@tbw`=G@PDpr%EY~7FdVvytUe&x7f7?)0VTRk5?Iga4oMPZ
z8atSTcvY0yBL0p0t_ko>hEEzweP@k0w2tZ4Z?Op81GS07diMI&tNr8W-eZ>X?h?gG
z^K6w&@v^?PSBkbJSuvF@t^xI+Z8SPLID30?Jbw22`N8=4;pzSlM+eWt?)Nq~QEh&k
zj6TZZlJw?Nq3)BhAqw1$RGTezW0QGVY|Go54B`r4ubG;q23Yd-%e&{!%6ni6^}WO6
z{j-B`h+}PT>o-OD5?2Io>uH%{x=LB0He(0_Yxi87s|>w1W`D%?TI650uKdvPPWGLB
z7;dF~K+biOYX_|K60tbwyE@toGjxB+x_ePnj!|_>pHbJ|t={AwzmtQX-X5MDJcq^H
zJZ=M0UL-Q-UFVLzs&VZtGj5I?nD0g-x}alx{QCF+UZW13M0esw0ChKsm1}Y+GfHLp
zIE;!8pZY3`jnnF0dwYV1UAdX68f!5U(-+@3l#Gl^xd9oacj|_N7JX>nVt4E2!wvqs
zY3%GUoq$GHh}HI{at{K#sd$hP+mWkxz5tV2iJEWdAt~CjQw{NyeM@gCl(iky#+|Wk
zrkOI(cv76V=!~``2ehy4>*wId{WDzZpu~$T2kFqmfe2fkRePF!wtswjC`Sw}(b1>1
zU3>Q=TaZFjydye@wP%(6x)O)+%n@I<mo3!+9ddFMq<g5GftYn!`4~1lDb^&DRE~&H
z3PIWOIU??*PGyOq>y!!@v_$98GkI5#^Z5B{v3yqDT~fWgY>gb_TCXbEwRqMVUoG&l
z$*o@sC!%~^BG>LXtkdFiWX2Zd-sBltC*cA=Ny@922-9D6U`HL80hE}>V`FvrhKYz-
z7me`^8ttK@H?>2w)rpfecPe!8dw1wdb0O=m8&GMb6kA4l>8dJ}dD`KkGZbG7Ue2>B
z*|w@GkHzf2IV3?UDNSbArM#iSi<sOsCta-_1v5`<4#=tBN#X_F_CeAslnN06Ll1L3
zFVTQ)?f5daE{uZO92cGKsRl>vLLOWPuz62Bl_!y~<k}>Z#+{>pHgU)>THx&xpdcp+
zpICb%lz>R=UBrdVQXHpNQ8M^qeOhU=q^T~6*0SX|_(w@jR+5GwbY=`xYYudf;ECxS
zZfq61>2fTGz0vR+IfecsXSy7DaR9Q~*#)<)b1HRNqYA3)wE(K_Jn5}Ow-lUMtgZs*
z-fF;#L5VzR>e;b6X-d=-GNTJZhCEzpT~_Nf<vN}4V;;<0N?gbznWE{S*S4`I_Gs6b
zXup@Q;X1TxBfJjUeJ)q4qb;FRgP3GIE#@VU)1I2E0W&)D<BMv4XB=6qrg<AQ#Sb5t
zI@TedBR1{RKvfR|O(XY2^ln81du!)JjC(|Xny~(dPJN4WvzsxqXD;PLI{X`)KWp;r
znZhQj)Ct}rs1`1i9Px4^z3kWLNmSYj&yL@<a=+wa31%M=TN>3Q!N4lF0O1DAp|8zJ
zv^?wYiYzbP9xhH_pPY@4_s`y*>>sfY^7o6Q{U68A_D>Hy>#CV=(36F$;Vvkp*FI}d
zNxnDT9F3Yq;cE2N(q^S85;u;;#i`{mks0zy+ra(5`da7lrWni22Us-{ady+{4PNy7
z_GRNDF39fR<GMab<;Jj+<=*FRoS6>vV^8`#uajt(c6k~dV^}RTjo*{mmqyJu+&BYm
zbwiy6rqz8-o$;KCQ?oAqN|lmM;RF;JynGa71vRDA-eMJ(qz92V0q=#_y1IjoC-Vr^
zSG9d7)nH^pec(?WsKc@{4}dtdQR&8_(`Y&+PZr**r!v<Ft+TH$AIetOa}=3HwlI39
z0Gw&IqFsI(o7FNvmU4_1(1^lKMgmTvhcx#)qeXEh;%Y^YWg%+WB3zM`Qn;McNjAk&
zyKHeao^rG($Le9PLO*KSf&E0SxXP1~RV6uJUfS%e%Gtk*DHmOXkiX%%ukS7vrE_ia
zmFa)>9qLp^9;|aoooqHM=mu^h9#)3+)2vgD&|Y_Y`1{Ua=P`UfZm+Oc4Je-c6h?$-
z%M<J>`gmllW^{Hol;qz!Un;s2M{!B>gjo$_yez>W#hIisIO)lh90kiI9&n$Etu7G~
zhPd$RO@MQN(Kzinq}CL^`*fsA%wS0KAUqFu1sEHvmA-)qOKJcDsF+(rpshXPLKJ!n
z47ovffp>Jq+0-hVn0d(7dlX%slBtixzufCC)bS&Fg8GENPf{i5AYIjnLG?FL9;2j!
z)mKruLHMHS`l2mftaXbdiFrLp3lG9(#;Est3Fk_dfW+R~5%)mH`LsIlLQ)gto*-ko
zP}+nSgmo_O>$ydjyI8!d>l;}cr$SZIy80lHJ9}A~g80oB*XPMB-{y7>uC5}Kb%p@v
zkUD9*$?7!dtJ|a(=<3bOv&gUI%$^ZeXk6gtUmUzav$eXFD&v`iD!WL{-TUd67Jhv2
zKXp>yZ`v>re)nH-XsAgl*6z8Kb_mgFQZ-ErZxkWpoD*w~9obG9>iFM#Ng%Mc^NX#!
z@4g?G+}>A3#n|;FgG*Qx%7auIf$oaC09HaM5Yk;Kt=Umc{N_1c5xBv}B7q0KQE1?&
z4QPZy2e-1VeD&STm9XXA0smlKODAisLD*{NR9*z&CIhVm8c)JTT37O*tQkS2kyGti
z;kKQ7{63riNaqbz>oOEPz?OT+ln+jA>VO$+RVb)K3B0YHKoZJY$JdM*UZSTEeWItC
zEh}r#1bP{7H9k$lfoj~WrS+YndnSJncn-k=uY(oVNR`*Fp)X5H;5&&=%M(F-dfwbD
zroX<;7wg&MG)<Eg6PkMuQ$Opb*$V?YRlT7_(0+_)HUR52=}@#<gt!Hqftti7hhdXx
z^tO3_>}KeNQ&r100Yi&FVYzdB2SctEZP`<MxjHpB)@m3QD$B5$lwA9ROad=GN=b+Z
zN7Tgy432E)pyoIXwKL<swrBmbO+XU(r_%JP;^=QQ>Wazu9jNuZF45%}chUO*g#O3Z
znXM>-!DP~rEWfPYn(Ihw;|nFjkv58wkL@=9*5|u}A65Rx^q%e6E7ewEZ`(Ey{jOhe
zZ4+27EGwzw)^qA4p5wL#vLuMpPs<QcGG!B?NP(p68AbkkkCf!fMv-OMR;&UH8K>jD
zclVA*zCX<tndgPCJ$Mbb3#K7qoC3Zxq729c%!0ynohDMO(H1|DIc=k}_4nf@d>|2{
z0<NW@B4$*<`@~t!bg`x#%k-r5{~(nMm*kv7EVH#@^MwH-X24lYg+^eJNR<-9q-a6L
zDM8zk(Un_wF&T|7r(+w+u`~-}U_~^{m^O+<xuG*yF|)ugn1PnLiYWrk9OKaQ1WBpJ
zBsLk{jbxfhL50D8LQ78XMw4UD%k@((SGmb@Q@$p`P?ccJV_Qa-=V!w>Gi!)B(O6K-
z`XiFcBOtL&Ojq?gBe_}N*WbvWEJZ*=nOKlqYg@+D8QZ#MJe#M4@v5SsSHv%34_)XR
znn{Ixye}T$lPR_&hQgk7RFR>zI+pf92AWb>7?bIK7|vZF8$K+FhDJ*Mz)To%8HHWi
zrH9cwLgI+L?U8P$*Lh1iN3-aNyy^AgPJ9?2c6;3@EZanfu~anFD#kx)iZZv2es$41
z2rhcvl0mq|Ge%4U<LPL4JwCrbAKngO0KXTm_%!w#FgU^2n{K1EvA(=hFAMX*`IcE!
z=3#06<9||scfrLkN6#q0_084w_~v#pp8l(4a54I2jLw#|RYe}{lq}05+@iR1g)0o)
z-#e-*kBz^x52|i!x`kgh!T0Q@3{HxVn9!yv?Z?M07;SI@)X<o&H~CmBnUW&KE$KJ=
z5TQgnP>Pyd2}lUXef(lDfH}qSwDcPvC%2zI|9U?h-A=A9r;X+oc&#mplyEWuRSI`#
zu9=v-8C30LA*69*%589*SnYD{cROn)W8JQ`7ZqWmC=D_t14BuA#!-E3Hf^V9LKO~F
z8m^>zNVr@DWe4d1;esMmP`ba;)EFcf5D_@O0ggG14Y=K7I}$oi-wsYpZLeI>g390~
z>;MGL>K2Y=1ACl_9ZM{EX+Ry8lFhy^IhS+4;ousr8j^!(6>(cG*k9^_(_RTn?`IJt
zC<#AHk<$0aX;K3IV^wA}%IAO~e;!>N<!7nlJb#=f4(@L$QXL)}#x_nx&#bc=+5d!n
z7{XNI{bfmbPBo-C9$^s$R0VHdv-Y<vOLPo|@J9JHI+Q2<e*NHYmIsf0SOWeFN3~gl
zEuk-EaT&x8Su(_HL3zU1Cae(cwT-X)TWhz@qu^wvn4w(w8p|n6;y3#JeQkeMi=v7Z
z-)5bheTwtucw>9?cBOq1#U(J<*DYIn`^Jh7cEQV%6}_-suW$E+=El#-czOzl&vCX2
zqwm3!zV+;jBp<!6wOH#<+ei@q?!RKng|l6yNqDuC04+uIio}(wp!*Ucw6@odg<tZn
z15vO4`^~P`j-M%Qbr#6>%+BjKvoq@)ze^U0rj1`}@DgqpJ_FYeDBwLIDTmkvzMyck
z3f(wbA<cdu9v$IgvEHyv_(&|DM(`!(G_rk~!m%qU?^!N0vg7bnt^XLOQk|Ox0oZY}
zN_}s^fkX}jzD*;Bh9fslL&E(y8bT6Kg0!ViAEn&Y<@v?un+u^zddU}r!y{qf_>8B%
zm2v98qt6$}!3bEKr8Y%Fj`Vn}X%Pu2!yw9t?#|;di6a_ue2Q2c(5a?nYy<!9;>o6o
z@bB(2T9Uwb&QdQ6aYf0P3Or@N?@7iN81!>N8f&f}5yU1SjKO&v#Hsd81H6*dUlJ~Y
zi5Q3T>#OUpH*f+o$rP7v1(+NiPEKJmTvJo(NZL+?=B1QIlDb==u4oX%kCMDMtg6kZ
zB<@#;Ar?WziKHJ?==O@_ieFcVj|-pYD&AD64s}Tua7llg)8`0WJJt_hFaP><d*2nZ
zmy%U0VoMg)tFFKmt2=(h?1LfacA}wpeV{0ICpL=Lf~XscvwzMmug*SPUEE)PxxKvp
z+^m2&$YY-AjB*t{=vh>}?e5MiwzJ5gDYN60HiY);Li_VtIrz~-WBoyW{lUCee@isd
zwD6`b@un()q1u!L4T;0L#NoUfC(#BX4+hvosF%hV;<S@*;a=(DlN3t|2C>}7Ou$=O
z$S`ypTUTTY9^Bu{oTQn}jkZ;k)b(M9ImPI(V@fmMN+1TJhrK$j=~Ogq&5X+KU{q|H
z)23|AY=`WcKLm_~nkrUt3BAN#fKfV$eO5i26*tA@yI{QV8D_^|G;oiOT7^1Ol5?{u
zD=xlB<41_F%lEZZgJFgu?i#vU0l7Y43AKIKr_K><ZL_TrTs$E~%mM7$Vtg6f%p4)&
z%7G#HVG`g(FpyRx;{JiISfA@AUelV(-?iGS0#?CPMv9RC2#mGb?^;E1v(!kE1go;h
zIDO*gkt(f5&7_oPX;gS5@?nmoz(|qg7BW;kJ?7+!9s>hpo+En2)~Hs1uEUFylXl%U
zGhXVL&7os?6O?ZC>(YIe`sRMGt6$f8EtMN8zF{O^ly|FER*L{8aDx8d+2{o~N(HSA
zp>n9}RXxoN7u#X$ZnC#G+h*ZbrLd=>+}HXyCR-ImU%Dmxw-dhBBH`M5``bBgXx#7A
z_zP)m=q(eQkDh0ycCF<9N^aFcJ-up<mHDl-`=Wu^;%x|490!fb<dT5VzFJWE5rO6^
zel9jC{zp}QHkr5ZmkiN4GYg$C3SW1slc~_QmxGS$0vf5Mo#Um{TG}18o_0E(b}LUC
zCxGzgwXED{c=Id6PK-8?D&;6s$~XF?vQZuK@DB8S9gaZX)6HTc;3)=AX#5j>l2vjW
zpGC|!7WB!Xw$ZlK$Y^!w=O^@8F4G?LKXj-|%d-sEz7T%a{?0@?@V0cIQ(LDWzn94=
z(7vOJs`{>zN=Q?W8m&`H?ycEzo~eant`9SP4WqjrFo>e;`bLG=V5(r?6u&%PoA4)o
z3>;KWrCxo>VS9yD?$Ux)^2TF4nNV18p0K0w*u&5K%n~2YV@}hMaS}Nsb;eSdjYac^
z5C=f@7X=_zoN;;7&2xZ#CQ0Iy*SnP9OLjhuJc?iKOGB3s-d=qDTkox{92v71U=9vM
z;?M?`15E9}!+)!LUp1zHemLEoZaev(sE($1UnaY)%S?*m5_eDCEzBxDbaecDvdP_2
zj8VknhM<cQ(rPp?hJ#5THj_=U8p?o$DlqFN93R833ICQ1ufo_73`I{BeKQhukADII
zS=5D*Mj;nIHLKTZk(Wpg$x}V?9VibR-*ttGCA@;ruVMR3sA52-()tp1CKL2*uq>eZ
zuKfqqJZp2?IFjG}E0C13l4ccaZa*rMI37pYag{gr*-5Up;;f1yAqf?V)Do0!-Aw-b
zb~hdbNRX0~>|UKK70V>hX!N@q4gGSmS#6Gv#y=ggpV<4AkZd7R&fxbZDoU0wSh?ct
zX18AC*$$q?U!o;HhQT;~5D(egXfAlhuJV#+vET*!WkF9~OEu>>&eyN>__ujM;1=67
zWpTdQ6=Jz6S(GI#6*12wESxR!VjYzt&qi#M@(7;Y34TxWF3!)U?{20Dim)tKQOWKj
z$r2&ULd>@%PuRUESMUaQAoFbzb66-LjK@buS+wR7Heq*kdzP;^dB(F6K4mgbIX+nf
zMlX(zwz6y7>1G2+6Q(cr4J|cxx2MvA@1BBBQjWl#kLTHDTYl5bo9%MRC4Q3o=1(7D
zzM<*%(|K0%VgY13eC~O67o{ROEtcCgjIb{bhj5WEMSSqQ-*~#=h5mKJ_fm;Sss1-O
zK4Qunz7Ux>1TSaO!BlkSTpqOf%Wa7>)GuclP;1h=Ur~$VG?Jj*pn?%;ABmwfs{A_I
zmMeI7s5+026g(}?N53C2_!*Cx<eaU_aw8|>ahWEY<GfgoFWy{@qq!Wf%5^&C528e!
zl*jld&D(6}pi6*MCQEkn;p}XBbHiS;pI<cJzCAs^_;5XixBnG*d;ad@>BadQc>5RF
zKB0spz#rJ-T~shM6xs5R3{B8`uqg>&MBB791Yu|*^n|g3UjQv)v@Eg&ZI4+`Pk9F;
zzi|=Rd|U|P?O|)ZsV3+pH-)&1O3r#wWrtwfxa13Oz==YJ^>An1BVhTMOZi@uX?SE*
z6wwZrOa(}kgdv|k`vVYPs~PT#d7h`Nw-QOh5zR%EO74#^NUT7GVMM<le(jJhFsg^H
zrP9veCKM`SndJrlh(?NNH!X_1kYUtLZqL$OZVP~qg4;zJxy$m66d~H^5nBl!G)TLZ
zF<y27SHQJIEVfxpTU&B8Lq-q>!-?S|O;Y-ZKRu<WFExP4g#OmB@kcD!pcfez1p@~e
z_}klSzDPMOb%qlL3eIr&{1vQhJ(?U?m!=^PhtA^oQ}A+IWUN}^)6buuzk)T+L1UvV
z2HfFKQYJIyYlU5}Kx+61T@^VHs@!RuMy&6sWPj-F&8)3y@bV?Vd;UuObz&*vYBZZT
z%>8;G2ORbM|IUcSwKU($4~H(_!4?Nfh&!(Fg`hQBd*)Y}Jv74fK?k(j5Wj$kR!X!h
zG<MCSOfpfj^%i`|9E=X=qR7y<EW{G@e=yW5*#*m0k>5+^2P^D<R$%3vb=2Bm75I8n
z?tGK4WXlTGY(}1}*v91`V7Z5Np~6TPx#pTY;7%<}84PQ3M*Ahg6YxL%Nm1a5eNu^O
z-O$v<%5ew$VUvP^9Q6O_j}#ntU9)z-@2vb%*~OV$iA6auuo{avdj+QaMt)=fRKf)s
z<GKL*!@v62RV$pT;h}k71C+FMYY@jmB;pyGw7@cyF-)~`-wxI_Jxz{zhKZe=fWr*0
zt^qod-lk*c<Txd}v#yhI@}0*u-Jom|{;eaCr8@>8EI4NhKv6Tu&1>~I?$n5|ryjIu
zLaSd#VF_7vyAE=_ilqk5=TMN<vb;ago%h1ywEL!=xi+2g#*^W%UJYH2G7iy87+y2H
zXqSVIFshw;6-xG#6V$X2%*Co2+$MZ~<)yUZ1KA0z+ATajrNA}YziQ|hmsG=QFCs3(
zh4!Ob$U*iG67Z!jc!;I*cPE|=`D$W%w&L*@$?jJi&@DW#gbpc-<|*VGfN++Rv!emq
zqJRVw-rk8K&oDc#Yxm_HXuU|d+Gm-w7}uelKOnRnm31_>6jP(zyQ{}h21^=v#WutA
z2dIv=B1;Ua8WS)~3CUu^%)HiXU|8R6N90s(wqZIngocH1sb~zNtf3X+ug&7@+Vu$H
z_m*X*4?M<Tu4@s`zOI3*IdKx%2RU|GL@~xLafCI4UA{#+qw&=Oi7}Re5J?sxYB3N%
z7YL3aa?m5e?TtvJd6Zz>q+$$+M*ueifh&B$w<ttLv?7L0iqj|`xf#XgI}>kN44BER
zU>Ht;sb?5L7=Ufu7C@JuQKC4=;SLZ6yzY@$fFq!dRSxh=527R_9u>90-Yp${@(L`c
zp)&BK4iU>97WaM9V5sJog&-%zzelWA$6>vk9@M3lHbKFjzmGxx@4y2JVe?8!d4pG0
z*{uK=#Uw%Kw?_bo8Bj->S}RBSD)z{yUOoZY1S6qPszs?dOotWRa^Aqf(3}dsrH(5Q
zK#q~cCPgZNfzwbO17lzajk37oFd>r4P{CST&^3_lwNPn5!T-4x1t1yeqM+QX+6MG@
za5F?=AP7+6e~l^7TZ$H?HjD(Ftw4q6oTK&I;_J*KFO9Jz2++1WRJ%ugh*+A_Ie@7c
z0wYU~zw?aK1oOrKQ;d-LnoLf%1l{34Fi`M0qGUD(n1Y1?%aS?!v1F&M<eRX?M`iP=
zJ(<i!mRQXT4>8-{ub>r{Ka{K2+stEUlMPLqiJBwGbCdlAEE5pWxCAyC?K9KswiB%&
zm|SfHwB>G?fl5Vy*K#|5uGGK7?!I>fa-WH9o*^hRtJsZ9L%bG|NWt~|x<mJ%6dVwb
zqcp|0zrTiGUt05kuR-~!8)Nm<ZoV^8fLP?Qe4ij?Y6f~dW>JzfqQsz#*Tdp9FP7Yi
z0$WmfSORJ2YS1!5pY2%<x#6)`zz*%w<NC5?v8!hd1n>DPQY?*?N-QlRUg80G#w#`m
zFud2uiZKIv(wVS@@_*&<dQP2Csaf@@kqlOPY#3-57OIClsd8_(6duC<)(FcCG(eVe
z(2r9w1EHJgnX?k7_Jf5C+Wza{gh6Qi5DWvS|0XK#MWzY|w^zSi%`R`+#uH`K{-3|P
zFGR^xh!%c9F#(}?1?Gw3yQe|So>I67p=5>yYmxFL*dp}%COVSa%_c8OWzzo^#g{k7
zzl;s+enWL8laJHuUoUUY-~W9EpXfjMa~de<5OYJBt^0F0Ia?NJJoTR_1j4+Bb#a9b
zmb)VkK&o2oK&q*_k>M@q=|^77b1BMQvtYMJ45%6m+JF|s;>@n5XBXOsV-lq@z9?IA
zJC392#<4Ej8}+v8lV1<f)<($lDpU*98jW7-n5(JP0r+4f-`8ug#uB3N<`7h6EMJR~
z`Uh0h<L1aFa`ip001J+uqL!+t1<y-%pKsHITpN+dsh7cq?>RtAvOc63(HHPm+gj}E
z;<tgU6F!by_z<mvWff&#RxvBM%$lz`4$>HcMswy3W=k#DAKDr)Ns=ClrHSUy23PcG
z85%uemGjUA<Z$Il1F534`q79fQ6|kQD^@<Y@=P7hc_X_-Bv>r-Kxs%OZ0K+z2FoY6
zLe4-w2M(a123G0Y?fcz^liM3eu&r6S81%1IxJ4NXM&D1L$;re<FHh|Wg+9+H0Rl!K
zBOLft7c?Nw2kLvLO(QHe%@RJ}E@wE$$MO(mHF2PvWx(h{#2yHC!UllG&?Do-9OO46
z;?o2Y30XC#pjqj;f17f#Qwz~8Ejr#A@Z;sNj-n{-*8(`~uDNMAd{FDIv4LK&cgDjF
zV!pdvB%KlejVTk>!+NqZg?6~1QlZTR7wUDDNQ2K!MtDkPvU_I*og+9geJJE_1kCE#
z4C8IG?dp{K)IRv8B&eA?kTSL832psCq0s)YAl@VZ{;q&&N+D{oIvE(+wkhI*W|?FE
zhPerxfxgx2DkwEg@=x3fvV|Hprru!}jlm3^tjxgACMhol^#f>N=<i<x;Y>4__qPey
zo2}`@nUL0&x;5OSt?LGeUVLyAg(W%QK^sco+)79QYFiELsuqszG2<G~YM+ZDU!NI)
zt}`ig5~lYFzXK=NIH=92{S9-s=IMZQMr-S4RYQ<@cR-cbbY^OaKfOAqOj52W;J^`c
zs>oFVON+v*P8gMH7E6hlxjG}r89g+o0*L8pcqdgd3zN<oyQ$vSF`y6*<f2oDJF?(9
z?&^TAUL*AtuW@D)?vQxg!C3gPy>l8xN~*O_4(wrX^>$gk9qxw}B}old{jAVMtpVLP
zftH{xk#}Gt#%3SBd^MvUa<p%;u}Y0#VVGU#p@(ecutmC@f0XIQFHl$;)K`Tc>uy>r
zZm!pC^>hx2X|+G<m35~vuhRuOs_Qty8nhPK@S0E>oq+q;k@&1|cI4vz4Tsi`vfcJv
zw@$#QETed(>ev*JogH|z>q`Hm4z|Vu|8TdqpOX_WlfneKX>%U2BbCgPpTK0k;Mjy%
zaGh;ND&Wl*!QC3*XCU5~g{VjrdpiNtrpWKip;KOnCAxp>>HGy$94t(-oTK}>7t)rr
z0k*0#P<D&Pi4OXV`*huFZF~P#KibOdCR-lI^2B3z>j|Gt6VKcuJC*zC&Bb}4ixtk1
z%Q3^FLEz6EqM#inS4(v7IYs)akQ15XcGZKH7mXZp*eYt2%|(^dZwWg9b={k{#vluR
zusmapBR<qrGxl~ext{*_hx6;{8w^QmuP(3NpI^Q^y{N6S77xHVv<{~G+U>+viS=O7
z4vz4k1ID(dzqXu3op5;jF<hYu-)!g|H|X^Sj_6oMQBzsHQER{SNE60VMYl7xIE8?5
zcCoP0kA0#MB4kG1@*}&Z>pVlnci-?G7>WE?w3-!<PPbtsUpe&_x$l8xDN0CPNfON;
zazq^(U}_ZOBEvecOm+;&Z7SBHRCe$W-QQpX3p=j9qERqfQAZp~zb-RdJaTTDOeP;s
zFFs6XKPd|kWlfMqZbIs0s#3&It6M(kcbD&`kJhO3g^N9ElTbsE5+cKD4hSz~cHg60
zm!^x-)hyjhY})$`2aTHjhZRqwXyse~ZKT_v_kW~+KOVbBs-Z2n1$w=^0s>S(Y+9P<
zI<TlN3P$>LRdsML%xu->gep-|ptDB3#8ZP5>oSwNfD_#`B2_nVf05^tc~sa_k{?ns
ztGdrk*SXe}eMto2<Vyb@*))}Uud}&6NcUp*vg)?fqq*swE*-+w1;ny=qM}1N6UI@u
z5Jj96?czSMy#;=m6*SP1ftHFdAOb9j_&Q+LACsY7Ifs3g$h4t7RIXjhQga?jNp+gw
zw-O;k4v1&Ft`_;RYjuUE^<sv13(QoToFbELSg?H4W3hNgBT^x~Zlv#FiM~ZpyP8I2
zq;8hjv3k}cx#4!K2K#cW?JKN7YT?m+rb*SgFCq1|U=Ow>wzbV!qrXT0TvuifWWwtA
z$f|{VccI}n_qs;c!S<5I70GYWjsv#Zk?DK4zz$HE#$~GxCeVe6A4z@egde!KF84{j
zx|m5rzk|YE`{?Z9Kai#hz5RG-y9#b0gb~&$(kM1fbI%N-Xyl$Tr`yrK!FXt<UPCO3
z#ciiQ7Tis0+D(%kj1rh}@2@9Z86-OiU@km03^BbF@&=})+|&v}g>XFl4^?k#bG<Y9
z9`)U>@-*Re!RC_}CH8%i^+zplE3!F5K0D|uMsRh=P+vubmj0vqeot6$b~C;HIKBSV
z$Ns3B>BZarXEq5wKJK&raSiI{rnCbaW*V`9M~9J*u-p8gSjbK$&NI(swANLu4KO$D
z_L%|q8sw+X)eXH<w-_CU^}_>E%u{ixM+Bng@}0mgA3C}<xA5956om!qO0|86ZO{?6
zB--r*66$kHO5+E#YGmzv0v7;iK$pJ)ioVo<y2{bjwMc9UA-Y%B2~jG|fQbV89X553
zT(n<1(u4-O5`LYARWEV~KK2&;VS=h6FiH>IGf0ei6gYZw2kJ#l9t(es0a;ny&<ZPp
z9wx&>LM0%;jRrDsQPAH3&}wbJ@Er<(8hpa~^q~)I>|-v`uN|p95n#VdbD(6f{)A9I
zxAnLAqbMj9>#FMeOtNRPYOK=fb@0T>Zcw2+JRrHQFW*t~a{A=xYYiBGh_G!2+f({!
zN)c=U2t8Ea%M(sO9v{F&N%8@gv=Iy;&~>);1dTSlElN2<WCm)AN5&>Y)V^M_J;Yb5
zcbNnAy${NE(C2T|_b8=<b3A8Y`nx2;8F8!76WtC}dbL95*-~UKW7_MF^Ie#^;cHjb
z4{#~VS#^0-$a+K5UYDcq7#fUJ)!hfO=b~u60zy^0fH>9L3aX2)H4!@C6o+m?BIOIg
z?=1FooMUeCm2|6yHsnx9@9dbp5ee0#@JNT#kq%xxfG363H+{p-jrwwBXZ3YG?~VWc
z1zTw%;o2=}(^7UqCrdFods%^WFg3li9w_H-uIWv)-yCp=rLsgPW9MD3Z%V7aW5A_j
zwnB1xUVQ;X24<ALvw`Y>cwi`LlgisrR}+0rgenA5asKJ#X`A4GXT?r`PmC2=FI@4Y
zHe~(45HDwIyrePckN@%MAGedwfBy5}cA`HGf9j1Z(zl9m+ZLKflC%|bBB}S&!d&(L
z*Q0*{y;^H?;<_3B&aY4ydTeijwEfTz4v;0p>7kQ_93XoplVm)`mO)*xsbrIIn*8^^
zl58V<A!KJ-&rZO$^y+!<7q)Y`S#D~z^Di~@1<jU(A)l-;g3paZBNX~5T4FTat^F|A
z!87-Vv%qaw%-8F#fo_~R!2!ApBOJH{Q`GUrldnwfX}jUNm#n`DsUYXas}*v?&5n}A
zGD1$^p%rm)z~JD(59!*8NEkHHW`!Miwk7yQ?7JNftkKlsqy)-n=|t$oVaOvaqGTRN
z*h4QQTEZLPfQ2!2F&yLx#OJkI;H)tNCNhqm2H|=W1~`b|Tfo8<=1<mu=%QAO*$3+Y
z9|x*@9R`~?y7-x$(|EDKjDKUF*guXVIPmGpVaxqf`S9~p@)U+agsBhG`iPYE>f%kx
z4;S7jjBdg>@Uj=DQ^>xZe7cai{QEO|#wP(xL{tzAc#bgb3D^}ZC37%Kuwb;I;g)zL
zSO~-2I;$8n6oulBEwQlwRNARKeRbk!344DJ!H_BPF#2Z*1UfI`{;T}>S36ksgf;sl
zaDdFpVGJdz!-@P6eg${*#B+XM`%ewQ1)w7AawlOCxR{F?9`>Dh6^+0zP#0-$c7h6P
z7sq#8W9CvKM8`J@i3m6e0AN*$pvW#_dsByFl5@z`i7;xoIU8j81%zGWdAxu_eP_jR
z@>*ztUm!&YT+SLflsdZ(4-3JfDW%kscb!T*@AXOmpgsgACPJa(d4#`l4%i9hx~7ag
zl3N~V5Co<lcqhW!&2NJdzZZs(AU&6i#dC;#5E27dP_sb=0RWBNNEbYmLF%H%XG3h4
ziWMR_N9!1H&Ozdse}EZcVQ(N1FlCg{4QZ2O5wB>t!8F=QU_9)D8+Z_f`D&jmVv2Pm
zJEFnEYO7a<rv&7m(W5qpz@(vW50ynI(-dlXPIM@wA)uP3Dg{HD;(IM;k(tO8s3zKm
z#LG!Wz|QXY)#`yNrQ_?G(3sXl8iPMdNHERs{o8xXo>;%#4=2_&te9oq8|^k2>2<A5
zfG0>Wx>j$ZIuH;#vqA4nuM(GGw6(gS8P$*oN5LVH<B-r>+1ugN?oTHD2iV^aBp`0R
zf+#rV4@k5~$L&QM4aVQ@?BB<e>nVb`<Iu(SC@eRoTs<6^dy=e3;NjP_h^Pwy^#qW}
z-TW~SWpFr{9$1|MYrt_Gg_Bem9M1G4I9p7a@K^~*4M`%HDTjSzb0mOB;H=0WSU=1>
z5TW>e6XjwHYREW|ciY5Bl(0rtu*KdwR9`?K4z{{BefV}W9zEDxF1OZfI3C&8*46z#
zG^2^0ZicrrYhnY#!|VRcvaiPDTdP0%&};B3b|ImB7QP9rM>!rMx>N3wU<BttF5rRZ
zWeEkMgMdAsymCXk8lXAF&JVPNFf_-Qi!-937rQd{lqJbTMJ#_zBUNfQf!^wY*zzWl
zNJH62e57Z4fB7Y~4UqsL2xafUbY9!S#(G`NFp7L~9YR&fpe_as3=&lk`MNg9BhRc4
zEIkM#$by?qNV!V%`kz=GEyxzbY4u(g&Z{Ge{~Z&GJ%|;}jL9M!dkb2H3q1v5C?Qo@
zC{@_%y-*V2Rgf)jYv4SP;CWnAs{MlSk+X0>J@Xx8iL|t-?^o5+?BCYP0Z<&pG(dm-
z+usX(ydSP_NcETNRK)9?D7ZS$<gUDqgoQ3?_<{oHBc3L45Ro;`>P%gPhI*?dHrG)o
ziy9@Dw)2POz{<1pVV;ApNC1x#=rg*!lvT`UA!k-L&3j3~xOg$TgGNX?l!=6`>Dhbv
zKpL4?(L_I$(Tw9FQlul|jUpTf1fp(LU+YrsIhqZna0CKeG^PEMp0_^5Lmmrq*0g5v
zStp5IJ+18lJY9Qety>=Y)g&g<Kw6#iUg<X8zV-wQCM-c28NL2i=h=|BK#i$+Zxb?6
zQyLW{;a^*qg{x5zV<m*7?l(^%n&}&HBe18|<hwO_)Oa<ZJsXure3P+*m7MWhP(a!i
zWNL@z#Y;fy1+KDWQ}pqGj}E%sZbq`qbrgLAtD`XMN_^gwHZy;L5Vj9w{mo{@)gvlO
zUY8c5m_i%kk+MNIGN-_0>?nqt_Y;J{|2b#HlX7%gJsy)1JMYs)%q{D?=qztS3e}lp
zGFLJ23({LEE`gl4d%A(ny4{jP;QijK1bMxb;@J}kY!Mp@9G4Sm9)jqvh{G`B&!Nu8
zhiCl1wF(&sziv1&1|4_=g^_6CpiZv4j=RLrsdQ%jt6tsUrHW|d36*m!(dzA&VTaa>
z@=`6J)k|)q?qru|%d#)IS!24u`eTXGo~xu-jKIRO%H){s7sn_Py2ie!Yq>#RoM4Z0
zl6Y?hN2O3EXKv`ZSZ|uMhdaw2--)_*)c<B>{(Z!zX3&4>g>tOiR0ey)NRqqMt)Gk|
zm0<q_huFeSGQL3JP#Og;hOXh(`D2%kSS}A0kp?pZnfurz5=C`YbksUzxx=dEs}w~{
z&ujmv1>{6j%!%oBD7?K_{m&&PJ++v7%7H0xPBI&L2v`5<JEi+oWqy7=m#BbWS=!3t
z?bcbLQ$uf+iRX041tPn1Im$5$tifZ6z5?cZg>7ak`?&-sNgp}r{L2^g6}nxemMiq0
zh1xn9o~a=7#Wybx3(t?0hDlwc6q06%xJ2J5!-$xB9k_1hkO$T1$H}bKQU*!<F0H!P
z&PLBVb~qPErCn4bRMNr)dgoP>gjJCWWXCHf(Ivozy?qk5idwX(g8J#1=zv&eu#no-
zO8*5@oDP${5{*>18e_HJ)m4tmO3ZfzS<qb~{b|NqFNcrv8->>FcrVexl!mlt@xN!C
zb9q-1FZLBZ{-AW0_LeY`Oo_@>BOAsBJ}RBWco<&!rg_sJ-ri3vMFjiB2Mee7gMl@j
z=0-|#BEKKQmUeQb<0ZpHxpn!eSTbrHiUDHj7$6-+DjG~0adqq48#;6Ou-5j-f<R-b
zzAcFHlrcd<plnbeM*Sqp9ywyLg%_9}j1Uwlm-NMj^2n#*dM2i}dWjh1s2GZ99gZ>%
z1*h6laYk2F&s8-z#qus=DD|A;k9Ro_DjHZG#c>-`+s2%rip}wn8RljB!`PwOl?X}5
zH~D?6G-KZox^Ktwb@O4%n$aqA-$WjK^(h`)sU}}2aeq{anyP-K{ZLtZa8(LYr;x1t
z=NRdw2V?KNJmhhe9wWd@mCT|0;nlpJA6z{CMXks9e;2SpBK&8i2=v5swqrIgT_e2S
zKy0AAwmWCOEvu#UgtpcOj<o$y?CI{;JKGxHg1?CjZJ<53?fpwWmACBv-JLbM&L;8i
zwf_R0S8Z?NI1v7xU*Y3eC8;RvXG+;cg{nPup(@?pN!<#C#0l98PR@4dqF(Q}-;A9E
zC(xH&R27nVW}X>8^Nch2l&vz$>K$3+h}^DXLBcqp1imwmOOl2}t|*yr*I~-GaL@nS
zi)a@X<9f$;$+@?TDI?dZq|A>gCxcMk`7E?e*H72OV*Po_mAf!c65^-XmdDXb5|0HW
ziG9ih1ZH8%*Pe`1)*)F!J-D}t>7%l{x;&dq=M!|LP|B4j$)hJo5DUrUWiDwz9%H$J
zCy;?ibM8|J6ez?!%VOS|3P_^L=-XMk&QeC1gkMag3B@~WKy+eRxp-q8;6tFs&r6o&
z^5j=6=Xn%SfxpCC_9}?}KjKlohG#!va>*p+A=Ka}Y-Sk(d&^*!OSC91_0_wh6~^zh
zy5^}*g($yIkim*#<9wY7MHas*EfGGCGfBdNetyn5I3Z$1lcePGXD^p4Sny{GEaD`f
z<d2j^Wbml2KkKjWU6u?LmBN^Lz~RIbLdD!|WWgUoe?UhBf)v-*lSSZ@acC4Dc`78Z
z+$ZgThF+e?DNvJ~5_<>RK6%|@Om$wEAs8YGm7Yp#KYehg{pCw&Ht0d-tEa_6>NHqP
z+A)50$U%;hw%A>`eX>d8K)Kgx;wKJ?qkS9?*SU~|bxGMfFUhF@NpNh1*mhmR7(Zr+
z<6&{3&73xN`0+5J;5N%r4)vL%7vZ?>N#*6)(*GNUG;(KQ9OaxkZUcN9HLBdoQ_^0{
zCpUMKn|u5E;u?Nmo!bw)Fl}EiEcS2-qJ>K1m`)5-4d0(R^^(k!tNMEKsb5=JY@c#~
z$=6B+<)QL|CYduB3?{P+>lTPGKrtPDD8O|Q(uYBBNQxUIsCwlE$`DTf$zx6fOQr-H
zQLlqeNsYBm(ND>iqzwK+`YY2HDsj0-Zr8E~7$4RT=bFzk17atM(tPW9{{xUMYsYSl
z3;=l~O46lQ!>z^w=Ei|4IKZ|r12pWuu3w`lSm1@KjK=*hU=30tDJ4BB{T|+2>;iOy
z-jli8&kEd(t6J{iOHv=;RhWu-6wCKP85)Uo#Y#m|W@Y_;FFmT6icua{l+g{y7o@E=
z44(k+zXR{leiyZxjc-H%Mf8F|&(kDkkcd=HLE7+epvv3&uh&Jy+;1ru{ez);Nb#Ob
zd;2k~c;hYP{|-uMPK-)mQ0ykAlF_=qy&X9m+KsveG6Og`bZgr}H?VcBw)156;Iqj!
zv~<zX!iF=u(QWi5RIpUNQtUdUHoyD*+4b$^Y&yE?5c{_3NV&~Q#4QZhayu&14T@lS
zIBT`%7n7^27UaKyCmc>dV7jD8fB;ok)d>DrDoGS?D6<a$)Fa-p1G>y3fX5)~0;GP_
z@86BCzD^d?*>r*+y*O#kS!D~XkBk5(Z%8oxL46plPW^0B4WGt&fV5L}113()WK*+W
zlHp3cJsxfBhx?BYuA!#poPv2$FU0;((t}4r`eR&il}3&kxKlwiLg0r}nR8H9nuPuS
z{Oj4-WIi`1)h-Ra_ou`F)uazhhfjs82*#mMv(ItsBdOSybEN$#SuDnvH;YBr?sdDp
z8>+ifnB8c1b?B2?X@0}DS<oMF#1>A&?V*ufo5q;M%agiMA+-^@cv=CNPl4ly&y&r_
zDtcjjTK-aDC!D8TTbmWqRo{!RD)5T)<KZKZB~6$kG7cOJ9eY4A!f;H>bDG+})(6q*
zfFj5Ks%*ZhIApo4-l_Ixud`dGo{7Hl<#s`8pfNSV4vE14-fSEjqO{cgdU;*9nJl3R
zjD%mvOgU5;1VxUWm*J~3K!HWnkpDd5S32l&3UYKgKHNdIgdBJ`TyUBtz#8Y?etIHj
zvoBvp)A3?D`Z6KU&j1DQf<nweg7L;fhuk-sx?=Gt%i#R1CW_;#J9m@|bp>XsS>PU=
z8GxzmP|KLKe_0eN#f&$eq~+Pal1;Pg`vl*9S=5lj!uJ6gRP(}qKn<~N_h7s#P)+D`
z98xdM%MyLyrJ${3wU8vS6{=Q}uCqlDbH@dB65#@b$cO;Cgd^oORjQos36e~6e`PLc
zz8ok}nSPA~NQ^#`;-wO}g2^L0jzgqt<>a9pkLLf6rur5RkB2;GPF2gQemK`Vq`bm&
zm8*_xPQ7+bajnx@+Zp-PcT&9&<L3z9Ff`3n!25^de(&&(A5!W*@i_OkhZ&|GE!JLU
zWZDj!J5emgQy?C&U`2;~yB^(MTu#qti^*TNlPR{JnNUZa@SV3O*OBd3$v<2F1D#fF
zZ`wK({+?fPK2Q-V822-!wAD&=kt*2MZqn7=RGGv{d>8D<c4*PWf4|2s2?>SLEgvB9
z@p*sFV~?+jtO$bPc>w3|m@x$j%PHW0L8JzefX*m9Y*vZj8(fQil9YbH&1QcX_27;y
z8RhUvXv!l-C5#iha;==she)g@e*c}2)?8BNIYgq^NS0<A2#+CW5#<UU^F+uM(M<3@
z6gefhwr2F%>fO&iPUjC(W6DOUGos;{D2SQTk}XS3V|ZpdLkVV}L@6VRj$#|}FbFtV
zQH4p=8GZjKR)ye{YkcEM<kYOJFrtefDAkF57@rBW@jBy0sW1LS^Px;rs?3`@rGHCR
zBw3+_{C-muSUFp+Y878k8Tgy#1(gjuZsC-gP0sz^$h2Ic>^D?qTvM4~?SDgO@vd|h
zr8XMwui*w!ZDD7!^IbJaDRQz=7Ec)p0PzL{Qnp4EM{ZYz?`u-(48`xo_%MiaqEyQv
zeL<yIf&UJE1%OW>*_vnyov22eS+)V2=Nx`rGoDe&bS$E+UmSW}j3Y8oPf8w{0%6=d
zVQDF8*t1)l6Z3S;Bn&1j<wDYLBxkV&%T!7sRoL@>>z(zNc?J_j^&Ceg?3zk-d#|Op
zG+~?>i{Za5sd+e#Z3``7*Qfhr2C>_3OGl%{r^nf1eskZ4?qf!)Zh+tHgXkak<KPl@
z9fhC@N22LBWuwuzoBOZRr!UjbUuR#Yx89Sm&;h3hp?=YQcv+$9f6DL>LSPm5Ob94>
zR|JwgzvX_um`{ysQF+Gwb-IVr{Bf}M^}vVSTZii=q`kdEZ8HE3$K!E#y145GrUGL_
zypywP08Gix#zVVU2UgF{vAG!;H0@b3TyNWbh8(Z7w;2Tgh!P^gf#j;LLOqj=gTN2z
zJECB@fl@J^+AU*a8v!#J44iyCtX4p{I=>xArFV%vZbyY3@mX3=MrO`HvL-Ai%e=;<
zst+eaO}Z{%!`O~Yu*j_z>>6@m-?nZDi*kuvz8h-nlP8U^B9n?Pj!b#gsLKYgG#vaX
zyU-UJ;n5nlX&gGteD`6GccJ6D*&AUS_1l47U0qg7Db<a`EbI*?$SiT_oH+4e7U{J}
zEVCyWR=|wp{sCwBZg1yc65CBn8v3~VdqMW0&1@CBz~uxQ(d}{1-uxOuc+z+l98)ud
z(a`zPOsd3-kq+BYHRY1(QgZm~O*BRBra{BK%SzqGgI5vgsNDy4bS+rC*HV^1-KABj
zwAZe>g=bDl72f<_wXI>pHYBdQ<=c1oauXf_Ory8fTqAJgJon*(35k?s^YoK$RM_xp
zP5Md0qp^jnU72@Yw!x_yxaKx0P=VuB?(c@}snlv%V=i}&JX@vNdW>v?{{g*NZExE+
z4F2w4!2tng54rYxU)By?dn+(>1G>BWGGI_;CK2jLh9tMkZvF2^$#1gb#7XXU{?J&m
zNIoPVQB=<^@<kp+$8REd178-xz)WNa^qVtnLCwG}5bjsYnUX7-<Bx2PN3__jk9h(&
z>_MP}&&s0Y0yUh?{LG~(WsbO7zOB~ZDDBnFiYx=J@|70zg#{*4$OK1e$grF#y<}D>
zIfXn!MsrUBpS|42+pFul`)jAlqqGZV;h7mog|S*Z6c$r>7Ir~j$OEGa&5;bH9`SJ$
zNw!2oPBb2Uy;93uNtBk}q){2VnI$1QjiSPATlX%{3A9IgI<nNwWaw4~ueUNU>_L+E
z#e9y&y_qrj518estDk!uwdX;Vf8XOwNU@81fzYkAsAm-5F_}+=bwcG&AVo~{RJmk@
zT@YRF1Xmel_;-zu^mCS9TE2Kz`myHKaYQf~(TP?W_{e^&sssXlCrYLUs&Vvp1oY%u
zJTZ$f;dP$F*^39IGMET+E!jhcjs^a6@j$sI-b(HQ0^h!I^26$a+t@Kr&SB!XH3g<M
zTfu~7f|zTjP=8I)a4qtZ*R_!kB2AITU#~J{3f+RbVcaUcny%r2b0DjjcvPiB?wL5g
z|Mu3Py(1K{$C5N(-Qz#LD^bNYyn!Vpq__b$u;hK~N*wx?RKW@WRqhb#o@b~1m7#}W
z_}!A1;UtK;R2u&zUsAsdueDa%#K{RfDUl9GXpXj`L!6M&4H~wZb#ZLBejL10+JnJ4
zNGfx~Xv7TSUWf$oiAj!BajEjsR!M^O>me=k8Q=(QCvA9N+MJYXPfo@KH+$X`lDK(;
z$)bM!rOvjd1A}9ZZV}qVs+xO_NN)G_ywPY2E!Sy#aj}78t-h^xbs^(!38j7D##87O
zNth@<LHLBUTj6z~I1{zbTE|vQygYI+?wwi<vcWS6CZ-+iu^Ss}4aQK<7&EWvl#e;f
zG8b%DZc-%ML^CV+F4k)mrDRab!iaW2_>;;#bXp0Q96E-oiQ_?(OVo1=wqAR}#$}l=
z7wEaE%lz)a+oHQwI~v45${%Dud!2wg$LjZeqZ=X$wCob;KGJzd8v*IT++$DlRE?Rv
zBZr^xKQz9sa4Q6srj*EHN%gJQcn|}LK*ZhZ;2CT^=-cbpQ&@`cRIywZSdrQGq}n~7
zA&v@wH$LrkI<<|1(o9A^m2F1X)pGQ+YPAftiIx|(@%w*|L<O>rLk;LxgoO6dXRSCI
z^F`PUo4{B%+IL5GG*v1N1m(`z28=st_r>BBl#&Nl1h2uHbtv}Rg{AD6g(_Z{{u@(0
zC1W=4S5oChnCgV^+#;IJSZ44*1dYm4+i1c0!_bw#Np9gr`|glZMJ0P+e!ULg-usQe
zpU<`ME+j(TsW)WMSBd=@MT$xdV^$l{ld5+e=%8P1ZlUYzW50>+LhRgk13W%&!9}fq
zbL;i)NgOoYla05LCM@A>66W4H<*F^bIzJD>*mms6+NEH_bzo3-tDnJDxe@lmWZSK|
z^{JW}T3uhD>-#}99$MPDNH@yE*-pTYkKr#t@v;l8o?ZCdzr-3k7?8@+P;2BiTY>K<
z=w|x^)1v|Z*ZQ6{Vt4rR61_zK0Hs#TZreB%-RmpvB88;Dj%V#SZi2?a7zpf6lNK0E
zih!0Vn-hr?NGgd@_}}M})VogXcC@hhy6<xjIr*4xa?cx`dT<K&8>S#(DFyt`iPRtx
z&>ISO+bj`$i)+ynS<^E-Y|aN!2sdQKD2LBNQywuYVUpODOXXzFB9TqY^EX0TbxDz?
z5Q%&%*?Oaa@EB4SQLfN1PlU{fW`YkOPbtB*XGUMF-0l3+Y;iX;s;rlKLo~b)1u;`v
zvQ?pJ3@=P?a0eq$qL2|qL$URE<awNARACTxL=T@tmJ3d~#t~N{rDi2VkIp@>PzTPT
zf5y?)aL)5WpZ|{JU9nzMWk%|d{54gPWVsgd;VREDb2eSoDh>}R_>-nNl`TDP;gFaO
z&i!7=b&=uTFNn;!rZU0Y|ANf&sBo5rHWKcyWd>1gVRwt@D649alBZ;=ES^%_Fc2pQ
zNAgTqN>-`Ci#>{+P{NfoNv@E8NeaEe?PJkD@}iU|)p3Qsq7a%X=iUzw@UuRf?-YJq
zGQOdb=~zU&a&ct;bBP8cgZ8B0k#P*Y<_TLDk_MqY;<TCX#56-aGv9Eks9s<%1indu
zAO5_1O%ukM(H#8K*)<=>e(b;?@axX<2i>jlc=`E$zFb`04#2<1Y&Jb;Mt(SWTfHlP
z;7js?YB{pTpuI63f4jQ<I(u9!7c-+=fUpn%JYQ82T!2RyalG@MoiDS$zRthQuFF75
zV@?hN{i+A>nxW{w%8(bLBa1`S=i|;%9w<cAyACvgswb91Z2Nb`_`1gIgAb%kyz1Nh
zzPHRZX#~CjXRT=;C=5*mlgY%NEpL3!<X~d>ditRhIx`jhFd5m!P6d?hu}b&YL)|@5
zb0<8u<vs6jQ9wjEiYiexu5HLphZ0aZjab5>23qeM0F6Yu-%43iW2AKx;TQz2$+FlA
zR$C~PNxV5ZF(xqM)8WwVPe#=W2v@-O{i)<G5I(hEbL}hVR4$ZahMBa0HFfZ=sH;vz
zfE<Y`ZAxgiqH)~91;~PPD#L?*pz6v2tZ@ec4Ia+zXy^SezM`)*!uvYt-VJcV%zOYn
zGKUjanQ)A?(0zj2*y{@}Y)kcTwIDq2pBzrh)}cYEci>oZIK}+7?$jV0K$re1nt+RG
z>8q9Lkw~xe41qmr<omb848iqf8b<92?IYd3u%nVUthvpW$ahRpJ&{xwlEWXJD(A%t
zbJD(T?7M{qy{AuIzr7C|I8n_6OZhBV+^Z!^AgEl<3Z+ZwD&}t_EvUkGWGDErrNEXs
zt}#%8V*fiSc%$eo#8`DLuaO7c#CZ}BDarQniEdTUvT9W>DhCy6Y-hO1a${%b9ZG?#
zUMm3=)_#iq=yo_1T-`1h&5dKePI7i7M0VbPja1)H+b|G*&tGv!l}He@?=3A1)J~Hs
zG_5=$A=kYm7LJ|S4keoUzwhiMrCC|Q4~gyj_1)cfzP>5*GKxkQ5nRAyE-a)%BGA8N
z#(_@3<p`^~NVTfzj=!)BhotQFW1hf*tpzIhsU0dV(7<&XZf<R3GvvCMwfYNfg1fYm
z61XmFBeL89QyY+iqp}oOrP>tC39T-nl*s7rRp2(*Eq~n4A69ekDxh>ZbFgI=Ho`h1
z)|JBzY=z57LK#?H8IBZa6A+K0NU;JfC9%)w>0TG5R;V29l+_abO+knzQB>Jedh<7q
zrN{ZS)S2M><K#bfOU+-xXTiABraq~+A`N_6NZN<(7nE06urjAzYd}2>MZaTKaPXcW
zMdm6)^`}1YCQaM*@|IPOtl>NAG&NYmoeAB{+VgPj&$n5@gzS1cikxA>fk(mC5+D63
z`V#@I(uh~)5C$Rg6cqKGKzUIB=GR5Aw7@zv!}fmEbCFhx`^ttSV&7?%!NB*j^?M0x
zttAZBUcn2ekTPj883#dd)}ZoBq!6ER$*g_GHzJOW`=uL?gD^=BZ2WS$(OXc&#eT!%
z^G6M+d;tPWI}ly9Yh6K6Sx4NqjuG>{Qac@^P#xa&b9kOi_Az%+53)}b&ZbiscyeFO
zyye#+erp&&Q^BM`wy6mX%@>WrshIy3M%YzVmfFyq#YgoSSg+(;Lh<{S@nHx+YRxIz
zciP7vLp!JdnZ!-L`@xDEXGwB3<CLmHFN+(#+>ATp4BZ3WP#TjyGY*_z%^3e(3Bs|b
z)^XN7EC(#_mO)~HY6$sZHm!m)RV&{ejma+zFQE<8X=kNvXn3Gac(I8>pA3*`{KUxz
zBXNROy^`#GOg^o{d$P@U7ySi&Qq4{yF$})XQ~1E4RH(f}1(gsWB!m#<$i<WKOsvf~
zQIerlt9>AzgBQceKo1-?7e|im@5k9(1sj@Xy=-6!FP0PZ><Balj2V0n*%IsyWAEjl
zIr9exT4`~qUzk(4#g<9n$!8M76k*fX%r?zEE91w@@A_LG>$rY$4vY_n$b-#*(t%?`
zk`!2aA4kmW<qU!&)Z81>zV<!bU*A0LZpx_2GF!~B#{?ax9J!q`b+G4b^+gpVKSe_d
z)K$jorV$(|sfeSZ*K0opFC<xSlDwmm8I{pRF{QG;mrSuQO-fCt)n|x=CbJBXJtQ6k
z-H$6<oU+x*yZHGrc#Z^5EQAwmoC<z_-`21yN-rxdJ_79OAZ#6dvp8Zme;d$KDV4K?
zXUbEQRE=?}zwBxzk}9XEO-4N_(rd%I#xS*NwQfL6@fZfmyPwK#hEI#rbHEt!pdS1J
zeNnKHR9^8}m)NSk=v=Yg>Mtl<Fa$-Y8!X>wrbONUX;{_jXvSZtA8<1FDU&zPx{QC#
z7mZTEZrd;nz3VG@*dYxD=e`7+fgk}26v43ew(UU6v?Wv)4M}bq4Ey&{YMfy$+D;c)
z<Rkgsqc>khGb*)ODp<muu@O4!2;?3yB;XE`A-Fva9s85S^gZ@e2{_{y`U>{gSn}|d
z6M1bZz@{saIzH7@nupJ4{GLN;*G<lW=J6D4ZxWzy!C6f{%3$Ad7%*A(A7ONa5__<8
zEOj^6+uh-Ims=H<$zXybMrdtJ!8TK(7LGO<$%ul;Q_v)X+QN9Hl*fUhh`1>FvE^Z8
zPd>?)kL)N%24Qr=*iu+4HO2ox&-eNr`0i2Dn8nQn2TpsQe0xc(^D>HCHBQNhW8b*3
z9<~OZDBXnos&skP{eafZ4zHB;i9(m<{UhRf4y#`Z<dpvTEFl9Tpm<d9)j2+=>tq5S
zBfLiTj9Zm^oEq7pEZ6ItgPzhNuf_N9Asc`72`(-@=dm@U?<3gmFBhOk*=nrboMA9N
zpV2V8mjmiRX$l^mz~6tq$NZ50l!dgz5b(5CzttbLQ%!H$KoGtAS4<<C*byJfwGc{$
zK#G(`DD>7=XjzZ(D)z3myM~~M|DM^!xPa5-P<1c1XWowAdowfmTBJn~^sWQAh99Xg
zkcbR{o(0nuR01|dm~Zn$$t}hB6I)@Izz!es2&QZ)P{K@Elw6>OLE<ALv%k~jDj!z(
zsnWh&Qf3)&Rcy6br52csArl;>p&!dc>6}@iWE+YM8O7EDH~!xJ-FWgapSV(<rA?WI
z4Kol6W3^b87Gu~5n^J}p7*%SH^rP4_?gfElIT{jCEBZB7d7&gqOK;Ms3|%BAM)!)v
zsQW=s5`&r1E^nETc=UEBE$W2I^*!ptnuq5{@X0gB!dY;*@SyBel`^gqeb+MYspDx#
zqsLMAw90|OZ2s7}xuI~y^w6;pD{V?$cvMRvVVtsz+#6{3)#d(cw91*t4qfX7oMHxQ
z$tUiB$f-p+QFn-=L~Ts)5&)e-i#4+dt(s8(B+j&ETbK1UzO#b#xxClt4l$>BWO)+_
z-((f^jjs~mI}If63Ae^im_fa!Ap;Tn_?l%UnyPwl&!$|`7}9h~?mULYg6Ps<mE4BS
zo*#*6H)%z_;$FQwEjN*!VSNQ|8)lrqYI(P(wm8tPVb04)$P~4(vEsXTHLcKwZdc?A
zTF#^B%b{~;ghc}3r;1L>Ot?o!M+kRps?`Q0?dRVnH8j*@X_N4(Lcqmma{;lU_DE#`
zpJ{iySM7>U^v8=zraKyKsb#~&&d|wec=pqm`W^kdTTb|yTT7*~Gpj0g!kG8iz~$u|
z0=%{VPXPJz;5H#7=6*)srtVV<w<=9CHH%&F3ayiGPunmM#^2{t+)yV{#M<{OW1Ucu
zkQkZ-?-;6F=h9d>cI3OzW{B^;v-@YIFg9uPn?&b3`*+WCKKa~KO_mLhGB|>p$`F*s
zBFMK<fx(x+6~c8_m)>;})AwqQ14)kgx$eWcni+KP%`-Y}Fu+NfB4b+B479IL*ZJo@
zq~prgTF}1ff|*wg$`xRZMn`h7D}AUH8}E*xv8W{WU~rM@E-%g|SJ#txRHEccF)S28
zVTgm7wTuNU3|F!v9guH>M!Bd+#KSCesz#C~wjF&x^L67LI+j02-eQc@LUid>fnk(o
zE&WCI<~#aB`edoGiOp>at~{Un))m{0Q8Xi|^##b(B7roJQo$x9Xvw%aluEM?1_{`U
zYQ)O1QM}D2u<D1g-Nvi2YPk~qzpACF1(DIXO0`7MvN{C^v=bc9Yh~=ly<w)UA`-Xb
zt=%(?AW_!RCc(3f3&$9Q6SKz*WHrG&L_!sU>Y%snKw6I5sqMG~R)$a2pp~_1X7ToJ
zCmSwYflD!Z)@_wZzOIXhtGn8njFe28(@|BJPPJITq1Bx4-``IaE5^8bae6+S{<`tg
zGuW8&^aA;DEYe{xTzLKTCQ79!kK-yP_9A%yBh0+Fdk_J+4Ne{+A?N!<x2f>1|L-t!
zIeiai?cpAeDItINHcfvgJua?-Ux1Ux`@3P!NoK-vnIEn*;NU$SK;cDn=NWJ*4|{NU
zyk=YXyVG;BYX#Cpn_edyW&5&jYV!Xh;Z>Z!T(nE0^}3U3YkH3zy%2B<@s#}p#aUl-
z;y4n2=Tmg1sI{3*$jv>H5R%F!S93KJrjqPVT?LLZMu0EI<|LU6x5;<ER!cULFbSD^
zI35xsORer-|8Guv%lWd=IR4mxk8nRv1Wc2Z0sdb`TtYqtIcIRUUQF|Bjcf5^G-GYt
ztoDa-3$CMa!ZP@lOP0k6<8V5qm2;ubwBvknX7*p_oXAa!G=(@{u6Z(>ONg=wq)E&&
zffr}foG&7o<k=xCQx@UcDq&A_?#t)PtDCzkMT)qT^GL!|Bw&&V$&+y**#w>vImb6B
zfyfIUGrVX*93M9tS+rmRg{UMNT;_{qp0P~gQzr71(Mrk`11F6}Azs^h^&@6WwR3P=
zWHMQ>YT@LKlb^F?AqN+HwxXx~w$tC=*fhzK{qLZ^eZv&$nG|u6A<(!EV#(qpN|XN}
za0onzIV07S5R{rG%g{%nG|is`6q(`!_fH@v>OkNE5?MuQflo@U?8h<}`23_a^_bvF
zK2`KKHz-rXT`Wf3mA9Qog`6Xy?>TCe!-T=#^K1sEPxSp<|NB=vOV3EH$Vh}tr;!k_
z(H;qoq|q)X0xGB*e>MO=%VLZshkRs0!u>zKU5zeo|MvUWtDF1L9~WPKzk)6V5uX(c
zM07*~1t&WW_P^bK?%!;VX*l*fbaV05KBFMqdE};lLwhq+Gj7tmc(RHlgQm<M(SJ_d
z#kk-c`Tv|v*bo0zh130d$#%ZHL5A?o3>|joo<EeJim{R@GBWk~i0a5zj7u~IK$R^>
zQOZ?On@J{f&}_HO_VSdrHUXUdyGZyB(-h?CXbN!I|N3q8y?^`L9f)GN%(*NH9@|g~
ziD4zi;FHB<cvGG)?ueJru+$_A$F)Pnor_<q1A?VfBB)JB!@*`F3|H}dgnkhQ$6@cZ
z`_JcrXoU}h;KQ)j3fsTppWf-g06(q4r?A&;s`tmip?#lGV9P+LKAg#dXLM_)qnN#?
zEuq=^@R#AC$D&rz%eEFcQ#y-EuODMnMNiDsiUl6g#YilquaI+02GPQ3?qOJRYZz6b
zSujc#Vwon=Xca=%p0(`@P>bkOtCmN$`Z&@M*@T`<7Q(jzNmyhr72Vdp$~O2#oJZ?Y
zguOMbb)|d(laYEKZdB&(IXW})cU`x%cQ}G}eNXjGK%d&B-9OKhY|eNhCwcr*heZX#
z7~u@PECS6*^^B6Q@?_%Mc%)eCbm+9b+hVlIS;|&XCJAGb9DVrcY{ulR{U)@~N~RD7
zM*(!ZUGF@acFSUb<UKA;Krv%XH4z(|))BN*1_%ZWqXQ-nD>*6qGhZn<I~P1O^($fk
z9ZP?s*fvCYFh!+UM}$FF`K`n4A^f!kzrsU+Z-QWGp+d-*8*NB*I=(JVGPJL@04hOJ
z(O08nX#MgF92jbexFoN*=8T0cA2nh?Z*&7bvZLdQpNvl4K3~Rr7X?r3jrF<|UmEq|
z9k}9|$D^|-RuvUp`M-)s33?CtOwOxVK!vHLu=O5nEc1b02f_o4og)lNm<vZLZ-uV8
z1xH6g3woHp#<<aYiRRTo%WCZnaShl_%v7r+FNEiyCYO|g*kS1iJ`Hzxt3wRERjDip
zNQsyt7NNUAi5F}s4?Q}bv-nX_F1MHNskM$dDys3+ig<qy&vF>q<y!}~O#O`!x=a68
zWAs`1DWm*3hpn+DrMoiDmQ}K+sXd@@D{hM)EcaLx&mlBKHaUj`zc4q7um#xsHA@aO
zR%e?9Uqwpc2Z_L1rKDW$L=Uj33~RMJMy?)T4QCaR3i8*laf$6zzI|rfga?TjQB4!N
z*Y9Vc6{jxiJ#XQGZWukX^$7bc>0dR(2(@VvDs+IQ*rNV47kgNu0-!E<opoUl=h&5p
zPN3Vu<Q*mf&(H9>L59wWmdef-q?r9w@wU2O#V!c;L?6BPi3KYL<YgFTRb_=;^3Q}b
z)s*fZ#<or5eG)a?r|nw!mLixSiKJo{TL){_P&SlX4QI^&;AxI|vOJ5;p(05kPSLE&
z&QeznC1)Z4ds5P=uZ|8433kxYb?xh9XmGIk5Sc7T(2<6~4mzE{m{kFN;`e@KAF6xg
zen$6MCh$=YDKM{y_BP*Y3bf$@TM39#w7ba~5_O-#4lQuJCTYy*ig=-6)~oFddfugD
znxSglh)u7BDf_58d*0Pn-COADR&)ce>11`@^VMQ%maQJz!SR_24{pqrzHHIS?B->E
zBy?TSf!@2I*aVw;D73+rx>LSYX{`|0XN3p}TP)?;2-vEf!PIkXDynxX&q@)7W&e^z
zA>>^#n=xSuLpma^b6!n+G{O|FJ21}kwEprP1)Q#itLoFYMyr$20dU7|yOMiblnXmW
zI>I>FXHRkbvFF<Yx#iY7MB=%mG4DpIWyA&3m3k?I)E$H39jjjTUaL;j3ncm4%Wy`-
za%y2+QPOtFZc@w(#A=cUp+C)sCadXQ)U1&+A%Jn7b8)zdpe9zR@kF}Fg@lZ)7|q3#
zO_F`t9`o3IdC=*ptL;91tK(X<?sqT<So42>qGekqq`GnQy3)X#*BsamQxCkG<GoU?
z>>!<s9zG4B*Mk6Ro5WO&{<i|5hun5qHjhlN6gn*Tc9d{+d;OBuZGbRya#_pRt4!Ug
zV{swvt7zW!I%nwSJ5Snt)(3ArE_24HhhTn;Q{{X)Pjlw1%6w&68#-Cg3+*+==?(q%
zitO$v!X0dF(D6qUD1FVF;Vv}3&l!ycT{%BY@s<w|CT-T<CA1n+#B8F|UIg?rqMzh^
zBwQhC16VWT{po!<Fs|)cTo<hEc5E`f56L;tpJ;47_>#|(xC(1waB0S=ddyBg@llXE
zghW!xQH3FunZ;tPhN)A7g_&@xfhyL63+&h1cBrU{ZS_5x#rCV|Z#0s*`K_kq1Bj;O
z^$Py{z;LT(1qlrZXu-#c2(`<h{mJ&AvQ7rde@Sh7XUGN5TU|`;wHW?(hRq#1-@3Q<
z&TVCI9qVy(m7!l6{{^j7U2obj6n)RHxRd&jq7B{)qfAvRb(*$GOx;7*2jko%-V!_V
z2MBHb@4Imv2!X=7)(<2&*T?6ad+f<&l~++T8bmOFZ@Dm#iUNV271I_}3N}ZWugg@)
zHO=u~EW;rc*Yz<!ha0vKDB-KJD7iollhn`5OtWUlRXGjyH%fcB)D;DARjswiatll*
zPza9F(8e-Vx@1-;`4*}I8O<#PuKc=Bw^!Gn=hroqXK8b0VZ{t2!dNX9&SC;9VRQOI
z3XF1^BW;v;#-k{btVBa1Hi~{+sj^ZMrKLA%RDph`z?#4~ikvxCdMhhuo8K>0STP!S
zsdK9|8em>%3kb$#8JhZ)d=6%Cr!|3+a)N1{oiS%~D)_EQlZFK0qmmg+R{sC2dHfv8
zV(NvZLNeN@V8+0f|9rb!^g99?l@?285zdyZaM<|{@8SMoyj!EH9!MziRbFO22Jj(C
zfVI-70Uq1SW3o{N4HVQ<I&&q-9fs8{$V{VkTEbb~xiC3u__zgygEAv|*TcJdm$+`b
z%>Hai25ILPU@WDGdx%DSJv{uoX<z>R18IBHEG5dcRC1*3cW^I3QVO>dao7kh!j{39
zdUUlkram5Yt#pMI)U3XFlpFGlC_LLmI<%~$!({Aa&zfl<YF@>96Em&Zy2X6Ta1wxw
z=Md~7Wu|RWr>fJMo%V*x@uu+c`6jc@sXORreJQ*+j?MXxJ9j~QfKEhl@09s0hPAJd
zsm)!pr+JgICsNeWLYxAl7l)?-+@vR<o{mo_^!W+K9t}`vNL%~g5o!hQxN%fyhM}(0
z)R+W%#XWsp1_!cmiqy9BG^e}Xo%e5)`Zs0E=rQ^WjZ#f-+b|5h>sJs(fZ9cp-j^&3
zR<uBeAsvumJ1jdWGHq*<B|{%Ef+7EXl<X#1T42>hBt^dWD02Rxty{)!Zy4Ob*IGI#
zr9z;)<<^5K!Pf}ueN!5}r<nN7E1Xht%+Ev)4}2?8!x!UG3yBuyWr{3aUo#b^Sq%9P
z#wNHjC<Vf_dn>Ej1J?y8DNs8i)}^rx_tNMwv<f-Jb`rZ(_xbVeezm@jP)Vh)xrdHB
zD5UdNZiB}HI_YbAp$?o0Rv-}-N%1XXnm6dEiDO5bJJYmAqxNKJXB4K0!YE+#6nq=}
zjIrR}SaCAfp{meD%gz2%-_s1&qxNV^k~oV~N#C~Q!PoS4-wicrp+NX#bOrM+`OE(L
zHPvd7x)h2#2OqhsPilH>kkN05+rj1Ak(d2pK&K5`nhA|ci<ktRl^(NK`-71?Ib*oM
zgON#r{2lC!EE0H65zlDHRX_*t{{fjSD)ist%Nb3U&yHoZB*;Y#*^8>D_Cj5j18vC2
zq<DTteMbM|CkeQoOs=OxUV>WDww#m3BTM3Z&XI0~7599rDDM*b6?kplz;IwMt>FtN
zi!=qLvp7gv>+EWyug1?b`G9m_2lf|@QNd2bFbuutD}3NE(6rsz1d|Yxh7cePi3^uB
zb=!<Kt`di8n)dIwDPw4w1ijdC{p|Pr=C^ItDmA@Qa0RcG4N%w`L1L>t0~Np(!g|{j
z<hD{XAG*YeH23`@a|uhGS#<D1jLul}FfUSN5eCe}P;>L$za*c=6|t_tP`mZEtQfS*
zp|%EHkj1Vb-)Oev#?aQNrS@sDOSs3?-Tl-0z8{rXa-|tM9U!-Xz0D$H4xQyn{)mD=
z(HoRSd15?O%IOA!i1<<Ten(A94joJ80@au*HTDGFpCh-CXG+EJPsA}@$FjuGXJPgS
zepvGzR*umZLUGo+GT7p^3;kI_y25S|5aH~mJy5nm!*WI@pfnIX>Re}Xu56p|p~7_j
z1ODLVLPxH|p*O*ak2%5vxf14GdM}2snYj8U9n&6&{-SasLG2XC*Tzij71y2Vo1pWS
zadcJyT!iCe3@7v8Vvuxs4WDH5ncAx_jgUc012GVV@B1s}&_i3ay=$$7(t;u)uINQ5
zX?AuunoX8u(xpiMyOXq5DkA2R-N~Epy_v~%Ten#@9%e9vr&@U^l}6yZ6^_7`Ks7?X
zZAxplT$Asj!V!z3zAp!`6l;YB9xS1e3LQ+!RGImG&q&&4deASeOSm#<4brw-r>dGj
zm;$ttXgnL6(z-^FvgQn0je=_%g<a~qyO}TU^F>6ZlvE3XPIxGkC#Tkduz*fc%`ZHG
zx4}tdqar09XPFTVdLH69(d*nctu<(fzl^sUQ$=G8a2fZKf<I#G(6h>e0Iy8N<~~#v
z`slb3IvjU06M<@;^Tl!+2L-~dH5E*{^gr8QZzH3pDU#H}d&u`J_RKyq;L|#_5yU1u
z7I*iO1?Nd`Va?m(B^nt!V6~DQom`OAKhY18d=HGL7q@agO>b~@gvO`c@8}BYIg0v&
zi$jzjNQV@hIU)ZET&>9F3G`3ocY-hOF8c(fRmpDRKoGtAD@wU!Q3Q9g3@GD_kO+x@
zTQY~HDdX1I-K}0i&}jaBs@pa=fuLdHi<hqLy?Rx?{-$%CB;AVyE?|}m3z;Yo=&qS@
zpfYed!gO6`O0MY}|HYQrA>&|w#?RrN%>_z$QVt~-Xy7`FU;4K4>2Ouv*7o<x#BiA}
z3gAkwjacRmm|Q?1I7&;2Wu{EYoKW%-bb*Y%y$W1KztQk69Z%B`Dpu)o=3vDvEQEDN
z%)P?}tc1(ygb-Ne4M$3}h!uB}M6wbsf!H8=xl^T95~ZUjX;pz&N#gB+^Oy9s^+v}f
zl^?%d9pji9qs;McQ?Zn+INooDrWBGntX-+$u_JWsn2;72bp*p%BvUiTbK-Korslvv
zYidvINz?g0^Dd`u-Ww)4TCQM(ugWl|;Cd-sKP%|fn~p?x8>!DIJN3L^)<Q!;Oqcvl
zfUa0ixPl51?j9c=2IKElNufBkvanVjC;@Yh@thQ6Npff`%#k#MROy;}9s5E0ZKB~D
z@~8{K5;VlC<Q*7>xK@1#UaE!28p{~#k~FD(rBdY`JvO21yktu>(L+uql!&6V+&i^(
z<J6C^&rbeBU?=BwkZ!zdKc}`tKyE|W4V*Rz>jF-x+j|(E4u6aXqrC)cG+_v7eoA7M
zhrVy<WSK+L##a+eHgOV#q;umnG5$s5EvX*@UgK!tw$bqu*t2x<FdPqN>Ay*<g3FH3
z)z?73pVLFQw?JCZUE}@<`gAgRoYcq_=bjL*a@yWB<X&>-!#2h@jym>}<{QJB0;V-G
zV?Sbxzl(h|E|6xu-ov;J*sY=|(*$@wZ!R}#CAa2Zq;k7q57AgL(xNcdxQD*9#wqBJ
zw1)|#U0fdmCpzbqB79jXWP;0}DKl!6^+b!X^Lbf=(Qq(Lr&QQ;WklDWjnL~=8};TE
zEEZX>SFeG~k4{@Mc3dI@I}WYs+wrJIZpY=lc6Yosf~_2XUL}8$zr9ymQ{y%ie)q39
zWy0Fo4TP}04fk!>ZE5M2A@nI>7)6$`rncmf<b+JifA5jxfD@R^k`Vk7`{-Q0??{fn
zb8uXwMG&;#2k;)QQm!H483X(+h%z7(Fe!uHBu}K6ppE`RZrL_ETmOhQ;R_jZCg4IE
zCMahL4iaZM(LQFI%KWJE|00!3my}rsR2CD(Z&L$A#E@~ygvP=mkt!#KOVNTNV+3s@
z&c-h8{H*)=Ywxp7<xrZG7#I@`G1o@%VQE+lV{TGhK?YiuiZUz|JH+iE5F}?BNjxwb
zbY)&h!Gys(p=HMQgP_z4)(3x;rYKGIb0!Q^2`1dPJ#-{bNNG|edV$SQ4B`?lGNv`+
zIVfUeq)%>h!n0{#+Cjnv!FFUsYv`6rOBMVZ0A7XSBVrgdq^q?*YvjV&oY9rG7na9;
zBRMGM+5abOuf22S()M}EA@&@%LQvamxVfQ7(5RA{XpY+yK&#3FhhVcdT^<kBUJcvy
ztt0P?J~Oau4$~Y}vg2cj1~J1fus8~PSEpxR!zLWVz}><gB(h*43h|uowc9QxY(c0#
zgw3YUegCuxikVUgUvVMrT#ne^MZ|@HMureH0_!yQKpQ-RbP>a?qp{+KMH+WRm?YX5
z+;xWi&G^$st4d|@J;c@#y$<YCITo)8{Fk=^erex&kDSV^%*E>1yB2$uY|ZG;S@O!@
zPu~vwmF&7Ybpk74|Me03+M!=a&Fy0yd<)!zlH-+V>~F@uStghVK0xO!IB7Cs4~$*}
z-huvUV|~!@<6)#)1>MhUM3?fIEdi;2y!%78Mp!zP<0WCG{$_{17+x0@lF~r%8*c?t
z_3cfR%-u6BQG($6VgJ>)tC*KFqqfL7rdWpF?jP$U1tdX{GGi{PQ@j0boIcqEju^|5
zZ>O~mR;c`R_=E=-=^PlU<Vucfsu&Y1Zm1V|%WUb+@5_?+JPcQ_#G&VsEOjhj&f(Je
z=$XUjckOYna2C01O>pFpDn?mvm|lDgZ<*=(RP{ewq7<3Taq$FEH0vuf>6Jwx6;3-f
z3Os?xiT%UF!+AG&_YMZrqBrag$0d!5T1k3i#WgDFS|!)Hx%fkfhEirt951FpQOIa2
zp#w+ln2p-DH0ttxKeVHnRp`!a%*3hn@EX^iT^cW3!nH=h3)G~KbHx2D>F?&i&U2~u
zwvS)+&h@id8X61!iDM%2)G5m{Y!RbTXw9$yra)Q0bsN@dKV9aO2;9jn+l{b(rcM%n
z;Ob*f3pNHjA3yeg6f?)KL49!?V)H0bjKp(Mot@q9XS7HS$5hLBJewLj_dsYiMkCZD
za>b@Vob<V@q>q<9&%76XYxh3a)7RrZ_#f?9%~Iny5WeRrG*h8$Ple2$0|XeD*-aHQ
zOAXXs0!0bCooLsQU6KrB79MDyV_$4r@=t782?@1_J!}rdNa~-j`|EDShsW7G>-9c<
z=#dZPdd?(?Spo#VGb$8GW1{9ju9k~9<x5-(|DZD%;$eN>4+HXr-ZS9jGF8As27(;M
zX5~Z{GQ%)kjLY+1Qeo7^d6JMY&6a}A=88}rk%Wc7B^u^&Di&0+ln+Rj0L8Tj29HMW
zVsiHR+tp{S%6O^fRFOw2NyMZQ>^@fzkw>QHxPu5}nu`$7P-Hy**z0k+0Er-KL^o&Y
zB1<`Ng-=|j3EZ4R20TJA%L)G-LhZ>xub0bBGPtrp6xH{^md7vXkL7M67b%TE=v74-
z2hmzyr^A8h=2Xn`h2FdZ@qn>EOH!E&sFrt8rFStKqJFrfQck!65o4s^q^Wf3A`PiZ
z#WkI2mAh#w1N13p$&R7<{1ifFo+kW(CM>FgQg7^{?K{LEaA~JNTrV?-8j@I_rhvY~
z44Do>BB>28@Y@hTRwa2tb2Y~@`&s<`*DPfM$R&n>=HxKJYI}M*DZYlf&c>!F!USVW
zPNS%#T1hD#al#f@f*QIc&gAy~>=FEA`90PzmNhr-lT4%`Na@>IApNjf35;MNu0Q<}
zNSS#_jv9ye$1&p((qIPFfk`BNuMEPll=TKgi5!B1mDXfcVP9#6N~gE(T@1Fgw`Far
z+^M&)M*$7z#P7I`&8W{Jax^A=MQ1W-Kr}idKq$;asf}<3>b&0bQAY!YCAmMQk&cE5
zKp{Wm>0Kru!9L*Gf<=Nm)-I{QZitEegqni=u>g$a1N=sl9Q>9wJbb2g_(9N!f&Q?V
z_)JPrzCk<v>2~T>$+!({@WvY~DD3IRpRP#T^A`dMmP}WPHv6tGx|lGFNl`+D!v%Jy
zBl@G}B7Gzrr^~uZ_hlv+SF!IIh2;I7d{3~BBTWHP5~NrSDd(vo_c-3toJT`sV_|-v
z84*}nG5FR2+aEJ|mERlbUt_<d=xFrsp}EFs+VWnR;wqjOximN^k);#*9-y}jC>9Nf
zqx5Vqx53+B0}k*z0a=1w#rO75pSQPHhj271%7f;K`i89a19E&!Je%q-ZFV-a!&8>v
zHNf|twa#kYrK757Z3YFY5OjGb=PX8!mvXKu=rj2Xi?EHOjOUS~qobB4XDMuDX#+lO
zm+Pz4Hr5JiHOrdGOVhV8n9t9|-V*GADsb%0skC}eR-E<LGPCk+66xqz)EO4j<IX@H
zdPC$_mpY}Ey4JDfoa*!bN_A0YW~;<y4TF|0-J=_RZAI4AJeb~UY3*p|ly;Kw95ypE
z0vQUHRdb;3gpGCYR`XNm*RqoHX2Z4V+n#vSCM{~G*9qt$IK>nCpzb5>Ylv?uzig?N
zPpg4g)s`NF=GjSo+e>rO>EFvbLmI!af)DEmznV?2%_ZYi>3fmgw$K_H**MxlPCyP&
zMwLa0=D)~;Lh~AWY*1}q8@>Ww52G`hB)*5S(X_yh*rtiIzf~Q{mCemIP76t6rqp7y
z*3sDNhWZAJg`hU5Tfi2^-ZjI$zI*<E<9Iuo|H_S{U1nR~I?h*O+g&~khhJgUD>QD{
zG{w`<)~QjWu0c&v{!;Y4Vx;0<-K$Vf<E29tIcIW<AzLO?`mGkRx<d_G5!JaW%XVOR
z;eNZ|JBLo-2DM>6twxiDvXdG|l2*}boo$BBqTF3#Ub7hHx!%7x!`ZozSi75l%5_yW
zGU9woG8)zXuMiG8VGIWL@M=Zhx@*<H6+1B*vPgIK#@(ol{Y&qq_YbXB+j84B5Pj!Y
zY%^*^W@LN%YFm<B*G|)Ml}zL}S)+j{P()1u900VeY4Sb!ko;H|ASr=2+vx-^(f|j$
zXU|^1^Klxdo_F%jgLiNjGX)V#DBy2Oqy`azjwwucn@I2-?u8FzO^*?5@O~J;4OueE
z;gismhm1-%kL=Ec%I_S9Vlyi6H$qx-QI;eSigYL0I@Un=3KAAluFx@$gxnC#1Rp?}
zP=b4pjBf3{+YeXQlj*fFWm)Q&XxI`3E2gw$%S_W1Y?+Sn1S3!)lOaV%E6e!A^Ela1
zg+c5iy1x>eRB*~Q{^Lp{^!^X3LdjAs<eBGX>N)6Tnj&vY_Ur{H?rbp5^7ke9^;1Yw
zW4F985&A}Ce6>F~GfA_mUXV=3sO(>q@S__^`1fxDqo1;k;BfvA?nby7;@+_`dlw3o
zW+EX=<tFEXaZM#BiIpl$h*IDLSjvKby?;Hxm1avkM0vT=@c#DW@0YiW$>rbI(@&RI
z*D!?sVx5R3N%~0D;w5_|nnI7bvbiT?lSRIU-ab#&^Q908^i(Xif3nqz)@~Ci$<Dc}
z3cpq+voOX-B6Hk%?rH#qzM}$i(q=NuF+a~BNf;KkLXl?kQk`7QDC40K1{Mn|tjt2~
zJ87t>H-Ls<Xp&=h4H{bEK|~To1M4l%pjkcBDn}#7Dk7UHa-goSdZrv$#dRZTU)!Tz
zQ$5+|&ks&>!D^IQ1pY5fDXRTCB^3k?&|$;4N@=JaCH>$)xnN_Kq&kzl5v!`ub}OK`
zP^5h}ujaiOUjh7q=*sf@$*~=(x+5|jOR-hZHGy6ksPEP&#$0T_I_jCdI1k|MTc{$6
zE-C?abu4}0_;z$f;4AD)t|Px+AmGif>J6*}wk8)E=o7vx$NfRU{YOMCNWpjvt!%4Z
zP)vutdTkkP@7vN}F-mHuhw^ntjRg>Vf`={LZ-^$1zJhTpG-9Y~iD_I4;M5KyM>l-j
zDG6gJu}a88Ll{m0;B)Sdv(aJvHp<_^>X8*yoR8)*uceK$T$_CMLYDqr*LBbPiY)<0
zqhfOT0etyl4jMxc%lCk0D&O^kM%k7N$G>Jga|UZm@wsH$xD1EIjPCN%QMSW9*B19c
z@f~^IUbWbtH`k0NPwZ@7J}}iwwF`|>pB>7_SeW(Ms&A9I-yT4}4A?oDyY1~bYIJ9%
zXltJc9Yg)#dv(>(vH8bR*QxQ@dG~)-aqofdI%WWU(vpPQ>1|_d0KWy*T$sAMXMAB}
z_Km>-3XT&~(Ih%Ot$!8H2Y_ERw6*4I0=!f@omJQ(^~?~Pzi6>-y4%L8GOLq+Fu7@f
zs<vzSn{~)zxK-`6J~@_DGt3TRP2d3TryoDxEv9#$KTO`&s2+-`rDjc8*{X5I@|5bf
zd=}naRI~Z(y4XZH88X*ik)`qtu39VK*stDywN~41;xG_>&sU5pR)vbvcj$$x7l~E3
zRK2JV+g0T_4sn~<k?oX4RljFHWPfbOP67c+q0sdMP9`(QXY83{_K(si^}M|u4|d=-
z;u=C8Gr&0|%76^PL=0|5Nhrk#ZS<K8SPPx4f1NhqocNpxxRQnm%9(=w&{?`Vk7-ev
z92WlPQaQLVi({ZN9VtGD3=k1O%qbHZ7Z#yZ2{BxXCZsVVXnWyo=;AJVCuf&8XBNt_
zG!Zc{BpL#)jpBZ0SO7zABK(3GXqhR>aG}64-t#;`5~eYUaYhd(GD)Ri!r+t8GG-5_
zOjE^EBUQ)qGX0V3ahf7;N4B%X6)g$oS<cJc&wf*uTHJ@8cp)(lj@2Mb&|~~z8A4B_
znaO|4*iVF<vXBe@$#wcG5$k8hM&wgZ7^XrzkdCcES0r7MnFtHzJ0oKEToLj2kHo{g
z;fWNm|Af{MjTCJyZEanRg~Me`d|j=zF1OHv#O~zrqfvw!pfS-JCT9#h!78)6Q?-t1
zd9NPeaMbKT+!vx?hJ5jD&&{dAR-m>LYtp%4YBLzGNG@WEn?TaH>EO)AioymF)b1q&
zj*`#nGb@(ZO_2T*u7>Y!ZURw?jPTW+g@yz8`K#fe^Gxih+3wgq%n{IInx`Ean}|kG
zH!5R|N~9gswq&s!wyQRH7z}k{s?^$3A(chTgr>afWA-KQMrRJdSByM&R;Q9z<7z~5
z-~U2m(n+gPnfQM-okDt+(kT4Cdijc2E~QZMU6)3{LXySr6rzcg9D=|rWs$Vjb*fN3
z!uobU&%)k<qm;qcH@#)AMj=hvnZ%D-Yr6>pW*!6PXM;!US(0uvDrECcf16W-dlUku
z@tVTs76y!jydPT&WMwQ4LmODPH=h_lt%z@eFJ%n1fKjQ4^*?}+#F~Am0=tJf*aXGJ
zG^;pAv$EH2_wR16?rtA1``15?FQC29;rjT#*ogV`Pm43x_&;D;M8?%Ky%S?Ce`ibH
zmzQbO8Y!OM7t49Mo@bcr#islU)u|#DRMuxUk&jK;RfK338H=KPUV~{VL>mw+C8|Wi
zvULw@?OR1`HlS3MtSVxSOkNhzd-MJQeNaJ812GJ|=M_G10948YTA)&)5(oiOxdDf4
z)?ov?c9eLjD#Uwu2p_{6N<kdhi#Ox(*fZ0U*hFIv_YLgBZ4)y1&?0D!HVLo?X%Lp{
z&NHnQbI<k>$4VafyKWB_whBma!-C`jCYbty%<|XF*l~Bf;V(E9Ip4P}IF9QS9vcBm
zHMGGYWnE03Q)eYGjUcvY6?+M|Dsz|T^Ruhv*&tP}l*S6IY=$~yNulZmYgh$ow4)9(
z_sO9ys>{WP#*pnWtBI|n`#E=!2}$&iGPihtirJ+Qh10~CKL1C(?j`oJDd!}ZylPK|
zIE&vODfPAKerGqcy)@dmKuZUUWa;Cb_2y;hm|*Id#5$Qh`8)t)pN@-zt;{d&?PBw4
zK)={mnx=+KZio@;!mM!j&z-Qt1sDNWPv}J7rH;U+WY_wP!+eG#xO>=}m^bqYwOHA5
z+cp$^*H@q!&5&{>yU$VNW#V{}G^1qdCV7xG9+(6rq!hpcpj}Vm@9Bs1$9e&90k}xA
z>*_%wfxDc$;zF-ZvUN5X932eM0s4JSB}!;Y5d3CXD8v(_)&yPNZxYV#VJ-RtugD<~
zYx*!6p$mLN2}7T_A}pdrpjU}mIhB^@Fyfozg8qUFBQD9)6h%C{7j(5&2(uWaG$Krb
zVwP~R!HRM=Mp;TQtld&_XZSw6d;Mm9`9_N}DAgJ(bcZF1sZ@gA<ch@Tj;b~6fCZB0
zA|jwDHi(Y~1BN$5f)SNPSFiad<BTu`PfYTZT%8jc37RP`rh`E)w~?M@8Q?Zxr#nbt
zWdnAWzq`oau`E~i`%J9z4eULF<(wpx(S2Y!Odm7L0J&g-_5SkX9L1G0%9x+xT&*FF
z?+Ip;3xU}`e{=BlCEaj_UPYWK9I4Z9iPQ^+i6~=#N|_>p;nYMTO0ksaz2vNRHzI#Q
z4#g7HOM~wN1RsM)e-6-hkh3O&s+dO)#p03q%><-iq%$DNS)^?#(BBZxkD>R5hPZed
zBP;~IM?-ELA<+yimLntDqR^kAPOQoC9RMKbSmCf(SP|ukwR@%L(YTU2ni^RTgXc5M
z1}=1-OKs0$k`-xptemzv`a=^`5=@S%oRbx>+@vHNjT~)H(>O*-<fL2g!?QcIE}yXR
zj)rmd{4CC`Mcdt4{Qs6SMF$FtUo?#D!+*7>kY`sbnWeNvAfaohV2MsnP=Zt05zS{Z
z(CNyd^9+?<zwBphDKVZ`=f=#js5(uoRSZtGX_ML3;|wu4!W=N?^=9bf>QGu_zazVF
zuZ2AwR2y)15*)2j=xTSPBf}Ab^Rg7ss?1XGVyP{CdTibDbX)@b1!T8t1fS=>&Od&g
z2k58S%nOrIuKm!_M6|F);1CB(8<N0a@0K$4WbC2*3lUNWsinUk!>wiMhEd7$kv#PJ
zYY~(&u>#9CC+ep2w$rA^V{X>Yy3);w9U>6S9bzmlQ%={nIL(P{XI~{7@~<a1T8%}k
z*`q~#)f_MZ>ePbF{stq(VWU&fTdYXkCu$u<53rj2hS2H-Ns3p}D}Sx(8irmTQ?|0n
z|I4)7qOhhVm1Rca$TzG7wsWxPnP5gQtq~3Af~Z_DwD6*6D+SGtYj&qh#y%~T*Mj_+
zQ$gY;3zfeWJ6&7`PMhUSFSqEOq%ka+AS=+DrI0saaC9XP7FXhmE#cuP7^48emk-|U
zs-w2}1m~$TqOab~FVM`?yU%Y(phupd07wG#vX7z`zT7W>&QQ}isoij%q9M~$6C7%@
zqK|HkXhnU}8{A+rVSExCR)bkzh)oBNa_gQTXzb!BBAK$~Z72-7cDxONpDR6-8}K59
z`&}<hGaCXkP!e+wd@<=X=`eVK>|ztY8~cW`CB%4(_a5sym-@2Uu=xa{;F4M=^beiG
zKPJJrhi3%9b_b&3wL4$*Mpq?vM8+A`4coRt_QK^bK4T?2PIy8cd)ysW+_nGc8g5MM
zTP_DZg*&8f=a!9G$erFwK?ZTfP)u(+LA|EhI_iBr3&Y`$bla}0-6u4y+t%L53-TuJ
z;vU(Fx?t(W+;JamPj&lUMB7RO+b#E2-5SlU(>mN&p29)tWoc{4j}#O`F<&^l1-RWw
z>W=B{>zzGeOt;!`zEp#H-^ftN?C*)q4&ZTk<?R)rKhhegol`9Oxe3l_%_UxSAUsPc
zmU{H`K`wU<x|NI#5i8=|-l{(c%InS(FxrvX$PO1C;LCf)Gf4sQa_pP(S#xVkdMs?1
zXf&=#nzfzsNpKj)C5hj{cGERQ3`;95_x67-`~X+}X(C#7_ZEAnSkpKr%)9643Vv&r
zL)XjY1f==OvUnK$3%yy{cH1@(eb-l@j(tG7lHAirc~ui9b(_dJb&@_<J~2!}5)ukv
z0WgkF?C<G^^v5~?H*nGB#?^yKf-`ppvx7c3j%RVFv$xwpyXf7FDKudbMR1LY)JRN_
zo>6phH=hW82W!D+GNpYWHuPTLqnG4{QI6gUO?kkmL<bYQa-ve6ejw&Y8U0HkE!-rD
zA{2=DPO|AtBf>)zv4C;~g84+qInhk;E{Y>cVC@T|x0dhq+4IxU#i@a^TIw0m=$0rH
zGNmQENi+@7Ez>i213OS6kpTrkq1AY=)8S-J6>Or|(fGNT$AVL?;f^a2(eVqa0?A@6
z<bJ1<sAZ(XI0n6~vimDYVPy{c%&)7+f2C1OWp-Ibe8%HMr+<fXn#|$d1}rb=gmJdc
z9vr6gcpZlGL>rFua>g~46R`ch2{#)LZ;1RHid&At!sdBsosdM&AY6W<g!f)b!vFbO
zfJ-mfTyS&{2(C$>Pd-hQS?Et>9%3iVh~Xr%4i6%tR3WDHETUf_TtkJ*rOvkwf}hpQ
z{C3edz?xCXbSQ#{Y;n(C<KzbX4q?m#V}?xq8|u||infJa=pu3Ri3S>;?X`=Dl;jQ`
ztr-<MM3+~-g-*3FzwM9)LJ||whdEI1h^ZI(vghxY#QA$gbxANGk)l9VkU>s^e+Gj>
z;X=Vevs@>atsT8oFjM5Avw;aE6pX-ZuCU@Q&{5AMGM}Pt<6_XYi*AI7s>aYVp>=EJ
zJ4-=I?(eN+Zn;Xfd6g%$O|rZ7{A_Af?<iHgST#TV41VYu_q_tKcQmDX1XaxQ(eVJ`
z0}dH?g#G^3^_Y+OR)xRLmj^qjV%TAObox=!ID%01@ZMPMUXJCMU%|~D?xHQg>!KwP
zAk_**pa}M>qVX;|Q%KUk5+-Q~1QlhN`XhT|6~T8@VS~a2wxC;WVAhsRq@h_}7Y2$Q
zNg_QkR)t6_cAxGQ!>+#&`H_B&h13n}Sys>QrUB^p@ii_4JVA7&HP&<P^FUfJu1vFo
zH@Mfs{fyEHpR#ta3G#~fOpWN2XmS$)jqkvfkbS_s@AbG?f&0)d0Vpq^vg;tx%OzAj
zgzv#QX0<3$b*MhZuJBC~%!)Ps%p$s;MvlP8CD9^)6)7|f0vc<G$ta;|<mW)dzWHEY
zY>+}0sFszb=PlYJ5_1k|!C+Ra<873gfW!01s{=V9`4nkhanApo<mL3`)t*i3%J0`o
zc$;NvCT{aaWXQ&WNT5MESazQUiAljD^iv}b-JCILf(j1oq`3LPyiQ3lL(60!n9+-B
zT9?(3m!?EbOuj>I&JI5u9vbtsv|=+WrC9Bqy40dgjfN`iLRwUN=(ImMb;xMHz#VCM
zU*wFYV;^TiN0$bJ^>L=g+8!>{w*F0H^GUp$wZC@XW_>c3{|LXP2pf6TvFCrS1KE+#
z%dTehwKwZ0eMWGJmFb4~3LPJ#boO7C){Who{+A1PI=Y=Lw;I%WVWmWS*tF&JunHqM
z3-!!v0rJt0=x4vJ#ag^7OTEu7ez~}XT38#|?-iNS*6wa;tf65uVG_`)8pDVYMU`m?
zh2ww%81A60CkA#=z)7kT31!?8o33QcYdP{sW2+_NsylE`VI^k!m{X`dr*cZ2Zxc?B
zX`Bd`3`c86!}pAYCy0Vo5m5Dh`e04yT~@?h+;I^r2C;C}MT>%@vTkLXs=it9Y#caF
z(73*}wP6OnFoo0A>#Y<4Rf>kjQ7uDwtz6fOb+wWj0e*W#mhGahffJJTlgPpzbAOMP
zjxozOv2YuU#xX}$<52URD!-GXo^ubQQu(m%x1tm=92H+U4^i0{itnCjZ!leUzs{Vu
zSWa(IrFfJ{R@JLTsQX1qGab>gWgBmm-0#fG3f{t^lmgkPuN0cYW}&f^zVAZ0vrDm&
zq7qr9^ZBJPQrrC1Zjr&@)$8+LhOa-4hHp+U-VUFiro&4Cb%|MsuO2@WRcEx_-R!99
zVE6F=mN%I6mgPc9!RB!!!u+(96+{wyZVgLw+1SuW<|A;$zDtUliY4QE0((K1*E{O^
z%6qn>d|Vbz1KCBDlm7sxXSRk5^U0~Aj@xGHX6aU3lW{3<kl$Xx7DrDeI**+UYV#u0
zKJ@0JU}NB|@7VcXyE4e?=#7}E-eqP0e|;gEmc^?rkrx#&e}K~Oxh+#Gen0wsbpGcE
zr(1WpDuY5Z6<08Rpi-sZR@R8Z9ffw339WYVEiX#=r74&9@OIqRV9Qu=_TLlqPKXHS
zUmPAf{{r1wZExE+68`RA!3N1nZvC<?4)?*0ljhRowu@d`z}MRkwqY<bZEGt_f+#l)
z8vmaAA@|2__#%p;NLgvRi^FBHwL}ePhQpa>hA*e*=_c)ThR-|bIr`@&q-YgJ1i^2L
zvm7NWly3-{+;3M&d=G8GXS^l@AZGM_&_&nyHY73nnB*i5LXx4=6>oV%MV~>CY|kY9
zb&_#*t6dbKAW84DaJ|V9j+ZD30}@jZ9IujWi}Nsvdnk<vhPE#ux#Rubzq`D;nOree
zT+4ieb99F(T81>w!rNU=mgp|bH}C~UK$Be-5D>KF8V@_27;g!ML8uYUE|YDV#3at)
zDW*w8W^V}%vM|k)>~*KJqfMk2X$pFCWnUj4g_bRhv-mwke$9=LlWg{3m#4d2y&vlM
z3yD(bC4LSOzl(vj`1c}P@3!#m5nbMrRTzhD2CsGckctlAal+-u*BmXC$qUbVgLnA`
zyyaJd<NkGq<Ny3Sff=2I+ayM(K@#UU$lv_FqO4)C$_fvA6UJbq7)N}*g9uZ~MU<0@
z;Elvfipr+Ww+@0ot`Yltj=lk(4avfMnFM>;IOM-+296#uKU?kMfQ?0Je@iNM^eb=Z
z7|W*~!dZsz(Q(2JLD3jZ=UvWPXu<x%74l;iBhSX;vTOfrO_<T~F3SBb`spX+KbwVg
z!5R7vvMzdfK(ip(fl4kCASz|EzvHF&2FlSi1Cy?N4~)KLeb3NTejT9`IzJs2?OqQZ
zv#{%*i3pbb|AnI+af^Pf1n&`vz>A!kc%DYvQIE%YlH=&Na0yXAR%V@gym@iQ+PyhC
zKSv@YMkC&2D0Bn3;Ooj9Gn5G9wc@Ku>7yB-O+;cB6HPa6k2`QA!o1K|)<o!(A>G*t
zJst7~1jc0ldA;iREfT5}pvod6DZx2#WpkiwZqN>g=mq)<4CfW%C`i#Qfyp9LnO@nB
zS2=@np<9JVnvpdV7y+H{4QKTEbe7HHIXnzO{Lw5v8q{>stOp8odo`yPp$Ibv2JBfq
zKsB=7a+c+UNpJWe@hkAj*PaV$ts_?w^v`e*kW>Z$kJmD$3zEi&wh>k0*-G$dM6+G+
z(_{GyV{d$So3u7i)qU(SAIy_o3L#%nw;rT586oBT#q8s#E~hGM>J7xpz?*Aoi=o*D
z*%q**{R12Yy9fh<sD4ll2<@mpl?>(;@Vbwal!jEFaT~a3c9}r7&4V3t!}GFJ|Ah8<
z09z@$XoNh*$lzOa*DQKN);Pzv5#jv3e*fg<F@5Ow<AgtXjFV_Qc?GXki4yjt&ATNM
z=uq1T*ar3&_IV;!*9}@Q{=b0eN{}B0Xoqiw^n#-qpZ5}W{4I0|p}<FcQeikzl-!YJ
zSA!tt6yBeN`(-if8}EF8^0`$GFao?y6l)^5y^D4oQ<)dwV1sJJMUe^Q2-ZR>wbtOV
zqSqFG^|h8>oBF70MQskAZk_6C7=c!Lh3Yk`CZg)JI~g&@HfWw~G)<7b&NnOj#g=4i
zl_CK?tH_SVXZl3UyN1GT2WCwz2WEm57;aBHG);yQ2gJJhvLGlNpU01piyQny_G;xF
z&Y4%5@p%`WZL`isr3!sVrUXdyy66nOv@xiSb~-N;etp*2A6wXl@s8BL?!U`RG&)<A
zTdi!L=(&4``786?Z1VrzA?<%;!jXGGzWhbUfp}<_T_kb;jE_y*g3?mh3Pbs=S2r?5
zRTgKCs2J4}e0#*!`u#A>u8V^TbD(SAf~ga%8V2);;x#!q4CUFnhfOQioX9fJ&oii3
z=e??}FQO1rLU~22w{!6vF<F%C*xO@4*=;^!8*wxOYvL3_L&&j?bniBrlv@&%AX|4W
z<(3-n#+<>{xKF7l+*Wbbe3csSJAGGovJDhdrXfCN3DoVBELo*hvjy+L5;T9{n*_SY
z{}4w|p3XG*gX2{$F!&mTb>iy|gy5Ht(C%^V%&ZyvsZgxJr>{LjJy^c9gXMzb@<yF8
z=&O5m@*vjsY$xco*||XGnB1WXu9w(c)ypE(1pN>kPVE$d9vQw{<X}~AF3Lgc2gBFy
zs!JJg<;x`6ZR6j>N<mXze&jw+>)R}PP3G#u!B2)ws~VwLryrg4zX?_M6c*@52D++E
z1b5nVx@6l((CP)-1{j+U&x6=5@j;tTu8@F+cC`^_!ZV#y@%@3)`pB94nz+{4u*y}`
zGE>=Qj;6)Jh|cRuJ_egvIMndkG@PDgj0MO+!H+{XGxc#IIedl<4Zdw~R+wPzrb4>b
zQ7h&uc*Ekk<Y{xF;SkpSp9!M7jIbRS_#bK!q_oEwJAn<N-I5)oZioWPFkT~!Xi9=`
z6$VI2sk>=iuXph(fdOWOBax<HJ;+ReFxgDKLRElK1{92&bL~~oPC41UVQz$47KQdr
z;RM!H+d6DNWq<@y-a>h|L;&UZ3l1Z;>seYjC7Hu|2VhpOHV1=&colnR#W$S#D#2-n
z?jm+N>nn5E?3Iyxm&J0?#LrMEWK4~TZuw$y^_kpLjjf421({S*pZRXrz6Ec|XOBq%
z+D=m4@+*1y;0SU<IR!=)WKqBkt~QLf>er-Kt1@iw%A*>D6ye}Dn{_h5;lwnp!YF5l
zC5|aKJgbdUX^th!5F;XO0cZL};TzBFin-)A?W8#P+Y!}Xh>b>nfB)fc7w;E07yr1L
ze7v~45+%E)W4Lr{*LI`BO6wuzPOvOCBo4eb{^YQO#jhTRxQ`i@d0=yAKdW&7GiOm0
z9pf6-H+PULa3m)TjmKkKv53wqSgd#DqbtkQQRT$4(IoC;C2^o6RO%f%G&09B_};p<
zF~j{4Yq9VPOP2~xG|S`}D>IH+=(fEnqbulF^U32EKJ4TZbVwIDUh~Ap^<cBBbUG*^
z;rlF1$T@mu{{;NlzK~+&Jk1ijHL5%l#TvM6o*=qO_?5UVlxsYz6*O9bGiWxv-KWhx
z$?gb=d8rwmUEHdk)F0zAuB;ng=7yxCuWxQh-cxT7Zqq1P65o4ZF;H|EfEDdm2xPwD
zEDqT<WQz(U=4e=~R#0(EL7eF~+t6}1VjF&i;;%Rqb(xPJF1)+B7SK}=8+MRm@qo@g
zSk5J+3n9W+d>U?mIQIdIzUC#4LWaDP;u29gZsD?6vVaPa@3D)6d)Fb0HUdHD%rBDn
zlrf$+jYjY}jCK~IN~`PpSKbW%!2dk{@9#8;7bIraO4Vq4X!h&m!_DH;&DG@c;^WoZ
z#pM0P<d>@ndZ>N*bo1`=!`rK_Gw$D{IKx{3f2T4aAB2U@%1qZHx{cLC*%#arl8_nF
zJmc2R<jR>Xmx=Bz8XngL7=<y-aU76jg)SR*bc9@fI%XvQdQNU!G+IGN9PhF>r(3xd
z5d9ANk#i+*aA<9gbqh?B^K&lF?!{Xdy+E%Zqx^ipnY1%9(56UC%|6t8XQ7&%?H*OR
zaqzS4E<=&r-3NoP%0B8J!7!;jc!kHK9_sTpRx8yvRo;_$%|*Th5@syJ_V(LMJ$8)C
zF5kQ`=gM|}Oc!cgAJZ;7IoDxQ#TR4r*H-eF8N_`l+o(&ZZg*3TtHCj{Vybp(jDeE(
zZD#pmtX~2$uGE1O3$JAir@(MtUyT@c(wR4%JRi8`qH(pK-KYvebt*z@-}x`qT5WIJ
zHW2>qU%>_eq!f0VejA$RZB2u2Yn@_AUw|YCWQn%b$)YAwNrSGxXFp_rY{wT#Bt^<j
z<E@)NG&Xtn@a}lL=ScMVK`}1|gC~y%=rKB<rxZ=o3?ukkL?uIHir5^Zv%AHV<aaO@
z{}#>gHVAY1Fy2BZ(Imw=dP^A2;}n<Z`BaP?QmL~Ylf}N0KOv=nn^swdVp80d>1@tW
zlqV=lW1Lf1IG>Vo5wVoyLsVoqg0Y(v-wM6gKfQQ4K6}Zbgq3U_F?1VIl%$lE>7-&f
zLANQJ!wh&pNma%e7D|N0PX>cLT3`xJG#*{PAd7<JIA`!JrzFFd$C$=tS};=X4h9wN
z6Fn*luv-|ryF?U57T{<7cbWK4c~LR>?@>9c7BF`Ym18_j^K=!nG^Nu*DnKrX&HDJ}
zHA<RT)LVWSRcsF1_%n|3(McKQfBi`y)Mx2}<mh=!au&tx@Y9s?f$eEoZ~bAKGhF6T
zCN?6@B1+N6Mb-uz;m?pk2}SMD;L8BPr>G_nWk{Ml<`$wEW|o)7Bo-kGt#P!OG~c(L
zq08gbH?^ohmiYX$nUDqALpdaxE)@n(w|9ae3f`TcjD85Vb`6EmepD1-^NV?!C84$!
z58a*;iAx+Y{4&E5uN4Zm08YcxwJqdGr2y>#Ze#>*4GV_}NAVo#){XWdf^}BWa0|f!
zYL?j2f+FnVC#g2435#LTuokK}rpE4y>!y8O(Rm{Bvd?uTv6|yD&1<)%>WWUcmULW}
zsJ5ub-4e5^%!My<Ud=fYU6qRlSp7zuvHUVb6GAeyN#RT~h|e_2DE{YDU9H};CrZLf
z@>XxOPaz4Js@h?YCa`urFXB3eS{>>U?9t|R{UQ4EG)Zu7Af)t_7=%PQKu^&#wBz-}
z2u($SAp5da3iJfVDk`!XE~_eylyM3ybsM`yI)~~z2A&LoN3Tm<WWbT(#$~=SMDQ=#
zuwr}M!a|4*SJEk*IgyU`scMg;4t12J!148Y6v43-g(pp1{Z5!6=DR83w1CLd)_g-4
zj*ETx8|xOhoMDaQTVe_2In&%W9E{2`y1N$Y;f3Mt*<DTwnu5DmR!EyTSmW=6-w@@0
zF+R?CbfM=sD|(WWPX{)5t+cjOd|Q$jQ;L&U0Bk3tIs+Cjo2A>)Mp(Jt?0Ux;H&3(y
z8+ND-09AnKk9X(MOjIeOD}d6&@FLuKIC<!)TN|g10qM6thKP62`3!BgJu;94H0s}p
zVoE|7G>E?BQn!nsQ+tAU<6p+7AI1TCw6|xtsI!87=GAIGUh$xq*|5Uu?{P_GBDs#R
z$A}xL<g%m1^OiV`WEy-Im-kUtEz)UO8x~NzZ4}FvBFsc<Gi-=hS>X<QH1nNp(rk5Y
zl~4-w72Ib?Zw?zPML<=5Rnw7LZ^iylvrcai?H;b}-4su{jpU(t)DsK$ZZ`6L``HQw
zopR}q&A8E0(P?0`y>=$HVU*9{BTkyD7~SC%bB!9u-C??HzTk6Lb|B1Pxb>QYan%IG
z6#$=s59q0#OZdA;2fa#b9Z+AFml7WdiKhepd5pfmjem~IlqDoq7;y3De~OYY9P_7|
zhOA_&O|Wr&42@sy6?KS2e^p=JD1__cYRje|dHim{0NkFu``%O6>6W}AhT8YqgS9!-
ze+ylwGg?#B^X9TP$6P&{_O!EJ2UWdx+_fL>O%E3+)Qdon0#uZP1J!G-*FBA+d%D4g
zyXxvbtwx}6xvlNOZP|8yOGJ)D)uSj;E25Yez!K+(5&ojhhjRHIY(y))fzsH<%3^lj
z#PXVnHYEiAK1A(kx+uUvoV*pYcAQ!gG3B5lbK^J!mEA`Dv%~f6vQ}Z&C&+D%%i3nR
zMTo^@sc(=~$7OUJ?nr*%+e#7m*aUM)(9A^88-GC*o%9i;BwzbaD+Z?=vW#1|>&!4k
zVl=wJz;B_I0v%(#HQqxiYr4?%-Dt?<6CBAEo^Z`4oJP%iIZ<k!S1+%AO5u9_dzF?r
zF=0~rs~R^Rzg9vNb;E`e9nVs%@A~d#M$vlT()ZPG@HDEj-Y5E6#5Prqg4Sgnz>YaW
zgkKvEkY@@48*+VqS?^Q7xQWVZ{F&DVpO`8VR~*u}8UT5wxEhd!?=4>X%FCVl(J6LX
zB;7Gy9^&q^Q>(g4GSsHs^9jaRgsi^I(E|P#$`5gzqh-Y>7>$B$<%6gG6ojWXWhHzG
zb<s1<>TxBq=>P>B?GOD?h+lvO-OINWQ17IQ*F37Qg^9s7ttMcAXZ0c48A^CNX_ms%
z8ee;=1ShyBqoC<vto4kna=t*X;+8Lx!XD4$Gl+7B`ukUm;usg~`X<UMtgkA^-}B-7
zlY~Gs$ft%)set@;{#n4WO^Xbhp#KK~(zeV`KjMANxd+}dYVwM)iq0yo36oQNss^LD
zgbY4$uEW{HHPPjgC3|*14(>ePKEjKF-L*i@ciQ{WS!X}iNozLvx6@nwS>f@=$ibA3
z@hoD|By;BAT3E>5a~~7sWEmOtBk80OtgK~K$eooHU4`&o+FGsa(_3R%Q@M7}(iVsm
z!Q#JgZMYkT?O+2rcD}#q`a1X<t&&k|+dvG*-~B1{P*_{CgtE7-?b;<S1WGrO?yXSH
zwj3Wh>&)pKuZ({8>CR4@W?_u6dvS6n>HpJTI{(~MO_EGb6F7zYN;8z&Ajr2-&Vwz%
zR|w0ey0r8pcllbaa4f+g{y0B@8<lA!_+~v)uF=7H8E>w*&l%^oz8vCjtc&H!))>fb
z^W^lZ@}Q^yqjMw{VJfYwmDiR=&=^#5x6#<eyxaLSy<4WCRHXEk^3W-ULbG=|Ydsdw
zX<x~UbilTCIf_sbi6==ysz#P3UOIZ1+PblX<mDH!HTaNj<lm=YNo2k@#&!(eLSaK$
zS}|lOkQkAqyE^cT9R9#O5R9amH3F}7(@6N6Ffkyn6s@-Rnwr*c?YvU0uO#AcEuAE#
zCM8Z9#S8=gv{#B<2$Ga2Uf$wm@-qQBvAuA@*byB1)=~5dq`976+#JAp)LYtVnVd3g
z#RJ&}W(m>cZEVJ)s|Cm-U=SJ)^(XP$w3*CU>JfWbr1#$!caPJrv-EK`UtWK?O=oZc
zXJ;S8_&vHg6*`xq47z;dC0DjJMF4Rv!7KBguG5=<lv!)wXvkg0)P<y7fOjqat~%4K
zG9#ipiX+)5(6Vus-uXfIV3TD_dD!5vm!ZlqljD<*5hI57QwV3U{wNsy{_+4}DTWJT
zh<#2D>LC3Gncj#Ul^r`4F_~k`{v2d2#E3{R>RG|cyX!RLpY7R)_$Tr$@^kVFl~dho
z+b|G+_g`^?(Ap(Qx7U1^kV41U%38LUKv3*+tWA-OB*zV<|NBm|o#kUqm>(=ly8C_H
zod@GQ%Y)$dCV(4w&bWb;3j|torY)!xY=-c(U8hQJ=`8-uR@kLr7aztE+_NP|36IL6
zj5%r;r2b@Ls+?}D)}uQ9UTF`P7D7O*@~!5p%mR}M2p*#}L@ZOK*UWMy+mH)nbhhDG
z`n)d>)7jUjnS=5wZN@B=%s|48)qGi4OrYd8qZ@KyRH0)eqQon{4Fbv5XvoCQ(R`}b
zxsoU?eMzGP&Sx9i^@E@==c4FjO}d-4e<A!q=7p`^57MGeNyDX_Z-sS9)v}jG&GOZ}
z6GD{+tb&Xb_;P4fvZX*%eM%@ZS0-IZ$>j<dmBOoS`Zr;P&8R0o6;)0{g78^U+@SRP
zNwxgyN-^@~OSxp!H^Gd7TI5V?rG3Q!UuXi7zc=nMcnyG_T=NaH2=nJgA+*qC_7AQ(
zp|tRY+bMO7eEPd$Nuxm%BV#ucuvo-|Z*>vd@UWcF;%?uDqk=(8`GfW;eH-fbL94C|
z3_;RxMxMJ8?^Q5OZhF0a_9mshBd&>}TDp5$ZV)>o&qmn$uHXJ`aD~<vHH><Df{*lQ
zw1t)j=x0Gq1A0;dV%aF39O3`JY{yV{E<EVtd4f8~a~w9_M>%pyKmYtYrUE_FqgFX;
zyAAg>w&B|S<=0VvFSj!yQFn2S#&9wmQrqw};0F^09)TUHi!L^-aZYB*{P|`zmd9fV
z=iDqP;efs~BE$+Uf~za|2p@(+cqanJ@80y_(@ywX@CS`jO^@0z5WVMD%z*<S3itA{
zR9mQ!R&Ay2aix`UCd6uDNA?&NRr}vNb`naW7V1MB+w<|>o40tV@+wJY;{?X=BUcVG
zRUq(Q2}@uypd8`(TxLd}`A+^62b^+nh#$%kY{g!ohVO<@ONAB|S-e@hI%g_PxoYCK
z#>R4)FA9*RI$L$f34~6eP!hG{#yT^$6r_xvKvkgNyQ9KW%zN5BZoWQmLaB(7azSts
z4pQaFs=X&n;iM?%7iQp$w-UKg8WGQuM2iv~lejQ?c{F8ZG-~2M?M#6$n<Jm*N#fnD
zD84Bfce~H;gzt3ass8RXq0Jb>y_|2JLQ=i`GfR^dl3We@vto86bF>#4vvHLEQ&E_c
z12U|zt56c}TsCTNVuvtm!D2-|?S$9DQ_fS{TA?L6Y2XQu#tN>pI4D|Y1s}bgYNS<^
zSQf%LXedMsfNyM#)ImHYzY^e8S@w$z;~L0T!RA371tAO~ym|Mo2HHmYJ)4HTq-Agm
zyuM2AO4dsnJ~U&wRG&as`=<T`dg``4MzKYWHLO7})Q4454VG81dm*)~%MO97=SJ)0
zA2Q+by`~gr71kKOAi3!Iwq^7>n;PFx2A@xx$k|`TI3P6=3`ZZKm7_<>B6+KO-0lLZ
z39^eQSmG{>sCxj>9l%W}SJK@8(n$H=Na|4sD7~TI#L^wpd-5BFQo)YeFc7`_E9Q^`
ztSH=pZjn~3id40g=y9c$aVCjX$F}S-6jl509XmjmE$Zfwu_tfly*HEPC*OG?W_JSa
z;76w;G}<6=^fC~*2B<^W9{a}GBj?ml+2WMJ89!2Ec$7Ph7QQ<|t272!HYKx)L(NpV
z{{Do2bfL6sk};s1KL*`)1k%=Ev_c!1*fuWolC-lE@CGI4_8JeR?#t$3{dK#}t%^$O
zB*8&OsCA^EcZslugQkwZu!HDQP{>4eQ9KjE${r(|xHx)xaJ_dHE%C`lXYgsg=i5Sv
z6#s|fOwYQ{aq$j(V|}9Gy|IL$VGZxqd`pyzhVZJ2msO^@l8HK=XfK0CSeCHjmLX29
z3+T;p+VU*Y?!1DTXtb3)c_U+l6U|n)oGYdQfAJFQ%cqhQzXkB)gWgNZ`yr@0c5Jk5
zhgw!t5NXFt<lS18w+GM9irY{~ibkg?L8XSn1g=K`mCpAGyfF)vD~ZW1-f^KF<P`xj
zu-^InHSu4<GsCIlcyXz#^3U?&{<=AQ{MTj%zuY$4B7MF>kH+(?`HjSYl!Cp@c<%oq
z{s4ti!EPEc5WV{==D-0WO71`@6#@w<YAYqjNRjc*vR1wJ${sI8RsOwWvzsiaO7^g}
z$8X+yGvnpArfP(^zY}l=Pn8Z(YJ<RQBRzpDfhvT@b6q-n=9u~|k2qs+!jIJicJiRn
z!Y@Z?l|~QCGDp_ok~34TUUm4L^O>%U#(;9o+3RCPAZ-CgE3|=yZRvb1Njp1*#-QX_
ztMQcc9`>8<kH>AI$}Xvr1Sc7w(1E-@M8X12nkv5G3WAGXAqy4R@x2gM))=^mw~C%O
zu5O$~OT4qe8GPQhd|C(*!$&BN)a<)o7oWiQwuyB4?=7J(*~4c!KO?22%QDE~VdZXq
zH^!X;kOOw0n`k6qZWI2|l&enTlf26oL6%GbngRn*#nj?{kZT#K;^FMPv<icA@PMuJ
zlDU^hP3zL|G5VQBTIEib+Daawks(0m_X&N?QNr9n*5C(Gyxr!Y_$z?F#_KkD)eIXY
zvm5rxb>+Kw;HSVZ#HwTvUS1RvkdKPSU9Vx(RWya`hQdgv^Av7c1|ydP(`&^^7Q9%>
z($cfX`Ftq(F4c2)T$9dk`bO!seOU#hZAU$R7g=Q3>;J18rd)fQL+f;L<FFIzLGX3h
zz7J%M0~uy!r5j?86urIW?>S$^KebkEZ`(Ey{;pqf69QN&9B1pN!H%62o{ObOv%>MW
zI0$H(me@(8KvGGA!2i8RidH1qX&P)5U`RaP%X4=Rc|JWW(jo{>-UaXu7Ae=T;TZ#b
z7epD58!#z@>&JW}#Usk-za(J;RJQsNjo~9%aVFr4G)z#=6r66H<Xl%a11j^0*Z(M$
zbGIq845%y~6;DzFM64m>lnIT2#YU=}7%oL0ii{DI-E;Qf>@F{+v#aZwb>&c+lo)s*
z8rEDJ#aE?aYk1%$#U0E*%TiH>fz}T3Ne~E<GmS~q87-$WFQj0?;Fr)cW6Rk+t}f9b
z6HJYQphN^;v|3)u#QqYdE`(ufgI-2%^JQ25?L6w&l$};>qLfrl@;0+KTP&E$xgh4p
zrf%~uj-@j+WvW_Vmn%)N>aBtxlU%FMNoi7S_a|F%_?u*!V9!s#+U39u(n@fiNSS0T
zCp_Enq_&*P6&El?O>FR~va11gtMjC3a1v0IX>cXm^$mEA<jHN_;U%!aQvmoBir-`Y
zaFn^`VhT=Lu8@+*R6#8l;qH!N!Hg=Yi8?IUS;80u5<7PGm2dkTSuP$=YMnZc-P|6I
zCPkA6(H<$_h}l;+6yHE(A;5S%ZpV!qTJ}-QluC?hnaAPqG8@JMbuo@72{RRpcoeik
z{dUAfQJQN!dLn^3BI;i}%Oel9i=YMXc!Iq#oRTc+eGpI~kd&56*%O`G!(M6|#a;un
zD#rjmGp+GD8bbJ#SD)Lk*N2-P`$kz|E7^nb#Anopo>yuJ9a`@uif@}4zE-A}@Vi<e
zP9-0NhptK?EO=yWZZEs=$$xFbw<qCED`BGnKbhapu&%xoqJy`@uVvpiZl-u+cL?aE
zdmQ||ing<QL!|$k!E3fElc=|NCMZ}`yNP6{kZb&U*I)bTTjkOJ2mbl!(|v}$isD5&
z9R|2hAZ>77H+Y2QtFPO2HT<G@2t+CJ*x^i-Al$UFZjH_1a5kU+Gq*5qdhL4=@gM*3
z{?FU~kE|E7`R9wP4~tpHLrv*@FSqR^{d_o(Ws@Y$u)6~?gfs1SyCcCD{R*dHo9DiN
zQ4D7X#cpNIP-E!E%`-Ww?zR0ngnNg^YjPZDL{Nr*@|IN=WR>k5A!pD4+}&@q5tF@B
ztjKUEMmJ%vY1Iq+5H7=}Xc>mL{Z=jd5LNYxeKPT=6>59vbaZVFo))j#47O|XHuw&G
zQ^9W9KoGtAE9Sr<L^SlAhBOfZDOD6jO>QBImh~8K>z%cB#}L%!gL>~D<i|3*27@T-
zUSP-1Z{EClzW7>~b(RfJGdP9E(gY|>g&@DR@(iv3E)gEqws5qTn*OO4cqZV8Khb@d
zs<}aed&fxHpofbhRjxw&&Y5=ha)X~bpXiFFszAGX?aiWOP?SSuG*XbpR5))H8%G1E
zD^yZj8eFCKZg0kuyN5}nN-DWj3@a5NH-WvGH;g%~443jmCJ3(a8l_R56c4kEl*J%J
zbQ8_S&eo2QSpHFP70xEF8td5qOSC2F{*JZBAfO;xMWS}zqh?{YHj0n5!0TGN8%j!b
zOSU!YN;O={@ZaA5`1ij8epFU@tYn6ZALyOME8bSl2>CL})s+eX#%+^3$5Yo(-pK=e
z70dGgvm08f%H-F6(O40=Ll`R#+N8TH-VmcN#DeTs26Ad|mWmOS_i7D2Rmo!#|CboV
zfQU#Y#3OS^D3pb0HZ7n#J#jTiF526!|F+CdO!01Yl;-KVquFl`x3bfizhJDXl!qJ(
zL)e-f4wwuv?4MrTd3W0hisge>XOB^tnpgOnVk~>I>ZNf_NU;0u1v`!=h=^j7<Xu^p
z%8-n+p&z#9HggHK<ehW^y}ZO=ux~V<Y)ssGH#oKd7{Sx?AdT0KG=k5AJ;{4&M-b)r
zQ`>g4Nq}UE`22jo@vdXy9PCK?n~f(6<0tg#@<7c&J|gh#-;{Xd##6W7|5~y@zTV?J
z>7Tbo91OCdJfdo=;w}3CZBW5ZLNO4$_bc|O#J~qgkc2>jF~$UrTuR?QT5Y>cyUzzP
zevo(nfFE;T6;7Vo%+Act?DQeoq|{`jU<6z13bf86$eVO#pcdF7Y)+x2coNLK=>v|1
zJn(PKEv)q3VT2cAjK*PxX<Lzb`PGaKh1nl}MY-Cwo%diUow7Sv1|1vl&R{IEIJT67
zW=HW3l1DAryTiWfp4N-y^JY0%)s$>CL$3=ou5fnyj<JE>v6YE5DAZ+xvZ$$vCrU*f
zut<q(quqi+qKJ{@7YljZEsqA%u>XEIOU-?S){!x{qQ6{Vt~<8U>hb)Q&))%ItAozy
zCEWBCGX<RU1sO-=S<T@tHvc#S9_5lvf!)?->h<2E`cR+h2X#=(PC_vd-S;bIsl>ns
zNDxCH!5Cu#OE#r<N{j8ZY3K5Y@q^s^2mF|GugcC<n=@zTJjM^%Wu-;~1p`<+U%~o-
zAaB-%Az5IDusTPZ=q#9d(>ojrx#QoMTUh9=M}pVHNXBD<vF(v*{n;6s6eqv@MJoL{
z+lBxp<#X{n$DpZ!;0;n0VX~=2%|6i`<bYbRgU4gP_q?3VUsm((RPU0VW;p5!jjvq%
zwq<PK=-J6c64cZdgCf-Qjz>z7j#wqcHPL34Vorp_@}rspZssS0xzoSzYUzDXb<0k?
zKV3e{<trkrb<_oeSQziIq=-}gLxzMr>D5fowZf7PI{4<X?Aj<Y*Xw{MX{@QR`Iq6N
z6wpBxuHcdwi<JcGU45u;MUYKS12GJR_c?`^P@(n!RHdkDr6L4~cG*pu@pJ--6D6Mh
z2yr0x+@Kf3lm4)p(aW>_y*GS_O;l>oQ_zEDV>8s&A;>rC#1LxW24QjVb)bW2=2LI5
zFXqmFV{T!l*A@xh0wWoV35Io1#`!eUH^Gn2{#i(6UEMkdCd5Osn}$JC1<o3zEQhHM
z$!oTO?jSnUqHQhi%G~pOGJRQ0yH$mf8_lrO87iAO*>%fU!On6cFOndKHW`#dRUsZI
zMcQMQ5Z6SjN$@cc63ZXu;BYnF8;srk`>vM4{f;qV7E=~hK{O#HG}2D-LAMno+E%+(
zpbk+eEEQsNT6!sLtXpox`E>kA$6uLRYOfPI$uj)F6g-akqVx%QRIrWHIm4V}zpY-&
z%_}6}UW%_Wtj_O`Y14W^{dZU|J^Dg_73aj5YAHf}sc-cMU69RALNO49_kCQw19zrv
zw5;2)la9@fZ992m+qRu_Y}-ycwr$(CZ5t=wUh9lK#{LgaJ>#CUYStC5PRVfd3yGL8
zRxgyn?{G75i=whAt0;@=_dZDLGn^a4u})G@IjgDnl&i^GthR~;qXNBu);($k0_2^E
zHpU1rSKuXwhJ@+tL^<z{TKfAJwj&Hx=X2^#8b-pcnw|xOv5t?)Q1ISGvk$;n&9wb@
zj~p+$j~y&$<L{1Mr9pOeO8NR?CkT#Qw9CnT`_%Oc^zq`$I$ajIx_MYp?SGF+5!<ej
zG&nq5rDFaP+6?3(m;BuFl&7J}f?CKdFyU!Pq{+HvC^hQYut!_pU3}v`Jj=LT`aT_=
z$>XZRE2kwe-~y>#djCQlzZ8d{{<5~D<yr>8;dZoMfpU*#twB%nZHhu+2j%xEYmp5Z
z1gUhEBRs+Z{vR<W4)_w@qS}oXJ;+>V&8V)G@<-+zjo~|90qho!Cek=!PQA|J6%yk7
z5j$L!dg6s**-j^Z)7XX7@VaC7%hT7-(?kbt+*ePqP(LKo_h=fy2GjR1z>id9x(t!N
zwex)u9qndTPWgqMrj}k}IGOdt^~wpeucUUGgztjK3(>4V?0T<wXz)(xF5Q1E?8I|T
z)+~czQD&NJVq&i#yE4Xsk}O%t1*Z4j3YX^cph4M-H~bCd9rX1(M3-=CNyCRN()n(x
zHoocXORR+yUz<I!Ks$xRbpGS5Xk5eLPQD?>uF5o@#1-~l(wsKaTaFP~mA*O6Cbf?I
z6Fa|Qx9r5>b!CwsI#t+7`?*)7^@xg~=?PHUL{VGpIk@%V*MYtdn1pG8ja-#5cr5K&
zpfipYkOls)=IRsGQORHjLM$<m-@pJ8F-A**OA@<1tB8rpD)M`C6>zgtI{EN8`MmYf
z8fY+KWuOOqO~}a1KzO2Vg_;XaOmOkm^l#&Q!fWM^j57Dh^#)JHC80qu4U`FbZC?i_
z8BEtl8mC2$_oHQ5zV>_}XtadxJ_F>+1tB0L&Dq|jq)CP75P}@4a*Fp)_K;6C-T0zO
zGggI&1eD5-5vHe6>Fo@ZJ39dCEe|TS?Mx2+HO|dMs)?p9xP@emu9PN`A!3VBvG4Qj
zq6YRIKSV?1ij5jo9Z*pbeo~_11nlE7hpvr#A9_kFvz(09l#n~xye0#<!L>qWq}u6l
ziyDbAv@~o(V_~9IH(Ak|WFxjbtLydy%5Jop&b_HjewNkinrMCnGX8&c*a77SY8Z)_
zY$b7>sIqQ8KZP24>$mX^-tpgmf9U7G&v(ql)HzN|#ezwJ(L3}Cy#xXJx1JVu^hbw}
z6l=m{KRVpn|4)Zhj&PEl_hL7R7^7~~^o;>?3pr`E;`UGL-BSOf!varA?`sU^9~}ym
z8A!1vm8_Dr`QgY#JRRNAPw-S6MGQaY{f`bI{zr$-KRV?8PlrDgPr1l7Kes%T|D!`B
z>tl)|VKHjHGKw7+d*)P+@AWTg5Z8Pzmp*TwFY4p!(3)9!bXb3Suikhf){o-I|6hm4
z(JP`IR$$y?g=^63KB)L4b|}fv==OlfLFig{Rs1vTPDRQ8ng+YxRc~U2keqJ4Cewdu
zgP>rv0Z|0wy31Q}qLC&93zNZwe>}^F&zsVtK+@w{MG!smh{>8-Z<?s{PU*ouH^RxO
zhvZ%_xdB!2TLd0fm8QC2QF&*u$S`vpAw(cjPmB@uBA^xY<%O6h5#8IBq@iqRJ-)&`
zowk)Z!b97*ZdF+V36ZdC5`cjfg?kweFlzIk&zM;m+Gm_~ZR%`q(Ae%NhZQb}=ve|M
zvW7O7%hUu`CTYkj3G7Uvm+%`KWSU~8fd_=UDLmLsN{<H;zXAMkd8v`Qa=Rm&h_@W)
z#Va?i^XGK42wz6&Q8%T(PHgISU)va#a2t=*jYms_O$B|ql;1lOni7i3ds)jW<yU^$
zM%#$vCn-$eG0iNxw=?+DL)JN#WE#-lhFikMI7+g(Q<0#*^QPicwkNffnJ6M&1_spj
zt2cx%(aTZ!vpPOtzR8tw<_;aobIS5dd^3VQoBCGEC(HNTgyL!bo3ULe&NPM5K^}Ab
zz2s8n+HRP!Kk%?x12AhN5ZyZhN$H;92xYoIrCf!rUp@asC&=nW&f*Tm%CeQS?h_AC
znYeN?q}&J2MzHEvrCvFYOzQvkLzl}2`hx{Kwy$%`W;OooMTZ&MNcb6>9rnF-65%r~
z@%`+TxyAbqGpI26AMvB>oZ>&?NASy*iDpe65H#$iFG@drCwZL}OoF&TUOX0H%PTSd
zNbaEl7?+NSB78fh^8+n7SBXiLJ|v`<<Rr71z;q_gk8`KD&jgFBPu%?|=IT-~c>H5R
zt4G5&3-BUtHOr2zzq&X@iMvhxW5CMZTZTJpr*uLH>4#V0V=y=EWYwmEVsM4$n~1((
z`ZsI1bD2IrZpN&iXS7dBt1GMD<zhZ@3Y;T}Hcwh<u5jTUh@cRU&8h)eQ0<FQEaXcQ
z?NyxIrVsI(#r;6rw|J|lc-P&Otx7voIqwNJ@Wbb})&G1Dsnsb(kd>lwX*}k;d;u);
zIYTsv-LsH3!q(m=2=D(s1{WLLkpqkN%G@k{(nu^psXtcm=fzVngd8XJ_lgYDr1h7s
zE-)Qbs!_n_Q{ef-_sZ7q!9U%ET_Wph_0?9~4=<AB9pc=wJ1VzBJYKhq-nqW2zlmY4
zGj$Qtv3dicNCpl^YrTg9=J_RkiScg+ZnCHc6yLwqH$vjGFy(0YP`D<YBHi74W$=Nr
zZ$IY{&gd%DH67R65WSbH`JEPGos33pwym`Hj#jLXjM5`7nY?0A-~j$aWGJJ+xz;51
z-X5+%a(iHTmkB4mXiyghblY3Gv&=B{GNx_|grWzmk?c@;sYow5tx~bf1VjY~Chbsj
zMljbMbXV!{dQ4Z%JRw@G<)Nepij-!1fW$a?g6)pOaFd<FjIb@AB*szNk^NLR^Csh2
zPLu&@Pb5)1X?C1UP>S^yB8ddvQG>I-_V&;%$u@-RZSAk)BP4Zk3cv}p!?nYns8)?x
z63kh`yI5ciFxCyTDPB;3C&g{ey!Zy(VeWuT{%gBaLLrnisHdbG*8FP{x2~Ma*6Bfq
z_3>eVC{v=-7jLWM{z$jpxhDvh3(T?Es-W{=l3VR~@0cF6>@A@=ZJid1h}ZcMQQ#t<
zo^nfADAJwiRej}n|3h@-39fNKwNi(+?FKn*MSFgmj3M(esw47LFI_&r4>o<P0tvQD
zA~Sv=s0U^~Tq+*R?m_p&B%>?p{95)i)CW{gVwNo~a84w^wJO&rsfgk9bwLu7`|UUh
zkiy_9>8@pEI5wI(fwt(}=<w&4i5_QbeDyCZ-_!x2fcV3?h+decKdOtfFQ@;8W5_(*
zcW7N%Ri|8qcR<hF32Vna*n#*TyJl!GWyKIa(iMxH<UZ+n`#U2(?c)u6h73hNlfH>D
zZXAVaTaQib)La*mfM&9spr%XETYqEy8)pv$Ru^^M5fZ@vjT>*H)&#vHlo%yMB8zQE
zs2-5Wf1HW<xKe{o?LUK=e@>FG4x8Oj`H$zFJ7jwA-E=rRiWJ7w>@jSSYcQp=yWe$C
zi3@@+GCY$caGsr=OA&a3(H8^fRhFI=!ZXN4V9^Hp->I1E7K^2>Tu0PzuP|)BZA$5X
z*@i{r1TD7W$T@Tj_2kMur1!0d%yx(Y9fph$&@U>pZ8omp#nzM)6Yn=SeLS15;^?d?
z9Ww<O7h)w;%t0vUEu_hc!DgEo4&#Kbow7tg<UiFJ<7E_)pa2&$cG$A8_R`}tY}j0F
zqBI(pv|Yg?C~{uyi4}}cWvoC5QqdR(WZ<z?;Ck|L9{pt`<P}ysLz(yB0w;pjMDuaX
zs<^<CScNq-V`}4_YEbA@ao6=Wgg*idLl}>hb&6OWHH=Ml8cY%iE_ks|4CT#rt8?r!
z*Xyqzbj3Ju8)If*xu5=Je>GJ{jm0_&6E#~jI=K=ZVK5J#ylYn>O%$csiL11l5sFG|
zW9<dUh<1y&45<$Id$wWB78srdwLUAz5w|6Qq2Pl`p=w~B%W%2}pvR;E@yc5kQQv(j
zG)Y<0zByt*If)dY>}r2ecc&$B+d3$m%MXdnDg!?gL%V;eSSAPvG^j*ig|AZ4oXaQ=
zmf%?v8J%{*CJR+oPX05O6xP%9A?1b31Kpv5vlD6a+1~_Gp%`rIoN3U!I)*Eji07fX
z00;RMf(S0f#-j33rWgK3bXyD81hdD>@d`#;c~=Fq5`sh~cFlVSP(y%nGV*6yaO2*x
zRC4^MGEg_s$^ZxKOA9(JPBDGX$Xg}%I2TFUeD#)IbqZ27xv^gj<KbT94md%I*^0de
z?MBGVXC!nQ$Ydoq%^?vtHk`unJqO7>0g+y!?@>O8m!@19gGsT$S>N0iY0{1x^Scjm
zdE_=dlk$$htNC6{YamOL+akM{T~7Jd@a|}9YwghPYJYKhKYlcZDt!koq%a|aQ7<4;
z|93Dh5;Ue@g}<<O;iPYK@^Ckrrvwj^lO3ySIC%7Exr!1W?_=t)o0>^`2C)zEhLegi
z9w0io`+^A{cK+^=m^^oYiCF3>btB($UN(XSKcjeN=POUY)ulK!cS^1cWG5N-&u@`T
zL+kV60mj7(?yRf#@-f*3LSghmI={ZkG9<N!09d*R?p$Jk06HYOf$1(at#TCvoJ-g5
zUKYJxry*A6r;<<Zgdj)YJH|g-syJzdkzL%_oPsKM2epnd400_x7`cD6G5gppzA)`F
z6|}ktQC!fa>WSbNXp&5q!Re8R37MvZVZ#bjO<r+U%Dx_5RYSz8p>(HXCinU0F0wb1
z#`MHMrpmYb2sf87Ry|vy^p5Jxl-*fBa}cI5e99k5-spvSVIJuU4PA$l!<ow3*5%lU
zN|FZe+d1mAX6n9EJ`!lhx=T4T>LPBWU!aeHI_*%iY@%GHlPxsi<!>>A--S^LrStO_
zXi=f`E^LD~hCIpgy5){{oF*M^`;oif93Rco-OmS6ktU1OW@?kXI^W)Zy~KzkT^)tw
z2EKd!sw%n1*32rx9ols6=%E9*v}NxA0!q!e?cg<T+Oqd%6jW;GYid@EVD$@P(UG}O
z+V#w`p6!1@6MX|-hcr4b2s*UiEFpp-!IN!H)~3ePH(HwBgF92&sy&pRomG6cLl&kg
z#6N7=mqn^V0FuW2(>a9NxIMn>yuj!K4Cx?D*#<U93Uq#LsK0TGR{HA*0BU8|r1q9Y
zFD2j^{<)*yvwDOenuaCHr*H{!=dd0?%Ag4av=E#;XBDAr*ek=MXV7@-2U@YHBvr(B
zIbx~7z{+hHmkE2~_}bZ$3(w2JM2ikt7UnpkXjcHHh_lEA;e~WNDs+4!3(9l3jfSbF
z{D_7t%2D;#w|R0wN3C9O-1f2CDVfQ4s>Sc&_Xyp4BkJ|cA^>(j_<(hwkn*eyxoy_N
zVPqa|;HPWCVlJ0#8$?wG)r7mex-jy_vjNV{D(|0_B?J#%+03n&Jzx*rE=t!ZcNv9D
zh()Pqp)dY8>MnJV!rdNsrz1y)K&kfoEef-x4m>uUwtU1)Kkc(yWk;PVwrN+kF2U$K
zWBozx5u6-WAF3Hf!r2}A9e0MzaEe%7Bm1-cm|w<laH#5tdVBr0QHB{~9TcAigyLm0
zv2IFcSW(h;jLM~C;O>P50@{C52}93AQWuo-Tg6X13GHFmr`csmK?69}9N53CH16WK
z?UxPtT)q&36es`ldw<Fjk7^WvDtER3+LX|!Yh{(fg*q)5rZ}4CD{(x2b7j|CwFxzI
zbwN0gb*5e2X%qO^n<#@;3O%6SX2=4V5k1!;pup9>%zaNvRM#?|q&a{fMOvB1KODi0
zE7(pqo5-Bz^gUXK34jatqPb=Kx3@+FOqs?d|A$G6R0(8AReu&FZ6kwX&k``q>#KjY
z<S!R`H>vMkR>?nBfwKP?r8ta#eyCi!Snq{qA5wHM^Y)M3yG{@nHdf)Lf+Dkku{y9i
zYjb)&#N{;bt@VKBdOjhGfu}$naCH@Wcv~&;i#j3B5#}X1JvmqjEstcfS=LjsFV6mE
zA$gZL?+GGxAE^I<Z7#1Ys8)!(eh=(TGngyECOBeG7U;uB{xq!zjpE2iB9S-LNLO86
z`u$zqo9!}t{%|Hss#Z|=jX5#qX-l((t2t)%fhsx&EA1b)mTBUjqgObdo;VSmaJQ_*
z0ra_B53!CEt<{)c!}rlnb#C(`tjbYyH`-vX<{i(~`{N|Xu)DM%-MfyZ^1Pz-7Ivjm
zipw1at(BTpE4j>Lb}L~wZ6Y?E3op9gISJp<qim%)e8W5E>jxk`{!TZ;knK@ikd|XH
z|12!Gt`_OSFzKV_AKggXTn8MLhV=g~0v=W7F7_-IQl8rSn0LKR`Ng)v7zN^|u~pLg
zbFYU4o%b<$;N#uJR2K1hP<$eMCRMg==l_RAnj1zs-(+*+f6|0j1V1(uzSIkoMagE5
z6)_NPRh(b*d7YVsFWKZIm?!p9c)9s{_1@Jk>AoVHzhK|C4sX@3Jb)5NUF4fX5r-uV
z$(cv5PV#Sus^N8e)c;DqCd}0fL1r{l9zG|iXv0*gPv49NBx!r~9^jxgkOOT#AEb^G
zKsT3U6d?w(3p6lMtfjAy2c7oQ^S15BTm)(@DPnukc|SXPW5CE<N-cql2*)NY(36;K
zm2HmI12>Q89_xpc_CSFKO}$sOZx=5YL`*3%j~rL<bCG|Gtx8lhuc)c3xaycG#e@2n
z$Ur}@ZJnh3gNVFS(8*g0Wh^Wc1dDO%g~+u;p$ll#De#JEq8Ms9vR@r-1XVsxt&dP!
zq4hc8te1$8n%4P(^Y4~@(Y%x@3t1Dfq+A^+L({t`PIr*l_UqxVY^6GqS(K)aOz}+<
zP{4p@Xbx?`h}+Cn&c0Z~YgnQYm?jZRrINI6cL$C*Rv)5WW{AmvRw%|MJ7&o;M5H?%
zVpCcMDzptz<;js%e<;(W*o3zNSl?W5&1ys^Q9}nq&n~HW@9t7!HS!=&E&#z&q#Q97
z%AIn&6Q_}yWj~*KGt-rI7_Mh<r)w6*glQW#Xu|W7_ez*>RYnq-QdQB1*{A*KX9#;d
zvPz>_<(VSf<=J55nzPw8L#ar)?)H;0E$-MR*9n<}Z5LJWzq`xc=CL@b2HHnVl7i^#
z_D~=LOopPjP!>{(lniXgP4zF`dW~2!1#T(7vPqdq53jK|AzAcVsMHIljjnirNcQ@>
zgbp@kv_wI&G!c~FaU8MSp#*kmZ%^ymG9i5h5RSay*GmSilDA(l0m2^sG(&0!jN_pB
zW5;9Y+Du1BTftW+&*Mb&c;#k6byO8nkblKMtGrP(zY=VmJbkR2VvEnaDL?AY<6|{b
zeYcu)uj!=BT;mHI|KU|3*4Mi9E&yuJV?15iq9gyZ)@;iv-#sjz9bCU(y_rwBZ&uwO
zk6um<L8t5SQUTA2q9fhE-@Q1$abU#Kb>eR61WU2M?0t(hbZhmotLeUe%pAg5TQ0)w
zUlRfz=NUZRZP2in`#7HeRIRSkeRglu8e+~`3!Tfz$Zm$O`>z9!0j+)bFWDVhqF1M*
zH%MWEbj**)g0Eju9d~9_N;>Po+A5mnED$4<S}q5jNyCDenl9`m`9EBTWUvDpYLs5~
zjJmSZmY?1#uRWD3(NL*(6itbke_(!B%6fKiKZ{lDx1m`A)=xlVOX3a=-@M}wRaC$~
zCOWR6_t$xm8ms+;y2Wxg$Dpk?`C+;djoERC-dePPJlv950lA)q*2#}|NY|^WWWa^N
zo!s&4%GQkU(%h<a8qYOor-W#M%#rG4P_b*)f*d3DTN@e+OerN=RT)q=OfDpa%(K<9
z#U*I)ns-9YYXg(Rpk=H+<rPC3%5CH<)|H_pk{*PGEfl;qi#fe#rL-rr@vM-7T1(g>
z>x`jvu>rK?)>HEl++prveDQP5_gMZUWRT-#aP9EeUf=wt<5w}KrvtM>IIQS1huYLj
zGONsW-gk#mPuVW(A+HJV=ah^|WHLgbpB$8^u9GP221jhlf==-zwLV_h68dB#(Gq#&
z9(W?3Ap#w3b?i868iqh(l^3NhYsWi|`hlR32cu?O#H-HgFzFK@9BX+gw$C?(YDx*p
zlBs?RwbJ;!q(@zCCR_^wR>?84Zu~LkBT6BTUlix?@qrrIt-2U<MmDJ|ZTnvc=ejx-
z1W6J_%!9^H4nQEUY^_B3_&aZep}rzR+r!v{uw?J~A><*(`Qp%0fA!~~4rVmn@%Q>K
zcURZw9yMeYEpUtPbuInxFi<~lrk|)Lq*WxndSP5VmB#+GRWvTN%Ppa8ZzvB`qFphy
z1g%`Z^MNXO(a5P?(i7Y5pF$q3L^3G5q{@cWVYJjt0U~w@p&;V|r?HBkYW+G;%t{(i
zTCc6++sm7Aqmx{2No*z<NfSNN$i+R1X7+%>8ivbQ;CzS4IOs|4{c?g>YJd=tOL$Q;
z<z%9;`DqR_W$)?8a&t+$Kx{_a$S%zA1VdKzp+AYill=63B9ROB<{waVmi;9uvJ!M+
zw>LPrwb}v$#JICI#~TqiH5)_5b7aO<Jaf|T4;5lFA_bD&bY%EmSZ|Rb8YiO7=R3E)
zNWbdVNr!ethT3vaGL&yvA`&57K9Iw{-s)c`_k)|FplDL6M3)X%_^h?6Uu^RRz0|<-
z>6N+qS`~hH8+@^4{l4HuY1)4)E@i%ii)Ez=Tkm1<@WlzTOsA~XBzJ#DNQj@6C5uuY
zv{dh6{oAA)#5LL6@GUqhqeO0M8>U}tZPM0-7%uv&SbEv9`mYE6MPgw-kV0J{)leg=
z&QbJ^4Nw-8=virEpOTR(i1DIEc~u=vrmV}JKj4FT#bDXG$;TccZQo^zQD!wwH%G~1
z+;T32ZQ00dcjez3lNv1RXSBKzt5ww?Vv~THRq@YHu3Fu=I=;iY8sRZzZv+ET;6#&v
zT7AI+cc4W!f3lI=ddUmKMry;KlXm9ZI*K>oc>Qu#oI0gCu&_2Fa`-ozIu?2fTrv}#
zpACs}e%ShNhhVyyb1rBnJN67E274oz=u6)5IwMrpj7pk&ueIJI20`U}S(xY{9;{*5
zZEc&D#<pIlnWdBdwM~VEwlVDOKySIs^ZptRUh@tw&G^>VOy_h{vJel=lUv3f$G%vX
zgtHvR=|x}VG@ntaPm=8XP8#~Y?|<s!y%|sphejbhlpxk_J}yOY@b(su^A|W*<eguy
z1l1#^R4?mWF*c2J@sZ)koO&-qLS<||xD^52&hpa#%gVW#5mEphy@FeU1^jHVoAhyO
zBoUO2*3d{J{Kb}Gf<K?-9rm(|0%+t8_TN{wi+M5Y+ga>j_}r&w-h6Yvjp~0j67clh
z|23n?Zanf{g>PQddQ-K56ZN>m*u{ntIcDhZs!RfzX3`YxAC~-%a|p5={@o+bX}bLg
z%*y(^qkp9B$Mc4u%H9K4;4g1vi&4ya|9H50Iee|<S5BVO^c!Vl&L(-ECtv9~C|pKY
z?qN0wX)7s>bR81rA}9|9%#MS=g%OF&Y8pYmI8?lY-D}q#j(N~h@O(Cb@tadR-~wTh
zL^00qGLVe*(aWnat`;2_x;kIziJm&&aRueQrCJ-QygywYHcdVr&cH2&l)G}>cRia5
zG!*;lp3eoX&CmIDvxEol`oJB<0P!ema;SR2qAlPp`Sx-aKP0h3DxY(G7cr|(0sXBX
z0Y?3BXL=QRQ&sbtu~!C)OAdZ~sxwsmHs>~<N%wIg(NC@aLdnRpaMl%6n#q8Pkgmlx
zd3nrwwfqA5ucLFF{kPY%>I68vQL#m&m$U(!^^yQOWITaPjzNBIK^#DdsF7HC+3fS0
ztAJY9nCl8am&Y!2H<6aVtJOK4&@p?G$+82Rja)@|L;>9CSOhzQA>~h>YEp}$m=4oj
z!;qa&|7aUz-C_(R3KTP!3&}y*623XnNV}XF!gxOUX<O*9J_tw`B)>1++aLIaj99=e
z{O?o`Q8J04zwm}oHg0x9H5$43>S{aV>oeE3*@0ZT4^}EQIMg!VO%5YcuTNSKEu4Q`
zFh~pn0B>JB`<q%wT7a4eYioo$1vuzm+zjL3uBeowQc5y1#G1EdY|to-VGD*(pa6po
z7<57)hFs9^r3ug-wg8D56bF*waO2-pX+VF7)kS($9y+UUVa@;g9=w+rg=)OJbjM6j
z$K>9012^9Ki5VG4AkOKho&i{^)b)`VyIB8ZiKH@C?&4!lSHcAMB<^zQ5zWbYvv#rl
zB+YNDC)7lOSnclZo^P0aX*=8mB>HYVZ%{;@SX4s$;EPg=91KJSG;+O63-I+*af20)
zGD)G>rqJ{!!WZ1~#~b%k6|A78t;OOJ^*HVN{a`>Q<<K6^`qsNCT$j%7OmmnpRtnSA
zXdG2drbrZ#hZFnmTTP2Mnjytvh!qjrKH3sARSX*PM*rZKF^q~U@{fmU=}&Yc!d{=w
zcP@9OVsA8&ggu#Scy(P){&D|DBT5pZ04U);dD@xGXjQ~qrhwhdEo6wIqm{T?&;MKU
zByR={PzyuR-&-0j?SdZCmV7tnzT%Abuq)dwoBsnyOvdAIb{DeWQ;i)m<7NL%1HAZD
z?)w2Kxr~2XMH{~U6CaVlz~LV^@KnpKT5eeiAI>gvC`4ckEv*z@uoaX#i!Ueo-Ct~K
z%W=Jdk3RG@KYz6`0n+Hb1>MaZtkNp$G1y*bS2^2Yard?-e|jTwISH^7&2rrhtg~x9
zln(`2ucAw{-hHz~pocy}?V%L-TbO%-u)UPftjR|;(cHYh9u;xI7T(Z~xV?6aC6&)h
zHBtIo|9pVL{gw=N5bwmJpc{I#8ngvzU?ORIf8d65Dh5rc^|Cs2*O_wjcR=~Q=qMqd
z1Qh%NzFZ&t2E@2tCv202U66@tDGo;3c}_`8`qE{0@Yr5S#LN@?g2|$e)MsyYgg8U?
zoags$v?szDnD@uZvC<gQ7KcDTKw3as@F!#N<kiIH`Xu34)W~IxIXTO=A!4Cg6+|P}
z7&Hh>)PL<;|I7Y_^X3_4;mM_1u6(|%RHMWu%#NZ{`)yS$-E@^>kw-GLGfLGxB}Jp)
z9^8z1ZPmoH`-n(jP@1@Zb*nqbZd<W?o6~pEk!Sa~#lpAq>_C0rC+mO3zpOferlSUp
zbIc>7jc)B<v|^1ejjq<i0Q}RkC`GJ5K*1#vcfE>m8gm)jw$@m0{wgS*$;6b&VR{k4
z2G9WQT^0XDcEf@Sj`Tyy)uFc*Akk9{%&^WTZ!NU_@T;_w8k*ugK-8)&<cIR1h=_+-
zu#0=4V^Y)~(mI@9`;sufrv1s5woo={R4Bkm4aGu5&&lbfk!LYcCE^Ig5$4-k`eDbs
z@4syx7H3EvkC~b)n&|h#4*UT0k_!hhSo?~c1lj1z7H}x!E|_>>fJYseox+|(ny-~~
z$iwF55|}Cb*AY@tOUMM|(vK&$@^>{*R8F_{8yiZH@A&?5yyeT+d3-|c<Vf)iSlnCg
zRKJ+{K)uLjcjCCdj?~(9c626NCWpOL>LhWfH$Z$J?>d@C%q?kFcMPmV*Kr#T{faOI
zDZR!!FjGVgQ2zaHlmcn-H)aFN0HY!et&F(Lqbx0Wib(}YqF>bL?m>d-^-~wHWh-1o
ztYt?+v+v@PgYm4Nc~VNIjM`ByK8T<DmRAs1w!EYHtHE>5MxI^*7@pp=tAu9iL&vPv
z1kKNUvWY%a)7NjAURRE=L%Ee0D6Wdw6%f?UHI_^)?|?0`l^1@!)MK9S<#_H?W)FZC
z#D%}i$BpKX-*Lf25}B2sFw9;|#dY9@XeFClPSyV6gBaV#y8CngUK8fy4*f*+)nx+A
z09dm673WJ4A!weCv%gkT>(g#RWGI==G^Utjhc%rspODUTydx5$74;FQkX`(U*kV7w
zYT49Uue9K(Mw!Q&4`dn(scv}Dl*@{3+LSUfQKVrFi!=Y*N+G?6_CuoLv@}{~A!*Fz
zdHrw^&k!pu&_g0XAZZJ7Yk>q?>AmEiks^-hFn-GtuKRgA&LedHt4u_Qw0`i7J2ccd
zY_tnp8O-Z`c<$w`!NO3e1x*XU8qNnfcnsUUEl0+qFO4nq@4j1YXr9iJ&1<|z9d5b1
znOMdg>F$l~>QYPTXZiMI`E8A46$~mMfptbP#a?z*sUn4hha=ENZegs+*?Qc)k+UL>
zu5l&weCBmSbx10ortu;s{!fF&pk^2-xbj`TP(rm&#K>s)7ubzZzhyOj(s&S+=El3R
z1;eLN%;x*L)c-K#Wv92yf}W5^IU})luZ`72v0X}GUH$QHT$MjzIZ|{;LU>ew-FqrI
zdQO}E$@cnGDqG9`Tzh?G>)NNs+Wn^4)+AQ~14n{YS}71uB1&M73NjRJQsmeCexH&_
zCoKdcoW!?y*2!-7xVpf}K~qNr6@>u8=`kFFE6}3v>C9d8m*_Qt#oM}58f8lyoOYUe
zGrPDD$LS;S+LP+*tdknbG-sFTJeW}8{Zu>5U;9${IrvKcIrs`^n><bfqeTAAZ8E2)
zmqwYTIG)5EC`cb(2WCpQb$#USaJ#?TC-6#bEke^F2Li>Wa$h`G2ddLDDHni>p?sFA
zpF3dci2@pbG@*wm4X6(rgCR+4aElj#Vr@6b({slFEqoohsA>S1pI>Td6e$kiUfsL_
z9{;BOxw0aXt6S^33h_UCXcgTbDW9KdTz%e+OlIxZkxH`L(6yk9>LtZ1ek`r-JhIAG
zq*cM?hE|}ZV3m<G%<Y5y0`)DQ@f4s5;5j_Sa0wE}?fMgWPPrziT0p^K!4ygBIi{n_
zyX(2LGO_{(E-W9ZUDFmxvuf5u86;$OrbF_JjKKaTv#9@*GDQRbEmm3E=CW1&EQ(UC
z;dEhz(ahiJ%o>wfK79=vCVNlYp+V#VRdh9$^tHEVyuT(%9;W^XN&wqoWXu1|?$?#b
z$ZK$htG4Od=*Po@HU$!$P6Bl4il+SvvD?@E6K`AVm-iz^RPp?+?aR9iS8IDGt|$Wf
z^Zx0}tqm5uE6E}@rU{t@xwTlx%T{QHBN|nd;}1o~Dy~^0eN{nnM$J_Qi@O<l&bqg4
z&iS}@?#PDFyHZeo(A4%|D~Up~ntMOEKnVj44_Jl}h7DSy>YLW@-{!Yvb}#cDY$!rI
z;9BJZPkNb@ouilZ&z@enc0_}hY1elb4P0i#GZ?$+7h<OAHH_QV*Pk9tHhF-C^lowN
z_S5@RT};Sj3zVce#YM5$V$Uu%skM^y_*1E!Wvio%|C#Hs$MB&b4^#ZT>PMfmiP3&z
znIq9AA`F#6uyd^O4MNoa{knxJ<N25K%yZW6^8Wpk7PLb0%tv*Ymo$u9i@W@Vy5D_$
z!ER1&O{kD~;Q744GrgK}s~(3cK+g`l^V^20itvyFm<Q(Pk%=M|Y*(*Qq);)E%v}Ta
zG`jjGDh``sH6-7oYc5BOgBq!5%CW30#TPfOc<n=x6d*ay9U_cIHHe-DM0yl^4;oZ7
zK$K)L3Y(G#0f>&Yiowaz+E~1f$XRCNqe(2EGn(i@o~J)vBj=@po7xS_h*SynOD>d%
zMVize3?TSz6_zf>97&4qpf2XuH<K~LI6O)>0i%>pK>o<vEU8)~!1Ah?{sV`99w|FL
z6gHcPJ&;N$li<DMuo%(8f)f!O#3*5w-aFISbW}-?M0v013&@q2EvQKS#jCiZCG?2d
z0m`33HLDY{r3+F{WryS-03H=~DZJedzfn(ax<F%*XBW}+kuk<n7xf$F<YfkL0UV)=
z)vP`bFPq=Y18+#Ed&fZuuqOGBBI%d*OuBf!-Ns_Et2PfV!U<R#=f&Rw9V%19Tk-w4
zeh)a_qp6Ew>Xgxd^$+4L)0OWUpzL?PA{0%Q)<^JtyorK|e+f*DH4lo(mK%fF#lOAM
z?7Xh&^TC;-HD#VGR3LAwUQ?s7$fh@6j~cRMcH9=~?Bs)*h(a;zhy$EesAT?}Mgv0{
z?eoKilpw3<HOxjek6ss{sJpI4ID!+(Mfl+fwVl#<F3-a$NIv11Pt5P$giT8~O+ks)
z1b@o7ZSQ5ngg09*%+*7+=i_ZsQOBl{J2kGnQ21G&h?KS{rh=D>ApZ@=<&6@xb6VKt
zT0b^YYkzJw4y?Wj-oyHUOL@X8Bfpq#OZq91YGSa;<rRwe)Yx<}Z7bglgWty2Io8Q&
zMn4Dv)kWigdq2@5g4ej^lKrmCQ=EWpn&z7{d@onO5k*QzQA@S@{zZ>R?9O%)nu#1o
zpuv<YrTAqvtkb={&GE>|JP-5E)$XusBdcVK-C4a8y1VXT8<^9##8kUVKxf$5C3^-f
zo5DoNr=iGuwHP$yrMpght2@;?B4^K(GJ38Pgl<-KI*jXe69GBzz8B~`wY<YOsjBI?
zCW7L9teQDGBPJL5%M?eJer2B6hS7RW=8_la=M>%eQdonbJV~4MsQdW>AP5;~&Y3mJ
zOJF|DvEAzBvAgGhNsA3vz3I!k5lkKA3qZMPB^DG!@`a_?sMsUerOLeTj`dgr7#Ci@
z(X@~{ig0|yiH&)QfN6ocA5pTfYV(B+t9)}JV$qJ|L4Fvu{y?b``CovEjuf-=4DpDG
zNaIO5K*mFnGClMj<kvsnZZF@rZMLY$aSLI?0!8Ed{0kLo{*s;o<E6pM`(qY}lX`|n
zqj4Hk&+ZTxQIN_TF?(eUj0Y;x-bNLR3m4;?H53@Em>HcCHd^8q6&SpEkfx+jckwxV
zK+O!-fbW6}9X`)@vn$4>RsXZ_tBSL)#>!>PF8}xpEm%RP#_Meh5)qJ{W40Yc9W@HY
z8gA;hjOAF0e3|Pz_BNz;kJLY60&qrE!}ZjnKwg#$vPl!ODfL0JH=!iRVR0g|tld0@
z-^N0dqK9=iC1m@J9<4YS0Y58O6BgbH!5^d9w)1MNtp(<ZC_29xX{oHQz&5VE@dY~T
z!k0gS(?(QF;P{V8-DKIF5xppuXW;SGfia?~V)-d0`~y)BM+iN3W!E2|{zZyPH3FiK
zm?j!N2Y%kv!*8F;EhuGI`bH?fSqQA^5YLztWpC=43+4a?wYHh!Lun6|JeIq=DQUUJ
zEK3cszsRYEsilKf{l^YR5{`u)*_Gnt6PFg9&k1*WJX6MRl~O<H?95>UxJe~aQ!O)6
z+6^d7VGRrI=-fI-12!KK2{c8dj{cv16uJ`P8*R>nA6L39ZY)v0v%a)EOI}B)akXQ)
z=GoB@08!!`qbRrhT}Vmb)ls<iH#s^pkp<?skx=@p#GI{ZSnrp&xxxPX7KOsxS2L)1
zJ%>$!GwA3-w2v<VM22NW`Q&BEmLSt_aVuS#-V2-0q2OET%Wu9l{rQ!J<v^Q$?<OvY
zO3QX-MFq$CR$~U|S|?e7#2x3NGzGrOY=@;f3i)L%W`&9YBdT8UYLF?ghg<T;EOk@O
zCDB#y(O)EEB(zoD$}UUuCJg)Sz91w*VT|18%7ewGJciiexbw>(G%!Jo%HhgE_w}kv
z?gA?9*}4c*jTk}D0+uO>CM0P3K@_(_cFmL_=tHFYFmG&;Lo0$jnuQU2IW}OCqODT}
zY~^K#Wwia{sT&SVwY=T~ZB09elJn{<zMLdr-5^y%^NNVqkVW3{x7M;W?0#R-hh1{_
zb`ZwIn!cP~EO+Zsl|nwO8|4}rOdb_++hH|;N9c;)ibdz1Q@lPMwkMy;7#*V=v&_(>
za@P{IZq<}jn-;{<<Y$in)t1&|JZJ1Nq-J2umMMfy?_YfNISUlV_S}Zuk0pFwPab?@
zm&NYQqVFC{v%ub~`$s#;>a4VBc#T}pN?y6wB{`6vt}~VIIZ298d|Yy!o=OOK$r{2P
zuaOeTWc%?2o&fUl9i;6OrRt1qQ=#Apn`W-2frQuH;@a@~sz?i+&AGG_b`N{;!1h&x
zq(6q>8IoUk_-{|dCyaeqt#lpc*AGsdX`a!hmn$BA@5e`+&OKxX`=qirw#U%lv%--+
zf0vT>rIV^xU+wPxvRm#~zuKG+ql6sexaex$JG^W3<F=`HWNM!e@l`7H%KYS^JD;hJ
zc7Q_lufrt-`Nd%w_TnT@r);oYi!++22#0)J*MgLHb0Iv;xw4**CNpHNur?v%qCg{e
z0N4mYrN7;53t;qMAhGm2t6?NPqDxiP_fiuKzxd(w37f&8vaR?Pz;UI*QPSSvnN*s(
zcn;_)B%J`7%DGncu0;z##D{V}Xth>))TKp649S!kC321@6T1|<nDJH5#%$5D0!A}T
zJu;qyAqdkZ>mD2zQZw&e_zvqVLE1#J!L;ARmJb`k+p{Jn=R-&eJIH@EcaMO|!8e^B
zh{LX~B%x2jLyh)I1|NV%Cr=U&{@Hl_Qmns8=ZN8zHpXUt{!*=GydCsb(CL8LNop8m
z@n;E^kuL_~uFK!jG(M2!YJ0u~N-69#Z@%D02vlm|_HXx};5?DF`}e*N_gmI><SX-}
z<y#i_&=t3zs^#4FI4FmqA-Zi%BAz7Q2+V$A^O=Y0FQ|;Rpx_6W(pQn`U?9lVyO1Yv
zl9K#?^M&_xHT!R5D9RfdbMqj*a^`>LHzJe=Z7Bm92BJ;#Rp~F+nYd&%6-pX-V)j>E
z?_JkZu3n1h&M4a106TEmAo|!aB)=_|c{C;PCVsaK<+OM%&i!t+Xmpf|J;UrC9!;pk
z8zJ>Xt=!=AiJS?k498w&7P#AI36GWv3dx<aE%P{Zv{Wr2ivQzL6gdr6$T@&Iheb}Y
z0ypzszwbR=?cPoa{7r7sLu;Do(ZDDlEURq^uB-v`A_Nm*N&kbY;W3mVPplpkEc_5Y
zr>VRsk=O7biKT4t1~-oN$R3X6NPcm}HoP_~h3?QVQJa0<QA(coP4Cj=zDaZNM`K3K
zk{QL=*H6IKZnqn&23iGDiN#EBprdRgbLtAy(n<jBE9Q_%J}x4uI+d2%!XzpCxOFH~
zy~Cwx)Ds0mrc<)RXvlNN^EcreG7t|jiV1en&qVGbq!x0PXF<c7I1k<{PUZ<bE%_69
ze`z+90U0U#b=%>IkTd>k#sgj9hrI>p7iJ=DJqPaSu(L>8gloRd?hBK(P;LnsLcpXW
zxXL%{k}2tZNSA8gI1mc<klE<Tk}b{G-hx!n*9j~D$;s@26JvW;1){-xhOCx<cct?Q
zSxv8rJ@7s%YObEe+PuF<4GsrxCOGCe$d+|%Kybp}GZGKmeaK1}A$anPAx((B^`7Oa
zL0E%9D|jua;yyhyrGAp@ja&8+*(F;Ok!&Mu6A+!a^hX=|Y#x#lb80^5K|z@q$Wpg~
zAy%zXD8o@J^demIF4}(($d=Uf9=oM_<H9wY6)~$ZT##*`X;{O0vC@Yv#Ecztxq~mu
zSAk!I6EPuJaDFa97F%ji?+5qjA~1jV7U5uZDlYtK_bYbY8`hn;_5B<?C8w8sk^#_r
zS0C;RH3uZRa#4^jo+g-JOBk0skaHy3S<JPrgLrLiE5E~ci`f1YSNvZW0o!U6!ECLN
zT!Z?D+<xM#?H*^$NlL2dFFgHU4qn0G4Gd+_sRk@QCMHJqoUS%zr~(Zf?WVjK7WXgc
zr)UPKAjI6Cjmr?)8y&-|n9W^<2+7Y<t^m#T-;5uy{uhwQ742B72blFv`Yqf`+rdif
z&iT(ff*WLOkHE>AHwUrxNRH@pdO^TG{wK2*7j(Ny_S?-rL&TMhL^)^SgNj}qrp8!&
z2_~3ks+jv^$qys+KrU>J^L7lQ3B&~Tw&LWA6PAI#?j*|b#_b!`Yrx57B9)JF-2un=
zOGlb@HyKQ^xN`a%{{=c9egRdRVJ5c?B4~jI1!hYhNE>+~|A>r>)g@7<zdL}IsFzJm
zcBvU98JU&FWbM|3P3=xLxgyfq$#w~f-PX~2@Q0o7QC!vZD)zvr?rlqaug5Pd^@gHl
zzZWPGXF;`FR-FmPZ58SvMQm*sVra)=I4pwi--Y0!>>*MrTx`4SeBr6Wz+}lmHuyN5
z!UBOl{XpVO4{;B<sA~PcMT7Qm8|t)Lra4*5w9d1?w2=qYL;lgiYUI(_FqXzC;Z#rh
zY~uoE;|<$Sb$FG;h~l{Kwz55bivGsuI~F-TXZ_LbGN3`2;_Q1|ry9UmKr$RKD$$ro
zRN2wLdyhI|`iSudwcYxQ{3Tmdl7D)-;f9&m9BsyUKGkSsIzO-rH|^_*#tBqjB_jS>
z_>F=xB08GO)n-z3>Zy>g25|4g9$$g#ws~FC(gk0O3UQ99|F=jSg(d!3Bo+l7LQw}v
z+k^4Ym(4JU0>bKFY8K<Idf_+`xv_Lh09C{(Xx#<!nE2g?>Qj&M<;p*PxN6X31U<EA
z%A5mF|9(t%(`#6JRbzN7!~U+<gk!iA%YCpuN<95%<L8%`@afa*(GHnpHQ`ih?}DW>
z8Ilcwb3J$ku(sIFvstMTCe#e64JC1AeP2=PrmaB#tJID<Ekog25k-L%DfpQFxg*St
zeenD}unn~NZ_b#=GY>zBD;&QGw4Mf&aylKbhJC=^(r%LQ1m-xgKk%#$R4$!c)4CEW
zP<j_ZNt-SY9U6va{XY^D^`RonZz8BYYb=>slO0s8?#^KPhg+>8tvjx(aKZLGCX3$k
zKizla5O{j7kiZI15`8C6kBfB8M%><Twl*K~Ay--GiWQ91yqL%uBmQO}elxVPm)20K
z2qi-YIBQy#3wFQ<hIB1j_e~l|bAs5P8I*r6po`fS;K1>N+4!`hXl;Emc2eF0`t@Dq
z4tp_min8$-0#4FE#sjwvCo@LI;lOR0)+?dr4HYYs3F7#Mt{1ch{;A|mq1`Z1Bn45p
zjtXehS|W~ltIH&kA~}|f)_lF$m8&)Y6rA8Q36}mH`Je&UpT+r{?Eam(c8c+jLZ}S3
z<^2GP3+=cBtv@wwye)Wh|I2yoA{IvJDzcu`B-u2mXiimIw5|qjG+>{BEt(Z58}Ujk
zmVh8VUYcuR@?OJJmoOl+^QV*V61HD0RUC@d^=cTOuXi=Ae<2^V*-H(|G1a(w$-4Zn
zma4WY3^!9IGw<9zitbX`=T(v50a;|G?wO6nCftJL-(kkMj-TX0aK$JCu?w1Whp-;;
z^fJ`#Sg#|pGXgl=5MwE2U7#;6yLB3ph^ZiU#L-O<1S`5Qz{YXv1W)<OBU~y9<GBH_
z0SUoN36WdWeZTU=#gi)Kjknd+>CThp^sMJ84LK~`;$4E4H*8)tkgTDGSE>JghcaJ4
zGenw^7%Zh=GFKuY)2!N?o{@U!d7yuolC>4VD0LlpQ1UnDGzqn@qsV>5z%&Y^bF0wg
zH7F+vxLXDMVM)_P$*d;vg%k3*N9cnul;%koyq%MggB;mJY2YEOQ)3~B>EwmnPXsot
zCb^Q6-q&~H7@V>d6i9+wJk)&TIT!JBx3dS9809U$_*m=EL-9)c?DD}(HaX`qvJZie
z-NDzCjO+_-BWAurrG8lE>!Fo{m%5viD^@+by`Oi|`k(PlS>o+^MrRz=-X%|*<-;ji
zZyS0jh3?wPA6F;ErlqR(y9=Sc=mKJ}QWqCzQk{{d#7(yTf$<a{`^pWgML#yFmt$-7
z+{U@1>pTz`k+$E#Dz5o{+bFD=De9~1!!*!_wqM6OHm0H~-Jp`pT<Orv$B9WA=}ONH
z@#~w@)-gNjpkLCjAK{5n-<lO3-B=cC{tF@pe8n$G-cQd*#r8lKQVL?SEf`NE`5NnU
z_&zy21=CWH8VgP3nJ*q16DBx+lfN1_J-nVQf<1-aeIX`U8Y8#Y1l;-skHA5wUD^MY
z`$=6db(TBScku|4SgD;=L<zOezzW`bd#aJ;0~vMLU!@+NtFc~GLE~?S<~ua_5#_*W
zWte4~LZWtb-L#!W4nH_(x+YB>I}*l81W7A>)HGB7M!H@FuKxT~aq`6COd1MV+Fr!|
zR9qK%a{UUo9^xI3>YZud+Q5JX1Gcsi>jN^+fZ~X$S!yD!E6^0jXg>7metr_ts8orE
zy3~pp1^sjV{<ZSFRRtft2k2;I`EZZ$l(s?h7BunZhx&-tPL4MdnFAwPK0l;}UcRw<
zTg{rsRf{~&GSA6ucjbi}HBOwfJ5v;aH~AQK4f9=16B!q3{o*#j*`$U6W{lcnxj&9b
zZ22b&>?6?+3K>!#O0&5T(+3m=a@JSxkyFLKF?c>--@I%Z8t#}zyOCJ25$NU}&-hI%
zSt_dH-R5h{?@v6ok_b!~<H)_S2E9ol%^#|jw?1!%DM|>Z_<}+z&u{CKD<HM{wWN~F
zOv5#)hSXbkq-=_yh?P&@j6S=ObL7+1+c`eRKK_m3(+RIQX43O9?^}I}LJ=N<?av#x
z17|GB=M>=OM0_fqs8we+Wfq^=5;;KK_RNzW3$|<{I0qSp262Vey?-t?P)d3HHZ?g1
z#y(L5pA3>oi-GZ-(_<hA4=ll_c-{Uw_XyJH(83~QGs<k|S2lFCRILf>y>|h>f%rix
zrQq;&bvAiBc`#gGp5VG{Y9!_UoVW>qy1Zng`O@RBAiLD7o|4(}i8<$SPnpC<>l)NW
zZ($tJgVHNi8~^ZND^!^RI+?tk#`;d6*Jwismw-EfpmL*?;)17D1ezeR3_$`$(-WM)
zsRBI-p*Y=Wy&&5T=)q60{gM}nOe4&^Cn<(WS?w+uXV=aNMHRDaH`Oiv37c^-FX5I3
z5k>UI|8~%x#KPZ)!MW|wr%8#Hk7+G;6!`{;czP<|t4__Cn<s}s9Jl$~OC9>_FN7!0
zCsfMji=;+7bRWhY0L6V2N?J8BST)m00bz%C0SF_~g(%IBa)XQ_svI=%#CN+40}9du
zWlS+3u{|)!dPJaR+s^vu_*Z*~fWlcXUreuDNPyRyvbrTA@7I7I#*TXkD#bV~9;bOW
za%EEtX6JK0_1`}uYQ`5*hj@l9L>JMDgGDz?1j(uJn%YTXQrx2Z2nSLthnpm$%AZ4C
zHz}*}xlc%Y7f3!LbvKR}m3>`-m}lnZ$w8j3gb7dxddbp?!z(<AhY-T`Cs%qPDeHfP
z?k1c4Ys4mBK&Uy8Nc2Dj`YD1q2fI|CSolBWeGMPY-|b}PnTCi+39`Pt;cr@!d@l3=
zwO(d|*BLNK>HhH5@?P-aYt<EU(SD>MZ6cRhV$H;Rv>YX>G5~77_C#{%5JnXivyS9k
zWr~p_Rgy_7{I^jmU(=m{?0L3T9C-U>*Xvvtsy@?3-%D-Er3iw(K5`Oqv|&V)++o{l
z-Fs--)!MK;h}{V|q%sP5B+!W8DfA`8`LT*<5=2Zh3g9GzSZBh3E!jSu@MtK|PBO}t
zGwQ$YeXu~?nPp6&kSSFJ5)y~&4!4FRCe`NYzQS@`(x*hw+~i?*)V?`8?X5ltoP!ps
z7Bmn?Bwz7@{|*pmR6)PNX2UD;VI>)r$O1UwBpd|sb4!M_3K1D=M;{0iu*8ChUtQIH
zo#EWk;qYaGr-fM7W<Hzk(0LuWhp(IO_!Jeav)Re|3D`8re4VChec7e?=u1j6z8|ha
zdG6Hd9ch`LqXr4i45LPmjgK7n2sZE$J;z;RmXiPLwPK!&r|00r8ZQoA6=9|TxP$eJ
zPW6#R0s!q(h+U$hVsHT4D`?|=sCk}st0<FHzERlRyZrb#AK6Z(bQ9_d)$iFjw5>)4
z^70Nof)mgqX(>_zX$OB<3$$_6VT)3?F8v2cnx!Ghv?1_X11zZ>TSzz_+JS_nl9d^D
zXMMRvvkY4{N~lhC#aE^W1IJD2&nI^Ayi$Y=CU;v2d<6zt`_@z)#WK+(yI*|rSzPd%
zcGpJ~Vl1~aCc8)?Lj1r~S9+RJeR`EQ2fyWrfAPZ>2G@?J_7|Hc7tAWG{<-Pj=+A0r
zQD<O_R<_t1+DCGJr*TPs^ddwT&MR-o4;CvlTEPj#LHwp(trA?LGOfS>ql@lc&y@mM
zlYRwEQ->+*lX;-gs2t?S^QGcUl;boYCi0pUuZvu0ECS#`!5%=PTB7i(1wfTuY<*Fn
z?^&HJs2eb2m}&PFH%-JXR%30#<<E82S36MPX#PI{P(ZK0;^uu-BX-&Sw&6Z;*}K^c
z{Idls*2_?~=Bgz}1|bL<`5>RujEIAIij2o&OKp9GHAmVf4zwfAw}T4wknDZiFR&Kl
zk3JyQRM;n76Sm(b^%-oyOVPgArPjM1L8RQ|NUiKzTLbwe17<zP5nTb<t~h%iMAS$W
zq82S>y#!Zu>B8m_&i`Bz=pM3NvQo1|3HL-1I%2fr|3Ygrpf(2tGS1#WuHL}aH;zq3
zV*{pfOz2LbuFMlFmdy3M%dsL~wE@codSKgHTvRyc6re~bhih-#D*{KKg|=GeOk2FM
zq{g&$BXO&QHj`PW)h5iPHr?G=7-J;7kuX(4n+c=SY7<73j*d~9+hwp!tF><{bLy4~
z{90Au=A@;jBm?}v@y(!vD@F004`=*P3?tiWsH=SU;Bbx@A0wU`nJc3l@)hnyGqL}u
z?7<O0Y*dPBlZCp$nIp%XiTKjq8*MO{lkm+v)C}XF#6$f+-^zn#_bcwJ3HGr#9&l5B
z+>1xFK4{m?po+(y37X$E$zl%+q)O|++XDejy;gt0?DaNV-a*p<Rks*gLmfYjmT^EO
zdc-OQ**>%+a{8Lm{s13wG`{5UjvqfmGY)Obj6uuM;f&PGm~yR4ZXLC_04q(rkreJO
zI?9Un`S!^N$2>{<$z+OU4FWhh+CKQ_Eq|^*8<E|<-X=nfQg^x_#Tw{uNar(Mlkp+x
z+`B<mnU1f08hFMUW1=b<b-jC>yEjkEu@O!dPW>bkrA^9CkRJm7k(TE;V0l2@drH8N
z3pbpriEmww;ifSS+F-`!$#414OZ&n&nkp4-MVi7o(0&HcZ~{@aknH5^O>`{mY&8=3
zSt!2VSn_PoVkqf9jT%=zrXLdS)oEPo*mMoQ6p+osbVxcN9#g|OaiE|J44yO)=L>wC
zgu{BAL+ms=3{BrDY>sheSR;jgoKY;^v}`F9Wj!)03ckPmMe6fVZ!7HXBz(P7w78rX
zLO~ZCE5~yHxyJ;rI=JqBrQO%k07CLBm8c`Kw~H+W{I5j}o}xnM>qj17ku9Tc{h>}s
z2b^Y%RREhoN?~j0qY}EM>RN2SePVD{EE$#403-~4etFLi377tqMLdb%DYMpUl}_}v
zL@^waS6Fs2I(L~D@OYh(h<iAn+$VK@!JBbgLs-ogmVVJ{Xkg}M0sN;yK5WkE>T({m
z)j;+hwT>oN0N?(&wqtJU0Ut)<>0%l|?uV_Q%#h|yJjZHI^4o8QT@J@>1yj2Y3)VFO
zY~w+d&ei7gMOC~AWUOm<2gH6foll)i4;FXgMxzz)k!4TOFC~u=`CDC%J?CYBeGh3)
zp{jte7OeUdqcwk-gF3@yv_KFMJ}zkh66RNCing3>qXS|5dr^kv*52-JSBkl*>(=jP
zmBEjuU~zLHk<)UhUx9~Q&%#*Edd{7)R?)__iqS~i3wwR@Ve+r{ug`9DjcFGve&qMW
z{B&Kt3(%m2ywuT<%Ko*s=DDJ(K~)+v+Sa3dz@chEdO{P`Cik1KedPPNnxtfY;9UR;
zr(bK8E4l=@q}t=~-a@yPUP~xwer5>&vV_jE09As=g)0aLEK@|0kVJUgpg9;Gui(X4
zw|X9vg`wsK<P^HF!t97LSwyQUukPIS!)E81LKV$6h|$`}`Tz8UUe6egnKS<~E6sBl
zNFFI$qZ#m~Em}cbb|m*M^IdQeP=tH$`r3^LQptdrrt%I!91q$~B_#_xJ$aw95}D?9
z@&r`25^-~up3g~zffj_NNtQ6CW>P)HD!cQmH}dixQHO|NH?)~`OEcY~@F3&3uRenE
z>7Q|Da9kYlJt3w#5%cGG<*c}SSR51D=+*{qxh1tSX@Z!j>#p&YZmrvpa7iTFn22#e
zMIYiI@~HFTHheLtV`$%w3Ujc!L92!<I{F&8V#-qD1t%@qgE|3BAueb*=haua;8K4v
zzN5(db=>PK8*YBx#pw^qEYt{)8>Grc-W{qdi=2WyCutJNQ0U9CIwGvn7&g+VXZg|k
zjs2;iC9z)>{8^}2bB9GT$Vk~8gz-c=jMd`?1pTqze{e#_8)X8&4>a`q<mJnb-{?E~
zEkf7>z&mcD(<sQ6p|jVZJp+zwL{u{y!yv8qaUH<pR+A;3#P3shE!)5NOPg0{MgE~>
zYO&07;_c-Rmy@%17dz!U6ozzlskxG6E6tX9A>Zip_p7Cc^j}$sE-U#Ayu~~ZZ>~_R
z<xkB)RI>6@p68xY<3m}~);Nsv_khI3A}nw`;)d&$yDs6H;;Uc{*yM{Uql!~hu6{s6
zD+&qY-JX&4v3Lt*|Eat@lc5g{Tzz;BYy5?rFW^bMoHVjLv~l6lnVSXa7toRKHjQjg
zO-he8?=~;yHQWasiT5K6PnRryEb-ohW~hgUA~{|M8RV}O4NQHjw*zdcyQ7XMPF%(h
z)c^qxBki_LHL-P6kc=@pCyd4v+Zzp5J4zmuiCEC_Oju&%pu|Ya9-qH1WeOnSa7J0e
zzMU5|0pIo;Dw^6_Mv<|co!1o#xz={Zjqp1*omws&3^d8DyHBmVOGe5tkAt#{(ZG!p
z>eacK%^DKFQm5!<_|>}NVvZ6>yLQ)aW`wB=L{DKwG^2`GaT~ABiP8m&R{SWX{A#Sz
zdoSM8&|VQ0mkA_O{6r1O;nSsjVJS3@n0)yf35DkLNv5)>G8am_Sk<CIsxFcJnKYO)
z^}o}gcDb%agG<N^Z2jz5c*D^+0^0;Qm}LB-E3dIySdinnFW>?5N$h$~CFzthnRX*|
zKzgJ%Ah*{ySCh-*SCfmg^P4sWxes5!nZ>=D$;dOUFCZm*K2rtxO;z$WPRQ%Y8~2DC
zw)gy&{1Y~GThRd`_DENny*uoJio4`v7bNI@B3-G8(O;8pw>M}*re0nyp;X8KydFM(
zaeQNLNLOwhqrWGOtQjwJTX{2)HDdelTyBTmJS&a1+qtj2kN!*%<SX~T5AUQa(oCBb
zO7FzC3s8gB9v*pIXeSgk9o?;)B$TC<30^))EgDcp=M<08Ui{j1KDyh#+-^@kz3e+j
zquY`5@!wte+&}6*`Y-eob~gy_-05e0F*8pa9Y8!?(8}2;uSbhF*CZ=^(%bUFn8NsR
z?~`?(?C^Ix#@dV0qJtfjyJ|BF<?{kR!HQh9EBSj41=SX^4S+V14T)Pp?wWvG6;(>6
z6~s5qJSN~fVLEeq-QJD{GY|_*&Dc)<#Y(L&)BFIZSwJKP7s3)7tvOM?;RweX6y7qZ
zcf#QiZ_cXoOd=WyK0g!Z{Mj8pM-#8^ETQ@I`JVz&nV%$|v-0g?vUFodb5cNM8`>K6
z#q&n945V1*q;N#YUX=Qn$ALM{4&)TqkVU`mu1i;*Aj#>fak_6Cx)v<(sMKg2j15FJ
z8sac5$J=?cXkOgkE{XNhq*#3q?u$K3@b<X%U&UElZ`(E$e)q57f*6)p=h8mxLC&pd
zk}hboc1>Dfurq^}XqzZa8YJb^YxCcCNL{Q8B|BMx`5{rPb3fm?kU2VC%oeTI!LKd!
zE4rIeg(j2{1iu$pY9uB|&j`9*%_oAd;Je@}o|1haHuPT5MOS!C2}d7=COn`-qN9oZ
z=1j#r`+=CBB=lE8T5*$zF%*c!O48{}Bg{j@Xh66E#e5><9BV3g4=otM@ZFM<2g~>V
z`pxAZx0gngwNlTpMh{q_kSZ<dIMO6U4^+?K4S1kLBm)A9LTm9stHtr0C~zY4X!u6V
z7lIS6;fX83$nbZ<7DV=2tw=SIU49G5!k9U{=1a_I_*zb*IZ$LT`ddqQFQzoun(srT
z7m-eWU2{$31U%}SB-$vS;YiOQ((lNUa&#^rx<_Bl^B5k_rgKbLnv{c9z_3#2qZCs~
zl)C024X_rn^}U7QvygO&wFx0t8eM((bo2V|79FF3eQQ1)Zqmg%==cP6P@AR#+Nceo
zRsfcEr&p#PaWTSN(UdDkxh7o_ITngENk(3qFuYJC^nX+BZeCHsU8kwaSzuj_o~*rR
zUd)ADxlGCAZD)^D)_uQK$jPp-0O%LKq+Fw2rJ;21=$sVaothfqQ?wgb7^IOy9oEn!
zhB=9_lz4@9vzUCrEF#KbNJjA{k`f@?NHW8GN-UhAoQjkaCUBni^CE<=s~(PpV2S(C
z2#(PNGewfH+2SxCD3B$Vu@gtJyFC<O#_*VtlZ57=AQvQR8l-;5;R8FBLo{?vJh!eT
zpE?gw{HGy}|AtzfQ^u$wP;H?qNwm6um|Ro>pK3y{IR(SO^NaumGvE%4twqP8F*IE0
z!#pq@2aQIy!eta_uhdskob`|sKE1{?0@2IE!(I(y5)oZ%()X-jc1`o%JBif-O$PLg
zf=-ZULveh3oZ8dPNw88fGZT3s0h{KOlXIf<m3`@T`x(z;o%oW`6+Km_2A#c54|Rq^
z^Ye%KanQMUYH~2!P>q)MPp_i96ogmk1Pucbaa|=X8>(kgJRlCEv~FN|otp^S{0uLl
z#x*j-SEE-sG+C>1nA-2S1DHfS%YY(m;`>vQg#Cg{D5q9qn!J9Qw;oW<EyE=ui><q5
z<yf-L3B($Hr2u)X6#6aE%I+jV+}d(cN?PZBW5p?=Z(=&H+;eN{Vcn5a!hR*<um>#|
zUNx9)9E=TL8ywfy273*ox4}{a$$TV9SP#PD&f|5`6(naDW|H7=g%VjC(B_JdE4_9y
zK&z{H?a00hQ|l45?l1uGWYC%KulY@`oqJvMVgt4tY9PVbF*<xk&R>U1%mY%&dULvQ
z%;UK-{L4>F@eG!CE;L#ZjmCuVO}WnNk6{a8QWp?oX(pdn>3WjrNOCuBf_1XCO=7A4
z7DOC1faED=H6ksqaC<<#cu@nXXTa$SdbgUDT8KS#l^S1ZgGsBh5qA?Se49S=f1+^v
zj#G+e?oEo`2T3(yU{|L~Q`uzQ8F`z|qGaGsOz%Wfx&%+miPu@`$xfR^-Zh=mG#DXW
zKRq0jk`Y5WneoXHabQ{Q(dlXK_)s%MF&y(@&zuPs5{a_qy4H)7*<M!62^@7pm=sFD
z4+be;i3n+d1RS^|4PlYth<u|;8%J`Awu%W1>5prctJJib2(3>MP^QUK8M$$kaz_XV
zQMw-)nJ#t3wo{Ri#`<`zbt6!=i#YNq4_Fi$4-HpH7@bo?X;whQ=vRW;-EGnJgh(2!
zrM~?102c7-h@%U$*+De*C#!2mXDS__eE-Ykr}GcD*LQ!7{``D>c^4lmid_KW^Tpl}
zP`!HE5KH6$+-)cE7LrUylGqH7Oc2L7`0DL^Z+ip0_s?)|bpN93o%%!H8~ojd=k96y
zk?!=?u6er<kYH9l>DYm{MoVt3-;ml=;Nazb#kE{U*0SRzGS?4FPUo3Y*@yWPR<Cpf
zft*5r?QY1a>wxGZXVX(K@Pb*k?QWOGg9Ee)8-9u`a{~*HrUIb7@zn!f6=VhGVzfb8
z{B-Hp2D@R0LZ`XgH@|w9)_<xcHRf#Mytq97{Pw?ikh{k7YwqESzJz3gBc`9NGrbJ;
zD>t3_;?03D*PK73C2U8cBugqHmF`q#q?s1%JgSv}ylw{DpVziprd_Lxw=?{9crpC;
z@_g{>-A<`yoeY^ZxtJgV`^^^G7<aNa)^+nn@5i@`?xjYGh=<;s22$7qp*c2oAy+RC
z4-ab><g<jic*8h+!-R@t^9^HWbHga}W5I5N2ZacBvK80fH?Lc~>D;;7kfx@b5mhc!
z2F`csS+!lgn5szV-j`Z@uV{Xf>7QbJWkYu<Ozz;HtuX%Ik?+T2=gvaLUL>Hsf-%`m
zLwUwk0$~0NP%>w0{Wq4|i-nA!3`UW?aIz?_*L<G>`?2*e#aw%H+c=W{-=6|@X_nMR
zmYmGp?wwy5$98sHl}xgBcDJr1mx`t!i)D)B5|nJ;#NYk88vqG{AT4`Rb*f4%l6dqB
zziu>|I((lkvaPMrpSReb*|$X`*gT3kgTGmj7c8B#V!_$f<8q!Rk8m%%3vT%k8e@Au
z?6Z%-O~e!SH7$4&Mm%SSbGq}3kbQ<>x;$3xKc+biH($ju3)Ac|k8T$Q3z8X&qmU;8
zCQjyQz6^>eO$IEBc>wp;5x=K?pDs?%f4e%zp@_<25ftn`5NsBSB9CrX1)s6|s93-g
z;6S9SJmfIZj3^#$Z6(2y3t*z;XmXk^vozsJ0pAjl#(eTCk29VhY;CPXSF_VqE>dXL
z-Rk@y<QXzE`5XxmCASwzwkpcIn|HrlB}KI48~6N3QY?5r`LZft%JTZv9j}VVm_OH>
z*pvTXB+zLNvfixERgv>x8QjGDWxXYp`chuKvhx)WQMB^rhFxDc;onzWkUmcrDOkL|
z+_>AO9lr5=86`oi%y_;^h&4wKkUN;=L>wRpC=}pK&m$KD3*$flBIM~hnsLDvbXTw<
zh4l)Y2VtR?9cM6Kt^wkgU{x$&(QgV8qb)g;H9dcTelx-3<<{?83_e6Heqfq)kh7f2
z_5M8pbWu-6^f$|+bx?5Di_o&9p#i(*BT)e4gzP3wW7ZQz@yL!?k*`3X9j#_jav?61
z0HQTlV;Y2=h&#ao_HV@w3d|4@wJCYXd9lh9wu~MC#J;IkfQ{lFShm_0i#)v-%mxK^
zL2#WDekUoL1x0{!0>d-V6wOUC08UT{bt$cG0E8=33B;XWUy4eA17;aL>!oyKQ0k5K
zG|T;c$q`K<6^EZ_&V1DiC<3`AAqQXMUd4T*BYt$pBmHgn_?8#vd7kF7r{6y)J3MXG
zCf$}i>>fv^=KQ`rhtft59SIG8#^=E*E>1`ve#KwwOmZTVyEcepfBF-e6Fx+q6oD|O
z?9e1mQDvAj_7lpm9rP6Wqcwz-h30~0`)3eGU@>XloUkd8Sqir8mx_1E!=ix*C%8a=
z4yJun*_z)+YiF+Uei$VOTOA5sOWyejc)Dd)2;Zc1z&b~NVqs8(3+6jrJnM1&wV_6(
zX~7HA7Uw}Mc;6xy^@YI3j*dXp&?LTrSnNx=5T3PDmmmp73<5iKrv+A@+cY<$lYxQ1
z{}LsDNl`IN!>3Nf0qTE)0L=%?5ag9C&`=b3nkVm|Wy-HPUxRNGU{nyTVi1dvK6Fj4
zAibmkB1v4JSJ2+?Tk{JZ&-eGWdmuHnQ9!_taJv!ox59Y>rX{$HnU&ZP+Gm_hCBSeO
zgJ*mW?hiaVG!BC#Negzv*&>?Fc;a-06~DB4{y3m31H1=4^RGEX7lnICRvj$#YC_uk
zeKxuJc6RYwWn(>vCsK$NU}FGG9I-lpofr@EQzb9ooV31*YJ+|M&bCbj<F$^W_V*Wo
zK$AFG2T_dn;lO0D&bn2YlNy9Z;#bm(8)chFT}~j?d8zemF8W_<j||Bh@*J=l5#RD?
zxm2tixF?hxwe@1}f!Jv2TXgl=zD;U#_!2T3Cf{p#dsB?t4mo}-72Vd8<f@>~&FWK=
z!Y(L8Qb^I#jzCVXskQv1mM{h*&)~Nx#i51G=Be0AV4v)CLcVu$ljZ;yL(efyllz9r
zn%2^0pORf^6G-ZF6IEAFj3blQg0k1Tl%sjq0Wl4mH``kzZEE1PA<(?d8}0F5Yj|7R
zXSM{l!02oS?P23n*y1!MQY=isU&a6_(nOBg9?(vY_AQ81(Ln<gdkJpy<LG}WF01$X
zt$frTCRg1%h}DhZZ_RHuoKho<+1w4yWWNRzZH!mmK=o|nP(5x}_gaU~jk!AlYc={L
z1Q45IY%oP3_^tg16`cpx@~N%an$^`(4Gnt>>9J@~ExQTd6^Yhy_%o0bf$s#f?%q16
zsm7XzYxe%VL$a21Exq!GEKX<K_XeI*8u*!~u=>%zl>Gw1dUx#TnDy39tX^*d1Z!IT
z>n5=2X~w;~YaFO#bS+t2+srxGbQ)SSvXrP{1(z8`TvmXarv+#PLd0@inbFxxLOy$u
zExDk;+BO;8wFxh;uuF}DM0A|^L7oSX(<RSuxj$}dpoNe@t>yJVyAhdXu9KiG-f$)!
z=A*rS-(Cc*B2dz8LF*b%z8<9CrfZ!OlDnbt^>g~|Vyb@EbeM8<5KM3js7hjPQ8<Fc
z_}UEOm%+ooqFJ$k2k=$vD9HTrbb9*f<mzfV1tH#J6Ay$hpWpFE5c0FQQ<r+Rq;*GH
z()>{_>L6Y<^F$f=P-N{0d7S1v<3Ztj3~{3*d{=Gjh(;d=Y*n@x<Kh<Ju99Nz?=Ut#
zM4=u3B=k&&Bf4?TeiAzaqHdsR>-30vg69@}kT8yEE~Ywcw&E!>*1q5;X7r6s?e$*z
z$?c=srh~GvR~)RJGFYw$yT`C|^1Zn}MDUvXCSxVJM}X_v2zv2;h*OCACCSw4vm6P%
zq(^tXhLdcc+&iQ$$KKF2;?O%BsplK4Y(T4L*S5J?HFLy`<UkhWuo>3b?OJ%-y|u4J
z$}fO>JA}sA1RbFjOSdFxdLbQ*fkbgPB2UTO8`4@f0FMOa%12!oLRJwj-ZF9raA(hG
zlg<%GcHbVD$OIcq2`}|6Lp?n0C9CD<vgssDR~T=r&NT`#EASZt4}^dPhj5KQ@X+@t
zS+IL+np!UsS9mypWM_+Pe>9@A0*~TMU#4lNU|rzMieQRK`r4kbKlWC6<Wb~+%g!7b
z<vKPSUmFkaZFnAy*qO{{u_z1@OtgxW-BXT;&FNHtFcokr0|OI%$|i9DSmxhz4_5pv
zrAq`+d9DEN8@lzYoLEB?YNlQ6=k@E<oXloy5#26gJog2hD)<AQMLfp5xspIY<=G>`
zfWUk>wDi423<!?a<vOACy_+})?>uxn3s{R@-=g6X*$zsc%SX@}<m7M9AvUS&!-g!?
zvQ#sG-yZ4q7o}Sj3->T{d@uj)4cObgJ!f<bH2p1Fb0(tOB#7ApbP(g|TEM~uhDvmT
zvq~KKg$`rDPkp=H3o$)~O1Cl)Z*6}E1c7f&vn&;;qm<1-7Xo2bcJC{{CH)bEJC8bs
zxL<I2%A`&+Lb-v(oF%mbwWWp3kqx^tDj}xde9tTM9w=jd8RA8?Z*y<+oRV%BD}cRT
z){b<=tCK3#hHPi@_OE~4QFH@IDBBNUp0WtxbP-_EU!U(;@{l%V0u&h<IpL@+3$wf1
zi(1lo5}0?7m+6{+;`73XAgqF2Twz#*;qShMuQD2vClR)Jlmpf<TSif0bpxt5$0gGT
zdR^I|F1A}abbx*B@rJ-(>+_5gXi)BoCESDUZNxWN#n&{Wl@kY|z=bajgQas>fx`iq
zVb26Hfa!K?^GZiq*8|*hE5J0-y`O(JOw>i(Su{hpK^_Cwya<B~7CDEt2LScHNlVCv
zZm@ahvL^HlK>9y2b^<Zh{g8cttF!bzk=IT$ffWgHVJ{rNyQc6HR-?uTxP|!PeK2mc
zrY&)-dRG{1_pQ7JQ|n49D^qmnm_+PeHqNEpH4B1hl&o4)*X^t1&5^|$rZRxHeb%;k
zBtyPw!*7%relqEOHn&@v*Cfrs2Eecm+0XA>Y)Ts}b`0d-nIv5Xse74JV$M@4ZhI5O
z$+hCkrPMD$V~icI-Lk<C80tAjM-ZdHVps-If?f|-tH2E^1BlJh-_dYgv#YM913;<Q
z)~wFx%EXi07%fv#T=Ebmh#$`}lIOF3;@+|b<Ndbd9GclmKsX5L>TLl2@W{zVM`w)L
zO&<@)k*eMK@@6{YxOJWCn{^L@&VE4kIDNF>GTUvi4K@v<G#?DAiQ4=aQCE2lnWLCT
zF~*&(9jH^&zYID%RP_#WK3(<Daj;{4^!c|D7Qte{)P^X6ybx2Y!BRsHSckvUpXR}j
z{&ZQv3!P=zuiI~TpydW|ASb9Bci2J94S1uwmjUW4+`1dNTcZcb>%)KT?XbfxX4}2%
z7`mTA_oHL>b^tK?aAsbd%Zqn(@ljs<d_Bg1THU$cEKJ)((qx{95~1Un1tg9pZ{A=W
z+w6(uIhXR-j*gL>LfjzTOc|>e9b(wizW|dr6Y6sYRz(|)M^$pP2}zVEb>>I)2fP{<
z4nAhE+Y2j?L`#~2&l`RlCCb&Uk~<7UX+Y-l;q8!(Pr@ZX<JZgd!wUDV{nnM-z$zMM
zP|CIQ2)}aDm89Ohq4O3R=7${Zm%F4e=0W}`O8Ci~5)h74u$RXl<>(?<^RKCh^l6FR
z5LEInTw9H7$$*td;;0!c(vN~TeuNDI8DCik<e0lutuj>O;P@3`hRZ-}u;3jo;$v@U
zC298e<?i8I9z-#i6zzs#)3fk({8Nj?1`fLWl#a#0T|{URgCGi67Hv{?p21Oi2=*0J
zFUCa5A}pj@fU>Zj7LT|=(!ni6J?#mwdQPEiSC-F}GVDGBZ`Fc6u2Bka%fsTX4eOwm
zV8Uc7I3Q4gBdXO)uTSWrG;KiT0Cdia3l_Z?a4dX1<$!sEW+GoRs2aJ`<kg{1{TNp>
zb5NTeA{|;yxF;?X4boKg39F7j)ODZjvbW96o~ErDsPj0c#zHf7|2K|DF{-?-D!iNL
z>C#=_*O9`fN^h0&D_d9{sotE#SLj1&xVVsKz_LJ`l~3%s{~v1$n}unurx5ipMi$st
z%*tB)HcKZ<nM`C<JUP3#JU{*R<??@~SLa_(E>GZV<H!kCD~vgvLfh$d=#7TM(WMf-
z7~Mq4NODIs4WY5uOpr>I(Yr;MoF(T-1`x0e@T%b}JiNOvX;eTroqoLdbdCq4djs~L
zPS@8fmf1NGD;@<M8K9$_&Y~QTq#R`01K>+mKJq)zW4Rzx%0o5iuEP+}BD9V`cJR#X
zfe+z}U124G=Ezj$dzQ;3OhZvc1%0!6+6QW$=W@X+3#3?ciEx#Gm$~!Z+_#iCTj7LN
z>0?%jg3EtVk?7`!Ncd?s(T6G}X;tZuDxfuAYiQORHYloc+%`h^-aisjSdrpt=QSj#
zrMyjm*9w<M2K8nAAAA4(7rQd#4+wL^Y`&#EBLm?KieHuVf2vJU8GA$jT0E+rs8JbE
zHtaTkhoLszlqwtJbW9V-7aLk!Q+32^zMyeZ-Is4#MsbX<1yQQYc&iEBgrZ2<2<)X=
z{LsYhftJAogJ}AOGTxe40VpfL*^rZk?TzwCNy@0!u5wFdvs*CwXPi>wO%EsUKjIxH
zSx0~e;Sll}$FwDP_Tkm%;Gv|-)V4ZrGz!=C2;aX~7rVQ*wbko3WNC-f$yBBLvQ(sU
z%d%4^Xu2!bwS~47GS*(OX_TP9v_9Nj-Cd5-tZ=c$aBc?lpxB{1R(}q3_bH-rg)O!6
zfbG|n2ebsc)|&_x3`)mYqObibW80vu9a<-vXej|wM*=L{QyfMDEcdZ>AJIA!tIpZw
z5dJ*PU<+H5C2Uc0uix$knp9=5Pki`8M42PJhNkT%QRv)WMNIYXsx^_}F5exq(TuN0
zXhfd*jvKxcwGs}0(>0??e8|3SE(vQd1WRE@iZyJoJ7*A_frA3fmv2i}u0#Or1ynhJ
zdCnibrD}pWKK^Fb)ZTE6>A~IUJ#m{yX?wH7=_uq5<~uD;2Ou~Kt5HIZNHWZ-BqY8-
z_~jJBo{WmstVmkDn6yDaW~jP+Yo$ImOxrkFFvGtkQjA$MIR)xlzEL2D3uDmzMMXj#
z*y@}A%H25!eKG18g=8-iqH@17a3qYTl$4Tb=(o_<P#NLQ*I&O*&%b;k#&&*3nx1~A
z;huI}j?HmS@zm5V<<Mb_&ZNd>3T<<7mUQ;<#eawWI?z7IqUn8<%pm%khS?Mbauk7*
zBJ8GE_-XHmnxpxyZeGflUZZlQd=DY(lGI)sdR<}OCzS8-u#3?b{Z6OIco@wi%%0=c
z4kbiD22IyISGD?-W0PC;=isC+YY;ReEt$}v0PlG~QT0M$*4RBcB#F%&o9xQ+)jRF7
z7^}MBj4EZ*rdClZ9XcCGX4SwO<ZQK4sY9FUP7!!$BV_*m0sbaJnj=DiCh<osK>X;O
z^r?~l`5O@|O9!HQ;_(Gm0R;0ozRd-m0vo3I>kDP~ALX>l{)*MwFI`Ya!qr*%K%ST*
zceKHZ3NXc0JYy<%CtG)0VK-9SI~^&M&k(Pk;ZIH+vFD>$1BC_WcPh_kjWqW3Ga2t%
z=-yk(R7#^4-j_YR{Kf=)h@4&RYXNoZ8)DF^#p~2}c(sH#%CUUQSw@98&_EJz)u!SP
zB$d)Y2*FJmT}X<>fCV$y1p`IeF3TVJfE(se$|RJzs!VP|qnEga-P8FTmj1BDGDeS*
z<&qd!^4pUrnNoFxPqYu%7y{Y>i5UMcyk_FPCx=JY3m(U9CLl$Lc+k~C85QO<r$ssy
zO~V}21a7|+hRoQ_C4KIe#!#-74h%ASXe4^t`aiW++j84B5Pj!Y?1K_gu429GW;c%9
zcxpG!C^MPX@?>agDPl|lEC5>8Wc2S{fLDo9tu!tlBoN%o*|UpXjLy<1b)5c*11In$
zVhTbQBhY{9OAR6f9U;utNhtW5_JT)$iKirN<h`H^m;M7o4!1%h4;V@qg?8s$<vOQ<
zNG65+rI6NKn8h&!B3(<ij5PRs0Wk}ZD{{<3AroIS!F!O#=+oX4!<E&$zPgzHF`F7w
z7Nw4S4J%*4f+;Q8L#A;7E2bm*LJ=sD$pFdG!XoZF4)+sO6hsx#{6ZwD;K((txDqkW
zKVqDs96C;>{!Q%C!qh0|pE8|hx_TeJpqPsne^;C|LIU)X*5?eBA!U9M38JceJzh=l
zkQK!Ku=24AGrcyy`FHy=G^J&8UzU*FhTk%_FquixnE718--QQ=Ec<1Fo%@-NsAzu2
zC&uBuph6ivn)L%M&zFhM;<CQ_P7wP_m3~Udc{Tx`sXP}7wzr+{4$xx}n&$+*pEDkz
zWO^ZjO|jXx|EZ)34@`lD84oPh70KbPq#(4nlTPReyV0vWLZ^(eYwhK(&C}6@4#u!k
zM}q;Xz)$guq$n9*zNfRND8$ICEWMj7QI`(9Zg*JQTwv&Du`#<X{UP7?NVXDYAvA3=
zbwd)yCz8zu&>HON7*r}5*P-Wvmr5k!-zd<6Qpz>s8Ft+s$<isbUZ*0QQ66=W=`EO>
z8ib;A8${q~Ny<A;1Jeb#X&U44xQcDCCDUZG#x^qjWb#Ih`gSp}s7R<8e)&8|^dEQj
zt>=mx>P|}gJV0uT`wrBPAOdfVs?SBYfChIXs^o-@lZ9KZ?<>f?I;m&ilClc}aJg__
zA(pM40&m|!yBrk8RQ_IfPmF<8SFKvh%_^^v@JgqyPkc^e>d>CsbL$ZI#YBSveN!Tp
zGIjpWBd%dQfzFd3w+m<2-JKD?H$V%_cQiH<uTZ{k<J`1iyjWyMWb(jK_gGSL0ZlTx
zubtvoO5*>>M3tbDgnKwUYcO&oA^*Kq{0#O6$~}ctjD~j;J3nIXwK`HKwL^vAxiA6u
zP^&(i-&WUdyR@x2ziVylmI<%iP%ReGyDi>pq}x?fOvPge@CqA+Y$5kkGkGedkcUU|
zeEJ+<nh#|(qPr8>vYbmdIc{ET4l>Mfb!{i-aQ}Df(98W=s%~g_(w*9CaVt@0lJ8}Z
z?&g$^!JrXs6<rb17MoP$Prk;Qrrnu50CR!n%RNN6Um0JB6^$D+eCM|xZ@+z-eY^bi
z=IZ*-T^4f4;8sWHLd*D<zv|;-uJIhI&r_3}`m4J)*!@O7wA41v#`y>BJ=>1lMt1M>
z6(vF5?)LOtB-`uNTs4}JZ6%guj3&DeGm{3JtnTIxo9vM6x$H_nuupl&Lju@HkPC7J
z0t9(5f&>VHO}=6L3;vRvQ#V!>tJv(3l)R*2tD9uisdG-9I=4E-+1Z~>W-BWjAFq&)
z$;l)x$S6)If$v$6mn0jJaze@Lo9QS^Z{S{d5sc|NG{*Mbut&ZKhA~aaH(5#3Fs3=#
z8L>N03f^Zu%%*#y{TErzz>VffLc(lzlgHypNrE&YNgUF&fPvFdmQRB+&eA@aB{YD0
zmodF!{l0#F`0VBDX9$X6Sx$nITm=P*;-bvs;k={~xr)mPJOK)dY@UY{28tNQ8!Ibm
zFr@_$p(r{#%%-y}rD+Mj(jrUf*;h1~(R_PlWnMHjdv+bt8KQaiJiQE(I6BD3^C`4Y
z54KxFIG(3vJf*FBe!*B&(){ezyqwKTb=|(>FY;hE3x)}`AUsdupAm3q5h&hIUcROw
zBF=BN?8?8i0YM6xn0%9GmvKZ3GGS9ukTSy=o+ZHz2}p@pO9^}u%*zQ#Ra+@k9d7^b
z_WK|H==OW~@xyO!zrX$M?Z4mt*X@7a{`c*_-u}lAe@S-c(^;Gs7dKDF(;!Z2{SSr_
zO%jmP5jluUGR)>t5Rsi=J%~$w;pzAyxF%nM+-G?lq-19rTn87yRs5?U_w_gmVCB7l
zCkeD6I}uz?#nt0ahGwUYl`sj4f}9|eR(`!g;4{nP%b>({kQOC*{p_2A<Aak|$Agns
z-;iChxxJ{-;OVQAlUFaG?Zf7_FP<Mkqesn+6tGWR?Vi3mK6-XMc=dZHub&@1^PwkN
zJ%1@00bWL{ebff&m^_%!Afow6T!OOLB`K(#ZFj>_29ndzFvxQdJ^`<QCa34l26=Yn
zdOFOq1bV}q|0+w%Ab}>MAStL51|5xXHC@ufESXQ!U&K*4aRH6fk~~P~(;>}Yjd<I_
zZ1Ery>(RJblsAcc<d6Y*jn5ls44ct1T7k5C8*--PGzFG|-c~Fz8Wkn1u}}hKs28%y
zd<a$pj7iFL4;c)Ybma4}>{_}-a-zpN@@0Xa2WThO_V`1<Kru|UC}=X;+7bhk{rz2W
zCr;y%GpgIunhSsh<qx}^h>n7JQg(Wr_P4w#Q*`+Gn7pQC0a}d>K%g}O25Q#D^9`L;
z!3;&Q9Og)M>q>z}OV{UWfHe`kvl*}?c}DY7Hpn@$O%tg)g<rZUB*Pnm09sKxZl<)i
zrIGq>B<8f7=c$|0{e5sOV2P6y91@?|?-n4tX*ue4IOFesRNO~@D$PnxJ&o2oeSvqg
zSTIw^87H|UpFa_JGJ$h(uqGtkibHQK-f?cb*9M=qU3r;PFyWUROqchsGmo`x6bJO?
z!g&shzjRUQrbG%sw`sa{6a@Ayc+9nxht=Q-2UFr<A2`hdc_z&S40fQeyBJhbkcRYK
z=I^l5%U!1RIl9k5b6)p-h%J~`UDu!L0M9?@WOGi97?=2<HoKpXL?d+UanS$+`UHF|
zJ{|`*PO>4G(Pc!ZiHYq6s)22w9Ymu_P@6>$2$_N!n$D*XwSbkxaLdP*I|vN3ybgh3
zci4cfWP}^=x{NRgOUgq7-7F+zPR#ovz32+JfelhDL9FJj;0MH&2H}Ks1tbEJ`5;C{
zklj7WN)4h0)tU_6t1tUhL%h8!AA{?5@^b(|L<k`Zi;v@!N613$T}@)34!kFbo&YWd
zQ$`~WznIZ59>pxK#u2U{@E}82oESgCU67@WOu@s6Ay|hfKBYw;;U!Yxk&y^3Bf_;4
za4)Ce-_e5RmtYIueX^yKc_&ea0Iqw_@B`WURRM9gr&Ks_cVXCUi$UctoPC{*<Iv?M
z(6U6W9jM8a)516o)0Cyj4JqccS(dX5#{@#%dBOWI_d@bG?~^fTOuUCa#zJhjwph5>
zNBua6=x{zBls7Zb^-cWf_1to6tRv<4zaPD^lvI4hqqMFWw0W0*71Xf~190o+;1sHU
z+or70>8!k|o|2#ZgxoueivjDb?w@X+_i8FZ3m@h0^CnhS?Pc>eY;$nr7{b!77NUCM
zAT4_Jn7<&37%UFu-DgX}({c06Q>BC%ny7-|hez#lxUA{jmF%))2oIa0zgTAZn~JC=
z<%7?46=MSN(1$EIWvdB(X|v@f%`IIDhAH-(WlJ&YAc`=;LqfnBpxI!KS)XNgbGpW3
z{GxhtccqV3C%rqfO--+}-Id7nD|0(zTWNFNlN6I|o<wLVgH#QJ_L=ExrolsSc~FN-
zZSBH9Dd@rA#j}&IUL6ev9_`CSNxJPkrQ(qtsnx@T2D$75$b|DGC@HY^Fazqk&05~Q
zzzhUjVfFh{@;EwhT!lQ`%Jj)%Inc#lbaSkv4`h{Cim|KmjwN0$K-5fP@-80|(J!i8
z=yHgfNz@OI=vOMA+I1vY%Y43&vwC~2_mW5-OZCR0QP6;Vh1p8(*>x}lCwa@dji1#u
z^J8B(++Wq<ydlqDKYdBm=MCYrVSnC`1HQMQ-TE;2JbwK6(ZjXRezx{-bM14uK8i0P
zMgUzmrO}Os&rtwADLF{u@g$~sY~h1&J_j&sn~wm_CgKlvGGPk!<SHYFaT(JB+Z|4V
z9P@lfad<(~q7LV$n`@sw0zjWVW^gcj^L3U-a;Ni{MJR8`@2rz!_TNdCT;SHy`{s{Z
zs-@<%<u!_NM=Zy^39vq<>FZh^YE8IncEH-Dke|xKGTcvaWiht_t^x~tS;)&D*?<-B
z(+Ban=H*)BxW;Po=?vnQ@|N@uhPQD#r*&NL^VU0JT!5-!<04fxr`}1sa?S9<Ga#W!
zK_yAN7ckl;?GQtD2r=|VEFgo>x0nSfgr|GE<WUn=8yn<hmd*Mo-#Odbhp3S$=lczq
zwI;LLEUN*k-8Ju2SI!}&m~!`YO7k(bB(o0^CRWCIU$^Vc0jhL$UYdJnDyUh}G59ji
z=Ch*8i4Ny+60xbN1wyVd1Z<K0QSgjW;)44IFvz{y;@#HUeG%scdOj68&W4kqkXD#k
z#-78K&=4>pD?zVVitMVUKP19x-5t9(@%#fcEp@ggl)~HHZPW=m^Rz8hM>CCg=o(lk
z%8y@5ysdY*yFxM?WkAYM=I;lwdrfRxo=nAO%y;-DV0nW5YDNvYFSg^%+J!CGT~S}q
z_d`{SW8dXqZ!vwgRCl)hz;v?a;`4kNXlD-439sjoRc-k;i?n|gatXJ)_~%wGj{l#&
zcb`5()ih1u;(7K>*dh;44Pi|i(^maD<>+O=V@b8A1?P`!<RHJ%bMWD!iAjr5VL}#R
z??TMycepbbhJf2rDkRhq^g7t4#nKvjHE$uIK{}sxeVG(%N&6#EEuiJA0@j$IW9evg
z)e*;7!HcNTv7#4)du#&+_Y}x(ZN0yEe$*#Mf<d^G)?Lmy@yrg5a6N2tHzCBlRplC4
zrBU`8;gP-DQ5-@<C=&1Xj6P+LFw89M!0VpuhmJfmlk)nJxUNZVo)x%{gW$Tg(4q;$
zQ1o=-sDrIx>6iu1KAa^Rg;Omn0^*&}QHem|=QNJQFIL2hzj?@4(cIV2JpGw@xoKX0
zdaiGTsL;q|H$DWe7B&yfON)|ETH~sU9X~wEk1YypiXPUH{$RL#ZeIS>y!`Ckv*$Gp
z@(YLzcB`?C9e6N%VqX-iLS@32?1**0O;%UMy;{5?Ag}MDUK!+cMnMsq<nkrtEWK1o
zV#}~-U=?PS8d@U{(V{7iq2UsY^ycqTzma>pGIv_f-{ak{X*w<^zyw~XzO}{nQ@ipi
zr_=0`9?>w%SrvWvf!Z9dRE2wEw@*~tNIE8RUqjc#eTkoKY6V9;7>cJ>AMVd+gzdrn
z$J3Z8as%EP`P7+kGP%M#*IfWX+TFR=_wb_AsqsM@Zy_t?$i;jJ!YLm1$!1@&Va-B)
zjeOEu@2sz{cdSt@XOTmCUE(p0T`Yuvkh*JgRA*kFJaWtp^GumwPltnumasksG!3%|
z7PAD`7gn34+?{iz);1>-*I*Kav;ttUtFNQqH_)`H_W7LEn1HzCt{iUD7@)Uq4ZrT_
zqVsdL5u=9OlU#ULd0f(@+BWpK8Ja^b7LRw&UAlmmG%w>YNK{Fq?Ep6VZlXx8!F@9;
z^w|arx@va9y1fUb`pC-Lwk&bsQ<+*+zS2HDJV)&-uRb|n$V9%A1M$fcUh{j{qgdot
zYh@CZi;P8GQkkgZ3>bhOss|p|8Q~oAqA$JX(<KMax!0l<QMp%v8M7T)J+rDePl5u6
zJY%L(+I8^I*W?is{8U*(3BB5Xa2tANOKjS~@fPtx?Ax!9Ojx(M08nI@D)*Od_^s8^
zvg3r_A!=E2FI;OD1>YGjR941XKwIW*e#XYgr>l|ODosPE<vLSkiDVW;Xjj^)DrB0z
zAhhZ~*Xr=9DmJ{_u95Ws`}<(nHHqc5c)RT!MQcBf4dC6_!Ke0)4tZ#c>c$2Z8L=%&
zRqDx(Qf5h#T_LGrk#u?3TVR8bL+q^^pwzm`gA}(^grQg^50&_#fpg%shIrv3OzE|#
zy>u=qj^V1V3@lOP`yoAMNShd14RqeZ$O4nlxd165S6SLA;otlM<R=3UE4kq!#%fj9
zhBxeN5vxb-lPgM6N+aC5AH~;<uR;=yiR7*j^UtLRMBHu>@~+V-s#tUeSR^#%eUQcI
zdX%|vnK>XeoM&IlI-_9~yGv!cz0yJ~y*n4Sb#AcBT8!nf`aGoOb-5mz6oaILoG@Rj
z;*)jX@4+t!c^Ev?mPwQ7AXelWg@V)kGX_Ra?STZHaK}mO{tdrb+p=$|BE+czXG`|X
zu~qjn<K3dCHzxrK?7dk|#{<ASoOC-IzrWKxyIOsN|LmTgUG>jbxA%J=_x9FTcg{Ad
zNAN$pzrXijqf?Qqk0rJe%<-K1A=EvS8g+`#lDqZbie=ld=$0?xuCC_&xo}4Pq%3Cx
zwuw9VgE`G_y6*7-^;fL2ufW;u0Lh(gJK%ED)7j~)<5=sRy^o5WjlE92lP9eY#IT4%
z2p|lJ-Tee<f~tj7tP@9Bw(#N2*Vvjmi)-T862;MYR~&NO9;%;rLE8gpNm8Uf^&_@;
zd%#>m+Cp}U3asg;H(0rpcHO$nR-Kl|j`m99C?}<FX^lu_iTes8e=v9`%MS?m281)f
zoahmI2}4|%mAD>P%UdhaR7_q41E-tLQ#4J*K6l$wckgH0Gbs=|JvVHns|=*EfW+EZ
zKp!BuuA&%YQfeHv>PO7NcXi)lDNHSSav9`{PjnD1-6tlMVct3ks2Rd}%8G7Sg?{}+
z6rZNwr8goUD=v0aRL3i0FfGd;`O47bMp~RCFTvfb%4+%&s9h5Qe%>)N^8{awfE96g
z@Q4gSzAg$;bk4L29vfs{U!YpKU13qu#E0XBZZf62Cybrbka5>oss^_O-*@`bTk5R^
z`bR4`YdlSJ&d#0OA%`j49n7*W8o;N%MYyDZ;vOjeJV+xHPvx{W!v`%T*|$(5OU~R=
z=7;fhpIL_cXX$;fv1zJvsZmCYFqpBu)_6KgvWRvOc3&2t0coe!vQy>x9p3jO4`Qt8
ze;R}r1w5H_z|W=EIxsN-u8gtdY?COd@=u;K5GeP_X-6=#qa@Z8xO293F4{W=XGiy7
zbQ4?MLi0QKJ$4nm4xPTHicdZit}*<@G{_$R-B|f47n>tGu2G^F%5qNO-8!52g}t-m
zml27K$S4W?ThxRK&0-ulz}`*8p$$;E1Iz{Ug5C`1bzGE%)X05PclXGfH^kLipl>x-
z$TrrxGTNNoP9<E;%;L+QWX*@6*L|SftZy@DTNW?$0;^xPC#OV<*(zn)L9647j}(!{
z9Bh#@&<>Y0FIdj&*9~?^x<+zkc<T77VoKbLZFHH~P9!wg(v2;y3*qgYH=Cm6q@yCn
z*>6#mw?UdJq`o_Ccbk6v+{84ADqOq?s0ALM<7m|uCM#{XS-O?N-4bq83}yz&9F&<n
zV(KhJZmg1a9U8DIrhC0wg2;ekPZzj#I>OuNlpRD7I|PW{p<RFET245M^cFQ#K*Mh?
zI~*^=Y93CW<uL$xA}ACh!WJWY$sGC-0f->GC5%w*5F<MtSa@Fy(;R6T?ynXVh`ctl
zj$7Onu?45uPd6M~1k=jBHOmn~k%_w3oT%a{8IboNmw7s8r?b~AZG&B1T40%X>>Tjj
zgXz2|*<s5Hp+3HIh~dKC$&!+6_)8j=%(tTmjh($5z`EktbbILC;OWe9d`VM0k!hcb
zce-wGYkX^)%{%6@<WBgrnN5dZ3%AVG%h)YbeWW9I%DOmCpBQ-@#;8UY`kg()vlM*8
zCeP3!RcZt_E{jy;vwc}UAomR`>{0!TW}X6ieFf+~g2PYb6-^6WYH<5mj>dW}azj3+
za-K4qD#vjKKebz+?Lt_|_<A)`Ug7HyL4pfd2|*%GymqB#x>nmhb=j~q1-BVu7U4Ub
z=LN{VuqCLGIG$o}NbnapbKbMvn<jtX7!`Goc0>9&+AXgjvJ>jktAnYuz^oCW-mJYl
zF9&Q0O=7{u{$Mh}w1!#%sBzu2HTg^|`|%!q-S;+sAiLTI+eM1b+{oym-YUcIpuPs}
zN!iOz*b8RZ+O6r?>SSJhDw*ZcUd!Qc)NRfLx_YfPWe*!AtVedd^~tWubxs1e-ym9&
z`M&&=;6CRi5mpJ<iRLxnHxR@uE8@yQu|8ZE6f=B5uZJOhg$*mL5{74Sp1rA5!XG-;
zR>s4&%BO8wPs*2k)r&}(HHRxk*r^TbC<^ei#C@ke1vNGZ#=|q4?@e(mgVpE(Bk6^B
zT^r7d=?rTbnFad@RZPa>8H|8ga8`?f=+!ZseB&K7h8Npr76lw0Jz@jLPUZWk$}o_-
zdpU(%fQ#2KlSsl1A)5&XzHtHTyl|Pt_Gu3}JNsMWWf@wtdekeH?Q)@vSoxZ(=80vT
zI`HSn7uPn!sch<Ef|3T--6;~j^os%4^cXNT?eG@Z7<OiMxfSbMu<Tun_5Hr#jb6y;
zS)UF=X1qwnk*=tA`Lqq6UgLDRtMetG)vAu(ll+#8%e9WS<g21Rj0^P_Bzu^b#6?-(
zDy2LiY{$jps_4;Rpi|l_7INLO+4pTRnpSS{N^tI~zAudj>WE&4$vgtiU}6lsH1o}k
zuGy8*Mih@mYOl0Uq|y}l3$3ZHd}?!<C9`1W)n0j_=AFOgvF+Blam2qeZ)1MY-<tEr
zgDlRuZ#vk*YoD6m<uR@f^p9Pq`5mqQZ(qdWyj>Uhc%cucQ1uG_!VQj+)gQ`wm3ON#
z^KW*jp?oK2G&B}~;fdP{lp~eu99@*3R3#0VW<i&;G)C`(M;Ir@2pg_N>Pz$JAHBZY
z7+iOW#5Nr#y#*nR7-pGcR38!ycLX_@#hCdwpPHY#pLir%E?%n|1;w&@TZnQYm#$iB
zQ>QE|R|F;)*xG{UK5A{1KcY^4q+4GNA(xSK7X!Pz457nKtlA%%X*_y@2SFBW-5B%X
zsWta_N3t7J^5&L@{zf5LZBh4%998Mt^(JzRwxu9T7Q-4xjw=z;qjQ&B?eFW}n1LuS
zm6A9523W^wpq9lj`}jiXMa}veCM;pBt{QxU1iYJIgnLW;*a7Yulo=66_Q4AX!9k3I
zGFap;$TR-7q%<s4%dU&eu{(R@BSF4Vk4f(iub0)|8NcU5+y46t`X5X1IJ5kC6|^Xf
zx0LDcLATl&(#&3!UA@syU#XqlPOskf=i;E7(UQ1Y9`TI`<FLKaa@&yd=`0A#W*S7J
z)&#W1zcu=<hEC<&`Ka)b%Jkxw^Ejf-)K=|U6TJ3;XUw44ctZ%#>mhfTUE>R}Y(gDC
zJw*NZ?H{%#>&I_@<3!hZGXu2xE!H>x`0XF_uYciRf5N~1k$?R;|N1xn^)3JUD?gD(
z*?h>~{q+u{ekX8Pg5vM~ly_N%@b5S|-*HmE`!oLa_x$Ux`PV=3ufO15f5X52mVf;-
z|M~|vH-zdtHPBIik_TN&n?vTCgF2P2;u)Ok+G;2if~+cI7giJTm&n$*H!{ZM#G6;k
zt2X+z9QL~YXf0y%tXlACuiBkAyEew(_VE7+5$~VH;9FMs7f)(Ipz9!tN+CjzraVpY
zzx;Q1-md%)om5S4+b|5h0B%5$zx!8kMONEImSESWp9tEmz%UF=Z%t4rG93$*B}0;%
z1x5e+D8=^XEbWHsl9;6U9?3_YoL5B^MdPCgj^M5k7IGmG=(l3VfzH7d2(wL@YqcR8
ze`G5hQLv9scna5SDNw-=?ND)n22S!|xv<+iBd*J{CjMHRkS?#K1g@)%5v#%hQyECX
zQCR|3xi%$pLaQNE5*gW^1g^uqZ#UDc@3SkPDzJ0~bFgL>GGUz&%i3WEYvBs=Pz6@k
zh9d!Gf$=zs6f4nE5nV;|sV*z6P&xXitd=<cin2m8iK5!R6?XNLW94biZ`2c$BD*xJ
zx}=ECG4X8;bziXB6;%7>GD9h;xEwBpgQc!Bmca=dG2yl!7psy9+4gK4amlQOJGPWK
zrK{0%1avARo|r@MMXMDI2*1Wj&&7;k8yM)o#KI}u2e&`5(Q9ggisAGOJ`aD}xt4qF
z)@>vPtD?be9Sf>1;MGeS9Zghmj|2}7oba5fxl4NVh(a6>_wZVzA<=V(H}J#zbk^Q#
ztLyyZG4KNUBW#mE7;5LG-X?=g<T+gpU=RKy+5UaRjZIqcv|-a&x2UZzP5)rzk1MEc
zph$_Y%{#HweC6^az9X%6GlNW{1*IL>x~eoSRagNnrC$5?G>FGAk3ZUZJfbFvvXUg)
zB%ag9+_x=MM5HDir<bT#val9iSK56uvqcJrhw$MqGp(6*OmU?B?ugF3?;T}_azo;F
zB4uq!-6TTQ0r{8YpbvF0iuc#kA4NCE63q&C<}~c2)TC<CgvImc2yW5UhSK=1b3c!u
zr%~e`zoKHNXF<J5dfcqpj!I2P+Y{?+48EWv0o3J^UPo#}vu1BISfQJ4<2(bB)qePd
zJn2ru?z=@^{3oO4LHH-5+il!C7`0DMpV1zOpbQUi-WSW8-QSgW3-S{E0;N?^Z`wQ*
zeb2ABle#5TjJ~&BSJpv`###i~H&p~hCOC;z$BtsB6ixl_-?a%@LTNW?c_7$6zW1JU
zkDc?+d73-U$*}{+;HOMM%s2&n=cLdeW6&vu*(Qsn*x+3BKoZ(Ru)%v#2Zm(HsDO#o
zR78vxa30&4OSRq8i)40D;fJ!Y;o_2Wh-AJgSdwZWVg;N<R47a=Vp(KFGby@|b4qaT
zk<qo?Hy&LLZf64%%2ugUqG3%GteDaTTb7!xV9j)jE66~}vWO@qTG@(E97m9hDkM=e
z3a(_9OF@Oke?m!4gB!|oTAVpfsosJOo+6r?GJ}zLB%H1KMN(#ns29$Rtd{pBDRqk6
z@98>4t-hr)*BhZ8HVn=meh)5_j4-|v?8J#UQ3`yr<n)SiKGPdconH>%lb1_W45<mF
z;p<@7|1tK%{&;kK3!lK{G}bPrx5$D$5=|?p-@gv;CjRK|c80*YMVQBp6Sw<&v}}!}
zrK75;#lgTfclf<OX@|9yz^4lcX8tss^uLDF(e;hr2##&nv}j|#-1#>Rh;>ODF&+&4
z!{v~oAR9QUYJNe|L~&O%CMDN<j9**Y(KqV?o!eN#z9+&iD9Yp0(^e;1Bsm{iU++b!
ztKarBE=6RLK^R(Di!##QOGb;1-Sn$Yz+&)@RxFNj)xtwF*zOD;=tg<F?VT<(XU#eJ
zc(GgSbQ&?uqtimJLE!Ow&E%d!;f0Pp*T)0e_A0C-RUo7WRpz<G>%<;@$+=uJkwBI9
z6ax3X3f!LC1(xL;kE`bfI0#()v9z$Vv%0Wnr^TBoMRm<@UiD<rfe#<xT~Lz^=@VWO
z>LsvS^{#gCKdJDukjTu22E>-M2mhHDWF?-GWrP0Pv>Q!&QQj+Jw3}HwA)`e?_d4CJ
z?No(&K5WB;>bot@>zr=m?K!WYx-7(A?p92D2b$*?uBleLuEUz5q<CM)=A%Fo`=(C>
zl|Ye_E-aH?wQslmvPx#|dXdZ*)%?k8rTZlLyXv<>;U@)eBCpl@idR#IZVOQ7^Nz4t
z`_5_P2$%?M9t+%=u5lk*!&YW)sW~?r7LA@;aoc4C{pqxS9}Y)je=rSy%m(4N!F`SR
zW0NOj^<~pHrZq~TlMm~(=fwE|b?Rfa_*2fS`c5=CKX04*rn}mC8h2`)>)H7qZBW5(
z!Y~ZI_bYth(4r0Q8)HleG^A;o2FFS$q;4B6O)AF)p^1N=8#bgNa!F#p=l7l`&u!f%
z$#|H+5H__5P#TLMcdLlOm%uf``q-4-9i^tfRD~k}_xMz2uv9yP4n91i(*_A9WvtA?
znKRP9nf~IJp5nN&vlg^(k7TNvLAe5~(ddE*yV6sm*m!pbtwklZy}?7|y{+bp_w}M5
z6<u<z7!E2xVFHucb&LfZ4A;_;1i^QtQG|-<c$_3oH5eqsB~d>2P3s*xmX{0OV*ZM@
zMSARa5>3yHV<e|+9HFfW0XAx9@zWmym_|%C!Vi$I1gF^3OH~n8iZS_4Ku$|$FF(lV
z)`yM|1{Jz9RAeHe+sOiCFHZN#VY}7hhN;t>-e6^sbROQHK_B;idg;T{KZzc4x-C>8
z|G7@H2go<1_DG?Rccnqd9XUv^wX!t(Q#d6*jZjT%0x=N1=U2?3;0L02wXGmZ3vDUr
ztrnTh&bq;D5|V7UOYy&VHh$1!b4l{%y_tD${^&|4#AGO72-{KxD3m7P+o6wO3y3Ab
zrmYHVTE^rN4>V?S$M4GltT9t$;N3<tQjv#wk&s0=YsS)64;TL0`qZwdwFYTj>(!x*
zfF=j6B$>d2O<{e7QCTwrrwJMRQq&~f%ky&ewpn$p(w4Er2n`0vRft|?b)*~`6-%zL
zgJ5efi3jCr<B1RkD++Al=4iLHm9vIS<d+Fn)9#71BR}ghNlU+?KL$YXwgDcMkunGV
z2I7D)T7L~=fpsj|;C};|2&pjy*kYz>bL|H7&AR*oFG*|hBY=;qGtP*kGqMW@_It?-
zM_<d>NAIzPJL|eifP47(93;_Mn&jx&<aGL1*6WRKqQNXtPvRtg0qt5@Z`(!?e%G(q
zq6sXgk}cnMe8hL`!Z~0I?L%Ay6uFWXrbw1t*-;Y%MV|WD05%G=D0%_~`V<r>P!wr@
zgYp;rOFFx}miJ-#A!r1_7Ri~9b8%+4J1h5$u2HE>-l?EFsM#eJY7-SB_-{xiMS2_2
zE=EU#UR&1&a85pvI(Pzz8GThAN4rvsU=2OiDb{3yO|;VHXVxv7XF}F{YYzRcZgRMG
zUsaK;8v~Pcx)e#8f>a`7&4L?iZQblil;~Ow87h|G+$q6lobO<NYv<w74uj%S(ym0&
znPee_Skxq~KE(<;BeV-wKm$wfn=*zQDO}>oN=1`;*a9UyjgGhUo}p`4qwq_!bQK@(
zVb#Fqa;4I@(#Uq6$=G0G9`9?Xl1h{fv(xVZg?C{&H^PD5A+o>+?%?*?#%-cui|cOD
zfeJstI!HoIsik^eSeN>=3#apX!ebczG<^N`tKn<-@%H8L_3+K`&*4AAzlZ-0{}}%D
z_B*uF?-|6jP6q3po<!6L|F#4n@c^!<lBu8-1rB@8(b7yS$TV4zRmrk!$&Z*WmFE=%
zAHyW45@q_CMC+hihNLL)W2-BfXcdj2vE^7YxIg(q*QlgE>Qjp-cvCkOY`SdqOtyV3
zKi4TXDUlOy^&*2Q?nX&GvZ-5^p#4V~bWPnjWRFk*`UgZQKz)GQxxoRskT9D%rFyRf
zO92&ZhJsoYA$M$K-=~-x3iEJN<>TsN3Bs*OsET)aK4ru!?apdTg%rNr>a3o13B}7g
z&p6g<OIMXOblXBJlWPf(Z5<NJXdz{+s(V~g0g+XJwcFOpB>$1Zd8nWHY`3j+N=Ukp
z7OBs`Buijv@n<y!n`o3Ls^-AJKyZB2Jbe0iWBcjh{{6isq;E#cQ#kwFK}VRfa?0}>
zlEHJ543?}RC=Uux=uAeJV8Y>Ynb%EB`=*9&v6AMToV2Csx1ef5G1X*dab#io*iW9-
zn1nih7j%T$Dsz52|FREhqv{6%Lg6C&(5|VUAq~oKuvAsYnoycV)ljc*QKab<wJ^dx
zgAOLf#+N;?^NRPAD^y<#=6g|yWuI2Gfem&ZvGV;gR*tu1Cum7-HfGF_*+i)ViX@51
z1Hmsr$PP4LSS#%O71q0~xkp!*7gv{G7y15LkpAWXzj2kALi<OX5B<=ZMm(jUn9tS4
zOSECP8p6rTSH3-dEGWhAqqawBz+ZeNUZJI>rRk~q++uyIQD5L{Z<AB#{17yaSQ&(E
z0(}=Gp$!$v0knA}WD^Fr0BH5bG{7}%D?;A|HimA#d8VT+LJ72zE*y(k)>>{8`2>3K
zDBOIbK06I~b4v~!d*}}!cHP&5Lx_9Jh5L8{9rABeS5H_&8iHGF)R!953p2CzsrtMv
z9rXVIsj)vMMxU}j5207KFLoqo^Fc@xdVGRI(tTUd?7xjV07?UX?>*y_;zM34?eBRh
z#cwk$uK?(F*IM)H8{r)(WLpj1!;)%(lhxAuY!`bunJuRMbp^P0PXH*C>v<w|8|?pO
z8f8yXFp=^HbJVGHDnX9-iL`Jc{o(53%jkDH_UzTgn}qYFzhwb0e|}#JZW?fuwcryc
zD~`Mpq%DFZ)`65okn2|g-tlK9|8;m<!=@&wSuMY4F|dVXn$jS?<9`x(Im)h-wK)1j
zd&W{H7t~bnWa7_KYpc8JkYd-JXHw5l@!j|$n^ZXBztf|A6idR*+)!~{9Lq05qX6yA
zfX$A*8x?i2P#tTGww{)Rn|(KG=|Z7^nIG-LTM}+AqlOxg$9itzvr{Eca(?`7i8&8d
zEsW8J4dx1LXS(q;ENZU<yI4)#Kq@;Hu%-%NJs=7av3hVUKus5b;;Y62l)dLBfX(Cu
z>p2Vj4j7X$0ydi$tmUu%vtxT%JBl|~49~NhgBP;fd@(f7qYhfwqYDKrCq@U8GK{sD
ziS>dtX<no`BKeVKiyVL)6ESNDf8Li=3sKz{h_rd@mvKLDvqFf*=<OQGx3izLd^Zzz
zIfQtP-flKkJ3Fv~cP!OUZwXs+ekaWp^80AVCxH`Sw7@Z!$Uo!CSQEA#yeA@jGJxgB
zW&kZBfDk2igC7<z`J(89TrUTqjZ51;k+*^PjYU`1G;)8-&yhWiSlm+dv`J(LZCiSd
zNo0ubTZ*pBU=tMaT${lnn#%Wmnm!_j6B${)2y82cqKCbq<$wuqX$GT=fn-KSbcZt>
zjgBmisf#ZfD!486RT}ex<8KsUN$%PNk#|X!d7iJUL_3M*hVgUG4d*EX_EFdo(G=*L
z6-ZI)Abs-*__u8#MR-5+IQw{5ZKrNWMa1KrHB|23c<MWN)R>w3YXRNzZLo<srl2_G
z7X?BtF1{=vN*(*E9+MQa=$s^yMdqcbR6;TTr4oknUJlwkat3o;mZW(t6ijJ3?3tf9
zl%w*lsMr%3_9nDF;&!c_{;kmHgr6Tm7qSX>bOa*;QD#{#S>5DEEv!<`v=EUt#S3hV
zVU#ZLW>5n5_s-@pzBt7aWG-X&1pQKN?(2}>;DV5OtS#HqHzTxqV4f#z{J_P0J_yeT
z#X?=nBk?xK@=Q?ALJkUvp5iCUhBDoi^bz=IQy8GC`mZf!-lP;7zzVRI@j;4y8M^_6
z>>d;|#opp15~2eGUw7z>4Wd=WskGEduVbP;<!wyWC9k0;-Voct&Tg|7nrRb`Hy<_k
zKC2;W_VIY~m{`(Gbal+R5>y}UJTtJ&rnlMhB)ryFgVKbA5oH<Ao-cF8^ju}jL{Or~
z(gw)5SHKhCnAEuO<PrpkLEH<^bmk1p$Si1*rp0DXBGUMSqB$P%xB*p%Gmn2_%(EMw
zPt9qb$Xx44%oCNSka^;UZS$Guyz(FI8ryQ)y7Ap#fw<}smB^NpPCFAja*~rKGoHyL
znK(UtaC{Vsgd|KTf+ax9n%Mu|UEFvBb#YG5Q}rT=T<m=py9>N{nJuz|gVEyy@|b*C
zFhOQ4p#;9OFqeeSh+I%|xn9nAx`t=b_i#>+0T|(fXh7bDQ$|zriA$PBjOOIUOg(ue
z^qS*{FV7A9JDw|avm!}I#ItqI<_k%}G$sj)XexkkI^+2=l#HiCk|i{RXE%(l)VlW<
zZ{B{me2b_QmvRwGvI+%>nUFb~7Lvwf#pD9sfCPdUc|?IwtT-MW9Hilr3J}6c^z{v2
zW;~^-gkP!P3H^GJW`#UEI4Hy>sJFKf&5+BlpNmwoC3O$ZP@78J*ZKTLVIw)saw=fG
z0AWE!d<J@9>72}RzEr}!d4EB|d|oUO%xd^w0@QtK{@|yl7mrB_I&lPo!I^>ibxmSA
z3yVY!71nRP$>rP6zrFo@)d%D^{p)W)BoEhUVURE;Gh-8t_a;mV>ZmJ!h=AiMCH#iw
zIg4Yk^>j_>Z3Y%&GC`jZ0tIOzfj{b51R9fh5lNo!AV`y4C)mY|ta+iR5hn3>E@(0v
zl9;D`iDJyD)E=Q+jO9WSnov}ybz>ztA_KATKe~f`mltV@VuTq=rX0|!;ol1o+KLI<
zuvQ|HHzgdRszi|+-(+Zdk<myBM1;TsY34-&3JQhcYJNk&yN=0)?8DP!$$|ASS%qr>
z=%j?80!rwQ0FHRRU4pl#bEUCwWQFXZZdRe@Da-i{i>cBP;Va{CR+?8~As1lueFFED
zpp-16%uYw6)oOJ-Pm5zv_(<@XT!lFuC2SgvmSI|i$!H;$$s~oK8@)D)I=Wn^GQ2&;
zH$HScqv<^7MW&GQG+`;tim4c#oIL->^S}S?`SZ~f5&<~27~M|eNwf&Fr_U6+zsPVt
zdHQT}@=Qf|l%Ri<fk$sax>ykP@8HJ)dR~^Zn@}2WAU(;yL*_a2y@C`7R3V_%yJ8BC
z0l6!U&^gFt;_Mz6cx6fOXh?5EP4b^~#!{x>dvW<&!weK&&6ElWvtEC{d`X(YfX}Y3
z4L|r9jR+>bO#4ykxyrL0l;Un87HkIbg_s5v6g^CpN9S4#mU!ho=m0EudRi5?BFaE3
z?%wDq2XBfn3p+IlD!(Y)K~3K+*_&)s&0?^tw2Gg{<i{(PE@;kV%%gkraMZ<uGGox9
zs2+b*IU6a0X!NYfkM;n?Pldk{Y_-6BC_rnHM`O!2z}IwM#WfgIc<}L2g;tsiG}2)m
za!@jHzr_R<R6->VVlhrRPa0@X)x(Ca*o*{qK7aXz^!vm~+!CrHgv|m*jw<7jpau0K
zKRVigKBuzCQ!)!-`A+CS?un34(TEAw2Tr9(rfrc5^Y3{&*Le11AGx>eU!7drhmUqr
z*(D@sxtZ+46kf))QDKequ4wy&Ft9TbfqW63ncY#nwPB|-XWi+la@1U}6^v>t9>dl-
z1vqD(r`1e_iv9|36ATH2ACPl^XedINLo1`qQb*^DP$*_1tTAvg*kpi4@xVeMp?QXS
zwY})*JdCi^`wgp{pyfPDbt5bjw3>818tS5m1nOVPiK;>et(AtGFpg_3U}z7We((XR
zr()Yq*Vy1(m(&Q>#IuvL`M4bFovkA|ZSyJIEv#Qzz*lmS^OYdYI$M`zX5F0Kz@L~?
zfyE%bg??Z^_e4!t4^;|jI%uNOdfop@DY1$UdJG^=&Y-j<FVuoF^5jX6`8@Q|PA=MG
z*IxhXLB+;n<aJDz(@9J*<4^3vsv(AITWeSsKT4^p_HODm5TLA7&Vv3IC@Kz*{wfZw
zmQlapyhg#t{h`jlI@39xUJ}PWIYs{JPTOPPxWf{D&~oB~y0aPL<2^$am3P)o4I0}H
zL0md{bq}!1f$#^Q5)4ovtpN0pBk~mFSLMJdY06EW=!k8Rn&ve8zF#D7XR8s1TC??E
z8=^7+<a;Fg3NH`I^Us=jUi+2WEHjQ(5kSKatIPhly=&vLzS(tkvK==qfT)xWJbKjy
zTakK7wxL1Tsm)Hi)ajpS76u-CTheUR)DOzCWz)J}dX=0LXzSMHWCDIsoo;t<3s;G3
zc8UlyYs8DxDc+GA)Vm!pvYs122TyOYvDQ5~hXyEjOb!X?44UtH{p!uQWvvvo>p;NQ
znRcoR&%9={B3vP!N@!l2F6-!=0eSGcU;sJeO6vwwrvB9u99mmh&K}&_AvS){<PzO_
zK>uF@^i`|dG=XVsLvhrEtO)W@6)HS?s`2XD^@(*|6{&U&=z%)4(BcyE^)@a=&}7gI
zO5X4#gh>2BXEqGX_O=t~ahJuVJRnJ~df(~VHH+|jqQ+JMz8k1+Uxm5q9U@J|B)A&3
zic-8AnU~L&dL0EvxLq|sdZd~?#d>ptZS35tU^iin68V@@{@7;F2dZRQQh_5;%<ZmB
zY3C>if<vrZj7US$atNUSu!QkY9}>3A5+2i_e@G4i#u-Q$Njw!*=Z?KQ-y8XS2uq%l
zVh@G;nEt>ktT}G6{H-f|4prht4YzvJjXK<!l?G)mk-C>|sDv%m9X8t6aolQV)F%Ju
zv@?xX%x<^Bl*B`_WVc`^Q+If#J6jtPi>ejHe^4h;A>f@?_=}-kI|7HiUb$Dxuuhv+
zO5s1*q@Jo;SAP$*X0?R$*3TX5KG1o%VdZ{au*D5Dg<U$r`bJh|IW_!#;mXp!2?t7B
zPHnX!|9G)<lWC_v8|15rrv=iupzJB7#e&DoJZmfTEYBY{J9W=aMKv#K=m*P?N4xdU
z|9iFFH|ByYov0l#(7X=GRll#hq-!$+QT42sdwf%GKRQPBx(+woY80ZJ^o0q5Z4h_3
zQ1X1;u00KkgyJzD9)U4+^q8yTcAipua2MCz0jgQK@kGH>ZZe??HC$>3oo@Q<9^T!N
zir(<CM{VB1!1mW_(T-dA<^~%PZJ1WH{c_wHx3w`36UxY+>3<5A)7W1jKg?ZojZ^Fp
z-kwBTGH83iT6h`0KN`>KsO+sB>StFQmDeWRaS-A14~k@(Ek$p)sYQLcZ*j-2yWwcB
zaRLkJ>mBw>u8$m?l9zg;Y)%-M+55@_YF|O=O2cU3x?*zz845MmJMTEG(QUM9xP7NR
zU7ZddLq$B5AxlMh1~u-hSbSuHw#vtqo*Mec!1zIIENxo9VR!q1<a042Ox-f5mNi3l
zg#j{8uCFc78=9|y4IHh^@cIEb{-M1zVZ0yBdhDa{5mVZV3CO|b%7Pw9M2j#d0dw@5
zbN?Zvz+_#*V?xBcCo=p_-T8?+KG8RL1cl^*nbvcPVy27@yF7)?wmo^Q3~J4@qvj~W
zny+r5x`&(i-C?ZXX-iOE%6Zn&SyuD9p8@cp?)Ux*z}CgJN(sHK9RAcD(dg4lzoYf7
z#9lj3b$F`Ztv!j<VfW_8?y%pBkUc9kvnCIefheaYKa<zMV?KdvFDZmxt^B_;S19xa
zD|>v8VWZ%M71Mu+Z<Ya&zKSuhPby{KhHTiK2P+JeC-+^)+!bwkOj56eOKuG7$VX?b
zj=9I2z^gQ&*PQy`h`Nec$$+3tNrk#bh63n^<3538IHhx@u7-6Zs;06!CcXtlFQK71
z$ZK6uFomqTqJW2LrpN%UPFtI4%^v0sN?Eu=V(6RV&(hm)C&I#X<|$*ou3+~6YX?ik
z{6AR*>=rHNDMrQ})O2^VgojcC-KmnYXKqf~FxnVkss-OY!W>BDhEwfEk%KT-icZLj
zvMJG5rrL#?_p*@&_8ombFix#rHs;9vV%6)XTl{Uil$x#PlmF)hcR2b-r+`M`<Zef}
z<v)`j>TcIg5uX*9DkW89vl*jtdDU89gmgE5=R#fKrEz&{S52djHzt?KL~?!E7Mlxy
zZ{Z?ZJLodZ0=GWs-Zp{FIRMLO5%hoj9vof$KE8f39t6iv2KR1s4c`jHYY3|+1p(FV
zu}LXZL}6y{4(gZBb~vi3_cM>S^)s$0YSY|d>fTjS4eNQaI+8L=+&KtwS`u!Adw=j>
zy;$FG+cpq>*I&UFUL^-{vhFcyexYlC0!3Cd+4hhG1|v~6VVTrO%8AkBf8QNR$+9FX
zZnDlVwy5LryZgQ)kN$9yPxBzy-wDVLxtelKQl2pa-#Jx=$ds5VBbUp0D#a4U;u)Q=
zJupW5C?1k?ddHa{U!`Fp=1h?fsU11hZq8mT=f~duTq^4>EwYTnGG8h_nHoYxLNXpR
zp<!W>N;Rj3OR-Dxj8Pa{aCUF!efj+H)5YZ{bY)SRDK+GtYLakm6u&DBOUOMpQ+NXr
zXj!P3!9s~eydMOD&Y6ZFs)%kr%6TpY69#?>Ei-oWS>%N|41z-US$%qlS&k^denB&y
zoT*7M2aD>(;g5Rw!#>sK11mOdXG+nfg+&z071Q8GL)IW!IF>89;0Z)d?I1<#lA%8}
z&~@M+@H238j);Jqt{g|#A@DQ@CPH#_Ou|&kgFC9iUHj9G`RCCHf0S1E`*wKfS2(4G
znF7h%ief*AGpcnxLiPZ25>4z=@I64#x#A0Im<x>zK$*a!VM;@e?EB&l^aHXIF=md8
z$1x<?s3JB|YtF87{X0v!;MRPQtbRjcK%7JC)-7(chI$$uubhBg8-|5K6|i$~P=`?S
zkC}qclbc}q#m^4;e#*s^DQ*%OKl#D^&fq4@oO7j3DY$5OKu%EpV$whjmBeT~B~cqb
zNX6kt9tR-5f(>gk@xxP?=xpA-BR5=+-6DQ)h@;^Mgm6^m;`-OyrW5=?A`BM=J6wD7
z6s$ceW(p-dl$B-8%3B~kuTSEX>aS%sT-`-3x<{`UivzTBCuK$kQe;bOkHn`m(+rZ1
zubMh>)4<5-Zdi`g6!Hu!Gsj358*h*V4vY_G!>&XR7AVVEZ=NlywQwwnC5x?9Yk9X(
zKkNF2i?NM78Z36p;5)&3w@@K1uO0r|AYNHQ+p+IQk?BWB{9~F)YMjv{3ej#Iw8%^;
zi(bLZ`2$P-SH(1#j#gC9$m1i@RSBx8gg(;BsJD<quV8;nF}<o;SB`xm4AS0MVz!ki
z2aD|`xt@!*D!*AXV9JY$ryP#z>KwP7PT6KrHNn11Yp^iV4*64guUF6Gv5}W<a|W4p
zo&|1)Mx9;X9&W3wwG-l}oezTv@PP%;uznBLCnP)y$pHyT*yg)bSScUCxJfswK*7q!
z*16X;vUPo1o%4H97?L+w8Gy+m-t#$QI;J_hk~1bE^a^0ZVH>PdM{C52bOVw;6c9x(
z4&-YClCCo8qNTQaBg?QfpXV9$)e#W0>-w_soaWKB1p{4T4NZ9Kif)LAHi6x~;MP|5
zAYal}DQHe(yf9Q{1imzjn!Vq1yDwYz_fWMxmn}DMI-3$ux`E<?0)so59^(xsLT|Pk
z54(E-2bLzu7bzy?Ay?di8$b28VYwGJlV5F|o7Q}8$xFBcn65S7_pjOOwCZ=At8O>J
z`meSi&XUCL#fXqd3z1k)<qlgKo|>tW_jnKKx}1@}r*OaV^Cx@(4~b-2gm{60%V<Mt
z?)p**t(hXbZ<2up6&GgLbqZyO4L#aU(5Gc}u^1ggOMB@ZM3t)+Q8p@j`RfiW(tuW&
zGzzca^m#k_MZYb>!~ltqKEge$zST0FEqkX3JD@{9=3bsl)e(a=xPYRIn)2DmZwBlA
ze0sO?LZQI_DYybcEfV~1WzMxO&*(mt)N9v^1pmT#u|P@+&`C=gJ@YQug!asQiLjng
zmRqN{!5p~RC=5Ix+rWiKeI>1UoX>TaewOp3uWK%E%f|h%>!R8%cOOnCm`dXnjy1yU
zZNjzQ8!zL|{pgtMztHBJmsRwi^Wg=Hh2)B7OGcc68Zh0uH0y@x!iAJ=c@b<9COlR3
zKMpqS3i#icJ43eG6I%c1`FbvWyky(24l#eT1O{GN(yL>!vou>WXhqc!0?MEYaf`z2
z*zW!8jqE%H{{q!mTTkOS6n@XII5X-F30q*F%WxSnjD$2|M+0xbGH!CxSR{5fb_x~4
zf8S##&8-P^peyZG6)pDhxqSY<V>cg<(kOMDy=@1!;WFY1LLMW~XUZ}SG6WqVTr84M
ziUp1NcWj2cWNhqR--9n~%2B{KsZsbGGx!+Vkz-Y?+4W^|SlWM)nROTDaSXmp7a5;L
z8kh(m<~|BVfkh~@glR6t7}6LSjm<gU+jU>hPEOA+PK_&@rH+_}d!``ZN@skUYYgC?
z>xgEk0wwdzM+y|!jQ1QzumlwqQB`z(B9l}K6q>#XC1bok6KSsZ9Vb`MS)D%kn3^of
ze$HYZe9C5dLKfA;{@NbC=R)%Y8!Kr)EMPVlvl*uPslmdJnW8-+AeqHb_!(*}4ecbV
z<@Q`g8Decy&H~F2(oD{IKxj=D5MapiSWn7T^!`D`%&p5G6Y^qq#k!Y-9)y`pY(6Jn
z&&XF%wE~yE&b_6B3)&7bTXkW0wG2)B#z0xaI&Q`mFRv05mki5<k6ErG0%Tn#?m28q
zVVPe7wnRB0x)rt9fis~o3yCXZplXmMY#L*G#(8vrUX+_g-*9h4SaQLOP3%l5>ttnE
z+AUXb09Q9FlQq1()7&INb?`ZofzEOy>R6k6N`fMt3Ey~!+goA*C6N2twIzJ6@@(cz
zP6SEQvp$O2%!`NMnsGQdIB1%C4IA?s8P)9^w*8TGI}u%PzgqSL7!#{|{Y<$C+-A7_
zJ}WCerm^MKDgN3ID<$*VhR0(rBFwlBr2kY7?)3s@V?Tpb7oswmzWr)UukQ5_Y%L;n
zEvYlBs@~Nqzh%-#t8^lKQZ!eAwN!Uol~-D*c~zlM1$sS@_4afTYuDSwpaIW}=q)}q
zknMuqL@41(QA25(+g@=?2L_47E&jQ~g=$i3=WvF)TH|`&xURshROo@}=*@NGZgyQs
zP~*)r0q?G>xVQK~hn1?m_W1bl0fv%mWV3U~)pz_m=NSeq_InLLjCQYmnVXeeY&<xG
zKe`#~D3kYAw%udNRVnpq9lBfRQUeN^&!Xl5P`aPM``^@iZ+B~KTPhvCE`6o<YJ6{_
zn&s-O?uV{7fvJ>nhjrzClniS0&ml3bA6}tu#y7!R9eSW;w0rnyqbapXJz1WbeTWqN
zOfZ|FyCTLG13wqn1#&oEQQ}}vdR5MDaXEmIxwcXI34g$#=WKe{lW@dTEg8FhnCL?{
zxSH_hDq>h&(H#Ow{Z$wp7&#lVmr<IG9-v(X*Ogs!14l=z4X~qn>)ei&_z(C0U!rU;
z*5d+d7!fY{3UU7*kPl&fP*(MJ^qTc{nEGPpc^<cosOZn)vhil!7k+wFU*2XmneDoY
z??>?*XZDBV0Q=h4SWANXGEt|{<6D%DFXcHoUb^r4Z|-t~Vm;h!Sib9;J~`_MZJF!l
zWLE6v>-t*H?WSlW9j3rhXJjeL$w2>WmH97pzaG}T-1}ZdzHZ%XlFan0iXuJy>Hd=X
z?^C9q02}Sf{k`N@dvXge`1y0dth4V!1)M6MrRL!aXnBXi0&eclSd2#)$8=N~esS}l
zMQFz9hhi=i3laQ?eu(WpTXx~+()g|lw~?sw<ujJP+S3eYw+YjJ<ZeCwb#;BebMyP?
z$?RdV+Dg`DJn7`>mKGZkV)2B<EgzB$T$PJS!<FW<ls6tcW#n$iHZ|Juo}7OGrB-ck
z+cpsXu3vF2vRE!W2OS0sh~unAngRxbv~w~H!!iW4e6om2q(@S5jXD2)N9x6*BD)Tz
zFSc~Y<2}#aJ><o&t7H`fXYT@d2lolr5c3p)epgHxkTIA9;ck<~Qf%m3^p!1fNY2(j
zjQa42%{dDAA`Oa&qk@arefgk^HN!||m!<zFsa&`?Pg98GYNPlvF~GzEQXZkuw6Tb#
z%9!C&3}BTaqi;_f*KXa-^y>Qd?%IZOS(=0ySThX^u8rdJ+~5M%+$3Zn1X|`QLfUBI
zGCm6e!7|hYqDJ&^C9{<jC=C4*TBi6g6|3Bgf*{w2ysp1RxUyN2{}W63VxpFLMjo|c
zbaaFpx#Uq}9aY28HN%xcO=~nTLXl+!Q38RLn^lGQz;crixyKgcEQnI3H8`wQ=E1)K
z(6h?tR1DfrXalqB-+rIYu0O&U-j80IKYzKOe!iXDkol($^Yrd<GMi2QB=gS%%h?rw
zVg|w1ODy5UR%GN^xG->%QO!mj3$|q4&ZSJZOewb63hJb7oJ#70lLf{sPfgb{Yt)hA
z6~WfSk!&BLk9wVDmGAz?Wm~=6C%Za;HMFAHOl^Amqgjxh(X8PdG^X+Sd0hc2Z}Fuf
z{ngnwIDiQ>-wb{;o#6_uEfhy`gY}y4I{oUM#vw-t;};1#Tp&fd>6e?;dzwVawe835
zS%N<jYHN=lD^Wta-T0!6bJlFZI2Vyy`}pX(QRR^dn{7APwHh_3#Wd(@7qazwgF}4m
zs3^h|=!$8w504>ql#R#ZV!wXFx@(1Ti?31b^9-13v~dd0OZWx0+j7|jyl=;Ibb=t+
z+{b9BX+ngF!`{SW_3aP(tw-&UuopS^8~FtF-xDjfKVG`Y7&qs+VJy)#rn+JDsqPrm
zhOb8Rv7kDvI4`q$elgTDG`SMm9UR`A4i9$A63s0+h5hrg<gH>V7q$uey9p>72Oj&0
z5XB1r$+^PCussar7Pi&u#cn9kkfc}5@5{pgVn!_jl6FyRuJIs9u4m=u7N^~)8)Zv^
zZ2yL>Z>P;7f4>-ATtti%h<!!KsGgh-{X#<YQN;LkR42}B>6q9#K8B0kk+$Qa{&pM}
zcW8>P^aS$-*isVx%RwQ8TtreSj7&>&iH0SALU9mmV}|~xrj=lu%><{X&K=&2$90JP
z>g0n9dsj?Y;h_}i#^Yl{=LPmu@op`x<7L?EmMJgavfAyue4XBtynPzn{Pp+9Gw+o8
z%>&nuj?0}^bp_kc#-v4o#m?+8XzQ~(40F0^&9Sz43=}MM@KK9z1;oET9hTG1#@#EY
zRkziOy8lvfP-|b6pntbHBFB2ck;?C#Q$<G4!GCR$!D_=W42JK13LSQ6%V-{;W$P#{
zbc`|RV3%GTTS?3u+1SoP7<>20Zo9#l4{<C@`ak_%-}}xBQ7r^4;I%Um8e<W7_cA1K
z4Wtg?IQ5OAiDT+rwz%ZvoIg`@*vr}=!HY{s%3y$XQzDyqu30MA-(B+eE|hl7U@a);
zr(oJHfg}yqD5S{3)VR>gWE|asw<tOGVQ?&UPlxU9`MAri3T5hKf>B1$CZ=HOA)$uR
zq>gWRg6M{zkcD(1u7n`jW8@)zCOU0h?;Rl}{-fwDo(|-Pw91wg=5l-(WxxX^3{5VM
zog1u%nsIw(?75tU>j{*VF=9M}Y4k`sf};$ddtD^XJ+CHi<d8Zx=FKsFfJa!5(rV+D
zBi0(DX=&5;(%7q!l`uab|G<e)0lW%*UJE#4ip9Ra^5wcJyB}(P0e%=#*?NeWO4h7=
ze<!~&`8;2VFYyh{T3d6|MihScuUME+Nf4VpJ0y^S&@w|)ngrSz$CHtzwXGs+U9ALU
zn*8^kUF}MH(<LSpoCj>_?74jBvghpb?D=-R9gUto9-+tRVx3U5Oj3;C-))!|h%8aD
z#_0Tdvn1IyJc~YtD?9;WM(;-fdL1qjoS}E5z*&^w96ej|CogEVW)hLjk)VG~a?Wm9
zrYVZZ_Bu~i>jH&YjM5~+83n=FlH{APNJzGiwkZzb*{1}5=Ih?Rd3kbre!^IBEsJ$n
zpwA&iaYBncS(F8i(dVRC!yB-Gk}{7l2#UGJPe-FH++Yeu)D~U7B%3YCa8|&#jFJ>z
zzR9*_aWEQ{w2SKGON6&fOQ8Q0rb&F9ugVQj)GrPOb9hTuNu;a;Z*aJd5!dAvUM5+>
zUZEUsb4-B?MIoY?`-e*hBR880#|)!T=t4QPgtMj6Y40g`a4LSV&tBXJI7As>ZHV<}
zl9YXF0%@`DF<8BQ{poaicJjyjH)kiWf_>-m-?>`8w<HACdP~WmdOn?gIDY&7<jQ6;
z4-SO#FT%1|Lr4t`!Kb4r4JkFv8~r<Ce7AY>DJ&Rxd3cTX8VnE7Y<{4TBw2y>a{N!3
z<T!pwO89w*e%5LBKoo!hyd)wFTnKyzS!HsVc2Wwxgf|^p34#o-!X6R|s1;FJ+s0{l
z(6J8y3%MU|B()MA$C-Etai@8k2b$tOfQS}h7Gc5iX{AQFfINrv&mvBAbrpf0MP5dQ
zZwq6(1$<rQARenMvByUc`bu~zi-OADTg#+#4A!z5q6iShEn#X;Iu+IBS*luEx`Kzl
zu)W7VQ1WmXt&wU8g0i-k6nGOTjM*ny0v&r%V=SFfL2uHla%Xdp%oiVMG`9$+P^=sa
zYfD;}j+$={H^~5@e#0s_a1d6?1DQ~@-;;U(lEvRRDya0M5y~1Zn4);7J*EZAzQ|}y
zbe4{m5N-{T>UB$XQ7C!~he6w3i&U-RxWi+%Gmhh!Z8ALw{@+f~tav`iD=e!RBIv>4
zp+ajWQ<JI69!r}A&g8S8ZB_^E$>aw7MX}DwXNvTm0sXngtmZ}}&jFpf0bqUHD*1%7
zp>X*+*o~eJxDpD%@0;N~tJjQ=R=7BY*1!+ufe8#ZgEs@ZB|e3{Dl3-0$3sBq!FxK^
zWuS+T=tC5y;Dz`a;V;nl(Ft@8E}?+}u2P$HPq*a9-PL^=W*I3Mme88X>}@Ql^j;Rw
zoz&@~y==2$zg5R!rYbxWdM5Pp1N75R$c2JgQNA${M2JJs8xM!URB{I-IFh~<mL2u7
zUVc}oO&L#~xN5w@)wLOS7yWMChNY;@#;!hRxG3|CSA4xtEUv5cgl-(ZZVBZ*j8*qV
z@oF2HsxnrG3a?x!CYWYkQ6+n49a}YfvCrngY<0ssb*5P`)irk1vj+mFbx4~+&DXXk
zL7OE_I$W$}(UN8{gAhv*ZV?aoN{ZWg>b`ZE(5s|Y3q7w2$rb2OVrrG*08K65A2ghE
z?o74C<80@B&WC;-Gr+7MsJ3QNmDP|i<H7Ad6?cdG7KEf-efGD&Mr?5=Lapu4FS0ki
zV?QLs84c0UV5dI7!zCK{NDo_f_Ba>}$jZ$EO0;PK?RKG}6fbH_vBXL?p;qrE3_iSk
z_v^c>H>Vd@za9St9=nV<SIe1qv#8#bb~Nowt=pX@wikLwXD8NhM?Mn?z=ED-!Ob!y
zVR6IX-7w&ehAInlYgnf3F|t=BNb5vuPAgsAuHe<bzwqZmGv8hJB!U&oVZ)#}dl)cv
zRFrJykQ2Ezap=tYhCn&KI!<X?20-^wfE<X86B^^S>x@Tv4ZYXkaoRn>eJ>;x%?BXa
zM5&}=(Mg=gASN_&jTU`wh`MI3iiv1dw7F!MoxX~YRH<*+lBYR>UK_MnWB;Ij0fi?_
z>5z3h4QRr8wkgJ~qnRZvurPO8SqJ%#rLW%dE5zp_XYG!^j#K<)o01s&-i;whUCUxv
z=D+Ja!2+r-7PETYz&L1MZv(sw(0p!}JX-;;jWtd~^!U(!+2c(|aI>w4h|87l?Y$1n
z8#NW>2b{KQrX=)~<xRLqv17dDIfY}!8l-s{8GDmHneF9A;pUE)`%6kilo=+st~#$2
z4^_(^h}(7mbM6)OT8ucmjk(&+ai<|y>>O2#sE@bRtM1`e?tk|)+K$J}W5SrbjkbD|
z+(gwbL#Wnc7$d0ZAAZff!Nr=yC<+<u3yew%(N_=@t#R~`ab{g5Jj~g#YFftZEj*Eh
zZC#(Kf-nr(%Ur<-<VCE{ZhsqR1^l)KqB`gug5B<QjKBJj>O%3ZgKAIPr;e$z?;94Z
z14mS${e3xKR@Pp~>jJ(T=t?o~hW*abTa_*?id&616(w&+Bh-r7A3Js>90qnB5wA&Z
zp<eHsUDZsFm?pyvUtADg+^y!~n-AWVI`=bn4;X9Y$lcZT+}pUVo~Nkp=Ldaa2C@R-
zE4RgFKQZ}%dvKnGY4>cd$Acr(sz<Ipv%ky!`t7rO_jI+!tvjeo!>{tBED1k`C#5!q
zC*|Yeo-}(y_<A3n>}!Oio<m&eQn7b0r`H+T(xm?&^IQ=6tjdWXgKDva5fQh+xQA1$
z{(l91`lwjI$Z3{k>KH;KC;nebyqPF+bI-g2tNK>Xy8RyBme)}&xp-dUm}EtuW{fPF
zVZ=QBfsxx*SnOmpIH}mjLysu?^Y&Xwlqrsjl~;W}yU*}u9-4yI?aRS&1u3^%ocoSb
zj9tafE3wYi&WYWIygmXrY?+%uPMuAVM_mK<)akf7O;i!uEUb#S8INJ~Wv*}?_q2)7
z;<n~Bdqi34v%k4ovR$nAMYyQtVBml+uRf#_fu3#3T~J@XjmKK5sRt=xk{XHONHj%M
z_iccX%Q!ysCaz0?iFafGJ@lep6EFb@lgY$0p|m(Z7<ff*sy_qu#ZO0EaM+j*^KK1v
zN7xMQ-5}YB6DPzXt9Jc_i<JAp?dU)4SHW)MHW0n*E9MZOa*$2#-E@<7HvtS3-C(n5
zFMFY-k;H}~1rB9LX!`FRQk3mDvh1b}dZ`Y!M3FOZ-n=14msd^IB+12T0;lk`k_3fR
z2>jm&>%bJ?Duny4E{yJYEPD_op7UfsKh0)vD;5$p+!=>DlW5_x2qV|juQ|_5{UOf3
zH8z+lTBRT}O=o3UIS@JrB{S5-j&)&dEu1v^3>t-k$CeUTVcpO3k2k;E-*{62rK^O4
zl_1C^IV%^f!yH!9Rs4n{Ak*3m*-;)4UnGeZH4+E0j_BJ*Q#VGVc6_JFDEv0pP3zt#
zNlR0+ZXPpiJW8Iw6iVhl+On;A#`?wkqb+=CwUae&t>k<J!UC4Lc4!L^nq%@b$jv~_
z6nU>4_o4&Av`W7OG9`$RhD2S9)>TaYvB|nfHa?zXNd8EGuYk{Ar|<<`YjuyTkd`=~
zkqRiRsl&JxE3YSJpUn`Y+BpAAn9t6mos00_v<p@O3q)t02`JIsdYc2g>Fj&B^10R}
zv$PM1ZJC<lkY^T#c0y_pz!_|DKr)yM)xhg2lLzJvED$)SxxZz8tf2-o7gOR{-#8j<
zERf~wg^C?iVu?J!{0G4ZPTD!l9n>vzHki(YMPDA>fCfGpB=E2`W=JHgR2|q5YH*zy
zYds8$)GFqj(@dOeuH7J}HI!Awo@<^WSu;>5Q4(j$udf$UvuoMgBMu?1-DTuD1PDF<
zPr_Q!!Aanb!i=xHJU%i-%9w`$CmP;OMJBWln}36)*^ZZmF$#w3#Awys`Ei2Jd<$8H
z*#pNc)RxUNpa<EoGsBfv7^TdLfqD<fTMX}IkrGJXy_*5aQVTUHze>>EVEuDgn~nv4
z)`Q&!`2!R}5wcwUs|l?RlzDg}aMXhwEt3DG`FEr_c8$t4rP;qA*y!8m`-yY#R45}{
z59LYw6YnI)LU<yg@8Pk}KLd!=@z$lyK$<_1O{?>%>KG05tt(~?D59?ABj$%T^W&=N
zcqU_+O%&kE()&s3yf3`0WqtBF6^=O0Iys^F#ETsSLMfN1*T)%!MkNyRLVvEZW<{`j
zmQNDG;?C3H{1X;Z%P{C;i}xeoe~tA?o7z4W3jF5F%$F-_)0WkCU^WIj33u2V(h*$4
ze&$<{G3six<)%5?(f&&|qozX2FAvG#!y(lT-2?gdA*`F;kk<`NUzvVO5IYfpZzcD^
z-Y$jRtn6zS`|PaE_ug{eVD)#Lut#oikBu@G6`Xj8BdNN_Am!aCxqlpu>1}b-9^7X=
ziE&Su5Zuu0aX_Jx25Vpzzx%T%K%gNy;8Zq-<n|G=_vjxd^w5d^yaI;(^FP&pzu6wE
z{@8!K)P8*NHp-92U!nVFN6A6eKa1`kY5tXnX%z9R_1@bWSNlPQk5RWz-*f7}s{4Mj
zMxm+y5*2K2iC2@pB+WNd)4e`Ik~U52#=LahbTG{7wuinQ*n-E5{+av*y;yB;+cpsX
z?q9(cSuF>#gBI&BBym!&afbjw(j{quVHpfsrfi}TrHNEhqt1Wd9jO<JmSv|MW(0^t
z-s^M6yQ5Cdl10+#9PW3>KDk?PNdg`+0{;`5DiQ}oEf~37MnNo=u;zcEb2b2Cr1$(D
z`9P<f3Gy*kO!%Co<Rs85@1)@w_;GZa(|?FlEiTBykoa-3O!<7F2o*CDa-RtaibW8o
z5mh`E2P6p@g|!FH9yQ<P#ryHq?HEOAE7gK3@<=6_aj8;1%@muFN3IsI10KjYOMM24
zX4>MzPDjv)NpPa{=>B~iC9z;a!IO}2$nGyhlBwfPCzEYd<F7tT&`O|xpdp`)(s>pE
zMY(ajvxLid&V7pyqM_lsVM)p)@JK?zizqTc2}WW~S%l#o&C~**-8B@49Y3T}67A`=
z7S;LIA@I|R@wZRTV<KXRjgMwQSb&rSdHjre;<3SeK>Gb93&Y;PWDooy#f$|s3l*8N
z1%2Sa28m?2<RI5@sQ)L~6haT)38~2E(dDP{<m&orOorq&0O8m)A^>&9NR&ww4e2N)
zMtlKYTXumB8Lk)ham7-dQF8c}fGvIgwzt)aoADo?E^fx>V9A?xOYSOd5nZBC{D**n
zzYM}<47Cx`n)TB#jI-Hx3$8!jU0h#{F2RDITP-j#k^oDnIGh=yT$b8rJRKeeaa=r3
zX}Vqe#qDHtb2IuAwEw!*f9*7bg9k~M#F8rx@8GXsbE==~a8Mz+fkVXlWxF|7<KIVj
zqu(xdX8e*Hl%)KDDn{_|i#gfD<9*z)v!ZEAmn(r~XHUXWQ9d4Vn~)1d_9Cbhjr_2?
zn#OTx30ehV4Ao~Z&-5lX+?0OGi(~Cz_zo&8jT%gJex=14_2NYy5T6P>1;}#%DVHmS
zlUCBeIShHku`EuPWQCXmk5*Nqb4)^an=GkJLZtMQod~dYM6R(snXX|Xw{PM|#hRMj
za}6x2)QHw%Rg@8}rg+J7sVD-P5-XErVQ_R*)sSAUuGFd)Y5a&~ueo58i@<gT%Lq55
zh#MDBJrl_0X~>$AHOPdoc_$O?Z<_havlH{67HKQ0!#sjz3YIGkX#{)S?m-)L6>3I|
zfx*;w{PBRGT@wgNs^kRQrI#Dn?f1LAo<*x;je8(VW>a7*NZ<61ORA?%O*o4ZwKQ~V
z!gL6rEIe+Eg4Z31A`DtHWI5JVh_n_w=x)_qAiM60gZV~5I;UO?hZTn_3aRe7oM^~f
zRJv+;l!Opsue*XMR&2*Lrl)4BCGf*UFrUaI<jU)Q^X^x@{@D{q3Lzh&$_xx8MDlpE
z9BuamrYPu*6`$P1ve9znSOaET9G;&Er5$bAP=~H5q(clT9<jB|$j_ZyL#zxTER+l-
z8QRk!93z{$Y)~gB<aLj%R=H69_Uuz2p_K>~c-?EOBE9@czQnSG2xz_mhC=((d?@yC
z4(^}kC)nzb)}|F=r#D(eIXqT}v^MMIsiEl=G05q;9O+ZjBd=bO7x|(YVm@PS_r9xa
zT)==WC6;HR;(QDfwSw*pHaxJ0##zjyJ@MuvoKtQZy}80Ehk|0`(f{pGm3eiKXei@y
zHf(lhEf<(NH_gK<x=2p{v^KunFqNf3+8T@WX`JTD203TyHYfCYN94@(GN((WTDqH~
z&#(n^eXAW;K!i5zU_y0vTGXd7m^eXj@ONjDTnRSvl0CoV<TD87q+6B_NC43VB{*?E
za@jtS)H3l%>uPnCOHF&j{>gaCW}Yc#wLMdnXy|QEk9AB^Blt%^u>mP=YR>~@&B-=k
zn$+oL;x+EPvdiZ8Af)IQgr_*|H2hD1DlU}Y1ymLBU4g3ZuP#vK&JP2HS0Dt-z5DKj
zR1-!;cX%#Fc}Lq7o9cG$VpHz4V6(2?YC*f2VBM%)8>+2m7-98}AHAJ8)vm!nT&>%N
zowpj>i{`bl?bg4!dENJBt^_BbD%EeA`twpI@g`<{F{_z^7PMVV+`*^mHc<_z8;r-F
zh2CF(JCkoYpuVs!CWWl_5!^*%<UkPAJ{;r|NPhnSqd;80F4lJ&#mkYgaHDBjs`VRt
zx;m=>I5G!xmx-X}%hs8oNaAuV*!+Q_wTsq13~e*88lV;Xx_y2+uNZb5Uur{nvqkS0
z%>N=W-Su}oG;GcvSUGY+rv${!r}bED0n!lbLreCIfcDYD(DYBssmz=OV|}?;OE8?Z
zEw*Z?bXcp6Huf^^4tKe}k-46u7I$r<g}t~A)mZbz7B+WEtFb$q+r(7uy+KU1S&Au=
z=&AEBeNs(p8!-^Q@2{9c4@oHY4~S_ECILe!A<i)ut#)=LDvg9R8+U2@-#e0bZR(JU
z1+C`my*D$PuhGP&S>H8q2QS8E=&eJLJF3JGdSHWan0y~-5}W>^23$#SiNDde@Tgjg
z1W$pHw8aFQzFM~Vl(W*of0^SSL#pNa(K*l|PRS02K~V?JYNRZ{)Q991+d!WoI#gnN
zvv{m|-}bwQ?}vv{s<LFG7>+7KXEP_;j*J}~EgSKOf*i)AQGmM2c-=IlJZ2GbR`j|H
zJ_bT!`J)^hzV0cGd|z5pIUhKo@~U-M9eZL-eW@S-g_FG)yzuo>N=UR5DA8z33TUTt
z#$2jZ#zwuNh@QQ<0xT`vs*#Pf={dBPU}u!%!X}m1O4rwR@XETSt?TAO;6tkTQ-;%J
z_}AS0YCulaS&nE$UPN7(0SAz~gFXchM}u_ItTbC1mUbhI8PjU6v=pohC7&=RH<b_>
zJ@jP_FxT`rrWi6_CvIi?1Ulh7!%s7pmn(8}{JP$8Y-NpPyGWP)fsA}=$<3U8D`UNq
z{ER#%dawE&p;QCUjDC~s@PE;VGrGY3Y5oGGRoiacI1qi;S4@QzlwwCtcHiu{Zjib`
zfFiqX9P9#?*Pvy}5-O7dN!d-e`S%WKNtQ1Of>wY)ad>8U=Bmp<p5%_xId$L^MoFq5
zPBR9$=2U7BG3bQB{o^tg{1Ii*SGr&Uf(_n_eE3LbDdX_B(2PeZlW-YZ$$PcY2_mt4
zSK>bkY0bq&mO&))N0}}X4V2FzOC!b=Ud&@5msF>Mw;|6MMcFE4YpeI^_Ih}CKQyK+
zOPx>+YpP(LDlOAlq1hbPsZQ_&Jy4>M5yOk-mT|{%I9)P@PShTS*J7Cq&bY=eu0+Pd
zTb>uX=QxFW2{rr{vD~mk{EBAj{7Np0B_isBo{6e;`yRRRg|!Qk<&r7HDRdjXHL_fa
zRXRuN=m`a7(N%~a6vn$-Zp?GC(dh%npfoIdBo+eB&Sq5hUHrt=C4R5ed`}CVVDw*`
zt&S6ARH+^6>>Dc06`-dpD{=mJ45Pf5VfHZ0Txs|+yczyGy&rwKy}Ln@#2fz?s!40$
zdxLJMet3h+Hz7X0yZsEwj}xEtp0o9E_xa(k(eT5*QKM@NKd*VHH|V;k>sr-Q!w8?C
z7Wk(~E40?hKBST$CM4!gd#O#Zc`(A*FLYUEugcO@wXf4|Hl~y<nrSAn;iOnv+4ZN}
z(psnKQe5!J6ckLS);n25+S|FuxA09itRj_oRkzzz7*G6?w5=l3AZPCs(<AW}8_z2R
z+U(Nr%qtE1o8UejxH~F=I~8k>>VW7(inW60`UCz+uo4SSXQq>dA#MBL#LZKQD6%=$
z_zG(@p?S`@zZ)BwuBc|);MB}_Bhv*cC4Jlr(1}GWtcmfYx0Pm$FK~GDAw(m%siM$;
zM1@q?M}0W&?O8J|iF0i$UMFTod6mj#W#4ZQF;5zUht)-(-|v^S$EDI_AKSPtsKKpP
z1&6@^2<aWD)QH0)tPm{9g6*C>IR_N6fEQDo%u(WzPN-U)E7C3*;A#)raNe#$<R7DM
z?3f_I8{?|=;~1=wqVWVO<RSMLg1>cSX9p}(?7$oB_`ZuBz8O?~d`X~K7I(Wx21!6#
z{;&AnNSjp{Urd7X>yJrbsy2@l4&8()Q^Qjn85#bmyfHy)cpV9eyID3{*Ci8N@KY5t
zRPah;f1>oF4QCg=@AqEg{foZ-o~L_W?eIL`^85vwdw+%BC0eKC7?mTMoemrsQ3o(P
z0_~srxhd!=oMc?b9(g!A2|1$@+#m?xtpZ%!ppo#(+l`AD&hx{Z?>2HZj9QHuSEZw&
z+0c4L%f8gA4NH>gLh=e-{aBuypPg6lZsIr)|ISm)RaAuC0@~}RqovnwH|?S8(u($W
zwQ5mif<t@_c4RxSsM`m+=eQTUu}vVP0d5<qYOv>@fAgF1<oNd_N-CAsy9&I6yND?W
zSxf={Cq!xxA?S$0?R*jnKF77-iHvCzg^j!y)Zu~*8Rc*zH01%K5{^T=a;lt8GZ2%L
zh5Ut()?ApzF$5x+OE!))5I%yK1(Yjv%tIk3L^Ht;Ac-l#wJD=Bt9R8s_j|X#F=eCF
z5z#Os3Pwz6$%d(>BbYHA;SQcaiBtv@9gS?ntxAQH2~~KA<%u57#Uv4&a*c0XiI_fI
ziSd}qqe>-3*EdR<g@>~tIv|10HuHO3J|!_5oyl=JK|}ucfF>sXbt(M2qEi~X)y?j&
zQ=O#CpYB(eYbrww`+q9G(!%`O1l-*A8;1zUB#9Z}8sDrQ#P(QOT2D!;BTUtw|Nb*&
z96qId93#lbBlmJTo)8x2^LnZ%g-Gi}wOg&(Y}Q0hH9|IS3OQ~iN}9jMVaw(qKnn^M
z0XsN>en;|*6s)6Md9DCHNjgMw*ibcedl%QxftsO7?dbKs-|t`djR2KWNR)6Ql1+)G
zP!$%KqqRjMC7DBYO65=}rsp<GpGksN?yaDCvh20n{%5~`>G#gRLFWVtK)2gp{Qk%5
z+wR@B$KG}S^V!uwiG{N(zkl~;?el*3u6urV^=1PLh~B9E^{n6P_AcM7-@C@>{T=G=
z%`ek;1lXm$)x;<N<6pZDU}c>0pp-7IOZ^O26ph0L`deACLoT2H9iq!j?~u#o)JYnU
zw<mAAT$ZHmQp-FP#R`ZIg@~bQ3mV&d2SO4nnpL(d{xIc%X}R$DX#0Rn1ML;kn^ph8
z)`}k-Y|ikYZhby4&r&tlOyk7aMTxckk`pNNRO0^qM)_A3Uj<hT_kFpfGxXxXvzLN-
z-of)J;}Mlik3{gYSZtLdj8}zMjg7ejsN!v^a2{A<hTv;#<_@ejOa&ViAY&nTzc8h!
z_BI{%-kBfN>p4C1=tznga2y6UUAdk@(r_JmwY$jPYG6&l-oDy{k)R5=(0JY8xX`R&
z{C2lqU%|UT#v;8+Yd+0KD~VPMz9M8ehX^~KSc<|z4G+p`VDOQ1JK>Ni-kM|>(={w|
zr3sx*r#x#*L<)cy1M3`QNPfZtigR1}1W`0mIH`MUoQ$dV&1syrmqW;*w5IMNSQRLi
zA1#Fx0W&yZ*hrKSvwR978a&~=$!j_XSfc?<*OV1kIJ5!IId0s`f}Js(Ax8pFj3?tH
zjt$E58JRcN@?$h{%Lr;fRDp&e!#R})b3nplKX*<ROa=$MW_)aBU`b;fMG^Wrk|x0c
z72lg{`O72rC1bKzhm+36V&0U^rKy=ARh%R9@&1RZI=SEfwW<cNe^^z=ExTeUyp1mz
z!<S+ftVH0UsJANKtZeJ`gWW;r6PrtKu9x(wP9;~C1~7~8;{X$r0jwY*Q|#%KayNBi
zVdzEWSP!bXwf#gy`HpBFHW+g?6dH`Q-V3DM)b_e7JQQTj3tLNyKM^ajMvWxK`iVq5
zqH-BzW+)q(Z~nM}3yFlC3HjvAi-b!2B8m}AxRfGI*3Y-N<dz4_r^tNNAQ3mUSp>jI
zl=WELF?XRR*b;KNu07XY_0<frg;04nl+>Qzv|DBS`$`PSM@bN2F=P;8QB|Ml++6Ne
zgtM$~aq|smJ01$ak00>B)T0VWOr+;@aLw-JdfLOSJ+JAarHw2f<o(|BvkBtmWp4n^
zO`(ecvW?mzF1q=I=-;sk-QG5Lc+0BNTbgUP`xobjhljrv`{^<g1A-X-O>um&ApES~
z+P%|;TJr%r(xd&_a;BQKL9NW~PkV5t^*o^)4VN)!!7}8fmigwB_f^jd^`-J3ZBjvQ
z+b|Hk>lJ%25Zg%Pd*ir90~>7-GzMIt7Xt-NEiJavQXp4xjll2eL;A5UDOGXW?nTmS
zW_M=D`P-&!vTQcZU<#j08^G8KL7t8B49)<T2-{O_9G#@6zpDf00*?5xp1@k|EfQ=T
zBWa5s<|cKPq2uJ*)r%g#c0P?WZB>DG&B@zC$)Ko!%4(z_i^(`&E4GfVp{Y<w@5$mZ
z@g6?huRd*8aa2;trD8a$0EG?g?Y?C!;Apv&KjI*`)@zhSMN&M=GEy}LF)=vW-MhMR
zgv9bj!Bx0>Y`JOqHfEAUFICH>2>*zRZq{DWub)naZ*A=e=GqY}&C72l#71uXBCXPu
z3IX1=#-PWdn+f<sLMj4upV@N;QjNDyiV>m%I>2b3IB*A7S0W-Jl8{(aSk(<%4A6sO
zavr($6u@$Ts7AcxJ$%+JX!nw?gibof3I<u1<H?(TW5RS&VvYJ4B489#yjgU+ZeI|W
z?Mt1pIyJ+Tj&=UW$Me!siQaPI^!c?~FE>fYgB%1G?u#IC{3jtf!yvct8urdrFd{rw
zmT>a7kykSFyMcG1)*2WO{0r`X`Mb^g&DYiA!%Gt9-rYI-4YgQZZxcBbeb28jQp8M9
zXn5GCltO6;+DJgErm#X=RGf*Y@iMVzZBNsP<-hN-J(GBbOsGT|A)0uu@4e^T4`1i`
z%Y2!4I)f)2@`PM2xh5&k7{TA1Dnn#S%#xAWW|c~@!CLZ_-moJGTlqNYkvDYCnIPxV
zFp+Sk$n(^#oNB-4D3PldrTiPIoVv8gGLp!Aqxj9z5GocV;|UWQhD9pXiW)9OpX3>%
zSi9wH?e@K$jK=S0W2?$}X_nNGHPvLnwNZRt7`7m5ZkBih1X>m<VKB6C9uGPlL03!z
z#1_%jNUm}zm@xPxw9MGmv@m&Ljys(~9};`x+%!y;8@Ask0{^A3acpUIxXV3W&~j_R
zELcj5%#b9b8mxmF3RXsMCqz2ABQh}rK4>z#d_Dbe>1e{o@x?{Ozl)dOj}H_`#Vr#c
zAFL>v=ZFSXvcSGCGou(?c@MrgYjX*nT2<Sp>m4B{L?8e)5OMD~^a20azXiXgnYC@?
zuvJUwN1V!>i8w+A4hI8m7LbhkBw9y3r`~VJ`dF#^Y-dV^+pUIET9_rk-Zx7J9ZzRH
zV(bpv7P@Ag@D<W?1-uREZTvgmIu<~#z>8rH2s}KlEmEcEhIA9JV8#-g_+F0&<i9^7
ziLAU!B>Mmo3X`r-D2B8@-CL&SQggFGfKWl(ZyCE~8Hth0Rc(J9Uz|;6lgm#weYBw#
z5ErBYrq?h(moocL*gD>8e!&u{s4d68mJC)<_mWhL1VyOPMl^|?2ABJVkxy?5yx`)d
zX{@cnyaU~|dQl3J-2!)rQ19LnoUm10m0m+{Wp?00RLs$o(5r+C3c0>^{HP)^u_ZsC
z_=ISdrNiNt%Io*ji+8Wy_8m<j8^~h#(Qic*g7LE6DW6KtEvk@n!(r%7*S5Q-FKjt@
z#XeEvUO(`%ANbJ^?DWbMvky;8qE1duLXp6}%f^9=+1ZG|jD{P1Qda2_&6wlZSPQZR
zN2JI$WW7ZFfqX?4QbZ^p@ei^cO-tu2;i+Z1+Hh1eR)X`@v#$*V=;4A?KLZ~EwvS?_
zP~v#I_I>xdOA}Mj>~#>o(i+#>Mb`^|m$Us!<qg}VOWbP@+74zTXq9Ws>^%Pg-{Z%1
z2o0dUkfngDpgoO%$1r;uS?p!+*S@hG9W1a?DDDlbhFa@~jXLmA3s0t+biAW2pxCeN
z?Y1G&AFD_Nn`%6?M`b@L-%hze6XZDJlJ7quAqY>Sd$hHJdPu`O-<y`r9B6L%MfZ1n
z+@r}IfV9(7>s9TL4s7^ENV|M+jo+Q22Rz@2m!gNfZV~<!kCBwFw^XCruz8s8FQuAq
z55imMMZ*QsW%gy0#b*EXQf<y$IL9$gtAg1!m=wwefiQ8)l@xY3Bf7|QsW8*5;WTCo
zQdWP}nvATp`B}KpqZB5_#CFClE*x<)H>%FOX3MWF)cvHUG{eB*I&;-WE(#&w$aMC{
zvuAN@xE~ywAMWpi4V?d8Y@;PhzUmsPJC+m<LWmF7ipkkK!e>Z0J1si3Xuj(uPnMOk
zg=E?e6o7*Z4<-$F3&PzsSz>quKJ^qczg$4MCUa)i41>t4*=RDc<KXyg^m;OC661&S
zEiFx4dr9dg9u=nc+PQmGskvr%xTb1%VYx2sRW$06mt^}bjx-jAB#Qbq1t@2b5=Yb7
z<)`y;)T_U}I{)+hdOF)Jehx;1TA&^wQ1+UfOC8(G3$Dd+bc`EQ={bmv9KfhGaHpk0
z#r)m+Fl|51qYcXJ<npM@ogd4pIlxq4!dstD^zzoXcZ9>N`oUi0{YBSJp&&r>x&8e>
z!f7;Jq*|)v$~kOv&`3#ERBZgO3=5_cux6yvO=7Qbli&h}Xyo;~fL@ihh9o|1zu}UX
z!vjzrFaotP^QQp_YyY7GfDZIq0|5Qo09af50<imy;GO~a-uWMOQOi!lFc7@^EB3&F
zR;ay01(l#6Bm_w1$YtYf8Y{6K*&9khd=;O-kFj=I9u@dvYrL~NGdnx$>Q1TYSiu+`
zY7?O{ErHw}1_oaN*96Ort-RX^rW;(*M2b`Wp&r2{7KR+$dnTt11(;PCna6=M(cYeJ
z>o0xC?W(?QLHlkK%&KNUS3+wvxhR8O<%2~w-W@^L5(@TYXq|aC*XN7d<s!ApD!E36
zHAW~+<Y0=Psf4xRT7JYq^nK7IgUYOUs+2=ZQA~U}dOY{G^Nt+L%SGSP<6X~P&nGF9
zEP9I%@U>$KRcavplO*#ESdnX`lV~V5ziFUbjB)anF_vZgX%(>WQWd$R5ON-obpG%I
zU+fXuUG8)2xt1(1Fql5Rz}3flAl(?4l^Cd*G@+TVESh!~{#1SI{KpSH%K}B!9<E*$
z$jMoxGlnbT!TNp&aRVaXhh#L@PV?RMg=|-r?gmRM;zcSO_=lt8{Z5koU%dF6w?F<M
z&mR3t&Uc!&4PZGSyLG>*PmNbwQ`<Nce$THs%Vdkw4N2Qa0+bFd+wQQ18M@Pl(qR-^
zjy2elN0Lc1z)#z!{bPG{b8N>6_yJ<&Tt9v1lB4%!Rt^T!*8_MB-!i5kWjO`>UlOT7
zq@Xhj*Q+8Ge1&K69a+!`3LE(-9>F=8Gs@vgXv$+oB^;&p<WxDGNi2#JFMlqiHJ4U-
z4zVa#k}Wa~geQ=*m~w@Vc`9T<G!uLbWljm6-7~thdKX{LK7GCZWK7v8bw)HSiGqYF
zE!n)%G=U}48GeHqC{f9nqNBt{JRJ-;DX79E>WpsAL{SP(xyDaiiJabCR=TY8Y%r+Q
zF0pePrl!&>)bC$7{z=it>=_H6X<nkb`}dsiH!2IpNj@`oWx+fpmCg{*D+FCqNGiC>
zsZyBtQJEle>U2>MmIwT6`9H~AGMd9BLMHMmzWeWAI9j;Fi3o?Qw)S)o=R_&+;at<$
z+>py0=r6qcM8UO|loal8@Gt;;O3Chtra+`5D;UNC!QmQ?;m6NeOMv0&FlU@9{PNAL
zPgyyqs{Q3quaPn579I0o#z<jOfTW%X?PsWLxE<lX1b_ToJNM#K7eh5i-Xfj3{St0(
zF+nt2#X9ol$3FU3wS}?E^`6SPP)x7JFc%_+VM1deF{5M*+ZYAIG@OlW01jju3Xurx
z;bCtGO=nF%4Rf>Fl8yJa;wodQu~COTG)2`AwC@KeK>+XVRp*WxQsI_RieohgI!E5#
z)5hhUVeL!oLXzGyQ7I6PYpHD^rnsG_iI?wOV}nj#t749A2|Jm4*8*Z=djell;Mj@A
zrnhk0U=Tuvwd8%-=C^ibnxfUD$xaqnnW#l*<EDFKEQN>`rCvoIB3~RMczlH4{25ap
z!*xZYQA682lIlwGHPjx&VBC4{D!J=brD?bw&to|7N(kh;(P#$KDg0gKnw9y=qc>l{
zI}0I(B<*cb5@+^KjR24&!5%!PdPxyeZ+IOc&>Y)bJE9sTAB}yTwMANSHrhug?WP4d
zIQFJzgN-st#COSb4L~VM*SyZ0hkuX<`B^26ux|wc&M~9}bJ)t;ORTk}v8^nly8N}%
ziCDaF6e%}McaTX0bCH>FeDR1MC7I*!8+!dNuL4$<g`4GSjpdk5P;VvDb-$q6LlTV+
z!G+NA=U51=D03XN(f<Cpb6s1ZI%TG@VHenm05U3s;QYgoafGs)H*(QZF`~a*BsW)|
zuWmnGUW|hR;HF@2@hnu@Lm$f=d;U0vn6f-D1cCU-uxiNag7SsVqPC%Fx6fIP?<_${
ztlRg8@OBrYal#z8LVH#?B-bp1ev}^&=8WR4CnA1oBQ0@hi_OkdgB|K3Ani#KW)#xa
z1liZhUevKR%CELxn{E{AnqB?Hj)kCTAji6Yyrh_$ZoFE9XN}s}-Z|>faoEyEooxuV
z!hEiMe9$<%m}WRBmA2;NN-Au#IDBx~bwesKqsa|--&ZDXcP}WecnK8b4jJqfV@Z}d
zROOOL+|eon1~3g7(_xu0k|ySQrlK)y-Y8^4SD}rY6Kf3_qcbV0MK*!U(x{L;$K7JB
z5q>;$EaT)5oqp%nxSD}4xjj2uxt;5m>4hoRZ^G^i=Ta1HS+h-U>s-Ai43A!BdbXX3
zW;|^+rtZRI+L3?h7K)wU0kq>|&+V?1dFE*RuH7!4+9lMVCib`Bpnv4Ha&ir-mT!)Q
z?fXZs-xIu#P8zsn6gcMsVXG3j+ctLg4u#a=I*s;je!ZRl_&xcsH||fhGqM|AZHi`_
z2_+Rv+*)>eb>80mwYO=sk$%ribbA+W15~PRQy6uIaJMElhEHhE8h?5ryP03HHiokM
zZFzXOw1X(TNowHsZQ8Cj^^B{3b3}+5dclCvZEW(^nDTzGZ-=~bz7G9q@ISp(-A~&v
z5P#2KaSwfH5u@)d12!m9B}Rc3q)AA~NiK~w$ByhXRmb|j@9gwTY*a{m_@PZMcm93c
zB|bc^%Q{KAdkO5pq?8T{sSx<T7M8#iKqbO>UKK{qIhOqrQ#|10kl)Taa4u4b8m<hX
z&LmnmEMnxuH8lsBsg9QU=f=kE3a=Dork-0lEeV9qLCFlYV_;nvTM3dz??bInaO_dy
zEY@8NPY0LdLD(v?q*4&fgo9i<vNH9AIm{%L{Dc)a<86ivlt;$hB+;Tm$0F8>?oUls
z8;zRyN;{+Qe&nh4)K3!ccBP$1nuPZLlGQXt>sbHQ#m@?dntuu=*bhC4rfs$d=j+;{
zbLc>@gC<5-%?PX2gy1V^wro?`?(~;gC&E+7ZFp_l)&&!jN_Kjjm0r<rgu{}k?sdDw
zaib4%Jc<@)N;tR8SytS|ip4u<B5R4sQxZ7WRz3<sXcZgx;)AF^tUY)-k-9`HDL2_-
z8SFOIKIPHjiPBk^8F08Uv;C5}TUedAOT#3Bb|E*Q4G)l>#^~Y=Y^K|6Iz4!a(7z<e
z@Z7R>^VK|uS7SwghERD&V3EAlAa?H?)-tmd-it3sYxQt^{Crfl`1aqdpSy8}nX%m8
zyqy}Opp~!gKh}BaHo$Crz<!3ew4@Nq;kzikLz@~WY2M~eK}+Eyst+Hp4JfN*-2aPo
zsES_iZgBH`G#*ZVK3v}p2a~spmhRe1q}>LS_3z-Xbd6H{lx{|}`R5{@Vd|%!f;HnL
zRJt9`Og;U>H&&#4oVNIIbbP$KeTWlm>X7dEG->8%bUV4aojhEQZhm~b_}Iyg6n7D9
zJ|_I>Qc@!`jMlst??v(#wO4IV<2Vrho?kI1q1$v-;CoAXTgnNE0~X4n)9$Kr6Q{8@
zwX?BPwp#e_H@2I^Nt^Pr5JB76<C$lkd9l5BkjAO!?SAy&BaC7uAz}#y{7y-xKt!No
z3O9>cB=`cyf*)i`cTiZ%`#}dz$%Ii3S3*%9Fq*+$WJV69U9%I2+5S@gRAfe7lqU%U
zB3)!`8Y>_?goFi@OEk<Qk<Ex=f_EWJD8aEgqxWXr`Prx8#m!KwGALC{6x<UDA(JX&
zlU&gd?wN{l20f4>&jN~uLW6kM^EjDNiB6OrefuP4so<0={Kch6=(o#UrMc>RUM@F@
zof?>mX3GWTd;hfy&p3WW2(GW=VF)|c?gt5x7#8GCm<4u#$|4G*m}V3R{zq(1A)#}c
zNFBL3%_c%JwdgG+@sDe3Ne{n4q?%=nDJl!Ww=+u{ou#-{L3^-02Y)8e#>)J{6+)>P
zW11|0{=$R^QE`1iNGJK!NTMjgG%y1Vp`SUU3Wa`ZRL-29J|ww{k&EZ%-L6L_m>eWn
z@&=Z5U^C3F83v{pDe3oqdw@@xu{lvXBNc3wRQ79gTTvBtGhyPU9|Vd8L}q&V1K0V!
z_Nf%>Fjf(>Q3M}Tr>Ma%!|UVAo3qh>n9y7*qLDM+1m9_xp9s-n+L#Y%ATpxM<}Rja
z1?y8lF$h>J63bmSbhhQK^|Runpt>4h1~`_VZ$#0Su9c8RBu`XRZ{f<Wr97WtkHFT!
z1CzGnv7sT$1LYsoV*~?`G>Lk>lCtr|<@LWu=Uq#O<MjX{l1SQZ^~rT-02;N0Wpl)E
zsC&)!zH8lqa&XXsrQcNG+Hs7c0*>vkfzR)>uixI6RGkzq`jxlKHIFN)`umV^j6GAK
z2p%`Gj+!eB&)}?uto6SBIlQS0uhVOdY6De9Ri5z`aBo6a6^KUeJw?rXhLOoiG18=w
zJ&%&@{o2wuVdzUyEWRmY)A^oLWJd5!a;8FnWFUx*Tr{?VKMTWWz0++DL9=~)zC9a`
zU@#cG3m{7ceHkSCYY2PqhH3FyT<;F<M4w+?2J2*aeEZM);JHU3ns8qqhxzmYUotYm
zlk!%vm3QrV#-9CTxl>-=j;?M;%dM%U_>6Af(S(~X?wp0LH)sad!UpWNh2nmgFgzHQ
zoA=9IViEX%F*z=bRBm-Tj+pVjm_f~7%a`xf{=4+pGPOu)3j}zmk6s_$HHWUwkIpXo
zb#1!SS*?FpJ|6VeS?D`JikxB&oMsPsXgQj!nJ9{A?aZcWlk5FeT(x5oYw>RN%v1}Y
zqinxO(t0;<#?lt#+R)(^M@bMvl?i|s%i^V}Na8Ki2<y-^C-oEPn_J^--UwH3Ws#e1
zFj%ws+Mgvv=Md;V6ZGWA>eNO^n2qc4yhfSH<0swIb)JqDnM(g@PoM9q6H{Z*st(0n
zt$pcp^@k7LvYB+;q;S+YeatAptSGKU`ud_TX7+x%Q|oNyoiokwf*R<nM%m>GD7Md)
zj5N9%0($iR2h~>FPTN2befL+)0}lzJ1SmxnmzDqlMWO_90aZe(*7i7AVegvVb)u;B
z-#hDTfLwq+)enh1KC|b{*_llazsIB4aT@CmtV4gqH3U3FpzoL|12O<JLg-DSK#D2F
zyazVKO#)kd&8x#Xb2$pQmIj5#QNdx5Mvirsv+2p`TaG`MDqSu}!Vo+ePZb}I3^3tC
z$UPLAh(#b(#0-~W1L6=F#l{>bY2Ib~v~|^M*`-pIX2c9km<FF~qqv(G^kKryh~7{I
zS|-XvBJxwk4aX5ILQO@K72Ti8D3$_+p*x{vi1(eu#ECg@oJ22!ou@Jlsyv~5ZVUPd
zh~vQ8n%12m$`{sMTMn-R5tSOz@}%FL0wa5}9PmP>HR{6gW0sf^x%gJs8%{;?LWT3&
z0lMPECGW{3p$*)&x+k4pyZ`go&7j@t!x3!n9V~-gb-F*AmxTMgvlN%zwFtPky9zjq
z-ro7T6n@q^8C(!<=L_k44eSj1*Mokga(m8VIi}mZv+FDdTwgZZR|MJ3iPF8b*E-xO
zZcqaQ>Ml+50Y;`9EK|ofb69~srpaOvtO=ZiTp-+ykig0&G2f?E@)s}hGPYBpp$RTG
z5z`NLI*VY9y0e(pOfXQJltyKxFky6k1Ga1f+5q=aQODUFO_KpMNgBgofB(5}PkHp^
zw&wyHvz7&k@T?-3SWjwpEXDANZWVKBV%Ktq^ai+6hLs6N5U^0=h8>Ek)Farczt`^c
zI3Xi-<s{HCVF4)oMVs*-nj4B`_P)W#9-8bR8l!Th=4M(H`Mh!GYtU$Ji@aLO7UCGg
zIXo8ykC!M#hup{bhO>P2eOusbsxF#DQNfdZrYa`dmB)mmf!e3X`f?_&Z!FT1*d~1^
zOZI@oGhWG)6@(vWn$FU_iEsLEoIbkAFeO{fc4o1QdCK<l(UXeV-@YJZ!<AikR={i7
z5mKfvYrXeySmg!9bM<r7l)wA6MgId}Ehu7h6c%n5vymTSWeWAVJzG3nIUSV}6216O
z$sgx0l~!$U+cpsX?q6{Qf=VtNtJ_DX?&5iF8z6}TJ6l)GgGx)3L{ugPlCtBq`R_YY
zlwvE^+UbKW@#VR@=bk(A%`Zh(^m@Uo9=wA4j44Q1P67W5A~lEvbVgyh-z0+XaV+{m
zQaZ%NX1yQv;T>5s%Hd9E$|FW4yh-fHrK<J}Be8kw*1r?d!X;&%LnMm5WND^>@ECFy
zQLfN1PlVhM%>*AnkyC<WTSj+w-}TjWcDtMzDC?!ph=v_e5HqDETbG)~uwy#I8H_-Q
zQbrUF#n$7X*W+YE6$a5nw3>=dAvon4-?$PvUCm2fl=`CAE7gB3n>|FdFmA4{_?F}>
zp2)P^;EHDA;yVcMY@nJ-XR`Ue;`o!Gmlq~6mbs;tlx(VXu#-$vWf>9Gh!#K~Wm`;y
zvMcKh{jM-wBllsRGq+<597#Qd^%GH0?t7?*Q4lB{<4SJ;-p=dyFC4-|!RNz0pCKX~
zOqc}KQJEgVUX*s6<VsYNHeLVEji4Yp3$zHTmBU=5#v6h^2?En6r!GmUGgQ`(DlzCq
zIZ^7EQ~H3rVg=P_?`zL^SxB}en!;HX8K%RG+LV|FO=FRe4M^&wcJgt%&FjQ*)a+;h
zF|JQzR6tuQ*FrJ9$4bSrXufi~r8)R0uexCWm@R&tFR$)Dq58SfglmQ1F1kiv{g(N)
z5cxN5iu0uTm_|YpQ)3@9idLl2T|Ed`Sw?IMe2ai(444>ko|ZVlc-l7BCHl&Nv!tGI
z3*l*i*@%$t%95@`7Sn{3xo+duW*h4|lVYc!t7=Vb9Q7&{HYPV|+94PCjd>%v%b^1d
zDy5Wb>|of~cw|As(DE+JNc(4XU6|}1<Zuj%=E-Q(<SM+KFK#B+1Dl6Ky0J<y&_O3<
zhip}AtEej#n};RfzgRI9*21g3>ch8h;8pJ)ycmxmrMg)a>V5IFw0{6-9?PUH;4U(K
z&j|IX(5l+wlwz@wx*V{DGp$;z4?R=j?s@DruV<#YpTBim$F1tDqqWi)V?0khw*5b1
z*r8@bO+_x`vMdTAwSU?LR4_U?8Xcv%$?V_&d2o;$hxPcZjl8G2YUec_T9YV4w@}*l
zBs*fTmjAG=Y)N$~dAqlq7AR)90`=QcaVSSDcRBv`l5y+<3=fOw@z|ckHXIph8<Vm4
zXbvvl9MwF9GuJR`xucG9#_1{LHgoL+ItUn!VRiT6E}YG;Pv+|~v1g`#6x5*E-#^e!
zlH{ezj#qXjZeh8?+{uy}PY-gaDgh~Mz$hp7kG;~gQ#L)AGff8XF=U-1X^3SSjswAg
z_5J{S)Pk}1HfG#l(U(1#CdPP-T@JaW5i#9yx=(iuuT(c`uYLxqBcPiyH+{QMw2Va!
zg)-eRjt4B>x(Jy2QVazvC_>?3zN7YF7d+ns3N-p+ouYipq~Nw@Tb?awLa|gLIs$tE
zQh3|>Gp6e@{eZW=9KY_Qh%gJIQB9cTq~4!tT`0Vcq<E<-*X9HdB8L+^Se)~$0_rFR
ztF0eRkGoocFo)ZYDf&H0KkF7FYp^BZAi$e%o@1}9!{OrG+8qj+21in7N>S`3;c~XX
zbKx)Vb{<aW*Ykz<x9!xGf38g<@BY(*XYJWBV7HvC3S-avfE`|Xwo}%S_p`-Kc(<6p
zUrcT~VGXC9sH@+u7PIO7eDMhbxtlB|_-ajftCiOQ=&x#8L;8UCdF6YG6fE3TQVzHJ
zr`NATmp89}1Yw?+FX6I#L#v>lZ$C-y<aT*Ao!_3YW=>6<IN}X2_OnfC_H=A`FxB;(
z>yC5I@ltslVrS5L-_e&Id;bE3RNGGDFc5vuSBzFgO;BigZYh*YSy&Z{pxV_+NR{hM
z8ZU_**-oKCd=THkkL@^VLrY=T4{b6Y&zy7SI0r|0l6ziz*MnUcC&EB1QUv<XnYN%}
zunEH5B8!z=P>esY8MY|d<@-E<b2b$y;YL}MT%d-7xQz5ob*9BtcDT$xSGp`07ikJy
z<qIuli3KJjNCih}sIiQd&X^TShLESoC^i@PSe_eRo(`_>2Ch_z(k9HpBQp>QW3`wT
z79)5RHlZD2U{s+wQlqFu-1a=lGBiY@W^{k5vRp}&mY$?hDc+9?n-{k0d4>5`+Te*}
z?qJ?u$~j9#bgXAZMj7=+_dgZROQII_vSs~#Dd{IBlwCKNQn_O|DdHG4MpbS_{Q)sI
zpk%rz<w=>ba1A_R+N?&@XN65j_8)Jr`t3Daz!~bon73Cr_(SEgML#M7xSCVj<5b7M
zSc@#fsA{`xicd7;$Uyb#J$pba*J94Bo1BG4#-4^KXEy0>?78X488oJ4HRwUJN!-ee
zVoIYYM@a58gUN)GJXROn`kNI)I4T2k)Kg`IT~HZ=Y24}j9NeCa?k>l_C)cCftK(q^
zQ>9X9M97t9&J#U|S!ytZuat&Hyoyn>B!31ayo#b*A_o5*3>@@eKUmv#%O+Yqf+Vwk
zWeMMqBGSfw^V^Q`gKwm0j@%kxr9|A)By&ej%n|BlE%>f1>_n|*Ncvn2#uuZr$s}CU
zCJ4GUk{7Rjq$^C_JDqh=-}MXE6bjb_SgX}=_h|3%opx_)#LIT2Pu<#uK}KBBz;f8`
zc5AeSmIee-B`D+~+ghf#Kea)OmM4DDSvu##EE>xi4o-!z>a_)Y+iz}FXzD6o@p$eF
znV=RnQv78Tt){OXcgCs#N9q@4qQ7!FeP;}PDOXk`Q=~%TM^kOWZ1w7MYiLX3t<HaN
z+}8Q~n~R&tU^M*H4j)A^#gyRs8{rW4VQ*{h!AheS?=Q7jZExE)5dN-TaShyB&O96a
z>eP8bmJS8lp=*NfLy`uxOj|@GQ6nik#*qKM<BMeK#g4nK`VyDC<J~>?@b1`mXL+0l
z!T30UW4MW#gau0|;NP4G1$+T2rf|JU7d+eGTJ%VkbcDiMK8yzNp3E4{;4@b=ix?H~
zZedo=rPUclJUw;t@3}C?Es7+8i02!@mazho%^_hC%_JJm7F?u6F`f+}Pbk5)6{BmT
z_wmE!)gRYa`Y7Y2iiv_XkuYac2{tPfox_@`7<VuN$qNxtG&DCJkAom1DU}#R717-#
zPjjBpOyRFg@`T>~Sx~9Xp9Dc6_X%D-MKsrvcOSA9N!a{CEQ=H+s*Mv3tcm;!%>|XX
zCxJi|bBq@Lc7{qc&q<+TMCedN$3c`3DdEx_SGo=K3H9a@%7x&c0PxENTM<Qp2thW`
zvp&d^+TM)w1bS(aC?;t_BL!1fkVMkDn8rF=LN6DHiI(ZZDfGK#s1RIyqEaGlwB%Qk
z6cmnL%OlM(W`RRpqin#^AA*7OBWZO^i4{_G3mhm8L_X?2njM%e(NMR+R?&h{PmnB{
z*knamLT1P#x7|=q*%Q(UdULuU2#HlL|3Naj#?+u`K~*6#r#rSF6f@*A(macdpAQca
zaz=?FQeiWqVIw0$XSXstg$%FDz#ME-sXw-W@KvcZ@HX_PV!_vt;jOv*$d@dt2pRS-
z>)eC1KrmvmLSiV;*G<9OlAskpqyFHeGVmN!KM^OS^km}4=LJ@VFgV$&^z_aA^|VaL
zw82DAL{jxtlY=NOLbtZ0>Nk7lc55)`QoSe?$9sYmL{VW#C&LOZtMJ?+-4~Ne*=ELQ
zZ+g)y3#$wV6PwOPwk$^)!SC|onqrmkFCouenK1jM*k3WtYGS(LQDts}DCp4c<=Y@2
zA{or6qb{8{4?Oq1+#4{O`Ls10w#o*gAQjf|r~!kEzg}Q`#UCO;C)zKidL2`&9kwl%
zI3cTjVD~4VNgoP~T%)l!{jGT0-u<pApj~n$7JK5sRQzmILX!hsYWDhK&)>_${cijx
z@;DdkedGnwRL!PW`utt_u0k;l2~yXQbVRNR!OB#LW?(lhotWq*?wrpPoF-zP%#lOk
zYplczH{;Y!{UNljycQaE_0<=UYqa2+>QBCK<uu^)vwhSAD^p_XZ8HF`O>~q_Bhrkn
z9kVCgs60FFqY-8DLP{QO#oU75MVbIqVTL_>9-R;LSOVd;yVo2Z)?6A^R+|l7cl%m_
zZR{Jek8u*D(W7A?@{{T*Mi0c;22<kL-O@611kR?*2OPSiIP8zV-F_S1{}P@}hUUlM
zxHs+(!4Yo&Rb<+Ct%68&xud`B9I|Ud4kc0~Q;V<(ONF1;-OJCLK&o_=@|P83=u@8H
z<RA8jo$fczeFlniZbuv)C*M|U_l-k>cGgPr+z5tgK#qr<aADFYiDHjAr9G@Ry+@dy
zLT|MT=cdkW@9`e}#E{c)8~Lge%02%3jPs&z1ijyLL%S}&d-xv0<GW6*pBni%(2YUD
zuI+-u;O=JF>2$isiKa8R8a8dE?NA%74#Z09cM&f#oQ2)71AHI7{U0t#|Hk&>6`SL|
zc25u-`$#%t%Yqkj1onL;V_qb4J?!C=RljxggKLEMfTiwI9068|BV4I`JoKhndBn*K
zx(|{Pfpx=TJcO?5=p*xLSBdk5%$pNl>C{<k2jtFsO5D1o4qBO@%vINRn8bD$Zq-Z-
z_dCnkE^AipV9HeHZJ5(-nDFKee5X&IKSuJP9CjN22}RuAyTf>e?Mwgn5YgOVILxf7
zd3*@^b%~F5w3%$mUaMy;T@J7;*a|mkQ?*^c>;*4-`<d4l9FCLn*UOdtg??NPMQtbc
z9_`ekLg=@3*rD#f#mi~yIrtZiQ&CUbFc5yvuQ;KKCa7!P3uPb%64Hb==p$O?rkBRT
zwKLnHbff=$XU7R?3fugW_;PpOci(+E`&<@f6s0E-oWQK$268SC=vgvtLFHfzgoo`q
zS8_|S?1`;#Ovx@k&Jws`3yu=LDT^}WsNpR4kqcATj5D=95BWDr`*wLH1Z1k*YQ8Eg
zFu4T5Gn9saWv=v^S+3*=N`Z`G&m1?t?(6N<_1(j@Yvozmf?3!w150kK=8MYW5;oix
z^o1rcs?r$}(9$zbqe!wf8XBUV=<!OeOC?cSdXq*8eEeRaaqy>36;JyfOO1wd3^3TD
zNu`3HA*+$%f>pMl@%~qiG|B`s1_(9hVc-TC@P(?E2AV+hI|4eT=FiL`xLM^223A*i
zDa{7;J+APD2)is#+8rWAJ7nuNzu^qw%t+EUW)(2=<Q`7x%AoFbStupwK3HPTDq*49
zrHL`m#x>DsD@`kO9D#JnnK1YPuihMRN!9L2ZAh4`@QjW~_@e+2`lPig)q>1Jo|2g#
zWIoSmlhiY_aewkrJw-di)bksC$Yct`^v5>k!^A_?Yw(~<lOHCNE?5Vp0Z775+!;7e
zemXydINW2e#Gt)%KZW4GP{$#-Li?o#>3mC)x_EbBg?qmb<E89vOSbjnePM&$T4mpd
zoIu8eU<-jgjXEkHaE_DCl)4q-J%u_F)~0$R6c6eV66aUC1;9~gnRLjw!*hrqxtTi;
zw59!|4o*lp-TS_a_O2o4*36vIrx3g532BF`xi@cIa~U<6$>{+n|8Kx_I(_raKS{yy
z@jmunS%%u-uto_jUSB_Iv1@F!i~az`S>JElHV}UIU%>%JZ5M8Xy{1jwz-zYxZLqaL
zp9~l@O<6=F(iN$=*^>W#M^YjwS-<Rdm|qgf$K!Y39X}rF*Nc6;AB`@akI-{;8#9R_
zmQVzL_c&8XL`cOHeR)VD!5`oqxx+j95{$L|l+4h3ykV51KZT;4Fq)y)k$Ll0+A%MQ
zNZ%Cp??q<ZMR}4SBK8j%+r<iDzC{TmluMYHM<PqHVuH`nKA{-i-7|VH<34^^zPtJI
zPP;NFRg4unV2QR&s*G)NMYrg{R1Duh1XAP~p)k?bAifxlI8LdAAY4SNrAYUJQ?B4Y
zE=59Df8|u_>0gaTx$H80_npwawp@MS_c&qO>ui^&VBx-aHQ2*Pv123{2MIBZeWv@2
zN*E&%MkTV6{<k<+F;F@*1s5ZdU@4uS(LW;upMA#ev7$&*$aiS`%@GiOyI@?QF;<GE
zdq8uAI3%%ZvJoOd<Ctx?faVHCIFYp7;yq514b&4@sw}S=E>_D#$ULJkWv&DS0JWfK
zw)BIJ=MM&%d|(CSG#T1RA0eVgjp$KZJVuFtY8r28g!4qTdgi)36ZSW4c5NdB|7nUh
zP@+x2S(_AQVF}~ZQ)R47=Jf{>3~LalWn!8>E?Ka4DRK`=AT00nAH8g#2(w0)HhN8i
z3EuGF7(m8l`GC1RK*-=RqbkohVv+NWpgw6P5f`xR_^z1h!p59$U}?jO=fogeuL%@C
za6;6yUU2hfSRRojd}bWm+BF>L#s1=r3;wEJ!hw<ZR892L5%-@>n9>CK%`d!;&~{Xn
zD{DHtEMlo)Ey$}u9)h8oh+ZVWS#uAhDc7Cg2J&-=DZtBoF@Roy%z^G<qU8+Af*wqn
zlNd^m=t}8E&*Z0aX=wNwcPCJ{klLVrp{fg~j76So3%DI<-4Y6??~FuJ<wL2hdXpH~
z=SXukhw3m6B5dT~{2ZmZRA@tymE^v>{9&vHCB-^CGb2@02vi)TWk?#_cPh@rL89um
ziau~ebVH$MtZXZ~-vJ308ppOTr3DM&Ue=aO5XoslNaHp(3vBhrz}6*LLq45cmt;7Z
zBbWm#8u4*FFDElEeNUr$ak(veT&C%yvI=Q*IV<3}tj&FXh2G!nwhg$s;4kX2R5RRN
zer4ZqLK&7rhLvMK++y!*js1rdqZXwtvl3B{Y8-V|Zs3V2{#`QyO%z0oqM~cBR#@K#
zbRAlMHJ)_F77QMBXH*Y>1fXp&btg-g_=aHI@P+?>I+@JSWzeLxWPV7T=c`U%zMF`0
zESXLg-gF7fipe$3GW;+tjq9>fy!X^Hc`c<NZUC@mJgifi?da70e@7prvzQkK_A!|0
zviXZ3MfLRBKs*Q2nGrD$rV2jHvbA_s`Ti+TIz*w5HlkZZ%%IoAoKQH&u5L4Y58Jt>
zwV9wLCNZsa^=H7Jqi2D)-eByUi$x8B$v+%l)=E@!JGW<rSq}&G_(;>a$(T3m!izWc
z%5<yG`I>c#hh9l;R!5fJUw?+6EQ3v8p{Hq(lxjSU`){W#oEt&u<Te~{E>xr*>)IX0
z_c`?Q(0LU12IeB9=tc|hm?I|zP{TxIcGKDFgOkj6JG&$OSdZGwY{}|T@eF8oiVgGG
zGcy4Fa&_gs{7*ek*EIsV3IU?W$KWAUkn$2B*keHd%GZ~dQ6|!5L0e^=oV53v;={;a
zVU*QYKZc%_?60NUAi?$9lAbQ3Zf@!GZ#94Zsf9pq(9WQ<Ih8`EK>Z}P>WwFAu*SIA
zdUYkm-&vZcKwr86DFANDo3(m!Z#2Ovg=4=KgPbQUW%`=4f8>x>rS0YtvgUjI<EgZq
zF*~&P0F1w17o(=tJH##>@v`Bj1TpasuhFmVI?@)@bn>Z{c6a8)XfGsF?4H`buuoR}
zg{VV!Zn6HCMbTR3VSY@1&Q<q5>VoVjag2g%(sJdM$EBuyGB5{?w|Q{-G{waomhM6k
zDKrGU>IZ$H&9toRRO?-Fy@tvZcSqBlq>?udPau;XWRE~r?uf%1;}$IpEZW5|nEl)W
z`@y8(pO=)@atw$cEV~|Og@Ju06eW6D1a}Db++$j5Sg`s}{W`huZ4TZuv?3zssyGov
zEP>{say+sw=4b+kFw4heR&9)r?=f!6Uk3(VVYuHC+R}ScVf(pjzf|;;boh(LIDphy
zh)<(`0hLr;Z`v>veb2ABm5^`{E!yiSU8SnkCQa2e_68_2=7v}^c4RvgH1Xee<0LdG
z*{bFN68rd^d+vvCzvNjSMUznkBlwj`2dPvD^q+I<!KC0bg!yro8hxZS@tbe)hQKAB
zi5Q;vTB3#@#-kPzE!?JI<=$0iZiLz0)%Yi416^7u1;XS<E4P^kt~a2hK<!9ar^fEM
zmqw2vSIB8?FYzUu`~L0W@p=AOQiUje#yz}n2OH_UmFvRe241AkXonm)Q&@o{v<VSU
zqDb={Ix=x~w0tnT+-TIE-n26cmvgz*T>Zpt$$6YcQ7Y*hgyPOYcQg7E0X?~ud+rgq
zwfqPJ7cgJRl|t)a28$K31YofypJZQ)(jX*>AW?4%;aMCI6=C_v6xgysCU_u0$A-Dk
zUM1WewMZ%*H;m)fu^@8^VkCm`^b9*i)o*WDHrPYUr1p)SF$k^{UsKk*2IJ4LH*(Vx
z{greMJsXs@xW4OVWl@u?E`lHA7WdK=?t%2y)Nho)%20J8*`iOfiiXuJah=~z?xaha
zkl6+4g=~=iZ={PAMRGwj?Xa9$364HO+u3ZnX**}<QY-@H7=~3IhO4@=-FiAtW7I0E
zbn_z5jin)BRJFA+s;_GQYPw4NvfC{B!fHsV%W&G~zp92#!g#!48v`D4MFYx)WBMSN
zEDOwrG|^?{k|vn4%|9+(1Ip&_WN0!PRhSXnQ<I~mSn7pI??_aMZVyC%-w%W-2s49a
zczLh+Ta~7354p(Tog+ZE-9W<Z?(G=99ixo9XFQal5d3O3YeKt*Pu-sF^1L=#!_aeU
zoT9&-RNZdcFciMeQyf*1fC|cX3oW$j=u~Z@RoU8$u9{5Z5NpPc{6j%gA86097u&Iu
z6q9yknlCUpK0n`g{*K2*UPMv<FoHw)k~0k%;}q~Nh%z8EFgb<UW|>K`L0R&HEa(v`
zJN<UjfeSKcRKT?~R3wZlIL^G}RF^hKiCm5<{R^qQyUcP9i7YmXEph`yq`+B1g~q@l
zlWIu}lcEa+rvzmyMjyT1=gafSbT)CWJW7)j1CK;Q%Cu2zZVgT0k(nG{kb#y~B@_dt
z9&ta41X)szB%T?4JD1Bs3Mvf#6IyaQj3TSwcz2Q|BChY@9`#F6SX2I93PV+f(f8S0
zS>ue#E3m>c`8=KyYjVuxNA>&HLNZ0+nh8oQ9CJ+RdVN}6M=qHo&phEoYnU;y;IsmM
zRuq_YpJ||LtX`_2dWwEVfTvJwMGOU(Td{z6MU{5iC(!yj{WQJ0o3@5KigPJB#0XAK
z*36)uQI@`@qO1_k<q2ejYsbv#cy{g}Lq&~M0%BLlO4u(Q**U_-77~evuBo{#akU#b
zI|D?H{1R_hQgX-p?2Wc;YJ&=fJ7M^ez|%{N854w8U;hRCtjbh-H*tG_2l;(A`4{L-
z09b_fZeK#o+&4NFIH6r=G$6#%3#xa7$%JWOWEr$8oK=xK!E1mI*9*4%VBk=cVY{{e
z&hXjbY0InMhdT;xaNH_L%1#A0(SRGk$w<)APQFcC_=4bZodn%q<6TfQMXPoP#)EB#
zcN_f@fD7IBMqxc0l?rT-#RXe?xK`sTtv77V2RB*4$)?_82fbcSd2!I}0bOB@zt1K&
zx09Ru7Ey~;>*4<0!(RcCG%bO>Md1U@h~=hQ1TRw4^&{O0+HJSkJ2UT&QJY5nV{8E5
zx?$u!T>yU6_zPFf*wr?9rF-hBaKXo8cwbM(Q}hR|R!vjeFc7`_S8Qi;aF_t?6)2^A
z4NNIX3-pwkj4ZEX4YK5sWYP@fzjrOiiIYMC#Xcm~df)Eb-6vZIU-C2$g59kFh&*@0
z0Jh*Z6&4a95$Hc>#(_@2r3g3EEYWI8Hh#~>xI@mRf5^LV&LV*d2HK(G0u3A_-g0Cs
z%nsMt;mrSB8y_wyqy(<>sS)GU0aGzZ!BJUCtP*W9=7d%~$R#qeJqVn5+|}jD+4ap?
z8OpPCDRVGk7GhzY5mDhVhKX<~J)sJ$E(}LX6nn<IL7-TMmWr5HG(6E+t`#arcgkvs
z!y7l1xE}<CUFUV~SvoYse&O=M&DWQTeiBNtzahc}%ADW>qsIoVJ!WPTqRLb+tJSO1
z&A|VlX!L$Ir^vNo4lQW!0!{;qW9pvAgDu+v<3hv;si$sh862^~r8L@a_#hM<YZ~Xl
zeR&_z?a?@6Le?tS4Om2@V%!0j%vz}U_@0BvXy6%<uFZ3rJ@6j$b?_JfUAYktL>W32
zWh%y7i-^=jB2&DS5sXG<4bBwYg)4DuWY+_$pykym^|O6A>%`|pg7V>0mB#n2ytd%+
zNT?KzaIxl3Gvn^FTog{Ogu+lL2OX{pRYw1`HvRVDgd$@|6^sn#$XqxaTnt8M{j1(A
zMz_1fY&9u21j2^Us`MHAP02rY_n`4;g^58|7*D(D6fP0$`B2^WH)md_P~$&zYgk08
z=+Kt6^wP0Ch_sf_Au^JBNZb=9EosA7<ED9OvM7_iz5d<p;O=&G-T(Rh>(#5e+sINU
z=v6`6Dom<%rL|B4C1_UB5_gO47n(?0;ii>tBtD?rKxhdyL%g5MxEYmnOLU&s>k6A?
zTq`}PUzc%Mi88L&n;Wx$Hc;;;CF~+F^`@lts^%==TItRFTNu9dZG=uz+cx)W5w3x1
zMNEsx)UcPhzE)w4U~LTZM<LL?agZ}i8|kb4f^Q@+N3}#@`rkCBtx`F~s2IO_S9#3x
zm)X!UnU|;3rVP)F(Wa7LxVjxg0^x_{<A|Wc3{xEGZ2tUFu-m}D#BhJ^F{8Ft+e-}V
zik^bMomEYb(=ZUd=U2>O5ACYj!W9-+SZ&3M6(E%ZhrKxQq_OIZgY7h}fd9_eNmdog
zHreKq#D4SMe0hBRp(?5*Szab^2|o(uAXgfJ-<7Z)Ob)(4SRcyV(1F*ot=Qldg9Cn+
z&0!@{g#_P?N6HjhxX$CsjcaYLGE=_q@GD~@U0!PqnW+v|Z3+*9Bxsc(ITohe*iv|9
zXaSW*!D~B(O|*NszrFjqz6(^*OJ4{Njc_29^H!y`M+uGc1@CYK&eS$T7Lw89Ws;C6
z(Qyz@5k20TvND9^`HP&<__+25jc-FrqR-!IU)3I5ScL+0h1T`)--y~59Mc!vDS}Ui
z<G9|2@034pHl<Ly4}X~`@@Vs@9k}lM-{f}!{6x9%#58dR90+#3EJJp@@;by2_m}Zq
z)hXwUQ%PA!RtuShG|&bvI84WdnsXe_k~=)IJWbv~Uqr9DCZ|~gg6U?$T5*62)L3#M
z+zHmB?hqP0?ne{?qI3FBr!pxsb(S#<EV^2INQE6qPm6!K5&>Gv4K!6KqR)|Ogr!iq
zsX`t8jNB0q0uZt^qyp1vnE*aRBja-y%%{q9_%oEeNJkG|fb>0FppZNu7SR1$(+u_V
zN4E{^ziM>j-V3*VI(WUs0{Rt+xd<hF2gFl#!Le!`Jc5gz&`Ju=?bYth-$1GMC`aAt
zM<_z=c%Ul^1F%q1;<%@uBW%Fmv;E=|&vTG+)gAniQn$zf2U277ak{*%k)^}(vl+<>
z!}rp}I<?>d<*paneeR7I?f;cKkp(G%u+fT`d_HoZuz3hLzHC^~)D-An4|L$#^Y!jx
zkt=I9HjFzHue#F$JviF8GNstF$g80?mpefm@{kPt<QB%tO_S@GTESrVOjs*L$`!+k
z)0A3<8FT+l{sG+^Yf~G^@jJg_e1&gU7Xh}De25I#n3HYlWFWHaOA1lcYIhb*v6|KG
zi~!}#k4U8|KQO-}Jv}qKvkyHmICU4Q?j+5#-`&&Q-hDM4Pd7Gpe%K&CkinP<60?L7
z_?!lrBxy|Kn39k4Nu2UIjD=UhCEbR_YP}z}$lGAVC?}_>q&#FaBfBw<ycT-Tc9>4~
z&HA@#hR4OTBq3osooDQFEJ?s4lCY3+0T=T)%_f0lDQ}Z$LIW7PX7mR4^^Oj^#~-`u
zD1=gu14(WIK_Vt(#zr$qBXYy!7-j$ik<PM^!bK56ytA>vg9#OYM2^w$Fr7?OPPv3{
zT%-vdew6cszTDWDiDj$0w;`P>D2GS<I!IV_kX_Cuup*y$x%LVD8JBEA*WURSDI{q&
zJekSqOy<8=ZG2CYDeTf8Yc4*`(#wnr@g`VzhgtB~85Ihfd)+n&MvD0BuRWwma-a1d
zDadso)0F@naiFaJ{}Bh;#vnDT_Got4pZeE*H-Fu(LB=K%8oimtG0pVYs-2cU!^3e3
z%4dJBzb)l4Gpc&;&FgL$&}_nZ04xR*g*HSZM<N=g$VW0p?t<Mi#>Lty)MN5)#-iL_
zy$)t_49k9^*Nl@lDcGIeEA@Q@UteEN0+v{FwX+c>fe`jIeHgt3BNqt+1CDL{x<TM?
zIvarn15?9=Bp(j`cF{XJ?q2k|$L|L3$sT$B;u&Co3o~{dNJ=&tM;?{NQp32?;4c+D
zDosvZ?Q~}tmt-?xoc1Wcl;g^_5y}aTtfaU&#4{eM`^d!wqLa-+>6i7uK;I@6VYL{v
z@H|Z!^|z_a@zy?W0&2LpJJV&LU>ygu-yqoj@W-Qm_i%91|NF(q?&(4Q0KSsFy*=U$
zhaP!F{zN+DMcV?iwSP(FXPS*t!Q|X;wMiT#g0@MRfUK2P<%ZO6wF>ZdcF50+N9m0q
z;RO6k7EA?Eq!lDkP6kK?pGx$kkyh|Q5jY`mK^YCgF^$^fW=vrPN@zw&0RP2llB73`
zUy^Vffc%17@>FgYRMCg*5g+Mbjt0mO)SuO)-y*L%M9?JebSgquqi!J!a3mb%oAbAb
z53<rC%c%-fYrLjqWC!I3u;Q}QaplHbo?4b#0ny;y>CLFw>JK9X-~bSofTI==YADhM
zWR#@g6$T@qf`&w(qD@kZOMMj%@XIejmIZUNY0eUW1danu=2NO93<8m2P@s}mN2eK$
z*)0rv#A}mLnkFz7M3I`@v$CXzsR#o+7m%klC9qJy{E&$Ygw4-Kft3V@E+Cu$m3L=4
z<ShSn?oixN7pz)(n$aoPrZ<RvtH%ACj7ges%a0J`Qc}Ixp$?LzZ3xk}sJC-`+ZM%E
z{RR-y9*CH~khQ<QW*mf{$tVr)ma<SXnNZ)--+;HkrrZPfvwTAR2{49S#=f@;7GDK!
z`%lI0&c0`jT5bzE9gXuK1NQ(By@425fNvP*lxwxxYaR_aT_|7!>3e(dTif(b2UXFx
zzcM;Wuj!B4!vR4o*UA>EU67{bLU8^~c_S!({@-(F>vzeW1l~bF1mD;_noxzHSk0XQ
z*wqqq>{c*V+A2+gsh{8D+xeDrs`|^QoMpVAF+l%Rc<uZ==Zd?w17O{#<rd3X^X&+y
z{7SRaSf6%lTKa{CzGUam3v3~<RZ#>fEVXiq#jY|3D&#9Tq4|&trNfAozE~-WdZZhL
zS?++%qI*$uRPsb^<AL@6z1{e7FQRcUOXSN@{&io)Wm<2I55|wjFmbam1VA2yfOql}
z0OkSYqXaCHf*ay=%GIC>BQQXCIH)ws((GY?cKiL4zJc{-3__z|g(&=yA-xGQt}N4o
zVEy@^e|&WOu1eWCRgv@~0}Qb^eHgUICxfm5)q(H{@m5E_9P?l{241djYURTKJvx4S
zVgUUXLK=dtEJB8_gz@m;)8Odjc#)t!c|>@n$`e@^I;KHHGl-4N?+l)S3t-kkHD;Oo
zR>>xB?F%a3>yvzYWW$m^9PT?;6qE3>id0yU57!;$N^e-$^KqK7f23T(OBIn_E?~v#
z!8f8zet};+oPMjcQz4dmiC)q94mxm$KFQot((daj#|=P%62Q}x5|wdC<BpyFfp`b{
zx#JZ>XC9pGk-dH5;RW7#F^8#uQXbRdwSalxEg5I(YYzY~>EM_0L1cS-dsAUoW1=BC
zL^EejSfXfM87d+bq>_qK5QA!r!eUsWiO0B*0S_rqv<yylj|<7!xk@GA0Wa%|0IsDA
zLf{qS)tS2*ger8?^fJJ<R>G9CN2R6Bt~M|<OcOB;I5PEx`vj-~tzw?92l<H;ZY~B{
zjuq<^tcz+FzV{iqBgW}0iIm`i_~N-XFVa@|D)dvDf2791ZLhTq+!EbD;4Q%AJvm*%
zS*Ef}^;LH@Wv<$*!cv{7<IW$!MFiq1e*xS4Y>_cC5o(@E3c)fcNKhhKgvzGpS{*WB
zw=}A1oITTsl+Bj=&Smx%_gQ3T(I9@dclpJ&?kmMS)$DslT-9%R97?@sQABwIy}kim
zO3$zoISdp|jPP3}S*Qyu4FuC!#zMRhnGOzDD76?;MYpEXO`~i*1~yn-YCy(>4SF7w
z6B%Aro&|!SY@M1WPxkf-Xsa(_{l3mK7;(a;zP+z%XNqghwlh0)PF}sr=Ns+L3SyVa
zYb7%0xIZSrZAs{(3^M6s9cU7${PnX1(V0_2Qs}!On^XMt)hYEHjI$Y32(NrZ91fyu
z<y<rtLei<Kr7b|?l1dlc7I4Ds#+{D{)mw<D#MoaOj@YbUn814BOwBkLBEL@E$56!@
zPfOC#A<k44x3ZAfQqMvuDQPN}<&>s2mYBYLA>RA>lx7}Qn}B?jU;Eym+y8KJ+CO>M
zKltF)!kEpn+)>$`OywMY9F8IS2vrK!`_I4s2_c9|6D8PYBE}E~V6hDskm2mbpa1fF
z`LPx?=h$jkQ`=L8;$H@eD9Emwf%xMxt5PfR)<xj8pwwkvrvuMp2*T)!$ALZi$gIX)
z=#cHVHgQD67-TzF5s^8g5Gux5I$3N(Kp8A#&J|UeS)d(v&1GuW-r6sPpIPES+^RHu
z2rOd*SJ*YsZ9!UfSwW*7iIz+E;74@W(%2wV&L9U|+)&3Hmrp_`Q-Z&(7q&@bB=oh|
zR-VO`*>b(!q@4ZlhWxu`qF8~}xIIEj(Wbcdo3;?%qM(VwYihl^etq(3aQbO*aeUJM
zaL}t-aC}0+3(6kl)L?5Aa&r8o;%o!r_e<bg+nN_Z@+25y(##87teYg94JtmYZ(Ee_
zzbECF(On0sAU>+=ps14n?%Clo!(jInY+1bZ;jFPLi=+<I8JA5VlSRs|)+_4)O0$YP
zbyB76ZFAA$;I)sMud-*#{N*Wwn=u16OoA)mfNBFvV|YTtOFdJZ53U22tWHisxX@Ka
z5NyWsTe=&j`7xyKR<lip6T>z<$n+SsmOGtNMzf<cAJvelXnH9%!8jSO=0-vCs=Px5
z6}srIDuksehhesPMRzqJK%EXCg@pMr&jR|M>C4^14O^G0Kh6zl^g$TNs3exoyz2C)
z@9nB$1J=v&i`Vct_VXN=Z<~Euc$(&rKE6U+)0XBkwG=fhi%iRpuW4nS{evf5k@c$f
z+d{B8F2zr(bBm`CF{<|rjkdiN@YbV(4!KTQEq$RIy}<U(MxaAhj}qXyKRkVZdeJ@U
zwTV%wW(AC?4B;iwYLl%ORSyrQ5}yuu%h|K@)m~jirBnsZ1SVvfsq9`#Zt}bz;;$R3
zwdyLXwY^a~RMWp|!q5Qh5JQxFFE(kS@#R3a-dof9=40deghFHh6J(SG{7SD^&D}<C
zMpPN@R@Fr1Q6kwgbiF`pWayyjS=Htx4Aj;9X8s}dX;i560`|OIN(10k5(tU7gQRg!
z5@39%%u9ub>NUMk)c5Vp7Mr!hwY#NgyY8vd(Bt^<9=fXBcQ?~UHAzyy5vU_ma>YT_
znEtl|Ij#cR9*vx@=V{75vsd$(ix6}B+nVB&|4|#D?nvn9{8Lq!7>~dQ=PjAf922bX
z%BLRKhony{we0EcRb9L($z73DLn_zg%*1ZCspRabI9KFo41p>L4uO&hRbV!(RRA5~
z`oQFO-DWJj!ac6}fdMk8nsf2rlK^Lk3A03DbxbeOs!;HX&Q+ymQAmi-DbonqR1vbR
zt9y%@)ryv%YK5dsl_+QK0$C^^+<LTbwF+m<c(2wzTx%=dstE2@MFjp(M=1Am#W73n
zR}xEar%4*Q{_-ZxBE@#sSk!=SlVSsA%`4Z`1fgg9yWN3CZlj3lf}^u^DPys^XuMR>
z<-1RwlkdOR(zi?M^IH(dF9*Q$7FFEb+(gVWA$vyQZp)?zMcbM+1&j%mg^?f{H6#ma
z2R<)@q0{d(F2*dDzJ|9=>WQ>wL>gaidHek)Q=0lc4m9cMa)Xv%tGHK1Lv3OhjKj`t
zy{uC+ReEB%9@`tVdNl3OOSbD~ZxY-#s@em!9mxe>p0(U4GM4}yq%R>>(M0=H<o&aG
z-#DJWhA7(D9l2>e`rXEV0mWEtZ`w!@{?4zMRH(KS0!h@<ouHIPX?l&6CQ(SQIsu1_
zz2H^twY9qr$zAf_Z+5*l#^97zCmkP%@y^c6Gc(WZ=ItN}l18Jm-++C%3#foO4GG}i
z#N`s=Imm#(@G+Xl>=EC2-`oXhqp*^<JqJFzGfEiT#F8+N5)N<Y`ptWh?P+^)^v=kC
zjJZ}fPs0$rIC<oB5lC>E4<Ypk6KI&tV;;GZ#;gTNNL+k(Psvj6ySz9%zZ#w^RoY7#
zxDuAG0G|rU=`5ARhb5H(u3!WrPPs?Wkgq-NG#bo}h`=C<h{k7el*EiMiBC+#A?Y<5
zUg!z|cZ5fjxnbj<2H+>*^xl;Oghb~&7*HmmxuiZC>jT4pdi7!f(Q&>cH;dyCnnKFQ
zLQKnb_V@K)4Ec8=g@!>I&p?}RoApknH=QArh%oaMhOi*=tCF&vE@CUSOcs#(6ak<Z
zVfVImc76Hf^VQIDdW8&~gFSac%)?&4Z+18(9qPl0OgRG^EjWOgh-@RbQuEwc)2Kp(
zJ}ML>oOiq1)n;pyQTc&JSRNRVu(#_p9+b7gpbNhpWzx?(pqXXqyKsKeVl{Xcna%;d
zytq1l3C?W84tN^DodMmh_@@yyfgz;7)I$0m-6dSL%oYeup%+L7t{7sqpWeGPbY~$^
zfT|{_AX<dBw+c;lNeyBpiLF6(Iv~E$1iXNF-;{FlKuS(gO(n`5f6arvaV|0?56Csb
zw$w(;sc}Omc&h_yn{DYnKY921*lIyDPGyoxd_dJwk(JY{%YxyDBc13%ek~srVp)Y&
z$@vzXt?}5>n#Uh5ZqLu|u5bUG4$p5+Z%^^D8mZclaI%;pS$lzPb^fx){(<wLziq6O
zv0ZvGcAP=8gVE|@&YR=(YIt#WeT6V$^jZ%Q8<3i`kq60LPr_)~f=?5e^EiT6%ZC8$
zuMeM`SKGGWv{BMQNqSRmjWPPB<#K06$CF;&j-u765JcL=mNydz230+8CeW?EJE`b?
z27*<i%Plj3E%JvvJ~|qvNfL9U9C-a2ils{T)W8<A@DWm>>H$j!>)<P8e!LVae{1aL
z$3y^&C5X%#+$+;yllG!rZ2A=rU_s^K%oTyN&734cQnmmb;+aLtz%8~PA7xq(3DZ4>
zqgl^f9AwzxG)j;ts6>ZN6B-|KkI?(!-G}QhcQq+lFYzw|9Z?{a`E4ENf>@e<u?=#X
z!6G$Bg3s7vwE&mv@@Fb-WqEY8L$Ph{s+Q>Uigt9MJ4}GBP(9bM{H<mr0n3130dbQO
z#pjiD*&>ceDfb5|-E+D~xjx<rr!s15h-;$@w$2H|lbbv(+=Nb-nG;j(;M6#1W&KpU
zZqMU{Fx$cda<|hF(nq332D6sPS9K%s0&%5oNdG2kk`y(SDu8vrWn{0;)h^3A#EZi;
zLYa^<vKu0`$=kx|dSncdb<uvQvX%T<W_Yu*H>jN>Hf_!0y|!`J{OnLQ!B#eYjK_<9
zQ3fFB6<92LKT6b9GJT<U>bQNy3v0pmvQXQ~$Nbs&`5#5!g8;O4Smp@)AK`z$^HWTX
zx~$>VP+);a$cupUTNMnI7Ov&vsHI7O6QS$g#hWAH97jS{{dtua=SI`K=-+7aq)GV{
z#|G!F>JGf02^<yXCYr^soKU|^Y^Yi9(thBUH1zc-n~}^_f2X#p5`Gs3+K1{HUtLj)
zUgE^{KVlYdc<f=gwv~fol}~YN2lPzA(-Z8i)!Cu>9E|y3%-RQo?BKNVL!F|uiWjQQ
z0J^$vmJ(W8A8k}oYqLrwbzE012hC=O?$1`kcayWmS(qH5dv5z2s7X%l;u9=5N%Cg1
zoSjb4Rc)DlXkv**2t%z)H5Z5k)lAidsl7$irmyJ};c=SCn2QAOFMSxT?LUV8I~Z9B
zO-MGdCatyglNZ(}rLt`%S*U2B@Yc@bZB^aC7fPdOX~*;Lk(DQZs<SREWnA)<Oe(kH
zy)hM26x9E<v2)u$4o=>m5)&3pv2dn%?!XHNf}S~uMO`vI_d+C?9hOeYOB#=S*?78n
zZPUKw#r53y7qwMUZ`(Kwe)q57LjgNO+q@@B*Iwb_0(9%J6dexj5GXbs3sWRRlAQ&I
z{P&||CsmxR?aK)Ts>mNdk{?Ow<EN^uqG<Rbf)DUeasvey2=u>V+JY*;mI$-Ws!(!6
zXW1{d#7hD@e3A{|Gh1+!@J(5i8AlBt3x9HLTARyEt*$!!XQe$|Q40Z?sy3Q0OAAcq
zAb5t-kYiaWy<(Otc@C98MrRGjwYR&Q-lkt?siX2y+LBpVGXps{R`W$|F^4s`C4Hd`
zjH-2p<S6$M52Hx36&gxnpV9NJT2)G-w6v2(34DG)V^NQzs5Y;`ZmNo6_JNMyfKFvq
z+vgjt*~V|jPH!(rO6eJ&nkBDXE}h_6YX<DagV`zmqa>|&SSCZvIpj*l7D&G(TCmEg
z!WLd8BCF{De{=dS*mBg-xpfwBzyu^|9psh_#;1T6R|f43ai&C>6igWOK!?31UnN!g
zy`3?PGQo@qy|y)o{*9bpCvJQ2pc!}SxzkGXhFLs_YWJyL&<S;!%zRSwxs%lDI<raO
z<iK>`En9~^S=T`qSBKgh`f{*s>(Q6fEh_16%%~6Bss{MW4zR=BG>i*h9##1gk9q+5
z<C2nQlthCgI9xNdtqbltDn$AM2P8RWN|RD~pCTYpwRJ3eXrH4&y-<eR&D$J%XrCiv
zm8~_-jm=T(xk0*M$d@3_FYMReo(6yr_jP+M&^FZ?UckV1y7lC`)=2cyDM9y`oBGwt
zG5DT$S3n0Go@^0a%Y?ZBg)=YcIds3e;!yFQehx;Cz27L6#%5Nc5Rd!JCqNU3vPt6E
z-|5}m{4xFh*Zpkz@J~GGTGTD8Hvv!3bZtqyQQY4eNgLT<d|<*0NVuV4Om?9@#X&Q~
zKL>-JlfENA%F`E<KN1}}-bP1pgskRWZf8~_TO|fXF&bsGx7ZyWa=q?*kLC8>H_<+Y
zP;R%n9_b8>WwtiA)EjQLj|TqY%5_B;$oUS{_G%E-mL4R@gy>gvID}pcxTlpehs7qm
z@F;sF3%;ZQncmaG1#6`8(;(8VUDLa0hZ>y~w|#m7aGF5Zg<RDJ8YXIVr>s#t2YQM8
zdl8#pGU=-!1Lo=dgRF#5Yxkx&tU0Qzzu;jqnVf3(Q<Zi`&%5cG(+m=85|d^$74gZI
zbnChWoE)1zc6)T<bxO|W>DR}nBZhwah6c0rI|1Le*#bHl{_kuj@#QI%-y^}Fl82Lp
zJ7#=Ei}z5x1hnm5$8Gc<om9(i+b|Hk>nrvUz;a+a_c(R~qzRCsNDIX1B?$tWUP){u
zlHen$QTT&;?;qsHx}+pqQi2vJFQS&avokxC&OYcuC&|fi0>`i_goR9$2=vs<I8Yh5
z0^xRBWlC--#-CV@GfEEmDIdcXTMLx%RXLPgpn<b2M$T<rGvlgSHu+b|M7YeCC2*y;
zM&yM9CO1$Dj?z+NnJH5-CzPCkE|F2}S>Q{o`+R+Id2@Ripdw3GFb6Np!bVtU#M(RD
zz>9DNosa^nyx~ZVHj(j3l1NseB@uf?_ZO<tN}_bMlU9{@ze4NK%#+01zok*6BI50H
z{_k{B6J&L^*HU};UzN8$&xt4P>^!&^$9qY`vT;x@oXI@c$7_D!+0?e~oipzWa^%zN
zFZ24lLRhhi87yhAXW!AN3eQ~|nMriZI741CYoSqnAXHB+`I!JMZNxKk2uHjfP964Z
zvYFhMJe0uWBPagOc<#~$a9=Wx6*XK~N5RqQvQ@L_V29&f-60MltYf$^7$_WMgFVa)
zGLlDkjm8g7J<-jZHFYQNGHp;WWyY{A9L37<Da6+yQ|^r+1Fz)<e-P1ouDo<<Q#0S^
zi44-w2o{S4pxm_Q;|@|-vBRTQ`YpgN=_h$<3z4;*CWDbpmpQr{y8r2T-1t$m?cYWs
zJh-2yr(syDIHd!2S7e9N5N^6$iy-bTm5-PSDMDf-v<K+Av;aw8{=2t6?THw`@9i4W
zne^~`5K6Z_?;Z|x=x2nC7m#-ABL6S?4I`jGQG+wIv4y{Tpa!GqbTn%s9b3B2?zaY=
zH?ncKVmcks2lLFz(WH%`$w_E~-xnCczp>I|k7qmYU9wC50F6~`Z{s!${_bDF1B$DC
zXp-+qlQrn|umW3eTe?qe5hya92(=|olG6pl{r6EXb{sdmn-Rbc{qQ0AkfN`Ds&{pg
zOg<&>2_ARCKp{#5y4OrwPzBf>!s<{JN*>6@U)dJN1a|n8XYhq>1WNc#S(IF$hU>yx
zZcOkQb5$)O{)^I{u4u{<xT+6YY<Cuz%%Kz<rJ=yGP`YAPD0u~SiHvM}fp6aLm;2kh
zht-{<@>$v)v+%|Y<ic1jHjTv`-h|!J8>+ylMsuV<xzBi#B$8EVsEDqj=UY|PN}{y%
zB#kQZ`4NppJxh|td=EyJiV|<{vme0kW!>24rPl1=A7@T;FUlR2Xnc8=A`7{7qVwQJ
zch7EG#cx<+cckL~RlRfgLv4hF+Z`)Ou50c7jk*7Kv#ppYTZc))$z~vy6~svXNq{a_
zVK6*uCR_>5T5GXq7U6=oN(6JWp`KE!C3nq)_1e{Bb;E5M$vc<KdxRkFx^V3qE#h04
z_qg5bZy|!$&t0V9-^i)?LB@z3$CoW;xu-JOhD1e=c1fw)-OO|VrJs;gCZp8%IEB+|
zg*F5du91Bt6eZjCNOI&#lQ#K~qDP_{>sUJIkYkT}ql~bJA9HljAqQu*Z8WZp%~9*M
zK|0$Mt0c}}*=y%db4Q4;O*oPCc&9ZS!N6Jt2XfswL<P(ZH(Uf&0G2XZ{5XeBGQDjo
zIu^!9i0YrGi7!uR-ZgHRh(@YYx|Yx`>n4Hxg!OA60w-rDG_YgZuj6W%&K#azvZ;$O
znAypMq_X`11h;K~&YyDojI)v?6k(sTx~9;6%Ynwf8llnjnf&@{#qwH7bxP~DUQGuT
z^UjaB(+`47HVw%?T}GG7m#jm%>*GgArQ5+D=5)6D$;=05Z?xE=T^<2x_KvCV@8O@Z
z5K;v6Xt85v84F3fe2yepPeOOa@tFtR*A?n5rpH2HzBrfR14)u*FIUk$n{}LVS9t2+
z*9MUEQ9178^qnWQ;ZIt4%#G8i!b<5wJn^)}kOmd^w1G)<YK^zMj-ej{qr#`@_r`5>
zC4a`UMm?P}^O|OmD_T@iS?WAZ1c~k@VpA&q>X!fN@$>z|_-xXn1(C0O@YG;gOsAZl
zEk;uxYO-vWoJ>X>j5x<nm%X(`<MFNy!?5>9_<xd|RlPrzonN=@&V@dQqJ9;uH2D3-
z3j5V>vMy3zgt!|b*jQ#8b4xqn%*^XXo~U`%BEq7~+RxCp<X^2*!EWL(5WV{==D-Sy
zTDU`jRuohuRH04TOX<Nl6Jj;7BikuO75~0tC#1`&yHch4GS2hNn>WwS^`uA(#`;|b
zU3g5Tg+yiu6bo(~=mcDf5FPSFs{>);h3~LO$v(d$E?~~L5*4hpLnR~{xK09cW2>5;
z(D}H|pKBB7k}}Ic=;C1HE_J|F44D+DEHze%HaT}vt4k;{<b=IS+=sg5Vmf<>W}Ygj
zbSZbR=N4jVosrwpVGMieQaYgttS*f}Y7_^>eZ~~e(b5pjM4PG33$0K&+9|6u+&rRn
zXu_v6Tq-wYtRxky`_)=Wx0xFv*=zIiN6J~YPyRPOAvq0vibS4B#mSD0TMIS1uu&-l
zT1!p=zLB-DKRfkc?+j@5yWJ4Uj`tg>QZ&-VS{!SzA7W8%$y>5q32!Pm9g$UP*SQ#g
z4ZDz5G5TfDl}16^8`y|w55xJ9eW9_TCn5ZeG`;CwMT)l5(sY}K1Z=g=K5t(eF&ISa
z>2wxFFdB`Zs{0lx371)E@D8movhdJ{s{h*J-=V0)LA%%T5AACFVd}St<8dtghG+Ay
z%53GlC<ulTJT;(SjiK|~#d7^~2BR^wYcRNhaj$*(dCB78*X?p~cUIzmJE>lICeP}g
zhwN|5PLiG~<<BsgfGtS7OF9i*l}jezn{+f9ccq0Np1QvE#@QqL4b@m%Z`(E$e)q57
z0;85YH+gs3T$VbkfwT!?FT+q51}z=gTqIH@skrWt|Gq;~k|o))-L3;RBk)B$JeQB(
zxiGKKlSR^MoxE(3mt?$Pii9izf}aVMnuw6-1(4Ay4h3J~Gyjp!;TVODyythxHJvfw
z<W6YdJ_AW!hxW;Za(j+_5uau9*Fsu#VH!om7s*Pp`9c%Q0}?SGxI)7`6f&lo3Em?~
z1Qee=F<9DtH^ZyJhta^OvR>*1)nrK(37FE7%~A~kSu(xA6^uZMRQiC10_*WftHo&y
z3WF#jnp}xE5gfS2Z(NB8CSy<<<Y}vwqUpPLcfWC_C)W~pE`@xYTq*@ppW4-CB}1O1
z+Px1ssteKPzCE|8Hk-1a?$?2P+{d?C8fghMKFp9q#s1WiGP@GTcydEEN_`)c!b3eZ
zM6xG+K~ufJ)4q(QNPRrIcQpP=$?JvrI94o9&{L)_<}qbaPLY$AQLTxyH8$T{f3*m{
z63L#Z2GSOpv*m|WO1dI#X24eD4f*(~x;_&kB5j{0I+fsJRzn^@0{F&tw8A|hjTBV3
zIfd0{7&mDvO?9fSkX0D3S+y~n*Guv%pbLho$jBr@w<Mrdj<lSu?DL2!P2daosiAnD
zU%tbVAYwF0Fc)kB9A{c{<rjJ(#Zr;Ueabb9VerL=#HtyFgz1hVK8+${3owbmYIdf8
z#DM1!WSUM~Q0WXUVKQ>xDw%_R>%8_HWZYz8#J)lfP`6J^p7FWe?~ca2SV+8|7$%1H
z+9vZ}ow;-Bc1uF$Wdk4_(|IEXuj7bFxX_3*)6AL<dI)7eRw6AzDFc>8D&cdAq(RTh
z;GcK8r-k|FR`FHBlJTJG>Z>yh-;u-Xc2C#B?ffL)nAmZ7ih@&LV6Jhk4pd?QTEkgK
zrD|d-0e|@5O|bY(2e&spax~#by+W)hC_}VD$jLl66V!Q3mXc|VglIuV<F|wR`<$q|
zc!;fm#-vV?-xtU+YyhZg{SXYRLoDwclv$Z@LvlRheN-GsDWs#schNCBm>p@qgPb>F
z&ioQJ$0n1ELpf~NT?|j@6P7PJ!&bCh7!XlR+u~&eWXf$b!Y$+|^JA)XfQqIH42Bw_
z)e#XchcSDOzm>3Mkh(vP!iTB-50cuJY<$NO&9TX2OZ!KKw~?H-v3tnBYKO1!F!$c!
zTWTl!)AHXBAwS+esSOW1gDCgk9Z|RzX(zA$SqB^y&D}tQ{eCAL>rsH5pYQH&qY@-P
zpv9FCF4|mnAoZxIomjVwYo4o~q>V$d!m%DxwbQ|<p9BkPVY{if-*>vkICpy+5cF*5
z+w63Eg^g|#cSbpPknz$bvTA5N)q(GlXAh7`E+8zukVsHi-As5u{e@GQ>)HBBOl*Pa
zQDyX9MR8@b?oF8sJ9(wDilMxU>$ZO(&;1(M<$_@b+D!a(vo0FJCP0S;!77y{kpgFL
zy{cn-S+p|Ok5s=VfPVq_!gQ^mzk%MUR=^5T5=L}h((wdxCKS`F{W=QKx{k(X+9&Vn
zW3k^7BEa%yZ<zQM`x;pbue*2k@UmIII6af8S+&fLFGHxi{oHonG$vNZ^buB5_=49~
z<#igv>GamN$cq=nkB>XHd|Efs@0^1wr5-&tSzW#=dLc3hD_XKh`X?tb#6lWRJ4<|X
zb6KgG=YC|jgCc-}ADvGdw}cHRu*%@wB;V1XrE2qeuLlLY4))+7-_f9@$%AJCh{^#d
zSFZlvrbpYXn#NPv*Y7_J?ti%*4aa{>KiuBGzr5+~&{RUuXyR!URiw)UpWO-T+3-hj
zqpZ(@d~N^zgR{t%xpcj@S54`xHq@-w_Npn7uBwKq^-^~OBne>zKCV@On%uj`i2UvB
zPyAB5E!TX(rh^6RF00q357gA!VDfdZ<7z=?w;CJOrR~fNE1#!j3J2_Xpiv4{cY77I
znjyHO63a}Z`*!sTheG9T@dJsq6#%zw0{|nx4S<rG0|BV-*b2b6ko~!#P3Kbt&MWrc
zm0Np}8xz(o$w&WmR?KTNMZG7vSj?4qyR-7=!rRgjnvv6tO<q1_QI%P!m&(xm2LX|B
zc6yoAaemL+eW7)mx?3h2x025`&#k`!rB_>X;x-h1=U1HFN!MnFO}1~D1iB<C*`>__
zL&zI59@&;{6<hL1awzTQzxPPSK(GmP)(=5GK9}#@mF|~3$y=?9k1hBJvxF&#SV{qZ
zb0Rf}2y{Z>ag{}auaFijNKDU>+3>qT8}5nED2IvAln0DT=th>(SEbB(AhO@q{P#jy
zby1O~5QuywS)6DfJcN`5lq)pMBOx=QncyABQ%aEb%;?g}Jq+&#qsM_!Wl`#cXjl>j
zAyZm1ztA*<CDRFhK@XHDWI)kSXc1quTAXB5p%WXA<`a>wP**yiB>Cm%YZD0zwNDD2
zAl#wga7+Fn9J&bU+&9O5oDr5*j%`>+ED$iJX>0=5<@lzS;Tyau0{<%M0)M)BUkAxj
z$i;5B`iyHTIY}+}h~WtWlu}^9w*GAaK6&9|@IYw{T7aSDfe9W&A$xYCRA7Y8@W?{S
z!w&2al#uPKl3?|e+RP)VE+mJ(yAgzot<1IMduhF8Jf_+Usb9pNUggw1dnRc?(VEE;
zkN3<e%vg|st0nU6(9IK={Bu(-y<QJWJy#V#$9!<E>jHD8JYR@(Yq*jy)I$;_xVlV9
zKO{w@B&)iRB_EQ(yw)X<c!=L7sV-s3hh&8R7Y%lVd`ZcofwyG9zQY{yfMUbXJ#X@D
z;te^LB6gsr-kmABt=;DDdq6@Oks{SsuZZSh5xCoon)-kq^i9P`T6XNKqS>#A>Z!mK
ze8I(%?^!p`x<vPFJ5OtgEr3HdDs)be3Pr=yY^;I3ue<@bwDEo`y(4v2Hgpf>CIa@Q
z^89+sWpGC%#dI0WSdh6uHp|@sr|;CFv<6YKG#XxWxW+7wddfG}?N1xNT)~2_T>IuR
zlj#hZHs39SW6w_e-02gJ<1`aRRR_lh#3tP=bkFbwixhicZ#Wpw-<f)@xJy>}@L@X^
znu^CT?FU6CQY?YvGMUeiX&|MLuFA2yb>uoXGA@jV@GGu4h3N(@YB<}F6-t9otIcRD
zq~hqnFA8GzOu5sk%|MH&{bnu@NE-~}DIv@yjXey%_NZ~h%T(+h8?k#bZY@OR_?S!w
zU%laIHkgiX9=ySHI-b`1xN5-RdP#v***K1@zT2DMy{Fmz<uQHVNouYD7=PscbO}L1
zBni+4mO7TbVt%^9LJ5SFIN<P%_YU0f``y`Od3=BWIG7y+FiT8!BSkgdD?;ExgEgjd
z!EI5Py!$j}oMWU-ArQchWgEbV29X|`=W9rJf6k`($9oulA0CBti}x;#QCQ$TDPtPw
z-wDAwe9P(S;O=SqI2?~ovoNJWA(g4ClP&y#S|4ZV!$}5^+m!JCabYw*rgS74tM1_L
zspQrxpeFosLf>J7d4b@X;L3E%ZiBOgtgLe#s3@G$Ftv*puN=)6EN8ufN>=#s1Iiiy
zZfC}C6;~QhnGFUb(xg_Nxeosv%+J-*;X#%+AnL#zKc<wsm9~>H;??q}5ZZlSi(+-O
z<VxXz4QVc&jWc;y^${I5Yt7reMDjp+jQ^DMYJs}0?SR)3-5rrF2;6<^oD_apjhWft
zjj8$cO5r9kFRlLol~vnr+CUI}=PTv`DRxS3?MoFP7p0_)+5i$%d4R}T>@{9x*+t%U
z5?b=_oxK1CoJjQx*`1j)=giJbT9@-|UaOrP*5D9^8B>rlP62=CB-bEQ&>4lnVwOs=
zz`OW~OzAN?8~-2<;g(Do70{QOikQ(HTB*IcQZD8=ma_}*e=Bnfmlm8uEa!`yO*0Kd
zB*0lrg~G%lmHCWlCPf40oD#fyX7t6z{kps9bO#*+Wm)QsXm}wC5~g&{CWWR6yfB@i
z1r;b+<T1rWiDi6Js|hlr3Pr3Hjr)=>5Q~rd+5GEi(^SGzy&{FqknSx_(5-laYoVop
zmf?4WOr_FA!sKyYti)Y0p=mA%x2a-IlmY}D$|o!jo1vB&6<Wb~fK<hlOgOFmtpR>E
zrTGx#ndDdl?awFncV0}eJWyu|@~a9^7O^r$(^vgY)O%?-6ZAhr=2H0xf0Gs>Hg5<~
z6ib2pidY92ZA3IYUq`M1_Sz(cHXNP#Ga@nzVD3T-?TTf-x_REC3zneOR%ORvaE-}{
z-!b}3UgnMw(;C|<yR*MlOPf+{AGeE56@=$-S$c*ISC&F>@Voo7+k5C9K)a3TrVBBP
zHo=iO1ZzQISPHegyz>~rITb-kVF(v+2FoRkWu9ysTJYsFT!Jujc3!T^Mz9xUzMSeJ
z7cSM7;_~z3Iv_LiHcKaSN%EX5p#H=}Qq>ddGBFicC#=v!O1@JboOVj$41&Pog$@vK
zrt8my7j(BCrkrCYBI_MEp9YN91#FbnJ~jY5kM0$<B-+@UTgJB!N|X|==!Z?g)ZJ9b
z+)Q^+t=L1AL~OW^#>430$K9|q=wIJ-8i2=}-u->2JG6g)>)mXfd;Lx~8eV^2>HLsc
z6lv*Jk0DmstDaimjNyLcRP=?9Q5tu4JbJ8Z1!vnZv5n9E&|tL(%!c-JpK>xaBY27&
zZFzP_-;eKEX>?1w;<P-`CXHGT8jfp3I1hX_mnm%Scj7A0^dR;keTDXgN2~5e6*(b3
zva;Rkc3JsJwO-AApY`4{4m({56kD$XcvN>yZ&#_U&f|L!+l$4i965<5M&N&0_f)|i
zW@A(39panne=2V&vxYugHZJ|Dt=?+?0DX~BYuhjsh2QlnF02np=o+?;GTN@ImMLq%
zbAqisj4_O&NU@kB8%b^mqyK$ZN*emGR4+DH-#Pb)bNjigJ3_`I0wdtH@t{qk0Kc7Z
z0a^{AR#5IXy0tr;$v<MPE)b6VKn`IlmPT1vv_V;El!IHHCii}?xsdJV?!Zr5m+W-k
zG$7k<=ghheAnXbnBbD{I*y`48L@=#AhptfqXOBj0lP;T0SYEPdl~RUU1lS4>E8~MR
z%RZ<TY)z=~24CRY-bsavRw?nAkT<_*IDmuW-}N=8#W%*QNk+?Z_?u{B1?Fpn_i&`h
zUjlf#eu+`h)A|4}b?^z^-JC?GKk^Bm&2yyQpQgSu{xJWF%!kv=qL?pO!G9w4@idhp
zRg-yMa+>p)?dlavT2Nfg3gj+diAS>xiL1;15VNu>*n&|`zho>z_<}@@M<cj@6b_3G
zv4R)MGu?=_KX8Yc?yZd7LscbX*UK=7(mjmMUN!pI7$zDf`M#WZ&SLd%@1F7JCGqNs
zJduAjP)ln9F%Z7zSIo&5MLl|uw$LhFD0ZpR(}KigVg|FxlEm6=@xOOmbuNK#zSm^_
z)YwLd$w<HmHkJ|?atQo3GG+({vPD?8wF$muOdaGN$4tKP2WkjQxg+#YhKybjMwpup
zc}`c&ScUrW#$Sfm*_oqrphD9|+S?4$YjC8{Cl2-|#9C$w{s9_?lCf{XQ>S|`UKXqM
z;$qdc%vNSN$po5Gj<h>w)NrC~dBYc^aEuB$NOz4VLXd$$Rlb$muf^xO_*iX=SD3?W
z$^*R~;13^>IC|@X)Tjsj91iH|7h``ogg*g1%E^?Vw9V$SyJ~d0e^FHi*K#>mF=IBZ
z?z~QVH8_j2_y<i-!D_=W488j+bZo+Cb{wp1g|20V(UoQFGzg9(Ct|4`Y-Od4{`(Yn
zl<6Yz-qVxb;&JE(rHWiZ4(}aBu+$?+A9P^w7PvzwPY3JWNig%JTbzq{($7o=8(kAR
z*n3822m>r^LYDEeGdKS5@TcGSknHT(_h9^R3e<KC+BMLVK^Nt)vpyU&lXo{T^r!{<
zCOoFSm+fl3E7y}%`jR`%aMTeRiX5mO85=kfcfv@5=*M7C4mIiHLMgH^``kb8tB>_t
zxqaPL+b3AS-K|sxKMJJCF$Sw;uM|ty>bl27T<EEaJipHJ$}%92!9h&=e@t<mhq0D`
zlG~Xn8B`Vfi~TISPpY#zt6wco!A`?4487+oeB36qapX_|66-`I7!?IhNK=+Li$$7L
zNk*yA{v9vF7t7D@JwI1>gB^reEd(s!%~AqG4uSh1V}@WLTZC@vP4E+A>PsGQ$>cMC
zrslAbdqNLw$mkVegvu1;K3z0R75dwM{wBm?XO7N+3d0oXU^7Us!I46r_^>x2_A*oO
zS1>q~jC~W1MfcP^)Z4B;Ta}dA$_%4Spef}@`(s88BW24Q{vd^8RLF;PNxTw*49q^;
z$9DHozjn>bcGs+-f}3luIs6LXQck7>@7{7Mhx%D&W$PF@IsWjAIzgEV_o6t7llTKI
zk3mnvFbsw7`4#WDO=#oDp#mi6L?tvTigrSpvea2E(xggKN`>~{$ufMg{QTK|E*^$%
z5Mr|uSmC4N0L_Mw@*sVL(}*3RnS1T*oHX?%Pqa?(g<q&8w(`hiQM*W1F?kd^E05ti
zvsSLZ|L3>P=XH8C2FeYy=TjFUZ41MSY)FT#cD|R9oxQ<eNG9!@Y07i2)l<1^%FC+k
zGIlazk^wD;==nHCYB6!_QYU>7+~^ghLv41v5rQ=qpY=<9*q853^|m`y&nR$rn_`Jy
zffUNf5U`hKq|*Cjn10e{Z9uLvas|)gEdBtclud8qFc60C`4zJgYLW`I-91&%ElamS
zi-Z6b)Dx0rl1XCK*pcnPMpgfNorJGSfgbQB^2|H$Jf1jt=w)f<IJeghT*EwN8e+x~
z>@%avfQ-SU2(w}pOHtTZ_(l`FvEowig+2`ElA(a9G$=xb3LfGr@<-P-H=$fTZuJAH
zD!Vx69735DiY2K5Dk9)4M4@eC5lgkAhDp(ej3c$NHN#C+HyZv8#<QTbswhoL4Q!}}
zh-stPGB+5(hMCl6><P5YRfx7xR1x1gPOkT7SxhA_tP5XE)9n5ZtV`B)92SGOnEsoR
z*WhI~oQ%ov86JPb{heJtygOi*LX#`ebv|nOj|gKXF!J2Na5N8I$ZLNzeD2Q!@-&%@
zTpzBk;H)I*k6nLfUMo*{wPA6>z(3%`xd_Yo5&Un*qCGc`*!s|5mxeOz#a!AMwnV=A
z*@naBm*3g$-nYkvtR7USQ`K!NYHb%jZ1?8onZkr{strM<q#`SwG_W+NJd04iRgp9>
zH0sY`SSJ!nVJH*2q5pB(>uuY%Qd($ZuY4Q!A%Pfiv}j8yc>~xNqrCz2df>Y4U3tCz
zme-alqe*$8Paq#DE~Y;Ax)2;ibQXJ`zZm-9bOCaLhD5l`6Jm-C8<@Weyw;lX9M4_P
z=7R4S6xM$%!lDxpM+&dC+gK1Lnm*Li6*b8xg;HUUnm`c!&aaqWnk*)YsL?x5O=~L2
zk(g@0_UmSa0XLz$+X3!kdiUSE;9<Q_oew0una8|&kL4G0GLADGf~YH9XpwprfUh|!
zBvD}s$1{A>zl<)C97ks0?w|JjXAs5V?mG`Ru!N~U^Zg$DallqH@#%yjMJjoTs&ac>
ztEo%JWlx90emL?*mh3~QDkLQeh>@O=ARyAjdW)9z);>QY5v+i9Qef;&JRefh##oVM
zZH%T0GELV*q{=}nuySEJ^=2Sc3TIt|AOxzFYWmE(xyECCFa?Sdp*A^Lp)J{dvbNC8
z<}qv!F+58FcS(nqSY(6Rq}DSS4D8IE2kWENWY>6?HNkGX_~(&SlIK{tES04x#F=Ar
zb;&;1)%hK-_aUrS)_|mt3|?R1BWg2Ck2$-gHkG}Qtk8`Qn;?q%t%>ihw$1_;CH^O{
zrZ73_mVCp#$)+Ni=SY_W-0Mg~=wIIg{v!?|ZguRU7PLa%9Eb3CEeW|+2?FPvFyb6M
zV8hPXVHYPS6h-rMvPDCyYEsus*6%Y&p^{bdFrH-d@noLO=EwUfKHLjG8zoarC(~>+
zn>;>R-?#0!YgPOOi;MtsiPc`y8R9!VXmz67M6Kn(MW;IpO0X=mpL6i&0{{R3M?y_P
D&!*GK


From 8120278b8ce22c8efa54146bcdb66861303a9c21 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Nov 2024 10:41:25 +0000
Subject: [PATCH 355/666] PHP Deps: Bumped up minor versions

---
 composer.lock | 494 +++++++++++++++++++++++++-------------------------
 1 file changed, 249 insertions(+), 245 deletions(-)

diff --git a/composer.lock b/composer.lock
index d86ec0b33d6..f2d585f8fb2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.6",
+            "version": "v1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "a63485b65b6b3367039306496d49737cf1995408"
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408",
-                "reference": "a63485b65b6b3367039306496d49737cf1995408",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e",
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e",
                 "shasum": ""
             },
             "require": {
@@ -56,22 +56,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.6"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7"
             },
-            "time": "2024-06-13T17:21:28+00:00"
+            "time": "2024-10-18T22:15:13+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.6",
+            "version": "3.325.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca"
+                "reference": "86372984539f25485718059f997a4ea12c05ba0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
-                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/86372984539f25485718059f997a4ea12c05ba0a",
+                "reference": "86372984539f25485718059f997a4ea12c05ba0a",
                 "shasum": ""
             },
             "require": {
@@ -154,22 +154,22 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.325.4"
             },
-            "time": "2024-09-26T18:12:45+00:00"
+            "time": "2024-11-07T19:25:01+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41"
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/510de6eca6248d77d31b339d62437cc995e2fb41",
-                "reference": "510de6eca6248d77d31b339d62437cc995e2fb41",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f",
                 "shasum": ""
             },
             "require": {
@@ -208,9 +208,9 @@
             "homepage": "https://github.com/Bacon/BaconQrCode",
             "support": {
                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.0"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1"
             },
-            "time": "2024-04-18T11:16:25+00:00"
+            "time": "2024-10-01T13:55:55+00:00"
         },
         {
             "name": "brick/math",
@@ -561,16 +561,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.9.1",
+            "version": "3.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7"
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
-                "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
                 "shasum": ""
             },
             "require": {
@@ -586,7 +586,7 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.12.0",
+                "phpstan/phpstan": "1.12.6",
                 "phpstan/phpstan-strict-rules": "^1.6",
                 "phpunit/phpunit": "9.6.20",
                 "psalm/plugin-phpunit": "0.18.4",
@@ -654,7 +654,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.9.1"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.3"
             },
             "funding": [
                 {
@@ -670,7 +670,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-01T13:49:23+00:00"
+            "time": "2024-10-10T17:56:43+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1135,16 +1135,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -1157,10 +1157,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -1184,7 +1188,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -1192,7 +1196,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -1585,16 +1589,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
             "require": {
@@ -1648,7 +1652,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.3"
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
             },
             "funding": [
                 {
@@ -1664,7 +1668,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T10:29:17+00:00"
+            "time": "2024-10-17T10:06:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -1938,21 +1942,21 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.8.0",
+            "version": "3.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "1786ad5e1789050939d73cd195de4b8eaeeb34ed"
+                "reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/1786ad5e1789050939d73cd195de4b8eaeeb34ed",
-                "reference": "1786ad5e1789050939d73cd195de4b8eaeeb34ed",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/b496d1f6b9f812f96166623358dfcafb8c3b1683",
+                "reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "intervention/gif": "^4.1",
+                "intervention/gif": "^4.2",
                 "php": "^8.1"
             },
             "require-dev": {
@@ -1994,7 +1998,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.8.0"
+                "source": "https://github.com/Intervention/image/tree/3.9.1"
             },
             "funding": [
                 {
@@ -2010,7 +2014,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2024-08-16T14:57:26+00:00"
+            "time": "2024-10-27T10:15:54+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -2733,16 +2737,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.28.0",
+            "version": "3.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                 "shasum": ""
             },
             "require": {
@@ -2810,22 +2814,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
             },
-            "time": "2024-05-22T10:09:12+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8"
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8",
-                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9",
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9",
                 "shasum": ""
             },
             "require": {
@@ -2865,22 +2869,22 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-17T13:10:48+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
                 "shasum": ""
             },
             "require": {
@@ -2914,9 +2918,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-09T21:24:39+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -3552,24 +3556,24 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
                 "tracy/tracy": "^2.8"
             },
@@ -3608,9 +3612,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
             },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
         },
         {
             "name": "nette/utils",
@@ -3700,16 +3704,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.2.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
-                "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
@@ -3752,39 +3756,38 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2024-09-15T16:40:33+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.15.1",
+            "version": "v1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+                "reference": "dcf1ec3dfa36137b7ce41d43866644a7ab8fc257"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/dcf1ec3dfa36137b7ce41d43866644a7ab8fc257",
+                "reference": "dcf1ec3dfa36137b7ce41d43866644a7ab8fc257",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/console": "^5.3.0|^6.0.0"
+                "php": "^8.1",
+                "symfony/console": "^6.4.12"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^1.0.",
-                "illuminate/console": "^8.0|^9.0",
-                "illuminate/support": "^8.0|^9.0",
-                "laravel/pint": "^1.0.0",
-                "pestphp/pest": "^1.21.0",
-                "pestphp/pest-plugin-mock": "^1.0",
-                "phpstan/phpstan": "^1.4.6",
-                "phpstan/phpstan-strict-rules": "^1.1.0",
-                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "illuminate/console": "^10.48.22",
+                "illuminate/support": "^10.48.22",
+                "laravel/pint": "^1.18.1",
+                "pestphp/pest": "^2",
+                "pestphp/pest-plugin-mock": "2.0.0",
+                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "symfony/var-dumper": "^6.4.11",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3824,7 +3827,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v1.16.0"
             },
             "funding": [
                 {
@@ -3840,7 +3843,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-08T01:06:31+00:00"
+            "time": "2024-10-15T15:27:12+00:00"
         },
         {
             "name": "onelogin/php-saml",
@@ -5130,24 +5133,24 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.6.0",
+            "version": "v8.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70"
+                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
-                "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/f414ff953002a9b18e3a116f5e462c56f21237cf",
+                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=5.6.20"
+                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.40"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -5189,9 +5192,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.6.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.7.0"
             },
-            "time": "2024-07-01T07:33:21+00:00"
+            "time": "2024-10-27T17:38:32+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5638,16 +5641,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.12",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765"
+                "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765",
-                "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765",
+                "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b",
+                "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b",
                 "shasum": ""
             },
             "require": {
@@ -5712,7 +5715,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.12"
+                "source": "https://github.com/symfony/console/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -5728,20 +5731,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:15:52+00:00"
+            "time": "2024-11-05T15:34:40+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.8",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08"
+                "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08",
-                "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e",
+                "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e",
                 "shasum": ""
             },
             "require": {
@@ -5777,7 +5780,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.8"
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -5793,7 +5796,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -5864,16 +5867,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.10",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0"
+                "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0",
-                "reference": "231f1b2ee80f72daa1972f7340297d67439224f0",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9",
+                "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9",
                 "shasum": ""
             },
             "require": {
@@ -5919,7 +5922,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.10"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -5935,20 +5938,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:30:32+00:00"
+            "time": "2024-11-05T15:34:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.8",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b"
+                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b",
-                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e",
+                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e",
                 "shasum": ""
             },
             "require": {
@@ -5999,7 +6002,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -6015,7 +6018,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -6095,16 +6098,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.11",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453"
+                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
-                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
+                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
                 "shasum": ""
             },
             "require": {
@@ -6139,7 +6142,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.11"
+                "source": "https://github.com/symfony/finder/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -6155,20 +6158,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:27:37+00:00"
+            "time": "2024-10-01T08:30:56+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.12",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "133ac043875f59c26c55e79cf074562127cce4d2"
+                "reference": "ba020a321a95519303a3f09ec2824d34d601c388"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2",
-                "reference": "133ac043875f59c26c55e79cf074562127cce4d2",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388",
+                "reference": "ba020a321a95519303a3f09ec2824d34d601c388",
                 "shasum": ""
             },
             "require": {
@@ -6216,7 +6219,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.12"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -6232,20 +6235,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:18:25+00:00"
+            "time": "2024-11-05T16:39:55+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.12",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "96df83d51b5f78804f70c093b97310794fd6257b"
+                "reference": "8278a947d0369754a47b758a9e17b72cab970951"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b",
-                "reference": "96df83d51b5f78804f70c093b97310794fd6257b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951",
+                "reference": "8278a947d0369754a47b758a9e17b72cab970951",
                 "shasum": ""
             },
             "require": {
@@ -6330,7 +6333,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.12"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -6346,20 +6349,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-21T06:02:57+00:00"
+            "time": "2024-11-06T09:45:21+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1"
+                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/abe16ee7790b16aa525877419deb0f113953f0e1",
-                "reference": "abe16ee7790b16aa525877419deb0f113953f0e1",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
+                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
                 "shasum": ""
             },
             "require": {
@@ -6415,7 +6418,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.12"
+                "source": "https://github.com/symfony/mime/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -6431,7 +6434,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:18:25+00:00"
+            "time": "2024-10-25T15:07:50+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7071,16 +7074,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.12",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3"
+                "reference": "25214adbb0996d18112548de20c281be9f27279f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3",
-                "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3",
+                "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f",
+                "reference": "25214adbb0996d18112548de20c281be9f27279f",
                 "shasum": ""
             },
             "require": {
@@ -7112,7 +7115,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.12"
+                "source": "https://github.com/symfony/process/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -7128,20 +7131,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T12:47:12+00:00"
+            "time": "2024-11-06T09:25:01+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f"
+                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f",
-                "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278",
+                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278",
                 "shasum": ""
             },
             "require": {
@@ -7195,7 +7198,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.12"
+                "source": "https://github.com/symfony/routing/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -7211,7 +7214,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:32:26+00:00"
+            "time": "2024-10-01T08:30:56+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7298,16 +7301,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b"
+                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b",
-                "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
+                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
                 "shasum": ""
             },
             "require": {
@@ -7364,7 +7367,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.12"
+                "source": "https://github.com/symfony/string/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -7380,20 +7383,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:15:52+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "cf8360b8352b086be620fae8342c4d96e391a489"
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/cf8360b8352b086be620fae8342c4d96e391a489",
-                "reference": "cf8360b8352b086be620fae8342c4d96e391a489",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66",
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66",
                 "shasum": ""
             },
             "require": {
@@ -7459,7 +7462,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.12"
+                "source": "https://github.com/symfony/translation/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -7475,7 +7478,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T06:02:54+00:00"
+            "time": "2024-09-27T18:14:25+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7557,16 +7560,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d"
+                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
-                "reference": "2f16054e0a9b194b8ca581d4a64eee3f7d4a9d4d",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/18eb207f0436a993fffbdd811b5b8fa35fa5e007",
+                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007",
                 "shasum": ""
             },
             "require": {
@@ -7611,7 +7614,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.12"
+                "source": "https://github.com/symfony/uid/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -7627,20 +7630,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:32:26+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.11",
+            "version": "v6.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694"
+                "reference": "93c09246038178717a9c14b809ea8151ffcf7091"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694",
-                "reference": "ee14c8254a480913268b1e3b1cba8045ed122694",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091",
+                "reference": "93c09246038178717a9c14b809ea8151ffcf7091",
                 "shasum": ""
             },
             "require": {
@@ -7696,7 +7699,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.11"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.14"
             },
             "funding": [
                 {
@@ -7712,7 +7715,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-30T16:03:21+00:00"
+            "time": "2024-11-05T15:34:40+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8247,36 +8250,37 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.8",
+            "version": "v2.9.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7"
+                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/340badd89b0eb5bddbc503a4829c08cf9a2819d7",
-                "reference": "340badd89b0eb5bddbc503a4829c08cf9a2819d7",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
+                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.11.2"
+                "phpstan/phpstan": "^1.12.5"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
                 "nikic/php-parser": "^4.19.1",
                 "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
                 "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpstan/phpstan-deprecation-rules": "^1.2",
                 "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
@@ -8325,7 +8329,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.8"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.10"
             },
             "funding": [
                 {
@@ -8345,7 +8349,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-07-06T17:46:02+00:00"
+            "time": "2024-10-19T23:04:40+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8492,40 +8496,40 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v7.10.0",
+            "version": "v7.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "49ec67fa7b002712da8526678abd651c09f375b2"
+                "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2",
-                "reference": "49ec67fa7b002712da8526678abd651c09f375b2",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/994ea93df5d4132f69d3f1bd74730509df6e8a05",
+                "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.15.3",
+                "filp/whoops": "^2.16.0",
                 "nunomaduro/termwind": "^1.15.1",
                 "php": "^8.1.0",
-                "symfony/console": "^6.3.4"
+                "symfony/console": "^6.4.12"
             },
             "conflict": {
                 "laravel/framework": ">=11.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^7.3.0",
-                "laravel/framework": "^10.28.0",
-                "laravel/pint": "^1.13.3",
-                "laravel/sail": "^1.25.0",
-                "laravel/sanctum": "^3.3.1",
-                "laravel/tinker": "^2.8.2",
-                "nunomaduro/larastan": "^2.6.4",
-                "orchestra/testbench-core": "^8.13.0",
-                "pestphp/pest": "^2.23.2",
-                "phpunit/phpunit": "^10.4.1",
-                "sebastian/environment": "^6.0.1",
-                "spatie/laravel-ignition": "^2.3.1"
+                "brianium/paratest": "^7.3.1",
+                "laravel/framework": "^10.48.22",
+                "laravel/pint": "^1.18.1",
+                "laravel/sail": "^1.36.0",
+                "laravel/sanctum": "^3.3.3",
+                "laravel/tinker": "^2.10.0",
+                "nunomaduro/larastan": "^2.9.8",
+                "orchestra/testbench-core": "^8.28.3",
+                "pestphp/pest": "^2.35.1",
+                "phpunit/phpunit": "^10.5.36",
+                "sebastian/environment": "^6.1.0",
+                "spatie/laravel-ignition": "^2.8.0"
             },
             "type": "library",
             "extra": {
@@ -8584,7 +8588,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-10-11T15:45:01+00:00"
+            "time": "2024-10-15T15:12:40+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8793,16 +8797,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.5",
+            "version": "1.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
+                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
-                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
+                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
                 "shasum": ""
             },
             "require": {
@@ -8847,7 +8851,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-26T12:45:22+00:00"
+            "time": "2024-11-06T19:06:49+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9172,16 +9176,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.35",
+            "version": "10.5.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b"
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7ac8b4e63f456046dcb4c9787da9382831a1874b",
-                "reference": "7ac8b4e63f456046dcb4c9787da9382831a1874b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
                 "shasum": ""
             },
             "require": {
@@ -9202,7 +9206,7 @@
                 "phpunit/php-timer": "^6.0.0",
                 "sebastian/cli-parser": "^2.0.1",
                 "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.2",
+                "sebastian/comparator": "^5.0.3",
                 "sebastian/diff": "^5.1.1",
                 "sebastian/environment": "^6.1.0",
                 "sebastian/exporter": "^5.1.2",
@@ -9253,7 +9257,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.35"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
             },
             "funding": [
                 {
@@ -9269,7 +9273,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T10:52:21+00:00"
+            "time": "2024-10-28T13:06:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9441,16 +9445,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.2",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
-                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
                 "shasum": ""
             },
             "require": {
@@ -9461,7 +9465,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.4"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
@@ -9506,7 +9510,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
             },
             "funding": [
                 {
@@ -9514,7 +9518,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-12T06:03:08+00:00"
+            "time": "2024-10-18T14:56:07+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -10325,16 +10329,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.12",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0"
+                "reference": "ae074dffb018c37a57071990d16e6152728dd972"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0",
-                "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972",
+                "reference": "ae074dffb018c37a57071990d16e6152728dd972",
                 "shasum": ""
             },
             "require": {
@@ -10372,7 +10376,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -10388,7 +10392,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-15T06:35:36+00:00"
+            "time": "2024-10-25T15:07:50+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -10458,7 +10462,7 @@
         "ext-mbstring": "*",
         "ext-xml": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.0"
     },

From 7017a1cae59353fd3d94683ae8f30a98bad5c559 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Nov 2024 11:22:30 +0000
Subject: [PATCH 356/666] Update URL Command: Added revisions table support

For #5292
Added test to cover.
---
 app/Console/Commands/UpdateUrlCommand.php |  7 +++++++
 tests/Commands/UpdateUrlCommandTest.php   | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/app/Console/Commands/UpdateUrlCommand.php b/app/Console/Commands/UpdateUrlCommand.php
index 0c95b0a3c8a..e155878d331 100644
--- a/app/Console/Commands/UpdateUrlCommand.php
+++ b/app/Console/Commands/UpdateUrlCommand.php
@@ -49,6 +49,7 @@ public function handle(Connection $db): int
             'chapters'    => ['description_html'],
             'books'       => ['description_html'],
             'bookshelves' => ['description_html'],
+            'page_revisions' => ['html', 'text', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],
             'comments'    => ['html', 'text'],
@@ -77,6 +78,12 @@ public function handle(Connection $db): int
         $this->info('URL update procedure complete.');
         $this->info('============================================================================');
         $this->info('Be sure to run "php artisan cache:clear" to clear any old URLs in the cache.');
+
+        if (!str_starts_with($newUrl, url('/'))) {
+            $this->warn('You still need to update your APP_URL env value. This is currently set to:');
+            $this->warn(url('/'));
+        }
+
         $this->info('============================================================================');
 
         return 0;
diff --git a/tests/Commands/UpdateUrlCommandTest.php b/tests/Commands/UpdateUrlCommandTest.php
index 62c39c2741f..1353cf80365 100644
--- a/tests/Commands/UpdateUrlCommandTest.php
+++ b/tests/Commands/UpdateUrlCommandTest.php
@@ -87,6 +87,26 @@ public function test_command_updates_array_settings()
         $this->assertEquals('a https://cats.example.com/donkey/cat url', $settingVal[0]['name']);
     }
 
+    public function test_command_updates_page_revisions()
+    {
+        $page = $this->entities->page();
+
+        for ($i = 0; $i < 2; $i++) {
+            $this->entities->updatePage($page, [
+                'name' => $page->name,
+                'markdown' => "[A link {$i}](https://example.com/donkey/cat)"
+            ]);
+        }
+
+        $this->runUpdate('https://example.com', 'https://cats.example.com');
+        setting()->flushCache();
+
+        $this->assertDatabaseHas('page_revisions', [
+            'markdown' => '[A link 1](https://cats.example.com/donkey/cat)',
+            'html' => '<p id="bkmrk-a-link-1"><a href="https://cats.example.com/donkey/cat">A link 1</a></p>' . "\n"
+        ]);
+    }
+
     protected function runUpdate(string $oldUrl, string $newUrl)
     {
         $this->artisan("bookstack:update-url {$oldUrl} {$newUrl}")

From a6ba8dd68f841048811b496a4b4c39e4e11536fd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Nov 2024 11:35:18 +0000
Subject: [PATCH 357/666] Testing: Improved reliability

- Added extra column/value check for page revision test for accuracy.
- Changed search sort test to use more reliable values.
  - Change due to database seeding somtimes generating values that
    proceeded the test value, expected to be first, in sort results.
---
 tests/Commands/UpdateUrlCommandTest.php | 1 +
 tests/Entity/EntitySearchTest.php       | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/Commands/UpdateUrlCommandTest.php b/tests/Commands/UpdateUrlCommandTest.php
index 1353cf80365..d336e05a240 100644
--- a/tests/Commands/UpdateUrlCommandTest.php
+++ b/tests/Commands/UpdateUrlCommandTest.php
@@ -102,6 +102,7 @@ public function test_command_updates_page_revisions()
         setting()->flushCache();
 
         $this->assertDatabaseHas('page_revisions', [
+            'page_id' => $page->id,
             'markdown' => '[A link 1](https://cats.example.com/donkey/cat)',
             'html' => '<p id="bkmrk-a-link-1"><a href="https://cats.example.com/donkey/cat">A link 1</a></p>' . "\n"
         ]);
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 57b7c3f6b88..cabf23bd3d3 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -393,11 +393,11 @@ public function test_sibling_search_for_books_provides_results_in_alphabetical_o
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
         $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
 
-        $searchBook->name = 'AAAAAAArdvarks';
+        $searchBook->name = '1AAAAAAArdvarks';
         $searchBook->save();
 
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
-        $this->withHtml($search)->assertElementContains('a:first-child', 'AAAAAAArdvarks');
+        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
     }
 
     public function test_sibling_search_for_shelves_provides_results_in_alphabetical_order()
@@ -411,11 +411,11 @@ public function test_sibling_search_for_shelves_provides_results_in_alphabetical
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
         $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
 
-        $searchShelf->name = 'AAAAAAArdvarks';
+        $searchShelf->name = '1AAAAAAArdvarks';
         $searchShelf->save();
 
         $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
-        $this->withHtml($search)->assertElementContains('a:first-child', 'AAAAAAArdvarks');
+        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
     }
 
     public function test_search_works_on_updated_page_content()

From e42cdbe8e040e707614969b1fbca02028b54698e Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Fri, 8 Nov 2024 13:29:21 +0000
Subject: [PATCH 358/666] Updated translations with latest Crowdin changes
 (#5250)

---
 lang/ar/auth.php          |   4 +-
 lang/cs/common.php        |   2 +-
 lang/cs/entities.php      |   4 +-
 lang/cs/errors.php        |   2 +-
 lang/et/common.php        |   2 +-
 lang/et/entities.php      |   4 +-
 lang/et/errors.php        |   2 +-
 lang/fr/common.php        |   2 +-
 lang/fr/entities.php      |   4 +-
 lang/fr/errors.php        |   2 +-
 lang/he/activities.php    |  70 +++---
 lang/he/auth.php          |  50 ++---
 lang/he/common.php        |   8 +-
 lang/he/components.php    |  26 +--
 lang/he/passwords.php     |   8 +-
 lang/he/preferences.php   |  58 ++---
 lang/he/settings.php      |   6 +-
 lang/it/activities.php    |  50 ++---
 lang/it/auth.php          |  44 ++--
 lang/it/common.php        |  48 ++---
 lang/it/components.php    |  32 +--
 lang/it/editor.php        |  70 +++---
 lang/it/entities.php      | 342 ++++++++++++++---------------
 lang/it/errors.php        |   2 +-
 lang/ja/common.php        |   2 +-
 lang/ja/entities.php      |   4 +-
 lang/ja/errors.php        |   2 +-
 lang/ko/activities.php    |  36 ++--
 lang/nl/common.php        |   2 +-
 lang/nl/entities.php      |   4 +-
 lang/nl/errors.php        |   2 +-
 lang/nl/settings.php      |   2 +-
 lang/pl/auth.php          |   2 +-
 lang/pl/common.php        |   2 +-
 lang/pl/entities.php      |   4 +-
 lang/pl/errors.php        |   4 +-
 lang/pt_BR/editor.php     |   2 +-
 lang/pt_BR/entities.php   | 124 +++++------
 lang/tk/activities.php    | 124 +++++++++++
 lang/tk/auth.php          | 117 ++++++++++
 lang/tk/common.php        | 113 ++++++++++
 lang/tk/components.php    |  46 ++++
 lang/tk/editor.php        | 177 +++++++++++++++
 lang/tk/entities.php      | 439 ++++++++++++++++++++++++++++++++++++++
 lang/tk/errors.php        | 121 +++++++++++
 lang/tk/notifications.php |  27 +++
 lang/tk/pagination.php    |  12 ++
 lang/tk/passwords.php     |  15 ++
 lang/tk/preferences.php   |  51 +++++
 lang/tk/settings.php      | 338 +++++++++++++++++++++++++++++
 lang/tk/validation.php    | 117 ++++++++++
 lang/vi/activities.php    |   2 +-
 lang/vi/entities.php      |   8 +-
 53 files changed, 2219 insertions(+), 522 deletions(-)
 create mode 100644 lang/tk/activities.php
 create mode 100644 lang/tk/auth.php
 create mode 100644 lang/tk/common.php
 create mode 100644 lang/tk/components.php
 create mode 100644 lang/tk/editor.php
 create mode 100644 lang/tk/entities.php
 create mode 100644 lang/tk/errors.php
 create mode 100644 lang/tk/notifications.php
 create mode 100644 lang/tk/pagination.php
 create mode 100644 lang/tk/passwords.php
 create mode 100644 lang/tk/preferences.php
 create mode 100644 lang/tk/settings.php
 create mode 100644 lang/tk/validation.php

diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index fb434699e2d..0d3b12f8fc6 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -89,8 +89,8 @@
     'mfa_setup_action' => 'إعداد (تنصيب)',
     'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
     'mfa_option_totp_title' => 'تطبيق الجوال',
-    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_option_backup_codes_title' => 'Backup Codes',
+    'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق محمول يدعم TOTP مثل Google Authenticator أو Authy أو Microsoft Authenticer.',
+    'mfa_option_backup_codes_title' => 'رموز النسخ الاحتياطي',
     'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
     'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
     'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
diff --git a/lang/cs/common.php b/lang/cs/common.php
index 1e20b17e7dc..66ad222792d 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Podmínky služby',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Vyhledat :appName',
 ];
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index c73dd6f1f11..6122fe6a445 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Vytvořený obsah)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Přepnout na nový WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(V alfa testování)',
     'pages_edit_set_changelog' => 'Nastavit protokol změn',
     'pages_edit_enter_changelog_desc' => 'Zadejte stručný popis změn, které jste provedli',
     'pages_edit_enter_changelog' => 'Zadejte protokol změn',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index a1efdadb7ae..e23f1032b7d 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nemůžete odstranit posledního administrátora',
     'users_cannot_delete_guest' => 'Uživatele Host není možno odstranit',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Nebylo možné vytvořit uživatele, protože se nepodařilo odeslat email s pozvánkou',
 
     // Roles
     'role_cannot_be_edited' => 'Tuto roli nelze editovat',
diff --git a/lang/et/common.php b/lang/et/common.php
index a53060a00e6..3eb6b50b96e 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Kasutustingimused',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Otsi :appName',
 ];
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 0d90dd32f3c..dd875a6f2da 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Puhas sisu)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiilne sisu)',
     'pages_edit_switch_to_wysiwyg' => 'Kasuta WYSIWYG redaktorit',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Kasuta uut tekstiredaktorit',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa-testimisel)',
     'pages_edit_set_changelog' => 'Muudatuste logi',
     'pages_edit_enter_changelog_desc' => 'Sisesta tehtud muudatuste lühikirjeldus',
     'pages_edit_enter_changelog' => 'Salvesta muudatuste logi',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index a4c3cf2bdcb..732c945295f 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ainsat administraatorit ei saa kustutada',
     'users_cannot_delete_guest' => 'Külaliskasutajat ei saa kustutada',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Kasutajat ei saadud luua, kuna kutse e-kirja saatmine ebaõnnestus',
 
     // Roles
     'role_cannot_be_edited' => 'Seda rolli ei saa muuta',
diff --git a/lang/fr/common.php b/lang/fr/common.php
index 282a72e4569..0abff99542a 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Conditions d\'utilisation',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Recherche :appName',
 ];
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 1f826bb7ee7..b92ddac0ac7 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Contenu nettoyé)',
     'pages_edit_switch_to_markdown_stable' => '(Contenu stable)',
     'pages_edit_switch_to_wysiwyg' => 'Basculer vers l\'éditeur WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Basculer vers le nouveau WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En test Alpha)',
     'pages_edit_set_changelog' => 'Remplir le journal des changements',
     'pages_edit_enter_changelog_desc' => 'Entrez une brève description des changements effectués',
     'pages_edit_enter_changelog' => 'Ouvrir le journal des changements',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index f2c9b125f37..7658fd8a982 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Vous ne pouvez pas supprimer le dernier administrateur',
     'users_cannot_delete_guest' => 'Vous ne pouvez pas supprimer l\'utilisateur invité',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Impossible de créer l\'utilisateur à cause d\'une erreur d\'envoi de l\'email d\'invitation',
 
     // Roles
     'role_cannot_be_edited' => 'Ce rôle ne peut pas être modifié',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 8ce859127a5..75ab9b3ea28 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -62,61 +62,61 @@
     'watch_update_level_notification' => 'העדפות צפייה עודכנו בהצלחה',
 
     // Auth
-    'auth_login' => 'logged in',
-    'auth_register' => 'registered as new user',
-    'auth_password_reset_request' => 'requested user password reset',
-    'auth_password_reset_update' => 'reset user password',
-    'mfa_setup_method' => 'configured MFA method',
-    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
-    'mfa_remove_method' => 'removed MFA method',
-    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+    'auth_login' => 'מחובר',
+    'auth_register' => 'נרשם כמשתמש חדש',
+    'auth_password_reset_request' => 'בקשת איפוס סיסמה למשתמש בוצעה בהצלחה',
+    'auth_password_reset_update' => 'איפוס סיסמה למשתמש',
+    'mfa_setup_method' => 'הגדרת אימות דו-שלבי פעיל',
+    'mfa_setup_method_notification' => 'הגדרת אימות דו-שלבי בוצע בהצלחה',
+    'mfa_remove_method' => 'הגדרת אימות דו-שלבי הוסר',
+    'mfa_remove_method_notification' => 'אפשרות אימות דו-שלבי הוסר בהצלחה',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
-    'maintenance_action_run' => 'ran maintenance action',
+    'settings_update' => 'הגדרות עודכנו בהצלחה',
+    'settings_update_notification' => 'ההגדרות עודכנו בהצלחה',
+    'maintenance_action_run' => 'פעולות תחזוקה שהופעלו',
 
     // Webhooks
-    'webhook_create' => 'created webhook',
-    'webhook_create_notification' => 'Webhook נוצר בהצלחה',
-    'webhook_update' => 'updated webhook',
-    'webhook_update_notification' => 'Webhook successfully updated',
-    'webhook_delete' => 'deleted webhook',
-    'webhook_delete_notification' => 'Webhook successfully deleted',
+    'webhook_create' => 'webook נוצר',
+    'webhook_create_notification' => 'יצירת Webhook בוצעה בהצלחה',
+    'webhook_update' => 'webhook עודכן',
+    'webhook_update_notification' => 'webook עודכן בהצלחה',
+    'webhook_delete' => 'Webhook נמחק',
+    'webhook_delete_notification' => 'Webook נמחק בהצלחה',
 
     // Users
-    'user_create' => 'created user',
-    'user_create_notification' => 'User successfully created',
-    'user_update' => 'updated user',
+    'user_create' => 'משתמש חדש נוצר',
+    'user_create_notification' => 'משתמש נוצר בהצלחה',
+    'user_update' => 'משתמש עודכן',
     'user_update_notification' => 'משתמש עודכן בהצלחה',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'משתמש נמחק',
     'user_delete_notification' => 'משתמש הוסר בהצלחה',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'API Token נוצר',
+    'api_token_create_notification' => 'API Token נוצר בהצלחה',
+    'api_token_update' => 'API Token עודכן',
+    'api_token_update_notification' => 'API Token עודכן בהצלחה',
+    'api_token_delete' => 'API Token נמחק',
+    'api_token_delete_notification' => 'API Token נמחק בהצלחה',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => 'תפקיד נוצר',
     'role_create_notification' => 'תפקיד נוצר בהצלחה',
-    'role_update' => 'updated role',
+    'role_update' => 'תפקיד עודכן',
     'role_update_notification' => 'תפקיד עודכן בהצלחה',
-    'role_delete' => 'deleted role',
+    'role_delete' => 'תפקיד נמחק',
     'role_delete_notification' => 'תפקיד נמחק בהצלחה',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'סל המחזור רוקן',
+    'recycle_bin_restore' => 'שוחזר מסל המחזור',
+    'recycle_bin_destroy' => 'נמחק מסל המחזור',
 
     // Comments
     'commented_on'                => 'הגיב/ה על',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
+    'comment_create'              => 'הערה הוספה',
+    'comment_update'              => 'תגובה הוספה',
     'comment_delete'              => 'תגובה נמחקה',
 
     // Other
diff --git a/lang/he/auth.php b/lang/he/auth.php
index 04045e35758..017602b4f2a 100644
--- a/lang/he/auth.php
+++ b/lang/he/auth.php
@@ -6,12 +6,12 @@
  */
 return [
 
-    'failed' => 'פרטי ההתחברות אינם תואמים את הנתונים שלנו',
-    'throttle' => 'נסיונות התחברות רבים מדי, יש להמתין :seconds שניות ולנסות שנית.',
+    'failed' => 'פרטי ההתחברות אינם תואמים את הנתונים שלנו.',
+    'throttle' => 'נסיונות התחברות מהירים מדי, יש להמתין :seconds שניות ולנסות שנית.',
 
     // Login & Register
-    'sign_up' => 'הרשמה',
-    'log_in' => 'התחבר',
+    'sign_up' => 'הרשמה למערכת',
+    'log_in' => 'התחבר למערכת',
     'log_in_with' => 'התחבר באמצעות :socialDriver',
     'sign_up_with' => 'הרשם באמצעות :socialDriver',
     'logout' => 'התנתק',
@@ -72,40 +72,40 @@
 
     // User Invite
     'user_invite_email_subject' => 'הוזמנת להצטרף ל:appName!',
-    'user_invite_email_greeting' => 'An account has been created for you on :appName.',
+    'user_invite_email_greeting' => 'חשבון נוצר עבורך ב :appName.',
     'user_invite_email_text' => 'לחץ על הכפתור מטה בכדי להגדיר סיסמת משתמש ולקבל גישה:',
     'user_invite_email_action' => 'הגדר סיסמה לחשבון',
-    'user_invite_page_welcome' => 'Welcome to :appName!',
-    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
+    'user_invite_page_welcome' => 'ברוכים הבאים ל :appName!',
+    'user_invite_page_text' => 'על מנת לסיים את ההרשמה ולקבל גישה עלייך להגדיר סיסמה אשר תהיה בשימוש בהתחברות ל :appName בביקורים עתידיים.',
     'user_invite_page_confirm_button' => 'אימות סיסמא',
-    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+    'user_invite_success_login' => 'הסיסמה הוגדרה בהצלחה, כעת תוכלו לקבל גישה ל :appName!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'הגדר אימות רב-שלבי',
     'mfa_setup_desc' => 'הגדר אימות רב-שלבי כשכבת אבטחה נוספת עבור החשבון שלך.',
     'mfa_setup_configured' => 'כבר הוגדר',
     'mfa_setup_reconfigure' => 'הגדר מחדש',
-    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
-    'mfa_setup_action' => 'Setup',
+    'mfa_setup_remove_confirmation' => 'האם להסיר את אפשרות האימות הדו-שלבי הזאת?',
+    'mfa_setup_action' => 'הגדרה',
     'mfa_backup_codes_usage_limit_warning' => 'נשאר לך פחות מ 5 קודי גיבוי, בבקשה חולל ואחסן סט חדש לפני שיגמרו לך הקודים בכדי למנוע נעילה מחוץ לחשבון שלך.',
     'mfa_option_totp_title' => 'אפליקציה לנייד',
     'mfa_option_totp_desc' => 'בכדי להשתמש באימות רב-שלבי תצטרך אפליקציית מובייל תומכת TOTP כמו Google Authenticator, Authy או Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'קודי גיבוי',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
-    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
-    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
-    'mfa_gen_backup_codes_download' => 'Download Codes',
-    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
-    'mfa_gen_totp_title' => 'Mobile App Setup',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
-    'mfa_gen_totp_verify_setup' => 'Verify Setup',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
-    'mfa_verify_no_methods' => 'No Methods Configured',
+    'mfa_option_backup_codes_desc' => 'יצירת מערך סיסמאות חד-פעמיות כגיבוי אשר תתקבשו להזין על מנת לאמת את הזהות שלכם, אנא וודאו כי הקודים האלו שמורים במקום בטוח.',
+    'mfa_gen_confirm_and_enable' => 'אישור והפעלה',
+    'mfa_gen_backup_codes_title' => 'הגדרת קודי גיבוי',
+    'mfa_gen_backup_codes_desc' => 'אנא שמור את רשימת הקודים הרשומים מטה במקום בטוח. בגישה למערכת תהיה אפשרות להשתמש באחד הקודים הללו כאמצעי זיהוי נוסף.',
+    'mfa_gen_backup_codes_download' => 'הורדת קודים',
+    'mfa_gen_backup_codes_usage_warning' => 'ניתן להשתמש בכל קוד פעם אחת בלבד',
+    'mfa_gen_totp_title' => 'הגדרת אפליקציה לזיהוי',
+    'mfa_gen_totp_desc' => 'על מנת להגדיר זיהוי דו-שלבי במכשיר נייד עלייך להשתמש באפליקציה התומכת ב TOTP כגון Google Authenticator, Authy או Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'סרוק את קוד ה QR באמצעות האפליקציה שבה מתבצע הזיהוי על מנת להתחיל.',
+    'mfa_gen_totp_verify_setup' => 'אשר את ההגדרה',
+    'mfa_gen_totp_verify_setup_desc' => 'על מנת לוודא כי הזיהוי הדו-שלבי עובד יש להכניס את הקוד, הוא מופיע לך על מסך האפליקציה, בשדה מטה:',
+    'mfa_gen_totp_provide_code_here' => 'אנא הכנס את הקוד כאן',
+    'mfa_verify_access' => 'אשר גישה',
+    'mfa_verify_access_desc' => 'חשבון המשתמש שלך דורש ממך לאת את הזהות שלך בשכבת הגנה נוספת על מנת לאפשר לך גישה. יש לאשר גישה דרך אחד האמצעים הקיימים על מנת להמשיך.',
+    'mfa_verify_no_methods' => 'אין אפשרויות אימות דו-שלבי מוגדרות',
     'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
     'mfa_verify_use_totp' => 'Verify using a mobile app',
     'mfa_verify_use_backup_codes' => 'Verify using a backup code',
diff --git a/lang/he/common.php b/lang/he/common.php
index a427df954fe..4e4483ccf01 100644
--- a/lang/he/common.php
+++ b/lang/he/common.php
@@ -20,7 +20,7 @@
     'description' => 'תיאור',
     'role' => 'תפקיד',
     'cover_image' => 'תמונת נושא',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'התמונה צריכה להיות לפחות בגודל של 440 על 250 למרות שהיא תוצג בצורה דינמית ותותאם בהתאם להתאים לממשק המשתמש במצבים שונים על פי הדרישה, ולכן המימדים יהיו שונים.',
 
     // Actions
     'actions' => 'פעולות',
@@ -52,7 +52,7 @@
     'filter_clear' => 'נקה מסננים',
     'download' => 'הורדה',
     'open_in_tab' => 'פתח בכרטיסייה חדשה',
-    'open' => 'Open',
+    'open' => 'פתח',
 
     // Sort Options
     'sort_options' => 'אפשרויות מיון',
@@ -76,7 +76,7 @@
     'grid_view' => 'תצוגת רשת',
     'list_view' => 'תצוגת רשימה',
     'default' => 'ברירת מחדל',
-    'breadcrumb' => 'Breadcrumb',
+    'breadcrumb' => 'סימון מסלול',
     'status' => 'סטטוס',
     'status_active' => 'פעיל',
     'status_inactive' => 'לא פעיל',
@@ -109,5 +109,5 @@
     'terms_of_service' => 'תנאי שימוש',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'חפש :appName',
 ];
diff --git a/lang/he/components.php b/lang/he/components.php
index 9e075d89da9..30b9ab01a09 100644
--- a/lang/he/components.php
+++ b/lang/he/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'בחירת תמונה',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'רשימת תמונות',
+    'image_details' => 'פרטי תמונה',
+    'image_upload' => 'העלאת תמונה',
+    'image_intro' => 'כאן ניתן לבחור ולנהל תמונות אשר הועלו למערכת.',
+    'image_intro_upload' => 'ניתן לגרור תמונות לחלון זה, או על ידי לחיצה על כפתור "העלאת תמונות" למעלה.',
     'image_all' => 'הכל',
     'image_all_title' => 'הצג את כל התמונות',
     'image_book_title' => 'הצג תמונות שהועלו לספר זה',
     'image_page_title' => 'הצג תמונות שהועלו לדף זה',
     'image_search_hint' => 'חפש תמונה לפי שם',
     'image_uploaded' => 'הועלה :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'הועלה על ידי :userName',
+    'image_uploaded_to' => 'הועלה ל :pageLink',
+    'image_updated' => 'עודכן :updateDate',
     'image_load_more' => 'טען עוד',
     'image_image_name' => 'שם התמונה',
     'image_delete_used' => 'תמונה זו בשימוש בדפים שמתחת',
     'image_delete_confirm_text' => 'האם את/ה בטוח/ה שברצונך למחוק את התמונה הזו?',
     'image_select_image' => 'בחר תמונה',
     'image_dropzone' => 'גרור תמונות או לחץ כאן להעלאה',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'גרור תמונות לכאן על מנת להעלאות אותם',
     'images_deleted' => 'התמונות נמחקו',
     'image_preview' => 'תצוגה מקדימה',
     'image_upload_success' => 'התמונה עלתה בהצלחה',
     'image_update_success' => 'פרטי התמונה עודכנו בהצלחה',
     'image_delete_success' => 'התמונה נמחקה בהצלחה',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'החלפת תמונה',
+    'image_replace_success' => 'תמונה עודכנה בהצלחה',
+    'image_rebuild_thumbs' => 'יצר ווריאציות גודל מחדש',
+    'image_rebuild_thumbs_success' => 'ווריאציות גודל תמונה יוצרו מחדש בהצלחה!',
 
     // Code Editor
     'code_editor' => 'ערוך קוד',
diff --git a/lang/he/passwords.php b/lang/he/passwords.php
index a94d7c30b36..3909680e3d4 100644
--- a/lang/he/passwords.php
+++ b/lang/he/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => 'הסיסמה חייבת להיות בעלת 8 תווים לפחות ולהתאים לאימות.',
-    'user' => "לא נמצא משתמש עם כתובת דוא\"ל זו.",
-    'token' => 'אסימון איפוס הסיסמה לא תקף עבור כתובת דוא"ל זו.',
-    'sent' => 'שלחנו לך דוא"ל עם קישור לאיפוס הסיסמה!',
+    'password' => 'הסיסמא חייבת להיות בעלת 8 תווים לפחות ולהתאים לאימות.',
+    'user' => "לא נמצא משתמש קיים עם כתובת דוא\"ל זו.",
+    'token' => 'הקישור לאיפוס הסיסמה לא תקף עבור כתובת דוא"ל זו.',
+    'sent' => 'שלחנו לך דוא"ל עם קישור לאיפוס הסיסמא!',
     'reset' => 'איפוס הסיסמה הושלם בהצלחה!',
 
 ];
diff --git a/lang/he/preferences.php b/lang/he/preferences.php
index f0f997f26d2..9e05eefb3ab 100644
--- a/lang/he/preferences.php
+++ b/lang/he/preferences.php
@@ -5,10 +5,10 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'החשבון שלי',
 
     'shortcuts' => 'קיצורי דרך',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_interface' => 'העדפות קיצורי ממשק משתמש',
     'shortcuts_toggle_desc' => 'כאן תוכל להפעיל או לבטל קיצורי דרך לממשק מערכת המקלדת, המשמשים לניווט ולפעולות.',
     'shortcuts_customize_desc' => 'אתה יכול להתאים אישית כל אחד מקיצורי הדרך למטה. פשוט לחץ על צירוף המקשים הרצוי לאחר בחירת הקלט לקיצור דרך.',
     'shortcuts_toggle_label' => 'קיצורי מקשים מופעלים',
@@ -17,35 +17,35 @@
     'shortcuts_save' => 'שמור קיצורי דרך',
     'shortcuts_overlay_desc' => 'הערה: כאשר קיצורי דרך מופעלים, שכבת-על מסייעת זמינה באמצעות לחיצה על "?" אשר ידגיש את קיצורי הדרך הזמינים לפעולות הנראות כעת על המסך.',
     'shortcuts_update_success' => 'העדפותיך נשמרו!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_overview_desc' => 'ניהול קיצורי מקלדת שבשימוש לניווט מהיר בממשק המשתמש.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications' => 'הגדרת התראות',
+    'notifications_desc' => 'העדפות קבלת מייל והתראות כאשר מבוצעת פעולה מסויימת במערכת.',
+    'notifications_opt_own_page_changes' => 'עדכן אותי כאשר מתבצעים שינויים לדפים שבבעלותי',
+    'notifications_opt_own_page_comments' => 'עדכן אותי כאשר נוספות הערות לדפים שבבעלותי',
+    'notifications_opt_comment_replies' => 'עדכן אותי כאשר מתקבלות תגובות להערות שלי',
+    'notifications_save' => 'שמור העדפות',
+    'notifications_update_success' => 'הגדרת התראות עודכנו!',
+    'notifications_watched' => 'פריטים נצפים וברשימת התעלמות',
+    'notifications_watched_desc' => 'להן רשימת הפריטים אשר קיימת עבורם הגדרות מותאמות אישית. על מנת לעדכן רשימה זו, צפה בפריט ומצא את אפשרות הצפייה / מעקב בפאנל הצידי.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'גישה ואבטחה',
+    'auth_change_password' => 'שינוי סיסמה',
+    'auth_change_password_desc' => 'שינוי הסיסמה לכניסה למערכת. הסיסמה חייבת להיות לפחות 8 תווים.',
+    'auth_change_password_success' => 'הסיסמה עודכנה בהצלחה!',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => 'פרטי הפרופיל',
+    'profile_desc' => 'נהל את פרטי החשבון שלך אשר יוצגו לאחרים במערכת, בנוסף לפרטים אשר נועדו להתאמה אישית במערכת ויצירת קשר.',
+    'profile_view_public' => 'צפה בפרופיל הציבורי',
+    'profile_name_desc' => 'הגדר את שם התצוגה שלך אשר יהיה זמין לצפייה לשאר משתמשי המערכת ובכל פעולה אשר תבצע במערכת, ובתוכן אשר שייך לך.',
+    'profile_email_desc' => 'כתובת הדוא"ל תשמש להתראות, ובהתאם למערכות ההזדהות הפעילות לגישה למערכת.',
+    'profile_email_no_permission' => 'לצערנו אין לך גישה לביצוע שינוי כתובת הדוא"ל שלך, אם ברצונך לבצע שינוי בכתובת אנא פנה למנהל המערכת על מנת שיבצע שינוי זה עבורך.',
+    'profile_avatar_desc' => 'אנא בחר תמונה שתייצג אותך כלפי אחרים במערכת, תמונה אידיאלית צריכה להיות בגובה ואורך של 256 פיקסלים.',
+    'profile_admin_options' => 'אפשרויות מנהל',
+    'profile_admin_options_desc' => 'אפשרויות ברמת מנהל נוספות, כגון הוספת תפקידים והרשאות למשתמשים, אפשר למצוא עבור המשתמש שלך באיזור "הגדרות > משתמשים" במערכת.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'הסר חשבון',
+    'delete_my_account' => 'הסר את החשבון שלי',
+    'delete_my_account_desc' => 'פעולה זו תמחק את החשבון שלך כולל כל ההגדרות עבור החשבון שלך מהמערכת. אין דרך לשחזר את החשבון לאחר המחיקה. כל תוכן שיצרת כולל קבצים שהעלת לאתר ישארו פעילים.',
+    'delete_my_account_warning' => 'הפעולה אינה ניתנת לביטול, האם למחוק את החשבון?',
 ];
diff --git a/lang/he/settings.php b/lang/he/settings.php
index 3ad9da5ffbf..bf585287cf8 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -9,8 +9,8 @@
     // Common Messages
     'settings' => 'הגדרות',
     'settings_save' => 'שמור הגדרות',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'גירסת מערכת',
+    'categories' => 'קטגוריות',
 
     // App Settings
     'app_customization' => 'התאמה אישית',
@@ -26,7 +26,7 @@
     'app_secure_images' => 'העלאת תמונות מאובטחת',
     'app_secure_images_toggle' => 'אפשר העלאת תמונות מאובטחת',
     'app_secure_images_desc' => 'משיקולי ביצועים, כל התמונות הינן ציבוריות. אפשרות זו מוסיפה מחרוזת אקראית שקשה לנחש לכל כתובת של תמונה. אנא ודא שאפשרות הצגת תוכן התיקייה מבוטל.',
-    'app_default_editor' => 'Default Page Editor',
+    'app_default_editor' => 'עורך דפים ברירת מחדל',
     'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
     'app_custom_html' => 'HTML מותאם אישית לחלק העליון',
     'app_custom_html_desc' => 'כל קוד שיתווסף כאן, יופיע בתחתית תגית ה head של כל דף. חלק זה שימושי על מנת להגדיר עיצובי CSS והתקנת קוד Analytics',
diff --git a/lang/it/activities.php b/lang/it/activities.php
index 39b6859e422..61a22518551 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -31,19 +31,19 @@
     'book_create'                 => 'ha creato il libro',
     'book_create_notification'    => 'Libro creato con successo',
     'book_create_from_chapter'              => 'ha convertito da capitolo a libro',
-    'book_create_from_chapter_notification' => 'Capitolo convertito con successo in libro',
+    'book_create_from_chapter_notification' => 'Capitolo convertito in libro con successo',
     'book_update'                 => 'ha aggiornato il libro',
     'book_update_notification'    => 'Libro aggiornato con successo',
     'book_delete'                 => 'ha eliminato il libro',
     'book_delete_notification'    => 'Libro eliminato con successo',
     'book_sort'                   => 'ha ordinato il libro',
-    'book_sort_notification'      => 'Libro reindicizzato con successo',
+    'book_sort_notification'      => 'Libro riordinato con successo',
 
     // Bookshelves
     'bookshelf_create'            => 'ha creato la libreria',
     'bookshelf_create_notification'    => 'Libreria creata con successo',
-    'bookshelf_create_from_book'    => 'ha convertito libro in libreria',
-    'bookshelf_create_from_book_notification'    => 'Libro convertito con successo in libreria',
+    'bookshelf_create_from_book'    => 'ha convertito il libro in libreria',
+    'bookshelf_create_from_book_notification'    => 'Libro convertito in libreria con successo',
     'bookshelf_update'                 => 'ha aggiornato la libreria',
     'bookshelf_update_notification'    => 'Libreria aggiornata con successo',
     'bookshelf_delete'                 => 'ha eliminato la libreria',
@@ -72,53 +72,53 @@
     'mfa_remove_method_notification' => 'Metodo multi-fattore rimosso con successo',
 
     // Settings
-    'settings_update' => 'impostazioni aggiornate',
+    'settings_update' => 'ha aggiornato le impostazioni',
     'settings_update_notification' => 'Impostazioni aggiornate con successo',
-    'maintenance_action_run' => 'eseguita azione di manutenzione',
+    'maintenance_action_run' => 'ha eseguito un\'azione di manutenzione',
 
     // Webhooks
-    'webhook_create' => 'webhook creato',
+    'webhook_create' => 'ha creato un webhook',
     'webhook_create_notification' => 'Webhook creato con successo',
-    'webhook_update' => 'webhook aggiornato',
+    'webhook_update' => 'ha aggiornato un webhook',
     'webhook_update_notification' => 'Webhook aggiornato con successo',
-    'webhook_delete' => 'webhook eliminato',
+    'webhook_delete' => 'ha eliminato un webhook',
     'webhook_delete_notification' => 'Webhook eliminato con successo',
 
     // Users
-    'user_create' => 'utente creato',
+    'user_create' => 'ha creato un utente',
     'user_create_notification' => 'Utente creato con successo',
-    'user_update' => 'utente aggiornato',
+    'user_update' => 'ha aggiornato un utente',
     'user_update_notification' => 'Utente aggiornato con successo',
-    'user_delete' => 'utente eliminato',
+    'user_delete' => 'ha eliminato un utente',
     'user_delete_notification' => 'Utente rimosso con successo',
 
     // API Tokens
-    'api_token_create' => 'token API creato',
+    'api_token_create' => 'ha creato un token API',
     'api_token_create_notification' => 'Token API creato con successo',
-    'api_token_update' => 'token API aggiornato',
+    'api_token_update' => 'ha aggiornato un token API',
     'api_token_update_notification' => 'Token API aggiornato correttamente',
-    'api_token_delete' => 'token API eliminato',
+    'api_token_delete' => 'ha eliminato token API',
     'api_token_delete_notification' => 'Token API eliminato con successo',
 
     // Roles
-    'role_create' => 'creato ruolo',
+    'role_create' => 'ha creato un ruolo',
     'role_create_notification' => 'Ruolo creato con successo',
-    'role_update' => 'aggiornato ruolo',
+    'role_update' => 'ha aggiornato un ruolo',
     'role_update_notification' => 'Ruolo aggiornato con successo',
-    'role_delete' => 'eliminato ruolo',
+    'role_delete' => 'ha eliminato un ruolo',
     'role_delete_notification' => 'Ruolo eliminato con successo',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'cestino svuotato',
-    'recycle_bin_restore' => 'ripristinato dal cestino',
-    'recycle_bin_destroy' => 'rimosso dal cestino',
+    'recycle_bin_empty' => 'ha svuotato il cestino',
+    'recycle_bin_restore' => 'ha ripristinato dal cestino',
+    'recycle_bin_destroy' => 'ha rimosso dal cestino',
 
     // Comments
     'commented_on'                => 'ha commentato in',
-    'comment_create'              => 'commento aggiunto',
-    'comment_update'              => 'commento aggiornato',
-    'comment_delete'              => 'commento rimosso',
+    'comment_create'              => 'ha aggiunto un commento',
+    'comment_update'              => 'ha aggiornato un commento',
+    'comment_delete'              => 'ha rimosso un commento',
 
     // Other
-    'permissions_update'          => 'autorizzazioni aggiornate',
+    'permissions_update'          => 'ha aggiornate le autorizzazioni',
 ];
diff --git a/lang/it/auth.php b/lang/it/auth.php
index 94f1ebd53b0..9191ecba794 100644
--- a/lang/it/auth.php
+++ b/lang/it/auth.php
@@ -20,11 +20,11 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
-    'password_confirm' => 'Conferma Password',
+    'password_confirm' => 'Conferma password',
     'password_hint' => 'Deve essere lunga almeno 8 caratteri',
     'forgot_password' => 'Password dimenticata?',
     'remember_me' => 'Ricordami',
-    'ldap_email_hint' => 'Inserisci un email per usare quest\'account.',
+    'ldap_email_hint' => 'Inserisci un\'email per usare quest\'account.',
     'create_account' => 'Crea un account',
     'already_have_account' => 'Hai già un account?',
     'dont_have_account' => 'Non hai un account?',
@@ -34,54 +34,54 @@
 
     'register_thanks' => 'Grazie per esserti registrato!',
     'register_confirm' => 'Controlla la tua mail e clicca il pulsante di conferma per accedere a :appName.',
-    'registrations_disabled' => 'La registrazione è disabilitata',
-    'registration_email_domain_invalid' => 'Questo dominio della mail non ha accesso a questa applicazione',
-    'register_success' => 'Grazie per la registrazione! Sei registrato e loggato.',
+    'registrations_disabled' => 'La registrazione è disabilitata al momento',
+    'registration_email_domain_invalid' => 'Questo dominio email non ha accesso a questa applicazione',
+    'register_success' => 'Grazie per la registrazione! Sei registrato e connesso.',
 
     // Login auto-initiation
     'auto_init_starting' => 'Tentativo di accesso',
-    'auto_init_starting_desc' => 'Stiamo contattando il vostro sistema di autenticazione per avviare il processo di login. Se dopo 5 secondi non si verifica alcun progresso, si può provare a fare clic sul link sottostante.',
+    'auto_init_starting_desc' => 'Stiamo contattando il tuo sistema di autenticazione per avviare il processo di login. Se non ci sono progressi dopo 5 secondi, puoi provare a cliccare sul link qui sotto.',
     'auto_init_start_link' => 'Procedi con l\'autenticazione',
 
     // Password Reset
-    'reset_password' => 'Reimposta Password',
-    'reset_password_send_instructions' => 'Inserisci il tuo indirizzo sotto e ti verrà inviata una mail contenente un link per resettare la tua password.',
-    'reset_password_send_button' => 'Invia Link Reset',
-    'reset_password_sent' => 'Un link di reset della password verrà inviato a :email se la mail verrà trovata nel sistema.',
-    'reset_password_success' => 'La tua password è stata resettata correttamente.',
+    'reset_password' => 'Reimposta la password',
+    'reset_password_send_instructions' => 'Inserisci il tuo indirizzo e ti verrà inviata una mail contenente un link per reimpostare la tua password.',
+    'reset_password_send_button' => 'Invia link di ripristino',
+    'reset_password_sent' => 'Se la mail verrà trovata nel sistema, verrà inviato a :email un link di ripristino della password.',
+    'reset_password_success' => 'La tua password è stata ripristinata correttamente.',
     'email_reset_subject' => 'Reimposta la password di :appName',
-    'email_reset_text' => 'Stai ricevendo questa mail perché abbiamo ricevuto una richiesta di reset della password per il tuo account.',
-    'email_reset_not_requested' => 'Se non hai richiesto un reset della password, ignora questa mail.',
+    'email_reset_text' => 'Stai ricevendo questa mail perché abbiamo ricevuto una richiesta di ripristino della password per il tuo account.',
+    'email_reset_not_requested' => 'Se non hai richiesto un ripristino della password, ignora questa mail.',
 
     // Email Confirmation
     'email_confirm_subject' => 'Conferma email per :appName',
     'email_confirm_greeting' => 'Grazie per esserti registrato a :appName!',
     'email_confirm_text' => 'Conferma il tuo indirizzo email cliccando il pulsante sotto:',
-    'email_confirm_action' => 'Conferma Email',
+    'email_confirm_action' => 'Conferma email',
     'email_confirm_send_error' => 'La conferma della mail è richiesta ma non è stato possibile mandare la mail. Contatta l\'amministratore.',
     'email_confirm_success' => 'La tua email è stata confermata! Ora dovresti essere in grado di effettuare il login utilizzando questo indirizzo email.',
     'email_confirm_resent' => 'Mail di conferma reinviata, controlla la tua posta.',
     'email_confirm_thanks' => 'Grazie per la conferma!',
-    'email_confirm_thanks_desc' => 'Attendere un momento mentre la conferma viene gestita. Se non si è reindirizzati dopo 3 secondi, premere il link "Continua" qui sotto per procedere.',
+    'email_confirm_thanks_desc' => 'Attendi un momento mentre la conferma viene gestita. Se non vieni reindirizzato dopo 3 secondi, clicca sul link "Continua" qui sotto per procedere.',
 
-    'email_not_confirmed' => 'Indirizzo Email Non Confermato',
+    'email_not_confirmed' => 'Indirizzo email non confermato',
     'email_not_confirmed_text' => 'Il tuo indirizzo email non è ancora stato confermato.',
     'email_not_confirmed_click_link' => 'Clicca il link nella mail mandata subito dopo la tua registrazione.',
     'email_not_confirmed_resend' => 'Se non riesci a trovare la mail puoi rimandarla cliccando il pulsante sotto.',
-    'email_not_confirmed_resend_button' => 'Reinvia Conferma',
+    'email_not_confirmed_resend_button' => 'Reinvia conferma',
 
     // User Invite
     'user_invite_email_subject' => 'Sei stato invitato a unirti a :appName!',
     'user_invite_email_greeting' => 'Un account è stato creato per te su :appName.',
     'user_invite_email_text' => 'Clicca sul pulsante qui sotto per impostare una password e ottenere l\'accesso:',
-    'user_invite_email_action' => 'Imposta Password',
+    'user_invite_email_action' => 'Imposta password',
     'user_invite_page_welcome' => 'Benvenuto in :appName!',
-    'user_invite_page_text' => 'Per completare il tuo account e ottenere l\'accesso devi impostare una password che verrà utilizzata per accedere a :appName in futuro.',
-    'user_invite_page_confirm_button' => 'Conferma Password',
+    'user_invite_page_text' => 'Per completare il tuo account e ottenere l\'accesso, devi impostare una password che verrà utilizzata per accedere a :appName in futuro.',
+    'user_invite_page_confirm_button' => 'Conferma password',
     'user_invite_success_login' => 'Password impostata, ora dovresti essere in grado di effettuare il login utilizzando la password impostata per accedere a :appName!',
 
     // Multi-factor Authentication
-    'mfa_setup' => 'Imposta Autenticazione Multi-Fattore',
+    'mfa_setup' => 'Imposta autenticazione multi-fattore',
     'mfa_setup_desc' => 'Imposta l\'autenticazione multi-fattore come misura di sicurezza aggiuntiva per il tuo account.',
     'mfa_setup_configured' => 'Già configurata',
     'mfa_setup_reconfigure' => 'Riconfigura',
@@ -97,7 +97,7 @@
     'mfa_gen_backup_codes_desc' => 'Conserva l\'elenco di codici qui sotto in un luogo sicuro. Quando accedi al sistema potrai utilizzare uno dei codici come meccanismo di autenticazione secondario.',
     'mfa_gen_backup_codes_download' => 'Scarica codici',
     'mfa_gen_backup_codes_usage_warning' => 'Ogni codice può essere utilizzato solo una volta',
-    'mfa_gen_totp_title' => 'Impostazione App Mobile',
+    'mfa_gen_totp_title' => 'Impostazione app mobile',
     'mfa_gen_totp_desc' => 'Per utilizzare l\'autenticazione multi-fattore avrai bisogno di un\'applicazione mobile che supporti TOTP come Google Authenticator, Authy o Microsoft Authenticator.',
     'mfa_gen_totp_scan' => 'Scansiona il codice QR qui sotto utilizzando la tua app di autenticazione preferita per iniziare.',
     'mfa_gen_totp_verify_setup' => 'Verifica configurazione',
diff --git a/lang/it/common.php b/lang/it/common.php
index 113ddb01405..d45f93c5e42 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -31,7 +31,7 @@
     'update' => 'Aggiorna',
     'edit' => 'Modifica',
     'sort' => 'Ordina',
-    'move' => 'Muovi',
+    'move' => 'Sposta',
     'copy' => 'Copia',
     'reply' => 'Rispondi',
     'delete' => 'Elimina',
@@ -50,31 +50,31 @@
     'previous' => 'Precedente',
     'filter_active' => 'Filtro attivo:',
     'filter_clear' => 'Pulisci filtro',
-    'download' => 'Download',
+    'download' => 'Scarica',
     'open_in_tab' => 'Apri nella scheda',
     'open' => 'Apri',
 
     // Sort Options
-    'sort_options' => 'Opzioni Ordinamento',
+    'sort_options' => 'Opzioni ordinamento',
     'sort_direction_toggle' => 'Inverti direzione ordinamento',
-    'sort_ascending' => 'Ordine ascendente',
-    'sort_descending' => 'Ordine discendente',
+    'sort_ascending' => 'Ordine crescente',
+    'sort_descending' => 'Ordine decrescente',
     'sort_name' => 'Nome',
     'sort_default' => 'Predefinito',
-    'sort_created_at' => 'Data Creazione',
-    'sort_updated_at' => 'Data Aggiornamento',
+    'sort_created_at' => 'Data creazione',
+    'sort_updated_at' => 'Data aggiornamento',
 
     // Misc
-    'deleted_user' => 'Utente Eliminato',
+    'deleted_user' => 'Utente eliminato',
     'no_activity' => 'Nessuna attività da mostrare',
     'no_items' => 'Nessun elemento disponibile',
     'back_to_top' => 'Torna in alto',
     'skip_to_main_content' => 'Passa al contenuto principale',
-    'toggle_details' => 'Mostra Dettagli',
-    'toggle_thumbnails' => 'Mostra Miniature',
+    'toggle_details' => 'Mostra dettagli',
+    'toggle_thumbnails' => 'Mostra miniature',
     'details' => 'Dettagli',
-    'grid_view' => 'Visualizzazione Griglia',
-    'list_view' => 'Visualizzazione Lista',
+    'grid_view' => 'Visualizzazione griglia',
+    'list_view' => 'Visualizzazione lista',
     'default' => 'Predefinito',
     'breadcrumb' => 'Navigazione',
     'status' => 'Stato',
@@ -85,29 +85,29 @@
 
     // Header
     'homepage' => 'Homepage',
-    'header_menu_expand' => 'Espandi Menù Intestazione',
+    'header_menu_expand' => 'Espandi menù intestazione',
     'profile_menu' => 'Menù del profilo',
-    'view_profile' => 'Visualizza Profilo',
-    'edit_profile' => 'Modifica Profilo',
-    'dark_mode' => 'Modalità Scura',
-    'light_mode' => 'Modalità Chiara',
-    'global_search' => 'Ricerca Globale',
+    'view_profile' => 'Visualizza profilo',
+    'edit_profile' => 'Modifica profilo',
+    'dark_mode' => 'Modalità scura',
+    'light_mode' => 'Modalità chiara',
+    'global_search' => 'Ricerca globale',
 
     // Layout tabs
-    'tab_info' => 'Info',
-    'tab_info_label' => 'Tab: Mostra Informazioni Secondarie',
+    'tab_info' => 'Informazioni',
+    'tab_info_label' => 'Scheda: Mostra informazioni secondarie',
     'tab_content' => 'Contenuto',
-    'tab_content_label' => 'Tab: Mostra Contenuto Principale',
+    'tab_content_label' => 'Scheda: Mostra contenuto principale',
 
     // Email Content
-    'email_action_help' => 'Se hai problemi nel cliccare il pulsante ":actionText", copia e incolla lo URL sotto nel tuo browser:',
+    'email_action_help' => 'Se hai problemi nel cliccare il pulsante ":actionText", copia e incolla l\'URL qui sotto nel tuo browser:',
     'email_rights' => 'Tutti i diritti riservati',
 
     // Footer Link Options
     // Not directly used but available for convenience to users.
     'privacy_policy' => 'Norme sulla privacy',
-    'terms_of_service' => 'Condizioni del Servizio',
+    'terms_of_service' => 'Condizioni del servizio',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Cerca :appName',
 ];
diff --git a/lang/it/components.php b/lang/it/components.php
index b336893b5d2..e067db7033a 100644
--- a/lang/it/components.php
+++ b/lang/it/components.php
@@ -5,10 +5,10 @@
 return [
 
     // Image Manager
-    'image_select' => 'Selezione Immagine',
-    'image_list' => 'Elenco Immagini',
-    'image_details' => 'Dettagli Immagine',
-    'image_upload' => 'Carica Immagine',
+    'image_select' => 'Seleziona un\'immagine',
+    'image_list' => 'Elenco immagini',
+    'image_details' => 'Dettagli immagine',
+    'image_upload' => 'Carica immagine',
     'image_intro' => 'Qui è possibile selezionare e gestire le immagini che sono state precedentemente caricate nel sistema.',
     'image_intro_upload' => 'Carica una nuova immagine trascinando un file immagine in questa finestra oppure utilizzando il pulsante "Carica immagine" in alto.',
     'image_all' => 'Tutte',
@@ -20,27 +20,27 @@
     'image_uploaded_by' => 'Caricato da :userName',
     'image_uploaded_to' => 'Caricato su :pageLink',
     'image_updated' => 'Aggiornato il :updateDate',
-    'image_load_more' => 'Carica Altre',
-    'image_image_name' => 'Nome Immagine',
+    'image_load_more' => 'Carica altre',
+    'image_image_name' => 'Nome immagine',
     'image_delete_used' => 'Questa immagine è usata nelle pagine elencate.',
     'image_delete_confirm_text' => 'Sei sicuro di voler eliminare questa immagine?',
-    'image_select_image' => 'Seleziona Immagine',
+    'image_select_image' => 'Seleziona immagine',
     'image_dropzone' => 'Rilascia immagini o clicca qui per caricarle',
     'image_dropzone_drop' => 'Trascina qui le immagini da caricare',
-    'images_deleted' => 'Immagini Eliminate',
-    'image_preview' => 'Anteprima Immagine',
+    'images_deleted' => 'Immagini eliminate',
+    'image_preview' => 'Anteprima immagine',
     'image_upload_success' => 'Immagine caricata correttamente',
     'image_update_success' => 'Dettagli immagine aggiornati correttamente',
     'image_delete_success' => 'Immagine eliminata correttamente',
-    'image_replace' => 'Sostituisci Immagine',
+    'image_replace' => 'Sostituisci immagine',
     'image_replace_success' => 'File immagine aggiornato con successo',
-    'image_rebuild_thumbs' => 'Rigenera Variazioni Dimensione',
+    'image_rebuild_thumbs' => 'Rigenera variazioni dimensione',
     'image_rebuild_thumbs_success' => 'Variazioni di dimensione immagine ricostruite con successo!',
 
     // Code Editor
-    'code_editor' => 'Modifica Codice',
-    'code_language' => 'Linguaggio Codice',
-    'code_content' => 'Contenuto Codice',
-    'code_session_history' => 'Cronologia Sessione',
-    'code_save' => 'Salva Codice',
+    'code_editor' => 'Modifica codice',
+    'code_language' => 'Linguaggio codice',
+    'code_content' => 'Contenuto codice',
+    'code_session_history' => 'Cronologia sessione',
+    'code_save' => 'Salva codice',
 ];
diff --git a/lang/it/editor.php b/lang/it/editor.php
index dc05fcb4314..f9a6e47ae03 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -28,22 +28,22 @@
 
     // Toolbar
     'formats' => 'Formati',
-    'header_large' => 'Intestazione Grande',
-    'header_medium' => 'Intestazione Media',
-    'header_small' => 'Intestazione Piccola',
-    'header_tiny' => 'Intestazione Minuscola',
+    'header_large' => 'Intestazione grande',
+    'header_medium' => 'Intestazione media',
+    'header_small' => 'Intestazione piccola',
+    'header_tiny' => 'Intestazione minuscola',
     'paragraph' => 'Paragrafo',
     'blockquote' => 'Virgolettato',
     'inline_code' => 'Codice in linea',
     'callouts' => 'Didascalie',
-    'callout_information' => 'Informazioni',
+    'callout_information' => 'Informazione',
     'callout_success' => 'Fatto',
-    'callout_warning' => 'Attenzione',
+    'callout_warning' => 'Avviso',
     'callout_danger' => 'Pericolo',
     'bold' => 'Grassetto',
     'italic' => 'Corsivo',
     'underline' => 'Sottolineato',
-    'strikethrough' => 'Testo barrato',
+    'strikethrough' => 'Barrato',
     'superscript' => 'Apice',
     'subscript' => 'Pedice',
     'text_color' => 'Colore del testo',
@@ -61,20 +61,20 @@
     'indent_decrease' => 'Riduci rientro',
     'table' => 'Tabella',
     'insert_image' => 'Inserisci immagine',
-    'insert_image_title' => 'Inserisci/Modifica Immagine',
-    'insert_link' => 'Inserisci/Modifica Collegamento',
-    'insert_link_title' => 'Inserisci/Modifica Collegamento',
-    'insert_horizontal_line' => 'Inserisci Riga Orizzontale',
+    'insert_image_title' => 'Inserisci/modifica immagine',
+    'insert_link' => 'Inserisci/modifica collegamento',
+    'insert_link_title' => 'Inserisci/modifica collegamento',
+    'insert_horizontal_line' => 'Inserisci riga orizzontale',
     'insert_code_block' => 'Inserisci blocco di codice',
     'edit_code_block' => 'Modifica blocco di codice',
-    'insert_drawing' => 'Inserisci/Modifica Disegno',
+    'insert_drawing' => 'Inserisci/modifica disegno',
     'drawing_manager' => 'Gestore disegni',
     'insert_media' => 'Inserisci/modifica media',
-    'insert_media_title' => 'Inserisci/Modifica Media',
+    'insert_media_title' => 'Inserisci/modifica media',
     'clear_formatting' => 'Cancella formattazione',
     'source_code' => 'Codice sorgente',
-    'source_code_title' => 'Codice Sorgente',
-    'fullscreen' => 'Schermo Intero',
+    'source_code_title' => 'Codice sorgente',
+    'fullscreen' => 'Schermo intero',
     'image_options' => 'Opzioni immagine',
 
     // Tables
@@ -92,39 +92,39 @@
     'delete_column' => 'Elimina colonna',
     'table_cell' => 'Cella',
     'table_row' => 'Riga',
-    'table_column' => 'Column',
+    'table_column' => 'Colonna',
     'cell_properties' => 'Proprietà cella',
-    'cell_properties_title' => 'Proprietà Cella',
+    'cell_properties_title' => 'Proprietà cella',
     'cell_type' => 'Tipo di cella',
     'cell_type_cell' => 'Cella',
     'cell_scope' => 'Ambito',
     'cell_type_header' => 'Cella intestazione',
     'merge_cells' => 'Unisci celle',
     'split_cell' => 'Dividi cella',
-    'table_row_group' => 'Gruppo Riga',
-    'table_column_group' => 'Gruppo Colonna',
+    'table_row_group' => 'Gruppo riga',
+    'table_column_group' => 'Gruppo colonna',
     'horizontal_align' => 'Allineamento orizzontale',
     'vertical_align' => 'Allineamento verticale',
     'border_width' => 'Spessore bordo',
-    'border_style' => 'Stile del Bordo',
-    'border_color' => 'Colore del bordo',
+    'border_style' => 'Stile bordo',
+    'border_color' => 'Colore bordo',
     'row_properties' => 'Proprietà riga',
-    'row_properties_title' => 'Proprietà Riga',
+    'row_properties_title' => 'Proprietà riga',
     'cut_row' => 'Taglia riga',
     'copy_row' => 'Copia riga',
-    'paste_row_before' => 'Inserisci la riga prima',
+    'paste_row_before' => 'Incolla riga prima',
     'paste_row_after' => 'Incolla riga dopo',
-    'row_type' => 'Tipo di riga',
+    'row_type' => 'Tipo riga',
     'row_type_header' => 'Intestazione',
     'row_type_body' => 'Corpo',
-    'row_type_footer' => 'Piè di Pagina',
+    'row_type_footer' => 'Piè di pagina',
     'alignment' => 'Allineamento',
     'cut_column' => 'Taglia colonna',
     'copy_column' => 'Copia colonna',
     'paste_column_before' => 'Incolla colonna prima',
-    'paste_column_after' => 'Inserisci colonna dopo',
-    'cell_padding' => 'Spaziatura cella',
-    'cell_spacing' => 'Spaziatura celle',
+    'paste_column_after' => 'Incolla colonna dopo',
+    'cell_padding' => 'Padding cella',
+    'cell_spacing' => 'Spaziatura cella',
     'caption' => 'Didascalia',
     'show_caption' => 'Mostra didascalia',
     'constrain' => 'Mantieni proporzioni',
@@ -132,10 +132,10 @@
     'cell_border_dotted' => 'Punteggiato',
     'cell_border_dashed' => 'Tratteggiato',
     'cell_border_double' => 'Doppio',
-    'cell_border_groove' => 'Bordo Incassato',
-    'cell_border_ridge' => 'Bordo In Rilievo',
+    'cell_border_groove' => 'Bordo incassato',
+    'cell_border_ridge' => 'In rilievo',
     'cell_border_inset' => 'Sfondo Incassato',
-    'cell_border_outset' => 'Sfondo In rilievo',
+    'cell_border_outset' => 'Sfondo in rilievo',
     'cell_border_none' => 'Nessuno',
     'cell_border_hidden' => 'Nascosto',
 
@@ -155,17 +155,17 @@
     'insert_collapsible' => 'Inserisci blocco collassabile',
     'collapsible_unwrap' => 'Espandi',
     'edit_label' => 'Modifica etichetta',
-    'toggle_open_closed' => 'Espandi/Comprimi',
+    'toggle_open_closed' => 'Espandi/comprimi',
     'collapsible_edit' => 'Modifica blocco collassabile',
-    'toggle_label' => 'Attiva/Disattiva etichetta',
+    'toggle_label' => 'Attiva/disattiva etichetta',
 
     // About view
     'about' => 'Informazioni sull\'editor',
     'about_title' => 'Informazioni sull\'editor di WYSIWYG',
-    'editor_license' => 'Licenza & Copyright Dell\'Editor',
+    'editor_license' => 'Licenza e copyright dell\'editor',
     'editor_tiny_license' => 'Questo editor è realizzato usando :tinyLink che è fornito sotto la licenza MIT.',
     'editor_tiny_license_link' => 'I dettagli del copyright e della licenza di TinyMCE sono disponibili qui.',
-    'save_continue' => 'Salva Pagina E Continua',
+    'save_continue' => 'Salva pagina e continua',
     'callouts_cycle' => '(Continua a premere per passare da un tipo all\'altro)',
     'link_selector' => 'Link al contenuto',
     'shortcuts' => 'Scorciatoie',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 83ea85d266f..d7542b1ba11 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -11,36 +11,36 @@
     'recently_updated_pages' => 'Pagine aggiornate di recente',
     'recently_created_chapters' => 'Capitoli creati di recente',
     'recently_created_books' => 'Libri creati di recente',
-    'recently_created_shelves' => 'Librerie Create Di Recente',
+    'recently_created_shelves' => 'Librerie create di recente',
     'recently_update' => 'Aggiornati di recente',
     'recently_viewed' => 'Visti di recente',
-    'recent_activity' => 'Attività Recente',
+    'recent_activity' => 'Attività recente',
     'create_now' => 'Creane uno ora',
-    'revisions' => 'Versioni',
-    'meta_revision' => 'Versione #:revisionCount',
+    'revisions' => 'Revisioni',
+    'meta_revision' => 'Revisione #:revisionCount',
     'meta_created' => 'Creato :timeLength',
     'meta_created_name' => 'Creato :timeLength da :user',
     'meta_updated' => 'Aggiornato :timeLength',
     'meta_updated_name' => 'Aggiornato :timeLength da :user',
     'meta_owned_name' => 'Creati da :user',
     'meta_reference_count' => 'Referenziato da :count item|Referenziato da :count items',
-    'entity_select' => 'Selezione Entità',
+    'entity_select' => 'Seleziona l\'entità',
     'entity_select_lack_permission' => 'Non hai i permessi necessari per selezionare questo elemento',
     'images' => 'Immagini',
-    'my_recent_drafts' => 'Bozze Recenti',
+    'my_recent_drafts' => 'Bozze recenti',
     'my_recently_viewed' => 'Visti di recente',
-    'my_most_viewed_favourites' => 'I Miei Preferiti Più Visti',
-    'my_favourites' => 'I miei Preferiti',
+    'my_most_viewed_favourites' => 'I miei preferiti più visti',
+    'my_favourites' => 'I miei preferiti',
     'no_pages_viewed' => 'Non hai visto nessuna pagina',
-    'no_pages_recently_created' => 'Nessuna pagina è stata creata di recente',
-    'no_pages_recently_updated' => 'Nessuna pagina è stata aggiornata di recente',
+    'no_pages_recently_created' => 'Nessuna pagina creata di recente',
+    'no_pages_recently_updated' => 'Nessuna pagina aggiornata di recente',
     'export' => 'Esporta',
-    'export_html' => 'File Contenuto Web',
+    'export_html' => 'File contenuto web',
     'export_pdf' => 'File PDF',
     'export_text' => 'File di testo',
     'export_md' => 'File Markdown',
-    'default_template' => 'Modello di Pagina Predefinito',
-    'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tieni presente che questo verrà utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
+    'default_template' => 'Modello di pagina predefinito',
+    'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tieni presente che potrà essere utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
     'default_template_select' => 'Seleziona una pagina modello',
 
     // Permissions and restrictions
@@ -48,25 +48,25 @@
     'permissions_desc' => 'Imposta qui i permessi per sovrascrivere i permessi predefiniti forniti dai ruoli utente.',
     'permissions_book_cascade' => 'I permessi impostati sui libri si trasmettono automaticamente a cascata ai capitoli e alle pagine figli, a meno che non siano stati definiti permessi propri.',
     'permissions_chapter_cascade' => 'I permessi impostati sui capitoli si trasmettono automaticamente a cascata alle pagine figlie, a meno che non siano stati definiti permessi propri.',
-    'permissions_save' => 'Salva Permessi',
+    'permissions_save' => 'Salva permessi',
     'permissions_owner' => 'Proprietario',
-    'permissions_role_everyone_else' => 'Tutti Gli Altri',
+    'permissions_role_everyone_else' => 'Tutti gli altri',
     'permissions_role_everyone_else_desc' => 'Imposta i permessi per tutti i ruoli non specificamente sovrascritti.',
     'permissions_role_override' => 'Sovrascrivere i permessi per il ruolo',
     'permissions_inherit_defaults' => 'Eredita predefinite',
 
     // Search
-    'search_results' => 'Risultati Ricerca',
+    'search_results' => 'Risultati della ricerca',
     'search_total_results_found' => ':count risultato trovato|:count risultati trovati',
-    'search_clear' => 'Pulisci Ricerca',
+    'search_clear' => 'Pulisci ricerca',
     'search_no_pages' => 'Nessuna pagina corrisponde alla ricerca',
     'search_for_term' => 'Ricerca per :term',
-    'search_more' => 'Più risultati',
-    'search_advanced' => 'Ricerca Avanzata',
-    'search_terms' => 'Termini Ricerca',
-    'search_content_type' => 'Tipo di Contenuto',
-    'search_exact_matches' => 'Corrispondenza Esatta',
-    'search_tags' => 'Ricerche Tag',
+    'search_more' => 'Altri risultati',
+    'search_advanced' => 'Ricerca avanzata',
+    'search_terms' => 'Termini di ricerca',
+    'search_content_type' => 'Tipo di contenuto',
+    'search_exact_matches' => 'Corrispondenza esatta',
+    'search_tags' => 'Ricerche per tag',
     'search_options' => 'Opzioni',
     'search_viewed_by_me' => 'Visti da me',
     'search_not_viewed_by_me' => 'Non visti da me',
@@ -74,68 +74,68 @@
     'search_created_by_me' => 'Creati da me',
     'search_updated_by_me' => 'Aggiornati da me',
     'search_owned_by_me' => 'Creati da me',
-    'search_date_options' => 'Opzioni Data',
+    'search_date_options' => 'Opzioni data',
     'search_updated_before' => 'Aggiornati prima del',
     'search_updated_after' => 'Aggiornati dopo il',
     'search_created_before' => 'Creati prima del',
     'search_created_after' => 'Creati dopo il',
-    'search_set_date' => 'Imposta Data',
-    'search_update' => 'Aggiorna Ricerca',
+    'search_set_date' => 'Imposta data',
+    'search_update' => 'Aggiorna ricerca',
 
     // Shelves
     'shelf' => 'Libreria',
     'shelves' => 'Librerie',
-    'x_shelves' => ':count Libreria|:count Librerie',
-    'shelves_empty' => 'Nessuna libreria è stata creata',
-    'shelves_create' => 'Crea Nuova Libreria',
-    'shelves_popular' => 'Librerie Popolari',
-    'shelves_new' => 'Nuove Librerie',
-    'shelves_new_action' => 'Nuova Libreria',
+    'x_shelves' => ':count libreria|:count librerie',
+    'shelves_empty' => 'Nessuna libreria creata',
+    'shelves_create' => 'Crea nuova libreria',
+    'shelves_popular' => 'Librerie popolari',
+    'shelves_new' => 'Nuove librerie',
+    'shelves_new_action' => 'Nuova libreria',
     'shelves_popular_empty' => 'Le librerie più popolari appariranno qui.',
     'shelves_new_empty' => 'Le librerie create più di recente appariranno qui.',
-    'shelves_save' => 'Salva Libreria',
+    'shelves_save' => 'Salva libreria',
     'shelves_books' => 'Libri in questa libreria',
     'shelves_add_books' => 'Aggiungi libri a questa libreria',
     'shelves_drag_books' => 'Trascina i libri qui sotto per aggiungerli a questa libreria',
     'shelves_empty_contents' => 'Questa libreria non ha libri assegnati',
     'shelves_edit_and_assign' => 'Modifica la libreria per assegnare i libri',
-    'shelves_edit_named' => 'Modifica Libreria :name',
-    'shelves_edit' => 'Modifica Libreria',
-    'shelves_delete' => 'Elimina Libreria',
-    'shelves_delete_named' => 'Elimina Libreria :name',
+    'shelves_edit_named' => 'Modifica libreria :name',
+    'shelves_edit' => 'Modifica libreria',
+    'shelves_delete' => 'Elimina libreria',
+    'shelves_delete_named' => 'Elimina libreria :name',
     'shelves_delete_explain' => "La libreria ':name' verrà eliminata. I libri al suo interno non verranno eliminati.",
     'shelves_delete_confirmation' => 'Sei sicuro di voler eliminare questa libreria?',
-    'shelves_permissions' => 'Permessi Libreria',
-    'shelves_permissions_updated' => 'Permessi Libreria Aggiornati',
-    'shelves_permissions_active' => 'Permessi Libreria Attivi',
+    'shelves_permissions' => 'Permessi libreria',
+    'shelves_permissions_updated' => 'Permessi libreria aggiornati',
+    'shelves_permissions_active' => 'Permessi libreria attivi',
     'shelves_permissions_cascade_warning' => 'I permessi delle librerie non si estendono automaticamente ai libri contenuti. Questo perché un libro può essere presente su più scaffali. I permessi possono comunque essere copiati ai libri al suo interno usando l\'opzione sottostante.',
     'shelves_permissions_create' => 'Le autorizzazioni per la creazione di librerie sono utilizzate solo per copiare le autorizzazioni ai libri figli utilizzando l\'azione sottostante. Non controllano la capacità di creare libri.',
-    'shelves_copy_permissions_to_books' => 'Copia Permessi ai Libri',
-    'shelves_copy_permissions' => 'Copia Permessi',
+    'shelves_copy_permissions_to_books' => 'Copia permessi ai libri',
+    'shelves_copy_permissions' => 'Copia permessi',
     'shelves_copy_permissions_explain' => 'Verranno applicati tutti i permessi della libreria ai libri al suo interno. Prima dell\'attivazione, assicurati di aver salvato le modifiche ai permessi di questa libreria.',
     'shelves_copy_permission_success' => 'Permessi della libreria copiati in :count libri',
 
     // Books
     'book' => 'Libro',
     'books' => 'Libri',
-    'x_books' => ':count Libro|:count Libri',
-    'books_empty' => 'Nessun libro è stato creato',
-    'books_popular' => 'Libri Popolari',
-    'books_recent' => 'Libri Recenti',
-    'books_new' => 'Nuovi Libri',
-    'books_new_action' => 'Nuovo Libro',
+    'x_books' => ':count libro|:count libri',
+    'books_empty' => 'Nessun libro creato',
+    'books_popular' => 'Libri popolari',
+    'books_recent' => 'Libri recenti',
+    'books_new' => 'Nuovi libri',
+    'books_new_action' => 'Nuovo libro',
     'books_popular_empty' => 'I libri più popolari appariranno qui.',
-    'books_new_empty' => 'I libri creati più di recente appariranno qui.',
-    'books_create' => 'Crea Nuovo Libro',
-    'books_delete' => 'Elimina Libro',
+    'books_new_empty' => 'I libri creati di recente appariranno qui.',
+    'books_create' => 'Crea nuovo libro',
+    'books_delete' => 'Elimina libro',
     'books_delete_named' => 'Elimina il libro :bookName',
     'books_delete_explain' => 'Questo eliminerà il libro di nome \':bookName\'. Tutte le pagine e i capitoli saranno rimossi.',
     'books_delete_confirmation' => 'Sei sicuro di voler eliminare questo libro?',
-    'books_edit' => 'Modifica Libro',
+    'books_edit' => 'Modifica libro',
     'books_edit_named' => 'Modifica il libro :bookName',
-    'books_form_book_name' => 'Nome Libro',
-    'books_save' => 'Salva Libro',
-    'books_permissions' => 'Permessi Libro',
+    'books_form_book_name' => 'Nome libro',
+    'books_save' => 'Salva libro',
+    'books_permissions' => 'Permessi libro',
     'books_permissions_updated' => 'Permessi del libro aggiornati',
     'books_empty_contents' => 'Non ci sono pagine o capitoli per questo libro.',
     'books_empty_create_page' => 'Crea una nuova pagina',
@@ -143,16 +143,16 @@
     'books_empty_add_chapter' => 'Aggiungi un capitolo',
     'books_permissions_active' => 'Permessi libro attivi',
     'books_search_this' => 'Cerca in questo libro',
-    'books_navigation' => 'Navigazione Libro',
+    'books_navigation' => 'Navigazione libro',
     'books_sort' => 'Ordina il contenuto del libro',
     'books_sort_desc' => 'Sposta capitoli e pagine all\'interno di un libro per riorganizzarne il contenuto. È possibile aggiungere altri libri, per spostare facilmente capitoli e pagine da un libro all\'altro.',
     'books_sort_named' => 'Ordina il libro :bookName',
     'books_sort_name' => 'Ordina per Nome',
-    'books_sort_created' => 'Ordina per Data di Creazione',
-    'books_sort_updated' => 'Ordina per Data di Aggiornamento',
-    'books_sort_chapters_first' => 'Capitoli Per Primi',
-    'books_sort_chapters_last' => 'Capitoli Per Ultimi',
-    'books_sort_show_other' => 'Mostra Altri Libri',
+    'books_sort_created' => 'Ordina per Data di creazione',
+    'books_sort_updated' => 'Ordina per Data di aggiornamento',
+    'books_sort_chapters_first' => 'Capitoli per primi',
+    'books_sort_chapters_last' => 'Capitoli per ultimi',
+    'books_sort_show_other' => 'Mostra altri libri',
     'books_sort_save' => 'Salva il nuovo ordine',
     'books_sort_show_other_desc' => 'Aggiungi qui altri libri per includerli nell\'operazione di ordinamento e consentire una facile riorganizzazione incrociata dei libri.',
     'books_sort_move_up' => 'Muovi su',
@@ -165,126 +165,126 @@
     'books_sort_move_book_end' => 'Passa alla fine del libro',
     'books_sort_move_before_chapter' => 'Passa al capitolo precedente',
     'books_sort_move_after_chapter' => 'Passa al capitolo successivo',
-    'books_copy' => 'Copia Libro',
+    'books_copy' => 'Copia libro',
     'books_copy_success' => 'Libro copiato con successo',
 
     // Chapters
     'chapter' => 'Capitolo',
     'chapters' => 'Capitoli',
-    'x_chapters' => ':count Capitolo|:count Capitoli',
-    'chapters_popular' => 'Capitoli Popolari',
-    'chapters_new' => 'Nuovo Capitolo',
+    'x_chapters' => ':count capitolo|:count capitoli',
+    'chapters_popular' => 'Capitoli popolari',
+    'chapters_new' => 'Nuovo capitolo',
     'chapters_create' => 'Crea un nuovo capitolo',
-    'chapters_delete' => 'Elimina Capitolo',
+    'chapters_delete' => 'Elimina capitolo',
     'chapters_delete_named' => 'Elimina il capitolo :chapterName',
-    'chapters_delete_explain' => 'Procedendo si eliminerà il capitolo denominato \':chapterName\'. Anche le pagine all\'interno saranno eliminate.',
+    'chapters_delete_explain' => 'Verrà eliminato il capitolo denominato \':chapterName\'. Saranno eliminate anche le pagine all\'interno.',
     'chapters_delete_confirm' => 'Sei sicuro di voler eliminare questo capitolo?',
-    'chapters_edit' => 'Elimina Capitolo',
+    'chapters_edit' => 'Elimina capitolo',
     'chapters_edit_named' => 'Modifica il capitolo :chapterName',
-    'chapters_save' => 'Salva Capitolo',
-    'chapters_move' => 'Muovi Capitolo',
-    'chapters_move_named' => 'Muovi il capitolo :chapterName',
-    'chapters_copy' => 'Copia Capitolo',
+    'chapters_save' => 'Salva capitolo',
+    'chapters_move' => 'Sposta capitolo',
+    'chapters_move_named' => 'Sposta il capitolo :chapterName',
+    'chapters_copy' => 'Copia capitolo',
     'chapters_copy_success' => 'Capitolo copiato con successo',
-    'chapters_permissions' => 'Permessi Capitolo',
+    'chapters_permissions' => 'Permessi capitolo',
     'chapters_empty' => 'Non ci sono pagine in questo capitolo.',
-    'chapters_permissions_active' => 'Permessi Capitolo Attivi',
-    'chapters_permissions_success' => 'Permessi Capitolo Aggiornati',
+    'chapters_permissions_active' => 'Permessi capitolo attivi',
+    'chapters_permissions_success' => 'Permessi capitolo aggiornati',
     'chapters_search_this' => 'Cerca in questo capitolo',
-    'chapter_sort_book' => 'Ordina Libro',
+    'chapter_sort_book' => 'Ordina libro',
 
     // Pages
     'page' => 'Pagina',
     'pages' => 'Pagine',
-    'x_pages' => ':count Pagina|:count Pagine',
-    'pages_popular' => 'Pagine Popolari',
-    'pages_new' => 'Nuova Pagina',
+    'x_pages' => ':count pagina|:count pagine',
+    'pages_popular' => 'Pagine popolari',
+    'pages_new' => 'Nuova pagina',
     'pages_attachments' => 'Allegati',
-    'pages_navigation' => 'Navigazione Pagine',
-    'pages_delete' => 'Elimina Pagina',
+    'pages_navigation' => 'Navigazione pagine',
+    'pages_delete' => 'Elimina pagina',
     'pages_delete_named' => 'Elimina la pagina :pageName',
     'pages_delete_draft_named' => 'Elimina bozza della pagina :pageName',
-    'pages_delete_draft' => 'Elimina Bozza Pagina',
+    'pages_delete_draft' => 'Elimina bozza pagina',
     'pages_delete_success' => 'Pagina eliminata',
     'pages_delete_draft_success' => 'Bozza di una pagina eliminata',
     'pages_delete_warning_template' => 'Questa pagina è in uso come modello di pagina predefinito del libro o del capitolo. Questi libri o capitoli non avranno più un modello di pagina predefinito assegnato dopo che questa pagina sarà eliminata.',
     'pages_delete_confirm' => 'Sei sicuro di voler eliminare questa pagina?',
     'pages_delete_draft_confirm' => 'Sei sicuro di voler eliminare la bozza di questa pagina?',
     'pages_editing_named' => 'Modifica :pageName',
-    'pages_edit_draft_options' => 'Opzioni Bozza',
-    'pages_edit_save_draft' => 'Salva Bozza',
-    'pages_edit_draft' => 'Modifica Bozza della pagina',
-    'pages_editing_draft' => 'Modifica Bozza',
-    'pages_editing_page' => 'Modifica Pagina',
+    'pages_edit_draft_options' => 'Opzioni bozza',
+    'pages_edit_save_draft' => 'Salva bozza',
+    'pages_edit_draft' => 'Modifica bozza della pagina',
+    'pages_editing_draft' => 'Modifica bozza',
+    'pages_editing_page' => 'Modifica pagina',
     'pages_edit_draft_save_at' => 'Bozza salvata alle ',
-    'pages_edit_delete_draft' => 'Elimina Bozza',
+    'pages_edit_delete_draft' => 'Elimina bozza',
     'pages_edit_delete_draft_confirm' => 'Si è sicuri di voler eliminare le modifiche alla pagina bozza? Tutte le modifiche apportate dall\'ultimo salvataggio completo andranno perse e l\'editor verrà aggiornato con l\'ultimo stato di salvataggio della pagina non in bozza.',
-    'pages_edit_discard_draft' => 'Scarta Bozza',
+    'pages_edit_discard_draft' => 'Scarta bozza',
     'pages_edit_switch_to_markdown' => 'Passa all\'editor Markdown',
     'pages_edit_switch_to_markdown_clean' => '(Contenuto Chiaro)',
-    'pages_edit_switch_to_markdown_stable' => '(Contenuto Stabile)',
+    'pages_edit_switch_to_markdown_stable' => '(Contenuto stabile)',
     'pages_edit_switch_to_wysiwyg' => 'Passa all\'editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
-    'pages_edit_set_changelog' => 'Imposta Changelog',
+    'pages_edit_switch_to_new_wysiwyg' => 'Passa al nuovo WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In test alpha)',
+    'pages_edit_set_changelog' => 'Imposta changelog',
     'pages_edit_enter_changelog_desc' => 'Inserisci una breve descrizione dei cambiamenti che hai apportato',
-    'pages_edit_enter_changelog' => 'Inserisci Changelog',
-    'pages_editor_switch_title' => 'Cambia Editor',
+    'pages_edit_enter_changelog' => 'Inserisci changelog',
+    'pages_editor_switch_title' => 'Cambia editor',
     'pages_editor_switch_are_you_sure' => 'Sei sicuro di voler cambiare l\'editor di questa pagina?',
     'pages_editor_switch_consider_following' => 'Considera quanto segue quando si cambia editor:',
     'pages_editor_switch_consideration_a' => 'Una volta salvata, la nuova opzione di editor sarà utilizzata da chi modificherà in futuro, inclusi quelli che potrebbero non essere in grado di cambiare il tipo di editor da soli.',
     'pages_editor_switch_consideration_b' => 'Ciò può potenzialmente portare a una perdita di dettagli e sintassi in determinate circostanze.',
-    'pages_editor_switch_consideration_c' => 'Le modifiche al tag o al changelog, fatte dall\'ultimo salvataggio, non persisteranno in questa modifica.',
-    'pages_save' => 'Salva Pagina',
-    'pages_title' => 'Titolo Pagina',
-    'pages_name' => 'Nome Pagina',
+    'pages_editor_switch_consideration_c' => 'Le modifiche ai tag o al changelog, fatte dall\'ultimo salvataggio, non persisteranno in questa modifica.',
+    'pages_save' => 'Salva pagina',
+    'pages_title' => 'Titolo pagina',
+    'pages_name' => 'Nome pagina',
     'pages_md_editor' => 'Editor',
     'pages_md_preview' => 'Anteprima',
-    'pages_md_insert_image' => 'Inserisci Immagina',
-    'pages_md_insert_link' => 'Inserisci Link Entità',
-    'pages_md_insert_drawing' => 'Inserisci Disegno',
+    'pages_md_insert_image' => 'Inserisci immagine',
+    'pages_md_insert_link' => 'Inserisci collegamento entità',
+    'pages_md_insert_drawing' => 'Inserisci disegno',
     'pages_md_show_preview' => 'Visualizza anteprima',
     'pages_md_sync_scroll' => 'Sincronizza scorrimento anteprima',
-    'pages_drawing_unsaved' => 'Trovato Disegno Non Salvato',
-    'pages_drawing_unsaved_confirm' => 'Sono stati trovati i dati di un disegno non salvati da un precedente tentativo di salvataggio di disegno non riuscito. Ripristinare e continuare a modificare questo disegno non salvato?',
+    'pages_drawing_unsaved' => 'Trovato disegno non salvato',
+    'pages_drawing_unsaved_confirm' => 'Sono stati trovati i dati di un disegno non salvato da un precedente tentativo di salvataggio di disegno non riuscito. Ripristinare e continuare a modificare questo disegno non salvato?',
     'pages_not_in_chapter' => 'La pagina non è in un capitolo',
-    'pages_move' => 'Muovi Pagina',
-    'pages_copy' => 'Copia Pagina',
-    'pages_copy_desination' => 'Copia Destinazione',
+    'pages_move' => 'Sposta pagina',
+    'pages_copy' => 'Copia pagina',
+    'pages_copy_desination' => 'Copia destinazione',
     'pages_copy_success' => 'Pagina copiata correttamente',
-    'pages_permissions' => 'Permessi Pagina',
+    'pages_permissions' => 'Permessi pagina',
     'pages_permissions_success' => 'Permessi pagina aggiornati',
     'pages_revision' => 'Versione',
-    'pages_revisions' => 'Versioni Pagina',
-    'pages_revisions_desc' => 'Di seguito sono elencate tutte le revisioni precedenti di questa pagina. È possibile consultare, confrontare e ripristinare le vecchie versioni della pagina, se le autorizzazioni lo consentono. La cronologia completa della pagina potrebbe non essere riportata qui, poiché, a seconda della configurazione del sistema, le vecchie revisioni potrebbero essere cancellate automaticamente.',
-    'pages_revisions_named' => 'Versioni della pagina :pageName',
-    'pages_revision_named' => 'Versione della pagina :pageName',
+    'pages_revisions' => 'Revisioni pagina',
+    'pages_revisions_desc' => 'Di seguito sono elencate tutte le revisioni precedenti di questa pagina. È possibile consultare, confrontare e ripristinare le vecchie versioni della pagina, se hai i permessi. La cronologia completa della pagina potrebbe non essere riportata qui, poiché a seconda della configurazione del sistema le vecchie revisioni potrebbero essere cancellate automaticamente.',
+    'pages_revisions_named' => 'Revisioni della pagina :pageName',
+    'pages_revision_named' => 'Revisione della pagina :pageName',
     'pages_revision_restored_from' => 'Ripristinato da #:id; :summary',
-    'pages_revisions_created_by' => 'Creata Da',
-    'pages_revisions_date' => 'Data Versione',
+    'pages_revisions_created_by' => 'Creata da',
+    'pages_revisions_date' => 'Data versione',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Numero Revisione',
+    'pages_revisions_sort_number' => 'Numero revisione',
     'pages_revisions_numbered' => 'Revisione #:id',
-    'pages_revisions_numbered_changes' => 'Modifiche Revisione #:id',
-    'pages_revisions_editor' => 'Tipo Di Editor',
-    'pages_revisions_changelog' => 'Cambiamenti',
+    'pages_revisions_numbered_changes' => 'Modifiche revisione #:id',
+    'pages_revisions_editor' => 'Tipo di editor',
+    'pages_revisions_changelog' => 'Changelog',
     'pages_revisions_changes' => 'Cambiamenti',
-    'pages_revisions_current' => 'Versione Corrente',
+    'pages_revisions_current' => 'Versione corrente',
     'pages_revisions_preview' => 'Anteprima',
     'pages_revisions_restore' => 'Ripristina',
-    'pages_revisions_none' => 'Questa pagina non ha versioni',
-    'pages_copy_link' => 'Copia Link',
+    'pages_revisions_none' => 'Questa pagina non ha revisioni',
+    'pages_copy_link' => 'Copia collegamento',
     'pages_edit_content_link' => 'Vai alla sezione nell\'editor',
-    'pages_pointer_enter_mode' => 'Accedi alla modalità di selezione della sezione',
-    'pages_pointer_label' => 'Opzioni Sezione Pagina',
-    'pages_pointer_permalink' => 'Permalink Sezione Pagina',
-    'pages_pointer_include_tag' => 'Sezione Pagina Includi Tag',
-    'pages_pointer_toggle_link' => 'Modalità Permalink, Premi per mostrare includi tag',
+    'pages_pointer_enter_mode' => 'Vai alla modalità di selezione della sezione',
+    'pages_pointer_label' => 'Opzioni sezione pagina',
+    'pages_pointer_permalink' => 'Sezione pagina Permalink',
+    'pages_pointer_include_tag' => 'Sezione pagina includi tag',
+    'pages_pointer_toggle_link' => 'Modalità Permalink, premi per mostrare includi tag',
     'pages_pointer_toggle_include' => 'Modalità includi tag, premi per mostrare permalink',
-    'pages_permissions_active' => 'Permessi Pagina Attivi',
+    'pages_permissions_active' => 'Permessi pagina attivi',
     'pages_initial_revision' => 'Pubblicazione iniziale',
     'pages_references_update_revision' => 'Aggiornamento automatico di sistema dei collegamenti interni',
-    'pages_initial_name' => 'Nuova Pagina',
+    'pages_initial_name' => 'Nuova pagina',
     'pages_editing_draft_notification' => 'Stai modificando una bozza che è stata salvata il :timeDiff.',
     'pages_draft_edited_notification' => 'Questa pagina è stata aggiornata. Si consiglia di scartare questa bozza.',
     'pages_draft_page_changed_since_creation' => 'Questa pagina è stata aggiornata da quando è stata creata questa bozza. Si consiglia di scartare questa bozza o di fare attenzione a non sovrascrivere alcun cambiamento alla pagina.',
@@ -297,15 +297,15 @@
     ],
     'pages_draft_discarded' => 'Bozza scartata! L\'editor è stato aggiornato con il contenuto della pagina corrente',
     'pages_draft_deleted' => 'Bozza eliminata! L\'editor è stato aggiornato con il contenuto della pagina corrente',
-    'pages_specific' => 'Pagina Specifica',
-    'pages_is_template' => 'Template Pagina',
+    'pages_specific' => 'Pagina specifica',
+    'pages_is_template' => 'Modello pagina',
 
     // Editor Sidebar
     'toggle_sidebar' => 'Attiva/disattiva barra laterale',
-    'page_tags' => 'Tag Pagina',
-    'chapter_tags' => 'Tag Capitolo',
-    'book_tags' => 'Tag Libro',
-    'shelf_tags' => 'Tag Libreria',
+    'page_tags' => 'Tag pagina',
+    'chapter_tags' => 'Tag capitolo',
+    'book_tags' => 'Tag libro',
+    'shelf_tags' => 'Tag libreria',
     'tag' => 'Tag',
     'tags' =>  'Tag',
     'tags_index_desc' => 'I tag possono essere applicati ai contenuti del sistema per applicare una forma flessibile di categorizzazione. I tag possono avere una chiave e un valore, il valore è opzionale. Una volta applicati, i contenuti possono essere cercati utilizzando il nome e il valore del tag.',
@@ -314,7 +314,7 @@
     'tags_explain' => "Aggiungi tag per categorizzare meglio il contenuto. \n Puoi assegnare un valore ai tag per una migliore organizzazione.",
     'tags_add' => 'Aggiungi un altro tag',
     'tags_remove' => 'Rimuovi questo tag',
-    'tags_usages' => 'Utilizzo totale dei tag',
+    'tags_usages' => 'Utilizzi totali dei tag',
     'tags_assigned_pages' => 'Assegnato alle pagine',
     'tags_assigned_chapters' => 'Assegnato ai capitoli',
     'tags_assigned_books' => 'Assegnato ai libri',
@@ -325,22 +325,22 @@
     'tags_view_existing_tags' => 'Usa i tag esistenti',
     'tags_list_empty_hint' => 'I tag possono essere assegnati tramite la barra laterale dell\'editor di pagina o durante la modifica dei dettagli di un libro, di un capitolo o di una libreria.',
     'attachments' => 'Allegati',
-    'attachments_explain' => 'Carica alcuni file o allega link per visualizzarli nella pagina. Questi sono visibili nella barra laterale della pagina.',
+    'attachments_explain' => 'Carica alcuni file o allega dei collegamenti per visualizzarli nella pagina. Questi sono visibili nella barra laterale della pagina.',
     'attachments_explain_instant_save' => 'I cambiamenti qui sono salvati istantaneamente.',
-    'attachments_upload' => 'Carica File',
-    'attachments_link' => 'Allega Link',
+    'attachments_upload' => 'Carica file',
+    'attachments_link' => 'Allega collegamento',
     'attachments_upload_drop' => 'In alternativa puoi trascinare un file qui per caricarlo come allegato.',
-    'attachments_set_link' => 'Imposta Link',
-    'attachments_delete' => 'Sei sicuro di voler eliminare questo allegato?',
+    'attachments_set_link' => 'Imposta collegamento',
+    'attachments_delete' => 'Vuoi davvero eliminare questo allegato?',
     'attachments_dropzone' => 'Trascina qui i file da caricare',
     'attachments_no_files' => 'Nessun file è stato caricato',
-    'attachments_explain_link' => 'Puoi allegare un link se preferisci non caricare un file. Questo può essere un link a un\'altra pagina o a un file nel cloud.',
-    'attachments_link_name' => 'Nome Link',
-    'attachment_link' => 'Link allegato',
-    'attachments_link_url' => 'Link al file',
+    'attachments_explain_link' => 'Puoi allegare un collegamento se preferisci non caricare un file. Questo può essere un collegamento a un\'altra pagina o a un file nel cloud.',
+    'attachments_link_name' => 'Nome collegamento',
+    'attachment_link' => 'Collegamento allegato',
+    'attachments_link_url' => 'Collegamento al file',
     'attachments_link_url_hint' => 'Url del sito o del file',
     'attach' => 'Allega',
-    'attachments_insert_link' => 'Aggiungi link allegato alla pagina',
+    'attachments_insert_link' => 'Aggiungi allegato collegamento alla pagina',
     'attachments_edit_file' => 'Modifica file',
     'attachments_edit_file_name' => 'Nome file',
     'attachments_edit_drop_upload' => 'Trascina file qui o clicca per caricare e sovrascrivere',
@@ -349,7 +349,7 @@
     'attachments_deleted' => 'Allegato eliminato',
     'attachments_file_uploaded' => 'File caricato correttamente',
     'attachments_file_updated' => 'File aggiornato correttamente',
-    'attachments_link_attached' => 'Link allegato correttamente alla pagina',
+    'attachments_link_attached' => 'Collegamento allegato correttamente alla pagina',
     'templates' => 'Modello',
     'templates_set_as_template' => 'La pagina è un modello',
     'templates_explain_set_as_template' => 'Puoi impostare questa pagina come modello in modo da utilizzare il suo contenuto quando si creano altre pagine. Gli altri utenti potranno utilizzare questo modello se avranno i permessi di visualizzazione per questa pagina.',
@@ -359,7 +359,7 @@
 
     // Profile View
     'profile_user_for_x' => 'Utente da :time',
-    'profile_created_content' => 'Contenuti Creati',
+    'profile_created_content' => 'Contenuti creati',
     'profile_not_created_pages' => ':userName non ha creato pagine',
     'profile_not_created_chapters' => ':userName non ha creato capitoli',
     'profile_not_created_books' => ':userName non ha creato libri',
@@ -368,18 +368,18 @@
     // Comments
     'comment' => 'Commento',
     'comments' => 'Commenti',
-    'comment_add' => 'Aggiungi Commento',
+    'comment_add' => 'Aggiungi commento',
     'comment_placeholder' => 'Scrivi un commento',
-    'comment_count' => '{0} Nessun Commento|{1} 1 Commento|[2,*] :count Commenti',
-    'comment_save' => 'Salva Commento',
-    'comment_new' => 'Nuovo Commento',
+    'comment_count' => '{0} Nessun commento|{1} 1 commento|[2,*] :count commenti',
+    'comment_save' => 'Salva commento',
+    'comment_new' => 'Nuovo commento',
     'comment_created' => 'ha commentato :createDiff',
     'comment_updated' => 'Aggiornato :updateDiff da :username',
     'comment_updated_indicator' => 'Aggiornato',
     'comment_deleted_success' => 'Commento eliminato',
     'comment_created_success' => 'Commento aggiunto',
     'comment_updated_success' => 'Commento aggiornato',
-    'comment_delete_confirm' => 'Sei sicuro di voler elminare questo commento?',
+    'comment_delete_confirm' => 'Sei sicuro di voler eliminare questo commento?',
     'comment_in_reply_to' => 'In risposta a :commentId',
     'comment_editor_explain' => 'Ecco i commenti che sono stati lasciati in questa pagina. I commenti possono essere aggiunti e gestiti quando si visualizza la pagina salvata.',
 
@@ -394,18 +394,18 @@
     'copy_consider_owner' => 'Diventerai il proprietario di tutti i contenuti copiati.',
     'copy_consider_images' => 'I file delle immagini delle pagine non saranno duplicati e le immagini originali manterranno la loro relazione con la pagina su cui sono state originariamente caricate.',
     'copy_consider_attachments' => 'Gli allegati della pagina non saranno copiati.',
-    'copy_consider_access' => 'Un cambiamento di posizione, di proprietario o di autorizzazioni può far sì che questo contenuto sia accessibile a chi prima non aveva accesso.',
+    'copy_consider_access' => 'Un cambiamento di posizione, di proprietario o di autorizzazioni potrebbe rendere questo contenuto accessibile a chi prima non aveva accesso.',
 
     // Conversions
-    'convert_to_shelf' => 'Converti in Libreria',
+    'convert_to_shelf' => 'Converti in libreria',
     'convert_to_shelf_contents_desc' => 'Puoi convertire questo libro in una nuova libreria con gli stessi contenuti. I capitoli contenuti in questo libro saranno convertiti in nuovi libri. Se il libro contiene pagine che non fanno parte di un capitolo, questo libro verrà rinominato e conterrà tali pagine e diventerà parte della nuova libreria.',
     'convert_to_shelf_permissions_desc' => 'Tutti i permessi impostati su questo libro saranno copiati sulla nuova libreria e su tutti i nuovi libri figli che non hanno i loro permessi applicati. Nota che i permessi delle librerie non si trasmettono automaticamente ai contenuti al loro interno, come avviene per i libri.',
-    'convert_book' => 'Converti Libro',
+    'convert_book' => 'Converti libro',
     'convert_book_confirm' => 'Sei sicuro di voler convertire questo libro?',
     'convert_undo_warning' => 'Questo non può essere annullato con la stessa facilità.',
     'convert_to_book' => 'Converti in libro',
     'convert_to_book_desc' => 'È possibile convertire questo capitolo in un nuovo libro con gli stessi contenuti. Tutti i permessi impostati su questo capitolo saranno copiati nel nuovo libro, ma i permessi ereditati dal libro principale non saranno copiati, il che potrebbe portare a una modifica del controllo degli accessi.',
-    'convert_chapter' => 'Converti Capitolo',
+    'convert_chapter' => 'Converti capitolo',
     'convert_chapter_confirm' => 'Sei sicuro di voler convertire questo capitolo?',
 
     // References
@@ -415,25 +415,25 @@
 
     // Watch Options
     'watch' => 'Osserva',
-    'watch_title_default' => 'Preferenze Predefinite',
-    'watch_desc_default' => 'Ripristina la visualizzazione delle tue preferenze di notifica predefinite.',
+    'watch_title_default' => 'Preferenze predefinite',
+    'watch_desc_default' => 'Ripristina l\'osservazione alle tue preferenze di notifica predefinite.',
     'watch_title_ignore' => 'Ignora',
-    'watch_desc_ignore' => 'Ignora tutte le notifiche, comprese quelle dalle preferenze di livello utente.',
-    'watch_title_new' => 'Nuove Pagine',
+    'watch_desc_ignore' => 'Ignora tutte le notifiche, incluse quelle dalle preferenze a livello utente.',
+    'watch_title_new' => 'Nuove pagine',
     'watch_desc_new' => 'Notifica quando viene creata una nuova pagina all\'interno di questo elemento.',
-    'watch_title_updates' => 'Tutti Gli Aggiornamenti Della Pagina',
-    'watch_desc_updates' => 'Notificare su tutte le nuove pagine e modifiche di pagina.',
-    'watch_desc_updates_page' => 'Notifica su tutte le modifiche alla pagina.',
-    'watch_title_comments' => 'Tutti Gli Aggiornamenti Della Pagina E Commenti',
-    'watch_desc_comments' => 'Notificare su tutte le nuove pagine, modifiche di pagina e nuovi commenti.',
-    'watch_desc_comments_page' => 'Notificare le modifiche alla pagina e i nuovi commenti.',
+    'watch_title_updates' => 'Tutti gli aggiornamenti della pagina',
+    'watch_desc_updates' => 'Notifica tutte le nuove pagine e le modifiche alle pagine.',
+    'watch_desc_updates_page' => 'Notifica tutte le modifiche alla pagine.',
+    'watch_title_comments' => 'Tutti gli aggiornamenti delle pagine e i commenti',
+    'watch_desc_comments' => 'Notifica tutte le nuove pagine, le modifiche alle pagine e i nuovi commenti.',
+    'watch_desc_comments_page' => 'Notifica le modifiche alla pagina e i nuovi commenti.',
     'watch_change_default' => 'Modifica le preferenze di notifica predefinite',
     'watch_detail_ignore' => 'Ignorare le notifiche',
-    'watch_detail_new' => 'In attesa di nuove pagine',
+    'watch_detail_new' => 'Osservare le nuove pagine',
     'watch_detail_updates' => 'Osservare le nuove pagine e gli aggiornamenti',
     'watch_detail_comments' => 'Osservare le nuove pagine, aggiornamenti e commenti',
-    'watch_detail_parent_book' => 'Osservare tramite il libro madre',
-    'watch_detail_parent_book_ignore' => 'Ignorato tramite il libro madre',
-    'watch_detail_parent_chapter' => 'Osservare tramite il capitolo madre',
-    'watch_detail_parent_chapter_ignore' => 'Ignorato tramite il capitolo madre',
+    'watch_detail_parent_book' => 'Osservare tramite il libro che lo contiene',
+    'watch_detail_parent_book_ignore' => 'Ignorare tramite il libro che lo contiene',
+    'watch_detail_parent_chapter' => 'Osservare tramite il capitolo che lo contiene',
+    'watch_detail_parent_chapter_ignore' => 'Ignorato tramite il capitolo che lo contiene',
 ];
diff --git a/lang/it/errors.php b/lang/it/errors.php
index fe8c4c17c33..5120a6d71e9 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Non puoi eliminare l\'unico admin',
     'users_cannot_delete_guest' => 'Non puoi eliminare l\'utente ospite',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Impossibile creare l\'utente poiché l\'invio dell\'email di invito non è riuscito',
 
     // Roles
     'role_cannot_be_edited' => 'Questo ruolo non può essere modificato',
diff --git a/lang/ja/common.php b/lang/ja/common.php
index 097974d8e96..4f15bafbb9d 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => '利用規約',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => ':appName を検索',
 ];
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index eda30371bac..489032835cc 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(クリーンなコンテンツ)',
     'pages_edit_switch_to_markdown_stable' => '(安定したコンテンツ)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYGエディタに切り替え',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => '新しいWYSIWYGエディタに切り替える',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(アルファテスト版)',
     'pages_edit_set_changelog' => '編集内容についての説明',
     'pages_edit_enter_changelog_desc' => 'どのような変更を行ったのかを記録してください',
     'pages_edit_enter_changelog' => '編集内容を入力',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index e1d7709651c..4eba6365934 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '唯一の管理者を削除することはできません',
     'users_cannot_delete_guest' => 'ゲストユーザを削除することはできません',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => '招待メールの送信に失敗したため、ユーザーを作成できませんでした。',
 
     // Roles
     'role_cannot_be_edited' => 'この役割は編集できません',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index 7bdcd3c610f..bcf34795622 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -6,26 +6,26 @@
 return [
 
     // Pages
-    'page_create'                 => '생성된 페이지',
+    'page_create'                 => '페이지 생성',
     'page_create_notification'    => '페이지가 성공적으로 생성되었습니다.',
-    'page_update'                 => '페이지 업데이트됨',
+    'page_update'                 => '페이지 업데이트',
     'page_update_notification'    => '페이지가 성공적으로 업데이트되었습니다.',
-    'page_delete'                 => '삭제된 페이지',
+    'page_delete'                 => '페이지 삭제',
     'page_delete_notification'    => '페이지가 성공적으로 삭제되었습니다.',
-    'page_restore'                => '복구된 페이지',
+    'page_restore'                => '페이지 복원',
     'page_restore_notification'   => '페이지가 성공적으로 복원되었습니다.',
-    'page_move'                   => '이동된 페이지',
+    'page_move'                   => '페이지 이동',
     'page_move_notification'      => '페이지가 성공적으로 이동되었습니다.',
 
     // Chapters
-    'chapter_create'              => '챕터 만들기',
+    'chapter_create'              => '챕터 생성',
     'chapter_create_notification' => '챕터가 성공적으로 생성되었습니다.',
-    'chapter_update'              => '업데이트된 챕터',
-    'chapter_update_notification' => '챕터가 성공적으로 업데이트되었습니다.',
-    'chapter_delete'              => '삭제된 챕터',
+    'chapter_update'              => '챕터 수정',
+    'chapter_update_notification' => '챕터가 성공적으로 수정되었습니다.',
+    'chapter_delete'              => '챕터 삭제',
     'chapter_delete_notification' => '챕터가 성공적으로 삭제되었습니다.',
-    'chapter_move'                => '이동된 챕터',
-    'chapter_move_notification' => '챕터를 성공적으로 이동했습니다.',
+    'chapter_move'                => '챕터 이동',
+    'chapter_move_notification' => '페이지가 성공적으로 이동되었습니다.',
 
     // Books
     'book_create'                 => '생성된 책',
@@ -36,7 +36,7 @@
     'book_update_notification'    => '책이 성공적으로 업데이트되었습니다.',
     'book_delete'                 => '삭제된 책',
     'book_delete_notification'    => '책이 성공적으로 삭제되었습니다.',
-    'book_sort'                   => '정렬된 책',
+    'book_sort'                   => '책 정렬',
     'book_sort_notification'      => '책이 성공적으로 재정렬되었습니다.',
 
     // Bookshelves
@@ -51,8 +51,8 @@
 
     // Revisions
     'revision_restore' => '복구된 리비전',
-    'revision_delete' => '삭제된 리비전',
-    'revision_delete_notification' => '리비전을 성공적으로 삭제하였습니다.',
+    'revision_delete' => '버전 삭제',
+    'revision_delete_notification' => '버전 삭제 성공',
 
     // Favourites
     'favourite_add_notification' => '":name" 을 북마크에 추가하였습니다.',
@@ -62,14 +62,14 @@
     'watch_update_level_notification' => '주시 환경설정이 성공적으로 업데이트되었습니다.',
 
     // Auth
-    'auth_login' => '로그인 됨',
+    'auth_login' => '로그인 완료',
     'auth_register' => '신규 사용자 등록',
     'auth_password_reset_request' => '사용자 비밀번호 초기화 요청',
     'auth_password_reset_update' => '사용자 비밀번호 초기화',
-    'mfa_setup_method' => '구성된 MFA 방법',
+    'mfa_setup_method' => '다중인증(MFA)이 구성되었습니다.',
     'mfa_setup_method_notification' => '다중 인증 설정함',
     'mfa_remove_method' => 'MFA 메서드 제거',
-    'mfa_remove_method_notification' => '다중 인증 해제함',
+    'mfa_remove_method_notification' => '다중인증(MFA)이 성공적으로 제거되었습니다.',
 
     // Settings
     'settings_update' => '설정 변경',
@@ -80,7 +80,7 @@
     'webhook_create' => '웹 훅 만들기',
     'webhook_create_notification' => '웹 훅 생성함',
     'webhook_update' => '웹 훅 수정하기',
-    'webhook_update_notification' => '웹 훅 수정함',
+    'webhook_update_notification' => '웹훅 설정이 수정되었습니다.',
     'webhook_delete' => '웹 훅 지우기',
     'webhook_delete_notification' => '웹 훅 삭제함',
 
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 844fe91d1af..843b02b0fb7 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Algemene voorwaarden',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Zoek in :appName',
 ];
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 9daec1c1fc4..36955c8e1f5 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -18,8 +18,8 @@
     'create_now' => 'Maak er nu één',
     'revisions' => 'Revisies',
     'meta_revision' => 'Revisie #:revisionCount',
-    'meta_created' => 'Gemaakt op: :timeLength',
-    'meta_created_name' => 'Gemaakt op :timeLength door :user',
+    'meta_created' => 'Gemaakt: :timeLength',
+    'meta_created_name' => 'Gemaakt: :timeLength door :user',
     'meta_updated' => 'Bijgewerkt: :timeLength',
     'meta_updated_name' => 'Bijgewerkt: :timeLength door :user',
     'meta_owned_name' => 'Eigendom van :user',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index a6ec53883ea..0c83cb7f31f 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Je kunt niet het enige admin account verwijderen',
     'users_cannot_delete_guest' => 'Je kunt het gastaccount niet verwijderen',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Kan de gebruiker niet aanmaken, uitnodigingsmail kon niet worden verzonden',
 
     // Roles
     'role_cannot_be_edited' => 'Deze rol kan niet bewerkt worden',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 3f997c404bc..1d0b14b5cf5 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -208,7 +208,7 @@
     'users_avatar' => 'Avatar',
     'users_avatar_desc' => 'Selecteer een afbeelding om deze gebruiker voor te stellen. Deze moet ongeveer 256px breed en vierkant zijn.',
     'users_preferred_language' => 'Voorkeurstaal',
-    'users_preferred_language_desc' => 'Deze optie wijzigt de taal die gebruikt wordt voor de gebruikersinterface. Dit heeft geen invloed op door gebruiker gemaakte inhoud.',
+    'users_preferred_language_desc' => 'Deze optie wijzigt de taal die gebruikt wordt voor de gebruikersinterface. Dit heeft geen invloed op door gebruikers gemaakte inhoud.',
     'users_social_accounts' => 'Sociale media accounts',
     'users_social_accounts_desc' => 'Bekijk de status van de verbonden socialmedia-accounts voor deze gebruiker. socialmedia-accounts kunnen worden gebruikt naast het primaire authenticatiesysteem voor systeemtoegang.',
     'users_social_accounts_info' => 'Hier kun je je andere accounts koppelen om sneller en eenvoudiger in te loggen. Als je hier een account loskoppelt, wordt de eerder gemachtigde toegang niet ingetrokken. Je kunt de toegang intrekken via je profielinstellingen op het gekoppelde socialemedia-account zelf.',
diff --git a/lang/pl/auth.php b/lang/pl/auth.php
index e56e8ab43f1..445f8198af8 100644
--- a/lang/pl/auth.php
+++ b/lang/pl/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplikacja mobilna',
     'mfa_option_totp_desc' => 'Aby korzystać z uwierzytelniania wieloskładnikowego, potrzebujesz aplikacji mobilnej, która obsługuje TOTP, takiej jak Google Authenticator, Authy lub Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Kody zapasowe',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Generuje zestaw jednorazowych kodów zapasowych, które wprowadzisz przy logowaniu, aby zweryfikować Twoją tożsamość. Upewnij się, że przechowujesz je w bezpiecznym miejscu.',
     'mfa_gen_confirm_and_enable' => 'Potwierdź i włącz',
     'mfa_gen_backup_codes_title' => 'Ustawienia kopii zapasowych kodów',
     'mfa_gen_backup_codes_desc' => 'Przechowuj poniższą listę kodów w bezpiecznym miejscu. Przy dostępie do systemu będziesz mógł użyć jednego z kodów jako drugiego mechanizmu uwierzytelniania.',
diff --git a/lang/pl/common.php b/lang/pl/common.php
index 4d5a346b2b5..a690cdb041e 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Warunki usługi',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Szukaj :appName',
 ];
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 0941a1fb992..f0ff5a251f5 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Czysta zawartość)',
     'pages_edit_switch_to_markdown_stable' => '(Statyczna zawartość)',
     'pages_edit_switch_to_wysiwyg' => 'Przełącz na edytor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Przełącz na nowy WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa testy)',
     'pages_edit_set_changelog' => 'Ustaw dziennik zmian',
     'pages_edit_enter_changelog_desc' => 'Opisz zmiany, które zostały wprowadzone',
     'pages_edit_enter_changelog' => 'Wyświetl dziennik zmian',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index 5fb78a98334..71f592ad683 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Funkcja społecznościowa nie została odnaleziona',
     'social_driver_not_configured' => 'Ustawienia konta :socialAccount nie są poprawne.',
     'invite_token_expired' => 'Zaproszenie wygasło. Możesz spróować zresetować swoje hasło.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Użytkownik dla tej akcji nie został znaleziony.',
 
     // System
     'path_not_writable' => 'Zapis do ścieżki :filePath jest niemożliwy. Upewnij się że aplikacja ma prawa do zapisu plików na serwerze.',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nie możesz usunąć jedynego administratora',
     'users_cannot_delete_guest' => 'Nie możesz usunąć użytkownika-gościa',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Nie można utworzyć użytkownika, ponieważ nie udało się wysłać wiadomości e-mail z zaproszeniem',
 
     // Roles
     'role_cannot_be_edited' => 'Ta rola nie może być edytowana',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index 80ca8e9a310..42e20af87df 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -31,7 +31,7 @@
     'header_large' => 'Cabeçalho Grande',
     'header_medium' => 'Cabeçalho Médio',
     'header_small' => 'Cabeçalho Pequeno',
-    'header_tiny' => 'Cabeçalho Pequeno',
+    'header_tiny' => 'Cabeçalho Minúsculo',
     'paragraph' => 'Parágrafo',
     'blockquote' => 'Bloco de Citação',
     'inline_code' => 'Código embutido',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 41d4516b900..d23f677d9f5 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -6,88 +6,88 @@
 return [
 
     // Shared
-    'recently_created' => 'Criados Recentemente',
-    'recently_created_pages' => 'Páginas Criadas Recentemente',
-    'recently_updated_pages' => 'Páginas Atualizadas Recentemente',
-    'recently_created_chapters' => 'Capítulos Criados Recentemente',
-    'recently_created_books' => 'Livros Criados Recentemente',
+    'recently_created' => 'Criado Recentemente',
+    'recently_created_pages' => 'Páginas Recentemente Criadas',
+    'recently_updated_pages' => 'Páginas Recentemente Atualizadas',
+    'recently_created_chapters' => 'Capítulos Recentemente Criados',
+    'recently_created_books' => 'Livros Recentemente Criados',
     'recently_created_shelves' => 'Prateleiras Criadas Recentemente',
-    'recently_update' => 'Atualizados Recentemente',
-    'recently_viewed' => 'Visualizados Recentemente',
-    'recent_activity' => 'Atividade Recente',
-    'create_now' => 'Criar um agora',
+    'recently_update' => 'Recentemente Atualizado',
+    'recently_viewed' => 'Recentemente Visualizado',
+    'recent_activity' => 'Atividades recentes',
+    'create_now' => 'Criar agora',
     'revisions' => 'Revisões',
-    'meta_revision' => 'Revisão #:revisionCount',
-    'meta_created' => 'Criado :timeLength',
-    'meta_created_name' => 'Criado :timeLength por :user',
-    'meta_updated' => 'Atualizado :timeLength',
-    'meta_updated_name' => 'Atualizado :timeLength por :user',
-    'meta_owned_name' => 'De :user',
-    'meta_reference_count' => 'Referenciado no item :count|Referenciado nos items :count',
-    'entity_select' => 'Seleção de Entidade',
-    'entity_select_lack_permission' => 'Você não tem as permissões necessárias para selecionar este item',
+    'meta_revision' => 'Revisão #: contagem de revisões',
+    'meta_created' => 'Criado: duração de tempo',
+    'meta_created_name' => 'Criado: duração de tempo por usuário',
+    'meta_updated' => 'Atualizado: duração de tempo',
+    'meta_updated_name' => 'Atualizado: duração de tempo por usuário',
+    'meta_owned_name' => 'Propriedade de: usuário',
+    'meta_reference_count' => 'Referenciado por: count item|Referenciado por: count itens',
+    'entity_select' => 'Seleção de entidade',
+    'entity_select_lack_permission' => 'Você não tem as permissões necessárias para selecionar este ‘item’',
     'images' => 'Imagens',
     'my_recent_drafts' => 'Meus Rascunhos Recentes',
-    'my_recently_viewed' => 'Visualizados por mim Recentemente',
+    'my_recently_viewed' => 'Visualizados Recentemente',
     'my_most_viewed_favourites' => 'Meus Favoritos Mais Visualizados',
-    'my_favourites' => 'Meus Favoritos',
+    'my_favourites' => 'Favoritos',
     'no_pages_viewed' => 'Você não visualizou nenhuma página',
-    'no_pages_recently_created' => 'Nenhuma página criada recentemente',
-    'no_pages_recently_updated' => 'Nenhuma página atualizada recentemente',
+    'no_pages_recently_created' => 'Nenhuma página foi criada recentemente',
+    'no_pages_recently_updated' => 'Nenhuma página foi atualizada recentemente',
     'export' => 'Exportar',
-    'export_html' => 'Arquivo Web Contained',
+    'export_html' => 'Arquivo Web Contido',
     'export_pdf' => 'Arquivo PDF',
-    'export_text' => 'Arquivo Texto',
-    'export_md' => 'Arquivos para remarcar',
-    'default_template' => 'Modelo de página padrão',
-    'default_template_explain' => 'Atribuir o modelo de página que sera usado como padrão para todas as páginas criadas neste livro. Tenha em mente que isto será usado apenas se o criador da página tiver acesso de visualização ao modelo de página escolhido.',
-    'default_template_select' => 'Selecione o modelo de página',
+    'export_text' => 'Arquivo de texto simples',
+    'export_md' => 'Arquivo de redução',
+    'default_template' => 'Modelo padrão de página',
+    'default_template_explain' => 'Atribuir o modelo de página que será usado como padrão para todas as páginas criadas neste livro. Tenha em mente que isto será usado apenas se o criador da página tiver acesso de visualização ao modelo de página escolhido.',
+    'default_template_select' => 'Selecione uma página de modelo',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
-    'permissions_desc' => 'Defina as permissões aqui para substituir as permissões padrão fornecidas pelas funções do usuário.',
-    'permissions_book_cascade' => 'As permissões definidas em livros serão automaticamente em cascata para capítulos e páginas filho, a menos que tenham suas próprias permissões definidas.',
-    'permissions_chapter_cascade' => 'As permissões definidas nos capítulos serão automaticamente em cascata para as páginas filhas, a menos que tenham suas próprias permissões definidas.',
-    'permissions_save' => 'Salvar Permissões',
-    'permissions_owner' => 'Proprietário',
-    'permissions_role_everyone_else' => 'Todos os outros',
-    'permissions_role_everyone_else_desc' => 'Defina permissões para todas as funções não especificamente substituídas.',
-    'permissions_role_override' => 'Substituir permissões para função',
-    'permissions_inherit_defaults' => 'Herdar padrões',
+    'permissions_desc' => 'Defina permissões aqui para substituir as permissões padrão fornecidas pelas funções do usuário.',
+    'permissions_book_cascade' => 'As permissões definidas nos livros serão automaticamente transmitidas aos capítulos e páginas secundários, a menos que eles tenham suas próprias permissões definidas.',
+    'permissions_chapter_cascade' => 'As permissões definidas nos capítulos serão automaticamente transmitidas às páginas secundárias, a menos que elas tenham suas próprias permissões definidas.',
+    'permissions_save' => 'Salvar permissões',
+    'permissions_owner' => 'Dono',
+    'permissions_role_everyone_else' => 'Todos os Outros',
+    'permissions_role_everyone_else_desc' => 'Defina permissões para todas as funções não substituídas especificamente.',
+    'permissions_role_override' => 'Substituir permissões para o papel',
+    'permissions_inherit_defaults' => 'Herdar Padrões',
 
     // Search
     'search_results' => 'Resultado(s) da Pesquisa',
-    'search_total_results_found' => ':count resultado encontrado|:count resultados encontrados',
+    'search_total_results_found' => ':count resultado encontrado (contagem de resultados) :count resultados totais encontrados',
     'search_clear' => 'Limpar Pesquisa',
-    'search_no_pages' => 'Nenhuma página corresponde à pesquisa',
-    'search_for_term' => 'Pesquisar por :term',
-    'search_more' => 'Mais Resultados',
-    'search_advanced' => 'Pesquisa Avançada',
-    'search_terms' => 'Termos da Pesquisa',
-    'search_content_type' => 'Tipo de Conteúdo',
-    'search_exact_matches' => 'Correspondências Exatas',
-    'search_tags' => 'Persquisar Tags',
+    'search_no_pages' => 'Nenhuma página corresponde a esta pesquisa',
+    'search_for_term' => 'Pesquisar por: termo',
+    'search_more' => 'Mais resultados',
+    'search_advanced' => 'Pesquisa avançada',
+    'search_terms' => 'Termos da pesquisa',
+    'search_content_type' => 'Categoria de conteúdo',
+    'search_exact_matches' => 'Correspondências exatas',
+    'search_tags' => 'Etiqueta de buscas',
     'search_options' => 'Opções',
-    'search_viewed_by_me' => 'Visualizado por mim',
-    'search_not_viewed_by_me' => 'Não visualizado por mim',
-    'search_permissions_set' => 'Permissão definida',
-    'search_created_by_me' => 'Criado por mim',
-    'search_updated_by_me' => 'Atualizado por mim',
-    'search_owned_by_me' => 'Possuído por mim',
+    'search_viewed_by_me' => 'Visto por mim',
+    'search_not_viewed_by_me' => 'Não visto por mim',
+    'search_permissions_set' => 'Permissões definidas',
+    'search_created_by_me' => 'Criados por mim',
+    'search_updated_by_me' => 'Atualizados por mim',
+    'search_owned_by_me' => 'Meus itens',
     'search_date_options' => 'Opções de Data',
-    'search_updated_before' => 'Atualizado antes de',
-    'search_updated_after' => 'Atualizado depois de',
-    'search_created_before' => 'Criado antes de',
-    'search_created_after' => 'Criado depois de',
+    'search_updated_before' => 'Atualizado antes',
+    'search_updated_after' => 'Atualizado depois',
+    'search_created_before' => 'Criado antes',
+    'search_created_after' => 'Criado depois',
     'search_set_date' => 'Definir Data',
-    'search_update' => 'Refazer Pesquisa',
+    'search_update' => 'Atualizar pesquisa',
 
     // Shelves
     'shelf' => 'Estante',
     'shelves' => 'Estantes',
-    'x_shelves' => ':count Estante|:count Estantes',
+    'x_shelves' => ': count Estante|: count Estantes',
     'shelves_empty' => 'Nenhuma estante foi criada',
-    'shelves_create' => 'Criar Nova Estante',
+    'shelves_create' => 'Criar Prateleira',
     'shelves_popular' => 'Estantes Populares',
     'shelves_new' => 'Novas Estantes',
     'shelves_new_action' => 'Nova Estante',
@@ -111,7 +111,7 @@
     'shelves_permissions_cascade_warning' => 'As permissões nas prateleiras não são automaticamente em cascata para os livros contidos. Isso ocorre porque um livro pode existir em várias prateleiras. No entanto, as permissões podem ser copiadas para livros filhos usando a opção encontrada abaixo.',
     'shelves_permissions_create' => 'As permissões de criação de prateleira são usadas apenas para copiar livros filhos usando a ação abaixo. Eles não controlam a capacidade de criar livros.',
     'shelves_copy_permissions_to_books' => 'Copiar Permissões para Livros',
-    'shelves_copy_permissions' => 'Copiar Permissões',
+    'shelves_copy_permissions' => 'Copiar permissões',
     'shelves_copy_permissions_explain' => 'Isso aplicará as configurações de permissão atuais desta estante a todos os livros contidos nela. Antes de ativar, verifique se todas as alterações nas permissões desta prateleira foram salvas.',
     'shelves_copy_permission_success' => 'Permissões de prateleira copiadas para :count books',
 
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Conteúdo Limpo)',
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o Editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Mudar para o novo WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(No Teste Alfa)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por você',
     'pages_edit_enter_changelog' => 'Insira Alterações',
diff --git a/lang/tk/activities.php b/lang/tk/activities.php
new file mode 100644
index 00000000000..092398ef0e1
--- /dev/null
+++ b/lang/tk/activities.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'created page',
+    'page_create_notification'    => 'Page successfully created',
+    'page_update'                 => 'updated page',
+    'page_update_notification'    => 'Page successfully updated',
+    'page_delete'                 => 'deleted page',
+    'page_delete_notification'    => 'Page successfully deleted',
+    'page_restore'                => 'restored page',
+    'page_restore_notification'   => 'Page successfully restored',
+    'page_move'                   => 'moved page',
+    'page_move_notification'      => 'Page successfully moved',
+
+    // Chapters
+    'chapter_create'              => 'created chapter',
+    'chapter_create_notification' => 'Chapter successfully created',
+    'chapter_update'              => 'updated chapter',
+    'chapter_update_notification' => 'Chapter successfully updated',
+    'chapter_delete'              => 'deleted chapter',
+    'chapter_delete_notification' => 'Chapter successfully deleted',
+    'chapter_move'                => 'moved chapter',
+    'chapter_move_notification' => 'Chapter successfully moved',
+
+    // Books
+    'book_create'                 => 'created book',
+    'book_create_notification'    => 'Book successfully created',
+    'book_create_from_chapter'              => 'converted chapter to book',
+    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
+    'book_update'                 => 'updated book',
+    'book_update_notification'    => 'Book successfully updated',
+    'book_delete'                 => 'deleted book',
+    'book_delete_notification'    => 'Book successfully deleted',
+    'book_sort'                   => 'sorted book',
+    'book_sort_notification'      => 'Book successfully re-sorted',
+
+    // Bookshelves
+    'bookshelf_create'            => 'created shelf',
+    'bookshelf_create_notification'    => 'Shelf successfully created',
+    'bookshelf_create_from_book'    => 'converted book to shelf',
+    'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
+    'bookshelf_update'                 => 'updated shelf',
+    'bookshelf_update_notification'    => 'Shelf successfully updated',
+    'bookshelf_delete'                 => 'deleted shelf',
+    'bookshelf_delete_notification'    => 'Shelf successfully deleted',
+
+    // Revisions
+    'revision_restore' => 'restored revision',
+    'revision_delete' => 'deleted revision',
+    'revision_delete_notification' => 'Revision successfully deleted',
+
+    // Favourites
+    'favourite_add_notification' => '":name" has been added to your favourites',
+    'favourite_remove_notification' => '":name" has been removed from your favourites',
+
+    // Watching
+    'watch_update_level_notification' => 'Watch preferences successfully updated',
+
+    // Auth
+    'auth_login' => 'logged in',
+    'auth_register' => 'registered as new user',
+    'auth_password_reset_request' => 'requested user password reset',
+    'auth_password_reset_update' => 'reset user password',
+    'mfa_setup_method' => 'configured MFA method',
+    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
+    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+
+    // Settings
+    'settings_update' => 'updated settings',
+    'settings_update_notification' => 'Settings successfully updated',
+    'maintenance_action_run' => 'ran maintenance action',
+
+    // Webhooks
+    'webhook_create' => 'created webhook',
+    'webhook_create_notification' => 'Webhook successfully created',
+    'webhook_update' => 'updated webhook',
+    'webhook_update_notification' => 'Webhook successfully updated',
+    'webhook_delete' => 'deleted webhook',
+    'webhook_delete_notification' => 'Webhook successfully deleted',
+
+    // Users
+    'user_create' => 'created user',
+    'user_create_notification' => 'User successfully created',
+    'user_update' => 'updated user',
+    'user_update_notification' => 'User successfully updated',
+    'user_delete' => 'deleted user',
+    'user_delete_notification' => 'User successfully removed',
+
+    // API Tokens
+    'api_token_create' => 'created API token',
+    'api_token_create_notification' => 'API token successfully created',
+    'api_token_update' => 'updated API token',
+    'api_token_update_notification' => 'API token successfully updated',
+    'api_token_delete' => 'deleted API token',
+    'api_token_delete_notification' => 'API token successfully deleted',
+
+    // Roles
+    'role_create' => 'created role',
+    'role_create_notification' => 'Role successfully created',
+    'role_update' => 'updated role',
+    'role_update_notification' => 'Role successfully updated',
+    'role_delete' => 'deleted role',
+    'role_delete_notification' => 'Role successfully deleted',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'emptied recycle bin',
+    'recycle_bin_restore' => 'restored from recycle bin',
+    'recycle_bin_destroy' => 'removed from recycle bin',
+
+    // Comments
+    'commented_on'                => 'commented on',
+    'comment_create'              => 'added comment',
+    'comment_update'              => 'updated comment',
+    'comment_delete'              => 'deleted comment',
+
+    // Other
+    'permissions_update'          => 'updated permissions',
+];
diff --git a/lang/tk/auth.php b/lang/tk/auth.php
new file mode 100644
index 00000000000..57f0cb5c632
--- /dev/null
+++ b/lang/tk/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'These credentials do not match our records.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+    // Login & Register
+    'sign_up' => 'Sign up',
+    'log_in' => 'Log in',
+    'log_in_with' => 'Login with :socialDriver',
+    'sign_up_with' => 'Sign up with :socialDriver',
+    'logout' => 'Logout',
+
+    'name' => 'Name',
+    'username' => 'Username',
+    'email' => 'Email',
+    'password' => 'Password',
+    'password_confirm' => 'Confirm Password',
+    'password_hint' => 'Must be at least 8 characters',
+    'forgot_password' => 'Forgot Password?',
+    'remember_me' => 'Remember Me',
+    'ldap_email_hint' => 'Please enter an email to use for this account.',
+    'create_account' => 'Create Account',
+    'already_have_account' => 'Already have an account?',
+    'dont_have_account' => 'Don\'t have an account?',
+    'social_login' => 'Social Login',
+    'social_registration' => 'Social Registration',
+    'social_registration_text' => 'Register and sign in using another service.',
+
+    'register_thanks' => 'Thanks for registering!',
+    'register_confirm' => 'Please check your email and click the confirmation button to access :appName.',
+    'registrations_disabled' => 'Registrations are currently disabled',
+    'registration_email_domain_invalid' => 'That email domain does not have access to this application',
+    'register_success' => 'Thanks for signing up! You are now registered and signed in.',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'Attempting Login',
+    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
+    'auto_init_start_link' => 'Proceed with authentication',
+
+    // Password Reset
+    'reset_password' => 'Reset Password',
+    'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
+    'reset_password_send_button' => 'Send Reset Link',
+    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
+    'reset_password_success' => 'Your password has been successfully reset.',
+    'email_reset_subject' => 'Reset your :appName password',
+    'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
+    'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'Confirm your email on :appName',
+    'email_confirm_greeting' => 'Thanks for joining :appName!',
+    'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
+    'email_confirm_action' => 'Confirm Email',
+    'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
+    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
+    'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
+    'email_confirm_thanks' => 'Thanks for confirming!',
+    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+
+    'email_not_confirmed' => 'Email Address Not Confirmed',
+    'email_not_confirmed_text' => 'Your email address has not yet been confirmed.',
+    'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
+    'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
+    'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
+
+    // User Invite
+    'user_invite_email_subject' => 'You have been invited to join :appName!',
+    'user_invite_email_greeting' => 'An account has been created for you on :appName.',
+    'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
+    'user_invite_email_action' => 'Set Account Password',
+    'user_invite_page_welcome' => 'Welcome to :appName!',
+    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
+    'user_invite_page_confirm_button' => 'Confirm Password',
+    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'Setup Multi-Factor Authentication',
+    'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'mfa_setup_configured' => 'Already configured',
+    'mfa_setup_reconfigure' => 'Reconfigure',
+    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
+    'mfa_setup_action' => 'Setup',
+    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_option_totp_title' => 'Mobile App',
+    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Backup Codes',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
+    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
+    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_download' => 'Download Codes',
+    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
+    'mfa_gen_totp_title' => 'Mobile App Setup',
+    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_verify_setup' => 'Verify Setup',
+    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
+    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_verify_access' => 'Verify Access',
+    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_no_methods' => 'No Methods Configured',
+    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_use_totp' => 'Verify using a mobile app',
+    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
+    'mfa_verify_backup_code' => 'Backup Code',
+    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
+    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
+    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+];
diff --git a/lang/tk/common.php b/lang/tk/common.php
new file mode 100644
index 00000000000..b05169bb2c4
--- /dev/null
+++ b/lang/tk/common.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'Cancel',
+    'close' => 'Close',
+    'confirm' => 'Confirm',
+    'back' => 'Back',
+    'save' => 'Save',
+    'continue' => 'Continue',
+    'select' => 'Select',
+    'toggle_all' => 'Toggle All',
+    'more' => 'More',
+
+    // Form Labels
+    'name' => 'Name',
+    'description' => 'Description',
+    'role' => 'Role',
+    'cover_image' => 'Cover image',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+
+    // Actions
+    'actions' => 'Actions',
+    'view' => 'View',
+    'view_all' => 'View All',
+    'new' => 'New',
+    'create' => 'Create',
+    'update' => 'Update',
+    'edit' => 'Edit',
+    'sort' => 'Sort',
+    'move' => 'Move',
+    'copy' => 'Copy',
+    'reply' => 'Reply',
+    'delete' => 'Delete',
+    'delete_confirm' => 'Confirm Deletion',
+    'search' => 'Search',
+    'search_clear' => 'Clear Search',
+    'reset' => 'Reset',
+    'remove' => 'Remove',
+    'add' => 'Add',
+    'configure' => 'Configure',
+    'manage' => 'Manage',
+    'fullscreen' => 'Fullscreen',
+    'favourite' => 'Favourite',
+    'unfavourite' => 'Unfavourite',
+    'next' => 'Next',
+    'previous' => 'Previous',
+    'filter_active' => 'Active Filter:',
+    'filter_clear' => 'Clear Filter',
+    'download' => 'Download',
+    'open_in_tab' => 'Open in Tab',
+    'open' => 'Open',
+
+    // Sort Options
+    'sort_options' => 'Sort Options',
+    'sort_direction_toggle' => 'Sort Direction Toggle',
+    'sort_ascending' => 'Sort Ascending',
+    'sort_descending' => 'Sort Descending',
+    'sort_name' => 'Name',
+    'sort_default' => 'Default',
+    'sort_created_at' => 'Created Date',
+    'sort_updated_at' => 'Updated Date',
+
+    // Misc
+    'deleted_user' => 'Deleted User',
+    'no_activity' => 'No activity to show',
+    'no_items' => 'No items available',
+    'back_to_top' => 'Back to top',
+    'skip_to_main_content' => 'Skip to main content',
+    'toggle_details' => 'Toggle Details',
+    'toggle_thumbnails' => 'Toggle Thumbnails',
+    'details' => 'Details',
+    'grid_view' => 'Grid View',
+    'list_view' => 'List View',
+    'default' => 'Default',
+    'breadcrumb' => 'Breadcrumb',
+    'status' => 'Status',
+    'status_active' => 'Active',
+    'status_inactive' => 'Inactive',
+    'never' => 'Never',
+    'none' => 'None',
+
+    // Header
+    'homepage' => 'Homepage',
+    'header_menu_expand' => 'Expand Header Menu',
+    'profile_menu' => 'Profile Menu',
+    'view_profile' => 'View Profile',
+    'edit_profile' => 'Edit Profile',
+    'dark_mode' => 'Dark Mode',
+    'light_mode' => 'Light Mode',
+    'global_search' => 'Global Search',
+
+    // Layout tabs
+    'tab_info' => 'Info',
+    'tab_info_label' => 'Tab: Show Secondary Information',
+    'tab_content' => 'Content',
+    'tab_content_label' => 'Tab: Show Primary Content',
+
+    // Email Content
+    'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:',
+    'email_rights' => 'All rights reserved',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'Privacy Policy',
+    'terms_of_service' => 'Terms of Service',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
+];
diff --git a/lang/tk/components.php b/lang/tk/components.php
new file mode 100644
index 00000000000..c33b1d0b791
--- /dev/null
+++ b/lang/tk/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'Image Select',
+    'image_list' => 'Image List',
+    'image_details' => 'Image Details',
+    'image_upload' => 'Upload Image',
+    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
+    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_all' => 'All',
+    'image_all_title' => 'View all images',
+    'image_book_title' => 'View images uploaded to this book',
+    'image_page_title' => 'View images uploaded to this page',
+    'image_search_hint' => 'Search by image name',
+    'image_uploaded' => 'Uploaded :uploadedDate',
+    'image_uploaded_by' => 'Uploaded by :userName',
+    'image_uploaded_to' => 'Uploaded to :pageLink',
+    'image_updated' => 'Updated :updateDate',
+    'image_load_more' => 'Load More',
+    'image_image_name' => 'Image Name',
+    'image_delete_used' => 'This image is used in the pages below.',
+    'image_delete_confirm_text' => 'Are you sure you want to delete this image?',
+    'image_select_image' => 'Select Image',
+    'image_dropzone' => 'Drop images or click here to upload',
+    'image_dropzone_drop' => 'Drop images here to upload',
+    'images_deleted' => 'Images Deleted',
+    'image_preview' => 'Image Preview',
+    'image_upload_success' => 'Image uploaded successfully',
+    'image_update_success' => 'Image details successfully updated',
+    'image_delete_success' => 'Image successfully deleted',
+    'image_replace' => 'Replace Image',
+    'image_replace_success' => 'Image file successfully updated',
+    'image_rebuild_thumbs' => 'Regenerate Size Variations',
+    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+
+    // Code Editor
+    'code_editor' => 'Edit Code',
+    'code_language' => 'Code Language',
+    'code_content' => 'Code Content',
+    'code_session_history' => 'Session History',
+    'code_save' => 'Save Code',
+];
diff --git a/lang/tk/editor.php b/lang/tk/editor.php
new file mode 100644
index 00000000000..de9aa0ece10
--- /dev/null
+++ b/lang/tk/editor.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'General',
+    'advanced' => 'Advanced',
+    'none' => 'None',
+    'cancel' => 'Cancel',
+    'save' => 'Save',
+    'close' => 'Close',
+    'undo' => 'Undo',
+    'redo' => 'Redo',
+    'left' => 'Left',
+    'center' => 'Center',
+    'right' => 'Right',
+    'top' => 'Top',
+    'middle' => 'Middle',
+    'bottom' => 'Bottom',
+    'width' => 'Width',
+    'height' => 'Height',
+    'More' => 'More',
+    'select' => 'Select...',
+
+    // Toolbar
+    'formats' => 'Formats',
+    'header_large' => 'Large Header',
+    'header_medium' => 'Medium Header',
+    'header_small' => 'Small Header',
+    'header_tiny' => 'Tiny Header',
+    'paragraph' => 'Paragraph',
+    'blockquote' => 'Blockquote',
+    'inline_code' => 'Inline code',
+    'callouts' => 'Callouts',
+    'callout_information' => 'Information',
+    'callout_success' => 'Success',
+    'callout_warning' => 'Warning',
+    'callout_danger' => 'Danger',
+    'bold' => 'Bold',
+    'italic' => 'Italic',
+    'underline' => 'Underline',
+    'strikethrough' => 'Strikethrough',
+    'superscript' => 'Superscript',
+    'subscript' => 'Subscript',
+    'text_color' => 'Text color',
+    'custom_color' => 'Custom color',
+    'remove_color' => 'Remove color',
+    'background_color' => 'Background color',
+    'align_left' => 'Align left',
+    'align_center' => 'Align center',
+    'align_right' => 'Align right',
+    'align_justify' => 'Justify',
+    'list_bullet' => 'Bullet list',
+    'list_numbered' => 'Numbered list',
+    'list_task' => 'Task list',
+    'indent_increase' => 'Increase indent',
+    'indent_decrease' => 'Decrease indent',
+    'table' => 'Table',
+    'insert_image' => 'Insert image',
+    'insert_image_title' => 'Insert/Edit Image',
+    'insert_link' => 'Insert/edit link',
+    'insert_link_title' => 'Insert/Edit Link',
+    'insert_horizontal_line' => 'Insert horizontal line',
+    'insert_code_block' => 'Insert code block',
+    'edit_code_block' => 'Edit code block',
+    'insert_drawing' => 'Insert/edit drawing',
+    'drawing_manager' => 'Drawing manager',
+    'insert_media' => 'Insert/edit media',
+    'insert_media_title' => 'Insert/Edit Media',
+    'clear_formatting' => 'Clear formatting',
+    'source_code' => 'Source code',
+    'source_code_title' => 'Source Code',
+    'fullscreen' => 'Fullscreen',
+    'image_options' => 'Image options',
+
+    // Tables
+    'table_properties' => 'Table properties',
+    'table_properties_title' => 'Table Properties',
+    'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
+    'insert_row_before' => 'Insert row before',
+    'insert_row_after' => 'Insert row after',
+    'delete_row' => 'Delete row',
+    'insert_column_before' => 'Insert column before',
+    'insert_column_after' => 'Insert column after',
+    'delete_column' => 'Delete column',
+    'table_cell' => 'Cell',
+    'table_row' => 'Row',
+    'table_column' => 'Column',
+    'cell_properties' => 'Cell properties',
+    'cell_properties_title' => 'Cell Properties',
+    'cell_type' => 'Cell type',
+    'cell_type_cell' => 'Cell',
+    'cell_scope' => 'Scope',
+    'cell_type_header' => 'Header cell',
+    'merge_cells' => 'Merge cells',
+    'split_cell' => 'Split cell',
+    'table_row_group' => 'Row Group',
+    'table_column_group' => 'Column Group',
+    'horizontal_align' => 'Horizontal align',
+    'vertical_align' => 'Vertical align',
+    'border_width' => 'Border width',
+    'border_style' => 'Border style',
+    'border_color' => 'Border color',
+    'row_properties' => 'Row properties',
+    'row_properties_title' => 'Row Properties',
+    'cut_row' => 'Cut row',
+    'copy_row' => 'Copy row',
+    'paste_row_before' => 'Paste row before',
+    'paste_row_after' => 'Paste row after',
+    'row_type' => 'Row type',
+    'row_type_header' => 'Header',
+    'row_type_body' => 'Body',
+    'row_type_footer' => 'Footer',
+    'alignment' => 'Alignment',
+    'cut_column' => 'Cut column',
+    'copy_column' => 'Copy column',
+    'paste_column_before' => 'Paste column before',
+    'paste_column_after' => 'Paste column after',
+    'cell_padding' => 'Cell padding',
+    'cell_spacing' => 'Cell spacing',
+    'caption' => 'Caption',
+    'show_caption' => 'Show caption',
+    'constrain' => 'Constrain proportions',
+    'cell_border_solid' => 'Solid',
+    'cell_border_dotted' => 'Dotted',
+    'cell_border_dashed' => 'Dashed',
+    'cell_border_double' => 'Double',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'None',
+    'cell_border_hidden' => 'Hidden',
+
+    // Images, links, details/summary & embed
+    'source' => 'Source',
+    'alt_desc' => 'Alternative description',
+    'embed' => 'Embed',
+    'paste_embed' => 'Paste your embed code below:',
+    'url' => 'URL',
+    'text_to_display' => 'Text to display',
+    'title' => 'Title',
+    'open_link' => 'Open link',
+    'open_link_in' => 'Open link in...',
+    'open_link_current' => 'Current window',
+    'open_link_new' => 'New window',
+    'remove_link' => 'Remove link',
+    'insert_collapsible' => 'Insert collapsible block',
+    'collapsible_unwrap' => 'Unwrap',
+    'edit_label' => 'Edit label',
+    'toggle_open_closed' => 'Toggle open/closed',
+    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_label' => 'Toggle label',
+
+    // About view
+    'about' => 'About the editor',
+    'about_title' => 'About the WYSIWYG Editor',
+    'editor_license' => 'Editor License & Copyright',
+    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
+    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'save_continue' => 'Save Page & Continue',
+    'callouts_cycle' => '(Keep pressing to toggle through types)',
+    'link_selector' => 'Link to content',
+    'shortcuts' => 'Shortcuts',
+    'shortcut' => 'Shortcut',
+    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'Description',
+];
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
new file mode 100644
index 00000000000..35e6f050bb8
--- /dev/null
+++ b/lang/tk/entities.php
@@ -0,0 +1,439 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'Recently Created',
+    'recently_created_pages' => 'Recently Created Pages',
+    'recently_updated_pages' => 'Recently Updated Pages',
+    'recently_created_chapters' => 'Recently Created Chapters',
+    'recently_created_books' => 'Recently Created Books',
+    'recently_created_shelves' => 'Recently Created Shelves',
+    'recently_update' => 'Recently Updated',
+    'recently_viewed' => 'Recently Viewed',
+    'recent_activity' => 'Recent Activity',
+    'create_now' => 'Create one now',
+    'revisions' => 'Revisions',
+    'meta_revision' => 'Revision #:revisionCount',
+    'meta_created' => 'Created :timeLength',
+    'meta_created_name' => 'Created :timeLength by :user',
+    'meta_updated' => 'Updated :timeLength',
+    'meta_updated_name' => 'Updated :timeLength by :user',
+    'meta_owned_name' => 'Owned by :user',
+    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'entity_select' => 'Entity Select',
+    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'images' => 'Images',
+    'my_recent_drafts' => 'My Recent Drafts',
+    'my_recently_viewed' => 'My Recently Viewed',
+    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
+    'my_favourites' => 'My Favourites',
+    'no_pages_viewed' => 'You have not viewed any pages',
+    'no_pages_recently_created' => 'No pages have been recently created',
+    'no_pages_recently_updated' => 'No pages have been recently updated',
+    'export' => 'Export',
+    'export_html' => 'Contained Web File',
+    'export_pdf' => 'PDF File',
+    'export_text' => 'Plain Text File',
+    'export_md' => 'Markdown File',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
+
+    // Permissions and restrictions
+    'permissions' => 'Permissions',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_save' => 'Save Permissions',
+    'permissions_owner' => 'Owner',
+    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Override permissions for role',
+    'permissions_inherit_defaults' => 'Inherit defaults',
+
+    // Search
+    'search_results' => 'Search Results',
+    'search_total_results_found' => ':count result found|:count total results found',
+    'search_clear' => 'Clear Search',
+    'search_no_pages' => 'No pages matched this search',
+    'search_for_term' => 'Search for :term',
+    'search_more' => 'More Results',
+    'search_advanced' => 'Advanced Search',
+    'search_terms' => 'Search Terms',
+    'search_content_type' => 'Content Type',
+    'search_exact_matches' => 'Exact Matches',
+    'search_tags' => 'Tag Searches',
+    'search_options' => 'Options',
+    'search_viewed_by_me' => 'Viewed by me',
+    'search_not_viewed_by_me' => 'Not viewed by me',
+    'search_permissions_set' => 'Permissions set',
+    'search_created_by_me' => 'Created by me',
+    'search_updated_by_me' => 'Updated by me',
+    'search_owned_by_me' => 'Owned by me',
+    'search_date_options' => 'Date Options',
+    'search_updated_before' => 'Updated before',
+    'search_updated_after' => 'Updated after',
+    'search_created_before' => 'Created before',
+    'search_created_after' => 'Created after',
+    'search_set_date' => 'Set Date',
+    'search_update' => 'Update Search',
+
+    // Shelves
+    'shelf' => 'Shelf',
+    'shelves' => 'Shelves',
+    'x_shelves' => ':count Shelf|:count Shelves',
+    'shelves_empty' => 'No shelves have been created',
+    'shelves_create' => 'Create New Shelf',
+    'shelves_popular' => 'Popular Shelves',
+    'shelves_new' => 'New Shelves',
+    'shelves_new_action' => 'New Shelf',
+    'shelves_popular_empty' => 'The most popular shelves will appear here.',
+    'shelves_new_empty' => 'The most recently created shelves will appear here.',
+    'shelves_save' => 'Save Shelf',
+    'shelves_books' => 'Books on this shelf',
+    'shelves_add_books' => 'Add books to this shelf',
+    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_empty_contents' => 'This shelf has no books assigned to it',
+    'shelves_edit_and_assign' => 'Edit shelf to assign books',
+    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit' => 'Edit Shelf',
+    'shelves_delete' => 'Delete Shelf',
+    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
+    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
+    'shelves_permissions' => 'Shelf Permissions',
+    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
+    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
+    'shelves_copy_permissions' => 'Copy Permissions',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+
+    // Books
+    'book' => 'Book',
+    'books' => 'Books',
+    'x_books' => ':count Book|:count Books',
+    'books_empty' => 'No books have been created',
+    'books_popular' => 'Popular Books',
+    'books_recent' => 'Recent Books',
+    'books_new' => 'New Books',
+    'books_new_action' => 'New Book',
+    'books_popular_empty' => 'The most popular books will appear here.',
+    'books_new_empty' => 'The most recently created books will appear here.',
+    'books_create' => 'Create New Book',
+    'books_delete' => 'Delete Book',
+    'books_delete_named' => 'Delete Book :bookName',
+    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
+    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
+    'books_edit' => 'Edit Book',
+    'books_edit_named' => 'Edit Book :bookName',
+    'books_form_book_name' => 'Book Name',
+    'books_save' => 'Save Book',
+    'books_permissions' => 'Book Permissions',
+    'books_permissions_updated' => 'Book Permissions Updated',
+    'books_empty_contents' => 'No pages or chapters have been created for this book.',
+    'books_empty_create_page' => 'Create a new page',
+    'books_empty_sort_current_book' => 'Sort the current book',
+    'books_empty_add_chapter' => 'Add a chapter',
+    'books_permissions_active' => 'Book Permissions Active',
+    'books_search_this' => 'Search this book',
+    'books_navigation' => 'Book Navigation',
+    'books_sort' => 'Sort Book Contents',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_named' => 'Sort Book :bookName',
+    'books_sort_name' => 'Sort by Name',
+    'books_sort_created' => 'Sort by Created Date',
+    'books_sort_updated' => 'Sort by Updated Date',
+    'books_sort_chapters_first' => 'Chapters First',
+    'books_sort_chapters_last' => 'Chapters Last',
+    'books_sort_show_other' => 'Show Other Books',
+    'books_sort_save' => 'Save New Order',
+    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_move_up' => 'Move Up',
+    'books_sort_move_down' => 'Move Down',
+    'books_sort_move_prev_book' => 'Move to Previous Book',
+    'books_sort_move_next_book' => 'Move to Next Book',
+    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
+    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
+    'books_sort_move_book_start' => 'Move to Start of Book',
+    'books_sort_move_book_end' => 'Move to End of Book',
+    'books_sort_move_before_chapter' => 'Move to Before Chapter',
+    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_copy' => 'Copy Book',
+    'books_copy_success' => 'Book successfully copied',
+
+    // Chapters
+    'chapter' => 'Chapter',
+    'chapters' => 'Chapters',
+    'x_chapters' => ':count Chapter|:count Chapters',
+    'chapters_popular' => 'Popular Chapters',
+    'chapters_new' => 'New Chapter',
+    'chapters_create' => 'Create New Chapter',
+    'chapters_delete' => 'Delete Chapter',
+    'chapters_delete_named' => 'Delete Chapter :chapterName',
+    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
+    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
+    'chapters_edit' => 'Edit Chapter',
+    'chapters_edit_named' => 'Edit Chapter :chapterName',
+    'chapters_save' => 'Save Chapter',
+    'chapters_move' => 'Move Chapter',
+    'chapters_move_named' => 'Move Chapter :chapterName',
+    'chapters_copy' => 'Copy Chapter',
+    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_permissions' => 'Chapter Permissions',
+    'chapters_empty' => 'No pages are currently in this chapter.',
+    'chapters_permissions_active' => 'Chapter Permissions Active',
+    'chapters_permissions_success' => 'Chapter Permissions Updated',
+    'chapters_search_this' => 'Search this chapter',
+    'chapter_sort_book' => 'Sort Book',
+
+    // Pages
+    'page' => 'Page',
+    'pages' => 'Pages',
+    'x_pages' => ':count Page|:count Pages',
+    'pages_popular' => 'Popular Pages',
+    'pages_new' => 'New Page',
+    'pages_attachments' => 'Attachments',
+    'pages_navigation' => 'Page Navigation',
+    'pages_delete' => 'Delete Page',
+    'pages_delete_named' => 'Delete Page :pageName',
+    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
+    'pages_delete_draft' => 'Delete Draft Page',
+    'pages_delete_success' => 'Page deleted',
+    'pages_delete_draft_success' => 'Draft page deleted',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
+    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
+    'pages_editing_named' => 'Editing Page :pageName',
+    'pages_edit_draft_options' => 'Draft Options',
+    'pages_edit_save_draft' => 'Save Draft',
+    'pages_edit_draft' => 'Edit Page Draft',
+    'pages_editing_draft' => 'Editing Draft',
+    'pages_editing_page' => 'Editing Page',
+    'pages_edit_draft_save_at' => 'Draft saved at ',
+    'pages_edit_delete_draft' => 'Delete Draft',
+    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_discard_draft' => 'Discard Draft',
+    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
+    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
+    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_set_changelog' => 'Set Changelog',
+    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
+    'pages_edit_enter_changelog' => 'Enter Changelog',
+    'pages_editor_switch_title' => 'Switch Editor',
+    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
+    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_save' => 'Save Page',
+    'pages_title' => 'Page Title',
+    'pages_name' => 'Page Name',
+    'pages_md_editor' => 'Editor',
+    'pages_md_preview' => 'Preview',
+    'pages_md_insert_image' => 'Insert Image',
+    'pages_md_insert_link' => 'Insert Entity Link',
+    'pages_md_insert_drawing' => 'Insert Drawing',
+    'pages_md_show_preview' => 'Show preview',
+    'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_not_in_chapter' => 'Page is not in a chapter',
+    'pages_move' => 'Move Page',
+    'pages_copy' => 'Copy Page',
+    'pages_copy_desination' => 'Copy Destination',
+    'pages_copy_success' => 'Page successfully copied',
+    'pages_permissions' => 'Page Permissions',
+    'pages_permissions_success' => 'Page permissions updated',
+    'pages_revision' => 'Revision',
+    'pages_revisions' => 'Page Revisions',
+    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_named' => 'Page Revisions for :pageName',
+    'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revisions_created_by' => 'Created By',
+    'pages_revisions_date' => 'Revision Date',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_numbered' => 'Revision #:id',
+    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
+    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_changelog' => 'Changelog',
+    'pages_revisions_changes' => 'Changes',
+    'pages_revisions_current' => 'Current Version',
+    'pages_revisions_preview' => 'Preview',
+    'pages_revisions_restore' => 'Restore',
+    'pages_revisions_none' => 'This page has no revisions',
+    'pages_copy_link' => 'Copy Link',
+    'pages_edit_content_link' => 'Jump to section in editor',
+    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_label' => 'Page Section Options',
+    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
+    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_permissions_active' => 'Page Permissions Active',
+    'pages_initial_revision' => 'Initial publish',
+    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_initial_name' => 'New Page',
+    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
+    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
+    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count users have started editing this page',
+        'start_b' => ':userName has started editing this page',
+        'time_a' => 'since the page was last updated',
+        'time_b' => 'in the last :minCount minutes',
+        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+    ],
+    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
+    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_specific' => 'Specific Page',
+    'pages_is_template' => 'Page Template',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'Toggle Sidebar',
+    'page_tags' => 'Page Tags',
+    'chapter_tags' => 'Chapter Tags',
+    'book_tags' => 'Book Tags',
+    'shelf_tags' => 'Shelf Tags',
+    'tag' => 'Tag',
+    'tags' =>  'Tags',
+    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tag_name' =>  'Tag Name',
+    'tag_value' => 'Tag Value (Optional)',
+    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
+    'tags_add' => 'Add another tag',
+    'tags_remove' => 'Remove this tag',
+    'tags_usages' => 'Total tag usages',
+    'tags_assigned_pages' => 'Assigned to Pages',
+    'tags_assigned_chapters' => 'Assigned to Chapters',
+    'tags_assigned_books' => 'Assigned to Books',
+    'tags_assigned_shelves' => 'Assigned to Shelves',
+    'tags_x_unique_values' => ':count unique values',
+    'tags_all_values' => 'All values',
+    'tags_view_tags' => 'View Tags',
+    'tags_view_existing_tags' => 'View existing tags',
+    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'attachments' => 'Attachments',
+    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
+    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
+    'attachments_upload' => 'Upload File',
+    'attachments_link' => 'Attach Link',
+    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_set_link' => 'Set Link',
+    'attachments_delete' => 'Are you sure you want to delete this attachment?',
+    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_no_files' => 'No files have been uploaded',
+    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
+    'attachments_link_name' => 'Link Name',
+    'attachment_link' => 'Attachment link',
+    'attachments_link_url' => 'Link to file',
+    'attachments_link_url_hint' => 'Url of site or file',
+    'attach' => 'Attach',
+    'attachments_insert_link' => 'Add Attachment Link to Page',
+    'attachments_edit_file' => 'Edit File',
+    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
+    'attachments_order_updated' => 'Attachment order updated',
+    'attachments_updated_success' => 'Attachment details updated',
+    'attachments_deleted' => 'Attachment deleted',
+    'attachments_file_uploaded' => 'File successfully uploaded',
+    'attachments_file_updated' => 'File successfully updated',
+    'attachments_link_attached' => 'Link successfully attached to page',
+    'templates' => 'Templates',
+    'templates_set_as_template' => 'Page is a template',
+    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
+    'templates_replace_content' => 'Replace page content',
+    'templates_append_content' => 'Append to page content',
+    'templates_prepend_content' => 'Prepend to page content',
+
+    // Profile View
+    'profile_user_for_x' => 'User for :time',
+    'profile_created_content' => 'Created Content',
+    'profile_not_created_pages' => ':userName has not created any pages',
+    'profile_not_created_chapters' => ':userName has not created any chapters',
+    'profile_not_created_books' => ':userName has not created any books',
+    'profile_not_created_shelves' => ':userName has not created any shelves',
+
+    // Comments
+    'comment' => 'Comment',
+    'comments' => 'Comments',
+    'comment_add' => 'Add Comment',
+    'comment_placeholder' => 'Leave a comment here',
+    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_save' => 'Save Comment',
+    'comment_new' => 'New Comment',
+    'comment_created' => 'commented :createDiff',
+    'comment_updated' => 'Updated :updateDiff by :username',
+    'comment_updated_indicator' => 'Updated',
+    'comment_deleted_success' => 'Comment deleted',
+    'comment_created_success' => 'Comment added',
+    'comment_updated_success' => 'Comment updated',
+    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
+    'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+
+    // Revision
+    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
+    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
+    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+
+    // Copy view
+    'copy_consider' => 'Please consider the below when copying content.',
+    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_owner' => 'You will become the owner of all copied content.',
+    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
+    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+
+    // Conversions
+    'convert_to_shelf' => 'Convert to Shelf',
+    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
+    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_book' => 'Convert Book',
+    'convert_book_confirm' => 'Are you sure you want to convert this book?',
+    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_to_book' => 'Convert to Book',
+    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_chapter' => 'Convert Chapter',
+    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+
+    // References
+    'references' => 'References',
+    'references_none' => 'There are no tracked references to this item.',
+    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+
+    // Watch Options
+    'watch' => 'Watch',
+    'watch_title_default' => 'Default Preferences',
+    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_title_ignore' => 'Ignore',
+    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_new' => 'New Pages',
+    'watch_desc_new' => 'Notify when any new page is created within this item.',
+    'watch_title_updates' => 'All Page Updates',
+    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
+    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
+    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
+    'watch_change_default' => 'Change default notification preferences',
+    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_updates' => 'Watching new pages and updates',
+    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
+    'watch_detail_parent_chapter' => 'Watching via parent chapter',
+    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+];
diff --git a/lang/tk/errors.php b/lang/tk/errors.php
new file mode 100644
index 00000000000..9c40aa9ed33
--- /dev/null
+++ b/lang/tk/errors.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'You do not have permission to access the requested page.',
+    'permissionJson' => 'You do not have permission to perform the requested action.',
+
+    // Auth
+    'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
+    'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
+    'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
+    'email_confirmation_awaiting' => 'The email address for the account in use needs to be confirmed',
+    'ldap_fail_anonymous' => 'LDAP access failed using anonymous bind',
+    'ldap_fail_authed' => 'LDAP access failed using given dn & password details',
+    'ldap_extension_not_installed' => 'LDAP PHP extension not installed',
+    'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
+    'saml_already_logged_in' => 'Already logged in',
+    'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
+    'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'oidc_already_logged_in' => 'Already logged in',
+    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'social_no_action_defined' => 'No action defined',
+    'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
+    'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',
+    'social_account_email_in_use' => 'The email :email is already in use. If you already have an account you can connect your :socialAccount account from your profile settings.',
+    'social_account_existing' => 'This :socialAccount is already attached to your profile.',
+    'social_account_already_used_existing' => 'This :socialAccount account is already used by another user.',
+    'social_account_not_used' => 'This :socialAccount account is not linked to any users. Please attach it in your profile settings. ',
+    'social_account_register_instructions' => 'If you do not yet have an account, You can register an account using the :socialAccount option.',
+    'social_driver_not_found' => 'Social driver not found',
+    'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
+    'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
+
+    // System
+    'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
+    'cannot_get_image_from_url' => 'Cannot get image from :url',
+    'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
+    'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
+    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
+
+    // Drawing & Images
+    'image_upload_error' => 'An error occurred uploading the image',
+    'image_upload_type_error' => 'The image type being uploaded is invalid',
+    'image_upload_replace_type' => 'Image file replacements must be of the same type',
+    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
+    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+
+    // Attachments
+    'attachment_not_found' => 'Attachment not found',
+    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+
+    // Pages
+    'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
+    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
+
+    // Entities
+    'entity_not_found' => 'Entity not found',
+    'bookshelf_not_found' => 'Shelf not found',
+    'book_not_found' => 'Book not found',
+    'page_not_found' => 'Page not found',
+    'chapter_not_found' => 'Chapter not found',
+    'selected_book_not_found' => 'The selected book was not found',
+    'selected_book_chapter_not_found' => 'The selected Book or Chapter was not found',
+    'guests_cannot_save_drafts' => 'Guests cannot save drafts',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
+    'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+
+    // Roles
+    'role_cannot_be_edited' => 'This role cannot be edited',
+    'role_system_cannot_be_deleted' => 'This role is a system role and cannot be deleted',
+    'role_registration_default_cannot_delete' => 'This role cannot be deleted while set as the default registration role',
+    'role_cannot_remove_only_admin' => 'This user is the only user assigned to the administrator role. Assign the administrator role to another user before attempting to remove it here.',
+
+    // Comments
+    'comment_list' => 'An error occurred while fetching the comments.',
+    'cannot_add_comment_to_draft' => 'You cannot add comments to a draft.',
+    'comment_add' => 'An error occurred while adding / updating the comment.',
+    'comment_delete' => 'An error occurred while deleting the comment.',
+    'empty_comment' => 'Cannot add an empty comment.',
+
+    // Error pages
+    '404_page_not_found' => 'Page Not Found',
+    'sorry_page_not_found' => 'Sorry, The page you were looking for could not be found.',
+    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
+    'image_not_found' => 'Image Not Found',
+    'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
+    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
+    'return_home' => 'Return to home',
+    'error_occurred' => 'An Error Occurred',
+    'app_down' => ':appName is down right now',
+    'back_soon' => 'It will be back up soon.',
+
+    // API errors
+    'api_no_authorization_found' => 'No authorization token found on the request',
+    'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
+    'api_user_token_not_found' => 'No matching API token was found for the provided authorization token',
+    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
+    'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
+    'api_user_token_expired' => 'The authorization token used has expired',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+];
diff --git a/lang/tk/notifications.php b/lang/tk/notifications.php
new file mode 100644
index 00000000000..1afd23f1dc4
--- /dev/null
+++ b/lang/tk/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'New comment on page: :pageName',
+    'new_comment_intro' => 'A user has commented on a page in :appName:',
+    'new_page_subject' => 'New page: :pageName',
+    'new_page_intro' => 'A new page has been created in :appName:',
+    'updated_page_subject' => 'Updated page: :pageName',
+    'updated_page_intro' => 'A page has been updated in :appName:',
+    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+
+    'detail_page_name' => 'Page Name:',
+    'detail_page_path' => 'Page Path:',
+    'detail_commenter' => 'Commenter:',
+    'detail_comment' => 'Comment:',
+    'detail_created_by' => 'Created By:',
+    'detail_updated_by' => 'Updated By:',
+
+    'action_view_comment' => 'View Comment',
+    'action_view_page' => 'View Page',
+
+    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason_link' => 'your notification preferences',
+];
diff --git a/lang/tk/pagination.php b/lang/tk/pagination.php
new file mode 100644
index 00000000000..85bd12fc319
--- /dev/null
+++ b/lang/tk/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];
diff --git a/lang/tk/passwords.php b/lang/tk/passwords.php
new file mode 100644
index 00000000000..b408f3c2fda
--- /dev/null
+++ b/lang/tk/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'Passwords must be at least eight characters and match the confirmation.',
+    'user' => "We can't find a user with that e-mail address.",
+    'token' => 'The password reset token is invalid for this email address.',
+    'sent' => 'We have e-mailed your password reset link!',
+    'reset' => 'Your password has been reset!',
+
+];
diff --git a/lang/tk/preferences.php b/lang/tk/preferences.php
new file mode 100644
index 00000000000..2872f5f3c65
--- /dev/null
+++ b/lang/tk/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'My Account',
+
+    'shortcuts' => 'Shortcuts',
+    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
+    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
+    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
+    'shortcuts_section_navigation' => 'Navigation',
+    'shortcuts_section_actions' => 'Common Actions',
+    'shortcuts_save' => 'Save Shortcuts',
+    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
+    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
+    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+
+    'notifications' => 'Notification Preferences',
+    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
+    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
+    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
+    'notifications_save' => 'Save Preferences',
+    'notifications_update_success' => 'Notification preferences have been updated!',
+    'notifications_watched' => 'Watched & Ignored Items',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+
+    'auth' => 'Access & Security',
+    'auth_change_password' => 'Change Password',
+    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
+    'auth_change_password_success' => 'Password has been updated!',
+
+    'profile' => 'Profile Details',
+    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_view_public' => 'View Public Profile',
+    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
+    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
+    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
+    'profile_admin_options' => 'Administrator Options',
+    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+
+    'delete_account' => 'Delete Account',
+    'delete_my_account' => 'Delete My Account',
+    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
+    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+];
diff --git a/lang/tk/settings.php b/lang/tk/settings.php
new file mode 100644
index 00000000000..5427cb9419e
--- /dev/null
+++ b/lang/tk/settings.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'Settings',
+    'settings_save' => 'Save Settings',
+    'system_version' => 'System Version',
+    'categories' => 'Categories',
+
+    // App Settings
+    'app_customization' => 'Customization',
+    'app_features_security' => 'Features & Security',
+    'app_name' => 'Application Name',
+    'app_name_desc' => 'This name is shown in the header and in any system-sent emails.',
+    'app_name_header' => 'Show name in header',
+    'app_public_access' => 'Public Access',
+    'app_public_access_desc' => 'Enabling this option will allow visitors, that are not logged-in, to access content in your BookStack instance.',
+    'app_public_access_desc_guest' => 'Access for public visitors can be controlled through the "Guest" user.',
+    'app_public_access_toggle' => 'Allow public access',
+    'app_public_viewing' => 'Allow public viewing?',
+    'app_secure_images' => 'Higher Security Image Uploads',
+    'app_secure_images_toggle' => 'Enable higher security image uploads',
+    'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.',
+    'app_default_editor' => 'Default Page Editor',
+    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_custom_html' => 'Custom HTML Head Content',
+    'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
+    'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
+    'app_logo' => 'Application Logo',
+    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_icon' => 'Application Icon',
+    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_homepage' => 'Application Homepage',
+    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
+    'app_homepage_select' => 'Select a page',
+    'app_footer_links' => 'Footer Links',
+    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
+    'app_footer_links_label' => 'Link Label',
+    'app_footer_links_url' => 'Link URL',
+    'app_footer_links_add' => 'Add Footer Link',
+    'app_disable_comments' => 'Disable Comments',
+    'app_disable_comments_toggle' => 'Disable comments',
+    'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
+
+    // Color settings
+    'color_scheme' => 'Application Color Scheme',
+    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
+    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'app_color' => 'Primary Color',
+    'link_color' => 'Default Link Color',
+    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'bookshelf_color' => 'Shelf Color',
+    'book_color' => 'Book Color',
+    'chapter_color' => 'Chapter Color',
+    'page_color' => 'Page Color',
+    'page_draft_color' => 'Page Draft Color',
+
+    // Registration Settings
+    'reg_settings' => 'Registration',
+    'reg_enable' => 'Enable Registration',
+    'reg_enable_toggle' => 'Enable registration',
+    'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
+    'reg_default_role' => 'Default user role after registration',
+    'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
+    'reg_email_confirmation' => 'Email Confirmation',
+    'reg_email_confirmation_toggle' => 'Require email confirmation',
+    'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.',
+    'reg_confirm_restrict_domain' => 'Domain Restriction',
+    'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
+    'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
+
+    // Maintenance settings
+    'maint' => 'Maintenance',
+    'maint_image_cleanup' => 'Cleanup Images',
+    'maint_image_cleanup_desc' => 'Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.',
+    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_image_cleanup_run' => 'Run Cleanup',
+    'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
+    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
+    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
+    'maint_send_test_email' => 'Send a Test Email',
+    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
+    'maint_send_test_email_run' => 'Send test email',
+    'maint_send_test_email_success' => 'Email sent to :address',
+    'maint_send_test_email_mail_subject' => 'Test Email',
+    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
+    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
+    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_open' => 'Open Recycle Bin',
+    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
+    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+
+    // Recycle Bin
+    'recycle_bin' => 'Recycle Bin',
+    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_deleted_item' => 'Deleted Item',
+    'recycle_bin_deleted_parent' => 'Parent',
+    'recycle_bin_deleted_by' => 'Deleted By',
+    'recycle_bin_deleted_at' => 'Deletion Time',
+    'recycle_bin_permanently_delete' => 'Permanently Delete',
+    'recycle_bin_restore' => 'Restore',
+    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
+    'recycle_bin_empty' => 'Empty Recycle Bin',
+    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_list' => 'Items to be Destroyed',
+    'recycle_bin_restore_list' => 'Items to be Restored',
+    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
+    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_parent' => 'Restore Parent',
+    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
+    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+
+    // Audit Log
+    'audit' => 'Audit Log',
+    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_event_filter' => 'Event Filter',
+    'audit_event_filter_no_filter' => 'No Filter',
+    'audit_deleted_item' => 'Deleted Item',
+    'audit_deleted_item_name' => 'Name: :name',
+    'audit_table_user' => 'User',
+    'audit_table_event' => 'Event',
+    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_ip' => 'IP Address',
+    'audit_table_date' => 'Activity Date',
+    'audit_date_from' => 'Date Range From',
+    'audit_date_to' => 'Date Range To',
+
+    // Role Settings
+    'roles' => 'Roles',
+    'role_user_roles' => 'User Roles',
+    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_assigned_users' => 'Assigned Users',
+    'roles_permissions_provided' => 'Provided Permissions',
+    'role_create' => 'Create New Role',
+    'role_delete' => 'Delete Role',
+    'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.',
+    'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.',
+    'role_delete_no_migration' => "Don't migrate users",
+    'role_delete_sure' => 'Are you sure you want to delete this role?',
+    'role_edit' => 'Edit Role',
+    'role_details' => 'Role Details',
+    'role_name' => 'Role Name',
+    'role_desc' => 'Short Description of Role',
+    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_external_auth_id' => 'External Authentication IDs',
+    'role_system' => 'System Permissions',
+    'role_manage_users' => 'Manage users',
+    'role_manage_roles' => 'Manage roles & role permissions',
+    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
+    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
+    'role_manage_page_templates' => 'Manage page templates',
+    'role_access_api' => 'Access system API',
+    'role_manage_settings' => 'Manage app settings',
+    'role_export_content' => 'Export content',
+    'role_editor_change' => 'Change page editor',
+    'role_notifications' => 'Receive & manage notifications',
+    'role_asset' => 'Asset Permissions',
+    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
+    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
+    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_all' => 'All',
+    'role_own' => 'Own',
+    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_save' => 'Save Role',
+    'role_users' => 'Users in this role',
+    'role_users_none' => 'No users are currently assigned to this role',
+
+    // Users
+    'users' => 'Users',
+    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'user_profile' => 'User Profile',
+    'users_add_new' => 'Add New User',
+    'users_search' => 'Search Users',
+    'users_latest_activity' => 'Latest Activity',
+    'users_details' => 'User Details',
+    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
+    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
+    'users_role' => 'User Roles',
+    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
+    'users_password' => 'User Password',
+    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
+    'users_send_invite_option' => 'Send user invite email',
+    'users_external_auth_id' => 'External Authentication ID',
+    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_delete' => 'Delete User',
+    'users_delete_named' => 'Delete user :userName',
+    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
+    'users_delete_confirm' => 'Are you sure you want to delete this user?',
+    'users_migrate_ownership' => 'Migrate Ownership',
+    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_none_selected' => 'No user selected',
+    'users_edit' => 'Edit User',
+    'users_edit_profile' => 'Edit Profile',
+    'users_avatar' => 'User Avatar',
+    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
+    'users_preferred_language' => 'Preferred Language',
+    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
+    'users_social_accounts' => 'Social Accounts',
+    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
+    'users_social_connect' => 'Connect Account',
+    'users_social_disconnect' => 'Disconnect Account',
+    'users_social_status_connected' => 'Connected',
+    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
+    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
+    'users_api_tokens' => 'API Tokens',
+    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_none' => 'No API tokens have been created for this user',
+    'users_api_tokens_create' => 'Create Token',
+    'users_api_tokens_expires' => 'Expires',
+    'users_api_tokens_docs' => 'API Documentation',
+    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_configure' => 'Configure Methods',
+
+    // API Tokens
+    'user_api_token_create' => 'Create API Token',
+    'user_api_token_name' => 'Name',
+    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_expiry' => 'Expiry Date',
+    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
+    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token' => 'API Token',
+    'user_api_token_id' => 'Token ID',
+    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
+    'user_api_token_secret' => 'Token Secret',
+    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_created' => 'Token created :timeAgo',
+    'user_api_token_updated' => 'Token updated :timeAgo',
+    'user_api_token_delete' => 'Delete Token',
+    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
+    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
+    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_create' => 'Create New Webhook',
+    'webhooks_none_created' => 'No webhooks have yet been created.',
+    'webhooks_edit' => 'Edit Webhook',
+    'webhooks_save' => 'Save Webhook',
+    'webhooks_details' => 'Webhook Details',
+    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_events' => 'Webhook Events',
+    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
+    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_events_all' => 'All system events',
+    'webhooks_name' => 'Webhook Name',
+    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
+    'webhooks_endpoint' => 'Webhook Endpoint',
+    'webhooks_active' => 'Webhook Active',
+    'webhook_events_table_header' => 'Events',
+    'webhooks_delete' => 'Delete Webhook',
+    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
+    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
+    'webhooks_format_example' => 'Webhook Format Example',
+    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_status' => 'Webhook Status',
+    'webhooks_last_called' => 'Last Called:',
+    'webhooks_last_errored' => 'Last Errored:',
+    'webhooks_last_error_message' => 'Last Error Message:',
+
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/tk/validation.php b/lang/tk/validation.php
new file mode 100644
index 00000000000..2a676c7c4cc
--- /dev/null
+++ b/lang/tk/validation.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values',
+    'file'                 => 'The :attribute must be provided as a valid file.',
+    'filled'               => 'The :attribute field is required.',
+    'gt'                   => [
+        'numeric' => 'The :attribute must be greater than :value.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
+    ],
+    'gte'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
+    ],
+    'exists'               => 'The selected :attribute is invalid.',
+    'image'                => 'The :attribute must be an image.',
+    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
+    ],
+    'lte'                  => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
+    ],
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'safe_url'             => 'The provided link may not be safe.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'totp'                 => 'The provided code is not valid or has expired.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'Password confirmation required',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index fda4899b368..d11de40e4a6 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -85,7 +85,7 @@
     'webhook_delete_notification' => 'Webhook đã được xóa thành công',
 
     // Users
-    'user_create' => 'người dùng đã tạo',
+    'user_create' => 'đã tạo người dùng',
     'user_create_notification' => 'Người dùng được tạo thành công',
     'user_update' => 'người dùng được cập nhật',
     'user_update_notification' => 'Người dùng được cập nhật thành công',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index c726920eaff..f8f6ca293bb 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -107,7 +107,7 @@
     'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
     'shelves_permissions' => 'Shelf Permissions',
     'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_active' => 'Quyền của kệ đang hoạt động',
     'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
     'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
     'shelves_copy_permissions_to_books' => 'Sao chép các quyền cho sách',
@@ -207,7 +207,7 @@
     'pages_delete_draft' => 'Xóa Trang Nháp',
     'pages_delete_success' => 'Đã xóa Trang',
     'pages_delete_draft_success' => 'Đã xóa trang Nháp',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => '.',
     'pages_delete_confirm' => 'Bạn có chắc chắn muốn xóa trang này?',
     'pages_delete_draft_confirm' => 'Bạn có chắc chắn muốn xóa trang nháp này?',
     'pages_editing_named' => 'Đang chỉnh sửa Trang :pageName',
@@ -223,7 +223,7 @@
     'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_wysiwyg' => 'Chuyển sang trình soạn thảo WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Đặt Changelog',
@@ -232,7 +232,7 @@
     'pages_editor_switch_title' => 'Switch Editor',
     'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
     'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_a' => 'Sau khi lưu, tùy chọn trình soạn thảo mới sẽ được sử dụng bởi bất kỳ trình chỉnh sửa nào trong tương lai, kể cả những người không thể tự thay đổi loại trình chỉnh sửa.',
     'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
     'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
     'pages_save' => 'Lưu Trang',

From e5a6ccc4d464cf728bb425701717607782dcfce6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Nov 2024 13:31:21 +0000
Subject: [PATCH 359/666] Translators: Updated before patch release

---
 .github/translators.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index d0ab518ebdc..65ea00fe8f7 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -449,3 +449,7 @@ Avishay Rapp (AvishayRapp) :: Hebrew
 matthias4217 :: French
 Berke BOYLU2 (berkeboylu2) :: Turkish
 etwas7B :: German
+Mohammed srhiri (m.sghiri20) :: Arabic
+YongMin Kim (kym0118) :: Korean
+Rivo Zängov (Eraser) :: Estonian
+Francisco Rafael Fonseca (chicoraf) :: Portuguese, Brazilian

From ac27e1893388c39f2b43c92fb91a0fca3d6ae7b3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Nov 2024 13:46:57 +0000
Subject: [PATCH 360/666] Languages: Added Turkmen to locale manager

---
 app/Translation/LocaleManager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index e087dd9fa5e..ca71df64931 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -60,6 +60,7 @@ class LocaleManager
         'sq'          => 'sq_AL',
         'sr'          => 'sr_RS',
         'sv'          => 'sv_SE',
+        'tk'          => 'tk_TM',
         'tr'          => 'tr_TR',
         'uk'          => 'uk_UA',
         'uz'          => 'uz_UZ',

From d13e4d2eefeed427c0377be04761a639e9fdb8fc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Nov 2024 14:01:24 +0000
Subject: [PATCH 361/666] ZIP imports: Started actual import logic

---
 app/Entities/Tools/Cloner.php                 |  17 +--
 .../ZipExports/Models/ZipExportAttachment.php |   6 +-
 .../ZipExports/Models/ZipExportTag.php        |   6 +-
 app/Exports/ZipExports/ZipExportReader.php    |   8 ++
 app/Exports/ZipExports/ZipImportRunner.php    | 107 ++++++++++++++++++
 dev/docs/portable-zip-file-format.md          |   4 +-
 6 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 2030b050c4b..2be6083e3dd 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -18,17 +18,12 @@
 
 class Cloner
 {
-    protected PageRepo $pageRepo;
-    protected ChapterRepo $chapterRepo;
-    protected BookRepo $bookRepo;
-    protected ImageService $imageService;
-
-    public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo, BookRepo $bookRepo, ImageService $imageService)
-    {
-        $this->pageRepo = $pageRepo;
-        $this->chapterRepo = $chapterRepo;
-        $this->bookRepo = $bookRepo;
-        $this->imageService = $imageService;
+    public function __construct(
+        protected PageRepo $pageRepo,
+        protected ChapterRepo $chapterRepo,
+        protected BookRepo $bookRepo,
+        protected ImageService $imageService,
+    ) {
     }
 
     /**
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index 1dbdc7333e8..c6615e1dc49 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -10,13 +10,12 @@ class ZipExportAttachment extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
-    public ?int $order = null;
     public ?string $link = null;
     public ?string $file = null;
 
     public function metadataOnly(): void
     {
-        $this->order = $this->link = $this->file = null;
+        $this->link = $this->file = null;
     }
 
     public static function fromModel(Attachment $model, ZipExportFiles $files): self
@@ -24,7 +23,6 @@ public static function fromModel(Attachment $model, ZipExportFiles $files): self
         $instance = new self();
         $instance->id = $model->id;
         $instance->name = $model->name;
-        $instance->order = $model->order;
 
         if ($model->external) {
             $instance->link = $model->path;
@@ -47,7 +45,6 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         $rules = [
             'id'    => ['nullable', 'int'],
             'name'  => ['required', 'string', 'min:1'],
-            'order' => ['nullable', 'integer'],
             'link'  => ['required_without:file', 'nullable', 'string'],
             'file'  => ['required_without:link', 'nullable', 'string', $context->fileReferenceRule()],
         ];
@@ -61,7 +58,6 @@ public static function fromArray(array $data): self
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
-        $model->order = isset($data['order']) ? intval($data['order']) : null;
         $model->link = $data['link'] ?? null;
         $model->file = $data['file'] ?? null;
 
diff --git a/app/Exports/ZipExports/Models/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
index b6c9e338aef..6b4720fca7e 100644
--- a/app/Exports/ZipExports/Models/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -9,11 +9,10 @@ class ZipExportTag extends ZipExportModel
 {
     public string $name;
     public ?string $value = null;
-    public ?int $order = null;
 
     public function metadataOnly(): void
     {
-        $this->value = $this->order = null;
+        $this->value =  null;
     }
 
     public static function fromModel(Tag $model): self
@@ -21,7 +20,6 @@ public static function fromModel(Tag $model): self
         $instance = new self();
         $instance->name = $model->name;
         $instance->value = $model->value;
-        $instance->order = $model->order;
 
         return $instance;
     }
@@ -36,7 +34,6 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         $rules = [
             'name'  => ['required', 'string', 'min:1'],
             'value' => ['nullable', 'string'],
-            'order' => ['nullable', 'integer'],
         ];
 
         return $context->validateData($data, $rules);
@@ -48,7 +45,6 @@ public static function fromArray(array $data): self
 
         $model->name = $data['name'];
         $model->value = $data['value'] ?? null;
-        $model->order = isset($data['order']) ? intval($data['order']) : null;
 
         return $model;
     }
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index c3e47da048d..ebc2fbbc9e1 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -73,6 +73,14 @@ public function fileExists(string $fileName): bool
         return $this->zip->statName("files/{$fileName}") !== false;
     }
 
+    /**
+     * @return false|resource
+     */
+    public function streamFile(string $fileName)
+    {
+        return $this->zip->getStream("files/{$fileName}");
+    }
+
     /**
      * @throws ZipExportException
      */
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 2f784ebea6e..2b897ff9167 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -5,18 +5,33 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Repos\ChapterRepo;
+use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\ZipExportException;
 use BookStack\Exceptions\ZipImportException;
 use BookStack\Exports\Import;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Exports\ZipExports\Models\ZipExportTag;
 use BookStack\Uploads\FileStorage;
+use BookStack\Uploads\ImageService;
+use Illuminate\Http\UploadedFile;
 
 class ZipImportRunner
 {
+    protected array $tempFilesToCleanup = []; // TODO
+    protected array $createdImages = []; // TODO
+    protected array $createdAttachments = []; // TODO
+
     public function __construct(
         protected FileStorage $storage,
+        protected PageRepo $pageRepo,
+        protected ChapterRepo $chapterRepo,
+        protected BookRepo $bookRepo,
+        protected ImageService $imageService,
     ) {
     }
 
@@ -51,6 +66,98 @@ public function run(Import $import, ?Entity $parent = null): void
         $this->ensurePermissionsPermitImport($exportModel);
 
         // TODO - Run import
+          // TODO - In transaction?
+            // TODO - Revert uploaded files if goes wrong
+    }
+
+    protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader): Book
+    {
+        $book = $this->bookRepo->create([
+            'name' => $exportBook->name,
+            'description_html' => $exportBook->description_html ?? '',
+            'image' => $exportBook->cover ? $this->zipFileToUploadedFile($exportBook->cover, $reader) : null,
+            'tags' => $this->exportTagsToInputArray($exportBook->tags ?? []),
+        ]);
+
+        // TODO - Parse/format description_html references
+
+        if ($book->cover) {
+            $this->createdImages[] = $book->cover;
+        }
+
+        // TODO - Pages
+        foreach ($exportBook->chapters as $exportChapter) {
+            $this->importChapter($exportChapter, $book);
+        }
+        // TODO - Sort chapters/pages by order
+
+        return $book;
+    }
+
+    protected function importChapter(ZipExportChapter $exportChapter, Book $parent, ZipExportReader $reader): Chapter
+    {
+        $chapter = $this->chapterRepo->create([
+            'name' => $exportChapter->name,
+            'description_html' => $exportChapter->description_html ?? '',
+            'tags' => $this->exportTagsToInputArray($exportChapter->tags ?? []),
+        ], $parent);
+
+        // TODO - Parse/format description_html references
+
+        $exportPages = $exportChapter->pages;
+        usort($exportPages, function (ZipExportPage $a, ZipExportPage $b) {
+            return ($a->priority ?? 0) - ($b->priority ?? 0);
+        });
+
+        foreach ($exportPages as $exportPage) {
+            //
+        }
+        // TODO - Pages
+
+        return $chapter;
+    }
+
+    protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, ZipExportReader $reader): Page
+    {
+        $page = $this->pageRepo->getNewDraftPage($parent);
+
+        // TODO - Import attachments
+        // TODO - Import images
+        // TODO - Parse/format HTML
+
+        $this->pageRepo->publishDraft($page, [
+            'name' => $exportPage->name,
+            'markdown' => $exportPage->markdown,
+            'html' => $exportPage->html,
+            'tags' => $this->exportTagsToInputArray($exportPage->tags ?? []),
+        ]);
+
+        return $page;
+    }
+
+    protected function exportTagsToInputArray(array $exportTags): array
+    {
+        $tags = [];
+
+        /** @var ZipExportTag $tag */
+        foreach ($exportTags as $tag) {
+            $tags[] = ['name' => $tag->name, 'value' => $tag->value ?? ''];
+        }
+
+        return $tags;
+    }
+
+    protected function zipFileToUploadedFile(string $fileName, ZipExportReader $reader): UploadedFile
+    {
+        $tempPath = tempnam(sys_get_temp_dir(), 'bszipextract');
+        $fileStream = $reader->streamFile($fileName);
+        $tempStream = fopen($tempPath, 'wb');
+        stream_copy_to_stream($fileStream, $tempStream);
+        fclose($tempStream);
+
+        $this->tempFilesToCleanup[] = $tempPath;
+
+        return new UploadedFile($tempPath, $fileName);
     }
 
     /**
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index 6cee7356d23..7e5df3f015b 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -135,12 +135,10 @@ embedded within it.
 - `name` - String, required, name of attachment.
 - `link` - String, semi-optional, URL of attachment.
 - `file` - String reference, semi-optional, reference to attachment file.
-- `order` - Number, optional, integer order of the attachments (shown low to high).
 
 Either `link` or `file` must be present, as that will determine the type of attachment. 
 
 #### Tag
 
 - `name` - String, required, name of the tag.
-- `value` - String, optional, value of the tag (can be empty).
-- `order` - Number, optional, integer order of the tags (shown low to high).
\ No newline at end of file
+- `value` - String, optional, value of the tag (can be empty).
\ No newline at end of file

From f12946d581fe66d5269f992db6573bb892286303 Mon Sep 17 00:00:00 2001
From: czemu <pawel.dymek@gmail.com>
Date: Sun, 10 Nov 2024 09:39:33 +0100
Subject: [PATCH 362/666] ExportFormatter: Add book description and check for
 empty book and chapter descriptions in markdown export

---
 app/Entities/Tools/ExportFormatter.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Tools/ExportFormatter.php b/app/Entities/Tools/ExportFormatter.php
index beddfe8e6e0..e85992a9d70 100644
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Entities/Tools/ExportFormatter.php
@@ -315,7 +315,11 @@ public function pageToMarkdown(Page $page): string
     public function chapterToMarkdown(Chapter $chapter): string
     {
         $text = '# ' . $chapter->name . "\n\n";
-        $text .= $chapter->description . "\n\n";
+
+        if (!empty($chapter->description)) {
+            $text .= $chapter->description . "\n\n";
+        }
+
         foreach ($chapter->pages as $page) {
             $text .= $this->pageToMarkdown($page) . "\n\n";
         }
@@ -330,6 +334,11 @@ public function bookToMarkdown(Book $book): string
     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $text = '# ' . $book->name . "\n\n";
+        
+        if (!empty($book->description)) {
+            $text .= $book->description . "\n\n";
+        }
+
         foreach ($bookTree as $bookChild) {
             if ($bookChild instanceof Chapter) {
                 $text .= $this->chapterToMarkdown($bookChild) . "\n\n";

From 378f0d595fe8aa5aca212e1c5ed22944bf8bf1b7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 10 Nov 2024 16:03:50 +0000
Subject: [PATCH 363/666] ZIP Imports: Built out reference parsing/updating
 logic

---
 app/Entities/Repos/PageRepo.php               |  13 +-
 .../ZipExports/ZipExportReferences.php        |   8 +-
 .../ZipExports/ZipImportReferences.php        | 142 ++++++++++++++++++
 app/Exports/ZipExports/ZipImportRunner.php    |  20 ++-
 app/Exports/ZipExports/ZipReferenceParser.php |  72 +++++++--
 5 files changed, 232 insertions(+), 23 deletions(-)
 create mode 100644 app/Exports/ZipExports/ZipImportReferences.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 1bc15392cec..68b1c398f80 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -87,6 +87,17 @@ public function publishDraft(Page $draft, array $input): Page
         return $draft;
     }
 
+    /**
+     * Directly update the content for the given page from the provided input.
+     * Used for direct content access in a way that performs required changes
+     * (Search index & reference regen) without performing an official update.
+     */
+    public function setContentFromInput(Page $page, array $input): void
+    {
+        $this->updateTemplateStatusAndContentFromInput($page, $input);
+        $this->baseRepo->update($page, []);
+    }
+
     /**
      * Update a page in the system.
      */
@@ -121,7 +132,7 @@ public function update(Page $page, array $input): Page
         return $page;
     }
 
-    protected function updateTemplateStatusAndContentFromInput(Page $page, array $input)
+    protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void
     {
         if (isset($input['template']) && userCan('templates-manage')) {
             $page->template = ($input['template'] === 'true');
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index c630c832b37..0de409fa19a 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -85,9 +85,9 @@ public function buildReferences(ZipExportFiles $files): void
         // Parse page content first
         foreach ($this->pages as $page) {
             $handler = $createHandler($page);
-            $page->html = $this->parser->parse($page->html ?? '', $handler);
+            $page->html = $this->parser->parseLinks($page->html ?? '', $handler);
             if ($page->markdown) {
-                $page->markdown = $this->parser->parse($page->markdown, $handler);
+                $page->markdown = $this->parser->parseLinks($page->markdown, $handler);
             }
         }
 
@@ -95,7 +95,7 @@ public function buildReferences(ZipExportFiles $files): void
         foreach ($this->chapters as $chapter) {
             if ($chapter->description_html) {
                 $handler = $createHandler($chapter);
-                $chapter->description_html = $this->parser->parse($chapter->description_html, $handler);
+                $chapter->description_html = $this->parser->parseLinks($chapter->description_html, $handler);
             }
         }
 
@@ -103,7 +103,7 @@ public function buildReferences(ZipExportFiles $files): void
         foreach ($this->books as $book) {
             if ($book->description_html) {
                 $handler = $createHandler($book);
-                $book->description_html = $this->parser->parse($book->description_html, $handler);
+                $book->description_html = $this->parser->parseLinks($book->description_html, $handler);
             }
         }
     }
diff --git a/app/Exports/ZipExports/ZipImportReferences.php b/app/Exports/ZipExports/ZipImportReferences.php
new file mode 100644
index 00000000000..8062886e542
--- /dev/null
+++ b/app/Exports/ZipExports/ZipImportReferences.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use BookStack\App\Model;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Repos\BaseRepo;
+use BookStack\Entities\Repos\PageRepo;
+use BookStack\Exports\ZipExports\Models\ZipExportBook;
+use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Uploads\Attachment;
+use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageResizer;
+
+class ZipImportReferences
+{
+    /** @var Page[] */
+    protected array $pages = [];
+    /** @var Chapter[] */
+    protected array $chapters = [];
+    /** @var Book[] */
+    protected array $books = [];
+    /** @var Attachment[] */
+    protected array $attachments = [];
+    /** @var Image[] */
+    protected array $images = [];
+
+    /** @var array<string, Model> */
+    protected array $referenceMap = [];
+
+    /** @var array<int, ZipExportPage> */
+    protected array $zipExportPageMap = [];
+    /** @var array<int, ZipExportChapter> */
+    protected array $zipExportChapterMap = [];
+    /** @var array<int, ZipExportBook> */
+    protected array $zipExportBookMap = [];
+
+    public function __construct(
+        protected ZipReferenceParser $parser,
+        protected BaseRepo $baseRepo,
+        protected PageRepo $pageRepo,
+        protected ImageResizer $imageResizer,
+    ) {
+    }
+
+    protected function addReference(string $type, Model $model, ?int $importId): void
+    {
+        if ($importId) {
+            $key = $type . ':' . $importId;
+            $this->referenceMap[$key] = $model;
+        }
+    }
+
+    public function addPage(Page $page, ZipExportPage $exportPage): void
+    {
+        $this->pages[] = $page;
+        $this->zipExportPageMap[$page->id] = $exportPage;
+        $this->addReference('page', $page, $exportPage->id);
+    }
+
+    public function addChapter(Chapter $chapter, ZipExportChapter $exportChapter): void
+    {
+        $this->chapters[] = $chapter;
+        $this->zipExportChapterMap[$chapter->id] = $exportChapter;
+        $this->addReference('chapter', $chapter, $exportChapter->id);
+    }
+
+    public function addBook(Book $book, ZipExportBook $exportBook): void
+    {
+        $this->books[] = $book;
+        $this->zipExportBookMap[$book->id] = $exportBook;
+        $this->addReference('book', $book, $exportBook->id);
+    }
+
+    public function addAttachment(Attachment $attachment, ?int $importId): void
+    {
+        $this->attachments[] = $attachment;
+        $this->addReference('attachment', $attachment, $importId);
+    }
+
+    public function addImage(Image $image, ?int $importId): void
+    {
+        $this->images[] = $image;
+        $this->addReference('image', $image, $importId);
+    }
+
+    protected function handleReference(string $type, int $id): ?string
+    {
+        $key = $type . ':' . $id;
+        $model = $this->referenceMap[$key] ?? null;
+        if ($model instanceof Entity) {
+            return $model->getUrl();
+        } else if ($model instanceof Image) {
+            if ($model->type === 'gallery') {
+                $this->imageResizer->loadGalleryThumbnailsForImage($model, false);
+                return $model->thumbs['gallery'] ?? $model->url;
+            }
+
+            return $model->url;
+        }
+
+        return null;
+    }
+
+    public function replaceReferences(): void
+    {
+        foreach ($this->books as $book) {
+            $exportBook = $this->zipExportBookMap[$book->id];
+            $content = $exportBook->description_html || '';
+            $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
+
+            $this->baseRepo->update($book, [
+                'description_html' => $parsed,
+            ]);
+        }
+
+        foreach ($this->chapters as $chapter) {
+            $exportChapter = $this->zipExportChapterMap[$chapter->id];
+            $content = $exportChapter->description_html || '';
+            $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
+
+            $this->baseRepo->update($chapter, [
+                'description_html' => $parsed,
+            ]);
+        }
+
+        foreach ($this->pages as $page) {
+            $exportPage = $this->zipExportPageMap[$page->id];
+            $contentType = $exportPage->markdown ? 'markdown' : 'html';
+            $content = $exportPage->markdown ?: ($exportPage->html ?: '');
+            $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
+
+            $this->pageRepo->setContentFromInput($page, [
+                $contentType => $parsed,
+            ]);
+        }
+    }
+}
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 2b897ff9167..345c22be153 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -23,8 +23,6 @@
 class ZipImportRunner
 {
     protected array $tempFilesToCleanup = []; // TODO
-    protected array $createdImages = []; // TODO
-    protected array $createdAttachments = []; // TODO
 
     public function __construct(
         protected FileStorage $storage,
@@ -32,6 +30,7 @@ public function __construct(
         protected ChapterRepo $chapterRepo,
         protected BookRepo $bookRepo,
         protected ImageService $imageService,
+        protected ZipImportReferences $references,
     ) {
     }
 
@@ -68,6 +67,11 @@ public function run(Import $import, ?Entity $parent = null): void
         // TODO - Run import
           // TODO - In transaction?
             // TODO - Revert uploaded files if goes wrong
+              // TODO - Attachments
+              // TODO - Images
+              // (Both listed/stored in references)
+
+        $this->references->replaceReferences();
     }
 
     protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader): Book
@@ -82,15 +86,17 @@ protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader
         // TODO - Parse/format description_html references
 
         if ($book->cover) {
-            $this->createdImages[] = $book->cover;
+            $this->references->addImage($book->cover, null);
         }
 
         // TODO - Pages
         foreach ($exportBook->chapters as $exportChapter) {
-            $this->importChapter($exportChapter, $book);
+            $this->importChapter($exportChapter, $book, $reader);
         }
         // TODO - Sort chapters/pages by order
 
+        $this->references->addBook($book, $exportBook);
+
         return $book;
     }
 
@@ -114,6 +120,8 @@ protected function importChapter(ZipExportChapter $exportChapter, Book $parent,
         }
         // TODO - Pages
 
+        $this->references->addChapter($chapter, $exportChapter);
+
         return $chapter;
     }
 
@@ -122,7 +130,9 @@ protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, Z
         $page = $this->pageRepo->getNewDraftPage($parent);
 
         // TODO - Import attachments
+          // TODO - Add attachment references
         // TODO - Import images
+          // TODO - Add image references
         // TODO - Parse/format HTML
 
         $this->pageRepo->publishDraft($page, [
@@ -132,6 +142,8 @@ protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, Z
             'tags' => $this->exportTagsToInputArray($exportPage->tags ?? []),
         ]);
 
+        $this->references->addPage($page, $exportPage);
+
         return $page;
     }
 
diff --git a/app/Exports/ZipExports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
index da43d1b366b..5929383b4dd 100644
--- a/app/Exports/ZipExports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -15,27 +15,23 @@
 class ZipReferenceParser
 {
     /**
-     * @var CrossLinkModelResolver[]
+     * @var CrossLinkModelResolver[]|null
      */
-    protected array $modelResolvers;
+    protected ?array $modelResolvers = null;
 
-    public function __construct(EntityQueries $queries)
-    {
-        $this->modelResolvers = [
-            new PagePermalinkModelResolver($queries->pages),
-            new PageLinkModelResolver($queries->pages),
-            new ChapterLinkModelResolver($queries->chapters),
-            new BookLinkModelResolver($queries->books),
-            new ImageModelResolver(),
-            new AttachmentModelResolver(),
-        ];
+    public function __construct(
+        protected EntityQueries $queries
+    ) {
     }
 
     /**
      * Parse and replace references in the given content.
+     * Calls the handler for each model link detected and replaces the link
+     * with the handler return value if provided.
+     * Returns the resulting content with links replaced.
      * @param callable(Model):(string|null) $handler
      */
-    public function parse(string $content, callable $handler): string
+    public function parseLinks(string $content, callable $handler): string
     {
         $escapedBase = preg_quote(url('/'), '/');
         $linkRegex = "/({$escapedBase}.*?)[\\t\\n\\f>\"'=?#()]/";
@@ -59,13 +55,43 @@ public function parse(string $content, callable $handler): string
         return $content;
     }
 
+    /**
+     * Parse and replace references in the given content.
+     * Calls the handler for each reference detected and replaces the link
+     * with the handler return value if provided.
+     * Returns the resulting content string with references replaced.
+     * @param callable(string $type, int $id):(string|null) $handler
+     */
+    public function parseReferences(string $content, callable $handler): string
+    {
+        $referenceRegex = '/\[\[bsexport:([a-z]+):(\d+)]]/';
+        $matches = [];
+        preg_match_all($referenceRegex, $content, $matches);
+
+        if (count($matches) < 3) {
+            return $content;
+        }
+
+        for ($i = 0; $i < count($matches[0]); $i++) {
+            $referenceText = $matches[0][$i];
+            $type = strtolower($matches[1][$i]);
+            $id = intval($matches[2][$i]);
+            $result = $handler($type, $id);
+            if ($result !== null) {
+                $content = str_replace($referenceText, $result, $content);
+            }
+        }
+
+        return $content;
+    }
+
 
     /**
      * Attempt to resolve the given link to a model using the instance model resolvers.
      */
     protected function linkToModel(string $link): ?Model
     {
-        foreach ($this->modelResolvers as $resolver) {
+        foreach ($this->getModelResolvers() as $resolver) {
             $model = $resolver->resolve($link);
             if (!is_null($model)) {
                 return $model;
@@ -74,4 +100,22 @@ protected function linkToModel(string $link): ?Model
 
         return null;
     }
+
+    protected function getModelResolvers(): array
+    {
+        if (isset($this->modelResolvers)) {
+            return $this->modelResolvers;
+        }
+
+        $this->modelResolvers = [
+            new PagePermalinkModelResolver($this->queries->pages),
+            new PageLinkModelResolver($this->queries->pages),
+            new ChapterLinkModelResolver($this->queries->chapters),
+            new BookLinkModelResolver($this->queries->books),
+            new ImageModelResolver(),
+            new AttachmentModelResolver(),
+        ];
+
+        return $this->modelResolvers;
+    }
 }

From 48c101aa7ab5b77781f4cd536b654d037b5aa55e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 11 Nov 2024 15:06:46 +0000
Subject: [PATCH 364/666] ZIP Imports: Finished off core import logic

---
 app/Exceptions/ZipImportException.php         |   3 +-
 app/Exports/Controllers/ImportController.php  |  11 +-
 app/Exports/ImportRepo.php                    |   6 +-
 .../ZipExports/ZipImportReferences.php        |   4 +-
 app/Exports/ZipExports/ZipImportRunner.php    | 117 +++++++++++++++---
 5 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/app/Exceptions/ZipImportException.php b/app/Exceptions/ZipImportException.php
index 2403c514477..452365c6e88 100644
--- a/app/Exceptions/ZipImportException.php
+++ b/app/Exceptions/ZipImportException.php
@@ -7,6 +7,7 @@ class ZipImportException extends \Exception
     public function __construct(
         public array $errors
     ) {
-        parent::__construct();
+        $message = "Import failed with errors:" . implode("\n", $this->errors);
+        parent::__construct($message);
     }
 }
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index ec5ac80808b..4d2c83090a3 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -79,18 +79,21 @@ public function run(int $id, Request $request)
         $import = $this->imports->findVisible($id);
         $parent = null;
 
-        if ($import->getType() === 'page' || $import->getType() === 'chapter') {
+        if ($import->type === 'page' || $import->type === 'chapter') {
             $data = $this->validate($request, [
                 'parent' => ['required', 'string']
             ]);
             $parent = $data['parent'];
         }
 
-        // TODO  - Run import
-           // TODO - Validate again before
-           // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
+        $entity = $this->imports->runImport($import, $parent);
+        if ($entity) {
+            $this->logActivity(ActivityType::IMPORT_RUN, $import);
+            return redirect($entity->getUrl());
+        }
         // TODO - Redirect to result
         // TODO - Or redirect back with errors
+        return 'failed';
     }
 
     /**
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index b94563545a4..d169d4845ab 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -2,9 +2,11 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\ZipExportException;
+use BookStack\Exceptions\ZipImportException;
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
@@ -95,9 +97,9 @@ public function storeFromUpload(UploadedFile $file): Import
     }
 
     /**
-     * @throws ZipValidationException
+     * @throws ZipValidationException|ZipImportException
      */
-    public function runImport(Import $import, ?string $parent = null)
+    public function runImport(Import $import, ?string $parent = null): ?Entity
     {
         $parentModel = null;
         if ($import->type === 'page' || $import->type === 'chapter') {
diff --git a/app/Exports/ZipExports/ZipImportReferences.php b/app/Exports/ZipExports/ZipImportReferences.php
index 8062886e542..3bce16bbb13 100644
--- a/app/Exports/ZipExports/ZipImportReferences.php
+++ b/app/Exports/ZipExports/ZipImportReferences.php
@@ -110,7 +110,7 @@ public function replaceReferences(): void
     {
         foreach ($this->books as $book) {
             $exportBook = $this->zipExportBookMap[$book->id];
-            $content = $exportBook->description_html || '';
+            $content = $exportBook->description_html ?? '';
             $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
 
             $this->baseRepo->update($book, [
@@ -120,7 +120,7 @@ public function replaceReferences(): void
 
         foreach ($this->chapters as $chapter) {
             $exportChapter = $this->zipExportChapterMap[$chapter->id];
-            $content = $exportChapter->description_html || '';
+            $content = $exportChapter->description_html ?? '';
             $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
 
             $this->baseRepo->update($chapter, [
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 345c22be153..9f19f03e2e5 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -12,17 +12,22 @@
 use BookStack\Exceptions\ZipExportException;
 use BookStack\Exceptions\ZipImportException;
 use BookStack\Exports\Import;
+use BookStack\Exports\ZipExports\Models\ZipExportAttachment;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
+use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\Models\ZipExportTag;
+use BookStack\Uploads\Attachment;
+use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\FileStorage;
+use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\UploadedFile;
 
 class ZipImportRunner
 {
-    protected array $tempFilesToCleanup = []; // TODO
+    protected array $tempFilesToCleanup = [];
 
     public function __construct(
         protected FileStorage $storage,
@@ -30,14 +35,19 @@ public function __construct(
         protected ChapterRepo $chapterRepo,
         protected BookRepo $bookRepo,
         protected ImageService $imageService,
+        protected AttachmentService $attachmentService,
         protected ZipImportReferences $references,
     ) {
     }
 
     /**
+     * Run the import.
+     * Performs re-validation on zip, validation on parent provided, and permissions for importing
+     * the planned content, before running the import process.
+     * Returns the top-level entity item which was imported.
      * @throws ZipImportException
      */
-    public function run(Import $import, ?Entity $parent = null): void
+    public function run(Import $import, ?Entity $parent = null): ?Entity
     {
         $zipPath = $this->getZipPath($import);
         $reader = new ZipExportReader($zipPath);
@@ -63,8 +73,16 @@ public function run(Import $import, ?Entity $parent = null): void
         }
 
         $this->ensurePermissionsPermitImport($exportModel);
+        $entity = null;
+
+        if ($exportModel instanceof ZipExportBook) {
+            $entity = $this->importBook($exportModel, $reader);
+        } else if ($exportModel instanceof ZipExportChapter) {
+            $entity = $this->importChapter($exportModel, $parent, $reader);
+        } else if ($exportModel instanceof ZipExportPage) {
+            $entity = $this->importPage($exportModel, $parent, $reader);
+        }
 
-        // TODO - Run import
           // TODO - In transaction?
             // TODO - Revert uploaded files if goes wrong
               // TODO - Attachments
@@ -72,6 +90,23 @@ public function run(Import $import, ?Entity $parent = null): void
               // (Both listed/stored in references)
 
         $this->references->replaceReferences();
+
+        $reader->close();
+        $this->cleanup();
+
+        dd('stop');
+
+        // TODO - Delete import/zip after import?
+          // Do this in parent repo?
+
+        return $entity;
+    }
+
+    protected function cleanup()
+    {
+        foreach ($this->tempFilesToCleanup as $file) {
+            unlink($file);
+        }
     }
 
     protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader): Book
@@ -83,17 +118,26 @@ protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader
             'tags' => $this->exportTagsToInputArray($exportBook->tags ?? []),
         ]);
 
-        // TODO - Parse/format description_html references
-
         if ($book->cover) {
             $this->references->addImage($book->cover, null);
         }
 
-        // TODO - Pages
-        foreach ($exportBook->chapters as $exportChapter) {
-            $this->importChapter($exportChapter, $book, $reader);
+        $children = [
+            ...$exportBook->chapters,
+            ...$exportBook->pages,
+        ];
+
+        usort($children, function (ZipExportPage|ZipExportChapter $a, ZipExportPage|ZipExportChapter $b) {
+            return ($a->priority ?? 0) - ($b->priority ?? 0);
+        });
+
+        foreach ($children as $child) {
+            if ($child instanceof ZipExportChapter) {
+                $this->importChapter($child, $book, $reader);
+            } else if ($child instanceof ZipExportPage) {
+                $this->importPage($child, $book, $reader);
+            }
         }
-        // TODO - Sort chapters/pages by order
 
         $this->references->addBook($book, $exportBook);
 
@@ -108,17 +152,14 @@ protected function importChapter(ZipExportChapter $exportChapter, Book $parent,
             'tags' => $this->exportTagsToInputArray($exportChapter->tags ?? []),
         ], $parent);
 
-        // TODO - Parse/format description_html references
-
         $exportPages = $exportChapter->pages;
         usort($exportPages, function (ZipExportPage $a, ZipExportPage $b) {
             return ($a->priority ?? 0) - ($b->priority ?? 0);
         });
 
         foreach ($exportPages as $exportPage) {
-            //
+            $this->importPage($exportPage, $chapter, $reader);
         }
-        // TODO - Pages
 
         $this->references->addChapter($chapter, $exportChapter);
 
@@ -129,11 +170,13 @@ protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, Z
     {
         $page = $this->pageRepo->getNewDraftPage($parent);
 
-        // TODO - Import attachments
-          // TODO - Add attachment references
-        // TODO - Import images
-          // TODO - Add image references
-        // TODO - Parse/format HTML
+        foreach ($exportPage->attachments as $exportAttachment) {
+            $this->importAttachment($exportAttachment, $page, $reader);
+        }
+
+        foreach ($exportPage->images as $exportImage) {
+            $this->importImage($exportImage, $page, $reader);
+        }
 
         $this->pageRepo->publishDraft($page, [
             'name' => $exportPage->name,
@@ -147,6 +190,40 @@ protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, Z
         return $page;
     }
 
+    protected function importAttachment(ZipExportAttachment $exportAttachment, Page $page, ZipExportReader $reader): Attachment
+    {
+        if ($exportAttachment->file) {
+            $file = $this->zipFileToUploadedFile($exportAttachment->file, $reader);
+            $attachment = $this->attachmentService->saveNewUpload($file, $page->id);
+            $attachment->name = $exportAttachment->name;
+            $attachment->save();
+        } else {
+            $attachment = $this->attachmentService->saveNewFromLink(
+                $exportAttachment->name,
+                $exportAttachment->link ?? '',
+                $page->id,
+            );
+        }
+
+        $this->references->addAttachment($attachment, $exportAttachment->id);
+
+        return $attachment;
+    }
+
+    protected function importImage(ZipExportImage $exportImage, Page $page, ZipExportReader $reader): Image
+    {
+        $file = $this->zipFileToUploadedFile($exportImage->file, $reader);
+        $image = $this->imageService->saveNewFromUpload(
+            $file,
+            $exportImage->type,
+            $page->id,
+        );
+
+        $this->references->addImage($image, $exportImage->id);
+
+        return $image;
+    }
+
     protected function exportTagsToInputArray(array $exportTags): array
     {
         $tags = [];
@@ -235,7 +312,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         }
 
         if (count($attachments) > 0) {
-            if (userCan('attachment-create-all')) {
+            if (!userCan('attachment-create-all')) {
                 $errors[] = 'You are lacking the required permissions to create attachments.';
             }
         }
@@ -257,6 +334,8 @@ protected function getZipPath(Import $import): string
         stream_copy_to_stream($stream, $tempFile);
         fclose($tempFile);
 
+        $this->tempFilesToCleanup[] = $tempFilePath;
+
         return $tempFilePath;
     }
 }

From c40ab4147e38748a90fcfc71d6632cb6e868ed21 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 13 Nov 2024 11:39:04 +0000
Subject: [PATCH 365/666] Dependencies: Updated composer packages

---
 composer.json |   2 +-
 composer.lock | 138 ++++++++++++++++++++++++++------------------------
 2 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/composer.json b/composer.json
index 5c54774f1e2..b9b5c9a0490 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
-        "laravel/framework": "^10.10",
+        "laravel/framework": "^10.48.23",
         "laravel/socialite": "^5.10",
         "laravel/tinker": "^2.8",
         "league/commonmark": "^2.3",
diff --git a/composer.lock b/composer.lock
index f2d585f8fb2..2d798fd6bed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b24a1daf815b6910b51a2acc5e2d38e7",
+    "content-hash": "4a5a18010b7f4b32b7f0ae2a3e6305bb",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.325.4",
+            "version": "3.325.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "86372984539f25485718059f997a4ea12c05ba0a"
+                "reference": "55852104253172e66c3358bf4c35281bbd8622b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/86372984539f25485718059f997a4ea12c05ba0a",
-                "reference": "86372984539f25485718059f997a4ea12c05ba0a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55852104253172e66c3358bf4c35281bbd8622b2",
+                "reference": "55852104253172e66c3358bf4c35281bbd8622b2",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.325.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.325.7"
             },
-            "time": "2024-11-07T19:25:01+00:00"
+            "time": "2024-11-12T19:27:31+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2085,16 +2085,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.22",
+            "version": "v10.48.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "c4ea52bb044faef4a103d7dd81746c01b2ec860e"
+                "reference": "625269ca4881d2b50eded2045cb930960a181d98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c4ea52bb044faef4a103d7dd81746c01b2ec860e",
-                "reference": "c4ea52bb044faef4a103d7dd81746c01b2ec860e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/625269ca4881d2b50eded2045cb930960a181d98",
+                "reference": "625269ca4881d2b50eded2045cb930960a181d98",
                 "shasum": ""
             },
             "require": {
@@ -2288,7 +2288,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-09-12T15:00:09+00:00"
+            "time": "2024-11-12T15:39:10+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2350,16 +2350,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.5",
+            "version": "v1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
+                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
-                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
+                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
                 "shasum": ""
             },
             "require": {
@@ -2407,7 +2407,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-09-23T13:33:08+00:00"
+            "time": "2024-11-11T17:06:04+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -3282,16 +3282,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.7.0",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8"
+                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8",
-                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
+                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
                 "shasum": ""
             },
             "require": {
@@ -3311,12 +3311,14 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.5.17",
+                "php-console/php-console": "^3.1.8",
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
-                "ruflin/elastica": "^7",
+                "rollbar/rollbar": "^4.0",
+                "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -3367,7 +3369,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.7.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
             },
             "funding": [
                 {
@@ -3379,7 +3381,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:40:51+00:00"
+            "time": "2024-11-12T13:57:08+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -5289,16 +5291,16 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.6.0",
+            "version": "v4.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "dea5190981c31b89e52259da9ab1ca4e2b258b21"
+                "reference": "ab0691b82cec77efd90154c78f1854903455c82f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/dea5190981c31b89e52259da9ab1ca4e2b258b21",
-                "reference": "dea5190981c31b89e52259da9ab1ca4e2b258b21",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/ab0691b82cec77efd90154c78f1854903455c82f",
+                "reference": "ab0691b82cec77efd90154c78f1854903455c82f",
                 "shasum": ""
             },
             "require": {
@@ -5359,7 +5361,7 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2024-05-04T07:57:39+00:00"
+            "time": "2024-11-10T01:56:18+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
@@ -7990,16 +7992,16 @@
     "packages-dev": [
         {
             "name": "fakerphp/faker",
-            "version": "v1.23.1",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
+                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/a136842a532bac9ecd8a1c723852b09915d7db50",
+                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50",
                 "shasum": ""
             },
             "require": {
@@ -8047,9 +8049,9 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.0"
             },
-            "time": "2024-01-02T13:46:09+00:00"
+            "time": "2024-11-07T15:11:20+00:00"
         },
         {
             "name": "filp/whoops",
@@ -8250,16 +8252,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.10",
+            "version": "v2.9.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76"
+                "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
-                "reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/54eccd35d1732b9ee4392c25aec606a6a9c521e7",
+                "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7",
                 "shasum": ""
             },
             "require": {
@@ -8277,9 +8279,11 @@
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
+                "laravel/framework": "^9.52.16 || ^10.28.0 || ^11.16",
+                "mockery/mockery": "^1.5.1",
                 "nikic/php-parser": "^4.19.1",
                 "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
-                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "orchestra/testbench-core": "^7.33.0 || ^8.13.0 || ^9.0.9",
                 "phpstan/phpstan-deprecation-rules": "^1.2",
                 "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
@@ -8329,7 +8333,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.10"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.11"
             },
             "funding": [
                 {
@@ -8349,7 +8353,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-10-19T23:04:40+00:00"
+            "time": "2024-11-11T23:11:00+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8436,16 +8440,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                 "shasum": ""
             },
             "require": {
@@ -8484,7 +8488,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
             },
             "funding": [
                 {
@@ -8492,7 +8496,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-12T14:39:25+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -8710,16 +8714,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.10.0",
+            "version": "5.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "91d980ab76c3f152481e367f62b921adc38af451"
+                "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/91d980ab76c3f152481e367f62b921adc38af451",
-                "reference": "91d980ab76c3f152481e367f62b921adc38af451",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/b14fd66496a22d8dd7f7e2791edd9e8674422f17",
+                "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17",
                 "shasum": ""
             },
             "require": {
@@ -8793,20 +8797,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-08-29T20:56:34+00:00"
+            "time": "2024-11-10T04:10:31+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.8",
+            "version": "1.12.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
+                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
-                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
+                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
                 "shasum": ""
             },
             "require": {
@@ -8851,7 +8855,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-06T19:06:49+00:00"
+            "time": "2024-11-11T15:37:09+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10193,16 +10197,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.3",
+            "version": "3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
+                "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
-                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450",
+                "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450",
                 "shasum": ""
             },
             "require": {
@@ -10269,7 +10273,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-09-18T10:38:58+00:00"
+            "time": "2024-11-12T09:53:29+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",

From 306b8774c25d5c7148441c52125800506f8f2891 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 13 Nov 2024 11:59:03 +0000
Subject: [PATCH 366/666] Updated translations with latest Crowdin changes
 (#5317)

* New translations common.php (Ukrainian)

* New translations entities.php (Ukrainian)

* New translations errors.php (Ukrainian)

* New translations activities.php (Czech)

* New translations entities.php (Czech)
---
 lang/cs/activities.php | 2 +-
 lang/cs/entities.php   | 4 ++--
 lang/uk/common.php     | 2 +-
 lang/uk/entities.php   | 4 ++--
 lang/uk/errors.php     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index d0bf9cf4577..412bf9d3be3 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -46,7 +46,7 @@
     'bookshelf_create_from_book_notification'    => 'Kniha byla úspěšně převedena na polici',
     'bookshelf_update'                 => 'aktualizovat polici',
     'bookshelf_update_notification'    => 'Police byla úspěšně aktualizována',
-    'bookshelf_delete'                 => 'odstranit knihovnu',
+    'bookshelf_delete'                 => 'odstranil polici',
     'bookshelf_delete_notification'    => 'Police byla úspěšně odstraněna',
 
     // Revisions
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 6122fe6a445..77fb8a3fb95 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -83,8 +83,8 @@
     'search_update' => 'Aktualizovat hledání',
 
     // Shelves
-    'shelf' => 'Knihovna',
-    'shelves' => 'Knihovny',
+    'shelf' => 'Police',
+    'shelves' => 'Police',
     'x_shelves' => '{0}:count polic|{1}:count police|[2,4]:count police|[5,*]:count polic',
     'shelves_empty' => 'Nebyly vytvořeny žádné police',
     'shelves_create' => 'Vytvořit novou polici',
diff --git a/lang/uk/common.php b/lang/uk/common.php
index d384e392447..aed4880f124 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Умови використання',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Шукати :appName',
 ];
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 664c6ed1725..01549e7f36f 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -224,8 +224,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Очистити вміст)',
     'pages_edit_switch_to_markdown_stable' => '(Стабілізувати вміст)',
     'pages_edit_switch_to_wysiwyg' => 'Змінити редактор на WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Перейти на новий WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(В альфа-тестуванні)',
     'pages_edit_set_changelog' => 'Встановити журнал змін',
     'pages_edit_enter_changelog_desc' => 'Введіть короткий опис внесених вами змін',
     'pages_edit_enter_changelog' => 'Введіть список змін',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 602df64f8f5..7698093c1d5 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ви не можете видалити єдиного адміністратора',
     'users_cannot_delete_guest' => 'Ви не можете видалити гостьового користувача',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Не вдалося створити користувача, оскільки не вдалося надіслати електронний лист із запрошенням',
 
     // Roles
     'role_cannot_be_edited' => 'Цю роль не можна редагувати',

From b7476a9e7fc27c27342a0a155ab256a93f19981e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 14 Nov 2024 15:59:15 +0000
Subject: [PATCH 367/666] ZIP Import: Finished base import process & error
 handling

Added file creation reverting and DB rollback on error.
Added error display on failed import.
Extracted likely shown import form/error text to translation files.
---
 app/Exports/Controllers/ImportController.php  | 25 +++----
 app/Exports/ImportRepo.php                    | 26 ++++++-
 .../ZipExports/ZipImportReferences.php        | 17 +++++
 app/Exports/ZipExports/ZipImportRunner.php    | 69 +++++++++++--------
 app/Uploads/AttachmentService.php             |  2 +-
 app/Uploads/ImageService.php                  | 12 +++-
 lang/en/entities.php                          |  3 +
 lang/en/errors.php                            |  6 ++
 resources/views/exports/import-show.blade.php | 49 ++++++++-----
 .../views/exports/parts/import.blade.php      |  4 +-
 10 files changed, 145 insertions(+), 68 deletions(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 4d2c83090a3..d8dceed2f8e 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -4,7 +4,7 @@
 
 namespace BookStack\Exports\Controllers;
 
-use BookStack\Activity\ActivityType;
+use BookStack\Exceptions\ZipImportException;
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ImportRepo;
 use BookStack\Http\Controller;
@@ -48,12 +48,9 @@ public function upload(Request $request)
         try {
             $import = $this->imports->storeFromUpload($file);
         } catch (ZipValidationException $exception) {
-            session()->flash('validation_errors', $exception->errors);
-            return redirect('/import');
+            return redirect('/import')->with('validation_errors', $exception->errors);
         }
 
-        $this->logActivity(ActivityType::IMPORT_CREATE, $import);
-
         return redirect($import->getUrl());
     }
 
@@ -80,20 +77,20 @@ public function run(int $id, Request $request)
         $parent = null;
 
         if ($import->type === 'page' || $import->type === 'chapter') {
+            session()->setPreviousUrl($import->getUrl());
             $data = $this->validate($request, [
-                'parent' => ['required', 'string']
+                'parent' => ['required', 'string'],
             ]);
             $parent = $data['parent'];
         }
 
-        $entity = $this->imports->runImport($import, $parent);
-        if ($entity) {
-            $this->logActivity(ActivityType::IMPORT_RUN, $import);
-            return redirect($entity->getUrl());
+        try {
+            $entity = $this->imports->runImport($import, $parent);
+        } catch (ZipImportException $exception) {
+            return redirect($import->getUrl())->with('import_errors', $exception->errors);
         }
-        // TODO - Redirect to result
-        // TODO - Or redirect back with errors
-        return 'failed';
+
+        return redirect($entity->getUrl());
     }
 
     /**
@@ -104,8 +101,6 @@ public function delete(int $id)
         $import = $this->imports->findVisible($id);
         $this->imports->deleteImport($import);
 
-        $this->logActivity(ActivityType::IMPORT_DELETE, $import);
-
         return redirect('/import');
     }
 }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index d169d4845ab..f72386c47bc 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports;
 
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
@@ -14,8 +15,10 @@
 use BookStack\Exports\ZipExports\ZipExportReader;
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Exports\ZipExports\ZipImportRunner;
+use BookStack\Facades\Activity;
 use BookStack\Uploads\FileStorage;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImportRepo
@@ -93,25 +96,42 @@ public function storeFromUpload(UploadedFile $file): Import
         $import->path = $path;
         $import->save();
 
+        Activity::add(ActivityType::IMPORT_CREATE, $import);
+
         return $import;
     }
 
     /**
-     * @throws ZipValidationException|ZipImportException
+     * @throws ZipImportException
      */
-    public function runImport(Import $import, ?string $parent = null): ?Entity
+    public function runImport(Import $import, ?string $parent = null): Entity
     {
         $parentModel = null;
         if ($import->type === 'page' || $import->type === 'chapter') {
             $parentModel = $parent ? $this->entityQueries->findVisibleByStringIdentifier($parent) : null;
         }
 
-        return $this->importer->run($import, $parentModel);
+        DB::beginTransaction();
+        try {
+            $model = $this->importer->run($import, $parentModel);
+        } catch (ZipImportException $e) {
+            DB::rollBack();
+            $this->importer->revertStoredFiles();
+            throw $e;
+        }
+
+        DB::commit();
+        $this->deleteImport($import);
+        Activity::add(ActivityType::IMPORT_RUN, $import);
+
+        return $model;
     }
 
     public function deleteImport(Import $import): void
     {
         $this->storage->delete($import->path);
         $import->delete();
+
+        Activity::add(ActivityType::IMPORT_DELETE, $import);
     }
 }
diff --git a/app/Exports/ZipExports/ZipImportReferences.php b/app/Exports/ZipExports/ZipImportReferences.php
index 3bce16bbb13..b23d5e72b15 100644
--- a/app/Exports/ZipExports/ZipImportReferences.php
+++ b/app/Exports/ZipExports/ZipImportReferences.php
@@ -139,4 +139,21 @@ public function replaceReferences(): void
             ]);
         }
     }
+
+
+    /**
+     * @return Image[]
+     */
+    public function images(): array
+    {
+        return $this->images;
+    }
+
+    /**
+     * @return Attachment[]
+     */
+    public function attachments(): array
+    {
+        return $this->attachments;
+    }
 }
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 9f19f03e2e5..c5b9da31909 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -47,14 +47,17 @@ public function __construct(
      * Returns the top-level entity item which was imported.
      * @throws ZipImportException
      */
-    public function run(Import $import, ?Entity $parent = null): ?Entity
+    public function run(Import $import, ?Entity $parent = null): Entity
     {
         $zipPath = $this->getZipPath($import);
         $reader = new ZipExportReader($zipPath);
 
         $errors = (new ZipExportValidator($reader))->validate();
         if ($errors) {
-            throw new ZipImportException(["ZIP failed to validate"]);
+            throw new ZipImportException([
+                trans('errors.import_validation_failed'),
+                ...$errors,
+            ]);
         }
 
         try {
@@ -65,15 +68,14 @@ public function run(Import $import, ?Entity $parent = null): ?Entity
 
         // Validate parent type
         if ($exportModel instanceof ZipExportBook && ($parent !== null)) {
-            throw new ZipImportException(["Must not have a parent set for a Book import"]);
-        } else if ($exportModel instanceof ZipExportChapter && (!$parent instanceof Book)) {
-            throw new ZipImportException(["Parent book required for chapter import"]);
+            throw new ZipImportException(["Must not have a parent set for a Book import."]);
+        } else if ($exportModel instanceof ZipExportChapter && !($parent instanceof Book)) {
+            throw new ZipImportException(["Parent book required for chapter import."]);
         } else if ($exportModel instanceof ZipExportPage && !($parent instanceof Book || $parent instanceof Chapter)) {
-            throw new ZipImportException(["Parent book or chapter required for page import"]);
+            throw new ZipImportException(["Parent book or chapter required for page import."]);
         }
 
-        $this->ensurePermissionsPermitImport($exportModel);
-        $entity = null;
+        $this->ensurePermissionsPermitImport($exportModel, $parent);
 
         if ($exportModel instanceof ZipExportBook) {
             $entity = $this->importBook($exportModel, $reader);
@@ -81,32 +83,46 @@ public function run(Import $import, ?Entity $parent = null): ?Entity
             $entity = $this->importChapter($exportModel, $parent, $reader);
         } else if ($exportModel instanceof ZipExportPage) {
             $entity = $this->importPage($exportModel, $parent, $reader);
+        } else {
+            throw new ZipImportException(['No importable data found in import data.']);
         }
 
-          // TODO - In transaction?
-            // TODO - Revert uploaded files if goes wrong
-              // TODO - Attachments
-              // TODO - Images
-              // (Both listed/stored in references)
-
         $this->references->replaceReferences();
 
         $reader->close();
         $this->cleanup();
 
-        dd('stop');
+        return $entity;
+    }
 
-        // TODO - Delete import/zip after import?
-          // Do this in parent repo?
+    /**
+     * Revert any files which have been stored during this import process.
+     * Considers files only, and avoids the database under the
+     * assumption that the database may already have been
+     * reverted as part of a transaction rollback.
+     */
+    public function revertStoredFiles(): void
+    {
+        foreach ($this->references->images() as $image) {
+            $this->imageService->destroyFileAtPath($image->type, $image->path);
+        }
 
-        return $entity;
+        foreach ($this->references->attachments() as $attachment) {
+            if (!$attachment->external) {
+                $this->attachmentService->deleteFileInStorage($attachment);
+            }
+        }
+
+        $this->cleanup();
     }
 
-    protected function cleanup()
+    protected function cleanup(): void
     {
         foreach ($this->tempFilesToCleanup as $file) {
             unlink($file);
         }
+
+        $this->tempFilesToCleanup = [];
     }
 
     protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader): Book
@@ -256,9 +272,6 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
     {
         $errors = [];
 
-        // TODO - Extract messages to language files
-        // TODO - Ensure these are shown to users on failure
-
         $chapters = [];
         $pages = [];
         $images = [];
@@ -266,7 +279,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
 
         if ($exportModel instanceof ZipExportBook) {
             if (!userCan('book-create-all')) {
-                $errors[] = 'You are lacking the required permission to create books.';
+                $errors[] = trans('errors.import_perms_books');
             }
             array_push($pages, ...$exportModel->pages);
             array_push($chapters, ...$exportModel->chapters);
@@ -283,7 +296,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         if (count($chapters) > 0) {
             $permission = 'chapter-create' . ($parent ? '' : '-all');
             if (!userCan($permission, $parent)) {
-                $errors[] = 'You are lacking the required permission to create chapters.';
+                $errors[] = trans('errors.import_perms_chapters');
             }
         }
 
@@ -295,25 +308,25 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         if (count($pages) > 0) {
             if ($parent) {
                 if (!userCan('page-create', $parent)) {
-                    $errors[] = 'You are lacking the required permission to create pages.';
+                    $errors[] = trans('errors.import_perms_pages');
                 }
             } else {
                 $hasPermission = userCan('page-create-all') || userCan('page-create-own');
                 if (!$hasPermission) {
-                    $errors[] = 'You are lacking the required permission to create pages.';
+                    $errors[] = trans('errors.import_perms_pages');
                 }
             }
         }
 
         if (count($images) > 0) {
             if (!userCan('image-create-all')) {
-                $errors[] = 'You are lacking the required permissions to create images.';
+                $errors[] = trans('errors.import_perms_images');
             }
         }
 
         if (count($attachments) > 0) {
             if (!userCan('attachment-create-all')) {
-                $errors[] = 'You are lacking the required permissions to create attachments.';
+                $errors[] = trans('errors.import_perms_attachments');
             }
         }
 
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index fa53c4ae499..033f2334104 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -151,7 +151,7 @@ public function deleteFile(Attachment $attachment)
      * Delete a file from the filesystem it sits on.
      * Cleans any empty leftover folders.
      */
-    protected function deleteFileInStorage(Attachment $attachment): void
+    public function deleteFileInStorage(Attachment $attachment): void
     {
         $this->storage->delete($attachment->path);
     }
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index e501cc7b12d..5c455cf8633 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -153,11 +153,19 @@ public function getImageStream(Image $image): mixed
      */
     public function destroy(Image $image): void
     {
-        $disk = $this->storage->getDisk($image->type);
-        $disk->destroyAllMatchingNameFromPath($image->path);
+        $this->destroyFileAtPath($image->type, $image->path);
         $image->delete();
     }
 
+    /**
+     * Destroy the underlying image file at the given path.
+     */
+    public function destroyFileAtPath(string $type, string $path): void
+    {
+        $disk = $this->storage->getDisk($type);
+        $disk->destroyAllMatchingNameFromPath($path);
+    }
+
     /**
      * Delete gallery and drawings that are not within HTML content of pages or page revisions.
      * Checks based off of only the image name.
diff --git a/lang/en/entities.php b/lang/en/entities.php
index ae1c1e8d4cc..26a563a7eb5 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -52,6 +52,7 @@
     'import_pending_none' => 'No imports have been started.',
     'import_continue' => 'Continue Import',
     'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
     'import_run' => 'Run Import',
     'import_size' => ':size Import ZIP Size',
     'import_uploaded_at' => 'Uploaded :relativeTime',
@@ -60,6 +61,8 @@
     'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 3f2f303311e..ced80a32c1f 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -109,6 +109,12 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
 
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index 40867377fb0..e4f199aa20c 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -7,8 +7,19 @@
             <h1 class="list-heading">{{ trans('entities.import_continue') }}</h1>
             <p class="text-muted">{{ trans('entities.import_continue_desc') }}</p>
 
+            @if(session()->has('import_errors'))
+                <div class="mb-m">
+                    <label class="setting-list-label mb-xs text-neg">@icon('warning') {{ trans('entities.import_errors') }}</label>
+                    <p class="mb-xs small">{{ trans('entities.import_errors_desc') }}</p>
+                    @foreach(session()->get('import_errors') ?? [] as $error)
+                        <p class="mb-none text-neg">{{ $error }}</p>
+                    @endforeach
+                    <hr class="mt-m">
+                </div>
+            @endif
+
             <div class="mb-m">
-                <label class="setting-list-label mb-m">Import Details</label>
+                <label class="setting-list-label mb-m">{{ trans('entities.import_details') }}</label>
                 <div class="flex-container-row justify-space-between wrap">
                     <div>
                         @include('exports.parts.import-item', ['type' => $import->type, 'model' => $data])
@@ -34,32 +45,36 @@
                 @if($import->type === 'page' || $import->type === 'chapter')
                     <hr>
                     <label class="setting-list-label">{{ trans('entities.import_location') }}</label>
-                    <p class="small mb-m">{{ trans('entities.import_location_desc') }}</p>
+                    <p class="small mb-s">{{ trans('entities.import_location_desc') }}</p>
+                    @if($errors->has('parent'))
+                        <div class="mb-s">
+                            @include('form.errors', ['name' => 'parent'])
+                        </div>
+                    @endif
                     @include('entities.selector', [
                         'name' => 'parent',
                         'entityTypes' => $import->type === 'page' ? 'chapter,book' : 'book',
                         'entityPermission' => "{$import->type}-create",
                         'selectorSize' => 'compact small',
                     ])
-                    @include('form.errors', ['name' => 'parent'])
                 @endif
-            </form>
 
-            <div class="text-right">
-                <a href="{{ url('/import') }}" class="button outline">{{ trans('common.cancel') }}</a>
-                <div component="dropdown" class="inline block mx-s">
-                    <button refs="dropdown@toggle"
-                            type="button"
-                            title="{{ trans('common.delete') }}"
-                            class="button outline">{{ trans('common.delete') }}</button>
-                    <div refs="dropdown@menu" class="dropdown-menu">
-                        <p class="text-neg bold small px-m mb-xs">{{ trans('entities.import_delete_confirm') }}</p>
-                        <p class="small px-m mb-xs">{{ trans('entities.import_delete_desc') }}</p>
-                        <button type="submit" form="import-delete-form" class="text-link small text-item">{{ trans('common.confirm') }}</button>
+                <div class="text-right">
+                    <a href="{{ url('/import') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <div component="dropdown" class="inline block mx-s">
+                        <button refs="dropdown@toggle"
+                                type="button"
+                                title="{{ trans('common.delete') }}"
+                                class="button outline">{{ trans('common.delete') }}</button>
+                        <div refs="dropdown@menu" class="dropdown-menu">
+                            <p class="text-neg bold small px-m mb-xs">{{ trans('entities.import_delete_confirm') }}</p>
+                            <p class="small px-m mb-xs">{{ trans('entities.import_delete_desc') }}</p>
+                            <button type="submit" form="import-delete-form" class="text-link small text-item">{{ trans('common.confirm') }}</button>
+                        </div>
                     </div>
+                    <button type="submit" class="button">{{ trans('entities.import_run') }}</button>
                 </div>
-                <button type="submit" form="import-run-form" class="button">{{ trans('entities.import_run') }}</button>
-            </div>
+            </form>
         </main>
     </div>
 
diff --git a/resources/views/exports/parts/import.blade.php b/resources/views/exports/parts/import.blade.php
index fd53095a422..2f7659c469e 100644
--- a/resources/views/exports/parts/import.blade.php
+++ b/resources/views/exports/parts/import.blade.php
@@ -4,7 +4,7 @@
            class="text-{{ $import->type }}">@icon($import->type) {{ $import->name }}</a>
     </div>
     <div class="px-m py-s flex-container-row gap-m items-center">
-        <div class="bold opacity-80">{{ $import->getSizeString() }}</div>
-        <div class="bold opacity-80 text-muted" title="{{ $import->created_at->toISOString() }}">@icon('time'){{ $import->created_at->diffForHumans() }}</div>
+        <div class="bold opacity-80 text-muted">{{ $import->getSizeString() }}</div>
+        <div class="bold opacity-80 text-muted min-width-xs text-right" title="{{ $import->created_at->toISOString() }}">@icon('time'){{ $import->created_at->diffForHumans() }}</div>
     </div>
 </div>
\ No newline at end of file

From 7681e32dca6cb7d06c2d196bf46239a41a86852c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 16 Nov 2024 13:57:41 +0000
Subject: [PATCH 368/666] ZIP Imports: Added high level import run tests

---
 app/Exports/Controllers/ImportController.php |   4 +-
 database/factories/Exports/ImportFactory.php |   2 +-
 tests/Exports/ZipImportRunnerTest.php        |  21 +++
 tests/Exports/ZipImportTest.php              | 133 +++++++++++++++++--
 tests/Exports/ZipTestHelper.php              |  47 +++++++
 5 files changed, 192 insertions(+), 15 deletions(-)
 create mode 100644 tests/Exports/ZipImportRunnerTest.php
 create mode 100644 tests/Exports/ZipTestHelper.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index d8dceed2f8e..a20c341fb02 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -70,9 +70,11 @@ public function show(int $id)
         ]);
     }
 
+    /**
+     * Run the import process against an uploaded import ZIP.
+     */
     public function run(int $id, Request $request)
     {
-        // TODO - Test access/visibility
         $import = $this->imports->findVisible($id);
         $parent = null;
 
diff --git a/database/factories/Exports/ImportFactory.php b/database/factories/Exports/ImportFactory.php
index 74a2bcd65f3..5d0b4f89299 100644
--- a/database/factories/Exports/ImportFactory.php
+++ b/database/factories/Exports/ImportFactory.php
@@ -21,7 +21,7 @@ class ImportFactory extends Factory
     public function definition(): array
     {
         return [
-            'path' => 'uploads/imports/' . Str::random(10) . '.zip',
+            'path' => 'uploads/files/imports/' . Str::random(10) . '.zip',
             'name' => $this->faker->words(3, true),
             'type' => 'book',
             'metadata' => '{"name": "My book"}',
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
new file mode 100644
index 00000000000..7bdd8ecbb65
--- /dev/null
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Exports\ZipExports\ZipImportRunner;
+use Tests\TestCase;
+
+class ZipImportRunnerTest extends TestCase
+{
+    protected ZipImportRunner $runner;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->runner = app()->make(ZipImportRunner::class);
+    }
+
+    // TODO - Test full book import
+    // TODO - Test full chapter import
+    // TODO - Test full page import
+}
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
index 2b40100aabe..3644e9bdcb7 100644
--- a/tests/Exports/ZipImportTest.php
+++ b/tests/Exports/ZipImportTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Exports;
 
 use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Book;
 use BookStack\Exports\Import;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
@@ -91,7 +92,7 @@ public function test_error_shown_if_missing_data()
     public function test_error_shown_if_no_importable_key()
     {
         $this->asAdmin();
-        $resp = $this->runImportFromFile($this->zipUploadFromData([
+        $resp = $this->runImportFromFile(ZipTestHelper::zipUploadFromData([
             'instance' => []
         ]));
 
@@ -103,7 +104,7 @@ public function test_error_shown_if_no_importable_key()
     public function test_zip_data_validation_messages_shown()
     {
         $this->asAdmin();
-        $resp = $this->runImportFromFile($this->zipUploadFromData([
+        $resp = $this->runImportFromFile(ZipTestHelper::zipUploadFromData([
             'book' => [
                 'id' => 4,
                 'pages' => [
@@ -154,7 +155,7 @@ public function test_import_upload_success()
             ],
         ];
 
-        $resp = $this->runImportFromFile($this->zipUploadFromData($data));
+        $resp = $this->runImportFromFile(ZipTestHelper::zipUploadFromData($data));
 
         $this->assertDatabaseHas('imports', [
             'name' => 'My great book name',
@@ -217,7 +218,7 @@ public function test_import_show_page_access_limited()
     public function test_import_delete()
     {
         $this->asAdmin();
-        $this->runImportFromFile($this->zipUploadFromData([
+        $this->runImportFromFile(ZipTestHelper::zipUploadFromData([
             'book' => [
                 'name' => 'My great book name'
             ],
@@ -262,20 +263,126 @@ public function test_import_delete_access_limited()
         $this->delete("/import/{$adminImport->id}")->assertRedirect('/import');
     }
 
-    protected function runImportFromFile(UploadedFile $file): TestResponse
+    public function test_run_simple_success_scenario()
     {
-        return $this->call('POST', '/import', [], [], ['file' => $file]);
+        $import = ZipTestHelper::importFromData([], [
+            'book' => [
+                'name' => 'My imported book',
+                'pages' => [
+                    [
+                        'name' => 'My imported book page',
+                        'html' => '<p>Hello there from child page!</p>'
+                    ]
+                ],
+            ]
+        ]);
+
+        $resp = $this->asAdmin()->post("/import/{$import->id}");
+        $book = Book::query()->where('name', '=', 'My imported book')->latest()->first();
+        $resp->assertRedirect($book->getUrl());
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSee('My imported book page');
+        $resp->assertSee('Hello there from child page!');
+
+        $this->assertDatabaseMissing('imports', ['id' => $import->id]);
+        $this->assertFileDoesNotExist(storage_path($import->path));
+        $this->assertActivityExists(ActivityType::IMPORT_RUN, null, $import->logDescriptor());
     }
 
-    protected function zipUploadFromData(array $data): UploadedFile
+    public function test_import_run_access_limited()
     {
-        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+        $user = $this->users->editor();
+        $admin = $this->users->admin();
+        $userImport = Import::factory()->create(['name' => 'MySuperUserImport', 'created_by' => $user->id]);
+        $adminImport = Import::factory()->create(['name' => 'MySuperAdminImport', 'created_by' => $admin->id]);
+        $this->actingAs($user);
 
-        $zip = new ZipArchive();
-        $zip->open($zipFile, ZipArchive::CREATE);
-        $zip->addFromString('data.json', json_encode($data));
-        $zip->close();
+        $this->post("/import/{$userImport->id}")->assertRedirect('/');
+        $this->post("/import/{$adminImport->id}")->assertRedirect('/');
+
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $this->post("/import/{$userImport->id}")->assertRedirect($userImport->getUrl()); // Getting validation response instead of access issue response
+        $this->post("/import/{$adminImport->id}")->assertStatus(404);
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        $this->post("/import/{$adminImport->id}")->assertRedirect($adminImport->getUrl()); // Getting validation response instead of access issue response
+    }
+
+    public function test_run_revalidates_content()
+    {
+        $import = ZipTestHelper::importFromData([], [
+            'book' => [
+                'id' => 'abc',
+            ]
+        ]);
+
+        $resp = $this->asAdmin()->post("/import/{$import->id}");
+        $resp->assertRedirect($import->getUrl());
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSeeText('The name field is required.');
+        $resp->assertSeeText('The id must be an integer.');
+    }
+
+    public function test_run_checks_permissions_on_import()
+    {
+        $viewer = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($viewer, ['content-import']);
+        $import = ZipTestHelper::importFromData(['created_by' => $viewer->id], [
+            'book' => ['name' => 'My import book'],
+        ]);
+
+        $resp = $this->asViewer()->post("/import/{$import->id}");
+        $resp->assertRedirect($import->getUrl());
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSeeText('You are lacking the required permissions to create books.');
+    }
+
+    public function test_run_requires_parent_for_chapter_and_page_imports()
+    {
+        $book = $this->entities->book();
+        $pageImport = ZipTestHelper::importFromData([], [
+            'page' => ['name' => 'My page', 'html' => '<p>page test!</p>'],
+        ]);
+        $chapterImport = ZipTestHelper::importFromData([], [
+            'chapter' => ['name' => 'My chapter'],
+        ]);
+
+        $resp = $this->asAdmin()->post("/import/{$pageImport->id}");
+        $resp->assertRedirect($pageImport->getUrl());
+        $this->followRedirects($resp)->assertSee('The parent field is required.');
+
+        $resp = $this->asAdmin()->post("/import/{$pageImport->id}", ['parent' => "book:{$book->id}"]);
+        $resp->assertRedirectContains($book->getUrl());
+
+        $resp = $this->asAdmin()->post("/import/{$chapterImport->id}");
+        $resp->assertRedirect($chapterImport->getUrl());
+        $this->followRedirects($resp)->assertSee('The parent field is required.');
+
+        $resp = $this->asAdmin()->post("/import/{$chapterImport->id}", ['parent' => "book:{$book->id}"]);
+        $resp->assertRedirectContains($book->getUrl());
+    }
+
+    public function test_run_validates_correct_parent_type()
+    {
+        $chapter = $this->entities->chapter();
+        $import = ZipTestHelper::importFromData([], [
+            'chapter' => ['name' => 'My chapter'],
+        ]);
+
+        $resp = $this->asAdmin()->post("/import/{$import->id}", ['parent' => "chapter:{$chapter->id}"]);
+        $resp->assertRedirect($import->getUrl());
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSee('Parent book required for chapter import.');
+    }
 
-        return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
+    protected function runImportFromFile(UploadedFile $file): TestResponse
+    {
+        return $this->call('POST', '/import', [], [], ['file' => $file]);
     }
 }
diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
new file mode 100644
index 00000000000..3a9b3435454
--- /dev/null
+++ b/tests/Exports/ZipTestHelper.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Exports\Import;
+use Illuminate\Http\UploadedFile;
+use ZipArchive;
+
+class ZipTestHelper
+{
+    public static function importFromData(array $importData, array $zipData): Import
+    {
+        if (isset($zipData['book'])) {
+            $importData['type'] = 'book';
+        } else if (isset($zipData['chapter'])) {
+            $importData['type'] = 'chapter';
+        } else if (isset($zipData['page'])) {
+            $importData['type'] = 'page';
+        }
+
+        $import = Import::factory()->create($importData);
+        $zip = static::zipUploadFromData($zipData);
+        rename($zip->getRealPath(), storage_path($import->path));
+
+        return $import;
+    }
+
+    public static function deleteZipForImport(Import $import): void
+    {
+        $path = storage_path($import->path);
+        if (file_exists($path)) {
+            unlink($path);
+        }
+    }
+
+    public static function zipUploadFromData(array $data): UploadedFile
+    {
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::CREATE);
+        $zip->addFromString('data.json', json_encode($data));
+        $zip->close();
+
+        return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
+    }
+}

From 8645aeaa4a914c5ee7e0d07a9202b8812aefcafe Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 16 Nov 2024 16:12:45 +0000
Subject: [PATCH 369/666] ZIP Imports: Started testing core import logic

Fixed image size handling, and lack of attachment reference replacements
during testing.
---
 .../ZipExports/ZipImportReferences.php        |   4 +-
 app/Exports/ZipExports/ZipImportRunner.php    |   4 +
 app/Uploads/ImageService.php                  |   5 +-
 tests/Exports/ZipImportRunnerTest.php         | 152 ++++++++++++++++++
 tests/Exports/ZipTestHelper.php               |  11 +-
 5 files changed, 170 insertions(+), 6 deletions(-)

diff --git a/app/Exports/ZipExports/ZipImportReferences.php b/app/Exports/ZipExports/ZipImportReferences.php
index b23d5e72b15..da0581df6f5 100644
--- a/app/Exports/ZipExports/ZipImportReferences.php
+++ b/app/Exports/ZipExports/ZipImportReferences.php
@@ -97,10 +97,12 @@ protected function handleReference(string $type, int $id): ?string
         } else if ($model instanceof Image) {
             if ($model->type === 'gallery') {
                 $this->imageResizer->loadGalleryThumbnailsForImage($model, false);
-                return $model->thumbs['gallery'] ?? $model->url;
+                return $model->thumbs['display'] ?? $model->url;
             }
 
             return $model->url;
+        } else if ($model instanceof Attachment) {
+            return $model->getUrl(false);
         }
 
         return null;
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index c5b9da31909..27d859e5915 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -233,6 +233,10 @@ protected function importImage(ZipExportImage $exportImage, Page $page, ZipExpor
             $file,
             $exportImage->type,
             $page->id,
+            null,
+            null,
+            true,
+            $exportImage->name,
         );
 
         $this->references->addImage($image, $exportImage->id);
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 5c455cf8633..038e6aa417c 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -33,9 +33,10 @@ public function saveNewFromUpload(
         int $uploadedTo = 0,
         int $resizeWidth = null,
         int $resizeHeight = null,
-        bool $keepRatio = true
+        bool $keepRatio = true,
+        string $imageName = '',
     ): Image {
-        $imageName = $uploadedFile->getClientOriginalName();
+        $imageName = $imageName ?: $uploadedFile->getClientOriginalName();
         $imageData = file_get_contents($uploadedFile->getRealPath());
 
         if ($resizeWidth !== null || $resizeHeight !== null) {
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index 7bdd8ecbb65..f07b3f41b42 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -2,7 +2,10 @@
 
 namespace Tests\Exports;
 
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExports\ZipImportRunner;
+use BookStack\Uploads\Image;
 use Tests\TestCase;
 
 class ZipImportRunnerTest extends TestCase
@@ -15,6 +18,155 @@ protected function setUp(): void
         $this->runner = app()->make(ZipImportRunner::class);
     }
 
+    public function test_book_import()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $testFilePath = $this->files->testFilePath('test-file.txt');
+        $import = ZipTestHelper::importFromData([], [
+            'book' => [
+                'id' => 5,
+                'name' => 'Import test',
+                'cover' => 'book_cover_image',
+                'description_html' => '<p><a href="[[bsexport:page:3]]">Link to chapter page</a></p>',
+                'tags' => [
+                    ['name' => 'Animal', 'value' => 'Cat'],
+                    ['name' => 'Category', 'value' => 'Test'],
+                ],
+                'chapters' => [
+                    [
+                        'id' => 6,
+                        'name' => 'Chapter A',
+                        'description_html' => '<p><a href="[[bsexport:book:5]]">Link to book</a></p>',
+                        'priority' => 1,
+                        'tags' => [
+                            ['name' => 'Reviewed'],
+                            ['name' => 'Category', 'value' => 'Test Chapter'],
+                        ],
+                        'pages' => [
+                            [
+                                'id' => 3,
+                                'name' => 'Page A',
+                                'priority' => 6,
+                                'html' => '
+<p><a href="[[bsexport:page:3]]">Link to self</a></p>
+<p><a href="[[bsexport:image:1]]">Link to cat image</a></p>
+<p><a href="[[bsexport:attachment:4]]">Link to text attachment</a></p>',
+                                'tags' => [
+                                    ['name' => 'Unreviewed'],
+                                ],
+                                'attachments' => [
+                                    [
+                                        'id' => 4,
+                                        'name' => 'Text attachment',
+                                        'file' => 'file_attachment'
+                                    ],
+                                    [
+                                        'name' => 'Cats',
+                                        'link' => 'https://example.com/cats',
+                                    ]
+                                ],
+                                'images' => [
+                                    [
+                                        'id' => 1,
+                                        'name' => 'Cat',
+                                        'type' => 'gallery',
+                                        'file' => 'cat_image'
+                                    ],
+                                    [
+                                        'id' => 2,
+                                        'name' => 'Dog Drawing',
+                                        'type' => 'drawio',
+                                        'file' => 'dog_image'
+                                    ]
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Chapter child B',
+                        'priority' => 5,
+                    ]
+                ],
+                'pages' => [
+                    [
+                        'name' => 'Page C',
+                        'markdown' => '[Link to text]([[bsexport:attachment:4]]?scale=big)',
+                        'priority' => 3,
+                    ]
+                ],
+            ],
+        ], [
+            'book_cover_image' => $testImagePath,
+            'file_attachment'  => $testFilePath,
+            'cat_image' => $testImagePath,
+            'dog_image' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Book $book */
+        $book = $this->runner->run($import);
+
+        // Book checks
+        $this->assertEquals('Import test', $book->name);
+        $this->assertFileExists(public_path($book->cover->path));
+        $this->assertCount(2, $book->tags);
+        $this->assertEquals('Cat', $book->tags()->first()->value);
+        $this->assertCount(2, $book->chapters);
+        $this->assertEquals(1, $book->directPages()->count());
+
+        // Chapter checks
+        $chapterA = $book->chapters()->where('name', 'Chapter A')->first();
+        $this->assertCount(2, $chapterA->tags);
+        $firstChapterTag = $chapterA->tags()->first();
+        $this->assertEquals('Reviewed', $firstChapterTag->name);
+        $this->assertEquals('', $firstChapterTag->value);
+        $this->assertCount(1, $chapterA->pages);
+
+        // Page checks
+        /** @var Page $pageA */
+        $pageA = $chapterA->pages->first();
+        $this->assertEquals('Page A', $pageA->name);
+        $this->assertCount(1, $pageA->tags);
+        $firstPageTag = $pageA->tags()->first();
+        $this->assertEquals('Unreviewed', $firstPageTag->name);
+        $this->assertCount(2, $pageA->attachments);
+        $firstAttachment = $pageA->attachments->first();
+        $this->assertEquals('Text attachment', $firstAttachment->name);
+        $this->assertFileEquals($testFilePath, storage_path($firstAttachment->path));
+        $this->assertFalse($firstAttachment->external);
+        $secondAttachment = $pageA->attachments->last();
+        $this->assertEquals('Cats', $secondAttachment->name);
+        $this->assertEquals('https://example.com/cats', $secondAttachment->path);
+        $this->assertTrue($secondAttachment->external);
+        $pageAImages = Image::where('uploaded_to', '=', $pageA->id)->whereIn('type', ['gallery', 'drawio'])->get();
+        $this->assertCount(2, $pageAImages);
+        $this->assertEquals('Cat', $pageAImages[0]->name);
+        $this->assertEquals('gallery', $pageAImages[0]->type);
+        $this->assertFileEquals($testImagePath, public_path($pageAImages[0]->path));
+        $this->assertEquals('Dog Drawing', $pageAImages[1]->name);
+        $this->assertEquals('drawio', $pageAImages[1]->type);
+
+        // Book order check
+        $children = $book->getDirectVisibleChildren()->values()->all();
+        $this->assertEquals($children[0]->name, 'Chapter A');
+        $this->assertEquals($children[1]->name, 'Page C');
+        $this->assertEquals($children[2]->name, 'Chapter child B');
+
+        // Reference checks
+        $textAttachmentUrl = $firstAttachment->getUrl();
+        $this->assertStringContainsString($pageA->getUrl(), $book->description_html);
+        $this->assertStringContainsString($book->getUrl(), $chapterA->description_html);
+        $this->assertStringContainsString($pageA->getUrl(), $pageA->html);
+        $this->assertStringContainsString($pageAImages[0]->getThumb(1680, null, true), $pageA->html);
+        $this->assertStringContainsString($firstAttachment->getUrl(), $pageA->html);
+
+        // Reference in converted markdown
+        $pageC = $children[1];
+        $this->assertStringContainsString("href=\"{$textAttachmentUrl}?scale=big\"", $pageC->html);
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
+
     // TODO - Test full book import
     // TODO - Test full chapter import
     // TODO - Test full page import
diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
index 3a9b3435454..2196f361c17 100644
--- a/tests/Exports/ZipTestHelper.php
+++ b/tests/Exports/ZipTestHelper.php
@@ -8,7 +8,7 @@
 
 class ZipTestHelper
 {
-    public static function importFromData(array $importData, array $zipData): Import
+    public static function importFromData(array $importData, array $zipData, array $files = []): Import
     {
         if (isset($zipData['book'])) {
             $importData['type'] = 'book';
@@ -19,7 +19,7 @@ public static function importFromData(array $importData, array $zipData): Import
         }
 
         $import = Import::factory()->create($importData);
-        $zip = static::zipUploadFromData($zipData);
+        $zip = static::zipUploadFromData($zipData, $files);
         rename($zip->getRealPath(), storage_path($import->path));
 
         return $import;
@@ -33,13 +33,18 @@ public static function deleteZipForImport(Import $import): void
         }
     }
 
-    public static function zipUploadFromData(array $data): UploadedFile
+    public static function zipUploadFromData(array $data, array $files = []): UploadedFile
     {
         $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
 
         $zip = new ZipArchive();
         $zip->open($zipFile, ZipArchive::CREATE);
         $zip->addFromString('data.json', json_encode($data));
+
+        foreach ($files as $name => $file) {
+            $zip->addFile($file, "files/$name");
+        }
+
         $zip->close();
 
         return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);

From c2c64e207f89567350eab4b40b725e8d042c9654 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 16 Nov 2024 19:52:20 +0000
Subject: [PATCH 370/666] ZIP Imports: Covered import runner with further
 testing

---
 tests/Exports/ZipImportRunnerTest.php | 194 +++++++++++++++++++++++++-
 1 file changed, 191 insertions(+), 3 deletions(-)

diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index f07b3f41b42..c833fadda96 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Exports;
 
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Uploads\Image;
@@ -167,7 +168,194 @@ public function test_book_import()
         ZipTestHelper::deleteZipForImport($import);
     }
 
-    // TODO - Test full book import
-    // TODO - Test full chapter import
-    // TODO - Test full page import
+    public function test_chapter_import()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $testFilePath = $this->files->testFilePath('test-file.txt');
+        $parent = $this->entities->book();
+
+        $import = ZipTestHelper::importFromData([], [
+            'chapter' => [
+                'id' => 6,
+                'name' => 'Chapter A',
+                'description_html' => '<p><a href="[[bsexport:page:3]]">Link to page</a></p>',
+                'priority' => 1,
+                'tags' => [
+                    ['name' => 'Reviewed', 'value' => '2024'],
+                ],
+                'pages' => [
+                    [
+                        'id' => 3,
+                        'name' => 'Page A',
+                        'priority' => 6,
+                        'html' => '<p><a href="[[bsexport:chapter:6]]">Link to chapter</a></p>
+<p><a href="[[bsexport:image:2]]">Link to dog drawing</a></p>
+<p><a href="[[bsexport:attachment:4]]">Link to text attachment</a></p>',
+                        'tags' => [
+                            ['name' => 'Unreviewed'],
+                        ],
+                        'attachments' => [
+                            [
+                                'id' => 4,
+                                'name' => 'Text attachment',
+                                'file' => 'file_attachment'
+                            ]
+                        ],
+                        'images' => [
+                            [
+                                'id' => 2,
+                                'name' => 'Dog Drawing',
+                                'type' => 'drawio',
+                                'file' => 'dog_image'
+                            ]
+                        ],
+                    ],
+                    [
+                        'name' => 'Page B',
+                        'markdown' => '[Link to page A]([[bsexport:page:3]])',
+                        'priority' => 9,
+                    ],
+                ],
+            ],
+        ], [
+            'file_attachment'  => $testFilePath,
+            'dog_image' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Chapter $chapter */
+        $chapter = $this->runner->run($import, $parent);
+
+        // Chapter checks
+        $this->assertEquals('Chapter A', $chapter->name);
+        $this->assertEquals($parent->id, $chapter->book_id);
+        $this->assertCount(1, $chapter->tags);
+        $firstChapterTag = $chapter->tags()->first();
+        $this->assertEquals('Reviewed', $firstChapterTag->name);
+        $this->assertEquals('2024', $firstChapterTag->value);
+        $this->assertCount(2, $chapter->pages);
+
+        // Page checks
+        /** @var Page $pageA */
+        $pageA = $chapter->pages->first();
+        $this->assertEquals('Page A', $pageA->name);
+        $this->assertCount(1, $pageA->tags);
+        $this->assertCount(1, $pageA->attachments);
+        $pageAImages = Image::where('uploaded_to', '=', $pageA->id)->whereIn('type', ['gallery', 'drawio'])->get();
+        $this->assertCount(1, $pageAImages);
+
+        // Reference checks
+        $attachment = $pageA->attachments->first();
+        $this->assertStringContainsString($pageA->getUrl(), $chapter->description_html);
+        $this->assertStringContainsString($chapter->getUrl(), $pageA->html);
+        $this->assertStringContainsString($pageAImages[0]->url, $pageA->html);
+        $this->assertStringContainsString($attachment->getUrl(), $pageA->html);
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
+
+    public function test_page_import()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $testFilePath = $this->files->testFilePath('test-file.txt');
+        $parent = $this->entities->chapter();
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'id' => 3,
+                'name' => 'Page A',
+                'priority' => 6,
+                'html' => '<p><a href="[[bsexport:page:3]]">Link to self</a></p>
+<p><a href="[[bsexport:image:2]]">Link to dog drawing</a></p>
+<p><a href="[[bsexport:attachment:4]]">Link to text attachment</a></p>',
+                'tags' => [
+                    ['name' => 'Unreviewed'],
+                ],
+                'attachments' => [
+                    [
+                        'id' => 4,
+                        'name' => 'Text attachment',
+                        'file' => 'file_attachment'
+                    ]
+                ],
+                'images' => [
+                    [
+                        'id' => 2,
+                        'name' => 'Dog Drawing',
+                        'type' => 'drawio',
+                        'file' => 'dog_image'
+                    ]
+                ],
+            ],
+        ], [
+            'file_attachment'  => $testFilePath,
+            'dog_image' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Page $page */
+        $page = $this->runner->run($import, $parent);
+
+        // Page checks
+        $this->assertEquals('Page A', $page->name);
+        $this->assertCount(1, $page->tags);
+        $this->assertCount(1, $page->attachments);
+        $pageImages = Image::where('uploaded_to', '=', $page->id)->whereIn('type', ['gallery', 'drawio'])->get();
+        $this->assertCount(1, $pageImages);
+        $this->assertFileEquals($testImagePath, public_path($pageImages[0]->path));
+
+        // Reference checks
+        $this->assertStringContainsString($page->getUrl(), $page->html);
+        $this->assertStringContainsString($pageImages[0]->url, $page->html);
+        $this->assertStringContainsString($page->attachments->first()->getUrl(), $page->html);
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
+
+    public function test_revert_cleans_up_uploaded_files()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $testFilePath = $this->files->testFilePath('test-file.txt');
+        $parent = $this->entities->chapter();
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<p>Hello</p>',
+                'attachments' => [
+                    [
+                        'name' => 'Text attachment',
+                        'file' => 'file_attachment'
+                    ]
+                ],
+                'images' => [
+                    [
+                        'name' => 'Dog Image',
+                        'type' => 'gallery',
+                        'file' => 'dog_image'
+                    ]
+                ],
+            ],
+        ], [
+            'file_attachment'  => $testFilePath,
+            'dog_image' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Page $page */
+        $page = $this->runner->run($import, $parent);
+
+        $attachment = $page->attachments->first();
+        $image = Image::query()->where('uploaded_to', '=', $page->id)->where('type', '=', 'gallery')->first();
+
+        $this->assertFileExists(public_path($image->path));
+        $this->assertFileExists(storage_path($attachment->path));
+
+        $this->runner->revertStoredFiles();
+
+        $this->assertFileDoesNotExist(public_path($image->path));
+        $this->assertFileDoesNotExist(storage_path($attachment->path));
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
 }

From e2f6e50df4347579e3b6eb8e7c48bfcb79199a64 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 18 Nov 2024 15:53:21 +0000
Subject: [PATCH 371/666] ZIP Exports: Added ID checks and testing to validator

---
 .../ZipExports/Models/ZipExportAttachment.php |  2 +-
 .../ZipExports/Models/ZipExportBook.php       |  2 +-
 .../ZipExports/Models/ZipExportChapter.php    |  2 +-
 .../ZipExports/Models/ZipExportImage.php      |  2 +-
 .../ZipExports/Models/ZipExportPage.php       |  2 +-
 .../ZipExports/ZipFileReferenceRule.php       |  1 -
 app/Exports/ZipExports/ZipUniqueIdRule.php    | 26 +++++++
 .../ZipExports/ZipValidationHelper.php        | 24 ++++++
 lang/en/validation.php                        |  1 +
 tests/Exports/ZipExportValidatorTests.php     | 74 +++++++++++++++++++
 10 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 app/Exports/ZipExports/ZipUniqueIdRule.php
 create mode 100644 tests/Exports/ZipExportValidatorTests.php

diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index c6615e1dc49..4f5b2f23699 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -43,7 +43,7 @@ public static function fromModelArray(array $attachmentArray, ZipExportFiles $fi
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
-            'id'    => ['nullable', 'int'],
+            'id'    => ['nullable', 'int', $context->uniqueIdRule('attachment')],
             'name'  => ['required', 'string', 'min:1'],
             'link'  => ['required_without:file', 'nullable', 'string'],
             'file'  => ['required_without:link', 'nullable', 'string', $context->fileReferenceRule()],
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 0dc4e93d43c..47ab8f0a699 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -70,7 +70,7 @@ public static function fromModel(Book $model, ZipExportFiles $files): self
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
-            'id'    => ['nullable', 'int'],
+            'id'    => ['nullable', 'int', $context->uniqueIdRule('book')],
             'name'  => ['required', 'string', 'min:1'],
             'description_html' => ['nullable', 'string'],
             'cover' => ['nullable', 'string', $context->fileReferenceRule()],
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index 50440d61a5a..5a5fe350f3a 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -59,7 +59,7 @@ public static function fromModelArray(array $chapterArray, ZipExportFiles $files
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
-            'id'    => ['nullable', 'int'],
+            'id'    => ['nullable', 'int', $context->uniqueIdRule('chapter')],
             'name'  => ['required', 'string', 'min:1'],
             'description_html' => ['nullable', 'string'],
             'priority' => ['nullable', 'int'],
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 691eb918fc6..89083b15be1 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -33,7 +33,7 @@ public function metadataOnly(): void
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
-            'id'    => ['nullable', 'int'],
+            'id'    => ['nullable', 'int', $context->uniqueIdRule('image')],
             'name'  => ['required', 'string', 'min:1'],
             'file'  => ['required', 'string', $context->fileReferenceRule()],
             'type'  => ['required', 'string', Rule::in(['gallery', 'drawio'])],
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 3a876e7aaff..16e7e925539 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -68,7 +68,7 @@ public static function fromModelArray(array $pageArray, ZipExportFiles $files):
     public static function validate(ZipValidationHelper $context, array $data): array
     {
         $rules = [
-            'id'    => ['nullable', 'int'],
+            'id'    => ['nullable', 'int', $context->uniqueIdRule('page')],
             'name'  => ['required', 'string', 'min:1'],
             'html' => ['nullable', 'string'],
             'markdown' => ['nullable', 'string'],
diff --git a/app/Exports/ZipExports/ZipFileReferenceRule.php b/app/Exports/ZipExports/ZipFileReferenceRule.php
index bcd3c39acf0..7d6c829cf03 100644
--- a/app/Exports/ZipExports/ZipFileReferenceRule.php
+++ b/app/Exports/ZipExports/ZipFileReferenceRule.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
-use ZipArchive;
 
 class ZipFileReferenceRule implements ValidationRule
 {
diff --git a/app/Exports/ZipExports/ZipUniqueIdRule.php b/app/Exports/ZipExports/ZipUniqueIdRule.php
new file mode 100644
index 00000000000..ea2b2539296
--- /dev/null
+++ b/app/Exports/ZipExports/ZipUniqueIdRule.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\Exports\ZipExports;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class ZipUniqueIdRule implements ValidationRule
+{
+    public function __construct(
+        protected ZipValidationHelper $context,
+        protected string $modelType,
+    ) {
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if ($this->context->hasIdBeenUsed($this->modelType, $value)) {
+            $fail('validation.zip_unique')->translate(['attribute' => $attribute]);
+        }
+    }
+}
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index 55c86b03b5b..7659c228bcd 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -9,6 +9,13 @@ class ZipValidationHelper
 {
     protected Factory $validationFactory;
 
+    /**
+     * Local store of validated IDs (in format "<type>:<id>". Example: "book:2")
+     * which we can use to check uniqueness.
+     * @var array<string, bool>
+     */
+    protected array $validatedIds = [];
+
     public function __construct(
         public ZipExportReader $zipReader,
     ) {
@@ -31,6 +38,23 @@ public function fileReferenceRule(): ZipFileReferenceRule
         return new ZipFileReferenceRule($this);
     }
 
+    public function uniqueIdRule(string $type): ZipUniqueIdRule
+    {
+        return new ZipUniqueIdRule($this, $type);
+    }
+
+    public function hasIdBeenUsed(string $type, int $id): bool
+    {
+        $key = $type . ':' . $id;
+        if (isset($this->validatedIds[$key])) {
+            return true;
+        }
+
+        $this->validatedIds[$key] = true;
+
+        return false;
+    }
+
     /**
      * Validate an array of relation data arrays that are expected
      * to be for the given ZipExportModel.
diff --git a/lang/en/validation.php b/lang/en/validation.php
index bc01ac47b94..fdfc3d9a9b9 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -107,6 +107,7 @@
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/tests/Exports/ZipExportValidatorTests.php b/tests/Exports/ZipExportValidatorTests.php
new file mode 100644
index 00000000000..4cacea95ec6
--- /dev/null
+++ b/tests/Exports/ZipExportValidatorTests.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Exports;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Exports\ZipExports\ZipExportReader;
+use BookStack\Exports\ZipExports\ZipExportValidator;
+use BookStack\Exports\ZipExports\ZipImportRunner;
+use BookStack\Uploads\Image;
+use Tests\TestCase;
+
+class ZipExportValidatorTests extends TestCase
+{
+    protected array $filesToRemove = [];
+
+    protected function tearDown(): void
+    {
+        foreach ($this->filesToRemove as $file) {
+            unlink($file);
+        }
+
+        parent::tearDown();
+    }
+
+    protected function getValidatorForData(array $zipData, array $files = []): ZipExportValidator
+    {
+        $upload = ZipTestHelper::zipUploadFromData($zipData, $files);
+        $path = $upload->getRealPath();
+        $this->filesToRemove[] = $path;
+        $reader = new ZipExportReader($path);
+        return new ZipExportValidator($reader);
+    }
+
+    public function test_ids_have_to_be_unique()
+    {
+        $validator = $this->getValidatorForData([
+            'book' => [
+                'id' => 4,
+                'name' => 'My book',
+                'pages' => [
+                    [
+                        'id' => 4,
+                        'name' => 'My page',
+                        'markdown' => 'hello',
+                        'attachments' => [
+                            ['id' => 4, 'name' => 'Attachment A', 'link' => 'https://example.com'],
+                            ['id' => 4, 'name' => 'Attachment B', 'link' => 'https://example.com']
+                        ],
+                        'images' => [
+                            ['id' => 4, 'name' => 'Image A', 'type' => 'gallery', 'file' => 'cat'],
+                            ['id' => 4, 'name' => 'Image b', 'type' => 'gallery', 'file' => 'cat'],
+                        ],
+                    ],
+                    ['id' => 4, 'name' => 'My page', 'markdown' => 'hello'],
+                ],
+                'chapters' => [
+                    ['id' => 4, 'name' => 'Chapter 1'],
+                    ['id' => 4, 'name' => 'Chapter 2']
+                ]
+            ]
+        ], ['cat' => $this->files->testFilePath('test-image.png')]);
+
+        $results = $validator->validate();
+        $this->assertCount(4, $results);
+
+        $expectedMessage = 'The id must be unique for the object type within the ZIP.';
+        $this->assertEquals($expectedMessage, $results['book.pages.0.attachments.1.id']);
+        $this->assertEquals($expectedMessage, $results['book.pages.0.images.1.id']);
+        $this->assertEquals($expectedMessage, $results['book.pages.1.id']);
+        $this->assertEquals($expectedMessage, $results['book.chapters.1.id']);
+    }
+}

From 59cfc087e12c8752b4a9f1760db71a13ad6c121c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 18 Nov 2024 17:42:49 +0000
Subject: [PATCH 372/666] ZIP Imports: Added image type validation/handling

Images were missing their extension after import since it was
(potentially) not part of the import data.
This adds validation via mime sniffing (to match normal image upload
checks) and also uses the same logic to sniff out a correct extension.

Added tests to cover.
Also fixed some existing tests around zip functionality.
---
 .../ZipExports/Models/ZipExportImage.php      |  3 +-
 app/Exports/ZipExports/ZipExportReader.php    | 12 +++++++
 .../ZipExports/ZipFileReferenceRule.php       | 12 +++++++
 app/Exports/ZipExports/ZipImportRunner.php    |  8 ++++-
 .../ZipExports/ZipValidationHelper.php        |  6 ++--
 lang/en/validation.php                        |  1 +
 tests/Exports/ZipExportTest.php               |  4 ---
 ...orTests.php => ZipExportValidatorTest.php} | 21 ++++++++++-
 tests/Exports/ZipImportRunnerTest.php         | 35 +++++++++++++++++++
 9 files changed, 92 insertions(+), 10 deletions(-)
 rename tests/Exports/{ZipExportValidatorTests.php => ZipExportValidatorTest.php} (77%)

diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 89083b15be1..e0e7d11986d 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -32,10 +32,11 @@ public function metadataOnly(): void
 
     public static function validate(ZipValidationHelper $context, array $data): array
     {
+        $acceptedImageTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp'];
         $rules = [
             'id'    => ['nullable', 'int', $context->uniqueIdRule('image')],
             'name'  => ['required', 'string', 'min:1'],
-            'file'  => ['required', 'string', $context->fileReferenceRule()],
+            'file'  => ['required', 'string', $context->fileReferenceRule($acceptedImageTypes)],
             'type'  => ['required', 'string', Rule::in(['gallery', 'drawio'])],
         ];
 
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index ebc2fbbc9e1..6b88ef61c33 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -7,6 +7,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Util\WebSafeMimeSniffer;
 use ZipArchive;
 
 class ZipExportReader
@@ -81,6 +82,17 @@ public function streamFile(string $fileName)
         return $this->zip->getStream("files/{$fileName}");
     }
 
+    /**
+     * Sniff the mime type from the file of given name.
+     */
+    public function sniffFileMime(string $fileName): string
+    {
+        $stream = $this->streamFile($fileName);
+        $sniffContent = fread($stream, 2000);
+
+        return (new WebSafeMimeSniffer())->sniff($sniffContent);
+    }
+
     /**
      * @throws ZipExportException
      */
diff --git a/app/Exports/ZipExports/ZipFileReferenceRule.php b/app/Exports/ZipExports/ZipFileReferenceRule.php
index 7d6c829cf03..90e78c060b0 100644
--- a/app/Exports/ZipExports/ZipFileReferenceRule.php
+++ b/app/Exports/ZipExports/ZipFileReferenceRule.php
@@ -9,6 +9,7 @@ class ZipFileReferenceRule implements ValidationRule
 {
     public function __construct(
         protected ZipValidationHelper $context,
+        protected array $acceptedMimes,
     ) {
     }
 
@@ -21,5 +22,16 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         if (!$this->context->zipReader->fileExists($value)) {
             $fail('validation.zip_file')->translate();
         }
+
+        if (!empty($this->acceptedMimes)) {
+            $fileMime = $this->context->zipReader->sniffFileMime($value);
+            if (!in_array($fileMime, $this->acceptedMimes)) {
+                $fail('validation.zip_file_mime')->translate([
+                    'attribute' => $attribute,
+                    'validTypes' => implode(',', $this->acceptedMimes),
+                    'foundType' => $fileMime
+                ]);
+            }
+        }
     }
 }
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 27d859e5915..d25a1621f6e 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -228,6 +228,9 @@ protected function importAttachment(ZipExportAttachment $exportAttachment, Page
 
     protected function importImage(ZipExportImage $exportImage, Page $page, ZipExportReader $reader): Image
     {
+        $mime = $reader->sniffFileMime($exportImage->file);
+        $extension = explode('/', $mime)[1];
+
         $file = $this->zipFileToUploadedFile($exportImage->file, $reader);
         $image = $this->imageService->saveNewFromUpload(
             $file,
@@ -236,9 +239,12 @@ protected function importImage(ZipExportImage $exportImage, Page $page, ZipExpor
             null,
             null,
             true,
-            $exportImage->name,
+            $exportImage->name . '.' . $extension,
         );
 
+        $image->name = $exportImage->name;
+        $image->save();
+
         $this->references->addImage($image, $exportImage->id);
 
         return $image;
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index 7659c228bcd..fd9cd784472 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -33,9 +33,9 @@ public function validateData(array $data, array $rules): array
         return $messages;
     }
 
-    public function fileReferenceRule(): ZipFileReferenceRule
+    public function fileReferenceRule(array $acceptedMimes = []): ZipFileReferenceRule
     {
-        return new ZipFileReferenceRule($this);
+        return new ZipFileReferenceRule($this, $acceptedMimes);
     }
 
     public function uniqueIdRule(string $type): ZipUniqueIdRule
@@ -43,7 +43,7 @@ public function uniqueIdRule(string $type): ZipUniqueIdRule
         return new ZipUniqueIdRule($this, $type);
     }
 
-    public function hasIdBeenUsed(string $type, int $id): bool
+    public function hasIdBeenUsed(string $type, mixed $id): bool
     {
         $key = $type . ':' . $id;
         if (isset($this->validatedIds[$key])) {
diff --git a/lang/en/validation.php b/lang/en/validation.php
index fdfc3d9a9b9..d9b982d1e23 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -106,6 +106,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
 
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index ac07b33aef5..12531239ff3 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -107,12 +107,10 @@ public function test_page_export_with_tags()
             [
                 'name' => 'Exporty',
                 'value' => 'Content',
-                'order' => 1,
             ],
             [
                 'name' => 'Another',
                 'value' => '',
-                'order' => 2,
             ]
         ], $pageData['tags']);
     }
@@ -162,7 +160,6 @@ public function test_page_export_file_attachments()
         $attachmentData = $pageData['attachments'][0];
         $this->assertEquals('PageAttachmentExport.txt', $attachmentData['name']);
         $this->assertEquals($attachment->id, $attachmentData['id']);
-        $this->assertEquals(1, $attachmentData['order']);
         $this->assertArrayNotHasKey('link', $attachmentData);
         $this->assertNotEmpty($attachmentData['file']);
 
@@ -193,7 +190,6 @@ public function test_page_export_link_attachments()
         $attachmentData = $pageData['attachments'][0];
         $this->assertEquals('My link attachment for export', $attachmentData['name']);
         $this->assertEquals($attachment->id, $attachmentData['id']);
-        $this->assertEquals(1, $attachmentData['order']);
         $this->assertEquals('https://example.com/cats', $attachmentData['link']);
         $this->assertArrayNotHasKey('file', $attachmentData);
     }
diff --git a/tests/Exports/ZipExportValidatorTests.php b/tests/Exports/ZipExportValidatorTest.php
similarity index 77%
rename from tests/Exports/ZipExportValidatorTests.php
rename to tests/Exports/ZipExportValidatorTest.php
index 4cacea95ec6..c453ef294d4 100644
--- a/tests/Exports/ZipExportValidatorTests.php
+++ b/tests/Exports/ZipExportValidatorTest.php
@@ -11,7 +11,7 @@
 use BookStack\Uploads\Image;
 use Tests\TestCase;
 
-class ZipExportValidatorTests extends TestCase
+class ZipExportValidatorTest extends TestCase
 {
     protected array $filesToRemove = [];
 
@@ -71,4 +71,23 @@ public function test_ids_have_to_be_unique()
         $this->assertEquals($expectedMessage, $results['book.pages.1.id']);
         $this->assertEquals($expectedMessage, $results['book.chapters.1.id']);
     }
+
+    public function test_image_files_need_to_be_a_valid_detected_image_file()
+    {
+        $validator = $this->getValidatorForData([
+            'page' => [
+                'id' => 4,
+                'name' => 'My page',
+                'markdown' => 'hello',
+                'images' => [
+                    ['id' => 4, 'name' => 'Image A', 'type' => 'gallery', 'file' => 'cat'],
+                ],
+            ]
+        ], ['cat' => $this->files->testFilePath('test-file.txt')]);
+
+        $results = $validator->validate();
+        $this->assertCount(1, $results);
+
+        $this->assertEquals('The file needs to reference a file of type image/png,image/jpeg,image/gif,image/webp, found text/plain.', $results['page.images.0.file']);
+    }
 }
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index c833fadda96..d3af6df76a6 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -358,4 +358,39 @@ public function test_revert_cleans_up_uploaded_files()
 
         ZipTestHelper::deleteZipForImport($import);
     }
+
+    public function test_imported_images_have_their_detected_extension_added()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $parent = $this->entities->chapter();
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<p>hello</p>',
+                'images' => [
+                    [
+                        'id' => 2,
+                        'name' => 'Cat',
+                        'type' => 'gallery',
+                        'file' => 'cat_image'
+                    ]
+                ],
+            ],
+        ], [
+            'cat_image' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Page $page */
+        $page = $this->runner->run($import, $parent);
+
+        $pageImages = Image::where('uploaded_to', '=', $page->id)->whereIn('type', ['gallery', 'drawio'])->get();
+
+        $this->assertCount(1, $pageImages);
+        $this->assertStringEndsWith('.png', $pageImages[0]->url);
+        $this->assertStringEndsWith('.png', $pageImages[0]->path);
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
 }

From c0dff6d4a6227549e7f756cdd0d7cd6a003b9886 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 22 Nov 2024 21:03:04 +0000
Subject: [PATCH 373/666] ZIP Imports: Added book content ordering to import
 preview

---
 app/Exports/ZipExports/Models/ZipExportBook.php    | 14 ++++++++++++++
 app/Exports/ZipExports/Models/ZipExportChapter.php |  7 ++++++-
 app/Exports/ZipExports/Models/ZipExportPage.php    |  2 +-
 app/Exports/ZipExports/ZipExportReader.php         |  1 -
 .../views/exports/parts/import-item.blade.php      | 14 ++++++++------
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 47ab8f0a699..4f641d25bd7 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -36,6 +36,20 @@ public function metadataOnly(): void
         }
     }
 
+    public function children(): array
+    {
+        $children = [
+            ...$this->pages,
+            ...$this->chapters,
+        ];
+
+        usort($children, function ($a, $b) {
+            return ($a->priority ?? 0) - ($b->priority ?? 0);
+        });
+
+        return $children;
+    }
+
     public static function fromModel(Book $model, ZipExportFiles $files): self
     {
         $instance = new self();
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index 5a5fe350f3a..bf2dc78f8de 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -20,7 +20,7 @@ class ZipExportChapter extends ZipExportModel
 
     public function metadataOnly(): void
     {
-        $this->description_html = $this->priority = null;
+        $this->description_html = null;
 
         foreach ($this->pages as $page) {
             $page->metadataOnly();
@@ -30,6 +30,11 @@ public function metadataOnly(): void
         }
     }
 
+    public function children(): array
+    {
+        return $this->pages;
+    }
+
     public static function fromModel(Chapter $model, ZipExportFiles $files): self
     {
         $instance = new self();
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 16e7e925539..097443df02b 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -23,7 +23,7 @@ class ZipExportPage extends ZipExportModel
 
     public function metadataOnly(): void
     {
-        $this->html = $this->markdown = $this->priority = null;
+        $this->html = $this->markdown = null;
 
         foreach ($this->attachments as $attachment) {
             $attachment->metadataOnly();
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index 6b88ef61c33..c3d5c23cfec 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -5,7 +5,6 @@
 use BookStack\Exceptions\ZipExportException;
 use BookStack\Exports\ZipExports\Models\ZipExportBook;
 use BookStack\Exports\ZipExports\Models\ZipExportChapter;
-use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Util\WebSafeMimeSniffer;
 use ZipArchive;
diff --git a/resources/views/exports/parts/import-item.blade.php b/resources/views/exports/parts/import-item.blade.php
index 811a3b31bda..5da4b21405d 100644
--- a/resources/views/exports/parts/import-item.blade.php
+++ b/resources/views/exports/parts/import-item.blade.php
@@ -16,11 +16,13 @@
                 <span>@icon('tag'){{ count($model->tags) }}</span>
             @endif
         </div>
-        @foreach($model->chapters ?? [] as $chapter)
-            @include('exports.parts.import-item', ['type' => 'chapter', 'model' => $chapter])
-        @endforeach
-        @foreach($model->pages ?? [] as $page)
-            @include('exports.parts.import-item', ['type' => 'page', 'model' => $page])
-        @endforeach
+        @if(method_exists($model, 'children'))
+            @foreach($model->children() as $child)
+                @include('exports.parts.import-item', [
+                    'type' => ($child instanceof \BookStack\Exports\ZipExports\Models\ZipExportPage) ? 'page' : 'chapter',
+                    'model' => $child
+                ])
+            @endforeach
+        @endif
     </div>
 </div>
\ No newline at end of file

From f79c6aef8d1c9aa83e9ce89ec1e5ac9d9e1eb570 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 22 Nov 2024 21:36:42 +0000
Subject: [PATCH 374/666] ZIP Imports: Updated import form to show loading
 indicator

And disable button after submit.
Added here because the import could take some time, so it's best to show
an indicator to the user to show that something is happening, and help
prevent duplicate submission or re-submit attempts.
---
 resources/js/components/index.js              |  1 +
 resources/js/components/loading-button.ts     | 38 +++++++++++++++++++
 resources/sass/styles.scss                    |  4 ++
 resources/views/exports/import-show.blade.php |  4 +-
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/components/loading-button.ts

diff --git a/resources/js/components/index.js b/resources/js/components/index.js
index 8ad5e14cb2e..12c991a51d8 100644
--- a/resources/js/components/index.js
+++ b/resources/js/components/index.js
@@ -30,6 +30,7 @@ export {HeaderMobileToggle} from './header-mobile-toggle';
 export {ImageManager} from './image-manager';
 export {ImagePicker} from './image-picker';
 export {ListSortControl} from './list-sort-control';
+export {LoadingButton} from './loading-button';
 export {MarkdownEditor} from './markdown-editor';
 export {NewUserPassword} from './new-user-password';
 export {Notification} from './notification';
diff --git a/resources/js/components/loading-button.ts b/resources/js/components/loading-button.ts
new file mode 100644
index 00000000000..a793d30a235
--- /dev/null
+++ b/resources/js/components/loading-button.ts
@@ -0,0 +1,38 @@
+import {Component} from "./component.js";
+import {showLoading} from "../services/dom";
+import {el} from "../wysiwyg/utils/dom";
+
+/**
+ * Loading button.
+ * Shows a loading indicator and disables the button when the button is clicked,
+ * or when the form attached to the button is submitted.
+ */
+export class LoadingButton extends Component {
+
+    protected button!: HTMLButtonElement;
+    protected loadingEl: HTMLDivElement|null = null;
+
+    setup() {
+        this.button = this.$el as HTMLButtonElement;
+        const form = this.button.form;
+
+        const action = () => {
+            setTimeout(() => this.showLoadingState(), 10)
+        };
+
+        this.button.addEventListener('click', action);
+        if (form) {
+            form.addEventListener('submit', action);
+        }
+    }
+
+    showLoadingState() {
+        this.button.disabled = true;
+
+        if (!this.loadingEl) {
+            this.loadingEl = el('div', {class: 'inline block'}) as HTMLDivElement;
+            showLoading(this.loadingEl);
+            this.button.after(this.loadingEl);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 2cf3cbf8221..2106f86e625 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -106,6 +106,10 @@ $loadingSize: 10px;
   }
 }
 
+.inline.block .loading-container {
+  margin: $-xs $-s;
+}
+
 .skip-to-content-link {
   position: fixed;
   top: -52px;
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index e4f199aa20c..a28b79bb35c 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -59,7 +59,7 @@
                     ])
                 @endif
 
-                <div class="text-right">
+                <div class="flex-container-row items-center justify-flex-end">
                     <a href="{{ url('/import') }}" class="button outline">{{ trans('common.cancel') }}</a>
                     <div component="dropdown" class="inline block mx-s">
                         <button refs="dropdown@toggle"
@@ -72,7 +72,7 @@ class="button outline">{{ trans('common.delete') }}</button>
                             <button type="submit" form="import-delete-form" class="text-link small text-item">{{ trans('common.confirm') }}</button>
                         </div>
                     </div>
-                    <button type="submit" class="button">{{ trans('entities.import_run') }}</button>
+                    <button component="loading-button" type="submit" class="button">{{ trans('entities.import_run') }}</button>
                 </div>
             </form>
         </main>

From 9ecc91929a60a66ff7e821dfbc9d2b55197988f7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 25 Nov 2024 15:54:15 +0000
Subject: [PATCH 375/666] ZIP Import & Exports: Addressed issues during testing

- Handled links to within-zip page images found in chapter/book
  descriptions; Added test to cover.
- Fixed session showing unrelated success on failed import.

Tested import file-create undo on failure as part of this testing.
---
 app/Exports/Controllers/ImportController.php  |  2 ++
 .../ZipExports/ZipExportReferences.php        |  7 ++---
 lang/en/errors.php                            |  1 +
 tests/Exports/ZipExportTest.php               | 26 +++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index a20c341fb02..b938dac8e29 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -89,6 +89,8 @@ public function run(int $id, Request $request)
         try {
             $entity = $this->imports->runImport($import, $parent);
         } catch (ZipImportException $exception) {
+            session()->flush();
+            $this->showErrorNotification(trans('errors.import_zip_failed_notification'));
             return redirect($import->getUrl())->with('import_errors', $exception->errors);
         }
 
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index 0de409fa19a..bf5e02133ef 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -127,11 +127,12 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
                 return null;
             }
 
-            // We don't expect images to be part of book/chapter content
-            if (!($exportModel instanceof ZipExportPage)) {
-                return null;
+            // Handle simple links outside of page content
+            if (!($exportModel instanceof ZipExportPage) && isset($this->images[$model->id])) {
+                return "[[bsexport:image:{$model->id}]]";
             }
 
+            // Find and include images if in visibility
             $page = $model->getPage();
             if ($page && userCan('view', $page)) {
                 if (!isset($this->images[$model->id])) {
diff --git a/lang/en/errors.php b/lang/en/errors.php
index ced80a32c1f..9d738379648 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -110,6 +110,7 @@
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
     'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
     'import_perms_pages' => 'You are lacking the required permissions to create pages.',
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 12531239ff3..6e8462f596f 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -274,6 +274,32 @@ public function test_cross_reference_links_are_converted()
         $this->assertStringContainsString('href="[[bsexport:book:' . $book->id . ']]?view=true"', $pageData['html']);
     }
 
+    public function test_book_and_chapter_description_links_to_images_in_pages_are_converted()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $page = $chapter->pages()->first();
+
+        $this->asEditor();
+        $this->files->uploadGalleryImageToPage($this, $page);
+        /** @var Image $image */
+        $image = Image::query()->where('type', '=', 'gallery')
+            ->where('uploaded_to', '=', $page->id)->first();
+
+        $book->description_html = '<p><a href="' . $image->url . '">Link to image</a></p>';
+        $book->save();
+        $chapter->description_html = '<p><a href="' . $image->url . '">Link to image</a></p>';
+        $chapter->save();
+
+        $zipResp = $this->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $bookData = $zip->data['book'];
+        $chapterData = $bookData['chapters'][0];
+
+        $this->assertStringContainsString('href="[[bsexport:image:' . $image->id . ']]"', $bookData['description_html']);
+        $this->assertStringContainsString('href="[[bsexport:image:' . $image->id . ']]"', $chapterData['description_html']);
+    }
+
     public function test_cross_reference_links_external_to_export_are_not_converted()
     {
         $page = $this->entities->page();

From 95d62e7f573b5bbb04a66fae926c8a33c6ab5c43 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 25 Nov 2024 16:23:59 +0000
Subject: [PATCH 376/666] ZIP Imports/Exports: Fixed some lint and test issues

- Updated test handling to create imports folder when required.
- Updated some tests to delete created import zip files.
---
 resources/js/components/index.js         | 2 +-
 resources/js/components/page-comments.js | 1 -
 tests/Exports/ZipImportTest.php          | 8 ++++++++
 tests/Exports/ZipTestHelper.php          | 9 ++++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/index.js b/resources/js/components/index.js
index 12c991a51d8..24e60bd97f2 100644
--- a/resources/js/components/index.js
+++ b/resources/js/components/index.js
@@ -30,7 +30,7 @@ export {HeaderMobileToggle} from './header-mobile-toggle';
 export {ImageManager} from './image-manager';
 export {ImagePicker} from './image-picker';
 export {ListSortControl} from './list-sort-control';
-export {LoadingButton} from './loading-button';
+export {LoadingButton} from './loading-button.ts';
 export {MarkdownEditor} from './markdown-editor';
 export {NewUserPassword} from './new-user-password';
 export {Notification} from './notification';
diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.js
index 1d6abfe2044..63900888aca 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.js
@@ -93,7 +93,6 @@ export class PageComments extends Component {
 
     updateCount() {
         const count = this.getCommentCount();
-        console.log('update count', count, this.container);
         this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
     }
 
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
index 3644e9bdcb7..ad0e6b24137 100644
--- a/tests/Exports/ZipImportTest.php
+++ b/tests/Exports/ZipImportTest.php
@@ -168,6 +168,8 @@ public function test_import_upload_success()
         $resp->assertRedirect("/import/{$import->id}");
         $this->assertFileExists(storage_path($import->path));
         $this->assertActivityExists(ActivityType::IMPORT_CREATE);
+
+        ZipTestHelper::deleteZipForImport($import);
     }
 
     public function test_import_show_page()
@@ -325,6 +327,8 @@ public function test_run_revalidates_content()
         $resp = $this->followRedirects($resp);
         $resp->assertSeeText('The name field is required.');
         $resp->assertSeeText('The id must be an integer.');
+
+        ZipTestHelper::deleteZipForImport($import);
     }
 
     public function test_run_checks_permissions_on_import()
@@ -340,6 +344,8 @@ public function test_run_checks_permissions_on_import()
 
         $resp = $this->followRedirects($resp);
         $resp->assertSeeText('You are lacking the required permissions to create books.');
+
+        ZipTestHelper::deleteZipForImport($import);
     }
 
     public function test_run_requires_parent_for_chapter_and_page_imports()
@@ -379,6 +385,8 @@ public function test_run_validates_correct_parent_type()
 
         $resp = $this->followRedirects($resp);
         $resp->assertSee('Parent book required for chapter import.');
+
+        ZipTestHelper::deleteZipForImport($import);
     }
 
     protected function runImportFromFile(UploadedFile $file): TestResponse
diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
index 2196f361c17..d830d8eb6bf 100644
--- a/tests/Exports/ZipTestHelper.php
+++ b/tests/Exports/ZipTestHelper.php
@@ -20,7 +20,14 @@ public static function importFromData(array $importData, array $zipData, array $
 
         $import = Import::factory()->create($importData);
         $zip = static::zipUploadFromData($zipData, $files);
-        rename($zip->getRealPath(), storage_path($import->path));
+        $targetPath = storage_path($import->path);
+        $targetDir = dirname($targetPath);
+
+        if (!file_exists($targetDir)) {
+            mkdir($targetDir);
+        }
+
+        rename($zip->getRealPath(), $targetPath);
 
         return $import;
     }

From 0a182a45ba944c807c7a5ba6d6ba3a48809e1dc2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 26 Nov 2024 15:59:39 +0000
Subject: [PATCH 377/666] ZIP Exports: Added detection/handling of images with
 external storage

Added test to cover.
---
 app/Exports/ZipExports/ZipReferenceParser.php | 23 +++++++++++++--
 .../ModelResolvers/ImageModelResolver.php     | 29 +++++++++++++++++--
 app/Uploads/ImageStorage.php                  | 16 ++++++++--
 tests/Exports/ZipExportTest.php               | 24 +++++++++++++++
 4 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/app/Exports/ZipExports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
index 5929383b4dd..a6560e3f289 100644
--- a/app/Exports/ZipExports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -11,6 +11,7 @@
 use BookStack\References\ModelResolvers\ImageModelResolver;
 use BookStack\References\ModelResolvers\PageLinkModelResolver;
 use BookStack\References\ModelResolvers\PagePermalinkModelResolver;
+use BookStack\Uploads\ImageStorage;
 
 class ZipReferenceParser
 {
@@ -33,8 +34,7 @@ public function __construct(
      */
     public function parseLinks(string $content, callable $handler): string
     {
-        $escapedBase = preg_quote(url('/'), '/');
-        $linkRegex = "/({$escapedBase}.*?)[\\t\\n\\f>\"'=?#()]/";
+        $linkRegex = $this->getLinkRegex();
         $matches = [];
         preg_match_all($linkRegex, $content, $matches);
 
@@ -118,4 +118,23 @@ protected function getModelResolvers(): array
 
         return $this->modelResolvers;
     }
+
+    /**
+     * Build the regex to identify links we should handle in content.
+     */
+    protected function getLinkRegex(): string
+    {
+        $urls = [rtrim(url('/'), '/')];
+        $imageUrl = rtrim(ImageStorage::getPublicUrl('/'), '/');
+        if ($urls[0] !== $imageUrl) {
+            $urls[] = $imageUrl;
+        }
+
+
+        $urlBaseRegex = implode('|', array_map(function ($url) {
+            return preg_quote($url, '/');
+        }, $urls));
+
+        return "/(({$urlBaseRegex}).*?)[\\t\\n\\f>\"'=?#()]/";
+    }
 }
diff --git a/app/References/ModelResolvers/ImageModelResolver.php b/app/References/ModelResolvers/ImageModelResolver.php
index 331dd593b73..2c6c9fecd74 100644
--- a/app/References/ModelResolvers/ImageModelResolver.php
+++ b/app/References/ModelResolvers/ImageModelResolver.php
@@ -3,19 +3,22 @@
 namespace BookStack\References\ModelResolvers;
 
 use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageStorage;
 
 class ImageModelResolver implements CrossLinkModelResolver
 {
+    protected ?string $pattern = null;
+
     public function resolve(string $link): ?Image
     {
-        $pattern = '/^' . preg_quote(url('/uploads/images'), '/') . '\/(.+)/';
+        $pattern = $this->getUrlPattern();
         $matches = [];
         $match = preg_match($pattern, $link, $matches);
         if (!$match) {
             return null;
         }
 
-        $path = $matches[1];
+        $path = $matches[2];
 
         // Strip thumbnail element from path if existing
         $originalPathSplit = array_filter(explode('/', $path), function (string $part) {
@@ -30,4 +33,26 @@ public function resolve(string $link): ?Image
 
         return Image::query()->where('path', '=', $fullPath)->first();
     }
+
+    /**
+     * Get the regex pattern to identify image URLs.
+     * Caches the pattern since it requires looking up to settings/config.
+     */
+    protected function getUrlPattern(): string
+    {
+        if ($this->pattern) {
+            return $this->pattern;
+        }
+
+        $urls = [url('/uploads/images')];
+        $baseImageUrl = ImageStorage::getPublicUrl('/uploads/images');
+        if ($baseImageUrl !== $urls[0]) {
+            $urls[] = $baseImageUrl;
+        }
+
+        $imageUrlRegex = implode('|', array_map(fn ($url) => preg_quote($url, '/'), $urls));
+        $this->pattern = '/^(' . $imageUrlRegex . ')\/(.+)/';
+
+        return $this->pattern;
+    }
 }
diff --git a/app/Uploads/ImageStorage.php b/app/Uploads/ImageStorage.php
index dc4abc0f281..ddaa26a9400 100644
--- a/app/Uploads/ImageStorage.php
+++ b/app/Uploads/ImageStorage.php
@@ -110,10 +110,20 @@ public function urlToPath(string $url): ?string
     }
 
     /**
-     * Gets a public facing url for an image by checking relevant environment variables.
+     * Gets a public facing url for an image or location at the given path.
+     */
+    public static function getPublicUrl(string $filePath): string
+    {
+        return static::getPublicBaseUrl() . '/' . ltrim($filePath, '/');
+    }
+
+    /**
+     * Get the public base URL used for images.
+     * Will not include any path element of the image file, just the base part
+     * from where the path is then expected to start from.
      * If s3-style store is in use it will default to guessing a public bucket URL.
      */
-    public function getPublicUrl(string $filePath): string
+    protected static function getPublicBaseUrl(): string
     {
         $storageUrl = config('filesystems.url');
 
@@ -131,6 +141,6 @@ public function getPublicUrl(string $filePath): string
 
         $basePath = $storageUrl ?: url('/');
 
-        return rtrim($basePath, '/') . $filePath;
+        return rtrim($basePath, '/');
     }
 }
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 6e8462f596f..17891c73d73 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -300,6 +300,30 @@ public function test_book_and_chapter_description_links_to_images_in_pages_are_c
         $this->assertStringContainsString('href="[[bsexport:image:' . $image->id . ']]"', $chapterData['description_html']);
     }
 
+    public function test_image_links_are_handled_when_using_external_storage_url()
+    {
+        $page = $this->entities->page();
+
+        $this->asEditor();
+        $this->files->uploadGalleryImageToPage($this, $page);
+        /** @var Image $image */
+        $image = Image::query()->where('type', '=', 'gallery')
+            ->where('uploaded_to', '=', $page->id)->first();
+
+        config()->set('filesystems.url', 'https://i.example.com/content');
+
+        $storageUrl = 'https://i.example.com/content/' . ltrim($image->path, '/');
+        $page->html = '<p><a href="' . $image->url . '">Original URL</a><a href="' . $storageUrl . '">Storage URL</a></p>';
+        $page->save();
+
+        $zipResp = $this->get($page->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $ref = '[[bsexport:image:' . $image->id . ']]';
+        $this->assertStringContainsString("<a href=\"{$ref}\">Original URL</a><a href=\"{$ref}\">Storage URL</a>", $pageData['html']);
+    }
+
     public function test_cross_reference_links_external_to_export_are_not_converted()
     {
         $page = $this->entities->page();

From 17f7afe12d617358ba59489fb544f339839e7370 Mon Sep 17 00:00:00 2001
From: Wes Biggs <wes.biggs@amplica.io>
Date: Tue, 26 Nov 2024 11:21:20 -0600
Subject: [PATCH 378/666] Updates the OIDC userinfo endpoint request to allow
 for a `Content-Type` response header with optional parameters, like
 `application/json; charset=utf-8`. This was causing an issue when integrating
 with [node-oidc-provider](https://github.com/panva/node-oidc-provider).

---
 app/Access/Oidc/OidcUserinfoResponse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
index 9aded654e31..ffcacb8dee8 100644
--- a/app/Access/Oidc/OidcUserinfoResponse.php
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -11,7 +11,7 @@ class OidcUserinfoResponse implements ProvidesClaims
 
     public function __construct(ResponseInterface $response, string $issuer, array $keys)
     {
-        $contentType = $response->getHeader('Content-Type')[0];
+        $contentType = explode(';', $response->getHeader('Content-Type')[0], 2)[0];
         if ($contentType === 'application/json') {
             $this->claims = json_decode($response->getBody()->getContents(), true);
         }

From edb684c72ce0b1f1cf9be90d338ee08e24b4a0cc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 26 Nov 2024 17:53:20 +0000
Subject: [PATCH 379/666] ZIP Exports: Updated format doc with advisories
 regarding html/md

---
 dev/docs/portable-zip-file-format.md | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index 7e5df3f015b..fbb31785824 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -13,7 +13,8 @@ Following the goals & ideals of BookStack, stability is very important. We aim f
 - Where reasonably possible, we will attempt to avoid modifications/removals of existing features/properties.
 - Where potentially breaking changes do have to be made, these will be noted in BookStack release/update notes.
 
-The addition of new features/properties alone are not considered as a breaking change to the format. Breaking changes are considered as such where they could impact common/expected use of the existing properties and features we document, they are not considered based upon user assumptions or any possible breakage. For example if your application, using the format, breaks because we added a new property while you hard-coded your application to use the third property (instead of a property name), then that's on you.
+The addition of new features/properties alone are not considered as a breaking change to the format. Breaking changes are considered as such where they could impact common/expected use of the existing properties and features we document, they are not considered based upon user assumptions or any possible breakage.
+For example if your application, using the format, breaks because we added a new property while you hard-coded your application to use the third property (instead of a property name), then that's on you.
 
 ## Format Outline
 
@@ -57,6 +58,23 @@ Here's an example of each type of such reference that could be used:
 [[bsexport:book:8]]
 ```
 
+## HTML & Markdown Content
+
+BookStack commonly stores & utilises content in the HTML format.
+Properties that expect or provided HTML will either be named `html` or contain `html` in the property name.
+While BookStack supports a range of HTML, not all HTML content will be supported by BookStack and be assured to work as desired across all BookStack features.
+The HTML supported by BookStack is not yet formally documented, but you can inspect to what the WYSIWYG editor produces as a basis.
+Generally, top-level elements should keep to common block formats (p, blockquote, h1, h2 etc...) with no nesting or custom structure apart from common inline elements.
+Some areas of BookStack where HTML is used, like book & chapter descriptions, will strictly limit/filter HTML tag & attributes to an allow-list.
+
+For markdown content, in BookStack we target [the commonmark spec](https://commonmark.org/) with the addition of tables & task-lists.
+HTML within markdown is supported but not all HTML is assured to work as advised above.
+
+### Content Security
+
+If you're consuming HTML or markdown within an export please consider that the content is not assured to be safe, even if provided directly by a BookStack instance. It's best to treat such content as potentially unsafe.
+By default, BookStack performs some basic filtering to remove scripts among other potentially dangerous elements but this is not foolproof. BookStack itself relies on additional security mechanisms such as [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) to help prevent a range of exploits.
+
 ## Export Data - `data.json`
 
 The `data.json` file is a JSON format file which contains all structured data for the export. The properties are as follows:
@@ -114,9 +132,9 @@ The `pages` are not all pages within the book, just those that are direct childr
 - `images` - [Image](#image) array, optional, images used in this page.
 - `tags` - [Tag](#tag) array, optional, tags assigned to this page.
 
-To define the page content, either `markdown` or `html` should be provided. Ideally these should be limited to the range of markdown and HTML which BookStack supports.
+To define the page content, either `markdown` or `html` should be provided. Ideally these should be limited to the range of markdown and HTML which BookStack supports. See the ["HTML & Markdown Content"](#html--markdown-content) section.
 
-The page editor type, and edit content will be determined by what content is provided. If non-empty `markdown` is provided, the page will be assumed as a markdown editor page (where permissions allow) and the HTML will be rendered from the markdown content. Otherwise, the provided `html` will be used as editor and display content.
+The page editor type, and edit content will be determined by what content is provided. If non-empty `markdown` is provided, the page will be assumed as a markdown editor page (where permissions allow) and the HTML will be rendered from the markdown content. Otherwise, the provided `html` will be used as editor & display content.
 
 #### Image
 

From bdca9fc1ce6f3f792106e86348cfb1479f4dd27c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 27 Nov 2024 16:30:19 +0000
Subject: [PATCH 380/666] ZIP Exports: Changed the instance id mechanism

Adds an instance id via app settings.
---
 app/Exports/ZipExports/ZipExportBuilder.php   |  4 +--
 ...4_11_27_171039_add_instance_id_setting.php | 30 +++++++++++++++++++
 dev/docs/portable-zip-file-format.md          |  6 ++--
 tests/Exports/ZipExportTest.php               |  6 ++--
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 database/migrations/2024_11_27_171039_add_instance_id_setting.php

diff --git a/app/Exports/ZipExports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
index 42fb03541c0..4c5c638f591 100644
--- a/app/Exports/ZipExports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -69,8 +69,8 @@ protected function build(): string
 
         $this->data['exported_at'] = date(DATE_ATOM);
         $this->data['instance'] = [
-            'version'       => trim(file_get_contents(base_path('version'))),
-            'id_ciphertext' => encrypt('bookstack'),
+            'id'      => setting('instance-id', ''),
+            'version' => trim(file_get_contents(base_path('version'))),
         ];
 
         $zipFile = tempnam(sys_get_temp_dir(), 'bszip-');
diff --git a/database/migrations/2024_11_27_171039_add_instance_id_setting.php b/database/migrations/2024_11_27_171039_add_instance_id_setting.php
new file mode 100644
index 00000000000..ee1e90d0303
--- /dev/null
+++ b/database/migrations/2024_11_27_171039_add_instance_id_setting.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table('settings')->insert([
+            'setting_key' => 'instance-id',
+            'value' => Str::uuid(),
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now(),
+            'type' => 'string',
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DB::table('settings')->where('setting_key', '=', 'instance-id')->delete();
+    }
+};
diff --git a/dev/docs/portable-zip-file-format.md b/dev/docs/portable-zip-file-format.md
index fbb31785824..754cb4d3e94 100644
--- a/dev/docs/portable-zip-file-format.md
+++ b/dev/docs/portable-zip-file-format.md
@@ -93,12 +93,10 @@ The below details the objects & their properties used in Application Data.
 
 #### Instance
 
-These details are mainly informational regarding the exporting BookStack instance from where an export was created from.
+These details are informational regarding the exporting BookStack instance from where an export was created from.
 
+- `id` - String, required, unique identifier for the BookStack instance.
 - `version` - String, required, BookStack version of the export source instance.
-- `id_ciphertext` - String, required, identifier for the BookStack instance.
-
-The `id_ciphertext` is the ciphertext of encrypting the text `bookstack`. This is used as a simple & rough way for a BookStack instance to be able to identify if they were the source (by attempting to decrypt the ciphertext).
 
 #### Book
 
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 17891c73d73..ebe07d052bc 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -54,8 +54,10 @@ public function test_export_metadata()
         $version = trim(file_get_contents(base_path('version')));
         $this->assertEquals($version, $zip->data['instance']['version']);
 
-        $instanceId = decrypt($zip->data['instance']['id_ciphertext']);
-        $this->assertEquals('bookstack', $instanceId);
+        $zipInstanceId = $zip->data['instance']['id'];
+        $instanceId = setting('instance-id');
+        $this->assertNotEmpty($instanceId);
+        $this->assertEquals($instanceId, $zipInstanceId);
     }
 
     public function test_page_export()

From 68ce34074110375d52f3496c1377515e8634d615 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 28 Nov 2024 16:25:01 +0000
Subject: [PATCH 381/666] Depenencies: Updated PHP packages

---
 composer.lock | 347 ++++++++++++++++++++++++--------------------------
 1 file changed, 168 insertions(+), 179 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2d798fd6bed..f744f76208c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.325.7",
+            "version": "3.331.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "55852104253172e66c3358bf4c35281bbd8622b2"
+                "reference": "0f8b3f63ba7b296afedcb3e6a43ce140831b9400"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55852104253172e66c3358bf4c35281bbd8622b2",
-                "reference": "55852104253172e66c3358bf4c35281bbd8622b2",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0f8b3f63ba7b296afedcb3e6a43ce140831b9400",
+                "reference": "0f8b3f63ba7b296afedcb3e6a43ce140831b9400",
                 "shasum": ""
             },
             "require": {
@@ -100,8 +100,8 @@
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
                 "sebastian/comparator": "^1.2.3 || ^4.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.325.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.331.0"
             },
-            "time": "2024-11-12T19:27:31+00:00"
+            "time": "2024-11-27T19:12:58+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1267,16 +1267,16 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.1",
+            "version": "v6.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "500501c2ce893c824c801da135d02661199f60c5"
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
-                "reference": "500501c2ce893c824c801da135d02661199f60c5",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
                 "shasum": ""
             },
             "require": {
@@ -1324,9 +1324,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
             },
-            "time": "2024-05-18T18:05:11+00:00"
+            "time": "2024-11-24T11:22:49+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -2085,16 +2085,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.23",
+            "version": "v10.48.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "625269ca4881d2b50eded2045cb930960a181d98"
+                "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/625269ca4881d2b50eded2045cb930960a181d98",
-                "reference": "625269ca4881d2b50eded2045cb930960a181d98",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f132b23b13909cc22c615c01b0c5640541c3da0c",
+                "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c",
                 "shasum": ""
             },
             "require": {
@@ -2201,7 +2201,7 @@
                 "nyholm/psr7": "^1.2",
                 "orchestra/testbench-core": "^8.23.4",
                 "pda/pheanstalk": "^4.0",
-                "phpstan/phpstan": "^1.4.7",
+                "phpstan/phpstan": "~1.11.11",
                 "phpunit/phpunit": "^10.0.7",
                 "predis/predis": "^2.0.2",
                 "symfony/cache": "^6.2",
@@ -2288,7 +2288,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-12T15:39:10+00:00"
+            "time": "2024-11-26T15:32:57+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2350,16 +2350,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.6",
+            "version": "v1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/4f48ade902b94323ca3be7646db16209ec76be3d",
+                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d",
                 "shasum": ""
             },
             "require": {
@@ -2407,7 +2407,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-11-11T17:06:04+00:00"
+            "time": "2024-11-14T18:34:49+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -3764,32 +3764,32 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.16.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "dcf1ec3dfa36137b7ce41d43866644a7ab8fc257"
+                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/dcf1ec3dfa36137b7ce41d43866644a7ab8fc257",
-                "reference": "dcf1ec3dfa36137b7ce41d43866644a7ab8fc257",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/5369ef84d8142c1d87e4ec278711d4ece3cbf301",
+                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^8.1",
-                "symfony/console": "^6.4.12"
+                "symfony/console": "^6.4.15"
             },
             "require-dev": {
-                "illuminate/console": "^10.48.22",
-                "illuminate/support": "^10.48.22",
-                "laravel/pint": "^1.18.1",
-                "pestphp/pest": "^2",
+                "illuminate/console": "^10.48.24",
+                "illuminate/support": "^10.48.24",
+                "laravel/pint": "^1.18.2",
+                "pestphp/pest": "^2.36.0",
                 "pestphp/pest-plugin-mock": "2.0.0",
-                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan": "^1.12.11",
                 "phpstan/phpstan-strict-rules": "^1.6.1",
-                "symfony/var-dumper": "^6.4.11",
+                "symfony/var-dumper": "^6.4.15",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3829,7 +3829,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.16.0"
+                "source": "https://github.com/nunomaduro/termwind/tree/v1.17.0"
             },
             "funding": [
                 {
@@ -3845,7 +3845,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-15T15:27:12+00:00"
+            "time": "2024-11-21T10:36:35+00:00"
         },
         {
             "name": "onelogin/php-saml",
@@ -4267,16 +4267,16 @@
         },
         {
             "name": "predis/predis",
-            "version": "v2.2.2",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
-                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
+                "url": "https://api.github.com/repos/predis/predis/zipball/bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
                 "shasum": ""
             },
             "require": {
@@ -4285,7 +4285,7 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.3",
                 "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^8.0 || ~9.4.4"
+                "phpunit/phpunit": "^8.0 || ^9.4"
             },
             "suggest": {
                 "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
@@ -4316,7 +4316,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.2.2"
+                "source": "https://github.com/predis/predis/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -4324,7 +4324,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-13T16:42:03+00:00"
+            "time": "2024-11-21T20:00:02+00:00"
         },
         {
             "name": "psr/cache",
@@ -5093,16 +5093,16 @@
         },
         {
             "name": "robrichards/xmlseclibs",
-            "version": "3.1.1",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
+                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
+                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/2bdfd742624d739dfadbd415f00181b4a77aaf07",
+                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07",
                 "shasum": ""
             },
             "require": {
@@ -5129,9 +5129,9 @@
             ],
             "support": {
                 "issues": "https://github.com/robrichards/xmlseclibs/issues",
-                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
+                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.3"
             },
-            "time": "2020-09-05T13:00:25+00:00"
+            "time": "2024-11-20T21:13:56+00:00"
         },
         {
             "name": "sabberworm/php-css-parser",
@@ -5643,16 +5643,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.14",
+            "version": "v6.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b"
+                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b",
-                "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
+                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
                 "shasum": ""
             },
             "require": {
@@ -5717,7 +5717,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.14"
+                "source": "https://github.com/symfony/console/tree/v6.4.15"
             },
             "funding": [
                 {
@@ -5733,7 +5733,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-05T15:34:40+00:00"
+            "time": "2024-11-06T14:19:14+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5802,16 +5802,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
                 "shasum": ""
             },
             "require": {
@@ -5849,7 +5849,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -5865,7 +5865,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -6024,16 +6024,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
                 "shasum": ""
             },
             "require": {
@@ -6080,7 +6080,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -6096,7 +6096,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/finder",
@@ -6164,16 +6164,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.14",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "ba020a321a95519303a3f09ec2824d34d601c388"
+                "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388",
-                "reference": "ba020a321a95519303a3f09ec2824d34d601c388",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57",
+                "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57",
                 "shasum": ""
             },
             "require": {
@@ -6183,12 +6183,12 @@
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
-                "symfony/cache": "<6.3"
+                "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
             },
             "require-dev": {
                 "doctrine/dbal": "^2.13.1|^3|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.3|^7.0",
+                "symfony/cache": "^6.4.12|^7.1.5",
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
                 "symfony/expression-language": "^5.4|^6.0|^7.0",
                 "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
@@ -6221,7 +6221,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.14"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -6237,20 +6237,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-05T16:39:55+00:00"
+            "time": "2024-11-13T18:58:10+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.14",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "8278a947d0369754a47b758a9e17b72cab970951"
+                "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951",
-                "reference": "8278a947d0369754a47b758a9e17b72cab970951",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
+                "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
                 "shasum": ""
             },
             "require": {
@@ -6335,7 +6335,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.14"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -6351,7 +6351,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T09:45:21+00:00"
+            "time": "2024-11-27T12:49:36+00:00"
         },
         {
             "name": "symfony/mime",
@@ -7076,16 +7076,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.14",
+            "version": "v6.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "25214adbb0996d18112548de20c281be9f27279f"
+                "reference": "3cb242f059c14ae08591c5c4087d1fe443564392"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f",
-                "reference": "25214adbb0996d18112548de20c281be9f27279f",
+                "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392",
+                "reference": "3cb242f059c14ae08591c5c4087d1fe443564392",
                 "shasum": ""
             },
             "require": {
@@ -7117,7 +7117,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.14"
+                "source": "https://github.com/symfony/process/tree/v6.4.15"
             },
             "funding": [
                 {
@@ -7133,20 +7133,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T09:25:01+00:00"
+            "time": "2024-11-06T14:19:14+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.13",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278"
+                "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278",
-                "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220",
+                "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220",
                 "shasum": ""
             },
             "require": {
@@ -7200,7 +7200,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.13"
+                "source": "https://github.com/symfony/routing/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -7216,20 +7216,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-01T08:30:56+00:00"
+            "time": "2024-11-13T15:31:34+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
                 "shasum": ""
             },
             "require": {
@@ -7283,7 +7283,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -7299,20 +7299,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.13",
+            "version": "v6.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627"
+                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
-                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
+                "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
+                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
                 "shasum": ""
             },
             "require": {
@@ -7369,7 +7369,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.13"
+                "source": "https://github.com/symfony/string/tree/v6.4.15"
             },
             "funding": [
                 {
@@ -7385,7 +7385,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:18:03+00:00"
+            "time": "2024-11-13T13:31:12+00:00"
         },
         {
             "name": "symfony/translation",
@@ -7484,16 +7484,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
                 "shasum": ""
             },
             "require": {
@@ -7542,7 +7542,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -7558,7 +7558,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/uid",
@@ -7636,16 +7636,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.14",
+            "version": "v6.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "93c09246038178717a9c14b809ea8151ffcf7091"
+                "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091",
-                "reference": "93c09246038178717a9c14b809ea8151ffcf7091",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80",
+                "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80",
                 "shasum": ""
             },
             "require": {
@@ -7701,7 +7701,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.14"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.15"
             },
             "funding": [
                 {
@@ -7717,7 +7717,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-05T15:34:40+00:00"
+            "time": "2024-11-08T15:28:48+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7858,16 +7858,16 @@
         },
         {
             "name": "voku/portable-ascii",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
                 "shasum": ""
             },
             "require": {
@@ -7892,7 +7892,7 @@
             "authors": [
                 {
                     "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "homepage": "https://www.moelleken.org/"
                 }
             ],
             "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
@@ -7904,7 +7904,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
             },
             "funding": [
                 {
@@ -7928,7 +7928,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-08T17:03:00+00:00"
+            "time": "2024-11-21T01:49:47+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -7992,16 +7992,16 @@
     "packages-dev": [
         {
             "name": "fakerphp/faker",
-            "version": "v1.24.0",
+            "version": "v1.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50"
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/a136842a532bac9ecd8a1c723852b09915d7db50",
-                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
                 "shasum": ""
             },
             "require": {
@@ -8049,9 +8049,9 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.0"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1"
             },
-            "time": "2024-11-07T15:11:20+00:00"
+            "time": "2024-11-21T13:46:39+00:00"
         },
         {
             "name": "filp/whoops",
@@ -8177,28 +8177,29 @@
         },
         {
             "name": "itsgoingd/clockwork",
-            "version": "v5.2.2",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/itsgoingd/clockwork.git",
-                "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef"
+                "reference": "7b0c40418df761f7a78e88762a323386a139d83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
-                "reference": "29bc4cedfbe742b419544c30b7b6e15cd9da08ef",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/7b0c40418df761f7a78e88762a323386a139d83d",
+                "reference": "7b0c40418df761f7a78e88762a323386a139d83d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=5.6"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-pdo": "Needed in order to use a SQL database for metadata storage",
                 "ext-pdo_mysql": "Needed in order to use MySQL for metadata storage",
                 "ext-pdo_postgres": "Needed in order to use Postgres for metadata storage",
                 "ext-pdo_sqlite": "Needed in order to use a SQLite for metadata storage",
-                "ext-redis": "Needed in order to use Redis for metadata storage"
+                "ext-redis": "Needed in order to use Redis for metadata storage",
+                "php-http/discovery": "Vanilla integration - required for the middleware zero-configuration setup"
             },
             "type": "library",
             "extra": {
@@ -8240,7 +8241,7 @@
             ],
             "support": {
                 "issues": "https://github.com/itsgoingd/clockwork/issues",
-                "source": "https://github.com/itsgoingd/clockwork/tree/v5.2.2"
+                "source": "https://github.com/itsgoingd/clockwork/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -8248,20 +8249,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-14T10:49:22+00:00"
+            "time": "2024-11-19T17:25:22+00:00"
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.11",
+            "version": "v2.9.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7"
+                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/54eccd35d1732b9ee4392c25aec606a6a9c521e7",
-                "reference": "54eccd35d1732b9ee4392c25aec606a6a9c521e7",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/19012b39fbe4dede43dbe0c126d9681827a5e908",
+                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908",
                 "shasum": ""
             },
             "require": {
@@ -8275,7 +8276,7 @@
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.12.5"
+                "phpstan/phpstan": "^1.12.11"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
@@ -8292,13 +8293,13 @@
             },
             "type": "phpstan-extension",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                },
                 "phpstan": {
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -8320,7 +8321,7 @@
                     "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
             "keywords": [
                 "PHPStan",
                 "code analyse",
@@ -8333,27 +8334,15 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.11"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.12"
             },
             "funding": [
-                {
-                    "url": "https://www.paypal.com/paypalme/enunomaduro",
-                    "type": "custom"
-                },
                 {
                     "url": "https://github.com/canvural",
                     "type": "github"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/nunomaduro",
-                    "type": "patreon"
                 }
             ],
-            "time": "2024-11-11T23:11:00+00:00"
+            "time": "2024-11-26T23:09:02+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8801,16 +8790,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.10",
+            "version": "1.12.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
+                "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
-                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
+                "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
                 "shasum": ""
             },
             "require": {
@@ -8855,7 +8844,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-11T15:37:09+00:00"
+            "time": "2024-11-17T14:08:01+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10197,16 +10186,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.0",
+            "version": "3.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450"
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450",
-                "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
+                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
                 "shasum": ""
             },
             "require": {
@@ -10273,7 +10262,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-11-12T09:53:29+00:00"
+            "time": "2024-11-16T12:02:36+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10333,16 +10322,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.13",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "ae074dffb018c37a57071990d16e6152728dd972"
+                "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972",
-                "reference": "ae074dffb018c37a57071990d16e6152728dd972",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4304e6ad5c894a9c72831ad459f627bfd35d766d",
+                "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d",
                 "shasum": ""
             },
             "require": {
@@ -10380,7 +10369,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -10396,7 +10385,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-25T15:07:50+00:00"
+            "time": "2024-11-13T15:06:22+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 415cd6a360f9326fd82480f7a7510e0ee247fbcb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 28 Nov 2024 16:30:59 +0000
Subject: [PATCH 382/666] Includes: Workaround for PHP 8.3.14 bug

Changed DOMText creation to be done via document so its document
reference is correct to avoid a bug in PHP 8.3.14.
Ref: https://github.com/php/php-src/issues/16967

Fixes #5341
---
 app/Entities/Tools/PageIncludeParser.php | 4 ++--
 app/Util/HtmlDocument.php                | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index dad7c29e60e..e0b89f15870 100644
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -104,10 +104,10 @@ protected function splitTextNodesAtTags(DOMNode $textNode): array
 
             if ($currentOffset < $tagStartOffset) {
                 $previousText = substr($text, $currentOffset, $tagStartOffset - $currentOffset);
-                $textNode->parentNode->insertBefore(new DOMText($previousText), $textNode);
+                $textNode->parentNode->insertBefore($this->doc->createTextNode($previousText), $textNode);
             }
 
-            $node = $textNode->parentNode->insertBefore(new DOMText($tagOuterContent), $textNode);
+            $node = $textNode->parentNode->insertBefore($this->doc->createTextNode($tagOuterContent), $textNode);
             $includeTags[] = new PageIncludeTag($tagInnerContent, $node);
             $currentOffset = $tagStartOffset + strlen($tagOuterContent);
         }
diff --git a/app/Util/HtmlDocument.php b/app/Util/HtmlDocument.php
index b8c53d43916..7517955b9f6 100644
--- a/app/Util/HtmlDocument.php
+++ b/app/Util/HtmlDocument.php
@@ -6,6 +6,7 @@
 use DOMElement;
 use DOMNode;
 use DOMNodeList;
+use DOMText;
 use DOMXPath;
 
 /**
@@ -81,6 +82,14 @@ public function createElement(string $localName, string $value = ''): DOMElement
         return $element;
     }
 
+    /**
+     * Create a new text node within this document.
+     */
+    public function createTextNode(string $text): DOMText
+    {
+        return $this->document->createTextNode($text);
+    }
+
     /**
      * Get an element within the document of the given ID.
      */

From bc1f1d92e52ef5b103bdcbd739a001aece605b5d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 28 Nov 2024 16:58:06 +0000
Subject: [PATCH 383/666] OIDC: Added extra userinfo content-type normalisation
 and test

During review of #5337
---
 app/Access/Oidc/OidcUserinfoResponse.php |  4 +++-
 tests/Auth/OidcTest.php                  | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/Access/Oidc/OidcUserinfoResponse.php b/app/Access/Oidc/OidcUserinfoResponse.php
index ffcacb8dee8..33b8ec80665 100644
--- a/app/Access/Oidc/OidcUserinfoResponse.php
+++ b/app/Access/Oidc/OidcUserinfoResponse.php
@@ -11,7 +11,9 @@ class OidcUserinfoResponse implements ProvidesClaims
 
     public function __construct(ResponseInterface $response, string $issuer, array $keys)
     {
-        $contentType = explode(';', $response->getHeader('Content-Type')[0], 2)[0];
+        $contentTypeHeaderValue = $response->getHeader('Content-Type')[0] ?? '';
+        $contentType = strtolower(trim(explode(';', $contentTypeHeaderValue, 2)[0]));
+
         if ($contentType === 'application/json') {
             $this->claims = json_decode($response->getBody()->getContents(), true);
         }
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 201f67b5333..205f75a4d62 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -787,6 +787,20 @@ public function test_userinfo_endpoint_fetch_can_parsed_nested_groups()
         $this->assertTrue($user->hasRole($roleA->id));
     }
 
+    public function test_userinfo_endpoint_response_with_complex_json_content_type_handled()
+    {
+        $userinfoResponseData = [
+            'sub' => OidcJwtHelper::defaultPayload()['sub'],
+            'name' => 'Barry',
+        ];
+        $userinfoResponse = new Response(200, ['Content-Type'  => 'Application/Json ; charset=utf-8'], json_encode($userinfoResponseData));
+        $resp = $this->runLogin(['name' => null], [$userinfoResponse]);
+        $resp->assertRedirect('/');
+
+        $user = User::where('email', OidcJwtHelper::defaultPayload()['email'])->first();
+        $this->assertEquals('Barry', $user->name);
+    }
+
     public function test_userinfo_endpoint_jwks_response_handled()
     {
         $userinfoResponseData = OidcJwtHelper::idToken(['name' => 'Barry Jwks']);

From 4630f0728225dbbfca285bd88345a678cf8d02d1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 29 Nov 2024 12:57:53 +0000
Subject: [PATCH 384/666] Code: Set base codemirror line height

Prevents difference in line height between light/dark mode.
For #5146
---
 resources/sass/_codemirror.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/sass/_codemirror.scss b/resources/sass/_codemirror.scss
index c79671d7646..5f14cb9dbc9 100644
--- a/resources/sass/_codemirror.scss
+++ b/resources/sass/_codemirror.scss
@@ -14,6 +14,10 @@
   border-radius: 4px;
 }
 
+.cm-editor .cm-line {
+  line-height: 1.6;
+}
+
 .cm-editor .cm-line, .cm-editor .cm-gutter {
   font-family: var(--font-code);
 }

From e9f906ce5682d43312055dd3faff77f6e39ac5be Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 29 Nov 2024 13:19:55 +0000
Subject: [PATCH 385/666] Attachments: Fixed full range request handling

We were not responsing with a range request, where the requested range
was for the full extent of content. This changes things to always
provide a range request, even for the full range.

Change made since our existing logic could cause problems in chromium
browsers.

Elseif statement removed as its was likley redundant based upon other
existing checks.
This also changes responses for requested ranges beyond content, but I
think that's technically correct looking at the spec (416 are for when
there are no overlapping request/response ranges at all).

Updated tests to cover.
For #5342
---
 app/Http/RangeSupportedStream.php |  2 +-
 tests/Uploads/AttachmentTest.php  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
index 300f4488cf4..fce1e9acce3 100644
--- a/app/Http/RangeSupportedStream.php
+++ b/app/Http/RangeSupportedStream.php
@@ -92,7 +92,7 @@ protected function parseRequest(Request $request): void
             if ($start < 0 || $start > $end) {
                 $this->responseStatus = 416;
                 $this->responseHeaders['Content-Range'] = sprintf('bytes */%s', $this->fileSize);
-            } elseif ($end - $start < $this->fileSize - 1) {
+            } else {
                 $this->responseLength = $end < $this->fileSize ? $end - $start + 1 : -1;
                 $this->responseOffset = $start;
                 $this->responseStatus = 206;
diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index 2e1a7b3395a..de448d93a4c 100644
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -404,8 +404,8 @@ public function test_file_head_range_edge_cases()
             $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=0-2010']);
             $resp->assertStreamedContent($content);
             $resp->assertHeader('Content-Length', '2005');
-            $resp->assertHeaderMissing('Content-Range');
-            $resp->assertStatus(200);
+            $resp->assertHeader('Content-Range', 'bytes 0-2004/2005');
+            $resp->assertStatus(206);
 
             // Range start before end
             $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=50-10']);
@@ -413,6 +413,13 @@ public function test_file_head_range_edge_cases()
             $resp->assertHeader('Content-Length', '2005');
             $resp->assertHeader('Content-Range', 'bytes */2005');
             $resp->assertStatus(416);
+
+            // Full range request
+            $resp = $this->get($attachment->getUrl($isInline), ['Range' => 'bytes=0-']);
+            $resp->assertStreamedContent($content);
+            $resp->assertHeader('Content-Length', '2005');
+            $resp->assertHeader('Content-Range', 'bytes 0-2004/2005');
+            $resp->assertStatus(206);
         }
 
         $this->files->deleteAllAttachmentFiles();

From f5ecd51461c31c4e58fbbc5cf5a7dabeabb5bc98 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Fri, 29 Nov 2024 13:40:09 +0000
Subject: [PATCH 386/666] Updated translations with latest Crowdin changes
 (#5331)

---
 lang/da/activities.php    | 28 ++++++++++++++--------------
 lang/da/settings.php      |  2 +-
 lang/ka/activities.php    |  2 +-
 lang/nn/activities.php    |  6 +++---
 lang/nn/auth.php          |  2 +-
 lang/zh_TW/validation.php |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lang/da/activities.php b/lang/da/activities.php
index 6a99fec6f92..e92d1c165a5 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -63,17 +63,17 @@
 
     // Auth
     'auth_login' => 'loggede ind',
-    'auth_register' => 'registered as new user',
+    'auth_register' => 'registreret som ny bruger',
     'auth_password_reset_request' => 'requested user password reset',
     'auth_password_reset_update' => 'nulstil adgangskode',
-    'mfa_setup_method' => 'configured MFA method',
+    'mfa_setup_method' => 'konfigureret MFA metode',
     'mfa_setup_method_notification' => 'Multi-faktor metode konfigureret',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => 'fjernet MFA metode',
     'mfa_remove_method_notification' => 'Multi-faktor metode fjernet',
 
     // Settings
-    'settings_update' => 'updated settings',
-    'settings_update_notification' => 'Settings successfully updated',
+    'settings_update' => 'opdaterede indstillinger',
+    'settings_update_notification' => 'Indstillinger opdateret',
     'maintenance_action_run' => 'ran maintenance action',
 
     // Webhooks
@@ -87,13 +87,13 @@
     // Users
     'user_create' => 'opret bruger',
     'user_create_notification' => 'Bruger oprettet korrekt',
-    'user_update' => 'updated user',
+    'user_update' => 'opdateret bruger',
     'user_update_notification' => 'Brugeren blev opdateret',
-    'user_delete' => 'deleted user',
+    'user_delete' => 'slettet bruger',
     'user_delete_notification' => 'Brugeren blev fjernet',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'oprettet API token',
     'api_token_create_notification' => 'API token successfully created',
     'api_token_update' => 'updated API token',
     'api_token_update_notification' => 'API token successfully updated',
@@ -101,12 +101,12 @@
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
-    'role_create' => 'created role',
-    'role_create_notification' => 'Role successfully created',
-    'role_update' => 'updated role',
-    'role_update_notification' => 'Role successfully updated',
-    'role_delete' => 'deleted role',
-    'role_delete_notification' => 'Role successfully deleted',
+    'role_create' => 'oprettet rolle',
+    'role_create_notification' => 'Rolle oprettet',
+    'role_update' => 'opdateret rolle',
+    'role_update_notification' => 'Rolle opdateret',
+    'role_delete' => 'slettet rolle',
+    'role_delete_notification' => 'Rollen blev slettet',
 
     // Recycle Bin
     'recycle_bin_empty' => 'emptied recycle bin',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index 5fa2d156f1e..fa802af16f0 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -33,7 +33,7 @@
     'app_custom_html_disabled_notice' => 'Brugerdefineret HTML head indhold er deaktiveret på denne indstillingsside for at, at ændringer kan rulles tilbage.',
     'app_logo' => 'Applikationslogo',
     'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
-    'app_icon' => 'Application Icon',
+    'app_icon' => 'Program ikon',
     'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
     'app_homepage' => 'Applikationsforside',
     'app_homepage_desc' => 'Vælg en visning, der skal vises på forsiden i stedet for standardvisningen. Sidetilladelser ignoreres for de valgte sider.',
diff --git a/lang/ka/activities.php b/lang/ka/activities.php
index 092398ef0e1..6c7af4429f0 100644
--- a/lang/ka/activities.php
+++ b/lang/ka/activities.php
@@ -69,7 +69,7 @@
     'mfa_setup_method' => 'configured MFA method',
     'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
     'mfa_remove_method' => 'removed MFA method',
-    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+    'mfa_remove_method_notification' => 'მულტი-ფაქტორული მეთოდი წარმატებით მოიხსნა',
 
     // Settings
     'settings_update' => 'updated settings',
diff --git a/lang/nn/activities.php b/lang/nn/activities.php
index 36b7d847b44..73182e0ba84 100644
--- a/lang/nn/activities.php
+++ b/lang/nn/activities.php
@@ -93,11 +93,11 @@
     'user_delete_notification' => 'Brukaren vart fjerna',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'opprett API-nøkkel',
     'api_token_create_notification' => 'API-token er oppretta',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'oppdatert api token',
     'api_token_update_notification' => 'API-token oppdatert',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'sletta api token',
     'api_token_delete_notification' => 'API-token vart sletta',
 
     // Roles
diff --git a/lang/nn/auth.php b/lang/nn/auth.php
index 04546da1dc4..5da686eaa9e 100644
--- a/lang/nn/auth.php
+++ b/lang/nn/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilapplikasjon',
     'mfa_option_totp_desc' => 'For å bruka fleirfaktorautentisering treng du ein mobilapplikasjon som støttar TOTP-teknologien, slik som Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Tryggleikskodar',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Genererer et sett med engangs sikkerhetskoder som du skal logge inn for å bekrefte identiteten din. Sørg for å lagre disse på et sikkert og sikkert sted.',
     'mfa_gen_confirm_and_enable' => 'Stadfest og aktiver',
     'mfa_gen_backup_codes_title' => 'Konfigurasjon av tryggleikskodar',
     'mfa_gen_backup_codes_desc' => 'Lagre lista under med kodar på ein trygg stad. Når du skal ha tilgang til systemet kan du bruka ein av desse som ein faktor under innlogging.',
diff --git a/lang/zh_TW/validation.php b/lang/zh_TW/validation.php
index 71ba5acadf8..6651f13966c 100644
--- a/lang/zh_TW/validation.php
+++ b/lang/zh_TW/validation.php
@@ -103,7 +103,7 @@
     'totp'                 => '提供的代碼無效或已過期。',
     'unique'               => ':attribute 已經被使用。',
     'url'                  => ':attribute 格式無效。',
-    'uploaded'             => '無法上傳文件， 服務器可能不接受此大小的文件。',
+    'uploaded'             => '無法上傳文檔案， 伺服器可能不接受此大小的檔案。',
 
     // Custom validation lines
     'custom' => [

From 94165cc18f344cee3c99695b4d546b984df21f5f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 29 Nov 2024 13:46:37 +0000
Subject: [PATCH 387/666] Updated translator & dependency attribution before
 release v24.10.2

---
 .github/translators.txt                | 2 ++
 dev/licensing/php-library-licenses.txt | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 65ea00fe8f7..9699be70f8b 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -453,3 +453,5 @@ Mohammed srhiri (m.sghiri20) :: Arabic
 YongMin Kim (kym0118) :: Korean
 Rivo Zängov (Eraser) :: Estonian
 Francisco Rafael Fonseca (chicoraf) :: Portuguese, Brazilian
+ИEØ_ΙΙØZ (NEO_IIOZ) :: Chinese Traditional
+madnjpn (madnjpn.) :: Georgian
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 8507cb4cb61..747ccc986d7 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -415,7 +415,7 @@ predis/predis
 License: MIT
 License File: vendor/predis/predis/LICENSE
 Copyright: Copyright (c) 2009-2020 Daniele Alessandri (original work)
-Copyright (c) 2021-2023 Till Krüss (modified work)
+Copyright (c) 2021-2024 Till Krüss (modified work)
 Source: https://github.com/predis/predis.git
 Link: http://github.com/predis/predis
 -----------
@@ -514,7 +514,7 @@ Link: https://github.com/ramsey/uuid.git
 robrichards/xmlseclibs
 License: BSD-3-Clause
 License File: vendor/robrichards/xmlseclibs/LICENSE
-Copyright: Copyright (c) 2007-2019, Robert Richards <*********@*********.***>.
+Copyright: Copyright (c) 2007-2024, Robert Richards <*********@*********.***>.
 Source: https://github.com/robrichards/xmlseclibs.git
 Link: https://github.com/robrichards/xmlseclibs
 -----------

From 227c5e155b60ba9a442d23c64a9846366c3e15ac Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 1 Dec 2024 16:02:21 +0000
Subject: [PATCH 388/666] Dev Docker: Fixed missing gd jpeg handling, forced
 migrations

Migrations run without force could fail startup in certain environment
conditions (when testing production env).
Also updated paths permission handling to update more needed locations.
---
 dev/docker/Dockerfile        | 7 +++++--
 dev/docker/entrypoint.app.sh | 4 ++--
 dev/docs/development.md      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 9f283c75544..edab90ca1c5 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -6,15 +6,18 @@ RUN apt-get update && \
         git \
         zip \
         unzip \
-        libpng-dev \
+        libfreetype-dev \
+        libjpeg62-turbo-dev \
         libldap2-dev \
+        libpng-dev \
         libzip-dev \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
-    docker-php-ext-install pdo_mysql gd ldap zip && \
+    docker-php-ext-configure gd --with-freetype --with-jpeg && \
+    docker-php-ext-install -j$(nproc) pdo_mysql gd ldap zip && \
     pecl install xdebug && \
     docker-php-ext-enable xdebug
 
diff --git a/dev/docker/entrypoint.app.sh b/dev/docker/entrypoint.app.sh
index e91d34a7133..b09edda8863 100755
--- a/dev/docker/entrypoint.app.sh
+++ b/dev/docker/entrypoint.app.sh
@@ -9,7 +9,7 @@ if [[ -n "$1" ]]; then
 else
     composer install
     wait-for-it db:3306 -t 45
-    php artisan migrate --database=mysql
-    chown -R www-data:www-data storage
+    php artisan migrate --database=mysql --force
+    chown -R www-data storage public/uploads bootstrap/cache
     exec apache2-foreground
 fi
diff --git a/dev/docs/development.md b/dev/docs/development.md
index 3c7a6e9d299..0324140f8bd 100644
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -82,7 +82,7 @@ If all the conditions are met, you can proceed with the following steps:
 
 1. **Copy `.env.example` to `.env`**, change `APP_KEY` to a random 32 char string and set `APP_ENV` to `local`.
 2. Make sure **port 8080 is unused** *or else* change `DEV_PORT` to a free port on your host.
-3. **Run `chgrp -R docker storage`**. The development container will chown the `storage` directory to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory.
+3. **Run `chgrp -R docker storage`**. The development container will chown the `storage`, `public/uploads` and `bootstrap/cache` directories to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory.
 4. **Run `docker-compose up`** and wait until the image is built and all database migrations have been done.
 5. You can now login with `admin@admin.com` and `password` as password on `localhost:8080` (or another port if specified).
 

From 90341e0e00a832e78df8a394487a073a475003ed Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 1 Dec 2024 18:42:54 +0000
Subject: [PATCH 389/666] LDAP: Review and testing of mulitple-display-name
 attr support

Review of #5295
Added test to cover functionality.
Moved splitting from config to service.
---
 app/Access/LdapService.php | 30 ++++++++++++++----------------
 app/Config/services.php    |  2 +-
 tests/Auth/LdapTest.php    | 33 ++++++++++++++++++++++++++++++---
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index ef6d33f4db1..e5037ad2f95 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -72,25 +72,23 @@ private function getUserWithAttributes(string $userName, array $attributes): ?ar
     }
 
     /**
-     * Calculate the display name.
+     * Build the user display name from the (potentially multiple) attributes defined by the configuration.
      */
-    protected function getUserDisplayName(array $displayNameAttr, array $userDetails, string $defaultValue): string
+    protected function getUserDisplayName(array $userDetails, array $displayNameAttrs, string $defaultValue): string
     {
-        $displayName = [];
-        foreach ($displayNameAttr as $dnAttr) {
+        $displayNameParts = [];
+        foreach ($displayNameAttrs as $dnAttr) {
             $dnComponent = $this->getUserResponseProperty($userDetails, $dnAttr, null);
-            if ($dnComponent !== null) {
-                $displayName[] = $dnComponent;
+            if ($dnComponent) {
+                $displayNameParts[] = $dnComponent;
             }
         }
 
-        if (count($displayName) == 0) {
-            $displayName = $defaultValue;
-        } else {
-            $displayName = implode(' ', $displayName);
+        if (empty($displayNameParts)) {
+            return $defaultValue;
         }
 
-        return $displayName;
+        return implode(' ', $displayNameParts);
     }
 
     /**
@@ -103,12 +101,12 @@ public function getUserDetails(string $userName): ?array
     {
         $idAttr = $this->config['id_attribute'];
         $emailAttr = $this->config['email_attribute'];
-        $displayNameAttr = $this->config['display_name_attribute'];
+        $displayNameAttrs = explode('|', $this->config['display_name_attribute']);
         $thumbnailAttr = $this->config['thumbnail_attribute'];
 
-        $user = $this->getUserWithAttributes($userName, array_filter(array_merge($displayNameAttr, [
-            'cn', 'dn', $idAttr, $emailAttr, $thumbnailAttr,
-        ])));
+        $user = $this->getUserWithAttributes($userName, array_filter([
+            'cn', 'dn', $idAttr, $emailAttr, ...$displayNameAttrs, $thumbnailAttr,
+        ]));
 
         if (is_null($user)) {
             return null;
@@ -117,7 +115,7 @@ public function getUserDetails(string $userName): ?array
         $userCn = $this->getUserResponseProperty($user, 'cn', null);
         $formatted = [
             'uid'   => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
-            'name'  => $this->getUserDisplayName($displayNameAttr, $user, $userCn),
+            'name'  => $this->getUserDisplayName($user, $displayNameAttrs, $userCn),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
             'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
diff --git a/app/Config/services.php b/app/Config/services.php
index 4e27896870a..d7345823150 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -127,7 +127,7 @@
         'version'                => env('LDAP_VERSION', false),
         'id_attribute'           => env('LDAP_ID_ATTRIBUTE', 'uid'),
         'email_attribute'        => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
-        'display_name_attribute' => explode('|', env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn')),
+        'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'),
         'follow_referrals'       => env('LDAP_FOLLOW_REFERRALS', false),
         'user_to_groups'         => env('LDAP_USER_TO_GROUPS', false),
         'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 27169a2becf..9a00c983a50 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
             'auth.defaults.guard'                  => 'ldap',
             'services.ldap.base_dn'                => 'dc=ldap,dc=local',
             'services.ldap.email_attribute'        => 'mail',
-            'services.ldap.display_name_attribute' => ['cn'],
+            'services.ldap.display_name_attribute' => 'cn',
             'services.ldap.id_attribute'           => 'uid',
             'services.ldap.user_to_groups'         => false,
             'services.ldap.version'                => '3',
@@ -581,7 +581,7 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
     public function test_login_uses_specified_display_name_attribute()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => ['displayName'],
+            'services.ldap.display_name_attribute' => 'displayName',
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
@@ -603,10 +603,37 @@ public function test_login_uses_specified_display_name_attribute()
         $this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $this->mockUser->name, 'name' => 'displayNameAttribute']);
     }
 
+    public function test_login_uses_multiple_display_properties_if_defined()
+    {
+        app('config')->set([
+            'services.ldap.display_name_attribute' => 'firstname|middlename|noname|lastname',
+        ]);
+
+        $this->commonLdapMocks(1, 1, 1, 2, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
+            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->andReturn(['count' => 1, 0 => [
+                'uid'         => [$this->mockUser->name],
+                'cn'          => [$this->mockUser->name],
+                'dn'          => 'dc=test' . config('services.ldap.base_dn'),
+                'firstname' => ['Barry'],
+                'middlename' => ['Elliott'],
+                'lastname' => ['Chuckle'],
+                'mail'     => [$this->mockUser->email],
+            ]]);
+
+        $this->mockUserLogin();
+
+        $this->assertDatabaseHas('users', [
+            'email' => $this->mockUser->email,
+            'name' => 'Barry Elliott Chuckle',
+        ]);
+    }
+
     public function test_login_uses_default_display_name_attribute_if_specified_not_present()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => ['displayName'],
+            'services.ldap.display_name_attribute' => 'displayName',
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);

From 0f9957bc036e40d068dfb0958560485f7456964a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 2 Dec 2024 11:46:56 +0000
Subject: [PATCH 390/666] MD Exports: Added HTML description conversion

Also updated tests to cover checking description use/conversion.
Made during review of #5313
---
 app/Entities/Tools/ExportFormatter.php | 12 +++++++-----
 tests/Entity/ExportTest.php            | 12 ++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Entities/Tools/ExportFormatter.php b/app/Entities/Tools/ExportFormatter.php
index e85992a9d70..0af68b8db3c 100644
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Entities/Tools/ExportFormatter.php
@@ -316,8 +316,9 @@ public function chapterToMarkdown(Chapter $chapter): string
     {
         $text = '# ' . $chapter->name . "\n\n";
 
-        if (!empty($chapter->description)) {
-            $text .= $chapter->description . "\n\n";
+        $description = (new HtmlToMarkdown($chapter->descriptionHtml()))->convert();
+        if ($description) {
+            $text .= $description . "\n\n";
         }
 
         foreach ($chapter->pages as $page) {
@@ -334,9 +335,10 @@ public function bookToMarkdown(Book $book): string
     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $text = '# ' . $book->name . "\n\n";
-        
-        if (!empty($book->description)) {
-            $text .= $book->description . "\n\n";
+
+        $description = (new HtmlToMarkdown($book->descriptionHtml()))->convert();
+        if ($description) {
+            $text .= $description . "\n\n";
         }
 
         foreach ($bookTree as $bookChild) {
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 7aafa3b7927..97b1ff1bcfd 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -417,23 +417,35 @@ public function test_page_markdown_export_converts_html_where_no_markdown()
     public function test_chapter_markdown_export()
     {
         $chapter = $this->entities->chapter();
+        $chapter->description_html = '<p>My <strong>chapter</strong> description</p>';
+        $chapter->save();
         $page = $chapter->pages()->first();
+
         $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown'));
 
         $resp->assertSee('# ' . $chapter->name);
         $resp->assertSee('# ' . $page->name);
+        $resp->assertSee('My **chapter** description');
     }
 
     public function test_book_markdown_export()
     {
         $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
+        $book->description_html = '<p>My <strong>book</strong> description</p>';
+        $book->save();
+
         $chapter = $book->chapters()->first();
+        $chapter->description_html = '<p>My <strong>chapter</strong> description</p>';
+        $chapter->save();
+
         $page = $chapter->pages()->first();
         $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));
 
         $resp->assertSee('# ' . $book->name);
         $resp->assertSee('# ' . $chapter->name);
         $resp->assertSee('# ' . $page->name);
+        $resp->assertSee('My **book** description');
+        $resp->assertSee('My **chapter** description');
     }
 
     public function test_book_markdown_export_concats_immediate_pages_with_newlines()

From fec44452cb67819b594bdfca4ca37e4a20c0f42e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 3 Dec 2024 13:47:45 +0000
Subject: [PATCH 391/666] Search API: Updated handling of parent detail, added
 testing

Review of #5280.

- Removed additional non-needed loads which could ignore permissions.
- Updated new formatter method name to be more specific on use.
- Added test case to cover changes.
- Updated API examples to align parent id/info in info to be
  representative.
---
 app/Api/ApiEntityListFormatter.php |  32 ++----
 app/Search/SearchApiController.php |  15 +--
 dev/api/responses/search-all.json  | 172 ++++++++++++++---------------
 tests/Api/SearchApiTest.php        |  44 +++++++-
 4 files changed, 142 insertions(+), 121 deletions(-)

diff --git a/app/Api/ApiEntityListFormatter.php b/app/Api/ApiEntityListFormatter.php
index 7c2d09d4f3a..3c94d96ee60 100644
--- a/app/Api/ApiEntityListFormatter.php
+++ b/app/Api/ApiEntityListFormatter.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Api;
 
+use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 
@@ -72,20 +73,20 @@ public function withTags(): self
     }
 
     /**
-     * Enable the inclusion of related book and chapter titles in the response.
+     * Include parent book/chapter info in the formatted data.
      */
-    public function withRelatedData(): self
+    public function withParents(): self
     {
         $this->withField('book', function (Entity $entity) {
-            if (method_exists($entity, 'book')) {
-                return $entity->book()->select(['id', 'name', 'slug'])->first();
+            if ($entity instanceof BookChild && $entity->book) {
+                return $entity->book->only(['id', 'name', 'slug']);
             }
             return null;
         });
 
         $this->withField('chapter', function (Entity $entity) {
-            if ($entity instanceof Page && $entity->chapter_id) {
-                return $entity->chapter()->select(['id', 'name', 'slug'])->first();
+            if ($entity instanceof Page && $entity->chapter) {
+                return $entity->chapter->only(['id', 'name', 'slug']);
             }
             return null;
         });
@@ -99,8 +100,6 @@ public function withRelatedData(): self
      */
     public function format(): array
     {
-        $this->loadRelatedData();
-
         $results = [];
 
         foreach ($this->list as $item) {
@@ -110,23 +109,6 @@ public function format(): array
         return $results;
     }
 
-    /**
-     * Eager load the related book and chapter data when needed.
-     */
-    protected function loadRelatedData(): void
-    {
-        $pages = collect($this->list)->filter(fn($item) => $item instanceof Page);
-
-        foreach ($this->list as $entity) {
-            if (method_exists($entity, 'book')) {
-                $entity->load('book');
-            }
-            if ($entity instanceof Page && $entity->chapter_id) {
-                $entity->load('chapter');
-            }
-        }
-    }
-
     /**
      * Format a single entity item to a plain array.
      */
diff --git a/app/Search/SearchApiController.php b/app/Search/SearchApiController.php
index 28a3b53e6c3..79cd8cfabd0 100644
--- a/app/Search/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -9,21 +9,18 @@
 
 class SearchApiController extends ApiController
 {
-    protected SearchRunner $searchRunner;
-    protected SearchResultsFormatter $resultsFormatter;
-
     protected $rules = [
         'all' => [
             'query' => ['required'],
-            'page' => ['integer', 'min:1'],
+            'page'  => ['integer', 'min:1'],
             'count' => ['integer', 'min:1', 'max:100'],
         ],
     ];
 
-    public function __construct(SearchRunner $searchRunner, SearchResultsFormatter $resultsFormatter)
-    {
-        $this->searchRunner = $searchRunner;
-        $this->resultsFormatter = $resultsFormatter;
+    public function __construct(
+        protected SearchRunner $searchRunner,
+        protected SearchResultsFormatter $resultsFormatter
+    ) {
     }
 
     /**
@@ -50,7 +47,7 @@ public function all(Request $request)
         $this->resultsFormatter->format($results['results']->all(), $options);
 
         $data = (new ApiEntityListFormatter($results['results']->all()))
-            ->withType()->withTags()->withRelatedData()
+            ->withType()->withTags()->withParents()
             ->withField('preview_html', function (Entity $entity) {
                 return [
                     'name' => (string) $entity->getAttribute('preview_name'),
diff --git a/dev/api/responses/search-all.json b/dev/api/responses/search-all.json
index f60a12f750d..2ad89641693 100644
--- a/dev/api/responses/search-all.json
+++ b/dev/api/responses/search-all.json
@@ -1,92 +1,92 @@
 {
-    "data": [
+  "data": [
+    {
+      "id": 84,
+      "book_id": 1,
+      "slug": "a-chapter-for-cats",
+      "name": "A chapter for cats",
+      "created_at": "2021-11-14T15:57:35.000000Z",
+      "updated_at": "2021-11-14T15:57:35.000000Z",
+      "type": "chapter",
+      "url": "https://example.com/books/cats/chapter/a-chapter-for-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "preview_html": {
+        "name": "A chapter for <strong>cats</strong>",
+        "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
+      },
+      "tags": []
+    },
+    {
+      "name": "The hows and whys of cats",
+      "id": 396,
+      "slug": "the-hows-and-whys-of-cats",
+      "book_id": 1,
+      "chapter_id": 75,
+      "draft": false,
+      "template": false,
+      "created_at": "2021-05-15T16:28:10.000000Z",
+      "updated_at": "2021-11-14T15:56:49.000000Z",
+      "type": "page",
+      "url": "https://example.com/books/cats/page/the-hows-and-whys-of-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "chapter": {
+        "id": 75,
+        "name": "A chapter for cats",
+        "slug": "a-chapter-for-cats"
+      },
+      "preview_html": {
+        "name": "The hows and whys of <strong>cats</strong>",
+        "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
+      },
+      "tags": [
         {
-            "id": 84,
-            "book_id": 1,
-            "slug": "a-chapter-for-cats",
-            "name": "A chapter for cats",
-            "created_at": "2021-11-14T15:57:35.000000Z",
-            "updated_at": "2021-11-14T15:57:35.000000Z",
-            "type": "chapter",
-            "url": "https://example.com/books/my-book/chapter/a-chapter-for-cats",
-            "book": {
-                "id": 1,
-                "name": "Cats",
-                "slug": "cats"
-            },
-            "preview_html": {
-                "name": "A chapter for <strong>cats</strong>",
-                "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
-            },
-            "tags": []
+          "name": "Animal",
+          "value": "Cat",
+          "order": 0
         },
         {
-            "name": "The hows and whys of cats",
-            "id": 396,
-            "slug": "the-hows-and-whys-of-cats",
-            "book_id": 1,
-            "chapter_id": 75,
-            "draft": false,
-            "template": false,
-            "created_at": "2021-05-15T16:28:10.000000Z",
-            "updated_at": "2021-11-14T15:56:49.000000Z",
-            "type": "page",
-            "url": "https://example.com/books/my-book/page/the-hows-and-whys-of-cats",
-            "book": {
-                "id": 1,
-                "name": "Cats",
-                "slug": "cats"
-            },
-            "chapter": {
-                "id": 84,
-                "name": "A chapter for cats",
-                "slug": "a-chapter-for-cats"
-            },
-            "preview_html": {
-                "name": "The hows and whys of <strong>cats</strong>",
-                "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
-            },
-            "tags": [
-                {
-                    "name": "Animal",
-                    "value": "Cat",
-                    "order": 0
-                },
-                {
-                    "name": "Category",
-                    "value": "Top Content",
-                    "order": 0
-                }
-            ]
-        },
-        {
-            "name": "How advanced are cats?",
-            "id": 362,
-            "slug": "how-advanced-are-cats",
-            "book_id": 13,
-            "chapter_id": 73,
-            "draft": false,
-            "template": false,
-            "created_at": "2020-11-29T21:55:07.000000Z",
-            "updated_at": "2021-11-14T16:02:39.000000Z",
-            "type": "page",
-            "url": "https://example.com/books/my-book/page/how-advanced-are-cats",
-            "book": {
-                "id": 1,
-                "name": "Cats",
-                "slug": "cats"
-            },
-            "chapter": {
-                "id": 84,
-                "name": "A chapter for cats",
-                "slug": "a-chapter-for-cats"
-            },
-            "preview_html": {
-                "name": "How advanced are <strong>cats</strong>?",
-                "content": "<strong>cats</strong> are some of the most advanced animals in the world."
-            },
-            "tags": []
+          "name": "Category",
+          "value": "Top Content",
+          "order": 0
         }
-    ],
-    "total": 3
+      ]
+    },
+    {
+      "name": "How advanced are cats?",
+      "id": 362,
+      "slug": "how-advanced-are-cats",
+      "book_id": 13,
+      "chapter_id": 73,
+      "draft": false,
+      "template": false,
+      "created_at": "2020-11-29T21:55:07.000000Z",
+      "updated_at": "2021-11-14T16:02:39.000000Z",
+      "type": "page",
+      "url": "https://example.com/books/big-cats/page/how-advanced-are-cats",
+      "book": {
+        "id": 13,
+        "name": "Big Cats",
+        "slug": "big-cats"
+      },
+      "chapter": {
+        "id": 73,
+        "name": "A chapter for bigger cats",
+        "slug": "a-chapter-for-bigger-cats"
+      },
+      "preview_html": {
+        "name": "How advanced are <strong>cats</strong>?",
+        "content": "<strong>cats</strong> are some of the most advanced animals in the world."
+      },
+      "tags": []
+    }
+  ],
+  "total": 3
 }
diff --git a/tests/Api/SearchApiTest.php b/tests/Api/SearchApiTest.php
index 3f2eb395c11..9da7900ca9a 100644
--- a/tests/Api/SearchApiTest.php
+++ b/tests/Api/SearchApiTest.php
@@ -13,7 +13,7 @@ class SearchApiTest extends TestCase
 {
     use TestsApi;
 
-    protected $baseEndpoint = '/api/search';
+    protected string $baseEndpoint = '/api/search';
 
     public function test_all_endpoint_returns_search_filtered_results_with_query()
     {
@@ -74,4 +74,46 @@ public function test_all_endpoint_requires_query_parameter()
         $resp = $this->actingAsApiEditor()->get($this->baseEndpoint . '?query=myqueryvalue');
         $resp->assertOk();
     }
+
+    public function test_all_endpoint_includes_parent_details_where_visible()
+    {
+        $page = $this->entities->pageWithinChapter();
+        $chapter = $page->chapter;
+        $book = $page->book;
+
+        $page->update(['name' => 'name with superextrauniquevalue within']);
+        $page->indexForSearch();
+
+        $editor = $this->users->editor();
+        $this->actingAsApiEditor();
+        $resp = $this->getJson($this->baseEndpoint . '?query=superextrauniquevalue');
+        $resp->assertJsonFragment([
+            'id' => $page->id,
+            'type' => 'page',
+            'book' => [
+                'id' => $book->id,
+                'name' => $book->name,
+                'slug' => $book->slug,
+            ],
+            'chapter' => [
+                'id' => $chapter->id,
+                'name' => $chapter->name,
+                'slug' => $chapter->slug,
+            ],
+        ]);
+
+        $this->permissions->disableEntityInheritedPermissions($chapter);
+        $this->permissions->setEntityPermissions($page, ['view'], [$editor->roles()->first()]);
+
+        $resp = $this->getJson($this->baseEndpoint . '?query=superextrauniquevalue');
+        $resp->assertJsonPath('data.0.id', $page->id);
+        $resp->assertJsonPath('data.0.book.name', $book->name);
+        $resp->assertJsonMissingPath('data.0.chapter');
+
+        $this->permissions->disableEntityInheritedPermissions($book);
+
+        $resp = $this->getJson($this->baseEndpoint . '?query=superextrauniquevalue');
+        $resp->assertJsonPath('data.0.id', $page->id);
+        $resp->assertJsonMissingPath('data.0.book.name');
+    }
 }

From f3fa63a5ae5d671d10c9313965723683608ddc4e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 3 Dec 2024 16:24:49 +0000
Subject: [PATCH 392/666] Lexical: Merged custom paragraph node, removed old
 format/indent refs

Start of work to merge custom nodes into lexical, removing old unused
format/indent core logic while extending common block elements where
possible.
---
 .../js/wysiwyg/lexical/core/LexicalEvents.ts  |   3 -
 .../wysiwyg/lexical/core/LexicalMutations.ts  |   9 --
 .../wysiwyg/lexical/core/LexicalReconciler.ts |  67 ----------
 .../lexical/core/__tests__/utils/index.ts     |   8 --
 .../lexical/core/nodes/CommonBlockNode.ts     |  54 ++++++++
 .../lexical/core/nodes/LexicalElementNode.ts  |  41 ------
 .../core/nodes/LexicalParagraphNode.ts        |  69 +++-------
 .../lexical/core/nodes/LexicalRootNode.ts     |   4 -
 resources/js/wysiwyg/lexical/html/index.ts    |   4 -
 resources/js/wysiwyg/lexical/link/index.ts    |   4 -
 .../lexical/list/LexicalListItemNode.ts       |  38 ------
 .../js/wysiwyg/lexical/list/formatList.ts     |   6 -
 .../js/wysiwyg/lexical/rich-text/index.ts     |  56 +-------
 .../lexical/selection/range-selection.ts      |   8 --
 .../js/wysiwyg/nodes/custom-paragraph.ts      | 123 ------------------
 resources/js/wysiwyg/nodes/index.ts           |   9 +-
 .../wysiwyg/services/drop-paste-handling.ts   |   4 +-
 .../js/wysiwyg/services/keyboard-handling.ts  |   4 +-
 resources/js/wysiwyg/todo.md                  |   6 +-
 resources/js/wysiwyg/utils/formats.ts         |  13 +-
 resources/js/wysiwyg/utils/nodes.ts           |   4 +-
 resources/js/wysiwyg/utils/selection.ts       |   6 +-
 22 files changed, 95 insertions(+), 445 deletions(-)
 create mode 100644 resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-paragraph.ts

diff --git a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
index 5fd671a76c5..c70a906a08e 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
@@ -355,7 +355,6 @@ function onSelectionChange(
               lastNode instanceof ParagraphNode &&
               lastNode.getChildrenSize() === 0
             ) {
-              selection.format = lastNode.getTextFormat();
               selection.style = lastNode.getTextStyle();
             } else {
               selection.format = 0;
@@ -578,7 +577,6 @@ function onBeforeInput(event: InputEvent, editor: LexicalEditor): void {
           if ($isRangeSelection(selection)) {
             const anchorNode = selection.anchor.getNode();
             anchorNode.markDirty();
-            selection.format = anchorNode.getFormat();
             invariant(
               $isTextNode(anchorNode),
               'Anchor node must be a TextNode',
@@ -912,7 +910,6 @@ function onCompositionStart(
         // need to invoke the empty space heuristic below.
         anchor.type === 'element' ||
         !selection.isCollapsed() ||
-        node.getFormat() !== selection.format ||
         ($isTextNode(node) && node.getStyle() !== selection.style)
       ) {
         // We insert a zero width character, ready for the composition
diff --git a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
index 56f364501ee..c24dc9ebb3c 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
@@ -96,15 +96,6 @@ function shouldUpdateTextNodeFromMutation(
   targetDOM: Node,
   targetNode: TextNode,
 ): boolean {
-  if ($isRangeSelection(selection)) {
-    const anchorNode = selection.anchor.getNode();
-    if (
-      anchorNode.is(targetNode) &&
-      selection.format !== anchorNode.getFormat()
-    ) {
-      return false;
-    }
-  }
   return targetDOM.nodeType === DOM_TEXT_TYPE && targetNode.isAttached();
 }
 
diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
index 09d01bffd43..7843027d713 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -17,7 +17,6 @@ import type {NodeKey, NodeMap} from './LexicalNode';
 import type {ElementNode} from './nodes/LexicalElementNode';
 
 import invariant from 'lexical/shared/invariant';
-import normalizeClassNames from 'lexical/shared/normalizeClassNames';
 
 import {
   $isDecoratorNode,
@@ -117,51 +116,6 @@ function setTextAlign(domStyle: CSSStyleDeclaration, value: string): void {
   domStyle.setProperty('text-align', value);
 }
 
-const DEFAULT_INDENT_VALUE = '40px';
-
-function setElementIndent(dom: HTMLElement, indent: number): void {
-  const indentClassName = activeEditorConfig.theme.indent;
-
-  if (typeof indentClassName === 'string') {
-    const elementHasClassName = dom.classList.contains(indentClassName);
-
-    if (indent > 0 && !elementHasClassName) {
-      dom.classList.add(indentClassName);
-    } else if (indent < 1 && elementHasClassName) {
-      dom.classList.remove(indentClassName);
-    }
-  }
-
-  const indentationBaseValue =
-    getComputedStyle(dom).getPropertyValue('--lexical-indent-base-value') ||
-    DEFAULT_INDENT_VALUE;
-
-  dom.style.setProperty(
-    'padding-inline-start',
-    indent === 0 ? '' : `calc(${indent} * ${indentationBaseValue})`,
-  );
-}
-
-function setElementFormat(dom: HTMLElement, format: number): void {
-  const domStyle = dom.style;
-
-  if (format === 0) {
-    setTextAlign(domStyle, '');
-  } else if (format === IS_ALIGN_LEFT) {
-    setTextAlign(domStyle, 'left');
-  } else if (format === IS_ALIGN_CENTER) {
-    setTextAlign(domStyle, 'center');
-  } else if (format === IS_ALIGN_RIGHT) {
-    setTextAlign(domStyle, 'right');
-  } else if (format === IS_ALIGN_JUSTIFY) {
-    setTextAlign(domStyle, 'justify');
-  } else if (format === IS_ALIGN_START) {
-    setTextAlign(domStyle, 'start');
-  } else if (format === IS_ALIGN_END) {
-    setTextAlign(domStyle, 'end');
-  }
-}
-
 function $createNode(
   key: NodeKey,
   parentDOM: null | HTMLElement,
@@ -185,22 +139,14 @@ function $createNode(
   }
 
   if ($isElementNode(node)) {
-    const indent = node.__indent;
     const childrenSize = node.__size;
 
-    if (indent !== 0) {
-      setElementIndent(dom, indent);
-    }
     if (childrenSize !== 0) {
       const endIndex = childrenSize - 1;
       const children = createChildrenArray(node, activeNextNodeMap);
       $createChildren(children, node, 0, endIndex, dom, null);
     }
-    const format = node.__format;
 
-    if (format !== 0) {
-      setElementFormat(dom, format);
-    }
     if (!node.isInline()) {
       reconcileElementTerminatingLineBreak(null, node, dom);
     }
@@ -349,10 +295,8 @@ function reconcileParagraphFormat(element: ElementNode): void {
   if (
     $isParagraphNode(element) &&
     subTreeTextFormat != null &&
-    subTreeTextFormat !== element.__textFormat &&
     !activeEditorStateReadOnly
   ) {
-    element.setTextFormat(subTreeTextFormat);
     element.setTextStyle(subTreeTextStyle);
   }
 }
@@ -563,17 +507,6 @@ function $reconcileNode(
 
   if ($isElementNode(prevNode) && $isElementNode(nextNode)) {
     // Reconcile element children
-    const nextIndent = nextNode.__indent;
-
-    if (nextIndent !== prevNode.__indent) {
-      setElementIndent(dom, nextIndent);
-    }
-
-    const nextFormat = nextNode.__format;
-
-    if (nextFormat !== prevNode.__format) {
-      setElementFormat(dom, nextFormat);
-    }
     if (isDirty) {
       $reconcileChildrenWithDirection(prevNode, nextNode, dom);
       if (!$isRootNode(nextNode) && !nextNode.isInline()) {
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index f7230595a43..a4d74210e41 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -129,8 +129,6 @@ export class TestElementNode extends ElementNode {
     serializedNode: SerializedTestElementNode,
   ): TestInlineElementNode {
     const node = $createTestInlineElementNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -195,8 +193,6 @@ export class TestInlineElementNode extends ElementNode {
     serializedNode: SerializedTestInlineElementNode,
   ): TestInlineElementNode {
     const node = $createTestInlineElementNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -241,8 +237,6 @@ export class TestShadowRootNode extends ElementNode {
     serializedNode: SerializedTestShadowRootNode,
   ): TestShadowRootNode {
     const node = $createTestShadowRootNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -322,8 +316,6 @@ export class TestExcludeFromCopyElementNode extends ElementNode {
     serializedNode: SerializedTestExcludeFromCopyElementNode,
   ): TestExcludeFromCopyElementNode {
     const node = $createTestExcludeFromCopyElementNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
new file mode 100644
index 00000000000..37ca1cdef7f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
@@ -0,0 +1,54 @@
+import {ElementNode} from "./LexicalElementNode";
+import {CommonBlockAlignment, SerializedCommonBlockNode} from "../../../nodes/_common";
+
+
+export class CommonBlockNode extends ElementNode {
+    __id: string = '';
+    __alignment: CommonBlockAlignment = '';
+    __inset: number = 0;
+
+    setId(id: string) {
+        const self = this.getWritable();
+        self.__id = id;
+    }
+
+    getId(): string {
+        const self = this.getLatest();
+        return self.__id;
+    }
+
+    setAlignment(alignment: CommonBlockAlignment) {
+        const self = this.getWritable();
+        self.__alignment = alignment;
+    }
+
+    getAlignment(): CommonBlockAlignment {
+        const self = this.getLatest();
+        return self.__alignment;
+    }
+
+    setInset(size: number) {
+        const self = this.getWritable();
+        self.__inset = size;
+    }
+
+    getInset(): number {
+        const self = this.getLatest();
+        return self.__inset;
+    }
+
+    exportJSON(): SerializedCommonBlockNode {
+        return {
+            ...super.exportJSON(),
+            id: this.__id,
+            alignment: this.__alignment,
+            inset: this.__inset,
+        };
+    }
+}
+
+export function copyCommonBlockProperties(from: CommonBlockNode, to: CommonBlockNode): void {
+    to.__id = from.__id;
+    to.__alignment = from.__alignment;
+    to.__inset = from.__inset;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 88c6d56780f..002d825d6ea 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -42,8 +42,6 @@ export type SerializedElementNode<
   {
     children: Array<T>;
     direction: 'ltr' | 'rtl' | null;
-    format: ElementFormatType;
-    indent: number;
   },
   SerializedLexicalNode
 >;
@@ -74,12 +72,8 @@ export class ElementNode extends LexicalNode {
   /** @internal */
   __size: number;
   /** @internal */
-  __format: number;
-  /** @internal */
   __style: string;
   /** @internal */
-  __indent: number;
-  /** @internal */
   __dir: 'ltr' | 'rtl' | null;
 
   constructor(key?: NodeKey) {
@@ -87,9 +81,7 @@ export class ElementNode extends LexicalNode {
     this.__first = null;
     this.__last = null;
     this.__size = 0;
-    this.__format = 0;
     this.__style = '';
-    this.__indent = 0;
     this.__dir = null;
   }
 
@@ -98,28 +90,14 @@ export class ElementNode extends LexicalNode {
     this.__first = prevNode.__first;
     this.__last = prevNode.__last;
     this.__size = prevNode.__size;
-    this.__indent = prevNode.__indent;
-    this.__format = prevNode.__format;
     this.__style = prevNode.__style;
     this.__dir = prevNode.__dir;
   }
 
-  getFormat(): number {
-    const self = this.getLatest();
-    return self.__format;
-  }
-  getFormatType(): ElementFormatType {
-    const format = this.getFormat();
-    return ELEMENT_FORMAT_TO_TYPE[format] || '';
-  }
   getStyle(): string {
     const self = this.getLatest();
     return self.__style;
   }
-  getIndent(): number {
-    const self = this.getLatest();
-    return self.__indent;
-  }
   getChildren<T extends LexicalNode>(): Array<T> {
     const children: Array<T> = [];
     let child: T | null = this.getFirstChild();
@@ -301,13 +279,6 @@ export class ElementNode extends LexicalNode {
     const self = this.getLatest();
     return self.__dir;
   }
-  hasFormat(type: ElementFormatType): boolean {
-    if (type !== '') {
-      const formatFlag = ELEMENT_TYPE_TO_FORMAT[type];
-      return (this.getFormat() & formatFlag) !== 0;
-    }
-    return false;
-  }
 
   // Mutators
 
@@ -378,21 +349,11 @@ export class ElementNode extends LexicalNode {
     self.__dir = direction;
     return self;
   }
-  setFormat(type: ElementFormatType): this {
-    const self = this.getWritable();
-    self.__format = type !== '' ? ELEMENT_TYPE_TO_FORMAT[type] : 0;
-    return this;
-  }
   setStyle(style: string): this {
     const self = this.getWritable();
     self.__style = style || '';
     return this;
   }
-  setIndent(indentLevel: number): this {
-    const self = this.getWritable();
-    self.__indent = indentLevel;
-    return this;
-  }
   splice(
     start: number,
     deleteCount: number,
@@ -528,8 +489,6 @@ export class ElementNode extends LexicalNode {
     return {
       children: [],
       direction: this.getDirection(),
-      format: this.getFormatType(),
-      indent: this.getIndent(),
       type: 'element',
       version: 1,
     };
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index 4e69dc21c3c..6517d939eda 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -19,39 +19,36 @@ import type {
   LexicalNode,
   NodeKey,
 } from '../LexicalNode';
-import type {
-  ElementFormatType,
-  SerializedElementNode,
-} from './LexicalElementNode';
 import type {RangeSelection} from 'lexical';
 
-import {TEXT_TYPE_TO_FORMAT} from '../LexicalConstants';
 import {
   $applyNodeReplacement,
   getCachedClassNameArray,
   isHTMLElement,
 } from '../LexicalUtils';
-import {ElementNode} from './LexicalElementNode';
-import {$isTextNode, TextFormatType} from './LexicalTextNode';
+import {$isTextNode} from './LexicalTextNode';
+import {
+  commonPropertiesDifferent, deserializeCommonBlockNode,
+  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  updateElementWithCommonBlockProps
+} from "../../../nodes/_common";
+import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
 
 export type SerializedParagraphNode = Spread<
   {
-    textFormat: number;
     textStyle: string;
   },
-  SerializedElementNode
+  SerializedCommonBlockNode
 >;
 
 /** @noInheritDoc */
-export class ParagraphNode extends ElementNode {
+export class ParagraphNode extends CommonBlockNode {
   ['constructor']!: KlassConstructor<typeof ParagraphNode>;
   /** @internal */
-  __textFormat: number;
   __textStyle: string;
 
   constructor(key?: NodeKey) {
     super(key);
-    this.__textFormat = 0;
     this.__textStyle = '';
   }
 
@@ -59,22 +56,6 @@ export class ParagraphNode extends ElementNode {
     return 'paragraph';
   }
 
-  getTextFormat(): number {
-    const self = this.getLatest();
-    return self.__textFormat;
-  }
-
-  setTextFormat(type: number): this {
-    const self = this.getWritable();
-    self.__textFormat = type;
-    return self;
-  }
-
-  hasTextFormat(type: TextFormatType): boolean {
-    const formatFlag = TEXT_TYPE_TO_FORMAT[type];
-    return (this.getTextFormat() & formatFlag) !== 0;
-  }
-
   getTextStyle(): string {
     const self = this.getLatest();
     return self.__textStyle;
@@ -92,8 +73,8 @@ export class ParagraphNode extends ElementNode {
 
   afterCloneFrom(prevNode: this) {
     super.afterCloneFrom(prevNode);
-    this.__textFormat = prevNode.__textFormat;
     this.__textStyle = prevNode.__textStyle;
+    copyCommonBlockProperties(prevNode, this);
   }
 
   // View
@@ -105,6 +86,9 @@ export class ParagraphNode extends ElementNode {
       const domClassList = dom.classList;
       domClassList.add(...classNames);
     }
+
+    updateElementWithCommonBlockProps(dom, this);
+
     return dom;
   }
   updateDOM(
@@ -112,7 +96,7 @@ export class ParagraphNode extends ElementNode {
     dom: HTMLElement,
     config: EditorConfig,
   ): boolean {
-    return false;
+    return commonPropertiesDifferent(prevNode, this);
   }
 
   static importDOM(): DOMConversionMap | null {
@@ -131,16 +115,6 @@ export class ParagraphNode extends ElementNode {
       if (this.isEmpty()) {
         element.append(document.createElement('br'));
       }
-
-      const formatType = this.getFormatType();
-      element.style.textAlign = formatType;
-
-      const indent = this.getIndent();
-      if (indent > 0) {
-        // padding-inline-start is not widely supported in email HTML, but
-        // Lexical Reconciler uses padding-inline-start. Using text-indent instead.
-        element.style.textIndent = `${indent * 20}px`;
-      }
     }
 
     return {
@@ -150,16 +124,13 @@ export class ParagraphNode extends ElementNode {
 
   static importJSON(serializedNode: SerializedParagraphNode): ParagraphNode {
     const node = $createParagraphNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
-    node.setTextFormat(serializedNode.textFormat);
+    deserializeCommonBlockNode(serializedNode, node);
     return node;
   }
 
   exportJSON(): SerializedParagraphNode {
     return {
       ...super.exportJSON(),
-      textFormat: this.getTextFormat(),
       textStyle: this.getTextStyle(),
       type: 'paragraph',
       version: 1,
@@ -173,11 +144,9 @@ export class ParagraphNode extends ElementNode {
     restoreSelection: boolean,
   ): ParagraphNode {
     const newElement = $createParagraphNode();
-    newElement.setTextFormat(rangeSelection.format);
     newElement.setTextStyle(rangeSelection.style);
     const direction = this.getDirection();
     newElement.setDirection(direction);
-    newElement.setFormat(this.getFormatType());
     newElement.setStyle(this.getTextStyle());
     this.insertAfter(newElement, restoreSelection);
     return newElement;
@@ -210,13 +179,7 @@ export class ParagraphNode extends ElementNode {
 
 function $convertParagraphElement(element: HTMLElement): DOMConversionOutput {
   const node = $createParagraphNode();
-  if (element.style) {
-    node.setFormat(element.style.textAlign as ElementFormatType);
-    const indent = parseInt(element.style.textIndent, 10) / 20;
-    if (indent > 0) {
-      node.setIndent(indent);
-    }
-  }
+  setCommonBlockPropsFromElement(element, node);
   return {node};
 }
 
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
index 74c8d5a7f9b..a1c8813c390 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalRootNode.ts
@@ -99,8 +99,6 @@ export class RootNode extends ElementNode {
   static importJSON(serializedNode: SerializedRootNode): RootNode {
     // We don't create a root, and instead use the existing root.
     const node = $getRoot();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -109,8 +107,6 @@ export class RootNode extends ElementNode {
     return {
       children: [],
       direction: this.getDirection(),
-      format: this.getFormatType(),
-      indent: this.getIndent(),
       type: 'root',
       version: 1,
     };
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index 2975315cc35..3e962ec72f7 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -327,9 +327,6 @@ function wrapContinuousInlines(
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i];
     if ($isBlockElementNode(node)) {
-      if (textAlign && !node.getFormat()) {
-        node.setFormat(textAlign);
-      }
       out.push(node);
     } else {
       continuousInlines.push(node);
@@ -338,7 +335,6 @@ function wrapContinuousInlines(
         (i < nodes.length - 1 && $isBlockElementNode(nodes[i + 1]))
       ) {
         const wrapper = createWrapperFn();
-        wrapper.setFormat(textAlign);
         wrapper.append(...continuousInlines);
         out.push(wrapper);
         continuousInlines = [];
diff --git a/resources/js/wysiwyg/lexical/link/index.ts b/resources/js/wysiwyg/lexical/link/index.ts
index fe2b9757048..884fe9153a0 100644
--- a/resources/js/wysiwyg/lexical/link/index.ts
+++ b/resources/js/wysiwyg/lexical/link/index.ts
@@ -162,8 +162,6 @@ export class LinkNode extends ElementNode {
       target: serializedNode.target,
       title: serializedNode.title,
     });
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -402,8 +400,6 @@ export class AutoLinkNode extends LinkNode {
       target: serializedNode.target,
       title: serializedNode.title,
     });
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     node.setDirection(serializedNode.direction);
     return node;
   }
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
index 5026a01293e..c20329e4be9 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -126,14 +126,12 @@ export class ListItemNode extends ElementNode {
     const node = $createListItemNode();
     node.setChecked(serializedNode.checked);
     node.setValue(serializedNode.value);
-    node.setFormat(serializedNode.format);
     node.setDirection(serializedNode.direction);
     return node;
   }
 
   exportDOM(editor: LexicalEditor): DOMExportOutput {
     const element = this.createDOM(editor._config);
-    element.style.textAlign = this.getFormatType();
     return {
       element,
     };
@@ -172,7 +170,6 @@ export class ListItemNode extends ElementNode {
     if ($isListItemNode(replaceWithNode)) {
       return super.replace(replaceWithNode);
     }
-    this.setIndent(0);
     const list = this.getParentOrThrow();
     if (!$isListNode(list)) {
       return replaceWithNode;
@@ -351,41 +348,6 @@ export class ListItemNode extends ElementNode {
     this.setChecked(!this.__checked);
   }
 
-  getIndent(): number {
-    // If we don't have a parent, we are likely serializing
-    const parent = this.getParent();
-    if (parent === null) {
-      return this.getLatest().__indent;
-    }
-    // ListItemNode should always have a ListNode for a parent.
-    let listNodeParent = parent.getParentOrThrow();
-    let indentLevel = 0;
-    while ($isListItemNode(listNodeParent)) {
-      listNodeParent = listNodeParent.getParentOrThrow().getParentOrThrow();
-      indentLevel++;
-    }
-
-    return indentLevel;
-  }
-
-  setIndent(indent: number): this {
-    invariant(typeof indent === 'number', 'Invalid indent value.');
-    indent = Math.floor(indent);
-    invariant(indent >= 0, 'Indent value must be non-negative.');
-    let currentIndent = this.getIndent();
-    while (currentIndent !== indent) {
-      if (currentIndent < indent) {
-        $handleIndent(this);
-        currentIndent++;
-      } else {
-        $handleOutdent(this);
-        currentIndent--;
-      }
-    }
-
-    return this;
-  }
-
   /** @deprecated @internal */
   canInsertAfter(node: LexicalNode): boolean {
     return $isListItemNode(node);
diff --git a/resources/js/wysiwyg/lexical/list/formatList.ts b/resources/js/wysiwyg/lexical/list/formatList.ts
index b9ca011696a..aa0d5d61129 100644
--- a/resources/js/wysiwyg/lexical/list/formatList.ts
+++ b/resources/js/wysiwyg/lexical/list/formatList.ts
@@ -84,10 +84,6 @@ export function insertList(editor: LexicalEditor, listType: ListType): void {
           if ($isRootOrShadowRoot(anchorNodeParent)) {
             anchorNode.replace(list);
             const listItem = $createListItemNode();
-            if ($isElementNode(anchorNode)) {
-              listItem.setFormat(anchorNode.getFormatType());
-              listItem.setIndent(anchorNode.getIndent());
-            }
             list.append(listItem);
           } else if ($isListItemNode(anchorNode)) {
             const parent = anchorNode.getParentOrThrow();
@@ -157,8 +153,6 @@ function $createListOrMerge(node: ElementNode, listType: ListType): ListNode {
   const previousSibling = node.getPreviousSibling();
   const nextSibling = node.getNextSibling();
   const listItem = $createListItemNode();
-  listItem.setFormat(node.getFormatType());
-  listItem.setIndent(node.getIndent());
   append(listItem, node.getChildren());
 
   if (
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index d937060c658..bc5c3f1d207 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -155,9 +155,6 @@ export class QuoteNode extends ElementNode {
       if (this.isEmpty()) {
         element.append(document.createElement('br'));
       }
-
-      const formatType = this.getFormatType();
-      element.style.textAlign = formatType;
     }
 
     return {
@@ -167,8 +164,6 @@ export class QuoteNode extends ElementNode {
 
   static importJSON(serializedNode: SerializedQuoteNode): QuoteNode {
     const node = $createQuoteNode();
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
     return node;
   }
 
@@ -315,9 +310,6 @@ export class HeadingNode extends ElementNode {
       if (this.isEmpty()) {
         element.append(document.createElement('br'));
       }
-
-      const formatType = this.getFormatType();
-      element.style.textAlign = formatType;
     }
 
     return {
@@ -326,10 +318,7 @@ export class HeadingNode extends ElementNode {
   }
 
   static importJSON(serializedNode: SerializedHeadingNode): HeadingNode {
-    const node = $createHeadingNode(serializedNode.tag);
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
-    return node;
+    return $createHeadingNode(serializedNode.tag);
   }
 
   exportJSON(): SerializedHeadingNode {
@@ -402,18 +391,12 @@ function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
     nodeName === 'h6'
   ) {
     node = $createHeadingNode(nodeName);
-    if (element.style !== null) {
-      node.setFormat(element.style.textAlign as ElementFormatType);
-    }
   }
   return {node};
 }
 
 function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
   const node = $createQuoteNode();
-  if (element.style !== null) {
-    node.setFormat(element.style.textAlign as ElementFormatType);
-  }
   return {node};
 }
 
@@ -651,9 +634,6 @@ export function registerRichText(editor: LexicalEditor): () => void {
             (parentNode): parentNode is ElementNode =>
               $isElementNode(parentNode) && !parentNode.isInline(),
           );
-          if (element !== null) {
-            element.setFormat(format);
-          }
         }
         return true;
       },
@@ -691,28 +671,6 @@ export function registerRichText(editor: LexicalEditor): () => void {
       },
       COMMAND_PRIORITY_EDITOR,
     ),
-    editor.registerCommand(
-      INDENT_CONTENT_COMMAND,
-      () => {
-        return $handleIndentAndOutdent((block) => {
-          const indent = block.getIndent();
-          block.setIndent(indent + 1);
-        });
-      },
-      COMMAND_PRIORITY_EDITOR,
-    ),
-    editor.registerCommand(
-      OUTDENT_CONTENT_COMMAND,
-      () => {
-        return $handleIndentAndOutdent((block) => {
-          const indent = block.getIndent();
-          if (indent > 0) {
-            block.setIndent(indent - 1);
-          }
-        });
-      },
-      COMMAND_PRIORITY_EDITOR,
-    ),
     editor.registerCommand<KeyboardEvent>(
       KEY_ARROW_UP_COMMAND,
       (event) => {
@@ -846,19 +804,7 @@ export function registerRichText(editor: LexicalEditor): () => void {
           return false;
         }
         event.preventDefault();
-        const {anchor} = selection;
-        const anchorNode = anchor.getNode();
 
-        if (
-          selection.isCollapsed() &&
-          anchor.offset === 0 &&
-          !$isRootNode(anchorNode)
-        ) {
-          const element = $getNearestBlockElementAncestorOrThrow(anchorNode);
-          if (element.getIndent() > 0) {
-            return editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined);
-          }
-        }
         return editor.dispatchCommand(DELETE_CHARACTER_COMMAND, true);
       },
       COMMAND_PRIORITY_EDITOR,
diff --git a/resources/js/wysiwyg/lexical/selection/range-selection.ts b/resources/js/wysiwyg/lexical/selection/range-selection.ts
index dbadaf346b6..542eae4db9f 100644
--- a/resources/js/wysiwyg/lexical/selection/range-selection.ts
+++ b/resources/js/wysiwyg/lexical/selection/range-selection.ts
@@ -81,8 +81,6 @@ export function $setBlocksType(
     invariant($isElementNode(node), 'Expected block node to be an ElementNode');
 
     const targetElement = createElement();
-    targetElement.setFormat(node.getFormatType());
-    targetElement.setIndent(node.getIndent());
     node.replace(targetElement, true);
   }
 }
@@ -136,8 +134,6 @@ export function $wrapNodes(
         : anchor.getNode();
     const children = target.getChildren();
     let element = createElement();
-    element.setFormat(target.getFormatType());
-    element.setIndent(target.getIndent());
     children.forEach((child) => element.append(child));
 
     if (wrappingElement) {
@@ -277,8 +273,6 @@ export function $wrapNodesImpl(
 
       if (elementMapping.get(parentKey) === undefined) {
         const targetElement = createElement();
-        targetElement.setFormat(parent.getFormatType());
-        targetElement.setIndent(parent.getIndent());
         elements.push(targetElement);
         elementMapping.set(parentKey, targetElement);
         // Move node and its siblings to the new
@@ -299,8 +293,6 @@ export function $wrapNodesImpl(
         'Expected node in emptyElements to be an ElementNode',
       );
       const targetElement = createElement();
-      targetElement.setFormat(node.getFormatType());
-      targetElement.setIndent(node.getIndent());
       elements.push(targetElement);
       node.remove(true);
     }
diff --git a/resources/js/wysiwyg/nodes/custom-paragraph.ts b/resources/js/wysiwyg/nodes/custom-paragraph.ts
deleted file mode 100644
index 3adc10d0e9c..00000000000
--- a/resources/js/wysiwyg/nodes/custom-paragraph.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import {
-    DOMConversion,
-    DOMConversionMap,
-    DOMConversionOutput,
-    LexicalNode,
-    ParagraphNode, SerializedParagraphNode, Spread,
-} from "lexical";
-import {EditorConfig} from "lexical/LexicalEditor";
-import {
-    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
-    setCommonBlockPropsFromElement,
-    updateElementWithCommonBlockProps
-} from "./_common";
-
-export type SerializedCustomParagraphNode = Spread<SerializedCommonBlockNode, SerializedParagraphNode>
-
-export class CustomParagraphNode extends ParagraphNode {
-    __id: string = '';
-    __alignment: CommonBlockAlignment = '';
-    __inset: number = 0;
-
-    static getType() {
-        return 'custom-paragraph';
-    }
-
-    setId(id: string) {
-        const self = this.getWritable();
-        self.__id = id;
-    }
-
-    getId(): string {
-        const self = this.getLatest();
-        return self.__id;
-    }
-
-    setAlignment(alignment: CommonBlockAlignment) {
-        const self = this.getWritable();
-        self.__alignment = alignment;
-    }
-
-    getAlignment(): CommonBlockAlignment {
-        const self = this.getLatest();
-        return self.__alignment;
-    }
-
-    setInset(size: number) {
-        const self = this.getWritable();
-        self.__inset = size;
-    }
-
-    getInset(): number {
-        const self = this.getLatest();
-        return self.__inset;
-    }
-
-    static clone(node: CustomParagraphNode): CustomParagraphNode {
-        const newNode = new CustomParagraphNode(node.__key);
-        newNode.__id = node.__id;
-        newNode.__alignment = node.__alignment;
-        newNode.__inset = node.__inset;
-        return newNode;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const dom = super.createDOM(config);
-        updateElementWithCommonBlockProps(dom, this);
-        return dom;
-    }
-
-    updateDOM(prevNode: CustomParagraphNode, dom: HTMLElement, config: EditorConfig): boolean {
-        return super.updateDOM(prevNode, dom, config)
-            || commonPropertiesDifferent(prevNode, this);
-    }
-
-    exportJSON(): SerializedCustomParagraphNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-paragraph',
-            version: 1,
-            id: this.__id,
-            alignment: this.__alignment,
-            inset: this.__inset,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomParagraphNode): CustomParagraphNode {
-        const node = $createCustomParagraphNode();
-        deserializeCommonBlockNode(serializedNode, node);
-        return node;
-    }
-
-    static importDOM(): DOMConversionMap|null {
-        return {
-            p(node: HTMLElement): DOMConversion|null {
-                return {
-                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
-                        const node = $createCustomParagraphNode();
-                        if (element.style.textIndent) {
-                            const indent = parseInt(element.style.textIndent, 10) / 20;
-                            if (indent > 0) {
-                                node.setIndent(indent);
-                            }
-                        }
-
-                        setCommonBlockPropsFromElement(element, node);
-
-                        return {node};
-                    },
-                    priority: 1,
-                };
-            },
-        };
-    }
-}
-
-export function $createCustomParagraphNode(): CustomParagraphNode {
-    return new CustomParagraphNode();
-}
-
-export function $isCustomParagraphNode(node: LexicalNode | null | undefined): node is CustomParagraphNode {
-    return node instanceof CustomParagraphNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index b5483c5009c..062394a9887 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -7,7 +7,6 @@ import {
     LexicalNodeReplacement, NodeMutation,
     ParagraphNode
 } from "lexical";
-import {CustomParagraphNode} from "./custom-paragraph";
 import {LinkNode} from "@lexical/link";
 import {ImageNode} from "./image";
 import {DetailsNode, SummaryNode} from "./details";
@@ -45,14 +44,8 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CodeBlockNode,
         DiagramNode,
         MediaNode, // TODO - Alignment
-        CustomParagraphNode,
+        ParagraphNode,
         LinkNode,
-        {
-            replace: ParagraphNode,
-            with: (node: ParagraphNode) => {
-                return new CustomParagraphNode();
-            }
-        },
         {
             replace: HeadingNode,
             with: (node: HeadingNode) => {
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index 07e35d4438e..e049d5e7c9e 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -1,4 +1,5 @@
 import {
+    $createParagraphNode,
     $insertNodes,
     $isDecoratorNode, COMMAND_PRIORITY_HIGH, DROP_COMMAND,
     LexicalEditor,
@@ -8,7 +9,6 @@ import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selec
 import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";
 import {$createImageNode} from "../nodes/image";
-import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";
@@ -67,7 +67,7 @@ function handleMediaInsert(data: DataTransfer, context: EditorUiContext): boolea
         for (const imageFile of images) {
             const loadingImage = window.baseUrl('/loading.gif');
             const loadingNode = $createImageNode(loadingImage);
-            const imageWrap = $createCustomParagraphNode();
+            const imageWrap = $createParagraphNode();
             imageWrap.append(loadingNode);
             $insertNodes([imageWrap]);
 
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 2c7bfdbbae7..3f0b0c495e0 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -1,5 +1,6 @@
 import {EditorUiContext} from "../ui/framework/core";
 import {
+    $createParagraphNode,
     $getSelection,
     $isDecoratorNode,
     COMMAND_PRIORITY_LOW,
@@ -13,7 +14,6 @@ import {$isImageNode} from "../nodes/image";
 import {$isMediaNode} from "../nodes/media";
 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
-import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$isCustomListItemNode} from "../nodes/custom-list-item";
 import {$setInsetForSelection} from "../utils/lists";
 
@@ -45,7 +45,7 @@ function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEve
         if (nearestBlock) {
             requestAnimationFrame(() => {
                 editor.update(() => {
-                    const newParagraph = $createCustomParagraphNode();
+                    const newParagraph = $createParagraphNode();
                     nearestBlock.insertAfter(newParagraph);
                     newParagraph.select();
                 });
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index a49cccd26dc..817a235a712 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,7 +2,11 @@
 
 ## In progress
 
-//
+Reorg
+  - Merge custom nodes into original nodes
+    - Reduce down to use CommonBlockNode where possible
+    - Remove existing formatType/ElementFormatType references (replaced with alignment).
+    - Remove existing indent references (replaced with inset).
 
 ## Main Todo
 
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 0ec9220dd2e..3cfc964423f 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -1,5 +1,13 @@
 import {$isQuoteNode, HeadingNode, HeadingTagType} from "@lexical/rich-text";
-import {$createTextNode, $getSelection, $insertNodes, LexicalEditor, LexicalNode} from "lexical";
+import {
+    $createParagraphNode,
+    $createTextNode,
+    $getSelection,
+    $insertNodes,
+    $isParagraphNode,
+    LexicalEditor,
+    LexicalNode
+} from "lexical";
 import {
     $getBlockElementNodesInSelection,
     $getNodeFromSelection,
@@ -8,7 +16,6 @@ import {
     getLastSelection
 } from "./selection";
 import {$createCustomHeadingNode, $isCustomHeadingNode} from "../nodes/custom-heading";
-import {$createCustomParagraphNode, $isCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$createCustomQuoteNode} from "../nodes/custom-quote";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
 import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
@@ -31,7 +38,7 @@ export function toggleSelectionAsHeading(editor: LexicalEditor, tag: HeadingTagT
 
 export function toggleSelectionAsParagraph(editor: LexicalEditor) {
     editor.update(() => {
-        $toggleSelectionBlockNodeType($isCustomParagraphNode, $createCustomParagraphNode);
+        $toggleSelectionBlockNodeType($isParagraphNode, $createParagraphNode);
     });
 }
 
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 2dd99d369c7..97634f96b4e 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -1,4 +1,5 @@
 import {
+    $createParagraphNode,
     $getRoot,
     $isDecoratorNode,
     $isElementNode, $isRootNode,
@@ -8,7 +9,6 @@ import {
     LexicalNode
 } from "lexical";
 import {LexicalNodeMatcher} from "../nodes";
-import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
 import {NodeHasAlignment, NodeHasInset} from "../nodes/_common";
@@ -17,7 +17,7 @@ import {$findMatchingParent} from "@lexical/utils";
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
         if ($isTextNode(node)) {
-            const paragraph = $createCustomParagraphNode();
+            const paragraph = $createParagraphNode();
             paragraph.append(node);
             return paragraph;
         }
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 67c2d91b26c..02838eba034 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -7,17 +7,15 @@ import {
     $isTextNode,
     $setSelection,
     BaseSelection, DecoratorNode,
-    ElementFormatType,
     ElementNode, LexicalEditor,
     LexicalNode,
     TextFormatType, TextNode
 } from "lexical";
-import {$findMatchingParent, $getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
+import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
 import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
-import {$createCustomParagraphNode} from "../nodes/custom-paragraph";
 import {CommonBlockAlignment} from "../nodes/_common";
 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
@@ -71,7 +69,7 @@ export function $toggleSelectionBlockNodeType(matcher: LexicalNodeMatcher, creat
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
     if (selection && matcher(blockElement)) {
-        $setBlocksType(selection, $createCustomParagraphNode);
+        $setBlocksType(selection, $createParagraphNode);
     } else {
         $setBlocksType(selection, creator);
     }

From 36a4d791205f824ce6d7d487ab4578ae736c78c0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 3 Dec 2024 17:04:50 +0000
Subject: [PATCH 393/666] Lexical: Extracted & merged heading & quote nodes

---
 .../unit/LexicalSerialization.test.ts         |   3 +-
 .../lexical/core/__tests__/utils/index.ts     |   3 +-
 .../lexical/core/nodes/CommonBlockNode.ts     |   2 +-
 .../__tests__/unit/LexicalTabNode.test.ts     |   3 +-
 .../html/__tests__/unit/LexicalHtml.test.ts   |   3 +-
 .../lexical/rich-text/LexicalHeadingNode.ts   | 202 ++++++++++
 .../lexical/rich-text/LexicalQuoteNode.ts     | 129 +++++++
 .../__tests__/unit/LexicalHeadingNode.test.ts |   6 +-
 .../__tests__/unit/LexicalQuoteNode.test.ts   |   2 +-
 .../js/wysiwyg/lexical/rich-text/index.ts     | 345 +-----------------
 .../__tests__/unit/LexicalSelection.test.ts   |   3 +-
 .../unit/LexicalSelectionHelpers.test.ts      |   2 +-
 .../unit/LexicalEventHelpers.test.ts          |   4 +-
 resources/js/wysiwyg/nodes/custom-heading.ts  | 146 --------
 resources/js/wysiwyg/nodes/custom-quote.ts    | 115 ------
 resources/js/wysiwyg/nodes/index.ts           |  21 +-
 resources/js/wysiwyg/services/shortcuts.ts    |   2 +-
 .../ui/defaults/buttons/block-formats.ts      |   8 +-
 .../wysiwyg/ui/framework/blocks/link-field.ts |  11 +-
 resources/js/wysiwyg/utils/formats.ts         |  11 +-
 20 files changed, 370 insertions(+), 651 deletions(-)
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-heading.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-quote.ts

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
index 5599604c059..81eff674a99 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -8,11 +8,12 @@
 
 import {$createLinkNode} from '@lexical/link';
 import {$createListItemNode, $createListNode} from '@lexical/list';
-import {$createHeadingNode, $createQuoteNode} from '@lexical/rich-text';
 import {$createTableNodeWithDimensions} from '@lexical/table';
 import {$createParagraphNode, $createTextNode, $getRoot} from 'lexical';
 
 import {initializeUnitTest} from '../utils';
+import {$createHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
+import {$createQuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 function $createEditorContent() {
   const root = $getRoot();
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index a4d74210e41..e9d14ef1139 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -10,7 +10,6 @@ import {createHeadlessEditor} from '@lexical/headless';
 import {AutoLinkNode, LinkNode} from '@lexical/link';
 import {ListItemNode, ListNode} from '@lexical/list';
 
-import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 
 import {
@@ -36,6 +35,8 @@ import {
   LexicalNodeReplacement,
 } from '../../LexicalEditor';
 import {resetRandomKey} from '../../LexicalUtils';
+import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
+import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 
 type TestEnv = {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
index 37ca1cdef7f..bf4fc08ca60 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
@@ -48,7 +48,7 @@ export class CommonBlockNode extends ElementNode {
 }
 
 export function copyCommonBlockProperties(from: CommonBlockNode, to: CommonBlockNode): void {
-    to.__id = from.__id;
+    // to.__id = from.__id;
     to.__alignment = from.__alignment;
     to.__inset = from.__inset;
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index d8525fb369f..9831114340d 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -11,7 +11,7 @@ import {
   $insertDataTransferForRichText,
 } from '@lexical/clipboard';
 import {$createListItemNode, $createListNode} from '@lexical/list';
-import {$createHeadingNode, registerRichText} from '@lexical/rich-text';
+import {registerRichText} from '@lexical/rich-text';
 import {
   $createParagraphNode,
   $createRangeSelection,
@@ -32,6 +32,7 @@ import {
   initializeUnitTest,
   invariant,
 } from '../../../__tests__/utils';
+import {$createHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 describe('LexicalTabNode tests', () => {
   initializeUnitTest((testEnv) => {
diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
index 947e591b4ff..a4e2d231389 100644
--- a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -13,13 +13,14 @@ import {createHeadlessEditor} from '@lexical/headless';
 import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
 import {LinkNode} from '@lexical/link';
 import {ListItemNode, ListNode} from '@lexical/list';
-import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {
   $createParagraphNode,
   $createRangeSelection,
   $createTextNode,
   $getRoot,
 } from 'lexical';
+import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
+import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 describe('HTML', () => {
   type Input = Array<{
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
new file mode 100644
index 00000000000..0f30263ba0e
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
@@ -0,0 +1,202 @@
+import {
+    $applyNodeReplacement,
+    $createParagraphNode,
+    type DOMConversionMap,
+    DOMConversionOutput,
+    type DOMExportOutput,
+    type EditorConfig,
+    isHTMLElement,
+    type LexicalEditor,
+    type LexicalNode,
+    type NodeKey,
+    type ParagraphNode,
+    type RangeSelection,
+    type SerializedElementNode,
+    type Spread
+} from "lexical";
+import {addClassNamesToElement} from "@lexical/utils";
+import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {
+    commonPropertiesDifferent, deserializeCommonBlockNode,
+    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "../../nodes/_common";
+
+export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+export type SerializedHeadingNode = Spread<
+    {
+        tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+    },
+    SerializedCommonBlockNode
+>;
+
+/** @noInheritDoc */
+export class HeadingNode extends CommonBlockNode {
+    /** @internal */
+    __tag: HeadingTagType;
+
+    static getType(): string {
+        return 'heading';
+    }
+
+    static clone(node: HeadingNode): HeadingNode {
+        const clone = new HeadingNode(node.__tag, node.__key);
+        copyCommonBlockProperties(node, clone);
+        return clone;
+    }
+
+    constructor(tag: HeadingTagType, key?: NodeKey) {
+        super(key);
+        this.__tag = tag;
+    }
+
+    getTag(): HeadingTagType {
+        return this.__tag;
+    }
+
+    // View
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const tag = this.__tag;
+        const element = document.createElement(tag);
+        const theme = config.theme;
+        const classNames = theme.heading;
+        if (classNames !== undefined) {
+            const className = classNames[tag];
+            addClassNamesToElement(element, className);
+        }
+        updateElementWithCommonBlockProps(element, this);
+        return element;
+    }
+
+    updateDOM(prevNode: HeadingNode, dom: HTMLElement): boolean {
+        return commonPropertiesDifferent(prevNode, this);
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            h1: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h2: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h3: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h4: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h5: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+            h6: (node: Node) => ({
+                conversion: $convertHeadingElement,
+                priority: 0,
+            }),
+        };
+    }
+
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const {element} = super.exportDOM(editor);
+
+        if (element && isHTMLElement(element)) {
+            if (this.isEmpty()) {
+                element.append(document.createElement('br'));
+            }
+        }
+
+        return {
+            element,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedHeadingNode): HeadingNode {
+        const node = $createHeadingNode(serializedNode.tag);
+        deserializeCommonBlockNode(serializedNode, node);
+        return node;
+    }
+
+    exportJSON(): SerializedHeadingNode {
+        return {
+            ...super.exportJSON(),
+            tag: this.getTag(),
+            type: 'heading',
+            version: 1,
+        };
+    }
+
+    // Mutation
+    insertNewAfter(
+        selection?: RangeSelection,
+        restoreSelection = true,
+    ): ParagraphNode | HeadingNode {
+        const anchorOffet = selection ? selection.anchor.offset : 0;
+        const lastDesc = this.getLastDescendant();
+        const isAtEnd =
+            !lastDesc ||
+            (selection &&
+                selection.anchor.key === lastDesc.getKey() &&
+                anchorOffet === lastDesc.getTextContentSize());
+        const newElement =
+            isAtEnd || !selection
+                ? $createParagraphNode()
+                : $createHeadingNode(this.getTag());
+        const direction = this.getDirection();
+        newElement.setDirection(direction);
+        this.insertAfter(newElement, restoreSelection);
+        if (anchorOffet === 0 && !this.isEmpty() && selection) {
+            const paragraph = $createParagraphNode();
+            paragraph.select();
+            this.replace(paragraph, true);
+        }
+        return newElement;
+    }
+
+    collapseAtStart(): true {
+        const newElement = !this.isEmpty()
+            ? $createHeadingNode(this.getTag())
+            : $createParagraphNode();
+        const children = this.getChildren();
+        children.forEach((child) => newElement.append(child));
+        this.replace(newElement);
+        return true;
+    }
+
+    extractWithChild(): boolean {
+        return true;
+    }
+}
+
+function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
+    const nodeName = element.nodeName.toLowerCase();
+    let node = null;
+    if (
+        nodeName === 'h1' ||
+        nodeName === 'h2' ||
+        nodeName === 'h3' ||
+        nodeName === 'h4' ||
+        nodeName === 'h5' ||
+        nodeName === 'h6'
+    ) {
+        node = $createHeadingNode(nodeName);
+        setCommonBlockPropsFromElement(element, node);
+    }
+    return {node};
+}
+
+export function $createHeadingNode(headingTag: HeadingTagType): HeadingNode {
+    return $applyNodeReplacement(new HeadingNode(headingTag));
+}
+
+export function $isHeadingNode(
+    node: LexicalNode | null | undefined,
+): node is HeadingNode {
+    return node instanceof HeadingNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
new file mode 100644
index 00000000000..53caca80115
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
@@ -0,0 +1,129 @@
+import {
+    $applyNodeReplacement,
+    $createParagraphNode,
+    type DOMConversionMap,
+    type DOMConversionOutput,
+    type DOMExportOutput,
+    type EditorConfig,
+    ElementNode,
+    isHTMLElement,
+    type LexicalEditor,
+    LexicalNode,
+    type NodeKey,
+    type ParagraphNode,
+    type RangeSelection,
+    SerializedElementNode
+} from "lexical";
+import {addClassNamesToElement} from "@lexical/utils";
+import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {
+    commonPropertiesDifferent, deserializeCommonBlockNode,
+    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    updateElementWithCommonBlockProps
+} from "../../nodes/_common";
+
+export type SerializedQuoteNode = SerializedCommonBlockNode;
+
+/** @noInheritDoc */
+export class QuoteNode extends CommonBlockNode {
+    static getType(): string {
+        return 'quote';
+    }
+
+    static clone(node: QuoteNode): QuoteNode {
+        const clone = new QuoteNode(node.__key);
+        copyCommonBlockProperties(node, clone);
+        return clone;
+    }
+
+    constructor(key?: NodeKey) {
+        super(key);
+    }
+
+    // View
+
+    createDOM(config: EditorConfig): HTMLElement {
+        const element = document.createElement('blockquote');
+        addClassNamesToElement(element, config.theme.quote);
+        updateElementWithCommonBlockProps(element, this);
+        return element;
+    }
+
+    updateDOM(prevNode: QuoteNode, dom: HTMLElement): boolean {
+        return commonPropertiesDifferent(prevNode, this);
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            blockquote: (node: Node) => ({
+                conversion: $convertBlockquoteElement,
+                priority: 0,
+            }),
+        };
+    }
+
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const {element} = super.exportDOM(editor);
+
+        if (element && isHTMLElement(element)) {
+            if (this.isEmpty()) {
+                element.append(document.createElement('br'));
+            }
+        }
+
+        return {
+            element,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedQuoteNode): QuoteNode {
+        const node = $createQuoteNode();
+        deserializeCommonBlockNode(serializedNode, node);
+        return node;
+    }
+
+    exportJSON(): SerializedQuoteNode {
+        return {
+            ...super.exportJSON(),
+            type: 'quote',
+        };
+    }
+
+    // Mutation
+
+    insertNewAfter(_: RangeSelection, restoreSelection?: boolean): ParagraphNode {
+        const newBlock = $createParagraphNode();
+        const direction = this.getDirection();
+        newBlock.setDirection(direction);
+        this.insertAfter(newBlock, restoreSelection);
+        return newBlock;
+    }
+
+    collapseAtStart(): true {
+        const paragraph = $createParagraphNode();
+        const children = this.getChildren();
+        children.forEach((child) => paragraph.append(child));
+        this.replace(paragraph);
+        return true;
+    }
+
+    canMergeWhenEmpty(): true {
+        return true;
+    }
+}
+
+export function $createQuoteNode(): QuoteNode {
+    return $applyNodeReplacement(new QuoteNode());
+}
+
+export function $isQuoteNode(
+    node: LexicalNode | null | undefined,
+): node is QuoteNode {
+    return node instanceof QuoteNode;
+}
+
+function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
+    const node = $createQuoteNode();
+    setCommonBlockPropsFromElement(element, node);
+    return {node};
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
index a94f9ee0bb8..be4b97ba3f3 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalHeadingNode.test.ts
@@ -6,11 +6,6 @@
  *
  */
 
-import {
-  $createHeadingNode,
-  $isHeadingNode,
-  HeadingNode,
-} from '@lexical/rich-text';
 import {
   $createTextNode,
   $getRoot,
@@ -19,6 +14,7 @@ import {
   RangeSelection,
 } from 'lexical';
 import {initializeUnitTest} from 'lexical/__tests__/utils';
+import {$createHeadingNode, $isHeadingNode, HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
index 66374bf5ff0..cf85045cda1 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalQuoteNode.test.ts
@@ -6,9 +6,9 @@
  *
  */
 
-import {$createQuoteNode, QuoteNode} from '@lexical/rich-text';
 import {$createRangeSelection, $getRoot, ParagraphNode} from 'lexical';
 import {initializeUnitTest} from 'lexical/__tests__/utils';
+import {$createQuoteNode, QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index bc5c3f1d207..c585c028a5a 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -8,42 +8,14 @@
 
 import type {
   CommandPayloadType,
-  DOMConversionMap,
-  DOMConversionOutput,
-  DOMExportOutput,
-  EditorConfig,
   ElementFormatType,
   LexicalCommand,
   LexicalEditor,
-  LexicalNode,
-  NodeKey,
-  ParagraphNode,
   PasteCommandType,
   RangeSelection,
-  SerializedElementNode,
-  Spread,
   TextFormatType,
 } from 'lexical';
-
-import {
-  $insertDataTransferForRichText,
-  copyToClipboard,
-} from '@lexical/clipboard';
-import {
-  $moveCharacter,
-  $shouldOverrideDefaultCharacterSelection,
-} from '@lexical/selection';
 import {
-  $findMatchingParent,
-  $getNearestBlockElementAncestorOrThrow,
-  addClassNamesToElement,
-  isHTMLElement,
-  mergeRegister,
-  objectKlassEquals,
-} from '@lexical/utils';
-import {
-  $applyNodeReplacement,
-  $createParagraphNode,
   $createRangeSelection,
   $createTabNode,
   $getAdjacentNode,
@@ -55,7 +27,6 @@ import {
   $isElementNode,
   $isNodeSelection,
   $isRangeSelection,
-  $isRootNode,
   $isTextNode,
   $normalizeSelection__EXPERIMENTAL,
   $selectAll,
@@ -75,7 +46,6 @@ import {
   ElementNode,
   FORMAT_ELEMENT_COMMAND,
   FORMAT_TEXT_COMMAND,
-  INDENT_CONTENT_COMMAND,
   INSERT_LINE_BREAK_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
   INSERT_TAB_COMMAND,
@@ -88,327 +58,22 @@ import {
   KEY_DELETE_COMMAND,
   KEY_ENTER_COMMAND,
   KEY_ESCAPE_COMMAND,
-  OUTDENT_CONTENT_COMMAND,
   PASTE_COMMAND,
   REMOVE_TEXT_COMMAND,
   SELECT_ALL_COMMAND,
 } from 'lexical';
-import caretFromPoint from 'lexical/shared/caretFromPoint';
-import {
-  CAN_USE_BEFORE_INPUT,
-  IS_APPLE_WEBKIT,
-  IS_IOS,
-  IS_SAFARI,
-} from 'lexical/shared/environment';
 
-export type SerializedHeadingNode = Spread<
-  {
-    tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
-  },
-  SerializedElementNode
->;
+import {$insertDataTransferForRichText, copyToClipboard,} from '@lexical/clipboard';
+import {$moveCharacter, $shouldOverrideDefaultCharacterSelection,} from '@lexical/selection';
+import {$findMatchingParent, mergeRegister, objectKlassEquals,} from '@lexical/utils';
+import caretFromPoint from 'lexical/shared/caretFromPoint';
+import {CAN_USE_BEFORE_INPUT, IS_APPLE_WEBKIT, IS_IOS, IS_SAFARI,} from 'lexical/shared/environment';
 
 export const DRAG_DROP_PASTE: LexicalCommand<Array<File>> = createCommand(
   'DRAG_DROP_PASTE_FILE',
 );
 
-export type SerializedQuoteNode = SerializedElementNode;
-
-/** @noInheritDoc */
-export class QuoteNode extends ElementNode {
-  static getType(): string {
-    return 'quote';
-  }
-
-  static clone(node: QuoteNode): QuoteNode {
-    return new QuoteNode(node.__key);
-  }
-
-  constructor(key?: NodeKey) {
-    super(key);
-  }
-
-  // View
-
-  createDOM(config: EditorConfig): HTMLElement {
-    const element = document.createElement('blockquote');
-    addClassNamesToElement(element, config.theme.quote);
-    return element;
-  }
-  updateDOM(prevNode: QuoteNode, dom: HTMLElement): boolean {
-    return false;
-  }
-
-  static importDOM(): DOMConversionMap | null {
-    return {
-      blockquote: (node: Node) => ({
-        conversion: $convertBlockquoteElement,
-        priority: 0,
-      }),
-    };
-  }
-
-  exportDOM(editor: LexicalEditor): DOMExportOutput {
-    const {element} = super.exportDOM(editor);
-
-    if (element && isHTMLElement(element)) {
-      if (this.isEmpty()) {
-        element.append(document.createElement('br'));
-      }
-    }
-
-    return {
-      element,
-    };
-  }
-
-  static importJSON(serializedNode: SerializedQuoteNode): QuoteNode {
-    const node = $createQuoteNode();
-    return node;
-  }
-
-  exportJSON(): SerializedElementNode {
-    return {
-      ...super.exportJSON(),
-      type: 'quote',
-    };
-  }
-
-  // Mutation
-
-  insertNewAfter(_: RangeSelection, restoreSelection?: boolean): ParagraphNode {
-    const newBlock = $createParagraphNode();
-    const direction = this.getDirection();
-    newBlock.setDirection(direction);
-    this.insertAfter(newBlock, restoreSelection);
-    return newBlock;
-  }
-
-  collapseAtStart(): true {
-    const paragraph = $createParagraphNode();
-    const children = this.getChildren();
-    children.forEach((child) => paragraph.append(child));
-    this.replace(paragraph);
-    return true;
-  }
-
-  canMergeWhenEmpty(): true {
-    return true;
-  }
-}
-
-export function $createQuoteNode(): QuoteNode {
-  return $applyNodeReplacement(new QuoteNode());
-}
-
-export function $isQuoteNode(
-  node: LexicalNode | null | undefined,
-): node is QuoteNode {
-  return node instanceof QuoteNode;
-}
-
-export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
-
-/** @noInheritDoc */
-export class HeadingNode extends ElementNode {
-  /** @internal */
-  __tag: HeadingTagType;
-
-  static getType(): string {
-    return 'heading';
-  }
-
-  static clone(node: HeadingNode): HeadingNode {
-    return new HeadingNode(node.__tag, node.__key);
-  }
-
-  constructor(tag: HeadingTagType, key?: NodeKey) {
-    super(key);
-    this.__tag = tag;
-  }
-
-  getTag(): HeadingTagType {
-    return this.__tag;
-  }
-
-  // View
-
-  createDOM(config: EditorConfig): HTMLElement {
-    const tag = this.__tag;
-    const element = document.createElement(tag);
-    const theme = config.theme;
-    const classNames = theme.heading;
-    if (classNames !== undefined) {
-      const className = classNames[tag];
-      addClassNamesToElement(element, className);
-    }
-    return element;
-  }
-
-  updateDOM(prevNode: HeadingNode, dom: HTMLElement): boolean {
-    return false;
-  }
-
-  static importDOM(): DOMConversionMap | null {
-    return {
-      h1: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      h2: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      h3: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      h4: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      h5: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      h6: (node: Node) => ({
-        conversion: $convertHeadingElement,
-        priority: 0,
-      }),
-      p: (node: Node) => {
-        // domNode is a <p> since we matched it by nodeName
-        const paragraph = node as HTMLParagraphElement;
-        const firstChild = paragraph.firstChild;
-        if (firstChild !== null && isGoogleDocsTitle(firstChild)) {
-          return {
-            conversion: () => ({node: null}),
-            priority: 3,
-          };
-        }
-        return null;
-      },
-      span: (node: Node) => {
-        if (isGoogleDocsTitle(node)) {
-          return {
-            conversion: (domNode: Node) => {
-              return {
-                node: $createHeadingNode('h1'),
-              };
-            },
-            priority: 3,
-          };
-        }
-        return null;
-      },
-    };
-  }
-
-  exportDOM(editor: LexicalEditor): DOMExportOutput {
-    const {element} = super.exportDOM(editor);
-
-    if (element && isHTMLElement(element)) {
-      if (this.isEmpty()) {
-        element.append(document.createElement('br'));
-      }
-    }
-
-    return {
-      element,
-    };
-  }
-
-  static importJSON(serializedNode: SerializedHeadingNode): HeadingNode {
-    return $createHeadingNode(serializedNode.tag);
-  }
-
-  exportJSON(): SerializedHeadingNode {
-    return {
-      ...super.exportJSON(),
-      tag: this.getTag(),
-      type: 'heading',
-      version: 1,
-    };
-  }
-
-  // Mutation
-  insertNewAfter(
-    selection?: RangeSelection,
-    restoreSelection = true,
-  ): ParagraphNode | HeadingNode {
-    const anchorOffet = selection ? selection.anchor.offset : 0;
-    const lastDesc = this.getLastDescendant();
-    const isAtEnd =
-      !lastDesc ||
-      (selection &&
-        selection.anchor.key === lastDesc.getKey() &&
-        anchorOffet === lastDesc.getTextContentSize());
-    const newElement =
-      isAtEnd || !selection
-        ? $createParagraphNode()
-        : $createHeadingNode(this.getTag());
-    const direction = this.getDirection();
-    newElement.setDirection(direction);
-    this.insertAfter(newElement, restoreSelection);
-    if (anchorOffet === 0 && !this.isEmpty() && selection) {
-      const paragraph = $createParagraphNode();
-      paragraph.select();
-      this.replace(paragraph, true);
-    }
-    return newElement;
-  }
-
-  collapseAtStart(): true {
-    const newElement = !this.isEmpty()
-      ? $createHeadingNode(this.getTag())
-      : $createParagraphNode();
-    const children = this.getChildren();
-    children.forEach((child) => newElement.append(child));
-    this.replace(newElement);
-    return true;
-  }
-
-  extractWithChild(): boolean {
-    return true;
-  }
-}
 
-function isGoogleDocsTitle(domNode: Node): boolean {
-  if (domNode.nodeName.toLowerCase() === 'span') {
-    return (domNode as HTMLSpanElement).style.fontSize === '26pt';
-  }
-  return false;
-}
-
-function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
-  const nodeName = element.nodeName.toLowerCase();
-  let node = null;
-  if (
-    nodeName === 'h1' ||
-    nodeName === 'h2' ||
-    nodeName === 'h3' ||
-    nodeName === 'h4' ||
-    nodeName === 'h5' ||
-    nodeName === 'h6'
-  ) {
-    node = $createHeadingNode(nodeName);
-  }
-  return {node};
-}
-
-function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
-  const node = $createQuoteNode();
-  return {node};
-}
-
-export function $createHeadingNode(headingTag: HeadingTagType): HeadingNode {
-  return $applyNodeReplacement(new HeadingNode(headingTag));
-}
-
-export function $isHeadingNode(
-  node: LexicalNode | null | undefined,
-): node is HeadingNode {
-  return node instanceof HeadingNode;
-}
 
 function onPasteForRichText(
   event: CommandPayloadType<typeof PASTE_COMMAND>,
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
index 5f2d9dcc093..466be7498de 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
@@ -8,7 +8,7 @@
 
 import {$createLinkNode} from '@lexical/link';
 import {$createListItemNode, $createListNode} from '@lexical/list';
-import {$createHeadingNode, registerRichText} from '@lexical/rich-text';
+import {registerRichText} from '@lexical/rich-text';
 import {
   $addNodeStyle,
   $getSelectionStyleValueForProperty,
@@ -74,6 +74,7 @@ import {
 } from '../utils';
 import {createEmptyHistoryState, registerHistory} from "@lexical/history";
 import {mergeRegister} from "@lexical/utils";
+import {$createHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 interface ExpectedSelection {
   anchorPath: number[];
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
index 4d88bde0e4c..0523b7f7164 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelectionHelpers.test.ts
@@ -7,7 +7,6 @@
  */
 
 import {$createLinkNode} from '@lexical/link';
-import {$createHeadingNode, $isHeadingNode} from '@lexical/rich-text';
 import {
   $getSelectionStyleValueForProperty,
   $patchStyleText,
@@ -44,6 +43,7 @@ import {
 } from 'lexical/__tests__/utils';
 
 import {$setAnchorPoint, $setFocusPoint} from '../utils';
+import {$createHeadingNode, $isHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 Range.prototype.getBoundingClientRect = function (): DOMRect {
   const rect = {
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
index fd7731f9061..d76937ed606 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
@@ -7,7 +7,7 @@
  */
 import {AutoLinkNode, LinkNode} from '@lexical/link';
 import {ListItemNode, ListNode} from '@lexical/list';
-import {HeadingNode, QuoteNode, registerRichText} from '@lexical/rich-text';
+import {registerRichText} from '@lexical/rich-text';
 import {
   applySelectionInputs,
   pasteHTML,
@@ -15,6 +15,8 @@ import {
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 import {$createParagraphNode, $insertNodes, LexicalEditor} from 'lexical';
 import {createTestEditor, initializeClipboard} from 'lexical/__tests__/utils';
+import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
+import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 jest.mock('lexical/shared/environment', () => {
   const originalModule = jest.requireActual('lexical/shared/environment');
diff --git a/resources/js/wysiwyg/nodes/custom-heading.ts b/resources/js/wysiwyg/nodes/custom-heading.ts
deleted file mode 100644
index 5df6245f5a5..00000000000
--- a/resources/js/wysiwyg/nodes/custom-heading.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import {
-    DOMConversionMap,
-    DOMConversionOutput,
-    LexicalNode,
-    Spread
-} from "lexical";
-import {EditorConfig} from "lexical/LexicalEditor";
-import {HeadingNode, HeadingTagType, SerializedHeadingNode} from "@lexical/rich-text";
-import {
-    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
-    setCommonBlockPropsFromElement,
-    updateElementWithCommonBlockProps
-} from "./_common";
-
-
-export type SerializedCustomHeadingNode = Spread<SerializedCommonBlockNode, SerializedHeadingNode>
-
-export class CustomHeadingNode extends HeadingNode {
-    __id: string = '';
-    __alignment: CommonBlockAlignment = '';
-    __inset: number = 0;
-
-    static getType() {
-        return 'custom-heading';
-    }
-
-    setId(id: string) {
-        const self = this.getWritable();
-        self.__id = id;
-    }
-
-    getId(): string {
-        const self = this.getLatest();
-        return self.__id;
-    }
-
-    setAlignment(alignment: CommonBlockAlignment) {
-        const self = this.getWritable();
-        self.__alignment = alignment;
-    }
-
-    getAlignment(): CommonBlockAlignment {
-        const self = this.getLatest();
-        return self.__alignment;
-    }
-
-    setInset(size: number) {
-        const self = this.getWritable();
-        self.__inset = size;
-    }
-
-    getInset(): number {
-        const self = this.getLatest();
-        return self.__inset;
-    }
-
-    static clone(node: CustomHeadingNode) {
-        const newNode = new CustomHeadingNode(node.__tag, node.__key);
-        newNode.__alignment = node.__alignment;
-        newNode.__inset = node.__inset;
-        return newNode;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const dom = super.createDOM(config);
-        updateElementWithCommonBlockProps(dom, this);
-        return dom;
-    }
-
-    updateDOM(prevNode: CustomHeadingNode, dom: HTMLElement): boolean {
-        return super.updateDOM(prevNode, dom)
-            || commonPropertiesDifferent(prevNode, this);
-    }
-
-    exportJSON(): SerializedCustomHeadingNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-heading',
-            version: 1,
-            id: this.__id,
-            alignment: this.__alignment,
-            inset: this.__inset,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomHeadingNode): CustomHeadingNode {
-        const node = $createCustomHeadingNode(serializedNode.tag);
-        deserializeCommonBlockNode(serializedNode, node);
-        return node;
-    }
-
-    static importDOM(): DOMConversionMap | null {
-        return {
-            h1: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-            h2: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-            h3: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-            h4: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-            h5: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-            h6: (node: Node) => ({
-                conversion: $convertHeadingElement,
-                priority: 0,
-            }),
-        };
-    }
-}
-
-function $convertHeadingElement(element: HTMLElement): DOMConversionOutput {
-    const nodeName = element.nodeName.toLowerCase();
-    let node = null;
-    if (
-        nodeName === 'h1' ||
-        nodeName === 'h2' ||
-        nodeName === 'h3' ||
-        nodeName === 'h4' ||
-        nodeName === 'h5' ||
-        nodeName === 'h6'
-    ) {
-        node = $createCustomHeadingNode(nodeName);
-        setCommonBlockPropsFromElement(element, node);
-    }
-    return {node};
-}
-
-export function $createCustomHeadingNode(tag: HeadingTagType) {
-    return new CustomHeadingNode(tag);
-}
-
-export function $isCustomHeadingNode(node: LexicalNode | null | undefined): node is CustomHeadingNode {
-    return node instanceof CustomHeadingNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-quote.ts b/resources/js/wysiwyg/nodes/custom-quote.ts
deleted file mode 100644
index 39ae7bf8af3..00000000000
--- a/resources/js/wysiwyg/nodes/custom-quote.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import {
-    DOMConversionMap,
-    DOMConversionOutput,
-    LexicalNode,
-    Spread
-} from "lexical";
-import {EditorConfig} from "lexical/LexicalEditor";
-import {QuoteNode, SerializedQuoteNode} from "@lexical/rich-text";
-import {
-    CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
-    setCommonBlockPropsFromElement,
-    updateElementWithCommonBlockProps
-} from "./_common";
-
-
-export type SerializedCustomQuoteNode = Spread<SerializedCommonBlockNode, SerializedQuoteNode>
-
-export class CustomQuoteNode extends QuoteNode {
-    __id: string = '';
-    __alignment: CommonBlockAlignment = '';
-    __inset: number = 0;
-
-    static getType() {
-        return 'custom-quote';
-    }
-
-    setId(id: string) {
-        const self = this.getWritable();
-        self.__id = id;
-    }
-
-    getId(): string {
-        const self = this.getLatest();
-        return self.__id;
-    }
-
-    setAlignment(alignment: CommonBlockAlignment) {
-        const self = this.getWritable();
-        self.__alignment = alignment;
-    }
-
-    getAlignment(): CommonBlockAlignment {
-        const self = this.getLatest();
-        return self.__alignment;
-    }
-
-    setInset(size: number) {
-        const self = this.getWritable();
-        self.__inset = size;
-    }
-
-    getInset(): number {
-        const self = this.getLatest();
-        return self.__inset;
-    }
-
-    static clone(node: CustomQuoteNode) {
-        const newNode = new CustomQuoteNode(node.__key);
-        newNode.__id = node.__id;
-        newNode.__alignment = node.__alignment;
-        newNode.__inset = node.__inset;
-        return newNode;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const dom = super.createDOM(config);
-        updateElementWithCommonBlockProps(dom, this);
-        return dom;
-    }
-
-    updateDOM(prevNode: CustomQuoteNode): boolean {
-        return commonPropertiesDifferent(prevNode, this);
-    }
-
-    exportJSON(): SerializedCustomQuoteNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-quote',
-            version: 1,
-            id: this.__id,
-            alignment: this.__alignment,
-            inset: this.__inset,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomQuoteNode): CustomQuoteNode {
-        const node = $createCustomQuoteNode();
-        deserializeCommonBlockNode(serializedNode, node);
-        return node;
-    }
-
-    static importDOM(): DOMConversionMap | null {
-        return {
-            blockquote: (node: Node) => ({
-                conversion: $convertBlockquoteElement,
-                priority: 0,
-            }),
-        };
-    }
-}
-
-function $convertBlockquoteElement(element: HTMLElement): DOMConversionOutput {
-    const node = $createCustomQuoteNode();
-    setCommonBlockPropsFromElement(element, node);
-    return {node};
-}
-
-export function $createCustomQuoteNode() {
-    return new CustomQuoteNode();
-}
-
-export function $isCustomQuoteNode(node: LexicalNode | null | undefined): node is CustomQuoteNode {
-    return node instanceof CustomQuoteNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 062394a9887..7b274eba13c 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -1,4 +1,3 @@
-import {HeadingNode, QuoteNode} from '@lexical/rich-text';
 import {CalloutNode} from './callout';
 import {
     ElementNode,
@@ -21,9 +20,9 @@ import {MediaNode} from "./media";
 import {CustomListItemNode} from "./custom-list-item";
 import {CustomTableCellNode} from "./custom-table-cell";
 import {CustomTableRowNode} from "./custom-table-row";
-import {CustomHeadingNode} from "./custom-heading";
-import {CustomQuoteNode} from "./custom-quote";
 import {CustomListNode} from "./custom-list";
+import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
+import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 /**
  * Load the nodes for lexical.
@@ -31,8 +30,8 @@ import {CustomListNode} from "./custom-list";
 export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
     return [
         CalloutNode,
-        CustomHeadingNode,
-        CustomQuoteNode,
+        HeadingNode,
+        QuoteNode,
         CustomListNode,
         CustomListItemNode, // TODO - Alignment?
         CustomTableNode,
@@ -46,18 +45,6 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         MediaNode, // TODO - Alignment
         ParagraphNode,
         LinkNode,
-        {
-            replace: HeadingNode,
-            with: (node: HeadingNode) => {
-                return new CustomHeadingNode(node.__tag);
-            }
-        },
-        {
-            replace: QuoteNode,
-            with: (node: QuoteNode) => {
-                return new CustomQuoteNode();
-            }
-        },
         {
             replace: ListNode,
             with: (node: ListNode) => {
diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
index 05bdb5dccd3..0384a3bf133 100644
--- a/resources/js/wysiwyg/services/shortcuts.ts
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -6,12 +6,12 @@ import {
     toggleSelectionAsHeading, toggleSelectionAsList,
     toggleSelectionAsParagraph
 } from "../utils/formats";
-import {HeadingTagType} from "@lexical/rich-text";
 import {EditorUiContext} from "../ui/framework/core";
 import {$getNodeFromSelection} from "../utils/selection";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import {$showLinkForm} from "../ui/defaults/forms/objects";
 import {showLinkSelector} from "../utils/links";
+import {HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
 
 function headerHandler(editor: LexicalEditor, tag: HeadingTagType): boolean {
     toggleSelectionAsHeading(editor, tag);
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index f86e33c311e..e0d1e7077fa 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -2,18 +2,14 @@ import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {$isParagraphNode, BaseSelection, LexicalNode} from "lexical";
-import {
-    $isHeadingNode,
-    $isQuoteNode,
-    HeadingNode,
-    HeadingTagType
-} from "@lexical/rich-text";
 import {$selectionContainsNodeType, $toggleSelectionBlockNodeType} from "../../../utils/selection";
 import {
     toggleSelectionAsBlockquote,
     toggleSelectionAsHeading,
     toggleSelectionAsParagraph
 } from "../../../utils/formats";
+import {$isHeadingNode, HeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
+import {$isQuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 function buildCalloutButton(category: CalloutCategory, name: string): EditorButtonDefinition {
     return {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/link-field.ts b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
index 5a64cdc30fc..f88b22c3f05 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
@@ -1,14 +1,13 @@
 import {EditorContainerUiElement} from "../core";
 import {el} from "../../../utils/dom";
 import {EditorFormField} from "../forms";
-import {CustomHeadingNode} from "../../../nodes/custom-heading";
 import {$getAllNodesOfType} from "../../../utils/nodes";
-import {$isHeadingNode} from "@lexical/rich-text";
 import {uniqueIdSmall} from "../../../../services/util";
+import {$isHeadingNode, HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 export class LinkField extends EditorContainerUiElement {
     protected input: EditorFormField;
-    protected headerMap = new Map<string, CustomHeadingNode>();
+    protected headerMap = new Map<string, HeadingNode>();
 
     constructor(input: EditorFormField) {
         super([input]);
@@ -43,7 +42,7 @@ export class LinkField extends EditorContainerUiElement {
         return container;
     }
 
-    updateFormFromHeader(header: CustomHeadingNode) {
+    updateFormFromHeader(header: HeadingNode) {
         this.getHeaderIdAndText(header).then(({id, text}) => {
             console.log('updating form', id, text);
             const modal =  this.getContext().manager.getActiveModal('link');
@@ -57,7 +56,7 @@ export class LinkField extends EditorContainerUiElement {
         });
     }
 
-    getHeaderIdAndText(header: CustomHeadingNode): Promise<{id: string, text: string}> {
+    getHeaderIdAndText(header: HeadingNode): Promise<{id: string, text: string}> {
         return new Promise((res) => {
             this.getContext().editor.update(() => {
                 let id = header.getId();
@@ -75,7 +74,7 @@ export class LinkField extends EditorContainerUiElement {
 
     updateDataList(listEl: HTMLElement) {
         this.getContext().editor.getEditorState().read(() => {
-            const headers = $getAllNodesOfType($isHeadingNode) as CustomHeadingNode[];
+            const headers = $getAllNodesOfType($isHeadingNode) as HeadingNode[];
 
             this.headerMap.clear();
             const listEls: HTMLElement[] = [];
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 3cfc964423f..d724730e3a2 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -1,4 +1,3 @@
-import {$isQuoteNode, HeadingNode, HeadingTagType} from "@lexical/rich-text";
 import {
     $createParagraphNode,
     $createTextNode,
@@ -15,23 +14,23 @@ import {
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";
-import {$createCustomHeadingNode, $isCustomHeadingNode} from "../nodes/custom-heading";
-import {$createCustomQuoteNode} from "../nodes/custom-quote";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
 import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
 import {insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$isCustomListNode} from "../nodes/custom-list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
+import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
+import {$createQuoteNode, $isQuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
 const $isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
-    return $isCustomHeadingNode(node) && (node as HeadingNode).getTag() === tag;
+    return $isHeadingNode(node) && node.getTag() === tag;
 };
 
 export function toggleSelectionAsHeading(editor: LexicalEditor, tag: HeadingTagType) {
     editor.update(() => {
         $toggleSelectionBlockNodeType(
             (node) => $isHeaderNodeOfTag(node, tag),
-            () => $createCustomHeadingNode(tag),
+            () => $createHeadingNode(tag),
         )
     });
 }
@@ -44,7 +43,7 @@ export function toggleSelectionAsParagraph(editor: LexicalEditor) {
 
 export function toggleSelectionAsBlockquote(editor: LexicalEditor) {
     editor.update(() => {
-        $toggleSelectionBlockNodeType($isQuoteNode, $createCustomQuoteNode);
+        $toggleSelectionBlockNodeType($isQuoteNode, $createQuoteNode);
     });
 }
 

From ebd4604f21060cd5414fda5d2d79ed41e79e9b62 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 3 Dec 2024 19:03:52 +0000
Subject: [PATCH 394/666] Lexical: Merged list nodes

---
 .../lexical/list/LexicalListItemNode.ts       | 126 ++++++----------
 .../wysiwyg/lexical/list/LexicalListNode.ts   |  66 ++++++---
 .../unit/LexicalListItemNode.test.ts          |  94 ------------
 .../js/wysiwyg/nodes/custom-list-item.ts      | 120 ---------------
 resources/js/wysiwyg/nodes/custom-list.ts     | 139 ------------------
 resources/js/wysiwyg/nodes/index.ts           |  18 +--
 .../js/wysiwyg/services/keyboard-handling.ts  |   4 +-
 .../ui/framework/helpers/task-list-handler.ts |   4 +-
 resources/js/wysiwyg/utils/formats.ts         |   5 +-
 resources/js/wysiwyg/utils/lists.ts           |  27 ++--
 10 files changed, 111 insertions(+), 492 deletions(-)
 delete mode 100644 resources/js/wysiwyg/nodes/custom-list-item.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-list.ts

diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
index c20329e4be9..33b021298a6 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -13,7 +13,6 @@ import type {
   DOMConversionOutput,
   DOMExportOutput,
   EditorConfig,
-  EditorThemeClasses,
   LexicalNode,
   NodeKey,
   ParagraphNode,
@@ -22,10 +21,6 @@ import type {
   Spread,
 } from 'lexical';
 
-import {
-  addClassNamesToElement,
-  removeClassNamesFromElement,
-} from '@lexical/utils';
 import {
   $applyNodeReplacement,
   $createParagraphNode,
@@ -36,11 +31,11 @@ import {
   LexicalEditor,
 } from 'lexical';
 import invariant from 'lexical/shared/invariant';
-import normalizeClassNames from 'lexical/shared/normalizeClassNames';
 
 import {$createListNode, $isListNode} from './';
-import {$handleIndent, $handleOutdent, mergeLists} from './formatList';
+import {mergeLists} from './formatList';
 import {isNestedListNode} from './utils';
+import {el} from "../../utils/dom";
 
 export type SerializedListItemNode = Spread<
   {
@@ -74,11 +69,17 @@ export class ListItemNode extends ElementNode {
   createDOM(config: EditorConfig): HTMLElement {
     const element = document.createElement('li');
     const parent = this.getParent();
+
     if ($isListNode(parent) && parent.getListType() === 'check') {
-      updateListItemChecked(element, this, null, parent);
+      updateListItemChecked(element, this);
     }
+
     element.value = this.__value;
-    $setListItemThemeClassNames(element, config.theme, this);
+
+    if ($hasNestedListWithoutLabel(this)) {
+      element.style.listStyle = 'none';
+    }
+
     return element;
   }
 
@@ -89,11 +90,12 @@ export class ListItemNode extends ElementNode {
   ): boolean {
     const parent = this.getParent();
     if ($isListNode(parent) && parent.getListType() === 'check') {
-      updateListItemChecked(dom, this, prevNode, parent);
+      updateListItemChecked(dom, this);
     }
+
+    dom.style.listStyle = $hasNestedListWithoutLabel(this) ? 'none' : '';
     // @ts-expect-error - this is always HTMLListItemElement
     dom.value = this.__value;
-    $setListItemThemeClassNames(dom, config.theme, this);
 
     return false;
   }
@@ -132,6 +134,20 @@ export class ListItemNode extends ElementNode {
 
   exportDOM(editor: LexicalEditor): DOMExportOutput {
     const element = this.createDOM(editor._config);
+
+    if (element.classList.contains('task-list-item')) {
+      const input = el('input', {
+        type: 'checkbox',
+        disabled: 'disabled',
+      });
+      if (element.hasAttribute('checked')) {
+        input.setAttribute('checked', 'checked');
+        element.removeAttribute('checked');
+      }
+
+      element.prepend(input);
+    }
+
     return {
       element,
     };
@@ -390,89 +406,33 @@ export class ListItemNode extends ElementNode {
   }
 }
 
-function $setListItemThemeClassNames(
-  dom: HTMLElement,
-  editorThemeClasses: EditorThemeClasses,
-  node: ListItemNode,
-): void {
-  const classesToAdd = [];
-  const classesToRemove = [];
-  const listTheme = editorThemeClasses.list;
-  const listItemClassName = listTheme ? listTheme.listitem : undefined;
-  let nestedListItemClassName;
-
-  if (listTheme && listTheme.nested) {
-    nestedListItemClassName = listTheme.nested.listitem;
-  }
-
-  if (listItemClassName !== undefined) {
-    classesToAdd.push(...normalizeClassNames(listItemClassName));
-  }
-
-  if (listTheme) {
-    const parentNode = node.getParent();
-    const isCheckList =
-      $isListNode(parentNode) && parentNode.getListType() === 'check';
-    const checked = node.getChecked();
-
-    if (!isCheckList || checked) {
-      classesToRemove.push(listTheme.listitemUnchecked);
-    }
-
-    if (!isCheckList || !checked) {
-      classesToRemove.push(listTheme.listitemChecked);
-    }
+function $hasNestedListWithoutLabel(node: ListItemNode): boolean {
+  const children = node.getChildren();
+  let hasLabel = false;
+  let hasNestedList = false;
 
-    if (isCheckList) {
-      classesToAdd.push(
-        checked ? listTheme.listitemChecked : listTheme.listitemUnchecked,
-      );
+  for (const child of children) {
+    if ($isListNode(child)) {
+      hasNestedList = true;
+    } else if (child.getTextContent().trim().length > 0) {
+      hasLabel = true;
     }
   }
 
-  if (nestedListItemClassName !== undefined) {
-    const nestedListItemClasses = normalizeClassNames(nestedListItemClassName);
-
-    if (node.getChildren().some((child) => $isListNode(child))) {
-      classesToAdd.push(...nestedListItemClasses);
-    } else {
-      classesToRemove.push(...nestedListItemClasses);
-    }
-  }
-
-  if (classesToRemove.length > 0) {
-    removeClassNamesFromElement(dom, ...classesToRemove);
-  }
-
-  if (classesToAdd.length > 0) {
-    addClassNamesToElement(dom, ...classesToAdd);
-  }
+  return hasNestedList && !hasLabel;
 }
 
 function updateListItemChecked(
   dom: HTMLElement,
   listItemNode: ListItemNode,
-  prevListItemNode: ListItemNode | null,
-  listNode: ListNode,
 ): void {
-  // Only add attributes for leaf list items
-  if ($isListNode(listItemNode.getFirstChild())) {
-    dom.removeAttribute('role');
-    dom.removeAttribute('tabIndex');
-    dom.removeAttribute('aria-checked');
+  // Only set task list attrs for leaf list items
+  const shouldBeTaskItem = !$isListNode(listItemNode.getFirstChild());
+  dom.classList.toggle('task-list-item', shouldBeTaskItem);
+  if (listItemNode.__checked) {
+    dom.setAttribute('checked', 'checked');
   } else {
-    dom.setAttribute('role', 'checkbox');
-    dom.setAttribute('tabIndex', '-1');
-
-    if (
-      !prevListItemNode ||
-      listItemNode.__checked !== prevListItemNode.__checked
-    ) {
-      dom.setAttribute(
-        'aria-checked',
-        listItemNode.getChecked() ? 'true' : 'false',
-      );
-    }
+    dom.removeAttribute('checked');
   }
 }
 
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
index e22fbf7717f..138c895e6b8 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -36,9 +36,11 @@ import {
   updateChildrenListItemValue,
 } from './formatList';
 import {$getListDepth, $wrapInListItem} from './utils';
+import {extractDirectionFromElement} from "../../nodes/_common";
 
 export type SerializedListNode = Spread<
   {
+    id: string;
     listType: ListType;
     start: number;
     tag: ListNodeTagType;
@@ -58,15 +60,18 @@ export class ListNode extends ElementNode {
   __start: number;
   /** @internal */
   __listType: ListType;
+  /** @internal */
+  __id: string = '';
 
   static getType(): string {
     return 'list';
   }
 
   static clone(node: ListNode): ListNode {
-    const listType = node.__listType || TAG_TO_LIST_TYPE[node.__tag];
-
-    return new ListNode(listType, node.__start, node.__key);
+    const newNode = new ListNode(node.__listType, node.__start, node.__key);
+    newNode.__id = node.__id;
+    newNode.__dir = node.__dir;
+    return newNode;
   }
 
   constructor(listType: ListType, start: number, key?: NodeKey) {
@@ -81,6 +86,16 @@ export class ListNode extends ElementNode {
     return this.__tag;
   }
 
+  setId(id: string) {
+    const self = this.getWritable();
+    self.__id = id;
+  }
+
+  getId(): string {
+    const self = this.getLatest();
+    return self.__id;
+  }
+
   setListType(type: ListType): void {
     const writable = this.getWritable();
     writable.__listType = type;
@@ -108,6 +123,14 @@ export class ListNode extends ElementNode {
     dom.__lexicalListType = this.__listType;
     $setListThemeClassNames(dom, config.theme, this);
 
+    if (this.__id) {
+      dom.setAttribute('id', this.__id);
+    }
+
+    if (this.__dir) {
+      dom.setAttribute('dir', this.__dir);
+    }
+
     return dom;
   }
 
@@ -116,7 +139,11 @@ export class ListNode extends ElementNode {
     dom: HTMLElement,
     config: EditorConfig,
   ): boolean {
-    if (prevNode.__tag !== this.__tag) {
+    if (
+        prevNode.__tag !== this.__tag
+        || prevNode.__dir !== this.__dir
+        || prevNode.__id !== this.__id
+    ) {
       return true;
     }
 
@@ -148,8 +175,7 @@ export class ListNode extends ElementNode {
 
   static importJSON(serializedNode: SerializedListNode): ListNode {
     const node = $createListNode(serializedNode.listType, serializedNode.start);
-    node.setFormat(serializedNode.format);
-    node.setIndent(serializedNode.indent);
+    node.setId(serializedNode.id);
     node.setDirection(serializedNode.direction);
     return node;
   }
@@ -177,6 +203,7 @@ export class ListNode extends ElementNode {
       tag: this.getTag(),
       type: 'list',
       version: 1,
+      id: this.__id,
     };
   }
 
@@ -277,28 +304,21 @@ function $setListThemeClassNames(
 }
 
 /*
- * This function normalizes the children of a ListNode after the conversion from HTML,
- * ensuring that they are all ListItemNodes and contain either a single nested ListNode
- * or some other inline content.
+ * This function is a custom normalization function to allow nested lists within list item elements.
+ * Original taken from https://github.com/facebook/lexical/blob/6e10210fd1e113ccfafdc999b1d896733c5c5bea/packages/lexical-list/src/LexicalListNode.ts#L284-L303
+ * With modifications made.
  */
 function $normalizeChildren(nodes: Array<LexicalNode>): Array<ListItemNode> {
   const normalizedListItems: Array<ListItemNode> = [];
-  for (let i = 0; i < nodes.length; i++) {
-    const node = nodes[i];
+
+  for (const node of nodes) {
     if ($isListItemNode(node)) {
       normalizedListItems.push(node);
-      const children = node.getChildren();
-      if (children.length > 1) {
-        children.forEach((child) => {
-          if ($isListNode(child)) {
-            normalizedListItems.push($wrapInListItem(child));
-          }
-        });
-      }
     } else {
       normalizedListItems.push($wrapInListItem(node));
     }
   }
+
   return normalizedListItems;
 }
 
@@ -334,6 +354,14 @@ function $convertListNode(domNode: HTMLElement): DOMConversionOutput {
     }
   }
 
+  if (domNode.id && node) {
+    node.setId(domNode.id);
+  }
+
+  if (domNode.dir && node) {
+    node.setDirection(extractDirectionFromElement(domNode));
+  }
+
   return {
     after: $normalizeChildren,
     node,
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index 581db0294f5..523c7eb126e 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -1265,99 +1265,5 @@ describe('LexicalListItemNode tests', () => {
         expect($isListItemNode(listItemNode)).toBe(true);
       });
     });
-
-    describe('ListItemNode.setIndent()', () => {
-      let listNode: ListNode;
-      let listItemNode1: ListItemNode;
-      let listItemNode2: ListItemNode;
-
-      beforeEach(async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          listNode = new ListNode('bullet', 1);
-          listItemNode1 = new ListItemNode();
-
-          listItemNode2 = new ListItemNode();
-
-          root.append(listNode);
-          listNode.append(listItemNode1, listItemNode2);
-          listItemNode1.append(new TextNode('one'));
-          listItemNode2.append(new TextNode('two'));
-        });
-      });
-      it('indents and outdents list item', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          listItemNode1.setIndent(3);
-        });
-
-        await editor.update(() => {
-          expect(listItemNode1.getIndent()).toBe(3);
-        });
-
-        expectHtmlToBeEqual(
-          editor.getRootElement()!.innerHTML,
-          html`
-            <ul>
-              <li value="1">
-                <ul>
-                  <li value="1">
-                    <ul>
-                      <li value="1">
-                        <ul>
-                          <li value="1">
-                            <span data-lexical-text="true">one</span>
-                          </li>
-                        </ul>
-                      </li>
-                    </ul>
-                  </li>
-                </ul>
-              </li>
-              <li value="1">
-                <span data-lexical-text="true">two</span>
-              </li>
-            </ul>
-          `,
-        );
-
-        await editor.update(() => {
-          listItemNode1.setIndent(0);
-        });
-
-        await editor.update(() => {
-          expect(listItemNode1.getIndent()).toBe(0);
-        });
-
-        expectHtmlToBeEqual(
-          editor.getRootElement()!.innerHTML,
-          html`
-            <ul>
-              <li value="1">
-                <span data-lexical-text="true">one</span>
-              </li>
-              <li value="2">
-                <span data-lexical-text="true">two</span>
-              </li>
-            </ul>
-          `,
-        );
-      });
-
-      it('handles fractional indent values', async () => {
-        const {editor} = testEnv;
-
-        await editor.update(() => {
-          listItemNode1.setIndent(0.5);
-        });
-
-        await editor.update(() => {
-          expect(listItemNode1.getIndent()).toBe(0);
-        });
-      });
-    });
   });
 });
diff --git a/resources/js/wysiwyg/nodes/custom-list-item.ts b/resources/js/wysiwyg/nodes/custom-list-item.ts
deleted file mode 100644
index 11887b4364d..00000000000
--- a/resources/js/wysiwyg/nodes/custom-list-item.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import {$isListNode, ListItemNode, SerializedListItemNode} from "@lexical/list";
-import {EditorConfig} from "lexical/LexicalEditor";
-import {DOMExportOutput, LexicalEditor, LexicalNode} from "lexical";
-
-import {el} from "../utils/dom";
-import {$isCustomListNode} from "./custom-list";
-
-function updateListItemChecked(
-    dom: HTMLElement,
-    listItemNode: ListItemNode,
-): void {
-    // Only set task list attrs for leaf list items
-    const shouldBeTaskItem = !$isListNode(listItemNode.getFirstChild());
-    dom.classList.toggle('task-list-item', shouldBeTaskItem);
-    if (listItemNode.__checked) {
-        dom.setAttribute('checked', 'checked');
-    } else {
-        dom.removeAttribute('checked');
-    }
-}
-
-
-export class CustomListItemNode extends ListItemNode {
-    static getType(): string {
-        return 'custom-list-item';
-    }
-
-    static clone(node: CustomListItemNode): CustomListItemNode {
-        return new CustomListItemNode(node.__value, node.__checked, node.__key);
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const element = document.createElement('li');
-        const parent = this.getParent();
-
-        if ($isListNode(parent) && parent.getListType() === 'check') {
-            updateListItemChecked(element, this);
-        }
-
-        element.value = this.__value;
-
-        if ($hasNestedListWithoutLabel(this)) {
-            element.style.listStyle = 'none';
-        }
-
-        return element;
-    }
-
-    updateDOM(
-        prevNode: ListItemNode,
-        dom: HTMLElement,
-        config: EditorConfig,
-    ): boolean {
-        const parent = this.getParent();
-        if ($isListNode(parent) && parent.getListType() === 'check') {
-            updateListItemChecked(dom, this);
-        }
-
-        dom.style.listStyle = $hasNestedListWithoutLabel(this) ? 'none' : '';
-        // @ts-expect-error - this is always HTMLListItemElement
-        dom.value = this.__value;
-
-        return false;
-    }
-
-    exportDOM(editor: LexicalEditor): DOMExportOutput {
-        const element = this.createDOM(editor._config);
-        element.style.textAlign = this.getFormatType();
-
-        if (element.classList.contains('task-list-item')) {
-            const input = el('input', {
-                type: 'checkbox',
-                disabled: 'disabled',
-            });
-            if (element.hasAttribute('checked')) {
-                input.setAttribute('checked', 'checked');
-                element.removeAttribute('checked');
-            }
-
-            element.prepend(input);
-        }
-
-        return {
-            element,
-        };
-    }
-
-    exportJSON(): SerializedListItemNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-list-item',
-        };
-    }
-}
-
-function $hasNestedListWithoutLabel(node: CustomListItemNode): boolean {
-    const children = node.getChildren();
-    let hasLabel = false;
-    let hasNestedList = false;
-
-    for (const child of children) {
-        if ($isCustomListNode(child)) {
-            hasNestedList = true;
-        } else if (child.getTextContent().trim().length > 0) {
-            hasLabel = true;
-        }
-    }
-
-    return hasNestedList && !hasLabel;
-}
-
-export function $isCustomListItemNode(
-    node: LexicalNode | null | undefined,
-): node is CustomListItemNode {
-    return node instanceof CustomListItemNode;
-}
-
-export function $createCustomListItemNode(): CustomListItemNode {
-    return new CustomListItemNode();
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-list.ts b/resources/js/wysiwyg/nodes/custom-list.ts
deleted file mode 100644
index 4b05fa62e25..00000000000
--- a/resources/js/wysiwyg/nodes/custom-list.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-    DOMConversionFn,
-    DOMConversionMap, EditorConfig,
-    LexicalNode,
-    Spread
-} from "lexical";
-import {$isListItemNode, ListItemNode, ListNode, ListType, SerializedListNode} from "@lexical/list";
-import {$createCustomListItemNode} from "./custom-list-item";
-import {extractDirectionFromElement} from "./_common";
-
-
-export type SerializedCustomListNode = Spread<{
-    id: string;
-}, SerializedListNode>
-
-export class CustomListNode extends ListNode {
-    __id: string = '';
-
-    static getType() {
-        return 'custom-list';
-    }
-
-    setId(id: string) {
-        const self = this.getWritable();
-        self.__id = id;
-    }
-
-    getId(): string {
-        const self = this.getLatest();
-        return self.__id;
-    }
-
-    static clone(node: CustomListNode) {
-        const newNode = new CustomListNode(node.__listType, node.__start, node.__key);
-        newNode.__id = node.__id;
-        newNode.__dir = node.__dir;
-        return newNode;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const dom = super.createDOM(config);
-        if (this.__id) {
-            dom.setAttribute('id', this.__id);
-        }
-
-        if (this.__dir) {
-            dom.setAttribute('dir', this.__dir);
-        }
-
-        return dom;
-    }
-
-    updateDOM(prevNode: ListNode, dom: HTMLElement, config: EditorConfig): boolean {
-        return super.updateDOM(prevNode, dom, config) ||
-            prevNode.__dir !== this.__dir;
-    }
-
-    exportJSON(): SerializedCustomListNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-list',
-            version: 1,
-            id: this.__id,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomListNode): CustomListNode {
-        const node = $createCustomListNode(serializedNode.listType);
-        node.setId(serializedNode.id);
-        node.setDirection(serializedNode.direction);
-        return node;
-    }
-
-    static importDOM(): DOMConversionMap | null {
-        // @ts-ignore
-        const converter = super.importDOM().ol().conversion as DOMConversionFn<HTMLElement>;
-        const customConvertFunction = (element: HTMLElement) => {
-            const baseResult = converter(element);
-            if (element.id && baseResult?.node) {
-                (baseResult.node as CustomListNode).setId(element.id);
-            }
-
-            if (element.dir && baseResult?.node) {
-                (baseResult.node as CustomListNode).setDirection(extractDirectionFromElement(element));
-            }
-
-            if (baseResult) {
-                baseResult.after = $normalizeChildren;
-            }
-
-            return baseResult;
-        };
-
-        return {
-            ol: () => ({
-                conversion: customConvertFunction,
-                priority: 0,
-            }),
-            ul: () => ({
-                conversion: customConvertFunction,
-                priority: 0,
-            }),
-        };
-    }
-}
-
-/*
- * This function is a custom normalization function to allow nested lists within list item elements.
- * Original taken from https://github.com/facebook/lexical/blob/6e10210fd1e113ccfafdc999b1d896733c5c5bea/packages/lexical-list/src/LexicalListNode.ts#L284-L303
- * With modifications made.
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- * MIT license
- */
-function $normalizeChildren(nodes: Array<LexicalNode>): Array<ListItemNode> {
-    const normalizedListItems: Array<ListItemNode> = [];
-
-    for (const node of nodes) {
-        if ($isListItemNode(node)) {
-            normalizedListItems.push(node);
-        } else {
-            normalizedListItems.push($wrapInListItem(node));
-        }
-    }
-
-    return normalizedListItems;
-}
-
-function $wrapInListItem(node: LexicalNode): ListItemNode {
-    const listItemWrapper = $createCustomListItemNode();
-    return listItemWrapper.append(node);
-}
-
-export function $createCustomListNode(type: ListType): CustomListNode {
-    return new CustomListNode(type, 1);
-}
-
-export function $isCustomListNode(node: LexicalNode | null | undefined): node is CustomListNode {
-    return node instanceof CustomListNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 7b274eba13c..7e0ce9daf2b 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -17,10 +17,8 @@ import {CodeBlockNode} from "./code-block";
 import {DiagramNode} from "./diagram";
 import {EditorUiContext} from "../ui/framework/core";
 import {MediaNode} from "./media";
-import {CustomListItemNode} from "./custom-list-item";
 import {CustomTableCellNode} from "./custom-table-cell";
 import {CustomTableRowNode} from "./custom-table-row";
-import {CustomListNode} from "./custom-list";
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
@@ -32,8 +30,8 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         CalloutNode,
         HeadingNode,
         QuoteNode,
-        CustomListNode,
-        CustomListItemNode, // TODO - Alignment?
+        ListNode,
+        ListItemNode,
         CustomTableNode,
         CustomTableRowNode,
         CustomTableCellNode,
@@ -45,18 +43,6 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         MediaNode, // TODO - Alignment
         ParagraphNode,
         LinkNode,
-        {
-            replace: ListNode,
-            with: (node: ListNode) => {
-                return new CustomListNode(node.getListType(), node.getStart());
-            }
-        },
-        {
-            replace: ListItemNode,
-            with: (node: ListItemNode) => {
-                return new CustomListItemNode(node.__value, node.__checked);
-            }
-        },
         {
             replace: TableNode,
             with(node: TableNode) {
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 3f0b0c495e0..5f7f41ef02c 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -14,8 +14,8 @@ import {$isImageNode} from "../nodes/image";
 import {$isMediaNode} from "../nodes/media";
 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
-import {$isCustomListItemNode} from "../nodes/custom-list-item";
 import {$setInsetForSelection} from "../utils/lists";
+import {$isListItemNode} from "@lexical/list";
 
 function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     if (nodes.length === 1) {
@@ -62,7 +62,7 @@ function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null): boo
     const change = event?.shiftKey ? -40 : 40;
     const selection = $getSelection();
     const nodes = selection?.getNodes() || [];
-    if (nodes.length > 1 || (nodes.length === 1 && $isCustomListItemNode(nodes[0].getParent()))) {
+    if (nodes.length > 1 || (nodes.length === 1 && $isListItemNode(nodes[0].getParent()))) {
         editor.update(() => {
             $setInsetForSelection(editor, change);
         });
diff --git a/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts
index da8c0eae3dd..62a784d83ed 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/task-list-handler.ts
@@ -1,5 +1,5 @@
 import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
-import {$isCustomListItemNode} from "../../../nodes/custom-list-item";
+import {$isListItemNode} from "@lexical/list";
 
 class TaskListHandler {
     protected editorContainer: HTMLElement;
@@ -38,7 +38,7 @@ class TaskListHandler {
 
         this.editor.update(() => {
             const node = $getNearestNodeFromDOMNode(listItem);
-            if ($isCustomListItemNode(node)) {
+            if ($isListItemNode(node)) {
                 node.setChecked(!node.getChecked());
             }
         });
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index d724730e3a2..1be802ebf1c 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -16,8 +16,7 @@ import {
 } from "./selection";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
 import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
-import {insertList, ListNode, ListType, removeList} from "@lexical/list";
-import {$isCustomListNode} from "../nodes/custom-list";
+import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
 import {$createQuoteNode, $isQuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
@@ -51,7 +50,7 @@ export function toggleSelectionAsList(editor: LexicalEditor, type: ListType) {
     editor.getEditorState().read(() => {
         const selection = $getSelection();
         const listSelected = $selectionContainsNodeType(selection, (node: LexicalNode | null | undefined): boolean => {
-            return $isCustomListNode(node) && (node as ListNode).getListType() === type;
+            return $isListNode(node) && (node as ListNode).getListType() === type;
         });
 
         if (listSelected) {
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index 30a97cbc1f9..646f341c2ba 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -1,22 +1,21 @@
-import {$createCustomListItemNode, $isCustomListItemNode, CustomListItemNode} from "../nodes/custom-list-item";
-import {$createCustomListNode, $isCustomListNode} from "../nodes/custom-list";
 import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
 import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection} from "./selection";
 import {nodeHasInset} from "./nodes";
+import {$createListItemNode, $createListNode, $isListItemNode, $isListNode, ListItemNode} from "@lexical/list";
 
 
-export function $nestListItem(node: CustomListItemNode): CustomListItemNode {
+export function $nestListItem(node: ListItemNode): ListItemNode {
     const list = node.getParent();
-    if (!$isCustomListNode(list)) {
+    if (!$isListNode(list)) {
         return node;
     }
 
-    const listItems = list.getChildren() as CustomListItemNode[];
+    const listItems = list.getChildren() as ListItemNode[];
     const nodeIndex = listItems.findIndex((n) => n.getKey() === node.getKey());
     const isFirst = nodeIndex === 0;
 
-    const newListItem = $createCustomListItemNode();
-    const newList = $createCustomListNode(list.getListType());
+    const newListItem = $createListItemNode();
+    const newList = $createListNode(list.getListType());
     newList.append(newListItem);
     newListItem.append(...node.getChildren());
 
@@ -31,11 +30,11 @@ export function $nestListItem(node: CustomListItemNode): CustomListItemNode {
     return newListItem;
 }
 
-export function $unnestListItem(node: CustomListItemNode): CustomListItemNode {
+export function $unnestListItem(node: ListItemNode): ListItemNode {
     const list = node.getParent();
     const parentListItem = list?.getParent();
     const outerList = parentListItem?.getParent();
-    if (!$isCustomListNode(list) || !$isCustomListNode(outerList) || !$isCustomListItemNode(parentListItem)) {
+    if (!$isListNode(list) || !$isListNode(outerList) || !$isListItemNode(parentListItem)) {
         return node;
     }
 
@@ -51,19 +50,19 @@ export function $unnestListItem(node: CustomListItemNode): CustomListItemNode {
     return node;
 }
 
-function getListItemsForSelection(selection: BaseSelection|null): (CustomListItemNode|null)[] {
+function getListItemsForSelection(selection: BaseSelection|null): (ListItemNode|null)[] {
     const nodes = selection?.getNodes() || [];
     const listItemNodes = [];
 
     outer: for (const node of nodes) {
-        if ($isCustomListItemNode(node)) {
+        if ($isListItemNode(node)) {
             listItemNodes.push(node);
             continue;
         }
 
         const parents = node.getParents();
         for (const parent of parents) {
-            if ($isCustomListItemNode(parent)) {
+            if ($isListItemNode(parent)) {
                 listItemNodes.push(parent);
                 continue outer;
             }
@@ -75,8 +74,8 @@ function getListItemsForSelection(selection: BaseSelection|null): (CustomListIte
     return listItemNodes;
 }
 
-function $reduceDedupeListItems(listItems: (CustomListItemNode|null)[]): CustomListItemNode[] {
-    const listItemMap: Record<string, CustomListItemNode> = {};
+function $reduceDedupeListItems(listItems: (ListItemNode|null)[]): ListItemNode[] {
+    const listItemMap: Record<string, ListItemNode> = {};
 
     for (const item of listItems) {
         if (item === null) {

From 57d8449660e2cf5acd9bfaa6c951b3dfd040bf42 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 3 Dec 2024 20:08:33 +0000
Subject: [PATCH 395/666] Lexical: Merged custom table node code

---
 .../lexical/table/LexicalTableCellNode.ts     | 134 ++++++----
 .../wysiwyg/lexical/table/LexicalTableNode.ts |  98 ++++++-
 .../lexical/table/LexicalTableRowNode.ts      |  57 ++--
 .../table/LexicalTableSelectionHelpers.ts     |  53 ----
 .../unit/LexicalTableRowNode.test.ts          |   5 +-
 .../js/wysiwyg/nodes/custom-table-cell.ts     | 247 ------------------
 .../js/wysiwyg/nodes/custom-table-row.ts      | 106 --------
 resources/js/wysiwyg/nodes/custom-table.ts    | 166 ------------
 resources/js/wysiwyg/nodes/index.ts           |  33 +--
 .../js/wysiwyg/ui/defaults/buttons/tables.ts  |  35 ++-
 .../js/wysiwyg/ui/defaults/forms/tables.ts    |  21 +-
 .../ui/framework/blocks/table-creator.ts      |   3 +-
 .../ui/framework/helpers/table-resizer.ts     |   5 +-
 .../helpers/table-selection-handler.ts        |   8 +-
 .../js/wysiwyg/utils/table-copy-paste.ts      |  42 +--
 resources/js/wysiwyg/utils/table-map.ts       |  28 +-
 resources/js/wysiwyg/utils/tables.ts          |  70 ++---
 17 files changed, 323 insertions(+), 788 deletions(-)
 delete mode 100644 resources/js/wysiwyg/nodes/custom-table-cell.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-table-row.ts
 delete mode 100644 resources/js/wysiwyg/nodes/custom-table.ts

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
index 455d39bf6c9..72676b9bacb 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -28,7 +28,8 @@ import {
   ElementNode,
 } from 'lexical';
 
-import {COLUMN_WIDTH, PIXEL_VALUE_REG_EXP} from './constants';
+import {extractStyleMapFromElement, StyleMap} from "../../utils/dom";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "../../nodes/_common";
 
 export const TableCellHeaderStates = {
   BOTH: 3,
@@ -47,6 +48,8 @@ export type SerializedTableCellNode = Spread<
     headerState: TableCellHeaderState;
     width?: number;
     backgroundColor?: null | string;
+    styles: Record<string, string>;
+    alignment: CommonBlockAlignment;
   },
   SerializedElementNode
 >;
@@ -63,6 +66,10 @@ export class TableCellNode extends ElementNode {
   __width?: number;
   /** @internal */
   __backgroundColor: null | string;
+  /** @internal */
+  __styles: StyleMap = new Map;
+  /** @internal */
+  __alignment: CommonBlockAlignment = '';
 
   static getType(): string {
     return 'tablecell';
@@ -77,6 +84,8 @@ export class TableCellNode extends ElementNode {
     );
     cellNode.__rowSpan = node.__rowSpan;
     cellNode.__backgroundColor = node.__backgroundColor;
+    cellNode.__styles = new Map(node.__styles);
+    cellNode.__alignment = node.__alignment;
     return cellNode;
   }
 
@@ -94,16 +103,20 @@ export class TableCellNode extends ElementNode {
   }
 
   static importJSON(serializedNode: SerializedTableCellNode): TableCellNode {
-    const colSpan = serializedNode.colSpan || 1;
-    const rowSpan = serializedNode.rowSpan || 1;
-    const cellNode = $createTableCellNode(
-      serializedNode.headerState,
-      colSpan,
-      serializedNode.width || undefined,
+    const node = $createTableCellNode(
+        serializedNode.headerState,
+        serializedNode.colSpan,
+        serializedNode.width,
     );
-    cellNode.__rowSpan = rowSpan;
-    cellNode.__backgroundColor = serializedNode.backgroundColor || null;
-    return cellNode;
+
+    if (serializedNode.rowSpan) {
+        node.setRowSpan(serializedNode.rowSpan);
+    }
+
+    node.setStyles(new Map(Object.entries(serializedNode.styles)));
+    node.setAlignment(serializedNode.alignment);
+
+    return node;
   }
 
   constructor(
@@ -144,34 +157,19 @@ export class TableCellNode extends ElementNode {
       this.hasHeader() && config.theme.tableCellHeader,
     );
 
+    for (const [name, value] of this.__styles.entries()) {
+      element.style.setProperty(name, value);
+    }
+
+    if (this.__alignment) {
+      element.classList.add('align-' + this.__alignment);
+    }
+
     return element;
   }
 
   exportDOM(editor: LexicalEditor): DOMExportOutput {
     const {element} = super.exportDOM(editor);
-
-    if (element) {
-      const element_ = element as HTMLTableCellElement;
-      element_.style.border = '1px solid black';
-      if (this.__colSpan > 1) {
-        element_.colSpan = this.__colSpan;
-      }
-      if (this.__rowSpan > 1) {
-        element_.rowSpan = this.__rowSpan;
-      }
-      element_.style.width = `${this.getWidth() || COLUMN_WIDTH}px`;
-
-      element_.style.verticalAlign = 'top';
-      element_.style.textAlign = 'start';
-
-      const backgroundColor = this.getBackgroundColor();
-      if (backgroundColor !== null) {
-        element_.style.backgroundColor = backgroundColor;
-      } else if (this.hasHeader()) {
-        element_.style.backgroundColor = '#f2f3f5';
-      }
-    }
-
     return {
       element,
     };
@@ -186,6 +184,8 @@ export class TableCellNode extends ElementNode {
       rowSpan: this.__rowSpan,
       type: 'tablecell',
       width: this.getWidth(),
+      styles: Object.fromEntries(this.__styles),
+      alignment: this.__alignment,
     };
   }
 
@@ -231,6 +231,38 @@ export class TableCellNode extends ElementNode {
     return this.getLatest().__width;
   }
 
+  clearWidth(): void {
+    const self = this.getWritable();
+    self.__width = undefined;
+  }
+
+  getStyles(): StyleMap {
+    const self = this.getLatest();
+    return new Map(self.__styles);
+  }
+
+  setStyles(styles: StyleMap): void {
+    const self = this.getWritable();
+    self.__styles = new Map(styles);
+  }
+
+  setAlignment(alignment: CommonBlockAlignment) {
+    const self = this.getWritable();
+    self.__alignment = alignment;
+  }
+
+  getAlignment(): CommonBlockAlignment {
+    const self = this.getLatest();
+    return self.__alignment;
+  }
+
+  updateTag(tag: string): void {
+    const isHeader = tag.toLowerCase() === 'th';
+    const state = isHeader ? TableCellHeaderStates.ROW : TableCellHeaderStates.NO_STATUS;
+    const self = this.getWritable();
+    self.__headerState = state;
+  }
+
   getBackgroundColor(): null | string {
     return this.getLatest().__backgroundColor;
   }
@@ -265,7 +297,9 @@ export class TableCellNode extends ElementNode {
       prevNode.__width !== this.__width ||
       prevNode.__colSpan !== this.__colSpan ||
       prevNode.__rowSpan !== this.__rowSpan ||
-      prevNode.__backgroundColor !== this.__backgroundColor
+      prevNode.__backgroundColor !== this.__backgroundColor ||
+      prevNode.__styles !== this.__styles ||
+      prevNode.__alignment !== this.__alignment
     );
   }
 
@@ -287,38 +321,42 @@ export class TableCellNode extends ElementNode {
 }
 
 export function $convertTableCellNodeElement(
-  domNode: Node,
+    domNode: Node,
 ): DOMConversionOutput {
   const domNode_ = domNode as HTMLTableCellElement;
   const nodeName = domNode.nodeName.toLowerCase();
 
   let width: number | undefined = undefined;
 
+
+  const PIXEL_VALUE_REG_EXP = /^(\d+(?:\.\d+)?)px$/;
   if (PIXEL_VALUE_REG_EXP.test(domNode_.style.width)) {
     width = parseFloat(domNode_.style.width);
   }
 
   const tableCellNode = $createTableCellNode(
-    nodeName === 'th'
-      ? TableCellHeaderStates.ROW
-      : TableCellHeaderStates.NO_STATUS,
-    domNode_.colSpan,
-    width,
+      nodeName === 'th'
+          ? TableCellHeaderStates.ROW
+          : TableCellHeaderStates.NO_STATUS,
+      domNode_.colSpan,
+      width,
   );
 
   tableCellNode.__rowSpan = domNode_.rowSpan;
-  const backgroundColor = domNode_.style.backgroundColor;
-  if (backgroundColor !== '') {
-    tableCellNode.__backgroundColor = backgroundColor;
-  }
 
   const style = domNode_.style;
   const textDecoration = style.textDecoration.split(' ');
   const hasBoldFontWeight =
-    style.fontWeight === '700' || style.fontWeight === 'bold';
+      style.fontWeight === '700' || style.fontWeight === 'bold';
   const hasLinethroughTextDecoration = textDecoration.includes('line-through');
   const hasItalicFontStyle = style.fontStyle === 'italic';
   const hasUnderlineTextDecoration = textDecoration.includes('underline');
+
+  if (domNode instanceof HTMLElement) {
+    tableCellNode.setStyles(extractStyleMapFromElement(domNode));
+    tableCellNode.setAlignment(extractAlignmentFromElement(domNode));
+  }
+
   return {
     after: (childLexicalNodes) => {
       if (childLexicalNodes.length === 0) {
@@ -330,8 +368,8 @@ export function $convertTableCellNodeElement(
       if ($isTableCellNode(parentLexicalNode) && !$isElementNode(lexicalNode)) {
         const paragraphNode = $createParagraphNode();
         if (
-          $isLineBreakNode(lexicalNode) &&
-          lexicalNode.getTextContent() === '\n'
+            $isLineBreakNode(lexicalNode) &&
+            lexicalNode.getTextContent() === '\n'
         ) {
           return null;
         }
@@ -360,7 +398,7 @@ export function $convertTableCellNodeElement(
 }
 
 export function $createTableCellNode(
-  headerState: TableCellHeaderState,
+  headerState: TableCellHeaderState = TableCellHeaderStates.NO_STATUS,
   colSpan = 1,
   width?: number,
 ): TableCellNode {
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index 357ba3e738b..ab163005370 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -7,7 +7,7 @@
  */
 
 import type {TableCellNode} from './LexicalTableCellNode';
-import type {
+import {
   DOMConversionMap,
   DOMConversionOutput,
   DOMExportOutput,
@@ -15,7 +15,7 @@ import type {
   LexicalEditor,
   LexicalNode,
   NodeKey,
-  SerializedElementNode,
+  SerializedElementNode, Spread,
 } from 'lexical';
 
 import {addClassNamesToElement, isHTMLElement} from '@lexical/utils';
@@ -27,19 +27,36 @@ import {
 
 import {$isTableCellNode} from './LexicalTableCellNode';
 import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
-import {$isTableRowNode, TableRowNode} from './LexicalTableRowNode';
 import {getTable} from './LexicalTableSelectionHelpers';
-
-export type SerializedTableNode = SerializedElementNode;
+import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {
+  commonPropertiesDifferent, deserializeCommonBlockNode,
+  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  updateElementWithCommonBlockProps
+} from "../../nodes/_common";
+import {el, extractStyleMapFromElement, StyleMap} from "../../utils/dom";
+import {getTableColumnWidths} from "../../utils/tables";
+
+export type SerializedTableNode = Spread<{
+  colWidths: string[];
+  styles: Record<string, string>,
+}, SerializedCommonBlockNode>
 
 /** @noInheritDoc */
-export class TableNode extends ElementNode {
+export class TableNode extends CommonBlockNode {
+  __colWidths: string[] = [];
+  __styles: StyleMap = new Map;
+
   static getType(): string {
     return 'table';
   }
 
   static clone(node: TableNode): TableNode {
-    return new TableNode(node.__key);
+    const newNode = new TableNode(node.__key);
+    copyCommonBlockProperties(node, newNode);
+    newNode.__colWidths = node.__colWidths;
+    newNode.__styles = new Map(node.__styles);
+    return newNode;
   }
 
   static importDOM(): DOMConversionMap | null {
@@ -52,18 +69,24 @@ export class TableNode extends ElementNode {
   }
 
   static importJSON(_serializedNode: SerializedTableNode): TableNode {
-    return $createTableNode();
+    const node = $createTableNode();
+    deserializeCommonBlockNode(_serializedNode, node);
+    node.setColWidths(_serializedNode.colWidths);
+    node.setStyles(new Map(Object.entries(_serializedNode.styles)));
+    return node;
   }
 
   constructor(key?: NodeKey) {
     super(key);
   }
 
-  exportJSON(): SerializedElementNode {
+  exportJSON(): SerializedTableNode {
     return {
       ...super.exportJSON(),
       type: 'table',
       version: 1,
+      colWidths: this.__colWidths,
+      styles: Object.fromEntries(this.__styles),
     };
   }
 
@@ -72,11 +95,33 @@ export class TableNode extends ElementNode {
 
     addClassNamesToElement(tableElement, config.theme.table);
 
+    updateElementWithCommonBlockProps(tableElement, this);
+
+    const colWidths = this.getColWidths();
+    if (colWidths.length > 0) {
+      const colgroup = el('colgroup');
+      for (const width of colWidths) {
+        const col = el('col');
+        if (width) {
+          col.style.width = width;
+        }
+        colgroup.append(col);
+      }
+      tableElement.append(colgroup);
+    }
+
+    for (const [name, value] of this.__styles.entries()) {
+      tableElement.style.setProperty(name, value);
+    }
+
     return tableElement;
   }
 
-  updateDOM(): boolean {
-    return false;
+  updateDOM(_prevNode: TableNode): boolean {
+    return commonPropertiesDifferent(_prevNode, this)
+      || this.__colWidths.join(':') !== _prevNode.__colWidths.join(':')
+      || this.__styles.size !== _prevNode.__styles.size
+      || (Array.from(this.__styles.values()).join(':') !== (Array.from(_prevNode.__styles.values()).join(':')));
   }
 
   exportDOM(editor: LexicalEditor): DOMExportOutput {
@@ -115,6 +160,26 @@ export class TableNode extends ElementNode {
     return true;
   }
 
+  setColWidths(widths: string[]) {
+    const self = this.getWritable();
+    self.__colWidths = widths;
+  }
+
+  getColWidths(): string[] {
+    const self = this.getLatest();
+    return self.__colWidths;
+  }
+
+  getStyles(): StyleMap {
+    const self = this.getLatest();
+    return new Map(self.__styles);
+  }
+
+  setStyles(styles: StyleMap): void {
+    const self = this.getWritable();
+    self.__styles = new Map(styles);
+  }
+
   getCordsFromCellNode(
     tableCellNode: TableCellNode,
     table: TableDOMTable,
@@ -239,8 +304,15 @@ export function $getElementForTableNode(
   return getTable(tableElement);
 }
 
-export function $convertTableElement(_domNode: Node): DOMConversionOutput {
-  return {node: $createTableNode()};
+export function $convertTableElement(element: HTMLElement): DOMConversionOutput {
+  const node = $createTableNode();
+  setCommonBlockPropsFromElement(element, node);
+
+  const colWidths = getTableColumnWidths(element as HTMLTableElement);
+  node.setColWidths(colWidths);
+  node.setStyles(extractStyleMapFromElement(element));
+
+  return {node};
 }
 
 export function $createTableNode(): TableNode {
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
index eddea69a27e..07db2b65dc0 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableRowNode.ts
@@ -20,11 +20,12 @@ import {
   SerializedElementNode,
 } from 'lexical';
 
-import {PIXEL_VALUE_REG_EXP} from './constants';
+import {extractStyleMapFromElement, sizeToPixels, StyleMap} from "../../utils/dom";
 
 export type SerializedTableRowNode = Spread<
   {
-    height?: number;
+    styles: Record<string, string>,
+    height?: number,
   },
   SerializedElementNode
 >;
@@ -33,13 +34,17 @@ export type SerializedTableRowNode = Spread<
 export class TableRowNode extends ElementNode {
   /** @internal */
   __height?: number;
+  /** @internal */
+  __styles: StyleMap = new Map();
 
   static getType(): string {
     return 'tablerow';
   }
 
   static clone(node: TableRowNode): TableRowNode {
-    return new TableRowNode(node.__height, node.__key);
+    const newNode = new TableRowNode(node.__key);
+    newNode.__styles = new Map(node.__styles);
+    return newNode;
   }
 
   static importDOM(): DOMConversionMap | null {
@@ -52,20 +57,24 @@ export class TableRowNode extends ElementNode {
   }
 
   static importJSON(serializedNode: SerializedTableRowNode): TableRowNode {
-    return $createTableRowNode(serializedNode.height);
+    const node = $createTableRowNode();
+
+    node.setStyles(new Map(Object.entries(serializedNode.styles)));
+
+    return node;
   }
 
-  constructor(height?: number, key?: NodeKey) {
+  constructor(key?: NodeKey) {
     super(key);
-    this.__height = height;
   }
 
   exportJSON(): SerializedTableRowNode {
     return {
       ...super.exportJSON(),
-      ...(this.getHeight() && {height: this.getHeight()}),
       type: 'tablerow',
       version: 1,
+      styles: Object.fromEntries(this.__styles),
+      height: this.__height || 0,
     };
   }
 
@@ -76,6 +85,10 @@ export class TableRowNode extends ElementNode {
       element.style.height = `${this.__height}px`;
     }
 
+    for (const [name, value] of this.__styles.entries()) {
+      element.style.setProperty(name, value);
+    }
+
     addClassNamesToElement(element, config.theme.tableRow);
 
     return element;
@@ -85,6 +98,16 @@ export class TableRowNode extends ElementNode {
     return true;
   }
 
+  getStyles(): StyleMap {
+    const self = this.getLatest();
+    return new Map(self.__styles);
+  }
+
+  setStyles(styles: StyleMap): void {
+    const self = this.getWritable();
+    self.__styles = new Map(styles);
+  }
+
   setHeight(height: number): number | null | undefined {
     const self = this.getWritable();
     self.__height = height;
@@ -96,7 +119,8 @@ export class TableRowNode extends ElementNode {
   }
 
   updateDOM(prevNode: TableRowNode): boolean {
-    return prevNode.__height !== this.__height;
+    return prevNode.__height !== this.__height
+        || prevNode.__styles !== this.__styles;
   }
 
   canBeEmpty(): false {
@@ -109,18 +133,21 @@ export class TableRowNode extends ElementNode {
 }
 
 export function $convertTableRowElement(domNode: Node): DOMConversionOutput {
-  const domNode_ = domNode as HTMLTableCellElement;
-  let height: number | undefined = undefined;
+  const rowNode = $createTableRowNode();
+  const domNode_ = domNode as HTMLElement;
+
+  const height = sizeToPixels(domNode_.style.height);
+  rowNode.setHeight(height);
 
-  if (PIXEL_VALUE_REG_EXP.test(domNode_.style.height)) {
-    height = parseFloat(domNode_.style.height);
+  if (domNode instanceof HTMLElement) {
+    rowNode.setStyles(extractStyleMapFromElement(domNode));
   }
 
-  return {node: $createTableRowNode(height)};
+  return {node: rowNode};
 }
 
-export function $createTableRowNode(height?: number): TableRowNode {
-  return $applyNodeReplacement(new TableRowNode(height));
+export function $createTableRowNode(): TableRowNode {
+  return $applyNodeReplacement(new TableRowNode());
 }
 
 export function $isTableRowNode(
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index 812cccc0d25..6c3317c5dfa 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -438,59 +438,6 @@ export function applyTableHandlers(
     ),
   );
 
-  tableObserver.listenersToRemove.add(
-    editor.registerCommand<ElementFormatType>(
-      FORMAT_ELEMENT_COMMAND,
-      (formatType) => {
-        const selection = $getSelection();
-        if (
-          !$isTableSelection(selection) ||
-          !$isSelectionInTable(selection, tableNode)
-        ) {
-          return false;
-        }
-
-        const anchorNode = selection.anchor.getNode();
-        const focusNode = selection.focus.getNode();
-        if (!$isTableCellNode(anchorNode) || !$isTableCellNode(focusNode)) {
-          return false;
-        }
-
-        const [tableMap, anchorCell, focusCell] = $computeTableMap(
-          tableNode,
-          anchorNode,
-          focusNode,
-        );
-        const maxRow = Math.max(anchorCell.startRow, focusCell.startRow);
-        const maxColumn = Math.max(
-          anchorCell.startColumn,
-          focusCell.startColumn,
-        );
-        const minRow = Math.min(anchorCell.startRow, focusCell.startRow);
-        const minColumn = Math.min(
-          anchorCell.startColumn,
-          focusCell.startColumn,
-        );
-        for (let i = minRow; i <= maxRow; i++) {
-          for (let j = minColumn; j <= maxColumn; j++) {
-            const cell = tableMap[i][j].cell;
-            cell.setFormat(formatType);
-
-            const cellChildren = cell.getChildren();
-            for (let k = 0; k < cellChildren.length; k++) {
-              const child = cellChildren[k];
-              if ($isElementNode(child) && !child.isInline()) {
-                child.setFormat(formatType);
-              }
-            }
-          }
-        }
-        return true;
-      },
-      COMMAND_PRIORITY_CRITICAL,
-    ),
-  );
-
   tableObserver.listenersToRemove.add(
     editor.registerCommand(
       CONTROLLED_TEXT_INSERTION_COMMAND,
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
index 285d587bf5f..5dbf03d9e9c 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableRowNode.test.ts
@@ -39,10 +39,9 @@ describe('LexicalTableRowNode tests', () => {
           `<tr class="${editorConfig.theme.tableRow}"></tr>`,
         );
 
-        const rowHeight = 36;
-        const rowWithCustomHeightNode = $createTableRowNode(36);
+        const rowWithCustomHeightNode = $createTableRowNode();
         expect(rowWithCustomHeightNode.createDOM(editorConfig).outerHTML).toBe(
-          `<tr style="height: ${rowHeight}px;" class="${editorConfig.theme.tableRow}"></tr>`,
+          `<tr class="${editorConfig.theme.tableRow}"></tr>`,
         );
       });
     });
diff --git a/resources/js/wysiwyg/nodes/custom-table-cell.ts b/resources/js/wysiwyg/nodes/custom-table-cell.ts
deleted file mode 100644
index 793302cfec4..00000000000
--- a/resources/js/wysiwyg/nodes/custom-table-cell.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-import {
-    $createParagraphNode,
-    $isElementNode,
-    $isLineBreakNode,
-    $isTextNode,
-    DOMConversionMap,
-    DOMConversionOutput,
-    DOMExportOutput,
-    EditorConfig,
-    LexicalEditor,
-    LexicalNode,
-    Spread
-} from "lexical";
-
-import {
-    $createTableCellNode,
-    $isTableCellNode,
-    SerializedTableCellNode,
-    TableCellHeaderStates,
-    TableCellNode
-} from "@lexical/table";
-import {TableCellHeaderState} from "@lexical/table/LexicalTableCellNode";
-import {extractStyleMapFromElement, StyleMap} from "../utils/dom";
-import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
-
-export type SerializedCustomTableCellNode = Spread<{
-    styles: Record<string, string>;
-    alignment: CommonBlockAlignment;
-}, SerializedTableCellNode>
-
-export class CustomTableCellNode extends TableCellNode {
-    __styles: StyleMap = new Map;
-    __alignment: CommonBlockAlignment = '';
-
-    static getType(): string {
-        return 'custom-table-cell';
-    }
-
-    static clone(node: CustomTableCellNode): CustomTableCellNode {
-        const cellNode = new CustomTableCellNode(
-            node.__headerState,
-            node.__colSpan,
-            node.__width,
-            node.__key,
-        );
-        cellNode.__rowSpan = node.__rowSpan;
-        cellNode.__styles = new Map(node.__styles);
-        cellNode.__alignment = node.__alignment;
-        return cellNode;
-    }
-
-    clearWidth(): void {
-        const self = this.getWritable();
-        self.__width = undefined;
-    }
-
-    getStyles(): StyleMap {
-        const self = this.getLatest();
-        return new Map(self.__styles);
-    }
-
-    setStyles(styles: StyleMap): void {
-        const self = this.getWritable();
-        self.__styles = new Map(styles);
-    }
-
-    setAlignment(alignment: CommonBlockAlignment) {
-        const self = this.getWritable();
-        self.__alignment = alignment;
-    }
-
-    getAlignment(): CommonBlockAlignment {
-        const self = this.getLatest();
-        return self.__alignment;
-    }
-
-    updateTag(tag: string): void {
-        const isHeader = tag.toLowerCase() === 'th';
-        const state = isHeader ? TableCellHeaderStates.ROW : TableCellHeaderStates.NO_STATUS;
-        const self = this.getWritable();
-        self.__headerState = state;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const element = super.createDOM(config);
-
-        for (const [name, value] of this.__styles.entries()) {
-            element.style.setProperty(name, value);
-        }
-
-        if (this.__alignment) {
-            element.classList.add('align-' + this.__alignment);
-        }
-
-        return element;
-    }
-
-    updateDOM(prevNode: CustomTableCellNode): boolean {
-        return super.updateDOM(prevNode)
-            || this.__styles !== prevNode.__styles
-            || this.__alignment !== prevNode.__alignment;
-    }
-
-    static importDOM(): DOMConversionMap | null {
-        return {
-            td: (node: Node) => ({
-                conversion: $convertCustomTableCellNodeElement,
-                priority: 0,
-            }),
-            th: (node: Node) => ({
-                conversion: $convertCustomTableCellNodeElement,
-                priority: 0,
-            }),
-        };
-    }
-
-    exportDOM(editor: LexicalEditor): DOMExportOutput {
-        const element = this.createDOM(editor._config);
-        return {
-            element
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomTableCellNode): CustomTableCellNode {
-        const node = $createCustomTableCellNode(
-            serializedNode.headerState,
-            serializedNode.colSpan,
-            serializedNode.width,
-        );
-
-        node.setStyles(new Map(Object.entries(serializedNode.styles)));
-        node.setAlignment(serializedNode.alignment);
-
-        return node;
-    }
-
-    exportJSON(): SerializedCustomTableCellNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-table-cell',
-            styles: Object.fromEntries(this.__styles),
-            alignment: this.__alignment,
-        };
-    }
-}
-
-function $convertCustomTableCellNodeElement(domNode: Node): DOMConversionOutput {
-    const output =  $convertTableCellNodeElement(domNode);
-
-    if (domNode instanceof HTMLElement && output.node instanceof CustomTableCellNode) {
-        output.node.setStyles(extractStyleMapFromElement(domNode));
-        output.node.setAlignment(extractAlignmentFromElement(domNode));
-    }
-
-    return output;
-}
-
-/**
- * Function taken from:
- * https://github.com/facebook/lexical/blob/e1881a6e409e1541c10dd0b5378f3a38c9dc8c9e/packages/lexical-table/src/LexicalTableCellNode.ts#L289
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- * MIT LICENSE
- * Modified since copy.
- */
-export function $convertTableCellNodeElement(
-    domNode: Node,
-): DOMConversionOutput {
-    const domNode_ = domNode as HTMLTableCellElement;
-    const nodeName = domNode.nodeName.toLowerCase();
-
-    let width: number | undefined = undefined;
-
-
-    const PIXEL_VALUE_REG_EXP = /^(\d+(?:\.\d+)?)px$/;
-    if (PIXEL_VALUE_REG_EXP.test(domNode_.style.width)) {
-        width = parseFloat(domNode_.style.width);
-    }
-
-    const tableCellNode = $createTableCellNode(
-        nodeName === 'th'
-            ? TableCellHeaderStates.ROW
-            : TableCellHeaderStates.NO_STATUS,
-        domNode_.colSpan,
-        width,
-    );
-
-    tableCellNode.__rowSpan = domNode_.rowSpan;
-
-    const style = domNode_.style;
-    const textDecoration = style.textDecoration.split(' ');
-    const hasBoldFontWeight =
-        style.fontWeight === '700' || style.fontWeight === 'bold';
-    const hasLinethroughTextDecoration = textDecoration.includes('line-through');
-    const hasItalicFontStyle = style.fontStyle === 'italic';
-    const hasUnderlineTextDecoration = textDecoration.includes('underline');
-    return {
-        after: (childLexicalNodes) => {
-            if (childLexicalNodes.length === 0) {
-                childLexicalNodes.push($createParagraphNode());
-            }
-            return childLexicalNodes;
-        },
-        forChild: (lexicalNode, parentLexicalNode) => {
-            if ($isTableCellNode(parentLexicalNode) && !$isElementNode(lexicalNode)) {
-                const paragraphNode = $createParagraphNode();
-                if (
-                    $isLineBreakNode(lexicalNode) &&
-                    lexicalNode.getTextContent() === '\n'
-                ) {
-                    return null;
-                }
-                if ($isTextNode(lexicalNode)) {
-                    if (hasBoldFontWeight) {
-                        lexicalNode.toggleFormat('bold');
-                    }
-                    if (hasLinethroughTextDecoration) {
-                        lexicalNode.toggleFormat('strikethrough');
-                    }
-                    if (hasItalicFontStyle) {
-                        lexicalNode.toggleFormat('italic');
-                    }
-                    if (hasUnderlineTextDecoration) {
-                        lexicalNode.toggleFormat('underline');
-                    }
-                }
-                paragraphNode.append(lexicalNode);
-                return paragraphNode;
-            }
-
-            return lexicalNode;
-        },
-        node: tableCellNode,
-    };
-}
-
-
-export function $createCustomTableCellNode(
-    headerState: TableCellHeaderState = TableCellHeaderStates.NO_STATUS,
-    colSpan = 1,
-    width?: number,
-): CustomTableCellNode {
-    return new CustomTableCellNode(headerState, colSpan, width);
-}
-
-export function $isCustomTableCellNode(node: LexicalNode | null | undefined): node is CustomTableCellNode {
-    return node instanceof CustomTableCellNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-table-row.ts b/resources/js/wysiwyg/nodes/custom-table-row.ts
deleted file mode 100644
index f4702f36dd5..00000000000
--- a/resources/js/wysiwyg/nodes/custom-table-row.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import {
-    DOMConversionMap,
-    DOMConversionOutput,
-    EditorConfig,
-    LexicalNode,
-    Spread
-} from "lexical";
-
-import {
-    SerializedTableRowNode,
-    TableRowNode
-} from "@lexical/table";
-import {NodeKey} from "lexical/LexicalNode";
-import {extractStyleMapFromElement, StyleMap} from "../utils/dom";
-
-export type SerializedCustomTableRowNode = Spread<{
-    styles: Record<string, string>,
-}, SerializedTableRowNode>
-
-export class CustomTableRowNode extends TableRowNode {
-    __styles: StyleMap = new Map();
-
-    constructor(key?: NodeKey) {
-        super(0, key);
-    }
-
-    static getType(): string {
-        return 'custom-table-row';
-    }
-
-    static clone(node: CustomTableRowNode): CustomTableRowNode {
-        const cellNode = new CustomTableRowNode(node.__key);
-
-        cellNode.__styles = new Map(node.__styles);
-        return cellNode;
-    }
-
-    getStyles(): StyleMap {
-        const self = this.getLatest();
-        return new Map(self.__styles);
-    }
-
-    setStyles(styles: StyleMap): void {
-        const self = this.getWritable();
-        self.__styles = new Map(styles);
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const element = super.createDOM(config);
-
-        for (const [name, value] of this.__styles.entries()) {
-            element.style.setProperty(name, value);
-        }
-
-        return element;
-    }
-
-    updateDOM(prevNode: CustomTableRowNode): boolean {
-        return super.updateDOM(prevNode)
-            || this.__styles !== prevNode.__styles;
-    }
-
-    static importDOM(): DOMConversionMap | null {
-        return {
-            tr: (node: Node) => ({
-                conversion: $convertTableRowElement,
-                priority: 0,
-            }),
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomTableRowNode): CustomTableRowNode {
-        const node = $createCustomTableRowNode();
-
-        node.setStyles(new Map(Object.entries(serializedNode.styles)));
-
-        return node;
-    }
-
-    exportJSON(): SerializedCustomTableRowNode {
-        return {
-            ...super.exportJSON(),
-            height: 0,
-            type: 'custom-table-row',
-            styles: Object.fromEntries(this.__styles),
-        };
-    }
-}
-
-export function $convertTableRowElement(domNode: Node): DOMConversionOutput {
-    const rowNode = $createCustomTableRowNode();
-
-    if (domNode instanceof HTMLElement) {
-        rowNode.setStyles(extractStyleMapFromElement(domNode));
-    }
-
-    return {node: rowNode};
-}
-
-export function $createCustomTableRowNode(): CustomTableRowNode {
-    return new CustomTableRowNode();
-}
-
-export function $isCustomTableRowNode(node: LexicalNode | null | undefined): node is CustomTableRowNode {
-    return node instanceof CustomTableRowNode;
-}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/custom-table.ts b/resources/js/wysiwyg/nodes/custom-table.ts
deleted file mode 100644
index c25c06c6515..00000000000
--- a/resources/js/wysiwyg/nodes/custom-table.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import {SerializedTableNode, TableNode} from "@lexical/table";
-import {DOMConversion, DOMConversionMap, DOMConversionOutput, LexicalNode, Spread} from "lexical";
-import {EditorConfig} from "lexical/LexicalEditor";
-
-import {el, extractStyleMapFromElement, StyleMap} from "../utils/dom";
-import {getTableColumnWidths} from "../utils/tables";
-import {
-    CommonBlockAlignment, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
-    setCommonBlockPropsFromElement,
-    updateElementWithCommonBlockProps
-} from "./_common";
-
-export type SerializedCustomTableNode = Spread<Spread<{
-    colWidths: string[];
-    styles: Record<string, string>,
-}, SerializedTableNode>, SerializedCommonBlockNode>
-
-export class CustomTableNode extends TableNode {
-    __id: string = '';
-    __colWidths: string[] = [];
-    __styles: StyleMap = new Map;
-    __alignment: CommonBlockAlignment = '';
-    __inset: number = 0;
-
-    static getType() {
-        return 'custom-table';
-    }
-
-    setId(id: string) {
-        const self = this.getWritable();
-        self.__id = id;
-    }
-
-    getId(): string {
-        const self = this.getLatest();
-        return self.__id;
-    }
-
-    setAlignment(alignment: CommonBlockAlignment) {
-        const self = this.getWritable();
-        self.__alignment = alignment;
-    }
-
-    getAlignment(): CommonBlockAlignment {
-        const self = this.getLatest();
-        return self.__alignment;
-    }
-
-    setInset(size: number) {
-        const self = this.getWritable();
-        self.__inset = size;
-    }
-
-    getInset(): number {
-        const self = this.getLatest();
-        return self.__inset;
-    }
-
-    setColWidths(widths: string[]) {
-        const self = this.getWritable();
-        self.__colWidths = widths;
-    }
-
-    getColWidths(): string[] {
-        const self = this.getLatest();
-        return self.__colWidths;
-    }
-
-    getStyles(): StyleMap {
-        const self = this.getLatest();
-        return new Map(self.__styles);
-    }
-
-    setStyles(styles: StyleMap): void {
-        const self = this.getWritable();
-        self.__styles = new Map(styles);
-    }
-
-    static clone(node: CustomTableNode) {
-        const newNode = new CustomTableNode(node.__key);
-        newNode.__id = node.__id;
-        newNode.__colWidths = node.__colWidths;
-        newNode.__styles = new Map(node.__styles);
-        newNode.__alignment = node.__alignment;
-        newNode.__inset = node.__inset;
-        return newNode;
-    }
-
-    createDOM(config: EditorConfig): HTMLElement {
-        const dom = super.createDOM(config);
-        updateElementWithCommonBlockProps(dom, this);
-
-        const colWidths = this.getColWidths();
-        if (colWidths.length > 0) {
-            const colgroup = el('colgroup');
-            for (const width of colWidths) {
-                const col = el('col');
-                if (width) {
-                    col.style.width = width;
-                }
-                colgroup.append(col);
-            }
-            dom.append(colgroup);
-        }
-
-        for (const [name, value] of this.__styles.entries()) {
-            dom.style.setProperty(name, value);
-        }
-
-        return dom;
-    }
-
-    updateDOM(): boolean {
-        return true;
-    }
-
-    exportJSON(): SerializedCustomTableNode {
-        return {
-            ...super.exportJSON(),
-            type: 'custom-table',
-            version: 1,
-            id: this.__id,
-            colWidths: this.__colWidths,
-            styles: Object.fromEntries(this.__styles),
-            alignment: this.__alignment,
-            inset: this.__inset,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedCustomTableNode): CustomTableNode {
-        const node = $createCustomTableNode();
-        deserializeCommonBlockNode(serializedNode, node);
-        node.setColWidths(serializedNode.colWidths);
-        node.setStyles(new Map(Object.entries(serializedNode.styles)));
-        return node;
-    }
-
-    static importDOM(): DOMConversionMap|null {
-        return {
-            table(node: HTMLElement): DOMConversion|null {
-                return {
-                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
-                        const node = $createCustomTableNode();
-                        setCommonBlockPropsFromElement(element, node);
-
-                        const colWidths = getTableColumnWidths(element as HTMLTableElement);
-                        node.setColWidths(colWidths);
-                        node.setStyles(extractStyleMapFromElement(element));
-
-                        return {node};
-                    },
-                    priority: 1,
-                };
-            },
-        };
-    }
-}
-
-export function $createCustomTableNode(): CustomTableNode {
-    return new CustomTableNode();
-}
-
-export function $isCustomTableNode(node: LexicalNode | null | undefined): node is CustomTableNode {
-    return node instanceof CustomTableNode;
-}
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes/index.ts
index 7e0ce9daf2b..03213e2629a 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes/index.ts
@@ -11,14 +11,11 @@ import {ImageNode} from "./image";
 import {DetailsNode, SummaryNode} from "./details";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
-import {CustomTableNode} from "./custom-table";
 import {HorizontalRuleNode} from "./horizontal-rule";
 import {CodeBlockNode} from "./code-block";
 import {DiagramNode} from "./diagram";
 import {EditorUiContext} from "../ui/framework/core";
 import {MediaNode} from "./media";
-import {CustomTableCellNode} from "./custom-table-cell";
-import {CustomTableRowNode} from "./custom-table-row";
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
@@ -32,9 +29,9 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         QuoteNode,
         ListNode,
         ListItemNode,
-        CustomTableNode,
-        CustomTableRowNode,
-        CustomTableCellNode,
+        TableNode,
+        TableRowNode,
+        TableCellNode,
         ImageNode, // TODO - Alignment
         HorizontalRuleNode,
         DetailsNode, SummaryNode,
@@ -43,30 +40,6 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         MediaNode, // TODO - Alignment
         ParagraphNode,
         LinkNode,
-        {
-            replace: TableNode,
-            with(node: TableNode) {
-                return new CustomTableNode();
-            }
-        },
-        {
-            replace: TableRowNode,
-            with(node: TableRowNode) {
-                return new CustomTableRowNode();
-            }
-        },
-        {
-            replace: TableCellNode,
-            with: (node: TableCellNode) => {
-                const cell = new CustomTableCellNode(
-                    node.__headerState,
-                    node.__colSpan,
-                    node.__width,
-                );
-                cell.__rowSpan = node.__rowSpan;
-                return cell;
-            }
-        },
     ];
 }
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index fc4196f0a08..2e4883d88e6 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -9,17 +9,15 @@ import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
 import {EditorUiContext} from "../../framework/core";
 import {$getSelection, BaseSelection} from "lexical";
-import {$isCustomTableNode} from "../../../nodes/custom-table";
 import {
     $deleteTableColumn__EXPERIMENTAL,
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
-    $insertTableRow__EXPERIMENTAL,
-    $isTableNode, $isTableSelection, $unmergeCell, TableCellNode,
+    $insertTableRow__EXPERIMENTAL, $isTableCellNode,
+    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode,
 } from "@lexical/table";
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
-import {$isCustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {$showCellPropertiesForm, $showRowPropertiesForm, $showTablePropertiesForm} from "../forms/tables";
 import {
     $clearTableFormatting,
@@ -27,7 +25,6 @@ import {
     $getTableRowsFromSelection,
     $mergeTableCellsInSelection
 } from "../../../utils/tables";
-import {$isCustomTableRowNode} from "../../../nodes/custom-table-row";
 import {
     $copySelectedColumnsToClipboard,
     $copySelectedRowsToClipboard,
@@ -41,7 +38,7 @@ import {
 } from "../../../utils/table-copy-paste";
 
 const neverActive = (): boolean => false;
-const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isCustomTableCellNode);
+const cellNotSelected = (selection: BaseSelection|null) => !$selectionContainsNodeType(selection, $isTableCellNode);
 
 export const table: EditorBasicButtonDefinition = {
     label: 'Table',
@@ -54,7 +51,7 @@ export const tableProperties: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const table = $getTableFromSelection($getSelection());
-            if ($isCustomTableNode(table)) {
+            if ($isTableNode(table)) {
                 $showTablePropertiesForm(table, context);
             }
         });
@@ -68,13 +65,13 @@ export const clearTableFormatting: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if (!$isCustomTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
                 return;
             }
 
             const table = $getParentOfType(cell, $isTableNode);
-            if ($isCustomTableNode(table)) {
+            if ($isTableNode(table)) {
                 $clearTableFormatting(table);
             }
         });
@@ -88,13 +85,13 @@ export const resizeTableToContents: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if (!$isCustomTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if (!$isTableCellNode(cell)) {
                 return;
             }
 
-            const table = $getParentOfType(cell, $isCustomTableNode);
-            if ($isCustomTableNode(table)) {
+            const table = $getParentOfType(cell, $isTableNode);
+            if ($isTableNode(table)) {
                 $clearTableSizes(table);
             }
         });
@@ -108,7 +105,7 @@ export const deleteTable: EditorButtonDefinition = {
     icon: deleteIcon,
     action(context: EditorUiContext) {
         context.editor.update(() => {
-            const table = $getNodeFromSelection($getSelection(), $isCustomTableNode);
+            const table = $getNodeFromSelection($getSelection(), $isTableNode);
             if (table) {
                 table.remove();
             }
@@ -169,7 +166,7 @@ export const rowProperties: EditorButtonDefinition = {
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
             const rows = $getTableRowsFromSelection($getSelection());
-            if ($isCustomTableRowNode(rows[0])) {
+            if ($isTableRowNode(rows[0])) {
                 $showRowPropertiesForm(rows[0], context);
             }
         });
@@ -350,8 +347,8 @@ export const cellProperties: EditorButtonDefinition = {
     format: 'long',
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
-            const cell = $getNodeFromSelection($getSelection(), $isCustomTableCellNode);
-            if ($isCustomTableCellNode(cell)) {
+            const cell = $getNodeFromSelection($getSelection(), $isTableCellNode);
+            if ($isTableCellNode(cell)) {
                 $showCellPropertiesForm(cell, context);
             }
         });
@@ -387,7 +384,7 @@ export const splitCell: EditorButtonDefinition = {
     },
     isActive: neverActive,
     isDisabled(selection) {
-        const cell = $getNodeFromSelection(selection, $isCustomTableCellNode) as TableCellNode|null;
+        const cell = $getNodeFromSelection(selection, $isTableCellNode) as TableCellNode|null;
         if (cell) {
             const merged = cell.getRowSpan() > 1 || cell.getColSpan() > 1;
             return !merged;
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 5a41c85b3da..3cfe9592ccb 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -5,7 +5,6 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {CustomTableCellNode} from "../../../nodes/custom-table-cell";
 import {EditorFormModal} from "../../framework/modals";
 import {$getSelection, ElementFormatType} from "lexical";
 import {
@@ -16,8 +15,8 @@ import {
     $setTableCellColumnWidth
 } from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
-import {CustomTableRowNode} from "../../../nodes/custom-table-row";
-import {CustomTableNode} from "../../../nodes/custom-table";
+import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
+import {CommonBlockAlignment} from "../../../nodes/_common";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -62,14 +61,14 @@ const alignmentInput: EditorSelectFormFieldDefinition = {
     }
 };
 
-export function $showCellPropertiesForm(cell: CustomTableCellNode, context: EditorUiContext): EditorFormModal {
+export function $showCellPropertiesForm(cell: TableCellNode, context: EditorUiContext): EditorFormModal {
     const styles = cell.getStyles();
     const modalForm = context.manager.createModal('cell_properties');
     modalForm.show({
         width: $getTableCellColumnWidth(context.editor, cell),
         height: styles.get('height') || '',
         type: cell.getTag(),
-        h_align: cell.getFormatType(),
+        h_align: cell.getAlignment(),
         v_align: styles.get('vertical-align') || '',
         border_width: styles.get('border-width') || '',
         border_style: styles.get('border-style') || '',
@@ -89,7 +88,7 @@ export const cellProperties: EditorFormDefinition = {
 
                 $setTableCellColumnWidth(cell, width);
                 cell.updateTag(formData.get('type')?.toString() || '');
-                cell.setFormat((formData.get('h_align')?.toString() || '') as ElementFormatType);
+                cell.setAlignment((formData.get('h_align')?.toString() || '') as CommonBlockAlignment);
 
                 const styles = cell.getStyles();
                 styles.set('height', formatSizeValue(formData.get('height')?.toString() || ''));
@@ -172,7 +171,7 @@ export const cellProperties: EditorFormDefinition = {
     ],
 };
 
-export function $showRowPropertiesForm(row: CustomTableRowNode, context: EditorUiContext): EditorFormModal {
+export function $showRowPropertiesForm(row: TableRowNode, context: EditorUiContext): EditorFormModal {
     const styles = row.getStyles();
     const modalForm = context.manager.createModal('row_properties');
     modalForm.show({
@@ -216,7 +215,7 @@ export const rowProperties: EditorFormDefinition = {
     ],
 };
 
-export function $showTablePropertiesForm(table: CustomTableNode, context: EditorUiContext): EditorFormModal {
+export function $showTablePropertiesForm(table: TableNode, context: EditorUiContext): EditorFormModal {
     const styles = table.getStyles();
     const modalForm = context.manager.createModal('table_properties');
     modalForm.show({
@@ -229,7 +228,7 @@ export function $showTablePropertiesForm(table: CustomTableNode, context: Editor
         border_color: styles.get('border-color') || '',
         background_color: styles.get('background-color') || '',
         // caption: '', TODO
-        align: table.getFormatType(),
+        align: table.getAlignment(),
     });
     return modalForm;
 }
@@ -253,12 +252,12 @@ export const tableProperties: EditorFormDefinition = {
             styles.set('background-color', formData.get('background_color')?.toString() || '');
             table.setStyles(styles);
 
-            table.setFormat(formData.get('align') as ElementFormatType);
+            table.setAlignment(formData.get('align') as CommonBlockAlignment);
 
             const cellPadding = (formData.get('cell_padding')?.toString() || '');
             if (cellPadding) {
                 const cellPaddingFormatted = formatSizeValue(cellPadding);
-                $forEachTableCell(table, (cell: CustomTableCellNode) => {
+                $forEachTableCell(table, (cell: TableCellNode) => {
                     const styles = cell.getStyles();
                     styles.set('padding', cellPaddingFormatted);
                     cell.setStyles(styles);
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index 30ff3abc56c..6f026ca1895 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -1,6 +1,5 @@
 import {EditorUiElement} from "../core";
 import {$createTableNodeWithDimensions} from "@lexical/table";
-import {CustomTableNode} from "../../../nodes/custom-table";
 import {$insertNewBlockNodeAtSelection} from "../../../utils/selection";
 import {el} from "../../../utils/dom";
 
@@ -78,7 +77,7 @@ export class EditorTableCreator extends EditorUiElement {
         const colWidths = Array(columns).fill(targetColWidth + 'px');
 
         this.getContext().editor.update(() => {
-            const table = $createTableNodeWithDimensions(rows, columns, false) as CustomTableNode;
+            const table = $createTableNodeWithDimensions(rows, columns, false);
             table.setColWidths(colWidths);
             $insertNewBlockNodeAtSelection(table);
         });
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 37f1b6f01ee..4256fdafc65 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -1,7 +1,6 @@
 import {$getNearestNodeFromDOMNode, LexicalEditor} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
-import {CustomTableNode} from "../../../nodes/custom-table";
-import {TableRowNode} from "@lexical/table";
+import {TableNode, TableRowNode} from "@lexical/table";
 import {el} from "../../../utils/dom";
 import {$getTableColumnWidth, $setTableColumnWidth} from "../../../utils/tables";
 
@@ -148,7 +147,7 @@ class TableResizer {
 
                     _this.editor.update(() => {
                         const table = $getNearestNodeFromDOMNode(parentTable);
-                        if (table instanceof CustomTableNode) {
+                        if (table instanceof TableNode) {
                             const originalWidth = $getTableColumnWidth(_this.editor, table, cellIndex);
                             const newWidth = Math.max(originalWidth + change, 10);
                             $setTableColumnWidth(table, cellIndex, newWidth);
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
index f631fb804a5..d3d8925505f 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
@@ -1,12 +1,12 @@
 import {$getNodeByKey, LexicalEditor} from "lexical";
 import {NodeKey} from "lexical/LexicalNode";
 import {
+    $isTableNode,
     applyTableHandlers,
     HTMLTableElementWithWithTableSelectionState,
     TableNode,
     TableObserver
 } from "@lexical/table";
-import {$isCustomTableNode, CustomTableNode} from "../../../nodes/custom-table";
 
 // File adapted from logic in:
 // https://github.com/facebook/lexical/blob/f373759a7849f473d34960a6bf4e34b2a011e762/packages/lexical-react/src/LexicalTablePlugin.ts#L49
@@ -25,12 +25,12 @@ class TableSelectionHandler {
     }
 
     protected init() {
-        this.unregisterMutationListener = this.editor.registerMutationListener(CustomTableNode, (mutations) => {
+        this.unregisterMutationListener = this.editor.registerMutationListener(TableNode, (mutations) => {
             for (const [nodeKey, mutation] of mutations) {
                 if (mutation === 'created') {
                     this.editor.getEditorState().read(() => {
-                        const tableNode = $getNodeByKey<CustomTableNode>(nodeKey);
-                        if ($isCustomTableNode(tableNode)) {
+                        const tableNode = $getNodeByKey<TableNode>(nodeKey);
+                        if ($isTableNode(tableNode)) {
                             this.initializeTableNode(tableNode);
                         }
                     });
diff --git a/resources/js/wysiwyg/utils/table-copy-paste.ts b/resources/js/wysiwyg/utils/table-copy-paste.ts
index 12c19b0fb80..1e024e4c758 100644
--- a/resources/js/wysiwyg/utils/table-copy-paste.ts
+++ b/resources/js/wysiwyg/utils/table-copy-paste.ts
@@ -1,24 +1,28 @@
 import {NodeClipboard} from "./node-clipboard";
-import {CustomTableRowNode} from "../nodes/custom-table-row";
 import {$getTableCellsFromSelection, $getTableFromSelection, $getTableRowsFromSelection} from "./tables";
 import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
-import {$createCustomTableCellNode, $isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
-import {CustomTableNode} from "../nodes/custom-table";
 import {TableMap} from "./table-map";
-import {$isTableSelection} from "@lexical/table";
+import {
+    $createTableCellNode,
+    $isTableCellNode,
+    $isTableSelection,
+    TableCellNode,
+    TableNode,
+    TableRowNode
+} from "@lexical/table";
 import {$getNodeFromSelection} from "./selection";
 
-const rowClipboard: NodeClipboard<CustomTableRowNode> = new NodeClipboard<CustomTableRowNode>();
+const rowClipboard: NodeClipboard<TableRowNode> = new NodeClipboard<TableRowNode>();
 
 export function isRowClipboardEmpty(): boolean {
     return rowClipboard.size() === 0;
 }
 
-export function validateRowsToCopy(rows: CustomTableRowNode[]): void {
+export function validateRowsToCopy(rows: TableRowNode[]): void {
     let commonRowSize: number|null = null;
 
     for (const row of rows) {
-        const cells = row.getChildren().filter(n => $isCustomTableCellNode(n));
+        const cells = row.getChildren().filter(n => $isTableCellNode(n));
         let rowSize = 0;
         for (const cell of cells) {
             rowSize += cell.getColSpan() || 1;
@@ -35,10 +39,10 @@ export function validateRowsToCopy(rows: CustomTableRowNode[]): void {
     }
 }
 
-export function validateRowsToPaste(rows: CustomTableRowNode[], targetTable: CustomTableNode): void {
+export function validateRowsToPaste(rows: TableRowNode[], targetTable: TableNode): void {
     const tableColCount = (new TableMap(targetTable)).columnCount;
     for (const row of rows) {
-        const cells = row.getChildren().filter(n => $isCustomTableCellNode(n));
+        const cells = row.getChildren().filter(n => $isTableCellNode(n));
         let rowSize = 0;
         for (const cell of cells) {
             rowSize += cell.getColSpan() || 1;
@@ -49,7 +53,7 @@ export function validateRowsToPaste(rows: CustomTableRowNode[], targetTable: Cus
         }
 
         while (rowSize < tableColCount) {
-            row.append($createCustomTableCellNode());
+            row.append($createTableCellNode());
             rowSize++;
         }
     }
@@ -98,11 +102,11 @@ export function $pasteClipboardRowsAfter(editor: LexicalEditor): void {
     }
 }
 
-const columnClipboard: NodeClipboard<CustomTableCellNode>[] = [];
+const columnClipboard: NodeClipboard<TableCellNode>[] = [];
 
-function setColumnClipboard(columns: CustomTableCellNode[][]): void {
+function setColumnClipboard(columns: TableCellNode[][]): void {
     const newClipboards = columns.map(cells => {
-        const clipboard = new NodeClipboard<CustomTableCellNode>();
+        const clipboard = new NodeClipboard<TableCellNode>();
         clipboard.set(...cells);
         return clipboard;
     });
@@ -122,9 +126,9 @@ function $getSelectionColumnRange(selection: BaseSelection|null): TableRange|nul
         return {from: shape.fromX, to: shape.toX};
     }
 
-    const cell = $getNodeFromSelection(selection, $isCustomTableCellNode);
+    const cell = $getNodeFromSelection(selection, $isTableCellNode);
     const table = $getTableFromSelection(selection);
-    if (!$isCustomTableCellNode(cell) || !table) {
+    if (!$isTableCellNode(cell) || !table) {
         return null;
     }
 
@@ -137,7 +141,7 @@ function $getSelectionColumnRange(selection: BaseSelection|null): TableRange|nul
     return {from: range.fromX, to: range.toX};
 }
 
-function $getTableColumnCellsFromSelection(range: TableRange, table: CustomTableNode): CustomTableCellNode[][] {
+function $getTableColumnCellsFromSelection(range: TableRange, table: TableNode): TableCellNode[][] {
     const map = new TableMap(table);
     const columns = [];
     for (let x = range.from; x <= range.to; x++) {
@@ -148,7 +152,7 @@ function $getTableColumnCellsFromSelection(range: TableRange, table: CustomTable
     return columns;
 }
 
-function validateColumnsToCopy(columns: CustomTableCellNode[][]): void {
+function validateColumnsToCopy(columns: TableCellNode[][]): void {
     let commonColSize: number|null = null;
 
     for (const cells of columns) {
@@ -203,7 +207,7 @@ export function $copySelectedColumnsToClipboard(): void {
     setColumnClipboard(columns);
 }
 
-function validateColumnsToPaste(columns: CustomTableCellNode[][], targetTable: CustomTableNode) {
+function validateColumnsToPaste(columns: TableCellNode[][], targetTable: TableNode) {
     const tableRowCount = (new TableMap(targetTable)).rowCount;
     for (const cells of columns) {
         let colSize = 0;
@@ -216,7 +220,7 @@ function validateColumnsToPaste(columns: CustomTableCellNode[][], targetTable: C
         }
 
         while (colSize < tableRowCount) {
-            cells.push($createCustomTableCellNode());
+            cells.push($createTableCellNode());
             colSize++;
         }
     }
diff --git a/resources/js/wysiwyg/utils/table-map.ts b/resources/js/wysiwyg/utils/table-map.ts
index 607deffe1ca..dfe21b936f6 100644
--- a/resources/js/wysiwyg/utils/table-map.ts
+++ b/resources/js/wysiwyg/utils/table-map.ts
@@ -1,6 +1,4 @@
-import {CustomTableNode} from "../nodes/custom-table";
-import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
-import {$isTableRowNode} from "@lexical/table";
+import {$isTableCellNode, $isTableRowNode, TableCellNode, TableNode} from "@lexical/table";
 
 export type CellRange = {
     fromX: number;
@@ -16,15 +14,15 @@ export class TableMap {
 
     // Represents an array (rows*columns in length) of cell nodes from top-left to
     // bottom right. Cells may repeat where merged and covering multiple spaces.
-    cells: CustomTableCellNode[] = [];
+    cells: TableCellNode[] = [];
 
-    constructor(table: CustomTableNode) {
+    constructor(table: TableNode) {
         this.buildCellMap(table);
     }
 
-    protected buildCellMap(table: CustomTableNode) {
-        const rowsAndCells: CustomTableCellNode[][] = [];
-        const setCell = (x: number, y: number, cell: CustomTableCellNode) => {
+    protected buildCellMap(table: TableNode) {
+        const rowsAndCells: TableCellNode[][] = [];
+        const setCell = (x: number, y: number, cell: TableCellNode) => {
             if (typeof rowsAndCells[y] === 'undefined') {
                 rowsAndCells[y] = [];
             }
@@ -36,7 +34,7 @@ export class TableMap {
         const rowNodes = table.getChildren().filter(r => $isTableRowNode(r));
         for (let rowIndex = 0; rowIndex < rowNodes.length; rowIndex++) {
             const rowNode = rowNodes[rowIndex];
-            const cellNodes = rowNode.getChildren().filter(c => $isCustomTableCellNode(c));
+            const cellNodes = rowNode.getChildren().filter(c => $isTableCellNode(c));
             let targetColIndex: number = 0;
             for (let cellIndex = 0; cellIndex < cellNodes.length; cellIndex++) {
                 const cellNode = cellNodes[cellIndex];
@@ -60,7 +58,7 @@ export class TableMap {
         this.columnCount = Math.max(...rowsAndCells.map(r => r.length));
 
         const cells = [];
-        let lastCell: CustomTableCellNode = rowsAndCells[0][0];
+        let lastCell: TableCellNode = rowsAndCells[0][0];
         for (let y = 0; y < this.rowCount; y++) {
             for (let x = 0; x < this.columnCount; x++) {
                 if (!rowsAndCells[y] || !rowsAndCells[y][x]) {
@@ -75,7 +73,7 @@ export class TableMap {
         this.cells = cells;
     }
 
-    public getCellAtPosition(x: number, y: number): CustomTableCellNode {
+    public getCellAtPosition(x: number, y: number): TableCellNode {
         const position = (y * this.columnCount) + x;
         if (position >= this.cells.length) {
             throw new Error(`TableMap Error: Attempted to get cell ${position+1} of ${this.cells.length}`);
@@ -84,13 +82,13 @@ export class TableMap {
         return this.cells[position];
     }
 
-    public getCellsInRange(range: CellRange): CustomTableCellNode[] {
+    public getCellsInRange(range: CellRange): TableCellNode[] {
         const minX = Math.max(Math.min(range.fromX, range.toX), 0);
         const maxX = Math.min(Math.max(range.fromX, range.toX), this.columnCount - 1);
         const minY = Math.max(Math.min(range.fromY, range.toY), 0);
         const maxY = Math.min(Math.max(range.fromY, range.toY), this.rowCount - 1);
 
-        const cells = new Set<CustomTableCellNode>();
+        const cells = new Set<TableCellNode>();
 
         for (let y = minY; y <= maxY; y++) {
             for (let x = minX; x <= maxX; x++) {
@@ -101,7 +99,7 @@ export class TableMap {
         return [...cells.values()];
     }
 
-    public getCellsInColumn(columnIndex: number): CustomTableCellNode[] {
+    public getCellsInColumn(columnIndex: number): TableCellNode[] {
         return this.getCellsInRange({
             fromX: columnIndex,
             toX: columnIndex,
@@ -110,7 +108,7 @@ export class TableMap {
         });
     }
 
-    public getRangeForCell(cell: CustomTableCellNode): CellRange|null {
+    public getRangeForCell(cell: TableCellNode): CellRange|null {
         let range: CellRange|null = null;
         const cellKey = cell.getKey();
 
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index aa8ec89ba77..ed947ddcdcb 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -1,15 +1,19 @@
 import {BaseSelection, LexicalEditor} from "lexical";
-import {$isTableRowNode, $isTableSelection, TableRowNode, TableSelection, TableSelectionShape} from "@lexical/table";
-import {$isCustomTableNode, CustomTableNode} from "../nodes/custom-table";
-import {$isCustomTableCellNode, CustomTableCellNode} from "../nodes/custom-table-cell";
+import {
+    $isTableCellNode,
+    $isTableNode,
+    $isTableRowNode,
+    $isTableSelection, TableCellNode, TableNode,
+    TableRowNode,
+    TableSelection,
+} from "@lexical/table";
 import {$getParentOfType} from "./nodes";
 import {$getNodeFromSelection} from "./selection";
 import {formatSizeValue} from "./dom";
 import {TableMap} from "./table-map";
-import {$isCustomTableRowNode, CustomTableRowNode} from "../nodes/custom-table-row";
 
-function $getTableFromCell(cell: CustomTableCellNode): CustomTableNode|null {
-    return $getParentOfType(cell, $isCustomTableNode) as CustomTableNode|null;
+function $getTableFromCell(cell: TableCellNode): TableNode|null {
+    return $getParentOfType(cell, $isTableNode) as TableNode|null;
 }
 
 export function getTableColumnWidths(table: HTMLTableElement): string[] {
@@ -55,7 +59,7 @@ function extractWidthFromElement(element: HTMLElement): string {
     return width || '';
 }
 
-export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number, width: number|string): void {
+export function $setTableColumnWidth(node: TableNode, columnIndex: number, width: number|string): void {
     const rows = node.getChildren() as TableRowNode[];
     let maxCols = 0;
     for (const row of rows) {
@@ -78,7 +82,7 @@ export function $setTableColumnWidth(node: CustomTableNode, columnIndex: number,
     node.setColWidths(colWidths);
 }
 
-export function $getTableColumnWidth(editor: LexicalEditor, node: CustomTableNode, columnIndex: number): number {
+export function $getTableColumnWidth(editor: LexicalEditor, node: TableNode, columnIndex: number): number {
     const colWidths = node.getColWidths();
     if (colWidths.length > columnIndex && colWidths[columnIndex].endsWith('px')) {
         return Number(colWidths[columnIndex].replace('px', ''));
@@ -97,14 +101,14 @@ export function $getTableColumnWidth(editor: LexicalEditor, node: CustomTableNod
     return 0;
 }
 
-function $getCellColumnIndex(node: CustomTableCellNode): number {
+function $getCellColumnIndex(node: TableCellNode): number {
     const row = node.getParent();
     if (!$isTableRowNode(row)) {
         return -1;
     }
 
     let index = 0;
-    const cells = row.getChildren<CustomTableCellNode>();
+    const cells = row.getChildren<TableCellNode>();
     for (const cell of cells) {
         let colSpan = cell.getColSpan() || 1;
         index += colSpan;
@@ -116,7 +120,7 @@ function $getCellColumnIndex(node: CustomTableCellNode): number {
     return index - 1;
 }
 
-export function $setTableCellColumnWidth(cell: CustomTableCellNode, width: string): void {
+export function $setTableCellColumnWidth(cell: TableCellNode, width: string): void {
     const table = $getTableFromCell(cell)
     const index = $getCellColumnIndex(cell);
 
@@ -125,7 +129,7 @@ export function $setTableCellColumnWidth(cell: CustomTableCellNode, width: strin
     }
 }
 
-export function $getTableCellColumnWidth(editor: LexicalEditor, cell: CustomTableCellNode): string {
+export function $getTableCellColumnWidth(editor: LexicalEditor, cell: TableCellNode): string {
     const table = $getTableFromCell(cell)
     const index = $getCellColumnIndex(cell);
     if (!table) {
@@ -136,13 +140,13 @@ export function $getTableCellColumnWidth(editor: LexicalEditor, cell: CustomTabl
     return (widths.length > index) ? widths[index] : '';
 }
 
-export function $getTableCellsFromSelection(selection: BaseSelection|null): CustomTableCellNode[]  {
+export function $getTableCellsFromSelection(selection: BaseSelection|null): TableCellNode[]  {
     if ($isTableSelection(selection)) {
         const nodes = selection.getNodes();
-        return nodes.filter(n => $isCustomTableCellNode(n));
+        return nodes.filter(n => $isTableCellNode(n));
     }
 
-    const cell = $getNodeFromSelection(selection, $isCustomTableCellNode) as CustomTableCellNode;
+    const cell = $getNodeFromSelection(selection, $isTableCellNode) as TableCellNode;
     return cell ? [cell] : [];
 }
 
@@ -193,12 +197,12 @@ export function $mergeTableCellsInSelection(selection: TableSelection): void {
     firstCell.setRowSpan(newHeight);
 }
 
-export function $getTableRowsFromSelection(selection: BaseSelection|null): CustomTableRowNode[] {
+export function $getTableRowsFromSelection(selection: BaseSelection|null): TableRowNode[] {
     const cells = $getTableCellsFromSelection(selection);
-    const rowsByKey: Record<string, CustomTableRowNode> = {};
+    const rowsByKey: Record<string, TableRowNode> = {};
     for (const cell of cells) {
         const row = cell.getParent();
-        if ($isCustomTableRowNode(row)) {
+        if ($isTableRowNode(row)) {
             rowsByKey[row.getKey()] = row;
         }
     }
@@ -206,28 +210,28 @@ export function $getTableRowsFromSelection(selection: BaseSelection|null): Custo
     return Object.values(rowsByKey);
 }
 
-export function $getTableFromSelection(selection: BaseSelection|null): CustomTableNode|null {
+export function $getTableFromSelection(selection: BaseSelection|null): TableNode|null {
     const cells = $getTableCellsFromSelection(selection);
     if (cells.length === 0) {
         return null;
     }
 
-    const table = $getParentOfType(cells[0], $isCustomTableNode);
-    if ($isCustomTableNode(table)) {
+    const table = $getParentOfType(cells[0], $isTableNode);
+    if ($isTableNode(table)) {
         return table;
     }
 
     return null;
 }
 
-export function $clearTableSizes(table: CustomTableNode): void {
+export function $clearTableSizes(table: TableNode): void {
     table.setColWidths([]);
 
     // TODO - Extra form things once table properties and extra things
     //   are supported
 
     for (const row of table.getChildren()) {
-        if (!$isCustomTableRowNode(row)) {
+        if (!$isTableRowNode(row)) {
             continue;
         }
 
@@ -236,7 +240,7 @@ export function $clearTableSizes(table: CustomTableNode): void {
         rowStyles.delete('width');
         row.setStyles(rowStyles);
 
-        const cells = row.getChildren().filter(c => $isCustomTableCellNode(c));
+        const cells = row.getChildren().filter(c => $isTableCellNode(c));
         for (const cell of cells) {
             const cellStyles = cell.getStyles();
             cellStyles.delete('height');
@@ -247,23 +251,21 @@ export function $clearTableSizes(table: CustomTableNode): void {
     }
 }
 
-export function $clearTableFormatting(table: CustomTableNode): void {
+export function $clearTableFormatting(table: TableNode): void {
     table.setColWidths([]);
     table.setStyles(new Map);
 
     for (const row of table.getChildren()) {
-        if (!$isCustomTableRowNode(row)) {
+        if (!$isTableRowNode(row)) {
             continue;
         }
 
         row.setStyles(new Map);
-        row.setFormat('');
 
-        const cells = row.getChildren().filter(c => $isCustomTableCellNode(c));
+        const cells = row.getChildren().filter(c => $isTableCellNode(c));
         for (const cell of cells) {
             cell.setStyles(new Map);
             cell.clearWidth();
-            cell.setFormat('');
         }
     }
 }
@@ -272,14 +274,14 @@ export function $clearTableFormatting(table: CustomTableNode): void {
  * Perform the given callback for each cell in the given table.
  * Returning false from the callback stops the function early.
  */
-export function $forEachTableCell(table: CustomTableNode, callback: (c: CustomTableCellNode) => void|false): void {
+export function $forEachTableCell(table: TableNode, callback: (c: TableCellNode) => void|false): void {
     outer: for (const row of table.getChildren()) {
-        if (!$isCustomTableRowNode(row)) {
+        if (!$isTableRowNode(row)) {
             continue;
         }
         const cells = row.getChildren();
         for (const cell of cells) {
-            if (!$isCustomTableCellNode(cell)) {
+            if (!$isTableCellNode(cell)) {
                 return;
             }
             const result = callback(cell);
@@ -290,10 +292,10 @@ export function $forEachTableCell(table: CustomTableNode, callback: (c: CustomTa
     }
 }
 
-export function $getCellPaddingForTable(table: CustomTableNode): string {
+export function $getCellPaddingForTable(table: TableNode): string {
     let padding: string|null = null;
 
-    $forEachTableCell(table, (cell: CustomTableCellNode) => {
+    $forEachTableCell(table, (cell: TableCellNode) => {
         const cellPadding = cell.getStyles().get('padding') || ''
         if (padding === null) {
             padding = cellPadding;

From 9fdd100f2d989ddc30d9cbad4dadb1b98096edaf Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 4 Dec 2024 18:53:59 +0000
Subject: [PATCH 396/666] Lexical: Reorganised custom node code into lexical
 codebase

Also cleaned up old unused imports.
---
 resources/js/wysiwyg/index.ts                    |  2 +-
 .../js/wysiwyg/lexical/core/LexicalMutations.ts  |  1 -
 .../js/wysiwyg/lexical/core/LexicalReconciler.ts | 12 ++++++------
 .../core/__tests__/unit/LexicalEditor.test.ts    |  1 -
 .../lexical/core/nodes/CommonBlockNode.ts        | 13 ++++++++++---
 .../lexical/core/nodes/LexicalElementNode.ts     |  4 ++--
 .../lexical/core/nodes/LexicalParagraphNode.ts   |  6 +++---
 .../nodes/__tests__/unit/LexicalTabNode.test.ts  | 10 +---------
 .../nodes/__tests__/unit/LexicalTextNode.test.ts |  2 --
 .../_common.ts => lexical/core/nodes/common.ts}  | 13 +++----------
 .../js/wysiwyg/lexical/list/LexicalListNode.ts   |  2 +-
 resources/js/wysiwyg/lexical/readme.md           |  2 +-
 .../rich-text/LexicalCalloutNode.ts}             |  4 ++--
 .../rich-text/LexicalCodeBlockNode.ts}           |  6 +++---
 .../rich-text/LexicalDetailsNode.ts}             |  4 ++--
 .../rich-text/LexicalDiagramNode.ts}             |  4 ++--
 .../lexical/rich-text/LexicalHeadingNode.ts      |  7 +++----
 .../rich-text/LexicalHorizontalRuleNode.ts}      |  0
 .../rich-text/LexicalImageNode.ts}               |  4 ++--
 .../rich-text/LexicalMediaNode.ts}               |  8 ++++----
 .../lexical/rich-text/LexicalQuoteNode.ts        | 10 ++++------
 .../lexical/table/LexicalTableCellNode.ts        |  2 +-
 .../js/wysiwyg/lexical/table/LexicalTableNode.ts | 10 +++++-----
 .../table/LexicalTableSelectionHelpers.ts        |  2 --
 .../js/wysiwyg/{nodes/index.ts => nodes.ts}      | 16 ++++++++--------
 .../js/wysiwyg/services/drop-paste-handling.ts   |  2 +-
 .../js/wysiwyg/services/keyboard-handling.ts     |  4 ++--
 resources/js/wysiwyg/ui/decorators/code-block.ts |  4 ++--
 resources/js/wysiwyg/ui/decorators/diagram.ts    |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/alignments.ts |  4 ++--
 .../wysiwyg/ui/defaults/buttons/block-formats.ts |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts    | 15 +++++++--------
 .../js/wysiwyg/ui/defaults/forms/objects.ts      |  9 ++++-----
 resources/js/wysiwyg/ui/defaults/forms/tables.ts |  4 ++--
 .../wysiwyg/ui/framework/helpers/node-resizer.ts |  6 +++---
 resources/js/wysiwyg/ui/framework/manager.ts     |  2 +-
 resources/js/wysiwyg/utils/diagrams.ts           |  4 ++--
 resources/js/wysiwyg/utils/formats.ts            |  4 ++--
 resources/js/wysiwyg/utils/images.ts             |  2 +-
 resources/js/wysiwyg/utils/nodes.ts              |  2 +-
 resources/js/wysiwyg/utils/selection.ts          |  2 +-
 41 files changed, 97 insertions(+), 116 deletions(-)
 rename resources/js/wysiwyg/{nodes/_common.ts => lexical/core/nodes/common.ts} (89%)
 rename resources/js/wysiwyg/{nodes/callout.ts => lexical/rich-text/LexicalCalloutNode.ts} (98%)
 rename resources/js/wysiwyg/{nodes/code-block.ts => lexical/rich-text/LexicalCodeBlockNode.ts} (97%)
 rename resources/js/wysiwyg/{nodes/details.ts => lexical/rich-text/LexicalDetailsNode.ts} (97%)
 rename resources/js/wysiwyg/{nodes/diagram.ts => lexical/rich-text/LexicalDiagramNode.ts} (97%)
 rename resources/js/wysiwyg/{nodes/horizontal-rule.ts => lexical/rich-text/LexicalHorizontalRuleNode.ts} (100%)
 rename resources/js/wysiwyg/{nodes/image.ts => lexical/rich-text/LexicalImageNode.ts} (98%)
 rename resources/js/wysiwyg/{nodes/media.ts => lexical/rich-text/LexicalMediaNode.ts} (97%)
 rename resources/js/wysiwyg/{nodes/index.ts => nodes.ts} (78%)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index c4403773bf2..9066b402f33 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,4 +1,4 @@
-import {$getSelection, createEditor, CreateEditorArgs, isCurrentlyReadOnlyMode, LexicalEditor} from 'lexical';
+import {$getSelection, createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
diff --git a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
index c24dc9ebb3c..80645205679 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalMutations.ts
@@ -16,7 +16,6 @@ import {
   $getSelection,
   $isDecoratorNode,
   $isElementNode,
-  $isRangeSelection,
   $isTextNode,
   $setSelection,
 } from '.';
diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
index 7843027d713..fccf1ae23a8 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -29,12 +29,12 @@ import {
 import {
   DOUBLE_LINE_BREAK,
   FULL_RECONCILE,
-  IS_ALIGN_CENTER,
-  IS_ALIGN_END,
-  IS_ALIGN_JUSTIFY,
-  IS_ALIGN_LEFT,
-  IS_ALIGN_RIGHT,
-  IS_ALIGN_START,
+
+
+
+
+
+
 } from './LexicalConstants';
 import {EditorState} from './LexicalEditorState';
 import {
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index f3c6f710509..28a203100c4 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -47,7 +47,6 @@ import {
 import invariant from 'lexical/shared/invariant';
 
 import {
-  $createTestDecoratorNode,
   $createTestElementNode,
   $createTestInlineElementNode,
   createTestEditor,
diff --git a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
index bf4fc08ca60..572c9448b0c 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/CommonBlockNode.ts
@@ -1,8 +1,15 @@
-import {ElementNode} from "./LexicalElementNode";
-import {CommonBlockAlignment, SerializedCommonBlockNode} from "../../../nodes/_common";
+import {ElementNode, type SerializedElementNode} from "./LexicalElementNode";
+import {CommonBlockAlignment, CommonBlockInterface} from "./common";
+import {Spread} from "lexical";
 
 
-export class CommonBlockNode extends ElementNode {
+export type SerializedCommonBlockNode = Spread<{
+    id: string;
+    alignment: CommonBlockAlignment;
+    inset: number;
+}, SerializedElementNode>
+
+export class CommonBlockNode extends ElementNode implements CommonBlockInterface {
     __id: string = '';
     __alignment: CommonBlockAlignment = '';
     __inset: number = 0;
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 002d825d6ea..9624af67e7e 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -19,8 +19,8 @@ import invariant from 'lexical/shared/invariant';
 import {$isTextNode, TextNode} from '../index';
 import {
   DOUBLE_LINE_BREAK,
-  ELEMENT_FORMAT_TO_TYPE,
-  ELEMENT_TYPE_TO_FORMAT,
+
+
 } from '../LexicalConstants';
 import {LexicalNode} from '../LexicalNode';
 import {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index 6517d939eda..f6f57c91c75 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -29,10 +29,10 @@ import {
 import {$isTextNode} from './LexicalTextNode';
 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,
-  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  setCommonBlockPropsFromElement,
   updateElementWithCommonBlockProps
-} from "../../../nodes/_common";
-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+} from "./common";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 
 export type SerializedParagraphNode = Spread<
   {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
index 9831114340d..d1ba5359752 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTabNode.test.ts
@@ -10,21 +10,14 @@ import {
   $insertDataTransferForPlainText,
   $insertDataTransferForRichText,
 } from '@lexical/clipboard';
-import {$createListItemNode, $createListNode} from '@lexical/list';
-import {registerRichText} from '@lexical/rich-text';
 import {
   $createParagraphNode,
-  $createRangeSelection,
   $createTabNode,
-  $createTextNode,
   $getRoot,
   $getSelection,
   $insertNodes,
-  $isElementNode,
   $isRangeSelection,
-  $isTextNode,
-  $setSelection,
-  KEY_TAB_COMMAND,
+
 } from 'lexical';
 
 import {
@@ -32,7 +25,6 @@ import {
   initializeUnitTest,
   invariant,
 } from '../../../__tests__/utils';
-import {$createHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 describe('LexicalTabNode tests', () => {
   initializeUnitTest((testEnv) => {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index b1ea099ac1e..c54760ff242 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -41,9 +41,7 @@ import {
   $setCompositionKey,
   getEditorStateTextContent,
 } from '../../../LexicalUtils';
-import {Text} from "@codemirror/state";
 import {$generateHtmlFromNodes} from "@lexical/html";
-import {formatBold} from "@lexical/selection/__tests__/utils";
 
 const editorConfig = Object.freeze({
   namespace: '',
diff --git a/resources/js/wysiwyg/nodes/_common.ts b/resources/js/wysiwyg/lexical/core/nodes/common.ts
similarity index 89%
rename from resources/js/wysiwyg/nodes/_common.ts
rename to resources/js/wysiwyg/lexical/core/nodes/common.ts
index 71849bb4589..eac9c829595 100644
--- a/resources/js/wysiwyg/nodes/_common.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/common.ts
@@ -1,18 +1,11 @@
-import {LexicalNode, Spread} from "lexical";
-import type {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
-import {el, sizeToPixels} from "../utils/dom";
+import {sizeToPixels} from "../../../utils/dom";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
 
 type EditorNodeDirection = 'ltr' | 'rtl' | null;
 
-export type SerializedCommonBlockNode = Spread<{
-    id: string;
-    alignment: CommonBlockAlignment;
-    inset: number;
-}, SerializedElementNode>
-
 export interface NodeHasAlignment {
     readonly __alignment: CommonBlockAlignment;
     setAlignment(alignment: CommonBlockAlignment): void;
@@ -37,7 +30,7 @@ export interface NodeHasDirection {
     getDirection(): EditorNodeDirection;
 }
 
-interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset, NodeHasDirection {}
+export interface CommonBlockInterface extends NodeHasId, NodeHasAlignment, NodeHasInset, NodeHasDirection {}
 
 export function extractAlignmentFromElement(element: HTMLElement): CommonBlockAlignment {
     const textAlignStyle: string = element.style.textAlign || '';
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
index 138c895e6b8..6edf0d64a2e 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -36,7 +36,7 @@ import {
   updateChildrenListItemValue,
 } from './formatList';
 import {$getListDepth, $wrapInListItem} from './utils';
-import {extractDirectionFromElement} from "../../nodes/_common";
+import {extractDirectionFromElement} from "lexical/nodes/common";
 
 export type SerializedListNode = Spread<
   {
diff --git a/resources/js/wysiwyg/lexical/readme.md b/resources/js/wysiwyg/lexical/readme.md
index 31db8fab1ca..24440ec8077 100644
--- a/resources/js/wysiwyg/lexical/readme.md
+++ b/resources/js/wysiwyg/lexical/readme.md
@@ -9,4 +9,4 @@ Only components used, or intended to be used, were copied in at this point.
 The original work built upon in this directory and below is under the copyright of Meta Platforms, Inc. and affiliates.
 The original license can be seen in the [ORIGINAL-LEXICAL-LICENSE](./ORIGINAL-LEXICAL-LICENSE) file.
 
-Files may have since been modified with modifications being under the license and copyright of the BookStack project as a whole. 
\ No newline at end of file
+Files may have since been added or modified with changes being under the license and copyright of the BookStack project as a whole. 
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes/callout.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
similarity index 98%
rename from resources/js/wysiwyg/nodes/callout.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
index cfe32ec854c..6f97ba751ff 100644
--- a/resources/js/wysiwyg/nodes/callout.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCalloutNode.ts
@@ -11,10 +11,10 @@ import type {EditorConfig} from "lexical/LexicalEditor";
 import type {RangeSelection} from "lexical/LexicalSelection";
 import {
     CommonBlockAlignment, commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
-} from "./_common";
+} from "lexical/nodes/common";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 
 export type CalloutCategory = 'info' | 'danger' | 'warning' | 'success';
 
diff --git a/resources/js/wysiwyg/nodes/code-block.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/code-block.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index 76c17197111..cbe69184887 100644
--- a/resources/js/wysiwyg/nodes/code-block.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -8,9 +8,9 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {CodeEditor} from "../../components";
-import {el} from "../utils/dom";
+import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
+import {CodeEditor} from "../../../components";
+import {el} from "../../utils/dom";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
diff --git a/resources/js/wysiwyg/nodes/details.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/details.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index de87696f345..178b0d9531d 100644
--- a/resources/js/wysiwyg/nodes/details.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -8,8 +8,8 @@ import {
     EditorConfig,
 } from 'lexical';
 
-import {el} from "../utils/dom";
-import {extractDirectionFromElement} from "./_common";
+import {el} from "../../utils/dom";
+import {extractDirectionFromElement} from "lexical/nodes/common";
 
 export type SerializedDetailsNode = Spread<{
     id: string;
diff --git a/resources/js/wysiwyg/nodes/diagram.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/diagram.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
index bd37b200c80..e69f97848ac 100644
--- a/resources/js/wysiwyg/nodes/diagram.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
@@ -8,8 +8,8 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {EditorDecoratorAdapter} from "../ui/framework/decorator";
-import {el} from "../utils/dom";
+import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
+import {el} from "../../utils/dom";
 
 export type SerializedDiagramNode = Spread<{
     id: string;
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
index 0f30263ba0e..30563c09d5a 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalHeadingNode.ts
@@ -11,16 +11,15 @@ import {
     type NodeKey,
     type ParagraphNode,
     type RangeSelection,
-    type SerializedElementNode,
     type Spread
 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";
-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
-} from "../../nodes/_common";
+} from "lexical/nodes/common";
 
 export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 
diff --git a/resources/js/wysiwyg/nodes/horizontal-rule.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalHorizontalRuleNode.ts
similarity index 100%
rename from resources/js/wysiwyg/nodes/horizontal-rule.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalHorizontalRuleNode.ts
diff --git a/resources/js/wysiwyg/nodes/image.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
similarity index 98%
rename from resources/js/wysiwyg/nodes/image.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
index b6d362b62c9..9f42ad73204 100644
--- a/resources/js/wysiwyg/nodes/image.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
@@ -6,8 +6,8 @@ import {
     Spread
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
-import {CommonBlockAlignment, extractAlignmentFromElement} from "./_common";
-import {$selectSingleNode} from "../utils/selection";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";
+import {$selectSingleNode} from "../../utils/selection";
 import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {
diff --git a/resources/js/wysiwyg/nodes/media.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
similarity index 97%
rename from resources/js/wysiwyg/nodes/media.ts
rename to resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 64fe8f77b4d..a675665ac14 100644
--- a/resources/js/wysiwyg/nodes/media.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -8,14 +8,14 @@ import {
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
-import {el, setOrRemoveAttribute, sizeToPixels} from "../utils/dom";
+import {el, setOrRemoveAttribute, sizeToPixels} from "../../utils/dom";
 import {
     CommonBlockAlignment, deserializeCommonBlockNode,
-    SerializedCommonBlockNode,
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
-} from "./_common";
-import {$selectSingleNode} from "../utils/selection";
+} from "lexical/nodes/common";
+import {$selectSingleNode} from "../../utils/selection";
+import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
index 53caca80115..f0d97fe9806 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalQuoteNode.ts
@@ -5,22 +5,20 @@ import {
     type DOMConversionOutput,
     type DOMExportOutput,
     type EditorConfig,
-    ElementNode,
     isHTMLElement,
     type LexicalEditor,
     LexicalNode,
     type NodeKey,
     type ParagraphNode,
-    type RangeSelection,
-    SerializedElementNode
+    type RangeSelection
 } from "lexical";
 import {addClassNamesToElement} from "@lexical/utils";
-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 import {
     commonPropertiesDifferent, deserializeCommonBlockNode,
-    SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+    setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
-} from "../../nodes/_common";
+} from "lexical/nodes/common";
 
 export type SerializedQuoteNode = SerializedCommonBlockNode;
 
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
index 72676b9bacb..1fc6b42bbeb 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -29,7 +29,7 @@ import {
 } from 'lexical';
 
 import {extractStyleMapFromElement, StyleMap} from "../../utils/dom";
-import {CommonBlockAlignment, extractAlignmentFromElement} from "../../nodes/_common";
+import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";
 
 export const TableCellHeaderStates = {
   BOTH: 3,
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index ab163005370..9443747a6f7 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -15,25 +15,25 @@ import {
   LexicalEditor,
   LexicalNode,
   NodeKey,
-  SerializedElementNode, Spread,
+  Spread,
 } from 'lexical';
 
 import {addClassNamesToElement, isHTMLElement} from '@lexical/utils';
 import {
   $applyNodeReplacement,
   $getNearestNodeFromDOMNode,
-  ElementNode,
+
 } from 'lexical';
 
 import {$isTableCellNode} from './LexicalTableCellNode';
 import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
 import {getTable} from './LexicalTableSelectionHelpers';
-import {CommonBlockNode, copyCommonBlockProperties} from "lexical/nodes/CommonBlockNode";
+import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 import {
   commonPropertiesDifferent, deserializeCommonBlockNode,
-  SerializedCommonBlockNode, setCommonBlockPropsFromElement,
+  setCommonBlockPropsFromElement,
   updateElementWithCommonBlockProps
-} from "../../nodes/_common";
+} from "lexical/nodes/common";
 import {el, extractStyleMapFromElement, StyleMap} from "../../utils/dom";
 import {getTableColumnWidths} from "../../utils/tables";
 
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index 6c3317c5dfa..e098a21e498 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -16,7 +16,6 @@ import type {
 } from './LexicalTableSelection';
 import type {
   BaseSelection,
-  ElementFormatType,
   LexicalCommand,
   LexicalEditor,
   LexicalNode,
@@ -50,7 +49,6 @@ import {
   DELETE_LINE_COMMAND,
   DELETE_WORD_COMMAND,
   FOCUS_COMMAND,
-  FORMAT_ELEMENT_COMMAND,
   FORMAT_TEXT_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
   KEY_ARROW_DOWN_COMMAND,
diff --git a/resources/js/wysiwyg/nodes/index.ts b/resources/js/wysiwyg/nodes.ts
similarity index 78%
rename from resources/js/wysiwyg/nodes/index.ts
rename to resources/js/wysiwyg/nodes.ts
index 03213e2629a..eb836bdce02 100644
--- a/resources/js/wysiwyg/nodes/index.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -1,4 +1,4 @@
-import {CalloutNode} from './callout';
+import {CalloutNode} from '@lexical/rich-text/LexicalCalloutNode';
 import {
     ElementNode,
     KlassConstructor,
@@ -7,15 +7,15 @@ import {
     ParagraphNode
 } from "lexical";
 import {LinkNode} from "@lexical/link";
-import {ImageNode} from "./image";
-import {DetailsNode, SummaryNode} from "./details";
+import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {DetailsNode, SummaryNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
-import {HorizontalRuleNode} from "./horizontal-rule";
-import {CodeBlockNode} from "./code-block";
-import {DiagramNode} from "./diagram";
-import {EditorUiContext} from "../ui/framework/core";
-import {MediaNode} from "./media";
+import {HorizontalRuleNode} from "@lexical/rich-text/LexicalHorizontalRuleNode";
+import {CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
+import {EditorUiContext} from "./ui/framework/core";
+import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index e049d5e7c9e..2ee831d74fc 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -8,7 +8,7 @@ import {
 import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
 import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";
-import {$createImageNode} from "../nodes/image";
+import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 5f7f41ef02c..6a1345fac6d 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -10,8 +10,8 @@ import {
     LexicalEditor,
     LexicalNode
 } from "lexical";
-import {$isImageNode} from "../nodes/image";
-import {$isMediaNode} from "../nodes/media";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {getLastSelection} from "../utils/selection";
 import {$getNearestNodeBlockParent} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/code-block.ts
index 37d3df588c3..daae32e1982 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/code-block.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
-import {$openCodeEditorForNode, CodeBlockNode} from "../../nodes/code-block";
-import {$isDecoratorNode, BaseSelection} from "lexical";
+import {$openCodeEditorForNode, CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {BaseSelection} from "lexical";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 
 
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index 44d332939e8..d53bcb482ec 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,7 +1,7 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
 import {BaseSelection} from "lexical";
-import {DiagramNode} from "../../nodes/diagram";
+import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 import {$openDrawingEditorForNode} from "../../utils/diagrams";
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index f0f46ddc674..98edf44b3b9 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -9,9 +9,9 @@ import ltrIcon from "@icons/editor/direction-ltr.svg";
 import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
     $getBlockElementNodesInSelection,
-    $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, $toggleSelection, getLastSelection
+    $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, getLastSelection
 } from "../../../utils/selection";
-import {CommonBlockAlignment} from "../../../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";
 import {nodeHasAlignment} from "../../../utils/nodes";
 
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
index e0d1e7077fa..b36fd1c4f0c 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/block-formats.ts
@@ -1,4 +1,4 @@
-import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "../../../nodes/callout";
+import {$createCalloutNode, $isCalloutNodeOfCategory, CalloutCategory} from "@lexical/rich-text/LexicalCalloutNode";
 import {EditorButtonDefinition} from "../../framework/buttons";
 import {EditorUiContext} from "../../framework/core";
 import {$isParagraphNode, BaseSelection, LexicalNode} from "lexical";
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index fd95f9f35d2..f9c029ff14c 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -2,27 +2,26 @@ import {EditorButtonDefinition} from "../../framework/buttons";
 import linkIcon from "@icons/editor/link.svg";
 import {EditorUiContext} from "../../framework/core";
 import {
-    $createTextNode,
     $getRoot,
     $getSelection, $insertNodes,
     BaseSelection,
-    ElementNode, isCurrentlyReadOnlyMode
+    ElementNode
 } from "lexical";
 import {$isLinkNode, LinkNode} from "@lexical/link";
 import unlinkIcon from "@icons/editor/unlink.svg";
 import imageIcon from "@icons/editor/image.svg";
-import {$isImageNode, ImageNode} from "../../../nodes/image";
+import {$isImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
 import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg";
-import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../../nodes/horizontal-rule";
+import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "@lexical/rich-text/LexicalHorizontalRuleNode";
 import codeBlockIcon from "@icons/editor/code-block.svg";
-import {$isCodeBlockNode} from "../../../nodes/code-block";
+import {$isCodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
 import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
-import {$createDiagramNode, DiagramNode} from "../../../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import detailsIcon from "@icons/editor/details.svg";
 import mediaIcon from "@icons/editor/media.svg";
-import {$createDetailsNode, $isDetailsNode} from "../../../nodes/details";
-import {$isMediaNode, MediaNode} from "../../../nodes/media";
+import {$createDetailsNode, $isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {$isMediaNode, MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {
     $getNodeFromSelection,
     $insertNewBlockNodeAtSelection,
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 228566d442e..f00a08bb5f5 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -5,11 +5,10 @@ import {
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
-import {$createNodeSelection, $createTextNode, $getSelection, $insertNodes, $setSelection} from "lexical";
-import {$isImageNode, ImageNode} from "../../../nodes/image";
-import {$createLinkNode, $isLinkNode, LinkNode} from "@lexical/link";
-import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "../../../nodes/media";
-import {$insertNodeToNearestRoot} from "@lexical/utils";
+import {$createNodeSelection, $getSelection, $insertNodes, $setSelection} from "lexical";
+import {$isImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {LinkNode} from "@lexical/link";
+import {$createMediaNodeFromHtml, $createMediaNodeFromSrc, $isMediaNode, MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {$getNodeFromSelection, getLastSelection} from "../../../utils/selection";
 import {EditorFormModal} from "../../framework/modals";
 import {EditorActionField} from "../../framework/blocks/action-field";
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 3cfe9592ccb..63fa24c800f 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -6,7 +6,7 @@ import {
 } from "../../framework/forms";
 import {EditorUiContext} from "../../framework/core";
 import {EditorFormModal} from "../../framework/modals";
-import {$getSelection, ElementFormatType} from "lexical";
+import {$getSelection} from "lexical";
 import {
     $forEachTableCell, $getCellPaddingForTable,
     $getTableCellColumnWidth,
@@ -16,7 +16,7 @@ import {
 } from "../../../utils/tables";
 import {formatSizeValue} from "../../../utils/dom";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
-import {CommonBlockAlignment} from "../../../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index 2e4f2939ca2..fa8ff48be56 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -1,10 +1,10 @@
 import {BaseSelection, LexicalNode,} from "lexical";
 import {MouseDragTracker, MouseDragTrackerDistance} from "./mouse-drag-tracker";
 import {el} from "../../../utils/dom";
-import {$isImageNode} from "../../../nodes/image";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {EditorUiContext} from "../core";
-import {NodeHasSize} from "../../../nodes/_common";
-import {$isMediaNode} from "../../../nodes/media";
+import {NodeHasSize} from "lexical/nodes/common";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 
 function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
     return $isImageNode(node) || $isMediaNode(node);
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 7c0975da7e7..185cd5dccd0 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,7 +1,7 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
-import {$getSelection, BaseSelection, COMMAND_PRIORITY_LOW, LexicalEditor, SELECTION_CHANGE_COMMAND} from "lexical";
+import {BaseSelection, LexicalEditor} from "lexical";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
diff --git a/resources/js/wysiwyg/utils/diagrams.ts b/resources/js/wysiwyg/utils/diagrams.ts
index fb5543005c2..ffd8e603b99 100644
--- a/resources/js/wysiwyg/utils/diagrams.ts
+++ b/resources/js/wysiwyg/utils/diagrams.ts
@@ -1,8 +1,8 @@
-import {$getSelection, $insertNodes, LexicalEditor, LexicalNode} from "lexical";
+import {$insertNodes, LexicalEditor, LexicalNode} from "lexical";
 import {HttpError} from "../../services/http";
 import {EditorUiContext} from "../ui/framework/core";
 import * as DrawIO from "../../services/drawio";
-import {$createDiagramNode, DiagramNode} from "../nodes/diagram";
+import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import {ImageManager} from "../../components";
 import {EditorImageData} from "./images";
 import {$getNodeFromSelection, getLastSelection} from "./selection";
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index 1be802ebf1c..a5f06f147d2 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -14,8 +14,8 @@ import {
     $toggleSelectionBlockNodeType,
     getLastSelection
 } from "./selection";
-import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "../nodes/code-block";
-import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "../nodes/callout";
+import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
+import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "@lexical/rich-text/LexicalCalloutNode";
 import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index 2c13427d967..85bae18e5e5 100644
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -1,5 +1,5 @@
 import {ImageManager} from "../../components";
-import {$createImageNode} from "../nodes/image";
+import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$createLinkNode, LinkNode} from "@lexical/link";
 
 export type EditorImageData = {
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 97634f96b4e..b5cc789550c 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -11,7 +11,7 @@ import {
 import {LexicalNodeMatcher} from "../nodes";
 import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
-import {NodeHasAlignment, NodeHasInset} from "../nodes/_common";
+import {NodeHasAlignment, NodeHasInset} from "lexical/nodes/common";
 import {$findMatchingParent} from "@lexical/utils";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 02838eba034..28e729e92ae 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -16,7 +16,7 @@ import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
 import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
-import {CommonBlockAlignment} from "../nodes/_common";
+import {CommonBlockAlignment} from "lexical/nodes/common";
 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
 

From d00cf6e1bac6165354f3b8a3a440f948941fe011 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 4 Dec 2024 20:03:05 +0000
Subject: [PATCH 397/666] Lexical: Updated tests for node changes

---
 .../__tests__/unit/HTMLCopyAndPaste.test.ts   |   4 +-
 .../core/__tests__/unit/LexicalEditor.test.ts |  18 +-
 .../__tests__/unit/LexicalEditorState.test.ts |  12 +-
 .../unit/LexicalSerialization.test.ts         |   4 +-
 .../__tests__/unit/LexicalElementNode.test.ts |   2 -
 .../unit/LexicalParagraphNode.test.ts         |  21 +-
 .../__tests__/unit/LexicalRootNode.test.ts    |   2 -
 .../unit/LexicalHeadlessEditor.test.ts        |   2 +-
 .../html/__tests__/unit/LexicalHtml.test.ts   |   4 +-
 .../unit/LexicalListItemNode.test.ts          | 554 ++++++++----------
 .../__tests__/unit/LexicalListNode.test.ts    |  19 -
 .../__tests__/unit/LexicalSelection.test.ts   |   6 +-
 .../__tests__/unit/LexicalTableNode.test.ts   |   5 +-
 .../unit/LexicalTableSelection.test.ts        |   8 +-
 .../unit/LexicalEventHelpers.test.ts          |  12 +-
 .../unit/LexicalUtilsSplitNode.test.ts        |   4 +-
 ...exlcaiUtilsInsertNodeToNearestRoot.test.ts |   4 +-
 17 files changed, 301 insertions(+), 380 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
index 534663a54b4..cdad252c92d 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/HTMLCopyAndPaste.test.ts
@@ -82,12 +82,12 @@ describe('HTMLCopyAndPaste tests', () => {
           pastedHTML: ` <span>123<div>456</div></span>`,
         },
         {
-          expectedHTML: `<ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li><li value="3"><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul></li><li role="checkbox" tabindex="-1" aria-checked="false" value="3"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul>`,
+          expectedHTML: `<ul><li class="task-list-item" checked="checked" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li class="task-list-item" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li><li value="3" style="list-style: none;"><ul><li class="task-list-item" checked="checked" value="1"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">done</span></li><li class="task-list-item" value="2"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul></li><li class="task-list-item" value="3"><span style="color: rgb(0, 0, 0);" data-lexical-text="true">todo</span></li></ul>`,
           name: 'google doc checklist',
           pastedHTML: `<meta charset='utf-8'><meta charset="utf-8"><b style="font-weight:normal;" id="docs-internal-guid-1980f960-7fff-f4df-4ba3-26c6e1508542"><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li><ul style="margin-top:0;margin-bottom:0;padding-inline-start:28px;"><li role="checkbox" aria-checked="true" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAABbElEQVR4Ae3bsU4CYRDEcRsxodZE8Q0BbS258l5MwESJNL6HOfrPKdhyxeBcwk5mkn9F98sGIOSuPM/zPM/zPI+xG/SEtuiAWpEOaIOWaDIWziP6RK14OzSjX44ITvTBvqRn1MRaMIHeBIE2TKBBEGhgArWkKmtJBjKQgQxkIANd/Aw0NVC+O7RHvYFynHasN1COE/UGynGiXgOIjxOtdIH4OGJAfBwxID6OGBAfRwiIjyMARMCpCjRF5+72Dzhd5R+rHfpC92NeTlWgLl5PkQg4RYBynBSJgFMGKMNJkQg4lYFeUDuFRMCpBXQOEgGnDtA/kPg4xT7m2y/tCd9zKgOdviTC5RQEIiAFjh4QASlw9IAISIEjCURAWvmf1UDKcQwUSDmOgWLdMcxA7BnIQAYykIEM5EcRvplAW0GgNRNoKQg0ZwJN0E4I5x1dI+pmgSSA84BG2QQt0LrYG/eAXtGccjme53me53me9wPjPWZWjhktAQAAAABJRU5ErkJggg==" width="18.4px" height="18.4px" alt="checked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:line-through;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">done</span></p></li><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="2"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul><li role="checkbox" aria-checked="false" style="list-style-type:none;font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;" aria-level="1"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAA1ElEQVR4Ae3bMQ4BURSFYY2xBuwQ7BIkTGxFRj9Oo9RdkXn5TvL3L19u+2ZmZmZmZhVbpH26pFcaJ9IrndMudb/CWadHGiden1bll9MIzqd79SUd0thY20qga4NA50qgoUGgoRJo/NL/V/N+QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEyFeEZyXQpUGgUyXQrkGgTSVQl/qGcG5pnkq3Sn0jOMv0k3Vpm05pmNjfsGPalFyOmZmZmdkbSS9cKbtzhxMAAAAASUVORK5CYII=" width="18.4px" height="18.4px" alt="unchecked" aria-roledescription="checkbox" style="margin-right:3px;" /><p style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;display:inline-block;vertical-align:top;margin-top:0;" role="presentation"><span style="font-size:11.5pt;font-family:'Optimistic Text',sans-serif;color:#000000;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">todo</span></p></li></ul></b>`,
         },
         {
-          expectedHTML: `<p style="text-align: start;"><span data-lexical-text="true">checklist</span></p><ul><li role="checkbox" tabindex="-1" aria-checked="true" value="1" style="text-align: start;"><span data-lexical-text="true">done</span></li><li role="checkbox" tabindex="-1" aria-checked="false" value="2" style="text-align: start;"><span data-lexical-text="true">todo</span></li></ul>`,
+          expectedHTML: `<p><span data-lexical-text="true">checklist</span></p><ul><li class="task-list-item" checked="checked" value="1"><span data-lexical-text="true">done</span></li><li class="task-list-item" value="2"><span data-lexical-text="true">todo</span></li></ul>`,
           name: 'github checklist',
           pastedHTML: `<meta charset='utf-8'><p dir="auto" style="box-sizing: border-box; margin-top: 0px !important; margin-bottom: 16px; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">checklist</p><ul class="contains-task-list" style="box-sizing: border-box; padding: 0px; margin-top: 0px; margin-bottom: 0px !important; position: relative; color: rgb(31, 35, 40); font-family: -apple-system, &quot;system-ui&quot;, &quot;Segoe UI&quot;, &quot;Noto Sans&quot;, Helvetica, Arial, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" checked="" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>done</li><li class="task-list-item enabled" style="box-sizing: border-box; list-style-type: none; margin-top: 0px; padding: 2px 15px 2px 42px; margin-right: -15px; margin-left: -15px; line-height: 1.5; border: 0px;"><span class="handle" style="box-sizing: border-box; display: block; float: left; width: 20px; padding: 2px 0px 0px 2px; margin-left: -43px; opacity: 0;"><svg class="drag-handle" aria-hidden="true" width="16" height="16"><path d="M10 13a1 1 0 100-2 1 1 0 000 2zm-4 0a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2zm1-5a1 1 0 11-2 0 1 1 0 012 0zM6 5a1 1 0 100-2 1 1 0 000 2z"></path></svg></span><input type="checkbox" id="" class="task-list-item-checkbox" style="box-sizing: border-box; font: inherit; margin: 0px 0.2em 0.25em -1.4em; overflow: visible; padding: 0px; vertical-align: middle;"><span></span>todo</li></ul>`,
         },
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index 28a203100c4..5d763291972 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -974,7 +974,7 @@ describe('LexicalEditor tests', () => {
       editable ? 'editable' : 'non-editable'
     })`, async () => {
       const JSON_EDITOR_STATE =
-        '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"123","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
+        '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"123","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"textStyle":""}],"direction":null,"type":"root","version":1}}';
       init();
       const contentEditable = editor.getRootElement();
       editor.setEditable(editable);
@@ -1047,8 +1047,6 @@ describe('LexicalEditor tests', () => {
           __cachedText: null,
           __dir: null,
           __first: paragraphKey,
-          __format: 0,
-          __indent: 0,
           __key: 'root',
           __last: paragraphKey,
           __next: null,
@@ -1059,10 +1057,11 @@ describe('LexicalEditor tests', () => {
           __type: 'root',
         });
         expect(parsedParagraph).toEqual({
+          "__alignment": "",
           __dir: null,
           __first: textKey,
-          __format: 0,
-          __indent: 0,
+          __id: '',
+          __inset: 0,
           __key: paragraphKey,
           __last: textKey,
           __next: null,
@@ -1070,7 +1069,6 @@ describe('LexicalEditor tests', () => {
           __prev: null,
           __size: 1,
           __style: '',
-          __textFormat: 0,
           __textStyle: '',
           __type: 'paragraph',
         });
@@ -1129,8 +1127,6 @@ describe('LexicalEditor tests', () => {
           __cachedText: null,
           __dir: null,
           __first: paragraphKey,
-          __format: 0,
-          __indent: 0,
           __key: 'root',
           __last: paragraphKey,
           __next: null,
@@ -1141,10 +1137,11 @@ describe('LexicalEditor tests', () => {
           __type: 'root',
         });
         expect(parsedParagraph).toEqual({
+          "__alignment": "",
           __dir: null,
           __first: textKey,
-          __format: 0,
-          __indent: 0,
+          __id: '',
+          __inset: 0,
           __key: paragraphKey,
           __last: textKey,
           __next: null,
@@ -1152,7 +1149,6 @@ describe('LexicalEditor tests', () => {
           __prev: null,
           __size: 1,
           __style: '',
-          __textFormat: 0,
           __textStyle: '',
           __type: 'paragraph',
         });
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
index 38ecf03bce2..97b63450323 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
@@ -54,8 +54,6 @@ describe('LexicalEditorState tests', () => {
         __cachedText: 'foo',
         __dir: null,
         __first: '1',
-        __format: 0,
-        __indent: 0,
         __key: 'root',
         __last: '1',
         __next: null,
@@ -66,10 +64,11 @@ describe('LexicalEditorState tests', () => {
         __type: 'root',
       });
       expect(paragraph).toEqual({
+        "__alignment": "",
         __dir: null,
         __first: '2',
-        __format: 0,
-        __indent: 0,
+        __id: '',
+        __inset: 0,
         __key: '1',
         __last: '2',
         __next: null,
@@ -77,7 +76,6 @@ describe('LexicalEditorState tests', () => {
         __prev: null,
         __size: 1,
         __style: '',
-        __textFormat: 0,
         __textStyle: '',
         __type: 'paragraph',
       });
@@ -113,7 +111,7 @@ describe('LexicalEditorState tests', () => {
       });
 
       expect(JSON.stringify(editor.getEditorState().toJSON())).toEqual(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"root","version":1}}`,
       );
     });
 
@@ -140,8 +138,6 @@ describe('LexicalEditorState tests', () => {
               __cachedText: '',
               __dir: null,
               __first: null,
-              __format: 0,
-              __indent: 0,
               __key: 'root',
               __last: null,
               __next: null,
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
index 81eff674a99..e08547c13b6 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -107,7 +107,7 @@ describe('LexicalSerialization tests', () => {
       });
 
       const stringifiedEditorState = JSON.stringify(editor.getEditorState());
-      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":null,"format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`;
+      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`;
 
       expect(stringifiedEditorState).toBe(expectedStringifiedEditorState);
 
@@ -116,7 +116,7 @@ describe('LexicalSerialization tests', () => {
       const otherStringifiedEditorState = JSON.stringify(editorState);
 
       expect(otherStringifiedEditorState).toBe(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"quote","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"listitem","version":1,"value":4}],"direction":null,"format":"","indent":0,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1},{"children":[{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1},{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1,"textFormat":0,"textStyle":""}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
index fb5c98f8a6c..6e3a3861ae5 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
@@ -84,8 +84,6 @@ describe('LexicalElementNode tests', () => {
         expect(node.exportJSON()).toStrictEqual({
           children: [],
           direction: null,
-          format: '',
-          indent: 0,
           type: 'test_block',
           version: 1,
         });
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
index 1f7c4cfc3a7..7bf485ca1d4 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
@@ -48,11 +48,11 @@ describe('LexicalParagraphNode tests', () => {
         // logic is in place in the corresponding importJSON  method
         // to accomodate these changes.
         expect(node.exportJSON()).toStrictEqual({
+          alignment: '',
           children: [],
           direction: null,
-          format: '',
-          indent: 0,
-          textFormat: 0,
+          id: '',
+          inset: 0,
           textStyle: '',
           type: 'paragraph',
           version: 1,
@@ -127,6 +127,21 @@ describe('LexicalParagraphNode tests', () => {
       });
     });
 
+    test('id is supported', async () => {
+      const {editor} = testEnv;
+      let paragraphNode: ParagraphNode;
+
+      await editor.update(() => {
+        paragraphNode = new ParagraphNode();
+        paragraphNode.setId('testid')
+        $getRoot().append(paragraphNode);
+      });
+
+      expect(testEnv.innerHTML).toBe(
+          '<p id="testid"><br></p>',
+      );
+    });
+
     test('$createParagraphNode()', async () => {
       const {editor} = testEnv;
 
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
index 123cb3375d6..7ef370f4ba7 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalRootNode.test.ts
@@ -77,8 +77,6 @@ describe('LexicalRootNode tests', () => {
         expect(node.exportJSON()).toStrictEqual({
           children: [],
           direction: null,
-          format: '',
-          indent: 0,
           type: 'root',
           version: 1,
         });
diff --git a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
index c4dedd47d13..122516d45b6 100644
--- a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
@@ -206,7 +206,7 @@ describe('LexicalHeadlessEditor', () => {
     cleanup();
 
     expect(html).toBe(
-      '<p>hello world</p>',
+      '<p dir="ltr">hello world</p>',
     );
   });
 });
diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
index a4e2d231389..e5064121ab5 100644
--- a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -176,7 +176,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p style="text-align: center;">Hello world!</p>',
+      '<p class="align-center">Hello world!</p>',
     );
   });
 
@@ -206,7 +206,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p style="text-align: center;">Hello world!</p>',
+      '<p class="align-center">Hello world!</p>',
     );
   });
 });
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index 523c7eb126e..567714bcd9f 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -62,7 +62,7 @@ describe('LexicalListItemNode tests', () => {
         expectHtmlToBeEqual(
           listItemNode.createDOM(editorConfig).outerHTML,
           html`
-            <li value="1" class="my-listItem-item-class"></li>
+            <li value="1"></li>
           `,
         );
 
@@ -90,7 +90,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li value="1" class="my-listItem-item-class"></li>
+              <li value="1"></li>
             `,
           );
           const newListItemNode = new ListItemNode();
@@ -106,7 +106,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li value="1" class="my-listItem-item-class"></li>
+              <li value="1"></li>
             `,
           );
         });
@@ -125,7 +125,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li value="1" class="my-listItem-item-class"></li>
+              <li value="1"></li>
             `,
           );
           const nestedListNode = new ListNode('bullet', 1);
@@ -142,7 +142,7 @@ describe('LexicalListItemNode tests', () => {
           expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
-              <li value="1" class="my-listItem-item-class my-nested-list-listItem-class"></li>
+              <li value="1" style="list-style: none;"></li>
             `,
           );
         });
@@ -486,53 +486,43 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="2">
-                  <span data-lexical-text="true">B</span>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="2">
+                <span data-lexical-text="true">B</span>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">B</span>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">B</span>
+              </li>
+            </ul>
           `,
         );
       });
@@ -566,53 +556,43 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <span data-lexical-text="true">A</span>
-                </li>
-                <li value="2">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="3">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1">
+                <span data-lexical-text="true">A</span>
+              </li>
+              <li value="2">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="3" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <span data-lexical-text="true">A</span>
-                </li>
-                <li value="2">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1">
+                <span data-lexical-text="true">A</span>
+              </li>
+              <li value="2" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
       });
@@ -650,57 +630,47 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="2">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="2" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                    <li value="2">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                  <li value="2">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
       });
@@ -746,71 +716,61 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A1</span>
-                    </li>
-                    <li value="2">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">A2</span>
-                        </li>
-                      </ul>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="2">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A1</span>
+                  </li>
+                  <li value="2" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">A2</span>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="2" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A1</span>
-                    </li>
-                    <li value="2">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">A2</span>
-                        </li>
-                      </ul>
-                    </li>
-                    <li value="2">
-                      <span data-lexical-text="true">B</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A1</span>
+                  </li>
+                  <li value="2" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">A2</span>
+                      </li>
+                    </ul>
+                  </li>
+                  <li value="2">
+                    <span data-lexical-text="true">B</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
       });
@@ -856,71 +816,61 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="2">
-                  <ul>
-                    <li value="1">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">B1</span>
-                        </li>
-                      </ul>
-                    </li>
-                    <li value="1">
-                      <span data-lexical-text="true">B2</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="2" style="list-style: none;">
+                <ul>
+                  <li value="1" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">B1</span>
+                      </li>
+                    </ul>
+                  </li>
+                  <li value="1">
+                    <span data-lexical-text="true">B2</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A</span>
-                    </li>
-                    <li value="2">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">B1</span>
-                        </li>
-                      </ul>
-                    </li>
-                    <li value="2">
-                      <span data-lexical-text="true">B2</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A</span>
+                  </li>
+                  <li value="2" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">B1</span>
+                      </li>
+                    </ul>
+                  </li>
+                  <li value="2">
+                    <span data-lexical-text="true">B2</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
       });
@@ -974,81 +924,71 @@ describe('LexicalListItemNode tests', () => {
         });
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A1</span>
-                    </li>
-                    <li value="2">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">A2</span>
-                        </li>
-                      </ul>
-                    </li>
-                  </ul>
-                </li>
-                <li value="1">
-                  <span data-lexical-text="true">x</span>
-                </li>
-                <li value="2">
-                  <ul>
-                    <li value="1">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">B1</span>
-                        </li>
-                      </ul>
-                    </li>
-                    <li value="1">
-                      <span data-lexical-text="true">B2</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A1</span>
+                  </li>
+                  <li value="2" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">A2</span>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+              <li value="1">
+                <span data-lexical-text="true">x</span>
+              </li>
+              <li value="2" style="list-style: none;">
+                <ul>
+                  <li value="1" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">B1</span>
+                      </li>
+                    </ul>
+                  </li>
+                  <li value="1">
+                    <span data-lexical-text="true">B2</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
 
         await editor.update(() => x.remove());
 
         expectHtmlToBeEqual(
-          testEnv.outerHTML,
+          testEnv.innerHTML,
           html`
-            <div
-              contenteditable="true"
-              style="user-select: text; white-space: pre-wrap; word-break: break-word;"
-              data-lexical-editor="true">
-              <ul>
-                <li value="1">
-                  <ul>
-                    <li value="1">
-                      <span data-lexical-text="true">A1</span>
-                    </li>
-                    <li value="2">
-                      <ul>
-                        <li value="1">
-                          <span data-lexical-text="true">A2</span>
-                        </li>
-                        <li value="2">
-                          <span data-lexical-text="true">B1</span>
-                        </li>
-                      </ul>
-                    </li>
-                    <li value="2">
-                      <span data-lexical-text="true">B2</span>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
+            <ul>
+              <li value="1" style="list-style: none;">
+                <ul>
+                  <li value="1">
+                    <span data-lexical-text="true">A1</span>
+                  </li>
+                  <li value="2" style="list-style: none;">
+                    <ul>
+                      <li value="1">
+                        <span data-lexical-text="true">A2</span>
+                      </li>
+                      <li value="2">
+                        <span data-lexical-text="true">B1</span>
+                      </li>
+                    </ul>
+                  </li>
+                  <li value="2">
+                    <span data-lexical-text="true">B2</span>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           `,
         );
       });
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
index 497e096b1c2..8c7729dbff1 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
@@ -294,24 +294,5 @@ describe('LexicalListNode tests', () => {
         expect(bulletList.__listType).toBe('bullet');
       });
     });
-
-    test('ListNode.clone() without list type (backward compatibility)', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        const olNode = ListNode.clone({
-          __key: '1',
-          __start: 1,
-          __tag: 'ol',
-        } as unknown as ListNode);
-        const ulNode = ListNode.clone({
-          __key: '1',
-          __start: 1,
-          __tag: 'ul',
-        } as unknown as ListNode);
-        expect(olNode.__listType).toBe('number');
-        expect(ulNode.__listType).toBe('bullet');
-      });
-    });
   });
 });
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
index 466be7498de..cc09d1735cc 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
@@ -2605,7 +2605,7 @@ describe('LexicalSelection tests', () => {
           return $createHeadingNode('h1');
         });
         expect(JSON.stringify(testEditor._pendingEditorState?.toJSON())).toBe(
-          '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[{"children":[{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1}],"direction":null,"format":"","indent":0,"type":"tablerow","version":1}],"direction":null,"format":"","indent":0,"type":"table","version":1},{"children":[],"direction":null,"format":"","indent":0,"type":"heading","version":1,"tag":"h1"}],"direction":null,"format":"","indent":0,"type":"root","version":1}}',
+          '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"children":[{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}},{"children":[],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"}],"direction":null,"type":"root","version":1}}',
         );
       });
     });
@@ -2695,7 +2695,7 @@ describe('LexicalSelection tests', () => {
         });
       });
       expect(element.innerHTML).toStrictEqual(
-        `<h1><span data-lexical-text="true">1</span></h1><h1 style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">1.1</span></h1>`,
+        `<h1><span data-lexical-text="true">1</span></h1><ul><li value="1"><h1><span data-lexical-text="true">1.1</span></h1></li></ul>`,
       );
     });
 
@@ -2734,7 +2734,7 @@ describe('LexicalSelection tests', () => {
         });
       });
       expect(element.innerHTML).toStrictEqual(
-        `<h1 style="padding-inline-start: calc(1 * 40px);"><span data-lexical-text="true">1.1</span></h1>`,
+        `<ul><li value="1"><h1><span data-lexical-text="true">1.1</span></h1></li></ul>`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
index 6848e55325d..2879decdad7 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
@@ -113,9 +113,8 @@ describe('LexicalTableNode tests', () => {
           $insertDataTransferForRichText(dataTransfer, selection, editor);
         });
         // Make sure paragraph is inserted inside empty cells
-        const emptyCell = '<td><p><br></p></td>';
         expect(testEnv.innerHTML).toBe(
-          `<table><tr><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello there</span></p></td><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">General Kenobi!</span></p></td></tr><tr><td><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Lexical is nice</span></p></td>${emptyCell}</tr></table>`,
+          `<table style="border-collapse: collapse; table-layout: fixed; width: 468pt;"><colgroup><col><col></colgroup><tr style="height: 22.015pt;"><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello there</span></p></td><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">General Kenobi!</span></p></td></tr><tr style="height: 22.015pt;"><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Lexical is nice</span></p></td><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><br></p></td></tr></table>`,
         );
       });
 
@@ -136,7 +135,7 @@ describe('LexicalTableNode tests', () => {
           $insertDataTransferForRichText(dataTransfer, selection, editor);
         });
         expect(testEnv.innerHTML).toBe(
-          `<table><tr style="height: 21px;"><td><p><strong data-lexical-text="true">Surface</strong></p></td><td><p><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td><p style="text-align: right;"><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td><p><span data-lexical-text="true">Lexical</span></p></td><td><p><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td><p><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
+          `<table style="table-layout: fixed; font-size: 10pt; font-family: Arial; width: 0px; border-collapse: collapse;"><colgroup><col style="width: 100px;"><col style="width: 189px;"><col style="width: 171px;"></colgroup><tr style="height: 21px;"><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom; font-weight: bold;"><p><strong data-lexical-text="true">Surface</strong></p></td><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom; font-style: italic;"><p><em data-lexical-text="true">MWP_WORK_LS_COMPOSER</em></p></td><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom; text-decoration: underline; text-align: right;" class="align-right"><p><span data-lexical-text="true">77349</span></p></td></tr><tr style="height: 21px;"><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom;"><p><span data-lexical-text="true">Lexical</span></p></td><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom; text-decoration: line-through;"><p><span data-lexical-text="true">XDS_RICH_TEXT_AREA</span></p></td><td style="overflow: hidden; padding: 2px 3px 2px 3px; vertical-align: bottom;"><p><span data-lexical-text="true">sdvd </span><strong data-lexical-text="true">sdfvsfs</strong></p></td></tr></table>`,
         );
       });
     },
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
index d5b85ccaaa0..1548216cf1a 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
@@ -101,8 +101,6 @@ describe('table selection', () => {
       __cachedText: null,
       __dir: null,
       __first: paragraphKey,
-      __format: 0,
-      __indent: 0,
       __key: 'root',
       __last: paragraphKey,
       __next: null,
@@ -113,10 +111,11 @@ describe('table selection', () => {
       __type: 'root',
     });
     expect(parsedParagraph).toEqual({
+      __alignment: "",
       __dir: null,
       __first: textKey,
-      __format: 0,
-      __indent: 0,
+      __id: '',
+      __inset: 0,
       __key: paragraphKey,
       __last: textKey,
       __next: null,
@@ -124,7 +123,6 @@ describe('table selection', () => {
       __prev: null,
       __size: 1,
       __style: '',
-      __textFormat: 0,
       __textStyle: '',
       __type: 'paragraph',
     });
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
index d76937ed606..cae4f1aae68 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalEventHelpers.test.ts
@@ -176,7 +176,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Other side</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">I must have called</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1"><span data-lexical-text="true">Other side</span></li><li value="2"><span data-lexical-text="true">I must have called</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><ul><li>Other side</li><li>I must have called</li></ul>`,
@@ -186,7 +186,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">To tell you</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">I’m sorry</span></li></ol></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ol class="editor-list-ol"><li value="1"><span data-lexical-text="true">To tell you</span></li><li value="2"><span data-lexical-text="true">I’m sorry</span></li></ol></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><ol><li>To tell you</li><li>I’m sorry</li></ol>`,
@@ -266,7 +266,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem"><span data-lexical-text="true">side</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1"><span data-lexical-text="true">Hello</span></li><li value="2"><span data-lexical-text="true">from the other</span></li><li value="3"><span data-lexical-text="true">side</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist>`,
@@ -276,7 +276,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1" class="editor-listitem"><span data-lexical-text="true">Hello</span></li><li value="2" class="editor-listitem"><span data-lexical-text="true">from the other</span></li><li value="3" class="editor-listitem"><span data-lexical-text="true">side</span></li></ul></div>',
+            '<div contenteditable="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-lexical-editor="true"><ul class="editor-list-ul"><li value="1"><span data-lexical-text="true">Hello</span></li><li value="2"><span data-lexical-text="true">from the other</span></li><li value="3"><span data-lexical-text="true">side</span></li></ul></div>',
           inputs: [
             pasteHTML(
               `<meta charset='utf-8'><doesnotexist><doesnotexist><ul><li>Hello</li><li>from the other</li><li>side</li></ul></doesnotexist></doesnotexist>`,
@@ -611,7 +611,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></li><li value="2" class="editor-listitem"><br></li><li value="3" class="editor-listitem"><span data-lexical-text="true">3</span></li></ol>',
+            '<ol class="editor-list-ol"><li value="1"><span data-lexical-text="true">1</span><br><span data-lexical-text="true">2</span></li><li value="2"><br></li><li value="3"><span data-lexical-text="true">3</span></li></ol>',
           inputs: [
             pasteHTML('<ol><li>1<div></div>2</li><li></li><li>3</li></ol>'),
           ],
@@ -647,7 +647,7 @@ describe('LexicalEventHelpers', () => {
         },
         {
           expectedHTML:
-            '<ol class="editor-list-ol"><li value="1" class="editor-listitem"><span data-lexical-text="true">1</span></li><li value="2" class="editor-listitem"><br></li><li value="3" class="editor-listitem"><span data-lexical-text="true">3</span></li></ol>',
+            '<ol class="editor-list-ol"><li value="1"><span data-lexical-text="true">1</span></li><li value="2"><br></li><li value="3"><span data-lexical-text="true">3</span></li></ol>',
           inputs: [pasteHTML('<ol><li>1</li><li><br /></li><li>3</li></ol>')],
           name: 'only br in a li',
         },
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
index a70200d6349..54cd8b54f1e 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
@@ -82,10 +82,10 @@ describe('LexicalUtils#splitNode', () => {
       expectedHtml:
         '<ul>' +
         '<li>Before</li>' +
-        '<li><ul><li>Hello</li></ul></li>' +
+        '<li style="list-style: none;"><ul><li>Hello</li></ul></li>' +
         '</ul>' +
         '<ul>' +
-        '<li><ul><li>world</li></ul></li>' +
+        '<li style="list-style: none;"><ul><li>world</li></ul></li>' +
         '<li>After</li>' +
         '</ul>',
       initialHtml:
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
index fb04e628413..8c31496de5a 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
@@ -56,11 +56,11 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
       expectedHtml:
         '<ul>' +
         '<li>Before</li>' +
-        '<li><ul><li>Hello</li></ul></li>' +
+        '<li style="list-style: none;"><ul><li>Hello</li></ul></li>' +
         '</ul>' +
         '<test-decorator></test-decorator>' +
         '<ul>' +
-        '<li><ul><li>world</li></ul></li>' +
+        '<li style="list-style: none;"><ul><li>world</li></ul></li>' +
         '<li>After</li>' +
         '</ul>',
       initialHtml:

From 55d074f1a5922fa966a428d9f03e0a1e405e33aa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Dec 2024 11:32:15 +0000
Subject: [PATCH 398/666] Attachment API: Fixed error when name not provided in
 update

Fixes #5353
---
 app/Uploads/AttachmentService.php |  8 +++++---
 tests/Api/AttachmentsApiTest.php  | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 033f2334104..dabd537292f 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -116,16 +116,18 @@ public function updateFileOrderWithinPage(array $attachmentOrder, string $pageId
      */
     public function updateFile(Attachment $attachment, array $requestData): Attachment
     {
-        $attachment->name = $requestData['name'];
-        $link = trim($requestData['link'] ?? '');
+        if (isset($requestData['name'])) {
+            $attachment->name = $requestData['name'];
+        }
 
+        $link = trim($requestData['link'] ?? '');
         if (!empty($link)) {
             if (!$attachment->external) {
                 $this->deleteFileInStorage($attachment);
                 $attachment->external = true;
                 $attachment->extension = '';
             }
-            $attachment->path = $requestData['link'];
+            $attachment->path = $link;
         }
 
         $attachment->save();
diff --git a/tests/Api/AttachmentsApiTest.php b/tests/Api/AttachmentsApiTest.php
index b03f280ac67..b2346587924 100644
--- a/tests/Api/AttachmentsApiTest.php
+++ b/tests/Api/AttachmentsApiTest.php
@@ -12,7 +12,7 @@ class AttachmentsApiTest extends TestCase
 {
     use TestsApi;
 
-    protected $baseEndpoint = '/api/attachments';
+    protected string $baseEndpoint = '/api/attachments';
 
     public function test_index_endpoint_returns_expected_book()
     {
@@ -302,6 +302,23 @@ public function test_update_link_attachment_to_file()
     }
 
     public function test_update_file_attachment_to_link()
+    {
+        $this->actingAsApiAdmin();
+        $page = $this->entities->page();
+        $attachment = $this->createAttachmentForPage($page);
+
+        $resp = $this->putJson("{$this->baseEndpoint}/{$attachment->id}", [
+            'link' => 'https://example.com/donkey',
+        ]);
+
+        $resp->assertStatus(200);
+        $this->assertDatabaseHas('attachments', [
+            'id' => $attachment->id,
+            'path' => 'https://example.com/donkey',
+        ]);
+    }
+
+    public function test_update_does_not_require_name()
     {
         $this->actingAsApiAdmin();
         $page = $this->entities->page();

From 617b2edea0bfe8ebb5556aca6b0b6aa371232cca Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Dec 2024 13:07:39 +0000
Subject: [PATCH 399/666] JS: Updated packages, fixed lint issue

Left eslint as old due to eslint-config-airbnb-base not yet being
comptible.
Some SASS deprecations to solve.
---
 dev/docs/development.md          |   2 +-
 package-lock.json                | 812 +++++++++++++++++++++++--------
 package.json                     |  40 +-
 resources/js/components/index.ts |   2 +-
 4 files changed, 642 insertions(+), 214 deletions(-)

diff --git a/dev/docs/development.md b/dev/docs/development.md
index 0324140f8bd..ea3e692a198 100644
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -3,7 +3,7 @@
 All development on BookStack is currently done on the `development` branch. 
 When it's time for a release the `development` branch is merged into release with built & minified CSS & JS then tagged at its version. Here are the current development requirements:
 
-* [Node.js](https://nodejs.org/en/) v18.0+
+* [Node.js](https://nodejs.org/en/) v20.0+
 
 ## Building CSS & JavaScript Assets
 
diff --git a/package-lock.json b/package-lock.json
index 68ec85fff8b..1912106c2b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,46 +4,47 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "bookstack",
       "dependencies": {
-        "@codemirror/commands": "^6.3.2",
-        "@codemirror/lang-css": "^6.2.1",
-        "@codemirror/lang-html": "^6.4.7",
-        "@codemirror/lang-javascript": "^6.2.1",
+        "@codemirror/commands": "^6.7.1",
+        "@codemirror/lang-css": "^6.3.1",
+        "@codemirror/lang-html": "^6.4.9",
+        "@codemirror/lang-javascript": "^6.2.2",
         "@codemirror/lang-json": "^6.0.1",
-        "@codemirror/lang-markdown": "^6.2.3",
+        "@codemirror/lang-markdown": "^6.3.1",
         "@codemirror/lang-php": "^6.0.1",
-        "@codemirror/lang-xml": "^6.0.2",
-        "@codemirror/language": "^6.9.3",
-        "@codemirror/legacy-modes": "^6.3.3",
-        "@codemirror/state": "^6.3.3",
+        "@codemirror/lang-xml": "^6.1.0",
+        "@codemirror/language": "^6.10.6",
+        "@codemirror/legacy-modes": "^6.4.2",
+        "@codemirror/state": "^6.5.0",
         "@codemirror/theme-one-dark": "^6.1.2",
-        "@codemirror/view": "^6.22.2",
-        "@lezer/highlight": "^1.2.0",
+        "@codemirror/view": "^6.35.2",
+        "@lezer/highlight": "^1.2.1",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-        "@types/jest": "^29.5.13",
+        "@types/jest": "^29.5.14",
         "codemirror": "^6.0.1",
         "idb-keyval": "^6.2.1",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
-        "snabbdom": "^3.5.1",
-        "sortablejs": "^1.15.1"
+        "snabbdom": "^3.6.2",
+        "sortablejs": "^1.15.6"
       },
       "devDependencies": {
-        "@lezer/generator": "^1.5.1",
+        "@lezer/generator": "^1.7.2",
         "chokidar-cli": "^3.0",
-        "esbuild": "^0.23.0",
-        "eslint": "^8.55.0",
+        "esbuild": "^0.24.0",
+        "eslint": "^8.57.1",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-import": "^2.31.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "livereload": "^0.9.3",
         "npm-run-all": "^4.1.5",
-        "sass": "^1.69.5",
+        "sass": "^1.82.0",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
-        "typescript": "5.6.*"
+        "typescript": "5.7.*"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -627,9 +628,10 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
-      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -638,9 +640,10 @@
       }
     },
     "node_modules/@codemirror/lang-css": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
-      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
+      "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.0.0",
@@ -689,9 +692,10 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.2.5.tgz",
-      "integrity": "sha512-Hgke565YcO4fd9pe2uLYxnMufHO5rQwRr+AAhFq8ABuhkrjyX8R5p5s+hZUTdV60O0dMRjxKhBLxz8pu/MkUVA==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.1.tgz",
+      "integrity": "sha512-y3sSPuQjBKZQbQwe3ZJKrSW6Silyl9PnrU/Mf0m2OQgIlPoSYTtOvEL7xs94SVMkb8f4x+SQFnzXPdX4Wk2lsg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
         "@codemirror/lang-html": "^6.0.0",
@@ -728,9 +732,10 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
-      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "version": "6.10.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz",
+      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -741,9 +746,10 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.1.tgz",
-      "integrity": "sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.2.tgz",
+      "integrity": "sha512-HsvWu08gOIIk303eZQCal4H4t65O/qp1V4ul4zVa3MHK5FJ0gz3qz3O55FIkm+aQUcshUOjBx38t2hPiJwW5/g==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
@@ -769,9 +775,13 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
+      "license": "MIT",
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
     },
     "node_modules/@codemirror/theme-one-dark": {
       "version": "6.1.2",
@@ -785,9 +795,10 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.34.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.1.tgz",
-      "integrity": "sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==",
+      "version": "6.35.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.2.tgz",
+      "integrity": "sha512-u04R04XFCYCNaHoNRr37WUUAfnxKPwPdqV+370NiO6i85qB1J/qCD/WbbMJsyJfRWhXIJXAe2BG/oTzAggqv4A==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -817,13 +828,14 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz",
-      "integrity": "sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
+      "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -833,13 +845,14 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.1.tgz",
-      "integrity": "sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
+      "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -849,13 +862,14 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz",
-      "integrity": "sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
+      "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -865,13 +879,14 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.1.tgz",
-      "integrity": "sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
+      "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -881,13 +896,14 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz",
-      "integrity": "sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
+      "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -897,13 +913,14 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz",
-      "integrity": "sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
+      "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -913,13 +930,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -929,13 +947,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz",
-      "integrity": "sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
+      "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -945,13 +964,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz",
-      "integrity": "sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
+      "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -961,13 +981,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz",
-      "integrity": "sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
+      "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -977,13 +998,14 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz",
-      "integrity": "sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
+      "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -993,13 +1015,14 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz",
-      "integrity": "sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
+      "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1009,13 +1032,14 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz",
-      "integrity": "sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
+      "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
       "cpu": [
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1025,13 +1049,14 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz",
-      "integrity": "sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
+      "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1041,13 +1066,14 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz",
-      "integrity": "sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
+      "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1057,13 +1083,14 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz",
-      "integrity": "sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
+      "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1073,13 +1100,14 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz",
-      "integrity": "sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
+      "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1089,13 +1117,14 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -1105,13 +1134,14 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz",
-      "integrity": "sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -1121,13 +1151,14 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz",
-      "integrity": "sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -1137,13 +1168,14 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz",
-      "integrity": "sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
+      "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -1153,13 +1185,14 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz",
-      "integrity": "sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
+      "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -1169,13 +1202,14 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz",
-      "integrity": "sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
+      "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -1185,13 +1219,14 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz",
-      "integrity": "sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
+      "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -1216,10 +1251,11 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
-      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -1229,6 +1265,7 @@
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -1252,6 +1289,7 @@
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
       "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -1262,6 +1300,7 @@
       "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
@@ -1289,7 +1328,8 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1738,10 +1778,11 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.1.tgz",
-      "integrity": "sha512-MgPJN9Si+ccxzXl3OAmCeZuUKw4XiPl4y664FX/hnnyG9CTqUPq65N3/VGPA2jD23D7QgMTtNqflta+cPN+5mQ==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.2.tgz",
+      "integrity": "sha512-CwgULPOPPmH54tv4gki18bElLCdJ1+FBC+nGVSVD08vFWDsMjS7KEjNTph9JOypDnet90ujN3LzQiW3CyVODNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.1.0",
         "@lezer/lr": "^1.3.0"
@@ -1825,11 +1866,18 @@
         "@lezer/lr": "^1.0.0"
       }
     },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.0.tgz",
+      "integrity": "sha512-0YSzy7M9mBiK+h1m33rD8vZOfaO8leG6CY3+Q+1Lig86snkc8OAHQVAdndmnXMWJlVIH6S7fSZVVcjLcq6OH1A==",
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -1843,6 +1891,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1852,6 +1901,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -1860,6 +1910,316 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -2009,9 +2369,10 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.13",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
-      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "license": "MIT",
       "dependencies": {
         "expect": "^29.0.0",
         "pretty-format": "^29.0.0"
@@ -2067,10 +2428,11 @@
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz",
+      "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -2080,10 +2442,11 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2106,6 +2469,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2139,6 +2503,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2857,10 +3222,11 @@
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -3063,6 +3429,20 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -3094,6 +3474,7 @@
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -3307,11 +3688,12 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.1.tgz",
-      "integrity": "sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
+      "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -3319,30 +3701,30 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.23.1",
-        "@esbuild/android-arm": "0.23.1",
-        "@esbuild/android-arm64": "0.23.1",
-        "@esbuild/android-x64": "0.23.1",
-        "@esbuild/darwin-arm64": "0.23.1",
-        "@esbuild/darwin-x64": "0.23.1",
-        "@esbuild/freebsd-arm64": "0.23.1",
-        "@esbuild/freebsd-x64": "0.23.1",
-        "@esbuild/linux-arm": "0.23.1",
-        "@esbuild/linux-arm64": "0.23.1",
-        "@esbuild/linux-ia32": "0.23.1",
-        "@esbuild/linux-loong64": "0.23.1",
-        "@esbuild/linux-mips64el": "0.23.1",
-        "@esbuild/linux-ppc64": "0.23.1",
-        "@esbuild/linux-riscv64": "0.23.1",
-        "@esbuild/linux-s390x": "0.23.1",
-        "@esbuild/linux-x64": "0.23.1",
-        "@esbuild/netbsd-x64": "0.23.1",
-        "@esbuild/openbsd-arm64": "0.23.1",
-        "@esbuild/openbsd-x64": "0.23.1",
-        "@esbuild/sunos-x64": "0.23.1",
-        "@esbuild/win32-arm64": "0.23.1",
-        "@esbuild/win32-ia32": "0.23.1",
-        "@esbuild/win32-x64": "0.23.1"
+        "@esbuild/aix-ppc64": "0.24.0",
+        "@esbuild/android-arm": "0.24.0",
+        "@esbuild/android-arm64": "0.24.0",
+        "@esbuild/android-x64": "0.24.0",
+        "@esbuild/darwin-arm64": "0.24.0",
+        "@esbuild/darwin-x64": "0.24.0",
+        "@esbuild/freebsd-arm64": "0.24.0",
+        "@esbuild/freebsd-x64": "0.24.0",
+        "@esbuild/linux-arm": "0.24.0",
+        "@esbuild/linux-arm64": "0.24.0",
+        "@esbuild/linux-ia32": "0.24.0",
+        "@esbuild/linux-loong64": "0.24.0",
+        "@esbuild/linux-mips64el": "0.24.0",
+        "@esbuild/linux-ppc64": "0.24.0",
+        "@esbuild/linux-riscv64": "0.24.0",
+        "@esbuild/linux-s390x": "0.24.0",
+        "@esbuild/linux-x64": "0.24.0",
+        "@esbuild/netbsd-x64": "0.24.0",
+        "@esbuild/openbsd-arm64": "0.24.0",
+        "@esbuild/openbsd-x64": "0.24.0",
+        "@esbuild/sunos-x64": "0.24.0",
+        "@esbuild/win32-arm64": "0.24.0",
+        "@esbuild/win32-ia32": "0.24.0",
+        "@esbuild/win32-x64": "0.24.0"
       }
     },
     "node_modules/escalade": {
@@ -3391,7 +3773,9 @@
       "version": "8.57.1",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -3508,10 +3892,11 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz",
-      "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.8",
@@ -3521,7 +3906,7 @@
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.9.0",
+        "eslint-module-utils": "^2.12.0",
         "hasown": "^2.0.2",
         "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
@@ -3530,13 +3915,14 @@
         "object.groupby": "^1.0.3",
         "object.values": "^1.2.0",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
@@ -3565,6 +3951,7 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -3605,6 +3992,7 @@
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -3647,6 +4035,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -3723,7 +4112,8 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -3742,6 +4132,7 @@
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
       "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -3760,6 +4151,7 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -3829,6 +4221,7 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -3839,10 +4232,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/for-each": {
       "version": "0.3.3",
@@ -4036,6 +4430,7 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -4083,7 +4478,8 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-bigints": {
       "version": "1.0.2",
@@ -4247,21 +4643,24 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -4530,6 +4929,7 @@
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5434,6 +5834,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -5502,7 +5903,8 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
@@ -5520,7 +5922,8 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -5545,6 +5948,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -5888,6 +6292,14 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -5997,10 +6409,11 @@
       "dev": true
     },
     "node_modules/npm-run-all/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -6304,6 +6717,7 @@
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -6614,7 +7028,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/react-is": {
       "version": "18.3.1",
@@ -6729,6 +7144,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6747,6 +7163,7 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -6758,6 +7175,7 @@
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -6787,6 +7205,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -6833,13 +7252,14 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.79.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
-      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
+      "version": "1.82.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.82.0.tgz",
+      "integrity": "sha512-j4GMCTa8elGyN9A7x7bEglx0VgSpNUG4W4wNedQ33wSMdnkqQCT8HTwOaVSV4e6yQovcu/3Oc4coJP/l0xhL2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
-        "immutable": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -6847,6 +7267,9 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass/node_modules/chokidar": {
@@ -7013,9 +7436,10 @@
       }
     },
     "node_modules/sortablejs": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.3.tgz",
-      "integrity": "sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg=="
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.6.tgz",
+      "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==",
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.6.1",
@@ -7311,7 +7735,8 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tmpl": {
       "version": "1.0.5",
@@ -7528,6 +7953,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -7609,10 +8035,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -7690,6 +8117,7 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
diff --git a/package.json b/package.json
index 42531194ec3..08af25d140f 100644
--- a/package.json
+++ b/package.json
@@ -19,45 +19,45 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@lezer/generator": "^1.5.1",
+    "@lezer/generator": "^1.7.2",
     "chokidar-cli": "^3.0",
-    "esbuild": "^0.23.0",
-    "eslint": "^8.55.0",
+    "esbuild": "^0.24.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.31.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "livereload": "^0.9.3",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.69.5",
+    "sass": "^1.82.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "typescript": "5.6.*"
+    "typescript": "5.7.*"
   },
   "dependencies": {
-    "@codemirror/commands": "^6.3.2",
-    "@codemirror/lang-css": "^6.2.1",
-    "@codemirror/lang-html": "^6.4.7",
-    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/commands": "^6.7.1",
+    "@codemirror/lang-css": "^6.3.1",
+    "@codemirror/lang-html": "^6.4.9",
+    "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/lang-markdown": "^6.2.3",
+    "@codemirror/lang-markdown": "^6.3.1",
     "@codemirror/lang-php": "^6.0.1",
-    "@codemirror/lang-xml": "^6.0.2",
-    "@codemirror/language": "^6.9.3",
-    "@codemirror/legacy-modes": "^6.3.3",
-    "@codemirror/state": "^6.3.3",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.10.6",
+    "@codemirror/legacy-modes": "^6.4.2",
+    "@codemirror/state": "^6.5.0",
     "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.22.2",
-    "@lezer/highlight": "^1.2.0",
+    "@codemirror/view": "^6.35.2",
+    "@lezer/highlight": "^1.2.1",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^29.5.14",
     "codemirror": "^6.0.1",
     "idb-keyval": "^6.2.1",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
-    "snabbdom": "^3.5.1",
-    "sortablejs": "^1.15.1"
+    "snabbdom": "^3.6.2",
+    "sortablejs": "^1.15.6"
   },
   "eslintConfig": {
     "root": true,
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index 24e60bd97f2..12c991a51d8 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -30,7 +30,7 @@ export {HeaderMobileToggle} from './header-mobile-toggle';
 export {ImageManager} from './image-manager';
 export {ImagePicker} from './image-picker';
 export {ListSortControl} from './list-sort-control';
-export {LoadingButton} from './loading-button.ts';
+export {LoadingButton} from './loading-button';
 export {MarkdownEditor} from './markdown-editor';
 export {NewUserPassword} from './new-user-password';
 export {Notification} from './notification';

From 8ec26e80834841dd66ae6123dad8855d8509120f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 9 Dec 2024 13:25:35 +0000
Subject: [PATCH 400/666] SASS: Updated to use modules and address deprecations

Changes the name of our spacing variables due to the prefixing -/_
meaning private in the use of new "use" rather than include.

All now modular too, so all variables/mixins are accessed via their
package.

Also renamed variables file to vars for simpler/cleaner access/writing.

eg. '$-m' is now 'vars.$m'
---
 resources/sass/_blocks.scss                   |  97 ++++-----
 resources/sass/_buttons.scss                  |  33 ++--
 resources/sass/_codemirror.scss               |  11 +-
 resources/sass/_colors.scss                   |   8 +-
 resources/sass/_components.scss               | 187 +++++++++---------
 resources/sass/_content.scss                  |  65 +++---
 resources/sass/_editor.scss                   |  27 +--
 resources/sass/_forms.scss                    | 123 ++++++------
 resources/sass/_header.scss                   |  97 ++++-----
 resources/sass/_html.scss                     |   7 +-
 resources/sass/_layout.scss                   |  87 ++++----
 resources/sass/_lists.scss                    | 173 ++++++++--------
 resources/sass/_pages.scss                    |  65 +++---
 resources/sass/_spacing.scss                  |   6 +-
 resources/sass/_tables.scss                   |  21 +-
 resources/sass/_text.scss                     |  67 ++++---
 resources/sass/_tinymce.scss                  |  19 +-
 .../sass/{_variables.scss => _vars.scss}      |  36 ++--
 resources/sass/export-styles.scss             |  13 +-
 resources/sass/styles.scss                    | 102 +++++-----
 20 files changed, 649 insertions(+), 595 deletions(-)
 rename resources/sass/{_variables.scss => _vars.scss} (85%)

diff --git a/resources/sass/_blocks.scss b/resources/sass/_blocks.scss
index 9e96e920b8d..8c248caee14 100644
--- a/resources/sass/_blocks.scss
+++ b/resources/sass/_blocks.scss
@@ -1,14 +1,17 @@
+@use "mixins";
+@use "vars";
+
 /**
  * Card-style blocks
  */
 
 .card {
-  @include lightDark(background-color, #FFF, #222);
-  box-shadow: $bs-card;
+  @include mixins.lightDark(background-color, #FFF, #222);
+  box-shadow: vars.$bs-card;
   border-radius: 3px;
   break-inside: avoid;
   .body, p.empty-text {
-    padding-block: $-m;
+    padding-block: vars.$m;
   }
   a, p {
     word-wrap: break-word;
@@ -17,9 +20,9 @@
 }
 
 .card-title {
-  padding: $-m $-m $-xs;
+  padding: vars.$m vars.$m vars.$xs;
   margin: 0;
-  font-size: $fs-m;
+  font-size: vars.$fs-m;
   color: #222;
   fill: #222;
   font-weight: 400;
@@ -29,21 +32,21 @@
 }
 .card-footer-link, button.card-footer-link  {
   display: block;
-  padding: $-s $-m;
+  padding: vars.$s vars.$m;
   line-height: 1;
   border-top: 1px solid;
   width: 100%;
   text-align: left;
-  @include lightDark(border-color, #DDD, #555);
+  @include mixins.lightDark(border-color, #DDD, #555);
   border-radius: 0 0 3px 3px;
   font-size: 0.9em;
-  margin-top: $-xs;
+  margin-top: vars.$xs;
   &:hover {
     text-decoration: none;
-    @include lightDark(background-color, #f2f2f2, #2d2d2d);
+    @include mixins.lightDark(background-color, #f2f2f2, #2d2d2d);
   }
   &:focus {
-    @include lightDark(background-color, #eee, #222);
+    @include mixins.lightDark(background-color, #eee, #222);
     outline: 1px dotted #666;
     outline-offset: -2px;
   }
@@ -51,17 +54,17 @@
 
 .card.border-card {
   border: 1px solid;
-  @include lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(border-color, #ddd, #000);
 }
 
 .card.drag-card {
   border: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #000);
-  @include lightDark(background-color, #fff, #333);
+  @include mixins.lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(background-color, #fff, #333);
   border-radius: 4px;
   display: flex;
-  padding: 0 0 0 ($-s + 28px);
-  margin: $-s 0;
+  padding: 0 0 0 (vars.$s + 28px);
+  margin: vars.$s 0;
   position: relative;
   .drag-card-action {
     cursor: pointer;
@@ -73,30 +76,30 @@
     justify-content: center;
     width: 28px;
     flex-grow: 0;
-    padding: 0 $-xs;
+    padding: 0 vars.$xs;
     &:hover {
-      @include lightDark(background-color, #eee, #2d2d2d);
+      @include mixins.lightDark(background-color, #eee, #2d2d2d);
     }
     .svg-icon {
       margin-inline-end: 0px;
     }
   }
   .outline input {
-    margin: $-s 0;
+    margin: vars.$s 0;
     width: 100%;
   }
   .outline {
     position: relative;
   }
   .handle {
-    @include lightDark(background-color, #eee, #2d2d2d);
+    @include mixins.lightDark(background-color, #eee, #2d2d2d);
     left: 0;
     position: absolute;
     top: 0;
     bottom: 0;
   }
   > div {
-    padding: 0 $-s;
+    padding: 0 vars.$s;
     max-width: 80%;
     flex: 1;
   }
@@ -106,17 +109,17 @@
   display: flex;
   flex-direction: column;
   border: 1px solid #ddd;
-  @include lightDark(border-color, #ddd, #000);
-  margin-bottom: $-l;
+  @include mixins.lightDark(border-color, #ddd, #000);
+  margin-bottom: vars.$l;
   border-radius: 4px;
   overflow: hidden;
   min-width: 100px;
-  color: $text-dark;
+  color: vars.$text-dark;
   transition: border-color ease-in-out 120ms, box-shadow ease-in-out 120ms;
   &:hover {
-    color: $text-dark;
+    color: vars.$text-dark;
     text-decoration: none;
-    @include lightDark(box-shadow, $bs-card, $bs-card-dark);
+    @include mixins.lightDark(box-shadow, vars.$bs-card, vars.$bs-card-dark);
   }
   h2 {
     width: 100%;
@@ -134,7 +137,7 @@
     border-bottom-width: 2px;
   }
   .grid-card-content, .grid-card-footer {
-    padding: $-l;
+    padding: vars.$l;
   }
   .grid-card-content + .grid-card-footer {
     padding-top: 0;
@@ -149,10 +152,10 @@
 }
 
 .content-wrap.card {
-  padding: $-m $-xxl;
+  padding: vars.$m vars.$xxl;
   margin-inline-start: auto;
   margin-inline-end: auto;
-  margin-bottom: $-l;
+  margin-bottom: vars.$l;
   overflow: initial;
   min-height: 60vh;
   border-radius: 8px;
@@ -163,26 +166,26 @@
     width: 100%;
   }
 }
-@include smaller-than($xxl) {
+@include mixins.smaller-than(vars.$bp-xxl) {
   .content-wrap.card {
-    padding: $-m $-xl;
+    padding: vars.$m vars.$xl;
   }
 }
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .content-wrap.card {
-    padding: $-m $-l;
+    padding: vars.$m vars.$l;
   }
 }
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   .content-wrap.card {
-    padding: $-m $-m;
+    padding: vars.$m vars.$m;
   }
 }
 
 .sub-card {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
   border: 1.5px solid;
-  @include lightDark(border-color, #E2E2E2, #444);
+  @include mixins.lightDark(border-color, #E2E2E2, #444);
   border-radius: 4px;
 }
 
@@ -194,7 +197,7 @@
 }
 
 .fade-in-when-active {
-  @include lightDark(opacity, 0.6, 0.7);
+  @include mixins.lightDark(opacity, 0.6, 0.7);
   transition: opacity ease-in-out 120ms;
   &:hover, &:focus-within {
     opacity: 1 !important;
@@ -209,29 +212,29 @@
  */
 .tag-item {
   display: inline-flex;
-  margin-bottom: $-xs;
-  margin-inline-end: $-xs;
+  margin-bottom: vars.$xs;
+  margin-inline-end: vars.$xs;
   border-radius: 4px;
   border: 1px solid;
   overflow: hidden;
   font-size: 0.85em;
-  @include lightDark(border-color, #CCC, #666);
+  @include mixins.lightDark(border-color, #CCC, #666);
   a, span, a:hover, a:active {
     padding: 4px 8px;
-    @include lightDark(color, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8));
+    @include mixins.lightDark(color, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.8));
     transition: background-color ease-in-out 80ms;
     text-decoration: none;
   }
   a:hover {
-    @include lightDark(background-color, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.3));
+    @include mixins.lightDark(background-color, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.3));
   }
   svg {
-    @include lightDark(fill, rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.5));
+    @include mixins.lightDark(fill, rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.5));
   }
   .tag-value {
     border-inline-start: 1px solid;
-    @include lightDark(border-color, #DDD, #666);
-    @include lightDark(background-color, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.2))
+    @include mixins.lightDark(border-color, #DDD, #666);
+    @include mixins.lightDark(background-color, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.2))
   }
 }
 
@@ -253,7 +256,7 @@
 .api-method {
   font-size: 0.75rem;
   background-color: #888;
-  padding: $-xs;
+  padding: vars.$xs;
   line-height: 1.3;
   opacity: 0.7;
   vertical-align: top;
@@ -271,7 +274,7 @@
 
 .sticky-sidebar {
   position: sticky;
-  top: $-m;
-  max-height: calc(100vh - #{$-m});
+  top: vars.$m;
+  max-height: calc(100vh - #{vars.$m});
   overflow-y: auto;
 }
diff --git a/resources/sass/_buttons.scss b/resources/sass/_buttons.scss
index e629e772662..29deda3a08a 100644
--- a/resources/sass/_buttons.scss
+++ b/resources/sass/_buttons.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 button {
   background-color: transparent;
   border: 0;
@@ -8,9 +11,9 @@ button {
   text-decoration: none;
   font-size: 0.85rem;
   line-height: 1.4em;
-  padding: $-xs*1.3 $-m;
-  margin-top: $-xs;
-  margin-bottom: $-xs;
+  padding: vars.$xs*1.3 vars.$m;
+  margin-top: vars.$xs;
+  margin-bottom: vars.$xs;
   display: inline-block;
   font-weight: 400;
   outline: 0;
@@ -30,12 +33,12 @@ button {
     color: #FFFFFF;
   }
   &:hover {
-    @include lightDark(box-shadow, $bs-light, $bs-dark);
+    @include mixins.lightDark(box-shadow, vars.$bs-light, vars.$bs-dark);
     filter: brightness(110%);
   }
   &:focus {
     outline: 1px dotted currentColor;
-    outline-offset: -$-xs;
+    outline-offset: -(vars.$xs);
     box-shadow: none;
     filter: brightness(90%);
   }
@@ -46,16 +49,16 @@ button {
 
 .button.outline {
   background-color: transparent;
-  @include lightDark(color, #666, #AAA);
+  @include mixins.lightDark(color, #666, #AAA);
   fill: currentColor;
   border: 1px solid;
-  @include lightDark(border-color, #CCC, #666);
+  @include mixins.lightDark(border-color, #CCC, #666);
   &:hover, &:focus, &:active {
-    @include lightDark(color, #444, #BBB);
+    @include mixins.lightDark(color, #444, #BBB);
     border: 1px solid #CCC;
     box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
     background-color: #F2F2F2;
-    @include lightDark(background-color, #f8f8f8, #444);
+    @include mixins.lightDark(background-color, #f8f8f8, #444);
     filter: none;
   }
   &:active {
@@ -67,12 +70,12 @@ button {
 }
 
 .button + .button {
-  margin-inline-start: $-s;
+  margin-inline-start: vars.$s;
 }
 
 .button.small {
   font-size: 0.75rem;
-  padding: $-xs*1.2 $-s;
+  padding: vars.$xs*1.2 vars.$s;
 }
 
 .text-button {
@@ -119,22 +122,22 @@ button {
 .icon-button:hover {
   background-color: rgba(0, 0, 0, 0.05);
   border-radius: 4px;
-  @include lightDark(border-color, #DDD, #444);
+  @include mixins.lightDark(border-color, #DDD, #444);
   cursor: pointer;
 }
 
 .button.svg {
   display: flex;
   align-items: center;
-  padding: $-s $-m;
-  padding-bottom: ($-s - 2px);
+  padding: vars.$s vars.$m;
+  padding-bottom: (vars.$s - 2px);
   width: 100%;
   svg {
     display: inline-block;
     width: 24px;
     height: 24px;
     bottom: auto;
-    margin-inline-end: $-m;
+    margin-inline-end: vars.$m;
   }
 }
 
diff --git a/resources/sass/_codemirror.scss b/resources/sass/_codemirror.scss
index 5f14cb9dbc9..a516b4426a3 100644
--- a/resources/sass/_codemirror.scss
+++ b/resources/sass/_codemirror.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 /**
  * Custom CodeMirror BookStack overrides
  */
@@ -6,7 +9,7 @@
   font-size: 12px;
   border: 1px solid #ddd;
   line-height: 1.4;
-  margin-bottom: $-l;
+  margin-bottom: vars.$l;
 }
 
 .page-content .cm-editor,
@@ -42,9 +45,9 @@
   background-color: #EEE;
   border: 1px solid #DDD;
   border-start-end-radius: 4px;
-  @include lightDark(background-color, #eee, #333);
-  @include lightDark(border-color, #ddd, #444);
-  @include lightDark(color, #444, #888);
+  @include mixins.lightDark(background-color, #eee, #333);
+  @include mixins.lightDark(border-color, #ddd, #444);
+  @include mixins.lightDark(color, #444, #888);
   line-height: 0;
   cursor: pointer;
   z-index: 5;
diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss
index c77c1d8b388..bf7a7a0fc03 100644
--- a/resources/sass/_colors.scss
+++ b/resources/sass/_colors.scss
@@ -1,3 +1,5 @@
+@use "mixins";
+
 /**
  * Background colors
  */
@@ -7,7 +9,7 @@
 }
 .primary-background-light {
   background-color: var(--color-primary-light);
-  @include whenDark {
+  @include mixins.whenDark {
     background: #000;
     .text-link {
       color: #AAA !important;
@@ -50,12 +52,12 @@
 }
 
 .text-muted {
-  @include lightDark(color, #575757, #888888, true);
+  @include mixins.lightDark(color, #575757, #888888, true);
   fill: currentColor !important;
 }
 
 .text-dark {
-  @include lightDark(color, #222, #ccc, true);
+  @include mixins.lightDark(color, #222, #ccc, true);
   fill: currentColor !important;
 }
 
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 18d1bc18f0c..888b325275e 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -1,16 +1,21 @@
+@use "sass:math";
+
+@use "mixins";
+@use "vars";
+
 
 // System wide notifications
 .notification {
   position: fixed;
   top: 0;
   right: 0;
-  margin: $-xl;
-  padding: $-m $-l;
+  margin: vars.$xl;
+  padding: vars.$m vars.$l;
   background-color: #FFF;
-  @include lightDark(background-color, #fff, #444);
+  @include mixins.lightDark(background-color, #fff, #444);
   border-radius: 4px;
   border-inline-start: 6px solid currentColor;
-  box-shadow: $bs-large;
+  box-shadow: vars.$bs-large;
   z-index: 999999;
   cursor: pointer;
   max-width: 360px;
@@ -28,20 +33,20 @@
   svg {
     width: 2.8rem;
     height: 2.8rem;
-    padding-inline-end: $-s;
+    padding-inline-end: vars.$s;
     fill: currentColor;
   }
   .dismiss {
     margin-top: -8px;
     svg {
       height: 1.0rem;
-      @include lightDark(color, #444, #888);
+      @include mixins.lightDark(color, #444, #888);
     }
   }
   span {
     vertical-align: middle;
     line-height: 1.3;
-    @include whenDark {
+    @include mixins.whenDark {
       color: #BBB;
     }
   }
@@ -78,12 +83,12 @@
     transform: rotate(90deg);
   }
   svg[data-icon="caret-right"] + * {
-    margin-inline-start: $-xxs;
+    margin-inline-start: vars.$xxs;
   }
 }
 
 [overlay], .popup-background {
-  @include lightDark(background-color, rgba(0, 0, 0, 0.333), rgba(0, 0, 0, 0.6));
+  @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.333), rgba(0, 0, 0, 0.6));
   position: fixed;
   z-index: 95536;
   width: 100%;
@@ -104,7 +109,7 @@
 }
 
 .popup-body {
-  @include lightDark(background-color, #fff, #333);
+  @include mixins.lightDark(background-color, #fff, #333);
   max-height: 90%;
   max-width: 1200px;
   width: 90%;
@@ -144,7 +149,7 @@
   border-radius: 0;
   box-shadow: none;
   color: #FFF;
-  padding: $-xs $-m;
+  padding: vars.$xs vars.$m;
   cursor: pointer;
 }
 
@@ -161,7 +166,7 @@
   background-color: var(--color-primary-light);
   min-height: 41px;
   button {
-    padding: 10px $-m;
+    padding: 10px vars.$m;
   }
 }
 
@@ -183,7 +188,7 @@
   .popup-title {
     color: #FFF;
     margin-inline-end: auto;
-    padding: 8px $-m;
+    padding: 8px vars.$m;
   }
   &.flex-container-row {
     display: flex !important;
@@ -226,7 +231,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .dropzone-landing-area {
   background-color: var(--color-primary-light);
-  padding: $-m $-l;
+  padding: vars.$m vars.$l;
   width: 100%;
   border: 1px dashed var(--color-primary);
   color: var(--color-primary);
@@ -275,8 +280,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   display: flex;
   margin: 1rem;
   flex-direction: row;
-  @include lightDark(background, #FFF, #444);
-  box-shadow: $bs-large;
+  @include mixins.lightDark(background, #FFF, #444);
+  box-shadow: vars.$bs-large;
   border-radius: 4px;
   overflow: hidden;
   padding-bottom: 3px;
@@ -354,7 +359,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   position: sticky;
   top: 0;
   z-index: 5;
-  @include lightDark(background-color, rgba(255, 255, 255, 0.85), rgba(80, 80, 80, 0.85));
+  @include mixins.lightDark(background-color, rgba(255, 255, 255, 0.85), rgba(80, 80, 80, 0.85));
 }
 .image-manager-filter-bar-bg {
   position: absolute;
@@ -367,16 +372,16 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .image-manager-filters {
-  box-shadow: $bs-med;
+  box-shadow: vars.$bs-med;
   border-radius: 4px;
   overflow: hidden;
   border-bottom: 0 !important;
-  @include whenDark {
+  @include mixins.whenDark {
     border: 1px solid #000 !important;
   }
   button {
     line-height: 0;
-    @include lightDark(background-color, #FFF, #333);
+    @include mixins.lightDark(background-color, #FFF, #333);
   }
   svg {
     margin: 0;
@@ -404,7 +409,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   padding: 0;
   cursor: pointer;
   aspect-ratio: 1;
-  @include lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(border-color, #ddd, #000);
   transition: all linear 80ms;
   overflow: hidden;
   &.selected {
@@ -441,7 +446,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   &:focus .image-meta {
     opacity: 1;
   }
-  @include smaller-than($m) {
+  @include mixins.smaller-than(vars.$bp-m) {
     .image-meta {
       display: none;
     }
@@ -450,7 +455,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .image-manager .load-more {
   text-align: center;
-  padding: $-s $-m;
+  padding: vars.$s vars.$m;
   clear: both;
   .loading-container {
     margin: 0;
@@ -467,7 +472,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .image-manager-warning {
-  @include lightDark(background, #FFF, #333);
+  @include mixins.lightDark(background, #FFF, #333);
   color: var(--color-warning);
   font-weight: bold;
   border-inline: 3px solid var(--color-warning);
@@ -479,16 +484,16 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   overflow-y: auto;
   overflow-x: hidden;
   border-inline-start: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(border-color, #ddd, #000);
   .inner {
     min-height: auto;
-    padding: $-m;
+    padding: vars.$m;
   }
   .image-manager-viewer img {
     max-width: 100%;
     max-height: 180px;
     display: block;
-    margin: 0 auto $-m auto;
+    margin: 0 auto vars.$m auto;
     box-shadow: 0 1px 21px 1px rgba(76, 76, 76, 0.3);
   }
   .image-manager-viewer {
@@ -501,7 +506,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     }
   }
 }
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .image-manager-sidebar {
     border-inline-start: 0;
   }
@@ -522,7 +527,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .tab-container.bordered [role="tablist"] button[role="tab"] {
   border-inline-end: 1px solid #DDD;
-  @include lightDark(border-inline-end-color, #DDD, #000);
+  @include mixins.lightDark(border-inline-end-color, #DDD, #000);
   &:last-child {
     border-inline-end: none;
   }
@@ -534,14 +539,14 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   justify-items: start;
   text-align: start;
   border-bottom: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #444);
-  margin-bottom: $-m;
+  @include mixins.lightDark(border-color, #ddd, #444);
+  margin-bottom: vars.$m;
 }
 
 .tab-container [role="tablist"] button[role="tab"] {
   display: inline-block;
-  padding: $-s;
-  @include lightDark(color, rgba(0, 0, 0, .5), rgba(255, 255, 255, .5));
+  padding: vars.$s;
+  @include mixins.lightDark(color, rgba(0, 0, 0, .5), rgba(255, 255, 255, .5));
   cursor: pointer;
   border-bottom: 2px solid transparent;
   margin-bottom: -1px;
@@ -551,8 +556,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     outline: 0 !important;
   }
   &:hover, &:focus {
-    @include lightDark(color, rgba(0, 0, 0, .8), rgba(255, 255, 255, .8));
-    @include lightDark(border-bottom-color,  rgba(0, 0, 0, .2), rgba(255, 255, 255, .2));
+    @include mixins.lightDark(color, rgba(0, 0, 0, .8), rgba(255, 255, 255, .8));
+    @include mixins.lightDark(border-bottom-color,  rgba(0, 0, 0, .2), rgba(255, 255, 255, .2));
   }
   &:focus {
     outline: 1px dotted var(--color-primary);
@@ -562,7 +567,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 .tab-container [role="tablist"].controls-card {
   margin-bottom: 0;
   border-bottom: 0;
-  padding: 0 $-xs;
+  padding: 0 vars.$xs;
 }
 
 .image-picker .none {
@@ -583,16 +588,16 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .code-editor .lang-options button {
   display: block;
-  padding: $-xs $-m;
+  padding: vars.$xs vars.$m;
   border-bottom: 1px solid;
-  @include lightDark(color, #333, #AAA);
-  @include lightDark(border-bottom-color, #EEE, #000);
+  @include mixins.lightDark(color, #333, #AAA);
+  @include mixins.lightDark(border-bottom-color, #EEE, #000);
   cursor: pointer;
   width: 100%;
   text-align: left;
   font-family: var(--font-code);
   font-size: 0.7rem;
-  padding-left: 24px + $-xs;
+  padding-left: 24px + vars.$xs;
   &:hover, &.active {
     background-color: var(--color-primary-light);
     color: var(--color-primary);
@@ -633,7 +638,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   background-color: var(--color-primary-light);
   width: 100%;
   color: var(--color-primary);
-  padding: $-xxs $-s;
+  padding: vars.$xxs vars.$s;
   margin-bottom: 0;
 }
 
@@ -648,7 +653,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   border-radius: 0;
   border: 0;
   border-bottom: 1px solid #DDD;
-  padding: $-xs $-s;
+  padding: vars.$xs vars.$s;
   height: auto;
 }
 
@@ -667,7 +672,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   height: 80vh;
 }
 
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   .code-editor .lang-options {
     display: none;
   }
@@ -680,21 +685,21 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .comments-container {
-  padding-inline: $-xl;
-  @include smaller-than($m) {
-    padding-inline: $-xs;
+  padding-inline: vars.$xl;
+  @include mixins.smaller-than(vars.$bp-m) {
+    padding-inline: vars.$xs;
   }
 }
 .comment-box {
   border-radius: 4px;
   border: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #000);
-  @include lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(background-color, #FFF, #222);
   .content {
     font-size: 0.666em;
-    padding: $-xs $-s;
+    padding: vars.$xs vars.$s;
     p, ul, ol {
-      font-size: $fs-m;
+      font-size: vars.$fs-m;
       margin: .5em 0;
     }
   }
@@ -708,7 +713,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   .actions button:focus {
     outline: 1px dotted var(--color-primary);
   }
-  @include smaller-than($m) {
+  @include mixins.smaller-than(vars.$bp-m) {
     .actions {
       opacity: 1;
     }
@@ -717,8 +722,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .comment-box .header {
   border-bottom: 1px solid #DDD;
-  padding: $-xs $-s;
-  @include lightDark(border-color, #DDD, #000);
+  padding: vars.$xs vars.$s;
+  @include mixins.lightDark(border-color, #DDD, #000);
   a {
     color: inherit;
   }
@@ -735,10 +740,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 .comment-thread-indicator {
   border-inline-start: 3px dotted #DDD;
-  @include lightDark(border-color, #DDD, #444);
-  margin-inline-start: $-xs;
-  width: $-l;
-  height: calc(100% - $-m);
+  @include mixins.lightDark(border-color, #DDD, #444);
+  margin-inline-start: vars.$xs;
+  width: vars.$l;
+  height: calc(100% - vars.$m);
 }
 
 .comment-branch .comment-branch .comment-branch .comment-branch .comment-thread-indicator {
@@ -748,7 +753,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 .comment-reply {
   display: none;
   margin: 0 !important;
-  margin-bottom: -$-xxs !important;
+  margin-bottom: -(vars.$xxs) !important;
 }
 
 .comment-branch .comment-branch .comment-branch .comment-branch .comment-reply {
@@ -760,17 +765,17 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     font-size: 0.8rem;
   }
   .header {
-    padding: $-xs;
+    padding: vars.$xs;
   }
   .right-meta {
     display: none;
   }
   .content {
-    padding: $-xs $-s;
+    padding: vars.$xs vars.$s;
   }
 }
 .comment-container-compact .comment-thread-indicator {
-  width: $-m;
+  width: vars.$m;
 }
 
 #tag-manager .drag-card {
@@ -792,15 +797,15 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     display: flex;
     flex-direction: column;
     border-inline-start: 1px solid;
-    @include lightDark(border-color, #ddd, #000);
+    @include mixins.lightDark(border-color, #ddd, #000);
   }
   .template-item-actions button {
     cursor: pointer;
     flex: 1;
-    @include lightDark(background-color, #FFF, #222);
+    @include mixins.lightDark(background-color, #FFF, #222);
     border: 0;
     border-top: 1px solid;
-    @include lightDark(border-color, #DDD, #000);
+    @include mixins.lightDark(border-color, #DDD, #000);
   }
   .template-item-actions button svg {
     margin: 0;
@@ -818,7 +823,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   border: 1px solid transparent;
   border-radius: 4px;
   line-height: normal;
-  padding: $-xs;
+  padding: vars.$xs;
   &:hover {
     border-color: #DDD;
   }
@@ -828,7 +833,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 .dropdown-search-toggle-select {
   display: flex;
-  gap: $-s;
+  gap: vars.$s;
   line-height: normal;
   .svg-icon {
     height: 26px;
@@ -862,7 +867,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .dropdown-search-dropdown {
-  box-shadow: $bs-med;
+  box-shadow: vars.$bs-med;
   overflow: hidden;
   min-height: 100px;
   width: 240px;
@@ -871,16 +876,16 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   z-index: 80;
   right: 0;
   top: 0;
-  margin-top: $-m;
-  @include rtl {
+  margin-top: vars.$m;
+  @include mixins.rtl {
     right: auto;
-    left: -$-m;
+    left: -(vars.$m);
   }
   .dropdown-search-search .svg-icon {
     position: absolute;
-    left: $-s;
-    @include rtl {
-      right: $-s;
+    left: vars.$s;
+    @include mixins.rtl {
+      right: vars.$s;
       left: auto;
     }
     top: 11px;
@@ -893,14 +898,14 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     text-align: start;
   }
   .dropdown-search-item {
-    padding: $-s $-m;
+    padding: vars.$s vars.$m;
     &:hover,&:focus {
       background-color: #F2F2F2;
       text-decoration: none;
     }
   }
   input, input:focus {
-    padding-inline-start: $-xl;
+    padding-inline-start: vars.$xl;
     border-radius: 0;
     border: 0;
     border-bottom: 1px solid #DDD;
@@ -910,9 +915,9 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   }
 }
 
-@include smaller-than($l) {
+@include mixins.smaller-than(vars.$bp-l) {
   .dropdown-search-dropdown {
-    inset-inline: $-m auto;
+    inset-inline: vars.$m auto;
   }
   .dropdown-search-dropdown .dropdown-search-list {
     max-height: 240px;
@@ -924,13 +929,13 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 .item-list-row {
   border: 1.5px solid;
-  @include lightDark(border-color, #E2E2E2, #444);
+  @include mixins.lightDark(border-color, #E2E2E2, #444);
   border-bottom-width: 0;
   label {
     padding-bottom: 0;
   }
   &:hover {
-    @include lightDark(background-color, #F6F6F6, #333);
+    @include mixins.lightDark(background-color, #F6F6F6, #333);
   }
 }
 .item-list-row:first-child {
@@ -980,7 +985,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 .shortcut-hint {
   position: fixed;
-  padding: $-xxs $-xxs;
+  padding: vars.$xxs vars.$xxs;
   font-size: .85rem;
   font-weight: 700;
   line-height: 1;
@@ -996,8 +1001,8 @@ $btt-size: 40px;
 .back-to-top {
   background-color: var(--color-primary);
   position: fixed;
-  bottom: $-m;
-  right: $-l;
+  bottom: vars.$m;
+  right: vars.$l;
   padding: 5px 7px;
   cursor: pointer;
   color: #FFF;
@@ -1036,17 +1041,17 @@ $btt-size: 40px;
   max-height: 280px;
   overflow-y: scroll;
   border: 1px solid;
-  @include lightDark(border-color, #DDD, #000);
+  @include mixins.lightDark(border-color, #DDD, #000);
   border-radius: 3px;
   min-height: 20px;
-  @include lightDark(background-color, #EEE, #000);
+  @include mixins.lightDark(background-color, #EEE, #000);
 }
 .scroll-box-item {
   border-bottom: 1px solid;
   border-top: 1px solid;
-  @include lightDark(border-color, #DDD, #000);
+  @include mixins.lightDark(border-color, #DDD, #000);
   margin-top: -1px;
-  @include lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(background-color, #FFF, #222);
   display: flex;
   align-items: flex-start;
   padding: 1px;
@@ -1055,7 +1060,7 @@ $btt-size: 40px;
   }
   &:hover {
     cursor: pointer;
-    @include lightDark(background-color, #f8f8f8, #333);
+    @include mixins.lightDark(background-color, #f8f8f8, #333);
   }
   .handle {
     color: #AAA;
@@ -1068,13 +1073,13 @@ $btt-size: 40px;
     margin: 0;
   }
   > * {
-    padding: $-xs $-m;
+    padding: vars.$xs vars.$m;
   }
   .handle + * {
     padding-left: 0;
   }
   &:hover .handle {
-    @include lightDark(color, #444, #FFF);
+    @include mixins.lightDark(color, #444, #FFF);
   }
   &:hover button {
     opacity: 1;
@@ -1087,8 +1092,8 @@ $btt-size: 40px;
 input.scroll-box-search, .scroll-box-header-item {
   font-size: 0.8rem;
   border: 1px solid;
-  @include lightDark(border-color, #DDD, #000);
-  @include lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(border-color, #DDD, #000);
+  @include mixins.lightDark(background-color, #FFF, #222);
   margin-bottom: -1px;
   border-radius: 3px 3px 0 0;
   width: 100%;
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index 7d130bb0c24..b0176d64ef1 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 /**
  * Page Content
  * Styles specific to blocks used within page content.
@@ -13,14 +16,14 @@
   }
   img.align-left, table.align-left, iframe.align-left, video.align-left {
     float: left !important;
-    margin: $-xs $-m $-m 0;
+    margin: vars.$xs vars.$m vars.$m 0;
   }
   .align-right {
     text-align: right !important;
   }
   img.align-right, table.align-right, iframe.align-right, video.align-right {
     float: right !important;
-    margin: $-xs 0 $-xs $-s;
+    margin: vars.$xs 0 vars.$xs vars.$s;
   }
   .align-center {
     text-align: center;
@@ -40,7 +43,7 @@
   }
   hr {
     clear: both;
-    margin: $-m 0;
+    margin: vars.$m 0;
   }
   table {
     hyphens: auto;
@@ -63,23 +66,23 @@
 
   details {
     border: 1px solid;
-    @include lightDark(border-color, #DDD, #555);
+    @include mixins.lightDark(border-color, #DDD, #555);
     margin-bottom: 1em;
-    padding: $-s;
+    padding: vars.$s;
   }
   details > summary {
-    margin-top: -$-s;
-    margin-left: -$-s;
-    margin-right: -$-s;
-    margin-bottom: -$-s;
+    margin-top: -(vars.$s);
+    margin-left: -(vars.$s);
+    margin-right: -(vars.$s);
+    margin-bottom: -(vars.$s);
     font-weight: bold;
-    @include lightDark(background-color, #EEE, #333);
-    padding: $-xs $-s;
+    @include mixins.lightDark(background-color, #EEE, #333);
+    padding: vars.$xs vars.$s;
   }
   details[open] > summary {
-    margin-bottom: $-s;
+    margin-bottom: vars.$s;
     border-bottom: 1px solid;
-    @include lightDark(border-color, #DDD, #555);
+    @include mixins.lightDark(border-color, #DDD, #555);
   }
   details > summary + * {
     margin-top: .2em;
@@ -138,10 +141,10 @@ body .page-content img,
   border-inline-start: 3px solid #BBB;
   border-inline-end: none;
   background-color: #EEE;
-  padding: $-s;
-  padding-left: $-xl;
-  padding-inline-start: $-xl;
-  padding-inline-end: $-s;
+  padding: vars.$s;
+  padding-left: vars.$xl;
+  padding-inline-start: vars.$xl;
+  padding-inline-end: vars.$s;
   display: block;
   position: relative;
   overflow: auto;
@@ -151,8 +154,8 @@ body .page-content img,
     content: '';
     width: 1.2em;
     height: 1.2em;
-    left: $-xs + 2px;
-    inset-inline-start: $-xs + 2px;
+    left: vars.$xs + 2px;
+    inset-inline-start: vars.$xs + 2px;
     inset-inline-end: unset;
     top: 50%;
     margin-top: -9px;
@@ -162,30 +165,30 @@ body .page-content img,
     opacity: 0.8;
   }
   &.success {
-    @include lightDark(border-color, $positive, $positive-dark);
-    @include lightDark(background-color, #eafdeb, #122913);
-    @include lightDark(color, #063409, $positive-dark);
+    @include mixins.lightDark(border-color, vars.$positive, vars.$positive-dark);
+    @include mixins.lightDark(background-color, #eafdeb, #122913);
+    @include mixins.lightDark(color, #063409, vars.$positive-dark);
   }
   &.success:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMzNzZjMzkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEyIDJDNi40OCAyIDIgNi40OCAyIDEyczQuNDggMTAgMTAgMTAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDJ6bS0yIDE1bC01LTUgMS40MS0xLjQxTDEwIDE0LjE3bDcuNTktNy41OUwxOSA4bC05IDl6Ii8+PC9zdmc+");
   }
   &.danger {
-    @include lightDark(border-color, $negative, $negative-dark);
-    @include lightDark(background-color, #fcdbdb, #250505);
-    @include lightDark(color, #4d0706, $negative-dark);
+    @include mixins.lightDark(border-color, vars.$negative, vars.$negative-dark);
+    @include mixins.lightDark(background-color, #fcdbdb, #250505);
+    @include mixins.lightDark(color, #4d0706, vars.$negative-dark);
   }
   &.danger:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiOTE4MTgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0xNS43MyAzSDguMjdMMyA4LjI3djcuNDZMOC4yNyAyMWg3LjQ2TDIxIDE1LjczVjguMjdMMTUuNzMgM3pNMTIgMTcuM2MtLjcyIDAtMS4zLS41OC0xLjMtMS4zIDAtLjcyLjU4LTEuMyAxLjMtMS4zLjcyIDAgMS4zLjU4IDEuMyAxLjMgMCAuNzItLjU4IDEuMy0xLjMgMS4zem0xLTQuM2gtMlY3aDJ2NnoiLz4gICAgPHBhdGggZD0iTTAgMGgyNHYyNEgweiIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
   }
   &.info {
-    @include lightDark(border-color, $info, $info-dark);
-    @include lightDark(background-color, #d3efff, #001825);
-    @include lightDark(color, #01466c, $info-dark);
+    @include mixins.lightDark(border-color, vars.$info, vars.$info-dark);
+    @include mixins.lightDark(background-color, #d3efff, #001825);
+    @include mixins.lightDark(color, #01466c, vars.$info-dark);
   }
   &.warning {
-    @include lightDark(border-color, $warning, $warning-dark);
-    @include lightDark(background-color, #fee3d3, #30170a);
-    @include lightDark(color, #6a2802, $warning-dark);
+    @include mixins.lightDark(border-color, vars.$warning, vars.$warning-dark);
+    @include mixins.lightDark(background-color, #fee3d3, #30170a);
+    @include mixins.lightDark(color, #6a2802, vars.$warning-dark);
   }
   &.warning:before {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiNiNjUzMWMiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ICAgIDxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz4gICAgPHBhdGggZD0iTTEgMjFoMjJMMTIgMiAxIDIxem0xMi0zaC0ydi0yaDJ2MnptMC00aC0ydi00aDJ2NHoiLz48L3N2Zz4=");
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index b33cb4d0558..e273f1942d5 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 // Common variables
 :root {
   --editor-color-primary: #206ea7;
@@ -262,11 +265,11 @@ body.editor-is-fullscreen {
   color: #FFF;
 }
 .editor-modal-title {
-  padding: 8px $-m;
+  padding: 8px vars.$m;
 }
 .editor-modal-close {
   color: #FFF;
-  padding: 8px $-m;
+  padding: 8px vars.$m;
   align-items: center;
   justify-content: center;
   cursor: pointer;
@@ -281,7 +284,7 @@ body.editor-is-fullscreen {
   }
 }
 .editor-modal-body {
-  padding: $-m;
+  padding: vars.$m;
 }
 
 // Specific UI elements
@@ -493,21 +496,21 @@ textarea.editor-form-field-input {
 .editor-form-actions {
   display: flex;
   justify-content: end;
-  gap: $-s;
-  margin-top: $-m;
+  gap: vars.$s;
+  margin-top: vars.$m;
 }
 .editor-form-actions > button {
   display: block;
   font-size: 0.85rem;
   line-height: 1.4em;
-  padding: $-xs*1.3 $-m;
+  padding: vars.$xs*1.3 vars.$m;
   font-weight: 400;
   border-radius: 4px;
   cursor: pointer;
   box-shadow: none;
   &:focus {
     outline: 1px dotted currentColor;
-    outline-offset: -$-xs;
+    outline-offset: -(vars.$xs);
     box-shadow: none;
     filter: brightness(90%);
   }
@@ -517,20 +520,20 @@ textarea.editor-form-field-input {
   color: #FFF;
   border: 1px solid var(--color-primary);
   &:hover {
-    @include lightDark(box-shadow, $bs-light, $bs-dark);
+    @include mixins.lightDark(box-shadow, vars.$bs-light, vars.$bs-dark);
     filter: brightness(110%);
   }
 }
 .editor-form-action-secondary {
   border: 1px solid;
-  @include lightDark(border-color, #CCC, #666);
-  @include lightDark(color, #666, #AAA);
+  @include mixins.lightDark(border-color, #CCC, #666);
+  @include mixins.lightDark(color, #666, #AAA);
   &:hover, &:focus, &:active {
-    @include lightDark(color, #444, #BBB);
+    @include mixins.lightDark(color, #444, #BBB);
     border: 1px solid #CCC;
     box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
     background-color: #F2F2F2;
-    @include lightDark(background-color, #f8f8f8, #444);
+    @include mixins.lightDark(background-color, #f8f8f8, #444);
     filter: none;
   }
   &:active {
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 1c679aaa0dd..b66688f8d20 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -1,13 +1,18 @@
+@use "sass:math";
+
+@use "mixins";
+@use "vars";
+
 
 .input-base {
   border-radius: 3px;
   border: 1px solid #D4D4D4;
-  @include lightDark(background-color, #fff, #333);
-  @include lightDark(border-color, #d4d4d4, #111);
-  @include lightDark(color, #666, #AAA);
+  @include mixins.lightDark(background-color, #fff, #333);
+  @include mixins.lightDark(border-color, #d4d4d4, #111);
+  @include mixins.lightDark(color, #666, #AAA);
   display: inline-block;
-  font-size: $fs-m;
-  padding: $-xs*1.8;
+  font-size: vars.$fs-m;
+  padding: vars.$xs*1.8;
   height: 40px;
   width: 250px;
   max-width: 100%;
@@ -49,7 +54,7 @@
   #markdown-editor-input {
     font-style: normal;
     font-weight: 400;
-    padding: $-xs $-m;
+    padding: vars.$xs vars.$m;
     color: #444;
     border-radius: 0;
     max-height: 100%;
@@ -72,7 +77,7 @@
 .markdown-editor-wrap {
   border-top: 1px solid #DDD;
   border-bottom: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #000);
+  @include mixins.lightDark(border-color, #ddd, #000);
   position: relative;
   flex: 1;
   min-width: 0;
@@ -92,11 +97,11 @@
 
 .markdown-panel-divider {
   width: 2px;
-  @include lightDark(background-color, #ddd, #000);
+  @include mixins.lightDark(background-color, #ddd, #000);
   cursor: col-resize;
 }
 
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   #markdown-editor {
     flex-direction: column;
   }
@@ -109,7 +114,7 @@
   }
   .editor-toolbar-label {
     float: none !important;
-    @include lightDark(border-color, #DDD, #555);
+    @include mixins.lightDark(border-color, #DDD, #555);
     display: block;
   }
   .markdown-editor-wrap:not(.active) .editor-toolbar + div,
@@ -150,10 +155,10 @@ html.markdown-editor-display.dark-mode {
   font-size: 11px;
   line-height: 1.6;
   border-bottom: 1px solid #CCC;
-  @include lightDark(background-color, #FFF, #333);
-  @include lightDark(border-color, #CCC, #000);
+  @include mixins.lightDark(background-color, #FFF, #333);
+  @include mixins.lightDark(border-color, #CCC, #000);
   flex: none;
-  @include whenDark {
+  @include mixins.whenDark {
     button {
       color: #AAA;
     }
@@ -161,12 +166,12 @@ html.markdown-editor-display.dark-mode {
 }
 
 .editor-toolbar .buttons {
-  font-size: $fs-m;
+  font-size: vars.$fs-m;
   .dropdown-menu {
     padding: 0;
   }
   .toggle-switch {
-    margin: $-s 0;
+    margin: vars.$s 0;
   }
 }
 
@@ -175,18 +180,18 @@ html.markdown-editor-display.dark-mode {
   width: 2rem;
   text-align: center;
   border-left: 1px solid;
-  @include lightDark(border-color, #DDD, #555);
+  @include mixins.lightDark(border-color, #DDD, #555);
   svg {
     margin-inline-end: 0;
   }
   &:hover {
-    @include lightDark(background-color, #DDD, #222);
+    @include mixins.lightDark(background-color, #DDD, #222);
   }
 }
 
 
 label {
-  @include lightDark(color, #666, #ddd);
+  @include mixins.lightDark(color, #666, #ddd);
   display: block;
   line-height: 1.4em;
   font-size: 0.94em;
@@ -202,12 +207,12 @@ label.radio, label.checkbox {
   font-weight: 400;
   user-select: none;
   input[type="radio"], input[type="checkbox"] {
-    margin-inline-end: $-xs;
+    margin-inline-end: vars.$xs;
   }
 }
 
 label.inline.checkbox {
-  margin-inline-end: $-m;
+  margin-inline-end: vars.$m;
 }
 
 label + p.small {
@@ -218,7 +223,7 @@ table.form-table {
   max-width: 100%;
   td {
     overflow: hidden;
-    padding: math.div($-xxs, 2) 0;
+    padding: math.div(vars.$xxs, 2) 0;
   }
 }
 
@@ -236,7 +241,7 @@ select {
   background-position: calc(100% - 20px) 64%;
   background-repeat: no-repeat;
 
-  @include rtl {
+  @include mixins.rtl {
     background-position: 20px 70%;
   }
 }
@@ -257,9 +262,9 @@ input[type=color] {
 .toggle-switch {
   user-select: none;
   display: inline-grid;
-  grid-template-columns: (16px + $-s) 1fr;
+  grid-template-columns: (16px + vars.$s) 1fr;
   align-items: center;
-  margin: $-m 0;
+  margin: vars.$m 0;
   .custom-checkbox {
     width: 16px;
     height: 16px;
@@ -302,7 +307,7 @@ input[type=color] {
 }
 .toggle-switch-list {
   .toggle-switch {
-    margin: $-xs 0;
+    margin: vars.$xs 0;
   }
   &.compact .toggle-switch {
     margin: 1px 0;
@@ -310,18 +315,18 @@ input[type=color] {
 }
 
 .form-group {
-  margin-bottom: $-s;
+  margin-bottom: vars.$s;
 }
 
 .setting-list > div {
   border-bottom: 1px solid #DDD;
-  padding: $-xl 0;
+  padding: vars.$xl 0;
   &:last-child {
     border-bottom: none;
   }
 }
 .setting-list-label {
-  @include lightDark(color, #222, #DDD);
+  @include mixins.lightDark(color, #222, #DDD);
   color: #222;
   font-size: 1rem;
 }
@@ -329,7 +334,7 @@ input[type=color] {
   margin-bottom: 0;
 }
 .setting-list-label + .grid {
-  margin-top: $-m;
+  margin-top: vars.$m;
 }
 
 .setting-list .grid, .stretch-inputs {
@@ -349,19 +354,19 @@ input[type=color] {
 
 .form-group {
   div.text-pos, div.text-neg, p.text-post, p.text-neg {
-    padding: $-xs 0;
+    padding: vars.$xs 0;
   }
 }
 
 .form-group.collapsible {
-  padding: 0 $-m;
+  padding: 0 vars.$m;
   border: 1px solid;
-  @include lightDark(border-color, #DDD, #000);
+  @include mixins.lightDark(border-color, #DDD, #000);
   border-radius: 4px;
   .collapse-title {
-    margin-inline-start: -$-m;
-    margin-inline-end: -$-m;
-    padding: $-s $-m;
+    margin-inline-start: -(vars.$m);
+    margin-inline-end: -(vars.$m);
+    padding: vars.$s vars.$m;
     display: block;
     width: calc(100% + 32px);
     text-align: start;
@@ -377,13 +382,13 @@ input[type=color] {
   .collapse-title label:before {
     display: inline-block;
     content: '▸';
-    margin-inline-end: $-m;
+    margin-inline-end: vars.$m;
     transition: all ease-in-out 400ms;
     transform: rotate(0);
   }
   .collapse-content {
     display: none;
-    padding-bottom: $-m;
+    padding-bottom: vars.$m;
   }
   &.open .collapse-title label:before {
     transform: rotate(90deg);
@@ -407,7 +412,7 @@ input[type=color] {
 .title-input input[type="text"] {
   display: block;
   width: 100%;
-  padding: $-s;
+  padding: vars.$s;
   margin-top: 0;
   font-size: 2em;
   height: auto;
@@ -416,15 +421,15 @@ input[type=color] {
 .description-input textarea {
   display: block;
   width: 100%;
-  padding: $-s;
-  font-size: $fs-m;
+  padding: vars.$s;
+  font-size: vars.$fs-m;
   color: #666;
   height: auto;
 }
 
 .description-input > .tox-tinymce {
   border: 1px solid #DDD !important;
-  @include lightDark(border-color, #DDD !important, #000 !important);
+  @include mixins.lightDark(border-color, #DDD !important, #000 !important);
   border-radius: 3px;
   .tox-toolbar__primary {
     justify-content: end;
@@ -437,7 +442,7 @@ input[type=color] {
   button[tabindex="-1"] {
     background-color: transparent;
     border: none;
-    @include lightDark(color, #666, #AAA);
+    @include mixins.lightDark(color, #666, #AAA);
     padding: 0;
     cursor: pointer;
     position: absolute;
@@ -446,8 +451,8 @@ input[type=color] {
   }
   input {
     display: block;
-    padding: $-xs * 1.5;
-    padding-inline-start: $-l + 4px;
+    padding: vars.$xs * 1.5;
+    padding-inline-start: vars.$l + 4px;
     width: 300px;
     max-width: 100%;
     height: auto;
@@ -466,10 +471,10 @@ input[type=color] {
   height: 38px;
   z-index: -1;
   &.floating {
-    box-shadow: $bs-med;
+    box-shadow: vars.$bs-med;
     border-radius: 4px;
     overflow: hidden;
-    @include whenDark {
+    @include mixins.whenDark {
       border: 1px solid #000;
     }
   }
@@ -477,7 +482,7 @@ input[type=color] {
     height: 100%;
     border-radius: 0;
     border: 1px solid #ddd;
-    @include lightDark(border-color, #ddd, #000);
+    @include mixins.lightDark(border-color, #ddd, #000);
     margin-inline-start: -1px;
     &:last-child {
       border-inline-end: 0;
@@ -486,7 +491,7 @@ input[type=color] {
   input {
     border: 0;
     flex: 5;
-    padding: $-xs $-s;
+    padding: vars.$xs vars.$s;
     &:focus, &:active {
       outline: 1px dotted var(--color-primary);
       outline-offset: -2px;
@@ -498,8 +503,8 @@ input[type=color] {
     width: 48px;
     border-inline-start: 1px solid #DDD;
     background-color: #FFF;
-    @include lightDark(background-color, #FFF, #333);
-    @include lightDark(color, #444, #AAA);
+    @include mixins.lightDark(background-color, #FFF, #333);
+    @include mixins.lightDark(color, #444, #AAA);
   }
   button:focus {
     outline: 1px dotted var(--color-primary);
@@ -508,7 +513,7 @@ input[type=color] {
   svg {
     margin: 0;
   }
-  @include smaller-than($s) {
+  @include mixins.smaller-than(vars.$bp-s) {
     width: 180px;
   }
 }
@@ -548,30 +553,30 @@ input[type=color] {
 .custom-simple-file-input {
   max-width: 100%;
   border: 1px solid;
-  @include lightDark(border-color, #DDD, #666);
+  @include mixins.lightDark(border-color, #DDD, #666);
   border-radius: 4px;
-  padding: $-s $-m;
+  padding: vars.$s vars.$m;
 }
 .custom-simple-file-input::file-selector-button {
   background-color: transparent;
   text-decoration: none;
   font-size: 0.8rem;
   line-height: 1.4em;
-  padding: $-xs $-s;
+  padding: vars.$xs vars.$s;
   border: 1px solid;
   font-weight: 400;
   outline: 0;
   border-radius: 4px;
   cursor: pointer;
-  margin-right: $-m;
-  @include lightDark(color, #666, #AAA);
-  @include lightDark(border-color, #CCC, #666);
+  margin-right: vars.$m;
+  @include mixins.lightDark(color, #666, #AAA);
+  @include mixins.lightDark(border-color, #CCC, #666);
   &:hover, &:focus, &:active {
-    @include lightDark(color, #444, #BBB);
+    @include mixins.lightDark(color, #444, #BBB);
     border: 1px solid #CCC;
     box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
     background-color: #F2F2F2;
-    @include lightDark(background-color, #f8f8f8, #444);
+    @include mixins.lightDark(background-color, #f8f8f8, #444);
     filter: none;
   }
   &:active {
diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss
index d72b6672948..3ec7275a480 100644
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 /**
  * Includes the main navigation header and the faded toolbar.
  */
@@ -6,7 +9,7 @@ header.grid {
   grid-template-columns: minmax(max-content, 2fr) 1fr minmax(max-content, 2fr);
 }
 
-@include smaller-than($l) {
+@include mixins.smaller-than(vars.$bp-l) {
   header.grid {
     grid-template-columns: 1fr;
     grid-row-gap: 0;
@@ -20,8 +23,8 @@ header {
   top: 0;
   color: rgb(250, 250, 250);
   border-bottom: 1px solid #DDD;
-  box-shadow: $bs-card;
-  @include lightDark(border-bottom-color, #DDD, #000);
+  box-shadow: vars.$bs-card;
+  @include mixins.lightDark(border-bottom-color, #DDD, #000);
   .header-links {
     display: flex;
     align-items: center;
@@ -33,7 +36,7 @@ header {
   }
   .links a {
     display: inline-block;
-    padding: 10px $-m;
+    padding: 10px vars.$m;
     color: #FFF;
     border-radius: 3px;
   }
@@ -42,7 +45,7 @@ header {
     background-color: rgba(255, 255, 255, .15);
   }
   .dropdown-container {
-    padding-inline-start: $-m;
+    padding-inline-start: vars.$m;
     padding-inline-end: 0;
   }
   .avatar, .user-name {
@@ -58,12 +61,12 @@ header {
     display: inline-flex;
     align-items: center;
     cursor: pointer;
-    padding: $-s;
-    margin: 0 (-$-s);
+    padding: vars.$s;
+    margin: 0 (-(vars.$s));
     border-radius: 3px;
-    gap: $-xs;
+    gap: vars.$xs;
     > span {
-      padding-inline-start: $-xs;
+      padding-inline-start: vars.$xs;
       display: inline-block;
       line-height: 1;
     }
@@ -75,8 +78,8 @@ header {
     &:hover {
       background-color: rgba(255, 255, 255, 0.15);
     }
-    @include between($l, $xl) {
-      padding-inline-start: $-xs;
+    @include mixins.between(vars.$bp-l, vars.$bp-xl) {
+      padding-inline-start: vars.$xs;
       .name {
         display: none;
       }
@@ -98,7 +101,7 @@ header .search-box {
     color: #EEE;
     z-index: 2;
     height: auto;
-    padding: $-xs*1.5;
+    padding: vars.$xs*1.5;
     padding-inline-start: 40px;
     &:focus {
       outline: none;
@@ -109,7 +112,7 @@ header .search-box {
     color: #FFF;
     opacity: 0.6;
   }
-  @include between($l, $xl) {
+  @include mixins.between(vars.$bp-l, vars.$bp-xl) {
     max-width: 200px;
   }
   &:focus-within #header-search-box-button {
@@ -122,7 +125,7 @@ header .search-box {
   top: 10px;
   color: #FFF;
   opacity: 0.6;
-  @include lightDark(color, rgba(255, 255, 255, 0.8), #AAA);
+  @include mixins.lightDark(color, rgba(255, 255, 255, 0.8), #AAA);
   svg {
     margin-inline-end: 0;
   }
@@ -131,15 +134,15 @@ header .search-box {
 .global-search-suggestions {
   display: none;
   position: absolute;
-  top: -$-s;
+  top: -(vars.$s);
   left: 0;
   right: 0;
   z-index: -1;
-  margin-left: -$-xxl;
-  margin-right: -$-xxl;
+  margin-left: -(vars.$xxl);
+  margin-right: -(vars.$xxl);
   padding-top: 56px;
   border-radius: 3px;
-  box-shadow: $bs-hover;
+  box-shadow: vars.$bs-hover;
   transform-origin: top center;
   opacity: .5;
   transform: scale(0.9);
@@ -166,19 +169,19 @@ header .search-box.search-active:focus-within {
     display: block;
   }
   input {
-    @include lightDark(background-color, #EEE, #333);
-    @include lightDark(border-color, #DDD, #111);
+    @include mixins.lightDark(background-color, #EEE, #333);
+    @include mixins.lightDark(border-color, #DDD, #111);
   }
   #header-search-box-button, input {
-    @include lightDark(color, #444, #AAA);
+    @include mixins.lightDark(color, #444, #AAA);
   }
 }
 
 .logo {
   display: inline-flex;
-  padding: ($-s - 6px) $-s;
-  margin: 6px (-$-s);
-  gap: $-s;
+  padding: (vars.$s - 6px) vars.$s;
+  margin: 6px (-(vars.$s));
+  gap: vars.$s;
   align-items: center;
   border-radius: 4px;
   &:hover {
@@ -204,7 +207,7 @@ header .search-box.search-active:focus-within {
   font-size: 2em;
   border: 2px solid rgba(255, 255, 255, 0.8);
   border-radius: 4px;
-  padding: 0 $-xs;
+  padding: 0 vars.$xs;
   line-height: 1;
   cursor: pointer;
   user-select: none;
@@ -215,18 +218,18 @@ header .search-box.search-active:focus-within {
 }
 
 
-@include smaller-than($l) {
+@include mixins.smaller-than(vars.$bp-l) {
   header .header-links {
-    @include lightDark(background-color, #fff, #333);
+    @include mixins.lightDark(background-color, #fff, #333);
     display: none;
     z-index: 10;
-    inset-inline-end: $-m;
+    inset-inline-end: vars.$m;
     border-radius: 4px;
     overflow: hidden;
     position: absolute;
-    box-shadow: $bs-hover;
-    margin-top: $-m;
-    padding: $-xs 0;
+    box-shadow: vars.$bs-hover;
+    margin-top: vars.$m;
+    padding: vars.$xs 0;
     &.show {
       display: block;
     }
@@ -235,14 +238,14 @@ header .search-box.search-active:focus-within {
     text-align: start;
     display: grid;
     align-items: center;
-    padding: 8px $-m;
-    gap: $-m;
-    color: $text-dark;
+    padding: 8px vars.$m;
+    gap: vars.$m;
+    color: vars.$text-dark;
     grid-template-columns: 16px auto;
     line-height: 1.4;
-    @include lightDark(color, $text-dark, #eee);
+    @include mixins.lightDark(color, vars.$text-dark, #eee);
     svg {
-      margin-inline-end: $-s;
+      margin-inline-end: vars.$s;
       width: 16px;
     }
     &:hover {
@@ -251,7 +254,7 @@ header .search-box.search-active:focus-within {
       text-decoration: none;
     }
     &:focus {
-      @include lightDark(background-color, #eee, #333);
+      @include mixins.lightDark(background-color, #eee, #333);
       outline-color: var(--color-primary);
       color: var(--color-primary);
     }
@@ -280,19 +283,19 @@ header .search-box.search-active:focus-within {
   z-index: 5;
   background-color: #FFF;
   border-bottom: 1px solid #DDD;
-  @include lightDark(border-bottom-color, #DDD, #333);
-  box-shadow: $bs-card;
+  @include mixins.lightDark(border-bottom-color, #DDD, #333);
+  box-shadow: vars.$bs-card;
 }
 .tri-layout-mobile-tab {
   text-align: center;
   border-bottom: 3px solid #BBB;
   cursor: pointer;
   margin: 0;
-  @include lightDark(background-color, #FFF, #222);
-  @include lightDark(border-bottom-color, #BBB, #333);
+  @include mixins.lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(border-bottom-color, #BBB, #333);
   &:first-child {
     border-inline-end: 1px solid #DDD;
-    @include lightDark(border-inline-end-color, #DDD, #000);
+    @include mixins.lightDark(border-inline-end-color, #DDD, #000);
   }
   &[aria-selected="true"] {
     border-bottom-color: currentColor !important;
@@ -308,8 +311,8 @@ header .search-box.search-active:focus-within {
   opacity: 0.7;
   .icon-list-item {
     width: auto;
-    padding-top: $-xs;
-    padding-bottom: $-xs;
+    padding-top: vars.$xs;
+    padding-bottom: vars.$xs;
   }
   .separator {
     display: inline-block;
@@ -326,9 +329,9 @@ header .search-box.search-active:focus-within {
   }
 }
 
-@include smaller-than($l) {
+@include mixins.smaller-than(vars.$bp-l) {
   .breadcrumbs .icon-list-item {
-    padding: $-xs;
+    padding: vars.$xs;
     > span + span {
       display: none;
     }
@@ -355,5 +358,5 @@ header .search-box.search-active:focus-within {
 
 .faded span.faded-text {
   display: inline-block;
-  padding: $-s;
+  padding: vars.$s;
 }
\ No newline at end of file
diff --git a/resources/sass/_html.scss b/resources/sass/_html.scss
index 1d5defa9765..edaff081045 100644
--- a/resources/sass/_html.scss
+++ b/resources/sass/_html.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 * {
   box-sizing: border-box;
   outline-color: var(--color-primary);
@@ -21,9 +24,9 @@ html {
 }
 
 body {
-  font-size: $fs-m;
+  font-size: vars.$fs-m;
   line-height: 1.6;
-  @include lightDark(color, #444, #AAA);
+  @include mixins.lightDark(color, #444, #AAA);
   -webkit-font-smoothing: antialiased;
   height: 100%;
   display: flex;
diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 6c78419d86c..8175db948a5 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -1,13 +1,16 @@
+@use "mixins";
+@use "vars";
+
 
 /**
  * Generic content container
  */
 .container {
-  max-width: $xxl;
+  max-width: vars.$bp-xxl;
   margin-inline-start: auto;
   margin-inline-end: auto;
-  padding-inline-start: $-m;
-  padding-inline-end: $-m;
+  padding-inline-start: vars.$m;
+  padding-inline-end: vars.$m;
   &.medium {
     max-width: 1100px;
   }
@@ -24,8 +27,8 @@
  */
 .grid {
   display: grid;
-  grid-column-gap: $-l;
-  grid-row-gap: $-l;
+  grid-column-gap: vars.$l;
+  grid-row-gap: vars.$l;
   > * {
     min-width: 0;
   }
@@ -42,15 +45,15 @@
     grid-template-columns: 1fr 3fr;
   }
   &.gap-y-xs {
-    grid-row-gap: $-xs;
+    grid-row-gap: vars.$xs;
   }
   &.gap-xl {
-    grid-column-gap: $-xl;
-    grid-row-gap: $-xl;
+    grid-column-gap: vars.$xl;
+    grid-row-gap: vars.$xl;
   }
   &.gap-xxl {
-    grid-column-gap: $-xxl;
-    grid-row-gap: $-xxl;
+    grid-column-gap: vars.$xxl;
+    grid-row-gap: vars.$xxl;
   }
   &.v-center {
     align-items: center;
@@ -67,7 +70,7 @@
   }
 }
 
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .grid.third:not(.no-break) {
     grid-template-columns: 1fr 1fr;
   }
@@ -78,8 +81,8 @@
     grid-template-columns: 1fr 1fr;
   }
   .grid.gap-xl {
-    grid-column-gap: $-m;
-    grid-row-gap: $-m;
+    grid-column-gap: vars.$m;
+    grid-row-gap: vars.$m;
   }
   .grid.right-focus.reverse-collapse > *:nth-child(2) {
     order: 0;
@@ -89,13 +92,13 @@
   }
 }
 
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   .grid.third:not(.no-break) {
     grid-template-columns: 1fr;
   }
 }
 
-@include smaller-than($xs) {
+@include mixins.smaller-than(vars.$bp-xs) {
   .grid.half.collapse-xs {
     grid-template-columns: 1fr;
   }
@@ -287,19 +290,19 @@ body.flexbox {
 
 .sticky-top-m {
   position: sticky;
-  top: $-m;
+  top: vars.$m;
 }
 
 /**
  * Visibility
  */
-@each $sizeLetter, $size in $screen-sizes {
-  @include smaller-than($size) {
+@each $sizeLetter, $size in vars.$screen-sizes {
+  @include mixins.smaller-than($size) {
     .hide-under-#{$sizeLetter} {
       display: none !important;
     }
   }
-  @include larger-than($size) {
+  @include mixins.larger-than($size) {
     .hide-over-#{$sizeLetter} {
       display: none !important;
     }
@@ -333,7 +336,7 @@ body.flexbox {
   columns: 2;
 }
 
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .dual-column-content {
     columns: 1;
   }
@@ -357,11 +360,11 @@ body.flexbox {
  */
 .tri-layout-container {
   display: grid;
-  margin-inline-start: $-xl;
-  margin-inline-end: $-xl;
+  margin-inline-start: vars.$xl;
+  margin-inline-end: vars.$xl;
   grid-template-columns: 1fr 4fr 1fr;
   grid-template-areas: "a b c";
-  grid-column-gap: $-xl;
+  grid-column-gap: vars.$xl;
   position: relative;
 }
 .tri-layout-sides {
@@ -379,7 +382,7 @@ body.flexbox {
 }
 .tri-layout-middle {
   grid-area: b;
-  padding-top: $-m;
+  padding-top: vars.$m;
   min-width: 0;
   z-index: 5;
 }
@@ -392,9 +395,9 @@ body.flexbox {
   min-width: 0;
 }
 
-@include larger-than($xxl) {
+@include mixins.larger-than(vars.$bp-xxl) {
   .tri-layout-left-contents, .tri-layout-right-contents {
-    padding: $-xl $-m;
+    padding: vars.$xl vars.$m;
     position: sticky;
     top: 0;
     max-height: 100vh;
@@ -413,22 +416,22 @@ body.flexbox {
     margin: 0 auto;
   }
 }
-@include between($xxl, $xxxl) {
+@include mixins.between(vars.$bp-xxl, vars.$bp-xxxl) {
   .tri-layout-sides-content, .tri-layout-container {
-    grid-template-columns: 1fr calc(940px + (2 * $-m)) 1fr;
+    grid-template-columns: 1fr calc(940px + (2 * vars.$m)) 1fr;
   }
   .tri-layout-container {
-    grid-column-gap: $-s;
-    margin-inline-start: $-m;
-    margin-inline-end: $-m;
+    grid-column-gap: vars.$s;
+    margin-inline-start: vars.$m;
+    margin-inline-end: vars.$m;
   }
 }
-@include smaller-than($xxl) {
+@include mixins.smaller-than(vars.$bp-xxl) {
   .tri-layout-container {
     grid-template-areas:  "a b b";
     grid-template-columns: 1fr 3fr;
     grid-template-rows: min-content min-content 1fr;
-    padding-inline-end: $-l;
+    padding-inline-end: vars.$l;
   }
   .tri-layout-sides {
     grid-column-start: a;
@@ -438,7 +441,7 @@ body.flexbox {
     display: block;
   }
 }
-@include between($l, $xxl) {
+@include mixins.between(vars.$bp-l, vars.$bp-xxl) {
   .tri-layout-sides-content {
     position: sticky;
     top: 0;
@@ -454,12 +457,12 @@ body.flexbox {
     }
   }
 }
-@include larger-than($l) {
+@include mixins.larger-than(vars.$bp-l) {
   .tri-layout-mobile-tabs {
     display: none;
   }
   .tri-layout-left-contents > *, .tri-layout-right-contents > * {
-    @include lightDark(opacity, 0.6, 0.75);
+    @include mixins.lightDark(opacity, 0.6, 0.75);
     transition: opacity ease-in-out 120ms;
     &:hover, &:focus-within {
       opacity: 1 !important;
@@ -469,16 +472,16 @@ body.flexbox {
     }
   }
 }
-@include smaller-than($l) {
+@include mixins.smaller-than(vars.$bp-l) {
   .tri-layout-container {
     grid-template-areas:  none;
     grid-template-columns: 1fr;
     grid-column-gap: 0;
-    padding-inline-end: $-xs;
-    padding-inline-start: $-xs;
+    padding-inline-end: vars.$xs;
+    padding-inline-start: vars.$xs;
     .tri-layout-sides {
-      padding-inline-start: $-m;
-      padding-inline-end: $-m;
+      padding-inline-start: vars.$m;
+      padding-inline-end: vars.$m;
       grid-column: 1/1;
     }
     .tri-layout-left > *, .tri-layout-right > * {
@@ -512,7 +515,7 @@ body.flexbox {
   }
 }
 
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .tri-layout-container {
     margin-inline-start: 0;
     margin-inline-end: 0;
diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 00aa04f485c..fd76f498ed1 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 
 .book-contents .entity-list-item {
   .icon {
@@ -6,7 +9,7 @@
     justify-self: stretch;
     align-self: stretch;
     height: auto;
-    margin-inline-end: $-xs;
+    margin-inline-end: vars.$xs;
   }
   .icon:after {
     opacity: 0.5;
@@ -25,7 +28,7 @@
 
 .entity-list-item + .chapter-expansion {
   display: flex;
-  padding: 0 $-m $-m $-m;
+  padding: 0 vars.$m vars.$m vars.$m;
   align-items: center;
   border: 0;
   width: 100%;
@@ -58,7 +61,7 @@
   }
   .chapter-contents-toggle {
     border-radius: 0 4px 4px 0;
-    padding: $-xs ($-m + $-xxs);
+    padding: vars.$xs (vars.$m + vars.$xxs);
     width: 100%;
     text-align: start;
   }
@@ -86,20 +89,20 @@
 }
 
 .sidebar-page-nav {
-  $nav-indent: $-m;
+  $nav-indent: vars.$m;
   list-style: none;
-  @include margin($-s, 0, $-m, $-xs);
+  @include mixins.margin(vars.$s, 0, vars.$m, vars.$xs);
   position: relative;
   &:after {
     content: '';
     display: block;
     position: absolute;
     left: 0;
-    @include rtl {
+    @include mixins.rtl {
       left: auto;
       right: 0;
     }
-    @include lightDark(background-color, rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.2));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.2));
     width: 2px;
     top: 5px;
     bottom: 5px;
@@ -132,7 +135,7 @@
     font-weight: bold;
   }
   li:not(.current-heading) .sidebar-page-nav-bullet {
-    @include lightDark(background-color, #BBB, #666, true);
+    @include mixins.lightDark(background-color, #BBB, #666, true);
   }
   .sidebar-page-nav-bullet {
     width: 6px;
@@ -142,9 +145,9 @@
     top: 30%;
     border-radius: 50%;
     box-shadow: 0 0 0 6px #F2F2F2;
-    @include lightDark(box-shadow, 0 0 0 6px #F2F2F2, 0 0 0 6px #111);
+    @include mixins.lightDark(box-shadow, 0 0 0 6px #F2F2F2, 0 0 0 6px #111);
     z-index: 1;
-    @include rtl {
+    @include mixins.rtl {
       left: auto;
       right: -2px;
     }
@@ -154,7 +157,7 @@
 // Sidebar list
 .book-tree .sidebar-page-list  {
   list-style: none;
-  @include margin($-xs, -$-s, 0, -$-s);
+  @include mixins.margin(vars.$xs, -(vars.$s), 0, -(vars.$s));
   padding-inline-start: 0;
   padding-inline-end: 0;
 
@@ -172,22 +175,22 @@
     padding-inline-end: 0;
     .content {
       width: 100%;
-      padding-top: $-xs;
-      padding-bottom: $-xs;
+      padding-top: vars.$xs;
+      padding-bottom: vars.$xs;
       max-width: calc(100% - 20px);
     }
   }
   .entity-list-item.selected {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
   }
   .entity-list-item.no-hover {
-    margin-top: -$-xs;
+    margin-top: -(vars.$xs);
     padding-inline-end: 0;
   }
   .entity-list-item-name {
     font-size: 1em;
     margin: 0;
-    margin-inline-end: $-m;
+    margin-inline-end: vars.$m;
   }
   .chapter-child-menu {
     font-size: .8rem;
@@ -198,13 +201,13 @@
     display: block;
     width: 100%;
     text-align: start;
-    padding: $-xxs $-s ($-xxs * 2) $-s;
+    padding: vars.$xxs vars.$s (vars.$xxs * 2) vars.$s;
     border-radius: 0 3px 3px 0;
     line-height: 1;
-    margin-top: -$-xxs;
-    margin-bottom: -$-xxs;
+    margin-top: -(vars.$xxs);
+    margin-bottom: -(vars.$xxs);
     &:hover {
-      @include lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
+      @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
     }
   }
   .entity-list-item .icon {
@@ -236,8 +239,8 @@
   list-style: none;
 }
 .sort-box {
-  margin-bottom: $-m;
-  padding: $-m $-xl;
+  margin-bottom: vars.$m;
+  padding: vars.$m vars.$xl;
   position: relative;
   &::before {
     pointer-events: none;
@@ -279,14 +282,14 @@
     margin-inline-start: 0;
   }
   .sortable-page-sublist {
-    margin-bottom: $-m;
+    margin-bottom: vars.$m;
     margin-top: 0;
-    padding-inline-start: $-m;
+    padding-inline-start: vars.$m;
   }
   li {
-    @include lightDark(background-color, #FFF, #222);
+    @include mixins.lightDark(background-color, #FFF, #222);
     border: 1px solid;
-    @include lightDark(border-color, #DDD, #666);
+    @include mixins.lightDark(border-color, #DDD, #666);
     margin-top: -1px;
     min-height: 38px;
   }
@@ -294,7 +297,7 @@
     border-inline-start: 2px solid currentColor;
   }
   li:first-child {
-    margin-top: $-xs;
+    margin-top: vars.$xs;
   }
 }
 .sortable-page-list li.placeholder {
@@ -335,21 +338,21 @@ details.sort-box[open] summary .caret-container svg {
 }
 
 .activity-list-item {
-  padding: $-s 0;
+  padding: vars.$s 0;
   display: grid;
   grid-template-columns: min-content 1fr;
-  grid-column-gap: $-m;
+  grid-column-gap: vars.$m;
   font-size: 0.9em;
 }
 .card .activity-list-item {
-  padding-block: $-s;
+  padding-block: vars.$s;
 }
 
 .user-list-item {
   display: inline-grid;
-  padding: $-s;
+  padding: vars.$s;
   grid-template-columns: min-content 1fr;
-  grid-column-gap: $-m;
+  grid-column-gap: vars.$m;
   font-size: 0.9em;
   align-items: center;
   > div:first-child {
@@ -360,7 +363,7 @@ details.sort-box[open] summary .caret-container svg {
 ul.pagination {
   display: inline-flex;
   list-style: none;
-  margin: $-m 0;
+  margin: vars.$m 0;
   padding-inline-start: 1px;
   li:first-child {
     a, span {
@@ -374,19 +377,19 @@ ul.pagination {
   }
   a, span {
     display: block;
-    padding: $-xxs $-s;
+    padding: vars.$xxs vars.$s;
     border: 1px solid #CCC;
     margin-inline-start: -1px;
     user-select: none;
-    @include lightDark(color, #555, #eee);
-    @include lightDark(border-color, #ccc, #666);
+    @include mixins.lightDark(color, #555, #eee);
+    @include mixins.lightDark(border-color, #ccc, #666);
   }
   li.disabled {
     cursor: not-allowed;
   }
   li.active span {
-    @include lightDark(color, #111, #eee);
-    @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.5));
+    @include mixins.lightDark(color, #111, #eee);
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.5));
   }
 }
 
@@ -395,7 +398,7 @@ ul.pagination {
 }
 
 .entity-list, .icon-list {
-  margin: 0 (-$-m);
+  margin: 0 (-(vars.$m));
   h4 {
     margin: 0;
   }
@@ -405,7 +408,7 @@ ul.pagination {
   .text-small.text-muted {
     color: #AAA;
     font-size: 0.75em;
-    margin-top: $-xs;
+    margin-top: vars.$xs;
   }
   .text-muted p.text-muted {
     margin-top: 0;
@@ -420,7 +423,7 @@ ul.pagination {
 }
 
 .icon-list hr {
-  margin: $-s $-m;
+  margin: vars.$s vars.$m;
   max-width: 140px;
   opacity: 0.25;
   height: 1.1px;
@@ -431,10 +434,10 @@ ul.pagination {
 }
 
 .entity-list-item, .icon-list-item {
-  padding: $-s $-m;
+  padding: vars.$s vars.$m;
   display: flex;
   align-items: center;
-  gap: $-m;
+  gap: vars.$m;
   background-color: transparent;
   border: 0;
   width: 100%;
@@ -458,7 +461,7 @@ ul.pagination {
     cursor: pointer;
   }
   &:not(.no-hover):hover {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
     text-decoration: none;
     border-radius: 4px;
   }
@@ -466,7 +469,7 @@ ul.pagination {
     background-color: transparent;
   }
   &:focus {
-    @include lightDark(background-color, #eee, #222);
+    @include mixins.lightDark(background-color, #eee, #222);
     outline: 1px dotted #666;
     outline-offset: -2px;
   }
@@ -493,7 +496,7 @@ ul.pagination {
 .split-icon-list-item {
   display: flex;
   align-items: center;
-  gap: $-m;
+  gap: vars.$m;
   background-color: transparent;
   border: 0;
   width: 100%;
@@ -501,10 +504,10 @@ ul.pagination {
   word-break: break-word;
   border-radius: 4px;
   > a {
-    padding: $-s $-m;
+    padding: vars.$s vars.$m;
     display: flex;
     align-items: center;
-    gap: $-m;
+    gap: vars.$m;
     flex: 1;
   }
   > a:hover {
@@ -515,7 +518,7 @@ ul.pagination {
     flex: none;
   }
   &:hover {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
   }
 }
 
@@ -532,21 +535,21 @@ ul.pagination {
   visibility: visible;
 }
 .icon-list-item-dropdown-toggle {
-  padding: $-xs;
+  padding: vars.$xs;
   display: flex;
   align-items: center;
   cursor: pointer;
-  @include lightDark(color, #888, #999);
+  @include mixins.lightDark(color, #888, #999);
   svg {
     margin: 0;
   }
   &:hover {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.06), rgba(255, 255, 255, 0.06));
   }
 }
 
 .card .entity-list-item:not(.no-hover, .book-contents .entity-list-item):hover {
-  @include lightDark(background-color, #F2F2F2, #2d2d2d);
+  @include mixins.lightDark(background-color, #F2F2F2, #2d2d2d);
   border-radius: 0;
 }
 .card .entity-list-item .entity-list-item:hover {
@@ -554,10 +557,10 @@ ul.pagination {
 }
 
 .entity-list-item-children {
-  padding: $-m $-l;
+  padding: vars.$m vars.$l;
   > div {
     overflow: hidden;
-    padding: 0 0 $-xs 0;
+    padding: 0 0 vars.$xs 0;
   }
   .entity-chip {
     text-overflow: ellipsis;
@@ -568,7 +571,7 @@ ul.pagination {
     white-space: nowrap;
   }
   > .entity-list > .entity-list-item:last-child {
-    margin-bottom: -$-xs;
+    margin-bottom: -(vars.$xs);
   }
 }
 
@@ -580,22 +583,22 @@ ul.pagination {
   background-position: 50% 50%;
   border-radius: 3px;
   position: relative;
-  margin-inline-end: $-l;
+  margin-inline-end: vars.$l;
 
   &.entity-list-item-image-wide {
     width: 220px;
   }
 
   .svg-icon {
-    @include lightDark(color, #fff, rgba(255, 255, 255, 0.6));
+    @include mixins.lightDark(color, #fff, rgba(255, 255, 255, 0.6));
     font-size: 1.66rem;
     margin-inline-end: 0;
     position: absolute;
-    bottom: $-xs;
-    left: $-xs;
+    bottom: vars.$xs;
+    left: vars.$xs;
   }
 
-  @include smaller-than($m) {
+  @include mixins.smaller-than(vars.$bp-m) {
     width: 80px;
   }
 }
@@ -605,7 +608,7 @@ ul.pagination {
 }
 
 .entity-list.compact {
-  font-size: 0.6 * $fs-m;
+  font-size: 0.6 * vars.$fs-m;
   h4, a {
     line-height: 1.2;
   }
@@ -613,8 +616,8 @@ ul.pagination {
     display: none;
   }
   .entity-list-item p {
-    font-size: $fs-m * 0.8;
-    padding-top: $-xs;
+    font-size: vars.$fs-m * 0.8;
+    padding-top: vars.$xs;
   }
   .entity-list-item p:empty {
     padding-top: 0;
@@ -624,12 +627,12 @@ ul.pagination {
   }
   > p.empty-text {
     display: block;
-    font-size: $fs-m;
+    font-size: vars.$fs-m;
   }
   hr {
     margin: 0;
   }
-  @include smaller-than($m) {
+  @include mixins.smaller-than(vars.$bp-m) {
     h4 {
       font-size: 1.666em;
     }
@@ -660,13 +663,13 @@ ul.pagination {
   top: 0;
   list-style: none;
   inset-inline-end: 0;
-  margin: $-m 0;
-  @include lightDark(background-color, #fff, #333);
+  margin: vars.$m 0;
+  @include mixins.lightDark(background-color, #fff, #333);
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.18);
   border-radius: 3px;
   min-width: 180px;
-  padding: $-xs 0;
-  @include lightDark(color, #555, #eee);
+  padding: vars.$xs 0;
+  @include mixins.lightDark(color, #555, #eee);
   fill: currentColor;
   text-align: start !important;
   max-height: 500px;
@@ -697,11 +700,11 @@ ul.pagination {
     border-bottom: 1px solid #DDD;
   }
   li hr {
-    margin: $-xs 0;
+    margin: vars.$xs 0;
   }
   .icon-item, .text-item, .label-item {
-    padding: 8px $-m;
-    @include lightDark(color, #555, #eee);
+    padding: 8px vars.$m;
+    @include mixins.lightDark(color, #555, #eee);
     fill: currentColor;
     white-space: nowrap;
     line-height: 1.4;
@@ -721,7 +724,7 @@ ul.pagination {
       outline-offset: -2px;
     }
     svg {
-      margin-inline-end: $-s;
+      margin-inline-end: vars.$s;
       display: inline-block;
       width: 16px;
     }
@@ -733,7 +736,7 @@ ul.pagination {
     display: grid;
     align-items: center;
     grid-template-columns: auto min-content;
-    gap: $-m;
+    gap: vars.$m;
   }
   .label-item > *:nth-child(2) {
     opacity: 0.7;
@@ -745,7 +748,7 @@ ul.pagination {
     display: grid;
     align-items: start;
     grid-template-columns: 16px auto;
-    gap: $-m;
+    gap: vars.$m;
     svg {
       margin-inline-end: 0;
       margin-block-start: 1px;
@@ -757,7 +760,7 @@ ul.pagination {
 // being cut by scrollable container.
 .tri-layout-right .dropdown-menu,
 .tri-layout-left .dropdown-menu {
-  inset-inline-end: $-xs;
+  inset-inline-end: vars.$xs;
 }
 
 // Books grid view
@@ -781,7 +784,7 @@ ul.pagination {
 .featured-image-container-wrap {
   position: relative;
   .svg-icon {
-    @include lightDark(color, #fff, rgba(255, 255, 255, 0.6));
+    @include mixins.lightDark(color, #fff, rgba(255, 255, 255, 0.6));
     font-size: 2rem;
     margin-inline-end: 0;
     position: absolute;
@@ -800,30 +803,30 @@ ul.pagination {
   background: transparent;
   border: none;
   color: currentColor;
-  padding: $-m 0;
+  padding: vars.$m 0;
 }
 
 .active-link-list {
   a {
     display: inline-block;
-    padding: $-s;
+    padding: vars.$s;
   }
   a:not(.active) {
-    @include lightDark(color, #444, #888);
+    @include mixins.lightDark(color, #444, #888);
   }
   a:hover {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
     border-radius: 4px;
     text-decoration: none;
   }
   &.in-sidebar {
     a {
       display: block;
-      margin-bottom: $-xs;
+      margin-bottom: vars.$xs;
     }
     a.active {
       border-radius: 4px;
-      @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+      @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
     }
   }
 }
@@ -833,7 +836,7 @@ ul.pagination {
   line-height: 1.2;
   margin: 0.6em 0;
   align-content: start;
-  gap: $-s;
+  gap: vars.$s;
   a {
     line-height: 1.2;
   }
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 426f7961c72..17bcfcfbf11 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 .page-editor {
   display: flex;
   flex-direction: column;
@@ -22,8 +25,8 @@
 .page-editor-page-area {
   width: 100%;
   border-radius: 8px;
-  box-shadow: $bs-card;
-  @include lightDark(background-color, #FFF, #333)
+  box-shadow: vars.$bs-card;
+  @include mixins.lightDark(background-color, #FFF, #333)
 }
 
 .page-edit-toolbar {
@@ -34,7 +37,7 @@
   align-items: center;
 }
 
-@include larger-than($xxl) {
+@include mixins.larger-than(vars.$bp-xxl) {
   .page-editor-wysiwyg2024 .page-edit-toolbar,
   .page-editor-wysiwyg2024 .page-editor-page-area,
   .page-editor-wysiwyg .page-edit-toolbar,
@@ -48,7 +51,7 @@
   }
 }
 
-@include smaller-than($m) {
+@include mixins.smaller-than(vars.$bp-m) {
   .page-edit-toolbar {
     display: flex;
     flex-direction: row;
@@ -76,7 +79,7 @@
     position: relative;
     outline-offset: -1px;
     outline: 1px dashed var(--color-primary);
-    box-shadow: $bs-card;
+    box-shadow: vars.$bs-card;
     z-index: 50;
   }
 }
@@ -96,7 +99,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
 }
 
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   .page-edit-toolbar {
     overflow-x: scroll;
     overflow-y: visible;
@@ -116,9 +119,9 @@ body.tox-fullscreen, body.markdown-fullscreen {
   width: 52px;
   height: 52px;
   font-size: 26px;
-  inset-inline-end: $-xs;
-  bottom: $-s;
-  box-shadow: $bs-hover;
+  inset-inline-end: vars.$xs;
+  bottom: vars.$s;
+  box-shadow: vars.$bs-hover;
   background-color: currentColor;
   text-align: center;
   svg {
@@ -150,10 +153,10 @@ body.tox-fullscreen, body.markdown-fullscreen {
 }
 .pointer {
   border: 1px solid #CCC;
-  @include lightDark(border-color, #ccc, #000);
+  @include mixins.lightDark(border-color, #ccc, #000);
   border-radius: 4px;
   box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.1);
-  @include lightDark(background-color, #fff, #333);
+  @include mixins.lightDark(background-color, #fff, #333);
   width: 275px;
 
   &.is-page-editable {
@@ -174,8 +177,8 @@ body.tox-fullscreen, body.markdown-fullscreen {
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     z-index: 56;
-    @include lightDark(background-color, #fff, #333);
-    @include lightDark(border-color, #ccc, #000);
+    @include mixins.lightDark(background-color, #fff, #333);
+    @include mixins.lightDark(border-color, #ccc, #000);
   }
   input, button, a {
     position: relative;
@@ -188,14 +191,14 @@ body.tox-fullscreen, body.markdown-fullscreen {
   input {
     background-color: #FFF;
     border: 1px solid #DDD;
-    @include lightDark(border-color, #ddd, #000);
+    @include mixins.lightDark(border-color, #ddd, #000);
     color: #666;
     width: 160px;
     z-index: 40;
     padding: 5px 10px;
   }
   .text-button {
-    @include lightDark(color, #444, #AAA);
+    @include mixins.lightDark(color, #444, #AAA);
   }
   .input-group .button {
     line-height: 1;
@@ -210,22 +213,22 @@ body.tox-fullscreen, body.markdown-fullscreen {
     height: 1.2em;
   }
   .button {
-    @include lightDark(border-color, #ddd, #000);
+    @include mixins.lightDark(border-color, #ddd, #000);
   }
 }
 
 // Page editor sidebar toolbox
 .floating-toolbox {
-  @include lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(background-color, #FFF, #222);
   overflow: hidden;
   align-items: stretch;
   flex-direction: row;
   display: flex;
   max-height: 100%;
   border-radius: 8px;
-  box-shadow: $bs-card;
+  box-shadow: vars.$bs-card;
   margin-bottom: auto;
-  margin-inline-start: $-l;
+  margin-inline-start: vars.$l;
   position: relative;
   &.open {
     position: relative;
@@ -254,23 +257,23 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
   .tabs {
     border-inline-end: 1px solid #DDD;
-    @include lightDark(border-inline-end-color, #DDD, #000);
+    @include mixins.lightDark(border-inline-end-color, #DDD, #000);
     width: 40px;
     flex: 0 1 auto;
     margin-inline-end: -1px;
   }
   .tabs-inner {
-    @include lightDark(background-color, #FFFFFF, #222);
+    @include mixins.lightDark(background-color, #FFFFFF, #222);
   }
   .tabs svg {
     padding: 0;
     margin: 0;
   }
   .tabs-inner > button {
-    @include lightDark(color, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.5));
+    @include mixins.lightDark(color, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.5));
     display: block;
     cursor: pointer;
-    padding: 10px $-xs;
+    padding: 10px vars.$xs;
     font-size: 18px;
     line-height: 1.6;
   }
@@ -295,8 +298,8 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
   h4 {
     font-size: 24px;
-    margin: $-m 0 0 0;
-    padding: 0 $-l $-s $-l;
+    margin: vars.$m 0 0 0;
+    padding: 0 vars.$l vars.$s vars.$l;
   }
   .tags input {
     max-width: 100%;
@@ -304,8 +307,8 @@ body.tox-fullscreen, body.markdown-fullscreen {
     min-width: 50px;
   }
   .tags td, .inline-start-table > div > div > div {
-    padding-inline-end: $-s;
-    padding-top: $-s;
+    padding-inline-end: vars.$s;
+    padding-top: vars.$s;
     position: relative;
   }
   .handle {
@@ -324,13 +327,13 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
 }
 
-@include smaller-than($xxl) {
+@include mixins.smaller-than(vars.$bp-xxl) {
   .floating-toolbox {
-    margin-inline-start: $-s;
+    margin-inline-start: vars.$s;
   }
 }
 
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   .page-editor-page-area-wrap {
     margin: 4px !important;
   }
@@ -429,7 +432,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   border-radius: 3px;
   position: relative;
   overflow: hidden;
-  padding: $-xs $-s;
+  padding: vars.$xs vars.$s;
   fill: currentColor;
   opacity: 0.85;
   transition: opacity ease-in-out 120ms;
diff --git a/resources/sass/_spacing.scss b/resources/sass/_spacing.scss
index 14f8918dcb4..6b5e2f837d9 100644
--- a/resources/sass/_spacing.scss
+++ b/resources/sass/_spacing.scss
@@ -1,8 +1,10 @@
+@use "vars";
+
 // Here we generate spacing utility classes for our sizes for all box sides and axis.
 // These will output to classes like .px-m (Padding on x-axis, medium size) or .mr-l (Margin right, large size)
 
 @mixin spacing($prop, $propLetter) {
-  @each $sizeLetter, $size in $spacing {
+  @each $sizeLetter, $size in vars.$spacing {
     .#{$propLetter}-#{$sizeLetter} {
       #{$prop}: $size !important;
     }
@@ -31,7 +33,7 @@
 @include spacing('margin', 'm');
 @include spacing('padding', 'p');
 
-@each $sizeLetter, $size in $spacing {
+@each $sizeLetter, $size in vars.$spacing {
   .gap-#{$sizeLetter} {
     gap: $size !important;
   }
diff --git a/resources/sass/_tables.scss b/resources/sass/_tables.scss
index a3da3362122..16be32fb39b 100644
--- a/resources/sass/_tables.scss
+++ b/resources/sass/_tables.scss
@@ -1,8 +1,11 @@
+@use "mixins";
+@use "vars";
+
 table {
   min-width: 100px;
   max-width: 100%;
   thead {
-    @include lightDark(background-color, #f8f8f8, #333);
+    @include mixins.lightDark(background-color, #f8f8f8, #333);
     font-weight: 500;
   }
   td, th {
@@ -27,7 +30,7 @@ table.table {
   th, td {
     text-align: start;
     border: none;
-    padding: $-s $-s;
+    padding: vars.$s vars.$s;
     vertical-align: middle;
     margin: 0;
     overflow: visible;
@@ -36,7 +39,7 @@ table.table {
     font-weight: bold;
   }
   tr:hover {
-    @include lightDark(background-color, #F2F2F2, #333);
+    @include mixins.lightDark(background-color, #F2F2F2, #333);
   }
   .text-right {
     text-align: end;
@@ -51,10 +54,10 @@ table.table {
     display: inline-block;
   }
   &.expand-to-padding {
-    margin-left: -$-s;
-    margin-right: -$-s;
-    width: calc(100% + (2*#{$-s}));
-    max-width: calc(100% + (2*#{$-s}));
+    margin-left: -(vars.$s);
+    margin-right: -(vars.$s);
+    width: calc(100% + (2*#{vars.$s}));
+    max-width: calc(100% + (2*#{vars.$s}));
   }
 }
 
@@ -66,10 +69,10 @@ table.no-style {
 }
 
 table.list-table {
-  margin: 0 (-$-xs);
+  margin: 0 (-(vars.$xs));
   td {
     border: 0;
     vertical-align: middle;
-    padding: $-xs;
+    padding: vars.$xs;
   }
 }
\ No newline at end of file
diff --git a/resources/sass/_text.scss b/resources/sass/_text.scss
index 56e66195c38..04fd31e6df7 100644
--- a/resources/sass/_text.scss
+++ b/resources/sass/_text.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 /**
  * Fonts
  */
@@ -43,7 +46,7 @@ h1, h2, h3, h4, h5, h6 {
   position: relative;
   display: block;
   font-family: var(--font-heading, var(--font-body));
-  @include lightDark(color, #222, #BBB);
+  @include mixins.lightDark(color, #222, #BBB);
 }
 
 h5 {
@@ -56,7 +59,7 @@ h5, h6 {
   margin-bottom: 0.66em;
 }
 
-@include smaller-than($s) {
+@include mixins.smaller-than(vars.$bp-s) {
   h1 {
     font-size: 2.8275em;
   }
@@ -133,16 +136,16 @@ p, ul, ol, pre, table, blockquote {
 hr {
   border: 0;
   height: 1px;
-  @include lightDark(background, #eaeaea, #555);
-  margin-bottom: $-l;
+  @include mixins.lightDark(background, #eaeaea, #555);
+  margin-bottom: vars.$l;
   &.faded {
     background-image: linear-gradient(to right, #FFF, #e3e0e0 20%, #e3e0e0 80%, #FFF);
   }
   &.darker {
-    @include lightDark(background, #DDD, #666);
+    @include mixins.lightDark(background, #DDD, #666);
   }
   &.margin-top, &.even {
-    margin-top: $-l;
+    margin-top: vars.$l;
   }
 }
 
@@ -174,8 +177,8 @@ sub, .subscript {
 pre {
   font-size: 12px;
   border: 1px solid #DDD;
-  @include lightDark(background-color, #FFF, #2B2B2B);
-  @include lightDark(border-color, #DDD, #111);
+  @include mixins.lightDark(background-color, #FFF, #2B2B2B);
+  @include mixins.lightDark(border-color, #DDD, #111);
   border-radius: 4px;
   padding-inline-start: 26px;
   position: relative;
@@ -189,8 +192,8 @@ pre {
     width: 22.4px;
     inset-inline-start: 0;
     height: 100%;
-    @include lightDark(background-color, #f5f5f5, #313335);
-    @include lightDark(border-inline-end, 1px solid #DDD, none);
+    @include mixins.lightDark(background-color, #f5f5f5, #313335);
+    @include mixins.lightDark(border-inline-end, 1px solid #DDD, none);
   }
 }
 
@@ -208,16 +211,16 @@ blockquote {
   position: relative;
   border-left: 4px solid transparent;
   border-left-color: var(--color-primary);
-  @include lightDark(background-color, #f8f8f8, #333);
-  padding: $-s $-m $-s $-xl;
+  @include mixins.lightDark(background-color, #f8f8f8, #333);
+  padding: vars.$s vars.$m vars.$s vars.$xl;
   overflow: auto;
   &:before {
     content: "\201C";
     font-size: 2em;
     font-weight: bold;
     position: absolute;
-    top: $-s;
-    left: $-s;
+    top: vars.$s;
+    left: vars.$s;
     color: #777;
   }
 }
@@ -238,8 +241,8 @@ blockquote {
   font-size: 0.84em;
   border: 1px solid #DDD;
   border-radius: 3px;
-  @include lightDark(background-color, #f8f8f8, #2b2b2b);
-  @include lightDark(border-color, #DDD, #444);
+  @include mixins.lightDark(background-color, #f8f8f8, #2b2b2b);
+  @include mixins.lightDark(border-color, #DDD, #444);
 }
 
 code {
@@ -252,7 +255,7 @@ code {
 
 span.code {
   @extend .code-base;
-  padding: 1px $-xs;
+  padding: 1px vars.$xs;
 }
 
 pre code {
@@ -272,8 +275,8 @@ span.highlight {
  * Lists
  */
 ul, ol {
-  padding-left: $-m * 2.0;
-  padding-right: $-m * 2.0;
+  padding-left: vars.$m * 2.0;
+  padding-right: vars.$m * 2.0;
   display: flow-root;
   p {
     margin: 0;
@@ -300,8 +303,8 @@ li > ol, li > ul {
   margin-block-start: 0;
   padding-block-end: 0;
   padding-block-start: 0;
-  padding-left: $-m * 1.2;
-  padding-right: $-m * 1.2;
+  padding-left: vars.$m * 1.2;
+  padding-right: vars.$m * 1.2;
 }
 
 /**
@@ -312,17 +315,17 @@ li > ol, li > ul {
 li.checkbox-item, li.task-list-item {
   display: list-item;
   list-style: none;
-  margin-left: -($-m * 1.2);
-  margin-inline-start: -($-m * 1.2);
+  margin-left: -(vars.$m * 1.2);
+  margin-inline-start: -(vars.$m * 1.2);
   margin-inline-end: 0;
   input[type="checkbox"] {
-    margin-right: $-xs;
-    margin-inline-end: $-xs;
+    margin-right: vars.$xs;
+    margin-inline-end: vars.$xs;
     margin-inline-start: 0;
   }
   li.checkbox-item, li.task-list-item {
-    margin-left: $-xs;
-    margin-inline-start: $-xs;
+    margin-left: vars.$xs;
+    margin-inline-start: vars.$xs;
     margin-inline-end: 0;
   }
 }
@@ -344,8 +347,8 @@ li.checkbox-item, li.task-list-item {
   text-align: end;
 }
 
-@each $sizeLetter, $size in $screen-sizes {
-  @include larger-than($size) {
+@each $sizeLetter, $size in vars.$screen-sizes {
+  @include mixins.larger-than($size) {
     .text-#{$sizeLetter}-center {
       text-align: center;
     }
@@ -395,7 +398,7 @@ li.checkbox-item, li.task-list-item {
  * Grouping
  */
 .header-group {
-  margin: $-m 0;
+  margin: vars.$m 0;
   h1, h2, h3, h4, h5, h6 {
     margin: 0;
   }
@@ -403,7 +406,7 @@ li.checkbox-item, li.task-list-item {
 
 span.sep {
   color: #BBB;
-  padding: 0 $-xs;
+  padding: 0 vars.$xs;
 }
 
 .list > * {
@@ -419,7 +422,7 @@ span.sep {
   display: inline-block;
   position: relative;
   bottom: -0.105em;
-  margin-inline-end: $-xs;
+  margin-inline-end: vars.$xs;
   pointer-events: none;
   fill: currentColor;
 }
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 129e478212b..8cc96df4193 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 
 // Custom full screen mode
 .tox.tox-fullscreen {
@@ -35,7 +38,7 @@
   padding: 1rem;
   top: 4px;
   font-style: italic;
-  @include lightDark(color, rgba(34,47,62,.5), rgba(155,155,155,.5))
+  @include mixins.lightDark(color, rgba(34,47,62,.5), rgba(155,155,155,.5))
 }
 
 // Default styles for our custom root nodes
@@ -74,23 +77,23 @@ body.page-content.mce-content-body  {
   pointer-events: none;
 }
 .page-content.mce-content-body details doc-root {
-  padding: $-s;
-  margin-left: (2px - $-s);
-  margin-right: (2px - $-s);
-  margin-bottom: (2px - $-s);
-  margin-top: (2px - $-s);
+  padding: vars.$s;
+  margin-left: (2px - vars.$s);
+  margin-right: (2px - vars.$s);
+  margin-bottom: (2px - vars.$s);
+  margin-top: (2px - vars.$s);
   overflow: hidden;
 }
 
 // Allow alignment to be reflected in media embed wrappers
 .page-content.mce-content-body .mce-preview-object.align-right {
   float: right !important;
-  margin: $-xs 0 $-xs $-s;
+  margin: vars.$xs 0 vars.$xs vars.$s;
 }
 
 .page-content.mce-content-body .mce-preview-object.align-left {
   float: left !important;
-  margin: $-xs $-m $-m 0;
+  margin: vars.$xs vars.$m vars.$m 0;
 }
 
 .page-content.mce-content-body .mce-preview-object.align-center {
diff --git a/resources/sass/_variables.scss b/resources/sass/_vars.scss
similarity index 85%
rename from resources/sass/_variables.scss
rename to resources/sass/_vars.scss
index 35586bf5830..26539656e7f 100644
--- a/resources/sass/_variables.scss
+++ b/resources/sass/_vars.scss
@@ -2,30 +2,30 @@
 ///////////////
 
 // Screen breakpoints
-$xxxl: 1700px;
-$xxl: 1400px;
-$xl: 1100px;
-$l: 1000px;
-$m: 880px;
-$s: 600px;
-$xs: 400px;
-$xxs: 360px;
+$bp-xxxl: 1700px;
+$bp-xxl: 1400px;
+$bp-xl: 1100px;
+$bp-l: 1000px;
+$bp-m: 880px;
+$bp-s: 600px;
+$bp-xs: 400px;
+$bp-xxs: 360px;
 
 // List of screen sizes
-$screen-sizes: (('xxs', $xxs), ('xs', $xs), ('s', $s), ('m', $m), ('l', $l), ('xl', $xl));
+$screen-sizes: (('xxs', $bp-xxs), ('xs', $bp-xs), ('s', $bp-s), ('m', $bp-m), ('l', $bp-l), ('xl', $bp-xl));
 
 // Spacing (Margins+Padding)
-$-xxxl: 64px;
-$-xxl: 48px;
-$-xl: 32px;
-$-l: 24px;
-$-m: 16px;
-$-s: 12px;
-$-xs: 6px;
-$-xxs: 3px;
+$xxxl: 64px;
+$xxl: 48px;
+$xl: 32px;
+$l: 24px;
+$m: 16px;
+$s: 12px;
+$xs: 6px;
+$xxs: 3px;
 
 // List of our spacing sizes
-$spacing: (('none', 0), ('xxs', $-xxs), ('xs', $-xs), ('s', $-s), ('m', $-m), ('l', $-l), ('xl', $-xl), ('xxl', $-xxl), ('auto', auto));
+$spacing: (('none', 0), ('xxs', $xxs), ('xs', $xs), ('s', $s), ('m', $m), ('l', $l), ('xl', $xl), ('xxl', $xxl), ('auto', auto));
 
 // Fonts
 $font-body: -apple-system, BlinkMacSystemFont,
diff --git a/resources/sass/export-styles.scss b/resources/sass/export-styles.scss
index cfa1ebdf8a6..8dd7be375e8 100644
--- a/resources/sass/export-styles.scss
+++ b/resources/sass/export-styles.scss
@@ -1,10 +1,11 @@
 @use "sass:math";
-@import "variables";
-@import "mixins";
-@import "html";
-@import "text";
-@import "tables";
-@import "content";
+
+@use "vars";
+@use "mixins";
+@use "html";
+@use "text";
+@use "tables";
+@use "content";
 
 html, body {
   background-color: #FFF;
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 2106f86e625..c6642d0cad6 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -1,31 +1,31 @@
-@use "sass:math";
+@use "sass:meta";
 
-@import "reset";
-@import "variables";
-@import "mixins";
-@import "spacing";
-@import "opacity";
-@import "html";
-@import "text";
-@import "colors";
-@import "layout";
-@import "blocks";
-@import "buttons";
-@import "tables";
-@import "forms";
-@import "animations";
-@import "tinymce";
-@import "editor";
-@import "codemirror";
-@import "components";
-@import "header";
-@import "footer";
-@import "lists";
-@import "pages";
-@import "content";
+@use "reset";
+@use "vars";
+@use "mixins";
+@use "spacing";
+@use "opacity";
+@use "html";
+@use "text";
+@use "colors";
+@use "layout";
+@use "blocks";
+@use "buttons";
+@use "tables";
+@use "forms";
+@use "animations";
+@use "tinymce";
+@use "editor";
+@use "codemirror";
+@use "components";
+@use "header";
+@use "footer";
+@use "lists";
+@use "pages";
+@use "content";
 
 @media print {
-  @import "print";
+  @include meta.load-css("print");
 }
 
 // Jquery Sortable Styles
@@ -41,7 +41,7 @@ body.dragging, body.dragging * {
 // User Avatar Images
 .avatar {
   border-radius: 100%;
-  @include lightDark(background-color, #eee, #000);
+  @include mixins.lightDark(background-color, #eee, #000);
   width: 30px;
   height: 30px;
   &.med {
@@ -60,7 +60,7 @@ body.dragging, body.dragging * {
     border-radius: 3px;
   }
   &[src$="user_avatar.png"] {
-    @include whenDark {
+    @include mixins.whenDark {
       filter: invert(1);
     }
   }
@@ -71,7 +71,7 @@ $loadingSize: 10px;
 .loading-container {
   position: relative;
   display: block;
-  margin: $-xl auto;
+  margin: vars.$xl auto;
   > div {
     width: $loadingSize;
     height: $loadingSize;
@@ -79,7 +79,7 @@ $loadingSize: 10px;
     display: inline-block;
     vertical-align: top;
     transform: translate3d(-10px, 0, 0);
-    margin-top: $-xs;
+    margin-top: vars.$xs;
     animation-name: loadingBob;
     animation-duration: 1.4s;
     animation-iteration-count: infinite;
@@ -89,17 +89,17 @@ $loadingSize: 10px;
     animation-delay: -300ms;
   }
   > div:first-child {
-      left: -($loadingSize+$-xs);
+      left: -($loadingSize+vars.$xs);
       background-color: var(--color-book);
       animation-delay: -600ms;
   }
   > div:last-of-type {
-    left: $loadingSize+$-xs;
+    left: $loadingSize+vars.$xs;
     background-color: var(--color-chapter);
     animation-delay: 0ms;
   }
   > span {
-    margin-inline-start: $-s;
+    margin-inline-start: vars.$s;
     font-style: italic;
     color: #888;
     vertical-align: top;
@@ -107,7 +107,7 @@ $loadingSize: 10px;
 }
 
 .inline.block .loading-container {
-  margin: $-xs $-s;
+  margin: vars.$xs vars.$s;
 }
 
 .skip-to-content-link {
@@ -118,10 +118,10 @@ $loadingSize: 10px;
   z-index: 15;
   border-radius: 0 4px 4px 0;
   display: block;
-  box-shadow: $bs-dark;
+  box-shadow: vars.$bs-dark;
   font-weight: bold;
   &:focus {
-    top: $-xl;
+    top: vars.$xl;
     outline-offset: -10px;
     outline: 2px dotted var(--color-link);
   }
@@ -129,7 +129,7 @@ $loadingSize: 10px;
 
 .entity-selector {
   border: 1px solid #DDD;
-  @include lightDark(border-color, #ddd, #111);
+  @include mixins.lightDark(border-color, #ddd, #111);
   border-radius: 3px;
   overflow: hidden;
   font-size: 0.8em;
@@ -140,7 +140,7 @@ $loadingSize: 10px;
     border: 0;
     border-bottom: 1px solid #DDD;
     font-size: 16px;
-    padding: $-s $-m;
+    padding: vars.$s vars.$m;
   }
   input[type="text"]:focus {
     outline: 1px solid var(--color-primary);
@@ -150,12 +150,12 @@ $loadingSize: 10px;
   .entity-list {
     overflow-y: scroll;
     height: 400px;
-    @include lightDark(background-color, #eee, #222);
+    @include mixins.lightDark(background-color, #eee, #222);
     margin-inline-end: 0;
     margin-inline-start: 0;
   }
   .entity-list-item {
-    @include lightDark(background-color, #fff, #222);
+    @include mixins.lightDark(background-color, #fff, #222);
   }
   .entity-list-item p {
     margin-bottom: 0;
@@ -165,11 +165,11 @@ $loadingSize: 10px;
     outline-offset: -4px;
   }
   .entity-list-item.selected {
-    @include lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
+    @include mixins.lightDark(background-color, rgba(0, 0, 0, 0.05), rgba(255, 255, 255, 0.05));
   }
   .loading {
     height: 400px;
-    padding-top: $-l;
+    padding-top: vars.$l;
   }
   &.compact {
     font-size: 10px;
@@ -182,14 +182,14 @@ $loadingSize: 10px;
   }
   &.small {
     .entity-list-item {
-      padding: $-xs $-m;
+      padding: vars.$xs vars.$m;
     }
     .entity-list, .loading {
       height: 300px;
     }
     input[type="text"] {
       font-size: 13px;
-      padding: $-xs $-m;
+      padding: vars.$xs vars.$m;
       height: auto;
     }
   }
@@ -207,11 +207,11 @@ $loadingSize: 10px;
   z-index: 150;
 }
 
-@include between($s, $m) {
+@include mixins.between(vars.$bp-s, vars.$bp-m) {
   #home-default > .grid.third {
     display: block;
     columns: 2;
-    column-gap: $-l !important;
+    column-gap: vars.$l !important;
   }
 }
 
@@ -222,29 +222,29 @@ $loadingSize: 10px;
   }
   .list-sort {
     display: inline-grid;
-    margin-inline-start: $-s;
+    margin-inline-start: vars.$s;
     grid-template-columns: minmax(120px, max-content) 40px;
     font-size: 0.9rem;
     border: 2px solid #DDD;
-    @include lightDark(border-color, #ddd, #444);
+    @include mixins.lightDark(border-color, #ddd, #444);
     border-radius: 4px;
   }
   .list-sort-label {
     font-weight: bold;
     display: inline-block;
-    @include lightDark(color, #555, #888);
+    @include mixins.lightDark(color, #555, #888);
   }
   .list-sort-type {
     text-align: start;
   }
   .list-sort-type, .list-sort-dir {
-    padding: $-xs $-s;
+    padding: vars.$xs vars.$s;
     cursor: pointer;
   }
   .list-sort-dir {
     border-inline-start: 2px solid #DDD;
     color: #888;
-    @include lightDark(border-color, #ddd, #444);
+    @include mixins.lightDark(border-color, #ddd, #444);
     .svg-icon {
       transition: transform ease-in-out 120ms;
     }
@@ -256,5 +256,5 @@ $loadingSize: 10px;
 
 .import-item {
   border-inline-start: 2px solid currentColor;
-  padding-inline-start: $-xs;
+  padding-inline-start: vars.$xs;
 }
\ No newline at end of file

From 5632fef6212001ec8357c854f565b5e6a1df9c0f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 11 Dec 2024 14:22:48 +0000
Subject: [PATCH 401/666] Auth: Added specific guards against guest account
 login

Hardened things to enforce the intent that the guest account should not
be used for logins.
Currently this would not be allowed due to empty set password, and no
password fields on user edit forms, but an error could occur if the
login was attempted.

This adds:
- Handling to show normal invalid user warning on login instead of a
  hash check error.
- Prevention of guest user via main login route, in the event that
  inventive workarounds would be used by admins to set a password for
  this account.
- Test for guest user login.
---
 app/Access/LoginService.php                   | 35 +++++++++++++++++--
 .../LoginAttemptInvalidUserException.php      |  7 ++++
 tests/Auth/AuthTest.php                       | 20 +++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 app/Exceptions/LoginAttemptInvalidUserException.php

diff --git a/app/Access/LoginService.php b/app/Access/LoginService.php
index cc48e0f9bab..6607969afae 100644
--- a/app/Access/LoginService.php
+++ b/app/Access/LoginService.php
@@ -5,6 +5,7 @@
 use BookStack\Access\Mfa\MfaSession;
 use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\LoginAttemptException;
+use BookStack\Exceptions\LoginAttemptInvalidUserException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
@@ -29,10 +30,14 @@ public function __construct(
      * a reason to (MFA or Unconfirmed Email).
      * Returns a boolean to indicate the current login result.
      *
-     * @throws StoppedAuthenticationException
+     * @throws StoppedAuthenticationException|LoginAttemptInvalidUserException
      */
     public function login(User $user, string $method, bool $remember = false): void
     {
+        if ($user->isGuest()) {
+            throw new LoginAttemptInvalidUserException('Login not allowed for guest user');
+        }
+
         if ($this->awaitingEmailConfirmation($user) || $this->needsMfaVerification($user)) {
             $this->setLastLoginAttemptedForUser($user, $method, $remember);
 
@@ -58,7 +63,7 @@ public function login(User $user, string $method, bool $remember = false): void
      *
      * @throws Exception
      */
-    public function reattemptLoginFor(User $user)
+    public function reattemptLoginFor(User $user): void
     {
         if ($user->id !== ($this->getLastLoginAttemptUser()->id ?? null)) {
             throw new Exception('Login reattempt user does align with current session state');
@@ -152,16 +157,40 @@ public function awaitingEmailConfirmation(User $user): bool
      */
     public function attempt(array $credentials, string $method, bool $remember = false): bool
     {
+        if ($this->areCredentialsForGuest($credentials)) {
+            return false;
+        }
+
         $result = auth()->attempt($credentials, $remember);
         if ($result) {
             $user = auth()->user();
             auth()->logout();
-            $this->login($user, $method, $remember);
+            try {
+                $this->login($user, $method, $remember);
+            } catch (LoginAttemptInvalidUserException $e) {
+                // Catch and return false for non-login accounts
+                // so it looks like a normal invalid login.
+                return false;
+            }
         }
 
         return $result;
     }
 
+    /**
+     * Check if the given credentials are likely for the system guest account.
+     */
+    protected function areCredentialsForGuest(array $credentials): bool
+    {
+        if (isset($credentials['email'])) {
+            return User::query()->where('email', '=', $credentials['email'])
+                ->where('system_name', '=', 'public')
+                ->exists();
+        }
+
+        return false;
+    }
+
     /**
      * Logs the current user out of the application.
      * Returns an app post-redirect path.
diff --git a/app/Exceptions/LoginAttemptInvalidUserException.php b/app/Exceptions/LoginAttemptInvalidUserException.php
new file mode 100644
index 00000000000..163484c5aa2
--- /dev/null
+++ b/app/Exceptions/LoginAttemptInvalidUserException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+class LoginAttemptInvalidUserException extends LoginAttemptException
+{
+}
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index 0164978d85d..bffd8bbdbcb 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Auth;
 
 use BookStack\Access\Mfa\MfaSession;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
@@ -144,6 +145,25 @@ public function test_login_attempts_are_rate_limited()
         $resp->assertSee('Too many login attempts. Please try again in');
     }
 
+    public function test_login_specifically_disabled_for_guest_account()
+    {
+        $guest = $this->users->guest();
+
+        $resp = $this->post('/login', ['email' => $guest->email, 'password' => 'password']);
+        $resp->assertRedirect('/login');
+        $resp = $this->followRedirects($resp);
+        $resp->assertSee('These credentials do not match our records.');
+
+        // Test login even with password somehow set
+        $guest->password = Hash::make('password');
+        $guest->save();
+
+        $resp = $this->post('/login', ['email' => $guest->email, 'password' => 'password']);
+        $resp->assertRedirect('/login');
+        $resp = $this->followRedirects($resp);
+        $resp->assertSee('These credentials do not match our records.');
+    }
+
     /**
      * Perform a login.
      */

From 509af2463d94210fd500c10c651fa8f883e87fd8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 11 Dec 2024 15:53:57 +0000
Subject: [PATCH 402/666] Search Index: Fixed SQL error when indexing large
 pages

Due to hitting statement placeholder limits (typically 65k)
when inserting index terms for single page.

Added test to cover.
Also added skipped tests for tests we don't always want to run.
For #5322
---
 app/Search/SearchIndex.php        | 20 +++++++++++++++-----
 tests/Entity/EntitySearchTest.php | 20 ++++++++++++++++++++
 tests/LanguageTest.php            |  4 +++-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index d9fc4e7aadc..c7d9d6502e2 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -30,7 +30,7 @@ public function indexEntity(Entity $entity): void
     {
         $this->deleteEntityTerms($entity);
         $terms = $this->entityToTermDataArray($entity);
-        SearchTerm::query()->insert($terms);
+        $this->insertTerms($terms);
     }
 
     /**
@@ -46,10 +46,7 @@ public function indexEntities(array $entities): void
             array_push($terms, ...$entityTerms);
         }
 
-        $chunkedTerms = array_chunk($terms, 500);
-        foreach ($chunkedTerms as $termChunk) {
-            SearchTerm::query()->insert($termChunk);
-        }
+        $this->insertTerms($terms);
     }
 
     /**
@@ -99,6 +96,19 @@ public function deleteEntityTerms(Entity $entity): void
         $entity->searchTerms()->delete();
     }
 
+    /**
+     * Insert the given terms into the database.
+     * Chunks through the given terms to remain within database limits.
+     * @param array[] $terms
+     */
+    protected function insertTerms(array $terms): void
+    {
+        $chunkedTerms = array_chunk($terms, 500);
+        foreach ($chunkedTerms as $termChunk) {
+            SearchTerm::query()->insert($termChunk);
+        }
+    }
+
     /**
      * Create a scored term array from the given text, where the keys are the terms
      * and the values are their scores.
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index cabf23bd3d3..5ace70e3ab2 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class EntitySearchTest extends TestCase
@@ -477,6 +478,25 @@ public function test_terms_in_headers_have_an_adjusted_index_score()
         $this->assertEquals(2, $scoreByTerm->get('TermG'));
     }
 
+    public function test_indexing_works_as_expected_for_page_with_lots_of_terms()
+    {
+        $this->markTestSkipped('Time consuming test');
+
+        $count = 100000;
+        $text = '';
+        $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#';
+        for ($i = 0; $i < $count; $i++) {
+            $text .= substr(str_shuffle($chars), 0, 5) . ' ';
+        }
+
+        $page = $this->entities->newPage(['name' => 'Test page A', 'html' => '<p>' . $text . '</p>']);
+
+        $termCount = $page->searchTerms()->count();
+
+        // Expect at least 90% unique rate
+        $this->assertGreaterThan($count * 0.9, $termCount);
+    }
+
     public function test_name_and_content_terms_are_merged_to_single_score()
     {
         $page = $this->entities->newPage(['name' => 'TermA', 'html' => '
diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index abe06407e1e..28491c3af9d 100644
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -27,8 +27,10 @@ public function test_locales_list_set_properly()
     }
 
     // Not part of standard phpunit test runs since we sometimes expect non-added langs.
-    public function do_test_locales_all_have_language_dropdown_entry()
+    public function test_locales_all_have_language_dropdown_entry()
     {
+        $this->markTestSkipped('Only used when checking language inclusion');
+
         $dropdownLocales = array_keys(trans('settings.language_select', [], 'en'));
         sort($dropdownLocales);
         sort($this->langs);

From 0ece664475180119b6e5c6c589302628c080cc71 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 11 Dec 2024 18:50:10 +0000
Subject: [PATCH 403/666] CI: Added php8.4 to CI suites, bumped action/os
 versions

---
 .github/workflows/analyse-php.yml     | 4 ++--
 .github/workflows/lint-php.yml        | 6 +++---
 .github/workflows/test-migrations.yml | 6 +++---
 .github/workflows/test-php.yml        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/analyse-php.yml b/.github/workflows/analyse-php.yml
index dbeaf94724a..647835aeb2f 100644
--- a/.github/workflows/analyse-php.yml
+++ b/.github/workflows/analyse-php.yml
@@ -11,9 +11,9 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index b2f8b3d2b4a..cb9dedcb25a 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -11,14 +11,14 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.1
+        php-version: 8.3
         tools: phpcs
 
     - name: Run formatting check
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 10cfbe17204..2d6d280b2ee 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -13,12 +13,12 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 269f326320a..ee9cf39bc2a 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

From fcf0bf79a98c9b9b545d36ef728ee9cbe054048e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 11 Dec 2024 20:38:30 +0000
Subject: [PATCH 404/666] Attachments: Hid edit/delete controls where lacking
 permission

Added test to cover.
Also migrated related ajax-delete-row component to ts.

For #5323
---
 ...{ajax-delete-row.js => ajax-delete-row.ts} | 12 +++--
 resources/js/components/component.js          |  6 +--
 .../views/attachments/manager-list.blade.php  | 34 +++++++-------
 tests/Uploads/AttachmentTest.php              | 44 +++++++++++++++++++
 4 files changed, 74 insertions(+), 22 deletions(-)
 rename resources/js/components/{ajax-delete-row.js => ajax-delete-row.ts} (65%)

diff --git a/resources/js/components/ajax-delete-row.js b/resources/js/components/ajax-delete-row.ts
similarity index 65%
rename from resources/js/components/ajax-delete-row.js
rename to resources/js/components/ajax-delete-row.ts
index 6ed3deedf4d..4c7942a9e36 100644
--- a/resources/js/components/ajax-delete-row.js
+++ b/resources/js/components/ajax-delete-row.ts
@@ -1,12 +1,16 @@
-import {onSelect} from '../services/dom.ts';
+import {onSelect} from '../services/dom';
 import {Component} from './component';
 
 export class AjaxDeleteRow extends Component {
 
+    protected row!: HTMLElement;
+    protected url!: string;
+    protected deleteButtons: HTMLElement[] = [];
+
     setup() {
         this.row = this.$el;
         this.url = this.$opts.url;
-        this.deleteButtons = this.$manyRefs.delete;
+        this.deleteButtons = this.$manyRefs.delete || [];
 
         onSelect(this.deleteButtons, this.runDelete.bind(this));
     }
@@ -21,8 +25,8 @@ export class AjaxDeleteRow extends Component {
             }
             this.row.remove();
         }).catch(() => {
-            this.row.style.opacity = null;
-            this.row.style.pointerEvents = null;
+            this.row.style.removeProperty('opacity');
+            this.row.style.removeProperty('pointer-events');
         });
     }
 
diff --git a/resources/js/components/component.js b/resources/js/components/component.js
index 654f41a9664..c23898bbcbb 100644
--- a/resources/js/components/component.js
+++ b/resources/js/components/component.js
@@ -8,20 +8,20 @@ export class Component {
 
     /**
      * The element that the component is registered upon.
-     * @type {Element}
+     * @type {HTMLElement}
      */
     $el = null;
 
     /**
      * Mapping of referenced elements within the component.
-     * @type {Object<string, Element>}
+     * @type {Object<string, HTMLElement>}
      */
     $refs = {};
 
     /**
      * Mapping of arrays of referenced elements within the component so multiple
      * references, sharing the same name, can be fetched.
-     * @type {Object<string, Element[]>}
+     * @type {Object<string, HTMLElement[]>}
      */
     $manyRefs = {};
 
diff --git a/resources/views/attachments/manager-list.blade.php b/resources/views/attachments/manager-list.blade.php
index 0e841a042f7..6314aa7b5d7 100644
--- a/resources/views/attachments/manager-list.blade.php
+++ b/resources/views/attachments/manager-list.blade.php
@@ -15,23 +15,27 @@ class="card drag-card">
                         option:event-emit-select:name="insert"
                         type="button"
                         title="{{ trans('entities.attachments_insert_link') }}"
-                        class="drag-card-action text-center text-link">@icon('link')                 </button>
-                <button component="event-emit-select"
-                        option:event-emit-select:name="edit"
-                        option:event-emit-select:id="{{ $attachment->id }}"
-                        type="button"
-                        title="{{ trans('common.edit') }}"
-                        class="drag-card-action text-center text-link">@icon('edit')</button>
-                <div component="dropdown" class="flex-fill relative">
-                    <button refs="dropdown@toggle"
+                        class="drag-card-action text-center text-link">@icon('link')</button>
+                @if(userCan('attachment-update', $attachment))
+                    <button component="event-emit-select"
+                            option:event-emit-select:name="edit"
+                            option:event-emit-select:id="{{ $attachment->id }}"
                             type="button"
-                            title="{{ trans('common.delete') }}"
-                            class="drag-card-action text-center text-neg">@icon('close')</button>
-                    <div refs="dropdown@menu" class="dropdown-menu">
-                        <p class="text-neg small px-m mb-xs">{{ trans('entities.attachments_delete') }}</p>
-                        <button refs="ajax-delete-row@delete" type="button" class="text-link small delete text-item">{{ trans('common.confirm') }}</button>
+                            title="{{ trans('common.edit') }}"
+                            class="drag-card-action text-center text-link">@icon('edit')</button>
+                @endif
+                @if(userCan('attachment-delete', $attachment))
+                    <div component="dropdown" class="flex-fill relative">
+                        <button refs="dropdown@toggle"
+                                type="button"
+                                title="{{ trans('common.delete') }}"
+                                class="drag-card-action text-center text-neg">@icon('close')</button>
+                        <div refs="dropdown@menu" class="dropdown-menu">
+                            <p class="text-neg small px-m mb-xs">{{ trans('entities.attachments_delete') }}</p>
+                            <button refs="ajax-delete-row@delete" type="button" class="text-link small delete text-item">{{ trans('common.confirm') }}</button>
+                        </div>
                     </div>
-                </div>
+                @endif
             </div>
         </div>
     @endforeach
diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index de448d93a4c..2eaf21d9c6f 100644
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -267,6 +267,50 @@ public function test_data_and_js_links_cannot_be_attached_to_a_page()
         }
     }
 
+    public function test_attachment_delete_only_shows_with_permission()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+        $this->files->uploadAttachmentFile($this, 'upload_test.txt', $page->id);
+        $attachment = $page->attachments()->first();
+        $viewer = $this->users->viewer();
+
+        $this->permissions->grantUserRolePermissions($viewer, ['page-update-all', 'attachment-create-all']);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $html = $this->withHtml($resp);
+        $html->assertElementExists(".card[data-id=\"{$attachment->id}\"]");
+        $html->assertElementNotExists(".card[data-id=\"{$attachment->id}\"] button[title=\"Delete\"]");
+
+        $this->permissions->grantUserRolePermissions($viewer, ['attachment-delete-all']);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $html = $this->withHtml($resp);
+        $html->assertElementExists(".card[data-id=\"{$attachment->id}\"] button[title=\"Delete\"]");
+    }
+
+    public function test_attachment_edit_only_shows_with_permission()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+        $this->files->uploadAttachmentFile($this, 'upload_test.txt', $page->id);
+        $attachment = $page->attachments()->first();
+        $viewer = $this->users->viewer();
+
+        $this->permissions->grantUserRolePermissions($viewer, ['page-update-all', 'attachment-create-all']);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $html = $this->withHtml($resp);
+        $html->assertElementExists(".card[data-id=\"{$attachment->id}\"]");
+        $html->assertElementNotExists(".card[data-id=\"{$attachment->id}\"] button[title=\"Edit\"]");
+
+        $this->permissions->grantUserRolePermissions($viewer, ['attachment-update-all']);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $html = $this->withHtml($resp);
+        $html->assertElementExists(".card[data-id=\"{$attachment->id}\"] button[title=\"Edit\"]");
+    }
+
     public function test_file_access_with_open_query_param_provides_inline_response_with_correct_content_type()
     {
         $page = $this->entities->page();

From 19ee1c9be740de037dbe61ec8e82e74f24276322 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 12 Dec 2024 21:45:52 +0000
Subject: [PATCH 405/666] Notifications: Logged errors and prevented them
 blocking user

Failed notification sends could block the user action, whereas it's
probably more important that the user action takes places uninteruupted
than showing an error screen for the user to debug.
Logs notification errors so issues can still be debugged by admins.

Closes #5315
---
 .../Handlers/BaseNotificationHandler.php      |  7 +++++-
 tests/Activity/WatchTest.php                  | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
index b5f339b2ce0..3a9b0c1dc80 100644
--- a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
+use Illuminate\Support\Facades\Log;
 
 abstract class BaseNotificationHandler implements NotificationHandler
 {
@@ -36,7 +37,11 @@ protected function sendNotificationToUserIds(string $notification, array $userId
             }
 
             // Send the notification
-            $user->notify(new $notification($detail, $initiator));
+            try {
+                $user->notify(new $notification($detail, $initiator));
+            } catch (\Exception $exception) {
+                Log::error("Failed to send email notification to user [id:{$user->id}] with error: {$exception->getMessage()}");
+            }
         }
     }
 }
diff --git a/tests/Activity/WatchTest.php b/tests/Activity/WatchTest.php
index 605b60fd498..c405b07aed7 100644
--- a/tests/Activity/WatchTest.php
+++ b/tests/Activity/WatchTest.php
@@ -13,6 +13,8 @@
 use BookStack\Activity\WatchLevels;
 use BookStack\Entities\Models\Entity;
 use BookStack\Settings\UserNotificationPreferences;
+use Illuminate\Contracts\Notifications\Dispatcher;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -365,6 +367,29 @@ public function test_notifications_sent_in_right_language()
         }
     }
 
+    public function test_failed_notifications_dont_block_and_log_errors()
+    {
+        $logger = $this->withTestLogger();
+        $editor = $this->users->editor();
+        $admin = $this->users->admin();
+        $page = $this->entities->page();
+        $book = $page->book;
+        $activityLogger = app()->make(ActivityLogger::class);
+
+        $watches = new UserEntityWatchOptions($editor, $book);
+        $watches->updateLevelByValue(WatchLevels::UPDATES);
+
+        $mockDispatcher = $this->mock(Dispatcher::class);
+        $mockDispatcher->shouldReceive('send')->once()
+            ->andThrow(\Exception::class, 'Failed to connect to mail server');
+
+        $this->actingAs($admin);
+
+        $activityLogger->add(ActivityType::PAGE_UPDATE, $page);
+
+        $this->assertTrue($logger->hasErrorThatContains("Failed to send email notification to user [id:{$editor->id}] with error: Failed to connect to mail server"));
+    }
+
     public function test_notifications_not_sent_if_lacking_view_permission_for_related_item()
     {
         $notifications = Notification::fake();

From 7e1a8e5ec676a2f9a27acef71da6d6c0b5916384 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Dec 2024 14:21:04 +0000
Subject: [PATCH 406/666] API: Added cover to book/shelf list endpoints

Aligns with what we provide in the UI.
Added/updated tests to cover, and updated API examples.

For 5180.
---
 .../Controllers/BookApiController.php         |  1 +
 .../Controllers/BookshelfApiController.php    |  1 +
 dev/api/responses/books-list.json             | 10 ++++++--
 dev/api/responses/shelves-list.json           | 13 ++++++++---
 tests/Api/BooksApiTest.php                    | 23 +++++++++++++++++++
 tests/Api/ShelvesApiTest.php                  | 23 +++++++++++++++++++
 tests/Helpers/EntityProvider.php              |  1 +
 7 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index c1e38e72fe7..a617ee2da68 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -30,6 +30,7 @@ public function list()
     {
         $books = $this->queries
             ->visibleForList()
+            ->with(['cover:id,name,url'])
             ->addSelect(['created_by', 'updated_by']);
 
         return $this->apiListingResponse($books, [
diff --git a/app/Entities/Controllers/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
index a665bcb6bab..b512f2d0553 100644
--- a/app/Entities/Controllers/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -26,6 +26,7 @@ public function list()
     {
         $shelves = $this->queries
             ->visibleForList()
+            ->with(['cover:id,name,url'])
             ->addSelect(['created_by', 'updated_by']);
 
         return $this->apiListingResponse($shelves, [
diff --git a/dev/api/responses/books-list.json b/dev/api/responses/books-list.json
index 0f8458feda2..50c8c49e6ef 100644
--- a/dev/api/responses/books-list.json
+++ b/dev/api/responses/books-list.json
@@ -9,7 +9,8 @@
       "updated_at": "2019-12-11T20:57:31.000000Z",
       "created_by": 1,
       "updated_by": 1,
-      "owned_by": 1
+      "owned_by": 1,
+      "cover": null
     },
     {
       "id": 2,
@@ -20,7 +21,12 @@
       "updated_at": "2019-12-11T20:57:23.000000Z",
       "created_by": 4,
       "updated_by": 3,
-      "owned_by": 3
+      "owned_by": 3,
+      "cover": {
+        "id": 11,
+        "name": "cat_banner.jpg",
+        "url": "https://example.com/uploads/images/cover_book/2021-10/cat-banner.jpg"
+      }
     }
   ],
   "total": 14
diff --git a/dev/api/responses/shelves-list.json b/dev/api/responses/shelves-list.json
index 4b1a1b43f93..d5debfaef10 100644
--- a/dev/api/responses/shelves-list.json
+++ b/dev/api/responses/shelves-list.json
@@ -9,7 +9,12 @@
       "updated_at": "2020-04-10T13:00:45.000000Z",
       "created_by": 4,
       "updated_by": 1,
-      "owned_by": 1
+      "owned_by": 1,
+      "cover": {
+        "id": 4,
+        "name": "shelf.jpg",
+        "url": "https://example.com/uploads/images/cover_bookshelf/2024-12/shelf.jpg"
+      }
     },
     {
       "id": 9,
@@ -20,7 +25,8 @@
       "updated_at": "2020-04-10T13:00:58.000000Z",
       "created_by": 4,
       "updated_by": 1,
-      "owned_by": 1
+      "owned_by": 1,
+      "cover": null
     },
     {
       "id": 10,
@@ -31,7 +37,8 @@
       "updated_at": "2020-04-10T13:00:53.000000Z",
       "created_by": 4,
       "updated_by": 1,
-      "owned_by": 4
+      "owned_by": 4,
+      "cover": null
     }
   ],
   "total": 3
diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index 0de98dc323b..084cb59bd5c 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Api;
 
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Repos\BaseRepo;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
@@ -27,6 +28,28 @@ public function test_index_endpoint_returns_expected_book()
                 'owned_by' => $firstBook->owned_by,
                 'created_by' => $firstBook->created_by,
                 'updated_by' => $firstBook->updated_by,
+                'cover' => null,
+            ],
+        ]]);
+    }
+
+    public function test_index_endpoint_includes_cover_if_set()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+
+        $baseRepo = $this->app->make(BaseRepo::class);
+        $image = $this->files->uploadedImage('book_cover');
+        $baseRepo->updateCoverImage($book, $image);
+
+        $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $book->id);
+        $resp->assertJson(['data' => [
+            [
+                'id'   => $book->id,
+                'cover' => [
+                    'id' => $book->cover->id,
+                    'url' => $book->cover->url,
+                ],
             ],
         ]]);
     }
diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php
index be276e11004..ba13c0153b1 100644
--- a/tests/Api/ShelvesApiTest.php
+++ b/tests/Api/ShelvesApiTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Repos\BaseRepo;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
@@ -28,6 +29,28 @@ public function test_index_endpoint_returns_expected_shelf()
                 'owned_by' => $firstBookshelf->owned_by,
                 'created_by' => $firstBookshelf->created_by,
                 'updated_by' => $firstBookshelf->updated_by,
+                'cover' => null,
+            ],
+        ]]);
+    }
+
+    public function test_index_endpoint_includes_cover_if_set()
+    {
+        $this->actingAsApiEditor();
+        $shelf = $this->entities->shelf();
+
+        $baseRepo = $this->app->make(BaseRepo::class);
+        $image = $this->files->uploadedImage('shelf_cover');
+        $baseRepo->updateCoverImage($shelf, $image);
+
+        $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $shelf->id);
+        $resp->assertJson(['data' => [
+            [
+                'id'   => $shelf->id,
+                'cover' => [
+                    'id' => $shelf->cover->id,
+                    'url' => $shelf->cover->url,
+                ],
             ],
         ]]);
     }
diff --git a/tests/Helpers/EntityProvider.php b/tests/Helpers/EntityProvider.php
index 1897abefa28..22e554f74b5 100644
--- a/tests/Helpers/EntityProvider.php
+++ b/tests/Helpers/EntityProvider.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;

From a8ef820443cc444423f0fd21c4e1ce9fb64cbac0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Dec 2024 15:19:09 +0000
Subject: [PATCH 407/666] Users: Hid lanuage preference for guest user

Hiding since it's not really used, and may mislead on how to set default
app language (which should be done via env options).
Updated test to cover.

For #5356
---
 resources/views/users/edit.blade.php | 4 +++-
 tests/User/UserManagementTest.php    | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 2b736d81ede..611653d6a80 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -34,7 +34,9 @@ class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
                         </div>
                     </div>
 
-                    @include('users.parts.language-option-row', ['value' => old('language') ?? $user->getLocale()->appLocale()])
+                    @if(!$user->isGuest())
+                        @include('users.parts.language-option-row', ['value' => old('language') ?? $user->getLocale()->appLocale()])
+                    @endif
                 </div>
 
                 <div class="text-right">
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 37d9b383544..d92f13f0b3f 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -202,9 +202,13 @@ public function test_delete_removes_user_preferences()
     public function test_guest_profile_shows_limited_form()
     {
         $guest = $this->users->guest();
+
         $resp = $this->asAdmin()->get('/settings/users/' . $guest->id);
         $resp->assertSee('Guest');
-        $this->withHtml($resp)->assertElementNotExists('#password');
+        $html = $this->withHtml($resp);
+
+        $html->assertElementNotExists('#password');
+        $html->assertElementNotExists('[name="language"]');
     }
 
     public function test_guest_profile_cannot_be_deleted()

From 97b201f61f98aaccf779d08634c247c8cfbbfbb5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 14 Dec 2024 12:35:13 +0000
Subject: [PATCH 408/666] Lexical: Added auto links on enter/space

---
 resources/js/wysiwyg/index.ts                 |  2 +
 .../services/__tests__/auto-links.test.ts     | 91 +++++++++++++++++++
 resources/js/wysiwyg/services/auto-links.ts   | 74 +++++++++++++++
 resources/js/wysiwyg/utils/selection.ts       |  4 +
 4 files changed, 171 insertions(+)
 create mode 100644 resources/js/wysiwyg/services/__tests__/auto-links.test.ts
 create mode 100644 resources/js/wysiwyg/services/auto-links.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9066b402f33..510ab1f9230 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -15,6 +15,7 @@ import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
 import {registerNodeResizer} from "./ui/framework/helpers/node-resizer";
 import {registerKeyboardHandling} from "./services/keyboard-handling";
+import {registerAutoLinks} from "./services/auto-links";
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const config: CreateEditorArgs = {
@@ -64,6 +65,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerTaskListHandler(editor, editArea),
         registerDropPasteHandling(context),
         registerNodeResizer(context),
+        registerAutoLinks(editor),
     );
 
     listenToCommonEvents(editor);
diff --git a/resources/js/wysiwyg/services/__tests__/auto-links.test.ts b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
new file mode 100644
index 00000000000..d3b120b7064
--- /dev/null
+++ b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
@@ -0,0 +1,91 @@
+import {initializeUnitTest} from "lexical/__tests__/utils";
+import {SerializedLinkNode} from "@lexical/link";
+import {
+    $getRoot,
+    ParagraphNode,
+    SerializedParagraphNode,
+    SerializedTextNode,
+    TextNode
+} from "lexical";
+import {registerAutoLinks} from "../auto-links";
+
+describe('Auto-link service tests', () => {
+    initializeUnitTest((testEnv) => {
+
+        test('space after link in text', async () => {
+            const {editor} = testEnv;
+
+            registerAutoLinks(editor);
+            let pNode!: ParagraphNode;
+
+            editor.update(() => {
+                pNode = new ParagraphNode();
+                const text = new TextNode('Some https://example.com?test=true text');
+                pNode.append(text);
+                $getRoot().append(pNode);
+
+                text.select(35, 35);
+            });
+
+            editor.commitUpdates();
+
+            const pDomEl = editor.getElementByKey(pNode.getKey());
+            const event = new KeyboardEvent('keydown', {
+                bubbles: true,
+                cancelable: true,
+                key: ' ',
+                keyCode: 62,
+            });
+            pDomEl?.dispatchEvent(event);
+
+            editor.commitUpdates();
+
+            const paragraph = editor!.getEditorState().toJSON().root
+                .children[0] as SerializedParagraphNode;
+            expect(paragraph.children[1].type).toBe('link');
+
+            const link = paragraph.children[1] as SerializedLinkNode;
+            expect(link.url).toBe('https://example.com?test=true');
+            const linkText = link.children[0] as SerializedTextNode;
+            expect(linkText.text).toBe('https://example.com?test=true');
+        });
+
+        test('enter after link in text', async () => {
+            const {editor} = testEnv;
+
+            registerAutoLinks(editor);
+            let pNode!: ParagraphNode;
+
+            editor.update(() => {
+                pNode = new ParagraphNode();
+                const text = new TextNode('Some https://example.com?test=true text');
+                pNode.append(text);
+                $getRoot().append(pNode);
+
+                text.select(35, 35);
+            });
+
+            editor.commitUpdates();
+
+            const pDomEl = editor.getElementByKey(pNode.getKey());
+            const event = new KeyboardEvent('keydown', {
+                bubbles: true,
+                cancelable: true,
+                key: 'Enter',
+                keyCode: 66,
+            });
+            pDomEl?.dispatchEvent(event);
+
+            editor.commitUpdates();
+
+            const paragraph = editor!.getEditorState().toJSON().root
+                .children[0] as SerializedParagraphNode;
+            expect(paragraph.children[1].type).toBe('link');
+
+            const link = paragraph.children[1] as SerializedLinkNode;
+            expect(link.url).toBe('https://example.com?test=true');
+            const linkText = link.children[0] as SerializedTextNode;
+            expect(linkText.text).toBe('https://example.com?test=true');
+        });
+    });
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/auto-links.ts b/resources/js/wysiwyg/services/auto-links.ts
new file mode 100644
index 00000000000..44a78ec8577
--- /dev/null
+++ b/resources/js/wysiwyg/services/auto-links.ts
@@ -0,0 +1,74 @@
+import {
+    $getSelection, BaseSelection,
+    COMMAND_PRIORITY_NORMAL,
+    KEY_ENTER_COMMAND,
+    KEY_SPACE_COMMAND,
+    LexicalEditor,
+    TextNode
+} from "lexical";
+import {$getTextNodeFromSelection} from "../utils/selection";
+import {$createLinkNode, LinkNode} from "@lexical/link";
+
+
+function isLinkText(text: string): boolean {
+    const lower = text.toLowerCase();
+    if (!lower.startsWith('http')) {
+        return false;
+    }
+
+    const linkRegex = /(http|https):\/\/(\S+)\.\S+$/;
+    return linkRegex.test(text);
+}
+
+
+function handlePotentialLinkEvent(node: TextNode, selection: BaseSelection, editor: LexicalEditor) {
+    const selectionRange = selection.getStartEndPoints();
+    if (!selectionRange) {
+        return;
+    }
+
+    const cursorPoint = selectionRange[0].offset - 1;
+    const nodeText = node.getTextContent();
+    const rTrimText = nodeText.slice(0, cursorPoint);
+    const priorSpaceIndex = rTrimText.lastIndexOf(' ');
+    const startIndex = priorSpaceIndex + 1;
+    const textSegment = nodeText.slice(startIndex, cursorPoint);
+
+    if (!isLinkText(textSegment)) {
+        return;
+    }
+
+    editor.update(() => {
+        const linkNode: LinkNode = $createLinkNode(textSegment);
+        linkNode.append(new TextNode(textSegment));
+
+        const splits = node.splitText(startIndex, cursorPoint);
+        const targetIndex = splits.length === 3 ? 1 : 0;
+        const targetText = splits[targetIndex];
+        if (targetText) {
+            targetText.replace(linkNode);
+        }
+    });
+}
+
+
+export function registerAutoLinks(editor: LexicalEditor): () => void {
+
+    const handler = (payload: KeyboardEvent): boolean => {
+        const selection = $getSelection();
+        const textNode = $getTextNodeFromSelection(selection);
+        if (textNode && selection) {
+            handlePotentialLinkEvent(textNode, selection, editor);
+        }
+
+        return false;
+    };
+
+    const unregisterSpace = editor.registerCommand(KEY_SPACE_COMMAND, handler, COMMAND_PRIORITY_NORMAL);
+    const unregisterEnter = editor.registerCommand(KEY_ENTER_COMMAND, handler, COMMAND_PRIORITY_NORMAL);
+
+    return (): void => {
+        unregisterSpace();
+        unregisterEnter();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 28e729e92ae..167ab32adca 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -51,6 +51,10 @@ export function $getNodeFromSelection(selection: BaseSelection | null, matcher:
     return null;
 }
 
+export function $getTextNodeFromSelection(selection: BaseSelection | null): TextNode|null {
+    return $getNodeFromSelection(selection, $isTextNode) as TextNode|null;
+}
+
 export function $selectionContainsTextFormat(selection: BaseSelection | null, format: TextFormatType): boolean {
     if (!selection) {
         return false;

From a71aa241ada17bfc5497c59914774260003b3339 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 14 Dec 2024 15:17:33 +0000
Subject: [PATCH 409/666] Lexical: Added dark mode styles, fixed autolink range

---
 .../services/__tests__/auto-links.test.ts     |  4 +-
 resources/js/wysiwyg/services/auto-links.ts   |  2 +-
 resources/sass/_editor.scss                   | 47 ++++++++++++-------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/resources/js/wysiwyg/services/__tests__/auto-links.test.ts b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
index d3b120b7064..30dc925659e 100644
--- a/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
@@ -24,7 +24,7 @@ describe('Auto-link service tests', () => {
                 pNode.append(text);
                 $getRoot().append(pNode);
 
-                text.select(35, 35);
+                text.select(34, 34);
             });
 
             editor.commitUpdates();
@@ -62,7 +62,7 @@ describe('Auto-link service tests', () => {
                 pNode.append(text);
                 $getRoot().append(pNode);
 
-                text.select(35, 35);
+                text.select(34, 34);
             });
 
             editor.commitUpdates();
diff --git a/resources/js/wysiwyg/services/auto-links.ts b/resources/js/wysiwyg/services/auto-links.ts
index 44a78ec8577..1c3b1c73010 100644
--- a/resources/js/wysiwyg/services/auto-links.ts
+++ b/resources/js/wysiwyg/services/auto-links.ts
@@ -27,7 +27,7 @@ function handlePotentialLinkEvent(node: TextNode, selection: BaseSelection, edit
         return;
     }
 
-    const cursorPoint = selectionRange[0].offset - 1;
+    const cursorPoint = selectionRange[0].offset;
     const nodeText = node.getTextContent();
     const rTrimText = nodeText.slice(0, cursorPoint);
     const priorSpaceIndex = rTrimText.lastIndexOf(' ');
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index e273f1942d5..bdf6ea44c3d 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -8,18 +8,20 @@
 
 // Main UI elements
 .editor-container {
-  background-color: #FFF;
+  @include mixins.lightDark(background-color, #FFF, #222);
   position: relative;
   &.fullscreen {
     z-index: 500;
   }
 }
+
 .editor-toolbar-main {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
   border-top: 1px solid #DDD;
   border-bottom: 1px solid #DDD;
+  @include mixins.lightDark(border-color, #DDD, #000);
 }
 
 body.editor-is-fullscreen {
@@ -46,6 +48,7 @@ body.editor-is-fullscreen {
   font-size: 12px;
   padding: 4px;
   color: #444;
+  @include mixins.lightDark(color, #444, #999);
   border-radius: 4px;
   display: flex;
   align-items: center;
@@ -54,6 +57,7 @@ body.editor-is-fullscreen {
 }
 .editor-button:hover {
   background-color: #EEE;
+  @include mixins.lightDark(background-color, #EEE, #333);
   cursor: pointer;
   color: #000;
 }
@@ -63,7 +67,7 @@ body.editor-is-fullscreen {
   opacity: .6;
 }
 .editor-button-active, .editor-button-active:hover {
-  background-color: #ceebff;
+  @include mixins.lightDark(background-color, #ceebff, #444);
   color: #000;
 }
 .editor-button-long {
@@ -75,7 +79,7 @@ body.editor-is-fullscreen {
 }
 .editor-button-text {
   font-weight: 400;
-  color: #000;
+  @include mixins.lightDark(color, #000, #AAA);
   font-size: 14px;
   flex: 1;
   padding-inline-end: 4px;
@@ -126,7 +130,8 @@ body.editor-is-fullscreen {
     }
   }
   &:hover {
-    outline: 1px solid #DDD;
+    outline: 1px solid;
+    @include mixins.lightDark(outline-color, #DDD, #111);
     outline-offset: -3px;
   }
 }
@@ -137,11 +142,14 @@ body.editor-is-fullscreen {
 }
 .editor-dropdown-menu {
   position: absolute;
-  background-color: #FFF;
-  box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.15);
+  border: 1px solid;
+  @include mixins.lightDark(background-color, #FFF, #292929);
+  @include mixins.lightDark(border-color, #FFF, #333);
+  @include mixins.lightDark(box-shadow, 0 0 6px 0 rgba(0, 0, 0, 0.15), 0 1px 4px 0 rgba(0, 0, 0, 0.4));
   z-index: 99;
   display: flex;
   flex-direction: row;
+  border-radius: 3px;
 }
 .editor-dropdown-menu-vertical {
   display: flex;
@@ -163,8 +171,8 @@ body.editor-is-fullscreen {
 .editor-separator {
   display: block;
   height: 1px;
-  background-color: #DDD;
   opacity: .8;
+  @include mixins.lightDark(background-color, #DDD, #000);
 }
 
 .editor-format-menu-toggle {
@@ -199,6 +207,7 @@ body.editor-is-fullscreen {
   display: flex;
   border-inline: 1px solid #DDD;
   padding-inline: 4px;
+  @include mixins.lightDark(border-color, #DDD, #000);
   &:first-child {
     border-inline-start: none;
   }
@@ -212,11 +221,12 @@ body.editor-is-fullscreen {
 
 .editor-context-toolbar {
   position: fixed;
-  background-color: #FFF;
   border: 1px solid #DDD;
+  @include mixins.lightDark(background-color, #FFF, #222);
+  @include mixins.lightDark(border-color, #DDD, #333);
+  @include mixins.lightDark(box-shadow, 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 1px 4px 0 rgba(0, 0, 0, 0.4));
   padding: .2rem;
   border-radius: 4px;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12);
   display: flex;
   flex-direction: row;
   &:before {
@@ -226,9 +236,10 @@ body.editor-is-fullscreen {
     width: 8px;
     height: 8px;
     position: absolute;
-    background-color: #FFF;
+    @include mixins.lightDark(background-color, #FFF, #222);
     border-top: 1px solid #DDD;
     border-left: 1px solid #DDD;
+    @include mixins.lightDark(border-color, #DDD, #333);
     transform: rotate(45deg);
     left: 50%;
     margin-left: -4px;
@@ -252,7 +263,7 @@ body.editor-is-fullscreen {
   height: 100%;
 }
 .editor-modal {
-  background-color: #FFF;
+  @include mixins.lightDark(background-color, #FFF, #222);
   border-radius: 4px;
   overflow: hidden;
   box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3);
@@ -314,7 +325,8 @@ body.editor-is-fullscreen {
   display: flex;
 }
 .editor-table-creator-cell {
-  border: 1px solid #DDD;
+  border: 1px solid;
+  @include mixins.lightDark(border-color, #DDD, #000);
   width: 15px;
   height: 15px;
   cursor: pointer;
@@ -347,7 +359,7 @@ body.editor-is-fullscreen {
   height: 10px;
   border: 2px solid var(--editor-color-primary);
   z-index: 3;
-  background-color: #FFF;
+  @include mixins.lightDark(background-color, #FFF, #000);
   user-select: none;
   &.nw {
     inset-inline-start: -5px;
@@ -477,10 +489,11 @@ body.editor-is-fullscreen {
   display: block;
   width: 100%;
   min-width: 250px;
-  border: 1px solid #DDD;
+  border: 1px solid;
+  @include mixins.lightDark(border-color, #DDD, #000);
   padding: .5rem;
   border-radius: 4px;
-  color: #444;
+  @include mixins.lightDark(color, #444, #BBB);
 }
 textarea.editor-form-field-input {
   font-family: var(--font-code);
@@ -557,7 +570,7 @@ textarea.editor-form-field-input {
 .editor-form-tab-control {
   font-weight: bold;
   font-size: 14px;
-  color: #444;
+  @include mixins.lightDark(color, #444, #666);
   border-bottom: 2px solid transparent;
   position: relative;
   cursor: pointer;
@@ -565,7 +578,7 @@ textarea.editor-form-field-input {
   text-align: start;
   &[aria-selected="true"] {
     border-color: var(--editor-color-primary);
-    color: var(--editor-color-primary);
+    color: var(--editor-color-primary) !important;
   }
   &[aria-selected="true"]:after, &:hover:after {
     background-color: var(--editor-color-primary);

From 5f07f31c9fc21c4f82b757eb2e78027ff3ad6337 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Dec 2024 14:03:08 +0000
Subject: [PATCH 410/666] Lexical: Added mobile toolbar support

Adds dynamic and fixed (out of DOM order) positioning with location
adjustment depending on space.
Also adds smarter hiding to prevent disappearing when mouse leaves but
within the same space as the toggle.
---
 .../ui/framework/blocks/button-with-menu.ts   |  1 +
 .../ui/framework/blocks/dropdown-button.ts    |  3 ++
 .../wysiwyg/ui/framework/helpers/dropdowns.ts | 52 +++++++++++++++++--
 resources/js/wysiwyg/ui/toolbars.ts           |  4 +-
 resources/sass/_editor.scss                   |  8 +++
 resources/sass/_pages.scss                    |  1 +
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts
index 30dd237f60f..2aec7c3352e 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/button-with-menu.ts
@@ -16,6 +16,7 @@ export class EditorButtonWithMenu extends EditorContainerUiElement {
             button: {label: 'Menu', icon: caretDownIcon},
             showOnHover: false,
             direction: 'vertical',
+            showAside: false,
         }, menuItems);
         this.addChildren(this.dropdownButton);
     }
diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index cba141f6c77..d7f02d5732b 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -7,12 +7,14 @@ import {EditorMenuButton} from "./menu-button";
 export type EditorDropdownButtonOptions = {
     showOnHover?: boolean;
     direction?: 'vertical'|'horizontal';
+    showAside?: boolean;
     button: EditorBasicButtonDefinition|EditorButton;
 };
 
 const defaultOptions: EditorDropdownButtonOptions = {
     showOnHover: false,
     direction: 'horizontal',
+    showAside: undefined,
     button: {label: 'Menu'},
 }
 
@@ -65,6 +67,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
 
         handleDropdown({toggle: button, menu : menu,
             showOnHover: this.options.showOnHover,
+            showAside: typeof this.options.showAside === 'boolean' ? this.options.showAside : (this.options.direction === 'vertical'),
             onOpen : () => {
             this.open = true;
             this.getContext().manager.triggerStateUpdateForElement(this.button);
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index e8cef3c8d20..ccced685867 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -1,20 +1,48 @@
-
-
-
 interface HandleDropdownParams {
     toggle: HTMLElement;
     menu: HTMLElement;
     showOnHover?: boolean,
     onOpen?: Function | undefined;
     onClose?: Function | undefined;
+    showAside?: boolean;
+}
+
+function positionMenu(menu: HTMLElement, toggle: HTMLElement, showAside: boolean) {
+    const toggleRect = toggle.getBoundingClientRect();
+    const menuBounds = menu.getBoundingClientRect();
+
+    menu.style.position = 'fixed';
+
+    if (showAside) {
+        let targetLeft = toggleRect.right;
+        const isRightOOB = toggleRect.right + menuBounds.width > window.innerWidth;
+        if (isRightOOB) {
+            targetLeft = Math.max(toggleRect.left - menuBounds.width, 0);
+        }
+
+        menu.style.top = toggleRect.top + 'px';
+        menu.style.left = targetLeft + 'px';
+    } else {
+        const isRightOOB = toggleRect.left + menuBounds.width > window.innerWidth;
+        let targetLeft = toggleRect.left;
+        if (isRightOOB) {
+            targetLeft = Math.max(toggleRect.right - menuBounds.width, 0);
+        }
+
+        menu.style.top = toggleRect.bottom + 'px';
+        menu.style.left = targetLeft + 'px';
+    }
 }
 
 export function handleDropdown(options: HandleDropdownParams) {
-    const {menu, toggle, onClose, onOpen, showOnHover} = options;
+    const {menu, toggle, onClose, onOpen, showOnHover, showAside} = options;
     let clickListener: Function|null = null;
 
     const hide = () => {
         menu.hidden = true;
+        menu.style.removeProperty('position');
+        menu.style.removeProperty('left');
+        menu.style.removeProperty('top');
         if (clickListener) {
             window.removeEventListener('click', clickListener as EventListener);
         }
@@ -25,6 +53,7 @@ export function handleDropdown(options: HandleDropdownParams) {
 
     const show = () => {
         menu.hidden = false
+        positionMenu(menu, toggle, Boolean(showAside));
         clickListener = (event: MouseEvent) => {
             if (!toggle.contains(event.target as HTMLElement) && !menu.contains(event.target as HTMLElement)) {
                 hide();
@@ -44,5 +73,18 @@ export function handleDropdown(options: HandleDropdownParams) {
         toggle.addEventListener('mouseenter', toggleShowing);
     }
 
-    menu.parentElement?.addEventListener('mouseleave', hide);
+    menu.parentElement?.addEventListener('mouseleave', (event: MouseEvent) => {
+
+        // Prevent mouseleave hiding if withing the same bounds of the toggle.
+        // Avoids hiding in the event the mouse is interrupted by a high z-index
+        // item like a browser scrollbar.
+        const toggleBounds = toggle.getBoundingClientRect();
+        const withinX = event.clientX <= toggleBounds.right && event.clientX >= toggleBounds.left;
+        const withinY = event.clientY <= toggleBounds.bottom && event.clientY >= toggleBounds.top;
+        const withinToggle = withinX && withinY;
+
+        if (!withinToggle) {
+            hide();
+        }
+    });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 35146e5a440..886e1394b20 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -149,8 +149,8 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         new EditorOverflowContainer(4, [
             new EditorButton(link),
 
-            new EditorDropdownButton({button: table, direction: 'vertical'}, [
-                new EditorDropdownButton({button: {label: 'Insert', format: 'long'}, showOnHover: true}, [
+            new EditorDropdownButton({button: table, direction: 'vertical', showAside: false}, [
+                new EditorDropdownButton({button: {label: 'Insert', format: 'long'}, showOnHover: true, showAside: true}, [
                     new EditorTableCreator(),
                 ]),
                 new EditorSeparator(),
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index bdf6ea44c3d..e481318374c 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -24,6 +24,14 @@
   @include mixins.lightDark(border-color, #DDD, #000);
 }
 
+@include mixins.smaller-than(vars.$bp-xl) {
+  .editor-toolbar-main {
+    overflow-x: scroll;
+    flex-wrap: nowrap;
+    justify-content: start;
+  }
+}
+
 body.editor-is-fullscreen {
   overflow: hidden;
   .edit-area {
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 17bcfcfbf11..45e58ffc865 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -26,6 +26,7 @@
   width: 100%;
   border-radius: 8px;
   box-shadow: vars.$bs-card;
+  min-width: 300px;
   @include mixins.lightDark(background-color, #FFF, #333)
 }
 

From 2f119d3033c9543a22109c34d2b77ef99e5486af Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Dec 2024 15:29:00 +0000
Subject: [PATCH 411/666] Lexical: Adjusted modals and content area for mobile
 sizes

---
 resources/sass/_editor.scss | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index e481318374c..3eef4c2c6b9 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -48,6 +48,7 @@ body.editor-is-fullscreen {
 .editor-content-wrap {
   position: relative;
   overflow-y: scroll;
+  padding-inline: vars.$s;
   flex: 1;
 }
 
@@ -275,6 +276,9 @@ body.editor-is-fullscreen {
   border-radius: 4px;
   overflow: hidden;
   box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.3);
+  margin: vars.$xs;
+  max-height: 100%;
+  overflow-y: auto;
 }
 .editor-modal-header {
   display: flex;
@@ -490,19 +494,29 @@ body.editor-is-fullscreen {
 /**
  * Form elements
  */
+$inputWidth: 260px;
+
 .editor-form-field-wrapper {
   margin-bottom: .5rem;
 }
 .editor-form-field-input {
   display: block;
-  width: 100%;
-  min-width: 250px;
+  width: $inputWidth;
+  min-width: 100px;
+  max-width: 100%;
   border: 1px solid;
   @include mixins.lightDark(border-color, #DDD, #000);
   padding: .5rem;
   border-radius: 4px;
   @include mixins.lightDark(color, #444, #BBB);
 }
+
+@include mixins.smaller-than(vars.$bp-xs) {
+  .editor-form-field-input {
+    min-width: 160px;
+  }
+}
+
 textarea.editor-form-field-input {
   font-family: var(--font-code);
   width: 350px;
@@ -575,6 +589,17 @@ textarea.editor-form-field-input {
   align-items: stretch;
   gap: .25rem;
 }
+
+@include mixins.smaller-than(vars.$bp-m) {
+  .editor-form-tab-container {
+    flex-direction: column;
+    gap: .5rem;
+  }
+  .editor-form-tab-controls {
+    flex-direction: row;
+  }
+}
+
 .editor-form-tab-control {
   font-weight: bold;
   font-size: 14px;
@@ -601,7 +626,8 @@ textarea.editor-form-field-input {
   }
 }
 .editor-form-tab-contents {
-  width: 360px;
+  width: $inputWidth;
+  max-width: 100%;
 }
 .editor-action-input-container {
   display: flex;
@@ -612,6 +638,9 @@ textarea.editor-form-field-input {
   .editor-button {
     margin-bottom: 12px;
   }
+  input {
+    width: $inputWidth - 40px;
+  }
 }
 
 // Editor theme styles

From 3f86937f74f2e5dc1e11fc2fd84694ce0793308f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Dec 2024 17:11:02 +0000
Subject: [PATCH 412/666] Lexical: Made summary part of details node

To provide more control of the summary as part of details.
To support, added a way to ignore elements during import DOM, allowing
up to read summaries when parsing details without duplicate nodes
involved.
---
 .../js/wysiwyg/lexical/core/LexicalNode.ts    |  7 +-
 resources/js/wysiwyg/lexical/html/index.ts    |  5 +
 .../lexical/rich-text/LexicalDetailsNode.ts   | 98 ++++++++-----------
 resources/js/wysiwyg/nodes.ts                 |  4 +-
 4 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index c6bc2e642ee..a6c9b6023e5 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -142,10 +142,15 @@ export type DOMConversionMap<T extends HTMLElement = HTMLElement> = Record<
 >;
 type NodeName = string;
 
+/**
+ * Output for a DOM conversion.
+ * Node can be set to 'ignore' to ignore the conversion and handling of the DOMNode
+ * including all its children.
+ */
 export type DOMConversionOutput = {
   after?: (childLexicalNodes: Array<LexicalNode>) => Array<LexicalNode>;
   forChild?: DOMChildConversion;
-  node: null | LexicalNode | Array<LexicalNode>;
+  node: null | LexicalNode | Array<LexicalNode> | 'ignore';
 };
 
 export type DOMExportOutputMap = Map<
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index 3e962ec72f7..5c3cb6cce29 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -217,6 +217,11 @@ function $createNodesFromDOM(
   if (transformOutput !== null) {
     postTransform = transformOutput.after;
     const transformNodes = transformOutput.node;
+
+    if (transformNodes === 'ignore') {
+      return lexicalNodes;
+    }
+
     currentLexicalNode = Array.isArray(transformNodes)
       ? transformNodes[transformNodes.length - 1]
       : transformNodes;
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 178b0d9531d..18d47110316 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -5,18 +5,19 @@ import {
     LexicalEditor,
     LexicalNode,
     SerializedElementNode, Spread,
-    EditorConfig,
+    EditorConfig, DOMExportOutput,
 } from 'lexical';
 
-import {el} from "../../utils/dom";
 import {extractDirectionFromElement} from "lexical/nodes/common";
 
 export type SerializedDetailsNode = Spread<{
     id: string;
+    summary: string;
 }, SerializedElementNode>
 
 export class DetailsNode extends ElementNode {
     __id: string = '';
+    __summary: string = '';
 
     static getType() {
         return 'details';
@@ -32,10 +33,21 @@ export class DetailsNode extends ElementNode {
         return self.__id;
     }
 
+    setSummary(summary: string) {
+        const self = this.getWritable();
+        self.__summary = summary;
+    }
+
+    getSummary(): string {
+        const self = this.getLatest();
+        return self.__summary;
+    }
+
     static clone(node: DetailsNode): DetailsNode {
         const newNode =  new DetailsNode(node.__key);
         newNode.__id = node.__id;
         newNode.__dir = node.__dir;
+        newNode.__summary = node.__summary;
         return newNode;
     }
 
@@ -49,6 +61,11 @@ export class DetailsNode extends ElementNode {
             el.setAttribute('dir', this.__dir);
         }
 
+        const summary = document.createElement('summary');
+        summary.textContent = this.__summary;
+        summary.setAttribute('contenteditable', 'false');
+        el.append(summary);
+
         return el;
     }
 
@@ -71,20 +88,42 @@ export class DetailsNode extends ElementNode {
                             node.setDirection(extractDirectionFromElement(element));
                         }
 
+                        const summaryElem = Array.from(element.children).find(e => e.nodeName === 'SUMMARY');
+                        node.setSummary(summaryElem?.textContent || '');
+
                         return {node};
                     },
                     priority: 3,
                 };
             },
+            summary(node: HTMLElement): DOMConversion|null {
+                return {
+                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                        return {node: 'ignore'};
+                    },
+                    priority: 3,
+                };
+            },
         };
     }
 
+    exportDOM(editor: LexicalEditor): DOMExportOutput {
+        const element = this.createDOM(editor._config, editor);
+        const editable = element.querySelectorAll('[contenteditable]');
+        for (const elem of editable) {
+            elem.removeAttribute('contenteditable');
+        }
+
+        return {element};
+    }
+
     exportJSON(): SerializedDetailsNode {
         return {
             ...super.exportJSON(),
             type: 'details',
             version: 1,
             id: this.__id,
+            summary: this.__summary,
         };
     }
 
@@ -104,58 +143,3 @@ export function $createDetailsNode() {
 export function $isDetailsNode(node: LexicalNode | null | undefined): node is DetailsNode {
     return node instanceof DetailsNode;
 }
-
-export class SummaryNode extends ElementNode {
-
-    static getType() {
-        return 'summary';
-    }
-
-    static clone(node: SummaryNode) {
-        return new SummaryNode(node.__key);
-    }
-
-    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
-        return el('summary');
-    }
-
-    updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
-        return false;
-    }
-
-    static importDOM(): DOMConversionMap|null {
-        return {
-            summary(node: HTMLElement): DOMConversion|null {
-                return {
-                    conversion: (element: HTMLElement): DOMConversionOutput|null => {
-                        return {
-                            node: new SummaryNode(),
-                        };
-                    },
-                    priority: 3,
-                };
-            },
-        };
-    }
-
-    exportJSON(): SerializedElementNode {
-        return {
-            ...super.exportJSON(),
-            type: 'summary',
-            version: 1,
-        };
-    }
-
-    static importJSON(serializedNode: SerializedElementNode): SummaryNode {
-        return $createSummaryNode();
-    }
-
-}
-
-export function $createSummaryNode(): SummaryNode {
-    return new SummaryNode();
-}
-
-export function $isSummaryNode(node: LexicalNode | null | undefined): node is SummaryNode {
-    return node instanceof SummaryNode;
-}
diff --git a/resources/js/wysiwyg/nodes.ts b/resources/js/wysiwyg/nodes.ts
index eb836bdce02..8a47f322d6d 100644
--- a/resources/js/wysiwyg/nodes.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -8,7 +8,7 @@ import {
 } from "lexical";
 import {LinkNode} from "@lexical/link";
 import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
-import {DetailsNode, SummaryNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {ListItemNode, ListNode} from "@lexical/list";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {HorizontalRuleNode} from "@lexical/rich-text/LexicalHorizontalRuleNode";
@@ -34,7 +34,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         TableCellNode,
         ImageNode, // TODO - Alignment
         HorizontalRuleNode,
-        DetailsNode, SummaryNode,
+        DetailsNode,
         CodeBlockNode,
         DiagramNode,
         MediaNode, // TODO - Alignment

From 5887322178c0fd95319ed104abee3bd4733c5d0d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Dec 2024 18:13:49 +0000
Subject: [PATCH 413/666] Lexical: Added details toolbar

Includes unwrap and toggle open actions.
---
 resources/icons/editor/details-toggle.svg     |  1 +
 .../lexical/rich-text/LexicalDetailsNode.ts   | 33 ++++++++++-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 59 ++++++++++++++++++-
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 34 +++++++++++
 resources/js/wysiwyg/ui/defaults/modals.ts    |  6 +-
 resources/js/wysiwyg/ui/index.ts              |  7 ++-
 resources/js/wysiwyg/ui/toolbars.ts           | 10 +++-
 7 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 resources/icons/editor/details-toggle.svg

diff --git a/resources/icons/editor/details-toggle.svg b/resources/icons/editor/details-toggle.svg
new file mode 100644
index 00000000000..37194e059ca
--- /dev/null
+++ b/resources/icons/editor/details-toggle.svg
@@ -0,0 +1 @@
+<svg viewbox="0 0 24 24"><path d="M8.12 19.3c.39.39 1.02.39 1.41 0L12 16.83l2.47 2.47c.39.39 1.02.39 1.41 0 .39-.39.39-1.02 0-1.41l-3.17-3.17c-.39-.39-1.02-.39-1.41 0l-3.17 3.17c-.4.38-.4 1.02-.01 1.41zm7.76-14.6c-.39-.39-1.02-.39-1.41 0L12 7.17 9.53 4.7c-.39-.39-1.02-.39-1.41 0-.39.39-.39 1.03 0 1.42l3.17 3.17c.39.39 1.02.39 1.41 0l3.17-3.17c.4-.39.4-1.03.01-1.42z"/></svg>
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 18d47110316..3c845359aec 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -18,6 +18,7 @@ export type SerializedDetailsNode = Spread<{
 export class DetailsNode extends ElementNode {
     __id: string = '';
     __summary: string = '';
+    __open: boolean = false;
 
     static getType() {
         return 'details';
@@ -43,11 +44,22 @@ export class DetailsNode extends ElementNode {
         return self.__summary;
     }
 
+    setOpen(open: boolean) {
+        const self = this.getWritable();
+        self.__open = open;
+    }
+
+    getOpen(): boolean {
+        const self = this.getLatest();
+        return self.__open;
+    }
+
     static clone(node: DetailsNode): DetailsNode {
         const newNode =  new DetailsNode(node.__key);
         newNode.__id = node.__id;
         newNode.__dir = node.__dir;
         newNode.__summary = node.__summary;
+        newNode.__open = node.__open;
         return newNode;
     }
 
@@ -61,17 +73,34 @@ export class DetailsNode extends ElementNode {
             el.setAttribute('dir', this.__dir);
         }
 
+        if (this.__open) {
+            el.setAttribute('open', 'true');
+        }
+
         const summary = document.createElement('summary');
         summary.textContent = this.__summary;
         summary.setAttribute('contenteditable', 'false');
+        summary.addEventListener('click', event => {
+            event.preventDefault();
+            _editor.update(() => {
+                this.select();
+            })
+        });
+
         el.append(summary);
 
         return el;
     }
 
     updateDOM(prevNode: DetailsNode, dom: HTMLElement) {
+
+        if (prevNode.__open !== this.__open) {
+            dom.toggleAttribute('open', this.__open);
+        }
+
         return prevNode.__id !== this.__id
-        || prevNode.__dir !== this.__dir;
+        || prevNode.__dir !== this.__dir
+        || prevNode.__summary !== this.__summary;
     }
 
     static importDOM(): DOMConversionMap|null {
@@ -114,6 +143,8 @@ export class DetailsNode extends ElementNode {
             elem.removeAttribute('contenteditable');
         }
 
+        element.removeAttribute('open');
+
         return {element};
     }
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index f9c029ff14c..6612c0dc451 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -19,6 +19,9 @@ import editIcon from "@icons/edit.svg";
 import diagramIcon from "@icons/editor/diagram.svg";
 import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import detailsIcon from "@icons/editor/details.svg";
+import detailsToggleIcon from "@icons/editor/details-toggle.svg";
+import tableDeleteIcon from "@icons/editor/table-delete.svg";
+import tagIcon from "@icons/tag.svg";
 import mediaIcon from "@icons/editor/media.svg";
 import {$createDetailsNode, $isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {$isMediaNode, MediaNode} from "@lexical/rich-text/LexicalMediaNode";
@@ -29,7 +32,7 @@ import {
 } from "../../../utils/selection";
 import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert} from "../../../utils/diagrams";
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
-import {$showImageForm, $showLinkForm} from "../forms/objects";
+import {$showDetailsForm, $showImageForm, $showLinkForm} from "../forms/objects";
 import {formatCodeBlock} from "../../../utils/formats";
 
 export const link: EditorButtonDefinition = {
@@ -216,4 +219,58 @@ export const details: EditorButtonDefinition = {
     isActive(selection: BaseSelection | null): boolean {
         return $selectionContainsNodeType(selection, $isDetailsNode);
     }
+}
+
+export const detailsEditLabel: EditorButtonDefinition = {
+    label: 'Edit label',
+    icon: tagIcon,
+    action(context: EditorUiContext) {
+        context.editor.getEditorState().read(() => {
+            const details = $getNodeFromSelection($getSelection(), $isDetailsNode);
+            if ($isDetailsNode(details)) {
+                $showDetailsForm(details, context);
+            }
+        })
+    },
+    isActive(selection: BaseSelection | null): boolean {
+        return false;
+    }
+}
+
+export const detailsToggle: EditorButtonDefinition = {
+    label: 'Toggle open/closed',
+    icon: detailsToggleIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const details = $getNodeFromSelection($getSelection(), $isDetailsNode);
+            if ($isDetailsNode(details)) {
+                details.setOpen(!details.getOpen());
+                context.manager.triggerLayoutUpdate();
+            }
+        })
+    },
+    isActive(selection: BaseSelection | null): boolean {
+        return false;
+    }
+}
+
+export const detailsUnwrap: EditorButtonDefinition = {
+    label: 'Unwrap',
+    icon: tableDeleteIcon,
+    action(context: EditorUiContext) {
+        context.editor.update(() => {
+            const details = $getNodeFromSelection($getSelection(), $isDetailsNode);
+            if ($isDetailsNode(details)) {
+                const children = details.getChildren();
+                for (const child of children) {
+                    details.insertBefore(child);
+                }
+                details.remove();
+                context.manager.triggerLayoutUpdate();
+            }
+        })
+    },
+    isActive(selection: BaseSelection | null): boolean {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index f00a08bb5f5..21d333c3aa2 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -19,6 +19,7 @@ import searchIcon from "@icons/search.svg";
 import {showLinkSelector} from "../../../utils/links";
 import {LinkField} from "../../framework/blocks/link-field";
 import {insertOrUpdateLink} from "../../../utils/formats";
+import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 export function $showImageForm(image: ImageNode, context: EditorUiContext) {
     const imageModal: EditorFormModal = context.manager.createModal('image');
@@ -262,4 +263,37 @@ export const media: EditorFormDefinition = {
             }
         },
     ],
+};
+
+export function $showDetailsForm(details: DetailsNode|null, context: EditorUiContext) {
+    const linkModal = context.manager.createModal('details');
+    if (!details) {
+        return;
+    }
+
+    linkModal.show({
+        summary: details.getSummary()
+    });
+}
+
+export const details: EditorFormDefinition = {
+    submitText: 'Save',
+    async action(formData, context: EditorUiContext) {
+        context.editor.update(() => {
+            const node = $getNodeFromSelection($getSelection(), $isDetailsNode);
+            const summary = (formData.get('summary') || '').toString().trim();
+            if ($isDetailsNode(node)) {
+                node.setSummary(summary);
+            }
+        });
+
+        return true;
+    },
+    fields: [
+        {
+            label: 'Toggle label',
+            name: 'summary',
+            type: 'text',
+        },
+    ],
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/modals.ts b/resources/js/wysiwyg/ui/defaults/modals.ts
index c4392377828..da385926626 100644
--- a/resources/js/wysiwyg/ui/defaults/modals.ts
+++ b/resources/js/wysiwyg/ui/defaults/modals.ts
@@ -1,5 +1,5 @@
 import {EditorFormModalDefinition} from "../framework/modals";
-import {image, link, media} from "./forms/objects";
+import {details, image, link, media} from "./forms/objects";
 import {source} from "./forms/controls";
 import {cellProperties, rowProperties, tableProperties} from "./forms/tables";
 
@@ -32,4 +32,8 @@ export const modals: Record<string, EditorFormModalDefinition> = {
         title: 'Table Properties',
         form: tableProperties,
     },
+    details: {
+        title: 'Edit collapsible block',
+        form: details,
+    }
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 3811f44b9bf..40df433479f 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,6 +1,6 @@
 import {LexicalEditor} from "lexical";
 import {
-    getCodeToolbarContent,
+    getCodeToolbarContent, getDetailsToolbarContent,
     getImageToolbarContent,
     getLinkToolbarContent,
     getMainEditorFullToolbar, getTableToolbarContent
@@ -56,7 +56,6 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         selector: '.editor-code-block-wrap',
         content: getCodeToolbarContent(),
     });
-
     manager.registerContextToolbar('table', {
         selector: 'td,th',
         content: getTableToolbarContent(),
@@ -64,6 +63,10 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
             return originalTarget.closest('table') as HTMLTableElement;
         }
     });
+    manager.registerContextToolbar('details', {
+        selector: 'details',
+        content: getDetailsToolbarContent(),
+    });
 
     // Register image decorator listener
     manager.registerDecoratorType('code', CodeBlockDecorator);
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.ts
index 886e1394b20..1230cbdd298 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/toolbars.ts
@@ -68,7 +68,7 @@ import {
 } from "./defaults/buttons/lists";
 import {
     codeBlock,
-    details,
+    details, detailsEditLabel, detailsToggle, detailsUnwrap,
     diagram, diagramManager,
     editCodeBlock,
     horizontalRule,
@@ -253,4 +253,12 @@ export function getTableToolbarContent(): EditorUiElement[] {
             new EditorButton(deleteColumn),
         ]),
     ];
+}
+
+export function getDetailsToolbarContent(): EditorUiElement[] {
+    return [
+        new EditorButton(detailsEditLabel),
+        new EditorButton(detailsToggle),
+        new EditorButton(detailsUnwrap),
+    ];
 }
\ No newline at end of file

From 8486775edf9d7979f9d6f1f555460bf8678d6653 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 16 Dec 2024 14:30:06 +0000
Subject: [PATCH 414/666] Lexical: Added mulitple methods to escape details
 block

Enter on empty last line, or down on last empty line, will focus on the
next node after details, or created a new paragraph to focus on if
needed.
---
 .../js/wysiwyg/services/keyboard-handling.ts  | 109 +++++++++++++++++-
 1 file changed, 106 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 6a1345fac6d..08eed764596 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -3,7 +3,7 @@ import {
     $createParagraphNode,
     $getSelection,
     $isDecoratorNode,
-    COMMAND_PRIORITY_LOW,
+    COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
     KEY_ENTER_COMMAND, KEY_TAB_COMMAND,
@@ -13,9 +13,10 @@ import {
 import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {getLastSelection} from "../utils/selection";
-import {$getNearestNodeBlockParent} from "../utils/nodes";
+import {$getNearestNodeBlockParent, $getParentOfType} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
+import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     if (nodes.length === 1) {
@@ -28,6 +29,10 @@ function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     return false;
 }
 
+/**
+ * Delete the current node in the selection if the selection contains a single
+ * selected node (like image, media etc...).
+ */
 function deleteSingleSelectedNode(editor: LexicalEditor) {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
     if (isSingleSelectedNode(selectionNodes)) {
@@ -37,6 +42,10 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
     }
 }
 
+/**
+ * Insert a new empty node after the selection if the selection contains a single
+ * selected node (like image, media etc...).
+ */
 function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
     if (isSingleSelectedNode(selectionNodes)) {
@@ -58,6 +67,94 @@ function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEve
     return false;
 }
 
+/**
+ * Insert a new node after a details node, if inside a details node that's
+ * the last element, and if the cursor is at the last block within the details node.
+ */
+function insertAfterDetails(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
+    const scenario = getDetailsScenario(editor);
+    if (scenario === null || scenario.detailsSibling) {
+        return false;
+    }
+
+    editor.update(() => {
+        const newParagraph = $createParagraphNode();
+        scenario.parentDetails.insertAfter(newParagraph);
+        newParagraph.select();
+    });
+    event?.preventDefault();
+
+    return true;
+}
+
+/**
+ * If within a details block, move after it, creating a new node if required, if we're on
+ * the last empty block element within the details node.
+ */
+function moveAfterDetailsOnEmptyLine(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
+    const scenario = getDetailsScenario(editor);
+    if (scenario === null) {
+        return false;
+    }
+
+    if (scenario.parentBlock.getTextContent() !== '') {
+        return false;
+    }
+
+    event?.preventDefault()
+
+    const nextSibling = scenario.parentDetails.getNextSibling();
+    editor.update(() => {
+        if (nextSibling) {
+            nextSibling.selectStart();
+        } else {
+            const newParagraph = $createParagraphNode();
+            scenario.parentDetails.insertAfter(newParagraph);
+            newParagraph.select();
+        }
+        scenario.parentBlock.remove();
+    });
+
+    return true;
+}
+
+/**
+ * Get the common nodes used for a details node scenario, relative to current selection.
+ * Returns null if not found, or if the parent block is not the last in the parent details node.
+ */
+function getDetailsScenario(editor: LexicalEditor): {
+    parentDetails: DetailsNode;
+    parentBlock: LexicalNode;
+    detailsSibling: LexicalNode | null
+} | null {
+    const selection = getLastSelection(editor);
+    const firstNode = selection?.getNodes()[0];
+    if (!firstNode) {
+        return null;
+    }
+
+    const block = $getNearestNodeBlockParent(firstNode);
+    const details = $getParentOfType(firstNode, $isDetailsNode);
+    if (!$isDetailsNode(details) || block === null) {
+        return null;
+    }
+
+    if (block.getKey() !== details.getLastChild()?.getKey()) {
+        return null;
+    }
+
+    const nextSibling = details.getNextSibling();
+    return {
+        parentDetails: details,
+        parentBlock: block,
+        detailsSibling: nextSibling,
+    }
+}
+
+/**
+ * Inset the nodes within selection when a range of nodes is selected
+ * or if a list node is selected.
+ */
 function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const change = event?.shiftKey ? -40 : 40;
     const selection = $getSelection();
@@ -85,17 +182,23 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
     }, COMMAND_PRIORITY_LOW);
 
     const unregisterEnter = context.editor.registerCommand(KEY_ENTER_COMMAND, (event): boolean => {
-        return insertAfterSingleSelectedNode(context.editor, event);
+        return insertAfterSingleSelectedNode(context.editor, event)
+            || moveAfterDetailsOnEmptyLine(context.editor, event);
     }, COMMAND_PRIORITY_LOW);
 
     const unregisterTab = context.editor.registerCommand(KEY_TAB_COMMAND, (event): boolean => {
         return handleInsetOnTab(context.editor, event);
     }, COMMAND_PRIORITY_LOW);
 
+    const unregisterDown = context.editor.registerCommand(KEY_ARROW_DOWN_COMMAND, (event): boolean => {
+        return insertAfterDetails(context.editor, event);
+    }, COMMAND_PRIORITY_LOW);
+
     return () => {
         unregisterBackspace();
         unregisterDelete();
         unregisterEnter();
         unregisterTab();
+        unregisterDown();
     };
 }
\ No newline at end of file

From e50cd33277026a93983b696014c6468a4d34fe6f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 16 Dec 2024 16:24:47 +0000
Subject: [PATCH 415/666] Lexical: Added testing for some added shortcuts

Also:
- Added svg loading support (dummy stub) for jest.
- Updated headless test case due to node changes.
- Split out editor change detected to where appropriate.
- Added functions to help with testing, like mocking our context.
---
 dev/build/svg-blank-transform.js              | 14 +++
 jest.config.ts                                |  1 +
 resources/js/wysiwyg/index.ts                 | 36 +------
 .../js/wysiwyg/lexical/core/LexicalEditor.ts  |  8 ++
 .../lexical/core/__tests__/utils/index.ts     | 46 +++++++++
 .../unit/LexicalHeadlessEditor.test.ts        |  1 -
 .../__tests__/unit/LexicalDetailsNode.test.ts | 40 ++++++++
 .../__tests__/keyboard-handling.test.ts       | 95 +++++++++++++++++++
 .../js/wysiwyg/services/common-events.ts      | 14 ++-
 resources/js/wysiwyg/ui/framework/manager.ts  | 18 +++-
 10 files changed, 239 insertions(+), 34 deletions(-)
 create mode 100644 dev/build/svg-blank-transform.js
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
 create mode 100644 resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts

diff --git a/dev/build/svg-blank-transform.js b/dev/build/svg-blank-transform.js
new file mode 100644
index 00000000000..5183014c880
--- /dev/null
+++ b/dev/build/svg-blank-transform.js
@@ -0,0 +1,14 @@
+// This is a basic transformer stub to help jest handle SVG files.
+// Essentially blanks them since we don't really need to involve them
+// in our tests (yet).
+module.exports = {
+    process() {
+        return {
+            code: 'module.exports = \'\';',
+        };
+    },
+    getCacheKey() {
+        // The output is always the same.
+        return 'svgTransform';
+    },
+};
diff --git a/jest.config.ts b/jest.config.ts
index 3c04f05b218..53bfceb053e 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -185,6 +185,7 @@ const config: Config = {
   // A map from regular expressions to paths to transformers
   transform: {
     "^.+.tsx?$": ["ts-jest",{}],
+    "^.+.svg$": ["<rootDir>/dev/build/svg-blank-transform.js",{}],
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 510ab1f9230..ffdc7d7e82c 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -75,38 +75,12 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     const debugView = document.getElementById('lexical-debug');
     if (debugView) {
         debugView.hidden = true;
-    }
-
-    let changeFromLoading = true;
-    editor.registerUpdateListener(({dirtyElements, dirtyLeaves, editorState, prevEditorState}) => {
-        // Watch for selection changes to update the UI on change
-        // Used to be done via SELECTION_CHANGE_COMMAND but this would not always emit
-        // for all selection changes, so this proved more reliable.
-        const selectionChange = !(prevEditorState._selection?.is(editorState._selection) || false);
-        if (selectionChange) {
-            editor.update(() => {
-                const selection = $getSelection();
-                context.manager.triggerStateUpdate({
-                    editor, selection,
-                });
-            });
-        }
-
-        // Emit change event to component system (for draft detection) on actual user content change
-        if (dirtyElements.size > 0 || dirtyLeaves.size > 0) {
-            if (changeFromLoading) {
-                changeFromLoading = false;
-            } else {
-                window.$events.emit('editor-html-change', '');
-            }
-        }
-
-        // Debug logic
-        // console.log('editorState', editorState.toJSON());
-        if (debugView) {
+        editor.registerUpdateListener(({dirtyElements, dirtyLeaves, editorState, prevEditorState}) => {
+            // Debug logic
+            // console.log('editorState', editorState.toJSON());
             debugView.textContent = JSON.stringify(editorState.toJSON(), null, 2);
-        }
-    });
+        });
+    }
 
     // @ts-ignore
     window.debugEditorState = () => {
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
index 092429156be..364f6c6b7c3 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
@@ -1188,6 +1188,14 @@ export class LexicalEditor {
     updateEditor(this, updateFn, options);
   }
 
+  /**
+   * Helper to run the update and commitUpdates methods in a single call.
+   */
+  updateAndCommit(updateFn: () => void, options?: EditorUpdateOptions): void {
+    this.update(updateFn, options);
+    this.commitUpdates();
+  }
+
   /**
    * Focuses the editor
    * @param callbackFn - A function to run after the editor is focused.
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index e9d14ef1139..2fc57315b7c 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -13,6 +13,7 @@ import {ListItemNode, ListNode} from '@lexical/list';
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 
 import {
+  $getSelection,
   $isRangeSelection,
   createEditor,
   DecoratorNode,
@@ -37,6 +38,10 @@ import {
 import {resetRandomKey} from '../../LexicalUtils';
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
+import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {EditorUiContext} from "../../../../ui/framework/core";
+import {EditorUIManager} from "../../../../ui/framework/manager";
+import {registerRichText} from "@lexical/rich-text";
 
 
 type TestEnv = {
@@ -420,6 +425,7 @@ const DEFAULT_NODES: NonNullable<ReadonlyArray<Klass<LexicalNode> | LexicalNodeR
   TableRowNode,
   AutoLinkNode,
   LinkNode,
+  DetailsNode,
   TestElementNode,
   TestSegmentedNode,
   TestExcludeFromCopyElementNode,
@@ -451,6 +457,7 @@ export function createTestEditor(
     ...config,
     nodes: DEFAULT_NODES.concat(customNodes),
   });
+
   return editor;
 }
 
@@ -465,6 +472,26 @@ export function createTestHeadlessEditor(
   });
 }
 
+export function createTestContext(env: TestEnv): EditorUiContext {
+  const context = {
+    containerDOM: document.createElement('div'),
+    editor: env.editor,
+    editorDOM: document.createElement('div'),
+    error(text: string | Error): void {
+    },
+    manager: new EditorUIManager(),
+    options: {},
+    scrollDOM: document.createElement('div'),
+    translate(text: string): string {
+      return "";
+    }
+  };
+
+  context.manager.setContext(context);
+
+  return context;
+}
+
 export function $assertRangeSelection(selection: unknown): RangeSelection {
   if (!$isRangeSelection(selection)) {
     throw new Error(`Expected RangeSelection, got ${selection}`);
@@ -717,4 +744,23 @@ export function expectHtmlToBeEqual(expected: string, actual: string): void {
 
 function formatHtml(s: string): string {
   return s.replace(/>\s+</g, '><').replace(/\s*\n\s*/g, ' ').trim();
+}
+
+export function dispatchKeydownEventForNode(node: LexicalNode, editor: LexicalEditor, key: string) {
+  const nodeDomEl = editor.getElementByKey(node.getKey());
+  const event = new KeyboardEvent('keydown', {
+    bubbles: true,
+    cancelable: true,
+    key,
+  });
+  nodeDomEl?.dispatchEvent(event);
+}
+
+export function dispatchKeydownEventForSelectedNode(editor: LexicalEditor, key: string) {
+  editor.getEditorState().read((): void => {
+    const node = $getSelection()?.getNodes()[0] || null;
+    if (node) {
+      dispatchKeydownEventForNode(node, editor, key);
+    }
+  });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
index 122516d45b6..c03f1bdb2fb 100644
--- a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
@@ -62,7 +62,6 @@ describe('LexicalHeadlessEditor', () => {
   it('should be headless environment', async () => {
     expect(typeof window === 'undefined').toBe(true);
     expect(typeof document === 'undefined').toBe(true);
-    expect(typeof navigator === 'undefined').toBe(true);
   });
 
   it('can update editor', async () => {
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
new file mode 100644
index 00000000000..faa31d8874d
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
@@ -0,0 +1,40 @@
+import {dispatchKeydownEventForNode, initializeUnitTest} from "lexical/__tests__/utils";
+import {$createDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {$createParagraphNode, $getRoot, LexicalNode, ParagraphNode} from "lexical";
+
+const editorConfig = Object.freeze({
+    namespace: '',
+    theme: {
+    },
+});
+
+describe('LexicalDetailsNode tests', () => {
+    initializeUnitTest((testEnv) => {
+
+        test('createDOM()', () => {
+            const {editor} = testEnv;
+            let html!: string;
+
+            editor.updateAndCommit(() => {
+                const details = $createDetailsNode();
+                html = details.createDOM(editorConfig, editor).outerHTML;
+            });
+
+            expect(html).toBe(`<details><summary contenteditable="false"></summary></details>`);
+        });
+
+        test('exportDOM()', () => {
+            const {editor} = testEnv;
+            let html!: string;
+
+            editor.updateAndCommit(() => {
+                const details = $createDetailsNode();
+                html = (details.exportDOM(editor).element as HTMLElement).outerHTML;
+            });
+
+            expect(html).toBe(`<details><summary></summary></details>`);
+        });
+
+
+    });
+})
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
new file mode 100644
index 00000000000..14a1ea973a5
--- /dev/null
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -0,0 +1,95 @@
+import {
+    createTestContext,
+    dispatchKeydownEventForNode,
+    dispatchKeydownEventForSelectedNode,
+    initializeUnitTest
+} from "lexical/__tests__/utils";
+import {
+    $createParagraphNode, $createTextNode,
+    $getRoot, LexicalNode,
+    ParagraphNode,
+} from "lexical";
+import {$createDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {registerKeyboardHandling} from "../keyboard-handling";
+import {registerRichText} from "@lexical/rich-text";
+
+describe('Keyboard-handling service tests', () => {
+    initializeUnitTest((testEnv) => {
+
+        test('Details: down key on last lines creates new sibling node', () => {
+            const {editor} = testEnv;
+
+            registerRichText(editor);
+            registerKeyboardHandling(createTestContext(testEnv));
+
+            let lastRootChild!: LexicalNode|null;
+            let detailsPara!: ParagraphNode;
+
+            editor.updateAndCommit(() => {
+                const root = $getRoot()
+                const details = $createDetailsNode();
+                detailsPara = $createParagraphNode();
+                details.append(detailsPara);
+                $getRoot().append(details);
+                detailsPara.select();
+
+                lastRootChild = root.getLastChild();
+            });
+
+            expect(lastRootChild).toBeInstanceOf(DetailsNode);
+
+            dispatchKeydownEventForNode(detailsPara, editor, 'ArrowDown');
+            editor.commitUpdates();
+
+            editor.getEditorState().read(() => {
+                lastRootChild = $getRoot().getLastChild();
+            });
+
+            expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+        });
+
+        test('Details: enter on last empy block creates new sibling node', () => {
+            const {editor} = testEnv;
+
+            registerRichText(editor);
+            registerKeyboardHandling(createTestContext(testEnv));
+
+            let lastRootChild!: LexicalNode|null;
+            let detailsPara!: ParagraphNode;
+
+            editor.updateAndCommit(() => {
+                const root = $getRoot()
+                const details = $createDetailsNode();
+                const text = $createTextNode('Hello!');
+                detailsPara = $createParagraphNode();
+                detailsPara.append(text);
+                details.append(detailsPara);
+                $getRoot().append(details);
+                text.selectEnd();
+
+                lastRootChild = root.getLastChild();
+            });
+
+            expect(lastRootChild).toBeInstanceOf(DetailsNode);
+
+            dispatchKeydownEventForNode(detailsPara, editor, 'Enter');
+            editor.commitUpdates();
+
+            dispatchKeydownEventForSelectedNode(editor, 'Enter');
+            editor.commitUpdates();
+
+            let detailsChildren!: LexicalNode[];
+            let lastDetailsText!: string;
+
+            editor.getEditorState().read(() => {
+                detailsChildren = (lastRootChild as DetailsNode).getChildren();
+                lastRootChild = $getRoot().getLastChild();
+                lastDetailsText = detailsChildren[0].getTextContent();
+            });
+
+            expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+            expect(detailsChildren).toHaveLength(1);
+            expect(lastDetailsText).toBe('Hello!');
+        });
+    });
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/common-events.ts b/resources/js/wysiwyg/services/common-events.ts
index 16522d66b71..2ffa722e40c 100644
--- a/resources/js/wysiwyg/services/common-events.ts
+++ b/resources/js/wysiwyg/services/common-events.ts
@@ -1,4 +1,4 @@
-import {LexicalEditor} from "lexical";
+import {$getSelection, LexicalEditor} from "lexical";
 import {
     appendHtmlToEditor,
     focusEditor,
@@ -40,4 +40,16 @@ export function listen(editor: LexicalEditor): void {
     window.$events.listen<EditorEventContent>('editor::focus', () => {
         focusEditor(editor);
     });
+
+    let changeFromLoading = true;
+    editor.registerUpdateListener(({dirtyElements, dirtyLeaves, editorState, prevEditorState}) => {
+        // Emit change event to component system (for draft detection) on actual user content change
+        if (dirtyElements.size > 0 || dirtyLeaves.size > 0) {
+            if (changeFromLoading) {
+                changeFromLoading = false;
+            } else {
+                window.$events.emit('editor-html-change', '');
+            }
+        }
+    });
 }
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 185cd5dccd0..0f501d9faae 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -1,7 +1,7 @@
 import {EditorFormModal, EditorFormModalDefinition} from "./modals";
 import {EditorContainerUiElement, EditorUiContext, EditorUiElement, EditorUiStateUpdate} from "./core";
 import {EditorDecorator, EditorDecoratorAdapter} from "./decorator";
-import {BaseSelection, LexicalEditor} from "lexical";
+import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
 import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
@@ -231,6 +231,22 @@ export class EditorUIManager {
             });
         }
         editor.registerDecoratorListener(domDecorateListener);
+
+        // Watch for changes to update local state
+        editor.registerUpdateListener(({editorState, prevEditorState}) => {
+            // Watch for selection changes to update the UI on change
+            // Used to be done via SELECTION_CHANGE_COMMAND but this would not always emit
+            // for all selection changes, so this proved more reliable.
+            const selectionChange = !(prevEditorState._selection?.is(editorState._selection) || false);
+            if (selectionChange) {
+                editor.update(() => {
+                    const selection = $getSelection();
+                    this.triggerStateUpdate({
+                        editor, selection,
+                    });
+                });
+            }
+        });
     }
 
     protected setupEventListeners(context: EditorUiContext) {

From ace8af077dfa5173c24cdf8b50eb82ccbd1dbf7e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Dec 2024 14:44:10 +0000
Subject: [PATCH 416/666] Lexical: Improved list tab handling, Improved test
 utils

- Made tab work on empty list items
- Improved select preservation on single list item tab
- Altered test context creation for more standard testing
---
 .../lexical/core/__tests__/utils/index.ts     |  32 +++-
 .../__tests__/keyboard-handling.test.ts       | 158 +++++++++++-------
 .../js/wysiwyg/services/keyboard-handling.ts  |  11 +-
 resources/js/wysiwyg/utils/lists.ts           |  17 +-
 4 files changed, 151 insertions(+), 67 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 2fc57315b7c..7815d4f0dc6 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -472,16 +472,34 @@ export function createTestHeadlessEditor(
   });
 }
 
-export function createTestContext(env: TestEnv): EditorUiContext {
+export function createTestContext(): EditorUiContext {
+
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  const scrollWrap = document.createElement('div');
+  const editorDOM = document.createElement('div');
+  editorDOM.setAttribute('contenteditable', 'true');
+
+  scrollWrap.append(editorDOM);
+  container.append(scrollWrap);
+
+  const editor = createTestEditor({
+    namespace: 'testing',
+    theme: {},
+  });
+
+  editor.setRootElement(editorDOM);
+
   const context = {
-    containerDOM: document.createElement('div'),
-    editor: env.editor,
-    editorDOM: document.createElement('div'),
+    containerDOM: container,
+    editor: editor,
+    editorDOM: editorDOM,
     error(text: string | Error): void {
     },
     manager: new EditorUIManager(),
     options: {},
-    scrollDOM: document.createElement('div'),
+    scrollDOM: scrollWrap,
     translate(text: string): string {
       return "";
     }
@@ -492,6 +510,10 @@ export function createTestContext(env: TestEnv): EditorUiContext {
   return context;
 }
 
+export function destroyFromContext(context: EditorUiContext) {
+  context.containerDOM.remove();
+}
+
 export function $assertRangeSelection(selection: unknown): RangeSelection {
   if (!$isRangeSelection(selection)) {
     throw new Error(`Expected RangeSelection, got ${selection}`);
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
index 14a1ea973a5..0ab6935fb1a 100644
--- a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -1,95 +1,135 @@
 import {
-    createTestContext,
+    createTestContext, destroyFromContext,
     dispatchKeydownEventForNode,
     dispatchKeydownEventForSelectedNode,
-    initializeUnitTest
 } from "lexical/__tests__/utils";
 import {
     $createParagraphNode, $createTextNode,
-    $getRoot, LexicalNode,
-    ParagraphNode,
+    $getRoot, $getSelection, LexicalEditor, LexicalNode,
+    ParagraphNode, TextNode,
 } from "lexical";
 import {$createDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {registerKeyboardHandling} from "../keyboard-handling";
 import {registerRichText} from "@lexical/rich-text";
+import {EditorUiContext} from "../../ui/framework/core";
+import {$createListItemNode, $createListNode, ListItemNode, ListNode} from "@lexical/list";
 
 describe('Keyboard-handling service tests', () => {
-    initializeUnitTest((testEnv) => {
 
-        test('Details: down key on last lines creates new sibling node', () => {
-            const {editor} = testEnv;
+    let context!: EditorUiContext;
+    let editor!: LexicalEditor;
 
-            registerRichText(editor);
-            registerKeyboardHandling(createTestContext(testEnv));
+    beforeEach(() => {
+        context = createTestContext();
+        editor = context.editor;
+        registerRichText(editor);
+        registerKeyboardHandling(context);
+    });
 
-            let lastRootChild!: LexicalNode|null;
-            let detailsPara!: ParagraphNode;
+    afterEach(() => {
+        destroyFromContext(context);
+    });
 
-            editor.updateAndCommit(() => {
-                const root = $getRoot()
-                const details = $createDetailsNode();
-                detailsPara = $createParagraphNode();
-                details.append(detailsPara);
-                $getRoot().append(details);
-                detailsPara.select();
+    test('Details: down key on last lines creates new sibling node', () => {
+        let lastRootChild!: LexicalNode|null;
+        let detailsPara!: ParagraphNode;
 
-                lastRootChild = root.getLastChild();
-            });
+        editor.updateAndCommit(() => {
+            const root = $getRoot()
+            const details = $createDetailsNode();
+            detailsPara = $createParagraphNode();
+            details.append(detailsPara);
+            $getRoot().append(details);
+            detailsPara.select();
 
-            expect(lastRootChild).toBeInstanceOf(DetailsNode);
+            lastRootChild = root.getLastChild();
+        });
 
-            dispatchKeydownEventForNode(detailsPara, editor, 'ArrowDown');
-            editor.commitUpdates();
+        expect(lastRootChild).toBeInstanceOf(DetailsNode);
 
-            editor.getEditorState().read(() => {
-                lastRootChild = $getRoot().getLastChild();
-            });
+        dispatchKeydownEventForNode(detailsPara, editor, 'ArrowDown');
+        editor.commitUpdates();
 
-            expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+        editor.getEditorState().read(() => {
+            lastRootChild = $getRoot().getLastChild();
         });
 
-        test('Details: enter on last empy block creates new sibling node', () => {
-            const {editor} = testEnv;
+        expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+    });
+
+    test('Details: enter on last empty block creates new sibling node', () => {
+        registerRichText(editor);
+
+        let lastRootChild!: LexicalNode|null;
+        let detailsPara!: ParagraphNode;
 
-            registerRichText(editor);
-            registerKeyboardHandling(createTestContext(testEnv));
+        editor.updateAndCommit(() => {
+            const root = $getRoot()
+            const details = $createDetailsNode();
+            const text = $createTextNode('Hello!');
+            detailsPara = $createParagraphNode();
+            detailsPara.append(text);
+            details.append(detailsPara);
+            $getRoot().append(details);
+            text.selectEnd();
 
-            let lastRootChild!: LexicalNode|null;
-            let detailsPara!: ParagraphNode;
+            lastRootChild = root.getLastChild();
+        });
+
+        expect(lastRootChild).toBeInstanceOf(DetailsNode);
+
+        dispatchKeydownEventForNode(detailsPara, editor, 'Enter');
+        editor.commitUpdates();
 
-            editor.updateAndCommit(() => {
-                const root = $getRoot()
-                const details = $createDetailsNode();
-                const text = $createTextNode('Hello!');
-                detailsPara = $createParagraphNode();
-                detailsPara.append(text);
-                details.append(detailsPara);
-                $getRoot().append(details);
-                text.selectEnd();
+        dispatchKeydownEventForSelectedNode(editor, 'Enter');
+        editor.commitUpdates();
 
-                lastRootChild = root.getLastChild();
-            });
+        let detailsChildren!: LexicalNode[];
+        let lastDetailsText!: string;
 
-            expect(lastRootChild).toBeInstanceOf(DetailsNode);
+        editor.getEditorState().read(() => {
+            detailsChildren = (lastRootChild as DetailsNode).getChildren();
+            lastRootChild = $getRoot().getLastChild();
+            lastDetailsText = detailsChildren[0].getTextContent();
+        });
 
-            dispatchKeydownEventForNode(detailsPara, editor, 'Enter');
-            editor.commitUpdates();
+        expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+        expect(detailsChildren).toHaveLength(1);
+        expect(lastDetailsText).toBe('Hello!');
+    });
 
-            dispatchKeydownEventForSelectedNode(editor, 'Enter');
-            editor.commitUpdates();
+    test('Lists: tab on empty list item insets item', () => {
 
-            let detailsChildren!: LexicalNode[];
-            let lastDetailsText!: string;
+        let list!: ListNode;
+        let listItemB!: ListItemNode;
 
-            editor.getEditorState().read(() => {
-                detailsChildren = (lastRootChild as DetailsNode).getChildren();
-                lastRootChild = $getRoot().getLastChild();
-                lastDetailsText = detailsChildren[0].getTextContent();
-            });
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            list = $createListNode('bullet');
+            const listItemA = $createListItemNode();
+            listItemA.append($createTextNode('Hello!'));
+            listItemB = $createListItemNode();
+            list.append(listItemA, listItemB);
+            root.append(list);
+            listItemB.selectStart();
+        });
 
-            expect(lastRootChild).toBeInstanceOf(ParagraphNode);
-            expect(detailsChildren).toHaveLength(1);
-            expect(lastDetailsText).toBe('Hello!');
+        dispatchKeydownEventForNode(listItemB, editor, 'Tab');
+        editor.commitUpdates();
+
+        editor.getEditorState().read(() => {
+            const list = $getRoot().getChildren()[0] as ListNode;
+            const listChild = list.getChildren()[0] as ListItemNode;
+            const children = listChild.getChildren();
+            expect(children).toHaveLength(2);
+            expect(children[0]).toBeInstanceOf(TextNode);
+            expect(children[0].getTextContent()).toBe('Hello!');
+            expect(children[1]).toBeInstanceOf(ListNode);
+
+            const innerList = children[1] as ListNode;
+            const selectedNode = $getSelection()?.getNodes()[0];
+            expect(selectedNode).toBeInstanceOf(ListItemNode);
+            expect(selectedNode?.getKey()).toBe(innerList.getChildren()[0].getKey());
         });
     });
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 08eed764596..ff6117b2b87 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -151,6 +151,15 @@ function getDetailsScenario(editor: LexicalEditor): {
     }
 }
 
+function $isSingleListItem(nodes: LexicalNode[]): boolean {
+    if (nodes.length !== 1) {
+        return false;
+    }
+
+    const node = nodes[0];
+    return $isListItemNode(node) || $isListItemNode(node.getParent());
+}
+
 /**
  * Inset the nodes within selection when a range of nodes is selected
  * or if a list node is selected.
@@ -159,7 +168,7 @@ function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null): boo
     const change = event?.shiftKey ? -40 : 40;
     const selection = $getSelection();
     const nodes = selection?.getNodes() || [];
-    if (nodes.length > 1 || (nodes.length === 1 && $isListItemNode(nodes[0].getParent()))) {
+    if (nodes.length > 1 || $isSingleListItem(nodes)) {
         editor.update(() => {
             $setInsetForSelection(editor, change);
         });
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index 646f341c2ba..2fc1c5f6b4e 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -1,4 +1,4 @@
-import {$getSelection, BaseSelection, LexicalEditor} from "lexical";
+import {$createTextNode, $getSelection, BaseSelection, LexicalEditor, TextNode} from "lexical";
 import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection} from "./selection";
 import {nodeHasInset} from "./nodes";
 import {$createListItemNode, $createListNode, $isListItemNode, $isListNode, ListItemNode} from "@lexical/list";
@@ -93,6 +93,7 @@ function $reduceDedupeListItems(listItems: (ListItemNode|null)[]): ListItemNode[
 
 export function $setInsetForSelection(editor: LexicalEditor, change: number): void {
     const selection = $getSelection();
+    const selectionBounds = selection?.getStartEndPoints();
     const listItemsInSelection = getListItemsForSelection(selection);
     const isListSelection = listItemsInSelection.length > 0 && !listItemsInSelection.includes(null);
 
@@ -110,7 +111,19 @@ export function $setInsetForSelection(editor: LexicalEditor, change: number): vo
             alteredListItems.reverse();
         }
 
-        $selectNodes(alteredListItems);
+        if (alteredListItems.length === 1 && selectionBounds) {
+            // Retain selection range if moving just one item
+            const listItem = alteredListItems[0] as ListItemNode;
+            let child = listItem.getChildren()[0] as TextNode;
+            if (!child) {
+                child = $createTextNode('');
+                listItem.append(child);
+            }
+            child.select(selectionBounds[0].offset, selectionBounds[1].offset);
+        } else {
+            $selectNodes(alteredListItems);
+        }
+
         return;
     }
 

From fca8f928a380350a1a6441530a722f4578f8ae14 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Dec 2024 16:50:03 +0000
Subject: [PATCH 417/666] Lexical: Aligned new empty item behaviour for nested
 lists

- Makes enter on empty nested list item un-nest instead of just creating
  new list items.
- Also updated existing lists tests to use newer helper setup.
---
 .../lexical/core/__tests__/utils/index.ts     |    1 +
 .../lexical/list/LexicalListItemNode.ts       |   11 +-
 .../unit/LexicalListItemNode.test.ts          | 1041 +++++++++--------
 .../__tests__/keyboard-handling.test.ts       |    5 -
 4 files changed, 538 insertions(+), 520 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 7815d4f0dc6..d90853b7c34 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -776,6 +776,7 @@ export function dispatchKeydownEventForNode(node: LexicalNode, editor: LexicalEd
     key,
   });
   nodeDomEl?.dispatchEvent(event);
+  editor.commitUpdates();
 }
 
 export function dispatchKeydownEventForSelectedNode(editor: LexicalEditor, key: string) {
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
index 33b021298a6..239c49a8c30 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -271,11 +271,18 @@ export class ListItemNode extends ElementNode {
   insertNewAfter(
     _: RangeSelection,
     restoreSelection = true,
-  ): ListItemNode | ParagraphNode {
+  ): ListItemNode | ParagraphNode | null {
 
     if (this.getTextContent().trim() === '' && this.isLastChild()) {
       const list = this.getParentOrThrow<ListNode>();
-      if (!$isListItemNode(list.getParent())) {
+      const parentListItem = list.getParent();
+      if ($isListItemNode(parentListItem)) {
+        // Un-nest list item if empty nested item
+        parentListItem.insertAfter(this);
+        this.selectStart();
+        return null;
+      } else {
+        // Insert empty paragraph after list if adding after last empty child
         const paragraph = $createParagraphNode();
         list.insertAfter(paragraph, restoreSelection);
         this.remove();
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index 567714bcd9f..10ff0fc6699 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -9,13 +9,13 @@
 import {
   $createParagraphNode,
   $createRangeSelection,
-  $getRoot,
+  $getRoot, LexicalEditor,
   TextNode,
 } from 'lexical';
 import {
+  createTestContext, destroyFromContext,
   expectHtmlToBeEqual,
   html,
-  initializeUnitTest,
 } from 'lexical/__tests__/utils';
 
 import {
@@ -24,49 +24,49 @@ import {
   ListItemNode,
   ListNode,
 } from '../..';
-
-const editorConfig = Object.freeze({
-  namespace: '',
-  theme: {
-    list: {
-      listitem: 'my-listItem-item-class',
-      nested: {
-        listitem: 'my-nested-list-listItem-class',
-      },
-    },
-  },
-});
+import {EditorUiContext} from "../../../../ui/framework/core";
+import {$htmlToBlockNodes} from "../../../../utils/nodes";
 
 describe('LexicalListItemNode tests', () => {
-  initializeUnitTest((testEnv) => {
-    test('ListItemNode.constructor', async () => {
-      const {editor} = testEnv;
 
-      await editor.update(() => {
-        const listItemNode = new ListItemNode();
+  let context!: EditorUiContext;
+  let editor!: LexicalEditor;
 
-        expect(listItemNode.getType()).toBe('listitem');
+  beforeEach(() => {
+    context = createTestContext();
+    editor = context.editor;
+  });
 
-        expect(listItemNode.getTextContent()).toBe('');
-      });
+  afterEach(() => {
+    destroyFromContext(context);
+  });
+
+  test('ListItemNode.constructor', async () => {
+
+    await editor.update(() => {
+      const listItemNode = new ListItemNode();
 
-      expect(() => new ListItemNode()).toThrow();
+      expect(listItemNode.getType()).toBe('listitem');
+
+      expect(listItemNode.getTextContent()).toBe('');
     });
 
-    test('ListItemNode.createDOM()', async () => {
-      const {editor} = testEnv;
+    expect(() => new ListItemNode()).toThrow();
+  });
 
-      await editor.update(() => {
-        const listItemNode = new ListItemNode();
+  test('ListItemNode.createDOM()', async () => {
 
-        expectHtmlToBeEqual(
-          listItemNode.createDOM(editorConfig).outerHTML,
+    await editor.update(() => {
+      const listItemNode = new ListItemNode();
+
+      expectHtmlToBeEqual(
+          listItemNode.createDOM(editor._config).outerHTML,
           html`
             <li value="1"></li>
           `,
-        );
+      );
 
-        expectHtmlToBeEqual(
+      expectHtmlToBeEqual(
           listItemNode.createDOM({
             namespace: '',
             theme: {},
@@ -74,108 +74,105 @@ describe('LexicalListItemNode tests', () => {
           html`
             <li value="1"></li>
           `,
-        );
-      });
+      );
     });
+  });
 
-    describe('ListItemNode.updateDOM()', () => {
-      test('base', async () => {
-        const {editor} = testEnv;
+  describe('ListItemNode.updateDOM()', () => {
+    test('base', async () => {
 
-        await editor.update(() => {
-          const listItemNode = new ListItemNode();
+      await editor.update(() => {
+        const listItemNode = new ListItemNode();
 
-          const domElement = listItemNode.createDOM(editorConfig);
+        const domElement = listItemNode.createDOM(editor._config);
 
-          expectHtmlToBeEqual(
+        expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
               <li value="1"></li>
             `,
-          );
-          const newListItemNode = new ListItemNode();
+        );
+        const newListItemNode = new ListItemNode();
 
-          const result = newListItemNode.updateDOM(
+        const result = newListItemNode.updateDOM(
             listItemNode,
             domElement,
-            editorConfig,
-          );
+            editor._config,
+        );
 
-          expect(result).toBe(false);
+        expect(result).toBe(false);
 
-          expectHtmlToBeEqual(
+        expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
               <li value="1"></li>
             `,
-          );
-        });
+        );
       });
+    });
 
-      test('nested list', async () => {
-        const {editor} = testEnv;
+    test('nested list', async () => {
 
-        await editor.update(() => {
-          const parentListNode = new ListNode('bullet', 1);
-          const parentlistItemNode = new ListItemNode();
+      await editor.update(() => {
+        const parentListNode = new ListNode('bullet', 1);
+        const parentlistItemNode = new ListItemNode();
 
-          parentListNode.append(parentlistItemNode);
-          const domElement = parentlistItemNode.createDOM(editorConfig);
+        parentListNode.append(parentlistItemNode);
+        const domElement = parentlistItemNode.createDOM(editor._config);
 
-          expectHtmlToBeEqual(
+        expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
               <li value="1"></li>
             `,
-          );
-          const nestedListNode = new ListNode('bullet', 1);
-          nestedListNode.append(new ListItemNode());
-          parentlistItemNode.append(nestedListNode);
-          const result = parentlistItemNode.updateDOM(
+        );
+        const nestedListNode = new ListNode('bullet', 1);
+        nestedListNode.append(new ListItemNode());
+        parentlistItemNode.append(nestedListNode);
+        const result = parentlistItemNode.updateDOM(
             parentlistItemNode,
             domElement,
-            editorConfig,
-          );
+            editor._config,
+        );
 
-          expect(result).toBe(false);
+        expect(result).toBe(false);
 
-          expectHtmlToBeEqual(
+        expectHtmlToBeEqual(
             domElement.outerHTML,
             html`
               <li value="1" style="list-style: none;"></li>
             `,
-          );
-        });
+        );
       });
     });
+  });
 
-    describe('ListItemNode.replace()', () => {
-      let listNode: ListNode;
-      let listItemNode1: ListItemNode;
-      let listItemNode2: ListItemNode;
-      let listItemNode3: ListItemNode;
+  describe('ListItemNode.replace()', () => {
+    let listNode: ListNode;
+    let listItemNode1: ListItemNode;
+    let listItemNode2: ListItemNode;
+    let listItemNode3: ListItemNode;
 
-      beforeEach(async () => {
-        const {editor} = testEnv;
+    beforeEach(async () => {
 
-        await editor.update(() => {
-          const root = $getRoot();
-          listNode = new ListNode('bullet', 1);
-          listItemNode1 = new ListItemNode();
+      await editor.update(() => {
+        const root = $getRoot();
+        listNode = new ListNode('bullet', 1);
+        listItemNode1 = new ListItemNode();
 
-          listItemNode1.append(new TextNode('one'));
-          listItemNode2 = new ListItemNode();
+        listItemNode1.append(new TextNode('one'));
+        listItemNode2 = new ListItemNode();
 
-          listItemNode2.append(new TextNode('two'));
-          listItemNode3 = new ListItemNode();
+        listItemNode2.append(new TextNode('two'));
+        listItemNode3 = new ListItemNode();
 
-          listItemNode3.append(new TextNode('three'));
-          root.append(listNode);
-          listNode.append(listItemNode1, listItemNode2, listItemNode3);
-        });
+        listItemNode3.append(new TextNode('three'));
+        root.append(listNode);
+        listNode.append(listItemNode1, listItemNode2, listItemNode3);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -194,21 +191,20 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('another list item node', async () => {
-        const {editor} = testEnv;
+    test('another list item node', async () => {
 
-        await editor.update(() => {
-          const newListItemNode = new ListItemNode();
+      await editor.update(() => {
+        const newListItemNode = new ListItemNode();
 
-          newListItemNode.append(new TextNode('bar'));
-          listItemNode1.replace(newListItemNode);
-        });
+        newListItemNode.append(new TextNode('bar'));
+        listItemNode1.replace(newListItemNode);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -227,18 +223,17 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('first list item with a non list item node', async () => {
-        const {editor} = testEnv;
+    test('first list item with a non list item node', async () => {
 
-        await editor.update(() => {
-          return;
-        });
+      await editor.update(() => {
+        return;
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -257,15 +252,15 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
+      );
 
-        await editor.update(() => {
-          const paragraphNode = $createParagraphNode();
-          listItemNode1.replace(paragraphNode);
-        });
+      await editor.update(() => {
+        const paragraphNode = $createParagraphNode();
+        listItemNode1.replace(paragraphNode);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -282,19 +277,18 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('last list item with a non list item node', async () => {
-        const {editor} = testEnv;
+    test('last list item with a non list item node', async () => {
 
-        await editor.update(() => {
-          const paragraphNode = $createParagraphNode();
-          listItemNode3.replace(paragraphNode);
-        });
+      await editor.update(() => {
+        const paragraphNode = $createParagraphNode();
+        listItemNode3.replace(paragraphNode);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -311,19 +305,18 @@ describe('LexicalListItemNode tests', () => {
               <p><br></p>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('middle list item with a non list item node', async () => {
-        const {editor} = testEnv;
+    test('middle list item with a non list item node', async () => {
 
-        await editor.update(() => {
-          const paragraphNode = $createParagraphNode();
-          listItemNode2.replace(paragraphNode);
-        });
+      await editor.update(() => {
+        const paragraphNode = $createParagraphNode();
+        listItemNode2.replace(paragraphNode);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -342,19 +335,18 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('the only list item with a non list item node', async () => {
-        const {editor} = testEnv;
+    test('the only list item with a non list item node', async () => {
 
-        await editor.update(() => {
-          listItemNode2.remove();
-          listItemNode3.remove();
-        });
+      await editor.update(() => {
+        listItemNode2.remove();
+        listItemNode3.remove();
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -367,15 +359,15 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
+      );
 
-        await editor.update(() => {
-          const paragraphNode = $createParagraphNode();
-          listItemNode1.replace(paragraphNode);
-        });
+      await editor.update(() => {
+        const paragraphNode = $createParagraphNode();
+        listItemNode1.replace(paragraphNode);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -384,37 +376,36 @@ describe('LexicalListItemNode tests', () => {
               <p><br></p>
             </div>
           `,
-        );
-      });
+      );
     });
+  });
 
-    describe('ListItemNode.remove()', () => {
-      // - A
-      // - x
-      // - B
-      test('siblings are not nested', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
+  describe('ListItemNode.remove()', () => {
+    // - A
+    // - x
+    // - B
+    test('siblings are not nested', async () => {
+      let x: ListItemNode;
 
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
 
-          const A_listItem = new ListItemNode();
-          A_listItem.append(new TextNode('A'));
+        const A_listItem = new ListItemNode();
+        A_listItem.append(new TextNode('A'));
 
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
 
-          const B_listItem = new ListItemNode();
-          B_listItem.append(new TextNode('B'));
+        const B_listItem = new ListItemNode();
+        B_listItem.append(new TextNode('B'));
 
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -433,12 +424,12 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -454,39 +445,38 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      //   - A
-      // - x
-      // - B
-      test('the previous sibling is nested', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
+    //   - A
+    // - x
+    // - B
+    test('the previous sibling is nested', async () => {
+      let x: ListItemNode;
 
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
 
-          const A_listItem = new ListItemNode();
-          const A_nestedList = new ListNode('bullet', 1);
-          const A_nestedListItem = new ListItemNode();
-          A_listItem.append(A_nestedList);
-          A_nestedList.append(A_nestedListItem);
-          A_nestedListItem.append(new TextNode('A'));
+        const A_listItem = new ListItemNode();
+        const A_nestedList = new ListNode('bullet', 1);
+        const A_nestedListItem = new ListItemNode();
+        A_listItem.append(A_nestedList);
+        A_nestedList.append(A_nestedListItem);
+        A_nestedListItem.append(new TextNode('A'));
 
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
 
-          const B_listItem = new ListItemNode();
-          B_listItem.append(new TextNode('B'));
+        const B_listItem = new ListItemNode();
+        B_listItem.append(new TextNode('B'));
 
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -504,12 +494,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -524,39 +514,38 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
+    });
 
-      // - A
-      // - x
-      //   - B
-      test('the next sibling is nested', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
+    // - A
+    // - x
+    //   - B
+    test('the next sibling is nested', async () => {
+      let x: ListItemNode;
 
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
 
-          const A_listItem = new ListItemNode();
-          A_listItem.append(new TextNode('A'));
+        const A_listItem = new ListItemNode();
+        A_listItem.append(new TextNode('A'));
 
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
 
-          const B_listItem = new ListItemNode();
-          const B_nestedList = new ListNode('bullet', 1);
-          const B_nestedListItem = new ListItemNode();
-          B_listItem.append(B_nestedList);
-          B_nestedList.append(B_nestedListItem);
-          B_nestedListItem.append(new TextNode('B'));
+        const B_listItem = new ListItemNode();
+        const B_nestedList = new ListNode('bullet', 1);
+        const B_nestedListItem = new ListItemNode();
+        B_listItem.append(B_nestedList);
+        B_nestedList.append(B_nestedListItem);
+        B_nestedListItem.append(new TextNode('B'));
 
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1">
@@ -574,12 +563,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1">
@@ -594,43 +583,42 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
+    });
 
-      //   - A
-      // - x
-      //   - B
-      test('both siblings are nested', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
-
-          const A_listItem = new ListItemNode();
-          const A_nestedList = new ListNode('bullet', 1);
-          const A_nestedListItem = new ListItemNode();
-          A_listItem.append(A_nestedList);
-          A_nestedList.append(A_nestedListItem);
-          A_nestedListItem.append(new TextNode('A'));
-
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
-
-          const B_listItem = new ListItemNode();
-          const B_nestedList = new ListNode('bullet', 1);
-          const B_nestedListItem = new ListItemNode();
-          B_listItem.append(B_nestedList);
-          B_nestedList.append(B_nestedListItem);
-          B_nestedListItem.append(new TextNode('B'));
-
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+    //   - A
+    // - x
+    //   - B
+    test('both siblings are nested', async () => {
+      let x: ListItemNode;
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
+
+        const A_listItem = new ListItemNode();
+        const A_nestedList = new ListNode('bullet', 1);
+        const A_nestedListItem = new ListItemNode();
+        A_listItem.append(A_nestedList);
+        A_nestedList.append(A_nestedListItem);
+        A_nestedListItem.append(new TextNode('A'));
+
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
+
+        const B_listItem = new ListItemNode();
+        const B_nestedList = new ListNode('bullet', 1);
+        const B_nestedListItem = new ListItemNode();
+        B_listItem.append(B_nestedList);
+        B_nestedList.append(B_nestedListItem);
+        B_nestedListItem.append(new TextNode('B'));
+
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
+
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -652,12 +640,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -672,51 +660,50 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
+    });
 
-      //  - A1
-      //     - A2
-      // - x
-      //   - B
-      test('the previous sibling is nested deeper than the next sibling', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
-
-          const A_listItem = new ListItemNode();
-          const A_nestedList = new ListNode('bullet', 1);
-          const A_nestedListItem1 = new ListItemNode();
-          const A_nestedListItem2 = new ListItemNode();
-          const A_deeplyNestedList = new ListNode('bullet', 1);
-          const A_deeplyNestedListItem = new ListItemNode();
-          A_listItem.append(A_nestedList);
-          A_nestedList.append(A_nestedListItem1);
-          A_nestedList.append(A_nestedListItem2);
-          A_nestedListItem1.append(new TextNode('A1'));
-          A_nestedListItem2.append(A_deeplyNestedList);
-          A_deeplyNestedList.append(A_deeplyNestedListItem);
-          A_deeplyNestedListItem.append(new TextNode('A2'));
-
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
-
-          const B_listItem = new ListItemNode();
-          const B_nestedList = new ListNode('bullet', 1);
-          const B_nestedlistItem = new ListItemNode();
-          B_listItem.append(B_nestedList);
-          B_nestedList.append(B_nestedlistItem);
-          B_nestedlistItem.append(new TextNode('B'));
-
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+    //  - A1
+    //     - A2
+    // - x
+    //   - B
+    test('the previous sibling is nested deeper than the next sibling', async () => {
+      let x: ListItemNode;
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
+
+        const A_listItem = new ListItemNode();
+        const A_nestedList = new ListNode('bullet', 1);
+        const A_nestedListItem1 = new ListItemNode();
+        const A_nestedListItem2 = new ListItemNode();
+        const A_deeplyNestedList = new ListNode('bullet', 1);
+        const A_deeplyNestedListItem = new ListItemNode();
+        A_listItem.append(A_nestedList);
+        A_nestedList.append(A_nestedListItem1);
+        A_nestedList.append(A_nestedListItem2);
+        A_nestedListItem1.append(new TextNode('A1'));
+        A_nestedListItem2.append(A_deeplyNestedList);
+        A_deeplyNestedList.append(A_deeplyNestedListItem);
+        A_deeplyNestedListItem.append(new TextNode('A2'));
+
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
+
+        const B_listItem = new ListItemNode();
+        const B_nestedList = new ListNode('bullet', 1);
+        const B_nestedlistItem = new ListItemNode();
+        B_listItem.append(B_nestedList);
+        B_nestedList.append(B_nestedlistItem);
+        B_nestedlistItem.append(new TextNode('B'));
+
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
+
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -745,12 +732,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -772,51 +759,50 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
+    });
 
-      //   - A
-      // - x
-      //     - B1
-      //   - B2
-      test('the next sibling is nested deeper than the previous sibling', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
-
-          const A_listItem = new ListItemNode();
-          const A_nestedList = new ListNode('bullet', 1);
-          const A_nestedListItem = new ListItemNode();
-          A_listItem.append(A_nestedList);
-          A_nestedList.append(A_nestedListItem);
-          A_nestedListItem.append(new TextNode('A'));
-
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
-
-          const B_listItem = new ListItemNode();
-          const B_nestedList = new ListNode('bullet', 1);
-          const B_nestedListItem1 = new ListItemNode();
-          const B_nestedListItem2 = new ListItemNode();
-          const B_deeplyNestedList = new ListNode('bullet', 1);
-          const B_deeplyNestedListItem = new ListItemNode();
-          B_listItem.append(B_nestedList);
-          B_nestedList.append(B_nestedListItem1);
-          B_nestedList.append(B_nestedListItem2);
-          B_nestedListItem1.append(B_deeplyNestedList);
-          B_nestedListItem2.append(new TextNode('B2'));
-          B_deeplyNestedList.append(B_deeplyNestedListItem);
-          B_deeplyNestedListItem.append(new TextNode('B1'));
-
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+    //   - A
+    // - x
+    //     - B1
+    //   - B2
+    test('the next sibling is nested deeper than the previous sibling', async () => {
+      let x: ListItemNode;
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
+
+        const A_listItem = new ListItemNode();
+        const A_nestedList = new ListNode('bullet', 1);
+        const A_nestedListItem = new ListItemNode();
+        A_listItem.append(A_nestedList);
+        A_nestedList.append(A_nestedListItem);
+        A_nestedListItem.append(new TextNode('A'));
+
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
+
+        const B_listItem = new ListItemNode();
+        const B_nestedList = new ListNode('bullet', 1);
+        const B_nestedListItem1 = new ListItemNode();
+        const B_nestedListItem2 = new ListItemNode();
+        const B_deeplyNestedList = new ListNode('bullet', 1);
+        const B_deeplyNestedListItem = new ListItemNode();
+        B_listItem.append(B_nestedList);
+        B_nestedList.append(B_nestedListItem1);
+        B_nestedList.append(B_nestedListItem2);
+        B_nestedListItem1.append(B_deeplyNestedList);
+        B_nestedListItem2.append(new TextNode('B2'));
+        B_deeplyNestedList.append(B_deeplyNestedListItem);
+        B_deeplyNestedListItem.append(new TextNode('B1'));
+
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
+
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -845,12 +831,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -872,59 +858,58 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
+    });
 
-      //   - A1
-      //     - A2
-      // - x
-      //     - B1
-      //   - B2
-      test('both siblings are deeply nested', async () => {
-        const {editor} = testEnv;
-        let x: ListItemNode;
-
-        await editor.update(() => {
-          const root = $getRoot();
-          const parent = new ListNode('bullet', 1);
-
-          const A_listItem = new ListItemNode();
-          const A_nestedList = new ListNode('bullet', 1);
-          const A_nestedListItem1 = new ListItemNode();
-          const A_nestedListItem2 = new ListItemNode();
-          const A_deeplyNestedList = new ListNode('bullet', 1);
-          const A_deeplyNestedListItem = new ListItemNode();
-          A_listItem.append(A_nestedList);
-          A_nestedList.append(A_nestedListItem1);
-          A_nestedList.append(A_nestedListItem2);
-          A_nestedListItem1.append(new TextNode('A1'));
-          A_nestedListItem2.append(A_deeplyNestedList);
-          A_deeplyNestedList.append(A_deeplyNestedListItem);
-          A_deeplyNestedListItem.append(new TextNode('A2'));
-
-          x = new ListItemNode();
-          x.append(new TextNode('x'));
-
-          const B_listItem = new ListItemNode();
-          const B_nestedList = new ListNode('bullet', 1);
-          const B_nestedListItem1 = new ListItemNode();
-          const B_nestedListItem2 = new ListItemNode();
-          const B_deeplyNestedList = new ListNode('bullet', 1);
-          const B_deeplyNestedListItem = new ListItemNode();
-          B_listItem.append(B_nestedList);
-          B_nestedList.append(B_nestedListItem1);
-          B_nestedList.append(B_nestedListItem2);
-          B_nestedListItem1.append(B_deeplyNestedList);
-          B_nestedListItem2.append(new TextNode('B2'));
-          B_deeplyNestedList.append(B_deeplyNestedListItem);
-          B_deeplyNestedListItem.append(new TextNode('B1'));
-
-          parent.append(A_listItem, x, B_listItem);
-          root.append(parent);
-        });
+    //   - A1
+    //     - A2
+    // - x
+    //     - B1
+    //   - B2
+    test('both siblings are deeply nested', async () => {
+      let x: ListItemNode;
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      await editor.update(() => {
+        const root = $getRoot();
+        const parent = new ListNode('bullet', 1);
+
+        const A_listItem = new ListItemNode();
+        const A_nestedList = new ListNode('bullet', 1);
+        const A_nestedListItem1 = new ListItemNode();
+        const A_nestedListItem2 = new ListItemNode();
+        const A_deeplyNestedList = new ListNode('bullet', 1);
+        const A_deeplyNestedListItem = new ListItemNode();
+        A_listItem.append(A_nestedList);
+        A_nestedList.append(A_nestedListItem1);
+        A_nestedList.append(A_nestedListItem2);
+        A_nestedListItem1.append(new TextNode('A1'));
+        A_nestedListItem2.append(A_deeplyNestedList);
+        A_deeplyNestedList.append(A_deeplyNestedListItem);
+        A_deeplyNestedListItem.append(new TextNode('A2'));
+
+        x = new ListItemNode();
+        x.append(new TextNode('x'));
+
+        const B_listItem = new ListItemNode();
+        const B_nestedList = new ListNode('bullet', 1);
+        const B_nestedListItem1 = new ListItemNode();
+        const B_nestedListItem2 = new ListItemNode();
+        const B_deeplyNestedList = new ListNode('bullet', 1);
+        const B_deeplyNestedListItem = new ListItemNode();
+        B_listItem.append(B_nestedList);
+        B_nestedList.append(B_nestedListItem1);
+        B_nestedList.append(B_nestedListItem2);
+        B_nestedListItem1.append(B_deeplyNestedList);
+        B_nestedListItem2.append(new TextNode('B2'));
+        B_deeplyNestedList.append(B_deeplyNestedListItem);
+        B_deeplyNestedListItem.append(new TextNode('B1'));
+
+        parent.append(A_listItem, x, B_listItem);
+        root.append(parent);
+      });
+
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -960,12 +945,12 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
+      );
 
-        await editor.update(() => x.remove());
+      await editor.update(() => x.remove());
 
-        expectHtmlToBeEqual(
-          testEnv.innerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
           html`
             <ul>
               <li value="1" style="list-style: none;">
@@ -990,37 +975,36 @@ describe('LexicalListItemNode tests', () => {
               </li>
             </ul>
           `,
-        );
-      });
+      );
     });
+  });
 
-    describe('ListItemNode.insertNewAfter(): non-empty list items', () => {
-      let listNode: ListNode;
-      let listItemNode1: ListItemNode;
-      let listItemNode2: ListItemNode;
-      let listItemNode3: ListItemNode;
+  describe('ListItemNode.insertNewAfter(): non-empty list items', () => {
+    let listNode: ListNode;
+    let listItemNode1: ListItemNode;
+    let listItemNode2: ListItemNode;
+    let listItemNode3: ListItemNode;
 
-      beforeEach(async () => {
-        const {editor} = testEnv;
+    beforeEach(async () => {
 
-        await editor.update(() => {
-          const root = $getRoot();
-          listNode = new ListNode('bullet', 1);
-          listItemNode1 = new ListItemNode();
+      await editor.update(() => {
+        const root = $getRoot();
+        listNode = new ListNode('bullet', 1);
+        listItemNode1 = new ListItemNode();
 
-          listItemNode2 = new ListItemNode();
+        listItemNode2 = new ListItemNode();
 
-          listItemNode3 = new ListItemNode();
+        listItemNode3 = new ListItemNode();
 
-          root.append(listNode);
-          listNode.append(listItemNode1, listItemNode2, listItemNode3);
-          listItemNode1.append(new TextNode('one'));
-          listItemNode2.append(new TextNode('two'));
-          listItemNode3.append(new TextNode('three'));
-        });
+        root.append(listNode);
+        listNode.append(listItemNode1, listItemNode2, listItemNode3);
+        listItemNode1.append(new TextNode('one'));
+        listItemNode2.append(new TextNode('two'));
+        listItemNode3.append(new TextNode('three'));
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1039,18 +1023,17 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('first list item', async () => {
-        const {editor} = testEnv;
+    test('first list item', async () => {
 
-        await editor.update(() => {
-          listItemNode1.insertNewAfter($createRangeSelection());
-        });
+      await editor.update(() => {
+        listItemNode1.insertNewAfter($createRangeSelection());
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1070,18 +1053,17 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('last list item', async () => {
-        const {editor} = testEnv;
+    test('last list item', async () => {
 
-        await editor.update(() => {
-          listItemNode3.insertNewAfter($createRangeSelection());
-        });
+      await editor.update(() => {
+        listItemNode3.insertNewAfter($createRangeSelection());
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1101,18 +1083,17 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
+    });
 
-      test('middle list item', async () => {
-        const {editor} = testEnv;
+    test('middle list item', async () => {
 
-        await editor.update(() => {
-          listItemNode3.insertNewAfter($createRangeSelection());
-        });
+      await editor.update(() => {
+        listItemNode3.insertNewAfter($createRangeSelection());
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1132,19 +1113,17 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
-
-      test('the only list item', async () => {
-        const {editor} = testEnv;
+      );
+    });
 
-        await editor.update(() => {
-          listItemNode2.remove();
-          listItemNode3.remove();
-        });
+    test('the only list item', async () => {
+      await editor.update(() => {
+        listItemNode2.remove();
+        listItemNode3.remove();
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1157,14 +1136,14 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
+      );
 
-        await editor.update(() => {
-          listItemNode1.insertNewAfter($createRangeSelection());
-        });
+      await editor.update(() => {
+        listItemNode1.insertNewAfter($createRangeSelection());
+      });
 
-        expectHtmlToBeEqual(
-          testEnv.outerHTML,
+      expectHtmlToBeEqual(
+          context.editorDOM.outerHTML,
           html`
             <div
               contenteditable="true"
@@ -1178,32 +1157,68 @@ describe('LexicalListItemNode tests', () => {
               </ul>
             </div>
           `,
-        );
-      });
+      );
     });
+  });
 
-    test('$createListItemNode()', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        const listItemNode = new ListItemNode();
-
-        const createdListItemNode = $createListItemNode();
+  describe('ListItemNode.insertNewAfter()', () => {
+    test('new items after empty nested items un-nests the current item instead of creating new', () => {
+      let nestedItem!: ListItemNode;
+      const input = `<ul>
+        <li>
+            Item A
+            <ul><li>Nested item A</li></ul>
+        </li>        
+        <li>Item B</li>        
+        </ul>`;
+
+      editor.updateAndCommit(() => {
+        const root = $getRoot();
+        root.append(...$htmlToBlockNodes(editor, input));
+        const list = root.getFirstChild() as ListNode;
+        const itemA = list.getFirstChild() as ListItemNode;
+        const nestedList = itemA.getLastChild() as ListNode;
+        nestedItem = nestedList.getFirstChild() as ListItemNode;
+        nestedList.selectEnd();
+      });
 
-        expect(listItemNode.__type).toEqual(createdListItemNode.__type);
-        expect(listItemNode.__parent).toEqual(createdListItemNode.__parent);
-        expect(listItemNode.__key).not.toEqual(createdListItemNode.__key);
+      editor.updateAndCommit(() => {
+          nestedItem.insertNewAfter($createRangeSelection());
+          const newItem = nestedItem.getNextSibling() as ListItemNode;
+          newItem.insertNewAfter($createRangeSelection());
       });
+
+      expectHtmlToBeEqual(
+          context.editorDOM.innerHTML,
+          html`<ul>
+            <li value="1">
+              <span data-lexical-text="true">Item A</span>
+              <ul><li value="1"><span data-lexical-text="true">Nested item A</span></li></ul>
+            </li>
+            <li value="2"><br></li>
+            <li value="3"><span data-lexical-text="true">Item B</span></li>
+          </ul>`,
+      );
     });
+  });
 
-    test('$isListItemNode()', async () => {
-      const {editor} = testEnv;
+  test('$createListItemNode()', async () => {
+    await editor.update(() => {
+      const listItemNode = new ListItemNode();
 
-      await editor.update(() => {
-        const listItemNode = new ListItemNode();
+      const createdListItemNode = $createListItemNode();
 
-        expect($isListItemNode(listItemNode)).toBe(true);
-      });
+      expect(listItemNode.__type).toEqual(createdListItemNode.__type);
+      expect(listItemNode.__parent).toEqual(createdListItemNode.__parent);
+      expect(listItemNode.__key).not.toEqual(createdListItemNode.__key);
+    });
+  });
+
+  test('$isListItemNode()', async () => {
+    await editor.update(() => {
+      const listItemNode = new ListItemNode();
+
+      expect($isListItemNode(listItemNode)).toBe(true);
     });
   });
 });
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
index 0ab6935fb1a..736c3573c5b 100644
--- a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -48,7 +48,6 @@ describe('Keyboard-handling service tests', () => {
         expect(lastRootChild).toBeInstanceOf(DetailsNode);
 
         dispatchKeydownEventForNode(detailsPara, editor, 'ArrowDown');
-        editor.commitUpdates();
 
         editor.getEditorState().read(() => {
             lastRootChild = $getRoot().getLastChild();
@@ -79,10 +78,7 @@ describe('Keyboard-handling service tests', () => {
         expect(lastRootChild).toBeInstanceOf(DetailsNode);
 
         dispatchKeydownEventForNode(detailsPara, editor, 'Enter');
-        editor.commitUpdates();
-
         dispatchKeydownEventForSelectedNode(editor, 'Enter');
-        editor.commitUpdates();
 
         let detailsChildren!: LexicalNode[];
         let lastDetailsText!: string;
@@ -115,7 +111,6 @@ describe('Keyboard-handling service tests', () => {
         });
 
         dispatchKeydownEventForNode(listItemB, editor, 'Tab');
-        editor.commitUpdates();
 
         editor.getEditorState().read(() => {
             const list = $getRoot().getChildren()[0] as ListNode;

From f4005a139b0ac102674cad0185fa6c32265e68f5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Dec 2024 18:07:46 +0000
Subject: [PATCH 418/666] Lexical: Adjusted handling of child/sibling list
 items on nesting

Sibling/child items will now remain at the same visual level during
nesting/un-nested, so only the selected item level is visually altered.

Also added new model-based editor content matching system for tests.
---
 .../lexical/core/__tests__/utils/index.ts     |  43 +++++-
 .../js/wysiwyg/utils/__tests__/lists.test.ts  | 124 ++++++++++++++++++
 resources/js/wysiwyg/utils/lists.ts           |  22 ++++
 3 files changed, 183 insertions(+), 6 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/__tests__/lists.test.ts

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index d90853b7c34..b13bba6977e 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -30,18 +30,14 @@ import {
   TextNode,
 } from 'lexical';
 
-import {
-  CreateEditorArgs,
-  HTMLConfig,
-  LexicalNodeReplacement,
-} from '../../LexicalEditor';
+import {CreateEditorArgs, HTMLConfig, LexicalNodeReplacement,} from '../../LexicalEditor';
 import {resetRandomKey} from '../../LexicalUtils';
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {EditorUiContext} from "../../../../ui/framework/core";
 import {EditorUIManager} from "../../../../ui/framework/manager";
-import {registerRichText} from "@lexical/rich-text";
+import {turtle} from "@codemirror/legacy-modes/mode/turtle";
 
 
 type TestEnv = {
@@ -764,6 +760,41 @@ export function expectHtmlToBeEqual(expected: string, actual: string): void {
   expect(formatHtml(expected)).toBe(formatHtml(actual));
 }
 
+type nodeTextShape = {
+  text: string;
+};
+
+type nodeShape = {
+  type: string;
+  children?: (nodeShape|nodeTextShape)[];
+}
+
+export function getNodeShape(node: SerializedLexicalNode): nodeShape|nodeTextShape {
+  // @ts-ignore
+  const children: SerializedLexicalNode[] = (node.children || []);
+
+  const shape: nodeShape = {
+    type: node.type,
+  };
+
+  if (shape.type === 'text') {
+    // @ts-ignore
+    return  {text: node.text}
+  }
+
+  if (children.length > 0) {
+    shape.children = children.map(c => getNodeShape(c));
+  }
+
+  return shape;
+}
+
+export function expectNodeShapeToMatch(editor: LexicalEditor, expected: nodeShape[]) {
+  const json = editor.getEditorState().toJSON();
+  const shape = getNodeShape(json.root) as nodeShape;
+  expect(shape.children).toMatchObject(expected);
+}
+
 function formatHtml(s: string): string {
   return s.replace(/>\s+</g, '><').replace(/\s*\n\s*/g, ' ').trim();
 }
diff --git a/resources/js/wysiwyg/utils/__tests__/lists.test.ts b/resources/js/wysiwyg/utils/__tests__/lists.test.ts
new file mode 100644
index 00000000000..20dcad24098
--- /dev/null
+++ b/resources/js/wysiwyg/utils/__tests__/lists.test.ts
@@ -0,0 +1,124 @@
+import {
+    createTestContext, destroyFromContext,
+    dispatchKeydownEventForNode, expectNodeShapeToMatch,
+} from "lexical/__tests__/utils";
+import {
+    $createParagraphNode, $getRoot, LexicalEditor, LexicalNode,
+    ParagraphNode,
+} from "lexical";
+import {$createDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {EditorUiContext} from "../../ui/framework/core";
+import {$htmlToBlockNodes} from "../nodes";
+import {ListItemNode, ListNode} from "@lexical/list";
+import {$nestListItem, $unnestListItem} from "../lists";
+
+describe('List Utils', () => {
+
+    let context!: EditorUiContext;
+    let editor!: LexicalEditor;
+
+    beforeEach(() => {
+        context = createTestContext();
+        editor = context.editor;
+    });
+
+    afterEach(() => {
+        destroyFromContext(context);
+    });
+
+    describe('$nestListItem', () => {
+        test('nesting handles child items to leave at the same level', () => {
+            const input = `<ul>
+    <li>Inner A</li>
+    <li>Inner B <ul>
+            <li>Inner C</li>
+    </ul></li>
+</ul>`;
+            let list!: ListNode;
+
+            editor.updateAndCommit(() => {
+                $getRoot().append(...$htmlToBlockNodes(editor, input));
+                list = $getRoot().getFirstChild() as ListNode;
+            });
+
+            editor.updateAndCommit(() => {
+                $nestListItem(list.getChildren()[1] as ListItemNode);
+            });
+
+            expectNodeShapeToMatch(editor, [
+                {
+                    type: 'list',
+                    children: [
+                        {
+                            type: 'listitem',
+                            children: [
+                                {text: 'Inner A'},
+                                {
+                                    type: 'list',
+                                    children: [
+                                        {type: 'listitem', children: [{text: 'Inner B'}]},
+                                        {type: 'listitem', children: [{text: 'Inner C'}]},
+                                    ]
+                                }
+                            ]
+                        },
+                    ]
+                }
+            ]);
+        });
+    });
+
+    describe('$unnestListItem', () => {
+        test('middle in nested list converts to new parent item at same place', () => {
+            const input = `<ul>
+<li>Nested list:<ul>
+    <li>Inner A</li>
+    <li>Inner B</li>
+    <li>Inner C</li>
+</ul></li>
+</ul>`;
+            let innerList!: ListNode;
+
+            editor.updateAndCommit(() => {
+                $getRoot().append(...$htmlToBlockNodes(editor, input));
+                innerList = (($getRoot().getFirstChild() as ListNode).getFirstChild() as ListItemNode).getLastChild() as ListNode;
+            });
+
+            editor.updateAndCommit(() => {
+                $unnestListItem(innerList.getChildren()[1] as ListItemNode);
+            });
+
+            expectNodeShapeToMatch(editor, [
+                {
+                    type: 'list',
+                    children: [
+                        {
+                            type: 'listitem',
+                            children: [
+                                {text: 'Nested list:'},
+                                {
+                                    type: 'list',
+                                    children: [
+                                        {type: 'listitem', children: [{text: 'Inner A'}]},
+                                    ],
+                                }
+                            ],
+                        },
+                        {
+                            type: 'listitem',
+                            children: [
+                                {text: 'Inner B'},
+                                {
+                                    type: 'list',
+                                    children: [
+                                        {type: 'listitem', children: [{text: 'Inner C'}]},
+                                    ],
+                                }
+                            ],
+                        }
+                    ]
+                }
+            ]);
+        });
+    });
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index 2fc1c5f6b4e..005b05f9816 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -10,6 +10,9 @@ export function $nestListItem(node: ListItemNode): ListItemNode {
         return node;
     }
 
+    const nodeChildList = node.getChildren().filter(n => $isListNode(n))[0] || null;
+    const nodeChildItems = nodeChildList?.getChildren() || [];
+
     const listItems = list.getChildren() as ListItemNode[];
     const nodeIndex = listItems.findIndex((n) => n.getKey() === node.getKey());
     const isFirst = nodeIndex === 0;
@@ -27,6 +30,13 @@ export function $nestListItem(node: ListItemNode): ListItemNode {
         node.remove();
     }
 
+    if (nodeChildList) {
+        for (const child of nodeChildItems) {
+            newListItem.insertAfter(child);
+        }
+        nodeChildList.remove();
+    }
+
     return newListItem;
 }
 
@@ -38,6 +48,8 @@ export function $unnestListItem(node: ListItemNode): ListItemNode {
         return node;
     }
 
+    const laterSiblings = node.getNextSiblings();
+
     parentListItem.insertAfter(node);
     if (list.getChildren().length === 0) {
         list.remove();
@@ -47,6 +59,16 @@ export function $unnestListItem(node: ListItemNode): ListItemNode {
         parentListItem.remove();
     }
 
+    if (laterSiblings.length > 0) {
+        const childList = $createListNode(list.getListType());
+        childList.append(...laterSiblings);
+        node.append(childList);
+    }
+
+    if (list.getChildrenSize() === 0) {
+        list.remove();
+    }
+
     return node;
 }
 

From ebe2ca7faff580ccb8064920a24fb2fad6412105 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Dec 2024 22:40:28 +0000
Subject: [PATCH 419/666] Lexical: Added about button/view

Re-used existing route and moved tinymce help to its own different
route. Added test to cover.
Added new external-content block to support in editor UI.
---
 lang/en/editor.php                            |   2 +
 .../icons/editor/{help.svg => about.svg}      |   0
 resources/js/wysiwyg-tinymce/plugins-about.js |   2 +-
 .../wysiwyg/ui/defaults/buttons/controls.ts   |  15 +-
 .../js/wysiwyg/ui/defaults/forms/controls.ts  |  17 +-
 resources/js/wysiwyg/ui/defaults/modals.ts    |   6 +-
 .../js/wysiwyg/ui/{ => defaults}/toolbars.ts  |  39 +--
 .../ui/framework/blocks/external-content.ts   |  29 ++
 resources/js/wysiwyg/ui/index.ts              |   2 +-
 resources/sass/_editor.scss                   |   7 +
 resources/views/help/tinymce.blade.php        | 146 +++++++++
 resources/views/help/wysiwyg.blade.php        | 280 +++++++++---------
 routes/web.php                                |   1 +
 tests/Meta/HelpTest.php                       |  12 +-
 14 files changed, 388 insertions(+), 170 deletions(-)
 rename resources/icons/editor/{help.svg => about.svg} (100%)
 rename resources/js/wysiwyg/ui/{ => defaults}/toolbars.ts (88%)
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/external-content.ts
 create mode 100644 resources/views/help/tinymce.blade.php

diff --git a/lang/en/editor.php b/lang/en/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/resources/icons/editor/help.svg b/resources/icons/editor/about.svg
similarity index 100%
rename from resources/icons/editor/help.svg
rename to resources/icons/editor/about.svg
diff --git a/resources/js/wysiwyg-tinymce/plugins-about.js b/resources/js/wysiwyg-tinymce/plugins-about.js
index 096b4f96805..75cf476cf9f 100644
--- a/resources/js/wysiwyg-tinymce/plugins-about.js
+++ b/resources/js/wysiwyg-tinymce/plugins-about.js
@@ -4,7 +4,7 @@
 function register(editor) {
     const aboutDialog = {
         title: 'About the WYSIWYG Editor',
-        url: window.baseUrl('/help/wysiwyg'),
+        url: window.baseUrl('/help/tinymce'),
     };
 
     editor.ui.registry.addButton('about', {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
index 77223dac3f7..5e32005393e 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -11,8 +11,9 @@ import {
 } from "lexical";
 import redoIcon from "@icons/editor/redo.svg";
 import sourceIcon from "@icons/editor/source-view.svg";
-import {getEditorContentAsHtml} from "../../../utils/actions";
 import fullscreenIcon from "@icons/editor/fullscreen.svg";
+import aboutIcon from "@icons/editor/about.svg";
+import {getEditorContentAsHtml} from "../../../utils/actions";
 
 export const undo: EditorButtonDefinition = {
     label: 'Undo',
@@ -80,4 +81,16 @@ export const fullscreen: EditorButtonDefinition = {
     isActive(selection, context: EditorUiContext) {
         return context.containerDOM.classList.contains('fullscreen');
     }
+};
+
+export const about: EditorButtonDefinition = {
+    label: 'About the editor',
+    icon: aboutIcon,
+    async action(context: EditorUiContext, button: EditorButton) {
+        const modal = context.manager.createModal('about');
+        modal.show({});
+    },
+    isActive(selection, context: EditorUiContext) {
+        return false;
+    }
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/controls.ts b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
index fc461f6626f..8e7219d6749 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
@@ -1,6 +1,7 @@
 import {EditorFormDefinition} from "../../framework/forms";
-import {EditorUiContext} from "../../framework/core";
+import {EditorUiContext, EditorUiElement} from "../../framework/core";
 import {setEditorContentFromHtml} from "../../../utils/actions";
+import {ExternalContent} from "../../framework/blocks/external-content";
 
 export const source: EditorFormDefinition = {
     submitText: 'Save',
@@ -15,4 +16,18 @@ export const source: EditorFormDefinition = {
             type: 'textarea',
         },
     ],
+};
+
+export const about: EditorFormDefinition = {
+    submitText: 'Close',
+    async action() {
+        return true;
+    },
+    fields: [
+        {
+            build(): EditorUiElement {
+                return new ExternalContent('/help/wysiwyg');
+            }
+        }
+    ],
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/modals.ts b/resources/js/wysiwyg/ui/defaults/modals.ts
index da385926626..830a42935c7 100644
--- a/resources/js/wysiwyg/ui/defaults/modals.ts
+++ b/resources/js/wysiwyg/ui/defaults/modals.ts
@@ -1,6 +1,6 @@
 import {EditorFormModalDefinition} from "../framework/modals";
 import {details, image, link, media} from "./forms/objects";
-import {source} from "./forms/controls";
+import {about, source} from "./forms/controls";
 import {cellProperties, rowProperties, tableProperties} from "./forms/tables";
 
 export const modals: Record<string, EditorFormModalDefinition> = {
@@ -35,5 +35,9 @@ export const modals: Record<string, EditorFormModalDefinition> = {
     details: {
         title: 'Edit collapsible block',
         form: details,
+    },
+    about: {
+        title: 'About the WYSIWYG Editor',
+        form: about,
     }
 };
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
similarity index 88%
rename from resources/js/wysiwyg/ui/toolbars.ts
rename to resources/js/wysiwyg/ui/defaults/toolbars.ts
index 1230cbdd298..61baa3c3260 100644
--- a/resources/js/wysiwyg/ui/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -1,12 +1,12 @@
-import {EditorButton} from "./framework/buttons";
-import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";
-import {EditorFormatMenu} from "./framework/blocks/format-menu";
-import {FormatPreviewButton} from "./framework/blocks/format-preview-button";
-import {EditorDropdownButton} from "./framework/blocks/dropdown-button";
-import {EditorColorPicker} from "./framework/blocks/color-picker";
-import {EditorTableCreator} from "./framework/blocks/table-creator";
-import {EditorColorButton} from "./framework/blocks/color-button";
-import {EditorOverflowContainer} from "./framework/blocks/overflow-container";
+import {EditorButton} from "../framework/buttons";
+import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "../framework/core";
+import {EditorFormatMenu} from "../framework/blocks/format-menu";
+import {FormatPreviewButton} from "../framework/blocks/format-preview-button";
+import {EditorDropdownButton} from "../framework/blocks/dropdown-button";
+import {EditorColorPicker} from "../framework/blocks/color-picker";
+import {EditorTableCreator} from "../framework/blocks/table-creator";
+import {EditorColorButton} from "../framework/blocks/color-button";
+import {EditorOverflowContainer} from "../framework/blocks/overflow-container";
 import {
     cellProperties, clearTableFormatting,
     copyColumn,
@@ -29,8 +29,8 @@ import {
     rowProperties,
     splitCell,
     table, tableProperties
-} from "./defaults/buttons/tables";
-import {fullscreen, redo, source, undo} from "./defaults/buttons/controls";
+} from "./buttons/tables";
+import {about, fullscreen, redo, source, undo} from "./buttons/controls";
 import {
     blockquote, dangerCallout,
     h2,
@@ -41,7 +41,7 @@ import {
     paragraph,
     successCallout,
     warningCallout
-} from "./defaults/buttons/block-formats";
+} from "./buttons/block-formats";
 import {
     bold, clearFormating, code,
     highlightColor,
@@ -50,7 +50,7 @@ import {
     superscript,
     textColor,
     underline
-} from "./defaults/buttons/inline-formats";
+} from "./buttons/inline-formats";
 import {
     alignCenter,
     alignJustify,
@@ -58,14 +58,14 @@ import {
     alignRight,
     directionLTR,
     directionRTL
-} from "./defaults/buttons/alignments";
+} from "./buttons/alignments";
 import {
     bulletList,
     indentDecrease,
     indentIncrease,
     numberList,
     taskList
-} from "./defaults/buttons/lists";
+} from "./buttons/lists";
 import {
     codeBlock,
     details, detailsEditLabel, detailsToggle, detailsUnwrap,
@@ -75,10 +75,10 @@ import {
     image,
     link, media,
     unlink
-} from "./defaults/buttons/objects";
-import {el} from "../utils/dom";
-import {EditorButtonWithMenu} from "./framework/blocks/button-with-menu";
-import {EditorSeparator} from "./framework/blocks/separator";
+} from "./buttons/objects";
+import {el} from "../../utils/dom";
+import {EditorButtonWithMenu} from "../framework/blocks/button-with-menu";
+import {EditorSeparator} from "../framework/blocks/separator";
 
 export function getMainEditorFullToolbar(context: EditorUiContext): EditorContainerUiElement {
 
@@ -201,6 +201,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         // Meta elements
         new EditorOverflowContainer(3, [
             new EditorButton(source),
+            new EditorButton(about),
             new EditorButton(fullscreen),
 
             // Test
diff --git a/resources/js/wysiwyg/ui/framework/blocks/external-content.ts b/resources/js/wysiwyg/ui/framework/blocks/external-content.ts
new file mode 100644
index 00000000000..b53c43e5511
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/external-content.ts
@@ -0,0 +1,29 @@
+import {EditorUiElement} from "../core";
+import {el} from "../../../utils/dom";
+
+export class ExternalContent extends EditorUiElement {
+
+    /**
+     * The URL for HTML to be loaded from.
+     */
+    protected url: string = '';
+
+    constructor(url: string) {
+        super();
+        this.url = url;
+    }
+
+    buildDOM(): HTMLElement {
+        const wrapper = el('div', {
+            class: 'editor-external-content',
+        });
+
+        window.$http.get(this.url).then(resp => {
+            if (typeof resp.data === 'string') {
+                wrapper.innerHTML = resp.data;
+            }
+        });
+
+        return wrapper;
+    }
+}
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index 40df433479f..fda37085ef3 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -4,7 +4,7 @@ import {
     getImageToolbarContent,
     getLinkToolbarContent,
     getMainEditorFullToolbar, getTableToolbarContent
-} from "./toolbars";
+} from "./defaults/toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 3eef4c2c6b9..2446c141670 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -350,6 +350,13 @@ body.editor-is-fullscreen {
   text-align: center;
   padding: 0.2em;
 }
+.editor-external-content {
+  min-width: 500px;
+  min-height: 500px;
+  h4:first-child {
+    margin-top: 0;
+  }
+}
 
 // In-editor elements
 .editor-image-wrap {
diff --git a/resources/views/help/tinymce.blade.php b/resources/views/help/tinymce.blade.php
new file mode 100644
index 00000000000..8ff59c8d664
--- /dev/null
+++ b/resources/views/help/tinymce.blade.php
@@ -0,0 +1,146 @@
+@extends('layouts.plain')
+@section('document-class', 'bg-white ' .  (setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : ''))
+
+@section('content')
+    <div class="p-m">
+
+        <h4 class="mt-s">{{ trans('editor.editor_license') }}</h4>
+        <p>
+            {!! trans('editor.editor_tiny_license', ['tinyLink' => '<a href="https://www.tiny.cloud/" target="_blank" rel="noopener noreferrer">TinyMCE</a>']) !!}
+            <br>
+            <a href="{{ url('/libs/tinymce/license.txt') }}" target="_blank">{{ trans('editor.editor_tiny_license_link') }}</a>
+        </p>
+
+        <h4>{{ trans('editor.shortcuts') }}</h4>
+
+        <p>{{ trans('editor.shortcuts_intro') }}</p>
+        <table>
+            <thead>
+            <tr>
+                <th>{{ trans('editor.shortcut') }} {{ trans('editor.windows_linux') }}</th>
+                <th>{{ trans('editor.shortcut') }} {{ trans('editor.mac') }}</th>
+                <th>{{ trans('editor.description') }}</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td><code>Ctrl</code>+<code>S</code></td>
+                <td><code>Cmd</code>+<code>S</code></td>
+                <td>{{ trans('entities.pages_edit_save_draft') }}</td>
+            </tr>
+            <tr>
+                <td><code>Ctrl</code>+<code>Enter</code></td>
+                <td><code>Cmd</code>+<code>Enter</code></td>
+                <td>{{ trans('editor.save_continue') }}</td>
+            </tr>
+            <tr>
+                <td><code>Ctrl</code>+<code>B</code></td>
+                <td><code>Cmd</code>+<code>B</code></td>
+                <td>{{ trans('editor.bold') }}</td>
+            </tr>
+            <tr>
+                <td><code>Ctrl</code>+<code>I</code></td>
+                <td><code>Cmd</code>+<code>I</code></td>
+                <td>{{ trans('editor.italic') }}</td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>1</code><br>
+                    <code>Ctrl</code>+<code>2</code><br>
+                    <code>Ctrl</code>+<code>3</code><br>
+                    <code>Ctrl</code>+<code>4</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>1</code><br>
+                    <code>Cmd</code>+<code>2</code><br>
+                    <code>Cmd</code>+<code>3</code><br>
+                    <code>Cmd</code>+<code>4</code>
+                </td>
+                <td>
+                    {{ trans('editor.header_large') }} <br>
+                    {{ trans('editor.header_medium') }} <br>
+                    {{ trans('editor.header_small') }} <br>
+                    {{ trans('editor.header_tiny') }}
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>5</code><br>
+                    <code>Ctrl</code>+<code>D</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>5</code><br>
+                    <code>Cmd</code>+<code>D</code>
+                </td>
+                <td>{{ trans('editor.paragraph') }}</td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>6</code><br>
+                    <code>Ctrl</code>+<code>Q</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>6</code><br>
+                    <code>Cmd</code>+<code>Q</code>
+                </td>
+                <td>{{ trans('editor.blockquote') }}</td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>7</code><br>
+                    <code>Ctrl</code>+<code>E</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>7</code><br>
+                    <code>Cmd</code>+<code>E</code>
+                </td>
+                <td>{{ trans('editor.insert_code_block') }}</td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>8</code><br>
+                    <code>Ctrl</code>+<code>Shift</code>+<code>E</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>8</code><br>
+                    <code>Cmd</code>+<code>Shift</code>+<code>E</code>
+                </td>
+                <td>{{ trans('editor.inline_code') }}</td>
+            </tr>
+            <tr>
+                <td><code>Ctrl</code>+<code>9</code></td>
+                <td><code>Cmd</code>+<code>9</code></td>
+                <td>
+                    {{ trans('editor.callouts') }} <br>
+                    <small>{{ trans('editor.callouts_cycle') }}</small>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>O</code> <br>
+                    <code>Ctrl</code>+<code>P</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>O</code> <br>
+                    <code>Cmd</code>+<code>P</code>
+                </td>
+                <td>
+                    {{ trans('editor.list_numbered') }} <br>
+                    {{ trans('editor.list_bullet') }}
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>Shift</code>+<code>K</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>Shift</code>+<code>K</code>
+                </td>
+                <td>{{ trans('editor.link_selector') }}</td>
+            </tr>
+            </tbody>
+        </table>
+
+    </div>
+@endsection
+
diff --git a/resources/views/help/wysiwyg.blade.php b/resources/views/help/wysiwyg.blade.php
index 8ff59c8d664..4fc00b0e1e6 100644
--- a/resources/views/help/wysiwyg.blade.php
+++ b/resources/views/help/wysiwyg.blade.php
@@ -1,146 +1,138 @@
-@extends('layouts.plain')
-@section('document-class', 'bg-white ' .  (setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : ''))
+<h4>{{ trans('editor.shortcuts') }}</h4>
 
-@section('content')
-    <div class="p-m">
-
-        <h4 class="mt-s">{{ trans('editor.editor_license') }}</h4>
-        <p>
-            {!! trans('editor.editor_tiny_license', ['tinyLink' => '<a href="https://www.tiny.cloud/" target="_blank" rel="noopener noreferrer">TinyMCE</a>']) !!}
-            <br>
-            <a href="{{ url('/libs/tinymce/license.txt') }}" target="_blank">{{ trans('editor.editor_tiny_license_link') }}</a>
-        </p>
-
-        <h4>{{ trans('editor.shortcuts') }}</h4>
-
-        <p>{{ trans('editor.shortcuts_intro') }}</p>
-        <table>
-            <thead>
-            <tr>
-                <th>{{ trans('editor.shortcut') }} {{ trans('editor.windows_linux') }}</th>
-                <th>{{ trans('editor.shortcut') }} {{ trans('editor.mac') }}</th>
-                <th>{{ trans('editor.description') }}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td><code>Ctrl</code>+<code>S</code></td>
-                <td><code>Cmd</code>+<code>S</code></td>
-                <td>{{ trans('entities.pages_edit_save_draft') }}</td>
-            </tr>
-            <tr>
-                <td><code>Ctrl</code>+<code>Enter</code></td>
-                <td><code>Cmd</code>+<code>Enter</code></td>
-                <td>{{ trans('editor.save_continue') }}</td>
-            </tr>
-            <tr>
-                <td><code>Ctrl</code>+<code>B</code></td>
-                <td><code>Cmd</code>+<code>B</code></td>
-                <td>{{ trans('editor.bold') }}</td>
-            </tr>
-            <tr>
-                <td><code>Ctrl</code>+<code>I</code></td>
-                <td><code>Cmd</code>+<code>I</code></td>
-                <td>{{ trans('editor.italic') }}</td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>1</code><br>
-                    <code>Ctrl</code>+<code>2</code><br>
-                    <code>Ctrl</code>+<code>3</code><br>
-                    <code>Ctrl</code>+<code>4</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>1</code><br>
-                    <code>Cmd</code>+<code>2</code><br>
-                    <code>Cmd</code>+<code>3</code><br>
-                    <code>Cmd</code>+<code>4</code>
-                </td>
-                <td>
-                    {{ trans('editor.header_large') }} <br>
-                    {{ trans('editor.header_medium') }} <br>
-                    {{ trans('editor.header_small') }} <br>
-                    {{ trans('editor.header_tiny') }}
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>5</code><br>
-                    <code>Ctrl</code>+<code>D</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>5</code><br>
-                    <code>Cmd</code>+<code>D</code>
-                </td>
-                <td>{{ trans('editor.paragraph') }}</td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>6</code><br>
-                    <code>Ctrl</code>+<code>Q</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>6</code><br>
-                    <code>Cmd</code>+<code>Q</code>
-                </td>
-                <td>{{ trans('editor.blockquote') }}</td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>7</code><br>
-                    <code>Ctrl</code>+<code>E</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>7</code><br>
-                    <code>Cmd</code>+<code>E</code>
-                </td>
-                <td>{{ trans('editor.insert_code_block') }}</td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>8</code><br>
-                    <code>Ctrl</code>+<code>Shift</code>+<code>E</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>8</code><br>
-                    <code>Cmd</code>+<code>Shift</code>+<code>E</code>
-                </td>
-                <td>{{ trans('editor.inline_code') }}</td>
-            </tr>
-            <tr>
-                <td><code>Ctrl</code>+<code>9</code></td>
-                <td><code>Cmd</code>+<code>9</code></td>
-                <td>
-                    {{ trans('editor.callouts') }} <br>
-                    <small>{{ trans('editor.callouts_cycle') }}</small>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>O</code> <br>
-                    <code>Ctrl</code>+<code>P</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>O</code> <br>
-                    <code>Cmd</code>+<code>P</code>
-                </td>
-                <td>
-                    {{ trans('editor.list_numbered') }} <br>
-                    {{ trans('editor.list_bullet') }}
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <code>Ctrl</code>+<code>Shift</code>+<code>K</code>
-                </td>
-                <td>
-                    <code>Cmd</code>+<code>Shift</code>+<code>K</code>
-                </td>
-                <td>{{ trans('editor.link_selector') }}</td>
-            </tr>
-            </tbody>
-        </table>
-
-    </div>
-@endsection
+<p>{{ trans('editor.shortcuts_intro') }}</p>
+<table>
+    <thead>
+    <tr>
+        <th>{{ trans('editor.shortcut') }} {{ trans('editor.windows_linux') }}</th>
+        <th>{{ trans('editor.shortcut') }} {{ trans('editor.mac') }}</th>
+        <th>{{ trans('editor.description') }}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><code>Ctrl</code>+<code>S</code></td>
+        <td><code>Cmd</code>+<code>S</code></td>
+        <td>{{ trans('entities.pages_edit_save_draft') }}</td>
+    </tr>
+    <tr>
+        <td><code>Ctrl</code>+<code>Enter</code></td>
+        <td><code>Cmd</code>+<code>Enter</code></td>
+        <td>{{ trans('editor.save_continue') }}</td>
+    </tr>
+    <tr>
+        <td><code>Ctrl</code>+<code>B</code></td>
+        <td><code>Cmd</code>+<code>B</code></td>
+        <td>{{ trans('editor.bold') }}</td>
+    </tr>
+    <tr>
+        <td><code>Ctrl</code>+<code>I</code></td>
+        <td><code>Cmd</code>+<code>I</code></td>
+        <td>{{ trans('editor.italic') }}</td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>1</code><br>
+            <code>Ctrl</code>+<code>2</code><br>
+            <code>Ctrl</code>+<code>3</code><br>
+            <code>Ctrl</code>+<code>4</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>1</code><br>
+            <code>Cmd</code>+<code>2</code><br>
+            <code>Cmd</code>+<code>3</code><br>
+            <code>Cmd</code>+<code>4</code>
+        </td>
+        <td>
+            {{ trans('editor.header_large') }} <br>
+            {{ trans('editor.header_medium') }} <br>
+            {{ trans('editor.header_small') }} <br>
+            {{ trans('editor.header_tiny') }}
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>5</code><br>
+            <code>Ctrl</code>+<code>D</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>5</code><br>
+            <code>Cmd</code>+<code>D</code>
+        </td>
+        <td>{{ trans('editor.paragraph') }}</td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>6</code><br>
+            <code>Ctrl</code>+<code>Q</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>6</code><br>
+            <code>Cmd</code>+<code>Q</code>
+        </td>
+        <td>{{ trans('editor.blockquote') }}</td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>7</code><br>
+            <code>Ctrl</code>+<code>E</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>7</code><br>
+            <code>Cmd</code>+<code>E</code>
+        </td>
+        <td>{{ trans('editor.insert_code_block') }}</td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>8</code><br>
+            <code>Ctrl</code>+<code>Shift</code>+<code>E</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>8</code><br>
+            <code>Cmd</code>+<code>Shift</code>+<code>E</code>
+        </td>
+        <td>{{ trans('editor.inline_code') }}</td>
+    </tr>
+    <tr>
+        <td><code>Ctrl</code>+<code>9</code></td>
+        <td><code>Cmd</code>+<code>9</code></td>
+        <td>
+            {{ trans('editor.callouts') }} <br>
+            <small>{{ trans('editor.callouts_cycle') }}</small>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>O</code> <br>
+            <code>Ctrl</code>+<code>P</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>O</code> <br>
+            <code>Cmd</code>+<code>P</code>
+        </td>
+        <td>
+            {{ trans('editor.list_numbered') }} <br>
+            {{ trans('editor.list_bullet') }}
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <code>Ctrl</code>+<code>Shift</code>+<code>K</code>
+        </td>
+        <td>
+            <code>Cmd</code>+<code>Shift</code>+<code>K</code>
+        </td>
+        <td>{{ trans('editor.link_selector') }}</td>
+    </tr>
+    </tbody>
+</table>
 
+<h4 class="mt-s">{{ trans('editor.editor_license') }}</h4>
+<p>
+    {!! trans('editor.editor_lexical_license', ['lexicalLink' => '<a href="https://lexical.dev/" target="_blank" rel="noopener noreferrer">Lexical</a>']) !!}
+    <br>
+    <em class="text-muted">Copyright (c) Meta Platforms, Inc. and affiliates.</em>
+    <br>
+    <a href="{{ url('/licenses') }}" target="_blank">{{ trans('editor.editor_lexical_license_link') }}</a>
+</p>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 85f83352859..318147ef518 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -361,6 +361,7 @@
 Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset'])->middleware('throttle:public');
 
 // Metadata routes
+Route::view('/help/tinymce', 'help.tinymce');
 Route::view('/help/wysiwyg', 'help.wysiwyg');
 
 Route::fallback([MetaController::class, 'notFound'])->name('fallback');
diff --git a/tests/Meta/HelpTest.php b/tests/Meta/HelpTest.php
index e1de96bc8df..acce65394a3 100644
--- a/tests/Meta/HelpTest.php
+++ b/tests/Meta/HelpTest.php
@@ -6,9 +6,9 @@
 
 class HelpTest extends TestCase
 {
-    public function test_wysiwyg_help_shows_tiny_and_tiny_license_link()
+    public function test_tinymce_help_shows_tiny_and_tiny_license_link()
     {
-        $resp = $this->get('/help/wysiwyg');
+        $resp = $this->get('/help/tinymce');
         $resp->assertOk();
         $this->withHtml($resp)->assertElementExists('a[href="https://www.tiny.cloud/"]');
         $this->withHtml($resp)->assertElementExists('a[href="' . url('/libs/tinymce/license.txt') . '"]');
@@ -22,4 +22,12 @@ public function test_tiny_license_exists_where_expected()
         $contents = file_get_contents($expectedPath);
         $this->assertStringContainsString('MIT License', $contents);
     }
+
+    public function test_wysiwyg_help_shows_lexical_and_licenses_link()
+    {
+        $resp = $this->get('/help/wysiwyg');
+        $resp->assertOk();
+        $this->withHtml($resp)->assertElementExists('a[href="https://lexical.dev/"]');
+        $this->withHtml($resp)->assertElementExists('a[href="' . url('/licenses') . '"]');
+    }
 }

From 01825ddb9392212aef0b1bfba55e5191a7888119 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 21 Dec 2024 15:48:46 +0000
Subject: [PATCH 420/666] Dependancies: Bumped up composer dep versions

---
 composer.lock | 337 ++++++++++++++++++++++++--------------------------
 1 file changed, 165 insertions(+), 172 deletions(-)

diff --git a/composer.lock b/composer.lock
index f744f76208c..2a71d3e7cb0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4a5a18010b7f4b32b7f0ae2a3e6305bb",
+    "content-hash": "9c0520d8b0c13ae46bd0213c4dec5e38",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.331.0",
+            "version": "3.336.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0f8b3f63ba7b296afedcb3e6a43ce140831b9400"
+                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0f8b3f63ba7b296afedcb3e6a43ce140831b9400",
-                "reference": "0f8b3f63ba7b296afedcb3e6a43ce140831b9400",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/954bfdfc048840ca34afe2a2e1cbcff6681989c4",
+                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.331.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.2"
             },
-            "time": "2024-11-27T19:12:58+00:00"
+            "time": "2024-12-20T19:05:10+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -674,29 +674,27 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
+                "doctrine/coding-standard": "^9 || ^12",
+                "phpstan/phpstan": "1.4.10 || 2.0.3",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
+                "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -704,7 +702,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Doctrine\\Deprecations\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -715,9 +713,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
             },
-            "time": "2024-01-30T19:34:25+00:00"
+            "time": "2024-12-07T21:18:45+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -980,16 +978,16 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "fbc7c5ee5d94f7a910b78b43feb7931b7f971b59"
+                "reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/fbc7c5ee5d94f7a910b78b43feb7931b7f971b59",
-                "reference": "fbc7c5ee5d94f7a910b78b43feb7931b7f971b59",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
+                "reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
                 "shasum": ""
             },
             "require": {
@@ -1038,22 +1036,22 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v3.0.0"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.0.1"
             },
-            "time": "2024-04-29T14:01:28+00:00"
+            "time": "2024-12-05T14:59:38+00:00"
         },
         {
             "name": "dompdf/php-font-lib",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "991d6a954f6bbd7e41022198f00586b230731441"
+                "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/991d6a954f6bbd7e41022198f00586b230731441",
-                "reference": "991d6a954f6bbd7e41022198f00586b230731441",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d",
+                "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d",
                 "shasum": ""
             },
             "require": {
@@ -1083,9 +1081,9 @@
             "homepage": "https://github.com/dompdf/php-font-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.0"
+                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.1"
             },
-            "time": "2024-04-29T13:40:38+00:00"
+            "time": "2024-12-02T14:37:59+00:00"
         },
         {
             "name": "dompdf/php-svg-lib",
@@ -1942,16 +1940,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.9.1",
+            "version": "3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683"
+                "reference": "1ddc9a096b3a641958515700e09be910bf03a5bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/b496d1f6b9f812f96166623358dfcafb8c3b1683",
-                "reference": "b496d1f6b9f812f96166623358dfcafb8c3b1683",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/1ddc9a096b3a641958515700e09be910bf03a5bd",
+                "reference": "1ddc9a096b3a641958515700e09be910bf03a5bd",
                 "shasum": ""
             },
             "require": {
@@ -1961,8 +1959,8 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.6",
-                "phpstan/phpstan": "^1",
-                "phpunit/phpunit": "^10.0",
+                "phpstan/phpstan": "^2",
+                "phpunit/phpunit": "^10.0 || ^11.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
             },
@@ -1998,7 +1996,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.9.1"
+                "source": "https://github.com/Intervention/image/tree/3.10.0"
             },
             "funding": [
                 {
@@ -2014,7 +2012,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2024-10-27T10:15:54+00:00"
+            "time": "2024-12-21T07:41:40+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -2411,16 +2409,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.16.0",
+            "version": "v5.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf"
+                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
-                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
+                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
                 "shasum": ""
             },
             "require": {
@@ -2430,7 +2428,7 @@
                 "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "league/oauth1-client": "^1.10.1",
+                "league/oauth1-client": "^1.11",
                 "php": "^7.2|^8.0",
                 "phpseclib/phpseclib": "^3.0"
             },
@@ -2442,16 +2440,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Laravel\\Socialite\\SocialiteServiceProvider"
-                    ],
                     "aliases": {
                         "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
-                    }
+                    },
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -2479,7 +2477,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-09-03T09:46:57+00:00"
+            "time": "2024-12-11T16:43:51+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2549,16 +2547,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.3",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932",
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932",
                 "shasum": ""
             },
             "require": {
@@ -2583,8 +2581,9 @@
                 "phpstan/phpstan": "^1.8.2",
                 "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -2594,7 +2593,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.6-dev"
+                    "dev-main": "2.7-dev"
                 }
             },
             "autoload": {
@@ -2651,7 +2650,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-16T11:46:16+00:00"
+            "time": "2024-12-07T15:34:16+00:00"
         },
         {
             "name": "league/config",
@@ -3069,16 +3068,16 @@
         },
         {
             "name": "league/oauth1-client",
-            "version": "v1.10.1",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth1-client.git",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
                 "shasum": ""
             },
             "require": {
@@ -3139,41 +3138,36 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth1-client/issues",
-                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.11.0"
             },
-            "time": "2022-04-15T14:02:14+00:00"
+            "time": "2024-12-10T19:59:05+00:00"
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8"
+                "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/160d6274b03562ebeb55ed18399281d8118b76c8",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/3d5cf8d0543731dfb725ab30e4d7289891991e13",
+                "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0",
-                "paragonie/random_compat": "^1 || ^2 || ^9.99",
-                "php": "^5.6 || ^7.0 || ^8.0"
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+                "php": "^7.1 || >=8.0.0 <8.5.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.5",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
-                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "^3.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "League\\OAuth2\\Client\\": "src/"
@@ -3209,9 +3203,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.7.0"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.0"
             },
-            "time": "2023-04-16T18:19:15+00:00"
+            "time": "2024-12-11T05:05:52+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -3282,16 +3276,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
                 "shasum": ""
             },
             "require": {
@@ -3369,7 +3363,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.1"
             },
             "funding": [
                 {
@@ -3381,7 +3375,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-12T13:57:08+00:00"
+            "time": "2024-12-05T17:15:07+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -3493,10 +3487,6 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -3506,6 +3496,10 @@
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -4105,16 +4099,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.42",
+            "version": "3.0.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
+                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
-                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
+                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
                 "shasum": ""
             },
             "require": {
@@ -4195,7 +4189,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
             },
             "funding": [
                 {
@@ -4211,7 +4205,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T03:06:04+00:00"
+            "time": "2024-12-14T21:12:59+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -4789,16 +4783,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.4",
+            "version": "v0.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
                 "shasum": ""
             },
             "require": {
@@ -4825,12 +4819,12 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "0.12.x-dev"
-                },
                 "bamarni-bin": {
                     "bin-links": false,
                     "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "0.12.x-dev"
                 }
             },
             "autoload": {
@@ -4862,9 +4856,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
             },
-            "time": "2024-06-10T01:18:23+00:00"
+            "time": "2024-12-10T01:58:33+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -5516,17 +5510,15 @@
         },
         {
             "name": "ssddanbrown/htmldiff",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ssddanbrown/HtmlDiff.git",
-                "reference": "92da405f8138066834b71ac7bedebbda6327761b"
+                "url": "https://codeberg.org/danb/HtmlDiff",
+                "reference": "d5cbd43f66c4e512cc0ab71d0e0b07271e7d6af6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/92da405f8138066834b71ac7bedebbda6327761b",
-                "reference": "92da405f8138066834b71ac7bedebbda6327761b",
-                "shasum": ""
+                "url": "https://codeberg.org/api/v1/repos/danb/HtmlDiff/archive/%prettyVersion%.zip"
             },
             "require": {
                 "ext-mbstring": "*",
@@ -5549,23 +5541,23 @@
             "authors": [
                 {
                     "name": "Dan Brown",
-                    "email": "ssddanbrown@googlemail.com",
+                    "homepage": "https://danb.me",
                     "role": "Developer"
                 }
             ],
             "description": "HTML Content Diff Generator",
-            "homepage": "https://github.com/ssddanbrown/htmldiff",
-            "support": {
-                "issues": "https://github.com/ssddanbrown/HtmlDiff/issues",
-                "source": "https://github.com/ssddanbrown/HtmlDiff/tree/v1.0.3"
-            },
+            "homepage": "https://codeberg.org/danb/HtmlDiff",
             "funding": [
                 {
-                    "url": "https://github.com/ssddanbrown",
+                    "url": "https://github.com/sponsors/ssddanbrown",
                     "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/ssddanbrown",
+                    "type": "kofi"
                 }
             ],
-            "time": "2024-03-29T16:51:55+00:00"
+            "time": "2024-12-12T16:45:37+00:00"
         },
         {
             "name": "ssddanbrown/symfony-mailer",
@@ -6464,8 +6456,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6540,8 +6532,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6619,8 +6611,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6701,8 +6693,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6785,8 +6777,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6859,8 +6851,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -6939,8 +6931,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -7021,8 +7013,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8177,16 +8169,16 @@
         },
         {
             "name": "itsgoingd/clockwork",
-            "version": "v5.3.1",
+            "version": "v5.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/itsgoingd/clockwork.git",
-                "reference": "7b0c40418df761f7a78e88762a323386a139d83d"
+                "reference": "ffd1f1626830005e92461a538ad58372641e065a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/7b0c40418df761f7a78e88762a323386a139d83d",
-                "reference": "7b0c40418df761f7a78e88762a323386a139d83d",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/ffd1f1626830005e92461a538ad58372641e065a",
+                "reference": "ffd1f1626830005e92461a538ad58372641e065a",
                 "shasum": ""
             },
             "require": {
@@ -8204,12 +8196,12 @@
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Clockwork\\Support\\Laravel\\ClockworkServiceProvider"
-                    ],
                     "aliases": {
                         "Clockwork": "Clockwork\\Support\\Laravel\\Facade"
-                    }
+                    },
+                    "providers": [
+                        "Clockwork\\Support\\Laravel\\ClockworkServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -8241,7 +8233,7 @@
             ],
             "support": {
                 "issues": "https://github.com/itsgoingd/clockwork/issues",
-                "source": "https://github.com/itsgoingd/clockwork/tree/v5.3.1"
+                "source": "https://github.com/itsgoingd/clockwork/tree/v5.3.2"
             },
             "funding": [
                 {
@@ -8249,7 +8241,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-19T17:25:22+00:00"
+            "time": "2024-12-02T22:59:59+00:00"
         },
         {
             "name": "larastan/larastan",
@@ -8703,16 +8695,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.10.1",
+            "version": "5.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17"
+                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/b14fd66496a22d8dd7f7e2791edd9e8674422f17",
-                "reference": "b14fd66496a22d8dd7f7e2791edd9e8674422f17",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/72afbce7e4b421593b60d2eb7281e37a50734df8",
+                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8",
                 "shasum": ""
             },
             "require": {
@@ -8786,20 +8778,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-11-10T04:10:31+00:00"
+            "time": "2024-12-05T15:04:09+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.11",
+            "version": "1.12.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733"
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
-                "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f",
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f",
                 "shasum": ""
             },
             "require": {
@@ -8844,7 +8836,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-17T14:08:01+00:00"
+            "time": "2024-12-17T17:00:20+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9169,16 +9161,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.38",
+            "version": "10.5.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132"
+                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
-                "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6ddda95af52f69c1e0c7b4f977cccb58048798c",
+                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c",
                 "shasum": ""
             },
             "require": {
@@ -9188,7 +9180,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.0",
+                "myclabs/deep-copy": "^1.12.1",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
@@ -9250,7 +9242,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.40"
             },
             "funding": [
                 {
@@ -9266,7 +9258,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-28T13:06:21+00:00"
+            "time": "2024-12-21T05:49:06+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10186,16 +10178,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.1",
+            "version": "3.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87"
+                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
-                "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
+                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
                 "shasum": ""
             },
             "require": {
@@ -10262,7 +10254,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-11-16T12:02:36+00:00"
+            "time": "2024-12-11T16:04:26+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10453,7 +10445,8 @@
         "ext-gd": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "ext-xml": "*"
+        "ext-xml": "*",
+        "ext-zip": "*"
     },
     "platform-dev": {},
     "platform-overrides": {

From c84d99945649941c82b654ec4247f56cfa98a81e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 22 Dec 2024 12:43:26 +0000
Subject: [PATCH 421/666] ZIP Exports: Prevent book child page drafts from
 being included

Added test to cover
---
 .../ZipExports/Models/ZipExportBook.php       |  2 +-
 tests/Exports/ZipExportTest.php               | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 4f641d25bd7..39176ded420 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -70,7 +70,7 @@ public static function fromModel(Book $model, ZipExportFiles $files): self
         foreach ($children as $child) {
             if ($child instanceof Chapter) {
                 $chapters[] = $child;
-            } else if ($child instanceof Page) {
+            } else if ($child instanceof Page && !$child->draft) {
                 $pages[] = $child;
             }
         }
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index ebe07d052bc..163828c1b6e 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -198,7 +198,7 @@ public function test_page_export_link_attachments()
 
     public function test_book_export()
     {
-        $book = $this->entities->book();
+        $book = $this->entities->bookHasChaptersAndPages();
         $book->tags()->saveMany(Tag::factory()->count(2)->make());
 
         $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
@@ -251,6 +251,35 @@ public function test_chapter_export()
         $this->assertCount($chapter->pages()->count(), $chapterData['pages']);
     }
 
+    public function test_draft_pages_are_not_included()
+    {
+        $editor = $this->users->editor();
+        $entities = $this->entities->createChainBelongingToUser($editor);
+        $book = $entities['book'];
+        $page = $entities['page'];
+        $chapter = $entities['chapter'];
+        $book->tags()->saveMany(Tag::factory()->count(2)->make());
+
+        $page->created_by = $editor->id;
+        $page->draft = true;
+        $page->save();
+
+        $zipResp = $this->actingAs($editor)->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $this->assertCount(0, $zip->data['book']['chapters'][0]['pages'] ?? ['cat']);
+
+        $zipResp = $this->actingAs($editor)->get($chapter->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $this->assertCount(0, $zip->data['chapter']['pages'] ?? ['cat']);
+
+        $page->chapter_id = 0;
+        $page->save();
+
+        $zipResp = $this->actingAs($editor)->get($book->getUrl("/export/zip"));
+        $zip = $this->extractZipResponse($zipResp);
+        $this->assertCount(0, $zip->data['book']['pages'] ?? ['cat']);
+    }
+
 
     public function test_cross_reference_links_are_converted()
     {

From 2be504e0d20aa7c95b1fe006f675928faf0bd1a9 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 23 Dec 2024 11:23:44 +0000
Subject: [PATCH 422/666] Updated translations with latest Crowdin changes
 (#5345)

---
 lang/ar/activities.php          |   8 +
 lang/ar/editor.php              |   2 +
 lang/ar/entities.php            |  21 ++
 lang/ar/errors.php              |  12 +
 lang/ar/settings.php            |   1 +
 lang/ar/validation.php          |   5 +
 lang/bg/activities.php          |   8 +
 lang/bg/editor.php              |   2 +
 lang/bg/entities.php            |  21 ++
 lang/bg/errors.php              |  12 +
 lang/bg/settings.php            |   1 +
 lang/bg/validation.php          |   5 +
 lang/bn/activities.php          | 132 +++++++++
 lang/bn/auth.php                | 117 ++++++++
 lang/bn/common.php              | 113 ++++++++
 lang/bn/components.php          |  46 ++++
 lang/bn/editor.php              | 179 +++++++++++++
 lang/bn/entities.php            | 460 ++++++++++++++++++++++++++++++++
 lang/bn/errors.php              | 133 +++++++++
 lang/bn/notifications.php       |  27 ++
 lang/bn/pagination.php          |  12 +
 lang/bn/passwords.php           |  15 ++
 lang/bn/preferences.php         |  51 ++++
 lang/bn/settings.php            | 339 +++++++++++++++++++++++
 lang/bn/validation.php          | 122 +++++++++
 lang/bs/activities.php          |   8 +
 lang/bs/editor.php              |   2 +
 lang/bs/entities.php            |  21 ++
 lang/bs/errors.php              |  12 +
 lang/bs/settings.php            |   1 +
 lang/bs/validation.php          |   5 +
 lang/ca/activities.php          |   8 +
 lang/ca/editor.php              |   2 +
 lang/ca/entities.php            |  21 ++
 lang/ca/errors.php              |  12 +
 lang/ca/settings.php            |   1 +
 lang/ca/validation.php          |   5 +
 lang/cs/activities.php          |   8 +
 lang/cs/editor.php              |   2 +
 lang/cs/entities.php            |  21 ++
 lang/cs/errors.php              |  12 +
 lang/cs/settings.php            |   1 +
 lang/cs/validation.php          |   5 +
 lang/cy/activities.php          |   8 +
 lang/cy/editor.php              |   2 +
 lang/cy/entities.php            |  21 ++
 lang/cy/errors.php              |  12 +
 lang/cy/settings.php            |   1 +
 lang/cy/validation.php          |   5 +
 lang/da/activities.php          |   8 +
 lang/da/editor.php              |   2 +
 lang/da/entities.php            |  21 ++
 lang/da/errors.php              |  12 +
 lang/da/settings.php            |   1 +
 lang/da/validation.php          |   5 +
 lang/de/activities.php          |   8 +
 lang/de/editor.php              |   2 +
 lang/de/entities.php            |  21 ++
 lang/de/errors.php              |  12 +
 lang/de/settings.php            |   1 +
 lang/de/validation.php          |   5 +
 lang/de_informal/activities.php |   8 +
 lang/de_informal/common.php     |   2 +-
 lang/de_informal/editor.php     |   2 +
 lang/de_informal/entities.php   |  25 +-
 lang/de_informal/errors.php     |  14 +-
 lang/de_informal/settings.php   |   1 +
 lang/de_informal/validation.php |   7 +-
 lang/el/activities.php          |  26 +-
 lang/el/auth.php                |   2 +-
 lang/el/common.php              |  10 +-
 lang/el/components.php          |  26 +-
 lang/el/editor.php              |  12 +-
 lang/el/entities.php            |  21 ++
 lang/el/errors.php              |  12 +
 lang/el/notifications.php       |  34 +--
 lang/el/settings.php            |  31 +--
 lang/el/validation.php          |   5 +
 lang/es/activities.php          |   8 +
 lang/es/editor.php              |   2 +
 lang/es/entities.php            |  21 ++
 lang/es/errors.php              |  12 +
 lang/es/settings.php            |   1 +
 lang/es/validation.php          |   5 +
 lang/es_AR/activities.php       |   8 +
 lang/es_AR/editor.php           |   2 +
 lang/es_AR/entities.php         |  21 ++
 lang/es_AR/errors.php           |  12 +
 lang/es_AR/settings.php         |   1 +
 lang/es_AR/validation.php       |   5 +
 lang/et/activities.php          |   8 +
 lang/et/editor.php              |   2 +
 lang/et/entities.php            |  21 ++
 lang/et/errors.php              |  12 +
 lang/et/settings.php            |   1 +
 lang/et/validation.php          |   5 +
 lang/eu/activities.php          |   8 +
 lang/eu/editor.php              |   2 +
 lang/eu/entities.php            |  21 ++
 lang/eu/errors.php              |  12 +
 lang/eu/settings.php            |   1 +
 lang/eu/validation.php          |   5 +
 lang/fa/activities.php          |   8 +
 lang/fa/editor.php              |   2 +
 lang/fa/entities.php            |  21 ++
 lang/fa/errors.php              |  12 +
 lang/fa/settings.php            |   1 +
 lang/fa/validation.php          |   5 +
 lang/fi/activities.php          |   8 +
 lang/fi/editor.php              |   2 +
 lang/fi/entities.php            |  21 ++
 lang/fi/errors.php              |  12 +
 lang/fi/settings.php            |   1 +
 lang/fi/validation.php          |   5 +
 lang/fr/activities.php          |   8 +
 lang/fr/editor.php              |   2 +
 lang/fr/entities.php            |  21 ++
 lang/fr/errors.php              |  12 +
 lang/fr/settings.php            |   1 +
 lang/fr/validation.php          |   5 +
 lang/he/activities.php          |   8 +
 lang/he/editor.php              |   2 +
 lang/he/entities.php            |  21 ++
 lang/he/errors.php              |  12 +
 lang/he/settings.php            |   1 +
 lang/he/validation.php          |   5 +
 lang/hr/activities.php          |   8 +
 lang/hr/editor.php              |   2 +
 lang/hr/entities.php            |  21 ++
 lang/hr/errors.php              |  12 +
 lang/hr/settings.php            |   1 +
 lang/hr/validation.php          |   5 +
 lang/hu/activities.php          |   8 +
 lang/hu/editor.php              |   2 +
 lang/hu/entities.php            |  21 ++
 lang/hu/errors.php              |  12 +
 lang/hu/settings.php            |   1 +
 lang/hu/validation.php          |   5 +
 lang/id/activities.php          |   8 +
 lang/id/editor.php              |   2 +
 lang/id/entities.php            |  21 ++
 lang/id/errors.php              |  12 +
 lang/id/settings.php            |   1 +
 lang/id/validation.php          |   5 +
 lang/is/activities.php          | 132 +++++++++
 lang/is/auth.php                | 117 ++++++++
 lang/is/common.php              | 113 ++++++++
 lang/is/components.php          |  46 ++++
 lang/is/editor.php              | 179 +++++++++++++
 lang/is/entities.php            | 460 ++++++++++++++++++++++++++++++++
 lang/is/errors.php              | 133 +++++++++
 lang/is/notifications.php       |  27 ++
 lang/is/pagination.php          |  12 +
 lang/is/passwords.php           |  15 ++
 lang/is/preferences.php         |  51 ++++
 lang/is/settings.php            | 339 +++++++++++++++++++++++
 lang/is/validation.php          | 122 +++++++++
 lang/it/activities.php          |   8 +
 lang/it/editor.php              |   2 +
 lang/it/entities.php            |  21 ++
 lang/it/errors.php              |  12 +
 lang/it/settings.php            |   1 +
 lang/it/validation.php          |   5 +
 lang/ja/activities.php          |   8 +
 lang/ja/editor.php              |   2 +
 lang/ja/entities.php            |  21 ++
 lang/ja/errors.php              |  12 +
 lang/ja/settings.php            |   1 +
 lang/ja/validation.php          |   5 +
 lang/ka/activities.php          |   8 +
 lang/ka/editor.php              |   2 +
 lang/ka/entities.php            |  21 ++
 lang/ka/errors.php              |  12 +
 lang/ka/settings.php            |   1 +
 lang/ka/validation.php          |   5 +
 lang/ko/activities.php          |  10 +-
 lang/ko/common.php              |   4 +-
 lang/ko/components.php          |   6 +-
 lang/ko/editor.php              |   2 +
 lang/ko/entities.php            |  37 ++-
 lang/ko/errors.php              |  12 +
 lang/ko/settings.php            |   1 +
 lang/ko/validation.php          |   5 +
 lang/lt/activities.php          |   8 +
 lang/lt/editor.php              |   2 +
 lang/lt/entities.php            |  21 ++
 lang/lt/errors.php              |  12 +
 lang/lt/settings.php            |   1 +
 lang/lt/validation.php          |   5 +
 lang/lv/activities.php          |   8 +
 lang/lv/editor.php              |   2 +
 lang/lv/entities.php            |  21 ++
 lang/lv/errors.php              |  12 +
 lang/lv/settings.php            |   1 +
 lang/lv/validation.php          |   5 +
 lang/nb/activities.php          |   8 +
 lang/nb/common.php              |   2 +-
 lang/nb/editor.php              |   2 +
 lang/nb/entities.php            |  25 +-
 lang/nb/errors.php              |  14 +-
 lang/nb/settings.php            |   1 +
 lang/nb/validation.php          |   5 +
 lang/nl/activities.php          |   8 +
 lang/nl/editor.php              |   2 +
 lang/nl/entities.php            |  21 ++
 lang/nl/errors.php              |  12 +
 lang/nl/settings.php            |   1 +
 lang/nl/validation.php          |   5 +
 lang/nn/activities.php          |   8 +
 lang/nn/editor.php              |   2 +
 lang/nn/entities.php            |  21 ++
 lang/nn/errors.php              |  12 +
 lang/nn/settings.php            |   1 +
 lang/nn/validation.php          |   5 +
 lang/pl/activities.php          |   8 +
 lang/pl/editor.php              |   2 +
 lang/pl/entities.php            |  21 ++
 lang/pl/errors.php              |  12 +
 lang/pl/settings.php            |   1 +
 lang/pl/validation.php          |   5 +
 lang/pt/activities.php          |   8 +
 lang/pt/editor.php              |   2 +
 lang/pt/entities.php            |  21 ++
 lang/pt/errors.php              |  12 +
 lang/pt/settings.php            |   1 +
 lang/pt/validation.php          |   5 +
 lang/pt_BR/activities.php       |   8 +
 lang/pt_BR/editor.php           |   2 +
 lang/pt_BR/entities.php         |  23 +-
 lang/pt_BR/errors.php           |  12 +
 lang/pt_BR/settings.php         |   1 +
 lang/pt_BR/validation.php       |   5 +
 lang/ro/activities.php          |   8 +
 lang/ro/editor.php              |   2 +
 lang/ro/entities.php            |  21 ++
 lang/ro/errors.php              |  12 +
 lang/ro/settings.php            |   1 +
 lang/ro/validation.php          |   5 +
 lang/ru/activities.php          |   8 +
 lang/ru/editor.php              |   2 +
 lang/ru/entities.php            |  21 ++
 lang/ru/errors.php              |  12 +
 lang/ru/settings.php            |   1 +
 lang/ru/validation.php          |   5 +
 lang/sk/activities.php          |   8 +
 lang/sk/editor.php              |   2 +
 lang/sk/entities.php            |  21 ++
 lang/sk/errors.php              |  12 +
 lang/sk/settings.php            |   1 +
 lang/sk/validation.php          |   5 +
 lang/sl/activities.php          |   8 +
 lang/sl/editor.php              |   2 +
 lang/sl/entities.php            |  21 ++
 lang/sl/errors.php              |  12 +
 lang/sl/settings.php            |   1 +
 lang/sl/validation.php          |   5 +
 lang/sq/activities.php          |   8 +
 lang/sq/editor.php              |   2 +
 lang/sq/entities.php            |  21 ++
 lang/sq/errors.php              |  12 +
 lang/sq/settings.php            |   1 +
 lang/sq/validation.php          |   5 +
 lang/sr/activities.php          |   8 +
 lang/sr/editor.php              |   2 +
 lang/sr/entities.php            |  21 ++
 lang/sr/errors.php              |  12 +
 lang/sr/settings.php            |   1 +
 lang/sr/validation.php          |   5 +
 lang/sv/activities.php          |   8 +
 lang/sv/editor.php              |   2 +
 lang/sv/entities.php            |  21 ++
 lang/sv/errors.php              |  12 +
 lang/sv/settings.php            |   1 +
 lang/sv/validation.php          |   5 +
 lang/tk/activities.php          |   8 +
 lang/tk/editor.php              |   2 +
 lang/tk/entities.php            |  21 ++
 lang/tk/errors.php              |  12 +
 lang/tk/settings.php            |   1 +
 lang/tk/validation.php          |   5 +
 lang/tr/activities.php          |   8 +
 lang/tr/editor.php              |   2 +
 lang/tr/entities.php            |  21 ++
 lang/tr/errors.php              |  12 +
 lang/tr/settings.php            |   1 +
 lang/tr/validation.php          |   5 +
 lang/uk/activities.php          |   8 +
 lang/uk/editor.php              |   2 +
 lang/uk/entities.php            |  21 ++
 lang/uk/errors.php              |  12 +
 lang/uk/settings.php            |   1 +
 lang/uk/validation.php          |   5 +
 lang/uz/activities.php          |   8 +
 lang/uz/editor.php              |   2 +
 lang/uz/entities.php            |  21 ++
 lang/uz/errors.php              |  12 +
 lang/uz/settings.php            |   1 +
 lang/uz/validation.php          |   5 +
 lang/vi/activities.php          |   8 +
 lang/vi/editor.php              |   2 +
 lang/vi/entities.php            |  21 ++
 lang/vi/errors.php              |  12 +
 lang/vi/settings.php            |   1 +
 lang/vi/validation.php          |   5 +
 lang/zh_CN/activities.php       |   8 +
 lang/zh_CN/components.php       |   2 +-
 lang/zh_CN/editor.php           |   2 +
 lang/zh_CN/entities.php         |  21 ++
 lang/zh_CN/errors.php           |  12 +
 lang/zh_CN/settings.php         |   1 +
 lang/zh_CN/validation.php       |   5 +
 lang/zh_TW/activities.php       |   8 +
 lang/zh_TW/common.php           |   2 +-
 lang/zh_TW/editor.php           |   2 +
 lang/zh_TW/entities.php         |  25 +-
 lang/zh_TW/errors.php           |  14 +-
 lang/zh_TW/settings.php         |   1 +
 lang/zh_TW/validation.php       |   5 +
 318 files changed, 5889 insertions(+), 94 deletions(-)
 create mode 100644 lang/bn/activities.php
 create mode 100644 lang/bn/auth.php
 create mode 100644 lang/bn/common.php
 create mode 100644 lang/bn/components.php
 create mode 100644 lang/bn/editor.php
 create mode 100644 lang/bn/entities.php
 create mode 100644 lang/bn/errors.php
 create mode 100644 lang/bn/notifications.php
 create mode 100644 lang/bn/pagination.php
 create mode 100644 lang/bn/passwords.php
 create mode 100644 lang/bn/preferences.php
 create mode 100644 lang/bn/settings.php
 create mode 100644 lang/bn/validation.php
 create mode 100644 lang/is/activities.php
 create mode 100644 lang/is/auth.php
 create mode 100644 lang/is/common.php
 create mode 100644 lang/is/components.php
 create mode 100644 lang/is/editor.php
 create mode 100644 lang/is/entities.php
 create mode 100644 lang/is/errors.php
 create mode 100644 lang/is/notifications.php
 create mode 100644 lang/is/pagination.php
 create mode 100644 lang/is/passwords.php
 create mode 100644 lang/is/preferences.php
 create mode 100644 lang/is/settings.php
 create mode 100644 lang/is/validation.php

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index 134dce4cd98..127ddbe1aba 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'حذف webhook',
     'webhook_delete_notification' => 'تم حذف Webhook بنجاح',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'إنشاء مستخدم',
     'user_create_notification' => 'تم انشاء الحساب',
diff --git a/lang/ar/editor.php b/lang/ar/editor.php
index 6fb6e3d1153..2254eb9ba6e 100644
--- a/lang/ar/editor.php
+++ b/lang/ar/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 1740ca9f999..065516bcfd8 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'ملف PDF',
     'export_text' => 'ملف نص عادي',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'الأذونات',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index 7788c54caca..73e76a5cc01 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName لا يعمل حالياً',
     'back_soon' => 'سيعود للعمل قريباً.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'لم يتم العثور على رمز ترخيص مميز في الطلب',
     'api_bad_authorization_format' => 'تم العثور على رمز ترخيص مميز في الطلب ولكن يبدو أن التنسيق غير صحيح',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 0d8ebcfea4a..ca8a7d90916 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'الوصول إلى واجهة برمجة تطبيقات النظام API',
     'role_manage_settings' => 'إدارة إعدادات التطبيق',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'أذونات الأصول',
diff --git a/lang/ar/validation.php b/lang/ar/validation.php
index a9793c54844..f35c920348c 100644
--- a/lang/ar/validation.php
+++ b/lang/ar/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'صيغة :attribute غير صالحة.',
     'uploaded'             => 'تعذر تحميل الملف. قد لا يقبل الخادم ملفات بهذا الحجم.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/bg/activities.php b/lang/bg/activities.php
index e1e43a0d267..d7ac37c1053 100644
--- a/lang/bg/activities.php
+++ b/lang/bg/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'изтрита уебкука',
     'webhook_delete_notification' => 'Уебкуката е изтрита успешно',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index 5f6fa1a6a7a..a530820381b 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -163,6 +163,8 @@
     'about' => 'За редактора',
     'about_title' => 'Относно визуалния редактор',
     'editor_license' => 'Лиценз, авторски и сходни права на редактора',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Този редактор е изграден посредством :tinyLink, което е предоставен под лиценз MIT.',
     'editor_tiny_license_link' => 'Авторското и сходните му права, както и лицензът на TinyMCE, могат да бъдат намерени тук.',
     'save_continue' => 'Запази страницата и продължи',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index 468256d7bac..1fdb3f6346b 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Обикновен текстов файл',
     'export_md' => 'Markdown файл',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Права',
diff --git a/lang/bg/errors.php b/lang/bg/errors.php
index 73909b344a9..dd024518083 100644
--- a/lang/bg/errors.php
+++ b/lang/bg/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName не е достъпно в момента',
     'back_soon' => 'Ще се върне обратно онлайн скоро.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Но беше намерен код за достъп в заявката',
     'api_bad_authorization_format' => 'В заявката имаше код за достъп, но формата изглежда е неправилен',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index 7faca69222a..1bc617fc9ed 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Достъп до API на системата',
     'role_manage_settings' => 'Управление на настройките на приложението',
     'role_export_content' => 'Експортирай съдържанието',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Настройки за достъп до активи',
diff --git a/lang/bg/validation.php b/lang/bg/validation.php
index fb6c4dd4a63..e08eb55de61 100644
--- a/lang/bg/validation.php
+++ b/lang/bg/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Форматът на :attribute не е валиден.',
     'uploaded'             => 'Файлът не можа да бъде качен. Сървърът може да не приема файлове с такъв размер.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/bn/activities.php b/lang/bn/activities.php
new file mode 100644
index 00000000000..e46d85fbb0a
--- /dev/null
+++ b/lang/bn/activities.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'নতুন পৃষ্ঠা সৃষ্টি করেছেন',
+    'page_create_notification'    => 'পৃষ্ঠাটি সার্থকভাবে তৈরী করা হয়েছে',
+    'page_update'                 => 'পৃষ্ঠা হালনাগাদ করেছেন',
+    'page_update_notification'    => 'পৃষ্ঠাটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'page_delete'                 => 'পৃষ্ঠা মুছে ফেলেছেন',
+    'page_delete_notification'    => 'পৃষ্ঠাটি সার্থকভাবে মুছে ফেলা হয়েছে',
+    'page_restore'                => 'মুছে ফেলা পৃষ্ঠা পুনরুদ্ধার করেছেন',
+    'page_restore_notification'   => 'পৃষ্ঠাটি সার্থকভাবে পুনরুদ্ধার করা হয়েছে',
+    'page_move'                   => 'পৃষ্ঠা স্থানান্তর করেছেন',
+    'page_move_notification'      => 'পৃষ্ঠাটি সার্থকভাবে স্থানান্তর করা হয়েছে',
+
+    // Chapters
+    'chapter_create'              => 'নতুন অধ্যায় সৃষ্টি করেছেন',
+    'chapter_create_notification' => 'অধ্যায়টি সার্থকভাবে তৈরী করা হয়েছে',
+    'chapter_update'              => 'অধ্যায় হালনাগাদ করেছেন',
+    'chapter_update_notification' => 'অধ্যায়টি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'chapter_delete'              => 'অধ্যায় মুছে ফেলেছেন',
+    'chapter_delete_notification' => 'অধ্যায়টি সার্থকভাবে মুছে ফেলা হয়েছে',
+    'chapter_move'                => 'অধ্যায় স্থানান্তর করেছেন',
+    'chapter_move_notification' => 'অধ্যায়টি সার্থকভাবে স্থানান্তর করা হয়েছে',
+
+    // Books
+    'book_create'                 => 'নতুন বই সৃষ্টি করেছেন',
+    'book_create_notification'    => 'বইটি সার্থকভাবে তৈরী করা হয়েছে',
+    'book_create_from_chapter'              => 'অধ্যায়কে বইতে রূপান্তরিত করেছেন',
+    'book_create_from_chapter_notification' => 'অধ্যায়কে বইতে রূপান্তর করার প্রক্রিয়া সফলভাবে সম্পন্ন হয়েছে',
+    'book_update'                 => 'বই হালনাগাদ করেছেন',
+    'book_update_notification'    => 'বইটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'book_delete'                 => 'বই মুছে ফেলেছেন',
+    'book_delete_notification'    => 'বইটি সার্থকভাবে মুছে ফেলা হয়েছে',
+    'book_sort'                   => 'বইটি ক্রমানুযায়ী সাজিয়েছেন',
+    'book_sort_notification'      => 'বইটি সার্থকভাবে ক্রমানুযায়ী সাজানো হয়েছে',
+
+    // Bookshelves
+    'bookshelf_create'            => 'নতুন বুকশেলফ তৈরী করেছেন',
+    'bookshelf_create_notification'    => 'বুকশেলফটি সার্থকভাবে তৈরী করা হয়েছে',
+    'bookshelf_create_from_book'    => 'বইটিকে বুকশেলফে রূপান্তরিত করার প্রক্রিয়া সফলভাবে সম্পন্ন হয়েছে',
+    'bookshelf_create_from_book_notification'    => 'বইকে বুকশেলফে রূপান্তর করার প্রক্রিয়া সফলভাবে সম্পন্ন হয়েছে',
+    'bookshelf_update'                 => 'বুকশেলফটি হালনাগাদ করেছেন',
+    'bookshelf_update_notification'    => 'বুকশেলফটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'bookshelf_delete'                 => 'বুকশেলফটি মুছে ফেলেছেন',
+    'bookshelf_delete_notification'    => 'বুকশেলফটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Revisions
+    'revision_restore' => 'সংশোধনী পুনঃস্থাপন করেছেন',
+    'revision_delete' => 'সংশোধনী মুছে ফেলেছেন',
+    'revision_delete_notification' => 'সংশোধনী সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Favourites
+    'favourite_add_notification' => 'আপনার প্রিয় তালিকায় ":name" যোগ করা হয়েছে',
+    'favourite_remove_notification' => 'আপনার প্রিয় তালিকা হতে ":name"-কে মুছে ফেলা হয়েছে',
+
+    // Watching
+    'watch_update_level_notification' => 'পর্যবেক্ষণনীতি সার্থকভাবে হালনাগাদ করা হয়েছে',
+
+    // Auth
+    'auth_login' => 'লগড ইন অবস্থায় আছেন',
+    'auth_register' => 'নতুন ব্যবহারকারী হিসাবে নিবন্ধিত',
+    'auth_password_reset_request' => 'ব্যবহারকারীর পাসওয়ার্ড রিসেটের আবেদন করেছেন',
+    'auth_password_reset_update' => 'ব্যবহারকারী পাসওয়ার্ড রিসেট করুন',
+    'mfa_setup_method' => 'মাল্টি ফ্যাক্টর অথেনটিকেশন সক্রিয় করেছেন',
+    'mfa_setup_method_notification' => 'মাল্টি ফ্যাক্টর অথেনটিকেশন সার্থকভাবে সক্রিয় করা হয়েছে',
+    'mfa_remove_method' => 'মাল্টি ফ্যাক্টর অথেনটিকেশন নিষ্ক্রিয় করেছেন',
+    'mfa_remove_method_notification' => 'মাল্টি ফ্যাক্টর অথেনটিকেশন সার্থকভাবে নিষ্ক্রিয় করা হয়েছে',
+
+    // Settings
+    'settings_update' => 'সেটিংস হালনাগাদ করেছেন',
+    'settings_update_notification' => 'সেটিংস সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'maintenance_action_run' => 'রক্ষণাবেক্ষণ কার্যক্রম চালু করেছেন',
+
+    // Webhooks
+    'webhook_create' => 'নতুন ওয়েবহুক তৈরী করেছেন',
+    'webhook_create_notification' => 'নতুন ওয়েবহুক সার্থকভাবে তৈরী করা হয়েছে',
+    'webhook_update' => 'ওয়েবহুকটি হালনাগাদ করেছেন',
+    'webhook_update_notification' => 'ওয়েবহুকটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'webhook_delete' => 'ওয়েবহুকটি মুছে ফেলেছেন',
+    'webhook_delete_notification' => 'ওয়েবহুকটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Imports
+    'import_create' => 'ইমপোর্টটি তৈরী করেছেন',
+    'import_create_notification' => 'ইমপোর্টটি সার্থকভাবে আপলোড করা হয়েছে',
+    'import_run' => 'ইমপোর্টটি হালনাগাদ করেছেন',
+    'import_run_notification' => 'কনটেন্ট সার্থকভাবে ইমপোর্ট করা হয়েছে',
+    'import_delete' => 'ইমপোর্টটি মুছে ফেলেছেন',
+    'import_delete_notification' => 'ইমপোর্টটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Users
+    'user_create' => 'নতুন ব্যবহারকারী তৈরী করেছেন',
+    'user_create_notification' => 'নতুন ব্যবহারকারী সার্থকভাবে তৈরী করা হয়েছে',
+    'user_update' => 'ব্যবহারকারীটি হালনাগাদ করেছেন',
+    'user_update_notification' => 'ব্যবহারকারীটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'user_delete' => 'ব্যবহারকারীটি মুছে ফেলেছেন',
+    'user_delete_notification' => 'ব্যবহারকারীটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // API Tokens
+    'api_token_create' => 'এপিআই টোকেনটি তৈরী করেছেন',
+    'api_token_create_notification' => 'এপিআই টোকেনটি সার্থকভাবে তৈরী করা হয়েছে',
+    'api_token_update' => 'এপিআই টোকেনটি হালনাগাদ করেছেন',
+    'api_token_update_notification' => 'এপিআই টোকেনটি হালনাগাদ করা হয়েছে',
+    'api_token_delete' => 'এপিআই টোকেনটি মুছে ফেলেছেন',
+    'api_token_delete_notification' => 'এপিআই টোকেনটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Roles
+    'role_create' => 'রোলটি তৈরী করেছেন',
+    'role_create_notification' => 'রোলটি সার্থকভাবে তৈরী করা হয়েছে',
+    'role_update' => 'রোলটি হালনাগাদ করেছেন',
+    'role_update_notification' => 'রোলটি সার্থকভাবে হালনাগাদ করা হয়েছে',
+    'role_delete' => 'রোলটি মুছে ফেলেছেন',
+    'role_delete_notification' => 'রোলটি সার্থকভাবে মুছে ফেলা হয়েছে',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'রিসাইকেল বিন খালি করে ফেলেছেন',
+    'recycle_bin_restore' => 'রিসাইকেল বিন হতে প্রত্যাবর্তন করা হয়েছে',
+    'recycle_bin_destroy' => 'রিসাইকেল বিন হতে অপসারণ করা হয়েছে',
+
+    // Comments
+    'commented_on'                => 'মন্তব্য প্রদান করেছেন',
+    'comment_create'              => 'মন্তব্য যোগ করেছেন',
+    'comment_update'              => 'মন্তব্য হালনাগাদ করেছেন',
+    'comment_delete'              => 'মন্তব্য মুছে ফেলেছেন',
+
+    // Other
+    'permissions_update'          => 'অনুমতিক্রম হালনাগাদ করেছেন',
+];
diff --git a/lang/bn/auth.php b/lang/bn/auth.php
new file mode 100644
index 00000000000..aca585962cc
--- /dev/null
+++ b/lang/bn/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'প্রদত্ত তথ্যনিরূপিত কোন রেকর্ড পাওয়া যায়নি।',
+    'throttle' => 'লগইন প্রচেষ্টার সীমা অতিক্রান্ত। দয়া করে :seconds সেকেন্ড পর আবার চেষ্টা করুন।',
+
+    // Login & Register
+    'sign_up' => 'নিবন্ধিত হোন',
+    'log_in' => 'লগ ইন করুন',
+    'log_in_with' => ':socialDriver দ্বারা লগইন করুন',
+    'sign_up_with' => ':socialDriver দ্বারা নিবন্ধিত হোন',
+    'logout' => 'Logout',
+
+    'name' => 'Name',
+    'username' => 'Username',
+    'email' => 'Email',
+    'password' => 'Password',
+    'password_confirm' => 'Confirm Password',
+    'password_hint' => 'Must be at least 8 characters',
+    'forgot_password' => 'Forgot Password?',
+    'remember_me' => 'Remember Me',
+    'ldap_email_hint' => 'Please enter an email to use for this account.',
+    'create_account' => 'Create Account',
+    'already_have_account' => 'Already have an account?',
+    'dont_have_account' => 'Don\'t have an account?',
+    'social_login' => 'Social Login',
+    'social_registration' => 'Social Registration',
+    'social_registration_text' => 'Register and sign in using another service.',
+
+    'register_thanks' => 'Thanks for registering!',
+    'register_confirm' => 'Please check your email and click the confirmation button to access :appName.',
+    'registrations_disabled' => 'Registrations are currently disabled',
+    'registration_email_domain_invalid' => 'That email domain does not have access to this application',
+    'register_success' => 'Thanks for signing up! You are now registered and signed in.',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'Attempting Login',
+    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
+    'auto_init_start_link' => 'Proceed with authentication',
+
+    // Password Reset
+    'reset_password' => 'Reset Password',
+    'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
+    'reset_password_send_button' => 'Send Reset Link',
+    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
+    'reset_password_success' => 'Your password has been successfully reset.',
+    'email_reset_subject' => 'Reset your :appName password',
+    'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
+    'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'Confirm your email on :appName',
+    'email_confirm_greeting' => 'Thanks for joining :appName!',
+    'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
+    'email_confirm_action' => 'Confirm Email',
+    'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
+    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
+    'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
+    'email_confirm_thanks' => 'Thanks for confirming!',
+    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+
+    'email_not_confirmed' => 'Email Address Not Confirmed',
+    'email_not_confirmed_text' => 'Your email address has not yet been confirmed.',
+    'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
+    'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
+    'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
+
+    // User Invite
+    'user_invite_email_subject' => 'You have been invited to join :appName!',
+    'user_invite_email_greeting' => 'An account has been created for you on :appName.',
+    'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
+    'user_invite_email_action' => 'Set Account Password',
+    'user_invite_page_welcome' => 'Welcome to :appName!',
+    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
+    'user_invite_page_confirm_button' => 'Confirm Password',
+    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'Setup Multi-Factor Authentication',
+    'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'mfa_setup_configured' => 'Already configured',
+    'mfa_setup_reconfigure' => 'Reconfigure',
+    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
+    'mfa_setup_action' => 'Setup',
+    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_option_totp_title' => 'Mobile App',
+    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Backup Codes',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
+    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
+    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_download' => 'Download Codes',
+    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
+    'mfa_gen_totp_title' => 'Mobile App Setup',
+    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_verify_setup' => 'Verify Setup',
+    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
+    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_verify_access' => 'Verify Access',
+    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_no_methods' => 'No Methods Configured',
+    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_use_totp' => 'Verify using a mobile app',
+    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
+    'mfa_verify_backup_code' => 'Backup Code',
+    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
+    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
+    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+];
diff --git a/lang/bn/common.php b/lang/bn/common.php
new file mode 100644
index 00000000000..8f425abee93
--- /dev/null
+++ b/lang/bn/common.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'প্রত্যাহার করুন',
+    'close' => 'বন্ধ করুন',
+    'confirm' => 'নিশ্চিত করুন',
+    'back' => 'প্রত্যাবর্তন করুন',
+    'save' => 'সংরক্ষণ করুন',
+    'continue' => 'অগ্রসর হউন',
+    'select' => 'নির্বাচন করুন',
+    'toggle_all' => 'সবগুলোকে টগল করুন',
+    'more' => 'বিস্তারিত',
+
+    // Form Labels
+    'name' => 'নাম',
+    'description' => 'বিবরণ',
+    'role' => 'রোল',
+    'cover_image' => 'প্রচ্ছদ ছবি',
+    'cover_image_description' => 'এই চিত্রটি আনুমানিক 440x250px হওয়া বাঞ্চনীয়। ক্ষেত্রবিশেষে ও ব্যবহারকারীর ইন্টারফেসের সাথে মানানসই করে উপস্থাপন করার জন্যে প্রয়োজনে এর আকার পরিবর্তন করে প্রদর্শন করা হবে, যা প্রকৃত মাত্রা হতে ভিন্ন হবে৷',
+
+    // Actions
+    'actions' => 'কার্যক্রম',
+    'view' => 'দেখুন',
+    'view_all' => 'সব দেখুন',
+    'new' => 'নতুন',
+    'create' => 'তৈরী করুন',
+    'update' => 'হালনাগাদ করুন',
+    'edit' => 'সম্পাদন করুন',
+    'sort' => 'ক্রমান্বয় করুন',
+    'move' => 'স্থানান্তর করুন',
+    'copy' => 'অনুলিপি করুন',
+    'reply' => 'প্রত্যুত্তর করুন',
+    'delete' => 'মুছে ফেলুন',
+    'delete_confirm' => 'মুছে ফেলা নিশ্চিত করুন',
+    'search' => 'অনুসন্ধান করুন',
+    'search_clear' => 'অনুসন্ধান পুনঃসূচনা করুন',
+    'reset' => 'পুনঃসূচনা করুন',
+    'remove' => 'অপসারণ করুন',
+    'add' => 'যোগ করুন',
+    'configure' => 'সংস্থাপন করুন',
+    'manage' => 'ব্যবস্থাপনা করুন',
+    'fullscreen' => 'ফুলস্ক্রিন',
+    'favourite' => 'প্রিয় তালিকায় যুক্ত করুন',
+    'unfavourite' => 'প্রিয় তালিকা হতে অপসারণ করুন',
+    'next' => 'পরবর্তী',
+    'previous' => 'পূর্ববর্তী',
+    'filter_active' => 'Active Filter:',
+    'filter_clear' => 'Clear Filter',
+    'download' => 'Download',
+    'open_in_tab' => 'Open in Tab',
+    'open' => 'Open',
+
+    // Sort Options
+    'sort_options' => 'Sort Options',
+    'sort_direction_toggle' => 'Sort Direction Toggle',
+    'sort_ascending' => 'Sort Ascending',
+    'sort_descending' => 'Sort Descending',
+    'sort_name' => 'Name',
+    'sort_default' => 'Default',
+    'sort_created_at' => 'Created Date',
+    'sort_updated_at' => 'Updated Date',
+
+    // Misc
+    'deleted_user' => 'Deleted User',
+    'no_activity' => 'No activity to show',
+    'no_items' => 'No items available',
+    'back_to_top' => 'Back to top',
+    'skip_to_main_content' => 'Skip to main content',
+    'toggle_details' => 'Toggle Details',
+    'toggle_thumbnails' => 'Toggle Thumbnails',
+    'details' => 'Details',
+    'grid_view' => 'Grid View',
+    'list_view' => 'List View',
+    'default' => 'Default',
+    'breadcrumb' => 'Breadcrumb',
+    'status' => 'অবস্থা',
+    'status_active' => 'Active',
+    'status_inactive' => 'নিষ্ক্রিয়',
+    'never' => 'অভূতপূর্ব',
+    'none' => 'None',
+
+    // Header
+    'homepage' => 'নীড়পাতা',
+    'header_menu_expand' => 'হেডার মেন্যু প্রসারিত করুন',
+    'profile_menu' => 'প্রোফাইল মেন্যু',
+    'view_profile' => 'প্রোফাইল দেখুন',
+    'edit_profile' => 'প্রোফাইল সম্পাদনা করুন',
+    'dark_mode' => 'নৈশরূপ',
+    'light_mode' => 'দিবারূপ',
+    'global_search' => 'সকল স্থানে অনুসন্ধান',
+
+    // Layout tabs
+    'tab_info' => 'তথ্য',
+    'tab_info_label' => 'ট্যাব: গৌণ তথ্য',
+    'tab_content' => 'কনটেন্ট',
+    'tab_content_label' => 'ট্যাব: মূখ্য তথ্য',
+
+    // Email Content
+    'email_action_help' => 'আপনার যদি ":actionText"-এ ক্লিক করতে সমস্যা হয়, তবে নিচের লিংকটি কপি করে আপনার ওয়েব ব্রাউজারে পেস্ট করুন:',
+    'email_rights' => 'সর্বস্বত্ব সংরক্ষিত',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'গোপনীয়তা নীতি',
+    'terms_of_service' => 'পরিষেবার শর্তাবলী',
+
+    // OpenSearch
+    'opensearch_description' => 'অনুসন্ধান :appName',
+];
diff --git a/lang/bn/components.php b/lang/bn/components.php
new file mode 100644
index 00000000000..c33b1d0b791
--- /dev/null
+++ b/lang/bn/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'Image Select',
+    'image_list' => 'Image List',
+    'image_details' => 'Image Details',
+    'image_upload' => 'Upload Image',
+    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
+    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_all' => 'All',
+    'image_all_title' => 'View all images',
+    'image_book_title' => 'View images uploaded to this book',
+    'image_page_title' => 'View images uploaded to this page',
+    'image_search_hint' => 'Search by image name',
+    'image_uploaded' => 'Uploaded :uploadedDate',
+    'image_uploaded_by' => 'Uploaded by :userName',
+    'image_uploaded_to' => 'Uploaded to :pageLink',
+    'image_updated' => 'Updated :updateDate',
+    'image_load_more' => 'Load More',
+    'image_image_name' => 'Image Name',
+    'image_delete_used' => 'This image is used in the pages below.',
+    'image_delete_confirm_text' => 'Are you sure you want to delete this image?',
+    'image_select_image' => 'Select Image',
+    'image_dropzone' => 'Drop images or click here to upload',
+    'image_dropzone_drop' => 'Drop images here to upload',
+    'images_deleted' => 'Images Deleted',
+    'image_preview' => 'Image Preview',
+    'image_upload_success' => 'Image uploaded successfully',
+    'image_update_success' => 'Image details successfully updated',
+    'image_delete_success' => 'Image successfully deleted',
+    'image_replace' => 'Replace Image',
+    'image_replace_success' => 'Image file successfully updated',
+    'image_rebuild_thumbs' => 'Regenerate Size Variations',
+    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+
+    // Code Editor
+    'code_editor' => 'Edit Code',
+    'code_language' => 'Code Language',
+    'code_content' => 'Code Content',
+    'code_session_history' => 'Session History',
+    'code_save' => 'Save Code',
+];
diff --git a/lang/bn/editor.php b/lang/bn/editor.php
new file mode 100644
index 00000000000..8bcef5f23ce
--- /dev/null
+++ b/lang/bn/editor.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'সাধারণ',
+    'advanced' => 'উন্নত',
+    'none' => 'অপ্রযোজ্য',
+    'cancel' => 'প্রত্যাহার করুন',
+    'save' => 'সংরক্ষণ করুন',
+    'close' => 'বন্ধ করুন',
+    'undo' => 'প্রত্যাহার করুন',
+    'redo' => 'পুনর্বহাল রাখুন',
+    'left' => 'বাম',
+    'center' => 'মধ্য',
+    'right' => 'ডান',
+    'top' => 'উপর',
+    'middle' => 'মধ্য',
+    'bottom' => 'নিচে',
+    'width' => 'প্রস্থ',
+    'height' => 'উচ্চতা',
+    'More' => 'বিস্তারিত',
+    'select' => 'নির্বাচন করুন...',
+
+    // Toolbar
+    'formats' => 'প্রকরণ',
+    'header_large' => 'বড় হেডার',
+    'header_medium' => 'মাঝারি হেডার',
+    'header_small' => 'ছোট হেডার',
+    'header_tiny' => 'ক্ষুদ্র হেডার',
+    'paragraph' => 'প্যারাগ্রাফ',
+    'blockquote' => 'ব্লককোট',
+    'inline_code' => 'ইনলাইন কোড',
+    'callouts' => 'কলআউট',
+    'callout_information' => 'তথ্যমূলক',
+    'callout_success' => 'সফলজনক',
+    'callout_warning' => 'সতর্কতামূলক',
+    'callout_danger' => 'বিপদজনক',
+    'bold' => 'বোল্ড',
+    'italic' => 'ইটালিক',
+    'underline' => 'আন্ডারলাইন',
+    'strikethrough' => 'স্ট্রাইকথ্রু',
+    'superscript' => 'Superscript',
+    'subscript' => 'Subscript',
+    'text_color' => 'Text color',
+    'custom_color' => 'Custom color',
+    'remove_color' => 'Remove color',
+    'background_color' => 'Background color',
+    'align_left' => 'Align left',
+    'align_center' => 'Align center',
+    'align_right' => 'Align right',
+    'align_justify' => 'Justify',
+    'list_bullet' => 'Bullet list',
+    'list_numbered' => 'Numbered list',
+    'list_task' => 'Task list',
+    'indent_increase' => 'Increase indent',
+    'indent_decrease' => 'Decrease indent',
+    'table' => 'Table',
+    'insert_image' => 'Insert image',
+    'insert_image_title' => 'Insert/Edit Image',
+    'insert_link' => 'Insert/edit link',
+    'insert_link_title' => 'Insert/Edit Link',
+    'insert_horizontal_line' => 'Insert horizontal line',
+    'insert_code_block' => 'Insert code block',
+    'edit_code_block' => 'Edit code block',
+    'insert_drawing' => 'Insert/edit drawing',
+    'drawing_manager' => 'Drawing manager',
+    'insert_media' => 'Insert/edit media',
+    'insert_media_title' => 'Insert/Edit Media',
+    'clear_formatting' => 'Clear formatting',
+    'source_code' => 'Source code',
+    'source_code_title' => 'Source Code',
+    'fullscreen' => 'Fullscreen',
+    'image_options' => 'Image options',
+
+    // Tables
+    'table_properties' => 'Table properties',
+    'table_properties_title' => 'Table Properties',
+    'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
+    'insert_row_before' => 'Insert row before',
+    'insert_row_after' => 'Insert row after',
+    'delete_row' => 'Delete row',
+    'insert_column_before' => 'Insert column before',
+    'insert_column_after' => 'Insert column after',
+    'delete_column' => 'Delete column',
+    'table_cell' => 'Cell',
+    'table_row' => 'Row',
+    'table_column' => 'Column',
+    'cell_properties' => 'Cell properties',
+    'cell_properties_title' => 'Cell Properties',
+    'cell_type' => 'Cell type',
+    'cell_type_cell' => 'Cell',
+    'cell_scope' => 'Scope',
+    'cell_type_header' => 'Header cell',
+    'merge_cells' => 'Merge cells',
+    'split_cell' => 'Split cell',
+    'table_row_group' => 'Row Group',
+    'table_column_group' => 'Column Group',
+    'horizontal_align' => 'Horizontal align',
+    'vertical_align' => 'Vertical align',
+    'border_width' => 'Border width',
+    'border_style' => 'Border style',
+    'border_color' => 'Border color',
+    'row_properties' => 'Row properties',
+    'row_properties_title' => 'Row Properties',
+    'cut_row' => 'Cut row',
+    'copy_row' => 'Copy row',
+    'paste_row_before' => 'Paste row before',
+    'paste_row_after' => 'Paste row after',
+    'row_type' => 'Row type',
+    'row_type_header' => 'Header',
+    'row_type_body' => 'Body',
+    'row_type_footer' => 'Footer',
+    'alignment' => 'Alignment',
+    'cut_column' => 'Cut column',
+    'copy_column' => 'Copy column',
+    'paste_column_before' => 'Paste column before',
+    'paste_column_after' => 'Paste column after',
+    'cell_padding' => 'Cell padding',
+    'cell_spacing' => 'Cell spacing',
+    'caption' => 'Caption',
+    'show_caption' => 'Show caption',
+    'constrain' => 'Constrain proportions',
+    'cell_border_solid' => 'Solid',
+    'cell_border_dotted' => 'Dotted',
+    'cell_border_dashed' => 'Dashed',
+    'cell_border_double' => 'Double',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'None',
+    'cell_border_hidden' => 'Hidden',
+
+    // Images, links, details/summary & embed
+    'source' => 'Source',
+    'alt_desc' => 'Alternative description',
+    'embed' => 'Embed',
+    'paste_embed' => 'Paste your embed code below:',
+    'url' => 'URL',
+    'text_to_display' => 'Text to display',
+    'title' => 'Title',
+    'open_link' => 'Open link',
+    'open_link_in' => 'Open link in...',
+    'open_link_current' => 'Current window',
+    'open_link_new' => 'New window',
+    'remove_link' => 'Remove link',
+    'insert_collapsible' => 'Insert collapsible block',
+    'collapsible_unwrap' => 'Unwrap',
+    'edit_label' => 'Edit label',
+    'toggle_open_closed' => 'Toggle open/closed',
+    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_label' => 'Toggle label',
+
+    // About view
+    'about' => 'About the editor',
+    'about_title' => 'About the WYSIWYG Editor',
+    'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
+    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'save_continue' => 'Save Page & Continue',
+    'callouts_cycle' => '(Keep pressing to toggle through types)',
+    'link_selector' => 'Link to content',
+    'shortcuts' => 'Shortcuts',
+    'shortcut' => 'Shortcut',
+    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'Description',
+];
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
new file mode 100644
index 00000000000..26a563a7eb5
--- /dev/null
+++ b/lang/bn/entities.php
@@ -0,0 +1,460 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'Recently Created',
+    'recently_created_pages' => 'Recently Created Pages',
+    'recently_updated_pages' => 'Recently Updated Pages',
+    'recently_created_chapters' => 'Recently Created Chapters',
+    'recently_created_books' => 'Recently Created Books',
+    'recently_created_shelves' => 'Recently Created Shelves',
+    'recently_update' => 'Recently Updated',
+    'recently_viewed' => 'Recently Viewed',
+    'recent_activity' => 'Recent Activity',
+    'create_now' => 'Create one now',
+    'revisions' => 'Revisions',
+    'meta_revision' => 'Revision #:revisionCount',
+    'meta_created' => 'Created :timeLength',
+    'meta_created_name' => 'Created :timeLength by :user',
+    'meta_updated' => 'Updated :timeLength',
+    'meta_updated_name' => 'Updated :timeLength by :user',
+    'meta_owned_name' => 'Owned by :user',
+    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'entity_select' => 'Entity Select',
+    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'images' => 'Images',
+    'my_recent_drafts' => 'My Recent Drafts',
+    'my_recently_viewed' => 'My Recently Viewed',
+    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
+    'my_favourites' => 'My Favourites',
+    'no_pages_viewed' => 'You have not viewed any pages',
+    'no_pages_recently_created' => 'No pages have been recently created',
+    'no_pages_recently_updated' => 'No pages have been recently updated',
+    'export' => 'Export',
+    'export_html' => 'Contained Web File',
+    'export_pdf' => 'PDF File',
+    'export_text' => 'Plain Text File',
+    'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+
+    // Permissions and restrictions
+    'permissions' => 'Permissions',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_save' => 'Save Permissions',
+    'permissions_owner' => 'Owner',
+    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Override permissions for role',
+    'permissions_inherit_defaults' => 'Inherit defaults',
+
+    // Search
+    'search_results' => 'Search Results',
+    'search_total_results_found' => ':count result found|:count total results found',
+    'search_clear' => 'Clear Search',
+    'search_no_pages' => 'No pages matched this search',
+    'search_for_term' => 'Search for :term',
+    'search_more' => 'More Results',
+    'search_advanced' => 'Advanced Search',
+    'search_terms' => 'Search Terms',
+    'search_content_type' => 'Content Type',
+    'search_exact_matches' => 'Exact Matches',
+    'search_tags' => 'Tag Searches',
+    'search_options' => 'Options',
+    'search_viewed_by_me' => 'Viewed by me',
+    'search_not_viewed_by_me' => 'Not viewed by me',
+    'search_permissions_set' => 'Permissions set',
+    'search_created_by_me' => 'Created by me',
+    'search_updated_by_me' => 'Updated by me',
+    'search_owned_by_me' => 'Owned by me',
+    'search_date_options' => 'Date Options',
+    'search_updated_before' => 'Updated before',
+    'search_updated_after' => 'Updated after',
+    'search_created_before' => 'Created before',
+    'search_created_after' => 'Created after',
+    'search_set_date' => 'Set Date',
+    'search_update' => 'Update Search',
+
+    // Shelves
+    'shelf' => 'Shelf',
+    'shelves' => 'Shelves',
+    'x_shelves' => ':count Shelf|:count Shelves',
+    'shelves_empty' => 'No shelves have been created',
+    'shelves_create' => 'Create New Shelf',
+    'shelves_popular' => 'Popular Shelves',
+    'shelves_new' => 'New Shelves',
+    'shelves_new_action' => 'New Shelf',
+    'shelves_popular_empty' => 'The most popular shelves will appear here.',
+    'shelves_new_empty' => 'The most recently created shelves will appear here.',
+    'shelves_save' => 'Save Shelf',
+    'shelves_books' => 'Books on this shelf',
+    'shelves_add_books' => 'Add books to this shelf',
+    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_empty_contents' => 'This shelf has no books assigned to it',
+    'shelves_edit_and_assign' => 'Edit shelf to assign books',
+    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit' => 'Edit Shelf',
+    'shelves_delete' => 'Delete Shelf',
+    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
+    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
+    'shelves_permissions' => 'Shelf Permissions',
+    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
+    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
+    'shelves_copy_permissions' => 'Copy Permissions',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+
+    // Books
+    'book' => 'Book',
+    'books' => 'Books',
+    'x_books' => ':count Book|:count Books',
+    'books_empty' => 'No books have been created',
+    'books_popular' => 'Popular Books',
+    'books_recent' => 'Recent Books',
+    'books_new' => 'New Books',
+    'books_new_action' => 'New Book',
+    'books_popular_empty' => 'The most popular books will appear here.',
+    'books_new_empty' => 'The most recently created books will appear here.',
+    'books_create' => 'Create New Book',
+    'books_delete' => 'Delete Book',
+    'books_delete_named' => 'Delete Book :bookName',
+    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
+    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
+    'books_edit' => 'Edit Book',
+    'books_edit_named' => 'Edit Book :bookName',
+    'books_form_book_name' => 'Book Name',
+    'books_save' => 'Save Book',
+    'books_permissions' => 'Book Permissions',
+    'books_permissions_updated' => 'Book Permissions Updated',
+    'books_empty_contents' => 'No pages or chapters have been created for this book.',
+    'books_empty_create_page' => 'Create a new page',
+    'books_empty_sort_current_book' => 'Sort the current book',
+    'books_empty_add_chapter' => 'Add a chapter',
+    'books_permissions_active' => 'Book Permissions Active',
+    'books_search_this' => 'Search this book',
+    'books_navigation' => 'Book Navigation',
+    'books_sort' => 'Sort Book Contents',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_named' => 'Sort Book :bookName',
+    'books_sort_name' => 'Sort by Name',
+    'books_sort_created' => 'Sort by Created Date',
+    'books_sort_updated' => 'Sort by Updated Date',
+    'books_sort_chapters_first' => 'Chapters First',
+    'books_sort_chapters_last' => 'Chapters Last',
+    'books_sort_show_other' => 'Show Other Books',
+    'books_sort_save' => 'Save New Order',
+    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_move_up' => 'Move Up',
+    'books_sort_move_down' => 'Move Down',
+    'books_sort_move_prev_book' => 'Move to Previous Book',
+    'books_sort_move_next_book' => 'Move to Next Book',
+    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
+    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
+    'books_sort_move_book_start' => 'Move to Start of Book',
+    'books_sort_move_book_end' => 'Move to End of Book',
+    'books_sort_move_before_chapter' => 'Move to Before Chapter',
+    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_copy' => 'Copy Book',
+    'books_copy_success' => 'Book successfully copied',
+
+    // Chapters
+    'chapter' => 'Chapter',
+    'chapters' => 'Chapters',
+    'x_chapters' => ':count Chapter|:count Chapters',
+    'chapters_popular' => 'Popular Chapters',
+    'chapters_new' => 'New Chapter',
+    'chapters_create' => 'Create New Chapter',
+    'chapters_delete' => 'Delete Chapter',
+    'chapters_delete_named' => 'Delete Chapter :chapterName',
+    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
+    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
+    'chapters_edit' => 'Edit Chapter',
+    'chapters_edit_named' => 'Edit Chapter :chapterName',
+    'chapters_save' => 'Save Chapter',
+    'chapters_move' => 'Move Chapter',
+    'chapters_move_named' => 'Move Chapter :chapterName',
+    'chapters_copy' => 'Copy Chapter',
+    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_permissions' => 'Chapter Permissions',
+    'chapters_empty' => 'No pages are currently in this chapter.',
+    'chapters_permissions_active' => 'Chapter Permissions Active',
+    'chapters_permissions_success' => 'Chapter Permissions Updated',
+    'chapters_search_this' => 'Search this chapter',
+    'chapter_sort_book' => 'Sort Book',
+
+    // Pages
+    'page' => 'Page',
+    'pages' => 'Pages',
+    'x_pages' => ':count Page|:count Pages',
+    'pages_popular' => 'Popular Pages',
+    'pages_new' => 'New Page',
+    'pages_attachments' => 'Attachments',
+    'pages_navigation' => 'Page Navigation',
+    'pages_delete' => 'Delete Page',
+    'pages_delete_named' => 'Delete Page :pageName',
+    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
+    'pages_delete_draft' => 'Delete Draft Page',
+    'pages_delete_success' => 'Page deleted',
+    'pages_delete_draft_success' => 'Draft page deleted',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
+    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
+    'pages_editing_named' => 'Editing Page :pageName',
+    'pages_edit_draft_options' => 'Draft Options',
+    'pages_edit_save_draft' => 'Save Draft',
+    'pages_edit_draft' => 'Edit Page Draft',
+    'pages_editing_draft' => 'Editing Draft',
+    'pages_editing_page' => 'Editing Page',
+    'pages_edit_draft_save_at' => 'Draft saved at ',
+    'pages_edit_delete_draft' => 'Delete Draft',
+    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_discard_draft' => 'Discard Draft',
+    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
+    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
+    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_set_changelog' => 'Set Changelog',
+    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
+    'pages_edit_enter_changelog' => 'Enter Changelog',
+    'pages_editor_switch_title' => 'Switch Editor',
+    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
+    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_save' => 'Save Page',
+    'pages_title' => 'Page Title',
+    'pages_name' => 'Page Name',
+    'pages_md_editor' => 'Editor',
+    'pages_md_preview' => 'Preview',
+    'pages_md_insert_image' => 'Insert Image',
+    'pages_md_insert_link' => 'Insert Entity Link',
+    'pages_md_insert_drawing' => 'Insert Drawing',
+    'pages_md_show_preview' => 'Show preview',
+    'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_not_in_chapter' => 'Page is not in a chapter',
+    'pages_move' => 'Move Page',
+    'pages_copy' => 'Copy Page',
+    'pages_copy_desination' => 'Copy Destination',
+    'pages_copy_success' => 'Page successfully copied',
+    'pages_permissions' => 'Page Permissions',
+    'pages_permissions_success' => 'Page permissions updated',
+    'pages_revision' => 'Revision',
+    'pages_revisions' => 'Page Revisions',
+    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_named' => 'Page Revisions for :pageName',
+    'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revisions_created_by' => 'Created By',
+    'pages_revisions_date' => 'Revision Date',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_numbered' => 'Revision #:id',
+    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
+    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_changelog' => 'Changelog',
+    'pages_revisions_changes' => 'Changes',
+    'pages_revisions_current' => 'Current Version',
+    'pages_revisions_preview' => 'Preview',
+    'pages_revisions_restore' => 'Restore',
+    'pages_revisions_none' => 'This page has no revisions',
+    'pages_copy_link' => 'Copy Link',
+    'pages_edit_content_link' => 'Jump to section in editor',
+    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_label' => 'Page Section Options',
+    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
+    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_permissions_active' => 'Page Permissions Active',
+    'pages_initial_revision' => 'Initial publish',
+    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_initial_name' => 'New Page',
+    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
+    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
+    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count users have started editing this page',
+        'start_b' => ':userName has started editing this page',
+        'time_a' => 'since the page was last updated',
+        'time_b' => 'in the last :minCount minutes',
+        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+    ],
+    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
+    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_specific' => 'Specific Page',
+    'pages_is_template' => 'Page Template',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'Toggle Sidebar',
+    'page_tags' => 'Page Tags',
+    'chapter_tags' => 'Chapter Tags',
+    'book_tags' => 'Book Tags',
+    'shelf_tags' => 'Shelf Tags',
+    'tag' => 'Tag',
+    'tags' =>  'Tags',
+    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tag_name' =>  'Tag Name',
+    'tag_value' => 'Tag Value (Optional)',
+    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
+    'tags_add' => 'Add another tag',
+    'tags_remove' => 'Remove this tag',
+    'tags_usages' => 'Total tag usages',
+    'tags_assigned_pages' => 'Assigned to Pages',
+    'tags_assigned_chapters' => 'Assigned to Chapters',
+    'tags_assigned_books' => 'Assigned to Books',
+    'tags_assigned_shelves' => 'Assigned to Shelves',
+    'tags_x_unique_values' => ':count unique values',
+    'tags_all_values' => 'All values',
+    'tags_view_tags' => 'View Tags',
+    'tags_view_existing_tags' => 'View existing tags',
+    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'attachments' => 'Attachments',
+    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
+    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
+    'attachments_upload' => 'Upload File',
+    'attachments_link' => 'Attach Link',
+    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_set_link' => 'Set Link',
+    'attachments_delete' => 'Are you sure you want to delete this attachment?',
+    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_no_files' => 'No files have been uploaded',
+    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
+    'attachments_link_name' => 'Link Name',
+    'attachment_link' => 'Attachment link',
+    'attachments_link_url' => 'Link to file',
+    'attachments_link_url_hint' => 'Url of site or file',
+    'attach' => 'Attach',
+    'attachments_insert_link' => 'Add Attachment Link to Page',
+    'attachments_edit_file' => 'Edit File',
+    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
+    'attachments_order_updated' => 'Attachment order updated',
+    'attachments_updated_success' => 'Attachment details updated',
+    'attachments_deleted' => 'Attachment deleted',
+    'attachments_file_uploaded' => 'File successfully uploaded',
+    'attachments_file_updated' => 'File successfully updated',
+    'attachments_link_attached' => 'Link successfully attached to page',
+    'templates' => 'Templates',
+    'templates_set_as_template' => 'Page is a template',
+    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
+    'templates_replace_content' => 'Replace page content',
+    'templates_append_content' => 'Append to page content',
+    'templates_prepend_content' => 'Prepend to page content',
+
+    // Profile View
+    'profile_user_for_x' => 'User for :time',
+    'profile_created_content' => 'Created Content',
+    'profile_not_created_pages' => ':userName has not created any pages',
+    'profile_not_created_chapters' => ':userName has not created any chapters',
+    'profile_not_created_books' => ':userName has not created any books',
+    'profile_not_created_shelves' => ':userName has not created any shelves',
+
+    // Comments
+    'comment' => 'Comment',
+    'comments' => 'Comments',
+    'comment_add' => 'Add Comment',
+    'comment_placeholder' => 'Leave a comment here',
+    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_save' => 'Save Comment',
+    'comment_new' => 'New Comment',
+    'comment_created' => 'commented :createDiff',
+    'comment_updated' => 'Updated :updateDiff by :username',
+    'comment_updated_indicator' => 'Updated',
+    'comment_deleted_success' => 'Comment deleted',
+    'comment_created_success' => 'Comment added',
+    'comment_updated_success' => 'Comment updated',
+    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
+    'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+
+    // Revision
+    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
+    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
+    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+
+    // Copy view
+    'copy_consider' => 'Please consider the below when copying content.',
+    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_owner' => 'You will become the owner of all copied content.',
+    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
+    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+
+    // Conversions
+    'convert_to_shelf' => 'Convert to Shelf',
+    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
+    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_book' => 'Convert Book',
+    'convert_book_confirm' => 'Are you sure you want to convert this book?',
+    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_to_book' => 'Convert to Book',
+    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_chapter' => 'Convert Chapter',
+    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+
+    // References
+    'references' => 'References',
+    'references_none' => 'There are no tracked references to this item.',
+    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+
+    // Watch Options
+    'watch' => 'Watch',
+    'watch_title_default' => 'Default Preferences',
+    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_title_ignore' => 'Ignore',
+    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_new' => 'New Pages',
+    'watch_desc_new' => 'Notify when any new page is created within this item.',
+    'watch_title_updates' => 'All Page Updates',
+    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
+    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
+    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
+    'watch_change_default' => 'Change default notification preferences',
+    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_updates' => 'Watching new pages and updates',
+    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
+    'watch_detail_parent_chapter' => 'Watching via parent chapter',
+    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+];
diff --git a/lang/bn/errors.php b/lang/bn/errors.php
new file mode 100644
index 00000000000..ee2fbfa2100
--- /dev/null
+++ b/lang/bn/errors.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'অনুরোধকৃত পৃষ্ঠাটিতে আপনার ব্যবহারাধিকারের অনুমতি নেই।',
+    'permissionJson' => 'You do not have permission to perform the requested action.',
+
+    // Auth
+    'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
+    'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
+    'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
+    'email_confirmation_awaiting' => 'The email address for the account in use needs to be confirmed',
+    'ldap_fail_anonymous' => 'LDAP access failed using anonymous bind',
+    'ldap_fail_authed' => 'LDAP access failed using given dn & password details',
+    'ldap_extension_not_installed' => 'LDAP PHP extension not installed',
+    'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
+    'saml_already_logged_in' => 'Already logged in',
+    'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
+    'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'oidc_already_logged_in' => 'Already logged in',
+    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'social_no_action_defined' => 'No action defined',
+    'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
+    'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',
+    'social_account_email_in_use' => 'The email :email is already in use. If you already have an account you can connect your :socialAccount account from your profile settings.',
+    'social_account_existing' => 'This :socialAccount is already attached to your profile.',
+    'social_account_already_used_existing' => 'This :socialAccount account is already used by another user.',
+    'social_account_not_used' => 'This :socialAccount account is not linked to any users. Please attach it in your profile settings. ',
+    'social_account_register_instructions' => 'If you do not yet have an account, You can register an account using the :socialAccount option.',
+    'social_driver_not_found' => 'Social driver not found',
+    'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
+    'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
+
+    // System
+    'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
+    'cannot_get_image_from_url' => 'Cannot get image from :url',
+    'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
+    'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
+    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
+
+    // Drawing & Images
+    'image_upload_error' => 'An error occurred uploading the image',
+    'image_upload_type_error' => 'The image type being uploaded is invalid',
+    'image_upload_replace_type' => 'Image file replacements must be of the same type',
+    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
+    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+
+    // Attachments
+    'attachment_not_found' => 'Attachment not found',
+    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+
+    // Pages
+    'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
+    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
+
+    // Entities
+    'entity_not_found' => 'Entity not found',
+    'bookshelf_not_found' => 'Shelf not found',
+    'book_not_found' => 'Book not found',
+    'page_not_found' => 'Page not found',
+    'chapter_not_found' => 'Chapter not found',
+    'selected_book_not_found' => 'The selected book was not found',
+    'selected_book_chapter_not_found' => 'The selected Book or Chapter was not found',
+    'guests_cannot_save_drafts' => 'Guests cannot save drafts',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
+    'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+
+    // Roles
+    'role_cannot_be_edited' => 'This role cannot be edited',
+    'role_system_cannot_be_deleted' => 'This role is a system role and cannot be deleted',
+    'role_registration_default_cannot_delete' => 'This role cannot be deleted while set as the default registration role',
+    'role_cannot_remove_only_admin' => 'This user is the only user assigned to the administrator role. Assign the administrator role to another user before attempting to remove it here.',
+
+    // Comments
+    'comment_list' => 'An error occurred while fetching the comments.',
+    'cannot_add_comment_to_draft' => 'You cannot add comments to a draft.',
+    'comment_add' => 'An error occurred while adding / updating the comment.',
+    'comment_delete' => 'An error occurred while deleting the comment.',
+    'empty_comment' => 'Cannot add an empty comment.',
+
+    // Error pages
+    '404_page_not_found' => 'Page Not Found',
+    'sorry_page_not_found' => 'Sorry, The page you were looking for could not be found.',
+    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
+    'image_not_found' => 'Image Not Found',
+    'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
+    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
+    'return_home' => 'Return to home',
+    'error_occurred' => 'An Error Occurred',
+    'app_down' => ':appName is down right now',
+    'back_soon' => 'It will be back up soon.',
+
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
+    // API errors
+    'api_no_authorization_found' => 'No authorization token found on the request',
+    'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
+    'api_user_token_not_found' => 'No matching API token was found for the provided authorization token',
+    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
+    'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
+    'api_user_token_expired' => 'The authorization token used has expired',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+];
diff --git a/lang/bn/notifications.php b/lang/bn/notifications.php
new file mode 100644
index 00000000000..1afd23f1dc4
--- /dev/null
+++ b/lang/bn/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'New comment on page: :pageName',
+    'new_comment_intro' => 'A user has commented on a page in :appName:',
+    'new_page_subject' => 'New page: :pageName',
+    'new_page_intro' => 'A new page has been created in :appName:',
+    'updated_page_subject' => 'Updated page: :pageName',
+    'updated_page_intro' => 'A page has been updated in :appName:',
+    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+
+    'detail_page_name' => 'Page Name:',
+    'detail_page_path' => 'Page Path:',
+    'detail_commenter' => 'Commenter:',
+    'detail_comment' => 'Comment:',
+    'detail_created_by' => 'Created By:',
+    'detail_updated_by' => 'Updated By:',
+
+    'action_view_comment' => 'View Comment',
+    'action_view_page' => 'View Page',
+
+    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason_link' => 'your notification preferences',
+];
diff --git a/lang/bn/pagination.php b/lang/bn/pagination.php
new file mode 100644
index 00000000000..2cf360a0fb6
--- /dev/null
+++ b/lang/bn/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; পূর্ববর্তী',
+    'next'     => 'পরবর্তী &raquo;',
+
+];
diff --git a/lang/bn/passwords.php b/lang/bn/passwords.php
new file mode 100644
index 00000000000..da318b1acc0
--- /dev/null
+++ b/lang/bn/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'পাসওয়ার্ড কমপক্ষে আট অক্ষরের হতে হবে এবং পাসওয়ার্ড নিশ্চিতকরণের ঘরে প্রদত্ত পাসওয়ার্ডের সাথে মিলতে হবে।',
+    'user' => "প্রদত্ত ইমেইল ঠিকানার স্বাপেক্ষে কোন ব্যবহারকারী খুঁজে পাওয়া যায়নি।",
+    'token' => 'প্রদত্ত পাসওয়ার্ড রিসেট টোকেন অত্র ইমেল ঠিকানার জন্য বৈধ নয়৷',
+    'sent' => 'আপনার পাসওয়ার্ড রিসেট লিঙ্কটি ই-মেইলের মাধ্যমে প্রেরণ করা হয়েছে!',
+    'reset' => 'আপনার পাসওয়ার্ডটি রিসেট করা হয়েছে!',
+
+];
diff --git a/lang/bn/preferences.php b/lang/bn/preferences.php
new file mode 100644
index 00000000000..2e47604e471
--- /dev/null
+++ b/lang/bn/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'আমার অ্যাকাউন্ট',
+
+    'shortcuts' => 'Shortcuts',
+    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
+    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
+    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
+    'shortcuts_section_navigation' => 'Navigation',
+    'shortcuts_section_actions' => 'Common Actions',
+    'shortcuts_save' => 'Save Shortcuts',
+    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
+    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
+    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+
+    'notifications' => 'Notification Preferences',
+    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
+    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
+    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
+    'notifications_save' => 'Save Preferences',
+    'notifications_update_success' => 'Notification preferences have been updated!',
+    'notifications_watched' => 'Watched & Ignored Items',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+
+    'auth' => 'Access & Security',
+    'auth_change_password' => 'Change Password',
+    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
+    'auth_change_password_success' => 'Password has been updated!',
+
+    'profile' => 'Profile Details',
+    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_view_public' => 'View Public Profile',
+    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
+    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
+    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
+    'profile_admin_options' => 'Administrator Options',
+    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+
+    'delete_account' => 'Delete Account',
+    'delete_my_account' => 'Delete My Account',
+    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
+    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+];
diff --git a/lang/bn/settings.php b/lang/bn/settings.php
new file mode 100644
index 00000000000..e66e32284d6
--- /dev/null
+++ b/lang/bn/settings.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'সেটিংস',
+    'settings_save' => 'সেটিংস সংরক্ষণ করুন',
+    'system_version' => 'সিস্টেম ভার্সন',
+    'categories' => 'শ্রেণীবিভাগ সমূহ',
+
+    // App Settings
+    'app_customization' => 'নিজস্বীকরণ',
+    'app_features_security' => 'ফিচারসমূহ ও নিরাপত্তা',
+    'app_name' => 'এপ্লিকেশনের নাম',
+    'app_name_desc' => 'এই নামটি হেডারে এবং যেকোন সিস্টেম-প্রেরিত ইমেলে দেখানো হয়।',
+    'app_name_header' => 'হেডারে নাম দেখান',
+    'app_public_access' => 'পাবলিক এক্সেস',
+    'app_public_access_desc' => 'উক্ত অপশনটি সক্রিয় করলে আপনার বুকস্ট্যাক ওয়েবসাইটের সকল তথ্য, যে কেউ লগ ইন করা ছাড়াই, দেখতে বা পড়তে অথবা এক্সেস করতে পারবেন।',
+    'app_public_access_desc_guest' => '"Guest" ব্যবহারকারীর মাধ্যমে ওয়েবসাইট ভিসিটরদের পঠনধিকার নিয়ন্ত্রণ করা যেতে পারে।',
+    'app_public_access_toggle' => 'পাবলিক অ্যাক্সেসের অনুমতি দিন',
+    'app_public_viewing' => 'সকলের জন্যে উন্মুক্ত করতে চান?',
+    'app_secure_images' => 'Higher Security Image Uploads',
+    'app_secure_images_toggle' => 'Enable higher security image uploads',
+    'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.',
+    'app_default_editor' => 'Default Page Editor',
+    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_custom_html' => 'Custom HTML Head Content',
+    'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
+    'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
+    'app_logo' => 'অ্যাপ্লিকেশনের লোগো',
+    'app_logo_desc' => 'এটি অ্যাপ্লিকেশনের হেডার বার-এ দেখানো হবে।  উক্ত ছবিটির উচ্চতা সর্বোচ্চ ৮৬ পিক্সেলের হতে হবে। অধিকতর উচ্চতার ছবিকে স্কেল ডাউন করা হবে। ',
+    'app_icon' => 'অ্যাপ্লিকেশনের আইকন',
+    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_homepage' => 'অ্যাপ্লিকেশনের নীড়পাতা',
+    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
+    'app_homepage_select' => 'একটি পৃষ্ঠা নির্বাচন করুন',
+    'app_footer_links' => 'ফুটার লিঙ্কসমূহ',
+    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
+    'app_footer_links_label' => 'Link Label',
+    'app_footer_links_url' => 'Link URL',
+    'app_footer_links_add' => 'Add Footer Link',
+    'app_disable_comments' => 'Disable Comments',
+    'app_disable_comments_toggle' => 'Disable comments',
+    'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
+
+    // Color settings
+    'color_scheme' => 'Application Color Scheme',
+    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
+    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'app_color' => 'Primary Color',
+    'link_color' => 'Default Link Color',
+    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'bookshelf_color' => 'Shelf Color',
+    'book_color' => 'Book Color',
+    'chapter_color' => 'Chapter Color',
+    'page_color' => 'Page Color',
+    'page_draft_color' => 'Page Draft Color',
+
+    // Registration Settings
+    'reg_settings' => 'Registration',
+    'reg_enable' => 'Enable Registration',
+    'reg_enable_toggle' => 'Enable registration',
+    'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
+    'reg_default_role' => 'Default user role after registration',
+    'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
+    'reg_email_confirmation' => 'Email Confirmation',
+    'reg_email_confirmation_toggle' => 'Require email confirmation',
+    'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.',
+    'reg_confirm_restrict_domain' => 'Domain Restriction',
+    'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
+    'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
+
+    // Maintenance settings
+    'maint' => 'Maintenance',
+    'maint_image_cleanup' => 'Cleanup Images',
+    'maint_image_cleanup_desc' => 'Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.',
+    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_image_cleanup_run' => 'Run Cleanup',
+    'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
+    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
+    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
+    'maint_send_test_email' => 'Send a Test Email',
+    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
+    'maint_send_test_email_run' => 'Send test email',
+    'maint_send_test_email_success' => 'Email sent to :address',
+    'maint_send_test_email_mail_subject' => 'Test Email',
+    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
+    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
+    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_open' => 'Open Recycle Bin',
+    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
+    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+
+    // Recycle Bin
+    'recycle_bin' => 'Recycle Bin',
+    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_deleted_item' => 'Deleted Item',
+    'recycle_bin_deleted_parent' => 'Parent',
+    'recycle_bin_deleted_by' => 'Deleted By',
+    'recycle_bin_deleted_at' => 'Deletion Time',
+    'recycle_bin_permanently_delete' => 'Permanently Delete',
+    'recycle_bin_restore' => 'Restore',
+    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
+    'recycle_bin_empty' => 'Empty Recycle Bin',
+    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_list' => 'Items to be Destroyed',
+    'recycle_bin_restore_list' => 'Items to be Restored',
+    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
+    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_parent' => 'Restore Parent',
+    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
+    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+
+    // Audit Log
+    'audit' => 'Audit Log',
+    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_event_filter' => 'Event Filter',
+    'audit_event_filter_no_filter' => 'No Filter',
+    'audit_deleted_item' => 'Deleted Item',
+    'audit_deleted_item_name' => 'Name: :name',
+    'audit_table_user' => 'User',
+    'audit_table_event' => 'Event',
+    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_ip' => 'IP Address',
+    'audit_table_date' => 'Activity Date',
+    'audit_date_from' => 'Date Range From',
+    'audit_date_to' => 'Date Range To',
+
+    // Role Settings
+    'roles' => 'Roles',
+    'role_user_roles' => 'User Roles',
+    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_assigned_users' => 'Assigned Users',
+    'roles_permissions_provided' => 'Provided Permissions',
+    'role_create' => 'Create New Role',
+    'role_delete' => 'Delete Role',
+    'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.',
+    'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.',
+    'role_delete_no_migration' => "Don't migrate users",
+    'role_delete_sure' => 'Are you sure you want to delete this role?',
+    'role_edit' => 'Edit Role',
+    'role_details' => 'Role Details',
+    'role_name' => 'Role Name',
+    'role_desc' => 'Short Description of Role',
+    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_external_auth_id' => 'External Authentication IDs',
+    'role_system' => 'System Permissions',
+    'role_manage_users' => 'Manage users',
+    'role_manage_roles' => 'Manage roles & role permissions',
+    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
+    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
+    'role_manage_page_templates' => 'Manage page templates',
+    'role_access_api' => 'Access system API',
+    'role_manage_settings' => 'Manage app settings',
+    'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
+    'role_editor_change' => 'Change page editor',
+    'role_notifications' => 'Receive & manage notifications',
+    'role_asset' => 'Asset Permissions',
+    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
+    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
+    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_all' => 'All',
+    'role_own' => 'Own',
+    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_save' => 'Save Role',
+    'role_users' => 'Users in this role',
+    'role_users_none' => 'No users are currently assigned to this role',
+
+    // Users
+    'users' => 'Users',
+    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'user_profile' => 'User Profile',
+    'users_add_new' => 'Add New User',
+    'users_search' => 'Search Users',
+    'users_latest_activity' => 'Latest Activity',
+    'users_details' => 'User Details',
+    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
+    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
+    'users_role' => 'User Roles',
+    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
+    'users_password' => 'User Password',
+    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
+    'users_send_invite_option' => 'Send user invite email',
+    'users_external_auth_id' => 'External Authentication ID',
+    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_delete' => 'Delete User',
+    'users_delete_named' => 'Delete user :userName',
+    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
+    'users_delete_confirm' => 'Are you sure you want to delete this user?',
+    'users_migrate_ownership' => 'Migrate Ownership',
+    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_none_selected' => 'No user selected',
+    'users_edit' => 'Edit User',
+    'users_edit_profile' => 'Edit Profile',
+    'users_avatar' => 'User Avatar',
+    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
+    'users_preferred_language' => 'Preferred Language',
+    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
+    'users_social_accounts' => 'Social Accounts',
+    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
+    'users_social_connect' => 'Connect Account',
+    'users_social_disconnect' => 'Disconnect Account',
+    'users_social_status_connected' => 'Connected',
+    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
+    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
+    'users_api_tokens' => 'API Tokens',
+    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_none' => 'No API tokens have been created for this user',
+    'users_api_tokens_create' => 'Create Token',
+    'users_api_tokens_expires' => 'Expires',
+    'users_api_tokens_docs' => 'API Documentation',
+    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_configure' => 'Configure Methods',
+
+    // API Tokens
+    'user_api_token_create' => 'Create API Token',
+    'user_api_token_name' => 'Name',
+    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_expiry' => 'Expiry Date',
+    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
+    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token' => 'API Token',
+    'user_api_token_id' => 'Token ID',
+    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
+    'user_api_token_secret' => 'Token Secret',
+    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_created' => 'Token created :timeAgo',
+    'user_api_token_updated' => 'Token updated :timeAgo',
+    'user_api_token_delete' => 'Delete Token',
+    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
+    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
+    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_create' => 'Create New Webhook',
+    'webhooks_none_created' => 'No webhooks have yet been created.',
+    'webhooks_edit' => 'Edit Webhook',
+    'webhooks_save' => 'Save Webhook',
+    'webhooks_details' => 'Webhook Details',
+    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_events' => 'Webhook Events',
+    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
+    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_events_all' => 'All system events',
+    'webhooks_name' => 'Webhook Name',
+    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
+    'webhooks_endpoint' => 'Webhook Endpoint',
+    'webhooks_active' => 'Webhook Active',
+    'webhook_events_table_header' => 'Events',
+    'webhooks_delete' => 'Delete Webhook',
+    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
+    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
+    'webhooks_format_example' => 'Webhook Format Example',
+    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_status' => 'Webhook Status',
+    'webhooks_last_called' => 'Last Called:',
+    'webhooks_last_errored' => 'Last Errored:',
+    'webhooks_last_error_message' => 'Last Error Message:',
+
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/bn/validation.php b/lang/bn/validation.php
new file mode 100644
index 00000000000..d9b982d1e23
--- /dev/null
+++ b/lang/bn/validation.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values',
+    'file'                 => 'The :attribute must be provided as a valid file.',
+    'filled'               => 'The :attribute field is required.',
+    'gt'                   => [
+        'numeric' => 'The :attribute must be greater than :value.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
+    ],
+    'gte'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
+    ],
+    'exists'               => 'The selected :attribute is invalid.',
+    'image'                => 'The :attribute must be an image.',
+    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
+    ],
+    'lte'                  => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
+    ],
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'safe_url'             => 'The provided link may not be safe.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'totp'                 => 'The provided code is not valid or has expired.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'Password confirmation required',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/bs/activities.php b/lang/bs/activities.php
index ee538c23a47..fc63058ae12 100644
--- a/lang/bs/activities.php
+++ b/lang/bs/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'deleted webhook',
     'webhook_delete_notification' => 'Webhook successfully deleted',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/bs/editor.php b/lang/bs/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/bs/editor.php
+++ b/lang/bs/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index 1b59ecac875..fc6e19ddd8a 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF fajl',
     'export_text' => 'Plain Text fajl',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Dozvole',
diff --git a/lang/bs/errors.php b/lang/bs/errors.php
index be633b5894b..f60f92f0782 100644
--- a/lang/bs/errors.php
+++ b/lang/bs/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName trenutno nije u funkciji',
     'back_soon' => 'Biti će uskoro u funkciji.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Na zahtjevu nije pronađen token za autorizaciju',
     'api_bad_authorization_format' => 'Token za autorizaciju je pronađen u zahtjevu ali je format neispravan',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index 5427cb9419e..c0b6b692a57 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/lang/bs/validation.php b/lang/bs/validation.php
index b07df9178fc..4b026afd2dc 100644
--- a/lang/bs/validation.php
+++ b/lang/bs/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Format :attribute je neispravan.',
     'uploaded'             => 'Fajl nije učitan. Server ne prihvata fajlove ove veličine.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index c288384826c..8835676644b 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'ha suprimit el webhook',
     'webhook_delete_notification' => 'S’ha suprimit el webhook',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'ha creat l’usuari',
     'user_create_notification' => 'S’ha creat l’usuari',
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index 7a09986a2f2..cdd80c245d2 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Quant a l’Editor',
     'about_title' => 'Quant a l’Editor WYSIWYG',
     'editor_license' => 'Llicència i copyright de l’Editor',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Aquest editor s’ha creat amb :tinyLink que es proporciona amb la llicència MIT.',
     'editor_tiny_license_link' => 'Detalls de la llicència i el copyright de TinyMCE.',
     'save_continue' => 'Desa la pàgina i continua',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index 0f241d9f24d..ef2a4c2a8c4 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Fitxer PDF',
     'export_text' => 'Fitxer de text sense format',
     'export_md' => 'Fitxer Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 03a07bb335b..76fb293dab6 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName està fora de servei.',
     'back_soon' => 'Aviat ho arreglarem.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No s’ha trobat cap testimoni d’autorització en aquesta sol·licitud.',
     'api_bad_authorization_format' => 'S’ha trobat un testimoni d’autorització en aquesta sol·licitud però no tenia el format correcte.',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 46f92571e95..2390a7962b8 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Accés a l’API del sistema',
     'role_manage_settings' => 'Gestió de la configuració de l’aplicació',
     'role_export_content' => 'Exportació de contingut',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Canvi de l’editor de pàgina',
     'role_notifications' => 'Recepció i gestió de notificacions',
     'role_asset' => 'Permisos de recursos',
diff --git a/lang/ca/validation.php b/lang/ca/validation.php
index dc9b02d5024..e33ae336f20 100644
--- a/lang/ca/validation.php
+++ b/lang/ca/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'El format :attribute no és vàlid.',
     'uploaded'             => 'No s’ha pogut pujar el fitxer. És possible que el servidor no admeti fitxers d’aquesta mida.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index 412bf9d3be3..3b4a05213ba 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'odstranil/a webhook',
     'webhook_delete_notification' => 'Webhook byl úspěšně odstraněn',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'vytvořil uživatele',
     'user_create_notification' => 'Uživatel byl úspěšně vytvořen',
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index f4c442af8b7..8e7001c081c 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -163,6 +163,8 @@
     'about' => 'O editoru',
     'about_title' => 'O WYSIWYG editoru',
     'editor_license' => 'Editor licence a autorská práva',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Tento editor je vytvořen pomocí :tinyLink, který je poskytován pod licencí MIT.',
     'editor_tiny_license_link' => 'Podrobnosti o autorských právech a licenci TinyMCE naleznete zde.',
     'save_continue' => 'Uložit stránku a pokračovat',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 77fb8a3fb95..a87ba49d044 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF dokument',
     'export_text' => 'Textový soubor',
     'export_md' => 'Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Výchozí šablona stránky',
     'default_template_explain' => 'Přiřadit šablonu stránky, která bude použita jako výchozí obsah pro všechny nové stránky v této knize. Mějte na paměti, že šablona bude použita pouze v případě, že tvůrce stránek bude mít přístup k těmto vybraným stránkám šablony.',
     'default_template_select' => 'Vyberte šablonu stránky',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnění',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index e23f1032b7d..c740ee193e7 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName je momentálně vypnutá',
     'back_soon' => 'Brzy bude opět v provozu.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'V požadavku nebyl nalezen žádný autorizační token',
     'api_bad_authorization_format' => 'V požadavku byl nalezen autorizační token, ale jeho formát se zdá být chybný',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 01ea3a1db5a..67d7d825a5e 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Přístup k systémovému API',
     'role_manage_settings' => 'Správa nastavení aplikace',
     'role_export_content' => 'Exportovat obsah',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Změnit editor stránek',
     'role_notifications' => 'Přijímat a spravovat oznámení',
     'role_asset' => 'Obsahová oprávnění',
diff --git a/lang/cs/validation.php b/lang/cs/validation.php
index 83929cc887b..f2ee59e5be0 100644
--- a/lang/cs/validation.php
+++ b/lang/cs/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Formát :attribute je neplatný.',
     'uploaded'             => 'Nahrávání :attribute se nezdařilo.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index b7f1cadf323..e5dcddc56e1 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook wedi\'i dileu',
     'webhook_delete_notification' => 'Webhook wedi\'i dileu\'n llwyddiannus',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'creodd ddefnyddiwr',
     'user_create_notification' => 'Defnyddiwr wedi\'i greu\'n llwyddiannus',
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index c99a9bb00ea..a10fc7d0be4 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Ynglŷn â\'r golygydd',
     'about_title' => 'Ynglŷn â\'r Golygydd WYSIWYG',
     'editor_license' => 'Trwydded a Hawlfraint Golygydd',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Mae\'r golygydd hwn wedi\'i adeiladu gan ddefnyddio :tinyLink sy\'n cael ei ddarparu o dan y drwydded MIT.',
     'editor_tiny_license_link' => 'Gellir dod o hyd i fanylion hawlfraint a thrwydded TinyMCE yma.',
     'save_continue' => 'Cadw Tudalen a Pharhau',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index 1293231d0fb..d153ba453bf 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Ffeil PDF',
     'export_text' => 'Ffeil Testun Plaen',
     'export_md' => 'Ffeil Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Templed Tudalen Diofyn',
     'default_template_explain' => 'Clustnodwch dempled tudalen a fydd yn cael ei ddefnyddio fel y cynnwys diofyn ar gyfer pob tudalen a grëwyd yn yr eitem hon. Cofiwch y bydd hwn ond yn cael ei ddefnyddio os yw’r sawl a grëodd y dudalen â mynediad gweld i’r dudalen dempled a ddewiswyd.',
     'default_template_select' => 'Dewiswch dudalen templed',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Caniatâd',
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index b6868c5cefe..4fe90a0c1dc 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -105,6 +105,18 @@
     'app_down' => 'Mae :appName i lawr ar hyn o bryd',
     'back_soon' => 'Bydd yn ôl i fyny yn fuan.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Ni chanfuwyd tocyn awdurdodi ar y cais',
     'api_bad_authorization_format' => 'Canfuwyd tocyn awdurdodi ar y cais ond roedd yn ymddangos bod y fformat yn anghywir',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index 3b0fa5ed604..92b2d65d968 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Mynediad i Ryngwyneb Rhaglennu Cymwysiadau (API) system',
     'role_manage_settings' => 'Rheoli gosodiadau apiau',
     'role_export_content' => 'Cynnwys allforio',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Newid golygydd tudalen',
     'role_notifications' => 'Derbyn a rheoli hysbysiadau',
     'role_asset' => 'Caniatâd Asedau',
diff --git a/lang/cy/validation.php b/lang/cy/validation.php
index 00664184174..fd3483ddc4c 100644
--- a/lang/cy/validation.php
+++ b/lang/cy/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Mae’r fformat :attribute yn annilys.',
     'uploaded'             => 'Nid oedd modd uwchlwytho’r ffeil. Efallai na fydd y gweinydd yn derbyn ffeiliau o\'r maint hwn.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/da/activities.php b/lang/da/activities.php
index e92d1c165a5..f6053318f27 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'slettede webhooken',
     'webhook_delete_notification' => 'Webhooken blev slettet',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'opret bruger',
     'user_create_notification' => 'Bruger oprettet korrekt',
diff --git a/lang/da/editor.php b/lang/da/editor.php
index 973c8a90266..054c4262794 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Gem og fortsæt',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index 47d2f1568d5..eca5f1f0296 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Almindelig tekstfil',
     'export_md' => 'Markdown Fil',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Rettigheder',
diff --git a/lang/da/errors.php b/lang/da/errors.php
index afa7b5824d7..f12dbab57c8 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName er nede lige nu',
     'back_soon' => 'Den er oppe igen snart.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Der blev ikke fundet nogen autorisationstoken på anmodningen',
     'api_bad_authorization_format' => 'En autorisationstoken blev fundet på anmodningen, men formatet var forkert',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index fa802af16f0..36ab18d3082 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Tilgå system-API',
     'role_manage_settings' => 'Administrer app-indstillinger',
     'role_export_content' => 'Eksporter indhold',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Skift side editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Tilladelser for medier og "assets"',
diff --git a/lang/da/validation.php b/lang/da/validation.php
index 022839dc693..b09b621b23b 100644
--- a/lang/da/validation.php
+++ b/lang/da/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute-formatet er ugyldigt.',
     'uploaded'             => 'Filen kunne ikke oploades. Serveren accepterer muligvis ikke filer af denne størrelse.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/de/activities.php b/lang/de/activities.php
index 5099209475e..79e05fbaf3d 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'löschte Webhook',
     'webhook_delete_notification' => 'Webhook erfolgreich gelöscht',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'hat Benutzer erzeugt:',
     'user_create_notification' => 'Benutzer erfolgreich erstellt',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index e6b2400692a..ab19d167e62 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Über den Editor',
     'about_title' => 'Über den WYSIWYG-Editor',
     'editor_license' => 'Editorlizenz & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Dieser Editor wurde mithilfe von :tinyLink erstellt, der unter der MIT-Lizenz bereitgestellt wird.',
     'editor_tiny_license_link' => 'Die Copyright- und Lizenzdetails von TinyMCE finden Sie hier.',
     'save_continue' => 'Speichern & Fortfahren',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 6c67d9830dc..b3e1b38f9fe 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-Datei',
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Standard Seitenvorlage',
     'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
     'default_template_select' => 'Wählen Sie eine Seitenvorlage',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index 7d6e09935aa..f940f67436b 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName befindet sich aktuell im Wartungsmodus',
     'back_soon' => 'Wir werden so schnell wie möglich wieder online sein.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Kein Autorisierungstoken für die Anfrage gefunden',
     'api_bad_authorization_format' => 'Ein Autorisierungstoken wurde auf die Anfrage gefunden, aber das Format schien falsch zu sein',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 60fc2591469..c1e4bcdd92f 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -163,6 +163,7 @@
     'role_access_api' => 'Systemzugriffs-API',
     'role_manage_settings' => 'Globaleinstellungen verwalten',
     'role_export_content' => 'Inhalt exportieren',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Seiten-Editor ändern',
     'role_notifications' => 'Empfangen und Verwalten von Benachrichtigungen',
     'role_asset' => 'Berechtigungen',
diff --git a/lang/de/validation.php b/lang/de/validation.php
index 1ca1f458e18..072bf79d1ec 100644
--- a/lang/de/validation.php
+++ b/lang/de/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute ist kein valides Format.',
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index 6783b42a5f1..94a0b2b1d5c 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'gelöschter Webhook',
     'webhook_delete_notification' => 'Webhook erfolgreich gelöscht',
 
+    // Imports
+    'import_create' => 'erstellter Import',
+    'import_create_notification' => 'Import erfolgreich hochgeladen',
+    'import_run' => 'aktualisierter Import',
+    'import_run_notification' => 'Inhalt erfolgreich importiert',
+    'import_delete' => 'gelöschter Import',
+    'import_delete_notification' => 'Import erfolgreich gelöscht',
+
     // Users
     'user_create' => 'hat Benutzer erzeugt:',
     'user_create_notification' => 'Benutzer erfolgreich erstellt',
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index e033b63d22e..bc33b8535a6 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Allgemeine Geschäftsbedingungen',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Suche :appName',
 ];
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 1956715d189..81f5eab9e64 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Über den Editor',
     'about_title' => 'Über den WYSIWYG Editor',
     'editor_license' => 'Editorlizenz & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Dieser Editor wurde mit :tinyLink erstellt, das unter der MIT-Lizenz zur Verfügung gestellt wird.',
     'editor_tiny_license_link' => 'Die Copyright- und Lizenzdetails von TinyMCE findest du hier.',
     'save_continue' => 'Seite speichern & fortfahren',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index e8a69167243..4283fb8cb0d 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-Datei',
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Standard Seitenvorlage',
     'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
     'default_template_select' => 'Wähle eine Seitenvorlage',
+    'import' => 'Importieren',
+    'import_validate' => 'Import validieren',
+    'import_desc' => 'Importiere Bücher, Kapitel & Seiten mit einem ZIP-Export von der gleichen oder einer anderen Instanz. Wähle eine ZIP-Datei, um fortzufahren. Nachdem die Datei hochgeladen und bestätigt wurde, kannst Du den Import in der nächsten Ansicht konfigurieren und bestätigen.',
+    'import_zip_select' => 'ZIP-Datei zum Hochladen auswählen',
+    'import_zip_validation_errors' => 'Fehler bei der Validierung der angegebenen ZIP-Datei:',
+    'import_pending' => 'Ausstehende Importe',
+    'import_pending_none' => 'Es wurden keine Importe gestartet.',
+    'import_continue' => 'Import fortsetzen',
+    'import_continue_desc' => 'Überprüfe den Inhalt, der aus der hochgeladenen ZIP-Datei importiert werden soll. Führe den Import aus, um dessen Inhalt zu diesem System hinzuzufügen. Die hochgeladene ZIP-Importdatei wird bei erfolgreichem Import automatisch gelöscht.',
+    'import_details' => 'Importdetails',
+    'import_run' => 'Import ausführen',
+    'import_size' => 'Größe des importierten ZIP: :size',
+    'import_uploaded_at' => 'Hochgeladen :relativeTime',
+    'import_uploaded_by' => 'Hochgeladen von',
+    'import_location' => 'Import Zielort',
+    'import_location_desc' => 'Wähle einen Zielort für deinen importierten Inhalt. Du benötigst die entsprechenden Berechtigungen, um innerhalb des gewünschten Zielortes Inhalte zu erstellen.',
+    'import_delete_confirm' => 'Bist Du sicher, dass Du diesen Import löschen möchtest?',
+    'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
+    'import_errors' => 'Importfehler',
+    'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
@@ -224,8 +245,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Sauberer Inhalt)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG Editor wechseln',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Wechsel zum neuen WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testphase)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index dcfa6a2ffaf..856f02b48c7 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kannst den einzigen Administrator nicht löschen.',
     'users_cannot_delete_guest' => 'Du kannst den Gast-Benutzer nicht löschen',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Benutzer konnte nicht erstellt werden, da die Einladungs-E-Mail nicht gesendet werden konnte',
 
     // Roles
     'role_cannot_be_edited' => 'Diese Rolle kann nicht bearbeitet werden.',
@@ -105,6 +105,18 @@
     'app_down' => ':appName befindet sich aktuell im Wartungsmodus.',
     'back_soon' => 'Wir werden so schnell wie möglich wieder online sein.',
 
+    // Import
+    'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
+    'import_zip_cant_decode_data' => 'Konnte Inhalt der data.json im ZIP nicht finden und dekodieren.',
+    'import_zip_no_data' => 'ZIP-Datei hat kein erwartetes Buch, Kapitel oder Seiteninhalt.',
+    'import_validation_failed' => 'ZIP Import konnte aufgrund folgender Fehler nicht validiert werden:',
+    'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
+    'import_perms_books' => 'Dir fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
+    'import_perms_chapters' => 'Dir fehlt die erforderliche Berechtigung, um Kapitel zu erstellen.',
+    'import_perms_pages' => 'Dir fehlt die erforderliche Berechtigung, um Seiten zu erstellen.',
+    'import_perms_images' => 'Dir fehlt die erforderliche Berechtigung, um Bilder zu erstellen.',
+    'import_perms_attachments' => 'Dir fehlt die erforderliche Berechtigung, um Anhänge zu erstellen.',
+
     // API errors
     'api_no_authorization_found' => 'Kein Autorisierungs-Token für die Anfrage gefunden',
     'api_bad_authorization_format' => 'Ein Autorisierungs-Token wurde auf die Anfrage gefunden, aber das Format schien falsch zu sein',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 2eddefd4ad5..549aba11442 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -163,6 +163,7 @@
     'role_access_api' => 'Systemzugriffs-API',
     'role_manage_settings' => 'Globaleinstellungen verwalten',
     'role_export_content' => 'Inhalt exportieren',
+    'role_import_content' => 'Inhalt importieren',
     'role_editor_change' => 'Seiteneditor ändern',
     'role_notifications' => 'Empfangen und Verwalten von Benachrichtigungen',
     'role_asset' => 'Berechtigungen',
diff --git a/lang/de_informal/validation.php b/lang/de_informal/validation.php
index 61cd7409b4e..0d26dfd298a 100644
--- a/lang/de_informal/validation.php
+++ b/lang/de_informal/validation.php
@@ -75,7 +75,7 @@
     ],
     'mimes'                => ':attribute muss eine Datei vom Typ: :values sein.',
     'min'                  => [
-        'numeric' => ':attribute muss mindestens :min sein',
+        'numeric' => ':attribute muss mindestens :min sein.',
         'file'    => ':attribute muss mindestens :min Kilobyte groß sein.',
         'string'  => ':attribute muss mindestens :min Zeichen lang sein.',
         'array'   => ':attribute muss mindesten :min Elemente enthalten.',
@@ -105,6 +105,11 @@
     'url'                  => ':attribute ist kein valides Format.',
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
+    'zip_file' => ':attribute muss auf eine Datei innerhalb des ZIP verweisen.',
+    'zip_file_mime' => ':attribute muss auf eine Datei des Typs :validType verweisen, gefunden :foundType.',
+    'zip_model_expected' => 'Datenobjekt erwartet, aber ":type" gefunden.',
+    'zip_unique' => ':attribute muss für den Objekttyp innerhalb des ZIP eindeutig sein.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/el/activities.php b/lang/el/activities.php
index 50bd7bb2ebe..6eb85746402 100644
--- a/lang/el/activities.php
+++ b/lang/el/activities.php
@@ -14,7 +14,7 @@
     'page_delete_notification'    => 'Η σελίδα διαγράφηκε επιτυχώς',
     'page_restore'                => 'αποκατεστημένη σελίδα',
     'page_restore_notification'   => 'Η σελίδα αποκαταστάθηκε με επιτυχία',
-    'page_move'                   => 'Η σελίδα μετακινήθηκε',
+    'page_move'                   => 'σελίδα που μετακινήθηκε',
     'page_move_notification'      => 'Η σελίδα μετακινήθηκε με επιτυχία',
 
     // Chapters
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '":name" προστέθηκε στα αγαπημένα σας',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Οι προτιμήσεις παρακολούθησης ενημερώθηκαν επιτυχώς',
 
     // Auth
     'auth_login' => 'συνδεδεμένος',
@@ -84,6 +84,14 @@
     'webhook_delete' => 'διαγραμμένο webhook',
     'webhook_delete_notification' => 'Το Webhook διαγράφηκε επιτυχώς',
 
+    // Imports
+    'import_create' => 'δημιουργημένη εισαγωγή',
+    'import_create_notification' => 'Το εισαγόμενο αρχείο μεταφορτώθηκε επιτυχώς',
+    'import_run' => 'ενημερωμένη εισαγωγή',
+    'import_run_notification' => 'Το περιεχόμενο εισήχθη επιτυχώς',
+    'import_delete' => 'διαγραμμένη εισαγωγή',
+    'import_delete_notification' => 'Η εισαγωγή διαγράφηκε επιτυχώς',
+
     // Users
     'user_create' => 'δημιουργημένος χρήστης',
     'user_create_notification' => 'Ο χρήστης δημιουργήθηκε με επιτυχία',
@@ -105,19 +113,19 @@
     'role_create_notification' => 'Ο Ρόλος δημιουργήθηκε με επιτυχία',
     'role_update' => 'Ενημέρωση ρόλου',
     'role_update_notification' => 'Ο Ρόλος ενημερώθηκε με επιτυχία',
-    'role_delete' => 'deleted role',
+    'role_delete' => 'διαγραμμένος ρόλος',
     'role_delete_notification' => 'Ο Ρόλος διαγράφηκε επιτυχώς',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'αδειασμένος κάδος ανακύκλωσης',
+    'recycle_bin_restore' => 'αποκαταστάθηκε από τον κάδο ανακύκλωσης',
+    'recycle_bin_destroy' => 'αφαιρέθηκε από τον κάδο ανακύκλωσης',
 
     // Comments
     'commented_on'                => 'σχολίασε',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'προστέθηκε σχόλιο',
+    'comment_update'              => 'ενημερώθηκε σχόλιο',
+    'comment_delete'              => 'διαγράφηκε σχόλιο',
 
     // Other
     'permissions_update'          => 'ενημερωμένα δικαιώματα',
diff --git a/lang/el/auth.php b/lang/el/auth.php
index 183baab7a02..0b94ef859dd 100644
--- a/lang/el/auth.php
+++ b/lang/el/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Εφαρμογή για κινητό',
     'mfa_option_totp_desc' => 'Για να χρησιμοποιήσετε τον έλεγχο ταυτότητας πολλαπλών παραγόντων, θα χρειαστείτε μια εφαρμογή για κινητά που υποστηρίζει TOTP, όπως το Google Authenticator, το Authy ή το Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Εφεδρικοί κωδικοί',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Δημιουργεί ένα σύνολο εφεδρικών κωδικών μίας χρήσης τους οποίους θα εισάγετε κατά τη σύνδεση σας, για να πιστοποιήσετε την ταυτότητά σας. Φροντίστε να τους αποθηκεύσετε σε ασφαλές σημείο.',
     'mfa_gen_confirm_and_enable' => 'Επιβεβαίωση και ενεργοποίηση',
     'mfa_gen_backup_codes_title' => 'Ρύθμιση εφεδρικών κωδικών',
     'mfa_gen_backup_codes_desc' => 'Αποθηκεύστε την παρακάτω λίστα κωδικών σε ασφαλές μέρος. Κατά την πρόσβαση στο σύστημα, θα μπορείτε να χρησιμοποιήσετε έναν από τους κωδικούς ως δεύτερο μηχανισμό ελέγχου ταυτότητας.',
diff --git a/lang/el/common.php b/lang/el/common.php
index d1b6bd9f790..112133883f3 100644
--- a/lang/el/common.php
+++ b/lang/el/common.php
@@ -6,7 +6,7 @@
 
     // Buttons
     'cancel' => 'Ακύρωση',
-    'close' => 'Close',
+    'close' => 'Κλείσιμο',
     'confirm' => 'Οκ',
     'back' => 'Πίσω',
     'save' => 'Αποθήκευση',
@@ -20,7 +20,7 @@
     'description' => 'Περιγραφή',
     'role' => 'Ρόλος',
     'cover_image' => 'Εικόνα εξώφυλλου',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Αυτή η εικόνα θα πρέπει να είναι περίπου 440x250px, αν και θα κλιμακωθεί και θα περικοπεί με ευελιξία ώστε να ταιριάζει στη διεπαφή χρήστη σε διαφορετικά σενάρια όπως απαιτείται, επομένως οι πραγματικές διαστάσεις για την εμφάνιση θα διαφέρουν.',
 
     // Actions
     'actions' => 'Ενέργειες',
@@ -42,7 +42,7 @@
     'remove' => 'Αφαίρεση',
     'add' => 'Προσθήκη',
     'configure' => 'Διαμόρφωση',
-    'manage' => 'Manage',
+    'manage' => 'Διαχείριση',
     'fullscreen' => 'Πλήρης οθόνη',
     'favourite' => 'Αγαπημένα',
     'unfavourite' => 'Αφαίρεση από Αγαπημένα',
@@ -52,7 +52,7 @@
     'filter_clear' => 'Διαγραφή φίλτρου',
     'download' => 'Λήψη',
     'open_in_tab' => 'Άνοιγμα σε Καρτέλα',
-    'open' => 'Open',
+    'open' => 'Άνοιγμα',
 
     // Sort Options
     'sort_options' => 'Επιλογές ταξινόμησης',
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Όροι χρήσης',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Αναζήτηση :appName',
 ];
diff --git a/lang/el/components.php b/lang/el/components.php
index b54a48601e3..9c9d3e8f839 100644
--- a/lang/el/components.php
+++ b/lang/el/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'Επιλογή εικόνας',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'Κατάλογος εικόνων',
+    'image_details' => 'Λεπτομέρειες εικόνας',
+    'image_upload' => 'Μεταφόρτωση εικόνας',
+    'image_intro' => 'Εδώ μπορείτε να επιλέξετε και να διαχειριστείτε εικόνες που έχουν προηγουμένως μεταφορτωθεί στο σύστημα.',
+    'image_intro_upload' => 'Μεταφορτώστε μια νέα εικόνα σύροντας ένα αρχείο εικόνας σε αυτό το παράθυρο ή χρησιμοποιώντας το κουμπί "Μεταφόρτωση εικόνας" παραπάνω.',
     'image_all' => 'Όλες',
     'image_all_title' => 'Δείτε όλες τις εικόνες που υπάρχουν στο Server',
     'image_book_title' => 'Προβολή εικόνων που έχουν μεταφορτωθεί σε αυτό το βιβλίο',
     'image_page_title' => 'Προβολή εικόνων που έχουν δημοσιευτεί σε αυτήν τη σελίδα',
     'image_search_hint' => 'Αναζήτηση με όνομα εικόνας',
     'image_uploaded' => 'Μεταφορτώθηκε :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'Μεταφορτώθηκε από :userName',
+    'image_uploaded_to' => 'Μεταφορτώθηκε στο :pageLink',
+    'image_updated' => 'Ενημερώθηκε :updateDate',
     'image_load_more' => 'Φόρτωσε περισσότερα',
     'image_image_name' => 'Όνομα εικόνας',
     'image_delete_used' => 'Αυτή η εικόνα χρησιμοποιείται στις παρακάτω σελίδες.',
     'image_delete_confirm_text' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την εικόνα;',
     'image_select_image' => 'Επιλέξτε Εικόνα',
     'image_dropzone' => 'Σύρτε ή κάντε κλικ εδώ για μεταφόρτωση εικόνων',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'Απόθεση εικόνων εδώ για μεταφόρτωση',
     'images_deleted' => 'Οι εικόνες διαγράφηκαν',
     'image_preview' => 'Προεπισκόπηση εικόνας',
     'image_upload_success' => 'Η εικόνα μεταφορτώθηκε με επιτυχία',
     'image_update_success' => 'Τα στοιχεία της εικόνας ενημερώθηκαν με επιτυχία',
     'image_delete_success' => 'Η εικόνα διαγράφηκε επιτυχώς',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'Αντικατάσταση εικόνας',
+    'image_replace_success' => 'Το αρχείο εικόνας ενημερώθηκε επιτυχώς',
+    'image_rebuild_thumbs' => 'Επαναδημιουργία παραλλαγών μεγέθους',
+    'image_rebuild_thumbs_success' => 'Οι παραλλαγές μεγέθους εικόνας ανακατασκευάστηκαν επιτυχώς!',
 
     // Code Editor
     'code_editor' => 'Επεξεργασία κώδικα',
diff --git a/lang/el/editor.php b/lang/el/editor.php
index 0d801e82182..f6c67b879e6 100644
--- a/lang/el/editor.php
+++ b/lang/el/editor.php
@@ -33,7 +33,7 @@
     'header_small' => 'Μικρή κεφαλίδα',
     'header_tiny' => 'Μικροσκοπική κεφαλίδα',
     'paragraph' => 'Παράγραφος',
-    'blockquote' => 'Blockquote',
+    'blockquote' => 'Μπλοκ κειμένου παράθεσης',
     'inline_code' => 'Ενσωματωμένος κωδικός',
     'callouts' => 'Επεξηγήσεις',
     'callout_information' => 'Πληροφορίες',
@@ -57,7 +57,7 @@
     'list_bullet' => 'Λίστα με κουκκίδες',
     'list_numbered' => 'Λίστα με αρίθμηση',
     'list_task' => 'Λίστα εργασιών',
-    'indent_increase' => 'Αύξηση εσοχήςt',
+    'indent_increase' => 'Αύξηση Εσοχής',
     'indent_decrease' => 'Μείωση εσοχής',
     'table' => 'Πίνακας',
     'insert_image' => 'Εισαγωγή εικόνας',
@@ -81,9 +81,9 @@
     'table_properties' => 'Ιδιότητες πίνακα',
     'table_properties_title' => 'Ιδιότητες πίνακα',
     'delete_table' => 'Διαγραφή πίνακα',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Εκκαθάριση μορφοποίησης πίνακα',
+    'resize_to_contents' => 'Αλλαγή μεγέθους σε περιεχόμενο',
+    'row_header' => 'Κεφαλίδα γραμμής',
     'insert_row_before' => 'Εισαγωγή γραμμής πάνω',
     'insert_row_after' => 'Εισαγωγή γραμμής κάτω',
     'delete_row' => 'Διαγραφή γραμμής',
@@ -163,6 +163,8 @@
     'about' => 'Σχετικά',
     'about_title' => 'Σχετικά με τον επεξεργαστή WYSIWYG',
     'editor_license' => 'Άδεια εκδότη και πνευματικά δικαιώματα',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Αυτός ο επεξεργαστής έχει δημιουργηθεί χρησιμοποιώντας :tinyLink που παρέχεται με την άδεια MIT.',
     'editor_tiny_license_link' => 'Τα πνευματικά δικαιώματα και τα στοιχεία άδειας χρήσης του TinyMCE μπορείτε να τα βρείτε εδώ.',
     'save_continue' => 'Αποθήκευση σελίδας & Συνέχεια',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index d127a77c222..d74c7de0598 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Αρχείο PDF',
     'export_text' => 'Αρχείο Απλού κειμένου',
     'export_md' => 'Αρχείο Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Δικαιώματα',
diff --git a/lang/el/errors.php b/lang/el/errors.php
index 1d57fe4a174..cdfa2155f13 100644
--- a/lang/el/errors.php
+++ b/lang/el/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName είναι προσωρινά μη διαθέσιμη',
     'back_soon' => 'Θα υπάρξει σύντομα υποστήριξη.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Δεν βρέθηκε διακριτικό εξουσιοδότησης κατόπιν αιτήματος',
     'api_bad_authorization_format' => 'Ένα διακριτικό εξουσιοδότησης βρέθηκε κατόπιν αιτήματος, αλλά η μορφή εμφανίστηκε εσφαλμένη',
diff --git a/lang/el/notifications.php b/lang/el/notifications.php
index 1afd23f1dc4..3924cab3b5c 100644
--- a/lang/el/notifications.php
+++ b/lang/el/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Νέο σχόλιο στη σελίδα: :pageName',
+    'new_comment_intro' => 'Ένας χρήστης έχει σχολιάσει σε μια σελίδα στο :appName:',
+    'new_page_subject' => 'Νέα σελίδα: :pageName',
+    'new_page_intro' => 'Μια νέα σελίδα έχει δημιουργηθεί στο :appName:',
+    'updated_page_subject' => 'Ενημερωμένη σελίδα: :pageName',
+    'updated_page_intro' => 'Μια σελίδα έχει ενημερωθεί στο :appName:',
+    'updated_page_debounce' => 'Για να αποτρέψετε μαζικές ειδοποιήσεις, για κάποιο διάστημα δε θα σας αποστέλλονται ειδοποιήσεις για περαιτέρω αλλαγές σε αυτήν τη σελίδα από τον ίδιο συντάκτη.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Όνομα σελίδας:',
+    'detail_page_path' => 'Διαδρομή σελίδας:',
+    'detail_commenter' => 'Σχολιαστής:',
+    'detail_comment' => 'Σχόλιο:',
+    'detail_created_by' => 'Δημιουργήθηκε από:',
+    'detail_updated_by' => 'Ενημερώθηκε από:',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => 'Προβολή σχολίου',
+    'action_view_page' => 'Προβολή σελίδας',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Αυτή η ειδοποίηση εστάλη σε εσάς επειδή το :link καλύπτει αυτόν τον τύπο δραστηριότητας για αυτό το αντικείμενο.',
+    'footer_reason_link' => 'προτιμήσεις σας για ειδοποιήσεις',
 ];
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 8c34fccba5d..243d1c2886c 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -109,7 +109,7 @@
     'recycle_bin_contents_empty' => 'Ο κάδος ανακύκλωσης είναι επί του παρόντος άδειος',
     'recycle_bin_empty' => 'Αδειάστε τον Κάδο Ανακύκλωσης',
     'recycle_bin_empty_confirm' => 'Αυτό θα καταστρέψει οριστικά όλα τα αντικείμενα στον κάδο ανακύκλωσης, συμπεριλαμβανομένου του περιεχομένου που περιέχεται σε κάθε αντικείμενο. Είστε βέβαιοι ότι θέλετε να αδειάσετε τον κάδο ανακύκλωσης;',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Αυτή η ενέργεια θα διαγράψει οριστικά από το σύστημα αυτό το στοιχείο μαζί με τυχόν θυγατρικά, που αναφέρονται παρακάτω. Μετά την επιβεβαίωση της διαγραφής δε θα μπορείτε να επαναφέρετε αυτό το περιεχόμενο. Είστε βέβαιοι ότι θέλετε να διαγράψετε οριστικά αυτό το στοιχείο;',
     'recycle_bin_destroy_list' => 'Αντικείμενα για καταστροφή',
     'recycle_bin_restore_list' => 'Αντικείμενα για επαναφορά',
     'recycle_bin_restore_confirm' => 'Αυτή η ενέργεια θα επαναφέρει το διαγραμμένο στοιχείο, συμπεριλαμβανομένων τυχόν θυγατρικών στοιχείων, στην αρχική τους θέση. Εάν η αρχική τοποθεσία έχει από τότε διαγραφεί και βρίσκεται τώρα στον κάδο ανακύκλωσης, θα πρέπει επίσης να αποκατασταθεί και το γονικό στοιχείο.',
@@ -162,8 +162,9 @@
     'role_access_api' => 'Πρόσβαση στο API του συστήματος',
     'role_manage_settings' => 'Διαχειριστείτε τις ρυθμίσεις του ΑΡΙ',
     'role_export_content' => 'Εξαγωγή περιεχομένου',
+    'role_import_content' => 'Εισαγωγή περιεχομένου',
     'role_editor_change' => 'Αλλαγή προγράμματος επεξεργασίας σελίδας',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => 'Λήψη & διαχείριση ειδοποιήσεων',
     'role_asset' => 'Δικαιώματα Συστήματος',
     'roles_system_warning' => 'Λάβετε υπόψη ότι η πρόσβαση σε οποιοδήποτε από τις τρεις παραπάνω άδειες (δικαιώματα) μπορεί να επιτρέψει σε έναν χρήστη να αλλάξει τα δικά του προνόμια ή τα προνόμια άλλων στο σύστημα. Εκχωρήστε ρόλους με αυτά τα δικαιώματα μόνο σε αξιόπιστους χρήστες.',
     'role_asset_desc' => 'Αυτά τα δικαιώματα ελέγχουν την προεπιλεγμένη πρόσβαση στα στοιχεία (άδειες) εντός του συστήματος. Τα δικαιώματα σε Βιβλία, Κεφάλαια και Σελίδες θα παρακάμψουν αυτές τις άδειες.',
@@ -193,8 +194,8 @@
     'users_send_invite_text' => 'Μπορείτε να επιλέξετε να στείλετε σε αυτόν τον χρήστη ένα email πρόσκλησης που του επιτρέπει να ορίσει τον δικό του κωδικό πρόσβασης. Σε διαφορετική περίπτωση μπορείτε να ορίσετε τον κωδικό πρόσβασής του εσείς.',
     'users_send_invite_option' => 'Αποστολή email πρόσκλησης σε χρήστη',
     'users_external_auth_id' => 'Εξωτερικός έλεγχος ταυτότητας',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Όταν χρησιμοποιείται ένα εξωτερικό σύστημα ελέγχου ταυτότητας (όπως SAML2, OIDC ή LDAP) αυτό είναι το αναγνωριστικό που συνδέει αυτόν τον χρήστη BookStack με τον λογαριασμό συστήματος ελέγχου ταυτότητας. Μπορείτε να αγνοήσετε αυτό το πεδίο αν χρησιμοποιείτε τον προεπιλεγμένο έλεγχο ταυτότητας μέσω email.',
+    'users_password_warning' => 'Συμπληρώστε τα παρακάτω μόνο αν θέλετε να αλλάξετε τον κωδικό πρόσβασης για αυτόν το χρήστη.',
     'users_system_public' => 'Αυτός ο χρήστης αντιπροσωπεύει οποιονδήποτε επισκέπτη που επισκέπτεται τη Βιβλιοθήκη σας. Δεν μπορεί να χρησιμοποιηθεί για τη σύνδεση αλλά εκχωρείται αυτόματα.',
     'users_delete' => 'Διαγραφή Χρήστη',
     'users_delete_named' => 'Διαγραφή χρήστη :userName',
@@ -210,16 +211,16 @@
     'users_preferred_language' => 'Προτιμώμενη γλώσσα',
     'users_preferred_language_desc' => 'Αυτή η επιλογή θα αλλάξει τη γλώσσα που χρησιμοποιείται για τη διεπαφή χρήστη της εφαρμογής. Αυτό δεν θα επηρεάσει οποιοδήποτε περιεχόμενο που δημιουργήθηκε από χρήστες.',
     'users_social_accounts' => 'Λογαριασμοί Κοινωνικής δικτύωσης ',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Δείτε την κατάσταση των συνδεδεμένων λογαριασμών κοινωνικών δικτύων για αυτόν το χρήστη. Οι λογαριασμοί κοινωνικών δικτύων, μπορούν να χρησιμοποιηθούν επιπλέον του κύριου συστήματος ελέγχου ταυτότητας, για πρόσβαση στο σύστημα.',
     'users_social_accounts_info' => 'Εδώ μπορείτε να συνδέσετε τους άλλους λογαριασμούς σας για ταχύτερη και ευκολότερη σύνδεση. Η αποσύνδεση ενός λογαριασμού εδώ δεν ανακαλεί προηγουμένως εξουσιοδοτημένη πρόσβαση. Ανάκληση πρόσβασης από τις ρυθμίσεις προφίλ σας στον συνδεδεμένο κοινωνικό λογαριασμό.',
     'users_social_connect' => 'Σύνδεση λογαριασμού',
     'users_social_disconnect' => 'Αποσύνδεση λογαριασμού',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Συνδεδεμένο',
+    'users_social_status_disconnected' => 'Αποσυνδεδεμένο',
     'users_social_connected' => ':socialΛογαριασμός λογαριασμού συνδέθηκε με επιτυχία στο προφίλ σας.',
     'users_social_disconnected' => ':socialΛογαριασμός αποσυνδέθηκε επιτυχώς από το προφίλ σας.',
     'users_api_tokens' => 'API Tokens',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'Δημιουργία και διαχείριση των διακριτικών πρόσβασης (token) που χρησιμοποιούνται για τον έλεγχο ταυτότητας με το REST API του BookStack. Τα δικαιώματα για το API τα διαχειρίζεται ο χρήστης στον οποίο ανήκει το διακριτικό (token).',
     'users_api_tokens_none' => 'Δεν έχουν δημιουργηθεί διακριτικά API για αυτόν το χρήστη',
     'users_api_tokens_create' => 'Δημιουργία διακριτικού  Api Token',
     'users_api_tokens_expires' => 'Λήγει',
@@ -277,13 +278,13 @@
     'webhooks_last_error_message' => 'Τελευταίο μήνυμα λάθους:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Άδειες',
+    'licenses_desc' => 'Αυτή η σελίδα αναφέρει λεπτομερώς τις πληροφορίες άδειας χρήσης για το BookStack επιπρόσθετα στα έργα και τις βιβλιοθήκες που χρησιμοποιούνται εντός του BookStack. Πολλά έργα που αναφέρονται μπορούν να χρησιμοποιηθούν μόνο σε ένα πλαίσιο ανάπτυξης.',
+    'licenses_bookstack' => 'Άδεια BookStack',
+    'licenses_php' => 'Άδειες Βιβλιοθήκης PHP',
+    'licenses_js' => 'Άδειες Βιβλιοθήκης JavaScript',
+    'licenses_other' => 'Άλλες άδειες',
+    'license_details' => 'Λεπτομέρειες άδειας',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/el/validation.php b/lang/el/validation.php
index be96cd0caf6..12d4919cab2 100644
--- a/lang/el/validation.php
+++ b/lang/el/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Η μορφή του :attribute δεν είναι έγκυρη.',
     'uploaded'             => 'Δεν ήταν δυνατή η αποστολή του αρχείου. Ο διακομιστής ενδέχεται να μην δέχεται αρχεία αυτού του μεγέθους.',
 
+    'zip_file' => 'Το :attribute πρέπει να παραπέμπει σε ένα αρχείο εντός του ZIP.',
+    'zip_file_mime' => 'Το :attribute πρέπει να αναφέρεται σε αρχείο τύπου :validTypes, βρέθηκε :foundType.',
+    'zip_model_expected' => 'Αναμενόταν αντικείμενο δεδομένων, αλλά ":type" βρέθηκε.',
+    'zip_unique' => 'Το :attribute πρέπει να είναι μοναδικό για τον τύπο αντικειμένου εντός του ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/es/activities.php b/lang/es/activities.php
index 9431eeb9fef..5bd3fa5f10c 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook eliminado',
     'webhook_delete_notification' => 'Webhook eliminado correctamente',
 
+    // Imports
+    'import_create' => 'importación creada',
+    'import_create_notification' => 'Importación cargada correctamente',
+    'import_run' => 'importación actualizada',
+    'import_run_notification' => 'Contenido importado correctamente',
+    'import_delete' => 'importación borrada',
+    'import_delete_notification' => 'Importación borrada correctamente',
+
     // Users
     'user_create' => 'usuario creado',
     'user_create_notification' => 'Usuario creado correctamente',
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 1f9f663fa63..3d9e90c13fb 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Acerca del editor',
     'about_title' => 'Acerca del editor WYSIWYG',
     'editor_license' => 'Licencia del editor y derechos de autor',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Este editor se construye usando :tinyLink que se proporciona bajo la licencia MIT.',
     'editor_tiny_license_link' => 'Aquí encontrará los detalles de los derechos de autor y la licencia de TinyMCE.',
     'save_continue' => 'Guardar Página y Continuar',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index d197c20983f..733be165dc8 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Archivo PDF',
     'export_text' => 'Archivo de texto',
     'export_md' => 'Archivo Markdown',
+    'export_zip' => 'ZIP portable',
     'default_template' => 'Plantilla de página por defecto',
     'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la plantilla de página elegida.',
     'default_template_select' => 'Seleccione una página de plantilla',
+    'import' => 'Importar',
+    'import_validate' => 'Validar importación',
+    'import_desc' => 'Importar libros, capítulos y páginas usando una exportación zip portable de la misma o distinta instancia. Seleccione un archivo ZIP para continuar. Después de que el archivo haya sido subido y validado, podrá configurar y confirmar la importación en la siguiente vista.',
+    'import_zip_select' => 'Seleccione archivo ZIP a subir',
+    'import_zip_validation_errors' => 'Se detectaron errores al validar el archivo ZIP proporcionado:',
+    'import_pending' => 'Importaciones pendientes',
+    'import_pending_none' => 'No se han iniciado importaciones.',
+    'import_continue' => 'Continuar importación',
+    'import_continue_desc' => 'Revise el contenido que debe importarse del archivo ZIP subido. Cuando esté listo, ejecute la importación para añadir su contenido a este sistema. El archivo de importación ZIP subido se eliminará automáticamente al terminar la importación correctamente.',
+    'import_details' => 'Detalles de la Importación',
+    'import_run' => 'Ejecutar Importación',
+    'import_size' => ':size tamaño archivo ZIP',
+    'import_uploaded_at' => 'Subido :relativeTime',
+    'import_uploaded_by' => 'Subido por',
+    'import_location' => 'Ubicación de Importación',
+    'import_location_desc' => 'Seleccione una ubicación de destino para el contenido importado. Necesitará los permisos pertinentes para crearlo dentro de la ubicación que elija.',
+    'import_delete_confirm' => '¿Está seguro de que desea eliminar esta importación?',
+    'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
+    'import_errors' => 'Errores de Importación',
+    'import_errors_desc' => 'Se han producido los siguientes errores durante el intento de importación:',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index deb6c1bc51e..98aa2acd593 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -105,6 +105,18 @@
     'app_down' => 'La aplicación :appName se encuentra caída en este momento',
     'back_soon' => 'Volverá a estar operativa pronto.',
 
+    // Import
+    'import_zip_cant_read' => 'No se pudo leer el archivo ZIP.',
+    'import_zip_cant_decode_data' => 'No se pudo encontrar y decodificar el archivo data.json. en el archivo ZIP.',
+    'import_zip_no_data' => 'Los datos del archivo ZIP no contienen ningún libro, capítulo o contenido de página.',
+    'import_validation_failed' => 'Error al validar la importación del ZIP con errores:',
+    'import_zip_failed_notification' => 'Error al importar archivo ZIP.',
+    'import_perms_books' => 'Le faltan los permisos necesarios para crear libros.',
+    'import_perms_chapters' => 'Le faltan los permisos necesarios para crear capítulos.',
+    'import_perms_pages' => 'Le faltan los permisos necesarios para crear páginas.',
+    'import_perms_images' => 'Le faltan los permisos necesarios para crear imágenes.',
+    'import_perms_attachments' => 'Le faltan los permisos necesarios para crear adjuntos.',
+
     // API errors
     'api_no_authorization_found' => 'No se encontró ningún token de autorización en la solicitud',
     'api_bad_authorization_format' => 'Se ha encontrado un token de autorización en la solicitud pero el formato era incorrecto',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 62919fe4ac8..cb13cad121b 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'API de sistema de acceso',
     'role_manage_settings' => 'Gestionar ajustes de la aplicación',
     'role_export_content' => 'Exportar contenido',
+    'role_import_content' => 'Importar contenido',
     'role_editor_change' => 'Cambiar editor de página',
     'role_notifications' => 'Recibir y gestionar notificaciones',
     'role_asset' => 'Permisos de contenido',
diff --git a/lang/es/validation.php b/lang/es/validation.php
index bfcb050bea4..d5f4f8495c8 100644
--- a/lang/es/validation.php
+++ b/lang/es/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'El atributo :attribute tiene un formato inválido.',
     'uploaded'             => 'El archivo no ha podido subirse. Es posible que el servidor no acepte archivos de este tamaño.',
 
+    'zip_file' => 'El :attribute necesita hacer referencia a un archivo dentro del ZIP.',
+    'zip_file_mime' => 'El :attribute necesita hacer referencia a un archivo de tipo :validTypes, encontrado :foundType.',
+    'zip_model_expected' => 'Se esperaba un objeto de datos, pero se encontró ":type".',
+    'zip_unique' => 'El :attribute debe ser único para el tipo de objeto dentro del ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index 62d986ceaa0..f7e9794937e 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook eliminado',
     'webhook_delete_notification' => 'Webhook eliminado correctamente',
 
+    // Imports
+    'import_create' => 'importación creada',
+    'import_create_notification' => 'Importación cargada correctamente',
+    'import_run' => 'importación actualizada',
+    'import_run_notification' => 'Contenido importado correctamente',
+    'import_delete' => 'importación borrada',
+    'import_delete_notification' => 'Importación borrada correctamente',
+
     // Users
     'user_create' => 'usuario creado',
     'user_create_notification' => 'Usuario creado correctamente',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 3cd7d4657a7..9002dc72bac 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Acerca del editor',
     'about_title' => 'Acerca del editor WYSIWYG',
     'editor_license' => 'Licencia del editor y derechos de autor',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Este editor se construye usando :tinyLink provisto bajo la licencia MIT.',
     'editor_tiny_license_link' => 'Aquí se muestran los detalles de los derechos de autor y la licencia de TinyMCE.',
     'save_continue' => 'Guardar Página y Continuar',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index d35682d2fad..a118e16bed9 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Archivo PDF',
     'export_text' => 'Archivo de texto plano',
     'export_md' => 'Archivo Markdown',
+    'export_zip' => 'ZIP portable',
     'default_template' => 'Plantilla de página por defecto',
     'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la plantilla de página elegida.',
     'default_template_select' => 'Seleccione una página de plantilla',
+    'import' => 'Importar',
+    'import_validate' => 'Validar importación',
+    'import_desc' => 'Importar libros, capítulos y páginas usando una exportación zip portable de la misma o distinta instancia. Seleccione un archivo ZIP para continuar. Después de que el archivo haya sido subido y validado, podrá configurar y confirmar la importación en la siguiente vista.',
+    'import_zip_select' => 'Seleccione archivo ZIP a subir',
+    'import_zip_validation_errors' => 'Se detectaron errores al validar el archivo ZIP proporcionado:',
+    'import_pending' => 'Importaciones pendientes',
+    'import_pending_none' => 'No se han iniciado importaciones.',
+    'import_continue' => 'Continuar importación',
+    'import_continue_desc' => 'Revise el contenido que debe importarse del archivo ZIP subido. Cuando esté listo, ejecute la importación para añadir su contenido a este sistema. El archivo de importación ZIP subido se eliminará automáticamente al terminar la importación correctamente.',
+    'import_details' => 'Detalles de la Importación',
+    'import_run' => 'Ejecutar Importación',
+    'import_size' => ':size tamaño archivo ZIP',
+    'import_uploaded_at' => 'Subido :relativeTime',
+    'import_uploaded_by' => 'Subido por',
+    'import_location' => 'Ubicación de Importación',
+    'import_location_desc' => 'Seleccione una ubicación de destino para el contenido importado. Necesitará los permisos pertinentes para crearlo dentro de la ubicación que elija.',
+    'import_delete_confirm' => '¿Está seguro de que desea eliminar esta importación?',
+    'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
+    'import_errors' => 'Errores de Importación',
+    'import_errors_desc' => 'Se han producido los siguientes errores durante el intento de importación:',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index c25c793d04f..cb1bc1202bb 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -105,6 +105,18 @@
     'app_down' => 'La aplicación :appName se encuentra caída en este momento',
     'back_soon' => 'Volverá a estar operativa en corto tiempo.',
 
+    // Import
+    'import_zip_cant_read' => 'No se pudo leer el archivo ZIP.',
+    'import_zip_cant_decode_data' => 'No se pudo encontrar y decodificar el archivo data.json. en el archivo ZIP.',
+    'import_zip_no_data' => 'Los datos del archivo ZIP no contienen ningún libro, capítulo o contenido de página.',
+    'import_validation_failed' => 'Error al validar la importación del ZIP con errores:',
+    'import_zip_failed_notification' => 'Error al importar archivo ZIP.',
+    'import_perms_books' => 'Le faltan los permisos necesarios para crear libros.',
+    'import_perms_chapters' => 'Le faltan los permisos necesarios para crear capítulos.',
+    'import_perms_pages' => 'Le faltan los permisos necesarios para crear páginas.',
+    'import_perms_images' => 'Le faltan los permisos necesarios para crear imágenes.',
+    'import_perms_attachments' => 'Le faltan los permisos necesarios para crear adjuntos.',
+
     // API errors
     'api_no_authorization_found' => 'No se encontró ningún token de autorización en la solicitud',
     'api_bad_authorization_format' => 'Se ha encontrado un token de autorización en la solicitud pero el formato era incorrecto',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 84ed4769468..9a78c876042 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -163,6 +163,7 @@
     'role_access_api' => 'API de sistema de acceso',
     'role_manage_settings' => 'Gestionar ajustes de activos',
     'role_export_content' => 'Exportar contenido',
+    'role_import_content' => 'Importar contenido',
     'role_editor_change' => 'Cambiar editor de página',
     'role_notifications' => 'Recibir y gestionar notificaciones',
     'role_asset' => 'Permisos de activos',
diff --git a/lang/es_AR/validation.php b/lang/es_AR/validation.php
index 9b2b1b4134a..db16845e030 100644
--- a/lang/es_AR/validation.php
+++ b/lang/es_AR/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'El atributo :attribute tiene un formato inválido.',
     'uploaded'             => 'El archivo no se pudo subir. Puede ser que el servidor no acepte archivos de este tamaño.',
 
+    'zip_file' => 'El :attribute necesita hacer referencia a un archivo dentro del ZIP.',
+    'zip_file_mime' => 'El :attribute necesita hacer referencia a un archivo de tipo :validTypes, encontrado :foundType.',
+    'zip_model_expected' => 'Se esperaba un objeto de datos, pero se encontró ":type".',
+    'zip_unique' => 'El :attribute debe ser único para el tipo de objeto dentro del ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/et/activities.php b/lang/et/activities.php
index 46812551023..bbc9762500e 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'kustutas veebihaagi',
     'webhook_delete_notification' => 'Veebihaak on kustutatud',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'lisas kasutaja',
     'user_create_notification' => 'Kasutaja on lisatud',
diff --git a/lang/et/editor.php b/lang/et/editor.php
index 610be639879..77b0514569e 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Redaktori info',
     'about_title' => 'Info WYSIWYG redaktori kohta',
     'editor_license' => 'Redaktori litsents ja autoriõigused',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'See redaktor on loodud :tinyLink abil, mis on saadaval MIT litsentsi alusel.',
     'editor_tiny_license_link' => 'TinyMCE autoriõigused ja litsents on saadaval siin.',
     'save_continue' => 'Salvesta leht ja jätka',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index dd875a6f2da..7afe7005da6 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF fail',
     'export_text' => 'Tekstifail',
     'export_md' => 'Markdown fail',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Vaikimisi lehe mall',
     'default_template_explain' => 'Vali lehe mall, mida kasutatakse kõigi selle objekti sees loodud lehtede vaikimisi sisuna. Pea meeles, et seda kasutatakse ainult siis, kui lehe loojal on valitud malli vaatamise õigus.',
     'default_template_select' => 'Vali mall',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 732c945295f..4faf1d00807 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName on hetkel maas',
     'back_soon' => 'See on varsti tagasi.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Päringust ei leitud volitustunnust',
     'api_bad_authorization_format' => 'Päringust leiti volitustunnus, aga see ei olnud korrektses formaadis',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index aa860c05081..6f29fcba17a 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Süsteemi API ligipääs',
     'role_manage_settings' => 'Rakenduse seadete haldamine',
     'role_export_content' => 'Sisu eksport',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Lehe redaktori muutmine',
     'role_notifications' => 'Võta vastu ja halda teavitusi',
     'role_asset' => 'Sisu õigused',
diff --git a/lang/et/validation.php b/lang/et/validation.php
index 5f7f6f3aa39..6a6eb661ccb 100644
--- a/lang/et/validation.php
+++ b/lang/et/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute on vigases formaadis.',
     'uploaded'             => 'Faili üleslaadimine ebaõnnestus. Server ei pruugi sellise suurusega faile vastu võtta.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/eu/activities.php b/lang/eu/activities.php
index 15e11c47618..eeee084ab3c 100644
--- a/lang/eu/activities.php
+++ b/lang/eu/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook ezabatua',
     'webhook_delete_notification' => 'Webhook egoki ezabatua',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/eu/editor.php b/lang/eu/editor.php
index 161cb3b27a4..34c73997840 100644
--- a/lang/eu/editor.php
+++ b/lang/eu/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index 7588561201c..10c5dba126e 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF fitxategia',
     'export_text' => 'Testu lauko fitxategiak',
     'export_md' => 'Markdown fitxategia',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Baimenak',
diff --git a/lang/eu/errors.php b/lang/eu/errors.php
index 33f033a176a..2a747e5f8bb 100644
--- a/lang/eu/errors.php
+++ b/lang/eu/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 1ee5843e8e7..80f1c87f439 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Sistemako APIra sarrera',
     'role_manage_settings' => 'Kudeatu aplikazio ezarpenak',
     'role_export_content' => 'Exportatu edukia',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Fitxategi baimenak',
diff --git a/lang/eu/validation.php b/lang/eu/validation.php
index cd7ba387dfa..f79dc852f3e 100644
--- a/lang/eu/validation.php
+++ b/lang/eu/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index adc38024978..c17fe698821 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'حذف وب هوک',
     'webhook_delete_notification' => 'وب هوک با موفقیت حذف شد',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'کاربر ایجاد شده',
     'user_create_notification' => 'کاربر با موفقیت به ایجاد شد',
diff --git a/lang/fa/editor.php b/lang/fa/editor.php
index 89d163de0eb..9fbb948f5ca 100644
--- a/lang/fa/editor.php
+++ b/lang/fa/editor.php
@@ -163,6 +163,8 @@
     'about' => 'درباره ویرایشگر',
     'about_title' => 'درباره ویرایشگر WYSIWYG',
     'editor_license' => 'مجوز و حق کپی رایت ویرایشگر',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'این ویرایشگر توسط :tinyLink و تحت مجوز MIT ساخته شده است.',
     'editor_tiny_license_link' => 'جزئیات کپی رایت و مجوز TinyMCE را می توانید در اینجا پیدا کنید.',
     'save_continue' => 'ذخیره صفحه و ادامه',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index 7d173e61e6a..7578c21c029 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'فایل PDF',
     'export_text' => 'پرونده متنی ساده',
     'export_md' => 'راهنما مارک‌دون',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'مجوزها',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 8a54f9d3784..c4bc6963ae6 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName در حال حاضر قطع است',
     'back_soon' => 'به زودی پشتیبان خواهد شد.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'هیچ نشانه مجوزی در درخواست یافت نشد',
     'api_bad_authorization_format' => 'یک نشانه مجوز در این درخواست یافت شد اما قالب نادرست به نظر می‌رسید',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index 4993c4671c5..bb18364f055 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'دسترسی به API سیستم',
     'role_manage_settings' => 'تنظیمات برنامه را مدیریت کنید',
     'role_export_content' => 'صادرات محتوا',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'تغییر ویرایشگر صفحه',
     'role_notifications' => 'دریافت و مدیریت اعلان‌ها',
     'role_asset' => 'مجوزهای دارایی',
diff --git a/lang/fa/validation.php b/lang/fa/validation.php
index 467c68702dd..10432471f64 100644
--- a/lang/fa/validation.php
+++ b/lang/fa/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute معتبر نمی‌باشد.',
     'uploaded'             => 'بارگذاری فایل :attribute موفقیت آمیز نبود.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/fi/activities.php b/lang/fi/activities.php
index 6bb267c707c..40588abcd3b 100644
--- a/lang/fi/activities.php
+++ b/lang/fi/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'poisti toimintokutsun',
     'webhook_delete_notification' => 'Toimintokutsu poistettiin onnistuneesti',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'loi käyttäjän',
     'user_create_notification' => 'Käyttäjä luotiin onnistuneesti',
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index 34150e64781..c2ab2d8094f 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Tietoja editorista',
     'about_title' => 'Tietoja WYSIWYG-editorista',
     'editor_license' => 'Editorin lisenssi ja tekijänoikeus',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Tämä editori on rakennettu käyttäen sovellusta :tinyLink, joka on MIT-lisenssin alainen.',
     'editor_tiny_license_link' => 'TinyMCE-editorin tekijänoikeus- ja lisenssitiedot löytyvät täältä.',
     'save_continue' => 'Tallenna sivu ja jatka',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index c10886fe00f..8743c972582 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-tiedosto',
     'export_text' => 'Tekstitiedosto',
     'export_md' => 'Markdown-tiedosto',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Käyttöoikeudet',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index 4ffb37e8a91..d948b556bf8 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -106,6 +106,18 @@
     'app_down' => ':appName on kaatunut',
     'back_soon' => 'Se palautetaan pian.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Pyynnöstä ei löytynyt valtuutuskoodia',
     'api_bad_authorization_format' => 'Pyynnöstä löytyi valtuutuskoodi, mutta sen muoto oli virheellinen',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index 3365d87bc37..5d953dc70e1 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Pääsy järjestelmän ohjelmointirajapintaan',
     'role_manage_settings' => 'Hallinnoi sivuston asetuksia',
     'role_export_content' => 'Vie sisältöjä',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Vaihda sivun editoria',
     'role_notifications' => 'Vastaanota ja hallinnoi ilmoituksia',
     'role_asset' => 'Sisältöjen oikeudet',
diff --git a/lang/fi/validation.php b/lang/fi/validation.php
index 35c5f1924b2..0a9330433c8 100644
--- a/lang/fi/validation.php
+++ b/lang/fi/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute muoto ei ole kelvollinen.',
     'uploaded'             => 'Tiedostoa ei voitu ladata. Palvelin ei ehkä hyväksy tämän kokoisia tiedostoja.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 7acf5931a28..871b886480c 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'supprimer un Webhook',
     'webhook_delete_notification' => 'Webhook supprimé avec succès',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'utilisateur créé',
     'user_create_notification' => 'Utilisateur créé avec succès',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 558dda4c63d..11edae10c9b 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -163,6 +163,8 @@
     'about' => 'À propos de l\'éditeur',
     'about_title' => 'À propos de l\'éditeur WYSIWYG',
     'editor_license' => 'Licence d\'éditeur et droit d\'auteur',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Cet éditeur est construit en utilisant :tinyLink qui est fourni sous la licence MIT.',
     'editor_tiny_license_link' => 'Vous trouverez ici les détails sur les droits d\'auteur et les licences de TinyMCE.',
     'save_continue' => 'Enregistrer et continuer',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index b92ddac0ac7..6581587d4f7 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Fichier PDF',
     'export_text' => 'Document texte',
     'export_md' => 'Fichiers Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Modèle de page par défaut',
     'default_template_explain' => 'Sélectionnez un modèle de page qui sera utilisé comme contenu par défaut pour les nouvelles pages créées dans cet élément. Gardez à l\'esprit que le modèle ne sera utilisé que si le créateur de la page a accès au modèle sélectionné.',
     'default_template_select' => 'Sélectionnez un modèle de page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Autorisations',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 7658fd8a982..d89926dac72 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName n\'est pas en service pour le moment',
     'back_soon' => 'Nous serons bientôt de retour.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Aucun jeton d\'autorisation trouvé pour la demande',
     'api_bad_authorization_format' => 'Un jeton d\'autorisation a été trouvé pour la requête, mais le format semble incorrect',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index eb8ca396cb6..d113e89ab7c 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Accès à l\'API du système',
     'role_manage_settings' => 'Gérer les préférences de l\'application',
     'role_export_content' => 'Exporter le contenu',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Changer l\'éditeur de page',
     'role_notifications' => 'Recevoir et gérer les notifications',
     'role_asset' => 'Permissions des ressources',
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index 702c025854a..ed16776e72f 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute a un format invalide.',
     'uploaded'             => 'Le fichier n\'a pas pu être envoyé. Le serveur peut ne pas accepter des fichiers de cette taille.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 75ab9b3ea28..1954121f813 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'Webhook נמחק',
     'webhook_delete_notification' => 'Webook נמחק בהצלחה',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'משתמש חדש נוצר',
     'user_create_notification' => 'משתמש נוצר בהצלחה',
diff --git a/lang/he/editor.php b/lang/he/editor.php
index e37862a4bff..a670385f99d 100644
--- a/lang/he/editor.php
+++ b/lang/he/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'אודות עורך הטקסט הויזואלי',
     'editor_license' => 'רשיון וזכויות העורך',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'שמור עמוד והמשך',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 0dc6f882ea4..9ca53fa137c 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'קובץ PDF',
     'export_text' => 'טקסט רגיל',
     'export_md' => 'קובץ Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'הרשאות',
diff --git a/lang/he/errors.php b/lang/he/errors.php
index b11375dae39..75f7949ea76 100644
--- a/lang/he/errors.php
+++ b/lang/he/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName כרגע אינו זמין',
     'back_soon' => 'מקווים שיחזור במהרה',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index bf585287cf8..9e63a43cdd8 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'גש ל-API המערכת',
     'role_manage_settings' => 'ניהול הגדרות יישום',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'הרשאות משאבים',
diff --git a/lang/he/validation.php b/lang/he/validation.php
index 85f6c698eb7..d7c12678365 100644
--- a/lang/he/validation.php
+++ b/lang/he/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'שדה :attribute בעל פורמט שאינו תקין.',
     'uploaded'             => 'שדה :attribute ארעה שגיאה בעת ההעלאה.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/hr/activities.php b/lang/hr/activities.php
index 284121b2dd7..f5853dc65c7 100644
--- a/lang/hr/activities.php
+++ b/lang/hr/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'web- dojavnik izbrisan',
     'webhook_delete_notification' => 'Web-dojavnik je uspješno izbrisan',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'kreirani korisnik',
     'user_create_notification' => 'Korisnik je uspješno kreiran',
diff --git a/lang/hr/editor.php b/lang/hr/editor.php
index f3fb21ad4e9..55b38ec2d7c 100644
--- a/lang/hr/editor.php
+++ b/lang/hr/editor.php
@@ -163,6 +163,8 @@
     'about' => 'O Editoru',
     'about_title' => 'O WYSIWYG Editoru',
     'editor_license' => 'Licenca i autorsko pravo uređivača',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Ovaj uređivač je izrađen pomoću: tinyLink koji je dostupan pod MIT licencom.',
     'editor_tiny_license_link' => 'Detalji o autorskim pravima i licenci za TinyMCE mogu se pronaći ovdje.',
     'save_continue' => 'Spremi Stranicu i Nastavi',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 01ceb054b1b..91621ed8cd3 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF Datoteka',
     'export_text' => 'Text File',
     'export_md' => 'Markdown Datoteka',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Dopuštenja',
diff --git a/lang/hr/errors.php b/lang/hr/errors.php
index 31577863c4f..92b9de7d24e 100644
--- a/lang/hr/errors.php
+++ b/lang/hr/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName trenutno nije dostupna',
     'back_soon' => 'Uskoro će se vratiti.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nije pronađena autorizacija',
     'api_bad_authorization_format' => 'Pogreška prilikom autorizacije',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index e58c3a6d45b..a8b8fea637f 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'API pristup',
     'role_manage_settings' => 'Upravljanje postavkama aplikacija',
     'role_export_content' => 'Izvoz sadržaja',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Promijeni uređivač stranica',
     'role_notifications' => 'Primanje i upravljanje obavijestima',
     'role_asset' => 'Upravljanje vlasništvom',
diff --git a/lang/hr/validation.php b/lang/hr/validation.php
index 95263ff07bd..32b11a9bd80 100644
--- a/lang/hr/validation.php
+++ b/lang/hr/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Format :attribute nije valjan.',
     'uploaded'             => 'Datoteka se ne može prenijeti. Server možda ne prihvaća datoteke te veličine.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index ea3d0cef3f2..b0dbfd45e97 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhookot törölt',
     'webhook_delete_notification' => 'Webhook sikeresen törölve',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'felhasználó létrehozása',
     'user_create_notification' => 'Felhasználó sikeresen létrehozva',
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index b71efec20f2..339ece151df 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -163,6 +163,8 @@
     'about' => 'A szerkesztőről',
     'about_title' => 'A WYSIWYG szerkesztőről',
     'editor_license' => 'Szerkesztő Licensz és Copyright információi',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Ez a szerkesztő az MIT licenc alatt szolgáltatott :tinyLink segítségével készült.',
     'editor_tiny_license_link' => 'A TinyMCE szerzői jogi és licencinformációi itt találhatók.',
     'save_continue' => 'Mentés és Folytatás',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 174197827b1..05c863878f9 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF fájl',
     'export_text' => 'Egyszerű szövegfájl',
     'export_md' => 'Markdown jegyzetek',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Alapértelmezett oldalsablon',
     'default_template_explain' => 'Rendeljen hozzá egy oldalsablont, amely alapértelmezett tartalomként lesz használva az ezen az elemen belül létrehozott összes oldalon. Ne feledje, hogy ezt csak akkor használja, ha az oldal készítője megtekintési hozzáféréssel rendelkezik a kiválasztott sablonoldalhoz.',
     'default_template_select' => 'Válasszon ki egy oldalsablont',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Jogosultságok',
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index 275eb65fe3d..00f47ac40bc 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName jelenleg nem üzemel',
     'back_soon' => 'Hamarosan újra elérhető lesz.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'A kérésben nem található hitelesítési vezérjel',
     'api_bad_authorization_format' => 'A kérésben hitelesítési vezérjel található de a formátuma érvénytelennek tűnik',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index 7398de9e171..55471ee0f8d 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Hozzáférés a rendszer API-hoz',
     'role_manage_settings' => 'Alkalmazás beállításainak kezelése',
     'role_export_content' => 'Tartalom exportálása',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Oldalszerkesztő módosítása',
     'role_notifications' => 'Értesítések fogadása és kezelése',
     'role_asset' => 'Eszköz jogosultságok',
diff --git a/lang/hu/validation.php b/lang/hu/validation.php
index 863e39d530d..a215416ca5f 100644
--- a/lang/hu/validation.php
+++ b/lang/hu/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formátuma érvénytelen.',
     'uploaded'             => 'A fájlt nem lehet feltölteni. A kiszolgáló nem fogad el ilyen méretű fájlokat.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/id/activities.php b/lang/id/activities.php
index bc20b86ffb2..8c3e800bb67 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'menghapus webhook',
     'webhook_delete_notification' => 'Webhook berhasil dihapus',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'pengguna yang dibuat',
     'user_create_notification' => 'Pengguna berhasil dibuat',
diff --git a/lang/id/editor.php b/lang/id/editor.php
index 73a374a1dc2..c0b72601ad6 100644
--- a/lang/id/editor.php
+++ b/lang/id/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index cf87ab0253b..81d6763d09d 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Dokumen PDF',
     'export_text' => 'Dokumen Teks Biasa',
     'export_md' => 'File Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Izin',
diff --git a/lang/id/errors.php b/lang/id/errors.php
index 8a4bc658f21..b4e2c6feb11 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName sedang down sekarang',
     'back_soon' => 'Ini akan segera kembali.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Tidak ada token otorisasi yang ditemukan pada permintaan tersebut',
     'api_bad_authorization_format' => 'Token otorisasi ditemukan pada permintaan tetapi formatnya salah',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 21979ba60c4..abc4c86b405 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Akses Sistem API',
     'role_manage_settings' => 'Kelola setelan aplikasi',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Izin Aset',
diff --git a/lang/id/validation.php b/lang/id/validation.php
index e1fcbc7246c..d922113d984 100644
--- a/lang/id/validation.php
+++ b/lang/id/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute format tidak valid.',
     'uploaded'             => 'Berkas tidak dapat diunggah. Server mungkin tidak menerima berkas dengan ukuran ini.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/is/activities.php b/lang/is/activities.php
new file mode 100644
index 00000000000..5c84cdb5365
--- /dev/null
+++ b/lang/is/activities.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'stofna síðu',
+    'page_create_notification'    => 'Síða stofnuð',
+    'page_update'                 => 'nafnlaus síða',
+    'page_update_notification'    => 'Síða uppfærð',
+    'page_delete'                 => 'síðu eytt',
+    'page_delete_notification'    => 'Tókst að eyða síðu',
+    'page_restore'                => 'endurvirkja síðu',
+    'page_restore_notification'   => 'Síða endurvirkjuð',
+    'page_move'                   => 'síða færð',
+    'page_move_notification'      => 'Tókst að færa síðu',
+
+    // Chapters
+    'chapter_create'              => 'kafli búinn til',
+    'chapter_create_notification' => 'Tókst að búa til kafla',
+    'chapter_update'              => 'kafli uppfærður',
+    'chapter_update_notification' => 'Tókst að uppfæra kafla',
+    'chapter_delete'              => 'eyddur kafli',
+    'chapter_delete_notification' => 'Tókst að eyða kafla',
+    'chapter_move'                => 'færður kafli',
+    'chapter_move_notification' => 'Tókst að færa kafla',
+
+    // Books
+    'book_create'                 => 'stofnuð bók',
+    'book_create_notification'    => 'Tókst að stofna bók',
+    'book_create_from_chapter'              => 'kafla breytt í bók',
+    'book_create_from_chapter_notification' => 'Tókst að breyta kafla í bók',
+    'book_update'                 => 'uppfærð bók',
+    'book_update_notification'    => 'Tókst að uppfæra bók',
+    'book_delete'                 => 'eydd bók',
+    'book_delete_notification'    => 'Tókst að eyða bók',
+    'book_sort'                   => 'flokkuð bók',
+    'book_sort_notification'      => 'Tókst að endurflokka bók',
+
+    // Bookshelves
+    'bookshelf_create'            => 'stofna hillu',
+    'bookshelf_create_notification'    => 'Tókst að stofna hillu',
+    'bookshelf_create_from_book'    => 'bók breytt i hillu',
+    'bookshelf_create_from_book_notification'    => 'Tókst að breyta bók í hillu',
+    'bookshelf_update'                 => 'uppærð hilla',
+    'bookshelf_update_notification'    => 'Tókst að uppfæra hillu',
+    'bookshelf_delete'                 => 'eydd hilla',
+    'bookshelf_delete_notification'    => 'Tókst að eyða hillu',
+
+    // Revisions
+    'revision_restore' => 'útgáfa bakfærð',
+    'revision_delete' => 'útgáfu eytt',
+    'revision_delete_notification' => 'Tókst að eyða útgáfu',
+
+    // Favourites
+    'favourite_add_notification' => 'hefur verið bætt í eftirlæti',
+    'favourite_remove_notification' => 'hefur verið eytt úr eftirlæti',
+
+    // Watching
+    'watch_update_level_notification' => 'Fylgjast með hefur verið uppfært',
+
+    // Auth
+    'auth_login' => 'skráður inn',
+    'auth_register' => 'skráður sem nýr notandi',
+    'auth_password_reset_request' => 'bað um nýtt lykilorð',
+    'auth_password_reset_update' => 'endurstilla lykilorð',
+    'mfa_setup_method' => 'valin MFA aðferð',
+    'mfa_setup_method_notification' => 'Fjölauðkenningar aðferð stillt',
+    'mfa_remove_method' => 'fjarlægja MFA aðferð',
+    'mfa_remove_method_notification' => 'Fjölauðkenningar aðferð fjarlægð',
+
+    // Settings
+    'settings_update' => 'uppfæra stillingar',
+    'settings_update_notification' => 'Tókst að uppfæra stillingar',
+    'maintenance_action_run' => 'keyrði uppfærslu',
+
+    // Webhooks
+    'webhook_create' => 'webhook búin til',
+    'webhook_create_notification' => 'Tókst að búa til Webhook',
+    'webhook_update' => 'webhook uppfærður',
+    'webhook_update_notification' => 'Tókst að uppfæra Webhook',
+    'webhook_delete' => 'eyða Webhook',
+    'webhook_delete_notification' => 'Tókst að eyða Webhook',
+
+    // Imports
+    'import_create' => 'búa til innlestur',
+    'import_create_notification' => 'Innlestur tókst',
+    'import_run' => 'uppfæra innlestur',
+    'import_run_notification' => 'Tókst að lesa inn',
+    'import_delete' => 'innlestri eytt',
+    'import_delete_notification' => 'Tókst að eyða innlestri',
+
+    // Users
+    'user_create' => 'stofnaður notandi',
+    'user_create_notification' => 'Tókst að stofna notanda',
+    'user_update' => 'uppfærður notandi',
+    'user_update_notification' => 'Tókst að uppfæra notanda',
+    'user_delete' => 'eyddur notandi',
+    'user_delete_notification' => 'Tókst að eyða notanda',
+
+    // API Tokens
+    'api_token_create' => 'API token búið til',
+    'api_token_create_notification' => 'Tókst að búa til API tóka',
+    'api_token_update' => 'API tóki uppfærður',
+    'api_token_update_notification' => 'Tókst að uppfæra API tóka',
+    'api_token_delete' => 'eyddur API tóki',
+    'api_token_delete_notification' => 'Tókst að eyða API tóka',
+
+    // Roles
+    'role_create' => 'stofnað hlutverk',
+    'role_create_notification' => 'Tókst að stofna hlutverk',
+    'role_update' => 'hlutverk uppfært',
+    'role_update_notification' => 'Tókst að uppfæra hlutverk',
+    'role_delete' => 'eytt hlutverk',
+    'role_delete_notification' => 'Tókst að eyða hlutverki',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'tæmd ruslatunna',
+    'recycle_bin_restore' => 'endurheimt úr ruslatunnu',
+    'recycle_bin_destroy' => 'fjarlægt úr ruslatunnu',
+
+    // Comments
+    'commented_on'                => 'athugasemd á',
+    'comment_create'              => 'athugasemd bætt við',
+    'comment_update'              => 'athugasemd uppfærð',
+    'comment_delete'              => 'athugasemd eytt',
+
+    // Other
+    'permissions_update'          => 'uppfærðar heimildir',
+];
diff --git a/lang/is/auth.php b/lang/is/auth.php
new file mode 100644
index 00000000000..c5e7ce4f1d7
--- /dev/null
+++ b/lang/is/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'Þeesi auðkenning er ekki á skrá.',
+    'throttle' => 'Of margar tilraunir til innskráningar. Reyndu aftur eftir :seconds sekúndur.',
+
+    // Login & Register
+    'sign_up' => 'Nýskrá',
+    'log_in' => 'Innskrá',
+    'log_in_with' => 'Innskrá með :socialDriver',
+    'sign_up_with' => 'Búa til aðgang með :socialDriver',
+    'logout' => 'Skrá út',
+
+    'name' => 'Nafn',
+    'username' => 'Notandanafn',
+    'email' => 'Netfang',
+    'password' => 'Lykilorð',
+    'password_confirm' => 'Staðfestu lykilorð',
+    'password_hint' => 'Verður að vera minnst 8 stafir',
+    'forgot_password' => 'Gleymt lykilorð?',
+    'remember_me' => 'Geyma innskráningarupplýsingar',
+    'ldap_email_hint' => 'Settu inn netfang til að nota þennan aðgang.',
+    'create_account' => 'Stofna aðgang',
+    'already_have_account' => 'Þegar með notandaaðgang?',
+    'dont_have_account' => 'Ekki með aðgang?',
+    'social_login' => 'Innskráning með samfélagsmiðli',
+    'social_registration' => 'Skráning samfélagsmiðils',
+    'social_registration_text' => 'Skráðu þig og innskrá með annari þjónustu.',
+
+    'register_thanks' => 'Takk fyrir að skrá þig!',
+    'register_confirm' => 'Skoðaðu tölvupóstinn þinn og smelltu á staðfestingarhlekkinn :appName.',
+    'registrations_disabled' => 'Skráningar eru óvirkar í augnablikinu',
+    'registration_email_domain_invalid' => 'Þetta lén hefur ekki aðgang að þessu forriti',
+    'register_success' => 'Takk fyrir að skrá þig, nú ertu innskráðursem notandi.',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'Reyni innskráningu',
+    'auto_init_starting_desc' => 'Reyni að tengjast auðkenningarþjónustu, ef ekkert gerist innan 5 sekúndna getur þú smellt á hlekkinn hér að neðan.',
+    'auto_init_start_link' => 'Halda áfram með auðkenningu',
+
+    // Password Reset
+    'reset_password' => 'Endurstilla lykilorð',
+    'reset_password_send_instructions' => 'Settu netfangið þitt hér að neðan og þú færð tölvupóst með endurstillingar hlekk.',
+    'reset_password_send_button' => 'Senda hlekk',
+    'reset_password_sent' => 'Endurstillingar hlekkur hefur verið sendur í tölvupósti :email ef netfangið er á skrá.',
+    'reset_password_success' => 'Lykilorðið þitt hefur verið endurstillt.',
+    'email_reset_subject' => 'Endurstilla :appName lykilorðið þitt',
+    'email_reset_text' => 'Þú fékkst þennan tölvupóst því að beðið var um endurstillingu lykilorðs á þínum aðgangi.',
+    'email_reset_not_requested' => 'Ef þú baðst ekki um endurstillingu lykilorðs þarftu ekki að gera neitt.',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'Staðfestu netfangið þitt á :appName',
+    'email_confirm_greeting' => 'Takk fyrir að skrá þig á :appName!',
+    'email_confirm_text' => 'Vinsamlegast staðfestu netfangið þitt með því að smella á hnappin hér fyrir neðan:',
+    'email_confirm_action' => 'Staðfesta netfang',
+    'email_confirm_send_error' => 'Staðfesting netfangs er nauðsynleg en kerfið gat ekki sent póst, vinsamlegast hafið samband við kerfisstjóra.',
+    'email_confirm_success' => 'Netfang þitt hefur verið staðfest, þú ættir nú að geta skráð þig inn með þessu netfangi.',
+    'email_confirm_resent' => 'Staðfestingar tölvupóstur hefur verið sendur, kíktu í póshólfið þitt.',
+    'email_confirm_thanks' => 'Takk fyrir að staðfesta!',
+    'email_confirm_thanks_desc' => 'Hinkraðu smá á meðan staðfestingin þín er í vinnslu, ef ekkert gerist eftir 3 sekúndur, smelltu á "Halda áfram" hlekkinn hér fyrir neðan.',
+
+    'email_not_confirmed' => 'Netfang hefur ekki verið staðfest',
+    'email_not_confirmed_text' => 'Netfangið þitt hefur ekki enn verið staðfest.',
+    'email_not_confirmed_click_link' => 'Vinsamlegast smelltu á hlekkinn sem barst þér í tölvupósti eftir skráningu.',
+    'email_not_confirmed_resend' => 'Ef þú finnur ekki tölvupóstinn sem var sendur á þig, getur þú fengið hann endursendann með því að fylla út formið hér að neðan.',
+    'email_not_confirmed_resend_button' => 'Endursenda staðfestingarpóst',
+
+    // User Invite
+    'user_invite_email_subject' => 'Þér hefur verið boðið að tengjast :appName!',
+    'user_invite_email_greeting' => 'Það hefur verið stofnaður aðgangur fyrir ig á :appName.',
+    'user_invite_email_text' => 'Smelltu á hnappinn fyrir neðan til að setja upp lykilorð og fá aðgang:',
+    'user_invite_email_action' => 'Settu inn lykilorð',
+    'user_invite_page_welcome' => 'Velkominn á :appName!',
+    'user_invite_page_text' => 'Til að ljúka við uppsetningu og fá aðgang að :appName verður þú að velja þér lykilorð.',
+    'user_invite_page_confirm_button' => 'Staðfestu lykilorð',
+    'user_invite_success_login' => 'Lykilorð klárt, nú ættir þú að geta skráð þig inn á :appName!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'Setja upp tvöfalda auðkenningu',
+    'mfa_setup_desc' => 'Tvöföld euðkenning er viðbótar vörn til að tryggja aðganginn þinn.',
+    'mfa_setup_configured' => 'Þegar uppsett',
+    'mfa_setup_reconfigure' => 'Endurstilla',
+    'mfa_setup_remove_confirmation' => 'Ertu viss um að þú viljið fjarlæga þessa auðkenningarleið?',
+    'mfa_setup_action' => 'Uppsetning',
+    'mfa_backup_codes_usage_limit_warning' => 'Þú átt færri en 5 tilraunir eftir. Búðu til og geymdu hjá þér fleiri tilraunir svo þú læsist ekki úti.',
+    'mfa_option_totp_title' => 'App',
+    'mfa_option_totp_desc' => 'Til að virkja tvöfalda auðkenningu verður þú að hafa app í símanum sem styður TOPT, til dæmis Google Authenticator, Authy eða Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Varakóðar',
+    'mfa_option_backup_codes_desc' => 'Býr til sett af einskiptis kóðum sem þú getur notað til að auðkenna þig með. Geymdu þessa kóða á öruggum stað.',
+    'mfa_gen_confirm_and_enable' => 'Staðfesta og virkja',
+    'mfa_gen_backup_codes_title' => 'Stillingar varakóða',
+    'mfa_gen_backup_codes_desc' => 'Geymdu listann af kóðum á öruggum stað. Þú getur notað þessa kóða sem auka auðkenningu.',
+    'mfa_gen_backup_codes_download' => 'Hala niður kóðum',
+    'mfa_gen_backup_codes_usage_warning' => 'Hver kóði getur bara verið notaður einu sinni',
+    'mfa_gen_totp_title' => 'Uppsetning Apps',
+    'mfa_gen_totp_desc' => 'Til að virkja tvöfalda auðkenningu verður þú að hafa app í símanum sem styður TOPT, til dæmis Google Authenticator, Authy eða Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Skannaðu QR kóðann með appinu sem þú notar fyrir tvöfalda auðkenningu.',
+    'mfa_gen_totp_verify_setup' => 'Staðfesta uppsetningu',
+    'mfa_gen_totp_verify_setup_desc' => 'Staðfestu að allt virki með því að setja inn kóða úr síma appinu þínu hér fyrir neðan:',
+    'mfa_gen_totp_provide_code_here' => 'Sláðu inn kóða úr auðkennningar appi',
+    'mfa_verify_access' => 'Staðfesta aðgang',
+    'mfa_verify_access_desc' => 'Aðgangurinn þinn þarf viðbótar auðkenningu, veldu auðkenningarleið.',
+    'mfa_verify_no_methods' => 'Engar aðferðir stilltar',
+    'mfa_verify_no_methods_desc' => 'Engin aukaauðkenningar aðferð fannst. Þú verður að setja upp minnst eina viðbótarauðkenningu til að halda áfram.',
+    'mfa_verify_use_totp' => 'Staðfestu með farsíma appi',
+    'mfa_verify_use_backup_codes' => 'Staðfesta með varakóða',
+    'mfa_verify_backup_code' => 'Varakóði',
+    'mfa_verify_backup_code_desc' => 'Settu inn einn af varakóðunum þínum hér að neðan:',
+    'mfa_verify_backup_code_enter_here' => 'Sláðu inn varakóða hér',
+    'mfa_verify_totp_desc' => 'Sláðu inn kóðann úr auðkenningar appinu úr símanum þínum:',
+    'mfa_setup_login_notification' => 'Tvöföld auðkenning stillt. Skráðu þig nú inn með euðkenningarleiðinni.',
+];
diff --git a/lang/is/common.php b/lang/is/common.php
new file mode 100644
index 00000000000..721d844ed1d
--- /dev/null
+++ b/lang/is/common.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'Hætta við',
+    'close' => 'Loka',
+    'confirm' => 'Staðfesta',
+    'back' => 'Til baka',
+    'save' => 'Vista',
+    'continue' => 'Halda áfram',
+    'select' => 'Velja',
+    'toggle_all' => 'Velja allt',
+    'more' => 'Meira',
+
+    // Form Labels
+    'name' => 'Nafn',
+    'description' => 'Lýsing',
+    'role' => 'Hlutverk',
+    'cover_image' => 'Forsíðumynd',
+    'cover_image_description' => 'Myndin ætti að fera u. þ. b 440x250px þótt hún verði sköluð og kroppuð eftir þörfum, þannig að endanleg stærð mun endurspegla það.',
+
+    // Actions
+    'actions' => 'Aðgerðir',
+    'view' => 'Skoða',
+    'view_all' => 'Skoða allt',
+    'new' => 'Ný',
+    'create' => 'Búa til',
+    'update' => 'Uppfæra',
+    'edit' => 'Breyta',
+    'sort' => 'Flokka',
+    'move' => 'Færa',
+    'copy' => 'Afrita',
+    'reply' => 'Svara',
+    'delete' => 'Eyða',
+    'delete_confirm' => 'Staðfesta eyðingu',
+    'search' => 'Leita',
+    'search_clear' => 'Hreinsa leit',
+    'reset' => 'Endurstilla',
+    'remove' => 'Fjarlægja',
+    'add' => 'Bæta við',
+    'configure' => 'Stilla',
+    'manage' => 'Stýra',
+    'fullscreen' => 'Fylla skjá',
+    'favourite' => 'Eftirlæti',
+    'unfavourite' => 'Fjarlægja úr eftirlæti',
+    'next' => 'Næst',
+    'previous' => 'Fyrri',
+    'filter_active' => 'Virk sía:',
+    'filter_clear' => 'Hreinsa síu',
+    'download' => 'Hlaða niður',
+    'open_in_tab' => 'Opna í flipa',
+    'open' => 'Opna',
+
+    // Sort Options
+    'sort_options' => 'Valkostir röðunar',
+    'sort_direction_toggle' => 'Flokkunarátt',
+    'sort_ascending' => 'Raða vaxandi',
+    'sort_descending' => 'Raða minnkandi',
+    'sort_name' => 'Nafn',
+    'sort_default' => 'Sjálfgefið',
+    'sort_created_at' => 'Stofnað þann',
+    'sort_updated_at' => 'Uppfært þann',
+
+    // Misc
+    'deleted_user' => 'Eyddur notandi',
+    'no_activity' => 'Engin virkni til að sýna',
+    'no_items' => 'Engir hlutir tiltækir',
+    'back_to_top' => 'Fara efst',
+    'skip_to_main_content' => 'Fara í aðalefni',
+    'toggle_details' => 'Virkja nánari sýn',
+    'toggle_thumbnails' => 'Sýna smámynd',
+    'details' => 'Nánari upplýsingar',
+    'grid_view' => 'Grid View',
+    'list_view' => 'Lista sýn',
+    'default' => 'Sjálfgefið',
+    'breadcrumb' => 'Brauðmolar',
+    'status' => 'Staða',
+    'status_active' => 'Virkt',
+    'status_inactive' => 'Óvirkt',
+    'never' => 'Aldrei',
+    'none' => 'Engin',
+
+    // Header
+    'homepage' => 'Forsíða',
+    'header_menu_expand' => 'Leiðarstjórn',
+    'profile_menu' => 'Prófíll',
+    'view_profile' => 'Skoða prófíl',
+    'edit_profile' => 'Breyta prófíl',
+    'dark_mode' => 'Dimmsnið',
+    'light_mode' => 'Ljóssnið',
+    'global_search' => 'Heildarleit',
+
+    // Layout tabs
+    'tab_info' => 'Upplýsingar',
+    'tab_info_label' => 'Tab: Sýna fleiri upplýsingar',
+    'tab_content' => 'Innihald',
+    'tab_content_label' => 'Tab: Sýna aðalinnihald',
+
+    // Email Content
+    'email_action_help' => 'Ef þú átt í vandræðum með að smella á ":actionText" hnappinn, afritaðu og límdu slóðina í vefskoðarann þinn:',
+    'email_rights' => 'Höfundaréttur varinn',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'Persónuverndarstefna',
+    'terms_of_service' => 'Skilmálar þjónustu',
+
+    // OpenSearch
+    'opensearch_description' => 'Leita :appName',
+];
diff --git a/lang/is/components.php b/lang/is/components.php
new file mode 100644
index 00000000000..6e0527eeede
--- /dev/null
+++ b/lang/is/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'Myndaval',
+    'image_list' => 'Myndalisti',
+    'image_details' => 'Uplýsingar myndar',
+    'image_upload' => 'Hlaða upp mynd',
+    'image_intro' => 'Hér getur þú valið og stjórnað þeim myndum sem þegar hefur verið upphlaðið.',
+    'image_intro_upload' => 'Hladdu upp nýrri mynd með því að draga hana inn í þennan glugga eða nota "Hlaða upp" hnappinn hér fyrir ofan.',
+    'image_all' => 'Allar',
+    'image_all_title' => 'Skoða allar myndir',
+    'image_book_title' => 'Skoða þær myndir sem þegar hefur verið hlaðið upp í þessa bók',
+    'image_page_title' => 'Skoða þær myndir sem þegar hefur verið hlaðið upp á þessa síðu',
+    'image_search_hint' => 'Leita af myndum eftir nafni',
+    'image_uploaded' => 'Hlaðið upp þann :uploadedDate',
+    'image_uploaded_by' => 'Hlaðið upp af :userName',
+    'image_uploaded_to' => 'Hlaðið upp á :pageLink',
+    'image_updated' => 'Uppfært þann :updateDate',
+    'image_load_more' => 'Hlaða fleirum',
+    'image_image_name' => 'Nafn myndar',
+    'image_delete_used' => 'Þessi mynd er notuð á eftirfarandi síðum.',
+    'image_delete_confirm_text' => 'Ertu viss um að þú viljir eyða þessari mynd?',
+    'image_select_image' => 'Velja mynd',
+    'image_dropzone' => 'Dragðu myndir eða smelltu hér til að hlaða upp',
+    'image_dropzone_drop' => 'Dragðu myndir hingað til að hlaða upp',
+    'images_deleted' => 'Myndum eytt',
+    'image_preview' => 'Forskoðun mynda',
+    'image_upload_success' => 'Upphal myndar tókst',
+    'image_update_success' => 'Upplýsingar um mynd uppfærðar',
+    'image_delete_success' => 'Tókst að eyða mynd',
+    'image_replace' => 'Skipta um mynd',
+    'image_replace_success' => 'Tókst að skipta um skrá',
+    'image_rebuild_thumbs' => 'Endurgera stærðastillingar',
+    'image_rebuild_thumbs_success' => 'Tókst að endurgera stærðarstillingar!',
+
+    // Code Editor
+    'code_editor' => 'Breyta kóða',
+    'code_language' => 'Tungumál kóða',
+    'code_content' => 'Innihald kóða',
+    'code_session_history' => 'Saga lotu',
+    'code_save' => 'Vista kóða',
+];
diff --git a/lang/is/editor.php b/lang/is/editor.php
new file mode 100644
index 00000000000..4e0ebcb4438
--- /dev/null
+++ b/lang/is/editor.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'Almennt',
+    'advanced' => 'Ítarlegt',
+    'none' => 'Engin',
+    'cancel' => 'Hætta við',
+    'save' => 'Vista',
+    'close' => 'Loka',
+    'undo' => 'Afturkalla',
+    'redo' => 'Endurgera',
+    'left' => 'Vinstri',
+    'center' => 'Miðja',
+    'right' => 'Hægri',
+    'top' => 'Efst',
+    'middle' => 'Miðja',
+    'bottom' => 'Neðst',
+    'width' => 'Breidd',
+    'height' => 'Hæð',
+    'More' => 'Meira',
+    'select' => 'Velja...',
+
+    // Toolbar
+    'formats' => 'Snið',
+    'header_large' => 'Stór fyrirsögn',
+    'header_medium' => 'Miðlungs fyrirsögn',
+    'header_small' => 'Lítil fyrirsögn',
+    'header_tiny' => 'Örsmá fyrirsögn',
+    'paragraph' => 'Málsgrein',
+    'blockquote' => 'Gæsalappir',
+    'inline_code' => 'Inline code',
+    'callouts' => 'Vitna í',
+    'callout_information' => 'Upplýsingar',
+    'callout_success' => 'Árangur',
+    'callout_warning' => 'Aðvörun',
+    'callout_danger' => 'Hætta',
+    'bold' => 'Feitletrað',
+    'italic' => 'Skáletrað',
+    'underline' => 'Undirstrikað',
+    'strikethrough' => 'Yfirstrikað',
+    'superscript' => 'Háletur',
+    'subscript' => 'Lágletur',
+    'text_color' => 'Litur texta',
+    'custom_color' => 'Sérsniðinn litur',
+    'remove_color' => 'Fjarlægja lit',
+    'background_color' => 'Bakgrunnslitur',
+    'align_left' => 'Jafna til vinstri',
+    'align_center' => 'Miðju jafna',
+    'align_right' => 'Hægrijafna',
+    'align_justify' => 'Jafna',
+    'list_bullet' => 'Punkta listi',
+    'list_numbered' => 'Númeraður listi',
+    'list_task' => 'Aðgerðar listi',
+    'indent_increase' => 'Auka inndrátt',
+    'indent_decrease' => 'Minnka inndrátt',
+    'table' => 'Tafla',
+    'insert_image' => 'Setja inn mynd',
+    'insert_image_title' => 'Setja inn eða breyta mynd',
+    'insert_link' => 'Setja inn eða breyta hlekk',
+    'insert_link_title' => 'Setja inn eða breyta hlekk',
+    'insert_horizontal_line' => 'Setja inn lárétta línu',
+    'insert_code_block' => 'Setja inn kóðastubb',
+    'edit_code_block' => 'Breyta kóðastubb',
+    'insert_drawing' => 'Setja inn eða breyta teikningu',
+    'drawing_manager' => 'Teikningastjóri',
+    'insert_media' => 'Setja inn eða breyta miðlum',
+    'insert_media_title' => 'Setja inn eða breyta miðlum',
+    'clear_formatting' => 'Hreinsa forsnið',
+    'source_code' => 'Frumkóði',
+    'source_code_title' => 'Frumkóði',
+    'fullscreen' => 'Fullann skjá',
+    'image_options' => 'Myndastillingar',
+
+    // Tables
+    'table_properties' => 'Eiginleikar töflu',
+    'table_properties_title' => 'Eiginleikar töflu',
+    'delete_table' => 'Eyða töflu',
+    'table_clear_formatting' => 'Hreinsa forsnið töflu',
+    'resize_to_contents' => 'Endurstilla stærð innihalds',
+    'row_header' => 'Titill raðar',
+    'insert_row_before' => 'Líma röð á undan',
+    'insert_row_after' => 'Líma röð á eftir',
+    'delete_row' => 'Eyða röð',
+    'insert_column_before' => 'Líma dálk á undan',
+    'insert_column_after' => 'Líma dálk á eftir',
+    'delete_column' => 'Eyða dálki',
+    'table_cell' => 'Reitur',
+    'table_row' => 'Röð',
+    'table_column' => 'Dálkur',
+    'cell_properties' => 'Eigindi reitar',
+    'cell_properties_title' => 'Eigindi reitar',
+    'cell_type' => 'Gerð reitar',
+    'cell_type_cell' => 'Reitur',
+    'cell_scope' => 'Svið',
+    'cell_type_header' => 'For reitur',
+    'merge_cells' => 'Sameina reiti',
+    'split_cell' => 'Kljúfa reiti',
+    'table_row_group' => 'Hópur raðar',
+    'table_column_group' => 'Hópur dálks',
+    'horizontal_align' => 'Jafna lárétt',
+    'vertical_align' => 'Jafna lóðrétt',
+    'border_width' => 'Border width',
+    'border_style' => 'Útlit jaðars',
+    'border_color' => 'Litur jaðars',
+    'row_properties' => 'Eigindi raðar',
+    'row_properties_title' => 'Eigindi raðar',
+    'cut_row' => 'Klippa röð',
+    'copy_row' => 'Afrita röð',
+    'paste_row_before' => 'Líma röð á undan',
+    'paste_row_after' => 'Líma röð á eftir',
+    'row_type' => 'Gerð raðar',
+    'row_type_header' => 'Síðuhaus',
+    'row_type_body' => 'Meginmál',
+    'row_type_footer' => 'Neðanmál',
+    'alignment' => 'Jöfnun',
+    'cut_column' => 'Klippa dálk',
+    'copy_column' => 'Afrita dálk',
+    'paste_column_before' => 'Líma dálk á undan',
+    'paste_column_after' => 'Líma dálk á eftir',
+    'cell_padding' => 'Cell padding',
+    'cell_spacing' => 'Cell spacing',
+    'caption' => 'Fyrirsögn',
+    'show_caption' => 'Sýna fyrirsögn',
+    'constrain' => 'Constrain proportions',
+    'cell_border_solid' => 'Fyllt',
+    'cell_border_dotted' => 'Punkta',
+    'cell_border_dashed' => 'Strikað',
+    'cell_border_double' => 'Tvöfalt',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'Engin',
+    'cell_border_hidden' => 'Falin',
+
+    // Images, links, details/summary & embed
+    'source' => 'Uppruni',
+    'alt_desc' => 'Auka lýsing',
+    'embed' => 'Innfellt',
+    'paste_embed' => 'Límdu innfellda kóðann þinn að neðan:',
+    'url' => 'Vistfang',
+    'text_to_display' => 'Teksti til að sýna',
+    'title' => 'Titill',
+    'open_link' => 'Opna hlekk',
+    'open_link_in' => 'Opna hlekk í...',
+    'open_link_current' => 'Virkum glugga',
+    'open_link_new' => 'Nýjum glugga',
+    'remove_link' => 'Fjarlægja hlekk',
+    'insert_collapsible' => 'Insert collapsible block',
+    'collapsible_unwrap' => 'Unwrap',
+    'edit_label' => 'Breyta miða',
+    'toggle_open_closed' => 'Velja opið/lokað',
+    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_label' => 'Sýna miða',
+
+    // About view
+    'about' => 'Um ritilinn',
+    'about_title' => 'Um WYSIWYG ritilinn',
+    'editor_license' => 'Leyfi og höfundaréttur ritilsins',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_tiny_license' => 'Þessi ritill er smíðaður með :tinyLink sem er undir MIT leyfi.',
+    'editor_tiny_license_link' => 'Höfundarétt og leyfi TinyMCE má finna hér.',
+    'save_continue' => 'Vista síðu og halda áfram',
+    'callouts_cycle' => '(Keep pressing to toggle through types)',
+    'link_selector' => 'Hlekkur á innihald',
+    'shortcuts' => 'Flýtileiðir',
+    'shortcut' => 'Flýtileið',
+    'shortcuts_intro' => 'Eftirtaldar flýtileiðir eru aðgengilegar í ritlinum:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'Lýsing',
+];
diff --git a/lang/is/entities.php b/lang/is/entities.php
new file mode 100644
index 00000000000..f4ea3ac6dc5
--- /dev/null
+++ b/lang/is/entities.php
@@ -0,0 +1,460 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'Nýlega búið til',
+    'recently_created_pages' => 'Nýlega stofnaðar síður',
+    'recently_updated_pages' => 'Nýlega uppfærðar síður',
+    'recently_created_chapters' => 'Nýlega stofnaðir kaflar',
+    'recently_created_books' => 'Nýlega stofnaðar bækur',
+    'recently_created_shelves' => 'Nýlega stofnaðar hillur',
+    'recently_update' => 'Nýlega uppfært',
+    'recently_viewed' => 'Nýlega skoðað',
+    'recent_activity' => 'Nýleg virkni',
+    'create_now' => 'Búðu til eina núna',
+    'revisions' => 'Útgáfur',
+    'meta_revision' => 'Úgáfa #:revisionCount',
+    'meta_created' => 'Búið til :timeLength',
+    'meta_created_name' => 'Búið til :timeLength af :user',
+    'meta_updated' => 'Uppfært :timeLength',
+    'meta_updated_name' => 'Uppfært :timeLength af :user',
+    'meta_owned_name' => 'Eigandi :user',
+    'meta_reference_count' => 'Vitnað í af :count item|Vitnað í af :count items',
+    'entity_select' => 'Entity Val',
+    'entity_select_lack_permission' => 'Þú hefur ekki nauðsynlegar aðgangsheimildir til að velja þetta',
+    'images' => 'Myndir',
+    'my_recent_drafts' => 'Nýlegur drögin mín',
+    'my_recently_viewed' => 'Síðast skoða af mér',
+    'my_most_viewed_favourites' => 'Mest skoðuðu eftirlætin',
+    'my_favourites' => 'Eftirlætin mín',
+    'no_pages_viewed' => 'Þú hefur ekki skoðað neinar síður',
+    'no_pages_recently_created' => 'Engar síður hafa verið búnar til nýlega',
+    'no_pages_recently_updated' => 'Engar síður hafa verið uppfærðar nýlega',
+    'export' => 'Flytja út',
+    'export_html' => 'Innifalin vefskrá',
+    'export_pdf' => 'PDF skrá',
+    'export_text' => 'Venjuleg textaskrá',
+    'export_md' => 'Markdown skrá',
+    'export_zip' => 'ZIP skrá',
+    'default_template' => 'Sjálfgefið síðusnið',
+    'default_template_explain' => 'Veldu síðusnið sem verður sjálgefið snið fyrir allar stofnaðar síður innan þessa hluta. Hafðu í huga að þetta verður aðeins notað ef sá sem stofnar síður er með heimild á þetta snið.',
+    'default_template_select' => 'Veldu sniðsíðu',
+    'import' => 'Flytja inn',
+    'import_validate' => 'Staðfesta innflutning',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Veldu ZIP skrá til að hlaða upp',
+    'import_zip_validation_errors' => 'Greindar voru villur við að staðreyna uppgefina ZIP skrá:',
+    'import_pending' => 'Innflutningur í bið',
+    'import_pending_none' => 'Ekkert hefur verið flutt inn.',
+    'import_continue' => 'Halda áfram að flytja inn',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Nánari lýsing á innflutningi',
+    'import_run' => 'Keyra innflutning',
+    'import_size' => ':size Stærð ZIP skrár',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Upphlaðið af',
+    'import_location' => 'Staðsetning innflutnings',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Ertu viss um að þú viljir eyða þessum innflutningi?',
+    'import_delete_desc' => 'Þetta mun eyða innsendri ZIP skrá, þessa aðgerð er ekki hægt að afturkalla.',
+    'import_errors' => 'Villur í innflutningi',
+    'import_errors_desc' => 'Eftirfarandi villur komu upp við innflutning:',
+
+    // Permissions and restrictions
+    'permissions' => 'Réttindi',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_save' => 'Vista réttindi',
+    'permissions_owner' => 'Eigandi',
+    'permissions_role_everyone_else' => 'Allir aðrir',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Yfirskrifa réttindi fyrir hlutverk',
+    'permissions_inherit_defaults' => 'Erfa sjálfgefið',
+
+    // Search
+    'search_results' => 'Leitarniðurstöður',
+    'search_total_results_found' => ':count result found|:count total results found',
+    'search_clear' => 'Hreinsa leit',
+    'search_no_pages' => 'Engar síður passa við þessa leit',
+    'search_for_term' => 'Leita að :term',
+    'search_more' => 'Fleiri niðurstöður',
+    'search_advanced' => 'Ítarleg leit',
+    'search_terms' => 'Leitarorð',
+    'search_content_type' => 'Efnistegund',
+    'search_exact_matches' => 'Nákvæm samsvörun',
+    'search_tags' => 'Leita í örmerkjum',
+    'search_options' => 'Valkostir',
+    'search_viewed_by_me' => 'Skoðað af mér',
+    'search_not_viewed_by_me' => 'Ekki skoðað af mér',
+    'search_permissions_set' => 'Réttindi stillt',
+    'search_created_by_me' => 'Búið til af mér',
+    'search_updated_by_me' => 'Uppfært af mér',
+    'search_owned_by_me' => 'Í minni eigu',
+    'search_date_options' => 'Dagsetningarval',
+    'search_updated_before' => 'Uppfært fyrir',
+    'search_updated_after' => 'Uppfært eftir',
+    'search_created_before' => 'Búið til fyrir',
+    'search_created_after' => 'Búið til eftir',
+    'search_set_date' => 'Dagsetning',
+    'search_update' => 'Uppfæra leit',
+
+    // Shelves
+    'shelf' => 'Hilla',
+    'shelves' => 'Hillur',
+    'x_shelves' => ':count Hilla|:count Hillur',
+    'shelves_empty' => 'Engar hillur hafa verið búnar til',
+    'shelves_create' => 'Búa til hillu',
+    'shelves_popular' => 'Vinsælar hillur',
+    'shelves_new' => 'Nýjar hillur',
+    'shelves_new_action' => 'Ný hilla',
+    'shelves_popular_empty' => 'Vinsælustu hillurnar munu birtast hér.',
+    'shelves_new_empty' => 'Nýjustu hillurnar munu birtast hér.',
+    'shelves_save' => 'Vista hillu',
+    'shelves_books' => 'Bækur í þessari hillu',
+    'shelves_add_books' => 'Bæta við bókum í þessa hillu',
+    'shelves_drag_books' => 'Dragðu bækur hér undir til að bæta þeim í þessa hillu',
+    'shelves_empty_contents' => 'Þessi hilla hefur engar bækur',
+    'shelves_edit_and_assign' => 'Breyttu hillu til að setja inn bækur',
+    'shelves_edit_named' => 'Breyta hillu :name',
+    'shelves_edit' => 'Breyta hillu',
+    'shelves_delete' => 'Eyða hillu',
+    'shelves_delete_named' => 'Eyða hillu :name',
+    'shelves_delete_explain' => "Þetta mun eyða hillunni ':name'. Bókum í þessari hillu verður ekki eytt.",
+    'shelves_delete_confirmation' => 'Ertu viss um að þú viljir eyða hillunni?',
+    'shelves_permissions' => 'Stillingar á réttindum á hillu',
+    'shelves_permissions_updated' => 'Réttindi á hillu uppfærð',
+    'shelves_permissions_active' => 'Réttindi á hillu virk',
+    'shelves_permissions_cascade_warning' => 'Réttindi á hillum yfirfærast ekki á bækurnar sem í hillunni eru. Þetta er vegna þess að ein bók getur verið í mörgum hillum. Réttindi geta hinsvegar verið afrituð niður á bækur með því að nota valmöguleikann hér fyrir neðan.',
+    'shelves_permissions_create' => 'Réttindi til að búa til hillu eru aðeins notuð til að afrita réttindi á undirliggjandi bækur með því að nota aðgerðina hér fyrir neðan. Þau stjórna ekki hvort hægt sé að búa til bækur.',
+    'shelves_copy_permissions_to_books' => 'Afrita réttindi á bækur',
+    'shelves_copy_permissions' => 'Afrita réttindi',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+
+    // Books
+    'book' => 'Bók',
+    'books' => 'Bækur',
+    'x_books' => ':count Bók:count Bækur',
+    'books_empty' => 'Engar bækur hafa verið búnar til',
+    'books_popular' => 'Vinsælar bækur',
+    'books_recent' => 'Nýlegar bækur',
+    'books_new' => 'Nýjar bækur',
+    'books_new_action' => 'Ný bók',
+    'books_popular_empty' => 'Vinsælustu bækurnar munu birtast hér.',
+    'books_new_empty' => 'The most recently created books will appear here.',
+    'books_create' => 'Búa til nýja bók',
+    'books_delete' => 'Eyða bók',
+    'books_delete_named' => 'Eyða bók :bookName',
+    'books_delete_explain' => 'Þetta mun eyða bók með nafninu \':bookName\'. Allar síður og allir kaflar verða fjarlægðir og eytt.',
+    'books_delete_confirmation' => 'Ertu viss um að þú viljir eyða þessari bók?',
+    'books_edit' => 'Breyta bók',
+    'books_edit_named' => 'Breyta bók :bookName',
+    'books_form_book_name' => 'Nafn bókar',
+    'books_save' => 'Vista bók',
+    'books_permissions' => 'Réttindastillingar bókar',
+    'books_permissions_updated' => 'Réttindastillingar bókar uppfærðar',
+    'books_empty_contents' => 'Engar síður eða kaflar hafa verið búin til fyrir þessa bók.',
+    'books_empty_create_page' => 'Búa til nýja síðu',
+    'books_empty_sort_current_book' => 'Raða núverandi bók',
+    'books_empty_add_chapter' => 'Bæta við kafla',
+    'books_permissions_active' => 'Réttindi bókar virk',
+    'books_search_this' => 'Leita í þessari bók',
+    'books_navigation' => 'Leiðartré bókar',
+    'books_sort' => 'Raða innihaldi bókar',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_named' => 'Raða bók :bookName',
+    'books_sort_name' => 'Raða eftir nafni',
+    'books_sort_created' => 'Raða eftir skráningar dagsetningu',
+    'books_sort_updated' => 'Raða eftir upphleðslu dagsetningu',
+    'books_sort_chapters_first' => 'Kaflar fyrst',
+    'books_sort_chapters_last' => 'Kaflar síðast',
+    'books_sort_show_other' => 'Sýna aðrar bækur',
+    'books_sort_save' => 'Vista nýja röð',
+    'books_sort_show_other_desc' => 'Bæta við öðrum bókum til að bæta þeim við röðunina.',
+    'books_sort_move_up' => 'Færa upp',
+    'books_sort_move_down' => 'Færa niður',
+    'books_sort_move_prev_book' => 'Færa í fyrri bók',
+    'books_sort_move_next_book' => 'Færa í næstu bók',
+    'books_sort_move_prev_chapter' => 'Færa inn í fyrri kafla',
+    'books_sort_move_next_chapter' => 'Færa inn í næsta kafla',
+    'books_sort_move_book_start' => 'Færa til byrjunar bókar',
+    'books_sort_move_book_end' => 'Færa í enda bókar',
+    'books_sort_move_before_chapter' => 'Færa í byrjun kafla',
+    'books_sort_move_after_chapter' => 'Færa í lok kafla',
+    'books_copy' => 'Afrita bók',
+    'books_copy_success' => 'Tókst að afrita bók',
+
+    // Chapters
+    'chapter' => 'Kafli',
+    'chapters' => 'Kaflar',
+    'x_chapters' => ':count Kafli|:count Kaflar',
+    'chapters_popular' => 'Vinsælir kaflar',
+    'chapters_new' => 'Nýr kafli',
+    'chapters_create' => 'Búa til nýjan kafla',
+    'chapters_delete' => 'Eyða kafla',
+    'chapters_delete_named' => 'Eyða kafla :chapterName',
+    'chapters_delete_explain' => 'Þetta mun eyða kafla með nafninu \':chapterName\'. Öllum blaðsíðum í þessum kafla verður einnig eytt.',
+    'chapters_delete_confirm' => 'Ertu viss um að þú viljir eyða þessum kafla?',
+    'chapters_edit' => 'Breyta kafla',
+    'chapters_edit_named' => 'Breyta kafla chapterName',
+    'chapters_save' => 'Vista kafla',
+    'chapters_move' => 'Færa kafla',
+    'chapters_move_named' => 'Færa kalfa :chapterName',
+    'chapters_copy' => 'Afrita kafla',
+    'chapters_copy_success' => 'Tókst að afrita kafla',
+    'chapters_permissions' => 'Réttindi á kafla',
+    'chapters_empty' => 'Engar síður eru eins og er í þessum kafla.',
+    'chapters_permissions_active' => 'Réttindi á kafla eru virk',
+    'chapters_permissions_success' => 'Réttindi á kafla hafa verið uppfærð',
+    'chapters_search_this' => 'Leita í þessum kafla',
+    'chapter_sort_book' => 'Raða bók',
+
+    // Pages
+    'page' => 'Síða',
+    'pages' => 'Síður',
+    'x_pages' => ':count Síða|:count Síður',
+    'pages_popular' => 'Vinsælar síður',
+    'pages_new' => 'Ný síða',
+    'pages_attachments' => 'Viðhengi',
+    'pages_navigation' => 'Síðuráp',
+    'pages_delete' => 'Eyða síðu',
+    'pages_delete_named' => 'Eyða síðu :pageName',
+    'pages_delete_draft_named' => 'Eyða drögum :pageName',
+    'pages_delete_draft' => 'Eyða uppkasti',
+    'pages_delete_success' => 'Síðu eytt',
+    'pages_delete_draft_success' => 'Uppkasti að síðu eytt',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_confirm' => 'Ertu viss um að þú viljir eyða þessari síðu?',
+    'pages_delete_draft_confirm' => 'Ertu viss um að þú viljir eyða þessu uppkasti að síðu?',
+    'pages_editing_named' => 'Breyta síðu :pageName',
+    'pages_edit_draft_options' => 'Valkostir uppkasts',
+    'pages_edit_save_draft' => 'Vista uppkast',
+    'pages_edit_draft' => 'Breyta drögum',
+    'pages_editing_draft' => 'Breyta uppkasti',
+    'pages_editing_page' => 'Breyta síðu',
+    'pages_edit_draft_save_at' => 'Vista uppkast ',
+    'pages_edit_delete_draft' => 'Eyða uppkasti',
+    'pages_edit_delete_draft_confirm' => 'Ertu viss um að þú viljir eyða uppkasti síðu? Allar breytingar sem gerðar hafa verið frá síðustu vistun á síðunni munu tapast.',
+    'pages_edit_discard_draft' => 'Henda uppkasti',
+    'pages_edit_switch_to_markdown' => 'Færa þig yfir í Markdown ritil',
+    'pages_edit_switch_to_markdown_clean' => '(Hreinsa innihald)',
+    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_wysiwyg' => 'Skipta yfir í WYSIWYG ritil',
+    'pages_edit_switch_to_new_wysiwyg' => 'Skipta yfir í nýja WYSIWYG ritilinn',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Í alfa prófun)',
+    'pages_edit_set_changelog' => 'Stilla breytingarskrá',
+    'pages_edit_enter_changelog_desc' => 'Skrifaðu stutta lýsingu á breytingunum sem þú gerðir',
+    'pages_edit_enter_changelog' => 'Færa í breytingaskrá',
+    'pages_editor_switch_title' => 'Skipta um ritil',
+    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
+    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_save' => 'Vista síðu',
+    'pages_title' => 'Titill síðu',
+    'pages_name' => 'Nafn síðu',
+    'pages_md_editor' => 'Ritill',
+    'pages_md_preview' => 'Forskoðun',
+    'pages_md_insert_image' => 'Setja inn mynd',
+    'pages_md_insert_link' => 'Insert Entity Link',
+    'pages_md_insert_drawing' => 'Setja inn teikningu',
+    'pages_md_show_preview' => 'Sýna forskoðun',
+    'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_not_in_chapter' => 'Síðan tilheyrir engum kafla',
+    'pages_move' => 'Færa síðu',
+    'pages_copy' => 'Afrita síðu',
+    'pages_copy_desination' => 'Áfangastaður afritunar',
+    'pages_copy_success' => 'Tókst að afrita síðu',
+    'pages_permissions' => 'Réttindi síðu',
+    'pages_permissions_success' => 'Réttindi síðu uppfærð',
+    'pages_revision' => 'Útgáfa',
+    'pages_revisions' => 'Útgáfur síðu',
+    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_named' => 'Page Revisions for :pageName',
+    'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revisions_created_by' => 'Búið til af',
+    'pages_revisions_date' => 'Útgáfu dagsetning',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Útgáfunúmer',
+    'pages_revisions_numbered' => 'Útgáfu #:id',
+    'pages_revisions_numbered_changes' => 'Útgáfu #:id breytingar',
+    'pages_revisions_editor' => 'Gerð ritils',
+    'pages_revisions_changelog' => 'Breytingaskrá',
+    'pages_revisions_changes' => 'Breytingar',
+    'pages_revisions_current' => 'Núverandi útgáfa',
+    'pages_revisions_preview' => 'Forskoðun',
+    'pages_revisions_restore' => 'Endurheimta',
+    'pages_revisions_none' => 'Þessi síða hefur engar útgáfur',
+    'pages_copy_link' => 'Afrita hlekk',
+    'pages_edit_content_link' => 'Hoppa í staðsetningu í ritli',
+    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_label' => 'Page Section Options',
+    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
+    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_permissions_active' => 'Page Permissions Active',
+    'pages_initial_revision' => 'Fyrsta birting',
+    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_initial_name' => 'Ný síða',
+    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
+    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
+    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count users have started editing this page',
+        'start_b' => ':userName has started editing this page',
+        'time_a' => 'since the page was last updated',
+        'time_b' => 'in the last :minCount minutes',
+        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+    ],
+    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
+    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_specific' => 'Tilgreind síða',
+    'pages_is_template' => 'Forsnið síðu',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'Toggle Sidebar',
+    'page_tags' => 'Page Tags',
+    'chapter_tags' => 'Chapter Tags',
+    'book_tags' => 'Book Tags',
+    'shelf_tags' => 'Shelf Tags',
+    'tag' => 'Tag',
+    'tags' =>  'Tags',
+    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tag_name' =>  'Tag Name',
+    'tag_value' => 'Tag Value (Optional)',
+    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
+    'tags_add' => 'Add another tag',
+    'tags_remove' => 'Remove this tag',
+    'tags_usages' => 'Total tag usages',
+    'tags_assigned_pages' => 'Assigned to Pages',
+    'tags_assigned_chapters' => 'Assigned to Chapters',
+    'tags_assigned_books' => 'Assigned to Books',
+    'tags_assigned_shelves' => 'Assigned to Shelves',
+    'tags_x_unique_values' => ':count unique values',
+    'tags_all_values' => 'All values',
+    'tags_view_tags' => 'View Tags',
+    'tags_view_existing_tags' => 'View existing tags',
+    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'attachments' => 'Attachments',
+    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
+    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
+    'attachments_upload' => 'Upload File',
+    'attachments_link' => 'Attach Link',
+    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_set_link' => 'Set Link',
+    'attachments_delete' => 'Are you sure you want to delete this attachment?',
+    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_no_files' => 'No files have been uploaded',
+    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
+    'attachments_link_name' => 'Link Name',
+    'attachment_link' => 'Attachment link',
+    'attachments_link_url' => 'Link to file',
+    'attachments_link_url_hint' => 'Url of site or file',
+    'attach' => 'Attach',
+    'attachments_insert_link' => 'Add Attachment Link to Page',
+    'attachments_edit_file' => 'Edit File',
+    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
+    'attachments_order_updated' => 'Attachment order updated',
+    'attachments_updated_success' => 'Attachment details updated',
+    'attachments_deleted' => 'Attachment deleted',
+    'attachments_file_uploaded' => 'File successfully uploaded',
+    'attachments_file_updated' => 'File successfully updated',
+    'attachments_link_attached' => 'Link successfully attached to page',
+    'templates' => 'Templates',
+    'templates_set_as_template' => 'Page is a template',
+    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
+    'templates_replace_content' => 'Replace page content',
+    'templates_append_content' => 'Append to page content',
+    'templates_prepend_content' => 'Prepend to page content',
+
+    // Profile View
+    'profile_user_for_x' => 'User for :time',
+    'profile_created_content' => 'Created Content',
+    'profile_not_created_pages' => ':userName has not created any pages',
+    'profile_not_created_chapters' => ':userName has not created any chapters',
+    'profile_not_created_books' => ':userName has not created any books',
+    'profile_not_created_shelves' => ':userName has not created any shelves',
+
+    // Comments
+    'comment' => 'Comment',
+    'comments' => 'Comments',
+    'comment_add' => 'Add Comment',
+    'comment_placeholder' => 'Leave a comment here',
+    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_save' => 'Save Comment',
+    'comment_new' => 'New Comment',
+    'comment_created' => 'commented :createDiff',
+    'comment_updated' => 'Updated :updateDiff by :username',
+    'comment_updated_indicator' => 'Updated',
+    'comment_deleted_success' => 'Comment deleted',
+    'comment_created_success' => 'Comment added',
+    'comment_updated_success' => 'Comment updated',
+    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
+    'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+
+    // Revision
+    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
+    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
+    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+
+    // Copy view
+    'copy_consider' => 'Please consider the below when copying content.',
+    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_owner' => 'You will become the owner of all copied content.',
+    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
+    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+
+    // Conversions
+    'convert_to_shelf' => 'Convert to Shelf',
+    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
+    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_book' => 'Convert Book',
+    'convert_book_confirm' => 'Are you sure you want to convert this book?',
+    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_to_book' => 'Convert to Book',
+    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_chapter' => 'Convert Chapter',
+    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+
+    // References
+    'references' => 'References',
+    'references_none' => 'There are no tracked references to this item.',
+    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+
+    // Watch Options
+    'watch' => 'Watch',
+    'watch_title_default' => 'Default Preferences',
+    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_title_ignore' => 'Ignore',
+    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_new' => 'New Pages',
+    'watch_desc_new' => 'Notify when any new page is created within this item.',
+    'watch_title_updates' => 'All Page Updates',
+    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
+    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
+    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
+    'watch_change_default' => 'Change default notification preferences',
+    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_updates' => 'Watching new pages and updates',
+    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
+    'watch_detail_parent_chapter' => 'Watching via parent chapter',
+    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+];
diff --git a/lang/is/errors.php b/lang/is/errors.php
new file mode 100644
index 00000000000..50e30a8c57a
--- /dev/null
+++ b/lang/is/errors.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'Þú hefur ekki heimild til að skoða þessa síðu.',
+    'permissionJson' => 'Þú hefur ekki heimild til að framkvæma þessa aðgerð.',
+
+    // Auth
+    'error_user_exists_different_creds' => 'Notandi með netfangið :email er nú þegar til.',
+    'auth_pre_register_theme_prevention' => 'Ekki var hægt að búa til aðgang með þessum upplýsingum',
+    'email_already_confirmed' => 'Netfang hefur þegar verið staðfest. Prófaðu að skrá þig inn.',
+    'email_confirmation_invalid' => 'Þessi staðfestingar tóki er ekki gildur eða hefur þegar verið notaður. Reyndu að skrá þig aftur.',
+    'email_confirmation_expired' => 'Staðfestingar tóki hefur runnið út. Nýr staðfestinga tölvupóstur hefur verið sendur.',
+    'email_confirmation_awaiting' => 'Eftir á að staðfest þetta netfang',
+    'ldap_fail_anonymous' => 'LDAP auðkenning virkaði ekki',
+    'ldap_fail_authed' => 'LDAP auðkenning virkaði ekki með að nota uppgefið dn & password',
+    'ldap_extension_not_installed' => 'LDAP PHP viðbót ekki uppsett',
+    'ldap_cannot_connect' => 'Næ ekki að tengjast Ldap þjóni. Fyrsta tenging mistókst',
+    'saml_already_logged_in' => 'Þegar innskráður',
+    'saml_no_email_address' => 'Fann ekki netfang fyrir þennan notanda í auðkenningar þjónustu',
+    'saml_invalid_response_id' => 'Beiðnin frá ytri auðkenningaraðila er óþekkt af kerfinu. Að fara tilbaka eftir innskráningu gæti valdið þessu vandamáli.',
+    'saml_fail_authed' => 'Innskráning sem notaði :system tókst ekki. Kerfið gaf ekki út gilda auðkenningu',
+    'oidc_already_logged_in' => 'Þegar skráður inn',
+    'oidc_no_email_address' => 'Fann ekki netfang fyrir þennan notanda í ytri auðkenningar þjónustu',
+    'oidc_fail_authed' => 'Innskráning sem notaði :system tókst ekki. Kerfið gaf ekki út gilda auðkenningu',
+    'social_no_action_defined' => 'Engin aðgerð skilgreind',
+    'social_login_bad_response' => "Villa kom upp við auðkenninga á :socialAccount login",
+    'social_account_in_use' => 'Þessi :socialAccount er þegar í notkun. Reyndu að skrá þig inn með :socialAccount.',
+    'social_account_email_in_use' => 'Netfangið :email er þegar í notkun. Ef þú ert nú þegar með aðgang getur þú tengt :socialAccount við hann í prófíl stillingum.',
+    'social_account_existing' => 'Þessi :socialAccount er nú þegar tengdur við prófílinn þinn.',
+    'social_account_already_used_existing' => 'Þessi :socialAccount reikningur er nú þegar í notkun hjá öðrum notanda.',
+    'social_account_not_used' => 'Þessi :socialAccount er ekki tengdur neinum notanda. Þú getur tengt hann við þig í prófíl stillingar. ',
+    'social_account_register_instructions' => 'Ef þú ert ekki nú þegar með aðgang, getur þú skrá þig með :socialAccount',
+    'social_driver_not_found' => 'Samfélagsviðbót fannst ekki',
+    'social_driver_not_configured' => 'Þínar :socialAccount er ekki rétt stilltar.',
+    'invite_token_expired' => 'Þess boðshlekkur er útrunninn, Prófa að endurstilla lykilorðið þitt.',
+    'login_user_not_found' => 'Enginn notandi fannst fyrir þessa aðgerð.',
+
+    // System
+    'path_not_writable' => 'Ekki var hægt að hlaða upp á slóðinni :filePath. Vertu viss um að slóðin sé skrifanleg.',
+    'cannot_get_image_from_url' => 'Get ekki sótt mynd frá :url',
+    'cannot_create_thumbs' => 'Netþjónninn getur ekki búið til smámyndir. Vertu viss um að þú hafir GD PHP viðbótina uppsetta.',
+    'server_upload_limit' => 'Þessi netþjónn leyfir ekki uphal af þessari stærð. Prófaðu minni skrá.',
+    'server_post_limit' => 'Netþjóninn getur ekki tekið á móti þessu magni gagna. Reyndu aftur með færri eða smærri gögnum.',
+    'uploaded'  => 'Þessi netþjónn leyfir ekki uphal af þessari stærð. Prófaðu minni skrá.',
+
+    // Drawing & Images
+    'image_upload_error' => 'Villa kom upp við að hlaða upp mynd',
+    'image_upload_type_error' => 'Gerð myndar er ógild',
+    'image_upload_replace_type' => 'Myndin sem á að nota við útskipti þarf að vera sömu gerðar',
+    'image_upload_memory_limit' => 'Ekki var hægt að taka við upphali og eða búa til smámyndir þar sem ekki eru auðlindir til staðar.',
+    'image_thumbnail_memory_limit' => 'Ekki var hægt að búa til nokkrar stærðir myndarinnar vegna skorts á auðlindum.',
+    'image_gallery_thumbnail_memory_limit' => 'Ekki var hægt að búa til smámyndayfirlit vegna skorts á auðlindum.',
+    'drawing_data_not_found' => 'Ekki tóks að hlaða inn teikningagögnum. Það gæti vantað skránna eða að þú hafir ekki réttindi að henni.',
+
+    // Attachments
+    'attachment_not_found' => 'Viðhengi fannst ekki',
+    'attachment_upload_error' => 'Það kom upp villa við að hlaða upp viðhenginu',
+
+    // Pages
+    'page_draft_autosave_fail' => 'Gat ekki vistað uppkast. Gættu að þú hafir tengingu við internetið áður en þú vistar þessa síðu',
+    'page_draft_delete_fail' => 'Ekki var hægt að eyða uppkasti og sækja fyrra innihald síðunar',
+    'page_custom_home_deletion' => 'Ekki er hægt að eyða síðu á meðan hún er valin sem sjálfgefin upphafssíða',
+
+    // Entities
+    'entity_not_found' => 'Entity fannst ekki',
+    'bookshelf_not_found' => 'Hilla fannst ekki',
+    'book_not_found' => 'Bók fannst ekki',
+    'page_not_found' => 'Síða fannst ekki',
+    'chapter_not_found' => 'Kafli fannst ekki',
+    'selected_book_not_found' => 'Valin bók fannst ekki',
+    'selected_book_chapter_not_found' => 'Valin bók eða kafli fannst ekki',
+    'guests_cannot_save_drafts' => 'Gestir geta ekki vistað drög',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'Þú getur ekki eytt, bara kerfisstjóri',
+    'users_cannot_delete_guest' => 'Þú getur ekki eytt gesta notanda',
+    'users_could_not_send_invite' => 'Gat ekki stofnað notanda þar sem ekki tókst að senda staðfestingar tölvupóst',
+
+    // Roles
+    'role_cannot_be_edited' => 'Ekki er hægt að breyta þessu hlutverki',
+    'role_system_cannot_be_deleted' => 'Þetta er kerfis hlutverk og því ekki hægt að eyða því',
+    'role_registration_default_cannot_delete' => 'Ekki er hægt að eyða þessu hlutverki þar sem það er sjálfgefið kerfishlutverk við skráningu',
+    'role_cannot_remove_only_admin' => 'Þessi notandi er sá eini sem er með kerfisstjóra hlutverk. Bættu hlutverkinu við annann notanda áður en þú reynir að fjarlægja það héðan.',
+
+    // Comments
+    'comment_list' => 'Villa kom upp við að sækja athugasemdir.',
+    'cannot_add_comment_to_draft' => 'Þú getur ekki sett athugasemdir við drög.',
+    'comment_add' => 'Villa kom upp við að bæta við eða breyta athugasemdinni.',
+    'comment_delete' => 'Villa kom upp við að eyða athugasemdinni.',
+    'empty_comment' => 'Get ekki bætt við tómri athugasemd.',
+
+    // Error pages
+    '404_page_not_found' => 'Síða fannst ekki',
+    'sorry_page_not_found' => 'Síðan sem þú varst að leita að fannst því miður ekki.',
+    'sorry_page_not_found_permission_warning' => 'Ef þú átt von á að þessi síða sé til gæti verið að þú hafir ekki aðgang að henni.',
+    'image_not_found' => 'Fann ekki mynd',
+    'image_not_found_subtitle' => 'Myndin sem þú varst að leita að fannst því miður ekki.',
+    'image_not_found_details' => 'Ef þú heldur að þessi mynda hafi verið til, þá gæti henni hafa verið eytt.',
+    'return_home' => 'Fara á forsíðu',
+    'error_occurred' => 'Það kom upp villa',
+    'app_down' => ':appName er niðri í augnablikinu',
+    'back_soon' => 'Verð komin upp aftur fljótlega.',
+
+    // Import
+    'import_zip_cant_read' => 'Gat ekki lesið ZIP skrá.',
+    'import_zip_cant_decode_data' => 'Fann ekki ZIP data.json innihald.',
+    'import_zip_no_data' => 'ZIP skráin inniheldur ekkert efni.',
+    'import_validation_failed' => 'ZIP skráin stóðst ekki staðfestingu og skilaði villu:',
+    'import_zip_failed_notification' => 'Gat ekki lesið inn ZIP skrá.',
+    'import_perms_books' => 'Þú hefur ekki heimild til að búa til bækur.',
+    'import_perms_chapters' => 'Þú hefur ekki heimild til að búa til kafla.',
+    'import_perms_pages' => 'Þú hefur ekki heimild til að búa til síður.',
+    'import_perms_images' => 'Þú hefur ekki heimild til að búa til myndir.',
+    'import_perms_attachments' => 'Þú hefur ekki heimild til að búa til viðhengi.',
+
+    // API errors
+    'api_no_authorization_found' => 'Engin auðkenningar tóki fannst í aðgerðinni',
+    'api_bad_authorization_format' => 'Auðkenningar tóki fannst með aðgerðinni en snið hans er rangt',
+    'api_user_token_not_found' => 'Engin API tóki fannst á móti þessum auðkenningar tóka',
+    'api_incorrect_token_secret' => 'Leyndarmálið sem gefið var upp fyrir API tókann er rangt',
+    'api_user_no_api_permission' => 'Eigandi API tókans hefur ekki heimild til að gera API köll',
+    'api_user_token_expired' => 'Auðkenningar tókin er útrunninn',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'Villa kom upp viðað reyna senda prufu tölvupóst:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'Þetta vistfang stemmir ekki við leyfða SSR biðlara',
+];
diff --git a/lang/is/notifications.php b/lang/is/notifications.php
new file mode 100644
index 00000000000..b4fe01ad748
--- /dev/null
+++ b/lang/is/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'Ný athugasemd á síðu :pageName',
+    'new_comment_intro' => 'Notandi hefur sett inn athugasemd á síðu á :appName:',
+    'new_page_subject' => 'Ný síða á: :pageName',
+    'new_page_intro' => 'Ný síða hefur verið búin til á :appName:',
+    'updated_page_subject' => 'Uppfærð síða á: :pageName',
+    'updated_page_intro' => 'Síða hefur verið uppfærð á :appName:',
+    'updated_page_debounce' => 'Til að fyrirbyggja fjöldatilkynningar verður þér ekki sendar tilkynningar í smá stund um uppfærslu á þessari síðu frá sama höfundi.',
+
+    'detail_page_name' => 'Síðunafn:',
+    'detail_page_path' => 'Síðuslóð:',
+    'detail_commenter' => 'Notandi:',
+    'detail_comment' => 'Athugasemd:',
+    'detail_created_by' => 'Búið til af:',
+    'detail_updated_by' => 'Uppfært af:',
+
+    'action_view_comment' => 'Skoða athugasemd',
+    'action_view_page' => 'Skoða síðu',
+
+    'footer_reason' => 'Þessi tilkynning var send til þín vegna :link nær yfir þessa virkni á þessum hlut.',
+    'footer_reason_link' => 'stillingar á tilkynningum til þín',
+];
diff --git a/lang/is/pagination.php b/lang/is/pagination.php
new file mode 100644
index 00000000000..3eca2f26e4a
--- /dev/null
+++ b/lang/is/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; Fyrri',
+    'next'     => 'Næsta&raquo;',
+
+];
diff --git a/lang/is/passwords.php b/lang/is/passwords.php
new file mode 100644
index 00000000000..b8c093b0388
--- /dev/null
+++ b/lang/is/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'Lykilorð verður að vera að lágmarki 8 stafir og stemma saman.',
+    'user' => "Enginn notandi finnst með þetta netfang.",
+    'token' => 'Tókinn er ógildur fyrir þetta netfang.',
+    'sent' => 'Þér hefur verið sendur hlekkur í tölvupósti!',
+    'reset' => 'Lykilorðinu hefur verið breytt!',
+
+];
diff --git a/lang/is/preferences.php b/lang/is/preferences.php
new file mode 100644
index 00000000000..b7ebc2df00a
--- /dev/null
+++ b/lang/is/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'Minn aðgangur',
+
+    'shortcuts' => 'Flýtileiðir',
+    'shortcuts_interface' => 'UI, stillingar flýtileiða',
+    'shortcuts_toggle_desc' => 'Hér getur þú virkjað eða óvirkjað flýtilykla, notað fyrir leiðarstýringu og aðgerðir.',
+    'shortcuts_customize_desc' => 'Þú getur stillt alla flýtilyklana hér að neðan. Þú ýtir þá þann flýtilykil sem þú vilt nota eftir að þú hefur valið innsláttarleið.',
+    'shortcuts_toggle_label' => 'Flýtilyklar virkjaðir',
+    'shortcuts_section_navigation' => 'Leiðarstýring',
+    'shortcuts_section_actions' => 'Algengar aðgerðir',
+    'shortcuts_save' => 'Vista flýtilykla',
+    'shortcuts_overlay_desc' => 'Ath: þegar flýtilyklar eru virkjaðir er hægt að fá aðstoð með því að ýta á "?" sem mun yfirstrika þær flýtileiðir sem í boði eru.',
+    'shortcuts_update_success' => 'Stillingar flýtilykla hafa verið uppfærðar!',
+    'shortcuts_overview_desc' => 'Stjórna þeim flýtilyklum sem í boði eru.',
+
+    'notifications' => 'Stillingar tilkynninga',
+    'notifications_desc' => 'Stýrðu þeim tölvupóst tilkynningum sem þú færð þegar ákveðnar aðgerðir eru gerðar af kerfinu.',
+    'notifications_opt_own_page_changes' => 'Láta vita þegar gerðar eru breytingar á síðum sem ég á',
+    'notifications_opt_own_page_comments' => 'Láta vita þegar gerðar eru athugasmedir við síður sem ég á',
+    'notifications_opt_comment_replies' => 'Láta vita þegar athugasemdum mínum er svarað',
+    'notifications_save' => 'Vista stillingar',
+    'notifications_update_success' => 'Stillingar á tilkynningum hafa verið uppfærðar!',
+    'notifications_watched' => 'Watched & Ignored Items',
+    'notifications_watched_desc' => 'Fyrir neðan eru hlutir sem hafa sérsniðna eftirfylgni stillta. Til að uppfæra stillingarnar fyrir þessa hluti skaltu skoða hann og og finna skoðastillinguna í hliðarstikunni.',
+
+    'auth' => 'Aðgangur og öryggi',
+    'auth_change_password' => 'Breyta lykilorði',
+    'auth_change_password_desc' => 'Breyta lykilorðinu sem þú notar til að skrá þig inn í hugbúnaðinn. Lykilorðið verður að vera a. m. k 8 stafa langt.',
+    'auth_change_password_success' => 'Lykilorði hefur verið breytt!',
+
+    'profile' => 'Upplýsingar um prófíl',
+    'profile_desc' => 'Stýra þeim upplýsingum um þig sem aðrir notendur sjá.',
+    'profile_view_public' => 'Skoða almennan prófíl',
+    'profile_name_desc' => 'Stilla þitt notendanafn sem er sýnlegt öðrum notendum.',
+    'profile_email_desc' => 'Þetta netfang verður notað fyrir tilkynningar og aðgang að kerfinu hafir þú valið svo.',
+    'profile_email_no_permission' => 'Þú hefur ekki heimild til að breyta netfanginu þinu. Ef þú vilt láta breyta því verður þú að hafa samband við kerfisstjóra.',
+    'profile_avatar_desc' => 'Veldu mynd til að sýna öðrum notendum. Helst þarf þessi mynd að vera ferköntuð og um það bil 256px bæði á breidd og hæð.',
+    'profile_admin_options' => 'Stillingar kerfisstjóra',
+    'profile_admin_options_desc' => 'Viðbótar kerfistjóra stillingar, til dæmis stjórnun á hlutverkum sem finna á í "Stillingar > Notendur svæði hugbúnaðarins.',
+
+    'delete_account' => 'Eyða aðgangi',
+    'delete_my_account' => 'Eyða reikningi mínum',
+    'delete_my_account_desc' => 'Þetta mun eyða þínum aðgangi að hugbúnaðinum. Þú munt ekki geta enduheimt aðganginn. Efni sem þú hefur búið til eins og síður og þær myndir sem þú hefur sent inn munu halda sér.',
+    'delete_my_account_warning' => 'Ertu viss um að þú viljir eyða aðganginum þínum?',
+];
diff --git a/lang/is/settings.php b/lang/is/settings.php
new file mode 100644
index 00000000000..14b0ec8e32d
--- /dev/null
+++ b/lang/is/settings.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'Stillingar',
+    'settings_save' => 'Vista stillingar',
+    'system_version' => 'Kerfisútgáfa',
+    'categories' => 'Flokkar',
+
+    // App Settings
+    'app_customization' => 'Sérsníða',
+    'app_features_security' => 'Eigindi og öryggi',
+    'app_name' => 'Nafn kerfis',
+    'app_name_desc' => 'Þetta nafn er sýnd í titli og í öllum tölvupóstum sem sendir eru.',
+    'app_name_header' => 'Sýna nafn í titli',
+    'app_public_access' => 'Almennur aðgangur',
+    'app_public_access_desc' => 'Með því að virkja þennan valmöguleika munu notendur sem eru ekki skráðir inn geta skoðað innihald vefsins.',
+    'app_public_access_desc_guest' => 'Hægt er að stýra almennum aðgangi í gegnum "Guest" notandann.',
+    'app_public_access_toggle' => 'Leyfa almennann aðgang',
+    'app_public_viewing' => 'Leyfa almenna skoðun?',
+    'app_secure_images' => 'Aukið öryggi á mynda upphal',
+    'app_secure_images_toggle' => 'Virkja aukið öryggi á mynda upphal',
+    'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.',
+    'app_default_editor' => 'Sjálfgefin ritill',
+    'app_default_editor_desc' => 'Veldu hvaða ritil á að nota sjálfgefið þegar unnið er með nýjar síður. Hægt er að yfirskrifa þessa stillingu á hverri síðu ef viðkomandi er með réttindi.',
+    'app_custom_html' => 'Custom HTML Head Content',
+    'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
+    'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
+    'app_logo' => 'Lógó síðu',
+    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_icon' => 'Íkon síðu',
+    'app_icon_desc' => 'Þetta íkon er notað í tabs í vöfrum og sem flýtivísir á síðu. Þetta ætti að vera 256px PNG mynd.',
+    'app_homepage' => 'Heimasíða',
+    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
+    'app_homepage_select' => 'Veldu síðu',
+    'app_footer_links' => 'Neðangreins hlekkir',
+    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
+    'app_footer_links_label' => 'Miði hlekks',
+    'app_footer_links_url' => 'Vistfang hlekks',
+    'app_footer_links_add' => 'Bæta við neðangreinshlekk',
+    'app_disable_comments' => 'Óvirkja athugasemdir',
+    'app_disable_comments_toggle' => 'Óvirkja athugasemdir',
+    'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
+
+    // Color settings
+    'color_scheme' => 'Litaþema hugbúnaðar',
+    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
+    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'app_color' => 'Aðal litur',
+    'link_color' => 'Aðal litur hlekkja',
+    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'bookshelf_color' => 'Litur hillu',
+    'book_color' => 'Litur Bóka',
+    'chapter_color' => 'Litur kalfa',
+    'page_color' => 'Litur síðu',
+    'page_draft_color' => 'Litur draga',
+
+    // Registration Settings
+    'reg_settings' => 'Skráning',
+    'reg_enable' => 'Virkja skráningar',
+    'reg_enable_toggle' => 'Virkja skráningar',
+    'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
+    'reg_default_role' => 'Sjálfgefið hlutverk notanda eftir skráningu',
+    'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
+    'reg_email_confirmation' => 'Tölvupóst staðfesting',
+    'reg_email_confirmation_toggle' => 'Krefast staðfestingar í tölvupósti',
+    'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.',
+    'reg_confirm_restrict_domain' => 'Læsingar á lén',
+    'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
+    'reg_confirm_restrict_domain_placeholder' => 'Engin skilyrði sett',
+
+    // Maintenance settings
+    'maint' => 'Viðhald',
+    'maint_image_cleanup' => 'Taka til í myndum',
+    'maint_image_cleanup_desc' => 'Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.',
+    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_image_cleanup_run' => 'Keyra hreinsun',
+    'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
+    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
+    'maint_image_cleanup_nothing_found' => 'Engar ónotaðar myndir fundust, engu eytt!',
+    'maint_send_test_email' => 'Senda prufu tölvupóst',
+    'maint_send_test_email_desc' => 'Þessi aðgerð sendir prufu tölvupóst á netfangið sem stillt er á í prófílnum þínum.',
+    'maint_send_test_email_run' => 'Senda prufu tölvupóst',
+    'maint_send_test_email_success' => 'Tölvupóstur sendur á :address',
+    'maint_send_test_email_mail_subject' => 'Prufupóstur',
+    'maint_send_test_email_mail_greeting' => 'Það virðist virka að senda tölvupóst!',
+    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
+    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_open' => 'Opna ruslatunnu',
+    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
+    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+
+    // Recycle Bin
+    'recycle_bin' => 'Ruslatunna',
+    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_deleted_item' => 'Eyddur hlutur',
+    'recycle_bin_deleted_parent' => 'Foreldri',
+    'recycle_bin_deleted_by' => 'Eytt af',
+    'recycle_bin_deleted_at' => 'Eytt þann',
+    'recycle_bin_permanently_delete' => 'Eyða varanlega',
+    'recycle_bin_restore' => 'Endurheimta',
+    'recycle_bin_contents_empty' => 'Ruslatunnan er tóm',
+    'recycle_bin_empty' => 'Tæma ruslatunnu',
+    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_list' => 'Hlutir til eyðingar',
+    'recycle_bin_restore_list' => 'Hlutir til endurheimtar',
+    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
+    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_parent' => 'Endurheimta foreldri',
+    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
+    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+
+    // Audit Log
+    'audit' => 'Ferilskrá',
+    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_event_filter' => 'Atburðasía',
+    'audit_event_filter_no_filter' => 'Engin sía',
+    'audit_deleted_item' => 'Eyddur hlutur',
+    'audit_deleted_item_name' => 'Nafn :name',
+    'audit_table_user' => 'Notandi',
+    'audit_table_event' => 'Atburður',
+    'audit_table_related' => 'Tengdur hlutur eða lýsing',
+    'audit_table_ip' => 'IP tala',
+    'audit_table_date' => 'Dagsetning virkni',
+    'audit_date_from' => 'Dagsetning frá',
+    'audit_date_to' => 'Dagsetning til',
+
+    // Role Settings
+    'roles' => 'Hlutverk',
+    'role_user_roles' => 'Notanda hlutverk',
+    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_assigned_users' => 'Skilgreindir notendur',
+    'roles_permissions_provided' => 'Uppgefnar heimildir',
+    'role_create' => 'Búa til nýtt hlutverk',
+    'role_delete' => 'Eyða hlutverki',
+    'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.',
+    'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.',
+    'role_delete_no_migration' => "Don't migrate users",
+    'role_delete_sure' => 'Are you sure you want to delete this role?',
+    'role_edit' => 'Breyta hlutverki',
+    'role_details' => 'Lýsing á hlutverki',
+    'role_name' => 'Nafn hlutverks',
+    'role_desc' => 'Stutt lýsing á hlutverki',
+    'role_mfa_enforced' => 'Krefst tvöfaldrar auðkenningar',
+    'role_external_auth_id' => 'Ytri auðkenningarnúmer',
+    'role_system' => 'Réttindastillingar kerfis',
+    'role_manage_users' => 'Sýsla með notendur',
+    'role_manage_roles' => 'Stýra hlutverkum og réttindum hlutverka',
+    'role_manage_entity_permissions' => 'Stýra öllum bóka, kafla og síðu réttindum',
+    'role_manage_own_entity_permissions' => 'Stýra réttindum á eigin bókum, köflum og síðum',
+    'role_manage_page_templates' => 'Stýra síðu sníðmátum',
+    'role_access_api' => 'Access system API',
+    'role_manage_settings' => 'Manage app settings',
+    'role_export_content' => 'Flytja út efni',
+    'role_import_content' => 'Flytja inn efni',
+    'role_editor_change' => 'Skipta um ritil síðu',
+    'role_notifications' => 'Receive & manage notifications',
+    'role_asset' => 'Asset Permissions',
+    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
+    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
+    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_all' => 'Allt',
+    'role_own' => 'Eigin',
+    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_save' => 'Vista hlutverk',
+    'role_users' => 'Notendur í þessu hlutverki',
+    'role_users_none' => 'Engir notendur eru eins og er í þessu hlutverki',
+
+    // Users
+    'users' => 'Notendur',
+    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'user_profile' => 'Prófíll notanda',
+    'users_add_new' => 'Bæta við nýjum notanda',
+    'users_search' => 'Leita að notendum',
+    'users_latest_activity' => 'Síðasta virkni',
+    'users_details' => 'Notendaupplýsingar',
+    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
+    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
+    'users_role' => 'Hlutverk notenda',
+    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
+    'users_password' => 'Lykilorð notanda',
+    'users_password_desc' => 'Setja lykilorð sem þú notar til að skrá þig inn í hugbúnaðinn. Lykilorðið verður að vera a. m. k 8 stafa langt.',
+    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
+    'users_send_invite_option' => 'Senda boð á notanda með tölvupósti',
+    'users_external_auth_id' => 'Ytra auðkenningar númer',
+    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_delete' => 'Eyða notanda',
+    'users_delete_named' => 'Eyða notanda :userName',
+    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
+    'users_delete_confirm' => 'Ertu viss um að þú viljir eyða þessum notanda?',
+    'users_migrate_ownership' => 'Færa eignarhald',
+    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_none_selected' => 'Engin notandi valin',
+    'users_edit' => 'Breyta notanda',
+    'users_edit_profile' => 'Breyta prófíl',
+    'users_avatar' => 'Avatar notanda',
+    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
+    'users_preferred_language' => 'Valið tungumál',
+    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
+    'users_social_accounts' => 'Samfélagsmiðla reikningar',
+    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
+    'users_social_connect' => 'Tengja aðgang',
+    'users_social_disconnect' => 'Aftengja aðgang',
+    'users_social_status_connected' => 'Tengt',
+    'users_social_status_disconnected' => 'Aftengt',
+    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
+    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
+    'users_api_tokens' => 'API tókar',
+    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_none' => 'No API tokens have been created for this user',
+    'users_api_tokens_create' => 'Búa til tóka',
+    'users_api_tokens_expires' => 'Rennur út',
+    'users_api_tokens_docs' => 'API Documentation',
+    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_configure' => 'Configure Methods',
+
+    // API Tokens
+    'user_api_token_create' => 'Búa til API tóka',
+    'user_api_token_name' => 'Nafn',
+    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_expiry' => 'Rennur út þann',
+    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
+    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token' => 'API tóki',
+    'user_api_token_id' => 'Númer tóka',
+    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
+    'user_api_token_secret' => 'Tóka leyndarmál',
+    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_created' => 'Tóki búinn til :timeAgo',
+    'user_api_token_updated' => 'Tóki uppfærður :timeAgo',
+    'user_api_token_delete' => 'Eyða tóka',
+    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
+    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
+    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_create' => 'Búa til nýjann Webhook',
+    'webhooks_none_created' => 'Engir Webhooks hafa verið búnir til.',
+    'webhooks_edit' => 'Breyta Webhook',
+    'webhooks_save' => 'Vista Webhook',
+    'webhooks_details' => 'Upplýsingar um Webhook',
+    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_events' => 'Webhook atburðir',
+    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
+    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_events_all' => 'Allir kerfis atburðir',
+    'webhooks_name' => 'Webhook nafn',
+    'webhooks_timeout' => 'Webhook tímamörk (Sekúndur)',
+    'webhooks_endpoint' => 'Webhook endapunktur',
+    'webhooks_active' => 'Webhook virkur',
+    'webhook_events_table_header' => 'Atburðir',
+    'webhooks_delete' => 'Eyða Webhook',
+    'webhooks_delete_warning' => 'Þessi aðgerð mun eyða þessum Webhook að fullu \':webhookName\',.',
+    'webhooks_delete_confirm' => 'Ertu viss um að þú viljir eyða þessum Webhook?',
+    'webhooks_format_example' => 'Dæmi um snið á Webhook',
+    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_status' => 'Staða á Webhook',
+    'webhooks_last_called' => 'Síðast kallað:',
+    'webhooks_last_errored' => 'Síðasta villa kom upp:',
+    'webhooks_last_error_message' => 'Síðustu villuskilaboð:',
+
+    // Licensing
+    'licenses' => 'Leyfi',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'Bookstack leyfi',
+    'licenses_php' => 'PHP kóðasafnsleyfi',
+    'licenses_js' => 'Javascript kóðasafnsleyfi',
+    'licenses_other' => 'Önnur leyfi',
+    'license_details' => 'Upplýsingar um leyfi',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/is/validation.php b/lang/is/validation.php
new file mode 100644
index 00000000000..9183d27cf53
--- /dev/null
+++ b/lang/is/validation.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'Það verður að samþykkja :attribute.',
+    'active_url'           => ':attribute Er ekki gilt vistfang.',
+    'after'                => ':attribute verður að vera dagsetning eftir :date.',
+    'alpha'                => ':attribute má eingöngu innihalda stafi.',
+    'alpha_dash'           => ':attribute má eingöngu innihalda stafi, tölustafi, strik og undirstrik.',
+    'alpha_num'            => ':attribute má eingöngu innihalda stafi og tölustafi.',
+    'array'                => 'The :attribute must be an array.',
+    'backup_codes'         => 'Kóðinn sem þú gafst upp er ekki gildur eða hefur þegar verið notaður.',
+    'before'               => ':attribute verður að vera dagsetning á undan :date.',
+    'between'              => [
+        'numeric' => ':attribute verður að vera á milli :min og :max.',
+        'file'    => ':attribute verður að vera á milli :min og :max kílóbæti.',
+        'string'  => ':attribute verður að vera á milli :min og :max stafir.',
+        'array'   => ':attribute verður að vera á milli :min og :max fjöldi.',
+    ],
+    'boolean'              => ':attribute gildið verður að vera true og false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values',
+    'file'                 => 'The :attribute must be provided as a valid file.',
+    'filled'               => 'The :attribute field is required.',
+    'gt'                   => [
+        'numeric' => 'The :attribute must be greater than :value.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
+    ],
+    'gte'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
+    ],
+    'exists'               => 'The selected :attribute is invalid.',
+    'image'                => 'The :attribute must be an image.',
+    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
+    ],
+    'lte'                  => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
+    ],
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'safe_url'             => 'The provided link may not be safe.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'totp'                 => 'The provided code is not valid or has expired.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'Staðfestingu á lykilorði er krafist',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/it/activities.php b/lang/it/activities.php
index 61a22518551..0747d7784e5 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'ha eliminato un webhook',
     'webhook_delete_notification' => 'Webhook eliminato con successo',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'ha creato un utente',
     'user_create_notification' => 'Utente creato con successo',
diff --git a/lang/it/editor.php b/lang/it/editor.php
index f9a6e47ae03..11b019ee382 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Informazioni sull\'editor',
     'about_title' => 'Informazioni sull\'editor di WYSIWYG',
     'editor_license' => 'Licenza e copyright dell\'editor',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Questo editor è realizzato usando :tinyLink che è fornito sotto la licenza MIT.',
     'editor_tiny_license_link' => 'I dettagli del copyright e della licenza di TinyMCE sono disponibili qui.',
     'save_continue' => 'Salva pagina e continua',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index d7542b1ba11..22c428ed3e1 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'File PDF',
     'export_text' => 'File di testo',
     'export_md' => 'File Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Modello di pagina predefinito',
     'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tieni presente che potrà essere utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
     'default_template_select' => 'Seleziona una pagina modello',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permessi',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index 5120a6d71e9..a68da405bb5 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName è offline al momento',
     'back_soon' => 'Tornerà presto online.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nessun token di autorizzazione trovato nella richiesta',
     'api_bad_authorization_format' => 'Un token di autorizzazione è stato trovato nella richiesta, ma il formato sembra non corretto',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 5d68fd26d1f..e57baceb49e 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Accedere alle API di sistema',
     'role_manage_settings' => 'Gestire impostazioni app',
     'role_export_content' => 'Esportare contenuto',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Cambiare editor di pagina',
     'role_notifications' => 'Ricevere e gestire le notifiche',
     'role_asset' => 'Permessi entità',
diff --git a/lang/it/validation.php b/lang/it/validation.php
index f8f59a3ac0f..b21e8d932b4 100644
--- a/lang/it/validation.php
+++ b/lang/it/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Il formato :attribute non è valido.',
     'uploaded'             => 'Il file non può essere caricato. Il server potrebbe non accettare file di questa dimensione.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index 0e6e8d3ce83..f20f9a90d5a 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'がWebhookを削除',
     'webhook_delete_notification' => 'Webhookを削除しました',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'がユーザを作成',
     'user_create_notification' => 'ユーザーを作成しました',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 22162796c0b..576e08f14b2 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -163,6 +163,8 @@
     'about' => 'エディタについて',
     'about_title' => 'WYSIWYGエディタについて',
     'editor_license' => 'エディタのライセンスと著作権',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'このエディタはMITライセンスの下で提供される:tinyLinkを利用して構築されています。',
     'editor_tiny_license_link' => 'TinyMCEの著作権およびライセンスの詳細は、こちらをご覧ください。',
     'save_continue' => 'ページを保存して続行',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 489032835cc..05e2f33ab8f 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF',
     'export_text' => 'テキストファイル',
     'export_md' => 'Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'デフォルトページテンプレート',
     'default_template_explain' => 'このアイテム内に新しいページを作成する際にデフォルトコンテンツとして使用されるページテンプレートを割り当てます。これはページ作成者が選択したテンプレートページへのアクセス権を持つ場合にのみ使用されることに注意してください。',
     'default_template_select' => 'テンプレートページを選択',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => '権限',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index 4eba6365934..ca001d7680b 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appNameは現在停止しています',
     'back_soon' => '回復までしばらくお待ちください。',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'リクエストに認証トークンが見つかりません',
     'api_bad_authorization_format' => 'リクエストに認証トークンが見つかりましたが、形式が正しくないようです',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 218eecf8c2c..d73f12cb2c9 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'システムのAPIへのアクセス',
     'role_manage_settings' => 'アプリケーション設定の管理',
     'role_export_content' => 'コンテンツのエクスポート',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'ページエディタの変更',
     'role_notifications' => '通知の受信と管理',
     'role_asset' => 'アセット権限',
diff --git a/lang/ja/validation.php b/lang/ja/validation.php
index 96ae7dfff24..110bcb01213 100644
--- a/lang/ja/validation.php
+++ b/lang/ja/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attributeのフォーマットは不正です。',
     'uploaded'             => 'ファイルをアップロードできませんでした。サーバーがこのサイズのファイルを受け付けていない可能性があります。',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ka/activities.php b/lang/ka/activities.php
index 6c7af4429f0..4cc9fbcb66a 100644
--- a/lang/ka/activities.php
+++ b/lang/ka/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'deleted webhook',
     'webhook_delete_notification' => 'Webhook successfully deleted',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/ka/editor.php b/lang/ka/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/ka/editor.php
+++ b/lang/ka/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index 35e6f050bb8..26a563a7eb5 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/ka/errors.php b/lang/ka/errors.php
index 9c40aa9ed33..9d738379648 100644
--- a/lang/ka/errors.php
+++ b/lang/ka/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index 5427cb9419e..c0b6b692a57 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/lang/ka/validation.php b/lang/ka/validation.php
index 2a676c7c4cc..d9b982d1e23 100644
--- a/lang/ka/validation.php
+++ b/lang/ka/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index bcf34795622..356568d1fd6 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -77,13 +77,21 @@
     'maintenance_action_run' => '유지 관리 작업 실행',
 
     // Webhooks
-    'webhook_create' => '웹 훅 만들기',
+    'webhook_create' => '웹 훅 생성',
     'webhook_create_notification' => '웹 훅 생성함',
     'webhook_update' => '웹 훅 수정하기',
     'webhook_update_notification' => '웹훅 설정이 수정되었습니다.',
     'webhook_delete' => '웹 훅 지우기',
     'webhook_delete_notification' => '웹 훅 삭제함',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => '사용자 생성',
     'user_create_notification' => '사용자 생성 성공',
diff --git a/lang/ko/common.php b/lang/ko/common.php
index 246a3aebc36..b19b0d5cdd2 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -71,7 +71,7 @@
     'back_to_top' => '맨 위로',
     'skip_to_main_content' => '메인 항목으로',
     'toggle_details' => '내용 보기',
-    'toggle_thumbnails' => '섬네일 보기',
+    'toggle_thumbnails' => '썸네일 보기',
     'details' => '정보',
     'grid_view' => '격자 보기',
     'list_view' => '목록 보기',
@@ -101,7 +101,7 @@
 
     // Email Content
     'email_action_help' => ':actionText를 클릭할 수 없을 때는 웹 브라우저에서 다음 링크로 접속할 수 있습니다.',
-    'email_rights' => 'All rights reserved.',
+    'email_rights' => '모든 권리는 보호됩니다.',
 
     // Footer Link Options
     // Not directly used but available for convenience to users.
diff --git a/lang/ko/components.php b/lang/ko/components.php
index c81497e0308..cbda4d15980 100644
--- a/lang/ko/components.php
+++ b/lang/ko/components.php
@@ -12,7 +12,7 @@
     'image_intro' => '여기에서 이전에 시스템에 업로드한 이미지를 선택하고 관리할 수 있습니다.',
     'image_intro_upload' => '이미지 파일을 이 창으로 끌어다 놓거나 위의 \'이미지 업로드\' 버튼을 사용하여 새 이미지를 업로드합니다.',
     'image_all' => '모든 이미지',
-    'image_all_title' => '모든 이미지',
+    'image_all_title' => '모든 이미지 보기',
     'image_book_title' => '이 책에서 쓰고 있는 이미지',
     'image_page_title' => '이 문서에서 쓰고 있는 이미지',
     'image_search_hint' => '이미지 이름 검색',
@@ -30,8 +30,8 @@
     'images_deleted' => '이미지 삭제함',
     'image_preview' => '이미지 미리 보기',
     'image_upload_success' => '이미지 올림',
-    'image_update_success' => '이미지 정보 수정함',
-    'image_delete_success' => '이미지 삭제함',
+    'image_update_success' => '이미지 정보가 수정되었습니다.',
+    'image_delete_success' => '이미지가 삭제되었습니다.',
     'image_replace' => '이미지 교체',
     'image_replace_success' => '이미지 파일 업데이트 성공',
     'image_rebuild_thumbs' => '사이즈 변경 재생성하기',
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index 485ab79cd94..6892410169d 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -163,6 +163,8 @@
     'about' => '이 편집기에 대하여',
     'about_title' => 'WYSIWYG 편집기에 대하여',
     'editor_license' => '편집기 라이선스 & 저작권',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => '전체 라이센스 세부 사항은 여기에서 확인할 수 있습니다.',
     'editor_tiny_license' => '이 편집기는 MIT 라이선스에 따라 제공되는 :tinyLink를 사용하여 제작되었습니다.',
     'editor_tiny_license_link' => 'TinyMCE의 저작권 및 라이선스 세부 정보는 여기에서 확인할 수 있습니다.',
     'save_continue' => '저장하고 계속하기',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 4afd174f5f0..4fbbe376629 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF 파일',
     'export_text' => '일반 텍스트 파일',
     'export_md' => '마크다운 파일',
+    'export_zip' => 'Portable ZIP',
     'default_template' => '기본 페이지 템플릿',
     'default_template_explain' => '이 항목 내에서 생성되는 모든 페이지의 기본 콘텐츠로 사용할 페이지 템플릿을 지정합니다. 페이지 작성자가 선택한 템플릿 페이지를 볼 수 있는 권한이 있는 경우에만 이 항목이 사용된다는 점을 유의하세요.',
     'default_template_select' => '템플릿 페이지 선택',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => '같은 인스턴스나 다른 인스턴스에서 휴대용 zip 내보내기를 사용하여 책, 장 및 페이지를 가져옵니다. 진행하려면 ZIP 파일을 선택합니다. 파일을 업로드하고 검증한 후 다음 보기에서 가져오기를 구성하고 확인할 수 있습니다.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => '업로드된 ZIP 파일이 삭제되며, 실행 취소할 수 없습니다.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => '권한',
@@ -130,7 +151,7 @@
     'books_delete' => '책 삭제하기',
     'books_delete_named' => ':bookName(을)를 지웁니다.',
     'books_delete_explain' => ':bookName에 있는 모든 챕터와 문서도 지웁니다.',
-    'books_delete_confirmation' => '이 책을 지울 건가요?',
+    'books_delete_confirmation' => '이 책을 지우시겠습니까?',
     'books_edit' => '책 바꾸기',
     'books_edit_named' => ':bookName(을)를 바꿉니다.',
     'books_form_book_name' => '책 이름',
@@ -139,7 +160,7 @@
     'books_permissions_updated' => '권한 저장함',
     'books_empty_contents' => '이 책에 챕터나 문서가 없습니다.',
     'books_empty_create_page' => '문서 만들기',
-    'books_empty_sort_current_book' => '읽고 있는 책 정렬',
+    'books_empty_sort_current_book' => '현재 책 정렬',
     'books_empty_add_chapter' => '챕터 만들기',
     'books_permissions_active' => '책 권한 허용함',
     'books_search_this' => '이 책에서 검색',
@@ -224,7 +245,7 @@
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG 편집기로 전환',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => '새 위지윅 편집기로 변경',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => '수정본 설명',
     'pages_edit_enter_changelog_desc' => '수정본 설명',
@@ -287,7 +308,7 @@
     'pages_initial_name' => '제목 없음',
     'pages_editing_draft_notification' => ':timeDiff에 초안 문서입니다.',
     'pages_draft_edited_notification' => '최근에 수정한 문서이기 때문에 초안 문서를 폐기하는 편이 좋습니다.',
-    'pages_draft_page_changed_since_creation' => '최근에 수정한 문서이기 때문에 초안 문서를 폐기하는 편이 좋습니다.',
+    'pages_draft_page_changed_since_creation' => '최근에 수정한 문서이기 때문에 임시 저장문서를 폐기하는 편이 좋습니다.',
     'pages_draft_edit_active' => [
         'start_a' => ':count명이 이 문서를 수정하고 있습니다.',
         'start_b' => ':userName이 이 문서를 수정하고 있습니다.',
@@ -302,7 +323,7 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '사이드바 토글',
-    'page_tags' => '문서 꼬리표',
+    'page_tags' => '문서 태그',
     'chapter_tags' => '챕터 꼬리표',
     'book_tags' => '책 꼬리표',
     'shelf_tags' => '책꽂이 꼬리표',
@@ -317,7 +338,7 @@
     'tags_usages' => '모든 꼬리표',
     'tags_assigned_pages' => '문서에 꼬리표 지정함',
     'tags_assigned_chapters' => '챕터에 꼬리표 지정함',
-    'tags_assigned_books' => '책에 꼬리표 지정함',
+    'tags_assigned_books' => '책에 태그 지정함',
     'tags_assigned_shelves' => '책꽂이에 꼬리표 지정함',
     'tags_x_unique_values' => ':count 중복 없는 값',
     'tags_all_values' => '모든 값',
@@ -351,7 +372,7 @@
     'attachments_file_updated' => '파일 바꿈',
     'attachments_link_attached' => '링크 첨부함',
     'templates' => '템플릿',
-    'templates_set_as_template' => '템플릿',
+    'templates_set_as_template' => '현재 페이지는 템플릿용 페이지 입니다.',
     'templates_explain_set_as_template' => '템플릿은 보기 권한만 있어도 문서에 쓸 수 있습니다.',
     'templates_replace_content' => '문서 대체',
     'templates_append_content' => '문서 앞에 추가',
@@ -433,7 +454,7 @@
     'watch_detail_updates' => '새 페이지 및 업데이트 보기',
     'watch_detail_comments' => '새 페이지, 업데이트 및 댓글 보기',
     'watch_detail_parent_book' => '상위 책을 통해 보기',
-    'watch_detail_parent_book_ignore' => '페어런트 북을 통한 무시하기',
+    'watch_detail_parent_book_ignore' => '상위 책을 통한 무시하기',
     'watch_detail_parent_chapter' => '상위 챕터를 통해 보기',
     'watch_detail_parent_chapter_ignore' => '상위 챕터를 통해 무시하기',
 ];
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index 7f2d8bb6a72..f5ba13efa3b 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName에 문제가 생겼습니다.',
     'back_soon' => '곧 돌아갑니다.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => '요청에서 인증 토큰을 찾을 수 없습니다.',
     'api_bad_authorization_format' => '요청에서 인증 토큰을 찾았으나 형식에 문제가 있습니다.',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 3a24e21a0c0..7277891d55b 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => '시스템 접근 API',
     'role_manage_settings' => '사이트 설정 관리',
     'role_export_content' => '항목 내보내기',
+    'role_import_content' => 'Import content',
     'role_editor_change' => '페이지 편집기 변경',
     'role_notifications' => '알림 수신 및 관리',
     'role_asset' => '권한 항목',
diff --git a/lang/ko/validation.php b/lang/ko/validation.php
index e533429ee1a..7a4d228ce10 100644
--- a/lang/ko/validation.php
+++ b/lang/ko/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute(은)는 유효하지 않은 형식입니다.',
     'uploaded'             => '파일 크기가 서버에서 허용하는 수치를 넘습니다.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/lt/activities.php b/lang/lt/activities.php
index 9a240d83cae..2c4165195ec 100644
--- a/lang/lt/activities.php
+++ b/lang/lt/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'deleted webhook',
     'webhook_delete_notification' => 'Webhook successfully deleted',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/lt/editor.php b/lang/lt/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/lt/editor.php
+++ b/lang/lt/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 17601aa1687..91d4cedc435 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF failas',
     'export_text' => 'Paprastas failo tekstas',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Leidimai',
diff --git a/lang/lt/errors.php b/lang/lt/errors.php
index 2209a00d7e0..392e99a5192 100644
--- a/lang/lt/errors.php
+++ b/lang/lt/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName dabar yra apačioje',
     'back_soon' => 'Tai sugrįž greitai',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Užklausoje nerastas įgaliojimo prieigos raktas',
     'api_bad_authorization_format' => 'Užklausoje rastas prieigos raktas, tačiau formatas yra neteisingas',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index 3692bd2413b..ddd2a702299 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Gauti prieigą prie sistemos API',
     'role_manage_settings' => 'Tvarkyti programos nustatymus',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Nuosavybės leidimai',
diff --git a/lang/lt/validation.php b/lang/lt/validation.php
index 08470cf2291..92de23004aa 100644
--- a/lang/lt/validation.php
+++ b/lang/lt/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formatas yra klaidingas.',
     'uploaded'             => 'Šis failas negali būti įkeltas. Serveris gali nepriimti tokio dydžio failų.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index f7db090d806..2f9b49f8e75 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'izdzēsa webhook',
     'webhook_delete_notification' => 'Webhook veiksmīgi izdzēsts',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'izveidoja lietotāju',
     'user_create_notification' => 'Lietotājs veiksmīgi izveidots',
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index 5443e505d66..1bdf4476dfc 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Par redaktoru',
     'about_title' => 'Par WYSIWYG redaktoru',
     'editor_license' => 'Redaktora licence un autortiesības',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar MIT licenci.',
     'editor_tiny_license_link' => 'TinyMCE autortiesības un licences detaļas var atrast šeit.',
     'save_continue' => 'Saglabāt lapu un turpināt',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 771fffd4470..f5d9a2eeb54 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF fails',
     'export_text' => 'Vienkāršs teksta fails',
     'export_md' => 'Markdown fails',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Noklusētā lapas sagatave',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Izvēlēt sagataves lapu',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Atļaujas',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index e705da6a02b..40d755e61f3 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName pagaidām nav pieejams',
     'back_soon' => 'Drīz būs atkal pieejams.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Pieprasījumā nav atrasts autorizācijas žetons',
     'api_bad_authorization_format' => 'Pieprasījumā atrasts autorizācijas žetons, taču tā formāts nav pareizs',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index a94b45b3e42..3fca3050aad 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Piekļūt sistēmas API',
     'role_manage_settings' => 'Pārvaldīt iestatījumus',
     'role_export_content' => 'Eksportēt saturu',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Mainīt lapu redaktoru',
     'role_notifications' => 'Saņemt un pārvaldīt paziņojumus',
     'role_asset' => 'Resursa piekļuves tiesības',
diff --git a/lang/lv/validation.php b/lang/lv/validation.php
index 64a0dece367..5b714af8659 100644
--- a/lang/lv/validation.php
+++ b/lang/lv/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formāts nav derīgs.',
     'uploaded'             => 'Fails netika ielādēts. Serveris nevar pieņemt šāda izmēra failus.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index 04ab09c8477..3f8ee88df7c 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -85,6 +85,14 @@
     'webhook_delete' => 'slettet webhook',
     'webhook_delete_notification' => 'Webhook ble slettet',
 
+    // Imports
+    'import_create' => 'import opprettet',
+    'import_create_notification' => 'Importen ble opplastet',
+    'import_run' => 'oppdatert import',
+    'import_run_notification' => 'Innhold importert',
+    'import_delete' => 'import slettet',
+    'import_delete_notification' => 'Importering ble slettet',
+
     // Users
     'user_create' => 'opprettet bruker',
     'user_create_notification' => 'Bruker ble opprettet',
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 0e9e19b6e59..1214e81c52b 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Bruksvilkår',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Søk :appName',
 ];
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index 759f1803625..e128717cdcd 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Om tekstredigeringsprogrammet',
     'about_title' => 'Om HDSEHDF-tekstredigeringsprogrammet',
     'editor_license' => 'Tekstbehandlerlisens og opphavsrett',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Denne tekstredigereren er laget med :tinyLink som er lisensiert under MIT.',
     'editor_tiny_license_link' => 'Informasjon om opphavsrett og lisens for TinyMCE finnes her.',
     'save_continue' => 'Lagre side og fortsett',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index a28f15fa660..0d2491eafdc 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF Fil',
     'export_text' => 'Tekstfil',
     'export_md' => 'Markdownfil',
+    'export_zip' => 'Flyttbar ZIP',
     'default_template' => 'Standard sidemal',
     'default_template_explain' => 'Tildel en sidemal som vil bli brukt som standardinnhold for alle nye sider i denne boken. Husk dette vil kun bli brukt hvis sideskaperen har tilgang til den valgte malsiden.',
     'default_template_select' => 'Velg en malside',
+    'import' => 'Import',
+    'import_validate' => 'Valider Import',
+    'import_desc' => 'Importer bøker, kapitler & sider ved å bruke en flyttbar zip-eksport fra samme eller en annen forekomst. Velg en ZIP-fil for å fortsette. Når filen har blitt lastet opp og validert vil du kunne konfigurere & bekrefte importen i neste visning.',
+    'import_zip_select' => 'Velg ZIP-filen som skal lastes opp',
+    'import_zip_validation_errors' => 'Feil ble funnet under validering av den angitte ZIP-filen:',
+    'import_pending' => 'Venter på import',
+    'import_pending_none' => 'Ingen importer er startet.',
+    'import_continue' => 'Fortsett import',
+    'import_continue_desc' => 'Gjennomgå innholdet på grunn av at det importeres fra den opplastede ZIP-filen. Når klar, kjøre importen for å legge til innholdet i dette systemet. Den opplastede ZIP-importfilen vil automatisk bli fjernet ved vellykket import.',
+    'import_details' => 'Importer detaljer',
+    'import_run' => 'Kjør Import',
+    'import_size' => ':size Import ZIP størrelse',
+    'import_uploaded_at' => 'Opplastet :relativeTime',
+    'import_uploaded_by' => 'Lastet opp av',
+    'import_location' => 'Import posisjon',
+    'import_location_desc' => 'Velg en mållokasjon for ditt importerte innhold. Du vil trenge relevante tillatelser for å opprette innenfor den posisjonen du velger.',
+    'import_delete_confirm' => 'Er du sikker på at du vil slette denne importen?',
+    'import_delete_desc' => 'Dette vil slette den opplastede importen av ZIP-filen og kan ikke angres.',
+    'import_errors' => 'Import feil',
+    'import_errors_desc' => 'Feil oppstod under importforsøket:',
 
     // Permissions and restrictions
     'permissions' => 'Tilganger',
@@ -224,8 +245,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Renset innhold)',
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Bytt til ny WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(I Alpha Testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi en kort beskrivelse av endringene dine',
     'pages_edit_enter_changelog' => 'Se endringslogg',
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 379483626c0..400681b10d1 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan ikke slette den eneste administratoren',
     'users_cannot_delete_guest' => 'Du kan ikke slette gjestebrukeren (Du kan deaktivere offentlig visning istede)',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Kunne ikke opprette bruker fordi invitasjons e-post ikke kunne sendes',
 
     // Roles
     'role_cannot_be_edited' => 'Denne rollen kan ikke endres',
@@ -105,6 +105,18 @@
     'app_down' => ':appName er nede for øyeblikket',
     'back_soon' => 'Den vil snart komme tilbake.',
 
+    // Import
+    'import_zip_cant_read' => 'Kunne ikke lese ZIP-filen.',
+    'import_zip_cant_decode_data' => 'Kunne ikke finne og dekode ZIP data.json innhold.',
+    'import_zip_no_data' => 'ZIP-fildata har ingen forventet bok, kapittel eller sideinnhold.',
+    'import_validation_failed' => 'Import av ZIP feilet i å validere med feil:',
+    'import_zip_failed_notification' => 'Kunne ikke importere ZIP-fil.',
+    'import_perms_books' => 'Du mangler nødvendige tillatelser for å lage bøker.',
+    'import_perms_chapters' => 'Du mangler de nødvendige tillatelsene for å opprette kapittel.',
+    'import_perms_pages' => 'Du mangler nødvendige tillatelser for å opprette sider.',
+    'import_perms_images' => 'Du mangler de nødvendige tillatelsene for å opprette bilder.',
+    'import_perms_attachments' => 'Du mangler nødvendig tillatelse for å opprette vedlegg.',
+
     // API errors
     'api_no_authorization_found' => 'Ingen autorisasjonstoken ble funnet på forespørselen',
     'api_bad_authorization_format' => 'Det ble funnet et autorisasjonstoken på forespørselen, men formatet virket feil',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index 539dc1902cd..a39f6ae1bbe 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Systemtilgang API',
     'role_manage_settings' => 'Behandle applikasjonsinnstillinger',
     'role_export_content' => 'Eksporter innhold',
+    'role_import_content' => 'Import innhold',
     'role_editor_change' => 'Endre sideredigering',
     'role_notifications' => 'Motta og administrere varslinger',
     'role_asset' => 'Eiendomstillatelser',
diff --git a/lang/nb/validation.php b/lang/nb/validation.php
index 7e3784e30c7..a156da8f705 100644
--- a/lang/nb/validation.php
+++ b/lang/nb/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute format er ugyldig.',
     'uploaded'             => 'kunne ikke lastes opp, tjeneren støtter ikke filer av denne størrelsen.',
 
+    'zip_file' => 'Attributtet :attribute må henvises til en fil i ZIP.',
+    'zip_file_mime' => 'Attributtet :attribute må referere en fil av typen :validTypes, som ble funnet :foundType.',
+    'zip_model_expected' => 'Data objekt forventet, men ":type" funnet.',
+    'zip_unique' => 'Attributtet :attribute må være unikt for objekttypen i ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 52a8e3e3762..88563ba873e 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'verwijderde webhook',
     'webhook_delete_notification' => 'Webhook succesvol verwijderd',
 
+    // Imports
+    'import_create' => 'maakte import',
+    'import_create_notification' => 'Import succesvol geüpload',
+    'import_run' => 'wijzigde import',
+    'import_run_notification' => 'Inhoud succesvol geïmporteerd',
+    'import_delete' => 'verwijderde import',
+    'import_delete_notification' => 'Import succesvol verwijderd',
+
     // Users
     'user_create' => 'maakte gebruiker aan',
     'user_create_notification' => 'Gebruiker succesvol aangemaakt',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index 89b2e7bea85..d82dd86014b 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Over de bewerker',
     'about_title' => 'Over de WYSIWYG Bewerker',
     'editor_license' => 'Bewerker Licentie & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Deze editor is gemaakt met behulp van :tinyLink welke is verstrekt onder de MIT-licentie.',
     'editor_tiny_license_link' => 'De copyright- en licentiegegevens van TinyMCE vindt u hier.',
     'save_continue' => 'Pagina opslaan en verdergaan',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 36955c8e1f5..57967f9f1a6 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF bestand',
     'export_text' => 'Normaal tekstbestand',
     'export_md' => 'Markdown bestand',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Standaard Paginasjabloon',
     'default_template_explain' => 'Ken een paginasjabloon toe die zal worden gebruikt als de standaardinhoud voor alle pagina\'s die binnen dit item worden aangemaakt. Houd er rekening mee dat dit alleen zal worden gebruikt als de paginamaker leesrechten heeft voor de gekozen sjabloonpagina.',
     'default_template_select' => 'Selecteer een sjabloonpagina',
+    'import' => 'Import',
+    'import_validate' => 'Valideer Import',
+    'import_desc' => 'Importeer boeken, hoofdstukken & pagina\'s met een portable Zip-export van dezelfde, of een andere omgeving. Selecteer een Zip-bestand om door te gaan. Nadat het bestand is geüpload en gecontroleerd kunt u de import configureren en doorvoeren in de volgende weergave.',
+    'import_zip_select' => 'Selecteer een Zip-bestand om te uploaden',
+    'import_zip_validation_errors' => 'Er zijn fouten gevonden tijdens het controleren van het Zip-bestand:',
+    'import_pending' => 'Wachtende Imports',
+    'import_pending_none' => 'Er zijn geen imports gestart.',
+    'import_continue' => 'Importeren Voortzetten',
+    'import_continue_desc' => 'Controleer de inhoud die gaat worden geïmporteerd vanuit get geüploade Zip-bestand. Voer de import door om de inhoud toe te voegen aan dit systeem. Bij een succesvolle import zal het geüploade Zip-bestand automatisch verwijderd worden.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Import Doorvoeren',
+    'import_size' => ':size Import Zip Grootte',
+    'import_uploaded_at' => 'Geüpload :relativeTime',
+    'import_uploaded_by' => 'Geüpload door',
+    'import_location' => 'Importlocatie',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Importeerfouten',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 0c83cb7f31f..07900fc6b4f 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is nu niet beschikbaar',
     'back_soon' => 'Komt snel weer online.',
 
+    // Import
+    'import_zip_cant_read' => 'Kon het Zip-bestand niet lezen.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Importeren van het Zip-bestand is mislukt.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Geen autorisatie token gevonden',
     'api_bad_authorization_format' => 'Een autorisatie token is gevonden, maar het formaat schijnt onjuist te zijn',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 1d0b14b5cf5..646eb2ba995 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Ga naar systeem API',
     'role_manage_settings' => 'Beheer app instellingen',
     'role_export_content' => 'Exporteer inhoud',
+    'role_import_content' => 'Importeer inhoud',
     'role_editor_change' => 'Wijzig pagina bewerker',
     'role_notifications' => 'Meldingen ontvangen & beheren',
     'role_asset' => 'Asset Machtigingen',
diff --git a/lang/nl/validation.php b/lang/nl/validation.php
index 378ec6a9158..52b1a22651a 100644
--- a/lang/nl/validation.php
+++ b/lang/nl/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formaat is ongeldig.',
     'uploaded'             => 'Het bestand kon niet worden geüpload. De server accepteert mogelijk geen bestanden van deze grootte.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/nn/activities.php b/lang/nn/activities.php
index 73182e0ba84..a522d10e7fe 100644
--- a/lang/nn/activities.php
+++ b/lang/nn/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'sletta webhook',
     'webhook_delete_notification' => 'Webhook vart sletta',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'oppretta brukar',
     'user_create_notification' => 'Brukar vart oppretta',
diff --git a/lang/nn/editor.php b/lang/nn/editor.php
index 7998bfadbf2..6ac0a92af09 100644
--- a/lang/nn/editor.php
+++ b/lang/nn/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Om tekstredigeringsprogrammet',
     'about_title' => 'Om HDSEHDF-tekstredigeringsprogrammet',
     'editor_license' => 'Tekstbehandlerlisens og opphavsrett',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Denne tekstredigereren er laget med :tinyLink som er lisensiert under MIT.',
     'editor_tiny_license_link' => 'Informasjon om opphavsrett og lisens for TinyMCE finnes her.',
     'save_continue' => 'Lagre side og fortsett',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 790c6ec97b8..b2ae3526917 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Tekstfil',
     'export_md' => 'Markdownfil',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Tilgongar',
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index 7be55a09177..0619c4682fc 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName er nede for øyeblikket',
     'back_soon' => 'Den vil snart komme tilbake.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Ingen autorisasjonstoken ble funnet på forespørselen',
     'api_bad_authorization_format' => 'Det ble funnet et autorisasjonstoken på forespørselen, men formatet virket feil',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index 9eefaf3bb7e..ed9cd937a8f 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Systemtilgang API',
     'role_manage_settings' => 'Behandle applikasjonsinnstillinger',
     'role_export_content' => 'Eksporter innhold',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Endre sideredigering',
     'role_notifications' => 'Motta og administrere varslinger',
     'role_asset' => 'Eiendomstillatelser',
diff --git a/lang/nn/validation.php b/lang/nn/validation.php
index 7e3784e30c7..a24ebd17189 100644
--- a/lang/nn/validation.php
+++ b/lang/nn/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute format er ugyldig.',
     'uploaded'             => 'kunne ikke lastes opp, tjeneren støtter ikke filer av denne størrelsen.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index 25f9e23c669..4e209c99cf1 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'usunął webhook',
     'webhook_delete_notification' => 'Webhook usunięty pomyślnie',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'utworzył użytkownika',
     'user_create_notification' => 'Użytkownik utworzony pomyślnie',
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index f4ed4b5f2b5..ac7d57a5d61 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -163,6 +163,8 @@
     'about' => 'O edytorze',
     'about_title' => 'O edytorze WYSIWYG',
     'editor_license' => 'Licencja edytora i prawa autorskie',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Ten edytor jest zbudowany przy użyciu :tinyLink, który jest udostępniany na licencji MIT.',
     'editor_tiny_license_link' => 'Szczegóły dotyczące praw autorskich i licencji TinyMCE można znaleźć tutaj.',
     'save_continue' => 'Zapisz stronę i kontynuuj',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index f0ff5a251f5..537b15d38c3 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Plik PDF',
     'export_text' => 'Plik tekstowy',
     'export_md' => 'Pliki Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Domyślny szablon strony',
     'default_template_explain' => 'Przypisz szablon strony, który będzie używany jako domyślna zawartość dla wszystkich stron utworzonych w tym elemencie. Pamiętaj, że będzie to używane tylko wtedy, gdy twórca strony ma dostęp do wybranej strony szablonu.',
     'default_template_select' => 'Wybierz stronę szablonu',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Uprawnienia',
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index 71f592ad683..e6ad2093f1f 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName jest aktualnie wyłączona',
     'back_soon' => 'Niedługo zostanie uruchomiona ponownie.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nie znaleziono tokenu autoryzacji dla żądania',
     'api_bad_authorization_format' => 'Token autoryzacji został znaleziony w żądaniu, ale format okazał się nieprawidłowy',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 77c25ffa93a..811398ec463 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Dostęp do systemowego API',
     'role_manage_settings' => 'Zarządzanie ustawieniami aplikacji',
     'role_export_content' => 'Eksportuj zawartość',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Zmień edytor strony',
     'role_notifications' => 'Odbieranie i zarządzanie powiadomieniami',
     'role_asset' => 'Zarządzanie zasobami',
diff --git a/lang/pl/validation.php b/lang/pl/validation.php
index 935c634df29..f20a66dfb6c 100644
--- a/lang/pl/validation.php
+++ b/lang/pl/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Format :attribute jest nieprawidłowy.',
     'uploaded'             => 'Plik nie może zostać wysłany. Serwer nie akceptuje plików o takim rozmiarze.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/pt/activities.php b/lang/pt/activities.php
index 089613b8f59..96d950554b5 100644
--- a/lang/pt/activities.php
+++ b/lang/pt/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'eliminar webhook',
     'webhook_delete_notification' => 'Webhook criado com sucesso',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'utilizador criado',
     'user_create_notification' => 'Utilizador criado com sucesso',
diff --git a/lang/pt/editor.php b/lang/pt/editor.php
index c3c4975a7ee..b25b319f0b6 100644
--- a/lang/pt/editor.php
+++ b/lang/pt/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Sobre o editor',
     'about_title' => 'Sobre o Editor WYSIWYG',
     'editor_license' => 'Editor da licença de direitos autorais',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Este editor foi criado com :tinyLink que é fornecido sob a licença MIT.',
     'editor_tiny_license_link' => 'Os dados relativos aos direitos de autor e à licença do TinyMCE podem ser encontrados aqui.',
     'save_continue' => 'Salvar página e continuar',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index 792f80056d0..93d1a38cfab 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo Texto',
     'export_md' => 'Ficheiro Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
diff --git a/lang/pt/errors.php b/lang/pt/errors.php
index bed2bf5b779..b337005e14f 100644
--- a/lang/pt/errors.php
+++ b/lang/pt/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName está fora do ar de momento',
     'back_soon' => 'Voltaremos em breve.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nenhum token de autorização encontrado na requisição',
     'api_bad_authorization_format' => 'Um token de autorização foi encontrado na requisição, mas o formato parece incorreto',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index 8664884c0d5..935fd30ce93 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Aceder à API do sistema',
     'role_manage_settings' => 'Gerir as configurações da aplicação',
     'role_export_content' => 'Exportar conteúdo',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Alterar editor de página',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Permissões de Ativos',
diff --git a/lang/pt/validation.php b/lang/pt/validation.php
index d98f9857eb2..df414c992e2 100644
--- a/lang/pt/validation.php
+++ b/lang/pt/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'O formato da URL :attribute é inválido.',
     'uploaded'             => 'O arquivo não pôde ser carregado. O servidor pode não aceitar arquivos deste tamanho.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index d2b963244da..845b41cc305 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook excluído',
     'webhook_delete_notification' => 'Webhook excluido com sucesso',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'usuário criado',
     'user_create_notification' => 'Usuário criado com sucesso',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index 42e20af87df..e251ba96636 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Sobre o editor',
     'about_title' => 'Sobre o Editor WYSIWYG',
     'editor_license' => 'Licença do Editor e Direitos Autorais',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Este editor é construído usando :tinyLink que é fornecido sob a licença MIT.',
     'editor_tiny_license_link' => 'Os dados relativos aos direitos de autor e à licença do TinyMCE podem ser encontrados aqui.',
     'save_continue' => 'Salvar Página e Continuar',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index d23f677d9f5..b3e794a2d76 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo de texto simples',
     'export_md' => 'Arquivo de redução',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Modelo padrão de página',
     'default_template_explain' => 'Atribuir o modelo de página que será usado como padrão para todas as páginas criadas neste livro. Tenha em mente que isto será usado apenas se o criador da página tiver acesso de visualização ao modelo de página escolhido.',
     'default_template_select' => 'Selecione uma página de modelo',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -85,7 +106,7 @@
     // Shelves
     'shelf' => 'Estante',
     'shelves' => 'Estantes',
-    'x_shelves' => ': count Estante|: count Estantes',
+    'x_shelves' => ':count Estante|:count Estantes',
     'shelves_empty' => 'Nenhuma estante foi criada',
     'shelves_create' => 'Criar Prateleira',
     'shelves_popular' => 'Estantes Populares',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index 3fa7d44c7de..15464c95ac3 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -106,6 +106,18 @@
     'app_down' => 'Agora está baixo',
     'back_soon' => 'Vai estar de volta em breve.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nenhum código de autorização encontrado na requisição',
     'api_bad_authorization_format' => 'Um código de autorização foi encontrado na requisição, mas o formato parece incorreto',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 881604d4d71..a5b68c7e4ec 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Acessar API do sistema',
     'role_manage_settings' => 'Gerenciar configurações da aplicação',
     'role_export_content' => 'Exportar conteúdo',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Alterar página de edição',
     'role_notifications' => 'Receber e gerenciar notificações',
     'role_asset' => 'Permissões de Ativos',
diff --git a/lang/pt_BR/validation.php b/lang/pt_BR/validation.php
index 68b85029843..b3a9a729438 100644
--- a/lang/pt_BR/validation.php
+++ b/lang/pt_BR/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'O formato da URL :attribute é inválido.',
     'uploaded'             => 'O arquivo não pôde ser carregado. O servidor pode não aceitar arquivos deste tamanho.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ro/activities.php b/lang/ro/activities.php
index d076b91e82a..951ca2347e9 100644
--- a/lang/ro/activities.php
+++ b/lang/ro/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'a șters webhook',
     'webhook_delete_notification' => 'Webhook șters cu succes',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'utilizator creat',
     'user_create_notification' => 'Utilizator creat cu succes',
diff --git a/lang/ro/editor.php b/lang/ro/editor.php
index 65208957b37..a22e239aa92 100644
--- a/lang/ro/editor.php
+++ b/lang/ro/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Despre editor',
     'about_title' => 'Despre editorul WYSIWYG',
     'editor_license' => 'Editor licență și drepturi de autor',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Acest editor este construit folosind :tinyLink care este furnizat sub licența MIT.',
     'editor_tiny_license_link' => 'Detaliile privind drepturile de autor şi licența TinyMCE pot fi consultate aici.',
     'save_continue' => 'Salvează pagina și continuă',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index 676562f465c..f6bec4cb9a6 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Fișier PDF',
     'export_text' => 'Fișier text simplu',
     'export_md' => 'Fișier Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permisiuni',
diff --git a/lang/ro/errors.php b/lang/ro/errors.php
index 0989f797c01..07c295b0785 100644
--- a/lang/ro/errors.php
+++ b/lang/ro/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName nu funcționează acum',
     'back_soon' => 'Va reveni în curând.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Nu s-a găsit niciun token de autorizare la cerere',
     'api_bad_authorization_format' => 'A fost găsit un token de autorizare, dar formatul este incorect',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index 338f4920036..ee402085ac9 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Accesează API sistem',
     'role_manage_settings' => 'Gestionează setările aplicației',
     'role_export_content' => 'Exportă conținut',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Schimbă editorul de pagină',
     'role_notifications' => 'Primire și gestionare notificări',
     'role_asset' => 'Permisiuni active',
diff --git a/lang/ro/validation.php b/lang/ro/validation.php
index 52394385098..56a3e2e05d1 100644
--- a/lang/ro/validation.php
+++ b/lang/ro/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute nu este valid.',
     'uploaded'             => 'Fişierul nu a putut fi încărcat. Serverul nu poate accepta fişiere de această dimensiune.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index df6ae9062c2..3fe46181de9 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'удалил вебхук',
     'webhook_delete_notification' => 'Вебхук успешно удален',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'создал пользователя',
     'user_create_notification' => 'Пользователь успешно создан',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index b93bd8840a5..7e12acfff80 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -163,6 +163,8 @@
     'about' => 'О редакторе',
     'about_title' => 'О редакторе WYSIWYG',
     'editor_license' => 'Лицензия редактора и авторские права',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Этот редактор собран с помощью :tinyLink, который предоставляется под MIT лицензией.',
     'editor_tiny_license_link' => 'Авторские права и подробности лицензии TinyMCE вы можете найти здесь.',
     'save_continue' => 'Сохранить страницу и продолжить',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 5de25a50deb..795c287cbd2 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовый файл',
     'export_md' => 'Файл Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Шаблон страницы по умолчанию',
     'default_template_explain' => 'Назначить шаблон страницы, который будет использоваться в качестве содержимого по умолчанию для всех страниц, созданных в этом элементе. Имейте в виду, что это будет работать, только если создатель страницы имеет доступ к выбранной странице шаблона.',
     'default_template_select' => 'Выберите страницу шаблона',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Разрешения',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index 033a64840b8..ceae383c676 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName в данный момент не доступно',
     'back_soon' => 'Скоро восстановится.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Отсутствует токен авторизации в запросе',
     'api_bad_authorization_format' => 'Токен авторизации найден, но формат запроса неверен',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 4357cbddf38..32b5367c60a 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Доступ к системному API',
     'role_manage_settings' => 'Управление настройками приложения',
     'role_export_content' => 'Экспорт контента',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Изменение редактора страниц',
     'role_notifications' => 'Получение и управление уведомлениями',
     'role_asset' => 'Права доступа к материалам',
diff --git a/lang/ru/validation.php b/lang/ru/validation.php
index 88bd9a41f97..156a05fe678 100644
--- a/lang/ru/validation.php
+++ b/lang/ru/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Формат :attribute некорректен.',
     'uploaded'             => 'Не удалось загрузить файл. Сервер не может принимать файлы такого размера.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index 6dad803e003..a1ef597ca24 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'odstránil(a) si webhook',
     'webhook_delete_notification' => 'Webhook úspešne odstránený',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'užívateľ vytvorený',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/sk/editor.php b/lang/sk/editor.php
index ec7f24d657e..5b7ee2f49b3 100644
--- a/lang/sk/editor.php
+++ b/lang/sk/editor.php
@@ -163,6 +163,8 @@
     'about' => 'O editore',
     'about_title' => 'O WYSIWYG Editore',
     'editor_license' => 'Licencia editora a autorské práva',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Tento editor je vytvorený pomocou :tinyLink, ktorý je poskytovaný pod licenciou MIT.',
     'editor_tiny_license_link' => 'Podrobnosti o autorských právach a licenciách TinyMCE nájdete tu.',
     'save_continue' => 'Uložiť a pokračovať',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index b296f4f6778..882ac533dfe 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF súbor',
     'export_text' => 'Súbor s čistým textom',
     'export_md' => 'Súbor Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnenia',
diff --git a/lang/sk/errors.php b/lang/sk/errors.php
index 036f2b2d415..143259f3ad4 100644
--- a/lang/sk/errors.php
+++ b/lang/sk/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName je momentálne nedostupná',
     'back_soon' => 'Čoskoro bude opäť dostupná.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'V žiadosti sa nenašiel žiadny autorizačný token',
     'api_bad_authorization_format' => 'V žiadosti sa našiel autorizačný token, ale formát sa zdal nesprávny',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index 40b256229a5..cb8fb9fa938 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'API prístupového systému',
     'role_manage_settings' => 'Spravovať nastavenia aplikácie',
     'role_export_content' => 'Exportovať obsah',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Zmeniť editor stránky',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Oprávnenia majetku',
diff --git a/lang/sk/validation.php b/lang/sk/validation.php
index dfc821b7c9c..415f7cf05b9 100644
--- a/lang/sk/validation.php
+++ b/lang/sk/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formát je neplatný.',
     'uploaded'             => 'Súbor sa nepodarilo nahrať. Server nemusí akceptovať súbory tejto veľkosti.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index 027c17f872a..11627a89ad9 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'izbrisan webhook',
     'webhook_delete_notification' => 'Webhook uspešno izbrisan',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'ustvarjen uporabnik',
     'user_create_notification' => 'Uporabnik uspešno ustvarjen',
diff --git a/lang/sl/editor.php b/lang/sl/editor.php
index b6f462eb596..09b311018a4 100644
--- a/lang/sl/editor.php
+++ b/lang/sl/editor.php
@@ -163,6 +163,8 @@
     'about' => 'O urejevalniku',
     'about_title' => 'O Urejevalniku WYSIWYG',
     'editor_license' => 'Licenca in avtorske pravice Urejevalnika',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Urejevalnik je ustvarjen z uporabo :tinyLink pod pogoji licence MIT.',
     'editor_tiny_license_link' => 'Podrobnosti o avtorskih pravicah in licenci za TinyMCE lahko preberete tukaj.',
     'save_continue' => 'Shrani stran in Nadaljuj',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index be58595cfe8..e118bfaaccf 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF datoteka (.pdf)',
     'export_text' => 'Navadna besedilna datoteka',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Dovoljenja',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index 7269b755531..9a8759684c7 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName trenutno ni dosegljiva',
     'back_soon' => 'Kmalu bo ponovno dosegljiva.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Avtorizacija ni bila najdena',
     'api_bad_authorization_format' => 'Avtorizacija je bila najdena, vendar je v napačni obliki',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 7de5f24e7a8..77af9dac4b9 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'API za dostop do sistema',
     'role_manage_settings' => 'Nastavitve za upravljanje',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Sistemska dovoljenja',
diff --git a/lang/sl/validation.php b/lang/sl/validation.php
index 012bfe4a704..0d9b56c1019 100644
--- a/lang/sl/validation.php
+++ b/lang/sl/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute oblika ni veljavna.',
     'uploaded'             => 'Datoteke ni bilo mogoče naložiti. Strežnik morda ne sprejema datotek te velikosti.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/sq/activities.php b/lang/sq/activities.php
index b3590c9bf83..b7ca7d02d8d 100644
--- a/lang/sq/activities.php
+++ b/lang/sq/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'fshiu uebhook',
     'webhook_delete_notification' => 'Uebhook-u u fshi me sukses',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'krijoi përdorues',
     'user_create_notification' => 'Përdoruesi u krijua me sukses',
diff --git a/lang/sq/editor.php b/lang/sq/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/sq/editor.php
+++ b/lang/sq/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index 35e6f050bb8..26a563a7eb5 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/sq/errors.php b/lang/sq/errors.php
index 9c40aa9ed33..9d738379648 100644
--- a/lang/sq/errors.php
+++ b/lang/sq/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index 5427cb9419e..c0b6b692a57 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/lang/sq/validation.php b/lang/sq/validation.php
index 2a676c7c4cc..d9b982d1e23 100644
--- a/lang/sq/validation.php
+++ b/lang/sq/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/sr/activities.php b/lang/sr/activities.php
index 4077c07454d..9a72cfc5e3c 100644
--- a/lang/sr/activities.php
+++ b/lang/sr/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'обрисан вебхоок',
     'webhook_delete_notification' => 'Вебхоок је успешно обрисан',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'креирао корисника',
     'user_create_notification' => 'Корисник је успешно креиран',
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index b376e542cf9..8b7690e2c34 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -163,6 +163,8 @@
     'about' => 'О уређивачу',
     'about_title' => 'О уређивачу WYSIWYG',
     'editor_license' => 'Уредничка лиценца и ауторска права',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Овај уређивач је направљен помоћу :tinyLink који је обезбеђен под МИТ лиценцом.',
     'editor_tiny_license_link' => 'Детаље о ауторским правима и лиценци за ТиниМЦЕ можете пронаћи овде.',
     'save_continue' => 'Сачувај страницу и настави',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index a6964a1032b..0c27ddf59db 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF датотека',
     'export_text' => 'Датотеке чистог текста',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Подразумевани шаблон странице',
     'default_template_explain' => 'Доделите шаблон странице који ће се користити као подразумевани садржај за све странице креиране у оквиру ове ставке. Имајте на уму да ће се ово користити само ако креатор странице има приступ за преглед изабране странице шаблона.',
     'default_template_select' => 'Изаберите страницу са шаблоном',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Дозволе',
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
index acf0d5f3650..ee8443461c3 100644
--- a/lang/sr/errors.php
+++ b/lang/sr/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index e2460191383..6bd5f525237 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/lang/sr/validation.php b/lang/sr/validation.php
index 2a676c7c4cc..d9b982d1e23 100644
--- a/lang/sr/validation.php
+++ b/lang/sr/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index abe53c856d1..5244b224372 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'raderade webhook',
     'webhook_delete_notification' => 'Webhook har tagits bort',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'skapade användare',
     'user_create_notification' => 'Användare skapades',
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index 25e443511c1..4badcc0e343 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Om redigeraren',
     'about_title' => 'Om WYSIWYG-redigeraren',
     'editor_license' => 'Licens och upphovsrätt för redigerare',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Denna redigerare är byggd med :tinyLink som tillhandahålls under MIT licensen.',
     'editor_tiny_license_link' => 'Upphovsrätten och licensuppgifterna för TinyMCE hittar du här.',
     'save_continue' => 'Spara sida & fortsätt',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index d01de6380c4..5df1f43dcf0 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Textfil',
     'export_md' => 'Markdown-fil',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Förvald sidmall',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Rättigheter',
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index d6049b20cb4..86ea215d02f 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName är nere just nu',
     'back_soon' => 'Vi är snart tillbaka.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Ingen auktoriseringstoken hittades på denna begäran',
     'api_bad_authorization_format' => 'En auktoriseringstoken hittades på denna begäran men formatet verkade felaktigt',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index c9f00a34059..bd6afcf2892 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Åtkomst till systemets API',
     'role_manage_settings' => 'Hantera appinställningar',
     'role_export_content' => 'Exportera innehåll',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Ändra sidredigerare',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Tillgång till innehåll',
diff --git a/lang/sv/validation.php b/lang/sv/validation.php
index b9c609f486d..4cc98c57598 100644
--- a/lang/sv/validation.php
+++ b/lang/sv/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Formatet på :attribute är ogiltigt.',
     'uploaded'             => 'Filen kunde inte laddas upp. Servern kanske inte tillåter filer med denna storlek.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/tk/activities.php b/lang/tk/activities.php
index 092398ef0e1..7c3454d41ca 100644
--- a/lang/tk/activities.php
+++ b/lang/tk/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'deleted webhook',
     'webhook_delete_notification' => 'Webhook successfully deleted',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/tk/editor.php b/lang/tk/editor.php
index de9aa0ece10..a61b460427e 100644
--- a/lang/tk/editor.php
+++ b/lang/tk/editor.php
@@ -163,6 +163,8 @@
     'about' => 'About the editor',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
     'save_continue' => 'Save Page & Continue',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index 35e6f050bb8..26a563a7eb5 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF File',
     'export_text' => 'Plain Text File',
     'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/tk/errors.php b/lang/tk/errors.php
index 9c40aa9ed33..9d738379648 100644
--- a/lang/tk/errors.php
+++ b/lang/tk/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName is down right now',
     'back_soon' => 'It will be back up soon.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'No authorization token found on the request',
     'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
diff --git a/lang/tk/settings.php b/lang/tk/settings.php
index 5427cb9419e..c0b6b692a57 100644
--- a/lang/tk/settings.php
+++ b/lang/tk/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Access system API',
     'role_manage_settings' => 'Manage app settings',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Asset Permissions',
diff --git a/lang/tk/validation.php b/lang/tk/validation.php
index 2a676c7c4cc..d9b982d1e23 100644
--- a/lang/tk/validation.php
+++ b/lang/tk/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'The :attribute format is invalid.',
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index bfafba4a4f4..fcecd6de3b4 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'web kancası silindi',
     'webhook_delete_notification' => 'Web kancası başarıyla silindi',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'Kullanıcı başarıyla oluşturuldu',
diff --git a/lang/tr/editor.php b/lang/tr/editor.php
index 585d6ec0516..3dc990f0cb9 100644
--- a/lang/tr/editor.php
+++ b/lang/tr/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Editör hakkında',
     'about_title' => 'WYSIWYG editor hakkında',
     'editor_license' => 'Editor Lisans ve Telif Hakkı',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Bu düzenleyici, MIT lisansı altında sağlanan :tinyLink kullanılarak oluşturulmuştur.',
     'editor_tiny_license_link' => 'TinyMCE telif ve lisans bilgilerini burada bulabilirsiniz.',
     'save_continue' => 'Kaydet & Devam Et',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index ae60e8d07b8..a73cdd85330 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF Dosyası',
     'export_text' => 'Düz Metin Dosyası',
     'export_md' => 'Markdown Dosyası',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'İzinler',
diff --git a/lang/tr/errors.php b/lang/tr/errors.php
index 7087aca4738..fd742687127 100644
--- a/lang/tr/errors.php
+++ b/lang/tr/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName şu anda erişilemez durumda',
     'back_soon' => 'En kısa sürede tekrar erişilebilir duruma gelecektir.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Yapılan istekte, yetkilendirme anahtarı bulunamadı',
     'api_bad_authorization_format' => 'Yapılan istekte bir yetkilendirme anahtarı bulundu fakat doğru görünmüyor',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 8b38e7b955c..68c470b0aa9 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Sistem programlama arayüzüne (API) eriş',
     'role_manage_settings' => 'Uygulama ayarlarını yönet',
     'role_export_content' => 'İçeriği dışa aktar',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Yazı editörünü değiştir',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Varlık Yetkileri',
diff --git a/lang/tr/validation.php b/lang/tr/validation.php
index 640fe6131ce..9dbfadd6b9e 100644
--- a/lang/tr/validation.php
+++ b/lang/tr/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute formatı geçersiz.',
     'uploaded'             => 'Dosya yüklemesi başarısız oldu. Sunucu, bu boyuttaki dosyaları kabul etmiyor olabilir.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index 1ab0eca61a8..86195224c3e 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'видалений вебхук',
     'webhook_delete_notification' => 'Вебхуки успішно видалено',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'створений користувач',
     'user_create_notification' => 'Користувач успішно створений',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index 176f7fab713..85efbc661d9 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Про редактор',
     'about_title' => 'Про WYSIWYG редактор',
     'editor_license' => 'Ліцензія редактора і авторські права',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Цей редактор побудований за допомогою :tinylink, яке надається за ліцензією MIT.',
     'editor_tiny_license_link' => 'Тут можна знайти авторські та умови ліцензії.',
     'save_continue' => 'Зберегти і продовжити',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 01549e7f36f..e955f5801af 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовий файл',
     'export_md' => 'Файл розмітки',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Типовий шаблон сторінки',
     'default_template_explain' => 'Призначити шаблон сторінки, який буде використовуватися як типовий вміст для всіх сторінок, створених у цьому елементі. Майте на увазі, що ця сторінка буде використана лише у випадку, якщо вона має доступ до обраної сторінки шаблону.',
     'default_template_select' => 'Виберіть сторінку шаблону',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 7698093c1d5..5c8148fece2 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName зараз недоступний',
     'back_soon' => 'Він повернеться найближчим часом.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'У запиті не знайдено токен авторизації',
     'api_bad_authorization_format' => 'У запиті знайдено токен авторизації, але формат недійсний',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index e26a2a8b829..a897439a14d 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Доступ до системного API',
     'role_manage_settings' => 'Керування налаштуваннями програми',
     'role_export_content' => 'Вміст експорту',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Змінити редактор сторінок',
     'role_notifications' => 'Отримувати та керувати повідомленнями',
     'role_asset' => 'Дозволи',
diff --git a/lang/uk/validation.php b/lang/uk/validation.php
index 51a59166619..ae31bb237aa 100644
--- a/lang/uk/validation.php
+++ b/lang/uk/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Формат поля :attribute неправильний.',
     'uploaded'             => 'Не вдалося завантажити файл. Сервер може не приймати файли такого розміру.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/uz/activities.php b/lang/uz/activities.php
index 0cbfd264a02..19d52adc49c 100644
--- a/lang/uz/activities.php
+++ b/lang/uz/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'o‘chirilgan webhook',
     'webhook_delete_notification' => 'Webhook muvaffaqiyatli o‘chirildi',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'created user',
     'user_create_notification' => 'User successfully created',
diff --git a/lang/uz/editor.php b/lang/uz/editor.php
index f3aa4f5cdf9..deea210bab7 100644
--- a/lang/uz/editor.php
+++ b/lang/uz/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Muharrir haqida',
     'about_title' => 'WYSIWYG muharriri haqida',
     'editor_license' => 'Muharrir litsenziyasi va mualliflik huquqi',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Ushbu muharrir MIT litsenziyasi ostida taqdim etilgan :tinyLink yordamida yaratilgan.',
     'editor_tiny_license_link' => 'TinyMCE mualliflik huquqi va litsenziya tafsilotlarini bu yerda topishingiz mumkin.',
     'save_continue' => 'Sahifani saqlang va Davom eting',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index f0818207121..fa198c68d8a 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF holatida',
     'export_text' => 'Oddiy matn holatida',
     'export_md' => 'Markdown fayli holatida',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Huquqlar',
diff --git a/lang/uz/errors.php b/lang/uz/errors.php
index 63a61ef844a..a0d86c44191 100644
--- a/lang/uz/errors.php
+++ b/lang/uz/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName hozir ishlamayapti',
     'back_soon' => 'Tez orada zaxiralanadi.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'So‘rovda hech qanday avtorizatsiya belgisi topilmadi',
     'api_bad_authorization_format' => 'So‘rovda avtorizatsiya belgisi topildi, lekin format noto‘g‘ri ko‘rindi',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index 4ce7c06094a..fabef538314 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Kirish tizimi API',
     'role_manage_settings' => 'Ilova sozlamalarini boshqaring',
     'role_export_content' => 'Kontentni eksport qilish',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Sahifa muharririni o\'zgartirish',
     'role_notifications' => 'Bildirishnomalarni qabul qilish va boshqarish',
     'role_asset' => 'Obyektga ruxsatlar',
diff --git a/lang/uz/validation.php b/lang/uz/validation.php
index 4606a012879..d9d0fa0b2af 100644
--- a/lang/uz/validation.php
+++ b/lang/uz/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute URL formatida emas.',
     'uploaded'             => 'Faylni yuklashda xatolik. Server bunday hajmdagi faylllarni yuklamasligi mumkin.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index d11de40e4a6..2262e37a005 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'đã xóa webhook',
     'webhook_delete_notification' => 'Webhook đã được xóa thành công',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => 'đã tạo người dùng',
     'user_create_notification' => 'Người dùng được tạo thành công',
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index 76203c2d231..2e36df8dd9e 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -163,6 +163,8 @@
     'about' => 'Giới thiệu về trình soạn thảo',
     'about_title' => 'Giới thiệu về trình soạn thảo WYSIWYG',
     'editor_license' => 'Giáy phép & Bản quyền của trình soạn thảo',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'Trình soạn thảo này được xây dựng bằng các sử dụng :tinyLink theo giấy phép MIT.',
     'editor_tiny_license_link' => 'Chi tiết về bản quyền và giấy phép của TinyMCE có thể được tìm thấy tại đây.',
     'save_continue' => 'Lưu trang & Tiếp tục',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index f8f6ca293bb..11c47a8d5eb 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'Tệp PDF',
     'export_text' => 'Tệp văn bản thuần túy',
     'export_md' => 'Tệp Markdown',
+    'export_zip' => 'Portable ZIP',
     'default_template' => 'Default Page Template',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
     'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => 'Quyền',
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index a2a7d491b4a..66ad23b7278 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName hiện đang ngoại tuyến',
     'back_soon' => 'Nó sẽ sớm hoạt động trở lại.',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => 'Không tìm thấy token ủy quyền trong yêu cầu',
     'api_bad_authorization_format' => 'Đã tìm thấy một token ủy quyền trong yêu cầu nhưng định dạng hiển thị không hợp lệ',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 63024cbd39a..410d28d5941 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => 'Truy cập đến API hệ thống',
     'role_manage_settings' => 'Quản lý cài đặt của ứng dụng',
     'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
     'role_asset' => 'Quyền tài sản (asset)',
diff --git a/lang/vi/validation.php b/lang/vi/validation.php
index e7bcfd3e2a9..9683c085726 100644
--- a/lang/vi/validation.php
+++ b/lang/vi/validation.php
@@ -105,6 +105,11 @@
     'url'                  => 'Định dạng của :attribute không hợp lệ.',
     'uploaded'             => 'Tệp tin đã không được tải lên. Máy chủ không chấp nhận các tệp tin với dung lượng lớn như tệp tin trên.',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/zh_CN/activities.php b/lang/zh_CN/activities.php
index 54c93b0efea..7edf9bc79fc 100644
--- a/lang/zh_CN/activities.php
+++ b/lang/zh_CN/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'Webhook 已删除',
     'webhook_delete_notification' => 'Webhook 删除成功',
 
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
     // Users
     'user_create' => '用户已创建',
     'user_create_notification' => '用户创建成功',
diff --git a/lang/zh_CN/components.php b/lang/zh_CN/components.php
index f04a254ec09..c2ca50d3691 100644
--- a/lang/zh_CN/components.php
+++ b/lang/zh_CN/components.php
@@ -17,7 +17,7 @@
     'image_page_title' => '查看上传到本页面的图片',
     'image_search_hint' => '按图片名称搜索',
     'image_uploaded' => '上传于 :uploadedDate',
-    'image_uploaded_by' => '由 :username 上传',
+    'image_uploaded_by' => '由 :userName 上传',
     'image_uploaded_to' => '上传到 :pageLink',
     'image_updated' => ':updateDate 更新',
     'image_load_more' => '显示更多',
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index 1a07362a553..5f4ffdcb96b 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -163,6 +163,8 @@
     'about' => '关于编辑器',
     'about_title' => '关于所见即所得（WYSIWYG）编辑器',
     'editor_license' => '编辑器许可证与版权信息',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => '此编辑器是用 :tinyLink 构建的，基于 MIT 许可证。',
     'editor_tiny_license_link' => 'TinyMCE 的版权和许可证详细信息可以在这里找到。',
     'save_continue' => '保存页面并继续',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index 5083b263e6f..9f6ee7ecfb3 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF文件',
     'export_text' => '纯文本文件',
     'export_md' => 'Markdown 文件',
+    'export_zip' => 'Portable ZIP',
     'default_template' => '默认页面模板',
     'default_template_explain' => '指定一个页面模板，该模板将作为此项目中所有页面的默认内容。请注意，仅当页面创建者具有对所选页面模板的查看访问权限时，此功能才会生效。',
     'default_template_select' => '选择模板页面',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
     'permissions' => '权限',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index b51be47c106..3c5f262a166 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -105,6 +105,18 @@
     'app_down' => ':appName现在正在关闭',
     'back_soon' => '请耐心等待网站的恢复。',
 
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
     // API errors
     'api_no_authorization_found' => '未在请求中找到授权令牌',
     'api_bad_authorization_format' => '已在请求中找到授权令牌，但格式貌似不正确',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index 4eae4a98dfa..3343877ab58 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -162,6 +162,7 @@
     'role_access_api' => '访问系统 API',
     'role_manage_settings' => '管理 App 设置',
     'role_export_content' => '导出内容',
+    'role_import_content' => 'Import content',
     'role_editor_change' => '更改页面编辑器',
     'role_notifications' => '管理和接收通知',
     'role_asset' => '资源许可',
diff --git a/lang/zh_CN/validation.php b/lang/zh_CN/validation.php
index 9f24f3339da..120dfd998c8 100644
--- a/lang/zh_CN/validation.php
+++ b/lang/zh_CN/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute 格式无效。',
     'uploaded'             => '无法上传文件。 服务器可能不接受此大小的文件。',
 
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index dddca399ac9..be12e22c2f4 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -84,6 +84,14 @@
     'webhook_delete' => 'webhook 已刪除',
     'webhook_delete_notification' => 'Webhook 已刪除成功',
 
+    // Imports
+    'import_create' => '已建立匯入',
+    'import_create_notification' => '成功上傳匯入',
+    'import_run' => '已更新匯入',
+    'import_run_notification' => '成功匯入內容',
+    'import_delete' => '已刪除匯入',
+    'import_delete_notification' => '匯入刪除成功',
+
     // Users
     'user_create' => '建立使用者',
     'user_create_notification' => '使用者已成功建立。',
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 8b003a7303b..f8023bdd5ea 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => '服務條款',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => '搜尋 :appName',
 ];
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index 2ee37f863de..7eeb48501ac 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -163,6 +163,8 @@
     'about' => '關於編輯器',
     'about_title' => '關於所見即所得（WYSIWYG）編輯器',
     'editor_license' => '編輯器許可證與版權信息',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => '此編輯器是用 :tinyLink 構建的，基於 MIT 許可證。',
     'editor_tiny_license_link' => 'TinyMCE 的版權和許可證詳細信息可以在這裡找到。',
     'save_continue' => '保存頁面並繼續',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 2f96bea2e56..ee8113bee79 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -39,9 +39,30 @@
     'export_pdf' => 'PDF 檔案',
     'export_text' => '純文字檔案',
     'export_md' => 'Markdown 檔案',
+    'export_zip' => '可攜式 ZIP',
     'default_template' => '預設頁面範本',
     'default_template_explain' => '請設定一個頁面範本，作為新頁面的預設內容。請注意，這僅限於作者擁有頁面範本讀取權限時才能夠使用。',
     'default_template_select' => '選擇一個頁面範本',
+    'import' => '匯入',
+    'import_validate' => '驗證匯入',
+    'import_desc' => '使用從相同或不同站點匯出的可攜式壓縮檔匯入書本、章節與頁面。選取 ZIP 檔案繼續。檔案上傳並通過驗證後，您就可以在下一個檢視中設定並確認匯入。',
+    'import_zip_select' => '選取要上傳的 ZIP 檔案',
+    'import_zip_validation_errors' => '驗證提供的 ZIP 檔案時偵測到錯誤：',
+    'import_pending' => '擱置中的匯入',
+    'import_pending_none' => '尚未開始匯入。',
+    'import_continue' => '繼續匯入',
+    'import_continue_desc' => '檢視要從上傳的 ZIP 檔匯入的內容。準備就緒後，執行匯入以將其內容加入本系統。成功匯入後，上傳的 ZIP 匯入檔案會自動移除。',
+    'import_details' => '匯入詳細資訊',
+    'import_run' => '執行匯入',
+    'import_size' => ':size 匯入 ZIP 大小',
+    'import_uploaded_at' => ':relativeTime 已上傳',
+    'import_uploaded_by' => '上傳者',
+    'import_location' => '匯入位置',
+    'import_location_desc' => '為您匯入的內容選取目標位置。您需要相關權限才能在您選擇的位置內建立。',
+    'import_delete_confirm' => '您確定要刪除此匯入嗎？',
+    'import_delete_desc' => '這將會刪除已上傳的匯入 ZIP 檔案，且無法還原。',
+    'import_errors' => '匯入錯誤',
+    'import_errors_desc' => '嘗試匯入時發生以下錯誤：',
 
     // Permissions and restrictions
     'permissions' => '權限',
@@ -224,8 +245,8 @@
     'pages_edit_switch_to_markdown_clean' => '(清除內容)',
     'pages_edit_switch_to_markdown_stable' => '(保留內容)',
     'pages_edit_switch_to_wysiwyg' => '切換到所見即所得編輯器',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => '切換為新的所見即所得編輯器',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '（仍在開發測試階段）',
     'pages_edit_set_changelog' => '設定變更日誌',
     'pages_edit_enter_changelog_desc' => '輸入對您所做變動的簡易描述',
     'pages_edit_enter_changelog' => '輸入變更日誌',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 172c8ad0f82..7a42ce5119c 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '您不能刪除唯一的管理員帳號',
     'users_cannot_delete_guest' => '您不能刪除訪客使用者',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => '由於寄送邀請電子郵件失敗，因此無法建立使用者',
 
     // Roles
     'role_cannot_be_edited' => '無法編輯這個角色',
@@ -105,6 +105,18 @@
     'app_down' => ':appName 離線中',
     'back_soon' => '它應該很快就會重新上線。',
 
+    // Import
+    'import_zip_cant_read' => '無法讀取 ZIP 檔案。',
+    'import_zip_cant_decode_data' => '無法尋找並解碼 ZIP data.json 內容。',
+    'import_zip_no_data' => 'ZIP 檔案資料沒有預期的書本、章節或頁面內容。',
+    'import_validation_failed' => '匯入 ZIP 驗證失敗，發生錯誤：',
+    'import_zip_failed_notification' => '匯入 ZIP 檔案失敗。',
+    'import_perms_books' => '您缺乏建立書本所需的權限。',
+    'import_perms_chapters' => '您缺乏建立章節所需的權限。',
+    'import_perms_pages' => '您缺乏建立頁面所需的權限。',
+    'import_perms_images' => '您缺乏建立影像所需的權限。',
+    'import_perms_attachments' => '您缺乏建立附件所需的權限。',
+
     // API errors
     'api_no_authorization_found' => '在請求上找不到授權權杖',
     'api_bad_authorization_format' => '在請求中找到授權權杖，但格式似乎不正確',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index 9c893f1fae0..b50d7649e7a 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -163,6 +163,7 @@
     'role_access_api' => '存取系統 API',
     'role_manage_settings' => '管理應用程式設定',
     'role_export_content' => '匯出內容',
+    'role_import_content' => '匯入內容',
     'role_editor_change' => '重設頁面編輯器',
     'role_notifications' => '管理和接收通知',
     'role_asset' => '資源權限',
diff --git a/lang/zh_TW/validation.php b/lang/zh_TW/validation.php
index 6651f13966c..30031470749 100644
--- a/lang/zh_TW/validation.php
+++ b/lang/zh_TW/validation.php
@@ -105,6 +105,11 @@
     'url'                  => ':attribute 格式無效。',
     'uploaded'             => '無法上傳文檔案， 伺服器可能不接受此大小的檔案。',
 
+    'zip_file' => ':attribute 需要參照 ZIP 中的檔案。',
+    'zip_file_mime' => ':attribute 需要參照類型為 :validTypes 的檔案，找到 :foundType。',
+    'zip_model_expected' => '預期為資料物件，但找到「:type」。',
+    'zip_unique' => '對於 ZIP 中的物件類型，:attribute 必須是唯一的。',
+
     // Custom validation lines
     'custom' => [
         'password-confirm' => [

From d56eea9279d37444265563d2794bba475719deb9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 23 Dec 2024 11:27:58 +0000
Subject: [PATCH 423/666] Locales: Updated locale list with new languages

---
 app/Translation/LocaleManager.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index ca71df64931..0e2e7372ff6 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -21,6 +21,7 @@ class LocaleManager
     protected array $localeMap = [
         'ar'          => 'ar',
         'bg'          => 'bg_BG',
+        'bn'          => 'bn_BD',
         'bs'          => 'bs_BA',
         'ca'          => 'ca',
         'cs'          => 'cs_CZ',
@@ -41,6 +42,7 @@ class LocaleManager
         'hr'          => 'hr_HR',
         'hu'          => 'hu_HU',
         'id'          => 'id_ID',
+        'is'          => 'is_IS',
         'it'          => 'it_IT',
         'ja'          => 'ja',
         'ka'          => 'ka_GE',

From 980a684b1468fa15caa509aba534732b68a77fbb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 23 Dec 2024 11:53:35 +0000
Subject: [PATCH 424/666] Updated translator & dependency attribution before
 release v24.12

---
 .github/translators.txt                |  6 ++++
 dev/licensing/js-library-licenses.txt  | 39 ++++++++++++++++++++++++++
 dev/licensing/php-library-licenses.txt | 10 +++----
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 9699be70f8b..9844f65b366 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -455,3 +455,9 @@ Rivo Zängov (Eraser) :: Estonian
 Francisco Rafael Fonseca (chicoraf) :: Portuguese, Brazilian
 ИEØ_ΙΙØZ (NEO_IIOZ) :: Chinese Traditional
 madnjpn (madnjpn.) :: Georgian
+Ásgeir Shiny Ásgeirsson (AsgeirShiny) :: Icelandic
+Mohammad Aftab Uddin (chirohorit) :: Bengali
+Yannis Karlaftis (meliseus) :: Greek
+felixxx :: German Informal
+randi (randi65535) :: Korean
+test65428 :: Greek
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index a6a01cdcc4f..479941db199 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -507,6 +507,12 @@ Copyright: Copyright (c) 2011 Debuggable Limited <*****@**********.***>
 Source: git://github.com/felixge/node-delayed-stream.git
 Link: https://github.com/felixge/node-delayed-stream
 -----------
+detect-libc
+License: Apache-2.0
+License File: node_modules/detect-libc/LICENSE
+Source: git://github.com/lovell/detect-libc
+Link: git://github.com/lovell/detect-libc
+-----------
 detect-newline
 License: MIT
 License File: node_modules/detect-newline/license
@@ -1819,6 +1825,13 @@ Copyright: Copyright (c) 2018 Tobias Reich
 Source: https://github.com/electerious/nice-try.git
 Link: https://github.com/electerious/nice-try
 -----------
+node-addon-api
+License: MIT
+License File: node_modules/node-addon-api/LICENSE.md
+Copyright: Copyright (c) 2017 [Node.js API collaborators](https://github.com/nodejs/node-addon-api#collaborators)
+Source: git://github.com/nodejs/node-addon-api.git
+Link: https://github.com/nodejs/node-addon-api
+-----------
 node-int64
 License: MIT
 License File: node_modules/node-int64/LICENSE
@@ -3525,6 +3538,11 @@ Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and
 Source: https://github.com/lezer-parser/xml.git
 Link: https://github.com/lezer-parser/xml.git
 -----------
+@marijn/find-cluster-break
+License: MIT
+Source: git+https://github.com/marijnh/find-cluster-break.git
+Link: https://github.com/marijnh/find-cluster-break#readme
+-----------
 @nodelib/fs.scandir
 License: MIT
 License File: node_modules/@nodelib/fs.scandir/LICENSE
@@ -3546,6 +3564,27 @@ Copyright: Copyright (c) Denis Malinochkin
 Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
 Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
 -----------
+@parcel/watcher-linux-x64-glibc
+License: MIT
+License File: node_modules/@parcel/watcher-linux-x64-glibc/LICENSE
+Copyright: Copyright (c) 2017-present Devon Govett
+Source: https://github.com/parcel-bundler/watcher.git
+Link: https://github.com/parcel-bundler/watcher.git
+-----------
+@parcel/watcher-linux-x64-musl
+License: MIT
+License File: node_modules/@parcel/watcher-linux-x64-musl/LICENSE
+Copyright: Copyright (c) 2017-present Devon Govett
+Source: https://github.com/parcel-bundler/watcher.git
+Link: https://github.com/parcel-bundler/watcher.git
+-----------
+@parcel/watcher
+License: MIT
+License File: node_modules/@parcel/watcher/LICENSE
+Copyright: Copyright (c) 2017-present Devon Govett
+Source: https://github.com/parcel-bundler/watcher.git
+Link: https://github.com/parcel-bundler/watcher.git
+-----------
 @rtsao/scc
 License: MIT
 License File: node_modules/@rtsao/scc/LICENSE
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 747ccc986d7..bf3619036f7 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -202,7 +202,7 @@ Link: https://github.com/intervention/gif
 intervention/image
 License: MIT
 License File: vendor/intervention/image/LICENSE
-Copyright: Copyright (c) 2013-2024 Oliver Vogel
+Copyright: Copyright (c) 2013-present Oliver Vogel
 Source: https://github.com/Intervention/image.git
 Link: https://image.intervention.io/
 -----------
@@ -307,7 +307,7 @@ Link: https://github.com/thephpleague/oauth1-client.git
 league/oauth2-client
 License: MIT
 License File: vendor/league/oauth2-client/LICENSE
-Copyright: Copyright (c) 2013-2020 Alex Bilbie <*****@**********.***>
+Copyright: Copyright (c) 2013-2023 Alex Bilbie <*****@**********.***>
 Source: https://github.com/thephpleague/oauth2-client.git
 Link: https://github.com/thephpleague/oauth2-client.git
 -----------
@@ -560,9 +560,9 @@ Link: https://github.com/SocialiteProviders/Twitch.git
 ssddanbrown/htmldiff
 License: MIT
 License File: vendor/ssddanbrown/htmldiff/license.md
-Copyright: Copyright (c) 2020 Nathan Herald, Rohland de Charmoy, Dan Brown
-Source: https://github.com/ssddanbrown/HtmlDiff.git
-Link: https://github.com/ssddanbrown/htmldiff
+Copyright: Copyright (c) 2024 Nathan Herald, Rohland de Charmoy, Dan Brown
+Source: https://codeberg.org/danb/HtmlDiff
+Link: https://codeberg.org/danb/HtmlDiff
 -----------
 ssddanbrown/symfony-mailer
 License: MIT

From 6d7ff59a89e572f7ce25057a858e5223740b8549 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 31 Dec 2024 15:13:50 +0000
Subject: [PATCH 425/666] ZIP Exports: Improved temp file tracking & clean-up

---
 .../Controllers/BookExportController.php      |  2 +-
 .../Controllers/ChapterExportController.php   |  2 +-
 .../Controllers/PageExportController.php      |  2 +-
 app/Exports/ZipExports/ZipExportBuilder.php   | 25 ++++++++++++++---
 app/Http/DownloadResponseFactory.php          | 28 ++++++++++++++++++-
 tests/Exports/ZipExportTest.php               | 19 +++++++++++++
 6 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index f726175a086..184f7c2350e 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -75,6 +75,6 @@ public function zip(string $bookSlug, ZipExportBuilder $builder)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedDirectly(fopen($zip, 'r'), $bookSlug . '.zip', filesize($zip));
+        return $this->download()->streamedFileDirectly($zip, $bookSlug . '.zip', filesize($zip), true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index 0d7a5c0d195..4748ca6a80a 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -81,6 +81,6 @@ public function zip(string $bookSlug, string $chapterSlug, ZipExportBuilder $bui
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedDirectly(fopen($zip, 'r'), $chapterSlug . '.zip', filesize($zip));
+        return $this->download()->streamedFileDirectly($zip, $chapterSlug . '.zip', filesize($zip), true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 34e67ffcf70..203495fe900 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -85,6 +85,6 @@ public function zip(string $bookSlug, string $pageSlug, ZipExportBuilder $builde
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedDirectly(fopen($zip, 'r'), $pageSlug . '.zip', filesize($zip));
+        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', filesize($zip), true);
     }
 }
diff --git a/app/Exports/ZipExports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
index 4c5c638f591..9a52c9a3cb8 100644
--- a/app/Exports/ZipExports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -84,10 +84,27 @@ protected function build(): string
         $zip->addEmptyDir('files');
 
         $toRemove = [];
-        $this->files->extractEach(function ($filePath, $fileRef) use ($zip, &$toRemove) {
-            $zip->addFile($filePath, "files/$fileRef");
-            $toRemove[] = $filePath;
-        });
+        $addedNames = [];
+
+        try {
+            $this->files->extractEach(function ($filePath, $fileRef) use ($zip, &$toRemove, &$addedNames) {
+                $entryName = "files/$fileRef";
+                $zip->addFile($filePath, $entryName);
+                $toRemove[] = $filePath;
+                $addedNames[] = $entryName;
+            });
+        } catch (\Exception $exception) {
+            // Cleanup the files we've processed so far and respond back with error
+            foreach ($toRemove as $file) {
+                unlink($file);
+            }
+            foreach ($addedNames as $name) {
+                $zip->deleteName($name);
+            }
+            $zip->close();
+            unlink($zipFile);
+            throw new ZipExportException("Failed to add files for ZIP export, received error: " . $exception->getMessage());
+        }
 
         $zip->close();
 
diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index f29aaa2e45a..d06e2bac44d 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -9,7 +9,7 @@
 class DownloadResponseFactory
 {
     public function __construct(
-        protected Request $request
+        protected Request $request,
     ) {
     }
 
@@ -35,6 +35,32 @@ public function streamedDirectly($stream, string $fileName, int $fileSize): Stre
         );
     }
 
+    /**
+     * Create a response that downloads the given file via a stream.
+     * Has the option to delete the provided file once the stream is closed.
+     */
+    public function streamedFileDirectly(string $filePath, string $fileName, int $fileSize, bool $deleteAfter = false): StreamedResponse
+    {
+        $stream = fopen($filePath, 'r');
+
+        if ($deleteAfter) {
+            // Delete the given file if it still exists after the app terminates
+            $callback = function () use ($filePath) {
+                if (file_exists($filePath)) {
+                    unlink($filePath);
+                }
+            };
+
+            // We watch both app terminate and php shutdown to cover both normal app termination
+            // as well as other potential scenarios (connection termination).
+            app()->terminating($callback);
+            register_shutdown_function($callback);
+        }
+
+        return $this->streamedDirectly($stream, $fileName, $fileSize);
+    }
+
+
     /**
      * Create a file download response that provides the file with a content-type
      * correct for the file, in a way so the browser can show the content in browser,
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 163828c1b6e..0e17bc0e01d 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
+use FilesystemIterator;
 use Illuminate\Support\Carbon;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
@@ -60,6 +61,24 @@ public function test_export_metadata()
         $this->assertEquals($instanceId, $zipInstanceId);
     }
 
+    public function test_export_leaves_no_temp_files()
+    {
+        $tempDir = sys_get_temp_dir();
+        $startTempFileCount = iterator_count((new FileSystemIterator($tempDir, FilesystemIterator::SKIP_DOTS)));
+
+        $page = $this->entities->pageWithinChapter();
+        $this->asEditor();
+        $pageResp = $this->get($page->getUrl("/export/zip"));
+        $pageResp->streamedContent();
+        $pageResp->assertOk();
+        $this->get($page->chapter->getUrl("/export/zip"))->assertOk();
+        $this->get($page->book->getUrl("/export/zip"))->assertOk();
+
+        $afterTempFileCount = iterator_count((new FileSystemIterator($tempDir, FilesystemIterator::SKIP_DOTS)));
+
+        $this->assertEquals($startTempFileCount, $afterTempFileCount);
+    }
+
     public function test_page_export()
     {
         $page = $this->entities->page();

From 7e31725d48f502a3c51d0382c874affa13fdf8ff Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 1 Jan 2025 15:19:11 +0000
Subject: [PATCH 426/666] Exports: Improved PDF command temp file cleanup

---
 app/Exports/PdfGenerator.php    | 12 +++++++++++-
 tests/Exports/PdfExportTest.php | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/Exports/PdfGenerator.php b/app/Exports/PdfGenerator.php
index 0524e063fb2..f31d8aad078 100644
--- a/app/Exports/PdfGenerator.php
+++ b/app/Exports/PdfGenerator.php
@@ -90,18 +90,28 @@ protected function renderUsingCommand(string $html): string
         $process = Process::fromShellCommandline($command);
         $process->setTimeout($timeout);
 
+        $cleanup = function () use ($inputHtml, $outputPdf) {
+            foreach ([$inputHtml, $outputPdf] as $file) {
+                if (file_exists($file)) {
+                    unlink($file);
+                }
+            }
+        };
+
         try {
             $process->run();
         } catch (ProcessTimedOutException $e) {
+            $cleanup();
             throw new PdfExportException("PDF Export via command failed due to timeout at {$timeout} second(s)");
         }
 
         if (!$process->isSuccessful()) {
+            $cleanup();
             throw new PdfExportException("PDF Export via command failed with exit code {$process->getExitCode()}, stdout: {$process->getOutput()}, stderr: {$process->getErrorOutput()}");
         }
 
         $pdfContents = file_get_contents($outputPdf);
-        unlink($outputPdf);
+        $cleanup();
 
         if ($pdfContents === false) {
             throw new PdfExportException("PDF Export via command failed, unable to read PDF output file");
diff --git a/tests/Exports/PdfExportTest.php b/tests/Exports/PdfExportTest.php
index 9d85c69e23a..e4de87d0d2f 100644
--- a/tests/Exports/PdfExportTest.php
+++ b/tests/Exports/PdfExportTest.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\PdfExportException;
 use BookStack\Exports\PdfGenerator;
+use FilesystemIterator;
 use Tests\TestCase;
 
 class PdfExportTest extends TestCase
@@ -128,7 +129,7 @@ public function test_pdf_command_option_errors_if_command_returns_error_status()
         }, PdfExportException::class);
     }
 
-    public function test_pdf_command_timout_option_limits_export_time()
+    public function test_pdf_command_timeout_option_limits_export_time()
     {
         $page = $this->entities->page();
         $command = 'php -r \'sleep(4);\'';
@@ -143,4 +144,19 @@ public function test_pdf_command_timout_option_limits_export_time()
         }, PdfExportException::class,
             "PDF Export via command failed due to timeout at 1 second(s)");
     }
+
+    public function test_pdf_command_option_does_not_leave_temp_files()
+    {
+        $tempDir = sys_get_temp_dir();
+        $startTempFileCount = iterator_count((new FileSystemIterator($tempDir, FilesystemIterator::SKIP_DOTS)));
+
+        $page = $this->entities->page();
+        $command = 'cp {input_html_path} {output_pdf_path}';
+        config()->set('exports.pdf_command', $command);
+
+        $this->asEditor()->get($page->getUrl('/export/pdf'));
+
+        $afterTempFileCount = iterator_count((new FileSystemIterator($tempDir, FilesystemIterator::SKIP_DOTS)));
+        $this->assertEquals($startTempFileCount, $afterTempFileCount);
+    }
 }

From 1ff28266787b0f160697cdc74dfb05907611fcc6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 1 Jan 2025 15:42:59 +0000
Subject: [PATCH 427/666] Exports: Added rate limits for UI exports

Just as a measure to prevent potential abuse of these potentially
longer-running endpoints.
Adds test to cover for ZIP exports, but applied to all formats.
---
 app/App/Providers/RouteServiceProvider.php    |  7 ++++++
 .../Controllers/BookExportController.php      |  1 +
 .../Controllers/ChapterExportController.php   |  1 +
 .../Controllers/PageExportController.php      |  1 +
 tests/Exports/ZipExportTest.php               | 22 +++++++++++++++++++
 5 files changed, 32 insertions(+)

diff --git a/app/App/Providers/RouteServiceProvider.php b/app/App/Providers/RouteServiceProvider.php
index d7c1cb73756..97c3e7c770d 100644
--- a/app/App/Providers/RouteServiceProvider.php
+++ b/app/App/Providers/RouteServiceProvider.php
@@ -85,5 +85,12 @@ protected function configureRateLimiting(): void
         RateLimiter::for('public', function (Request $request) {
             return Limit::perMinute(10)->by($request->ip());
         });
+
+        RateLimiter::for('exports', function (Request $request) {
+            $user = user();
+            $attempts = $user->isGuest() ? 4 : 10;
+            $key = $user->isGuest() ? $request->ip() : $user->id;
+            return Limit::perMinute($attempts)->by($key);
+        });
     }
 }
diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index 184f7c2350e..b6b1006bd61 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -16,6 +16,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
     ) {
         $this->middleware('can:content-export');
+        $this->middleware('throttle:exports');
     }
 
     /**
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index 4748ca6a80a..de2385bb11f 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -16,6 +16,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
     ) {
         $this->middleware('can:content-export');
+        $this->middleware('throttle:exports');
     }
 
     /**
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 203495fe900..d7145411eaa 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -17,6 +17,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
     ) {
         $this->middleware('can:content-export');
+        $this->middleware('throttle:exports');
     }
 
     /**
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 0e17bc0e01d..1434c013f73 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -423,6 +423,28 @@ public function test_links_in_markdown_are_parsed()
         $this->assertStringContainsString("[Link to chapter]([[bsexport:chapter:{$chapter->id}]])", $pageData['markdown']);
     }
 
+    public function test_exports_rate_limited_low_for_guest_viewers()
+    {
+        $this->setSettings(['app-public' => 'true']);
+
+        $page = $this->entities->page();
+        for ($i = 0; $i < 4; $i++) {
+            $this->get($page->getUrl("/export/zip"))->assertOk();
+        }
+        $this->get($page->getUrl("/export/zip"))->assertStatus(429);
+    }
+
+    public function test_exports_rate_limited_higher_for_logged_in_viewers()
+    {
+        $this->asAdmin();
+
+        $page = $this->entities->page();
+        for ($i = 0; $i < 10; $i++) {
+            $this->get($page->getUrl("/export/zip"))->assertOk();
+        }
+        $this->get($page->getUrl("/export/zip"))->assertStatus(429);
+    }
+
     protected function extractZipResponse(TestResponse $response): ZipResultData
     {
         $zipData = $response->streamedContent();

From ff6c5aaecbd470204136e8368eeed69d38d05d15 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 4 Jan 2025 21:01:28 +0000
Subject: [PATCH 428/666] Markdown Editor: Fixed scroll jump on image upload

For #5384
---
 resources/js/markdown/actions.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/js/markdown/actions.js b/resources/js/markdown/actions.js
index 86e25532802..e99bbf3e14f 100644
--- a/resources/js/markdown/actions.js
+++ b/resources/js/markdown/actions.js
@@ -445,8 +445,12 @@ export class Actions {
         selectionRange = selectionRange || this.#getSelectionRange();
         const newDoc = this.editor.cm.state.toText(text);
         const newSelectFrom = Math.min(selectionRange.from, newDoc.length);
+        const scrollTop = this.editor.cm.scrollDOM.scrollTop;
         this.#dispatchChange(0, this.editor.cm.state.doc.length, text, newSelectFrom);
         this.focus();
+        window.requestAnimationFrame(() => {
+            this.editor.cm.scrollDOM.scrollTop = scrollTop;
+        });
     }
 
     /**

From 9a5c287470662817a12ce0be08f71fc708f64189 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 4 Jan 2025 21:45:36 +0000
Subject: [PATCH 429/666] Deps: Updated composer packages

---
 composer.lock | 244 ++++++++++++++++++++++++--------------------------
 1 file changed, 117 insertions(+), 127 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2a71d3e7cb0..16156f2dc11 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.2",
+            "version": "3.336.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4"
+                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/954bfdfc048840ca34afe2a2e1cbcff6681989c4",
-                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
+                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.8"
             },
-            "time": "2024-12-20T19:05:10+00:00"
+            "time": "2025-01-03T19:06:11+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -978,16 +978,16 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6"
+                "reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
-                "reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/baf4084b27c7f4b5b7a221b19a94d11327664eb8",
+                "reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8",
                 "shasum": ""
             },
             "require": {
@@ -1003,7 +1003,7 @@
                 "ext-json": "*",
                 "ext-zip": "*",
                 "mockery/mockery": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10",
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11",
                 "squizlabs/php_codesniffer": "^3.5",
                 "symfony/process": "^4.4 || ^5.4 || ^6.2 || ^7.0"
             },
@@ -1036,9 +1036,9 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v3.0.1"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.0.2"
             },
-            "time": "2024-12-05T14:59:38+00:00"
+            "time": "2024-12-27T20:27:37+00:00"
         },
         {
             "name": "dompdf/php-font-lib",
@@ -1198,16 +1198,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+                "reference": "b115554301161fa21467629f1e1391c1936de517"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517",
+                "reference": "b115554301161fa21467629f1e1391c1936de517",
                 "shasum": ""
             },
             "require": {
@@ -1253,7 +1253,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.3"
             },
             "funding": [
                 {
@@ -1261,7 +1261,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-06T06:47:41+00:00"
+            "time": "2024-12-27T00:36:43+00:00"
         },
         {
             "name": "firebase/php-jwt",
@@ -1940,16 +1940,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.10.0",
+            "version": "3.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "1ddc9a096b3a641958515700e09be910bf03a5bd"
+                "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/1ddc9a096b3a641958515700e09be910bf03a5bd",
-                "reference": "1ddc9a096b3a641958515700e09be910bf03a5bd",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/1c68e5fdf443374f3580c5b920a7f177eccdab85",
+                "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85",
                 "shasum": ""
             },
             "require": {
@@ -1996,7 +1996,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.10.0"
+                "source": "https://github.com/Intervention/image/tree/3.10.2"
             },
             "funding": [
                 {
@@ -2012,7 +2012,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2024-12-21T07:41:40+00:00"
+            "time": "2025-01-04T07:31:37+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -2547,16 +2547,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d150f911e0079e90ae3c106734c93137c184f932"
+                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932",
-                "reference": "d150f911e0079e90ae3c106734c93137c184f932",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad",
+                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad",
                 "shasum": ""
             },
             "require": {
@@ -2650,7 +2650,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T15:34:16+00:00"
+            "time": "2024-12-29T14:10:59+00:00"
         },
         {
             "name": "league/config",
@@ -3445,16 +3445,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.5",
+            "version": "2.72.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
                 "shasum": ""
             },
             "require": {
@@ -3474,7 +3474,7 @@
                 "doctrine/orm": "^2.7 || ^3.0",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
+                "ondrejmirtes/better-reflection": "<6",
                 "phpmd/phpmd": "^2.9",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -3548,7 +3548,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-03T19:18:41+00:00"
+            "time": "2024-12-27T09:28:11+00:00"
         },
         {
             "name": "nette/schema",
@@ -3700,16 +3700,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.3.1",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
-                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
                 "shasum": ""
             },
             "require": {
@@ -3752,9 +3752,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
             },
-            "time": "2024-10-08T18:51:32+00:00"
+            "time": "2024-12-30T11:07:19+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -5285,22 +5285,22 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.7.0",
+            "version": "v4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "ab0691b82cec77efd90154c78f1854903455c82f"
+                "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/ab0691b82cec77efd90154c78f1854903455c82f",
-                "reference": "ab0691b82cec77efd90154c78f1854903455c82f",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/e93acc38f8464cc775a2b8bf09df311d1fdfefcb",
+                "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb",
                 "shasum": ""
             },
             "require": {
                 "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0",
                 "laravel/socialite": "^5.5",
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "mockery/mockery": "^1.2",
@@ -5355,7 +5355,7 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2024-11-10T01:56:18+00:00"
+            "time": "2025-01-03T09:40:37+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
@@ -5635,16 +5635,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.15",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd"
+                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
-                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
+                "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04",
+                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04",
                 "shasum": ""
             },
             "require": {
@@ -5709,7 +5709,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.15"
+                "source": "https://github.com/symfony/console/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -5725,7 +5725,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T14:19:14+00:00"
+            "time": "2024-12-07T12:07:30+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5811,12 +5811,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -5861,16 +5861,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.14",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9"
+                "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9",
-                "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c",
+                "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c",
                 "shasum": ""
             },
             "require": {
@@ -5916,7 +5916,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.14"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -5932,7 +5932,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-05T15:34:40+00:00"
+            "time": "2024-12-06T13:30:51+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6034,12 +6034,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -6092,16 +6092,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.13",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958"
+                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
-                "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
+                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
                 "shasum": ""
             },
             "require": {
@@ -6136,7 +6136,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.13"
+                "source": "https://github.com/symfony/finder/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -6152,7 +6152,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-01T08:30:56+00:00"
+            "time": "2024-12-29T13:51:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -6233,16 +6233,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.16",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0"
+                "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
-                "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710",
+                "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710",
                 "shasum": ""
             },
             "require": {
@@ -6327,7 +6327,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.16"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -6343,20 +6343,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-27T12:49:36+00:00"
+            "time": "2024-12-31T14:49:31+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.13",
+            "version": "v6.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855"
+                "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
-                "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232",
+                "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232",
                 "shasum": ""
             },
             "require": {
@@ -6412,7 +6412,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.13"
+                "source": "https://github.com/symfony/mime/tree/v6.4.17"
             },
             "funding": [
                 {
@@ -6428,7 +6428,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-25T15:07:50+00:00"
+            "time": "2024-12-02T11:09:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7234,12 +7234,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -7493,12 +7493,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -7713,31 +7713,33 @@
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "v2.2.7",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
+                "reference": "0d72ac1c00084279c1816675284073c5a337c20d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
-                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",
+                "reference": "0d72ac1c00084279c1816675284073c5a337c20d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.5 || ^7.0 || ^8.0",
-                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "php": "^7.4 || ^8.0",
+                "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^8.5.21 || ^9.5.10"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -7760,9 +7762,9 @@
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             "support": {
                 "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"
             },
-            "time": "2023-12-08T13:03:43+00:00"
+            "time": "2024-12-21T16:25:41+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -8782,16 +8784,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.13",
+            "version": "1.12.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f"
+                "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f",
-                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e73868f809e68fff33be961ad4946e2e43ec9e38",
+                "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38",
                 "shasum": ""
             },
             "require": {
@@ -8836,7 +8838,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-17T17:00:20+00:00"
+            "time": "2024-12-31T07:26:13+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10258,17 +10260,15 @@
         },
         {
             "name": "ssddanbrown/asserthtml",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ssddanbrown/asserthtml.git",
-                "reference": "a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d"
+                "url": "https://codeberg.org/danb/asserthtml",
+                "reference": "31b3035b5533ae80ab16c80d3774dd840dbfd079"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/asserthtml/zipball/a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d",
-                "reference": "a2cf9394dfc4138b8d9691e1bd128ccc3d8fcc5d",
-                "shasum": ""
+                "url": "https://codeberg.org/api/v1/repos/danb/asserthtml/archive/%prettyVersion%.zip"
             },
             "require": {
                 "ext-dom": "*",
@@ -10299,18 +10299,8 @@
                 }
             ],
             "description": "HTML Content Assertions for PHPUnit",
-            "homepage": "https://github.com/ssddanbrown/asserthtml",
-            "support": {
-                "issues": "https://github.com/ssddanbrown/asserthtml/issues",
-                "source": "https://github.com/ssddanbrown/asserthtml/tree/v3.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ssddanbrown",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-05-11T14:26:12+00:00"
+            "homepage": "https://codeberg.org/danb/asserthtml",
+            "time": "2024-12-28T15:15:02+00:00"
         },
         {
             "name": "symfony/dom-crawler",

From 33b46882f39106697a704dadd25f221f0dc2ff53 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sat, 4 Jan 2025 21:46:35 +0000
Subject: [PATCH 430/666] Updated translations with latest Crowdin changes
 (#5370)

---
 lang/cs/activities.php      | 12 ++---
 lang/cs/common.php          |  4 +-
 lang/cs/editor.php          |  4 +-
 lang/cs/entities.php        | 42 +++++++++---------
 lang/cs/errors.php          | 20 ++++-----
 lang/cs/settings.php        |  2 +-
 lang/cs/validation.php      |  8 ++--
 lang/de/activities.php      | 12 ++---
 lang/de/editor.php          |  4 +-
 lang/de/entities.php        | 40 ++++++++---------
 lang/de/errors.php          | 22 +++++-----
 lang/de/settings.php        |  2 +-
 lang/de/validation.php      |  8 ++--
 lang/de_informal/editor.php |  4 +-
 lang/es/editor.php          |  4 +-
 lang/es_AR/editor.php       |  4 +-
 lang/it/activities.php      | 12 ++---
 lang/it/editor.php          |  4 +-
 lang/it/entities.php        | 42 +++++++++---------
 lang/it/errors.php          | 20 ++++-----
 lang/it/settings.php        |  2 +-
 lang/it/validation.php      |  8 ++--
 lang/ja/activities.php      |  6 +--
 lang/ja/editor.php          |  4 +-
 lang/ja/entities.php        | 42 +++++++++---------
 lang/ja/errors.php          | 20 ++++-----
 lang/ja/settings.php        |  2 +-
 lang/ja/validation.php      |  8 ++--
 lang/ko/activities.php      | 12 ++---
 lang/ko/auth.php            |  8 ++--
 lang/ko/common.php          |  2 +-
 lang/ko/components.php      |  2 +-
 lang/ko/editor.php          |  2 +-
 lang/ko/entities.php        | 88 ++++++++++++++++++-------------------
 lang/ko/errors.php          | 24 +++++-----
 lang/ko/passwords.php       |  4 +-
 lang/ko/preferences.php     |  4 +-
 lang/ko/settings.php        | 20 ++++-----
 lang/ko/validation.php      |  8 ++--
 lang/nl/editor.php          |  4 +-
 lang/nl/entities.php        | 10 ++---
 lang/nl/errors.php          | 16 +++----
 lang/nl/settings.php        |  2 +-
 lang/nl/validation.php      |  8 ++--
 lang/pt_BR/activities.php   | 24 +++++-----
 lang/pt_BR/common.php       | 14 +++---
 lang/pt_BR/editor.php       | 12 ++---
 lang/pt_BR/entities.php     | 62 +++++++++++++-------------
 lang/pt_BR/errors.php       | 40 ++++++++---------
 lang/pt_BR/settings.php     |  2 +-
 lang/pt_BR/validation.php   |  8 ++--
 lang/sk/activities.php      | 10 ++---
 52 files changed, 374 insertions(+), 374 deletions(-)

diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index 3b4a05213ba..8ce0397a74a 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook byl úspěšně odstraněn',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'vytvořil/a import',
+    'import_create_notification' => 'Import byl úspěšně nahrán',
+    'import_run' => 'aktualizoval/a import',
+    'import_run_notification' => 'Obsah byl úspěšně importován',
+    'import_delete' => 'odstranil/a import',
+    'import_delete_notification' => 'Import byl úspěšně odstraněn',
 
     // Users
     'user_create' => 'vytvořil uživatele',
diff --git a/lang/cs/common.php b/lang/cs/common.php
index 66ad222792d..af02491e460 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -73,8 +73,8 @@
     'toggle_details' => 'Přepnout podrobnosti',
     'toggle_thumbnails' => 'Přepnout náhledy',
     'details' => 'Podrobnosti',
-    'grid_view' => 'Zobrazení mřížky',
-    'list_view' => 'Zobrazení seznamu',
+    'grid_view' => 'Zobrazit mřížku',
+    'list_view' => 'Zobrazit seznam',
     'default' => 'Výchozí',
     'breadcrumb' => 'Drobečková navigace',
     'status' => 'Stav',
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index 8e7001c081c..fc5a4a74ac2 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -163,8 +163,8 @@
     'about' => 'O editoru',
     'about_title' => 'O WYSIWYG editoru',
     'editor_license' => 'Editor licence a autorská práva',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Tento editor je vytvořen jako fork :lexicalLink, který je distribuován pod licencí MIT.',
+    'editor_lexical_license_link' => 'Kompletní údaje o licenci naleznete zde.',
     'editor_tiny_license' => 'Tento editor je vytvořen pomocí :tinyLink, který je poskytován pod licencí MIT.',
     'editor_tiny_license_link' => 'Podrobnosti o autorských právech a licenci TinyMCE naleznete zde.',
     'save_continue' => 'Uložit stránku a pokračovat',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index a87ba49d044..21d6c8dd33d 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF dokument',
     'export_text' => 'Textový soubor',
     'export_md' => 'Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Přenosný archiv ZIP',
     'default_template' => 'Výchozí šablona stránky',
     'default_template_explain' => 'Přiřadit šablonu stránky, která bude použita jako výchozí obsah pro všechny nové stránky v této knize. Mějte na paměti, že šablona bude použita pouze v případě, že tvůrce stránek bude mít přístup k těmto vybraným stránkám šablony.',
     'default_template_select' => 'Vyberte šablonu stránky',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importovat',
+    'import_validate' => 'Ověřit import',
+    'import_desc' => 'Import knih, kapitol a stránek pomocí přenosného archivu ZIP z tohoto nebo jiného webu. Pro pokračování vyberte ZIP soubor. Po nahrání a ověření souboru budete moci v dalším kroku nastavit a potvrdit import.',
+    'import_zip_select' => 'Vybrat ZIP soubor k nahrání',
+    'import_zip_validation_errors' => 'Při ověřování vybraného souboru ZIP byly zjištěny chyby:',
+    'import_pending' => 'Čekající importy',
+    'import_pending_none' => 'Žádné importy nebyly spuštěny.',
+    'import_continue' => 'Pokračovat v importu',
+    'import_continue_desc' => 'Zkontrolujte obsah, který má být importován z nahraného souboru. Pokud je vše v pořádku, spusťte import pro přidání obsahu ZIP archivu na tento web. Nahraný soubor ZIP bude automaticky odstraněn po úspěšném importu.',
+    'import_details' => 'Obsah importu',
+    'import_run' => 'Spustit import',
+    'import_size' => 'Velikost archivu ZIP: :size',
+    'import_uploaded_at' => 'Nahráno :relativeTime',
+    'import_uploaded_by' => 'Nahrál/a',
+    'import_location' => 'Cílové umístění',
+    'import_location_desc' => 'Vyberte cílové umístění pro importovaný obsah. K vytvoření potřebujete příslušná oprávnění.',
+    'import_delete_confirm' => 'Opravdu chcete tento import odstranit?',
+    'import_delete_desc' => 'Potvrzením odstraníte nahraný ZIP soubor. Tento krok nelze vrátit zpět.',
+    'import_errors' => 'Chyby importu',
+    'import_errors_desc' => 'Při pokusu o import došlo k následujícím chybám:',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnění',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index c740ee193e7..b1eeb54e015 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'Brzy bude opět v provozu.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Nelze načíst ZIP soubor.',
+    'import_zip_cant_decode_data' => 'Nelze najít a dekódovat data.json v archivu ZIP.',
+    'import_zip_no_data' => 'ZIP archiv neobsahuje knihy, kapitoly nebo stránky.',
+    'import_validation_failed' => 'Importování ZIP selhalo s chybami:',
+    'import_zip_failed_notification' => 'Nepodařilo se naimportovat ZIP soubor.',
+    'import_perms_books' => 'Chybí vám požadovaná oprávnění k vytvoření knih.',
+    'import_perms_chapters' => 'Chybí vám požadovaná oprávnění k vytvoření kapitol.',
+    'import_perms_pages' => 'Chybí vám požadovaná oprávnění k vytvoření stránek.',
+    'import_perms_images' => 'Chybí vám požadovaná oprávnění k vytvoření obrázků.',
+    'import_perms_attachments' => 'Chybí vám požadovaná oprávnění k vytvoření příloh.',
 
     // API errors
     'api_no_authorization_found' => 'V požadavku nebyl nalezen žádný autorizační token',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 67d7d825a5e..17c25b27b62 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -162,7 +162,7 @@
     'role_access_api' => 'Přístup k systémovému API',
     'role_manage_settings' => 'Správa nastavení aplikace',
     'role_export_content' => 'Exportovat obsah',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importovat obsah',
     'role_editor_change' => 'Změnit editor stránek',
     'role_notifications' => 'Přijímat a spravovat oznámení',
     'role_asset' => 'Obsahová oprávnění',
diff --git a/lang/cs/validation.php b/lang/cs/validation.php
index f2ee59e5be0..b05d94625af 100644
--- a/lang/cs/validation.php
+++ b/lang/cs/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'Formát :attribute je neplatný.',
     'uploaded'             => 'Nahrávání :attribute se nezdařilo.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute musí odkazovat na soubor v archivu ZIP.',
+    'zip_file_mime' => ':attribute musí odkazovat na soubor typu :validTypes, nalezen :foundType.',
+    'zip_model_expected' => 'Očekáván datový objekt, ale nalezen „:type“.',
+    'zip_unique' => ':attribute musí být jedinečný pro typ objektu v archivu ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/de/activities.php b/lang/de/activities.php
index 79e05fbaf3d..012e024a235 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook erfolgreich gelöscht',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'Import erstellt',
+    'import_create_notification' => 'Import erfolgreich hochgeladen',
+    'import_run' => 'Import aktualisiert',
+    'import_run_notification' => 'Inhalt erfolgreich importiert',
+    'import_delete' => 'Import gelöscht',
+    'import_delete_notification' => 'Import erfolgreich gelöscht',
 
     // Users
     'user_create' => 'hat Benutzer erzeugt:',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index ab19d167e62..6e6b1fa63df 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Über den Editor',
     'about_title' => 'Über den WYSIWYG-Editor',
     'editor_license' => 'Editorlizenz & Copyright',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Dieser Editor wurde mithilfe von :lexicalLink erstellt, der unter der MIT-Lizenz bereitgestellt wird.',
+    'editor_lexical_license_link' => 'Vollständige Lizenzdetails finden Sie hier.',
     'editor_tiny_license' => 'Dieser Editor wurde mithilfe von :tinyLink erstellt, der unter der MIT-Lizenz bereitgestellt wird.',
     'editor_tiny_license_link' => 'Die Copyright- und Lizenzdetails von TinyMCE finden Sie hier.',
     'save_continue' => 'Speichern & Fortfahren',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index b3e1b38f9fe..799aa46050f 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -44,25 +44,25 @@
     'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
     'default_template_select' => 'Wählen Sie eine Seitenvorlage',
     'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import_validate' => 'Import validieren',
+    'import_desc' => 'Importieren Sie Bücher, Kapitel & Seiten mit einem "Portable Zip-Export" von der gleichen oder einer anderen Instanz. Wählen Sie eine ZIP-Datei, um fortzufahren. Nachdem die Datei hochgeladen und bestätigt wurde, können Sie den Import in der nächsten Ansicht konfigurieren und bestätigen.',
+    'import_zip_select' => 'ZIP-Datei zum Hochladen auswählen',
+    'import_zip_validation_errors' => 'Fehler bei der Validierung der angegebenen ZIP-Datei:',
+    'import_pending' => 'Ausstehende Importe',
+    'import_pending_none' => 'Es wurden keine Importe gestartet.',
+    'import_continue' => 'Import fortsetzen',
+    'import_continue_desc' => 'Überprüfen Sie den Inhalt, der aus der hochgeladenen ZIP-Datei importiert werden soll. Führen Sie den Import aus, um dessen Inhalt zu diesem System hinzuzufügen. Die hochgeladene ZIP-Importdatei wird bei erfolgreichem Import automatisch entfernt.',
+    'import_details' => 'Einzelheiten zum Import',
+    'import_run' => 'Import starten',
+    'import_size' => ':size Import ZIP Größe',
+    'import_uploaded_at' => 'Hochgeladen :relativeTime',
+    'import_uploaded_by' => 'Hochgeladen von',
+    'import_location' => 'Import Ort',
+    'import_location_desc' => 'Wählen Sie einen Zielort für Ihren importierten Inhalt. Sie benötigen die entsprechenden Berechtigungen, um innerhalb des gewünschten Standortes zu erstellen.',
+    'import_delete_confirm' => 'Sind Sie sicher, dass Sie diesen Import löschen möchten?',
+    'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
+    'import_errors' => 'Importfehler',
+    'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
@@ -245,7 +245,7 @@
     'pages_edit_switch_to_markdown_clean' => '(gesäuberter Output)',
     'pages_edit_switch_to_markdown_stable' => '(html beibehalten)',
     'pages_edit_switch_to_wysiwyg' => 'Wechseln Sie zum WYSIWYG-Editor',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'Zu neuem WYSIWYG wechseln',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index f940f67436b..c1f65d94006 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Sie können den einzigen Administrator nicht löschen',
     'users_cannot_delete_guest' => 'Sie können den Gast-Benutzer nicht löschen',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Benutzer konnte nicht erstellt werden, da die Einladungs-E-Mail nicht gesendet wurde',
 
     // Roles
     'role_cannot_be_edited' => 'Diese Rolle kann nicht bearbeitet werden',
@@ -106,16 +106,16 @@
     'back_soon' => 'Wir werden so schnell wie möglich wieder online sein.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
+    'import_zip_cant_decode_data' => 'ZIP data.json konnte nicht gefunden und dekodiert werden.',
+    'import_zip_no_data' => 'ZIP-Datei Daten haben kein erwartetes Buch, Kapitel oder Seiteninhalt.',
+    'import_validation_failed' => 'ZIP Import konnte mit Fehlern nicht validiert werden:',
+    'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
+    'import_perms_books' => 'Ihnen fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
+    'import_perms_chapters' => 'Ihnen fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
+    'import_perms_pages' => 'Ihnen fehlt die erforderliche Berechtigung, um Seiten zu erstellen.',
+    'import_perms_images' => 'Ihnen fehlt die erforderliche Berechtigung, um Bilder zu erstellen.',
+    'import_perms_attachments' => 'Ihnen fehlt die erforderliche Berechtigung, um Anhänge zu erstellen.',
 
     // API errors
     'api_no_authorization_found' => 'Kein Autorisierungstoken für die Anfrage gefunden',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index c1e4bcdd92f..78cd2b500a2 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -163,7 +163,7 @@
     'role_access_api' => 'Systemzugriffs-API',
     'role_manage_settings' => 'Globaleinstellungen verwalten',
     'role_export_content' => 'Inhalt exportieren',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Inhalt importieren',
     'role_editor_change' => 'Seiten-Editor ändern',
     'role_notifications' => 'Empfangen und Verwalten von Benachrichtigungen',
     'role_asset' => 'Berechtigungen',
diff --git a/lang/de/validation.php b/lang/de/validation.php
index 072bf79d1ec..10961eb7fb2 100644
--- a/lang/de/validation.php
+++ b/lang/de/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute ist kein valides Format.',
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute muss eine Datei innerhalb des ZIP referenzieren.',
+    'zip_file_mime' => ':attribute muss eine Datei des Typs :validType referenzieren, gefunden :foundType.',
+    'zip_model_expected' => 'Datenobjekt erwartet, aber ":type" gefunden.',
+    'zip_unique' => ':attribute muss für den Objekttyp innerhalb des ZIP eindeutig sein.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 81f5eab9e64..23ce1ee4aab 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Über den Editor',
     'about_title' => 'Über den WYSIWYG Editor',
     'editor_license' => 'Editorlizenz & Copyright',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Dieser Editor wurde mithilfe von :lexicalLink erstellt, der unter der MIT-Lizenz bereitgestellt wird.',
+    'editor_lexical_license_link' => 'Vollständige Lizenzdetails findest du hier.',
     'editor_tiny_license' => 'Dieser Editor wurde mit :tinyLink erstellt, das unter der MIT-Lizenz zur Verfügung gestellt wird.',
     'editor_tiny_license_link' => 'Die Copyright- und Lizenzdetails von TinyMCE findest du hier.',
     'save_continue' => 'Seite speichern & fortfahren',
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 3d9e90c13fb..6253c7ab3c6 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Acerca del editor',
     'about_title' => 'Acerca del editor WYSIWYG',
     'editor_license' => 'Licencia del editor y derechos de autor',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Este editor está construido como una bifurcación de :lexicalLink que se distribuye bajo la licencia MIT.',
+    'editor_lexical_license_link' => 'Los detalles completos de la licencia se pueden encontrar aquí.',
     'editor_tiny_license' => 'Este editor se construye usando :tinyLink que se proporciona bajo la licencia MIT.',
     'editor_tiny_license_link' => 'Aquí encontrará los detalles de los derechos de autor y la licencia de TinyMCE.',
     'save_continue' => 'Guardar Página y Continuar',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 9002dc72bac..28b6e92c88a 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Acerca del editor',
     'about_title' => 'Acerca del editor WYSIWYG',
     'editor_license' => 'Licencia del editor y derechos de autor',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Este editor está construido como una bifurcación de :lexicalLink que se distribuye bajo la licencia MIT.',
+    'editor_lexical_license_link' => 'Los detalles completos de la licencia se pueden encontrar aquí.',
     'editor_tiny_license' => 'Este editor se construye usando :tinyLink provisto bajo la licencia MIT.',
     'editor_tiny_license_link' => 'Aquí se muestran los detalles de los derechos de autor y la licencia de TinyMCE.',
     'save_continue' => 'Guardar Página y Continuar',
diff --git a/lang/it/activities.php b/lang/it/activities.php
index 0747d7784e5..32d71ac083e 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook eliminato con successo',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'importazione creata',
+    'import_create_notification' => 'Importazione caricata con successo',
+    'import_run' => 'importazione aggiornata',
+    'import_run_notification' => 'Contenuto importato con successo',
+    'import_delete' => 'importazione cancellata',
+    'import_delete_notification' => 'Importazione eliminata con successo',
 
     // Users
     'user_create' => 'ha creato un utente',
diff --git a/lang/it/editor.php b/lang/it/editor.php
index 11b019ee382..fac478a4aca 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Informazioni sull\'editor',
     'about_title' => 'Informazioni sull\'editor di WYSIWYG',
     'editor_license' => 'Licenza e copyright dell\'editor',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Questo editor è stato creato come fork di :lexicalLink ed è distribuito sotto la licenza MIT.',
+    'editor_lexical_license_link' => 'I dettagli della licenza sono disponibili qui.',
     'editor_tiny_license' => 'Questo editor è realizzato usando :tinyLink che è fornito sotto la licenza MIT.',
     'editor_tiny_license_link' => 'I dettagli del copyright e della licenza di TinyMCE sono disponibili qui.',
     'save_continue' => 'Salva pagina e continua',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 22c428ed3e1..c3efa5d3390 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'File PDF',
     'export_text' => 'File di testo',
     'export_md' => 'File Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'ZIP Portatile',
     'default_template' => 'Modello di pagina predefinito',
     'default_template_explain' => 'Assegna un modello di pagina che sarà usato come contenuto predefinito per tutte le pagine create in questo elemento. Tieni presente che potrà essere utilizzato solo se il creatore della pagina ha accesso alla pagina del modello scelto.',
     'default_template_select' => 'Seleziona una pagina modello',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importa',
+    'import_validate' => 'Convalida Importazione',
+    'import_desc' => 'Importa libri, capitoli e pagine utilizzando un\'esportazione zip portatile dalla stessa istanza o da un\'istanza diversa. Selezionare un file ZIP per procedere. Dopo che il file è stato caricato e convalidato, sarà possibile configurare e confermare l\'importazione nella vista successiva.',
+    'import_zip_select' => 'Seleziona il file ZIP da caricare',
+    'import_zip_validation_errors' => 'Sono stati rilevati errori durante la convalida del file ZIP fornito:',
+    'import_pending' => 'Importazioni In Attesa',
+    'import_pending_none' => 'Non sono state avviate importazioni.',
+    'import_continue' => 'Continua l\'importazione',
+    'import_continue_desc' => 'Esaminare il contenuto da importare dal file ZIP caricato. Quando è pronto, eseguire l\'importazione per aggiungere i contenuti al sistema. Il file di importazione ZIP caricato verrà automaticamente rimosso quando l\'importazione sarà riuscita.',
+    'import_details' => 'Dettagli dell\'importazione',
+    'import_run' => 'Esegui Importazione',
+    'import_size' => 'Dimensione dello ZIP importato :size',
+    'import_uploaded_at' => 'Caricato il :relativeTime',
+    'import_uploaded_by' => 'Caricata da',
+    'import_location' => 'Posizione Di Importazione',
+    'import_location_desc' => 'Selezionare una posizione di destinazione per i contenuti importati. È necessario disporre delle autorizzazioni adeguate per creare all\'interno della posizione scelta.',
+    'import_delete_confirm' => 'Sei sicuro di voler eliminare questa importazione?',
+    'import_delete_desc' => 'Questa operazione cancella il file ZIP di importazione caricato e non può essere annullata.',
+    'import_errors' => 'Errori di importazione',
+    'import_errors_desc' => 'Gli seguenti errori si sono verificati durante il tentativo di importazione:',
 
     // Permissions and restrictions
     'permissions' => 'Permessi',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index a68da405bb5..b3763cce252 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'Tornerà presto online.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Impossibile leggere il file ZIP.',
+    'import_zip_cant_decode_data' => 'Impossibile trovare e decodificare il contenuto ZIP data.json.',
+    'import_zip_no_data' => 'I dati del file ZIP non hanno il contenuto previsto di libri, capitoli o pagine.',
+    'import_validation_failed' => 'L\'importazione ZIP non è stata convalidata con errori:',
+    'import_zip_failed_notification' => 'Impossibile importare il file ZIP.',
+    'import_perms_books' => 'Non hai i permessi necessari per creare libri.',
+    'import_perms_chapters' => 'Non hai i permessi necessari per creare capitoli.',
+    'import_perms_pages' => 'Non hai i permessi necessari per creare pagine.',
+    'import_perms_images' => 'Non hai i permessi necessari per creare immagini.',
+    'import_perms_attachments' => 'Non hai il permesso necessario per creare allegati.',
 
     // API errors
     'api_no_authorization_found' => 'Nessun token di autorizzazione trovato nella richiesta',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index e57baceb49e..e9c45bced20 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -162,7 +162,7 @@
     'role_access_api' => 'Accedere alle API di sistema',
     'role_manage_settings' => 'Gestire impostazioni app',
     'role_export_content' => 'Esportare contenuto',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importa contenuto',
     'role_editor_change' => 'Cambiare editor di pagina',
     'role_notifications' => 'Ricevere e gestire le notifiche',
     'role_asset' => 'Permessi entità',
diff --git a/lang/it/validation.php b/lang/it/validation.php
index b21e8d932b4..c945ff7d426 100644
--- a/lang/it/validation.php
+++ b/lang/it/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'Il formato :attribute non è valido.',
     'uploaded'             => 'Il file non può essere caricato. Il server potrebbe non accettare file di questa dimensione.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'L\'attributo :attribute deve fare riferimento a un file all\'interno dello ZIP.',
+    'zip_file_mime' => 'Il campo :attribute deve fare riferimento a un file di tipo :validTypes, trovato :foundType.',
+    'zip_model_expected' => 'Oggetto dati atteso ma ":type" trovato.',
+    'zip_unique' => 'L\'attributo :attribute deve essere univoco per il tipo di oggetto all\'interno dello ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index f20f9a90d5a..c97fbd7ed76 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -86,11 +86,11 @@
 
     // Imports
     'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
+    'import_create_notification' => 'インポートファイルが正常にアップロードされました',
     'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
+    'import_run_notification' => 'コンテンツが正常にインポートされました',
     'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_delete_notification' => 'インポートファイルが正常に削除されました',
 
     // Users
     'user_create' => 'がユーザを作成',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 576e08f14b2..6d4a424c5f6 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -163,8 +163,8 @@
     'about' => 'エディタについて',
     'about_title' => 'WYSIWYGエディタについて',
     'editor_license' => 'エディタのライセンスと著作権',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'このエディタはMITライセンスの下で配布されている :lexicalLink のフォークとして構築されています。',
+    'editor_lexical_license_link' => '完全なライセンスの詳細はこちらをご覧ください。',
     'editor_tiny_license' => 'このエディタはMITライセンスの下で提供される:tinyLinkを利用して構築されています。',
     'editor_tiny_license_link' => 'TinyMCEの著作権およびライセンスの詳細は、こちらをご覧ください。',
     'save_continue' => 'ページを保存して続行',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 05e2f33ab8f..76cc2a7693d 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF',
     'export_text' => 'テキストファイル',
     'export_md' => 'Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'ポータブルZIP',
     'default_template' => 'デフォルトページテンプレート',
     'default_template_explain' => 'このアイテム内に新しいページを作成する際にデフォルトコンテンツとして使用されるページテンプレートを割り当てます。これはページ作成者が選択したテンプレートページへのアクセス権を持つ場合にのみ使用されることに注意してください。',
     'default_template_select' => 'テンプレートページを選択',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'インポート',
+    'import_validate' => 'インポートの検証',
+    'import_desc' => 'ポータブルzipエクスポートファイルを使用して、同一または別のインスタンスからブック、チャプタ、ページをインポートします。続行するにはZIPファイルを選択します。 ファイルをアップロードすると検証が行われ、次のビューでインポートの設定と確認ができます。',
+    'import_zip_select' => 'アップロードするZIPファイルの選択',
+    'import_zip_validation_errors' => '指定された ZIP ファイルの検証中にエラーが検出されました:',
+    'import_pending' => '保留中のインポート',
+    'import_pending_none' => 'インポートは行われていません。',
+    'import_continue' => 'インポートを続行',
+    'import_continue_desc' => 'アップロードされたZIPファイルからインポートされるコンテンツを確認してください。準備ができたらインポートを実行してこのシステムにコンテンツを追加します。 アップロードされたZIPファイルは、インポートが成功すると自動的に削除されます。',
+    'import_details' => 'インポートの詳細',
+    'import_run' => 'インポートを実行',
+    'import_size' => 'インポートZIPサイズ: :size',
+    'import_uploaded_at' => 'アップロード: :relativeTime',
+    'import_uploaded_by' => 'アップロードユーザ:',
+    'import_location' => 'インポートの場所',
+    'import_location_desc' => 'コンテンツをインポートする場所を選択します。選択した場所に作成するための権限を持つ必要があります。',
+    'import_delete_confirm' => 'このインポートを削除してもよろしいですか？',
+    'import_delete_desc' => 'アップロードされたインポートZIPファイルは削除され、元に戻すことはできません。',
+    'import_errors' => 'インポートエラー',
+    'import_errors_desc' => 'インポート中に次のエラーが発生しました：',
 
     // Permissions and restrictions
     'permissions' => '権限',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index ca001d7680b..8161c08b860 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => '回復までしばらくお待ちください。',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'ZIPファイルを読み込めません。',
+    'import_zip_cant_decode_data' => 'ZIPファイル内に data.json が見つからないかデコードできませんでした。',
+    'import_zip_no_data' => 'ZIPファイルのデータにブック、チャプター、またはページコンテンツがありません。',
+    'import_validation_failed' => 'エラーによりインポートZIPの検証に失敗しました:',
+    'import_zip_failed_notification' => 'ZIP ファイルのインポートに失敗しました。',
+    'import_perms_books' => 'ブックを作成するために必要な権限がありません。',
+    'import_perms_chapters' => 'チャプタを作成するために必要な権限がありません。',
+    'import_perms_pages' => 'ページを作成するために必要な権限がありません。',
+    'import_perms_images' => '画像を作成するために必要な権限がありません。',
+    'import_perms_attachments' => '添付ファイルを作成するために必要な権限がありません。',
 
     // API errors
     'api_no_authorization_found' => 'リクエストに認証トークンが見つかりません',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index d73f12cb2c9..ffced8dd16e 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -162,7 +162,7 @@
     'role_access_api' => 'システムのAPIへのアクセス',
     'role_manage_settings' => 'アプリケーション設定の管理',
     'role_export_content' => 'コンテンツのエクスポート',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'コンテンツのインポート',
     'role_editor_change' => 'ページエディタの変更',
     'role_notifications' => '通知の受信と管理',
     'role_asset' => 'アセット権限',
diff --git a/lang/ja/validation.php b/lang/ja/validation.php
index 110bcb01213..7d18c85be72 100644
--- a/lang/ja/validation.php
+++ b/lang/ja/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attributeのフォーマットは不正です。',
     'uploaded'             => 'ファイルをアップロードできませんでした。サーバーがこのサイズのファイルを受け付けていない可能性があります。',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute はZIP 内のファイルを参照する必要があります。',
+    'zip_file_mime' => ':attribute は種別 :validType のファイルを参照する必要がありますが、種別 :foundType となっています。',
+    'zip_model_expected' => 'データオブジェクトが期待されますが、":type" が見つかりました。',
+    'zip_unique' => 'ZIP内のオブジェクトタイプに :attribute が一意である必要があります。',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index 356568d1fd6..c3f35e44375 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => '웹 훅 삭제함',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => '컨텐츠 ZIP 파일이 생성되었습니다.',
+    'import_create_notification' => '컨텐츠 ZIP 파일이 업로드 되었습니다.',
+    'import_run' => '컨텐츠 ZIP 파일을 업데이트하였습니다.',
+    'import_run_notification' => '내용을 가져왔습니다.',
+    'import_delete' => '임포트 파일 삭제',
+    'import_delete_notification' => '임포트 파일을 삭제하였습니다.',
 
     // Users
     'user_create' => '사용자 생성',
diff --git a/lang/ko/auth.php b/lang/ko/auth.php
index fbf12859f18..6b60225cbd4 100644
--- a/lang/ko/auth.php
+++ b/lang/ko/auth.php
@@ -68,7 +68,7 @@
     'email_not_confirmed_text' => '전자우편 확인이 아직 완료되지 않았습니다.',
     'email_not_confirmed_click_link' => '등록한 직후에 발송된 전자우편에 있는 확인 링크를 클릭하세요.',
     'email_not_confirmed_resend' => '전자우편 확인을 위해 발송된 전자우편을 찾을 수 없다면 아래의 폼을 다시 발행하여 전자우편 확인을 재발송할 수 있습니다.',
-    'email_not_confirmed_resend_button' => '전자우편 확인 재전송',
+    'email_not_confirmed_resend_button' => '확인용 이메일 재전송',
 
     // User Invite
     'user_invite_email_subject' => ':appName 애플리케이션에서 초대를 받았습니다!',
@@ -84,7 +84,7 @@
     'mfa_setup' => '다중 인증 설정',
     'mfa_setup_desc' => '추가 보안 계층으로 다중 인증을 설정합니다.',
     'mfa_setup_configured' => '이미 설정되었습니다',
-    'mfa_setup_reconfigure' => '다시 설정',
+    'mfa_setup_reconfigure' => '재설정',
     'mfa_setup_remove_confirmation' => '다중 인증을 해제할까요?',
     'mfa_setup_action' => '설정',
     'mfa_backup_codes_usage_limit_warning' => '남은 백업 코드가 다섯 개 미만입니다. 새 백업 코드 세트를 생성하지 않아 코드가 소진되면 계정이 잠길 수 있습니다.',
@@ -95,7 +95,7 @@
     'mfa_gen_confirm_and_enable' => '확인 및 활성화',
     'mfa_gen_backup_codes_title' => '백업 코드 설정',
     'mfa_gen_backup_codes_desc' => '코드 목록을 안전한 장소에 보관하세요. 코드 중 하나를 2FA에 쓸 수 있습니다.',
-    'mfa_gen_backup_codes_download' => '코드 내려받기',
+    'mfa_gen_backup_codes_download' => '코드 설치',
     'mfa_gen_backup_codes_usage_warning' => '각 코드는 한 번씩만 유효합니다.',
     'mfa_gen_totp_title' => '모바일 앱 설정',
     'mfa_gen_totp_desc' => '다중 인증에는 Google Authenticator, Authy나 Microsoft Authenticator와 같은 TOTP 지원 모바일 앱이 필요합니다.',
@@ -104,7 +104,7 @@
     'mfa_gen_totp_verify_setup_desc' => '인증 앱에서 생성한 코드를 입력하세요:',
     'mfa_gen_totp_provide_code_here' => '백업 코드를 입력하세요.',
     'mfa_verify_access' => '접근 확인',
-    'mfa_verify_access_desc' => '추가 인증으로 신원을 확인합니다. 설정한 방법 중 하나를 고르세요.',
+    'mfa_verify_access_desc' => '사용자 계정에서는 액세스 권한을 부여받기 전에 추가 검증 수준을 통해 신원을 확인해야 합니다. 계속하려면 구성된 방법 중 하나를 사용하여 확인하세요.',
     'mfa_verify_no_methods' => '설정한 방법이 없습니다.',
     'mfa_verify_no_methods_desc' => '다중 인증을 설정하지 않았습니다. 접근 권한을 얻기 전에 하나 이상의 다중 인증을 설정해야 합니다.',
     'mfa_verify_use_totp' => '모바일 앱으로 인증하기',
diff --git a/lang/ko/common.php b/lang/ko/common.php
index b19b0d5cdd2..a0751d4c020 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => '서비스 이용 약관',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => '검색 :appName',
 ];
diff --git a/lang/ko/components.php b/lang/ko/components.php
index cbda4d15980..cbe4d44c27d 100644
--- a/lang/ko/components.php
+++ b/lang/ko/components.php
@@ -33,7 +33,7 @@
     'image_update_success' => '이미지 정보가 수정되었습니다.',
     'image_delete_success' => '이미지가 삭제되었습니다.',
     'image_replace' => '이미지 교체',
-    'image_replace_success' => '이미지 파일 업데이트 성공',
+    'image_replace_success' => '이미지가 수정되었습니다.',
     'image_rebuild_thumbs' => '사이즈 변경 재생성하기',
     'image_rebuild_thumbs_success' => '이미지 크기 변경이 성공적으로 완료되었습니다!',
 
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index 6892410169d..81c2dbc54dd 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -163,7 +163,7 @@
     'about' => '이 편집기에 대하여',
     'about_title' => 'WYSIWYG 편집기에 대하여',
     'editor_license' => '편집기 라이선스 & 저작권',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license' => '이 편집기는 MIT 라이선스에 따라 배포되는 :lexicalLink의 포크로 만들어졌습니다.',
     'editor_lexical_license_link' => '전체 라이센스 세부 사항은 여기에서 확인할 수 있습니다.',
     'editor_tiny_license' => '이 편집기는 MIT 라이선스에 따라 제공되는 :tinyLink를 사용하여 제작되었습니다.',
     'editor_tiny_license_link' => 'TinyMCE의 저작권 및 라이선스 세부 정보는 여기에서 확인할 수 있습니다.',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 4fbbe376629..cfb905a8fb4 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -12,17 +12,17 @@
     'recently_created_chapters' => '최근에 만든 챕터',
     'recently_created_books' => '최근에 만든 책',
     'recently_created_shelves' => '최근에 만든 책장',
-    'recently_update' => '최근에 수정함',
-    'recently_viewed' => '최근에 읽음',
-    'recent_activity' => '최근에 활동함',
+    'recently_update' => '최신 수정 목록',
+    'recently_viewed' => '최근에 본 목록',
+    'recent_activity' => '최근 활동 기록',
     'create_now' => '바로 만들기',
-    'revisions' => '수정본',
-    'meta_revision' => '판본 #:revisionCount',
-    'meta_created' => '만듦 :timeLength',
-    'meta_created_name' => '만듦 :timeLength, :user',
-    'meta_updated' => '수정함 :timeLength',
-    'meta_updated_name' => '수정함 :timeLength, :user',
-    'meta_owned_name' => '소유함 :user',
+    'revisions' => '버전',
+    'meta_revision' => '버전 #:revisionCount',
+    'meta_created' => '생성 :timeLength',
+    'meta_created_name' => '생성 :timeLength, :user',
+    'meta_updated' => '수정 :timeLength',
+    'meta_updated_name' => '수정 :timeLength, :user',
+    'meta_owned_name' => ':user 소유',
     'meta_reference_count' => '참조 대상 :count item|참조 대상 :count items',
     'entity_select' => '항목 선택',
     'entity_select_lack_permission' => '이 항목을 선택하기 위해 필요한 권한이 없습니다',
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF 파일',
     'export_text' => '일반 텍스트 파일',
     'export_md' => '마크다운 파일',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => '압축 파일',
     'default_template' => '기본 페이지 템플릿',
     'default_template_explain' => '이 항목 내에서 생성되는 모든 페이지의 기본 콘텐츠로 사용할 페이지 템플릿을 지정합니다. 페이지 작성자가 선택한 템플릿 페이지를 볼 수 있는 권한이 있는 경우에만 이 항목이 사용된다는 점을 유의하세요.',
     'default_template_select' => '템플릿 페이지 선택',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
+    'import' => '압축 파일 가져오기',
+    'import_validate' => '압축 파일 검증하기',
     'import_desc' => '같은 인스턴스나 다른 인스턴스에서 휴대용 zip 내보내기를 사용하여 책, 장 및 페이지를 가져옵니다. 진행하려면 ZIP 파일을 선택합니다. 파일을 업로드하고 검증한 후 다음 보기에서 가져오기를 구성하고 확인할 수 있습니다.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_zip_select' => '업로드할 휴대용 압축 파일 선택',
+    'import_zip_validation_errors' => '제공된 Portable ZIP 파일을 검증하는 동안 오류가 감지되었습니다.',
+    'import_pending' => 'Portable ZIP 파일 가져오기가 일시정지 되었습니다.',
+    'import_pending_none' => 'Portable ZIP 파일 가져오기가 시작되지 않았습니다.',
+    'import_continue' => 'Portable ZIP 가져오기 계속하기',
+    'import_continue_desc' => '업로드된 ZIP 파일에서 가져올 내용을 검토합니다. 준비가 되면 가져오기를 실행하여 이 시스템에 내용을 추가합니다. 업로드된 ZIP 가져오기 파일은 가져오기가 성공하면 자동으로 제거됩니다.',
+    'import_details' => '압축된 ZIP 파일 상세',
+    'import_run' => '가져오기 실행',
+    'import_size' => '압축된 ZIP 파일 사이즈',
+    'import_uploaded_at' => '업로드되었습니다. :relativeTime',
+    'import_uploaded_by' => '업로드되었습니다.',
+    'import_location' => '가져올 경로',
+    'import_location_desc' => '가져온 콘텐츠에 대한 대상 위치를 선택하세요. 선택한 위치 내에서 만들려면 관련 권한이 필요합니다.',
+    'import_delete_confirm' => '정말 삭제하시겠습니까?',
     'import_delete_desc' => '업로드된 ZIP 파일이 삭제되며, 실행 취소할 수 없습니다.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import_errors' => '가져오기 오류',
+    'import_errors_desc' => '가져오기 중 에러가 발생했습니다.',
 
     // Permissions and restrictions
     'permissions' => '권한',
@@ -157,7 +157,7 @@
     'books_form_book_name' => '책 이름',
     'books_save' => '저장',
     'books_permissions' => '책 권한',
-    'books_permissions_updated' => '권한 저장함',
+    'books_permissions_updated' => '책의 권한이 수정되었습니다.',
     'books_empty_contents' => '이 책에 챕터나 문서가 없습니다.',
     'books_empty_create_page' => '문서 만들기',
     'books_empty_sort_current_book' => '현재 책 정렬',
@@ -165,7 +165,7 @@
     'books_permissions_active' => '책 권한 허용함',
     'books_search_this' => '이 책에서 검색',
     'books_navigation' => '목차',
-    'books_sort' => '다른 책들',
+    'books_sort' => '책 내용 정렬',
     'books_sort_desc' => '책 내에서 챕터와 페이지를 이동하여 내용을 재구성할 수 있습니다. 다른 책을 추가하여 책 간에 챕터와 페이지를 쉽게 이동할 수 있습니다.',
     'books_sort_named' => ':bookName 정렬',
     'books_sort_name' => '제목',
@@ -187,7 +187,7 @@
     'books_sort_move_before_chapter' => '이전 챕터로 이동',
     'books_sort_move_after_chapter' => '챕터 뒤로 이동',
     'books_copy' => '책 복사하기',
-    'books_copy_success' => '책 복사함',
+    'books_copy_success' => '책을 복사하였습니다.',
 
     // Chapters
     'chapter' => '챕터',
@@ -200,17 +200,17 @@
     'chapters_delete_named' => ':chapterName(을)를 지웁니다.',
     'chapters_delete_explain' => '\':ChapterName\'에 있는 모든 페이지도 지웁니다.',
     'chapters_delete_confirm' => '이 챕터를 지울 건가요?',
-    'chapters_edit' => '챕터 바꾸기',
+    'chapters_edit' => '챕터 수정하기',
     'chapters_edit_named' => ':chapterName 바꾸기',
     'chapters_save' => '저장',
     'chapters_move' => '챕터 이동하기',
     'chapters_move_named' => ':chapterName 이동하기',
     'chapters_copy' => '챕터 복사하기',
-    'chapters_copy_success' => '챕터 복사함',
+    'chapters_copy_success' => '챕터를 복사하였습니다.',
     'chapters_permissions' => '챕터 권한',
     'chapters_empty' => '이 챕터에 문서가 없습니다.',
     'chapters_permissions_active' => '문서 권한 허용함',
-    'chapters_permissions_success' => '권한 저장함',
+    'chapters_permissions_success' => '챕터의 권한을 수정하였습니다.',
     'chapters_search_this' => '이 챕터에서 검색',
     'chapter_sort_book' => '책 정렬하기',
 
@@ -240,21 +240,21 @@
     'pages_edit_draft_save_at' => '보관함: ',
     'pages_edit_delete_draft' => '초안 삭제',
     'pages_edit_delete_draft_confirm' => '초안 페이지 변경 내용을 삭제하시겠습니까? 마지막 전체 저장 이후의 모든 변경 내용이 손실되고 편집기가 최신 페이지의 초안 저장 상태가 아닌 상태로 업데이트됩니다.',
-    'pages_edit_discard_draft' => '폐기',
+    'pages_edit_discard_draft' => '변경된 내용 삭제',
     'pages_edit_switch_to_markdown' => '마크다운 편집기로 전환',
     'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG 편집기로 전환',
     'pages_edit_switch_to_new_wysiwyg' => '새 위지윅 편집기로 변경',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '알파 테스트 중',
     'pages_edit_set_changelog' => '수정본 설명',
     'pages_edit_enter_changelog_desc' => '수정본 설명',
-    'pages_edit_enter_changelog' => '설명',
+    'pages_edit_enter_changelog' => '변경 로그 입력란',
     'pages_editor_switch_title' => '편집기 전환',
     'pages_editor_switch_are_you_sure' => '이 페이지의 편집기를 변경하시겠어요?',
     'pages_editor_switch_consider_following' => '편집기를 전환할 때에 다음 사항들을 고려하세요:',
     'pages_editor_switch_consideration_a' => '저장된 새 편집기 옵션은 편집기 유형을 직접 변경할 수 없는 편집자를 포함하여 향후 모든 편집자가 사용할 수 있습니다.',
-    'pages_editor_switch_consideration_b' => '이로 인해 특정 상황에서는 디테일과 구문이 손실될 수 있습니다.',
+    'pages_editor_switch_consideration_b' => '이로 인해 특정 상황에서는 상세 내용과 구문이 손실될 수 있습니다.',
     'pages_editor_switch_consideration_c' => '마지막 저장 이후 변경된 태그 또는 변경 로그 변경 사항은 이 변경 사항에서 유지되지 않습니다.',
     'pages_save' => '저장',
     'pages_title' => '문서 제목',
@@ -406,8 +406,8 @@
 
     // Revision
     'revision_delete_confirm' => '이 수정본을 지울 건가요?',
-    'revision_restore_confirm' => '이 수정본을 되돌릴 건가요? 현재 판본을 바꿉니다.',
-    'revision_cannot_delete_latest' => '현재 판본은 지울 수 없습니다.',
+    'revision_restore_confirm' => '이 버전을 되돌릴 건가요? 현재 페이지는 대체됩니다.',
+    'revision_cannot_delete_latest' => '현재 버전본은 지울 수 없습니다.',
 
     // Copy view
     'copy_consider' => '항목을 복사할 때 다음을 고려하세요.',
@@ -435,10 +435,10 @@
     'references_to_desc' => '이 항목으로 연결되는 시스템에서 알려진 모든 콘텐츠가 아래에 나열되어 있습니다.',
 
     // Watch Options
-    'watch' => '주시',
+    'watch' => '변경 알림 설정',
     'watch_title_default' => '기본 설정',
-    'watch_desc_default' => '보기를 기본 알림 환경설정으로 되돌릴 수 있습니다.',
-    'watch_title_ignore' => '무시',
+    'watch_desc_default' => '알림 설정을 기본값으로 되돌리기',
+    'watch_title_ignore' => '알림 설정 끄기',
     'watch_desc_ignore' => '사용자 수준 환경설정의 알림을 포함한 모든 알림을 무시합니다.',
     'watch_title_new' => '새로운 페이지',
     'watch_desc_new' => '이 항목에 새 페이지가 생성되면 알림을 받습니다.',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index f5ba13efa3b..ea1fd7d61e7 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Admin을 삭제할 수 없습니다.',
     'users_cannot_delete_guest' => 'Guest를 삭제할 수 없습니다.',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => '초대 이메일을 보내는 데 실패하여 사용자를 생성할 수 없습니다.',
 
     // Roles
     'role_cannot_be_edited' => '권한을 수정할 수 없습니다.',
@@ -94,7 +94,7 @@
     'empty_comment' => '빈 댓글은 등록할 수 없습니다.',
 
     // Error pages
-    '404_page_not_found' => '404 Not Found',
+    '404_page_not_found' => '페이지를 찾을 수 없습니다.',
     'sorry_page_not_found' => '문서를 못 찾았습니다.',
     'sorry_page_not_found_permission_warning' => '문서를 볼 권한이 없습니다.',
     'image_not_found' => '이미지를 찾을 수 없습니다',
@@ -106,16 +106,16 @@
     'back_soon' => '곧 돌아갑니다.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'ZIP 파일을 읽을 수 없습니다.',
+    'import_zip_cant_decode_data' => 'ZIP data.json 콘텐츠를 찾아서 디코딩할 수 없습니다.',
+    'import_zip_no_data' => 'ZIP 파일 데이터에는 예상되는 책, 장 또는 페이지 콘텐츠가 없습니다.',
+    'import_validation_failed' => 'ZIP 파일을 가져오려다 실패했습니다. 이유:',
+    'import_zip_failed_notification' => 'ZIP 파일을 가져오지 못했습니다.',
+    'import_perms_books' => '책을 만드는 데 필요한 권한이 없습니다.',
+    'import_perms_chapters' => '챕터를 만드는 데 필요한 권한이 없습니다.',
+    'import_perms_pages' => '페이지를 만드는 데 필요한 권한이 없습니다.',
+    'import_perms_images' => '이미지를 만드는 데 필요한 권한이 없습니다.',
+    'import_perms_attachments' => '첨부 파일을 만드는 데 필요한 권한이 없습니다.',
 
     // API errors
     'api_no_authorization_found' => '요청에서 인증 토큰을 찾을 수 없습니다.',
diff --git a/lang/ko/passwords.php b/lang/ko/passwords.php
index 064f4d92576..97061631a85 100644
--- a/lang/ko/passwords.php
+++ b/lang/ko/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => '여덟 글자를 넘어야 합니다.',
+    'password' => '최소 8글자 이상이어야 합니다.',
     'user' => "메일 주소를 가진 사용자가 없습니다.",
     'token' => '유효하지 않거나 만료된 토큰입니다.',
     'sent' => '메일을 보냈습니다.',
-    'reset' => '패스워드를 바꿨습니다.',
+    'reset' => '패스워드가 초기화되었습니다.',
 
 ];
diff --git a/lang/ko/preferences.php b/lang/ko/preferences.php
index ded933923b6..79692f564c3 100644
--- a/lang/ko/preferences.php
+++ b/lang/ko/preferences.php
@@ -26,8 +26,8 @@
     'notifications_opt_comment_replies' => '내 댓글에 대한 답글 알림 받기',
     'notifications_save' => '환경설정 저장',
     'notifications_update_success' => '알림 환경설정이 업데이트되었습니다!',
-    'notifications_watched' => '주시 및 무시한 항목',
-    'notifications_watched_desc' => '아래는 사용자 지정 시계 환경설정이 적용된 항목입니다. 이러한 항목에 대한 환경설정을 업데이트하려면 해당 항목을 본 다음 사이드바에서 시계 옵션을 찾습니다.',
+    'notifications_watched' => '알람 설정 및 알람 무시한 항목',
+    'notifications_watched_desc' => '아래는 사용자 지정 알람 환경설정이 적용된 항목입니다. 이러한 항목에 대한 환경설정을 업데이트하려면 해당 항목을 본 다음 사이드바에서 알림 옵션을 찾습니다.',
 
     'auth' => '액세스 및 보안',
     'auth_change_password' => '패스워드 변경',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 7277891d55b..c2f8fd780c6 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -13,13 +13,13 @@
     'categories' => '카테고리',
 
     // App Settings
-    'app_customization' => '맞춤',
+    'app_customization' => '어플리케이션 설정',
     'app_features_security' => '기능 및 보안',
     'app_name' => '애플리케이션 이름 (사이트 제목)',
     'app_name_desc' => '이 이름은 헤더와 시스템에서 보낸 모든 이메일에 표시됩니다.',
     'app_name_header' => '헤더에 이름 표시',
     'app_public_access' => '사이트 공개',
-    'app_public_access_desc' => '이 옵션을 활성화하면 로그인하지 않은 방문자도 북스택 인스턴스의 콘텐츠에 액세스할 수 있습니다.',
+    'app_public_access_desc' => '이 옵션을 활성화하면 로그인하지 않은 방문자도 이 서버의 콘텐츠에 액세스할 수 있습니다.',
     'app_public_access_desc_guest' => '일반 방문자의 액세스는 "Guest" 사용자를 통해 제어할 수 있습니다.',
     'app_public_access_toggle' => '공개 액세스 허용',
     'app_public_viewing' => '공개 열람을 허용할까요?',
@@ -63,7 +63,7 @@
     // Registration Settings
     'reg_settings' => '가입',
     'reg_enable' => '가입 활성화',
-    'reg_enable_toggle' => '가입 받기',
+    'reg_enable_toggle' => '가입 허용',
     'reg_enable_desc' => '가입한 사용자는 한 가지 권한을 가집니다.',
     'reg_default_role' => '기본 권한',
     'reg_enable_external_warning' => '외부 시스템이 LDAP나 SAML 인증이 활성화되어 있다면 설정과 관계없이 인증을 성공할 때 없는 계정을 만듭니다.',
@@ -75,9 +75,9 @@
     'reg_confirm_restrict_domain_placeholder' => '차단한 도메인 없음',
 
     // Maintenance settings
-    'maint' => '데이터',
+    'maint' => '유지관리',
     'maint_image_cleanup' => '이미지 정리',
-    'maint_image_cleanup_desc' => '중복한 이미지를 찾습니다. 실행하기 전에 이미지를 백업하세요.',
+    'maint_image_cleanup_desc' => '중복인 이미지를 찾습니다. 실행하기 전에 이미지를 백업하세요.',
     'maint_delete_images_only_in_revisions' => '지난 버전에만 있는 이미지 지우기',
     'maint_image_cleanup_run' => '실행',
     'maint_image_cleanup_warning' => '이미지 :count개를 지울 건가요?',
@@ -162,7 +162,7 @@
     'role_access_api' => '시스템 접근 API',
     'role_manage_settings' => '사이트 설정 관리',
     'role_export_content' => '항목 내보내기',
-    'role_import_content' => 'Import content',
+    'role_import_content' => '내용 가져오기',
     'role_editor_change' => '페이지 편집기 변경',
     'role_notifications' => '알림 수신 및 관리',
     'role_asset' => '권한 항목',
@@ -188,9 +188,9 @@
     'users_details_desc' => '메일 주소로 로그인합니다.',
     'users_details_desc_no_email' => '사용자 이름을 바꿉니다.',
     'users_role' => '사용자 권한',
-    'users_role_desc' => '고른 권한 모두를 적용합니다.',
+    'users_role_desc' => '이 사용자에게 할당될 역할을 선택합니다. 사용자가 여러 역할에 할당된 경우 해당 역할의 권한이 겹쳐서 적용됩니다. 할당된 역할의 모든 기능을 받게 됩니다.',
     'users_password' => '사용자 패스워드',
-    'users_password_desc' => '패스워드는 여덟 글자를 넘어야 합니다.',
+    'users_password_desc' => '패스워드는 8 글자를 넘어야 합니다.',
     'users_send_invite_text' => '패스워드 설정을 권유하는 메일을 보내거나 내가 정할 수 있습니다.',
     'users_send_invite_option' => '메일 보내기',
     'users_external_auth_id' => '외부 인증 계정',
@@ -215,8 +215,8 @@
     'users_social_accounts_info' => '다른 계정으로 간단하게 로그인하세요. 여기에서 계정 연결을 끊는 것과 소셜 계정에서 접근 권한을 취소하는 것은 다릅니다.',
     'users_social_connect' => '계정 연결',
     'users_social_disconnect' => '계정 연결 끊기',
-    'users_social_status_connected' => '연결됨',
-    'users_social_status_disconnected' => '연결 해제됨',
+    'users_social_status_connected' => '연결되었습니다.',
+    'users_social_status_disconnected' => '연결 해제되었습니다.',
     'users_social_connected' => ':socialAccount(와)과 연결했습니다.',
     'users_social_disconnected' => ':socialAccount(와)과의 연결을 끊었습니다.',
     'users_api_tokens' => 'API 토큰',
diff --git a/lang/ko/validation.php b/lang/ko/validation.php
index 7a4d228ce10..df766740342 100644
--- a/lang/ko/validation.php
+++ b/lang/ko/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute(은)는 유효하지 않은 형식입니다.',
     'uploaded'             => '파일 크기가 서버에서 허용하는 수치를 넘습니다.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute은(는) ZIP 파일 내의 파일을 참조해야 합니다.',
+    'zip_file_mime' => ':attribute은(는)  :validTypes, found :foundType 유형의 파일을 참조해야 합니다.',
+    'zip_model_expected' => '데이터 객체가 필요하지만 ":type" 타입이 발견되었습니다.',
+    'zip_unique' => ':attribute은(는)  ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index d82dd86014b..fa813ec16b4 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -163,8 +163,8 @@
     'about' => 'Over de bewerker',
     'about_title' => 'Over de WYSIWYG Bewerker',
     'editor_license' => 'Bewerker Licentie & Copyright',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Deze editor is gemaakt als een fork van :lexicalLink welke is verstrekt onder de MIT-licentie.',
+    'editor_lexical_license_link' => 'Volledige licentieinformatie kan hier gevonden worden.',
     'editor_tiny_license' => 'Deze editor is gemaakt met behulp van :tinyLink welke is verstrekt onder de MIT-licentie.',
     'editor_tiny_license_link' => 'De copyright- en licentiegegevens van TinyMCE vindt u hier.',
     'save_continue' => 'Pagina opslaan en verdergaan',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 57967f9f1a6..878adb1e1c2 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -58,11 +58,11 @@
     'import_uploaded_at' => 'Geüpload :relativeTime',
     'import_uploaded_by' => 'Geüpload door',
     'import_location' => 'Importlocatie',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_location_desc' => 'Selecteer een locatie voor de geïmporteerde inhoud. Je hebt de bijbehorende machtigingen nodig op de importlocatie.',
+    'import_delete_confirm' => 'Weet je zeker dat je deze import wilt verwijderen?',
+    'import_delete_desc' => 'Dit zal het Zip-bestand van de import permanent verwijderen.',
     'import_errors' => 'Importeerfouten',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import_errors_desc' => 'De volgende fouten deden zich voor tijdens het importeren:',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
@@ -373,7 +373,7 @@
     'attachments_link_attached' => 'Hyperlink succesvol gekoppeld aan de pagina',
     'templates' => 'Sjablonen',
     'templates_set_as_template' => 'Pagina is een sjabloon',
-    'templates_explain_set_as_template' => 'Je kan deze pagina als sjabloon instellen zodat de inhoud gebruikt kan worden bij het maken van andere pagina\'s. Andere gebruikers kunnen dit sjabloon gebruiken als ze de machtiging hebben voor deze pagina.',
+    'templates_explain_set_as_template' => 'Je kan deze pagina als sjabloon instellen zodat de inhoud gebruikt kan worden bij het maken van andere pagina\'s. Andere gebruikers kunnen dit sjabloon gebruiken als ze de machtiging hebben om deze pagina te zien.',
     'templates_replace_content' => 'Pagina-inhoud vervangen',
     'templates_append_content' => 'Toevoegen aan pagina-inhoud',
     'templates_prepend_content' => 'Voeg vooraan toe aan pagina-inhoud',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 07900fc6b4f..d8d5af7239c 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -107,15 +107,15 @@
 
     // Import
     'import_zip_cant_read' => 'Kon het Zip-bestand niet lezen.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_cant_decode_data' => 'Kon de data.json Zip-inhoud niet vinden of decoderen.',
+    'import_zip_no_data' => 'Zip-bestand bevat niet de verwachte boek, hoofdstuk of pagina-inhoud.',
+    'import_validation_failed' => 'De validatie van het Zip-bestand is mislukt met de volgende fouten:',
     'import_zip_failed_notification' => 'Importeren van het Zip-bestand is mislukt.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_perms_books' => 'Je mist de vereiste machtigingen om boeken te maken.',
+    'import_perms_chapters' => 'Je mist de vereiste machtigingen om hoofdstukken te maken.',
+    'import_perms_pages' => 'Je mist de vereiste machtigingen om pagina\'s te maken.',
+    'import_perms_images' => 'Je mist de vereiste machtigingen om afbeeldingen toe te voegen.',
+    'import_perms_attachments' => 'Je mist de vereiste machtigingen om bijlagen toe te voegen.',
 
     // API errors
     'api_no_authorization_found' => 'Geen autorisatie token gevonden',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 646eb2ba995..5cdd45a7e71 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -155,7 +155,7 @@
     'role_external_auth_id' => 'Externe authenticatie ID\'s',
     'role_system' => 'Systeem Machtigingen',
     'role_manage_users' => 'Gebruikers beheren',
-    'role_manage_roles' => 'Beheer rollen & rolmachtigingen',
+    'role_manage_roles' => 'Beheer rollen & machtigingen',
     'role_manage_entity_permissions' => 'Beheer alle machtigingen voor boeken, hoofdstukken en pagina\'s',
     'role_manage_own_entity_permissions' => 'Beheer machtigingen van je eigen boek, hoofdstuk & pagina\'s',
     'role_manage_page_templates' => 'Paginasjablonen beheren',
diff --git a/lang/nl/validation.php b/lang/nl/validation.php
index 52b1a22651a..7c7e20c8bfc 100644
--- a/lang/nl/validation.php
+++ b/lang/nl/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute formaat is ongeldig.',
     'uploaded'             => 'Het bestand kon niet worden geüpload. De server accepteert mogelijk geen bestanden van deze grootte.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'Het \':attribute\' veld moet verwijzen naar een bestand in de ZIP.',
+    'zip_file_mime' => 'Het \':attribute\' veld moet verwijzen naar een bestand met het type :validTypes, vond :foundType.',
+    'zip_model_expected' => 'Dataobject verwacht maar vond ":type".',
+    'zip_unique' => ':attribute moet uniek zijn voor het objecttype binnen de ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 845b41cc305..536005d8f5b 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -40,14 +40,14 @@
     'book_sort_notification'      => 'Livro reordenado com sucesso',
 
     // Bookshelves
-    'bookshelf_create'            => 'prateleira criada',
+    'bookshelf_create'            => 'estante criada',
     'bookshelf_create_notification'    => 'Prateleira criada com sucesso',
     'bookshelf_create_from_book'    => 'livro convertido em estante',
-    'bookshelf_create_from_book_notification'    => 'Capítulo convertido com sucesso em um livro',
-    'bookshelf_update'                 => 'prateleira atualizada',
-    'bookshelf_update_notification'    => 'Prateleira atualizada com sucesso',
-    'bookshelf_delete'                 => 'prateleira excluída',
-    'bookshelf_delete_notification'    => 'Prateleira excluída com sucesso',
+    'bookshelf_create_from_book_notification'    => 'Livro convertido com sucesso em uma estante',
+    'bookshelf_update'                 => 'estante atualizada',
+    'bookshelf_update_notification'    => 'Estante atualizada com sucesso',
+    'bookshelf_delete'                 => 'estante excluída',
+    'bookshelf_delete_notification'    => 'Estante excluída com sucesso',
 
     // Revisions
     'revision_restore' => 'revisão restaurada',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook excluido com sucesso',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'importação criada',
+    'import_create_notification' => 'Importação carregada com sucesso',
+    'import_run' => 'importação atualizada',
+    'import_run_notification' => 'Conteúdo importado com sucesso',
+    'import_delete' => 'importação excluída',
+    'import_delete_notification' => 'Importação excluída com sucesso',
 
     // Users
     'user_create' => 'usuário criado',
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index f5e6d230d43..10ac376517b 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -5,13 +5,13 @@
 return [
 
     // Buttons
-    'cancel' => 'Cancela',
-    'close' => 'Fecha',
-    'confirm' => 'Confirma',
-    'back' => 'Volta',
-    'save' => 'Salva',
-    'continue' => 'Continua',
-    'select' => 'Seleciona',
+    'cancel' => 'Cancelar',
+    'close' => 'Fechar',
+    'confirm' => 'Confirmar',
+    'back' => 'Voltar',
+    'save' => 'Salvar',
+    'continue' => 'Continuar',
+    'select' => 'Selecionar',
     'toggle_all' => 'Alternar Tudo',
     'more' => 'Mais
 ',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index e251ba96636..f470647e3aa 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -40,12 +40,12 @@
     'callout_success' => 'Sucesso',
     'callout_warning' => 'Atenção',
     'callout_danger' => 'Perigo',
-    'bold' => 'Bold',
+    'bold' => 'Negrito',
     'italic' => 'Itálico',
-    'underline' => 'Sublinhar',
+    'underline' => 'Sublinhado',
     'strikethrough' => 'Riscado',
-    'superscript' => 'Superinscrição',
-    'subscript' => 'Subscrição',
+    'superscript' => 'Sobrescrito',
+    'subscript' => 'Subscrito',
     'text_color' => 'Cor do texto',
     'custom_color' => 'Cor personalizada',
     'remove_color' => 'Remover cor',
@@ -163,8 +163,8 @@
     'about' => 'Sobre o editor',
     'about_title' => 'Sobre o Editor WYSIWYG',
     'editor_license' => 'Licença do Editor e Direitos Autorais',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Este editor é criado como uma bifurcação de :lexicalLink distribuído sob a licença MIT.',
+    'editor_lexical_license_link' => 'Aqui podem ser encontrados detalhes da licença.',
     'editor_tiny_license' => 'Este editor é construído usando :tinyLink que é fornecido sob a licença MIT.',
     'editor_tiny_license_link' => 'Os dados relativos aos direitos de autor e à licença do TinyMCE podem ser encontrados aqui.',
     'save_continue' => 'Salvar Página e Continuar',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index b3e794a2d76..fe73c35b810 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -17,13 +17,13 @@
     'recent_activity' => 'Atividades recentes',
     'create_now' => 'Criar agora',
     'revisions' => 'Revisões',
-    'meta_revision' => 'Revisão #: contagem de revisões',
-    'meta_created' => 'Criado: duração de tempo',
-    'meta_created_name' => 'Criado: duração de tempo por usuário',
-    'meta_updated' => 'Atualizado: duração de tempo',
-    'meta_updated_name' => 'Atualizado: duração de tempo por usuário',
-    'meta_owned_name' => 'Propriedade de: usuário',
-    'meta_reference_count' => 'Referenciado por: count item|Referenciado por: count itens',
+    'meta_revision' => 'Revisão #:revisionCount',
+    'meta_created' => 'Criado :timeLength',
+    'meta_created_name' => 'Criado :timeLength por :user',
+    'meta_updated' => 'Atualizado :timeLength',
+    'meta_updated_name' => 'Atualizado: :timeLength por :user',
+    'meta_owned_name' => 'Propriedade de :user',
+    'meta_reference_count' => 'Referenciado por :count item|Referenciado por :count itens',
     'entity_select' => 'Seleção de entidade',
     'entity_select_lack_permission' => 'Você não tem as permissões necessárias para selecionar este ‘item’',
     'images' => 'Imagens',
@@ -39,30 +39,30 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo de texto simples',
     'export_md' => 'Arquivo de redução',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'ZIP portátil',
     'default_template' => 'Modelo padrão de página',
     'default_template_explain' => 'Atribuir o modelo de página que será usado como padrão para todas as páginas criadas neste livro. Tenha em mente que isto será usado apenas se o criador da página tiver acesso de visualização ao modelo de página escolhido.',
     'default_template_select' => 'Selecione uma página de modelo',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importação',
+    'import_validate' => 'Validar Importação',
+    'import_desc' => 'Importar livros, capítulos e páginas usando uma exportação zip portátil da mesma ou de uma instância diferente. Selecione um arquivo ZIP para prosseguir. Após a carga e validação do arquivo, você será capaz de configurar e confirmar a importação na próxima visualização.',
+    'import_zip_select' => 'Selecione o arquivo ZIP para carregar',
+    'import_zip_validation_errors' => 'Foram detectados erros ao validar o arquivo ZIP:',
+    'import_pending' => 'Importações pendentes',
+    'import_pending_none' => 'Nenhuma importação foi iniciada.',
+    'import_continue' => 'Continuar a importação',
+    'import_continue_desc' => 'Revise o conteúdo que deve ser importado do arquivo ZIP carregado. Quando estiver pronto, execute a importação para adicionar seu conteúdo a este sistema. O arquivo ZIP importado será automaticamente removido quando a importação for bem sucedida.',
+    'import_details' => 'Detalhes da importação',
+    'import_run' => 'Executar Importação',
+    'import_size' => ':size Tamanho do ZIP',
+    'import_uploaded_at' => 'Carregado :relativeTime',
+    'import_uploaded_by' => 'Enviado por',
+    'import_location' => 'Local da importação',
+    'import_location_desc' => 'Selecione um local para o conteúdo importado. Você precisa das permissões necessárias para criar no local escolhido.',
+    'import_delete_confirm' => 'Tem certeza que deseja excluir esta importação?',
+    'import_delete_desc' => 'Isto irá excluir o arquivo ZIP de importação carregado e não poderá ser desfeito.',
+    'import_errors' => 'Erros de importação',
+    'import_errors_desc' => 'Os seguintes erros ocorreram durante a tentativa de importação:',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -78,10 +78,10 @@
 
     // Search
     'search_results' => 'Resultado(s) da Pesquisa',
-    'search_total_results_found' => ':count resultado encontrado (contagem de resultados) :count resultados totais encontrados',
+    'search_total_results_found' => ':count resultado encontrado|:count resultados encontrados',
     'search_clear' => 'Limpar Pesquisa',
     'search_no_pages' => 'Nenhuma página corresponde a esta pesquisa',
-    'search_for_term' => 'Pesquisar por: termo',
+    'search_for_term' => 'Pesquisar por :term',
     'search_more' => 'Mais resultados',
     'search_advanced' => 'Pesquisa avançada',
     'search_terms' => 'Termos da pesquisa',
@@ -246,7 +246,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Mudar para o novo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(No Teste Alfa)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Em teste alfa)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por você',
     'pages_edit_enter_changelog' => 'Insira Alterações',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index 15464c95ac3..fdad94139d5 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -22,17 +22,17 @@
     'saml_already_logged_in' => '\'Login\' já efetuado',
     'saml_no_email_address' => 'Não foi possível encontrar um endereço de mensagem eletrônica para este usuário nos dados providos pelo sistema de autenticação externa',
     'saml_invalid_response_id' => 'A requisição do sistema de autenticação externa não foi reconhecida por um processo iniciado por esta aplicação. Após o \'login\', navegar para o caminho anterior pode causar um problema.',
-    'saml_fail_authed' => '\'Login\' utilizando :sistema falhou. Sistema não forneceu autorização bem sucedida',
+    'saml_fail_authed' => 'Login utilizando :system falhou. Sistema não forneceu autorização bem sucedida',
     'oidc_already_logged_in' => '\'Login\' já efetuado',
     'oidc_no_email_address' => 'Não foi possível encontrar um endereço de mensagem eletrônica para este usuário, nos dados fornecidos pelo sistema de autenticação externa',
-    'oidc_fail_authed' => '\'Login\' usando: sistema falhou, o sistema não forneceu autorização com sucesso',
+    'oidc_fail_authed' => 'Login usando :system falhou, o sistema não forneceu autorização com sucesso',
     'social_no_action_defined' => 'Nenhuma ação definida',
     'social_login_bad_response' => "Erro recebido durante o 'login' :socialAccount: \n: error",
-    'social_account_in_use' => 'Essa conta: conta social já está em uso. Por favor, tente entrar utilizando a opção :conta social.',
-    'social_account_email_in_use' => 'O endereço eletrônico: endereço eletrônico já está em uso. Se você já tem uma conta você poderá se conectar a conta social a partir das configurações de seu perfil.',
-    'social_account_existing' => 'Essa conta: conta social já está vinculada a esse perfil.',
-    'social_account_already_used_existing' => 'Essa conta: conta social já está sendo utilizada por outro usuário.',
-    'social_account_not_used' => 'Essa conta: conta social não está vinculada a nenhum usuário. Por favor, vincule a conta nas suas configurações de perfil. ',
+    'social_account_in_use' => 'Essa conta :socialAccount já está em uso. Por favor, tente entrar utilizando a opção :socialAccount.',
+    'social_account_email_in_use' => 'O e-mail :email já está em uso. Se você já tem uma conta você poderá se conectar a conta :socialAccount a partir das configurações de seu perfil.',
+    'social_account_existing' => 'Essa conta :socialAccount já está vinculada a esse perfil.',
+    'social_account_already_used_existing' => 'Essa conta :socialAccount já está sendo utilizada por outro usuário.',
+    'social_account_not_used' => 'Essa conta :socialAccount não está vinculada a nenhum usuário. Por favor vincule a conta nas suas configurações de perfil. ',
     'social_account_register_instructions' => 'Se você não tem uma conta, você poderá se cadastrar usando a opção: conta social.',
     'social_driver_not_found' => 'Social driver não encontrado',
     'social_driver_not_configured' => 'Seus parâmetros sociais de: conta social não estão configurados corretamente.',
@@ -40,8 +40,8 @@
     'login_user_not_found' => 'Não foi possível encontrar um usuário para esta ação.',
 
     // System
-    'path_not_writable' => 'O caminho de destino de ‘upload’ de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
-    'cannot_get_image_from_url' => 'Não foi possível obter a imagem a partir de: URL',
+    'path_not_writable' => 'O caminho de destino (:filePath) de upload de arquivo não possui permissão de escrita. Certifique-se que ele possui direitos de escrita no servidor.',
+    'cannot_get_image_from_url' => 'Não foi possível obter a imagem a partir de :url',
     'cannot_create_thumbs' => 'O servidor não pôde criar as miniaturas de imagem. Por favor, verifique se a extensão GD PHP está instalada.',
     'server_upload_limit' => 'O servidor não permite o ‘upload’ de arquivos com esse tamanho. Por favor, tente um tamanho de arquivo menor.',
     'server_post_limit' => 'O servidor não pode receber a quantidade de dados fornecida. Tente novamente com menos dados ou um arquivo menor.',
@@ -103,20 +103,20 @@
     'image_not_found_details' => 'Se você esperava que esta imagem existisse, ela pode ter sido excluída.',
     'return_home' => 'Retornar à página inicial',
     'error_occurred' => 'Ocorreu um Erro',
-    'app_down' => 'Agora está baixo',
+    'app_down' => ':appName está fora do ar no momento',
     'back_soon' => 'Vai estar de volta em breve.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Não foi possível ler o arquivo ZIP.',
+    'import_zip_cant_decode_data' => 'Não foi possível encontrar e decodificar o conteúdo ZIP data.json.',
+    'import_zip_no_data' => 'Os dados do arquivo ZIP não têm o conteúdo esperado livro, capítulo ou página.',
+    'import_validation_failed' => 'Falhou na validação da importação do ZIP com erros:',
+    'import_zip_failed_notification' => 'Falhou ao importar arquivo ZIP.',
+    'import_perms_books' => 'Você não tem as permissões necessárias para criar livros.',
+    'import_perms_chapters' => 'Você não tem as permissões necessárias para criar capítulos.',
+    'import_perms_pages' => 'Você não tem as permissões necessárias para criar páginas.',
+    'import_perms_images' => 'Está não tem permissões necessárias para criar imagens.',
+    'import_perms_attachments' => 'Você não tem a permissão necessária para criar anexos.',
 
     // API errors
     'api_no_authorization_found' => 'Nenhum código de autorização encontrado na requisição',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index a5b68c7e4ec..30d5b82a1cf 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -162,7 +162,7 @@
     'role_access_api' => 'Acessar API do sistema',
     'role_manage_settings' => 'Gerenciar configurações da aplicação',
     'role_export_content' => 'Exportar conteúdo',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importar conteúdo',
     'role_editor_change' => 'Alterar página de edição',
     'role_notifications' => 'Receber e gerenciar notificações',
     'role_asset' => 'Permissões de Ativos',
diff --git a/lang/pt_BR/validation.php b/lang/pt_BR/validation.php
index b3a9a729438..9ddfdf2a566 100644
--- a/lang/pt_BR/validation.php
+++ b/lang/pt_BR/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'O formato da URL :attribute é inválido.',
     'uploaded'             => 'O arquivo não pôde ser carregado. O servidor pode não aceitar arquivos deste tamanho.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'O :attribute precisa fazer referência a um arquivo do ZIP.',
+    'zip_file_mime' => 'O :attribute precisa fazer referência a um arquivo do tipo :validTypes, encontrado :foundType.',
+    'zip_model_expected' => 'Objeto de dados esperado, mas ":type" encontrado.',
+    'zip_unique' => 'O :attribute deve ser único para o tipo de objeto dentro do ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index a1ef597ca24..5e1800dabf6 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -51,8 +51,8 @@
 
     // Revisions
     'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
-    'revision_delete_notification' => 'Revision successfully deleted',
+    'revision_delete' => 'odstránil(a) revíziu',
+    'revision_delete_notification' => 'Revízia úspešne odstránená',
 
     // Favourites
     'favourite_add_notification' => '":name" bol pridaný medzi obľúbené',
@@ -62,7 +62,7 @@
     'watch_update_level_notification' => 'Watch preferences successfully updated',
 
     // Auth
-    'auth_login' => 'logged in',
+    'auth_login' => 'sa prihlásil(a)',
     'auth_register' => 'registered as new user',
     'auth_password_reset_request' => 'requested user password reset',
     'auth_password_reset_update' => 'reset user password',
@@ -123,8 +123,8 @@
 
     // Comments
     'commented_on'                => 'komentoval(a)',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
+    'comment_create'              => 'pridal(a) komentár',
+    'comment_update'              => 'aktualizoval(a) komentár',
     'comment_delete'              => 'odstrániť komentár',
 
     // Other

From 5116d83d388d7994d5ce62b63c3c512fdf37bbc5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 9 Jan 2025 16:46:13 +0000
Subject: [PATCH 431/666] PHP: Updated min version to 8.2

PHPStan config not yet compatible, but should work after moving to Laravel
11, which would allow using larastan 3.x.
---
 .github/workflows/test-php.yml |  2 +-
 composer.json                  |  4 +-
 composer.lock                  | 95 +++++++++++++++++-----------------
 phpstan.neon.dist              |  4 +-
 4 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index ee9cf39bc2a..277af907025 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4']
     steps:
     - uses: actions/checkout@v4
 
diff --git a/composer.json b/composer.json
index b8d8da9e72f..426602e9a94 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^8.1.0",
+        "php": "^8.2.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -104,7 +104,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         }
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index 16156f2dc11..a2ceed629f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9c0520d8b0c13ae46bd0213c4dec5e38",
+    "content-hash": "a8875f121a0e28301e3ca8b3e63d394c",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.8",
+            "version": "3.336.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6"
+                "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
-                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/442039c766a82f06ecfecb0ac2c610d6aaba228d",
+                "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.8"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.11"
             },
-            "time": "2025-01-03T19:06:11+00:00"
+            "time": "2025-01-08T19:06:59+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2016,16 +2016,16 @@
         },
         {
             "name": "knplabs/knp-snappy",
-            "version": "v1.5.0",
+            "version": "v1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
-                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6"
+                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/98468898b50c09f26d56d905b79b0f52a2215da6",
-                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
+                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
                 "shasum": ""
             },
             "require": {
@@ -2077,9 +2077,9 @@
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/snappy/issues",
-                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.0"
+                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.1"
             },
-            "time": "2023-12-18T09:12:11+00:00"
+            "time": "2025-01-06T16:53:26+00:00"
         },
         {
             "name": "laravel/framework",
@@ -3448,12 +3448,12 @@
             "version": "2.72.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
+                "url": "https://github.com/CarbonPHP/carbon.git",
                 "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
                 "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
                 "shasum": ""
             },
@@ -5936,24 +5936,24 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.13",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e"
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e",
-                "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -5962,13 +5962,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5996,7 +5996,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -6012,7 +6012,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:18:03+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -7295,20 +7295,20 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.15",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f"
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
-                "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
@@ -7318,11 +7318,12 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7361,7 +7362,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.15"
+                "source": "https://github.com/symfony/string/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7377,7 +7378,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:12+00:00"
+            "time": "2024-11-13T13:31:26+00:00"
         },
         {
             "name": "symfony/translation",
@@ -8784,16 +8785,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.14",
+            "version": "1.12.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38"
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e73868f809e68fff33be961ad4946e2e43ec9e38",
-                "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
                 "shasum": ""
             },
             "require": {
@@ -8838,7 +8839,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-31T07:26:13+00:00"
+            "time": "2025-01-05T16:40:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10428,7 +10429,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1.0",
+        "php": "^8.2.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -10440,7 +10441,7 @@
     },
     "platform-dev": {},
     "platform-overrides": {
-        "php": "8.1.0"
+        "php": "8.2.0"
     },
     "plugin-api-version": "2.6.0"
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index bcf4e5aa208..aa2ad3d9e0f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,9 @@ parameters:
     # The level 8 is the highest level
     level: 1
 
-    phpVersion: 80200
+    phpVersion:
+        min: 80200
+        max: 80400
 
     bootstrapFiles:
       - bootstrap/phpstan.php

From cf9ccfcd5b0186249fd904067a1f343ea2f1dd04 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 11 Jan 2025 11:14:49 +0000
Subject: [PATCH 432/666] Framework: Performed Laravel 11 upgrade guide steps

Performed a little code cleanups when observed along the way.
Tested not yet ran.
---
 app/Access/ExternalBaseUserProvider.php       |   49 +-
 app/App/Providers/EventServiceProvider.php    |    8 +
 app/Config/broadcasting.php                   |   37 -
 app/Config/cache.php                          |    5 +-
 app/Config/filesystems.php                    |    3 +
 app/Config/mail.php                           |   10 +-
 app/Config/queue.php                          |    1 +
 app/Uploads/FileStorage.php                   |    1 -
 composer.json                                 |    8 +-
 composer.lock                                 | 1452 ++++++++---------
 ..._04_25_140741_update_polymorphic_types.php |    4 +-
 public/index.php                              |   35 +-
 12 files changed, 694 insertions(+), 919 deletions(-)
 delete mode 100644 app/Config/broadcasting.php

diff --git a/app/Access/ExternalBaseUserProvider.php b/app/Access/ExternalBaseUserProvider.php
index d3ece983fb8..2b5ddfbf3d0 100644
--- a/app/Access/ExternalBaseUserProvider.php
+++ b/app/Access/ExternalBaseUserProvider.php
@@ -8,27 +8,15 @@
 
 class ExternalBaseUserProvider implements UserProvider
 {
-    /**
-     * The user model.
-     *
-     * @var string
-     */
-    protected $model;
-
-    /**
-     * LdapUserProvider constructor.
-     */
-    public function __construct(string $model)
-    {
-        $this->model = $model;
+    public function __construct(
+        protected string $model
+    ) {
     }
 
     /**
      * Create a new instance of the model.
-     *
-     * @return Model
      */
-    public function createModel()
+    public function createModel(): Model
     {
         $class = '\\' . ltrim($this->model, '\\');
 
@@ -37,12 +25,8 @@ public function createModel()
 
     /**
      * Retrieve a user by their unique identifier.
-     *
-     * @param mixed $identifier
-     *
-     * @return Authenticatable|null
      */
-    public function retrieveById($identifier)
+    public function retrieveById(mixed $identifier): ?Authenticatable
     {
         return $this->createModel()->newQuery()->find($identifier);
     }
@@ -50,12 +34,9 @@ public function retrieveById($identifier)
     /**
      * Retrieve a user by their unique identifier and "remember me" token.
      *
-     * @param mixed  $identifier
      * @param string $token
-     *
-     * @return Authenticatable|null
      */
-    public function retrieveByToken($identifier, $token)
+    public function retrieveByToken(mixed $identifier, $token): null
     {
         return null;
     }
@@ -75,12 +56,8 @@ public function updateRememberToken(Authenticatable $user, $token)
 
     /**
      * Retrieve a user by the given credentials.
-     *
-     * @param array $credentials
-     *
-     * @return Authenticatable|null
      */
-    public function retrieveByCredentials(array $credentials)
+    public function retrieveByCredentials(array $credentials): ?Authenticatable
     {
         // Search current user base by looking up a uid
         $model = $this->createModel();
@@ -92,15 +69,15 @@ public function retrieveByCredentials(array $credentials)
 
     /**
      * Validate a user against the given credentials.
-     *
-     * @param Authenticatable $user
-     * @param array           $credentials
-     *
-     * @return bool
      */
-    public function validateCredentials(Authenticatable $user, array $credentials)
+    public function validateCredentials(Authenticatable $user, array $credentials): bool
     {
         // Should be done in the guard.
         return false;
     }
+
+    public function rehashPasswordIfRequired(Authenticatable $user, #[\SensitiveParameter] array $credentials, bool $force = false)
+    {
+        // No action to perform, any passwords are external in the auth system
+    }
 }
diff --git a/app/App/Providers/EventServiceProvider.php b/app/App/Providers/EventServiceProvider.php
index 4cd527ba4a4..34ab7cfefea 100644
--- a/app/App/Providers/EventServiceProvider.php
+++ b/app/App/Providers/EventServiceProvider.php
@@ -42,4 +42,12 @@ public function shouldDiscoverEvents(): bool
     {
         return false;
     }
+
+    /**
+     * Overrides the registration of Laravel's default email verification system
+     */
+    protected function configureEmailVerification(): void
+    {
+        //
+    }
 }
diff --git a/app/Config/broadcasting.php b/app/Config/broadcasting.php
deleted file mode 100644
index 3b95698ccc2..00000000000
--- a/app/Config/broadcasting.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Broadcasting configuration options.
- *
- * Changes to these config files are not supported by BookStack and may break upon updates.
- * Configuration should be altered via the `.env` file or environment variables.
- * Do not edit this file unless you're happy to maintain any changes yourself.
- */
-
-return [
-
-    // Default Broadcaster
-    // This option controls the default broadcaster that will be used by the
-    // framework when an event needs to be broadcast. This can be set to
-    // any of the connections defined in the "connections" array below.
-    'default' => 'null',
-
-    // Broadcast Connections
-    // Here you may define all of the broadcast connections that will be used
-    // to broadcast events to other systems or over websockets. Samples of
-    // each available type of connection are provided inside this array.
-    'connections' => [
-
-        // Default options removed since we don't use broadcasting.
-
-        'log' => [
-            'driver' => 'log',
-        ],
-
-        'null' => [
-            'driver' => 'null',
-        ],
-
-    ],
-
-];
diff --git a/app/Config/cache.php b/app/Config/cache.php
index b588437ff1a..9a0be8eabfc 100644
--- a/app/Config/cache.php
+++ b/app/Config/cache.php
@@ -35,10 +35,6 @@
     // Available caches stores
     'stores' => [
 
-        'apc' => [
-            'driver' => 'apc',
-        ],
-
         'array' => [
             'driver'    => 'array',
             'serialize' => false,
@@ -49,6 +45,7 @@
             'table'           => 'cache',
             'connection'      => null,
             'lock_connection' => null,
+            'lock_table'      => null,
         ],
 
         'file' => [
diff --git a/app/Config/filesystems.php b/app/Config/filesystems.php
index 1319c8886f6..08ae7b04776 100644
--- a/app/Config/filesystems.php
+++ b/app/Config/filesystems.php
@@ -33,12 +33,14 @@
             'driver'     => 'local',
             'root'       => public_path(),
             'visibility' => 'public',
+            'serve'      => false,
             'throw'      => true,
         ],
 
         'local_secure_attachments' => [
             'driver' => 'local',
             'root'   => storage_path('uploads/files/'),
+            'serve'  => false,
             'throw'  => true,
         ],
 
@@ -46,6 +48,7 @@
             'driver'     => 'local',
             'root'       => storage_path('uploads/images/'),
             'visibility' => 'public',
+            'serve'      => false,
             'throw'      => true,
         ],
 
diff --git a/app/Config/mail.php b/app/Config/mail.php
index 2906d769afd..038864f8cf4 100644
--- a/app/Config/mail.php
+++ b/app/Config/mail.php
@@ -38,7 +38,7 @@
             'password' => env('MAIL_PASSWORD'),
             'verify_peer' => env('MAIL_VERIFY_SSL', true),
             'timeout' => null,
-            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+            'local_domain' => null,
             'tls_required' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl'),
         ],
 
@@ -64,12 +64,4 @@
             ],
         ],
     ],
-
-    // Email markdown configuration
-    'markdown' => [
-        'theme' => 'default',
-        'paths' => [
-            resource_path('views/vendor/mail'),
-        ],
-    ],
 ];
diff --git a/app/Config/queue.php b/app/Config/queue.php
index 795a7932545..08f3a5baab5 100644
--- a/app/Config/queue.php
+++ b/app/Config/queue.php
@@ -23,6 +23,7 @@
 
         'database' => [
             'driver'       => 'database',
+            'connection'   => null,
             'table'        => 'jobs',
             'queue'        => 'default',
             'retry_after'  => 90,
diff --git a/app/Uploads/FileStorage.php b/app/Uploads/FileStorage.php
index e6ac368d000..6e4a210a162 100644
--- a/app/Uploads/FileStorage.php
+++ b/app/Uploads/FileStorage.php
@@ -5,7 +5,6 @@
 use BookStack\Exceptions\FileUploadException;
 use Exception;
 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
-use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
diff --git a/composer.json b/composer.json
index 426602e9a94..58b89fcce60 100644
--- a/composer.json
+++ b/composer.json
@@ -18,12 +18,11 @@
         "ext-xml": "*",
         "ext-zip": "*",
         "bacon/bacon-qr-code": "^3.0",
-        "doctrine/dbal": "^3.5",
         "dompdf/dompdf": "^3.0",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
-        "laravel/framework": "^10.48.23",
+        "laravel/framework": "^v11.37",
         "laravel/socialite": "^5.10",
         "laravel/tinker": "^2.8",
         "league/commonmark": "^2.3",
@@ -39,14 +38,13 @@
         "socialiteproviders/microsoft-azure": "^5.1",
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
-        "ssddanbrown/htmldiff": "^1.0.2",
-        "ssddanbrown/symfony-mailer": "6.4.x-dev"
+        "ssddanbrown/htmldiff": "^1.0.2"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
         "itsgoingd/clockwork": "^5.1",
         "mockery/mockery": "^1.5",
-        "nunomaduro/collision": "^7.0",
+        "nunomaduro/collision": "^8.1",
         "larastan/larastan": "^2.7",
         "phpunit/phpunit": "^10.0",
         "squizlabs/php_codesniffer": "^3.7",
diff --git a/composer.lock b/composer.lock
index a2ceed629f8..1d512f85148 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a8875f121a0e28301e3ca8b3e63d394c",
+    "content-hash": "518176ac5bb608061e0f74b06fdae582",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.11",
+            "version": "3.336.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d"
+                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/442039c766a82f06ecfecb0ac2c610d6aaba228d",
-                "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dcb43c029ca74c52fa03a739341cc77086296a83",
+                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.11"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.13"
             },
-            "time": "2025-01-08T19:06:59+00:00"
+            "time": "2025-01-10T19:04:25+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -274,26 +274,26 @@
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "2.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "php": "^8.1"
             },
             "conflict": {
-                "doctrine/dbal": "<3.7.0 || >=4.0.0"
+                "doctrine/dbal": "<4.0.0 || >=5.0.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^3.7.0",
+                "doctrine/dbal": "^4.0.0",
                 "nesbot/carbon": "^2.71.0 || ^3.0.0",
                 "phpunit/phpunit": "^10.3"
             },
@@ -323,7 +323,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
             },
             "funding": [
                 {
@@ -339,7 +339,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-11T17:09:12+00:00"
+            "time": "2024-02-09T16:56:22+00:00"
         },
         {
             "name": "dasprid/enum",
@@ -466,348 +466,6 @@
             },
             "time": "2024-07-08T12:26:09+00:00"
         },
-        {
-            "name": "doctrine/cache",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.4 || ^6",
-                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
-            "homepage": "https://www.doctrine-project.org/projects/cache.html",
-            "keywords": [
-                "abstraction",
-                "apcu",
-                "cache",
-                "caching",
-                "couchdb",
-                "memcached",
-                "php",
-                "redis",
-                "xcache"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-20T20:07:39+00:00"
-        },
-        {
-            "name": "doctrine/dbal",
-            "version": "3.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
-                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
-                "shasum": ""
-            },
-            "require": {
-                "composer-runtime-api": "^2",
-                "doctrine/cache": "^1.11|^2.0",
-                "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1|^2",
-                "php": "^7.4 || ^8.0",
-                "psr/cache": "^1|^2|^3",
-                "psr/log": "^1|^2|^3"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "12.0.0",
-                "fig/log-test": "^1",
-                "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.12.6",
-                "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "9.6.20",
-                "psalm/plugin-phpunit": "0.18.4",
-                "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.10.2",
-                "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
-                "vimeo/psalm": "4.30.0"
-            },
-            "suggest": {
-                "symfony/console": "For helpful console commands such as SQL execution and import of files."
-            },
-            "bin": [
-                "bin/doctrine-dbal"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\DBAL\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                }
-            ],
-            "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
-            "homepage": "https://www.doctrine-project.org/projects/dbal.html",
-            "keywords": [
-                "abstraction",
-                "database",
-                "db2",
-                "dbal",
-                "mariadb",
-                "mssql",
-                "mysql",
-                "oci8",
-                "oracle",
-                "pdo",
-                "pgsql",
-                "postgresql",
-                "queryobject",
-                "sasql",
-                "sql",
-                "sqlite",
-                "sqlserver",
-                "sqlsrv"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.9.3"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-10-10T17:56:43+00:00"
-        },
-        {
-            "name": "doctrine/deprecations",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9 || ^12",
-                "phpstan/phpstan": "1.4.10 || 2.0.3",
-                "phpstan/phpstan-phpunit": "^1.0 || ^2",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/log": "^1 || ^2 || ^3"
-            },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Deprecations\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
-            "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
-            },
-            "time": "2024-12-07T21:18:45+00:00"
-        },
-        {
-            "name": "doctrine/event-manager",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
-                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "conflict": {
-                "doctrine/common": "<2.9"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^12",
-                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^10.5",
-                "vimeo/psalm": "^5.24"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                },
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                }
-            ],
-            "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
-            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
-            "keywords": [
-                "event",
-                "event dispatcher",
-                "event manager",
-                "event system",
-                "events"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-05-22T20:47:39+00:00"
-        },
         {
             "name": "doctrine/inflector",
             "version": "2.0.10",
@@ -2083,23 +1741,23 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.25",
+            "version": "v11.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c"
+                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f132b23b13909cc22c615c01b0c5640541c3da0c",
-                "reference": "f132b23b13909cc22c615c01b0c5640541c3da0c",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
+                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
-                "dragonmantank/cron-expression": "^3.3.2",
+                "dragonmantank/cron-expression": "^3.4",
                 "egulias/email-validator": "^3.2.1|^4.0",
                 "ext-ctype": "*",
                 "ext-filter": "*",
@@ -2108,44 +1766,45 @@
                 "ext-openssl": "*",
                 "ext-session": "*",
                 "ext-tokenizer": "*",
-                "fruitcake/php-cors": "^1.2",
+                "fruitcake/php-cors": "^1.3",
+                "guzzlehttp/guzzle": "^7.8.2",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.9",
-                "laravel/serializable-closure": "^1.3",
-                "league/commonmark": "^2.2.1",
-                "league/flysystem": "^3.8.0",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
+                "laravel/serializable-closure": "^1.3|^2.0",
+                "league/commonmark": "^2.6",
+                "league/flysystem": "^3.25.1",
+                "league/flysystem-local": "^3.25.1",
+                "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.67",
-                "nunomaduro/termwind": "^1.13",
-                "php": "^8.1",
+                "nesbot/carbon": "^2.72.2|^3.4",
+                "nunomaduro/termwind": "^2.0",
+                "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^6.2",
-                "symfony/error-handler": "^6.2",
-                "symfony/finder": "^6.2",
-                "symfony/http-foundation": "^6.4",
-                "symfony/http-kernel": "^6.2",
-                "symfony/mailer": "^6.2",
-                "symfony/mime": "^6.2",
-                "symfony/process": "^6.2",
-                "symfony/routing": "^6.2",
-                "symfony/uid": "^6.2",
-                "symfony/var-dumper": "^6.2",
+                "symfony/console": "^7.0.3",
+                "symfony/error-handler": "^7.0.3",
+                "symfony/finder": "^7.0.3",
+                "symfony/http-foundation": "^7.2.0",
+                "symfony/http-kernel": "^7.0.3",
+                "symfony/mailer": "^7.0.3",
+                "symfony/mime": "^7.0.3",
+                "symfony/polyfill-php83": "^1.31",
+                "symfony/process": "^7.0.3",
+                "symfony/routing": "^7.0.3",
+                "symfony/uid": "^7.0.3",
+                "symfony/var-dumper": "^7.0.3",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
-                "vlucas/phpdotenv": "^5.4.1",
-                "voku/portable-ascii": "^2.0"
+                "vlucas/phpdotenv": "^5.6.1",
+                "voku/portable-ascii": "^2.0.2"
             },
             "conflict": {
-                "carbonphp/carbon-doctrine-types": ">=3.0",
-                "doctrine/dbal": ">=4.0",
-                "mockery/mockery": "1.6.8",
-                "phpunit/phpunit": ">=11.0.0",
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
+                "psr/log-implementation": "1.0|2.0|3.0",
                 "psr/simple-cache-implementation": "1.0|2.0|3.0"
             },
             "replace": {
@@ -2154,6 +1813,7 @@
                 "illuminate/bus": "self.version",
                 "illuminate/cache": "self.version",
                 "illuminate/collections": "self.version",
+                "illuminate/concurrency": "self.version",
                 "illuminate/conditionable": "self.version",
                 "illuminate/config": "self.version",
                 "illuminate/console": "self.version",
@@ -2181,36 +1841,38 @@
                 "illuminate/testing": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "spatie/once": "*"
             },
             "require-dev": {
                 "ably/ably-php": "^1.0",
-                "aws/aws-sdk-php": "^3.235.5",
-                "doctrine/dbal": "^3.5.1",
+                "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
-                "fakerphp/faker": "^1.21",
-                "guzzlehttp/guzzle": "^7.5",
-                "league/flysystem-aws-s3-v3": "^3.0",
-                "league/flysystem-ftp": "^3.0",
-                "league/flysystem-path-prefixing": "^3.3",
-                "league/flysystem-read-only": "^3.3",
-                "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.5.1",
-                "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^8.23.4",
-                "pda/pheanstalk": "^4.0",
-                "phpstan/phpstan": "~1.11.11",
-                "phpunit/phpunit": "^10.0.7",
-                "predis/predis": "^2.0.2",
-                "symfony/cache": "^6.2",
-                "symfony/http-client": "^6.2.4",
-                "symfony/psr-http-message-bridge": "^2.0"
+                "fakerphp/faker": "^1.24",
+                "guzzlehttp/promises": "^2.0.3",
+                "guzzlehttp/psr7": "^2.4",
+                "league/flysystem-aws-s3-v3": "^3.25.1",
+                "league/flysystem-ftp": "^3.25.1",
+                "league/flysystem-path-prefixing": "^3.25.1",
+                "league/flysystem-read-only": "^3.25.1",
+                "league/flysystem-sftp-v3": "^3.25.1",
+                "mockery/mockery": "^1.6.10",
+                "orchestra/testbench-core": "^9.6",
+                "pda/pheanstalk": "^5.0.6",
+                "php-http/discovery": "^1.15",
+                "phpstan/phpstan": "^1.11.5",
+                "phpunit/phpunit": "^10.5.35|^11.3.6",
+                "predis/predis": "^2.3",
+                "resend/resend-php": "^0.10.0",
+                "symfony/cache": "^7.0.3",
+                "symfony/http-client": "^7.0.3",
+                "symfony/psr-http-message-bridge": "^7.0.3",
+                "symfony/translation": "^7.0.3"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
-                "brianium/paratest": "Required to run tests in parallel (^6.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
+                "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -2219,42 +1881,45 @@
                 "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
                 "ext-pdo": "Required to use all database features.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
-                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
-                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
-                "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
-                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
-                "mockery/mockery": "Required to use mocking (^1.5.1).",
-                "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
-                "predis/predis": "Required to use the predis connector (^2.0.2).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
+                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).",
+                "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
+                "mockery/mockery": "Required to use mocking (^1.6).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+                "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
+                "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "10.x-dev"
+                    "dev-master": "11.x-dev"
                 }
             },
             "autoload": {
                 "files": [
+                    "src/Illuminate/Collections/functions.php",
                     "src/Illuminate/Collections/helpers.php",
                     "src/Illuminate/Events/functions.php",
                     "src/Illuminate/Filesystem/functions.php",
                     "src/Illuminate/Foundation/helpers.php",
+                    "src/Illuminate/Log/functions.php",
+                    "src/Illuminate/Support/functions.php",
                     "src/Illuminate/Support/helpers.php"
                 ],
                 "psr-4": {
@@ -2286,25 +1951,25 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-26T15:32:57+00:00"
+            "time": "2025-01-02T20:10:21+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.25",
+            "version": "v0.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
-                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": "^2.2",
                 "ext-mbstring": "*",
-                "illuminate/collections": "^10.0|^11.0",
                 "php": "^8.1",
                 "symfony/console": "^6.2|^7.0"
             },
@@ -2313,8 +1978,9 @@
                 "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
+                "illuminate/collections": "^10.0|^11.0",
                 "mockery/mockery": "^1.5",
-                "pestphp/pest": "^2.3",
+                "pestphp/pest": "^2.3|^3.4",
                 "phpstan/phpstan": "^1.11",
                 "phpstan/phpstan-mockery": "^1.1"
             },
@@ -2324,7 +1990,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.1.x-dev"
+                    "dev-main": "0.3.x-dev"
                 }
             },
             "autoload": {
@@ -2342,38 +2008,38 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.25"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
             },
-            "time": "2024-08-12T22:06:33+00:00"
+            "time": "2024-11-12T14:59:47+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.7",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d"
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/4f48ade902b94323ca3be7646db16209ec76be3d",
-                "reference": "4f48ade902b94323ca3be7646db16209ec76be3d",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "nesbot/carbon": "^2.61|^3.0",
-                "pestphp/pest": "^1.21.3",
-                "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
+                "illuminate/support": "^10.0|^11.0",
+                "nesbot/carbon": "^2.67|^3.0",
+                "pestphp/pest": "^2.36",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -2405,7 +2071,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-11-14T18:34:49+00:00"
+            "time": "2024-12-16T15:26:28+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -3161,16 +2827,178 @@
                 "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
                 "php": "^7.1 || >=8.0.0 <8.5.0"
             },
-            "require-dev": {
-                "mockery/mockery": "^1.3.5",
-                "php-parallel-lint/php-parallel-lint": "^1.4",
-                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
-                "squizlabs/php_codesniffer": "^3.11"
+            "require-dev": {
+                "mockery/mockery": "^1.3.5",
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "^3.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth2\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alex Bilbie",
+                    "email": "hello@alexbilbie.com",
+                    "homepage": "http://www.alexbilbie.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Woody Gilk",
+                    "homepage": "https://github.com/shadowhand",
+                    "role": "Contributor"
+                }
+            ],
+            "description": "OAuth 2.0 Client Library",
+            "keywords": [
+                "Authentication",
+                "SSO",
+                "authorization",
+                "identity",
+                "idp",
+                "oauth",
+                "oauth2",
+                "single sign on"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/oauth2-client/issues",
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.0"
+            },
+            "time": "2024-12-11T05:05:52+00:00"
+        },
+        {
+            "name": "league/uri",
+            "version": "7.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/uri.git",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430",
+                "shasum": ""
+            },
+            "require": {
+                "league/uri-interfaces": "^7.5",
+                "php": "^8.1"
+            },
+            "conflict": {
+                "league/uri-schemes": "^1.0"
+            },
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-fileinfo": "to create Data URI from file contennts",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
+                "league/uri-components": "Needed to easily manipulate URI objects components",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Uri\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
+                }
+            ],
+            "description": "URI manipulation library",
+            "homepage": "https://uri.thephpleague.com",
+            "keywords": [
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "middleware",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "uri",
+                "uri-template",
+                "url",
+                "ws"
+            ],
+            "support": {
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri/tree/7.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-12-08T08:40:02+00:00"
+        },
+        {
+            "name": "league/uri-interfaces",
+            "version": "7.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/uri-interfaces.git",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "shasum": ""
+            },
+            "require": {
+                "ext-filter": "*",
+                "php": "^8.1",
+                "psr/http-factory": "^1",
+                "psr/http-message": "^1.1 || ^2.0"
+            },
+            "suggest": {
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "League\\OAuth2\\Client\\": "src/"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3179,33 +3007,45 @@
             ],
             "authors": [
                 {
-                    "name": "Alex Bilbie",
-                    "email": "hello@alexbilbie.com",
-                    "homepage": "http://www.alexbilbie.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Woody Gilk",
-                    "homepage": "https://github.com/shadowhand",
-                    "role": "Contributor"
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "OAuth 2.0 Client Library",
+            "description": "Common interfaces and classes for URI representation and interaction",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
-                "Authentication",
-                "SSO",
-                "authorization",
-                "identity",
-                "idp",
-                "oauth",
-                "oauth2",
-                "single sign on"
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
+                "rfc3986",
+                "rfc3987",
+                "rfc6570",
+                "uri",
+                "url",
+                "ws"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.0"
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0"
             },
-            "time": "2024-12-11T05:05:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-12-08T08:18:47+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -3445,42 +3285,41 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.6",
+            "version": "3.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
-                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
                 "shasum": ""
             },
             "require": {
-                "carbonphp/carbon-doctrine-types": "*",
+                "carbonphp/carbon-doctrine-types": "<100.0",
                 "ext-json": "*",
-                "php": "^7.1.8 || ^8.0",
+                "php": "^8.1",
                 "psr/clock": "^1.0",
+                "symfony/clock": "^6.3 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
-                "doctrine/orm": "^2.7 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.0",
-                "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "<6",
-                "phpmd/phpmd": "^2.9",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
-                "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
-                "squizlabs/php_codesniffer": "^3.4"
+                "doctrine/dbal": "^3.6.3 || ^4.0",
+                "doctrine/orm": "^2.15.2 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "kylekatarnls/multi-tester": "^2.5.3",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
+                "phpmd/phpmd": "^2.15.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.11.2",
+                "phpunit/phpunit": "^10.5.20",
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "bin": [
                 "bin/carbon"
@@ -3548,7 +3387,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-27T09:28:11+00:00"
+            "time": "2024-12-27T09:25:35+00:00"
         },
         {
             "name": "nette/schema",
@@ -3758,32 +3597,31 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.17.0",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301"
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/5369ef84d8142c1d87e4ec278711d4ece3cbf301",
-                "reference": "5369ef84d8142c1d87e4ec278711d4ece3cbf301",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/52915afe6a1044e8b9cee1bcff836fb63acf9cda",
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.1",
-                "symfony/console": "^6.4.15"
+                "php": "^8.2",
+                "symfony/console": "^7.1.8"
             },
             "require-dev": {
-                "illuminate/console": "^10.48.24",
-                "illuminate/support": "^10.48.24",
+                "illuminate/console": "^11.33.2",
                 "laravel/pint": "^1.18.2",
+                "mockery/mockery": "^1.6.12",
                 "pestphp/pest": "^2.36.0",
-                "pestphp/pest-plugin-mock": "2.0.0",
                 "phpstan/phpstan": "^1.12.11",
                 "phpstan/phpstan-strict-rules": "^1.6.1",
-                "symfony/var-dumper": "^6.4.15",
+                "symfony/var-dumper": "^7.1.8",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3792,6 +3630,9 @@
                     "providers": [
                         "Termwind\\Laravel\\TermwindServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3823,7 +3664,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.17.0"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -3839,7 +3680,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-21T10:36:35+00:00"
+            "time": "2024-11-21T10:39:51+00:00"
         },
         {
             "name": "onelogin/php-saml",
@@ -4320,55 +4161,6 @@
             ],
             "time": "2024-11-21T20:00:02+00:00"
         },
-        {
-            "name": "psr/cache",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/cache/tree/3.0.0"
-            },
-            "time": "2021-02-03T23:26:27+00:00"
-        },
         {
             "name": "psr/clock",
             "version": "1.0.0",
@@ -5560,49 +5352,34 @@
             "time": "2024-12-12T16:45:37+00:00"
         },
         {
-            "name": "ssddanbrown/symfony-mailer",
-            "version": "6.4.x-dev",
+            "name": "symfony/clock",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ssddanbrown/symfony-mailer.git",
-                "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae"
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/0497d6eb2734fe22b9550f88ae6526611c9df7ae",
-                "reference": "0497d6eb2734fe22b9550f88ae6526611c9df7ae",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
                 "shasum": ""
             },
             "require": {
-                "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.1",
-                "psr/event-dispatcher": "^1",
-                "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/mime": "^6.2|^7.0",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
-                "symfony/messenger": "<6.2",
-                "symfony/mime": "<6.2",
-                "symfony/twig-bridge": "<6.2.1"
-            },
-            "replace": {
-                "symfony/mailer": "^6.0"
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
             },
-            "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^6.2|^7.0",
-                "symfony/twig-bridge": "^6.2|^7.0"
+            "provide": {
+                "psr/clock-implementation": "1.0"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Mailer\\": ""
+                    "Symfony\\Component\\Clock\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -5614,68 +5391,82 @@
             ],
             "authors": [
                 {
-                    "name": "Dan Brown",
-                    "homepage": "https://danb.me"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Helps sending emails",
+            "description": "Decouples applications from the system clock",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
             "support": {
-                "source": "https://github.com/ssddanbrown/symfony-mailer/tree/6.4"
+                "source": "https://github.com/symfony/clock/tree/v7.2.0"
             },
-            "time": "2024-03-17T16:25:21+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.17",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04"
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04",
-                "reference": "799445db3f15768ecc382ac5699e6da0520a0a04",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0|^7.0"
+                "symfony/string": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5709,7 +5500,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.17"
+                "source": "https://github.com/symfony/console/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -5725,7 +5516,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T12:07:30+00:00"
+            "time": "2024-12-11T03:49:26+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5861,22 +5652,22 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.17",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c"
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c",
-                "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8",
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
@@ -5885,7 +5676,7 @@
             "require-dev": {
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^5.4|^6.0|^7.0"
+                "symfony/serializer": "^6.4|^7.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -5916,7 +5707,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.17"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -5932,7 +5723,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-06T13:30:51+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6092,23 +5883,23 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.17",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7"
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
-                "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0|^7.0"
+                "symfony/filesystem": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6136,7 +5927,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.17"
+                "source": "https://github.com/symfony/finder/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -6152,40 +5943,41 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-29T13:51:37+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.16",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57"
+                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57",
-                "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
+                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-mbstring": "~1.1",
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
+                "doctrine/dbal": "<3.6",
                 "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "symfony/cache": "^6.4.12|^7.1.5",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
-                "symfony/mime": "^5.4|^6.0|^7.0",
-                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
+                "symfony/rate-limiter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -6213,7 +6005,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.16"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -6229,77 +6021,77 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T18:58:10+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.17",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710"
+                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710",
-                "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3c432966bd8c7ec7429663105f5a02d7e75b4306",
+                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.4",
-                "symfony/config": "<6.1",
-                "symfony/console": "<5.4",
+                "symfony/browser-kit": "<6.4",
+                "symfony/cache": "<6.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
-                "symfony/doctrine-bridge": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<5.4",
+                "symfony/doctrine-bridge": "<6.4",
+                "symfony/form": "<6.4",
+                "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<5.4",
-                "symfony/translation": "<5.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/translation": "<6.4",
                 "symfony/translation-contracts": "<2.5",
-                "symfony/twig-bridge": "<5.4",
+                "symfony/twig-bridge": "<6.4",
                 "symfony/validator": "<6.4",
-                "symfony/var-dumper": "<6.3",
-                "twig/twig": "<2.13"
+                "symfony/var-dumper": "<6.4",
+                "twig/twig": "<3.12"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0|^7.0",
-                "symfony/clock": "^6.2|^7.0",
-                "symfony/config": "^6.1|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/css-selector": "^6.4|^7.0",
                 "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/dom-crawler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
-                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4.4|^7.0.4",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^7.1",
+                "symfony/routing": "^6.4|^7.0",
+                "symfony/serializer": "^7.1",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/translation": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^6.4|^7.0",
                 "symfony/validator": "^6.4|^7.0",
-                "symfony/var-dumper": "^5.4|^6.4|^7.0",
-                "symfony/var-exporter": "^6.2|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "type": "library",
             "autoload": {
@@ -6327,7 +6119,87 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.17"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-12-31T14:59:40+00:00"
+        },
+        {
+            "name": "symfony/mailer",
+            "version": "v7.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/e4d358702fb66e4c8a2af08e90e7271a62de39cc",
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -6343,25 +6215,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-31T14:49:31+00:00"
+            "time": "2024-11-25T15:21:05+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.17",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232"
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232",
-                "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -6369,17 +6240,17 @@
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<5.4",
+                "symfony/mailer": "<6.4",
                 "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.4|^7.0",
-                "symfony/property-access": "^5.4|^6.0|^7.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
                 "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
@@ -6412,7 +6283,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.17"
+                "source": "https://github.com/symfony/mime/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -6428,7 +6299,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-02T11:09:41+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7068,20 +6939,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.15",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "3cb242f059c14ae08591c5c4087d1fe443564392"
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392",
-                "reference": "3cb242f059c14ae08591c5c4087d1fe443564392",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -7109,7 +6980,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.15"
+                "source": "https://github.com/symfony/process/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7125,40 +6996,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T14:19:14+00:00"
+            "time": "2024-11-06T14:24:19+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.16",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220"
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220",
-                "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e10a2450fa957af6c448b9b93c9010a4e4c0725e",
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12",
-                "symfony/config": "<6.2",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.2|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7192,7 +7061,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.16"
+                "source": "https://github.com/symfony/routing/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7208,7 +7077,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T15:31:34+00:00"
+            "time": "2024-11-25T11:08:51+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7382,33 +7251,33 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.13",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66"
+                "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66",
-                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e2674a30132b7cc4d74540d6c2573aa363f05923",
+                "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/translation-contracts": "^2.5|^3.0"
             },
             "conflict": {
-                "symfony/config": "<5.4",
-                "symfony/console": "<5.4",
-                "symfony/dependency-injection": "<5.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
+                "symfony/http-kernel": "<6.4",
                 "symfony/service-contracts": "<2.5",
-                "symfony/twig-bundle": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/twig-bundle": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
                 "symfony/translation-implementation": "2.3|3.0"
@@ -7416,17 +7285,17 @@
             "require-dev": {
                 "nikic/php-parser": "^4.18|^5.0",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/routing": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7457,7 +7326,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.13"
+                "source": "https://github.com/symfony/translation/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -7473,7 +7342,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-27T18:14:25+00:00"
+            "time": "2024-12-07T08:18:10+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7555,24 +7424,24 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.13",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007"
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/18eb207f0436a993fffbdd811b5b8fa35fa5e007",
-                "reference": "18eb207f0436a993fffbdd811b5b8fa35fa5e007",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2d294d0c48df244c71c105a169d0190bfb080426",
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7609,7 +7478,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.13"
+                "source": "https://github.com/symfony/uid/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7625,38 +7494,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:18:03+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.15",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80"
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80",
-                "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6a22929407dec8765d6e2b6ff85b800b245879c",
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^6.3|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -7694,7 +7561,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.15"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7710,7 +7577,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T15:28:48+00:00"
+            "time": "2024-11-08T15:48:14+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8484,40 +8351,38 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v7.11.0",
+            "version": "v8.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05"
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/994ea93df5d4132f69d3f1bd74730509df6e8a05",
-                "reference": "994ea93df5d4132f69d3f1bd74730509df6e8a05",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.16.0",
-                "nunomaduro/termwind": "^1.15.1",
-                "php": "^8.1.0",
-                "symfony/console": "^6.4.12"
+                "nunomaduro/termwind": "^2.1.0",
+                "php": "^8.2.0",
+                "symfony/console": "^7.1.5"
             },
             "conflict": {
-                "laravel/framework": ">=11.0.0"
+                "laravel/framework": "<11.0.0 || >=12.0.0",
+                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^7.3.1",
-                "laravel/framework": "^10.48.22",
+                "larastan/larastan": "^2.9.8",
+                "laravel/framework": "^11.28.0",
                 "laravel/pint": "^1.18.1",
                 "laravel/sail": "^1.36.0",
-                "laravel/sanctum": "^3.3.3",
+                "laravel/sanctum": "^4.0.3",
                 "laravel/tinker": "^2.10.0",
-                "nunomaduro/larastan": "^2.9.8",
-                "orchestra/testbench-core": "^8.28.3",
-                "pestphp/pest": "^2.35.1",
-                "phpunit/phpunit": "^10.5.36",
-                "sebastian/environment": "^6.1.0",
-                "spatie/laravel-ignition": "^2.8.0"
+                "orchestra/testbench-core": "^9.5.3",
+                "pestphp/pest": "^2.36.0 || ^3.4.0",
+                "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
             "extra": {
@@ -8525,6 +8390,9 @@
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-8.x": "8.x-dev"
                 }
             },
             "autoload": {
@@ -8576,7 +8444,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-10-15T15:12:40+00:00"
+            "time": "2024-10-15T16:06:32+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -10423,9 +10291,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "ssddanbrown/symfony-mailer": 20
-    },
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/database/migrations/2022_04_25_140741_update_polymorphic_types.php b/database/migrations/2022_04_25_140741_update_polymorphic_types.php
index 00e1e0688fc..f201d41ccc6 100644
--- a/database/migrations/2022_04_25_140741_update_polymorphic_types.php
+++ b/database/migrations/2022_04_25_140741_update_polymorphic_types.php
@@ -8,7 +8,7 @@
     /**
      * Mapping of old polymorphic types to new simpler values.
      */
-    protected $changeMap = [
+    protected array $changeMap = [
         'BookStack\\Bookshelf' => 'bookshelf',
         'BookStack\\Book'      => 'book',
         'BookStack\\Chapter'   => 'chapter',
@@ -18,7 +18,7 @@
     /**
      * Mapping of tables and columns that contain polymorphic types.
      */
-    protected $columnsByTable = [
+    protected array $columnsByTable = [
         'activities'         => 'entity_type',
         'comments'           => 'entity_type',
         'deletions'          => 'deletable_type',
diff --git a/public/index.php b/public/index.php
index fdf6e720f53..2b5c57b8f40 100644
--- a/public/index.php
+++ b/public/index.php
@@ -5,45 +5,16 @@
 
 define('LARAVEL_START', microtime(true));
 
-/*
-|--------------------------------------------------------------------------
-| Check If The Application Is Under Maintenance
-|--------------------------------------------------------------------------
-|
-| If the application is in maintenance / demo mode via the "down" command
-| we will load this file so that any pre-rendered content can be shown
-| instead of starting the framework, which could cause an exception.
-|
-*/
-
+// Determine if the application is in maintenance mode...
 if (file_exists(__DIR__ . '/../storage/framework/maintenance.php')) {
     require __DIR__ . '/../storage/framework/maintenance.php';
 }
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader for
-| this application. We just need to utilize it! We'll simply require it
-| into the script here so we don't need to manually load our classes.
-|
-*/
-
+// Register the Composer autoloader...
 require __DIR__ . '/../vendor/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Run The Application
-|--------------------------------------------------------------------------
-|
-| Once we have the application, we can handle the incoming request using
-| the application's HTTP kernel. Then, we will send the response back
-| to this client's browser, allowing them to enjoy our application.
-|
-*/
 
+// Run the application
 $app = require_once __DIR__ . '/../bootstrap/app.php';
 $app->alias('request', Request::class);
 

From 5bf75786c6326f4c2ef5df577a1062aeacce7bff Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 11 Jan 2025 13:22:49 +0000
Subject: [PATCH 433/666] Framework: Fixed Laravel 11 upgrade test issues,
 updated phpstan

- Fixed failing tests due to Laravel 11 changes
- Updated phpstan to 3.x branch
- Removed some seemingly redundant comment code, which was triggering
  phpstan.
---
 app/Activity/Models/Comment.php               | 17 ------
 composer.json                                 |  2 +-
 composer.lock                                 | 60 +++++++++----------
 .../2015_08_31_175240_add_search_indexes.php  | 12 +---
 .../2015_12_05_145049_fulltext_weighting.php  | 12 +---
 ...03_19_091553_create_search_index_table.php | 12 +---
 phpstan.neon.dist                             |  4 +-
 tests/Entity/PageTest.php                     |  2 +-
 8 files changed, 42 insertions(+), 79 deletions(-)

diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 7d1c54646c1..d0385d3962f 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -26,7 +26,6 @@ class Comment extends Model implements Loggable
     use HasCreatorAndUpdater;
 
     protected $fillable = ['parent_id'];
-    protected $appends = ['created', 'updated'];
 
     /**
      * Get the entity that this comment belongs to.
@@ -54,22 +53,6 @@ public function isUpdated(): bool
         return $this->updated_at->timestamp > $this->created_at->timestamp;
     }
 
-    /**
-     * Get created date as a relative diff.
-     */
-    public function getCreatedAttribute(): string
-    {
-        return $this->created_at->diffForHumans();
-    }
-
-    /**
-     * Get updated date as a relative diff.
-     */
-    public function getUpdatedAttribute(): string
-    {
-        return $this->updated_at->diffForHumans();
-    }
-
     public function logDescriptor(): string
     {
         return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->entity_type} (ID: {$this->entity_id})";
diff --git a/composer.json b/composer.json
index 58b89fcce60..2c3c047322f 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
         "itsgoingd/clockwork": "^5.1",
         "mockery/mockery": "^1.5",
         "nunomaduro/collision": "^8.1",
-        "larastan/larastan": "^2.7",
+        "larastan/larastan": "^v3.0",
         "phpunit/phpunit": "^10.0",
         "squizlabs/php_codesniffer": "^3.7",
         "ssddanbrown/asserthtml": "^3.0"
diff --git a/composer.lock b/composer.lock
index 1d512f85148..c7c4018a127 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "518176ac5bb608061e0f74b06fdae582",
+    "content-hash": "36bd84db9a3fd3e801fbd8375b91e0e5",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -8115,40 +8115,40 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.12",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908"
+                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/19012b39fbe4dede43dbe0c126d9681827a5e908",
-                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
+                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
-                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
-                "php": "^8.0.2",
+                "illuminate/console": "^11.15.0",
+                "illuminate/container": "^11.15.0",
+                "illuminate/contracts": "^11.15.0",
+                "illuminate/database": "^11.15.0",
+                "illuminate/http": "^11.15.0",
+                "illuminate/pipeline": "^11.15.0",
+                "illuminate/support": "^11.15.0",
+                "php": "^8.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.12.11"
+                "phpstan/phpstan": "^2.0.2"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "laravel/framework": "^9.52.16 || ^10.28.0 || ^11.16",
-                "mockery/mockery": "^1.5.1",
-                "nikic/php-parser": "^4.19.1",
-                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
-                "orchestra/testbench-core": "^7.33.0 || ^8.13.0 || ^9.0.9",
-                "phpstan/phpstan-deprecation-rules": "^1.2",
-                "phpunit/phpunit": "^9.6.13 || ^10.5.16"
+                "laravel/framework": "^11.15.0",
+                "mockery/mockery": "^1.6",
+                "nikic/php-parser": "^5.3",
+                "orchestra/canvas": "^v9.1.3",
+                "orchestra/testbench-core": "^9.5.2",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpunit/phpunit": "^10.5.16"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -8183,7 +8183,7 @@
                     "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
             "keywords": [
                 "PHPStan",
                 "code analyse",
@@ -8196,7 +8196,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.12"
+                "source": "https://github.com/larastan/larastan/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -8204,7 +8204,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-26T23:09:02+00:00"
+            "time": "2024-11-26T23:15:21+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8653,20 +8653,20 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.15",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
+                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
-                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0"
+                "php": "^7.4|^8.0"
             },
             "conflict": {
                 "phpstan/phpstan-shim": "*"
@@ -8707,7 +8707,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-05T16:40:22+00:00"
+            "time": "2025-01-05T16:43:48+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/database/migrations/2015_08_31_175240_add_search_indexes.php b/database/migrations/2015_08_31_175240_add_search_indexes.php
index 4d58d940959..13141698a9f 100644
--- a/database/migrations/2015_08_31_175240_add_search_indexes.php
+++ b/database/migrations/2015_08_31_175240_add_search_indexes.php
@@ -26,25 +26,19 @@ public function up()
      */
     public function down(): void
     {
-        $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $prefix = DB::getTablePrefix();
-        $pages = $sm->introspectTable($prefix . 'pages');
-        $books = $sm->introspectTable($prefix . 'books');
-        $chapters = $sm->introspectTable($prefix . 'chapters');
-
-        if ($pages->hasIndex('search')) {
+        if (Schema::hasIndex('pages', 'search')) {
             Schema::table('pages', function (Blueprint $table) {
                 $table->dropIndex('search');
             });
         }
 
-        if ($books->hasIndex('search')) {
+        if (Schema::hasIndex('books', 'search')) {
             Schema::table('books', function (Blueprint $table) {
                 $table->dropIndex('search');
             });
         }
 
-        if ($chapters->hasIndex('search')) {
+        if (Schema::hasIndex('chapters', 'search')) {
             Schema::table('chapters', function (Blueprint $table) {
                 $table->dropIndex('search');
             });
diff --git a/database/migrations/2015_12_05_145049_fulltext_weighting.php b/database/migrations/2015_12_05_145049_fulltext_weighting.php
index b20c04520cb..3d0d21e7081 100644
--- a/database/migrations/2015_12_05_145049_fulltext_weighting.php
+++ b/database/migrations/2015_12_05_145049_fulltext_weighting.php
@@ -26,25 +26,19 @@ public function up()
      */
     public function down(): void
     {
-        $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $prefix = DB::getTablePrefix();
-        $pages = $sm->introspectTable($prefix . 'pages');
-        $books = $sm->introspectTable($prefix . 'books');
-        $chapters = $sm->introspectTable($prefix . 'chapters');
-
-        if ($pages->hasIndex('name_search')) {
+        if (Schema::hasIndex('pages', 'name_search')) {
             Schema::table('pages', function (Blueprint $table) {
                 $table->dropIndex('name_search');
             });
         }
 
-        if ($books->hasIndex('name_search')) {
+        if (Schema::hasIndex('books', 'name_search')) {
             Schema::table('books', function (Blueprint $table) {
                 $table->dropIndex('name_search');
             });
         }
 
-        if ($chapters->hasIndex('name_search')) {
+        if (Schema::hasIndex('chapters', 'name_search')) {
             Schema::table('chapters', function (Blueprint $table) {
                 $table->dropIndex('name_search');
             });
diff --git a/database/migrations/2017_03_19_091553_create_search_index_table.php b/database/migrations/2017_03_19_091553_create_search_index_table.php
index 56281741e3c..7f96aca6b33 100644
--- a/database/migrations/2017_03_19_091553_create_search_index_table.php
+++ b/database/migrations/2017_03_19_091553_create_search_index_table.php
@@ -25,27 +25,21 @@ public function up(): void
             $table->index('score');
         });
 
-        $sm = Schema::getConnection()->getDoctrineSchemaManager();
-        $prefix = DB::getTablePrefix();
-        $pages = $sm->introspectTable($prefix . 'pages');
-        $books = $sm->introspectTable($prefix . 'books');
-        $chapters = $sm->introspectTable($prefix . 'chapters');
-
-        if ($pages->hasIndex('search')) {
+        if (Schema::hasIndex('pages', 'search')) {
             Schema::table('pages', function (Blueprint $table) {
                 $table->dropIndex('search');
                 $table->dropIndex('name_search');
             });
         }
 
-        if ($books->hasIndex('search')) {
+        if (Schema::hasIndex('books', 'search')) {
             Schema::table('books', function (Blueprint $table) {
                 $table->dropIndex('search');
                 $table->dropIndex('name_search');
             });
         }
 
-        if ($chapters->hasIndex('search')) {
+        if (Schema::hasIndex('chapters', 'search')) {
             Schema::table('chapters', function (Blueprint $table) {
                 $table->dropIndex('search');
                 $table->dropIndex('name_search');
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index aa2ad3d9e0f..0f20213836c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -21,6 +21,4 @@ parameters:
 
     excludePaths:
         - ./Config/**/*.php
-        - ./dev/**/*.php
-
-    checkMissingIterableValueType: false
\ No newline at end of file
+        - ./dev/**/*.php
\ No newline at end of file
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index b96d455eb25..deeead09911 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -300,7 +300,7 @@ public function test_recently_updated_pages_view_shows_updated_by_details()
         ]);
 
         $resp = $this->asAdmin()->get('/pages/recently-updated');
-        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 1 second ago by ' . $user->name);
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 0 seconds ago by ' . $user->name);
     }
 
     public function test_recently_updated_pages_view_shows_parent_chain()

From ad8bc5fe21ddccc243f6a4ef4e87bbd28668c423 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 11 Jan 2025 13:50:01 +0000
Subject: [PATCH 434/666] Framework: Updated phpunit to 11, updated migration
 test php versions

---
 .github/workflows/test-migrations.yml |   2 +-
 .github/workflows/test-php.yml        |   2 +-
 composer.json                         |   4 +-
 composer.lock                         | 552 ++++++++++++++------------
 4 files changed, 312 insertions(+), 248 deletions(-)

diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 2d6d280b2ee..23e58a772c2 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 277af907025..64132f673a4 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php: ['8.2', '8.3', '8.4']
diff --git a/composer.json b/composer.json
index 2c3c047322f..9ffded1c587 100644
--- a/composer.json
+++ b/composer.json
@@ -46,9 +46,9 @@
         "mockery/mockery": "^1.5",
         "nunomaduro/collision": "^8.1",
         "larastan/larastan": "^v3.0",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^11.5",
         "squizlabs/php_codesniffer": "^3.7",
-        "ssddanbrown/asserthtml": "^3.0"
+        "ssddanbrown/asserthtml": "^3.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index c7c4018a127..5d2b38215a7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "36bd84db9a3fd3e801fbd8375b91e0e5",
+    "content-hash": "f8d7d0be63e355bf8d39ebf2ced165b7",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5520,20 +5520,20 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.4.13",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e"
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e",
-                "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2",
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -5565,7 +5565,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.4.13"
+                "source": "https://github.com/symfony/css-selector/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -5581,7 +5581,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:18:03+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -8711,35 +8711,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.16",
+            "version": "11.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
-                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/418c59fd080954f8c4aa5631d9502ecda2387118",
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.19.1 || ^5.1.0",
-                "php": ">=8.1",
-                "phpunit/php-file-iterator": "^4.1.0",
-                "phpunit/php-text-template": "^3.0.1",
-                "sebastian/code-unit-reverse-lookup": "^3.0.0",
-                "sebastian/complexity": "^3.2.0",
-                "sebastian/environment": "^6.1.0",
-                "sebastian/lines-of-code": "^2.0.2",
-                "sebastian/version": "^4.0.1",
+                "nikic/php-parser": "^5.3.1",
+                "php": ">=8.2",
+                "phpunit/php-file-iterator": "^5.1.0",
+                "phpunit/php-text-template": "^4.0.1",
+                "sebastian/code-unit-reverse-lookup": "^4.0.1",
+                "sebastian/complexity": "^4.0.1",
+                "sebastian/environment": "^7.2.0",
+                "sebastian/lines-of-code": "^3.0.1",
+                "sebastian/version": "^5.0.2",
                 "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.1"
+                "phpunit/phpunit": "^11.5.0"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -8748,7 +8748,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1.x-dev"
+                    "dev-main": "11.0.x-dev"
                 }
             },
             "autoload": {
@@ -8777,7 +8777,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.8"
             },
             "funding": [
                 {
@@ -8785,32 +8785,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-22T04:31:57+00:00"
+            "time": "2024-12-11T12:34:27+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "4.1.0",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
+                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -8838,7 +8838,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
             },
             "funding": [
                 {
@@ -8846,28 +8846,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T06:24:48+00:00"
+            "time": "2024-08-27T05:02:59+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "4.0.0",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
+                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
-                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2",
+                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -8875,7 +8875,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -8901,7 +8901,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+                "security": "https://github.com/sebastianbergmann/php-invoker/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1"
             },
             "funding": [
                 {
@@ -8909,32 +8910,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:56:09+00:00"
+            "time": "2024-07-03T05:07:44+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "3.0.1",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
+                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -8961,7 +8962,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
                 "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1"
             },
             "funding": [
                 {
@@ -8969,32 +8970,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T14:07:24+00:00"
+            "time": "2024-07-03T05:08:43+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "6.0.0",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
-                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
+                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -9020,7 +9021,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+                "security": "https://github.com/sebastianbergmann/php-timer/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1"
             },
             "funding": [
                 {
@@ -9028,20 +9030,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:57:52+00:00"
+            "time": "2024-07-03T05:09:35+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.40",
+            "version": "11.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c"
+                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6ddda95af52f69c1e0c7b4f977cccb58048798c",
-                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/153d0531b9f7e883c5053160cad6dd5ac28140b3",
+                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
                 "shasum": ""
             },
             "require": {
@@ -9054,23 +9056,23 @@
                 "myclabs/deep-copy": "^1.12.1",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
-                "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.16",
-                "phpunit/php-file-iterator": "^4.1.0",
-                "phpunit/php-invoker": "^4.0.0",
-                "phpunit/php-text-template": "^3.0.1",
-                "phpunit/php-timer": "^6.0.0",
-                "sebastian/cli-parser": "^2.0.1",
-                "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.3",
-                "sebastian/diff": "^5.1.1",
-                "sebastian/environment": "^6.1.0",
-                "sebastian/exporter": "^5.1.2",
-                "sebastian/global-state": "^6.0.2",
-                "sebastian/object-enumerator": "^5.0.0",
-                "sebastian/recursion-context": "^5.0.0",
-                "sebastian/type": "^4.0.0",
-                "sebastian/version": "^4.0.1"
+                "php": ">=8.2",
+                "phpunit/php-code-coverage": "^11.0.8",
+                "phpunit/php-file-iterator": "^5.1.0",
+                "phpunit/php-invoker": "^5.0.1",
+                "phpunit/php-text-template": "^4.0.1",
+                "phpunit/php-timer": "^7.0.1",
+                "sebastian/cli-parser": "^3.0.2",
+                "sebastian/code-unit": "^3.0.2",
+                "sebastian/comparator": "^6.2.1",
+                "sebastian/diff": "^6.0.2",
+                "sebastian/environment": "^7.2.0",
+                "sebastian/exporter": "^6.3.0",
+                "sebastian/global-state": "^7.0.2",
+                "sebastian/object-enumerator": "^6.0.1",
+                "sebastian/type": "^5.1.0",
+                "sebastian/version": "^5.0.2",
+                "staabm/side-effects-detector": "^1.0.5"
             },
             "suggest": {
                 "ext-soap": "To be able to generate mocks based on WSDL files"
@@ -9081,7 +9083,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.5-dev"
+                    "dev-main": "11.5-dev"
                 }
             },
             "autoload": {
@@ -9113,7 +9115,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.40"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.2"
             },
             "funding": [
                 {
@@ -9129,32 +9131,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-21T05:49:06+00:00"
+            "time": "2024-12-21T05:51:08+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180",
+                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9178,7 +9180,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
                 "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2"
             },
             "funding": [
                 {
@@ -9186,32 +9188,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:12:49+00:00"
+            "time": "2024-07-03T04:41:36+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "2.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
+                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
-                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
+                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9234,7 +9236,8 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
+                "security": "https://github.com/sebastianbergmann/code-unit/security/policy",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.2"
             },
             "funding": [
                 {
@@ -9242,32 +9245,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:58:43+00:00"
+            "time": "2024-12-12T09:59:06+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "3.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
+                "reference": "183a9b2632194febd219bb9246eee421dad8d45e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
-                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e",
+                "reference": "183a9b2632194febd219bb9246eee421dad8d45e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9289,7 +9292,8 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
+                "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1"
             },
             "funding": [
                 {
@@ -9297,36 +9301,39 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:59:15+00:00"
+            "time": "2024-07-03T04:45:54+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.3",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
-                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-mbstring": "*",
-                "php": ">=8.1",
-                "sebastian/diff": "^5.0",
-                "sebastian/exporter": "^5.0"
+                "php": ">=8.2",
+                "sebastian/diff": "^6.0",
+                "sebastian/exporter": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.5"
+                "phpunit/phpunit": "^11.4"
+            },
+            "suggest": {
+                "ext-bcmath": "For comparing BcMath\\Number objects"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.2-dev"
                 }
             },
             "autoload": {
@@ -9366,7 +9373,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
             },
             "funding": [
                 {
@@ -9374,33 +9381,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-18T14:56:07+00:00"
+            "time": "2025-01-06T10:28:19+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "3.2.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799"
+                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0",
+                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=8.1"
+                "nikic/php-parser": "^5.0",
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.2-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9424,7 +9431,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
                 "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1"
             },
             "funding": [
                 {
@@ -9432,33 +9439,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:37:17+00:00"
+            "time": "2024-07-03T04:49:50+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "5.1.1",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0",
-                "symfony/process": "^6.4"
+                "phpunit/phpunit": "^11.0",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9491,7 +9498,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
             },
             "funding": [
                 {
@@ -9499,27 +9506,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:15:17+00:00"
+            "time": "2024-07-03T04:53:05+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "6.1.0",
+            "version": "7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
+                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -9527,7 +9534,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.1-dev"
+                    "dev-main": "7.2-dev"
                 }
             },
             "autoload": {
@@ -9555,7 +9562,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0"
             },
             "funding": [
                 {
@@ -9563,34 +9570,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-23T08:47:14+00:00"
+            "time": "2024-07-03T04:54:44+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "5.1.2",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/3473f61172093b2da7de1fb5782e1f24cc036dc3",
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=8.1",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=8.2",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -9633,7 +9640,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
                 "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.0"
             },
             "funding": [
                 {
@@ -9641,35 +9648,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:17:12+00:00"
+            "time": "2024-12-05T09:17:50+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "6.0.2",
+            "version": "7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+                "reference": "3be331570a721f9a4b5917f4209773de17f747d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7",
+                "reference": "3be331570a721f9a4b5917f4209773de17f747d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "sebastian/object-reflector": "^3.0",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=8.2",
+                "sebastian/object-reflector": "^4.0",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -9695,7 +9702,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
                 "security": "https://github.com/sebastianbergmann/global-state/security/policy",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2"
             },
             "funding": [
                 {
@@ -9703,33 +9710,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:19:19+00:00"
+            "time": "2024-07-03T04:57:36+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "2.0.2",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a",
+                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=8.1"
+                "nikic/php-parser": "^5.0",
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9753,7 +9760,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
                 "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1"
             },
             "funding": [
                 {
@@ -9761,34 +9768,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:38:20+00:00"
+            "time": "2024-07-03T04:58:38+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "5.0.0",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
+                "reference": "f5b498e631a74204185071eb41f33f38d64608aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
-                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa",
+                "reference": "f5b498e631a74204185071eb41f33f38d64608aa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "sebastian/object-reflector": "^3.0",
-                "sebastian/recursion-context": "^5.0"
+                "php": ">=8.2",
+                "sebastian/object-reflector": "^4.0",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9810,7 +9817,8 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1"
             },
             "funding": [
                 {
@@ -9818,32 +9826,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:08:32+00:00"
+            "time": "2024-07-03T05:00:13+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "3.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
+                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
-                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9",
+                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9865,7 +9873,8 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
+                "security": "https://github.com/sebastianbergmann/object-reflector/security/policy",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1"
             },
             "funding": [
                 {
@@ -9873,32 +9882,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:06:18+00:00"
+            "time": "2024-07-03T05:01:32+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "5.0.0",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
+                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
-                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16",
+                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9928,7 +9937,8 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2"
             },
             "funding": [
                 {
@@ -9936,32 +9946,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:05:40+00:00"
+            "time": "2024-07-03T05:10:34+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "4.0.0",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
-                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9984,7 +9994,8 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
+                "security": "https://github.com/sebastianbergmann/type/security/policy",
+                "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
             },
             "funding": [
                 {
@@ -9992,29 +10003,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T07:10:45+00:00"
+            "time": "2024-09-17T13:12:04+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "4.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
-                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -10037,7 +10048,8 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
+                "security": "https://github.com/sebastianbergmann/version/security/policy",
+                "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
             },
             "funding": [
                 {
@@ -10045,7 +10057,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-07T11:34:05+00:00"
+            "time": "2024-10-09T05:16:32+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -10129,11 +10141,11 @@
         },
         {
             "name": "ssddanbrown/asserthtml",
-            "version": "v3.0.1",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://codeberg.org/danb/asserthtml",
-                "reference": "31b3035b5533ae80ab16c80d3774dd840dbfd079"
+                "reference": "cf8206171d667d43e1bdde17d67191f30e95c8a0"
             },
             "dist": {
                 "type": "zip",
@@ -10143,12 +10155,12 @@
                 "ext-dom": "*",
                 "ext-json": "*",
                 "php": ">=8.1",
-                "phpunit/phpunit": "^10.0",
-                "symfony/css-selector": "^6.0",
-                "symfony/dom-crawler": "^6.0"
+                "phpunit/phpunit": "^10.0|^11.0",
+                "symfony/css-selector": "^6.0|^7.0",
+                "symfony/dom-crawler": "^6.0|^7.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.10"
+                "phpstan/phpstan": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -10169,30 +10181,82 @@
             ],
             "description": "HTML Content Assertions for PHPUnit",
             "homepage": "https://codeberg.org/danb/asserthtml",
-            "time": "2024-12-28T15:15:02+00:00"
+            "time": "2025-01-11T13:35:55+00:00"
+        },
+        {
+            "name": "staabm/side-effects-detector",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staabm/side-effects-detector.git",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.6",
+                "phpunit/phpunit": "^9.6.21",
+                "symfony/var-dumper": "^5.4.43",
+                "tomasvotruba/type-coverage": "1.0.0",
+                "tomasvotruba/unused-public": "1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A static analysis tool to detect side effects in PHP code",
+            "keywords": [
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/staabm/side-effects-detector/issues",
+                "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/staabm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-10-20T05:08:20+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v6.4.16",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d"
+                "reference": "b176e1f1f550ef44c94eb971bf92488de08f7c6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4304e6ad5c894a9c72831ad459f627bfd35d766d",
-                "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b176e1f1f550ef44c94eb971bf92488de08f7c6b",
+                "reference": "b176e1f1f550ef44c94eb971bf92488de08f7c6b",
                 "shasum": ""
             },
             "require": {
                 "masterminds/html5": "^2.6",
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "^5.4|^6.0|^7.0"
+                "symfony/css-selector": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10220,7 +10284,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v6.4.16"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10236,7 +10300,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T15:06:22+00:00"
+            "time": "2024-11-13T16:15:23+00:00"
         },
         {
             "name": "theseer/tokenizer",

From dbda82ef9275fcb791a27cd329d8383c6a676d17 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 11 Jan 2025 15:05:10 +0000
Subject: [PATCH 435/666] Framework: Re-add updated patched symfony-mailer

https://github.com/ssddanbrown/symfony-mailer/commit/e9de8dccd76a63fc23475016e6574da6f5f12a2
---
 composer.json |   3 +-
 composer.lock | 159 ++++++++++++++++++++++++--------------------------
 2 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/composer.json b/composer.json
index 9ffded1c587..6fcf26aaadf 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
         "socialiteproviders/microsoft-azure": "^5.1",
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
-        "ssddanbrown/htmldiff": "^1.0.2"
+        "ssddanbrown/htmldiff": "^1.0.2",
+        "ssddanbrown/symfony-mailer": "7.2.x-dev"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
diff --git a/composer.lock b/composer.lock
index 5d2b38215a7..1f3808cdcb8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f8d7d0be63e355bf8d39ebf2ced165b7",
+    "content-hash": "8e9b6e95d9222289ce51646e27c1f404",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5351,6 +5351,79 @@
             ],
             "time": "2024-12-12T16:45:37+00:00"
         },
+        {
+            "name": "ssddanbrown/symfony-mailer",
+            "version": "7.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ssddanbrown/symfony-mailer.git",
+                "reference": "e9de8dccd76a63fc23475016e6574da6f5f12a2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/e9de8dccd76a63fc23475016e6574da6f5f12a2d",
+                "reference": "e9de8dccd76a63fc23475016e6574da6f5f12a2d",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
+            },
+            "replace": {
+                "symfony/mailer": "^7.0"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dan Brown",
+                    "homepage": "https://danb.me"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/ssddanbrown/symfony-mailer/tree/7.2"
+            },
+            "time": "2025-01-11T14:57:07+00:00"
+        },
         {
             "name": "symfony/clock",
             "version": "v7.2.0",
@@ -6137,86 +6210,6 @@
             ],
             "time": "2024-12-31T14:59:40+00:00"
         },
-        {
-            "name": "symfony/mailer",
-            "version": "v7.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/mailer.git",
-                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/e4d358702fb66e4c8a2af08e90e7271a62de39cc",
-                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc",
-                "shasum": ""
-            },
-            "require": {
-                "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.2",
-                "psr/event-dispatcher": "^1",
-                "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/mime": "^7.2",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<6.4",
-                "symfony/messenger": "<6.4",
-                "symfony/mime": "<6.4",
-                "symfony/twig-bridge": "<6.4"
-            },
-            "require-dev": {
-                "symfony/console": "^6.4|^7.0",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/twig-bridge": "^6.4|^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Mailer\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Helps sending emails",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-11-25T15:21:05+00:00"
-        },
         {
             "name": "symfony/mime",
             "version": "v7.2.1",
@@ -10355,7 +10348,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": {
+        "ssddanbrown/symfony-mailer": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {

From ee88832f1a468af9f930807071da3a206eeb91c8 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 13 Jan 2025 13:26:04 +0000
Subject: [PATCH 436/666] Updated translations with latest Crowdin changes
 (#5399)

---
 lang/bn/auth.php        | 18 +++++++++---------
 lang/fr/activities.php  | 12 ++++++------
 lang/fr/editor.php      |  4 ++--
 lang/fr/entities.php    | 42 ++++++++++++++++++++---------------------
 lang/fr/errors.php      | 20 ++++++++++----------
 lang/fr/settings.php    |  2 +-
 lang/fr/validation.php  |  8 ++++----
 lang/ko/activities.php  |  6 +++---
 lang/ko/common.php      | 14 +++++++-------
 lang/ko/components.php  |  2 +-
 lang/ko/entities.php    | 26 ++++++++++++-------------
 lang/ko/errors.php      |  6 +++---
 lang/ko/settings.php    | 36 +++++++++++++++++------------------
 lang/ko/validation.php  |  4 ++--
 lang/pt_BR/entities.php | 38 ++++++++++++++++++-------------------
 15 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/lang/bn/auth.php b/lang/bn/auth.php
index aca585962cc..06ed376a71a 100644
--- a/lang/bn/auth.php
+++ b/lang/bn/auth.php
@@ -14,16 +14,16 @@
     'log_in' => 'লগ ইন করুন',
     'log_in_with' => ':socialDriver দ্বারা লগইন করুন',
     'sign_up_with' => ':socialDriver দ্বারা নিবন্ধিত হোন',
-    'logout' => 'Logout',
+    'logout' => 'লগআউট',
 
-    'name' => 'Name',
-    'username' => 'Username',
-    'email' => 'Email',
-    'password' => 'Password',
-    'password_confirm' => 'Confirm Password',
-    'password_hint' => 'Must be at least 8 characters',
-    'forgot_password' => 'Forgot Password?',
-    'remember_me' => 'Remember Me',
+    'name' => 'নাম',
+    'username' => 'ব্যবহারকারী',
+    'email' => 'ই-মেইল',
+    'password' => 'পাসওয়ার্ড',
+    'password_confirm' => 'পাসওয়ার্ডের পুনরাবৃত্তি',
+    'password_hint' => 'ন্যূনতম ৮ অক্ষরের হতে হবে',
+    'forgot_password' => 'পাসওয়ার্ড ভুলে গেছেন?',
+    'remember_me' => 'লগইন স্থায়িত্ব ধরে রাখুন',
     'ldap_email_hint' => 'Please enter an email to use for this account.',
     'create_account' => 'Create Account',
     'already_have_account' => 'Already have an account?',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 871b886480c..34ec83ec34c 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook supprimé avec succès',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'import créé',
+    'import_create_notification' => 'Importation envoyée avec succès',
+    'import_run' => 'importation mise à jour',
+    'import_run_notification' => 'Contenu importé avec succès',
+    'import_delete' => 'import supprimé',
+    'import_delete_notification' => 'Importation supprimée avec succès',
 
     // Users
     'user_create' => 'utilisateur créé',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 11edae10c9b..bdef1e8b1f5 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -163,8 +163,8 @@
     'about' => 'À propos de l\'éditeur',
     'about_title' => 'À propos de l\'éditeur WYSIWYG',
     'editor_license' => 'Licence d\'éditeur et droit d\'auteur',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Cet éditeur est construit comme un fork de :lexicalLink qui est distribué sous licence MIT.',
+    'editor_lexical_license_link' => 'Vous trouverez ici tous les détails de la licence.',
     'editor_tiny_license' => 'Cet éditeur est construit en utilisant :tinyLink qui est fourni sous la licence MIT.',
     'editor_tiny_license_link' => 'Vous trouverez ici les détails sur les droits d\'auteur et les licences de TinyMCE.',
     'save_continue' => 'Enregistrer et continuer',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 6581587d4f7..2382a1d6ce2 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'Fichier PDF',
     'export_text' => 'Document texte',
     'export_md' => 'Fichiers Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Export ZIP',
     'default_template' => 'Modèle de page par défaut',
     'default_template_explain' => 'Sélectionnez un modèle de page qui sera utilisé comme contenu par défaut pour les nouvelles pages créées dans cet élément. Gardez à l\'esprit que le modèle ne sera utilisé que si le créateur de la page a accès au modèle sélectionné.',
     'default_template_select' => 'Sélectionnez un modèle de page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importation',
+    'import_validate' => 'Valider l\'import',
+    'import_desc' => 'Importez des livres, des chapitres et des pages à l\'aide d\'un export zip à partir de la même instance ou d\'une instance différente. Sélectionnez un fichier ZIP pour continuer. Une fois le fichier téléchargé et validé, vous pourrez configurer et confirmer l\'importation dans la vue suivante.',
+    'import_zip_select' => 'Sélectionnez le fichier ZIP à télécharger',
+    'import_zip_validation_errors' => 'Des erreurs ont été détectées lors de la validation du fichier ZIP fourni:',
+    'import_pending' => 'Importations en attente',
+    'import_pending_none' => 'Aucune importation n\'a été commencée.',
+    'import_continue' => 'Continuer l\'importation',
+    'import_continue_desc' => 'Examinez le contenu à importer à partir du fichier ZIP téléchargé. Lorsque vous êtes prêt, lancez l\'importation pour ajouter son contenu à ce système. Le fichier d\'importation ZIP téléchargé sera automatiquement supprimé si l\'importation est réussie.',
+    'import_details' => 'Détails de l\'importation',
+    'import_run' => 'Exécuter Importation',
+    'import_size' => ':size taille du ZIP d\'import',
+    'import_uploaded_at' => ':relativeTime téléchargé',
+    'import_uploaded_by' => 'Téléchargé par',
+    'import_location' => 'Emplacement de l\'importation',
+    'import_location_desc' => 'Sélectionnez un emplacement cible pour votre contenu importé. Vous aurez besoin des autorisations appropriées pour créer dans l\'emplacement que vous choisissez.',
+    'import_delete_confirm' => 'Êtes-vous sûr de vouloir supprimer cette importation ?',
+    'import_delete_desc' => 'Ceci supprimera le fichier ZIP importé et ne pourra pas être annulé.',
+    'import_errors' => 'Erreurs d\'importation',
+    'import_errors_desc' => 'Les erreurs suivantes se sont produites lors de la tentative d\'importation :',
 
     // Permissions and restrictions
     'permissions' => 'Autorisations',
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index d89926dac72..94d21e1dd14 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'Nous serons bientôt de retour.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Impossible de lire le fichier ZIP.',
+    'import_zip_cant_decode_data' => 'Impossible de trouver et de décoder le contenu ZIP data.json.',
+    'import_zip_no_data' => 'Les données du fichier ZIP n\'ont pas de livre, de chapitre ou de page attendus.',
+    'import_validation_failed' => 'L\'importation du ZIP n\'a pas été validée avec les erreurs :',
+    'import_zip_failed_notification' => 'Impossible d\'importer le fichier ZIP.',
+    'import_perms_books' => 'Vous n\'avez pas les permissions requises pour créer des livres.',
+    'import_perms_chapters' => 'Vous n\'avez pas les permissions requises pour créer des chapitres.',
+    'import_perms_pages' => 'Vous n\'avez pas les permissions requises pour créer des pages.',
+    'import_perms_images' => 'Vous n\'avez pas les permissions requises pour créer des images.',
+    'import_perms_attachments' => 'Vous n\'avez pas les permissions requises pour créer des pièces jointes.',
 
     // API errors
     'api_no_authorization_found' => 'Aucun jeton d\'autorisation trouvé pour la demande',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index d113e89ab7c..58bce55e06c 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -162,7 +162,7 @@
     'role_access_api' => 'Accès à l\'API du système',
     'role_manage_settings' => 'Gérer les préférences de l\'application',
     'role_export_content' => 'Exporter le contenu',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importer le contenu',
     'role_editor_change' => 'Changer l\'éditeur de page',
     'role_notifications' => 'Recevoir et gérer les notifications',
     'role_asset' => 'Permissions des ressources',
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index ed16776e72f..7db0493a165 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute a un format invalide.',
     'uploaded'             => 'Le fichier n\'a pas pu être envoyé. Le serveur peut ne pas accepter des fichiers de cette taille.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'L\'attribut :attribute doit référencer un fichier dans le ZIP.',
+    'zip_file_mime' => ':attribute doit référencer un fichier de type :validTypes, trouvé :foundType.',
+    'zip_model_expected' => 'Objet de données attendu, mais ":type" trouvé.',
+    'zip_unique' => 'L\'attribut :attribute doit être unique pour le type d\'objet dans le ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index c3f35e44375..4e733b7b582 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -50,7 +50,7 @@
     'bookshelf_delete_notification'    => '책장이 성공적으로 삭제되었습니다.',
 
     // Revisions
-    'revision_restore' => '복구된 리비전',
+    'revision_restore' => '복구된 버전',
     'revision_delete' => '버전 삭제',
     'revision_delete_notification' => '버전 삭제 성공',
 
@@ -74,13 +74,13 @@
     // Settings
     'settings_update' => '설정 변경',
     'settings_update_notification' => '설졍 변경 성공',
-    'maintenance_action_run' => '유지 관리 작업 실행',
+    'maintenance_action_run' => '유지관리 작업 실행',
 
     // Webhooks
     'webhook_create' => '웹 훅 생성',
     'webhook_create_notification' => '웹 훅 생성함',
     'webhook_update' => '웹 훅 수정하기',
-    'webhook_update_notification' => '웹훅 설정이 수정되었습니다.',
+    'webhook_update_notification' => '웹 훅 설정이 수정되었습니다.',
     'webhook_delete' => '웹 훅 지우기',
     'webhook_delete_notification' => '웹 훅 삭제함',
 
diff --git a/lang/ko/common.php b/lang/ko/common.php
index a0751d4c020..00caf4f5498 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -18,12 +18,12 @@
     // Form Labels
     'name' => '이름',
     'description' => '설명',
-    'role' => '권한',
+    'role' => '역할',
     'cover_image' => '대표 이미지',
-    'cover_image_description' => '이 이미지는 필요에 따라 다양한 시나리오에서 사용자 인터페이스에 맞게 크기가 조정되거나 잘려질 수 있기 때문에 실제 표시되는 크기가 다를 수는 있지만 대략 440x250px 이어야 합니다.',
+    'cover_image_description' => '이 이미지는 대략 440x250px가 되어야 하지만, 필요에 따라 다양한 시나리오에서 사용자 인터페이스에 맞게 유연하게 크기 조절 및 자르기가 가능하므로 실제로 표시되는 크기는 다를 수 있습니다.',
 
     // Actions
-    'actions' => '활동',
+    'actions' => '동작',
     'view' => '보기',
     'view_all' => '모두 보기',
     'new' => '신규',
@@ -35,9 +35,9 @@
     'copy' => '복사',
     'reply' => '답글',
     'delete' => '삭제',
-    'delete_confirm' => '삭제 요청 확인',
+    'delete_confirm' => '삭제',
     'search' => '검색',
-    'search_clear' => '검색 지우기',
+    'search_clear' => '검색창 비우기',
     'reset' => '리셋',
     'remove' => '제거',
     'add' => '추가',
@@ -73,8 +73,8 @@
     'toggle_details' => '내용 보기',
     'toggle_thumbnails' => '썸네일 보기',
     'details' => '정보',
-    'grid_view' => '격자 보기',
-    'list_view' => '목록 보기',
+    'grid_view' => '격자 형식으로 보기',
+    'list_view' => '리스트 형식으로 보기',
     'default' => '기본 설정',
     'breadcrumb' => '탐색 경로',
     'status' => '상태',
diff --git a/lang/ko/components.php b/lang/ko/components.php
index cbe4d44c27d..0c0bc2e65ed 100644
--- a/lang/ko/components.php
+++ b/lang/ko/components.php
@@ -23,7 +23,7 @@
     'image_load_more' => '더 보기',
     'image_image_name' => '이미지 이름',
     'image_delete_used' => '이 이미지는 다음 문서들이 쓰고 있습니다.',
-    'image_delete_confirm_text' => '이 이미지를 지울 건가요?',
+    'image_delete_confirm_text' => '이 이미지를 정말 삭제하시겠습니까?',
     'image_select_image' => '이미지 선택',
     'image_dropzone' => '여기에 이미지를 드롭하거나 여기를 클릭하세요. 이미지를 올릴 수 있습니다.',
     'image_dropzone_drop' => '업로드 할 이미지 파일을 여기에 놓으세요.',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index cfb905a8fb4..7402056efc2 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -39,22 +39,22 @@
     'export_pdf' => 'PDF 파일',
     'export_text' => '일반 텍스트 파일',
     'export_md' => '마크다운 파일',
-    'export_zip' => '압축 파일',
+    'export_zip' => '컨텐츠 ZIP 파일',
     'default_template' => '기본 페이지 템플릿',
     'default_template_explain' => '이 항목 내에서 생성되는 모든 페이지의 기본 콘텐츠로 사용할 페이지 템플릿을 지정합니다. 페이지 작성자가 선택한 템플릿 페이지를 볼 수 있는 권한이 있는 경우에만 이 항목이 사용된다는 점을 유의하세요.',
     'default_template_select' => '템플릿 페이지 선택',
-    'import' => '압축 파일 가져오기',
-    'import_validate' => '압축 파일 검증하기',
+    'import' => '컨텐츠 ZIP 파일 가져오기',
+    'import_validate' => '컨텐츠 ZIP 파일 검증하기',
     'import_desc' => '같은 인스턴스나 다른 인스턴스에서 휴대용 zip 내보내기를 사용하여 책, 장 및 페이지를 가져옵니다. 진행하려면 ZIP 파일을 선택합니다. 파일을 업로드하고 검증한 후 다음 보기에서 가져오기를 구성하고 확인할 수 있습니다.',
     'import_zip_select' => '업로드할 휴대용 압축 파일 선택',
-    'import_zip_validation_errors' => '제공된 Portable ZIP 파일을 검증하는 동안 오류가 감지되었습니다.',
-    'import_pending' => 'Portable ZIP 파일 가져오기가 일시정지 되었습니다.',
+    'import_zip_validation_errors' => '컨텐츠 ZIP 파일을 검증하는 동안 오류가 감지되었습니다.',
+    'import_pending' => '컨텐츠 ZIP 파일 가져오기가 일시정지 되었습니다.',
     'import_pending_none' => 'Portable ZIP 파일 가져오기가 시작되지 않았습니다.',
-    'import_continue' => 'Portable ZIP 가져오기 계속하기',
-    'import_continue_desc' => '업로드된 ZIP 파일에서 가져올 내용을 검토합니다. 준비가 되면 가져오기를 실행하여 이 시스템에 내용을 추가합니다. 업로드된 ZIP 가져오기 파일은 가져오기가 성공하면 자동으로 제거됩니다.',
-    'import_details' => '압축된 ZIP 파일 상세',
+    'import_continue' => '컨텐츠 ZIP 파일 가져오기가 시작되지 않았습니다.',
+    'import_continue_desc' => '업로드된 컨텐츠 ZIP 파일에서 가져올 내용을 검토합니다. 준비가 되면 가져오기를 실행하여 이 시스템에 내용을 추가합니다. 업로드된 ZIP 가져오기 파일은 가져오기가 성공하면 자동으로 제거됩니다.',
+    'import_details' => '컨텐츠 ZIP 파일 상세',
     'import_run' => '가져오기 실행',
-    'import_size' => '압축된 ZIP 파일 사이즈',
+    'import_size' => '컨텐츠 ZIP 파일 사이즈',
     'import_uploaded_at' => '업로드되었습니다. :relativeTime',
     'import_uploaded_by' => '업로드되었습니다.',
     'import_location' => '가져올 경로',
@@ -87,7 +87,7 @@
     'search_terms' => '용어 검색',
     'search_content_type' => '형식',
     'search_exact_matches' => '정확히 일치',
-    'search_tags' => '꼬리표 일치',
+    'search_tags' => '태그 검색',
     'search_options' => '선택',
     'search_viewed_by_me' => '내가 읽음',
     'search_not_viewed_by_me' => '내가 읽지 않음',
@@ -162,7 +162,7 @@
     'books_empty_create_page' => '문서 만들기',
     'books_empty_sort_current_book' => '현재 책 정렬',
     'books_empty_add_chapter' => '챕터 만들기',
-    'books_permissions_active' => '책 권한 허용함',
+    'books_permissions_active' => '책 권한 적용됨',
     'books_search_this' => '이 책에서 검색',
     'books_navigation' => '목차',
     'books_sort' => '책 내용 정렬',
@@ -332,7 +332,7 @@
     'tags_index_desc' => '태그를 시스템 내의 콘텐츠에 적용하여 유연한 형태의 분류를 적용할 수 있습니다. 태그는 키와 값을 모두 가질 수 있으며 값은 선택 사항입니다. 태그가 적용되면 태그 이름과 값을 사용하여 콘텐츠를 쿼리할 수 있습니다.',
     'tag_name' =>  '꼬리표 이름',
     'tag_value' => '리스트 값 (선택 사항)',
-    'tags_explain' => "꼬리표로 문서를 분류하세요.",
+    'tags_explain' => "문서를 더 잘 분류하려면 태그를 추가하세요.\n태그에 값을 할당하여 더욱 체계적으로 구성할 수 있습니다.",
     'tags_add' => '꼬리표 추가',
     'tags_remove' => '꼬리표 삭제',
     'tags_usages' => '모든 꼬리표',
@@ -344,7 +344,7 @@
     'tags_all_values' => '모든 값',
     'tags_view_tags' => '꼬리표 보기',
     'tags_view_existing_tags' => '사용 중인 꼬리표 보기',
-    'tags_list_empty_hint' => '꼬리표는 에디터 사이드바나 책, 챕터 또는 책꽂이 정보 편집에서 지정할 수 있습니다.',
+    'tags_list_empty_hint' => '태그는 에디터 사이드바나 책, 챕터 또는 책꽂이 정보 편집에서 지정할 수 있습니다.',
     'attachments' => '첨부 파일',
     'attachments_explain' => '파일이나 링크를 첨부하세요. 정보 탭에 나타납니다.',
     'attachments_explain_instant_save' => '여기에서 바꾼 내용은 바로 적용합니다.',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index ea1fd7d61e7..9639a503613 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -108,9 +108,9 @@
     // Import
     'import_zip_cant_read' => 'ZIP 파일을 읽을 수 없습니다.',
     'import_zip_cant_decode_data' => 'ZIP data.json 콘텐츠를 찾아서 디코딩할 수 없습니다.',
-    'import_zip_no_data' => 'ZIP 파일 데이터에는 예상되는 책, 장 또는 페이지 콘텐츠가 없습니다.',
-    'import_validation_failed' => 'ZIP 파일을 가져오려다 실패했습니다. 이유:',
-    'import_zip_failed_notification' => 'ZIP 파일을 가져오지 못했습니다.',
+    'import_zip_no_data' => '컨텐츠 ZIP 파일 데이터에 데이터가 비어있습니다.',
+    'import_validation_failed' => '컨텐츠 ZIP 파일을 가져오려다 실패했습니다. 이유:',
+    'import_zip_failed_notification' => '컨텐츠 ZIP 파일을 가져오지 못했습니다.',
     'import_perms_books' => '책을 만드는 데 필요한 권한이 없습니다.',
     'import_perms_chapters' => '챕터를 만드는 데 필요한 권한이 없습니다.',
     'import_perms_pages' => '페이지를 만드는 데 필요한 권한이 없습니다.',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index c2f8fd780c6..169f7970fde 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -69,8 +69,8 @@
     'reg_enable_external_warning' => '외부 시스템이 LDAP나 SAML 인증이 활성화되어 있다면 설정과 관계없이 인증을 성공할 때 없는 계정을 만듭니다.',
     'reg_email_confirmation' => '메일 주소 확인',
     'reg_email_confirmation_toggle' => '메일 주소 확인',
-    'reg_confirm_email_desc' => '도메인 차단을 활성화하면 설정과 관계없이 메일 주소 확인이 필요합니다.',
-    'reg_confirm_restrict_domain' => '도메인 차단',
+    'reg_confirm_email_desc' => '도메인 제한을 활성화하면 설정과 관계없이 메일 주소 확인이 필요합니다.',
+    'reg_confirm_restrict_domain' => '도메인 제한',
     'reg_confirm_restrict_domain_desc' => '가입을 차단할 도메인을 쉼표로 구분하여 입력하세요. 사용자가 메일 주소 확인에 성공하면 메일 주소를 바꿀 수 있습니다.',
     'reg_confirm_restrict_domain_placeholder' => '차단한 도메인 없음',
 
@@ -80,13 +80,13 @@
     'maint_image_cleanup_desc' => '중복인 이미지를 찾습니다. 실행하기 전에 이미지를 백업하세요.',
     'maint_delete_images_only_in_revisions' => '지난 버전에만 있는 이미지 지우기',
     'maint_image_cleanup_run' => '실행',
-    'maint_image_cleanup_warning' => '이미지 :count개를 지울 건가요?',
+    'maint_image_cleanup_warning' => '이미지 :count개를 지우시겠습니까?',
     'maint_image_cleanup_success' => '이미지 :count개 삭제함',
     'maint_image_cleanup_nothing_found' => '삭제한 것 없음',
     'maint_send_test_email' => '테스트 메일 보내기',
     'maint_send_test_email_desc' => '메일 주소로 테스트 메일을 전송합니다.',
     'maint_send_test_email_run' => '테스트 메일 보내기',
-    'maint_send_test_email_success' => ':address로 보냈습니다.',
+    'maint_send_test_email_success' => ':address 계정으로 이메일을 보냈습니다.',
     'maint_send_test_email_mail_subject' => '테스트 메일',
     'maint_send_test_email_mail_greeting' => '메일을 수신했습니다.',
     'maint_send_test_email_mail_text' => '메일을 정상적으로 수신했습니다.',
@@ -108,7 +108,7 @@
     'recycle_bin_restore' => '복원',
     'recycle_bin_contents_empty' => '휴지통이 비었습니다.',
     'recycle_bin_empty' => '비우기',
-    'recycle_bin_empty_confirm' => '휴지통을 비울 건가요?',
+    'recycle_bin_empty_confirm' => '이렇게 하면 각 항목에 포함된 콘텐츠를 포함하여 휴지통에 있는 모든 항목이 영구적으로 삭제됩니다. 휴지통을 비우시겠습니까?',
     'recycle_bin_destroy_confirm' => '이 작업을 수행하면 이 항목이 아래에 나열된 모든 하위 요소와 함께 시스템에서 영구적으로 삭제되며, 복원할 수 없습니다. 이 항목을 영구 삭제하시겠어요?',
     'recycle_bin_destroy_list' => '영구 삭제함',
     'recycle_bin_restore_list' => '복원함',
@@ -119,8 +119,8 @@
     'recycle_bin_restore_notification' => ':count항목 복원함',
 
     // Audit Log
-    'audit' => '추적 기록',
-    'audit_desc' => '시스템에서 추적한 작업입니다. 권한 필터가 작동하지 않습니다.',
+    'audit' => '활동 기록',
+    'audit_desc' => '이 활동 로그는 시스템에서 추적된 활동 목록을 표시합니다. 이 목록은 권한 필터가 적용되는 시스템의 유사한 활동 목록과 달리 필터링되지 않습니다.',
     'audit_event_filter' => '이벤트 필터',
     'audit_event_filter_no_filter' => '필터 없음',
     'audit_deleted_item' => '삭제한 항목',
@@ -134,8 +134,8 @@
     'audit_date_to' => 'To',
 
     // Role Settings
-    'roles' => '권한',
-    'role_user_roles' => '사용자 권한',
+    'roles' => '역할',
+    'role_user_roles' => '사용자 역할',
     'roles_index_desc' => '역할은 사용자를 그룹화하고 구성원에게 시스템 권한을 제공하기 위해 사용됩니다. 사용자가 여러 역할의 구성원인 경우 부여된 권한이 중첩되며 모든 권한을 상속받게 됩니다.',
     'roles_x_users_assigned' => ':count 명의 사용자가 할당됨|:count 명의 사용자가 할당됨',
     'roles_x_permissions_provided' => ':count 개의 권한|:count 개의 권한',
@@ -147,10 +147,10 @@
     'role_delete_users_assigned' => '이 권한을 가진 사용자 :userCount명에 할당할 권한을 고르세요.',
     'role_delete_no_migration' => "할당하지 않음",
     'role_delete_sure' => '이 권한을 지울 건가요?',
-    'role_edit' => '권한 수정',
-    'role_details' => '권한 정보',
-    'role_name' => '권한 이름',
-    'role_desc' => '설명',
+    'role_edit' => '역할 수정',
+    'role_details' => '역할 정보',
+    'role_name' => '역할 이름',
+    'role_desc' => '역할 설명',
     'role_mfa_enforced' => '다중 인증 필요',
     'role_external_auth_id' => '외부 인증 계정',
     'role_system' => '시스템 권한',
@@ -168,14 +168,14 @@
     'role_asset' => '권한 항목',
     'roles_system_warning' => '위 세 권한은 자신의 권한이나 다른 유저의 권한을 바꿀 수 있습니다.',
     'role_asset_desc' => '책, 챕터, 문서별 권한은 이 설정에 우선합니다.',
-    'role_asset_admins' => 'Admin 권한은 어디든 접근할 수 있지만 이 설정은 사용자 인터페이스에서 해당 활동을 표시할지 결정합니다.',
+    'role_asset_admins' => '관리자 권한은 어디든 접근할 수 있지만 이 설정은 사용자 인터페이스에서 해당 활동을 표시할지 결정합니다.',
     'role_asset_image_view_note' => '이는 이미지 관리자 내 가시성과 관련이 있습니다. 업로드된 이미지 파일의 실제 접근은 시스템의 이미지 저장 설정에 따라 달라집니다.',
     'role_all' => '모든 항목',
     'role_own' => '직접 만든 항목',
     'role_controlled_by_asset' => '저마다 다름',
     'role_save' => '저장',
-    'role_users' => '이 권한을 가진 사용자들',
-    'role_users_none' => '그런 사용자가 없습니다.',
+    'role_users' => '이 역할을 가진 사용자들',
+    'role_users_none' => '역할이 부여된 사용자가 없습니다.',
 
     // Users
     'users' => '사용자',
@@ -200,7 +200,7 @@
     'users_delete' => '사용자 삭제',
     'users_delete_named' => ':userName 삭제',
     'users_delete_warning' => ':userName에 관한 데이터를 지웁니다.',
-    'users_delete_confirm' => '이 사용자를 지울 건가요?',
+    'users_delete_confirm' => '이 사용자를 삭제하시겠습니까?',
     'users_migrate_ownership' => '소유자 바꾸기',
     'users_migrate_ownership_desc' => '선택한 사용자가 소유하고 있는 모든 항목을 다른 유저가 소유하게 합니다.',
     'users_none_selected' => '선택한 유저 없음',
@@ -246,7 +246,7 @@
     'user_api_token_updated' => ':timeAgo 전에 토큰 갱신함',
     'user_api_token_delete' => '토큰 삭제',
     'user_api_token_delete_warning' => '\':tokenName\'을 시스템에서 삭제합니다.',
-    'user_api_token_delete_confirm' => '이 API 토큰을 지울 건가요?',
+    'user_api_token_delete_confirm' => '이 API 토큰을 삭제하시겠습니까?',
 
     // Webhooks
     'webhooks' => '웹 훅',
diff --git a/lang/ko/validation.php b/lang/ko/validation.php
index df766740342..ef7361ff9ac 100644
--- a/lang/ko/validation.php
+++ b/lang/ko/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute(은)는 유효하지 않은 형식입니다.',
     'uploaded'             => '파일 크기가 서버에서 허용하는 수치를 넘습니다.',
 
-    'zip_file' => ':attribute은(는) ZIP 파일 내의 파일을 참조해야 합니다.',
+    'zip_file' => ':attribute은(는) 컨텐츠 ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
     'zip_file_mime' => ':attribute은(는)  :validTypes, found :foundType 유형의 파일을 참조해야 합니다.',
     'zip_model_expected' => '데이터 객체가 필요하지만 ":type" 타입이 발견되었습니다.',
-    'zip_unique' => ':attribute은(는)  ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
+    'zip_unique' => ':attribute은(는) 컨텐츠 ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index fe73c35b810..f947b304087 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -87,7 +87,7 @@
     'search_terms' => 'Termos da pesquisa',
     'search_content_type' => 'Categoria de conteúdo',
     'search_exact_matches' => 'Correspondências exatas',
-    'search_tags' => 'Etiqueta de buscas',
+    'search_tags' => 'Pesquisar marcadores',
     'search_options' => 'Opções',
     'search_viewed_by_me' => 'Visto por mim',
     'search_not_viewed_by_me' => 'Não visto por mim',
@@ -255,7 +255,7 @@
     'pages_editor_switch_consider_following' => 'Considere o seguinte ao alterar editores:',
     'pages_editor_switch_consideration_a' => 'Uma vez salva, a nova opção do editor será usada por quaisquer editores futuros, incluindo aqueles que podem não ser capazes de mudar o tipo do editor.',
     'pages_editor_switch_consideration_b' => 'Isso pode levar a uma perda de detalhes e sintaxe em certas circunstâncias.',
-    'pages_editor_switch_consideration_c' => 'Etiqueta ou alterações no log de mudanças, feitas desde o último salvamento, não persistem nesta alteração.',
+    'pages_editor_switch_consideration_c' => 'Marcadores ou alterações no log de mudanças, feitas desde o último salvamento, não persistem nesta alteração.',
     'pages_save' => 'Salvar Página',
     'pages_title' => 'Título da Página',
     'pages_name' => 'Nome da Página',
@@ -299,9 +299,9 @@
     'pages_pointer_enter_mode' => 'Entrar em modo de seleção de seção',
     'pages_pointer_label' => 'Opções de Seção de Página',
     'pages_pointer_permalink' => 'Seção de Página Permalink',
-    'pages_pointer_include_tag' => 'Seção de Página Incluir Tag',
-    'pages_pointer_toggle_link' => 'Modo permalink, pressione para mostrar a tag incluída',
-    'pages_pointer_toggle_include' => 'Incluir o modo tag, pressione para mostrar permalink',
+    'pages_pointer_include_tag' => 'Marcador de inclusão de seção de página',
+    'pages_pointer_toggle_link' => 'Modo permalink, pressione para mostrar a marcação incluída',
+    'pages_pointer_toggle_include' => 'Incluir o modo de marcação, pressione para mostrar o permalink',
     'pages_permissions_active' => 'Permissões de Página Ativas',
     'pages_initial_revision' => 'Publicação Inicial',
     'pages_references_update_revision' => 'Atualização automática do sistema de links internos',
@@ -323,18 +323,18 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '',
-    'page_tags' => 'Tags de Página',
-    'chapter_tags' => 'Tags de Capítulo',
-    'book_tags' => 'Tags de Livro',
-    'shelf_tags' => 'Tags de Prateleira',
-    'tag' => 'Tag',
-    'tags' =>  'Tags',
-    'tags_index_desc' => 'As tags podem ser aplicadas ao conteúdo dentro do sistema para aplicar uma forma flexível de categorização. As tags podem ter uma chave e um valor, sendo o valor opcional. Depois de aplicado, o conteúdo pode ser consultado usando o nome e o valor da tag.',
-    'tag_name' =>  'Nome da Tag',
-    'tag_value' => 'Valor da Tag (Opcional)',
-    'tags_explain' => "Adicione algumas tags para melhor categorizar seu conteúdo. \n Você pode atribuir valores às tags para uma organização mais complexa.",
-    'tags_add' => 'Adicionar outra tag',
-    'tags_remove' => 'Remover essa tag',
+    'page_tags' => 'Marcadores de Página',
+    'chapter_tags' => 'Marcadores de Capítulo',
+    'book_tags' => 'Marcadores de Livro',
+    'shelf_tags' => 'Marcadores de Estante',
+    'tag' => 'Marcador',
+    'tags' =>  'Marcadores',
+    'tags_index_desc' => 'Os marcadores podem ser aplicadas ao conteúdo dentro do sistema para aplicar uma forma flexível de categorização. Os marcadores podem ter uma chave e um valor, sendo o valor opcional. Depois de aplicado, o conteúdo pode ser consultado usando o nome e o valor do marcador.',
+    'tag_name' =>  'Nome do marcador',
+    'tag_value' => 'Valor do marcador (Opcional)',
+    'tags_explain' => "Adicione alguns marcadores para melhor categorizar seu conteúdo. \n Você pode atribuir valores aos marcadores para uma organização mais complexa.",
+    'tags_add' => 'Adicionar outro marcador',
+    'tags_remove' => 'Remover esse marcador',
     'tags_usages' => 'Total de marcadores usados',
     'tags_assigned_pages' => 'Atribuído às páginas',
     'tags_assigned_chapters' => 'Atribuído aos Capítulos',
@@ -343,8 +343,8 @@
     'tags_x_unique_values' => ':count valores únicos',
     'tags_all_values' => 'Todos os valores',
     'tags_view_tags' => 'Ver Marcadores',
-    'tags_view_existing_tags' => 'Ver tags existentes',
-    'tags_list_empty_hint' => 'As tags podem ser atribuídas através da barra lateral do editor de página ou ao editar os detalhes de um livro, capítulo ou prateleira.',
+    'tags_view_existing_tags' => 'Ver marcadores existentes',
+    'tags_list_empty_hint' => 'Os marcadores podem ser atribuídos através da barra lateral do editor de página ou ao editar os detalhes de um livro, capítulo ou prateleira.',
     'attachments' => 'Anexos',
     'attachments_explain' => 'Faça o upload de alguns arquivos ou anexe links para serem exibidos na sua página. Eles estarão visíveis na barra lateral à direita.',
     'attachments_explain_instant_save' => 'Mudanças são salvas instantaneamente.',

From 593645acfe8521db97d7469c92546c8529703969 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 13 Jan 2025 14:30:53 +0000
Subject: [PATCH 437/666] Themes: Added route to serve public theme files

Allows files to be placed within a "public" folder within a theme
directory which the contents of will served by BookStack for access.

- Only "web safe" content-types are provided.
- A static 1 day cache time it set on served files.

For #3904
---
 app/App/helpers.php                           |  4 +--
 .../Controllers/BookExportController.php      |  2 +-
 .../Controllers/ChapterExportController.php   |  2 +-
 .../Controllers/PageExportController.php      |  2 +-
 app/Http/DownloadResponseFactory.php          | 19 +++++++++++-
 .../Middleware/PreventResponseCaching.php     | 14 +++++++++
 app/Theming/ThemeController.php               | 31 +++++++++++++++++++
 app/Theming/ThemeService.php                  |  9 ++++++
 app/Uploads/FileStorage.php                   |  9 +++---
 app/Uploads/ImageStorageDisk.php              |  9 +++---
 app/Util/FilePathNormalizer.php               | 17 ++++++++++
 routes/web.php                                |  8 ++++-
 12 files changed, 111 insertions(+), 15 deletions(-)
 create mode 100644 app/Theming/ThemeController.php
 create mode 100644 app/Util/FilePathNormalizer.php

diff --git a/app/App/helpers.php b/app/App/helpers.php
index af6dbcfc397..941c267d6cd 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use BookStack\App\Model;
+use BookStack\Facades\Theme;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\User;
@@ -88,8 +89,7 @@ function setting(string $key = null, $default = null)
  */
 function theme_path(string $path = ''): ?string
 {
-    $theme = config('view.theme');
-
+    $theme = Theme::getTheme();
     if (!$theme) {
         return null;
     }
diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index b6b1006bd61..67247598c31 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -76,6 +76,6 @@ public function zip(string $bookSlug, ZipExportBuilder $builder)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $bookSlug . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $bookSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index de2385bb11f..8490243439a 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -82,6 +82,6 @@ public function zip(string $bookSlug, string $chapterSlug, ZipExportBuilder $bui
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapterSlug . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $chapterSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index d7145411eaa..145dce9dd0f 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -86,6 +86,6 @@ public function zip(string $bookSlug, string $pageSlug, ZipExportBuilder $builde
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', true);
     }
 }
diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index d06e2bac44d..01b3502d4b1 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -39,8 +39,9 @@ public function streamedDirectly($stream, string $fileName, int $fileSize): Stre
      * Create a response that downloads the given file via a stream.
      * Has the option to delete the provided file once the stream is closed.
      */
-    public function streamedFileDirectly(string $filePath, string $fileName, int $fileSize, bool $deleteAfter = false): StreamedResponse
+    public function streamedFileDirectly(string $filePath, string $fileName, bool $deleteAfter = false): StreamedResponse
     {
+        $fileSize = filesize($filePath);
         $stream = fopen($filePath, 'r');
 
         if ($deleteAfter) {
@@ -79,6 +80,22 @@ public function streamedInline($stream, string $fileName, int $fileSize): Stream
         );
     }
 
+    /**
+     * Create a response that provides the given file via a stream with detected content-type.
+     * Has the option to delete the provided file once the stream is closed.
+     */
+    public function streamedFileInline(string $filePath, ?string $fileName = null): StreamedResponse
+    {
+        $fileSize = filesize($filePath);
+        $stream = fopen($filePath, 'r');
+
+        if ($fileName === null) {
+            $fileName = basename($filePath);
+        }
+
+        return $this->streamedInline($stream, $fileName, $fileSize);
+    }
+
     /**
      * Get the common headers to provide for a download response.
      */
diff --git a/app/Http/Middleware/PreventResponseCaching.php b/app/Http/Middleware/PreventResponseCaching.php
index c763b5fc1bb..a40150444b5 100644
--- a/app/Http/Middleware/PreventResponseCaching.php
+++ b/app/Http/Middleware/PreventResponseCaching.php
@@ -7,6 +7,13 @@
 
 class PreventResponseCaching
 {
+    /**
+     * Paths to ignore when preventing response caching.
+     */
+    protected array $ignoredPathPrefixes = [
+        'theme/',
+    ];
+
     /**
      * Handle an incoming request.
      *
@@ -20,6 +27,13 @@ public function handle($request, Closure $next)
         /** @var Response $response */
         $response = $next($request);
 
+        $path = $request->path();
+        foreach ($this->ignoredPathPrefixes as $ignoredPath) {
+            if (str_starts_with($path, $ignoredPath)) {
+                return $response;
+            }
+        }
+
         $response->headers->set('Cache-Control', 'no-cache, no-store, private');
         $response->headers->set('Expires', 'Sun, 12 Jul 2015 19:01:00 GMT');
 
diff --git a/app/Theming/ThemeController.php b/app/Theming/ThemeController.php
new file mode 100644
index 00000000000..1eecc697428
--- /dev/null
+++ b/app/Theming/ThemeController.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace BookStack\Theming;
+
+use BookStack\Facades\Theme;
+use BookStack\Http\Controller;
+use BookStack\Util\FilePathNormalizer;
+
+class ThemeController extends Controller
+{
+    /**
+     * Serve a public file from the configured theme.
+     */
+    public function publicFile(string $theme, string $path)
+    {
+        $cleanPath = FilePathNormalizer::normalize($path);
+        if ($theme !== Theme::getTheme() || !$cleanPath) {
+            abort(404);
+        }
+
+        $filePath = theme_path("public/{$cleanPath}");
+        if (!file_exists($filePath)) {
+            abort(404);
+        }
+
+        $response = $this->download()->streamedFileInline($filePath);
+        $response->setMaxAge(86400);
+
+        return $response;
+    }
+}
diff --git a/app/Theming/ThemeService.php b/app/Theming/ThemeService.php
index 94e4712176b..639854d6ad1 100644
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@ -15,6 +15,15 @@ class ThemeService
      */
     protected array $listeners = [];
 
+    /**
+     * Get the currently configured theme.
+     * Returns an empty string if not configured.
+     */
+    public function getTheme(): string
+    {
+        return config('view.theme') ?? '';
+    }
+
     /**
      * Listen to a given custom theme event,
      * setting up the action to be ran when the event occurs.
diff --git a/app/Uploads/FileStorage.php b/app/Uploads/FileStorage.php
index 6e4a210a162..70040725a3d 100644
--- a/app/Uploads/FileStorage.php
+++ b/app/Uploads/FileStorage.php
@@ -3,12 +3,12 @@
 namespace BookStack\Uploads;
 
 use BookStack\Exceptions\FileUploadException;
+use BookStack\Util\FilePathNormalizer;
 use Exception;
 use Illuminate\Contracts\Filesystem\Filesystem as Storage;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
-use League\Flysystem\WhitespacePathNormalizer;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class FileStorage
@@ -120,12 +120,13 @@ protected function getStorageDiskName(): string
      */
     protected function adjustPathForStorageDisk(string $path): string
     {
-        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/files/', '', $path));
+        $trimmed = str_replace('uploads/files/', '', $path);
+        $normalized = FilePathNormalizer::normalize($trimmed);
 
         if ($this->getStorageDiskName() === 'local_secure_attachments') {
-            return $path;
+            return $normalized;
         }
 
-        return 'uploads/files/' . $path;
+        return 'uploads/files/' . $normalized;
     }
 }
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index 8df702e0d94..da8bacb3447 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Uploads;
 
+use BookStack\Util\FilePathNormalizer;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Filesystem\FilesystemAdapter;
-use League\Flysystem\WhitespacePathNormalizer;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ImageStorageDisk
@@ -30,13 +30,14 @@ public function usingSecureImages(): bool
      */
     protected function adjustPathForDisk(string $path): string
     {
-        $path = (new WhitespacePathNormalizer())->normalizePath(str_replace('uploads/images/', '', $path));
+        $trimmed = str_replace('uploads/images/', '', $path);
+        $normalized = FilePathNormalizer::normalize($trimmed);
 
         if ($this->usingSecureImages()) {
-            return $path;
+            return $normalized;
         }
 
-        return 'uploads/images/' . $path;
+        return 'uploads/images/' . $normalized;
     }
 
     /**
diff --git a/app/Util/FilePathNormalizer.php b/app/Util/FilePathNormalizer.php
new file mode 100644
index 00000000000..d55fb74f879
--- /dev/null
+++ b/app/Util/FilePathNormalizer.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace BookStack\Util;
+
+use League\Flysystem\WhitespacePathNormalizer;
+
+/**
+ * Utility to normalize (potentially) user provided file paths
+ * to avoid things like directory traversal.
+ */
+class FilePathNormalizer
+{
+    public static function normalize(string $path): string
+    {
+        return (new WhitespacePathNormalizer())->normalizePath($path);
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index 318147ef518..5bb9622e737 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,12 +13,14 @@
 use BookStack\References\ReferenceController;
 use BookStack\Search\SearchController;
 use BookStack\Settings as SettingControllers;
+use BookStack\Theming\ThemeController;
 use BookStack\Uploads\Controllers as UploadControllers;
 use BookStack\Users\Controllers as UserControllers;
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 
+// Status & Meta routes
 Route::get('/status', [SettingControllers\StatusController::class, 'show']);
 Route::get('/robots.txt', [MetaController::class, 'robots']);
 Route::get('/favicon.ico', [MetaController::class, 'favicon']);
@@ -360,8 +362,12 @@
 Route::get('/password/reset/{token}', [AccessControllers\ResetPasswordController::class, 'showResetForm']);
 Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset'])->middleware('throttle:public');
 
-// Metadata routes
+// Help & Info routes
 Route::view('/help/tinymce', 'help.tinymce');
 Route::view('/help/wysiwyg', 'help.wysiwyg');
 
+// Theme Routes
+Route::get('/theme/{theme}/{path}', [ThemeController::class, 'publicFile'])
+    ->where('path', '.*$');
+
 Route::fallback([MetaController::class, 'notFound'])->name('fallback');

From 481580be172a4813ee98ad1b945d12d731e71cdb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 13 Jan 2025 16:51:07 +0000
Subject: [PATCH 438/666] Themes: Added testing and better mime sniffing for
 public serving

Existing mime sniffer wasn't great at distinguishing between plaintext
file types, so added a custom extension based mapping for common web
formats that may be expected to be used with this.
---
 app/Http/DownloadResponseFactory.php |  2 +-
 app/Http/RangeSupportedStream.php    |  4 ++--
 app/Util/WebSafeMimeSniffer.php      | 16 ++++++++++++++--
 tests/ThemeTest.php                  | 28 ++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index 01b3502d4b1..8384484ad62 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -70,7 +70,7 @@ public function streamedFileDirectly(string $filePath, string $fileName, bool $d
     public function streamedInline($stream, string $fileName, int $fileSize): StreamedResponse
     {
         $rangeStream = new RangeSupportedStream($stream, $fileSize, $this->request);
-        $mime = $rangeStream->sniffMime();
+        $mime = $rangeStream->sniffMime(pathinfo($fileName, PATHINFO_EXTENSION));
         $headers = array_merge($this->getHeaders($fileName, $fileSize, $mime), $rangeStream->getResponseHeaders());
 
         return response()->stream(
diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
index fce1e9acce3..c4b00778939 100644
--- a/app/Http/RangeSupportedStream.php
+++ b/app/Http/RangeSupportedStream.php
@@ -32,12 +32,12 @@ public function __construct(
     /**
      * Sniff a mime type from the stream.
      */
-    public function sniffMime(): string
+    public function sniffMime(string $extension = ''): string
     {
         $offset = min(2000, $this->fileSize);
         $this->sniffContent = fread($this->stream, $offset);
 
-        return (new WebSafeMimeSniffer())->sniff($this->sniffContent);
+        return (new WebSafeMimeSniffer())->sniff($this->sniffContent, $extension);
     }
 
     /**
diff --git a/app/Util/WebSafeMimeSniffer.php b/app/Util/WebSafeMimeSniffer.php
index b182d8ac19b..4a82de85d25 100644
--- a/app/Util/WebSafeMimeSniffer.php
+++ b/app/Util/WebSafeMimeSniffer.php
@@ -13,7 +13,7 @@ class WebSafeMimeSniffer
     /**
      * @var string[]
      */
-    protected $safeMimes = [
+    protected array $safeMimes = [
         'application/json',
         'application/octet-stream',
         'application/pdf',
@@ -48,16 +48,28 @@ class WebSafeMimeSniffer
         'video/av1',
     ];
 
+    protected array $textTypesByExtension = [
+        'css' => 'text/css',
+        'js' => 'text/javascript',
+        'json' => 'application/json',
+        'csv' => 'text/csv',
+    ];
+
     /**
      * Sniff the mime-type from the given file content while running the result
      * through an allow-list to ensure a web-safe result.
      * Takes the content as a reference since the value may be quite large.
+     * Accepts an optional $extension which can be used for further guessing.
      */
-    public function sniff(string &$content): string
+    public function sniff(string &$content, string $extension = ''): string
     {
         $fInfo = new finfo(FILEINFO_MIME_TYPE);
         $mime = $fInfo->buffer($content) ?: 'application/octet-stream';
 
+        if ($mime === 'text/plain' && $extension) {
+            $mime = $this->textTypesByExtension[$extension] ?? 'text/plain';
+        }
+
         if (in_array($mime, $this->safeMimes)) {
             return $mime;
         }
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 837b94eee72..b3c85d8f724 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -464,6 +464,34 @@ public function test_custom_settings_category_page_can_be_added_via_view_file()
         });
     }
 
+    public function test_public_folder_contents_accessible_via_route()
+    {
+        $this->usingThemeFolder(function (string $themeFolderName) {
+            $publicDir = theme_path('public');
+            mkdir($publicDir, 0777, true);
+
+            $text = 'some-text ' . md5(random_bytes(5));
+            $css = "body { background-color: tomato !important; }";
+            file_put_contents("{$publicDir}/file.txt", $text);
+            file_put_contents("{$publicDir}/file.css", $css);
+            copy($this->files->testFilePath('test-image.png'), "{$publicDir}/image.png");
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.txt");
+            $resp->assertStreamedContent($text);
+            $resp->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/image.png");
+            $resp->assertHeader('Content-Type', 'image/png');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.css");
+            $resp->assertStreamedContent($css);
+            $resp->assertHeader('Content-Type', 'text/css; charset=UTF-8');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+        });
+    }
+
     protected function usingThemeFolder(callable $callback)
     {
         // Create a folder and configure a theme

From 25c4f4b02ba06f66f5239de48ae005f895146f8d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 14 Jan 2025 14:53:10 +0000
Subject: [PATCH 439/666] Themes: Documented public file serving

---
 dev/docs/logical-theme-system.md |  4 +++-
 dev/docs/visual-theme-system.md  | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dev/docs/logical-theme-system.md b/dev/docs/logical-theme-system.md
index 139055b3db2..84bd26a5387 100644
--- a/dev/docs/logical-theme-system.md
+++ b/dev/docs/logical-theme-system.md
@@ -2,7 +2,9 @@
 
 BookStack allows logical customization via the theme system which enables you to add, or extend, functionality within the PHP side of the system without needing to alter the core application files.
 
-WARNING: This system is currently in alpha so may incur changes. Once we've gathered some feedback on usage we'll look to removing this warning. This system will be considered semi-stable in the future. The `Theme::` system will be kept maintained but specific customizations or deeper app/framework usage using this system will not be supported nor considered in any way stable. Customizations using this system should be checked after updates.
+This is part of the theme system alongside the [visual theme system](./visual-theme-system.md).
+
+**Note:** This system is considered semi-stable. The `Theme::` system is kept maintained but specific customizations or deeper app/framework usage using this system will not be supported nor considered in any way stable. Customizations using this system should be checked after updates.
 
 ## Getting Started
 
diff --git a/dev/docs/visual-theme-system.md b/dev/docs/visual-theme-system.md
index 6e7105a9ed0..8a76ddb00e0 100644
--- a/dev/docs/visual-theme-system.md
+++ b/dev/docs/visual-theme-system.md
@@ -2,7 +2,9 @@
 
 BookStack allows visual customization via the theme system which enables you to extensively customize views, translation text & icons.
 
-This theme system itself is maintained and supported but usages of this system, including the files you are able to override, are not considered stable and may change upon any update. You should test any customizations made after updates.
+This is part of the theme system alongside the [logical theme system](./logical-theme-system.md).
+
+**Note:** This theme system itself is maintained and supported but usages of this system, including the files you are able to override, are not considered stable and may change upon any update. You should test any customizations made after updates.
 
 ## Getting Started
 
@@ -32,3 +34,24 @@ return [
     'search' => 'find',
 ];
 ```
+
+## Publicly Accessible Files
+
+As part of deeper customizations you may want to expose additional files 
+(images, scripts, styles, etc...) as part of your theme, in a way so they're
+accessible in public web-space to browsers.
+
+To achieve this, you can put files within a `themes/<theme_name>/public` folder.
+BookStack will serve any files within this folder from a `/theme/<theme_name>` base path.
+
+As an example, if I had an image located at `themes/custom/public/cat.jpg`, I could access
+that image via the URL path `/theme/custom/cat.jpg`. That's assuming that `custom` is the currently
+configured application theme.
+
+There are some considerations to these publicly served files:
+
+- Only a predetermined range "web safe" content-types are currently served.
+  - This limits running into potential insecure scenarios in serving problematic file types.
+- A static 1-day cache time it set on files served from this folder.
+  - You can use alternative cache-breaking techniques (change of query string) upon changes if needed. 
+  - If required, you could likely override caching at the webserver level.  

From 0d1a237f8150ed103349ce0485472fb247c3251e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 15 Jan 2025 14:15:58 +0000
Subject: [PATCH 440/666] Lexical: Fixed auto-link issue

Added extra test helper to check the editor state directly via string
notation access rather than juggling types/objects to access deep
properties.
---
 .../lexical/core/__tests__/utils/index.ts     |  29 ++++-
 .../services/__tests__/auto-links.test.ts     | 121 ++++++++----------
 resources/js/wysiwyg/services/auto-links.ts   |   2 +-
 resources/js/wysiwyg/todo.md                  |   6 +-
 4 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index b13bba6977e..d54a64ce89a 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -37,8 +37,6 @@ import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {EditorUiContext} from "../../../../ui/framework/core";
 import {EditorUIManager} from "../../../../ui/framework/manager";
-import {turtle} from "@codemirror/legacy-modes/mode/turtle";
-
 
 type TestEnv = {
   readonly container: HTMLDivElement;
@@ -47,6 +45,9 @@ type TestEnv = {
   readonly innerHTML: string;
 };
 
+/**
+ * @deprecated - Consider using `createTestContext` instead within the test case.
+ */
 export function initializeUnitTest(
   runTests: (testEnv: TestEnv) => void,
   editorConfig: CreateEditorArgs = {namespace: 'test', theme: {}},
@@ -795,6 +796,30 @@ export function expectNodeShapeToMatch(editor: LexicalEditor, expected: nodeShap
   expect(shape.children).toMatchObject(expected);
 }
 
+/**
+ * Expect a given prop within the JSON editor state structure to be the given value.
+ * Uses dot notation for the provided `propPath`. Example:
+ * 0.5.cat => First child, Sixth child, cat property
+ */
+export function expectEditorStateJSONPropToEqual(editor: LexicalEditor, propPath: string, expected: any) {
+  let currentItem: any = editor.getEditorState().toJSON().root;
+  let currentPath = [];
+  const pathParts = propPath.split('.');
+
+  for (const part of pathParts) {
+    currentPath.push(part);
+    const childAccess = Number.isInteger(Number(part)) && Array.isArray(currentItem.children);
+    const target = childAccess ? currentItem.children : currentItem;
+
+    if (typeof target[part] === 'undefined') {
+      throw new Error(`Could not resolve editor state at path ${currentPath.join('.')}`)
+    }
+    currentItem = target[part];
+  }
+
+  expect(currentItem).toBe(expected);
+}
+
 function formatHtml(s: string): string {
   return s.replace(/>\s+</g, '><').replace(/\s*\n\s*/g, ' ').trim();
 }
diff --git a/resources/js/wysiwyg/services/__tests__/auto-links.test.ts b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
index 30dc925659e..add61c495a2 100644
--- a/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/auto-links.test.ts
@@ -1,91 +1,76 @@
-import {initializeUnitTest} from "lexical/__tests__/utils";
-import {SerializedLinkNode} from "@lexical/link";
+import {
+    createTestContext,
+    dispatchKeydownEventForNode, expectEditorStateJSONPropToEqual,
+    expectNodeShapeToMatch
+} from "lexical/__tests__/utils";
 import {
     $getRoot,
     ParagraphNode,
-    SerializedParagraphNode,
-    SerializedTextNode,
     TextNode
 } from "lexical";
 import {registerAutoLinks} from "../auto-links";
 
 describe('Auto-link service tests', () => {
-    initializeUnitTest((testEnv) => {
-
-        test('space after link in text', async () => {
-            const {editor} = testEnv;
-
-            registerAutoLinks(editor);
-            let pNode!: ParagraphNode;
-
-            editor.update(() => {
-                pNode = new ParagraphNode();
-                const text = new TextNode('Some https://example.com?test=true text');
-                pNode.append(text);
-                $getRoot().append(pNode);
-
-                text.select(34, 34);
-            });
+    test('space after link in text', async () => {
+        const {editor} = createTestContext();
+        registerAutoLinks(editor);
+        let pNode!: ParagraphNode;
+
+        editor.updateAndCommit(() => {
+            pNode = new ParagraphNode();
+            const text = new TextNode('Some https://example.com?test=true text');
+            pNode.append(text);
+            $getRoot().append(pNode);
+
+            text.select(34, 34);
+        });
 
-            editor.commitUpdates();
+        dispatchKeydownEventForNode(pNode, editor, ' ');
 
-            const pDomEl = editor.getElementByKey(pNode.getKey());
-            const event = new KeyboardEvent('keydown', {
-                bubbles: true,
-                cancelable: true,
-                key: ' ',
-                keyCode: 62,
-            });
-            pDomEl?.dispatchEvent(event);
+        expectEditorStateJSONPropToEqual(editor, '0.1.url', 'https://example.com?test=true');
+        expectEditorStateJSONPropToEqual(editor, '0.1.0.text', 'https://example.com?test=true');
+    });
 
-            editor.commitUpdates();
+    test('space after link at end of line', async () => {
+        const {editor} = createTestContext();
+        registerAutoLinks(editor);
+        let pNode!: ParagraphNode;
 
-            const paragraph = editor!.getEditorState().toJSON().root
-                .children[0] as SerializedParagraphNode;
-            expect(paragraph.children[1].type).toBe('link');
+        editor.updateAndCommit(() => {
+            pNode = new ParagraphNode();
+            const text = new TextNode('Some https://example.com?test=true');
+            pNode.append(text);
+            $getRoot().append(pNode);
 
-            const link = paragraph.children[1] as SerializedLinkNode;
-            expect(link.url).toBe('https://example.com?test=true');
-            const linkText = link.children[0] as SerializedTextNode;
-            expect(linkText.text).toBe('https://example.com?test=true');
+            text.selectEnd();
         });
 
-        test('enter after link in text', async () => {
-            const {editor} = testEnv;
-
-            registerAutoLinks(editor);
-            let pNode!: ParagraphNode;
-
-            editor.update(() => {
-                pNode = new ParagraphNode();
-                const text = new TextNode('Some https://example.com?test=true text');
-                pNode.append(text);
-                $getRoot().append(pNode);
+        dispatchKeydownEventForNode(pNode, editor, ' ');
 
-                text.select(34, 34);
-            });
+        expectNodeShapeToMatch(editor, [{type: 'paragraph', children: [
+                {text: 'Some '},
+                {type: 'link', children: [{text: 'https://example.com?test=true'}]}
+            ]}]);
+        expectEditorStateJSONPropToEqual(editor, '0.1.url', 'https://example.com?test=true');
+    });
 
-            editor.commitUpdates();
+    test('enter after link in text', async () => {
+        const {editor} = createTestContext();
+        registerAutoLinks(editor);
+        let pNode!: ParagraphNode;
 
-            const pDomEl = editor.getElementByKey(pNode.getKey());
-            const event = new KeyboardEvent('keydown', {
-                bubbles: true,
-                cancelable: true,
-                key: 'Enter',
-                keyCode: 66,
-            });
-            pDomEl?.dispatchEvent(event);
+        editor.updateAndCommit(() => {
+            pNode = new ParagraphNode();
+            const text = new TextNode('Some https://example.com?test=true text');
+            pNode.append(text);
+            $getRoot().append(pNode);
 
-            editor.commitUpdates();
+            text.select(34, 34);
+        });
 
-            const paragraph = editor!.getEditorState().toJSON().root
-                .children[0] as SerializedParagraphNode;
-            expect(paragraph.children[1].type).toBe('link');
+        dispatchKeydownEventForNode(pNode, editor, 'Enter');
 
-            const link = paragraph.children[1] as SerializedLinkNode;
-            expect(link.url).toBe('https://example.com?test=true');
-            const linkText = link.children[0] as SerializedTextNode;
-            expect(linkText.text).toBe('https://example.com?test=true');
-        });
+        expectEditorStateJSONPropToEqual(editor, '0.1.url', 'https://example.com?test=true');
+        expectEditorStateJSONPropToEqual(editor, '0.1.0.text', 'https://example.com?test=true');
     });
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/auto-links.ts b/resources/js/wysiwyg/services/auto-links.ts
index 1c3b1c73010..62cd459940c 100644
--- a/resources/js/wysiwyg/services/auto-links.ts
+++ b/resources/js/wysiwyg/services/auto-links.ts
@@ -43,7 +43,7 @@ function handlePotentialLinkEvent(node: TextNode, selection: BaseSelection, edit
         linkNode.append(new TextNode(textSegment));
 
         const splits = node.splitText(startIndex, cursorPoint);
-        const targetIndex = splits.length === 3 ? 1 : 0;
+        const targetIndex = startIndex > 0 ? 1 : 0;
         const targetText = splits[targetIndex];
         if (targetText) {
             targetText.replace(linkNode);
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 817a235a712..a49cccd26dc 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -2,11 +2,7 @@
 
 ## In progress
 
-Reorg
-  - Merge custom nodes into original nodes
-    - Reduce down to use CommonBlockNode where possible
-    - Remove existing formatType/ElementFormatType references (replaced with alignment).
-    - Remove existing indent references (replaced with inset).
+//
 
 ## Main Todo
 

From 7f5fd16dc601039a0ff14749c98d8ea35902ec4c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 15 Jan 2025 14:31:09 +0000
Subject: [PATCH 441/666] Lexical: Added some general test guidance

Just to help remember the general layout/methods that we've added to
make testing easier.
---
 resources/js/wysiwyg/testing.md | 55 +++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 resources/js/wysiwyg/testing.md

diff --git a/resources/js/wysiwyg/testing.md b/resources/js/wysiwyg/testing.md
new file mode 100644
index 00000000000..7b272c60696
--- /dev/null
+++ b/resources/js/wysiwyg/testing.md
@@ -0,0 +1,55 @@
+# Testing Guidance
+
+This is testing guidance specific for this Lexical-based WYSIWYG editor.
+There is a lot of pre-existing test code carried over form the fork of lexical, but since there we've added a range of helpers and altered how testing can be done to make things a bit simpler and aligned with how we run tests.
+
+This document is an attempt to document the new best options for added tests with an aim for standardisation on these approaches going forward.
+
+## Utils Location
+
+Most core test utils can be found in the file at path: resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+
+## Test Example
+
+This is an example of a typical test using the common modern utilities to help perform actions or assertions. Comments are for this example only, and are not expected in actual test files.
+
+```ts
+import {
+    createTestContext,
+    dispatchKeydownEventForNode, 
+    expectEditorStateJSONPropToEqual,
+    expectNodeShapeToMatch
+} from "lexical/__tests__/utils";
+import {
+    $getRoot,
+    ParagraphNode,
+    TextNode
+} from "lexical";
+
+describe('A specific service or file or function', () => {
+    test('it does thing', async () => {
+        // Create the editor context and get an editor reference
+        const {editor} = createTestContext();
+
+        // Run an action within the editor.
+        let pNode: ParagraphNode;
+        editor.updateAndCommit(() => {
+            pNode = new ParagraphNode();
+            const text = new TextNode('Hello!');
+            pNode.append(text);
+            $getRoot().append(pNode);
+        });
+
+        // Dispatch key events via the DOM
+        dispatchKeydownEventForNode(pNode!, editor, ' ');
+
+        // Check the shape (and text) of the resulting state
+        expectNodeShapeToMatch(editor, [{type: 'paragraph', children: [
+                {text: 'Hello!'},
+            ]}]);
+
+        // Check specific props in the resulting JSON state
+        expectEditorStateJSONPropToEqual(editor, '0.0.text', 'Hello!');
+    });
+});
+```
\ No newline at end of file

From c091f67db334024bd6b4c65d1833b2c60e3e0a45 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 17 Jan 2025 11:15:14 +0000
Subject: [PATCH 442/666] Lexical: Added color format custom color select

Includes tracking of selected colors via localstorage for display.
---
 resources/icons/editor/color-select.svg       |  1 +
 .../ui/framework/blocks/color-picker.ts       | 49 ++++++++++++++++++-
 resources/js/wysiwyg/ui/framework/core.ts     |  7 +++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 resources/icons/editor/color-select.svg

diff --git a/resources/icons/editor/color-select.svg b/resources/icons/editor/color-select.svg
new file mode 100644
index 00000000000..cef6866558b
--- /dev/null
+++ b/resources/icons/editor/color-select.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 32.5-156t88-127Q256-817 330-848.5T488-880q80 0 151 27.5t124.5 76q53.5 48.5 85 115T880-518q0 115-70 176.5T640-280h-74q-9 0-12.5 5t-3.5 11q0 12 15 34.5t15 51.5q0 50-27.5 74T480-80Zm0-400Zm-220 40q26 0 43-17t17-43q0-26-17-43t-43-17q-26 0-43 17t-17 43q0 26 17 43t43 17Zm120-160q26 0 43-17t17-43q0-26-17-43t-43-17q-26 0-43 17t-17 43q0 26 17 43t43 17Zm200 0q26 0 43-17t17-43q0-26-17-43t-43-17q-26 0-43 17t-17 43q0 26 17 43t43 17Zm120 160q26 0 43-17t17-43q0-26-17-43t-43-17q-26 0-43 17t-17 43q0 26 17 43t43 17ZM480-160q9 0 14.5-5t5.5-13q0-14-15-33t-15-57q0-42 29-67t71-25h70q66 0 113-38.5T800-518q0-121-92.5-201.5T488-800q-136 0-232 93t-96 227q0 133 93.5 226.5T480-160Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
index b068fb4f0bf..65623e1b21d 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -4,6 +4,8 @@ import {$patchStyleText} from "@lexical/selection";
 import {el} from "../../../utils/dom";
 
 import removeIcon from "@icons/editor/color-clear.svg";
+import selectIcon from "@icons/editor/color-select.svg";
+import {uniqueIdSmall} from "../../../../services/util";
 
 const colorChoices = [
     '#000000',
@@ -34,6 +36,8 @@ const colorChoices = [
     '#34495E',
 ];
 
+const storageKey = 'bs-lexical-custom-colors';
+
 export class EditorColorPicker extends EditorUiElement {
 
     protected styleProperty: string;
@@ -44,8 +48,10 @@ export class EditorColorPicker extends EditorUiElement {
     }
 
     buildDOM(): HTMLElement {
+        const id = uniqueIdSmall();
 
-        const colorOptions = colorChoices.map(choice => {
+        const allChoices = [...colorChoices, ...this.getCustomColorChoices()];
+        const colorOptions = allChoices.map(choice => {
             return el('div', {
                 class: 'editor-color-select-option',
                 style: `background-color: ${choice}`,
@@ -62,6 +68,25 @@ export class EditorColorPicker extends EditorUiElement {
         removeButton.innerHTML = removeIcon;
         colorOptions.push(removeButton);
 
+        const selectButton = el('label', {
+            class: 'editor-color-select-option',
+            for: `color-select-${id}`,
+            'data-color': '',
+            title: 'Custom color',
+        }, []);
+        selectButton.innerHTML = selectIcon;
+        colorOptions.push(selectButton);
+
+        const input = el('input', {type: 'color', hidden: 'true', id: `color-select-${id}`}) as HTMLInputElement;
+        colorOptions.push(input);
+        input.addEventListener('change', e => {
+            if (input.value) {
+                this.storeCustomColorChoice(input.value);
+                this.setColor(input.value);
+                this.rebuildDOM();
+            }
+        });
+
         const colorRows = [];
         for (let i = 0; i < colorOptions.length; i+=5) {
             const options = colorOptions.slice(i, i + 5);
@@ -79,11 +104,33 @@ export class EditorColorPicker extends EditorUiElement {
         return wrapper;
     }
 
+    storeCustomColorChoice(color: string) {
+        if (colorChoices.includes(color)) {
+            return;
+        }
+
+        const customColors: string[] = this.getCustomColorChoices();
+        if (customColors.includes(color)) {
+            return;
+        }
+
+        customColors.push(color);
+        window.localStorage.setItem(storageKey, JSON.stringify(customColors));
+    }
+
+    getCustomColorChoices(): string[] {
+        return JSON.parse(window.localStorage.getItem(storageKey) || '[]');
+    }
+
     onClick(event: MouseEvent) {
         const colorEl = (event.target as HTMLElement).closest('[data-color]') as HTMLElement;
         if (!colorEl) return;
 
         const color = colorEl.dataset.color as string;
+        this.setColor(color);
+    }
+
+    setColor(color: string) {
         this.getContext().editor.update(() => {
             const selection = $getSelection();
             if (selection) {
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 3433b96e8d7..90ce4ebf93c 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -53,6 +53,13 @@ export abstract class EditorUiElement {
         return this.dom;
     }
 
+    rebuildDOM(): HTMLElement {
+        const newDOM = this.buildDOM();
+        this.dom?.replaceWith(newDOM);
+        this.dom = newDOM;
+        return this.dom;
+    }
+
     trans(text: string) {
         return this.getContext().translate(text);
     }

From 04cca77ae6d84e0f7c3aceef6c0bc3682258c5c9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 18 Jan 2025 11:12:43 +0000
Subject: [PATCH 443/666] Lexical: Added color picker/indicator to form fields

---
 resources/icons/editor/color-display.svg      | 10 ++++
 resources/js/wysiwyg/todo.md                  |  4 --
 .../ui/defaults/buttons/inline-formats.ts     | 14 +++++
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 21 +++----
 resources/js/wysiwyg/ui/defaults/toolbars.ts  |  8 +--
 .../ui/framework/blocks/color-field.ts        | 56 +++++++++++++++++++
 .../ui/framework/blocks/color-picker.ts       | 19 +++----
 .../wysiwyg/ui/framework/blocks/link-field.ts |  2 -
 resources/js/wysiwyg/ui/framework/forms.ts    | 17 ++++--
 resources/sass/_editor.scss                   | 10 ++++
 10 files changed, 125 insertions(+), 36 deletions(-)
 create mode 100644 resources/icons/editor/color-display.svg
 create mode 100644 resources/js/wysiwyg/ui/framework/blocks/color-field.ts

diff --git a/resources/icons/editor/color-display.svg b/resources/icons/editor/color-display.svg
new file mode 100644
index 00000000000..86be9a7bfa7
--- /dev/null
+++ b/resources/icons/editor/color-display.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 -960 960 960" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <pattern id="pattern2" x="0.40000001" patternTransform="scale(200)" preserveAspectRatio="xMidYMid" xlink:href="#Checkerboard"/>
+  <pattern id="Checkerboard" width="2" height="2" fill="#b6b6b6" patternTransform="translate(0) scale(10)" patternUnits="userSpaceOnUse" preserveAspectRatio="xMidYMid">
+   <rect width="1" height="1"/>
+   <rect x="1" y="1" width="1" height="1"/>
+  </pattern>
+ </defs>
+ <rect class="editor-icon-color-display" x="103.53" y="-856.47" width="752.94" height="752.94" rx="47.059" ry="47.059" fill="url(#pattern2)" stroke="#666" stroke-linecap="square" stroke-linejoin="round" stroke-width="47.059"/>
+</svg>
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index a49cccd26dc..695e8cb69ed 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -10,13 +10,9 @@
 
 ## Secondary Todo
 
-- Color picker support in table form color fields
-- Color picker for color controls
 - Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Deep check of translation coverage
-- About button & view
-- Mobile display and handling
 
 ## Bugs
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
index c3726acf001..c5b7ad29ad9 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -12,6 +12,8 @@ import subscriptIcon from "@icons/editor/subscript.svg";
 import codeIcon from "@icons/editor/code.svg";
 import formatClearIcon from "@icons/editor/format-clear.svg";
 import {$selectionContainsTextFormat} from "../../../utils/selection";
+import {$patchStyleText} from "@lexical/selection";
+import {context} from "esbuild";
 
 function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
     return {
@@ -32,6 +34,18 @@ export const underline: EditorButtonDefinition = buildFormatButton('Underline',
 export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
 export const highlightColor: EditorBasicButtonDefinition = {label: 'Background color', icon: highlightIcon};
 
+function colorAction(context: EditorUiContext, property: string, color: string): void {
+    context.editor.update(() => {
+        const selection = $getSelection();
+        if (selection) {
+            $patchStyleText(selection, {[property]: color || null});
+        }
+    });
+}
+
+export const textColorAction = (color: string, context: EditorUiContext) => colorAction(context, 'color', color);
+export const highlightColorAction = (color: string, context: EditorUiContext) => colorAction(context, 'color', color);
+
 export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);
 export const subscript: EditorButtonDefinition = buildFormatButton('Subscript', 'subscript', subscriptIcon);
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 63fa24c800f..b592d7c67e6 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -1,6 +1,6 @@
 import {
     EditorFormDefinition,
-    EditorFormFieldDefinition,
+    EditorFormFieldDefinition, EditorFormFields,
     EditorFormTabs,
     EditorSelectFormFieldDefinition
 } from "../../framework/forms";
@@ -17,6 +17,7 @@ import {
 import {formatSizeValue} from "../../../utils/dom";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {CommonBlockAlignment} from "lexical/nodes/common";
+import {colorFieldBuilder} from "../../framework/blocks/color-field";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -145,15 +146,15 @@ export const cellProperties: EditorFormDefinition = {
                     } as EditorSelectFormFieldDefinition,
                 ];
 
-                const advancedFields: EditorFormFieldDefinition[] = [
+                const advancedFields: EditorFormFields = [
                     {
                         label: 'Border width', // inline-style: border-width
                         name: 'border_width',
                         type: 'text',
                     },
                     borderStyleInput, // inline-style: border-style
-                    borderColorInput, // inline-style: border-color
-                    backgroundColorInput, // inline-style: background-color
+                    colorFieldBuilder(borderColorInput),
+                    colorFieldBuilder(backgroundColorInput),
                 ];
 
                 return new EditorFormTabs([
@@ -210,8 +211,8 @@ export const rowProperties: EditorFormDefinition = {
             type: 'text',
         },
         borderStyleInput, // style on tr: height
-        borderColorInput, // style on tr: height
-        backgroundColorInput, // style on tr: height
+        colorFieldBuilder(borderColorInput),
+        colorFieldBuilder(backgroundColorInput),
     ],
 };
 
@@ -305,10 +306,10 @@ export const tableProperties: EditorFormDefinition = {
                     alignmentInput, // alignment class
                 ];
 
-                const advancedFields: EditorFormFieldDefinition[] = [
-                    borderStyleInput, // Style - border-style
-                    borderColorInput, // Style - border-color
-                    backgroundColorInput, // Style - background-color
+                const advancedFields: EditorFormFields = [
+                    borderStyleInput,
+                    colorFieldBuilder(borderColorInput),
+                    colorFieldBuilder(backgroundColorInput),
                 ];
 
                 return new EditorFormTabs([
diff --git a/resources/js/wysiwyg/ui/defaults/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
index 61baa3c3260..b09a7530f1f 100644
--- a/resources/js/wysiwyg/ui/defaults/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -44,11 +44,11 @@ import {
 } from "./buttons/block-formats";
 import {
     bold, clearFormating, code,
-    highlightColor,
+    highlightColor, highlightColorAction,
     italic,
     strikethrough, subscript,
     superscript,
-    textColor,
+    textColor, textColorAction,
     underline
 } from "./buttons/inline-formats";
 import {
@@ -114,10 +114,10 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
             new EditorButton(italic),
             new EditorButton(underline),
             new EditorDropdownButton({ button: new EditorColorButton(textColor, 'color') }, [
-                new EditorColorPicker('color'),
+                new EditorColorPicker(textColorAction),
             ]),
             new EditorDropdownButton({button: new EditorColorButton(highlightColor, 'background-color')}, [
-                new EditorColorPicker('background-color'),
+                new EditorColorPicker(highlightColorAction),
             ]),
             new EditorButton(strikethrough),
             new EditorButton(superscript),
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-field.ts b/resources/js/wysiwyg/ui/framework/blocks/color-field.ts
new file mode 100644
index 00000000000..8c8f167d9f7
--- /dev/null
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-field.ts
@@ -0,0 +1,56 @@
+import {EditorContainerUiElement, EditorUiBuilderDefinition, EditorUiContext} from "../core";
+import {EditorFormField, EditorFormFieldDefinition} from "../forms";
+import {EditorColorPicker} from "./color-picker";
+import {EditorDropdownButton} from "./dropdown-button";
+
+import colorDisplayIcon from "@icons/editor/color-display.svg"
+
+export class EditorColorField extends EditorContainerUiElement {
+    protected input: EditorFormField;
+    protected pickerButton: EditorDropdownButton;
+
+    constructor(input: EditorFormField) {
+        super([]);
+
+        this.input = input;
+
+        this.pickerButton = new EditorDropdownButton({
+            button: { icon: colorDisplayIcon, label: 'Select color'}
+        }, [
+            new EditorColorPicker(this.onColorSelect.bind(this))
+        ]);
+        this.addChildren(this.pickerButton, this.input);
+    }
+
+    protected buildDOM(): HTMLElement {
+        const dom = this.input.getDOMElement();
+        dom.append(this.pickerButton.getDOMElement());
+        dom.classList.add('editor-color-field-container');
+
+        const field = dom.querySelector('input') as HTMLInputElement;
+        field.addEventListener('change', () => {
+            this.setIconColor(field.value);
+        });
+
+        return dom;
+    }
+
+    onColorSelect(color: string, context: EditorUiContext): void {
+        this.input.setValue(color);
+    }
+
+    setIconColor(color: string) {
+        const icon = this.getDOMElement().querySelector('svg .editor-icon-color-display');
+        if (icon) {
+            icon.setAttribute('fill', color || 'url(#pattern2)');
+        }
+    }
+}
+
+export function colorFieldBuilder(field: EditorFormFieldDefinition): EditorUiBuilderDefinition {
+    return {
+        build() {
+            return new EditorColorField(new EditorFormField(field));
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
index 65623e1b21d..c742ddc7723 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -1,6 +1,4 @@
-import {EditorUiElement} from "../core";
-import {$getSelection} from "lexical";
-import {$patchStyleText} from "@lexical/selection";
+import {EditorUiContext, EditorUiElement} from "../core";
 import {el} from "../../../utils/dom";
 
 import removeIcon from "@icons/editor/color-clear.svg";
@@ -38,13 +36,15 @@ const colorChoices = [
 
 const storageKey = 'bs-lexical-custom-colors';
 
+export type EditorColorPickerCallback = (color: string, context: EditorUiContext) => void;
+
 export class EditorColorPicker extends EditorUiElement {
 
-    protected styleProperty: string;
+    protected callback: EditorColorPickerCallback;
 
-    constructor(styleProperty: string) {
+    constructor(callback: EditorColorPickerCallback) {
         super();
-        this.styleProperty = styleProperty;
+        this.callback = callback;
     }
 
     buildDOM(): HTMLElement {
@@ -131,11 +131,6 @@ export class EditorColorPicker extends EditorUiElement {
     }
 
     setColor(color: string) {
-        this.getContext().editor.update(() => {
-            const selection = $getSelection();
-            if (selection) {
-                $patchStyleText(selection, {[this.styleProperty]: color || null});
-            }
-        });
+        this.callback(color, this.getContext());
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/link-field.ts b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
index f88b22c3f05..880238a9a4c 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/link-field.ts
@@ -44,7 +44,6 @@ export class LinkField extends EditorContainerUiElement {
 
     updateFormFromHeader(header: HeadingNode) {
         this.getHeaderIdAndText(header).then(({id, text}) => {
-            console.log('updating form', id, text);
             const modal =  this.getContext().manager.getActiveModal('link');
             if (modal) {
                 modal.getForm().setValues({
@@ -60,7 +59,6 @@ export class LinkField extends EditorContainerUiElement {
         return new Promise((res) => {
             this.getContext().editor.update(() => {
                 let id = header.getId();
-                console.log('header', id, header.__id);
                 if (!id) {
                     id = 'header-' + uniqueIdSmall();
                     header.setId(id);
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 36371e30238..771ab0bdfe5 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -19,15 +19,17 @@ export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefiniti
     valuesByLabel: Record<string, string>
 }
 
+export type EditorFormFields = (EditorFormFieldDefinition|EditorUiBuilderDefinition)[];
+
 interface EditorFormTabDefinition {
     label: string;
-    contents: EditorFormFieldDefinition[];
+    contents: EditorFormFields;
 }
 
 export interface EditorFormDefinition {
     submitText: string;
     action: (formData: FormData, context: EditorUiContext) => Promise<boolean>;
-    fields: (EditorFormFieldDefinition|EditorUiBuilderDefinition)[];
+    fields: EditorFormFields;
 }
 
 export class EditorFormField extends EditorUiElement {
@@ -41,6 +43,7 @@ export class EditorFormField extends EditorUiElement {
     setValue(value: string) {
         const input = this.getDOMElement().querySelector('input,select,textarea') as HTMLInputElement;
         input.value = value;
+        input.dispatchEvent(new Event('change'));
     }
 
     getName(): string {
@@ -155,11 +158,17 @@ export class EditorForm extends EditorContainerUiElement {
 export class EditorFormTab extends EditorContainerUiElement {
 
     protected definition: EditorFormTabDefinition;
-    protected fields: EditorFormField[];
+    protected fields: EditorUiElement[];
     protected id: string;
 
     constructor(definition: EditorFormTabDefinition) {
-        const fields = definition.contents.map(fieldDef => new EditorFormField(fieldDef));
+        const fields = definition.contents.map(fieldDef => {
+            if (isUiBuilderDefinition(fieldDef)) {
+                return fieldDef.build();
+            }
+            return new EditorFormField(fieldDef)
+        });
+
         super(fields);
 
         this.definition = definition;
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 2446c141670..9f7694e858c 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -649,6 +649,16 @@ textarea.editor-form-field-input {
     width: $inputWidth - 40px;
   }
 }
+.editor-color-field-container {
+  position: relative;
+  input {
+    padding-left: 36px;
+  }
+  .editor-dropdown-menu-container {
+    position: absolute;
+    bottom: 0;
+  }
+}
 
 // Editor theme styles
 .editor-theme-bold {

From da82e70ca3cdd075f7ae148cb2f58fddb0d93627 Mon Sep 17 00:00:00 2001
From: Talstra Ruben SRSNL <ruben.talstra@stadlerrail.com>
Date: Mon, 20 Jan 2025 17:21:46 +0100
Subject: [PATCH 444/666] =?UTF-8?q?Add=20optional=20OIDC=20avatar=20fetchi?=
 =?UTF-8?q?ng=20from=20the=20=E2=80=9Cpicture=E2=80=9D=20claim?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Access/Oidc/OidcService.php     |  8 ++++++-
 app/Access/Oidc/OidcUserDetails.php |  2 ++
 app/Config/oidc.php                 |  3 +++
 app/Uploads/UserAvatars.php         | 37 ++++++++++++++++++++++++++---
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 7c1760649b5..660885e8b2a 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -11,6 +11,7 @@
 use BookStack\Facades\Theme;
 use BookStack\Http\HttpRequestService;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Uploads\UserAvatars;
 use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
@@ -26,7 +27,8 @@ public function __construct(
         protected RegistrationService $registrationService,
         protected LoginService $loginService,
         protected HttpRequestService $http,
-        protected GroupSyncService $groupService
+        protected GroupSyncService $groupService,
+        protected UserAvatars $userAvatars
     ) {
     }
 
@@ -227,6 +229,10 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
 
         $this->loginService->login($user, 'oidc');
 
+        if ($this->config()['fetch_avatars'] && $userDetails->picture) {
+            $this->userAvatars->assignToUserFromUrl($user, $userDetails->picture, $accessToken->getToken());
+        }
+
         return $user;
     }
 
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index fae20de0b62..10595d1e0dd 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -11,6 +11,7 @@ public function __construct(
         public ?string $email = null,
         public ?string $name = null,
         public ?array $groups = null,
+        public ?string $picture = null,
     ) {
     }
 
@@ -40,6 +41,7 @@ public function populate(
         $this->email = $claims->getClaim('email') ?? $this->email;
         $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
+        $this->picture    = $claims->getClaim('picture') ?: $this->picture;
     }
 
     protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string
diff --git a/app/Config/oidc.php b/app/Config/oidc.php
index 8b5470931d0..62f19a119c0 100644
--- a/app/Config/oidc.php
+++ b/app/Config/oidc.php
@@ -54,4 +54,7 @@
     'groups_claim' => env('OIDC_GROUPS_CLAIM', 'groups'),
     // When syncing groups, remove any groups that no longer match. Otherwise, sync only adds new groups.
     'remove_from_groups' => env('OIDC_REMOVE_FROM_GROUPS', false),
+
+    // When enabled, BookStack will fetch the user’s avatar from the 'picture' claim (SSRF risk if URLs are untrusted).
+    'fetch_avatars' => env('OIDC_FETCH_AVATARS', false),
 ];
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index c623247352b..af91dfe70f1 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -53,6 +53,31 @@ public function assignToUserFromExistingData(User $user, string $imageData, stri
         }
     }
 
+    /**
+     * Assign a new avatar image to the given user by fetching from a remote URL.
+     */
+    public function assignToUserFromUrl(User $user, string $avatarUrl, ?string $accessToken = null): void
+    {
+        // Quickly skip invalid or non-HTTP URLs
+        if (!$avatarUrl || !str_starts_with($avatarUrl, 'http')) {
+            return;
+        }
+
+        try {
+            $this->destroyAllForUser($user);
+            $imageData = $this->getAvatarImageData($avatarUrl, $accessToken);
+            $avatar = $this->createAvatarImageFromData($user, $imageData, 'png');
+            $user->avatar()->associate($avatar);
+            $user->save();
+        } catch (Exception $e) {
+            Log::error('Failed to save user avatar image from URL', [
+                'exception' => $e,
+                'url'       => $avatarUrl,
+                'user_id'   => $user->id,
+            ]);
+        }
+    }
+
     /**
      * Destroy all user avatars uploaded to the given user.
      */
@@ -105,15 +130,21 @@ protected function createAvatarImageFromData(User $user, string $imageData, stri
     }
 
     /**
-     * Gets an image from url and returns it as a string of image data.
+     * Gets an image from a URL (public or private) and returns it as a string of image data.
      *
      * @throws HttpFetchException
      */
-    protected function getAvatarImageData(string $url): string
+    protected function getAvatarImageData(string $url, ?string $accessToken = null): string
     {
         try {
+            $headers = [];
+            if (!empty($accessToken)) {
+                $headers['Authorization'] = 'Bearer ' . $accessToken;
+            }
+
             $client = $this->http->buildClient(5);
-            $response = $client->sendRequest(new Request('GET', $url));
+            $response = $client->sendRequest(new Request('GET', $url, $headers));
+
             if ($response->getStatusCode() !== 200) {
                 throw new HttpFetchException(trans('errors.cannot_get_image_from_url', ['url' => $url]));
             }

From 8a66365d48f8c1b4a8926dd632fe0fb1868cdc43 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 22 Jan 2025 12:54:13 +0000
Subject: [PATCH 445/666] Lexical: Added support for table caption nodes

Needs linking up to the table form still.
---
 .../js/wysiwyg/lexical/core/LexicalNode.ts    | 10 +++
 .../wysiwyg/lexical/core/LexicalReconciler.ts | 21 ++++--
 .../lexical/table/LexicalCaptionNode.ts       | 74 +++++++++++++++++++
 .../wysiwyg/lexical/table/LexicalTableNode.ts |  2 +
 resources/js/wysiwyg/nodes.ts                 |  2 +
 5 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts

diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index a6c9b6023e5..163bb8c31c8 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -1165,6 +1165,16 @@ export class LexicalNode {
   markDirty(): void {
     this.getWritable();
   }
+
+  /**
+   * Insert the DOM of this node into that of the parent.
+   * Allows this node to implement custom DOM attachment logic.
+   * Boolean result indicates if the insertion was handled by the function.
+   * A true return value prevents default insertion logic from taking place.
+   */
+  insertDOMIntoParent(nodeDOM: HTMLElement, parentDOM: HTMLElement): boolean {
+    return false;
+  }
 }
 
 function errorOnTypeKlassMismatch(
diff --git a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
index fccf1ae23a8..297e96ce018 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalReconciler.ts
@@ -171,16 +171,21 @@ function $createNode(
   }
 
   if (parentDOM !== null) {
-    if (insertDOM != null) {
-      parentDOM.insertBefore(dom, insertDOM);
-    } else {
-      // @ts-expect-error: internal field
-      const possibleLineBreak = parentDOM.__lexicalLineBreak;
 
-      if (possibleLineBreak != null) {
-        parentDOM.insertBefore(dom, possibleLineBreak);
+    const inserted = node?.insertDOMIntoParent(dom, parentDOM);
+
+    if (!inserted) {
+      if (insertDOM != null) {
+        parentDOM.insertBefore(dom, insertDOM);
       } else {
-        parentDOM.appendChild(dom);
+        // @ts-expect-error: internal field
+        const possibleLineBreak = parentDOM.__lexicalLineBreak;
+
+        if (possibleLineBreak != null) {
+          parentDOM.insertBefore(dom, possibleLineBreak);
+        } else {
+          parentDOM.appendChild(dom);
+        }
       }
     }
   }
diff --git a/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
new file mode 100644
index 00000000000..08c6870e69f
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
@@ -0,0 +1,74 @@
+import {
+    DOMConversionMap,
+    DOMExportOutput,
+    EditorConfig,
+    ElementNode,
+    LexicalEditor,
+    LexicalNode,
+    SerializedElementNode
+} from "lexical";
+
+
+export class CaptionNode extends ElementNode {
+    static getType(): string {
+        return 'caption';
+    }
+
+    static clone(node: CaptionNode): CaptionNode {
+        return new CaptionNode(node.__key);
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor): HTMLElement {
+        return document.createElement('caption');
+    }
+
+    updateDOM(_prevNode: unknown, _dom: HTMLElement, _config: EditorConfig): boolean {
+        return false;
+    }
+
+    isParentRequired(): true {
+        return true;
+    }
+
+    canBeEmpty(): boolean {
+        return false;
+    }
+
+    exportJSON(): SerializedElementNode {
+        return {
+            ...super.exportJSON(),
+            type: 'caption',
+            version: 1,
+        };
+    }
+
+    insertDOMIntoParent(nodeDOM: HTMLElement, parentDOM: HTMLElement): boolean {
+        parentDOM.insertBefore(nodeDOM, parentDOM.firstChild);
+        return true;
+    }
+
+    static importJSON(serializedNode: SerializedElementNode): CaptionNode {
+        return $createCaptionNode();
+    }
+
+    static importDOM(): DOMConversionMap | null {
+        return {
+            caption: (node: Node) => ({
+                conversion(domNode: Node) {
+                    return {
+                        node: $createCaptionNode(),
+                    }
+                },
+                priority: 0,
+            }),
+        };
+    }
+}
+
+export function $createCaptionNode(): CaptionNode {
+    return new CaptionNode();
+}
+
+export function $isCaptionNode(node: LexicalNode | null | undefined): node is CaptionNode {
+    return node instanceof CaptionNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index 9443747a6f7..a103614753e 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -139,6 +139,8 @@ export class TableNode extends CommonBlockNode {
           for (const child of Array.from(tableElement.children)) {
             if (child.nodeName === 'TR') {
               tBody.append(child);
+            } else if (child.nodeName === 'CAPTION') {
+              newElement.insertBefore(child, newElement.firstChild);
             } else {
               newElement.append(child);
             }
diff --git a/resources/js/wysiwyg/nodes.ts b/resources/js/wysiwyg/nodes.ts
index 8a47f322d6d..c1db0f0869f 100644
--- a/resources/js/wysiwyg/nodes.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -18,6 +18,7 @@ import {EditorUiContext} from "./ui/framework/core";
 import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
+import {CaptionNode} from "@lexical/table/LexicalCaptionNode";
 
 /**
  * Load the nodes for lexical.
@@ -32,6 +33,7 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
         TableNode,
         TableRowNode,
         TableCellNode,
+        CaptionNode,
         ImageNode, // TODO - Alignment
         HorizontalRuleNode,
         DetailsNode,

From 958b537a49c442699ec1834d437ce55c8db6394a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 22 Jan 2025 20:39:15 +0000
Subject: [PATCH 446/666] Lexical: Linked table form to have caption toggle
 option

---
 .../lexical/table/LexicalCaptionNode.ts       | 18 +++++++++++++++++
 resources/js/wysiwyg/todo.md                  |  1 -
 .../js/wysiwyg/ui/defaults/forms/tables.ts    | 20 +++++++++++++++----
 resources/js/wysiwyg/ui/framework/forms.ts    | 10 ++++++++--
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
index 08c6870e69f..d9d83562c29 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
@@ -1,4 +1,5 @@
 import {
+    $createTextNode,
     DOMConversionMap,
     DOMExportOutput,
     EditorConfig,
@@ -7,6 +8,7 @@ import {
     LexicalNode,
     SerializedElementNode
 } from "lexical";
+import {TableNode} from "@lexical/table/LexicalTableNode";
 
 
 export class CaptionNode extends ElementNode {
@@ -71,4 +73,20 @@ export function $createCaptionNode(): CaptionNode {
 
 export function $isCaptionNode(node: LexicalNode | null | undefined): node is CaptionNode {
     return node instanceof CaptionNode;
+}
+
+export function $tableHasCaption(table: TableNode): boolean {
+    for (const child of table.getChildren()) {
+        if ($isCaptionNode(child)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export function $addCaptionToTable(table: TableNode, text: string = ''): void {
+    const caption = $createCaptionNode();
+    const textNode = $createTextNode(text || ' ');
+    caption.append(textNode);
+    table.append(caption);
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 695e8cb69ed..1d42ba3e447 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -10,7 +10,6 @@
 
 ## Secondary Todo
 
-- Table caption text support
 - Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Deep check of translation coverage
 
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index b592d7c67e6..5b484310d9a 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -18,6 +18,7 @@ import {formatSizeValue} from "../../../utils/dom";
 import {TableCellNode, TableNode, TableRowNode} from "@lexical/table";
 import {CommonBlockAlignment} from "lexical/nodes/common";
 import {colorFieldBuilder} from "../../framework/blocks/color-field";
+import {$addCaptionToTable, $isCaptionNode, $tableHasCaption} from "@lexical/table/LexicalCaptionNode";
 
 const borderStyleInput: EditorSelectFormFieldDefinition = {
     label: 'Border style',
@@ -219,6 +220,7 @@ export const rowProperties: EditorFormDefinition = {
 export function $showTablePropertiesForm(table: TableNode, context: EditorUiContext): EditorFormModal {
     const styles = table.getStyles();
     const modalForm = context.manager.createModal('table_properties');
+
     modalForm.show({
         width: styles.get('width') || '',
         height: styles.get('height') || '',
@@ -228,7 +230,7 @@ export function $showTablePropertiesForm(table: TableNode, context: EditorUiCont
         border_style: styles.get('border-style') || '',
         border_color: styles.get('border-color') || '',
         background_color: styles.get('background-color') || '',
-        // caption: '', TODO
+        caption: $tableHasCaption(table) ? 'true' : '',
         align: table.getAlignment(),
     });
     return modalForm;
@@ -265,7 +267,17 @@ export const tableProperties: EditorFormDefinition = {
                 });
             }
 
-            // TODO - cell caption
+            const showCaption = Boolean(formData.get('caption')?.toString() || '');
+            const hasCaption = $tableHasCaption(table);
+            if (showCaption && !hasCaption) {
+                $addCaptionToTable(table, context.translate('Caption'));
+            } else if (!showCaption && hasCaption) {
+                for (const child of table.getChildren()) {
+                    if ($isCaptionNode(child)) {
+                        child.remove();
+                    }
+                }
+            }
         });
         return true;
     },
@@ -299,9 +311,9 @@ export const tableProperties: EditorFormDefinition = {
                         type: 'text',
                     },
                     {
-                        label: 'caption', // Caption element
+                        label: 'Show caption', // Caption element
                         name: 'caption',
-                        type: 'text', // TODO -
+                        type: 'checkbox',
                     },
                     alignmentInput, // alignment class
                 ];
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 771ab0bdfe5..08edb214e2a 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -11,7 +11,7 @@ import {el} from "../../utils/dom";
 export interface EditorFormFieldDefinition {
     label: string;
     name: string;
-    type: 'text' | 'select' | 'textarea';
+    type: 'text' | 'select' | 'textarea' | 'checkbox';
 }
 
 export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefinition {
@@ -42,7 +42,11 @@ export class EditorFormField extends EditorUiElement {
 
     setValue(value: string) {
         const input = this.getDOMElement().querySelector('input,select,textarea') as HTMLInputElement;
-        input.value = value;
+        if (this.definition.type === 'checkbox') {
+            input.checked = Boolean(value);
+        } else {
+            input.value = value;
+        }
         input.dispatchEvent(new Event('change'));
     }
 
@@ -61,6 +65,8 @@ export class EditorFormField extends EditorUiElement {
             input = el('select', {id, name: this.definition.name, class: 'editor-form-field-input'}, optionElems);
         } else if (this.definition.type === 'textarea') {
             input = el('textarea', {id, name: this.definition.name, class: 'editor-form-field-input'});
+        } else if (this.definition.type === 'checkbox') {
+            input = el('input', {id, name: this.definition.name, type: 'checkbox', class: 'editor-form-field-input-checkbox', value: 'true'});
         } else {
             input = el('input', {id, name: this.definition.name, class: 'editor-form-field-input'});
         }

From d89a2fdb150880bf98292bff3e16083179709ffb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 27 Jan 2025 14:28:27 +0000
Subject: [PATCH 447/666] Lexical: Added media src conversions

Only actuall added YT in the end.
Google had changed URL scheme, and Vimeo seems to just be something else
now, can't really browse video pages like before.
---
 .../lexical/rich-text/LexicalMediaNode.ts     | 49 ++++++++++++++++++-
 resources/js/wysiwyg/todo.md                  |  1 -
 .../js/wysiwyg/ui/defaults/buttons/objects.ts | 17 +------
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 34 +++++++++++--
 4 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index a675665ac14..81fb96a936b 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -16,6 +16,7 @@ import {
 } from "lexical/nodes/common";
 import {$selectSingleNode} from "../../utils/selection";
 import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
+import * as url from "node:url";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
@@ -343,11 +344,55 @@ export function $createMediaNodeFromHtml(html: string): MediaNode | null {
     return domElementToNode(tag as MediaNodeTag, el);
 }
 
+interface UrlPattern {
+    readonly regex: RegExp;
+    readonly w: number;
+    readonly h: number;
+    readonly url: string;
+}
+
+/**
+ * These patterns originate from the tinymce/tinymce project.
+ * https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts
+ * License: MIT Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
+ * License Link: https://github.com/tinymce/tinymce/blob/584a150679669859a528828e5d2910a083b1d911/LICENSE.TXT
+ */
+const urlPatterns: UrlPattern[] = [
+    {
+        regex: /.*?youtu\.be\/([\w\-_\?&=.]+)/i,
+        w: 560, h: 314,
+        url: 'https://www.youtube.com/embed/$1',
+    },
+    {
+        regex: /.*youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?.*/i,
+        w: 560, h: 314,
+        url: 'https://www.youtube.com/embed/$2?$4',
+    },
+    {
+        regex: /.*youtube.com\/embed\/([a-z0-9\?&=\-_]+).*/i,
+        w: 560, h: 314,
+        url: 'https://www.youtube.com/embed/$1',
+    },
+];
+
 const videoExtensions = ['mp4', 'mpeg', 'm4v', 'm4p', 'mov'];
 const audioExtensions = ['3gp', 'aac', 'flac', 'mp3', 'm4a', 'ogg', 'wav', 'webm'];
 const iframeExtensions = ['html', 'htm', 'php', 'asp', 'aspx', ''];
 
 export function $createMediaNodeFromSrc(src: string): MediaNode {
+
+    for (const pattern of urlPatterns) {
+        const match = src.match(pattern.regex);
+        if (match) {
+            const newSrc = src.replace(pattern.regex, pattern.url);
+            const node = new MediaNode('iframe');
+            node.setSrc(newSrc);
+            node.setHeight(pattern.h);
+            node.setWidth(pattern.w);
+            return node;
+        }
+    }
+
     let nodeTag: MediaNodeTag = 'iframe';
     const srcEnd = src.split('?')[0].split('/').pop() || '';
     const srcEndSplit = srcEnd.split('.');
@@ -360,7 +405,9 @@ export function $createMediaNodeFromSrc(src: string): MediaNode {
         nodeTag = 'embed';
     }
 
-    return new MediaNode(nodeTag);
+    const node = new MediaNode(nodeTag);
+    node.setSrc(src);
+    return node;
 }
 
 export function $isMediaNode(node: LexicalNode | null | undefined): node is MediaNode {
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
index 1d42ba3e447..94ae0e144ba 100644
--- a/resources/js/wysiwyg/todo.md
+++ b/resources/js/wysiwyg/todo.md
@@ -10,7 +10,6 @@
 
 ## Secondary Todo
 
-- Support media src conversions (https://github.com/tinymce/tinymce/blob/release/6.6/modules/tinymce/src/plugins/media/main/ts/core/UrlPatterns.ts)
 - Deep check of translation coverage
 
 ## Bugs
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 6612c0dc451..63df4fea8cd 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -32,7 +32,7 @@ import {
 } from "../../../utils/selection";
 import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert} from "../../../utils/diagrams";
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
-import {$showDetailsForm, $showImageForm, $showLinkForm} from "../forms/objects";
+import {$showDetailsForm, $showImageForm, $showLinkForm, $showMediaForm} from "../forms/objects";
 import {formatCodeBlock} from "../../../utils/formats";
 
 export const link: EditorButtonDefinition = {
@@ -168,24 +168,11 @@ export const media: EditorButtonDefinition = {
     label: 'Insert/edit Media',
     icon: mediaIcon,
     action(context: EditorUiContext) {
-        const mediaModal = context.manager.createModal('media');
-
         context.editor.getEditorState().read(() => {
             const selection = $getSelection();
             const selectedNode = $getNodeFromSelection(selection, $isMediaNode) as MediaNode | null;
 
-            let formDefaults = {};
-            if (selectedNode) {
-                const nodeAttrs = selectedNode.getAttributes();
-                formDefaults = {
-                    src: nodeAttrs.src || nodeAttrs.data || '',
-                    width: nodeAttrs.width,
-                    height: nodeAttrs.height,
-                    embed: '',
-                }
-            }
-
-            mediaModal.show(formDefaults);
+            $showMediaForm(selectedNode, context);
         });
     },
     isActive(selection: BaseSelection | null): boolean {
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 21d333c3aa2..0effdc1715e 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -186,6 +186,23 @@ export const link: EditorFormDefinition = {
     ],
 };
 
+export function $showMediaForm(media: MediaNode|null, context: EditorUiContext): void {
+    const mediaModal = context.manager.createModal('media');
+
+    let formDefaults = {};
+    if (media) {
+        const nodeAttrs = media.getAttributes();
+        formDefaults = {
+            src: nodeAttrs.src || nodeAttrs.data || '',
+            width: nodeAttrs.width,
+            height: nodeAttrs.height,
+            embed: '',
+        }
+    }
+
+    mediaModal.show(formDefaults);
+}
+
 export const media: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
@@ -215,12 +232,19 @@ export const media: EditorFormDefinition = {
             const height = (formData.get('height') || '').toString().trim();
             const width = (formData.get('width') || '').toString().trim();
 
-            const updateNode = selectedNode || $createMediaNodeFromSrc(src);
-            updateNode.setSrc(src);
-            updateNode.setWidthAndHeight(width, height);
-            if (!selectedNode) {
-                $insertNodes([updateNode]);
+            // Update existing
+            if (selectedNode) {
+                selectedNode.setSrc(src);
+                selectedNode.setWidthAndHeight(width, height);
+                return;
+            }
+
+            // Insert new
+            const node = $createMediaNodeFromSrc(src);
+            if (width || height) {
+                node.setWidthAndHeight(width, height);
             }
+            $insertNodes([node]);
         });
 
         return true;

From 7e03a973d88999f1e22b601d0b2f6c947d0bd5fc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 27 Jan 2025 16:40:41 +0000
Subject: [PATCH 448/666] Lexical: Ran a deeper check on translation use

---
 lang/en/editor.php                              |  2 ++
 resources/js/wysiwyg/todo.md                    | 17 -----------------
 .../js/wysiwyg/ui/defaults/buttons/controls.ts  |  2 +-
 .../js/wysiwyg/ui/defaults/buttons/objects.ts   |  2 +-
 .../wysiwyg/ui/framework/blocks/color-picker.ts |  4 ++--
 5 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 resources/js/wysiwyg/todo.md

diff --git a/lang/en/editor.php b/lang/en/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/resources/js/wysiwyg/todo.md b/resources/js/wysiwyg/todo.md
deleted file mode 100644
index 94ae0e144ba..00000000000
--- a/resources/js/wysiwyg/todo.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lexical based editor todo
-
-## In progress
-
-//
-
-## Main Todo
-
-//
-
-## Secondary Todo
-
-- Deep check of translation coverage
-
-## Bugs
-
-//
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
index 5e32005393e..6c22d3faaf8 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/controls.ts
@@ -57,7 +57,7 @@ export const redo: EditorButtonDefinition = {
 
 
 export const source: EditorButtonDefinition = {
-    label: 'Source',
+    label: 'Source code',
     icon: sourceIcon,
     async action(context: EditorUiContext) {
         const modal = context.manager.createModal('source');
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 63df4fea8cd..4eb4c5a4e68 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -165,7 +165,7 @@ export const diagramManager: EditorButtonDefinition = {
 };
 
 export const media: EditorButtonDefinition = {
-    label: 'Insert/edit Media',
+    label: 'Insert/edit media',
     icon: mediaIcon,
     action(context: EditorUiContext) {
         context.editor.getEditorState().read(() => {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
index c742ddc7723..8e62a0e5e7d 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/color-picker.ts
@@ -63,7 +63,7 @@ export class EditorColorPicker extends EditorUiElement {
         const removeButton = el('div', {
             class: 'editor-color-select-option',
             'data-color': '',
-            title: 'Clear color',
+            title: this.getContext().translate('Remove color'),
         }, []);
         removeButton.innerHTML = removeIcon;
         colorOptions.push(removeButton);
@@ -72,7 +72,7 @@ export class EditorColorPicker extends EditorUiElement {
             class: 'editor-color-select-option',
             for: `color-select-${id}`,
             'data-color': '',
-            title: 'Custom color',
+            title: this.getContext().translate('Custom color'),
         }, []);
         selectButton.innerHTML = selectIcon;
         colorOptions.push(selectButton);

From ac0cd9995d8b420e33e392ba82d40bde8df94205 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 29 Jan 2025 16:40:11 +0000
Subject: [PATCH 449/666] Sorting: Reorganised book sort code to its own
 directory

---
 app/Entities/Tools/BookContents.php           | 209 +---------------
 .../BookSortController.php                    |   8 +-
 .../Tools => Sorting}/BookSortMap.php         |   2 +-
 .../Tools => Sorting}/BookSortMapItem.php     |   2 +-
 app/Sorting/BookSorter.php                    | 226 ++++++++++++++++++
 routes/web.php                                |   7 +-
 6 files changed, 237 insertions(+), 217 deletions(-)
 rename app/{Entities/Controllers => Sorting}/BookSortController.php (88%)
 rename app/{Entities/Tools => Sorting}/BookSortMap.php (96%)
 rename app/{Entities/Tools => Sorting}/BookSortMapItem.php (94%)
 create mode 100644 app/Sorting/BookSorter.php

diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php
index 7fa2134b7fa..7dd3f3e11ad 100644
--- a/app/Entities/Tools/BookContents.php
+++ b/app/Entities/Tools/BookContents.php
@@ -8,6 +8,8 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Sorting\BookSortMap;
+use BookStack\Sorting\BookSortMapItem;
 use Illuminate\Support\Collection;
 
 class BookContents
@@ -103,211 +105,4 @@ protected function getPages(bool $showDrafts = false, bool $getPageContent = fal
 
         return $query->where('book_id', '=', $this->book->id)->get();
     }
-
-    /**
-     * Sort the books content using the given sort map.
-     * Returns a list of books that were involved in the operation.
-     *
-     * @returns Book[]
-     */
-    public function sortUsingMap(BookSortMap $sortMap): array
-    {
-        // Load models into map
-        $modelMap = $this->loadModelsFromSortMap($sortMap);
-
-        // Sort our changes from our map to be chapters first
-        // Since they need to be process to ensure book alignment for child page changes.
-        $sortMapItems = $sortMap->all();
-        usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) {
-            $aScore = $itemA->type === 'page' ? 2 : 1;
-            $bScore = $itemB->type === 'page' ? 2 : 1;
-
-            return $aScore - $bScore;
-        });
-
-        // Perform the sort
-        foreach ($sortMapItems as $item) {
-            $this->applySortUpdates($item, $modelMap);
-        }
-
-        /** @var Book[] $booksInvolved */
-        $booksInvolved = array_values(array_filter($modelMap, function (string $key) {
-            return str_starts_with($key, 'book:');
-        }, ARRAY_FILTER_USE_KEY));
-
-        // Update permissions of books involved
-        foreach ($booksInvolved as $book) {
-            $book->rebuildPermissions();
-        }
-
-        return $booksInvolved;
-    }
-
-    /**
-     * Using the given sort map item, detect changes for the related model
-     * and update it if required. Changes where permissions are lacking will
-     * be skipped and not throw an error.
-     *
-     * @param array<string, Entity> $modelMap
-     */
-    protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMap): void
-    {
-        /** @var BookChild $model */
-        $model = $modelMap[$sortMapItem->type . ':' . $sortMapItem->id] ?? null;
-        if (!$model) {
-            return;
-        }
-
-        $priorityChanged = $model->priority !== $sortMapItem->sort;
-        $bookChanged = $model->book_id !== $sortMapItem->parentBookId;
-        $chapterChanged = ($model instanceof Page) && $model->chapter_id !== $sortMapItem->parentChapterId;
-
-        // Stop if there's no change
-        if (!$priorityChanged && !$bookChanged && !$chapterChanged) {
-            return;
-        }
-
-        $currentParentKey = 'book:' . $model->book_id;
-        if ($model instanceof Page && $model->chapter_id) {
-            $currentParentKey = 'chapter:' . $model->chapter_id;
-        }
-
-        $currentParent = $modelMap[$currentParentKey] ?? null;
-        /** @var Book $newBook */
-        $newBook = $modelMap['book:' . $sortMapItem->parentBookId] ?? null;
-        /** @var ?Chapter $newChapter */
-        $newChapter = $sortMapItem->parentChapterId ? ($modelMap['chapter:' . $sortMapItem->parentChapterId] ?? null) : null;
-
-        if (!$this->isSortChangePermissible($sortMapItem, $model, $currentParent, $newBook, $newChapter)) {
-            return;
-        }
-
-        // Action the required changes
-        if ($bookChanged) {
-            $model->changeBook($newBook->id);
-        }
-
-        if ($model instanceof Page && $chapterChanged) {
-            $model->chapter_id = $newChapter->id ?? 0;
-        }
-
-        if ($priorityChanged) {
-            $model->priority = $sortMapItem->sort;
-        }
-
-        if ($chapterChanged || $priorityChanged) {
-            $model->save();
-        }
-    }
-
-    /**
-     * Check if the current user has permissions to apply the given sorting change.
-     * Is quite complex since items can gain a different parent change. Acts as a:
-     * - Update of old parent element (Change of content/order).
-     * - Update of sorted/moved element.
-     * - Deletion of element (Relative to parent upon move).
-     * - Creation of element within parent (Upon move to new parent).
-     */
-    protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChild $model, ?Entity $currentParent, ?Entity $newBook, ?Entity $newChapter): bool
-    {
-        // Stop if we can't see the current parent or new book.
-        if (!$currentParent || !$newBook) {
-            return false;
-        }
-
-        $hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));
-        if ($model instanceof Chapter) {
-            $hasPermission = userCan('book-update', $currentParent)
-                && userCan('book-update', $newBook)
-                && userCan('chapter-update', $model)
-                && (!$hasNewParent || userCan('chapter-create', $newBook))
-                && (!$hasNewParent || userCan('chapter-delete', $model));
-
-            if (!$hasPermission) {
-                return false;
-            }
-        }
-
-        if ($model instanceof Page) {
-            $parentPermission = ($currentParent instanceof Chapter) ? 'chapter-update' : 'book-update';
-            $hasCurrentParentPermission = userCan($parentPermission, $currentParent);
-
-            // This needs to check if there was an intended chapter location in the original sort map
-            // rather than inferring from the $newChapter since that variable may be null
-            // due to other reasons (Visibility).
-            $newParent = $sortMapItem->parentChapterId ? $newChapter : $newBook;
-            if (!$newParent) {
-                return false;
-            }
-
-            $hasPageEditPermission = userCan('page-update', $model);
-            $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));
-            $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
-            $hasNewParentPermission = userCan($newParentPermission, $newParent);
-
-            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan('page-delete', $model));
-            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan('page-create', $newParent));
-
-            $hasPermission = $hasCurrentParentPermission
-                && $newParentInRightLocation
-                && $hasNewParentPermission
-                && $hasPageEditPermission
-                && $hasDeletePermissionIfMoving
-                && $hasCreatePermissionIfMoving;
-
-            if (!$hasPermission) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Load models from the database into the given sort map.
-     *
-     * @return array<string, Entity>
-     */
-    protected function loadModelsFromSortMap(BookSortMap $sortMap): array
-    {
-        $modelMap = [];
-        $ids = [
-            'chapter' => [],
-            'page'    => [],
-            'book'    => [],
-        ];
-
-        foreach ($sortMap->all() as $sortMapItem) {
-            $ids[$sortMapItem->type][] = $sortMapItem->id;
-            $ids['book'][] = $sortMapItem->parentBookId;
-            if ($sortMapItem->parentChapterId) {
-                $ids['chapter'][] = $sortMapItem->parentChapterId;
-            }
-        }
-
-        $pages = $this->queries->pages->visibleForList()->whereIn('id', array_unique($ids['page']))->get();
-        /** @var Page $page */
-        foreach ($pages as $page) {
-            $modelMap['page:' . $page->id] = $page;
-            $ids['book'][] = $page->book_id;
-            if ($page->chapter_id) {
-                $ids['chapter'][] = $page->chapter_id;
-            }
-        }
-
-        $chapters = $this->queries->chapters->visibleForList()->whereIn('id', array_unique($ids['chapter']))->get();
-        /** @var Chapter $chapter */
-        foreach ($chapters as $chapter) {
-            $modelMap['chapter:' . $chapter->id] = $chapter;
-            $ids['book'][] = $chapter->book_id;
-        }
-
-        $books = $this->queries->books->visibleForList()->whereIn('id', array_unique($ids['book']))->get();
-        /** @var Book $book */
-        foreach ($books as $book) {
-            $modelMap['book:' . $book->id] = $book;
-        }
-
-        return $modelMap;
-    }
 }
diff --git a/app/Entities/Controllers/BookSortController.php b/app/Sorting/BookSortController.php
similarity index 88%
rename from app/Entities/Controllers/BookSortController.php
rename to app/Sorting/BookSortController.php
index 5aefc583279..feed5db4fde 100644
--- a/app/Entities/Controllers/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace BookStack\Entities\Controllers;
+namespace BookStack\Sorting;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\BookContents;
-use BookStack\Entities\Tools\BookSortMap;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
@@ -47,7 +46,7 @@ public function showItem(string $bookSlug)
     /**
      * Sorts a book using a given mapping array.
      */
-    public function update(Request $request, string $bookSlug)
+    public function update(Request $request, BookSorter $sorter, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
@@ -58,8 +57,7 @@ public function update(Request $request, string $bookSlug)
         }
 
         $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
-        $bookContents = new BookContents($book);
-        $booksInvolved = $bookContents->sortUsingMap($sortMap);
+        $booksInvolved = $sorter->sortUsingMap($sortMap);
 
         // Rebuild permissions and add activity for involved books.
         foreach ($booksInvolved as $bookInvolved) {
diff --git a/app/Entities/Tools/BookSortMap.php b/app/Sorting/BookSortMap.php
similarity index 96%
rename from app/Entities/Tools/BookSortMap.php
rename to app/Sorting/BookSortMap.php
index ff1ec767f78..96c9d342a27 100644
--- a/app/Entities/Tools/BookSortMap.php
+++ b/app/Sorting/BookSortMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Entities\Tools;
+namespace BookStack\Sorting;
 
 class BookSortMap
 {
diff --git a/app/Entities/Tools/BookSortMapItem.php b/app/Sorting/BookSortMapItem.php
similarity index 94%
rename from app/Entities/Tools/BookSortMapItem.php
rename to app/Sorting/BookSortMapItem.php
index f76d87f2366..8f517edd6ff 100644
--- a/app/Entities/Tools/BookSortMapItem.php
+++ b/app/Sorting/BookSortMapItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Entities\Tools;
+namespace BookStack\Sorting;
 
 class BookSortMapItem
 {
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
new file mode 100644
index 00000000000..7268b3543a3
--- /dev/null
+++ b/app/Sorting/BookSorter.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace BookStack\Sorting;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
+
+class BookSorter
+{
+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
+
+    /**
+     * Sort the books content using the given sort map.
+     * Returns a list of books that were involved in the operation.
+     *
+     * @returns Book[]
+     */
+    public function sortUsingMap(BookSortMap $sortMap): array
+    {
+        // Load models into map
+        $modelMap = $this->loadModelsFromSortMap($sortMap);
+
+        // Sort our changes from our map to be chapters first
+        // Since they need to be process to ensure book alignment for child page changes.
+        $sortMapItems = $sortMap->all();
+        usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) {
+            $aScore = $itemA->type === 'page' ? 2 : 1;
+            $bScore = $itemB->type === 'page' ? 2 : 1;
+
+            return $aScore - $bScore;
+        });
+
+        // Perform the sort
+        foreach ($sortMapItems as $item) {
+            $this->applySortUpdates($item, $modelMap);
+        }
+
+        /** @var Book[] $booksInvolved */
+        $booksInvolved = array_values(array_filter($modelMap, function (string $key) {
+            return str_starts_with($key, 'book:');
+        }, ARRAY_FILTER_USE_KEY));
+
+        // Update permissions of books involved
+        foreach ($booksInvolved as $book) {
+            $book->rebuildPermissions();
+        }
+
+        return $booksInvolved;
+    }
+
+    /**
+     * Using the given sort map item, detect changes for the related model
+     * and update it if required. Changes where permissions are lacking will
+     * be skipped and not throw an error.
+     *
+     * @param array<string, Entity> $modelMap
+     */
+    protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMap): void
+    {
+        /** @var BookChild $model */
+        $model = $modelMap[$sortMapItem->type . ':' . $sortMapItem->id] ?? null;
+        if (!$model) {
+            return;
+        }
+
+        $priorityChanged = $model->priority !== $sortMapItem->sort;
+        $bookChanged = $model->book_id !== $sortMapItem->parentBookId;
+        $chapterChanged = ($model instanceof Page) && $model->chapter_id !== $sortMapItem->parentChapterId;
+
+        // Stop if there's no change
+        if (!$priorityChanged && !$bookChanged && !$chapterChanged) {
+            return;
+        }
+
+        $currentParentKey = 'book:' . $model->book_id;
+        if ($model instanceof Page && $model->chapter_id) {
+            $currentParentKey = 'chapter:' . $model->chapter_id;
+        }
+
+        $currentParent = $modelMap[$currentParentKey] ?? null;
+        /** @var Book $newBook */
+        $newBook = $modelMap['book:' . $sortMapItem->parentBookId] ?? null;
+        /** @var ?Chapter $newChapter */
+        $newChapter = $sortMapItem->parentChapterId ? ($modelMap['chapter:' . $sortMapItem->parentChapterId] ?? null) : null;
+
+        if (!$this->isSortChangePermissible($sortMapItem, $model, $currentParent, $newBook, $newChapter)) {
+            return;
+        }
+
+        // Action the required changes
+        if ($bookChanged) {
+            $model->changeBook($newBook->id);
+        }
+
+        if ($model instanceof Page && $chapterChanged) {
+            $model->chapter_id = $newChapter->id ?? 0;
+        }
+
+        if ($priorityChanged) {
+            $model->priority = $sortMapItem->sort;
+        }
+
+        if ($chapterChanged || $priorityChanged) {
+            $model->save();
+        }
+    }
+
+    /**
+     * Check if the current user has permissions to apply the given sorting change.
+     * Is quite complex since items can gain a different parent change. Acts as a:
+     * - Update of old parent element (Change of content/order).
+     * - Update of sorted/moved element.
+     * - Deletion of element (Relative to parent upon move).
+     * - Creation of element within parent (Upon move to new parent).
+     */
+    protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChild $model, ?Entity $currentParent, ?Entity $newBook, ?Entity $newChapter): bool
+    {
+        // Stop if we can't see the current parent or new book.
+        if (!$currentParent || !$newBook) {
+            return false;
+        }
+
+        $hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));
+        if ($model instanceof Chapter) {
+            $hasPermission = userCan('book-update', $currentParent)
+                && userCan('book-update', $newBook)
+                && userCan('chapter-update', $model)
+                && (!$hasNewParent || userCan('chapter-create', $newBook))
+                && (!$hasNewParent || userCan('chapter-delete', $model));
+
+            if (!$hasPermission) {
+                return false;
+            }
+        }
+
+        if ($model instanceof Page) {
+            $parentPermission = ($currentParent instanceof Chapter) ? 'chapter-update' : 'book-update';
+            $hasCurrentParentPermission = userCan($parentPermission, $currentParent);
+
+            // This needs to check if there was an intended chapter location in the original sort map
+            // rather than inferring from the $newChapter since that variable may be null
+            // due to other reasons (Visibility).
+            $newParent = $sortMapItem->parentChapterId ? $newChapter : $newBook;
+            if (!$newParent) {
+                return false;
+            }
+
+            $hasPageEditPermission = userCan('page-update', $model);
+            $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));
+            $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
+            $hasNewParentPermission = userCan($newParentPermission, $newParent);
+
+            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan('page-delete', $model));
+            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan('page-create', $newParent));
+
+            $hasPermission = $hasCurrentParentPermission
+                && $newParentInRightLocation
+                && $hasNewParentPermission
+                && $hasPageEditPermission
+                && $hasDeletePermissionIfMoving
+                && $hasCreatePermissionIfMoving;
+
+            if (!$hasPermission) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Load models from the database into the given sort map.
+     *
+     * @return array<string, Entity>
+     */
+    protected function loadModelsFromSortMap(BookSortMap $sortMap): array
+    {
+        $modelMap = [];
+        $ids = [
+            'chapter' => [],
+            'page'    => [],
+            'book'    => [],
+        ];
+
+        foreach ($sortMap->all() as $sortMapItem) {
+            $ids[$sortMapItem->type][] = $sortMapItem->id;
+            $ids['book'][] = $sortMapItem->parentBookId;
+            if ($sortMapItem->parentChapterId) {
+                $ids['chapter'][] = $sortMapItem->parentChapterId;
+            }
+        }
+
+        $pages = $this->queries->pages->visibleForList()->whereIn('id', array_unique($ids['page']))->get();
+        /** @var Page $page */
+        foreach ($pages as $page) {
+            $modelMap['page:' . $page->id] = $page;
+            $ids['book'][] = $page->book_id;
+            if ($page->chapter_id) {
+                $ids['chapter'][] = $page->chapter_id;
+            }
+        }
+
+        $chapters = $this->queries->chapters->visibleForList()->whereIn('id', array_unique($ids['chapter']))->get();
+        /** @var Chapter $chapter */
+        foreach ($chapters as $chapter) {
+            $modelMap['chapter:' . $chapter->id] = $chapter;
+            $ids['book'][] = $chapter->book_id;
+        }
+
+        $books = $this->queries->books->visibleForList()->whereIn('id', array_unique($ids['book']))->get();
+        /** @var Book $book */
+        foreach ($books as $book) {
+            $modelMap['book:' . $book->id] = $book;
+        }
+
+        return $modelMap;
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index 5bb9622e737..e1e819dd03e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,6 +13,7 @@
 use BookStack\References\ReferenceController;
 use BookStack\Search\SearchController;
 use BookStack\Settings as SettingControllers;
+use BookStack\Sorting\BookSortController;
 use BookStack\Theming\ThemeController;
 use BookStack\Uploads\Controllers as UploadControllers;
 use BookStack\Users\Controllers as UserControllers;
@@ -66,7 +67,7 @@
     Route::get('/books/{slug}/edit', [EntityControllers\BookController::class, 'edit']);
     Route::put('/books/{slug}', [EntityControllers\BookController::class, 'update']);
     Route::delete('/books/{id}', [EntityControllers\BookController::class, 'destroy']);
-    Route::get('/books/{slug}/sort-item', [EntityControllers\BookSortController::class, 'showItem']);
+    Route::get('/books/{slug}/sort-item', [BookSortController::class, 'showItem']);
     Route::get('/books/{slug}', [EntityControllers\BookController::class, 'show']);
     Route::get('/books/{bookSlug}/permissions', [PermissionsController::class, 'showForBook']);
     Route::put('/books/{bookSlug}/permissions', [PermissionsController::class, 'updateForBook']);
@@ -74,8 +75,8 @@
     Route::get('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'showCopy']);
     Route::post('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'copy']);
     Route::post('/books/{bookSlug}/convert-to-shelf', [EntityControllers\BookController::class, 'convertToShelf']);
-    Route::get('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'show']);
-    Route::put('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'update']);
+    Route::get('/books/{bookSlug}/sort', [BookSortController::class, 'show']);
+    Route::put('/books/{bookSlug}/sort', [BookSortController::class, 'update']);
     Route::get('/books/{slug}/references', [ReferenceController::class, 'book']);
     Route::get('/books/{bookSlug}/export/html', [ExportControllers\BookExportController::class, 'html']);
     Route::get('/books/{bookSlug}/export/pdf', [ExportControllers\BookExportController::class, 'pdf']);

From 5b0cb3dd506c108b5d5d13c5c07c4f02e6107608 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 29 Jan 2025 17:02:34 +0000
Subject: [PATCH 450/666] Sorting: Extracted URL sort helper to own class

Was only used in one place, so didn't make sense to have extra global
helper clutter.
---
 .../Controllers/AuditLogController.php        |  2 +
 app/App/helpers.php                           | 32 ------------
 app/Sorting/SortUrl.php                       | 49 +++++++++++++++++++
 resources/views/settings/audit.blade.php      |  4 +-
 4 files changed, 53 insertions(+), 34 deletions(-)
 create mode 100644 app/Sorting/SortUrl.php

diff --git a/app/Activity/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.php
index 641106d7f45..66ca301977c 100644
--- a/app/Activity/Controllers/AuditLogController.php
+++ b/app/Activity/Controllers/AuditLogController.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Activity;
 use BookStack\Http\Controller;
+use BookStack\Sorting\SortUrl;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
@@ -65,6 +66,7 @@ public function index(Request $request)
             'filters'       => $filters,
             'listOptions'   => $listOptions,
             'activityTypes' => $types,
+            'filterSortUrl' => new SortUrl('settings/audit', array_filter($request->except('page')))
         ]);
     }
 }
diff --git a/app/App/helpers.php b/app/App/helpers.php
index 941c267d6cd..204b3f06a72 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -96,35 +96,3 @@ function theme_path(string $path = ''): ?string
 
     return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
 }
-
-/**
- * Generate a URL with multiple parameters for sorting purposes.
- * Works out the logic to set the correct sorting direction
- * Discards empty parameters and allows overriding.
- */
-function sortUrl(string $path, array $data, array $overrideData = []): string
-{
-    $queryStringSections = [];
-    $queryData = array_merge($data, $overrideData);
-
-    // Change sorting direction is already sorted on current attribute
-    if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
-        $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';
-    } elseif (isset($overrideData['sort'])) {
-        $queryData['order'] = 'asc';
-    }
-
-    foreach ($queryData as $name => $value) {
-        $trimmedVal = trim($value);
-        if ($trimmedVal === '') {
-            continue;
-        }
-        $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);
-    }
-
-    if (count($queryStringSections) === 0) {
-        return url($path);
-    }
-
-    return url($path . '?' . implode('&', $queryStringSections));
-}
diff --git a/app/Sorting/SortUrl.php b/app/Sorting/SortUrl.php
new file mode 100644
index 00000000000..f01df2c36a0
--- /dev/null
+++ b/app/Sorting/SortUrl.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace BookStack\Sorting;
+
+/**
+ * Generate a URL with multiple parameters for sorting purposes.
+ * Works out the logic to set the correct sorting direction
+ * Discards empty parameters and allows overriding.
+ */
+class SortUrl
+{
+    public function __construct(
+        protected string $path,
+        protected array $data,
+        protected array $overrideData = []
+    ) {
+    }
+
+    public function withOverrideData(array $overrideData = []): self
+    {
+        return new self($this->path, $this->data, $overrideData);
+    }
+
+    public function build(): string
+    {
+        $queryStringSections = [];
+        $queryData = array_merge($this->data, $this->overrideData);
+
+        // Change sorting direction if already sorted on current attribute
+        if (isset($this->overrideData['sort']) && $this->overrideData['sort'] === $this->data['sort']) {
+            $queryData['order'] = ($this->data['order'] === 'asc') ? 'desc' : 'asc';
+        } elseif (isset($this->overrideData['sort'])) {
+            $queryData['order'] = 'asc';
+        }
+
+        foreach ($queryData as $name => $value) {
+            $trimmedVal = trim($value);
+            if ($trimmedVal !== '') {
+                $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);
+            }
+        }
+
+        if (count($queryStringSections) === 0) {
+            return url($this->path);
+        }
+
+        return url($this->path . '?' . implode('&', $queryStringSections));
+    }
+}
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 28cdeb8a5a7..8e477668040 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -26,11 +26,11 @@ class="flex-container-row wrap justify-flex-start gap-x-m gap-y-xs">
                             class="input-base text-left">{{ $filters['event'] ?: trans('settings.audit_event_filter_no_filter') }}</button>
                     <ul refs="dropdown@menu" class="dropdown-menu">
                         <li @if($filters['event'] === '') class="active" @endif><a
-                                    href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => '']) }}"
+                                    href="{{ $filterSortUrl->withOverrideData(['event' => ''])->build() }}"
                                     class="text-item">{{ trans('settings.audit_event_filter_no_filter') }}</a></li>
                         @foreach($activityTypes as $type)
                             <li @if($type === $filters['event']) class="active" @endif><a
-                                        href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => $type]) }}"
+                                        href="{{ $filterSortUrl->withOverrideData(['event' => $type])->build() }}"
                                         class="text-item">{{ $type }}</a></li>
                         @endforeach
                     </ul>

From b2ac3e0834172e2eaf70d4c893c90704b5aa9bf8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 29 Jan 2025 17:34:07 +0000
Subject: [PATCH 451/666] Sorting: Added SortSet model & migration

---
 app/Sorting/SortSetOption.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 app/Sorting/SortSetOption.php

diff --git a/app/Sorting/SortSetOption.php b/app/Sorting/SortSetOption.php
new file mode 100644
index 00000000000..0a78e99c7eb
--- /dev/null
+++ b/app/Sorting/SortSetOption.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace BookStack\Sorting;
+
+enum SortSetOption: string
+{
+    case NameAsc = 'name_asc';
+    case NameDesc = 'name_desc';
+    case NameNumericAsc = 'name_numeric_asc';
+    case CreatedDateAsc = 'created_date_asc';
+    case CreatedDateDesc = 'created_date_desc';
+    case UpdateDateAsc = 'updated_date_asc';
+    case UpdateDateDesc = 'updated_date_desc';
+    case ChaptersFirst = 'chapters_first';
+    case ChaptersLast = 'chapters_last';
+}

From a34023f715575dcf64f0c023cea81af9aa1364e8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 30 Jan 2025 17:49:19 +0000
Subject: [PATCH 452/666] Sorting: Added content misses from last commit,
 started settings

---
 app/Sorting/SortSet.php                       | 35 +++++++++++++
 ...25_01_29_180933_create_sort_sets_table.php | 29 +++++++++++
 lang/en/settings.php                          |  7 +++
 .../settings/categories/sorting.blade.php     | 49 +++++++++++++++++++
 resources/views/settings/layout.blade.php     |  2 +
 5 files changed, 122 insertions(+)
 create mode 100644 app/Sorting/SortSet.php
 create mode 100644 database/migrations/2025_01_29_180933_create_sort_sets_table.php
 create mode 100644 resources/views/settings/categories/sorting.blade.php

diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
new file mode 100644
index 00000000000..42e1e0951c7
--- /dev/null
+++ b/app/Sorting/SortSet.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace BookStack\Sorting;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property string $sequence
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
+class SortSet extends Model
+{
+    /**
+     * @return SortSetOption[]
+     */
+    public function getOptions(): array
+    {
+        $strOptions = explode(',', $this->sequence);
+        $options = array_map(fn ($val) => SortSetOption::tryFrom($val), $strOptions);
+        return array_filter($options);
+    }
+
+    /**
+     * @param SortSetOption[] $options
+     */
+    public function setOptions(array $options): void
+    {
+        $values = array_map(fn (SortSetOption $opt) => $opt->value, $options);
+        $this->sequence = implode(',', $values);
+    }
+}
diff --git a/database/migrations/2025_01_29_180933_create_sort_sets_table.php b/database/migrations/2025_01_29_180933_create_sort_sets_table.php
new file mode 100644
index 00000000000..bf9780c5b7e
--- /dev/null
+++ b/database/migrations/2025_01_29_180933_create_sort_sets_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('sort_sets', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->text('sequence');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('sort_sets');
+    }
+};
diff --git a/lang/en/settings.php b/lang/en/settings.php
index c0b6b692a57..b20152bfe0b 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -74,6 +74,13 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort set to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_sets' => 'Sort Sets',
+    'sorting_sets_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
new file mode 100644
index 00000000000..153ea0e3b0b
--- /dev/null
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -0,0 +1,49 @@
+@extends('settings.layout')
+
+@section('card')
+    <h1 id="sorting" class="list-heading">{{ trans('settings.sorting') }}</h1>
+    <form action="{{ url("/settings/sorting") }}" method="POST">
+        {{ csrf_field() }}
+        <input type="hidden" name="section" value="sorting">
+
+        <div class="setting-list">
+            <div class="grid half gap-xl items-center">
+                <div>
+                    <label for="setting-sorting-book-default"
+                           class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
+                    <p class="small">{{ trans('settings.sorting_book_default_desc') }}</p>
+                </div>
+                <div>
+                    <select id="setting-sorting-book-default" name="setting-sorting-book-default"
+                            @if($errors->has('setting-sorting-book-default')) class="neg" @endif>
+                        <option value="0" @if(intval(setting('sorting-book-default', '0')) === 0) selected @endif>
+                            -- {{ trans('common.none') }} --
+                        </option>
+{{--                        TODO--}}
+{{--                        @foreach(\BookStack\Users\Models\Role::all() as $role)--}}
+{{--                            <option value="{{$role->id}}"--}}
+{{--                                    data-system-role-name="{{ $role->system_name ?? '' }}"--}}
+{{--                                    @if(intval(setting('registration-role', '0')) === $role->id) selected @endif--}}
+{{--                            >--}}
+{{--                                {{ $role->display_name }}--}}
+{{--                            </option>--}}
+{{--                        @endforeach--}}
+                    </select>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group text-right">
+            <button type="submit" class="button">{{ trans('settings.settings_save') }}</button>
+        </div>
+    </form>
+@endsection
+
+@section('after-card')
+    <div class="card content-wrap auto-height">
+        <h2 class="list-heading">{{ trans('settings.sorting_sets') }}</h2>
+        <p class="text-muted">{{ trans('settings.sorting_sets_desc') }}</p>
+{{--        TODO--}}
+    </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/settings/layout.blade.php b/resources/views/settings/layout.blade.php
index a59b58d535c..930d407a508 100644
--- a/resources/views/settings/layout.blade.php
+++ b/resources/views/settings/layout.blade.php
@@ -13,6 +13,7 @@
                     <a href="{{ url('/settings/features') }}" class="{{ $category === 'features' ? 'active' : '' }}">@icon('star') {{ trans('settings.app_features_security') }}</a>
                     <a href="{{ url('/settings/customization') }}" class="{{ $category === 'customization' ? 'active' : '' }}">@icon('palette') {{ trans('settings.app_customization') }}</a>
                     <a href="{{ url('/settings/registration') }}" class="{{ $category === 'registration' ? 'active' : '' }}">@icon('security') {{ trans('settings.reg_settings') }}</a>
+                    <a href="{{ url('/settings/sorting') }}" class="{{ $category === 'sorting' ? 'active' : '' }}">@icon('sort') {{ trans('settings.sorting') }}</a>
                 </nav>
 
                 <h5 class="mt-xl">{{ trans('settings.system_version') }}</h5>
@@ -29,6 +30,7 @@
                 <div class="card content-wrap auto-height">
                     @yield('card')
                 </div>
+                @yield('after-card')
             </div>
 
         </div>

From 4f5f7c10b10bfa0434cbe4c81a066cf779ca63e5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 31 Jan 2025 21:29:38 +0000
Subject: [PATCH 453/666] Thumbnails: Fixed thumnail orientation

Prevents double rotation caused from both our own orientation handling
upon that invervention was auto-applying since v3.

Fixes #5462
---
 app/Uploads/ImageResizer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index fa6b1cac2d4..5f095658f3f 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -158,7 +158,10 @@ public function resizeImageData(
      */
     protected function interventionFromImageData(string $imageData, ?string $fileType): InterventionImage
     {
-        $manager = new ImageManager(new Driver());
+        $manager = new ImageManager(
+            new Driver(),
+            autoOrientation: false,
+        );
 
         // Ensure gif images are decoded natively instead of deferring to intervention GIF
         // handling since we don't need the added animation support.

From bf8a84a8b1dd02578e6b5e2b39882902809f112a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 3 Feb 2025 16:48:57 +0000
Subject: [PATCH 454/666] Sorting: Started sort set routes and form

---
 app/Sorting/SortSetController.php             | 19 +++++
 app/Sorting/SortSetOption.php                 | 28 +++++++
 lang/en/settings.php                          | 16 ++++
 .../settings/categories/sorting.blade.php     | 12 ++-
 .../views/settings/sort-sets/create.blade.php | 24 ++++++
 .../settings/sort-sets/parts/form.blade.php   | 74 +++++++++++++++++++
 routes/web.php                                | 15 +++-
 7 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 app/Sorting/SortSetController.php
 create mode 100644 resources/views/settings/sort-sets/create.blade.php
 create mode 100644 resources/views/settings/sort-sets/parts/form.blade.php

diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortSetController.php
new file mode 100644
index 00000000000..4ef14829538
--- /dev/null
+++ b/app/Sorting/SortSetController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\Sorting;
+
+use BookStack\Http\Controller;
+
+class SortSetController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('can:settings-manage');
+        // TODO - Test
+    }
+
+    public function create()
+    {
+        return view('settings.sort-sets.create');
+    }
+}
diff --git a/app/Sorting/SortSetOption.php b/app/Sorting/SortSetOption.php
index 0a78e99c7eb..bb878cf30f9 100644
--- a/app/Sorting/SortSetOption.php
+++ b/app/Sorting/SortSetOption.php
@@ -13,4 +13,32 @@ enum SortSetOption: string
     case UpdateDateDesc = 'updated_date_desc';
     case ChaptersFirst = 'chapters_first';
     case ChaptersLast = 'chapters_last';
+
+    /**
+     * Provide a translated label string for this option.
+     */
+    public function getLabel(): string
+    {
+        $key = $this->value;
+        $label = '';
+        if (str_ends_with($key, '_asc')) {
+            $key = substr($key, 0, -4);
+            $label = trans('settings.sort_set_op_asc');
+        } elseif (str_ends_with($key, '_desc')) {
+            $key = substr($key, 0, -5);
+            $label = trans('settings.sort_set_op_desc');
+        }
+
+        $label = trans('settings.sort_set_op_' . $key) . ' ' . $label;
+        return trim($label);
+    }
+
+    /**
+     * @return SortSetOption[]
+     */
+    public static function allExcluding(array $options): array
+    {
+        $all = SortSetOption::cases();
+        return array_diff($all, $options);
+    }
 }
diff --git a/lang/en/settings.php b/lang/en/settings.php
index b20152bfe0b..b29ec25338b 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -80,6 +80,22 @@
     'sorting_book_default_desc' => 'Select the default sort set to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_sets' => 'Sort Sets',
     'sorting_sets_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_set_create' => 'Create Sort Set',
+    'sort_set_edit' => 'Edit Sort Set',
+    'sort_set_details' => 'Sort Set Details',
+    'sort_set_details_desc' => 'Set a name for this sort set, which will appear in lists when users are selecting a sort.',
+    'sort_set_operations' => 'Sort Operations',
+    'sort_set_operations_desc' => 'Configure the sort actions to be performed in this set by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom.',
+    'sort_set_available_operations' => 'Available Operations',
+    'sort_set_configured_operations' => 'Configured Operations',
+    'sort_set_op_asc' => '(Asc)',
+    'sort_set_op_desc' => '(Desc)',
+    'sort_set_op_name' => 'Name - Alphabetical',
+    'sort_set_op_name_numeric' => 'Name - Numeric',
+    'sort_set_op_created_date' => 'Created Date',
+    'sort_set_op_updated_date' => 'Updated Date',
+    'sort_set_op_chapters_first' => 'Chapters First',
+    'sort_set_op_chapters_last' => 'Chapters Last',
 
     // Maintenance settings
     'maint' => 'Maintenance',
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 153ea0e3b0b..9de11bb6f2b 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -42,8 +42,16 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
 
 @section('after-card')
     <div class="card content-wrap auto-height">
-        <h2 class="list-heading">{{ trans('settings.sorting_sets') }}</h2>
-        <p class="text-muted">{{ trans('settings.sorting_sets_desc') }}</p>
+        <div class="flex-container-row items-center gap-m">
+            <div class="flex">
+                <h2 class="list-heading">{{ trans('settings.sorting_sets') }}</h2>
+                <p class="text-muted">{{ trans('settings.sorting_sets_desc') }}</p>
+            </div>
+            <div>
+                <a href="{{ url('/settings/sorting/sets/new') }}" class="button outline">{{ trans('settings.sort_set_create') }}</a>
+            </div>
+        </div>
+
 {{--        TODO--}}
     </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/settings/sort-sets/create.blade.php b/resources/views/settings/sort-sets/create.blade.php
new file mode 100644
index 00000000000..16f2d2ac72c
--- /dev/null
+++ b/resources/views/settings/sort-sets/create.blade.php
@@ -0,0 +1,24 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container small">
+
+        @include('settings.parts.navbar', ['selected' => 'settings'])
+
+        <div class="card content-wrap auto-height">
+            <h1 class="list-heading">{{ trans('settings.sort_set_create') }}</h1>
+
+            <form action="{{ url("/settings/sorting/sets") }}" method="POST">
+                {{ csrf_field() }}
+                @include('settings.sort-sets.parts.form', ['model' => null])
+
+                <div class="form-group text-right">
+                    <a href="{{ url("/settings/sorting") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <button type="submit" class="button">{{ trans('common.save') }}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
+@stop
diff --git a/resources/views/settings/sort-sets/parts/form.blade.php b/resources/views/settings/sort-sets/parts/form.blade.php
new file mode 100644
index 00000000000..6df04a72191
--- /dev/null
+++ b/resources/views/settings/sort-sets/parts/form.blade.php
@@ -0,0 +1,74 @@
+
+<div class="setting-list">
+    <div class="grid half">
+        <div>
+            <label class="setting-list-label">{{ trans('settings.sort_set_details') }}</label>
+            <p class="text-muted text-small">{{ trans('settings.sort_set_details_desc') }}</p>
+        </div>
+        <div>
+            <div class="form-group">
+                <label for="name">{{ trans('common.name') }}</label>
+                @include('form.text', ['name' => 'name'])
+            </div>
+        </div>
+    </div>
+
+    <div>
+        <label class="setting-list-label">{{ trans('settings.sort_set_operations') }}</label>
+        <p class="text-muted text-small">{{ trans('settings.sort_set_operations_desc') }}</p>
+
+
+
+        <div class="grid half">
+            <div class="form-group">
+                <label for="books" id="sort-set-configured-operations">{{ trans('settings.sort_set_configured_operations') }}</label>
+                <ul refs="sort-set@configured-operations-list"
+                    aria-labelledby="sort-set-configured-operations"
+                    class="scroll-box">
+                    @foreach(($model?->getOptions() ?? []) as $option)
+                        <li data-id="{{ $option->value }}"
+                            class="scroll-box-item">
+                            <div class="handle px-s">@icon('grip')</div>
+                            <div>{{ $option->getLabel() }}</div>
+                            <div class="buttons flex-container-row items-center ml-auto px-xxs py-xs">
+                                <button type="button" data-action="move_up" class="icon-button p-xxs"
+                                        title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
+                                <button type="button" data-action="move_down" class="icon-button p-xxs"
+                                        title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
+                                <button type="button" data-action="remove" class="icon-button p-xxs"
+                                        title="{{ trans('common.remove') }}">@icon('remove')</button>
+                                <button type="button" data-action="add" class="icon-button p-xxs"
+                                        title="{{ trans('common.add') }}">@icon('add-small')</button>
+                            </div>
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+
+            <div class="form-group">
+                <label for="books" id="sort-set-available-operations">{{ trans('settings.sort_set_available_operations') }}</label>
+                <ul refs="sort-set@available-operations-list"
+                    aria-labelledby="sort-set-available-operations"
+                    class="scroll-box">
+                    @foreach(\BookStack\Sorting\SortSetOption::allExcluding($model?->getOptions() ?? []) as $option)
+                        <li data-id="{{ $option->value }}"
+                            class="scroll-box-item">
+                            <div class="handle px-s">@icon('grip')</div>
+                            <div>{{ $option->getLabel() }}</div>
+                            <div class="buttons flex-container-row items-center ml-auto px-xxs py-xs">
+                                <button type="button" data-action="move_up" class="icon-button p-xxs"
+                                        title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
+                                <button type="button" data-action="move_down" class="icon-button p-xxs"
+                                        title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
+                                <button type="button" data-action="remove" class="icon-button p-xxs"
+                                        title="{{ trans('common.remove') }}">@icon('remove')</button>
+                                <button type="button" data-action="add" class="icon-button p-xxs"
+                                        title="{{ trans('common.add') }}">@icon('add-small')</button>
+                            </div>
+                        </li>
+                    @endforeach
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index e1e819dd03e..62c120f2020 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,7 +13,7 @@
 use BookStack\References\ReferenceController;
 use BookStack\Search\SearchController;
 use BookStack\Settings as SettingControllers;
-use BookStack\Sorting\BookSortController;
+use BookStack\Sorting as SortingControllers;
 use BookStack\Theming\ThemeController;
 use BookStack\Uploads\Controllers as UploadControllers;
 use BookStack\Users\Controllers as UserControllers;
@@ -67,7 +67,7 @@
     Route::get('/books/{slug}/edit', [EntityControllers\BookController::class, 'edit']);
     Route::put('/books/{slug}', [EntityControllers\BookController::class, 'update']);
     Route::delete('/books/{id}', [EntityControllers\BookController::class, 'destroy']);
-    Route::get('/books/{slug}/sort-item', [BookSortController::class, 'showItem']);
+    Route::get('/books/{slug}/sort-item', [SortingControllers\BookSortController::class, 'showItem']);
     Route::get('/books/{slug}', [EntityControllers\BookController::class, 'show']);
     Route::get('/books/{bookSlug}/permissions', [PermissionsController::class, 'showForBook']);
     Route::put('/books/{bookSlug}/permissions', [PermissionsController::class, 'updateForBook']);
@@ -75,8 +75,8 @@
     Route::get('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'showCopy']);
     Route::post('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'copy']);
     Route::post('/books/{bookSlug}/convert-to-shelf', [EntityControllers\BookController::class, 'convertToShelf']);
-    Route::get('/books/{bookSlug}/sort', [BookSortController::class, 'show']);
-    Route::put('/books/{bookSlug}/sort', [BookSortController::class, 'update']);
+    Route::get('/books/{bookSlug}/sort', [SortingControllers\BookSortController::class, 'show']);
+    Route::put('/books/{bookSlug}/sort', [SortingControllers\BookSortController::class, 'update']);
     Route::get('/books/{slug}/references', [ReferenceController::class, 'book']);
     Route::get('/books/{bookSlug}/export/html', [ExportControllers\BookExportController::class, 'html']);
     Route::get('/books/{bookSlug}/export/pdf', [ExportControllers\BookExportController::class, 'pdf']);
@@ -295,6 +295,13 @@
     Route::get('/settings/webhooks/{id}/delete', [ActivityControllers\WebhookController::class, 'delete']);
     Route::delete('/settings/webhooks/{id}', [ActivityControllers\WebhookController::class, 'destroy']);
 
+    // Sort Sets
+    Route::get('/settings/sorting/sets/new', [SortingControllers\SortSetController::class, 'create']);
+    Route::post('/settings/sorting/sets', [SortingControllers\SortSetController::class, 'store']);
+    Route::get('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'edit']);
+    Route::put('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'update']);
+    Route::delete('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'destroy']);
+
     // Settings
     Route::get('/settings', [SettingControllers\SettingController::class, 'index'])->name('settings');
     Route::get('/settings/{category}', [SettingControllers\SettingController::class, 'category'])->name('settings.category');

From 12cc2f0689306048b7f13e4d04577da255d96583 Mon Sep 17 00:00:00 2001
From: Silverlan <silverlann@gmail.com>
Date: Mon, 3 Feb 2025 19:01:08 +0100
Subject: [PATCH 455/666] Fix incorrect condition for displaying new books
 section

---
 resources/views/books/index.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 418c0fea8d1..197de011d01 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -23,7 +23,7 @@
 
     <div id="new" class="mb-xl">
         <h5>{{ trans('entities.books_new') }}</h5>
-        @if(count($popular) > 0)
+        @if(count($new) > 0)
             @include('entities.list', ['entities' => $new, 'style' => 'compact'])
         @else
             <p class="text-muted pb-l mb-none">{{ trans('entities.books_new_empty') }}</p>
@@ -59,4 +59,4 @@
         </div>
     </div>
 
-@stop
\ No newline at end of file
+@stop

From d28278bba63eaa13d7ab691379b4b741c1fb83e6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 4 Feb 2025 15:14:22 +0000
Subject: [PATCH 456/666] Sorting: Added sort set form manager UI JS

Extracted much code to be shared with the shelf books management UI
---
 app/Sorting/SortSet.php                       | 12 ++--
 ...SortSetOption.php => SortSetOperation.php} | 10 ++--
 lang/en/settings.php                          |  2 +
 package-lock.json                             |  9 ++-
 package.json                                  |  1 +
 resources/js/components/index.ts              |  1 +
 resources/js/components/shelf-sort.js         | 48 ++-------------
 resources/js/components/sort-set-manager.ts   | 41 +++++++++++++
 resources/js/services/dual-lists.ts           | 51 ++++++++++++++++
 resources/sass/_components.scss               | 19 ++++--
 .../settings/sort-sets/parts/form.blade.php   | 58 ++++++-------------
 .../sort-sets/parts/operation.blade.php       | 15 +++++
 resources/views/shelves/parts/form.blade.php  |  4 +-
 13 files changed, 168 insertions(+), 103 deletions(-)
 rename app/Sorting/{SortSetOption.php => SortSetOperation.php} (82%)
 create mode 100644 resources/js/components/sort-set-manager.ts
 create mode 100644 resources/js/services/dual-lists.ts
 create mode 100644 resources/views/settings/sort-sets/parts/operation.blade.php

diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
index 42e1e0951c7..ee45c211f2d 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortSet.php
@@ -15,21 +15,21 @@
 class SortSet extends Model
 {
     /**
-     * @return SortSetOption[]
+     * @return SortSetOperation[]
      */
-    public function getOptions(): array
+    public function getOperations(): array
     {
         $strOptions = explode(',', $this->sequence);
-        $options = array_map(fn ($val) => SortSetOption::tryFrom($val), $strOptions);
+        $options = array_map(fn ($val) => SortSetOperation::tryFrom($val), $strOptions);
         return array_filter($options);
     }
 
     /**
-     * @param SortSetOption[] $options
+     * @param SortSetOperation[] $options
      */
-    public function setOptions(array $options): void
+    public function setOperations(array $options): void
     {
-        $values = array_map(fn (SortSetOption $opt) => $opt->value, $options);
+        $values = array_map(fn (SortSetOperation $opt) => $opt->value, $options);
         $this->sequence = implode(',', $values);
     }
 }
diff --git a/app/Sorting/SortSetOption.php b/app/Sorting/SortSetOperation.php
similarity index 82%
rename from app/Sorting/SortSetOption.php
rename to app/Sorting/SortSetOperation.php
index bb878cf30f9..12fda669fbd 100644
--- a/app/Sorting/SortSetOption.php
+++ b/app/Sorting/SortSetOperation.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Sorting;
 
-enum SortSetOption: string
+enum SortSetOperation: string
 {
     case NameAsc = 'name_asc';
     case NameDesc = 'name_desc';
@@ -34,11 +34,11 @@ public function getLabel(): string
     }
 
     /**
-     * @return SortSetOption[]
+     * @return SortSetOperation[]
      */
-    public static function allExcluding(array $options): array
+    public static function allExcluding(array $operations): array
     {
-        $all = SortSetOption::cases();
-        return array_diff($all, $options);
+        $all = SortSetOperation::cases();
+        return array_diff($all, $operations);
     }
 }
diff --git a/lang/en/settings.php b/lang/en/settings.php
index b29ec25338b..8bb2f6ef481 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -87,7 +87,9 @@
     'sort_set_operations' => 'Sort Operations',
     'sort_set_operations_desc' => 'Configure the sort actions to be performed in this set by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom.',
     'sort_set_available_operations' => 'Available Operations',
+    'sort_set_available_operations_empty' => 'No operations remaining',
     'sort_set_configured_operations' => 'Configured Operations',
+    'sort_set_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
     'sort_set_op_asc' => '(Asc)',
     'sort_set_op_desc' => '(Desc)',
     'sort_set_op_name' => 'Name - Alphabetical',
diff --git a/package-lock.json b/package-lock.json
index 1912106c2b7..44a735d2f0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,7 +4,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "bookstack",
       "dependencies": {
         "@codemirror/commands": "^6.7.1",
         "@codemirror/lang-css": "^6.3.1",
@@ -32,6 +31,7 @@
       },
       "devDependencies": {
         "@lezer/generator": "^1.7.2",
+        "@types/sortablejs": "^1.15.8",
         "chokidar-cli": "^3.0",
         "esbuild": "^0.24.0",
         "eslint": "^8.57.1",
@@ -2403,6 +2403,13 @@
         "undici-types": "~6.19.2"
       }
     },
+    "node_modules/@types/sortablejs": {
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
diff --git a/package.json b/package.json
index 08af25d140f..4571ea77d76 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.2",
+    "@types/sortablejs": "^1.15.8",
     "chokidar-cli": "^3.0",
     "esbuild": "^0.24.0",
     "eslint": "^8.57.1",
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index 12c991a51d8..affa25fcf31 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -50,6 +50,7 @@ export {ShelfSort} from './shelf-sort';
 export {Shortcuts} from './shortcuts';
 export {ShortcutInput} from './shortcut-input';
 export {SortableList} from './sortable-list';
+export {SortSetManager} from './sort-set-manager'
 export {SubmitOnChange} from './submit-on-change';
 export {Tabs} from './tabs';
 export {TagManager} from './tag-manager';
diff --git a/resources/js/components/shelf-sort.js b/resources/js/components/shelf-sort.js
index 01ca11a333f..b56b01980a1 100644
--- a/resources/js/components/shelf-sort.js
+++ b/resources/js/components/shelf-sort.js
@@ -1,29 +1,6 @@
 import Sortable from 'sortablejs';
 import {Component} from './component';
-
-/**
- * @type {Object<string, function(HTMLElement, HTMLElement, HTMLElement)>}
- */
-const itemActions = {
-    move_up(item) {
-        const list = item.parentNode;
-        const index = Array.from(list.children).indexOf(item);
-        const newIndex = Math.max(index - 1, 0);
-        list.insertBefore(item, list.children[newIndex] || null);
-    },
-    move_down(item) {
-        const list = item.parentNode;
-        const index = Array.from(list.children).indexOf(item);
-        const newIndex = Math.min(index + 2, list.children.length);
-        list.insertBefore(item, list.children[newIndex] || null);
-    },
-    remove(item, shelfBooksList, allBooksList) {
-        allBooksList.appendChild(item);
-    },
-    add(item, shelfBooksList) {
-        shelfBooksList.appendChild(item);
-    },
-};
+import {buildListActions, sortActionClickListener} from '../services/dual-lists.ts';
 
 export class ShelfSort extends Component {
 
@@ -55,12 +32,9 @@ export class ShelfSort extends Component {
     }
 
     setupListeners() {
-        this.elem.addEventListener('click', event => {
-            const sortItemAction = event.target.closest('.scroll-box-item button[data-action]');
-            if (sortItemAction) {
-                this.sortItemActionClick(sortItemAction);
-            }
-        });
+        const listActions = buildListActions(this.allBookList, this.shelfBookList);
+        const sortActionListener = sortActionClickListener(listActions, this.onChange.bind(this));
+        this.elem.addEventListener('click', sortActionListener);
 
         this.bookSearchInput.addEventListener('input', () => {
             this.filterBooksByName(this.bookSearchInput.value);
@@ -93,20 +67,6 @@ export class ShelfSort extends Component {
         }
     }
 
-    /**
-     * Called when a sort item action button is clicked.
-     * @param {HTMLElement} sortItemAction
-     */
-    sortItemActionClick(sortItemAction) {
-        const sortItem = sortItemAction.closest('.scroll-box-item');
-        const {action} = sortItemAction.dataset;
-
-        const actionFunction = itemActions[action];
-        actionFunction(sortItem, this.shelfBookList, this.allBookList);
-
-        this.onChange();
-    }
-
     onChange() {
         const shelfBookElems = Array.from(this.shelfBookList.querySelectorAll('[data-id]'));
         this.input.value = shelfBookElems.map(elem => elem.getAttribute('data-id')).join(',');
diff --git a/resources/js/components/sort-set-manager.ts b/resources/js/components/sort-set-manager.ts
new file mode 100644
index 00000000000..c35ad41fe07
--- /dev/null
+++ b/resources/js/components/sort-set-manager.ts
@@ -0,0 +1,41 @@
+import {Component} from "./component.js";
+import Sortable from "sortablejs";
+import {buildListActions, sortActionClickListener} from "../services/dual-lists";
+
+
+export class SortSetManager extends Component {
+
+    protected input!: HTMLInputElement;
+    protected configuredList!: HTMLElement;
+    protected availableList!: HTMLElement;
+
+    setup() {
+        this.input = this.$refs.input as HTMLInputElement;
+        this.configuredList = this.$refs.configuredOperationsList;
+        this.availableList = this.$refs.availableOperationsList;
+
+        this.initSortable();
+
+        const listActions = buildListActions(this.availableList, this.configuredList);
+        const sortActionListener = sortActionClickListener(listActions, this.onChange.bind(this));
+        this.$el.addEventListener('click', sortActionListener);
+    }
+
+    initSortable() {
+        const scrollBoxes = [this.configuredList, this.availableList];
+        for (const scrollBox of scrollBoxes) {
+            new Sortable(scrollBox, {
+                group: 'sort-set-operations',
+                ghostClass: 'primary-background-light',
+                handle: '.handle',
+                animation: 150,
+                onSort: this.onChange.bind(this),
+            });
+        }
+    }
+
+    onChange() {
+        const configuredOpEls = Array.from(this.configuredList.querySelectorAll('[data-id]'));
+        this.input.value = configuredOpEls.map(elem => elem.getAttribute('data-id')).join(',');
+    }
+}
\ No newline at end of file
diff --git a/resources/js/services/dual-lists.ts b/resources/js/services/dual-lists.ts
new file mode 100644
index 00000000000..98f2af92daf
--- /dev/null
+++ b/resources/js/services/dual-lists.ts
@@ -0,0 +1,51 @@
+/**
+ * Service for helping manage common dual-list scenarios.
+ * (Shelf book manager, sort set manager).
+ */
+
+type ListActionsSet = Record<string, ((item: HTMLElement) => void)>;
+
+export function buildListActions(
+    availableList: HTMLElement,
+    configuredList: HTMLElement,
+): ListActionsSet {
+    return {
+        move_up(item) {
+            const list = item.parentNode as HTMLElement;
+            const index = Array.from(list.children).indexOf(item);
+            const newIndex = Math.max(index - 1, 0);
+            list.insertBefore(item, list.children[newIndex] || null);
+        },
+        move_down(item) {
+            const list = item.parentNode as HTMLElement;
+            const index = Array.from(list.children).indexOf(item);
+            const newIndex = Math.min(index + 2, list.children.length);
+            list.insertBefore(item, list.children[newIndex] || null);
+        },
+        remove(item) {
+            availableList.appendChild(item);
+        },
+        add(item) {
+            configuredList.appendChild(item);
+        },
+    };
+}
+
+export function sortActionClickListener(actions: ListActionsSet, onChange: () => void) {
+    return (event: MouseEvent) => {
+        const sortItemAction = (event.target as Element).closest('.scroll-box-item button[data-action]') as HTMLElement|null;
+        if (sortItemAction) {
+            const sortItem = sortItemAction.closest('.scroll-box-item') as HTMLElement;
+            const action = sortItemAction.dataset.action;
+            if (!action) {
+                throw new Error('No action defined for clicked button');
+            }
+
+            const actionFunction = actions[action];
+            actionFunction(sortItem);
+
+            onChange();
+        }
+    };
+}
+
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 888b325275e..58d39d3ee6e 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -1062,12 +1062,16 @@ $btt-size: 40px;
     cursor: pointer;
     @include mixins.lightDark(background-color, #f8f8f8, #333);
   }
+  &.items-center {
+    align-items: center;
+  }
   .handle {
     color: #AAA;
     cursor: grab;
   }
   button {
     opacity: .6;
+    line-height: 1;
   }
   .handle svg {
     margin: 0;
@@ -1108,12 +1112,19 @@ input.scroll-box-search, .scroll-box-header-item {
   border-radius: 0 0 3px 3px;
 }
 
-.scroll-box[refs="shelf-sort@shelf-book-list"] [data-action="add"] {
+.scroll-box.configured-option-list [data-action="add"] {
   display: none;
 }
-.scroll-box[refs="shelf-sort@all-book-list"] [data-action="remove"],
-.scroll-box[refs="shelf-sort@all-book-list"] [data-action="move_up"],
-.scroll-box[refs="shelf-sort@all-book-list"] [data-action="move_down"],
+.scroll-box.available-option-list [data-action="remove"],
+.scroll-box.available-option-list [data-action="move_up"],
+.scroll-box.available-option-list [data-action="move_down"],
 {
   display: none;
+}
+
+.scroll-box > li.empty-state {
+  display: none;
+}
+.scroll-box > li.empty-state:last-child {
+  display: list-item;
 }
\ No newline at end of file
diff --git a/resources/views/settings/sort-sets/parts/form.blade.php b/resources/views/settings/sort-sets/parts/form.blade.php
index 6df04a72191..3f22209471f 100644
--- a/resources/views/settings/sort-sets/parts/form.blade.php
+++ b/resources/views/settings/sort-sets/parts/form.blade.php
@@ -1,4 +1,3 @@
-
 <div class="setting-list">
     <div class="grid half">
         <div>
@@ -13,59 +12,36 @@
         </div>
     </div>
 
-    <div>
+    <div component="sort-set-manager">
         <label class="setting-list-label">{{ trans('settings.sort_set_operations') }}</label>
         <p class="text-muted text-small">{{ trans('settings.sort_set_operations_desc') }}</p>
 
-
+        <input refs="sort-set-manager@input" type="hidden" name="books"
+               value="{{ $model?->sequence ?? '' }}">
 
         <div class="grid half">
             <div class="form-group">
-                <label for="books" id="sort-set-configured-operations">{{ trans('settings.sort_set_configured_operations') }}</label>
-                <ul refs="sort-set@configured-operations-list"
+                <label for="books"
+                       id="sort-set-configured-operations">{{ trans('settings.sort_set_configured_operations') }}</label>
+                <ul refs="sort-set-manager@configured-operations-list"
                     aria-labelledby="sort-set-configured-operations"
-                    class="scroll-box">
-                    @foreach(($model?->getOptions() ?? []) as $option)
-                        <li data-id="{{ $option->value }}"
-                            class="scroll-box-item">
-                            <div class="handle px-s">@icon('grip')</div>
-                            <div>{{ $option->getLabel() }}</div>
-                            <div class="buttons flex-container-row items-center ml-auto px-xxs py-xs">
-                                <button type="button" data-action="move_up" class="icon-button p-xxs"
-                                        title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
-                                <button type="button" data-action="move_down" class="icon-button p-xxs"
-                                        title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
-                                <button type="button" data-action="remove" class="icon-button p-xxs"
-                                        title="{{ trans('common.remove') }}">@icon('remove')</button>
-                                <button type="button" data-action="add" class="icon-button p-xxs"
-                                        title="{{ trans('common.add') }}">@icon('add-small')</button>
-                            </div>
-                        </li>
+                    class="scroll-box configured-option-list">
+                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_configured_operations_empty') }}</li>
+                    @foreach(($model?->getOperations() ?? []) as $option)
+                        @include('settings.sort-sets.parts.operation')
                     @endforeach
                 </ul>
             </div>
 
             <div class="form-group">
-                <label for="books" id="sort-set-available-operations">{{ trans('settings.sort_set_available_operations') }}</label>
-                <ul refs="sort-set@available-operations-list"
+                <label for="books"
+                       id="sort-set-available-operations">{{ trans('settings.sort_set_available_operations') }}</label>
+                <ul refs="sort-set-manager@available-operations-list"
                     aria-labelledby="sort-set-available-operations"
-                    class="scroll-box">
-                    @foreach(\BookStack\Sorting\SortSetOption::allExcluding($model?->getOptions() ?? []) as $option)
-                        <li data-id="{{ $option->value }}"
-                            class="scroll-box-item">
-                            <div class="handle px-s">@icon('grip')</div>
-                            <div>{{ $option->getLabel() }}</div>
-                            <div class="buttons flex-container-row items-center ml-auto px-xxs py-xs">
-                                <button type="button" data-action="move_up" class="icon-button p-xxs"
-                                        title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
-                                <button type="button" data-action="move_down" class="icon-button p-xxs"
-                                        title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
-                                <button type="button" data-action="remove" class="icon-button p-xxs"
-                                        title="{{ trans('common.remove') }}">@icon('remove')</button>
-                                <button type="button" data-action="add" class="icon-button p-xxs"
-                                        title="{{ trans('common.add') }}">@icon('add-small')</button>
-                            </div>
-                        </li>
+                    class="scroll-box available-option-list">
+                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_available_operations_empty') }}</li>
+                    @foreach(\BookStack\Sorting\SortSetOperation::allExcluding($model?->getOperations() ?? []) as $operation)
+                        @include('settings.sort-sets.parts.operation', ['operation' => $operation])
                     @endforeach
                 </ul>
             </div>
diff --git a/resources/views/settings/sort-sets/parts/operation.blade.php b/resources/views/settings/sort-sets/parts/operation.blade.php
new file mode 100644
index 00000000000..3feb68a4742
--- /dev/null
+++ b/resources/views/settings/sort-sets/parts/operation.blade.php
@@ -0,0 +1,15 @@
+<li data-id="{{ $operation->value }}"
+    class="scroll-box-item items-center">
+    <div class="handle px-s">@icon('grip')</div>
+    <div class="text-small">{{ $operation->getLabel() }}</div>
+    <div class="buttons flex-container-row items-center ml-auto px-xxs py-xxs">
+        <button type="button" data-action="move_up" class="icon-button p-xxs"
+                title="{{ trans('entities.books_sort_move_up') }}">@icon('chevron-up')</button>
+        <button type="button" data-action="move_down" class="icon-button p-xxs"
+                title="{{ trans('entities.books_sort_move_down') }}">@icon('chevron-down')</button>
+        <button type="button" data-action="remove" class="icon-button p-xxs"
+                title="{{ trans('common.remove') }}">@icon('remove')</button>
+        <button type="button" data-action="add" class="icon-button p-xxs"
+                title="{{ trans('common.add') }}">@icon('add-small')</button>
+    </div>
+</li>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/form.blade.php b/resources/views/shelves/parts/form.blade.php
index a75dd6ac1b5..7790ba5a4e7 100644
--- a/resources/views/shelves/parts/form.blade.php
+++ b/resources/views/shelves/parts/form.blade.php
@@ -38,7 +38,7 @@ class="icon-button px-xs py-xxs mx-xs text-bigger"
         </div>
         <ul refs="shelf-sort@shelf-book-list"
             aria-labelledby="shelf-sort-books-label"
-            class="scroll-box">
+            class="scroll-box configured-option-list">
             @foreach (($shelf->visibleBooks ?? []) as $book)
                 @include('shelves.parts.shelf-sort-book-item', ['book' => $book])
             @endforeach
@@ -49,7 +49,7 @@ class="scroll-box">
         <input type="text" refs="shelf-sort@book-search" class="scroll-box-search" placeholder="{{ trans('common.search') }}">
         <ul refs="shelf-sort@all-book-list"
             aria-labelledby="shelf-sort-all-books-label"
-            class="scroll-box">
+            class="scroll-box available-option-list">
             @foreach ($books as $book)
                 @include('shelves.parts.shelf-sort-book-item', ['book' => $book])
             @endforeach

From b897af2ed034088193986c8526be9606edaca7d5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 4 Feb 2025 20:11:35 +0000
Subject: [PATCH 457/666] Sorting: Finished main sort set CRUD work

---
 app/Activity/ActivityType.php                 |  4 ++
 app/Sorting/SortSet.php                       | 17 +++--
 app/Sorting/SortSetController.php             | 69 +++++++++++++++++++
 app/Sorting/SortSetOperation.php              | 17 ++++-
 lang/en/activities.php                        |  8 +++
 lang/en/settings.php                          |  2 +
 .../settings/categories/sorting.blade.php     | 13 +++-
 .../views/settings/sort-sets/edit.blade.php   | 44 ++++++++++++
 .../settings/sort-sets/parts/form.blade.php   | 16 +++--
 .../parts/sort-set-list-item.blade.php        |  8 +++
 10 files changed, 187 insertions(+), 11 deletions(-)
 create mode 100644 resources/views/settings/sort-sets/edit.blade.php
 create mode 100644 resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php

diff --git a/app/Activity/ActivityType.php b/app/Activity/ActivityType.php
index 5ec9b9cf0dc..4a648da6cfb 100644
--- a/app/Activity/ActivityType.php
+++ b/app/Activity/ActivityType.php
@@ -71,6 +71,10 @@ class ActivityType
     const IMPORT_RUN = 'import_run';
     const IMPORT_DELETE = 'import_delete';
 
+    const SORT_SET_CREATE = 'sort_set_create';
+    const SORT_SET_UPDATE = 'sort_set_update';
+    const SORT_SET_DELETE = 'sort_set_delete';
+
     /**
      * Get all the possible values.
      */
diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
index ee45c211f2d..971b3e29aae 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortSet.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Sorting;
 
+use BookStack\Activity\Models\Loggable;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
@@ -12,16 +13,14 @@
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
-class SortSet extends Model
+class SortSet extends Model implements Loggable
 {
     /**
      * @return SortSetOperation[]
      */
     public function getOperations(): array
     {
-        $strOptions = explode(',', $this->sequence);
-        $options = array_map(fn ($val) => SortSetOperation::tryFrom($val), $strOptions);
-        return array_filter($options);
+        return SortSetOperation::fromSequence($this->sequence);
     }
 
     /**
@@ -32,4 +31,14 @@ public function setOperations(array $options): void
         $values = array_map(fn (SortSetOperation $opt) => $opt->value, $options);
         $this->sequence = implode(',', $values);
     }
+
+    public function logDescriptor(): string
+    {
+        return "({$this->id}) {$this->name}";
+    }
+
+    public function getUrl(): string
+    {
+        return url("/settings/sorting/sets/{$this->id}");
+    }
 }
diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortSetController.php
index 4ef14829538..0d77bd88fcd 100644
--- a/app/Sorting/SortSetController.php
+++ b/app/Sorting/SortSetController.php
@@ -2,7 +2,9 @@
 
 namespace BookStack\Sorting;
 
+use BookStack\Activity\ActivityType;
 use BookStack\Http\Controller;
+use BookStack\Http\Request;
 
 class SortSetController extends Controller
 {
@@ -14,6 +16,73 @@ public function __construct()
 
     public function create()
     {
+        $this->setPageTitle(trans('settings.sort_set_create'));
+
         return view('settings.sort-sets.create');
     }
+
+    public function store(Request $request)
+    {
+        $this->validate($request, [
+            'name' => ['required', 'string', 'min:1', 'max:200'],
+            'sequence' => ['required', 'string', 'min:1'],
+        ]);
+
+        $operations = SortSetOperation::fromSequence($request->input('sequence'));
+        if (count($operations) === 0) {
+            return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
+        }
+
+        $set = new SortSet();
+        $set->name = $request->input('name');
+        $set->setOperations($operations);
+        $set->save();
+
+        $this->logActivity(ActivityType::SORT_SET_CREATE, $set);
+
+        return redirect('/settings/sorting');
+    }
+
+    public function edit(string $id)
+    {
+        $set = SortSet::query()->findOrFail($id);
+
+        $this->setPageTitle(trans('settings.sort_set_edit'));
+
+        return view('settings.sort-sets.edit', ['set' => $set]);
+    }
+
+    public function update(string $id, Request $request)
+    {
+        $this->validate($request, [
+            'name' => ['required', 'string', 'min:1', 'max:200'],
+            'sequence' => ['required', 'string', 'min:1'],
+        ]);
+
+        $set = SortSet::query()->findOrFail($id);
+        $operations = SortSetOperation::fromSequence($request->input('sequence'));
+        if (count($operations) === 0) {
+            return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
+        }
+
+        $set->name = $request->input('name');
+        $set->setOperations($operations);
+        $set->save();
+
+        $this->logActivity(ActivityType::SORT_SET_UPDATE, $set);
+
+        return redirect('/settings/sorting');
+    }
+
+    public function destroy(string $id)
+    {
+        $set = SortSet::query()->findOrFail($id);
+
+        // TODO - Check if it's in use
+
+        $set->delete();
+        $this->logActivity(ActivityType::SORT_SET_DELETE, $set);
+
+        return redirect('/settings/sorting');
+    }
 }
diff --git a/app/Sorting/SortSetOperation.php b/app/Sorting/SortSetOperation.php
index 12fda669fbd..a6dd860f5c7 100644
--- a/app/Sorting/SortSetOperation.php
+++ b/app/Sorting/SortSetOperation.php
@@ -39,6 +39,21 @@ public function getLabel(): string
     public static function allExcluding(array $operations): array
     {
         $all = SortSetOperation::cases();
-        return array_diff($all, $operations);
+        $filtered = array_filter($all, function (SortSetOperation $operation) use ($operations) {
+            return !in_array($operation, $operations);
+        });
+        return array_values($filtered);
+    }
+
+    /**
+     * Create a set of operations from a string sequence representation.
+     * (values seperated by commas).
+     * @return SortSetOperation[]
+     */
+    public static function fromSequence(string $sequence): array
+    {
+        $strOptions = explode(',', $sequence);
+        $options = array_map(fn ($val) => SortSetOperation::tryFrom($val), $strOptions);
+        return array_filter($options);
     }
 }
diff --git a/lang/en/activities.php b/lang/en/activities.php
index 7c3454d41ca..7db872c0ca8 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Sets
+    'sort_set_create' => 'created sort set',
+    'sort_set_create_notification' => 'Sort set successfully created',
+    'sort_set_update' => 'updated sort set',
+    'sort_set_update_notification' => 'Sort set successfully update',
+    'sort_set_delete' => 'deleted sort set',
+    'sort_set_delete_notification' => 'Sort set successfully deleted',
+
     // Other
     'permissions_update'          => 'updated permissions',
 ];
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 8bb2f6ef481..cda097590a0 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -82,6 +82,8 @@
     'sorting_sets_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
     'sort_set_create' => 'Create Sort Set',
     'sort_set_edit' => 'Edit Sort Set',
+    'sort_set_delete' => 'Delete Sort Set',
+    'sort_set_delete_desc' => 'Remove this sort set from the system. Deletion will only go ahead if the sort is not in active use.',
     'sort_set_details' => 'Sort Set Details',
     'sort_set_details_desc' => 'Set a name for this sort set, which will appear in lists when users are selecting a sort.',
     'sort_set_operations' => 'Sort Operations',
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 9de11bb6f2b..b5d61384003 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -52,6 +52,17 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
             </div>
         </div>
 
-{{--        TODO--}}
+        @php
+            $sortSets = \BookStack\Sorting\SortSet::query()->orderBy('name', 'asc')->get();
+        @endphp
+        @if(empty($sortSets))
+            <p class="italic text-muted">{{ trans('common.no_items') }}</p>
+        @else
+            <div class="item-list">
+                @foreach($sortSets as $set)
+                    @include('settings.sort-sets.parts.sort-set-list-item', ['set' => $set])
+                @endforeach
+            </div>
+        @endif
     </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/settings/sort-sets/edit.blade.php b/resources/views/settings/sort-sets/edit.blade.php
new file mode 100644
index 00000000000..3b88c124338
--- /dev/null
+++ b/resources/views/settings/sort-sets/edit.blade.php
@@ -0,0 +1,44 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container small">
+
+        @include('settings.parts.navbar', ['selected' => 'settings'])
+
+        <div class="card content-wrap auto-height">
+            <h1 class="list-heading">{{ trans('settings.sort_set_edit') }}</h1>
+
+            <form action="{{ $set->getUrl() }}" method="POST">
+                {{ method_field('PUT') }}
+                {{ csrf_field() }}
+
+                @include('settings.sort-sets.parts.form', ['model' => $set])
+
+                <div class="form-group text-right">
+                    <a href="{{ url("/settings/sorting") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <button type="submit" class="button">{{ trans('common.save') }}</button>
+                </div>
+            </form>
+        </div>
+
+        <div class="card content-wrap auto-height">
+            <div class="flex-container-row items-center gap-l">
+                <div>
+                    <h2 class="list-heading">{{ trans('settings.sort_set_delete') }}</h2>
+                    <p class="text-muted">{{ trans('settings.sort_set_delete_desc') }}</p>
+                </div>
+                <div class="flex">
+                    <form action="{{ $set->getUrl() }}" method="POST">
+                        {{ method_field('DELETE') }}
+                        {{ csrf_field() }}
+                        <div class="text-right">
+                            <button type="submit" class="button outline">{{ trans('common.delete') }}</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+@stop
diff --git a/resources/views/settings/sort-sets/parts/form.blade.php b/resources/views/settings/sort-sets/parts/form.blade.php
index 3f22209471f..38db840ac57 100644
--- a/resources/views/settings/sort-sets/parts/form.blade.php
+++ b/resources/views/settings/sort-sets/parts/form.blade.php
@@ -15,9 +15,14 @@
     <div component="sort-set-manager">
         <label class="setting-list-label">{{ trans('settings.sort_set_operations') }}</label>
         <p class="text-muted text-small">{{ trans('settings.sort_set_operations_desc') }}</p>
+        @include('form.errors', ['name' => 'sequence'])
 
-        <input refs="sort-set-manager@input" type="hidden" name="books"
-               value="{{ $model?->sequence ?? '' }}">
+        <input refs="sort-set-manager@input" type="hidden" name="sequence"
+               value="{{ old('sequence') ?? $model?->sequence ?? '' }}">
+
+        @php
+            $configuredOps = old('sequence') ? \BookStack\Sorting\SortSetOperation::fromSequence(old('sequence')) : ($model?->getOperations() ?? []);
+        @endphp
 
         <div class="grid half">
             <div class="form-group">
@@ -27,8 +32,9 @@
                     aria-labelledby="sort-set-configured-operations"
                     class="scroll-box configured-option-list">
                     <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_configured_operations_empty') }}</li>
-                    @foreach(($model?->getOperations() ?? []) as $option)
-                        @include('settings.sort-sets.parts.operation')
+
+                    @foreach($configuredOps as $operation)
+                        @include('settings.sort-sets.parts.operation', ['operation' => $operation])
                     @endforeach
                 </ul>
             </div>
@@ -40,7 +46,7 @@ class="scroll-box configured-option-list">
                     aria-labelledby="sort-set-available-operations"
                     class="scroll-box available-option-list">
                     <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_available_operations_empty') }}</li>
-                    @foreach(\BookStack\Sorting\SortSetOperation::allExcluding($model?->getOperations() ?? []) as $operation)
+                    @foreach(\BookStack\Sorting\SortSetOperation::allExcluding($configuredOps) as $operation)
                         @include('settings.sort-sets.parts.operation', ['operation' => $operation])
                     @endforeach
                 </ul>
diff --git a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
new file mode 100644
index 00000000000..e5ee1fb8795
--- /dev/null
+++ b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
@@ -0,0 +1,8 @@
+<div class="item-list-row flex-container-row py-xs items-center">
+    <div class="py-xs px-m flex-2">
+        <a href="{{ $set->getUrl() }}">{{ $set->name }}</a>
+    </div>
+    <div class="px-m text-small text-muted">
+        {{ implode(', ', array_map(fn ($op) => $op->getLabel(), $set->getOperations())) }}
+    </div>
+</div>
\ No newline at end of file

From 7093daa49de63e237d442709a93a03b5acc4f323 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Feb 2025 14:33:46 +0000
Subject: [PATCH 458/666] Sorting: Connected up default sort setting for books

---
 app/Entities/Models/Book.php                  | 11 ++++++++
 app/Entities/Repos/BookRepo.php               |  7 +++++
 app/Sorting/SortSet.php                       |  7 +++++
 app/Sorting/SortSetController.php             | 13 +++++++--
 ..._02_05_150842_add_sort_set_id_to_books.php | 28 +++++++++++++++++++
 lang/en/settings.php                          |  2 ++
 .../settings/categories/sorting.blade.php     | 23 ++++++++-------
 7 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php

diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index c1644dcf5fb..7d240e5cab9 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Entities\Models;
 
+use BookStack\Sorting\SortSet;
 use BookStack\Uploads\Image;
 use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -16,12 +17,14 @@
  * @property string                                   $description
  * @property int                                      $image_id
  * @property ?int                                     $default_template_id
+ * @property ?int                                     $sort_set_id
  * @property Image|null                               $cover
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages
  * @property \Illuminate\Database\Eloquent\Collection $shelves
  * @property ?Page                                    $defaultTemplate
+ * @property ?SortSet                                 $sortSet
  */
 class Book extends Entity implements HasCoverImage
 {
@@ -82,6 +85,14 @@ public function defaultTemplate(): BelongsTo
         return $this->belongsTo(Page::class, 'default_template_id');
     }
 
+    /**
+     * Get the sort set assigned to this book, if existing.
+     */
+    public function sortSet(): BelongsTo
+    {
+        return $this->belongsTo(SortSet::class);
+    }
+
     /**
      * Get all pages within this book.
      */
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 19d159eb1e7..b3b81164785 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Facades\Activity;
+use BookStack\Sorting\SortSet;
 use BookStack\Uploads\ImageRepo;
 use Exception;
 use Illuminate\Http\UploadedFile;
@@ -33,6 +34,12 @@ public function create(array $input): Book
         $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::BOOK_CREATE, $book);
 
+        $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
+        if ($defaultBookSortSetting && SortSet::query()->find($defaultBookSortSetting)) {
+            $book->sort_set_id = $defaultBookSortSetting;
+            $book->save();
+        }
+
         return $book;
     }
 
diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
index 971b3e29aae..a73407bfa08 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortSet.php
@@ -3,8 +3,10 @@
 namespace BookStack\Sorting;
 
 use BookStack\Activity\Models\Loggable;
+use BookStack\Entities\Models\Book;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int $id
@@ -41,4 +43,9 @@ public function getUrl(): string
     {
         return url("/settings/sorting/sets/{$this->id}");
     }
+
+    public function books(): HasMany
+    {
+        return $this->hasMany(Book::class);
+    }
 }
diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortSetController.php
index 0d77bd88fcd..8f51207918f 100644
--- a/app/Sorting/SortSetController.php
+++ b/app/Sorting/SortSetController.php
@@ -62,7 +62,7 @@ public function update(string $id, Request $request)
         $set = SortSet::query()->findOrFail($id);
         $operations = SortSetOperation::fromSequence($request->input('sequence'));
         if (count($operations) === 0) {
-            return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
+            return redirect($set->getUrl())->withInput()->withErrors(['sequence' => 'No operations set.']);
         }
 
         $set->name = $request->input('name');
@@ -78,7 +78,16 @@ public function destroy(string $id)
     {
         $set = SortSet::query()->findOrFail($id);
 
-        // TODO - Check if it's in use
+        if ($set->books()->count() > 0) {
+            $this->showErrorNotification(trans('settings.sort_set_delete_fail_books'));
+            return redirect($set->getUrl());
+        }
+
+        $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
+        if ($defaultBookSortSetting === intval($id)) {
+            $this->showErrorNotification(trans('settings.sort_set_delete_fail_default'));
+            return redirect($set->getUrl());
+        }
 
         $set->delete();
         $this->logActivity(ActivityType::SORT_SET_DELETE, $set);
diff --git a/database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php b/database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php
new file mode 100644
index 00000000000..c0b32c55288
--- /dev/null
+++ b/database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('books', function (Blueprint $table) {
+            $table->unsignedInteger('sort_set_id')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('books', function (Blueprint $table) {
+            $table->dropColumn('sort_set_id');
+        });
+    }
+};
diff --git a/lang/en/settings.php b/lang/en/settings.php
index cda097590a0..eb046d27848 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -84,6 +84,8 @@
     'sort_set_edit' => 'Edit Sort Set',
     'sort_set_delete' => 'Delete Sort Set',
     'sort_set_delete_desc' => 'Remove this sort set from the system. Deletion will only go ahead if the sort is not in active use.',
+    'sort_set_delete_fail_books' => 'Unable to delete this sort set since it has books assigned.',
+    'sort_set_delete_fail_default' => 'Unable to delete this sort set since it\'s used as the default book sort.',
     'sort_set_details' => 'Sort Set Details',
     'sort_set_details_desc' => 'Set a name for this sort set, which will appear in lists when users are selecting a sort.',
     'sort_set_operations' => 'Sort Operations',
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index b5d61384003..0af3a8fb85b 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -1,5 +1,9 @@
 @extends('settings.layout')
 
+@php
+    $sortSets = \BookStack\Sorting\SortSet::query()->orderBy('name', 'asc')->get();
+@endphp
+
 @section('card')
     <h1 id="sorting" class="list-heading">{{ trans('settings.sorting') }}</h1>
     <form action="{{ url("/settings/sorting") }}" method="POST">
@@ -19,15 +23,13 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
                         <option value="0" @if(intval(setting('sorting-book-default', '0')) === 0) selected @endif>
                             -- {{ trans('common.none') }} --
                         </option>
-{{--                        TODO--}}
-{{--                        @foreach(\BookStack\Users\Models\Role::all() as $role)--}}
-{{--                            <option value="{{$role->id}}"--}}
-{{--                                    data-system-role-name="{{ $role->system_name ?? '' }}"--}}
-{{--                                    @if(intval(setting('registration-role', '0')) === $role->id) selected @endif--}}
-{{--                            >--}}
-{{--                                {{ $role->display_name }}--}}
-{{--                            </option>--}}
-{{--                        @endforeach--}}
+                        @foreach($sortSets as $set)
+                            <option value="{{$set->id}}"
+                                    @if(intval(setting('sorting-book-default', '0')) === $set->id) selected @endif
+                            >
+                                {{ $set->name }}
+                            </option>
+                        @endforeach
                     </select>
                 </div>
             </div>
@@ -52,9 +54,6 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
             </div>
         </div>
 
-        @php
-            $sortSets = \BookStack\Sorting\SortSet::query()->orderBy('name', 'asc')->get();
-        @endphp
         @if(empty($sortSets))
             <p class="italic text-muted">{{ trans('common.no_items') }}</p>
         @else

From c13ce1883708c184d14b3be10734894ddf7c9e00 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Feb 2025 16:52:20 +0000
Subject: [PATCH 459/666] Sorting: Added book autosort logic

---
 app/Entities/Repos/BaseRepo.php             | 15 +++++
 app/Entities/Repos/ChapterRepo.php          |  6 ++
 app/Entities/Repos/PageRepo.php             |  6 ++
 app/Sorting/BookSorter.php                  | 48 ++++++++++++++
 app/Sorting/SortSetOperation.php            |  9 +++
 app/Sorting/SortSetOperationComparisons.php | 69 +++++++++++++++++++++
 6 files changed, 153 insertions(+)
 create mode 100644 app/Sorting/SortSetOperationComparisons.php

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 033350743e0..151d5b0555b 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
@@ -12,6 +13,7 @@
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
+use BookStack\Sorting\BookSorter;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Util\HtmlDescriptionFilter;
 use Illuminate\Http\UploadedFile;
@@ -24,6 +26,7 @@ public function __construct(
         protected ReferenceUpdater $referenceUpdater,
         protected ReferenceStore $referenceStore,
         protected PageQueries $pageQueries,
+        protected BookSorter $bookSorter,
     ) {
     }
 
@@ -134,6 +137,18 @@ public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): vo
         $entity->save();
     }
 
+    /**
+     * Sort the parent of the given entity, if any auto sort actions are set for it.
+     * Typical ran during create/update/insert events.
+     */
+    public function sortParent(Entity $entity): void
+    {
+        if ($entity instanceof BookChild) {
+            $book = $entity->book;
+            $this->bookSorter->runBookAutoSort($book);
+        }
+    }
+
     protected function updateDescription(Entity $entity, array $input): void
     {
         if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 17cbccd4133..fdf2de4e202 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -34,6 +34,8 @@ public function create(array $input, Book $parentBook): Chapter
         $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
         Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
+        $this->baseRepo->sortParent($chapter);
+
         return $chapter;
     }
 
@@ -50,6 +52,8 @@ public function update(Chapter $chapter, array $input): Chapter
 
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 
+        $this->baseRepo->sortParent($chapter);
+
         return $chapter;
     }
 
@@ -88,6 +92,8 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
         $chapter->rebuildPermissions();
         Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
 
+        $this->baseRepo->sortParent($chapter);
+
         return $parent;
     }
 }
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 68b1c398f80..c3be6d826a2 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -83,6 +83,7 @@ public function publishDraft(Page $draft, array $input): Page
         $draft->refresh();
 
         Activity::add(ActivityType::PAGE_CREATE, $draft);
+        $this->baseRepo->sortParent($draft);
 
         return $draft;
     }
@@ -128,6 +129,7 @@ public function update(Page $page, array $input): Page
         }
 
         Activity::add(ActivityType::PAGE_UPDATE, $page);
+        $this->baseRepo->sortParent($page);
 
         return $page;
     }
@@ -243,6 +245,8 @@ public function restoreRevision(Page $page, int $revisionId): Page
         Activity::add(ActivityType::PAGE_RESTORE, $page);
         Activity::add(ActivityType::REVISION_RESTORE, $revision);
 
+        $this->baseRepo->sortParent($page);
+
         return $page;
     }
 
@@ -272,6 +276,8 @@ public function move(Page $page, string $parentIdentifier): Entity
 
         Activity::add(ActivityType::PAGE_MOVE, $page);
 
+        $this->baseRepo->sortParent($page);
+
         return $parent;
     }
 
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index 7268b3543a3..e89fdaccc31 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -16,6 +16,54 @@ public function __construct(
     ) {
     }
 
+    /**
+     * Runs the auto-sort for a book if the book has a sort set applied to it.
+     * This does not consider permissions since the sort operations are centrally
+     * managed by admins so considered permitted if existing and assigned.
+     */
+    public function runBookAutoSort(Book $book): void
+    {
+        $set = $book->sortSet;
+        if (!$set) {
+            return;
+        }
+
+        $sortFunctions = array_map(function (SortSetOperation $op) {
+            return $op->getSortFunction();
+        }, $set->getOperations());
+
+        $chapters = $book->chapters()
+            ->with('pages:id,name,priority,created_at,updated_at')
+            ->get(['id', 'name', 'priority', 'created_at', 'updated_at']);
+
+        /** @var (Chapter|Book)[] $topItems */
+        $topItems = [
+            ...$book->directPages()->get(['id', 'name', 'priority', 'created_at', 'updated_at']),
+            ...$chapters,
+        ];
+
+        foreach ($sortFunctions as $sortFunction) {
+            usort($topItems, $sortFunction);
+        }
+
+        foreach ($topItems as $index => $topItem) {
+            $topItem->priority = $index + 1;
+            $topItem->save();
+        }
+
+        foreach ($chapters as $chapter) {
+            $pages = $chapter->pages->all();
+            foreach ($sortFunctions as $sortFunction) {
+                usort($pages, $sortFunction);
+            }
+
+            foreach ($pages as $index => $page) {
+                $page->priority = $index + 1;
+                $page->save();
+            }
+        }
+    }
+
 
     /**
      * Sort the books content using the given sort map.
diff --git a/app/Sorting/SortSetOperation.php b/app/Sorting/SortSetOperation.php
index a6dd860f5c7..7fdd0b002bf 100644
--- a/app/Sorting/SortSetOperation.php
+++ b/app/Sorting/SortSetOperation.php
@@ -2,6 +2,9 @@
 
 namespace BookStack\Sorting;
 
+use Closure;
+use Illuminate\Support\Str;
+
 enum SortSetOperation: string
 {
     case NameAsc = 'name_asc';
@@ -33,6 +36,12 @@ public function getLabel(): string
         return trim($label);
     }
 
+    public function getSortFunction(): callable
+    {
+        $camelValue = Str::camel($this->value);
+        return SortSetOperationComparisons::$camelValue(...);
+    }
+
     /**
      * @return SortSetOperation[]
      */
diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
new file mode 100644
index 00000000000..e1c3e625f9f
--- /dev/null
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace BookStack\Sorting;
+
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+
+/**
+ * Sort comparison function for each of the possible SortSetOperation values.
+ * Method names should be camelCase names for the SortSetOperation enum value.
+ * TODO - Test to cover each SortSetOperation enum value is covered.
+ */
+class SortSetOperationComparisons
+{
+    public static function nameAsc(Entity $a, Entity $b): int
+    {
+        return $a->name <=> $b->name;
+    }
+
+    public static function nameDesc(Entity $a, Entity $b): int
+    {
+        return $b->name <=> $a->name;
+    }
+
+    public static function nameNumericAsc(Entity $a, Entity $b): int
+    {
+        $numRegex = '/^\d+(\.\d+)?/';
+        $aMatches = [];
+        $bMatches = [];
+        preg_match($numRegex, $a, $aMatches);
+        preg_match($numRegex, $b, $bMatches);
+        return ($aMatches[0] ?? 0) <=> ($bMatches[0] ?? 0);
+    }
+
+    public static function nameNumericDesc(Entity $a, Entity $b): int
+    {
+        return -(static::nameNumericAsc($a, $b));
+    }
+
+    public static function createdDateAsc(Entity $a, Entity $b): int
+    {
+        return $a->created_at->unix() <=> $b->created_at->unix();
+    }
+
+    public static function createdDateDesc(Entity $a, Entity $b): int
+    {
+        return $b->created_at->unix() <=> $a->created_at->unix();
+    }
+
+    public static function updatedDateAsc(Entity $a, Entity $b): int
+    {
+        return $a->updated_at->unix() <=> $b->updated_at->unix();
+    }
+
+    public static function updatedDateDesc(Entity $a, Entity $b): int
+    {
+        return $b->updated_at->unix() <=> $a->updated_at->unix();
+    }
+
+    public static function chaptersFirst(Entity $a, Entity $b): int
+    {
+        return ($b instanceof Chapter ? 1 : 0) - (($a instanceof Chapter) ? 1 : 0);
+    }
+
+    public static function chaptersLast(Entity $a, Entity $b): int
+    {
+        return ($a instanceof Chapter ? 1 : 0) - (($b instanceof Chapter) ? 1 : 0);
+    }
+}

From 103a8a8e8ee1528a1ce248f01bf3fd4ab16840f6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 5 Feb 2025 21:17:48 +0000
Subject: [PATCH 460/666] Meta: Updated sponsor list, licence year and readme

---
 LICENSE   |  2 +-
 readme.md | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5ed2edf8585..9b94d9be3f3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2024, Dan Brown and the BookStack Project contributors.
+Copyright (c) 2015-2025, Dan Brown and the BookStack project contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/readme.md b/readme.md
index 857e2051a55..339c7cbd4ae 100644
--- a/readme.md
+++ b/readme.md
@@ -29,11 +29,11 @@ A platform for storing and organising information and documentation. Details for
 
 ## 📚 Project Definition
 
-BookStack is an opinionated documentation platform that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
+BookStack is an opinionated documentation platform that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it, but they should not interfere with the core simple user experience.
 
 BookStack is not designed as an extensible platform to be used for purposes that differ to the statement above.
 
-In regard to development philosophy, BookStack has a relaxed, open & positive approach. At the end of the day this is free software developed and maintained by people donating their own free time.
+In regard to development philosophy, BookStack has a relaxed, open & positive approach. We aim to slowly yet continuously evolve the platform while providing a stable & easy upgrade path. 
 
 You can read more about the project and its origins in [our FAQ here](https://www.bookstackapp.com/about/project-faq/).
 
@@ -82,15 +82,11 @@ Big thanks to these companies for supporting the project.
 <td align="center"><a href="https://practinet.be/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
-<td align="center"><a href="https://transporttalent.com" target="_blank">
-    <img width="240" src="https://www.bookstackapp.com/images/sponsors/transport-talent.png" alt="Transport Talent">
-</a></td>
-</tr>
-<tr>
-<td colspan="2" align="center"><a href="https://route4me.com/" target="_blank">
+<td align="center"><a href="https://route4me.com/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
-</tr></tbody></table>
+</tr>
+</tbody></table>
 
 ## 🛠️ Development & Testing
 
@@ -134,7 +130,7 @@ We want BookStack to remain accessible to as many people as possible. We aim for
 
 ## 🖥️ Website, Docs & Blog
 
-The website which contains the project docs & blog can be found in the [BookStackApp/website](https://github.com/BookStackApp/website) repo.
+The website which contains the project docs & blog can be found in the [BookStackApp/website](https://codeberg.org/bookstack/website) repo.
 
 ## ⚖️ License
 
@@ -161,7 +157,7 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [KnpLabs/snappy](https://github.com/KnpLabs/snappy) - _[MIT](https://github.com/KnpLabs/snappy/blob/master/LICENSE)_
 * [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) - _[LGPL v3.0](https://github.com/wkhtmltopdf/wkhtmltopdf/blob/master/LICENSE)_
 * [diagrams.net](https://github.com/jgraph/drawio) - _[Embedded Version Terms](https://www.diagrams.net/trust/) / [Source Project - Apache-2.0](https://github.com/jgraph/drawio/blob/dev/LICENSE)_
-* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) - _[MIT](https://github.com/onelogin/php-saml/blob/master/LICENSE)_
+* [SAML PHP Toolkit](https://github.com/SAML-Toolkits/php-saml) - _[MIT](https://github.com/SAML-Toolkits/php-saml/blob/master/LICENSE)_
 * [League/CommonMark](https://commonmark.thephpleague.com/) - _[BSD-3-Clause](https://github.com/thephpleague/commonmark/blob/2.2/LICENSE)_
 * [League/Flysystem](https://flysystem.thephpleague.com) - _[MIT](https://github.com/thephpleague/flysystem/blob/3.x/LICENSE)_
 * [League/html-to-markdown](https://github.com/thephpleague/html-to-markdown) - _[MIT](https://github.com/thephpleague/html-to-markdown/blob/master/LICENSE)_

From ccd94684ebc5d8b14a9fa4e7b0808501b3c80cd9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 6 Feb 2025 14:58:08 +0000
Subject: [PATCH 461/666] Sorting: Improved sort set display, delete, added
 action on edit

- Changes to a sort set will now auto-apply to assinged books (basic
  chunck through all on save).
- Added book count indicator to sort set list items.
- Deletion now has confirmation and auto-handling of assigned
  books/settings.
---
 app/Sorting/BookSorter.php                    |  9 +++++
 app/Sorting/SortSetController.php             | 34 ++++++++++++++-----
 lang/en/settings.php                          |  6 ++--
 .../settings/categories/sorting.blade.php     |  5 ++-
 .../views/settings/sort-sets/edit.blade.php   | 16 +++++++--
 .../parts/sort-set-list-item.blade.php        | 10 ++++--
 6 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index e89fdaccc31..fd99a8d3781 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -16,6 +16,15 @@ public function __construct(
     ) {
     }
 
+    public function runBookAutoSortForAllWithSet(SortSet $set): void
+    {
+        $set->books()->chunk(50, function ($books) {
+            foreach ($books as $book) {
+                $this->runBookAutoSort($book);
+            }
+        });
+    }
+
     /**
      * Runs the auto-sort for a book if the book has a sort set applied to it.
      * This does not consider permissions since the sort operations are centrally
diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortSetController.php
index 8f51207918f..b0ad2a7d766 100644
--- a/app/Sorting/SortSetController.php
+++ b/app/Sorting/SortSetController.php
@@ -52,7 +52,7 @@ public function edit(string $id)
         return view('settings.sort-sets.edit', ['set' => $set]);
     }
 
-    public function update(string $id, Request $request)
+    public function update(string $id, Request $request, BookSorter $bookSorter)
     {
         $this->validate($request, [
             'name' => ['required', 'string', 'min:1', 'max:200'],
@@ -67,26 +67,44 @@ public function update(string $id, Request $request)
 
         $set->name = $request->input('name');
         $set->setOperations($operations);
+        $changedSequence = $set->isDirty('sequence');
         $set->save();
 
         $this->logActivity(ActivityType::SORT_SET_UPDATE, $set);
 
+        if ($changedSequence) {
+            $bookSorter->runBookAutoSortForAllWithSet($set);
+        }
+
         return redirect('/settings/sorting');
     }
 
-    public function destroy(string $id)
+    public function destroy(string $id, Request $request)
     {
         $set = SortSet::query()->findOrFail($id);
-
-        if ($set->books()->count() > 0) {
-            $this->showErrorNotification(trans('settings.sort_set_delete_fail_books'));
-            return redirect($set->getUrl());
+        $confirmed = $request->input('confirm') === 'true';
+        $booksAssigned = $set->books()->count();
+        $warnings = [];
+
+        if ($booksAssigned > 0) {
+            if ($confirmed) {
+                $set->books()->update(['sort_set_id' => null]);
+            } else {
+                $warnings[] = trans('settings.sort_set_delete_warn_books', ['count' => $booksAssigned]);
+            }
         }
 
         $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
         if ($defaultBookSortSetting === intval($id)) {
-            $this->showErrorNotification(trans('settings.sort_set_delete_fail_default'));
-            return redirect($set->getUrl());
+            if ($confirmed) {
+                setting()->remove('sorting-book-default');
+            } else {
+                $warnings[] = trans('settings.sort_set_delete_warn_default');
+            }
+        }
+
+        if (count($warnings) > 0) {
+            return redirect($set->getUrl() . '#delete')->withErrors(['delete' => $warnings]);
         }
 
         $set->delete();
diff --git a/lang/en/settings.php b/lang/en/settings.php
index eb046d27848..19ffd924049 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -83,9 +83,9 @@
     'sort_set_create' => 'Create Sort Set',
     'sort_set_edit' => 'Edit Sort Set',
     'sort_set_delete' => 'Delete Sort Set',
-    'sort_set_delete_desc' => 'Remove this sort set from the system. Deletion will only go ahead if the sort is not in active use.',
-    'sort_set_delete_fail_books' => 'Unable to delete this sort set since it has books assigned.',
-    'sort_set_delete_fail_default' => 'Unable to delete this sort set since it\'s used as the default book sort.',
+    'sort_set_delete_desc' => 'Remove this sort set from the system. Books using this sort will revert to manual sorting.',
+    'sort_set_delete_warn_books' => 'This sort set is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_set_delete_warn_default' => 'This sort set is currently used as the default for books. Are you sure you want to delete this?',
     'sort_set_details' => 'Sort Set Details',
     'sort_set_details_desc' => 'Set a name for this sort set, which will appear in lists when users are selecting a sort.',
     'sort_set_operations' => 'Sort Operations',
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 0af3a8fb85b..60fb329b6aa 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -1,7 +1,10 @@
 @extends('settings.layout')
 
 @php
-    $sortSets = \BookStack\Sorting\SortSet::query()->orderBy('name', 'asc')->get();
+    $sortSets = \BookStack\Sorting\SortSet::query()
+        ->withCount('books')
+        ->orderBy('name', 'asc')
+        ->get();
 @endphp
 
 @section('card')
diff --git a/resources/views/settings/sort-sets/edit.blade.php b/resources/views/settings/sort-sets/edit.blade.php
index 3b88c124338..febcd9ffe1f 100644
--- a/resources/views/settings/sort-sets/edit.blade.php
+++ b/resources/views/settings/sort-sets/edit.blade.php
@@ -22,16 +22,26 @@
             </form>
         </div>
 
-        <div class="card content-wrap auto-height">
+        <div id="delete" class="card content-wrap auto-height">
             <div class="flex-container-row items-center gap-l">
-                <div>
+                <div class="mb-m">
                     <h2 class="list-heading">{{ trans('settings.sort_set_delete') }}</h2>
-                    <p class="text-muted">{{ trans('settings.sort_set_delete_desc') }}</p>
+                    <p class="text-muted mb-xs">{{ trans('settings.sort_set_delete_desc') }}</p>
+                    @if($errors->has('delete'))
+                        @foreach($errors->get('delete') as $error)
+                            <p class="text-neg mb-xs">{{ $error }}</p>
+                        @endforeach
+                    @endif
                 </div>
                 <div class="flex">
                     <form action="{{ $set->getUrl() }}" method="POST">
                         {{ method_field('DELETE') }}
                         {{ csrf_field() }}
+
+                        @if($errors->has('delete'))
+                            <input type="hidden" name="confirm" value="true">
+                        @endif
+
                         <div class="text-right">
                             <button type="submit" class="button outline">{{ trans('common.delete') }}</button>
                         </div>
diff --git a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
index e5ee1fb8795..e977c286e11 100644
--- a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
+++ b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
@@ -1,8 +1,12 @@
-<div class="item-list-row flex-container-row py-xs items-center">
-    <div class="py-xs px-m flex-2">
+<div class="item-list-row flex-container-row py-xs px-m gap-m items-center">
+    <div class="py-xs flex">
         <a href="{{ $set->getUrl() }}">{{ $set->name }}</a>
     </div>
-    <div class="px-m text-small text-muted">
+    <div class="px-m text-small text-muted ml-auto">
         {{ implode(', ', array_map(fn ($op) => $op->getLabel(), $set->getOperations())) }}
     </div>
+    <div>
+        <span title="{{ trans('entities.tags_assigned_books') }}"
+              class="flex fill-area min-width-xxs bold text-right text-book"><span class="opacity-60">@icon('book')</span>{{ $set->books_count ?? 0 }}</span>
+    </div>
 </div>
\ No newline at end of file

From d938565839e5c59576b45ccb6e8caa40baa7129d Mon Sep 17 00:00:00 2001
From: inv-hareesh <hareesh.p@innovaturelabs.com>
Date: Fri, 7 Feb 2025 08:59:36 +0530
Subject: [PATCH 462/666] =?UTF-8?q?Fix=20search=20issue=20for=20words=20in?=
 =?UTF-8?q?side=20Guillemets=20(=C2=AB=20=C2=BB)=20without=20spaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Search/SearchIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index c7d9d6502e2..e10219e2d2f 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -16,7 +16,7 @@ class SearchIndex
     /**
      * A list of delimiter characters used to break-up parsed content into terms for indexing.
      */
-    public static string $delimiters = " \n\t.,!?:;()[]{}<>`'\"";
+    public static string $delimiters = " \n\t.,!?:;()[]{}<>`'\"«»";
 
     public function __construct(
         protected EntityProvider $entityProvider

From ec7951749333fb9b57c3e5ce368f3427065489b3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Feb 2025 15:16:18 +0000
Subject: [PATCH 463/666] Sorting: Added auto sort option to book sort UI

Includes indicator on books added to sort operation.
---
 app/Sorting/BookSortController.php            | 36 +++++++++++++------
 app/Sorting/SortSet.php                       |  9 +++++
 lang/en/entities.php                          |  4 ++-
 resources/icons/auto-sort.svg                 |  1 +
 resources/sass/_lists.scss                    |  4 +++
 .../views/books/parts/sort-box.blade.php      |  5 +++
 resources/views/books/sort.blade.php          | 28 +++++++++++++--
 .../settings/categories/sorting.blade.php     |  5 +--
 8 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 resources/icons/auto-sort.svg

diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index feed5db4fde..98d79d0fd12 100644
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -44,24 +44,40 @@ public function showItem(string $bookSlug)
     }
 
     /**
-     * Sorts a book using a given mapping array.
+     * Update the sort options of a book, setting the auto-sort and/or updating
+     * child order via mapping.
      */
     public function update(Request $request, BookSorter $sorter, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
+        $loggedActivityForBook = false;
 
-        // Return if no map sent
-        if (!$request->filled('sort-tree')) {
-            return redirect($book->getUrl());
-        }
+        // Sort via map
+        if ($request->filled('sort-tree')) {
+            $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
+            $booksInvolved = $sorter->sortUsingMap($sortMap);
 
-        $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
-        $booksInvolved = $sorter->sortUsingMap($sortMap);
+            // Rebuild permissions and add activity for involved books.
+            foreach ($booksInvolved as $bookInvolved) {
+                Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+                if ($bookInvolved->id === $book->id) {
+                    $loggedActivityForBook = true;
+                }
+            }
+        }
 
-        // Rebuild permissions and add activity for involved books.
-        foreach ($booksInvolved as $bookInvolved) {
-            Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+        if ($request->filled('auto-sort')) {
+            $sortSetId = intval($request->get('auto-sort')) ?: null;
+            if ($sortSetId && SortSet::query()->find($sortSetId) === null) {
+                $sortSetId = null;
+            }
+            $book->sort_set_id = $sortSetId;
+            $book->save();
+            $sorter->runBookAutoSort($book);
+            if (!$loggedActivityForBook) {
+                Activity::add(ActivityType::BOOK_SORT, $book);
+            }
         }
 
         return redirect($book->getUrl());
diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
index a73407bfa08..8cdee1df49c 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortSet.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\Models\Loggable;
 use BookStack\Entities\Models\Book;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
@@ -48,4 +49,12 @@ public function books(): HasMany
     {
         return $this->hasMany(Book::class);
     }
+
+    public static function allByName(): Collection
+    {
+        return static::query()
+            ->withCount('books')
+            ->orderBy('name', 'asc')
+            ->get();
+    }
 }
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 26a563a7eb5..28a209fa21a 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort option can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/resources/icons/auto-sort.svg b/resources/icons/auto-sort.svg
new file mode 100644
index 00000000000..c3cb2f51669
--- /dev/null
+++ b/resources/icons/auto-sort.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 18h6v-2h-6zm0-12v2h18v-2zm0 7h11v-2h-11z"/><g transform="matrix(.024132 0 0 .024132 3.6253 26.687)"><path d="m602.72-360v-146.6h-58.639l117.28-205.24v146.6h58.639z" stroke-width=".73298"/></g></svg>
diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index fd76f498ed1..1e503dd0ffe 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -242,6 +242,10 @@
   margin-bottom: vars.$m;
   padding: vars.$m vars.$xl;
   position: relative;
+  summary:focus {
+    outline: 1px dashed var(--color-primary);
+    outline-offset: 5px;
+  }
   &::before {
     pointer-events: none;
     content: '';
diff --git a/resources/views/books/parts/sort-box.blade.php b/resources/views/books/parts/sort-box.blade.php
index 03998e26178..232616168f9 100644
--- a/resources/views/books/parts/sort-box.blade.php
+++ b/resources/views/books/parts/sort-box.blade.php
@@ -8,6 +8,11 @@
                 <span>@icon('book')</span>
                 <span>{{ $book->name }}</span>
             </div>
+            <div class="flex-container-row items-center text-book">
+                @if($book->sortSet)
+                    <span title="{{ trans('entities.books_sort_auto_sort_active', ['sortName' => $book->sortSet->name]) }}">@icon('auto-sort')</span>
+                @endif
+            </div>
         </h5>
     </summary>
     <div class="sort-box-options pb-sm">
diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index c82ad4e3b1e..3c59ac1e092 100644
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -18,14 +18,36 @@
             <div>
                 <div component="book-sort" class="card content-wrap auto-height">
                     <h1 class="list-heading">{{ trans('entities.books_sort') }}</h1>
-                    <p class="text-muted">{{ trans('entities.books_sort_desc') }}</p>
+
+                    <div class="flex-container-row gap-m wrap mb-m">
+                        <p class="text-muted flex min-width-s mb-none">{{ trans('entities.books_sort_desc') }}</p>
+                        <div class="min-width-s">
+                            @php
+                                $autoSortVal = intval(old('auto-sort') ?? $book->sort_set_id ?? 0);
+                            @endphp
+                            <label for="auto-sort">{{ trans('entities.books_sort_auto_sort') }}</label>
+                            <select id="auto-sort"
+                                    name="auto-sort"
+                                    form="sort-form"
+                                    class="{{ $errors->has('auto-sort') ? 'neg' : '' }}">
+                                <option value="0" @if($autoSortVal === 0) selected @endif>-- {{ trans('common.none') }} --</option>
+                                @foreach(\BookStack\Sorting\SortSet::allByName() as $set)
+                                    <option value="{{$set->id}}"
+                                            @if($autoSortVal === $set->id) selected @endif
+                                    >
+                                        {{ $set->name }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
 
                     <div refs="book-sort@sortContainer">
                         @include('books.parts.sort-box', ['book' => $book, 'bookChildren' => $bookChildren])
                     </div>
 
-                    <form action="{{ $book->getUrl('/sort') }}" method="POST">
-                        {!! csrf_field() !!}
+                    <form id="sort-form" action="{{ $book->getUrl('/sort') }}" method="POST">
+                        {{ csrf_field() }}
                         <input type="hidden" name="_method" value="PUT">
                         <input refs="book-sort@input" type="hidden" name="sort-tree">
                         <div class="list text-right">
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 60fb329b6aa..6a52873e6ab 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -1,10 +1,7 @@
 @extends('settings.layout')
 
 @php
-    $sortSets = \BookStack\Sorting\SortSet::query()
-        ->withCount('books')
-        ->orderBy('name', 'asc')
-        ->get();
+    $sortSets = \BookStack\Sorting\SortSet::allByName();
 @endphp
 
 @section('card')

From 37d020c08350721320d3e7e3c8533daec544bb03 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Feb 2025 17:44:24 +0000
Subject: [PATCH 464/666] Sorting: Addded command to apply sort sets

---
 app/Console/Commands/AssignSortSetCommand.php | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 app/Console/Commands/AssignSortSetCommand.php

diff --git a/app/Console/Commands/AssignSortSetCommand.php b/app/Console/Commands/AssignSortSetCommand.php
new file mode 100644
index 00000000000..aca046bae4a
--- /dev/null
+++ b/app/Console/Commands/AssignSortSetCommand.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace BookStack\Console\Commands;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Sorting\BookSorter;
+use BookStack\Sorting\SortSet;
+use Illuminate\Console\Command;
+
+class AssignSortSetCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'bookstack:assign-sort-set
+                            {sort-set=0: ID of the sort set to apply}
+                            {--all-books : Apply to all books in the system}
+                            {--books-without-sort : Apply to only books without a sort set already assigned}
+                            {--books-with-sort= : Apply to only books with the sort of given id}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Assign a sort set to content in the system';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(BookSorter $sorter): int
+    {
+        $sortSetId = intval($this->argument('sort-set')) ?? 0;
+        if ($sortSetId === 0) {
+            return $this->listSortSets();
+        }
+
+        $set = SortSet::query()->find($sortSetId);
+        if ($this->option('all-books')) {
+            $query = Book::query();
+        } else if ($this->option('books-without-sort')) {
+            $query = Book::query()->whereNull('sort_set_id');
+        } else if ($this->option('books-with-sort')) {
+            $sortId = intval($this->option('books-with-sort')) ?: 0;
+            if (!$sortId) {
+                $this->error("Provided --books-with-sort option value is invalid");
+                return 1;
+            }
+            $query = Book::query()->where('sort_set_id', $sortId);
+        } else {
+            $this->error("Either the --all-books or --books-without-sort option must be provided!");
+            return 1;
+        }
+
+        if (!$set) {
+            $this->error("Sort set of provided id {$sortSetId} not found!");
+            return 1;
+        }
+
+        $count = $query->clone()->count();
+        $this->warn("This will apply sort set [{$set->id}: {$set->name}] to {$count} book(s) and run the sort on each.");
+        $confirmed = $this->confirm("Are you sure you want to continue?");
+
+        if (!$confirmed) {
+            return 1;
+        }
+
+        $processed = 0;
+        $query->chunkById(10, function ($books) use ($set, $sorter, $count, &$processed) {
+            $max = min($count, ($processed + 10));
+            $this->info("Applying to {$processed}-{$max} of {$count} books");
+            foreach ($books as $book) {
+                $book->sort_set_id = $set->id;
+                $book->save();
+                $sorter->runBookAutoSort($book);
+            }
+            $processed = $max;
+        });
+
+        $this->info("Sort applied to {$processed} books!");
+
+        return 0;
+    }
+
+    protected function listSortSets(): int
+    {
+
+        $sets = SortSet::query()->orderBy('id', 'asc')->get();
+        $this->error("Sort set ID required!");
+        $this->warn("\nAvailable sort sets:");
+        foreach ($sets as $set) {
+            $this->info("{$set->id}: {$set->name}");
+        }
+
+        return 1;
+    }
+}

From 69683d50ecb854211fc9bb4502c9ef512ad23d8e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 9 Feb 2025 23:24:36 +0000
Subject: [PATCH 465/666] Sorting: Added tests to cover AssignSortSetCommand

---
 app/Console/Commands/AssignSortSetCommand.php |   4 +-
 app/Sorting/SortSet.php                       |   3 +
 database/factories/Sorting/SortSetFactory.php |  30 +++++
 tests/Commands/AssignSortSetCommandTest.php   | 112 ++++++++++++++++++
 4 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 database/factories/Sorting/SortSetFactory.php
 create mode 100644 tests/Commands/AssignSortSetCommandTest.php

diff --git a/app/Console/Commands/AssignSortSetCommand.php b/app/Console/Commands/AssignSortSetCommand.php
index aca046bae4a..484f6995255 100644
--- a/app/Console/Commands/AssignSortSetCommand.php
+++ b/app/Console/Commands/AssignSortSetCommand.php
@@ -50,7 +50,7 @@ public function handle(BookSorter $sorter): int
             }
             $query = Book::query()->where('sort_set_id', $sortId);
         } else {
-            $this->error("Either the --all-books or --books-without-sort option must be provided!");
+            $this->error("No option provided to specify target. Run with the -h option to see all available options.");
             return 1;
         }
 
@@ -79,7 +79,7 @@ public function handle(BookSorter $sorter): int
             $processed = $max;
         });
 
-        $this->info("Sort applied to {$processed} books!");
+        $this->info("Sort applied to {$processed} book(s)!");
 
         return 0;
     }
diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortSet.php
index 8cdee1df49c..cc8879f9657 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortSet.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Book;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
@@ -18,6 +19,8 @@
  */
 class SortSet extends Model implements Loggable
 {
+    use HasFactory;
+
     /**
      * @return SortSetOperation[]
      */
diff --git a/database/factories/Sorting/SortSetFactory.php b/database/factories/Sorting/SortSetFactory.php
new file mode 100644
index 00000000000..36e0a697677
--- /dev/null
+++ b/database/factories/Sorting/SortSetFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Database\Factories\Sorting;
+
+use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortSetOperation;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class SortSetFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = SortSet::class;
+
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        $cases = SortSetOperation::cases();
+        $op = $cases[array_rand($cases)];
+        return [
+            'name' => $op->name . ' Sort',
+            'sequence' => $op->value,
+        ];
+    }
+}
diff --git a/tests/Commands/AssignSortSetCommandTest.php b/tests/Commands/AssignSortSetCommandTest.php
new file mode 100644
index 00000000000..01cb5caa5e8
--- /dev/null
+++ b/tests/Commands/AssignSortSetCommandTest.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Commands;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Sorting\SortSet;
+use Tests\TestCase;
+
+class AssignSortSetCommandTest extends TestCase
+{
+    public function test_no_given_sort_set_lists_options()
+    {
+        $sortSets = SortSet::factory()->createMany(10);
+
+        $commandRun = $this->artisan('bookstack:assign-sort-set')
+            ->expectsOutputToContain('Sort set ID required!')
+            ->assertExitCode(1);
+
+        foreach ($sortSets as $sortSet) {
+            $commandRun->expectsOutputToContain("{$sortSet->id}: {$sortSet->name}");
+        }
+    }
+
+    public function test_run_without_options_advises_help()
+    {
+        $this->artisan("bookstack:assign-sort-set 100")
+            ->expectsOutput("No option provided to specify target. Run with the -h option to see all available options.")
+            ->assertExitCode(1);
+    }
+
+    public function test_run_without_valid_sort_advises_help()
+    {
+        $this->artisan("bookstack:assign-sort-set 100342 --all-books")
+            ->expectsOutput("Sort set of provided id 100342 not found!")
+            ->assertExitCode(1);
+    }
+
+    public function test_confirmation_required()
+    {
+        $sortSet = SortSet::factory()->create();
+
+        $this->artisan("bookstack:assign-sort-set {$sortSet->id} --all-books")
+            ->expectsConfirmation('Are you sure you want to continue?', 'no')
+            ->assertExitCode(1);
+
+        $booksWithSort = Book::query()->whereNotNull('sort_set_id')->count();
+        $this->assertEquals(0, $booksWithSort);
+    }
+
+    public function test_assign_to_all_books()
+    {
+        $sortSet = SortSet::factory()->create();
+        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
+        $this->assertGreaterThan(0, $booksWithoutSort);
+
+        $this->artisan("bookstack:assign-sort-set {$sortSet->id} --all-books")
+            ->expectsOutputToContain("This will apply sort set [{$sortSet->id}: {$sortSet->name}] to {$booksWithoutSort} book(s)")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
+            ->assertExitCode(0);
+
+        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
+        $this->assertEquals(0, $booksWithoutSort);
+    }
+
+    public function test_assign_to_all_books_without_sort()
+    {
+        $totalBooks = Book::query()->count();
+        $book = $this->entities->book();
+        $sortSetA = SortSet::factory()->create();
+        $sortSetB = SortSet::factory()->create();
+        $book->sort_set_id = $sortSetA->id;
+        $book->save();
+
+        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
+        $this->assertEquals($totalBooks, $booksWithoutSort + 1);
+
+        $this->artisan("bookstack:assign-sort-set {$sortSetB->id} --books-without-sort")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
+            ->assertExitCode(0);
+
+        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
+        $this->assertEquals(0, $booksWithoutSort);
+        $this->assertEquals($totalBooks, $sortSetB->books()->count() + 1);
+    }
+
+    public function test_assign_to_all_books_with_sort()
+    {
+        $book = $this->entities->book();
+        $sortSetA = SortSet::factory()->create();
+        $sortSetB = SortSet::factory()->create();
+        $book->sort_set_id = $sortSetA->id;
+        $book->save();
+
+        $this->artisan("bookstack:assign-sort-set {$sortSetB->id} --books-with-sort={$sortSetA->id}")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to 1 book(s)")
+            ->assertExitCode(0);
+
+        $book->refresh();
+        $this->assertEquals($sortSetB->id, $book->sort_set_id);
+        $this->assertEquals(1, $sortSetB->books()->count());
+    }
+
+    public function test_assign_to_all_books_with_sort_id_is_validated()
+    {
+        $this->artisan("bookstack:assign-sort-set 50 --books-with-sort=beans")
+            ->expectsOutputToContain("Provided --books-with-sort option value is invalid")
+            ->assertExitCode(1);
+    }
+}

From a65701294eaad4aad5ba5d9e249cbfb774ee6ca6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 10 Feb 2025 13:33:10 +0000
Subject: [PATCH 466/666] Sorting: Split out test class, added book autosort
 tests

Just for test view, actual functionality of autosort on change still
needs to be tested.
---
 app/Sorting/BookSorter.php                    |   2 +-
 .../SortTest.php => Sorting/BookSortTest.php} | 291 ++++--------------
 tests/Sorting/MoveTest.php                    | 221 +++++++++++++
 3 files changed, 286 insertions(+), 228 deletions(-)
 rename tests/{Entity/SortTest.php => Sorting/BookSortTest.php} (51%)
 create mode 100644 tests/Sorting/MoveTest.php

diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index fd99a8d3781..b6fe33b9c3e 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -42,7 +42,7 @@ public function runBookAutoSort(Book $book): void
         }, $set->getOperations());
 
         $chapters = $book->chapters()
-            ->with('pages:id,name,priority,created_at,updated_at')
+            ->with('pages:id,name,priority,created_at,updated_at,chapter_id')
             ->get(['id', 'name', 'priority', 'created_at', 'updated_at']);
 
         /** @var (Chapter|Book)[] $topItems */
diff --git a/tests/Entity/SortTest.php b/tests/Sorting/BookSortTest.php
similarity index 51%
rename from tests/Entity/SortTest.php
rename to tests/Sorting/BookSortTest.php
index 9a5a2fe175a..a726da14898 100644
--- a/tests/Entity/SortTest.php
+++ b/tests/Sorting/BookSortTest.php
@@ -1,15 +1,27 @@
 <?php
 
-namespace Tests\Entity;
+namespace Sorting;
 
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Sorting\SortSet;
 use Tests\TestCase;
 
-class SortTest extends TestCase
+class BookSortTest extends TestCase
 {
+    public function test_book_sort_page_shows()
+    {
+        $bookToSort = $this->entities->book();
+
+        $resp = $this->asAdmin()->get($bookToSort->getUrl());
+        $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
+
+        $resp = $this->get($bookToSort->getUrl('/sort'));
+        $resp->assertStatus(200);
+        $resp->assertSee($bookToSort->name);
+    }
+
     public function test_drafts_do_not_show_up()
     {
         $this->asAdmin();
@@ -20,232 +32,10 @@ public function test_drafts_do_not_show_up()
         $resp = $this->get($book->getUrl());
         $resp->assertSee($draft->name);
 
-        $resp = $this->get($book->getUrl() . '/sort');
+        $resp = $this->get($book->getUrl('/sort'));
         $resp->assertDontSee($draft->name);
     }
 
-    public function test_page_move_into_book()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-
-        $resp = $this->asEditor()->get($page->getUrl('/move'));
-        $resp->assertSee('Move Page');
-
-        $movePageResp = $this->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $page->refresh();
-
-        $movePageResp->assertRedirect($page->getUrl());
-        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
-
-        $newBookResp = $this->get($newBook->getUrl());
-        $newBookResp->assertSee('moved page');
-        $newBookResp->assertSee($page->name);
-    }
-
-    public function test_page_move_into_chapter()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-        $newChapter = $newBook->chapters()->first();
-
-        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [
-            'entity_selection' => 'chapter:' . $newChapter->id,
-        ]);
-        $page->refresh();
-
-        $movePageResp->assertRedirect($page->getUrl());
-        $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new chapter');
-
-        $newChapterResp = $this->get($newChapter->getUrl());
-        $newChapterResp->assertSee($page->name);
-    }
-
-    public function test_page_move_from_chapter_to_book()
-    {
-        $oldChapter = Chapter::query()->first();
-        $page = $oldChapter->pages()->first();
-        $newBook = Book::query()->where('id', '!=', $oldChapter->book_id)->first();
-
-        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $page->refresh();
-
-        $movePageResp->assertRedirect($page->getUrl());
-        $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new book');
-        $this->assertTrue($page->chapter === null, 'Page has no parent chapter');
-
-        $newBookResp = $this->get($newBook->getUrl());
-        $newBookResp->assertSee($page->name);
-    }
-
-    public function test_page_move_requires_create_permissions_on_parent()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-        $editor = $this->users->editor();
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], $editor->roles->all());
-
-        $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $this->assertPermissionError($movePageResp);
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles->all());
-        $movePageResp = $this->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $page->refresh();
-        $movePageResp->assertRedirect($page->getUrl());
-
-        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
-    }
-
-    public function test_page_move_requires_delete_permissions()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-        $editor = $this->users->editor();
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create'], $editor->roles->all());
-
-        $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $this->assertPermissionError($movePageResp);
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertDontSee($page->getUrl('/move'));
-
-        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $movePageResp = $this->put($page->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $page->refresh();
-        $movePageResp->assertRedirect($page->getUrl());
-        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
-    }
-
-    public function test_chapter_move()
-    {
-        $chapter = $this->entities->chapter();
-        $currentBook = $chapter->book;
-        $pageToCheck = $chapter->pages->first();
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-
-        $chapterMoveResp = $this->asEditor()->get($chapter->getUrl('/move'));
-        $chapterMoveResp->assertSee('Move Chapter');
-
-        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $chapter = Chapter::query()->find($chapter->id);
-        $moveChapterResp->assertRedirect($chapter->getUrl());
-        $this->assertTrue($chapter->book->id === $newBook->id, 'Chapter Book is now the new book');
-
-        $newBookResp = $this->get($newBook->getUrl());
-        $newBookResp->assertSee('moved chapter');
-        $newBookResp->assertSee($chapter->name);
-
-        $pageToCheck = Page::query()->find($pageToCheck->id);
-        $this->assertTrue($pageToCheck->book_id === $newBook->id, 'Chapter child page\'s book id has changed to the new book');
-        $pageCheckResp = $this->get($pageToCheck->getUrl());
-        $pageCheckResp->assertSee($newBook->name);
-    }
-
-    public function test_chapter_move_requires_delete_permissions()
-    {
-        $chapter = $this->entities->chapter();
-        $currentBook = $chapter->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-        $editor = $this->users->editor();
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create'], $editor->roles->all());
-
-        $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $this->assertPermissionError($moveChapterResp);
-        $pageView = $this->get($chapter->getUrl());
-        $pageView->assertDontSee($chapter->getUrl('/move'));
-
-        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $chapter = Chapter::query()->find($chapter->id);
-        $moveChapterResp->assertRedirect($chapter->getUrl());
-        $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
-    }
-
-    public function test_chapter_move_requires_create_permissions_in_new_book()
-    {
-        $chapter = $this->entities->chapter();
-        $currentBook = $chapter->book;
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-        $editor = $this->users->editor();
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], [$editor->roles->first()]);
-        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
-
-        $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-        $this->assertPermissionError($moveChapterResp);
-
-        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
-        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $chapter = Chapter::query()->find($chapter->id);
-        $moveChapterResp->assertRedirect($chapter->getUrl());
-        $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
-    }
-
-    public function test_chapter_move_changes_book_for_deleted_pages_within()
-    {
-        /** @var Chapter $chapter */
-        $chapter = Chapter::query()->whereHas('pages')->first();
-        $currentBook = $chapter->book;
-        $pageToCheck = $chapter->pages->first();
-        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
-
-        $pageToCheck->delete();
-
-        $this->asEditor()->put($chapter->getUrl('/move'), [
-            'entity_selection' => 'book:' . $newBook->id,
-        ]);
-
-        $pageToCheck->refresh();
-        $this->assertEquals($newBook->id, $pageToCheck->book_id);
-    }
-
-    public function test_book_sort_page_shows()
-    {
-        $bookToSort = $this->entities->book();
-
-        $resp = $this->asAdmin()->get($bookToSort->getUrl());
-        $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
-
-        $resp = $this->get($bookToSort->getUrl('/sort'));
-        $resp->assertStatus(200);
-        $resp->assertSee($bookToSort->name);
-    }
-
     public function test_book_sort()
     {
         $oldBook = $this->entities->book();
@@ -423,7 +213,7 @@ public function test_book_sort_item_returns_book_content()
         $firstPage = $bookToSort->pages[0];
         $firstChapter = $bookToSort->chapters[0];
 
-        $resp = $this->asAdmin()->get($bookToSort->getUrl() . '/sort-item');
+        $resp = $this->asAdmin()->get($bookToSort->getUrl('/sort-item'));
 
         // Ensure book details are returned
         $resp->assertSee($bookToSort->name);
@@ -431,6 +221,53 @@ public function test_book_sort_item_returns_book_content()
         $resp->assertSee($firstChapter->name);
     }
 
+    public function test_book_sort_item_shows_auto_sort_status()
+    {
+        $sort = SortSet::factory()->create(['name' => 'My sort']);
+        $book = $this->entities->book();
+
+        $resp = $this->asAdmin()->get($book->getUrl('/sort-item'));
+        $this->withHtml($resp)->assertElementNotExists("span[title='Auto Sort Active: My sort']");
+
+        $book->sort_set_id = $sort->id;
+        $book->save();
+
+        $resp = $this->asAdmin()->get($book->getUrl('/sort-item'));
+        $this->withHtml($resp)->assertElementExists("span[title='Auto Sort Active: My sort']");
+    }
+
+    public function test_auto_sort_options_shown_on_sort_page()
+    {
+        $sort = SortSet::factory()->create();
+        $book = $this->entities->book();
+        $resp = $this->asAdmin()->get($book->getUrl('/sort'));
+
+        $this->withHtml($resp)->assertElementExists('select[name="auto-sort"] option[value="' . $sort->id . '"]');
+    }
+
+    public function test_auto_sort_option_submit_saves_to_book()
+    {
+        $sort = SortSet::factory()->create();
+        $book = $this->entities->book();
+        $bookPage = $book->pages()->first();
+        $bookPage->priority = 10000;
+        $bookPage->save();
+
+        $resp = $this->asAdmin()->put($book->getUrl('/sort'), [
+            'auto-sort' => $sort->id,
+        ]);
+
+        $resp->assertRedirect($book->getUrl());
+        $book->refresh();
+        $bookPage->refresh();
+
+        $this->assertEquals($sort->id, $book->sort_set_id);
+        $this->assertNotEquals(10000, $bookPage->priority);
+
+        $resp = $this->get($book->getUrl('/sort'));
+        $this->withHtml($resp)->assertElementExists('select[name="auto-sort"] option[value="' . $sort->id . '"][selected]');
+    }
+
     public function test_pages_in_book_show_sorted_by_priority()
     {
         $book = $this->entities->bookHasChaptersAndPages();
diff --git a/tests/Sorting/MoveTest.php b/tests/Sorting/MoveTest.php
new file mode 100644
index 00000000000..edae1f3a3e1
--- /dev/null
+++ b/tests/Sorting/MoveTest.php
@@ -0,0 +1,221 @@
+<?php
+
+namespace Sorting;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use Tests\TestCase;
+
+class MoveTest extends TestCase
+{
+    public function test_page_move_into_book()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+
+        $resp = $this->asEditor()->get($page->getUrl('/move'));
+        $resp->assertSee('Move Page');
+
+        $movePageResp = $this->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $page->refresh();
+
+        $movePageResp->assertRedirect($page->getUrl());
+        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
+
+        $newBookResp = $this->get($newBook->getUrl());
+        $newBookResp->assertSee('moved page');
+        $newBookResp->assertSee($page->name);
+    }
+
+    public function test_page_move_into_chapter()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $newChapter = $newBook->chapters()->first();
+
+        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [
+            'entity_selection' => 'chapter:' . $newChapter->id,
+        ]);
+        $page->refresh();
+
+        $movePageResp->assertRedirect($page->getUrl());
+        $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new chapter');
+
+        $newChapterResp = $this->get($newChapter->getUrl());
+        $newChapterResp->assertSee($page->name);
+    }
+
+    public function test_page_move_from_chapter_to_book()
+    {
+        $oldChapter = Chapter::query()->first();
+        $page = $oldChapter->pages()->first();
+        $newBook = Book::query()->where('id', '!=', $oldChapter->book_id)->first();
+
+        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $page->refresh();
+
+        $movePageResp->assertRedirect($page->getUrl());
+        $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new book');
+        $this->assertTrue($page->chapter === null, 'Page has no parent chapter');
+
+        $newBookResp = $this->get($newBook->getUrl());
+        $newBookResp->assertSee($page->name);
+    }
+
+    public function test_page_move_requires_create_permissions_on_parent()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], $editor->roles->all());
+
+        $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $this->assertPermissionError($movePageResp);
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles->all());
+        $movePageResp = $this->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $page->refresh();
+        $movePageResp->assertRedirect($page->getUrl());
+
+        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
+    }
+
+    public function test_page_move_requires_delete_permissions()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create'], $editor->roles->all());
+
+        $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $this->assertPermissionError($movePageResp);
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertDontSee($page->getUrl('/move'));
+
+        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $movePageResp = $this->put($page->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $page->refresh();
+        $movePageResp->assertRedirect($page->getUrl());
+        $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
+    }
+
+    public function test_chapter_move()
+    {
+        $chapter = $this->entities->chapter();
+        $currentBook = $chapter->book;
+        $pageToCheck = $chapter->pages->first();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+
+        $chapterMoveResp = $this->asEditor()->get($chapter->getUrl('/move'));
+        $chapterMoveResp->assertSee('Move Chapter');
+
+        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $chapter = Chapter::query()->find($chapter->id);
+        $moveChapterResp->assertRedirect($chapter->getUrl());
+        $this->assertTrue($chapter->book->id === $newBook->id, 'Chapter Book is now the new book');
+
+        $newBookResp = $this->get($newBook->getUrl());
+        $newBookResp->assertSee('moved chapter');
+        $newBookResp->assertSee($chapter->name);
+
+        $pageToCheck = Page::query()->find($pageToCheck->id);
+        $this->assertTrue($pageToCheck->book_id === $newBook->id, 'Chapter child page\'s book id has changed to the new book');
+        $pageCheckResp = $this->get($pageToCheck->getUrl());
+        $pageCheckResp->assertSee($newBook->name);
+    }
+
+    public function test_chapter_move_requires_delete_permissions()
+    {
+        $chapter = $this->entities->chapter();
+        $currentBook = $chapter->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create'], $editor->roles->all());
+
+        $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $this->assertPermissionError($moveChapterResp);
+        $pageView = $this->get($chapter->getUrl());
+        $pageView->assertDontSee($chapter->getUrl('/move'));
+
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $chapter = Chapter::query()->find($chapter->id);
+        $moveChapterResp->assertRedirect($chapter->getUrl());
+        $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
+    }
+
+    public function test_chapter_move_requires_create_permissions_in_new_book()
+    {
+        $chapter = $this->entities->chapter();
+        $currentBook = $chapter->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], [$editor->roles->first()]);
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
+
+        $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $this->assertPermissionError($moveChapterResp);
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
+        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $chapter = Chapter::query()->find($chapter->id);
+        $moveChapterResp->assertRedirect($chapter->getUrl());
+        $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
+    }
+
+    public function test_chapter_move_changes_book_for_deleted_pages_within()
+    {
+        /** @var Chapter $chapter */
+        $chapter = Chapter::query()->whereHas('pages')->first();
+        $currentBook = $chapter->book;
+        $pageToCheck = $chapter->pages->first();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+
+        $pageToCheck->delete();
+
+        $this->asEditor()->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $pageToCheck->refresh();
+        $this->assertEquals($newBook->id, $pageToCheck->book_id);
+    }
+}

From a208c46b628505cfdd5caf5294a248560c485f50 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 10 Feb 2025 17:14:06 +0000
Subject: [PATCH 467/666] Sorting: Covered sort set management with tests

---
 app/Sorting/SortSetController.php             |   3 +-
 .../factories/Entities/Models/BookFactory.php |   4 +-
 lang/en/settings.php                          |   1 +
 .../parts/sort-set-list-item.blade.php        |   2 +-
 tests/Sorting/SortSetTest.php                 | 200 ++++++++++++++++++
 5 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 tests/Sorting/SortSetTest.php

diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortSetController.php
index b0ad2a7d766..7b1c0bc4160 100644
--- a/app/Sorting/SortSetController.php
+++ b/app/Sorting/SortSetController.php
@@ -4,14 +4,13 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Http\Controller;
-use BookStack\Http\Request;
+use Illuminate\Http\Request;
 
 class SortSetController extends Controller
 {
     public function __construct()
     {
         $this->middleware('can:settings-manage');
-        // TODO - Test
     }
 
     public function create()
diff --git a/database/factories/Entities/Models/BookFactory.php b/database/factories/Entities/Models/BookFactory.php
index 9cb8e971c6e..29403a2949c 100644
--- a/database/factories/Entities/Models/BookFactory.php
+++ b/database/factories/Entities/Models/BookFactory.php
@@ -26,7 +26,9 @@ public function definition()
             'name'        => $this->faker->sentence(),
             'slug'        => Str::random(10),
             'description' => $description,
-            'description_html' => '<p>' . e($description) . '</p>'
+            'description_html' => '<p>' . e($description) . '</p>',
+            'sort_set_id' => null,
+            'default_template_id' => null,
         ];
     }
 }
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 19ffd924049..344c186cb2f 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -80,6 +80,7 @@
     'sorting_book_default_desc' => 'Select the default sort set to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_sets' => 'Sort Sets',
     'sorting_sets_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_set_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
     'sort_set_create' => 'Create Sort Set',
     'sort_set_edit' => 'Edit Sort Set',
     'sort_set_delete' => 'Delete Sort Set',
diff --git a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
index e977c286e11..6c0b84047c0 100644
--- a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
+++ b/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
@@ -6,7 +6,7 @@
         {{ implode(', ', array_map(fn ($op) => $op->getLabel(), $set->getOperations())) }}
     </div>
     <div>
-        <span title="{{ trans('entities.tags_assigned_books') }}"
+        <span title="{{ trans_choice('settings.sort_set_assigned_to_x_books', $set->books_count ?? 0) }}"
               class="flex fill-area min-width-xxs bold text-right text-book"><span class="opacity-60">@icon('book')</span>{{ $set->books_count ?? 0 }}</span>
     </div>
 </div>
\ No newline at end of file
diff --git a/tests/Sorting/SortSetTest.php b/tests/Sorting/SortSetTest.php
new file mode 100644
index 00000000000..5f30034bd77
--- /dev/null
+++ b/tests/Sorting/SortSetTest.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Sorting;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Book;
+use BookStack\Sorting\SortSet;
+use Tests\Api\TestsApi;
+use Tests\TestCase;
+
+class SortSetTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_manage_settings_permission_required()
+    {
+        $set = SortSet::factory()->create();
+        $user = $this->users->viewer();
+        $this->actingAs($user);
+
+        $actions = [
+            ['GET', '/settings/sorting'],
+            ['POST', '/settings/sorting/sets'],
+            ['GET', "/settings/sorting/sets/{$set->id}"],
+            ['PUT', "/settings/sorting/sets/{$set->id}"],
+            ['DELETE', "/settings/sorting/sets/{$set->id}"],
+        ];
+
+        foreach ($actions as [$method, $path]) {
+            $resp = $this->call($method, $path);
+            $this->assertPermissionError($resp);
+        }
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        foreach ($actions as [$method, $path]) {
+            $resp = $this->call($method, $path);
+            $this->assertNotPermissionError($resp);
+        }
+    }
+
+    public function test_create_flow()
+    {
+        $resp = $this->asAdmin()->get('/settings/sorting');
+        $this->withHtml($resp)->assertLinkExists(url('/settings/sorting/sets/new'));
+
+        $resp = $this->get('/settings/sorting/sets/new');
+        $this->withHtml($resp)->assertElementExists('form[action$="/settings/sorting/sets"] input[name="name"]');
+        $resp->assertSeeText('Name - Alphabetical (Asc)');
+
+        $details = ['name' => 'My new sort', 'sequence' => 'name_asc'];
+        $resp = $this->post('/settings/sorting/sets', $details);
+        $resp->assertRedirect('/settings/sorting');
+
+        $this->assertActivityExists(ActivityType::SORT_SET_CREATE);
+        $this->assertDatabaseHas('sort_sets', $details);
+    }
+
+    public function test_listing_in_settings()
+    {
+        $set = SortSet::factory()->create(['name' => 'My super sort set', 'sequence' => 'name_asc']);
+        $books = Book::query()->limit(5)->get();
+        foreach ($books as $book) {
+            $book->sort_set_id = $set->id;
+            $book->save();
+        }
+
+        $resp = $this->asAdmin()->get('/settings/sorting');
+        $resp->assertSeeText('My super sort set');
+        $resp->assertSeeText('Name - Alphabetical (Asc)');
+        $this->withHtml($resp)->assertElementContains('.item-list-row [title="Assigned to 5 Books"]', '5');
+    }
+
+    public function test_update_flow()
+    {
+        $set = SortSet::factory()->create(['name' => 'My sort set to update', 'sequence' => 'name_asc']);
+
+        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
+        $respHtml = $this->withHtml($resp);
+        $respHtml->assertElementContains('.configured-option-list', 'Name - Alphabetical (Asc)');
+        $respHtml->assertElementNotContains('.available-option-list', 'Name - Alphabetical (Asc)');
+
+        $updateData = ['name' => 'My updated sort', 'sequence' => 'name_desc,chapters_last'];
+        $resp = $this->put("/settings/sorting/sets/{$set->id}", $updateData);
+
+        $resp->assertRedirect('/settings/sorting');
+        $this->assertActivityExists(ActivityType::SORT_SET_UPDATE);
+        $this->assertDatabaseHas('sort_sets', $updateData);
+    }
+
+    public function test_update_triggers_resort_on_assigned_books()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $set = SortSet::factory()->create(['name' => 'My sort set to update', 'sequence' => 'name_asc']);
+        $book->sort_set_id = $set->id;
+        $book->save();
+        $chapter->priority = 10000;
+        $chapter->save();
+
+        $resp = $this->asAdmin()->put("/settings/sorting/sets/{$set->id}", ['name' => $set->name, 'sequence' => 'chapters_last']);
+        $resp->assertRedirect('/settings/sorting');
+
+        $chapter->refresh();
+        $this->assertNotEquals(10000, $chapter->priority);
+    }
+
+    public function test_delete_flow()
+    {
+        $set = SortSet::factory()->create();
+
+        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
+        $resp->assertSeeText('Delete Sort Set');
+
+        $resp = $this->delete("settings/sorting/sets/{$set->id}");
+        $resp->assertRedirect('/settings/sorting');
+
+        $this->assertActivityExists(ActivityType::SORT_SET_DELETE);
+        $this->assertDatabaseMissing('sort_sets', ['id' => $set->id]);
+    }
+
+    public function test_delete_requires_confirmation_if_books_assigned()
+    {
+        $set = SortSet::factory()->create();
+        $books = Book::query()->limit(5)->get();
+        foreach ($books as $book) {
+            $book->sort_set_id = $set->id;
+            $book->save();
+        }
+
+        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
+        $resp->assertSeeText('Delete Sort Set');
+
+        $resp = $this->delete("settings/sorting/sets/{$set->id}");
+        $resp->assertRedirect("/settings/sorting/sets/{$set->id}#delete");
+        $resp = $this->followRedirects($resp);
+
+        $resp->assertSeeText('This sort set is currently used on 5 book(s). Are you sure you want to delete this?');
+        $this->assertDatabaseHas('sort_sets', ['id' => $set->id]);
+
+        $resp = $this->delete("settings/sorting/sets/{$set->id}", ['confirm' => 'true']);
+        $resp->assertRedirect('/settings/sorting');
+        $this->assertDatabaseMissing('sort_sets', ['id' => $set->id]);
+        $this->assertDatabaseMissing('books', ['sort_set_id' => $set->id]);
+    }
+
+    public function test_page_create_triggers_book_sort()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $set = SortSet::factory()->create(['sequence' => 'name_asc,chapters_first']);
+        $book->sort_set_id = $set->id;
+        $book->save();
+
+        $resp = $this->actingAsApiEditor()->post("/api/pages", [
+            'book_id' => $book->id,
+            'name' => '1111 page',
+            'markdown' => 'Hi'
+        ]);
+        $resp->assertOk();
+
+        $this->assertDatabaseHas('pages', [
+            'book_id' => $book->id,
+            'name' => '1111 page',
+            'priority' => $book->chapters()->count() + 1,
+        ]);
+    }
+
+    public function test_name_numeric_ordering()
+    {
+        $book = Book::factory()->create();
+        $set = SortSet::factory()->create(['sequence' => 'name_numeric_asc']);
+        $book->sort_set_id = $set->id;
+        $book->save();
+        $this->permissions->regenerateForEntity($book);
+
+        $namesToAdd = [
+            "1 - Pizza",
+            "2.0 - Tomato",
+            "2.5 - Beans",
+            "10 - Bread",
+            "20 - Milk",
+        ];
+
+        foreach ($namesToAdd as $name) {
+            $this->actingAsApiEditor()->post("/api/pages", [
+                'book_id' => $book->id,
+                'name' => $name,
+                'markdown' => 'Hello'
+            ]);
+        }
+
+        foreach ($namesToAdd as $index => $name) {
+            $this->assertDatabaseHas('pages', [
+                'book_id' => $book->id,
+                'name' => $name,
+                'priority' => $index + 1,
+            ]);
+        }
+    }
+}

From b9306a9029f41f3779b755d08c907a2edafc33df Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 11 Feb 2025 14:36:25 +0000
Subject: [PATCH 468/666] Sorting: Renamed sort set to sort rule

Renamed based on feedback from Tim and Script on Discord.
Also fixed flaky test
---
 app/Activity/ActivityType.php                 |  6 +-
 app/Console/Commands/AssignSortSetCommand.php |  6 +-
 app/Entities/Models/Book.php                  | 10 +--
 app/Entities/Repos/BookRepo.php               |  6 +-
 app/Sorting/BookSortController.php            |  4 +-
 app/Sorting/BookSorter.php                    |  6 +-
 app/Sorting/{SortSet.php => SortRule.php}     | 12 +--
 ...tController.php => SortRuleController.php} | 58 ++++++------
 ...SetOperation.php => SortRuleOperation.php} | 18 ++--
 .../factories/Entities/Models/BookFactory.php |  2 +-
 ...SortSetFactory.php => SortRuleFactory.php} | 10 +--
 ..._01_29_180933_create_sort_rules_table.php} |  4 +-
 ...2_05_150842_add_sort_rule_id_to_books.php} |  4 +-
 lang/en/entities.php                          |  2 +-
 lang/en/settings.php                          | 52 +++++------
 resources/js/components/index.ts              |  2 +-
 ...rt-set-manager.ts => sort-rule-manager.ts} |  4 +-
 .../views/books/parts/sort-box.blade.php      | 19 ++--
 resources/views/books/sort.blade.php          | 14 +--
 .../settings/categories/sorting.blade.php     | 17 ++--
 .../create.blade.php                          |  6 +-
 .../{sort-sets => sort-rules}/edit.blade.php  | 12 +--
 .../parts/form.blade.php                      | 36 ++++----
 .../parts/operation.blade.php                 |  0
 .../parts/sort-rule-list-item.blade.php}      |  8 +-
 routes/web.php                                | 12 +--
 tests/Commands/AssignSortSetCommandTest.php   | 22 ++---
 tests/Entity/PageTest.php                     |  2 +-
 tests/Sorting/BookSortTest.php                | 12 +--
 .../{SortSetTest.php => SortRuleTest.php}     | 90 +++++++++----------
 30 files changed, 232 insertions(+), 224 deletions(-)
 rename app/Sorting/{SortSet.php => SortRule.php} (77%)
 rename app/Sorting/{SortSetController.php => SortRuleController.php} (51%)
 rename app/Sorting/{SortSetOperation.php => SortRuleOperation.php} (74%)
 rename database/factories/Sorting/{SortSetFactory.php => SortRuleFactory.php} (70%)
 rename database/migrations/{2025_01_29_180933_create_sort_sets_table.php => 2025_01_29_180933_create_sort_rules_table.php} (82%)
 rename database/migrations/{2025_02_05_150842_add_sort_set_id_to_books.php => 2025_02_05_150842_add_sort_rule_id_to_books.php} (79%)
 rename resources/js/components/{sort-set-manager.ts => sort-rule-manager.ts} (93%)
 rename resources/views/settings/{sort-sets => sort-rules}/create.blade.php (70%)
 rename resources/views/settings/{sort-sets => sort-rules}/edit.blade.php (83%)
 rename resources/views/settings/{sort-sets => sort-rules}/parts/form.blade.php (53%)
 rename resources/views/settings/{sort-sets => sort-rules}/parts/operation.blade.php (100%)
 rename resources/views/settings/{sort-sets/parts/sort-set-list-item.blade.php => sort-rules/parts/sort-rule-list-item.blade.php} (53%)
 rename tests/Sorting/{SortSetTest.php => SortRuleTest.php} (58%)

diff --git a/app/Activity/ActivityType.php b/app/Activity/ActivityType.php
index 4a648da6cfb..a7f129f71d4 100644
--- a/app/Activity/ActivityType.php
+++ b/app/Activity/ActivityType.php
@@ -71,9 +71,9 @@ class ActivityType
     const IMPORT_RUN = 'import_run';
     const IMPORT_DELETE = 'import_delete';
 
-    const SORT_SET_CREATE = 'sort_set_create';
-    const SORT_SET_UPDATE = 'sort_set_update';
-    const SORT_SET_DELETE = 'sort_set_delete';
+    const SORT_RULE_CREATE = 'sort_rule_create';
+    const SORT_RULE_UPDATE = 'sort_rule_update';
+    const SORT_RULE_DELETE = 'sort_rule_delete';
 
     /**
      * Get all the possible values.
diff --git a/app/Console/Commands/AssignSortSetCommand.php b/app/Console/Commands/AssignSortSetCommand.php
index 484f6995255..6c9d3f7641a 100644
--- a/app/Console/Commands/AssignSortSetCommand.php
+++ b/app/Console/Commands/AssignSortSetCommand.php
@@ -4,7 +4,7 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Sorting\BookSorter;
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use Illuminate\Console\Command;
 
 class AssignSortSetCommand extends Command
@@ -37,7 +37,7 @@ public function handle(BookSorter $sorter): int
             return $this->listSortSets();
         }
 
-        $set = SortSet::query()->find($sortSetId);
+        $set = SortRule::query()->find($sortSetId);
         if ($this->option('all-books')) {
             $query = Book::query();
         } else if ($this->option('books-without-sort')) {
@@ -87,7 +87,7 @@ public function handle(BookSorter $sorter): int
     protected function listSortSets(): int
     {
 
-        $sets = SortSet::query()->orderBy('id', 'asc')->get();
+        $sets = SortRule::query()->orderBy('id', 'asc')->get();
         $this->error("Sort set ID required!");
         $this->warn("\nAvailable sort sets:");
         foreach ($sets as $set) {
diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 7d240e5cab9..ede4fc7d5a6 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use BookStack\Uploads\Image;
 use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -17,14 +17,14 @@
  * @property string                                   $description
  * @property int                                      $image_id
  * @property ?int                                     $default_template_id
- * @property ?int                                     $sort_set_id
+ * @property ?int                                     $sort_rule_id
  * @property Image|null                               $cover
  * @property \Illuminate\Database\Eloquent\Collection $chapters
  * @property \Illuminate\Database\Eloquent\Collection $pages
  * @property \Illuminate\Database\Eloquent\Collection $directPages
  * @property \Illuminate\Database\Eloquent\Collection $shelves
  * @property ?Page                                    $defaultTemplate
- * @property ?SortSet                                 $sortSet
+ * @property ?SortRule                                 $sortRule
  */
 class Book extends Entity implements HasCoverImage
 {
@@ -88,9 +88,9 @@ public function defaultTemplate(): BelongsTo
     /**
      * Get the sort set assigned to this book, if existing.
      */
-    public function sortSet(): BelongsTo
+    public function sortRule(): BelongsTo
     {
-        return $this->belongsTo(SortSet::class);
+        return $this->belongsTo(SortRule::class);
     }
 
     /**
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index b3b81164785..92e6a81c337 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -8,7 +8,7 @@
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Facades\Activity;
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use BookStack\Uploads\ImageRepo;
 use Exception;
 use Illuminate\Http\UploadedFile;
@@ -35,8 +35,8 @@ public function create(array $input): Book
         Activity::add(ActivityType::BOOK_CREATE, $book);
 
         $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
-        if ($defaultBookSortSetting && SortSet::query()->find($defaultBookSortSetting)) {
-            $book->sort_set_id = $defaultBookSortSetting;
+        if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
+            $book->sort_rule_id = $defaultBookSortSetting;
             $book->save();
         }
 
diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index 98d79d0fd12..479d1972440 100644
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -69,10 +69,10 @@ public function update(Request $request, BookSorter $sorter, string $bookSlug)
 
         if ($request->filled('auto-sort')) {
             $sortSetId = intval($request->get('auto-sort')) ?: null;
-            if ($sortSetId && SortSet::query()->find($sortSetId) === null) {
+            if ($sortSetId && SortRule::query()->find($sortSetId) === null) {
                 $sortSetId = null;
             }
-            $book->sort_set_id = $sortSetId;
+            $book->sort_rule_id = $sortSetId;
             $book->save();
             $sorter->runBookAutoSort($book);
             if (!$loggedActivityForBook) {
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index b6fe33b9c3e..7bf1b63f46c 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -16,7 +16,7 @@ public function __construct(
     ) {
     }
 
-    public function runBookAutoSortForAllWithSet(SortSet $set): void
+    public function runBookAutoSortForAllWithSet(SortRule $set): void
     {
         $set->books()->chunk(50, function ($books) {
             foreach ($books as $book) {
@@ -32,12 +32,12 @@ public function runBookAutoSortForAllWithSet(SortSet $set): void
      */
     public function runBookAutoSort(Book $book): void
     {
-        $set = $book->sortSet;
+        $set = $book->sortRule;
         if (!$set) {
             return;
         }
 
-        $sortFunctions = array_map(function (SortSetOperation $op) {
+        $sortFunctions = array_map(function (SortRuleOperation $op) {
             return $op->getSortFunction();
         }, $set->getOperations());
 
diff --git a/app/Sorting/SortSet.php b/app/Sorting/SortRule.php
similarity index 77%
rename from app/Sorting/SortSet.php
rename to app/Sorting/SortRule.php
index cc8879f9657..45e5514fd5f 100644
--- a/app/Sorting/SortSet.php
+++ b/app/Sorting/SortRule.php
@@ -17,24 +17,24 @@
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
-class SortSet extends Model implements Loggable
+class SortRule extends Model implements Loggable
 {
     use HasFactory;
 
     /**
-     * @return SortSetOperation[]
+     * @return SortRuleOperation[]
      */
     public function getOperations(): array
     {
-        return SortSetOperation::fromSequence($this->sequence);
+        return SortRuleOperation::fromSequence($this->sequence);
     }
 
     /**
-     * @param SortSetOperation[] $options
+     * @param SortRuleOperation[] $options
      */
     public function setOperations(array $options): void
     {
-        $values = array_map(fn (SortSetOperation $opt) => $opt->value, $options);
+        $values = array_map(fn (SortRuleOperation $opt) => $opt->value, $options);
         $this->sequence = implode(',', $values);
     }
 
@@ -45,7 +45,7 @@ public function logDescriptor(): string
 
     public function getUrl(): string
     {
-        return url("/settings/sorting/sets/{$this->id}");
+        return url("/settings/sorting/rules/{$this->id}");
     }
 
     public function books(): HasMany
diff --git a/app/Sorting/SortSetController.php b/app/Sorting/SortRuleController.php
similarity index 51%
rename from app/Sorting/SortSetController.php
rename to app/Sorting/SortRuleController.php
index 7b1c0bc4160..96b8e8ef53e 100644
--- a/app/Sorting/SortSetController.php
+++ b/app/Sorting/SortRuleController.php
@@ -6,7 +6,7 @@
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
-class SortSetController extends Controller
+class SortRuleController extends Controller
 {
     public function __construct()
     {
@@ -15,9 +15,9 @@ public function __construct()
 
     public function create()
     {
-        $this->setPageTitle(trans('settings.sort_set_create'));
+        $this->setPageTitle(trans('settings.sort_rule_create'));
 
-        return view('settings.sort-sets.create');
+        return view('settings.sort-rules.create');
     }
 
     public function store(Request $request)
@@ -27,28 +27,28 @@ public function store(Request $request)
             'sequence' => ['required', 'string', 'min:1'],
         ]);
 
-        $operations = SortSetOperation::fromSequence($request->input('sequence'));
+        $operations = SortRuleOperation::fromSequence($request->input('sequence'));
         if (count($operations) === 0) {
             return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
         }
 
-        $set = new SortSet();
-        $set->name = $request->input('name');
-        $set->setOperations($operations);
-        $set->save();
+        $rule = new SortRule();
+        $rule->name = $request->input('name');
+        $rule->setOperations($operations);
+        $rule->save();
 
-        $this->logActivity(ActivityType::SORT_SET_CREATE, $set);
+        $this->logActivity(ActivityType::SORT_RULE_CREATE, $rule);
 
         return redirect('/settings/sorting');
     }
 
     public function edit(string $id)
     {
-        $set = SortSet::query()->findOrFail($id);
+        $rule = SortRule::query()->findOrFail($id);
 
-        $this->setPageTitle(trans('settings.sort_set_edit'));
+        $this->setPageTitle(trans('settings.sort_rule_edit'));
 
-        return view('settings.sort-sets.edit', ['set' => $set]);
+        return view('settings.sort-rules.edit', ['rule' => $rule]);
     }
 
     public function update(string $id, Request $request, BookSorter $bookSorter)
@@ -58,21 +58,21 @@ public function update(string $id, Request $request, BookSorter $bookSorter)
             'sequence' => ['required', 'string', 'min:1'],
         ]);
 
-        $set = SortSet::query()->findOrFail($id);
-        $operations = SortSetOperation::fromSequence($request->input('sequence'));
+        $rule = SortRule::query()->findOrFail($id);
+        $operations = SortRuleOperation::fromSequence($request->input('sequence'));
         if (count($operations) === 0) {
-            return redirect($set->getUrl())->withInput()->withErrors(['sequence' => 'No operations set.']);
+            return redirect($rule->getUrl())->withInput()->withErrors(['sequence' => 'No operations set.']);
         }
 
-        $set->name = $request->input('name');
-        $set->setOperations($operations);
-        $changedSequence = $set->isDirty('sequence');
-        $set->save();
+        $rule->name = $request->input('name');
+        $rule->setOperations($operations);
+        $changedSequence = $rule->isDirty('sequence');
+        $rule->save();
 
-        $this->logActivity(ActivityType::SORT_SET_UPDATE, $set);
+        $this->logActivity(ActivityType::SORT_RULE_UPDATE, $rule);
 
         if ($changedSequence) {
-            $bookSorter->runBookAutoSortForAllWithSet($set);
+            $bookSorter->runBookAutoSortForAllWithSet($rule);
         }
 
         return redirect('/settings/sorting');
@@ -80,16 +80,16 @@ public function update(string $id, Request $request, BookSorter $bookSorter)
 
     public function destroy(string $id, Request $request)
     {
-        $set = SortSet::query()->findOrFail($id);
+        $rule = SortRule::query()->findOrFail($id);
         $confirmed = $request->input('confirm') === 'true';
-        $booksAssigned = $set->books()->count();
+        $booksAssigned = $rule->books()->count();
         $warnings = [];
 
         if ($booksAssigned > 0) {
             if ($confirmed) {
-                $set->books()->update(['sort_set_id' => null]);
+                $rule->books()->update(['sort_rule_id' => null]);
             } else {
-                $warnings[] = trans('settings.sort_set_delete_warn_books', ['count' => $booksAssigned]);
+                $warnings[] = trans('settings.sort_rule_delete_warn_books', ['count' => $booksAssigned]);
             }
         }
 
@@ -98,16 +98,16 @@ public function destroy(string $id, Request $request)
             if ($confirmed) {
                 setting()->remove('sorting-book-default');
             } else {
-                $warnings[] = trans('settings.sort_set_delete_warn_default');
+                $warnings[] = trans('settings.sort_rule_delete_warn_default');
             }
         }
 
         if (count($warnings) > 0) {
-            return redirect($set->getUrl() . '#delete')->withErrors(['delete' => $warnings]);
+            return redirect($rule->getUrl() . '#delete')->withErrors(['delete' => $warnings]);
         }
 
-        $set->delete();
-        $this->logActivity(ActivityType::SORT_SET_DELETE, $set);
+        $rule->delete();
+        $this->logActivity(ActivityType::SORT_RULE_DELETE, $rule);
 
         return redirect('/settings/sorting');
     }
diff --git a/app/Sorting/SortSetOperation.php b/app/Sorting/SortRuleOperation.php
similarity index 74%
rename from app/Sorting/SortSetOperation.php
rename to app/Sorting/SortRuleOperation.php
index 7fdd0b002bf..0d8ff239f8d 100644
--- a/app/Sorting/SortSetOperation.php
+++ b/app/Sorting/SortRuleOperation.php
@@ -5,7 +5,7 @@
 use Closure;
 use Illuminate\Support\Str;
 
-enum SortSetOperation: string
+enum SortRuleOperation: string
 {
     case NameAsc = 'name_asc';
     case NameDesc = 'name_desc';
@@ -26,13 +26,13 @@ public function getLabel(): string
         $label = '';
         if (str_ends_with($key, '_asc')) {
             $key = substr($key, 0, -4);
-            $label = trans('settings.sort_set_op_asc');
+            $label = trans('settings.sort_rule_op_asc');
         } elseif (str_ends_with($key, '_desc')) {
             $key = substr($key, 0, -5);
-            $label = trans('settings.sort_set_op_desc');
+            $label = trans('settings.sort_rule_op_desc');
         }
 
-        $label = trans('settings.sort_set_op_' . $key) . ' ' . $label;
+        $label = trans('settings.sort_rule_op_' . $key) . ' ' . $label;
         return trim($label);
     }
 
@@ -43,12 +43,12 @@ public function getSortFunction(): callable
     }
 
     /**
-     * @return SortSetOperation[]
+     * @return SortRuleOperation[]
      */
     public static function allExcluding(array $operations): array
     {
-        $all = SortSetOperation::cases();
-        $filtered = array_filter($all, function (SortSetOperation $operation) use ($operations) {
+        $all = SortRuleOperation::cases();
+        $filtered = array_filter($all, function (SortRuleOperation $operation) use ($operations) {
             return !in_array($operation, $operations);
         });
         return array_values($filtered);
@@ -57,12 +57,12 @@ public static function allExcluding(array $operations): array
     /**
      * Create a set of operations from a string sequence representation.
      * (values seperated by commas).
-     * @return SortSetOperation[]
+     * @return SortRuleOperation[]
      */
     public static function fromSequence(string $sequence): array
     {
         $strOptions = explode(',', $sequence);
-        $options = array_map(fn ($val) => SortSetOperation::tryFrom($val), $strOptions);
+        $options = array_map(fn ($val) => SortRuleOperation::tryFrom($val), $strOptions);
         return array_filter($options);
     }
 }
diff --git a/database/factories/Entities/Models/BookFactory.php b/database/factories/Entities/Models/BookFactory.php
index 29403a2949c..48d43d7a8b7 100644
--- a/database/factories/Entities/Models/BookFactory.php
+++ b/database/factories/Entities/Models/BookFactory.php
@@ -27,7 +27,7 @@ public function definition()
             'slug'        => Str::random(10),
             'description' => $description,
             'description_html' => '<p>' . e($description) . '</p>',
-            'sort_set_id' => null,
+            'sort_rule_id' => null,
             'default_template_id' => null,
         ];
     }
diff --git a/database/factories/Sorting/SortSetFactory.php b/database/factories/Sorting/SortRuleFactory.php
similarity index 70%
rename from database/factories/Sorting/SortSetFactory.php
rename to database/factories/Sorting/SortRuleFactory.php
index 36e0a697677..dafe8c3fa74 100644
--- a/database/factories/Sorting/SortSetFactory.php
+++ b/database/factories/Sorting/SortRuleFactory.php
@@ -2,25 +2,25 @@
 
 namespace Database\Factories\Sorting;
 
-use BookStack\Sorting\SortSet;
-use BookStack\Sorting\SortSetOperation;
+use BookStack\Sorting\SortRule;
+use BookStack\Sorting\SortRuleOperation;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-class SortSetFactory extends Factory
+class SortRuleFactory extends Factory
 {
     /**
      * The name of the factory's corresponding model.
      *
      * @var string
      */
-    protected $model = SortSet::class;
+    protected $model = SortRule::class;
 
     /**
      * Define the model's default state.
      */
     public function definition(): array
     {
-        $cases = SortSetOperation::cases();
+        $cases = SortRuleOperation::cases();
         $op = $cases[array_rand($cases)];
         return [
             'name' => $op->name . ' Sort',
diff --git a/database/migrations/2025_01_29_180933_create_sort_sets_table.php b/database/migrations/2025_01_29_180933_create_sort_rules_table.php
similarity index 82%
rename from database/migrations/2025_01_29_180933_create_sort_sets_table.php
rename to database/migrations/2025_01_29_180933_create_sort_rules_table.php
index bf9780c5b7e..37d20ddf618 100644
--- a/database/migrations/2025_01_29_180933_create_sort_sets_table.php
+++ b/database/migrations/2025_01_29_180933_create_sort_rules_table.php
@@ -11,7 +11,7 @@
      */
     public function up(): void
     {
-        Schema::create('sort_sets', function (Blueprint $table) {
+        Schema::create('sort_rules', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->text('sequence');
@@ -24,6 +24,6 @@ public function up(): void
      */
     public function down(): void
     {
-        Schema::dropIfExists('sort_sets');
+        Schema::dropIfExists('sort_rules');
     }
 };
diff --git a/database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php b/database/migrations/2025_02_05_150842_add_sort_rule_id_to_books.php
similarity index 79%
rename from database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php
rename to database/migrations/2025_02_05_150842_add_sort_rule_id_to_books.php
index c0b32c55288..106db05caa0 100644
--- a/database/migrations/2025_02_05_150842_add_sort_set_id_to_books.php
+++ b/database/migrations/2025_02_05_150842_add_sort_rule_id_to_books.php
@@ -12,7 +12,7 @@
     public function up(): void
     {
         Schema::table('books', function (Blueprint $table) {
-            $table->unsignedInteger('sort_set_id')->nullable()->default(null);
+            $table->unsignedInteger('sort_rule_id')->nullable()->default(null);
         });
     }
 
@@ -22,7 +22,7 @@ public function up(): void
     public function down(): void
     {
         Schema::table('books', function (Blueprint $table) {
-            $table->dropColumn('sort_set_id');
+            $table->dropColumn('sort_rule_id');
         });
     }
 };
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 28a209fa21a..a74785eaacd 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -166,7 +166,7 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort option can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 344c186cb2f..098479f3be0 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -77,32 +77,32 @@
     // Sorting Settings
     'sorting' => 'Sorting',
     'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort set to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_sets' => 'Sort Sets',
-    'sorting_sets_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_set_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_set_create' => 'Create Sort Set',
-    'sort_set_edit' => 'Edit Sort Set',
-    'sort_set_delete' => 'Delete Sort Set',
-    'sort_set_delete_desc' => 'Remove this sort set from the system. Books using this sort will revert to manual sorting.',
-    'sort_set_delete_warn_books' => 'This sort set is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_set_delete_warn_default' => 'This sort set is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_set_details' => 'Sort Set Details',
-    'sort_set_details_desc' => 'Set a name for this sort set, which will appear in lists when users are selecting a sort.',
-    'sort_set_operations' => 'Sort Operations',
-    'sort_set_operations_desc' => 'Configure the sort actions to be performed in this set by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom.',
-    'sort_set_available_operations' => 'Available Operations',
-    'sort_set_available_operations_empty' => 'No operations remaining',
-    'sort_set_configured_operations' => 'Configured Operations',
-    'sort_set_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_set_op_asc' => '(Asc)',
-    'sort_set_op_desc' => '(Desc)',
-    'sort_set_op_name' => 'Name - Alphabetical',
-    'sort_set_op_name_numeric' => 'Name - Numeric',
-    'sort_set_op_created_date' => 'Created Date',
-    'sort_set_op_updated_date' => 'Updated Date',
-    'sort_set_op_chapters_first' => 'Chapters First',
-    'sort_set_op_chapters_last' => 'Chapters Last',
+    'sorting_book_default_desc' => 'Select the default sort role to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed in this set by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
 
     // Maintenance settings
     'maint' => 'Maintenance',
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index affa25fcf31..10b8025db63 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -50,7 +50,7 @@ export {ShelfSort} from './shelf-sort';
 export {Shortcuts} from './shortcuts';
 export {ShortcutInput} from './shortcut-input';
 export {SortableList} from './sortable-list';
-export {SortSetManager} from './sort-set-manager'
+export {SortRuleManager} from './sort-rule-manager'
 export {SubmitOnChange} from './submit-on-change';
 export {Tabs} from './tabs';
 export {TagManager} from './tag-manager';
diff --git a/resources/js/components/sort-set-manager.ts b/resources/js/components/sort-rule-manager.ts
similarity index 93%
rename from resources/js/components/sort-set-manager.ts
rename to resources/js/components/sort-rule-manager.ts
index c35ad41fe07..ff08f4ab878 100644
--- a/resources/js/components/sort-set-manager.ts
+++ b/resources/js/components/sort-rule-manager.ts
@@ -3,7 +3,7 @@ import Sortable from "sortablejs";
 import {buildListActions, sortActionClickListener} from "../services/dual-lists";
 
 
-export class SortSetManager extends Component {
+export class SortRuleManager extends Component {
 
     protected input!: HTMLInputElement;
     protected configuredList!: HTMLElement;
@@ -25,7 +25,7 @@ export class SortSetManager extends Component {
         const scrollBoxes = [this.configuredList, this.availableList];
         for (const scrollBox of scrollBoxes) {
             new Sortable(scrollBox, {
-                group: 'sort-set-operations',
+                group: 'sort-rule-operations',
                 ghostClass: 'primary-background-light',
                 handle: '.handle',
                 animation: 150,
diff --git a/resources/views/books/parts/sort-box.blade.php b/resources/views/books/parts/sort-box.blade.php
index 232616168f9..6fdb1819e61 100644
--- a/resources/views/books/parts/sort-box.blade.php
+++ b/resources/views/books/parts/sort-box.blade.php
@@ -9,18 +9,23 @@
                 <span>{{ $book->name }}</span>
             </div>
             <div class="flex-container-row items-center text-book">
-                @if($book->sortSet)
-                    <span title="{{ trans('entities.books_sort_auto_sort_active', ['sortName' => $book->sortSet->name]) }}">@icon('auto-sort')</span>
+                @if($book->sortRule)
+                    <span title="{{ trans('entities.books_sort_auto_sort_active', ['sortName' => $book->sortRule->name]) }}">@icon('auto-sort')</span>
                 @endif
             </div>
         </h5>
     </summary>
     <div class="sort-box-options pb-sm">
-        <button type="button" data-sort="name" class="button outline small">{{ trans('entities.books_sort_name') }}</button>
-        <button type="button" data-sort="created" class="button outline small">{{ trans('entities.books_sort_created') }}</button>
-        <button type="button" data-sort="updated" class="button outline small">{{ trans('entities.books_sort_updated') }}</button>
-        <button type="button" data-sort="chaptersFirst" class="button outline small">{{ trans('entities.books_sort_chapters_first') }}</button>
-        <button type="button" data-sort="chaptersLast" class="button outline small">{{ trans('entities.books_sort_chapters_last') }}</button>
+        <button type="button" data-sort="name"
+                class="button outline small">{{ trans('entities.books_sort_name') }}</button>
+        <button type="button" data-sort="created"
+                class="button outline small">{{ trans('entities.books_sort_created') }}</button>
+        <button type="button" data-sort="updated"
+                class="button outline small">{{ trans('entities.books_sort_updated') }}</button>
+        <button type="button" data-sort="chaptersFirst"
+                class="button outline small">{{ trans('entities.books_sort_chapters_first') }}</button>
+        <button type="button" data-sort="chaptersLast"
+                class="button outline small">{{ trans('entities.books_sort_chapters_last') }}</button>
     </div>
     <ul class="sortable-page-list sort-list">
 
diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index 3c59ac1e092..e090708b1d7 100644
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -23,19 +23,21 @@
                         <p class="text-muted flex min-width-s mb-none">{{ trans('entities.books_sort_desc') }}</p>
                         <div class="min-width-s">
                             @php
-                                $autoSortVal = intval(old('auto-sort') ?? $book->sort_set_id ?? 0);
+                                $autoSortVal = intval(old('auto-sort') ?? $book->sort_rule_id ?? 0);
                             @endphp
                             <label for="auto-sort">{{ trans('entities.books_sort_auto_sort') }}</label>
                             <select id="auto-sort"
                                     name="auto-sort"
                                     form="sort-form"
                                     class="{{ $errors->has('auto-sort') ? 'neg' : '' }}">
-                                <option value="0" @if($autoSortVal === 0) selected @endif>-- {{ trans('common.none') }} --</option>
-                                @foreach(\BookStack\Sorting\SortSet::allByName() as $set)
-                                    <option value="{{$set->id}}"
-                                            @if($autoSortVal === $set->id) selected @endif
+                                <option value="0" @if($autoSortVal === 0) selected @endif>-- {{ trans('common.none') }}
+                                    --
+                                </option>
+                                @foreach(\BookStack\Sorting\SortRule::allByName() as $rule)
+                                    <option value="{{$rule->id}}"
+                                            @if($autoSortVal === $rule->id) selected @endif
                                     >
-                                        {{ $set->name }}
+                                        {{ $rule->name }}
                                     </option>
                                 @endforeach
                             </select>
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 6a52873e6ab..9d1d9814b96 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -1,7 +1,7 @@
 @extends('settings.layout')
 
 @php
-    $sortSets = \BookStack\Sorting\SortSet::allByName();
+    $sortRules = \BookStack\Sorting\SortRule::allByName();
 @endphp
 
 @section('card')
@@ -23,7 +23,7 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
                         <option value="0" @if(intval(setting('sorting-book-default', '0')) === 0) selected @endif>
                             -- {{ trans('common.none') }} --
                         </option>
-                        @foreach($sortSets as $set)
+                        @foreach($sortRules as $set)
                             <option value="{{$set->id}}"
                                     @if(intval(setting('sorting-book-default', '0')) === $set->id) selected @endif
                             >
@@ -46,20 +46,21 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
     <div class="card content-wrap auto-height">
         <div class="flex-container-row items-center gap-m">
             <div class="flex">
-                <h2 class="list-heading">{{ trans('settings.sorting_sets') }}</h2>
-                <p class="text-muted">{{ trans('settings.sorting_sets_desc') }}</p>
+                <h2 class="list-heading">{{ trans('settings.sorting_rules') }}</h2>
+                <p class="text-muted">{{ trans('settings.sorting_rules_desc') }}</p>
             </div>
             <div>
-                <a href="{{ url('/settings/sorting/sets/new') }}" class="button outline">{{ trans('settings.sort_set_create') }}</a>
+                <a href="{{ url('/settings/sorting/rules/new') }}"
+                   class="button outline">{{ trans('settings.sort_rule_create') }}</a>
             </div>
         </div>
 
-        @if(empty($sortSets))
+        @if(empty($sortRules))
             <p class="italic text-muted">{{ trans('common.no_items') }}</p>
         @else
             <div class="item-list">
-                @foreach($sortSets as $set)
-                    @include('settings.sort-sets.parts.sort-set-list-item', ['set' => $set])
+                @foreach($sortRules as $rule)
+                    @include('settings.sort-rules.parts.sort-rule-list-item', ['rule' => $rule])
                 @endforeach
             </div>
         @endif
diff --git a/resources/views/settings/sort-sets/create.blade.php b/resources/views/settings/sort-rules/create.blade.php
similarity index 70%
rename from resources/views/settings/sort-sets/create.blade.php
rename to resources/views/settings/sort-rules/create.blade.php
index 16f2d2ac72c..e1d5c7c4630 100644
--- a/resources/views/settings/sort-sets/create.blade.php
+++ b/resources/views/settings/sort-rules/create.blade.php
@@ -7,11 +7,11 @@
         @include('settings.parts.navbar', ['selected' => 'settings'])
 
         <div class="card content-wrap auto-height">
-            <h1 class="list-heading">{{ trans('settings.sort_set_create') }}</h1>
+            <h1 class="list-heading">{{ trans('settings.sort_rule_create') }}</h1>
 
-            <form action="{{ url("/settings/sorting/sets") }}" method="POST">
+            <form action="{{ url("/settings/sorting/rules") }}" method="POST">
                 {{ csrf_field() }}
-                @include('settings.sort-sets.parts.form', ['model' => null])
+                @include('settings.sort-rules.parts.form', ['model' => null])
 
                 <div class="form-group text-right">
                     <a href="{{ url("/settings/sorting") }}" class="button outline">{{ trans('common.cancel') }}</a>
diff --git a/resources/views/settings/sort-sets/edit.blade.php b/resources/views/settings/sort-rules/edit.blade.php
similarity index 83%
rename from resources/views/settings/sort-sets/edit.blade.php
rename to resources/views/settings/sort-rules/edit.blade.php
index febcd9ffe1f..8bf04701fe0 100644
--- a/resources/views/settings/sort-sets/edit.blade.php
+++ b/resources/views/settings/sort-rules/edit.blade.php
@@ -7,13 +7,13 @@
         @include('settings.parts.navbar', ['selected' => 'settings'])
 
         <div class="card content-wrap auto-height">
-            <h1 class="list-heading">{{ trans('settings.sort_set_edit') }}</h1>
+            <h1 class="list-heading">{{ trans('settings.sort_rule_edit') }}</h1>
 
-            <form action="{{ $set->getUrl() }}" method="POST">
+            <form action="{{ $rule->getUrl() }}" method="POST">
                 {{ method_field('PUT') }}
                 {{ csrf_field() }}
 
-                @include('settings.sort-sets.parts.form', ['model' => $set])
+                @include('settings.sort-rules.parts.form', ['model' => $rule])
 
                 <div class="form-group text-right">
                     <a href="{{ url("/settings/sorting") }}" class="button outline">{{ trans('common.cancel') }}</a>
@@ -25,8 +25,8 @@
         <div id="delete" class="card content-wrap auto-height">
             <div class="flex-container-row items-center gap-l">
                 <div class="mb-m">
-                    <h2 class="list-heading">{{ trans('settings.sort_set_delete') }}</h2>
-                    <p class="text-muted mb-xs">{{ trans('settings.sort_set_delete_desc') }}</p>
+                    <h2 class="list-heading">{{ trans('settings.sort_rule_delete') }}</h2>
+                    <p class="text-muted mb-xs">{{ trans('settings.sort_rule_delete_desc') }}</p>
                     @if($errors->has('delete'))
                         @foreach($errors->get('delete') as $error)
                             <p class="text-neg mb-xs">{{ $error }}</p>
@@ -34,7 +34,7 @@
                     @endif
                 </div>
                 <div class="flex">
-                    <form action="{{ $set->getUrl() }}" method="POST">
+                    <form action="{{ $rule->getUrl() }}" method="POST">
                         {{ method_field('DELETE') }}
                         {{ csrf_field() }}
 
diff --git a/resources/views/settings/sort-sets/parts/form.blade.php b/resources/views/settings/sort-rules/parts/form.blade.php
similarity index 53%
rename from resources/views/settings/sort-sets/parts/form.blade.php
rename to resources/views/settings/sort-rules/parts/form.blade.php
index 38db840ac57..d6de947b6c7 100644
--- a/resources/views/settings/sort-sets/parts/form.blade.php
+++ b/resources/views/settings/sort-rules/parts/form.blade.php
@@ -1,8 +1,8 @@
 <div class="setting-list">
     <div class="grid half">
         <div>
-            <label class="setting-list-label">{{ trans('settings.sort_set_details') }}</label>
-            <p class="text-muted text-small">{{ trans('settings.sort_set_details_desc') }}</p>
+            <label class="setting-list-label">{{ trans('settings.sort_rule_details') }}</label>
+            <p class="text-muted text-small">{{ trans('settings.sort_rule_details_desc') }}</p>
         </div>
         <div>
             <div class="form-group">
@@ -12,42 +12,42 @@
         </div>
     </div>
 
-    <div component="sort-set-manager">
-        <label class="setting-list-label">{{ trans('settings.sort_set_operations') }}</label>
-        <p class="text-muted text-small">{{ trans('settings.sort_set_operations_desc') }}</p>
+    <div component="sort-rule-manager">
+        <label class="setting-list-label">{{ trans('settings.sort_rule_operations') }}</label>
+        <p class="text-muted text-small">{{ trans('settings.sort_rule_operations_desc') }}</p>
         @include('form.errors', ['name' => 'sequence'])
 
-        <input refs="sort-set-manager@input" type="hidden" name="sequence"
+        <input refs="sort-rule-manager@input" type="hidden" name="sequence"
                value="{{ old('sequence') ?? $model?->sequence ?? '' }}">
 
         @php
-            $configuredOps = old('sequence') ? \BookStack\Sorting\SortSetOperation::fromSequence(old('sequence')) : ($model?->getOperations() ?? []);
+            $configuredOps = old('sequence') ? \BookStack\Sorting\SortRuleOperation::fromSequence(old('sequence')) : ($model?->getOperations() ?? []);
         @endphp
 
         <div class="grid half">
             <div class="form-group">
                 <label for="books"
-                       id="sort-set-configured-operations">{{ trans('settings.sort_set_configured_operations') }}</label>
-                <ul refs="sort-set-manager@configured-operations-list"
-                    aria-labelledby="sort-set-configured-operations"
+                       id="sort-rule-configured-operations">{{ trans('settings.sort_rule_configured_operations') }}</label>
+                <ul refs="sort-rule-manager@configured-operations-list"
+                    aria-labelledby="sort-rule-configured-operations"
                     class="scroll-box configured-option-list">
-                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_configured_operations_empty') }}</li>
+                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_rule_configured_operations_empty') }}</li>
 
                     @foreach($configuredOps as $operation)
-                        @include('settings.sort-sets.parts.operation', ['operation' => $operation])
+                        @include('settings.sort-rules.parts.operation', ['operation' => $operation])
                     @endforeach
                 </ul>
             </div>
 
             <div class="form-group">
                 <label for="books"
-                       id="sort-set-available-operations">{{ trans('settings.sort_set_available_operations') }}</label>
-                <ul refs="sort-set-manager@available-operations-list"
-                    aria-labelledby="sort-set-available-operations"
+                       id="sort-rule-available-operations">{{ trans('settings.sort_rule_available_operations') }}</label>
+                <ul refs="sort-rule-manager@available-operations-list"
+                    aria-labelledby="sort-rule-available-operations"
                     class="scroll-box available-option-list">
-                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_set_available_operations_empty') }}</li>
-                    @foreach(\BookStack\Sorting\SortSetOperation::allExcluding($configuredOps) as $operation)
-                        @include('settings.sort-sets.parts.operation', ['operation' => $operation])
+                    <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('settings.sort_rule_available_operations_empty') }}</li>
+                    @foreach(\BookStack\Sorting\SortRuleOperation::allExcluding($configuredOps) as $operation)
+                        @include('settings.sort-rules.parts.operation', ['operation' => $operation])
                     @endforeach
                 </ul>
             </div>
diff --git a/resources/views/settings/sort-sets/parts/operation.blade.php b/resources/views/settings/sort-rules/parts/operation.blade.php
similarity index 100%
rename from resources/views/settings/sort-sets/parts/operation.blade.php
rename to resources/views/settings/sort-rules/parts/operation.blade.php
diff --git a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php b/resources/views/settings/sort-rules/parts/sort-rule-list-item.blade.php
similarity index 53%
rename from resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
rename to resources/views/settings/sort-rules/parts/sort-rule-list-item.blade.php
index 6c0b84047c0..5236cb412a3 100644
--- a/resources/views/settings/sort-sets/parts/sort-set-list-item.blade.php
+++ b/resources/views/settings/sort-rules/parts/sort-rule-list-item.blade.php
@@ -1,12 +1,12 @@
 <div class="item-list-row flex-container-row py-xs px-m gap-m items-center">
     <div class="py-xs flex">
-        <a href="{{ $set->getUrl() }}">{{ $set->name }}</a>
+        <a href="{{ $rule->getUrl() }}">{{ $rule->name }}</a>
     </div>
     <div class="px-m text-small text-muted ml-auto">
-        {{ implode(', ', array_map(fn ($op) => $op->getLabel(), $set->getOperations())) }}
+        {{ implode(', ', array_map(fn ($op) => $op->getLabel(), $rule->getOperations())) }}
     </div>
     <div>
-        <span title="{{ trans_choice('settings.sort_set_assigned_to_x_books', $set->books_count ?? 0) }}"
-              class="flex fill-area min-width-xxs bold text-right text-book"><span class="opacity-60">@icon('book')</span>{{ $set->books_count ?? 0 }}</span>
+        <span title="{{ trans_choice('settings.sort_rule_assigned_to_x_books', $rule->books_count ?? 0) }}"
+              class="flex fill-area min-width-xxs bold text-right text-book"><span class="opacity-60">@icon('book')</span>{{ $rule->books_count ?? 0 }}</span>
     </div>
 </div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 62c120f2020..8184725834c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -295,12 +295,12 @@
     Route::get('/settings/webhooks/{id}/delete', [ActivityControllers\WebhookController::class, 'delete']);
     Route::delete('/settings/webhooks/{id}', [ActivityControllers\WebhookController::class, 'destroy']);
 
-    // Sort Sets
-    Route::get('/settings/sorting/sets/new', [SortingControllers\SortSetController::class, 'create']);
-    Route::post('/settings/sorting/sets', [SortingControllers\SortSetController::class, 'store']);
-    Route::get('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'edit']);
-    Route::put('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'update']);
-    Route::delete('/settings/sorting/sets/{id}', [SortingControllers\SortSetController::class, 'destroy']);
+    // Sort Rules
+    Route::get('/settings/sorting/rules/new', [SortingControllers\SortRuleController::class, 'create']);
+    Route::post('/settings/sorting/rules', [SortingControllers\SortRuleController::class, 'store']);
+    Route::get('/settings/sorting/rules/{id}', [SortingControllers\SortRuleController::class, 'edit']);
+    Route::put('/settings/sorting/rules/{id}', [SortingControllers\SortRuleController::class, 'update']);
+    Route::delete('/settings/sorting/rules/{id}', [SortingControllers\SortRuleController::class, 'destroy']);
 
     // Settings
     Route::get('/settings', [SettingControllers\SettingController::class, 'index'])->name('settings');
diff --git a/tests/Commands/AssignSortSetCommandTest.php b/tests/Commands/AssignSortSetCommandTest.php
index 01cb5caa5e8..659840a9bcc 100644
--- a/tests/Commands/AssignSortSetCommandTest.php
+++ b/tests/Commands/AssignSortSetCommandTest.php
@@ -3,14 +3,14 @@
 namespace Commands;
 
 use BookStack\Entities\Models\Book;
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use Tests\TestCase;
 
 class AssignSortSetCommandTest extends TestCase
 {
     public function test_no_given_sort_set_lists_options()
     {
-        $sortSets = SortSet::factory()->createMany(10);
+        $sortSets = SortRule::factory()->createMany(10);
 
         $commandRun = $this->artisan('bookstack:assign-sort-set')
             ->expectsOutputToContain('Sort set ID required!')
@@ -37,7 +37,7 @@ public function test_run_without_valid_sort_advises_help()
 
     public function test_confirmation_required()
     {
-        $sortSet = SortSet::factory()->create();
+        $sortSet = SortRule::factory()->create();
 
         $this->artisan("bookstack:assign-sort-set {$sortSet->id} --all-books")
             ->expectsConfirmation('Are you sure you want to continue?', 'no')
@@ -49,7 +49,7 @@ public function test_confirmation_required()
 
     public function test_assign_to_all_books()
     {
-        $sortSet = SortSet::factory()->create();
+        $sortSet = SortRule::factory()->create();
         $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
         $this->assertGreaterThan(0, $booksWithoutSort);
 
@@ -67,9 +67,9 @@ public function test_assign_to_all_books_without_sort()
     {
         $totalBooks = Book::query()->count();
         $book = $this->entities->book();
-        $sortSetA = SortSet::factory()->create();
-        $sortSetB = SortSet::factory()->create();
-        $book->sort_set_id = $sortSetA->id;
+        $sortSetA = SortRule::factory()->create();
+        $sortSetB = SortRule::factory()->create();
+        $book->sort_rule_id = $sortSetA->id;
         $book->save();
 
         $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
@@ -88,9 +88,9 @@ public function test_assign_to_all_books_without_sort()
     public function test_assign_to_all_books_with_sort()
     {
         $book = $this->entities->book();
-        $sortSetA = SortSet::factory()->create();
-        $sortSetB = SortSet::factory()->create();
-        $book->sort_set_id = $sortSetA->id;
+        $sortSetA = SortRule::factory()->create();
+        $sortSetB = SortRule::factory()->create();
+        $book->sort_rule_id = $sortSetA->id;
         $book->save();
 
         $this->artisan("bookstack:assign-sort-set {$sortSetB->id} --books-with-sort={$sortSetA->id}")
@@ -99,7 +99,7 @@ public function test_assign_to_all_books_with_sort()
             ->assertExitCode(0);
 
         $book->refresh();
-        $this->assertEquals($sortSetB->id, $book->sort_set_id);
+        $this->assertEquals($sortSetB->id, $book->sort_rule_id);
         $this->assertEquals(1, $sortSetB->books()->count());
     }
 
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index deeead09911..e444d165fb3 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -300,7 +300,7 @@ public function test_recently_updated_pages_view_shows_updated_by_details()
         ]);
 
         $resp = $this->asAdmin()->get('/pages/recently-updated');
-        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 0 seconds ago by ' . $user->name);
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1) small', 'by ' . $user->name);
     }
 
     public function test_recently_updated_pages_view_shows_parent_chain()
diff --git a/tests/Sorting/BookSortTest.php b/tests/Sorting/BookSortTest.php
index a726da14898..b30cec8b636 100644
--- a/tests/Sorting/BookSortTest.php
+++ b/tests/Sorting/BookSortTest.php
@@ -5,7 +5,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use Tests\TestCase;
 
 class BookSortTest extends TestCase
@@ -223,13 +223,13 @@ public function test_book_sort_item_returns_book_content()
 
     public function test_book_sort_item_shows_auto_sort_status()
     {
-        $sort = SortSet::factory()->create(['name' => 'My sort']);
+        $sort = SortRule::factory()->create(['name' => 'My sort']);
         $book = $this->entities->book();
 
         $resp = $this->asAdmin()->get($book->getUrl('/sort-item'));
         $this->withHtml($resp)->assertElementNotExists("span[title='Auto Sort Active: My sort']");
 
-        $book->sort_set_id = $sort->id;
+        $book->sort_rule_id = $sort->id;
         $book->save();
 
         $resp = $this->asAdmin()->get($book->getUrl('/sort-item'));
@@ -238,7 +238,7 @@ public function test_book_sort_item_shows_auto_sort_status()
 
     public function test_auto_sort_options_shown_on_sort_page()
     {
-        $sort = SortSet::factory()->create();
+        $sort = SortRule::factory()->create();
         $book = $this->entities->book();
         $resp = $this->asAdmin()->get($book->getUrl('/sort'));
 
@@ -247,7 +247,7 @@ public function test_auto_sort_options_shown_on_sort_page()
 
     public function test_auto_sort_option_submit_saves_to_book()
     {
-        $sort = SortSet::factory()->create();
+        $sort = SortRule::factory()->create();
         $book = $this->entities->book();
         $bookPage = $book->pages()->first();
         $bookPage->priority = 10000;
@@ -261,7 +261,7 @@ public function test_auto_sort_option_submit_saves_to_book()
         $book->refresh();
         $bookPage->refresh();
 
-        $this->assertEquals($sort->id, $book->sort_set_id);
+        $this->assertEquals($sort->id, $book->sort_rule_id);
         $this->assertNotEquals(10000, $bookPage->priority);
 
         $resp = $this->get($book->getUrl('/sort'));
diff --git a/tests/Sorting/SortSetTest.php b/tests/Sorting/SortRuleTest.php
similarity index 58%
rename from tests/Sorting/SortSetTest.php
rename to tests/Sorting/SortRuleTest.php
index 5f30034bd77..d0ff263df27 100644
--- a/tests/Sorting/SortSetTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -4,26 +4,26 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
-use BookStack\Sorting\SortSet;
+use BookStack\Sorting\SortRule;
 use Tests\Api\TestsApi;
 use Tests\TestCase;
 
-class SortSetTest extends TestCase
+class SortRuleTest extends TestCase
 {
     use TestsApi;
 
     public function test_manage_settings_permission_required()
     {
-        $set = SortSet::factory()->create();
+        $rule = SortRule::factory()->create();
         $user = $this->users->viewer();
         $this->actingAs($user);
 
         $actions = [
             ['GET', '/settings/sorting'],
-            ['POST', '/settings/sorting/sets'],
-            ['GET', "/settings/sorting/sets/{$set->id}"],
-            ['PUT', "/settings/sorting/sets/{$set->id}"],
-            ['DELETE', "/settings/sorting/sets/{$set->id}"],
+            ['POST', '/settings/sorting/rules'],
+            ['GET', "/settings/sorting/rules/{$rule->id}"],
+            ['PUT', "/settings/sorting/rules/{$rule->id}"],
+            ['DELETE', "/settings/sorting/rules/{$rule->id}"],
         ];
 
         foreach ($actions as [$method, $path]) {
@@ -42,63 +42,63 @@ public function test_manage_settings_permission_required()
     public function test_create_flow()
     {
         $resp = $this->asAdmin()->get('/settings/sorting');
-        $this->withHtml($resp)->assertLinkExists(url('/settings/sorting/sets/new'));
+        $this->withHtml($resp)->assertLinkExists(url('/settings/sorting/rules/new'));
 
-        $resp = $this->get('/settings/sorting/sets/new');
-        $this->withHtml($resp)->assertElementExists('form[action$="/settings/sorting/sets"] input[name="name"]');
+        $resp = $this->get('/settings/sorting/rules/new');
+        $this->withHtml($resp)->assertElementExists('form[action$="/settings/sorting/rules"] input[name="name"]');
         $resp->assertSeeText('Name - Alphabetical (Asc)');
 
         $details = ['name' => 'My new sort', 'sequence' => 'name_asc'];
-        $resp = $this->post('/settings/sorting/sets', $details);
+        $resp = $this->post('/settings/sorting/rules', $details);
         $resp->assertRedirect('/settings/sorting');
 
-        $this->assertActivityExists(ActivityType::SORT_SET_CREATE);
-        $this->assertDatabaseHas('sort_sets', $details);
+        $this->assertActivityExists(ActivityType::SORT_RULE_CREATE);
+        $this->assertDatabaseHas('sort_rules', $details);
     }
 
     public function test_listing_in_settings()
     {
-        $set = SortSet::factory()->create(['name' => 'My super sort set', 'sequence' => 'name_asc']);
+        $rule = SortRule::factory()->create(['name' => 'My super sort rule', 'sequence' => 'name_asc']);
         $books = Book::query()->limit(5)->get();
         foreach ($books as $book) {
-            $book->sort_set_id = $set->id;
+            $book->sort_rule_id = $rule->id;
             $book->save();
         }
 
         $resp = $this->asAdmin()->get('/settings/sorting');
-        $resp->assertSeeText('My super sort set');
+        $resp->assertSeeText('My super sort rule');
         $resp->assertSeeText('Name - Alphabetical (Asc)');
         $this->withHtml($resp)->assertElementContains('.item-list-row [title="Assigned to 5 Books"]', '5');
     }
 
     public function test_update_flow()
     {
-        $set = SortSet::factory()->create(['name' => 'My sort set to update', 'sequence' => 'name_asc']);
+        $rule = SortRule::factory()->create(['name' => 'My sort rule to update', 'sequence' => 'name_asc']);
 
-        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
+        $resp = $this->asAdmin()->get("/settings/sorting/rules/{$rule->id}");
         $respHtml = $this->withHtml($resp);
         $respHtml->assertElementContains('.configured-option-list', 'Name - Alphabetical (Asc)');
         $respHtml->assertElementNotContains('.available-option-list', 'Name - Alphabetical (Asc)');
 
         $updateData = ['name' => 'My updated sort', 'sequence' => 'name_desc,chapters_last'];
-        $resp = $this->put("/settings/sorting/sets/{$set->id}", $updateData);
+        $resp = $this->put("/settings/sorting/rules/{$rule->id}", $updateData);
 
         $resp->assertRedirect('/settings/sorting');
-        $this->assertActivityExists(ActivityType::SORT_SET_UPDATE);
-        $this->assertDatabaseHas('sort_sets', $updateData);
+        $this->assertActivityExists(ActivityType::SORT_RULE_UPDATE);
+        $this->assertDatabaseHas('sort_rules', $updateData);
     }
 
     public function test_update_triggers_resort_on_assigned_books()
     {
         $book = $this->entities->bookHasChaptersAndPages();
         $chapter = $book->chapters()->first();
-        $set = SortSet::factory()->create(['name' => 'My sort set to update', 'sequence' => 'name_asc']);
-        $book->sort_set_id = $set->id;
+        $rule = SortRule::factory()->create(['name' => 'My sort rule to update', 'sequence' => 'name_asc']);
+        $book->sort_rule_id = $rule->id;
         $book->save();
         $chapter->priority = 10000;
         $chapter->save();
 
-        $resp = $this->asAdmin()->put("/settings/sorting/sets/{$set->id}", ['name' => $set->name, 'sequence' => 'chapters_last']);
+        $resp = $this->asAdmin()->put("/settings/sorting/rules/{$rule->id}", ['name' => $rule->name, 'sequence' => 'chapters_last']);
         $resp->assertRedirect('/settings/sorting');
 
         $chapter->refresh();
@@ -107,48 +107,48 @@ public function test_update_triggers_resort_on_assigned_books()
 
     public function test_delete_flow()
     {
-        $set = SortSet::factory()->create();
+        $rule = SortRule::factory()->create();
 
-        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
-        $resp->assertSeeText('Delete Sort Set');
+        $resp = $this->asAdmin()->get("/settings/sorting/rules/{$rule->id}");
+        $resp->assertSeeText('Delete Sort Rule');
 
-        $resp = $this->delete("settings/sorting/sets/{$set->id}");
+        $resp = $this->delete("settings/sorting/rules/{$rule->id}");
         $resp->assertRedirect('/settings/sorting');
 
-        $this->assertActivityExists(ActivityType::SORT_SET_DELETE);
-        $this->assertDatabaseMissing('sort_sets', ['id' => $set->id]);
+        $this->assertActivityExists(ActivityType::SORT_RULE_DELETE);
+        $this->assertDatabaseMissing('sort_rules', ['id' => $rule->id]);
     }
 
     public function test_delete_requires_confirmation_if_books_assigned()
     {
-        $set = SortSet::factory()->create();
+        $rule = SortRule::factory()->create();
         $books = Book::query()->limit(5)->get();
         foreach ($books as $book) {
-            $book->sort_set_id = $set->id;
+            $book->sort_rule_id = $rule->id;
             $book->save();
         }
 
-        $resp = $this->asAdmin()->get("/settings/sorting/sets/{$set->id}");
-        $resp->assertSeeText('Delete Sort Set');
+        $resp = $this->asAdmin()->get("/settings/sorting/rules/{$rule->id}");
+        $resp->assertSeeText('Delete Sort Rule');
 
-        $resp = $this->delete("settings/sorting/sets/{$set->id}");
-        $resp->assertRedirect("/settings/sorting/sets/{$set->id}#delete");
+        $resp = $this->delete("settings/sorting/rules/{$rule->id}");
+        $resp->assertRedirect("/settings/sorting/rules/{$rule->id}#delete");
         $resp = $this->followRedirects($resp);
 
-        $resp->assertSeeText('This sort set is currently used on 5 book(s). Are you sure you want to delete this?');
-        $this->assertDatabaseHas('sort_sets', ['id' => $set->id]);
+        $resp->assertSeeText('This sort rule is currently used on 5 book(s). Are you sure you want to delete this?');
+        $this->assertDatabaseHas('sort_rules', ['id' => $rule->id]);
 
-        $resp = $this->delete("settings/sorting/sets/{$set->id}", ['confirm' => 'true']);
+        $resp = $this->delete("settings/sorting/rules/{$rule->id}", ['confirm' => 'true']);
         $resp->assertRedirect('/settings/sorting');
-        $this->assertDatabaseMissing('sort_sets', ['id' => $set->id]);
-        $this->assertDatabaseMissing('books', ['sort_set_id' => $set->id]);
+        $this->assertDatabaseMissing('sort_rules', ['id' => $rule->id]);
+        $this->assertDatabaseMissing('books', ['sort_rule_id' => $rule->id]);
     }
 
     public function test_page_create_triggers_book_sort()
     {
         $book = $this->entities->bookHasChaptersAndPages();
-        $set = SortSet::factory()->create(['sequence' => 'name_asc,chapters_first']);
-        $book->sort_set_id = $set->id;
+        $rule = SortRule::factory()->create(['sequence' => 'name_asc,chapters_first']);
+        $book->sort_rule_id = $rule->id;
         $book->save();
 
         $resp = $this->actingAsApiEditor()->post("/api/pages", [
@@ -168,8 +168,8 @@ public function test_page_create_triggers_book_sort()
     public function test_name_numeric_ordering()
     {
         $book = Book::factory()->create();
-        $set = SortSet::factory()->create(['sequence' => 'name_numeric_asc']);
-        $book->sort_set_id = $set->id;
+        $rule = SortRule::factory()->create(['sequence' => 'name_numeric_asc']);
+        $book->sort_rule_id = $rule->id;
         $book->save();
         $this->permissions->regenerateForEntity($book);
 

From 7bd89316bcc92642af6c17c9d6e7b89ad6807055 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 11 Feb 2025 15:29:16 +0000
Subject: [PATCH 469/666] Sorting: Updated sort set command, Changed sort
 timestamp handling

- Renamed AssignSortSetCommand to AssignSortRuleCommand, updated
  contents and testing.
- Updated sorting operations to not update timestamps if only priority
  is changed.
---
 ...tCommand.php => AssignSortRuleCommand.php} |  46 +++----
 app/Sorting/BookSorter.php                    |   7 +-
 lang/en/activities.php                        |  14 +--
 tests/Commands/AssignSortRuleCommandTest.php  | 112 ++++++++++++++++++
 tests/Commands/AssignSortSetCommandTest.php   | 112 ------------------
 tests/Sorting/BookSortTest.php                |  26 ++++
 tests/Sorting/SortRuleTest.php                |  21 ++++
 7 files changed, 193 insertions(+), 145 deletions(-)
 rename app/Console/Commands/{AssignSortSetCommand.php => AssignSortRuleCommand.php} (60%)
 create mode 100644 tests/Commands/AssignSortRuleCommandTest.php
 delete mode 100644 tests/Commands/AssignSortSetCommandTest.php

diff --git a/app/Console/Commands/AssignSortSetCommand.php b/app/Console/Commands/AssignSortRuleCommand.php
similarity index 60%
rename from app/Console/Commands/AssignSortSetCommand.php
rename to app/Console/Commands/AssignSortRuleCommand.php
index 6c9d3f7641a..c438d078326 100644
--- a/app/Console/Commands/AssignSortSetCommand.php
+++ b/app/Console/Commands/AssignSortRuleCommand.php
@@ -7,60 +7,60 @@
 use BookStack\Sorting\SortRule;
 use Illuminate\Console\Command;
 
-class AssignSortSetCommand extends Command
+class AssignSortRuleCommand extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'bookstack:assign-sort-set
-                            {sort-set=0: ID of the sort set to apply}
+    protected $signature = 'bookstack:assign-sort-rule
+                            {sort-rule=0: ID of the sort rule to apply}
                             {--all-books : Apply to all books in the system}
-                            {--books-without-sort : Apply to only books without a sort set already assigned}
-                            {--books-with-sort= : Apply to only books with the sort of given id}';
+                            {--books-without-sort : Apply to only books without a sort rule already assigned}
+                            {--books-with-sort= : Apply to only books with the sort rule of given id}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Assign a sort set to content in the system';
+    protected $description = 'Assign a sort rule to content in the system';
 
     /**
      * Execute the console command.
      */
     public function handle(BookSorter $sorter): int
     {
-        $sortSetId = intval($this->argument('sort-set')) ?? 0;
-        if ($sortSetId === 0) {
-            return $this->listSortSets();
+        $sortRuleId = intval($this->argument('sort-rule')) ?? 0;
+        if ($sortRuleId === 0) {
+            return $this->listSortRules();
         }
 
-        $set = SortRule::query()->find($sortSetId);
+        $rule = SortRule::query()->find($sortRuleId);
         if ($this->option('all-books')) {
             $query = Book::query();
         } else if ($this->option('books-without-sort')) {
-            $query = Book::query()->whereNull('sort_set_id');
+            $query = Book::query()->whereNull('sort_rule_id');
         } else if ($this->option('books-with-sort')) {
             $sortId = intval($this->option('books-with-sort')) ?: 0;
             if (!$sortId) {
                 $this->error("Provided --books-with-sort option value is invalid");
                 return 1;
             }
-            $query = Book::query()->where('sort_set_id', $sortId);
+            $query = Book::query()->where('sort_rule_id', $sortId);
         } else {
             $this->error("No option provided to specify target. Run with the -h option to see all available options.");
             return 1;
         }
 
-        if (!$set) {
-            $this->error("Sort set of provided id {$sortSetId} not found!");
+        if (!$rule) {
+            $this->error("Sort rule of provided id {$sortRuleId} not found!");
             return 1;
         }
 
         $count = $query->clone()->count();
-        $this->warn("This will apply sort set [{$set->id}: {$set->name}] to {$count} book(s) and run the sort on each.");
+        $this->warn("This will apply sort rule [{$rule->id}: {$rule->name}] to {$count} book(s) and run the sort on each.");
         $confirmed = $this->confirm("Are you sure you want to continue?");
 
         if (!$confirmed) {
@@ -68,11 +68,11 @@ public function handle(BookSorter $sorter): int
         }
 
         $processed = 0;
-        $query->chunkById(10, function ($books) use ($set, $sorter, $count, &$processed) {
+        $query->chunkById(10, function ($books) use ($rule, $sorter, $count, &$processed) {
             $max = min($count, ($processed + 10));
             $this->info("Applying to {$processed}-{$max} of {$count} books");
             foreach ($books as $book) {
-                $book->sort_set_id = $set->id;
+                $book->sort_rule_id = $rule->id;
                 $book->save();
                 $sorter->runBookAutoSort($book);
             }
@@ -84,14 +84,14 @@ public function handle(BookSorter $sorter): int
         return 0;
     }
 
-    protected function listSortSets(): int
+    protected function listSortRules(): int
     {
 
-        $sets = SortRule::query()->orderBy('id', 'asc')->get();
-        $this->error("Sort set ID required!");
-        $this->warn("\nAvailable sort sets:");
-        foreach ($sets as $set) {
-            $this->info("{$set->id}: {$set->name}");
+        $rules = SortRule::query()->orderBy('id', 'asc')->get();
+        $this->error("Sort rule ID required!");
+        $this->warn("\nAvailable sort rules:");
+        foreach ($rules as $rule) {
+            $this->info("{$rule->id}: {$rule->name}");
         }
 
         return 1;
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index 7bf1b63f46c..6710f070ad6 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Sorting;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
@@ -57,7 +58,7 @@ public function runBookAutoSort(Book $book): void
 
         foreach ($topItems as $index => $topItem) {
             $topItem->priority = $index + 1;
-            $topItem->save();
+            $topItem::withoutTimestamps(fn () => $topItem->save());
         }
 
         foreach ($chapters as $chapter) {
@@ -68,7 +69,7 @@ public function runBookAutoSort(Book $book): void
 
             foreach ($pages as $index => $page) {
                 $page->priority = $index + 1;
-                $page->save();
+                $page::withoutTimestamps(fn () => $page->save());
             }
         }
     }
@@ -166,7 +167,7 @@ protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMa
         }
 
         if ($chapterChanged || $priorityChanged) {
-            $model->save();
+            $model::withoutTimestamps(fn () => $model->save());
         }
     }
 
diff --git a/lang/en/activities.php b/lang/en/activities.php
index 7db872c0ca8..67df53e369a 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -127,13 +127,13 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
-    // Sort Sets
-    'sort_set_create' => 'created sort set',
-    'sort_set_create_notification' => 'Sort set successfully created',
-    'sort_set_update' => 'updated sort set',
-    'sort_set_update_notification' => 'Sort set successfully update',
-    'sort_set_delete' => 'deleted sort set',
-    'sort_set_delete_notification' => 'Sort set successfully deleted',
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully update',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
 
     // Other
     'permissions_update'          => 'updated permissions',
diff --git a/tests/Commands/AssignSortRuleCommandTest.php b/tests/Commands/AssignSortRuleCommandTest.php
new file mode 100644
index 00000000000..5b308cd7c75
--- /dev/null
+++ b/tests/Commands/AssignSortRuleCommandTest.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Commands;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Sorting\SortRule;
+use Tests\TestCase;
+
+class AssignSortRuleCommandTest extends TestCase
+{
+    public function test_no_given_sort_rule_lists_options()
+    {
+        $sortRules = SortRule::factory()->createMany(10);
+
+        $commandRun = $this->artisan('bookstack:assign-sort-rule')
+            ->expectsOutputToContain('Sort rule ID required!')
+            ->assertExitCode(1);
+
+        foreach ($sortRules as $sortRule) {
+            $commandRun->expectsOutputToContain("{$sortRule->id}: {$sortRule->name}");
+        }
+    }
+
+    public function test_run_without_options_advises_help()
+    {
+        $this->artisan("bookstack:assign-sort-rule 100")
+            ->expectsOutput("No option provided to specify target. Run with the -h option to see all available options.")
+            ->assertExitCode(1);
+    }
+
+    public function test_run_without_valid_sort_advises_help()
+    {
+        $this->artisan("bookstack:assign-sort-rule 100342 --all-books")
+            ->expectsOutput("Sort rule of provided id 100342 not found!")
+            ->assertExitCode(1);
+    }
+
+    public function test_confirmation_required()
+    {
+        $sortRule = SortRule::factory()->create();
+
+        $this->artisan("bookstack:assign-sort-rule {$sortRule->id} --all-books")
+            ->expectsConfirmation('Are you sure you want to continue?', 'no')
+            ->assertExitCode(1);
+
+        $booksWithSort = Book::query()->whereNotNull('sort_rule_id')->count();
+        $this->assertEquals(0, $booksWithSort);
+    }
+
+    public function test_assign_to_all_books()
+    {
+        $sortRule = SortRule::factory()->create();
+        $booksWithoutSort = Book::query()->whereNull('sort_rule_id')->count();
+        $this->assertGreaterThan(0, $booksWithoutSort);
+
+        $this->artisan("bookstack:assign-sort-rule {$sortRule->id} --all-books")
+            ->expectsOutputToContain("This will apply sort rule [{$sortRule->id}: {$sortRule->name}] to {$booksWithoutSort} book(s)")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
+            ->assertExitCode(0);
+
+        $booksWithoutSort = Book::query()->whereNull('sort_rule_id')->count();
+        $this->assertEquals(0, $booksWithoutSort);
+    }
+
+    public function test_assign_to_all_books_without_sort()
+    {
+        $totalBooks = Book::query()->count();
+        $book = $this->entities->book();
+        $sortRuleA = SortRule::factory()->create();
+        $sortRuleB = SortRule::factory()->create();
+        $book->sort_rule_id = $sortRuleA->id;
+        $book->save();
+
+        $booksWithoutSort = Book::query()->whereNull('sort_rule_id')->count();
+        $this->assertEquals($totalBooks, $booksWithoutSort + 1);
+
+        $this->artisan("bookstack:assign-sort-rule {$sortRuleB->id} --books-without-sort")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
+            ->assertExitCode(0);
+
+        $booksWithoutSort = Book::query()->whereNull('sort_rule_id')->count();
+        $this->assertEquals(0, $booksWithoutSort);
+        $this->assertEquals($totalBooks, $sortRuleB->books()->count() + 1);
+    }
+
+    public function test_assign_to_all_books_with_sort()
+    {
+        $book = $this->entities->book();
+        $sortRuleA = SortRule::factory()->create();
+        $sortRuleB = SortRule::factory()->create();
+        $book->sort_rule_id = $sortRuleA->id;
+        $book->save();
+
+        $this->artisan("bookstack:assign-sort-rule {$sortRuleB->id} --books-with-sort={$sortRuleA->id}")
+            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
+            ->expectsOutputToContain("Sort applied to 1 book(s)")
+            ->assertExitCode(0);
+
+        $book->refresh();
+        $this->assertEquals($sortRuleB->id, $book->sort_rule_id);
+        $this->assertEquals(1, $sortRuleB->books()->count());
+    }
+
+    public function test_assign_to_all_books_with_sort_id_is_validated()
+    {
+        $this->artisan("bookstack:assign-sort-rule 50 --books-with-sort=beans")
+            ->expectsOutputToContain("Provided --books-with-sort option value is invalid")
+            ->assertExitCode(1);
+    }
+}
diff --git a/tests/Commands/AssignSortSetCommandTest.php b/tests/Commands/AssignSortSetCommandTest.php
deleted file mode 100644
index 659840a9bcc..00000000000
--- a/tests/Commands/AssignSortSetCommandTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Commands;
-
-use BookStack\Entities\Models\Book;
-use BookStack\Sorting\SortRule;
-use Tests\TestCase;
-
-class AssignSortSetCommandTest extends TestCase
-{
-    public function test_no_given_sort_set_lists_options()
-    {
-        $sortSets = SortRule::factory()->createMany(10);
-
-        $commandRun = $this->artisan('bookstack:assign-sort-set')
-            ->expectsOutputToContain('Sort set ID required!')
-            ->assertExitCode(1);
-
-        foreach ($sortSets as $sortSet) {
-            $commandRun->expectsOutputToContain("{$sortSet->id}: {$sortSet->name}");
-        }
-    }
-
-    public function test_run_without_options_advises_help()
-    {
-        $this->artisan("bookstack:assign-sort-set 100")
-            ->expectsOutput("No option provided to specify target. Run with the -h option to see all available options.")
-            ->assertExitCode(1);
-    }
-
-    public function test_run_without_valid_sort_advises_help()
-    {
-        $this->artisan("bookstack:assign-sort-set 100342 --all-books")
-            ->expectsOutput("Sort set of provided id 100342 not found!")
-            ->assertExitCode(1);
-    }
-
-    public function test_confirmation_required()
-    {
-        $sortSet = SortRule::factory()->create();
-
-        $this->artisan("bookstack:assign-sort-set {$sortSet->id} --all-books")
-            ->expectsConfirmation('Are you sure you want to continue?', 'no')
-            ->assertExitCode(1);
-
-        $booksWithSort = Book::query()->whereNotNull('sort_set_id')->count();
-        $this->assertEquals(0, $booksWithSort);
-    }
-
-    public function test_assign_to_all_books()
-    {
-        $sortSet = SortRule::factory()->create();
-        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
-        $this->assertGreaterThan(0, $booksWithoutSort);
-
-        $this->artisan("bookstack:assign-sort-set {$sortSet->id} --all-books")
-            ->expectsOutputToContain("This will apply sort set [{$sortSet->id}: {$sortSet->name}] to {$booksWithoutSort} book(s)")
-            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
-            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
-            ->assertExitCode(0);
-
-        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
-        $this->assertEquals(0, $booksWithoutSort);
-    }
-
-    public function test_assign_to_all_books_without_sort()
-    {
-        $totalBooks = Book::query()->count();
-        $book = $this->entities->book();
-        $sortSetA = SortRule::factory()->create();
-        $sortSetB = SortRule::factory()->create();
-        $book->sort_rule_id = $sortSetA->id;
-        $book->save();
-
-        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
-        $this->assertEquals($totalBooks, $booksWithoutSort + 1);
-
-        $this->artisan("bookstack:assign-sort-set {$sortSetB->id} --books-without-sort")
-            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
-            ->expectsOutputToContain("Sort applied to {$booksWithoutSort} book(s)")
-            ->assertExitCode(0);
-
-        $booksWithoutSort = Book::query()->whereNull('sort_set_id')->count();
-        $this->assertEquals(0, $booksWithoutSort);
-        $this->assertEquals($totalBooks, $sortSetB->books()->count() + 1);
-    }
-
-    public function test_assign_to_all_books_with_sort()
-    {
-        $book = $this->entities->book();
-        $sortSetA = SortRule::factory()->create();
-        $sortSetB = SortRule::factory()->create();
-        $book->sort_rule_id = $sortSetA->id;
-        $book->save();
-
-        $this->artisan("bookstack:assign-sort-set {$sortSetB->id} --books-with-sort={$sortSetA->id}")
-            ->expectsConfirmation('Are you sure you want to continue?', 'yes')
-            ->expectsOutputToContain("Sort applied to 1 book(s)")
-            ->assertExitCode(0);
-
-        $book->refresh();
-        $this->assertEquals($sortSetB->id, $book->sort_rule_id);
-        $this->assertEquals(1, $sortSetB->books()->count());
-    }
-
-    public function test_assign_to_all_books_with_sort_id_is_validated()
-    {
-        $this->artisan("bookstack:assign-sort-set 50 --books-with-sort=beans")
-            ->expectsOutputToContain("Provided --books-with-sort option value is invalid")
-            ->assertExitCode(1);
-    }
-}
diff --git a/tests/Sorting/BookSortTest.php b/tests/Sorting/BookSortTest.php
index b30cec8b636..c4217a4cc6f 100644
--- a/tests/Sorting/BookSortTest.php
+++ b/tests/Sorting/BookSortTest.php
@@ -207,6 +207,32 @@ public function test_book_sort_makes_no_changes_if_no_delete_permissions_on_move
         ]);
     }
 
+    public function test_book_sort_does_not_change_timestamps_on_just_order_changes()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        \DB::table('chapters')->where('id', '=', $chapter->id)->update([
+            'priority' => 10001,
+            'updated_at' => \Carbon\Carbon::now()->subYear(5),
+        ]);
+
+        $chapter->refresh();
+        $oldUpdatedAt = $chapter->updated_at->unix();
+
+        $sortData = [
+            'id'            => $chapter->id,
+            'sort'          => 0,
+            'parentChapter' => false,
+            'type'          => 'chapter',
+            'book'          => $book->id,
+        ];
+        $this->asEditor()->put($book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $chapter->refresh();
+        $this->assertNotEquals(10001, $chapter->priority);
+        $this->assertEquals($oldUpdatedAt, $chapter->updated_at->unix());
+    }
+
     public function test_book_sort_item_returns_book_content()
     {
         $bookToSort = $this->entities->book();
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index d0ff263df27..0f6f43ceeb6 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -165,6 +165,27 @@ public function test_page_create_triggers_book_sort()
         ]);
     }
 
+    public function test_auto_book_sort_does_not_touch_timestamps()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $rule = SortRule::factory()->create(['sequence' => 'name_asc,chapters_first']);
+        $book->sort_rule_id = $rule->id;
+        $book->save();
+        $page = $book->pages()->first();
+        $chapter = $book->chapters()->first();
+
+        $resp = $this->actingAsApiEditor()->put("/api/pages/{$page->id}", [
+            'name' => '1111 page',
+        ]);
+        $resp->assertOk();
+
+        $oldTime = $chapter->updated_at->unix();
+        $oldPriority = $chapter->priority;
+        $chapter->refresh();
+        $this->assertEquals($oldTime, $chapter->updated_at->unix());
+        $this->assertNotEquals($oldPriority, $chapter->priority);
+    }
+
     public function test_name_numeric_ordering()
     {
         $book = Book::factory()->create();

From 7901ca9e6b619cb017019ea079e5db28b9d491ab Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 11 Feb 2025 15:52:35 +0000
Subject: [PATCH 470/666] Meta: Updated dev version and sponsor link

---
 readme.md | 2 +-
 version   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 339c7cbd4ae..d6641a53bb3 100644
--- a/readme.md
+++ b/readme.md
@@ -48,7 +48,7 @@ Big thanks to these companies for supporting the project.
 #### Gold Sponsor
 
 <table><tbody><tr>
-<td align="center"><a href="https://www.federated.computer/bookstack/" target="_blank">
+<td align="center"><a href="https://www.federated.computer/bookstack-wiki" target="_blank">
     <img width="480" src="https://www.bookstackapp.com/images/sponsors/federated-computer.png" alt="Federated.computer">
 </a></td>
 </tr></tbody></table>
diff --git a/version b/version
index baf91f15e00..51b8fdb6012 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v24.10-dev
+v25.02-dev

From 45a15b479294349638bbe334f8701f077aa899c4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 14 Feb 2025 13:24:39 +0000
Subject: [PATCH 471/666] Searching: Split out search tests into their own dir

---
 tests/{Entity => Search}/EntitySearchTest.php | 181 +-----------------
 tests/Search/SearchIndexingTest.php           |  77 ++++++++
 .../{Entity => Search}/SearchOptionsTest.php  |   2 +-
 tests/Search/SiblingSearchTest.php            | 117 +++++++++++
 4 files changed, 196 insertions(+), 181 deletions(-)
 rename tests/{Entity => Search}/EntitySearchTest.php (74%)
 create mode 100644 tests/Search/SearchIndexingTest.php
 rename tests/{Entity => Search}/SearchOptionsTest.php (99%)
 create mode 100644 tests/Search/SiblingSearchTest.php

diff --git a/tests/Entity/EntitySearchTest.php b/tests/Search/EntitySearchTest.php
similarity index 74%
rename from tests/Entity/EntitySearchTest.php
rename to tests/Search/EntitySearchTest.php
index 5ace70e3ab2..9c76d0f7136 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Search/EntitySearchTest.php
@@ -1,12 +1,9 @@
 <?php
 
-namespace Tests\Entity;
+namespace Search;
 
 use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Bookshelf;
-use BookStack\Entities\Models\Chapter;
-use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class EntitySearchTest extends TestCase
@@ -312,113 +309,6 @@ public function test_entity_template_selector_search()
         $defaultListTest->assertDontSee($templatePage->name);
     }
 
-    public function test_sibling_search_for_pages()
-    {
-        $chapter = $this->entities->chapterHasPages();
-        $this->assertGreaterThan(2, count($chapter->pages), 'Ensure we\'re testing with at least 1 sibling');
-        $page = $chapter->pages->first();
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page");
-        $search->assertSuccessful();
-        foreach ($chapter->pages as $page) {
-            $search->assertSee($page->name);
-        }
-
-        $search->assertDontSee($chapter->name);
-    }
-
-    public function test_sibling_search_for_pages_without_chapter()
-    {
-        $page = $this->entities->pageNotWithinChapter();
-        $bookChildren = $page->book->getDirectVisibleChildren();
-        $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page");
-        $search->assertSuccessful();
-        foreach ($bookChildren as $child) {
-            $search->assertSee($child->name);
-        }
-
-        $search->assertDontSee($page->book->name);
-    }
-
-    public function test_sibling_search_for_chapters()
-    {
-        $chapter = $this->entities->chapter();
-        $bookChildren = $chapter->book->getDirectVisibleChildren();
-        $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$chapter->id}&entity_type=chapter");
-        $search->assertSuccessful();
-        foreach ($bookChildren as $child) {
-            $search->assertSee($child->name);
-        }
-
-        $search->assertDontSee($chapter->book->name);
-    }
-
-    public function test_sibling_search_for_books()
-    {
-        $books = Book::query()->take(10)->get();
-        $book = $books->first();
-        $this->assertGreaterThan(2, count($books), 'Ensure we\'re testing with at least 1 sibling');
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$book->id}&entity_type=book");
-        $search->assertSuccessful();
-        foreach ($books as $expectedBook) {
-            $search->assertSee($expectedBook->name);
-        }
-    }
-
-    public function test_sibling_search_for_shelves()
-    {
-        $shelves = Bookshelf::query()->take(10)->get();
-        $shelf = $shelves->first();
-        $this->assertGreaterThan(2, count($shelves), 'Ensure we\'re testing with at least 1 sibling');
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$shelf->id}&entity_type=bookshelf");
-        $search->assertSuccessful();
-        foreach ($shelves as $expectedShelf) {
-            $search->assertSee($expectedShelf->name);
-        }
-    }
-
-    public function test_sibling_search_for_books_provides_results_in_alphabetical_order()
-    {
-        $contextBook = $this->entities->book();
-        $searchBook = $this->entities->book();
-
-        $searchBook->name = 'Zebras';
-        $searchBook->save();
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
-        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
-
-        $searchBook->name = '1AAAAAAArdvarks';
-        $searchBook->save();
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
-        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
-    }
-
-    public function test_sibling_search_for_shelves_provides_results_in_alphabetical_order()
-    {
-        $contextShelf = $this->entities->shelf();
-        $searchShelf = $this->entities->shelf();
-
-        $searchShelf->name = 'Zebras';
-        $searchShelf->save();
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
-        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
-
-        $searchShelf->name = '1AAAAAAArdvarks';
-        $searchShelf->save();
-
-        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
-        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
-    }
-
     public function test_search_works_on_updated_page_content()
     {
         $page = $this->entities->page();
@@ -453,75 +343,6 @@ public function test_search_ranks_common_words_lower()
         $this->withHtml($search)->assertElementContains('.entity-list > .page:nth-child(2)', 'Test page A');
     }
 
-    public function test_terms_in_headers_have_an_adjusted_index_score()
-    {
-        $page = $this->entities->newPage(['name' => 'Test page A', 'html' => '
-            <p>TermA</p>
-            <h1>TermB <strong>TermNested</strong></h1>
-            <h2>TermC</h2>
-            <h3>TermD</h3>
-            <h4>TermE</h4>
-            <h5>TermF</h5>
-            <h6>TermG</h6>
-        ']);
-
-        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
-
-        $this->assertEquals(1, $scoreByTerm->get('TermA'));
-        $this->assertEquals(10, $scoreByTerm->get('TermB'));
-        $this->assertEquals(10, $scoreByTerm->get('TermNested'));
-        $this->assertEquals(5, $scoreByTerm->get('TermC'));
-        $this->assertEquals(4, $scoreByTerm->get('TermD'));
-        $this->assertEquals(3, $scoreByTerm->get('TermE'));
-        $this->assertEquals(2, $scoreByTerm->get('TermF'));
-        // Is 1.5 but stored as integer, rounding up
-        $this->assertEquals(2, $scoreByTerm->get('TermG'));
-    }
-
-    public function test_indexing_works_as_expected_for_page_with_lots_of_terms()
-    {
-        $this->markTestSkipped('Time consuming test');
-
-        $count = 100000;
-        $text = '';
-        $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#';
-        for ($i = 0; $i < $count; $i++) {
-            $text .= substr(str_shuffle($chars), 0, 5) . ' ';
-        }
-
-        $page = $this->entities->newPage(['name' => 'Test page A', 'html' => '<p>' . $text . '</p>']);
-
-        $termCount = $page->searchTerms()->count();
-
-        // Expect at least 90% unique rate
-        $this->assertGreaterThan($count * 0.9, $termCount);
-    }
-
-    public function test_name_and_content_terms_are_merged_to_single_score()
-    {
-        $page = $this->entities->newPage(['name' => 'TermA', 'html' => '
-            <p>TermA</p>
-        ']);
-
-        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
-
-        // Scores 40 for being in the name then 1 for being in the content
-        $this->assertEquals(41, $scoreByTerm->get('TermA'));
-    }
-
-    public function test_tag_names_and_values_are_indexed_for_search()
-    {
-        $page = $this->entities->newPage(['name' => 'PageA', 'html' => '<p>content</p>', 'tags' => [
-            ['name' => 'Animal', 'value' => 'MeowieCat'],
-            ['name' => 'SuperImportant'],
-        ]]);
-
-        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
-        $this->assertEquals(5, $scoreByTerm->get('MeowieCat'));
-        $this->assertEquals(3, $scoreByTerm->get('Animal'));
-        $this->assertEquals(3, $scoreByTerm->get('SuperImportant'));
-    }
-
     public function test_matching_terms_in_search_results_are_highlighted()
     {
         $this->entities->newPage(['name' => 'My Meowie Cat', 'html' => '<p>A superimportant page about meowieable animals</p>', 'tags' => [
diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
new file mode 100644
index 00000000000..43219a4ed98
--- /dev/null
+++ b/tests/Search/SearchIndexingTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Search;
+
+use Tests\TestCase;
+
+class SearchIndexingTest extends TestCase
+{
+    public function test_terms_in_headers_have_an_adjusted_index_score()
+    {
+        $page = $this->entities->newPage(['name' => 'Test page A', 'html' => '
+            <p>TermA</p>
+            <h1>TermB <strong>TermNested</strong></h1>
+            <h2>TermC</h2>
+            <h3>TermD</h3>
+            <h4>TermE</h4>
+            <h5>TermF</h5>
+            <h6>TermG</h6>
+        ']);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+
+        $this->assertEquals(1, $scoreByTerm->get('TermA'));
+        $this->assertEquals(10, $scoreByTerm->get('TermB'));
+        $this->assertEquals(10, $scoreByTerm->get('TermNested'));
+        $this->assertEquals(5, $scoreByTerm->get('TermC'));
+        $this->assertEquals(4, $scoreByTerm->get('TermD'));
+        $this->assertEquals(3, $scoreByTerm->get('TermE'));
+        $this->assertEquals(2, $scoreByTerm->get('TermF'));
+        // Is 1.5 but stored as integer, rounding up
+        $this->assertEquals(2, $scoreByTerm->get('TermG'));
+    }
+
+    public function test_indexing_works_as_expected_for_page_with_lots_of_terms()
+    {
+        $this->markTestSkipped('Time consuming test');
+
+        $count = 100000;
+        $text = '';
+        $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#';
+        for ($i = 0; $i < $count; $i++) {
+            $text .= substr(str_shuffle($chars), 0, 5) . ' ';
+        }
+
+        $page = $this->entities->newPage(['name' => 'Test page A', 'html' => '<p>' . $text . '</p>']);
+
+        $termCount = $page->searchTerms()->count();
+
+        // Expect at least 90% unique rate
+        $this->assertGreaterThan($count * 0.9, $termCount);
+    }
+
+    public function test_name_and_content_terms_are_merged_to_single_score()
+    {
+        $page = $this->entities->newPage(['name' => 'TermA', 'html' => '
+            <p>TermA</p>
+        ']);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+
+        // Scores 40 for being in the name then 1 for being in the content
+        $this->assertEquals(41, $scoreByTerm->get('TermA'));
+    }
+
+    public function test_tag_names_and_values_are_indexed_for_search()
+    {
+        $page = $this->entities->newPage(['name' => 'PageA', 'html' => '<p>content</p>', 'tags' => [
+            ['name' => 'Animal', 'value' => 'MeowieCat'],
+            ['name' => 'SuperImportant'],
+        ]]);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+        $this->assertEquals(5, $scoreByTerm->get('MeowieCat'));
+        $this->assertEquals(3, $scoreByTerm->get('Animal'));
+        $this->assertEquals(3, $scoreByTerm->get('SuperImportant'));
+    }
+}
diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Search/SearchOptionsTest.php
similarity index 99%
rename from tests/Entity/SearchOptionsTest.php
rename to tests/Search/SearchOptionsTest.php
index 0c2ad271c58..39c20c19591 100644
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Search/SearchOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Entity;
+namespace Search;
 
 use BookStack\Search\Options\ExactSearchOption;
 use BookStack\Search\Options\FilterSearchOption;
diff --git a/tests/Search/SiblingSearchTest.php b/tests/Search/SiblingSearchTest.php
new file mode 100644
index 00000000000..63865af8a21
--- /dev/null
+++ b/tests/Search/SiblingSearchTest.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Search;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use Tests\TestCase;
+
+class SiblingSearchTest extends TestCase
+{
+    public function test_sibling_search_for_pages()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        $this->assertGreaterThan(2, count($chapter->pages), 'Ensure we\'re testing with at least 1 sibling');
+        $page = $chapter->pages->first();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page");
+        $search->assertSuccessful();
+        foreach ($chapter->pages as $page) {
+            $search->assertSee($page->name);
+        }
+
+        $search->assertDontSee($chapter->name);
+    }
+
+    public function test_sibling_search_for_pages_without_chapter()
+    {
+        $page = $this->entities->pageNotWithinChapter();
+        $bookChildren = $page->book->getDirectVisibleChildren();
+        $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page");
+        $search->assertSuccessful();
+        foreach ($bookChildren as $child) {
+            $search->assertSee($child->name);
+        }
+
+        $search->assertDontSee($page->book->name);
+    }
+
+    public function test_sibling_search_for_chapters()
+    {
+        $chapter = $this->entities->chapter();
+        $bookChildren = $chapter->book->getDirectVisibleChildren();
+        $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling');
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$chapter->id}&entity_type=chapter");
+        $search->assertSuccessful();
+        foreach ($bookChildren as $child) {
+            $search->assertSee($child->name);
+        }
+
+        $search->assertDontSee($chapter->book->name);
+    }
+
+    public function test_sibling_search_for_books()
+    {
+        $books = Book::query()->take(10)->get();
+        $book = $books->first();
+        $this->assertGreaterThan(2, count($books), 'Ensure we\'re testing with at least 1 sibling');
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$book->id}&entity_type=book");
+        $search->assertSuccessful();
+        foreach ($books as $expectedBook) {
+            $search->assertSee($expectedBook->name);
+        }
+    }
+
+    public function test_sibling_search_for_shelves()
+    {
+        $shelves = Bookshelf::query()->take(10)->get();
+        $shelf = $shelves->first();
+        $this->assertGreaterThan(2, count($shelves), 'Ensure we\'re testing with at least 1 sibling');
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$shelf->id}&entity_type=bookshelf");
+        $search->assertSuccessful();
+        foreach ($shelves as $expectedShelf) {
+            $search->assertSee($expectedShelf->name);
+        }
+    }
+
+    public function test_sibling_search_for_books_provides_results_in_alphabetical_order()
+    {
+        $contextBook = $this->entities->book();
+        $searchBook = $this->entities->book();
+
+        $searchBook->name = 'Zebras';
+        $searchBook->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
+        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
+
+        $searchBook->name = '1AAAAAAArdvarks';
+        $searchBook->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextBook->id}&entity_type=book");
+        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
+    }
+
+    public function test_sibling_search_for_shelves_provides_results_in_alphabetical_order()
+    {
+        $contextShelf = $this->entities->shelf();
+        $searchShelf = $this->entities->shelf();
+
+        $searchShelf->name = 'Zebras';
+        $searchShelf->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
+        $this->withHtml($search)->assertElementNotContains('a:first-child', 'Zebras');
+
+        $searchShelf->name = '1AAAAAAArdvarks';
+        $searchShelf->save();
+
+        $search = $this->actingAs($this->users->viewer())->get("/search/entity/siblings?entity_id={$contextShelf->id}&entity_type=bookshelf");
+        $this->withHtml($search)->assertElementContains('a:first-child', '1AAAAAAArdvarks');
+    }
+}

From f4449928f83748d015a633cdc1cef50fe822648c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 14 Feb 2025 19:01:51 +0000
Subject: [PATCH 472/666] Searching: Added custom tokenizer that considers soft
 delimiters.

This changes indexing so that a.b now indexes as "a", "b" AND "a.b"
instead of just the first two, for periods and hypens, so terms
containing those characters can be searched within.

Adds hypens as a delimiter - #2095
---
 app/Search/SearchIndex.php          | 41 ++++++++++++++---
 app/Search/SearchOptions.php        |  2 +-
 app/Search/SearchTextTokenizer.php  | 70 +++++++++++++++++++++++++++++
 tests/Search/SearchIndexingTest.php | 16 +++++++
 4 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 app/Search/SearchTextTokenizer.php

diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index c7d9d6502e2..a8bd2c4b285 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -16,7 +16,13 @@ class SearchIndex
     /**
      * A list of delimiter characters used to break-up parsed content into terms for indexing.
      */
-    public static string $delimiters = " \n\t.,!?:;()[]{}<>`'\"";
+    public static string $delimiters = " \n\t.-,!?:;()[]{}<>`'\"";
+
+    /**
+     * A list of delimiter which could be commonly used within a single term and also indicate a break between terms.
+     * The indexer will index the full term with these delimiters, plus the terms split via these delimiters.
+     */
+    public static string $softDelimiters = ".-";
 
     public function __construct(
         protected EntityProvider $entityProvider
@@ -196,15 +202,36 @@ protected function generateTermScoreMapFromTags(array $tags): array
     protected function textToTermCountMap(string $text): array
     {
         $tokenMap = []; // {TextToken => OccurrenceCount}
-        $splitChars = static::$delimiters;
-        $token = strtok($text, $splitChars);
+        $softDelims = static::$softDelimiters;
+        $tokenizer = new SearchTextTokenizer($text, static::$delimiters);
+        $extendedToken = '';
+        $extendedLen = 0;
+
+        $token = $tokenizer->next();
 
         while ($token !== false) {
-            if (!isset($tokenMap[$token])) {
-                $tokenMap[$token] = 0;
+            $delim = $tokenizer->previousDelimiter();
+
+            if ($delim && str_contains($softDelims, $delim) && $token !== '') {
+                $extendedToken .= $delim . $token;
+                $extendedLen++;
+            } else {
+                if ($extendedLen > 1) {
+                    $tokenMap[$extendedToken] = ($tokenMap[$extendedToken] ?? 0) + 1;
+                }
+                $extendedToken = $token;
+                $extendedLen = 1;
             }
-            $tokenMap[$token]++;
-            $token = strtok($splitChars);
+
+            if ($token) {
+                $tokenMap[$token] = ($tokenMap[$token] ?? 0) + 1;
+            }
+
+            $token = $tokenizer->next();
+        }
+
+        if ($extendedLen > 1) {
+            $tokenMap[$extendedToken] = ($tokenMap[$extendedToken] ?? 0) + 1;
         }
 
         return $tokenMap;
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index a6f82029920..bf527d9c305 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -181,7 +181,7 @@ protected static function decodeEscapes(string $input): string
     protected static function parseStandardTermString(string $termString): array
     {
         $terms = explode(' ', $termString);
-        $indexDelimiters = SearchIndex::$delimiters;
+        $indexDelimiters = implode('', array_diff(str_split(SearchIndex::$delimiters), str_split(SearchIndex::$softDelimiters)));
         $parsed = [
             'terms'  => [],
             'exacts' => [],
diff --git a/app/Search/SearchTextTokenizer.php b/app/Search/SearchTextTokenizer.php
new file mode 100644
index 00000000000..f43fd56f113
--- /dev/null
+++ b/app/Search/SearchTextTokenizer.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace BookStack\Search;
+
+/**
+ * A custom text tokenizer which records & provides insight needed for our search indexing.
+ * We used to use basic strtok() but this class does the following which that lacked:
+ * - Tracks and provides the current/previous delimiter that we've stopped at.
+ * - Returns empty tokens upon parsing a delimiter.
+ */
+class SearchTextTokenizer
+{
+    protected int $currentIndex = 0;
+    protected int $length;
+    protected string $currentDelimiter = '';
+    protected string $previousDelimiter = '';
+
+    public function __construct(
+        protected string $text,
+        protected string $delimiters = ' '
+    ) {
+        $this->length = strlen($this->text);
+    }
+
+    /**
+     * Get the current delimiter to be found.
+     */
+    public function currentDelimiter(): string
+    {
+        return $this->currentDelimiter;
+    }
+
+    /**
+     * Get the previous delimiter found.
+     */
+    public function previousDelimiter(): string
+    {
+        return $this->previousDelimiter;
+    }
+
+    /**
+     * Get the next token between delimiters.
+     * Returns false if there's no further tokens.
+     */
+    public function next(): string|false
+    {
+        $token = '';
+
+        for ($i = $this->currentIndex; $i < $this->length; $i++) {
+            $char = $this->text[$i];
+            if (str_contains($this->delimiters, $char)) {
+                $this->previousDelimiter = $this->currentDelimiter;
+                $this->currentDelimiter = $char;
+                $this->currentIndex = $i + 1;
+                return $token;
+            }
+
+            $token .= $char;
+        }
+
+        if ($token) {
+            $this->currentIndex = $this->length;
+            $this->previousDelimiter = $this->currentDelimiter;
+            $this->currentDelimiter = '';
+            return $token;
+        }
+
+        return false;
+    }
+}
diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
index 43219a4ed98..6933813b608 100644
--- a/tests/Search/SearchIndexingTest.php
+++ b/tests/Search/SearchIndexingTest.php
@@ -74,4 +74,20 @@ public function test_tag_names_and_values_are_indexed_for_search()
         $this->assertEquals(3, $scoreByTerm->get('Animal'));
         $this->assertEquals(3, $scoreByTerm->get('SuperImportant'));
     }
+
+    public function test_terms_containing_punctuation_within_retain_original_form_and_split_form_in_index()
+    {
+        $page = $this->entities->newPage(['html' => '<p>super.duper awesome-beans big- barry cheese.</p><p>biscuits</p><p>a-bs</p>']);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+        $expected = ['super', 'duper', 'super.duper', 'awesome-beans', 'awesome', 'beans', 'big', 'barry', 'cheese', 'biscuits', 'a-bs', 'a', 'bs'];
+        foreach ($expected as $term) {
+            $this->assertNotNull($scoreByTerm->get($term), "Failed asserting that \"$term\" is indexed");
+        }
+
+        $nonExpected = ['big-', 'big-barry', 'cheese.', 'cheese.biscuits'];
+        foreach ($nonExpected as $term) {
+            $this->assertNull($scoreByTerm->get($term), "Failed asserting that \"$term\" is not indexed");
+        }
+    }
 }

From f1b8e857bf68eb83ecc2db40da53f5d4626a16de Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 14 Feb 2025 19:30:25 +0000
Subject: [PATCH 473/666] Searching: Added test for guillemets

To cover #5475
---
 tests/Search/SearchIndexingTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
index 6933813b608..57cf412e1b7 100644
--- a/tests/Search/SearchIndexingTest.php
+++ b/tests/Search/SearchIndexingTest.php
@@ -75,6 +75,22 @@ public function test_tag_names_and_values_are_indexed_for_search()
         $this->assertEquals(3, $scoreByTerm->get('SuperImportant'));
     }
 
+    public function test_terms_containing_guillemets_handled()
+    {
+        $page = $this->entities->newPage(['html' => '<p>«Hello there» and « there »</p>']);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+        $expected = ['Hello', 'there', 'and'];
+        foreach ($expected as $term) {
+            $this->assertNotNull($scoreByTerm->get($term), "Failed asserting that \"$term\" is indexed");
+        }
+
+        $nonExpected = ['«', '»'];
+        foreach ($nonExpected as $term) {
+            $this->assertNull($scoreByTerm->get($term), "Failed asserting that \"$term\" is not indexed");
+        }
+    }
+
     public function test_terms_containing_punctuation_within_retain_original_form_and_split_form_in_index()
     {
         $page = $this->entities->newPage(['html' => '<p>super.duper awesome-beans big- barry cheese.</p><p>biscuits</p><p>a-bs</p>']);

From 5c15f4add277f237635b8dcc31db5f24fc2aa36e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 16 Feb 2025 11:27:49 +0000
Subject: [PATCH 474/666] Translations: Fixed a couple of errors in sorting en
 words

---
 lang/en/activities.php | 2 +-
 lang/en/settings.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/activities.php b/lang/en/activities.php
index 67df53e369a..4362fc02958 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -131,7 +131,7 @@
     'sort_rule_create' => 'created sort rule',
     'sort_rule_create_notification' => 'Sort rule successfully created',
     'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully update',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
     'sort_rule_delete' => 'deleted sort rule',
     'sort_rule_delete_notification' => 'Sort rule successfully deleted',
 
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 098479f3be0..f96057cf55d 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -77,7 +77,7 @@
     // Sorting Settings
     'sorting' => 'Sorting',
     'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort role to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
     'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',

From 2b746425c9c3d08a89649362396eaa75a1ccf626 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 16 Feb 2025 15:09:33 +0000
Subject: [PATCH 475/666] Lexical: Fixed code in lists, removed extra old
 alignment code

Code in lists could throw error on parse due to inner <code> tag being
parsed but not actually used within a <pre>, so this updates the
importDOM to disregard childdren for code blocks.

This also improves the invariant implementation to not be so
dev/debugger based, and to include vars in the output.
---
 .../wysiwyg/lexical/core/LexicalCommands.ts   |  3 ---
 .../wysiwyg/lexical/core/LexicalConstants.ts  | 22 -------------------
 .../js/wysiwyg/lexical/core/LexicalNode.ts    |  6 +++++
 resources/js/wysiwyg/lexical/core/index.ts    |  4 ----
 .../lexical/core/nodes/LexicalElementNode.ts  |  9 --------
 .../lexical/core/nodes/LexicalTextNode.ts     |  5 +++++
 .../wysiwyg/lexical/core/shared/invariant.ts  | 10 ++++-----
 resources/js/wysiwyg/lexical/html/index.ts    |  4 +---
 .../lexical/rich-text/LexicalCodeBlockNode.ts |  9 +++++++-
 .../js/wysiwyg/lexical/rich-text/index.ts     | 21 ------------------
 10 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalCommands.ts b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
index 0f1c0a5d31e..f995237a0cf 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
@@ -8,7 +8,6 @@
 
 import type {
   BaseSelection,
-  ElementFormatType,
   LexicalCommand,
   LexicalNode,
   TextFormatType,
@@ -91,8 +90,6 @@ export const OUTDENT_CONTENT_COMMAND: LexicalCommand<void> = createCommand(
 );
 export const DROP_COMMAND: LexicalCommand<DragEvent> =
   createCommand('DROP_COMMAND');
-export const FORMAT_ELEMENT_COMMAND: LexicalCommand<ElementFormatType> =
-  createCommand('FORMAT_ELEMENT_COMMAND');
 export const DRAGSTART_COMMAND: LexicalCommand<DragEvent> =
   createCommand('DRAGSTART_COMMAND');
 export const DRAGOVER_COMMAND: LexicalCommand<DragEvent> =
diff --git a/resources/js/wysiwyg/lexical/core/LexicalConstants.ts b/resources/js/wysiwyg/lexical/core/LexicalConstants.ts
index 82461e74d95..55668f1e4bc 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalConstants.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalConstants.ts
@@ -6,7 +6,6 @@
  *
  */
 
-import type {ElementFormatType} from './nodes/LexicalElementNode';
 import type {
   TextDetailType,
   TextFormatType,
@@ -111,27 +110,6 @@ export const DETAIL_TYPE_TO_DETAIL: Record<TextDetailType | string, number> = {
   unmergeable: IS_UNMERGEABLE,
 };
 
-export const ELEMENT_TYPE_TO_FORMAT: Record<
-  Exclude<ElementFormatType, ''>,
-  number
-> = {
-  center: IS_ALIGN_CENTER,
-  end: IS_ALIGN_END,
-  justify: IS_ALIGN_JUSTIFY,
-  left: IS_ALIGN_LEFT,
-  right: IS_ALIGN_RIGHT,
-  start: IS_ALIGN_START,
-};
-
-export const ELEMENT_FORMAT_TO_TYPE: Record<number, ElementFormatType> = {
-  [IS_ALIGN_CENTER]: 'center',
-  [IS_ALIGN_END]: 'end',
-  [IS_ALIGN_JUSTIFY]: 'justify',
-  [IS_ALIGN_LEFT]: 'left',
-  [IS_ALIGN_RIGHT]: 'right',
-  [IS_ALIGN_START]: 'start',
-};
-
 export const TEXT_MODE_TO_TYPE: Record<TextModeType, 0 | 1 | 2> = {
   normal: IS_NORMAL,
   segmented: IS_SEGMENTED,
diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index 163bb8c31c8..7306e6bca27 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -146,6 +146,12 @@ type NodeName = string;
  * Output for a DOM conversion.
  * Node can be set to 'ignore' to ignore the conversion and handling of the DOMNode
  * including all its children.
+ *
+ * You can specify a function to run for each converted child (forChild) or on all
+ * the child nodes after the conversion is complete (after).
+ * The key difference here is that forChild runs for every deeply nested child node
+ * of the current node, whereas after will run only once after the
+ * transformation of the node and all its children is complete.
  */
 export type DOMConversionOutput = {
   after?: (childLexicalNodes: Array<LexicalNode>) => Array<LexicalNode>;
diff --git a/resources/js/wysiwyg/lexical/core/index.ts b/resources/js/wysiwyg/lexical/core/index.ts
index 5ef926b5afc..92cb4a1ca9b 100644
--- a/resources/js/wysiwyg/lexical/core/index.ts
+++ b/resources/js/wysiwyg/lexical/core/index.ts
@@ -49,15 +49,12 @@ export type {
 } from './LexicalNode';
 export type {
   BaseSelection,
-  ElementPointType as ElementPoint,
   NodeSelection,
   Point,
   PointType,
   RangeSelection,
-  TextPointType as TextPoint,
 } from './LexicalSelection';
 export type {
-  ElementFormatType,
   SerializedElementNode,
 } from './nodes/LexicalElementNode';
 export type {SerializedRootNode} from './nodes/LexicalRootNode';
@@ -87,7 +84,6 @@ export {
   DRAGSTART_COMMAND,
   DROP_COMMAND,
   FOCUS_COMMAND,
-  FORMAT_ELEMENT_COMMAND,
   FORMAT_TEXT_COMMAND,
   INDENT_CONTENT_COMMAND,
   INSERT_LINE_BREAK_COMMAND,
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 9624af67e7e..9ad50841141 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -46,15 +46,6 @@ export type SerializedElementNode<
   SerializedLexicalNode
 >;
 
-export type ElementFormatType =
-  | 'left'
-  | 'start'
-  | 'center'
-  | 'right'
-  | 'end'
-  | 'justify'
-  | '';
-
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface ElementNode {
   getTopLevelElement(): ElementNode | null;
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
index 4a3a489504e..7f1b4f30515 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -1314,6 +1314,11 @@ const nodeNameToTextFormat: Record<string, TextFormatType> = {
 
 function convertTextFormatElement(domNode: HTMLElement): DOMConversionOutput {
   const format = nodeNameToTextFormat[domNode.nodeName.toLowerCase()];
+
+  if (format === 'code' && domNode.closest('pre')) {
+    return {node: null};
+  }
+
   if (format === undefined) {
     return {node: null};
   }
diff --git a/resources/js/wysiwyg/lexical/core/shared/invariant.ts b/resources/js/wysiwyg/lexical/core/shared/invariant.ts
index 0e73848bac1..8e008c11c51 100644
--- a/resources/js/wysiwyg/lexical/core/shared/invariant.ts
+++ b/resources/js/wysiwyg/lexical/core/shared/invariant.ts
@@ -18,9 +18,9 @@ export default function invariant(
     return;
   }
 
-  throw new Error(
-    'Internal Lexical error: invariant() is meant to be replaced at compile ' +
-      'time. There is no runtime version. Error: ' +
-      message,
-  );
+  for (const arg of args) {
+    message = (message || '').replace('%s', arg);
+  }
+
+  throw new Error(message);
 }
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index 5c3cb6cce29..5018e10b4f2 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -11,7 +11,6 @@ import type {
   DOMChildConversion,
   DOMConversion,
   DOMConversionFn,
-  ElementFormatType,
   LexicalEditor,
   LexicalNode,
 } from 'lexical';
@@ -58,6 +57,7 @@ export function $generateNodesFromDOM(
       }
     }
   }
+
   $unwrapArtificalNodes(allArtificialNodes);
 
   return lexicalNodes;
@@ -324,8 +324,6 @@ function wrapContinuousInlines(
   nodes: Array<LexicalNode>,
   createWrapperFn: () => ElementNode,
 ): Array<LexicalNode> {
-  const textAlign = (domNode as HTMLElement).style
-    .textAlign as ElementFormatType;
   const out: Array<LexicalNode> = [];
   let continuousInlines: Array<LexicalNode> = [];
   // wrap contiguous inline child nodes in para
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index cbe69184887..49ba7754c4c 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -145,7 +145,14 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
                             node.setId(element.id);
                         }
 
-                        return { node };
+                        return {
+                            node,
+                            after(childNodes): LexicalNode[] {
+                                // Remove any child nodes that may get parsed since we're manually
+                                // controlling the code contents.
+                                return [];
+                            },
+                        };
                     },
                     priority: 3,
                 };
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index c585c028a5a..477fdd78105 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -8,7 +8,6 @@
 
 import type {
   CommandPayloadType,
-  ElementFormatType,
   LexicalCommand,
   LexicalEditor,
   PasteCommandType,
@@ -44,7 +43,6 @@ import {
   DRAGSTART_COMMAND,
   DROP_COMMAND,
   ElementNode,
-  FORMAT_ELEMENT_COMMAND,
   FORMAT_TEXT_COMMAND,
   INSERT_LINE_BREAK_COMMAND,
   INSERT_PARAGRAPH_COMMAND,
@@ -285,25 +283,6 @@ export function registerRichText(editor: LexicalEditor): () => void {
       },
       COMMAND_PRIORITY_EDITOR,
     ),
-    editor.registerCommand<ElementFormatType>(
-      FORMAT_ELEMENT_COMMAND,
-      (format) => {
-        const selection = $getSelection();
-        if (!$isRangeSelection(selection) && !$isNodeSelection(selection)) {
-          return false;
-        }
-        const nodes = selection.getNodes();
-        for (const node of nodes) {
-          const element = $findMatchingParent(
-            node,
-            (parentNode): parentNode is ElementNode =>
-              $isElementNode(parentNode) && !parentNode.isInline(),
-          );
-        }
-        return true;
-      },
-      COMMAND_PRIORITY_EDITOR,
-    ),
     editor.registerCommand<boolean>(
       INSERT_LINE_BREAK_COMMAND,
       (selectStart) => {

From 3b4d3430a54a90a3926e7c029535dd74e7726ad9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 17 Feb 2025 12:07:23 +0000
Subject: [PATCH 476/666] Tests: Updated failing license test

---
 tests/Meta/LicensesTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Meta/LicensesTest.php b/tests/Meta/LicensesTest.php
index 4bee6f682b9..0d6af2555cf 100644
--- a/tests/Meta/LicensesTest.php
+++ b/tests/Meta/LicensesTest.php
@@ -12,7 +12,7 @@ public function test_licenses_endpoint()
         $resp->assertOk();
         $resp->assertSee('Licenses');
         $resp->assertSee('PHP Library Licenses');
-        $resp->assertSee('Dan Brown and the BookStack Project contributors');
+        $resp->assertSee('Dan Brown and the BookStack project contributors');
         $resp->assertSee('doctrine/dbal');
         $resp->assertSee('@codemirror/lang-html');
     }

From 5508c171db9ab34feb62694d912d4521cfa7b2ef Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 17 Feb 2025 12:45:37 +0000
Subject: [PATCH 477/666] PHP: Addressed 8.4 deprecations within app itself

---
 app/Access/Ldap.php                         |  8 ++++----
 app/Access/SocialDriverManager.php          |  2 +-
 app/App/helpers.php                         |  6 +++---
 app/Entities/Controllers/BookController.php |  4 ++--
 app/Entities/Controllers/PageController.php |  4 ++--
 app/Entities/Queries/QueryPopular.php       |  4 ++--
 app/Entities/Repos/RevisionRepo.php         |  2 +-
 app/Theming/ThemeService.php                |  2 +-
 app/Uploads/ImageRepo.php                   | 20 +++++++++++++-------
 app/Uploads/ImageService.php                |  4 ++--
 app/Users/Controllers/UserApiController.php |  4 ++--
 app/Util/SsrUrlValidator.php                |  7 ++++++-
 dev/docs/logical-theme-system.md            |  1 +
 tests/Entity/PageEditorTest.php             | 10 +++++-----
 14 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/app/Access/Ldap.php b/app/Access/Ldap.php
index 702d629cef0..d14f688218c 100644
--- a/app/Access/Ldap.php
+++ b/app/Access/Ldap.php
@@ -54,7 +54,7 @@ public function setVersion($ldapConnection, int $version): bool
      *
      * @return \LDAP\Result|array|false
      */
-    public function search($ldapConnection, string $baseDn, string $filter, array $attributes = null)
+    public function search($ldapConnection, string $baseDn, string $filter, array $attributes = [])
     {
         return ldap_search($ldapConnection, $baseDn, $filter, $attributes);
     }
@@ -66,7 +66,7 @@ public function search($ldapConnection, string $baseDn, string $filter, array $a
      *
      * @return \LDAP\Result|array|false
      */
-    public function read($ldapConnection, string $baseDn, string $filter, array $attributes = null)
+    public function read($ldapConnection, string $baseDn, string $filter, array $attributes = [])
     {
         return ldap_read($ldapConnection, $baseDn, $filter, $attributes);
     }
@@ -87,7 +87,7 @@ public function getEntries($ldapConnection, $ldapSearchResult): array|false
      *
      * @param resource|\LDAP\Connection   $ldapConnection
      */
-    public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = null): array|false
+    public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = []): array|false
     {
         $search = $this->search($ldapConnection, $baseDn, $filter, $attributes);
 
@@ -99,7 +99,7 @@ public function searchAndGetEntries($ldapConnection, string $baseDn, string $fil
      *
      * @param resource|\LDAP\Connection $ldapConnection
      */
-    public function bind($ldapConnection, string $bindRdn = null, string $bindPassword = null): bool
+    public function bind($ldapConnection, ?string $bindRdn = null, ?string $bindPassword = null): bool
     {
         return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
     }
diff --git a/app/Access/SocialDriverManager.php b/app/Access/SocialDriverManager.php
index 536b2e63d37..dafc0e82d14 100644
--- a/app/Access/SocialDriverManager.php
+++ b/app/Access/SocialDriverManager.php
@@ -92,7 +92,7 @@ public function addSocialDriver(
         string $driverName,
         array $config,
         string $socialiteHandler,
-        callable $configureForRedirect = null
+        ?callable $configureForRedirect = null
     ) {
         $this->validDrivers[] = $driverName;
         config()->set('services.' . $driverName, $config);
diff --git a/app/App/helpers.php b/app/App/helpers.php
index 204b3f06a72..eec86553fb4 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -43,9 +43,9 @@ function user(): User
  * Check if the current user has a permission. If an ownable element
  * is passed in the jointPermissions are checked against that particular item.
  */
-function userCan(string $permission, Model $ownable = null): bool
+function userCan(string $permission, ?Model $ownable = null): bool
 {
-    if ($ownable === null) {
+    if (is_null($ownable)) {
         return user()->can($permission);
     }
 
@@ -71,7 +71,7 @@ function userCanOnAny(string $action, string $entityClass = ''): bool
  *
  * @return mixed|SettingService
  */
-function setting(string $key = null, $default = null)
+function setting(?string $key = null, mixed $default = null): mixed
 {
     $settingService = app()->make(SettingService::class);
 
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index a1c586f47e7..b1685081a3d 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -70,7 +70,7 @@ public function index(Request $request)
     /**
      * Show the form for creating a new book.
      */
-    public function create(string $shelfSlug = null)
+    public function create(?string $shelfSlug = null)
     {
         $this->checkPermission('book-create-all');
 
@@ -93,7 +93,7 @@ public function create(string $shelfSlug = null)
      * @throws ImageUploadException
      * @throws ValidationException
      */
-    public function store(Request $request, string $shelfSlug = null)
+    public function store(Request $request, ?string $shelfSlug = null)
     {
         $this->checkPermission('book-create-all');
         $validated = $this->validate($request, [
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index eab53bb2510..230a84721f8 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -41,7 +41,7 @@ public function __construct(
      *
      * @throws Throwable
      */
-    public function create(string $bookSlug, string $chapterSlug = null)
+    public function create(string $bookSlug, ?string $chapterSlug = null)
     {
         if ($chapterSlug) {
             $parent = $this->entityQueries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
@@ -69,7 +69,7 @@ public function create(string $bookSlug, string $chapterSlug = null)
      *
      * @throws ValidationException
      */
-    public function createAsGuest(Request $request, string $bookSlug, string $chapterSlug = null)
+    public function createAsGuest(Request $request, string $bookSlug, ?string $chapterSlug = null)
     {
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index 85f88a1d19c..065ae82ef82 100644
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -18,7 +18,7 @@ public function __construct(
     ) {
     }
 
-    public function run(int $count, int $page, array $filterModels = null): Collection
+    public function run(int $count, int $page, array $filterModels): Collection
     {
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
@@ -26,7 +26,7 @@ public function run(int $count, int $page, array $filterModels = null): Collecti
             ->groupBy('viewable_id', 'viewable_type')
             ->orderBy('view_count', 'desc');
 
-        if ($filterModels) {
+        if (!empty($filterModels)) {
             $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 
diff --git a/app/Entities/Repos/RevisionRepo.php b/app/Entities/Repos/RevisionRepo.php
index daf55777ce3..d5549a0f14a 100644
--- a/app/Entities/Repos/RevisionRepo.php
+++ b/app/Entities/Repos/RevisionRepo.php
@@ -46,7 +46,7 @@ public function getNewDraftForCurrentUser(Page $page): PageRevision
     /**
      * Store a new revision in the system for the given page.
      */
-    public function storeNewForPage(Page $page, string $summary = null): PageRevision
+    public function storeNewForPage(Page $page, ?string $summary = null): PageRevision
     {
         $revision = new PageRevision();
 
diff --git a/app/Theming/ThemeService.php b/app/Theming/ThemeService.php
index 639854d6ad1..4bdb6836b02 100644
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@ -93,7 +93,7 @@ public function readThemeActions(): void
     /**
      * @see SocialDriverManager::addSocialDriver
      */
-    public function addSocialDriver(string $driverName, array $config, string $socialiteHandler, callable $configureForRedirect = null): void
+    public function addSocialDriver(string $driverName, array $config, string $socialiteHandler, ?callable $configureForRedirect = null): void
     {
         $driverManager = app()->make(SocialDriverManager::class);
         $driverManager->addSocialDriver($driverName, $config, $socialiteHandler, $configureForRedirect);
diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 845067fdc29..a16b87bd75b 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -49,9 +49,9 @@ public function getPaginatedByType(
         string $type,
         int $page = 0,
         int $pageSize = 24,
-        int $uploadedTo = null,
-        string $search = null,
-        callable $whereClause = null
+        ?int $uploadedTo = null,
+        ?string $search = null,
+        ?callable $whereClause = null
     ): array {
         $imageQuery = Image::query()->where('type', '=', strtolower($type));
 
@@ -91,7 +91,7 @@ public function getEntityFiltered(
             $parentFilter = function (Builder $query) use ($filterType, $contextPage) {
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
-                } elseif ($filterType === 'book') {
+                } else if ($filterType === 'book') {
                     $validPageIds = $contextPage->book->pages()
                         ->scopes('visible')
                         ->pluck('id')
@@ -109,8 +109,14 @@ public function getEntityFiltered(
      *
      * @throws ImageUploadException
      */
-    public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
-    {
+    public function saveNew(
+        UploadedFile $uploadFile,
+        string $type,
+        int $uploadedTo = 0,
+        ?int $resizeWidth = null,
+        ?int $resizeHeight = null,
+        bool $keepRatio = true
+    ): Image {
         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);
 
         if ($type !== 'system') {
@@ -184,7 +190,7 @@ public function updateImageFile(Image $image, UploadedFile $file): void
      *
      * @throws Exception
      */
-    public function destroyImage(Image $image = null): void
+    public function destroyImage(?Image $image = null): void
     {
         if ($image) {
             $this->imageService->destroy($image);
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 038e6aa417c..4d6d4919742 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -31,8 +31,8 @@ public function saveNewFromUpload(
         UploadedFile $uploadedFile,
         string $type,
         int $uploadedTo = 0,
-        int $resizeWidth = null,
-        int $resizeHeight = null,
+        ?int $resizeWidth = null,
+        ?int $resizeHeight = null,
         bool $keepRatio = true,
         string $imageName = '',
     ): Image {
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index c84f1531d6a..bb2570b3108 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -33,7 +33,7 @@ public function __construct(UserRepo $userRepo)
         });
     }
 
-    protected function rules(int $userId = null): array
+    protected function rules(?int $userId = null): array
     {
         return [
             'create' => [
@@ -54,7 +54,7 @@ protected function rules(int $userId = null): array
                     'string',
                     'email',
                     'min:2',
-                    (new Unique('users', 'email'))->ignore($userId ?? null),
+                    (new Unique('users', 'email'))->ignore($userId),
                 ],
                 'external_auth_id' => ['string'],
                 'language'         => ['string', 'max:15', 'alpha_dash'],
diff --git a/app/Util/SsrUrlValidator.php b/app/Util/SsrUrlValidator.php
index 0b3a6a31de9..076a653fc86 100644
--- a/app/Util/SsrUrlValidator.php
+++ b/app/Util/SsrUrlValidator.php
@@ -4,11 +4,16 @@
 
 use BookStack\Exceptions\HttpFetchException;
 
+/**
+ * Validate the host we're connecting to when making a server-side-request.
+ * Will use the given hosts config if given during construction otherwise
+ * will look to the app configured config.
+ */
 class SsrUrlValidator
 {
     protected string $config;
 
-    public function __construct(string $config = null)
+    public function __construct(?string $config = null)
     {
         $this->config = $config ?? config('app.ssr_hosts') ?? '';
     }
diff --git a/dev/docs/logical-theme-system.md b/dev/docs/logical-theme-system.md
index 84bd26a5387..0063c4e8bac 100644
--- a/dev/docs/logical-theme-system.md
+++ b/dev/docs/logical-theme-system.md
@@ -49,6 +49,7 @@ This method allows you to register a custom social authentication driver within
 - string $driverName
 - array $config
 - string $socialiteHandler
+- callable|null $configureForRedirect = null
 
 **Example**
 
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index 21abd4ba1e6..bb3d7419306 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -191,20 +191,20 @@ public function test_editor_type_switch_options_show()
     {
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
         $editLink = $this->page->getUrl('/edit') . '?editor=';
-        $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-clean\"]", '(Clean Content)');
-        $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-stable\"]", '(Stable Content)');
-        $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}wysiwyg2024\"]", '(In Alpha Testing)');
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}markdown-clean\"]", '(Clean Content)');
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}markdown-stable\"]", '(Stable Content)');
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}wysiwyg2024\"]", '(In Alpha Testing)');
 
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit?editor=markdown-stable'));
         $editLink = $this->page->getUrl('/edit') . '?editor=';
-        $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}wysiwyg\"]", 'Switch to WYSIWYG Editor');
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}wysiwyg\"]", 'Switch to WYSIWYG Editor');
     }
 
     public function test_editor_type_switch_options_dont_show_if_without_change_editor_permissions()
     {
         $resp = $this->asEditor()->get($this->page->getUrl('/edit'));
         $editLink = $this->page->getUrl('/edit') . '?editor=';
-        $this->withHtml($resp)->assertElementNotExists("a[href*=\"${editLink}\"]");
+        $this->withHtml($resp)->assertElementNotExists("a[href*=\"{$editLink}\"]");
     }
 
     public function test_page_editor_type_switch_does_not_work_without_change_editor_permissions()

From 5050719ea3933efcaaf3f69e51b25fcca0383f5b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 17 Feb 2025 13:37:58 +0000
Subject: [PATCH 478/666] PHP: Updated DOMPDF version

---
 app/Config/exports.php |  1 +
 composer.json          |  2 +-
 composer.lock          | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Config/exports.php b/app/Config/exports.php
index ba535ca7e4e..2e22bc759e3 100644
--- a/app/Config/exports.php
+++ b/app/Config/exports.php
@@ -114,6 +114,7 @@
          * @var array
          */
         'allowed_protocols' => [
+            "data://" => ["rules" => []],
             'file://'  => ['rules' => []],
             'http://'  => ['rules' => []],
             'https://' => ['rules' => []],
diff --git a/composer.json b/composer.json
index 6fcf26aaadf..b77c90dd31c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "ext-xml": "*",
         "ext-zip": "*",
         "bacon/bacon-qr-code": "^3.0",
-        "dompdf/dompdf": "^3.0",
+        "dompdf/dompdf": "^3.1",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
diff --git a/composer.lock b/composer.lock
index 1f3808cdcb8..9f5c9cf2809 100644
--- a/composer.lock
+++ b/composer.lock
@@ -636,16 +636,16 @@
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8"
+                "reference": "a51bd7a063a65499446919286fb18b518177155a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/baf4084b27c7f4b5b7a221b19a94d11327664eb8",
-                "reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/a51bd7a063a65499446919286fb18b518177155a",
+                "reference": "a51bd7a063a65499446919286fb18b518177155a",
                 "shasum": ""
             },
             "require": {
@@ -694,9 +694,9 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v3.0.2"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.1.0"
             },
-            "time": "2024-12-27T20:27:37+00:00"
+            "time": "2025-01-15T14:09:04+00:00"
         },
         {
             "name": "dompdf/php-font-lib",

From 35b45a2b8d81e60401c1409744c967b5ca551989 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 20 Feb 2025 13:06:49 +0000
Subject: [PATCH 479/666] LDAP: Fixed php type error when no cn provided for
 user

Changes default fallback for name to first DN part, otherwise the whole
DN, rather than leave as null which was causing a type error.

For #5443
---
 app/Access/LdapService.php |  8 ++++++--
 tests/Auth/LdapTest.php    | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index e5037ad2f95..0f456efc247 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -112,10 +112,14 @@ public function getUserDetails(string $userName): ?array
             return null;
         }
 
-        $userCn = $this->getUserResponseProperty($user, 'cn', null);
+        $nameDefault = $this->getUserResponseProperty($user, 'cn', null);
+        if (is_null($nameDefault)) {
+            $nameDefault = ldap_explode_dn($user['dn'], 1)[0] ?? $user['dn'];
+        }
+
         $formatted = [
             'uid'   => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
-            'name'  => $this->getUserDisplayName($user, $displayNameAttrs, $userCn),
+            'name'  => $this->getUserDisplayName($user, $displayNameAttrs, $nameDefault),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
             'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 9a00c983a50..d1f128a50d9 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -166,6 +166,26 @@ public function test_login_works_when_no_uid_provided_by_ldap_server()
         $this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $ldapDn]);
     }
 
+    public function test_login_works_when_ldap_server_does_not_provide_a_cn_value()
+    {
+        $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
+
+        $this->commonLdapMocks(1, 1, 1, 2, 1);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
+            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->andReturn(['count' => 1, 0 => [
+                'dn'   => $ldapDn,
+                'mail' => [$this->mockUser->email],
+            ]]);
+
+        $resp = $this->mockUserLogin();
+        $resp->assertRedirect('/');
+        $this->assertDatabaseHas('users', [
+            'name' => 'test-user',
+            'email' => $this->mockUser->email,
+        ]);
+    }
+
     public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properly()
     {
         config()->set(['services.ldap.id_attribute' => 'my_custom_id']);

From 5c78f8352e82231aaef70e2b3be47360d840ca47 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Feb 2025 11:19:11 +0000
Subject: [PATCH 480/666] Styles: Fixed breakpoint overlap

Alters common breakpoint utilities to not overlap at breakpoints which
would cause broken layout at those points.
For #5396
---
 resources/js/components/tri-layout.js | 2 +-
 resources/sass/_mixins.scss           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/tri-layout.js b/resources/js/components/tri-layout.js
index 8ccefb06c48..be9388e8d46 100644
--- a/resources/js/components/tri-layout.js
+++ b/resources/js/components/tri-layout.js
@@ -27,7 +27,7 @@ export class TriLayout extends Component {
     updateLayout() {
         let newLayout = 'tablet';
         if (window.innerWidth <= 1000) newLayout = 'mobile';
-        if (window.innerWidth >= 1400) newLayout = 'desktop';
+        if (window.innerWidth > 1400) newLayout = 'desktop';
         if (newLayout === this.lastLayoutType) return;
 
         if (this.onDestroy) {
diff --git a/resources/sass/_mixins.scss b/resources/sass/_mixins.scss
index 0a419c08abd..fc508600839 100644
--- a/resources/sass/_mixins.scss
+++ b/resources/sass/_mixins.scss
@@ -3,10 +3,10 @@
     @media screen and (max-width: $size) { @content; }
 }
 @mixin larger-than($size) {
-    @media screen and (min-width: $size) { @content; }
+    @media screen and (min-width: ($size + 1)) { @content; }
 }
 @mixin between($min, $max) {
-  @media screen and (min-width: $min) and (max-width: $max) { @content; }
+  @media screen and (min-width: ($min + 1)) and (max-width: $max) { @content; }
 }
 
 // Padding shorthand using logical operators to better support RTL.

From c3a1fabbf09c55f3625a7b9e7b616919e03dbe16 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Feb 2025 11:30:10 +0000
Subject: [PATCH 481/666] Deps & Tests: Updated PHP deps, fixed test namespaces

---
 composer.lock                                | 450 ++++++++++---------
 tests/Commands/AssignSortRuleCommandTest.php |   2 +-
 tests/Search/EntitySearchTest.php            |   2 +-
 tests/Search/SearchIndexingTest.php          |   2 +-
 tests/Search/SearchOptionsTest.php           |   2 +-
 tests/Search/SiblingSearchTest.php           |   2 +-
 tests/Sorting/BookSortTest.php               |   2 +-
 tests/Sorting/MoveTest.php                   |   2 +-
 tests/Sorting/SortRuleTest.php               |   2 +-
 9 files changed, 237 insertions(+), 229 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9f5c9cf2809..95bc3ae3716 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8e9b6e95d9222289ce51646e27c1f404",
+    "content-hash": "95a803e4d7797c8ab6c9803a6a3e99e5",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.13",
+            "version": "3.339.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83"
+                "reference": "18f05efe983860ad899082e04c13f06ec9fd6e41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dcb43c029ca74c52fa03a739341cc77086296a83",
-                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/18f05efe983860ad899082e04c13f06ec9fd6e41",
+                "reference": "18f05efe983860ad899082e04c13f06ec9fd6e41",
                 "shasum": ""
             },
             "require": {
@@ -79,31 +79,30 @@
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "guzzlehttp/promises": "^1.4.0 || ^2.0",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
-                "mtdowling/jmespath.php": "^2.6",
-                "php": ">=7.2.5",
-                "psr/http-message": "^1.0 || ^2.0"
+                "guzzlehttp/guzzle": "^7.4.5",
+                "guzzlehttp/promises": "^2.0",
+                "guzzlehttp/psr7": "^2.4.5",
+                "mtdowling/jmespath.php": "^2.8.0",
+                "php": ">=8.1",
+                "psr/http-message": "^2.0"
             },
             "require-dev": {
                 "andrewsville/php-token-reflection": "^1.4",
                 "aws/aws-php-sns-message-validator": "~1.0",
                 "behat/behat": "~3.0",
-                "composer/composer": "^1.10.22",
+                "composer/composer": "^2.7.8",
                 "dms/phpunit-arraysubset-asserts": "^0.4.0",
                 "doctrine/cache": "~1.4",
                 "ext-dom": "*",
                 "ext-openssl": "*",
                 "ext-pcntl": "*",
                 "ext-sockets": "*",
-                "nette/neon": "^2.3",
-                "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
-                "sebastian/comparator": "^1.2.3 || ^4.0",
-                "yoast/phpunit-polyfills": "^1.0"
+                "psr/cache": "^2.0 || ^3.0",
+                "psr/simple-cache": "^2.0 || ^3.0",
+                "sebastian/comparator": "^1.2.3 || ^4.0 || ^5.0",
+                "symfony/filesystem": "^v6.4.0 || ^v7.1.0",
+                "yoast/phpunit-polyfills": "^2.0"
             },
             "suggest": {
                 "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
@@ -152,11 +151,11 @@
                 "sdk"
             ],
             "support": {
-                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
+                "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.13"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.339.19"
             },
-            "time": "2025-01-10T19:04:25+00:00"
+            "time": "2025-02-21T19:13:15+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -923,16 +922,16 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.2",
+            "version": "v6.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
-                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
                 "shasum": ""
             },
             "require": {
@@ -980,9 +979,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
             },
-            "time": "2024-11-24T11:22:49+00:00"
+            "time": "2025-01-23T05:11:06+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1444,16 +1443,16 @@
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
                 "shasum": ""
             },
             "require": {
@@ -1510,7 +1509,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
             },
             "funding": [
                 {
@@ -1526,28 +1525,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T19:50:20+00:00"
+            "time": "2025-02-03T10:55:03+00:00"
         },
         {
             "name": "intervention/gif",
-            "version": "4.2.0",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/gif.git",
-                "reference": "42c131a31b93c440ad49061b599fa218f06f93be"
+                "reference": "6addac2c68b4bc0e37d0d3ccedda57eb84729c49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/gif/zipball/42c131a31b93c440ad49061b599fa218f06f93be",
-                "reference": "42c131a31b93c440ad49061b599fa218f06f93be",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/6addac2c68b4bc0e37d0d3ccedda57eb84729c49",
+                "reference": "6addac2c68b4bc0e37d0d3ccedda57eb84729c49",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
-                "phpunit/phpunit": "^10.0",
+                "phpstan/phpstan": "^2.1",
+                "phpunit/phpunit": "^10.0 || ^11.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
             },
@@ -1578,7 +1577,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/gif/issues",
-                "source": "https://github.com/Intervention/gif/tree/4.2.0"
+                "source": "https://github.com/Intervention/gif/tree/4.2.1"
             },
             "funding": [
                 {
@@ -1594,20 +1593,20 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2024-09-20T13:35:02+00:00"
+            "time": "2025-01-05T10:52:39+00:00"
         },
         {
             "name": "intervention/image",
-            "version": "3.10.2",
+            "version": "3.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85"
+                "reference": "0f87254688e480fbb521e2a1ac6c11c784ca41af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/1c68e5fdf443374f3580c5b920a7f177eccdab85",
-                "reference": "1c68e5fdf443374f3580c5b920a7f177eccdab85",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/0f87254688e480fbb521e2a1ac6c11c784ca41af",
+                "reference": "0f87254688e480fbb521e2a1ac6c11c784ca41af",
                 "shasum": ""
             },
             "require": {
@@ -1617,7 +1616,7 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.6",
-                "phpstan/phpstan": "^2",
+                "phpstan/phpstan": "^2.1",
                 "phpunit/phpunit": "^10.0 || ^11.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
@@ -1654,7 +1653,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.10.2"
+                "source": "https://github.com/Intervention/image/tree/3.11.1"
             },
             "funding": [
                 {
@@ -1670,7 +1669,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-01-04T07:31:37+00:00"
+            "time": "2025-02-01T07:28:26+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1741,16 +1740,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.37.0",
+            "version": "v11.43.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
+                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/99d1573698abc42222f04d25fcd5b213d0eedf21",
+                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21",
                 "shasum": ""
             },
             "require": {
@@ -1776,7 +1775,7 @@
                 "league/flysystem-local": "^3.25.1",
                 "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.72.2|^3.4",
+                "nesbot/carbon": "^2.72.6|^3.8.4",
                 "nunomaduro/termwind": "^2.0",
                 "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
@@ -1851,17 +1850,18 @@
                 "fakerphp/faker": "^1.24",
                 "guzzlehttp/promises": "^2.0.3",
                 "guzzlehttp/psr7": "^2.4",
+                "laravel/pint": "^1.18",
                 "league/flysystem-aws-s3-v3": "^3.25.1",
                 "league/flysystem-ftp": "^3.25.1",
                 "league/flysystem-path-prefixing": "^3.25.1",
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.6",
+                "orchestra/testbench-core": "^9.9.4",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
-                "phpstan/phpstan": "^1.11.5",
-                "phpunit/phpunit": "^10.5.35|^11.3.6",
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "^10.5.35|^11.3.6|^12.0.1",
                 "predis/predis": "^2.3",
                 "resend/resend-php": "^0.10.0",
                 "symfony/cache": "^7.0.3",
@@ -1893,7 +1893,7 @@
                 "mockery/mockery": "Required to use mocking (^1.6).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
                 "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.3.6|^12.0.1).",
                 "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
@@ -1951,20 +1951,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-01-02T20:10:21+00:00"
+            "time": "2025-02-19T21:53:48+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.2",
+            "version": "v0.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
+                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
+                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
                 "shasum": ""
             },
             "require": {
@@ -1978,7 +1978,7 @@
                 "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
-                "illuminate/collections": "^10.0|^11.0",
+                "illuminate/collections": "^10.0|^11.0|^12.0",
                 "mockery/mockery": "^1.5",
                 "pestphp/pest": "^2.3|^3.4",
                 "phpstan/phpstan": "^1.11",
@@ -2008,31 +2008,31 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.5"
             },
-            "time": "2024-11-12T14:59:47+00:00"
+            "time": "2025-02-11T13:34:40+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.1",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
+                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
-                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f379c13663245f7aa4512a7869f62eb14095f23f",
+                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1"
             },
             "require-dev": {
-                "illuminate/support": "^10.0|^11.0",
+                "illuminate/support": "^10.0|^11.0|^12.0",
                 "nesbot/carbon": "^2.67|^3.0",
-                "pestphp/pest": "^2.36",
+                "pestphp/pest": "^2.36|^3.0",
                 "phpstan/phpstan": "^2.0",
                 "symfony/var-dumper": "^6.2.0|^7.0.0"
             },
@@ -2071,38 +2071,38 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-12-16T15:26:28+00:00"
+            "time": "2025-02-11T15:03:05+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.16.1",
+            "version": "v5.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71"
+                "reference": "7809dc71250e074cd42970f0f803f2cddc04c5de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
-                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/7809dc71250e074cd42970f0f803f2cddc04c5de",
+                "reference": "7809dc71250e074cd42970f0f803f2cddc04c5de",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "firebase/php-jwt": "^6.4",
                 "guzzlehttp/guzzle": "^6.0|^7.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
                 "league/oauth1-client": "^1.11",
                 "php": "^7.2|^8.0",
                 "phpseclib/phpseclib": "^3.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
+                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^8.0|^9.3|^10.4"
+                "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5"
             },
             "type": "library",
             "extra": {
@@ -2143,26 +2143,26 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-12-11T16:43:51+00:00"
+            "time": "2025-02-11T13:38:19+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.10.0",
+            "version": "v2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
+                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
-                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/22177cc71807d38f2810c6204d8f7183d88a57d3",
+                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
                 "php": "^7.2.5|^8.0",
                 "psy/psysh": "^0.11.1|^0.12.0",
                 "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
@@ -2170,10 +2170,10 @@
             "require-dev": {
                 "mockery/mockery": "~1.3.3|^1.4.2",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^8.5.8|^9.3.3"
+                "phpunit/phpunit": "^8.5.8|^9.3.3|^10.0"
             },
             "suggest": {
-                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
+                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0)."
             },
             "type": "library",
             "extra": {
@@ -2207,9 +2207,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.10.0"
+                "source": "https://github.com/laravel/tinker/tree/v2.10.1"
             },
-            "time": "2024-09-23T13:32:56+00:00"
+            "time": "2025-01-27T14:24:01+00:00"
         },
         {
             "name": "league/commonmark",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.4",
+            "version": "3.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
+                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
-                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
+                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
                 "shasum": ""
             },
             "require": {
@@ -3370,8 +3370,8 @@
             ],
             "support": {
                 "docs": "https://carbon.nesbot.com/docs",
-                "issues": "https://github.com/briannesbitt/Carbon/issues",
-                "source": "https://github.com/briannesbitt/Carbon"
+                "issues": "https://github.com/CarbonPHP/carbon/issues",
+                "source": "https://github.com/CarbonPHP/carbon"
             },
             "funding": [
                 {
@@ -3387,7 +3387,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-27T09:25:35+00:00"
+            "time": "2025-02-20T17:33:38+00:00"
         },
         {
             "name": "nette/schema",
@@ -5390,6 +5390,7 @@
                 "symfony/messenger": "^6.4|^7.0",
                 "symfony/twig-bridge": "^6.4|^7.0"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -5725,16 +5726,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.2.1",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "6150b89186573046167796fa5f3f76601d5145f8"
+                "reference": "959a74d044a6db21f4caa6d695648dcb5584cb49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8",
-                "reference": "6150b89186573046167796fa5f3f76601d5145f8",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/959a74d044a6db21f4caa6d695648dcb5584cb49",
+                "reference": "959a74d044a6db21f4caa6d695648dcb5584cb49",
                 "shasum": ""
             },
             "require": {
@@ -5780,7 +5781,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.2.1"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -5796,7 +5797,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:50:44+00:00"
+            "time": "2025-01-07T09:39:55+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6020,16 +6021,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.2.2",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588"
+                "reference": "ee1b504b8926198be89d05e5b6fc4c3810c090f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
-                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ee1b504b8926198be89d05e5b6fc4c3810c090f0",
+                "reference": "ee1b504b8926198be89d05e5b6fc4c3810c090f0",
                 "shasum": ""
             },
             "require": {
@@ -6078,7 +6079,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.2.2"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -6094,20 +6095,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:17+00:00"
+            "time": "2025-01-17T10:56:55+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.2",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306"
+                "reference": "caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3c432966bd8c7ec7429663105f5a02d7e75b4306",
-                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b",
+                "reference": "caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b",
                 "shasum": ""
             },
             "require": {
@@ -6192,7 +6193,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -6208,20 +6209,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-31T14:59:40+00:00"
+            "time": "2025-01-29T07:40:13+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.1",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
+                "reference": "2fc3b4bd67e4747e45195bc4c98bea4628476204"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
-                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/2fc3b4bd67e4747e45195bc4c98bea4628476204",
+                "reference": "2fc3b4bd67e4747e45195bc4c98bea4628476204",
                 "shasum": ""
             },
             "require": {
@@ -6276,7 +6277,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.1"
+                "source": "https://github.com/symfony/mime/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -6292,7 +6293,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:50:44+00:00"
+            "time": "2025-01-27T11:08:17+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6993,16 +6994,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v7.2.0",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e"
+                "reference": "ee9a67edc6baa33e5fae662f94f91fd262930996"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e10a2450fa957af6c448b9b93c9010a4e4c0725e",
-                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/ee9a67edc6baa33e5fae662f94f91fd262930996",
+                "reference": "ee9a67edc6baa33e5fae662f94f91fd262930996",
                 "shasum": ""
             },
             "require": {
@@ -7054,7 +7055,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.2.0"
+                "source": "https://github.com/symfony/routing/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -7070,7 +7071,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-25T11:08:51+00:00"
+            "time": "2025-01-17T10:56:55+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7491,16 +7492,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.2.0",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c"
+                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6a22929407dec8765d6e2b6ff85b800b245879c",
-                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82b478c69745d8878eb60f9a049a4d584996f73a",
+                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a",
                 "shasum": ""
             },
             "require": {
@@ -7554,7 +7555,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.2.0"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -7570,7 +7571,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T15:48:14+00:00"
+            "time": "2025-01-17T11:39:41+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7910,16 +7911,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.16.0",
+            "version": "2.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
+                "reference": "075bc0c26631110584175de6523ab3f1652eb28e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
-                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
+                "reference": "075bc0c26631110584175de6523ab3f1652eb28e",
                 "shasum": ""
             },
             "require": {
@@ -7969,7 +7970,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.16.0"
+                "source": "https://github.com/filp/whoops/tree/2.17.0"
             },
             "funding": [
                 {
@@ -7977,7 +7978,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-25T12:00:00+00:00"
+            "time": "2025-01-25T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8032,16 +8033,16 @@
         },
         {
             "name": "itsgoingd/clockwork",
-            "version": "v5.3.2",
+            "version": "v5.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/itsgoingd/clockwork.git",
-                "reference": "ffd1f1626830005e92461a538ad58372641e065a"
+                "reference": "c27ad77a08a9e58bf0049de46969fa4fe3b506e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/ffd1f1626830005e92461a538ad58372641e065a",
-                "reference": "ffd1f1626830005e92461a538ad58372641e065a",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/c27ad77a08a9e58bf0049de46969fa4fe3b506e5",
+                "reference": "c27ad77a08a9e58bf0049de46969fa4fe3b506e5",
                 "shasum": ""
             },
             "require": {
@@ -8096,7 +8097,7 @@
             ],
             "support": {
                 "issues": "https://github.com/itsgoingd/clockwork/issues",
-                "source": "https://github.com/itsgoingd/clockwork/tree/v5.3.2"
+                "source": "https://github.com/itsgoingd/clockwork/tree/v5.3.4"
             },
             "funding": [
                 {
@@ -8104,44 +8105,44 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-02T22:59:59+00:00"
+            "time": "2025-02-09T15:57:21+00:00"
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f"
+                "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
-                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/dbb2dc20e5c8e1ed3ff289054e1955f269187312",
+                "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^11.15.0",
-                "illuminate/container": "^11.15.0",
-                "illuminate/contracts": "^11.15.0",
-                "illuminate/database": "^11.15.0",
-                "illuminate/http": "^11.15.0",
-                "illuminate/pipeline": "^11.15.0",
-                "illuminate/support": "^11.15.0",
+                "illuminate/console": "^11.15.0 || ^12.0",
+                "illuminate/container": "^11.15.0 || ^12.0",
+                "illuminate/contracts": "^11.15.0 || ^12.0",
+                "illuminate/database": "^11.15.0 || ^12.0",
+                "illuminate/http": "^11.15.0 || ^12.0",
+                "illuminate/pipeline": "^11.15.0 || ^12.0",
+                "illuminate/support": "^11.15.0 || ^12.0",
                 "php": "^8.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^2.0.2"
+                "phpstan/phpstan": "^2.1.3"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "laravel/framework": "^11.15.0",
+                "laravel/framework": "^11.15.0 || ^12.0",
                 "mockery/mockery": "^1.6",
                 "nikic/php-parser": "^5.3",
-                "orchestra/canvas": "^v9.1.3",
-                "orchestra/testbench-core": "^9.5.2",
+                "orchestra/canvas": "^v9.1.3 || ^10.0",
+                "orchestra/testbench-core": "^9.5.2 || ^10.0",
                 "phpstan/phpstan-deprecation-rules": "^2.0.0",
-                "phpunit/phpunit": "^10.5.16"
+                "phpunit/phpunit": "^10.5.35 || ^11.3.6"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -8154,7 +8155,7 @@
                     ]
                 },
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -8189,7 +8190,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.0.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.1.0"
             },
             "funding": [
                 {
@@ -8197,7 +8198,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-26T23:15:21+00:00"
+            "time": "2025-02-20T15:25:15+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8284,16 +8285,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414",
                 "shasum": ""
             },
             "require": {
@@ -8332,7 +8333,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
             },
             "funding": [
                 {
@@ -8340,41 +8341,41 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T17:47:46+00:00"
+            "time": "2025-02-12T12:17:51+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.5.0",
+            "version": "v8.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
+                "reference": "86f003c132143d5a2ab214e19933946409e0cae7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
-                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/86f003c132143d5a2ab214e19933946409e0cae7",
+                "reference": "86f003c132143d5a2ab214e19933946409e0cae7",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.16.0",
-                "nunomaduro/termwind": "^2.1.0",
+                "nunomaduro/termwind": "^2.3.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.1.5"
+                "symfony/console": "^7.2.1"
             },
             "conflict": {
-                "laravel/framework": "<11.0.0 || >=12.0.0",
-                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
+                "laravel/framework": "<11.39.1 || >=13.0.0",
+                "phpunit/phpunit": "<11.5.3 || >=12.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.9.8",
-                "laravel/framework": "^11.28.0",
-                "laravel/pint": "^1.18.1",
-                "laravel/sail": "^1.36.0",
-                "laravel/sanctum": "^4.0.3",
+                "larastan/larastan": "^2.9.12",
+                "laravel/framework": "^11.39.1",
+                "laravel/pint": "^1.20.0",
+                "laravel/sail": "^1.40.0",
+                "laravel/sanctum": "^4.0.7",
                 "laravel/tinker": "^2.10.0",
-                "orchestra/testbench-core": "^9.5.3",
-                "pestphp/pest": "^2.36.0 || ^3.4.0",
+                "orchestra/testbench-core": "^9.9.2",
+                "pestphp/pest": "^3.7.3",
                 "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
@@ -8412,6 +8413,7 @@
                 "cli",
                 "command-line",
                 "console",
+                "dev",
                 "error",
                 "handling",
                 "laravel",
@@ -8437,7 +8439,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-10-15T16:06:32+00:00"
+            "time": "2025-01-23T13:41:43+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8559,16 +8561,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.10.2",
+            "version": "5.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8"
+                "reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/72afbce7e4b421593b60d2eb7281e37a50734df8",
-                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
+                "reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
                 "shasum": ""
             },
             "require": {
@@ -8583,9 +8585,11 @@
                 "phpbench/phpbench": "^1.1",
                 "phpmyadmin/coding-standard": "^3.0",
                 "phpmyadmin/motranslator": "^4.0 || ^5.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.9.12",
-                "phpstan/phpstan-phpunit": "^1.3.3",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^1.12",
+                "phpstan/phpstan-deprecation-rules": "^1.2",
+                "phpstan/phpstan-phpunit": "^1.4",
+                "phpstan/phpstan-strict-rules": "^1.6",
                 "phpunit/phpunit": "^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.16.1",
                 "vimeo/psalm": "^4.11",
@@ -8642,20 +8646,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-12-05T15:04:09+00:00"
+            "time": "2025-02-22T20:00:59+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.1",
+            "version": "2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
+                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
                 "shasum": ""
             },
             "require": {
@@ -8700,7 +8704,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-05T16:43:48+00:00"
+            "time": "2025-02-19T15:46:42+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9027,16 +9031,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.2",
+            "version": "11.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3"
+                "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/153d0531b9f7e883c5053160cad6dd5ac28140b3",
-                "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b",
+                "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b",
                 "shasum": ""
             },
             "require": {
@@ -9046,7 +9050,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.1",
+                "myclabs/deep-copy": "^1.13.0",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
@@ -9057,7 +9061,7 @@
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.2",
-                "sebastian/comparator": "^6.2.1",
+                "sebastian/comparator": "^6.3.0",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
@@ -9108,7 +9112,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.9"
             },
             "funding": [
                 {
@@ -9124,7 +9128,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-21T05:51:08+00:00"
+            "time": "2025-02-21T06:08:50+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10054,16 +10058,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.2",
+            "version": "3.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
-                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
+                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
                 "shasum": ""
             },
             "require": {
@@ -10128,9 +10132,13 @@
                 {
                     "url": "https://opencollective.com/php_codesniffer",
                     "type": "open_collective"
+                },
+                {
+                    "url": "https://thanks.dev/phpcsstandards",
+                    "type": "thanks_dev"
                 }
             ],
-            "time": "2024-12-11T16:04:26+00:00"
+            "time": "2025-01-23T17:04:15+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10230,16 +10238,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.2.0",
+            "version": "v7.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b176e1f1f550ef44c94eb971bf92488de08f7c6b"
+                "reference": "700a880e5089280c7cf3ca1ccf9d9de6630f5d25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b176e1f1f550ef44c94eb971bf92488de08f7c6b",
-                "reference": "b176e1f1f550ef44c94eb971bf92488de08f7c6b",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/700a880e5089280c7cf3ca1ccf9d9de6630f5d25",
+                "reference": "700a880e5089280c7cf3ca1ccf9d9de6630f5d25",
                 "shasum": ""
             },
             "require": {
@@ -10277,7 +10285,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.0"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.3"
             },
             "funding": [
                 {
@@ -10293,7 +10301,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T16:15:23+00:00"
+            "time": "2025-01-27T11:08:17+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/tests/Commands/AssignSortRuleCommandTest.php b/tests/Commands/AssignSortRuleCommandTest.php
index 5b308cd7c75..934196471a7 100644
--- a/tests/Commands/AssignSortRuleCommandTest.php
+++ b/tests/Commands/AssignSortRuleCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Commands;
+namespace Tests\Commands;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Sorting\SortRule;
diff --git a/tests/Search/EntitySearchTest.php b/tests/Search/EntitySearchTest.php
index 9c76d0f7136..d3d85998615 100644
--- a/tests/Search/EntitySearchTest.php
+++ b/tests/Search/EntitySearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Search;
+namespace Tests\Search;
 
 use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
index 57cf412e1b7..64779dec632 100644
--- a/tests/Search/SearchIndexingTest.php
+++ b/tests/Search/SearchIndexingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Search;
+namespace Tests\Search;
 
 use Tests\TestCase;
 
diff --git a/tests/Search/SearchOptionsTest.php b/tests/Search/SearchOptionsTest.php
index 39c20c19591..2ebf273dd55 100644
--- a/tests/Search/SearchOptionsTest.php
+++ b/tests/Search/SearchOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Search;
+namespace Tests\Search;
 
 use BookStack\Search\Options\ExactSearchOption;
 use BookStack\Search\Options\FilterSearchOption;
diff --git a/tests/Search/SiblingSearchTest.php b/tests/Search/SiblingSearchTest.php
index 63865af8a21..e626a8843c5 100644
--- a/tests/Search/SiblingSearchTest.php
+++ b/tests/Search/SiblingSearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Search;
+namespace Tests\Search;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
diff --git a/tests/Sorting/BookSortTest.php b/tests/Sorting/BookSortTest.php
index c4217a4cc6f..4737ec231b6 100644
--- a/tests/Sorting/BookSortTest.php
+++ b/tests/Sorting/BookSortTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sorting;
+namespace Tests\Sorting;
 
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
diff --git a/tests/Sorting/MoveTest.php b/tests/Sorting/MoveTest.php
index edae1f3a3e1..606b23c680f 100644
--- a/tests/Sorting/MoveTest.php
+++ b/tests/Sorting/MoveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sorting;
+namespace Tests\Sorting;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index 0f6f43ceeb6..10c7bc17d3e 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sorting;
+namespace Tests\Sorting;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;

From 6548ea4a121adfb4e29f45378ae3642d3e1304c4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Feb 2025 11:55:09 +0000
Subject: [PATCH 482/666] JS: Upated npm deps, upgraded eslint, new eslint
 config

Upgraded eslint to 11, removed incompatible airbnb config as part of
process. ESlint config now in its own file.
---
 eslint.config.mjs                      |   64 +
 package-lock.json                      | 3289 +++++++++++++++---------
 package.json                           |  105 +-
 resources/js/components/page-editor.js |    2 +-
 4 files changed, 2146 insertions(+), 1314 deletions(-)
 create mode 100644 eslint.config.mjs

diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000000..0071e65985a
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,64 @@
+import globals from 'globals';
+import js from '@eslint/js';
+
+export default [
+    js.configs.recommended,
+    {
+        ignores: ['resources/**/*-stub.js', 'resources/**/*.ts'],
+    }, {
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+            },
+
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+        },
+
+        rules: {
+            indent: ['error', 4],
+            'arrow-parens': ['error', 'as-needed'],
+
+            'padded-blocks': ['error', {
+                blocks: 'never',
+                classes: 'always',
+            }],
+
+            'object-curly-spacing': ['error', 'never'],
+
+            'space-before-function-paren': ['error', {
+                anonymous: 'never',
+                named: 'never',
+                asyncArrow: 'always',
+            }],
+
+            'import/prefer-default-export': 'off',
+
+            'no-plusplus': ['error', {
+                allowForLoopAfterthoughts: true,
+            }],
+
+            'arrow-body-style': 'off',
+            'no-restricted-syntax': 'off',
+            'no-continue': 'off',
+            'prefer-destructuring': 'off',
+            'class-methods-use-this': 'off',
+            'no-param-reassign': 'off',
+
+            'no-console': ['warn', {
+                allow: ['error', 'warn'],
+            }],
+
+            'no-new': 'off',
+
+            'max-len': ['error', {
+                code: 110,
+                tabWidth: 4,
+                ignoreUrls: true,
+                ignoreComments: false,
+                ignoreRegExpLiterals: true,
+                ignoreStrings: true,
+                ignoreTemplateLiterals: true,
+            }],
+        },
+    }];
diff --git a/package-lock.json b/package-lock.json
index 44a735d2f0c..d00dceac226 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,19 +5,19 @@
   "packages": {
     "": {
       "dependencies": {
-        "@codemirror/commands": "^6.7.1",
+        "@codemirror/commands": "^6.8.0",
         "@codemirror/lang-css": "^6.3.1",
         "@codemirror/lang-html": "^6.4.9",
-        "@codemirror/lang-javascript": "^6.2.2",
+        "@codemirror/lang-javascript": "^6.2.3",
         "@codemirror/lang-json": "^6.0.1",
-        "@codemirror/lang-markdown": "^6.3.1",
+        "@codemirror/lang-markdown": "^6.3.2",
         "@codemirror/lang-php": "^6.0.1",
         "@codemirror/lang-xml": "^6.1.0",
-        "@codemirror/language": "^6.10.6",
-        "@codemirror/legacy-modes": "^6.4.2",
-        "@codemirror/state": "^6.5.0",
+        "@codemirror/language": "^6.10.8",
+        "@codemirror/legacy-modes": "^6.4.3",
+        "@codemirror/state": "^6.5.2",
         "@codemirror/theme-one-dark": "^6.1.2",
-        "@codemirror/view": "^6.35.2",
+        "@codemirror/view": "^6.36.3",
         "@lezer/highlight": "^1.2.1",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
@@ -30,19 +30,19 @@
         "sortablejs": "^1.15.6"
       },
       "devDependencies": {
+        "@eslint/js": "^9.21.0",
         "@lezer/generator": "^1.7.2",
         "@types/sortablejs": "^1.15.8",
         "chokidar-cli": "^3.0",
-        "esbuild": "^0.24.0",
-        "eslint": "^8.57.1",
-        "eslint-config-airbnb-base": "^15.0.0",
+        "esbuild": "^0.25.0",
+        "eslint": "^9.21.0",
         "eslint-plugin-import": "^2.31.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "livereload": "^0.9.3",
         "npm-run-all": "^4.1.5",
-        "sass": "^1.82.0",
-        "ts-jest": "^29.2.5",
+        "sass": "^1.85.0",
+        "ts-jest": "^29.2.6",
         "ts-node": "^10.9.2",
         "typescript": "5.7.*"
       }
@@ -52,6 +52,7 @@
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -61,11 +62,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -73,30 +76,32 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -112,29 +117,32 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.6",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -143,28 +151,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -174,151 +183,66 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.6"
+        "@babel/types": "^7.26.9"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -332,6 +256,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -344,6 +269,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -356,6 +282,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -368,6 +295,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -379,12 +307,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz",
-      "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -398,6 +327,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -410,6 +340,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -418,12 +349,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -437,6 +369,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -449,6 +382,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -461,6 +395,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -473,6 +408,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -485,6 +421,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -497,6 +434,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -509,6 +447,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -524,6 +463,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -535,12 +475,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz",
-      "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.8"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -550,30 +491,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -586,19 +529,20 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -608,29 +552,25 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz",
-      "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==",
+      "version": "6.18.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz",
+      "integrity": "sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.17.0",
         "@lezer/common": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
-      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.0.tgz",
+      "integrity": "sha512-q8VPEFaEP4ikSlt6ZxjB3zW72+7osfAYW9i8Zu943uqbKuz6utc1+F170hyLUCUltXORjQXRyYQNfkckzA/bPQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -656,6 +596,7 @@
       "version": "6.4.9",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
       "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -669,9 +610,10 @@
       }
     },
     "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
-      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.3.tgz",
+      "integrity": "sha512-8PR3vIWg7pSu7ur8A07pGiYHgy3hHj+mRYRCSG8q+mPIrl0F02rgpGv+DsQTHRTc30rydOsf5PZ7yjKFg2Ackw==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.6.0",
@@ -686,15 +628,16 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
       "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@lezer/json": "^1.0.0"
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.1.tgz",
-      "integrity": "sha512-y3sSPuQjBKZQbQwe3ZJKrSW6Silyl9PnrU/Mf0m2OQgIlPoSYTtOvEL7xs94SVMkb8f4x+SQFnzXPdX4Wk2lsg==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.2.tgz",
+      "integrity": "sha512-c/5MYinGbFxYl4itE9q/rgN/sMTjOr8XL5OWnC+EaRMLfCbVUmmubTJfdgpfcSS2SCaT7b+Q+xi3l6CgoE+BsA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
@@ -710,6 +653,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
       "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/lang-html": "^6.0.0",
         "@codemirror/language": "^6.0.0",
@@ -722,6 +666,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
       "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.4.0",
@@ -732,9 +677,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz",
-      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
+      "version": "6.10.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.8.tgz",
+      "integrity": "sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -746,28 +691,30 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.2.tgz",
-      "integrity": "sha512-HsvWu08gOIIk303eZQCal4H4t65O/qp1V4ul4zVa3MHK5FJ0gz3qz3O55FIkm+aQUcshUOjBx38t2hPiJwW5/g==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.3.tgz",
+      "integrity": "sha512-s1g+q4bil8Cs4O+ueIiKIhz9MQOGcRyxJglma8BYIWc/oEJLo13S3LYSWKaqhKwXGgt1GgZ66hCploHZD9Sstw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
-      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz",
+      "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.35.0",
         "crelt": "^1.0.5"
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
-      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
+      "version": "6.5.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.9.tgz",
+      "integrity": "sha512-7DdQ9aaZMMxuWB1u6IIFWWuK9NocVZwvo4nG8QjJTS6oZGvteoLSiXw3EbVZVlO08Ri2ltO89JVInMpfcJxhtg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -775,9 +722,9 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
-      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
+      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
       "license": "MIT",
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
@@ -787,6 +734,7 @@
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
       "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -795,12 +743,12 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.35.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.2.tgz",
-      "integrity": "sha512-u04R04XFCYCNaHoNRr37WUUAfnxKPwPdqV+370NiO6i85qB1J/qCD/WbbMJsyJfRWhXIJXAe2BG/oTzAggqv4A==",
+      "version": "6.36.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
+      "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
       "license": "MIT",
       "dependencies": {
-        "@codemirror/state": "^6.4.0",
+        "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -810,6 +758,7 @@
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
       "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -822,15 +771,16 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
       "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
-      "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
+      "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
       "cpu": [
         "ppc64"
       ],
@@ -845,9 +795,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
-      "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
+      "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
       "cpu": [
         "arm"
       ],
@@ -862,9 +812,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
-      "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
+      "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
       "cpu": [
         "arm64"
       ],
@@ -879,9 +829,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
-      "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
+      "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
       "cpu": [
         "x64"
       ],
@@ -896,9 +846,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
-      "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
+      "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
       "cpu": [
         "arm64"
       ],
@@ -913,9 +863,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
-      "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
+      "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
       "cpu": [
         "x64"
       ],
@@ -930,9 +880,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
-      "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
       "cpu": [
         "arm64"
       ],
@@ -947,9 +897,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
-      "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
+      "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
       "cpu": [
         "x64"
       ],
@@ -964,9 +914,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
-      "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
+      "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
       "cpu": [
         "arm"
       ],
@@ -981,9 +931,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
-      "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
+      "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
       "cpu": [
         "arm64"
       ],
@@ -998,9 +948,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
-      "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
+      "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
       "cpu": [
         "ia32"
       ],
@@ -1015,9 +965,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
-      "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
+      "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
       "cpu": [
         "loong64"
       ],
@@ -1032,9 +982,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
-      "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
+      "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
       "cpu": [
         "mips64el"
       ],
@@ -1049,9 +999,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
-      "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
+      "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
       "cpu": [
         "ppc64"
       ],
@@ -1066,9 +1016,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
-      "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
+      "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
       "cpu": [
         "riscv64"
       ],
@@ -1083,9 +1033,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
-      "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
+      "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
       "cpu": [
         "s390x"
       ],
@@ -1100,9 +1050,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
-      "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
+      "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
       "cpu": [
         "x64"
       ],
@@ -1116,10 +1066,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
-      "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
       "cpu": [
         "x64"
       ],
@@ -1134,9 +1101,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
-      "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
       "cpu": [
         "arm64"
       ],
@@ -1151,9 +1118,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
-      "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
       "cpu": [
         "x64"
       ],
@@ -1168,9 +1135,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
-      "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
+      "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
       "cpu": [
         "x64"
       ],
@@ -1185,9 +1152,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
-      "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
+      "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
       "cpu": [
         "arm64"
       ],
@@ -1202,9 +1169,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
-      "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
+      "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
       "cpu": [
         "ia32"
       ],
@@ -1219,9 +1186,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
-      "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
+      "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
       "cpu": [
         "x64"
       ],
@@ -1236,20 +1203,37 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@eslint-community/regexpp": {
       "version": "4.12.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
@@ -1260,17 +1244,45 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -1278,36 +1290,82 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
-      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "version": "9.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.21.0.tgz",
+      "integrity": "sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
-      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.3",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@eslint/core": "^0.12.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -1315,6 +1373,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -1323,19 +1382,26 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -1352,6 +1418,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -1361,6 +1428,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -1374,6 +1442,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -1387,6 +1456,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -1399,6 +1469,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -1414,6 +1485,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -1426,6 +1498,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1435,6 +1508,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1444,6 +1518,7 @@
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -1461,6 +1536,7 @@
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -1508,6 +1584,7 @@
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -1523,6 +1600,7 @@
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -1535,6 +1613,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -1547,6 +1626,7 @@
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -1564,6 +1644,7 @@
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -1579,6 +1660,7 @@
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -1621,6 +1703,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -1633,6 +1716,7 @@
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -1647,6 +1731,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -1662,6 +1747,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -1677,6 +1763,7 @@
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -1702,6 +1789,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -1715,10 +1803,11 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1733,6 +1822,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -1742,6 +1832,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -1750,27 +1841,30 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@lezer/common": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.9.tgz",
-      "integrity": "sha512-TYwgljcDv+YrV0MZFFvYFQHCfGgbPMR6nuqLabBdmZoFH3EP1gvw8t0vae326Ne3PszQkbXfVBjCnf3ZVCr0bA==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.10.tgz",
+      "integrity": "sha512-V5/89eDapjeAkWPBpWEfQjZ1Hag3aYUUJOL8213X0dFRuXJ4BXa5NKl9USzOnaLod4AOpmVCkduir2oKwZYZtg==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -1795,6 +1889,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
       "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -1803,6 +1898,7 @@
       "version": "1.3.10",
       "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
       "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -1810,9 +1906,10 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.18",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.18.tgz",
-      "integrity": "sha512-Y8BeHOt4LtcxJgXwadtfSeWPrh0XzklcCHnCVT+vOsxqH4gWmunP2ykX+VVOlM/dusyVyiNfG3lv0f10UK+mgA==",
+      "version": "1.4.21",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.21.tgz",
+      "integrity": "sha512-lL+1fcuxWYPURMM/oFZLEDm0XuLN128QPV+VuGtKpeaOGdcl9F2LYC3nh1S9LkPqx9M0mndZFdXCipNAZpzIkQ==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -1820,9 +1917,10 @@
       }
     },
     "node_modules/@lezer/json": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
-      "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.3.tgz",
+      "integrity": "sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -1833,23 +1931,27 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
       "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
-      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.4.1.tgz",
+      "integrity": "sha512-Za5okfyWoNaX6sSZ2dm94XegaFXbkQ9UjKJ8hAoZX88XDpbu6DoR63IuSl+dqj1VkVQBQGsdr0JnTcMsogQDdw==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0",
-        "@lezer/highlight": "^1.0.0"
+        "@lezer/highlight": "^1.0.0",
+        "@marijn/buildtool": "^0.1.6"
       }
     },
     "node_modules/@lezer/php": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.2.tgz",
       "integrity": "sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -1857,63 +1959,40 @@
       }
     },
     "node_modules/@lezer/xml": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.5.tgz",
-      "integrity": "sha512-VFouqOzmUWfIg+tfmpcdV33ewtK+NSwd4ngSe1aG7HFb4BN0ExyY1b8msp+ndFrnlG4V4iC8yXacjFtrwERnaw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.6.tgz",
+      "integrity": "sha512-CdDwirL0OEaStFue/66ZmFSeppuL6Dwjlk8qk153mSQwiSH/Dlri4GNymrNWnUmPl2Um7QfV1FO9KFUyX3Twww==",
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0"
       }
     },
-    "node_modules/@marijn/find-cluster-break": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.0.tgz",
-      "integrity": "sha512-0YSzy7M9mBiK+h1m33rD8vZOfaO8leG6CY3+Q+1Lig86snkc8OAHQVAdndmnXMWJlVIH6S7fSZVVcjLcq6OH1A==",
-      "license": "MIT"
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
+    "node_modules/@marijn/buildtool": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@marijn/buildtool/-/buildtool-0.1.6.tgz",
+      "integrity": "sha512-rcA2wljsM24MFAwx2U5vSBrt7IdIaPh4WPRfJPS8PuCUlbuQ8Pmky4c/ec00v3YFu90rZSbkVLnPuCeb/mUEng==",
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+        "@types/mocha": "^9.1.1",
+        "acorn": "^8.10.0",
+        "acorn-walk": "^8.2.0",
+        "rollup": "^3.28.0",
+        "rollup-plugin-dts": "^5.3.1",
+        "typescript": "^5.1.6"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
-      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1932,25 +2011,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.0",
-        "@parcel/watcher-darwin-arm64": "2.5.0",
-        "@parcel/watcher-darwin-x64": "2.5.0",
-        "@parcel/watcher-freebsd-x64": "2.5.0",
-        "@parcel/watcher-linux-arm-glibc": "2.5.0",
-        "@parcel/watcher-linux-arm-musl": "2.5.0",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
-        "@parcel/watcher-linux-arm64-musl": "2.5.0",
-        "@parcel/watcher-linux-x64-glibc": "2.5.0",
-        "@parcel/watcher-linux-x64-musl": "2.5.0",
-        "@parcel/watcher-win32-arm64": "2.5.0",
-        "@parcel/watcher-win32-ia32": "2.5.0",
-        "@parcel/watcher-win32-x64": "2.5.0"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
-      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -1969,9 +2048,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
-      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -1990,9 +2069,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
-      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -2011,9 +2090,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
-      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -2032,9 +2111,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
-      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -2053,9 +2132,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
-      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -2074,9 +2153,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
-      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -2095,9 +2174,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
-      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -2116,9 +2195,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
-      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -2137,9 +2216,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
-      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -2158,9 +2237,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
-      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -2179,9 +2258,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
-      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -2200,9 +2279,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
-      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -2224,18 +2303,21 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
       "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -2245,6 +2327,7 @@
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -2252,12 +2335,14 @@
     "node_modules/@ssddanbrown/codemirror-lang-smarty": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-smarty/-/codemirror-lang-smarty-1.0.0.tgz",
-      "integrity": "sha512-F0ut1kmdbT3eORk3xVIKfQsGCZiQdh+6sLayBa0+FTex2gyIQlVQZRRA7bPSlchI3uZtWwNnqGNz5O/QLWRlFg=="
+      "integrity": "sha512-F0ut1kmdbT3eORk3xVIKfQsGCZiQdh+6sLayBa0+FTex2gyIQlVQZRRA7bPSlchI3uZtWwNnqGNz5O/QLWRlFg==",
+      "license": "MIT"
     },
     "node_modules/@ssddanbrown/codemirror-lang-twig": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@ssddanbrown/codemirror-lang-twig/-/codemirror-lang-twig-1.0.0.tgz",
       "integrity": "sha512-7WIMIh8Ssc54TooGCY57WU2rKEqZZrcV2tZSVRPtd0gKYsrDEKCSLWpQjUWEx7bdgh3NKHUjq1O4ugIzI/+dwQ==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@lezer/highlight": "^1.0.0",
@@ -2269,6 +2354,7 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -2277,31 +2363,36 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
       "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
       "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
       "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
       "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -2315,6 +2406,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -2324,6 +2416,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
@@ -2334,15 +2427,24 @@
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
       "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -2350,12 +2452,14 @@
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -2364,6 +2468,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -2383,24 +2488,40 @@
       "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
       "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/tough-cookie": "*",
         "parse5": "^7.0.0"
       }
     },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mocha": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
+      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz",
-      "integrity": "sha512-qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA==",
+      "version": "22.13.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
+      "integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==",
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/sortablejs": {
@@ -2413,18 +2534,21 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "license": "MIT"
     },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
       "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/yargs": {
       "version": "17.0.33",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
       "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -2432,27 +2556,21 @@
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz",
-      "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==",
-      "dev": true,
-      "license": "ISC"
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "license": "MIT"
     },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "deprecated": "Use your platform's native atob() and btoa() methods instead",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/acorn": {
       "version": "8.14.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -2466,6 +2584,7 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
       "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.1.0",
         "acorn-walk": "^8.0.2"
@@ -2485,7 +2604,7 @@
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
       "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
       },
@@ -2498,6 +2617,7 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -2527,6 +2647,7 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -2537,23 +2658,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2562,6 +2672,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -2577,6 +2688,7 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -2589,21 +2701,24 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2617,6 +2732,7 @@
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
       "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -2637,6 +2753,7 @@
       "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
       "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -2653,15 +2770,16 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2671,15 +2789,16 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2689,19 +2808,19 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2714,19 +2833,32 @@
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -2742,6 +2874,7 @@
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -2763,6 +2896,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -2779,6 +2913,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -2795,6 +2930,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -2810,6 +2946,7 @@
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
       "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -2836,6 +2973,7 @@
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -2851,13 +2989,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -2870,6 +3010,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2879,6 +3020,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -2887,9 +3029,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
       "funding": [
         {
@@ -2905,11 +3047,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2923,6 +3066,7 @@
       "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
       "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-json-stable-stringify": "2.x"
       },
@@ -2935,6 +3079,7 @@
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -2943,19 +3088,51 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2969,6 +3146,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2978,14 +3156,15 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001664",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+      "version": "1.0.30001700",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "dev": true,
       "funding": [
         {
@@ -3000,12 +3179,14 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3022,6 +3203,7 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -3031,6 +3213,7 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -3055,6 +3238,7 @@
       "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-3.0.0.tgz",
       "integrity": "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": "^3.5.2",
         "lodash.debounce": "^4.0.8",
@@ -3078,21 +3262,24 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
-      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
-      "dev": true
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
       "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^3.1.0",
         "strip-ansi": "^5.2.0",
@@ -3104,6 +3291,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
       "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3113,6 +3301,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -3125,6 +3314,7 @@
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -3134,6 +3324,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/commands": "^6.0.0",
@@ -3148,12 +3339,14 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -3164,13 +3357,15 @@
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -3182,25 +3377,22 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/create-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -3221,12 +3413,14 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/crelt": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
@@ -3247,13 +3441,15 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
       "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssom": "~0.3.6"
       },
@@ -3265,13 +3461,15 @@
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
       "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "whatwg-mimetype": "^3.0.0",
@@ -3282,14 +3480,15 @@
       }
     },
     "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3299,29 +3498,31 @@
       }
     },
     "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -3333,10 +3534,11 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -3354,21 +3556,24 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/dedent": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -3382,13 +3587,15 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3398,6 +3605,7 @@
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -3415,6 +3623,7 @@
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -3432,6 +3641,7 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -3455,6 +3665,7 @@
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3464,6 +3675,7 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -3472,21 +3684,22 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/domexception": {
@@ -3495,6 +3708,7 @@
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "deprecated": "Use your platform's native DOMException instead",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -3502,11 +3716,27 @@
         "node": ">=12"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -3518,16 +3748,18 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.29",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
-      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
-      "dev": true
+      "version": "1.5.103",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
+      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -3539,12 +3771,14 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -3557,62 +3791,69 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3622,13 +3863,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -3638,15 +3877,17 @@
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -3655,37 +3896,44 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3695,9 +3943,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
-      "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
+      "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3708,30 +3956,31 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.24.0",
-        "@esbuild/android-arm": "0.24.0",
-        "@esbuild/android-arm64": "0.24.0",
-        "@esbuild/android-x64": "0.24.0",
-        "@esbuild/darwin-arm64": "0.24.0",
-        "@esbuild/darwin-x64": "0.24.0",
-        "@esbuild/freebsd-arm64": "0.24.0",
-        "@esbuild/freebsd-x64": "0.24.0",
-        "@esbuild/linux-arm": "0.24.0",
-        "@esbuild/linux-arm64": "0.24.0",
-        "@esbuild/linux-ia32": "0.24.0",
-        "@esbuild/linux-loong64": "0.24.0",
-        "@esbuild/linux-mips64el": "0.24.0",
-        "@esbuild/linux-ppc64": "0.24.0",
-        "@esbuild/linux-riscv64": "0.24.0",
-        "@esbuild/linux-s390x": "0.24.0",
-        "@esbuild/linux-x64": "0.24.0",
-        "@esbuild/netbsd-x64": "0.24.0",
-        "@esbuild/openbsd-arm64": "0.24.0",
-        "@esbuild/openbsd-x64": "0.24.0",
-        "@esbuild/sunos-x64": "0.24.0",
-        "@esbuild/win32-arm64": "0.24.0",
-        "@esbuild/win32-ia32": "0.24.0",
-        "@esbuild/win32-x64": "0.24.0"
+        "@esbuild/aix-ppc64": "0.25.0",
+        "@esbuild/android-arm": "0.25.0",
+        "@esbuild/android-arm64": "0.25.0",
+        "@esbuild/android-x64": "0.25.0",
+        "@esbuild/darwin-arm64": "0.25.0",
+        "@esbuild/darwin-x64": "0.25.0",
+        "@esbuild/freebsd-arm64": "0.25.0",
+        "@esbuild/freebsd-x64": "0.25.0",
+        "@esbuild/linux-arm": "0.25.0",
+        "@esbuild/linux-arm64": "0.25.0",
+        "@esbuild/linux-ia32": "0.25.0",
+        "@esbuild/linux-loong64": "0.25.0",
+        "@esbuild/linux-mips64el": "0.25.0",
+        "@esbuild/linux-ppc64": "0.25.0",
+        "@esbuild/linux-riscv64": "0.25.0",
+        "@esbuild/linux-s390x": "0.25.0",
+        "@esbuild/linux-x64": "0.25.0",
+        "@esbuild/netbsd-arm64": "0.25.0",
+        "@esbuild/netbsd-x64": "0.25.0",
+        "@esbuild/openbsd-arm64": "0.25.0",
+        "@esbuild/openbsd-x64": "0.25.0",
+        "@esbuild/sunos-x64": "0.25.0",
+        "@esbuild/win32-arm64": "0.25.0",
+        "@esbuild/win32-ia32": "0.25.0",
+        "@esbuild/win32-x64": "0.25.0"
       }
     },
     "node_modules/escalade": {
@@ -3739,6 +3988,7 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3748,6 +3998,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3760,6 +4011,7 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -3777,79 +4029,63 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
-      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
-      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "version": "9.21.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
+      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.1",
-        "@humanwhocodes/config-array": "^0.13.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.21.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "url": "https://eslint.org/donate"
       },
       "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-import-resolver-node": {
@@ -3857,6 +4093,7 @@
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
       "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -3868,6 +4105,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -3877,6 +4115,7 @@
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
       "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -3894,6 +4133,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -3937,26 +4177,15 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3964,19 +4193,20 @@
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -3987,6 +4217,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -3995,18 +4226,18 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -4017,6 +4248,7 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -4030,6 +4262,7 @@
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
       "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -4055,6 +4288,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -4064,6 +4298,7 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4073,6 +4308,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -4104,6 +4340,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "license": "MIT",
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -4126,44 +4363,37 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+      "license": "MIT"
     },
     "node_modules/fb-watchman": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/filelist": {
@@ -4171,6 +4401,7 @@
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
       "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.0.1"
       }
@@ -4180,6 +4411,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -4189,6 +4421,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -4200,6 +4433,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -4212,6 +4446,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -4224,44 +4459,52 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -4272,14 +4515,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4293,20 +4537,24 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4320,6 +4568,7 @@
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4329,6 +4578,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4338,21 +4588,28 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4366,15 +4623,31 @@
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -4383,14 +4656,15 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4405,6 +4679,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -4425,6 +4700,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -4433,16 +4709,13 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -4453,6 +4726,7 @@
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
       "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.2.1",
         "gopd": "^1.0.1"
@@ -4465,12 +4739,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4479,20 +4754,18 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true,
-      "license": "MIT"
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4501,6 +4774,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4510,6 +4784,7 @@
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -4518,10 +4793,14 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -4530,10 +4809,11 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4546,6 +4826,7 @@
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -4561,6 +4842,7 @@
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -4572,13 +4854,15 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -4590,13 +4874,15 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -4611,6 +4897,7 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -4624,6 +4911,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
@@ -4633,6 +4921,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -4643,7 +4932,8 @@
     "node_modules/idb-keyval": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
-      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
+      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==",
+      "license": "Apache-2.0"
     },
     "node_modules/ignore": {
       "version": "5.3.2",
@@ -4663,9 +4953,9 @@
       "license": "MIT"
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4684,6 +4974,7 @@
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
       "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -4703,6 +4994,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -4713,6 +5005,7 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -4722,30 +5015,34 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4758,15 +5055,40 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4777,6 +5099,7 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -4785,13 +5108,14 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4805,6 +5129,7 @@
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4813,10 +5138,11 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -4828,11 +5154,14 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -4843,12 +5172,14 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4862,15 +5193,33 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -4880,15 +5229,36 @@
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -4896,11 +5266,12 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-negative-zero": {
+    "node_modules/is-map": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4912,17 +5283,20 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4931,30 +5305,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4963,13 +5331,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4983,6 +5365,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -4991,12 +5374,14 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5006,12 +5391,15 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5021,13 +5409,27 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -5036,12 +5438,33 @@
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5051,19 +5474,22 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -5073,6 +5499,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -5085,10 +5512,11 @@
       }
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -5101,6 +5529,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -5115,6 +5544,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -5129,6 +5559,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -5142,6 +5573,7 @@
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
       "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
@@ -5160,6 +5592,7 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -5186,6 +5619,7 @@
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -5200,6 +5634,7 @@
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -5231,6 +5666,7 @@
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -5264,6 +5700,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -5277,13 +5714,15 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5293,6 +5732,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -5307,6 +5747,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -5324,6 +5765,7 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -5333,6 +5775,7 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -5351,6 +5794,7 @@
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -5395,6 +5839,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -5410,6 +5855,7 @@
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -5422,6 +5868,7 @@
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -5438,6 +5885,7 @@
       "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
       "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -5465,6 +5913,7 @@
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -5481,6 +5930,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
       "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -5490,6 +5940,7 @@
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -5515,6 +5966,7 @@
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -5527,6 +5979,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -5541,6 +5994,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -5561,6 +6015,7 @@
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -5575,6 +6030,7 @@
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -5592,6 +6048,7 @@
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -5601,6 +6058,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -5621,6 +6079,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -5634,6 +6093,7 @@
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -5666,6 +6126,7 @@
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -5699,6 +6160,7 @@
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -5726,10 +6188,11 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -5741,6 +6204,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -5758,6 +6222,7 @@
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -5775,6 +6240,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5787,6 +6253,7 @@
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -5806,6 +6273,7 @@
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -5821,6 +6289,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5834,7 +6303,8 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -5854,6 +6324,7 @@
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
       "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "acorn": "^8.8.1",
@@ -5895,15 +6366,16 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -5917,13 +6389,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -5936,13 +6410,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -5965,6 +6441,7 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5974,6 +6451,7 @@
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5983,6 +6461,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -5995,12 +6474,14 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/linkify-it": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
       "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "license": "MIT",
       "dependencies": {
         "uc.micro": "^2.0.0"
       }
@@ -6010,6 +6491,7 @@
       "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz",
       "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": "^3.5.0",
         "livereload-js": "^3.3.1",
@@ -6027,13 +6509,15 @@
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.4.1.tgz",
       "integrity": "sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/livereload/node_modules/ws": {
       "version": "7.5.10",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -6055,6 +6539,7 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
       "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -6070,6 +6555,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -6083,6 +6569,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6092,6 +6579,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -6106,40 +6594,55 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.throttle": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
       "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -6151,10 +6654,11 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6166,13 +6670,15 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -6181,6 +6687,7 @@
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
       "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "^4.4.0",
@@ -6196,12 +6703,24 @@
     "node_modules/markdown-it-task-lists": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz",
-      "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="
+      "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==",
+      "license": "ISC"
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/mdurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "license": "MIT"
     },
     "node_modules/memorystream": {
       "version": "0.3.1",
@@ -6216,12 +6735,14 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -6235,6 +6756,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6244,6 +6766,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -6256,6 +6779,7 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6265,6 +6789,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -6277,6 +6802,7 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6285,19 +6811,22 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-addon-api": {
       "version": "7.1.1",
@@ -6311,19 +6840,22 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -6336,6 +6868,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -6345,6 +6878,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6354,6 +6888,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
       "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "chalk": "^2.4.1",
@@ -6379,6 +6914,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -6391,6 +6927,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -6405,6 +6942,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -6413,7 +6951,8 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/npm-run-all/node_modules/cross-spawn": {
       "version": "6.0.6",
@@ -6437,6 +6976,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -6446,6 +6986,7 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6455,6 +6996,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6464,6 +7006,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -6473,6 +7016,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^1.0.0"
       },
@@ -6485,6 +7029,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6494,6 +7039,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -6506,6 +7052,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -6518,6 +7065,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -6526,16 +7074,18 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.12",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
-      "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
-      "dev": true
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6548,19 +7098,23 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -6570,25 +7124,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/object.fromentries": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
       "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -6607,6 +7148,7 @@
       "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
       "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -6617,12 +7159,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
@@ -6638,6 +7182,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -6647,6 +7192,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -6662,6 +7208,7 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -6678,13 +7225,33 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz",
       "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -6700,6 +7267,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -6715,6 +7283,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6737,6 +7306,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -6751,12 +7321,13 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -6767,6 +7338,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6776,6 +7348,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6785,6 +7358,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6793,13 +7367,15 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^3.0.0"
       },
@@ -6808,14 +7384,16 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -6828,6 +7406,7 @@
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
       "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -6840,6 +7419,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
       "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6849,6 +7429,7 @@
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -6858,6 +7439,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -6870,6 +7452,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -6883,6 +7466,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -6895,6 +7479,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -6910,6 +7495,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -6918,10 +7504,11 @@
       }
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -6931,6 +7518,7 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -6939,6 +7527,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -6952,6 +7541,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -6964,6 +7554,7 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -6973,16 +7564,24 @@
       }
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
     },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6991,6 +7590,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
       "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7009,45 +7609,28 @@
           "type": "opencollective",
           "url": "https://opencollective.com/fast-check"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "license": "MIT"
     },
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
     },
     "node_modules/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
       "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
@@ -7062,6 +7645,7 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -7069,16 +7653,42 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7092,6 +7702,7 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7100,27 +7711,33 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7130,6 +7747,7 @@
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -7142,6 +7760,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7157,93 +7776,100 @@
       }
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
+    "node_modules/rollup": {
+      "version": "3.29.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
+      "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
       "license": "MIT",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
       "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/rollup-plugin-dts": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-5.3.1.tgz",
+      "integrity": "sha512-gusMi+Z4gY/JaEQeXnB0RUdU82h1kF0WYzCWgVmV4p3hWXqelaKuCvcJawfeg+EKn2T1Ie+YWF2OiN1/L8bTVg==",
+      "license": "LGPL-3.0",
       "dependencies": {
-        "glob": "^7.1.3"
+        "magic-string": "^0.30.2"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">=v14.21.3"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/Swatinem"
+      },
+      "optionalDependencies": {
+        "@babel/code-frame": "^7.22.5"
+      },
+      "peerDependencies": {
+        "rollup": "^3.0",
+        "typescript": "^4.1 || ^5.0"
       }
     },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+    "node_modules/safe-array-concat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "license": "MIT",
       "dependencies": {
-        "queue-microtask": "^1.2.2"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "es-errors": "^1.3.0",
         "isarray": "^2.0.5"
       },
       "engines": {
-        "node": ">=0.4"
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7256,12 +7882,13 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.82.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.82.0.tgz",
-      "integrity": "sha512-j4GMCTa8elGyN9A7x7bEglx0VgSpNUG4W4wNedQ33wSMdnkqQCT8HTwOaVSV4e6yQovcu/3Oc4coJP/l0xhL2Q==",
+      "version": "1.85.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
+      "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7280,10 +7907,11 @@
       }
     },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -7295,12 +7923,13 @@
       }
     },
     "node_modules/sass/node_modules/readdirp": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
-      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 14.18.0"
       },
       "funding": {
         "type": "individual",
@@ -7312,6 +7941,7 @@
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
       "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -7324,6 +7954,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -7332,13 +7963,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -7356,6 +7989,7 @@
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -7366,11 +8000,27 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -7383,29 +8033,92 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7418,18 +8131,21 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7438,6 +8154,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.2.tgz",
       "integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=12.17.0"
       }
@@ -7453,6 +8170,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7462,6 +8180,7 @@
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7471,6 +8190,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -7481,6 +8201,7 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -7490,34 +8211,39 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
       "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "dev": true
+      "dev": true,
+      "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.20",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
-      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
-      "dev": true
+      "version": "3.0.21",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "dev": true,
+      "license": "CC0-1.0"
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -7529,6 +8255,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7538,6 +8265,7 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -7551,6 +8279,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
@@ -7565,6 +8294,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
       "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7574,6 +8304,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -7586,6 +8317,7 @@
       "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
       "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -7600,15 +8332,19 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7618,15 +8354,20 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -7636,6 +8377,7 @@
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -7653,6 +8395,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -7665,6 +8408,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7674,6 +8418,7 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7683,6 +8428,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -7693,12 +8439,14 @@
     "node_modules/style-mod": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "license": "MIT"
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7711,6 +8459,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7722,13 +8471,15 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -7738,32 +8489,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -7776,6 +8513,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
       "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -7791,6 +8529,7 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
       "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.1"
       },
@@ -7799,10 +8538,11 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.2.5",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
-      "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+      "version": "29.2.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.6.tgz",
+      "integrity": "sha512-yTNZVZqc8lSixm+QGVFcPe6+yj7+TWZwIesuOWvfcn4B9bz5x4NDzVCQQjOs7Hfouu36aEqfEbo9Qpo+gq8dDg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "ejs": "^3.1.10",
@@ -7811,7 +8551,7 @@
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.6.3",
+        "semver": "^7.7.1",
         "yargs-parser": "^21.1.1"
       },
       "bin": {
@@ -7847,10 +8587,11 @@
       }
     },
     "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -7863,6 +8604,7 @@
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -7906,6 +8648,7 @@
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
       "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -7918,6 +8661,7 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
       "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -7930,6 +8674,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -7939,6 +8684,7 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -7951,14 +8697,15 @@
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -7969,30 +8716,32 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8002,17 +8751,19 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8022,17 +8773,18 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8042,10 +8794,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
-      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
-      "dev": true,
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -8058,41 +8809,48 @@
     "node_modules/uc.micro": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
-      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
       "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
       "dev": true,
       "funding": [
         {
@@ -8108,9 +8866,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "escalade": "^3.2.0",
-        "picocolors": "^1.1.0"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -8134,6 +8893,7 @@
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -8143,13 +8903,15 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -8164,6 +8926,7 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -8172,13 +8935,15 @@
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "license": "MIT"
     },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
       "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^4.0.0"
       },
@@ -8191,6 +8956,7 @@
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -8200,6 +8966,7 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -8209,6 +8976,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -8221,6 +8989,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
       "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
@@ -8230,6 +8999,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
       "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tr46": "^3.0.0",
         "webidl-conversions": "^7.0.0"
@@ -8243,6 +9013,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -8254,16 +9025,67 @@
       }
     },
     "node_modules/which-boxed-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8273,18 +9095,21 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -8299,6 +9124,7 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8308,6 +9134,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
@@ -8322,6 +9149,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
       "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8331,6 +9159,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -8343,6 +9172,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -8351,13 +9181,15 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^4.1.0"
       },
@@ -8369,13 +9201,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -8385,10 +9219,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -8410,6 +9245,7 @@
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
       "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12"
       }
@@ -8418,25 +9254,29 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
       "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^5.0.0",
         "find-up": "^3.0.0",
@@ -8455,6 +9295,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -8464,6 +9305,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -8476,6 +9318,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -8489,6 +9332,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -8504,6 +9348,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -8516,6 +9361,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -8525,6 +9371,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
       "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -8535,6 +9382,7 @@
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8544,6 +9392,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/package.json b/package.json
index 4571ea77d76..5d94537d140 100644
--- a/package.json
+++ b/package.json
@@ -19,36 +19,36 @@
     "test": "jest"
   },
   "devDependencies": {
+    "@eslint/js": "^9.21.0",
     "@lezer/generator": "^1.7.2",
     "@types/sortablejs": "^1.15.8",
     "chokidar-cli": "^3.0",
-    "esbuild": "^0.24.0",
-    "eslint": "^8.57.1",
-    "eslint-config-airbnb-base": "^15.0.0",
+    "esbuild": "^0.25.0",
+    "eslint": "^9.21.0",
     "eslint-plugin-import": "^2.31.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "livereload": "^0.9.3",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.82.0",
-    "ts-jest": "^29.2.5",
+    "sass": "^1.85.0",
+    "ts-jest": "^29.2.6",
     "ts-node": "^10.9.2",
     "typescript": "5.7.*"
   },
   "dependencies": {
-    "@codemirror/commands": "^6.7.1",
+    "@codemirror/commands": "^6.8.0",
     "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.9",
-    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-javascript": "^6.2.3",
     "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/lang-markdown": "^6.3.1",
+    "@codemirror/lang-markdown": "^6.3.2",
     "@codemirror/lang-php": "^6.0.1",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/language": "^6.10.6",
-    "@codemirror/legacy-modes": "^6.4.2",
-    "@codemirror/state": "^6.5.0",
+    "@codemirror/language": "^6.10.8",
+    "@codemirror/legacy-modes": "^6.4.3",
+    "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.35.2",
+    "@codemirror/view": "^6.36.3",
     "@lezer/highlight": "^1.2.1",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
@@ -59,86 +59,5 @@
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.6.2",
     "sortablejs": "^1.15.6"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "browser": true,
-      "es2021": true
-    },
-    "extends": "airbnb-base",
-    "ignorePatterns": [
-      "resources/**/*-stub.js",
-      "resources/**/*.ts"
-    ],
-    "overrides": [],
-    "parserOptions": {
-      "ecmaVersion": "latest",
-      "sourceType": "module"
-    },
-    "rules": {
-      "indent": [
-        "error",
-        4
-      ],
-      "arrow-parens": [
-        "error",
-        "as-needed"
-      ],
-      "padded-blocks": [
-        "error",
-        {
-          "blocks": "never",
-          "classes": "always"
-        }
-      ],
-      "object-curly-spacing": [
-        "error",
-        "never"
-      ],
-      "space-before-function-paren": [
-        "error",
-        {
-          "anonymous": "never",
-          "named": "never",
-          "asyncArrow": "always"
-        }
-      ],
-      "import/prefer-default-export": "off",
-      "no-plusplus": [
-        "error",
-        {
-          "allowForLoopAfterthoughts": true
-        }
-      ],
-      "arrow-body-style": "off",
-      "no-restricted-syntax": "off",
-      "no-continue": "off",
-      "prefer-destructuring": "off",
-      "class-methods-use-this": "off",
-      "no-param-reassign": "off",
-      "no-console": [
-        "warn",
-        {
-          "allow": [
-            "error",
-            "warn"
-          ]
-        }
-      ],
-      "no-new": "off",
-      "max-len": [
-        "error",
-        {
-          "code": 110,
-          "tabWidth": 4,
-          "ignoreUrls": true,
-          "ignoreComments": false,
-          "ignoreRegExpLiterals": true,
-          "ignoreStrings": true,
-          "ignoreTemplateLiterals": true
-        }
-      ]
-    }
   }
 }
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 7ffceb0f904..64cd601a920 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -138,7 +138,7 @@ export class PageEditor extends Component {
 
             didSave = true;
             this.autoSave.pendingChange = false;
-        } catch (err) {
+        } catch {
             // Save the editor content in LocalStorage as a last resort, just in case.
             try {
                 const saveKey = `draft-save-fail-${(new Date()).toISOString()}`;

From d7ccb3ce6a559a62a9408765692c5cc514890b14 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 23 Feb 2025 14:41:26 +0000
Subject: [PATCH 483/666] Sorting: Updated text for sort rules

Removes 'Set' wording and notes application to books on change.
---
 lang/en/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/settings.php b/lang/en/settings.php
index f96057cf55d..82a4ade5df5 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -90,7 +90,7 @@
     'sort_rule_details' => 'Sort Rule Details',
     'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
     'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed in this set by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom.',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
     'sort_rule_available_operations' => 'Available Operations',
     'sort_rule_available_operations_empty' => 'No operations remaining',
     'sort_rule_configured_operations' => 'Configured Operations',

From dca14feaaad686bfbe9acb59f5eb11b815501e5b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 24 Feb 2025 16:58:59 +0000
Subject: [PATCH 484/666] Sorting: Fixes during testing of sort rules

- Fixed name numeric sorting not working as expected due to bad
  comparison.
- Added name numeric desc operation option.
- Added test to ensure each operating has a comparison function.
---
 app/Sorting/SortRuleOperation.php           |  1 +
 app/Sorting/SortSetOperationComparisons.php | 10 ++++++----
 tests/Sorting/SortRuleTest.php              | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Sorting/SortRuleOperation.php b/app/Sorting/SortRuleOperation.php
index 0d8ff239f8d..27bb9e3c0e2 100644
--- a/app/Sorting/SortRuleOperation.php
+++ b/app/Sorting/SortRuleOperation.php
@@ -10,6 +10,7 @@ enum SortRuleOperation: string
     case NameAsc = 'name_asc';
     case NameDesc = 'name_desc';
     case NameNumericAsc = 'name_numeric_asc';
+    case NameNumericDesc = 'name_numeric_desc';
     case CreatedDateAsc = 'created_date_asc';
     case CreatedDateDesc = 'created_date_desc';
     case UpdateDateAsc = 'updated_date_asc';
diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index e1c3e625f9f..0d8e582648e 100644
--- a/app/Sorting/SortSetOperationComparisons.php
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -8,7 +8,6 @@
 /**
  * Sort comparison function for each of the possible SortSetOperation values.
  * Method names should be camelCase names for the SortSetOperation enum value.
- * TODO - Test to cover each SortSetOperation enum value is covered.
  */
 class SortSetOperationComparisons
 {
@@ -27,9 +26,12 @@ public static function nameNumericAsc(Entity $a, Entity $b): int
         $numRegex = '/^\d+(\.\d+)?/';
         $aMatches = [];
         $bMatches = [];
-        preg_match($numRegex, $a, $aMatches);
-        preg_match($numRegex, $b, $bMatches);
-        return ($aMatches[0] ?? 0) <=> ($bMatches[0] ?? 0);
+        preg_match($numRegex, $a->name, $aMatches);
+        preg_match($numRegex, $b->name, $bMatches);
+        $aVal = floatval(($aMatches[0] ?? 0));
+        $bVal = floatval(($bMatches[0] ?? 0));
+
+        return $aVal <=> $bVal;
     }
 
     public static function nameNumericDesc(Entity $a, Entity $b): int
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index 10c7bc17d3e..85b3d7991c4 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Sorting\SortRule;
+use BookStack\Sorting\SortRuleOperation;
 use Tests\Api\TestsApi;
 use Tests\TestCase;
 
@@ -202,7 +203,8 @@ public function test_name_numeric_ordering()
             "20 - Milk",
         ];
 
-        foreach ($namesToAdd as $name) {
+        $reverseNamesToAdd = array_reverse($namesToAdd);
+        foreach ($reverseNamesToAdd as $name) {
             $this->actingAsApiEditor()->post("/api/pages", [
                 'book_id' => $book->id,
                 'name' => $name,
@@ -218,4 +220,14 @@ public function test_name_numeric_ordering()
             ]);
         }
     }
+
+    public function test_each_sort_rule_operation_has_a_comparison_function()
+    {
+        $operations = SortRuleOperation::cases();
+
+        foreach ($operations as $operation) {
+            $comparisonFunc = $operation->getSortFunction();
+            $this->assertIsCallable($comparisonFunc);
+        }
+    }
 }

From a384599cfab70f58bbeb9299c312f584870e95d5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 26 Feb 2025 13:44:56 +0000
Subject: [PATCH 485/666] Meta: Updated licenses and translation attribution
 pre v25.02

---
 .github/translators.txt                |   8 +
 dev/licensing/js-library-licenses.txt  | 435 +++++++++++++++----------
 dev/licensing/php-library-licenses.txt |  60 ++--
 3 files changed, 298 insertions(+), 205 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index 9844f65b366..8e4eb271c06 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -461,3 +461,11 @@ Yannis Karlaftis (meliseus) :: Greek
 felixxx :: German Informal
 randi (randi65535) :: Korean
 test65428 :: Greek
+zeronell :: Chinese Simplified
+julien Vinber (julienVinber) :: French
+Hyunwoo Park (oksure) :: Korean
+aram.rafeq.7 (aramrafeq2) :: Kurdish
+Raphael Moreno (RaphaelMoreno) :: Portuguese, Brazilian
+yn (user99) :: Arabic
+Pavel Zlatarov (pzlatarov) :: Bulgarian
+ingelres :: French
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 479941db199..52949e3cd27 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -127,6 +127,13 @@ Copyright: Copyright (c) 2023 ECMAScript Shims
 Source: git+https://github.com/es-shims/ArrayBuffer.prototype.slice.git
 Link: https://github.com/es-shims/ArrayBuffer.prototype.slice#readme
 -----------
+async-function
+License: MIT
+License File: node_modules/async-function/LICENSE
+Copyright: Copyright (c) 2016 EduardoRFS
+Source: git+https://github.com/ljharb/async-function.git
+Link: https://github.com/ljharb/async-function#readme
+-----------
 async
 License: MIT
 License File: node_modules/async/LICENSE
@@ -239,6 +246,13 @@ Copyright: Copyright (c) 2016, 2018 Linus Unnebäck
 Source: LinusU/buffer-from
 Link: LinusU/buffer-from
 -----------
+call-bind-apply-helpers
+License: MIT
+License File: node_modules/call-bind-apply-helpers/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/call-bind-apply-helpers.git
+Link: https://github.com/ljharb/call-bind-apply-helpers#readme
+-----------
 call-bind
 License: MIT
 License File: node_modules/call-bind/LICENSE
@@ -246,6 +260,13 @@ Copyright: Copyright (c) 2020 Jordan Harband
 Source: git+https://github.com/ljharb/call-bind.git
 Link: https://github.com/ljharb/call-bind#readme
 -----------
+call-bound
+License: MIT
+License File: node_modules/call-bound/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/call-bound.git
+Link: https://github.com/ljharb/call-bound#readme
+-----------
 callsites
 License: MIT
 License File: node_modules/callsites/license
@@ -303,6 +324,7 @@ Link: https://github.com/watson/ci-info
 cjs-module-lexer
 License: MIT
 License File: node_modules/cjs-module-lexer/LICENSE
+Copyright: Copyright (C) 2018-2020 Guy Bedford
 Source: git+https://github.com/nodejs/cjs-module-lexer.git
 Link: https://github.com/nodejs/cjs-module-lexer#readme
 -----------
@@ -360,13 +382,6 @@ License File: node_modules/concat-map/LICENSE
 Source: git://github.com/substack/node-concat-map.git
 Link: git://github.com/substack/node-concat-map.git
 -----------
-confusing-browser-globals
-License: MIT
-License File: node_modules/confusing-browser-globals/LICENSE
-Copyright: Copyright (c) 2013-present, Facebook, Inc.
-Source: https://github.com/facebook/create-react-app.git
-Link: https://github.com/facebook/create-react-app.git
------------
 convert-source-map
 License: MIT
 License File: node_modules/convert-source-map/LICENSE
@@ -427,22 +442,22 @@ data-view-buffer
 License: MIT
 License File: node_modules/data-view-buffer/LICENSE
 Copyright: Copyright (c) 2023 Jordan Harband
-Source: git+https://github.com/ljharb/data-view-buffer.git
-Link: https://github.com/ljharb/data-view-buffer#readme
+Source: git+https://github.com/inspect-js/data-view-buffer.git
+Link: https://github.com/inspect-js/data-view-buffer#readme
 -----------
 data-view-byte-length
 License: MIT
 License File: node_modules/data-view-byte-length/LICENSE
 Copyright: Copyright (c) 2024 Jordan Harband
-Source: git+https://github.com/ljharb/data-view-byte-length.git
-Link: https://github.com/ljharb/data-view-byte-length#readme
+Source: git+https://github.com/inspect-js/data-view-byte-length.git
+Link: https://github.com/inspect-js/data-view-byte-length#readme
 -----------
 data-view-byte-offset
 License: MIT
 License File: node_modules/data-view-byte-offset/LICENSE
 Copyright: Copyright (c) 2024 Jordan Harband
-Source: git+https://github.com/ljharb/data-view-byte-offset.git
-Link: https://github.com/ljharb/data-view-byte-offset#readme
+Source: git+https://github.com/inspect-js/data-view-byte-offset.git
+Link: https://github.com/inspect-js/data-view-byte-offset#readme
 -----------
 debug
 License: MIT
@@ -546,6 +561,13 @@ License File: node_modules/domexception/LICENSE.txt
 Source: jsdom/domexception
 Link: jsdom/domexception
 -----------
+dunder-proto
+License: MIT
+License File: node_modules/dunder-proto/LICENSE
+Copyright: Copyright (c) 2024 ECMAScript Shims
+Source: git+https://github.com/es-shims/dunder-proto.git
+Link: https://github.com/es-shims/dunder-proto#readme
+-----------
 ejs
 License: Apache-2.0
 License File: node_modules/ejs/LICENSE
@@ -664,13 +686,6 @@ Copyright: Copyright (C) 2012 Yusuke Suzuki (twitter: @Constellation) and other
 Source: http://github.com/estools/escodegen.git
 Link: http://github.com/estools/escodegen
 -----------
-eslint-config-airbnb-base
-License: MIT
-License File: node_modules/eslint-config-airbnb-base/LICENSE.md
-Copyright: Copyright (c) 2012 Airbnb
-Source: https://github.com/airbnb/javascript
-Link: https://github.com/airbnb/javascript
------------
 eslint-import-resolver-node
 License: MIT
 License File: node_modules/eslint-import-resolver-node/LICENSE
@@ -696,14 +711,14 @@ eslint-scope
 License: BSD-2-Clause
 License File: node_modules/eslint-scope/LICENSE
 Copyright: Copyright (C) 2012-2013 Yusuke Suzuki (twitter: @Constellation) and other contributors.
-Source: eslint/eslint-scope
-Link: http://github.com/eslint/eslint-scope
+Source: eslint/js
+Link: https://github.com/eslint/js/blob/main/packages/eslint-scope/README.md
 -----------
 eslint-visitor-keys
 License: Apache-2.0
 License File: node_modules/eslint-visitor-keys/LICENSE
-Source: eslint/eslint-visitor-keys
-Link: https://github.com/eslint/eslint-visitor-keys#readme
+Source: eslint/js
+Link: https://github.com/eslint/js/blob/main/packages/eslint-visitor-keys/README.md
 -----------
 eslint
 License: MIT
@@ -716,8 +731,8 @@ License: BSD-2-Clause
 License File: node_modules/espree/LICENSE
 Copyright: Copyright (c) Open JS Foundation
 All rights reserved.
-Source: eslint/espree
-Link: https://github.com/eslint/espree
+Source: eslint/js
+Link: https://github.com/eslint/js/blob/main/packages/espree/README.md
 -----------
 esprima
 License: BSD-2-Clause
@@ -790,13 +805,6 @@ Copyright: Copyright (c) 2013 [Ramesh Nair](http://www.hiddentao.com/)
 Source: https://github.com/hiddentao/fast-levenshtein.git
 Link: https://github.com/hiddentao/fast-levenshtein.git
 -----------
-fastq
-License: ISC
-License File: node_modules/fastq/LICENSE
-Copyright: Copyright (c) 2015-2020, Matteo Collina <******.*******@*****.***>
-Source: git+https://github.com/mcollina/fastq.git
-Link: https://github.com/mcollina/fastq#readme
------------
 fb-watchman
 License: Apache-2.0
 Source: git@github.com:facebook/watchman.git
@@ -805,9 +813,9 @@ Link: https://facebook.github.io/watchman/
 file-entry-cache
 License: MIT
 License File: node_modules/file-entry-cache/LICENSE
-Copyright: Copyright (c) 2015 Roy Riojas
-Source: royriojas/file-entry-cache
-Link: royriojas/file-entry-cache
+Copyright: Copyright (c) Roy Riojas & Jared Wray
+Source: jaredwray/file-entry-cache
+Link: jaredwray/file-entry-cache
 -----------
 filelist
 License: Apache-2.0
@@ -846,7 +854,7 @@ for-each
 License: MIT
 License File: node_modules/for-each/LICENSE
 Copyright: Copyright (c) 2012 Raynos.
-Source: git://github.com/Raynos/for-each.git
+Source: https://github.com/Raynos/for-each.git
 Link: https://github.com/Raynos/for-each
 -----------
 form-data
@@ -912,6 +920,13 @@ Copyright: Copyright (c) 2020 CFWare, LLC
 Source: git+https://github.com/cfware/get-package-type.git
 Link: https://github.com/cfware/get-package-type#readme
 -----------
+get-proto
+License: MIT
+License File: node_modules/get-proto/LICENSE
+Copyright: Copyright (c) 2025 Jordan Harband
+Source: git+https://github.com/ljharb/get-proto.git
+Link: https://github.com/ljharb/get-proto#readme
+-----------
 get-stream
 License: MIT
 License File: node_modules/get-stream/license
@@ -968,13 +983,6 @@ Copyright: Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contri
 Source: https://github.com/isaacs/node-graceful-fs
 Link: https://github.com/isaacs/node-graceful-fs
 -----------
-graphemer
-License: MIT
-License File: node_modules/graphemer/LICENSE
-Copyright: Copyright 2020 Filament (Anomalous Technologies Limited)
-Source: https://github.com/flmnt/graphemer.git
-Link: https://github.com/flmnt/graphemer
------------
 has-bigints
 License: MIT
 License File: node_modules/has-bigints/LICENSE
@@ -1139,6 +1147,13 @@ Copyright: Copyright (c) 2015 JD Ballard
 Source: https://github.com/qix-/node-is-arrayish.git
 Link: https://github.com/qix-/node-is-arrayish.git
 -----------
+is-async-function
+License: MIT
+License File: node_modules/is-async-function/LICENSE
+Copyright: Copyright (c) 2021 Jordan Harband
+Source: git://github.com/inspect-js/is-async-function.git
+Link: git://github.com/inspect-js/is-async-function.git
+-----------
 is-bigint
 License: MIT
 License File: node_modules/is-bigint/LICENSE
@@ -1195,6 +1210,13 @@ Copyright: Copyright (c) 2014-2016, Jon Schlinkert
 Source: jonschlinkert/is-extglob
 Link: https://github.com/jonschlinkert/is-extglob
 -----------
+is-finalizationregistry
+License: MIT
+License File: node_modules/is-finalizationregistry/LICENSE
+Copyright: Copyright (c) 2020 Inspect JS
+Source: git+https://github.com/inspect-js/is-finalizationregistry.git
+Link: https://github.com/inspect-js/is-finalizationregistry#readme
+-----------
 is-fullwidth-code-point
 License: MIT
 License File: node_modules/is-fullwidth-code-point/license
@@ -1209,6 +1231,13 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/is-generator-fn
 Link: sindresorhus/is-generator-fn
 -----------
+is-generator-function
+License: MIT
+License File: node_modules/is-generator-function/LICENSE
+Copyright: Copyright (c) 2014 Jordan Harband
+Source: git://github.com/inspect-js/is-generator-function.git
+Link: git://github.com/inspect-js/is-generator-function.git
+-----------
 is-glob
 License: MIT
 License File: node_modules/is-glob/LICENSE
@@ -1216,12 +1245,12 @@ Copyright: Copyright (c) 2014-2017, Jon Schlinkert.
 Source: micromatch/is-glob
 Link: https://github.com/micromatch/is-glob
 -----------
-is-negative-zero
+is-map
 License: MIT
-License File: node_modules/is-negative-zero/LICENSE
-Copyright: Copyright (c) 2014 Jordan Harband
-Source: git://github.com/inspect-js/is-negative-zero.git
-Link: https://github.com/inspect-js/is-negative-zero
+License File: node_modules/is-map/LICENSE
+Copyright: Copyright (c) 2019 Inspect JS
+Source: git+https://github.com/inspect-js/is-map.git
+Link: https://github.com/inspect-js/is-map#readme
 -----------
 is-number-object
 License: MIT
@@ -1237,13 +1266,6 @@ Copyright: Copyright (c) 2014-present, Jon Schlinkert.
 Source: jonschlinkert/is-number
 Link: https://github.com/jonschlinkert/is-number
 -----------
-is-path-inside
-License: MIT
-License File: node_modules/is-path-inside/license
-Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
-Source: sindresorhus/is-path-inside
-Link: sindresorhus/is-path-inside
------------
 is-potential-custom-element-name
 License: MIT
 License File: node_modules/is-potential-custom-element-name/LICENSE-MIT.txt
@@ -1257,6 +1279,13 @@ Copyright: Copyright (c) 2014 Jordan Harband
 Source: git://github.com/inspect-js/is-regex.git
 Link: https://github.com/inspect-js/is-regex
 -----------
+is-set
+License: MIT
+License File: node_modules/is-set/LICENSE
+Copyright: Copyright (c) 2019 Inspect JS
+Source: git+https://github.com/inspect-js/is-set.git
+Link: https://github.com/inspect-js/is-set#readme
+-----------
 is-shared-array-buffer
 License: MIT
 License File: node_modules/is-shared-array-buffer/LICENSE
@@ -1275,8 +1304,8 @@ is-string
 License: MIT
 License File: node_modules/is-string/LICENSE
 Copyright: Copyright (c) 2015 Jordan Harband
-Source: git://github.com/ljharb/is-string.git
-Link: git://github.com/ljharb/is-string.git
+Source: git://github.com/inspect-js/is-string.git
+Link: git://github.com/inspect-js/is-string.git
 -----------
 is-symbol
 License: MIT
@@ -1292,6 +1321,13 @@ Copyright: Copyright (c) 2015 Jordan Harband
 Source: git://github.com/inspect-js/is-typed-array.git
 Link: git://github.com/inspect-js/is-typed-array.git
 -----------
+is-weakmap
+License: MIT
+License File: node_modules/is-weakmap/LICENSE
+Copyright: Copyright (c) 2019 Inspect JS
+Source: git+https://github.com/inspect-js/is-weakmap.git
+Link: https://github.com/inspect-js/is-weakmap#readme
+-----------
 is-weakref
 License: MIT
 License File: node_modules/is-weakref/LICENSE
@@ -1299,6 +1335,13 @@ Copyright: Copyright (c) 2020 Inspect JS
 Source: git+https://github.com/inspect-js/is-weakref.git
 Link: https://github.com/inspect-js/is-weakref#readme
 -----------
+is-weakset
+License: MIT
+License File: node_modules/is-weakset/LICENSE
+Copyright: Copyright (c) 2019 Inspect JS
+Source: git+https://github.com/inspect-js/is-weakset.git
+Link: https://github.com/inspect-js/is-weakset#readme
+-----------
 isarray
 License: MIT
 License File: node_modules/isarray/LICENSE
@@ -1708,6 +1751,13 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git://github.com/isaacs/node-lru-cache.git
 Link: git://github.com/isaacs/node-lru-cache.git
 -----------
+magic-string
+License: MIT
+License File: node_modules/magic-string/LICENSE
+Copyright: Copyright 2018 Rich Harris
+Source: https://github.com/rich-harris/magic-string
+Link: https://github.com/rich-harris/magic-string
+-----------
 make-dir
 License: MIT
 License File: node_modules/make-dir/license
@@ -1743,6 +1793,13 @@ Copyright: Copyright (c) 2014 Vitaly Puzrin, Alex Kocharin.
 Source: markdown-it/markdown-it
 Link: markdown-it/markdown-it
 -----------
+math-intrinsics
+License: MIT
+License File: node_modules/math-intrinsics/LICENSE
+Copyright: Copyright (c) 2024 ECMAScript Shims
+Source: git+https://github.com/es-shims/math-intrinsics.git
+Link: https://github.com/es-shims/math-intrinsics#readme
+-----------
 mdurl
 License: MIT
 License File: node_modules/mdurl/LICENSE
@@ -1903,13 +1960,6 @@ Copyright: Copyright (c) 2014 Jordan Harband
 Source: git://github.com/ljharb/object.assign.git
 Link: git://github.com/ljharb/object.assign.git
 -----------
-object.entries
-License: MIT
-License File: node_modules/object.entries/LICENSE
-Copyright: Copyright (c) 2015 Jordan Harband
-Source: git://github.com/es-shims/Object.entries.git
-Link: git://github.com/es-shims/Object.entries.git
------------
 object.fromentries
 License: MIT
 License File: node_modules/object.fromentries/LICENSE
@@ -1960,6 +2010,13 @@ All rights reserved.
 Source: github:khtdr/opts
 Link: http://khtdr.com/opts
 -----------
+own-keys
+License: MIT
+License File: node_modules/own-keys/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/own-keys.git
+Link: https://github.com/ljharb/own-keys#readme
+-----------
 p-limit
 License: MIT
 License File: node_modules/p-limit/license
@@ -2000,7 +2057,7 @@ License: MIT
 License File: node_modules/parse5/LICENSE
 Copyright: Copyright (c) 2013-2019 Ivan Nikulin (******@*****.***, https://github.com/inikulin)
 Source: git://github.com/inikulin/parse5.git
-Link: https://github.com/inikulin/parse5
+Link: https://parse5.js.org
 -----------
 path-exists
 License: MIT
@@ -2140,13 +2197,6 @@ Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
 Source: https://github.com/unshiftio/querystringify
 Link: https://github.com/unshiftio/querystringify
 -----------
-queue-microtask
-License: MIT
-License File: node_modules/queue-microtask/LICENSE
-Copyright: Copyright (c) Feross Aboukhadijeh
-Source: git://github.com/feross/queue-microtask.git
-Link: https://github.com/feross/queue-microtask
------------
 react-is
 License: MIT
 License File: node_modules/react-is/LICENSE
@@ -2168,6 +2218,13 @@ Copyright: Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmil
 Source: git://github.com/paulmillr/readdirp.git
 Link: https://github.com/paulmillr/readdirp
 -----------
+reflect.getprototypeof
+License: MIT
+License File: node_modules/reflect.getprototypeof/LICENSE
+Copyright: Copyright (c) 2021 ECMAScript Shims
+Source: git+https://github.com/es-shims/Reflect.getPrototypeOf.git
+Link: https://github.com/es-shims/Reflect.getPrototypeOf
+-----------
 regexp.prototype.flags
 License: MIT
 License File: node_modules/regexp.prototype.flags/LICENSE
@@ -2224,26 +2281,17 @@ Copyright: Copyright (c) 2012 James Halliday
 Source: git://github.com/browserify/resolve.git
 Link: git://github.com/browserify/resolve.git
 -----------
-reusify
-License: MIT
-License File: node_modules/reusify/LICENSE
-Copyright: Copyright (c) 2015 Matteo Collina
-Source: git+https://github.com/mcollina/reusify.git
-Link: https://github.com/mcollina/reusify#readme
------------
-rimraf
-License: ISC
-License File: node_modules/rimraf/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: git://github.com/isaacs/rimraf.git
-Link: git://github.com/isaacs/rimraf.git
+rollup-plugin-dts
+License: LGPL-3.0
+Source: git+https://github.com/Swatinem/rollup-plugin-dts.git
+Link: https://github.com/Swatinem/rollup-plugin-dts#readme
 -----------
-run-parallel
+rollup
 License: MIT
-License File: node_modules/run-parallel/LICENSE
-Copyright: Copyright (c) Feross Aboukhadijeh
-Source: git://github.com/feross/run-parallel.git
-Link: https://github.com/feross/run-parallel
+License File: node_modules/rollup/LICENSE.md
+Copyright: Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+Source: rollup/rollup
+Link: https://rollupjs.org/
 -----------
 safe-array-concat
 License: MIT
@@ -2252,6 +2300,13 @@ Copyright: Copyright (c) 2023 Jordan Harband
 Source: git+https://github.com/ljharb/safe-array-concat.git
 Link: https://github.com/ljharb/safe-array-concat#readme
 -----------
+safe-push-apply
+License: MIT
+License File: node_modules/safe-push-apply/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/safe-push-apply.git
+Link: https://github.com/ljharb/safe-push-apply#readme
+-----------
 safe-regex-test
 License: MIT
 License File: node_modules/safe-regex-test/LICENSE
@@ -2306,6 +2361,13 @@ Copyright: Copyright (c) Jordan Harband and contributors
 Source: git+https://github.com/ljharb/set-function-name.git
 Link: https://github.com/ljharb/set-function-name#readme
 -----------
+set-proto
+License: MIT
+License File: node_modules/set-proto/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/set-proto.git
+Link: https://github.com/ljharb/set-proto#readme
+-----------
 shebang-command
 License: MIT
 License File: node_modules/shebang-command/license
@@ -2327,6 +2389,27 @@ Copyright: Copyright (c) 2013 James Halliday (****@********.***)
 Source: http://github.com/ljharb/shell-quote.git
 Link: https://github.com/ljharb/shell-quote
 -----------
+side-channel-list
+License: MIT
+License File: node_modules/side-channel-list/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/side-channel-list.git
+Link: https://github.com/ljharb/side-channel-list#readme
+-----------
+side-channel-map
+License: MIT
+License File: node_modules/side-channel-map/LICENSE
+Copyright: Copyright (c) 2024 Jordan Harband
+Source: git+https://github.com/ljharb/side-channel-map.git
+Link: https://github.com/ljharb/side-channel-map#readme
+-----------
+side-channel-weakmap
+License: MIT
+License File: node_modules/side-channel-weakmap/LICENSE
+Copyright: Copyright (c) 2019 Jordan Harband
+Source: git+https://github.com/ljharb/side-channel-weakmap.git
+Link: https://github.com/ljharb/side-channel-weakmap#readme
+-----------
 side-channel
 License: MIT
 License File: node_modules/side-channel/LICENSE
@@ -2534,12 +2617,6 @@ Copyright: Copyright (c) 2016, Contributors
 Source: git+https://github.com/istanbuljs/test-exclude.git
 Link: https://istanbul.js.org/
 -----------
-text-table
-License: MIT
-License File: node_modules/text-table/LICENSE
-Source: git://github.com/substack/text-table.git
-Link: https://github.com/substack/text-table
------------
 tmpl
 License: BSD-3-Clause
 License File: node_modules/tmpl/license
@@ -2547,14 +2624,6 @@ Copyright: Copyright (c) 2014, Naitik Shah. All rights reserved.
 Source: https://github.com/daaku/nodejs-tmpl
 Link: https://github.com/daaku/nodejs-tmpl
 -----------
-to-fast-properties
-License: MIT
-License File: node_modules/to-fast-properties/license
-Copyright: Copyright (c) 2014 Petka Antonov
-              2015 Sindre Sorhus
-Source: sindresorhus/to-fast-properties
-Link: sindresorhus/to-fast-properties
------------
 to-regex-range
 License: MIT
 License File: node_modules/to-regex-range/LICENSE
@@ -2579,7 +2648,7 @@ Link: https://github.com/jsdom/tr46
 ts-jest
 License: MIT
 License File: node_modules/ts-jest/LICENSE.md
-Copyright: Copyright (c) 2016-2018
+Copyright: Copyright (c) 2016-2025
 Source: git+https://github.com/kulshekhar/ts-jest.git
 Link: https://kulshekhar.github.io/ts-jest
 -----------
@@ -2622,8 +2691,8 @@ typed-array-buffer
 License: MIT
 License File: node_modules/typed-array-buffer/LICENSE
 Copyright: Copyright (c) 2023 Jordan Harband
-Source: git+https://github.com/ljharb/typed-array-buffer.git
-Link: https://github.com/ljharb/typed-array-buffer#readme
+Source: git+https://github.com/inspect-js/typed-array-buffer.git
+Link: https://github.com/inspect-js/typed-array-buffer#readme
 -----------
 typed-array-byte-length
 License: MIT
@@ -2774,6 +2843,20 @@ Copyright: Copyright (c) 2019 Jordan Harband
 Source: git+https://github.com/inspect-js/which-boxed-primitive.git
 Link: https://github.com/inspect-js/which-boxed-primitive#readme
 -----------
+which-builtin-type
+License: MIT
+License File: node_modules/which-builtin-type/LICENSE
+Copyright: Copyright (c) 2020 ECMAScript Shims
+Source: git+https://github.com/inspect-js/which-builtin-type.git
+Link: https://github.com/inspect-js/which-builtin-type#readme
+-----------
+which-collection
+License: MIT
+License File: node_modules/which-collection/LICENSE
+Copyright: Copyright (c) 2019 Inspect JS
+Source: git+https://github.com/inspect-js/which-collection.git
+Link: https://github.com/inspect-js/which-collection#readme
+-----------
 which-module
 License: ISC
 License File: node_modules/which-module/LICENSE
@@ -2949,13 +3032,6 @@ Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
 Source: https://github.com/babel/babel.git
 Link: https://babel.dev/docs/en/next/babel-helper-plugin-utils
 -----------
-@babel/helper-simple-access
-License: MIT
-License File: node_modules/@babel/helper-simple-access/LICENSE
-Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
-Source: https://github.com/babel/babel.git
-Link: https://babel.dev/docs/en/next/babel-helper-simple-access
------------
 @babel/helper-string-parser
 License: MIT
 License File: node_modules/@babel/helper-string-parser/LICENSE
@@ -2984,13 +3060,6 @@ Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
 Source: https://github.com/babel/babel.git
 Link: https://babel.dev/docs/en/next/babel-helpers
 -----------
-@babel/highlight
-License: MIT
-License File: node_modules/@babel/highlight/LICENSE
-Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
-Source: https://github.com/babel/babel.git
-Link: https://babel.dev/docs/en/next/babel-highlight
------------
 @babel/parser
 License: MIT
 License File: node_modules/@babel/parser/LICENSE
@@ -3282,6 +3351,18 @@ Copyright: Copyright (c) 2018 Toru Nagashima
 Source: https://github.com/eslint-community/regexpp
 Link: https://github.com/eslint-community/regexpp#readme
 -----------
+@eslint/config-array
+License: Apache-2.0
+License File: node_modules/@eslint/config-array/LICENSE
+Source: git+https://github.com/eslint/rewrite.git
+Link: https://github.com/eslint/rewrite#readme
+-----------
+@eslint/core
+License: Apache-2.0
+License File: node_modules/@eslint/core/LICENSE
+Source: git+https://github.com/eslint/rewrite.git
+Link: https://github.com/eslint/rewrite#readme
+-----------
 @eslint/eslintrc
 License: MIT
 License File: node_modules/@eslint/eslintrc/LICENSE
@@ -3294,11 +3375,29 @@ License File: node_modules/@eslint/js/LICENSE
 Source: https://github.com/eslint/eslint.git
 Link: https://eslint.org
 -----------
-@humanwhocodes/config-array
+@eslint/object-schema
+License: Apache-2.0
+License File: node_modules/@eslint/object-schema/LICENSE
+Source: git+https://github.com/eslint/rewrite.git
+Link: https://github.com/eslint/rewrite#readme
+-----------
+@eslint/plugin-kit
+License: Apache-2.0
+License File: node_modules/@eslint/plugin-kit/LICENSE
+Source: git+https://github.com/eslint/rewrite.git
+Link: https://github.com/eslint/rewrite#readme
+-----------
+@humanfs/core
+License: Apache-2.0
+License File: node_modules/@humanfs/core/LICENSE
+Source: git+https://github.com/humanwhocodes/humanfs.git
+Link: https://github.com/humanwhocodes/humanfs#readme
+-----------
+@humanfs/node
 License: Apache-2.0
-License File: node_modules/@humanwhocodes/config-array/LICENSE
-Source: git+https://github.com/humanwhocodes/config-array.git
-Link: https://github.com/humanwhocodes/config-array#readme
+License File: node_modules/@humanfs/node/LICENSE
+Source: git+https://github.com/humanwhocodes/humanfs.git
+Link: https://github.com/humanwhocodes/humanfs#readme
 -----------
 @humanwhocodes/module-importer
 License: Apache-2.0
@@ -3306,13 +3405,11 @@ License File: node_modules/@humanwhocodes/module-importer/LICENSE
 Source: git+https://github.com/humanwhocodes/module-importer.git
 Link: git+https://github.com/humanwhocodes/module-importer.git
 -----------
-@humanwhocodes/object-schema
-License: BSD-3-Clause
-License File: node_modules/@humanwhocodes/object-schema/LICENSE
-Copyright: Copyright (c) 2019, Human Who Codes
-All rights reserved.
-Source: git+https://github.com/humanwhocodes/object-schema.git
-Link: https://github.com/humanwhocodes/object-schema#readme
+@humanwhocodes/retry
+License: Apache-2.0
+License File: node_modules/@humanwhocodes/retry/LICENSE
+Source: git+https://github.com/humanwhocodes/retry.git
+Link: git+https://github.com/humanwhocodes/retry.git
 -----------
 @istanbuljs/load-nyc-config
 License: ISC
@@ -3538,32 +3635,20 @@ Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and
 Source: https://github.com/lezer-parser/xml.git
 Link: https://github.com/lezer-parser/xml.git
 -----------
+@marijn/buildtool
+License: MIT
+License File: node_modules/@marijn/buildtool/LICENSE
+Copyright: Copyright (C) 2022 by Marijn Haverbeke <******@*********.******> and others
+Source: https://github.com/marijnh/buildtool.git
+Link: https://github.com/marijnh/buildtool.git
+-----------
 @marijn/find-cluster-break
 License: MIT
+License File: node_modules/@marijn/find-cluster-break/LICENSE
+Copyright: Copyright (C) 2024 by Marijn Haverbeke <******@*********.******>
 Source: git+https://github.com/marijnh/find-cluster-break.git
 Link: https://github.com/marijnh/find-cluster-break#readme
 -----------
-@nodelib/fs.scandir
-License: MIT
-License File: node_modules/@nodelib/fs.scandir/LICENSE
-Copyright: Copyright (c) Denis Malinochkin
-Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
-Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
------------
-@nodelib/fs.stat
-License: MIT
-License File: node_modules/@nodelib/fs.stat/LICENSE
-Copyright: Copyright (c) Denis Malinochkin
-Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
-Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
------------
-@nodelib/fs.walk
-License: MIT
-License File: node_modules/@nodelib/fs.walk/LICENSE
-Copyright: Copyright (c) Denis Malinochkin
-Source: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
-Link: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
------------
 @parcel/watcher-linux-x64-glibc
 License: MIT
 License File: node_modules/@parcel/watcher-linux-x64-glibc/LICENSE
@@ -3571,13 +3656,6 @@ Copyright: Copyright (c) 2017-present Devon Govett
 Source: https://github.com/parcel-bundler/watcher.git
 Link: https://github.com/parcel-bundler/watcher.git
 -----------
-@parcel/watcher-linux-x64-musl
-License: MIT
-License File: node_modules/@parcel/watcher-linux-x64-musl/LICENSE
-Copyright: Copyright (c) 2017-present Devon Govett
-Source: https://github.com/parcel-bundler/watcher.git
-Link: https://github.com/parcel-bundler/watcher.git
------------
 @parcel/watcher
 License: MIT
 License File: node_modules/@parcel/watcher/LICENSE
@@ -3686,6 +3764,13 @@ Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__traverse
 -----------
+@types/estree
+License: MIT
+License File: node_modules/@types/estree/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/estree
+-----------
 @types/graceful-fs
 License: MIT
 License File: node_modules/@types/graceful-fs/LICENSE
@@ -3728,11 +3813,25 @@ Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/jsdom
 -----------
+@types/json-schema
+License: MIT
+License File: node_modules/@types/json-schema/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/json-schema
+-----------
 @types/json5
 License: MIT
 Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 -----------
+@types/mocha
+License: MIT
+License File: node_modules/@types/mocha/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mocha
+-----------
 @types/node
 License: MIT
 License File: node_modules/@types/node/LICENSE
@@ -3740,6 +3839,13 @@ Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node
 -----------
+@types/sortablejs
+License: MIT
+License File: node_modules/@types/sortablejs/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/sortablejs
+-----------
 @types/stack-utils
 License: MIT
 License File: node_modules/@types/stack-utils/LICENSE
@@ -3767,10 +3873,3 @@ License File: node_modules/@types/yargs/LICENSE
 Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs
------------
-@ungap/structured-clone
-License: ISC
-License File: node_modules/@ungap/structured-clone/LICENSE
-Copyright: Copyright (c) 2021, Andrea Giammarchi, @WebReflection
-Source: git+https://github.com/ungap/structured-clone.git
-Link: https://github.com/ungap/structured-clone#readme
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index bf3619036f7..86e40a055b6 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -47,34 +47,6 @@ Copyright: Copyright (c) 2012 Dragonfly Development Inc.
 Source: https://github.com/dflydev/dflydev-dot-access-data.git
 Link: https://github.com/dflydev/dflydev-dot-access-data
 -----------
-doctrine/cache
-License: MIT
-License File: vendor/doctrine/cache/LICENSE
-Copyright: Copyright (c) 2006-2015 Doctrine Project
-Source: https://github.com/doctrine/cache.git
-Link: https://www.doctrine-project.org/projects/cache.html
------------
-doctrine/dbal
-License: MIT
-License File: vendor/doctrine/dbal/LICENSE
-Copyright: Copyright (c) 2006-2018 Doctrine Project
-Source: https://github.com/doctrine/dbal.git
-Link: https://www.doctrine-project.org/projects/dbal.html
------------
-doctrine/deprecations
-License: MIT
-License File: vendor/doctrine/deprecations/LICENSE
-Copyright: Copyright (c) 2020-2021 Doctrine Project
-Source: https://github.com/doctrine/deprecations.git
-Link: https://www.doctrine-project.org/
------------
-doctrine/event-manager
-License: MIT
-License File: vendor/doctrine/event-manager/LICENSE
-Copyright: Copyright (c) 2006-2015 Doctrine Project
-Source: https://github.com/doctrine/event-manager.git
-Link: https://www.doctrine-project.org/projects/event-manager.html
------------
 doctrine/inflector
 License: MIT
 License File: vendor/doctrine/inflector/LICENSE
@@ -195,7 +167,7 @@ Link: https://github.com/guzzle/uri-template.git
 intervention/gif
 License: MIT
 License File: vendor/intervention/gif/LICENSE
-Copyright: Copyright (c) 2020-2024 Oliver Vogel
+Copyright: Copyright (c) 2020-present Oliver Vogel
 Source: https://github.com/Intervention/gif.git
 Link: https://github.com/intervention/gif
 -----------
@@ -311,6 +283,20 @@ Copyright: Copyright (c) 2013-2023 Alex Bilbie <*****@**********.***>
 Source: https://github.com/thephpleague/oauth2-client.git
 Link: https://github.com/thephpleague/oauth2-client.git
 -----------
+league/uri
+License: MIT
+License File: vendor/league/uri/LICENSE
+Copyright: Copyright (c) 2015 ignace nyamagana butera
+Source: https://github.com/thephpleague/uri.git
+Link: https://uri.thephpleague.com
+-----------
+league/uri-interfaces
+License: MIT
+License File: vendor/league/uri-interfaces/LICENSE
+Copyright: Copyright (c) 2015 ignace nyamagana butera
+Source: https://github.com/thephpleague/uri-interfaces.git
+Link: https://uri.thephpleague.com
+-----------
 masterminds/html5
 License: MIT
 License File: vendor/masterminds/html5/LICENSE.txt
@@ -336,7 +322,7 @@ nesbot/carbon
 License: MIT
 License File: vendor/nesbot/carbon/LICENSE
 Copyright: Copyright (C) Brian Nesbitt
-Source: https://github.com/briannesbitt/Carbon.git
+Source: https://github.com/CarbonPHP/carbon.git
 Link: https://carbon.nesbot.com
 -----------
 nette/schema
@@ -419,13 +405,6 @@ Copyright (c) 2021-2024 Till Krüss (modified work)
 Source: https://github.com/predis/predis.git
 Link: http://github.com/predis/predis
 -----------
-psr/cache
-License: MIT
-License File: vendor/psr/cache/LICENSE.txt
-Copyright: Copyright (c) 2015 PHP Framework Interoperability Group
-Source: https://github.com/php-fig/cache.git
-Link: https://github.com/php-fig/cache.git
------------
 psr/clock
 License: MIT
 License File: vendor/psr/clock/LICENSE
@@ -571,6 +550,13 @@ Copyright: Copyright (c) 2019-present Fabien Potencier
 Source: https://github.com/ssddanbrown/symfony-mailer.git
 Link: https://symfony.com
 -----------
+symfony/clock
+License: MIT
+License File: vendor/symfony/clock/LICENSE
+Copyright: Copyright (c) 2022-present Fabien Potencier
+Source: https://github.com/symfony/clock.git
+Link: https://symfony.com
+-----------
 symfony/console
 License: MIT
 License File: vendor/symfony/console/LICENSE

From 6211d6bcfcec93fafd6e84c0bcaaebdde71c096e Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 26 Feb 2025 13:51:51 +0000
Subject: [PATCH 486/666] Updated translations with latest Crowdin changes
 (#5409)

---
 lang/ar/activities.php          |   8 +
 lang/ar/editor.php              |   2 +
 lang/ar/entities.php            |   4 +-
 lang/ar/settings.php            |  30 +++
 lang/bg/activities.php          |  14 +-
 lang/bg/editor.php              |   2 +
 lang/bg/entities.php            |   4 +-
 lang/bg/settings.php            |  30 +++
 lang/bn/activities.php          |   8 +
 lang/bn/editor.php              |   2 +
 lang/bn/entities.php            |   4 +-
 lang/bn/settings.php            |  30 +++
 lang/bs/activities.php          |   8 +
 lang/bs/editor.php              |   2 +
 lang/bs/entities.php            |   4 +-
 lang/bs/settings.php            |  30 +++
 lang/ca/activities.php          |   8 +
 lang/ca/editor.php              |   2 +
 lang/ca/entities.php            |   4 +-
 lang/ca/settings.php            |  30 +++
 lang/cs/activities.php          |   8 +
 lang/cs/editor.php              |   2 +
 lang/cs/entities.php            |   4 +-
 lang/cs/settings.php            |  30 +++
 lang/cy/activities.php          |  20 +-
 lang/cy/editor.php              |   6 +-
 lang/cy/entities.php            |  46 ++--
 lang/cy/errors.php              |  20 +-
 lang/cy/settings.php            |  32 ++-
 lang/cy/validation.php          |   8 +-
 lang/da/activities.php          |  50 ++--
 lang/da/auth.php                |  22 +-
 lang/da/editor.php              |  74 ++---
 lang/da/entities.php            | 234 ++++++++--------
 lang/da/errors.php              |  46 ++--
 lang/da/notifications.php       |  18 +-
 lang/da/settings.php            |  92 ++++---
 lang/da/validation.php          |   8 +-
 lang/de/activities.php          |   8 +
 lang/de/editor.php              |   2 +
 lang/de/entities.php            |   4 +-
 lang/de/settings.php            |  30 +++
 lang/de_informal/activities.php |   8 +
 lang/de_informal/editor.php     |   2 +
 lang/de_informal/entities.php   |   4 +-
 lang/de_informal/settings.php   |  30 +++
 lang/el/activities.php          |   8 +
 lang/el/editor.php              |   2 +
 lang/el/entities.php            |   4 +-
 lang/el/settings.php            |  30 +++
 lang/es/activities.php          |   8 +
 lang/es/editor.php              |   2 +
 lang/es/entities.php            |   4 +-
 lang/es/settings.php            |  30 +++
 lang/es_AR/activities.php       |   8 +
 lang/es_AR/editor.php           |   2 +
 lang/es_AR/entities.php         |   4 +-
 lang/es_AR/settings.php         |  30 +++
 lang/et/activities.php          |  20 +-
 lang/et/editor.php              |   6 +-
 lang/et/entities.php            |  44 +--
 lang/et/errors.php              |  20 +-
 lang/et/settings.php            |  32 ++-
 lang/et/validation.php          |   8 +-
 lang/eu/activities.php          |   8 +
 lang/eu/editor.php              |   2 +
 lang/eu/entities.php            |   4 +-
 lang/eu/settings.php            |  30 +++
 lang/fa/activities.php          |   8 +
 lang/fa/editor.php              |   2 +
 lang/fa/entities.php            |   4 +-
 lang/fa/settings.php            |  30 +++
 lang/fi/activities.php          |  20 +-
 lang/fi/editor.php              |   2 +
 lang/fi/entities.php            |   4 +-
 lang/fi/settings.php            |  30 +++
 lang/fi/validation.php          |   2 +-
 lang/fr/activities.php          |   8 +
 lang/fr/editor.php              |   2 +
 lang/fr/entities.php            |   6 +-
 lang/fr/settings.php            |  30 +++
 lang/he/activities.php          |   8 +
 lang/he/editor.php              |   2 +
 lang/he/entities.php            |   4 +-
 lang/he/settings.php            |  30 +++
 lang/hr/activities.php          |   8 +
 lang/hr/editor.php              |   2 +
 lang/hr/entities.php            |   4 +-
 lang/hr/settings.php            |  30 +++
 lang/hu/activities.php          |   8 +
 lang/hu/editor.php              |   2 +
 lang/hu/entities.php            |   4 +-
 lang/hu/settings.php            |  30 +++
 lang/id/activities.php          |   8 +
 lang/id/editor.php              |   2 +
 lang/id/entities.php            |   4 +-
 lang/id/settings.php            |  30 +++
 lang/is/activities.php          |   8 +
 lang/is/editor.php              |   2 +
 lang/is/entities.php            |   4 +-
 lang/is/settings.php            |  30 +++
 lang/it/activities.php          |   8 +
 lang/it/editor.php              |   2 +
 lang/it/entities.php            |   4 +-
 lang/it/settings.php            |  30 +++
 lang/ja/activities.php          |   8 +
 lang/ja/editor.php              |   2 +
 lang/ja/entities.php            |   4 +-
 lang/ja/settings.php            |  30 +++
 lang/ka/activities.php          |   8 +
 lang/ka/editor.php              |   2 +
 lang/ka/entities.php            |   4 +-
 lang/ka/settings.php            |  30 +++
 lang/ko/activities.php          |  28 +-
 lang/ko/editor.php              |   2 +
 lang/ko/entities.php            |   4 +-
 lang/ko/settings.php            |  30 +++
 lang/ku/activities.php          | 140 ++++++++++
 lang/ku/auth.php                | 117 ++++++++
 lang/ku/common.php              | 113 ++++++++
 lang/ku/components.php          |  46 ++++
 lang/ku/editor.php              | 181 +++++++++++++
 lang/ku/entities.php            | 462 ++++++++++++++++++++++++++++++++
 lang/ku/errors.php              | 133 +++++++++
 lang/ku/notifications.php       |  27 ++
 lang/ku/pagination.php          |  12 +
 lang/ku/passwords.php           |  15 ++
 lang/ku/preferences.php         |  51 ++++
 lang/ku/settings.php            | 369 +++++++++++++++++++++++++
 lang/ku/validation.php          | 122 +++++++++
 lang/lt/activities.php          |   8 +
 lang/lt/editor.php              |   2 +
 lang/lt/entities.php            |   4 +-
 lang/lt/settings.php            |  30 +++
 lang/lv/activities.php          |   8 +
 lang/lv/editor.php              |   2 +
 lang/lv/entities.php            |   4 +-
 lang/lv/settings.php            |  30 +++
 lang/nb/activities.php          |   8 +
 lang/nb/editor.php              |   2 +
 lang/nb/entities.php            |   4 +-
 lang/nb/settings.php            |  30 +++
 lang/nl/activities.php          |   8 +
 lang/nl/common.php              |   2 +-
 lang/nl/editor.php              |   2 +
 lang/nl/entities.php            |   4 +-
 lang/nl/settings.php            |  30 +++
 lang/nn/activities.php          |   8 +
 lang/nn/editor.php              |   2 +
 lang/nn/entities.php            |   4 +-
 lang/nn/settings.php            |  30 +++
 lang/pl/activities.php          |   8 +
 lang/pl/editor.php              |   2 +
 lang/pl/entities.php            |   4 +-
 lang/pl/settings.php            |  30 +++
 lang/pt/activities.php          |   8 +
 lang/pt/editor.php              |   2 +
 lang/pt/entities.php            |   4 +-
 lang/pt/settings.php            |  30 +++
 lang/pt_BR/activities.php       |  16 +-
 lang/pt_BR/common.php           |   2 +-
 lang/pt_BR/editor.php           |   2 +
 lang/pt_BR/entities.php         |  28 +-
 lang/pt_BR/errors.php           |  10 +-
 lang/pt_BR/preferences.php      |   2 +-
 lang/pt_BR/settings.php         |  78 ++++--
 lang/ro/activities.php          |   8 +
 lang/ro/editor.php              |   2 +
 lang/ro/entities.php            |   4 +-
 lang/ro/settings.php            |  30 +++
 lang/ru/activities.php          |   8 +
 lang/ru/editor.php              |   2 +
 lang/ru/entities.php            |   4 +-
 lang/ru/settings.php            |  30 +++
 lang/sk/activities.php          |   8 +
 lang/sk/editor.php              |   2 +
 lang/sk/entities.php            |   4 +-
 lang/sk/settings.php            |  30 +++
 lang/sl/activities.php          |   8 +
 lang/sl/editor.php              |   2 +
 lang/sl/entities.php            |   4 +-
 lang/sl/settings.php            |  30 +++
 lang/sq/activities.php          |   8 +
 lang/sq/editor.php              |   2 +
 lang/sq/entities.php            |   4 +-
 lang/sq/settings.php            |  30 +++
 lang/sr/activities.php          |   8 +
 lang/sr/editor.php              |   2 +
 lang/sr/entities.php            |   4 +-
 lang/sr/settings.php            |  30 +++
 lang/sv/activities.php          |   8 +
 lang/sv/editor.php              |   2 +
 lang/sv/entities.php            |   4 +-
 lang/sv/settings.php            |  30 +++
 lang/tk/activities.php          |   8 +
 lang/tk/editor.php              |   2 +
 lang/tk/entities.php            |   4 +-
 lang/tk/settings.php            |  30 +++
 lang/tr/activities.php          |   8 +
 lang/tr/editor.php              |   2 +
 lang/tr/entities.php            |   4 +-
 lang/tr/settings.php            |  30 +++
 lang/uk/activities.php          |   8 +
 lang/uk/editor.php              |   2 +
 lang/uk/entities.php            |   4 +-
 lang/uk/settings.php            |  30 +++
 lang/uz/activities.php          |   8 +
 lang/uz/editor.php              |   2 +
 lang/uz/entities.php            |   4 +-
 lang/uz/settings.php            |  30 +++
 lang/vi/activities.php          |   8 +
 lang/vi/editor.php              |   2 +
 lang/vi/entities.php            |   4 +-
 lang/vi/settings.php            |  30 +++
 lang/zh_CN/activities.php       |  20 +-
 lang/zh_CN/auth.php             |   2 +-
 lang/zh_CN/common.php           |   2 +-
 lang/zh_CN/editor.php           |   6 +-
 lang/zh_CN/entities.php         |  50 ++--
 lang/zh_CN/errors.php           |  22 +-
 lang/zh_CN/settings.php         |  34 ++-
 lang/zh_CN/validation.php       |  18 +-
 lang/zh_TW/activities.php       |   8 +
 lang/zh_TW/editor.php           |   2 +
 lang/zh_TW/entities.php         |   4 +-
 lang/zh_TW/settings.php         |  30 +++
 226 files changed, 4356 insertions(+), 510 deletions(-)
 create mode 100644 lang/ku/activities.php
 create mode 100644 lang/ku/auth.php
 create mode 100644 lang/ku/common.php
 create mode 100644 lang/ku/components.php
 create mode 100644 lang/ku/editor.php
 create mode 100644 lang/ku/entities.php
 create mode 100644 lang/ku/errors.php
 create mode 100644 lang/ku/notifications.php
 create mode 100644 lang/ku/pagination.php
 create mode 100644 lang/ku/passwords.php
 create mode 100644 lang/ku/preferences.php
 create mode 100644 lang/ku/settings.php
 create mode 100644 lang/ku/validation.php

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index 127ddbe1aba..22386fd131f 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'تعليق محدث',
     'comment_delete'              => 'تعليق محذوف',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'تحديث الأذونات',
 ];
diff --git a/lang/ar/editor.php b/lang/ar/editor.php
index 2254eb9ba6e..0ff5a5a18fc 100644
--- a/lang/ar/editor.php
+++ b/lang/ar/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'إلغاء',
     'save' => 'حفظ',
     'close' => 'إغلاق',
+    'apply' => 'Apply',
     'undo' => 'تراجع',
     'redo' => 'إعادة التنفيذ',
     'left' => 'يسار',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 065516bcfd8..005b1f714fc 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'البحث في هذا الكتاب',
     'books_navigation' => 'تصفح الكتاب',
     'books_sort' => 'فرز محتويات الكتاب',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'فرز كتاب :bookName',
     'books_sort_name' => 'ترتيب حسب الإسم',
     'books_sort_created' => 'ترتيب حسب تاريخ الإنشاء',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index ca8a7d90916..f771fc85188 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'أدخل قائمة مفصولة بفواصل لنطاقات البريد الإلكتروني التي ترغب في تقييد التسجيل إليها. سيتم إرسال بريد إلكتروني للمستخدمين لتأكيد عنوانهم قبل السماح لهم بالتفاعل مع التطبيق. <br> لاحظ أن المستخدمين سيكونون قادرين على تغيير عناوين البريد الإلكتروني الخاصة بهم بعد التسجيل بنجاح.',
     'reg_confirm_restrict_domain_placeholder' => 'لم يتم اختيار أي قيود',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'الصيانة',
     'maint_image_cleanup' => 'تنظيف الصور',
diff --git a/lang/bg/activities.php b/lang/bg/activities.php
index d7ac37c1053..f5ed71a4cc6 100644
--- a/lang/bg/activities.php
+++ b/lang/bg/activities.php
@@ -15,7 +15,7 @@
     'page_restore'                => 'възстановена страница',
     'page_restore_notification'   => 'Страницата е възстановена успешно',
     'page_move'                   => 'преместена страница',
-    'page_move_notification'      => 'Page successfully moved',
+    'page_move_notification'      => 'Страницата беше успешно преместена',
 
     // Chapters
     'chapter_create'              => 'създадена глава',
@@ -25,13 +25,13 @@
     'chapter_delete'              => 'изтрита глава',
     'chapter_delete_notification' => 'Успешно изтрита глава',
     'chapter_move'                => 'преместена глава',
-    'chapter_move_notification' => 'Chapter successfully moved',
+    'chapter_move_notification' => 'Главата е успешно преместена',
 
     // Books
     'book_create'                 => 'създадена книга',
     'book_create_notification'    => 'Книгата е създадена успешно',
     'book_create_from_chapter'              => 'превърната глава в книга',
-    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
+    'book_create_from_chapter_notification' => 'Главата е успешно преобразувана в книга',
     'book_update'                 => 'обновена книга',
     'book_update_notification'    => 'Книгата е обновена успешно',
     'book_delete'                 => 'изтрита книга',
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'обновени права',
 ];
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index a530820381b..e01206e4ae9 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Отказ',
     'save' => 'Запис',
     'close' => 'Затваряне',
+    'apply' => 'Apply',
     'undo' => 'Отмяна',
     'redo' => 'Повтаряне',
     'left' => 'Вляво',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Текст за показване',
     'title' => 'Заглавие',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Текущ прозорец',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index 1fdb3f6346b..c4a62eb423e 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Търси в книгата',
     'books_navigation' => 'Навигация на книгата',
     'books_sort' => 'Сортирай съдържанието на книгата',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Сортирай книга :bookName',
     'books_sort_name' => 'Сортиране по име',
     'books_sort_created' => 'Сортирай по дата на създаване',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index 1bc617fc9ed..b5ed1e4a7ca 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Въведи разделен със запетаи списък от имейл домейни, до които да бъде ограничена регистрацията. На потребителите ще им бъде изпратен имейл, за да потвърдят адреса, преди да могат да използват приложението. <br> Имай предвид, че потребителите ще могат да сменят имейл адресите си след успешна регистрация.',
     'reg_confirm_restrict_domain_placeholder' => 'Няма наложени ограничения',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Поддръжка',
     'maint_image_cleanup' => 'Разчисти изображения',
diff --git a/lang/bn/activities.php b/lang/bn/activities.php
index e46d85fbb0a..7e4ba8229aa 100644
--- a/lang/bn/activities.php
+++ b/lang/bn/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'মন্তব্য হালনাগাদ করেছেন',
     'comment_delete'              => 'মন্তব্য মুছে ফেলেছেন',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'অনুমতিক্রম হালনাগাদ করেছেন',
 ];
diff --git a/lang/bn/editor.php b/lang/bn/editor.php
index 8bcef5f23ce..50b4ce4d83d 100644
--- a/lang/bn/editor.php
+++ b/lang/bn/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'প্রত্যাহার করুন',
     'save' => 'সংরক্ষণ করুন',
     'close' => 'বন্ধ করুন',
+    'apply' => 'Apply',
     'undo' => 'প্রত্যাহার করুন',
     'redo' => 'পুনর্বহাল রাখুন',
     'left' => 'বাম',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
index 26a563a7eb5..a74785eaacd 100644
--- a/lang/bn/entities.php
+++ b/lang/bn/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/lang/bn/settings.php b/lang/bn/settings.php
index e66e32284d6..8e584abea45 100644
--- a/lang/bn/settings.php
+++ b/lang/bn/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/lang/bs/activities.php b/lang/bs/activities.php
index fc63058ae12..e7308770a29 100644
--- a/lang/bs/activities.php
+++ b/lang/bs/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'je ažurirao/la dozvole',
 ];
diff --git a/lang/bs/editor.php b/lang/bs/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/bs/editor.php
+++ b/lang/bs/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index fc6e19ddd8a..9bcbdb0f504 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Pretraži ovu knjigu',
     'books_navigation' => 'Navigacija knjige',
     'books_sort' => 'Sortiraj sadržaj knjige',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sortiraj knjigu :bookName',
     'books_sort_name' => 'Sortiraj po imenu',
     'books_sort_created' => 'Sortiraj po datumu kreiranja',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index c0b6b692a57..82a4ade5df5 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index 8835676644b..8decaa739cd 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'ha actualitzat un comentari',
     'comment_delete'              => 'ha suprimit un comentari',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'ha actualitzat els permisos',
 ];
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index cdd80c245d2..331e596315f 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel·la',
     'save' => 'Desa',
     'close' => 'Tanca',
+    'apply' => 'Apply',
     'undo' => 'Desfés',
     'redo' => 'Refés',
     'left' => 'Esquerra',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text per a mostrar',
     'title' => 'Títol',
+    'browse_links' => 'Browse links',
     'open_link' => 'Obre l’enllaç',
     'open_link_in' => 'Obre l’enllaç…',
     'open_link_current' => 'A la finestra actual',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index ef2a4c2a8c4..e1939babd3d 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Cerca en aquest llibre',
     'books_navigation' => 'Navegació del llibre',
     'books_sort' => 'Ordena el contingut d’un llibre',
-    'books_sort_desc' => 'Moveu els capítols i les pàgines d’un llibre per a reorganitzar-ne el contingut. Podeu afegir altres llibres perquè sigui més fàcil moure capítols i pàgines d’un llibre a un altre.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Ordena el llibre &laquo;:bookName&raquo;',
     'books_sort_name' => 'Ordena pel nom',
     'books_sort_created' => 'Ordena per la data de creació',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 2390a7962b8..3cabbe1a3f0 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Introduïu una llista separada per comes dels dominis a què voleu restringir el registre. S’enviarà un correu electrònic als usuaris perquè confirmin la seva adreça electrònica abans que puguin interactuar amb l’aplicació. <br> Tingueu en compte que els usuaris podran canviar l’adreça electrònica un cop s’hagin registrat.',
     'reg_confirm_restrict_domain_placeholder' => 'No hi ha cap restricció',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Manteniment',
     'maint_image_cleanup' => 'Neteja d’imatges',
diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index 8ce0397a74a..f7e9337d3fa 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'aktualizoval komentář',
     'comment_delete'              => 'odstranil komentář',
 
+    // Sort Rules
+    'sort_rule_create' => 'vytvořil/a pravidlo řazení',
+    'sort_rule_create_notification' => 'Pravidlo řazení bylo úspěšně vytvořeno',
+    'sort_rule_update' => 'aktualizoval/a pravidlo řazení',
+    'sort_rule_update_notification' => 'Pravidlo řazení bylo úspěšně aktualizováno',
+    'sort_rule_delete' => 'odstranil/a pravidlo řazení',
+    'sort_rule_delete_notification' => 'Pravidlo řazení bylo úspěšně odstraněno',
+
     // Other
     'permissions_update'          => 'oprávnění upravena',
 ];
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index fc5a4a74ac2..15daa778c06 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Zrušit',
     'save' => 'Uložit',
     'close' => 'Zavřít‏',
+    'apply' => 'Použít',
     'undo' => 'Zpět',
     'redo' => 'Znovu',
     'left' => 'Vlevo',
@@ -147,6 +148,7 @@
     'url' => 'Adresa URL',
     'text_to_display' => 'Text k zobrazení',
     'title' => 'Titulek',
+    'browse_links' => 'Procházet odkazy',
     'open_link' => 'Otevřít odkaz',
     'open_link_in' => 'Otevřít odkaz v...',
     'open_link_current' => 'Aktuální okno',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 21d6c8dd33d..6add3175f80 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Prohledat tuto knihu',
     'books_navigation' => 'Navigace knihy',
     'books_sort' => 'Seřadit obsah knihy',
-    'books_sort_desc' => 'Přesunout kapitoly a stránky v knize pro přeuspořádání obsahu. Mohou být přidány další knihy, které umožňují snadný přesun kapitol a stránek mezi knihami.',
+    'books_sort_desc' => 'Pro přeuspořádání obsahu přesuňte kapitoly a stránky v knize. Mohou být přidány další knihy, které umožní snadný přesun kapitol a stránek mezi knihami. Volitelně lze nastavit pravidlo automatického řazení, aby se při změnách automaticky seřadil obsah této knihy.',
+    'books_sort_auto_sort' => 'Možnost automatického řazení',
+    'books_sort_auto_sort_active' => 'Aktivní automatické řazení: :sortName',
     'books_sort_named' => 'Seřadit knihu :bookName',
     'books_sort_name' => 'Seřadit podle názvu',
     'books_sort_created' => 'Seřadit podle data vytvoření',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index 17c25b27b62..ab316a7c40c 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Zadejte seznam e-mailových domén oddělených čárkami, na které chcete registraci omezit. Registrujícímu se uživateli bude zaslán e-mail, aby ověřil svoji e-mailovou adresu před tím, než mu bude přístup do aplikace povolen. <br> Upozorňujeme, že po úspěšné registraci může uživatel svoji e-mailovou adresu změnit.',
     'reg_confirm_restrict_domain_placeholder' => 'Žádná omezení nebyla nastavena',
 
+    // Sorting Settings
+    'sorting' => 'Řazení',
+    'sorting_book_default' => 'Výchozí řazení knih',
+    'sorting_book_default_desc' => 'Vybere výchozí pravidlo řazení pro nové knihy. Řazení neovlivní existující knihy a může být upraveno u konkrétní knihy.',
+    'sorting_rules' => 'Pravidla řazení',
+    'sorting_rules_desc' => 'Toto jsou předem definovaná pravidla řazení, která mohou být použita na webu.',
+    'sort_rule_assigned_to_x_books' => 'Přiřazeno k :count knize|Přiřazeno :count knihám',
+    'sort_rule_create' => 'Vytvořit pravidlo řazení',
+    'sort_rule_edit' => 'Upravit pravidlo řazení',
+    'sort_rule_delete' => 'Odstranit pravidlo řazení',
+    'sort_rule_delete_desc' => 'Odstraní toto pravidlo řazení z webu. Knihy, které jej používají, se vrátí k ručnímu řazení.',
+    'sort_rule_delete_warn_books' => 'Toto pravidlo řazení se v současné době používá na :count knihách. Opravdu ho chcete smazat?',
+    'sort_rule_delete_warn_default' => 'Toto pravidlo řazení je v současné době používáno jako výchozí. Opravdu ho chcete odstranit?',
+    'sort_rule_details' => 'Podrobnosti pravidla pro řazení',
+    'sort_rule_details_desc' => 'Nastavte název pro toto pravidlo, který se zobrazí v seznamu při výběru řazení.',
+    'sort_rule_operations' => 'Možnosti řazení',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Dostupné operace',
+    'sort_rule_available_operations_empty' => 'Žádné zbývající operace',
+    'sort_rule_configured_operations' => 'Konfigurované operace',
+    'sort_rule_configured_operations_empty' => 'Přetáhněte/přidejte operace ze seznamu "Dostupné operace"',
+    'sort_rule_op_asc' => '(Vzest)',
+    'sort_rule_op_desc' => '(Sest)',
+    'sort_rule_op_name' => 'Název - abecední',
+    'sort_rule_op_name_numeric' => 'Název - číselné',
+    'sort_rule_op_created_date' => 'Datum vytvoření',
+    'sort_rule_op_updated_date' => 'Datum aktualizace',
+    'sort_rule_op_chapters_first' => 'Kapitoly jako první',
+    'sort_rule_op_chapters_last' => 'Kapitoly jako poslední',
+
     // Maintenance settings
     'maint' => 'Údržba',
     'maint_image_cleanup' => 'Pročistění obrázků',
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index e5dcddc56e1..2459f2357f5 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook wedi\'i dileu\'n llwyddiannus',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'creodd fewnforyn',
+    'import_create_notification' => 'Mewnforyn wedi\'i lwytho i fyny\'n llwyddiannus',
+    'import_run' => 'diweddarodd fewnforyn',
+    'import_run_notification' => 'Cynnwys wedi\'i fewnforio\'n llwyddiannus',
+    'import_delete' => 'dileodd fewnforyn',
+    'import_delete_notification' => 'Mewnforyn wedi\'i ddileu\'n llwyddiannus',
 
     // Users
     'user_create' => 'creodd ddefnyddiwr',
@@ -127,6 +127,14 @@
     'comment_update'              => 'diweddarodd sylw',
     'comment_delete'              => 'dileodd sylw',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'caniatadau wedi\'u diweddaru',
 ];
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index a10fc7d0be4..93e1aed2019 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Canslo',
     'save' => 'Cadw',
     'close' => 'Cau',
+    'apply' => 'Apply',
     'undo' => 'Dadwneud',
     'redo' => 'Ail-wneud',
     'left' => 'Chwith',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Testun i\'w arddangos',
     'title' => 'Teitl',
+    'browse_links' => 'Browse links',
     'open_link' => 'Agor dolen',
     'open_link_in' => 'Agor dolen yn...',
     'open_link_current' => 'Ffenestr bresennol',
@@ -163,8 +165,8 @@
     'about' => 'Ynglŷn â\'r golygydd',
     'about_title' => 'Ynglŷn â\'r Golygydd WYSIWYG',
     'editor_license' => 'Trwydded a Hawlfraint Golygydd',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Mae\'r golygydd hwn wedi\'i adeiladu fel fforc o :lexicalLink sy\'n cael ei ddosbarthu o dan y drwydded MIT.',
+    'editor_lexical_license_link' => 'Gellir gweld manylion llawn y drwydded yma.',
     'editor_tiny_license' => 'Mae\'r golygydd hwn wedi\'i adeiladu gan ddefnyddio :tinyLink sy\'n cael ei ddarparu o dan y drwydded MIT.',
     'editor_tiny_license_link' => 'Gellir dod o hyd i fanylion hawlfraint a thrwydded TinyMCE yma.',
     'save_continue' => 'Cadw Tudalen a Pharhau',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index d153ba453bf..bf4bc554c82 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'Ffeil PDF',
     'export_text' => 'Ffeil Testun Plaen',
     'export_md' => 'Ffeil Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'ZIP cludadwy',
     'default_template' => 'Templed Tudalen Diofyn',
     'default_template_explain' => 'Clustnodwch dempled tudalen a fydd yn cael ei ddefnyddio fel y cynnwys diofyn ar gyfer pob tudalen a grëwyd yn yr eitem hon. Cofiwch y bydd hwn ond yn cael ei ddefnyddio os yw’r sawl a grëodd y dudalen â mynediad gweld i’r dudalen dempled a ddewiswyd.',
     'default_template_select' => 'Dewiswch dudalen templed',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Mewnforio',
+    'import_validate' => 'Dilysu\'r Mewnforyn',
+    'import_desc' => 'Mewnforio llyfrau, pennodau & tudalennau gan allforyn zip cludadwy o\'r un enghraifft, neu enghraifft wahanol. Dewis ffeil ZIP i barhau. Ar ôl i\'r ffeil wedi cael ei llwytho i fyny a dilysu, gallwch chi ffurfweddu & cadarnhau\'r mewnforyn yn yr olygfa nesa.',
+    'import_zip_select' => 'Dewis ffeil ZIP i lwytho i fyny',
+    'import_zip_validation_errors' => 'Wedi canfod gwallau pan ddilysu\'r ffeil ZIP wedi\'i roi:',
+    'import_pending' => 'Mewnforion i Ddod',
+    'import_pending_none' => 'Nid wedi dechrau unrhyw fewnforion.',
+    'import_continue' => 'Parhau Mewnforyn',
+    'import_continue_desc' => 'Adolygu\'r cynnwys sy\'n ddod i gael ei fewnforio o\'r ffeil ZIP wedi\'i lwytho i fyny. Pan barod, Rhedeg y mewnforyn i ychwanegu ei gynnwys â\'r system yma. Bydd y ffeil ZIP yn cael ei symud yn awtomatig ar ôl mewnforyn llwyddiannus.',
+    'import_details' => 'Manylion Mewnforyn',
+    'import_run' => 'Rhedeg y Mewnforyn',
+    'import_size' => ':size Mewnforio Maint ZIP',
+    'import_uploaded_at' => 'Wedi\'i lwytho i fyny :relativeTime',
+    'import_uploaded_by' => 'Llwythwyd gan',
+    'import_location' => 'Lleoliad Mewnforyn',
+    'import_location_desc' => 'Dewis lleoliad targedi\'r cynnwys wedi\'i mewnforio. Bydd angen yr hawliau perthnasol i greu yn y lleoliad yno.',
+    'import_delete_confirm' => 'Ydych chi\'n siŵr eich bod eisiau dileu\'r mewnforyn yma?',
+    'import_delete_desc' => 'Bydd hwn yn dileu\'r mewnforyn ffeil ZIP sy wedi\'i lwytho i fyny, a fydd e ddim gallu cael ei ddadwneud.',
+    'import_errors' => 'Gwallau Mewnforyn',
+    'import_errors_desc' => 'Digwyddodd y gwallau canlynol yn ystod cynnig y mewnforyn:',
 
     // Permissions and restrictions
     'permissions' => 'Caniatâd',
@@ -166,7 +166,9 @@
     'books_search_this' => 'Chwilio\'r llyfr hwn',
     'books_navigation' => 'Llywio Llyfr',
     'books_sort' => 'Trefnu Cynnwys Llyfr',
-    'books_sort_desc' => 'Symudwch benodau a thudalennau o fewn llyfr i ad-drefnu ei gynnwys. Gellir ychwanegu llyfrau eraill sy\'n caniatáu symud penodau a thudalennau yn hawdd rhwng llyfrau.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Trefnu Llyfr :bookName',
     'books_sort_name' => 'Trefnu yn ôl Enw',
     'books_sort_created' => 'Trefnu yn ôl Dyddiad Creu',
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index 4fe90a0c1dc..db3a468b60a 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'Bydd yn ôl i fyny yn fuan.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Wedi methu darllen ffeil ZIP.',
+    'import_zip_cant_decode_data' => 'Wedi methu ffeindio a dadgodio cynnwys ZIP data.json.',
+    'import_zip_no_data' => 'Nid oes cynnwys llyfr, pennod neu dudalen disgwyliedig yn nata ffeil ZIP.',
+    'import_validation_failed' => 'ZIP mewnforyn wedi\'i methu dilysu gyda gwallau:',
+    'import_zip_failed_notification' => 'Wedi methu mewnforio ffeil ZIP.',
+    'import_perms_books' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu llyfrau.',
+    'import_perms_chapters' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu pennodau.',
+    'import_perms_pages' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu tudalennau.',
+    'import_perms_images' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu delwau.',
+    'import_perms_attachments' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu atodiadau.',
 
     // API errors
     'api_no_authorization_found' => 'Ni chanfuwyd tocyn awdurdodi ar y cais',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index 92b2d65d968..fb1457e1e54 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Rhowch restr wedi\'i gwahanu gan goma o barthau e-bost yr hoffech gyfyngu cofrestriad iddynt. Bydd defnyddwyr yn cael e-bost i gadarnhau eu cyfeiriad cyn cael caniatâd i ryngweithio â\'r rhaglen. <br> Noder y bydd modd i ddefnyddwyr newid eu cyfeiriadau e-bost ar ôl cofrestru\'n llwyddiannus.',
     'reg_confirm_restrict_domain_placeholder' => 'Ni osodwyd cyfyngiad',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Cynnal',
     'maint_image_cleanup' => 'Glanhau Delweddau',
@@ -162,7 +192,7 @@
     'role_access_api' => 'Mynediad i Ryngwyneb Rhaglennu Cymwysiadau (API) system',
     'role_manage_settings' => 'Rheoli gosodiadau apiau',
     'role_export_content' => 'Cynnwys allforio',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Mewnforio Cynnwys',
     'role_editor_change' => 'Newid golygydd tudalen',
     'role_notifications' => 'Derbyn a rheoli hysbysiadau',
     'role_asset' => 'Caniatâd Asedau',
diff --git a/lang/cy/validation.php b/lang/cy/validation.php
index fd3483ddc4c..5259f647244 100644
--- a/lang/cy/validation.php
+++ b/lang/cy/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'Mae’r fformat :attribute yn annilys.',
     'uploaded'             => 'Nid oedd modd uwchlwytho’r ffeil. Efallai na fydd y gweinydd yn derbyn ffeiliau o\'r maint hwn.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'Mae\'r :attribute angen cyfeirio at ffeil yn y ZIP.',
+    'zip_file_mime' => 'Mae\'r :attribute angen cyfeirio at ffeil o fath :valid Types, sydd wedi\'i ffeindio :foundType.',
+    'zip_model_expected' => 'Dyswgyl am wrthrych data ond wedi ffeindio ":type".',
+    'zip_unique' => 'Mae rhaid y :attribute fod yn unigol i\'r fath o wrthrych yn y ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/da/activities.php b/lang/da/activities.php
index f6053318f27..fa11e8e3afb 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -59,12 +59,12 @@
     'favourite_remove_notification' => '":name" er blevet fjernet fra dine favoritter',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Opdatering af urets præferencer lykkedes',
 
     // Auth
     'auth_login' => 'loggede ind',
     'auth_register' => 'registreret som ny bruger',
-    'auth_password_reset_request' => 'requested user password reset',
+    'auth_password_reset_request' => 'anmodet om nulstilling af brugeradgangskode',
     'auth_password_reset_update' => 'nulstil adgangskode',
     'mfa_setup_method' => 'konfigureret MFA metode',
     'mfa_setup_method_notification' => 'Multi-faktor metode konfigureret',
@@ -74,7 +74,7 @@
     // Settings
     'settings_update' => 'opdaterede indstillinger',
     'settings_update_notification' => 'Indstillinger opdateret',
-    'maintenance_action_run' => 'ran maintenance action',
+    'maintenance_action_run' => 'kørte vedligeholdelsesaktion',
 
     // Webhooks
     'webhook_create' => 'oprettede webhook',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhooken blev slettet',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'oprettet import',
+    'import_create_notification' => 'Importen er uploadet med succes',
+    'import_run' => 'opdateret import',
+    'import_run_notification' => 'Indhold importeret med succes',
+    'import_delete' => 'slettet import',
+    'import_delete_notification' => 'Import slettet med succes',
 
     // Users
     'user_create' => 'opret bruger',
@@ -102,11 +102,11 @@
 
     // API Tokens
     'api_token_create' => 'oprettet API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create_notification' => 'API-token oprettet med succes',
+    'api_token_update' => 'opdateret API-token',
+    'api_token_update_notification' => 'API-token opdateret med succes',
+    'api_token_delete' => 'slettet API-token',
+    'api_token_delete_notification' => 'API-token slettet med succes',
 
     // Roles
     'role_create' => 'oprettet rolle',
@@ -117,16 +117,24 @@
     'role_delete_notification' => 'Rollen blev slettet',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'tømt papirkurven',
+    'recycle_bin_restore' => 'gendannet fra papirkurven',
+    'recycle_bin_destroy' => 'fjernet fra papirkurven',
 
     // Comments
     'commented_on'                => 'kommenterede til',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'tilføjet kommentar',
+    'comment_update'              => 'opdateret kommentar',
+    'comment_delete'              => 'slettet kommentar',
+
+    // Sort Rules
+    'sort_rule_create' => 'oprettet sorteringsregel',
+    'sort_rule_create_notification' => 'Sorteringsregel oprettet med succes',
+    'sort_rule_update' => 'opdateret sorteringsregel',
+    'sort_rule_update_notification' => 'Sorteringsregel opdateret med succes',
+    'sort_rule_delete' => 'slettet sorteringsregel',
+    'sort_rule_delete_notification' => 'Sorteringsregel slettet med succes',
 
     // Other
-    'permissions_update'          => 'Tilladelser opdateret',
+    'permissions_update'          => 'opdaterede tilladelser',
 ];
diff --git a/lang/da/auth.php b/lang/da/auth.php
index fb11ea6865a..9f717a3d563 100644
--- a/lang/da/auth.php
+++ b/lang/da/auth.php
@@ -62,7 +62,7 @@
     'email_confirm_success' => 'Din email er blevet bekræftet! Du bør nu kune logge ind med denne emailadresse.',
     'email_confirm_resent' => 'Bekræftelsesmail sendt, tjek venligst din indboks.',
     'email_confirm_thanks' => 'Tak for bekræftelsen!',
-    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+    'email_confirm_thanks_desc' => 'Vent venligst et øjeblik, mens din bekræftelse behandles. Hvis du ikke bliver omdirigeret efter 3 sekunder, skal du trykke på linket "Fortsæt" nedenfor for at fortsætte.',
 
     'email_not_confirmed' => 'E-Mail adresse ikke bekræftet',
     'email_not_confirmed_text' => 'Din E-Mail adresse er endnu ikke blevet bekræftet.',
@@ -91,27 +91,27 @@
     'mfa_option_totp_title' => 'Mobil app',
     'mfa_option_totp_desc' => 'For at bruge multi-faktor godkendelse, skal du bruge en mobil app, der understøtter TOTP såsom Google Authenticator, Authy eller Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup koder',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Genererer et sæt backup-koder til engangsbrug, som du skal indtaste ved login for at bekræfte din identitet. Sørg for at opbevare dem et sikkert sted.',
     'mfa_gen_confirm_and_enable' => 'Bekræft og aktivér',
     'mfa_gen_backup_codes_title' => 'Backup koder opsætning',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_desc' => 'Opbevar nedenstående liste med koder et sikkert sted. Når du får adgang til systemet, kan du bruge en af koderne som en ekstra godkendelsesmekanisme.',
     'mfa_gen_backup_codes_download' => 'Download koder',
     'mfa_gen_backup_codes_usage_warning' => 'Hver kode kan kun bruges en gang',
     'mfa_gen_totp_title' => 'Mobil App Setup',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_desc' => 'For at bruge multifaktorgodkendelse skal du bruge en mobilapplikation, der understøtter TOTP, f.eks. Google Authenticator, Authy eller Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan QR-koden nedenfor med din foretrukne godkendelsesapp for at komme i gang.',
     'mfa_gen_totp_verify_setup' => 'Verificer Opsætning',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_gen_totp_verify_setup_desc' => 'Kontrollér, at alt fungerer, ved at indtaste en kode, der er genereret i din godkendelsesapp, i indtastningsfeltet nedenfor:',
+    'mfa_gen_totp_provide_code_here' => 'Angiv din app-genererede kode her',
     'mfa_verify_access' => 'Bekræft Adgang',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_access_desc' => 'Din brugerkonto kræver, at du bekræfter din identitet via et ekstra verifikationsniveau, før du får adgang. Bekræft ved hjælp af en af dine konfigurerede metoder for at fortsætte.',
     'mfa_verify_no_methods' => 'Ingen Metoder Konfigureret',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_no_methods_desc' => 'Der blev ikke fundet nogen metoder til multifaktorgodkendelse til din konto. Du skal konfigurere mindst én metode, før du får adgang.',
     'mfa_verify_use_totp' => 'Bekræft ved brug af en mobil app',
     'mfa_verify_use_backup_codes' => 'Bekræft ved hjælp af en backup kode',
     'mfa_verify_backup_code' => 'Backup Kode',
     'mfa_verify_backup_code_desc' => 'Indtast en af dine resterende backup koder nedenfor:',
     'mfa_verify_backup_code_enter_here' => 'Indtast backup kode her',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_verify_totp_desc' => 'Indtast koden, der er genereret med din mobilapp, nedenfor:',
+    'mfa_setup_login_notification' => 'Multifaktormetode konfigureret, log venligst ind igen med den konfigurerede metode.',
 ];
diff --git a/lang/da/editor.php b/lang/da/editor.php
index 054c4262794..2f9b9f93662 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Annuller',
     'save' => 'Gem',
     'close' => 'Luk',
+    'apply' => 'Anvend',
     'undo' => 'Fortryd',
     'redo' => 'Gendan',
     'left' => 'Venstre',
@@ -60,30 +61,30 @@
     'indent_increase' => 'Forøg indrykning',
     'indent_decrease' => 'Formindsk indrykning',
     'table' => 'Tabel',
-    'insert_image' => 'Insert image',
-    'insert_image_title' => 'Insert/Edit Image',
+    'insert_image' => 'Indsæt billede',
+    'insert_image_title' => 'Indsæt/rediger billede',
     'insert_link' => 'Indsæt/rediger link',
     'insert_link_title' => 'Indsæt/Rediger Link',
     'insert_horizontal_line' => 'Indsæt vandret linje',
     'insert_code_block' => 'Indsæt kodeblok',
-    'edit_code_block' => 'Edit code block',
+    'edit_code_block' => 'Rediger kodeblok',
     'insert_drawing' => 'Indsæt/rediger tegning',
-    'drawing_manager' => 'Drawing manager',
+    'drawing_manager' => 'Tegningsansvarlig',
     'insert_media' => 'Indsæt/rediger medie',
     'insert_media_title' => 'Indsæt/Rediger Medie',
     'clear_formatting' => 'Ryd formatering',
     'source_code' => 'Kildekode',
     'source_code_title' => 'Kildekode',
     'fullscreen' => 'Fuld skærm',
-    'image_options' => 'Image options',
+    'image_options' => 'Billedindstillinger',
 
     // Tables
     'table_properties' => 'Tabelegenskaber',
     'table_properties_title' => 'Tabelegenskaber',
     'delete_table' => 'Slet tabel',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Ryd tabelformatering',
+    'resize_to_contents' => 'Ændre størrelse til indhold',
+    'row_header' => 'Rækkeoverskrift',
     'insert_row_before' => 'Indsæt række før',
     'insert_row_after' => 'Indsæt række efter',
     'delete_row' => 'Slet række',
@@ -97,8 +98,8 @@
     'cell_properties_title' => 'Celle Egenskaber',
     'cell_type' => 'Celle type',
     'cell_type_cell' => 'Celle',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
+    'cell_scope' => 'Omfang',
+    'cell_type_header' => 'Overskriftscelle',
     'merge_cells' => 'Flet celler',
     'split_cell' => 'Opdel celle',
     'table_row_group' => 'Række Gruppe',
@@ -123,18 +124,18 @@
     'copy_column' => 'Kopier kolonne',
     'paste_column_before' => 'Indsæt kolonne før',
     'paste_column_after' => 'Indsæt kolonne efter',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
+    'cell_padding' => 'Celle margen',
+    'cell_spacing' => 'Celle afstand',
     'caption' => 'Citat',
     'show_caption' => 'Vis citat',
-    'constrain' => 'Constrain proportions',
+    'constrain' => 'Begræns proportioner',
     'cell_border_solid' => 'Solid',
     'cell_border_dotted' => 'Prikket',
     'cell_border_dashed' => 'Stiplet',
     'cell_border_double' => 'Dobbelt',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
+    'cell_border_groove' => 'Udfræsning',
+    'cell_border_ridge' => 'Kant',
+    'cell_border_inset' => 'Indsat',
     'cell_border_outset' => 'Outset',
     'cell_border_none' => 'Ingen',
     'cell_border_hidden' => 'Gemt',
@@ -142,34 +143,35 @@
     // Images, links, details/summary & embed
     'source' => 'Kilde',
     'alt_desc' => 'Alternativ beskrivelse',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
+    'embed' => 'Indlejre',
+    'paste_embed' => 'Indsæt din indlejringskode nedenfor:',
     'url' => 'URL',
     'text_to_display' => 'Tekst til visning',
     'title' => 'Titel',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
+    'browse_links' => 'Gennemse links',
+    'open_link' => 'Åbn link',
+    'open_link_in' => 'Åbn link i...',
     'open_link_current' => 'Nuværende vindue',
     'open_link_new' => 'Nyt vindue',
-    'remove_link' => 'Remove link',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'remove_link' => 'Fjern link',
+    'insert_collapsible' => 'Indsæt sammenklappelig blok',
+    'collapsible_unwrap' => 'Pak ud',
+    'edit_label' => 'Rediger mærkat',
+    'toggle_open_closed' => 'Skift mellem åben og lukket',
+    'collapsible_edit' => 'Rediger sammenklappelig blok',
+    'toggle_label' => 'Skift etiket',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'about' => 'Om redaktøren',
+    'about_title' => 'Om WYSIWYG-editoren',
+    'editor_license' => 'Editor-licens og copyright',
+    'editor_lexical_license' => 'Denne editor er bygget som en forgrening af :lexicalLink, som distribueres under MIT-licensen.',
+    'editor_lexical_license_link' => 'Du kan finde alle licensoplysninger her.',
+    'editor_tiny_license' => 'Denne editor er bygget ved hjælp af :tinyLink, som leveres under MIT-licensen.',
+    'editor_tiny_license_link' => 'Oplysninger om copyright og licens for TinyMCE kan findes her.',
     'save_continue' => 'Gem og fortsæt',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
+    'callouts_cycle' => '(Bliv ved med at trykke for at skifte mellem typerne)',
+    'link_selector' => 'Link til indhold',
     'shortcuts' => 'Genveje',
     'shortcut' => 'Genvej',
     'shortcuts_intro' => 'Følgende genveje er tilgængelige i editoren:',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index eca5f1f0296..cfd2a193652 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -23,9 +23,9 @@
     'meta_updated' => 'Opdateret :timeLength',
     'meta_updated_name' => 'Opdateret :timeLength af :user',
     'meta_owned_name' => 'Ejet af :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Refereret af :count item|Refereret af :count items',
     'entity_select' => 'Vælg emne',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'entity_select_lack_permission' => 'Du har ikke de nødvendige tilladelser til at vælge dette element',
     'images' => 'Billeder',
     'my_recent_drafts' => 'Mine seneste kladder',
     'my_recently_viewed' => 'Mine senest viste',
@@ -39,42 +39,42 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Almindelig tekstfil',
     'export_md' => 'Markdown Fil',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'export_zip' => 'Bærbar ZIP',
+    'default_template' => 'Standard sideskabelon',
+    'default_template_explain' => 'Tildel en sideskabelon, der vil blive brugt som standardindhold for alle sider, der oprettes i dette element. Husk, at dette kun vil blive brugt, hvis sideskaberen har adgang til den valgte skabelonside.',
+    'default_template_select' => 'Vælg en skabelonside',
+    'import' => 'Importer',
+    'import_validate' => 'Valider import',
+    'import_desc' => 'Importer bøger, kapitler og sider ved hjælp af en bærbar zip-eksport fra den samme eller en anden instans. Vælg en ZIP-fil for at fortsætte. Når filen er blevet uploadet og valideret, kan du konfigurere og bekræfte importen i den næste visning.',
+    'import_zip_select' => 'Vælg den ZIP-fil, der skal uploades',
+    'import_zip_validation_errors' => 'Der blev opdaget fejl under validering af den medfølgende ZIP-fil:',
+    'import_pending' => 'Afventende import',
+    'import_pending_none' => 'Der er ikke startet nogen import.',
+    'import_continue' => 'Fortsæt med at importere',
+    'import_continue_desc' => 'Gennemgå det indhold, der skal importeres fra den uploadede ZIP-fil. Når du er klar, skal du køre importen for at tilføje dens indhold til dette system. Den uploadede ZIP-importfil fjernes automatisk, når importen er vellykket.',
+    'import_details' => 'Import detaljer',
+    'import_run' => 'Kør import',
+    'import_size' => ':size Importer ZIP-størrelse',
+    'import_uploaded_at' => 'Uploadet :relativeTime',
+    'import_uploaded_by' => 'Uploadet af',
+    'import_location' => 'Importplacering',
+    'import_location_desc' => 'Vælg en målplacering for dit importerede indhold. Du skal have de relevante tilladelser til at oprette på den valgte placering.',
+    'import_delete_confirm' => 'Er du sikker på, at du vil slette denne import?',
+    'import_delete_desc' => 'Dette vil slette den uploadede ZIP-fil og kan ikke fortrydes.',
+    'import_errors' => 'Importfejl',
+    'import_errors_desc' => 'Følgende fejl opstod under importforsøget:',
 
     // Permissions and restrictions
     'permissions' => 'Rettigheder',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_desc' => 'Angiv tilladelser her for at tilsidesætte de standardtilladelser, der gives af brugerroller.',
+    'permissions_book_cascade' => 'Tilladelser, der er indstillet på bøger, vil automatisk blive overført til underordnede kapitler og sider, medmindre de har deres egne tilladelser defineret.',
+    'permissions_chapter_cascade' => 'Tilladelser, der er indstillet på kapitler, overføres automatisk til underordnede sider, medmindre de har deres egne tilladelser defineret.',
     'permissions_save' => 'Gem tilladelser',
     'permissions_owner' => 'Ejer',
     'permissions_role_everyone_else' => 'Alle andre',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions_role_everyone_else_desc' => 'Indstil tilladelser for alle roller, der ikke specifikt er tilsidesat.',
+    'permissions_role_override' => 'Tilsidesæt tilladelser for rolle',
+    'permissions_inherit_defaults' => 'Arv standardindstillinger',
 
     // Search
     'search_results' => 'Søgeresultater',
@@ -117,24 +117,24 @@
     'shelves_save' => 'Gem reol',
     'shelves_books' => 'Bøger på denne reol',
     'shelves_add_books' => 'Tilføj bøger til denne reol',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_drag_books' => 'Træk bøger nedenfor for at tilføje dem til denne hylde',
     'shelves_empty_contents' => 'Denne reol har ingen bøger tilknyttet til den',
     'shelves_edit_and_assign' => 'Rediger reol for at tilføje bøger',
-    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit_named' => 'Rediger hylde :navn',
     'shelves_edit' => 'Rediger Reol',
     'shelves_delete' => 'Slettede reoler',
-    'shelves_delete_named' => 'Delete Shelf :name',
-    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_delete_named' => 'Slet hylde :navn',
+    'shelves_delete_explain' => "Dette vil slette hylden med navnet ':navn'. Indeholdte bøger vil ikke blive slettet.",
+    'shelves_delete_confirmation' => 'Er du sikker på, at du vil slette denne hylde?',
+    'shelves_permissions' => 'Tilladelser til hylder',
+    'shelves_permissions_updated' => 'Tilladelser til hylder opdateret',
+    'shelves_permissions_active' => 'Hyldetilladelser aktive',
+    'shelves_permissions_cascade_warning' => 'Tilladelser på hylder overføres ikke automatisk til indeholdte bøger. Det skyldes, at en bog kan findes på flere hylder. Tilladelser kan dog kopieres ned til underordnede bøger ved hjælp af nedenstående mulighed.',
+    'shelves_permissions_create' => 'Hyldeoprettelsestilladelser bruges kun til at kopiere tilladelser til underordnede bøger ved hjælp af nedenstående handling. De kontrollerer ikke muligheden for at oprette bøger.',
     'shelves_copy_permissions_to_books' => 'Kopier tilladelser til bøger',
     'shelves_copy_permissions' => 'Kopier tilladelser',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => 'Dette vil anvende de aktuelle tilladelsesindstillinger for denne hylde på alle bøger, der er indeholdt i den. Før du aktiverer, skal du sikre dig, at eventuelle ændringer af tilladelserne for denne hylde er blevet gemt.',
+    'shelves_copy_permission_success' => 'Hyldetilladelser kopieret til :count books',
 
     // Books
     'book' => 'Bog',
@@ -166,7 +166,9 @@
     'books_search_this' => 'Søg i denne bog',
     'books_navigation' => 'Bognavigation',
     'books_sort' => 'Sorter bogindhold',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Flyt kapitler og sider i en bog for at omorganisere dens indhold. Der kan tilføjes andre bøger, som gør det nemt at flytte kapitler og sider mellem bøgerne. Man kan indstille en automatisk sorteringsregel, så bogens indhold automatisk sorteres efter ændringer.',
+    'books_sort_auto_sort' => 'Mulighed for automatisk sortering',
+    'books_sort_auto_sort_active' => 'Automatisk sortering Aktiv: :sortName',
     'books_sort_named' => 'Sorter bog :bookName',
     'books_sort_name' => 'Sortér efter navn',
     'books_sort_created' => 'Sortér efter oprettelsesdato',
@@ -175,7 +177,7 @@
     'books_sort_chapters_last' => 'Kapitler sidst',
     'books_sort_show_other' => 'Vis andre bøger',
     'books_sort_save' => 'Gem ny ordre',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_show_other_desc' => 'Tilføj andre bøger her for at inkludere dem i sorteringen og gøre det nemt at omorganisere på tværs af bøger.',
     'books_sort_move_up' => 'Flyt op',
     'books_sort_move_down' => 'Flyt ned',
     'books_sort_move_prev_book' => 'Flyt til forrige bog',
@@ -184,8 +186,8 @@
     'books_sort_move_next_chapter' => 'Flyt Til Næste Kapitel',
     'books_sort_move_book_start' => 'Flyt til Start af bog',
     'books_sort_move_book_end' => 'Flyt til slutningen af bogen',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_sort_move_before_chapter' => 'Gå til kapitlet Før',
+    'books_sort_move_after_chapter' => 'Flyt til Efter kapitel',
     'books_copy' => 'Kopier Bog',
     'books_copy_success' => 'Bogen blev kopieret',
 
@@ -212,7 +214,7 @@
     'chapters_permissions_active' => 'Aktive kapiteltilladelser',
     'chapters_permissions_success' => 'Kapiteltilladelser opdateret',
     'chapters_search_this' => 'Søg i dette kapitel',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter_sort_book' => 'Sorter bog',
 
     // Pages
     'page' => 'Side',
@@ -228,7 +230,7 @@
     'pages_delete_draft' => 'Slet kladdeside',
     'pages_delete_success' => 'Side slettet',
     'pages_delete_draft_success' => 'Kladdeside slettet',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Denne side er i aktiv brug som standardsideskabelon for en bog eller et kapitel. Disse bøger eller kapitler vil ikke længere have en standardsideskabelon tildelt, når denne side er slettet.',
     'pages_delete_confirm' => 'Er du sikker på, du vil slette denne side?',
     'pages_delete_draft_confirm' => 'Er du sikker på at du vil slette denne kladdesidde?',
     'pages_editing_named' => 'Redigerer :pageName',
@@ -239,23 +241,23 @@
     'pages_editing_page' => 'Redigerer side',
     'pages_edit_draft_save_at' => 'Kladde gemt ved ',
     'pages_edit_delete_draft' => 'Slet kladde',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'Er du sikker på, at du vil slette dine ændringer på kladdesiden? Alle dine ændringer siden den sidste fulde lagring vil gå tabt, og editoren vil blive opdateret med den seneste lagring af siden uden udkast.',
     'pages_edit_discard_draft' => 'Kassér kladde',
     'pages_edit_switch_to_markdown' => 'Skift til Markdown redigering',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_markdown_clean' => '(Rent indhold)',
+    'pages_edit_switch_to_markdown_stable' => '(Stabilt indhold)',
     'pages_edit_switch_to_wysiwyg' => 'Skift til WYSIWYG redigering',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Skift til ny WYSIWYG (Hvad man ser, er hvad man får)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(I alfa-testning)',
     'pages_edit_set_changelog' => 'Sæt ændringsoversigt',
     'pages_edit_enter_changelog_desc' => 'Indtast en kort beskrivelse af ændringer du har lavet',
     'pages_edit_enter_changelog' => 'Indtast ændringsoversigt',
     'pages_editor_switch_title' => 'Skift Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_are_you_sure' => 'Er du sikker på, at du vil ændre editoren for denne side?',
     'pages_editor_switch_consider_following' => 'Overvej følgende ved skift af redaktører:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_consideration_a' => 'Når den nye redaktørindstilling er gemt, vil den blive brugt af alle fremtidige redaktører, også dem, der måske ikke selv kan ændre redaktørtype.',
+    'pages_editor_switch_consideration_b' => 'Dette kan potentielt føre til tab af detaljer og syntaks under visse omstændigheder.',
+    'pages_editor_switch_consideration_c' => 'Ændringer i tag eller changelog, der er foretaget siden sidste lagring, fortsætter ikke på tværs af denne ændring.',
     'pages_save' => 'Gem siden',
     'pages_title' => 'Overskrift',
     'pages_name' => 'Sidenavn',
@@ -265,9 +267,9 @@
     'pages_md_insert_link' => 'Indsæt emnelink',
     'pages_md_insert_drawing' => 'Indsæt tegning',
     'pages_md_show_preview' => 'Vis forhåndsvisning',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_md_sync_scroll' => 'Rulning af forhåndsvisning af synkronisering',
+    'pages_drawing_unsaved' => 'Ikke gemt tegning fundet',
+    'pages_drawing_unsaved_confirm' => 'Der blev fundet ikke-gemte tegningsdata fra et tidligere mislykket forsøg på at gemme en tegning. Vil du gendanne og fortsætte med at redigere denne ikke-gemte tegning?',
     'pages_not_in_chapter' => 'Side er ikke i et kapitel',
     'pages_move' => 'Flyt side',
     'pages_copy' => 'Kopier side',
@@ -277,7 +279,7 @@
     'pages_permissions_success' => 'Sidetilladelser opdateret',
     'pages_revision' => 'Revision',
     'pages_revisions' => 'Sidserevisioner',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => 'Nedenfor findes alle tidligere revisioner af denne side. Du kan se tilbage på, sammenligne og gendanne gamle sideversioner, hvis tilladelserne tillader det. Sidens fulde historik afspejles muligvis ikke fuldt ud her, da gamle revisioner kan blive slettet automatisk, afhængigt af systemkonfigurationen.',
     'pages_revisions_named' => 'Siderevisioner for :pageName',
     'pages_revision_named' => 'Siderevision for :pageName',
     'pages_revision_restored_from' => 'Genoprettet fra #:id; :summary',
@@ -295,16 +297,16 @@
     'pages_revisions_restore' => 'Gendan',
     'pages_revisions_none' => 'Denne side har ingen revisioner',
     'pages_copy_link' => 'Kopier link',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_edit_content_link' => 'Spring til sektionen i editoren',
+    'pages_pointer_enter_mode' => 'Gå ind i sektionsvalgtilstand',
+    'pages_pointer_label' => 'Indstillinger for sideafsnit',
+    'pages_pointer_permalink' => 'Side Afsnit Permalink',
+    'pages_pointer_include_tag' => 'Sideafsnit inkluderer tag',
+    'pages_pointer_toggle_link' => 'Permalink-tilstand, tryk for at vise include-tag',
+    'pages_pointer_toggle_include' => 'Inkluder tag-tilstand, tryk for at vise permalink',
     'pages_permissions_active' => 'Aktive sidetilladelser',
     'pages_initial_revision' => 'Første udgivelse',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_references_update_revision' => 'Automatisk systemopdatering af interne links',
     'pages_initial_name' => 'Ny side',
     'pages_editing_draft_notification' => 'Du redigerer en kladde der sidst var gemt :timeDiff.',
     'pages_draft_edited_notification' => 'Siden har været opdateret siden da. Det er anbefalet at du kasserer denne kladde.',
@@ -316,8 +318,8 @@
         'time_b' => 'i de sidste :minCount minutter',
         'message' => ':start : time. Pas på ikke at overskrive hinandens opdateringer!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => 'Udkast kasseret! Editoren er blevet opdateret med det aktuelle sideindhold',
+    'pages_draft_deleted' => 'Udkast slettet! Editoren er blevet opdateret med det aktuelle sideindhold',
     'pages_specific' => 'Specifik side',
     'pages_is_template' => 'Sideskabelon',
 
@@ -329,13 +331,13 @@
     'shelf_tags' => 'Reoltags',
     'tag' => 'Tag',
     'tags' =>  'Tags',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => 'Tags kan anvendes på indhold i systemet for at anvende en fleksibel form for kategorisering. Tags kan have både en nøgle og en værdi, hvor værdien er valgfri. Når de er anvendt, kan der søges efter indhold ved hjælp af tagnavn og -værdi.',
     'tag_name' =>  'Tagnavn',
     'tag_value' => 'Tagværdi (valgfri)',
     'tags_explain' => "Tilføj nogle tags for bedre at kategorisere dit indhold. \n Du kan tildele en værdi til et tag for mere dybdegående organisering.",
     'tags_add' => 'Tilføj endnu et tag',
     'tags_remove' => 'Fjern dette tag',
-    'tags_usages' => 'Total tag usages',
+    'tags_usages' => 'Samlet brug af tags',
     'tags_assigned_pages' => 'Tildelt til sider',
     'tags_assigned_chapters' => 'Tildelt til Kapitler',
     'tags_assigned_books' => 'Tildelt til Bøger',
@@ -344,16 +346,16 @@
     'tags_all_values' => 'Alle værdier',
     'tags_view_tags' => 'Vis Tags',
     'tags_view_existing_tags' => 'Vis eksisterende tags',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'tags_list_empty_hint' => 'Tags kan tildeles via sideeditorens sidepanel eller under redigering af detaljerne i en bog, et kapitel eller en hylde.',
     'attachments' => 'Vedhæftninger',
     'attachments_explain' => 'Upload nogle filer, eller vedhæft nogle links, der skal vises på siden. Disse er synlige i sidepanelet.',
     'attachments_explain_instant_save' => 'Ændringer her gemmes med det samme.',
     'attachments_upload' => 'Upload fil',
     'attachments_link' => 'Vedhæft link',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => 'Alternativt kan du trække og slippe en fil her for at uploade den som en vedhæftet fil.',
     'attachments_set_link' => 'Sæt link',
     'attachments_delete' => 'Er du sikker på at du vil slette denne vedhæftning?',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'Slip filer her for at uploade',
     'attachments_no_files' => 'Ingen filer er blevet overført',
     'attachments_explain_link' => 'Du kan vedhæfte et link, hvis du foretrækker ikke at uploade en fil. Dette kan være et link til en anden side eller et link til en fil i skyen.',
     'attachments_link_name' => 'Linknavn',
@@ -396,13 +398,13 @@
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenteret :createDiff',
     'comment_updated' => 'Opdateret :updateDiff af :username',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => 'Opdateret',
     'comment_deleted_success' => 'Kommentar slettet',
     'comment_created_success' => 'Kommentaren er tilføjet',
     'comment_updated_success' => 'Kommentaren er opdateret',
     'comment_delete_confirm' => 'Er du sikker på, at du vil slette denne kommentar?',
     'comment_in_reply_to' => 'Som svar til :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_editor_explain' => 'Her er de kommentarer, der er blevet efterladt på denne side. Kommentarer kan tilføjes og administreres, når du ser den gemte side.',
 
     // Revision
     'revision_delete_confirm' => 'Er du sikker på at du vil slette denne revision?',
@@ -410,51 +412,51 @@
     'revision_cannot_delete_latest' => 'Kan ikke slette seneste revision.',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => 'Vær opmærksom på nedenstående, når du kopierer indhold.',
+    'copy_consider_permissions' => 'Brugerdefinerede tilladelsesindstillinger kopieres ikke.',
+    'copy_consider_owner' => 'Du bliver ejer af alt kopieret indhold.',
+    'copy_consider_images' => 'Sidens billedfiler vil ikke blive duplikeret, og de originale billeder vil bevare deres relation til den side, de oprindeligt blev uploadet til.',
+    'copy_consider_attachments' => 'Vedhæftede sider bliver ikke kopieret.',
+    'copy_consider_access' => 'En ændring af placering, ejer eller tilladelser kan resultere i, at dette indhold er tilgængeligt for dem, der tidligere ikke havde adgang.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_to_shelf' => 'Konverter til hylde',
+    'convert_to_shelf_contents_desc' => 'Du kan konvertere denne bog til en ny hylde med samme indhold. Kapitler i denne bog vil blive konverteret til nye bøger. Hvis denne bog indeholder sider, som ikke er i et kapitel, vil bogen blive omdøbt og indeholde sådanne sider, og bogen vil blive en del af den nye hylde.',
+    'convert_to_shelf_permissions_desc' => 'Alle tilladelser, der er indstillet på denne bog, vil blive kopieret til den nye hylde og til alle nye underordnede bøger, der ikke har deres egne tilladelser håndhævet. Bemærk, at tilladelser på hylder ikke automatisk overføres til indholdet på hylden, som de gør for bøger.',
     'convert_book' => 'Omdan Bog',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_book_confirm' => 'Er du sikker på, at du vil konvertere denne bog?',
+    'convert_undo_warning' => 'Det kan ikke gøres om så let.',
     'convert_to_book' => 'Omdan til Bog',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_to_book_desc' => 'Du kan konvertere dette kapitel til en ny bog med samme indhold. Alle tilladelser, der er indstillet på dette kapitel, vil blive kopieret til den nye bog, men eventuelle nedarvede tilladelser fra den overordnede bog vil ikke blive kopieret, hvilket kan føre til en ændring af adgangskontrollen.',
     'convert_chapter' => 'Omdan Kapitel',
     'convert_chapter_confirm' => 'Er du sikker på at du vil omdanne dette kapitel?',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'Kilder',
+    'references_none' => 'Der er ingen sporede referencer til dette emne.',
+    'references_to_desc' => 'Nedenfor vises alt det kendte indhold i systemet, som linker til dette element.',
 
     // Watch Options
     'watch' => 'Overvåg',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_title_default' => 'Standardindstillinger',
+    'watch_desc_default' => 'Gå tilbage til kun at se dine standardindstillinger for notifikationer.',
+    'watch_title_ignore' => 'Ignorér',
+    'watch_desc_ignore' => 'Ignorer alle meddelelser, også dem fra indstillinger på brugerniveau.',
+    'watch_title_new' => 'Nye sider',
+    'watch_desc_new' => 'Giv besked, når der oprettes en ny side i dette element.',
+    'watch_title_updates' => 'Alle sideopdateringer',
+    'watch_desc_updates' => 'Giv besked om alle nye sider og sideændringer.',
+    'watch_desc_updates_page' => 'Giv besked om alle sideændringer.',
+    'watch_title_comments' => 'Alle sideopdateringer og kommentarer',
+    'watch_desc_comments' => 'Giv besked om alle nye sider, sideændringer og nye kommentarer.',
+    'watch_desc_comments_page' => 'Giv besked ved sideændringer og nye kommentarer.',
+    'watch_change_default' => 'Skift indstillinger for standardmeddelelser',
+    'watch_detail_ignore' => 'Ignorerer notifikationer',
+    'watch_detail_new' => 'Holder øje med nye sider',
+    'watch_detail_updates' => 'Holder øje med nye sider og opdateringer',
+    'watch_detail_comments' => 'Holder øje med nye sider, opdateringer og kommentarer',
+    'watch_detail_parent_book' => 'Se med via forældrebogen',
+    'watch_detail_parent_book_ignore' => 'Ignorering via forældrebog',
+    'watch_detail_parent_chapter' => 'Se med via forældrekapitel',
+    'watch_detail_parent_chapter_ignore' => 'Ignorering via forældrekapitel',
 ];
diff --git a/lang/da/errors.php b/lang/da/errors.php
index f12dbab57c8..864dec270dc 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En bruger med email :email eksistere allerede, men med andre legitimationsoplysninger.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Brugerkonto kunne ikke registreres for de angivne detaljer',
     'email_already_confirmed' => 'Email er allerede bekræftet. Prøv at logge ind.',
     'email_confirmation_invalid' => 'Denne bekræftelsestoken er ikke gyldig eller er allerede blevet brugt. Prøv at registrere dig igen.',
     'email_confirmation_expired' => 'Bekræftelsestoken er udløbet. En ny bekræftelsesmail er blevet sendt.',
@@ -37,37 +37,37 @@
     'social_driver_not_found' => 'Socialdriver ikke fundet',
     'social_driver_not_configured' => 'Dine :socialAccount indstillinger er ikke konfigureret korret.',
     'invite_token_expired' => 'Dette invitationslink er udløbet. I stedet kan du prøve at nulstille din kontos kodeord.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Der kunne ikke findes en bruger til denne handling.',
 
     // System
     'path_not_writable' => 'Filsti :filePath kunne ikke uploades til. Sørg for at den kan skrives til af webserveren.',
     'cannot_get_image_from_url' => 'Kan ikke finde billede på :url',
     'cannot_create_thumbs' => 'Serveren kan ikke oprette miniaturer. Kontroller, at GD PHP-udvidelsen er installeret.',
     'server_upload_limit' => 'Serveren tillader ikke uploads af denne størrelse. Prøv en mindre filstørrelse.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'Serveren kan ikke modtage den angivne mængde data. Prøv igen med færre data eller en mindre fil.',
     'uploaded'  => 'Serveren tillader ikke uploads af denne størrelse. Prøv en mindre filstørrelse.',
 
     // Drawing & Images
     'image_upload_error' => 'Der opstod en fejl ved upload af billedet',
     'image_upload_type_error' => 'Billedtypen, der uploades, er ugyldig',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_replace_type' => 'Udskiftninger af billedfiler skal være af samme type',
+    'image_upload_memory_limit' => 'Kunne ikke håndtere billedupload og/eller oprette thumbnails på grund af begrænsninger i systemets ressourcer.',
+    'image_thumbnail_memory_limit' => 'Det lykkedes ikke at skabe variationer i billedstørrelsen på grund af begrænsninger i systemets ressourcer.',
+    'image_gallery_thumbnail_memory_limit' => 'Det lykkedes ikke at oprette galleriminiaturer på grund af begrænsede systemressourcer.',
+    'drawing_data_not_found' => 'Tegningsdata kunne ikke indlæses. Tegningsfilen findes måske ikke længere, eller du har måske ikke tilladelse til at få adgang til den.',
 
     // Attachments
     'attachment_not_found' => 'Vedhæftning ikke fundet',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Der opstod en fejl ved upload af den vedhæftede fil',
 
     // Pages
     'page_draft_autosave_fail' => 'Kunne ikke gemme kladde. Tjek at du har internetforbindelse før du gemmer siden',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Kunne ikke slette sideudkast og hente den aktuelle sides gemte indhold',
     'page_custom_home_deletion' => 'Kan ikke slette en side der er sat som forside',
 
     // Entities
     'entity_not_found' => 'Emne ikke fundet',
-    'bookshelf_not_found' => 'Shelf not found',
+    'bookshelf_not_found' => 'Hylde ikke fundet',
     'book_not_found' => 'Bog ikke fundet',
     'page_not_found' => 'Side ikke fundet',
     'chapter_not_found' => 'Kapitel ikke fundet',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan ikke slette den eneste admin',
     'users_cannot_delete_guest' => 'Du kan ikke slette gæstebrugeren',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Kunne ikke oprette en bruger, da invitationsmailen ikke blev sendt',
 
     // Roles
     'role_cannot_be_edited' => 'Denne rolle kan ikke redigeres',
@@ -106,16 +106,16 @@
     'back_soon' => 'Den er oppe igen snart.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Kunne ikke læse ZIP-filen.',
+    'import_zip_cant_decode_data' => 'Kunne ikke finde og afkode ZIP data.json-indhold.',
+    'import_zip_no_data' => 'ZIP-filens data har ikke noget forventet bog-, kapitel- eller sideindhold.',
+    'import_validation_failed' => 'Import ZIP kunne ikke valideres med fejl:',
+    'import_zip_failed_notification' => 'Kunne ikke importere ZIP-fil.',
+    'import_perms_books' => 'Du mangler de nødvendige tilladelser til at oprette bøger.',
+    'import_perms_chapters' => 'Du mangler de nødvendige tilladelser til at oprette kapitler.',
+    'import_perms_pages' => 'Du mangler de nødvendige tilladelser til at oprette sider.',
+    'import_perms_images' => 'Du mangler de nødvendige tilladelser til at oprette billeder.',
+    'import_perms_attachments' => 'Du mangler den nødvendige tilladelse til at oprette vedhæftede filer.',
 
     // API errors
     'api_no_authorization_found' => 'Der blev ikke fundet nogen autorisationstoken på anmodningen',
@@ -129,5 +129,5 @@
     'maintenance_test_email_failure' => 'Følgende fejl opstod under afsendelse af testemail:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'URL\'en stemmer ikke overens med de konfigurerede tilladte SSR-værter',
 ];
diff --git a/lang/da/notifications.php b/lang/da/notifications.php
index 00b0c464f15..8074c03c4d9 100644
--- a/lang/da/notifications.php
+++ b/lang/da/notifications.php
@@ -12,16 +12,16 @@
     'updated_page_intro' => 'En side er blevet opdateret i :appName:',
     'updated_page_debounce' => 'For at forhindre en masse af notifikationer, i et stykke tid vil du ikke blive sendt notifikationer for yderligere redigeringer til denne side af den samme editor.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Sidens navn:',
+    'detail_page_path' => 'Sidesti:',
+    'detail_commenter' => 'Kommentator:',
+    'detail_comment' => 'Bemærkninger:',
+    'detail_created_by' => 'Oprettet af:',
+    'detail_updated_by' => 'Opdateret af:',
 
-    'action_view_comment' => 'View Comment',
+    'action_view_comment' => 'Se kommentar',
     'action_view_page' => 'Vis Side',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Denne meddelelse blev sendt til dig, fordi :link dækker denne type aktivitet for denne vare.',
+    'footer_reason_link' => 'dine indstillinger for notifikationer',
 ];
diff --git a/lang/da/settings.php b/lang/da/settings.php
index 36ab18d3082..d964ed61745 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -32,9 +32,9 @@
     'app_custom_html_desc' => 'Alt indhold tilføjet her, vil blive indsat i bunden af <head> sektionen på alle sider. Dette er brugbart til overskrivning af styles og tilføjelse af analytics kode.',
     'app_custom_html_disabled_notice' => 'Brugerdefineret HTML head indhold er deaktiveret på denne indstillingsside for at, at ændringer kan rulles tilbage.',
     'app_logo' => 'Applikationslogo',
-    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_logo_desc' => 'Det bruges blandt andet i applikationens headerbar. Dette billede skal være 86px i højden. Store billeder vil blive skaleret ned.',
     'app_icon' => 'Program ikon',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_icon_desc' => 'Dette ikon bruges til browserfaner og genvejsikoner. Det skal være et 256px kvadratisk PNG-billede.',
     'app_homepage' => 'Applikationsforside',
     'app_homepage_desc' => 'Vælg en visning, der skal vises på forsiden i stedet for standardvisningen. Sidetilladelser ignoreres for de valgte sider.',
     'app_homepage_select' => 'Vælg en side',
@@ -48,12 +48,12 @@
     'app_disable_comments_desc' => 'Deaktiverer kommentarer på tværs af alle sider i applikationen. <br> Eksisterende kommentarer vises ikke.',
 
     // Color settings
-    'color_scheme' => 'Application Color Scheme',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'color_scheme' => 'Applikationens farveskema',
+    'color_scheme_desc' => 'Indstil de farver, der skal bruges i applikationens brugergrænseflade. Farver kan konfigureres separat for mørke og lyse tilstande for at passe bedst til temaet og sikre læsbarhed.',
+    'ui_colors_desc' => 'Indstil applikationens primære farve og standardlinkfarve. Den primære farve bruges hovedsageligt til headerbanneret, knapper og interfacedekorationer. Standardlinkfarven bruges til tekstbaserede links og handlinger, både i det skrevne indhold og i programmets brugerflade.',
     'app_color' => 'Primær farve',
     'link_color' => 'Standard Link Farve',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'content_colors_desc' => 'Indstil farver for alle elementer i sideorganisationshierarkiet. Det anbefales at vælge farver med samme lysstyrke som standardfarverne af hensyn til læsbarheden.',
     'bookshelf_color' => 'Bogreolfarve',
     'book_color' => 'Bogfarve',
     'chapter_color' => 'Kapitelfarve',
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Indtast en kommasepareret liste over e-mail-domæner, som du vil begrænse registreringen til. Brugere får en E-Mail for at bekræfte deres adresse, før de får tilladelse til at interagere med applikationen. <br> Bemærk, at brugere vil kunne ændre deres e-mail-adresser efter vellykket registrering.',
     'reg_confirm_restrict_domain_placeholder' => 'Ingen restriktion opsat',
 
+    // Sorting Settings
+    'sorting' => 'Sortering',
+    'sorting_book_default' => 'Standard bog-sortering',
+    'sorting_book_default_desc' => 'Vælg den standardsorteringsregel, der skal gælde for nye bøger. Dette påvirker ikke eksisterende bøger og kan tilsidesættes for hver enkelt bog.',
+    'sorting_rules' => 'Regler for sortering',
+    'sorting_rules_desc' => 'Det er foruddefinerede sorteringsoperationer, som kan anvendes på indhold i systemet.',
+    'sort_rule_assigned_to_x_books' => 'Tildelt til :count Book|Tildelt til :count Books',
+    'sort_rule_create' => 'Opret sorteringsregel',
+    'sort_rule_edit' => 'Rediger sorteringsregel',
+    'sort_rule_delete' => 'Slet sorteringsregel',
+    'sort_rule_delete_desc' => 'Fjern denne sorteringsregel fra systemet. Bøger, der bruger denne sortering, vil vende tilbage til manuel sortering.',
+    'sort_rule_delete_warn_books' => 'Denne sorteringsregel bruges i øjeblikket på :count book(s). Er du sikker på, at du vil slette den?',
+    'sort_rule_delete_warn_default' => 'Denne sorteringsregel bruges i øjeblikket som standard for bøger. Er du sikker på, at du vil slette den?',
+    'sort_rule_details' => 'Detaljer om sorteringsregler',
+    'sort_rule_details_desc' => 'Angiv et navn for denne sorteringsregel, som vises i lister, når brugerne vælger en sortering.',
+    'sort_rule_operations' => 'Sorteringsoperationer',
+    'sort_rule_operations_desc' => 'Konfigurer de sorteringshandlinger, der skal udføres, ved at flytte dem fra listen over tilgængelige handlinger. Ved brug vil handlingerne blive anvendt i rækkefølge, fra top til bund. Alle ændringer, der foretages her, vil blive anvendt på alle tildelte bøger, når de gemmes.',
+    'sort_rule_available_operations' => 'Tilgængelige operationer',
+    'sort_rule_available_operations_empty' => 'Ingen operationer tilbage',
+    'sort_rule_configured_operations' => 'Konfigurerede operationer',
+    'sort_rule_configured_operations_empty' => 'Træk/tilføj operationer fra listen "Tilgængelige operationer"',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Navn - alfabetisk',
+    'sort_rule_op_name_numeric' => 'Navn - numerisk',
+    'sort_rule_op_created_date' => 'Oprettet den',
+    'sort_rule_op_updated_date' => 'Opdateret dato',
+    'sort_rule_op_chapters_first' => 'Kapitler først',
+    'sort_rule_op_chapters_last' => 'De sidste kapitler',
+
     // Maintenance settings
     'maint' => 'Vedligeholdelse',
     'maint_image_cleanup' => 'Ryd op i billeder',
@@ -93,9 +123,9 @@
     'maint_recycle_bin_desc' => 'Slettede hylder, bøger, kapitler og sider overføres til papirkurven, så de kan gendannes eller slettes permanent. Ældre elementer i papirkurven fjernes automatisk efter et stykke tid afhængigt af systemets konfiguration.',
     'maint_recycle_bin_open' => 'Åbn papirkurven',
     'maint_regen_references' => 'Regenerer Referencer',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint_regen_references_desc' => 'Denne handling vil genopbygge referenceindekset på tværs af elementer i databasen. Dette håndteres normalt automatisk, men denne handling kan være nyttig til at indeksere gammelt indhold eller indhold, der er tilføjet via uofficielle metoder.',
+    'maint_regen_references_success' => 'Referenceindekset er blevet genskabt!',
+    'maint_timeout_command_note' => 'Bemærk: Denne handling kan tage tid at udføre, hvilket kan føre til timeout-problemer i nogle webmiljøer. Som et alternativ kan denne handling udføres med en terminalkommando.',
 
     // Recycle Bin
     'recycle_bin' => 'Papirkurv',
@@ -109,7 +139,7 @@
     'recycle_bin_contents_empty' => 'Papirkurven er tom',
     'recycle_bin_empty' => 'Tøm papirkurv',
     'recycle_bin_empty_confirm' => 'Dette vil permanent slette alle elementer i papirkurven, inkluderet hvert elements indhold. Er du sikker på, at du vil tømme papirkurven?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Denne handling vil permanent slette dette element fra systemet sammen med alle underordnede elementer, der er anført nedenfor, og du vil ikke kunne gendanne dette indhold. Er du sikker på, at du vil slette dette element permanent?',
     'recycle_bin_destroy_list' => 'Elementer der skal slettes',
     'recycle_bin_restore_list' => 'Elementer der skal gendannes',
     'recycle_bin_restore_confirm' => 'Denne handling vil gendanne det slettede element, herunder alle underelementer, til deres oprindelige placering. Hvis den oprindelige placering siden er blevet slettet, og nu er i papirkurven, vil det overordnede element også skulle gendannes.',
@@ -136,11 +166,11 @@
     // Role Settings
     'roles' => 'Roller',
     'role_user_roles' => 'Brugerroller',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_index_desc' => 'Roller bruges til at gruppere brugere og give systemtilladelser til deres medlemmer. Når en bruger er medlem af flere roller, stables de tildelte rettigheder, og brugeren arver alle evner.',
+    'roles_x_users_assigned' => ':count bruger tildelt:count brugere tildelt',
+    'roles_x_permissions_provided' => ':count tilladelser: count tilladelser',
     'roles_assigned_users' => 'Tildelte brugere',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_permissions_provided' => 'Givne tilladelser',
     'role_create' => 'Opret en ny rolle',
     'role_delete' => 'Slet rolle',
     'role_delete_confirm' => 'Dette vil slette rollen med navnet \':roleName\'.',
@@ -162,14 +192,14 @@
     'role_access_api' => 'Tilgå system-API',
     'role_manage_settings' => 'Administrer app-indstillinger',
     'role_export_content' => 'Eksporter indhold',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importer indhold',
     'role_editor_change' => 'Skift side editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => 'Modtag og administrer notifikationer',
     'role_asset' => 'Tilladelser for medier og "assets"',
     'roles_system_warning' => 'Vær opmærksom på, at adgang til alle af de ovennævnte tre tilladelser, kan give en bruger mulighed for at ændre deres egne brugerrettigheder eller brugerrettigheder for andre i systemet. Tildel kun roller med disse tilladelser til betroede brugere.',
     'role_asset_desc' => 'Disse tilladelser kontrollerer standardadgang til medier og "assets" i systemet. Tilladelser til bøger, kapitler og sider tilsidesætter disse tilladelser.',
     'role_asset_admins' => 'Administratorer får automatisk adgang til alt indhold, men disse indstillinger kan vise eller skjule UI-indstillinger.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => 'Dette vedrører synlighed i billedhåndteringen. Den faktiske adgang til uploadede billedfiler vil afhænge af systemets billedlagringsindstilling.',
     'role_all' => 'Alle',
     'role_own' => 'Eget',
     'role_controlled_by_asset' => 'Styres af det medie/"asset", de uploades til',
@@ -179,7 +209,7 @@
 
     // Users
     'users' => 'Brugere',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'Opret og administrer individuelle brugerkonti i systemet. Brugerkonti bruges til login og tilskrivning af indhold og aktivitet. Adgangstilladelser er primært rollebaserede, men ejerskab af brugerindhold, blandt andre faktorer, kan også påvirke tilladelser og adgang.',
     'user_profile' => 'Brugerprofil',
     'users_add_new' => 'Tilføj ny bruger',
     'users_search' => 'Søg efter brugere',
@@ -194,8 +224,8 @@
     'users_send_invite_text' => 'Du kan vælge at sende denne bruger en invitation på E-Mail, som giver dem mulighed for at indstille deres egen adgangskode, ellers kan du indstille deres adgangskode selv.',
     'users_send_invite_option' => 'Send bruger en invitationsmail',
     'users_external_auth_id' => 'Ekstern godkendelses ID',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Når et eksternt godkendelsessystem er i brug (f.eks. SAML2, OIDC eller LDAP), er dette det ID, som forbinder denne BookStack-bruger med godkendelsessystemets konto. Du kan ignorere dette felt, hvis du bruger den e-mailbaserede standardgodkendelse.',
+    'users_password_warning' => 'Udfyld kun nedenstående, hvis du ønsker at ændre adgangskoden for denne bruger.',
     'users_system_public' => 'Denne bruger repræsenterer alle gæstebrugere, der besøger din instans. Den kan ikke bruges til at logge på, men tildeles automatisk.',
     'users_delete' => 'Slet bruger',
     'users_delete_named' => 'Slet bruger :userName',
@@ -211,7 +241,7 @@
     'users_preferred_language' => 'Foretrukket sprog',
     'users_preferred_language_desc' => 'Denne indstilling ændrer det sprog, der bruges til applikationens brugergrænseflade. Dette påvirker ikke noget brugeroprettet indhold.',
     'users_social_accounts' => 'Sociale konti',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Se status for de tilsluttede sociale konti for denne bruger. Sociale konti kan bruges som supplement til det primære godkendelsessystem til systemadgang.',
     'users_social_accounts_info' => 'Her kan du forbinde dine andre konti for hurtigere og lettere login. Afbrydelse af en konto her tilbagekalder ikke tidligere autoriseret adgang. Tilbagekald adgang fra dine profilindstillinger på den tilsluttede sociale konto.',
     'users_social_connect' => 'Forbind konto',
     'users_social_disconnect' => 'Frakobl konto',
@@ -220,7 +250,7 @@
     'users_social_connected' => ':socialAccount kontoen blev knyttet til din profil.',
     'users_social_disconnected' => ':socialAccount kontoen blev afbrudt fra din profil.',
     'users_api_tokens' => 'API Tokens',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'Opret og administrer de adgangstokens, der bruges til at godkende med BookStack REST API. Tilladelser til API\'en administreres via den bruger, som tokenet tilhører.',
     'users_api_tokens_none' => 'Ingen API tokens er blevet oprettet for denne bruger',
     'users_api_tokens_create' => 'Opret Token',
     'users_api_tokens_expires' => 'Udløber',
@@ -250,8 +280,8 @@
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_index_desc' => 'Webhooks er en måde at sende data til eksterne URL\'er på, når bestemte handlinger og hændelser sker i systemet, hvilket giver mulighed for hændelsesbaseret integration med eksterne platforme som f.eks. besked- eller notifikationssystemer.',
+    'webhooks_x_trigger_events' => ':count trigger begivenhed:count trigger events',
     'webhooks_create' => 'Opret ny Webhook',
     'webhooks_none_created' => 'Ingen webhooks er blevet oprettet endnu.',
     'webhooks_edit' => 'Rediger Webhook',
@@ -278,13 +308,13 @@
     'webhooks_last_error_message' => 'Sidste fejlmeddelelse:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Licenser',
+    'licenses_desc' => 'Denne side indeholder licensoplysninger for BookStack ud over de projekter og biblioteker, der bruges i BookStack. Mange af de nævnte projekter må kun bruges i udviklingssammenhæng.',
+    'licenses_bookstack' => 'BookStack-licens',
+    'licenses_php' => 'Licenser til PHP-biblioteker',
+    'licenses_js' => 'Licenser til JavaScript-biblioteker',
+    'licenses_other' => 'Andre licenser',
+    'license_details' => 'Licensoplysninger',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/da/validation.php b/lang/da/validation.php
index b09b621b23b..3caf1417a45 100644
--- a/lang/da/validation.php
+++ b/lang/da/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute-formatet er ugyldigt.',
     'uploaded'             => 'Filen kunne ikke oploades. Serveren accepterer muligvis ikke filer af denne størrelse.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'Attributten skal henvise til en fil i ZIP.',
+    'zip_file_mime' => 'Attributten skal henvise til en fil af typen: validTypes, fundet:foundType.',
+    'zip_model_expected' => 'Data objekt forventet men ":type" fundet.',
+    'zip_unique' => 'Attributten skal være unik for objekttypen i ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/de/activities.php b/lang/de/activities.php
index 012e024a235..8f15cd04a9f 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'Kommentar aktualisiert',
     'comment_delete'              => 'Kommentar gelöscht',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'hat die Berechtigungen aktualisiert',
 ];
diff --git a/lang/de/editor.php b/lang/de/editor.php
index 6e6b1fa63df..179c667844e 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Abbrechen',
     'save' => 'Speichern',
     'close' => 'Schließen',
+    'apply' => 'Apply',
     'undo' => 'Rückgängig',
     'redo' => 'Wiederholen',
     'left' => 'Links',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Anzuzeigender Text',
     'title' => 'Titel',
+    'browse_links' => 'Browse links',
     'open_link' => 'Link öffnen',
     'open_link_in' => 'Link öffnen in...',
     'open_link_current' => 'Aktuelles Fenster',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 799aa46050f..9377c7efcdc 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Dieses Buch durchsuchen',
     'books_navigation' => 'Buchnavigation',
     'books_sort' => 'Buchinhalte sortieren',
-    'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt zu reorganisieren. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 78cd2b500a2..c83d0ef3755 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -75,6 +75,36 @@
 Hinweis: Benutzer können ihre E-Mail-Adresse nach erfolgreicher Registrierung ändern.',
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Wartung',
     'maint_image_cleanup' => 'Bilder bereinigen',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index 94a0b2b1d5c..7b5996aab27 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'Kommentar aktualisiert',
     'comment_delete'              => 'Kommentar gelöscht',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'aktualisierte Berechtigungen',
 ];
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 23ce1ee4aab..0567ed6c27e 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Abbrechen',
     'save' => 'Speichern',
     'close' => 'Schließen',
+    'apply' => 'Apply',
     'undo' => 'Rückgängig machen',
     'redo' => 'Wiederholen',
     'left' => 'Links',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Anzuzeigender Text',
     'title' => 'Titel',
+    'browse_links' => 'Browse links',
     'open_link' => 'Link öffnen',
     'open_link_in' => 'Link öffnen in...',
     'open_link_current' => 'Aktuellem Fenster',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 4283fb8cb0d..08f2b2927b8 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Dieses Buch durchsuchen',
     'books_navigation' => 'Buchnavigation',
     'books_sort' => 'Buchinhalte sortieren',
-    'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt neu zu ordnen. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 549aba11442..fe8e88b89c1 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -75,6 +75,36 @@
 Hinweis: Benutzer können ihre E-Mail Adresse nach erfolgreicher Registrierung ändern.',
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Wartung',
     'maint_image_cleanup' => 'Bilder bereinigen',
diff --git a/lang/el/activities.php b/lang/el/activities.php
index 6eb85746402..226ef254074 100644
--- a/lang/el/activities.php
+++ b/lang/el/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'ενημερώθηκε σχόλιο',
     'comment_delete'              => 'διαγράφηκε σχόλιο',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'ενημερωμένα δικαιώματα',
 ];
diff --git a/lang/el/editor.php b/lang/el/editor.php
index f6c67b879e6..701b384bd51 100644
--- a/lang/el/editor.php
+++ b/lang/el/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Ακύρωση',
     'save' => 'Αποθήκευση',
     'close' => 'Κλείσιμο',
+    'apply' => 'Apply',
     'undo' => 'Αναίρεση',
     'redo' => 'Επανάληψη',
     'left' => 'Αριστερά',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Κείμενο εμφάνισης',
     'title' => 'Τίτλος',
+    'browse_links' => 'Browse links',
     'open_link' => 'Άνοιγμα συνδέσμου',
     'open_link_in' => 'Άνοιγμα συνδέσμου σε...',
     'open_link_current' => 'Τρέχον παράθυρο',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index d74c7de0598..8c043be4b36 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Αναζήτηση σε αυτό το βιβλίο',
     'books_navigation' => 'Πλοήγηση Βιβλίου',
     'books_sort' => 'Ταξινόμηση Περιεχομένων Βιβλίου',
-    'books_sort_desc' => 'Μετακινήστε κεφάλαια και σελίδες μέσα σε ένα βιβλίο για να αναδιοργανώσετε τα περιεχόμενά του. Μπορούν να προστεθούν και άλλα βιβλία, και επιτρέπουν την εύκολη μετακίνηση κεφαλαίων και σελίδων μεταξύ βιβλίων.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Ταξινόμηση Βιβλίου :bookname',
     'books_sort_name' => 'Ταξινόμηση κατά όνομα',
     'books_sort_created' => 'Ταξινόμηση κατά ημερομηνία δημιουργίας',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 243d1c2886c..386921b8a7a 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Εισαγάγετε μια λίστα διαχωρισμένων με κόμματα τομέων email στους οποίους θέλετε να περιορίσετε την εγγραφή. Θα σταλεί στους χρήστες ένα email για να επιβεβαιώσουν τη διεύθυνσή τους πριν τους επιτραπεί να αλληλεπιδράσουν με την εφαρμογή. <br> <strong>Σημειώστε ότι οι χρήστες θα μπορούν να αλλάξουν τις διευθύνσεις email τους μετά την επιτυχή εγγραφή</strong>.',
     'reg_confirm_restrict_domain_placeholder' => 'Δε έχουν ρυθμιστεί περιορισμοί ακόμα',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Συντήρηση',
     'maint_image_cleanup' => 'Εκκαθάριση Εικόνων',
diff --git a/lang/es/activities.php b/lang/es/activities.php
index 5bd3fa5f10c..89a11c63a2e 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'comentario actualizado',
     'comment_delete'              => 'comentario borrado',
 
+    // Sort Rules
+    'sort_rule_create' => 'regla de ordenación creada',
+    'sort_rule_create_notification' => 'Rol de ordenación creada con éxito',
+    'sort_rule_update' => 'regla de ordenación actualizada',
+    'sort_rule_update_notification' => 'Regla de ordenación actualizada correctamente',
+    'sort_rule_delete' => 'regla de ordenación eliminada',
+    'sort_rule_delete_notification' => 'Rol de ordenación borrada con éxito',
+
     // Other
     'permissions_update'          => 'permisos actualizados',
 ];
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 6253c7ab3c6..15f1dd9b7c4 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Guardar',
     'close' => 'Cerrar',
+    'apply' => 'Aplicar',
     'undo' => 'Deshacer',
     'redo' => 'Rehacer',
     'left' => 'Izquierda',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto para mostrar',
     'title' => 'Titulo',
+    'browse_links' => 'Ver enlaces',
     'open_link' => 'Abrir enlace',
     'open_link_in' => 'Abrir enlace en...',
     'open_link_current' => 'Ventana actual',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 733be165dc8..591babb696c 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Buscar en este libro',
     'books_navigation' => 'Navegación de libro',
     'books_sort' => 'Organizar contenido de libro',
-    'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros lo que permite mover fácilmente capítulos y páginas entre libros.',
+    'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para ordenar automáticamente el contenido de este libro cuando haya cambios.',
+    'books_sort_auto_sort' => 'Opción de ordenación automática',
+    'books_sort_auto_sort_active' => 'Opción de ordenación activa: sortName',
     'books_sort_named' => 'Organizar libro :bookName',
     'books_sort_name' => 'Organizar por Nombre',
     'books_sort_created' => 'Organizar por Fecha de creación',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index cb13cad121b..0a4a9303daa 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Introduzca una lista separada por comas de los dominios para cuentas de correo a los que se les permitirá el registro de usuarios. A los usuarios les será enviado un correo electrónico para confirmar la dirección antes de que se le permita interactuar con la aplicación. <br> Tenga en cuenta que los usuarios podrán cambiar sus direcciones de correo electrónico después de registrarse exitosamente.',
     'reg_confirm_restrict_domain_placeholder' => 'Ninguna restricción establecida',
 
+    // Sorting Settings
+    'sorting' => 'Ordenación',
+    'sorting_book_default' => 'Orden por defecto del libro',
+    'sorting_book_default_desc' => 'Seleccione la regla de ordenación predeterminada para aplicar a nuevos libros. Esto no afectará a los libros existentes, y puede ser anulado por libro.',
+    'sorting_rules' => 'Reglas de ordenación',
+    'sorting_rules_desc' => 'Son operaciones de ordenación predefinidas que se pueden aplicar al contenido en el sistema.',
+    'sort_rule_assigned_to_x_books' => 'Asignado a :count libro | Asignado a :count libros',
+    'sort_rule_create' => 'Crear regla de ordenación',
+    'sort_rule_edit' => 'Editar regla de ordenación',
+    'sort_rule_delete' => 'Eliminar regla de ordenación',
+    'sort_rule_delete_desc' => 'Eliminar esta regla de ordenación del sistema. Los Libros que utilicen este tipo se revertirán a la ordenación manual.',
+    'sort_rule_delete_warn_books' => 'Esta regla de ordenación se utiliza actualmente en :count libro(s). ¿Está seguro que desea eliminarla?',
+    'sort_rule_delete_warn_default' => 'Esta regla de ordenación se utiliza actualmente como predeterminado para los libros. ¿Está seguro de que desea eliminarla?',
+    'sort_rule_details' => 'Detalles de la regla de ordenación',
+    'sort_rule_details_desc' => 'Establezca un nombre para esta regla de ordenación, que aparecerá en las listas cuando los usuarios estén seleccionando un orden.',
+    'sort_rule_operations' => 'Operaciones de ordenación',
+    'sort_rule_operations_desc' => 'Configure las acciones de ordenación a realizar moviéndolas de la lista de operaciones disponibles. Al usarse, las operaciones se aplicarán en orden, de arriba a abajo. Cualquier cambio realizado aquí se aplicará a todos los libros asignados al guardar.',
+    'sort_rule_available_operations' => 'Operaciones disponibles',
+    'sort_rule_available_operations_empty' => 'No hay operaciones restantes',
+    'sort_rule_configured_operations' => 'Operaciones configuradas',
+    'sort_rule_configured_operations_empty' => 'Arrastrar/añadir operaciones desde la lista de "Operaciones disponibles"',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Nombre - Alfabético',
+    'sort_rule_op_name_numeric' => 'Nombre - Numérico',
+    'sort_rule_op_created_date' => 'Fecha de creación',
+    'sort_rule_op_updated_date' => 'Fecha de actualización',
+    'sort_rule_op_chapters_first' => 'Capítulos al inicio',
+    'sort_rule_op_chapters_last' => 'Capítulos al final',
+
     // Maintenance settings
     'maint' => 'Mantenimiento',
     'maint_image_cleanup' => 'Limpiar imágenes',
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index f7e9794937e..d7b93d73081 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'comentario actualizado',
     'comment_delete'              => 'comentario eliminado',
 
+    // Sort Rules
+    'sort_rule_create' => 'regla de ordenación creada',
+    'sort_rule_create_notification' => 'Rol de ordenación creada con éxito',
+    'sort_rule_update' => 'regla de ordenación actualizada',
+    'sort_rule_update_notification' => 'Regla de ordenación actualizada correctamente',
+    'sort_rule_delete' => 'regla de ordenación eliminada',
+    'sort_rule_delete_notification' => 'Rol de ordenación borrada con éxito',
+
     // Other
     'permissions_update'          => 'permisos actualizados',
 ];
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 28b6e92c88a..59c640ac061 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Guardar',
     'close' => 'Cerrar',
+    'apply' => 'Aplicar',
     'undo' => 'Deshacer',
     'redo' => 'Rehacer',
     'left' => 'Izquierda',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto a mostrar',
     'title' => 'Título',
+    'browse_links' => 'Ver enlaces',
     'open_link' => 'Abrir enlace',
     'open_link_in' => 'Abrir enlace en...',
     'open_link_current' => 'Ventana actual',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index a118e16bed9..b96de3b272e 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Buscar en este libro',
     'books_navigation' => 'Navegación de libro',
     'books_sort' => 'Organizar contenido de libro',
-    'books_sort_desc' => 'Mueva capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros, lo que permite mover fácilmente capítulos y páginas entre libros.',
+    'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para ordenar automáticamente el contenido de este libro cuando haya cambios.',
+    'books_sort_auto_sort' => 'Opción de ordenación automática',
+    'books_sort_auto_sort_active' => 'Opción de ordenación activa: sortName',
     'books_sort_named' => 'Organizar libro :bookName',
     'books_sort_name' => 'Organizar por nombre',
     'books_sort_created' => 'Organizar por fecha de creación',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 9a78c876042..30eb095d997 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Introduzca una lista separada por comas de los correos electrónicos del dominio a los que les gustaría restringir el registro por dominio. A los usuarios les será enviado un correo elctrónico para confirmar la dirección antes de que se le permita interactuar con la aplicación. <br> Note que a los usuarios se les permitirá cambiar sus direcciones de correo electrónico luego de un registro éxioso.',
     'reg_confirm_restrict_domain_placeholder' => 'Ninguna restricción establecida',
 
+    // Sorting Settings
+    'sorting' => 'Ordenación',
+    'sorting_book_default' => 'Orden por defecto del libro',
+    'sorting_book_default_desc' => 'Seleccione la regla de ordenación predeterminada para aplicar a nuevos libros. Esto no afectará a los libros existentes, y puede ser anulado por libro.',
+    'sorting_rules' => 'Reglas de ordenación',
+    'sorting_rules_desc' => 'Son operaciones de ordenación predefinidas que se pueden aplicar al contenido en el sistema.',
+    'sort_rule_assigned_to_x_books' => 'Asignado a :count libro | Asignado a :count libros',
+    'sort_rule_create' => 'Crear regla de ordenación',
+    'sort_rule_edit' => 'Editar regla de ordenación',
+    'sort_rule_delete' => 'Eliminar regla de ordenación',
+    'sort_rule_delete_desc' => 'Eliminar esta regla de ordenación del sistema. Los Libros que utilicen este tipo se revertirán a la ordenación manual.',
+    'sort_rule_delete_warn_books' => 'Esta regla de ordenación se utiliza actualmente en :count libro(s). ¿Está seguro que desea eliminarla?',
+    'sort_rule_delete_warn_default' => 'Esta regla de ordenación se utiliza actualmente como predeterminado para los libros. ¿Está seguro de que desea eliminarla?',
+    'sort_rule_details' => 'Detalles de la regla de ordenación',
+    'sort_rule_details_desc' => 'Establezca un nombre para esta regla de ordenación, que aparecerá en las listas cuando los usuarios estén seleccionando un orden.',
+    'sort_rule_operations' => 'Operaciones de ordenación',
+    'sort_rule_operations_desc' => 'Configure las acciones de ordenación a realizar moviéndolas de la lista de operaciones disponibles. Al usarse, las operaciones se aplicarán en orden, de arriba a abajo. Cualquier cambio realizado aquí se aplicará a todos los libros asignados al guardar.',
+    'sort_rule_available_operations' => 'Operaciones disponibles',
+    'sort_rule_available_operations_empty' => 'No hay operaciones restantes',
+    'sort_rule_configured_operations' => 'Operaciones configuradas',
+    'sort_rule_configured_operations_empty' => 'Arrastrar/añadir operaciones desde la lista de "Operaciones disponibles"',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Nombre - Alfabético',
+    'sort_rule_op_name_numeric' => 'Nombre - Numérico',
+    'sort_rule_op_created_date' => 'Fecha de creación',
+    'sort_rule_op_updated_date' => 'Fecha de actualización',
+    'sort_rule_op_chapters_first' => 'Capítulos al inicio',
+    'sort_rule_op_chapters_last' => 'Capítulos al final',
+
     // Maintenance settings
     'maint' => 'Mantenimiento',
     'maint_image_cleanup' => 'Limpiar imágenes',
diff --git a/lang/et/activities.php b/lang/et/activities.php
index bbc9762500e..3a86dcd8623 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Veebihaak on kustutatud',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'lisas impordi',
+    'import_create_notification' => 'Import on üles laaditud',
+    'import_run' => 'muutis importi',
+    'import_run_notification' => 'Sisu on imporditud',
+    'import_delete' => 'kustutas impordi',
+    'import_delete_notification' => 'Import on kustutatud',
 
     // Users
     'user_create' => 'lisas kasutaja',
@@ -127,6 +127,14 @@
     'comment_update'              => 'muutis kommentaari',
     'comment_delete'              => 'kustutas kommentaari',
 
+    // Sort Rules
+    'sort_rule_create' => 'lisas sorteerimisreegli',
+    'sort_rule_create_notification' => 'Sorteerimisreegel on lisatud',
+    'sort_rule_update' => 'muutis sorteerimisreeglit',
+    'sort_rule_update_notification' => 'Sorteerimisreegel on muudetud',
+    'sort_rule_delete' => 'kustutas sorteerimisreegli',
+    'sort_rule_delete_notification' => 'Sorteerimisreegel on kustutatud',
+
     // Other
     'permissions_update'          => 'muutis õiguseid',
 ];
diff --git a/lang/et/editor.php b/lang/et/editor.php
index 77b0514569e..e67e9b0f522 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Tühista',
     'save' => 'Salvesta',
     'close' => 'Sulge',
+    'apply' => 'Rakenda',
     'undo' => 'Võta tagasi',
     'redo' => 'Korda',
     'left' => 'Vasakul',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Kuvatav tekst',
     'title' => 'Pealkiri',
+    'browse_links' => 'Sirve linke',
     'open_link' => 'Ava link',
     'open_link_in' => 'Ava link...',
     'open_link_current' => 'Samas aknas',
@@ -163,8 +165,8 @@
     'about' => 'Redaktori info',
     'about_title' => 'Info WYSIWYG redaktori kohta',
     'editor_license' => 'Redaktori litsents ja autoriõigused',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'See redaktor on loodud :lexicalLink põhjal, mis on saadaval MIT litsentsi alusel.',
+    'editor_lexical_license_link' => 'Täielikud litsentsitingimused on leitavad siin.',
     'editor_tiny_license' => 'See redaktor on loodud :tinyLink abil, mis on saadaval MIT litsentsi alusel.',
     'editor_tiny_license_link' => 'TinyMCE autoriõigused ja litsents on saadaval siin.',
     'save_continue' => 'Salvesta leht ja jätka',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 7afe7005da6..6e47d2dfb7c 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF fail',
     'export_text' => 'Tekstifail',
     'export_md' => 'Markdown fail',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Portatiivne ZIP',
     'default_template' => 'Vaikimisi lehe mall',
     'default_template_explain' => 'Vali lehe mall, mida kasutatakse kõigi selle objekti sees loodud lehtede vaikimisi sisuna. Pea meeles, et seda kasutatakse ainult siis, kui lehe loojal on valitud malli vaatamise õigus.',
     'default_template_select' => 'Vali mall',
     'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import_validate' => 'Valideeri import',
+    'import_desc' => 'Impordi raamatud, peatükid ja lehed portatiivse ZIP-formaadi abil samast või erinevast instantsist. Jätkamiseks vali ZIP-fail. Pärast faili üleslaadimist ja valideerimist saad importimise seadistada ja kinnitada.',
+    'import_zip_select' => 'Vali ZIP-fail üleslaadimiseks',
+    'import_zip_validation_errors' => 'Valitud ZIP-faili valideerimisel tekkisid vead:',
+    'import_pending' => 'Ootel impordid',
+    'import_pending_none' => 'Ühtegi importi pole alustatud.',
+    'import_continue' => 'Jätka importimist',
+    'import_continue_desc' => 'Vaata üle sisu, mida üleslaaditud ZIP-failist importida. Kui oled valmis, käivita import, et sisu süsteemi lisada. Eduka impordi korral kustutatakse üleslaaditud ZIP-fail automaatselt.',
+    'import_details' => 'Importimise andmed',
+    'import_run' => 'Käivita import',
+    'import_size' => ':size Imporditud ZIP-faili maht',
+    'import_uploaded_at' => 'Üleslaaditud :relativeTime',
+    'import_uploaded_by' => 'Üles laadis',
+    'import_location' => 'Importimise asukoht',
+    'import_location_desc' => 'Vali imporditud sisu jaoks sihtkoht. Sul on vaja valitud asukohas sisu lisamiseks vajalikke õiguseid.',
+    'import_delete_confirm' => 'Kas oled kindel, et soovid selle impordi kustutada?',
+    'import_delete_desc' => 'See kustutab üleslaaditud ZIP-faili, ja seda ei saa tagasi võtta.',
+    'import_errors' => 'Importimise vead',
+    'import_errors_desc' => 'Importimisel esinesid järgmised vead:',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
@@ -166,7 +166,9 @@
     'books_search_this' => 'Otsi sellest raamatust',
     'books_navigation' => 'Raamatu sisukord',
     'books_sort' => 'Sorteeri raamatu sisu',
-    'books_sort_desc' => 'Liiguta peatükke ja lehti raamatu sisu ümber organiseerimiseks. Teisi raamatuid lisades saad peatükke ja lehti lihtsasti raamatute vahel liigutada.',
+    'books_sort_desc' => 'Liiguta raamatu sees peatükke ja lehti, et selle sisu ümber organiseerida. Saad lisada teisi raamatuid, mis võimaldab peatükke ja lehti lihtsasti raamatute vahel liigutada. Lisaks saad määrata automaatse sorteerimise reegli, et selle raamatu sisu muudatuste puhul automaatselt järjestada.',
+    'books_sort_auto_sort' => 'Automaatne sorteerimine',
+    'books_sort_auto_sort_active' => 'Automaatne sorteerimine aktiivne: :sortName',
     'books_sort_named' => 'Sorteeri raamat :bookName',
     'books_sort_name' => 'Sorteeri nime järgi',
     'books_sort_created' => 'Sorteeri loomisaja järgi',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 4faf1d00807..8f4f9939667 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'See on varsti tagasi.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'ZIP-faili lugemine ebaõnnestus.',
+    'import_zip_cant_decode_data' => 'ZIP-failist ei leitud data.json sisu.',
+    'import_zip_no_data' => 'ZIP-failist ei leitud raamatute, peatükkide või lehtede sisu.',
+    'import_validation_failed' => 'Imporditud ZIP-faili valideerimine ebaõnnestus vigadega:',
+    'import_zip_failed_notification' => 'ZIP-faili importimine ebaõnnestus.',
+    'import_perms_books' => 'Sul puuduvad õigused raamatute lisamiseks.',
+    'import_perms_chapters' => 'Sul puuduvad õigused peatükkide lisamiseks.',
+    'import_perms_pages' => 'Sul puuduvad õigused lehtede lisamiseks.',
+    'import_perms_images' => 'Sul puuduvad õigused piltide lisamiseks.',
+    'import_perms_attachments' => 'Sul puuduvad õigused manuste lisamiseks.',
 
     // API errors
     'api_no_authorization_found' => 'Päringust ei leitud volitustunnust',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 6f29fcba17a..0a81c74b8a5 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Sisesta komaga eraldatud nimekiri e-posti domeenidest, millega soovid registreerumist piirata. Kasutajale saadetakse aadressi kinnitamiseks e-kiri, enne kui neil lubatakse rakendust kasutada.<br>Pane tähele, et kasutajad saavad pärast edukat registreerumist oma e-posti aadressi muuta.',
     'reg_confirm_restrict_domain_placeholder' => 'Piirangut ei ole',
 
+    // Sorting Settings
+    'sorting' => 'Sorteerimine',
+    'sorting_book_default' => 'Vaikimisi raamatu sorteerimine',
+    'sorting_book_default_desc' => 'Vali vaikimisi uutele raamatutele rakenduv sorteerimisreegel. See ei mõjuta olemasolevaid raamatuid ning seda saab raamatupõhiselt muuta.',
+    'sorting_rules' => 'Sorteerimisreeglid',
+    'sorting_rules_desc' => 'Need on eeldefineeritud sorteerimistoimingud, mida saab süsteemis olevale sisule rakendada.',
+    'sort_rule_assigned_to_x_books' => 'Määratud :count raamatule|Määratud :count raamatule',
+    'sort_rule_create' => 'Lisa sorteerimisreegel',
+    'sort_rule_edit' => 'Muuda sorteerimisreeglit',
+    'sort_rule_delete' => 'Kustuta sorteerimisreegel',
+    'sort_rule_delete_desc' => 'Eemalda sorteerimisreegel süsteemist. Seda reeglit kasutavad raamatud jäävad käsitsi sorteerituks.',
+    'sort_rule_delete_warn_books' => 'Seda reeglit kasutab hetkel :count raamat(ut). Kas oled kindel, et soovid selle kustutada?',
+    'sort_rule_delete_warn_default' => 'See reegel on hetkel raamatute vaikimisi sorteerimisreegel. Kas oled kindel, et soovid selle kustutada?',
+    'sort_rule_details' => 'Sorteerimisreegli andmed',
+    'sort_rule_details_desc' => 'Määra sorteerimisreegli nimi, mida kasutatakse reegli valimise loendites.',
+    'sort_rule_operations' => 'Sorteerimistoimingud',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Saadaval toimingud',
+    'sort_rule_available_operations_empty' => 'Rohkem toiminguid pole',
+    'sort_rule_configured_operations' => 'Seadistatud toimingud',
+    'sort_rule_configured_operations_empty' => 'Lisa toiminguid "Saadaval toimingud" loendist',
+    'sort_rule_op_asc' => '(kasvavalt)',
+    'sort_rule_op_desc' => '(kahanevalt)',
+    'sort_rule_op_name' => 'Nimi - tähestikuline',
+    'sort_rule_op_name_numeric' => 'Nimi - numbriline',
+    'sort_rule_op_created_date' => 'Loomise aeg',
+    'sort_rule_op_updated_date' => 'Muutmise aeg',
+    'sort_rule_op_chapters_first' => 'Peatükid eespool',
+    'sort_rule_op_chapters_last' => 'Peatükid tagapool',
+
     // Maintenance settings
     'maint' => 'Hooldus',
     'maint_image_cleanup' => 'Pildifailide koristus',
@@ -162,7 +192,7 @@
     'role_access_api' => 'Süsteemi API ligipääs',
     'role_manage_settings' => 'Rakenduse seadete haldamine',
     'role_export_content' => 'Sisu eksport',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Imporditud sisu',
     'role_editor_change' => 'Lehe redaktori muutmine',
     'role_notifications' => 'Võta vastu ja halda teavitusi',
     'role_asset' => 'Sisu õigused',
diff --git a/lang/et/validation.php b/lang/et/validation.php
index 6a6eb661ccb..1354d1ed489 100644
--- a/lang/et/validation.php
+++ b/lang/et/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute on vigases formaadis.',
     'uploaded'             => 'Faili üleslaadimine ebaõnnestus. Server ei pruugi sellise suurusega faile vastu võtta.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute peab viitama failile ZIP-arhiivi sees.',
+    'zip_file_mime' => ':attribute peab viitama :validTypes tüüpi failile, leiti :foundType.',
+    'zip_model_expected' => 'Oodatud andmete asemel leiti ":type".',
+    'zip_unique' => ':attribute peab olema ZIP-arhiivi piires objekti tüübile unikaalne.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/eu/activities.php b/lang/eu/activities.php
index eeee084ab3c..847014efe74 100644
--- a/lang/eu/activities.php
+++ b/lang/eu/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'eguneratu baimenak',
 ];
diff --git a/lang/eu/editor.php b/lang/eu/editor.php
index 34c73997840..f6974e0561e 100644
--- a/lang/eu/editor.php
+++ b/lang/eu/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Ezeztatu',
     'save' => 'Gorde',
     'close' => 'Itxi',
+    'apply' => 'Apply',
     'undo' => 'Desegin',
     'redo' => 'Berregin',
     'left' => 'Ezkerra',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index 10c5dba126e..e13284216ca 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Bilatu liburu hau',
     'books_navigation' => 'Liburu nabigazioa',
     'books_sort' => 'Ordenatu liburu edukiak',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Ordenatu :bookName liburua',
     'books_sort_name' => 'Ordenatu izenaren arabera',
     'books_sort_created' => 'Ordenatu argitaratze-dataren arabera',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 80f1c87f439..2bc284c062d 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'Mugarik gabe',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Mantentze-lanak',
     'maint_image_cleanup' => 'Garbitu irudiak',
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index c17fe698821..cd7e52ed24d 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'نظر به روز شده',
     'comment_delete'              => 'نظر حذف شده',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'به روزرسانی مجوزها',
 ];
diff --git a/lang/fa/editor.php b/lang/fa/editor.php
index 9fbb948f5ca..fa95bb10b99 100644
--- a/lang/fa/editor.php
+++ b/lang/fa/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'لغو',
     'save' => 'ذخیره',
     'close' => 'بستن',
+    'apply' => 'Apply',
     'undo' => 'برگشت',
     'redo' => 'از نو',
     'left' => 'چپ',
@@ -147,6 +148,7 @@
     'url' => 'آدرس',
     'text_to_display' => 'متن جهت نمایش',
     'title' => 'عنوان',
+    'browse_links' => 'Browse links',
     'open_link' => 'بازکردن لینک',
     'open_link_in' => 'باز کردن لینک در ...',
     'open_link_current' => 'پنجره کنونی',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index 7578c21c029..d994ed2488f 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'این کتاب را جستجو کنید',
     'books_navigation' => 'ناوبری کتاب',
     'books_sort' => 'مرتب سازی مطالب کتاب',
-    'books_sort_desc' => 'فصل‌ها و صفحات را در یک کتاب جابه‌جا کنید تا محتوای آن را مجددا سازماندهی کنید. کتاب‌های دیگری را می‌توان اضافه کرد که امکان جابه‌جایی آسان فصل‌ها و صفحات را بین کتاب‌ها فراهم می‌کند.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'مرتب‌سازی کتاب:bookName',
     'books_sort_name' => 'مرتب سازی بر اساس نام',
     'books_sort_created' => 'مرتب سازی بر اساس تاریخ ایجاد',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index bb18364f055..09783312eb2 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'فهرستی از دامنه‌های ایمیل جدا شده با کاما را وارد کنید که می‌خواهید ثبت نام را محدود کنید. قبل از اینکه به کاربران اجازه تعامل با برنامه داده شود، ایمیلی برای تأیید آدرس آنها ارسال می شود. <br> توجه داشته باشید که کاربران پس از ثبت نام موفق می توانند آدرس ایمیل خود را تغییر دهند.',
     'reg_confirm_restrict_domain_placeholder' => 'بدون محدودیت',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'نگهداری',
     'maint_image_cleanup' => 'پاکسازی تصاویر',
diff --git a/lang/fi/activities.php b/lang/fi/activities.php
index 40588abcd3b..a5ee14906ef 100644
--- a/lang/fi/activities.php
+++ b/lang/fi/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Toimintokutsu poistettiin onnistuneesti',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'luotu tuonti',
+    'import_create_notification' => 'Tuontitiedosto ladattiin onnistuneesti',
+    'import_run' => 'päivitetty tuonti',
+    'import_run_notification' => 'Sisällön tuonti onnistui',
+    'import_delete' => 'poistettu tuonti',
+    'import_delete_notification' => 'Tuontitiedosto poistettiin onnistuneesti',
 
     // Users
     'user_create' => 'loi käyttäjän',
@@ -127,6 +127,14 @@
     'comment_update'              => 'päivitti kommentin',
     'comment_delete'              => 'poisti kommentin',
 
+    // Sort Rules
+    'sort_rule_create' => 'luotu lajittelusääntö',
+    'sort_rule_create_notification' => 'Lajittelusääntö luotiin onnistuneesti',
+    'sort_rule_update' => 'päivitetty lajittelusääntö',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'poistettu lajittelusääntö',
+    'sort_rule_delete_notification' => 'Lajittelusääntö poistettiin onnistuneesti',
+
     // Other
     'permissions_update'          => 'päivitti käyttöoikeudet',
 ];
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index c2ab2d8094f..6b5683d38da 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Peruuta',
     'save' => 'Tallenna',
     'close' => 'Sulje',
+    'apply' => 'Apply',
     'undo' => 'Kumoa',
     'redo' => 'Tee uudelleen',
     'left' => 'Vasen',
@@ -147,6 +148,7 @@
     'url' => 'URL-osoite',
     'text_to_display' => 'Näytettävä teksti',
     'title' => 'Otsikko',
+    'browse_links' => 'Browse links',
     'open_link' => 'Avaa linkki',
     'open_link_in' => 'Avaa linkki...',
     'open_link_current' => 'Nykyinen ikkuna',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index 8743c972582..4865485ea9c 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Hae tästä kirjasta',
     'books_navigation' => 'Kirjan navigaatio',
     'books_sort' => 'Järjestä kirjan sisältö',
-    'books_sort_desc' => 'Siirrä lukuja ja sivuja kirjan sisällä järjestelläksesi sen sisältöä uudelleen. Voit lisätä muita kirjoja, jolloin lukujen ja sivujen siirtäminen kirjojen välillä on helppoa.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Järjestä kirja :bookName',
     'books_sort_name' => 'Järjestä nimen mukaan',
     'books_sort_created' => 'Järjestä luontipäiväyksen mukaan',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index 5d953dc70e1..d37ff79f45e 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Kirjoita pilkulla erotettu luettelo sähköpostien domain-nimistä, joihin haluat rajoittaa rekisteröitymisen. Käyttäjille lähetetään sähköpostiviesti osoitteen vahvistamiseksi, ennen kuin he pääsevät käyttämään sivustoa. <br> Huomaa, että käyttäjät voivat muuttaa sähköpostiosoitteensa onnistuneen rekisteröinnin jälkeen.',
     'reg_confirm_restrict_domain_placeholder' => 'Ei rajoituksia',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Huolto',
     'maint_image_cleanup' => 'Siivoa kuvat',
diff --git a/lang/fi/validation.php b/lang/fi/validation.php
index 0a9330433c8..8adc934a177 100644
--- a/lang/fi/validation.php
+++ b/lang/fi/validation.php
@@ -105,7 +105,7 @@
     'url'                  => ':attribute muoto ei ole kelvollinen.',
     'uploaded'             => 'Tiedostoa ei voitu ladata. Palvelin ei ehkä hyväksy tämän kokoisia tiedostoja.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file' => 'Attribuutin :attribute on viitattava tiedostoon ZIP-tiedoston sisällä.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 34ec83ec34c..3b1fe2e42b5 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'Commentaire mis à jour',
     'comment_delete'              => 'Commentaire supprimé',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'a mis à jour les autorisations sur',
 ];
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index bdef1e8b1f5..1296b7a78b0 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Annuler',
     'save' => 'Sauvegarder',
     'close' => 'Fermer',
+    'apply' => 'Apply',
     'undo' => 'Annuler',
     'redo' => 'Rétablir',
     'left' => 'Gauche',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texte à afficher',
     'title' => 'Titre',
+    'browse_links' => 'Browse links',
     'open_link' => 'Ouvrir le lien',
     'open_link_in' => 'Ouvrir le lien dans...',
     'open_link_current' => 'Fenêtre actuelle',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 2382a1d6ce2..e28609a7a3d 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -162,11 +162,13 @@
     'books_empty_create_page' => 'Créer une nouvelle page',
     'books_empty_sort_current_book' => 'Trier les pages du livre',
     'books_empty_add_chapter' => 'Ajouter un chapitre',
-    'books_permissions_active' => 'Permissions personnalisées activées',
+    'books_permissions_active' => 'Permissions de livre actives',
     'books_search_this' => 'Rechercher dans ce livre',
     'books_navigation' => 'Navigation dans le livre',
     'books_sort' => 'Trier les contenus du livre',
-    'books_sort_desc' => 'Déplacez les chapitres et les pages d\'un livre pour réorganiser son contenu. D\'autres livres peuvent être ajoutés qui permettent de déplacer facilement les chapitres et les pages entre les livres.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Trier le livre :bookName',
     'books_sort_name' => 'Trier par le nom',
     'books_sort_created' => 'Trier par la date de création',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 58bce55e06c..301484afe21 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Entrez une liste de domaines acceptés lors de l\'inscription, séparés par une virgule. Les utilisateurs recevront un e-mail de confirmation à cette adresse. <br> Les utilisateurs pourront changer leur adresse après inscription s\'ils le souhaitent.',
     'reg_confirm_restrict_domain_placeholder' => 'Aucune restriction en place',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Nettoyer les images',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 1954121f813..81fc84dc8fc 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'תגובה הוספה',
     'comment_delete'              => 'תגובה נמחקה',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'הרשאות עודכנו',
 ];
diff --git a/lang/he/editor.php b/lang/he/editor.php
index a670385f99d..f119041b691 100644
--- a/lang/he/editor.php
+++ b/lang/he/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'ביטול',
     'save' => 'שמור',
     'close' => 'סגור',
+    'apply' => 'Apply',
     'undo' => 'אחזר',
     'redo' => 'בצע שוב',
     'left' => 'שמאל',
@@ -147,6 +148,7 @@
     'url' => 'קישור',
     'text_to_display' => 'טקסט שיוצג',
     'title' => 'כותרת',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'החלון הנוכחי',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 9ca53fa137c..22a4ad0c29f 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'חפש בספר זה',
     'books_navigation' => 'ניווט בספר',
     'books_sort' => 'מיין את תוכן הספר',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'מיין את הספר :bookName',
     'books_sort_name' => 'מיין לפי שם',
     'books_sort_created' => 'מיין לפי תאריך יצירה',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index 9e63a43cdd8..1fd21292598 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'הכנס דומיינים מופרדים בפסיק אשר עבורם תוגבל ההרשמה. משתמשים יקבלו אי-מייל על מנת לאמת את כתובת המייל שלהם. <br> לתשומת לבך: משתמש יוכל לשנות את כתובת המייל שלו לאחר ההרשמה',
     'reg_confirm_restrict_domain_placeholder' => 'אין הגבלה לדומיין',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'תחזוקה',
     'maint_image_cleanup' => 'ניקוי תמונות',
diff --git a/lang/hr/activities.php b/lang/hr/activities.php
index f5853dc65c7..bf79f9ab14a 100644
--- a/lang/hr/activities.php
+++ b/lang/hr/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'ažurirani komentar',
     'comment_delete'              => 'obrisani komentar',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'ažurirana dopuštenja',
 ];
diff --git a/lang/hr/editor.php b/lang/hr/editor.php
index 55b38ec2d7c..274f41c84e8 100644
--- a/lang/hr/editor.php
+++ b/lang/hr/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Otkaži',
     'save' => 'Spremi',
     'close' => 'Zatvori',
+    'apply' => 'Apply',
     'undo' => 'Poništi',
     'redo' => 'Ponovi',
     'left' => 'Lijevo',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Tekst za prikaz',
     'title' => 'Naslov',
+    'browse_links' => 'Browse links',
     'open_link' => 'Otvori poveznicu',
     'open_link_in' => 'Otvori poveznicu u...',
     'open_link_current' => 'Trenutni prozor',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 91621ed8cd3..2dac21da2ae 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Traži knjigu',
     'books_navigation' => 'Navigacija knjige',
     'books_sort' => 'Razvrstaj sadržaj knjige',
-    'books_sort_desc' => 'Pomaknite poglavlja i stranice unutar knjige kako biste reorganizirali njen sadržaj. Možete dodati i druge knjige što omogućuje jednostavno premještanje poglavlja i stranica između knjiga.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Razvrstaj knjigu :bookName',
     'books_sort_name' => 'Razvrstaj po imenu',
     'books_sort_created' => 'Razvrstaj po datumu nastanka',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index a8b8fea637f..1b9ec4896b0 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Unesite popis email domena kojima želite ograničiti registraciju i odvojite ih zarezom. Korisnicima će se slati email prije interakcije s aplikacijom. <br> Uzmite u obzir da će korisnici moći koristiti druge e mail adrese nakon uspješne registracije.',
     'reg_confirm_restrict_domain_placeholder' => 'Bez ograničenja',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Održavanje',
     'maint_image_cleanup' => 'Čišćenje slika',
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index b0dbfd45e97..548488c40f2 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'frissített hozzászólás',
     'comment_delete'              => 'megjegyzés törlése',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'engedélyek frissítve',
 ];
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index 339ece151df..83ca9b06254 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Mégsem',
     'save' => 'Mentés',
     'close' => 'Bezárás',
+    'apply' => 'Apply',
     'undo' => 'Visszavonás',
     'redo' => 'Újra',
     'left' => 'Balra',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Megjelenő szöveg',
     'title' => 'Cím',
+    'browse_links' => 'Browse links',
     'open_link' => 'Hivatkozás megnyitása',
     'open_link_in' => 'Hivatkozás megnyitása...',
     'open_link_current' => 'Aktuális ablak',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 05c863878f9..3c9921812e5 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Keresés ebben a könyvben',
     'books_navigation' => 'Könyv navigáció',
     'books_sort' => 'Könyv tartalmak rendezése',
-    'books_sort_desc' => 'Mozgassa át a fejezeteket és oldalakat a könyvben, hogy átszervezze a tartalmát. Más könyvek is hozzáadhatók, ami lehetővé teszi a fejezetek és oldalak könnyű mozgatását a könyvek között.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => ':bookName könyv rendezése',
     'books_sort_name' => 'Rendezés név szerint',
     'books_sort_created' => 'Rendezés létrehozás dátuma szerint',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index 55471ee0f8d..b4e2e62072d 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Azoknak az email tartományoknak a vesszővel elválasztott listája, melyekre a regisztráció korlátozva lesz. A felhasználók egy emailt fognak kapni, hogy megerősítsék az email címüket mielőtt használni kezdhetnék az alkalmazást.<br>Fontos tudni, hogy a felhasználók a sikeres regisztráció után megváltoztathatják az email címüket.',
     'reg_confirm_restrict_domain_placeholder' => 'Nincs beállítva korlátozás',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Karbantartás',
     'maint_image_cleanup' => 'Képek tisztítása',
diff --git a/lang/id/activities.php b/lang/id/activities.php
index 8c3e800bb67..380236439f8 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'izin diperbarui',
 ];
diff --git a/lang/id/editor.php b/lang/id/editor.php
index c0b72601ad6..40fc4a5abfd 100644
--- a/lang/id/editor.php
+++ b/lang/id/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Batal',
     'save' => 'Simpan',
     'close' => 'Tutup',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Ulangi',
     'left' => 'Kiri',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 81d6763d09d..63b6fe358ed 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Cari buku ini',
     'books_navigation' => 'Navigasi Buku',
     'books_sort' => 'Sortir Isi Buku',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sortir Buku :bookName',
     'books_sort_name' => 'Diurutkan berdasarkan nama',
     'books_sort_created' => 'Urutkan berdasarkan Tanggal Dibuat',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index abc4c86b405..8c26cbe9755 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Masukkan daftar domain email yang dipisahkan dengan koma yang ingin Anda batasi pendaftarannya. Pengguna akan dikirimi email untuk mengonfirmasi alamat mereka sebelum diizinkan untuk berinteraksi dengan aplikasi. <br> Perhatikan bahwa pengguna akan dapat mengubah alamat email mereka setelah pendaftaran berhasil.',
     'reg_confirm_restrict_domain_placeholder' => 'Tidak ada batasan yang ditetapkan',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Pemeliharaan',
     'maint_image_cleanup' => 'Gambar Bersihkan',
diff --git a/lang/is/activities.php b/lang/is/activities.php
index 5c84cdb5365..e70aa2567f0 100644
--- a/lang/is/activities.php
+++ b/lang/is/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'athugasemd uppfærð',
     'comment_delete'              => 'athugasemd eytt',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'uppfærðar heimildir',
 ];
diff --git a/lang/is/editor.php b/lang/is/editor.php
index 4e0ebcb4438..95b8c54e653 100644
--- a/lang/is/editor.php
+++ b/lang/is/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Hætta við',
     'save' => 'Vista',
     'close' => 'Loka',
+    'apply' => 'Apply',
     'undo' => 'Afturkalla',
     'redo' => 'Endurgera',
     'left' => 'Vinstri',
@@ -147,6 +148,7 @@
     'url' => 'Vistfang',
     'text_to_display' => 'Teksti til að sýna',
     'title' => 'Titill',
+    'browse_links' => 'Browse links',
     'open_link' => 'Opna hlekk',
     'open_link_in' => 'Opna hlekk í...',
     'open_link_current' => 'Virkum glugga',
diff --git a/lang/is/entities.php b/lang/is/entities.php
index f4ea3ac6dc5..1e5b0d9bc30 100644
--- a/lang/is/entities.php
+++ b/lang/is/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Leita í þessari bók',
     'books_navigation' => 'Leiðartré bókar',
     'books_sort' => 'Raða innihaldi bókar',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Raða bók :bookName',
     'books_sort_name' => 'Raða eftir nafni',
     'books_sort_created' => 'Raða eftir skráningar dagsetningu',
diff --git a/lang/is/settings.php b/lang/is/settings.php
index 14b0ec8e32d..08f922f7334 100644
--- a/lang/is/settings.php
+++ b/lang/is/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'Engin skilyrði sett',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Viðhald',
     'maint_image_cleanup' => 'Taka til í myndum',
diff --git a/lang/it/activities.php b/lang/it/activities.php
index 32d71ac083e..d682ccca6e0 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'ha aggiornato un commento',
     'comment_delete'              => 'ha rimosso un commento',
 
+    // Sort Rules
+    'sort_rule_create' => 'regola di ordinamento creata',
+    'sort_rule_create_notification' => 'Ordina regola creata con successo',
+    'sort_rule_update' => 'regola di ordinamento aggiornata',
+    'sort_rule_update_notification' => 'Regola di ordinamento aggiornata con successo',
+    'sort_rule_delete' => 'regola di ordinamento eliminata',
+    'sort_rule_delete_notification' => 'Regola di ordinamento eliminata con successo',
+
     // Other
     'permissions_update'          => 'ha aggiornate le autorizzazioni',
 ];
diff --git a/lang/it/editor.php b/lang/it/editor.php
index fac478a4aca..3fb517ffb5f 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Annulla',
     'save' => 'Salva',
     'close' => 'Chiudi',
+    'apply' => 'Applica',
     'undo' => 'Annulla',
     'redo' => 'Ripeti',
     'left' => 'Sinistra',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Testo da visualizzare',
     'title' => 'Titolo',
+    'browse_links' => 'Sfoglia link',
     'open_link' => 'Apri collegamento',
     'open_link_in' => 'Apri collegamento in...',
     'open_link_current' => 'Finestra corrente',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index c3efa5d3390..2762f1933ce 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Cerca in questo libro',
     'books_navigation' => 'Navigazione libro',
     'books_sort' => 'Ordina il contenuto del libro',
-    'books_sort_desc' => 'Sposta capitoli e pagine all\'interno di un libro per riorganizzarne il contenuto. È possibile aggiungere altri libri, per spostare facilmente capitoli e pagine da un libro all\'altro.',
+    'books_sort_desc' => 'Spostare i capitoli e le pagine di un libro per riorganizzarne il contenuto. Possono essere aggiunti altri libri che permettono di spostare facilmente capitoli e pagine tra i libri. Opzionalmente una regola di ordinamento automatico può essere impostata per ordinare automaticamente i contenuti di questo libro in caso di modifiche.',
+    'books_sort_auto_sort' => 'Opzione Ordinamento Automatico',
+    'books_sort_auto_sort_active' => 'Ordinamento Automatico Attivo: :sortName',
     'books_sort_named' => 'Ordina il libro :bookName',
     'books_sort_name' => 'Ordina per Nome',
     'books_sort_created' => 'Ordina per Data di creazione',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index e9c45bced20..bfad07b1c41 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Inserisci una lista separata da virgola di domini di email a cui vorresti restringere la registrazione. Agli utenti verrà inviata una mail per confermare il loro indirizzo prima che possano interagire con l\'applicazione. <br> Nota che gli utenti saranno in grado di cambiare il loro indirizzo dopo aver completato la registrazione.',
     'reg_confirm_restrict_domain_placeholder' => 'Nessuna restrizione impostata',
 
+    // Sorting Settings
+    'sorting' => 'Ordinamento',
+    'sorting_book_default' => 'Ordinamento libri predefinito',
+    'sorting_book_default_desc' => 'Selezionare la regola di ordinamento predefinita da applicare ai nuovi libri. Questa regola non influisce sui libri esistenti e può essere modificata per ogni libro.',
+    'sorting_rules' => 'Regole di ordinamento',
+    'sorting_rules_desc' => 'Si tratta di operazioni di ordinamento predefinite applicabili ai contenuti del sistema.',
+    'sort_rule_assigned_to_x_books' => 'Assegnato a :count Book|Assegnato a :count Books',
+    'sort_rule_create' => 'Crea Regola Di Ordinamento',
+    'sort_rule_edit' => 'Modifica Regola di Ordinamento',
+    'sort_rule_delete' => 'Elimina Regola di Ordinamento',
+    'sort_rule_delete_desc' => 'Rimuove questa regola di ordinamento dal sistema. I libri che usano questo ordinamento torneranno all\'ordinamento manuale.',
+    'sort_rule_delete_warn_books' => 'Questa regola di ordinamento è attualmente utilizzata su :count book(s). Sei sicuro di volerla eliminare?',
+    'sort_rule_delete_warn_default' => 'Questa regola di ordinamento è attualmente utilizzata come predefinita per i libri. Sei sicuro di volerla eliminare?',
+    'sort_rule_details' => 'Dettagli della regola di ordinamento',
+    'sort_rule_details_desc' => 'Imposta un nome per questa regola di ordinamento, apparirà nelle liste quando gli utenti selezionano un ordinamento.',
+    'sort_rule_operations' => 'Operazioni di ordinamento',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Operazioni Disponibili',
+    'sort_rule_available_operations_empty' => 'Nessuna operazione rimanente',
+    'sort_rule_configured_operations' => 'Operazioni Configurate',
+    'sort_rule_configured_operations_empty' => 'Trascinare/aggiungere le operazioni dall\'elenco “Operazioni disponibili”',
+    'sort_rule_op_asc' => '(Ascendente)',
+    'sort_rule_op_desc' => '(Discendente)',
+    'sort_rule_op_name' => 'Nome - Alfabetico',
+    'sort_rule_op_name_numeric' => 'Name - Numerico',
+    'sort_rule_op_created_date' => 'Data di creazione',
+    'sort_rule_op_updated_date' => 'Data di aggiornamento',
+    'sort_rule_op_chapters_first' => 'Capitoli Prima',
+    'sort_rule_op_chapters_last' => 'Capitoli dopo',
+
     // Maintenance settings
     'maint' => 'Manutenzione',
     'maint_image_cleanup' => 'Pulizia immagini',
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index c97fbd7ed76..b2bbd89a58f 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'がコメントを更新',
     'comment_delete'              => 'がコメントを削除',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'が権限を更新:',
 ];
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 6d4a424c5f6..4a131b5d9b1 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -13,6 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '閉じる',
+    'apply' => 'Apply',
     'undo' => '元に戻す',
     'redo' => 'やり直し',
     'left' => '左寄せ',
@@ -147,6 +148,7 @@
     'url' => 'リンク先URL',
     'text_to_display' => 'リンク元テキスト',
     'title' => 'タイトル',
+    'browse_links' => 'Browse links',
     'open_link' => 'リンクを開く',
     'open_link_in' => 'リンク先の表示場所',
     'open_link_current' => '同じウィンドウ',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 76cc2a7693d..583d2e17d20 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'このブックから検索',
     'books_navigation' => '目次',
     'books_sort' => '並び順を変更',
-    'books_sort_desc' => 'ブック内のチャプターとページを移動して、その内容を再編成します。 他のブックを追加することで、チャプターやページをブック間で簡単に移動することができます。',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'ブック「:bookName」を並べ替え',
     'books_sort_name' => '名前で並べ替え',
     'books_sort_created' => '作成日で並べ替え',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index ffced8dd16e..14a890dfd38 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => '特定のドメインのみ登録できるようにする場合、以下にカンマ区切りで入力します。設定された場合、Eメール認証が必須になります。<br>登録後、ユーザは自由にEメールアドレスを変更できます。',
     'reg_confirm_restrict_domain_placeholder' => '制限しない',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'メンテナンス',
     'maint_image_cleanup' => '画像のクリーンアップ',
diff --git a/lang/ka/activities.php b/lang/ka/activities.php
index 4cc9fbcb66a..35730fd77a0 100644
--- a/lang/ka/activities.php
+++ b/lang/ka/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'updated permissions',
 ];
diff --git a/lang/ka/editor.php b/lang/ka/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/ka/editor.php
+++ b/lang/ka/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index 26a563a7eb5..a74785eaacd 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index c0b6b692a57..82a4ade5df5 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index 4e733b7b582..84df1c1fda9 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -7,15 +7,15 @@
 
     // Pages
     'page_create'                 => '페이지 생성',
-    'page_create_notification'    => '페이지가 성공적으로 생성되었습니다.',
+    'page_create_notification'    => '페이지가 성공적으로 생성되었습니다',
     'page_update'                 => '페이지 업데이트',
-    'page_update_notification'    => '페이지가 성공적으로 업데이트되었습니다.',
+    'page_update_notification'    => '페이지가 성공적으로 업데이트 되었습니다',
     'page_delete'                 => '페이지 삭제',
-    'page_delete_notification'    => '페이지가 성공적으로 삭제되었습니다.',
+    'page_delete_notification'    => '페이지가 성공적으로 삭제되었습니다',
     'page_restore'                => '페이지 복원',
-    'page_restore_notification'   => '페이지가 성공적으로 복원되었습니다.',
+    'page_restore_notification'   => '페이지가 성공적으로 복원되었습니다',
     'page_move'                   => '페이지 이동',
-    'page_move_notification'      => '페이지가 성공적으로 이동되었습니다.',
+    'page_move_notification'      => '페이지가 성공적으로 이동되었습니다',
 
     // Chapters
     'chapter_create'              => '챕터 생성',
@@ -28,7 +28,7 @@
     'chapter_move_notification' => '페이지가 성공적으로 이동되었습니다.',
 
     // Books
-    'book_create'                 => '생성된 책',
+    'book_create'                 => '책 생성',
     'book_create_notification'    => '책이 성공적으로 생성되었습니다.',
     'book_create_from_chapter'              => '챕터를 책으로 변환',
     'book_create_from_chapter_notification' => '챕터가 책으로 성공적으로 변환되었습니다.',
@@ -44,13 +44,13 @@
     'bookshelf_create_notification'    => '책장을 성공적으로 생성했습니다.',
     'bookshelf_create_from_book'    => '책을 책장으로 변환함',
     'bookshelf_create_from_book_notification'    => '책을 성공적으로 책장으로 변환하였습니다.',
-    'bookshelf_update'                 => '책장 업데이트됨',
+    'bookshelf_update'                 => '책장 업데이트',
     'bookshelf_update_notification'    => '책장이 성공적으로 업데이트 되었습니다.',
-    'bookshelf_delete'                 => '삭제된 책장',
+    'bookshelf_delete'                 => '책장 삭제',
     'bookshelf_delete_notification'    => '책장이 성공적으로 삭제되었습니다.',
 
     // Revisions
-    'revision_restore' => '복구된 버전',
+    'revision_restore' => '버전 복구',
     'revision_delete' => '버전 삭제',
     'revision_delete_notification' => '버전 삭제 성공',
 
@@ -79,7 +79,7 @@
     // Webhooks
     'webhook_create' => '웹 훅 생성',
     'webhook_create_notification' => '웹 훅 생성함',
-    'webhook_update' => '웹 훅 수정하기',
+    'webhook_update' => '웹 훅 수정',
     'webhook_update_notification' => '웹 훅 설정이 수정되었습니다.',
     'webhook_delete' => '웹 훅 지우기',
     'webhook_delete_notification' => '웹 훅 삭제함',
@@ -127,6 +127,14 @@
     'comment_update'              => '댓글 변경',
     'comment_delete'              => '댓글 삭제',
 
+    // Sort Rules
+    'sort_rule_create' => '정렬 규칙 생성',
+    'sort_rule_create_notification' => '정렬 규칙이 성공적으로 생성되었습니다',
+    'sort_rule_update' => '정렬 규칙 업데이트',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => '정렬 규칙 삭제',
+    'sort_rule_delete_notification' => '정렬 규칙이 성공적으로 삭제되었습니다',
+
     // Other
     'permissions_update'          => '권한 수정함',
 ];
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index 81c2dbc54dd..f04611a925f 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -13,6 +13,7 @@
     'cancel' => '취소',
     'save' => '저장',
     'close' => '닫기',
+    'apply' => 'Apply',
     'undo' => '되돌리기',
     'redo' => '다시 실행',
     'left' => '왼쪽',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => '표시할 텍스트',
     'title' => '제목',
+    'browse_links' => 'Browse links',
     'open_link' => '링크 열기',
     'open_link_in' => '다음에서 링크 열기...',
     'open_link_current' => '현재 창',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 7402056efc2..c13f493710b 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => '이 책에서 검색',
     'books_navigation' => '목차',
     'books_sort' => '책 내용 정렬',
-    'books_sort_desc' => '책 내에서 챕터와 페이지를 이동하여 내용을 재구성할 수 있습니다. 다른 책을 추가하여 책 간에 챕터와 페이지를 쉽게 이동할 수 있습니다.',
+    'books_sort_desc' => '책 내의 챕터와 페이지를 이동하여 콘텐츠를 재구성할 수 있습니다. 다른 책들을 추가하여 책 간의 챕터와 페이지를 쉽게 이동할 수 있습니다. 선택적으로 자동 정렬 규칙을 설정하여 변경 시 이 책의 콘텐츠를 자동으로 정렬할 수 있습니다.',
+    'books_sort_auto_sort' => '자동 정렬 옵션',
+    'books_sort_auto_sort_active' => '현재 설정된 자동 정렬: :sortName',
     'books_sort_named' => ':bookName 정렬',
     'books_sort_name' => '제목',
     'books_sort_created' => '만든 날짜',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 169f7970fde..5c3af83eb77 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => '가입을 차단할 도메인을 쉼표로 구분하여 입력하세요. 사용자가 메일 주소 확인에 성공하면 메일 주소를 바꿀 수 있습니다.',
     'reg_confirm_restrict_domain_placeholder' => '차단한 도메인 없음',
 
+    // Sorting Settings
+    'sorting' => '정렬',
+    'sorting_book_default' => '기본 책 정렬',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => '정렬 규칙',
+    'sorting_rules_desc' => '현재 시스템에 미리 정의된 정렬 규칙의 목록입니다.',
+    'sort_rule_assigned_to_x_books' => ':count 책에 정렬 규칙 적용',
+    'sort_rule_create' => '정렬 규칙 생성하기',
+    'sort_rule_edit' => '정렬 규칙 수정하기',
+    'sort_rule_delete' => '정렬 규칙 삭제하기',
+    'sort_rule_delete_desc' => '시스템에서 이 정렬 규칙을 삭제합니다. 이 정렬 규칙을 사용하는 책들은 수동 정렬 사용으로 변경됩니다.',
+    'sort_rule_delete_warn_books' => '이 정렬 규칙은 현재 :count 권의 책에 적용되고 있습니다. 이 정렬 규칙을 정말 삭제하시겠습니까?',
+    'sort_rule_delete_warn_default' => '이 정렬 규칙은 현재 책들에 기본으로 적용되고 있습니다. 정말 삭제하시겠습니까?',
+    'sort_rule_details' => '정렬 규칙 세부사항',
+    'sort_rule_details_desc' => '이 정렬 규칙의 이름을 지어주세요. 이 이름은 사용자가 정렬할 때 나타납니다.',
+    'sort_rule_operations' => '정렬 규칙',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => '사용 가능한 정렬 규칙',
+    'sort_rule_available_operations_empty' => '사용 가능한 정렬 규칙 없음',
+    'sort_rule_configured_operations' => '정렬 규칙 설정',
+    'sort_rule_configured_operations_empty' => '"사용 가능한 정렬 규칙"에서 추가하기',
+    'sort_rule_op_asc' => '(오름차순)',
+    'sort_rule_op_desc' => '(내림차순)',
+    'sort_rule_op_name' => '이름순 - 가나다',
+    'sort_rule_op_name_numeric' => '이름순 - 숫자',
+    'sort_rule_op_created_date' => '생성일',
+    'sort_rule_op_updated_date' => '수정일',
+    'sort_rule_op_chapters_first' => '챕터 우선 정렬',
+    'sort_rule_op_chapters_last' => '챕터 나중 정렬',
+
     // Maintenance settings
     'maint' => '유지관리',
     'maint_image_cleanup' => '이미지 정리',
diff --git a/lang/ku/activities.php b/lang/ku/activities.php
new file mode 100644
index 00000000000..4362fc02958
--- /dev/null
+++ b/lang/ku/activities.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'created page',
+    'page_create_notification'    => 'Page successfully created',
+    'page_update'                 => 'updated page',
+    'page_update_notification'    => 'Page successfully updated',
+    'page_delete'                 => 'deleted page',
+    'page_delete_notification'    => 'Page successfully deleted',
+    'page_restore'                => 'restored page',
+    'page_restore_notification'   => 'Page successfully restored',
+    'page_move'                   => 'moved page',
+    'page_move_notification'      => 'Page successfully moved',
+
+    // Chapters
+    'chapter_create'              => 'created chapter',
+    'chapter_create_notification' => 'Chapter successfully created',
+    'chapter_update'              => 'updated chapter',
+    'chapter_update_notification' => 'Chapter successfully updated',
+    'chapter_delete'              => 'deleted chapter',
+    'chapter_delete_notification' => 'Chapter successfully deleted',
+    'chapter_move'                => 'moved chapter',
+    'chapter_move_notification' => 'Chapter successfully moved',
+
+    // Books
+    'book_create'                 => 'created book',
+    'book_create_notification'    => 'Book successfully created',
+    'book_create_from_chapter'              => 'converted chapter to book',
+    'book_create_from_chapter_notification' => 'Chapter successfully converted to a book',
+    'book_update'                 => 'updated book',
+    'book_update_notification'    => 'Book successfully updated',
+    'book_delete'                 => 'deleted book',
+    'book_delete_notification'    => 'Book successfully deleted',
+    'book_sort'                   => 'sorted book',
+    'book_sort_notification'      => 'Book successfully re-sorted',
+
+    // Bookshelves
+    'bookshelf_create'            => 'created shelf',
+    'bookshelf_create_notification'    => 'Shelf successfully created',
+    'bookshelf_create_from_book'    => 'converted book to shelf',
+    'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
+    'bookshelf_update'                 => 'updated shelf',
+    'bookshelf_update_notification'    => 'Shelf successfully updated',
+    'bookshelf_delete'                 => 'deleted shelf',
+    'bookshelf_delete_notification'    => 'Shelf successfully deleted',
+
+    // Revisions
+    'revision_restore' => 'restored revision',
+    'revision_delete' => 'deleted revision',
+    'revision_delete_notification' => 'Revision successfully deleted',
+
+    // Favourites
+    'favourite_add_notification' => '":name" has been added to your favourites',
+    'favourite_remove_notification' => '":name" has been removed from your favourites',
+
+    // Watching
+    'watch_update_level_notification' => 'Watch preferences successfully updated',
+
+    // Auth
+    'auth_login' => 'logged in',
+    'auth_register' => 'registered as new user',
+    'auth_password_reset_request' => 'requested user password reset',
+    'auth_password_reset_update' => 'reset user password',
+    'mfa_setup_method' => 'configured MFA method',
+    'mfa_setup_method_notification' => 'Multi-factor method successfully configured',
+    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method_notification' => 'Multi-factor method successfully removed',
+
+    // Settings
+    'settings_update' => 'updated settings',
+    'settings_update_notification' => 'Settings successfully updated',
+    'maintenance_action_run' => 'ran maintenance action',
+
+    // Webhooks
+    'webhook_create' => 'created webhook',
+    'webhook_create_notification' => 'Webhook successfully created',
+    'webhook_update' => 'updated webhook',
+    'webhook_update_notification' => 'Webhook successfully updated',
+    'webhook_delete' => 'deleted webhook',
+    'webhook_delete_notification' => 'Webhook successfully deleted',
+
+    // Imports
+    'import_create' => 'created import',
+    'import_create_notification' => 'Import successfully uploaded',
+    'import_run' => 'updated import',
+    'import_run_notification' => 'Content successfully imported',
+    'import_delete' => 'deleted import',
+    'import_delete_notification' => 'Import successfully deleted',
+
+    // Users
+    'user_create' => 'created user',
+    'user_create_notification' => 'User successfully created',
+    'user_update' => 'updated user',
+    'user_update_notification' => 'User successfully updated',
+    'user_delete' => 'deleted user',
+    'user_delete_notification' => 'User successfully removed',
+
+    // API Tokens
+    'api_token_create' => 'created API token',
+    'api_token_create_notification' => 'API token successfully created',
+    'api_token_update' => 'updated API token',
+    'api_token_update_notification' => 'API token successfully updated',
+    'api_token_delete' => 'deleted API token',
+    'api_token_delete_notification' => 'API token successfully deleted',
+
+    // Roles
+    'role_create' => 'created role',
+    'role_create_notification' => 'Role successfully created',
+    'role_update' => 'updated role',
+    'role_update_notification' => 'Role successfully updated',
+    'role_delete' => 'deleted role',
+    'role_delete_notification' => 'Role successfully deleted',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'emptied recycle bin',
+    'recycle_bin_restore' => 'restored from recycle bin',
+    'recycle_bin_destroy' => 'removed from recycle bin',
+
+    // Comments
+    'commented_on'                => 'commented on',
+    'comment_create'              => 'added comment',
+    'comment_update'              => 'updated comment',
+    'comment_delete'              => 'deleted comment',
+
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
+    // Other
+    'permissions_update'          => 'updated permissions',
+];
diff --git a/lang/ku/auth.php b/lang/ku/auth.php
new file mode 100644
index 00000000000..369e06f93ed
--- /dev/null
+++ b/lang/ku/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'ئەم بەکارهێنەرە نەدۆزرایەوە.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+    // Login & Register
+    'sign_up' => 'Sign up',
+    'log_in' => 'Log in',
+    'log_in_with' => 'Login with :socialDriver',
+    'sign_up_with' => 'Sign up with :socialDriver',
+    'logout' => 'Logout',
+
+    'name' => 'Name',
+    'username' => 'Username',
+    'email' => 'Email',
+    'password' => 'Password',
+    'password_confirm' => 'Confirm Password',
+    'password_hint' => 'Must be at least 8 characters',
+    'forgot_password' => 'Forgot Password?',
+    'remember_me' => 'Remember Me',
+    'ldap_email_hint' => 'Please enter an email to use for this account.',
+    'create_account' => 'Create Account',
+    'already_have_account' => 'Already have an account?',
+    'dont_have_account' => 'Don\'t have an account?',
+    'social_login' => 'Social Login',
+    'social_registration' => 'Social Registration',
+    'social_registration_text' => 'Register and sign in using another service.',
+
+    'register_thanks' => 'Thanks for registering!',
+    'register_confirm' => 'Please check your email and click the confirmation button to access :appName.',
+    'registrations_disabled' => 'Registrations are currently disabled',
+    'registration_email_domain_invalid' => 'That email domain does not have access to this application',
+    'register_success' => 'Thanks for signing up! You are now registered and signed in.',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'Attempting Login',
+    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
+    'auto_init_start_link' => 'Proceed with authentication',
+
+    // Password Reset
+    'reset_password' => 'Reset Password',
+    'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
+    'reset_password_send_button' => 'Send Reset Link',
+    'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
+    'reset_password_success' => 'Your password has been successfully reset.',
+    'email_reset_subject' => 'Reset your :appName password',
+    'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
+    'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'Confirm your email on :appName',
+    'email_confirm_greeting' => 'Thanks for joining :appName!',
+    'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
+    'email_confirm_action' => 'ئیمێڵەکەت دووبارە بنووسەوە',
+    'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
+    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
+    'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
+    'email_confirm_thanks' => 'Thanks for confirming!',
+    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+
+    'email_not_confirmed' => 'Email Address Not Confirmed',
+    'email_not_confirmed_text' => 'Your email address has not yet been confirmed.',
+    'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
+    'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
+    'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
+
+    // User Invite
+    'user_invite_email_subject' => 'You have been invited to join :appName!',
+    'user_invite_email_greeting' => 'An account has been created for you on :appName.',
+    'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
+    'user_invite_email_action' => 'Set Account Password',
+    'user_invite_page_welcome' => 'Welcome to :appName!',
+    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
+    'user_invite_page_confirm_button' => 'Confirm Password',
+    'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'Setup Multi-Factor Authentication',
+    'mfa_setup_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'mfa_setup_configured' => 'Already configured',
+    'mfa_setup_reconfigure' => 'Reconfigure',
+    'mfa_setup_remove_confirmation' => 'Are you sure you want to remove this multi-factor authentication method?',
+    'mfa_setup_action' => 'Setup',
+    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_option_totp_title' => 'Mobile App',
+    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Backup Codes',
+    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
+    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
+    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
+    'mfa_gen_backup_codes_download' => 'Download Codes',
+    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
+    'mfa_gen_totp_title' => 'Mobile App Setup',
+    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
+    'mfa_gen_totp_verify_setup' => 'Verify Setup',
+    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
+    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
+    'mfa_verify_access' => 'Verify Access',
+    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
+    'mfa_verify_no_methods' => 'No Methods Configured',
+    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_use_totp' => 'Verify using a mobile app',
+    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
+    'mfa_verify_backup_code' => 'Backup Code',
+    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
+    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
+    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
+    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+];
diff --git a/lang/ku/common.php b/lang/ku/common.php
new file mode 100644
index 00000000000..d1481e0ecc3
--- /dev/null
+++ b/lang/ku/common.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'لابردن',
+    'close' => 'داخستن',
+    'confirm' => 'دڵنیام',
+    'back' => 'گەڕانەوە',
+    'save' => 'پاشەکەوتکردن',
+    'continue' => 'بەردەوامبە',
+    'select' => 'هەڵبژێرە',
+    'toggle_all' => 'Toggle All',
+    'more' => 'زیاتر',
+
+    // Form Labels
+    'name' => 'ناو',
+    'description' => 'وردەکاری',
+    'role' => 'توانا',
+    'cover_image' => 'وێنەی کەڤەر',
+    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+
+    // Actions
+    'actions' => 'کردارەکان',
+    'view' => 'بینین',
+    'view_all' => 'بینینی هەموو',
+    'new' => 'نوێ',
+    'create' => 'دروستکردن',
+    'update' => 'نوێکردنەوە',
+    'edit' => 'دەسکاریکردن',
+    'sort' => 'ڕیزکردن',
+    'move' => 'جوڵاندن',
+    'copy' => 'لەبەرگرتنەوە',
+    'reply' => 'وەڵامدانەوە',
+    'delete' => 'سڕینەوە',
+    'delete_confirm' => 'دڵنیام لە سڕینەوە',
+    'search' => 'گەڕان',
+    'search_clear' => 'پاککردنه‌وه‌ی گه‌ڕان',
+    'reset' => 'ڕێکخستنەوە',
+    'remove' => 'لابردن',
+    'add' => 'زیادکردن',
+    'configure' => 'شێوەپێدان',
+    'manage' => 'بەڕیوەبردن',
+    'fullscreen' => 'پڕ شاشە',
+    'favourite' => 'ئارەزووەکان',
+    'unfavourite' => 'Unfavourite',
+    'next' => 'دواتر',
+    'previous' => 'پێشتر',
+    'filter_active' => 'Active Filter:',
+    'filter_clear' => 'Clear Filter',
+    'download' => 'دابەزاندن',
+    'open_in_tab' => 'Open in Tab',
+    'open' => 'کردنه‌وه‌',
+
+    // Sort Options
+    'sort_options' => 'Sort Options',
+    'sort_direction_toggle' => 'Sort Direction Toggle',
+    'sort_ascending' => 'Sort Ascending',
+    'sort_descending' => 'Sort Descending',
+    'sort_name' => 'ناو',
+    'sort_default' => 'Default',
+    'sort_created_at' => 'Created Date',
+    'sort_updated_at' => 'Updated Date',
+
+    // Misc
+    'deleted_user' => 'Deleted User',
+    'no_activity' => 'No activity to show',
+    'no_items' => 'No items available',
+    'back_to_top' => 'گەڕانەوە بۆ سەرەوە',
+    'skip_to_main_content' => 'Skip to main content',
+    'toggle_details' => 'Toggle Details',
+    'toggle_thumbnails' => 'Toggle Thumbnails',
+    'details' => 'وردەکاریەکان',
+    'grid_view' => 'Grid View',
+    'list_view' => 'List View',
+    'default' => 'Default',
+    'breadcrumb' => 'Breadcrumb',
+    'status' => 'Status',
+    'status_active' => 'Active',
+    'status_inactive' => 'Inactive',
+    'never' => 'Never',
+    'none' => 'هیچ',
+
+    // Header
+    'homepage' => 'پەرەی سەرەكی',
+    'header_menu_expand' => 'Expand Header Menu',
+    'profile_menu' => 'Profile Menu',
+    'view_profile' => 'View Profile',
+    'edit_profile' => 'ڕێکخستنی دۆسیەی تایبەت',
+    'dark_mode' => 'جۆری ڕەش',
+    'light_mode' => 'دۆخی ڕووناک',
+    'global_search' => 'Global Search',
+
+    // Layout tabs
+    'tab_info' => 'Info',
+    'tab_info_label' => 'Tab: Show Secondary Information',
+    'tab_content' => 'ناوەڕۆک',
+    'tab_content_label' => 'Tab: Show Primary Content',
+
+    // Email Content
+    'email_action_help' => 'If you’re having trouble clicking the ":actionText" button, copy and paste the URL below into your web browser:',
+    'email_rights' => 'All rights reserved',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'ڕێبازی مافی کەسیی',
+    'terms_of_service' => 'مەرجەکانی خزمەت',
+
+    // OpenSearch
+    'opensearch_description' => 'Search :appName',
+];
diff --git a/lang/ku/components.php b/lang/ku/components.php
new file mode 100644
index 00000000000..c33b1d0b791
--- /dev/null
+++ b/lang/ku/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'Image Select',
+    'image_list' => 'Image List',
+    'image_details' => 'Image Details',
+    'image_upload' => 'Upload Image',
+    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
+    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_all' => 'All',
+    'image_all_title' => 'View all images',
+    'image_book_title' => 'View images uploaded to this book',
+    'image_page_title' => 'View images uploaded to this page',
+    'image_search_hint' => 'Search by image name',
+    'image_uploaded' => 'Uploaded :uploadedDate',
+    'image_uploaded_by' => 'Uploaded by :userName',
+    'image_uploaded_to' => 'Uploaded to :pageLink',
+    'image_updated' => 'Updated :updateDate',
+    'image_load_more' => 'Load More',
+    'image_image_name' => 'Image Name',
+    'image_delete_used' => 'This image is used in the pages below.',
+    'image_delete_confirm_text' => 'Are you sure you want to delete this image?',
+    'image_select_image' => 'Select Image',
+    'image_dropzone' => 'Drop images or click here to upload',
+    'image_dropzone_drop' => 'Drop images here to upload',
+    'images_deleted' => 'Images Deleted',
+    'image_preview' => 'Image Preview',
+    'image_upload_success' => 'Image uploaded successfully',
+    'image_update_success' => 'Image details successfully updated',
+    'image_delete_success' => 'Image successfully deleted',
+    'image_replace' => 'Replace Image',
+    'image_replace_success' => 'Image file successfully updated',
+    'image_rebuild_thumbs' => 'Regenerate Size Variations',
+    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+
+    // Code Editor
+    'code_editor' => 'Edit Code',
+    'code_language' => 'Code Language',
+    'code_content' => 'Code Content',
+    'code_session_history' => 'Session History',
+    'code_save' => 'Save Code',
+];
diff --git a/lang/ku/editor.php b/lang/ku/editor.php
new file mode 100644
index 00000000000..752c6f3f702
--- /dev/null
+++ b/lang/ku/editor.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'General',
+    'advanced' => 'Advanced',
+    'none' => 'None',
+    'cancel' => 'Cancel',
+    'save' => 'Save',
+    'close' => 'Close',
+    'apply' => 'Apply',
+    'undo' => 'Undo',
+    'redo' => 'Redo',
+    'left' => 'Left',
+    'center' => 'Center',
+    'right' => 'Right',
+    'top' => 'Top',
+    'middle' => 'Middle',
+    'bottom' => 'Bottom',
+    'width' => 'Width',
+    'height' => 'Height',
+    'More' => 'More',
+    'select' => 'Select...',
+
+    // Toolbar
+    'formats' => 'Formats',
+    'header_large' => 'Large Header',
+    'header_medium' => 'Medium Header',
+    'header_small' => 'Small Header',
+    'header_tiny' => 'Tiny Header',
+    'paragraph' => 'Paragraph',
+    'blockquote' => 'Blockquote',
+    'inline_code' => 'Inline code',
+    'callouts' => 'Callouts',
+    'callout_information' => 'Information',
+    'callout_success' => 'Success',
+    'callout_warning' => 'Warning',
+    'callout_danger' => 'Danger',
+    'bold' => 'Bold',
+    'italic' => 'Italic',
+    'underline' => 'Underline',
+    'strikethrough' => 'Strikethrough',
+    'superscript' => 'Superscript',
+    'subscript' => 'Subscript',
+    'text_color' => 'Text color',
+    'custom_color' => 'Custom color',
+    'remove_color' => 'Remove color',
+    'background_color' => 'Background color',
+    'align_left' => 'Align left',
+    'align_center' => 'Align center',
+    'align_right' => 'Align right',
+    'align_justify' => 'Justify',
+    'list_bullet' => 'Bullet list',
+    'list_numbered' => 'Numbered list',
+    'list_task' => 'Task list',
+    'indent_increase' => 'Increase indent',
+    'indent_decrease' => 'Decrease indent',
+    'table' => 'Table',
+    'insert_image' => 'Insert image',
+    'insert_image_title' => 'Insert/Edit Image',
+    'insert_link' => 'Insert/edit link',
+    'insert_link_title' => 'Insert/Edit Link',
+    'insert_horizontal_line' => 'Insert horizontal line',
+    'insert_code_block' => 'Insert code block',
+    'edit_code_block' => 'Edit code block',
+    'insert_drawing' => 'Insert/edit drawing',
+    'drawing_manager' => 'Drawing manager',
+    'insert_media' => 'Insert/edit media',
+    'insert_media_title' => 'Insert/Edit Media',
+    'clear_formatting' => 'Clear formatting',
+    'source_code' => 'Source code',
+    'source_code_title' => 'Source Code',
+    'fullscreen' => 'Fullscreen',
+    'image_options' => 'Image options',
+
+    // Tables
+    'table_properties' => 'Table properties',
+    'table_properties_title' => 'Table Properties',
+    'delete_table' => 'Delete table',
+    'table_clear_formatting' => 'Clear table formatting',
+    'resize_to_contents' => 'Resize to contents',
+    'row_header' => 'Row header',
+    'insert_row_before' => 'Insert row before',
+    'insert_row_after' => 'Insert row after',
+    'delete_row' => 'Delete row',
+    'insert_column_before' => 'Insert column before',
+    'insert_column_after' => 'Insert column after',
+    'delete_column' => 'Delete column',
+    'table_cell' => 'Cell',
+    'table_row' => 'Row',
+    'table_column' => 'Column',
+    'cell_properties' => 'Cell properties',
+    'cell_properties_title' => 'Cell Properties',
+    'cell_type' => 'Cell type',
+    'cell_type_cell' => 'Cell',
+    'cell_scope' => 'Scope',
+    'cell_type_header' => 'Header cell',
+    'merge_cells' => 'Merge cells',
+    'split_cell' => 'Split cell',
+    'table_row_group' => 'Row Group',
+    'table_column_group' => 'Column Group',
+    'horizontal_align' => 'Horizontal align',
+    'vertical_align' => 'Vertical align',
+    'border_width' => 'Border width',
+    'border_style' => 'Border style',
+    'border_color' => 'Border color',
+    'row_properties' => 'Row properties',
+    'row_properties_title' => 'Row Properties',
+    'cut_row' => 'Cut row',
+    'copy_row' => 'Copy row',
+    'paste_row_before' => 'Paste row before',
+    'paste_row_after' => 'Paste row after',
+    'row_type' => 'Row type',
+    'row_type_header' => 'Header',
+    'row_type_body' => 'Body',
+    'row_type_footer' => 'Footer',
+    'alignment' => 'Alignment',
+    'cut_column' => 'Cut column',
+    'copy_column' => 'Copy column',
+    'paste_column_before' => 'Paste column before',
+    'paste_column_after' => 'Paste column after',
+    'cell_padding' => 'Cell padding',
+    'cell_spacing' => 'Cell spacing',
+    'caption' => 'Caption',
+    'show_caption' => 'Show caption',
+    'constrain' => 'Constrain proportions',
+    'cell_border_solid' => 'Solid',
+    'cell_border_dotted' => 'Dotted',
+    'cell_border_dashed' => 'Dashed',
+    'cell_border_double' => 'Double',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'None',
+    'cell_border_hidden' => 'Hidden',
+
+    // Images, links, details/summary & embed
+    'source' => 'Source',
+    'alt_desc' => 'Alternative description',
+    'embed' => 'Embed',
+    'paste_embed' => 'Paste your embed code below:',
+    'url' => 'URL',
+    'text_to_display' => 'Text to display',
+    'title' => 'Title',
+    'browse_links' => 'Browse links',
+    'open_link' => 'Open link',
+    'open_link_in' => 'Open link in...',
+    'open_link_current' => 'Current window',
+    'open_link_new' => 'New window',
+    'remove_link' => 'Remove link',
+    'insert_collapsible' => 'Insert collapsible block',
+    'collapsible_unwrap' => 'Unwrap',
+    'edit_label' => 'Edit label',
+    'toggle_open_closed' => 'Toggle open/closed',
+    'collapsible_edit' => 'Edit collapsible block',
+    'toggle_label' => 'Toggle label',
+
+    // About view
+    'about' => 'About the editor',
+    'about_title' => 'About the WYSIWYG Editor',
+    'editor_license' => 'Editor License & Copyright',
+    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
+    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
+    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
+    'save_continue' => 'Save Page & Continue',
+    'callouts_cycle' => '(Keep pressing to toggle through types)',
+    'link_selector' => 'Link to content',
+    'shortcuts' => 'Shortcuts',
+    'shortcut' => 'Shortcut',
+    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'Description',
+];
diff --git a/lang/ku/entities.php b/lang/ku/entities.php
new file mode 100644
index 00000000000..a74785eaacd
--- /dev/null
+++ b/lang/ku/entities.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'Recently Created',
+    'recently_created_pages' => 'Recently Created Pages',
+    'recently_updated_pages' => 'Recently Updated Pages',
+    'recently_created_chapters' => 'Recently Created Chapters',
+    'recently_created_books' => 'Recently Created Books',
+    'recently_created_shelves' => 'Recently Created Shelves',
+    'recently_update' => 'Recently Updated',
+    'recently_viewed' => 'Recently Viewed',
+    'recent_activity' => 'Recent Activity',
+    'create_now' => 'Create one now',
+    'revisions' => 'Revisions',
+    'meta_revision' => 'Revision #:revisionCount',
+    'meta_created' => 'Created :timeLength',
+    'meta_created_name' => 'Created :timeLength by :user',
+    'meta_updated' => 'Updated :timeLength',
+    'meta_updated_name' => 'Updated :timeLength by :user',
+    'meta_owned_name' => 'Owned by :user',
+    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'entity_select' => 'Entity Select',
+    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'images' => 'Images',
+    'my_recent_drafts' => 'My Recent Drafts',
+    'my_recently_viewed' => 'My Recently Viewed',
+    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
+    'my_favourites' => 'My Favourites',
+    'no_pages_viewed' => 'You have not viewed any pages',
+    'no_pages_recently_created' => 'No pages have been recently created',
+    'no_pages_recently_updated' => 'No pages have been recently updated',
+    'export' => 'Export',
+    'export_html' => 'Contained Web File',
+    'export_pdf' => 'PDF File',
+    'export_text' => 'Plain Text File',
+    'export_md' => 'Markdown File',
+    'export_zip' => 'Portable ZIP',
+    'default_template' => 'Default Page Template',
+    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_select' => 'Select a template page',
+    'import' => 'Import',
+    'import_validate' => 'Validate Import',
+    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
+    'import_pending' => 'Pending Imports',
+    'import_pending_none' => 'No imports have been started.',
+    'import_continue' => 'Continue Import',
+    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
+    'import_details' => 'Import Details',
+    'import_run' => 'Run Import',
+    'import_size' => ':size Import ZIP Size',
+    'import_uploaded_at' => 'Uploaded :relativeTime',
+    'import_uploaded_by' => 'Uploaded by',
+    'import_location' => 'Import Location',
+    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_delete_confirm' => 'Are you sure you want to delete this import?',
+    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
+    'import_errors' => 'Import Errors',
+    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+
+    // Permissions and restrictions
+    'permissions' => 'Permissions',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_save' => 'Save Permissions',
+    'permissions_owner' => 'Owner',
+    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Override permissions for role',
+    'permissions_inherit_defaults' => 'Inherit defaults',
+
+    // Search
+    'search_results' => 'Search Results',
+    'search_total_results_found' => ':count result found|:count total results found',
+    'search_clear' => 'Clear Search',
+    'search_no_pages' => 'No pages matched this search',
+    'search_for_term' => 'Search for :term',
+    'search_more' => 'More Results',
+    'search_advanced' => 'Advanced Search',
+    'search_terms' => 'Search Terms',
+    'search_content_type' => 'Content Type',
+    'search_exact_matches' => 'Exact Matches',
+    'search_tags' => 'Tag Searches',
+    'search_options' => 'Options',
+    'search_viewed_by_me' => 'Viewed by me',
+    'search_not_viewed_by_me' => 'Not viewed by me',
+    'search_permissions_set' => 'Permissions set',
+    'search_created_by_me' => 'Created by me',
+    'search_updated_by_me' => 'Updated by me',
+    'search_owned_by_me' => 'Owned by me',
+    'search_date_options' => 'Date Options',
+    'search_updated_before' => 'Updated before',
+    'search_updated_after' => 'Updated after',
+    'search_created_before' => 'Created before',
+    'search_created_after' => 'Created after',
+    'search_set_date' => 'Set Date',
+    'search_update' => 'Update Search',
+
+    // Shelves
+    'shelf' => 'Shelf',
+    'shelves' => 'Shelves',
+    'x_shelves' => ':count Shelf|:count Shelves',
+    'shelves_empty' => 'No shelves have been created',
+    'shelves_create' => 'Create New Shelf',
+    'shelves_popular' => 'Popular Shelves',
+    'shelves_new' => 'New Shelves',
+    'shelves_new_action' => 'New Shelf',
+    'shelves_popular_empty' => 'The most popular shelves will appear here.',
+    'shelves_new_empty' => 'The most recently created shelves will appear here.',
+    'shelves_save' => 'Save Shelf',
+    'shelves_books' => 'Books on this shelf',
+    'shelves_add_books' => 'Add books to this shelf',
+    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_empty_contents' => 'This shelf has no books assigned to it',
+    'shelves_edit_and_assign' => 'Edit shelf to assign books',
+    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit' => 'Edit Shelf',
+    'shelves_delete' => 'Delete Shelf',
+    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
+    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
+    'shelves_permissions' => 'Shelf Permissions',
+    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
+    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
+    'shelves_copy_permissions' => 'Copy Permissions',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+
+    // Books
+    'book' => 'Book',
+    'books' => 'Books',
+    'x_books' => ':count Book|:count Books',
+    'books_empty' => 'No books have been created',
+    'books_popular' => 'Popular Books',
+    'books_recent' => 'Recent Books',
+    'books_new' => 'New Books',
+    'books_new_action' => 'New Book',
+    'books_popular_empty' => 'The most popular books will appear here.',
+    'books_new_empty' => 'The most recently created books will appear here.',
+    'books_create' => 'Create New Book',
+    'books_delete' => 'Delete Book',
+    'books_delete_named' => 'Delete Book :bookName',
+    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
+    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
+    'books_edit' => 'Edit Book',
+    'books_edit_named' => 'Edit Book :bookName',
+    'books_form_book_name' => 'Book Name',
+    'books_save' => 'Save Book',
+    'books_permissions' => 'Book Permissions',
+    'books_permissions_updated' => 'Book Permissions Updated',
+    'books_empty_contents' => 'No pages or chapters have been created for this book.',
+    'books_empty_create_page' => 'Create a new page',
+    'books_empty_sort_current_book' => 'Sort the current book',
+    'books_empty_add_chapter' => 'Add a chapter',
+    'books_permissions_active' => 'Book Permissions Active',
+    'books_search_this' => 'Search this book',
+    'books_navigation' => 'Book Navigation',
+    'books_sort' => 'Sort Book Contents',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_named' => 'Sort Book :bookName',
+    'books_sort_name' => 'Sort by Name',
+    'books_sort_created' => 'Sort by Created Date',
+    'books_sort_updated' => 'Sort by Updated Date',
+    'books_sort_chapters_first' => 'Chapters First',
+    'books_sort_chapters_last' => 'Chapters Last',
+    'books_sort_show_other' => 'Show Other Books',
+    'books_sort_save' => 'Save New Order',
+    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_move_up' => 'Move Up',
+    'books_sort_move_down' => 'Move Down',
+    'books_sort_move_prev_book' => 'Move to Previous Book',
+    'books_sort_move_next_book' => 'Move to Next Book',
+    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
+    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
+    'books_sort_move_book_start' => 'Move to Start of Book',
+    'books_sort_move_book_end' => 'Move to End of Book',
+    'books_sort_move_before_chapter' => 'Move to Before Chapter',
+    'books_sort_move_after_chapter' => 'Move to After Chapter',
+    'books_copy' => 'Copy Book',
+    'books_copy_success' => 'Book successfully copied',
+
+    // Chapters
+    'chapter' => 'Chapter',
+    'chapters' => 'Chapters',
+    'x_chapters' => ':count Chapter|:count Chapters',
+    'chapters_popular' => 'Popular Chapters',
+    'chapters_new' => 'New Chapter',
+    'chapters_create' => 'Create New Chapter',
+    'chapters_delete' => 'Delete Chapter',
+    'chapters_delete_named' => 'Delete Chapter :chapterName',
+    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
+    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
+    'chapters_edit' => 'Edit Chapter',
+    'chapters_edit_named' => 'Edit Chapter :chapterName',
+    'chapters_save' => 'Save Chapter',
+    'chapters_move' => 'Move Chapter',
+    'chapters_move_named' => 'Move Chapter :chapterName',
+    'chapters_copy' => 'Copy Chapter',
+    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_permissions' => 'Chapter Permissions',
+    'chapters_empty' => 'No pages are currently in this chapter.',
+    'chapters_permissions_active' => 'Chapter Permissions Active',
+    'chapters_permissions_success' => 'Chapter Permissions Updated',
+    'chapters_search_this' => 'Search this chapter',
+    'chapter_sort_book' => 'Sort Book',
+
+    // Pages
+    'page' => 'Page',
+    'pages' => 'Pages',
+    'x_pages' => ':count Page|:count Pages',
+    'pages_popular' => 'Popular Pages',
+    'pages_new' => 'New Page',
+    'pages_attachments' => 'Attachments',
+    'pages_navigation' => 'Page Navigation',
+    'pages_delete' => 'Delete Page',
+    'pages_delete_named' => 'Delete Page :pageName',
+    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
+    'pages_delete_draft' => 'Delete Draft Page',
+    'pages_delete_success' => 'Page deleted',
+    'pages_delete_draft_success' => 'Draft page deleted',
+    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
+    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
+    'pages_editing_named' => 'Editing Page :pageName',
+    'pages_edit_draft_options' => 'Draft Options',
+    'pages_edit_save_draft' => 'Save Draft',
+    'pages_edit_draft' => 'Edit Page Draft',
+    'pages_editing_draft' => 'Editing Draft',
+    'pages_editing_page' => 'Editing Page',
+    'pages_edit_draft_save_at' => 'Draft saved at ',
+    'pages_edit_delete_draft' => 'Delete Draft',
+    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_discard_draft' => 'Discard Draft',
+    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
+    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
+    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
+    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_set_changelog' => 'Set Changelog',
+    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
+    'pages_edit_enter_changelog' => 'Enter Changelog',
+    'pages_editor_switch_title' => 'Switch Editor',
+    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
+    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
+    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
+    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_save' => 'Save Page',
+    'pages_title' => 'Page Title',
+    'pages_name' => 'Page Name',
+    'pages_md_editor' => 'Editor',
+    'pages_md_preview' => 'Preview',
+    'pages_md_insert_image' => 'Insert Image',
+    'pages_md_insert_link' => 'Insert Entity Link',
+    'pages_md_insert_drawing' => 'Insert Drawing',
+    'pages_md_show_preview' => 'Show preview',
+    'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
+    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_not_in_chapter' => 'Page is not in a chapter',
+    'pages_move' => 'Move Page',
+    'pages_copy' => 'Copy Page',
+    'pages_copy_desination' => 'Copy Destination',
+    'pages_copy_success' => 'Page successfully copied',
+    'pages_permissions' => 'Page Permissions',
+    'pages_permissions_success' => 'Page permissions updated',
+    'pages_revision' => 'Revision',
+    'pages_revisions' => 'Page Revisions',
+    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_named' => 'Page Revisions for :pageName',
+    'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revisions_created_by' => 'Created By',
+    'pages_revisions_date' => 'Revision Date',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_numbered' => 'Revision #:id',
+    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
+    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_changelog' => 'Changelog',
+    'pages_revisions_changes' => 'Changes',
+    'pages_revisions_current' => 'Current Version',
+    'pages_revisions_preview' => 'Preview',
+    'pages_revisions_restore' => 'Restore',
+    'pages_revisions_none' => 'This page has no revisions',
+    'pages_copy_link' => 'Copy Link',
+    'pages_edit_content_link' => 'Jump to section in editor',
+    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_pointer_label' => 'Page Section Options',
+    'pages_pointer_permalink' => 'Page Section Permalink',
+    'pages_pointer_include_tag' => 'Page Section Include Tag',
+    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
+    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_permissions_active' => 'Page Permissions Active',
+    'pages_initial_revision' => 'Initial publish',
+    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_initial_name' => 'New Page',
+    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
+    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
+    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count users have started editing this page',
+        'start_b' => ':userName has started editing this page',
+        'time_a' => 'since the page was last updated',
+        'time_b' => 'in the last :minCount minutes',
+        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+    ],
+    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
+    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_specific' => 'Specific Page',
+    'pages_is_template' => 'Page Template',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'Toggle Sidebar',
+    'page_tags' => 'Page Tags',
+    'chapter_tags' => 'Chapter Tags',
+    'book_tags' => 'Book Tags',
+    'shelf_tags' => 'Shelf Tags',
+    'tag' => 'Tag',
+    'tags' =>  'Tags',
+    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tag_name' =>  'Tag Name',
+    'tag_value' => 'Tag Value (Optional)',
+    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
+    'tags_add' => 'Add another tag',
+    'tags_remove' => 'Remove this tag',
+    'tags_usages' => 'Total tag usages',
+    'tags_assigned_pages' => 'Assigned to Pages',
+    'tags_assigned_chapters' => 'Assigned to Chapters',
+    'tags_assigned_books' => 'Assigned to Books',
+    'tags_assigned_shelves' => 'Assigned to Shelves',
+    'tags_x_unique_values' => ':count unique values',
+    'tags_all_values' => 'All values',
+    'tags_view_tags' => 'View Tags',
+    'tags_view_existing_tags' => 'View existing tags',
+    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'attachments' => 'Attachments',
+    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
+    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
+    'attachments_upload' => 'Upload File',
+    'attachments_link' => 'Attach Link',
+    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_set_link' => 'Set Link',
+    'attachments_delete' => 'Are you sure you want to delete this attachment?',
+    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_no_files' => 'No files have been uploaded',
+    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
+    'attachments_link_name' => 'Link Name',
+    'attachment_link' => 'Attachment link',
+    'attachments_link_url' => 'Link to file',
+    'attachments_link_url_hint' => 'Url of site or file',
+    'attach' => 'Attach',
+    'attachments_insert_link' => 'Add Attachment Link to Page',
+    'attachments_edit_file' => 'Edit File',
+    'attachments_edit_file_name' => 'File Name',
+    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
+    'attachments_order_updated' => 'Attachment order updated',
+    'attachments_updated_success' => 'Attachment details updated',
+    'attachments_deleted' => 'Attachment deleted',
+    'attachments_file_uploaded' => 'File successfully uploaded',
+    'attachments_file_updated' => 'File successfully updated',
+    'attachments_link_attached' => 'Link successfully attached to page',
+    'templates' => 'Templates',
+    'templates_set_as_template' => 'Page is a template',
+    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
+    'templates_replace_content' => 'Replace page content',
+    'templates_append_content' => 'Append to page content',
+    'templates_prepend_content' => 'Prepend to page content',
+
+    // Profile View
+    'profile_user_for_x' => 'User for :time',
+    'profile_created_content' => 'Created Content',
+    'profile_not_created_pages' => ':userName has not created any pages',
+    'profile_not_created_chapters' => ':userName has not created any chapters',
+    'profile_not_created_books' => ':userName has not created any books',
+    'profile_not_created_shelves' => ':userName has not created any shelves',
+
+    // Comments
+    'comment' => 'Comment',
+    'comments' => 'Comments',
+    'comment_add' => 'Add Comment',
+    'comment_placeholder' => 'Leave a comment here',
+    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_save' => 'Save Comment',
+    'comment_new' => 'New Comment',
+    'comment_created' => 'commented :createDiff',
+    'comment_updated' => 'Updated :updateDiff by :username',
+    'comment_updated_indicator' => 'Updated',
+    'comment_deleted_success' => 'Comment deleted',
+    'comment_created_success' => 'Comment added',
+    'comment_updated_success' => 'Comment updated',
+    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
+    'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+
+    // Revision
+    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
+    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
+    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+
+    // Copy view
+    'copy_consider' => 'Please consider the below when copying content.',
+    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
+    'copy_consider_owner' => 'You will become the owner of all copied content.',
+    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
+    'copy_consider_attachments' => 'Page attachments will not be copied.',
+    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+
+    // Conversions
+    'convert_to_shelf' => 'Convert to Shelf',
+    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
+    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
+    'convert_book' => 'Convert Book',
+    'convert_book_confirm' => 'Are you sure you want to convert this book?',
+    'convert_undo_warning' => 'This cannot be as easily undone.',
+    'convert_to_book' => 'Convert to Book',
+    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
+    'convert_chapter' => 'Convert Chapter',
+    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+
+    // References
+    'references' => 'References',
+    'references_none' => 'There are no tracked references to this item.',
+    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+
+    // Watch Options
+    'watch' => 'Watch',
+    'watch_title_default' => 'Default Preferences',
+    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_title_ignore' => 'Ignore',
+    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_title_new' => 'New Pages',
+    'watch_desc_new' => 'Notify when any new page is created within this item.',
+    'watch_title_updates' => 'All Page Updates',
+    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
+    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
+    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
+    'watch_change_default' => 'Change default notification preferences',
+    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_detail_new' => 'Watching for new pages',
+    'watch_detail_updates' => 'Watching new pages and updates',
+    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
+    'watch_detail_parent_chapter' => 'Watching via parent chapter',
+    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+];
diff --git a/lang/ku/errors.php b/lang/ku/errors.php
new file mode 100644
index 00000000000..9d738379648
--- /dev/null
+++ b/lang/ku/errors.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'You do not have permission to access the requested page.',
+    'permissionJson' => 'You do not have permission to perform the requested action.',
+
+    // Auth
+    'error_user_exists_different_creds' => 'A user with the email :email already exists but with different credentials.',
+    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
+    'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
+    'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
+    'email_confirmation_awaiting' => 'The email address for the account in use needs to be confirmed',
+    'ldap_fail_anonymous' => 'LDAP access failed using anonymous bind',
+    'ldap_fail_authed' => 'LDAP access failed using given dn & password details',
+    'ldap_extension_not_installed' => 'LDAP PHP extension not installed',
+    'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
+    'saml_already_logged_in' => 'Already logged in',
+    'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
+    'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'oidc_already_logged_in' => 'Already logged in',
+    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
+    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'social_no_action_defined' => 'No action defined',
+    'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
+    'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',
+    'social_account_email_in_use' => 'The email :email is already in use. If you already have an account you can connect your :socialAccount account from your profile settings.',
+    'social_account_existing' => 'This :socialAccount is already attached to your profile.',
+    'social_account_already_used_existing' => 'This :socialAccount account is already used by another user.',
+    'social_account_not_used' => 'This :socialAccount account is not linked to any users. Please attach it in your profile settings. ',
+    'social_account_register_instructions' => 'If you do not yet have an account, You can register an account using the :socialAccount option.',
+    'social_driver_not_found' => 'Social driver not found',
+    'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
+    'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
+    'login_user_not_found' => 'A user for this action could not be found.',
+
+    // System
+    'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
+    'cannot_get_image_from_url' => 'Cannot get image from :url',
+    'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
+    'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
+    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
+
+    // Drawing & Images
+    'image_upload_error' => 'An error occurred uploading the image',
+    'image_upload_type_error' => 'The image type being uploaded is invalid',
+    'image_upload_replace_type' => 'Image file replacements must be of the same type',
+    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
+    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+
+    // Attachments
+    'attachment_not_found' => 'Attachment not found',
+    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+
+    // Pages
+    'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
+    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
+
+    // Entities
+    'entity_not_found' => 'Entity not found',
+    'bookshelf_not_found' => 'Shelf not found',
+    'book_not_found' => 'Book not found',
+    'page_not_found' => 'Page not found',
+    'chapter_not_found' => 'Chapter not found',
+    'selected_book_not_found' => 'The selected book was not found',
+    'selected_book_chapter_not_found' => 'The selected Book or Chapter was not found',
+    'guests_cannot_save_drafts' => 'Guests cannot save drafts',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'You cannot delete the only admin',
+    'users_cannot_delete_guest' => 'You cannot delete the guest user',
+    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+
+    // Roles
+    'role_cannot_be_edited' => 'This role cannot be edited',
+    'role_system_cannot_be_deleted' => 'This role is a system role and cannot be deleted',
+    'role_registration_default_cannot_delete' => 'This role cannot be deleted while set as the default registration role',
+    'role_cannot_remove_only_admin' => 'This user is the only user assigned to the administrator role. Assign the administrator role to another user before attempting to remove it here.',
+
+    // Comments
+    'comment_list' => 'An error occurred while fetching the comments.',
+    'cannot_add_comment_to_draft' => 'You cannot add comments to a draft.',
+    'comment_add' => 'An error occurred while adding / updating the comment.',
+    'comment_delete' => 'An error occurred while deleting the comment.',
+    'empty_comment' => 'Cannot add an empty comment.',
+
+    // Error pages
+    '404_page_not_found' => 'Page Not Found',
+    'sorry_page_not_found' => 'Sorry, The page you were looking for could not be found.',
+    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
+    'image_not_found' => 'Image Not Found',
+    'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
+    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
+    'return_home' => 'Return to home',
+    'error_occurred' => 'An Error Occurred',
+    'app_down' => ':appName is down right now',
+    'back_soon' => 'It will be back up soon.',
+
+    // Import
+    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
+    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
+    'import_zip_failed_notification' => 'Failed to import ZIP file.',
+    'import_perms_books' => 'You are lacking the required permissions to create books.',
+    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
+    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
+    'import_perms_images' => 'You are lacking the required permissions to create images.',
+    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+
+    // API errors
+    'api_no_authorization_found' => 'No authorization token found on the request',
+    'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
+    'api_user_token_not_found' => 'No matching API token was found for the provided authorization token',
+    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
+    'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
+    'api_user_token_expired' => 'The authorization token used has expired',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+];
diff --git a/lang/ku/notifications.php b/lang/ku/notifications.php
new file mode 100644
index 00000000000..1afd23f1dc4
--- /dev/null
+++ b/lang/ku/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'New comment on page: :pageName',
+    'new_comment_intro' => 'A user has commented on a page in :appName:',
+    'new_page_subject' => 'New page: :pageName',
+    'new_page_intro' => 'A new page has been created in :appName:',
+    'updated_page_subject' => 'Updated page: :pageName',
+    'updated_page_intro' => 'A page has been updated in :appName:',
+    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+
+    'detail_page_name' => 'Page Name:',
+    'detail_page_path' => 'Page Path:',
+    'detail_commenter' => 'Commenter:',
+    'detail_comment' => 'Comment:',
+    'detail_created_by' => 'Created By:',
+    'detail_updated_by' => 'Updated By:',
+
+    'action_view_comment' => 'View Comment',
+    'action_view_page' => 'View Page',
+
+    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason_link' => 'your notification preferences',
+];
diff --git a/lang/ku/pagination.php b/lang/ku/pagination.php
new file mode 100644
index 00000000000..85bd12fc319
--- /dev/null
+++ b/lang/ku/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];
diff --git a/lang/ku/passwords.php b/lang/ku/passwords.php
new file mode 100644
index 00000000000..b408f3c2fda
--- /dev/null
+++ b/lang/ku/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'Passwords must be at least eight characters and match the confirmation.',
+    'user' => "We can't find a user with that e-mail address.",
+    'token' => 'The password reset token is invalid for this email address.',
+    'sent' => 'We have e-mailed your password reset link!',
+    'reset' => 'Your password has been reset!',
+
+];
diff --git a/lang/ku/preferences.php b/lang/ku/preferences.php
new file mode 100644
index 00000000000..2872f5f3c65
--- /dev/null
+++ b/lang/ku/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'My Account',
+
+    'shortcuts' => 'Shortcuts',
+    'shortcuts_interface' => 'UI Shortcut Preferences',
+    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
+    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
+    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
+    'shortcuts_section_navigation' => 'Navigation',
+    'shortcuts_section_actions' => 'Common Actions',
+    'shortcuts_save' => 'Save Shortcuts',
+    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
+    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
+    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+
+    'notifications' => 'Notification Preferences',
+    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
+    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
+    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
+    'notifications_save' => 'Save Preferences',
+    'notifications_update_success' => 'Notification preferences have been updated!',
+    'notifications_watched' => 'Watched & Ignored Items',
+    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+
+    'auth' => 'Access & Security',
+    'auth_change_password' => 'Change Password',
+    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
+    'auth_change_password_success' => 'Password has been updated!',
+
+    'profile' => 'Profile Details',
+    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_view_public' => 'View Public Profile',
+    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
+    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
+    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
+    'profile_admin_options' => 'Administrator Options',
+    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+
+    'delete_account' => 'Delete Account',
+    'delete_my_account' => 'Delete My Account',
+    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
+    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+];
diff --git a/lang/ku/settings.php b/lang/ku/settings.php
new file mode 100644
index 00000000000..82a4ade5df5
--- /dev/null
+++ b/lang/ku/settings.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'Settings',
+    'settings_save' => 'Save Settings',
+    'system_version' => 'System Version',
+    'categories' => 'Categories',
+
+    // App Settings
+    'app_customization' => 'Customization',
+    'app_features_security' => 'Features & Security',
+    'app_name' => 'Application Name',
+    'app_name_desc' => 'This name is shown in the header and in any system-sent emails.',
+    'app_name_header' => 'Show name in header',
+    'app_public_access' => 'Public Access',
+    'app_public_access_desc' => 'Enabling this option will allow visitors, that are not logged-in, to access content in your BookStack instance.',
+    'app_public_access_desc_guest' => 'Access for public visitors can be controlled through the "Guest" user.',
+    'app_public_access_toggle' => 'Allow public access',
+    'app_public_viewing' => 'Allow public viewing?',
+    'app_secure_images' => 'Higher Security Image Uploads',
+    'app_secure_images_toggle' => 'Enable higher security image uploads',
+    'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.',
+    'app_default_editor' => 'Default Page Editor',
+    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_custom_html' => 'Custom HTML Head Content',
+    'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
+    'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
+    'app_logo' => 'Application Logo',
+    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
+    'app_icon' => 'Application Icon',
+    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_homepage' => 'Application Homepage',
+    'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
+    'app_homepage_select' => 'Select a page',
+    'app_footer_links' => 'Footer Links',
+    'app_footer_links_desc' => 'Add links to show within the site footer. These will be displayed at the bottom of most pages, including those that do not require login. You can use a label of "trans::<key>" to use system-defined translations. For example: Using "trans::common.privacy_policy" will provide the translated text "Privacy Policy" and "trans::common.terms_of_service" will provide the translated text "Terms of Service".',
+    'app_footer_links_label' => 'Link Label',
+    'app_footer_links_url' => 'Link URL',
+    'app_footer_links_add' => 'Add Footer Link',
+    'app_disable_comments' => 'Disable Comments',
+    'app_disable_comments_toggle' => 'Disable comments',
+    'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
+
+    // Color settings
+    'color_scheme' => 'Application Color Scheme',
+    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
+    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'app_color' => 'Primary Color',
+    'link_color' => 'Default Link Color',
+    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'bookshelf_color' => 'Shelf Color',
+    'book_color' => 'Book Color',
+    'chapter_color' => 'Chapter Color',
+    'page_color' => 'Page Color',
+    'page_draft_color' => 'Page Draft Color',
+
+    // Registration Settings
+    'reg_settings' => 'Registration',
+    'reg_enable' => 'Enable Registration',
+    'reg_enable_toggle' => 'Enable registration',
+    'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.',
+    'reg_default_role' => 'Default user role after registration',
+    'reg_enable_external_warning' => 'The option above is ignored while external LDAP or SAML authentication is active. User accounts for non-existing members will be auto-created if authentication, against the external system in use, is successful.',
+    'reg_email_confirmation' => 'Email Confirmation',
+    'reg_email_confirmation_toggle' => 'Require email confirmation',
+    'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.',
+    'reg_confirm_restrict_domain' => 'Domain Restriction',
+    'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
+    'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
+
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
+    // Maintenance settings
+    'maint' => 'Maintenance',
+    'maint_image_cleanup' => 'Cleanup Images',
+    'maint_image_cleanup_desc' => 'Scans page & revision content to check which images and drawings are currently in use and which images are redundant. Ensure you create a full database and image backup before running this.',
+    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_image_cleanup_run' => 'Run Cleanup',
+    'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
+    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
+    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
+    'maint_send_test_email' => 'Send a Test Email',
+    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
+    'maint_send_test_email_run' => 'Send test email',
+    'maint_send_test_email_success' => 'Email sent to :address',
+    'maint_send_test_email_mail_subject' => 'Test Email',
+    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
+    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
+    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
+    'maint_recycle_bin_open' => 'Open Recycle Bin',
+    'maint_regen_references' => 'Regenerate References',
+    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
+    'maint_regen_references_success' => 'Reference index has been regenerated!',
+    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+
+    // Recycle Bin
+    'recycle_bin' => 'Recycle Bin',
+    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'recycle_bin_deleted_item' => 'Deleted Item',
+    'recycle_bin_deleted_parent' => 'Parent',
+    'recycle_bin_deleted_by' => 'Deleted By',
+    'recycle_bin_deleted_at' => 'Deletion Time',
+    'recycle_bin_permanently_delete' => 'Permanently Delete',
+    'recycle_bin_restore' => 'Restore',
+    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
+    'recycle_bin_empty' => 'Empty Recycle Bin',
+    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
+    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_list' => 'Items to be Destroyed',
+    'recycle_bin_restore_list' => 'Items to be Restored',
+    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
+    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
+    'recycle_bin_restore_parent' => 'Restore Parent',
+    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
+    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+
+    // Audit Log
+    'audit' => 'Audit Log',
+    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
+    'audit_event_filter' => 'Event Filter',
+    'audit_event_filter_no_filter' => 'No Filter',
+    'audit_deleted_item' => 'Deleted Item',
+    'audit_deleted_item_name' => 'Name: :name',
+    'audit_table_user' => 'User',
+    'audit_table_event' => 'Event',
+    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_ip' => 'IP Address',
+    'audit_table_date' => 'Activity Date',
+    'audit_date_from' => 'Date Range From',
+    'audit_date_to' => 'Date Range To',
+
+    // Role Settings
+    'roles' => 'Roles',
+    'role_user_roles' => 'User Roles',
+    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
+    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_permissions_provided' => ':count permission|:count permissions',
+    'roles_assigned_users' => 'Assigned Users',
+    'roles_permissions_provided' => 'Provided Permissions',
+    'role_create' => 'Create New Role',
+    'role_delete' => 'Delete Role',
+    'role_delete_confirm' => 'This will delete the role with the name \':roleName\'.',
+    'role_delete_users_assigned' => 'This role has :userCount users assigned to it. If you would like to migrate the users from this role select a new role below.',
+    'role_delete_no_migration' => "Don't migrate users",
+    'role_delete_sure' => 'Are you sure you want to delete this role?',
+    'role_edit' => 'Edit Role',
+    'role_details' => 'Role Details',
+    'role_name' => 'Role Name',
+    'role_desc' => 'Short Description of Role',
+    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_external_auth_id' => 'External Authentication IDs',
+    'role_system' => 'System Permissions',
+    'role_manage_users' => 'Manage users',
+    'role_manage_roles' => 'Manage roles & role permissions',
+    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
+    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
+    'role_manage_page_templates' => 'Manage page templates',
+    'role_access_api' => 'Access system API',
+    'role_manage_settings' => 'Manage app settings',
+    'role_export_content' => 'Export content',
+    'role_import_content' => 'Import content',
+    'role_editor_change' => 'Change page editor',
+    'role_notifications' => 'Receive & manage notifications',
+    'role_asset' => 'Asset Permissions',
+    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
+    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
+    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
+    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_all' => 'All',
+    'role_own' => 'Own',
+    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_save' => 'Save Role',
+    'role_users' => 'Users in this role',
+    'role_users_none' => 'No users are currently assigned to this role',
+
+    // Users
+    'users' => 'Users',
+    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'user_profile' => 'User Profile',
+    'users_add_new' => 'Add New User',
+    'users_search' => 'Search Users',
+    'users_latest_activity' => 'Latest Activity',
+    'users_details' => 'User Details',
+    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
+    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
+    'users_role' => 'User Roles',
+    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
+    'users_password' => 'User Password',
+    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
+    'users_send_invite_option' => 'Send user invite email',
+    'users_external_auth_id' => 'External Authentication ID',
+    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
+    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_delete' => 'Delete User',
+    'users_delete_named' => 'Delete user :userName',
+    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
+    'users_delete_confirm' => 'Are you sure you want to delete this user?',
+    'users_migrate_ownership' => 'Migrate Ownership',
+    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_none_selected' => 'No user selected',
+    'users_edit' => 'Edit User',
+    'users_edit_profile' => 'Edit Profile',
+    'users_avatar' => 'User Avatar',
+    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
+    'users_preferred_language' => 'Preferred Language',
+    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
+    'users_social_accounts' => 'Social Accounts',
+    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
+    'users_social_connect' => 'Connect Account',
+    'users_social_disconnect' => 'Disconnect Account',
+    'users_social_status_connected' => 'Connected',
+    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
+    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
+    'users_api_tokens' => 'API Tokens',
+    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_none' => 'No API tokens have been created for this user',
+    'users_api_tokens_create' => 'Create Token',
+    'users_api_tokens_expires' => 'Expires',
+    'users_api_tokens_docs' => 'API Documentation',
+    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
+    'users_mfa_x_methods' => ':count method configured|:count methods configured',
+    'users_mfa_configure' => 'Configure Methods',
+
+    // API Tokens
+    'user_api_token_create' => 'Create API Token',
+    'user_api_token_name' => 'Name',
+    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
+    'user_api_token_expiry' => 'Expiry Date',
+    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
+    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
+    'user_api_token' => 'API Token',
+    'user_api_token_id' => 'Token ID',
+    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
+    'user_api_token_secret' => 'Token Secret',
+    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
+    'user_api_token_created' => 'Token created :timeAgo',
+    'user_api_token_updated' => 'Token updated :timeAgo',
+    'user_api_token_delete' => 'Delete Token',
+    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
+    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
+    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_create' => 'Create New Webhook',
+    'webhooks_none_created' => 'No webhooks have yet been created.',
+    'webhooks_edit' => 'Edit Webhook',
+    'webhooks_save' => 'Save Webhook',
+    'webhooks_details' => 'Webhook Details',
+    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
+    'webhooks_events' => 'Webhook Events',
+    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
+    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
+    'webhooks_events_all' => 'All system events',
+    'webhooks_name' => 'Webhook Name',
+    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
+    'webhooks_endpoint' => 'Webhook Endpoint',
+    'webhooks_active' => 'Webhook Active',
+    'webhook_events_table_header' => 'Events',
+    'webhooks_delete' => 'Delete Webhook',
+    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
+    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
+    'webhooks_format_example' => 'Webhook Format Example',
+    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_status' => 'Webhook Status',
+    'webhooks_last_called' => 'Last Called:',
+    'webhooks_last_errored' => 'Last Errored:',
+    'webhooks_last_error_message' => 'Last Error Message:',
+
+    // Licensing
+    'licenses' => 'Licenses',
+    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_bookstack' => 'BookStack License',
+    'licenses_php' => 'PHP Library Licenses',
+    'licenses_js' => 'JavaScript Library Licenses',
+    'licenses_other' => 'Other Licenses',
+    'license_details' => 'License Details',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/ku/validation.php b/lang/ku/validation.php
new file mode 100644
index 00000000000..d9b982d1e23
--- /dev/null
+++ b/lang/ku/validation.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values',
+    'file'                 => 'The :attribute must be provided as a valid file.',
+    'filled'               => 'The :attribute field is required.',
+    'gt'                   => [
+        'numeric' => 'The :attribute must be greater than :value.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
+    ],
+    'gte'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
+    ],
+    'exists'               => 'The selected :attribute is invalid.',
+    'image'                => 'The :attribute must be an image.',
+    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
+    ],
+    'lte'                  => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
+    ],
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'safe_url'             => 'The provided link may not be safe.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'totp'                 => 'The provided code is not valid or has expired.',
+    'unique'               => 'The :attribute has already been taken.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+
+    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
+    'zip_model_expected' => 'Data object expected but ":type" found.',
+    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'Password confirmation required',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/lt/activities.php b/lang/lt/activities.php
index 2c4165195ec..a808171bb6d 100644
--- a/lang/lt/activities.php
+++ b/lang/lt/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'atnaujinti leidimai',
 ];
diff --git a/lang/lt/editor.php b/lang/lt/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/lt/editor.php
+++ b/lang/lt/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 91d4cedc435..1687195c5f0 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Ieškoti šioje knygoje',
     'books_navigation' => 'Knygos naršymas',
     'books_sort' => 'Rūšiuoti pagal knygos turinį',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Rūšiuoti knygą :bookName',
     'books_sort_name' => 'Rūšiuoti pagal vardą',
     'books_sort_created' => 'Rūšiuoti pagal sukūrimo datą',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index ddd2a702299..e3bd927dc91 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Įveskite kableliais atskirtą elektroninio pašto domenų, kurių registravimą norite apriboti, sąrašą. Vartotojai išsiųs elektorinį laišką, kad patvirtintumėte jų adresą prieš leidžiant naudotis programa. <br> Prisiminkite, kad vartotojai galės pakeisti savo elektroninius paštus po sėkmingos registracijos.',
     'reg_confirm_restrict_domain_placeholder' => 'Nėra jokių apribojimų',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Priežiūra',
     'maint_image_cleanup' => 'Išvalykite vaizdus',
diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index 2f9b49f8e75..3f6e38c13a5 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'atjaunoja komentārju',
     'comment_delete'              => 'dzēsa komentāru',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'atjaunoja atļaujas',
 ];
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index 1bdf4476dfc..05863fd30af 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Atcelt',
     'save' => 'Saglabāt',
     'close' => 'Aizvērt',
+    'apply' => 'Apply',
     'undo' => 'Atsaukt',
     'redo' => 'Atcelt atsaukšanu',
     'left' => 'Pa kreisi',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Attēlojamais teksts',
     'title' => 'Nosaukums',
+    'browse_links' => 'Browse links',
     'open_link' => 'Atvērt saiti',
     'open_link_in' => 'Atvērt saiti...',
     'open_link_current' => 'Šis logs',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index f5d9a2eeb54..e9aad99e581 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Meklēt šajā grāmatā',
     'books_navigation' => 'Grāmatas navigācija',
     'books_sort' => 'Kārtot grāmatas saturu',
-    'books_sort_desc' => 'Pārvietojiet nodaļas un lapas grāmatas ietvaros, lai organizētu tās saturu. Var pievienot vēl citas grāmatas, lai vieglāk pārcelt nodaļas un lapas starp grāmatām.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Kārtot grāmatu :bookName',
     'books_sort_name' => 'Kārtot pēc nosaukuma',
     'books_sort_created' => 'Kārtot pēc izveidošanas datuma',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index 3fca3050aad..fa0e21acc3b 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Ievadiet ar komatiem atdalītu sarakstu ar epasta domēniem, kam jūs gribētu atļaut reģistrāciju. Lietotājiem tiks nosūtīts epasts, lai apstiprinātu tā adresi pirms tiks ļauts darboties ar aplikāciju. <br> Ņemiet vērā, ka lietotāji varēs nomainīt savu epasta adresi pēc veiksmīgas reģistrācijas.',
     'reg_confirm_restrict_domain_placeholder' => 'Nav ierobežojumu',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Apkope',
     'maint_image_cleanup' => 'Tīrīt neizmantotās bildes',
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index 3f8ee88df7c..4d184633ff4 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -128,6 +128,14 @@
     'comment_update'              => 'oppdatert kommentar',
     'comment_delete'              => 'slettet kommentar',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'oppdaterte tilganger',
 ];
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index e128717cdcd..6b1c5eb78ed 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Avbryt',
     'save' => 'Lagre',
     'close' => 'Lukk',
+    'apply' => 'Apply',
     'undo' => 'Angre',
     'redo' => 'Gjør om',
     'left' => 'Venstre',
@@ -147,6 +148,7 @@
     'url' => 'Nettlenke',
     'text_to_display' => 'Synlig tekst',
     'title' => 'Tittel',
+    'browse_links' => 'Browse links',
     'open_link' => 'Åpne lenke',
     'open_link_in' => 'Åpne i ...',
     'open_link_current' => 'Samme vindu',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 0d2491eafdc..36f85791f70 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Søk i boken',
     'books_navigation' => 'Boknavigasjon',
     'books_sort' => 'Sorter bokinnhold',
-    'books_sort_desc' => 'Flytt kapitler og sider inni en bok for å omorganisere dem. Andre bøker kan bli lagt til slik at det er enklere å flytte frem og tilbake mellom dem.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Omorganisér :bookName (bok)',
     'books_sort_name' => 'Sorter på navn',
     'books_sort_created' => 'Sorter på opprettet dato',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index a39f6ae1bbe..182d23c3aa3 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Skriv inn en kommaseparert liste over e-postdomener du vil begrense registreringen til. Brukerne vil bli sendt en e-post for å bekrefte adressen deres før de får lov til å kommunisere med applikasjonen. <br> Vær oppmerksom på at brukere vil kunne endre e-postadressene sine etter vellykket registrering.',
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begrensninger er satt',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Vedlikehold',
     'maint_image_cleanup' => 'Bildeopprydding',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 88563ba873e..3d548e2a7c7 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'paste opmerking aan',
     'comment_delete'              => 'verwijderde opmerking',
 
+    // Sort Rules
+    'sort_rule_create' => 'maakte soorteerregel',
+    'sort_rule_create_notification' => 'Sorteerregel succesvol aangemaakt',
+    'sort_rule_update' => 'wijzigde sorteerregel',
+    'sort_rule_update_notification' => 'Sorteerregel succesvol bijgewerkt',
+    'sort_rule_delete' => 'verwijderde sorteerregel',
+    'sort_rule_delete_notification' => 'Sorteerregel succesvol verwijderd',
+
     // Other
     'permissions_update'          => 'wijzigde machtigingen',
 ];
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 843b02b0fb7..ca713a24323 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -62,7 +62,7 @@
     'sort_name' => 'Naam',
     'sort_default' => 'Standaard',
     'sort_created_at' => 'Aanmaakdatum',
-    'sort_updated_at' => 'Gewijzigd op',
+    'sort_updated_at' => 'Bijwerkdatum',
 
     // Misc
     'deleted_user' => 'Verwijderde gebruiker',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index fa813ec16b4..e3d6df6bc33 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Annuleer',
     'save' => 'Opslaan',
     'close' => 'Sluit',
+    'apply' => 'Toepassen',
     'undo' => 'Maak ongedaan',
     'redo' => 'Opnieuw uitvoeren',
     'left' => 'Links',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Weer te geven tekst',
     'title' => 'Titel',
+    'browse_links' => 'Blader links',
     'open_link' => 'Open koppeling',
     'open_link_in' => 'Open koppeling in...',
     'open_link_current' => 'Huidig venster',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 878adb1e1c2..198123018c0 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Zoeken in dit boek',
     'books_navigation' => 'Boek navigatie',
     'books_sort' => 'Inhoud van het boek sorteren',
-    'books_sort_desc' => 'Verplaats hoofdstukken en pagina\'s binnen een boek om de inhoud te reorganiseren. Andere boeken kunnen worden toegevoegd, waardoor het eenvoudig wordt om hoofdstukken en pagina\'s tussen boeken te verplaatsen.',
+    'books_sort_desc' => 'Verplaats hoofdstukken en pagina\'s door het boek om ze te organiseren. Andere boeken kunnen worden toegevoegd zodat hoofdstukken en pagina\'s gemakkelijk tussen boeken kunnen worden verplaatst. Het is mogelijk om een automatische sorteerregel in te stellen die de inhoud zal sorteren bij wijzigingen.',
+    'books_sort_auto_sort' => 'Automatisch Sorteren',
+    'books_sort_auto_sort_active' => 'Automatisch Sorteren Actief: :sortName',
     'books_sort_named' => 'Sorteer boek :bookName',
     'books_sort_name' => 'Sorteren op naam',
     'books_sort_created' => 'Sorteren op datum van aanmaken',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 5cdd45a7e71..79b277b60b4 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Geef een door komma-gescheiden lijst van domeinnamen op die gebruikt mogen worden bij registratie. Gebruikers dienen de ontvangen e-mail te bevestigen voordat ze toegang krijgen tot de applicatie. <br>Let op: Gebruikers kunnen na registratie hun e-mailadres nog steeds wijzigen.',
     'reg_confirm_restrict_domain_placeholder' => 'Geen beperkingen ingesteld',
 
+    // Sorting Settings
+    'sorting' => 'Sorteren',
+    'sorting_book_default' => 'Standaard Sorteerregel Boek',
+    'sorting_book_default_desc' => 'Selecteer de standaard sorteerregel om toe te passen op nieuwe boeken. Dit heeft geen invloed op bestaande boeken, en kan per boek worden overschreven.',
+    'sorting_rules' => 'Sorteerregels',
+    'sorting_rules_desc' => 'Dit zijn vooraf ingestelde sorteeroperaties die kunnen worden toegepast op inhoud in het systeem.',
+    'sort_rule_assigned_to_x_books' => 'Toegepast op :count Boek|Toegepast op :count Boeken',
+    'sort_rule_create' => 'Maakte Sorteerregel',
+    'sort_rule_edit' => 'Bewerk Sorteerregel',
+    'sort_rule_delete' => 'Verwijder Sorteerregel',
+    'sort_rule_delete_desc' => 'Verwijder deze sorteerregel uit het systeem. Boeken die deze regel gebruiken zullen terugvallen op handmatige sortering.',
+    'sort_rule_delete_warn_books' => 'Deze sorteerregel wordt momenteel gebruikt door :count boek(en). Weet je zeker dat je deze wilt verwijderen?',
+    'sort_rule_delete_warn_default' => 'Deze sorteerregel wordt gebruikt als standaardregel voor boeken. Weet je zeker dat je deze wilt verwijderen?',
+    'sort_rule_details' => 'Details Sorteerregel',
+    'sort_rule_details_desc' => 'Stel een naam in voor deze sorteerregel. Deze wordt weergegeven waar gebruikers een regel kunnen selecteren.',
+    'sort_rule_operations' => 'Sorteeroperaties',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Beschikbare Operaties',
+    'sort_rule_available_operations_empty' => 'Geen operaties over',
+    'sort_rule_configured_operations' => 'Ingestelde Operaties',
+    'sort_rule_configured_operations_empty' => 'Voeg operaties toe uit de "Beschikbare Operaties" lijst',
+    'sort_rule_op_asc' => '(Oplopend)',
+    'sort_rule_op_desc' => '(Aflopend)',
+    'sort_rule_op_name' => 'Naam - Alfabetisch',
+    'sort_rule_op_name_numeric' => 'Naam - Numeriek',
+    'sort_rule_op_created_date' => 'Aanmaakdatum',
+    'sort_rule_op_updated_date' => 'Bijwerkdatum',
+    'sort_rule_op_chapters_first' => 'Hoofdstukken Eerst',
+    'sort_rule_op_chapters_last' => 'Hoofdstukken Laatst',
+
     // Maintenance settings
     'maint' => 'Onderhoud',
     'maint_image_cleanup' => 'Afbeeldingen opschonen',
diff --git a/lang/nn/activities.php b/lang/nn/activities.php
index a522d10e7fe..f87aadc6677 100644
--- a/lang/nn/activities.php
+++ b/lang/nn/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'oppdatert kommentar',
     'comment_delete'              => 'sletta kommentar',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'oppdaterte tilgangar',
 ];
diff --git a/lang/nn/editor.php b/lang/nn/editor.php
index 6ac0a92af09..74b31748a19 100644
--- a/lang/nn/editor.php
+++ b/lang/nn/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Avbryt',
     'save' => 'Lagre',
     'close' => 'Lukk',
+    'apply' => 'Apply',
     'undo' => 'Angre',
     'redo' => 'Gjer om',
     'left' => 'Venstre',
@@ -147,6 +148,7 @@
     'url' => 'Nettlenke',
     'text_to_display' => 'Synlig tekst',
     'title' => 'Tittel',
+    'browse_links' => 'Browse links',
     'open_link' => 'Åpne lenke',
     'open_link_in' => 'Åpne i ...',
     'open_link_current' => 'Samme vindu',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index b2ae3526917..2689e1b0d33 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Søk i boka',
     'books_navigation' => 'Boknavigasjon',
     'books_sort' => 'Sorter bokinnhald',
-    'books_sort_desc' => 'Flytt kapittel og sider i ei bok for å omorganisere dei. Andre bøker kan bli lagt til slik at det er enklere å flytte fram og tilbake mellom dei.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Omorganiser :bookName',
     'books_sort_name' => 'Sorter på namn',
     'books_sort_created' => 'Sorter på oppretta dato',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index ed9cd937a8f..f71ffb20413 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Skriv inn en kommaseparert liste over e-postdomener du vil begrense registreringen til. Brukerne vil bli sendt en e-post for å bekrefte adressen deres før de får lov til å kommunisere med applikasjonen. <br> Vær oppmerksom på at brukere vil kunne endre e-postadressene sine etter vellykket registrering.',
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begrensninger er satt',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Vedlikehold',
     'maint_image_cleanup' => 'Rydd opp bilete',
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index 4e209c99cf1..60c109eda42 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'zaktualizował komentarz',
     'comment_delete'              => 'usunął komentarz',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'zaktualizował uprawnienia',
 ];
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index ac7d57a5d61..7ba9220cf56 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Anuluj',
     'save' => 'Zapisz',
     'close' => 'Zamknij',
+    'apply' => 'Apply',
     'undo' => 'Cofnij',
     'redo' => 'Ponów',
     'left' => 'Lewa strona',
@@ -147,6 +148,7 @@
     'url' => 'Adres URL',
     'text_to_display' => 'Tekst do wyświetlenia',
     'title' => 'Tytuł',
+    'browse_links' => 'Browse links',
     'open_link' => 'Otwórz link',
     'open_link_in' => 'Otwórz link w...',
     'open_link_current' => 'Bieżące okno',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 537b15d38c3..87a74ca2103 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Wyszukaj w tej książce',
     'books_navigation' => 'Nawigacja po książce',
     'books_sort' => 'Sortuj zawartość książki',
-    'books_sort_desc' => 'Przenieś rozdziały i strony w książce w celu reorganizacji jej treści. Można dodać inne książki, co umożliwia łatwe przenoszenie rozdziałów i stron między książkami.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sortuj książkę :bookName',
     'books_sort_name' => 'Sortuj według nazwy',
     'books_sort_created' => 'Sortuj według daty utworzenia',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 811398ec463..b1f0c1582ff 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Wprowadź listę domen adresów e-mail, rozdzieloną przecinkami, którym chciałbyś zezwolić na rejestrację. Wymusi to konieczność potwierdzenia adresu e-mail przez użytkownika przed uzyskaniem dostępu do aplikacji. <br> Pamiętaj, że użytkownicy będą mogli zmienić adres e-mail po rejestracji.',
     'reg_confirm_restrict_domain_placeholder' => 'Brak restrykcji',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Konserwacja',
     'maint_image_cleanup' => 'Czyszczenie obrazków',
diff --git a/lang/pt/activities.php b/lang/pt/activities.php
index 96d950554b5..9e458bffcf7 100644
--- a/lang/pt/activities.php
+++ b/lang/pt/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'comentário atualizado',
     'comment_delete'              => 'comentário eliminado',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'permissões atualizadas',
 ];
diff --git a/lang/pt/editor.php b/lang/pt/editor.php
index b25b319f0b6..222163102b9 100644
--- a/lang/pt/editor.php
+++ b/lang/pt/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Guardar',
     'close' => 'Fechar',
+    'apply' => 'Apply',
     'undo' => 'Anular',
     'redo' => 'Refazer',
     'left' => 'Esquerda',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto a ser exibido',
     'title' => 'Título',
+    'browse_links' => 'Browse links',
     'open_link' => 'Abrir ligação',
     'open_link_in' => 'Abrir ligação em...',
     'open_link_current' => 'Janela atual',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index 93d1a38cfab..b9e52c1af0e 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Pesquisar neste livro',
     'books_navigation' => 'Navegação do Livro',
     'books_sort' => 'Ordenar Conteúdos do Livro',
-    'books_sort_desc' => 'Mova capítulos e páginas de um livro para reorganizar o seu conteúdo. É possível acrescentar outros livros, o que permite uma movimentação fácil de capítulos e páginas entre livros.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Ordenar Livro :bookName',
     'books_sort_name' => 'Ordenar por Nome',
     'books_sort_created' => 'Ordenar por Data de Criação',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index 935fd30ce93..b321d2eda1c 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Entre com uma lista separada por vírgulas de domínios de e-mails aos quais você deseja restringir o registo. Um e-mail de confirmação será enviado para o utilizador validar o seu respetivo endereço de e-mail antes de ser permitida a interação com a aplicação. <br> Note que os utilizadores serão capazes de alterar os seus endereços de e-mail após o sucesso na confirmação do registo.',
     'reg_confirm_restrict_domain_placeholder' => 'Nenhuma restrição definida',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Manutenção',
     'maint_image_cleanup' => 'Limpeza de Imagens',
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 536005d8f5b..7b766d41afc 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -31,7 +31,7 @@
     'book_create'                 => 'criou o livro',
     'book_create_notification'    => 'Livro criado com sucesso',
     'book_create_from_chapter'              => 'capítulo convertido em livro',
-    'book_create_from_chapter_notification' => 'Capítulo convertido com sucesso em um livro',
+    'book_create_from_chapter_notification' => 'Capítulo convertido em livro com sucesso',
     'book_update'                 => 'atualizou o livro',
     'book_update_notification'    => 'Livro atualizado com sucesso',
     'book_delete'                 => 'excluiu o livro',
@@ -41,7 +41,7 @@
 
     // Bookshelves
     'bookshelf_create'            => 'estante criada',
-    'bookshelf_create_notification'    => 'Prateleira criada com sucesso',
+    'bookshelf_create_notification'    => 'Estante criada com sucesso',
     'bookshelf_create_from_book'    => 'livro convertido em estante',
     'bookshelf_create_from_book_notification'    => 'Livro convertido com sucesso em uma estante',
     'bookshelf_update'                 => 'estante atualizada',
@@ -109,9 +109,9 @@
     'api_token_delete_notification' => 'Token de API excluído com sucesso',
 
     // Roles
-    'role_create' => 'função criada',
+    'role_create' => 'perfil criado',
     'role_create_notification' => 'Perfil criado com sucesso',
-    'role_update' => 'função atualizada',
+    'role_update' => 'perfil atualizado',
     'role_update_notification' => 'Perfil atualizado com sucesso',
     'role_delete' => 'Excluir papel',
     'role_delete_notification' => 'Perfil excluído com sucesso',
@@ -127,6 +127,14 @@
     'comment_update'              => 'Atualizar descrição',
     'comment_delete'              => 'Comentário deletado',
 
+    // Sort Rules
+    'sort_rule_create' => 'regra de classificação criada',
+    'sort_rule_create_notification' => 'Regra de classificação criada com sucesso',
+    'sort_rule_update' => 'regra de classificação atualizada',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'regra de classificação excluída',
+    'sort_rule_delete_notification' => 'Regra de classificação excluída com sucesso',
+
     // Other
     'permissions_update'          => 'atualizou permissões',
 ];
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 10ac376517b..4a07cfb5b2b 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -21,7 +21,7 @@
 ',
     'description' => 'Descrição
 ',
-    'role' => 'Função',
+    'role' => 'Perfil',
     'cover_image' => 'Imagem da capa',
     'cover_image_description' => 'Esta imagem deve ter cerca de 440x250px, embora seja dimensionada e cortada de forma flexível para se ajustar à "interface" do usuário em diferentes cenários, conforme necessário, portanto, as dimensões reais para exibição serão diferentes.',
 
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index f470647e3aa..0ff86bf0f9b 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Salvar',
     'close' => 'Fechar',
+    'apply' => 'Apply',
     'undo' => 'Desfazer',
     'redo' => 'Refazer',
     'left' => 'Esquerda',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto de exibição',
     'title' => 'Título',
+    'browse_links' => 'Browse links',
     'open_link' => 'Link aberto',
     'open_link_in' => 'Abrir link em...',
     'open_link_current' => 'Janelas atuais',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index f947b304087..9ff98a27ade 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -11,7 +11,7 @@
     'recently_updated_pages' => 'Páginas Recentemente Atualizadas',
     'recently_created_chapters' => 'Capítulos Recentemente Criados',
     'recently_created_books' => 'Livros Recentemente Criados',
-    'recently_created_shelves' => 'Prateleiras Criadas Recentemente',
+    'recently_created_shelves' => 'Estantes Criadas Recentemente',
     'recently_update' => 'Recentemente Atualizado',
     'recently_viewed' => 'Recentemente Visualizado',
     'recent_activity' => 'Atividades recentes',
@@ -66,14 +66,14 @@
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
-    'permissions_desc' => 'Defina permissões aqui para substituir as permissões padrão fornecidas pelas funções do usuário.',
+    'permissions_desc' => 'Defina permissões aqui para substituir as permissões padrão fornecidas pelo perfil do usuário.',
     'permissions_book_cascade' => 'As permissões definidas nos livros serão automaticamente transmitidas aos capítulos e páginas secundários, a menos que eles tenham suas próprias permissões definidas.',
     'permissions_chapter_cascade' => 'As permissões definidas nos capítulos serão automaticamente transmitidas às páginas secundárias, a menos que elas tenham suas próprias permissões definidas.',
     'permissions_save' => 'Salvar permissões',
     'permissions_owner' => 'Dono',
     'permissions_role_everyone_else' => 'Todos os Outros',
-    'permissions_role_everyone_else_desc' => 'Defina permissões para todas as funções não substituídas especificamente.',
-    'permissions_role_override' => 'Substituir permissões para o papel',
+    'permissions_role_everyone_else_desc' => 'Defina permissões para todos os perfis não substituídas especificamente.',
+    'permissions_role_override' => 'Substituir permissões para o perfil',
     'permissions_inherit_defaults' => 'Herdar Padrões',
 
     // Search
@@ -108,7 +108,7 @@
     'shelves' => 'Estantes',
     'x_shelves' => ':count Estante|:count Estantes',
     'shelves_empty' => 'Nenhuma estante foi criada',
-    'shelves_create' => 'Criar Prateleira',
+    'shelves_create' => 'Criar Estante',
     'shelves_popular' => 'Estantes Populares',
     'shelves_new' => 'Novas Estantes',
     'shelves_new_action' => 'Nova Estante',
@@ -129,12 +129,12 @@
     'shelves_permissions' => 'Permissões da Estante',
     'shelves_permissions_updated' => 'Permissões da estante atualizadas',
     'shelves_permissions_active' => 'Permissões da estante ativada',
-    'shelves_permissions_cascade_warning' => 'As permissões nas prateleiras não são automaticamente em cascata para os livros contidos. Isso ocorre porque um livro pode existir em várias prateleiras. No entanto, as permissões podem ser copiadas para livros filhos usando a opção encontrada abaixo.',
-    'shelves_permissions_create' => 'As permissões de criação de prateleira são usadas apenas para copiar livros filhos usando a ação abaixo. Eles não controlam a capacidade de criar livros.',
+    'shelves_permissions_cascade_warning' => 'As permissões nas estantes não são automaticamente em cascata para os livros contidos. Isso ocorre porque um livro pode existir em várias estantes. No entanto, as permissões podem ser copiadas para livros filhos usando a opção encontrada abaixo.',
+    'shelves_permissions_create' => 'As permissões de criação de estante são usadas apenas para copiar livros filhos usando a ação abaixo. Eles não controlam a capacidade de criar livros.',
     'shelves_copy_permissions_to_books' => 'Copiar Permissões para Livros',
     'shelves_copy_permissions' => 'Copiar permissões',
-    'shelves_copy_permissions_explain' => 'Isso aplicará as configurações de permissão atuais desta estante a todos os livros contidos nela. Antes de ativar, verifique se todas as alterações nas permissões desta prateleira foram salvas.',
-    'shelves_copy_permission_success' => 'Permissões de prateleira copiadas para :count books',
+    'shelves_copy_permissions_explain' => 'Isso aplicará as configurações de permissão atuais desta estante a todos os livros contidos nela. Antes de ativar, verifique se todas as alterações nas permissões desta estante foram salvas.',
+    'shelves_copy_permission_success' => 'Permissões da estante copiadas para :count books',
 
     // Books
     'book' => 'Livro',
@@ -166,7 +166,9 @@
     'books_search_this' => 'Pesquisar neste livro',
     'books_navigation' => 'Navegação do Livro',
     'books_sort' => 'Ordenar Conteúdos do Livro',
-    'books_sort_desc' => 'Mova capítulos e páginas de um livro para reorganizar seu conteúdo. É possível acrescentar outros livros, o que permite uma movimentação fácil de capítulos e páginas entre livros.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Ordenar Livro :bookName',
     'books_sort_name' => 'Ordernar por Nome',
     'books_sort_created' => 'Ordenar por Data de Criação',
@@ -339,12 +341,12 @@
     'tags_assigned_pages' => 'Atribuído às páginas',
     'tags_assigned_chapters' => 'Atribuído aos Capítulos',
     'tags_assigned_books' => 'Atribuído a Livros',
-    'tags_assigned_shelves' => 'Atribuído a Prateleiras',
+    'tags_assigned_shelves' => 'Atribuído a Estantes',
     'tags_x_unique_values' => ':count valores únicos',
     'tags_all_values' => 'Todos os valores',
     'tags_view_tags' => 'Ver Marcadores',
     'tags_view_existing_tags' => 'Ver marcadores existentes',
-    'tags_list_empty_hint' => 'Os marcadores podem ser atribuídos através da barra lateral do editor de página ou ao editar os detalhes de um livro, capítulo ou prateleira.',
+    'tags_list_empty_hint' => 'Os marcadores podem ser atribuídos através da barra lateral do editor de página ou ao editar os detalhes de um livro, capítulo ou estante.',
     'attachments' => 'Anexos',
     'attachments_explain' => 'Faça o upload de alguns arquivos ou anexe links para serem exibidos na sua página. Eles estarão visíveis na barra lateral à direita.',
     'attachments_explain_instant_save' => 'Mudanças são salvas instantaneamente.',
@@ -384,7 +386,7 @@
     'profile_not_created_pages' => ':userName não criou páginas',
     'profile_not_created_chapters' => ':userName não criou capítulos',
     'profile_not_created_books' => ':userName não criou livros',
-    'profile_not_created_shelves' => ':userName não criou prateleiras',
+    'profile_not_created_shelves' => ':userName não criou estantes',
 
     // Comments
     'comment' => 'Comentário',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index fdad94139d5..d99d871f10b 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -68,7 +68,7 @@
     // Entities
     'entity_not_found' => 'Entidade não encontrada
 ',
-    'bookshelf_not_found' => 'Prateleira não encontrada',
+    'bookshelf_not_found' => 'Estante não encontrada',
     'book_not_found' => 'Livro não encontrado',
     'page_not_found' => 'Página não encontrada',
     'chapter_not_found' => 'Capítulo não encontrado',
@@ -82,10 +82,10 @@
     'users_could_not_send_invite' => 'Não foi possível criar o usuário porque o endereço eletrônico de convite não foi enviado',
 
     // Roles
-    'role_cannot_be_edited' => 'Essa função não pode ser editada',
-    'role_system_cannot_be_deleted' => 'Essa é uma função do sistema e não pode ser excluída',
-    'role_registration_default_cannot_delete' => 'Essa função não poderá se excluída enquanto estiver registrada como função de registro padrão',
-    'role_cannot_remove_only_admin' => 'Este usuário é o único vinculado ao cargo de administrador. Atribua o cargo de administrador a outro usuário antes de tentar removê-lo aqui.',
+    'role_cannot_be_edited' => 'Esse perfil não pode ser editado',
+    'role_system_cannot_be_deleted' => 'Este é um perfil do sistema e não pode ser excluído',
+    'role_registration_default_cannot_delete' => 'Esse perfil não poderá se excluído enquanto estiver registrado como perfil padrão de registro',
+    'role_cannot_remove_only_admin' => 'Este usuário é o único vinculado ao perfil de administrador. Atribua o perfil de administrador a outro usuário antes de tentar removê-lo daqui.',
 
     // Comments
     'comment_list' => 'Ocorreu um erro ao buscar os comentários.',
diff --git a/lang/pt_BR/preferences.php b/lang/pt_BR/preferences.php
index 28d0e497895..e0b79ff0644 100644
--- a/lang/pt_BR/preferences.php
+++ b/lang/pt_BR/preferences.php
@@ -42,7 +42,7 @@
     'profile_email_no_permission' => 'Infelizmente você não tem permissão para alterar seu endereço de e-mail. Se quiser alterar isso, você precisará pedir a um administrador para alterar isso para você.',
     'profile_avatar_desc' => 'Selecione uma imagem que será usada para representar você mesmo para outras pessoas no sistema. Idealmente, esta imagem deve ser quadrada e ter cerca de 256px de largura e altura.',
     'profile_admin_options' => 'Opções do administrador',
-    'profile_admin_options_desc' => 'Opções adicionais do nível administrador, como as que visam gerenciar as atribuições de papéis, podem ser encontradas para sua conta de usuário na área "Configurações > Usuários" do aplicativo.',
+    'profile_admin_options_desc' => 'Opções adicionais do nível administrador, como as que visam gerenciar as atribuições de perfis, podem ser encontradas para sua conta de usuário na área "Configurações > Usuários" do aplicativo.',
 
     'delete_account' => 'Deletar conta',
     'delete_my_account' => 'Deletar minha conta',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 30d5b82a1cf..f69edf4e2dc 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -54,7 +54,7 @@
     'app_color' => 'Cor Primária',
     'link_color' => 'Cor Padrão para Links',
     'content_colors_desc' => 'Definir cores para todos os elementos na hierarquia da organização da página. Escolher cores com um brilho semelhante às cores padrão é recomendado para legibilidade.',
-    'bookshelf_color' => 'Cor da Prateleira',
+    'bookshelf_color' => 'Cor da Estante',
     'book_color' => 'Cor do Livro',
     'chapter_color' => 'Cor do Capítulo',
     'page_color' => 'Cor da Página',
@@ -64,8 +64,8 @@
     'reg_settings' => 'Cadastro',
     'reg_enable' => 'Habilitar Cadastro',
     'reg_enable_toggle' => 'Habilitar cadastro',
-    'reg_enable_desc' => 'Quando o cadastro é habilitado, visitantes poderão cadastrar-se como usuários do aplicativo. Realizado o cadastro, recebem um único cargo padrão.',
-    'reg_default_role' => 'Cargo padrão para usuários após o cadastro',
+    'reg_enable_desc' => 'Quando o cadastro é habilitado, visitantes poderão cadastrar-se como usuários do aplicativo. Realizado o cadastro, recebem um único perfil padrão.',
+    'reg_default_role' => 'Perfil padrão para usuários após o cadastro',
     'reg_enable_external_warning' => 'A opção acima é ignorada enquanto a autenticação externa LDAP ou SAML estiver ativa. Contas de usuários para membros não existentes serão criadas automaticamente se a autenticação pelo sistema externo em uso for bem sucedida.',
     'reg_email_confirmation' => 'Confirmação de E-mail',
     'reg_email_confirmation_toggle' => 'Requerer confirmação de e-mail',
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Entre com uma lista separada por vírgulas de domínios de e-mails aos quais você deseja restringir o cadastro. Um e-mail de confirmação será enviado para o usuário validar seu endereço de e-mail antes de ser permitido a interagir com a aplicação. <br> Note que os usuários serão capazes de alterar o seus endereços de e-mail após o sucesso na confirmação do cadastro.',
     'reg_confirm_restrict_domain_placeholder' => 'Nenhuma restrição definida',
 
+    // Sorting Settings
+    'sorting' => 'Classificação',
+    'sorting_book_default' => 'Classificação padrão de livros',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Regras de classificação',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Manutenção',
     'maint_image_cleanup' => 'Limpeza de Imagens',
@@ -90,7 +120,7 @@
     'maint_send_test_email_mail_subject' => 'E-mail de Teste',
     'maint_send_test_email_mail_greeting' => 'O envio de e-mails parece funcionar!',
     'maint_send_test_email_mail_text' => 'Parabéns! Já que você recebeu esta notificação, suas opções de e-mail parecem estar configuradas corretamente.',
-    'maint_recycle_bin_desc' => 'Prateleiras, livros, capítulos e páginas deletados são mandados para a lixeira podendo assim ser restaurados ou excluídos permanentemente. Itens mais antigos da lixeira podem vir a ser automaticamente removidos da lixeira após um tempo dependendo da configuração do sistema.',
+    'maint_recycle_bin_desc' => 'Estantes, livros, capítulos e páginas excluídos são mandados para a lixeira podendo assim ser restaurados ou excluídos permanentemente. Itens mais antigos da lixeira podem vir a ser automaticamente removidos da lixeira após um tempo dependendo da configuração do sistema.',
     'maint_recycle_bin_open' => 'Abrir Lixeira',
     'maint_regen_references' => 'Regenerar referências',
     'maint_regen_references_desc' => 'Essa ação reconstruirá o índice de referência entre itens no banco de dados. Isso geralmente é tratado automaticamente, mas essa ação pode ser útil para indexar conteúdo antigo ou adicionado por métodos não oficiais.',
@@ -134,28 +164,28 @@
     'audit_date_to' => 'Para',
 
     // Role Settings
-    'roles' => 'Cargos',
-    'role_user_roles' => 'Cargos de Usuário',
-    'roles_index_desc' => 'As funções são usadas para agrupar usuários & fornecer permissão de sistema a seus membros. Quando um usuário é membro de várias funções, os privilégios concedidos serão acumulados e o usuário herdará todas as habilidades.',
+    'roles' => 'Perfis',
+    'role_user_roles' => 'Perfis de Usuários',
+    'roles_index_desc' => 'Os perfis são usados para agrupar usuários & fornecer permissão de sistema a seus membros. Quando um usuário possui vários perfis, os privilégios concedidos serão acumulados e o usuário herdará todas as habilidades.',
     'roles_x_users_assigned' => ':count usuário atribuído|:count usuários atribuídos',
     'roles_x_permissions_provided' => ':count permissão|:count permissões',
     'roles_assigned_users' => 'Usuários atribuídos',
     'roles_permissions_provided' => 'Permissões fornecidas',
-    'role_create' => 'Criar novo Cargo',
-    'role_delete' => 'Excluir Cargo',
-    'role_delete_confirm' => 'A ação vai excluír o cargo de nome \':roleName\'.',
-    'role_delete_users_assigned' => 'Esse cargo tem :userCount usuários vinculados a ele. Se quiser migrar usuários desse cargo para outro, selecione um novo cargo.',
+    'role_create' => 'Criar novo Perfil',
+    'role_delete' => 'Excluir Perfil',
+    'role_delete_confirm' => 'A ação vai excluír o perfil de nome \':roleName\'.',
+    'role_delete_users_assigned' => 'Esse perfil tem :userCount usuários vinculados a ele. Se quiser migrar usuários desse perfil para outro, selecione um novo perfil.',
     'role_delete_no_migration' => "Não migre os usuários",
-    'role_delete_sure' => 'Tem certeza que deseja excluir esse cargo?',
-    'role_edit' => 'Editar Cargo',
-    'role_details' => 'Detalhes do Cargo',
-    'role_name' => 'Nome do Cargo',
-    'role_desc' => 'Breve Descrição do Cargo',
+    'role_delete_sure' => 'Tem certeza que deseja excluir esse perfil?',
+    'role_edit' => 'Editar Perfil',
+    'role_details' => 'Detalhes do Perfil',
+    'role_name' => 'Nome do Perfil',
+    'role_desc' => 'Breve Descrição do Perfil',
     'role_mfa_enforced' => 'Requer Autenticação Multi-fator',
     'role_external_auth_id' => 'IDs de Autenticação Externa',
     'role_system' => 'Permissões do Sistema',
     'role_manage_users' => 'Gerenciar usuários',
-    'role_manage_roles' => 'Gerenciar cargos e permissões de cargos',
+    'role_manage_roles' => 'Gerenciar perfis e permissões de perfis',
     'role_manage_entity_permissions' => 'Gerenciar todos os livros, capítulos e permissões de páginas',
     'role_manage_own_entity_permissions' => 'Gerenciar permissões de seu próprio livro, capítulo e paginas',
     'role_manage_page_templates' => 'Gerenciar modelos de página',
@@ -166,20 +196,20 @@
     'role_editor_change' => 'Alterar página de edição',
     'role_notifications' => 'Receber e gerenciar notificações',
     'role_asset' => 'Permissões de Ativos',
-    'roles_system_warning' => 'Esteja ciente de que o acesso a qualquer uma das três permissões acima pode permitir que um usuário altere seus próprios privilégios ou privilégios de outros usuários no sistema. Apenas atribua cargos com essas permissões para usuários confiáveis.',
+    'roles_system_warning' => 'Esteja ciente de que o acesso a qualquer uma das três permissões acima pode permitir que um usuário altere seus próprios privilégios ou privilégios de outros usuários no sistema. Apenas atribua perfis com essas permissões para usuários confiáveis.',
     'role_asset_desc' => 'Essas permissões controlam o acesso padrão para os ativos dentro do sistema. Permissões em Livros, Capítulos e Páginas serão sobrescritas por essas permissões.',
     'role_asset_admins' => 'Administradores recebem automaticamente acesso a todo o conteúdo, mas essas opções podem mostrar ou ocultar as opções da Interface de Usuário.',
     'role_asset_image_view_note' => 'Isso está relacionado à visibilidade no gerenciador de imagens. O acesso real dos arquivos de imagem carregados dependerá da opção de armazenamento de imagem do sistema.',
     'role_all' => 'Todos',
     'role_own' => 'Próprio',
     'role_controlled_by_asset' => 'Controlado pelos ativos nos quais o upload foi realizado',
-    'role_save' => 'Salvar Cargo',
-    'role_users' => 'Usuários com este cargo',
-    'role_users_none' => 'Nenhum usuário está atualmente vinculado a este cargo',
+    'role_save' => 'Salvar Perfil',
+    'role_users' => 'Usuários com este perfil',
+    'role_users_none' => 'Nenhum usuário está atualmente vinculado a este perfil',
 
     // Users
     'users' => 'Usuários',
-    'users_index_desc' => 'Crie e gerencie contas de usuários individuais dentro do sistema. As contas de usuário são usadas para login e atribuição de conteúdo e atividade. As permissões de acesso são baseadas principalmente na função, mas a propriedade do conteúdo do usuário, entre outros fatores, também pode afetar as permissões e o acesso.',
+    'users_index_desc' => 'Crie e gerencie contas de usuários individuais dentro do sistema. As contas de usuário são usadas para login e atribuição de conteúdo e atividade. As permissões de acesso são baseadas principalmente no perfil, mas a propriedade do conteúdo do usuário, entre outros fatores, também pode afetar as permissões e o acesso.',
     'user_profile' => 'Perfil do Usuário',
     'users_add_new' => 'Adicionar Novo Usuário',
     'users_search' => 'Pesquisar Usuários',
@@ -187,8 +217,8 @@
     'users_details' => 'Detalhes do Usuário',
     'users_details_desc' => 'Defina um nome de exibição e um endereço de e-mail para este usuário. O endereço de e-mail será usado para fazer login na aplicação.',
     'users_details_desc_no_email' => 'Defina um nome de exibição para este usuário para que outros usuários possam reconhecê-lo',
-    'users_role' => 'Cargos do Usuário',
-    'users_role_desc' => 'Selecione os cargos aos quais este usuário será vinculado. Se um usuário for vinculado a múltiplos cargos, suas permissões serão empilhadas e ele receberá todas as habilidades dos cargos atribuídos.',
+    'users_role' => 'Perfis do Usuário',
+    'users_role_desc' => 'Selecione os perfis aos quais este usuário será vinculado. Se um usuário for vinculado a múltiplos perfis, suas permissões serão empilhadas e ele receberá todas as habilidades dos perfis atribuídos.',
     'users_password' => 'Senha do Usuário',
     'users_password_desc' => 'Defina uma senha usada para fazer \'login\' no aplicativo. Deve ter pelo menos 8 caracteres.',
     'users_send_invite_text' => 'Você pode escolher enviar a este usuário um convite por e-mail que o possibilitará definir sua própria senha, ou defina você uma senha.',
diff --git a/lang/ro/activities.php b/lang/ro/activities.php
index 951ca2347e9..eed5cc0832f 100644
--- a/lang/ro/activities.php
+++ b/lang/ro/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'comentariu actualizat',
     'comment_delete'              => 'comentariu șters',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'a actualizat permisiunile',
 ];
diff --git a/lang/ro/editor.php b/lang/ro/editor.php
index a22e239aa92..a61fdc6c83c 100644
--- a/lang/ro/editor.php
+++ b/lang/ro/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Anulează',
     'save' => 'Salvează',
     'close' => 'Închide',
+    'apply' => 'Apply',
     'undo' => 'Anulează',
     'redo' => 'Refă',
     'left' => 'Stânga',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text de afișat',
     'title' => 'Titlu',
+    'browse_links' => 'Browse links',
     'open_link' => 'Deschide link-ul',
     'open_link_in' => 'Deschide link-ul în...',
     'open_link_current' => 'Fereastra curentă',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index f6bec4cb9a6..ca13d90ffd2 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Caută în această carte',
     'books_navigation' => 'Navigare carte',
     'books_sort' => 'Sortează conținutul cărții',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sortează cartea :bookName',
     'books_sort_name' => 'Sortează după nume',
     'books_sort_created' => 'Sortează după data creării',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index ee402085ac9..c9bbaf06ea0 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Introduceți o listă de domenii de e-mail separate prin virgulă la care doriți să restricționați înregistrarea. Utilizatorilor le va fi trimis un e-mail pentru a-și confirma adresa înainte de a putea interacționa cu aplicația. <br> Rețineți că utilizatorii vor putea să își schimbe adresele de e-mail după o înregistrare reușită.',
     'reg_confirm_restrict_domain_placeholder' => 'Nicio restricție setată',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Mentenanţă',
     'maint_image_cleanup' => 'Curățare imagini',
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index 3fe46181de9..74564e2abfd 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'обновил комментарий',
     'comment_delete'              => 'удалил комментарий',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'обновил разрешения',
 ];
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index 7e12acfff80..c2c38984c03 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Отмена',
     'save' => 'Сохранить',
     'close' => 'Закрыть',
+    'apply' => 'Apply',
     'undo' => 'Отменить',
     'redo' => 'Повторить',
     'left' => 'Слева',
@@ -147,6 +148,7 @@
     'url' => 'URL-адрес',
     'text_to_display' => 'Текст для отображения',
     'title' => 'Заголовок',
+    'browse_links' => 'Browse links',
     'open_link' => 'Открыть ссылку',
     'open_link_in' => 'Открыть ссылку в...',
     'open_link_current' => 'В текущем окне',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 795c287cbd2..5ce4dea6043 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Поиск в этой книге',
     'books_navigation' => 'Навигация по книге',
     'books_sort' => 'Сортировка содержимого книги',
-    'books_sort_desc' => 'Переместите разделы и страницы в книге, чтобы изменить содержание. Могут быть добавлены другие книги, что позволяет легко перемещать разделы и страницы между книгами.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Сортировка книги :bookName',
     'books_sort_name' => 'По имени',
     'books_sort_created' => 'По дате создания',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 32b5367c60a..ee78104ef7a 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Введите список доменов почты через запятую, для которых разрешена регистрация. Пользователям будет отправлено письмо для подтверждения адреса перед входом в приложение. <br> Обратите внимание, что пользователи смогут изменить свой адрес после регистрации.',
     'reg_confirm_restrict_domain_placeholder' => 'Без ограничений',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Обслуживание',
     'maint_image_cleanup' => 'Очистка изображений',
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index 5e1800dabf6..65542fbe2a1 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'aktualizoval(a) komentár',
     'comment_delete'              => 'odstrániť komentár',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'aktualizované oprávnenia',
 ];
diff --git a/lang/sk/editor.php b/lang/sk/editor.php
index 5b7ee2f49b3..3c098e3b342 100644
--- a/lang/sk/editor.php
+++ b/lang/sk/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Zrušiť',
     'save' => 'Uložiť',
     'close' => 'Zavrieť',
+    'apply' => 'Apply',
     'undo' => 'Vrátiť späť',
     'redo' => 'Obnoviť',
     'left' => 'Vľavo',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text na zobrazenie',
     'title' => 'Názov',
+    'browse_links' => 'Browse links',
     'open_link' => 'Otvoriť odkaz',
     'open_link_in' => 'Otvoriť odkaz v...',
     'open_link_current' => 'Iba aktuálne okno',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 882ac533dfe..347434fd01b 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Hľadať v tejto knihe',
     'books_navigation' => 'Navigácia knihy',
     'books_sort' => 'Zoradiť obsah knihy',
-    'books_sort_desc' => 'Presúvajte kapitoly a strany v rámci knihy, aby ste reorganizovali jej obsah. Je možné pridať ďalšie knihy, čo umožňuje jednoduché presúvanie kapitol a strán medzi knihami.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Zoradiť knihu :bookName',
     'books_sort_name' => 'Zoradiť podľa mena',
     'books_sort_created' => 'Zoradiť podľa dátumu vytvorenia',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index cb8fb9fa938..b07586b8de6 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Zadajte zoznam domén, pre ktoré chcete povoliť registráciu oddelených čiarkou. Používatelia dostanú email kvôli overeniu adresy predtým ako im bude dovolené používať aplikáciu. <br> Používatelia si budú môcť po úspešnej registrácii zmeniť svoju emailovú adresu.',
     'reg_confirm_restrict_domain_placeholder' => 'Nie sú nastavené žiadne obmedzenia',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Údržba',
     'maint_image_cleanup' => 'Prečistenie obrázkov',
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index 11627a89ad9..2e8943e4025 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'posodobljen komentar',
     'comment_delete'              => 'izbrisan komentar',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'pravice so posodobljene',
 ];
diff --git a/lang/sl/editor.php b/lang/sl/editor.php
index 09b311018a4..c050d6b37c5 100644
--- a/lang/sl/editor.php
+++ b/lang/sl/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Prekliči',
     'save' => 'Shrani',
     'close' => 'Zapri',
+    'apply' => 'Apply',
     'undo' => 'Razveljavi',
     'redo' => 'Ponovi',
     'left' => 'Levo',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index e118bfaaccf..f3c56223ba4 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Išči v tej knjigi',
     'books_navigation' => 'Navigacija po knjigi',
     'books_sort' => 'Razvrsti vsebino knjige',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Razvrsti knjigo :bookName',
     'books_sort_name' => 'Razvrsti po imenu',
     'books_sort_created' => 'Razvrsti po datumu nastanka',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 77af9dac4b9..5ca213a395d 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Vnesite seznam domen, ločenih z vejico, na katere želite omejiti registracijo. Uporabnik bo prejel e-pošto za potrditev naslova, preden bo omogočena interakcija z aplikacijo. <br> Upoštevajte, da uporabnik po uspešni registrciji lahko spremeni svoj e-poštni naslov.',
     'reg_confirm_restrict_domain_placeholder' => 'Brez omejitev',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Vzdrževanje',
     'maint_image_cleanup' => 'Odstrani /počisti slike',
diff --git a/lang/sq/activities.php b/lang/sq/activities.php
index b7ca7d02d8d..fbe7e3179f4 100644
--- a/lang/sq/activities.php
+++ b/lang/sq/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'përditësoi koment',
     'comment_delete'              => 'fshiu koment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'përditësoi lejet',
 ];
diff --git a/lang/sq/editor.php b/lang/sq/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/sq/editor.php
+++ b/lang/sq/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index 26a563a7eb5..a74785eaacd 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index c0b6b692a57..82a4ade5df5 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/lang/sr/activities.php b/lang/sr/activities.php
index 9a72cfc5e3c..ad594a2204e 100644
--- a/lang/sr/activities.php
+++ b/lang/sr/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'ажуриран коментар',
     'comment_delete'              => 'обрисан коментар',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'ажуриране дозволе',
 ];
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index 8b7690e2c34..5db25faf34b 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Поништи',
     'save' => 'Сачувај',
     'close' => 'Затвори',
+    'apply' => 'Apply',
     'undo' => 'Опозови',
     'redo' => 'Понови',
     'left' => 'Лево',
@@ -147,6 +148,7 @@
     'url' => 'УРЛ',
     'text_to_display' => 'Текст за приказ',
     'title' => 'Наслов',
+    'browse_links' => 'Browse links',
     'open_link' => 'Отвори везу',
     'open_link_in' => 'Отвори везу у...',
     'open_link_current' => 'Тренутни прозор',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 0c27ddf59db..0aa531750ab 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index 6bd5f525237..09033109530 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Унесите листу домена е-поште одвојене зарезима на које желите да ограничите регистрацију. Корисницима ће бити послата е-порука да потврде своју адресу пре него што им буде дозвољено да комуницирају са апликацијом. <br> Имајте на уму да ће корисници моћи да промене своје адресе е-поште након успешне регистрације.',
     'reg_confirm_restrict_domain_placeholder' => 'Нема постављених ограничења',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Одржавање',
     'maint_image_cleanup' => 'Чишћење слика',
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index 5244b224372..eb5f4cb2896 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'uppdaterad kommentar',
     'comment_delete'              => 'raderad kommentar',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'uppdaterade behörigheter',
 ];
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index 4badcc0e343..a35b5247e1a 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Avbryt',
     'save' => 'Spara',
     'close' => 'Stäng',
+    'apply' => 'Apply',
     'undo' => 'Ångra',
     'redo' => 'Gör om',
     'left' => 'Vänster',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text som ska visas',
     'title' => 'Titel',
+    'browse_links' => 'Browse links',
     'open_link' => 'Öppna länk',
     'open_link_in' => 'Öppna länk i...',
     'open_link_current' => 'Aktuellt fönster',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 5df1f43dcf0..60e6c7fa72a 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Sök i boken',
     'books_navigation' => 'Navigering',
     'books_sort' => 'Sortera bokens innehåll',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sortera boken :bookName',
     'books_sort_name' => 'Sortera utifrån namn',
     'books_sort_created' => 'Sortera utifrån skapelse',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index bd6afcf2892..f5b87786d7c 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Ange en kommaseparerad lista över e-postdomäner som du vill begränsa registrering för. Användare kommer att få ett e-postmeddelande för att bekräfta sin e-postadress innan de tillåts att logga in. <br> Notera att användare kommer att kunna ändra sin e-postadress efter lyckad registrering.',
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begränsning inställd',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Underhåll',
     'maint_image_cleanup' => 'Rensa bilder',
diff --git a/lang/tk/activities.php b/lang/tk/activities.php
index 7c3454d41ca..4362fc02958 100644
--- a/lang/tk/activities.php
+++ b/lang/tk/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'updated permissions',
 ];
diff --git a/lang/tk/editor.php b/lang/tk/editor.php
index a61b460427e..752c6f3f702 100644
--- a/lang/tk/editor.php
+++ b/lang/tk/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Cancel',
     'save' => 'Save',
     'close' => 'Close',
+    'apply' => 'Apply',
     'undo' => 'Undo',
     'redo' => 'Redo',
     'left' => 'Left',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text to display',
     'title' => 'Title',
+    'browse_links' => 'Browse links',
     'open_link' => 'Open link',
     'open_link_in' => 'Open link in...',
     'open_link_current' => 'Current window',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index 26a563a7eb5..a74785eaacd 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Search this book',
     'books_navigation' => 'Book Navigation',
     'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
diff --git a/lang/tk/settings.php b/lang/tk/settings.php
index c0b6b692a57..82a4ade5df5 100644
--- a/lang/tk/settings.php
+++ b/lang/tk/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application. <br> Note that users will be able to change their email addresses after successful registration.',
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Maintenance',
     'maint_image_cleanup' => 'Cleanup Images',
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index fcecd6de3b4..ace52b36d4f 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'güncellenmiş izinler',
 ];
diff --git a/lang/tr/editor.php b/lang/tr/editor.php
index 3dc990f0cb9..6bb1d5db861 100644
--- a/lang/tr/editor.php
+++ b/lang/tr/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'İptal',
     'save' => 'Kaydet',
     'close' => 'Kapat',
+    'apply' => 'Apply',
     'undo' => 'Geri al',
     'redo' => 'Yeniden yap',
     'left' => 'Sol',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Görüntülenecek metin',
     'title' => 'Başlık',
+    'browse_links' => 'Browse links',
     'open_link' => 'Bağlantıyı aç',
     'open_link_in' => 'Bağlantıyı şurada aç...',
     'open_link_current' => 'Geçerli pencere',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index a73cdd85330..4e98df9b3ee 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Bu kitapta ara',
     'books_navigation' => 'Kitap Navigasyonu',
     'books_sort' => 'Kitap İçeriklerini Sırala',
-    'books_sort_desc' => 'İçeriğini yeniden düzenlemek için bir kitap içindeki bölümleri ve sayfaları taşıyın. Kitaplar arasında bölümlerin ve sayfaların kolayca taşınmasını sağlayan başka kitaplar eklenebilir.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => ':bookName Kitabını Sırala',
     'books_sort_name' => 'İsme Göre Sırala',
     'books_sort_created' => 'Oluşturulma Tarihine Göre Sırala',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 68c470b0aa9..11ab1b6df4a 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Kısıtlamak istediğiniz e-posta alan adlarını vigül ile ayırarak yazınız. Kullanıcılara, uygulamaya erişmeden önce adreslerini doğrulamaları için bir e-posta gönderilecektir. <br> Başarılı bir kayıt işleminden sonra kullanıcıların e-posta adreslerini değiştirebileceklerini unutmayın.',
     'reg_confirm_restrict_domain_placeholder' => 'Hiçbir kısıtlama tanımlanmamış',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Bakım',
     'maint_image_cleanup' => 'Görselleri Temizle',
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index 86195224c3e..fc076b510f0 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'оновлено коментар',
     'comment_delete'              => 'видалений коментар',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'оновив дозволи',
 ];
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index 85efbc661d9..e61d7f71967 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Скасувати',
     'save' => 'Зберегти',
     'close' => 'Закрити',
+    'apply' => 'Apply',
     'undo' => 'Відмінити',
     'redo' => 'Відновити',
     'left' => 'Ліворуч',
@@ -147,6 +148,7 @@
     'url' => 'Адреса URL',
     'text_to_display' => 'Текст для показу',
     'title' => 'Назва',
+    'browse_links' => 'Browse links',
     'open_link' => 'Відкрити посилання',
     'open_link_in' => 'Відкрити посилання в...',
     'open_link_current' => 'Поточне вікно',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index e955f5801af..753ceb72767 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Шукати цю книгу',
     'books_navigation' => 'Навігація по книзі',
     'books_sort' => 'Сортувати вміст книги',
-    'books_sort_desc' => 'Перекладіть розділи та сторінки в межах книги, щоб реорганізувати вміст. Інші книги можна додати, що дозволяє легко переміщати глави та сторінки між книгами.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Сортувати книгу :bookName',
     'books_sort_name' => 'Сортувати за назвою',
     'books_sort_created' => 'Сортувати за датою створення',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index a897439a14d..8670996aeff 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Введіть список розділених комами доменів електронної пошти, до яких ви хочете обмежити реєстрацію. Користувачам буде надіслано електронне повідомлення для підтвердження своєї адреси, перш ніж дозволяти взаємодіяти з додатком. <br> Зауважте, що користувачі зможуть змінювати свої електронні адреси після успішної реєстрації.',
     'reg_confirm_restrict_domain_placeholder' => 'Не встановлено обмежень',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Обслуговування',
     'maint_image_cleanup' => 'Очищення зображень',
diff --git a/lang/uz/activities.php b/lang/uz/activities.php
index 19d52adc49c..84764192d77 100644
--- a/lang/uz/activities.php
+++ b/lang/uz/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'updated comment',
     'comment_delete'              => 'deleted comment',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'yangilangan huquqlar',
 ];
diff --git a/lang/uz/editor.php b/lang/uz/editor.php
index deea210bab7..905855b4c44 100644
--- a/lang/uz/editor.php
+++ b/lang/uz/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Bekor qilish',
     'save' => 'Saqlash',
     'close' => 'Yopish',
+    'apply' => 'Apply',
     'undo' => 'Bekor qilish',
     'redo' => 'Qayta qiling',
     'left' => 'Chapga',
@@ -147,6 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Ko‘rish uchun matn',
     'title' => 'Sarlavha',
+    'browse_links' => 'Browse links',
     'open_link' => 'Havolani ochish',
     'open_link_in' => 'Havolani ochish...',
     'open_link_current' => 'Joriy oyna',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index fa198c68d8a..24f5a1acf63 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Ushbu kitobni qidiring',
     'books_navigation' => 'Kitob navigatsiya',
     'books_sort' => 'Kitob tarkibini saralash',
-    'books_sort_desc' => 'Kitob mazmunini qayta tartibga solish uchun bo\'lim va sahifalarni ko\'chiring. Kitoblar o\'rtasida bo\'limlar va sahifalarni osongina ko\'chirish imkonini beruvchi boshqa kitoblar qo\'shilishi mumkin.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Kitobni tartiblash: kitob nomi',
     'books_sort_name' => 'Nomi bo\'yicha saralash',
     'books_sort_created' => 'Yaratilgan sana bo\'yicha saralash',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index fabef538314..873642c2ad0 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Roʻyxatdan oʻtishni cheklamoqchi boʻlgan elektron pochta domenlarining vergul bilan ajratilgan roʻyxatini kiriting. Ilova bilan ishlashga ruxsat berishdan oldin foydalanuvchilarga manzillarini tasdiqlash uchun elektron pochta xabari yuboriladi. <br> E\'tibor bering, foydalanuvchilar muvaffaqiyatli ro\'yxatdan o\'tgandan so\'ng elektron pochta manzillarini o\'zgartirishi mumkin.',
     'reg_confirm_restrict_domain_placeholder' => 'Cheklov oʻrnatilmagan',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Xizmat',
     'maint_image_cleanup' => 'Tasvirlarni tozalash',
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index 2262e37a005..ef9cf7203c3 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => 'cập nhật bình luận',
     'comment_delete'              => 'đã xóa bình luận',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => 'các quyền đã được cập nhật',
 ];
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index 2e36df8dd9e..ed524610638 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -13,6 +13,7 @@
     'cancel' => 'Huỷ',
     'save' => 'Lưu',
     'close' => 'Đóng',
+    'apply' => 'Apply',
     'undo' => 'Hoàn tác',
     'redo' => 'Làm lại',
     'left' => 'Bên trái',
@@ -147,6 +148,7 @@
     'url' => 'Đường dẫn',
     'text_to_display' => 'Các văn bản hiển thị',
     'title' => 'Tiêu đề',
+    'browse_links' => 'Browse links',
     'open_link' => 'Mở liên kết',
     'open_link_in' => 'Mở liên kết trong...',
     'open_link_current' => 'Cửa sổ hiện tại',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 11c47a8d5eb..889af774937 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => 'Tìm cuốn sách này',
     'books_navigation' => 'Điều hướng cuốn sách',
     'books_sort' => 'Sắp xếp nội dung cuốn sách',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => 'Sắp xếp sách :bookName',
     'books_sort_name' => 'Sắp xếp theo tên',
     'books_sort_created' => 'Sắp xếp theo ngày tạo',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 410d28d5941..276891dc70d 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => 'Điền dấu phẩy ngăn cách danh sách các tên miền email dành cho việc bạn muốn giới hạn đăng nhập. Người dùng sẽ nhận được email xác nhận địa chỉ của họ trước khi được phép tương tác với ứng dụng. <br> Lưu ý rằng người dùng có thể thay đổi địa chỉ email của họ sau khi đăng ký thành công.',
     'reg_confirm_restrict_domain_placeholder' => 'Không có giới hạn nào được thiết lập',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => 'Bảo trì',
     'maint_image_cleanup' => 'Dọn dẹp ảnh',
diff --git a/lang/zh_CN/activities.php b/lang/zh_CN/activities.php
index 7edf9bc79fc..2ec271e0542 100644
--- a/lang/zh_CN/activities.php
+++ b/lang/zh_CN/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook 删除成功',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => '创建导入',
+    'import_create_notification' => '导入上传成功',
+    'import_run' => '更新导入',
+    'import_run_notification' => '内容成功导入',
+    'import_delete' => '删除导入',
+    'import_delete_notification' => '导入删除成功',
 
     // Users
     'user_create' => '用户已创建',
@@ -127,6 +127,14 @@
     'comment_update'              => '评论已更新',
     'comment_delete'              => '评论已删除',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => '权限已更新',
 ];
diff --git a/lang/zh_CN/auth.php b/lang/zh_CN/auth.php
index 603dcc8b38f..8c4ba63f9e2 100644
--- a/lang/zh_CN/auth.php
+++ b/lang/zh_CN/auth.php
@@ -36,7 +36,7 @@
     'register_confirm' => '请点击查收您的Email，并点击确认。',
     'registrations_disabled' => '注册目前被禁用',
     'registration_email_domain_invalid' => '该Email域名无权访问此应用程序',
-    'register_success' => '感谢您注册:appName，您现在已经登录。',
+    'register_success' => '感谢您注册！您现在已注册并登录。',
 
     // Login auto-initiation
     'auto_init_starting' => '尝试登录中',
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index bc391354e69..b1be3c73fa6 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => '服务条款',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => '搜索 :appName',
 ];
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index 5f4ffdcb96b..33e72f23f75 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -13,6 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '关闭',
+    'apply' => 'Apply',
     'undo' => '撤销',
     'redo' => '重做',
     'left' => '左对齐',
@@ -147,6 +148,7 @@
     'url' => '网址',
     'text_to_display' => '要显示的文本',
     'title' => '标题',
+    'browse_links' => 'Browse links',
     'open_link' => '打开链接',
     'open_link_in' => '打开链接于……',
     'open_link_current' => '覆盖当前窗口',
@@ -163,8 +165,8 @@
     'about' => '关于编辑器',
     'about_title' => '关于所见即所得（WYSIWYG）编辑器',
     'editor_license' => '编辑器许可证与版权信息',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => '该编辑器是 :lexicalLink 的一个分支构建的，并根据 MIT 许可证进行分发.',
+    'editor_lexical_license_link' => '许可证详细信息请点击此处',
     'editor_tiny_license' => '此编辑器是用 :tinyLink 构建的，基于 MIT 许可证。',
     'editor_tiny_license_link' => 'TinyMCE 的版权和许可证详细信息可以在这里找到。',
     'save_continue' => '保存页面并继续',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index 9f6ee7ecfb3..433a8e21f4f 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF文件',
     'export_text' => '纯文本文件',
     'export_md' => 'Markdown 文件',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => '便携版本 ZIP',
     'default_template' => '默认页面模板',
     'default_template_explain' => '指定一个页面模板，该模板将作为此项目中所有页面的默认内容。请注意，仅当页面创建者具有对所选页面模板的查看访问权限时，此功能才会生效。',
     'default_template_select' => '选择模板页面',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => '导入',
+    'import_validate' => '验证导入',
+    'import_desc' => '使用便携式 zip 导出从相同或不同的实例导入书籍、章节和页面。选择一个 ZIP 文件以继续。文件上传并验证后，您就可以在下一个视图中配置和确认导入。',
+    'import_zip_select' => '选择要上床的 ZIP 文件',
+    'import_zip_validation_errors' => '验证提供的 ZIP 文件时检测到错误:',
+    'import_pending' => '等待导入',
+    'import_pending_none' => '尚未开始导入。',
+    'import_continue' => '继续导入',
+    'import_continue_desc' => '查看从上传的 ZIP 文件中导入的内容。准备就绪后，运行导入将其内容添加到本系统中。成功导入后，上传的 ZIP 导入文件将自动删除。',
+    'import_details' => '导入详情',
+    'import_run' => '执行导入',
+    'import_size' => ':size 导入 ZIP 文件大小',
+    'import_uploaded_at' => '上传时间 :relativeTime',
+    'import_uploaded_by' => '上传者',
+    'import_location' => '导入位置',
+    'import_location_desc' => '为导入的内容选择目标位置。您需要相关权限才能在所选位置内进行创建',
+    'import_delete_confirm' => '您确定要删除此导入吗?',
+    'import_delete_desc' => '这将删除上传的ZIP文件，不能撤消。',
+    'import_errors' => '导入错误',
+    'import_errors_desc' => '在尝试导入过程中出现了以下错误:',
 
     // Permissions and restrictions
     'permissions' => '权限',
@@ -166,7 +166,9 @@
     'books_search_this' => '搜索这本书',
     'books_navigation' => '图书导航',
     'books_sort' => '排序图书内容',
-    'books_sort_desc' => '移动并重新排序书中的章节和页面。你也可以添加其他图书，这样就可以方便地在图书之间移动章节和页面。',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => '排序图书「:bookName」',
     'books_sort_name' => '按名称排序',
     'books_sort_created' => '创建时间排序',
@@ -245,8 +247,8 @@
     'pages_edit_switch_to_markdown_clean' => '（整理内容）',
     'pages_edit_switch_to_markdown_stable' => '（保留内容）',
     'pages_edit_switch_to_wysiwyg' => '切换到所见即所得编辑器',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => '切换到新的所见即所得',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alpha 测试)',
     'pages_edit_set_changelog' => '更新说明',
     'pages_edit_enter_changelog_desc' => '输入对您所做更改的简要说明',
     'pages_edit_enter_changelog' => '输入更新说明',
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index 3c5f262a166..37ef86af551 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => '您不能删除唯一的管理员账户',
     'users_cannot_delete_guest' => '您不能删除访客用户',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => '由于邀请电子邮件发送失败，无法创建用户',
 
     // Roles
     'role_cannot_be_edited' => '无法编辑该角色',
@@ -106,16 +106,16 @@
     'back_soon' => '请耐心等待网站的恢复。',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => '无法读取 ZIP 文件。',
+    'import_zip_cant_decode_data' => '无法找到并解码 ZIP data.json 内容。',
+    'import_zip_no_data' => 'ZIP 文件数据没有预期的书籍、章节或页面内容。',
+    'import_validation_failed' => '导入 ZIP 验证失败，出现错误：',
+    'import_zip_failed_notification' => 'ZIP 文件导入失败。',
+    'import_perms_books' => '您缺少创建书籍所需的权限。',
+    'import_perms_chapters' => '您缺少创建章节所需的权限。',
+    'import_perms_pages' => '您缺少创建页面所需的权限。',
+    'import_perms_images' => '您缺少创建图片所需的权限。',
+    'import_perms_attachments' => '您缺少创建附件所需的权限。',
 
     // API errors
     'api_no_authorization_found' => '未在请求中找到授权令牌',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index 3343877ab58..ce4d8e68244 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -45,7 +45,7 @@
     'app_footer_links_add' => '添加页脚链接',
     'app_disable_comments' => '禁用评论',
     'app_disable_comments_toggle' => '禁用评论',
-    'app_disable_comments_desc' => '在站点的所有页面上禁用评论，现有评论也不会显示出来。',
+    'app_disable_comments_desc' => '在站点的所有页面上禁用评论， <br> 已有评论也不会显示出来。',
 
     // Color settings
     'color_scheme' => '应用程序配色方案',
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => '输入您想要限制注册的电子邮件域名列表（即只允许使用这些电子邮件域名注册），多个域名用英文逗号隔开。在允许用户与应用程序交互之前，系统将向用户发送一封电子邮件以确认其电子邮件地址。<br>请注意，用户在注册成功后仍然可以更改他们的电子邮件地址。',
     'reg_confirm_restrict_domain_placeholder' => '尚未设置限制',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => '维护',
     'maint_image_cleanup' => '清理图像',
@@ -162,7 +192,7 @@
     'role_access_api' => '访问系统 API',
     'role_manage_settings' => '管理 App 设置',
     'role_export_content' => '导出内容',
-    'role_import_content' => 'Import content',
+    'role_import_content' => '导入内容',
     'role_editor_change' => '更改页面编辑器',
     'role_notifications' => '管理和接收通知',
     'role_asset' => '资源许可',
diff --git a/lang/zh_CN/validation.php b/lang/zh_CN/validation.php
index 120dfd998c8..1a576e6bca4 100644
--- a/lang/zh_CN/validation.php
+++ b/lang/zh_CN/validation.php
@@ -18,10 +18,10 @@
     'backup_codes'         => '您输入的认证码无效或已被使用。',
     'before'               => ':attribute 必须是在 :date 前的日期。',
     'between'              => [
-        'numeric' => ':attribute 必须在:min到:max之间。',
-        'file'    => ':attribute 必须为:min到:max KB。',
-        'string'  => ':attribute 必须在:min到:max个字符之间。',
-        'array'   => ':attribute 必须在:min到:max项之间.',
+        'numeric' => ':attribute 必须在 :min 到 :max 之间。',
+        'file'    => ':attribute 必须为 :min 到 :max 之间。',
+        'string'  => ':attribute 必须在 :min 到 :max 个字符之间。',
+        'array'   => ':attribute 必须在 :min 到 :max 项之间.',
     ],
     'boolean'              => ':attribute 字段必须为真或假。',
     'confirmed'            => ':attribute 确认不符。',
@@ -31,7 +31,7 @@
     'digits'               => ':attribute 必须为:digits位数。',
     'digits_between'       => ':attribute 必须为:min到:max位数。',
     'email'                => ':attribute 必须是有效的电子邮件地址。',
-    'ends_with' => ' :attribute 必须以 :values 后缀结尾',
+    'ends_with' => ':attribute 必须以: :values 后缀结尾。',
     'file'                 => ':attribute 必须是一个有效的文件。',
     'filled'               => ':attribute 字段是必需的。',
     'gt'                   => [
@@ -105,10 +105,10 @@
     'url'                  => ':attribute 格式无效。',
     'uploaded'             => '无法上传文件。 服务器可能不接受此大小的文件。',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute 需要引用 ZIP 内的文件。',
+    'zip_file_mime' => ':attribute 需要引用类型为 :validTypes 的文件，找到 :foundType 。',
+    'zip_model_expected' => '预期的数据对象，但找到了 ":type" 。',
+    'zip_unique' => '对于 ZIP 中的对象类型来说，:attribute 必须是唯一的。',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index be12e22c2f4..07d53ea65d0 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -127,6 +127,14 @@
     'comment_update'              => '更新評論',
     'comment_delete'              => '已刪除之評論',
 
+    // Sort Rules
+    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create_notification' => 'Sort rule successfully created',
+    'sort_rule_update' => 'updated sort rule',
+    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_delete' => 'deleted sort rule',
+    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+
     // Other
     'permissions_update'          => '更新權限',
 ];
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index 7eeb48501ac..737d51851b7 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -13,6 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '關閉',
+    'apply' => 'Apply',
     'undo' => '復原',
     'redo' => '重做',
     'left' => '左側',
@@ -147,6 +148,7 @@
     'url' => '網址',
     'text_to_display' => '要顯示的文字',
     'title' => '標題',
+    'browse_links' => 'Browse links',
     'open_link' => '開啟連結',
     'open_link_in' => '打開連結於……',
     'open_link_current' => '當前視窗',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index ee8113bee79..4c72bafeb70 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -166,7 +166,9 @@
     'books_search_this' => '搜尋此書本',
     'books_navigation' => '書本導覽',
     'books_sort' => '排序書本內容',
-    'books_sort_desc' => '移動章節、頁面來重新組織內容。也可以透過顯示多本書籍來調整書籍之間的內容',
+    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => '排序書本 :bookName',
     'books_sort_name' => '按名稱排序',
     'books_sort_created' => '按建立時間排序',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index b50d7649e7a..a20956bc06a 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -74,6 +74,36 @@
     'reg_confirm_restrict_domain_desc' => '輸入您想要限制註冊的電子郵件網域列表，以英文逗號分隔。在可以與應用程式互動前，使用者將會收到電子郵件以確認他們的電子郵件地址。<br>注意，使用者可以在註冊成功後變更他們的電子郵件地址。',
     'reg_confirm_restrict_domain_placeholder' => '尚未設定限制',
 
+    // Sorting Settings
+    'sorting' => 'Sorting',
+    'sorting_book_default' => 'Default Book Sort',
+    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_rules' => 'Sort Rules',
+    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
+    'sort_rule_create' => 'Create Sort Rule',
+    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_operations' => 'Sort Operations',
+    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_op_asc' => '(Asc)',
+    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_created_date' => 'Created Date',
+    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_chapters_last' => 'Chapters Last',
+
     // Maintenance settings
     'maint' => '維護',
     'maint_image_cleanup' => '清理圖片',

From 13dae24cbe3f95ba6747f1ffe37bc3e1a4db4af9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 26 Feb 2025 14:19:03 +0000
Subject: [PATCH 487/666] Testing: Fixed issues during pre-release testing

- Updated locale list
- Fixed new name sorting not being case insensitive
- Updated license test to account for changed deps
---
 app/Sorting/SortSetOperationComparisons.php |  4 +--
 app/Translation/LocaleManager.php           |  1 +
 tests/Meta/LicensesTest.php                 |  2 +-
 tests/Sorting/SortRuleTest.php              | 34 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index 0d8e582648e..e3465231573 100644
--- a/app/Sorting/SortSetOperationComparisons.php
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -13,12 +13,12 @@ class SortSetOperationComparisons
 {
     public static function nameAsc(Entity $a, Entity $b): int
     {
-        return $a->name <=> $b->name;
+        return strtolower($a->name) <=> strtolower($b->name);
     }
 
     public static function nameDesc(Entity $a, Entity $b): int
     {
-        return $b->name <=> $a->name;
+        return strtolower($b->name) <=> strtolower($a->name);
     }
 
     public static function nameNumericAsc(Entity $a, Entity $b): int
diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index 0e2e7372ff6..86e712beec9 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -47,6 +47,7 @@ class LocaleManager
         'ja'          => 'ja',
         'ka'          => 'ka_GE',
         'ko'          => 'ko_KR',
+        'ku'          => 'ku_TR',
         'lt'          => 'lt_LT',
         'lv'          => 'lv_LV',
         'nb'          => 'nb_NO',
diff --git a/tests/Meta/LicensesTest.php b/tests/Meta/LicensesTest.php
index 0d6af2555cf..a50fbdb9095 100644
--- a/tests/Meta/LicensesTest.php
+++ b/tests/Meta/LicensesTest.php
@@ -13,7 +13,7 @@ public function test_licenses_endpoint()
         $resp->assertSee('Licenses');
         $resp->assertSee('PHP Library Licenses');
         $resp->assertSee('Dan Brown and the BookStack project contributors');
-        $resp->assertSee('doctrine/dbal');
+        $resp->assertSee('league/commonmark');
         $resp->assertSee('@codemirror/lang-html');
     }
 
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index 85b3d7991c4..e956f49df4b 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -187,6 +187,40 @@ public function test_auto_book_sort_does_not_touch_timestamps()
         $this->assertNotEquals($oldPriority, $chapter->priority);
     }
 
+    public function test_name_alphabetical_ordering()
+    {
+        $book = Book::factory()->create();
+        $rule = SortRule::factory()->create(['sequence' => 'name_asc']);
+        $book->sort_rule_id = $rule->id;
+        $book->save();
+        $this->permissions->regenerateForEntity($book);
+
+        $namesToAdd = [
+            "Beans",
+            "bread",
+            "Milk",
+            "pizza",
+            "Tomato",
+        ];
+
+        $reverseNamesToAdd = array_reverse($namesToAdd);
+        foreach ($reverseNamesToAdd as $name) {
+            $this->actingAsApiEditor()->post("/api/pages", [
+                'book_id' => $book->id,
+                'name' => $name,
+                'markdown' => 'Hello'
+            ]);
+        }
+
+        foreach ($namesToAdd as $index => $name) {
+            $this->assertDatabaseHas('pages', [
+                'book_id' => $book->id,
+                'name' => $name,
+                'priority' => $index + 1,
+            ]);
+        }
+    }
+
     public function test_name_numeric_ordering()
     {
         $book = Book::factory()->create();

From 94b1cffa2d57141185d42965c8fa9f2da07f30ae Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 11 Mar 2025 23:45:26 +0000
Subject: [PATCH 488/666] System CLI: Updated with new version

As per https://codeberg.org/bookstack/system-cli/pulls/21
dev/checksums folder added to support this new system.

Related to #161
---
 .gitignore               |   1 +
 bookstack-system-cli     | Bin 386055 -> 388307 bytes
 dev/checksums/.gitignore |   1 +
 dev/checksums/vendor     |   1 +
 4 files changed, 3 insertions(+)
 create mode 100644 dev/checksums/.gitignore
 create mode 100644 dev/checksums/vendor

diff --git a/.gitignore b/.gitignore
index 3582c410221..b545d161f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ webpack-stats.json
 phpstan.neon
 esbuild-meta.json
 .phpactor.json
+/*.zip
diff --git a/bookstack-system-cli b/bookstack-system-cli
index 6fbfd98745b8bac922648e0354b9d55c9b9245a2..6283aa0cb41b89164a5fb67a2f208c03475e0d37 100755
GIT binary patch
delta 43963
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
K0000-LQO)J2ado1

delta 41543
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

diff --git a/dev/checksums/.gitignore b/dev/checksums/.gitignore
new file mode 100644
index 00000000000..b722e9e13ef
--- /dev/null
+++ b/dev/checksums/.gitignore
@@ -0,0 +1 @@
+!.gitignore
\ No newline at end of file
diff --git a/dev/checksums/vendor b/dev/checksums/vendor
new file mode 100644
index 00000000000..eb8b2f05237
--- /dev/null
+++ b/dev/checksums/vendor
@@ -0,0 +1 @@
+22e02ee72d21ff719c1073abbec8302f8e2096ba6d072e133051064ed24b45b1

From 4f5ad171ac239dacbf7dad4193366dfbacba5015 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 15 Mar 2025 20:32:57 +0000
Subject: [PATCH 489/666] Config: Updated DB host to handle ipv6

Can be set via the square bracket format.
For #5464
---
 .env.example.complete     |  1 +
 app/Config/database.php   | 22 +++++++++++++---------
 tests/TestCase.php        | 14 +++++++++-----
 tests/Unit/ConfigTest.php | 21 +++++++++++++++++++++
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/.env.example.complete b/.env.example.complete
index 6b4936648f0..25687aaac38 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -56,6 +56,7 @@ APP_PROXIES=null
 
 # Database details
 # Host can contain a port (localhost:3306) or a separate DB_PORT option can be used.
+# An ipv6 address can be used via the square bracket format ([::1]).
 DB_HOST=localhost
 DB_PORT=3306
 DB_DATABASE=database_database
diff --git a/app/Config/database.php b/app/Config/database.php
index 59ac0f31beb..8d38a86dfed 100644
--- a/app/Config/database.php
+++ b/app/Config/database.php
@@ -40,12 +40,16 @@
 
 // MYSQL
 // Split out port from host if set
-$mysql_host = env('DB_HOST', 'localhost');
-$mysql_host_exploded = explode(':', $mysql_host);
-$mysql_port = env('DB_PORT', 3306);
-if (count($mysql_host_exploded) > 1) {
-    $mysql_host = $mysql_host_exploded[0];
-    $mysql_port = intval($mysql_host_exploded[1]);
+$mysqlHost = env('DB_HOST', 'localhost');
+$mysqlHostExploded = explode(':', $mysqlHost);
+$mysqlPort = env('DB_PORT', 3306);
+$mysqlHostIpv6 = str_starts_with($mysqlHost, '[');
+if ($mysqlHostIpv6 && str_contains($mysqlHost, ']:')) {
+    $mysqlHost = implode(':', array_slice($mysqlHostExploded, 0, -1));
+    $mysqlPort = intval(end($mysqlHostExploded));
+} else if (!$mysqlHostIpv6 && count($mysqlHostExploded) > 1) {
+    $mysqlHost = $mysqlHostExploded[0];
+    $mysqlPort = intval($mysqlHostExploded[1]);
 }
 
 return [
@@ -61,12 +65,12 @@
         'mysql' => [
             'driver'         => 'mysql',
             'url'            => env('DATABASE_URL'),
-            'host'           => $mysql_host,
+            'host'           => $mysqlHost,
             'database'       => env('DB_DATABASE', 'forge'),
             'username'       => env('DB_USERNAME', 'forge'),
             'password'       => env('DB_PASSWORD', ''),
             'unix_socket'    => env('DB_SOCKET', ''),
-            'port'           => $mysql_port,
+            'port'           => $mysqlPort,
             'charset'        => 'utf8mb4',
             'collation'      => 'utf8mb4_unicode_ci',
             // Prefixes are only semi-supported and may be unstable
@@ -88,7 +92,7 @@
             'database'       => 'bookstack-test',
             'username'       => env('MYSQL_USER', 'bookstack-test'),
             'password'       => env('MYSQL_PASSWORD', 'bookstack-test'),
-            'port'           => $mysql_port,
+            'port'           => $mysqlPort,
             'charset'        => 'utf8mb4',
             'collation'      => 'utf8mb4_unicode_ci',
             'prefix'         => '',
diff --git a/tests/TestCase.php b/tests/TestCase.php
index b63de307624..0fb899ea99e 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -118,7 +118,7 @@ protected function mockHttpClient(array $responses = []): HttpClientHistory
      * Database config is juggled so the value can be restored when
      * parallel testing are used, where multiple databases exist.
      */
-    protected function runWithEnv(string $name, $value, callable $callback)
+    protected function runWithEnv(string $name, $value, callable $callback, bool $handleDatabase = true)
     {
         Env::disablePutenv();
         $originalVal = $_SERVER[$name] ?? null;
@@ -132,13 +132,17 @@ protected function runWithEnv(string $name, $value, callable $callback)
         $database = config('database.connections.mysql_testing.database');
         $this->refreshApplication();
 
-        DB::purge();
-        config()->set('database.connections.mysql_testing.database', $database);
-        DB::beginTransaction();
+        if ($handleDatabase) {
+            DB::purge();
+            config()->set('database.connections.mysql_testing.database', $database);
+            DB::beginTransaction();
+        }
 
         $callback();
 
-        DB::rollBack();
+        if ($handleDatabase) {
+            DB::rollBack();
+        }
 
         if (is_null($originalVal)) {
             unset($_SERVER[$name]);
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index d5c74392ffc..2883fddb8fc 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -160,6 +160,27 @@ public function test_smtp_scheme_and_certain_port_forces_tls_usage()
         $this->assertTrue($isMailTlsRequired());
     }
 
+    public function test_mysql_host_parsed_as_expected()
+    {
+        $cases = [
+            '127.0.0.1' => ['127.0.0.1', 3306],
+            '127.0.0.1:3307' => ['127.0.0.1', 3307],
+            'a.example.com' => ['a.example.com', 3306],
+            'a.example.com:3307' => ['a.example.com', 3307],
+            '[::1]' => ['[::1]', 3306],
+            '[::1]:123' => ['[::1]', 123],
+            '[2001:db8:3c4d:0015:0000:0000:1a2f]' => ['[2001:db8:3c4d:0015:0000:0000:1a2f]', 3306],
+            '[2001:db8:3c4d:0015:0000:0000:1a2f]:4567' => ['[2001:db8:3c4d:0015:0000:0000:1a2f]', 4567],
+        ];
+
+        foreach ($cases as $host => [$expectedHost, $expectedPort]) {
+            $this->runWithEnv("DB_HOST", $host, function () use ($expectedHost, $expectedPort) {
+                $this->assertEquals($expectedHost, config("database.connections.mysql.host"));
+                $this->assertEquals($expectedPort, config("database.connections.mysql.port"));
+            }, false);
+        }
+    }
+
     /**
      * Set an environment variable of the given name and value
      * then check the given config key to see if it matches the given result.

From dfbc78947f276f8b6782dd1e238c7bf28a40c265 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 16 Mar 2025 11:59:42 +0000
Subject: [PATCH 490/666] Revisions: Hid changes link for oldest revision

Just as a UX improvement to help avoid confusion, as the whole content
will be changes for this revision.

For #5454
---
 app/Entities/Controllers/PageRevisionController.php  |  2 +-
 .../views/pages/parts/revisions-index-row.blade.php  |  6 ++++--
 resources/views/pages/revisions.blade.php            |  6 +++++-
 tests/Entity/PageRevisionTest.php                    | 12 ++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index 232d40668f4..4985c39f351 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -43,7 +43,6 @@ public function index(Request $request, string $bookSlug, string $pageSlug)
             ->selectRaw("IF(markdown = '', false, true) as is_markdown")
             ->with(['page.book', 'createdBy'])
             ->reorder('id', $listOptions->getOrder())
-            ->reorder('created_at', $listOptions->getOrder())
             ->paginate(50);
 
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName' => $page->getShortName()]));
@@ -52,6 +51,7 @@ public function index(Request $request, string $bookSlug, string $pageSlug)
             'revisions'   => $revisions,
             'page'        => $page,
             'listOptions' => $listOptions,
+            'oldestRevisionId' => $page->revisions()->min('id'),
         ]);
     }
 
diff --git a/resources/views/pages/parts/revisions-index-row.blade.php b/resources/views/pages/parts/revisions-index-row.blade.php
index db89284bb47..48bea5b577c 100644
--- a/resources/views/pages/parts/revisions-index-row.blade.php
+++ b/resources/views/pages/parts/revisions-index-row.blade.php
@@ -27,8 +27,10 @@
         {{ $revision->summary }}
     </div>
     <div class="flex-2 px-m py-xs actions text-small text-l-right min-width-l">
-        <a href="{{ $revision->getUrl('changes') }}" target="_blank" rel="noopener">{{ trans('entities.pages_revisions_changes') }}</a>
-        <span class="text-muted opacity-70">&nbsp;|&nbsp;</span>
+        @if(!$oldest)
+            <a href="{{ $revision->getUrl('changes') }}" target="_blank" rel="noopener">{{ trans('entities.pages_revisions_changes') }}</a>
+            <span class="text-muted opacity-70">&nbsp;|&nbsp;</span>
+        @endif
 
 
         @if ($current)
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index 9f462e930eb..e8eb8d68bf0 100644
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -37,7 +37,11 @@
                         <div class="flex-2 px-m py-xs text-right">{{ trans('common.actions') }}</div>
                     </div>
                     @foreach($revisions as $index => $revision)
-                        @include('pages.parts.revisions-index-row', ['revision' => $revision, 'current' => $page->revision_count === $revision->revision_number])
+                        @include('pages.parts.revisions-index-row', [
+                                'revision' => $revision,
+                                'current' => $page->revision_count === $revision->revision_number,
+                                'oldest' => $oldestRevisionId === $revision->id,
+                            ])
                     @endforeach
                 </div>
             @else
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index a272dc38bdb..9040254f78f 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -203,6 +203,18 @@ public function test_revision_list_shows_editor_type()
         $this->withHtml($resp)->assertElementContains('.item-list-row > div:nth-child(2)', 'Markdown)');
     }
 
+    public function test_revision_changes_link_not_shown_for_oldest_revision()
+    {
+        $page = $this->entities->page();
+        $this->createRevisions($page, 3, ['html' => 'new page html']);
+
+        $resp = $this->asAdmin()->get($page->refresh()->getUrl('/revisions'));
+        $html = $this->withHtml($resp);
+
+        $html->assertElementNotExists('.item-list > .item-list-row:last-child a[href*="/changes"]');
+        $html->assertElementContains('.item-list > .item-list-row:nth-child(2)', 'Changes');
+    }
+
     public function test_revision_restore_action_only_visible_with_permission()
     {
         $page = $this->entities->page();

From 304a1d8f917325d3fa3a0ea8894bd3f2c7c8c122 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 16 Mar 2025 12:04:19 +0000
Subject: [PATCH 491/666] Dependancies: Updated PHP composer deps

---
 composer.lock | 469 ++++++++++++++++++++++----------------------------
 1 file changed, 204 insertions(+), 265 deletions(-)

diff --git a/composer.lock b/composer.lock
index 95bc3ae3716..4dfc8ec85a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.339.19",
+            "version": "3.342.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "18f05efe983860ad899082e04c13f06ec9fd6e41"
+                "reference": "2ad93ef447289da27892707efa683c1ae7ced85f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/18f05efe983860ad899082e04c13f06ec9fd6e41",
-                "reference": "18f05efe983860ad899082e04c13f06ec9fd6e41",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ad93ef447289da27892707efa683c1ae7ced85f",
+                "reference": "2ad93ef447289da27892707efa683c1ae7ced85f",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.339.19"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.6"
             },
-            "time": "2025-02-21T19:13:15+00:00"
+            "time": "2025-03-14T18:01:18+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -213,16 +213,16 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.1",
+            "version": "0.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
                 "shasum": ""
             },
             "require": {
@@ -231,7 +231,7 @@
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "5.16.0"
+                "vimeo/psalm": "6.8.8"
             },
             "type": "library",
             "autoload": {
@@ -261,7 +261,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.1"
+                "source": "https://github.com/brick/math/tree/0.12.3"
             },
             "funding": [
                 {
@@ -269,7 +269,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-29T23:19:16+00:00"
+            "time": "2025-02-28T13:11:00+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -1597,16 +1597,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.11.1",
+            "version": "3.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "0f87254688e480fbb521e2a1ac6c11c784ca41af"
+                "reference": "ebbb711871fb261c064cf4c422f5f3c124fe1842"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/0f87254688e480fbb521e2a1ac6c11c784ca41af",
-                "reference": "0f87254688e480fbb521e2a1ac6c11c784ca41af",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/ebbb711871fb261c064cf4c422f5f3c124fe1842",
+                "reference": "ebbb711871fb261c064cf4c422f5f3c124fe1842",
                 "shasum": ""
             },
             "require": {
@@ -1617,7 +1617,7 @@
             "require-dev": {
                 "mockery/mockery": "^1.6",
                 "phpstan/phpstan": "^2.1",
-                "phpunit/phpunit": "^10.0 || ^11.0",
+                "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
             },
@@ -1653,7 +1653,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.11.1"
+                "source": "https://github.com/Intervention/image/tree/3.11.2"
             },
             "funding": [
                 {
@@ -1669,7 +1669,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-02-01T07:28:26+00:00"
+            "time": "2025-02-27T13:08:55+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1740,16 +1740,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.43.2",
+            "version": "v11.44.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21"
+                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/99d1573698abc42222f04d25fcd5b213d0eedf21",
-                "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
+                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
                 "shasum": ""
             },
             "require": {
@@ -1857,7 +1857,7 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.9.4",
+                "orchestra/testbench-core": "^9.11.2",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^2.0",
@@ -1951,7 +1951,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-02-19T21:53:48+00:00"
+            "time": "2025-03-12T14:34:30+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2810,16 +2810,16 @@
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.8.0",
+            "version": "2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13"
+                "reference": "9df2924ca644736c835fc60466a3a60390d334f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/3d5cf8d0543731dfb725ab30e4d7289891991e13",
-                "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/9df2924ca644736c835fc60466a3a60390d334f9",
+                "reference": "9df2924ca644736c835fc60466a3a60390d334f9",
                 "shasum": ""
             },
             "require": {
@@ -2869,9 +2869,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.0"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.1"
             },
-            "time": "2024-12-11T05:05:52+00:00"
+            "time": "2025-02-26T04:37:30+00:00"
         },
         {
             "name": "league/uri",
@@ -4575,16 +4575,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.7",
+            "version": "v0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
                 "shasum": ""
             },
             "require": {
@@ -4648,9 +4648,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
             },
-            "time": "2024-12-10T01:58:33+00:00"
+            "time": "2025-03-16T03:05:19+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -4698,16 +4698,16 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
-                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
+                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
                 "shasum": ""
             },
             "require": {
@@ -4715,25 +4715,22 @@
             },
             "require-dev": {
                 "captainhook/plugin-composer": "^5.3",
-                "ergebnis/composer-normalize": "^2.28.3",
-                "fakerphp/faker": "^1.21",
+                "ergebnis/composer-normalize": "^2.45",
+                "fakerphp/faker": "^1.24",
                 "hamcrest/hamcrest-php": "^2.0",
-                "jangregor/phpstan-prophecy": "^1.0",
-                "mockery/mockery": "^1.5",
+                "jangregor/phpstan-prophecy": "^2.1",
+                "mockery/mockery": "^1.6",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5",
-                "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "ramsey/coding-standard": "^2.0.3",
-                "ramsey/conventional-commits": "^1.3",
-                "vimeo/psalm": "^5.4"
+                "php-parallel-lint/php-parallel-lint": "^1.4",
+                "phpspec/prophecy-phpunit": "^2.3",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "ramsey/coding-standard": "^2.3",
+                "ramsey/conventional-commits": "^1.6",
+                "roave/security-advisories": "dev-latest"
             },
             "type": "library",
             "extra": {
@@ -4771,19 +4768,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.0.0"
+                "source": "https://github.com/ramsey/collection/tree/2.1.0"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-31T21:50:55+00:00"
+            "time": "2025-03-02T04:48:29+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -5077,20 +5064,20 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.8.0",
+            "version": "v4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb"
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/e93acc38f8464cc775a2b8bf09df311d1fdfefcb",
-                "reference": "e93acc38f8464cc775a2b8bf09df311d1fdfefcb",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/8180ec14bef230ec2351cff993d5d2d7ca470ef4",
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0",
+                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
                 "laravel/socialite": "^5.5",
                 "php": "^8.1"
             },
@@ -5147,7 +5134,7 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2025-01-03T09:40:37+00:00"
+            "time": "2025-02-24T19:33:30+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
@@ -5726,16 +5713,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.2.3",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "959a74d044a6db21f4caa6d695648dcb5584cb49"
+                "reference": "aabf79938aa795350c07ce6464dd1985607d95d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/959a74d044a6db21f4caa6d695648dcb5584cb49",
-                "reference": "959a74d044a6db21f4caa6d695648dcb5584cb49",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/aabf79938aa795350c07ce6464dd1985607d95d5",
+                "reference": "aabf79938aa795350c07ce6464dd1985607d95d5",
                 "shasum": ""
             },
             "require": {
@@ -5781,7 +5768,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.2.3"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -5797,7 +5784,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-07T09:39:55+00:00"
+            "time": "2025-02-02T20:27:07+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6099,16 +6086,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.3",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b"
+                "reference": "9f1103734c5789798fefb90e91de4586039003ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b",
-                "reference": "caae9807f8e25a9b43ce8cc6fafab6cf91f0cc9b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f1103734c5789798fefb90e91de4586039003ed",
+                "reference": "9f1103734c5789798fefb90e91de4586039003ed",
                 "shasum": ""
             },
             "require": {
@@ -6193,7 +6180,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.3"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -6209,20 +6196,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-29T07:40:13+00:00"
+            "time": "2025-02-26T11:01:22+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.3",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "2fc3b4bd67e4747e45195bc4c98bea4628476204"
+                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/2fc3b4bd67e4747e45195bc4c98bea4628476204",
-                "reference": "2fc3b4bd67e4747e45195bc4c98bea4628476204",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/87ca22046b78c3feaff04b337f33b38510fd686b",
+                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b",
                 "shasum": ""
             },
             "require": {
@@ -6277,7 +6264,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.3"
+                "source": "https://github.com/symfony/mime/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -6293,7 +6280,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-27T11:08:17+00:00"
+            "time": "2025-02-19T08:51:20+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6933,16 +6920,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.0",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
+                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
-                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
+                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
                 "shasum": ""
             },
             "require": {
@@ -6974,7 +6961,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.0"
+                "source": "https://github.com/symfony/process/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -6990,7 +6977,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T14:24:19+00:00"
+            "time": "2025-02-05T08:33:46+00:00"
         },
         {
             "name": "symfony/routing",
@@ -7245,16 +7232,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v7.2.2",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923"
+                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e2674a30132b7cc4d74540d6c2573aa363f05923",
-                "reference": "e2674a30132b7cc4d74540d6c2573aa363f05923",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a",
+                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a",
                 "shasum": ""
             },
             "require": {
@@ -7320,7 +7307,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.2.2"
+                "source": "https://github.com/symfony/translation/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -7336,7 +7323,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:18:10+00:00"
+            "time": "2025-02-13T10:27:23+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7911,16 +7898,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.17.0",
+            "version": "2.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "075bc0c26631110584175de6523ab3f1652eb28e"
+                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
-                "reference": "075bc0c26631110584175de6523ab3f1652eb28e",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
                 "shasum": ""
             },
             "require": {
@@ -7970,7 +7957,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.17.0"
+                "source": "https://github.com/filp/whoops/tree/2.18.0"
             },
             "funding": [
                 {
@@ -7978,7 +7965,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-25T12:00:00+00:00"
+            "time": "2025-03-15T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8031,6 +8018,47 @@
             },
             "time": "2020-07-09T08:09:16+00:00"
         },
+        {
+            "name": "iamcal/sql-parser",
+            "version": "v0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/iamcal/SQLParser.git",
+                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/644fd994de3b54e5d833aecf406150aa3b66ca88",
+                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88",
+                "shasum": ""
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^1.0",
+                "phpunit/phpunit": "^5|^6|^7|^8|^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "iamcal\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cal Henderson",
+                    "email": "cal@iamcal.com"
+                }
+            ],
+            "description": "MySQL schema parser",
+            "support": {
+                "issues": "https://github.com/iamcal/SQLParser/issues",
+                "source": "https://github.com/iamcal/SQLParser/tree/v0.5"
+            },
+            "time": "2024-03-22T22:46:32+00:00"
+        },
         {
             "name": "itsgoingd/clockwork",
             "version": "v5.3.4",
@@ -8109,34 +8137,34 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.1.0",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312"
+                "reference": "d84d5a3b6536a586899ad6855a3e098473703690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/dbb2dc20e5c8e1ed3ff289054e1955f269187312",
-                "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/d84d5a3b6536a586899ad6855a3e098473703690",
+                "reference": "d84d5a3b6536a586899ad6855a3e098473703690",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^11.15.0 || ^12.0",
-                "illuminate/container": "^11.15.0 || ^12.0",
-                "illuminate/contracts": "^11.15.0 || ^12.0",
-                "illuminate/database": "^11.15.0 || ^12.0",
-                "illuminate/http": "^11.15.0 || ^12.0",
-                "illuminate/pipeline": "^11.15.0 || ^12.0",
-                "illuminate/support": "^11.15.0 || ^12.0",
+                "iamcal/sql-parser": "^0.5.0",
+                "illuminate/console": "^11.41.3 || ^12.0",
+                "illuminate/container": "^11.41.3 || ^12.0",
+                "illuminate/contracts": "^11.41.3 || ^12.0",
+                "illuminate/database": "^11.41.3 || ^12.0",
+                "illuminate/http": "^11.41.3 || ^12.0",
+                "illuminate/pipeline": "^11.41.3 || ^12.0",
+                "illuminate/support": "^11.41.3 || ^12.0",
                 "php": "^8.2",
-                "phpmyadmin/sql-parser": "^5.9.0",
                 "phpstan/phpstan": "^2.1.3"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "laravel/framework": "^11.15.0 || ^12.0",
+                "laravel/framework": "^11.41.3 || ^12.0",
                 "mockery/mockery": "^1.6",
                 "nikic/php-parser": "^5.3",
                 "orchestra/canvas": "^v9.1.3 || ^10.0",
@@ -8190,7 +8218,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.1.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.2.0"
             },
             "funding": [
                 {
@@ -8198,7 +8226,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-20T15:25:15+00:00"
+            "time": "2025-03-14T21:54:26+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8345,20 +8373,20 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.6.1",
+            "version": "v8.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "86f003c132143d5a2ab214e19933946409e0cae7"
+                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/86f003c132143d5a2ab214e19933946409e0cae7",
-                "reference": "86f003c132143d5a2ab214e19933946409e0cae7",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/586cb8181a257a2152b6a855ca8d9598878a1a26",
+                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.16.0",
+                "filp/whoops": "^2.17.0",
                 "nunomaduro/termwind": "^2.3.0",
                 "php": "^8.2.0",
                 "symfony/console": "^7.2.1"
@@ -8368,14 +8396,14 @@
                 "phpunit/phpunit": "<11.5.3 || >=12.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.9.12",
-                "laravel/framework": "^11.39.1",
-                "laravel/pint": "^1.20.0",
-                "laravel/sail": "^1.40.0",
-                "laravel/sanctum": "^4.0.7",
-                "laravel/tinker": "^2.10.0",
-                "orchestra/testbench-core": "^9.9.2",
-                "pestphp/pest": "^3.7.3",
+                "larastan/larastan": "^2.10.0",
+                "laravel/framework": "^11.44.2",
+                "laravel/pint": "^1.21.2",
+                "laravel/sail": "^1.41.0",
+                "laravel/sanctum": "^4.0.8",
+                "laravel/tinker": "^2.10.1",
+                "orchestra/testbench-core": "^9.12.0",
+                "pestphp/pest": "^3.7.4",
                 "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
@@ -8439,7 +8467,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-01-23T13:41:43+00:00"
+            "time": "2025-03-14T22:37:40+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8559,107 +8587,18 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "phpmyadmin/sql-parser",
-            "version": "5.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
-                "reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php80": "^1.16"
-            },
-            "conflict": {
-                "phpmyadmin/motranslator": "<3.0"
-            },
-            "require-dev": {
-                "phpbench/phpbench": "^1.1",
-                "phpmyadmin/coding-standard": "^3.0",
-                "phpmyadmin/motranslator": "^4.0 || ^5.0",
-                "phpstan/extension-installer": "^1.4",
-                "phpstan/phpstan": "^1.12",
-                "phpstan/phpstan-deprecation-rules": "^1.2",
-                "phpstan/phpstan-phpunit": "^1.4",
-                "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "^8.5 || ^9.6",
-                "psalm/plugin-phpunit": "^0.16.1",
-                "vimeo/psalm": "^4.11",
-                "zumba/json-serializer": "~3.0.2"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance",
-                "phpmyadmin/motranslator": "Translate messages to your favorite locale"
-            },
-            "bin": [
-                "bin/highlight-query",
-                "bin/lint-query",
-                "bin/sql-parser",
-                "bin/tokenize-query"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PhpMyAdmin\\SqlParser\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "The phpMyAdmin Team",
-                    "email": "developers@phpmyadmin.net",
-                    "homepage": "https://www.phpmyadmin.net/team/"
-                }
-            ],
-            "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
-            "homepage": "https://github.com/phpmyadmin/sql-parser",
-            "keywords": [
-                "analysis",
-                "lexer",
-                "parser",
-                "query linter",
-                "sql",
-                "sql lexer",
-                "sql linter",
-                "sql parser",
-                "sql syntax highlighter",
-                "sql tokenizer"
-            ],
-            "support": {
-                "issues": "https://github.com/phpmyadmin/sql-parser/issues",
-                "source": "https://github.com/phpmyadmin/sql-parser"
-            },
-            "funding": [
-                {
-                    "url": "https://www.phpmyadmin.net/donate/",
-                    "type": "other"
-                }
-            ],
-            "time": "2025-02-22T20:00:59+00:00"
-        },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.6",
+            "version": "2.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
+                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
-                "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
+                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
                 "shasum": ""
             },
             "require": {
@@ -8704,27 +8643,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-19T15:46:42+00:00"
+            "time": "2025-03-09T09:30:48+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.8",
+            "version": "11.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118"
+                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/418c59fd080954f8c4aa5631d9502ecda2387118",
-                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
+                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.3.1",
+                "nikic/php-parser": "^5.4.0",
                 "php": ">=8.2",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-text-template": "^4.0.1",
@@ -8736,7 +8675,7 @@
                 "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.5.0"
+                "phpunit/phpunit": "^11.5.2"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -8774,7 +8713,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.8"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.9"
             },
             "funding": [
                 {
@@ -8782,7 +8721,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-11T12:34:27+00:00"
+            "time": "2025-02-25T13:26:39+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9031,16 +8970,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.9",
+            "version": "11.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b"
+                "reference": "d42785840519401ed2113292263795eb4c0f95da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b",
-                "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da",
+                "reference": "d42785840519401ed2113292263795eb4c0f95da",
                 "shasum": ""
             },
             "require": {
@@ -9054,14 +8993,14 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.8",
+                "phpunit/php-code-coverage": "^11.0.9",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.2",
-                "sebastian/comparator": "^6.3.0",
+                "sebastian/comparator": "^6.3.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
@@ -9112,7 +9051,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12"
             },
             "funding": [
                 {
@@ -9128,7 +9067,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-21T06:08:50+00:00"
+            "time": "2025-03-07T07:31:03+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9302,16 +9241,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.3.0",
+            "version": "6.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
+                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
-                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
+                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
                 "shasum": ""
             },
             "require": {
@@ -9330,7 +9269,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.2-dev"
+                    "dev-main": "6.3-dev"
                 }
             },
             "autoload": {
@@ -9370,7 +9309,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1"
             },
             "funding": [
                 {
@@ -9378,7 +9317,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-06T10:28:19+00:00"
+            "time": "2025-03-07T06:57:01+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -10238,16 +10177,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.2.3",
+            "version": "v7.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "700a880e5089280c7cf3ca1ccf9d9de6630f5d25"
+                "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/700a880e5089280c7cf3ca1ccf9d9de6630f5d25",
-                "reference": "700a880e5089280c7cf3ca1ccf9d9de6630f5d25",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7",
+                "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7",
                 "shasum": ""
             },
             "require": {
@@ -10285,7 +10224,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.3"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.4"
             },
             "funding": [
                 {
@@ -10301,7 +10240,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-27T11:08:17+00:00"
+            "time": "2025-02-17T15:53:07+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 8a9215ecad16747788dd449f296f845fdbc75f4f Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sun, 16 Mar 2025 12:25:53 +0000
Subject: [PATCH 492/666] Updated translations with latest Crowdin changes
 (#5505)

---
 lang/ar/activities.php    |  30 ++--
 lang/ar/auth.php          |  48 +++---
 lang/ar/common.php        |   8 +-
 lang/ar/components.php    |  26 ++--
 lang/ar/entities.php      | 318 +++++++++++++++++++-------------------
 lang/cs/settings.php      |   2 +-
 lang/et/settings.php      |   2 +-
 lang/fr/activities.php    |  12 +-
 lang/he/settings.php      |   6 +-
 lang/he/validation.php    |   2 +-
 lang/hu/activities.php    |  30 ++--
 lang/hu/auth.php          |  20 +--
 lang/hu/components.php    |   2 +-
 lang/hu/editor.php        |   6 +-
 lang/hu/entities.php      |  10 +-
 lang/hu/errors.php        |   4 +-
 lang/hu/preferences.php   |  14 +-
 lang/it/settings.php      |   2 +-
 lang/ja/activities.php    |  18 +--
 lang/ja/editor.php        |   4 +-
 lang/ja/entities.php      |   6 +-
 lang/ja/settings.php      |  56 +++----
 lang/ko/activities.php    |   2 +-
 lang/ko/editor.php        |   4 +-
 lang/ko/settings.php      |   4 +-
 lang/nb/activities.php    |  12 +-
 lang/nb/editor.php        |   8 +-
 lang/nb/entities.php      |   6 +-
 lang/nb/settings.php      |  40 ++---
 lang/nl/settings.php      |  24 +--
 lang/nn/errors.php        |   2 +-
 lang/pl/activities.php    |   2 +-
 lang/sv/notifications.php |  32 ++--
 lang/tr/activities.php    |  26 ++--
 34 files changed, 394 insertions(+), 394 deletions(-)

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index 22386fd131f..db807b015e4 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'تم حذف Webhook بنجاح',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'تم إنشاء الاستيراد',
+    'import_create_notification' => 'تم رفع الاستيراد بنجاح',
+    'import_run' => 'تم تحديث الاستيراد',
+    'import_run_notification' => 'تم استيراد المحتوى بنجاح',
+    'import_delete' => 'تم حذف الاستيراد',
+    'import_delete_notification' => 'تم الاستيراد بنجاح',
 
     // Users
     'user_create' => 'إنشاء مستخدم',
@@ -101,11 +101,11 @@
     'user_delete_notification' => 'تم إزالة المستخدم بنجاح',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'تم إنشاء رمز واجهة برمجة التطبيقات -API-',
     'api_token_create_notification' => 'تم إنشاء رمز الـ API بنجاح',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'رمز واجهة برمجة التطبيقات المحدث',
     'api_token_update_notification' => 'تم تحديث رمز الـ API بنجاح',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'رمز واجهة برمجة التطبيقات المحذوف',
     'api_token_delete_notification' => 'تم حذف رمز الـ API بنجاح',
 
     // Roles
@@ -128,12 +128,12 @@
     'comment_delete'              => 'تعليق محذوف',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'تم إنشاء قاعدة الفرز',
+    'sort_rule_create_notification' => 'تم إنشاء قاعدة الفرز بنجاح',
+    'sort_rule_update' => 'تم تحديث قاعدة الفرز',
+    'sort_rule_update_notification' => 'تم تحديث قاعدة الفرز بنجاح',
+    'sort_rule_delete' => 'تم حذف قاعدة الفرز',
+    'sort_rule_delete_notification' => 'تم حذف قاعدة الفرز بنجاح',
 
     // Other
     'permissions_update'          => 'تحديث الأذونات',
diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index 0d3b12f8fc6..aa406bcece4 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -87,31 +87,31 @@
     'mfa_setup_reconfigure' => 'إعادة التكوين',
     'mfa_setup_remove_confirmation' => 'هل أنت متأكد من أنك تريد إزالة طريقة المصادقة متعددة العناصر هذه؟',
     'mfa_setup_action' => 'إعداد (تنصيب)',
-    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_backup_codes_usage_limit_warning' => 'لديك أقل من 5 رموز احتياطية متبقية، الرجاء إنشاء وتخزين مجموعة جديدة قبل نفاد الرموز لتجنب إغلاق حسابك.',
     'mfa_option_totp_title' => 'تطبيق الجوال',
     'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق محمول يدعم TOTP مثل Google Authenticator أو Authy أو Microsoft Authenticer.',
     'mfa_option_backup_codes_title' => 'رموز النسخ الاحتياطي',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
-    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
-    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
-    'mfa_gen_backup_codes_download' => 'Download Codes',
-    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
-    'mfa_gen_totp_title' => 'Mobile App Setup',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
-    'mfa_gen_totp_verify_setup' => 'Verify Setup',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
-    'mfa_verify_no_methods' => 'No Methods Configured',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
-    'mfa_verify_use_totp' => 'Verify using a mobile app',
-    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
-    'mfa_verify_backup_code' => 'Backup Code',
-    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
-    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_option_backup_codes_desc' => 'إنشاء مجموعة من رموز النسخ الاحتياطية للاستخدام مرة واحدة و التي سَتُدِخلها عند تسجيل الدخول للتحقق من هويتك. احرص أن تخزينها في مكان آمن.',
+    'mfa_gen_confirm_and_enable' => 'تأكيد وتمكين',
+    'mfa_gen_backup_codes_title' => 'إعداد رموز النسخ الاحتياطي',
+    'mfa_gen_backup_codes_desc' => 'خَزِن قائمة الرموز أدناه في مكان آمن. عند الوصول إلى النظام، ستتمكن من استخدام أحد الرموز كآلية مصادقة ثانية.',
+    'mfa_gen_backup_codes_download' => 'تنزيل الرموز',
+    'mfa_gen_backup_codes_usage_warning' => 'يمكن استخدام كل رمز مرة واحدة فقط',
+    'mfa_gen_totp_title' => 'إعداد تطبيق الجوال',
+    'mfa_gen_totp_desc' => 'لاستخدام المصادقة المتعددة ، ستحتاج إلى تطبيق جوال كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator.-',
+    'mfa_gen_totp_scan' => 'امسح رمز الاستجابة السريعة -QR- أدناه باستخدام تطبيق المصادقة المفضل لديك للبدء.',
+    'mfa_gen_totp_verify_setup' => 'التحقق من الإعداد',
+    'mfa_gen_totp_verify_setup_desc' => 'تحقق أن كل شيء يعمل عن طريق إدخال رمز تم إنشاؤه داخل تطبيق المصادقة الخاص بك في مربع الإدخال أدناه:',
+    'mfa_gen_totp_provide_code_here' => 'أدخل الرمز الذي تم إنشاؤه للتطبيق الخاص بك هنا',
+    'mfa_verify_access' => 'التحقق من الوصول',
+    'mfa_verify_access_desc' => 'يتطلب حساب المستخدم الخاص بك تأكيد هويتك عن طريق مستوى إضافي من التحقق قبل منحك حق الوصول. تحقق استخدام إحدى الطرق التي إعدادها للمتابعة.',
+    'mfa_verify_no_methods' => 'لا توجد طرق معدة',
+    'mfa_verify_no_methods_desc' => 'لم يتم العثور على طرق مصادقة متعددة العوامل لحسابك. ستحتاج إلى إعداد طريقة واحدة على الأقل قبل أن تتمكن من الوصول.',
+    'mfa_verify_use_totp' => 'التحقق باستخدام تطبيق الجوال',
+    'mfa_verify_use_backup_codes' => 'التحقق باستخدام رمز النسخ الاحتياطي',
+    'mfa_verify_backup_code' => 'الرموز الاحتياطية',
+    'mfa_verify_backup_code_desc' => 'أدخل أحد الرموز الاحتياطية المتبقية أدناه:',
+    'mfa_verify_backup_code_enter_here' => 'أدخل الرمز الاحتياطي هنا',
+    'mfa_verify_totp_desc' => 'أدخل الرمز الذي تم إنشاؤه باستخدام تطبيق الجوال الخاص بك، أدناه:',
+    'mfa_setup_login_notification' => 'تم إعداد طريقة الدخول متعددة العوامل، يرجى الآن تسجيل الدخول مرة أخرى باستخدام الطريقة التي تم إعدادها.',
 ];
diff --git a/lang/ar/common.php b/lang/ar/common.php
index 454b36a9448..07576a2505a 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -20,7 +20,7 @@
     'description' => 'الوصف',
     'role' => 'الدور',
     'cover_image' => 'صورة الغلاف',
-    'cover_image_description' => 'يجب أن يكون حجم هذه الصورة تقريبًا 440x250 بكسل، على الرغم من أنه سيتم تحجيمها وقصها بشكل مرن لتناسب واجهة المستخدم في سيناريوهات مختلفة حسب الحاجة، لذا فإن الأبعاد الفعلية للعرض ستختلف.',
+    'cover_image_description' => 'يجب أن يكون حجم هذه الصورة تقريبًا 440 في 250 بكسل، مع أنّه سيتم تحجيمها وقصها بشكل مرن لتناسب واجهة المستخدم في سيناريوهات مختلفة حسب الحاجة، لذا فإن الأبعاد الفعلية للعرض ستختلف.',
 
     // Actions
     'actions' => 'إجراءات',
@@ -48,8 +48,8 @@
     'unfavourite' => 'إزالة من المفضلة',
     'next' => 'التالي',
     'previous' => 'السابق',
-    'filter_active' => 'الفلاتر المفعلة:',
-    'filter_clear' => 'مسح الفلاتر',
+    'filter_active' => 'التصفية المفعلة:',
+    'filter_clear' => 'مسح التصفية',
     'download' => 'تنزيل',
     'open_in_tab' => 'فتح في علامة تبويب',
     'open' => 'فتح',
@@ -109,5 +109,5 @@
     'terms_of_service' => 'اتفاقية شروط الخدمة',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'البحث عن :appName',
 ];
diff --git a/lang/ar/components.php b/lang/ar/components.php
index 211b249eadd..12bc0e58ae9 100644
--- a/lang/ar/components.php
+++ b/lang/ar/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'تحديد صورة',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'قائمة الصور',
+    'image_details' => 'تفاصيل الصورة',
+    'image_upload' => 'تحميل صورة',
+    'image_intro' => 'هنا يمكنك تحديد وإدارة الصور التي تم تحميلها مسبقًا إلى النظام.',
+    'image_intro_upload' => 'تحميل صورة جديدة عن طريق سحب الصورة إلى هذه النافذة، أو باستخدام زر "تحميل صورة" أعلاه.',
     'image_all' => 'الكل',
     'image_all_title' => 'عرض جميع الصور',
     'image_book_title' => 'عرض الصور المرفوعة لهذا الكتاب',
     'image_page_title' => 'عرض الصور المرفوعة لهذه الصفحة',
     'image_search_hint' => 'البحث باستخدام اسم الصورة',
     'image_uploaded' => 'وقت الرفع :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'تم تحميلها من قبل :userName',
+    'image_uploaded_to' => 'تم رفعها إلى :pageLink',
+    'image_updated' => 'تم تحديثها :updatedate',
     'image_load_more' => 'المزيد',
     'image_image_name' => 'اسم الصورة',
     'image_delete_used' => 'هذه الصورة مستخدمة بالصفحات أدناه.',
     'image_delete_confirm_text' => 'هل أنت متأكد من أنك تريد حذف هذه الصورة؟',
     'image_select_image' => 'تحديد الصورة',
     'image_dropzone' => 'قم بإسقاط الصورة أو اضغط هنا للرفع',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'إسقاط صورة أو اضغط هنا للرفع',
     'images_deleted' => 'تم حذف الصور',
     'image_preview' => 'معاينة الصور',
     'image_upload_success' => 'تم رفع الصورة بنجاح',
     'image_update_success' => 'تم تحديث تفاصيل الصورة بنجاح',
     'image_delete_success' => 'تم حذف الصورة بنجاح',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'استبدال صورة',
+    'image_replace_success' => 'تم تحديث الصورة بنجاح',
+    'image_rebuild_thumbs' => 'تجديد تغيرات الحجم',
+    'image_rebuild_thumbs_success' => 'تم إعادة بناء تغيرات حجم الصورة بنجاح!',
 
     // Code Editor
     'code_editor' => 'تعديل الشفرة',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 005b1f714fc..d012ca45944 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -22,15 +22,15 @@
     'meta_created_name' => 'أنشئ :timeLength بواسطة :user',
     'meta_updated' => 'مُحدث :timeLength',
     'meta_updated_name' => 'مُحدث :timeLength بواسطة :user',
-    'meta_owned_name' => 'Owned by :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_owned_name' => 'مملوكة لـ:user',
+    'meta_reference_count' => 'مشار إليه :count مرة|مشار إليه :count مرة',
     'entity_select' => 'اختيار الكيان',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'entity_select_lack_permission' => 'ليس لديك الصلاحيات المطلوبة لتحديد هذا العنصر',
     'images' => 'صور',
     'my_recent_drafts' => 'مسوداتي الحديثة',
     'my_recently_viewed' => 'ما عرضته مؤخراً',
-    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
-    'my_favourites' => 'My Favourites',
+    'my_most_viewed_favourites' => 'مفضلاتي الأكثر مشاهدة',
+    'my_favourites' => 'مفضلاتي',
     'no_pages_viewed' => 'لم تستعرض أي صفحات',
     'no_pages_recently_created' => 'لم تنشأ أي صفحات مؤخراً',
     'no_pages_recently_updated' => 'لم تُحدّث أي صفحات مؤخراً',
@@ -38,43 +38,43 @@
     'export_html' => 'صفحة ويب',
     'export_pdf' => 'ملف PDF',
     'export_text' => 'ملف نص عادي',
-    'export_md' => 'Markdown File',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'export_md' => 'ملف ماركداون -Markdown-',
+    'export_zip' => 'ملف مضغوط -ZIP-',
+    'default_template' => 'قالب الصفحة الافتراضية',
+    'default_template_explain' => 'قم بتعيين قالب صفحة سيتم استخدامه كمحتوى افتراضي لجميع الصفحات التي تم إنشاؤها ضمن هذا العنصر. ضع في اعتبارك أن هذا لن يتم استخدامه إلا إذا كان لدى منشئ الصفحة حق الوصول إلى صفحة القالب المختارة.',
+    'default_template_select' => 'حدد صفحة القالب',
+    'import' => 'استيراد',
+    'import_validate' => 'التحقق من صحة الاستيراد',
+    'import_desc' => 'استيراد الكتب والفصول والصفحات باستخدام تصدير مِلَفّ مضغوط ZIP محمول من نفس النظام أو نظام مختلف. حدد مِلَفّ ZIP للمتابعة. بعد تحميل المِلَفّ والتحقق من صحته، ستتمكن من إعداد وتأكيد الاستيراد في العرض التالي.',
+    'import_zip_select' => 'حدد مِلَفّ مضغوط بصيغة ZIP للتحميل',
+    'import_zip_validation_errors' => 'تم اكتشاف أخطاء في أثناء التحقق من صحة المِلَفّ المضغوط ZIP المقدم:',
+    'import_pending' => 'الاستيرادات المعلقة',
+    'import_pending_none' => 'لم يتم البَدْء في أي عملية استيراد.',
+    'import_continue' => 'متابعة الاستيراد',
+    'import_continue_desc' => 'راجع المحتوى الذي يجب استيراده من المِلَفّ المضغوط ZIP الذي تم تحميله. عندما يكون جاهزًا، تشتغل عملية الاستيراد لإضافة محتوياته إلى هذا النظام. سيتم إزالة مِلَفّ الاستيراد الذي تم تحميله تلقائيًا عند الاستيراد الناجح.',
+    'import_details' => 'تفاصيل الاستيراد',
+    'import_run' => 'تشغيل الاستيراد',
+    'import_size' => 'حجم الاستيراد :size ',
+    'import_uploaded_at' => 'تم تحميلة في  :relativeTime',
+    'import_uploaded_by' => 'رُفِع بواسطة',
+    'import_location' => 'موقع الاستيراد',
+    'import_location_desc' => 'حدد موقعًا مستهدفًا للمحتوى المستورد. ستحتاج إلى الصلاحيات ذات الصلة لإنشاء المحتوى داخل الموقع الذي تختاره.',
+    'import_delete_confirm' => 'متيقِّن من أنك تريد حذف الاستيراد؟',
+    'import_delete_desc' => 'سيؤدي هذا إلى حذف مِلَفّ الاستيراد المضغوط ZIP، ولا يمكن التراجع عنه.',
+    'import_errors' => 'أخطاء الاستيراد',
+    'import_errors_desc' => 'حدثت الأخطاء التالية خلال محاولة الاستيراد:',
 
     // Permissions and restrictions
     'permissions' => 'الأذونات',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
-    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
-    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
+    'permissions_desc' => 'تعيين الصلاحيات هنا لتجاوز الصلاحيات الافتراضية التي توفرها أدوار المستخدم.',
+    'permissions_book_cascade' => 'سيتم نقل الصلاحيات التي تم تعيينها للكتب تلقائيًا إلى الفصول والصفحات الفرعية، ما لم تكن لديها صلاحيات خاصة بها محددة.',
+    'permissions_chapter_cascade' => 'سيتم نقل الصلاحيات التي تم تعيينها على الفصول تلقائيًا إلى الصفحات الفرعية، ما لم تكن لديها صلاحيات خاصة بها محددة.',
     'permissions_save' => 'حفظ الأذونات',
-    'permissions_owner' => 'Owner',
-    'permissions_role_everyone_else' => 'Everyone Else',
-    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
-    'permissions_role_override' => 'Override permissions for role',
-    'permissions_inherit_defaults' => 'Inherit defaults',
+    'permissions_owner' => 'المالك',
+    'permissions_role_everyone_else' => 'الآخرين',
+    'permissions_role_everyone_else_desc' => 'تعيين الصلاحيات لجميع الأدوار التي لم يتم تجاوزها على وجه التحديد.',
+    'permissions_role_override' => 'تجاوز الصلاحيات للدور',
+    'permissions_inherit_defaults' => 'وراثة الإعدادات الافتراضية',
 
     // Search
     'search_results' => 'نتائج البحث',
@@ -94,7 +94,7 @@
     'search_permissions_set' => 'حزمة الأذونات',
     'search_created_by_me' => 'أنشئت بواسطتي',
     'search_updated_by_me' => 'حُدثت بواسطتي',
-    'search_owned_by_me' => 'Owned by me',
+    'search_owned_by_me' => 'مملوكة لي',
     'search_date_options' => 'خيارات التاريخ',
     'search_updated_before' => 'حدثت قبل',
     'search_updated_after' => 'حدثت بعد',
@@ -117,24 +117,24 @@
     'shelves_save' => 'حفظ الرف',
     'shelves_books' => 'كتب على هذا الرف',
     'shelves_add_books' => 'إضافة كتب لهذا الرف',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
+    'shelves_drag_books' => 'اسحب الكتب الموجودة بالأسفل لإضافتها إلى هذا الرف',
     'shelves_empty_contents' => 'لا توجد كتب مخصصة لهذا الرف',
     'shelves_edit_and_assign' => 'تحرير الرف لإدراج كتب',
-    'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
-    'shelves_delete_named' => 'Delete Shelf :name',
-    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_edit_named' => 'تعديل الرف :name',
+    'shelves_edit' => 'تعديل الرف',
+    'shelves_delete' => 'حذف الرف',
+    'shelves_delete_named' => 'حذف الرف :name',
+    'shelves_delete_explain' => "سيؤدي هذا إلى حذف الرف الذي يحمل الاسم ':name'. لن يتم حذف الكتب المضمنة بداخله.",
+    'shelves_delete_confirmation' => 'هل أنت متأكد أنك تريد حذف هذا الرف؟',
+    'shelves_permissions' => 'صلاحيات الرف',
+    'shelves_permissions_updated' => 'تم تحديث صلاحيات الرف',
+    'shelves_permissions_active' => 'صلاحيات الرف نشطة',
+    'shelves_permissions_cascade_warning' => 'لا يتم نقل الصلاحيات الموجودة على الأرفف تلقائيًا إلى الكتب الموجودة في كل رف. وذلك لأن الكتاب يمكن أن يوجد على أرفف متعددة. ومع ذلك، يمكن نسخ الصلاحيات إلى الكتب الفرعية باستخدام الخِيار الموجود أدناه.',
+    'shelves_permissions_create' => 'تُستخدم صلاحيات إنشاء الرفوف فقط لنسخ الصلاحيات إلى الكتب الفرعية باستخدام الإجراء أدناه. ولا تتحكم في القدرة على إنشاء الكتب.',
     'shelves_copy_permissions_to_books' => 'نسخ أذونات الوصول إلى الكتب',
     'shelves_copy_permissions' => 'نسخ الأذونات',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => 'سيؤدي هذا إلى تطبيق إعدادات الصلاحيات الحالية لهذا الرف على جميع الكتب الموجودة بداخله. قبل التنشيط، تأكد من حفظ أي تغييرات على صلاحيات هذا الرف.',
+    'shelves_copy_permission_success' => 'تم نسخ صلاحيات الرف إلى :count كتاب/كتب',
 
     // Books
     'book' => 'كتاب',
@@ -166,9 +166,9 @@
     'books_search_this' => 'البحث في هذا الكتاب',
     'books_navigation' => 'تصفح الكتاب',
     'books_sort' => 'فرز محتويات الكتاب',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'نقل الفصول والصفحات داخل الكتاب لإعادة تنظيم محتوياته. يمكن إضافة كتب أخرى مما يسمح بنقل الفصول والصفحات بسهولة بين الكتب. اختياريًا، يمكن تعيين قاعدة فرز تلقائي لفرز محتويات هذا الكتاب تلقائيًا عند حدوث تغييرات.',
+    'books_sort_auto_sort' => 'خِيار الفرز التلقائي',
+    'books_sort_auto_sort_active' => 'الفرز التلقائي الشَغَّال: :sortName',
     'books_sort_named' => 'فرز كتاب :bookName',
     'books_sort_name' => 'ترتيب حسب الإسم',
     'books_sort_created' => 'ترتيب حسب تاريخ الإنشاء',
@@ -177,19 +177,19 @@
     'books_sort_chapters_last' => 'الفصول الأخيرة',
     'books_sort_show_other' => 'عرض كتب أخرى',
     'books_sort_save' => 'حفظ الترتيب الجديد',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
-    'books_copy' => 'Copy Book',
-    'books_copy_success' => 'Book successfully copied',
+    'books_sort_show_other_desc' => 'أضف كتبًا أخرى هنا لتضمينها في عملية الفرز، والسماح بإعادة تنظيم الكتب بسهولة.',
+    'books_sort_move_up' => 'حرك للأعلى',
+    'books_sort_move_down' => 'حرك للأسفل',
+    'books_sort_move_prev_book' => 'نقل للكتاب السابق',
+    'books_sort_move_next_book' => 'نقل للكتاب التالي',
+    'books_sort_move_prev_chapter' => 'نقل إلى الفصل السابق',
+    'books_sort_move_next_chapter' => 'نقل إلى الفصل التالي',
+    'books_sort_move_book_start' => 'نقل إلى بداية الكتاب',
+    'books_sort_move_book_end' => 'نقل إلى نهاية الكتاب',
+    'books_sort_move_before_chapter' => 'نقل إلى الفصل السابق',
+    'books_sort_move_after_chapter' => 'نقل إلى الفصل التالي',
+    'books_copy' => 'نسخة الكتاب',
+    'books_copy_success' => 'تم نسخ الكتاب بنجاح',
 
     // Chapters
     'chapter' => 'فصل',
@@ -200,21 +200,21 @@
     'chapters_create' => 'إنشاء فصل جديد',
     'chapters_delete' => 'حذف الفصل',
     'chapters_delete_named' => 'حذف فصل :chapterName',
-    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
+    'chapters_delete_explain' => 'سيؤدي هذا إلى حذف الفصل الذي يحمل الاسم \':chapterName\'. كما سيتم حذف جميع الصفحات الموجودة داخل هذا الفصل.',
     'chapters_delete_confirm' => 'تأكيد حذف الفصل؟',
     'chapters_edit' => 'تعديل الفصل',
     'chapters_edit_named' => 'تعديل فصل :chapterName',
     'chapters_save' => 'حفظ الفصل',
     'chapters_move' => 'نقل الفصل',
     'chapters_move_named' => 'نقل فصل :chapterName',
-    'chapters_copy' => 'Copy Chapter',
-    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_copy' => 'نسخ الفصل',
+    'chapters_copy_success' => 'تم نسخ الفصل بنجاح',
     'chapters_permissions' => 'أذونات الفصل',
     'chapters_empty' => 'لا توجد أي صفحات في هذا الفصل حالياً',
     'chapters_permissions_active' => 'أذونات الفصل مفعلة',
     'chapters_permissions_success' => 'تم تحديث أذونات الفصل',
     'chapters_search_this' => 'البحث في هذا الفصل',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter_sort_book' => 'فرز الكتاب',
 
     // Pages
     'page' => 'صفحة',
@@ -230,7 +230,7 @@
     'pages_delete_draft' => 'حذف المسودة',
     'pages_delete_success' => 'تم حذف الصفحة',
     'pages_delete_draft_success' => 'تم حذف المسودة',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'هذه الصفحة قيد الاستخدام كقالب افتراضي لصفحات الكتب أو الفصول. لن يكون لهذه الكتب أو الفصول قالب افتراضي بعد حذفها.',
     'pages_delete_confirm' => 'تأكيد حذف الصفحة؟',
     'pages_delete_draft_confirm' => 'تأكيد حذف المسودة؟',
     'pages_editing_named' => ':pageName قيد التعديل',
@@ -241,23 +241,23 @@
     'pages_editing_page' => 'الصفحة قيد التعديل',
     'pages_edit_draft_save_at' => 'تم خفظ المسودة في ',
     'pages_edit_delete_draft' => 'حذف المسودة',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'متيقِّن من رغبتك في حذف تغييرات صفحة المُسَوَّدَة؟ ستُفقد جميع تغييراتك، منذ آخر حفظ كامل، وسيتم تحديث المحرر بأحدث حالة حفظ للصفحة (غير مسودة).',
     'pages_edit_discard_draft' => 'التخلص من المسودة',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_markdown' => 'التبديل إلى محرر ماركداون -Markdown-',
+    'pages_edit_switch_to_markdown_clean' => '(محتوى نظيف)',
+    'pages_edit_switch_to_markdown_stable' => '(محتوى مستقر)',
+    'pages_edit_switch_to_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه -WYSIWYG-',
+    'pages_edit_switch_to_new_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه الجديد -new WYSIWYG-',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(في اختبار ألف)',
     'pages_edit_set_changelog' => 'تثبيت سجل التعديل',
     'pages_edit_enter_changelog_desc' => 'ضع وصف مختصر للتعديلات التي تمت',
     'pages_edit_enter_changelog' => 'أدخل سجل التعديل',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_title' => 'تبديل المحرر',
+    'pages_editor_switch_are_you_sure' => 'متيقِّن أنك تريد تغيير المحرر لهذه الصفحة؟',
+    'pages_editor_switch_consider_following' => 'عند تغيير المحررين، ضع في اعتبارك ما يلي:',
+    'pages_editor_switch_consideration_a' => 'بمجرد الحفظ، سيتم استخدام خِيار المحرر الجديد بواسطة أي محررين مستقبليين، بما في ذلك أولئك الذين قد لا يتمكنون من تغيير نوع المحرر بأنفسهم.',
+    'pages_editor_switch_consideration_b' => 'من الممكن أن يؤدي هذا إلى فقدان التفاصيل والنحو في ظروف معينة.',
+    'pages_editor_switch_consideration_c' => 'لن تستمر تغييرات العلامة أو سجل التغييرات، التي تم إجراؤها منذ الحفظ الأخير، عبر هذا التغيير.',
     'pages_save' => 'حفظ الصفحة',
     'pages_title' => 'عنوان الصفحة',
     'pages_name' => 'اسم الصفحة',
@@ -266,10 +266,10 @@
     'pages_md_insert_image' => 'إدخال صورة',
     'pages_md_insert_link' => 'إدراج ارتباط الكيان',
     'pages_md_insert_drawing' => 'إدخال رسمة',
-    'pages_md_show_preview' => 'Show preview',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_md_show_preview' => 'عرض المعاينة',
+    'pages_md_sync_scroll' => 'مزامنة معاينة التمرير',
+    'pages_drawing_unsaved' => 'تم العثور على رسم غير محفوظ',
+    'pages_drawing_unsaved_confirm' => 'تم العثور على بيانات رسم غير محفوظة من محاولة حفظ رسم سابقة فاشلة. هل ترغب في استعادة هذا الرسم غير المحفوظ ومواصلة تحريره؟',
     'pages_not_in_chapter' => 'صفحة ليست في فصل',
     'pages_move' => 'نقل الصفحة',
     'pages_copy' => 'نسخ الصفحة',
@@ -279,17 +279,17 @@
     'pages_permissions_success' => 'تم تحديث أذونات الصفحة',
     'pages_revision' => 'مراجعة',
     'pages_revisions' => 'مراجعات الصفحة',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => 'تجد أدناه جميع الإصدارات السابقة لهذه الصفحة. يمكنك الاطلاع عليها ومقارنتها واستعادة الإصدارات القديمة إذا سمحت الصلاحيات بذلك. قد لا يظهر تاريخ الصفحة بالكامل هنا، إذ قد تُحذف الإصدارات القديمة تلقائيًا، وذلك حسب إعدادات النظام.',
     'pages_revisions_named' => 'مراجعات صفحة :pageName',
     'pages_revision_named' => 'مراجعة صفحة :pageName',
-    'pages_revision_restored_from' => 'Restored from #:id; :summary',
+    'pages_revision_restored_from' => 'تم الاستعادة من #:id; :summary',
     'pages_revisions_created_by' => 'أنشئ بواسطة',
     'pages_revisions_date' => 'تاريخ المراجعة',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => 'رَقْم المراجعة',
     'pages_revisions_numbered' => 'مراجعة #:id',
     'pages_revisions_numbered_changes' => 'مراجعة #: رقم تعريفي التغييرات',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_editor' => 'نوع المحرر',
     'pages_revisions_changelog' => 'سجل التعديل',
     'pages_revisions_changes' => 'التعديلات',
     'pages_revisions_current' => 'النسخة الحالية',
@@ -297,20 +297,20 @@
     'pages_revisions_restore' => 'استرجاع',
     'pages_revisions_none' => 'لا توجد مراجعات لهذه الصفحة',
     'pages_copy_link' => 'نسخ الرابط',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_edit_content_link' => 'انتقل إلى القسم في المحرر',
+    'pages_pointer_enter_mode' => 'أدخل وضع اختيار القسم',
+    'pages_pointer_label' => 'خيارات قسم الصفحة',
+    'pages_pointer_permalink' => 'رابط دائم لقسم الصفحة',
+    'pages_pointer_include_tag' => 'قسم الصفحة يتضمن العلامة',
+    'pages_pointer_toggle_link' => 'وضع الرابط الدائم، اضغط لإظهار علامة التضمين',
+    'pages_pointer_toggle_include' => 'تضمين وضع العلامة، اضغط لإظهار الرابط الدائم',
     'pages_permissions_active' => 'أذونات الصفحة مفعلة',
     'pages_initial_revision' => 'نشر مبدئي',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_references_update_revision' => 'التحديث التلقائي للنظام للروابط الداخلية',
     'pages_initial_name' => 'صفحة جديدة',
     'pages_editing_draft_notification' => 'جارٍ تعديل مسودة لم يتم حفظها من :timeDiff.',
     'pages_draft_edited_notification' => 'تم تحديث هذه الصفحة منذ ذلك الوقت. من الأفضل التخلص من هذه المسودة.',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_page_changed_since_creation' => 'تم تحديث هذه الصفحة منذ إنشاء هذه المُسَوَّدَة. يُنصح بتجاهل هذه المُسَوَّدَة أو الحرص على عدم استبدال أي تغييرات في الصفحة.',
     'pages_draft_edit_active' => [
         'start_a' => ':count من المستخدمين بدأوا بتعديل هذه الصفحة',
         'start_b' => ':userName بدأ بتعديل هذه الصفحة',
@@ -318,44 +318,44 @@
         'time_b' => 'في آخر :minCount دقيقة/دقائق',
         'message' => 'وقت البدء: احرص على عدم الكتابة فوق تحديثات بعضنا البعض!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => 'تم رفض المُسَوَّدَة! تم تحديث المحرر بمحتوى الصفحة الحالي.',
+    'pages_draft_deleted' => 'تم حذف المُسَوَّدَة! تم تحديث المحرر بمحتوى الصفحة الحالي.',
     'pages_specific' => 'صفحة محددة',
     'pages_is_template' => 'قالب الصفحة',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'تبديل الشريط الجانبي',
     'page_tags' => 'وسوم الصفحة',
     'chapter_tags' => 'وسوم الفصل',
     'book_tags' => 'وسوم الكتاب',
     'shelf_tags' => 'علامات الرف',
     'tag' => 'وسم',
     'tags' =>  'وسوم',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => 'يمكن تطبيق الوسوم على المحتوى داخل النظام لتطبيق تصنيف مرن. يمكن أن تحتوي الوسوم على مفتاح وقيمة، مع العلم أن القيمة اختيارية. بعد تطبيقها، يمكن الاستعلام عن المحتوى باستخدام اسم الوسم وقيمته.',
     'tag_name' =>  'اسم العلامة',
     'tag_value' => 'قيمة الوسم (اختياري)',
     'tags_explain' => "إضافة الوسوم تساعد بترتيب وتقسيم المحتوى. \n من الممكن وضع قيمة لكل وسم لترتيب أفضل وأدق.",
     'tags_add' => 'إضافة وسم آخر',
     'tags_remove' => 'إزالة هذه العلامة',
-    'tags_usages' => 'Total tag usages',
-    'tags_assigned_pages' => 'Assigned to Pages',
-    'tags_assigned_chapters' => 'Assigned to Chapters',
-    'tags_assigned_books' => 'Assigned to Books',
-    'tags_assigned_shelves' => 'Assigned to Shelves',
-    'tags_x_unique_values' => ':count unique values',
-    'tags_all_values' => 'All values',
-    'tags_view_tags' => 'View Tags',
-    'tags_view_existing_tags' => 'View existing tags',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'tags_usages' => 'إجمالي استخدامات العلامة',
+    'tags_assigned_pages' => 'مُخصصة للصفحات',
+    'tags_assigned_chapters' => 'مُخصصة للفصول',
+    'tags_assigned_books' => 'مُخصص للكتب',
+    'tags_assigned_shelves' => 'مُخصصة للأرفف',
+    'tags_x_unique_values' => 'قيم الفريدة :count',
+    'tags_all_values' => 'جميع القيم',
+    'tags_view_tags' => 'عرض العلامات',
+    'tags_view_existing_tags' => 'عرض العلامات الموجودة',
+    'tags_list_empty_hint' => 'يمكن تعيين العلامات بواسطة الشريط الجانبي لمحرر الصفحة أو خلال تحرير تفاصيل الكتاب أو الفصل أو الرف.',
     'attachments' => 'المرفقات',
     'attachments_explain' => 'ارفع بعض الملفات أو أرفق بعض الروابط لعرضها بصفحتك. ستكون الملفات والروابط معروضة في الشريط الجانبي للصفحة.',
     'attachments_explain_instant_save' => 'سيتم حفظ التغييرات هنا آنيا.',
     'attachments_upload' => 'رفع ملف',
     'attachments_link' => 'إرفاق رابط',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => 'وبدلاً من ذلك، يمكنك سحب المِلَفّ وإفلاته هنا لتحميله كمرفق.',
     'attachments_set_link' => 'تحديد الرابط',
     'attachments_delete' => 'هل أنت متأكد من أنك تريد حذف هذا المرفق؟',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'قم بإسقاط الملفات هنا للتحميل',
     'attachments_no_files' => 'لم تُرفع أي ملفات',
     'attachments_explain_link' => 'بالإمكان إرفاق رابط في حال عدم تفضيل رفع ملف. قد يكون الرابط لصفحة أخرى أو لملف في أحد خدمات التخزين السحابي.',
     'attachments_link_name' => 'اسم الرابط',
@@ -398,13 +398,13 @@
     'comment_new' => 'تعليق جديد',
     'comment_created' => 'تم التعليق :createDiff',
     'comment_updated' => 'تم التحديث :updateDiff بواسطة :username',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => 'تم التحديث',
     'comment_deleted_success' => 'تم حذف التعليق',
     'comment_created_success' => 'تمت إضافة التعليق',
     'comment_updated_success' => 'تم تحديث التعليق',
     'comment_delete_confirm' => 'تأكيد حذف التعليق؟',
     'comment_in_reply_to' => 'رداً على :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_editor_explain' => 'هذه هي التعليقات المُضافة على هذه الصفحة. يُمكنك إضافة التعليقات وإدارتها عند عرض الصفحة المحفوظة.',
 
     // Revision
     'revision_delete_confirm' => 'هل أنت متأكد من أنك تريد حذف هذه المراجعة؟',
@@ -412,49 +412,49 @@
     'revision_cannot_delete_latest' => 'لايمكن حذف آخر مراجعة.',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => 'يرجى مراعاة ما يلي عند نسخ المحتوى.',
+    'copy_consider_permissions' => 'لن يتم نسخ إعدادات الصلاحيات المخصصة.',
+    'copy_consider_owner' => 'سوف تصبح مالكًا لجميع المحتوى المنسوخ.',
+    'copy_consider_images' => 'لن يتم تكرار ملفات صور الصفحة وستحتفظ الصور الأصلية بعلاقتها بالصفحة التي تم تحميلها إليها في الأصل.',
+    'copy_consider_attachments' => 'لن يتم نسخ مرفقات الصفحة.',
+    'copy_consider_access' => 'قد يؤدي تغيير الموقع أو المالك أو الصلاحيات إلى إمكانية وصول الأشخاص الذين لم يتمكنوا من الوصول إلى هذا المحتوى سابقًا.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => 'تحويل إلى رف',
+    'convert_to_shelf_contents_desc' => 'يمكنك تحويل هذا الكتاب إلى رف جديد بنفس المحتويات. سيتم تحويل الفصول الموجودة فيه إلى كتب جديدة. إذا احتوى هذا الكتاب على أي صفحات غير موجودة في أي فصل، فسيتم إعادة تسمية الكتاب وإضافة هذه الصفحات إليه، وسيصبح جزءًا من الرف الجديد.',
+    'convert_to_shelf_permissions_desc' => 'سيتم نسخ أي صلاحيات مُحددة لهذا الكتاب إلى الرف الجديد وإلى جميع الكتب الفرعية الجديدة التي لم تُطبّق عليها صلاحيات خاصة بها. يُرجى العلم بأن الصلاحيات على الرفوف لا تنتقل تلقائيًا إلى المحتوى داخلها، كما هو الحال مع الكتب.',
+    'convert_book' => 'تحويل الكتاب',
+    'convert_book_confirm' => 'هل أنت متيقِّن أنك تريد تحويل هذا الكتاب؟',
+    'convert_undo_warning' => 'لا يمكن التراجع عن هذا الأمر بسهولة.',
+    'convert_to_book' => 'تحويله إلى كتاب',
+    'convert_to_book_desc' => 'يمكنك تحويل هذا الفصل إلى كتاب جديد بنفس المحتوى. سيتم نسخ أي صلاحيات مُعيّنة لهذا الفصل إلى الكتاب الجديد، ولكن لن يتم نسخ أي صلاحيات موروثة من الكتاب الأصلي، مما قد يؤدي إلى تغيير في التحكم في الوصول.',
+    'convert_chapter' => 'تحويل الفصل',
+    'convert_chapter_confirm' => 'هل أنت متيقِّن أنك تريد تحويل هذا الفصل؟',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'مراجع',
+    'references_none' => 'لا توجد مراجع متعقبة لهذا العنصر.',
+    'references_to_desc' => 'تجد أدناه كل المحتوى المعروف في النظام المرتبط بهذا العنصر.',
 
     // Watch Options
-    'watch' => 'Watch',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch' => 'شاهد',
+    'watch_title_default' => 'التفضيلات الافتراضية',
+    'watch_desc_default' => 'استعادة المشاهدة إلى تفضيلات الإشعارات الافتراضية فقط.',
+    'watch_title_ignore' => 'تجاهل',
+    'watch_desc_ignore' => 'تجاهل كافة الإشعارات، بما في ذلك تلك الواردة من تفضيلات مستوى المستخدم.',
+    'watch_title_new' => 'صفحات جديدة',
+    'watch_desc_new' => 'إعلام عند إنشاء أي صفحة جديدة ضمن هذا العنصر.',
+    'watch_title_updates' => 'جميع تحديثات الصفحة',
+    'watch_desc_updates' => 'إشعار بجميع الصفحات الجديدة والتغييرات في الصفحات.',
+    'watch_desc_updates_page' => 'إشعار عند حدوث أي تغييرات في الصفحة.',
+    'watch_title_comments' => 'جميع تحديثات الصفحة والتعليقات',
+    'watch_desc_comments' => 'إشعار بجميع الصفحات الجديدة، وتغييرات الصفحات والتعليقات الجديدة.',
+    'watch_desc_comments_page' => 'إشعار عند حدوث تغييرات في الصفحة أو تعليقات جديدة.',
+    'watch_change_default' => 'تغيير تفضيلات الإشعارات الافتراضية',
+    'watch_detail_ignore' => 'تجاهل الإشعارات',
+    'watch_detail_new' => 'ترقب الصفحات الجديدة',
+    'watch_detail_updates' => 'مشاهدة الصفحات الجديدة والتحديثات',
+    'watch_detail_comments' => 'مشاهدة الصفحات الجديدة والتحديثات والتعليقات',
     'watch_detail_parent_book' => 'Watching via parent book',
     'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
     'watch_detail_parent_chapter' => 'Watching via parent chapter',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index ab316a7c40c..e4708f6b9eb 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -90,7 +90,7 @@
     'sort_rule_details' => 'Podrobnosti pravidla pro řazení',
     'sort_rule_details_desc' => 'Nastavte název pro toto pravidlo, který se zobrazí v seznamu při výběru řazení.',
     'sort_rule_operations' => 'Možnosti řazení',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => 'Přesunem ze seznamu dostupných operací nastavte akce řazení, které mají být provedeny. Operace se použijí v pořadí od shora dolů. Veškeré změny zde provedené budou při uložení aplikovány na všechny přiřazené knihy.',
     'sort_rule_available_operations' => 'Dostupné operace',
     'sort_rule_available_operations_empty' => 'Žádné zbývající operace',
     'sort_rule_configured_operations' => 'Konfigurované operace',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 0a81c74b8a5..bfb8a51ac67 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -90,7 +90,7 @@
     'sort_rule_details' => 'Sorteerimisreegli andmed',
     'sort_rule_details_desc' => 'Määra sorteerimisreegli nimi, mida kasutatakse reegli valimise loendites.',
     'sort_rule_operations' => 'Sorteerimistoimingud',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => 'Seadista sorteerimistoimingud, liigutades neid saadaval toimingute loendist. Toimingud rakendatakse järjest, ülevalt alla. Siin tehtud muudatused rakenduvad salvestamisel kõigile määratud raamatutele.',
     'sort_rule_available_operations' => 'Saadaval toimingud',
     'sort_rule_available_operations_empty' => 'Rohkem toiminguid pole',
     'sort_rule_configured_operations' => 'Seadistatud toimingud',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index 3b1fe2e42b5..b65134a2409 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -128,12 +128,12 @@
     'comment_delete'              => 'Commentaire supprimé',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'règle de tri crée',
+    'sort_rule_create_notification' => 'Règle de tri crée avec succès',
+    'sort_rule_update' => 'règle de tri mise à jour',
+    'sort_rule_update_notification' => 'Règle de tri mise à jour avec succès',
+    'sort_rule_delete' => 'règle de tri supprimée',
+    'sort_rule_delete_notification' => 'La règle de tri a été supprimée avec succès',
 
     // Other
     'permissions_update'          => 'a mis à jour les autorisations sur',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index 1fd21292598..0e7efe048f4 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -170,7 +170,7 @@
     'roles_x_users_assigned' => ':count user assigned|:count users assigned',
     'roles_x_permissions_provided' => ':count permission|:count permissions',
     'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_permissions_provided' => 'הרשאות שהוקצו',
     'role_create' => 'צור תפקיד משתמש חדש',
     'role_delete' => 'מחק תפקיד',
     'role_delete_confirm' => 'פעולה זו תמחק את התפקיד: :roleName',
@@ -193,8 +193,8 @@
     'role_manage_settings' => 'ניהול הגדרות יישום',
     'role_export_content' => 'Export content',
     'role_import_content' => 'Import content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_editor_change' => 'שנה עורך עמודים',
+    'role_notifications' => 'ניהול התראות',
     'role_asset' => 'הרשאות משאבים',
     'roles_system_warning' => 'שימו לב לכך שגישה לכל אחת משלושת ההרשאות הנ"ל יכולה לאפשר למשתמש לשנות את הפריווילגיות שלהם או של אחרים במערכת. הגדירו תפקידים להרשאות אלה למשתמשים בהם אתם בוטחים בלבד.',
     'role_asset_desc' => 'הרשאות אלו שולטות בגישת ברירת המחדל למשאבים בתוך המערכת. הרשאות של ספרים, פרקים ודפים יגברו על הרשאות אלו.',
diff --git a/lang/he/validation.php b/lang/he/validation.php
index d7c12678365..2d4f8b30598 100644
--- a/lang/he/validation.php
+++ b/lang/he/validation.php
@@ -15,7 +15,7 @@
     'alpha_dash'           => 'שדה :attribute יכול להכיל אותיות, מספרים ומקפים בלבד.',
     'alpha_num'            => 'שדה :attribute יכול להכיל אותיות ומספרים בלבד.',
     'array'                => 'שדה :attribute חייב להיות מערך.',
-    'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'backup_codes'         => 'קוד שהוזן לא תקין או שכבר השתמשו בו.',
     'before'               => 'שדה :attribute חייב להיות תאריך לפני :date.',
     'between'              => [
         'numeric' => 'שדה :attribute חייב להיות בין :min ל-:max.',
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index 548488c40f2..43683930bea 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -30,7 +30,7 @@
     // Books
     'book_create'                 => 'létrehozott egy könyvet',
     'book_create_notification'    => 'Könyv sikeresen létrehozva',
-    'book_create_from_chapter'              => 'fejezet könyvvé alakítva',
+    'book_create_from_chapter'              => 'könyvvé alakította a fejezetet',
     'book_create_from_chapter_notification' => 'Fejezet sikeresen könyvvé lett alakítva',
     'book_update'                 => 'frissítette a könyvet',
     'book_update_notification'    => 'Könyv sikeresen frissítve',
@@ -93,31 +93,31 @@
     'import_delete_notification' => 'Import successfully deleted',
 
     // Users
-    'user_create' => 'felhasználó létrehozása',
+    'user_create' => 'létrehozta a felhasználót',
     'user_create_notification' => 'Felhasználó sikeresen létrehozva',
-    'user_update' => 'felhasználó módosítása',
+    'user_update' => 'frissítette a felhasználót',
     'user_update_notification' => 'Felhasználó sikeresen frissítve',
     'user_delete' => 'felhasználót törölt',
     'user_delete_notification' => 'Felhasználó sikeresen eltávolítva',
 
     // API Tokens
-    'api_token_create' => 'létrehozott API token',
+    'api_token_create' => 'létrehozta az API tokent',
     'api_token_create_notification' => 'API token sikeresen létrehozva',
-    'api_token_update' => 'frissített API token',
+    'api_token_update' => 'frissítette az API tokent',
     'api_token_update_notification' => 'API token sikeresen frissítve',
-    'api_token_delete' => 'törölt API token',
+    'api_token_delete' => 'törölte az API tokent',
     'api_token_delete_notification' => 'API token sikeresen törölve',
 
     // Roles
     'role_create' => 'szerepkört hozott létre',
     'role_create_notification' => 'Szerepkör sikeresen létrehozva',
-    'role_update' => 'frissített szerepkör',
+    'role_update' => 'frissítette a szerepkört',
     'role_update_notification' => 'Szerepkör sikeresen frissítve',
-    'role_delete' => 'törölt szerepkör',
+    'role_delete' => 'törölte a szerepkört',
     'role_delete_notification' => 'Szerepkör sikeresen törölve',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'lomtár kiürítve',
+    'recycle_bin_empty' => 'kiürítette a lomtárat',
     'recycle_bin_restore' => 'lomtárból visszaállítva',
     'recycle_bin_destroy' => 'lomtárból törölve',
 
@@ -128,12 +128,12 @@
     'comment_delete'              => 'megjegyzés törlése',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'létrehozta a rendezési szabályt',
+    'sort_rule_create_notification' => 'Rendezési szabály sikeresen létrehozva',
+    'sort_rule_update' => 'frissítette a rendezési szabályt',
+    'sort_rule_update_notification' => 'Rendezési szabály sikeresen frissítve',
+    'sort_rule_delete' => 'törölte a rendezési szabályt',
+    'sort_rule_delete_notification' => 'Rendezési szabály sikeresen törölve',
 
     // Other
     'permissions_update'          => 'engedélyek frissítve',
diff --git a/lang/hu/auth.php b/lang/hu/auth.php
index db065453ec3..90669e2fba2 100644
--- a/lang/hu/auth.php
+++ b/lang/hu/auth.php
@@ -24,7 +24,7 @@
     'password_hint' => 'Legalább 8 karakter hosszú legyen',
     'forgot_password' => 'Elfelejtett jelszó?',
     'remember_me' => 'Emlékezzen rám',
-    'ldap_email_hint' => 'Adjon meg egy e-mail címet amelyet a felhasználói fiókhoz szeretne használni.',
+    'ldap_email_hint' => 'A fiókhoz használt email cím megadása.',
     'create_account' => 'Fiók létrehozása',
     'already_have_account' => 'Rendelkezik már felhasználói fiókkal?',
     'dont_have_account' => 'Még nincs felhasználói fiókja?',
@@ -33,7 +33,7 @@
     'social_registration_text' => 'Regisztráció és bejelentkezés másik szolgáltatással.',
 
     'register_thanks' => 'Köszönjük a regisztrációt!',
-    'register_confirm' => 'Ellenőrizni kell a megadott email címet és a megerősítő gombra kell kattintani :appName eléréséhez.',
+    'register_confirm' => 'Ellenőrizze a megadott e-mail címet, és kattintson a megerősítő gombra :appName eléréséhez.',
     'registrations_disabled' => 'A regisztráció jelenleg le van tiltva',
     'registration_email_domain_invalid' => 'Ebből az email tartományról nem lehet hozzáférni ehhez az alkalmazáshoz',
     'register_success' => 'Köszönjük a regisztrációt! A regisztráció és a bejelentkezés megtörtént.',
@@ -45,28 +45,28 @@
 
     // Password Reset
     'reset_password' => 'Jelszó visszaállítása',
-    'reset_password_send_instructions' => 'Meg kell adni az email címet amire egy jelszó visszaállító hivatkozás lesz elküldve.',
+    'reset_password_send_instructions' => 'Adja meg az e-mail címet, amire a jelszó-visszaállító linket küldjük.',
     'reset_password_send_button' => 'Visszaállító hivatkozás elküldése',
     'reset_password_sent' => 'A jelszó-visszaállító linket e-mailben fogjuk elküldeni a(z) :email címre, ha beállításra került a rendszerben.',
     'reset_password_success' => 'A jelszó sikeresen visszaállítva.',
     'email_reset_subject' => ':appName jelszó visszaállítása',
-    'email_reset_text' => 'Ezt az emailt azért küldtük mert egy jelszó visszaállításra vonatkozó kérést kaptunk ebből a fiókból.',
-    'email_reset_not_requested' => 'Ha nem történt jelszó visszaállításra vonatkozó kérés, akkor nincs szükség további intézkedésre.',
+    'email_reset_text' => 'Ezt az e-mailt azért küldtük, mert egy jelszó-visszaállításra vonatkozó kérést kaptunk ebből a fiókból.',
+    'email_reset_not_requested' => 'Ha nem Ön kérte a jelszó visszaállítását, akkor nincs szükség további intézkedésre.',
 
     // Email Confirmation
     'email_confirm_subject' => ':appName alkalmazásban beállított email címet meg kell erősíteni',
     'email_confirm_greeting' => ':appName köszöni a csatlakozást!',
     'email_confirm_text' => 'Az email címet a lenti gombra kattintva lehet megerősíteni:',
     'email_confirm_action' => 'Email megerősítése',
-    'email_confirm_send_error' => 'Az email megerősítés kötelező, de a rendszer nem tudta elküldeni az emailt. Fel kell venni a kapcsolatot az adminisztrátorral és meg kell győződni róla, hogy az email beállítások megfelelőek.',
-    'email_confirm_success' => 'Az e-mail címed sikeresen meg lett erősítve, most már be tudsz jelentkezni az e-mail címed használatával.',
-    'email_confirm_resent' => 'Megerősítő email újraküldve. Ellenőrizni kell a bejövő üzeneteket.',
+    'email_confirm_send_error' => 'Az e-mail megerősítés kötelező, de a rendszer nem tudta elküldeni az e-mailt. Keresse fel az adminisztrátort, és gondoskodjon róla, hogy az e-mail helyesen van beállítva.',
+    'email_confirm_success' => 'Az Ön e-mail címe sikeresen meg lett erősítve, most már be tud jelentkezni az e-mail címe használatával.',
+    'email_confirm_resent' => 'Megerősítő e-mail újraküldve. Ellenőrizze a bejövő üzeneteit!',
     'email_confirm_thanks' => 'Köszönjük a megerősítést!',
-    'email_confirm_thanks_desc' => 'Kérlek, várj egy pillanatot, amíg a megerősítésedet kezeljük. Ha nem kerülsz átirányításra 3 másodperc után, kattints a "Folytatás" linkre az alábbiakban a továbbhaladáshoz.',
+    'email_confirm_thanks_desc' => 'Kérjük, várjon egy pillanatot, amíg a megerősítést kezeljük. Ha nem kerül átirányításra 3 másodperc után, kattintson a lenti "Folytatás" linkre a továbbhaladáshoz.',
 
     'email_not_confirmed' => 'Az email cím nincs megerősítve',
     'email_not_confirmed_text' => 'Az email cím még nincs megerősítve.',
-    'email_not_confirmed_click_link' => 'Rá kell kattintani a regisztráció után nem sokkal elküldött emailben található hivatkozásra.',
+    'email_not_confirmed_click_link' => 'Kattintson a regisztráció után nem sokkal elküldött e-mailben található hivatkozásra.',
     'email_not_confirmed_resend' => 'Ha nem érkezik meg a megerősítő email, a lenti űrlap beküldésével újra lehet küldeni.',
     'email_not_confirmed_resend_button' => 'Megerősítő email újraküldése',
 
diff --git a/lang/hu/components.php b/lang/hu/components.php
index ef440e54084..6a54dd1b034 100644
--- a/lang/hu/components.php
+++ b/lang/hu/components.php
@@ -13,7 +13,7 @@
     'image_intro_upload' => 'Húzz ide egy új képfájlt az új kép feltöltéséhez, vagy használd a fenti "Kép feltöltése" gombot.',
     'image_all' => 'Összes',
     'image_all_title' => 'Összes kép megtekintése',
-    'image_book_title' => 'A könyv feltöltött képek megtekintése',
+    'image_book_title' => 'A könyvhöz feltöltött képek megtekintése',
     'image_page_title' => 'Az oldalra feltöltött képek megtekintése',
     'image_search_hint' => 'Keresés kép neve alapján',
     'image_uploaded' => 'Feltöltve ekkor: :uploadedDate',
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index 83ca9b06254..d5c6baed67f 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -36,10 +36,10 @@
     'paragraph' => 'Bekezdés',
     'blockquote' => 'Idézet',
     'inline_code' => 'Forráskód',
-    'callouts' => 'Ábrafelirat',
+    'callouts' => 'Szövegdobozok',
     'callout_information' => 'Információ',
-    'callout_success' => 'Sikeres',
-    'callout_warning' => 'Figyelem',
+    'callout_success' => 'Siker',
+    'callout_warning' => 'Figyelmeztetés',
     'callout_danger' => 'Veszély',
     'bold' => 'Félkövér',
     'italic' => 'Dőlt',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 3c9921812e5..d073d2b74dc 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -35,11 +35,11 @@
     'no_pages_recently_created' => 'Nincsenek legutóbb létrehozott oldalak',
     'no_pages_recently_updated' => 'Nincsenek legutóbb frissített oldalak',
     'export' => 'Exportálás',
-    'export_html' => 'Webfájlt tartalmaz',
+    'export_html' => 'Önálló weblap',
     'export_pdf' => 'PDF fájl',
     'export_text' => 'Egyszerű szövegfájl',
     'export_md' => 'Markdown jegyzetek',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Hordozható ZIP',
     'default_template' => 'Alapértelmezett oldalsablon',
     'default_template_explain' => 'Rendeljen hozzá egy oldalsablont, amely alapértelmezett tartalomként lesz használva az ezen az elemen belül létrehozott összes oldalon. Ne feledje, hogy ezt csak akkor használja, ha az oldal készítője megtekintési hozzáféréssel rendelkezik a kiválasztott sablonoldalhoz.',
     'default_template_select' => 'Válasszon ki egy oldalsablont',
@@ -344,8 +344,8 @@
     'tags_assigned_shelves' => 'Polcokhoz Rendelt',
     'tags_x_unique_values' => ':count egyedi érték',
     'tags_all_values' => 'Összes érték',
-    'tags_view_tags' => 'Címke megtekintése',
-    'tags_view_existing_tags' => 'Címkék megtekintése',
+    'tags_view_tags' => 'Címkék megtekintése',
+    'tags_view_existing_tags' => 'Létező címkék megtekintése',
     'tags_list_empty_hint' => 'A címkék hozzárendelhetők az oldalszerkesztő oldalsávján keresztül, vagy egy könyv, fejezet vagy polc adatainak szerkesztése közben.',
     'attachments' => 'Csatolmányok',
     'attachments_explain' => 'Az oldalon megjelenő fájlok feltöltése vagy hivatkozások csatolása. Az oldal oldalsávjában fognak megjelenni.',
@@ -447,7 +447,7 @@
     'watch_title_updates' => 'Minden oldal frissítése',
     'watch_desc_updates' => 'Értesítés minden új oldalról és oldalváltozásról.',
     'watch_desc_updates_page' => 'Értesítsen minden oldalváltozásról.',
-    'watch_title_comments' => 'Minden oldal frissítése és megjegyzése',
+    'watch_title_comments' => 'Az oldal összes frissítése és megjegyzése',
     'watch_desc_comments' => 'Értesítés minden új oldalról, oldalváltozásról és új megjegyzésről.',
     'watch_desc_comments_page' => 'Értesítés az oldal változásairól és az új megjegyzésekről.',
     'watch_change_default' => 'Az alapértelmezett értesítési beállítások módosítása',
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index 00f47ac40bc..8ee055e29f7 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -61,7 +61,7 @@
     'attachment_upload_error' => 'Hiba történt a melléklet feltöltésekor',
 
     // Pages
-    'page_draft_autosave_fail' => 'Nem sikerült a vázlat mentése. Mentés előtt meg kell róla győződni, hogy van internetkapcsolat',
+    'page_draft_autosave_fail' => 'Nem sikerült a vázlat mentése. Mentés előtt állítsd helyre az internetkapcsolatot',
     'page_draft_delete_fail' => 'Nem sikerült törölni az oldalvázlatot és lekérni az aktuális oldal mentett tartalmat',
     'page_custom_home_deletion' => 'Nem lehet oldalt törölni ha kezdőlapnak van beállítva',
 
@@ -101,7 +101,7 @@
     'image_not_found_subtitle' => 'Sajnáljuk, a keresett kép nem található.',
     'image_not_found_details' => 'Ha arra számított, hogy ez a kép létezik, akkor előfordulhat, hogy törölték.',
     'return_home' => 'Vissza a kezdőlapra',
-    'error_occurred' => 'Hiba örtént',
+    'error_occurred' => 'Hiba történt',
     'app_down' => ':appName jelenleg nem üzemel',
     'back_soon' => 'Hamarosan újra elérhető lesz.',
 
diff --git a/lang/hu/preferences.php b/lang/hu/preferences.php
index 8c78a1d0e9c..4251a28fbc7 100644
--- a/lang/hu/preferences.php
+++ b/lang/hu/preferences.php
@@ -7,17 +7,17 @@
 return [
     'my_account' => 'Fiókom',
 
-    'shortcuts' => 'Gyorsbillentyűk',
-    'shortcuts_interface' => 'UI parancsikon beállításai',
+    'shortcuts' => 'Billentyűparancsok',
+    'shortcuts_interface' => 'UI billentyűparancsok beállításai',
     'shortcuts_toggle_desc' => 'Itt engedélyezheti vagy letilthatja a navigációhoz és műveletekhez használt billentyűparancsokat.',
-    'shortcuts_customize_desc' => 'Csak nyomja meg a kívánt billentyűkombinációt, miután kiválasztotta a parancsikon bevitelét.',
+    'shortcuts_customize_desc' => 'Az alábbi billentyűparancsok testre szabhatók. Csak nyomja meg a kívánt billentyűkombinációt, miután kiválasztotta a billentyűparancshoz tartozó mezőt.',
     'shortcuts_toggle_label' => 'A billentyűparancsok engedélyezve',
     'shortcuts_section_navigation' => 'Navigáció',
     'shortcuts_section_actions' => 'Gyakori műveletek',
-    'shortcuts_save' => 'Gyorsbillentyűk mentése',
+    'shortcuts_save' => 'Billentyűparancsok mentése',
     'shortcuts_overlay_desc' => 'Megjegyzés: Amikor a gyorsbillentyűk engedélyezve vannak, egy segítő átfedés érhető el azzal, hogy a "?" billentyűt megnyomva kiemeli az aktuálisan látható képernyőn elérhető gyorsbillentyűket a műveletekhez.',
     'shortcuts_update_success' => 'A gyorsbillentyű-beállítások frissítve lettek!',
-    'shortcuts_overview_desc' => 'Kezelheted a billentyűparancsokat, amelyeket használhatsz a rendszerfelhasználói felület navigálásához.',
+    'shortcuts_overview_desc' => 'A rendszerfelhasználói felületen történő navigálásához használható billentyűparancsok kezelése.',
 
     'notifications' => 'Értesítési beállítások',
     'notifications_desc' => 'Állítsd be az e-mail értesítéseket, amelyeket akkor kapsz, ha bizonyos tevékenység történik a rendszeren belül.',
@@ -37,10 +37,10 @@
     'profile' => 'Felhasználó részletei',
     'profile_desc' => 'A kommunikációhoz és a rendszer személyre szabásához használt adatokon kívül kezelheti fiókja adatait, amelyek más felhasználók számára jelennek meg.',
     'profile_view_public' => 'Nyilvános profil megtekintése',
-    'profile_name_desc' => 'Állítsa be a megjelenített nevét, amely látható lesz a rendszer többi felhasználója számára az Ön által végzett tevékenység és a saját tartalom révén.',
+    'profile_name_desc' => 'Állítsd be a megjelenített nevedet, amely látható lesz a rendszer többi felhasználója számára az általad végzett tevékenység és a saját tartalom révén.',
     'profile_email_desc' => 'Ezt az e-mail címet értesítésekre fogjuk használni, valamint az érvényben lévő beállítások függvényében hitelesítéshez is.',
     'profile_email_no_permission' => 'Sajnos nincs jogosultságod az e-mail cím megváltoztatására. Ha szeretnéd ezt megváltoztatni, kérj meg egy adminisztrátort, hogy ezt megtegye helyetted.',
-    'profile_avatar_desc' => 'Válassz egy képet, amelyet a rendszerben használnál a neved mellett. Ideális esetben a kép négyzet alakú és körülbelül 256px szélességű és magasságú legyen.',
+    'profile_avatar_desc' => 'Válassz egy képet, amelyet a rendszerben használnál a neved mellett. A kép lehetőleg négyzet alakú és körülbelül 256px szélességű és magasságú legyen.',
     'profile_admin_options' => 'Adminisztrátori beállítások',
     'profile_admin_options_desc' => 'További adminisztrátori szintű lehetőségek, például a szerepkörök hozzárendelésének kezelése, megtalálhatóak a felhasználói fiókod beállításai között az "Beállítások > Felhasználók" területen az alkalmazásban.',
 
diff --git a/lang/it/settings.php b/lang/it/settings.php
index bfad07b1c41..3b57db1b160 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -90,7 +90,7 @@
     'sort_rule_details' => 'Dettagli della regola di ordinamento',
     'sort_rule_details_desc' => 'Imposta un nome per questa regola di ordinamento, apparirà nelle liste quando gli utenti selezionano un ordinamento.',
     'sort_rule_operations' => 'Operazioni di ordinamento',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => 'Configurare le azioni di ordinamento da eseguire spostandole dall\'elenco delle operazioni disponibili. Al momento dell\'utilizzo, le operazioni saranno applicate in ordine, dall\'alto verso il basso. Le modifiche apportate qui saranno applicate a tutti i libri assegnati al momento del salvataggio.',
     'sort_rule_available_operations' => 'Operazioni Disponibili',
     'sort_rule_available_operations_empty' => 'Nessuna operazione rimanente',
     'sort_rule_configured_operations' => 'Operazioni Configurate',
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index b2bbd89a58f..6f55098bbd9 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -85,11 +85,11 @@
     'webhook_delete_notification' => 'Webhookを削除しました',
 
     // Imports
-    'import_create' => 'created import',
+    'import_create' => 'がインポートを作成',
     'import_create_notification' => 'インポートファイルが正常にアップロードされました',
-    'import_run' => 'updated import',
+    'import_run' => 'がインポートを更新',
     'import_run_notification' => 'コンテンツが正常にインポートされました',
-    'import_delete' => 'deleted import',
+    'import_delete' => 'がインポートを削除',
     'import_delete_notification' => 'インポートファイルが正常に削除されました',
 
     // Users
@@ -128,12 +128,12 @@
     'comment_delete'              => 'がコメントを削除',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'がソートルールを作成',
+    'sort_rule_create_notification' => 'ソートルールを作成しました',
+    'sort_rule_update' => 'がソートルールを更新',
+    'sort_rule_update_notification' => 'ソートルールを更新しました',
+    'sort_rule_delete' => 'がソートルールを削除',
+    'sort_rule_delete_notification' => 'ソートルールを削除しました',
 
     // Other
     'permissions_update'          => 'が権限を更新:',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 4a131b5d9b1..6d4d8506e05 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -13,7 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '閉じる',
-    'apply' => 'Apply',
+    'apply' => '適用',
     'undo' => '元に戻す',
     'redo' => 'やり直し',
     'left' => '左寄せ',
@@ -148,7 +148,7 @@
     'url' => 'リンク先URL',
     'text_to_display' => 'リンク元テキスト',
     'title' => 'タイトル',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'エンティティを参照',
     'open_link' => 'リンクを開く',
     'open_link_in' => 'リンク先の表示場所',
     'open_link_current' => '同じウィンドウ',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 583d2e17d20..afd7765782e 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -166,9 +166,9 @@
     'books_search_this' => 'このブックから検索',
     'books_navigation' => '目次',
     'books_sort' => '並び順を変更',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'ブック内のチャプタおよびページを移動して内容を再編成できます。他のブックを並べて、ブック間でチャプタやページを簡単に移動することもできます。オプションで自動ソートルールを設定すると、変更時にブックの内容を自動的にソートすることができます。',
+    'books_sort_auto_sort' => '自動ソートオプション',
+    'books_sort_auto_sort_active' => '自動ソート有効: :sortName',
     'books_sort_named' => 'ブック「:bookName」を並べ替え',
     'books_sort_name' => '名前で並べ替え',
     'books_sort_created' => '作成日で並べ替え',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 14a890dfd38..1a0e64cb41d 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => '制限しない',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'ソート',
+    'sorting_book_default' => 'ブックのデフォルトソート',
+    'sorting_book_default_desc' => '新しいブックに適用するデフォルトのソートルールを選択します。これは既存のブックには影響しません。ルールはブックごとに上書きすることができます。',
+    'sorting_rules' => 'ソートルール',
+    'sorting_rules_desc' => 'これらはシステム内のコンテンツに適用できる事前定義のソート操作です。',
+    'sort_rule_assigned_to_x_books' => ':count 個のブックに割当|:count 個のブックに割当',
+    'sort_rule_create' => 'ソートルールを作成',
+    'sort_rule_edit' => 'ソートルールの編集',
+    'sort_rule_delete' => 'ソートルールを削除',
+    'sort_rule_delete_desc' => 'このソートルールをシステムから削除します。これを使用しているブックは手動ソートに戻ります。',
+    'sort_rule_delete_warn_books' => 'このソートルールは現在 :count 個のブックで使用されています。削除してもよろしいですか？',
+    'sort_rule_delete_warn_default' => 'このソートルールは現在ブックのデフォルトソートに使用されています。削除してもよろしいですか？',
+    'sort_rule_details' => 'ソートルールの詳細',
+    'sort_rule_details_desc' => 'ユーザがソートを選択する際にリストに表示される、ソートルールの名前を設定します。',
+    'sort_rule_operations' => 'ソート操作',
+    'sort_rule_operations_desc' => '利用可能な操作のリストから、実行するソート操作を追加してソートルールを設定します。操作は上から下へ順番に適用されます。ここで変更を行うと、保存時に割り当てられたすべてのブックに適用されます。',
+    'sort_rule_available_operations' => '利用可能な操作',
+    'sort_rule_available_operations_empty' => '残った操作はありません',
+    'sort_rule_configured_operations' => '設定された操作',
+    'sort_rule_configured_operations_empty' => '「利用可能な操作」リストから操作をドラッグ/追加してください',
+    'sort_rule_op_asc' => '(昇順)',
+    'sort_rule_op_desc' => '(降順)',
+    'sort_rule_op_name' => '名前 - キャラクタ順',
+    'sort_rule_op_name_numeric' => '名前 - 数値順',
+    'sort_rule_op_created_date' => '作成日時',
+    'sort_rule_op_updated_date' => '更新日時',
+    'sort_rule_op_chapters_first' => 'チャプタを最初に',
+    'sort_rule_op_chapters_last' => 'チャプタを最後に',
 
     // Maintenance settings
     'maint' => 'メンテナンス',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index 84df1c1fda9..c1dbb93fd7b 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -131,7 +131,7 @@
     'sort_rule_create' => '정렬 규칙 생성',
     'sort_rule_create_notification' => '정렬 규칙이 성공적으로 생성되었습니다',
     'sort_rule_update' => '정렬 규칙 업데이트',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_update_notification' => '정렬 규칙이 성공적으로 업데이트 되었습니다',
     'sort_rule_delete' => '정렬 규칙 삭제',
     'sort_rule_delete_notification' => '정렬 규칙이 성공적으로 삭제되었습니다',
 
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index f04611a925f..ac4d8d53d7a 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -13,7 +13,7 @@
     'cancel' => '취소',
     'save' => '저장',
     'close' => '닫기',
-    'apply' => 'Apply',
+    'apply' => '적용',
     'undo' => '되돌리기',
     'redo' => '다시 실행',
     'left' => '왼쪽',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => '표시할 텍스트',
     'title' => '제목',
-    'browse_links' => 'Browse links',
+    'browse_links' => '링크 찾기',
     'open_link' => '링크 열기',
     'open_link_in' => '다음에서 링크 열기...',
     'open_link_current' => '현재 창',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 5c3af83eb77..b78333385fd 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -77,7 +77,7 @@
     // Sorting Settings
     'sorting' => '정렬',
     'sorting_book_default' => '기본 책 정렬',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
+    'sorting_book_default_desc' => '새로운 책에 적용할 기본 정렬 규칙을 선택하세요. 이 선택은 기존 책에는 영향을 주지 않고, 기존 책의 설정은 책마다 변경할 수 있습니다.',
     'sorting_rules' => '정렬 규칙',
     'sorting_rules_desc' => '현재 시스템에 미리 정의된 정렬 규칙의 목록입니다.',
     'sort_rule_assigned_to_x_books' => ':count 책에 정렬 규칙 적용',
@@ -90,7 +90,7 @@
     'sort_rule_details' => '정렬 규칙 세부사항',
     'sort_rule_details_desc' => '이 정렬 규칙의 이름을 지어주세요. 이 이름은 사용자가 정렬할 때 나타납니다.',
     'sort_rule_operations' => '정렬 규칙',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => '사용 가능한 작업 목록에서 이동하여 수행할 정렬 작업을 구성합니다. 사용 시 위에서 아래로 순서대로 작업이 적용됩니다. 여기에서 변경한 내용은 저장 시 할당된 모든 책에 적용됩니다.',
     'sort_rule_available_operations' => '사용 가능한 정렬 규칙',
     'sort_rule_available_operations_empty' => '사용 가능한 정렬 규칙 없음',
     'sort_rule_configured_operations' => '정렬 규칙 설정',
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index 4d184633ff4..fd4de53216e 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -129,12 +129,12 @@
     'comment_delete'              => 'slettet kommentar',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'opprettet sorteringsregel',
+    'sort_rule_create_notification' => 'Sorteringsregel opprettet med suksess',
+    'sort_rule_update' => 'oppdatert sorteringsregel',
+    'sort_rule_update_notification' => 'Sorteringsregel oppdatert med suksess',
+    'sort_rule_delete' => 'slettet sorteringsregel',
+    'sort_rule_delete_notification' => 'Sorteringsregel slettet med suksess',
 
     // Other
     'permissions_update'          => 'oppdaterte tilganger',
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index 6b1c5eb78ed..ddb266626a4 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Avbryt',
     'save' => 'Lagre',
     'close' => 'Lukk',
-    'apply' => 'Apply',
+    'apply' => 'Bruk',
     'undo' => 'Angre',
     'redo' => 'Gjør om',
     'left' => 'Venstre',
@@ -148,7 +148,7 @@
     'url' => 'Nettlenke',
     'text_to_display' => 'Synlig tekst',
     'title' => 'Tittel',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Bla gjennom linker',
     'open_link' => 'Åpne lenke',
     'open_link_in' => 'Åpne i ...',
     'open_link_current' => 'Samme vindu',
@@ -165,8 +165,8 @@
     'about' => 'Om tekstredigeringsprogrammet',
     'about_title' => 'Om HDSEHDF-tekstredigeringsprogrammet',
     'editor_license' => 'Tekstbehandlerlisens og opphavsrett',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Denne redaktoren er bygget som en fork av :lexicalLink, som er distribuert under MIT-lisensen.',
+    'editor_lexical_license_link' => 'Full lisensinformasjon finner du her.',
     'editor_tiny_license' => 'Denne tekstredigereren er laget med :tinyLink som er lisensiert under MIT.',
     'editor_tiny_license_link' => 'Informasjon om opphavsrett og lisens for TinyMCE finnes her.',
     'save_continue' => 'Lagre side og fortsett',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 36f85791f70..85faf1e852d 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -166,9 +166,9 @@
     'books_search_this' => 'Søk i boken',
     'books_navigation' => 'Boknavigasjon',
     'books_sort' => 'Sorter bokinnhold',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Flytt kapitler og sider innen en bok for å reorganisere innholdet. Andre bøker kan legges til, noe som gjør det enkelt å flytte kapitler og sider mellom bøkene. Valgfritt kan en automatisk sorteringsregel settes for å automatisk sortere innholdet i denne boken ved endringer.',
+    'books_sort_auto_sort' => 'Automatisk sorteringsalternativ',
+    'books_sort_auto_sort_active' => 'Automatisk sortering aktiv: :sortName',
     'books_sort_named' => 'Omorganisér :bookName (bok)',
     'books_sort_name' => 'Sorter på navn',
     'books_sort_created' => 'Sorter på opprettet dato',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index 182d23c3aa3..a719d41cc48 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begrensninger er satt',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sorting' => 'Sortering',
+    'sorting_book_default' => 'Standard boksortering',
+    'sorting_book_default_desc' => 'Velg standard sorteringsregelen som skal brukes for nye bøker. Dette vil ikke påvirke eksisterende bøker, og kan overstyres per bok.',
+    'sorting_rules' => 'Sorteringsregler',
+    'sorting_rules_desc' => 'Dette er forhåndsdefinerte sorteringsoperasjoner som kan brukes på innhold i systemet.',
+    'sort_rule_assigned_to_x_books' => 'Tildelt til :count bok|Tildelt til :count bøker',
+    'sort_rule_create' => 'Opprett sorteringsregel',
+    'sort_rule_edit' => 'Rediger sorteringsregel',
+    'sort_rule_delete' => 'Slett sorteringsregel',
+    'sort_rule_delete_desc' => 'Fjern denne sorteringsregelen fra systemet. Bøker som bruker denne sorteringsregelen vil gå tilbake til manuell sortering.',
+    'sort_rule_delete_warn_books' => 'Denne sorteringsregelen brukes for øyeblikket på :count bok/bøker. Er du sikker på at du vil slette denne?',
+    'sort_rule_delete_warn_default' => 'Denne sorteringsregelen brukes for øyeblikket som standard for bøker. Er du sikker på at du vil slette denne?',
+    'sort_rule_details' => 'Detaljer om sorteringsregel',
+    'sort_rule_details_desc' => 'Angi et navn for denne sorteringsregelen, som vil vises i lister når brukerne velger en sorteringsmetode.',
+    'sort_rule_operations' => 'Sorteringsoperasjoner',
+    'sort_rule_operations_desc' => 'Konfigurer sorteringshandlinger ved å flytte dem fra listen over tilgjengelige operasjoner. Ved bruk vil operasjonene bli brukt i rekkefølge, fra topp til bunn. Eventuelle endringer gjort her vil bli brukt for alle tildelte bøker når du lagrer.',
     'sort_rule_available_operations' => 'Available Operations',
     'sort_rule_available_operations_empty' => 'No operations remaining',
     'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sort_rule_configured_operations_empty' => 'Dra/legg til operasjoner fra listen "Tilgjengelige operasjoner"',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name' => 'Navn - Alfabetisk',
     'sort_rule_op_name_numeric' => 'Name - Numeric',
     'sort_rule_op_created_date' => 'Created Date',
     'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_chapters_first' => 'Kapitler først',
+    'sort_rule_op_chapters_last' => 'Kapitler sist',
 
     // Maintenance settings
     'maint' => 'Vedlikehold',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 79b277b60b4..3bba35cb554 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -19,7 +19,7 @@
     'app_name_desc' => 'Deze naam wordt getoond in de header en in alle door het systeem verstuurde e-mails.',
     'app_name_header' => 'Toon naam in header',
     'app_public_access' => 'Openbare toegang',
-    'app_public_access_desc' => 'Door deze optie in te schakelen kunnen bezoekers, die niet ingelogd zijn, toegang krijgen tot de inhoud van uw BookStack omgeving.',
+    'app_public_access_desc' => 'Door deze optie in te schakelen kunnen bezoekers die niet ingelogd zijn toegang krijgen tot de inhoud van uw BookStack-omgeving.',
     'app_public_access_desc_guest' => 'De toegang voor publieke bezoekers kan worden ingesteld via de "Guest" gebruiker.',
     'app_public_access_toggle' => 'Openbare toegang toestaan',
     'app_public_viewing' => 'Publieke bezichtigingen toestaan?',
@@ -28,14 +28,14 @@
     'app_secure_images_desc' => 'Om prestatieredenen zijn alle afbeeldingen openbaar. Deze optie voegt een willekeurige en moeilijk te raden tekst toe aan de URL\'s van de afbeeldingen. Zorg ervoor dat "directory indexes" niet ingeschakeld zijn om eenvoudige toegang te voorkomen.',
     'app_default_editor' => 'Standaard Pagina Bewerker',
     'app_default_editor_desc' => 'Selecteer welke bewerker standaard zal worden gebruikt bij het bewerken van nieuwe pagina\'s. Dit kan worden overschreven op paginaniveau als de rechten dat toestaan.',
-    'app_custom_html' => 'HTML aan <head> toevoegen',
+    'app_custom_html' => 'Aangepaste inhoud voor het HTML head-element',
     'app_custom_html_desc' => 'Alle hieronder toegevoegde data wordt aan het einde van de <head> sectie van elke pagina toegevoegd. Gebruik dit om stijlen te overschrijven of analytische code toe te voegen.',
     'app_custom_html_disabled_notice' => 'Bovenstaande wordt niet toegevoegd aan deze pagina om ervoor te zorgen dat je foutieve code steeds ongedaan kan maken.',
     'app_logo' => 'Applicatielogo',
     'app_logo_desc' => 'Dit wordt onder meer gebruikt in de kopbalk van de applicatie. Deze afbeelding dient 86px hoog te zijn. Grote afbeeldingen worden teruggeschaald.',
-    'app_icon' => 'Applicatie Pictogram',
+    'app_icon' => 'Applicatiepictogram',
     'app_icon_desc' => 'Dit pictogram wordt gebruikt voor browsertabbladen en snelkoppelingspictogrammen. Dit dient een 256px vierkante PNG-afbeelding te zijn.',
-    'app_homepage' => 'Applicatie Startpagina',
+    'app_homepage' => 'Applicatie startpagina',
     'app_homepage_desc' => 'Selecteer een weergave om weer te geven op de startpagina in plaats van de standaard weergave. Paginamachtigingen worden genegeerd voor geselecteerde pagina\'s.',
     'app_homepage_select' => 'Selecteer een pagina',
     'app_footer_links' => 'Voettekst hyperlinks',
@@ -81,16 +81,16 @@
     'sorting_rules' => 'Sorteerregels',
     'sorting_rules_desc' => 'Dit zijn vooraf ingestelde sorteeroperaties die kunnen worden toegepast op inhoud in het systeem.',
     'sort_rule_assigned_to_x_books' => 'Toegepast op :count Boek|Toegepast op :count Boeken',
-    'sort_rule_create' => 'Maakte Sorteerregel',
-    'sort_rule_edit' => 'Bewerk Sorteerregel',
-    'sort_rule_delete' => 'Verwijder Sorteerregel',
+    'sort_rule_create' => 'Maak sorteerregel',
+    'sort_rule_edit' => 'Bewerk sorteerregel',
+    'sort_rule_delete' => 'Verwijder sorteerregel',
     'sort_rule_delete_desc' => 'Verwijder deze sorteerregel uit het systeem. Boeken die deze regel gebruiken zullen terugvallen op handmatige sortering.',
     'sort_rule_delete_warn_books' => 'Deze sorteerregel wordt momenteel gebruikt door :count boek(en). Weet je zeker dat je deze wilt verwijderen?',
     'sort_rule_delete_warn_default' => 'Deze sorteerregel wordt gebruikt als standaardregel voor boeken. Weet je zeker dat je deze wilt verwijderen?',
-    'sort_rule_details' => 'Details Sorteerregel',
+    'sort_rule_details' => 'Details sorteerregel',
     'sort_rule_details_desc' => 'Stel een naam in voor deze sorteerregel. Deze wordt weergegeven waar gebruikers een regel kunnen selecteren.',
     'sort_rule_operations' => 'Sorteeroperaties',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => 'Configureer de sorteeracties die moeten worden uitgevoerd door ze te verplaatsen van de lijst met beschikbare operaties. Bij gebruik worden de operaties toegepast in volgorde van boven naar beneden. Wijzigingen die hier worden gemaakt worden toegepast op alle toegewezen boeken.',
     'sort_rule_available_operations' => 'Beschikbare Operaties',
     'sort_rule_available_operations_empty' => 'Geen operaties over',
     'sort_rule_configured_operations' => 'Ingestelde Operaties',
@@ -107,8 +107,8 @@
     // Maintenance settings
     'maint' => 'Onderhoud',
     'maint_image_cleanup' => 'Afbeeldingen opschonen',
-    'maint_image_cleanup_desc' => 'Scant pagina- en revisie inhoud om te controleren welke afbeeldingen en tekeningen momenteel worden gebruikt en welke afbeeldingen overbodig zijn. Zorg ervoor dat je een volledige database- en afbeelding back-up maakt voordat je dit uitvoert.',
-    'maint_delete_images_only_in_revisions' => 'Ook afbeeldingen verwijderen die alleen in oude pagina revisies bestaan',
+    'maint_image_cleanup_desc' => 'Scant pagina- en revisieinhoud om te controleren welke afbeeldingen en tekeningen momenteel worden gebruikt en welke afbeeldingen overbodig zijn. Zorg ervoor dat je een volledige database- en afbeelding back-up maakt voordat je dit uitvoert.',
+    'maint_delete_images_only_in_revisions' => 'Ook afbeeldingen verwijderen die alleen in oude paginarevisies bestaan',
     'maint_image_cleanup_run' => 'Opschonen uitvoeren',
     'maint_image_cleanup_warning' => ':count potentieel ongebruikte afbeeldingen gevonden. Weet je zeker dat je deze afbeeldingen wilt verwijderen?',
     'maint_image_cleanup_success' => ':count potentieel ongebruikte afbeeldingen gevonden en verwijderd!',
@@ -124,7 +124,7 @@
     'maint_recycle_bin_open' => 'Prullenbak openen',
     'maint_regen_references' => 'Verwijzingen opnieuw genereren',
     'maint_regen_references_desc' => 'Deze actie zal de kruisverwijzingen index binnen de database opnieuw opbouwen. Dit wordt doorgaans automatisch gedaan, maar deze actie kan nuttig zijn om oude inhoud of inhoud die via onofficiële methoden is toegevoegd te indexeren.',
-    'maint_regen_references_success' => 'Verwijzingen index is opnieuw gegenereerd!',
+    'maint_regen_references_success' => 'Verwijzingenindex is opnieuw gegenereerd!',
     'maint_timeout_command_note' => 'Let op: Het uitvoeren van deze actie kan enige tijd in beslag nemen, wat in sommige webomgevingen kan leiden tot time-outs. Als alternatief kan deze actie ook worden uitgevoerd met een terminal-commando.',
 
     // Recycle Bin
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index 0619c4682fc..c56b7d07850 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -5,7 +5,7 @@
 return [
 
     // Permissions
-    'permission' => 'Du har ikke tilgang til å se denne siden.',
+    'permission' => 'Du har ikkje tilgang til å sjå denne sida.',
     'permissionJson' => 'Du har ikke tilgang til å utføre denne handlingen.',
 
     // Auth
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index 60c109eda42..dc078ad57ab 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -85,7 +85,7 @@
     'webhook_delete_notification' => 'Webhook usunięty pomyślnie',
 
     // Imports
-    'import_create' => 'created import',
+    'import_create' => 'utworzono import',
     'import_create_notification' => 'Import successfully uploaded',
     'import_run' => 'updated import',
     'import_run_notification' => 'Content successfully imported',
diff --git a/lang/sv/notifications.php b/lang/sv/notifications.php
index 9d2269ed87d..58418ddb01e 100644
--- a/lang/sv/notifications.php
+++ b/lang/sv/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Ny kommentar på sidan: :pageName',
+    'new_comment_intro' => 'En användare har kommenterat en sida i :appName:',
+    'new_page_subject' => 'Ny sida: :pageName',
+    'new_page_intro' => 'En ny sida har blivit skapad i :appName:',
+    'updated_page_subject' => 'Uppdaterad sida: :pageName',
+    'updated_page_intro' => 'En sida har blivit uppdaterad i :appName:',
+    'updated_page_debounce' => 'För att förhindra en massa notiser, så kommer det inte skickas nya notiser på ett tag för ytterligare ändringar till denna sida av samma skribent.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Sidonamn:',
+    'detail_page_path' => 'Sidosökväg:',
+    'detail_commenter' => 'Kommentars-skapare:',
+    'detail_comment' => 'Kommentar:',
+    'detail_created_by' => 'Skapad av:',
+    'detail_updated_by' => 'Uppdaterad av:',
 
     'action_view_comment' => 'Visa kommentar',
-    'action_view_page' => 'View Page',
+    'action_view_page' => 'Visa sida',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Detta meddelande skickades till dig eftersom :link täcker denna typ av aktivitet för detta objekt.',
+    'footer_reason_link' => 'dina notifikationspreferenser',
 ];
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index ace52b36d4f..5bed9ea303b 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -50,8 +50,8 @@
     'bookshelf_delete_notification'    => 'Kitaplık başarıyla silindi',
 
     // Revisions
-    'revision_restore' => 'restored revision',
-    'revision_delete' => 'deleted revision',
+    'revision_restore' => 'geri yüklenen revizyon',
+    'revision_delete' => 'silinmiş revizyon',
     'revision_delete_notification' => 'Değişiklik başarıyla silindi',
 
     // Favourites
@@ -64,17 +64,17 @@
     // Auth
     'auth_login' => 'oturum açıldı',
     'auth_register' => 'yeni kullanıcı olarak kayıt yapıldı',
-    'auth_password_reset_request' => 'requested user password reset',
+    'auth_password_reset_request' => 'talep edilmiş kullanıcı parola sıfırlamaları',
     'auth_password_reset_update' => 'Kullanıcı parolasını sıfırla',
-    'mfa_setup_method' => 'configured MFA method',
+    'mfa_setup_method' => 'uygulanan MFA yöntemi',
     'mfa_setup_method_notification' => 'Çok aşamalı kimlik doğrulama yöntemi başarıyla yapılandırıldı',
-    'mfa_remove_method' => 'removed MFA method',
+    'mfa_remove_method' => 'kaldırılan MFA yöntemi',
     'mfa_remove_method_notification' => 'Çok aşamalı kimlik doğrulama yöntemi başarıyla kaldırıldı',
 
     // Settings
-    'settings_update' => 'updated settings',
+    'settings_update' => 'güncellenmiş ayarlar',
     'settings_update_notification' => 'Ayarlar başarıyla güncellendi',
-    'maintenance_action_run' => 'ran maintenance action',
+    'maintenance_action_run' => 'bakım işlemine başla',
 
     // Webhooks
     'webhook_create' => 'web kancası oluşturuldu',
@@ -93,7 +93,7 @@
     'import_delete_notification' => 'Import successfully deleted',
 
     // Users
-    'user_create' => 'created user',
+    'user_create' => 'oluşturan kullanıcı',
     'user_create_notification' => 'Kullanıcı başarıyla oluşturuldu',
     'user_update' => 'updated user',
     'user_update_notification' => 'Kullanıcı başarıyla güncellendi',
@@ -118,14 +118,14 @@
 
     // Recycle Bin
     'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_restore' => 'çöp kutusundan geri getirilen',
+    'recycle_bin_destroy' => 'çöp kutusundan kaldırılan',
 
     // Comments
     'commented_on'                => 'yorum yaptı',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'eklenen yorum',
+    'comment_update'              => 'güncellenen yorum',
+    'comment_delete'              => 'silinen yorum',
 
     // Sort Rules
     'sort_rule_create' => 'created sort rule',

From e980564fd6df6cd74d444cc3f2525d9abed3f1dc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 16 Mar 2025 12:44:29 +0000
Subject: [PATCH 493/666] Updated translator & dependency attribution before
 release v25.02.1

---
 .github/translators.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index 8e4eb271c06..af5f2a703c1 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -469,3 +469,12 @@ Raphael Moreno (RaphaelMoreno) :: Portuguese, Brazilian
 yn (user99) :: Arabic
 Pavel Zlatarov (pzlatarov) :: Bulgarian
 ingelres :: French
+mabdullah :: Arabic
+Skrabák Csaba (kekcsi) :: Hungarian
+Evert Meulie (Evert) :: Norwegian Bokmal
+Jasper Backer (jasperb) :: Dutch
+Alexandar Cavdarovski (ace.200112) :: Swedish
+구닥다리TV (yjj8353) :: Korean
+Onur Oskay (o.oskay) :: Turkish
+Sébastien Merveille (SebastienMerv) :: French
+Maxim Kouznetsov (masya.work) :: Hebrew

From abe7467ae5f9341f2f5f9cad3b1a48724ed1a425 Mon Sep 17 00:00:00 2001
From: Bernardo Campos <camposbg@gmail.com>
Date: Sun, 23 Mar 2025 12:29:29 -0300
Subject: [PATCH 494/666] Fix issue BookStackApp#5542 Sorting by name

---
 app/Sorting/SortSetOperationComparisons.php | 5 +++--
 tests/Sorting/SortRuleTest.php              | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index e3465231573..e506e9a139d 100644
--- a/app/Sorting/SortSetOperationComparisons.php
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Sorting;
 
+use voku\helper\ASCII;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 
@@ -13,12 +14,12 @@ class SortSetOperationComparisons
 {
     public static function nameAsc(Entity $a, Entity $b): int
     {
-        return strtolower($a->name) <=> strtolower($b->name);
+        return strtolower(ASCII::to_transliterate($a->name)) <=>  strtolower(ASCII::to_transliterate($b->name));
     }
 
     public static function nameDesc(Entity $a, Entity $b): int
     {
-        return strtolower($b->name) <=> strtolower($a->name);
+        return strtolower(ASCII::to_transliterate($b->name)) <=>  strtolower(ASCII::to_transliterate($a->name));
     }
 
     public static function nameNumericAsc(Entity $a, Entity $b): int
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index e956f49df4b..b0f20cba5ae 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -198,6 +198,8 @@ public function test_name_alphabetical_ordering()
         $namesToAdd = [
             "Beans",
             "bread",
+            "Éclaire",
+            "egg",
             "Milk",
             "pizza",
             "Tomato",

From 5c6671b3bf5b582c2ed0e120bb8afb5f296a63e9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 27 Mar 2025 14:13:18 +0000
Subject: [PATCH 495/666] Lexical: Fixed issues with content not saving

Found that saving via Ctrl+Enter did not save as logic to load editor
output into form was bypassed, which this fixes by ensuring submit
events are raised during for this shortcut.

Submit handling also gets a timeout added since, at least in FF,
requestSubmit did not re-submit a form while in a submit event.
---
 resources/js/components/page-editor.js    | 2 +-
 resources/js/components/wysiwyg-editor.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 64cd601a920..81378e944c0 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -112,7 +112,7 @@ export class PageEditor extends Component {
     }
 
     savePage() {
-        this.container.closest('form').submit();
+        this.container.closest('form').requestSubmit();
     }
 
     async saveDraft() {
diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js
index 56dbe8d7c5f..5a258190069 100644
--- a/resources/js/components/wysiwyg-editor.js
+++ b/resources/js/components/wysiwyg-editor.js
@@ -25,6 +25,7 @@ export class WysiwygEditor extends Component {
                 textDirection: this.$opts.textDirection,
                 translations,
             });
+            window.wysiwyg = this.editor;
         });
 
         let handlingFormSubmit = false;
@@ -38,7 +39,9 @@ export class WysiwygEditor extends Component {
                 handlingFormSubmit = true;
                 this.editor.getContentAsHtml().then(html => {
                     this.input.value = html;
-                    this.input.form.submit();
+                    setTimeout(() => {
+                        this.input.form.requestSubmit();
+                    }, 5);
                 });
             } else {
                 handlingFormSubmit = false;

From c03e44124a3312d6832f71103bda76ab66646a54 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 27 Mar 2025 14:56:32 +0000
Subject: [PATCH 496/666] Lexical: Fixed task list parsing

Updated list DOM parsing to properly consider task list format set by
other MD/WYSIWYG editors.
---
 .../js/wysiwyg/lexical/list/LexicalListNode.ts     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
index 6edf0d64a2e..b5c83adddce 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -332,7 +332,19 @@ function isDomChecklist(domNode: HTMLElement) {
   }
   // if children are checklist items, the node is a checklist ul. Applicable for googledoc checklist pasting.
   for (const child of domNode.childNodes) {
-    if (isHTMLElement(child) && child.hasAttribute('aria-checked')) {
+    if (!isHTMLElement(child)) {
+      continue;
+    }
+
+    if (child.hasAttribute('aria-checked')) {
+      return true;
+    }
+
+    if (child.classList.contains('task-list-item')) {
+      return true;
+    }
+
+    if (child.firstElementChild && child.firstElementChild.matches('input[type="checkbox"]')) {
       return true;
     }
   }

From 62c8eb335785e41c730569ec34df7137f2f325f1 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 27 Mar 2025 17:49:48 +0000
Subject: [PATCH 497/666] Lexical: Made list selections & intendting more
 reliable

- Added handling to not include parent of top-most list range selection
  so that it's not also changed while not visually part of the
  selection range.
- Fixed issue where list items could be left over after unnesting, due
  to empty checks/removals occuring before all child handling.
- Added node sorting, applied to list items during nest operations so
  that selection range remains reliable.
---
 resources/js/wysiwyg/utils/lists.ts | 47 +++++++++++++++++++++++------
 resources/js/wysiwyg/utils/nodes.ts | 24 +++++++++++++++
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index 005b05f9816..3deb9dfb6e9 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -1,6 +1,6 @@
 import {$createTextNode, $getSelection, BaseSelection, LexicalEditor, TextNode} from "lexical";
 import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection} from "./selection";
-import {nodeHasInset} from "./nodes";
+import {$sortNodes, nodeHasInset} from "./nodes";
 import {$createListItemNode, $createListNode, $isListItemNode, $isListNode, ListItemNode} from "@lexical/list";
 
 
@@ -49,16 +49,11 @@ export function $unnestListItem(node: ListItemNode): ListItemNode {
     }
 
     const laterSiblings = node.getNextSiblings();
-
     parentListItem.insertAfter(node);
     if (list.getChildren().length === 0) {
         list.remove();
     }
 
-    if (parentListItem.getChildren().length === 0) {
-        parentListItem.remove();
-    }
-
     if (laterSiblings.length > 0) {
         const childList = $createListNode(list.getListType());
         childList.append(...laterSiblings);
@@ -69,23 +64,54 @@ export function $unnestListItem(node: ListItemNode): ListItemNode {
         list.remove();
     }
 
+    if (parentListItem.getChildren().length === 0) {
+        parentListItem.remove();
+    }
+
     return node;
 }
 
 function getListItemsForSelection(selection: BaseSelection|null): (ListItemNode|null)[] {
     const nodes = selection?.getNodes() || [];
-    const listItemNodes = [];
+    let [start, end] = selection?.getStartEndPoints() || [null, null];
+
+    // Ensure we ignore parent list items of the top-most list item since,
+    // although technically part of the selection, from a user point of
+    // view the selection does not spread to encompass this outer element.
+    const itemsToIgnore: Set<string> = new Set();
+    if (selection && start) {
+        if (selection.isBackward() && end) {
+            [end, start] = [start, end];
+        }
 
+        const startParents = start.getNode().getParents();
+        let foundList = false;
+        for (const parent of startParents) {
+            if ($isListItemNode(parent)) {
+                if (foundList) {
+                    itemsToIgnore.add(parent.getKey());
+                } else {
+                    foundList = true;
+                }
+            }
+        }
+    }
+
+    const listItemNodes = [];
     outer: for (const node of nodes) {
         if ($isListItemNode(node)) {
-            listItemNodes.push(node);
+            if (!itemsToIgnore.has(node.getKey())) {
+                listItemNodes.push(node);
+            }
             continue;
         }
 
         const parents = node.getParents();
         for (const parent of parents) {
             if ($isListItemNode(parent)) {
-                listItemNodes.push(parent);
+                if (!itemsToIgnore.has(parent.getKey())) {
+                    listItemNodes.push(parent);
+                }
                 continue outer;
             }
         }
@@ -110,7 +136,8 @@ function $reduceDedupeListItems(listItems: (ListItemNode|null)[]): ListItemNode[
         }
     }
 
-    return Object.values(listItemMap);
+    const items = Object.values(listItemMap);
+    return $sortNodes(items) as ListItemNode[];
 }
 
 export function $setInsetForSelection(editor: LexicalEditor, change: number): void {
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index b5cc789550c..591232ea385 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -94,6 +94,30 @@ export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null
     return $findMatchingParent(node, isBlockNode);
 }
 
+export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
+    const idChain: string[] = [];
+    const addIds = (n: ElementNode) => {
+        for (const child of n.getChildren()) {
+            idChain.push(child.getKey())
+            if ($isElementNode(child)) {
+                addIds(child)
+            }
+        }
+    };
+
+    const root = $getRoot();
+    addIds(root);
+
+    const sorted = Array.from(nodes);
+    sorted.sort((a, b) => {
+        const aIndex = idChain.indexOf(a.getKey());
+        const bIndex = idChain.indexOf(b.getKey());
+        return aIndex - bIndex;
+    });
+
+    return sorted;
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }

From 9bfcadd95f4c3917ff4aa4fd4b10bfa7ce4c6c09 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 28 Mar 2025 14:17:52 +0000
Subject: [PATCH 498/666] Lexical: Improved navigation around images/media

- Added specific handling to move/insert-up/down on arrow press.
- Prevented resize overlay from interrupting image node focus.
---
 .../lexical/rich-text/LexicalImageNode.ts     |  2 +-
 .../js/wysiwyg/services/keyboard-handling.ts  | 43 +++++++++++++++++--
 resources/sass/_editor.scss                   |  2 +
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
index 9f42ad73204..40f4ab71165 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
@@ -133,7 +133,7 @@ export class ImageNode extends ElementNode {
 
         element.addEventListener('click', e => {
             _editor.update(() => {
-                $selectSingleNode(this);
+                this.select();
             });
         });
 
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index ff6117b2b87..0ef0b81bff8 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -3,7 +3,7 @@ import {
     $createParagraphNode,
     $getSelection,
     $isDecoratorNode,
-    COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND,
+    COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
     KEY_ENTER_COMMAND, KEY_TAB_COMMAND,
@@ -43,7 +43,7 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
 }
 
 /**
- * Insert a new empty node after the selection if the selection contains a single
+ * Insert a new empty node before/after the selection if the selection contains a single
  * selected node (like image, media etc...).
  */
 function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
@@ -67,6 +67,37 @@ function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEve
     return false;
 }
 
+function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event: KeyboardEvent|null, after: boolean = true): boolean {
+    const selectionNodes = getLastSelection(editor)?.getNodes() || [];
+    if (!isSingleSelectedNode(selectionNodes)) {
+        return false;
+    }
+
+    event?.preventDefault();
+
+    const node = selectionNodes[0];
+    const nearestBlock = $getNearestNodeBlockParent(node) || node;
+    let target = after ? nearestBlock.getNextSibling() : nearestBlock.getPreviousSibling();
+
+    requestAnimationFrame(() => {
+        editor.update(() => {
+            if (!target) {
+                target = $createParagraphNode();
+                if (after) {
+                    nearestBlock.insertAfter(target)
+                } else {
+                    nearestBlock.insertBefore(target);
+                }
+            }
+
+            target.selectStart();
+        });
+    });
+
+
+    return true;
+}
+
 /**
  * Insert a new node after a details node, if inside a details node that's
  * the last element, and if the cursor is at the last block within the details node.
@@ -199,8 +230,13 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
         return handleInsetOnTab(context.editor, event);
     }, COMMAND_PRIORITY_LOW);
 
+    const unregisterUp = context.editor.registerCommand(KEY_ARROW_UP_COMMAND, (event): boolean => {
+        return focusAdjacentOrInsertForSingleSelectNode(context.editor, event, false);
+    }, COMMAND_PRIORITY_LOW);
+
     const unregisterDown = context.editor.registerCommand(KEY_ARROW_DOWN_COMMAND, (event): boolean => {
-        return insertAfterDetails(context.editor, event);
+        return insertAfterDetails(context.editor, event)
+            || focusAdjacentOrInsertForSingleSelectNode(context.editor, event, true)
     }, COMMAND_PRIORITY_LOW);
 
     return () => {
@@ -208,6 +244,7 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
         unregisterDelete();
         unregisterEnter();
         unregisterTab();
+        unregisterUp();
         unregisterDown();
     };
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 9f7694e858c..35f11c5a279 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -370,8 +370,10 @@ body.editor-is-fullscreen {
   display: inline-block;
   outline: 2px dashed var(--editor-color-primary);
   direction: ltr;
+  pointer-events: none;
 }
 .editor-node-resizer-handle {
+  pointer-events: auto;
   position: absolute;
   display: block;
   width: 10px;

From bb44334224d6eee53b229e1f59d63b4f1ef45e68 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 28 Mar 2025 18:29:00 +0000
Subject: [PATCH 499/666] Lexical: Added tests to cover recent changes

Also updated list tests to new test process.
---
 .../lexical/core/__tests__/utils/index.ts     |   4 +
 .../__tests__/unit/LexicalListNode.test.ts    | 336 +++++++++---------
 .../__tests__/keyboard-handling.test.ts       |  33 +-
 .../js/wysiwyg/services/keyboard-handling.ts  |  21 +-
 4 files changed, 219 insertions(+), 175 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index d54a64ce89a..6a8e457248b 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -37,6 +37,7 @@ import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {EditorUiContext} from "../../../../ui/framework/core";
 import {EditorUIManager} from "../../../../ui/framework/manager";
+import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
 
 type TestEnv = {
   readonly container: HTMLDivElement;
@@ -484,6 +485,9 @@ export function createTestContext(): EditorUiContext {
   const editor = createTestEditor({
     namespace: 'testing',
     theme: {},
+    nodes: [
+        ImageNode,
+    ]
   });
 
   editor.setRootElement(editorDOM);
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
index 8c7729dbff1..b85383e7da5 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListNode.test.ts
@@ -6,7 +6,7 @@
  *
  */
 import {ParagraphNode, TextNode} from 'lexical';
-import {initializeUnitTest} from 'lexical/__tests__/utils';
+import {createTestContext} from 'lexical/__tests__/utils';
 
 import {
   $createListItemNode,
@@ -16,6 +16,7 @@ import {
   ListItemNode,
   ListNode,
 } from '../..';
+import {$htmlToBlockNodes} from "../../../../utils/nodes";
 
 const editorConfig = Object.freeze({
   namespace: '',
@@ -46,123 +47,122 @@ const editorConfig = Object.freeze({
 });
 
 describe('LexicalListNode tests', () => {
-  initializeUnitTest((testEnv) => {
-    test('ListNode.constructor', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        const listNode = $createListNode('bullet', 1);
-        expect(listNode.getType()).toBe('list');
-        expect(listNode.getTag()).toBe('ul');
-        expect(listNode.getTextContent()).toBe('');
-      });
-
-      // @ts-expect-error
-      expect(() => $createListNode()).toThrow();
+  test('ListNode.constructor', async () => {
+    const {editor} = createTestContext();
+
+    await editor.update(() => {
+      const listNode = $createListNode('bullet', 1);
+      expect(listNode.getType()).toBe('list');
+      expect(listNode.getTag()).toBe('ul');
+      expect(listNode.getTextContent()).toBe('');
     });
 
-    test('ListNode.getTag()', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        const ulListNode = $createListNode('bullet', 1);
-        expect(ulListNode.getTag()).toBe('ul');
-        const olListNode = $createListNode('number', 1);
-        expect(olListNode.getTag()).toBe('ol');
-        const checkListNode = $createListNode('check', 1);
-        expect(checkListNode.getTag()).toBe('ul');
-      });
+    // @ts-expect-error
+    expect(() => $createListNode()).toThrow();
+  });
+
+  test('ListNode.getTag()', async () => {
+    const {editor} = createTestContext();
+
+    await editor.update(() => {
+      const ulListNode = $createListNode('bullet', 1);
+      expect(ulListNode.getTag()).toBe('ul');
+      const olListNode = $createListNode('number', 1);
+      expect(olListNode.getTag()).toBe('ol');
+      const checkListNode = $createListNode('check', 1);
+      expect(checkListNode.getTag()).toBe('ul');
     });
+  });
 
-    test('ListNode.createDOM()', async () => {
-      const {editor} = testEnv;
+  test('ListNode.createDOM()', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = $createListNode('bullet', 1);
-        expect(listNode.createDOM(editorConfig).outerHTML).toBe(
+    await editor.update(() => {
+      const listNode = $createListNode('bullet', 1);
+      expect(listNode.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
-        );
-        expect(
+      );
+      expect(
           listNode.createDOM({
             namespace: '',
             theme: {
               list: {},
             },
           }).outerHTML,
-        ).toBe('<ul></ul>');
-        expect(
+      ).toBe('<ul></ul>');
+      expect(
           listNode.createDOM({
             namespace: '',
             theme: {},
           }).outerHTML,
-        ).toBe('<ul></ul>');
-      });
+      ).toBe('<ul></ul>');
     });
+  });
 
-    test('ListNode.createDOM() correctly applies classes to a nested ListNode', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        const listNode1 = $createListNode('bullet');
-        const listNode2 = $createListNode('bullet');
-        const listNode3 = $createListNode('bullet');
-        const listNode4 = $createListNode('bullet');
-        const listNode5 = $createListNode('bullet');
-        const listNode6 = $createListNode('bullet');
-        const listNode7 = $createListNode('bullet');
-
-        const listItem1 = $createListItemNode();
-        const listItem2 = $createListItemNode();
-        const listItem3 = $createListItemNode();
-        const listItem4 = $createListItemNode();
-
-        listNode1.append(listItem1);
-        listItem1.append(listNode2);
-        listNode2.append(listItem2);
-        listItem2.append(listNode3);
-        listNode3.append(listItem3);
-        listItem3.append(listNode4);
-        listNode4.append(listItem4);
-        listNode4.append(listNode5);
-        listNode5.append(listNode6);
-        listNode6.append(listNode7);
-
-        expect(listNode1.createDOM(editorConfig).outerHTML).toBe(
+  test('ListNode.createDOM() correctly applies classes to a nested ListNode', async () => {
+    const {editor} = createTestContext();
+
+    await editor.update(() => {
+      const listNode1 = $createListNode('bullet');
+      const listNode2 = $createListNode('bullet');
+      const listNode3 = $createListNode('bullet');
+      const listNode4 = $createListNode('bullet');
+      const listNode5 = $createListNode('bullet');
+      const listNode6 = $createListNode('bullet');
+      const listNode7 = $createListNode('bullet');
+
+      const listItem1 = $createListItemNode();
+      const listItem2 = $createListItemNode();
+      const listItem3 = $createListItemNode();
+      const listItem4 = $createListItemNode();
+
+      listNode1.append(listItem1);
+      listItem1.append(listNode2);
+      listNode2.append(listItem2);
+      listItem2.append(listNode3);
+      listNode3.append(listItem3);
+      listItem3.append(listNode4);
+      listNode4.append(listItem4);
+      listNode4.append(listNode5);
+      listNode5.append(listNode6);
+      listNode6.append(listNode7);
+
+      expect(listNode1.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
-        );
-        expect(
+      );
+      expect(
           listNode1.createDOM({
             namespace: '',
             theme: {
               list: {},
             },
           }).outerHTML,
-        ).toBe('<ul></ul>');
-        expect(
+      ).toBe('<ul></ul>');
+      expect(
           listNode1.createDOM({
             namespace: '',
             theme: {},
           }).outerHTML,
-        ).toBe('<ul></ul>');
-        expect(listNode2.createDOM(editorConfig).outerHTML).toBe(
+      ).toBe('<ul></ul>');
+      expect(listNode2.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-2"></ul>',
-        );
-        expect(listNode3.createDOM(editorConfig).outerHTML).toBe(
+      );
+      expect(listNode3.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-3"></ul>',
-        );
-        expect(listNode4.createDOM(editorConfig).outerHTML).toBe(
+      );
+      expect(listNode4.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-4"></ul>',
-        );
-        expect(listNode5.createDOM(editorConfig).outerHTML).toBe(
+      );
+      expect(listNode5.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-5"></ul>',
-        );
-        expect(listNode6.createDOM(editorConfig).outerHTML).toBe(
+      );
+      expect(listNode6.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-6"></ul>',
-        );
-        expect(listNode7.createDOM(editorConfig).outerHTML).toBe(
+      );
+      expect(listNode7.createDOM(editorConfig).outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-7"></ul>',
-        );
-        expect(
+      );
+      expect(
           listNode5.createDOM({
             namespace: '',
             theme: {
@@ -176,123 +176,135 @@ describe('LexicalListNode tests', () => {
               },
             },
           }).outerHTML,
-        ).toBe('<ul class="my-ul-list-class my-ul-list-class-2"></ul>');
-      });
+      ).toBe('<ul class="my-ul-list-class my-ul-list-class-2"></ul>');
     });
+  });
 
-    test('ListNode.updateDOM()', async () => {
-      const {editor} = testEnv;
+  test('ListNode.updateDOM()', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = $createListNode('bullet', 1);
-        const domElement = listNode.createDOM(editorConfig);
+    await editor.update(() => {
+      const listNode = $createListNode('bullet', 1);
+      const domElement = listNode.createDOM(editorConfig);
 
-        expect(domElement.outerHTML).toBe(
+      expect(domElement.outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
-        );
+      );
 
-        const newListNode = $createListNode('number', 1);
-        const result = newListNode.updateDOM(
+      const newListNode = $createListNode('number', 1);
+      const result = newListNode.updateDOM(
           listNode,
           domElement,
           editorConfig,
-        );
+      );
 
-        expect(result).toBe(true);
-        expect(domElement.outerHTML).toBe(
+      expect(result).toBe(true);
+      expect(domElement.outerHTML).toBe(
           '<ul class="my-ul-list-class my-ul-list-class-1"></ul>',
-        );
-      });
+      );
     });
+  });
 
-    test('ListNode.append() should properly transform a ListItemNode', async () => {
-      const {editor} = testEnv;
+  test('ListNode.append() should properly transform a ListItemNode', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = new ListNode('bullet', 1);
-        const listItemNode = new ListItemNode();
-        const textNode = new TextNode('Hello');
+    await editor.update(() => {
+      const listNode = new ListNode('bullet', 1);
+      const listItemNode = new ListItemNode();
+      const textNode = new TextNode('Hello');
 
-        listItemNode.append(textNode);
-        const nodesToAppend = [listItemNode];
+      listItemNode.append(textNode);
+      const nodesToAppend = [listItemNode];
 
-        expect(listNode.append(...nodesToAppend)).toBe(listNode);
-        expect(listNode.getFirstChild()).toBe(listItemNode);
-        expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
-      });
+      expect(listNode.append(...nodesToAppend)).toBe(listNode);
+      expect(listNode.getFirstChild()).toBe(listItemNode);
+      expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
     });
+  });
 
-    test('ListNode.append() should properly transform a ListNode', async () => {
-      const {editor} = testEnv;
+  test('ListNode.append() should properly transform a ListNode', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = new ListNode('bullet', 1);
-        const nestedListNode = new ListNode('bullet', 1);
-        const listItemNode = new ListItemNode();
-        const textNode = new TextNode('Hello');
+    await editor.update(() => {
+      const listNode = new ListNode('bullet', 1);
+      const nestedListNode = new ListNode('bullet', 1);
+      const listItemNode = new ListItemNode();
+      const textNode = new TextNode('Hello');
 
-        listItemNode.append(textNode);
-        nestedListNode.append(listItemNode);
+      listItemNode.append(textNode);
+      nestedListNode.append(listItemNode);
 
-        const nodesToAppend = [nestedListNode];
+      const nodesToAppend = [nestedListNode];
 
-        expect(listNode.append(...nodesToAppend)).toBe(listNode);
-        expect($isListItemNode(listNode.getFirstChild())).toBe(true);
-        expect(listNode.getFirstChild<ListItemNode>()!.getFirstChild()).toBe(
+      expect(listNode.append(...nodesToAppend)).toBe(listNode);
+      expect($isListItemNode(listNode.getFirstChild())).toBe(true);
+      expect(listNode.getFirstChild<ListItemNode>()!.getFirstChild()).toBe(
           nestedListNode,
-        );
-      });
+      );
     });
+  });
 
-    test('ListNode.append() should properly transform a ParagraphNode', async () => {
-      const {editor} = testEnv;
+  test('ListNode.append() should properly transform a ParagraphNode', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = new ListNode('bullet', 1);
-        const paragraph = new ParagraphNode();
-        const textNode = new TextNode('Hello');
-        paragraph.append(textNode);
-        const nodesToAppend = [paragraph];
+    await editor.update(() => {
+      const listNode = new ListNode('bullet', 1);
+      const paragraph = new ParagraphNode();
+      const textNode = new TextNode('Hello');
+      paragraph.append(textNode);
+      const nodesToAppend = [paragraph];
 
-        expect(listNode.append(...nodesToAppend)).toBe(listNode);
-        expect($isListItemNode(listNode.getFirstChild())).toBe(true);
-        expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
-      });
+      expect(listNode.append(...nodesToAppend)).toBe(listNode);
+      expect($isListItemNode(listNode.getFirstChild())).toBe(true);
+      expect(listNode.getFirstChild()?.getTextContent()).toBe('Hello');
     });
+  });
 
-    test('$createListNode()', async () => {
-      const {editor} = testEnv;
+  test('$createListNode()', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const listNode = $createListNode('bullet', 1);
-        const createdListNode = $createListNode('bullet');
+    await editor.update(() => {
+      const listNode = $createListNode('bullet', 1);
+      const createdListNode = $createListNode('bullet');
 
-        expect(listNode.__type).toEqual(createdListNode.__type);
-        expect(listNode.__parent).toEqual(createdListNode.__parent);
-        expect(listNode.__tag).toEqual(createdListNode.__tag);
-        expect(listNode.__key).not.toEqual(createdListNode.__key);
-      });
+      expect(listNode.__type).toEqual(createdListNode.__type);
+      expect(listNode.__parent).toEqual(createdListNode.__parent);
+      expect(listNode.__tag).toEqual(createdListNode.__tag);
+      expect(listNode.__key).not.toEqual(createdListNode.__key);
     });
+  });
+
+  test('$isListNode()', async () => {
+    const {editor} = createTestContext();
+
+    await editor.update(() => {
+      const listNode = $createListNode('bullet', 1);
 
-    test('$isListNode()', async () => {
-      const {editor} = testEnv;
+      expect($isListNode(listNode)).toBe(true);
+    });
+  });
 
-      await editor.update(() => {
-        const listNode = $createListNode('bullet', 1);
+  test('$createListNode() with tag name (backward compatibility)', async () => {
+    const {editor} = createTestContext();
 
-        expect($isListNode(listNode)).toBe(true);
-      });
+    await editor.update(() => {
+      const numberList = $createListNode('number', 1);
+      const bulletList = $createListNode('bullet', 1);
+      expect(numberList.__listType).toBe('number');
+      expect(bulletList.__listType).toBe('bullet');
     });
+  });
 
-    test('$createListNode() with tag name (backward compatibility)', async () => {
-      const {editor} = testEnv;
+  test('importDOM handles old editor expected task list format', async () => {
+    const {editor} = createTestContext();
 
-      await editor.update(() => {
-        const numberList = $createListNode('number', 1);
-        const bulletList = $createListNode('bullet', 1);
-        expect(numberList.__listType).toBe('number');
-        expect(bulletList.__listType).toBe('bullet');
-      });
+    let list!: ListNode;
+    editor.update(() => {
+      const nodes = $htmlToBlockNodes(editor, `<ul><li class="task-list-item"><input checked="" disabled="" type="checkbox"> A</li></ul>`);
+      list = nodes[0] as ListNode;
     });
+
+    expect(list).toBeInstanceOf(ListNode);
+    expect(list.getListType()).toBe('check');
   });
 });
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
index 736c3573c5b..cd4235f2f06 100644
--- a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -1,7 +1,7 @@
 import {
     createTestContext, destroyFromContext,
     dispatchKeydownEventForNode,
-    dispatchKeydownEventForSelectedNode,
+    dispatchKeydownEventForSelectedNode, expectNodeShapeToMatch,
 } from "lexical/__tests__/utils";
 import {
     $createParagraphNode, $createTextNode,
@@ -13,6 +13,7 @@ import {registerKeyboardHandling} from "../keyboard-handling";
 import {registerRichText} from "@lexical/rich-text";
 import {EditorUiContext} from "../../ui/framework/core";
 import {$createListItemNode, $createListNode, ListItemNode, ListNode} from "@lexical/list";
+import {$createImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
 
 describe('Keyboard-handling service tests', () => {
 
@@ -127,4 +128,34 @@ describe('Keyboard-handling service tests', () => {
             expect(selectedNode?.getKey()).toBe(innerList.getChildren()[0].getKey());
         });
     });
+
+    test('Images: up on selected image creates new paragraph if none above', () => {
+        let image!: ImageNode;
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            const imageWrap = $createParagraphNode();
+            image = $createImageNode('https://example.com/cat.png');
+            imageWrap.append(image);
+            root.append(imageWrap);
+            image.select();
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'paragraph',
+            children: [
+                {type: 'image'}
+            ],
+        }]);
+
+        dispatchKeydownEventForNode(image, editor, 'ArrowUp');
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'paragraph',
+        }, {
+            type: 'paragraph',
+            children: [
+                {type: 'image'}
+            ],
+        }]);
+    });
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 0ef0b81bff8..a7f1ec7f0b0 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -79,22 +79,19 @@ function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event:
     const nearestBlock = $getNearestNodeBlockParent(node) || node;
     let target = after ? nearestBlock.getNextSibling() : nearestBlock.getPreviousSibling();
 
-    requestAnimationFrame(() => {
-        editor.update(() => {
-            if (!target) {
-                target = $createParagraphNode();
-                if (after) {
-                    nearestBlock.insertAfter(target)
-                } else {
-                    nearestBlock.insertBefore(target);
-                }
+    editor.update(() => {
+        if (!target) {
+            target = $createParagraphNode();
+            if (after) {
+                nearestBlock.insertAfter(target)
+            } else {
+                nearestBlock.insertBefore(target);
             }
+        }
 
-            target.selectStart();
-        });
+        target.selectStart();
     });
 
-
     return true;
 }
 

From 802f69cf35abba8ff75b0ef7bbed09bbcda62816 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 30 Mar 2025 17:36:48 +0100
Subject: [PATCH 500/666] Comments: Fixed missing comment timestamps

Due to deleted code during Laravel 11 upgrade.
Added test to cover.
Closes #5555
---
 resources/views/comments/comment.blade.php |  2 +-
 tests/Entity/CommentTest.php               | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index b507a810bb1..2bf89d6832d 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -24,7 +24,7 @@ class="comment-box">
                 @else
                     {{ trans('common.deleted_user') }}
                 @endif
-                <span title="{{ $comment->created_at }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $comment->created]) }}</span>
+                <span title="{{ $comment->created_at }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $comment->created_at->diffForHumans() ]) }}</span>
                 @if($comment->isUpdated())
                     <span class="mx-xs">&bull;</span>
                     <span title="{{ trans('entities.comment_updated', ['updateDiff' => $comment->updated_at, 'username' => $comment->updatedBy->name ?? trans('common.deleted_user')]) }}">
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 73136235ce0..9e019e3d148 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -214,4 +214,21 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
         $resp->assertSee('window.editor_translations', false);
         $resp->assertSee('component="entity-selector"', false);
     }
+
+    public function test_comment_displays_relative_times()
+    {
+        $page = $this->entities->page();
+        $comment = Comment::factory()->create(['entity_id' => $page->id, 'entity_type' => $page->getMorphClass()]);
+        $comment->created_at = now()->subWeek();
+        $comment->updated_at = now()->subDay();
+        $comment->save();
+
+        $pageResp = $this->asAdmin()->get($page->getUrl());
+        $html = $this->withHtml($pageResp);
+
+        // Create date shows relative time as text to user
+        $html->assertElementContains('.comment-box', 'commented 1 week ago');
+        // Updated indicator has full time as title
+        $html->assertElementContains('.comment-box span[title^="Updated ' . $comment->updated_at->format('Y-m-d') .  '"]', 'Updated');
+    }
 }

From 1ba0d26fdd1e673dfcaefc87e2fa38f08cac61ad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Apr 2025 15:17:17 +0100
Subject: [PATCH 501/666] Sort Rules: Updated name comparison to not ignore
 non-ascii chars

Related to #5550 and #5542
---
 app/Sorting/SortSetOperationComparisons.php | 4 ++--
 tests/Sorting/SortRuleTest.php              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Sorting/SortSetOperationComparisons.php b/app/Sorting/SortSetOperationComparisons.php
index e506e9a139d..cb20e1860f7 100644
--- a/app/Sorting/SortSetOperationComparisons.php
+++ b/app/Sorting/SortSetOperationComparisons.php
@@ -14,12 +14,12 @@ class SortSetOperationComparisons
 {
     public static function nameAsc(Entity $a, Entity $b): int
     {
-        return strtolower(ASCII::to_transliterate($a->name)) <=>  strtolower(ASCII::to_transliterate($b->name));
+        return strtolower(ASCII::to_transliterate($a->name, null)) <=> strtolower(ASCII::to_transliterate($b->name, null));
     }
 
     public static function nameDesc(Entity $a, Entity $b): int
     {
-        return strtolower(ASCII::to_transliterate($b->name)) <=>  strtolower(ASCII::to_transliterate($a->name));
+        return strtolower(ASCII::to_transliterate($b->name, null)) <=> strtolower(ASCII::to_transliterate($a->name, null));
     }
 
     public static function nameNumericAsc(Entity $a, Entity $b): int
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index b0f20cba5ae..4a9d3a7b33f 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -200,6 +200,8 @@ public function test_name_alphabetical_ordering()
             "bread",
             "Éclaire",
             "egg",
+            "É😀ire",
+            "É🫠ire",
             "Milk",
             "pizza",
             "Tomato",

From 61173498933fe230c75de9893645744578dba48c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Apr 2025 15:30:31 +0100
Subject: [PATCH 502/666] Deps: Updated composer packages

---
 composer.lock | 278 +++++++++++++++++++++++++-------------------------
 1 file changed, 139 insertions(+), 139 deletions(-)

diff --git a/composer.lock b/composer.lock
index 4dfc8ec85a4..e3e592852c1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.342.6",
+            "version": "3.342.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2ad93ef447289da27892707efa683c1ae7ced85f"
+                "reference": "e6c81bf323b082f8fe2b76d8d41e2614806d5892"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ad93ef447289da27892707efa683c1ae7ced85f",
-                "reference": "2ad93ef447289da27892707efa683c1ae7ced85f",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e6c81bf323b082f8fe2b76d8d41e2614806d5892",
+                "reference": "e6c81bf323b082f8fe2b76d8d41e2614806d5892",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.18"
             },
-            "time": "2025-03-14T18:01:18+00:00"
+            "time": "2025-04-01T18:15:02+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -855,16 +855,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "b115554301161fa21467629f1e1391c1936de517"
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517",
-                "reference": "b115554301161fa21467629f1e1391c1936de517",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
                 "shasum": ""
             },
             "require": {
@@ -910,7 +910,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.3"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -918,7 +918,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-27T00:36:43+00:00"
+            "time": "2025-03-06T22:45:56+00:00"
         },
         {
             "name": "firebase/php-jwt",
@@ -1118,16 +1118,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.9.2",
+            "version": "7.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
-                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
                 "shasum": ""
             },
             "require": {
@@ -1224,7 +1224,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
             },
             "funding": [
                 {
@@ -1240,20 +1240,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-24T11:22:20+00:00"
+            "time": "2025-03-27T13:37:11+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.4",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
-                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
+                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
                 "shasum": ""
             },
             "require": {
@@ -1307,7 +1307,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.4"
+                "source": "https://github.com/guzzle/promises/tree/2.2.0"
             },
             "funding": [
                 {
@@ -1323,20 +1323,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-17T10:06:22+00:00"
+            "time": "2025-03-27T13:27:01+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
-                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
                 "shasum": ""
             },
             "require": {
@@ -1423,7 +1423,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
             },
             "funding": [
                 {
@@ -1439,7 +1439,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T11:15:46+00:00"
+            "time": "2025-03-27T12:30:47+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -1529,16 +1529,16 @@
         },
         {
             "name": "intervention/gif",
-            "version": "4.2.1",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/gif.git",
-                "reference": "6addac2c68b4bc0e37d0d3ccedda57eb84729c49"
+                "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/gif/zipball/6addac2c68b4bc0e37d0d3ccedda57eb84729c49",
-                "reference": "6addac2c68b4bc0e37d0d3ccedda57eb84729c49",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/5999eac6a39aa760fb803bc809e8909ee67b451a",
+                "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a",
                 "shasum": ""
             },
             "require": {
@@ -1546,7 +1546,7 @@
             },
             "require-dev": {
                 "phpstan/phpstan": "^2.1",
-                "phpunit/phpunit": "^10.0 || ^11.0",
+                "phpunit/phpunit": "^10.0 || ^11.0  || ^12.0",
                 "slevomat/coding-standard": "~8.0",
                 "squizlabs/php_codesniffer": "^3.8"
             },
@@ -1577,7 +1577,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/gif/issues",
-                "source": "https://github.com/Intervention/gif/tree/4.2.1"
+                "source": "https://github.com/Intervention/gif/tree/4.2.2"
             },
             "funding": [
                 {
@@ -1593,7 +1593,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-01-05T10:52:39+00:00"
+            "time": "2025-03-29T07:46:21+00:00"
         },
         {
             "name": "intervention/image",
@@ -2014,16 +2014,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.3",
+            "version": "v2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f"
+                "reference": "b352cf0534aa1ae6b4d825d1e762e35d43f8a841"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f379c13663245f7aa4512a7869f62eb14095f23f",
-                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/b352cf0534aa1ae6b4d825d1e762e35d43f8a841",
+                "reference": "b352cf0534aa1ae6b4d825d1e762e35d43f8a841",
                 "shasum": ""
             },
             "require": {
@@ -2071,20 +2071,20 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2025-02-11T15:03:05+00:00"
+            "time": "2025-03-19T13:51:03+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.18.0",
+            "version": "v5.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "7809dc71250e074cd42970f0f803f2cddc04c5de"
+                "reference": "c40f843c5643fb6b089e46ce9794b8408bf08319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/7809dc71250e074cd42970f0f803f2cddc04c5de",
-                "reference": "7809dc71250e074cd42970f0f803f2cddc04c5de",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/c40f843c5643fb6b089e46ce9794b8408bf08319",
+                "reference": "c40f843c5643fb6b089e46ce9794b8408bf08319",
                 "shasum": ""
             },
             "require": {
@@ -2101,7 +2101,7 @@
             "require-dev": {
                 "mockery/mockery": "^1.0",
                 "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan": "^1.12.23",
                 "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5"
             },
             "type": "library",
@@ -2143,7 +2143,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-02-11T13:38:19+00:00"
+            "time": "2025-03-27T17:26:42+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3116,16 +3116,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.8.1",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4"
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
-                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
                 "shasum": ""
             },
             "require": {
@@ -3203,7 +3203,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.8.1"
+                "source": "https://github.com/Seldaek/monolog/tree/3.9.0"
             },
             "funding": [
                 {
@@ -3215,7 +3215,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-05T17:15:07+00:00"
+            "time": "2025-03-24T10:02:05+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.6",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd"
+                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
-                "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d",
+                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d",
                 "shasum": ""
             },
             "require": {
@@ -3387,7 +3387,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-20T17:33:38+00:00"
+            "time": "2025-03-27T12:57:33+00:00"
         },
         {
             "name": "nette/schema",
@@ -3453,16 +3453,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.5",
+            "version": "v4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
+                "reference": "ce708655043c7050eb050df361c5e313cf708309"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
+                "reference": "ce708655043c7050eb050df361c5e313cf708309",
                 "shasum": ""
             },
             "require": {
@@ -3533,9 +3533,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.5"
+                "source": "https://github.com/nette/utils/tree/v4.0.6"
             },
-            "time": "2024-08-07T15:39:19+00:00"
+            "time": "2025-03-30T21:06:30+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4698,16 +4698,16 @@
         },
         {
             "name": "ramsey/collection",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/collection.git",
-                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109"
+                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
-                "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2",
+                "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2",
                 "shasum": ""
             },
             "require": {
@@ -4768,9 +4768,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/2.1.0"
+                "source": "https://github.com/ramsey/collection/tree/2.1.1"
             },
-            "time": "2025-03-02T04:48:29+00:00"
+            "time": "2025-03-22T05:38:12+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -4908,16 +4908,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.7.0",
+            "version": "v8.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf"
+                "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/f414ff953002a9b18e3a116f5e462c56f21237cf",
-                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/3de493bdddfd1f051249af725c7e0d2c38fed740",
+                "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740",
                 "shasum": ""
             },
             "require": {
@@ -4925,7 +4925,7 @@
                 "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.40"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -4967,9 +4967,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.7.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.8.0"
             },
-            "time": "2024-10-27T17:38:32+00:00"
+            "time": "2025-03-23T17:59:05+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5488,16 +5488,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.1",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+                "reference": "e51498ea18570c062e7df29d05a7003585b19b88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
+                "reference": "e51498ea18570c062e7df29d05a7003585b19b88",
                 "shasum": ""
             },
             "require": {
@@ -5561,7 +5561,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.1"
+                "source": "https://github.com/symfony/console/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -5577,7 +5577,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T03:49:26+00:00"
+            "time": "2025-03-12T08:11:12+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5713,16 +5713,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.2.4",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "aabf79938aa795350c07ce6464dd1985607d95d5"
+                "reference": "102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/aabf79938aa795350c07ce6464dd1985607d95d5",
-                "reference": "aabf79938aa795350c07ce6464dd1985607d95d5",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b",
+                "reference": "102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b",
                 "shasum": ""
             },
             "require": {
@@ -5768,7 +5768,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.2.4"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -5784,7 +5784,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-02T20:27:07+00:00"
+            "time": "2025-03-03T07:12:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6008,16 +6008,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.2.3",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "ee1b504b8926198be89d05e5b6fc4c3810c090f0"
+                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ee1b504b8926198be89d05e5b6fc4c3810c090f0",
-                "reference": "ee1b504b8926198be89d05e5b6fc4c3810c090f0",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/371272aeb6286f8135e028ca535f8e4d6f114126",
+                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126",
                 "shasum": ""
             },
             "require": {
@@ -6066,7 +6066,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.2.3"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -6082,20 +6082,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-17T10:56:55+00:00"
+            "time": "2025-03-25T15:54:33+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.4",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "9f1103734c5789798fefb90e91de4586039003ed"
+                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f1103734c5789798fefb90e91de4586039003ed",
-                "reference": "9f1103734c5789798fefb90e91de4586039003ed",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
+                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
                 "shasum": ""
             },
             "require": {
@@ -6180,7 +6180,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -6196,7 +6196,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-26T11:01:22+00:00"
+            "time": "2025-03-28T13:32:50+00:00"
         },
         {
             "name": "symfony/mime",
@@ -6920,16 +6920,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.4",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
+                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
                 "shasum": ""
             },
             "require": {
@@ -6961,7 +6961,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.4"
+                "source": "https://github.com/symfony/process/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -6977,7 +6977,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-05T08:33:46+00:00"
+            "time": "2025-03-13T12:21:46+00:00"
         },
         {
             "name": "symfony/routing",
@@ -8589,16 +8589,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.8",
+            "version": "2.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
+                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
+                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
                 "shasum": ""
             },
             "require": {
@@ -8643,7 +8643,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-09T09:30:48+00:00"
+            "time": "2025-03-24T13:45:00+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8970,16 +8970,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.12",
+            "version": "11.5.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d42785840519401ed2113292263795eb4c0f95da"
+                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da",
-                "reference": "d42785840519401ed2113292263795eb4c0f95da",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
+                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
                 "shasum": ""
             },
             "require": {
@@ -8999,14 +8999,14 @@
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
-                "sebastian/code-unit": "^3.0.2",
+                "sebastian/code-unit": "^3.0.3",
                 "sebastian/comparator": "^6.3.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
-                "sebastian/type": "^5.1.0",
+                "sebastian/type": "^5.1.2",
                 "sebastian/version": "^5.0.2",
                 "staabm/side-effects-detector": "^1.0.5"
             },
@@ -9051,7 +9051,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.15"
             },
             "funding": [
                 {
@@ -9067,7 +9067,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-07T07:31:03+00:00"
+            "time": "2025-03-23T16:02:11+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9128,16 +9128,16 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca"
+                "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
-                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64",
+                "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64",
                 "shasum": ""
             },
             "require": {
@@ -9173,7 +9173,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
                 "security": "https://github.com/sebastianbergmann/code-unit/security/policy",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3"
             },
             "funding": [
                 {
@@ -9181,7 +9181,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-12T09:59:06+00:00"
+            "time": "2025-03-19T07:56:08+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -9886,16 +9886,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "5.1.0",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
+                "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
-                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
+                "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
                 "shasum": ""
             },
             "require": {
@@ -9931,7 +9931,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "security": "https://github.com/sebastianbergmann/type/security/policy",
-                "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/5.1.2"
             },
             "funding": [
                 {
@@ -9939,7 +9939,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-17T13:12:04+00:00"
+            "time": "2025-03-18T13:35:50+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9997,16 +9997,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.11.3",
+            "version": "3.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
+                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
-                "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
+                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
                 "shasum": ""
             },
             "require": {
@@ -10073,11 +10073,11 @@
                     "type": "open_collective"
                 },
                 {
-                    "url": "https://thanks.dev/phpcsstandards",
+                    "url": "https://thanks.dev/u/gh/phpcsstandards",
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-01-23T17:04:15+00:00"
+            "time": "2025-03-18T05:04:51+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",

From 42cbd6adefafc053f5b666ff26b76e2843d665a1 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 2 Apr 2025 17:19:34 +0100
Subject: [PATCH 503/666] Updated translations with latest Crowdin changes
 (#5537)

---
 lang/ar/activities.php          |  30 ++---
 lang/ar/auth.php                |  36 +++---
 lang/ar/editor.php              | 214 ++++++++++++++++----------------
 lang/ar/entities.php            |   8 +-
 lang/ar/errors.php              |  26 ++--
 lang/ar/notifications.php       |  34 ++---
 lang/ar/preferences.php         |  76 ++++++------
 lang/ar/settings.php            | 206 +++++++++++++++---------------
 lang/ar/validation.php          |   8 +-
 lang/de/activities.php          |   2 +-
 lang/de_informal/activities.php |   2 +-
 lang/fr/editor.php              |   4 +-
 lang/fr/entities.php            |   8 +-
 lang/fr/settings.php            |  52 ++++----
 lang/he/activities.php          |  12 +-
 lang/he/auth.php                |  12 +-
 lang/he/entities.php            |  26 ++--
 lang/pt_BR/activities.php       |  12 +-
 lang/pt_BR/editor.php           |   8 +-
 lang/pt_BR/entities.php         |   6 +-
 lang/pt_BR/settings.php         |  52 ++++----
 lang/ru/activities.php          |  12 +-
 lang/ru/common.php              |   2 +-
 lang/ru/editor.php              |   2 +-
 lang/ru/entities.php            |   6 +-
 lang/ru/errors.php              |  10 +-
 lang/ru/settings.php            |  34 ++---
 lang/sl/activities.php          |   2 +-
 lang/sl/auth.php                |   6 +-
 lang/sl/common.php              |  12 +-
 lang/sl/entities.php            |  16 +--
 lang/sl/errors.php              |   2 +-
 lang/sl/pagination.php          |   4 +-
 lang/sl/settings.php            |   8 +-
 lang/zh_CN/activities.php       |  12 +-
 lang/zh_CN/editor.php           |   4 +-
 lang/zh_CN/entities.php         |   2 +-
 lang/zh_CN/settings.php         |   2 +-
 lang/zh_TW/activities.php       |  12 +-
 lang/zh_TW/editor.php           |   8 +-
 lang/zh_TW/entities.php         |   6 +-
 lang/zh_TW/settings.php         |  56 ++++-----
 42 files changed, 526 insertions(+), 526 deletions(-)

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index db807b015e4..bf5d4411fed 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -66,10 +66,10 @@
     'auth_register' => 'سجل كمستخدم جديد',
     'auth_password_reset_request' => 'طلب رابط جديد لإعادة تعيين كلمة المرور',
     'auth_password_reset_update' => 'إعادة تعيين كلمة مرور المستخدم',
-    'mfa_setup_method' => 'طريقة MFA المكونة',
-    'mfa_setup_method_notification' => 'تم تكوين طريقة متعددة العوامل بنجاح',
-    'mfa_remove_method' => 'إزالة طريقة MFA',
-    'mfa_remove_method_notification' => 'تمت إزالة طريقة متعددة العوامل بنجاح',
+    'mfa_setup_method' => 'طريقة المصادقة متعددة العوامل المُهيأة',
+    'mfa_setup_method_notification' => 'تم إعداد المصادقة متعددة العوامل بنجاح',
+    'mfa_remove_method' => 'إزالة طريقة المصادقة متعددة العوامل',
+    'mfa_remove_method_notification' => 'تمت إزالة المصادقة متعددة العوامل بنجاح',
 
     // Settings
     'settings_update' => 'تحديث الإعدادات',
@@ -77,12 +77,12 @@
     'maintenance_action_run' => 'إجراء الصيانة',
 
     // Webhooks
-    'webhook_create' => 'تم إنشاء webhook',
-    'webhook_create_notification' => 'تم إنشاء Webhook بنجاح',
-    'webhook_update' => 'تم تحديث webhook',
-    'webhook_update_notification' => 'تم تحديث Webhook بنجاح',
-    'webhook_delete' => 'حذف webhook',
-    'webhook_delete_notification' => 'تم حذف Webhook بنجاح',
+    'webhook_create' => 'تم إنشاء خطاف ويب',
+    'webhook_create_notification' => 'تم إنشاء خطاف ويب بنجاح',
+    'webhook_update' => 'تم تحديث خطاف الويب',
+    'webhook_update_notification' => 'تم تحديث خطاف الويب بنجاح',
+    'webhook_delete' => 'حذف خطاف ويب',
+    'webhook_delete_notification' => 'تم حذف خطاف الويب بنجاح',
 
     // Imports
     'import_create' => 'تم إنشاء الاستيراد',
@@ -94,7 +94,7 @@
 
     // Users
     'user_create' => 'إنشاء مستخدم',
-    'user_create_notification' => 'تم انشاء الحساب',
+    'user_create_notification' => 'تم إنشاء الحساب',
     'user_update' => 'المستخدم المحدث',
     'user_update_notification' => 'تم تحديث المستخدم بنجاح',
     'user_delete' => 'المستخدم المحذوف',
@@ -102,11 +102,11 @@
 
     // API Tokens
     'api_token_create' => 'تم إنشاء رمز واجهة برمجة التطبيقات -API-',
-    'api_token_create_notification' => 'تم إنشاء رمز الـ API بنجاح',
+    'api_token_create_notification' => 'تم إنشاء  واجهة برمجة التطبيقات -API- بنجاح',
     'api_token_update' => 'رمز واجهة برمجة التطبيقات المحدث',
-    'api_token_update_notification' => 'تم تحديث رمز الـ API بنجاح',
+    'api_token_update_notification' => 'تم تحديث رمز واجهة برمجة التطبيقات -API- بنجاح',
     'api_token_delete' => 'رمز واجهة برمجة التطبيقات المحذوف',
-    'api_token_delete_notification' => 'تم حذف رمز الـ API بنجاح',
+    'api_token_delete_notification' => 'تم حذف رمز  واجهة برمجة التطبيقات -API- بنجاح',
 
     // Roles
     'role_create' => 'إنشاء صَلاحِيَة',
@@ -136,5 +136,5 @@
     'sort_rule_delete_notification' => 'تم حذف قاعدة الفرز بنجاح',
 
     // Other
-    'permissions_update'          => 'تحديث الأذونات',
+    'permissions_update'          => 'تحديث الصلاحيات',
 ];
diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index aa406bcece4..3890589cd13 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -7,22 +7,22 @@
 return [
 
     'failed' => 'البيانات المعطاة لا توافق سجلاتنا.',
-    'throttle' => 'تجاوزت الحد الأقصى من المحاولات. الرجاء المحاولة مرة أخرى بعد :seconds seconds.',
+    'throttle' => 'تجاوزت الحد الأقصى من المحاولات. الرجاء المحاولة مرة أخرى بعد :seconds ثانية/ثواني.',
 
     // Login & Register
     'sign_up' => 'إنشاء حساب',
     'log_in' => 'تسجيل الدخول',
     'log_in_with' => 'تسجيل الدخول باستخدام :socialDriver',
     'sign_up_with' => 'إنشاء حساب باستخدام :socialDriver',
-    'logout' => 'تسجيل الخروج',
+    'logout' => 'الخروج',
 
     'name' => 'الاسم',
     'username' => 'اسم المستخدم',
     'email' => 'البريد الإلكتروني',
-    'password' => 'كلمة المرور',
-    'password_confirm' => 'تأكيد كلمة المرور',
-    'password_hint' => 'يجب أن تحتوي كلمة المرور على 8 خانات على الأقل',
-    'forgot_password' => 'نسيت كلمة المرور؟',
+    'password' => 'كلمة السر',
+    'password_confirm' => 'تأكيد كلمة السر',
+    'password_hint' => 'يجب أن تحتوي كلمة السر على 8 خانات على الأقل',
+    'forgot_password' => 'نسيت كلمة السر؟',
     'remember_me' => 'تذكرني',
     'ldap_email_hint' => 'الرجاء إدخال عنوان بريد إلكتروني لاستخدامه مع الحساب.',
     'create_account' => 'إنشاء حساب',
@@ -44,14 +44,14 @@
     'auto_init_start_link' => 'المتابعة مع المصادقة',
 
     // Password Reset
-    'reset_password' => 'استعادة كلمة المرور',
+    'reset_password' => 'استعادة كلمة السر',
     'reset_password_send_instructions' => 'أدخل بريدك الإلكتروني بالأسفل وسيتم إرسال رسالة برابط لاستعادة كلمة المرور.',
     'reset_password_send_button' => 'أرسل رابط الاستعادة',
-    'reset_password_sent' => 'سيتم إرسال رابط إعادة تعيين كلمة المرور إلى عنوان البريد الإلكتروني هذا إذا كان موجودًا في النظام.',
-    'reset_password_success' => 'تمت استعادة كلمة المرور بنجاح.',
-    'email_reset_subject' => 'استعد كلمة المرور الخاصة بتطبيق :appName',
-    'email_reset_text' => 'تم إرسال هذه الرسالة بسبب تلقينا لطلب استعادة كلمة المرور الخاصة بحسابكم.',
-    'email_reset_not_requested' => 'إذا لم يتم طلب استعادة كلمة المرور من قبلكم، فلا حاجة لاتخاذ أية خطوات.',
+    'reset_password_sent' => 'سيتم إرسال رابط إعادة تعيين كلمة السر إلى عنوان البريد الإلكتروني هذا إذا كان موجودًا في النظام.',
+    'reset_password_success' => 'تمت استعادة كلمة السر بنجاح.',
+    'email_reset_subject' => 'استعد كلمة السر الخاصة بتطبيق :appName',
+    'email_reset_text' => 'تم إرسال هذه الرسالة بسبب تلقينا لطلب استعادة كلمة السر الخاصة بحسابكم.',
+    'email_reset_not_requested' => 'إذا لم يتم طلب استعادة كلمة السر من قبلكم، فلا حاجة لاتخاذ أية خطوات.',
 
     // Email Confirmation
     'email_confirm_subject' => 'تأكيد بريدكم الإلكتروني لتطبيق :appName',
@@ -76,20 +76,20 @@
     'user_invite_email_text' => 'انقر على الزر أدناه لتعيين كلمة مرور الحساب والحصول على الوصول:',
     'user_invite_email_action' => 'كلمة سر المستخدم',
     'user_invite_page_welcome' => 'مرحبا بكم في :appName!',
-    'user_invite_page_text' => 'لإكمال حسابك والحصول على حق الوصول تحتاج إلى تعيين كلمة مرور سيتم استخدامها لتسجيل الدخول إلى :appName في الزيارات المستقبلية.',
-    'user_invite_page_confirm_button' => 'تأكيد كلمة المرور',
-    'user_invite_success_login' => 'تم تأكيد كلمة المرور. يمكنك الآن تسجيل الدخول باستخدام كلمة المرور المحددة للوصول إلى :appName!',
+    'user_invite_page_text' => 'لإكمال حسابك والحصول على حق الوصول تحتاج إلى تعيين كلمة السر سيتم استخدامها لتسجيل الدخول إلى :appName في الزيارات المستقبلية.',
+    'user_invite_page_confirm_button' => 'تأكيد كلمة السر',
+    'user_invite_success_login' => 'تم تأكيد كلمة السر. يمكنك الآن تسجيل الدخول باستخدام كلمة المرور المحددة للوصول إلى :appName!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'إعداد المصادقة متعددة العوامل',
     'mfa_setup_desc' => 'إعداد المصادقة متعددة العوامل كطبقة إضافية من الأمان لحساب المستخدم الخاص بك.',
     'mfa_setup_configured' => 'تم إعداده مسبقاً',
     'mfa_setup_reconfigure' => 'إعادة التكوين',
-    'mfa_setup_remove_confirmation' => 'هل أنت متأكد من أنك تريد إزالة طريقة المصادقة متعددة العناصر هذه؟',
+    'mfa_setup_remove_confirmation' => 'هل أنت متأكد من أنك تريد إزالة طريقة المصادقة متعددة العوامل هذه؟',
     'mfa_setup_action' => 'إعداد (تنصيب)',
     'mfa_backup_codes_usage_limit_warning' => 'لديك أقل من 5 رموز احتياطية متبقية، الرجاء إنشاء وتخزين مجموعة جديدة قبل نفاد الرموز لتجنب إغلاق حسابك.',
     'mfa_option_totp_title' => 'تطبيق الجوال',
-    'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق محمول يدعم TOTP مثل Google Authenticator أو Authy أو Microsoft Authenticer.',
+    'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق جوال يدعم كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
     'mfa_option_backup_codes_title' => 'رموز النسخ الاحتياطي',
     'mfa_option_backup_codes_desc' => 'إنشاء مجموعة من رموز النسخ الاحتياطية للاستخدام مرة واحدة و التي سَتُدِخلها عند تسجيل الدخول للتحقق من هويتك. احرص أن تخزينها في مكان آمن.',
     'mfa_gen_confirm_and_enable' => 'تأكيد وتمكين',
@@ -98,7 +98,7 @@
     'mfa_gen_backup_codes_download' => 'تنزيل الرموز',
     'mfa_gen_backup_codes_usage_warning' => 'يمكن استخدام كل رمز مرة واحدة فقط',
     'mfa_gen_totp_title' => 'إعداد تطبيق الجوال',
-    'mfa_gen_totp_desc' => 'لاستخدام المصادقة المتعددة ، ستحتاج إلى تطبيق جوال كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator.-',
+    'mfa_gen_totp_desc' => 'لاستخدام المصادقة المتعددة ، ستحتاج إلى تطبيق جوال كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
     'mfa_gen_totp_scan' => 'امسح رمز الاستجابة السريعة -QR- أدناه باستخدام تطبيق المصادقة المفضل لديك للبدء.',
     'mfa_gen_totp_verify_setup' => 'التحقق من الإعداد',
     'mfa_gen_totp_verify_setup_desc' => 'تحقق أن كل شيء يعمل عن طريق إدخال رمز تم إنشاؤه داخل تطبيق المصادقة الخاص بك في مربع الإدخال أدناه:',
diff --git a/lang/ar/editor.php b/lang/ar/editor.php
index 0ff5a5a18fc..c656ba5a007 100644
--- a/lang/ar/editor.php
+++ b/lang/ar/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'إلغاء',
     'save' => 'حفظ',
     'close' => 'إغلاق',
-    'apply' => 'Apply',
+    'apply' => 'تطبيق',
     'undo' => 'تراجع',
     'redo' => 'إعادة التنفيذ',
     'left' => 'يسار',
@@ -25,7 +25,7 @@
     'width' => 'العرض',
     'height' => 'الارتفاع',
     'More' => 'المزيد',
-    'select' => 'Select...',
+    'select' => 'إختار...',
 
     // Toolbar
     'formats' => 'التنسيقات',
@@ -54,73 +54,73 @@
     'align_left' => 'محاذاة لليسار',
     'align_center' => 'محاذاة بالمنتصف',
     'align_right' => 'مُحاذاة لليمين',
-    'align_justify' => 'Justify',
+    'align_justify' => 'المحاذاة',
     'list_bullet' => 'قائمة نقاط',
     'list_numbered' => 'قائمة مرقمة',
-    'list_task' => 'Task list',
+    'list_task' => 'قائمة المهام',
     'indent_increase' => 'زيادة البادئة',
     'indent_decrease' => 'إنقاص البادئة',
     'table' => 'جدول',
     'insert_image' => 'ادراج صورة',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Insert code block',
-    'edit_code_block' => 'Edit code block',
-    'insert_drawing' => 'Insert/edit drawing',
-    'drawing_manager' => 'Drawing manager',
-    'insert_media' => 'Insert/edit media',
-    'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'insert_image_title' => 'إضافة/تحرير الصورة',
+    'insert_link' => 'إضافة/تعديل الرابط',
+    'insert_link_title' => 'إضافة/تحرير الرابط',
+    'insert_horizontal_line' => 'إضافة خط أفقي',
+    'insert_code_block' => 'إضافة مربع رموز برمجية',
+    'edit_code_block' => 'تعديل مربع الرموز البرمجية',
+    'insert_drawing' => 'إضافة/تعديل الرسم',
+    'drawing_manager' => 'إدارة الرسم',
+    'insert_media' => 'إضافة/تحرير الوسائط',
+    'insert_media_title' => 'إضافة/تحرير الوسائط',
+    'clear_formatting' => 'مسح التنسيق',
+    'source_code' => 'الرمز البرمجي',
+    'source_code_title' => 'الرمز البرمجي',
+    'fullscreen' => 'شاشة كاملة',
+    'image_options' => 'خيارات الصورة',
 
     // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
-    'table_cell' => 'Cell',
-    'table_row' => 'Row',
-    'table_column' => 'Column',
-    'cell_properties' => 'Cell properties',
-    'cell_properties_title' => 'Cell Properties',
-    'cell_type' => 'Cell type',
-    'cell_type_cell' => 'Cell',
-    'cell_scope' => 'Scope',
-    'cell_type_header' => 'Header cell',
-    'merge_cells' => 'Merge cells',
-    'split_cell' => 'Split cell',
-    'table_row_group' => 'Row Group',
-    'table_column_group' => 'Column Group',
-    'horizontal_align' => 'Horizontal align',
-    'vertical_align' => 'Vertical align',
-    'border_width' => 'Border width',
-    'border_style' => 'Border style',
-    'border_color' => 'Border color',
-    'row_properties' => 'Row properties',
-    'row_properties_title' => 'Row Properties',
-    'cut_row' => 'Cut row',
-    'copy_row' => 'Copy row',
-    'paste_row_before' => 'Paste row before',
-    'paste_row_after' => 'Paste row after',
-    'row_type' => 'Row type',
-    'row_type_header' => 'Header',
-    'row_type_body' => 'Body',
-    'row_type_footer' => 'Footer',
-    'alignment' => 'Alignment',
-    'cut_column' => 'Cut column',
+    'table_properties' => 'خصائص الجدول',
+    'table_properties_title' => 'خصائص الجدول',
+    'delete_table' => 'حذف الجدول',
+    'table_clear_formatting' => 'مسح تنسيق الجدول',
+    'resize_to_contents' => 'تغيير الحجم إلى المحتوى',
+    'row_header' => 'رأس الصف',
+    'insert_row_before' => 'إضافة صف قبل',
+    'insert_row_after' => 'إضافة صف بعد',
+    'delete_row' => 'حذف الصف',
+    'insert_column_before' => 'إدراج عمود قبل',
+    'insert_column_after' => 'إدراج عمود بعد',
+    'delete_column' => 'حذف عمود',
+    'table_cell' => 'خلية',
+    'table_row' => 'صف',
+    'table_column' => 'عمود',
+    'cell_properties' => 'خصائص الخلية',
+    'cell_properties_title' => 'خصائص الخلية',
+    'cell_type' => 'نوع الخلية',
+    'cell_type_cell' => 'الخلية',
+    'cell_scope' => 'النِطَاق',
+    'cell_type_header' => 'عنوان الخلية',
+    'merge_cells' => 'دمج الخلايا',
+    'split_cell' => 'خلية منقسمة',
+    'table_row_group' => 'مجموعة الصفوف',
+    'table_column_group' => 'مجموعة الأعمدة',
+    'horizontal_align' => 'محاذاة أفقية',
+    'vertical_align' => 'محاذاة عمودية',
+    'border_width' => 'عرض الحدود',
+    'border_style' => 'نمط الحدود',
+    'border_color' => 'لون الحدود',
+    'row_properties' => 'خصائص الصف',
+    'row_properties_title' => 'خصائص الصف',
+    'cut_row' => 'فص الصف',
+    'copy_row' => 'نسخ الصف',
+    'paste_row_before' => 'لصق الصف قبل',
+    'paste_row_after' => 'لصق الصف بعد',
+    'row_type' => 'نوع الصف',
+    'row_type_header' => 'العنوان',
+    'row_type_body' => 'المحتوى ',
+    'row_type_footer' => 'تذييل',
+    'alignment' => 'المحاذاة',
+    'cut_column' => 'قص العمود',
     'copy_column' => 'نسخ العمود',
     'paste_column_before' => 'لصق عمود قبل',
     'paste_column_after' => 'لصق عمود بعد',
@@ -128,54 +128,54 @@
     'cell_spacing' => 'تباعد الخلايا',
     'caption' => 'الوصف',
     'show_caption' => 'إظهار الوصف',
-    'constrain' => 'Constrain proportions',
-    'cell_border_solid' => 'Solid',
-    'cell_border_dotted' => 'Dotted',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
-    'cell_border_hidden' => 'Hidden',
+    'constrain' => 'تقييد النسب',
+    'cell_border_solid' => 'لون كامل',
+    'cell_border_dotted' => 'مُنَقط',
+    'cell_border_dashed' => 'متقطع',
+    'cell_border_double' => 'مزدوج',
+    'cell_border_groove' => 'أخدود',
+    'cell_border_ridge' => 'الحافَة',
+    'cell_border_inset' => 'الداخلية',
+    'cell_border_outset' => 'الخارجية',
+    'cell_border_none' => 'لا شَيْء',
+    'cell_border_hidden' => 'مخفي',
 
     // Images, links, details/summary & embed
-    'source' => 'Source',
-    'alt_desc' => 'Alternative description',
-    'embed' => 'Embed',
-    'paste_embed' => 'Paste your embed code below:',
-    'url' => 'URL',
-    'text_to_display' => 'Text to display',
-    'title' => 'Title',
-    'browse_links' => 'Browse links',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
-    'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
-    'remove_link' => 'Remove link',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
-    'edit_label' => 'Edit label',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'source' => 'المصدر',
+    'alt_desc' => 'وصف بديل',
+    'embed' => 'تضمين',
+    'paste_embed' => 'قم بلصق الرموز المصدرية المضمنة الخاص بك أدناه:',
+    'url' => 'الرابط',
+    'text_to_display' => 'النص المراد عرضه',
+    'title' => 'العنوان',
+    'browse_links' => 'تصفح الروابط',
+    'open_link' => 'افتح الرابط',
+    'open_link_in' => 'افتح الرابط في...',
+    'open_link_current' => 'النافذة الحالية',
+    'open_link_new' => 'نافذة جديدة',
+    'remove_link' => 'إزالة الرابط',
+    'insert_collapsible' => 'أدخل كتلة قابلة للطي',
+    'collapsible_unwrap' => 'بسط',
+    'edit_label' => 'عدل الوصف',
+    'toggle_open_closed' => 'التبديل بين الفتح والإغلاق',
+    'collapsible_edit' => 'تحرير الكتلة القابلة للطي',
+    'toggle_label' => 'تبديل التسمية',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
-    'editor_license' => 'Editor License & Copyright',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
-    'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
-    'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Link to content',
-    'shortcuts' => 'Shortcuts',
-    'shortcut' => 'Shortcut',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
-    'windows_linux' => '(Windows/Linux)',
-    'mac' => '(Mac)',
-    'description' => 'Description',
+    'about' => 'عن المحرر',
+    'about_title' => 'حول محرر ما تراه هو ما تحصل عليه -WYSIWYG-',
+    'editor_license' => 'رخصة المحرر وحقوق  التأليف والنشر',
+    'editor_lexical_license' => 'تم إنشاء هذا المحرر باعتباره فرعًا لـ :lexicalLink الذي يتم توزيعه بموجب ترخيص معهد ماساتشوستس للتقانة -MIT-.',
+    'editor_lexical_license_link' => 'يمكنك العثور على تفاصيل الترخيص الكاملة هنا.',
+    'editor_tiny_license' => 'تم إنشاء هذا المحرر باستخدام :tinyLink والذي يتم توفيره بموجب ترخيص معهد ماساتشوستس للتقانة -MIT-.',
+    'editor_tiny_license_link' => 'يمكن الاطلاع هنا على تفاصيل حقوق التأليف والنشر والترخيص الخاصة بتاینی‌ام‌سی‌ای -TinyMCE-.',
+    'save_continue' => 'حفظ الصفحة ومتابعة',
+    'callouts_cycle' => '(استمر في الضغط للتبديل بين الأنواع)',
+    'link_selector' => 'رابط للمحتوى',
+    'shortcuts' => 'الاختصارات',
+    'shortcut' => 'الاختصار',
+    'shortcuts_intro' => 'الاختصارات التالية متاحة في المحرر:',
+    'windows_linux' => '(ويندوز/لينكس)',
+    'mac' => '(ماك)',
+    'description' => 'الوصف',
 ];
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index d012ca45944..aea8bf1e537 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -455,8 +455,8 @@
     'watch_detail_new' => 'ترقب الصفحات الجديدة',
     'watch_detail_updates' => 'مشاهدة الصفحات الجديدة والتحديثات',
     'watch_detail_comments' => 'مشاهدة الصفحات الجديدة والتحديثات والتعليقات',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_detail_parent_book' => 'المشاهدة عبر الكتاب الرئيس',
+    'watch_detail_parent_book_ignore' => 'التجاهل عبر الكتاب الرئيس',
+    'watch_detail_parent_chapter' => 'المشاهدة عبر الفصل الرئيس',
+    'watch_detail_parent_chapter_ignore' => 'التجاهل عبر الفصل الرئيس',
 ];
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index 73e76a5cc01..b50c95c232f 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'يوجد مستخدم ببيانات مختلفة مسجل بالنظام للبريد الإلكتروني :email.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'لم يتمكن حساب المستخدم من التسجيل للحصول على التفاصيل المقدمة',
     'email_already_confirmed' => 'تم تأكيد البريد الإلكتروني من قبل, الرجاء محاولة تسجيل الدخول.',
     'email_confirmation_invalid' => 'رابط التأكيد غير صحيح أو قد تم استخدامه من قبل, الرجاء محاولة التسجيل من جديد.',
     'email_confirmation_expired' => 'صلاحية رابط التأكيد انتهت, تم إرسال رسالة تأكيد جديدة لعنوان البريد الإلكتروني.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'لم يتم العثور على السوشيال درايفر "Social driver"',
     'social_driver_not_configured' => 'لم يتم تهيئة إعدادات حسابك الاجتماعي بشكل صحيح.',
     'invite_token_expired' => 'انتهت صلاحية رابط هذه الدعوة. يمكنك بدلاً من ذلك محاولة إعادة تعيين كلمة مرور حسابك.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'لم يتم العثور على مستخدم لهذا الإجراء.',
 
     // System
     'path_not_writable' => 'لا يمكن الرفع إلى مسار :filePath. الرجاء التأكد من قابلية الكتابة إلى الخادم.',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'لا يمكن حذف المشرف الوحيد',
     'users_cannot_delete_guest' => 'لا يمكن حذف المستخدم الضيف',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'لم يتم إنشاء المستخدم بسبب فشل إرسال بريد الدعوة',
 
     // Roles
     'role_cannot_be_edited' => 'لا يمكن تعديل هذا الدور',
@@ -106,16 +106,16 @@
     'back_soon' => 'سيعود للعمل قريباً.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'لم أتمكن من قراءة المِلَفّ المضغوط -ZIP-.',
+    'import_zip_cant_decode_data' => 'لم نتمكن من العثور على محتوى المِلَفّ المضغوط data.json وفك تشفيره.',
+    'import_zip_no_data' => 'لا تتضمن بيانات المِلَفّ المضغوط أي محتوى متوقع للكتاب أو الفصل أو الصفحة.',
+    'import_validation_failed' => 'فشل التحقق من صحة استيراد المِلَفّ المضغوط بسبب الأخطاء التالية:',
+    'import_zip_failed_notification' => 'فشل استيراد المِلَفّ المضغوط.',
+    'import_perms_books' => 'أنت تفتقر إلى الصلاحيات المطلوبة لإنشاء الكتب.',
+    'import_perms_chapters' => 'أنت تفتقر إلى الصلاحيات المطلوبة لإنشاء الفصول.',
+    'import_perms_pages' => 'أنت تفتقر إلى الصلاحيات المطلوبة لإنشاء الصفحات.',
+    'import_perms_images' => 'أنت تفتقر إلى الصلاحيات المطلوبة لإنشاء الصور.',
+    'import_perms_attachments' => 'أنت تفتقر إلى الصَّلاحِيَة المطلوب لإنشاء المرفقات.',
 
     // API errors
     'api_no_authorization_found' => 'لم يتم العثور على رمز ترخيص مميز في الطلب',
diff --git a/lang/ar/notifications.php b/lang/ar/notifications.php
index 1afd23f1dc4..30a49a631cf 100644
--- a/lang/ar/notifications.php
+++ b/lang/ar/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'تعليق جديد على الصفحة: :pageName',
+    'new_comment_intro' => 'قام أحد المستخدمين بالتعليق على صفحة في :appName:',
+    'new_page_subject' => 'صفحة جديدة: :pageName',
+    'new_page_intro' => 'تم إنشاء صفحة جديدة في :appName:',
+    'updated_page_subject' => 'تم تحديث الصفحة: :pageName',
+    'updated_page_intro' => 'تم تحديث الصفحة في :appName:',
+    'updated_page_debounce' => 'لمنع تلقي عدد كبير من الإشعارات، لن يتم إرسال إشعارات إليك لفترة من الوقت لإجراء المزيد من التعديلات على هذه الصفحة بواسطة نفس المحرر.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'اسم الصفحة:',
+    'detail_page_path' => 'مسار الصفحة:',
+    'detail_commenter' => 'المُعَلِق:',
+    'detail_comment' => 'التعليق:',
+    'detail_created_by' => 'أنشئ من طرف:',
+    'detail_updated_by' => 'تم التحديث بواسطة:',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => 'عرض التعليق',
+    'action_view_page' => 'عرض الصفحة',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'لقد تم إرسال هذا الإشعار إليك لأن :link يغطي هذا النوع من النشاط لهذا العنصر.',
+    'footer_reason_link' => 'إعدادات الإشعارات الخاصة بك',
 ];
diff --git a/lang/ar/preferences.php b/lang/ar/preferences.php
index 2872f5f3c65..9158b4b375b 100644
--- a/lang/ar/preferences.php
+++ b/lang/ar/preferences.php
@@ -5,47 +5,47 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'حسابي',
 
-    'shortcuts' => 'Shortcuts',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts' => 'الاختصارات',
+    'shortcuts_interface' => 'خيارات اختصار واجهة المستخدم',
+    'shortcuts_toggle_desc' => 'هنا يمكنك تمكين أو تعطيل اختصارات واجهة نظام لوحة المفاتيح، المستخدمة للتنقل والإجراءات.',
+    'shortcuts_customize_desc' => 'يمكنك تخصيص كل اختصار من الاختصارات أدناه. ما عليك سوى الضغط على تركيبة المفاتيح المطلوبة بعد تحديد مدخل الاختصار.',
+    'shortcuts_toggle_label' => 'تم تمكين اختصارات لوحة المفاتيح',
+    'shortcuts_section_navigation' => 'التنقل',
+    'shortcuts_section_actions' => 'الإجراءات المشتركة',
+    'shortcuts_save' => 'حفظ الاختصارات',
+    'shortcuts_overlay_desc' => 'ملاحظة: عندما يتم تمكين الاختصارات، تتوفر تراكب المساعد عن طريق الضغط على "؟" الذي سيسلط الضوء على الاختصارات المتاحة للإجراءات المرئية حاليا على الشاشة.',
+    'shortcuts_update_success' => 'تم تحديث خيارات الاختصار!',
+    'shortcuts_overview_desc' => 'إدارة اختصارات لوحة المفاتيح التي يمكنك استخدامها للتنقل في واجهة مستخدم النظام.',
 
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications' => 'إعدادات الإشعارات',
+    'notifications_desc' => 'التحكم في إشعارات البريد الإلكتروني الذي تتلقاها عند إجراء نشاط معين داخل النظام.',
+    'notifications_opt_own_page_changes' => 'إشعاري عند حدوث تغييرات في الصفحات التي أملكها',
+    'notifications_opt_own_page_comments' => 'إشعاري بشأن التعليقات على الصفحات التي أملكها',
+    'notifications_opt_comment_replies' => 'إشعاري عند الردود على تعليقاتي',
+    'notifications_save' => 'حفظ اﻹعدادات',
+    'notifications_update_success' => 'تم تحديث إعدادات الإشعارات!',
+    'notifications_watched' => 'العناصر التي تمت مشاهدتها وتجاهلها',
+    'notifications_watched_desc' => 'فيما يلي العناصر التي طُبِّقت عليها إعدادات ساعة مخصصة. لتحديث إعداداتك، استعرض العنصر ثم ابحث عن خيارات الساعة في الشريط الجانبي.',
 
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
+    'auth' => 'الوصول و الأمان',
+    'auth_change_password' => 'تغيير كلمة السر',
+    'auth_change_password_desc' => 'غيّر كلمة السر التي تستخدمها لتسجيل الدخول إلى التطبيق. يجب ألا تقل عن 8 أحرف.',
+    'auth_change_password_success' => 'تم تحديث كلمة السر!',
 
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile' => 'تفاصيل المِلَفّ الشخصي',
+    'profile_desc' => 'إدارة تفاصيل حسابك الذي يمثلك أمام المستخدمين الآخرين، بالإضافة إلى التفاصيل المستخدمة للتواصل وتخصيص النظام.',
+    'profile_view_public' => 'عرض المِلَفّ الشخصي العام',
+    'profile_name_desc' => 'إعداد اسم العرض الخاص بك الذي سيكون مرئيًا للمستخدمين الآخرين في النظام من خلال النشاط الذي تقوم به والمحتوى الذي تملكه.',
+    'profile_email_desc' => 'سيتم استخدام هذا البريد الإلكتروني للإشعارات، وبناءً على مصادقة النظام النشط، سيتم استخدام الوصول إلى النظام.',
+    'profile_email_no_permission' => 'للأسف، ليس لديك إذن لتغيير عنوان بريدك الإلكتروني. إذا كنت ترغب في تغييره، فعليك طلب ذلك من أحد المسؤولين.',
+    'profile_avatar_desc' => 'اختر صورةً تُمثّلك أمام الآخرين في النظام. يُفضّل أن تكون الصورة مربعةً، وعرضها وارتفاعها حوالي ٢٥٦ بكسل.',
+    'profile_admin_options' => 'خيارات المسؤول',
+    'profile_admin_options_desc' => 'يمكنك العثور على خيارات إضافية على مستوى المسؤول، مثل تلك الخاصة بإدارة تعيينات الأدوار، لحساب المستخدم الخاص بك في منطقة "الإعدادات > المستخدمون" في التطبيق.',
 
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_account' => 'حذف الحساب',
+    'delete_my_account' => 'حذف حسابي',
+    'delete_my_account_desc' => 'سيؤدي هذا إلى حذف حساب المستخدم الخاص بك بالكامل من النظام. لن تتمكن من استعادة هذا الحساب أو التراجع عن هذا الإجراء. سيبقى المحتوى الذي أنشأته، مثل الصفحات التي أنشأتها والصور التي رفعتها، كما هي.',
+    'delete_my_account_warning' => 'هل أنت متأكد أنك تريد حذف حسابك؟',
 ];
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index f771fc85188..b7c8ad411fb 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -48,12 +48,12 @@
     'app_disable_comments_desc' => 'تعطيل التعليقات على جميع الصفحات داخل التطبيق. التعليقات الموجودة من الأصل لن تكون ظاهرة.',
 
     // Color settings
-    'color_scheme' => 'Application Color Scheme',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
-    'link_color' => 'Default Link Color',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'color_scheme' => 'مخطط ألوان التطبيق',
+    'color_scheme_desc' => 'حدّد الألوان المستخدمة في واجهة مستخدم التطبيق. يمكن ضبط الألوان بشكل منفصل للوضعين الداكن والفاتح لتناسب المظهر بشكل أفضل ولضمان وضوح النص.',
+    'ui_colors_desc' => 'عيّن اللون الأساسي للتطبيق ولون الرابط الافتراضي. يُستخدم اللون الأساسي بشكل رئيس في شعار الصفحة الرئيسة والأزرار وزخارف الواجهة. أما اللون الافتراضي للرابط، فيُستخدم للروابط والإجراءات النصية، سواءً داخل المحتوى المكتوب أو في واجهة التطبيق.',
+    'app_color' => 'اللون الأساسي',
+    'link_color' => 'لون الرابط الافتراضي',
+    'content_colors_desc' => 'حدّد ألوان جميع عناصر هيكل تنظيم الصفحة. يُنصح باختيار ألوان بنفس سطوع الألوان الافتراضية لسهولة القراءة.',
     'bookshelf_color' => 'لون الرف',
     'book_color' => 'لون الكتاب',
     'chapter_color' => 'لون الفصل',
@@ -75,40 +75,40 @@
     'reg_confirm_restrict_domain_placeholder' => 'لم يتم اختيار أي قيود',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'طريقة الترتيب',
+    'sorting_book_default' => 'ترتيب الكتاب الافتراضي',
+    'sorting_book_default_desc' => 'حدد قاعدة الترتيب الافتراضية لتطبيقها على الكتب الجديدة. لن يؤثر هذا على الكتب الحالية، ويمكن تجاوزه لكل كتاب على حدة.',
+    'sorting_rules' => 'قواعد الترتيب',
+    'sorting_rules_desc' => 'هذه هي عمليات الترتيب المحددة مسبقًا الذي يمكن تطبيقها على المحتوى الموجود في النظام.',
+    'sort_rule_assigned_to_x_books' => 'مُعيَّن إلى :count كتاب|مُعيَّن إلى :count كتاب',
+    'sort_rule_create' => 'إنشاء قاعدة الترتيب',
+    'sort_rule_edit' => 'تعديل قاعدة الترتيب',
+    'sort_rule_delete' => 'حذف قاعدة الترتيب',
+    'sort_rule_delete_desc' => 'أزل قاعدة الترتيب هذه من النظام. الكتب التي تستخدم هذا الفرز ستعود إلى الفرز اليدوي.',
+    'sort_rule_delete_warn_books' => 'تُستخدم قاعدة الترتيب هذه حاليًا على :count كتاب/كتب. متيقن من رغبتك في حذف هذا؟',
+    'sort_rule_delete_warn_default' => 'تُستخدم قاعدة الترتيب هذه حاليًا كإعداد افتراضي للكتب. متيقن من رغبتك في حذفها؟',
+    'sort_rule_details' => 'تفاصيل قاعدة الترتيب',
+    'sort_rule_details_desc' => 'تعيين اسم لقاعدة الترتيب هذه، التي ستظهر في القوائم عندما يقوم المستخدمون باختيار نوع ما.',
+    'sort_rule_operations' => 'عمليات الترتيب',
+    'sort_rule_operations_desc' => 'جهّز إجراءات الترتيب المطلوب تنفيذها بنقلها من قائمة العمليات المتاحة. عند الاستخدام، سيتم تطبيق العمليات بالترتيب من الأعلى إلى الأسفل. أي تغييرات تُجرى هنا ستُطبّق على جميع الكتب المُخصّصة عند الحفظ.',
+    'sort_rule_available_operations' => 'العمليات المتاحة',
+    'sort_rule_available_operations_empty' => 'لا توجد عمليات متبقية',
+    'sort_rule_configured_operations' => 'العمليات المُهيأة',
+    'sort_rule_configured_operations_empty' => 'اسحب/أضف العمليات من قائمة "العمليات المتاحة"',
+    'sort_rule_op_asc' => '(تصاعدي)',
+    'sort_rule_op_desc' => '(تنازلي)',
+    'sort_rule_op_name' => 'الاسم - أبجديًا',
+    'sort_rule_op_name_numeric' => 'الاسم - رقمي',
+    'sort_rule_op_created_date' => 'تاريخ الإنشاء',
+    'sort_rule_op_updated_date' => 'تاريخ التحديث',
+    'sort_rule_op_chapters_first' => 'الفصول الأولى',
+    'sort_rule_op_chapters_last' => 'الفصول الأخيرة',
 
     // Maintenance settings
     'maint' => 'الصيانة',
     'maint_image_cleanup' => 'تنظيف الصور',
     'maint_image_cleanup_desc' => 'مسح الصفحة ومراجعة المحتوى للتحقق من أي الصور والرسوم المستخدمة حاليًا وأي الصور زائدة عن الحاجة. تأكد من إنشاء قاعدة بيانات كاملة و نسخة احتياطية للصور قبل تشغيل هذا.',
-    'maint_delete_images_only_in_revisions' => 'Also delete images that only exist in old page revisions',
+    'maint_delete_images_only_in_revisions' => 'قم أيضًا بحذف الصور الموجودة فقط في مراجعات الصفحة القديمة',
     'maint_image_cleanup_run' => 'بدء التنظيف',
     'maint_image_cleanup_warning' => 'يوجد عدد :count من الصور المحتمل عدم استخدامها. تأكيد حذف الصور؟',
     'maint_image_cleanup_success' => 'تم إيجاد وحذف عدد :count من الصور المحتمل عدم استخدامها!',
@@ -122,16 +122,16 @@
     'maint_send_test_email_mail_text' => 'تهانينا! كما تلقيت إشعار هذا البريد الإلكتروني، يبدو أن إعدادات البريد الإلكتروني الخاص بك قد تم تكوينها بشكل صحيح.',
     'maint_recycle_bin_desc' => 'تُرسل الأرفف والكتب والفصول والصفحات المحذوفة إلى سلة المحذوفات حتى يمكن استعادتها أو حذفها نهائيًا. قد يتم إزالة العناصر الأقدم في سلة المحذوفات تلقائيًا بعد فترة اعتمادًا على تكوين النظام.',
     'maint_recycle_bin_open' => 'افتح سلة المحذوفات',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint_regen_references' => 'إعادة إنشاء المراجع',
+    'maint_regen_references_desc' => 'سيعيد هذا الإجراء بناء فِهْرِس المراجع بين العناصر داخل قاعدة البيانات. عادةً ما يتم ذلك تلقائيًا، ولكنه قد يكون مفيدًا لفهرسة المحتوى القديم أو المحتوى المُضاف بطرق غير رسمية.',
+    'maint_regen_references_success' => 'لقد تم تجديد فِهْرِس المرجع!',
+    'maint_timeout_command_note' => 'ملاحظة: قد يستغرق تنفيذ هذا الإجراء بعض الوقت، مما قد يؤدي إلى مشاكل في مهلة التنفيذ في بعض بيئات الويب. كبديل، يمكن تنفيذ هذا الإجراء باستخدام سطر الأوامر.',
 
     // Recycle Bin
     'recycle_bin' => 'سلة المحذوفات',
     'recycle_bin_desc' => 'هنا يمكنك استعادة العناصر التي تم حذفها أو اختيار إزالتها نهائيا من النظام. هذه القائمة غير مصفاة خلافاً لقوائم الأنشطة المماثلة في النظام حيث يتم تطبيق عوامل تصفية الأذونات.',
     'recycle_bin_deleted_item' => 'عنصر محذوف',
-    'recycle_bin_deleted_parent' => 'Parent',
+    'recycle_bin_deleted_parent' => 'اﻷب',
     'recycle_bin_deleted_by' => 'حُذف بواسطة',
     'recycle_bin_deleted_at' => 'وقت الحذف',
     'recycle_bin_permanently_delete' => 'حُذف نهائيًا',
@@ -139,12 +139,12 @@
     'recycle_bin_contents_empty' => 'سلة المحذوفات فارغة حاليًا',
     'recycle_bin_empty' => 'إفراغ سلة المحذوفات',
     'recycle_bin_empty_confirm' => 'سيؤدي هذا إلى إتلاف جميع العناصر الموجودة في سلة المحذوفات بشكل دائم بما في ذلك المحتوى الموجود داخل كل عنصر. هل أنت متأكد من أنك تريد إفراغ سلة المحذوفات؟',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'سيؤدي هذا الإجراء إلى حذف هذا العنصر نهائيًا من النظام، بالإضافة إلى أي عناصر فرعية مدرجة أدناه، ولن تتمكن من استعادة هذا المحتوى. هل أنت متيقِّن من رغبتك في حذف هذا العنصر نهائيًا؟',
     'recycle_bin_destroy_list' => 'العناصر المراد تدميرها',
     'recycle_bin_restore_list' => 'العناصر المراد استرجاعها',
     'recycle_bin_restore_confirm' => 'سيعيد هذا الإجراء العنصر المحذوف ، بما في ذلك أي عناصر فرعية ، إلى موقعه الأصلي. إذا تم حذف الموقع الأصلي منذ ذلك الحين ، وهو الآن في سلة المحذوفات ، فسيلزم أيضًا استعادة العنصر الأصلي.',
     'recycle_bin_restore_deleted_parent' => 'تم حذف أصل هذا العنصر أيضًا. سيبقى حذفه حتى يتم استعادة ذلك الأصل أيضًا.',
-    'recycle_bin_restore_parent' => 'Restore Parent',
+    'recycle_bin_restore_parent' => 'استعادة اﻷب',
     'recycle_bin_destroy_notification' => 'المحذوف: قُم بعد إجمالي العناصر من سلة المحذوفات.',
     'recycle_bin_restore_notification' => 'المرتجع: قُم بعد إجمالي العناصر من سلة المحذوفات.',
 
@@ -158,7 +158,7 @@
     'audit_table_user' => 'المستخدم',
     'audit_table_event' => 'الحدث',
     'audit_table_related' => 'العنصر أو التفاصيل ذات الصلة',
-    'audit_table_ip' => 'IP Address',
+    'audit_table_ip' => 'عنوان عُرف اﻹنترنت -IP-',
     'audit_table_date' => 'تاريخ النشاط',
     'audit_date_from' => 'نطاق التاريخ من',
     'audit_date_to' => 'نطاق التاريخ إلى',
@@ -166,11 +166,11 @@
     // Role Settings
     'roles' => 'الأدوار',
     'role_user_roles' => 'أدوار المستخدمين',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_index_desc' => 'تُستخدم الأدوار لتجميع المستخدمين ومنح أذونات النظام لأعضائها. عندما يكون المستخدم عضوًا في أدوار متعددة، تتراكم الصلاحيات الممنوحة، ويرث المستخدم جميع القدرات.',
+    'roles_x_users_assigned' => ':count مستخدم معين|:count مستخدمين معينين',
+    'roles_x_permissions_provided' => ':count إذن |:count إذونات',
+    'roles_assigned_users' => 'المستخدمون المعينون',
+    'roles_permissions_provided' => 'الصلاحيات المقدمة',
     'role_create' => 'إنشاء دور جديد',
     'role_delete' => 'حذف الدور',
     'role_delete_confirm' => 'سيتم حذف الدور المسمى \':roleName\'.',
@@ -181,7 +181,7 @@
     'role_details' => 'تفاصيل الدور',
     'role_name' => 'اسم الدور',
     'role_desc' => 'وصف مختصر للدور',
-    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_mfa_enforced' => 'يتطلب مصادقة متعددة العوامل',
     'role_external_auth_id' => 'ربط الحساب بمواقع التواصل',
     'role_system' => 'أذونات النظام',
     'role_manage_users' => 'إدارة المستخدمين',
@@ -191,15 +191,15 @@
     'role_manage_page_templates' => 'إدارة قوالب الصفحة',
     'role_access_api' => 'الوصول إلى واجهة برمجة تطبيقات النظام API',
     'role_manage_settings' => 'إدارة إعدادات التطبيق',
-    'role_export_content' => 'Export content',
-    'role_import_content' => 'Import content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_export_content' => 'تصدير المحتوى',
+    'role_import_content' => 'استيراد المحتوى',
+    'role_editor_change' => 'تغيير محرر الصفحة',
+    'role_notifications' => 'تلقي الإشعارات وإدارتها',
     'role_asset' => 'أذونات الأصول',
     'roles_system_warning' => 'اعلم أن الوصول إلى أي من الأذونات الثلاثة المذكورة أعلاه يمكن أن يسمح للمستخدم بتغيير امتيازاته الخاصة أو امتيازات الآخرين في النظام. قم بتعيين الأدوار مع هذه الأذونات فقط للمستخدمين الموثوق بهم.',
     'role_asset_desc' => 'تتحكم هذه الأذونات في الوصول الافتراضي إلى الأصول داخل النظام. ستتجاوز الأذونات الخاصة بالكتب والفصول والصفحات هذه الأذونات.',
     'role_asset_admins' => 'يُمنح المسؤولين حق الوصول تلقائيًا إلى جميع المحتويات ولكن هذه الخيارات قد تعرض خيارات واجهة المستخدم أو تخفيها.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => 'يتعلق هذا بالرؤية داخل مدير الصور. يعتمد الوصول الفعلي لملفات الصور المُحمّلة على خِيار تخزين الصور في النظام.',
     'role_all' => 'الكل',
     'role_own' => 'ما يخص',
     'role_controlled_by_asset' => 'يتحكم فيها الأصول التي يتم رفعها إلى',
@@ -209,7 +209,7 @@
 
     // Users
     'users' => 'المستخدمون',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'إنشاء وإدارة حسابات المستخدمين الفردية داخل النظام. يتم استخدام حسابات المستخدم لتسجيل الدخول وإسناد المحتوى والنشاط. صلاحيات الوصول هي أساسا قائمة على الأدوار ولكن ملكية محتوى المستخدم، من بين عوامل أخرى، قد تؤثر أيضا على صلاحيات والوصول إليها.',
     'user_profile' => 'ملف المستخدم',
     'users_add_new' => 'إضافة مستخدم جديد',
     'users_search' => 'بحث عن مستخدم',
@@ -220,20 +220,20 @@
     'users_role' => 'أدوار المستخدمين',
     'users_role_desc' => 'حدد الأدوار التي سيتم تعيين هذا المستخدم لها. إذا تم تعيين مستخدم لأدوار متعددة ، فسيتم تكديس الأذونات من هذه الأدوار وسيتلقى كل قدرات الأدوار المعينة.',
     'users_password' => 'كلمة مرور المستخدم',
-    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_password_desc' => 'عيّن كلمة مرور لتسجيل الدخول إلى التطبيق. يجب ألا تقل عن 8 أحرف.',
     'users_send_invite_text' => 'يمكنك اختيار إرسال دعوة بالبريد الإلكتروني إلى هذا المستخدم مما يسمح له بتعيين كلمة المرور الخاصة به أو يمكنك تعيين كلمة المرور الخاصة به بنفسك.',
     'users_send_invite_option' => 'أرسل بريدًا إلكترونيًا لدعوة المستخدم',
     'users_external_auth_id' => 'ربط الحساب بمواقع التواصل',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'عند استخدام نظام مصادقة خارجي (مثل SAML2 أو OIDC أو LDAP)، يكون هذا هو المعرف الذي يربط مستخدم بوكستاك -BookStack- بحساب نظام المصادقة. يمكنك تجاهل هذا الحقل عند استخدام المصادقة الافتراضية عبر البريد الإلكتروني.',
+    'users_password_warning' => 'قم بملء الحقل أدناه فقط إذا كنت ترغب في تغيير كلمة المرور لهذا المستخدم.',
     'users_system_public' => 'هذا المستخدم يمثل أي ضيف يقوم بزيارة شيء يخصك. لا يمكن استخدامه لتسجيل الدخول ولكن يتم تعيينه تلقائياً.',
     'users_delete' => 'حذف المستخدم',
     'users_delete_named' => 'حذف المستخدم :userName',
     'users_delete_warning' => 'سيتم حذف المستخدم \':userName\' بشكل تام من النظام.',
     'users_delete_confirm' => 'تأكيد حذف المستخدم؟',
-    'users_migrate_ownership' => 'Migrate Ownership',
-    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
-    'users_none_selected' => 'No user selected',
+    'users_migrate_ownership' => 'نقل الملكية',
+    'users_migrate_ownership_desc' => 'حدد مستخدم هنا إذا كنت تريد أن يصبح مستخدم آخر مالك جميع العناصر التي يمتلكها هذا المستخدم حاليا.',
+    'users_none_selected' => 'لم يتم تحديد مستخدم',
     'users_edit' => 'تعديل المستخدم',
     'users_edit_profile' => 'تعديل الملف',
     'users_avatar' => 'صورة المستخدم',
@@ -241,24 +241,24 @@
     'users_preferred_language' => 'اللغة المفضلة',
     'users_preferred_language_desc' => 'سيؤدي هذا الخيار إلى تغيير اللغة المستخدمة لواجهة المستخدم الخاصة بالتطبيق. لن يؤثر هذا على أي محتوى قد أنشائه المستخدم.',
     'users_social_accounts' => 'الحسابات الاجتماعية',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'عرض حالة الحسابات الاجتماعية المرتبطة لهذا المستخدم. ويمكن استخدام الحسابات الاجتماعية بالإضافة إلى نظام التوثيق الرئيس للوصول إلى النظام.',
     'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account.',
     'users_social_connect' => 'ربط الحساب',
     'users_social_disconnect' => 'فصل الحساب',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'متصل',
+    'users_social_status_disconnected' => 'غير متصل',
     'users_social_connected' => 'تم ربط حساب :socialAccount بملفك بنجاح.',
     'users_social_disconnected' => 'تم فصل حساب :socialAccount من ملفك بنجاح.',
     'users_api_tokens' => 'رموز الـ API',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'أنشئ وأدر رموز الوصول المستخدمة للمصادقة باستخدام واجهة برمجة تطبيقات بوكستاك رِست -BookStack REST API-. تتم إدارة صلاحيات واجهة برمجة التطبيقات بواسطة المستخدم الذي ينتمي إليه الرمز.',
     'users_api_tokens_none' => 'لم يتم إنشاء رموز API لهذا المستخدم',
     'users_api_tokens_create' => 'قم بإنشاء رمز مميز',
     'users_api_tokens_expires' => 'انتهاء مدة الصلاحية',
     'users_api_tokens_docs' => 'وثائق API',
-    'users_mfa' => 'Multi-Factor Authentication',
-    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
-    'users_mfa_configure' => 'Configure Methods',
+    'users_mfa' => 'المصادقة متعددة العوامل',
+    'users_mfa_desc' => 'إعداد المصادقة متعددة العوامل كطبقة إضافية من الأمان لحساب المستخدم الخاص بك.',
+    'users_mfa_x_methods' => ':count طريقة مُهيأة | :count طرق مُهيأة',
+    'users_mfa_configure' => 'إعداد الطرق',
 
     // API Tokens
     'user_api_token_create' => 'قم بإنشاء رمز API',
@@ -279,42 +279,42 @@
     'user_api_token_delete_confirm' => 'هل أنت متأكد من أنك تريد حذف رمز API؟',
 
     // Webhooks
-    'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
-    'webhooks_create' => 'Create New Webhook',
-    'webhooks_none_created' => 'No webhooks have yet been created.',
-    'webhooks_edit' => 'Edit Webhook',
-    'webhooks_save' => 'Save Webhook',
-    'webhooks_details' => 'Webhook Details',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
-    'webhooks_events_all' => 'All system events',
-    'webhooks_name' => 'Webhook Name',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
-    'webhook_events_table_header' => 'Events',
-    'webhooks_delete' => 'Delete Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
-    'webhooks_format_example' => 'Webhook Format Example',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
-    'webhooks_status' => 'Webhook Status',
-    'webhooks_last_called' => 'Last Called:',
-    'webhooks_last_errored' => 'Last Errored:',
-    'webhooks_last_error_message' => 'Last Error Message:',
+    'webhooks' => 'خطافات الويب -Webhooks-',
+    'webhooks_index_desc' => 'خطافات الويب هي طريقة لإرسال البيانات إلى الروابط الخارجية عندما تحدث بعض الإجراءات والأحداث داخل النظام الذي يسمح بالتكامل القائم على الأحداث مع المنصات الخارجية مثل نظم المراسلة أو الإشعار.',
+    'webhooks_x_trigger_events' => ':count حدث تشغيل |:count أحداث تشغيل',
+    'webhooks_create' => 'إنشاء خطاف ويب جديد',
+    'webhooks_none_created' => 'لم يتم إنشاء أي خطافات ويب حتى الآن.',
+    'webhooks_edit' => 'تحرير خطاف ويب',
+    'webhooks_save' => 'حفظ خطاف ويب',
+    'webhooks_details' => 'تفاصيل خطاف الويب',
+    'webhooks_details_desc' => 'قم بتوفير اسم سهل الاستخدام ونقطة نهاية POST كموقع لإرسال بيانات خطافات الويب إليه.',
+    'webhooks_events' => 'أحداث خطفات الويب',
+    'webhooks_events_desc' => 'حدد جميع الأحداث التي يجب أن تشغل هذا الرابط ليتم استدعاؤها.',
+    'webhooks_events_warning' => 'ضع في اعتبارك أن هذه الأحداث سيتم تشغيلها لجميع الأحداث المحددة، حتى إذا تم تطبيق صلاحيات مخصصة. تحقق أن استخدام خطاف الويب هذا لن يكشف عن محتوى سري.',
+    'webhooks_events_all' => 'جميع أحداث النظام',
+    'webhooks_name' => 'اسم خطاف الويب',
+    'webhooks_timeout' => 'مهلة طلب خطاف الويب (بالثواني)',
+    'webhooks_endpoint' => 'نقطة نهاية خطاف الويب',
+    'webhooks_active' => 'خطاف الويب فعال',
+    'webhook_events_table_header' => 'الأحداث',
+    'webhooks_delete' => 'حذف خطاف الويب',
+    'webhooks_delete_warning' => 'سيؤدي هذا إلى حذف خطاف الويب بالكامل، الذي يحمل اسم \':webhookName\'، من النظام.',
+    'webhooks_delete_confirm' => 'هل أنت متيقِّن أنك تريد حذف هذا الخطاف؟',
+    'webhooks_format_example' => 'مثال على تنسيق خطاف الويب',
+    'webhooks_format_example_desc' => 'يتم إرسال بيانات خطاف الويب كطلب بوست -POST- إلى نقطة النهاية المكونة كجيسون -JSON- باتباع التنسيق أدناه. خصائص "ذات صلة" و "روابط" اختيارية و ستعتمد على نوع الحدث الذي تم تشغيله.',
+    'webhooks_status' => 'حالة خطاف الويب',
+    'webhooks_last_called' => 'آخر اتصال:',
+    'webhooks_last_errored' => 'أخر خطأ:',
+    'webhooks_last_error_message' => 'رسالة الخطأ الأخيرة:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'الرخص',
+    'licenses_desc' => 'هذه الصفحة تفصل معلومات الرخص لبوكستاك -BookStack- بالإضافة إلى المشاريع والمكتبات المستخدمة في بوكستاك. ولا يمكن استخدام العديد من المشاريع المدرجة إلا في سياق إنمائي.',
+    'licenses_bookstack' => 'رخص بوكستاك',
+    'licenses_php' => 'رخص مكتبات بي إتش بي -PHP-',
+    'licenses_js' => 'رخص مكتبة جافا سكريبت -JavaScript-',
+    'licenses_other' => 'رخص أخرى',
+    'license_details' => 'تفاصيل الرخصة',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ar/validation.php b/lang/ar/validation.php
index f35c920348c..32a376865e9 100644
--- a/lang/ar/validation.php
+++ b/lang/ar/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'صيغة :attribute غير صالحة.',
     'uploaded'             => 'تعذر تحميل الملف. قد لا يقبل الخادم ملفات بهذا الحجم.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute بحاجة إلى الرجوع إلى مِلَفّ داخل المِلَفّ المضغوط.',
+    'zip_file_mime' => ':attribute بحاجة إلى الإشارة إلى مِلَفّ من نوع :validTypes، وجدت :foundType.',
+    'zip_model_expected' => 'عنصر البيانات المتوقع ولكن ":type" تم العثور عليه.',
+    'zip_unique' => 'يجب أن يكون :attribute فريداً لنوع الكائن داخل المِلَفّ المضغوط.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/de/activities.php b/lang/de/activities.php
index 8f15cd04a9f..cfb21a4c97e 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -128,7 +128,7 @@
     'comment_delete'              => 'Kommentar gelöscht',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create' => 'Sortierregel erstellt',
     'sort_rule_create_notification' => 'Sort rule successfully created',
     'sort_rule_update' => 'updated sort rule',
     'sort_rule_update_notification' => 'Sort rule successfully updated',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index 7b5996aab27..3ebd8dfd2c1 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -128,7 +128,7 @@
     'comment_delete'              => 'Kommentar gelöscht',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
+    'sort_rule_create' => 'Sortierregel erstellt',
     'sort_rule_create_notification' => 'Sort rule successfully created',
     'sort_rule_update' => 'updated sort rule',
     'sort_rule_update_notification' => 'Sort rule successfully updated',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 1296b7a78b0..fa620c52071 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Annuler',
     'save' => 'Sauvegarder',
     'close' => 'Fermer',
-    'apply' => 'Apply',
+    'apply' => 'Appliquer',
     'undo' => 'Annuler',
     'redo' => 'Rétablir',
     'left' => 'Gauche',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texte à afficher',
     'title' => 'Titre',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Parcourir les liens',
     'open_link' => 'Ouvrir le lien',
     'open_link_in' => 'Ouvrir le lien dans...',
     'open_link_current' => 'Fenêtre actuelle',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index e28609a7a3d..9992f7d7865 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -11,7 +11,7 @@
     'recently_updated_pages' => 'Pages mises à jour récemment',
     'recently_created_chapters' => 'Chapitres créés récemment',
     'recently_created_books' => 'Livres créés récemment',
-    'recently_created_shelves' => 'Étagères créés récemment',
+    'recently_created_shelves' => 'Étagères créées récemment',
     'recently_update' => 'Mis à jour récemment',
     'recently_viewed' => 'Vus récemment',
     'recent_activity' => 'Activité récente',
@@ -166,9 +166,9 @@
     'books_search_this' => 'Rechercher dans ce livre',
     'books_navigation' => 'Navigation dans le livre',
     'books_sort' => 'Trier les contenus du livre',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Déplacer les pages et chapitres au sein d’un livre pour en réorganiser le contenu. D’autres livres peuvent être ajoutés pour faciliter le déplacement des pages et chapitres entre les livres. Facultativement, une règle de tri automatique peut être mise en place afin de trier le livre lorsqu’il est édité.',
+    'books_sort_auto_sort' => 'Option de tri automatique',
+    'books_sort_auto_sort_active' => 'Tri automatique actif : :sortName',
     'books_sort_named' => 'Trier le livre :bookName',
     'books_sort_name' => 'Trier par le nom',
     'books_sort_created' => 'Trier par la date de création',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index 301484afe21..fa125680b47 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Aucune restriction en place',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sorting' => 'Tri',
+    'sorting_book_default' => 'Tri des livres par défaut',
+    'sorting_book_default_desc' => 'Sélectionnez le tri par défaut à mettre en place sur les nouveaux livres. Cela n’affectera pas les livres existants, et peut être redéfini dans les livres.',
+    'sorting_rules' => 'Règles de tri',
+    'sorting_rules_desc' => 'Ce sont les opérations de tri qui peuvent être appliquées au contenu du système.',
+    'sort_rule_assigned_to_x_books' => 'Assignée à :count livre|Assignée à :count livres',
+    'sort_rule_create' => 'Créer une règle de tri',
+    'sort_rule_edit' => 'Modifier une règle de tri',
+    'sort_rule_delete' => 'Supprimer une règle de tri',
+    'sort_rule_delete_desc' => 'Supprimer cette règle du système. Les livres l’utilisant précédemment reviendront au tri manuel.',
+    'sort_rule_delete_warn_books' => 'Cette règle est actuellement utilisée par :count livre(s). Êtes-vous sûr·e de vouloir la supprimer ?',
+    'sort_rule_delete_warn_default' => 'Cette règle est actuellement utilisée par défaut pour les livres. Êtes-vous sûr·e de vouloir la supprimer ?',
+    'sort_rule_details' => 'Détails de la Règle de Tri',
+    'sort_rule_details_desc' => 'Assignez un nom à cette règle, qui apparaîtra dans les listes servant à sélectionner une règle de tri.',
+    'sort_rule_operations' => 'Opérations de tri',
+    'sort_rule_operations_desc' => 'Configurez les actions de tri à appliquer en les déplaçant depuis la liste d’opérations. Lors de l’usage de cette règle, les opérations seront appliquées dans l’ordre, de haut en bas. Les changements effectués ici seront appliqués à tous les livres utilisant cette règle lors de la sauvegarde.',
+    'sort_rule_available_operations' => 'Opérations disponibles',
+    'sort_rule_available_operations_empty' => 'Aucune opération restante',
+    'sort_rule_configured_operations' => 'Opérations sélectionnées',
+    'sort_rule_configured_operations_empty' => 'Déplacez/ajoutez des opérations depuis la liste "Opérations disponibles"',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_name' => 'Nom - Alphabétique',
+    'sort_rule_op_name_numeric' => 'Nom - Numérique',
+    'sort_rule_op_created_date' => 'Date de création',
+    'sort_rule_op_updated_date' => 'Date de mise à jour',
+    'sort_rule_op_chapters_first' => 'Chapitres en premier',
+    'sort_rule_op_chapters_last' => 'Chapitres en dernier',
 
     // Maintenance settings
     'maint' => 'Maintenance',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 81fc84dc8fc..8dd244b7247 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webook נמחק בהצלחה',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'יבוא נוצר',
+    'import_create_notification' => 'יבוא עודכן בהצלחה',
+    'import_run' => 'יבוא עודכן',
+    'import_run_notification' => 'תוכן יובא בהצלחה',
+    'import_delete' => 'יבוא נמחק',
+    'import_delete_notification' => 'יבוא נמחק בהצלחה',
 
     // Users
     'user_create' => 'משתמש חדש נוצר',
diff --git a/lang/he/auth.php b/lang/he/auth.php
index 017602b4f2a..2948d5b2078 100644
--- a/lang/he/auth.php
+++ b/lang/he/auth.php
@@ -107,11 +107,11 @@
     'mfa_verify_access_desc' => 'חשבון המשתמש שלך דורש ממך לאת את הזהות שלך בשכבת הגנה נוספת על מנת לאפשר לך גישה. יש לאשר גישה דרך אחד האמצעים הקיימים על מנת להמשיך.',
     'mfa_verify_no_methods' => 'אין אפשרויות אימות דו-שלבי מוגדרות',
     'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
-    'mfa_verify_use_totp' => 'Verify using a mobile app',
-    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
-    'mfa_verify_backup_code' => 'Backup Code',
-    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
-    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
+    'mfa_verify_use_totp' => 'אמת באמצעות אפליקציה',
+    'mfa_verify_use_backup_codes' => 'אמת באמצעות קוד גיבוי',
+    'mfa_verify_backup_code' => 'קוד גיבוי',
+    'mfa_verify_backup_code_desc' => 'הזן מטה אחד מקודי הגיבוי הנותרים לך:',
+    'mfa_verify_backup_code_enter_here' => 'הזן קוד גיבוי כאן',
+    'mfa_verify_totp_desc' => 'הזן את הקוד, שהונפק דרך האפליקציה שלך, מטה:',
     'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
 ];
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 22a4ad0c29f..60b6011cd1a 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -25,11 +25,11 @@
     'meta_owned_name' => 'Owned by :user',
     'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
     'entity_select' => 'בחר יישות',
-    'entity_select_lack_permission' => 'You don\'t have the required permissions to select this item',
+    'entity_select_lack_permission' => 'אין לך אישורים דרושים לבחירת פריט זה',
     'images' => 'תמונות',
     'my_recent_drafts' => 'הטיוטות האחרונות שלי',
     'my_recently_viewed' => 'הנצפים לאחרונה שלי',
-    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
+    'my_most_viewed_favourites' => 'האהובים הנצפים ביותר שלי',
     'my_favourites' => 'המועדפים שלי',
     'no_pages_viewed' => 'לא צפית בדפים כלשהם',
     'no_pages_recently_created' => 'לא נוצרו דפים לאחרונה',
@@ -40,28 +40,28 @@
     'export_text' => 'טקסט רגיל',
     'export_md' => 'קובץ Markdown',
     'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
+    'default_template' => 'תבנית דף ברירת מחדל',
     'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
+    'default_template_select' => 'בחר דף תבנית',
+    'import' => 'יבוא',
+    'import_validate' => 'תקף יבוא',
     'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
+    'import_zip_select' => 'בחר קובץ ZIP להעלאה',
     'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
     'import_pending' => 'Pending Imports',
     'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
+    'import_continue' => 'המשך יבוא',
     'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
+    'import_details' => 'פרטי יבוא',
+    'import_run' => 'להריץ יבוא',
     'import_size' => ':size Import ZIP Size',
     'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
+    'import_uploaded_by' => 'הועלה על ידי',
+    'import_location' => 'מיקום יבוא',
     'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
+    'import_errors' => 'תקלות יבוא',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
 
     // Permissions and restrictions
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 7b766d41afc..2a2d173c790 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -128,12 +128,12 @@
     'comment_delete'              => 'Comentário deletado',
 
     // Sort Rules
-    'sort_rule_create' => 'regra de classificação criada',
-    'sort_rule_create_notification' => 'Regra de classificação criada com sucesso',
-    'sort_rule_update' => 'regra de classificação atualizada',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'regra de classificação excluída',
-    'sort_rule_delete_notification' => 'Regra de classificação excluída com sucesso',
+    'sort_rule_create' => 'criou regra de ordenação',
+    'sort_rule_create_notification' => 'Regra de ordenação criada com sucesso',
+    'sort_rule_update' => 'atualizou regra de ordenação',
+    'sort_rule_update_notification' => 'Regra de ordenação atualizada com sucesso',
+    'sort_rule_delete' => 'excluiu regra de ordenação',
+    'sort_rule_delete_notification' => 'Regra de ordenação excluída com sucesso',
 
     // Other
     'permissions_update'          => 'atualizou permissões',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index 0ff86bf0f9b..d56584e6cab 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Salvar',
     'close' => 'Fechar',
-    'apply' => 'Apply',
+    'apply' => 'Aplicar',
     'undo' => 'Desfazer',
     'redo' => 'Refazer',
     'left' => 'Esquerda',
@@ -60,7 +60,7 @@
     'list_task' => 'Lista de tarefas',
     'indent_increase' => 'Aumentar recuo',
     'indent_decrease' => 'Diminuir recuo',
-    'table' => 'Mesa',
+    'table' => 'Tabela',
     'insert_image' => 'Inserir Imagem',
     'insert_image_title' => 'Inserir/Editar imagem',
     'insert_link' => 'Inserir/editar link',
@@ -91,7 +91,7 @@
     'insert_column_before' => 'Inserir coluna antes',
     'insert_column_after' => 'Inserir coluna depois',
     'delete_column' => 'Excluir coluna',
-    'table_cell' => 'Celular',
+    'table_cell' => 'Célula',
     'table_row' => 'Linha',
     'table_column' => 'Coluna',
     'cell_properties' => 'Propriedades da célula',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto de exibição',
     'title' => 'Título',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Procurar links',
     'open_link' => 'Link aberto',
     'open_link_in' => 'Abrir link em...',
     'open_link_current' => 'Janelas atuais',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 9ff98a27ade..37350e67705 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -166,9 +166,9 @@
     'books_search_this' => 'Pesquisar neste livro',
     'books_navigation' => 'Navegação do Livro',
     'books_sort' => 'Ordenar Conteúdos do Livro',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Mova capítulos e páginas de um livro para reorganizar seu conteúdo. É possível acrescentar outros livros, o que permite uma movimentação fácil de capítulos e páginas entre livros. Opcionalmente, uma regra de ordenação automática pode ser definida para ordenar automaticamente o conteúdo deste livro após alterações.',
+    'books_sort_auto_sort' => 'Opção de ordenação automática',
+    'books_sort_auto_sort_active' => 'Ordenação automática ativa: :sortName',
     'books_sort_named' => 'Ordenar Livro :bookName',
     'books_sort_name' => 'Ordernar por Nome',
     'books_sort_created' => 'Ordenar por Data de Criação',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index f69edf4e2dc..39007cbccec 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nenhuma restrição definida',
 
     // Sorting Settings
-    'sorting' => 'Classificação',
-    'sorting_book_default' => 'Classificação padrão de livros',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Regras de classificação',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sorting' => 'Ordenação',
+    'sorting_book_default' => 'Ordenação padrão de livros',
+    'sorting_book_default_desc' => 'Selecione a regra de ordenação padrão a ser aplicada a novos livros. Isso não afetará os livros existentes e pode ser substituído para cada livro individualmente.',
+    'sorting_rules' => 'Regras de ordenação',
+    'sorting_rules_desc' => 'Estas são operações de ordenação pré-definidas que podem ser aplicadas a conteúdos no sistema.',
+    'sort_rule_assigned_to_x_books' => 'Atribuído a :count Livros|Atribuído a :count Livros',
+    'sort_rule_create' => 'Criar Regra de Ordenação',
+    'sort_rule_edit' => 'Editar Regra de Ordenação',
+    'sort_rule_delete' => 'Excluir Regra de Ordenação',
+    'sort_rule_delete_desc' => 'Remover esta regra de ordenação do sistema. Os livros usando este tipo serão revertidos para a ordenação manual.',
+    'sort_rule_delete_warn_books' => 'Esta regra de ordenação está sendo usada atualmente em :count livro(s). Tem certeza de que deseja excluí-la?',
+    'sort_rule_delete_warn_default' => 'Esta regra de ordenação é atualmente usada como padrão para livros. Tem certeza de que deseja excluí-la?',
+    'sort_rule_details' => 'Detalhes das Regras de Ordenação',
+    'sort_rule_details_desc' => 'Defina um nome para esta regra de ordenação, que aparecerá nas listas quando os usuários selecionarem uma ordenação.',
+    'sort_rule_operations' => 'Operações de Ordenação',
+    'sort_rule_operations_desc' => 'Configure as ações de ordenação a serem executadas movendo-as da lista de operações disponíveis. Ao usar, as operações serão aplicadas em ordem, de cima para baixo. Quaisquer alterações feitas aqui serão aplicadas a todos os livros atribuídos após salvar.',
+    'sort_rule_available_operations' => 'Operações Disponíveis',
+    'sort_rule_available_operations_empty' => 'Não há operações restantes',
+    'sort_rule_configured_operations' => 'Operações configuradas',
+    'sort_rule_configured_operations_empty' => 'Arrastar/adicionar operações da lista "Operações Disponíveis"',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_name' => 'Nome - Alfabético',
+    'sort_rule_op_name_numeric' => 'Nome - Numérico',
+    'sort_rule_op_created_date' => 'Data de Criação',
+    'sort_rule_op_updated_date' => 'Data de Atualização',
+    'sort_rule_op_chapters_first' => 'Capítulos Primeiro',
+    'sort_rule_op_chapters_last' => 'Capítulos por Último',
 
     // Maintenance settings
     'maint' => 'Manutenção',
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index 74564e2abfd..3a13ecf467f 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -128,12 +128,12 @@
     'comment_delete'              => 'удалил комментарий',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'создал правило сортировки',
+    'sort_rule_create_notification' => 'Правило сортировки успешно создано',
+    'sort_rule_update' => 'обновил правило сортировки',
+    'sort_rule_update_notification' => 'Правило сортировки успешно обновлено',
+    'sort_rule_delete' => 'удалил правило сортировки',
+    'sort_rule_delete_notification' => 'Правило сортировки успешно удалено',
 
     // Other
     'permissions_update'          => 'обновил разрешения',
diff --git a/lang/ru/common.php b/lang/ru/common.php
index d3860bba461..de2da532d9a 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Условия использования',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Поиск :appName',
 ];
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index c2c38984c03..264ab7ec33e 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Отмена',
     'save' => 'Сохранить',
     'close' => 'Закрыть',
-    'apply' => 'Apply',
+    'apply' => 'Применить',
     'undo' => 'Отменить',
     'redo' => 'Повторить',
     'left' => 'Слева',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 5ce4dea6043..2246be0435a 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -43,9 +43,9 @@
     'default_template' => 'Шаблон страницы по умолчанию',
     'default_template_explain' => 'Назначить шаблон страницы, который будет использоваться в качестве содержимого по умолчанию для всех страниц, созданных в этом элементе. Имейте в виду, что это будет работать, только если создатель страницы имеет доступ к выбранной странице шаблона.',
     'default_template_select' => 'Выберите страницу шаблона',
-    'import' => 'Import',
+    'import' => 'Импорт',
     'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
+    'import_desc' => 'Импортировать книги, главы и страницы с помощью ZIP-файла, экспортированного из этого или другого источника. Выберите ZIP-файл, чтобы продолжить. После загрузки и проверки файла вы сможете настроить и подтвердить импорт в следующем окне.',
     'import_zip_select' => 'Select ZIP file to upload',
     'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
     'import_pending' => 'Pending Imports',
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => 'Полное сохранение форматирования (HTML)',
     'pages_edit_switch_to_wysiwyg' => 'Переключиться в WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(В Альфа-тестировании)',
     'pages_edit_set_changelog' => 'Задать список изменений',
     'pages_edit_enter_changelog_desc' => 'Введите краткое описание внесенных изменений',
     'pages_edit_enter_changelog' => 'Введите список изменений',
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index ceae383c676..e87c9093629 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -111,11 +111,11 @@
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_perms_books' => 'У вас недостаточно прав для создания книг.',
+    'import_perms_chapters' => 'У вас недостаточно прав для создания глав.',
+    'import_perms_pages' => 'У вас недостаточно прав для создания страниц.',
+    'import_perms_images' => 'У вас недостаточно прав для создания изображений.',
+    'import_perms_attachments' => 'У вас недостаточно прав для создания вложений.',
 
     // API errors
     'api_no_authorization_found' => 'Отсутствует токен авторизации в запросе',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index ee78104ef7a..6cd29286982 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Без ограничений',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
+    'sorting' => 'Сортировка',
+    'sorting_book_default' => 'Сортировка книг по умолчанию',
+    'sorting_book_default_desc' => 'Выберите правило сортировки по умолчанию для новых книг. Это не повлияет на существующие книги, и может быть изменено для каждой книги отдельно.',
+    'sorting_rules' => 'Правила сортировки',
+    'sorting_rules_desc' => 'Выберите правило сортировки по умолчанию для новых книг. Это не повлияет на существующие книги и может быть изменено для каждой книги отдельно.',
+    'sort_rule_assigned_to_x_books' => 'Используется в :count книгах',
+    'sort_rule_create' => 'Создать правило сортировки',
     'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
+    'sort_rule_delete' => 'Удалить правило сортировки',
+    'sort_rule_delete_desc' => 'Удалить это правило сортировки из системы. Книги, использующие эту сортировку, вернутся к ручной сортировке.',
     'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_delete_warn_default' => 'Это правило сортировки используется по умолчанию для книг. Вы уверены, что хотите удалить его?',
+    'sort_rule_details' => 'Детали правила сортировки',
     'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
     'sort_rule_operations' => 'Sort Operations',
     'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
+    'sort_rule_available_operations' => 'Доступные операции',
     'sort_rule_available_operations_empty' => 'No operations remaining',
     'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_configured_operations_empty' => 'Перетащите/добавьте операции из списка "Доступные операции"',
+    'sort_rule_op_asc' => '(Возрастание)',
+    'sort_rule_op_desc' => '(Убывание)',
     'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
+    'sort_rule_op_name_numeric' => 'По нумерации',
     'sort_rule_op_created_date' => 'Created Date',
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_chapters_last' => 'Главы в конце',
 
     // Maintenance settings
     'maint' => 'Обслуживание',
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index 2e8943e4025..117c73ca186 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '":name" odstranjen iz priljubljenih',
 
     // Watching
-    'watch_update_level_notification' => 'Nastavitve opazovanja uspešno posodobljene',
+    'watch_update_level_notification' => 'Nastavitve spremljanja uspešno posodobljene',
 
     // Auth
     'auth_login' => 'prijavljen',
diff --git a/lang/sl/auth.php b/lang/sl/auth.php
index 47b70df7f22..e06d823e7cd 100644
--- a/lang/sl/auth.php
+++ b/lang/sl/auth.php
@@ -27,10 +27,10 @@
     'ldap_email_hint' => 'Prosimo vpišite e-poštni naslov za ta račun.',
     'create_account' => 'Ustvari račun',
     'already_have_account' => 'Že imate račun?',
-    'dont_have_account' => 'Nimate računa?',
+    'dont_have_account' => 'Nimaš računa?',
     'social_login' => 'Prijava z računi družbenih omrežij',
     'social_registration' => 'Registracija z družbenim omrežjem',
-    'social_registration_text' => 'Registrirajte in prijavite se za uporabo drugih možnosti.',
+    'social_registration_text' => 'Registriraj in prijavi se z uporabo drugih možnosti.',
 
     'register_thanks' => 'Hvala za registracijo!',
     'register_confirm' => 'Prosimo preverite vaš e-poštni predal in kliknite na potrditveni gumb za dostop :appName.',
@@ -40,7 +40,7 @@
 
     // Login auto-initiation
     'auto_init_starting' => 'Attempting Login',
-    'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
+    'auto_init_starting_desc' => 'Kontaktiram tvoj sistem za preverjanje pristnosti za pričetek procesa prijave. V primeru, da se nič ne zgodi v naslednjih 5 sekundah, klikni spodnjo povezavo.',
     'auto_init_start_link' => 'Proceed with authentication',
 
     // Password Reset
diff --git a/lang/sl/common.php b/lang/sl/common.php
index 4bad22048c6..29e2a0252cd 100644
--- a/lang/sl/common.php
+++ b/lang/sl/common.php
@@ -44,12 +44,12 @@
     'configure' => 'Configure',
     'manage' => 'Manage',
     'fullscreen' => 'Celozaslonski način',
-    'favourite' => 'Favourite',
-    'unfavourite' => 'Unfavourite',
-    'next' => 'Next',
-    'previous' => 'Previous',
+    'favourite' => 'Priljubljeno',
+    'unfavourite' => 'Ni priljubljeno',
+    'next' => 'Naprej',
+    'previous' => 'Nazaj',
     'filter_active' => 'Active Filter:',
-    'filter_clear' => 'Clear Filter',
+    'filter_clear' => 'Počisti filter',
     'download' => 'Download',
     'open_in_tab' => 'Open in Tab',
     'open' => 'Open',
@@ -91,7 +91,7 @@
     'edit_profile' => 'Uredi profil',
     'dark_mode' => 'Način temnega zaslona',
     'light_mode' => 'Način svetlega zaslona',
-    'global_search' => 'Global Search',
+    'global_search' => 'Globalno iskanje',
 
     // Layout tabs
     'tab_info' => 'Informacije',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index f3c56223ba4..9a7b73488db 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -29,8 +29,8 @@
     'images' => 'Slike',
     'my_recent_drafts' => 'Moji nedavni osnutki',
     'my_recently_viewed' => 'Nedavno prikazano',
-    'my_most_viewed_favourites' => 'My Most Viewed Favourites',
-    'my_favourites' => 'My Favourites',
+    'my_most_viewed_favourites' => 'Največkrat gledane priljubljene strani',
+    'my_favourites' => 'Priljubljene',
     'no_pages_viewed' => 'Niste si ogledali še nobene strani',
     'no_pages_recently_created' => 'Nedavno ni bila ustvarjena nobena stran',
     'no_pages_recently_updated' => 'Nedavno ni bila posodobljena nobena stran',
@@ -66,7 +66,7 @@
 
     // Permissions and restrictions
     'permissions' => 'Dovoljenja',
-    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_desc' => 'Nastavi dovoljenja bolj podrobno, kot to določajo uporabniške vloge.',
     'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
     'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
     'permissions_save' => 'Shrani dovoljenja',
@@ -78,7 +78,7 @@
 
     // Search
     'search_results' => 'Rezultati iskanja',
-    'search_total_results_found' => ':count najdenih rezultatov|:count skupaj najdenih rezultatov',
+    'search_total_results_found' => ':count najdenih rezultatov|:count skupno najdenih rezultatov',
     'search_clear' => 'Počisti iskanje',
     'search_no_pages' => 'Nobena stran se ne ujema z vašim iskanjem',
     'search_for_term' => 'Išči :term',
@@ -101,7 +101,7 @@
     'search_created_before' => 'Ustvarjeno pred',
     'search_created_after' => 'Ustvarjeno po',
     'search_set_date' => 'Nastavi datum',
-    'search_update' => 'Posodobi iskanje',
+    'search_update' => 'Išči ponovno',
 
     // Shelves
     'shelf' => 'Polica',
@@ -141,7 +141,7 @@
     'books' => 'Knjige',
     'x_books' => ':count Knjiga|:count Knjig',
     'books_empty' => 'Ustvarjena ni bila nobena knjiga',
-    'books_popular' => 'Priljubjene knjige',
+    'books_popular' => 'Priljubljene knjige',
     'books_recent' => 'Zadnje knjige',
     'books_new' => 'Nove knjige',
     'books_new_action' => 'Nova knjiga',
@@ -220,7 +220,7 @@
     'page' => 'Stran',
     'pages' => 'Strani',
     'x_pages' => ':count Stran|:count Strani',
-    'pages_popular' => 'Priljubjene strani',
+    'pages_popular' => 'Priljubljene knjige',
     'pages_new' => 'Nova stran',
     'pages_attachments' => 'Priponke',
     'pages_navigation' => 'Navigacija po strani',
@@ -442,7 +442,7 @@
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignore',
     'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
+    'watch_title_new' => 'Nove strani',
     'watch_desc_new' => 'Notify when any new page is created within this item.',
     'watch_title_updates' => 'All Page Updates',
     'watch_desc_updates' => 'Notify upon all new pages and page changes.',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index 9a8759684c7..da80fd3910e 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -96,7 +96,7 @@
     // Error pages
     '404_page_not_found' => 'Strani ni mogoče najti',
     'sorry_page_not_found' => 'Oprostite, strani ki jo iščete, ni mogoče najti.',
-    'sorry_page_not_found_permission_warning' => 'Če pričakujete, da ta stran obstaja, mogoče nimate pravic ogleda zanjo.',
+    'sorry_page_not_found_permission_warning' => 'Stran ne obstaja ali pa za ogled nimaš ustreznih pravic.',
     'image_not_found' => 'Image Not Found',
     'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
     'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
diff --git a/lang/sl/pagination.php b/lang/sl/pagination.php
index e04a98d89b5..80a1e1b4743 100644
--- a/lang/sl/pagination.php
+++ b/lang/sl/pagination.php
@@ -6,7 +6,7 @@
  */
 return [
 
-    'previous' => '&laquo; Predhodno',
-    'next'     => 'Naslednje &raquo;',
+    'previous' => '&laquo; Nazaj',
+    'next'     => 'Naprej &raquo;',
 
 ];
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 5ca213a395d..c49b6b79b55 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -64,9 +64,9 @@
     'reg_settings' => 'registracija',
     'reg_enable' => 'onemogočena registracija',
     'reg_enable_toggle' => 'omogočena registracija',
-    'reg_enable_desc' => 'Ko je registracija omogočena, se  bo uporabnik lahko prijavil sam kot uporabnik aplikacije. Po registraciji je uporabniku dodeljena ena prevzeta vloga.',
+    'reg_enable_desc' => 'Ko je registracija omogočena, se bo uporabnik lahko prijavil sam kot uporabnik aplikacije. Po registraciji je uporabniku dodeljena privzeta vloga.',
     'reg_default_role' => 'prevzeta uporabniška vloga po registraciji',
-    'reg_enable_external_warning' => 'Ta možnosti je ignorirana ko zunanja LDAP ali SAML avtentikacija je akitivna. Uporabniški računi za ne obstoječe uporabnike bodo avtomatsko izdelani, če avtentikacija zunanjih uporabljenih sistemov je uspešna.',
+    'reg_enable_external_warning' => 'Ta možnosti je prezrta, ko je aktivno zunanja LDAP ali SAML preverjanje pristnosti. Uporabniški računi za neobstoječe uporabnike bodo avtomatično ustvarjeni po uspešnem zunanjem preverjanju pristnosti.',
     'reg_email_confirmation' => 'potrditev e-pošte',
     'reg_email_confirmation_toggle' => 'potrebna potrditev e-pošte',
     'reg_confirm_email_desc' => 'Če uporabite omejitev domene, bo potrebna potrditev e-pošte in ta možnost bo prezrta.',
@@ -167,7 +167,7 @@
     'roles' => 'Vloge',
     'role_user_roles' => 'Vloge uporabnika',
     'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
+    'roles_x_users_assigned' => ':count uporabnik v tej vlogi|:count uporabnikov v tej vlogi',
     'roles_x_permissions_provided' => ':count permission|:count permissions',
     'roles_assigned_users' => 'Assigned Users',
     'roles_permissions_provided' => 'Provided Permissions',
@@ -223,7 +223,7 @@
     'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
     'users_send_invite_text' => 'Uporabniku lahko pošljete e-poštno sporočilo s povabilom, ki mu omogoča, da nastavi svoje geslo, ali pa ga nastavite kar sami.',
     'users_send_invite_option' => 'Pošlji uporabniku e-poštno povabilo',
-    'users_external_auth_id' => 'Zunanje dokazilo ID',
+    'users_external_auth_id' => 'Zunanji ID za preverjanje pristnosti (Authentication ID)',
     'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
     'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
     'users_system_public' => 'Ta uporabnik predstavlja vse gostujoče uporabnike, ki obiščejo vašo wiki stran. Za prijavo je ni mogoče uporabiti, ampak je dodeljena samodejno.',
diff --git a/lang/zh_CN/activities.php b/lang/zh_CN/activities.php
index 2ec271e0542..08f831f6102 100644
--- a/lang/zh_CN/activities.php
+++ b/lang/zh_CN/activities.php
@@ -128,12 +128,12 @@
     'comment_delete'              => '评论已删除',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => '创建排序规则',
+    'sort_rule_create_notification' => '排序规则创建成功',
+    'sort_rule_update' => '更新排序规则',
+    'sort_rule_update_notification' => '排序规则更新成功',
+    'sort_rule_delete' => '删除排序规则',
+    'sort_rule_delete_notification' => '排序规则删除成功',
 
     // Other
     'permissions_update'          => '权限已更新',
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index 33e72f23f75..8eb335ea2f6 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -13,7 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '关闭',
-    'apply' => 'Apply',
+    'apply' => '应用',
     'undo' => '撤销',
     'redo' => '重做',
     'left' => '左对齐',
@@ -148,7 +148,7 @@
     'url' => '网址',
     'text_to_display' => '要显示的文本',
     'title' => '标题',
-    'browse_links' => 'Browse links',
+    'browse_links' => '浏览链接',
     'open_link' => '打开链接',
     'open_link_in' => '打开链接于……',
     'open_link_current' => '覆盖当前窗口',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index 433a8e21f4f..f7d22973ada 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -167,7 +167,7 @@
     'books_navigation' => '图书导航',
     'books_sort' => '排序图书内容',
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
+    'books_sort_auto_sort' => '自动排序选项',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
     'books_sort_named' => '排序图书「:bookName」',
     'books_sort_name' => '按名称排序',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index ce4d8e68244..15297c804e6 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -75,7 +75,7 @@
     'reg_confirm_restrict_domain_placeholder' => '尚未设置限制',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
+    'sorting' => '排序',
     'sorting_book_default' => 'Default Book Sort',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index 07d53ea65d0..d33e4d4b742 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -128,12 +128,12 @@
     'comment_delete'              => '已刪除之評論',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => '已建立的排序規則',
+    'sort_rule_create_notification' => '排序規則已成功建立',
+    'sort_rule_update' => '已更新排序規則',
+    'sort_rule_update_notification' => '排序規則已成功更新',
+    'sort_rule_delete' => '已刪除排序規則',
+    'sort_rule_delete_notification' => '排序規則已成功刪除',
 
     // Other
     'permissions_update'          => '更新權限',
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index 737d51851b7..9319e64a437 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -13,7 +13,7 @@
     'cancel' => '取消',
     'save' => '保存',
     'close' => '關閉',
-    'apply' => 'Apply',
+    'apply' => '套用',
     'undo' => '復原',
     'redo' => '重做',
     'left' => '左側',
@@ -148,7 +148,7 @@
     'url' => '網址',
     'text_to_display' => '要顯示的文字',
     'title' => '標題',
-    'browse_links' => 'Browse links',
+    'browse_links' => '瀏覽連結',
     'open_link' => '開啟連結',
     'open_link_in' => '打開連結於……',
     'open_link_current' => '當前視窗',
@@ -165,8 +165,8 @@
     'about' => '關於編輯器',
     'about_title' => '關於所見即所得（WYSIWYG）編輯器',
     'editor_license' => '編輯器許可證與版權信息',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => '這個編輯器是從 :lexicalLink 分支出來的，而 :lexicalLink 是以 MIT 授權條款散佈。',
+    'editor_lexical_license_link' => '完整的授權條款詳細資訊可在這裡找到。',
     'editor_tiny_license' => '此編輯器是用 :tinyLink 構建的，基於 MIT 許可證。',
     'editor_tiny_license_link' => 'TinyMCE 的版權和許可證詳細信息可以在這裡找到。',
     'save_continue' => '保存頁面並繼續',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 4c72bafeb70..d3a684f8fd2 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -166,9 +166,9 @@
     'books_search_this' => '搜尋此書本',
     'books_navigation' => '書本導覽',
     'books_sort' => '排序書本內容',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => '在書籍中移動章節和頁面，重新安排其內容。可加入其他書籍，方便在書籍之間移動章節與頁面。可選擇設定自動排序規則，以便在變更時自動排序此書籍的內容。',
+    'books_sort_auto_sort' => '自動排序選項',
+    'books_sort_auto_sort_active' => '自動排序啟動：:sortName',
     'books_sort_named' => '排序書本 :bookName',
     'books_sort_name' => '按名稱排序',
     'books_sort_created' => '按建立時間排序',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index a20956bc06a..ec2682cf173 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => '尚未設定限制',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => '排序',
+    'sorting_book_default' => '預設書籍排序',
+    'sorting_book_default_desc' => '選取要套用至新書籍的預設排序規則。這不會影響現有書籍，並可按書籍覆寫。',
+    'sorting_rules' => '排序規則',
+    'sorting_rules_desc' => '這些是預先定義的排序作業，可套用於系統中的內容。',
+    'sort_rule_assigned_to_x_books' => '指定給 :count 本書',
+    'sort_rule_create' => '建立排序規則',
+    'sort_rule_edit' => '編輯排序規則',
+    'sort_rule_delete' => '刪除排序規則',
+    'sort_rule_delete_desc' => '從系統移除此排序規則。使用此排序的書籍將會還原為手動排序。',
+    'sort_rule_delete_warn_books' => '此排序規則目前用於 :count 本書。您確定您想要刪除嗎？',
+    'sort_rule_delete_warn_default' => '此排序規則目前為書籍的預設值。您確定您想要刪除嗎？',
+    'sort_rule_details' => '排序規則詳細資訊',
+    'sort_rule_details_desc' => '設定此排序規則的名稱，當使用者選取排序時，該名稱將會出現在清單中。',
+    'sort_rule_operations' => '排序選項',
+    'sort_rule_operations_desc' => '設定要執行的排序動作，方法是從可用的操作清單中移動它們。使用時，操作將依從上到下的順序套用。儲存時，在此處所做的任何變更都會套用至所有指定的書籍。',
+    'sort_rule_available_operations' => '可用操作',
+    'sort_rule_available_operations_empty' => '無剩餘操作',
+    'sort_rule_configured_operations' => '已設定的操作',
+    'sort_rule_configured_operations_empty' => '從「可用操作」清單中拖曳/新增操作',
+    'sort_rule_op_asc' => '（遞增）',
+    'sort_rule_op_desc' => '（遞減）',
+    'sort_rule_op_name' => '名稱 - 按字母順序排列',
+    'sort_rule_op_name_numeric' => '名稱 - 數字',
+    'sort_rule_op_created_date' => '建立日期',
+    'sort_rule_op_updated_date' => '更新日期',
+    'sort_rule_op_chapters_first' => '第一章',
+    'sort_rule_op_chapters_last' => '最後一章',
 
     // Maintenance settings
     'maint' => '維護',

From fa566f156ad8998d67a63be2856dafc7ce277d88 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Apr 2025 17:30:43 +0100
Subject: [PATCH 504/666] Updated translator & dependency attribution before
 release v25.02.2

---
 .github/translators.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index af5f2a703c1..e38cb8a5115 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -478,3 +478,9 @@ Alexandar Cavdarovski (ace.200112) :: Swedish
 Onur Oskay (o.oskay) :: Turkish
 Sébastien Merveille (SebastienMerv) :: French
 Maxim Kouznetsov (masya.work) :: Hebrew
+neodvisnost :: Slovenian
+Soubi Agatsuma (bisouya) :: Hebrew
+Ilya Shaulov (ishaulov) :: Russian
+Konstantin Bobkov (b.konstantv) :: Russian
+Ruben Sutter (rubensutter) :: German
+jellium :: French

From 8d159f77e440a57c8fdba5afb234d378d11856f6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Apr 2025 15:01:57 +0100
Subject: [PATCH 505/666] Comments: Started logic for content references

Adds button for comments to pointer.
Adds logic to generate a content reference point.
---
 resources/js/components/pointer.js            | 56 +++++++++++++++++--
 resources/js/services/dom.ts                  | 21 +++++++
 resources/js/services/util.ts                 | 21 +++++++
 resources/sass/_pages.scss                    | 11 ++--
 resources/views/pages/parts/pointer.blade.php | 23 +++++---
 5 files changed, 113 insertions(+), 19 deletions(-)

diff --git a/resources/js/components/pointer.js b/resources/js/components/pointer.js
index 292b923e551..997df329a84 100644
--- a/resources/js/components/pointer.js
+++ b/resources/js/components/pointer.js
@@ -1,6 +1,9 @@
 import * as DOM from '../services/dom.ts';
 import {Component} from './component';
 import {copyTextToClipboard} from '../services/clipboard.ts';
+import {el} from "../wysiwyg/utils/dom";
+import {cyrb53} from "../services/util";
+import {normalizeNodeTextOffsetToParent} from "../services/dom.ts";
 
 export class Pointer extends Component {
 
@@ -12,13 +15,16 @@ export class Pointer extends Component {
         this.includeInput = this.$refs.includeInput;
         this.includeButton = this.$refs.includeButton;
         this.sectionModeButton = this.$refs.sectionModeButton;
+        this.commentButton = this.$refs.commentButton;
         this.modeToggles = this.$manyRefs.modeToggle;
         this.modeSections = this.$manyRefs.modeSection;
         this.pageId = this.$opts.pageId;
 
         // Instance variables
         this.showing = false;
-        this.isSelection = false;
+        this.isMakingSelection = false;
+        this.targetElement = null;
+        this.targetSelectionRange = null;
 
         this.setupListeners();
     }
@@ -41,7 +47,7 @@ export class Pointer extends Component {
 
         // Hide pointer when clicking away
         DOM.onEvents(document.body, ['click', 'focus'], () => {
-            if (!this.showing || this.isSelection) return;
+            if (!this.showing || this.isMakingSelection) return;
             this.hidePointer();
         });
 
@@ -70,11 +76,17 @@ export class Pointer extends Component {
 
             this.modeToggles.find(b => b !== event.target).focus();
         });
+
+        if (this.commentButton) {
+            DOM.onSelect(this.commentButton, this.createCommentAtPointer.bind(this));
+        }
     }
 
     hidePointer() {
         this.pointer.style.display = null;
         this.showing = false;
+        this.targetElement = null;
+        this.targetSelectionRange = null;
     }
 
     /**
@@ -84,7 +96,9 @@ export class Pointer extends Component {
      * @param {Boolean} keyboardMode
      */
     showPointerAtTarget(element, xPosition, keyboardMode) {
-        this.updateForTarget(element);
+        this.targetElement = element;
+        this.targetSelectionRange = window.getSelection()?.getRangeAt(0);
+        this.updateDomForTarget(element);
 
         this.pointer.style.display = 'block';
         const targetBounds = element.getBoundingClientRect();
@@ -98,10 +112,10 @@ export class Pointer extends Component {
         this.pointer.style.top = `${yOffset}px`;
 
         this.showing = true;
-        this.isSelection = true;
+        this.isMakingSelection = true;
 
         setTimeout(() => {
-            this.isSelection = false;
+            this.isMakingSelection = false;
         }, 100);
 
         const scrollListener = () => {
@@ -119,7 +133,7 @@ export class Pointer extends Component {
      * Update the pointer inputs/content for the given target element.
      * @param {?Element} element
      */
-    updateForTarget(element) {
+    updateDomForTarget(element) {
         const permaLink = window.baseUrl(`/link/${this.pageId}#${element.id}`);
         const includeTag = `{{@${this.pageId}#${element.id}}}`;
 
@@ -152,4 +166,34 @@ export class Pointer extends Component {
         });
     }
 
+    createCommentAtPointer(event) {
+        if (!this.targetElement) {
+            return;
+        }
+
+        const normalisedElemHtml = this.targetElement.outerHTML.replace(/\s{2,}/g, '');
+        const refId = this.targetElement.id;
+        const hash = cyrb53(normalisedElemHtml);
+        let range = '';
+        if (this.targetSelectionRange) {
+            const commonContainer = this.targetSelectionRange.commonAncestorContainer;
+            if (this.targetElement.contains(commonContainer)) {
+                const start = normalizeNodeTextOffsetToParent(
+                    this.targetSelectionRange.startContainer,
+                    this.targetSelectionRange.startOffset,
+                    this.targetElement
+                );
+                const end = normalizeNodeTextOffsetToParent(
+                    this.targetSelectionRange.endContainer,
+                    this.targetSelectionRange.endOffset,
+                    this.targetElement
+                );
+                range = `${start}-${end}`;
+            }
+        }
+
+        const reference = `${refId}:${hash}:${range}`;
+        console.log(reference);
+    }
+
 }
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index c88827bac40..779b4854773 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -178,3 +178,24 @@ export function htmlToDom(html: string): HTMLElement {
 
     return firstChild;
 }
+
+export function normalizeNodeTextOffsetToParent(node: Node, offset: number, parentElement: HTMLElement): number {
+    if (!parentElement.contains(node)) {
+        throw new Error('ParentElement must be a prent of element');
+    }
+
+    let normalizedOffset = offset;
+    let currentNode: Node|null = node.nodeType === Node.TEXT_NODE ?
+        node : node.childNodes[offset];
+
+    while (currentNode !== parentElement && currentNode) {
+        if (currentNode.previousSibling) {
+            currentNode = currentNode.previousSibling;
+            normalizedOffset += (currentNode.textContent?.length || 0);
+        } else {
+            currentNode = currentNode.parentNode;
+        }
+    }
+
+    return normalizedOffset;
+}
diff --git a/resources/js/services/util.ts b/resources/js/services/util.ts
index c5a5d2db804..1a6fa55b6b0 100644
--- a/resources/js/services/util.ts
+++ b/resources/js/services/util.ts
@@ -144,4 +144,25 @@ function getVersion(): string {
 export function importVersioned(moduleName: string): Promise<object> {
     const importPath = window.baseUrl(`dist/${moduleName}.js?version=${getVersion()}`);
     return import(importPath);
+}
+
+/*
+    cyrb53 (c) 2018 bryc (github.com/bryc)
+    License: Public domain (or MIT if needed). Attribution appreciated.
+    A fast and simple 53-bit string hash function with decent collision resistance.
+    Largely inspired by MurmurHash2/3, but with a focus on speed/simplicity.
+    Taken from: https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
+*/
+export function cyrb53(str: string, seed: number = 0): string {
+    let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+    for(let i = 0, ch; i < str.length; i++) {
+        ch = str.charCodeAt(i);
+        h1 = Math.imul(h1 ^ ch, 2654435761);
+        h2 = Math.imul(h2 ^ ch, 1597334677);
+    }
+    h1  = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
+    h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+    h2  = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
+    h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+    return (4294967296 * (2097151 & h2) + (h1 >>> 0)) as string;
 }
\ No newline at end of file
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 45e58ffc865..de783705763 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -183,7 +183,6 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
   input, button, a {
     position: relative;
-    border-radius: 0;
     height: 28px;
     font-size: 12px;
     vertical-align: top;
@@ -194,17 +193,19 @@ body.tox-fullscreen, body.markdown-fullscreen {
     border: 1px solid #DDD;
     @include mixins.lightDark(border-color, #ddd, #000);
     color: #666;
-    width: 160px;
-    z-index: 40;
-    padding: 5px 10px;
+    width: 180px;
+    z-index: 58;
+    padding: 5px;
+    border-radius: 0;
   }
   .text-button {
     @include mixins.lightDark(color, #444, #AAA);
   }
   .input-group .button {
     line-height: 1;
-    margin: 0 0 0 -4px;
+    margin: 0 0 0 -5px;
     box-shadow: none;
+    border-radius: 0;
   }
   a.button {
     margin: 0;
diff --git a/resources/views/pages/parts/pointer.blade.php b/resources/views/pages/parts/pointer.blade.php
index 56f36cb75f3..77fc763827e 100644
--- a/resources/views/pages/parts/pointer.blade.php
+++ b/resources/views/pages/parts/pointer.blade.php
@@ -6,14 +6,14 @@
          tabindex="-1"
          aria-label="{{ trans('entities.pages_pointer_label') }}"
          class="pointer-container">
-        <div class="pointer flex-container-row items-center justify-space-between p-s anim {{ userCan('page-update', $page) ? 'is-page-editable' : ''}}" >
-            <div refs="pointer@mode-section" class="flex-container-row items-center gap-s">
+        <div class="pointer flex-container-row items-center justify-space-between gap-xs p-xs anim {{ userCan('page-update', $page) ? 'is-page-editable' : ''}}" >
+            <div refs="pointer@mode-section" class="flex-container-row items-center gap-xs">
                 <button refs="pointer@mode-toggle"
                         title="{{ trans('entities.pages_pointer_toggle_link') }}"
                         class="text-button icon px-xs">@icon('link')</button>
                 <div class="input-group">
                     <input refs="pointer@link-input" aria-label="{{ trans('entities.pages_pointer_permalink') }}" readonly="readonly" type="text" id="pointer-url" placeholder="url">
-                    <button refs="pointer@link-button" class="button outline icon" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
+                    <button refs="pointer@link-button" class="button outline icon px-xs" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
                 </div>
             </div>
             <div refs="pointer@mode-section" hidden class="flex-container-row items-center gap-s">
@@ -22,13 +22,20 @@ class="text-button icon px-xs">@icon('link')</button>
                         class="text-button icon px-xs">@icon('include')</button>
                 <div class="input-group">
                     <input refs="pointer@include-input" aria-label="{{ trans('entities.pages_pointer_include_tag') }}" readonly="readonly" type="text" id="pointer-include" placeholder="include">
-                    <button refs="pointer@include-button" class="button outline icon" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
+                    <button refs="pointer@include-button" class="button outline icon px-xs" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
                 </div>
             </div>
-            @if(userCan('page-update', $page))
-                <a href="{{ $page->getUrl('/edit') }}" id="pointer-edit" data-edit-href="{{ $page->getUrl('/edit') }}"
-                   class="button primary outline icon heading-edit-icon ml-s px-s" title="{{ trans('entities.pages_edit_content_link')}}">@icon('edit')</a>
-            @endif
+            <div>
+                @if(userCan('page-update', $page))
+                    <a href="{{ $page->getUrl('/edit') }}" id="pointer-edit" data-edit-href="{{ $page->getUrl('/edit') }}"
+                       class="button primary outline icon heading-edit-icon px-xs" title="{{ trans('entities.pages_edit_content_link')}}">@icon('edit')</a>
+                @endif
+                @if($commentTree->enabled() && userCan('comment-create-all'))
+                    <button type="button"
+                            refs="pointer@comment-button"
+                            class="button primary outline icon px-xs m-none" title="{{ trans('entities.comment_add')}}">@icon('comment')</button>
+                @endif
+            </div>
         </div>
     </div>
 

From add238fe9fb3d3626e8acd323bd32f91edb2797e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Apr 2025 20:42:56 +0100
Subject: [PATCH 506/666] Comments & Pointer: Converted components to
 typescript

Made changes for dom and translation services for easier usage
considering types.
trans_choice updated to allow default count replacement data as per
Laravel's default behaviour.
---
 .../{page-comments.js => page-comments.ts}    | 82 +++++++++++++------
 .../js/components/{pointer.js => pointer.ts}  | 53 +++++++-----
 resources/js/services/dom.ts                  |  8 +-
 resources/js/services/translations.ts         |  1 +
 4 files changed, 98 insertions(+), 46 deletions(-)
 rename resources/js/components/{page-comments.js => page-comments.ts} (68%)
 rename resources/js/components/{pointer.js => pointer.ts} (79%)

diff --git a/resources/js/components/page-comments.js b/resources/js/components/page-comments.ts
similarity index 68%
rename from resources/js/components/page-comments.js
rename to resources/js/components/page-comments.ts
index 8f023836b09..a19d2c7d4b1 100644
--- a/resources/js/components/page-comments.js
+++ b/resources/js/components/page-comments.ts
@@ -2,8 +2,38 @@ import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 
+export interface CommentReplyEvent extends Event {
+    detail: {
+        id: string; // ID of comment being replied to
+        element: HTMLElement; // Container for comment replied to
+    }
+}
+
 export class PageComments extends Component {
 
+    private elem: HTMLElement;
+    private pageId: number;
+    private container: HTMLElement;
+    private commentCountBar: HTMLElement;
+    private commentsTitle: HTMLElement;
+    private addButtonContainer: HTMLElement;
+    private replyToRow: HTMLElement;
+    private formContainer: HTMLElement;
+    private form: HTMLFormElement;
+    private formInput: HTMLInputElement;
+    private formReplyLink: HTMLAnchorElement;
+    private addCommentButton: HTMLElement;
+    private hideFormButton: HTMLElement;
+    private removeReplyToButton: HTMLElement;
+    private wysiwygLanguage: string;
+    private wysiwygTextDirection: string;
+    private wysiwygEditor: any = null;
+    private createdText: string;
+    private countText: string;
+    private parentId: number | null = null;
+    private contentReference: string = '';
+    private formReplyText: string = '';
+
     setup() {
         this.elem = this.$el;
         this.pageId = Number(this.$opts.pageId);
@@ -15,9 +45,9 @@ export class PageComments extends Component {
         this.addButtonContainer = this.$refs.addButtonContainer;
         this.replyToRow = this.$refs.replyToRow;
         this.formContainer = this.$refs.formContainer;
-        this.form = this.$refs.form;
-        this.formInput = this.$refs.formInput;
-        this.formReplyLink = this.$refs.formReplyLink;
+        this.form = this.$refs.form as HTMLFormElement;
+        this.formInput = this.$refs.formInput as HTMLInputElement;
+        this.formReplyLink = this.$refs.formReplyLink as HTMLAnchorElement;
         this.addCommentButton = this.$refs.addCommentButton;
         this.hideFormButton = this.$refs.hideFormButton;
         this.removeReplyToButton = this.$refs.removeReplyToButton;
@@ -25,26 +55,23 @@ export class PageComments extends Component {
         // WYSIWYG options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
         this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
-        this.wysiwygEditor = null;
 
         // Translations
         this.createdText = this.$opts.createdText;
         this.countText = this.$opts.countText;
 
-        // Internal State
-        this.parentId = null;
         this.formReplyText = this.formReplyLink?.textContent || '';
 
         this.setupListeners();
     }
 
-    setupListeners() {
+    protected setupListeners(): void {
         this.elem.addEventListener('page-comment-delete', () => {
             setTimeout(() => this.updateCount(), 1);
             this.hideForm();
         });
 
-        this.elem.addEventListener('page-comment-reply', event => {
+        this.elem.addEventListener('page-comment-reply', (event: CommentReplyEvent) => {
             this.setReply(event.detail.id, event.detail.element);
         });
 
@@ -56,7 +83,7 @@ export class PageComments extends Component {
         }
     }
 
-    saveComment(event) {
+    protected saveComment(event): void {
         event.preventDefault();
         event.stopPropagation();
 
@@ -68,10 +95,11 @@ export class PageComments extends Component {
         const reqData = {
             html: this.wysiwygEditor.getContent(),
             parent_id: this.parentId || null,
+            content_reference: this.contentReference || '',
         };
 
         window.$http.post(`/comment/${this.pageId}`, reqData).then(resp => {
-            const newElem = htmlToDom(resp.data);
+            const newElem = htmlToDom(resp.data as string);
 
             if (reqData.parent_id) {
                 this.formContainer.after(newElem);
@@ -91,20 +119,21 @@ export class PageComments extends Component {
         loading.remove();
     }
 
-    updateCount() {
+    protected updateCount(): void {
         const count = this.getCommentCount();
-        this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
+        this.commentsTitle.textContent = window.$trans.choice(this.countText, count);
     }
 
-    resetForm() {
+    protected resetForm(): void {
         this.removeEditor();
         this.formInput.value = '';
         this.parentId = null;
+        this.contentReference = '';
         this.replyToRow.toggleAttribute('hidden', true);
         this.container.append(this.formContainer);
     }
 
-    showForm() {
+    protected showForm(): void {
         this.removeEditor();
         this.formContainer.toggleAttribute('hidden', false);
         this.addButtonContainer.toggleAttribute('hidden', true);
@@ -112,7 +141,7 @@ export class PageComments extends Component {
         this.loadEditor();
     }
 
-    hideForm() {
+    protected hideForm(): void {
         this.resetForm();
         this.formContainer.toggleAttribute('hidden', true);
         if (this.getCommentCount() > 0) {
@@ -123,7 +152,7 @@ export class PageComments extends Component {
         this.addButtonContainer.toggleAttribute('hidden', false);
     }
 
-    loadEditor() {
+    protected loadEditor(): void {
         if (this.wysiwygEditor) {
             this.wysiwygEditor.focus();
             return;
@@ -134,42 +163,49 @@ export class PageComments extends Component {
             containerElement: this.formInput,
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.wysiwygTextDirection,
+            drawioUrl: '',
+            pageId: 0,
             translations: {},
-            translationMap: window.editor_translations,
+            translationMap: (window as Record<string, Object>).editor_translations,
         });
 
-        window.tinymce.init(config).then(editors => {
+        (window as {tinymce: {init: (Object) => Promise<any>}}).tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
             setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
     }
 
-    removeEditor() {
+    protected removeEditor(): void {
         if (this.wysiwygEditor) {
             this.wysiwygEditor.remove();
             this.wysiwygEditor = null;
         }
     }
 
-    getCommentCount() {
+    protected getCommentCount(): number {
         return this.container.querySelectorAll('[component="page-comment"]').length;
     }
 
-    setReply(commentLocalId, commentElement) {
+    protected setReply(commentLocalId, commentElement): void {
         const targetFormLocation = commentElement.closest('.comment-branch').querySelector('.comment-branch-children');
         targetFormLocation.append(this.formContainer);
         this.showForm();
         this.parentId = commentLocalId;
         this.replyToRow.toggleAttribute('hidden', false);
-        this.formReplyLink.textContent = this.formReplyText.replace('1234', this.parentId);
+        this.formReplyLink.textContent = this.formReplyText.replace('1234', String(this.parentId));
         this.formReplyLink.href = `#comment${this.parentId}`;
     }
 
-    removeReplyTo() {
+    protected removeReplyTo(): void {
         this.parentId = null;
         this.replyToRow.toggleAttribute('hidden', true);
         this.container.append(this.formContainer);
         this.showForm();
     }
 
+    public startNewComment(contentReference: string): void {
+        this.removeReplyTo();
+        this.contentReference = contentReference;
+    }
+
 }
diff --git a/resources/js/components/pointer.js b/resources/js/components/pointer.ts
similarity index 79%
rename from resources/js/components/pointer.js
rename to resources/js/components/pointer.ts
index 997df329a84..c3883b7b554 100644
--- a/resources/js/components/pointer.js
+++ b/resources/js/components/pointer.ts
@@ -1,18 +1,33 @@
 import * as DOM from '../services/dom.ts';
 import {Component} from './component';
 import {copyTextToClipboard} from '../services/clipboard.ts';
-import {el} from "../wysiwyg/utils/dom";
 import {cyrb53} from "../services/util";
 import {normalizeNodeTextOffsetToParent} from "../services/dom.ts";
+import {PageComments} from "./page-comments";
 
 export class Pointer extends Component {
 
+    protected showing: boolean = false;
+    protected isMakingSelection: boolean = false;
+    protected targetElement: HTMLElement|null = null;
+    protected targetSelectionRange: Range|null = null;
+
+    protected pointer: HTMLElement;
+    protected linkInput: HTMLInputElement;
+    protected linkButton: HTMLElement;
+    protected includeInput: HTMLInputElement;
+    protected includeButton: HTMLElement;
+    protected sectionModeButton: HTMLElement;
+    protected commentButton: HTMLElement;
+    protected modeToggles: HTMLElement[];
+    protected modeSections: HTMLElement[];
+    protected pageId: string;
+
     setup() {
-        this.container = this.$el;
         this.pointer = this.$refs.pointer;
-        this.linkInput = this.$refs.linkInput;
+        this.linkInput = this.$refs.linkInput as HTMLInputElement;
         this.linkButton = this.$refs.linkButton;
-        this.includeInput = this.$refs.includeInput;
+        this.includeInput = this.$refs.includeInput as HTMLInputElement;
         this.includeButton = this.$refs.includeButton;
         this.sectionModeButton = this.$refs.sectionModeButton;
         this.commentButton = this.$refs.commentButton;
@@ -20,12 +35,6 @@ export class Pointer extends Component {
         this.modeSections = this.$manyRefs.modeSection;
         this.pageId = this.$opts.pageId;
 
-        // Instance variables
-        this.showing = false;
-        this.isMakingSelection = false;
-        this.targetElement = null;
-        this.targetSelectionRange = null;
-
         this.setupListeners();
     }
 
@@ -36,7 +45,7 @@ export class Pointer extends Component {
 
         // Select all contents on input click
         DOM.onSelect([this.includeInput, this.linkInput], event => {
-            event.target.select();
+            (event.target as HTMLInputElement).select();
             event.stopPropagation();
         });
 
@@ -58,9 +67,10 @@ export class Pointer extends Component {
         const pageContent = document.querySelector('.page-content');
         DOM.onEvents(pageContent, ['mouseup', 'keyup'], event => {
             event.stopPropagation();
-            const targetEl = event.target.closest('[id^="bkmrk"]');
+            const targetEl = (event.target as HTMLElement).closest('[id^="bkmrk"]');
             if (targetEl && window.getSelection().toString().length > 0) {
-                this.showPointerAtTarget(targetEl, event.pageX, false);
+                const xPos = (event instanceof MouseEvent) ? event.pageX : 0;
+                this.showPointerAtTarget(targetEl, xPos, false);
             }
         });
 
@@ -69,12 +79,14 @@ export class Pointer extends Component {
 
         // Toggle between pointer modes
         DOM.onSelect(this.modeToggles, event => {
+            const targetToggle = (event.target as HTMLElement);
             for (const section of this.modeSections) {
-                const show = !section.contains(event.target);
+                const show = !section.contains(targetToggle);
                 section.toggleAttribute('hidden', !show);
             }
 
-            this.modeToggles.find(b => b !== event.target).focus();
+            const otherToggle = this.modeToggles.find(b => b !== targetToggle);
+            otherToggle && otherToggle.focus();
         });
 
         if (this.commentButton) {
@@ -83,7 +95,7 @@ export class Pointer extends Component {
     }
 
     hidePointer() {
-        this.pointer.style.display = null;
+        this.pointer.style.removeProperty('display');
         this.showing = false;
         this.targetElement = null;
         this.targetSelectionRange = null;
@@ -97,7 +109,7 @@ export class Pointer extends Component {
      */
     showPointerAtTarget(element, xPosition, keyboardMode) {
         this.targetElement = element;
-        this.targetSelectionRange = window.getSelection()?.getRangeAt(0);
+        this.targetSelectionRange = window.getSelection()?.getRangeAt(0) || null;
         this.updateDomForTarget(element);
 
         this.pointer.style.display = 'block';
@@ -120,7 +132,7 @@ export class Pointer extends Component {
 
         const scrollListener = () => {
             this.hidePointer();
-            window.removeEventListener('scroll', scrollListener, {passive: true});
+            window.removeEventListener('scroll', scrollListener);
         };
 
         element.parentElement.insertBefore(this.pointer, element);
@@ -142,7 +154,7 @@ export class Pointer extends Component {
 
         // Update anchor if present
         const editAnchor = this.pointer.querySelector('#pointer-edit');
-        if (editAnchor && element) {
+        if (editAnchor instanceof HTMLAnchorElement && element) {
             const {editHref} = editAnchor.dataset;
             const elementId = element.id;
 
@@ -193,7 +205,8 @@ export class Pointer extends Component {
         }
 
         const reference = `${refId}:${hash}:${range}`;
-        console.log(reference);
+        const pageComments = window.$components.first('page-comments') as PageComments;
+        pageComments.startNewComment(reference);
     }
 
 }
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 779b4854773..537af816a90 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -44,9 +44,11 @@ export function forEach(selector: string, callback: (el: Element) => any) {
 /**
  * Helper to listen to multiple DOM events
  */
-export function onEvents(listenerElement: Element, events: string[], callback: (e: Event) => any): void {
-    for (const eventName of events) {
-        listenerElement.addEventListener(eventName, callback);
+export function onEvents(listenerElement: Element|null, events: string[], callback: (e: Event) => any): void {
+    if (listenerElement) {
+        for (const eventName of events) {
+            listenerElement.addEventListener(eventName, callback);
+        }
     }
 }
 
diff --git a/resources/js/services/translations.ts b/resources/js/services/translations.ts
index b37dbdfb074..821c34f18f7 100644
--- a/resources/js/services/translations.ts
+++ b/resources/js/services/translations.ts
@@ -10,6 +10,7 @@ export class Translator {
      * to use. Similar format at Laravel's 'trans_choice' helper.
      */
     choice(translation: string, count: number, replacements: Record<string, string> = {}): string {
+        replacements = Object.assign({}, replacements, {count: String(count)});
         const splitText = translation.split('|');
         const exactCountRegex = /^{([0-9]+)}/;
         const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;

From 5e3c3ad634cb7de4a13041292611c7aaafaa2f30 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Apr 2025 21:13:49 +0100
Subject: [PATCH 507/666] Comments: Added back-end content reference handling

Also added archived property, to be added.
---
 app/Activity/CommentRepo.php                  |  3 +-
 .../Controllers/CommentController.php         |  3 +-
 app/Activity/Models/Comment.php               |  2 ++
 .../Activity/Models/CommentFactory.php        |  2 ++
 ..._content_refs_and_archived_to_comments.php | 30 +++++++++++++++++++
 resources/js/components/page-comments.ts      |  2 +-
 tests/Entity/CommentTest.php                  | 26 ++++++++++++++++
 7 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2025_04_18_215145_add_content_refs_and_archived_to_comments.php

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index 3336e17e988..c488350ca24 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -20,7 +20,7 @@ public function getById(int $id): Comment
     /**
      * Create a new comment on an entity.
      */
-    public function create(Entity $entity, string $html, ?int $parent_id): Comment
+    public function create(Entity $entity, string $html, ?int $parent_id, string $content_ref): Comment
     {
         $userId = user()->id;
         $comment = new Comment();
@@ -30,6 +30,7 @@ public function create(Entity $entity, string $html, ?int $parent_id): Comment
         $comment->updated_by = $userId;
         $comment->local_id = $this->getNextLocalId($entity);
         $comment->parent_id = $parent_id;
+        $comment->content_ref = preg_match('/^bkmrk-(.*?):\d+:(\d*-\d*)?$/', $content_ref) === 1 ? $content_ref : '';
 
         $entity->comments()->save($comment);
         ActivityService::add(ActivityType::COMMENT_CREATE, $comment);
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 52ccc823864..26208006784 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -26,6 +26,7 @@ public function savePageComment(Request $request, int $pageId)
         $input = $this->validate($request, [
             'html'      => ['required', 'string'],
             'parent_id' => ['nullable', 'integer'],
+            'content_ref' => ['string'],
         ]);
 
         $page = $this->pageQueries->findVisibleById($pageId);
@@ -40,7 +41,7 @@ public function savePageComment(Request $request, int $pageId)
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
-        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null);
+        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $input['content_ref']);
 
         return view('comments.comment-branch', [
             'readOnly' => false,
diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index d0385d3962f..91cea4fe0e3 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -19,6 +19,8 @@
  * @property int      $entity_id
  * @property int      $created_by
  * @property int      $updated_by
+ * @property string   $content_ref
+ * @property bool     $archived
  */
 class Comment extends Model implements Loggable
 {
diff --git a/database/factories/Activity/Models/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
index efbd183b31d..844bc399381 100644
--- a/database/factories/Activity/Models/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -27,6 +27,8 @@ public function definition()
             'html'      => $html,
             'parent_id' => null,
             'local_id'  => 1,
+            'content_ref' => '',
+            'archived' => false,
         ];
     }
 }
diff --git a/database/migrations/2025_04_18_215145_add_content_refs_and_archived_to_comments.php b/database/migrations/2025_04_18_215145_add_content_refs_and_archived_to_comments.php
new file mode 100644
index 00000000000..794201dec8a
--- /dev/null
+++ b/database/migrations/2025_04_18_215145_add_content_refs_and_archived_to_comments.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->string('content_ref');
+            $table->boolean('archived')->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->dropColumn('content_ref');
+            $table->dropColumn('archived');
+        });
+    }
+};
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index a19d2c7d4b1..45f8d6a9f6d 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -95,7 +95,7 @@ export class PageComments extends Component {
         const reqData = {
             html: this.wysiwygEditor.getContent(),
             parent_id: this.parentId || null,
-            content_reference: this.contentReference || '',
+            content_ref: this.contentReference || '',
         };
 
         window.$http.post(`/comment/${this.pageId}`, reqData).then(resp => {
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 9e019e3d148..973b2b81d8d 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -33,6 +33,32 @@ public function test_add_comment()
 
         $this->assertActivityExists(ActivityType::COMMENT_CREATE);
     }
+    public function test_add_comment_stores_content_reference_only_if_format_valid()
+    {
+        $validityByRefs = [
+            'bkmrk-my-title:4589284922:4-3' => true,
+            'bkmrk-my-title:4589284922:' => true,
+            'bkmrk-my-title:4589284922:abc' => false,
+            'my-title:4589284922:' => false,
+            'bkmrk-my-title-4589284922:' => false,
+        ];
+
+        $page = $this->entities->page();
+
+        foreach ($validityByRefs as $ref => $valid) {
+            $this->asAdmin()->postJson("/comment/$page->id", [
+                'html' => '<p>My comment</p>',
+                'parent_id' => null,
+                'content_ref' => $ref,
+            ]);
+
+            if ($valid) {
+                $this->assertDatabaseHas('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+            } else {
+                $this->assertDatabaseMissing('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+            }
+        }
+    }
 
     public function test_comment_edit()
     {

From 2e7544a865a2b8ca7fdd3e32bdd86746a1a62512 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 19 Apr 2025 12:46:47 +0100
Subject: [PATCH 508/666] Comments: Converted comment component to TS

---
 .../{page-comment.js => page-comment.ts}      | 47 +++++++++++++------
 resources/views/comments/comment.blade.php    |  2 +-
 2 files changed, 34 insertions(+), 15 deletions(-)
 rename resources/js/components/{page-comment.js => page-comment.ts} (70%)

diff --git a/resources/js/components/page-comment.js b/resources/js/components/page-comment.ts
similarity index 70%
rename from resources/js/components/page-comment.js
rename to resources/js/components/page-comment.ts
index 8c0a8b33e54..b2e2bac2784 100644
--- a/resources/js/components/page-comment.js
+++ b/resources/js/components/page-comment.ts
@@ -4,33 +4,51 @@ import {buildForInput} from '../wysiwyg-tinymce/config';
 
 export class PageComment extends Component {
 
+    protected commentId: string;
+    protected commentLocalId: string;
+    protected commentContentRef: string;
+    protected deletedText: string;
+    protected updatedText: string;
+
+    protected wysiwygEditor: any = null;
+    protected wysiwygLanguage: string;
+    protected wysiwygTextDirection: string;
+
+    protected container: HTMLElement;
+    protected contentContainer: HTMLElement;
+    protected form: HTMLFormElement;
+    protected formCancel: HTMLElement;
+    protected editButton: HTMLElement;
+    protected deleteButton: HTMLElement;
+    protected replyButton: HTMLElement;
+    protected input: HTMLInputElement;
+
     setup() {
         // Options
         this.commentId = this.$opts.commentId;
         this.commentLocalId = this.$opts.commentLocalId;
-        this.commentParentId = this.$opts.commentParentId;
+        this.commentContentRef = this.$opts.commentContentRef;
         this.deletedText = this.$opts.deletedText;
         this.updatedText = this.$opts.updatedText;
 
         // Editor reference and text options
-        this.wysiwygEditor = null;
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
         this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
 
         // Element references
         this.container = this.$el;
         this.contentContainer = this.$refs.contentContainer;
-        this.form = this.$refs.form;
+        this.form = this.$refs.form as HTMLFormElement;
         this.formCancel = this.$refs.formCancel;
         this.editButton = this.$refs.editButton;
         this.deleteButton = this.$refs.deleteButton;
         this.replyButton = this.$refs.replyButton;
-        this.input = this.$refs.input;
+        this.input = this.$refs.input as HTMLInputElement;
 
         this.setupListeners();
     }
 
-    setupListeners() {
+    protected setupListeners(): void {
         if (this.replyButton) {
             this.replyButton.addEventListener('click', () => this.$emit('reply', {
                 id: this.commentLocalId,
@@ -49,12 +67,12 @@ export class PageComment extends Component {
         }
     }
 
-    toggleEditMode(show) {
+    protected toggleEditMode(show: boolean) : void {
         this.contentContainer.toggleAttribute('hidden', show);
         this.form.toggleAttribute('hidden', !show);
     }
 
-    startEdit() {
+    protected startEdit() : void {
         this.toggleEditMode(true);
 
         if (this.wysiwygEditor) {
@@ -67,29 +85,30 @@ export class PageComment extends Component {
             containerElement: this.input,
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.wysiwygTextDirection,
+            drawioUrl: '',
+            pageId: 0,
             translations: {},
-            translationMap: window.editor_translations,
+            translationMap: (window as Record<string, Object>).editor_translations,
         });
 
-        window.tinymce.init(config).then(editors => {
+        (window as {tinymce: {init: (Object) => Promise<any>}}).tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
             setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
     }
 
-    async update(event) {
+    protected async update(event: Event): Promise<void> {
         event.preventDefault();
         const loading = this.showLoading();
         this.form.toggleAttribute('hidden', true);
 
         const reqData = {
             html: this.wysiwygEditor.getContent(),
-            parent_id: this.parentId || null,
         };
 
         try {
             const resp = await window.$http.put(`/comment/${this.commentId}`, reqData);
-            const newComment = htmlToDom(resp.data);
+            const newComment = htmlToDom(resp.data as string);
             this.container.replaceWith(newComment);
             window.$events.success(this.updatedText);
         } catch (err) {
@@ -100,7 +119,7 @@ export class PageComment extends Component {
         }
     }
 
-    async delete() {
+    protected async delete(): Promise<void> {
         this.showLoading();
 
         await window.$http.delete(`/comment/${this.commentId}`);
@@ -109,7 +128,7 @@ export class PageComment extends Component {
         window.$events.success(this.deletedText);
     }
 
-    showLoading() {
+    protected showLoading(): HTMLElement {
         const loading = getLoading();
         loading.classList.add('px-l');
         this.container.append(loading);
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 2bf89d6832d..c3578293a5a 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -4,7 +4,7 @@
 <div component="{{ $readOnly ? '' : 'page-comment' }}"
      option:page-comment:comment-id="{{ $comment->id }}"
      option:page-comment:comment-local-id="{{ $comment->local_id }}"
-     option:page-comment:comment-parent-id="{{ $comment->parent_id }}"
+     option:page-comment:comment-content-ref="{{ $comment->content_ref }}"
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
      option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"

From 18ede9bbd3bef5e7b82ae52c0dac2a26fe2c24fd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 19 Apr 2025 14:07:52 +0100
Subject: [PATCH 509/666] Comments: Added inline comment marker/highlight logic

---
 resources/js/components/page-comment.ts | 47 ++++++++++++++++++++-
 resources/js/components/pointer.ts      |  6 +--
 resources/js/services/dom.ts            | 56 +++++++++++++++++++++++++
 resources/js/services/util.ts           |  2 +-
 resources/sass/_pages.scss              | 21 ++++++++++
 5 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index b2e2bac2784..f4d295b95a3 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -1,6 +1,7 @@
 import {Component} from './component';
-import {getLoading, htmlToDom} from '../services/dom.ts';
+import {findTargetNodeAndOffset, getLoading, hashElement, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
+import {el} from "../wysiwyg/utils/dom";
 
 export class PageComment extends Component {
 
@@ -46,6 +47,7 @@ export class PageComment extends Component {
         this.input = this.$refs.input as HTMLInputElement;
 
         this.setupListeners();
+        this.positionForReference();
     }
 
     protected setupListeners(): void {
@@ -135,4 +137,47 @@ export class PageComment extends Component {
         return loading;
     }
 
+    protected positionForReference() {
+        if (!this.commentContentRef) {
+            return;
+        }
+
+        const [refId, refHash, refRange] = this.commentContentRef.split(':');
+        const refEl = document.getElementById(refId);
+        if (!refEl) {
+            // TODO - Show outdated marker for comment
+            return;
+        }
+
+        const actualHash = hashElement(refEl);
+        if (actualHash !== refHash) {
+            // TODO - Show outdated marker for comment
+            return;
+        }
+
+        const refElBounds = refEl.getBoundingClientRect();
+        let bounds = refElBounds;
+        const [rangeStart, rangeEnd] = refRange.split('-');
+        if (rangeStart && rangeEnd) {
+            const range = new Range();
+            const relStart = findTargetNodeAndOffset(refEl, Number(rangeStart));
+            const relEnd = findTargetNodeAndOffset(refEl, Number(rangeEnd));
+            if (relStart && relEnd) {
+                range.setStart(relStart.node, relStart.offset);
+                range.setEnd(relEnd.node, relEnd.offset);
+                bounds = range.getBoundingClientRect();
+            }
+        }
+
+        const relLeft = bounds.left - refElBounds.left;
+        const relTop = bounds.top - refElBounds.top;
+        // TODO - Extract to class, Use theme color
+        const marker = el('div', {
+            class: 'content-comment-highlight',
+            style: `left: ${relLeft}px; top: ${relTop}px; width: ${bounds.width}px; height: ${bounds.height}px;`
+        }, ['']);
+
+        refEl.style.position = 'relative';
+        refEl.append(marker);
+    }
 }
diff --git a/resources/js/components/pointer.ts b/resources/js/components/pointer.ts
index c3883b7b554..d84186d872d 100644
--- a/resources/js/components/pointer.ts
+++ b/resources/js/components/pointer.ts
@@ -1,8 +1,7 @@
 import * as DOM from '../services/dom.ts';
 import {Component} from './component';
 import {copyTextToClipboard} from '../services/clipboard.ts';
-import {cyrb53} from "../services/util";
-import {normalizeNodeTextOffsetToParent} from "../services/dom.ts";
+import {hashElement, normalizeNodeTextOffsetToParent} from "../services/dom.ts";
 import {PageComments} from "./page-comments";
 
 export class Pointer extends Component {
@@ -183,9 +182,8 @@ export class Pointer extends Component {
             return;
         }
 
-        const normalisedElemHtml = this.targetElement.outerHTML.replace(/\s{2,}/g, '');
         const refId = this.targetElement.id;
-        const hash = cyrb53(normalisedElemHtml);
+        const hash = hashElement(this.targetElement);
         let range = '';
         if (this.targetSelectionRange) {
             const commonContainer = this.targetSelectionRange.commonAncestorContainer;
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 537af816a90..661ed7ca3e5 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -1,3 +1,5 @@
+import {cyrb53} from "./util";
+
 /**
  * Check if the given param is a HTMLElement
  */
@@ -181,6 +183,9 @@ export function htmlToDom(html: string): HTMLElement {
     return firstChild;
 }
 
+/**
+ * For the given node and offset, return an adjusted offset that's relative to the given parent element.
+ */
 export function normalizeNodeTextOffsetToParent(node: Node, offset: number, parentElement: HTMLElement): number {
     if (!parentElement.contains(node)) {
         throw new Error('ParentElement must be a prent of element');
@@ -201,3 +206,54 @@ export function normalizeNodeTextOffsetToParent(node: Node, offset: number, pare
 
     return normalizedOffset;
 }
+
+/**
+ * Find the target child node and adjusted offset based on a parent node and text offset.
+ * Returns null if offset not found within the given parent node.
+ */
+export function findTargetNodeAndOffset(parentNode: HTMLElement, offset: number): ({node: Node, offset: number}|null) {
+    if (offset === 0) {
+        return { node: parentNode, offset: 0 };
+    }
+
+    let currentOffset = 0;
+    let currentNode = null;
+
+    for (let i = 0; i < parentNode.childNodes.length; i++) {
+        currentNode = parentNode.childNodes[i];
+
+        if (currentNode.nodeType === Node.TEXT_NODE) {
+            // For text nodes, count the length of their content
+            // Returns if within range
+            const textLength = currentNode.textContent.length;
+            if (currentOffset + textLength >= offset) {
+                return {
+                    node: currentNode,
+                    offset: offset - currentOffset
+                };
+            }
+
+            currentOffset += textLength;
+        } else if (currentNode.nodeType === Node.ELEMENT_NODE) {
+            // Otherwise, if an element, track the text length and search within
+            // if in range for the target offset
+            const elementTextLength = currentNode.textContent.length;
+            if (currentOffset + elementTextLength >= offset) {
+                return findTargetNodeAndOffset(currentNode, offset - currentOffset);
+            }
+
+            currentOffset += elementTextLength;
+        }
+    }
+
+    // Return null if not found within range
+    return null;
+}
+
+/**
+ * Create a hash for the given HTML element.
+ */
+export function hashElement(element: HTMLElement): string {
+    const normalisedElemHtml = element.outerHTML.replace(/\s{2,}/g, '');
+    return cyrb53(normalisedElemHtml);
+}
\ No newline at end of file
diff --git a/resources/js/services/util.ts b/resources/js/services/util.ts
index 1a6fa55b6b0..61a02a3d24d 100644
--- a/resources/js/services/util.ts
+++ b/resources/js/services/util.ts
@@ -164,5 +164,5 @@ export function cyrb53(str: string, seed: number = 0): string {
     h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
     h2  = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
     h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
-    return (4294967296 * (2097151 & h2) + (h1 >>> 0)) as string;
+    return String((4294967296 * (2097151 & h2) + (h1 >>> 0)));
 }
\ No newline at end of file
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index de783705763..1fe22b9c4e2 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -219,6 +219,27 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
 }
 
+// Page inline comments
+.content-comment-highlight {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 0;
+  height: 0;
+  user-select: none;
+  pointer-events: none;
+  &:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: var(--color-primary);
+    opacity: 0.25;
+  }
+}
+
 // Page editor sidebar toolbox
 .floating-toolbox {
   @include mixins.lightDark(background-color, #FFF, #222);

From 5bfba281fc0c57556d65092013b5663efd350b3e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Apr 2025 14:04:41 +0100
Subject: [PATCH 510/666] Comments: Started inline comment display windows

---
 lang/en/entities.php                       |  1 +
 resources/js/components/page-comment.ts    | 66 ++++++++++++++++++++--
 resources/sass/_animations.scss            | 22 ++++++++
 resources/sass/_pages.scss                 | 46 +++++++++++++++
 resources/views/comments/comment.blade.php |  1 +
 5 files changed, 132 insertions(+), 4 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index a74785eaacd..9ce684ac71b 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -402,6 +402,7 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_view' => 'View comment',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index f4d295b95a3..5a148c25885 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -3,6 +3,8 @@ import {findTargetNodeAndOffset, getLoading, hashElement, htmlToDom} from '../se
 import {buildForInput} from '../wysiwyg-tinymce/config';
 import {el} from "../wysiwyg/utils/dom";
 
+import commentIcon from "@icons/comment.svg"
+
 export class PageComment extends Component {
 
     protected commentId: string;
@@ -10,6 +12,7 @@ export class PageComment extends Component {
     protected commentContentRef: string;
     protected deletedText: string;
     protected updatedText: string;
+    protected viewCommentText: string;
 
     protected wysiwygEditor: any = null;
     protected wysiwygLanguage: string;
@@ -31,6 +34,7 @@ export class PageComment extends Component {
         this.commentContentRef = this.$opts.commentContentRef;
         this.deletedText = this.$opts.deletedText;
         this.updatedText = this.$opts.updatedText;
+        this.viewCommentText = this.$opts.viewCommentText;
 
         // Editor reference and text options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
@@ -171,13 +175,67 @@ export class PageComment extends Component {
 
         const relLeft = bounds.left - refElBounds.left;
         const relTop = bounds.top - refElBounds.top;
-        // TODO - Extract to class, Use theme color
-        const marker = el('div', {
+
+        const marker = el('button', {
+            type: 'button',
+            class: 'content-comment-marker',
+            title: this.viewCommentText,
+        });
+        marker.innerHTML = <string>commentIcon;
+        marker.addEventListener('click', event => {
+            this.showCommentAtMarker(marker);
+        });
+
+        const markerWrap = el('div', {
             class: 'content-comment-highlight',
             style: `left: ${relLeft}px; top: ${relTop}px; width: ${bounds.width}px; height: ${bounds.height}px;`
-        }, ['']);
+        }, [marker]);
 
         refEl.style.position = 'relative';
-        refEl.append(marker);
+        refEl.append(markerWrap);
+    }
+
+    protected showCommentAtMarker(marker: HTMLElement): void {
+
+        marker.hidden = true;
+        const readClone = this.container.closest('.comment-branch').cloneNode(true) as HTMLElement;
+        const toRemove = readClone.querySelectorAll('.actions, form');
+        for (const el of toRemove) {
+            el.remove();
+        }
+
+        const close = el('button', {type: 'button'}, ['x']);
+        const jump = el('button', {type: 'button'}, ['Jump to thread']);
+
+        const commentWindow = el('div', {
+            class: 'content-comment-window'
+        }, [
+            el('div', {
+                class: 'content-comment-window-actions',
+            }, [jump, close]),
+            el('div', {
+                class: 'content-comment-window-content',
+            }, [readClone]),
+        ]);
+
+        marker.parentElement.append(commentWindow);
+
+        const closeAction = () => {
+            commentWindow.remove();
+            marker.hidden = false;
+        };
+
+        close.addEventListener('click', closeAction.bind(this));
+
+        jump.addEventListener('click', () => {
+            closeAction();
+            this.container.scrollIntoView({behavior: 'smooth'});
+            const highlightTarget = this.container.querySelector('.header') as HTMLElement;
+            highlightTarget.classList.add('anim-highlight');
+            highlightTarget.addEventListener('animationend', () => highlightTarget.classList.remove('anim-highlight'))
+        });
+
+        // TODO - Position wrapper sensibly
+        // TODO - Movement control?
     }
 }
diff --git a/resources/sass/_animations.scss b/resources/sass/_animations.scss
index f1aa3139b8e..ccbe36161b6 100644
--- a/resources/sass/_animations.scss
+++ b/resources/sass/_animations.scss
@@ -67,4 +67,26 @@
   animation-duration: 180ms;
   animation-delay: 0s;
   animation-timing-function: cubic-bezier(.62, .28, .23, .99);
+}
+
+@keyframes highlight {
+  0% {
+    background-color: var(--color-primary-light);
+  }
+  33% {
+    background-color: transparent;
+  }
+  66% {
+    background-color: var(--color-primary-light);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+.anim-highlight {
+  animation-name: highlight;
+  animation-duration: 2s;
+  animation-delay: 0s;
+  animation-timing-function: linear;
 }
\ No newline at end of file
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 1fe22b9c4e2..ac2d195b4e8 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -239,6 +239,52 @@ body.tox-fullscreen, body.markdown-fullscreen {
     opacity: 0.25;
   }
 }
+.content-comment-window {
+  font-size: vars.$fs-m;
+  line-height: 1.4;
+  position: relative;
+  z-index: 90;
+  pointer-events: all;
+  min-width: min(340px, 80vw);
+  background-color: #FFF;
+  //border: 1px solid var(--color-primary);
+  box-shadow: vars.$bs-hover;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.content-comment-window-actions {
+  background-color: var(--color-primary);
+  color: #FFF;
+  display: flex;
+  align-items: center;
+  justify-content: end;
+}
+.content-comment-window-content {
+  padding: vars.$xs;
+  max-height: 200px;
+  overflow-y: scroll;
+}
+.content-comment-marker {
+  position: absolute;
+  right: -16px;
+  top: -16px;
+  pointer-events: all;
+  width: min(1.5em, 32px);
+  height: min(1.5em, 32px);
+  border-radius: min(calc(1.5em / 2), 32px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--color-primary);
+  box-shadow: vars.$bs-hover;
+  color: #FFF;
+  cursor: pointer;
+  z-index: 90;
+  svg {
+    fill: #FFF;
+    width: 80%;
+  }
+}
 
 // Page editor sidebar toolbox
 .floating-toolbox {
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index c3578293a5a..1886dad51e4 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -7,6 +7,7 @@
      option:page-comment:comment-content-ref="{{ $comment->content_ref }}"
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
+     option:page-comment:view-comment-text="{{ trans('entities.comment_view') }}"
      option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
      option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"

From f656a82fe7a2be253ee53c3af8d27edd35617bd2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 24 Apr 2025 13:21:23 +0100
Subject: [PATCH 511/666] Comments: Styled content comments & improved
 interaction

---
 lang/en/entities.php                          |  1 +
 resources/js/components/page-comment.ts       | 52 +++++++++++++++----
 resources/sass/_components.scss               | 27 ++++++++++
 resources/sass/_pages.scss                    | 29 +++++++++--
 .../views/comments/comment-branch.blade.php   |  2 +-
 resources/views/comments/comment.blade.php    |  2 +
 6 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index 9ce684ac71b..f9fab8ebfd3 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -403,6 +403,7 @@
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
     'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 5a148c25885..9192c7c56af 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -4,6 +4,13 @@ import {buildForInput} from '../wysiwyg-tinymce/config';
 import {el} from "../wysiwyg/utils/dom";
 
 import commentIcon from "@icons/comment.svg"
+import closeIcon from "@icons/close.svg"
+
+/**
+ * Track the close function for the current open marker so it can be closed
+ * when another is opened so we only show one marker comment thread at one time.
+ */
+let openMarkerClose: Function|null = null;
 
 export class PageComment extends Component {
 
@@ -13,6 +20,8 @@ export class PageComment extends Component {
     protected deletedText: string;
     protected updatedText: string;
     protected viewCommentText: string;
+    protected jumpToThreadText: string;
+    protected closeText: string;
 
     protected wysiwygEditor: any = null;
     protected wysiwygLanguage: string;
@@ -35,6 +44,8 @@ export class PageComment extends Component {
         this.deletedText = this.$opts.deletedText;
         this.updatedText = this.$opts.updatedText;
         this.viewCommentText = this.$opts.viewCommentText;
+        this.jumpToThreadText = this.$opts.jumpToThreadText;
+        this.closeText = this.$opts.closeText;
 
         // Editor reference and text options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
@@ -130,7 +141,7 @@ export class PageComment extends Component {
 
         await window.$http.delete(`/comment/${this.commentId}`);
         this.$emit('delete');
-        this.container.closest('.comment-branch').remove();
+        this.container.closest('.comment-branch')?.remove();
         window.$events.success(this.deletedText);
     }
 
@@ -196,16 +207,22 @@ export class PageComment extends Component {
     }
 
     protected showCommentAtMarker(marker: HTMLElement): void {
-
+        // Hide marker and close existing marker windows
+        if (openMarkerClose) {
+            openMarkerClose();
+        }
         marker.hidden = true;
-        const readClone = this.container.closest('.comment-branch').cloneNode(true) as HTMLElement;
+
+        // Build comment window
+        const readClone = (this.container.closest('.comment-branch') as HTMLElement).cloneNode(true) as HTMLElement;
         const toRemove = readClone.querySelectorAll('.actions, form');
         for (const el of toRemove) {
             el.remove();
         }
 
-        const close = el('button', {type: 'button'}, ['x']);
-        const jump = el('button', {type: 'button'}, ['Jump to thread']);
+        const close = el('button', {type: 'button', title: this.closeText});
+        close.innerHTML = (closeIcon as string);
+        const jump = el('button', {type: 'button', 'data-action': 'jump'}, [this.jumpToThreadText]);
 
         const commentWindow = el('div', {
             class: 'content-comment-window'
@@ -214,19 +231,29 @@ export class PageComment extends Component {
                 class: 'content-comment-window-actions',
             }, [jump, close]),
             el('div', {
-                class: 'content-comment-window-content',
+                class: 'content-comment-window-content comment-container-compact comment-container-super-compact',
             }, [readClone]),
         ]);
 
-        marker.parentElement.append(commentWindow);
+        marker.parentElement?.append(commentWindow);
 
+        // Handle interaction within window
         const closeAction = () => {
             commentWindow.remove();
             marker.hidden = false;
+            window.removeEventListener('click', windowCloseAction);
+            openMarkerClose = null;
         };
 
-        close.addEventListener('click', closeAction.bind(this));
+        const windowCloseAction = (event: MouseEvent) => {
+            if (!(marker.parentElement as HTMLElement).contains(event.target as HTMLElement)) {
+                closeAction();
+            }
+        };
+        window.addEventListener('click', windowCloseAction);
 
+        openMarkerClose = closeAction;
+        close.addEventListener('click', closeAction.bind(this));
         jump.addEventListener('click', () => {
             closeAction();
             this.container.scrollIntoView({behavior: 'smooth'});
@@ -235,7 +262,12 @@ export class PageComment extends Component {
             highlightTarget.addEventListener('animationend', () => highlightTarget.classList.remove('anim-highlight'))
         });
 
-        // TODO - Position wrapper sensibly
-        // TODO - Movement control?
+        // Position window within bounds
+        const commentWindowBounds = commentWindow.getBoundingClientRect();
+        const contentBounds = document.querySelector('.page-content')?.getBoundingClientRect();
+        if (contentBounds && commentWindowBounds.right > contentBounds.right) {
+            const diff = commentWindowBounds.right - contentBounds.right;
+            commentWindow.style.left = `-${diff}px`;
+        }
     }
 }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 58d39d3ee6e..26b0518275b 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -746,6 +746,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   height: calc(100% - vars.$m);
 }
 
+.comment-branch .comment-box {
+  margin-bottom: vars.$m;
+}
+
 .comment-branch .comment-branch .comment-branch .comment-branch .comment-thread-indicator {
   display: none;
 }
@@ -761,6 +765,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .comment-container-compact .comment-box {
+  margin-bottom: vars.$xs;
   .meta {
     font-size: 0.8rem;
   }
@@ -778,6 +783,28 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   width: vars.$m;
 }
 
+.comment-container-super-compact .comment-box {
+  .meta {
+    font-size: 12px;
+  }
+  .avatar {
+    width: 18px;
+    margin-inline-end: 2px !important;
+  }
+  .content {
+    padding: vars.$xxs vars.$s;
+    line-height: 1.2;
+  }
+  .content p {
+    font-size: 12px;
+  }
+}
+
+.comment-container-super-compact .comment-thread-indicator {
+  width: (vars.$xs + 3px);
+  margin-inline-start: 3px;
+}
+
 #tag-manager .drag-card {
   max-width: 500px;
 }
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index ac2d195b4e8..be5a0f7c360 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -242,12 +242,13 @@ body.tox-fullscreen, body.markdown-fullscreen {
 .content-comment-window {
   font-size: vars.$fs-m;
   line-height: 1.4;
-  position: relative;
-  z-index: 90;
+  position: absolute;
+  top: calc(100% + 3px);
+  left: 0;
+  z-index: 92;
   pointer-events: all;
   min-width: min(340px, 80vw);
   background-color: #FFF;
-  //border: 1px solid var(--color-primary);
   box-shadow: vars.$bs-hover;
   border-radius: 4px;
   overflow: hidden;
@@ -258,9 +259,24 @@ body.tox-fullscreen, body.markdown-fullscreen {
   display: flex;
   align-items: center;
   justify-content: end;
+  gap: vars.$xs;
+  button {
+    color: #FFF;
+    font-size: 12px;
+    padding: vars.$xs;
+    line-height: 1;
+    cursor: pointer;
+  }
+  button[data-action="jump"] {
+    text-decoration: underline;
+  }
+  svg {
+    fill: currentColor;
+    width: 12px;
+  }
 }
 .content-comment-window-content {
-  padding: vars.$xs;
+  padding: vars.$xs vars.$s vars.$xs vars.$xs;
   max-height: 200px;
   overflow-y: scroll;
 }
@@ -280,11 +296,16 @@ body.tox-fullscreen, body.markdown-fullscreen {
   color: #FFF;
   cursor: pointer;
   z-index: 90;
+  transform: scale(1);
+  transition: transform ease-in-out 120ms;
   svg {
     fill: #FFF;
     width: 80%;
   }
 }
+.page-content [id^="bkmrk-"]:hover .content-comment-marker {
+  transform: scale(1.15);
+}
 
 // Page editor sidebar toolbox
 .floating-toolbox {
diff --git a/resources/views/comments/comment-branch.blade.php b/resources/views/comments/comment-branch.blade.php
index 78d19ac3ea4..83fa4b5c595 100644
--- a/resources/views/comments/comment-branch.blade.php
+++ b/resources/views/comments/comment-branch.blade.php
@@ -1,5 +1,5 @@
 <div class="comment-branch">
-    <div class="mb-m">
+    <div>
         @include('comments.comment', ['comment' => $branch['comment']])
     </div>
     <div class="flex-container-row">
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 1886dad51e4..5b79da4ac68 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -8,6 +8,8 @@
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
      option:page-comment:view-comment-text="{{ trans('entities.comment_view') }}"
+     option:page-comment:jump-to-thread-text="{{ trans('entities.comment_jump_to_thread') }}"
+     option:page-comment:close-text="{{ trans('common.close') }}"
      option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
      option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"

From c61ce8dee4ea474b16564c3d3337bac25fba1f46 Mon Sep 17 00:00:00 2001
From: "nchoudhary@logicmines.in" <nchoudhary@logicmines.in>
Date: Fri, 25 Apr 2025 12:45:09 +0530
Subject: [PATCH 512/666] Implement functionality to export a book, along with
 its pages and chapters, as a ZIP file.

---
 .../Controllers/BookExportApiController.php    | 18 +++++++++++++++++-
 .../Controllers/ChapterExportApiController.php | 12 +++++++++++-
 .../Controllers/PageExportApiController.php    | 14 +++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index 164946b0c78..431afef143d 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
 use Throwable;
 
@@ -63,4 +64,19 @@ public function exportMarkdown(int $id)
 
         return $this->download()->directly($markdown, $book->slug . '.md');
     }
-}
+
+    
+    /**
+     * Export a book to a contained ZIP export file.
+     * @throws NotFoundException
+     */
+    public function exportZip(int $id, ZipExportBuilder $builder)
+    {
+        $book = $this->queries->findVisibleByIdOrFail($id);
+        $bookName= $book->getShortName();
+     
+        $zip = $builder->buildForBook($book);
+
+        return $this->download()->streamedFileDirectly($zip, $bookName . '.zip', filesize($zip), true);
+    }
+}
\ No newline at end of file
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index 9914e2b7fbe..58df4c9b087 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
 use Throwable;
 
@@ -63,4 +64,13 @@ public function exportMarkdown(int $id)
 
         return $this->download()->directly($markdown, $chapter->slug . '.md');
     }
-}
+
+    public function exportZip(int $id, ZipExportBuilder $builder)
+    {
+        $chapter = $this->queries->findVisibleByIdOrFail($id);
+        $chapterName= $chapter->getShortName();
+        $zip = $builder->buildForChapter($chapter);
+
+        return $this->download()->streamedFileDirectly($zip, $chapterName . '.zip', filesize($zip), true);
+    }
+}
\ No newline at end of file
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index c6e20b615d2..ef564da3e5c 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exports\ExportFormatter;
+use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
 use Throwable;
 
@@ -63,4 +64,15 @@ public function exportMarkdown(int $id)
 
         return $this->download()->directly($markdown, $page->slug . '.md');
     }
-}
+
+
+
+    public function exportZip(int $id, ZipExportBuilder $builder)
+    {
+        $page = $this->queries->findVisibleByIdOrFail($id);
+        $pageSlug = $page->slug;
+        $zip = $builder->buildForPage($page);
+
+        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', filesize($zip), true);
+    }
+}
\ No newline at end of file

From 5fa728f28a0c4f09649da7b653dd66260e49a596 Mon Sep 17 00:00:00 2001
From: "nchoudhary@logicmines.in" <nchoudhary@logicmines.in>
Date: Fri, 25 Apr 2025 12:48:34 +0530
Subject: [PATCH 513/666] Develop functionality to import ZIP files. Create an
 API controller and define a route entry for handling the import process.
 Implement logic to read the list of files within the ZIP, process the
 directory structure, and automatically create associated pages, chapters, and
 books based on the ZIP file's contents.

---
 .../Controllers/ImportApiController.php       | 121 ++++++++++++++++++
 routes/api.php                                |   6 +
 2 files changed, 127 insertions(+)
 create mode 100644 app/Exports/Controllers/ImportApiController.php

diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.php
new file mode 100644
index 00000000000..682d340b3b4
--- /dev/null
+++ b/app/Exports/Controllers/ImportApiController.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BookStack\Exports\Controllers;
+
+use BookStack\Exceptions\ZipImportException;
+use BookStack\Exceptions\ZipValidationException;
+use BookStack\Exports\ImportRepo;
+use BookStack\Http\Controller;
+use BookStack\Uploads\AttachmentService;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+class ImportApiController extends Controller
+{
+    public function __construct(
+        protected ImportRepo $imports,
+    ) {
+        $this->middleware('can:content-import');
+    }
+
+    /**
+     * List existing imports visible to the user.
+     */
+    public function list(): JsonResponse
+    {
+        $imports = $this->imports->getVisibleImports();
+
+        return response()->json([
+            'status' => 'success',
+            'imports' => $imports,
+        ]);
+    }
+
+    /**
+     * Upload, validate and store an import file.
+     */
+    public function upload(Request $request): JsonResponse
+    {
+        $this->validate($request, [
+            'file' => ['required', ...AttachmentService::getFileValidationRules()]
+        ]);
+
+        $file = $request->file('file');
+
+        try {
+            $import = $this->imports->storeFromUpload($file);
+        } catch (ZipValidationException $exception) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Validation failed',
+                'errors' => $exception->errors,
+            ], 422);
+        }
+
+        return response()->json([
+            'status' => 'success',
+            'import' => $import,
+        ], 201);
+    }
+
+    /**
+     * Show details of a pending import.
+     */
+    public function read(int $id): JsonResponse
+    {
+        $import = $this->imports->findVisible($id);
+
+        return response()->json([
+            'status' => 'success',
+            'import' => $import,
+            'data' => $import->decodeMetadata(),
+        ]);
+    }
+
+    /**
+     * Run the import process.
+     */
+    public function create(int $id, Request $request): JsonResponse
+    {
+        $import = $this->imports->findVisible($id);
+        $parent = null;
+
+        if ($import->type === 'page' || $import->type === 'chapter') {
+            $data = $this->validate($request, [
+                'parent' => ['required', 'string'],
+            ]);
+            $parent = $data['parent'];
+        }
+
+        try {
+            $entity = $this->imports->runImport($import, $parent);
+        } catch (ZipImportException $exception) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Import failed',
+                'errors' => $exception->errors,
+            ], 500);
+        }
+
+        return response()->json([
+            'status' => 'success',
+            'entity' => $entity,
+        ]);
+    }
+
+    /**
+     * Delete a pending import.
+     */
+    public function delete(int $id): JsonResponse
+    {
+        $import = $this->imports->findVisible($id);
+        $this->imports->deleteImport($import);
+
+        return response()->json([
+            'status' => 'success',
+            'message' => 'Import deleted successfully',
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 71036485597..bd00ea4b098 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -92,3 +92,9 @@
 Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
 
 Route::get('audit-log', [AuditLogApiController::class, 'list']);
+
+Route::get('import', [ExportControllers\ImportApiController::class, 'list']);
+Route::post('import', [ExportControllers\ImportApiController::class, 'upload']);
+Route::get('import/{id}', [ExportControllers\ImportApiController::class, 'read']);
+Route::post('import/{id}/create', [ExportControllers\ImportApiController::class, 'create']);
+Route::delete('import/{id}', [ExportControllers\ImportApiController::class, 'destroy']);
\ No newline at end of file

From 64da80cbf4611f0e6a1700e6e2fa399389ee50da Mon Sep 17 00:00:00 2001
From: "nchoudhary@logicmines.in" <nchoudhary@logicmines.in>
Date: Fri, 25 Apr 2025 13:00:06 +0530
Subject: [PATCH 514/666] added routes for zip export

---
 routes/api.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routes/api.php b/routes/api.php
index bd00ea4b098..7bc7d7d44c1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -36,6 +36,7 @@
 Route::get('books/{id}/export/pdf', [ExportControllers\BookExportApiController::class, 'exportPdf']);
 Route::get('books/{id}/export/plaintext', [ExportControllers\BookExportApiController::class, 'exportPlainText']);
 Route::get('books/{id}/export/markdown', [ExportControllers\BookExportApiController::class, 'exportMarkdown']);
+Route::get('books/{id}/export/zip', [ExportControllers\BookExportApiController::class, 'exportZip']);
 
 Route::get('chapters', [EntityControllers\ChapterApiController::class, 'list']);
 Route::post('chapters', [EntityControllers\ChapterApiController::class, 'create']);
@@ -46,6 +47,7 @@
 Route::get('chapters/{id}/export/pdf', [ExportControllers\ChapterExportApiController::class, 'exportPdf']);
 Route::get('chapters/{id}/export/plaintext', [ExportControllers\ChapterExportApiController::class, 'exportPlainText']);
 Route::get('chapters/{id}/export/markdown', [ExportControllers\ChapterExportApiController::class, 'exportMarkdown']);
+Route::get('chapters/{id}/export/zip', [ExportControllers\ChapterExportApiController::class, 'exportZip']);
 
 Route::get('pages', [EntityControllers\PageApiController::class, 'list']);
 Route::post('pages', [EntityControllers\PageApiController::class, 'create']);
@@ -57,6 +59,7 @@
 Route::get('pages/{id}/export/pdf', [ExportControllers\PageExportApiController::class, 'exportPdf']);
 Route::get('pages/{id}/export/plaintext', [ExportControllers\PageExportApiController::class, 'exportPlainText']);
 Route::get('pages/{id}/export/markdown', [ExportControllers\PageExportApiController::class, 'exportMarkdown']);
+Route::get('pages/{id}/export/zip', [ExportControllers\PageExportApiController::class, 'exportZip']);
 
 Route::get('image-gallery', [ImageGalleryApiController::class, 'list']);
 Route::post('image-gallery', [ImageGalleryApiController::class, 'create']);

From ecda4e1d6f42108fef9c62ff4a9a73a056caa089 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 26 Apr 2025 21:05:54 +0100
Subject: [PATCH 515/666] Comments: Added reference marker to comments

---
 resources/icons/bookmark.svg               |  1 +
 resources/js/components/page-comment.ts    | 17 +++++++---
 resources/js/components/page-display.js    |  3 ++
 resources/sass/_components.scss            | 38 ++++++++++++++++++++++
 resources/sass/_pages.scss                 |  3 ++
 resources/views/comments/comment.blade.php |  5 +++
 6 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 resources/icons/bookmark.svg

diff --git a/resources/icons/bookmark.svg b/resources/icons/bookmark.svg
new file mode 100644
index 00000000000..30e487c5219
--- /dev/null
+++ b/resources/icons/bookmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 9192c7c56af..24964bf5cba 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -5,6 +5,7 @@ import {el} from "../wysiwyg/utils/dom";
 
 import commentIcon from "@icons/comment.svg"
 import closeIcon from "@icons/close.svg"
+import {PageDisplay} from "./page-display";
 
 /**
  * Track the close function for the current open marker so it can be closed
@@ -35,6 +36,7 @@ export class PageComment extends Component {
     protected deleteButton: HTMLElement;
     protected replyButton: HTMLElement;
     protected input: HTMLInputElement;
+    protected contentRefLink: HTMLLinkElement|null;
 
     setup() {
         // Options
@@ -60,6 +62,7 @@ export class PageComment extends Component {
         this.deleteButton = this.$refs.deleteButton;
         this.replyButton = this.$refs.replyButton;
         this.input = this.$refs.input as HTMLInputElement;
+        this.contentRefLink = (this.$refs.contentRef || null) as HTMLLinkElement|null;
 
         this.setupListeners();
         this.positionForReference();
@@ -153,21 +156,20 @@ export class PageComment extends Component {
     }
 
     protected positionForReference() {
-        if (!this.commentContentRef) {
+        if (!this.commentContentRef || !this.contentRefLink) {
             return;
         }
 
         const [refId, refHash, refRange] = this.commentContentRef.split(':');
         const refEl = document.getElementById(refId);
         if (!refEl) {
-            // TODO - Show outdated marker for comment
+            this.contentRefLink.classList.add('outdated', 'missing');
             return;
         }
 
         const actualHash = hashElement(refEl);
         if (actualHash !== refHash) {
-            // TODO - Show outdated marker for comment
-            return;
+            this.contentRefLink.classList.add('outdated');
         }
 
         const refElBounds = refEl.getBoundingClientRect();
@@ -204,6 +206,13 @@ export class PageComment extends Component {
 
         refEl.style.position = 'relative';
         refEl.append(markerWrap);
+
+        this.contentRefLink.href = `#${refEl.id}`;
+        this.contentRefLink.addEventListener('click', (event: MouseEvent) => {
+            const pageDisplayComponent = window.$components.get('page-display')[0] as PageDisplay;
+            event.preventDefault();
+            pageDisplayComponent.goToText(refId);
+        });
     }
 
     protected showCommentAtMarker(marker: HTMLElement): void {
diff --git a/resources/js/components/page-display.js b/resources/js/components/page-display.js
index d3ac78a4ad1..13670c4bf50 100644
--- a/resources/js/components/page-display.js
+++ b/resources/js/components/page-display.js
@@ -57,6 +57,9 @@ export class PageDisplay extends Component {
         }
     }
 
+    /**
+     * @public
+     */
     goToText(text) {
         const idElem = document.getElementById(text);
 
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 26b0518275b..5486d611288 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -746,6 +746,44 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   height: calc(100% - vars.$m);
 }
 
+.comment-reference-indicator-wrap a {
+  float: left;
+  margin-top: vars.$xs;
+  font-size: 12px;
+  display: inline-block;
+  font-weight: bold;
+  position: relative;
+  border-radius: 4px;
+  overflow: hidden;
+  padding: 2px 6px 2px 0;
+  margin-inline-end: vars.$xs;
+  color: var(--color-link);
+  span {
+    display: none;
+  }
+  &.outdated span {
+    display: inline;
+  }
+  &.outdated.missing {
+    color: var(--color-warning);
+    pointer-events: none;
+  }
+  svg {
+    width: 24px;
+    margin-inline-end: 0;
+  }
+  &:after {
+    background-color: currentColor;
+    content: '';
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    opacity: 0.15;
+  }
+}
+
 .comment-branch .comment-box {
   margin-bottom: vars.$m;
 }
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index be5a0f7c360..dbdcc06656d 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -280,6 +280,9 @@ body.tox-fullscreen, body.markdown-fullscreen {
   max-height: 200px;
   overflow-y: scroll;
 }
+.content-comment-window-content .comment-reference-indicator-wrap {
+  display: none;
+}
 .content-comment-marker {
   position: absolute;
   right: -16px;
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 5b79da4ac68..7cc84a54cf1 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -77,6 +77,11 @@ class="comment-box">
                 <a class="text-muted text-small" href="#comment{{ $comment->parent_id }}">@icon('reply'){{ trans('entities.comment_in_reply_to', ['commentId' => '#' . $comment->parent_id]) }}</a>
             </p>
         @endif
+        @if($comment->content_ref)
+            <div class="comment-reference-indicator-wrap">
+                <a href="#" refs="page-comment@content-ref">@icon('bookmark')Reference <span>- Outdated</span></a>
+            </div>
+        @endif
         {!! $commentHtml  !!}
     </div>
 

From e8f44186a8ebfac6789800211cb5a947991bf971 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Apr 2025 16:51:24 +0100
Subject: [PATCH 516/666] Comments: Split out page comment reference logic to
 own component

Started support for editor view.
Moved comment elements to be added relative to content area instad of
specific target reference element.
Added relocating on screen size change.
---
 resources/js/components/editor-toolbox.js     |  13 +
 resources/js/components/index.ts              |   1 +
 .../js/components/page-comment-reference.ts   | 223 ++++++++++++++++++
 resources/js/components/page-comment.ts       | 149 +-----------
 resources/js/components/page-display.js       |   3 -
 resources/js/services/events.ts               |  11 +
 resources/sass/_content.scss                  |   1 +
 resources/views/comments/comment.blade.php    |  11 +-
 8 files changed, 256 insertions(+), 156 deletions(-)
 create mode 100644 resources/js/components/page-comment-reference.ts

diff --git a/resources/js/components/editor-toolbox.js b/resources/js/components/editor-toolbox.js
index ddb4ff39c76..95339328542 100644
--- a/resources/js/components/editor-toolbox.js
+++ b/resources/js/components/editor-toolbox.js
@@ -10,6 +10,10 @@ export class EditorToolbox extends Component {
         this.toggleButton = this.$refs.toggle;
         this.editorWrapEl = this.container.closest('.page-editor');
 
+        // State
+        this.open = false;
+        this.tab = '';
+
         this.setupListeners();
 
         // Set the first tab as active on load
@@ -34,6 +38,8 @@ export class EditorToolbox extends Component {
         const isOpen = this.container.classList.contains('open');
         this.toggleButton.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
         this.editorWrapEl.classList.toggle('toolbox-open', isOpen);
+        this.open = isOpen;
+        this.emitState();
     }
 
     setActiveTab(tabName, openToolbox = false) {
@@ -54,6 +60,13 @@ export class EditorToolbox extends Component {
         if (openToolbox && !this.container.classList.contains('open')) {
             this.toggle();
         }
+
+        this.tab = tabName;
+        this.emitState();
+    }
+
+    emitState() {
+        this.$emit('change', {tab: this.tab, open: this.open});
     }
 
 }
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index 10b8025db63..63e1ad0dbf7 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -36,6 +36,7 @@ export {NewUserPassword} from './new-user-password';
 export {Notification} from './notification';
 export {OptionalInput} from './optional-input';
 export {PageComment} from './page-comment';
+export {PageCommentReference} from './page-comment-reference';
 export {PageComments} from './page-comments';
 export {PageDisplay} from './page-display';
 export {PageEditor} from './page-editor';
diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.ts
new file mode 100644
index 00000000000..72e3dbe480d
--- /dev/null
+++ b/resources/js/components/page-comment-reference.ts
@@ -0,0 +1,223 @@
+import {Component} from "./component";
+import {findTargetNodeAndOffset, hashElement} from "../services/dom";
+import {el} from "../wysiwyg/utils/dom";
+import commentIcon from "@icons/comment.svg";
+import closeIcon from "@icons/close.svg";
+import {scrollAndHighlightElement} from "../services/util";
+
+/**
+ * Track the close function for the current open marker so it can be closed
+ * when another is opened so we only show one marker comment thread at one time.
+ */
+let openMarkerClose: Function|null = null;
+
+export class PageCommentReference extends Component {
+    protected link: HTMLLinkElement;
+    protected reference: string;
+    protected markerWrap: HTMLElement|null = null;
+
+    protected viewCommentText: string;
+    protected jumpToThreadText: string;
+    protected closeText: string;
+
+    setup() {
+        this.link = this.$el as HTMLLinkElement;
+        this.reference = this.$opts.reference;
+        this.viewCommentText = this.$opts.viewCommentText;
+        this.jumpToThreadText = this.$opts.jumpToThreadText;
+        this.closeText = this.$opts.closeText;
+
+        // Show within page display area if seen
+        const pageContentArea = document.querySelector('.page-content');
+        if (pageContentArea instanceof HTMLElement) {
+            this.updateMarker(pageContentArea);
+        }
+
+        // Handle editor view to show on comments toolbox view
+        window.addEventListener('editor-toolbox-change', (event) => {
+             const tabName: string = (event as {detail: {tab: string, open: boolean}}).detail.tab;
+             const isOpen = (event as {detail: {tab: string, open: boolean}}).detail.open;
+             if (tabName === 'comments' && isOpen) {
+                 this.showForEditor();
+             } else {
+                 this.hideMarker();
+             }
+        });
+    }
+
+    protected showForEditor() {
+        const contentWrap = document.querySelector('.editor-content-wrap');
+        if (contentWrap instanceof HTMLElement) {
+            this.updateMarker(contentWrap);
+        }
+
+        const onChange = () => {
+            this.hideMarker();
+            setTimeout(() => {
+                window.$events.remove('editor-html-change', onChange);
+            }, 1);
+        };
+
+        window.$events.listen('editor-html-change', onChange);
+    }
+
+    protected updateMarker(contentContainer: HTMLElement) {
+        // Reset link and existing marker
+        this.link.classList.remove('outdated', 'missing');
+        if (this.markerWrap) {
+            this.markerWrap.remove();
+        }
+
+        const [refId, refHash, refRange] = this.reference.split(':');
+        const refEl = document.getElementById(refId);
+        if (!refEl) {
+            this.link.classList.add('outdated', 'missing');
+            return;
+        }
+
+        const refCloneToAssess = refEl.cloneNode(true) as HTMLElement;
+        const toRemove = refCloneToAssess.querySelectorAll('[data-lexical-text]');
+        refCloneToAssess.removeAttribute('style');
+        for (const el of toRemove) {
+            el.after(...el.childNodes);
+            el.remove();
+        }
+
+        const actualHash = hashElement(refCloneToAssess);
+        if (actualHash !== refHash) {
+            this.link.classList.add('outdated');
+        }
+
+        const marker = el('button', {
+            type: 'button',
+            class: 'content-comment-marker',
+            title: this.viewCommentText,
+        });
+        marker.innerHTML = <string>commentIcon;
+        marker.addEventListener('click', event => {
+            this.showCommentAtMarker(marker);
+        });
+
+        this.markerWrap = el('div', {
+            class: 'content-comment-highlight',
+        }, [marker]);
+
+        contentContainer.append(this.markerWrap);
+        this.positionMarker(refEl, refRange);
+
+        this.link.href = `#${refEl.id}`;
+        this.link.addEventListener('click', (event: MouseEvent) => {
+            event.preventDefault();
+            scrollAndHighlightElement(refEl);
+        });
+
+        window.addEventListener('resize', () => {
+            this.positionMarker(refEl, refRange);
+        });
+    }
+
+    protected positionMarker(targetEl: HTMLElement, range: string) {
+        if (!this.markerWrap) {
+            return;
+        }
+
+        const markerParent = this.markerWrap.parentElement as HTMLElement;
+        const parentBounds = markerParent.getBoundingClientRect();
+        let targetBounds = targetEl.getBoundingClientRect();
+        const [rangeStart, rangeEnd] = range.split('-');
+        if (rangeStart && rangeEnd) {
+            const range = new Range();
+            const relStart = findTargetNodeAndOffset(targetEl, Number(rangeStart));
+            const relEnd = findTargetNodeAndOffset(targetEl, Number(rangeEnd));
+            if (relStart && relEnd) {
+                range.setStart(relStart.node, relStart.offset);
+                range.setEnd(relEnd.node, relEnd.offset);
+                targetBounds = range.getBoundingClientRect();
+            }
+        }
+
+        const relLeft = targetBounds.left - parentBounds.left;
+        const relTop = (targetBounds.top - parentBounds.top) + markerParent.scrollTop;
+
+        this.markerWrap.style.left = `${relLeft}px`;
+        this.markerWrap.style.top = `${relTop}px`;
+        this.markerWrap.style.width = `${targetBounds.width}px`;
+        this.markerWrap.style.height = `${targetBounds.height}px`;
+    }
+
+    protected hideMarker() {
+        // Hide marker and close existing marker windows
+        if (openMarkerClose) {
+            openMarkerClose();
+        }
+        this.markerWrap?.remove();
+    }
+
+    protected showCommentAtMarker(marker: HTMLElement): void {
+        // Hide marker and close existing marker windows
+        if (openMarkerClose) {
+            openMarkerClose();
+        }
+        marker.hidden = true;
+
+        // Locate relevant comment
+        const commentBox = this.link.closest('.comment-box') as HTMLElement;
+
+        // Build comment window
+        const readClone = (commentBox.closest('.comment-branch') as HTMLElement).cloneNode(true) as HTMLElement;
+        const toRemove = readClone.querySelectorAll('.actions, form');
+        for (const el of toRemove) {
+            el.remove();
+        }
+
+        const close = el('button', {type: 'button', title: this.closeText});
+        close.innerHTML = (closeIcon as string);
+        const jump = el('button', {type: 'button', 'data-action': 'jump'}, [this.jumpToThreadText]);
+
+        const commentWindow = el('div', {
+            class: 'content-comment-window'
+        }, [
+            el('div', {
+                class: 'content-comment-window-actions',
+            }, [jump, close]),
+            el('div', {
+                class: 'content-comment-window-content comment-container-compact comment-container-super-compact',
+            }, [readClone]),
+        ]);
+
+        marker.parentElement?.append(commentWindow);
+
+        // Handle interaction within window
+        const closeAction = () => {
+            commentWindow.remove();
+            marker.hidden = false;
+            window.removeEventListener('click', windowCloseAction);
+            openMarkerClose = null;
+        };
+
+        const windowCloseAction = (event: MouseEvent) => {
+            if (!(marker.parentElement as HTMLElement).contains(event.target as HTMLElement)) {
+                closeAction();
+            }
+        };
+        window.addEventListener('click', windowCloseAction);
+
+        openMarkerClose = closeAction;
+        close.addEventListener('click', closeAction.bind(this));
+        jump.addEventListener('click', () => {
+            closeAction();
+            commentBox.scrollIntoView({behavior: 'smooth'});
+            const highlightTarget = commentBox.querySelector('.header') as HTMLElement;
+            highlightTarget.classList.add('anim-highlight');
+            highlightTarget.addEventListener('animationend', () => highlightTarget.classList.remove('anim-highlight'))
+        });
+
+        // Position window within bounds
+        const commentWindowBounds = commentWindow.getBoundingClientRect();
+        const contentBounds = document.querySelector('.page-content')?.getBoundingClientRect();
+        if (contentBounds && commentWindowBounds.right > contentBounds.right) {
+            const diff = commentWindowBounds.right - contentBounds.right;
+            commentWindow.style.left = `-${diff}px`;
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 24964bf5cba..11ad769b1d0 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -1,28 +1,13 @@
 import {Component} from './component';
-import {findTargetNodeAndOffset, getLoading, hashElement, htmlToDom} from '../services/dom.ts';
+import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
-import {el} from "../wysiwyg/utils/dom";
-
-import commentIcon from "@icons/comment.svg"
-import closeIcon from "@icons/close.svg"
-import {PageDisplay} from "./page-display";
-
-/**
- * Track the close function for the current open marker so it can be closed
- * when another is opened so we only show one marker comment thread at one time.
- */
-let openMarkerClose: Function|null = null;
 
 export class PageComment extends Component {
 
     protected commentId: string;
     protected commentLocalId: string;
-    protected commentContentRef: string;
     protected deletedText: string;
     protected updatedText: string;
-    protected viewCommentText: string;
-    protected jumpToThreadText: string;
-    protected closeText: string;
 
     protected wysiwygEditor: any = null;
     protected wysiwygLanguage: string;
@@ -36,18 +21,13 @@ export class PageComment extends Component {
     protected deleteButton: HTMLElement;
     protected replyButton: HTMLElement;
     protected input: HTMLInputElement;
-    protected contentRefLink: HTMLLinkElement|null;
 
     setup() {
         // Options
         this.commentId = this.$opts.commentId;
         this.commentLocalId = this.$opts.commentLocalId;
-        this.commentContentRef = this.$opts.commentContentRef;
         this.deletedText = this.$opts.deletedText;
         this.updatedText = this.$opts.updatedText;
-        this.viewCommentText = this.$opts.viewCommentText;
-        this.jumpToThreadText = this.$opts.jumpToThreadText;
-        this.closeText = this.$opts.closeText;
 
         // Editor reference and text options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
@@ -62,10 +42,8 @@ export class PageComment extends Component {
         this.deleteButton = this.$refs.deleteButton;
         this.replyButton = this.$refs.replyButton;
         this.input = this.$refs.input as HTMLInputElement;
-        this.contentRefLink = (this.$refs.contentRef || null) as HTMLLinkElement|null;
 
         this.setupListeners();
-        this.positionForReference();
     }
 
     protected setupListeners(): void {
@@ -154,129 +132,4 @@ export class PageComment extends Component {
         this.container.append(loading);
         return loading;
     }
-
-    protected positionForReference() {
-        if (!this.commentContentRef || !this.contentRefLink) {
-            return;
-        }
-
-        const [refId, refHash, refRange] = this.commentContentRef.split(':');
-        const refEl = document.getElementById(refId);
-        if (!refEl) {
-            this.contentRefLink.classList.add('outdated', 'missing');
-            return;
-        }
-
-        const actualHash = hashElement(refEl);
-        if (actualHash !== refHash) {
-            this.contentRefLink.classList.add('outdated');
-        }
-
-        const refElBounds = refEl.getBoundingClientRect();
-        let bounds = refElBounds;
-        const [rangeStart, rangeEnd] = refRange.split('-');
-        if (rangeStart && rangeEnd) {
-            const range = new Range();
-            const relStart = findTargetNodeAndOffset(refEl, Number(rangeStart));
-            const relEnd = findTargetNodeAndOffset(refEl, Number(rangeEnd));
-            if (relStart && relEnd) {
-                range.setStart(relStart.node, relStart.offset);
-                range.setEnd(relEnd.node, relEnd.offset);
-                bounds = range.getBoundingClientRect();
-            }
-        }
-
-        const relLeft = bounds.left - refElBounds.left;
-        const relTop = bounds.top - refElBounds.top;
-
-        const marker = el('button', {
-            type: 'button',
-            class: 'content-comment-marker',
-            title: this.viewCommentText,
-        });
-        marker.innerHTML = <string>commentIcon;
-        marker.addEventListener('click', event => {
-            this.showCommentAtMarker(marker);
-        });
-
-        const markerWrap = el('div', {
-            class: 'content-comment-highlight',
-            style: `left: ${relLeft}px; top: ${relTop}px; width: ${bounds.width}px; height: ${bounds.height}px;`
-        }, [marker]);
-
-        refEl.style.position = 'relative';
-        refEl.append(markerWrap);
-
-        this.contentRefLink.href = `#${refEl.id}`;
-        this.contentRefLink.addEventListener('click', (event: MouseEvent) => {
-            const pageDisplayComponent = window.$components.get('page-display')[0] as PageDisplay;
-            event.preventDefault();
-            pageDisplayComponent.goToText(refId);
-        });
-    }
-
-    protected showCommentAtMarker(marker: HTMLElement): void {
-        // Hide marker and close existing marker windows
-        if (openMarkerClose) {
-            openMarkerClose();
-        }
-        marker.hidden = true;
-
-        // Build comment window
-        const readClone = (this.container.closest('.comment-branch') as HTMLElement).cloneNode(true) as HTMLElement;
-        const toRemove = readClone.querySelectorAll('.actions, form');
-        for (const el of toRemove) {
-            el.remove();
-        }
-
-        const close = el('button', {type: 'button', title: this.closeText});
-        close.innerHTML = (closeIcon as string);
-        const jump = el('button', {type: 'button', 'data-action': 'jump'}, [this.jumpToThreadText]);
-
-        const commentWindow = el('div', {
-            class: 'content-comment-window'
-        }, [
-            el('div', {
-                class: 'content-comment-window-actions',
-            }, [jump, close]),
-            el('div', {
-                class: 'content-comment-window-content comment-container-compact comment-container-super-compact',
-            }, [readClone]),
-        ]);
-
-        marker.parentElement?.append(commentWindow);
-
-        // Handle interaction within window
-        const closeAction = () => {
-            commentWindow.remove();
-            marker.hidden = false;
-            window.removeEventListener('click', windowCloseAction);
-            openMarkerClose = null;
-        };
-
-        const windowCloseAction = (event: MouseEvent) => {
-            if (!(marker.parentElement as HTMLElement).contains(event.target as HTMLElement)) {
-                closeAction();
-            }
-        };
-        window.addEventListener('click', windowCloseAction);
-
-        openMarkerClose = closeAction;
-        close.addEventListener('click', closeAction.bind(this));
-        jump.addEventListener('click', () => {
-            closeAction();
-            this.container.scrollIntoView({behavior: 'smooth'});
-            const highlightTarget = this.container.querySelector('.header') as HTMLElement;
-            highlightTarget.classList.add('anim-highlight');
-            highlightTarget.addEventListener('animationend', () => highlightTarget.classList.remove('anim-highlight'))
-        });
-
-        // Position window within bounds
-        const commentWindowBounds = commentWindow.getBoundingClientRect();
-        const contentBounds = document.querySelector('.page-content')?.getBoundingClientRect();
-        if (contentBounds && commentWindowBounds.right > contentBounds.right) {
-            const diff = commentWindowBounds.right - contentBounds.right;
-            commentWindow.style.left = `-${diff}px`;
-        }
-    }
 }
diff --git a/resources/js/components/page-display.js b/resources/js/components/page-display.js
index 13670c4bf50..d3ac78a4ad1 100644
--- a/resources/js/components/page-display.js
+++ b/resources/js/components/page-display.js
@@ -57,9 +57,6 @@ export class PageDisplay extends Component {
         }
     }
 
-    /**
-     * @public
-     */
     goToText(text) {
         const idElem = document.getElementById(text);
 
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index be9fba7eca5..7dae6dc29d9 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -24,6 +24,17 @@ export class EventManager {
         this.listeners[eventName].push(callback);
     }
 
+    /**
+     * Remove an event listener which is using the given callback for the given event name.
+     */
+    remove(eventName: string, callback: Function): void {
+        const listeners = this.listeners[eventName] || [];
+        const index = listeners.indexOf(callback);
+        if (index !== -1) {
+            listeners.splice(index, 1);
+        }
+    }
+
     /**
      * Emit an event for public use.
      * Sends the event via the native DOM event handling system.
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index b0176d64ef1..aba1556a983 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -11,6 +11,7 @@
   max-width: 840px;
   margin: 0 auto;
   overflow-wrap: break-word;
+  position: relative;
   .align-left {
     text-align: left;
   }
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 7cc84a54cf1..5310b2fe4c5 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -4,12 +4,8 @@
 <div component="{{ $readOnly ? '' : 'page-comment' }}"
      option:page-comment:comment-id="{{ $comment->id }}"
      option:page-comment:comment-local-id="{{ $comment->local_id }}"
-     option:page-comment:comment-content-ref="{{ $comment->content_ref }}"
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
-     option:page-comment:view-comment-text="{{ trans('entities.comment_view') }}"
-     option:page-comment:jump-to-thread-text="{{ trans('entities.comment_jump_to_thread') }}"
-     option:page-comment:close-text="{{ trans('common.close') }}"
      option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
      option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"
@@ -79,7 +75,12 @@ class="comment-box">
         @endif
         @if($comment->content_ref)
             <div class="comment-reference-indicator-wrap">
-                <a href="#" refs="page-comment@content-ref">@icon('bookmark')Reference <span>- Outdated</span></a>
+                <a component="page-comment-reference"
+                   option:page-comment-reference:reference="{{ $comment->content_ref }}"
+                   option:page-comment-reference:view-comment-text="{{ trans('entities.comment_view') }}"
+                   option:page-comment-reference:jump-to-thread-text="{{ trans('entities.comment_jump_to_thread') }}"
+                   option:page-comment-reference:close-text="{{ trans('common.close') }}"
+                   href="#">@icon('bookmark')Reference <span>- Outdated</span></a>
             </div>
         @endif
         {!! $commentHtml  !!}

From 8bdf948743016f0461e589759130cbb50e46ab20 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 28 Apr 2025 15:37:09 +0100
Subject: [PATCH 517/666] Comments: Added archive endpoints, messages, Js
 actions and tests

---
 app/Activity/CommentRepo.php                  | 27 +++++++++
 .../Controllers/CommentController.php         | 36 +++++++++++
 lang/en/common.php                            |  2 +
 lang/en/entities.php                          |  2 +
 resources/icons/archive.svg                   |  1 +
 resources/js/components/page-comment.ts       | 19 +++++-
 resources/views/comments/comment.blade.php    |  7 +++
 routes/web.php                                |  2 +
 tests/Entity/CommentTest.php                  | 60 +++++++++++++++++++
 9 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 resources/icons/archive.svg

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index c488350ca24..866368ee649 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -53,6 +53,33 @@ public function update(Comment $comment, string $html): Comment
         return $comment;
     }
 
+
+    /**
+     * Archive an existing comment.
+     */
+    public function archive(Comment $comment): Comment
+    {
+        $comment->archived = true;
+        $comment->save();
+
+        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+
+        return $comment;
+    }
+
+    /**
+     * Un-archive an existing comment.
+     */
+    public function unarchive(Comment $comment): Comment
+    {
+        $comment->archived = false;
+        $comment->save();
+
+        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+
+        return $comment;
+    }
+
     /**
      * Delete a comment from the system.
      */
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 26208006784..7a290ebabc5 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -75,6 +75,42 @@ public function update(Request $request, int $commentId)
         ]);
     }
 
+    /**
+     * Mark a comment as archived.
+     */
+    public function archive(int $id)
+    {
+        $comment = $this->commentRepo->getById($id);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+            $this->showPermissionError();
+        }
+
+        $this->commentRepo->archive($comment);
+
+        return view('comments.comment', [
+            'comment' => $comment,
+            'readOnly' => false,
+        ]);
+    }
+
+    /**
+     * Unmark a comment as archived.
+     */
+    public function unarchive(int $id)
+    {
+        $comment = $this->commentRepo->getById($id);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+            $this->showPermissionError();
+        }
+
+        $this->commentRepo->unarchive($comment);
+
+        return view('comments.comment', [
+            'comment' => $comment,
+            'readOnly' => false,
+        ]);
+    }
+
     /**
      * Delete a comment from the system.
      */
diff --git a/lang/en/common.php b/lang/en/common.php
index b05169bb2c4..06a9e855ce3 100644
--- a/lang/en/common.php
+++ b/lang/en/common.php
@@ -30,6 +30,8 @@
     'create' => 'Create',
     'update' => 'Update',
     'edit' => 'Edit',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sort',
     'move' => 'Move',
     'copy' => 'Copy',
diff --git a/lang/en/entities.php b/lang/en/entities.php
index f9fab8ebfd3..141e75b5f35 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -402,6 +402,8 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
     'comment_view' => 'View comment',
     'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
diff --git a/resources/icons/archive.svg b/resources/icons/archive.svg
new file mode 100644
index 00000000000..90a4f35b7e9
--- /dev/null
+++ b/resources/icons/archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m480-240 160-160-56-56-64 64v-168h-80v168l-64-64-56 56 160 160ZM200-640v440h560v-440H200Zm0 520q-33 0-56.5-23.5T120-200v-499q0-14 4.5-27t13.5-24l50-61q11-14 27.5-21.5T250-840h460q18 0 34.5 7.5T772-811l50 61q9 11 13.5 24t4.5 27v499q0 33-23.5 56.5T760-120H200Zm16-600h528l-34-40H250l-34 40Zm264 300Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 11ad769b1d0..d2cbd21d1db 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -8,6 +8,7 @@ export class PageComment extends Component {
     protected commentLocalId: string;
     protected deletedText: string;
     protected updatedText: string;
+    protected archiveText: string;
 
     protected wysiwygEditor: any = null;
     protected wysiwygLanguage: string;
@@ -20,6 +21,7 @@ export class PageComment extends Component {
     protected editButton: HTMLElement;
     protected deleteButton: HTMLElement;
     protected replyButton: HTMLElement;
+    protected archiveButton: HTMLElement;
     protected input: HTMLInputElement;
 
     setup() {
@@ -27,7 +29,8 @@ export class PageComment extends Component {
         this.commentId = this.$opts.commentId;
         this.commentLocalId = this.$opts.commentLocalId;
         this.deletedText = this.$opts.deletedText;
-        this.updatedText = this.$opts.updatedText;
+        this.deletedText = this.$opts.deletedText;
+        this.archiveText = this.$opts.archiveText;
 
         // Editor reference and text options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
@@ -41,6 +44,7 @@ export class PageComment extends Component {
         this.editButton = this.$refs.editButton;
         this.deleteButton = this.$refs.deleteButton;
         this.replyButton = this.$refs.replyButton;
+        this.archiveButton = this.$refs.archiveButton;
         this.input = this.$refs.input as HTMLInputElement;
 
         this.setupListeners();
@@ -63,6 +67,10 @@ export class PageComment extends Component {
         if (this.deleteButton) {
             this.deleteButton.addEventListener('click', this.delete.bind(this));
         }
+
+        if (this.archiveButton) {
+            this.archiveButton.addEventListener('click', this.archive.bind(this));
+        }
     }
 
     protected toggleEditMode(show: boolean) : void {
@@ -126,6 +134,15 @@ export class PageComment extends Component {
         window.$events.success(this.deletedText);
     }
 
+    protected async archive(): Promise<void> {
+        this.showLoading();
+        const isArchived = this.archiveButton.dataset.isArchived === 'true';
+
+        await window.$http.put(`/comment/${this.commentId}/${isArchived ? 'unarchive' : 'archive'}`);
+        this.$emit('archive');
+        window.$events.success(this.archiveText);
+    }
+
     protected showLoading(): HTMLElement {
         const loading = getLoading();
         loading.classList.add('px-l');
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 5310b2fe4c5..58e057140a0 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -6,6 +6,7 @@
      option:page-comment:comment-local-id="{{ $comment->local_id }}"
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
+     option:page-comment:archive-text="{{ $comment->archived ? trans('entities.comment_unarchive_success') : trans('entities.comment_archive_success') }}"
      option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
      option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"
@@ -37,6 +38,12 @@ class="comment-box">
                     @if(userCan('comment-create-all'))
                         <button refs="page-comment@reply-button" type="button" class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>
                     @endif
+                    @if(userCan('comment-update', $comment) || userCan('comment-delete', $comment))
+                        <button refs="page-comment@archive-button"
+                                type="button"
+                                data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"
+                                class="text-button text-muted hover-underline text-small p-xs">@icon('archive') {{ trans('common.' . ($comment->archived ? 'unarchive' : 'archive')) }}</button>
+                    @endif
                     @if(userCan('comment-update', $comment))
                         <button refs="page-comment@edit-button" type="button" class="text-button text-muted hover-underline text-small p-xs">@icon('edit') {{ trans('common.edit') }}</button>
                     @endif
diff --git a/routes/web.php b/routes/web.php
index 8184725834c..ea3efe1ac77 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -179,6 +179,8 @@
 
     // Comments
     Route::post('/comment/{pageId}', [ActivityControllers\CommentController::class, 'savePageComment']);
+    Route::put('/comment/{id}/archive', [ActivityControllers\CommentController::class, 'archive']);
+    Route::put('/comment/{id}/unarchive', [ActivityControllers\CommentController::class, 'unarchive']);
     Route::put('/comment/{id}', [ActivityControllers\CommentController::class, 'update']);
     Route::delete('/comment/{id}', [ActivityControllers\CommentController::class, 'destroy']);
 
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 973b2b81d8d..baf0d392beb 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -106,6 +106,66 @@ public function test_comment_delete()
         $this->assertActivityExists(ActivityType::COMMENT_DELETE);
     }
 
+    public function test_comment_archive_and_unarchive()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+
+        $comment = Comment::factory()->make();
+        $page->comments()->save($comment);
+        $comment->refresh();
+
+        $this->put("/comment/$comment->id/archive");
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'archived' => true,
+        ]);
+
+        $this->assertActivityExists(ActivityType::COMMENT_UPDATE);
+
+        $this->put("/comment/$comment->id/unarchive");
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'archived' => false,
+        ]);
+
+        $this->assertActivityExists(ActivityType::COMMENT_UPDATE);
+    }
+
+    public function test_archive_endpoints_require_delete_or_edit_permissions()
+    {
+        $viewer = $this->users->viewer();
+        $page = $this->entities->page();
+
+        $comment = Comment::factory()->make();
+        $page->comments()->save($comment);
+        $comment->refresh();
+
+        $endpoints = ["/comment/$comment->id/archive", "/comment/$comment->id/unarchive"];
+
+        foreach ($endpoints as $endpoint) {
+            $resp = $this->actingAs($viewer)->put($endpoint);
+            $this->assertPermissionError($resp);
+        }
+
+        $this->permissions->grantUserRolePermissions($viewer, ['comment-delete-all']);
+
+        foreach ($endpoints as $endpoint) {
+            $resp = $this->actingAs($viewer)->put($endpoint);
+            $resp->assertOk();
+        }
+
+        $this->permissions->removeUserRolePermissions($viewer, ['comment-delete-all']);
+        $this->permissions->grantUserRolePermissions($viewer, ['comment-update-all']);
+
+        foreach ($endpoints as $endpoint) {
+            $resp = $this->actingAs($viewer)->put($endpoint);
+            $resp->assertOk();
+        }
+    }
+
     public function test_scripts_cannot_be_injected_via_comment_html()
     {
         $page = $this->entities->page();

From 099f6104d07faffdcb2bd9793b249055eb4795b2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 28 Apr 2025 20:09:18 +0100
Subject: [PATCH 518/666] Comments: Started archive display, created mode for
 tree node

---
 app/Activity/CommentRepo.php                  | 10 ++++++
 .../Controllers/CommentController.php         | 19 +++++-----
 app/Activity/Tools/CommentTree.php            | 35 +++++++++++++------
 app/Activity/Tools/CommentTreeNode.php        | 23 ++++++++++++
 lang/en/entities.php                          |  1 +
 resources/js/components/page-comment.ts       |  6 ++--
 resources/js/components/page-comments.ts      | 16 +++++++++
 .../views/comments/comment-branch.blade.php   |  7 ++--
 resources/views/comments/comment.blade.php    |  2 +-
 resources/views/comments/comments.blade.php   | 19 +++++++---
 10 files changed, 110 insertions(+), 28 deletions(-)
 create mode 100644 app/Activity/Tools/CommentTreeNode.php

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index 866368ee649..bf162f68ae6 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -4,6 +4,8 @@
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Entity;
+use BookStack\Exceptions\NotifyException;
+use BookStack\Exceptions\PrettyException;
 use BookStack\Facades\Activity as ActivityService;
 use BookStack\Util\HtmlDescriptionFilter;
 
@@ -59,6 +61,10 @@ public function update(Comment $comment, string $html): Comment
      */
     public function archive(Comment $comment): Comment
     {
+        if ($comment->parent_id) {
+            throw new NotifyException('Only top-level comments can be archived.');
+        }
+
         $comment->archived = true;
         $comment->save();
 
@@ -72,6 +78,10 @@ public function archive(Comment $comment): Comment
      */
     public function unarchive(Comment $comment): Comment
     {
+        if ($comment->parent_id) {
+            throw new NotifyException('Only top-level comments can be un-archived.');
+        }
+
         $comment->archived = false;
         $comment->save();
 
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 7a290ebabc5..7f16c17ffce 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -3,6 +3,8 @@
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\CommentRepo;
+use BookStack\Activity\Tools\CommentTree;
+use BookStack\Activity\Tools\CommentTreeNode;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
@@ -45,10 +47,7 @@ public function savePageComment(Request $request, int $pageId)
 
         return view('comments.comment-branch', [
             'readOnly' => false,
-            'branch' => [
-                'comment' => $comment,
-                'children' => [],
-            ]
+            'branch' => new CommentTreeNode($comment, 0, []),
         ]);
     }
 
@@ -81,15 +80,17 @@ public function update(Request $request, int $commentId)
     public function archive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
+        $this->checkOwnablePermission('page-view', $comment->entity);
         if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
             $this->showPermissionError();
         }
 
         $this->commentRepo->archive($comment);
 
-        return view('comments.comment', [
-            'comment' => $comment,
+        $tree = new CommentTree($comment->entity);
+        return view('comments.comment-branch', [
             'readOnly' => false,
+            'branch' => $tree->getCommentNodeForId($id),
         ]);
     }
 
@@ -99,15 +100,17 @@ public function archive(int $id)
     public function unarchive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
+        $this->checkOwnablePermission('page-view', $comment->entity);
         if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
             $this->showPermissionError();
         }
 
         $this->commentRepo->unarchive($comment);
 
-        return view('comments.comment', [
-            'comment' => $comment,
+        $tree = new CommentTree($comment->entity);
+        return view('comments.comment-branch', [
             'readOnly' => false,
+            'branch' => $tree->getCommentNodeForId($id),
         ]);
     }
 
diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index 16f6804ea42..13afc92521d 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -9,7 +9,7 @@ class CommentTree
 {
     /**
      * The built nested tree structure array.
-     * @var array{comment: Comment, depth: int, children: array}[]
+     * @var CommentTreeNode[]
      */
     protected array $tree;
     protected array $comments;
@@ -36,9 +36,25 @@ public function count(): int
         return count($this->comments);
     }
 
-    public function get(): array
+    public function getActive(): array
     {
-        return $this->tree;
+        return array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived);
+    }
+
+    public function getArchived(): array
+    {
+        return array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived);
+    }
+
+    public function getCommentNodeForId(int $commentId): ?CommentTreeNode
+    {
+        foreach ($this->tree as $node) {
+            if ($node->comment->id === $commentId) {
+                return $node;
+            }
+        }
+
+        return null;
     }
 
     public function canUpdateAny(): bool
@@ -54,6 +70,7 @@ public function canUpdateAny(): bool
 
     /**
      * @param Comment[] $comments
+     * @return CommentTreeNode[]
      */
     protected function createTree(array $comments): array
     {
@@ -77,26 +94,22 @@ protected function createTree(array $comments): array
 
         $tree = [];
         foreach ($childMap[0] ?? [] as $childId) {
-            $tree[] = $this->createTreeForId($childId, 0, $byId, $childMap);
+            $tree[] = $this->createTreeNodeForId($childId, 0, $byId, $childMap);
         }
 
         return $tree;
     }
 
-    protected function createTreeForId(int $id, int $depth, array &$byId, array &$childMap): array
+    protected function createTreeNodeForId(int $id, int $depth, array &$byId, array &$childMap): CommentTreeNode
     {
         $childIds = $childMap[$id] ?? [];
         $children = [];
 
         foreach ($childIds as $childId) {
-            $children[] = $this->createTreeForId($childId, $depth + 1, $byId, $childMap);
+            $children[] = $this->createTreeNodeForId($childId, $depth + 1, $byId, $childMap);
         }
 
-        return [
-            'comment' => $byId[$id],
-            'depth' => $depth,
-            'children' => $children,
-        ];
+        return new CommentTreeNode($byId[$id], $depth, $children);
     }
 
     protected function loadComments(): array
diff --git a/app/Activity/Tools/CommentTreeNode.php b/app/Activity/Tools/CommentTreeNode.php
new file mode 100644
index 00000000000..7b280bd2d95
--- /dev/null
+++ b/app/Activity/Tools/CommentTreeNode.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\Activity\Tools;
+
+use BookStack\Activity\Models\Comment;
+
+class CommentTreeNode
+{
+    public Comment $comment;
+    public int $depth;
+
+    /**
+     * @var CommentTreeNode[]
+     */
+    public array $children;
+
+    public function __construct(Comment $comment, int $depth, array $children)
+    {
+        $this->comment = $comment;
+        $this->depth = $depth;
+        $this->children = $children;
+    }
+}
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 141e75b5f35..cda58e65bdf 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -392,6 +392,7 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_archived' => ':count Archived Comment|:count Archived Comments',
     'comment_placeholder' => 'Leave a comment here',
     'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
     'comment_save' => 'Save Comment',
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index d2cbd21d1db..82cb95f13de 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -137,10 +137,12 @@ export class PageComment extends Component {
     protected async archive(): Promise<void> {
         this.showLoading();
         const isArchived = this.archiveButton.dataset.isArchived === 'true';
+        const action = isArchived ? 'unarchive' : 'archive';
 
-        await window.$http.put(`/comment/${this.commentId}/${isArchived ? 'unarchive' : 'archive'}`);
-        this.$emit('archive');
+        const response = await window.$http.put(`/comment/${this.commentId}/${action}`);
+        this.$emit(action, {new_thread_dom: htmlToDom(response.data as string)});
         window.$events.success(this.archiveText);
+        this.container.closest('.comment-branch')?.remove();
     }
 
     protected showLoading(): HTMLElement {
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 45f8d6a9f6d..083919b826f 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -9,6 +9,12 @@ export interface CommentReplyEvent extends Event {
     }
 }
 
+export interface ArchiveEvent extends Event {
+    detail: {
+        new_thread_dom: HTMLElement;
+    }
+}
+
 export class PageComments extends Component {
 
     private elem: HTMLElement;
@@ -17,6 +23,7 @@ export class PageComments extends Component {
     private commentCountBar: HTMLElement;
     private commentsTitle: HTMLElement;
     private addButtonContainer: HTMLElement;
+    private archiveContainer: HTMLElement;
     private replyToRow: HTMLElement;
     private formContainer: HTMLElement;
     private form: HTMLFormElement;
@@ -43,6 +50,7 @@ export class PageComments extends Component {
         this.commentCountBar = this.$refs.commentCountBar;
         this.commentsTitle = this.$refs.commentsTitle;
         this.addButtonContainer = this.$refs.addButtonContainer;
+        this.archiveContainer = this.$refs.archiveContainer;
         this.replyToRow = this.$refs.replyToRow;
         this.formContainer = this.$refs.formContainer;
         this.form = this.$refs.form as HTMLFormElement;
@@ -75,6 +83,14 @@ export class PageComments extends Component {
             this.setReply(event.detail.id, event.detail.element);
         });
 
+        this.elem.addEventListener('page-comment-archive', (event: ArchiveEvent) => {
+            this.archiveContainer.append(event.detail.new_thread_dom);
+        });
+
+        this.elem.addEventListener('page-comment-unarchive', (event: ArchiveEvent) => {
+            this.container.append(event.detail.new_thread_dom)
+        });
+
         if (this.form) {
             this.removeReplyToButton.addEventListener('click', this.removeReplyTo.bind(this));
             this.hideFormButton.addEventListener('click', this.hideForm.bind(this));
diff --git a/resources/views/comments/comment-branch.blade.php b/resources/views/comments/comment-branch.blade.php
index 83fa4b5c595..658c33219c3 100644
--- a/resources/views/comments/comment-branch.blade.php
+++ b/resources/views/comments/comment-branch.blade.php
@@ -1,13 +1,16 @@
+{{--
+$branch CommentTreeNode
+--}}
 <div class="comment-branch">
     <div>
-        @include('comments.comment', ['comment' => $branch['comment']])
+        @include('comments.comment', ['comment' => $branch->comment])
     </div>
     <div class="flex-container-row">
         <div class="comment-thread-indicator-parent">
             <div class="comment-thread-indicator"></div>
         </div>
         <div class="comment-branch-children flex">
-            @foreach($branch['children'] as $childBranch)
+            @foreach($branch->children as $childBranch)
                 @include('comments.comment-branch', ['branch' => $childBranch])
             @endforeach
         </div>
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 58e057140a0..fe61bf1a4f6 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -38,7 +38,7 @@ class="comment-box">
                     @if(userCan('comment-create-all'))
                         <button refs="page-comment@reply-button" type="button" class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>
                     @endif
-                    @if(userCan('comment-update', $comment) || userCan('comment-delete', $comment))
+                    @if(!$comment->parent_id && (userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
                         <button refs="page-comment@archive-button"
                                 type="button"
                                 data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 48bf885fff5..06e96cad689 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -18,8 +18,8 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
         @endif
     </div>
 
-    <div refs="page-comments@commentContainer" class="comment-container">
-        @foreach($commentTree->get() as $branch)
+    <div refs="page-comments@comment-container" class="comment-container">
+        @foreach($commentTree->getActive() as $branch)
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
     </div>
@@ -27,14 +27,25 @@ class="button outline">{{ trans('entities.comment_add') }}</button>
     @if(userCan('comment-create-all'))
         @include('comments.create')
         @if (!$commentTree->empty())
-            <div refs="page-comments@addButtonContainer" class="text-right">
+            <div refs="page-comments@addButtonContainer" class="flex-container-row">
+
+                <button type="button"
+                        refs="page-comments@show-archived-button"
+                        class="text-button hover-underline">{{ trans_choice('entities.comment_archived', count($commentTree->getArchived())) }}</button>
+
                 <button type="button"
                         refs="page-comments@add-comment-button"
-                        class="button outline">{{ trans('entities.comment_add') }}</button>
+                        class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
             </div>
         @endif
     @endif
 
+    <div refs="page-comments@archive-container" class="comment-container">
+        @foreach($commentTree->getArchived() as $branch)
+            @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
+        @endforeach
+    </div>
+
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
         @push('body-end')
             <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>

From e7dcc2dcdf9e709523705a2b9ea9ffb7dedda59b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 30 Apr 2025 17:42:09 +0100
Subject: [PATCH 519/666] Comments: Moved to tab UI, Converted tabs component
 to ts

---
 app/Activity/Tools/CommentTree.php           | 12 +++-
 lang/en/entities.php                         |  5 +-
 resources/js/components/page-comment.ts      |  2 +-
 resources/js/components/page-comments.ts     | 35 ++++++---
 resources/js/components/{tabs.js => tabs.ts} | 25 ++++---
 resources/sass/_components.scss              |  7 ++
 resources/views/comments/comments.blade.php  | 76 +++++++++++++-------
 resources/views/pages/show.blade.php         |  6 --
 8 files changed, 115 insertions(+), 53 deletions(-)
 rename resources/js/components/{tabs.js => tabs.ts} (78%)

diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index 13afc92521d..a05a9d24726 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -28,7 +28,7 @@ public function enabled(): bool
 
     public function empty(): bool
     {
-        return count($this->tree) === 0;
+        return count($this->getActive()) === 0;
     }
 
     public function count(): int
@@ -41,11 +41,21 @@ public function getActive(): array
         return array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived);
     }
 
+    public function activeThreadCount(): int
+    {
+        return count($this->getActive());
+    }
+
     public function getArchived(): array
     {
         return array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived);
     }
 
+    public function archivedThreadCount(): int
+    {
+        return count($this->getArchived());
+    }
+
     public function getCommentNodeForId(int $commentId): ?CommentTreeNode
     {
         foreach ($this->tree as $node) {
diff --git a/lang/en/entities.php b/lang/en/entities.php
index cda58e65bdf..c70658c0176 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -392,9 +392,10 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
-    'comment_archived' => ':count Archived Comment|:count Archived Comments',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 82cb95f13de..12485b80728 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -140,8 +140,8 @@ export class PageComment extends Component {
         const action = isArchived ? 'unarchive' : 'archive';
 
         const response = await window.$http.put(`/comment/${this.commentId}/${action}`);
-        this.$emit(action, {new_thread_dom: htmlToDom(response.data as string)});
         window.$events.success(this.archiveText);
+        this.$emit(action, {new_thread_dom: htmlToDom(response.data as string)});
         this.container.closest('.comment-branch')?.remove();
     }
 
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 083919b826f..2482c9dcb7d 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -1,6 +1,7 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
+import {Tabs} from "./tabs";
 
 export interface CommentReplyEvent extends Event {
     detail: {
@@ -21,7 +22,8 @@ export class PageComments extends Component {
     private pageId: number;
     private container: HTMLElement;
     private commentCountBar: HTMLElement;
-    private commentsTitle: HTMLElement;
+    private activeTab: HTMLElement;
+    private archivedTab: HTMLElement;
     private addButtonContainer: HTMLElement;
     private archiveContainer: HTMLElement;
     private replyToRow: HTMLElement;
@@ -37,6 +39,7 @@ export class PageComments extends Component {
     private wysiwygEditor: any = null;
     private createdText: string;
     private countText: string;
+    private archivedCountText: string;
     private parentId: number | null = null;
     private contentReference: string = '';
     private formReplyText: string = '';
@@ -48,7 +51,8 @@ export class PageComments extends Component {
         // Element references
         this.container = this.$refs.commentContainer;
         this.commentCountBar = this.$refs.commentCountBar;
-        this.commentsTitle = this.$refs.commentsTitle;
+        this.activeTab = this.$refs.activeTab;
+        this.archivedTab = this.$refs.archivedTab;
         this.addButtonContainer = this.$refs.addButtonContainer;
         this.archiveContainer = this.$refs.archiveContainer;
         this.replyToRow = this.$refs.replyToRow;
@@ -67,6 +71,7 @@ export class PageComments extends Component {
         // Translations
         this.createdText = this.$opts.createdText;
         this.countText = this.$opts.countText;
+        this.archivedCountText = this.$opts.archivedCountText;
 
         this.formReplyText = this.formReplyLink?.textContent || '';
 
@@ -85,10 +90,12 @@ export class PageComments extends Component {
 
         this.elem.addEventListener('page-comment-archive', (event: ArchiveEvent) => {
             this.archiveContainer.append(event.detail.new_thread_dom);
+            setTimeout(() => this.updateCount(), 1);
         });
 
         this.elem.addEventListener('page-comment-unarchive', (event: ArchiveEvent) => {
-            this.container.append(event.detail.new_thread_dom)
+            this.container.append(event.detail.new_thread_dom);
+            setTimeout(() => this.updateCount(), 1);
         });
 
         if (this.form) {
@@ -136,8 +143,10 @@ export class PageComments extends Component {
     }
 
     protected updateCount(): void {
-        const count = this.getCommentCount();
-        this.commentsTitle.textContent = window.$trans.choice(this.countText, count);
+        const activeCount = this.getActiveThreadCount();
+        this.activeTab.textContent = window.$trans.choice(this.countText, activeCount);
+        const archivedCount = this.getArchivedThreadCount();
+        this.archivedTab.textContent = window.$trans.choice(this.archivedCountText, archivedCount);
     }
 
     protected resetForm(): void {
@@ -155,12 +164,18 @@ export class PageComments extends Component {
         this.addButtonContainer.toggleAttribute('hidden', true);
         this.formContainer.scrollIntoView({behavior: 'smooth', block: 'nearest'});
         this.loadEditor();
+
+        // Ensure the active comments tab is displaying
+        const tabs = window.$components.firstOnElement(this.elem, 'tabs');
+        if (tabs instanceof Tabs) {
+            tabs.show('comment-tab-panel-active');
+        }
     }
 
     protected hideForm(): void {
         this.resetForm();
         this.formContainer.toggleAttribute('hidden', true);
-        if (this.getCommentCount() > 0) {
+        if (this.getActiveThreadCount() > 0) {
             this.elem.append(this.addButtonContainer);
         } else {
             this.commentCountBar.append(this.addButtonContainer);
@@ -198,8 +213,12 @@ export class PageComments extends Component {
         }
     }
 
-    protected getCommentCount(): number {
-        return this.container.querySelectorAll('[component="page-comment"]').length;
+    protected getActiveThreadCount(): number {
+        return this.container.querySelectorAll(':scope > .comment-branch:not([hidden])').length;
+    }
+
+    protected getArchivedThreadCount(): number {
+        return this.archiveContainer.querySelectorAll(':scope > .comment-branch').length;
     }
 
     protected setReply(commentLocalId, commentElement): void {
diff --git a/resources/js/components/tabs.js b/resources/js/components/tabs.ts
similarity index 78%
rename from resources/js/components/tabs.js
rename to resources/js/components/tabs.ts
index f0fc058ced7..56405b8c78e 100644
--- a/resources/js/components/tabs.js
+++ b/resources/js/components/tabs.ts
@@ -19,18 +19,25 @@ import {Component} from './component';
  */
 export class Tabs extends Component {
 
+    protected container: HTMLElement;
+    protected tabList: HTMLElement;
+    protected tabs: HTMLElement[];
+    protected panels: HTMLElement[];
+
+    protected activeUnder: number;
+    protected active: null|boolean = null;
+
     setup() {
         this.container = this.$el;
-        this.tabList = this.container.querySelector('[role="tablist"]');
+        this.tabList = this.container.querySelector('[role="tablist"]') as HTMLElement;
         this.tabs = Array.from(this.tabList.querySelectorAll('[role="tab"]'));
         this.panels = Array.from(this.container.querySelectorAll(':scope > [role="tabpanel"], :scope > * > [role="tabpanel"]'));
         this.activeUnder = this.$opts.activeUnder ? Number(this.$opts.activeUnder) : 10000;
-        this.active = null;
 
         this.container.addEventListener('click', event => {
-            const tab = event.target.closest('[role="tab"]');
-            if (tab && this.tabs.includes(tab)) {
-                this.show(tab.getAttribute('aria-controls'));
+            const tab = (event.target as HTMLElement).closest('[role="tab"]');
+            if (tab instanceof HTMLElement && this.tabs.includes(tab)) {
+                this.show(tab.getAttribute('aria-controls') || '');
             }
         });
 
@@ -40,7 +47,7 @@ export class Tabs extends Component {
         this.updateActiveState();
     }
 
-    show(sectionId) {
+    public show(sectionId: string): void {
         for (const panel of this.panels) {
             panel.toggleAttribute('hidden', panel.id !== sectionId);
         }
@@ -54,7 +61,7 @@ export class Tabs extends Component {
         this.$emit('change', {showing: sectionId});
     }
 
-    updateActiveState() {
+    protected updateActiveState(): void {
         const active = window.innerWidth < this.activeUnder;
         if (active === this.active) {
             return;
@@ -69,13 +76,13 @@ export class Tabs extends Component {
         this.active = active;
     }
 
-    activate() {
+    protected activate(): void {
         const panelToShow = this.panels.find(p => !p.hasAttribute('hidden')) || this.panels[0];
         this.show(panelToShow.id);
         this.tabList.toggleAttribute('hidden', false);
     }
 
-    deactivate() {
+    protected deactivate(): void {
         for (const panel of this.panels) {
             panel.removeAttribute('hidden');
         }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 5486d611288..d25fab299d9 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -802,6 +802,13 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   display: block;
 }
 
+.comment-container .empty-state {
+  display: none;
+}
+.comment-container:not(:has([component="page-comment"])) .empty-state {
+  display: block;
+}
+
 .comment-container-compact .comment-box {
   margin-bottom: vars.$xs;
   .meta {
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 06e96cad689..882cfdf45ee 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,49 +1,73 @@
-<section component="page-comments"
+<section components="page-comments tabs"
          option:page-comments:page-id="{{ $page->id }}"
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
-         option:page-comments:count-text="{{ trans('entities.comment_count') }}"
+         option:page-comments:count-text="{{ trans('entities.comment_thread_count') }}"
+         option:page-comments:archived-count-text="{{ trans('entities.comment_archived_count') }}"
          option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
-         class="comments-list"
+         class="comments-list tab-container"
          aria-label="{{ trans('entities.comments') }}">
 
-    <div refs="page-comments@comment-count-bar" class="grid half left-focus v-center no-row-gap">
-        <h5 refs="page-comments@comments-title">{{ trans_choice('entities.comment_count', $commentTree->count(), ['count' => $commentTree->count()]) }}</h5>
+    <div refs="page-comments@comment-count-bar" class="flex-container-row items-center">
+        <div role="tablist" class="flex">
+            <button type="button"
+                    role="tab"
+                    id="comment-tab-active"
+                    aria-controls="comment-tab-panel-active"
+                    refs="page-comments@active-tab"
+                    aria-selected="true">{{ trans_choice('entities.comment_thread_count', $commentTree->activeThreadCount()) }}</button>
+            <button type="button"
+                    role="tab"
+                    id="comment-tab-archived"
+                    aria-controls="comment-tab-panel-archived"
+                    refs="page-comments@archived-tab"
+                    aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
+        </div>
         @if ($commentTree->empty() && userCan('comment-create-all'))
-            <div class="text-m-right" refs="page-comments@add-button-container">
+            <div class="ml-m" refs="page-comments@add-button-container">
                 <button type="button"
                         refs="page-comments@add-comment-button"
-                        class="button outline">{{ trans('entities.comment_add') }}</button>
+                        class="button outline mb-m">{{ trans('entities.comment_add') }}</button>
             </div>
         @endif
     </div>
 
-    <div refs="page-comments@comment-container" class="comment-container">
-        @foreach($commentTree->getActive() as $branch)
-            @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
-        @endforeach
-    </div>
+    <div id="comment-tab-panel-active"
+         tabindex="0"
+         role="tabpanel"
+         aria-labelledby="comment-tab-active"
+         class="comment-container">
+        <div refs="page-comments@comment-container">
+            @foreach($commentTree->getActive() as $branch)
+                @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
+            @endforeach
+        </div>
 
-    @if(userCan('comment-create-all'))
-        @include('comments.create')
-        @if (!$commentTree->empty())
-            <div refs="page-comments@addButtonContainer" class="flex-container-row">
-
-                <button type="button"
-                        refs="page-comments@show-archived-button"
-                        class="text-button hover-underline">{{ trans_choice('entities.comment_archived', count($commentTree->getArchived())) }}</button>
+        <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>
 
-                <button type="button"
-                        refs="page-comments@add-comment-button"
-                        class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
-            </div>
+        @if(userCan('comment-create-all'))
+            @include('comments.create')
+            @if (!$commentTree->empty())
+                <div refs="page-comments@addButtonContainer" class="flex-container-row">
+                    <button type="button"
+                            refs="page-comments@add-comment-button"
+                            class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
+                </div>
+            @endif
         @endif
-    @endif
+    </div>
 
-    <div refs="page-comments@archive-container" class="comment-container">
+    <div refs="page-comments@archive-container"
+         id="comment-tab-panel-archived"
+         tabindex="0"
+         role="tabpanel"
+         aria-labelledby="comment-tab-archived"
+         hidden="hidden"
+         class="comment-container">
         @foreach($commentTree->getArchived() as $branch)
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
+            <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>
     </div>
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index e3a31dd5ebf..137d43bdb1a 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -28,12 +28,6 @@ class="page-content clearfix">
     @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
 
     @if ($commentTree->enabled())
-        @if(($previous || $next))
-            <div class="px-xl print-hidden">
-                <hr class="darker">
-            </div>
-        @endif
-
         <div class="comments-container mb-l print-hidden">
             @include('comments.comments', ['commentTree' => $commentTree, 'page' => $page])
             <div class="clearfix"></div>

From 15c79c38db616ff240135d85be5210306f23efc4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 1 May 2025 16:33:42 +0100
Subject: [PATCH 520/666] Comments: Addressed a range of edge cases and ux
 issues for references

Handles only display and handling references when they're in the active
tab, while handling proper removal when made not visible.
---
 .../js/components/page-comment-reference.ts   | 27 +++++++++++++++----
 resources/js/components/page-comment.ts       |  9 ++++++-
 resources/js/services/components.ts           |  9 +++++--
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.ts
index 72e3dbe480d..edf24354b3b 100644
--- a/resources/js/components/page-comment-reference.ts
+++ b/resources/js/components/page-comment-reference.ts
@@ -3,7 +3,7 @@ import {findTargetNodeAndOffset, hashElement} from "../services/dom";
 import {el} from "../wysiwyg/utils/dom";
 import commentIcon from "@icons/comment.svg";
 import closeIcon from "@icons/close.svg";
-import {scrollAndHighlightElement} from "../services/util";
+import {debounce, scrollAndHighlightElement} from "../services/util";
 
 /**
  * Track the close function for the current open marker so it can be closed
@@ -29,7 +29,7 @@ export class PageCommentReference extends Component {
 
         // Show within page display area if seen
         const pageContentArea = document.querySelector('.page-content');
-        if (pageContentArea instanceof HTMLElement) {
+        if (pageContentArea instanceof HTMLElement && this.link.checkVisibility()) {
             this.updateMarker(pageContentArea);
         }
 
@@ -43,6 +43,21 @@ export class PageCommentReference extends Component {
                  this.hideMarker();
              }
         });
+
+        // Handle comments tab changes to hide/show markers & indicators
+        window.addEventListener('tabs-change', event => {
+            const sectionId = (event as {detail: {showing: string}}).detail.showing;
+            if (!sectionId.startsWith('comment-tab-panel') || !(pageContentArea instanceof HTMLElement)) {
+                return;
+            }
+
+            const panel = document.getElementById(sectionId);
+            if (panel?.contains(this.link)) {
+                this.updateMarker(pageContentArea);
+            } else {
+                this.hideMarker();
+            }
+        });
     }
 
     protected showForEditor() {
@@ -111,9 +126,10 @@ export class PageCommentReference extends Component {
             scrollAndHighlightElement(refEl);
         });
 
-        window.addEventListener('resize', () => {
+        const debouncedReposition = debounce(() => {
             this.positionMarker(refEl, refRange);
-        });
+        }, 50, false).bind(this);
+        window.addEventListener('resize', debouncedReposition);
     }
 
     protected positionMarker(targetEl: HTMLElement, range: string) {
@@ -145,12 +161,13 @@ export class PageCommentReference extends Component {
         this.markerWrap.style.height = `${targetBounds.height}px`;
     }
 
-    protected hideMarker() {
+    public hideMarker() {
         // Hide marker and close existing marker windows
         if (openMarkerClose) {
             openMarkerClose();
         }
         this.markerWrap?.remove();
+        this.markerWrap = null;
     }
 
     protected showCommentAtMarker(marker: HTMLElement): void {
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 12485b80728..18b9ab73bf0 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -1,6 +1,7 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
+import {PageCommentReference} from "./page-comment-reference";
 
 export class PageComment extends Component {
 
@@ -142,7 +143,13 @@ export class PageComment extends Component {
         const response = await window.$http.put(`/comment/${this.commentId}/${action}`);
         window.$events.success(this.archiveText);
         this.$emit(action, {new_thread_dom: htmlToDom(response.data as string)});
-        this.container.closest('.comment-branch')?.remove();
+
+        const branch = this.container.closest('.comment-branch') as HTMLElement;
+        const references = window.$components.allWithinElement<PageCommentReference>(branch, 'page-comment-reference');
+        for (const reference of references) {
+            reference.hideMarker();
+        }
+        branch.remove();
     }
 
     protected showLoading(): HTMLElement {
diff --git a/resources/js/services/components.ts b/resources/js/services/components.ts
index c19939e92a9..0e13cd0a09f 100644
--- a/resources/js/services/components.ts
+++ b/resources/js/services/components.ts
@@ -139,8 +139,8 @@ export class ComponentStore {
     /**
      * Get all the components of the given name.
      */
-    public get(name: string): Component[] {
-        return this.components[name] || [];
+    public get<T extends Component>(name: string): T[] {
+        return (this.components[name] || []) as T[];
     }
 
     /**
@@ -150,4 +150,9 @@ export class ComponentStore {
         const elComponents = this.elementComponentMap.get(element) || {};
         return elComponents[name] || null;
     }
+
+    public allWithinElement<T extends Component>(element: HTMLElement, name: string): T[] {
+        const components = this.get<T>(name);
+        return components.filter(c => element.contains(c.$el));
+    }
 }

From c82fa332100fb9f423f5db6ae3de5423de0a2941 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 1 May 2025 17:22:12 +0100
Subject: [PATCH 521/666] Comments: Further range of content reference ux
 improvements

- Added reference indicator to comment create form.
  - Added remove action.
- Extracted reference text to translations.
- Changed reference hash to be text-based instead of HTML based.
- Added reference display for newly added comments.
- Handled reference marker delete on comment delete.
---
 lang/en/entities.php                          |  2 +
 .../js/components/page-comment-reference.ts   | 26 ++++++-------
 resources/js/components/page-comment.ts       | 11 +++++-
 resources/js/components/page-comments.ts      | 38 ++++++++++++++++---
 resources/js/services/dom.ts                  |  6 +--
 resources/sass/_components.scss               |  3 ++
 resources/views/comments/comment.blade.php    |  2 +-
 resources/views/comments/comments.blade.php   |  4 +-
 resources/views/comments/create.blade.php     | 10 +++++
 9 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index c70658c0176..e25a83299f3 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -410,6 +410,8 @@
     'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.ts
index edf24354b3b..5a71f0c513b 100644
--- a/resources/js/components/page-comment-reference.ts
+++ b/resources/js/components/page-comment-reference.ts
@@ -28,10 +28,7 @@ export class PageCommentReference extends Component {
         this.closeText = this.$opts.closeText;
 
         // Show within page display area if seen
-        const pageContentArea = document.querySelector('.page-content');
-        if (pageContentArea instanceof HTMLElement && this.link.checkVisibility()) {
-            this.updateMarker(pageContentArea);
-        }
+        this.showForDisplay();
 
         // Handle editor view to show on comments toolbox view
         window.addEventListener('editor-toolbox-change', (event) => {
@@ -47,19 +44,26 @@ export class PageCommentReference extends Component {
         // Handle comments tab changes to hide/show markers & indicators
         window.addEventListener('tabs-change', event => {
             const sectionId = (event as {detail: {showing: string}}).detail.showing;
-            if (!sectionId.startsWith('comment-tab-panel') || !(pageContentArea instanceof HTMLElement)) {
+            if (!sectionId.startsWith('comment-tab-panel')) {
                 return;
             }
 
             const panel = document.getElementById(sectionId);
             if (panel?.contains(this.link)) {
-                this.updateMarker(pageContentArea);
+                this.showForDisplay();
             } else {
                 this.hideMarker();
             }
         });
     }
 
+    public showForDisplay() {
+        const pageContentArea = document.querySelector('.page-content');
+        if (pageContentArea instanceof HTMLElement && this.link.checkVisibility()) {
+            this.updateMarker(pageContentArea);
+        }
+    }
+
     protected showForEditor() {
         const contentWrap = document.querySelector('.editor-content-wrap');
         if (contentWrap instanceof HTMLElement) {
@@ -90,15 +94,7 @@ export class PageCommentReference extends Component {
             return;
         }
 
-        const refCloneToAssess = refEl.cloneNode(true) as HTMLElement;
-        const toRemove = refCloneToAssess.querySelectorAll('[data-lexical-text]');
-        refCloneToAssess.removeAttribute('style');
-        for (const el of toRemove) {
-            el.after(...el.childNodes);
-            el.remove();
-        }
-
-        const actualHash = hashElement(refCloneToAssess);
+        const actualHash = hashElement(refEl);
         if (actualHash !== refHash) {
             this.link.classList.add('outdated');
         }
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 18b9ab73bf0..ce35cdc4a24 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -131,7 +131,16 @@ export class PageComment extends Component {
 
         await window.$http.delete(`/comment/${this.commentId}`);
         this.$emit('delete');
-        this.container.closest('.comment-branch')?.remove();
+
+        const branch = this.container.closest('.comment-branch');
+        if (branch instanceof HTMLElement) {
+            const refs = window.$components.allWithinElement<PageCommentReference>(branch, 'page-comment-reference');
+            for (const ref of refs) {
+                ref.hideMarker();
+            }
+            branch.remove();
+        }
+
         window.$events.success(this.deletedText);
     }
 
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 2482c9dcb7d..04c8125808c 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -2,6 +2,8 @@ import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom.ts';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 import {Tabs} from "./tabs";
+import {PageCommentReference} from "./page-comment-reference";
+import {scrollAndHighlightElement} from "../services/util";
 
 export interface CommentReplyEvent extends Event {
     detail: {
@@ -27,13 +29,16 @@ export class PageComments extends Component {
     private addButtonContainer: HTMLElement;
     private archiveContainer: HTMLElement;
     private replyToRow: HTMLElement;
+    private referenceRow: HTMLElement;
     private formContainer: HTMLElement;
     private form: HTMLFormElement;
     private formInput: HTMLInputElement;
     private formReplyLink: HTMLAnchorElement;
+    private formReferenceLink: HTMLAnchorElement;
     private addCommentButton: HTMLElement;
     private hideFormButton: HTMLElement;
     private removeReplyToButton: HTMLElement;
+    private removeReferenceButton: HTMLElement;
     private wysiwygLanguage: string;
     private wysiwygTextDirection: string;
     private wysiwygEditor: any = null;
@@ -56,13 +61,16 @@ export class PageComments extends Component {
         this.addButtonContainer = this.$refs.addButtonContainer;
         this.archiveContainer = this.$refs.archiveContainer;
         this.replyToRow = this.$refs.replyToRow;
+        this.referenceRow = this.$refs.referenceRow;
         this.formContainer = this.$refs.formContainer;
         this.form = this.$refs.form as HTMLFormElement;
         this.formInput = this.$refs.formInput as HTMLInputElement;
         this.formReplyLink = this.$refs.formReplyLink as HTMLAnchorElement;
+        this.formReferenceLink = this.$refs.formReferenceLink as HTMLAnchorElement;
         this.addCommentButton = this.$refs.addCommentButton;
         this.hideFormButton = this.$refs.hideFormButton;
         this.removeReplyToButton = this.$refs.removeReplyToButton;
+        this.removeReferenceButton = this.$refs.removeReferenceButton;
 
         // WYSIWYG options
         this.wysiwygLanguage = this.$opts.wysiwygLanguage;
@@ -100,6 +108,7 @@ export class PageComments extends Component {
 
         if (this.form) {
             this.removeReplyToButton.addEventListener('click', this.removeReplyTo.bind(this));
+            this.removeReferenceButton.addEventListener('click', () => this.setContentReference(''));
             this.hideFormButton.addEventListener('click', this.hideForm.bind(this));
             this.addCommentButton.addEventListener('click', this.showForm.bind(this));
             this.form.addEventListener('submit', this.saveComment.bind(this));
@@ -118,7 +127,7 @@ export class PageComments extends Component {
         const reqData = {
             html: this.wysiwygEditor.getContent(),
             parent_id: this.parentId || null,
-            content_ref: this.contentReference || '',
+            content_ref: this.contentReference,
         };
 
         window.$http.post(`/comment/${this.pageId}`, reqData).then(resp => {
@@ -130,6 +139,11 @@ export class PageComments extends Component {
                 this.container.append(newElem);
             }
 
+            const refs = window.$components.allWithinElement<PageCommentReference>(newElem, 'page-comment-reference');
+            for (const ref of refs) {
+                ref.showForDisplay();
+            }
+
             window.$events.success(this.createdText);
             this.hideForm();
             this.updateCount();
@@ -152,10 +166,8 @@ export class PageComments extends Component {
     protected resetForm(): void {
         this.removeEditor();
         this.formInput.value = '';
-        this.parentId = null;
-        this.contentReference = '';
-        this.replyToRow.toggleAttribute('hidden', true);
-        this.container.append(this.formContainer);
+        this.setContentReference('');
+        this.removeReplyTo();
     }
 
     protected showForm(): void {
@@ -240,7 +252,21 @@ export class PageComments extends Component {
 
     public startNewComment(contentReference: string): void {
         this.removeReplyTo();
-        this.contentReference = contentReference;
+        this.setContentReference(contentReference);
+    }
+
+    protected setContentReference(reference: string): void {
+        this.contentReference = reference;
+        this.referenceRow.toggleAttribute('hidden', !Boolean(reference));
+        const [id] = reference.split(':');
+        this.formReferenceLink.href = `#${id}`;
+        this.formReferenceLink.onclick = function(event) {
+            event.preventDefault();
+            const el = document.getElementById(id);
+            if (el) {
+                scrollAndHighlightElement(el);
+            }
+        };
     }
 
 }
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 661ed7ca3e5..77c19a76105 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -251,9 +251,9 @@ export function findTargetNodeAndOffset(parentNode: HTMLElement, offset: number)
 }
 
 /**
- * Create a hash for the given HTML element.
+ * Create a hash for the given HTML element content.
  */
 export function hashElement(element: HTMLElement): string {
-    const normalisedElemHtml = element.outerHTML.replace(/\s{2,}/g, '');
-    return cyrb53(normalisedElemHtml);
+    const normalisedElemText = (element.textContent || '').replace(/\s{2,}/g, '');
+    return cyrb53(normalisedElemText);
 }
\ No newline at end of file
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index d25fab299d9..a86d31ce373 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -569,6 +569,9 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   border-bottom: 0;
   padding: 0 vars.$xs;
 }
+.tab-container [role="tabpanel"].no-outline:focus {
+  outline: none;
+}
 
 .image-picker .none {
   display: none;
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index fe61bf1a4f6..eadf3518722 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -87,7 +87,7 @@ class="text-button text-muted hover-underline text-small p-xs">@icon('archive')
                    option:page-comment-reference:view-comment-text="{{ trans('entities.comment_view') }}"
                    option:page-comment-reference:jump-to-thread-text="{{ trans('entities.comment_jump_to_thread') }}"
                    option:page-comment-reference:close-text="{{ trans('common.close') }}"
-                   href="#">@icon('bookmark')Reference <span>- Outdated</span></a>
+                   href="#">@icon('bookmark'){{ trans('entities.comment_reference') }} <span>{{ trans('entities.comment_reference_outdated') }}</span></a>
             </div>
         @endif
         {!! $commentHtml  !!}
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 882cfdf45ee..51c08d69a85 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -36,7 +36,7 @@ class="button outline mb-m">{{ trans('entities.comment_add') }}</button>
          tabindex="0"
          role="tabpanel"
          aria-labelledby="comment-tab-active"
-         class="comment-container">
+         class="comment-container no-outline">
         <div refs="page-comments@comment-container">
             @foreach($commentTree->getActive() as $branch)
                 @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
@@ -63,7 +63,7 @@ class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
          role="tabpanel"
          aria-labelledby="comment-tab-archived"
          hidden="hidden"
-         class="comment-container">
+         class="comment-container no-outline">
         @foreach($commentTree->getArchived() as $branch)
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
diff --git a/resources/views/comments/create.blade.php b/resources/views/comments/create.blade.php
index 417f0c60602..134ed516425 100644
--- a/resources/views/comments/create.blade.php
+++ b/resources/views/comments/create.blade.php
@@ -12,6 +12,16 @@
                 </div>
             </div>
         </div>
+        <div refs="page-comments@reference-row" hidden class="primary-background-light text-muted px-s py-xs">
+            <div class="grid left-focus v-center">
+                <div>
+                    <a refs="page-comments@formReferenceLink" href="#">{{ trans('entities.comment_reference') }}</a>
+                </div>
+                <div class="text-right">
+                    <button refs="page-comments@remove-reference-button" class="text-button">{{ trans('common.remove') }}</button>
+                </div>
+            </div>
+        </div>
 
         <div class="content px-s pt-s">
             <form refs="page-comments@form" novalidate>

From 1262083fcf48f522394d3a0cd7001be3e66eec53 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 3 May 2025 20:30:50 +0100
Subject: [PATCH 522/666] Images: Changed how new image permissions are set

Removed default public visibility for images at the driver level,
leaving only doing this as a specific action in the logic.
Added try/catch around permission setting so that
permission-incompatible environments won't fatally fail, but instead
log a warning.

Tested via a google cloud storage bucket FUSE mount, mounted under another
user but with open 777 permissions.

Related to #5269
---
 app/Config/filesystems.php       |  2 --
 app/Uploads/ImageStorageDisk.php | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/Config/filesystems.php b/app/Config/filesystems.php
index 08ae7b04776..ab507a2f8c6 100644
--- a/app/Config/filesystems.php
+++ b/app/Config/filesystems.php
@@ -32,7 +32,6 @@
         'local' => [
             'driver'     => 'local',
             'root'       => public_path(),
-            'visibility' => 'public',
             'serve'      => false,
             'throw'      => true,
         ],
@@ -47,7 +46,6 @@
         'local_secure_images' => [
             'driver'     => 'local',
             'root'       => storage_path('uploads/images/'),
-            'visibility' => 'public',
             'serve'      => false,
             'throw'      => true,
         ],
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index da8bacb3447..8e364831f75 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -5,6 +5,8 @@
 use BookStack\Util\FilePathNormalizer;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Facades\Log;
+use League\Flysystem\UnableToSetVisibility;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ImageStorageDisk
@@ -74,12 +76,19 @@ public function put(string $path, string $data, bool $makePublic = false): void
         $path = $this->adjustPathForDisk($path);
         $this->filesystem->put($path, $data);
 
-        // Set visibility when a non-AWS-s3, s3-like storage option is in use.
-        // Done since this call can break s3-like services but desired for other image stores.
-        // Attempting to set ACL during above put request requires different permissions
-        // hence would technically be a breaking change for actual s3 usage.
+        // Set public visibility to ensure public access on S3, or that the file is accessible
+        // to other processes (like web-servers) for local file storage options.
+        // We avoid attempting this for (non-AWS) s3-like systems (even in a try-catch) as
+        // we've always avoided setting permissions for s3-like due to potential issues,
+        // with docs advising setting pre-configured permissions instead.
+        // We also don't do this as the default filesystem/driver level as that can technically
+        // require different ACLs for S3, and this provides us more logical control.
         if ($makePublic && !$this->isS3Like()) {
-            $this->filesystem->setVisibility($path, 'public');
+            try {
+                $this->filesystem->setVisibility($path, 'public');
+            } catch (UnableToSetVisibility $e) {
+                Log::warning("Unable to set visibility for image upload with relative path: {$path}");
+            }
         }
     }
 

From 8821844c4aec3aa3e02d315829ebfccb8138d68a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 May 2025 12:21:32 +0100
Subject: [PATCH 523/666] Exports: Fixed CSS file BOM mark breaking CSS
 variables in exports

Adds a dummy CSS rule to break as the first rule, instead of our
:root variables.
Fixes #5576
---
 resources/sass/_vars.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/sass/_vars.scss b/resources/sass/_vars.scss
index 26539656e7f..1a9590e730f 100644
--- a/resources/sass/_vars.scss
+++ b/resources/sass/_vars.scss
@@ -1,5 +1,12 @@
 // Variables
-///////////////
+// A range of SASS and plain CSS variables used in BookStack
+////////////////////////////////////////////////////////////
+
+// This is simply placed here at the top to prevent parsing/rendering issues
+// where built CSS files may have a starting BOM mark which can break the first css rule
+// when used inline, so this is here as a sacrifice in such scenarios instead of an important rule.
+// Related: https://github.com/sass/dart-sass/issues/472
+.dummy-style {color: red;}
 
 // Screen breakpoints
 $bp-xxxl: 1700px;

From 4f36cdd75793771abb8aed877fafc692aa269f82 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 5 May 2025 12:24:12 +0100
Subject: [PATCH 524/666] Updated translations with latest Crowdin changes
 (#5566)

---
 lang/ar/activities.php           |   2 +-
 lang/ar/auth.php                 |  20 ++---
 lang/ar/errors.php               |   2 +-
 lang/ar/passwords.php            |   8 +-
 lang/ar/settings.php             |   6 +-
 lang/ar/validation.php           |   2 +-
 lang/de/activities.php           |  14 ++--
 lang/de/editor.php               |   4 +-
 lang/de/entities.php             |  28 +++----
 lang/de/passwords.php            |   2 +-
 lang/de/preferences.php          |   8 +-
 lang/de/settings.php             |  74 +++++++++---------
 lang/de/validation.php           |  18 ++---
 lang/de_informal/activities.php  |  50 ++++++------
 lang/de_informal/auth.php        |   4 +-
 lang/de_informal/editor.php      |   6 +-
 lang/de_informal/entities.php    |  26 +++----
 lang/de_informal/passwords.php   |   2 +-
 lang/de_informal/preferences.php |   6 +-
 lang/de_informal/settings.php    |  76 +++++++++---------
 lang/de_informal/validation.php  |  16 ++--
 lang/et/entities.php             |   2 +-
 lang/et/errors.php               |   4 +-
 lang/id/settings.php             | 130 +++++++++++++++----------------
 lang/id/validation.php           |   8 +-
 lang/pt_BR/editor.php            |   4 +-
 lang/pt_BR/entities.php          |   6 +-
 lang/pt_BR/errors.php            |   2 +-
 lang/sv/activities.php           |  24 +++---
 lang/sv/common.php               |   2 +-
 lang/sv/editor.php               |   8 +-
 lang/sv/entities.php             | 112 +++++++++++++-------------
 lang/sv/errors.php               |  20 ++---
 lang/sv/settings.php             |  20 ++---
 lang/uk/activities.php           |  24 +++---
 lang/uk/editor.php               |   8 +-
 lang/uk/entities.php             |  48 ++++++------
 lang/uk/errors.php               |  20 ++---
 lang/uk/settings.php             |  58 +++++++-------
 lang/uk/validation.php           |   8 +-
 lang/zh_CN/settings.php          |  50 ++++++------
 41 files changed, 466 insertions(+), 466 deletions(-)

diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index bf5d4411fed..69da1213846 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -64,7 +64,7 @@
     // Auth
     'auth_login' => 'تم تسجيل الدخول',
     'auth_register' => 'سجل كمستخدم جديد',
-    'auth_password_reset_request' => 'طلب رابط جديد لإعادة تعيين كلمة المرور',
+    'auth_password_reset_request' => 'طلب رابط جديد لإعادة تعيين كلمة السر',
     'auth_password_reset_update' => 'إعادة تعيين كلمة مرور المستخدم',
     'mfa_setup_method' => 'طريقة المصادقة متعددة العوامل المُهيأة',
     'mfa_setup_method_notification' => 'تم إعداد المصادقة متعددة العوامل بنجاح',
diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index 3890589cd13..fb6f3d1cf72 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -26,7 +26,7 @@
     'remember_me' => 'تذكرني',
     'ldap_email_hint' => 'الرجاء إدخال عنوان بريد إلكتروني لاستخدامه مع الحساب.',
     'create_account' => 'إنشاء حساب',
-    'already_have_account' => 'لديك حساب بالفعل؟',
+    'already_have_account' => 'لديك حساب مسبقاً؟',
     'dont_have_account' => 'ليس لديك حساب؟',
     'social_login' => 'تسجيل الدخول باستخدام حسابات التواصل الاجتماعي',
     'social_registration' => 'إنشاء حساب باستخدام حسابات التواصل الاجتماعي',
@@ -45,7 +45,7 @@
 
     // Password Reset
     'reset_password' => 'استعادة كلمة السر',
-    'reset_password_send_instructions' => 'أدخل بريدك الإلكتروني بالأسفل وسيتم إرسال رسالة برابط لاستعادة كلمة المرور.',
+    'reset_password_send_instructions' => 'أدخل بريدك الإلكتروني بالأسفل وسيتم إرسال رسالة برابط لاستعادة كلمة السر.',
     'reset_password_send_button' => 'أرسل رابط الاستعادة',
     'reset_password_sent' => 'سيتم إرسال رابط إعادة تعيين كلمة السر إلى عنوان البريد الإلكتروني هذا إذا كان موجودًا في النظام.',
     'reset_password_success' => 'تمت استعادة كلمة السر بنجاح.',
@@ -60,7 +60,7 @@
     'email_confirm_action' => 'تأكيد البريد الإلكتروني',
     'email_confirm_send_error' => 'تأكيد البريد الإلكتروني مطلوب ولكن النظام لم يستطع إرسال الرسالة. تواصل مع مشرف النظام للتأكد من إعدادات البريد.',
     'email_confirm_success' => 'تم تأكيد بريدك الإلكتروني! يمكنك الآن تسجيل الدخول باستخدام عنوان البريد الإلكتروني هذا.',
-    'email_confirm_resent' => 'تمت إعادة إرسال رسالة التأكيد. الرجاء مراجعة صندوق الوارد',
+    'email_confirm_resent' => 'تمت إعادة إرسال رسالة التأكيد، الرجاء مراجعة صندوق الوارد.',
     'email_confirm_thanks' => 'شكرا للتأكيد!',
     'email_confirm_thanks_desc' => 'الرجاء الانتظار لحظة بينما يتم التعامل مع التأكيد الخاص بك. إذا لم يتم إعادة توجيهك بعد 3 ثوان اضغط على الرابط "المتابعة" أدناه للمتابعة.',
 
@@ -72,24 +72,24 @@
 
     // User Invite
     'user_invite_email_subject' => 'تمت دعوتك للانضمام إلى صفحة الحالة الخاصة بـ :app_name!',
-    'user_invite_email_greeting' => 'تم إنشاء حساب مستخدم لك على %site%.',
-    'user_invite_email_text' => 'انقر على الزر أدناه لتعيين كلمة مرور الحساب والحصول على الوصول:',
+    'user_invite_email_greeting' => 'تم إنشاء حساب مستخدم لك على :appName.',
+    'user_invite_email_text' => 'انقر على الزر أدناه لتعيين كلمة سر الحساب والحصول على الوصول:',
     'user_invite_email_action' => 'كلمة سر المستخدم',
     'user_invite_page_welcome' => 'مرحبا بكم في :appName!',
     'user_invite_page_text' => 'لإكمال حسابك والحصول على حق الوصول تحتاج إلى تعيين كلمة السر سيتم استخدامها لتسجيل الدخول إلى :appName في الزيارات المستقبلية.',
     'user_invite_page_confirm_button' => 'تأكيد كلمة السر',
-    'user_invite_success_login' => 'تم تأكيد كلمة السر. يمكنك الآن تسجيل الدخول باستخدام كلمة المرور المحددة للوصول إلى :appName!',
+    'user_invite_success_login' => 'تم تأكيد كلمة السر. يمكنك الآن تسجيل الدخول باستخدام كلمة السر المحددة للوصول إلى :appName !',
 
     // Multi-factor Authentication
     'mfa_setup' => 'إعداد المصادقة متعددة العوامل',
     'mfa_setup_desc' => 'إعداد المصادقة متعددة العوامل كطبقة إضافية من الأمان لحساب المستخدم الخاص بك.',
     'mfa_setup_configured' => 'تم إعداده مسبقاً',
     'mfa_setup_reconfigure' => 'إعادة التكوين',
-    'mfa_setup_remove_confirmation' => 'هل أنت متأكد من أنك تريد إزالة طريقة المصادقة متعددة العوامل هذه؟',
-    'mfa_setup_action' => 'إعداد (تنصيب)',
+    'mfa_setup_remove_confirmation' => 'متأكد من أنك تريد إزالة طريقة المصادقة متعددة العوامل هذه؟',
+    'mfa_setup_action' => 'إعداد',
     'mfa_backup_codes_usage_limit_warning' => 'لديك أقل من 5 رموز احتياطية متبقية، الرجاء إنشاء وتخزين مجموعة جديدة قبل نفاد الرموز لتجنب إغلاق حسابك.',
     'mfa_option_totp_title' => 'تطبيق الجوال',
-    'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق جوال يدعم كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
+    'mfa_option_totp_desc' => 'لاستخدام المصادقة المتعددة العوامل، ستحتاج إلى تطبيق جوال يدعم كلمة السر المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
     'mfa_option_backup_codes_title' => 'رموز النسخ الاحتياطي',
     'mfa_option_backup_codes_desc' => 'إنشاء مجموعة من رموز النسخ الاحتياطية للاستخدام مرة واحدة و التي سَتُدِخلها عند تسجيل الدخول للتحقق من هويتك. احرص أن تخزينها في مكان آمن.',
     'mfa_gen_confirm_and_enable' => 'تأكيد وتمكين',
@@ -98,7 +98,7 @@
     'mfa_gen_backup_codes_download' => 'تنزيل الرموز',
     'mfa_gen_backup_codes_usage_warning' => 'يمكن استخدام كل رمز مرة واحدة فقط',
     'mfa_gen_totp_title' => 'إعداد تطبيق الجوال',
-    'mfa_gen_totp_desc' => 'لاستخدام المصادقة المتعددة ، ستحتاج إلى تطبيق جوال كلمة المرور المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
+    'mfa_gen_totp_desc' => 'لاستخدام المصادقة المتعددة ، ستحتاج إلى تطبيق جوال كلمة السر المؤقته -TOTP- مثل جوجل أوثنتيكاتور -Google Authenticator- أو أوثي -Authy- أو مايكروسوفت أوثنتيكاتور -Microsoft Authenticator-.',
     'mfa_gen_totp_scan' => 'امسح رمز الاستجابة السريعة -QR- أدناه باستخدام تطبيق المصادقة المفضل لديك للبدء.',
     'mfa_gen_totp_verify_setup' => 'التحقق من الإعداد',
     'mfa_gen_totp_verify_setup_desc' => 'تحقق أن كل شيء يعمل عن طريق إدخال رمز تم إنشاؤه داخل تطبيق المصادقة الخاص بك في مربع الإدخال أدناه:',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index b50c95c232f..4c6325cb3a1 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -16,7 +16,7 @@
     'email_confirmation_expired' => 'صلاحية رابط التأكيد انتهت, تم إرسال رسالة تأكيد جديدة لعنوان البريد الإلكتروني.',
     'email_confirmation_awaiting' => 'عنوان البريد الإلكتروني للحساب قيد الاستخدام يحتاج إلى تأكيد',
     'ldap_fail_anonymous' => 'فشل الوصول إلى LDAP باستخدام الربط المجهول',
-    'ldap_fail_authed' => 'فشل الوصول إلى LDAP باستخدام dn و password المعطاة',
+    'ldap_fail_authed' => 'فشل الوصول إلى LDAP باستخدام dn و كلمة السر المعطاة',
     'ldap_extension_not_installed' => 'لم يتم تثبيت إضافة LDAP PHP',
     'ldap_cannot_connect' => 'لا يمكن الاتصال بخادم ldap, فشل الاتصال المبدئي',
     'saml_already_logged_in' => 'تم تسجيل الدخول بالفعل',
diff --git a/lang/ar/passwords.php b/lang/ar/passwords.php
index 4ab447d5d56..1e8a10ccc89 100644
--- a/lang/ar/passwords.php
+++ b/lang/ar/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => 'يجب أن تتكون كلمة المرور من ستة أحرف على الأقل وأن تطابق التأكيد.',
+    'password' => 'يجب أن تتكون كلمة السر من ستة أحرف على الأقل وأن تطابق التأكيد.',
     'user' => "لم يتم العثور على مستخدم بعنوان البريد الإلكتروني المعطى.",
-    'token' => 'رمز إعادة تعيين كلمة المرور غير صالح لعنوان هذا البريد الإلكتروني.',
-    'sent' => 'تم إرسال رابط تجديد كلمة المرور إلى بريدكم الإلكتروني!',
-    'reset' => 'تم تجديد كلمة المرور الخاصة بكم!',
+    'token' => 'رمز إعادة تعيين كلمة السر غير صالح لعنوان هذا البريد الإلكتروني.',
+    'sent' => 'تم إرسال رابط تجديد كلمة السر إلى بريدكم الإلكتروني!',
+    'reset' => 'تم تجديد كلمة السر الخاصة بكم!',
 
 ];
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index b7c8ad411fb..8e615fc9cb9 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -220,12 +220,12 @@
     'users_role' => 'أدوار المستخدمين',
     'users_role_desc' => 'حدد الأدوار التي سيتم تعيين هذا المستخدم لها. إذا تم تعيين مستخدم لأدوار متعددة ، فسيتم تكديس الأذونات من هذه الأدوار وسيتلقى كل قدرات الأدوار المعينة.',
     'users_password' => 'كلمة مرور المستخدم',
-    'users_password_desc' => 'عيّن كلمة مرور لتسجيل الدخول إلى التطبيق. يجب ألا تقل عن 8 أحرف.',
-    'users_send_invite_text' => 'يمكنك اختيار إرسال دعوة بالبريد الإلكتروني إلى هذا المستخدم مما يسمح له بتعيين كلمة المرور الخاصة به أو يمكنك تعيين كلمة المرور الخاصة به بنفسك.',
+    'users_password_desc' => 'عيّن كلمة سر لتسجيل الدخول إلى التطبيق. يجب ألا تقل عن 8 أحرف.',
+    'users_send_invite_text' => 'يمكنك اختيار إرسال دعوة بالبريد الإلكتروني إلى هذا المستخدم مما يسمح له بتعيين كلمة السر الخاصة به أو يمكنك تعيين كلمة المرور الخاصة به بنفسك.',
     'users_send_invite_option' => 'أرسل بريدًا إلكترونيًا لدعوة المستخدم',
     'users_external_auth_id' => 'ربط الحساب بمواقع التواصل',
     'users_external_auth_id_desc' => 'عند استخدام نظام مصادقة خارجي (مثل SAML2 أو OIDC أو LDAP)، يكون هذا هو المعرف الذي يربط مستخدم بوكستاك -BookStack- بحساب نظام المصادقة. يمكنك تجاهل هذا الحقل عند استخدام المصادقة الافتراضية عبر البريد الإلكتروني.',
-    'users_password_warning' => 'قم بملء الحقل أدناه فقط إذا كنت ترغب في تغيير كلمة المرور لهذا المستخدم.',
+    'users_password_warning' => 'قم بملء الحقل أدناه فقط إذا كنت ترغب في تغيير كلمة السر لهذا المستخدم.',
     'users_system_public' => 'هذا المستخدم يمثل أي ضيف يقوم بزيارة شيء يخصك. لا يمكن استخدامه لتسجيل الدخول ولكن يتم تعيينه تلقائياً.',
     'users_delete' => 'حذف المستخدم',
     'users_delete_named' => 'حذف المستخدم :userName',
diff --git a/lang/ar/validation.php b/lang/ar/validation.php
index 32a376865e9..c27770fe3a9 100644
--- a/lang/ar/validation.php
+++ b/lang/ar/validation.php
@@ -113,7 +113,7 @@
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
-            'required_with' => 'يجب تأكيد كلمة المرور',
+            'required_with' => 'يجب تأكيد كلمة السر',
         ],
     ],
 
diff --git a/lang/de/activities.php b/lang/de/activities.php
index cfb21a4c97e..025cbaeffab 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -50,7 +50,7 @@
     'bookshelf_delete_notification'    => 'Regal erfolgreich gelöscht',
 
     // Revisions
-    'revision_restore' => 'widerherstellte Revision',
+    'revision_restore' => 'stellte Revision wieder her:',
     'revision_delete' => 'löschte Revision',
     'revision_delete_notification' => 'Revision erfolgreich gelöscht',
 
@@ -128,12 +128,12 @@
     'comment_delete'              => 'Kommentar gelöscht',
 
     // Sort Rules
-    'sort_rule_create' => 'Sortierregel erstellt',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'hat eine Sortierregel erstellt',
+    'sort_rule_create_notification' => 'Sortierregel erfolgreich angelegt',
+    'sort_rule_update' => 'hat eine Sortierregel aktualisiert',
+    'sort_rule_update_notification' => 'Sortierregel erfolgreich aktualisiert',
+    'sort_rule_delete' => 'hat eine Sortierregel gelöscht',
+    'sort_rule_delete_notification' => 'Sortierregel erfolgreich gelöscht',
 
     // Other
     'permissions_update'          => 'hat die Berechtigungen aktualisiert',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index 179c667844e..41ec74e52e1 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Abbrechen',
     'save' => 'Speichern',
     'close' => 'Schließen',
-    'apply' => 'Apply',
+    'apply' => 'Übernehmen',
     'undo' => 'Rückgängig',
     'redo' => 'Wiederholen',
     'left' => 'Links',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Anzuzeigender Text',
     'title' => 'Titel',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Links durchsuchen',
     'open_link' => 'Link öffnen',
     'open_link_in' => 'Link öffnen in...',
     'open_link_current' => 'Aktuelles Fenster',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 9377c7efcdc..767696eb35f 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -40,8 +40,8 @@
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
     'export_zip' => 'Portable ZIP',
-    'default_template' => 'Standard Seitenvorlage',
-    'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
+    'default_template' => 'Standard-Seitenvorlage',
+    'default_template_explain' => 'Bestimmen Sie eine Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt werden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Lesezugriff auf die ausgewählte Vorlagen-Seite hat.',
     'default_template_select' => 'Wählen Sie eine Seitenvorlage',
     'import' => 'Import',
     'import_validate' => 'Import validieren',
@@ -87,7 +87,7 @@
     'search_terms' => 'Suchbegriffe',
     'search_content_type' => 'Inhaltstyp',
     'search_exact_matches' => 'Exakte Treffer',
-    'search_tags' => 'Nach Schlagwort suchen',
+    'search_tags' => 'Schlagwort-Suchen',
     'search_options' => 'Optionen',
     'search_viewed_by_me' => 'Schon von mir angesehen',
     'search_not_viewed_by_me' => 'Noch nicht von mir angesehen',
@@ -166,9 +166,9 @@
     'books_search_this' => 'Dieses Buch durchsuchen',
     'books_navigation' => 'Buchnavigation',
     'books_sort' => 'Buchinhalte sortieren',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt zu reorganisieren. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert. Optional kann eine automatische Sortierregel erstellt werden, um den Inhalt dieses Buches nach Änderungen automatisch zu sortieren.',
+    'books_sort_auto_sort' => 'Auto-Sortieroption',
+    'books_sort_auto_sort_active' => 'Automatische Sortierung aktiv: :sortName',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
@@ -243,12 +243,12 @@
     'pages_edit_delete_draft' => 'Entwurf löschen',
     'pages_edit_delete_draft_confirm' => 'Sind Sie sicher, dass Sie Ihren Entwurf löschen möchten? Alle Ihre Änderungen seit dem letzten vollständigen Speichern gehen verloren und der Editor wird mit dem letzten Speicherzustand aktualisiert, der kein Entwurf ist.',
     'pages_edit_discard_draft' => 'Entwurf verwerfen',
-    'pages_edit_switch_to_markdown' => 'Zum Markdown Editor wechseln',
-    'pages_edit_switch_to_markdown_clean' => '(gesäuberter Output)',
-    'pages_edit_switch_to_markdown_stable' => '(html beibehalten)',
-    'pages_edit_switch_to_wysiwyg' => 'Wechseln Sie zum WYSIWYG-Editor',
-    'pages_edit_switch_to_new_wysiwyg' => 'Zu neuem WYSIWYG wechseln',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_markdown' => 'Zum Markdown-Editor wechseln',
+    'pages_edit_switch_to_markdown_clean' => '(Gesäuberter Inhalt)',
+    'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
+    'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
+    'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha-Testphase)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -332,7 +332,7 @@
     'tag' => 'Schlagwort',
     'tags' =>  'Schlagwörter',
     'tags_index_desc' => 'Tags können auf Inhalte im System angewendet werden, um eine flexible Form der Kategorisierung anzuwenden. Tags können sowohl einen Schlüssel als auch einen Wert haben, wobei der Wert optional ist. Einmal angewendet, können Inhalte unter Verwendung des Tag-Namens und Wertes abgefragt werden.',
-    'tag_name' =>  'Schlagwort Name',
+    'tag_name' =>  'Schlagwortname',
     'tag_value' => 'Inhalt (Optional)',
     'tags_explain' => "Fügen Sie Schlagwörter hinzu, um Ihren Inhalt zu kategorisieren.\nSie können einen erklärenden Inhalt hinzufügen, um eine genauere Unterteilung vorzunehmen.",
     'tags_add' => 'Weiteres Schlagwort hinzufügen',
@@ -392,7 +392,7 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
-    'comment_placeholder' => 'Geben Sie hier Ihre Kommentare ein (Markdown unterstützt)',
+    'comment_placeholder' => 'Geben Sie hier Ihre Kommentare ein',
     'comment_count' => '{0} Keine Kommentare|{1} 1 Kommentar|[2,*] :count Kommentare',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
diff --git a/lang/de/passwords.php b/lang/de/passwords.php
index 5896297e08b..c93ccb4dd84 100644
--- a/lang/de/passwords.php
+++ b/lang/de/passwords.php
@@ -8,7 +8,7 @@
 
     'password' => 'Passwörter müssen aus mindestens acht Zeichen bestehen und mit der eingegebenen Wiederholung übereinstimmen.',
     'user' => "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
-    'token' => 'Der Link zum Zurücksetzen Ihres Passworts ist entweder ungültig oder abgelaufen.',
+    'token' => 'Der Token zum Zurücksetzen des Passworts ist für diese E-Mail-Adresse ungültig.',
     'sent' => 'Der Link zum Zurücksetzen Ihres Passwortes wurde Ihnen per E-Mail zugesendet.',
     'reset' => 'Ihr Passwort wurde zurückgesetzt!',
 
diff --git a/lang/de/preferences.php b/lang/de/preferences.php
index 291e0f9f66d..26f0b05dacc 100644
--- a/lang/de/preferences.php
+++ b/lang/de/preferences.php
@@ -35,12 +35,12 @@
     'auth_change_password_success' => 'Das Passwort wurde aktualisiert!',
 
     'profile' => 'Profildetails',
-    'profile_desc' => 'Verwalten Sie die Details Ihres Kontos welche Sie gegenüber anderen Benutzern repräsentiert, zusätzlich zu den Details die für die Kommunikation und Personalisierung des Systems genutzt werden.',
-    'profile_view_public' => 'Öffentliches Profil zeigen',
-    'profile_name_desc' => 'Konfigurieren Sie Ihren Anzeigenamen, der durch die Aktivität, die Sie ausführen, für andere Benutzer und Ihre eigenen Inhalte im System sichtbar ist.',
+    'profile_desc' => 'Verwalten Sie die Details Ihres Kontos, welches Sie gegenüber anderen Benutzern repräsentiert, zusätzlich zu den Details, die für die Kommunikation und Personalisierung des Systems genutzt werden.',
+    'profile_view_public' => 'Öffentliches Profil anzeigen',
+    'profile_name_desc' => 'Konfigurieren Sie Ihren Anzeigenamen, der durch die Aktivität, die Sie ausführen, und die Ihnen gehörenden Inhalte für andere Benutzer sichtbar ist.',
     'profile_email_desc' => 'Diese E-Mail wird für Benachrichtigungen und, je nach aktiver Systemauthentifizierung, den Systemzugriff verwendet.',
     'profile_email_no_permission' => 'Leider haben Sie nicht die Berechtigung, Ihre E-Mail-Adresse zu ändern. Wenn Sie diese ändern möchten, wenden Sie sich bitte an Ihren Administrator.',
-    'profile_avatar_desc' => 'Wählen Sie ein Bild, dass anderen im System angezeigt wird, um Sie zu repräsentieren. Idealerweise sollte dieses Bild quadratisch und etwa 256px breit und hoch sein.',
+    'profile_avatar_desc' => 'Wählen Sie ein Bild aus, das anderen im System angezeigt wird, um Sie zu repräsentieren. Idealerweise sollte dieses Bild quadratisch und etwa 256px breit und hoch sein.',
     'profile_admin_options' => 'Administratoroptionen',
     'profile_admin_options_desc' => 'Weitere Administrator-Optionen wie zum Beispiel die Verwaltung von Rollenzuweisungen für Ihr Benutzerkonto finden Sie im Bereich "Einstellungen > Benutzer" der Anwendung.',
 
diff --git a/lang/de/settings.php b/lang/de/settings.php
index c83d0ef3755..a6b6482e3ab 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -19,17 +19,17 @@
     'app_name_desc' => 'Dieser Name wird im Header und in E-Mails angezeigt.',
     'app_name_header' => 'Anwendungsname im Header anzeigen?',
     'app_public_access' => 'Öffentlicher Zugriff',
-    'app_public_access_desc' => 'Wenn Sie diese Option aktivieren können Besucher, die nicht angemeldet sind, auf Inhalte in Ihrer BookStack-Instanz zugreifen.',
+    'app_public_access_desc' => 'Wenn Sie diese Option aktivieren, können Besucher, die nicht angemeldet sind, auf Inhalte in Ihrer BookStack-Instanz zugreifen.',
     'app_public_access_desc_guest' => 'Der Zugang für öffentliche Besucher kann über den Benutzer "Guest" gesteuert werden.',
     'app_public_access_toggle' => 'Öffentlichen Zugriff erlauben',
     'app_public_viewing' => 'Öffentliche Ansicht erlauben?',
     'app_secure_images' => 'Erhöhte Sicherheit für hochgeladene Bilder aktivieren?',
-    'app_secure_images_toggle' => 'Aktiviere höhere Sicherheit für Bild-Uploads',
+    'app_secure_images_toggle' => 'Höhere Sicherheit für Bild-Uploads aktivieren',
     'app_secure_images_desc' => 'Aus Leistungsgründen sind alle Bilder öffentlich sichtbar. Diese Option fügt zufällige, schwer zu erratende, Zeichenketten zu Bild-URLs hinzu. Stellen Sie sicher, dass Verzeichnisindizes deaktiviert sind, um einen einfachen Zugriff zu verhindern.',
     'app_default_editor' => 'Standard-Seiten-Editor',
     'app_default_editor_desc' => 'Wählen Sie aus, welcher Editor standardmäßig beim Bearbeiten neuer Seiten verwendet wird. Dies kann auf einer Seitenebene überschrieben werden, wenn es die Berechtigungen erlauben.',
-    'app_custom_html' => 'Benutzerdefinierter HTML <head> Inhalt',
-    'app_custom_html_desc' => 'Jeder Inhalt, der hier hinzugefügt wird, wird am Ende der <head> Sektion jeder Seite eingefügt. Diese kann praktisch sein, um CSS Styles anzupassen oder Analytics-Code hinzuzufügen.',
+    'app_custom_html' => 'Benutzerdefinierter HTML-Head-Inhalt',
+    'app_custom_html_desc' => 'Jeder Inhalt, der hier hinzugefügt wird, wird am Ende der <head>-Sektion jeder Seite eingefügt. Diese kann praktisch sein, um CSS-Styles anzupassen oder Analytics-Code hinzuzufügen.',
     'app_custom_html_disabled_notice' => 'Benutzerdefinierte HTML-Kopfzeileninhalte sind auf dieser Einstellungsseite deaktiviert, um sicherzustellen, dass alle Änderungen rückgängig gemacht werden können.',
     'app_logo' => 'Anwendungslogo',
     'app_logo_desc' => 'Dies wird unter anderem in der Kopfzeile der Anwendung verwendet. Dieses Bild sollte 86px hoch sein. Große Bilder werden herunterskaliert.',
@@ -76,34 +76,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Sortierung',
+    'sorting_book_default' => 'Standard-Buchsortierung',
+    'sorting_book_default_desc' => 'Wählen Sie die Standard-Sortierregel aus, die auf neue Bücher angewendet werden soll. Dies wirkt sich nicht auf bestehende Bücher aus und kann pro Buch überschrieben werden.',
+    'sorting_rules' => 'Sortierregeln',
+    'sorting_rules_desc' => 'Dies sind vordefinierte Sortieraktionen, die auf Inhalte im System angewendet werden können.',
+    'sort_rule_assigned_to_x_books' => ':count Buch zugewiesen|:count Büchern zugewiesen',
+    'sort_rule_create' => 'Sortierregel erstellen',
+    'sort_rule_edit' => 'Sortierregel bearbeiten',
+    'sort_rule_delete' => 'Sortierregel löschen',
+    'sort_rule_delete_desc' => 'Diese Sortierregel aus dem System entfernen. Bücher mit dieser Sortierung werden auf manuelle Sortierung zurückgesetzt.',
+    'sort_rule_delete_warn_books' => 'Diese Sortierregel wird derzeit in :count Bücher(n) verwendet. Sind Sie sicher, dass Sie dies löschen möchten?',
+    'sort_rule_delete_warn_default' => 'Diese Sortierregel wird derzeit als Standard für Bücher verwendet. Sind Sie sicher, dass Sie dies löschen möchten?',
+    'sort_rule_details' => 'Sortierregel-Details',
+    'sort_rule_details_desc' => 'Legen Sie einen Namen für diese Sortierregel fest, der in Listen erscheint, wenn Benutzer eine Sortierung auswählen.',
+    'sort_rule_operations' => 'Sortierungs-Aktionen',
+    'sort_rule_operations_desc' => 'Konfigurieren Sie die durchzuführenden Sortieraktionen durch Verschieben von der Liste der verfügbaren Aktionen. Bei der Verwendung werden die Aktionen von oben nach unten angewendet. Alle hier vorgenommenen Änderungen werden beim Speichern auf alle zugewiesenen Bücher angewendet.',
+    'sort_rule_available_operations' => 'Verfügbare Aktionen',
+    'sort_rule_available_operations_empty' => 'Keine verbleibenden Aktionen',
+    'sort_rule_configured_operations' => 'Konfigurierte Aktionen',
+    'sort_rule_configured_operations_empty' => 'Aktionen aus der Liste "Verfügbare Operationen" ziehen/hinzufügen',
+    'sort_rule_op_asc' => '(Aufst.)',
+    'sort_rule_op_desc' => '(Abst.)',
+    'sort_rule_op_name' => 'Name - Alphabetisch',
+    'sort_rule_op_name_numeric' => 'Name - Numerisch',
+    'sort_rule_op_created_date' => 'Erstellungsdatum',
+    'sort_rule_op_updated_date' => 'Aktualisierungsdatum',
+    'sort_rule_op_chapters_first' => 'Kapitel zuerst',
+    'sort_rule_op_chapters_last' => 'Kapitel zuletzt',
 
     // Maintenance settings
     'maint' => 'Wartung',
@@ -114,11 +114,11 @@
     'maint_image_cleanup_warning' => ':count eventuell unbenutze Bilder wurden gefunden. Möchten Sie diese Bilder löschen?',
     'maint_image_cleanup_success' => ':count eventuell unbenutze Bilder wurden gefunden und gelöscht.',
     'maint_image_cleanup_nothing_found' => 'Keine unbenutzen Bilder gefunden. Nichts zu löschen!',
-    'maint_send_test_email' => 'Test Email versenden',
-    'maint_send_test_email_desc' => 'Dies sendet eine Test E-Mail an Ihre in Ihrem Profil angegebene E-Mail-Adresse.',
-    'maint_send_test_email_run' => 'Sende eine Test E-Mail',
+    'maint_send_test_email' => 'Eine Test-E-Mail versenden',
+    'maint_send_test_email_desc' => 'Dies sendet eine Test-E-Mail an Ihre in Ihrem Profil angegebene E-Mail-Adresse.',
+    'maint_send_test_email_run' => 'Test-E-Mail senden',
     'maint_send_test_email_success' => 'E-Mail wurde an :address gesendet',
-    'maint_send_test_email_mail_subject' => 'Test E-Mail',
+    'maint_send_test_email_mail_subject' => 'Test-E-Mail',
     'maint_send_test_email_mail_greeting' => 'E-Mail-Versand scheint zu funktionieren!',
     'maint_send_test_email_mail_text' => 'Glückwunsch! Da Sie diese E-Mail Benachrichtigung erhalten haben, scheinen Ihre E-Mail-Einstellungen korrekt konfiguriert zu sein.',
     'maint_recycle_bin_desc' => 'Gelöschte Regale, Bücher, Kapitel & Seiten werden in den Papierkorb verschoben, so dass sie wiederhergestellt oder dauerhaft gelöscht werden können. Ältere Gegenstände im Papierkorb können, in Abhängigkeit von der Systemkonfiguration, nach einer Weile automatisch entfernt werden.',
@@ -159,7 +159,7 @@
     'audit_table_user' => 'Benutzer',
     'audit_table_event' => 'Ereignis',
     'audit_table_related' => 'Verknüpftes Element oder Detail',
-    'audit_table_ip' => 'IP Adresse',
+    'audit_table_ip' => 'IP-Adresse',
     'audit_table_date' => 'Aktivitätsdatum',
     'audit_date_from' => 'Zeitraum von',
     'audit_date_to' => 'Zeitraum bis',
diff --git a/lang/de/validation.php b/lang/de/validation.php
index 10961eb7fb2..2ffad05298e 100644
--- a/lang/de/validation.php
+++ b/lang/de/validation.php
@@ -9,7 +9,7 @@
 
     // Standard laravel validation lines
     'accepted'             => ':attribute muss akzeptiert werden.',
-    'active_url'           => ':attribute ist keine valide URL.',
+    'active_url'           => ':attribute ist keine gültige URL.',
     'after'                => ':attribute muss ein Datum nach :date sein.',
     'alpha'                => ':attribute kann nur Buchstaben enthalten.',
     'alpha_dash'           => ':attribute kann nur Buchstaben, Zahlen und Bindestriche enthalten.',
@@ -25,12 +25,12 @@
     ],
     'boolean'              => ':attribute Feld muss wahr oder falsch sein.',
     'confirmed'            => ':attribute stimmt nicht überein.',
-    'date'                 => ':attribute ist kein valides Datum.',
+    'date'                 => ':attribute ist kein gültiges Datum.',
     'date_format'          => ':attribute entspricht nicht dem Format :format.',
     'different'            => ':attribute und :other müssen unterschiedlich sein.',
     'digits'               => ':attribute muss :digits Stellen haben.',
     'digits_between'       => ':attribute muss zwischen :min und :max Stellen haben.',
-    'email'                => ':attribute muss eine valide E-Mail-Adresse sein.',
+    'email'                => ':attribute muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => ':attribute muss mit einem der folgenden Werte: :values enden',
     'file'                 => ':attribute muss als gültige Datei angegeben werden.',
     'filled'               => ':attribute ist erforderlich.',
@@ -51,8 +51,8 @@
     'image_extension'      => ':attribute muss eine gültige und unterstützte Bild-Dateiendung haben.',
     'in'                   => ':attribute ist ungültig.',
     'integer'              => ':attribute muss eine Zahl sein.',
-    'ip'                   => ':attribute muss eine valide IP-Adresse sein.',
-    'ipv4'                 => ':attribute muss eine gültige IPv4 Adresse sein.',
+    'ip'                   => ':attribute muss eine gültige IP-Adresse sein.',
+    'ipv4'                 => ':attribute muss eine gültige IPv4-Adresse sein.',
     'ipv6'                 => ':attribute muss eine gültige IPv6-Adresse sein.',
     'json'                 => 'Das Attribut muss eine gültige JSON-Zeichenfolge sein.',
     'lt'                   => [
@@ -80,8 +80,8 @@
         'string'  => ':attribute muss mindestens :min Zeichen lang sein.',
         'array'   => ':attribute muss mindesten :min Elemente enthalten.',
     ],
-    'not_in'               => ':attribute ist ungültig.',
-    'not_regex'            => ':attribute ist kein valides Format.',
+    'not_in'               => 'Das ausgewählte :attribute ist ungültig.',
+    'not_regex'            => ':attribute ist kein gültiges Format.',
     'numeric'              => ':attribute muss eine Zahl sein.',
     'regex'                => ':attribute ist in einem ungültigen Format.',
     'required'             => ':attribute ist erforderlich.',
@@ -99,10 +99,10 @@
         'array'   => ':attribute muss :size Elemente enthalten.',
     ],
     'string'               => ':attribute muss eine Zeichenkette sein.',
-    'timezone'             => ':attribute muss eine valide zeitzone sein.',
+    'timezone'             => ':attribute muss eine gültige Zeitzone sein.',
     'totp'                 => 'Der angegebene Code ist ungültig oder abgelaufen.',
     'unique'               => ':attribute wird bereits verwendet.',
-    'url'                  => ':attribute ist kein valides Format.',
+    'url'                  => ':attribute ist kein gültiges Format.',
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
     'zip_file' => ':attribute muss eine Datei innerhalb des ZIP referenzieren.',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index 3ebd8dfd2c1..990bfa0bc56 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -6,51 +6,51 @@
 return [
 
     // Pages
-    'page_create'                 => 'erstellt Seite',
+    'page_create'                 => 'erstellte Seite',
     'page_create_notification'    => 'Seite erfolgreich erstellt',
-    'page_update'                 => 'Seite aktualisiert',
+    'page_update'                 => 'aktualisierte Seite',
     'page_update_notification'    => 'Seite erfolgreich aktualisiert',
-    'page_delete'                 => 'Seite gelöscht',
+    'page_delete'                 => 'löschte Seite',
     'page_delete_notification'    => 'Seite erfolgreich gelöscht',
-    'page_restore'                => 'Seite wiederhergestellt',
+    'page_restore'                => 'stellte Seite wieder her',
     'page_restore_notification'   => 'Seite erfolgreich wiederhergestellt',
-    'page_move'                   => 'Seite verschoben',
+    'page_move'                   => 'verschob Seite',
     'page_move_notification'      => 'Seite erfolgreich verschoben',
 
     // Chapters
-    'chapter_create'              => 'Kapitel erstellt',
+    'chapter_create'              => 'erstellte Kapitel',
     'chapter_create_notification' => 'Kapitel erfolgreich erstellt',
-    'chapter_update'              => 'Kapitel aktualisiert',
+    'chapter_update'              => 'aktualisierte Kapitel',
     'chapter_update_notification' => 'Kapitel erfolgreich aktualisiert',
-    'chapter_delete'              => 'Kapitel gelöscht',
+    'chapter_delete'              => 'löschte Kapitel',
     'chapter_delete_notification' => 'Kapitel erfolgreich gelöscht',
-    'chapter_move'                => 'Kapitel verschoben',
+    'chapter_move'                => 'verschob Kapitel',
     'chapter_move_notification' => 'Kapitel erfolgreich verschoben',
 
     // Books
-    'book_create'                 => 'Buch erstellt',
+    'book_create'                 => 'erstellte Buch',
     'book_create_notification'    => 'Buch erfolgreich erstellt',
-    'book_create_from_chapter'              => 'Kapitel zu Buch umgewandelt',
+    'book_create_from_chapter'              => 'wandelte Kapitel zu Buch um',
     'book_create_from_chapter_notification' => 'Kapitel erfolgreich in ein Buch umgewandelt',
-    'book_update'                 => 'Buch aktualisiert',
+    'book_update'                 => 'aktualisierte Buch',
     'book_update_notification'    => 'Buch erfolgreich aktualisiert',
-    'book_delete'                 => 'Buch gelöscht',
+    'book_delete'                 => 'löschte Buch',
     'book_delete_notification'    => 'Buch erfolgreich gelöscht',
-    'book_sort'                   => 'Buch sortiert',
+    'book_sort'                   => 'sortierte Buch',
     'book_sort_notification'      => 'Buch erfolgreich umsortiert',
 
     // Bookshelves
-    'bookshelf_create'            => 'Regal erstellt',
+    'bookshelf_create'            => 'erstellte Regal',
     'bookshelf_create_notification'    => 'Regal erfolgreich erstellt',
-    'bookshelf_create_from_book'    => 'Buch zu Regal umgewandelt',
+    'bookshelf_create_from_book'    => 'wandelte Buch zu Regal um',
     'bookshelf_create_from_book_notification'    => 'Buch erfolgreich zu einem Regal umgewandelt',
-    'bookshelf_update'                 => 'Regal aktualisiert',
+    'bookshelf_update'                 => 'aktualisierte Regal',
     'bookshelf_update_notification'    => 'Regal erfolgreich aktualisiert',
-    'bookshelf_delete'                 => 'Regal gelöscht',
+    'bookshelf_delete'                 => 'löschte Regal',
     'bookshelf_delete_notification'    => 'Regal erfolgreich gelöscht',
 
     // Revisions
-    'revision_restore' => 'Revision wiederhergestellt',
+    'revision_restore' => 'stellte Revision wieder her',
     'revision_delete' => 'Revision gelöscht',
     'revision_delete_notification' => 'Revision erfolgreich gelöscht',
 
@@ -128,12 +128,12 @@
     'comment_delete'              => 'Kommentar gelöscht',
 
     // Sort Rules
-    'sort_rule_create' => 'Sortierregel erstellt',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'hat eine Sortierregel erstellt',
+    'sort_rule_create_notification' => 'Sortierregel erfolgreich angelegt',
+    'sort_rule_update' => 'hat eine Sortierregel aktualisiert',
+    'sort_rule_update_notification' => 'Sortierregel erfolgreich aktualisiert',
+    'sort_rule_delete' => 'hat eine Sortierregel gelöscht',
+    'sort_rule_delete_notification' => 'Sortierregel erfolgreich gelöscht',
 
     // Other
     'permissions_update'          => 'aktualisierte Berechtigungen',
diff --git a/lang/de_informal/auth.php b/lang/de_informal/auth.php
index 779726f4bbe..17dcdbcb26f 100644
--- a/lang/de_informal/auth.php
+++ b/lang/de_informal/auth.php
@@ -33,7 +33,7 @@
     'social_registration_text' => 'Mit einem dieser Dienste registrieren oder anmelden',
 
     'register_thanks' => 'Vielen Dank für deine Registrierung!',
-    'register_confirm' => 'Bitte prüfe deinen Posteingang und bestätige die Registrierung.',
+    'register_confirm' => 'Bitte prüfe deinen Posteingang und bestätige die Registrierung, um :appName nutzen zu können.',
     'registrations_disabled' => 'Eine Registrierung ist momentan nicht möglich',
     'registration_email_domain_invalid' => 'Du kannst dich mit dieser E-Mail nicht registrieren.',
     'register_success' => 'Vielen Dank für deine Registrierung! Du bist jetzt registriert und eingeloggt.',
@@ -82,7 +82,7 @@
 
     // Multi-factor Authentication
     'mfa_setup' => 'Multi-Faktor-Authentifizierung einrichten',
-    'mfa_setup_desc' => 'Richte eine Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für dein Benutzerkonto ein.',
+    'mfa_setup_desc' => 'Richte Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für dein Benutzerkonto ein.',
     'mfa_setup_configured' => 'Bereits konfiguriert',
     'mfa_setup_reconfigure' => 'Umkonfigurieren',
     'mfa_setup_remove_confirmation' => 'Bist du sicher, dass du diese Multi-Faktor-Authentifizierungsmethode entfernen möchtest?',
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 0567ed6c27e..3d6e24a230a 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Abbrechen',
     'save' => 'Speichern',
     'close' => 'Schließen',
-    'apply' => 'Apply',
+    'apply' => 'Übernehmen',
     'undo' => 'Rückgängig machen',
     'redo' => 'Wiederholen',
     'left' => 'Links',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Anzuzeigender Text',
     'title' => 'Titel',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Links durchsuchen',
     'open_link' => 'Link öffnen',
     'open_link_in' => 'Link öffnen in...',
     'open_link_current' => 'Aktuellem Fenster',
@@ -163,7 +163,7 @@
 
     // About view
     'about' => 'Über den Editor',
-    'about_title' => 'Über den WYSIWYG Editor',
+    'about_title' => 'Über den WYSIWYG-Editor',
     'editor_license' => 'Editorlizenz & Copyright',
     'editor_lexical_license' => 'Dieser Editor wurde mithilfe von :lexicalLink erstellt, der unter der MIT-Lizenz bereitgestellt wird.',
     'editor_lexical_license_link' => 'Vollständige Lizenzdetails findest du hier.',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 08f2b2927b8..9891bcb67e9 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -40,8 +40,8 @@
     'export_text' => 'Textdatei',
     'export_md' => 'Markdown-Datei',
     'export_zip' => 'Portable ZIP',
-    'default_template' => 'Standard Seitenvorlage',
-    'default_template_explain' => 'Zuweisen einer Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt wurden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Zugriff auf die ausgewählte Vorlagen-Seite hat.',
+    'default_template' => 'Standard-Seitenvorlage',
+    'default_template_explain' => 'Bestimme eine Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt werden. Beachte, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Lesezugriff auf die ausgewählte Vorlagen-Seite hat.',
     'default_template_select' => 'Wähle eine Seitenvorlage',
     'import' => 'Importieren',
     'import_validate' => 'Import validieren',
@@ -87,7 +87,7 @@
     'search_terms' => 'Suchbegriffe',
     'search_content_type' => 'Inhaltstyp',
     'search_exact_matches' => 'Exakte Treffer',
-    'search_tags' => 'Nach Schlagwort suchen',
+    'search_tags' => 'Schlagwort-Suchen',
     'search_options' => 'Optionen',
     'search_viewed_by_me' => 'Schon von mir angesehen',
     'search_not_viewed_by_me' => 'Noch nicht von mir angesehen',
@@ -166,9 +166,9 @@
     'books_search_this' => 'Dieses Buch durchsuchen',
     'books_navigation' => 'Buchnavigation',
     'books_sort' => 'Buchinhalte sortieren',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt zu reorganisieren. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert. Optional kann eine automatische Sortierregel erstellt werden, um den Inhalt dieses Buches nach Änderungen automatisch zu sortieren.',
+    'books_sort_auto_sort' => 'Auto-Sortieroption',
+    'books_sort_auto_sort_active' => 'Automatische Sortierung aktiv: :sortName',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
@@ -243,12 +243,12 @@
     'pages_edit_delete_draft' => 'Entwurf löschen',
     'pages_edit_delete_draft_confirm' => 'Bist du sicher, dass du deinen Entwurf löschen möchtest? Alle deine Änderungen seit dem letzten vollständigen Speichern gehen verloren und der Editor wird mit dem letzten Speicherzustand aktualisiert, der kein Entwurf ist.',
     'pages_edit_discard_draft' => 'Entwurf verwerfen',
-    'pages_edit_switch_to_markdown' => 'Zum Markdown Editor wechseln',
-    'pages_edit_switch_to_markdown_clean' => '(Sauberer Inhalt)',
+    'pages_edit_switch_to_markdown' => 'Zum Markdown-Editor wechseln',
+    'pages_edit_switch_to_markdown_clean' => '(Gesäuberter Inhalt)',
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
-    'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG Editor wechseln',
-    'pages_edit_switch_to_new_wysiwyg' => 'Wechsel zum neuen WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testphase)',
+    'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
+    'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha-Testphase)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -332,7 +332,7 @@
     'tag' => 'Schlagwort',
     'tags' =>  'Schlagwörter',
     'tags_index_desc' => 'Tags können auf Inhalte im System angewendet werden, um eine flexible Form der Kategorisierung anzuwenden. Tags können sowohl einen Schlüssel als auch einen Wert haben, wobei der Wert optional ist. Einmal angewendet, können Inhalte unter Verwendung des Tag-Namens und Wertes abgefragt werden.',
-    'tag_name' =>  'Schlagwort Name',
+    'tag_name' =>  'Schlagwortname',
     'tag_value' => 'Inhalt (Optional)',
     'tags_explain' => "Füge Schlagwörter hinzu, um ihren Inhalt zu kategorisieren.\nDu kannst einen erklärenden Inhalt hinzufügen, um eine genauere Unterteilung vorzunehmen.",
     'tags_add' => 'Weiteres Schlagwort hinzufügen',
@@ -392,7 +392,7 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
-    'comment_placeholder' => 'Gib hier deine Kommentare ein (Markdown unterstützt)',
+    'comment_placeholder' => 'Gib hier deine Kommentare ein',
     'comment_count' => '{0} Keine Kommentare|{1} 1 Kommentar|[2,*] :count Kommentare',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
diff --git a/lang/de_informal/passwords.php b/lang/de_informal/passwords.php
index e3606760bee..862382379fd 100644
--- a/lang/de_informal/passwords.php
+++ b/lang/de_informal/passwords.php
@@ -8,7 +8,7 @@
 
     'password' => 'Passwörter müssen aus mindestens acht Zeichen bestehen und mit der eingegebenen Wiederholung übereinstimmen.',
     'user' => "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden.",
-    'token' => 'Der Token zum Zurücksetzen des Passworts für diese E-Mail-Adresse ist ungültig.',
+    'token' => 'Der Token zum Zurücksetzen des Passworts ist für diese E-Mail-Adresse ungültig.',
     'sent' => 'Wir haben dir einen Link zum Zurücksetzen des Passwortes per E-Mail geschickt!',
     'reset' => 'Dein Passwort wurde zurückgesetzt!',
 
diff --git a/lang/de_informal/preferences.php b/lang/de_informal/preferences.php
index 8211e2336bf..07b83a8da3a 100644
--- a/lang/de_informal/preferences.php
+++ b/lang/de_informal/preferences.php
@@ -35,12 +35,12 @@
     'auth_change_password_success' => 'Das Passwort wurde aktualisiert!',
 
     'profile' => 'Profildetails',
-    'profile_desc' => 'Verwalte die Details für dein Konto, welche dich gegenüber anderen Benutzern repräsentieren, zusätzlich zu den Details, die für die Kommunikation und die Personalisierung des Systems verwendet werden.',
+    'profile_desc' => 'Verwalte die Details deines Kontos, welches dich gegenüber anderen Benutzern repräsentiert, zusätzlich zu den Details, die für die Kommunikation und die Personalisierung des Systems genutzt werden.',
     'profile_view_public' => 'Öffentliches Profil anzeigen',
-    'profile_name_desc' => 'Konfiguriere deinen Anzeigenamen, der durch die Aktivität, die du durchführst, für andere Benutzer und deine eigenen Inhalte im System sichtbar ist.',
+    'profile_name_desc' => 'Konfiguriere deinen Anzeigenamen, der durch die Aktivität, die du ausführst, und die dir gehörenden Inhalte für andere Benutzer sichtbar ist.',
     'profile_email_desc' => 'Diese E-Mail wird für Benachrichtigungen und, je nach aktiver Systemauthentifizierung, den Systemzugriff verwendet.',
     'profile_email_no_permission' => 'Leider hast du nicht die Berechtigung, deine E-Mail-Adresse zu ändern. Wenn du diese ändern möchtest, wende dich bitte an deinen Administrator.',
-    'profile_avatar_desc' => 'Wähle ein Bild aus, dass anderen im System angezeigt wird, um dich zu repräsentieren. Idealerweise sollte dieses Bild quadratisch und etwa 256px breit und hoch sein.',
+    'profile_avatar_desc' => 'Wähle ein Bild aus, das anderen im System angezeigt wird, um dich zu repräsentieren. Idealerweise sollte dieses Bild quadratisch und etwa 256px breit und hoch sein.',
     'profile_admin_options' => 'Administratoroptionen',
     'profile_admin_options_desc' => 'Weitere Administrator-Optionen, wie zum Beispiel die Verwaltung von Rollenzuweisungen, findest du in deinem Benutzerkonto im Bereich "Einstellungen > Benutzer" der Anwendung.',
 
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index fe8e88b89c1..0b7b74c0d4a 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -24,12 +24,12 @@
     'app_public_access_toggle' => 'Öffentlichen Zugriff erlauben',
     'app_public_viewing' => 'Öffentliche Ansicht erlauben?',
     'app_secure_images' => 'Erhöhte Sicherheit für hochgeladene Bilder aktivieren?',
-    'app_secure_images_toggle' => 'Aktiviere Bild-Upload mit höherer Sicherheit',
-    'app_secure_images_desc' => 'Aus Leistungsgründen sind alle Bilder öffentlich sichtbar. Diese Option fügt zufällige, schwer zu erratene, Zeichenketten zu Bild-URLs hinzu. Stelle sicher, dass Verzeichnisindizes deaktiviert sind, um einen einfachen Zugriff zu verhindern.',
+    'app_secure_images_toggle' => 'Höhere Sicherheit für Bild-Uploads aktivieren',
+    'app_secure_images_desc' => 'Aus Leistungsgründen sind alle Bilder öffentlich sichtbar. Diese Option fügt zufällige, schwer zu erratende, Zeichenketten zu Bild-URLs hinzu. Stelle sicher, dass Verzeichnisindizes deaktiviert sind, um einen einfachen Zugriff zu verhindern.',
     'app_default_editor' => 'Standard Seiteneditor',
     'app_default_editor_desc' => 'Wähle aus, welcher Editor bei der Bearbeitung neuer Seiten standardmäßig verwendet werden soll. Dies kann auf Seitenebene außer Kraft gesetzt werden, sofern die Berechtigungen dies zulassen.',
-    'app_custom_html' => 'Benutzerdefinierter HTML <head> Inhalt',
-    'app_custom_html_desc' => 'Jeder Inhalt, der hier hinzugefügt wird, wird am Ende der <head> Sektion jeder Seite eingefügt. Diese kann praktisch sein, um CSS Styles anzupassen oder Analytics-Code hinzuzufügen.',
+    'app_custom_html' => 'Benutzerdefinierter HTML-Head-Inhalt',
+    'app_custom_html_desc' => 'Jeder Inhalt, der hier hinzugefügt wird, wird am Ende der <head>-Sektion jeder Seite eingefügt. Diese kann praktisch sein, um CSS-Styles anzupassen oder Analytics-Code hinzuzufügen.',
     'app_custom_html_disabled_notice' => 'Benutzerdefinierte HTML-Kopfzeileninhalte sind auf dieser Einstellungsseite deaktiviert, um sicherzustellen, dass alle Änderungen rückgängig gemacht werden können.',
     'app_logo' => 'Anwendungslogo',
     'app_logo_desc' => 'Dies wird unter anderem in der Kopfzeile der Anwendung verwendet. Dieses Bild sollte 86px hoch sein. Große Bilder werden herunterskaliert.',
@@ -76,34 +76,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Sortierung',
+    'sorting_book_default' => 'Standard-Buchsortierung',
+    'sorting_book_default_desc' => 'Wähle die Standard-Sortierregel aus, die auf neue Bücher angewendet werden soll. Dies wirkt sich nicht auf bestehende Bücher aus und kann pro Buch überschrieben werden.',
+    'sorting_rules' => 'Sortierregeln',
+    'sorting_rules_desc' => 'Dies sind vordefinierte Sortieraktionen, die auf Inhalte im System angewendet werden können.',
+    'sort_rule_assigned_to_x_books' => ':count Buch zugewiesen|:count Büchern zugewiesen',
+    'sort_rule_create' => 'Sortierregel erstellen',
+    'sort_rule_edit' => 'Sortierregel bearbeiten',
+    'sort_rule_delete' => 'Sortierregel löschen',
+    'sort_rule_delete_desc' => 'Diese Sortierregel aus dem System entfernen. Bücher mit dieser Sortierung werden auf manuelle Sortierung zurückgesetzt.',
+    'sort_rule_delete_warn_books' => 'Diese Sortierregel wird derzeit in :count Bücher(n) verwendet. Bist du sicher, dass du dies löschen möchtest?',
+    'sort_rule_delete_warn_default' => 'Diese Sortierregel wird derzeit als Standard für Bücher verwendet. Bist du sicher, dass du dies löschen möchtest?',
+    'sort_rule_details' => 'Sortierregel-Details',
+    'sort_rule_details_desc' => 'Lege einen Namen für diese Sortierregel fest, der in Listen erscheint, wenn Benutzer eine Sortierung auswählen.',
+    'sort_rule_operations' => 'Sortierungs-Aktionen',
+    'sort_rule_operations_desc' => 'Konfiguriere die durchzuführenden Sortieraktionen durch Verschieben von der Liste der verfügbaren Aktionen. Bei der Verwendung werden die Aktionen von oben nach unten angewendet. Alle hier vorgenommenen Änderungen werden beim Speichern auf alle zugewiesenen Bücher angewendet.',
+    'sort_rule_available_operations' => 'Verfügbare Aktionen',
+    'sort_rule_available_operations_empty' => 'Keine verbleibenden Aktionen',
+    'sort_rule_configured_operations' => 'Konfigurierte Aktionen',
+    'sort_rule_configured_operations_empty' => 'Aktionen aus der Liste "Verfügbare Operationen" ziehen/hinzufügen',
+    'sort_rule_op_asc' => '(Aufst.)',
+    'sort_rule_op_desc' => '(Abst.)',
+    'sort_rule_op_name' => 'Name - Alphabetisch',
+    'sort_rule_op_name_numeric' => 'Name - Numerisch',
+    'sort_rule_op_created_date' => 'Erstellungsdatum',
+    'sort_rule_op_updated_date' => 'Aktualisierungsdatum',
+    'sort_rule_op_chapters_first' => 'Kapitel zuerst',
+    'sort_rule_op_chapters_last' => 'Kapitel zuletzt',
 
     // Maintenance settings
     'maint' => 'Wartung',
@@ -114,11 +114,11 @@
     'maint_image_cleanup_warning' => ':count eventuell unbenutze Bilder wurden gefunden. Möchtest du diese Bilder löschen?',
     'maint_image_cleanup_success' => ':count eventuell unbenutze Bilder wurden gefunden und gelöscht.',
     'maint_image_cleanup_nothing_found' => 'Keine unbenutzen Bilder gefunden. Nichts zu löschen!',
-    'maint_send_test_email' => 'Test E-Mail versenden',
-    'maint_send_test_email_desc' => 'Dies sendet eine Test E-Mail an die in deinem Profil angegebene E-Mail-Adresse.',
-    'maint_send_test_email_run' => 'Sende eine Test E-Mail',
+    'maint_send_test_email' => 'Eine Test-E-Mail versenden',
+    'maint_send_test_email_desc' => 'Dies sendet eine Test-E-Mail an die in deinem Profil angegebene E-Mail-Adresse.',
+    'maint_send_test_email_run' => 'Test-E-Mail senden',
     'maint_send_test_email_success' => 'E-Mail wurde an :address gesendet',
-    'maint_send_test_email_mail_subject' => 'Test E-Mail',
+    'maint_send_test_email_mail_subject' => 'Test-E-Mail',
     'maint_send_test_email_mail_greeting' => 'E-Mail-Versand scheint zu funktionieren!',
     'maint_send_test_email_mail_text' => 'Glückwunsch! Da du diese E-Mail Benachrichtigung erhalten hast, scheinen deine E-Mail-Einstellungen korrekt konfiguriert zu sein.',
     'maint_recycle_bin_desc' => 'Gelöschte Regale, Bücher, Kapitel & Seiten werden in den Papierkorb verschoben, so dass sie wiederhergestellt oder dauerhaft gelöscht werden können. Ältere Einträge im Papierkorb können, in Abhängigkeit von der Systemkonfiguration, nach einer Weile automatisch entfernt werden.',
@@ -159,7 +159,7 @@
     'audit_table_user' => 'Benutzer',
     'audit_table_event' => 'Ereignis',
     'audit_table_related' => 'Verknüpfter Eintrag oder Detail',
-    'audit_table_ip' => 'IP Adresse',
+    'audit_table_ip' => 'IP-Adresse',
     'audit_table_date' => 'Aktivitätsdatum',
     'audit_date_from' => 'Zeitraum von',
     'audit_date_to' => 'Zeitraum bis',
@@ -257,7 +257,7 @@
     'users_api_tokens_expires' => 'Endet',
     'users_api_tokens_docs' => 'API Dokumentation',
     'users_mfa' => 'Multi-Faktor-Authentifizierung',
-    'users_mfa_desc' => 'Richte die Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für dein Benutzerkonto ein.',
+    'users_mfa_desc' => 'Richte Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für dein Benutzerkonto ein.',
     'users_mfa_x_methods' => ':count Methode konfiguriert|:count Methoden konfiguriert',
     'users_mfa_configure' => 'Methoden konfigurieren',
 
diff --git a/lang/de_informal/validation.php b/lang/de_informal/validation.php
index 0d26dfd298a..f7be5a016c3 100644
--- a/lang/de_informal/validation.php
+++ b/lang/de_informal/validation.php
@@ -9,7 +9,7 @@
 
     // Standard laravel validation lines
     'accepted'             => ':attribute muss akzeptiert werden.',
-    'active_url'           => ':attribute ist keine valide URL.',
+    'active_url'           => ':attribute ist keine gültige URL.',
     'after'                => ':attribute muss ein Datum nach :date sein.',
     'alpha'                => ':attribute kann nur Buchstaben enthalten.',
     'alpha_dash'           => ':attribute kann nur Buchstaben, Zahlen und Bindestriche enthalten.',
@@ -25,12 +25,12 @@
     ],
     'boolean'              => ':attribute Feld muss wahr oder falsch sein.',
     'confirmed'            => ':attribute stimmt nicht überein.',
-    'date'                 => ':attribute ist kein valides Datum.',
+    'date'                 => ':attribute ist kein gültiges Datum.',
     'date_format'          => ':attribute entspricht nicht dem Format :format.',
     'different'            => ':attribute und :other müssen unterschiedlich sein.',
     'digits'               => ':attribute muss :digits Stellen haben.',
     'digits_between'       => ':attribute muss zwischen :min und :max Stellen haben.',
-    'email'                => ':attribute muss eine valide E-Mail-Adresse sein.',
+    'email'                => ':attribute muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => ':attribute muss mit einem der folgenden Werte: :values enden',
     'file'                 => ':attribute muss als gültige Datei angegeben werden.',
     'filled'               => ':attribute ist erforderlich.',
@@ -51,8 +51,8 @@
     'image_extension'      => ':attribute muss eine gültige und unterstützte Bild-Dateiendung haben.',
     'in'                   => ':attribute ist ungültig.',
     'integer'              => ':attribute muss eine Zahl sein.',
-    'ip'                   => ':attribute muss eine valide IP-Adresse sein.',
-    'ipv4'                 => ':attribute muss eine gültige IPv4 Adresse sein.',
+    'ip'                   => ':attribute muss eine gültige IP-Adresse sein.',
+    'ipv4'                 => ':attribute muss eine gültige IPv4-Adresse sein.',
     'ipv6'                 => ':attribute muss eine gültige IPv6-Adresse sein.',
     'json'                 => ':attribute muss ein gültiger JSON-String sein.',
     'lt'                   => [
@@ -80,7 +80,7 @@
         'string'  => ':attribute muss mindestens :min Zeichen lang sein.',
         'array'   => ':attribute muss mindesten :min Elemente enthalten.',
     ],
-    'not_in'               => ':attribute ist ungültig.',
+    'not_in'               => 'Das ausgewählte :attribute ist ungültig.',
     'not_regex'            => ':attribute ist kein gültiges Format.',
     'numeric'              => ':attribute muss eine Zahl sein.',
     'regex'                => ':attribute ist in einem ungültigen Format.',
@@ -99,14 +99,14 @@
         'array'   => ':attribute muss :size Elemente enthalten.',
     ],
     'string'               => ':attribute muss eine Zeichenkette sein.',
-    'timezone'             => ':attribute muss eine valide zeitzone sein.',
+    'timezone'             => ':attribute muss eine gültige Zeitzone sein.',
     'totp'                 => 'Der angegebene Code ist ungültig oder abgelaufen.',
     'unique'               => ':attribute wird bereits verwendet.',
     'url'                  => ':attribute ist kein valides Format.',
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
     'zip_file' => ':attribute muss auf eine Datei innerhalb des ZIP verweisen.',
-    'zip_file_mime' => ':attribute muss auf eine Datei des Typs :validType verweisen, gefunden :foundType.',
+    'zip_file_mime' => ':attribute muss eine Datei des Typs :validType referenzieren, gefunden :foundType.',
     'zip_model_expected' => 'Datenobjekt erwartet, aber ":type" gefunden.',
     'zip_unique' => ':attribute muss für den Objekttyp innerhalb des ZIP eindeutig sein.',
 
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 6e47d2dfb7c..87b625ed7ab 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiilne sisu)',
     'pages_edit_switch_to_wysiwyg' => 'Kasuta WYSIWYG redaktorit',
     'pages_edit_switch_to_new_wysiwyg' => 'Kasuta uut tekstiredaktorit',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa-testimisel)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(alfatestimisel)',
     'pages_edit_set_changelog' => 'Muudatuste logi',
     'pages_edit_enter_changelog_desc' => 'Sisesta tehtud muudatuste lühikirjeldus',
     'pages_edit_enter_changelog' => 'Salvesta muudatuste logi',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 8f4f9939667..49e755fccf1 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'See e-posti aadress on juba seotud teise kasutajaga.',
-    'auth_pre_register_theme_prevention' => 'Etteantud detailidega kasutajakontot ei saadud registreerida',
+    'auth_pre_register_theme_prevention' => 'Etteantud detailidega kasutajakontot ei õnnestunud registreerida',
     'email_already_confirmed' => 'E-posti aadress on juba kinnitatud. Proovi sisse logida.',
     'email_confirmation_invalid' => 'Kinnituslink ei ole kehtiv või on seda juba kasutatud. Proovi uuesti registreeruda.',
     'email_confirmation_expired' => 'Kinnituslink on aegunud. Sulle saadeti aadressi kinnitamiseks uus e-kiri.',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ainsat administraatorit ei saa kustutada',
     'users_cannot_delete_guest' => 'Külaliskasutajat ei saa kustutada',
-    'users_could_not_send_invite' => 'Kasutajat ei saadud luua, kuna kutse e-kirja saatmine ebaõnnestus',
+    'users_could_not_send_invite' => 'Kasutajat ei õnnestunud luua, kuna kutse e-kirja saatmine ebaõnnestus',
 
     // Roles
     'role_cannot_be_edited' => 'Seda rolli ei saa muuta',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 8c26cbe9755..53d1b576a30 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -9,8 +9,8 @@
     // Common Messages
     'settings' => 'Pengaturan',
     'settings_save' => 'Simpan Pengaturan',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'Versi Sistem',
+    'categories' => 'Kategori',
 
     // App Settings
     'app_customization' => 'Kustomisasi',
@@ -26,15 +26,15 @@
     'app_secure_images' => 'Unggahan Gambar Keamanan Lebih Tinggi',
     'app_secure_images_toggle' => 'Aktifkan unggahan gambar dengan keamanan lebih tinggi',
     'app_secure_images_desc' => 'Untuk alasan performa, semua gambar bersifat publik. Opsi ini menambahkan string acak yang sulit ditebak di depan url gambar. Pastikan indeks direktori tidak diaktifkan untuk mencegah akses mudah.',
-    'app_default_editor' => 'Default Page Editor',
-    'app_default_editor_desc' => 'Select which editor will be used by default when editing new pages. This can be overridden at a page level where permissions allow.',
+    'app_default_editor' => 'Editor Halaman Default',
+    'app_default_editor_desc' => 'Pilih editor yang akan digunakan secara default saat mengedit halaman baru. Pengaturan ini dapat diganti di tingkat halaman di mana itu diizinkan.',
     'app_custom_html' => 'Kustom Konten HTML Head',
     'app_custom_html_desc' => 'Konten apa pun yang ditambahkan di sini akan dimasukkan ke bagian bawah <head> bagian dari setiap halaman. Ini berguna untuk mengganti gaya atau menambahkan kode analitik.',
     'app_custom_html_disabled_notice' => 'Kustom konten HTML Head dinonaktifkan pada halaman pengaturan ini untuk memastikan setiap perubahan yang mengganggu dapat dikembalikan.',
     'app_logo' => 'Logo Aplikasi',
-    'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
-    'app_icon' => 'Application Icon',
-    'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
+    'app_logo_desc' => 'Ini digunakan di bilah tajuk aplikasi, di antara area lainnya. Gambar ini harus memiliki tinggi 86px. Gambar besar akan diperkecil.',
+    'app_icon' => 'Ikon Aplikasi',
+    'app_icon_desc' => 'Ikon digunakan pada tab browser dan ikon-ikon pintasan. Berkas harus berupa gambar IMG persegi dengan ukuran 256px.',
     'app_homepage' => 'Beranda Aplikasi',
     'app_homepage_desc' => 'Pilih tampilan untuk ditampilkan di beranda alih-alih tampilan default. Izin halaman diabaikan untuk halaman yang dipilih.',
     'app_homepage_select' => 'Pilih halaman',
@@ -48,12 +48,12 @@
     'app_disable_comments_desc' => 'Menonaktifkan komentar di semua halaman dalam aplikasi. <br> Komentar yang ada tidak ditampilkan.',
 
     // Color settings
-    'color_scheme' => 'Application Color Scheme',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
-    'link_color' => 'Default Link Color',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'color_scheme' => 'Skema Warna Aplikasi',
+    'color_scheme_desc' => 'Atur warna-warna untuk digunakan dalam antar muka aplikasi. Warna-warna dapat diatur secara terpisah masing-masing untuk mode gelap dan terang agar sesuai dengan tema dan memastikan keterbacaan.',
+    'ui_colors_desc' => 'Atur warna primer aplikasi dan warna tautan default. Warna primer terutama digunakan untuk bilah tajuk, tombol, dan dekorasi antarmuka. Warna tautan default digunakan untuk tautan dan tindakan berbasis teks, baik dalam konten tertulis maupun dalam antarmuka aplikasi.',
+    'app_color' => 'Warna Utama',
+    'link_color' => 'Warna Tautan Default',
+    'content_colors_desc' => 'Tetapkan warna untuk semua elemen dalam hierarki organisasi halaman. Sebaiknya pilih warna dengan tingkat kecerahan yang mirip dengan warna default agar mudah dibaca.',
     'bookshelf_color' => 'Warna Rak',
     'book_color' => 'Warna Buku',
     'chapter_color' => 'Warna Bab',
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Tidak ada batasan yang ditetapkan',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Menyortir',
+    'sorting_book_default' => 'Penyortiran Buku Default',
+    'sorting_book_default_desc' => 'Pilih aturan sortir default yang akan diterapkan pada buku baru. Aturan ini tidak akan memengaruhi buku yang sudah ada, dan dapat diganti per buku.',
+    'sorting_rules' => 'Aturan Penyortiran',
+    'sorting_rules_desc' => 'Ini adalah operasi penyortiran yang telah ditetapkan sebelumnya yang dapat diterapkan pada konten dalam sistem.',
+    'sort_rule_assigned_to_x_books' => 'Dikaitkan ke :count Buku|Dikaitkan ke :count Buku',
+    'sort_rule_create' => 'Buat Aturan Penyortiran',
+    'sort_rule_edit' => 'Mengedit Aturan Penyortiran',
+    'sort_rule_delete' => 'Hapus Aturan Penyortiran',
+    'sort_rule_delete_desc' => 'Hapus aturan sortir ini dari sistem. Buku yang menggunakan sortir ini akan kembali ke sortir manual.',
+    'sort_rule_delete_warn_books' => 'Aturan sortir ini saat ini digunakan pada :count buku (banyak buku). Apakah Anda yakin ingin menghapus ini?',
+    'sort_rule_delete_warn_default' => 'Aturan sortir ini saat ini digunakan sebagai aturan baku untuk buku. Apakah Anda yakin ingin menghapusnya?',
+    'sort_rule_details' => 'Perincian Aturan Penyortiran',
+    'sort_rule_details_desc' => 'Tetapkan nama untuk aturan pengurutan ini, yang akan muncul dalam daftar saat pengguna memilih pengurutan.',
+    'sort_rule_operations' => 'Operasi Penyortiran',
+    'sort_rule_operations_desc' => 'Konfigurasikan tindakan sortir yang akan dilakukan dengan memindahkannya dari daftar operasi yang tersedia. Setelah digunakan, operasi akan diterapkan secara berurutan, dari atas ke bawah. Setiap perubahan yang dibuat di sini akan diterapkan ke semua buku yang ditetapkan setelah disimpan.',
+    'sort_rule_available_operations' => 'Operasi yang Tersedia',
+    'sort_rule_available_operations_empty' => 'Tidak ada operasi yang tersisa',
+    'sort_rule_configured_operations' => 'Operasi yang Sudah Dikonfigurasi',
+    'sort_rule_configured_operations_empty' => 'Seret/tambahkan operasi dari daftar "Operasi yang Tersedia"',
+    'sort_rule_op_asc' => '(Naik)',
+    'sort_rule_op_desc' => '(Turun)',
+    'sort_rule_op_name' => 'Nama - Alfabetis',
+    'sort_rule_op_name_numeric' => 'Nama - Numerik',
+    'sort_rule_op_created_date' => 'Tanggal Dibuat',
+    'sort_rule_op_updated_date' => 'Tanggal Pembaruan',
+    'sort_rule_op_chapters_first' => 'Bab di Urutan Pertama',
+    'sort_rule_op_chapters_last' => 'Bab di Urutan Terakhir',
 
     // Maintenance settings
     'maint' => 'Pemeliharaan',
@@ -122,10 +122,10 @@
     'maint_send_test_email_mail_text' => 'Selamat! Saat Anda menerima pemberitahuan email ini, pengaturan email Anda tampaknya telah dikonfigurasi dengan benar.',
     'maint_recycle_bin_desc' => 'Rak, buku, bab & halaman yang dihapus dikirim ke recycle bin sehingga dapat dipulihkan atau dihapus secara permanen. Item lama di recycle bin dapat dihapus secara otomatis setelah beberapa saat tergantung pada konfigurasi sistem.',
     'maint_recycle_bin_open' => 'Buka Tempat Sampah',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint_regen_references' => 'Perbarui Referensi',
+    'maint_regen_references_desc' => 'Tindakan ini akan membangun kembali indeks referensi lintas item dalam basis data. Hal ini biasanya ditangani secara otomatis, tetapi tindakan ini dapat berguna untuk mengindeks konten lama atau konten yang ditambahkan melalui metode tidak resmi.',
+    'maint_regen_references_success' => 'Indeks referensi telah diperbarui!',
+    'maint_timeout_command_note' => 'Catatan: Tindakan ini memerlukan waktu untuk dijalankan, yang dapat menyebabkan masalah batas waktu di beberapa lingkungan web. Sebagai alternatif, tindakan ini dapat dilakukan menggunakan perintah terminal.',
 
     // Recycle Bin
     'recycle_bin' => 'Tempat Sampah',
@@ -139,7 +139,7 @@
     'recycle_bin_contents_empty' => 'Hapus Secara Permanen',
     'recycle_bin_empty' => 'Kosongkan Tempat Sampah',
     'recycle_bin_empty_confirm' => 'Ini akan menghancurkan secara permanen semua item di tempat sampah termasuk konten yang ada di dalam setiap item. Anda yakin ingin mengosongkan tempat sampah?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Tindakan ini akan menghapus item ini secara permanen dari sistem, beserta semua elemen turunan yang tercantum di bawah ini, dan Anda tidak akan dapat memulihkan konten ini. Apakah Anda yakin ingin menghapus item ini secara permanen?',
     'recycle_bin_destroy_list' => 'Item yang akan Dihancurkan',
     'recycle_bin_restore_list' => 'Item yang akan Dipulihkan',
     'recycle_bin_restore_confirm' => 'Tindakan ini akan memulihkan item yang dihapus, termasuk semua elemen anak, ke lokasi aslinya. Jika lokasi asli telah dihapus, dan sekarang berada di keranjang sampah, item induk juga perlu dipulihkan.',
@@ -158,7 +158,7 @@
     'audit_table_user' => 'Pengguna',
     'audit_table_event' => 'Peristiwa',
     'audit_table_related' => 'Item atau Detail Terkait',
-    'audit_table_ip' => 'IP Address',
+    'audit_table_ip' => 'Alamat IP',
     'audit_table_date' => 'Tanggal Kegiatan',
     'audit_date_from' => 'Rentang Tanggal Dari',
     'audit_date_to' => 'Rentang Tanggal Sampai',
@@ -166,11 +166,11 @@
     // Role Settings
     'roles' => 'Peran',
     'role_user_roles' => 'Peran Pengguna',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_index_desc' => 'Peran digunakan untuk mengelompokkan pengguna & memberikan izin sistem kepada anggotanya. Jika pengguna menjadi anggota beberapa peran, hak istimewa yang diberikan akan bertumpuk dan pengguna akan mewarisi semua kemampuan.',
+    'roles_x_users_assigned' => ':count pengguna yang ditetapkan|:count pengguna-pengguna yang ditetapkan',
+    'roles_x_permissions_provided' => ':count izin|:count izin-izin',
+    'roles_assigned_users' => 'Pengguna yang Ditetapkan',
+    'roles_permissions_provided' => 'Izin yang diberikan',
     'role_create' => 'Buat Peran Baru',
     'role_delete' => 'Hapus Peran',
     'role_delete_confirm' => 'Ini akan menghapus peran dengan nama \':roleName\'.',
@@ -181,7 +181,7 @@
     'role_details' => 'Detail Peran',
     'role_name' => 'Nama peran',
     'role_desc' => 'Deskripsi Singkat Peran',
-    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_mfa_enforced' => 'Membutuhkan Otentikasi Multi Faktor',
     'role_external_auth_id' => 'Otentikasi Eksternal IDs',
     'role_system' => 'Izin Sistem',
     'role_manage_users' => 'Kelola pengguna',
@@ -191,10 +191,10 @@
     'role_manage_page_templates' => 'Kelola template halaman',
     'role_access_api' => 'Akses Sistem API',
     'role_manage_settings' => 'Kelola setelan aplikasi',
-    'role_export_content' => 'Export content',
-    'role_import_content' => 'Import content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_export_content' => 'Ekspor konten',
+    'role_import_content' => 'Impor Konten',
+    'role_editor_change' => 'Ubah editor halaman',
+    'role_notifications' => 'Terima dan kelola notifikasi',
     'role_asset' => 'Izin Aset',
     'roles_system_warning' => 'Ketahuilah bahwa akses ke salah satu dari tiga izin di atas dapat memungkinkan pengguna untuk mengubah hak mereka sendiri atau orang lain dalam sistem. Hanya tetapkan peran dengan izin ini untuk pengguna tepercaya.',
     'role_asset_desc' => 'Izin ini mengontrol akses default ke aset dalam sistem. Izin pada Buku, Bab, dan Halaman akan menggantikan izin ini.',
@@ -245,8 +245,8 @@
     'users_social_accounts_info' => 'Di sini Anda dapat menghubungkan akun Anda yang lain untuk login yang lebih cepat dan mudah. Memutuskan akun di sini tidak mencabut akses resmi sebelumnya. Cabut akses dari pengaturan profil Anda pada akun sosial yang terhubung.',
     'users_social_connect' => 'Hubungkan Akun',
     'users_social_disconnect' => 'Putuskan Sambungan Akun',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Terhubung',
+    'users_social_status_disconnected' => 'Terputus',
     'users_social_connected' => ':socialAccount akun berhasil dilampirkan ke profil Anda.',
     'users_social_disconnected' => ':socialAccount akun berhasil diputuskan dari profil Anda.',
     'users_api_tokens' => 'Token API',
@@ -255,7 +255,7 @@
     'users_api_tokens_create' => 'Buat Token',
     'users_api_tokens_expires' => 'Kedaluwarsa',
     'users_api_tokens_docs' => 'Dokumentasi API',
-    'users_mfa' => 'Multi-Factor Authentication',
+    'users_mfa' => 'Otentikasi Multi Faktor',
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
@@ -310,11 +310,11 @@
     // Licensing
     'licenses' => 'Licenses',
     'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses_bookstack' => 'Lisensi BookStack',
+    'licenses_php' => 'Lisensi Pustaka PHP',
+    'licenses_js' => 'Lisensi Pustaka JavaScript',
+    'licenses_other' => 'Lisensi Lainnya',
+    'license_details' => 'Perincian Lisensi',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/id/validation.php b/lang/id/validation.php
index d922113d984..d5ccb27093c 100644
--- a/lang/id/validation.php
+++ b/lang/id/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute format tidak valid.',
     'uploaded'             => 'Berkas tidak dapat diunggah. Server mungkin tidak menerima berkas dengan ukuran ini.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute perlu merujuk ke sebuah file yang terdapat di dalam arsip ZIP.',
+    'zip_file_mime' => ':attribute seharusnya berupa file dengan tipe :validTypes, tapi yang Anda unggah bertipe :foundType.',
+    'zip_model_expected' => 'Diharapkan sebuah objek data, namun yang ditemukan adalah \':type\'.',
+    'zip_unique' => ':attribute harus bersifat unik untuk setiap jenis objek dalam file ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index d56584e6cab..ea4035a275c 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -68,8 +68,8 @@
     'insert_horizontal_line' => 'Insert horizontal line',
     'insert_code_block' => 'Inserir/editar bloco de código',
     'edit_code_block' => 'Editar bloco de código',
-    'insert_drawing' => 'Inserir/editar desenho',
-    'drawing_manager' => 'Gerente de desenho',
+    'insert_drawing' => 'Inserir/editar diagrama',
+    'drawing_manager' => 'Gerenciador de diagramas',
     'insert_media' => 'Inserir/editar mídia',
     'insert_media_title' => 'Inserir/Editar Mídia',
     'clear_formatting' => 'Limpar formatação',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 37350e67705..ba536808e2c 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -265,11 +265,11 @@
     'pages_md_preview' => 'Pré-Visualização',
     'pages_md_insert_image' => 'Inserir Imagem',
     'pages_md_insert_link' => 'Inserir Link para Entidade',
-    'pages_md_insert_drawing' => 'Inserir Desenho',
+    'pages_md_insert_drawing' => 'Inserir Diagrama',
     'pages_md_show_preview' => 'Mostrar pré-visualização',
     'pages_md_sync_scroll' => 'Sincronizar pré-visualização',
-    'pages_drawing_unsaved' => 'Desenho não-salvo encontrado',
-    'pages_drawing_unsaved_confirm' => 'Foram encontrados dados não-salvos de uma tentativa anterior de salvar o desenho. Você gostaria de restaurá-los e continuar editando este desenho?',
+    'pages_drawing_unsaved' => 'Diagrama não-salvo encontrado',
+    'pages_drawing_unsaved_confirm' => 'Foram encontrados dados não-salvos de uma tentativa anterior de salvar o diagrama. Você gostaria de restaurá-los e continuar editando este diagrama?',
     'pages_not_in_chapter' => 'Página não está dentro de um capítulo',
     'pages_move' => 'Mover Página',
     'pages_copy' => 'Copiar Página',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index d99d871f10b..8dab893c799 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -54,7 +54,7 @@
     'image_upload_memory_limit' => 'Falha ao processar o ‘upload’ de imagem e/ou criar miniaturas devido a limites de recursos do sistema.',
     'image_thumbnail_memory_limit' => 'Falha ao criar variações de tamanho de imagem devido a limites de recursos do sistema.',
     'image_gallery_thumbnail_memory_limit' => 'Falha ao criar miniaturas da galeria devido aos limites de recursos do sistema.',
-    'drawing_data_not_found' => 'Dados de desenho não puderam ser carregados. O arquivo de desenho pode não existir mais ou você não tenha permissão para acessá-lo.',
+    'drawing_data_not_found' => 'Dados de diagrama não puderam ser carregados. O arquivo do diagrama pode não existir mais ou você não tenha permissão para acessá-lo.',
 
     // Attachments
     'attachment_not_found' => 'Documento não encontrado',
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index eb5f4cb2896..3acf6d4ff8d 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook har tagits bort',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'import skapades',
+    'import_create_notification' => 'Import har laddats upp',
+    'import_run' => 'import uppdaterad',
+    'import_run_notification' => 'Innehållet har importerats',
+    'import_delete' => 'import borttagen',
+    'import_delete_notification' => 'Importen har tagits bort',
 
     // Users
     'user_create' => 'skapade användare',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'raderad kommentar',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'sorteringsregel skapad',
+    'sort_rule_create_notification' => 'Sorteringsregel har skapats',
+    'sort_rule_update' => 'sorteringsregel uppdaterad',
+    'sort_rule_update_notification' => 'Sorteringsregel har uppdaterats',
+    'sort_rule_delete' => 'sorteringsregel borttagen',
+    'sort_rule_delete_notification' => 'Sorteringsregel har tagits bort',
 
     // Other
     'permissions_update'          => 'uppdaterade behörigheter',
diff --git a/lang/sv/common.php b/lang/sv/common.php
index 8fe80899f0e..9ca2122dbb8 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Användarvillkor',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Sök :appName',
 ];
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index a35b5247e1a..a1e175ade04 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Avbryt',
     'save' => 'Spara',
     'close' => 'Stäng',
-    'apply' => 'Apply',
+    'apply' => 'Tillämpa',
     'undo' => 'Ångra',
     'redo' => 'Gör om',
     'left' => 'Vänster',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text som ska visas',
     'title' => 'Titel',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Bläddra bland länkar',
     'open_link' => 'Öppna länk',
     'open_link_in' => 'Öppna länk i...',
     'open_link_current' => 'Aktuellt fönster',
@@ -165,8 +165,8 @@
     'about' => 'Om redigeraren',
     'about_title' => 'Om WYSIWYG-redigeraren',
     'editor_license' => 'Licens och upphovsrätt för redigerare',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Denna editor är byggd som en fork av :lexicalLink som distribueras under MIT-licensen.',
+    'editor_lexical_license_link' => 'Fullständiga licensdetaljer hittas här.',
     'editor_tiny_license' => 'Denna redigerare är byggd med :tinyLink som tillhandahålls under MIT licensen.',
     'editor_tiny_license_link' => 'Upphovsrätten och licensuppgifterna för TinyMCE hittar du här.',
     'save_continue' => 'Spara sida & fortsätt',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 60e6c7fa72a..e13ff95add8 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF-fil',
     'export_text' => 'Textfil',
     'export_md' => 'Markdown-fil',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Portabel ZIP',
     'default_template' => 'Förvald sidmall',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'default_template_explain' => 'Tilldela en sidmall som kommer att användas som standardinnehåll för alla sidor som skapats inom detta objekt. Tänk på att detta endast kommer att användas om skaparen av sidan har tillgång till den valda mallsidan.',
+    'default_template_select' => 'Välj en sidmall',
+    'import' => 'Importera',
+    'import_validate' => 'Validera import',
+    'import_desc' => 'Importera böcker, kapitel och sidor med hjälp av en portabel ZIP-export från samma eller en annan instans. Välj en ZIP-fil för att fortsätta. Efter att filen har laddats upp och validerats kan du konfigurera och bekräfta importen i nästa vy.',
+    'import_zip_select' => 'Välj ZIP-fil att ladda upp',
+    'import_zip_validation_errors' => 'Fel upptäcktes vid validering av den angivna ZIP-filen:',
+    'import_pending' => 'Väntande importer',
+    'import_pending_none' => 'Ingen import har påbörjats.',
+    'import_continue' => 'Fortsätt import',
+    'import_continue_desc' => 'Granska innehållet som skall importeras från den uppladdade ZIP-filen. När du är redo, kör importen för att lägga till innehållet. Den uppladdade ZIP-baserade importfilen kommer automatiskt att tas bort vid lyckad import.',
+    'import_details' => 'Importdetaljer',
+    'import_run' => 'Kör import',
+    'import_size' => ':size ZIP-storlek',
+    'import_uploaded_at' => 'Uppladdad :relativeTime',
+    'import_uploaded_by' => 'Uppladdad av',
+    'import_location' => 'Importplats',
+    'import_location_desc' => 'Välj en målplats för ditt importerade innehåll. Du behöver relevanta behörigheter för att skapa på den plats du väljer.',
+    'import_delete_confirm' => 'Är du säker på att du vill ta bort denna import?',
+    'import_delete_desc' => 'Detta kommer att ta bort den uppladdade ZIP-baserade importfilen och kan inte ångras.',
+    'import_errors' => 'Importfel',
+    'import_errors_desc' => 'Följande fel inträffade under importförsöket:',
 
     // Permissions and restrictions
     'permissions' => 'Rättigheter',
@@ -130,7 +130,7 @@
     'shelves_permissions_updated' => 'Rättigheter för hylla uppdaterades',
     'shelves_permissions_active' => 'Rättigheter för hylla aktiverade',
     'shelves_permissions_cascade_warning' => 'Rättigheter för hyllor ärvs inte automatiskt ner till böckerna i hyllorna. Detta beror på att en bok kan finnas från flera hyllor. Rättigheter kan däremot kopieras ner till en bok i hyllan med hjälp av alternativet nedan.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_permissions_create' => 'Behörigheter för att skapa hyllor används endast för att kopiera behörigheter till underliggande böcker via åtgärden nedan. De styr inte möjligheten att skapa böcker.',
     'shelves_copy_permissions_to_books' => 'Kopiera rättigheter till böcker',
     'shelves_copy_permissions' => 'Kopiera rättigheter',
     'shelves_copy_permissions_explain' => 'Detta kommer att tillämpa rättigheterna från den här hyllan på alla böcker den innehåller. Se till att eventuella ändringar sparats innan tillämpningen genomförs.',
@@ -166,9 +166,9 @@
     'books_search_this' => 'Sök i boken',
     'books_navigation' => 'Navigering',
     'books_sort' => 'Sortera bokens innehåll',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Flytta kapitel och sidor inom en bok för att omorganisera dess innehåll. Andra böcker kan läggas till, vilket gör det enkelt att flytta kapitel och sidor mellan böcker. Du kan även ställa in en regel som automatiskt sorterar bokens innehåll vid ändringar.',
+    'books_sort_auto_sort' => 'Automatiskt sorteringsalternativ',
+    'books_sort_auto_sort_active' => 'Aktiv automatisk sorteringsregel: :sortName',
     'books_sort_named' => 'Sortera boken :bookName',
     'books_sort_name' => 'Sortera utifrån namn',
     'books_sort_created' => 'Sortera utifrån skapelse',
@@ -177,7 +177,7 @@
     'books_sort_chapters_last' => 'Kapitel sist',
     'books_sort_show_other' => 'Visa andra böcker',
     'books_sort_save' => 'Spara ordning',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
+    'books_sort_show_other_desc' => 'Lägg till andra böcker här för att inkludera dem i sorteringsåtgärden och möjliggöra enkel omorganisering mellan böcker.',
     'books_sort_move_up' => 'Flytta upp',
     'books_sort_move_down' => 'Flytta ned',
     'books_sort_move_prev_book' => 'Gå till förgående bok',
@@ -230,7 +230,7 @@
     'pages_delete_draft' => 'Ta bort utkast',
     'pages_delete_success' => 'Sidan har tagits bort',
     'pages_delete_draft_success' => 'Utkastet har tagits bort',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Denna sida används för närvarande som standardsidmall för en bok eller ett kapitel. Dessa böcker eller kapitel kommer inte längre ha någon tilldelad standardsidmall om sidan tas bort.',
     'pages_delete_confirm' => 'Är du säker på att du vill ta bort den här sidan?',
     'pages_delete_draft_confirm' => 'Är du säker på att du vill ta bort det här utkastet?',
     'pages_editing_named' => 'Redigerar sida :pageName',
@@ -241,14 +241,14 @@
     'pages_editing_page' => 'Redigerar sida',
     'pages_edit_draft_save_at' => 'Utkastet sparades ',
     'pages_edit_delete_draft' => 'Ta bort utkast',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'Är du säker på att du vill ta bort dina utkaständringar? Alla ändringar du gjort sedan den senaste fullständiga sparningen kommer att gå förlorade, och redigeraren kommer att uppdateras med det senaste icke-utkastet av sidan.',
     'pages_edit_discard_draft' => 'Ta bort utkastet',
     'pages_edit_switch_to_markdown' => 'Växla till Markdown-redigerare',
     'pages_edit_switch_to_markdown_clean' => '(Rent innehåll)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilt innehåll)',
     'pages_edit_switch_to_wysiwyg' => 'Växla till WYSIWYG-redigerare',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Växla till ny WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Under alfatestning)',
     'pages_edit_set_changelog' => 'Beskriv dina ändringar',
     'pages_edit_enter_changelog_desc' => 'Ange en kort beskrivning av de ändringar du har gjort',
     'pages_edit_enter_changelog' => 'Ändringslogg',
@@ -266,10 +266,10 @@
     'pages_md_insert_image' => 'Infoga bild',
     'pages_md_insert_link' => 'Infoga länk',
     'pages_md_insert_drawing' => 'Infoga teckning',
-    'pages_md_show_preview' => 'Show preview',
+    'pages_md_show_preview' => 'Visa förhandsgranskning',
     'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_drawing_unsaved' => 'Osparad ritning hittades',
+    'pages_drawing_unsaved_confirm' => 'Osparade ritningsdata hittades från ett tidigare misslyckat sparförsök. Vill du återställa och fortsätta redigera den osparade ritningen?',
     'pages_not_in_chapter' => 'Sidan ligger inte i något kapitel',
     'pages_move' => 'Flytta sida',
     'pages_copy' => 'Kopiera sida',
@@ -279,14 +279,14 @@
     'pages_permissions_success' => 'Rättigheterna för sidan har uppdaterats',
     'pages_revision' => 'Revidering',
     'pages_revisions' => 'Sidrevisioner',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => 'Nedan listas alla tidigare versioner av denna sida. Du kan granska, jämföra och återställa äldre versioner om du har behörighet. Den fullständiga versionshistoriken kanske inte visas i sin helhet här, eftersom äldre versioner kan ha raderats automatiskt beroende på systemets konfiguration.',
     'pages_revisions_named' => 'Sidrevisioner för :pageName',
     'pages_revision_named' => 'Sidrevision för :pageName',
     'pages_revision_restored_from' => 'Återställd från #:id; :summary',
     'pages_revisions_created_by' => 'Skapad av',
     'pages_revisions_date' => 'Revisionsdatum',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => 'Revisionsnummer',
     'pages_revisions_numbered' => 'Revisions #:id',
     'pages_revisions_numbered_changes' => 'Revision #:id ändringar',
     'pages_revisions_editor' => 'Typ av redigerare',
@@ -297,9 +297,9 @@
     'pages_revisions_restore' => 'Återställ',
     'pages_revisions_none' => 'Sidan har inga revisioner',
     'pages_copy_link' => 'Kopiera länk',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
+    'pages_edit_content_link' => 'Hoppa till sektionen i redigeraren',
+    'pages_pointer_enter_mode' => 'Ange markeringsläge för sektion',
+    'pages_pointer_label' => 'Alternativ för sidsektion',
     'pages_pointer_permalink' => 'Page Section Permalink',
     'pages_pointer_include_tag' => 'Page Section Include Tag',
     'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
@@ -318,20 +318,20 @@
         'time_b' => 'under de senaste :minCount minuterna',
         'message' => ':start :time. Var försiktiga så att ni inte skriver över varandras ändringar!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => 'Utkastet har tagits bort. Redigeringsverktyget har uppdaterats med aktuellt sidinnehåll',
+    'pages_draft_deleted' => 'Utkastet har raderats. Redigeringsverktyget har uppdaterats med aktuellt sidinnehåll',
     'pages_specific' => 'Specifik sida',
     'pages_is_template' => 'Sidmall',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Visa/Dölj sidopanel',
     'page_tags' => 'Sidtaggar',
     'chapter_tags' => 'Kapiteltaggar',
     'book_tags' => 'Boktaggar',
     'shelf_tags' => 'Hylltaggar',
     'tag' => 'Tagg',
     'tags' =>  'Taggar',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => 'Taggar kan användas på innehåll inom systemet för att skapa en flexibel form av kategorisering. Taggar kan ha både en nyckel och ett värde, där värdet är valfritt. När en tagg har tilldelats kan innehållet sökas fram med hjälp av taggens namn och värde.',
     'tag_name' =>  'Etikettnamn',
     'tag_value' => 'Taggvärde (Frivilligt)',
     'tags_explain' => "Lägg till taggar för att kategorisera ditt innehåll bättre. \n Du kan tilldela ett värde till en tagg för ännu bättre organisering.",
@@ -355,7 +355,7 @@
     'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
     'attachments_set_link' => 'Ange länk',
     'attachments_delete' => 'Är du säker på att du vill ta bort bilagan?',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'Släpp filer här för uppladdning',
     'attachments_no_files' => 'Inga filer har laddats upp',
     'attachments_explain_link' => 'Du kan bifoga en länk om du inte vill ladda upp en fil. Detta kan vara en länk till en annan sida eller till en fil i molnet.',
     'attachments_link_name' => 'Länknamn',
@@ -404,7 +404,7 @@
     'comment_updated_success' => 'Kommentaren har uppdaterats',
     'comment_delete_confirm' => 'Är du säker på att du vill ta bort den här kommentaren?',
     'comment_in_reply_to' => 'Som svar på :commentId',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_editor_explain' => 'Här är kommentarer som lämnats på denna sida. Kommentarer kan läggas till och hanteras när den sparade sidan visas.',
 
     // Revision
     'revision_delete_confirm' => 'Är du säker på att du vill radera den här versionen?',
@@ -438,20 +438,20 @@
 
     // Watch Options
     'watch' => 'Följ',
-    'watch_title_default' => 'Default Preferences',
+    'watch_title_default' => 'Standardinställningar',
     'watch_desc_default' => 'Revert watching to just your default notification preferences.',
     'watch_title_ignore' => 'Ignorera',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
+    'watch_desc_ignore' => 'Ignorera samtliga meddelanden, även sådana som styrs av användarens egna inställningar.',
     'watch_title_new' => 'Nya sidor',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
+    'watch_desc_new' => 'Meddela när en ny sida skapas inom detta objekt.',
+    'watch_title_updates' => 'Alla siduppdateringar',
+    'watch_desc_updates' => 'Meddela vid alla nya sidor och siduppdateringar.',
+    'watch_desc_updates_page' => 'Meddela alla siduppdateringar.',
     'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
+    'watch_desc_comments' => 'Meddela vid alla nya sidor, siduppdateringar och nya kommentarer.',
+    'watch_desc_comments_page' => 'Meddela vid siduppdateringar och nya kommentarer.',
+    'watch_change_default' => 'Ändra standardinställningar för meddelanden',
+    'watch_detail_ignore' => 'Ignorera meddelanden',
     'watch_detail_new' => 'Watching for new pages',
     'watch_detail_updates' => 'Watching new pages and updates',
     'watch_detail_comments' => 'Watching new pages, updates & comments',
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index 86ea215d02f..d65b7d0a013 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -53,7 +53,7 @@
     'image_upload_replace_type' => 'Image file replacements must be of the same type',
     'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
     'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'image_gallery_thumbnail_memory_limit' => 'Misslyckades att skapa galleriminiatyrer på grund av otillräckliga systemresurser.',
     'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
 
     // Attachments
@@ -106,16 +106,16 @@
     'back_soon' => 'Vi är snart tillbaka.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
+    'import_zip_cant_read' => 'Kunde inte läsa ZIP-filen.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_validation_failed' => 'ZIP-filen kunde inte valideras med fel:',
+    'import_zip_failed_notification' => 'Det gick inte att importera ZIP-fil.',
+    'import_perms_books' => 'Du saknar behörighet att skapa böcker.',
+    'import_perms_chapters' => 'Du saknar behörighet att skapa kapitel.',
+    'import_perms_pages' => 'Du saknar behörighet att skapa sidor.',
+    'import_perms_images' => 'Du saknar behörighet för att skapa bilder.',
+    'import_perms_attachments' => 'Du saknar behörighet att skapa bilagor.',
 
     // API errors
     'api_no_authorization_found' => 'Ingen auktoriseringstoken hittades på denna begäran',
@@ -129,5 +129,5 @@
     'maintenance_test_email_failure' => 'Ett fel uppstod när ett test mail skulle skickas:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'URL matchar inte de konfigurerade tillåtna SSR-värdarna',
 ];
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index f5b87786d7c..4af72c7f79a 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -53,7 +53,7 @@
     'ui_colors_desc' => 'Ange applikationens primära färg och standard färg för länkar. Den primära färgen används främst för huvudrubriken, knappar och gränssnitt dekorationer. Standardfärgen på länken används för textbaserade länkar och åtgärder, både inom skriftligt innehåll och i applikationsgränssnittet.',
     'app_color' => 'Primärfärg',
     'link_color' => 'Standardfärg för länkar',
-    'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
+    'content_colors_desc' => 'Ange färger för alla element i sidans organisationshierarki. Det rekommenderas att välja färger med liknande ljusstyrka som standardfärgerna för att bibehålla läsbarheten.',
     'bookshelf_color' => 'Hyllfärg',
     'book_color' => 'Bokfärg',
     'chapter_color' => 'Kapitelfärg',
@@ -75,19 +75,19 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begränsning inställd',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
+    'sorting' => 'Sorterar',
+    'sorting_book_default' => 'Standard boksortering',
+    'sorting_book_default_desc' => 'Välj standard sorteringsregel som skall tillämpas på nya böcker. Detta påverkar inte befintliga böcker och kan åsidosättas per bok.',
+    'sorting_rules' => 'Sorteringsregler',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
+    'sort_rule_assigned_to_x_books' => 'Tilldelad till :count bok|Tilldelad till :count böcker',
+    'sort_rule_create' => 'Skapa sorteringsregel',
+    'sort_rule_edit' => 'Redigera sorteringsregel',
+    'sort_rule_delete' => 'Ta bort sorteringsregel',
     'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
     'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
     'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
+    'sort_rule_details' => 'Detaljer för sorteringsregler',
     'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
     'sort_rule_operations' => 'Sort Operations',
     'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index fc076b510f0..e8b77e0d430 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Вебхуки успішно видалено',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'створений імпорт',
+    'import_create_notification' => 'Імпорт успішно завантажений',
+    'import_run' => 'оновлений імпорт',
+    'import_run_notification' => 'Контент успішно імпортовано',
+    'import_delete' => 'видалений імпорт',
+    'import_delete_notification' => 'Імпорт успішно видалено',
 
     // Users
     'user_create' => 'створений користувач',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'видалений коментар',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'створене правило сортування',
+    'sort_rule_create_notification' => 'Правило сортування успішно створено',
+    'sort_rule_update' => 'оновлено правило сортування',
+    'sort_rule_update_notification' => 'Правило сортування успішно оновлено',
+    'sort_rule_delete' => 'видалено правило сортування',
+    'sort_rule_delete_notification' => 'Правило сортування успішно видалено',
 
     // Other
     'permissions_update'          => 'оновив дозволи',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index e61d7f71967..f887b32031a 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Скасувати',
     'save' => 'Зберегти',
     'close' => 'Закрити',
-    'apply' => 'Apply',
+    'apply' => 'Застосувати',
     'undo' => 'Відмінити',
     'redo' => 'Відновити',
     'left' => 'Ліворуч',
@@ -148,7 +148,7 @@
     'url' => 'Адреса URL',
     'text_to_display' => 'Текст для показу',
     'title' => 'Назва',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Переглянути посилання',
     'open_link' => 'Відкрити посилання',
     'open_link_in' => 'Відкрити посилання в...',
     'open_link_current' => 'Поточне вікно',
@@ -165,8 +165,8 @@
     'about' => 'Про редактор',
     'about_title' => 'Про WYSIWYG редактор',
     'editor_license' => 'Ліцензія редактора і авторські права',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Цей редактор побудований як форк :lexicalLink який поширюється під ліцензією MIT.',
+    'editor_lexical_license_link' => 'Тут ви можете знайти повну інформацію про ліцензію.',
     'editor_tiny_license' => 'Цей редактор побудований за допомогою :tinylink, яке надається за ліцензією MIT.',
     'editor_tiny_license_link' => 'Тут можна знайти авторські та умови ліцензії.',
     'save_continue' => 'Зберегти і продовжити',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 753ceb72767..577fd129633 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовий файл',
     'export_md' => 'Файл розмітки',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Портативний ZIP',
     'default_template' => 'Типовий шаблон сторінки',
     'default_template_explain' => 'Призначити шаблон сторінки, який буде використовуватися як типовий вміст для всіх сторінок, створених у цьому елементі. Майте на увазі, що ця сторінка буде використана лише у випадку, якщо вона має доступ до обраної сторінки шаблону.',
     'default_template_select' => 'Виберіть сторінку шаблону',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Імпорт',
+    'import_validate' => 'Перевірка імпорту',
+    'import_desc' => 'Імпортувати книги, розділи і сторінки, використовуючи портативний zip-експорт з одного або іншого екземпляру. Виберіть ZIP-файл для продовження. Після завантаження файлу і підтвердження, ви зможете налаштувати та підтвердити імпорт в наступному вікні.',
+    'import_zip_select' => 'Виберіть ZIP-файл для завантаження',
+    'import_zip_validation_errors' => 'Під час перевірки вказаного ZIP-файлу були виявлені помилки:',
+    'import_pending' => 'Іпорт на розгляді',
+    'import_pending_none' => 'Імпорти не були розпочаті.',
+    'import_continue' => 'Продовжити імпорт',
+    'import_continue_desc' => 'Переглянути вміст через імпортування з завантаженого ZIP-файлу. Якщо готово, запустіть імпорт, щоб додати його вміст в цю систему. Завантажений ZIP файл імпорту буде автоматично вилучено при успішному імпорті.',
+    'import_details' => 'Імпортувати деталі',
+    'import_run' => 'Запустити імпорт',
+    'import_size' => ':size Розмір Імпорту ZIP',
+    'import_uploaded_at' => 'Завантажено :relativeTime',
+    'import_uploaded_by' => 'Завантажено',
+    'import_location' => 'Імпортувати місцезнаходження',
+    'import_location_desc' => 'Вибір цільового розташування для імпортованого вмісту. Вам потрібні відповідні дозволи для створення локації, яке ви обрали.',
+    'import_delete_confirm' => 'Ви впевнені, що бажаєте видалити цей імпорт?',
+    'import_delete_desc' => 'Це видалить завантажений імпорт файлу ZIP, і його не можна буде скасувати.',
+    'import_errors' => 'Помилки імпорту',
+    'import_errors_desc' => 'Під час спроби імпорту відбулися наступні помилки:',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
@@ -166,9 +166,9 @@
     'books_search_this' => 'Шукати цю книгу',
     'books_navigation' => 'Навігація по книзі',
     'books_sort' => 'Сортувати вміст книги',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Перекладіть розділи та сторінки в межах книги, щоб реорганізувати вміст. Інші книги можна додати, що дозволяє легко переміщати глави та сторінки між книгами. При необхідності правило автоматичного сортування може бути встановлено для автоматичного сортування вмісту цієї книги при змінах.',
+    'books_sort_auto_sort' => 'Опція автоматичного сортування',
+    'books_sort_auto_sort_active' => 'Автосортування : :sortName',
     'books_sort_named' => 'Сортувати книгу :bookName',
     'books_sort_name' => 'Сортувати за назвою',
     'books_sort_created' => 'Сортувати за датою створення',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index 5c8148fece2..eed61e8a027 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -106,16 +106,16 @@
     'back_soon' => 'Він повернеться найближчим часом.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Не вдалося прочитати ZIP-файл.',
+    'import_zip_cant_decode_data' => 'Не вдалося знайти і розшифрувати контент ZIP data.json.',
+    'import_zip_no_data' => 'ZIP-файл не містить очікуваної книги, глави або вмісту сторінки.',
+    'import_validation_failed' => 'Не вдалося виконати перевірку ZIP-адреси із помилками:',
+    'import_zip_failed_notification' => 'Не вдалося імпортувати ZIP-файл.',
+    'import_perms_books' => 'У Вас не вистачає необхідних прав для створення книг.',
+    'import_perms_chapters' => 'Вам не вистачає необхідних дозволів для створення розділів.',
+    'import_perms_pages' => 'У Вас немає необхідних прав для створення сторінок.',
+    'import_perms_images' => 'У Вас немає необхідних прав для створення зображень.',
+    'import_perms_attachments' => 'У Вас немає необхідних прав для створення вкладень.',
 
     // API errors
     'api_no_authorization_found' => 'У запиті не знайдено токен авторизації',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index 8670996aeff..5ab70d1ae69 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Не встановлено обмежень',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Сортування',
+    'sorting_book_default' => 'Типовий порядок сортування',
+    'sorting_book_default_desc' => 'Виберіть правило сортування за замовчуванням для застосування нових книг. Це не вплине на існуючі книги, і може бути перевизначено для кожної книги.',
+    'sorting_rules' => 'Сортувати правила',
+    'sorting_rules_desc' => 'Це попередньо визначені операції сортування, які можуть бути застосовані до вмісту в системі.',
+    'sort_rule_assigned_to_x_books' => 'Призначено :count книгу|Призначення на :count книг(и)',
+    'sort_rule_create' => 'Створити правило сортування',
+    'sort_rule_edit' => 'Змінити правило сортування',
+    'sort_rule_delete' => 'Видалити правило сортування',
+    'sort_rule_delete_desc' => 'Видалення даного правила сортування з системи. Книги за допомогою цього сортування будуть повернутися до ручного сортування.',
+    'sort_rule_delete_warn_books' => 'Це правило сортування використовується на :count книг(у,и). Ви впевнені, що хочете видалити це?',
+    'sort_rule_delete_warn_default' => 'Правило сортування в даний час використовується як правило за замовчуванням для книг. Ви впевнені, що хочете видалити це?',
+    'sort_rule_details' => 'Опис правил сортування',
+    'sort_rule_details_desc' => 'Вкажіть ім\'я для цього правила сортування, яке буде відображатися в списках при виборі сортування користувачем.',
+    'sort_rule_operations' => 'Операції сортування',
+    'sort_rule_operations_desc' => 'Налаштуйте дії, які слід виконати, переміщаючи їх зі списку доступних операцій. Після використання операцій буде застосовано відповідно до самого низу. Будь-які зміни, внесені сюди, будуть застосовані до всіх призначених книг при збереженні.',
+    'sort_rule_available_operations' => 'Доступні операції',
+    'sort_rule_available_operations_empty' => 'Не залишилось операцій',
+    'sort_rule_configured_operations' => 'Налаштовані операції',
+    'sort_rule_configured_operations_empty' => 'Перетягніть операції зі списку "Доступні операції"',
+    'sort_rule_op_asc' => '(За зростанням)',
+    'sort_rule_op_desc' => '(За спаданням)',
+    'sort_rule_op_name' => 'Назва - за алфавітом',
+    'sort_rule_op_name_numeric' => 'Назва - Числове',
+    'sort_rule_op_created_date' => 'Дата створення',
+    'sort_rule_op_updated_date' => 'Дата оновлення',
+    'sort_rule_op_chapters_first' => 'Спочатку розділи',
+    'sort_rule_op_chapters_last' => 'Розділи останні',
 
     // Maintenance settings
     'maint' => 'Обслуговування',
@@ -192,7 +192,7 @@
     'role_access_api' => 'Доступ до системного API',
     'role_manage_settings' => 'Керування налаштуваннями програми',
     'role_export_content' => 'Вміст експорту',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Імпортувати вміст',
     'role_editor_change' => 'Змінити редактор сторінок',
     'role_notifications' => 'Отримувати та керувати повідомленнями',
     'role_asset' => 'Дозволи',
diff --git a/lang/uk/validation.php b/lang/uk/validation.php
index ae31bb237aa..6161aba671a 100644
--- a/lang/uk/validation.php
+++ b/lang/uk/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'Формат поля :attribute неправильний.',
     'uploaded'             => 'Не вдалося завантажити файл. Сервер може не приймати файли такого розміру.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'Поле :attribute повинне вказувати файл в ZIP.',
+    'zip_file_mime' => 'Поле :attribute повинне посилатись на файл типу :validtypes, знайдений :foundType.',
+    'zip_model_expected' => 'Очікувався об’єкт даних, але знайдено ":type".',
+    'zip_unique' => 'Поле :attribute має бути унікальним для типу об\'єкта в ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index 15297c804e6..bc52b4ccc10 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -76,33 +76,33 @@
 
     // Sorting Settings
     'sorting' => '排序',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sorting_book_default' => '默认书卷排序',
+    'sorting_book_default_desc' => '选择要应用于新书的默认排序规则。这不会影响现有书，并且可以每本书覆盖。',
+    'sorting_rules' => '排序规则',
+    'sorting_rules_desc' => '这些是预定义的排序操作，可应用于系统中的内容。',
+    'sort_rule_assigned_to_x_books' => '分配给 :count Book|分配给 :count Books',
+    'sort_rule_create' => '创建排序规则',
+    'sort_rule_edit' => '编辑排序规则',
+    'sort_rule_delete' => '删除排序规则',
+    'sort_rule_delete_desc' => '从系统中删除这种排序规则。使用这种类型的书本将恢复到手动排序。',
+    'sort_rule_delete_warn_books' => '此排序规则目前用于:count book(s)。您确定要删除吗？',
+    'sort_rule_delete_warn_default' => '此排序规则目前被用作书籍的默认值。您确定要删除吗？',
+    'sort_rule_details' => '排序规则详细信息',
+    'sort_rule_details_desc' => '为此排序规则设置一个名称，当用户选择排序时，该名称将出现在列表中。',
+    'sort_rule_operations' => '排序选项',
+    'sort_rule_operations_desc' => '配置通过将它们从可用操作列表中移动来执行的排序操作。 一旦使用，操作将按顺序从上到下顺序进行。 这里所做的任何更改都将在保存时适用于所有分配的书本。',
+    'sort_rule_available_operations' => '可用操作',
+    'sort_rule_available_operations_empty' => '没有剩余操作',
+    'sort_rule_configured_operations' => '配置选项',
+    'sort_rule_configured_operations_empty' => '从“可用操作”列表中拖动/添加操作',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_name' => '名称-按字母顺序排序',
+    'sort_rule_op_name_numeric' => '名称-按数字顺序排序',
+    'sort_rule_op_created_date' => '创建时间',
+    'sort_rule_op_updated_date' => '更新时间',
+    'sort_rule_op_chapters_first' => '章节正序',
+    'sort_rule_op_chapters_last' => '章节倒序',
 
     // Maintenance settings
     'maint' => '维护',

From 295532fa7a58b640e67648f130e3ea356b85cba5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 May 2025 18:09:49 +0100
Subject: [PATCH 525/666] Deps: Updated PHP packages

---
 composer.lock | 409 +++++++++++++++++++++++++-------------------------
 1 file changed, 208 insertions(+), 201 deletions(-)

diff --git a/composer.lock b/composer.lock
index e3e592852c1..b3604dd471a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.342.18",
+            "version": "3.343.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e6c81bf323b082f8fe2b76d8d41e2614806d5892"
+                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e6c81bf323b082f8fe2b76d8d41e2614806d5892",
-                "reference": "e6c81bf323b082f8fe2b76d8d41e2614806d5892",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
+                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.342.18"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.3"
             },
-            "time": "2025-04-01T18:15:02+00:00"
+            "time": "2025-05-02T18:04:58+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -922,16 +922,16 @@
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.11.0",
+            "version": "v6.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
                 "shasum": ""
             },
             "require": {
@@ -979,9 +979,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
             },
-            "time": "2025-01-23T05:11:06+00:00"
+            "time": "2025-04-09T20:32:01+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1740,16 +1740,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.44.2",
+            "version": "v11.44.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
                 "shasum": ""
             },
             "require": {
@@ -1951,7 +1951,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-03-12T14:34:30+00:00"
+            "time": "2025-04-25T12:40:47+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2075,16 +2075,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.19.0",
+            "version": "v5.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "c40f843c5643fb6b089e46ce9794b8408bf08319"
+                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/c40f843c5643fb6b089e46ce9794b8408bf08319",
-                "reference": "c40f843c5643fb6b089e46ce9794b8408bf08319",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/30972c12a41f71abeb418bc9ff157da8d9231519",
+                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519",
                 "shasum": ""
             },
             "require": {
@@ -2143,7 +2143,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-03-27T17:26:42+00:00"
+            "time": "2025-04-21T14:21:34+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2213,16 +2213,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.6.1",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad"
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad",
-                "reference": "d990688c91cedfb69753ffc2512727ec646df2ad",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
                 "shasum": ""
             },
             "require": {
@@ -2259,7 +2259,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.7-dev"
+                    "dev-main": "2.8-dev"
                 }
             },
             "autoload": {
@@ -2316,7 +2316,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-29T14:10:59+00:00"
+            "time": "2025-05-05T12:20:28+00:00"
         },
         {
             "name": "league/config",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.9.0",
+            "version": "3.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d"
+                "reference": "ced71f79398ece168e24f7f7710462f462310d4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6d16a8a015166fe54e22c042e0805c5363aef50d",
-                "reference": "6d16a8a015166fe54e22c042e0805c5363aef50d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d",
+                "reference": "ced71f79398ece168e24f7f7710462f462310d4d",
                 "shasum": ""
             },
             "require": {
@@ -3387,7 +3387,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-27T12:57:33+00:00"
+            "time": "2025-05-01T19:51:51+00:00"
         },
         {
             "name": "nette/schema",
@@ -4102,16 +4102,16 @@
         },
         {
             "name": "predis/predis",
-            "version": "v2.3.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9"
+                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
-                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
+                "url": "https://api.github.com/repos/predis/predis/zipball/f49e13ee3a2a825631562aa0223ac922ec5d058b",
+                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b",
                 "shasum": ""
             },
             "require": {
@@ -4120,6 +4120,7 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.3",
                 "phpstan/phpstan": "^1.9",
+                "phpunit/phpcov": "^6.0 || ^8.0",
                 "phpunit/phpunit": "^8.0 || ^9.4"
             },
             "suggest": {
@@ -4142,7 +4143,7 @@
                     "role": "Maintainer"
                 }
             ],
-            "description": "A flexible and feature-complete Redis client for PHP.",
+            "description": "A flexible and feature-complete Redis/Valkey client for PHP.",
             "homepage": "http://github.com/predis/predis",
             "keywords": [
                 "nosql",
@@ -4151,7 +4152,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.3.0"
+                "source": "https://github.com/predis/predis/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -4159,7 +4160,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-21T20:00:02+00:00"
+            "time": "2025-04-30T15:16:02+00:00"
         },
         {
             "name": "psr/clock",
@@ -5189,16 +5190,16 @@
         },
         {
             "name": "socialiteproviders/okta",
-            "version": "4.4.0",
+            "version": "4.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Okta.git",
-                "reference": "5e47cd7b4c19da94ecafbd91fa430e4151c09806"
+                "reference": "b8b0d5ea72325ead82481524a48576aaf39356ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Okta/zipball/5e47cd7b4c19da94ecafbd91fa430e4151c09806",
-                "reference": "5e47cd7b4c19da94ecafbd91fa430e4151c09806",
+                "url": "https://api.github.com/repos/SocialiteProviders/Okta/zipball/b8b0d5ea72325ead82481524a48576aaf39356ed",
+                "reference": "b8b0d5ea72325ead82481524a48576aaf39356ed",
                 "shasum": ""
             },
             "require": {
@@ -5235,7 +5236,7 @@
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2023-12-12T01:59:17+00:00"
+            "time": "2024-11-07T21:57:40+00:00"
         },
         {
             "name": "socialiteproviders/twitch",
@@ -5488,16 +5489,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88"
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
                 "shasum": ""
             },
             "require": {
@@ -5561,7 +5562,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.5"
+                "source": "https://github.com/symfony/console/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -5577,7 +5578,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-12T08:11:12+00:00"
+            "time": "2025-04-07T19:09:28+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6008,16 +6009,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126"
+                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/371272aeb6286f8135e028ca535f8e4d6f114126",
-                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6023ec7607254c87c5e69fb3558255aca440d72b",
+                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b",
                 "shasum": ""
             },
             "require": {
@@ -6066,7 +6067,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.2.5"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -6082,20 +6083,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-25T15:54:33+00:00"
+            "time": "2025-04-09T08:14:01+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54"
+                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
-                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9dec01e6094a063e738f8945ef69c0cfcf792ec",
+                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec",
                 "shasum": ""
             },
             "require": {
@@ -6180,7 +6181,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -6196,20 +6197,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-28T13:32:50+00:00"
+            "time": "2025-05-02T09:04:03+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.4",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b"
+                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/87ca22046b78c3feaff04b337f33b38510fd686b",
-                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/706e65c72d402539a072d0d6ad105fff6c161ef1",
+                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1",
                 "shasum": ""
             },
             "require": {
@@ -6264,7 +6265,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.4"
+                "source": "https://github.com/symfony/mime/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -6280,11 +6281,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-19T08:51:20+00:00"
+            "time": "2025-04-27T13:34:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -6343,7 +6344,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6363,7 +6364,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -6421,7 +6422,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6441,16 +6442,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
-                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
                 "shasum": ""
             },
             "require": {
@@ -6504,7 +6505,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6520,11 +6521,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-09-10T14:38:51+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -6585,7 +6586,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6605,19 +6606,20 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
+                "ext-iconv": "*",
                 "php": ">=7.2"
             },
             "provide": {
@@ -6665,7 +6667,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6681,20 +6683,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
@@ -6745,7 +6747,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6761,11 +6763,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
@@ -6821,7 +6823,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -6841,7 +6843,7 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
@@ -6900,7 +6902,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -7145,16 +7147,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.0",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
                 "shasum": ""
             },
             "require": {
@@ -7212,7 +7214,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.0"
+                "source": "https://github.com/symfony/string/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7228,20 +7230,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:26+00:00"
+            "time": "2025-04-20T20:18:16+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.2.4",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a"
+                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a",
-                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
+                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
                 "shasum": ""
             },
             "require": {
@@ -7307,7 +7309,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.2.4"
+                "source": "https://github.com/symfony/translation/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7323,7 +7325,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-13T10:27:23+00:00"
+            "time": "2025-04-07T19:09:28+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7479,16 +7481,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.2.3",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a"
+                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82b478c69745d8878eb60f9a049a4d584996f73a",
-                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9c46038cd4ed68952166cf7001b54eb539184ccb",
+                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb",
                 "shasum": ""
             },
             "require": {
@@ -7542,7 +7544,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.2.3"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7558,7 +7560,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-17T11:39:41+00:00"
+            "time": "2025-04-09T08:14:01+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7617,16 +7619,16 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.1",
+            "version": "v5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
+                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
-                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
+                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
                 "shasum": ""
             },
             "require": {
@@ -7685,7 +7687,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2"
             },
             "funding": [
                 {
@@ -7697,7 +7699,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-20T21:52:34+00:00"
+            "time": "2025-04-30T23:37:27+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -7969,20 +7971,20 @@
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.0.1",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
+                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
-                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
+                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3|^7.0|^8.0"
+                "php": "^7.4|^8.0"
             },
             "replace": {
                 "cordoval/hamcrest-php": "*",
@@ -7990,8 +7992,8 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
-                "phpunit/php-file-iterator": "^1.4 || ^2.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
+                "phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -8014,22 +8016,22 @@
             ],
             "support": {
                 "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.1.1"
             },
-            "time": "2020-07-09T08:09:16+00:00"
+            "time": "2025-04-30T06:54:44+00:00"
         },
         {
             "name": "iamcal/sql-parser",
-            "version": "v0.5",
+            "version": "v0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iamcal/SQLParser.git",
-                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88"
+                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/644fd994de3b54e5d833aecf406150aa3b66ca88",
-                "reference": "644fd994de3b54e5d833aecf406150aa3b66ca88",
+                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/947083e2dca211a6f12fb1beb67a01e387de9b62",
+                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62",
                 "shasum": ""
             },
             "require-dev": {
@@ -8055,9 +8057,9 @@
             "description": "MySQL schema parser",
             "support": {
                 "issues": "https://github.com/iamcal/SQLParser/issues",
-                "source": "https://github.com/iamcal/SQLParser/tree/v0.5"
+                "source": "https://github.com/iamcal/SQLParser/tree/v0.6"
             },
-            "time": "2024-03-22T22:46:32+00:00"
+            "time": "2025-03-17T16:59:46+00:00"
         },
         {
             "name": "itsgoingd/clockwork",
@@ -8137,40 +8139,40 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.2.0",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "d84d5a3b6536a586899ad6855a3e098473703690"
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/d84d5a3b6536a586899ad6855a3e098473703690",
-                "reference": "d84d5a3b6536a586899ad6855a3e098473703690",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/1042fa0c2ee490bb6da7381f3323f7292ad68222",
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "iamcal/sql-parser": "^0.5.0",
-                "illuminate/console": "^11.41.3 || ^12.0",
-                "illuminate/container": "^11.41.3 || ^12.0",
-                "illuminate/contracts": "^11.41.3 || ^12.0",
-                "illuminate/database": "^11.41.3 || ^12.0",
-                "illuminate/http": "^11.41.3 || ^12.0",
-                "illuminate/pipeline": "^11.41.3 || ^12.0",
-                "illuminate/support": "^11.41.3 || ^12.0",
+                "iamcal/sql-parser": "^0.6.0",
+                "illuminate/console": "^11.44.2 || ^12.4.1",
+                "illuminate/container": "^11.44.2 || ^12.4.1",
+                "illuminate/contracts": "^11.44.2 || ^12.4.1",
+                "illuminate/database": "^11.44.2 || ^12.4.1",
+                "illuminate/http": "^11.44.2 || ^12.4.1",
+                "illuminate/pipeline": "^11.44.2 || ^12.4.1",
+                "illuminate/support": "^11.44.2 || ^12.4.1",
                 "php": "^8.2",
-                "phpstan/phpstan": "^2.1.3"
+                "phpstan/phpstan": "^2.1.11"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^12.0",
-                "laravel/framework": "^11.41.3 || ^12.0",
-                "mockery/mockery": "^1.6",
-                "nikic/php-parser": "^5.3",
-                "orchestra/canvas": "^v9.1.3 || ^10.0",
-                "orchestra/testbench-core": "^9.5.2 || ^10.0",
-                "phpstan/phpstan-deprecation-rules": "^2.0.0",
-                "phpunit/phpunit": "^10.5.35 || ^11.3.6"
+                "doctrine/coding-standard": "^13",
+                "laravel/framework": "^11.44.2 || ^12.7.2",
+                "mockery/mockery": "^1.6.12",
+                "nikic/php-parser": "^5.4",
+                "orchestra/canvas": "^v9.2.2 || ^10.0.1",
+                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "phpstan/phpstan-deprecation-rules": "^2.0.1",
+                "phpunit/phpunit": "^10.5.35 || ^11.5.15"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -8199,13 +8201,9 @@
                 {
                     "name": "Can Vural",
                     "email": "can9119@gmail.com"
-                },
-                {
-                    "name": "Nuno Maduro",
-                    "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
             "keywords": [
                 "PHPStan",
                 "code analyse",
@@ -8218,7 +8216,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.2.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -8226,7 +8224,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-14T21:54:26+00:00"
+            "time": "2025-04-22T09:44:59+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8313,16 +8311,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.0",
+            "version": "1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "024473a478be9df5fdaca2c793f2232fe788e414"
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
-                "reference": "024473a478be9df5fdaca2c793f2232fe788e414",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
                 "shasum": ""
             },
             "require": {
@@ -8361,7 +8359,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
             },
             "funding": [
                 {
@@ -8369,42 +8367,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-12T12:17:51+00:00"
+            "time": "2025-04-29T12:36:36+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.7.0",
+            "version": "v8.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26"
+                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/586cb8181a257a2152b6a855ca8d9598878a1a26",
-                "reference": "586cb8181a257a2152b6a855ca8d9598878a1a26",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4cf9f3b47afff38b139fb79ce54fc71799022ce8",
+                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.17.0",
+                "filp/whoops": "^2.18.0",
                 "nunomaduro/termwind": "^2.3.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.2.1"
+                "symfony/console": "^7.2.5"
             },
             "conflict": {
-                "laravel/framework": "<11.39.1 || >=13.0.0",
-                "phpunit/phpunit": "<11.5.3 || >=12.0.0"
+                "laravel/framework": "<11.44.2 || >=13.0.0",
+                "phpunit/phpunit": "<11.5.15 || >=13.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.10.0",
-                "laravel/framework": "^11.44.2",
+                "brianium/paratest": "^7.8.3",
+                "larastan/larastan": "^3.2",
+                "laravel/framework": "^11.44.2 || ^12.6",
                 "laravel/pint": "^1.21.2",
                 "laravel/sail": "^1.41.0",
                 "laravel/sanctum": "^4.0.8",
                 "laravel/tinker": "^2.10.1",
-                "orchestra/testbench-core": "^9.12.0",
-                "pestphp/pest": "^3.7.4",
-                "sebastian/environment": "^6.1.0 || ^7.2.0"
+                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "pestphp/pest": "^3.8.0",
+                "sebastian/environment": "^7.2.0 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -8467,7 +8466,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-03-14T22:37:40+00:00"
+            "time": "2025-04-03T14:33:09+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8589,16 +8588,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.11",
+            "version": "2.1.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
+                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
-                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
+                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
                 "shasum": ""
             },
             "require": {
@@ -8643,7 +8642,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-24T13:45:00+00:00"
+            "time": "2025-05-02T15:32:28+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8970,16 +8969,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.15",
+            "version": "11.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c"
+                "reference": "0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5",
+                "reference": "0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5",
                 "shasum": ""
             },
             "require": {
@@ -8989,7 +8988,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.0",
+                "myclabs/deep-copy": "^1.13.1",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
@@ -9051,7 +9050,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.19"
             },
             "funding": [
                 {
@@ -9062,12 +9061,20 @@
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-23T16:02:11+00:00"
+            "time": "2025-05-02T06:56:52+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9997,16 +10004,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.12.0",
+            "version": "3.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630"
+                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
-                "reference": "2d1b63db139c3c6ea0c927698e5160f8b3b8d630",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
+                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
                 "shasum": ""
             },
             "require": {
@@ -10077,7 +10084,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-03-18T05:04:51+00:00"
+            "time": "2025-04-13T04:10:18+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",

From ce1e20501cb9f1a4af81f5153a45ab05dbaaab23 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 5 May 2025 18:14:18 +0100
Subject: [PATCH 526/666] Updated translator & dependency attribution before
 release v25.02.3

---
 .github/translators.txt               | 3 +++
 dev/licensing/js-library-licenses.txt | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index e38cb8a5115..aab08d76413 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -484,3 +484,6 @@ Ilya Shaulov (ishaulov) :: Russian
 Konstantin Bobkov (b.konstantv) :: Russian
 Ruben Sutter (rubensutter) :: German
 jellium :: French
+Qxlkdr :: Swedish
+Hari (muhhari) :: Indonesian
+仙君御 (xjy) :: Chinese Simplified
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 52949e3cd27..14c0c8f4977 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -3656,6 +3656,13 @@ Copyright: Copyright (c) 2017-present Devon Govett
 Source: https://github.com/parcel-bundler/watcher.git
 Link: https://github.com/parcel-bundler/watcher.git
 -----------
+@parcel/watcher-linux-x64-musl
+License: MIT
+License File: node_modules/@parcel/watcher-linux-x64-musl/LICENSE
+Copyright: Copyright (c) 2017-present Devon Govett
+Source: https://github.com/parcel-bundler/watcher.git
+Link: https://github.com/parcel-bundler/watcher.git
+-----------
 @parcel/watcher
 License: MIT
 License File: node_modules/@parcel/watcher/LICENSE

From 3e99ce4098cf45eafd8917e9b208b3b6a4aaa1ec Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 8 May 2025 15:53:25 +0100
Subject: [PATCH 527/666] Deps: Updated PHP packages

Mainly to update termwind which was causing issues for users on Arch
where a more recent libxml version was in use.
---
 composer.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/composer.lock b/composer.lock
index b3604dd471a..04dfaa501b9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.3",
+            "version": "3.343.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979"
+                "reference": "3746aca8cbed5f46beba850e0a480ef58e71b197"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
-                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3746aca8cbed5f46beba850e0a480ef58e71b197",
+                "reference": "3746aca8cbed5f46beba850e0a480ef58e71b197",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.6"
             },
-            "time": "2025-05-02T18:04:58+00:00"
+            "time": "2025-05-07T18:10:08+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -3597,31 +3597,31 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v2.3.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda"
+                "reference": "dfa08f390e509967a15c22493dc0bac5733d9123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/52915afe6a1044e8b9cee1bcff836fb63acf9cda",
-                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/dfa08f390e509967a15c22493dc0bac5733d9123",
+                "reference": "dfa08f390e509967a15c22493dc0bac5733d9123",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^8.2",
-                "symfony/console": "^7.1.8"
+                "symfony/console": "^7.2.6"
             },
             "require-dev": {
-                "illuminate/console": "^11.33.2",
-                "laravel/pint": "^1.18.2",
+                "illuminate/console": "^11.44.7",
+                "laravel/pint": "^1.22.0",
                 "mockery/mockery": "^1.6.12",
-                "pestphp/pest": "^2.36.0",
-                "phpstan/phpstan": "^1.12.11",
-                "phpstan/phpstan-strict-rules": "^1.6.1",
-                "symfony/var-dumper": "^7.1.8",
+                "pestphp/pest": "^2.36.0 || ^3.8.2",
+                "phpstan/phpstan": "^1.12.25",
+                "phpstan/phpstan-strict-rules": "^1.6.2",
+                "symfony/var-dumper": "^7.2.6",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3664,7 +3664,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.0"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.1"
             },
             "funding": [
                 {
@@ -3680,7 +3680,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-21T10:39:51+00:00"
+            "time": "2025-05-08T08:14:37+00:00"
         },
         {
             "name": "onelogin/php-saml",

From a27df485bb19a2fbcddf8cac8ae2b367d23022e7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 9 May 2025 12:14:28 +0100
Subject: [PATCH 528/666] Comments: Fixed display, added archive list support
 for editor toolbox

---
 lang/en/entities.php                              |  1 +
 resources/js/components/page-comment-reference.ts | 15 ++++++++++++++-
 resources/sass/_components.scss                   | 15 +++++++++++++++
 .../views/pages/parts/toolbox-comments.blade.php  | 15 +++++++++++++--
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index e25a83299f3..6e616ded452 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -396,6 +396,7 @@
     'comment_placeholder' => 'Leave a comment here',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
     'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.ts
index 5a71f0c513b..48fb8ee0a49 100644
--- a/resources/js/components/page-comment-reference.ts
+++ b/resources/js/components/page-comment-reference.ts
@@ -34,13 +34,26 @@ export class PageCommentReference extends Component {
         window.addEventListener('editor-toolbox-change', (event) => {
              const tabName: string = (event as {detail: {tab: string, open: boolean}}).detail.tab;
              const isOpen = (event as {detail: {tab: string, open: boolean}}).detail.open;
-             if (tabName === 'comments' && isOpen) {
+             if (tabName === 'comments' && isOpen && this.link.checkVisibility()) {
                  this.showForEditor();
              } else {
                  this.hideMarker();
              }
         });
 
+        // Handle visibility changes within editor toolbox archived details dropdown
+        window.addEventListener('toggle', event => {
+            if (event.target instanceof HTMLElement && event.target.contains(this.link)) {
+                window.requestAnimationFrame(() => {
+                    if (this.link.checkVisibility()) {
+                        this.showForEditor();
+                    } else {
+                        this.hideMarker();
+                    }
+                });
+            }
+        }, {capture: true});
+
         // Handle comments tab changes to hide/show markers & indicators
         window.addEventListener('tabs-change', event => {
             const sectionId = (event as {detail: {showing: string}}).detail.showing;
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index a86d31ce373..faeb2e05141 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -1202,4 +1202,19 @@ input.scroll-box-search, .scroll-box-header-item {
 }
 .scroll-box > li.empty-state:last-child {
   display: list-item;
+}
+
+details.section-expander summary {
+  border-top: 1px solid #DDD;
+  font-weight: bold;
+  font-size: 12px;
+  color: #888;
+  cursor: pointer;
+  padding-block: vars.$xs;
+}
+details.section-expander:open summary {
+  margin-bottom: vars.$s;
+}
+details.section-expander {
+  border-bottom: 1px solid #DDD;
 }
\ No newline at end of file
diff --git a/resources/views/pages/parts/toolbox-comments.blade.php b/resources/views/pages/parts/toolbox-comments.blade.php
index d632b85c689..72958a2fede 100644
--- a/resources/views/pages/parts/toolbox-comments.blade.php
+++ b/resources/views/pages/parts/toolbox-comments.blade.php
@@ -1,3 +1,6 @@
+{{--
+$comments - CommentTree
+--}}
 <div refs="editor-toolbox@tab-content" data-tab-content="comments" class="toolbox-tab-content">
     <h4>{{ trans('entities.comments') }}</h4>
 
@@ -5,11 +8,19 @@
         <p class="text-muted small mb-m">
             {{ trans('entities.comment_editor_explain') }}
         </p>
-        @foreach($comments->get() as $branch)
+        @foreach($comments->getActive() as $branch)
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => true])
         @endforeach
         @if($comments->empty())
-            <p class="italic text-muted">{{ trans('common.no_items') }}</p>
+            <p class="italic text-muted">{{ trans('entities.comment_none') }}</p>
+        @endif
+        @if($comments->archivedThreadCount() > 0)
+            <details class="section-expander mt-s">
+                <summary>{{ trans('entities.comment_archived_threads') }}</summary>
+                @foreach($comments->getArchived() as $branch)
+                    @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => true])
+                @endforeach
+            </details>
         @endif
     </div>
 </div>
\ No newline at end of file

From f8c0aaff0326ac77195d854effd9315d80aa2bc4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 9 May 2025 14:17:04 +0100
Subject: [PATCH 529/666] Comments: Checked content/arhived comment styles in
 dark mode

Also added default non-clickable styles for scenarios for references
which don't have an active content link.
---
 resources/sass/_components.scss | 9 ++++++++-
 resources/sass/_pages.scss      | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index faeb2e05141..9e96b39fbb4 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -785,6 +785,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     top: 0;
     opacity: 0.15;
   }
+  &[href="#"] {
+    color: #444;
+    pointer-events: none;
+  }
 }
 
 .comment-branch .comment-box {
@@ -836,7 +840,8 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
     font-size: 12px;
   }
   .avatar {
-    width: 18px;
+    width: 22px;
+    height: 22px;
     margin-inline-end: 2px !important;
   }
   .content {
@@ -1206,6 +1211,7 @@ input.scroll-box-search, .scroll-box-header-item {
 
 details.section-expander summary {
   border-top: 1px solid #DDD;
+  @include mixins.lightDark(border-color, #DDD, #000);
   font-weight: bold;
   font-size: 12px;
   color: #888;
@@ -1217,4 +1223,5 @@ details.section-expander:open summary {
 }
 details.section-expander {
   border-bottom: 1px solid #DDD;
+  @include mixins.lightDark(border-color, #DDD, #000);
 }
\ No newline at end of file
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index dbdcc06656d..621d08f45f2 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -248,7 +248,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   z-index: 92;
   pointer-events: all;
   min-width: min(340px, 80vw);
-  background-color: #FFF;
+  @include mixins.lightDark(background-color, #FFF, #222);
   box-shadow: vars.$bs-hover;
   border-radius: 4px;
   overflow: hidden;

From 62f78f1c6d1f901cd986495a7271b983b60ec74d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 12 May 2025 14:26:09 +0100
Subject: [PATCH 530/666] Comments: Split tests, added extra archive/reference
 tests

---
 app/Activity/CommentRepo.php                  |   4 +-
 tests/Entity/CommentDisplayTest.php           | 134 ++++++++++++++++++
 .../{CommentTest.php => CommentStoreTest.php} | 117 ++++-----------
 3 files changed, 160 insertions(+), 95 deletions(-)
 create mode 100644 tests/Entity/CommentDisplayTest.php
 rename tests/Entity/{CommentTest.php => CommentStoreTest.php} (66%)

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index bf162f68ae6..c194e72168c 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -62,7 +62,7 @@ public function update(Comment $comment, string $html): Comment
     public function archive(Comment $comment): Comment
     {
         if ($comment->parent_id) {
-            throw new NotifyException('Only top-level comments can be archived.');
+            throw new NotifyException('Only top-level comments can be archived.', '/', 400);
         }
 
         $comment->archived = true;
@@ -79,7 +79,7 @@ public function archive(Comment $comment): Comment
     public function unarchive(Comment $comment): Comment
     {
         if ($comment->parent_id) {
-            throw new NotifyException('Only top-level comments can be un-archived.');
+            throw new NotifyException('Only top-level comments can be un-archived.', '/', 400);
         }
 
         $comment->archived = false;
diff --git a/tests/Entity/CommentDisplayTest.php b/tests/Entity/CommentDisplayTest.php
new file mode 100644
index 00000000000..4e9640baeed
--- /dev/null
+++ b/tests/Entity/CommentDisplayTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Entity;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Comment;
+use BookStack\Entities\Models\Page;
+use Tests\TestCase;
+
+class CommentDisplayTest extends TestCase
+{
+    public function test_reply_comments_are_nested()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+
+        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
+        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl()));
+        $respHtml->assertElementCount('.comment-branch', 3);
+        $respHtml->assertElementNotExists('.comment-branch .comment-branch');
+
+        $comment = $page->comments()->first();
+        $resp = $this->postJson("/comment/$page->id", [
+            'html' => '<p>My nested comment</p>', 'parent_id' => $comment->local_id
+        ]);
+        $resp->assertStatus(200);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl()));
+        $respHtml->assertElementCount('.comment-branch', 4);
+        $respHtml->assertElementContains('.comment-branch .comment-branch', 'My nested comment');
+    }
+
+    public function test_comments_are_visible_in_the_page_editor()
+    {
+        $page = $this->entities->page();
+
+        $this->asAdmin()->postJson("/comment/$page->id", ['html' => '<p>My great comment to see in the editor</p>']);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl('/edit')));
+        $respHtml->assertElementContains('.comment-box .content', 'My great comment to see in the editor');
+    }
+
+    public function test_comment_creator_name_truncated()
+    {
+        [$longNamedUser] = $this->users->newUserWithRole(['name' => 'Wolfeschlegelsteinhausenbergerdorff'], ['comment-create-all', 'page-view-all']);
+        $page = $this->entities->page();
+
+        $comment = Comment::factory()->make();
+        $this->actingAs($longNamedUser)->postJson("/comment/$page->id", $comment->getAttributes());
+
+        $pageResp = $this->asAdmin()->get($page->getUrl());
+        $pageResp->assertSee('Wolfeschlegels…');
+    }
+
+    public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
+    {
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertSee('tinymce.min.js?', false);
+        $resp->assertSee('window.editor_translations', false);
+        $resp->assertSee('component="entity-selector"', false);
+
+        $this->permissions->removeUserRolePermissions($editor, ['comment-create-all']);
+        $this->permissions->grantUserRolePermissions($editor, ['comment-update-own']);
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertDontSee('tinymce.min.js?', false);
+        $resp->assertDontSee('window.editor_translations', false);
+        $resp->assertDontSee('component="entity-selector"', false);
+
+        Comment::factory()->create([
+            'created_by'  => $editor->id,
+            'entity_type' => 'page',
+            'entity_id'   => $page->id,
+        ]);
+
+        $resp = $this->actingAs($editor)->get($page->getUrl());
+        $resp->assertSee('tinymce.min.js?', false);
+        $resp->assertSee('window.editor_translations', false);
+        $resp->assertSee('component="entity-selector"', false);
+    }
+
+    public function test_comment_displays_relative_times()
+    {
+        $page = $this->entities->page();
+        $comment = Comment::factory()->create(['entity_id' => $page->id, 'entity_type' => $page->getMorphClass()]);
+        $comment->created_at = now()->subWeek();
+        $comment->updated_at = now()->subDay();
+        $comment->save();
+
+        $pageResp = $this->asAdmin()->get($page->getUrl());
+        $html = $this->withHtml($pageResp);
+
+        // Create date shows relative time as text to user
+        $html->assertElementContains('.comment-box', 'commented 1 week ago');
+        // Updated indicator has full time as title
+        $html->assertElementContains('.comment-box span[title^="Updated ' . $comment->updated_at->format('Y-m-d') .  '"]', 'Updated');
+    }
+
+    public function test_comment_displays_reference_if_set()
+    {
+        $page = $this->entities->page();
+        $comment = Comment::factory()->make([
+            'content_ref' => 'bkmrk-a:abc:4-1',
+            'local_id'   =>  10,
+        ]);
+        $page->comments()->save($comment);
+
+        $html = $this->withHtml($this->asEditor()->get($page->getUrl()));
+        $html->assertElementExists('#comment10 .comment-reference-indicator-wrap a');
+    }
+
+    public function test_archived_comments_are_shown_in_their_own_container()
+    {
+        $page = $this->entities->page();
+        $comment = Comment::factory()->make(['local_id' => 44]);
+        $page->comments()->save($comment);
+
+        $html = $this->withHtml($this->asEditor()->get($page->getUrl()));
+        $html->assertElementExists('#comment-tab-panel-active #comment44');
+        $html->assertElementNotExists('#comment-tab-panel-archived .comment-box');
+
+        $comment->archived = true;
+        $comment->save();
+
+        $html = $this->withHtml($this->asEditor()->get($page->getUrl()));
+        $html->assertElementExists('#comment-tab-panel-archived #comment44.comment-box');
+        $html->assertElementNotExists('#comment-tab-panel-active #comment44');
+    }
+}
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentStoreTest.php
similarity index 66%
rename from tests/Entity/CommentTest.php
rename to tests/Entity/CommentStoreTest.php
index baf0d392beb..8b8a5d488b8 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentStoreTest.php
@@ -7,7 +7,7 @@
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
-class CommentTest extends TestCase
+class CommentStoreTest extends TestCase
 {
     public function test_add_comment()
     {
@@ -166,6 +166,29 @@ public function test_archive_endpoints_require_delete_or_edit_permissions()
         }
     }
 
+    public function test_non_top_level_comments_cant_be_archived_or_unarchived()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+
+        $comment = Comment::factory()->make();
+        $page->comments()->save($comment);
+        $subComment = Comment::factory()->make(['parent_id' => $comment->id]);
+        $page->comments()->save($subComment);
+        $subComment->refresh();
+
+        $resp = $this->putJson("/comment/$subComment->id/archive");
+        $resp->assertStatus(400);
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $subComment->id,
+            'archived' => false,
+        ]);
+
+        $resp = $this->putJson("/comment/$subComment->id/unarchive");
+        $resp->assertStatus(400);
+    }
+
     public function test_scripts_cannot_be_injected_via_comment_html()
     {
         $page = $this->entities->page();
@@ -225,96 +248,4 @@ public function test_comment_html_is_limited()
             'html' => $expected,
         ]);
     }
-
-    public function test_reply_comments_are_nested()
-    {
-        $this->asAdmin();
-        $page = $this->entities->page();
-
-        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
-        $this->postJson("/comment/$page->id", ['html' => '<p>My new comment</p>']);
-
-        $respHtml = $this->withHtml($this->get($page->getUrl()));
-        $respHtml->assertElementCount('.comment-branch', 3);
-        $respHtml->assertElementNotExists('.comment-branch .comment-branch');
-
-        $comment = $page->comments()->first();
-        $resp = $this->postJson("/comment/$page->id", [
-            'html' => '<p>My nested comment</p>', 'parent_id' => $comment->local_id
-        ]);
-        $resp->assertStatus(200);
-
-        $respHtml = $this->withHtml($this->get($page->getUrl()));
-        $respHtml->assertElementCount('.comment-branch', 4);
-        $respHtml->assertElementContains('.comment-branch .comment-branch', 'My nested comment');
-    }
-
-    public function test_comments_are_visible_in_the_page_editor()
-    {
-        $page = $this->entities->page();
-
-        $this->asAdmin()->postJson("/comment/$page->id", ['html' => '<p>My great comment to see in the editor</p>']);
-
-        $respHtml = $this->withHtml($this->get($page->getUrl('/edit')));
-        $respHtml->assertElementContains('.comment-box .content', 'My great comment to see in the editor');
-    }
-
-    public function test_comment_creator_name_truncated()
-    {
-        [$longNamedUser] = $this->users->newUserWithRole(['name' => 'Wolfeschlegelsteinhausenbergerdorff'], ['comment-create-all', 'page-view-all']);
-        $page = $this->entities->page();
-
-        $comment = Comment::factory()->make();
-        $this->actingAs($longNamedUser)->postJson("/comment/$page->id", $comment->getAttributes());
-
-        $pageResp = $this->asAdmin()->get($page->getUrl());
-        $pageResp->assertSee('Wolfeschlegels…');
-    }
-
-    public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
-    {
-        $editor = $this->users->editor();
-        $page = $this->entities->page();
-
-        $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertSee('tinymce.min.js?', false);
-        $resp->assertSee('window.editor_translations', false);
-        $resp->assertSee('component="entity-selector"', false);
-
-        $this->permissions->removeUserRolePermissions($editor, ['comment-create-all']);
-        $this->permissions->grantUserRolePermissions($editor, ['comment-update-own']);
-
-        $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertDontSee('tinymce.min.js?', false);
-        $resp->assertDontSee('window.editor_translations', false);
-        $resp->assertDontSee('component="entity-selector"', false);
-
-        Comment::factory()->create([
-            'created_by'  => $editor->id,
-            'entity_type' => 'page',
-            'entity_id'   => $page->id,
-        ]);
-
-        $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertSee('tinymce.min.js?', false);
-        $resp->assertSee('window.editor_translations', false);
-        $resp->assertSee('component="entity-selector"', false);
-    }
-
-    public function test_comment_displays_relative_times()
-    {
-        $page = $this->entities->page();
-        $comment = Comment::factory()->create(['entity_id' => $page->id, 'entity_type' => $page->getMorphClass()]);
-        $comment->created_at = now()->subWeek();
-        $comment->updated_at = now()->subDay();
-        $comment->save();
-
-        $pageResp = $this->asAdmin()->get($page->getUrl());
-        $html = $this->withHtml($pageResp);
-
-        // Create date shows relative time as text to user
-        $html->assertElementContains('.comment-box', 'commented 1 week ago');
-        // Updated indicator has full time as title
-        $html->assertElementContains('.comment-box span[title^="Updated ' . $comment->updated_at->format('Y-m-d') .  '"]', 'Updated');
-    }
 }

From 8f92b6f21b2412005e138c1482f32c158ff69204 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 12 May 2025 15:31:55 +0100
Subject: [PATCH 531/666] Comments: Fixed a range of TS errors + other

- Migrated toolbox component to TS
- Aligned how custom event types are managed
- Fixed PHP use of content_ref where not provided
---
 app/Activity/CommentRepo.php                  |  6 +-
 .../Controllers/CommentController.php         |  3 +-
 .../{editor-toolbox.js => editor-toolbox.ts}  | 43 +++++----
 .../js/components/page-comment-reference.ts   | 36 ++++----
 resources/js/components/page-comment.ts       | 62 ++++++++-----
 resources/js/components/page-comments.ts      | 88 ++++++++-----------
 resources/js/components/pointer.ts            | 46 +++++-----
 resources/js/components/tabs.ts               | 17 ++--
 resources/js/services/dom.ts                  |  6 +-
 resources/js/services/events.ts               |  9 +-
 10 files changed, 167 insertions(+), 149 deletions(-)
 rename resources/js/components/{editor-toolbox.js => editor-toolbox.ts} (61%)

diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index c194e72168c..7005f8fcf83 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -22,7 +22,7 @@ public function getById(int $id): Comment
     /**
      * Create a new comment on an entity.
      */
-    public function create(Entity $entity, string $html, ?int $parent_id, string $content_ref): Comment
+    public function create(Entity $entity, string $html, ?int $parentId, string $contentRef): Comment
     {
         $userId = user()->id;
         $comment = new Comment();
@@ -31,8 +31,8 @@ public function create(Entity $entity, string $html, ?int $parent_id, string $co
         $comment->created_by = $userId;
         $comment->updated_by = $userId;
         $comment->local_id = $this->getNextLocalId($entity);
-        $comment->parent_id = $parent_id;
-        $comment->content_ref = preg_match('/^bkmrk-(.*?):\d+:(\d*-\d*)?$/', $content_ref) === 1 ? $content_ref : '';
+        $comment->parent_id = $parentId;
+        $comment->content_ref = preg_match('/^bkmrk-(.*?):\d+:(\d*-\d*)?$/', $contentRef) === 1 ? $contentRef : '';
 
         $entity->comments()->save($comment);
         ActivityService::add(ActivityType::COMMENT_CREATE, $comment);
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 7f16c17ffce..479d57c4db9 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -43,7 +43,8 @@ public function savePageComment(Request $request, int $pageId)
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
-        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $input['content_ref']);
+        $contentRef = $input['content_ref'] ?? '';
+        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $contentRef);
 
         return view('comments.comment-branch', [
             'readOnly' => false,
diff --git a/resources/js/components/editor-toolbox.js b/resources/js/components/editor-toolbox.ts
similarity index 61%
rename from resources/js/components/editor-toolbox.js
rename to resources/js/components/editor-toolbox.ts
index 95339328542..60bdde05efb 100644
--- a/resources/js/components/editor-toolbox.js
+++ b/resources/js/components/editor-toolbox.ts
@@ -1,39 +1,49 @@
 import {Component} from './component';
 
+export interface EditorToolboxChangeEventData {
+    tab: string;
+    open: boolean;
+}
+
 export class EditorToolbox extends Component {
 
+    protected container!: HTMLElement;
+    protected buttons!: HTMLButtonElement[];
+    protected contentElements!: HTMLElement[];
+    protected toggleButton!: HTMLElement;
+    protected editorWrapEl!: HTMLElement;
+
+    protected open: boolean = false;
+    protected tab: string = '';
+
     setup() {
         // Elements
         this.container = this.$el;
-        this.buttons = this.$manyRefs.tabButton;
+        this.buttons = this.$manyRefs.tabButton as HTMLButtonElement[];
         this.contentElements = this.$manyRefs.tabContent;
         this.toggleButton = this.$refs.toggle;
-        this.editorWrapEl = this.container.closest('.page-editor');
-
-        // State
-        this.open = false;
-        this.tab = '';
+        this.editorWrapEl = this.container.closest('.page-editor') as HTMLElement;
 
         this.setupListeners();
 
         // Set the first tab as active on load
-        this.setActiveTab(this.contentElements[0].dataset.tabContent);
+        this.setActiveTab(this.contentElements[0].dataset.tabContent || '');
     }
 
-    setupListeners() {
+    protected setupListeners(): void {
         // Toolbox toggle button click
         this.toggleButton.addEventListener('click', () => this.toggle());
         // Tab button click
-        this.container.addEventListener('click', event => {
-            const button = event.target.closest('button');
-            if (this.buttons.includes(button)) {
-                const name = button.dataset.tab;
+        this.container.addEventListener('click', (event: MouseEvent) => {
+            const button = (event.target as HTMLElement).closest('button');
+            if (button instanceof HTMLButtonElement && this.buttons.includes(button)) {
+                const name = button.dataset.tab || '';
                 this.setActiveTab(name, true);
             }
         });
     }
 
-    toggle() {
+    protected toggle(): void {
         this.container.classList.toggle('open');
         const isOpen = this.container.classList.contains('open');
         this.toggleButton.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
@@ -42,7 +52,7 @@ export class EditorToolbox extends Component {
         this.emitState();
     }
 
-    setActiveTab(tabName, openToolbox = false) {
+    protected setActiveTab(tabName: string, openToolbox: boolean = false): void {
         // Set button visibility
         for (const button of this.buttons) {
             button.classList.remove('active');
@@ -65,8 +75,9 @@ export class EditorToolbox extends Component {
         this.emitState();
     }
 
-    emitState() {
-        this.$emit('change', {tab: this.tab, open: this.open});
+    protected emitState(): void {
+        const data: EditorToolboxChangeEventData = {tab: this.tab, open: this.open};
+        this.$emit('change', data);
     }
 
 }
diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.ts
index 48fb8ee0a49..009e806c104 100644
--- a/resources/js/components/page-comment-reference.ts
+++ b/resources/js/components/page-comment-reference.ts
@@ -4,6 +4,8 @@ import {el} from "../wysiwyg/utils/dom";
 import commentIcon from "@icons/comment.svg";
 import closeIcon from "@icons/close.svg";
 import {debounce, scrollAndHighlightElement} from "../services/util";
+import {EditorToolboxChangeEventData} from "./editor-toolbox";
+import {TabsChangeEvent} from "./tabs";
 
 /**
  * Track the close function for the current open marker so it can be closed
@@ -12,13 +14,13 @@ import {debounce, scrollAndHighlightElement} from "../services/util";
 let openMarkerClose: Function|null = null;
 
 export class PageCommentReference extends Component {
-    protected link: HTMLLinkElement;
-    protected reference: string;
+    protected link!: HTMLLinkElement;
+    protected reference!: string;
     protected markerWrap: HTMLElement|null = null;
 
-    protected viewCommentText: string;
-    protected jumpToThreadText: string;
-    protected closeText: string;
+    protected viewCommentText!: string;
+    protected jumpToThreadText!: string;
+    protected closeText!: string;
 
     setup() {
         this.link = this.$el as HTMLLinkElement;
@@ -31,15 +33,15 @@ export class PageCommentReference extends Component {
         this.showForDisplay();
 
         // Handle editor view to show on comments toolbox view
-        window.addEventListener('editor-toolbox-change', (event) => {
-             const tabName: string = (event as {detail: {tab: string, open: boolean}}).detail.tab;
-             const isOpen = (event as {detail: {tab: string, open: boolean}}).detail.open;
-             if (tabName === 'comments' && isOpen && this.link.checkVisibility()) {
-                 this.showForEditor();
-             } else {
-                 this.hideMarker();
-             }
-        });
+        window.addEventListener('editor-toolbox-change', ((event: CustomEvent<EditorToolboxChangeEventData>) => {
+            const tabName: string = event.detail.tab;
+            const isOpen = event.detail.open;
+            if (tabName === 'comments' && isOpen && this.link.checkVisibility()) {
+                this.showForEditor();
+            } else {
+                this.hideMarker();
+            }
+        }) as EventListener);
 
         // Handle visibility changes within editor toolbox archived details dropdown
         window.addEventListener('toggle', event => {
@@ -55,8 +57,8 @@ export class PageCommentReference extends Component {
         }, {capture: true});
 
         // Handle comments tab changes to hide/show markers & indicators
-        window.addEventListener('tabs-change', event => {
-            const sectionId = (event as {detail: {showing: string}}).detail.showing;
+        window.addEventListener('tabs-change', ((event: CustomEvent<TabsChangeEvent>) => {
+            const sectionId = event.detail.showing;
             if (!sectionId.startsWith('comment-tab-panel')) {
                 return;
             }
@@ -67,7 +69,7 @@ export class PageCommentReference extends Component {
             } else {
                 this.hideMarker();
             }
-        });
+        }) as EventListener);
     }
 
     public showForDisplay() {
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index ce35cdc4a24..0c3e19f4b1a 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -1,29 +1,39 @@
 import {Component} from './component';
-import {getLoading, htmlToDom} from '../services/dom.ts';
+import {getLoading, htmlToDom} from '../services/dom';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 import {PageCommentReference} from "./page-comment-reference";
+import {HttpError} from "../services/http";
+
+export interface PageCommentReplyEventData {
+    id: string; // ID of comment being replied to
+    element: HTMLElement; // Container for comment replied to
+}
+
+export interface PageCommentArchiveEventData {
+    new_thread_dom: HTMLElement;
+}
 
 export class PageComment extends Component {
 
-    protected commentId: string;
-    protected commentLocalId: string;
-    protected deletedText: string;
-    protected updatedText: string;
-    protected archiveText: string;
+    protected commentId!: string;
+    protected commentLocalId!: string;
+    protected deletedText!: string;
+    protected updatedText!: string;
+    protected archiveText!: string;
 
     protected wysiwygEditor: any = null;
-    protected wysiwygLanguage: string;
-    protected wysiwygTextDirection: string;
-
-    protected container: HTMLElement;
-    protected contentContainer: HTMLElement;
-    protected form: HTMLFormElement;
-    protected formCancel: HTMLElement;
-    protected editButton: HTMLElement;
-    protected deleteButton: HTMLElement;
-    protected replyButton: HTMLElement;
-    protected archiveButton: HTMLElement;
-    protected input: HTMLInputElement;
+    protected wysiwygLanguage!: string;
+    protected wysiwygTextDirection!: string;
+
+    protected container!: HTMLElement;
+    protected contentContainer!: HTMLElement;
+    protected form!: HTMLFormElement;
+    protected formCancel!: HTMLElement;
+    protected editButton!: HTMLElement;
+    protected deleteButton!: HTMLElement;
+    protected replyButton!: HTMLElement;
+    protected archiveButton!: HTMLElement;
+    protected input!: HTMLInputElement;
 
     setup() {
         // Options
@@ -53,10 +63,11 @@ export class PageComment extends Component {
 
     protected setupListeners(): void {
         if (this.replyButton) {
-            this.replyButton.addEventListener('click', () => this.$emit('reply', {
+            const data: PageCommentReplyEventData = {
                 id: this.commentLocalId,
                 element: this.container,
-            }));
+            };
+            this.replyButton.addEventListener('click', () => this.$emit('reply', data));
         }
 
         if (this.editButton) {
@@ -95,10 +106,10 @@ export class PageComment extends Component {
             drawioUrl: '',
             pageId: 0,
             translations: {},
-            translationMap: (window as Record<string, Object>).editor_translations,
+            translationMap: (window as unknown as Record<string, Object>).editor_translations,
         });
 
-        (window as {tinymce: {init: (Object) => Promise<any>}}).tinymce.init(config).then(editors => {
+        (window as unknown as {tinymce: {init: (arg0: Object) => Promise<any>}}).tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
             setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
@@ -120,7 +131,9 @@ export class PageComment extends Component {
             window.$events.success(this.updatedText);
         } catch (err) {
             console.error(err);
-            window.$events.showValidationErrors(err);
+            if (err instanceof HttpError) {
+                window.$events.showValidationErrors(err);
+            }
             this.form.toggleAttribute('hidden', false);
             loading.remove();
         }
@@ -151,7 +164,8 @@ export class PageComment extends Component {
 
         const response = await window.$http.put(`/comment/${this.commentId}/${action}`);
         window.$events.success(this.archiveText);
-        this.$emit(action, {new_thread_dom: htmlToDom(response.data as string)});
+        const eventData: PageCommentArchiveEventData = {new_thread_dom: htmlToDom(response.data as string)};
+        this.$emit(action, eventData);
 
         const branch = this.container.closest('.comment-branch') as HTMLElement;
         const references = window.$components.allWithinElement<PageCommentReference>(branch, 'page-comment-reference');
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 04c8125808c..94f5ab3bb8e 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -1,50 +1,38 @@
 import {Component} from './component';
-import {getLoading, htmlToDom} from '../services/dom.ts';
+import {getLoading, htmlToDom} from '../services/dom';
 import {buildForInput} from '../wysiwyg-tinymce/config';
 import {Tabs} from "./tabs";
 import {PageCommentReference} from "./page-comment-reference";
 import {scrollAndHighlightElement} from "../services/util";
-
-export interface CommentReplyEvent extends Event {
-    detail: {
-        id: string; // ID of comment being replied to
-        element: HTMLElement; // Container for comment replied to
-    }
-}
-
-export interface ArchiveEvent extends Event {
-    detail: {
-        new_thread_dom: HTMLElement;
-    }
-}
+import {PageCommentArchiveEventData, PageCommentReplyEventData} from "./page-comment";
 
 export class PageComments extends Component {
 
-    private elem: HTMLElement;
-    private pageId: number;
-    private container: HTMLElement;
-    private commentCountBar: HTMLElement;
-    private activeTab: HTMLElement;
-    private archivedTab: HTMLElement;
-    private addButtonContainer: HTMLElement;
-    private archiveContainer: HTMLElement;
-    private replyToRow: HTMLElement;
-    private referenceRow: HTMLElement;
-    private formContainer: HTMLElement;
-    private form: HTMLFormElement;
-    private formInput: HTMLInputElement;
-    private formReplyLink: HTMLAnchorElement;
-    private formReferenceLink: HTMLAnchorElement;
-    private addCommentButton: HTMLElement;
-    private hideFormButton: HTMLElement;
-    private removeReplyToButton: HTMLElement;
-    private removeReferenceButton: HTMLElement;
-    private wysiwygLanguage: string;
-    private wysiwygTextDirection: string;
+    private elem!: HTMLElement;
+    private pageId!: number;
+    private container!: HTMLElement;
+    private commentCountBar!: HTMLElement;
+    private activeTab!: HTMLElement;
+    private archivedTab!: HTMLElement;
+    private addButtonContainer!: HTMLElement;
+    private archiveContainer!: HTMLElement;
+    private replyToRow!: HTMLElement;
+    private referenceRow!: HTMLElement;
+    private formContainer!: HTMLElement;
+    private form!: HTMLFormElement;
+    private formInput!: HTMLInputElement;
+    private formReplyLink!: HTMLAnchorElement;
+    private formReferenceLink!: HTMLAnchorElement;
+    private addCommentButton!: HTMLElement;
+    private hideFormButton!: HTMLElement;
+    private removeReplyToButton!: HTMLElement;
+    private removeReferenceButton!: HTMLElement;
+    private wysiwygLanguage!: string;
+    private wysiwygTextDirection!: string;
     private wysiwygEditor: any = null;
-    private createdText: string;
-    private countText: string;
-    private archivedCountText: string;
+    private createdText!: string;
+    private countText!: string;
+    private archivedCountText!: string;
     private parentId: number | null = null;
     private contentReference: string = '';
     private formReplyText: string = '';
@@ -92,19 +80,19 @@ export class PageComments extends Component {
             this.hideForm();
         });
 
-        this.elem.addEventListener('page-comment-reply', (event: CommentReplyEvent) => {
+        this.elem.addEventListener('page-comment-reply', ((event: CustomEvent<PageCommentReplyEventData>) => {
             this.setReply(event.detail.id, event.detail.element);
-        });
+        }) as EventListener);
 
-        this.elem.addEventListener('page-comment-archive', (event: ArchiveEvent) => {
+        this.elem.addEventListener('page-comment-archive', ((event: CustomEvent<PageCommentArchiveEventData>) => {
             this.archiveContainer.append(event.detail.new_thread_dom);
             setTimeout(() => this.updateCount(), 1);
-        });
+        }) as EventListener);
 
-        this.elem.addEventListener('page-comment-unarchive', (event: ArchiveEvent) => {
+        this.elem.addEventListener('page-comment-unarchive', ((event: CustomEvent<PageCommentArchiveEventData>) => {
             this.container.append(event.detail.new_thread_dom);
             setTimeout(() => this.updateCount(), 1);
-        });
+        }) as EventListener);
 
         if (this.form) {
             this.removeReplyToButton.addEventListener('click', this.removeReplyTo.bind(this));
@@ -115,7 +103,7 @@ export class PageComments extends Component {
         }
     }
 
-    protected saveComment(event): void {
+    protected saveComment(event: SubmitEvent): void {
         event.preventDefault();
         event.stopPropagation();
 
@@ -209,10 +197,10 @@ export class PageComments extends Component {
             drawioUrl: '',
             pageId: 0,
             translations: {},
-            translationMap: (window as Record<string, Object>).editor_translations,
+            translationMap: (window as unknown as Record<string, Object>).editor_translations,
         });
 
-        (window as {tinymce: {init: (Object) => Promise<any>}}).tinymce.init(config).then(editors => {
+        (window as unknown as {tinymce: {init: (arg0: Object) => Promise<any>}}).tinymce.init(config).then(editors => {
             this.wysiwygEditor = editors[0];
             setTimeout(() => this.wysiwygEditor.focus(), 50);
         });
@@ -233,11 +221,11 @@ export class PageComments extends Component {
         return this.archiveContainer.querySelectorAll(':scope > .comment-branch').length;
     }
 
-    protected setReply(commentLocalId, commentElement): void {
-        const targetFormLocation = commentElement.closest('.comment-branch').querySelector('.comment-branch-children');
+    protected setReply(commentLocalId: string, commentElement: HTMLElement): void {
+        const targetFormLocation = (commentElement.closest('.comment-branch') as HTMLElement).querySelector('.comment-branch-children') as HTMLElement;
         targetFormLocation.append(this.formContainer);
         this.showForm();
-        this.parentId = commentLocalId;
+        this.parentId = Number(commentLocalId);
         this.replyToRow.toggleAttribute('hidden', false);
         this.formReplyLink.textContent = this.formReplyText.replace('1234', String(this.parentId));
         this.formReplyLink.href = `#comment${this.parentId}`;
diff --git a/resources/js/components/pointer.ts b/resources/js/components/pointer.ts
index d84186d872d..4b927045aae 100644
--- a/resources/js/components/pointer.ts
+++ b/resources/js/components/pointer.ts
@@ -1,7 +1,7 @@
-import * as DOM from '../services/dom.ts';
+import * as DOM from '../services/dom';
 import {Component} from './component';
-import {copyTextToClipboard} from '../services/clipboard.ts';
-import {hashElement, normalizeNodeTextOffsetToParent} from "../services/dom.ts";
+import {copyTextToClipboard} from '../services/clipboard';
+import {hashElement, normalizeNodeTextOffsetToParent} from "../services/dom";
 import {PageComments} from "./page-comments";
 
 export class Pointer extends Component {
@@ -11,16 +11,16 @@ export class Pointer extends Component {
     protected targetElement: HTMLElement|null = null;
     protected targetSelectionRange: Range|null = null;
 
-    protected pointer: HTMLElement;
-    protected linkInput: HTMLInputElement;
-    protected linkButton: HTMLElement;
-    protected includeInput: HTMLInputElement;
-    protected includeButton: HTMLElement;
-    protected sectionModeButton: HTMLElement;
-    protected commentButton: HTMLElement;
-    protected modeToggles: HTMLElement[];
-    protected modeSections: HTMLElement[];
-    protected pageId: string;
+    protected pointer!: HTMLElement;
+    protected linkInput!: HTMLInputElement;
+    protected linkButton!: HTMLElement;
+    protected includeInput!: HTMLInputElement;
+    protected includeButton!: HTMLElement;
+    protected sectionModeButton!: HTMLElement;
+    protected commentButton!: HTMLElement;
+    protected modeToggles!: HTMLElement[];
+    protected modeSections!: HTMLElement[];
+    protected pageId!: string;
 
     setup() {
         this.pointer = this.$refs.pointer;
@@ -67,7 +67,7 @@ export class Pointer extends Component {
         DOM.onEvents(pageContent, ['mouseup', 'keyup'], event => {
             event.stopPropagation();
             const targetEl = (event.target as HTMLElement).closest('[id^="bkmrk"]');
-            if (targetEl && window.getSelection().toString().length > 0) {
+            if (targetEl instanceof HTMLElement && (window.getSelection() || '').toString().length > 0) {
                 const xPos = (event instanceof MouseEvent) ? event.pageX : 0;
                 this.showPointerAtTarget(targetEl, xPos, false);
             }
@@ -102,11 +102,8 @@ export class Pointer extends Component {
 
     /**
      * Move and display the pointer at the given element, targeting the given screen x-position if possible.
-     * @param {Element} element
-     * @param {Number} xPosition
-     * @param {Boolean} keyboardMode
      */
-    showPointerAtTarget(element, xPosition, keyboardMode) {
+    showPointerAtTarget(element: HTMLElement, xPosition: number, keyboardMode: boolean) {
         this.targetElement = element;
         this.targetSelectionRange = window.getSelection()?.getRangeAt(0) || null;
         this.updateDomForTarget(element);
@@ -134,7 +131,7 @@ export class Pointer extends Component {
             window.removeEventListener('scroll', scrollListener);
         };
 
-        element.parentElement.insertBefore(this.pointer, element);
+        element.parentElement?.insertBefore(this.pointer, element);
         if (!keyboardMode) {
             window.addEventListener('scroll', scrollListener, {passive: true});
         }
@@ -142,9 +139,8 @@ export class Pointer extends Component {
 
     /**
      * Update the pointer inputs/content for the given target element.
-     * @param {?Element} element
      */
-    updateDomForTarget(element) {
+    updateDomForTarget(element: HTMLElement) {
         const permaLink = window.baseUrl(`/link/${this.pageId}#${element.id}`);
         const includeTag = `{{@${this.pageId}#${element.id}}}`;
 
@@ -158,13 +154,13 @@ export class Pointer extends Component {
             const elementId = element.id;
 
             // Get the first 50 characters.
-            const queryContent = element.textContent && element.textContent.substring(0, 50);
+            const queryContent = (element.textContent || '').substring(0, 50);
             editAnchor.href = `${editHref}?content-id=${elementId}&content-text=${encodeURIComponent(queryContent)}`;
         }
     }
 
     enterSectionSelectMode() {
-        const sections = Array.from(document.querySelectorAll('.page-content [id^="bkmrk"]'));
+        const sections = Array.from(document.querySelectorAll('.page-content [id^="bkmrk"]')) as HTMLElement[];
         for (const section of sections) {
             section.setAttribute('tabindex', '0');
         }
@@ -172,12 +168,12 @@ export class Pointer extends Component {
         sections[0].focus();
 
         DOM.onEnterPress(sections, event => {
-            this.showPointerAtTarget(event.target, 0, true);
+            this.showPointerAtTarget(event.target as HTMLElement, 0, true);
             this.pointer.focus();
         });
     }
 
-    createCommentAtPointer(event) {
+    createCommentAtPointer() {
         if (!this.targetElement) {
             return;
         }
diff --git a/resources/js/components/tabs.ts b/resources/js/components/tabs.ts
index 56405b8c78e..a03d37cd48c 100644
--- a/resources/js/components/tabs.ts
+++ b/resources/js/components/tabs.ts
@@ -1,5 +1,9 @@
 import {Component} from './component';
 
+export interface TabsChangeEvent {
+    showing: string;
+}
+
 /**
  * Tabs
  * Uses accessible attributes to drive its functionality.
@@ -19,12 +23,12 @@ import {Component} from './component';
  */
 export class Tabs extends Component {
 
-    protected container: HTMLElement;
-    protected tabList: HTMLElement;
-    protected tabs: HTMLElement[];
-    protected panels: HTMLElement[];
+    protected container!: HTMLElement;
+    protected tabList!: HTMLElement;
+    protected tabs!: HTMLElement[];
+    protected panels!: HTMLElement[];
 
-    protected activeUnder: number;
+    protected activeUnder!: number;
     protected active: null|boolean = null;
 
     setup() {
@@ -58,7 +62,8 @@ export class Tabs extends Component {
             tab.setAttribute('aria-selected', selected ? 'true' : 'false');
         }
 
-        this.$emit('change', {showing: sectionId});
+        const data: TabsChangeEvent = {showing: sectionId};
+        this.$emit('change', data);
     }
 
     protected updateActiveState(): void {
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 77c19a76105..c3817536c85 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -225,7 +225,7 @@ export function findTargetNodeAndOffset(parentNode: HTMLElement, offset: number)
         if (currentNode.nodeType === Node.TEXT_NODE) {
             // For text nodes, count the length of their content
             // Returns if within range
-            const textLength = currentNode.textContent.length;
+            const textLength = (currentNode.textContent || '').length;
             if (currentOffset + textLength >= offset) {
                 return {
                     node: currentNode,
@@ -237,9 +237,9 @@ export function findTargetNodeAndOffset(parentNode: HTMLElement, offset: number)
         } else if (currentNode.nodeType === Node.ELEMENT_NODE) {
             // Otherwise, if an element, track the text length and search within
             // if in range for the target offset
-            const elementTextLength = currentNode.textContent.length;
+            const elementTextLength = (currentNode.textContent || '').length;
             if (currentOffset + elementTextLength >= offset) {
-                return findTargetNodeAndOffset(currentNode, offset - currentOffset);
+                return findTargetNodeAndOffset(currentNode as HTMLElement, offset - currentOffset);
             }
 
             currentOffset += elementTextLength;
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index 7dae6dc29d9..6045d51f823 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -1,7 +1,9 @@
 import {HttpError} from "./http";
 
+type Listener = (data: any) => void;
+
 export class EventManager {
-    protected listeners: Record<string, ((data: any) => void)[]> = {};
+    protected listeners: Record<string, Listener[]> = {};
     protected stack: {name: string, data: {}}[] = [];
 
     /**
@@ -27,7 +29,7 @@ export class EventManager {
     /**
      * Remove an event listener which is using the given callback for the given event name.
      */
-    remove(eventName: string, callback: Function): void {
+    remove(eventName: string, callback: Listener): void {
         const listeners = this.listeners[eventName] || [];
         const index = listeners.indexOf(callback);
         if (index !== -1) {
@@ -64,8 +66,7 @@ export class EventManager {
     /**
      * Notify of standard server-provided validation errors.
      */
-    showValidationErrors(responseErr: {status?: number, data?: object}): void {
-        if (!responseErr.status) return;
+    showValidationErrors(responseErr: HttpError): void {
         if (responseErr.status === 422 && responseErr.data) {
             const message = Object.values(responseErr.data).flat().join('\n');
             this.error(message);

From 32b29fcdfc9e54416d5c01cf54b8a9df6753d326 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 13 May 2025 12:03:15 +0100
Subject: [PATCH 532/666] Comments: Fixed pointer display, Fixed translation
 test

---
 resources/js/services/__tests__/translations.test.ts |  5 +++++
 resources/js/services/translations.ts                |  2 +-
 resources/sass/_pages.scss                           | 12 +++++-------
 resources/views/pages/parts/pointer.blade.php        | 10 +++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/resources/js/services/__tests__/translations.test.ts b/resources/js/services/__tests__/translations.test.ts
index 043f1745ff6..5014051ab04 100644
--- a/resources/js/services/__tests__/translations.test.ts
+++ b/resources/js/services/__tests__/translations.test.ts
@@ -58,6 +58,11 @@ describe('Translations Service', () => {
             expect(caseB).toEqual('an orange angry big dinosaur');
         });
 
+        test('it provides count as a replacement by default', () => {
+            const caseA = $trans.choice(`:count cats|:count dogs`, 4);
+            expect(caseA).toEqual('4 dogs');
+        });
+
         test('not provided replacements are left as-is', () => {
             const caseA = $trans.choice(`An :a dog`, 5, {});
             expect(caseA).toEqual('An :a dog');
diff --git a/resources/js/services/translations.ts b/resources/js/services/translations.ts
index 821c34f18f7..f548a51d1d1 100644
--- a/resources/js/services/translations.ts
+++ b/resources/js/services/translations.ts
@@ -10,7 +10,7 @@ export class Translator {
      * to use. Similar format at Laravel's 'trans_choice' helper.
      */
     choice(translation: string, count: number, replacements: Record<string, string> = {}): string {
-        replacements = Object.assign({}, replacements, {count: String(count)});
+        replacements = Object.assign({}, {count: String(count)}, replacements);
         const splitText = translation.split('|');
         const exactCountRegex = /^{([0-9]+)}/;
         const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 621d08f45f2..83aec46f093 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -158,11 +158,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   border-radius: 4px;
   box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.1);
   @include mixins.lightDark(background-color, #fff, #333);
-  width: 275px;
-
-  &.is-page-editable {
-    width: 328px;
-  }
+  width: 328px;
 
   &:before {
     position: absolute;
@@ -193,7 +189,8 @@ body.tox-fullscreen, body.markdown-fullscreen {
     border: 1px solid #DDD;
     @include mixins.lightDark(border-color, #ddd, #000);
     color: #666;
-    width: 180px;
+    width: auto;
+    flex: 1;
     z-index: 58;
     padding: 5px;
     border-radius: 0;
@@ -203,7 +200,8 @@ body.tox-fullscreen, body.markdown-fullscreen {
   }
   .input-group .button {
     line-height: 1;
-    margin: 0 0 0 -5px;
+    margin-inline-start: -1px;
+    margin-block: 0;
     box-shadow: none;
     border-radius: 0;
   }
diff --git a/resources/views/pages/parts/pointer.blade.php b/resources/views/pages/parts/pointer.blade.php
index 77fc763827e..f6487b66600 100644
--- a/resources/views/pages/parts/pointer.blade.php
+++ b/resources/views/pages/parts/pointer.blade.php
@@ -6,21 +6,21 @@
          tabindex="-1"
          aria-label="{{ trans('entities.pages_pointer_label') }}"
          class="pointer-container">
-        <div class="pointer flex-container-row items-center justify-space-between gap-xs p-xs anim {{ userCan('page-update', $page) ? 'is-page-editable' : ''}}" >
-            <div refs="pointer@mode-section" class="flex-container-row items-center gap-xs">
+        <div class="pointer flex-container-row items-center justify-space-between gap-xs p-xs anim" >
+            <div refs="pointer@mode-section" class="flex flex-container-row items-center gap-xs">
                 <button refs="pointer@mode-toggle"
                         title="{{ trans('entities.pages_pointer_toggle_link') }}"
                         class="text-button icon px-xs">@icon('link')</button>
-                <div class="input-group">
+                <div class="input-group flex flex-container-row items-center">
                     <input refs="pointer@link-input" aria-label="{{ trans('entities.pages_pointer_permalink') }}" readonly="readonly" type="text" id="pointer-url" placeholder="url">
                     <button refs="pointer@link-button" class="button outline icon px-xs" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
                 </div>
             </div>
-            <div refs="pointer@mode-section" hidden class="flex-container-row items-center gap-s">
+            <div refs="pointer@mode-section" hidden class="flex flex-container-row items-center gap-xs">
                 <button refs="pointer@mode-toggle"
                         title="{{ trans('entities.pages_pointer_toggle_include') }}"
                         class="text-button icon px-xs">@icon('include')</button>
-                <div class="input-group">
+                <div class="input-group flex flex-container-row items-center">
                     <input refs="pointer@include-input" aria-label="{{ trans('entities.pages_pointer_include_tag') }}" readonly="readonly" type="text" id="pointer-include" placeholder="include">
                     <button refs="pointer@include-button" class="button outline icon px-xs" type="button" title="{{ trans('entities.pages_copy_link') }}">@icon('copy')</button>
                 </div>

From 058007109e3f62a649e43ab06802ddbfaadef999 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 13 May 2025 20:38:08 +0100
Subject: [PATCH 533/666] API: Added system read endpoint

Standardised logic for reading app version to its own static class.
---
 app/Api/ApiDocsGenerator.php                  |  3 +-
 app/App/AppVersion.php                        | 24 ++++++++++++++
 app/App/SystemApiController.php               | 31 +++++++++++++++++++
 app/App/helpers.php                           |  8 ++---
 .../BookStackExceptionHandlerPage.php         |  5 ++-
 app/Exports/ZipExports/ZipExportBuilder.php   |  3 +-
 app/Settings/MaintenanceController.php        |  6 ++--
 app/Settings/SettingController.php            |  6 ++--
 dev/api/responses/system-read.json            |  7 +++++
 routes/api.php                                |  3 ++
 10 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 app/App/AppVersion.php
 create mode 100644 app/App/SystemApiController.php
 create mode 100644 dev/api/responses/system-read.json

diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php
index 9cae80617e5..287c8387790 100644
--- a/app/Api/ApiDocsGenerator.php
+++ b/app/Api/ApiDocsGenerator.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Api;
 
+use BookStack\App\AppVersion;
 use BookStack\Http\ApiController;
 use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
@@ -25,7 +26,7 @@ class ApiDocsGenerator
      */
     public static function generateConsideringCache(): Collection
     {
-        $appVersion = trim(file_get_contents(base_path('version')));
+        $appVersion = AppVersion::get();
         $cacheKey = 'api-docs::' . $appVersion;
         $isProduction = config('app.env') === 'production';
         $cacheVal = $isProduction ? Cache::get($cacheKey) : null;
diff --git a/app/App/AppVersion.php b/app/App/AppVersion.php
new file mode 100644
index 00000000000..af422f64114
--- /dev/null
+++ b/app/App/AppVersion.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\App;
+
+class AppVersion
+{
+    protected static string $version = '';
+
+    /**
+     * Get the application's version number from its top-level `version` text file.
+     */
+    public static function get(): string
+    {
+        if (!empty(static::$version)) {
+            return static::$version;
+        }
+
+        $versionFile = base_path('version');
+        $version = trim(file_get_contents($versionFile));
+        static::$version = $version;
+
+        return $version;
+    }
+}
diff --git a/app/App/SystemApiController.php b/app/App/SystemApiController.php
new file mode 100644
index 00000000000..c476a74e998
--- /dev/null
+++ b/app/App/SystemApiController.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace BookStack\App;
+
+use BookStack\Http\ApiController;
+use Illuminate\Http\JsonResponse;
+
+class SystemApiController extends ApiController
+{
+    /**
+     * Read details regarding the BookStack instance.
+     * Some details may be null where not set, like the app logo for example.
+     */
+    public function read(): JsonResponse
+    {
+        $logoSetting = setting('app-logo', '');
+        if ($logoSetting === 'none') {
+            $logo = null;
+        } else {
+            $logo = $logoSetting ? url($logoSetting) : url('/logo.png');
+        }
+
+        return response()->json([
+            'version' => AppVersion::get(),
+            'instance_id' => setting('instance-id'),
+            'app_name' => setting('app-name'),
+            'app_logo' => $logo,
+            'base_url' => url('/'),
+        ]);
+    }
+}
diff --git a/app/App/helpers.php b/app/App/helpers.php
index eec86553fb4..2305c2d72a1 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -1,5 +1,6 @@
 <?php
 
+use BookStack\App\AppVersion;
 use BookStack\App\Model;
 use BookStack\Facades\Theme;
 use BookStack\Permissions\PermissionApplicator;
@@ -13,12 +14,7 @@
  */
 function versioned_asset(string $file = ''): string
 {
-    static $version = null;
-
-    if (is_null($version)) {
-        $versionFile = base_path('version');
-        $version = trim(file_get_contents($versionFile));
-    }
+    $version = AppVersion::get();
 
     $additional = '';
     if (config('app.env') === 'development') {
diff --git a/app/Exceptions/BookStackExceptionHandlerPage.php b/app/Exceptions/BookStackExceptionHandlerPage.php
index 78f586ad0c9..a53733ac7ee 100644
--- a/app/Exceptions/BookStackExceptionHandlerPage.php
+++ b/app/Exceptions/BookStackExceptionHandlerPage.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exceptions;
 
+use BookStack\App\AppVersion;
 use Illuminate\Contracts\Foundation\ExceptionRenderer;
 
 class BookStackExceptionHandlerPage implements ExceptionRenderer
@@ -30,9 +31,7 @@ protected function getEnvironment(): array
         return [
             'PHP Version'       => phpversion(),
             'BookStack Version' => $this->safeReturn(function () {
-                $versionFile = base_path('version');
-
-                return trim(file_get_contents($versionFile));
+                return AppVersion::get();
             }, 'unknown'),
             'Theme Configured' => $this->safeReturn(function () {
                 return config('view.theme');
diff --git a/app/Exports/ZipExports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
index 9a52c9a3cb8..9937d158975 100644
--- a/app/Exports/ZipExports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Exports\ZipExports;
 
+use BookStack\App\AppVersion;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
@@ -70,7 +71,7 @@ protected function build(): string
         $this->data['exported_at'] = date(DATE_ATOM);
         $this->data['instance'] = [
             'id'      => setting('instance-id', ''),
-            'version' => trim(file_get_contents(base_path('version'))),
+            'version' => AppVersion::get(),
         ];
 
         $zipFile = tempnam(sys_get_temp_dir(), 'bszip-');
diff --git a/app/Settings/MaintenanceController.php b/app/Settings/MaintenanceController.php
index 0382ae08a6d..ac9dd20ccb2 100644
--- a/app/Settings/MaintenanceController.php
+++ b/app/Settings/MaintenanceController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Settings;
 
 use BookStack\Activity\ActivityType;
+use BookStack\App\AppVersion;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceStore;
@@ -19,14 +20,11 @@ public function index(TrashCan $trashCan)
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.maint'));
 
-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
         // Recycle bin details
         $recycleStats = $trashCan->getTrashedCounts();
 
         return view('settings.maintenance', [
-            'version'      => $version,
+            'version'      => AppVersion::get(),
             'recycleStats' => $recycleStats,
         ]);
     }
diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index 1c5f13bc67f..3b7ba74d58a 100644
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Settings;
 
 use BookStack\Activity\ActivityType;
+use BookStack\App\AppVersion;
 use BookStack\Http\Controller;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
@@ -26,12 +27,9 @@ public function category(string $category)
         $this->checkPermission('settings-manage');
         $this->setPageTitle(trans('settings.settings'));
 
-        // Get application version
-        $version = trim(file_get_contents(base_path('version')));
-
         return view('settings.categories.' . $category, [
             'category'  => $category,
-            'version'   => $version,
+            'version'   => AppVersion::get(),
             'guestUser' => User::getGuest(),
         ]);
     }
diff --git a/dev/api/responses/system-read.json b/dev/api/responses/system-read.json
new file mode 100644
index 00000000000..4687d6ffc09
--- /dev/null
+++ b/dev/api/responses/system-read.json
@@ -0,0 +1,7 @@
+{
+  "version": "v25.02.4",
+  "instance_id": "1234abcd-cc12-7808-af0a-264cb0cbd611",
+  "app_name": "My BookStack Instance",
+  "app_logo": "https://docs.example.com/uploads/images/system/2025-05/cat-icon.png",
+  "base_url": "https://docs.example.com"
+}
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 71036485597..85e872ba4fb 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -8,6 +8,7 @@
 
 use BookStack\Activity\Controllers\AuditLogApiController;
 use BookStack\Api\ApiDocsController;
+use BookStack\App\SystemApiController;
 use BookStack\Entities\Controllers as EntityControllers;
 use BookStack\Exports\Controllers as ExportControllers;
 use BookStack\Permissions\ContentPermissionApiController;
@@ -92,3 +93,5 @@
 Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
 
 Route::get('audit-log', [AuditLogApiController::class, 'list']);
+
+Route::get('system', [SystemApiController::class, 'read']);

From 0e69ab1938ec2ad7e667dfc0111ce432c2c11ff7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 13 May 2025 20:46:11 +0100
Subject: [PATCH 534/666] API: Added test to cover system info endpoint

---
 tests/Api/SystemApiTest.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/Api/SystemApiTest.php

diff --git a/tests/Api/SystemApiTest.php b/tests/Api/SystemApiTest.php
new file mode 100644
index 00000000000..21e378d6116
--- /dev/null
+++ b/tests/Api/SystemApiTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Api;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Facades\Activity;
+use Tests\Api\TestsApi;
+use Tests\TestCase;
+
+class SystemApiTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_read_returns_app_info(): void
+    {
+        $resp = $this->actingAsApiEditor()->get('/api/system');
+        $data = $resp->json();
+
+        $this->assertStringStartsWith('v', $data['version']);
+        $this->assertEquals(setting('instance-id'), $data['instance_id']);
+        $this->assertEquals(setting('app-name'), $data['app_name']);
+        $this->assertEquals(url('/logo.png'), $data['app_logo']);
+        $this->assertEquals(url('/'), $data['base_url']);
+    }
+}

From 5ab31a81910b580bf3f86377926ef2d1fb58fac6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 14 May 2025 18:15:20 +0100
Subject: [PATCH 535/666] Images: Updated local disk to have open dir perms

Closes #5605
---
 app/Config/filesystems.php         |  1 +
 app/Uploads/ImageStorageDisk.php   |  3 ++-
 tests/Uploads/ImageStorageTest.php | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/Uploads/ImageStorageTest.php

diff --git a/app/Config/filesystems.php b/app/Config/filesystems.php
index ab507a2f8c6..ab73fec2968 100644
--- a/app/Config/filesystems.php
+++ b/app/Config/filesystems.php
@@ -34,6 +34,7 @@
             'root'       => public_path(),
             'serve'      => false,
             'throw'      => true,
+            'directory_visibility' => 'public',
         ],
 
         'local_secure_attachments' => [
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index 8e364831f75..f2667d993a8 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -7,6 +7,7 @@
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\Log;
 use League\Flysystem\UnableToSetVisibility;
+use League\Flysystem\Visibility;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ImageStorageDisk
@@ -85,7 +86,7 @@ public function put(string $path, string $data, bool $makePublic = false): void
         // require different ACLs for S3, and this provides us more logical control.
         if ($makePublic && !$this->isS3Like()) {
             try {
-                $this->filesystem->setVisibility($path, 'public');
+                $this->filesystem->setVisibility($path, Visibility::PUBLIC);
             } catch (UnableToSetVisibility $e) {
                 Log::warning("Unable to set visibility for image upload with relative path: {$path}");
             }
diff --git a/tests/Uploads/ImageStorageTest.php b/tests/Uploads/ImageStorageTest.php
new file mode 100644
index 00000000000..117da7f5299
--- /dev/null
+++ b/tests/Uploads/ImageStorageTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Uploads;
+
+use BookStack\Uploads\ImageStorage;
+use Tests\TestCase;
+
+class ImageStorageTest extends TestCase
+{
+    public function test_local_image_storage_sets_755_directory_permissions()
+    {
+        if (PHP_OS_FAMILY !== 'Linux') {
+            $this->markTestSkipped('Test only works on Linux');
+        }
+
+        config()->set('filesystems.default', 'local');
+        $storage = $this->app->make(ImageStorage::class);
+        $dirToCheck = 'test-dir-perms-' . substr(md5(random_bytes(16)), 0, 6);
+
+        $disk = $storage->getDisk('gallery');
+        $disk->put("{$dirToCheck}/image.png", 'abc', true);
+
+        $expectedPath = public_path("uploads/images/{$dirToCheck}");
+        $permissionsApplied = substr(sprintf('%o', fileperms($expectedPath)), -4);
+        $this->assertEquals('0755', $permissionsApplied);
+
+        @unlink("{$expectedPath}/image.png");
+        @rmdir($expectedPath);
+    }
+}

From 8121418e1837c670aa711bfbc44094c03bcee72a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 14 May 2025 22:35:59 +0100
Subject: [PATCH 536/666] Readme: Added phamos as sponsor

---
 readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/readme.md b/readme.md
index d6641a53bb3..3a5da8a9993 100644
--- a/readme.md
+++ b/readme.md
@@ -86,6 +86,11 @@ Big thanks to these companies for supporting the project.
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
 </tr>
+<tr>
+<td colspan="2" align="center"><a href="https://phamos.eu" target="_blank">
+    <img width="136" src="https://www.bookstackapp.com/images/sponsors/phamos.png" alt="phamos">
+</a></td>
+</tr>
 </tbody></table>
 
 ## 🛠️ Development & Testing

From d2d0331782d46bbd97385c277f0cd651c79bdd5b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 14 May 2025 23:15:46 +0100
Subject: [PATCH 537/666] Readme: Replaced discord/mastodon links, reformatted
 badges

---
 readme.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/readme.md b/readme.md
index 3a5da8a9993..e1c890e0b69 100644
--- a/readme.md
+++ b/readme.md
@@ -6,12 +6,12 @@
 [![Build Status](https://github.com/BookStackApp/BookStack/workflows/test-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
 [![Lint Status](https://github.com/BookStackApp/BookStack/workflows/lint-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/5551731994dd22fa1f4f/maintainability)](https://codeclimate.com/github/BookStackApp/BookStack/maintainability)
-
+<br>
 [![Alternate Source](https://img.shields.io/static/v1?label=Alt+Source&message=Git&color=ef391a&logo=git)](https://source.bookstackapp.com/)
 [![Repo Stats](https://img.shields.io/static/v1?label=GitHub+project&message=stats&color=f27e3f)](https://gh-stats.bookstackapp.com/)
-[![Discord](https://img.shields.io/static/v1?label=Discord&message=chat&color=738adb&logo=discord)](https://discord.gg/ztkBqR2)
-[![Mastodon](https://img.shields.io/static/v1?label=Mastodon&message=@bookstack&color=595aff&logo=mastodon)](https://fosstodon.org/@bookstack)
-
+[![Discord](https://img.shields.io/static/v1?label=Discord&message=chat&color=738adb&logo=discord)](https://www.bookstackapp.com/links/discord)
+[![Mastodon](https://img.shields.io/static/v1?label=Mastodon&message=@bookstack&color=595aff&logo=mastodon)](https://www.bookstackapp.com/links/mastodon)
+<br>
 [![PeerTube](https://img.shields.io/static/v1?label=PeerTube&message=bookstack@foss.video&color=f2690d&logo=peertube)](https://foss.video/c/bookstack)
 [![YouTube](https://img.shields.io/static/v1?label=YouTube&message=bookstackapp&color=ff0000&logo=youtube)](https://www.youtube.com/bookstackapp)
 
@@ -24,7 +24,7 @@ A platform for storing and organising information and documentation. Details for
 * [Screenshots](https://www.bookstackapp.com/#screenshots) 
 * [BookStack Blog](https://www.bookstackapp.com/blog)
 * [Issue List](https://github.com/BookStackApp/BookStack/issues)
-* [Discord Chat](https://discord.gg/ztkBqR2)
+* [Discord Chat](https://www.bookstackapp.com/links/discord)
 * [Support Options](https://www.bookstackapp.com/support/)
 
 ## 📚 Project Definition

From 25baaa818990bfdcbdc5610104362cd528eee1b7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 17 May 2025 11:40:58 +0100
Subject: [PATCH 538/666] Deps: Updated composer packages

---
 composer.lock | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/composer.lock b/composer.lock
index 04dfaa501b9..5458bb587a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.6",
+            "version": "3.343.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "3746aca8cbed5f46beba850e0a480ef58e71b197"
+                "reference": "eb50d111a09ef39675358e74801260ac129ee346"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3746aca8cbed5f46beba850e0a480ef58e71b197",
-                "reference": "3746aca8cbed5f46beba850e0a480ef58e71b197",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb50d111a09ef39675358e74801260ac129ee346",
+                "reference": "eb50d111a09ef39675358e74801260ac129ee346",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.13"
             },
-            "time": "2025-05-07T18:10:08+00:00"
+            "time": "2025-05-16T18:24:39+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -8588,16 +8588,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.14",
+            "version": "2.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2"
+                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
-                "reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
+                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
                 "shasum": ""
             },
             "require": {
@@ -8642,7 +8642,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-02T15:32:28+00:00"
+            "time": "2025-05-16T09:40:10+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8969,16 +8969,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.19",
+            "version": "11.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5"
+                "reference": "e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5",
-                "reference": "0da1ebcdbc4d5bd2d189cfe02846a89936d8dda5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f",
+                "reference": "e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f",
                 "shasum": ""
             },
             "require": {
@@ -9050,7 +9050,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.20"
             },
             "funding": [
                 {
@@ -9074,7 +9074,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-02T06:56:52+00:00"
+            "time": "2025-05-11T06:39:52+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10004,16 +10004,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.12.2",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa"
+                "reference": "65ff2489553b83b4597e89c3b8b721487011d186"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
-                "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186",
+                "reference": "65ff2489553b83b4597e89c3b8b721487011d186",
                 "shasum": ""
             },
             "require": {
@@ -10084,7 +10084,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-04-13T04:10:18+00:00"
+            "time": "2025-05-11T03:36:00+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",

From 752cfe2f6743336d76752d84ce66f8c10fc3d7a3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 17 May 2025 11:47:33 +0100
Subject: [PATCH 539/666] CLI: Updated CLI with fixes

- Updated php packages
- Added escaping for mysql options
---
 bookstack-system-cli | Bin 388307 -> 388792 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bookstack-system-cli b/bookstack-system-cli
index 6283aa0cb41b89164a5fb67a2f208c03475e0d37..c55c5a8a7840523d5de1a2b1ee74c13723e1eb6b 100755
GIT binary patch
delta 39483
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

delta 39230
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
Q29#%2tpfl607pViLO*=GZvX%Q


From cdd446ac7329faffd89ca68f548b030e8feafa32 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sat, 17 May 2025 12:04:25 +0100
Subject: [PATCH 540/666] Updated translations with latest Crowdin changes
 (#5608)

---
 lang/lv/activities.php  | 24 ++++++++---------
 lang/lv/common.php      |  2 +-
 lang/lv/editor.php      |  8 +++---
 lang/lv/entities.php    | 54 +++++++++++++++++++-------------------
 lang/lv/errors.php      | 22 ++++++++--------
 lang/lv/preferences.php | 18 ++++++-------
 lang/lv/settings.php    | 58 ++++++++++++++++++++---------------------
 lang/lv/validation.php  |  8 +++---
 8 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index 3f6e38c13a5..38d9ae21766 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook veiksmīgi izdzēsts',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'izveidoja importu',
+    'import_create_notification' => 'Imports veiksmīgi augšupielādēts',
+    'import_run' => 'atjaunoja importu',
+    'import_run_notification' => 'Saturs veiksmīgi importēts',
+    'import_delete' => 'izdzēsa importu',
+    'import_delete_notification' => 'Imports veiksmīgi dzēsts',
 
     // Users
     'user_create' => 'izveidoja lietotāju',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'dzēsa komentāru',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'izveidoja kārtošanas nosacījumu',
+    'sort_rule_create_notification' => 'Kārtošanas nosacījums veiksmīgi izveidots',
+    'sort_rule_update' => 'atjaunoja kārtošanas nosacījumu',
+    'sort_rule_update_notification' => 'Kārtošanas nosacījums veiksmīgi atjaunots',
+    'sort_rule_delete' => 'izdzēsa kārtošanas nosacījumu',
+    'sort_rule_delete_notification' => 'Kārtošanas nosacījums veiksmīgi dzēsts',
 
     // Other
     'permissions_update'          => 'atjaunoja atļaujas',
diff --git a/lang/lv/common.php b/lang/lv/common.php
index 584b24cb2e7..05c4629773c 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -109,5 +109,5 @@
     'terms_of_service' => 'Pakalpojuma noteikumi',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Meklēt :appName',
 ];
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index 05863fd30af..ad794da9c15 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Atcelt',
     'save' => 'Saglabāt',
     'close' => 'Aizvērt',
-    'apply' => 'Apply',
+    'apply' => 'Pielietot',
     'undo' => 'Atsaukt',
     'redo' => 'Atcelt atsaukšanu',
     'left' => 'Pa kreisi',
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Attēlojamais teksts',
     'title' => 'Nosaukums',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Pārlūkot saites',
     'open_link' => 'Atvērt saiti',
     'open_link_in' => 'Atvērt saiti...',
     'open_link_current' => 'Šis logs',
@@ -165,8 +165,8 @@
     'about' => 'Par redaktoru',
     'about_title' => 'Par WYSIWYG redaktoru',
     'editor_license' => 'Redaktora licence un autortiesības',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar MIT licenci.',
+    'editor_lexical_license_link' => 'Pilnu licences informāciju var atrast šeit.',
     'editor_tiny_license' => 'Šis redaktors ir izveidots, izmantojot :tinyLink, kas ir publicēts ar MIT licenci.',
     'editor_tiny_license_link' => 'TinyMCE autortiesības un licences detaļas var atrast šeit.',
     'save_continue' => 'Saglabāt lapu un turpināt',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index e9aad99e581..1c6e6def4b9 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF fails',
     'export_text' => 'Vienkāršs teksta fails',
     'export_md' => 'Markdown fails',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Pārceļams ZIP arhīvs',
     'default_template' => 'Noklusētā lapas sagatave',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
+    'default_template_explain' => 'Norādīt lapas sagatavi, kas tiks izmantota kā noklusētais saturs visām jaunājām lapām šajā grāmatā. Ņemiet vērā, ka tā tiks izmantota tikai tad, ja lapas veidotājam ir skatīšanas tiesības izvēlētajai sagatavei.',
     'default_template_select' => 'Izvēlēt sagataves lapu',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importēt',
+    'import_validate' => 'Pārbaudīt importu',
+    'import_desc' => 'Importēt grāmatas, nodaļas un lapas izmantojot pārceļamu ZIP arhīvu no šīs vai citas sistēmas instances. Izvēlietites ZIP failu, lai turpinātu. Kad fails ir augšupielādēts un pārbaudīts, jūs varēsiet veikt importa uzstādījumus un to apstiprināt nākamajā skatā.',
+    'import_zip_select' => 'Izvēlieties ZIP failu, ko augšupielādēt',
+    'import_zip_validation_errors' => 'Pārbaudot ZIP failu atrastas šādas kļūdas:',
+    'import_pending' => 'Gaidošie importi',
+    'import_pending_none' => 'Neviens imports nav uzsākts.',
+    'import_continue' => 'Turpināt importu',
+    'import_continue_desc' => 'Pārlūkot saturu, kas tiktu importēts no augšupielādētā ZIP faila. Kad esat gatavs, palaidiet importu, lai pievienotu tā saturu šai sistēmai. Augšupielādētais ZIP fails tiks automātiski izvākts pēc veiksmīga importa.',
+    'import_details' => 'Importa detaļas',
+    'import_run' => 'Palaist importu',
+    'import_size' => ':size importa ZIP izmērs',
+    'import_uploaded_at' => 'Augšupielādes laiks :relativeTime',
+    'import_uploaded_by' => 'Augšupielādēja',
+    'import_location' => 'Importa vieta',
+    'import_location_desc' => 'Izvēlieties mērķa vietu jūsu importētajam saturam. Jums būs nepieciešamas attiecīgās piekļuves tiesības, lai izveidotu saturu izvēlētajā vietā.',
+    'import_delete_confirm' => 'Vai tiešām vēlaties dzēst šo importu?',
+    'import_delete_desc' => 'Šis izdzēsīs augšupielādēto importa ZIP failu, un šo darbību nevarēs atcelt.',
+    'import_errors' => 'Importa kļūdas',
+    'import_errors_desc' => 'Importa mēģinājumā atgadījās šīs kļūdas:',
 
     // Permissions and restrictions
     'permissions' => 'Atļaujas',
@@ -247,8 +247,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Iztīrītais saturs)',
     'pages_edit_switch_to_markdown_stable' => '(Stabilais saturs)',
     'pages_edit_switch_to_wysiwyg' => 'Pārslēgties uz WYSIWYG redaktoru',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Pārslēgties uz jauno WYSIWYG redaktoru',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa testēšanā)',
     'pages_edit_set_changelog' => 'Pievienot izmaiņu aprakstu',
     'pages_edit_enter_changelog_desc' => 'Ievadi nelielu aprakstu par vaiktajām izmaiņām',
     'pages_edit_enter_changelog' => 'Izmaiņu apraksts',
@@ -452,9 +452,9 @@
     'watch_desc_comments_page' => 'Paziņot par lapu izmaiņām un jauniem komentāriem.',
     'watch_change_default' => 'Izmainīt noklusētos paziņojumu uzstādījumus',
     'watch_detail_ignore' => 'Ignorēt paziņojumus',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
+    'watch_detail_new' => 'Vērot jaunas lapas',
+    'watch_detail_updates' => 'Vērot jaunas lapas un atjauninājumus',
+    'watch_detail_comments' => 'Vērot jaunas lapas, atjauninājumus un komentārus',
     'watch_detail_parent_book' => 'Watching via parent book',
     'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
     'watch_detail_parent_chapter' => 'Watching via parent chapter',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 40d755e61f3..28cc0d892c1 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Jūs nevarat dzēst vienīgo administratoru',
     'users_cannot_delete_guest' => 'Jūs nevarat dzēst lietotāju "viesis"',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Neizdevās izveidot lietotāju, jo neizdevās nosūtīt ielūguma epastu',
 
     // Roles
     'role_cannot_be_edited' => 'Šo lomu nevar rediģēt',
@@ -106,16 +106,16 @@
     'back_soon' => 'Drīz būs atkal pieejams.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Nevarēja nolasīt ZIP failu.',
+    'import_zip_cant_decode_data' => 'Nevarēja atrast un nolasīt data.json saturu ZIP failā.',
+    'import_zip_no_data' => 'ZIP faila datos nav atrasts grāmatu, nodaļu vai lapu saturs.',
+    'import_validation_failed' => 'ZIP faila imports ir neveiksmīgs ar šādām kļūdām:',
+    'import_zip_failed_notification' => 'ZIP faila imports ir neveiksmīgs.',
+    'import_perms_books' => 'Jums nav nepieciešamo tiesību izveidot grāmatas.',
+    'import_perms_chapters' => 'Jums nav nepieciešamo tiesību izveidot nodaļas.',
+    'import_perms_pages' => 'Jums nav nepieciešamo tiesību izveidot lapas.',
+    'import_perms_images' => 'Jums nav nepieciešamo tiesību izviedot attēlus.',
+    'import_perms_attachments' => 'Jums nav nepieciešamo tiesību izveidot pielikumus.',
 
     // API errors
     'api_no_authorization_found' => 'Pieprasījumā nav atrasts autorizācijas žetons',
diff --git a/lang/lv/preferences.php b/lang/lv/preferences.php
index 18def9f5c7c..b91cc2e0833 100644
--- a/lang/lv/preferences.php
+++ b/lang/lv/preferences.php
@@ -9,25 +9,25 @@
 
     'shortcuts' => 'Saīsnes',
     'shortcuts_interface' => 'Saskarnes īsceļu iestatījumi',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
+    'shortcuts_toggle_desc' => 'Šeit jūs varat ieslēgt vai izslēgt sistēmas saskarnes klaviatūras īsceļus, kas tiek izmantoti navigācijai un darbībām.',
+    'shortcuts_customize_desc' => 'Jūs varat pielāgot katru no zemāk esošajiem īsceļiem. Vienkārši nospiediet nepieciešamo pogu kombināciju pēc tam, kad izvēlēts īsceļa ievadlauks.',
     'shortcuts_toggle_label' => 'Klaviatūras saīsnes ieslēgtas',
     'shortcuts_section_navigation' => 'Navigācija',
     'shortcuts_section_actions' => 'Biežākās darbības',
     'shortcuts_save' => 'Saglabāt saīsnes',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
+    'shortcuts_overlay_desc' => 'Piezīme: kad īsceļi ir ieslēgti, ir pieejams palīdzības lodziņš, kas parādās, nospiežot "?". Tas attēlos pieejamos īsceļus tajā brīdī pieejamajām darbībām.',
     'shortcuts_update_success' => 'Saīsņu uzstādījumi ir saglabāt!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
+    'shortcuts_overview_desc' => 'Pārvaldīt klaviatūras īsceļus, ko var izmantot sistēmas saskarnes navigācijai.',
 
     'notifications' => 'Paziņojumu iestatījumi',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
+    'notifications_desc' => 'Pārvaldiet epasta paziņojumus, ko saņemsiet, kad sistēmā tiek veiktas noteiktas darbības.',
     'notifications_opt_own_page_changes' => 'Paziņot par izmaiņām manās lapās',
     'notifications_opt_own_page_comments' => 'Paziņot par komentāriem manās lapās',
     'notifications_opt_comment_replies' => 'Paziņot par atbildēm uz maniem komentāriem',
     'notifications_save' => 'Saglabāt iestatījumus',
     'notifications_update_success' => 'Paziņojumu iestatījumi ir atjaunoti!',
     'notifications_watched' => 'Vērotie un ignorētie vienumi',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_watched_desc' => 'Zemāk ir vienumi, kam piemēroti īpaši vērošanas nosacījumi. Lai atjaunintātu savus uzstādījums šiem, apskatiet vienumu un tad sameklējiet vērošanas uzstādījumus sānu kolonnā.',
 
     'auth' => 'Piekļuve un drošība',
     'auth_change_password' => 'Mainīt paroli',
@@ -35,12 +35,12 @@
     'auth_change_password_success' => 'Parole ir nomainīta!',
 
     'profile' => 'Profila informācija',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_desc' => 'Pārvaldiet sava konta detaļas, kas jūs attēlo citiem lietotājiem, kā arī detaļas, kas tiek izmantotas saziņai un sistēmas pielāgošanai.',
     'profile_view_public' => 'Skatīt publisko profilu',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
+    'profile_name_desc' => 'Uzstādiet savu vārdu, kas tiks parādīts citiem lietotājiem sistēmā pie jūsu darbībām un jums piederošā satura.',
     'profile_email_desc' => 'Šis epasts tiks izmantots paziņojumiem un sistēmas piekļuvei, atkarībā no sistēmā uzstādītās autentifikācijas metodes.',
     'profile_email_no_permission' => 'Diemžēl jums nav tiesību mainīt savu epasta adresi. Ja vēlaties to mainīt, jums jāsazinās ar administratoru, lai tas nomaina šo adresi.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
+    'profile_avatar_desc' => 'Izvēlieties attēlu, kas tiks izmantots, lai jūs attēlotu citiem sistēmas lietotājiem. Ideālā gadījumā šim attēlam jābūt kvadrātaveida, apmēram 256px platumā un augstumā.',
     'profile_admin_options' => 'Administratora iestatījumi',
     'profile_admin_options_desc' => 'Papildus administratora iestatījumus, kā piemēram, lomu piešķiršanu, var atrast jūsu lietotāja kontā ejot uz "Uzstādījumu > Lietotāji".',
 
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index fa0e21acc3b..ff7db39ef2d 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nav ierobežojumu',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Kārtošana',
+    'sorting_book_default' => 'Noklusētā grāmatu kārtošana',
+    'sorting_book_default_desc' => 'Izvēlieties noklusēto kārtošanas nosacījumu, ko pielietot jaunām grāmatām. Šis neskars jau esošas grāmatas, un to var izmainīt grāmatas iestatījumos.',
+    'sorting_rules' => 'Kārtošanas noteikumi',
+    'sorting_rules_desc' => 'Šīs ir iepriekš noteiktas kārtošanas darbības, ko var pielietot saturam šajā sistēmā.',
+    'sort_rule_assigned_to_x_books' => 'Pielietots :count grāmatai|Pielietots :count grāmatām',
+    'sort_rule_create' => 'Izveidot kārtošanas nosacījumu',
+    'sort_rule_edit' => 'Rediģēt kārtošanas nosacījumu',
+    'sort_rule_delete' => 'Dzēst kārtošanas nosacījumu',
+    'sort_rule_delete_desc' => 'Izņemt šo kārtošanas nosacījumu no sistēmas. Grāmatām tiks atjaunota manuāla kārtošana.',
+    'sort_rule_delete_warn_books' => 'Šis kārtošanas nosacījums pašlaik tiek izmantots :count grāmatām. Vai tiešām vēlaties to dzēst?',
+    'sort_rule_delete_warn_default' => 'Šis kārtošanas nosacījums pašlaik ir norādīts kā noklusētais. Vai tiešām vēlaties to dzēst?',
+    'sort_rule_details' => 'Kārtošanas nosacījuma detaļas',
+    'sort_rule_details_desc' => 'Uzstādiet nosaukumu šim kārtošanas nosacījumam, kas parādīsies sarakstā, kad lietotājs izvēlēsies kārtošanas veidu.',
+    'sort_rule_operations' => 'Kārtošanas darbības',
+    'sort_rule_operations_desc' => 'Konfigurējiet kārtošanas darbības pārvelkot tās no pieejamo darb\'biu saraksta. Lietošanas procesā darbības tiks piemērotas saraksta kārtībā no augšas uz apakšu. Jekbādas izmaiņas šeit tiks piemērotas grāmatās, kur šis piemērots, pie saglabāšanas.',
+    'sort_rule_available_operations' => 'Pieejamās darbības',
+    'sort_rule_available_operations_empty' => 'Nav atlikušas darbības',
+    'sort_rule_configured_operations' => 'Uzstādītās darbības',
+    'sort_rule_configured_operations_empty' => 'Ievelciet/pievienojiet darbības no "Pieejamo darbību" saraksta',
+    'sort_rule_op_asc' => '(Pieaug.)',
+    'sort_rule_op_desc' => '(Dilst.)',
+    'sort_rule_op_name' => 'Nosaukums - alfabētiski',
+    'sort_rule_op_name_numeric' => 'Nosaukums - numuriski',
+    'sort_rule_op_created_date' => 'Izveidošanas datums',
+    'sort_rule_op_updated_date' => 'Atjaunināšanas datums',
+    'sort_rule_op_chapters_first' => 'Nodaļas pirmās',
+    'sort_rule_op_chapters_last' => 'Nodaļas pēdējās',
 
     // Maintenance settings
     'maint' => 'Apkope',
@@ -192,7 +192,7 @@
     'role_access_api' => 'Piekļūt sistēmas API',
     'role_manage_settings' => 'Pārvaldīt iestatījumus',
     'role_export_content' => 'Eksportēt saturu',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importēt saturu',
     'role_editor_change' => 'Mainīt lapu redaktoru',
     'role_notifications' => 'Saņemt un pārvaldīt paziņojumus',
     'role_asset' => 'Resursa piekļuves tiesības',
diff --git a/lang/lv/validation.php b/lang/lv/validation.php
index 5b714af8659..dd318119a58 100644
--- a/lang/lv/validation.php
+++ b/lang/lv/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute formāts nav derīgs.',
     'uploaded'             => 'Fails netika ielādēts. Serveris nevar pieņemt šāda izmēra failus.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute ir jāatsaucas uz failu ZIP arhīvā.',
+    'zip_file_mime' => ':attribute ir jāatsaucas uz failu ar tipu :validTypes, bet atrasts :foundType.',
+    'zip_model_expected' => 'Sagaidīts datu objekts, bet atrasts ":type".',
+    'zip_unique' => ':attribute jābūt unikālam šim objekta tipam ZIP arhīvā.',
 
     // Custom validation lines
     'custom' => [

From 3a9d18a6cddea100d923370dd1ad1c9b1c9aeecd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 23 May 2025 16:12:03 +0100
Subject: [PATCH 541/666] Images: Added base avif support

Includes handling for animated avif images like apng.
---
 app/Http/Controller.php      |  2 +-
 app/Uploads/ImageResizer.php | 50 +++++++++++++++++++++++++++++++-----
 app/Uploads/ImageService.php |  2 +-
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 090cf523ad2..652e2ccf3bd 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -163,7 +163,7 @@ protected function logActivity(string $type, string|Loggable $detail = ''): void
      */
     protected function getImageValidationRules(): array
     {
-        return ['image_extension', 'mimes:jpeg,png,gif,webp', 'max:' . (config('app.upload_limit') * 1000)];
+        return ['image_extension', 'mimes:jpeg,png,gif,webp,avif', 'max:' . (config('app.upload_limit') * 1000)];
     }
 
     /**
diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index 5f095658f3f..8d7571c82d6 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -6,6 +6,7 @@
 use Exception;
 use GuzzleHttp\Psr7\Utils;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
 use Intervention\Image\Decoders\BinaryImageDecoder;
 use Intervention\Image\Drivers\Gd\Decoders\NativeObjectDecoder;
 use Intervention\Image\Drivers\Gd\Driver;
@@ -93,8 +94,8 @@ public function resizeToThumbnailUrl(
 
         $imageData = $disk->get($imagePath);
 
-        // Do not resize apng images where we're not cropping
-        if ($keepRatio && $this->isApngData($image, $imageData)) {
+        // Do not resize animated images where we're not cropping
+        if ($keepRatio && $this->isAnimated($image, $imageData)) {
             Cache::put($thumbCacheKey, $image->path, static::THUMBNAIL_CACHE_TIME);
 
             return $this->storage->getPublicUrl($image->path);
@@ -240,15 +241,50 @@ protected function getExtension(Image $image): string
     /**
      * Check if the given image and image data is apng.
      */
-    protected function isApngData(Image $image, string &$imageData): bool
+    protected function isApngData(string &$imageData): bool
     {
-        $isPng = strtolower(pathinfo($image->path, PATHINFO_EXTENSION)) === 'png';
-        if (!$isPng) {
+        $initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT'));
+
+        return str_contains($initialHeader, 'acTL');
+    }
+
+    /**
+     * Check if the given avif image data represents an animated image.
+     * This is based up the answer here: https://stackoverflow.com/a/79457313
+     */
+    protected function isAnimatedAvifData(string &$imageData): bool
+    {
+        $stszPos = strpos($imageData, 'stsz');
+        if ($stszPos === false) {
             return false;
         }
 
-        $initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT'));
+        // Look 12 bytes after the start of 'stsz'
+        $start = $stszPos + 12;
+        $end = $start + 4;
+        if ($end > strlen($imageData) - 1) {
+            return false;
+        }
 
-        return str_contains($initialHeader, 'acTL');
+        $data = substr($imageData, $start, 4);
+        $count = unpack('Nvalue', $data)['value'];
+        return $count > 1;
+    }
+
+    /**
+     * Check if the given image is animated.
+     */
+    protected function isAnimated(Image $image, string &$imageData): bool
+    {
+        $extension = strtolower(pathinfo($image->path, PATHINFO_EXTENSION));
+        if ($extension === 'png') {
+            return $this->isApngData($imageData);
+        }
+
+        if ($extension === 'avif') {
+            return $this->isAnimatedAvifData($imageData);
+        }
+
+        return false;
     }
 }
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 4d6d4919742..a8f14451737 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -13,7 +13,7 @@
 
 class ImageService
 {
-    protected static array $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+    protected static array $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif'];
 
     public function __construct(
         protected ImageStorage $storage,

From 131ac29df456263fa471fed5875228e0402db9d9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 23 May 2025 17:19:34 +0100
Subject: [PATCH 542/666] Images: Added testing to cover animated avif handling

---
 tests/Uploads/ImageTest.php   |  15 ++++++++++++++-
 tests/test-data/animated.avif | Bin 0 -> 1168 bytes
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-data/animated.avif

diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index 2c36f5f356e..a2f03df34d4 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -68,7 +68,20 @@ public function test_image_display_thumbnail_generation_for_apng_images_uses_ori
         $this->files->deleteAtRelativePath($imgDetails['path']);
 
         $this->assertStringContainsString('thumbs-', $imgDetails['response']->thumbs->gallery);
-        $this->assertStringNotContainsString('thumbs-', $imgDetails['response']->thumbs->display);
+        $this->assertStringNotContainsString('scaled-', $imgDetails['response']->thumbs->display);
+    }
+
+    public function test_image_display_thumbnail_generation_for_animated_avif_images_uses_original_file()
+    {
+        $page = $this->entities->page();
+        $admin = $this->users->admin();
+        $this->actingAs($admin);
+
+        $imgDetails = $this->files->uploadGalleryImageToPage($this, $page, 'animated.avif');
+        $this->files->deleteAtRelativePath($imgDetails['path']);
+
+        $this->assertStringContainsString('thumbs-', $imgDetails['response']->thumbs->gallery);
+        $this->assertStringNotContainsString('scaled-', $imgDetails['response']->thumbs->display);
     }
 
     public function test_image_edit()
diff --git a/tests/test-data/animated.avif b/tests/test-data/animated.avif
new file mode 100644
index 0000000000000000000000000000000000000000..92f71459bb8182f0f6d2854dca8630a315676010
GIT binary patch
literal 1168
zcmb7DUq}>T5TD(>>^v+El{!k~9<DMoyFDoK$t(LKlu=<1fiLU+=|0`hU3S;S#7K#X
ztmr9-2%?9cA|f>C!P3BYee5CV9ukBKMB$>p*UavnUFJ)(%+Abj=9_Q6`Q`(F7Q?$}
zD?W1pi6pYYT|;KBb&xYd=1eiV4#|hn{gvyULUBm@a+>LcDuB&YudI_ijrO3UcPay#
zsRvP;ZRYVHM8JO|GcA>@BLD(^^am-AQbulKY`{Pnps)=MT`XCOpO!l;(+YC-G25}x
zae~>Zg|eQxwoZXakrKykHpB>!qR}Xd8pW48#-N6vI@L0r0o5D=G58SL%4}XfAr=-9
z#4DIdoZyz_qub<uPNSuNNLs|)i&Q@yW0n3g5M5(uR|D5o@VH{T=P3Q?&3XMf4VO#n
zL<U(e7eo5Tzh=*MYbf^#Af;;_4MBr$x^$VenzqIBl`IgRaE&QwCAqe?4_Sn>aBddG
z{|<-H&BF_?_j!=Evhb7^`WiGx4~HTwt!B_MleiVe3iYnnYodP3_1yCHP>vBA7nDSm
zIYT6ZL(+*VF_Dlssrc#vxm9j!mD6(4WW9>T_u{~Wet<-=h-&2s#SEsKLF%}w25p0p
zFgoFSK|9H!0Bm%ebgb14-dYJKUjt&nbEv@RV#t?5-!RHD5l#iQAn!(QM#h}M13;D5
zNO_bmxu$rrYJ%=OET*HGR2-&9LF{@jUO#&CUExyS*~wV#__LqM9qdc(qvY|0{Dt$`
zOmkYA83h>r0Z_ehJ_dJ}USB)aex~O}+or<Yhfia(pO+^JRXxj7?sR5Xdczwm=hzHR
z>+O#)3QG&)_r6P8o_|}J8mwz{pFUXL{_DlgY^Et)B}O8pzyb!Y>?ssyw6~8ZU-6dx
Q_m?`Z4o@#8y61X-181VpD*ylh

literal 0
HcmV?d00001


From 454b152b9570f7e5cf13757464a4af3d5ffd1649 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 12:05:17 +0100
Subject: [PATCH 543/666] Pages: Redirect user to view if they can't edit

For #5568
---
 app/Entities/Controllers/PageController.php |  3 ++-
 app/Http/Controller.php                     | 10 +++++-----
 tests/Entity/PageTest.php                   | 10 ++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 230a84721f8..de3aed7d9a7 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -17,6 +17,7 @@
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
@@ -196,7 +197,7 @@ public function getPageAjax(int $pageId)
     public function edit(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission('page-update', $page, $page->getUrl());
 
         $editorData = new PageEditorData($page, $this->entityQueries, $request->query('editor', ''));
         if ($editorData->getWarnings()) {
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 652e2ccf3bd..7f2134dd87a 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -49,13 +49,13 @@ public function setPageTitle(string $title)
      * On a permission error redirect to home and display.
      * the error as a notification.
      *
-     * @return never
+     * @throws NotifyException
      */
-    protected function showPermissionError()
+    protected function showPermissionError(string $redirectLocation = '/'): never
     {
         $message = request()->wantsJson() ? trans('errors.permissionJson') : trans('errors.permission');
 
-        throw new NotifyException($message, '/', 403);
+        throw new NotifyException($message, $redirectLocation, 403);
     }
 
     /**
@@ -81,10 +81,10 @@ protected function preventGuestAccess(): void
     /**
      * Check the current user's permissions against an ownable item otherwise throw an exception.
      */
-    protected function checkOwnablePermission(string $permission, Model $ownable): void
+    protected function checkOwnablePermission(string $permission, Model $ownable, string $redirectLocation = '/'): void
     {
         if (!userCan($permission, $ownable)) {
-            $this->showPermissionError();
+            $this->showPermissionError($redirectLocation);
         }
     }
 
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index e444d165fb3..d2c448bf4b7 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -356,4 +356,14 @@ public function test_recently_updated_pages_on_home()
         $resp = $this->get('/');
         $this->withHtml($resp)->assertElementContains('#recently-updated-pages', $page->name);
     }
+
+    public function test_page_edit_without_update_permissions_but_with_view_redirects_to_page()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->asViewer()->get($page->getUrl('/edit'));
+        $resp->assertRedirect($page->getUrl());
+
+        $resp->assertSessionHas('error', 'You do not have permission to access the requested page.');
+    }
 }

From f9dbbe5d70f751d67aa41f65f257f580bcf33568 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 14:02:37 +0100
Subject: [PATCH 544/666] OIDC: Updated picture fetch implementation during
 review

Review of #5429
---
 app/Access/Oidc/OidcService.php     |  8 ++++----
 app/Access/Oidc/OidcUserDetails.php | 20 ++++++++++++++-----
 app/Config/oidc.php                 |  8 +++++---
 app/Uploads/UserAvatars.php         | 30 ++++++++++++++---------------
 4 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 660885e8b2a..452fda3d85f 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -222,6 +222,10 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
             throw new OidcException($exception->getMessage());
         }
 
+        if ($this->config()['fetch_avatar'] && $user->wasRecentlyCreated && $userDetails->picture) {
+            $this->userAvatars->assignToUserFromUrl($user, $userDetails->picture);
+        }
+
         if ($this->shouldSyncGroups()) {
             $detachExisting = $this->config()['remove_from_groups'];
             $this->groupService->syncUserWithFoundGroups($user, $userDetails->groups ?? [], $detachExisting);
@@ -229,10 +233,6 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
 
         $this->loginService->login($user, 'oidc');
 
-        if ($this->config()['fetch_avatars'] && $userDetails->picture) {
-            $this->userAvatars->assignToUserFromUrl($user, $userDetails->picture, $accessToken->getToken());
-        }
-
         return $user;
     }
 
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 10595d1e0dd..7a422a58de2 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -41,16 +41,16 @@ public function populate(
         $this->email = $claims->getClaim('email') ?? $this->email;
         $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
-        $this->picture    = $claims->getClaim('picture') ?: $this->picture;
+        $this->picture = static::getPicture($claims) ?: $this->picture;
     }
 
-    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $token): string
+    protected static function getUserDisplayName(string $displayNameClaims, ProvidesClaims $claims): string
     {
         $displayNameClaimParts = explode('|', $displayNameClaims);
 
         $displayName = [];
         foreach ($displayNameClaimParts as $claim) {
-            $component = $token->getClaim(trim($claim)) ?? '';
+            $component = $claims->getClaim(trim($claim)) ?? '';
             if ($component !== '') {
                 $displayName[] = $component;
             }
@@ -59,13 +59,13 @@ protected static function getUserDisplayName(string $displayNameClaims, Provides
         return implode(' ', $displayName);
     }
 
-    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): ?array
+    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $claims): ?array
     {
         if (empty($groupsClaim)) {
             return null;
         }
 
-        $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
+        $groupsList = Arr::get($claims->getAllClaims(), $groupsClaim);
         if (!is_array($groupsList)) {
             return null;
         }
@@ -74,4 +74,14 @@ protected static function getUserGroups(string $groupsClaim, ProvidesClaims $tok
             return is_string($val);
         }));
     }
+
+    protected static function getPicture(ProvidesClaims $claims): ?string
+    {
+        $picture = $claims->getClaim('picture');
+        if (is_string($picture) && str_starts_with($picture, 'http')) {
+            return $picture;
+        }
+
+        return null;
+    }
 }
diff --git a/app/Config/oidc.php b/app/Config/oidc.php
index 62f19a119c0..49427cb12fd 100644
--- a/app/Config/oidc.php
+++ b/app/Config/oidc.php
@@ -47,6 +47,11 @@
     // Multiple values can be provided comma seperated.
     'additional_scopes' => env('OIDC_ADDITIONAL_SCOPES', null),
 
+    // Enable fetching of the user's avatar from the 'picture' claim on initial login.
+    // This can be a security risk due to performing server-side fetching of data from external URLs.
+    // Only enable if you trust the OIDC auth provider to provide safe URLs for user images.
+    'fetch_avatar' => env('OIDC_FETCH_AVATAR', false),
+
     // Group sync options
     // Enable syncing, upon login, of OIDC groups to BookStack roles
     'user_to_groups' => env('OIDC_USER_TO_GROUPS', false),
@@ -54,7 +59,4 @@
     'groups_claim' => env('OIDC_GROUPS_CLAIM', 'groups'),
     // When syncing groups, remove any groups that no longer match. Otherwise, sync only adds new groups.
     'remove_from_groups' => env('OIDC_REMOVE_FROM_GROUPS', false),
-
-    // When enabled, BookStack will fetch the user’s avatar from the 'picture' claim (SSRF risk if URLs are untrusted).
-    'fetch_avatars' => env('OIDC_FETCH_AVATARS', false),
 ];
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index af91dfe70f1..1763dcbbd58 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -5,6 +5,7 @@
 use BookStack\Exceptions\HttpFetchException;
 use BookStack\Http\HttpRequestService;
 use BookStack\Users\Models\User;
+use BookStack\Util\WebSafeMimeSniffer;
 use Exception;
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Support\Facades\Log;
@@ -56,17 +57,19 @@ public function assignToUserFromExistingData(User $user, string $imageData, stri
     /**
      * Assign a new avatar image to the given user by fetching from a remote URL.
      */
-    public function assignToUserFromUrl(User $user, string $avatarUrl, ?string $accessToken = null): void
+    public function assignToUserFromUrl(User $user, string $avatarUrl): void
     {
-        // Quickly skip invalid or non-HTTP URLs
-        if (!$avatarUrl || !str_starts_with($avatarUrl, 'http')) {
-            return;
-        }
-
         try {
             $this->destroyAllForUser($user);
-            $imageData = $this->getAvatarImageData($avatarUrl, $accessToken);
-            $avatar = $this->createAvatarImageFromData($user, $imageData, 'png');
+            $imageData = $this->getAvatarImageData($avatarUrl);
+
+            $mime = (new WebSafeMimeSniffer())->sniff($imageData);
+            [$format, $type] = explode('/', $mime, 2);
+            if ($format !== 'image' || ImageService::isExtensionSupported($type)) {
+                return;
+            }
+
+            $avatar = $this->createAvatarImageFromData($user, $imageData, $type);
             $user->avatar()->associate($avatar);
             $user->save();
         } catch (Exception $e) {
@@ -130,20 +133,15 @@ protected function createAvatarImageFromData(User $user, string $imageData, stri
     }
 
     /**
-     * Gets an image from a URL (public or private) and returns it as a string of image data.
+     * Get an image from a URL and return it as a string of image data.
      *
      * @throws HttpFetchException
      */
-    protected function getAvatarImageData(string $url, ?string $accessToken = null): string
+    protected function getAvatarImageData(string $url): string
     {
         try {
-            $headers = [];
-            if (!empty($accessToken)) {
-                $headers['Authorization'] = 'Bearer ' . $accessToken;
-            }
-
             $client = $this->http->buildClient(5);
-            $response = $client->sendRequest(new Request('GET', $url, $headers));
+            $response = $client->sendRequest(new Request('GET', $url));
 
             if ($response->getStatusCode() !== 200) {
                 throw new HttpFetchException(trans('errors.cannot_get_image_from_url', ['url' => $url]));

From b64c9b31d51b5d15972c6cb37cfdca37db80d28a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 14:36:36 +0100
Subject: [PATCH 545/666] OIDC: Added testing coverage for picture fetching

---
 app/Access/Oidc/OidcService.php |   2 ++
 app/Uploads/UserAvatars.php     |   2 +-
 app/Users/Models/User.php       |   1 +
 tests/Auth/OidcTest.php         |  52 ++++++++++++++++++++++++++++++++
 tests/Helpers/FileProvider.php  |   8 +++++
 tests/test-data/test-image.jpg  | Bin 0 -> 268 bytes
 6 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-data/test-image.jpg

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 452fda3d85f..38eecdff35c 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -222,6 +222,8 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
             throw new OidcException($exception->getMessage());
         }
 
+        // TODO - Update this (and tests and config option comments) to actually align with LDAP system
+        //  which syncs whenever on login or registration, where there's no existing avatar.
         if ($this->config()['fetch_avatar'] && $user->wasRecentlyCreated && $userDetails->picture) {
             $this->userAvatars->assignToUserFromUrl($user, $userDetails->picture);
         }
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index 1763dcbbd58..2c9f7a8482e 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -65,7 +65,7 @@ public function assignToUserFromUrl(User $user, string $avatarUrl): void
 
             $mime = (new WebSafeMimeSniffer())->sniff($imageData);
             [$format, $type] = explode('/', $mime, 2);
-            if ($format !== 'image' || ImageService::isExtensionSupported($type)) {
+            if ($format !== 'image' || !ImageService::isExtensionSupported($type)) {
                 return;
             }
 
diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index 3797e7cb027..0d437418bb9 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -45,6 +45,7 @@
  * @property string     $system_name
  * @property Collection $roles
  * @property Collection $mfaValues
+ * @property ?Image     $avatar
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable
 {
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 205f75a4d62..f4d044bf14d 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -41,6 +41,7 @@ protected function setUp(): void
             'oidc.discover'               => false,
             'oidc.dump_user_details'      => false,
             'oidc.additional_scopes'      => '',
+            'odic.fetch_avatar'           => false,
             'oidc.user_to_groups'         => false,
             'oidc.groups_claim'           => 'group',
             'oidc.remove_from_groups'     => false,
@@ -457,6 +458,57 @@ public function test_auth_uses_mulitple_display_name_claims_if_configured()
         ]);
     }
 
+    public function test_user_avatar_fetched_from_picture_on_first_login_if_enabled()
+    {
+        config()->set(['oidc.fetch_avatar' => true]);
+
+        $this->runLogin([
+            'email' => 'avatar@example.com',
+            'picture' => 'https://example.com/my-avatar.jpg',
+        ], [
+            new Response(200, ['Content-Type' => 'image/jpeg'], $this->files->jpegImageData())
+        ]);
+
+        $user = User::query()->where('email', '=', 'avatar@example.com')->first();
+        $this->assertNotNull($user);
+
+        $this->assertTrue($user->avatar()->exists());
+    }
+
+    public function test_user_avatar_not_fetched_if_image_data_format_unknown()
+    {
+        config()->set(['oidc.fetch_avatar' => true]);
+
+        $this->runLogin([
+            'email' => 'avatar-format@example.com',
+            'picture' => 'https://example.com/my-avatar.jpg',
+        ], [
+            new Response(200, ['Content-Type' => 'image/jpeg'], str_repeat('abc123', 5))
+        ]);
+
+        $user = User::query()->where('email', '=', 'avatar-format@example.com')->first();
+        $this->assertNotNull($user);
+
+        $this->assertFalse($user->avatar()->exists());
+    }
+
+    public function test_user_avatar_not_fetched_when_user_already_exists()
+    {
+        config()->set(['oidc.fetch_avatar' => true]);
+        $editor = $this->users->editor();
+        $editor->external_auth_id = 'benny509';
+
+        $this->runLogin([
+            'picture' => 'https://example.com/my-avatar.jpg',
+            'sub' => 'benny509',
+        ], [
+            new Response(200, ['Content-Type' => 'image/jpeg'], $this->files->jpegImageData())
+        ]);
+
+        $editor->refresh();
+        $this->assertFalse($editor->avatar()->exists());
+    }
+
     public function test_login_group_sync()
     {
         config()->set([
diff --git a/tests/Helpers/FileProvider.php b/tests/Helpers/FileProvider.php
index 442e036ff24..a455e0fb4ea 100644
--- a/tests/Helpers/FileProvider.php
+++ b/tests/Helpers/FileProvider.php
@@ -60,6 +60,14 @@ public function pngImageData(): string
         return file_get_contents($this->testFilePath('test-image.png'));
     }
 
+    /**
+     * Get raw data for a Jpeg image test file.
+     */
+    public function jpegImageData(): string
+    {
+        return file_get_contents($this->testFilePath('test-image.jpg'));
+    }
+
     /**
      * Get the expected relative path for an uploaded image of the given type and filename.
      */
diff --git a/tests/test-data/test-image.jpg b/tests/test-data/test-image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9bb74ff04833b969a41dd25c05144a7930ec4791
GIT binary patch
literal 268
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I|Mdr2uFMBc*2iKgl4-!QjN;!px||z$D1X
zEXer(3<DQ~fB-9_fFSGtTMRtRj6exyK?Zw<=hw>h+pFW<7#R=#a_3=8ej9ot%hR(f
wrhv<c$CmSij*T$KGU+QN!Cdz?zQ0jr%3E+vW%b^Rci+!ADRxd#o#+2e0B6vxbpQYW

literal 0
HcmV?d00001


From 30bf0ce632663eb508b02c2f534c817660dd5d34 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 16:34:36 +0100
Subject: [PATCH 546/666] OIDC: Updated avatar fetching to run on each login

But only where the user does not already have an avatar assigned.
This aligns with the LDAP avatar fetching logic.
---
 app/Access/Oidc/OidcService.php |  4 +---
 app/Config/oidc.php             |  3 ++-
 tests/Auth/OidcTest.php         | 31 +++++++++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index 38eecdff35c..d6f6ef156e4 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -222,9 +222,7 @@ protected function processAccessTokenCallback(OidcAccessToken $accessToken, Oidc
             throw new OidcException($exception->getMessage());
         }
 
-        // TODO - Update this (and tests and config option comments) to actually align with LDAP system
-        //  which syncs whenever on login or registration, where there's no existing avatar.
-        if ($this->config()['fetch_avatar'] && $user->wasRecentlyCreated && $userDetails->picture) {
+        if ($this->config()['fetch_avatar'] && !$user->avatar()->exists() && $userDetails->picture) {
             $this->userAvatars->assignToUserFromUrl($user, $userDetails->picture);
         }
 
diff --git a/app/Config/oidc.php b/app/Config/oidc.php
index 49427cb12fd..1d3193eeecc 100644
--- a/app/Config/oidc.php
+++ b/app/Config/oidc.php
@@ -47,7 +47,8 @@
     // Multiple values can be provided comma seperated.
     'additional_scopes' => env('OIDC_ADDITIONAL_SCOPES', null),
 
-    // Enable fetching of the user's avatar from the 'picture' claim on initial login.
+    // Enable fetching of the user's avatar from the 'picture' claim on login.
+    // Will only be fetched if the user doesn't already have an avatar image assigned.
     // This can be a security risk due to performing server-side fetching of data from external URLs.
     // Only enable if you trust the OIDC auth provider to provide safe URLs for user images.
     'fetch_avatar' => env('OIDC_FETCH_AVATAR', false),
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index f4d044bf14d..71f883ca6c6 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Uploads\UserAvatars;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use GuzzleHttp\Psr7\Response;
@@ -475,6 +476,26 @@ public function test_user_avatar_fetched_from_picture_on_first_login_if_enabled(
         $this->assertTrue($user->avatar()->exists());
     }
 
+    public function test_user_avatar_fetched_for_existing_user_when_no_avatar_already_assigned()
+    {
+        config()->set(['oidc.fetch_avatar' => true]);
+        $editor = $this->users->editor();
+        $editor->external_auth_id = 'benny509';
+        $editor->save();
+
+        $this->assertFalse($editor->avatar()->exists());
+
+        $this->runLogin([
+            'picture' => 'https://example.com/my-avatar.jpg',
+            'sub' => 'benny509',
+        ], [
+            new Response(200, ['Content-Type' => 'image/jpeg'], $this->files->jpegImageData())
+        ]);
+
+        $editor->refresh();
+        $this->assertTrue($editor->avatar()->exists());
+    }
+
     public function test_user_avatar_not_fetched_if_image_data_format_unknown()
     {
         config()->set(['oidc.fetch_avatar' => true]);
@@ -492,11 +513,16 @@ public function test_user_avatar_not_fetched_if_image_data_format_unknown()
         $this->assertFalse($user->avatar()->exists());
     }
 
-    public function test_user_avatar_not_fetched_when_user_already_exists()
+    public function test_user_avatar_not_fetched_when_avatar_already_assigned()
     {
         config()->set(['oidc.fetch_avatar' => true]);
         $editor = $this->users->editor();
         $editor->external_auth_id = 'benny509';
+        $editor->save();
+
+        $avatars = $this->app->make(UserAvatars::class);
+        $originalImageData = $this->files->pngImageData();
+        $avatars->assignToUserFromExistingData($editor, $originalImageData, 'png');
 
         $this->runLogin([
             'picture' => 'https://example.com/my-avatar.jpg',
@@ -506,7 +532,8 @@ public function test_user_avatar_not_fetched_when_user_already_exists()
         ]);
 
         $editor->refresh();
-        $this->assertFalse($editor->avatar()->exists());
+        $newAvatarData = file_get_contents($this->files->relativeToFullPath($editor->avatar->path));
+        $this->assertEquals($originalImageData, $newAvatarData);
     }
 
     public function test_login_group_sync()

From 9d6bc1ad4da9142766e4d3a29b5a535f93f1c33a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 16:47:01 +0100
Subject: [PATCH 547/666] Testing: Updated tests to account for recent page
 redirect changes

---
 tests/Permissions/EntityPermissionsTest.php |  8 ++++----
 tests/Permissions/RolePermissionsTest.php   | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index 6ea0257b81e..43d0cfc5063 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -184,7 +184,7 @@ public function test_book_update_restriction()
 
         $this->get($bookUrl . '/edit')->assertRedirect('/');
         $this->get('/')->assertSee('You do not have permission');
-        $this->get($bookPage->getUrl() . '/edit')->assertRedirect('/');
+        $this->get($bookPage->getUrl() . '/edit')->assertRedirect($bookPage->getUrl());
         $this->get('/')->assertSee('You do not have permission');
         $this->get($bookChapter->getUrl() . '/edit')->assertRedirect('/');
         $this->get('/')->assertSee('You do not have permission');
@@ -282,7 +282,7 @@ public function test_chapter_update_restriction()
 
         $this->get($chapterUrl . '/edit')->assertRedirect('/');
         $this->get('/')->assertSee('You do not have permission');
-        $this->get($chapterPage->getUrl() . '/edit')->assertRedirect('/');
+        $this->get($chapterPage->getUrl() . '/edit')->assertRedirect($chapterPage->getUrl());
         $this->get('/')->assertSee('You do not have permission');
 
         $this->setRestrictionsForTestRoles($chapter, ['view', 'update']);
@@ -341,7 +341,7 @@ public function test_page_update_restriction()
 
         $this->setRestrictionsForTestRoles($page, ['view', 'delete']);
 
-        $this->get($pageUrl . '/edit')->assertRedirect('/');
+        $this->get($pageUrl . '/edit')->assertRedirect($pageUrl);
         $this->get('/')->assertSee('You do not have permission');
 
         $this->setRestrictionsForTestRoles($page, ['view', 'update']);
@@ -565,7 +565,7 @@ public function test_book_update_restriction_override()
 
         $this->get($bookUrl . '/edit')->assertRedirect('/');
         $this->get('/')->assertSee('You do not have permission');
-        $this->get($bookPage->getUrl() . '/edit')->assertRedirect('/');
+        $this->get($bookPage->getUrl() . '/edit')->assertRedirect($bookPage->getUrl());
         $this->get('/')->assertSee('You do not have permission');
         $this->get($bookChapter->getUrl() . '/edit')->assertRedirect('/');
         $this->get('/')->assertSee('You do not have permission');
diff --git a/tests/Permissions/RolePermissionsTest.php b/tests/Permissions/RolePermissionsTest.php
index d3146bd47bd..97cce681754 100644
--- a/tests/Permissions/RolePermissionsTest.php
+++ b/tests/Permissions/RolePermissionsTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Permissions;
 
-use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
@@ -10,7 +9,6 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Uploads\Image;
-use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
@@ -152,10 +150,14 @@ public function test_restrictions_manage_own_permission()
     /**
      * Check a standard entity access permission.
      */
-    private function checkAccessPermission(string $permission, array $accessUrls = [], array $visibles = [])
-    {
+    private function checkAccessPermission(
+        string $permission,
+        array $accessUrls = [],
+        array $visibles = [],
+        string $expectedRedirectUri = '/',
+    ) {
         foreach ($accessUrls as $url) {
-            $this->actingAs($this->user)->get($url)->assertRedirect('/');
+            $this->actingAs($this->user)->get($url)->assertRedirect($expectedRedirectUri);
         }
 
         foreach ($visibles as $url => $text) {
@@ -535,11 +537,11 @@ public function test_page_edit_own_permission()
             $ownPage->getUrl() . '/edit',
         ], [
             $ownPage->getUrl() => 'Edit',
-        ]);
+        ], $ownPage->getUrl());
 
         $resp = $this->get($otherPage->getUrl());
         $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
-        $this->get($otherPage->getUrl() . '/edit')->assertRedirect('/');
+        $this->get($otherPage->getUrl() . '/edit')->assertRedirect($otherPage->getUrl());
     }
 
     public function test_page_edit_all_permission()
@@ -550,7 +552,7 @@ public function test_page_edit_all_permission()
             $otherPage->getUrl('/edit'),
         ], [
             $otherPage->getUrl() => 'Edit',
-        ]);
+        ], $otherPage->getUrl());
     }
 
     public function test_page_delete_own_permission()

From eb47e1191665e75adcbc63876470259685b459e8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 24 May 2025 17:56:21 +0100
Subject: [PATCH 548/666] Avatars: Added redirect handling image fetching

Up to 3 times.
Can be needed based upon testing with Auth0.
Should be fine as long as it's something clearly documented.
Added test to cover.
---
 app/Config/oidc.php         |  4 ++--
 app/Uploads/UserAvatars.php | 15 +++++++++++++--
 tests/Auth/OidcTest.php     | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/Config/oidc.php b/app/Config/oidc.php
index 1d3193eeecc..16bec873c9c 100644
--- a/app/Config/oidc.php
+++ b/app/Config/oidc.php
@@ -49,8 +49,8 @@
 
     // Enable fetching of the user's avatar from the 'picture' claim on login.
     // Will only be fetched if the user doesn't already have an avatar image assigned.
-    // This can be a security risk due to performing server-side fetching of data from external URLs.
-    // Only enable if you trust the OIDC auth provider to provide safe URLs for user images.
+    // This can be a security risk due to performing server-side fetching (with up to 3 redirects) of
+    // data from external URLs. Only enable if you trust the OIDC auth provider to provide safe URLs for user images.
     'fetch_avatar' => env('OIDC_FETCH_AVATAR', false),
 
     // Group sync options
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index 2c9f7a8482e..0cc640f225c 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -74,7 +74,7 @@ public function assignToUserFromUrl(User $user, string $avatarUrl): void
             $user->save();
         } catch (Exception $e) {
             Log::error('Failed to save user avatar image from URL', [
-                'exception' => $e,
+                'exception' => $e->getMessage(),
                 'url'       => $avatarUrl,
                 'user_id'   => $user->id,
             ]);
@@ -141,7 +141,18 @@ protected function getAvatarImageData(string $url): string
     {
         try {
             $client = $this->http->buildClient(5);
-            $response = $client->sendRequest(new Request('GET', $url));
+            $responseCount = 0;
+
+            do {
+                $response = $client->sendRequest(new Request('GET', $url));
+                $responseCount++;
+                $isRedirect = ($response->getStatusCode() === 301 || $response->getStatusCode() === 302);
+                $url = $response->getHeader('Location')[0] ?? '';
+            } while ($responseCount < 3 && $isRedirect && is_string($url) && str_starts_with($url, 'http'));
+
+            if ($responseCount === 3) {
+                throw new HttpFetchException("Failed to fetch image, max redirect limit of 3 tries reached. Last fetched URL: {$url}");
+            }
 
             if ($response->getStatusCode() !== 200) {
                 throw new HttpFetchException(trans('errors.cannot_get_image_from_url', ['url' => $url]));
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 71f883ca6c6..a0db1c2ba00 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -536,6 +536,28 @@ public function test_user_avatar_not_fetched_when_avatar_already_assigned()
         $this->assertEquals($originalImageData, $newAvatarData);
     }
 
+    public function test_user_avatar_fetch_follows_up_to_three_redirects()
+    {
+        config()->set(['oidc.fetch_avatar' => true]);
+
+        $logger = $this->withTestLogger();
+
+        $this->runLogin([
+            'email' => 'avatar@example.com',
+            'picture' => 'https://example.com/my-avatar.jpg',
+        ], [
+            new Response(302, ['Location' => 'https://example.com/a']),
+            new Response(302, ['Location' => 'https://example.com/b']),
+            new Response(302, ['Location' => 'https://example.com/c']),
+            new Response(302, ['Location' => 'https://example.com/d']),
+        ]);
+
+        $user = User::query()->where('email', '=', 'avatar@example.com')->first();
+        $this->assertFalse($user->avatar()->exists());
+
+        $this->assertStringContainsString('"Failed to fetch image, max redirect limit of 3 tries reached. Last fetched URL: https://example.com/c"', $logger->getRecords()[0]->formatted);
+    }
+
     public function test_login_group_sync()
     {
         config()->set([

From 32809193704b06dd8dbe2eb98bb1fe329138a0e7 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 25 May 2025 13:21:13 +0100
Subject: [PATCH 549/666] Lexical: Improved diagram selection and keyboard
 usage

Fixes issues where drawings could not be removed via backspace or
delete.
---
 resources/js/wysiwyg/services/keyboard-handling.ts |  3 ++-
 resources/js/wysiwyg/ui/decorators/diagram.ts      | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index a7f1ec7f0b0..41a917ecb34 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -17,11 +17,12 @@ import {$getNearestNodeBlockParent, $getParentOfType} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {$isDiagramNode} from "../utils/diagrams";
 
 function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     if (nodes.length === 1) {
         const node = nodes[0];
-        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node)) {
+        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
             return true;
         }
     }
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/diagram.ts
index d53bcb482ec..52a73ad7223 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/diagram.ts
@@ -1,6 +1,6 @@
 import {EditorDecorator} from "../framework/decorator";
 import {EditorUiContext} from "../framework/core";
-import {BaseSelection} from "lexical";
+import {BaseSelection, CLICK_COMMAND, COMMAND_PRIORITY_NORMAL} from "lexical";
 import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
 import {$openDrawingEditorForNode} from "../../utils/diagrams";
@@ -12,11 +12,17 @@ export class DiagramDecorator extends EditorDecorator {
     setup(context: EditorUiContext, element: HTMLElement) {
         const diagramNode = this.getNode();
         element.classList.add('editor-diagram');
-        element.addEventListener('click', event => {
+
+        context.editor.registerCommand(CLICK_COMMAND, (event: MouseEvent): boolean => {
+            if (!element.contains(event.target as HTMLElement)) {
+                return false;
+            }
+
             context.editor.update(() => {
                 $selectSingleNode(this.getNode());
-            })
-        });
+            });
+            return true;
+        }, COMMAND_PRIORITY_NORMAL);
 
         element.addEventListener('dblclick', event => {
             context.editor.getEditorState().read(() => {

From 1243108e0fbaef6a0b678a872eb9fbf2f269a57a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 25 May 2025 16:28:42 +0100
Subject: [PATCH 550/666] Lexical: Updated dropdown handling to match tinymce
 behaviour

Now toolbars stay open on mouse-out, and close on other toolbar open,
outside click or an accepted action.
To support:
- Added new system to track and manage open dropdowns.
- Added way for buttons to optionally emit events upon actions.
- Added way to listen for events.
- Used the above to control when dropdowns should hide on action, since
  some dont (like overflow containers and split dropdown buttons).
---
 .../ui/framework/blocks/dropdown-button.ts    |  13 ++-
 .../ui/framework/blocks/format-menu.ts        |   7 +-
 .../ui/framework/blocks/overflow-container.ts |   1 +
 resources/js/wysiwyg/ui/framework/buttons.ts  |  12 +-
 resources/js/wysiwyg/ui/framework/core.ts     |  15 +++
 .../wysiwyg/ui/framework/helpers/dropdowns.ts | 108 ++++++++++++------
 resources/js/wysiwyg/ui/framework/manager.ts  |   3 +
 7 files changed, 118 insertions(+), 41 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
index d7f02d5732b..45cb74dd4ae 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/dropdown-button.ts
@@ -1,4 +1,3 @@
-import {handleDropdown} from "../helpers/dropdowns";
 import {EditorContainerUiElement, EditorUiElement} from "../core";
 import {EditorBasicButtonDefinition, EditorButton} from "../buttons";
 import {el} from "../../../utils/dom";
@@ -8,6 +7,7 @@ export type EditorDropdownButtonOptions = {
     showOnHover?: boolean;
     direction?: 'vertical'|'horizontal';
     showAside?: boolean;
+    hideOnAction?: boolean;
     button: EditorBasicButtonDefinition|EditorButton;
 };
 
@@ -15,6 +15,7 @@ const defaultOptions: EditorDropdownButtonOptions = {
     showOnHover: false,
     direction: 'horizontal',
     showAside: undefined,
+    hideOnAction: true,
     button: {label: 'Menu'},
 }
 
@@ -40,7 +41,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
                 },
                 isActive: () => {
                     return this.open;
-                }
+                },
             });
         }
 
@@ -65,7 +66,7 @@ export class EditorDropdownButton extends EditorContainerUiElement {
             class: 'editor-dropdown-menu-container',
         }, [button, menu]);
 
-        handleDropdown({toggle: button, menu : menu,
+        this.getContext().manager.dropdowns.handle({toggle: button, menu : menu,
             showOnHover: this.options.showOnHover,
             showAside: typeof this.options.showAside === 'boolean' ? this.options.showAside : (this.options.direction === 'vertical'),
             onOpen : () => {
@@ -76,6 +77,12 @@ export class EditorDropdownButton extends EditorContainerUiElement {
             this.getContext().manager.triggerStateUpdateForElement(this.button);
         }});
 
+        if (this.options.hideOnAction) {
+            this.onEvent('button-action', () => {
+                this.getContext().manager.dropdowns.closeAll();
+            }, wrapper);
+        }
+
         return wrapper;
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
index d666954bf05..5d629493503 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/format-menu.ts
@@ -1,6 +1,5 @@
 import {EditorUiStateUpdate, EditorContainerUiElement} from "../core";
 import {EditorButton} from "../buttons";
-import {handleDropdown} from "../helpers/dropdowns";
 import {el} from "../../../utils/dom";
 
 export class EditorFormatMenu extends EditorContainerUiElement {
@@ -20,7 +19,11 @@ export class EditorFormatMenu extends EditorContainerUiElement {
             class: 'editor-format-menu editor-dropdown-menu-container',
         }, [toggle, menu]);
 
-        handleDropdown({toggle : toggle, menu : menu});
+        this.getContext().manager.dropdowns.handle({toggle : toggle, menu : menu});
+
+        this.onEvent('button-action', () => {
+            this.getContext().manager.dropdowns.closeAll();
+        }, wrapper);
 
         return wrapper;
     }
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
index cd078053415..1c96645058e 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -19,6 +19,7 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
                 label: 'More',
                 icon: moreHorizontal,
             },
+            hideOnAction: false,
         }, []);
         this.addChildren(this.overflowButton);
     }
diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index cf114aa0212..0e1cab0f569 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -10,7 +10,12 @@ export interface EditorBasicButtonDefinition {
 }
 
 export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
-    action: (context: EditorUiContext, button: EditorButton) => void;
+    /**
+     * The action to perform when the button is used.
+     * This can return false to indicate that the completion of the action should
+     * NOT be communicated to parent UI elements, which is what occurs by default.
+     */
+    action: (context: EditorUiContext, button: EditorButton) => void|false;
     isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     isDisabled?: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;
@@ -78,7 +83,10 @@ export class EditorButton extends EditorUiElement {
     }
 
     protected onClick() {
-        this.definition.action(this.getContext(), this);
+        const result = this.definition.action(this.getContext(), this);
+        if (result !== false) {
+            this.emitEvent('button-action');
+        }
     }
 
     protected updateActiveState(selection: BaseSelection|null) {
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 90ce4ebf93c..ca2ba40c6fc 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -67,6 +67,21 @@ export abstract class EditorUiElement {
     updateState(state: EditorUiStateUpdate): void {
         return;
     }
+
+    emitEvent(name: string, data: object = {}): void {
+        if (this.dom) {
+            this.dom.dispatchEvent(new CustomEvent('editor::' + name, {detail: data, bubbles: true}));
+        }
+    }
+
+    onEvent(name: string, callback: (data: object) => any, listenTarget: HTMLElement|null = null): void {
+        const target = listenTarget || this.dom;
+        if (target) {
+            target.addEventListener('editor::' + name, ((event: CustomEvent) => {
+                callback(event.detail);
+            }) as EventListener);
+        }
+    }
 }
 
 export class EditorContainerUiElement extends EditorUiElement {
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index ccced685867..751c1b3f207 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -34,57 +34,97 @@ function positionMenu(menu: HTMLElement, toggle: HTMLElement, showAside: boolean
     }
 }
 
-export function handleDropdown(options: HandleDropdownParams) {
-    const {menu, toggle, onClose, onOpen, showOnHover, showAside} = options;
-    let clickListener: Function|null = null;
+export class DropDownManager {
 
-    const hide = () => {
+    protected dropdownOptions: WeakMap<HTMLElement, HandleDropdownParams> = new WeakMap();
+    protected openDropdowns: Set<HTMLElement> = new Set();
+
+    constructor() {
+        this.onMenuMouseOver = this.onMenuMouseOver.bind(this);
+
+        window.addEventListener('click', (event: MouseEvent) => {
+            const target = event.target as HTMLElement;
+            this.closeAllNotContainingElement(target);
+        });
+    }
+
+    protected closeAllNotContainingElement(element: HTMLElement): void {
+        for (const menu of this.openDropdowns) {
+            if (!menu.parentElement?.contains(element)) {
+                this.closeDropdown(menu);
+            }
+        }
+    }
+
+    protected onMenuMouseOver(event: MouseEvent): void {
+        const target = event.target as HTMLElement;
+        this.closeAllNotContainingElement(target);
+    }
+
+    /**
+     * Close all open dropdowns.
+     */
+    public closeAll(): void {
+        for (const menu of this.openDropdowns) {
+            this.closeDropdown(menu);
+        }
+    }
+
+    protected closeDropdown(menu: HTMLElement): void {
         menu.hidden = true;
         menu.style.removeProperty('position');
         menu.style.removeProperty('left');
         menu.style.removeProperty('top');
-        if (clickListener) {
-            window.removeEventListener('click', clickListener as EventListener);
-        }
+
+        this.openDropdowns.delete(menu);
+        menu.removeEventListener('mouseover', this.onMenuMouseOver);
+
+        const onClose = this.getOptions(menu).onClose;
         if (onClose) {
             onClose();
         }
-    };
+    }
 
-    const show = () => {
+    protected openDropdown(menu: HTMLElement): void {
+        const {toggle, showAside, onOpen} = this.getOptions(menu);
         menu.hidden = false
         positionMenu(menu, toggle, Boolean(showAside));
-        clickListener = (event: MouseEvent) => {
-            if (!toggle.contains(event.target as HTMLElement) && !menu.contains(event.target as HTMLElement)) {
-                hide();
-            }
-        }
-        window.addEventListener('click', clickListener as EventListener);
+
+        this.openDropdowns.add(menu);
+        menu.addEventListener('mouseover', this.onMenuMouseOver);
+
         if (onOpen) {
             onOpen();
         }
-    };
-
-    const toggleShowing = (event: MouseEvent) => {
-        menu.hasAttribute('hidden') ? show() : hide();
-    };
-    toggle.addEventListener('click', toggleShowing);
-    if (showOnHover) {
-        toggle.addEventListener('mouseenter', toggleShowing);
     }
 
-    menu.parentElement?.addEventListener('mouseleave', (event: MouseEvent) => {
+    protected getOptions(menu: HTMLElement): HandleDropdownParams {
+        const options = this.dropdownOptions.get(menu);
+        if (!options) {
+            throw new Error(`Can't find options for dropdown menu`);
+        }
+
+        return options;
+    }
+
+    /**
+     * Add handling for a new dropdown.
+     */
+     public handle(options: HandleDropdownParams) {
+        const {menu, toggle, showOnHover} = options;
 
-        // Prevent mouseleave hiding if withing the same bounds of the toggle.
-        // Avoids hiding in the event the mouse is interrupted by a high z-index
-        // item like a browser scrollbar.
-        const toggleBounds = toggle.getBoundingClientRect();
-        const withinX = event.clientX <= toggleBounds.right && event.clientX >= toggleBounds.left;
-        const withinY = event.clientY <= toggleBounds.bottom && event.clientY >= toggleBounds.top;
-        const withinToggle = withinX && withinY;
+        // Register dropdown
+        this.dropdownOptions.set(menu, options);
 
-        if (!withinToggle) {
-            hide();
+        // Configure default events
+        const toggleShowing = (event: MouseEvent) => {
+            menu.hasAttribute('hidden') ? this.openDropdown(menu) : this.closeDropdown(menu);
+        };
+        toggle.addEventListener('click', toggleShowing);
+        if (showOnHover) {
+            toggle.addEventListener('mouseenter', () => {
+                this.openDropdown(menu);
+            });
         }
-    });
+    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 0f501d9faae..c80291fb707 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -6,6 +6,7 @@ import {DecoratorListener} from "lexical/LexicalEditor";
 import type {NodeKey} from "lexical/LexicalNode";
 import {EditorContextToolbar, EditorContextToolbarDefinition} from "./toolbars";
 import {getLastSelection, setLastSelection} from "../../utils/selection";
+import {DropDownManager} from "./helpers/dropdowns";
 
 export type SelectionChangeHandler = (selection: BaseSelection|null) => void;
 
@@ -21,6 +22,8 @@ export class EditorUIManager {
     protected activeContextToolbars: EditorContextToolbar[] = [];
     protected selectionChangeHandlers: Set<SelectionChangeHandler> = new Set();
 
+    public dropdowns: DropDownManager = new DropDownManager();
+
     setContext(context: EditorUiContext) {
         this.context = context;
         this.setupEventListeners(context);

From 2a324755414e18d96a472425533e0c033ffebe98 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 May 2025 14:48:13 +0100
Subject: [PATCH 551/666] Lexical: Made a range of selection improvements

Updated up/down handling to create where a selection candidate does not
exist, to apply to a wider scenario via the selectPrevious/Next methods.

Updated DOM selection change handling to identify single selections
within decorated nodes to select them in full, instead of losing
selection due to partial selection of their contents.

Updated table selection handling so that our colgroups are ignored for
internal selection focus handling.
---
 .../js/wysiwyg/lexical/core/LexicalNode.ts    |  5 ++--
 .../wysiwyg/lexical/core/LexicalSelection.ts  | 14 +++++++++-
 .../table/LexicalTableSelectionHelpers.ts     |  5 ++++
 .../js/wysiwyg/services/keyboard-handling.ts  | 27 +++++++++----------
 resources/js/wysiwyg/ui/framework/manager.ts  |  1 +
 resources/js/wysiwyg/utils/nodes.ts           | 13 ++++++++-
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index 7306e6bca27..e54cd1066c2 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -48,6 +48,7 @@ import {
   internalMarkNodeAsDirty,
   removeFromParent,
 } from './LexicalUtils';
+import {$insertAndSelectNewEmptyAdjacentNode} from "../../utils/nodes";
 
 export type NodeMap = Map<NodeKey, LexicalNode>;
 
@@ -1130,7 +1131,7 @@ export class LexicalNode {
     const prevSibling = this.getPreviousSibling();
     const parent = this.getParentOrThrow();
     if (prevSibling === null) {
-      return parent.select(0, 0);
+      return $insertAndSelectNewEmptyAdjacentNode(this, false);
     }
     if ($isElementNode(prevSibling)) {
       return prevSibling.select();
@@ -1152,7 +1153,7 @@ export class LexicalNode {
     const nextSibling = this.getNextSibling();
     const parent = this.getParentOrThrow();
     if (nextSibling === null) {
-      return parent.select();
+      return $insertAndSelectNewEmptyAdjacentNode(this, true);
     }
     if ($isElementNode(nextSibling)) {
       return nextSibling.select(0, 0);
diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
index db18cfc4a77..297286a4b8c 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -17,7 +17,7 @@ import invariant from 'lexical/shared/invariant';
 import {
   $createLineBreakNode,
   $createParagraphNode,
-  $createTextNode,
+  $createTextNode, $getNearestNodeFromDOMNode,
   $isDecoratorNode,
   $isElementNode,
   $isLineBreakNode,
@@ -63,6 +63,7 @@ import {
   toggleTextFormatType,
 } from './LexicalUtils';
 import {$createTabNode, $isTabNode} from './nodes/LexicalTabNode';
+import {$selectSingleNode} from "../../utils/selection";
 
 export type TextPointType = {
   _selection: BaseSelection;
@@ -2568,6 +2569,17 @@ export function updateDOMSelection(
   }
 
   if (!$isRangeSelection(nextSelection)) {
+
+    // If the DOM selection enters a decorator node update the selection to a single node selection
+    if (activeElement !== null && domSelection.isCollapsed && focusDOMNode instanceof Node) {
+      const node = $getNearestNodeFromDOMNode(focusDOMNode);
+      if ($isDecoratorNode(node)) {
+        domSelection.removeAllRanges();
+        $selectSingleNode(node);
+        return;
+      }
+    }
+
     // We don't remove selection if the prevSelection is null because
     // of editor.setRootElement(). If this occurs on init when the
     // editor is already focused, then this can cause the editor to
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index e098a21e498..d9164a778ce 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -917,6 +917,11 @@ export function getTable(tableElement: HTMLElement): TableDOMTable {
   while (currentNode != null) {
     const nodeMame = currentNode.nodeName;
 
+    if (nodeMame === 'COLGROUP') {
+      currentNode = currentNode.nextSibling;
+      continue;
+    }
+
     if (nodeMame === 'TD' || nodeMame === 'TH') {
       const elem = currentNode as HTMLElement;
       const cell = {
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 41a917ecb34..39818acb09e 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -47,16 +47,21 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
  * Insert a new empty node before/after the selection if the selection contains a single
  * selected node (like image, media etc...).
  */
-function insertAfterSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
+function insertAdjacentToSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
     if (isSingleSelectedNode(selectionNodes)) {
         const node = selectionNodes[0];
         const nearestBlock = $getNearestNodeBlockParent(node) || node;
+        const insertBefore = event?.shiftKey === true;
         if (nearestBlock) {
             requestAnimationFrame(() => {
                 editor.update(() => {
                     const newParagraph = $createParagraphNode();
-                    nearestBlock.insertAfter(newParagraph);
+                    if (insertBefore) {
+                        nearestBlock.insertBefore(newParagraph);
+                    } else {
+                        nearestBlock.insertAfter(newParagraph);
+                    }
                     newParagraph.select();
                 });
             });
@@ -75,22 +80,14 @@ function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event:
     }
 
     event?.preventDefault();
-
     const node = selectionNodes[0];
-    const nearestBlock = $getNearestNodeBlockParent(node) || node;
-    let target = after ? nearestBlock.getNextSibling() : nearestBlock.getPreviousSibling();
 
     editor.update(() => {
-        if (!target) {
-            target = $createParagraphNode();
-            if (after) {
-                nearestBlock.insertAfter(target)
-            } else {
-                nearestBlock.insertBefore(target);
-            }
+        if (after) {
+            node.selectNext();
+        } else {
+            node.selectPrevious();
         }
-
-        target.selectStart();
     });
 
     return true;
@@ -220,7 +217,7 @@ export function registerKeyboardHandling(context: EditorUiContext): () => void {
     }, COMMAND_PRIORITY_LOW);
 
     const unregisterEnter = context.editor.registerCommand(KEY_ENTER_COMMAND, (event): boolean => {
-        return insertAfterSingleSelectedNode(context.editor, event)
+        return insertAdjacentToSingleSelectedNode(context.editor, event)
             || moveAfterDetailsOnEmptyLine(context.editor, event);
     }, COMMAND_PRIORITY_LOW);
 
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index c80291fb707..2d15b341bdb 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -244,6 +244,7 @@ export class EditorUIManager {
             if (selectionChange) {
                 editor.update(() => {
                     const selection = $getSelection();
+                    // console.log('manager::selection', selection);
                     this.triggerStateUpdate({
                         editor, selection,
                     });
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 591232ea385..ebf01e39dde 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -6,7 +6,7 @@ import {
     $isTextNode,
     ElementNode,
     LexicalEditor,
-    LexicalNode
+    LexicalNode, RangeSelection
 } from "lexical";
 import {LexicalNodeMatcher} from "../nodes";
 import {$generateNodesFromDOM} from "@lexical/html";
@@ -118,6 +118,17 @@ export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
     return sorted;
 }
 
+export function $insertAndSelectNewEmptyAdjacentNode(node: LexicalNode, after: boolean): RangeSelection {
+    const target = $createParagraphNode();
+    if (after) {
+        node.insertAfter(target)
+    } else {
+        node.insertBefore(target);
+    }
+
+    return target.select();
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }

From c4f7368c1c18d868aec59665218103f678a7843d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 May 2025 15:19:11 +0100
Subject: [PATCH 552/666] Lexical: Fixed table column resizing changes not
 appearing

Also fixed some resizer zindex issues.
---
 resources/js/wysiwyg/lexical/table/LexicalTableNode.ts | 4 ++--
 resources/sass/_editor.scss                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index a103614753e..105764be2f0 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -54,7 +54,7 @@ export class TableNode extends CommonBlockNode {
   static clone(node: TableNode): TableNode {
     const newNode = new TableNode(node.__key);
     copyCommonBlockProperties(node, newNode);
-    newNode.__colWidths = node.__colWidths;
+    newNode.__colWidths = [...node.__colWidths];
     newNode.__styles = new Map(node.__styles);
     return newNode;
   }
@@ -169,7 +169,7 @@ export class TableNode extends CommonBlockNode {
 
   getColWidths(): string[] {
     const self = this.getLatest();
-    return self.__colWidths;
+    return [...self.__colWidths];
   }
 
   getStyles(): StyleMap {
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 35f11c5a279..4112f62888c 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -422,7 +422,7 @@ body.editor-is-fullscreen {
 .editor-table-marker {
   position: fixed;
   background-color: var(--editor-color-primary);
-  z-index: 99;
+  z-index: 3;
   user-select: none;
   opacity: 0;
   &:hover, &.active {

From a43a1832f5bd625d844903fd125ae39cbc50d5d5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 May 2025 18:02:53 +0100
Subject: [PATCH 553/666] Lexical: Added image insert via image link paste

Specifically added to align with existing TinyMCE behaviour which was
used by some users based upon new editor feedback.
---
 .../wysiwyg/services/drop-paste-handling.ts   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index 2ee831d74fc..57f9a80ae18 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -95,6 +95,21 @@ function handleMediaInsert(data: DataTransfer, context: EditorUiContext): boolea
     return handled;
 }
 
+function handleImageLinkInsert(data: DataTransfer, context: EditorUiContext): boolean {
+    const regex = /https?:\/\/([^?#]*?)\.(png|jpeg|jpg|gif|webp|bmp|avif)/i
+    const text = data.getData('text/plain');
+    if (text && regex.test(text)) {
+        context.editor.update(() => {
+            const image = $createImageNode(text);
+            $insertNodes([image]);
+            image.select();
+        });
+        return true;
+    }
+
+    return false;
+}
+
 function createDropListener(context: EditorUiContext): (event: DragEvent) => boolean {
     const editor = context.editor;
     return (event: DragEvent): boolean => {
@@ -138,7 +153,10 @@ function createPasteListener(context: EditorUiContext): (event: ClipboardEvent)
             return false;
         }
 
-        const handled = handleMediaInsert(event.clipboardData, context);
+        const handled =
+            handleImageLinkInsert(event.clipboardData, context) ||
+            handleMediaInsert(event.clipboardData, context);
+
         if (handled) {
             event.preventDefault();
         }

From 2e718c12e120f5d39efc23eef995275fc6fb80a4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 May 2025 18:47:51 +0100
Subject: [PATCH 554/666] Lexical: Changed table esacpe handling

Avoids misuse of selectPrevious/Next as per prior commit which was then
causing problems elsewhere, and is probably best to avoid creation in
those select methods anyway.
---
 .../js/wysiwyg/lexical/core/LexicalNode.ts    |  5 ++---
 .../table/LexicalTableSelectionHelpers.ts     |  5 +++--
 .../js/wysiwyg/services/keyboard-handling.ts  |  9 ++-------
 resources/js/wysiwyg/utils/nodes.ts           | 19 ++++++++++++-------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index e54cd1066c2..7306e6bca27 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -48,7 +48,6 @@ import {
   internalMarkNodeAsDirty,
   removeFromParent,
 } from './LexicalUtils';
-import {$insertAndSelectNewEmptyAdjacentNode} from "../../utils/nodes";
 
 export type NodeMap = Map<NodeKey, LexicalNode>;
 
@@ -1131,7 +1130,7 @@ export class LexicalNode {
     const prevSibling = this.getPreviousSibling();
     const parent = this.getParentOrThrow();
     if (prevSibling === null) {
-      return $insertAndSelectNewEmptyAdjacentNode(this, false);
+      return parent.select(0, 0);
     }
     if ($isElementNode(prevSibling)) {
       return prevSibling.select();
@@ -1153,7 +1152,7 @@ export class LexicalNode {
     const nextSibling = this.getNextSibling();
     const parent = this.getParentOrThrow();
     if (nextSibling === null) {
-      return $insertAndSelectNewEmptyAdjacentNode(this, true);
+      return parent.select();
     }
     if ($isElementNode(nextSibling)) {
       return nextSibling.select(0, 0);
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index d9164a778ce..44801966996 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -71,6 +71,7 @@ import {TableDOMTable, TableObserver} from './LexicalTableObserver';
 import {$isTableRowNode} from './LexicalTableRowNode';
 import {$isTableSelection} from './LexicalTableSelection';
 import {$computeTableMap, $getNodeTriplet} from './LexicalTableUtils';
+import {$selectOrCreateAdjacent} from "../../utils/nodes";
 
 const LEXICAL_ELEMENT_KEY = '__lexicalTableSelection';
 
@@ -1113,7 +1114,7 @@ const selectTableNodeInDirection = (
           false,
         );
       } else {
-        tableNode.selectPrevious();
+        $selectOrCreateAdjacent(tableNode, false);
       }
 
       return true;
@@ -1125,7 +1126,7 @@ const selectTableNodeInDirection = (
           true,
         );
       } else {
-        tableNode.selectNext();
+        $selectOrCreateAdjacent(tableNode, true);
       }
 
       return true;
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index 39818acb09e..b4f546117bb 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -13,7 +13,7 @@ import {
 import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {getLastSelection} from "../utils/selection";
-import {$getNearestNodeBlockParent, $getParentOfType} from "../utils/nodes";
+import {$getNearestNodeBlockParent, $getParentOfType, $selectOrCreateAdjacent} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
@@ -81,13 +81,8 @@ function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event:
 
     event?.preventDefault();
     const node = selectionNodes[0];
-
     editor.update(() => {
-        if (after) {
-            node.selectNext();
-        } else {
-            node.selectPrevious();
-        }
+        $selectOrCreateAdjacent(node, after);
     });
 
     return true;
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index ebf01e39dde..778be5ba6e0 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -118,15 +118,20 @@ export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
     return sorted;
 }
 
-export function $insertAndSelectNewEmptyAdjacentNode(node: LexicalNode, after: boolean): RangeSelection {
-    const target = $createParagraphNode();
-    if (after) {
-        node.insertAfter(target)
-    } else {
-        node.insertBefore(target);
+export function $selectOrCreateAdjacent(node: LexicalNode, after: boolean): RangeSelection {
+    const nearestBlock = $getNearestNodeBlockParent(node) || node;
+    let target = after ? nearestBlock.getNextSibling() : nearestBlock.getPreviousSibling()
+
+    if (!target) {
+        target = $createParagraphNode();
+        if (after) {
+            node.insertAfter(target)
+        } else {
+            node.insertBefore(target);
+        }
     }
 
-    return target.select();
+    return after ? target.selectStart() : target.selectEnd();
 }
 
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {

From d9ea52522ea577e960ff978e186fd7c5226535f5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 26 May 2025 19:06:36 +0100
Subject: [PATCH 555/666] Lexical: Fixed issues with recent changes

---
 resources/js/wysiwyg/ui/framework/buttons.ts | 10 ++++++++--
 resources/js/wysiwyg/utils/nodes.ts          |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/buttons.ts b/resources/js/wysiwyg/ui/framework/buttons.ts
index 0e1cab0f569..e12348e814b 100644
--- a/resources/js/wysiwyg/ui/framework/buttons.ts
+++ b/resources/js/wysiwyg/ui/framework/buttons.ts
@@ -15,7 +15,7 @@ export interface EditorButtonDefinition extends EditorBasicButtonDefinition {
      * This can return false to indicate that the completion of the action should
      * NOT be communicated to parent UI elements, which is what occurs by default.
      */
-    action: (context: EditorUiContext, button: EditorButton) => void|false;
+    action: (context: EditorUiContext, button: EditorButton) => void|false|Promise<void|boolean>;
     isActive: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     isDisabled?: (selection: BaseSelection|null, context: EditorUiContext) => boolean;
     setup?: (context: EditorUiContext, button: EditorButton) => void;
@@ -84,7 +84,13 @@ export class EditorButton extends EditorUiElement {
 
     protected onClick() {
         const result = this.definition.action(this.getContext(), this);
-        if (result !== false) {
+        if (result instanceof Promise) {
+            result.then(result => {
+                if (result === false) {
+                    this.emitEvent('button-action');
+                }
+            });
+        } else if (result !== false) {
             this.emitEvent('button-action');
         }
     }
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 778be5ba6e0..116a3f4e5c0 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -125,9 +125,9 @@ export function $selectOrCreateAdjacent(node: LexicalNode, after: boolean): Rang
     if (!target) {
         target = $createParagraphNode();
         if (after) {
-            node.insertAfter(target)
+            nearestBlock.insertAfter(target)
         } else {
-            node.insertBefore(target);
+            nearestBlock.insertBefore(target);
         }
     }
 

From 7650ebf2f90d120d2ae3c3b12560cf7449c6978b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 27 May 2025 15:53:46 +0100
Subject: [PATCH 556/666] Deps: Updated composer/npm packages, fixed test
 namespace

---
 composer.lock               | 154 ++++---
 package-lock.json           | 858 ++++++++++++++++++------------------
 tests/Api/SystemApiTest.php |   5 +-
 3 files changed, 503 insertions(+), 514 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5458bb587a2..a9c41613f67 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.13",
+            "version": "3.343.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "eb50d111a09ef39675358e74801260ac129ee346"
+                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb50d111a09ef39675358e74801260ac129ee346",
-                "reference": "eb50d111a09ef39675358e74801260ac129ee346",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae98d503173740cce23b30d2ba2737c49b0d9876",
+                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.13"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.18"
             },
-            "time": "2025-05-16T18:24:39+00:00"
+            "time": "2025-05-23T18:08:18+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1597,16 +1597,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.11.2",
+            "version": "3.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "ebbb711871fb261c064cf4c422f5f3c124fe1842"
+                "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/ebbb711871fb261c064cf4c422f5f3c124fe1842",
-                "reference": "ebbb711871fb261c064cf4c422f5f3c124fe1842",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/d0f097b8a3fa8fb758efc9440b513aa3833cda17",
+                "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17",
                 "shasum": ""
             },
             "require": {
@@ -1653,7 +1653,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.11.2"
+                "source": "https://github.com/Intervention/image/tree/3.11.3"
             },
             "funding": [
                 {
@@ -1669,7 +1669,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-02-27T13:08:55+00:00"
+            "time": "2025-05-22T17:26:23+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -1740,16 +1740,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.44.7",
+            "version": "v11.45.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7"
+                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
-                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/d0730deb427632004d24801be7ca1ed2c10fbc4e",
+                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e",
                 "shasum": ""
             },
             "require": {
@@ -1770,7 +1770,7 @@
                 "guzzlehttp/uri-template": "^1.0",
                 "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                 "laravel/serializable-closure": "^1.3|^2.0",
-                "league/commonmark": "^2.6",
+                "league/commonmark": "^2.7",
                 "league/flysystem": "^3.25.1",
                 "league/flysystem-local": "^3.25.1",
                 "league/uri": "^7.5.1",
@@ -1857,7 +1857,7 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.11.2",
+                "orchestra/testbench-core": "^9.13.2",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^2.0",
@@ -1951,7 +1951,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-04-25T12:40:47+00:00"
+            "time": "2025-05-20T15:15:58+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3684,16 +3684,16 @@
         },
         {
             "name": "onelogin/php-saml",
-            "version": "4.2.0",
+            "version": "4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SAML-Toolkits/php-saml.git",
-                "reference": "d3b5172f137db2f412239432d77253ceaaa1e939"
+                "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/d3b5172f137db2f412239432d77253ceaaa1e939",
-                "reference": "d3b5172f137db2f412239432d77253ceaaa1e939",
+                "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/bf5efce9f2df5d489d05e78c27003a0fc8bc50f0",
+                "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0",
                 "shasum": ""
             },
             "require": {
@@ -3744,7 +3744,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-30T15:10:40+00:00"
+            "time": "2025-05-25T14:28:00+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -5647,16 +5647,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -5669,7 +5669,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -5694,7 +5694,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -5710,7 +5710,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -5869,16 +5869,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
-                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
                 "shasum": ""
             },
             "require": {
@@ -5892,7 +5892,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -5925,7 +5925,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -5941,7 +5941,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/finder",
@@ -7064,16 +7064,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -7091,7 +7091,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -7127,7 +7127,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -7143,7 +7143,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "symfony/string",
@@ -7329,16 +7329,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
-                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
+                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
                 "shasum": ""
             },
             "require": {
@@ -7351,7 +7351,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -7387,7 +7387,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -7403,7 +7403,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-27T08:32:26+00:00"
         },
         {
             "name": "symfony/uid",
@@ -8588,16 +8588,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.16",
+            "version": "2.1.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9"
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
-                "reference": "b8c1cf533cba0c305d91c6ccd23f3dd0566ba5f9",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
                 "shasum": ""
             },
             "require": {
@@ -8642,7 +8642,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-16T09:40:10+00:00"
+            "time": "2025-05-21T20:55:28+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8969,16 +8969,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.20",
+            "version": "11.5.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f"
+                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f",
-                "reference": "e6bdea63ecb7a8287d2cdab25bdde3126e0cfe6f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
+                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
                 "shasum": ""
             },
             "require": {
@@ -9001,7 +9001,7 @@
                 "sebastian/code-unit": "^3.0.3",
                 "sebastian/comparator": "^6.3.1",
                 "sebastian/diff": "^6.0.2",
-                "sebastian/environment": "^7.2.0",
+                "sebastian/environment": "^7.2.1",
                 "sebastian/exporter": "^6.3.0",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
@@ -9050,7 +9050,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.21"
             },
             "funding": [
                 {
@@ -9074,7 +9074,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-11T06:39:52+00:00"
+            "time": "2025-05-21T12:35:00+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9453,23 +9453,23 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "7.2.0",
+            "version": "7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5"
+                "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
-                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a5c75038693ad2e8d4b6c15ba2403532647830c4",
+                "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^11.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -9505,15 +9505,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/7.2.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/environment",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T04:54:44+00:00"
+            "time": "2025-05-21T11:55:47+00:00"
         },
         {
             "name": "sebastian/exporter",
diff --git a/package-lock.json b/package-lock.json
index d00dceac226..926a6d9e3f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,23 +62,23 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.3.tgz",
+      "integrity": "sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -86,22 +86,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
-      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.3.tgz",
+      "integrity": "sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
-        "@babel/helper-compilation-targets": "^7.26.5",
-        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.9",
-        "@babel/parser": "^7.26.9",
-        "@babel/template": "^7.26.9",
-        "@babel/traverse": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.27.3",
+        "@babel/helpers": "^7.27.3",
+        "@babel/parser": "^7.27.3",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.27.3",
+        "@babel/types": "^7.27.3",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -117,14 +117,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
-      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.3.tgz",
+      "integrity": "sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/parser": "^7.27.3",
+        "@babel/types": "^7.27.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -134,14 +134,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
-      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.26.5",
-        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -151,29 +151,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -183,9 +183,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -193,9 +193,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -203,18 +203,18 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -222,27 +222,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
-      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.3.tgz",
+      "integrity": "sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
-      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.3.tgz",
+      "integrity": "sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.9"
+        "@babel/types": "^7.27.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -307,13 +307,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -349,13 +349,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -475,13 +475,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -491,32 +491,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
-      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
-      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.3.tgz",
+      "integrity": "sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
-        "@babel/parser": "^7.26.9",
-        "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.3",
+        "@babel/parser": "^7.27.3",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -535,14 +535,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
-      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.3.tgz",
+      "integrity": "sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -568,9 +568,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.0.tgz",
-      "integrity": "sha512-q8VPEFaEP4ikSlt6ZxjB3zW72+7osfAYW9i8Zu943uqbKuz6utc1+F170hyLUCUltXORjQXRyYQNfkckzA/bPQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.1.tgz",
+      "integrity": "sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -610,9 +610,9 @@
       }
     },
     "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.3.tgz",
-      "integrity": "sha512-8PR3vIWg7pSu7ur8A07pGiYHgy3hHj+mRYRCSG8q+mPIrl0F02rgpGv+DsQTHRTc30rydOsf5PZ7yjKFg2Ackw==",
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
+      "integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -677,9 +677,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.8.tgz",
-      "integrity": "sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.0.tgz",
+      "integrity": "sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -691,18 +691,18 @@
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.4.3.tgz",
-      "integrity": "sha512-s1g+q4bil8Cs4O+ueIiKIhz9MQOGcRyxJglma8BYIWc/oEJLo13S3LYSWKaqhKwXGgt1GgZ66hCploHZD9Sstw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.1.tgz",
+      "integrity": "sha512-DJYQQ00N1/KdESpZV7jg9hafof/iBNp9h7TYo1SLMk86TWl9uDsVdho2dzd81K+v4retmK6mdC7WpuOQDytQqw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0"
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.4.tgz",
-      "integrity": "sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==",
+      "version": "6.8.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.5.tgz",
+      "integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -711,9 +711,9 @@
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.9",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.9.tgz",
-      "integrity": "sha512-7DdQ9aaZMMxuWB1u6IIFWWuK9NocVZwvo4nG8QjJTS6oZGvteoLSiXw3EbVZVlO08Ri2ltO89JVInMpfcJxhtg==",
+      "version": "6.5.11",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
+      "integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -743,9 +743,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
-      "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
+      "version": "6.36.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
+      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.5.0",
@@ -778,9 +778,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
-      "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
       "cpu": [
         "ppc64"
       ],
@@ -795,9 +795,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
-      "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
       "cpu": [
         "arm"
       ],
@@ -812,9 +812,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
-      "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
       "cpu": [
         "arm64"
       ],
@@ -829,9 +829,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
-      "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
       "cpu": [
         "x64"
       ],
@@ -846,9 +846,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
-      "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
       "cpu": [
         "arm64"
       ],
@@ -863,9 +863,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
-      "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
       "cpu": [
         "x64"
       ],
@@ -880,9 +880,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
       "cpu": [
         "arm64"
       ],
@@ -897,9 +897,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
-      "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
       "cpu": [
         "x64"
       ],
@@ -914,9 +914,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
-      "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
       "cpu": [
         "arm"
       ],
@@ -931,9 +931,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
-      "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
       "cpu": [
         "arm64"
       ],
@@ -948,9 +948,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
-      "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
       "cpu": [
         "ia32"
       ],
@@ -965,9 +965,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
-      "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
       "cpu": [
         "loong64"
       ],
@@ -982,9 +982,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
-      "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
       "cpu": [
         "mips64el"
       ],
@@ -999,9 +999,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
-      "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1016,9 +1016,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
-      "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
       "cpu": [
         "riscv64"
       ],
@@ -1033,9 +1033,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
-      "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
       "cpu": [
         "s390x"
       ],
@@ -1050,9 +1050,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
-      "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
       "cpu": [
         "x64"
       ],
@@ -1067,9 +1067,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
       "cpu": [
         "arm64"
       ],
@@ -1084,9 +1084,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
-      "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
       "cpu": [
         "x64"
       ],
@@ -1101,9 +1101,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
       "cpu": [
         "arm64"
       ],
@@ -1118,9 +1118,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
-      "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
       "cpu": [
         "x64"
       ],
@@ -1135,9 +1135,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
-      "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
       "cpu": [
         "x64"
       ],
@@ -1152,9 +1152,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
-      "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
       "cpu": [
         "arm64"
       ],
@@ -1169,9 +1169,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
-      "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
       "cpu": [
         "ia32"
       ],
@@ -1186,9 +1186,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
-      "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
       "cpu": [
         "x64"
       ],
@@ -1203,9 +1203,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1245,9 +1245,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
-      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1259,10 +1259,20 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
+      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1273,9 +1283,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
-      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1297,13 +1307,16 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.21.0.tgz",
-      "integrity": "sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==",
+      "version": "9.27.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
       }
     },
     "node_modules/@eslint/object-schema": {
@@ -1317,13 +1330,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
-      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.12.0",
+        "@eslint/core": "^0.14.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1383,9 +1396,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1841,6 +1854,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -1861,20 +1875,20 @@
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.10.tgz",
-      "integrity": "sha512-V5/89eDapjeAkWPBpWEfQjZ1Hag3aYUUJOL8213X0dFRuXJ4BXa5NKl9USzOnaLod4AOpmVCkduir2oKwZYZtg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.2.1.tgz",
+      "integrity": "sha512-2F5tOqzKEKbCUNraIXc0f6HKeyKlmMWJnBB0i4XW6dJgssrZO/YlZ2pY5xgyqDleqqhiNJ3dQhbrV2aClZQMvg==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0"
+        "@lezer/lr": "^1.3.0"
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.2.tgz",
-      "integrity": "sha512-CwgULPOPPmH54tv4gki18bElLCdJ1+FBC+nGVSVD08vFWDsMjS7KEjNTph9JOypDnet90ujN3LzQiW3CyVODNQ==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.3.tgz",
+      "integrity": "sha512-vAI2O1tPF8QMMgp+bdUeeJCneJNkOZvqsrtyb4ohnFVFdboSqPwBEacnt0HH4E+5h+qsIwTHUSAhffU4hzKl1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1906,9 +1920,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.21",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.21.tgz",
-      "integrity": "sha512-lL+1fcuxWYPURMM/oFZLEDm0XuLN128QPV+VuGtKpeaOGdcl9F2LYC3nh1S9LkPqx9M0mndZFdXCipNAZpzIkQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.1.tgz",
+      "integrity": "sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -1937,14 +1951,13 @@
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.4.1.tgz",
-      "integrity": "sha512-Za5okfyWoNaX6sSZ2dm94XegaFXbkQ9UjKJ8hAoZX88XDpbu6DoR63IuSl+dqj1VkVQBQGsdr0JnTcMsogQDdw==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.4.3.tgz",
+      "integrity": "sha512-kfw+2uMrQ/wy/+ONfrH83OkdFNM0ye5Xq96cLlaCy7h5UT9FO54DU4oRoIc0CSBh5NWmWuiIJA7NGLMJbQ+Oxg==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0",
-        "@lezer/highlight": "^1.0.0",
-        "@marijn/buildtool": "^0.1.6"
+        "@lezer/highlight": "^1.0.0"
       }
     },
     "node_modules/@lezer/php": {
@@ -1969,20 +1982,6 @@
         "@lezer/lr": "^1.0.0"
       }
     },
-    "node_modules/@marijn/buildtool": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@marijn/buildtool/-/buildtool-0.1.6.tgz",
-      "integrity": "sha512-rcA2wljsM24MFAwx2U5vSBrt7IdIaPh4WPRfJPS8PuCUlbuQ8Pmky4c/ec00v3YFu90rZSbkVLnPuCeb/mUEng==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mocha": "^9.1.1",
-        "acorn": "^8.10.0",
-        "acorn-walk": "^8.2.0",
-        "rollup": "^3.28.0",
-        "rollup-plugin-dts": "^5.3.1",
-        "typescript": "^5.1.6"
-      }
-    },
     "node_modules/@marijn/find-cluster-break": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
@@ -2402,9 +2401,9 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2423,9 +2422,9 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
+      "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2433,9 +2432,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -2509,19 +2508,13 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "license": "MIT"
-    },
     "node_modules/@types/node": {
-      "version": "22.13.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
-      "integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==",
+      "version": "22.15.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+      "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~6.21.0"
       }
     },
     "node_modules/@types/sortablejs": {
@@ -2568,9 +2561,10 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -2604,6 +2598,7 @@
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
       "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
@@ -2749,18 +2744,19 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
+        "es-abstract": "^1.23.9",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3029,9 +3025,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
       "dev": true,
       "funding": [
         {
@@ -3049,10 +3045,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3125,14 +3121,14 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
-      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "get-intrinsic": "^1.2.6"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3162,9 +3158,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001700",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
-      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
       "dev": true,
       "funding": [
         {
@@ -3534,9 +3530,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3569,9 +3565,9 @@
       "license": "MIT"
     },
     "node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
+      "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -3748,9 +3744,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.103",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
-      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA==",
+      "version": "1.5.158",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.158.tgz",
+      "integrity": "sha512-9vcp2xHhkvraY6AHw2WMi+GDSLPX42qe2xjYaVoZqFRJiOcilVQFq9mZmpuHEQpzlgGDelKlV7ZiGcmMsc8WxQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -3797,9 +3793,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.23.10",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
+      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3807,18 +3803,18 @@
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -3834,13 +3830,13 @@
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
@@ -3853,7 +3849,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3943,9 +3939,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
-      "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
+      "version": "0.25.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3956,31 +3952,31 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.0",
-        "@esbuild/android-arm": "0.25.0",
-        "@esbuild/android-arm64": "0.25.0",
-        "@esbuild/android-x64": "0.25.0",
-        "@esbuild/darwin-arm64": "0.25.0",
-        "@esbuild/darwin-x64": "0.25.0",
-        "@esbuild/freebsd-arm64": "0.25.0",
-        "@esbuild/freebsd-x64": "0.25.0",
-        "@esbuild/linux-arm": "0.25.0",
-        "@esbuild/linux-arm64": "0.25.0",
-        "@esbuild/linux-ia32": "0.25.0",
-        "@esbuild/linux-loong64": "0.25.0",
-        "@esbuild/linux-mips64el": "0.25.0",
-        "@esbuild/linux-ppc64": "0.25.0",
-        "@esbuild/linux-riscv64": "0.25.0",
-        "@esbuild/linux-s390x": "0.25.0",
-        "@esbuild/linux-x64": "0.25.0",
-        "@esbuild/netbsd-arm64": "0.25.0",
-        "@esbuild/netbsd-x64": "0.25.0",
-        "@esbuild/openbsd-arm64": "0.25.0",
-        "@esbuild/openbsd-x64": "0.25.0",
-        "@esbuild/sunos-x64": "0.25.0",
-        "@esbuild/win32-arm64": "0.25.0",
-        "@esbuild/win32-ia32": "0.25.0",
-        "@esbuild/win32-x64": "0.25.0"
+        "@esbuild/aix-ppc64": "0.25.5",
+        "@esbuild/android-arm": "0.25.5",
+        "@esbuild/android-arm64": "0.25.5",
+        "@esbuild/android-x64": "0.25.5",
+        "@esbuild/darwin-arm64": "0.25.5",
+        "@esbuild/darwin-x64": "0.25.5",
+        "@esbuild/freebsd-arm64": "0.25.5",
+        "@esbuild/freebsd-x64": "0.25.5",
+        "@esbuild/linux-arm": "0.25.5",
+        "@esbuild/linux-arm64": "0.25.5",
+        "@esbuild/linux-ia32": "0.25.5",
+        "@esbuild/linux-loong64": "0.25.5",
+        "@esbuild/linux-mips64el": "0.25.5",
+        "@esbuild/linux-ppc64": "0.25.5",
+        "@esbuild/linux-riscv64": "0.25.5",
+        "@esbuild/linux-s390x": "0.25.5",
+        "@esbuild/linux-x64": "0.25.5",
+        "@esbuild/netbsd-arm64": "0.25.5",
+        "@esbuild/netbsd-x64": "0.25.5",
+        "@esbuild/openbsd-arm64": "0.25.5",
+        "@esbuild/openbsd-x64": "0.25.5",
+        "@esbuild/sunos-x64": "0.25.5",
+        "@esbuild/win32-arm64": "0.25.5",
+        "@esbuild/win32-ia32": "0.25.5",
+        "@esbuild/win32-x64": "0.25.5"
       }
     },
     "node_modules/escalade": {
@@ -4029,19 +4025,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.21.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
-      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
+      "version": "9.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
+      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.2",
-        "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.21.0",
-        "@eslint/plugin-kit": "^0.2.7",
+        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/core": "^0.14.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.27.0",
+        "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -4052,7 +4049,7 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
+        "eslint-scope": "^8.3.0",
         "eslint-visitor-keys": "^4.2.0",
         "espree": "^10.3.0",
         "esquery": "^1.5.0",
@@ -4183,9 +4180,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -4522,6 +4519,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -4930,9 +4928,9 @@
       }
     },
     "node_modules/idb-keyval": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
-      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.2.tgz",
+      "integrity": "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==",
       "license": "Apache-2.0"
     },
     "node_modules/ignore": {
@@ -4946,9 +4944,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
+      "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -5512,9 +5510,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -6188,9 +6186,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -6628,15 +6626,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
-      }
-    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -6654,9 +6643,9 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7074,9 +7063,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
-      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+      "version": "2.2.20",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
+      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
       "dev": true,
       "license": "MIT"
     },
@@ -7321,18 +7310,31 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
-      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
+      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^4.5.0"
+        "entities": "^6.0.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
+      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -7425,9 +7427,9 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7785,44 +7787,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/rollup": {
-      "version": "3.29.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
-      "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
-      "license": "MIT",
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/rollup-plugin-dts": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-5.3.1.tgz",
-      "integrity": "sha512-gusMi+Z4gY/JaEQeXnB0RUdU82h1kF0WYzCWgVmV4p3hWXqelaKuCvcJawfeg+EKn2T1Ie+YWF2OiN1/L8bTVg==",
-      "license": "LGPL-3.0",
-      "dependencies": {
-        "magic-string": "^0.30.2"
-      },
-      "engines": {
-        "node": ">=v14.21.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/Swatinem"
-      },
-      "optionalDependencies": {
-        "@babel/code-frame": "^7.22.5"
-      },
-      "peerDependencies": {
-        "rollup": "^3.0",
-        "typescript": "^4.1 || ^5.0"
-      }
-    },
     "node_modules/safe-array-concat": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
@@ -7886,9 +7850,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.85.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
-      "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
+      "version": "1.89.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+      "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8538,9 +8502,9 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.2.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.6.tgz",
-      "integrity": "sha512-yTNZVZqc8lSixm+QGVFcPe6+yj7+TWZwIesuOWvfcn4B9bz5x4NDzVCQQjOs7Hfouu36aEqfEbo9Qpo+gq8dDg==",
+      "version": "29.3.4",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
+      "integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8551,7 +8515,8 @@
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.1",
+        "semver": "^7.7.2",
+        "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
       "bin": {
@@ -8587,9 +8552,9 @@
       }
     },
     "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -8599,6 +8564,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/ts-jest/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -8797,6 +8775,7 @@
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -8832,9 +8811,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "license": "MIT"
     },
     "node_modules/universalify": {
@@ -8848,9 +8827,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
-      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -9099,16 +9078,17 @@
       "license": "ISC"
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
-      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "for-each": "^0.3.3",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
         "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
@@ -9219,9 +9199,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/tests/Api/SystemApiTest.php b/tests/Api/SystemApiTest.php
index 21e378d6116..e915286e888 100644
--- a/tests/Api/SystemApiTest.php
+++ b/tests/Api/SystemApiTest.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace Api;
+namespace Tests\Api;
 
-use BookStack\Activity\ActivityType;
-use BookStack\Facades\Activity;
-use Tests\Api\TestsApi;
 use Tests\TestCase;
 
 class SystemApiTest extends TestCase

From b0f8b1105403009f32e38aa50f1998a55a7ffd0d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 May 2025 22:00:24 +0100
Subject: [PATCH 557/666] Comments: Fixed tab focus change & button placement
 on form usage

Fixes issue of tabs jumping back to active comments when stopping a
reply to an archived comment.
Fixes button placement looking odd due to wrong location and differing
styles depending on interaction path.
---
 resources/js/components/page-comments.ts    | 21 ++++++++++++++-------
 resources/views/comments/comments.blade.php |  9 +++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 94f5ab3bb8e..5c1cd014c54 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -16,6 +16,7 @@ export class PageComments extends Component {
     private archivedTab!: HTMLElement;
     private addButtonContainer!: HTMLElement;
     private archiveContainer!: HTMLElement;
+    private activeContainer!: HTMLElement;
     private replyToRow!: HTMLElement;
     private referenceRow!: HTMLElement;
     private formContainer!: HTMLElement;
@@ -48,6 +49,7 @@ export class PageComments extends Component {
         this.archivedTab = this.$refs.archivedTab;
         this.addButtonContainer = this.$refs.addButtonContainer;
         this.archiveContainer = this.$refs.archiveContainer;
+        this.activeContainer = this.$refs.activeContainer;
         this.replyToRow = this.$refs.replyToRow;
         this.referenceRow = this.$refs.referenceRow;
         this.formContainer = this.$refs.formContainer;
@@ -76,8 +78,10 @@ export class PageComments extends Component {
 
     protected setupListeners(): void {
         this.elem.addEventListener('page-comment-delete', () => {
-            setTimeout(() => this.updateCount(), 1);
-            this.hideForm();
+            setTimeout(() => {
+                this.updateCount();
+                this.hideForm();
+            }, 1);
         });
 
         this.elem.addEventListener('page-comment-reply', ((event: CustomEvent<PageCommentReplyEventData>) => {
@@ -154,8 +158,10 @@ export class PageComments extends Component {
     protected resetForm(): void {
         this.removeEditor();
         this.formInput.value = '';
+        this.parentId = null;
+        this.replyToRow.toggleAttribute('hidden', true);
+        this.container.append(this.formContainer);
         this.setContentReference('');
-        this.removeReplyTo();
     }
 
     protected showForm(): void {
@@ -165,9 +171,9 @@ export class PageComments extends Component {
         this.formContainer.scrollIntoView({behavior: 'smooth', block: 'nearest'});
         this.loadEditor();
 
-        // Ensure the active comments tab is displaying
+        // Ensure the active comments tab is displaying if that's where we're showing the form
         const tabs = window.$components.firstOnElement(this.elem, 'tabs');
-        if (tabs instanceof Tabs) {
+        if (tabs instanceof Tabs && this.formContainer.closest('#comment-tab-panel-active')) {
             tabs.show('comment-tab-panel-active');
         }
     }
@@ -176,7 +182,7 @@ export class PageComments extends Component {
         this.resetForm();
         this.formContainer.toggleAttribute('hidden', true);
         if (this.getActiveThreadCount() > 0) {
-            this.elem.append(this.addButtonContainer);
+            this.activeContainer.append(this.addButtonContainer);
         } else {
             this.commentCountBar.append(this.addButtonContainer);
         }
@@ -239,7 +245,8 @@ export class PageComments extends Component {
     }
 
     public startNewComment(contentReference: string): void {
-        this.removeReplyTo();
+        this.resetForm();
+        this.showForm();
         this.setContentReference(contentReference);
     }
 
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 51c08d69a85..f27127e9732 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -24,15 +24,16 @@ class="comments-list tab-container"
                     aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
         </div>
         @if ($commentTree->empty() && userCan('comment-create-all'))
-            <div class="ml-m" refs="page-comments@add-button-container">
+            <div refs="page-comments@add-button-container" class="ml-m flex-container-row" >
                 <button type="button"
                         refs="page-comments@add-comment-button"
-                        class="button outline mb-m">{{ trans('entities.comment_add') }}</button>
+                        class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>
             </div>
         @endif
     </div>
 
     <div id="comment-tab-panel-active"
+         refs="page-comments@active-container"
          tabindex="0"
          role="tabpanel"
          aria-labelledby="comment-tab-active"
@@ -48,10 +49,10 @@ class="comment-container no-outline">
         @if(userCan('comment-create-all'))
             @include('comments.create')
             @if (!$commentTree->empty())
-                <div refs="page-comments@addButtonContainer" class="flex-container-row">
+                <div refs="page-comments@addButtonContainer" class="ml-m flex-container-row">
                     <button type="button"
                             refs="page-comments@add-comment-button"
-                            class="button outline ml-auto">{{ trans('entities.comment_add') }}</button>
+                            class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>
                 </div>
             @endif
         @endif

From b862f12a5072ee1429f3eab6ae3be454f4fab5c4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 May 2025 22:47:39 +0100
Subject: [PATCH 558/666] Lexical: Further improvements to table selection and
 captions

- Fixed errors with selection and range handling due to captions
  existing.
- Updated TableNode change handling to update existing DOM instead of
  re-creating, which avoids breaking an attached selection helper.
  - To support, Added function to handle node change detection and apply
    relevant dom updates for common properties.
---
 .../js/wysiwyg/lexical/core/nodes/common.ts   | 33 +++++++++++++++
 .../wysiwyg/lexical/table/LexicalTableNode.ts | 42 ++++++++++++-------
 .../table/LexicalTableSelectionHelpers.ts     |  6 +--
 .../lexical/table/LexicalTableUtils.ts        |  3 +-
 .../helpers/table-selection-handler.ts        |  2 +-
 resources/js/wysiwyg/utils/tables.ts          | 19 ++++++++-
 6 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/nodes/common.ts b/resources/js/wysiwyg/lexical/core/nodes/common.ts
index eac9c829595..50d8843440c 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/common.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/common.ts
@@ -1,5 +1,6 @@
 import {sizeToPixels} from "../../../utils/dom";
 import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
+import {elem} from "../../../../services/dom";
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
@@ -82,6 +83,38 @@ export function commonPropertiesDifferent(nodeA: CommonBlockInterface, nodeB: Co
         nodeA.__dir !== nodeB.__dir;
 }
 
+export function applyCommonPropertyChanges(prevNode: CommonBlockInterface, currentNode: CommonBlockInterface, element: HTMLElement): void {
+    if (prevNode.__id !== currentNode.__id) {
+        element.setAttribute('id', currentNode.__id);
+    }
+
+    if (prevNode.__alignment !== currentNode.__alignment) {
+        for (const alignment of validAlignments) {
+            element.classList.remove('align-' + alignment);
+        }
+
+        if (currentNode.__alignment) {
+            element.classList.add('align-' + currentNode.__alignment);
+        }
+    }
+
+    if (prevNode.__inset !== currentNode.__inset) {
+        if (currentNode.__inset) {
+            element.style.paddingLeft = `${currentNode.__inset}px`;
+        } else {
+            element.style.removeProperty('paddingLeft');
+        }
+    }
+
+    if (prevNode.__dir !== currentNode.__dir) {
+        if (currentNode.__dir) {
+            element.dir = currentNode.__dir;
+        } else {
+            element.removeAttribute('dir');
+        }
+    }
+}
+
 export function updateElementWithCommonBlockProps(element: HTMLElement, node: CommonBlockInterface): void {
     if (node.__id) {
         element.setAttribute('id', node.__id);
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
index 105764be2f0..460223bc9ce 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableNode.ts
@@ -30,12 +30,13 @@ import {TableDOMCell, TableDOMTable} from './LexicalTableObserver';
 import {getTable} from './LexicalTableSelectionHelpers';
 import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 import {
+  applyCommonPropertyChanges,
   commonPropertiesDifferent, deserializeCommonBlockNode,
   setCommonBlockPropsFromElement,
   updateElementWithCommonBlockProps
 } from "lexical/nodes/common";
 import {el, extractStyleMapFromElement, StyleMap} from "../../utils/dom";
-import {getTableColumnWidths} from "../../utils/tables";
+import {buildColgroupFromTableWidths, getTableColumnWidths} from "../../utils/tables";
 
 export type SerializedTableNode = Spread<{
   colWidths: string[];
@@ -98,15 +99,8 @@ export class TableNode extends CommonBlockNode {
     updateElementWithCommonBlockProps(tableElement, this);
 
     const colWidths = this.getColWidths();
-    if (colWidths.length > 0) {
-      const colgroup = el('colgroup');
-      for (const width of colWidths) {
-        const col = el('col');
-        if (width) {
-          col.style.width = width;
-        }
-        colgroup.append(col);
-      }
+    const colgroup = buildColgroupFromTableWidths(colWidths);
+    if (colgroup) {
       tableElement.append(colgroup);
     }
 
@@ -117,11 +111,29 @@ export class TableNode extends CommonBlockNode {
     return tableElement;
   }
 
-  updateDOM(_prevNode: TableNode): boolean {
-    return commonPropertiesDifferent(_prevNode, this)
-      || this.__colWidths.join(':') !== _prevNode.__colWidths.join(':')
-      || this.__styles.size !== _prevNode.__styles.size
-      || (Array.from(this.__styles.values()).join(':') !== (Array.from(_prevNode.__styles.values()).join(':')));
+  updateDOM(_prevNode: TableNode, dom: HTMLElement): boolean {
+    applyCommonPropertyChanges(_prevNode, this, dom);
+
+    if (this.__colWidths.join(':') !== _prevNode.__colWidths.join(':')) {
+      const existingColGroup = Array.from(dom.children).find(child => child.nodeName === 'COLGROUP');
+      const newColGroup = buildColgroupFromTableWidths(this.__colWidths);
+      if (existingColGroup) {
+        existingColGroup.remove();
+      }
+
+      if (newColGroup) {
+        dom.prepend(newColGroup);
+      }
+    }
+
+    if (Array.from(this.__styles.values()).join(':') !== Array.from(_prevNode.__styles.values()).join(':')) {
+      dom.style.cssText = '';
+      for (const [name, value] of this.__styles.entries()) {
+        dom.style.setProperty(name, value);
+      }
+    }
+
+    return false;
   }
 
   exportDOM(editor: LexicalEditor): DOMExportOutput {
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index 44801966996..6e5e5416fa0 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -916,14 +916,14 @@ export function getTable(tableElement: HTMLElement): TableDOMTable {
   domRows.length = 0;
 
   while (currentNode != null) {
-    const nodeMame = currentNode.nodeName;
+    const nodeName = currentNode.nodeName;
 
-    if (nodeMame === 'COLGROUP') {
+    if (nodeName === 'COLGROUP' || nodeName === 'CAPTION') {
       currentNode = currentNode.nextSibling;
       continue;
     }
 
-    if (nodeMame === 'TD' || nodeMame === 'TH') {
+    if (nodeName === 'TD' || nodeName === 'TH') {
       const elem = currentNode as HTMLElement;
       const cell = {
         elem,
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts b/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
index cdbc846584d..bd807d7f993 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableUtils.ts
@@ -35,6 +35,7 @@ import {
   TableRowNode,
 } from './LexicalTableRowNode';
 import {$isTableSelection} from './LexicalTableSelection';
+import {$isCaptionNode} from "@lexical/table/LexicalCaptionNode";
 
 export function $createTableNodeWithDimensions(
   rowCount: number,
@@ -779,7 +780,7 @@ export function $computeTableMapSkipCellCheck(
     return tableMap[row] === undefined || tableMap[row][column] === undefined;
   }
 
-  const gridChildren = grid.getChildren();
+  const gridChildren = grid.getChildren().filter(node => !$isCaptionNode(node));
   for (let i = 0; i < gridChildren.length; i++) {
     const row = gridChildren[i];
     invariant(
diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
index d3d8925505f..c05e448f5a0 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-selection-handler.ts
@@ -56,7 +56,7 @@ class TableSelectionHandler {
                 tableNode,
                 tableElement,
                 this.editor,
-                false,
+                true,
             );
             this.tableSelections.set(nodeKey, tableSelection);
         }
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index ed947ddcdcb..8f4a6599f9a 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -9,7 +9,7 @@ import {
 } from "@lexical/table";
 import {$getParentOfType} from "./nodes";
 import {$getNodeFromSelection} from "./selection";
-import {formatSizeValue} from "./dom";
+import {el, formatSizeValue} from "./dom";
 import {TableMap} from "./table-map";
 
 function $getTableFromCell(cell: TableCellNode): TableNode|null {
@@ -140,6 +140,23 @@ export function $getTableCellColumnWidth(editor: LexicalEditor, cell: TableCellN
     return (widths.length > index) ? widths[index] : '';
 }
 
+export function buildColgroupFromTableWidths(colWidths: string[]): HTMLElement|null {
+    if (colWidths.length === 0) {
+        return null
+    }
+
+    const colgroup = el('colgroup');
+    for (const width of colWidths) {
+        const col = el('col');
+        if (width) {
+            col.style.width = width;
+        }
+        colgroup.append(col);
+    }
+
+    return colgroup;
+}
+
 export function $getTableCellsFromSelection(selection: BaseSelection|null): TableCellNode[]  {
     if ($isTableSelection(selection)) {
         const nodes = selection.getNodes();

From c5ca8657234ad1f8866f3a868d4f5230c6b0d1dd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 28 May 2025 22:52:09 +0100
Subject: [PATCH 559/666] Lexical: Updated WYSIWYG editor status from alpha to
 beta

---
 lang/en/entities.php                                        | 2 +-
 resources/views/settings/categories/customization.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index 6e616ded452..561022ad6b6 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
diff --git a/resources/views/settings/categories/customization.blade.php b/resources/views/settings/categories/customization.blade.php
index 70a490298c7..732cb01988a 100644
--- a/resources/views/settings/categories/customization.blade.php
+++ b/resources/views/settings/categories/customization.blade.php
@@ -32,7 +32,7 @@
                     <select name="setting-app-editor" id="setting-app-editor">
                         <option @if(setting('app-editor') === 'wysiwyg') selected @endif value="wysiwyg">WYSIWYG</option>
                         <option @if(setting('app-editor') === 'markdown') selected @endif value="markdown">Markdown</option>
-                        <option @if(setting('app-editor') === 'wysiwyg2024') selected @endif value="wysiwyg2024">New WYSIWYG (alpha testing)</option>
+                        <option @if(setting('app-editor') === 'wysiwyg2024') selected @endif value="wysiwyg2024">New WYSIWYG (beta testing)</option>
                     </select>
                 </div>
             </div>

From b71b2a4376f175afd57d2906b109abf1a94a097e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 31 May 2025 12:11:00 +0100
Subject: [PATCH 560/666] Cleanup: Updated deps, fixed test, update issue
 templates

Also removed some unused imports.
---
 .github/ISSUE_TEMPLATE/support_request.yml    |   1 +
 .github/ISSUE_TEMPLATE/z_blank_request.yml    |   9 +
 composer.lock                                 | 226 +++++++++---------
 .../js/wysiwyg/lexical/core/nodes/common.ts   |   1 -
 .../lexical/rich-text/LexicalMediaNode.ts     |   1 -
 tests/Entity/PageEditorTest.php               |   2 +-
 6 files changed, 127 insertions(+), 113 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/z_blank_request.yml

diff --git a/.github/ISSUE_TEMPLATE/support_request.yml b/.github/ISSUE_TEMPLATE/support_request.yml
index 4db8d1cedc5..ae808a0b600 100644
--- a/.github/ISSUE_TEMPLATE/support_request.yml
+++ b/.github/ISSUE_TEMPLATE/support_request.yml
@@ -42,6 +42,7 @@ body:
       label: Log Content
       description: If the issue has produced an error, provide any [BookStack or server log](https://www.bookstackapp.com/docs/admin/debugging/) content below.
       placeholder: Be sure to remove any confidential details in your logs
+      render: text
     validations:
       required: false
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/z_blank_request.yml b/.github/ISSUE_TEMPLATE/z_blank_request.yml
new file mode 100644
index 00000000000..5cb5ed2a4d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/z_blank_request.yml
@@ -0,0 +1,9 @@
+name: Blank Request (Maintainers Only)
+description: For maintainers only - Start a blank request
+body:
+  - type: markdown
+    attributes:
+      value: "**This blank request option is only for existing official maintainers of the project!** Please instead use a different request option. If you use this your issue will be closed off."
+  - type: textarea
+    attributes:
+      label: Description
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index a9c41613f67..c8e4d16b63d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.18",
+            "version": "3.343.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876"
+                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae98d503173740cce23b30d2ba2737c49b0d9876",
-                "reference": "ae98d503173740cce23b30d2ba2737c49b0d9876",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/174cc187df3bde52c21e9c00a4e99610a08732a3",
+                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.18"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.22"
             },
-            "time": "2025-05-23T18:08:18+00:00"
+            "time": "2025-05-30T18:11:02+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2075,16 +2075,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.20.0",
+            "version": "v5.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519"
+                "reference": "d83639499ad14985c9a6a9713b70073300ce998d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/30972c12a41f71abeb418bc9ff157da8d9231519",
-                "reference": "30972c12a41f71abeb418bc9ff157da8d9231519",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/d83639499ad14985c9a6a9713b70073300ce998d",
+                "reference": "d83639499ad14985c9a6a9713b70073300ce998d",
                 "shasum": ""
             },
             "require": {
@@ -2143,7 +2143,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-04-21T14:21:34+00:00"
+            "time": "2025-05-19T12:56:37+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3539,16 +3539,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.4.0",
+            "version": "v5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
                 "shasum": ""
             },
             "require": {
@@ -3591,9 +3591,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
             },
-            "time": "2024-12-30T11:07:19+00:00"
+            "time": "2025-05-31T08:24:38+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -5415,7 +5415,7 @@
         },
         {
             "name": "symfony/clock",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/clock.git",
@@ -5469,7 +5469,7 @@
                 "time"
             ],
             "support": {
-                "source": "https://github.com/symfony/clock/tree/v7.2.0"
+                "source": "https://github.com/symfony/clock/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5489,23 +5489,24 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218"
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
-                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
+                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/string": "^7.2"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -5562,7 +5563,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.6"
+                "source": "https://github.com/symfony/console/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5578,11 +5579,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-07T19:09:28+00:00"
+            "time": "2025-05-24T10:34:04+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -5627,7 +5628,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.2.0"
+                "source": "https://github.com/symfony/css-selector/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5714,16 +5715,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.2.5",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b"
+                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b",
-                "reference": "102be5e6a8e4f4f3eb3149bcbfa33a80d1ee374b",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf68d225bc43629de4ff54778029aee6dc191b83",
+                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83",
                 "shasum": ""
             },
             "require": {
@@ -5736,9 +5737,11 @@
                 "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
+                "symfony/console": "^6.4|^7.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^6.4|^7.0"
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/webpack-encore-bundle": "^1.0|^2.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -5769,7 +5772,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.2.5"
+                "source": "https://github.com/symfony/error-handler/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5785,20 +5788,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-03T07:12:39+00:00"
+            "time": "2025-05-29T07:19:49+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
-                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
+                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
                 "shasum": ""
             },
             "require": {
@@ -5849,7 +5852,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -5865,7 +5868,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2025-04-22T09:11:45+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -5945,16 +5948,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.2.2",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
                 "shasum": ""
             },
             "require": {
@@ -5989,7 +5992,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.2.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -6005,20 +6008,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:17+00:00"
+            "time": "2024-12-30T19:00:26+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b"
+                "reference": "4236baf01609667d53b20371486228231eb135fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6023ec7607254c87c5e69fb3558255aca440d72b",
-                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4236baf01609667d53b20371486228231eb135fd",
+                "reference": "4236baf01609667d53b20371486228231eb135fd",
                 "shasum": ""
             },
             "require": {
@@ -6035,6 +6038,7 @@
                 "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "symfony/cache": "^6.4.12|^7.1.5",
+                "symfony/clock": "^6.4|^7.0",
                 "symfony/dependency-injection": "^6.4|^7.0",
                 "symfony/expression-language": "^6.4|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
@@ -6067,7 +6071,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.2.6"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -6083,20 +6087,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-09T08:14:01+00:00"
+            "time": "2025-05-12T14:48:23+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec"
+                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9dec01e6094a063e738f8945ef69c0cfcf792ec",
-                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ac7b8e163e8c83dce3abcc055a502d4486051a9f",
+                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f",
                 "shasum": ""
             },
             "require": {
@@ -6104,8 +6108,8 @@
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^7.3",
+                "symfony/http-foundation": "^7.3",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -6181,7 +6185,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.6"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -6197,20 +6201,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-02T09:04:03+00:00"
+            "time": "2025-05-29T07:47:32+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1"
+                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/706e65c72d402539a072d0d6ad105fff6c161ef1",
-                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
+                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
                 "shasum": ""
             },
             "require": {
@@ -6265,7 +6269,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.6"
+                "source": "https://github.com/symfony/mime/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -6281,7 +6285,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-27T13:34:41+00:00"
+            "time": "2025-02-19T08:51:26+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6922,16 +6926,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.5",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
                 "shasum": ""
             },
             "require": {
@@ -6963,7 +6967,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.5"
+                "source": "https://github.com/symfony/process/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -6979,20 +6983,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-13T12:21:46+00:00"
+            "time": "2025-04-17T09:11:12+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.2.3",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "ee9a67edc6baa33e5fae662f94f91fd262930996"
+                "reference": "8e213820c5fea844ecea29203d2a308019007c15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/ee9a67edc6baa33e5fae662f94f91fd262930996",
-                "reference": "ee9a67edc6baa33e5fae662f94f91fd262930996",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/8e213820c5fea844ecea29203d2a308019007c15",
+                "reference": "8e213820c5fea844ecea29203d2a308019007c15",
                 "shasum": ""
             },
             "require": {
@@ -7044,7 +7048,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.2.3"
+                "source": "https://github.com/symfony/routing/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7060,7 +7064,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-17T10:56:55+00:00"
+            "time": "2025-05-24T20:43:28+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7147,16 +7151,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
-                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
                 "shasum": ""
             },
             "require": {
@@ -7214,7 +7218,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.6"
+                "source": "https://github.com/symfony/string/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7230,20 +7234,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-20T20:18:16+00:00"
+            "time": "2025-04-20T20:19:01+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6"
+                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
-                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
+                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
                 "shasum": ""
             },
             "require": {
@@ -7253,6 +7257,7 @@
                 "symfony/translation-contracts": "^2.5|^3.0"
             },
             "conflict": {
+                "nikic/php-parser": "<5.0",
                 "symfony/config": "<6.4",
                 "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
@@ -7266,7 +7271,7 @@
                 "symfony/translation-implementation": "2.3|3.0"
             },
             "require-dev": {
-                "nikic/php-parser": "^4.18|^5.0",
+                "nikic/php-parser": "^5.0",
                 "psr/log": "^1|^2|^3",
                 "symfony/config": "^6.4|^7.0",
                 "symfony/console": "^6.4|^7.0",
@@ -7309,7 +7314,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.2.6"
+                "source": "https://github.com/symfony/translation/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7325,7 +7330,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-07T19:09:28+00:00"
+            "time": "2025-05-29T07:19:49+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7407,16 +7412,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "2d294d0c48df244c71c105a169d0190bfb080426"
+                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/2d294d0c48df244c71c105a169d0190bfb080426",
-                "reference": "2d294d0c48df244c71c105a169d0190bfb080426",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
+                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
                 "shasum": ""
             },
             "require": {
@@ -7461,7 +7466,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.2.0"
+                "source": "https://github.com/symfony/uid/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7477,24 +7482,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2025-05-24T14:28:13+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb"
+                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9c46038cd4ed68952166cf7001b54eb539184ccb",
-                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/548f6760c54197b1084e1e5c71f6d9d523f2f78e",
+                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -7544,7 +7550,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.2.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7560,7 +7566,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-09T08:14:01+00:00"
+            "time": "2025-04-27T18:39:23+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -10196,16 +10202,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.2.4",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7"
+                "reference": "0fabbc3d6a9c473b716a93fc8e7a537adb396166"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7",
-                "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0fabbc3d6a9c473b716a93fc8e7a537adb396166",
+                "reference": "0fabbc3d6a9c473b716a93fc8e7a537adb396166",
                 "shasum": ""
             },
             "require": {
@@ -10243,7 +10249,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.2.4"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -10259,7 +10265,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-17T15:53:07+00:00"
+            "time": "2025-03-05T10:15:41+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/resources/js/wysiwyg/lexical/core/nodes/common.ts b/resources/js/wysiwyg/lexical/core/nodes/common.ts
index 50d8843440c..f94fa1d5260 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/common.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/common.ts
@@ -1,6 +1,5 @@
 import {sizeToPixels} from "../../../utils/dom";
 import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
-import {elem} from "../../../../services/dom";
 
 export type CommonBlockAlignment = 'left' | 'right' | 'center' | 'justify' | '';
 const validAlignments: CommonBlockAlignment[] = ['left', 'right', 'center', 'justify'];
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 81fb96a936b..1dd159f510d 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -16,7 +16,6 @@ import {
 } from "lexical/nodes/common";
 import {$selectSingleNode} from "../../utils/selection";
 import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
-import * as url from "node:url";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
 export type MediaNodeSource = {
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index bb3d7419306..ad753c96647 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -193,7 +193,7 @@ public function test_editor_type_switch_options_show()
         $editLink = $this->page->getUrl('/edit') . '?editor=';
         $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}markdown-clean\"]", '(Clean Content)');
         $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}markdown-stable\"]", '(Stable Content)');
-        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}wysiwyg2024\"]", '(In Alpha Testing)');
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$editLink}wysiwyg2024\"]", '(In Beta Testing)');
 
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit?editor=markdown-stable'));
         $editLink = $this->page->getUrl('/edit') . '?editor=';

From 7f2604c8e8de02fa7ae1c8446c13cb49b3eb9d56 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Sat, 31 May 2025 12:15:16 +0100
Subject: [PATCH 561/666] Updated translations with latest Crowdin changes
 (#5622)

---
 lang/ar/common.php            |  2 ++
 lang/ar/entities.php          | 13 +++++--
 lang/bg/common.php            |  2 ++
 lang/bg/entities.php          | 13 +++++--
 lang/bn/common.php            |  2 ++
 lang/bn/entities.php          | 13 +++++--
 lang/bs/common.php            |  2 ++
 lang/bs/entities.php          | 13 +++++--
 lang/ca/common.php            |  2 ++
 lang/ca/entities.php          | 13 +++++--
 lang/cs/common.php            |  2 ++
 lang/cs/entities.php          | 13 +++++--
 lang/cy/common.php            |  2 ++
 lang/cy/entities.php          | 13 +++++--
 lang/da/common.php            |  2 ++
 lang/da/entities.php          | 13 +++++--
 lang/de/common.php            |  2 ++
 lang/de/entities.php          | 13 +++++--
 lang/de_informal/common.php   |  2 ++
 lang/de_informal/entities.php | 13 +++++--
 lang/el/common.php            |  2 ++
 lang/el/entities.php          | 13 +++++--
 lang/es/common.php            |  2 ++
 lang/es/entities.php          | 13 +++++--
 lang/es_AR/activities.php     |  8 ++---
 lang/es_AR/auth.php           |  8 ++---
 lang/es_AR/common.php         |  2 ++
 lang/es_AR/editor.php         |  2 +-
 lang/es_AR/entities.php       | 67 ++++++++++++++++++++---------------
 lang/es_AR/errors.php         | 10 +++---
 lang/es_AR/notifications.php  |  8 ++---
 lang/es_AR/preferences.php    | 28 +++++++--------
 lang/es_AR/settings.php       | 18 +++++-----
 lang/et/common.php            |  2 ++
 lang/et/entities.php          | 13 +++++--
 lang/eu/common.php            |  2 ++
 lang/eu/entities.php          | 13 +++++--
 lang/fa/common.php            |  2 ++
 lang/fa/entities.php          | 13 +++++--
 lang/fi/common.php            |  2 ++
 lang/fi/entities.php          | 13 +++++--
 lang/fr/common.php            |  2 ++
 lang/fr/entities.php          | 13 +++++--
 lang/he/common.php            |  2 ++
 lang/he/entities.php          | 13 +++++--
 lang/hr/common.php            |  2 ++
 lang/hr/entities.php          | 13 +++++--
 lang/hu/common.php            |  2 ++
 lang/hu/entities.php          | 13 +++++--
 lang/id/common.php            |  2 ++
 lang/id/entities.php          | 13 +++++--
 lang/is/common.php            |  2 ++
 lang/is/entities.php          | 13 +++++--
 lang/it/common.php            |  2 ++
 lang/it/entities.php          | 13 +++++--
 lang/ja/common.php            |  2 ++
 lang/ja/entities.php          | 13 +++++--
 lang/ka/common.php            |  2 ++
 lang/ka/entities.php          | 13 +++++--
 lang/ko/common.php            |  2 ++
 lang/ko/entities.php          | 13 +++++--
 lang/ku/common.php            |  2 ++
 lang/ku/entities.php          | 13 +++++--
 lang/lt/common.php            |  2 ++
 lang/lt/entities.php          | 13 +++++--
 lang/lv/common.php            |  2 ++
 lang/lv/entities.php          | 13 +++++--
 lang/nb/common.php            |  2 ++
 lang/nb/entities.php          | 13 +++++--
 lang/nl/common.php            |  2 ++
 lang/nl/entities.php          | 13 +++++--
 lang/nn/common.php            |  2 ++
 lang/nn/entities.php          | 13 +++++--
 lang/pl/common.php            |  2 ++
 lang/pl/entities.php          | 13 +++++--
 lang/pt/common.php            |  2 ++
 lang/pt/entities.php          | 13 +++++--
 lang/pt_BR/common.php         |  2 ++
 lang/pt_BR/entities.php       | 13 +++++--
 lang/ro/common.php            |  2 ++
 lang/ro/entities.php          | 13 +++++--
 lang/ru/common.php            |  2 ++
 lang/ru/entities.php          | 13 +++++--
 lang/sk/common.php            |  2 ++
 lang/sk/entities.php          | 13 +++++--
 lang/sl/common.php            |  2 ++
 lang/sl/entities.php          | 13 +++++--
 lang/sq/common.php            |  2 ++
 lang/sq/entities.php          | 13 +++++--
 lang/sr/common.php            |  2 ++
 lang/sr/entities.php          | 13 +++++--
 lang/sv/common.php            |  2 ++
 lang/sv/entities.php          | 13 +++++--
 lang/tk/common.php            |  2 ++
 lang/tk/entities.php          | 13 +++++--
 lang/tr/common.php            |  2 ++
 lang/tr/entities.php          | 13 +++++--
 lang/uk/common.php            |  2 ++
 lang/uk/entities.php          | 13 +++++--
 lang/uz/common.php            |  2 ++
 lang/uz/entities.php          | 13 +++++--
 lang/vi/common.php            |  2 ++
 lang/vi/entities.php          | 13 +++++--
 lang/zh_CN/common.php         |  2 ++
 lang/zh_CN/entities.php       | 13 +++++--
 lang/zh_TW/common.php         |  2 ++
 lang/zh_TW/entities.php       | 13 +++++--
 107 files changed, 718 insertions(+), 168 deletions(-)

diff --git a/lang/ar/common.php b/lang/ar/common.php
index 07576a2505a..a8fb18e865c 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -30,6 +30,8 @@
     'create' => 'إنشاء',
     'update' => 'تحديث',
     'edit' => 'تعديل',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'سرد',
     'move' => 'نقل',
     'copy' => 'نسخ',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index aea8bf1e537..c07fba5422f 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(محتوى مستقر)',
     'pages_edit_switch_to_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه -WYSIWYG-',
     'pages_edit_switch_to_new_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه الجديد -new WYSIWYG-',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(في اختبار ألف)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'تثبيت سجل التعديل',
     'pages_edit_enter_changelog_desc' => 'ضع وصف مختصر للتعديلات التي تمت',
     'pages_edit_enter_changelog' => 'أدخل سجل التعديل',
@@ -392,8 +392,11 @@
     'comment' => 'تعليق',
     'comments' => 'تعليقات',
     'comment_add' => 'إضافة تعليق',
+    'comment_none' => 'لا توجد تعليقات لعرضها',
     'comment_placeholder' => 'ضع تعليقاً هنا',
-    'comment_count' => '{0} لا توجد تعليقات|{1} تعليق واحد|{2} تعليقان[3,*] :count تعليقات',
+    'comment_thread_count' => ':count تعليقات| :count تعليقات',
+    'comment_archived_count' => ':count مؤرشف',
+    'comment_archived_threads' => 'المواضيع المؤرشفة',
     'comment_save' => 'حفظ التعليق',
     'comment_new' => 'تعليق جديد',
     'comment_created' => 'تم التعليق :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'تم حذف التعليق',
     'comment_created_success' => 'تمت إضافة التعليق',
     'comment_updated_success' => 'تم تحديث التعليق',
+    'comment_archive_success' => 'تم أرشفة التعليق',
+    'comment_unarchive_success' => 'تعليق غير مؤرشف',
+    'comment_view' => 'عرض التعليق',
+    'comment_jump_to_thread' => 'انتقل إلى الموضوع',
     'comment_delete_confirm' => 'تأكيد حذف التعليق؟',
     'comment_in_reply_to' => 'رداً على :commentId',
+    'comment_reference' => 'المرجع',
+    'comment_reference_outdated' => '(قديمة)',
     'comment_editor_explain' => 'هذه هي التعليقات المُضافة على هذه الصفحة. يُمكنك إضافة التعليقات وإدارتها عند عرض الصفحة المحفوظة.',
 
     // Revision
diff --git a/lang/bg/common.php b/lang/bg/common.php
index 30298e63941..ba74ea5b2cb 100644
--- a/lang/bg/common.php
+++ b/lang/bg/common.php
@@ -30,6 +30,8 @@
     'create' => 'Създаване',
     'update' => 'Обновяване',
     'edit' => 'Редактиране',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Сортиране',
     'move' => 'Преместване',
     'copy' => 'Копиране',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index c4a62eb423e..050b7e319c4 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Задайте регистър на промените',
     'pages_edit_enter_changelog_desc' => 'Въведете кратко резюме на промените, които сте създали',
     'pages_edit_enter_changelog' => 'Въведи регистър на промените',
@@ -392,8 +392,11 @@
     'comment' => 'Коментирай',
     'comments' => 'Коментари',
     'comment_add' => 'Добавяне на коментар',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Напишете коментар',
-    'comment_count' => '{0} Няма коментари|{1} 1 коментар|[2,*] :count коментара',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Запази коментар',
     'comment_new' => 'Нов коментар',
     'comment_created' => 'коментирано :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Коментарът е изтрит',
     'comment_created_success' => 'Коментарът е добавен',
     'comment_updated_success' => 'Коментарът е обновен',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Наистина ли искате да изтриете този коментар?',
     'comment_in_reply_to' => 'В отговор на :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/bn/common.php b/lang/bn/common.php
index 8f425abee93..baf20426f01 100644
--- a/lang/bn/common.php
+++ b/lang/bn/common.php
@@ -30,6 +30,8 @@
     'create' => 'তৈরী করুন',
     'update' => 'হালনাগাদ করুন',
     'edit' => 'সম্পাদন করুন',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'ক্রমান্বয় করুন',
     'move' => 'স্থানান্তর করুন',
     'copy' => 'অনুলিপি করুন',
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
index a74785eaacd..561022ad6b6 100644
--- a/lang/bn/entities.php
+++ b/lang/bn/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/bs/common.php b/lang/bs/common.php
index 4e4631a0d9d..c2f1fda0d1a 100644
--- a/lang/bs/common.php
+++ b/lang/bs/common.php
@@ -30,6 +30,8 @@
     'create' => 'Kreiraj',
     'update' => 'Ažuriraj',
     'edit' => 'Uredi',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortiraj',
     'move' => 'Pomjeri',
     'copy' => 'Kopiraj',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index 9bcbdb0f504..1f77db56855 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/ca/common.php b/lang/ca/common.php
index f4ad19230b7..698956601bf 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -30,6 +30,8 @@
     'create' => 'Crea',
     'update' => 'Actualitza',
     'edit' => 'Edita',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordena',
     'move' => 'Mou',
     'copy' => 'Copia',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index e1939babd3d..af62a4c0b27 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contingut estable)',
     'pages_edit_switch_to_wysiwyg' => 'Canvia a l’editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Registre de canvis',
     'pages_edit_enter_changelog_desc' => 'Introduïu una descripció breu dels canvis que heu fet',
     'pages_edit_enter_changelog' => 'Registra un canvi',
@@ -392,8 +392,11 @@
     'comment' => 'Comentari',
     'comments' => 'Comentaris',
     'comment_add' => 'Afegeix un comentari',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Deixa un comentari aquí',
-    'comment_count' => '{0} No hi ha cap comentari|{1} Hi ha 1 comentari|[2,*] Hi ha :count comentaris',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Desa el comentari',
     'comment_new' => 'Crea un comentari',
     'comment_created' => 'ha comentat :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'S’ha suprimit el comentari',
     'comment_created_success' => 'S’ha afegit un comentari',
     'comment_updated_success' => 'S’ha actualitzat un comentari',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Esteu segur que voleu suprimir aquest comentari?',
     'comment_in_reply_to' => 'En resposta a :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Vet aquí els comentaris que s’han fet en aquesta pàgina. Els comentaris es poden fer i gestionar quan es visualitza la pàgina desada.',
 
     // Revision
diff --git a/lang/cs/common.php b/lang/cs/common.php
index af02491e460..32d8f4b61da 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -30,6 +30,8 @@
     'create' => 'Vytvořit',
     'update' => 'Aktualizovat',
     'edit' => 'Upravit',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Seřadit',
     'move' => 'Přesunout',
     'copy' => 'Kopírovat',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 6add3175f80..3af8f389b33 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Přepnout na nový WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(V alfa testování)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Nastavit protokol změn',
     'pages_edit_enter_changelog_desc' => 'Zadejte stručný popis změn, které jste provedli',
     'pages_edit_enter_changelog' => 'Zadejte protokol změn',
@@ -392,8 +392,11 @@
     'comment' => 'Komentář',
     'comments' => 'Komentáře',
     'comment_add' => 'Přidat komentář',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Zde zadejte komentář',
-    'comment_count' => '{0} Bez komentářů|{1} 1 komentář|[2,4] :count komentáře|[5,*] :count komentářů',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Uložit komentář',
     'comment_new' => 'Nový komentář',
     'comment_created' => 'komentováno :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentář odstraněn',
     'comment_created_success' => 'Komentář přidán',
     'comment_updated_success' => 'Komentář aktualizován',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Opravdu chcete odstranit tento komentář?',
     'comment_in_reply_to' => 'Odpověď na :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Zde jsou komentáře, které zůstaly na této stránce. Komentáře lze přidat a spravovat při prohlížení uložené stránky.',
 
     // Revision
diff --git a/lang/cy/common.php b/lang/cy/common.php
index c8c770b7118..b42e0d44b19 100644
--- a/lang/cy/common.php
+++ b/lang/cy/common.php
@@ -30,6 +30,8 @@
     'create' => 'Creu',
     'update' => 'Diweddaru',
     'edit' => 'Golygu',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Trefnu',
     'move' => 'Symud',
     'copy' => 'Copïo',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index bf4bc554c82..7ddc29e7be7 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Cynnwys Glân)',
     'pages_edit_switch_to_wysiwyg' => 'Newid i Olygydd WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Newid i WYSIWYG newydd',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Mewn Profi Alpha)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Gosod Changelog',
     'pages_edit_enter_changelog_desc' => 'Rhowch ddisgrifiad byr o\'r newidiadau rydych wedi\'u gwneud',
     'pages_edit_enter_changelog' => 'Cofnodwch Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Sylw',
     'comments' => 'Sylwadau',
     'comment_add' => 'Ychwanegu Sylw',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Gadewch sylw yma',
-    'comment_count' => '{0} Dim sylwadau|{1} 1 Sylw| [2,*] :count Sylwadau',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Cadw Sylw',
     'comment_new' => 'Sylw Newydd',
     'comment_created' => 'sylwodd :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Dilëwyd sylw',
     'comment_created_success' => 'Ychwanegwyd sylw',
     'comment_updated_success' => 'Diweddarwyd sylw',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ydych chi\'n siwr eich bod eisiau dileu\'r sylw hwn?',
     'comment_in_reply_to' => 'Mewn ymateb i :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Dyma\'r sylwadau sydd wedi eu gadael ar y dudalen hon. Gellir ychwanegu a rheoli sylwadau wrth edrych ar y dudalen a gadwyd.',
 
     // Revision
diff --git a/lang/da/common.php b/lang/da/common.php
index 75060b28b3f..69c80e84425 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -30,6 +30,8 @@
     'create' => 'Opret',
     'update' => 'Opdater',
     'edit' => 'Rediger',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sorter',
     'move' => 'Flyt',
     'copy' => 'Kopier',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index cfd2a193652..1ef9ee4d525 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilt indhold)',
     'pages_edit_switch_to_wysiwyg' => 'Skift til WYSIWYG redigering',
     'pages_edit_switch_to_new_wysiwyg' => 'Skift til ny WYSIWYG (Hvad man ser, er hvad man får)',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(I alfa-testning)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Sæt ændringsoversigt',
     'pages_edit_enter_changelog_desc' => 'Indtast en kort beskrivelse af ændringer du har lavet',
     'pages_edit_enter_changelog' => 'Indtast ændringsoversigt',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Tilføj kommentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Skriv en kommentar her',
-    'comment_count' => '{0} Ingen kommentarer|{1} 1 Kommentar|[2,*] :count kommentarer',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Gem kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenteret :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar slettet',
     'comment_created_success' => 'Kommentaren er tilføjet',
     'comment_updated_success' => 'Kommentaren er opdateret',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Er du sikker på, at du vil slette denne kommentar?',
     'comment_in_reply_to' => 'Som svar til :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Her er de kommentarer, der er blevet efterladt på denne side. Kommentarer kan tilføjes og administreres, når du ser den gemte side.',
 
     // Revision
diff --git a/lang/de/common.php b/lang/de/common.php
index 8ff91da0a25..bbf8d8f238a 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -30,6 +30,8 @@
     'create' => 'Erstellen',
     'update' => 'Aktualisieren',
     'edit' => 'Bearbeiten',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortieren',
     'move' => 'Verschieben',
     'copy' => 'Kopieren',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 767696eb35f..2b86577452c 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
     'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha-Testphase)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Geben Sie hier Ihre Kommentare ein',
-    'comment_count' => '{0} Keine Kommentare|{1} 1 Kommentar|[2,*] :count Kommentare',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
     'comment_created' => ':createDiff kommentiert',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar gelöscht',
     'comment_created_success' => 'Kommentar hinzugefügt',
     'comment_updated_success' => 'Kommentar aktualisiert',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Möchten Sie diesen Kommentar wirklich löschen?',
     'comment_in_reply_to' => 'Antwort auf :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
 
     // Revision
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index bc33b8535a6..47ba2683497 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -30,6 +30,8 @@
     'create' => 'Anlegen',
     'update' => 'Aktualisieren',
     'edit' => 'Bearbeiten',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortieren',
     'move' => 'Verschieben',
     'copy' => 'Kopieren',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 9891bcb67e9..12a3dd8fe9a 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
     'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha-Testphase)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Gib hier deine Kommentare ein',
-    'comment_count' => '{0} Keine Kommentare|{1} 1 Kommentar|[2,*] :count Kommentare',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
     'comment_created' => ':createDiff kommentiert',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar gelöscht',
     'comment_created_success' => 'Kommentar hinzugefügt',
     'comment_updated_success' => 'Kommentar aktualisiert',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Möchtst du diesen Kommentar wirklich löschen?',
     'comment_in_reply_to' => 'Antwort auf :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
 
     // Revision
diff --git a/lang/el/common.php b/lang/el/common.php
index 112133883f3..39c5aad18fd 100644
--- a/lang/el/common.php
+++ b/lang/el/common.php
@@ -30,6 +30,8 @@
     'create' => 'Δημιουργία',
     'update' => 'Ενημέρωση',
     'edit' => 'Επεξεργασία',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ταξινόμηση',
     'move' => 'Μετακίνηση',
     'copy' => 'Αντιγραφή',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index 8c043be4b36..3220933cded 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Σταθερό Περιεχόμενο)',
     'pages_edit_switch_to_wysiwyg' => 'Εναλλαγή στον επεξεργαστή WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Ορισμός καταγραφής αλλαγών',
     'pages_edit_enter_changelog_desc' => 'Εισάγετε μια σύντομη περιγραφή των αλλαγών που κάνατε',
     'pages_edit_enter_changelog' => 'Εισαγωγή Αρχείου Καταγραφής Αλλαγών',
@@ -392,8 +392,11 @@
     'comment' => 'Σχόλιο',
     'comments' => 'Σχόλια',
     'comment_add' => 'Προσθήκη Σχολίου',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Αφήστε ένα σχόλιο εδώ',
-    'comment_count' => '{0} Κανένα Σχόλιο |{1} 1 Σχόλιο |[2,*] :count Σχόλια',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Αποθήκευση Σχολίου',
     'comment_new' => 'Νέο Σχόλιο',
     'comment_created' => 'σχολίασε :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Σχόλιο διαγράφηκε',
     'comment_created_success' => 'Το σχόλιο προστέθηκε',
     'comment_updated_success' => 'Το σχόλιο ενημερώθηκε',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το σχόλιο;',
     'comment_in_reply_to' => 'Σε απάντηση στο :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/es/common.php b/lang/es/common.php
index 14eee82d97c..cff4fced6f6 100644
--- a/lang/es/common.php
+++ b/lang/es/common.php
@@ -30,6 +30,8 @@
     'create' => 'Crear',
     'update' => 'Actualizar',
     'edit' => 'Editar',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 591babb696c..bff9ff47e9d 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(En alfa)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Ajustar Log de cambios',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar al Log de cambios',
@@ -392,8 +392,11 @@
     'comment' => 'Comentario',
     'comments' => 'Comentarios',
     'comment_add' => 'Añadir Comentario',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Introduzca su comentario aquí',
-    'comment_count' => '{0} Sin Comentarios|{1} 1 Comentario|[2,*] :count Comentarios',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Guardar comentario',
     'comment_new' => 'Nuevo Comentario',
     'comment_created' => 'comentado :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comentario borrado',
     'comment_created_success' => 'Comentario añadido',
     'comment_updated_success' => 'Comentario actualizado',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '¿Está seguro de que quiere borrar este comentario?',
     'comment_in_reply_to' => 'En respuesta a :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Estos son los comentarios que se han escrito en esta página. Los comentarios se pueden añadir y administrar cuando se ve la página guardada.',
 
     // Revision
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index d7b93d73081..e01fe4e643e 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -10,7 +10,7 @@
     'page_create_notification'    => 'Página creada correctamente',
     'page_update'                 => 'página actualizada',
     'page_update_notification'    => 'Página actualizada correctamente',
-    'page_delete'                 => 'página borrada',
+    'page_delete'                 => 'borró la página',
     'page_delete_notification'    => 'Página eliminada correctamente',
     'page_restore'                => 'página restaurada',
     'page_restore_notification'   => 'Página restaurada correctamente',
@@ -96,7 +96,7 @@
     'user_create' => 'usuario creado',
     'user_create_notification' => 'Usuario creado correctamente',
     'user_update' => 'usuario actualizado',
-    'user_update_notification' => 'Usuario actualizado correctamente',
+    'user_update_notification' => 'Usuario actualizado con éxito',
     'user_delete' => 'usuario eliminado',
     'user_delete_notification' => 'El usuario fue eliminado correctamente',
 
@@ -129,11 +129,11 @@
 
     // Sort Rules
     'sort_rule_create' => 'regla de ordenación creada',
-    'sort_rule_create_notification' => 'Rol de ordenación creada con éxito',
+    'sort_rule_create_notification' => 'Regla de ordenación creada correctamente',
     'sort_rule_update' => 'regla de ordenación actualizada',
     'sort_rule_update_notification' => 'Regla de ordenación actualizada correctamente',
     'sort_rule_delete' => 'regla de ordenación eliminada',
-    'sort_rule_delete_notification' => 'Rol de ordenación borrada con éxito',
+    'sort_rule_delete_notification' => 'Regla de ordenación eliminada correctamente',
 
     // Other
     'permissions_update'          => 'permisos actualizados',
diff --git a/lang/es_AR/auth.php b/lang/es_AR/auth.php
index 1316dd68615..7687f709e92 100644
--- a/lang/es_AR/auth.php
+++ b/lang/es_AR/auth.php
@@ -6,12 +6,12 @@
  */
 return [
 
-    'failed' => 'Las credenciales no concuerdan con nuestros registros.',
-    'throttle' => 'Demasiados intentos fallidos de conexión. Por favor intente nuevamente en :seconds segundos.',
+    'failed' => 'Estas credenciales no concuerdan con nuestros registros.',
+    'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor intente nuevamente en :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registrarse',
-    'log_in' => 'Acceder',
+    'log_in' => 'Iniciar sesión',
     'log_in_with' => 'Acceder con :socialDriver',
     'sign_up_with' => 'Registrarse con :socialDriver',
     'logout' => 'Salir',
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicación móvil',
     'mfa_option_totp_desc' => 'Para utilizar la autenticación en dos pasos necesitará una aplicación móvil que soporte TOTP como Google Authenticator, Authy o Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Códigos de Respaldo',
-    'mfa_option_backup_codes_desc' => 'Genera un conjunto de códigos de seguridad de un solo uso que ingresará al iniciar sesión para verificar su identidad. Asegúrese de guardarlos en un lugar seguro.',
+    'mfa_option_backup_codes_desc' => 'Genera un conjunto de códigos de respaldo de un único uso que ingresará al iniciar sesión para verificar su identidad. Asegúrese de guardarlos en un lugar seguro.',
     'mfa_gen_confirm_and_enable' => 'Confirmar y Activar',
     'mfa_gen_backup_codes_title' => 'Configuración de Códigos de Respaldo',
     'mfa_gen_backup_codes_desc' => 'Guarde la siguiente lista de códigos en un lugar seguro. Al acceder al sistema podrá usar uno de los códigos como un segundo mecanismo de autenticación.',
diff --git a/lang/es_AR/common.php b/lang/es_AR/common.php
index ebac11119d3..e30adbf69be 100644
--- a/lang/es_AR/common.php
+++ b/lang/es_AR/common.php
@@ -30,6 +30,8 @@
     'create' => 'Crear',
     'update' => 'Actualizar',
     'edit' => 'Editar',
+    'archive' => 'Archivar',
+    'unarchive' => 'Desarchivar',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 59c640ac061..7f4f7a0b88e 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -148,7 +148,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto a mostrar',
     'title' => 'Título',
-    'browse_links' => 'Ver enlaces',
+    'browse_links' => 'Explorar enlaces',
     'open_link' => 'Abrir enlace',
     'open_link_in' => 'Abrir enlace en...',
     'open_link_current' => 'Ventana actual',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index b96de3b272e..bb21300c2fe 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Actualizado el :timeLength',
     'meta_updated_name' => 'Actualizado el :timeLength por :user',
     'meta_owned_name' => 'Propiedad de :user',
-    'meta_reference_count' => 'Referido en :count página | Referido en :count paginas',
+    'meta_reference_count' => 'Referido en :count página | Referido en :count páginas',
     'entity_select' => 'Seleccione entidad',
     'entity_select_lack_permission' => 'No tiene los permisos necesarios para seleccionar este elemento',
     'images' => 'Imágenes',
@@ -40,21 +40,21 @@
     'export_text' => 'Archivo de texto plano',
     'export_md' => 'Archivo Markdown',
     'export_zip' => 'ZIP portable',
-    'default_template' => 'Plantilla de página por defecto',
-    'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de páginas tiene acceso a la plantilla de página elegida.',
+    'default_template' => 'Plantilla de página predeterminada',
+    'default_template_explain' => 'Asigne una plantilla de página que se utilizará como contenido predeterminado para todas las páginas creadas en este elemento. Tenga en cuenta que esto sólo se utilizará si el creador de las páginas tiene acceso a la plantilla de página elegida.',
     'default_template_select' => 'Seleccione una página de plantilla',
     'import' => 'Importar',
     'import_validate' => 'Validar importación',
-    'import_desc' => 'Importar libros, capítulos y páginas usando una exportación zip portable de la misma o distinta instancia. Seleccione un archivo ZIP para continuar. Después de que el archivo haya sido subido y validado, podrá configurar y confirmar la importación en la siguiente vista.',
+    'import_desc' => 'Importar libros, capítulos y páginas usando una exportación zip portable de la misma instancia u otra distinta. Seleccione un archivo ZIP para continuar. Después de que el archivo haya sido subido y validado, podrá configurar y confirmar la importación en la siguiente vista.',
     'import_zip_select' => 'Seleccione archivo ZIP a subir',
     'import_zip_validation_errors' => 'Se detectaron errores al validar el archivo ZIP proporcionado:',
     'import_pending' => 'Importaciones pendientes',
-    'import_pending_none' => 'No se han iniciado importaciones.',
-    'import_continue' => 'Continuar importación',
+    'import_pending_none' => 'No se iniciaron importaciones.',
+    'import_continue' => 'Continuar la importación',
     'import_continue_desc' => 'Revise el contenido que debe importarse del archivo ZIP subido. Cuando esté listo, ejecute la importación para añadir su contenido a este sistema. El archivo de importación ZIP subido se eliminará automáticamente al terminar la importación correctamente.',
     'import_details' => 'Detalles de la Importación',
-    'import_run' => 'Ejecutar Importación',
-    'import_size' => ':size tamaño archivo ZIP',
+    'import_run' => 'Ejecutar la importación',
+    'import_size' => ':size tamaño del archivo ZIP',
     'import_uploaded_at' => 'Subido :relativeTime',
     'import_uploaded_by' => 'Subido por',
     'import_location' => 'Ubicación de Importación',
@@ -62,11 +62,11 @@
     'import_delete_confirm' => '¿Está seguro de que desea eliminar esta importación?',
     'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
     'import_errors' => 'Errores de Importación',
-    'import_errors_desc' => 'Se han producido los siguientes errores durante el intento de importación:',
+    'import_errors_desc' => 'Se produjeron los siguientes errores durante el intento de importación:',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
-    'permissions_desc' => 'Establezca los permisos aquí para reemplazar los permisos por defecto proporcionados por los roles de usuario.',
+    'permissions_desc' => 'Establezca los permisos aquí para reemplazar los permisos predeterminados proporcionados por los roles de usuario.',
     'permissions_book_cascade' => 'Los permisos establecidos en los libros se aplicarán a los capítulos contenidos y las páginas contenidas, a menos que tengan sus propios permisos definidos.',
     'permissions_chapter_cascade' => 'Los permisos establecidos en los capítulos se aplicarán a las páginas contenidas, a menos que tengan sus propios permisos definidos.',
     'permissions_save' => 'Guardar permisos',
@@ -74,7 +74,7 @@
     'permissions_role_everyone_else' => 'Todos los demás',
     'permissions_role_everyone_else_desc' => 'Establecer permisos para todos los roles no específicamente reemplazados.',
     'permissions_role_override' => 'Reemplazar permisos para el rol',
-    'permissions_inherit_defaults' => 'Heredar valores por defecto',
+    'permissions_inherit_defaults' => 'Heredar valores predeterminados',
 
     // Search
     'search_results' => 'Buscar resultados',
@@ -166,7 +166,7 @@
     'books_search_this' => 'Buscar en este libro',
     'books_navigation' => 'Navegación de libro',
     'books_sort' => 'Organizar contenido de libro',
-    'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para ordenar automáticamente el contenido de este libro cuando haya cambios.',
+    'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para el contenido de este libro cuando haya cambios.',
     'books_sort_auto_sort' => 'Opción de ordenación automática',
     'books_sort_auto_sort_active' => 'Opción de ordenación activa: sortName',
     'books_sort_named' => 'Organizar libro :bookName',
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(En alfa)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Establecer cambios de registro',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar en cambio de registro',
@@ -269,7 +269,7 @@
     'pages_md_show_preview' => 'Mostrar vista previa',
     'pages_md_sync_scroll' => 'Sincronizar desplazamiento de vista previa',
     'pages_drawing_unsaved' => 'Encontrado dibujo sin guardar',
-    'pages_drawing_unsaved_confirm' => 'Se encontraron datos no guardados del dibujo de un intento de guardado fallido. ¿Desea restaurar y continuar editando el dibujo no guardado?',
+    'pages_drawing_unsaved_confirm' => 'Se encontraron datos del dibujo no guardados durante un intento de guardado fallido anterior. ¿Desea restaurar y continuar editando el dibujo no guardado?',
     'pages_not_in_chapter' => 'La página no esá en el capítulo',
     'pages_move' => 'Mover página',
     'pages_copy' => 'Copiar página',
@@ -392,8 +392,11 @@
     'comment' => 'Comentario',
     'comments' => 'Comentarios',
     'comment_add' => 'Agregar comentario',
+    'comment_none' => 'No hay comentarios para mostrar',
     'comment_placeholder' => 'DEjar un comentario aquí',
-    'comment_count' => '{0} Sin Comentarios|{1} 1 Comentario|[2,*] :count Comentarios',
+    'comment_thread_count' => ':count Hilo de Comentarios|:count Hilos de Comentarios',
+    'comment_archived_count' => ':count Archivados',
+    'comment_archived_threads' => 'Hilos Archivados',
     'comment_save' => 'Guardar comentario',
     'comment_new' => 'Nuevo comentario',
     'comment_created' => 'comentado :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comentario borrado',
     'comment_created_success' => 'Comentario agregado',
     'comment_updated_success' => 'Comentario actualizado',
+    'comment_archive_success' => 'Comentario archivado',
+    'comment_unarchive_success' => 'Comentario no archivado',
+    'comment_view' => 'Ver comentario',
+    'comment_jump_to_thread' => 'Ir al hilo',
     'comment_delete_confirm' => '¿Está seguro que quiere borrar este comentario?',
     'comment_in_reply_to' => 'En respuesta a :commentId',
+    'comment_reference' => 'Referencia',
+    'comment_reference_outdated' => '(Obsoleto)',
     'comment_editor_explain' => 'Estos son los comentarios que se escribieron en esta página. Los comentarios se pueden añadir y administrar cuando se visualiza la página guardada.',
 
     // Revision
@@ -434,29 +443,29 @@
     // References
     'references' => 'Referencias',
     'references_none' => 'No hay referencias a este elemento.',
-    'references_to_desc' => 'A continuación se muestran todas las páginas en el sistema que enlazan a este elemento.',
+    'references_to_desc' => 'A continuación se muestra todo el contenido conocido en el sistema que enlaza a este elemento.',
 
     // Watch Options
     'watch' => 'Suscribirme',
-    'watch_title_default' => 'Preferencias por defecto',
-    'watch_desc_default' => 'Revertir suscripciones a tus preferencias de notificación por defecto.',
+    'watch_title_default' => 'Preferencias Predeterminadas',
+    'watch_desc_default' => 'Revertir las suscripciones a solo tus preferencias de notificación predeterminadas.',
     'watch_title_ignore' => 'Ignorar',
-    'watch_desc_ignore' => 'Ignorar todas las notificaciones, incluyendo las de las preferencias a nivel de usuario.',
-    'watch_title_new' => 'Nuevas páginas',
+    'watch_desc_ignore' => 'Ignorar todas las notificaciones, incluyendo las de preferencias a nivel de usuario.',
+    'watch_title_new' => 'Páginas Nuevas',
     'watch_desc_new' => 'Notificar cuando se crea una nueva página dentro de este elemento.',
-    'watch_title_updates' => 'Todas las actualizaciones de páginas',
-    'watch_desc_updates' => 'Notificar todos los cambios de páginas y páginas nuevas.',
-    'watch_desc_updates_page' => 'Notificar todos los cambios en la página.',
-    'watch_title_comments' => 'Todas las actualizaciones de páginas y comentarios',
-    'watch_desc_comments' => 'Notificar sobre todas las páginas nuevas, cambios de página y nuevos comentarios.',
+    'watch_title_updates' => 'Todas las actualizaciones de página',
+    'watch_desc_updates' => 'Notificar todas las páginas nuevas y todos los cambios de página.',
+    'watch_desc_updates_page' => 'Notificar todos los cambios de página.',
+    'watch_title_comments' => 'Todas las actualizaciones y comentarios de página',
+    'watch_desc_comments' => 'Notificar todas las páginas nuevas, todos los cambios de página y todos los nuevos comentarios.',
     'watch_desc_comments_page' => 'Notificar los cambios en las páginas y los nuevos comentarios.',
-    'watch_change_default' => 'Cambiar preferencias de notificación por defecto',
-    'watch_detail_ignore' => 'Ignorar notificaciones',
+    'watch_change_default' => 'Cambiar preferencias de notificación predeterminadas',
+    'watch_detail_ignore' => 'Ignorando notificaciones',
     'watch_detail_new' => 'Suscripciones de nuevas páginas',
     'watch_detail_updates' => 'Suscripciones de nuevas páginas y actualizaciones de páginas',
     'watch_detail_comments' => 'Suscripciones de nuevas páginas, actualizaciones de páginas y comentarios',
     'watch_detail_parent_book' => 'Subscripciones por libro contenedor',
     'watch_detail_parent_book_ignore' => 'Ignorando a través del libro contenedor',
-    'watch_detail_parent_chapter' => 'Subscripciones por capítulo superior',
-    'watch_detail_parent_chapter_ignore' => 'Ignorar por capítulo superior',
+    'watch_detail_parent_chapter' => 'Subscripciones por capítulo contenedor',
+    'watch_detail_parent_chapter_ignore' => 'Ignorar por capítulo contenedor',
 ];
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index cb1bc1202bb..16a5b5467e3 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'No se puede borrar el único administrador',
     'users_cannot_delete_guest' => 'No se puede borrar el usuario invitado',
-    'users_could_not_send_invite' => 'No se pudo crear el usuario porque no se pudo enviar el correo de invitación',
+    'users_could_not_send_invite' => 'No se creó el usuario porque no se pudo enviar el correo de invitación',
 
     // Roles
     'role_cannot_be_edited' => 'Este rol no puede ser editado',
@@ -107,9 +107,9 @@
 
     // Import
     'import_zip_cant_read' => 'No se pudo leer el archivo ZIP.',
-    'import_zip_cant_decode_data' => 'No se pudo encontrar y decodificar el archivo data.json. en el archivo ZIP.',
-    'import_zip_no_data' => 'Los datos del archivo ZIP no contienen ningún libro, capítulo o contenido de página.',
-    'import_validation_failed' => 'Error al validar la importación del ZIP con errores:',
+    'import_zip_cant_decode_data' => 'No se pudo encontrar ni decodificar el contenido del archivo ZIP data.json.',
+    'import_zip_no_data' => 'Los datos del archivo ZIP no tienen un libro, un capítulo o contenido de página en su contenido.',
+    'import_validation_failed' => 'Error al validar la importación del ZIP con los errores:',
     'import_zip_failed_notification' => 'Error al importar archivo ZIP.',
     'import_perms_books' => 'Le faltan los permisos necesarios para crear libros.',
     'import_perms_chapters' => 'Le faltan los permisos necesarios para crear capítulos.',
@@ -129,5 +129,5 @@
     'maintenance_test_email_failure' => 'Error al enviar un email de prueba:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'La URL no coincide con los hosts SSR permitidos',
+    'http_ssr_url_no_match' => 'La URL no coincide con los hosts SSR configurados como permitidos',
 ];
diff --git a/lang/es_AR/notifications.php b/lang/es_AR/notifications.php
index a75b30f5572..fc89b2c25ab 100644
--- a/lang/es_AR/notifications.php
+++ b/lang/es_AR/notifications.php
@@ -5,11 +5,11 @@
 return [
 
     'new_comment_subject' => 'Nuevo comentario en la página: :pageName',
-    'new_comment_intro' => 'Un usuario ha comentado en una página de :appName:',
-    'new_page_subject' => 'Nueva página: :pageName',
-    'new_page_intro' => 'Una nueva página ha sido creada en :appName:',
+    'new_comment_intro' => 'Un usuario comentó en una página de :appName:',
+    'new_page_subject' => 'Página nueva: :pageName',
+    'new_page_intro' => 'Se creó una nueva página en :appName:',
     'updated_page_subject' => 'Página actualizada: :pageName',
-    'updated_page_intro' => 'Una página ha sido actualizada en :appName:',
+    'updated_page_intro' => 'Se actualizó una página en :appName:',
     'updated_page_debounce' => 'Para evitar una avalancha de notificaciones, durante un tiempo no se enviarán notificaciones sobre más ediciones de esta página por el mismo editor.',
 
     'detail_page_name' => 'Nombre de la página:',
diff --git a/lang/es_AR/preferences.php b/lang/es_AR/preferences.php
index 2bf3f3f9662..11c872021c0 100644
--- a/lang/es_AR/preferences.php
+++ b/lang/es_AR/preferences.php
@@ -8,7 +8,7 @@
     'my_account' => 'Mi cuenta',
 
     'shortcuts' => 'Atajos',
-    'shortcuts_interface' => 'Preferencias de acceso directo en la interfaz',
+    'shortcuts_interface' => 'Preferencias de atajos en la interfaz',
     'shortcuts_toggle_desc' => 'Aquí puede activar o desactivar los accesos rápidos de la interfaz, utilizados para la navegación y las acciones.',
     'shortcuts_customize_desc' => 'Puede personalizar cada uno de los atajos a continuación. Simplemente pulse la combinación de teclas deseada después de seleccionar la entrada para un atajo.',
     'shortcuts_toggle_label' => 'Atajos de teclado habilitados',
@@ -21,31 +21,31 @@
 
     'notifications' => 'Preferencias de notificaciones',
     'notifications_desc' => 'Controle las notificaciones por correo electrónico que recibe cuando se realiza cierta actividad dentro del sistema.',
-    'notifications_opt_own_page_changes' => 'Notificar sobre los cambios en las páginas en las que soy propietario',
-    'notifications_opt_own_page_comments' => 'Notificar sobre comentarios en las páginas en las que soy propietario',
+    'notifications_opt_own_page_changes' => 'Notificar sobre los cambios en las páginas de las que soy propietario',
+    'notifications_opt_own_page_comments' => 'Notificar sobre comentarios en las páginas de las que soy propietario',
     'notifications_opt_comment_replies' => 'Notificar sobre respuestas a mis comentarios',
     'notifications_save' => 'Guardar preferencias',
-    'notifications_update_success' => '¡Se han actualizado las preferencias de notificaciones!',
-    'notifications_watched' => 'Elementos vistos e ignorados',
+    'notifications_update_success' => '¡Se actualizaron las preferencias de notificaciones!',
+    'notifications_watched' => 'Elementos vigilados e ignorados',
     'notifications_watched_desc' => 'A continuación se muestran los elementos que tienen preferencias personalizadas de monitorización. Para actualizar sus preferencias, vea el artículo y las opciones se mostrarán en la barra lateral.',
 
     'auth' => 'Acceso y seguridad',
     'auth_change_password' => 'Cambiar contraseña',
     'auth_change_password_desc' => 'Cambie la contraseña que utiliza para iniciar sesión en la aplicación. Debe tener al menos 8 caracteres.',
-    'auth_change_password_success' => '¡La contraseña ha sido actualizada!',
+    'auth_change_password_success' => '¡Se actualizó la contraseña!',
 
     'profile' => 'Detalles del perfil',
-    'profile_desc' => 'Administre los detalles de su cuenta que le representa a otros usuarios, además de los detalles que se utilizan para la comunicación y la personalización del sistema.',
-    'profile_view_public' => 'Ver perfil público',
+    'profile_desc' => 'Administre los detalles de su cuenta que lo representan ante otros usuarios, además de los detalles que se utilizan para la comunicación y la personalización del sistema.',
+    'profile_view_public' => 'Ver Perfil Público',
     'profile_name_desc' => 'Configure el nombre que será visible para otros usuarios del sistema a través de la actividad que realiza, y el contenido que posee.',
-    'profile_email_desc' => 'Este correo electrónico se utilizará para las notificaciones y, dependiendo de la autenticación activa del sistema, el acceso del sistema.',
+    'profile_email_desc' => 'Este correo electrónico se utilizará para las notificaciones y, dependiendo de la autenticación activa del sistema, para el acceso al sistema.',
     'profile_email_no_permission' => 'Lamentablemente no tiene permiso para cambiar su dirección de correo electrónico. Si desea cambiar esto, necesitará pedir a un administrador que lo cambie por usted.',
-    'profile_avatar_desc' => 'Seleccione una imagen pública que verán los demás en el sistema. Idealmente esta imagen debe ser cuadrada y alrededor de 256px de anchura y altura.',
-    'profile_admin_options' => 'Opciones de administrador',
-    'profile_admin_options_desc' => 'Opciones adicionales de administrador, como por ejemplo administrar asignaciones de rol, se pueden encontrar para su cuenta de usuario en el área de "Ajustes > Usuarios" de la aplicación.',
+    'profile_avatar_desc' => 'Seleccione una imagen que se utilizará para representarlo ante los demás en el sistema. Idealmente esta imagen debe ser cuadrada y alrededor de 256px de ancho y alto.',
+    'profile_admin_options' => 'Opciones de Administrador',
+    'profile_admin_options_desc' => 'Opciones adicionales de nivel de administrador, como aquellas para administrar asignaciones de rol, se pueden encontrar para su cuenta de usuario en el área de "Ajustes > Usuarios" de la aplicación.',
 
-    'delete_account' => 'Eliminar cuenta',
-    'delete_my_account' => 'Eliminar mi cuenta',
+    'delete_account' => 'Eliminar Cuenta',
+    'delete_my_account' => 'Eliminar Mi Cuenta',
     'delete_my_account_desc' => 'Esto eliminará completamente su cuenta de usuario del sistema. No podrá recuperar esta cuenta o revertir esta acción. El contenido que ha creado, como páginas creadas e imágenes subidas, permanecerá.',
     'delete_my_account_warning' => '¿Está seguro de que desea eliminar su cuenta?',
 ];
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 30eb095d997..5d99f05f7d2 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -75,10 +75,10 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ninguna restricción establecida',
 
     // Sorting Settings
-    'sorting' => 'Ordenación',
-    'sorting_book_default' => 'Orden por defecto del libro',
+    'sorting' => 'Ordenando',
+    'sorting_book_default' => 'Orden predeterminado del libro',
     'sorting_book_default_desc' => 'Seleccione la regla de ordenación predeterminada para aplicar a nuevos libros. Esto no afectará a los libros existentes, y puede ser anulado por libro.',
-    'sorting_rules' => 'Reglas de ordenación',
+    'sorting_rules' => 'Reglas de Ordenación',
     'sorting_rules_desc' => 'Son operaciones de ordenación predefinidas que se pueden aplicar al contenido en el sistema.',
     'sort_rule_assigned_to_x_books' => 'Asignado a :count libro | Asignado a :count libros',
     'sort_rule_create' => 'Crear regla de ordenación',
@@ -86,13 +86,13 @@
     'sort_rule_delete' => 'Eliminar regla de ordenación',
     'sort_rule_delete_desc' => 'Eliminar esta regla de ordenación del sistema. Los Libros que utilicen este tipo se revertirán a la ordenación manual.',
     'sort_rule_delete_warn_books' => 'Esta regla de ordenación se utiliza actualmente en :count libro(s). ¿Está seguro que desea eliminarla?',
-    'sort_rule_delete_warn_default' => 'Esta regla de ordenación se utiliza actualmente como predeterminado para los libros. ¿Está seguro de que desea eliminarla?',
+    'sort_rule_delete_warn_default' => 'Esta regla de ordenación se utiliza actualmente como predeterminada para los libros. ¿Está seguro de que desea eliminarla?',
     'sort_rule_details' => 'Detalles de la regla de ordenación',
     'sort_rule_details_desc' => 'Establezca un nombre para esta regla de ordenación, que aparecerá en las listas cuando los usuarios estén seleccionando un orden.',
     'sort_rule_operations' => 'Operaciones de ordenación',
     'sort_rule_operations_desc' => 'Configure las acciones de ordenación a realizar moviéndolas de la lista de operaciones disponibles. Al usarse, las operaciones se aplicarán en orden, de arriba a abajo. Cualquier cambio realizado aquí se aplicará a todos los libros asignados al guardar.',
     'sort_rule_available_operations' => 'Operaciones disponibles',
-    'sort_rule_available_operations_empty' => 'No hay operaciones restantes',
+    'sort_rule_available_operations_empty' => 'No hay operaciones pendientes',
     'sort_rule_configured_operations' => 'Operaciones configuradas',
     'sort_rule_configured_operations_empty' => 'Arrastrar/añadir operaciones desde la lista de "Operaciones disponibles"',
     'sort_rule_op_asc' => '(Asc)',
@@ -225,7 +225,7 @@
     'users_send_invite_text' => 'Puede optar por enviar a este usuario un correo electrónico de invitación que les permita establecer su propia contraseña; de lo contrario, puede establecerla contraseña usted mismo.',
     'users_send_invite_option' => 'Enviar correo electrónico de invitación al usuario.',
     'users_external_auth_id' => 'ID externo de autenticación',
-    'users_external_auth_id_desc' => 'Cuando un sistema de autenticación externa está en uso (como SAML2, OIDC o LDAP) este es el ID que vincula este usuario de BookStack a la cuenta del sistema de autenticación. Puede ignorar este campo si utiliza la autenticación por defecto basada en correo electrónico.',
+    'users_external_auth_id_desc' => 'Cuando se usa un sistema de autenticación externa (como SAML2, OIDC o LDAP) este es el ID que vincula este usuario de BookStack a la cuenta del sistema de autenticación. Puede ignorar este campo si utiliza la autenticación por defecto basada en correo electrónico.',
     'users_password_warning' => 'Solo complete lo siguiente si desea cambiar la contraseña para este usuario.',
     'users_system_public' => 'Este usuario representa cualquier usuario invitado que visita la aplicación. No puede utilizarse para hacer login sino que es asignado automáticamente.',
     'users_delete' => 'Borrar usuario',
@@ -312,10 +312,10 @@
     'licenses' => 'Licencias',
     'licenses_desc' => 'Esta página detalla información sobre la licencia de BookStack además de los proyectos y bibliotecas que se utilizan en BookStack. Muchos proyectos enumerados aquí pueden ser utilizados solo en un contexto de desarrollo.',
     'licenses_bookstack' => 'Licencia BookStack',
-    'licenses_php' => 'Licencias de la biblioteca PHP',
-    'licenses_js' => 'Licencias de la biblioteca JavaScript',
+    'licenses_php' => 'Licencias de Bibliotecas PHP',
+    'licenses_js' => 'Licencias de Bibliotecas JavaScript',
     'licenses_other' => 'Otras Licencias',
-    'license_details' => 'Datos de la licencia',
+    'license_details' => 'Detalles de la licencia',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/et/common.php b/lang/et/common.php
index 3eb6b50b96e..580cdf133c4 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -30,6 +30,8 @@
     'create' => 'Lisa',
     'update' => 'Uuenda',
     'edit' => 'Muuda',
+    'archive' => 'Arhiveeri',
+    'unarchive' => 'Taasta arhiivist',
     'sort' => 'Sorteeri',
     'move' => 'Liiguta',
     'copy' => 'Kopeeri',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 87b625ed7ab..dc263081b33 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiilne sisu)',
     'pages_edit_switch_to_wysiwyg' => 'Kasuta WYSIWYG redaktorit',
     'pages_edit_switch_to_new_wysiwyg' => 'Kasuta uut tekstiredaktorit',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(alfatestimisel)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Muudatuste logi',
     'pages_edit_enter_changelog_desc' => 'Sisesta tehtud muudatuste lühikirjeldus',
     'pages_edit_enter_changelog' => 'Salvesta muudatuste logi',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentaar',
     'comments' => 'Kommentaarid',
     'comment_add' => 'Lisa kommentaar',
+    'comment_none' => 'Pole kommentaare, mida kuvada',
     'comment_placeholder' => 'Jäta siia kommentaar',
-    'comment_count' => '{0} Kommentaare pole|{1} 1 kommentaar|[2,*] :count kommentaari',
+    'comment_thread_count' => ':count kommentaarilõim|:count kommentaarilõime',
+    'comment_archived_count' => ':count arhiveeritud',
+    'comment_archived_threads' => 'Arhiveeritud lõimed',
     'comment_save' => 'Salvesta kommentaar',
     'comment_new' => 'Uus kommentaar',
     'comment_created' => 'kommenteeris :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentaar kustutatud',
     'comment_created_success' => 'Kommentaar lisatud',
     'comment_updated_success' => 'Kommentaar muudetud',
+    'comment_archive_success' => 'Kommentaar arhiveeritud',
+    'comment_unarchive_success' => 'Kommentaar arhiivist taastatud',
+    'comment_view' => 'Vaata kommentaari',
+    'comment_jump_to_thread' => 'Hüppa lõime juurde',
     'comment_delete_confirm' => 'Kas oled kindel, et soovid selle kommentaari kustutada?',
     'comment_in_reply_to' => 'Vastus kommentaarile :commentId',
+    'comment_reference' => 'Viide',
+    'comment_reference_outdated' => '(Aegunud)',
     'comment_editor_explain' => 'Siin on lehele jäetud kommentaarid. Kommentaare saab lisada ja hallata salvestatud lehte vaadates.',
 
     // Revision
diff --git a/lang/eu/common.php b/lang/eu/common.php
index 35a67b349ab..f3696825e57 100644
--- a/lang/eu/common.php
+++ b/lang/eu/common.php
@@ -30,6 +30,8 @@
     'create' => 'Sortu',
     'update' => 'Eguneratu',
     'edit' => 'Editatu',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordenatu',
     'move' => 'Mugitu',
     'copy' => 'Kopiatu',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index e13284216ca..f42ce1d027a 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Iruzkina',
     'comments' => 'Iruzkinak',
     'comment_add' => 'Iruzkina gehitu',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Utzi iruzkin bat hemen',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Iruzkina gorde',
     'comment_new' => 'Iruzkin berria',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Iruzkina gehituta',
     'comment_updated_success' => 'Iruzkina gehituta',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ziur zaude iruzkin hau ezabatu nahi duzula?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 765c1e6271d..9672ce2c1ae 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -30,6 +30,8 @@
     'create' => 'ایجاد',
     'update' => 'به‌روز رسانی',
     'edit' => 'ويرايش',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'مرتب سازی',
     'move' => 'جابجایی',
     'copy' => 'کپی',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index d994ed2488f..c9924a478e2 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(محتوای پایدار)',
     'pages_edit_switch_to_wysiwyg' => 'به ویرایشگر WYSIWYG بروید',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'تنظیم تغییرات',
     'pages_edit_enter_changelog_desc' => 'توضیح مختصری از تغییراتی که ایجاد کرده اید وارد کنید',
     'pages_edit_enter_changelog' => 'وارد کردن تغییرات',
@@ -392,8 +392,11 @@
     'comment' => 'اظهار نظر',
     'comments' => 'نظرات',
     'comment_add' => 'افزودن توضیح',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'اینجا نظر بدهید',
-    'comment_count' => '{0} بدون نظر|{1} 1 نظر|[2,*] :count نظرات',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'ذخیره نظر',
     'comment_new' => 'نظر جدید',
     'comment_created' => ':createDiff نظر داد',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'نظر حذف شد',
     'comment_created_success' => 'نظر اضافه شد',
     'comment_updated_success' => 'نظر به روز شد',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'آیا مطمئن هستید که می خواهید این نظر را حذف کنید؟',
     'comment_in_reply_to' => 'در پاسخ به :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'در اینجا نظراتی که در این صفحه گذاشته شده است، مشاهده می‌شود. نظرات را می‌توان در هنگام مشاهده صفحه ذخیره شده، اضافه و مدیریت کرد.',
 
     // Revision
diff --git a/lang/fi/common.php b/lang/fi/common.php
index d6efe8e0347..e05f40f44e6 100644
--- a/lang/fi/common.php
+++ b/lang/fi/common.php
@@ -30,6 +30,8 @@
     'create' => 'Luo',
     'update' => 'Päivitä',
     'edit' => 'Muokkaa',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Järjestä',
     'move' => 'Siirrä',
     'copy' => 'Kopioi',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index 4865485ea9c..3183abe5d58 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Vakaa sisältö)',
     'pages_edit_switch_to_wysiwyg' => 'Vaihda WYSIWYG-editoriin',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Aseta muutosloki',
     'pages_edit_enter_changelog_desc' => 'Kirjoita lyhyt kuvaus tekemistäsi muutoksista',
     'pages_edit_enter_changelog' => 'Syötä muutosloki',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentti',
     'comments' => 'Kommentit',
     'comment_add' => 'Lisää kommentti',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Jätä kommentti tähän',
-    'comment_count' => '{0} Ei kommentteja|{1} 1 kommentti|[2,*] :count kommenttia',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Tallenna kommentti',
     'comment_new' => 'Uusi kommentti',
     'comment_created' => 'kommentoi :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentti poistettu',
     'comment_created_success' => 'Kommentti lisätty',
     'comment_updated_success' => 'Kommentti päivitetty',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Haluatko varmasti poistaa tämän kommentin?',
     'comment_in_reply_to' => 'Vastaus kommenttiin :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Tässä ovat sivulle jätetyt komentit. Kommentteja voi lisätä ja hallita, kun tarkastelet tallennettua sivua.',
 
     // Revision
diff --git a/lang/fr/common.php b/lang/fr/common.php
index 0abff99542a..8f8a31135e0 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -30,6 +30,8 @@
     'create' => 'Créer',
     'update' => 'Modifier',
     'edit' => 'Éditer',
+    'archive' => 'Archiver',
+    'unarchive' => 'Désarchiver',
     'sort' => 'Trier',
     'move' => 'Déplacer',
     'copy' => 'Copier',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 9992f7d7865..0202f98a754 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenu stable)',
     'pages_edit_switch_to_wysiwyg' => 'Basculer vers l\'éditeur WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Basculer vers le nouveau WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(En test Alpha)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Remplir le journal des changements',
     'pages_edit_enter_changelog_desc' => 'Entrez une brève description des changements effectués',
     'pages_edit_enter_changelog' => 'Ouvrir le journal des changements',
@@ -392,8 +392,11 @@
     'comment' => 'Commentaire',
     'comments' => 'Commentaires',
     'comment_add' => 'Ajouter un commentaire',
+    'comment_none' => 'Aucun commentaire à afficher',
     'comment_placeholder' => 'Entrez vos commentaires ici',
-    'comment_count' => '{0} Pas de commentaires|{1} Un commentaire|[2,*] :count commentaires',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archivé',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Enregistrer le commentaire',
     'comment_new' => 'Nouveau commentaire',
     'comment_created' => 'commenté :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Commentaire supprimé',
     'comment_created_success' => 'Commentaire ajouté',
     'comment_updated_success' => 'Commentaire mis à jour',
+    'comment_archive_success' => 'Commentaire archivé',
+    'comment_unarchive_success' => 'Commentaire désarchiver',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Êtes-vous sûr de vouloir supprimer ce commentaire ?',
     'comment_in_reply_to' => 'En réponse à :commentId',
+    'comment_reference' => 'Référence',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Voici les commentaires qui ont été laissés sur cette page. Les commentaires peuvent être ajoutés et gérés en visualisant la page enregistrée.',
 
     // Revision
diff --git a/lang/he/common.php b/lang/he/common.php
index 4e4483ccf01..2e387f67d78 100644
--- a/lang/he/common.php
+++ b/lang/he/common.php
@@ -30,6 +30,8 @@
     'create' => 'צור',
     'update' => 'עדכן',
     'edit' => 'ערוך',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'מיין',
     'move' => 'הזז',
     'copy' => 'העתק',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 60b6011cd1a..ce1d4fa801e 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'הגדר יומן שינויים',
     'pages_edit_enter_changelog_desc' => 'ציין תיאור קצר אודות השינויים שביצעת',
     'pages_edit_enter_changelog' => 'הכנס יומן שינויים',
@@ -392,8 +392,11 @@
     'comment' => 'תגובה',
     'comments' => 'תגובות',
     'comment_add' => 'הוסף תגובה',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'השאר תגובה כאן',
-    'comment_count' => '{0} אין תגובות|{1} 1 תגובה|[2,*] :count תגובות',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'שמור תגובה',
     'comment_new' => 'תגובה חדשה',
     'comment_created' => 'הוגב :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'התגובה נמחקה',
     'comment_created_success' => 'התגובה נוספה',
     'comment_updated_success' => 'התגובה עודכנה',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'האם ברצונך למחוק תגובה זו?',
     'comment_in_reply_to' => 'בתגובה ל :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/hr/common.php b/lang/hr/common.php
index 3c9ed610bc6..7cd779593bf 100644
--- a/lang/hr/common.php
+++ b/lang/hr/common.php
@@ -30,6 +30,8 @@
     'create' => 'Stvori',
     'update' => 'Ažuriraj',
     'edit' => 'Uredi',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Razvrstaj',
     'move' => 'Makni',
     'copy' => 'Kopiraj',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 2dac21da2ae..62918c367ed 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilan Sadržaj)',
     'pages_edit_switch_to_wysiwyg' => 'Prebaci se na WYSIWYG uređivač',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Postavi dnevnik promjena',
     'pages_edit_enter_changelog_desc' => 'Ukratko opišite promjene koje ste napravili',
     'pages_edit_enter_changelog' => 'Unesi dnevnik promjena',
@@ -392,8 +392,11 @@
     'comment' => 'Komentar',
     'comments' => 'Komentari',
     'comment_add' => 'Dodaj komentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Komentar ostavi ovdje',
-    'comment_count' => '{0} Nema komentara|{1} 1 Komentar|[2,*] :count Komentara',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Spremi komentar',
     'comment_new' => 'Novi komentar',
     'comment_created' => 'komentirano :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Izbrisani komentar',
     'comment_created_success' => 'Dodani komentar',
     'comment_updated_success' => 'Ažurirani komentar',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Jeste li sigurni da želite izbrisati ovaj komentar?',
     'comment_in_reply_to' => 'Odgovor na :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Evo komentara koji su ostavljeni na ovoj stranici. Komentari se mogu dodavati i upravljati prilikom pregleda spremljene stranice.',
 
     // Revision
diff --git a/lang/hu/common.php b/lang/hu/common.php
index 29a87e19edf..e65e6890921 100644
--- a/lang/hu/common.php
+++ b/lang/hu/common.php
@@ -30,6 +30,8 @@
     'create' => 'Létrehozás',
     'update' => 'Frissítés',
     'edit' => 'Szerkesztés',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Rendezés',
     'move' => 'Áthelyezés',
     'copy' => 'Másolás',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index d073d2b74dc..8686908f069 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabil tartalom)',
     'pages_edit_switch_to_wysiwyg' => 'Váltás a WYSIWYG szerkesztőre',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Változásnapló beállítása',
     'pages_edit_enter_changelog_desc' => 'A végrehajtott módosítások rövid leírása',
     'pages_edit_enter_changelog' => 'Változásnapló megadása',
@@ -392,8 +392,11 @@
     'comment' => 'Megjegyzés',
     'comments' => 'Megjegyzések',
     'comment_add' => 'Megjegyzés hozzáadása',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Megjegyzés írása',
-    'comment_count' => '{0} Nincs megjegyzés|{1} 1 megjegyzés|[2,*] :count megjegyzés',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Megjegyzés mentése',
     'comment_new' => 'Új megjegyzés',
     'comment_created' => 'megjegyzést fűzött hozzá :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Megjegyzés törölve',
     'comment_created_success' => 'Megjegyzés hozzáadva',
     'comment_updated_success' => 'Megjegyzés frissítve',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Biztosan törölhető ez a megjegyzés?',
     'comment_in_reply_to' => 'Válasz erre: :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Itt vannak az ezen az oldalon lévő megjegyzések. Megjegyzések hozzáadhatók és kezelhetők a mentett oldal megtekintésekor.',
 
     // Revision
diff --git a/lang/id/common.php b/lang/id/common.php
index 06e9421c87b..f6520420f73 100644
--- a/lang/id/common.php
+++ b/lang/id/common.php
@@ -30,6 +30,8 @@
     'create' => 'Buat',
     'update' => 'Perbarui',
     'edit' => 'Sunting',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortir',
     'move' => 'Pindahkan',
     'copy' => 'Salin',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 63b6fe358ed..7fd76f44912 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Atur Changelog',
     'pages_edit_enter_changelog_desc' => 'Masukkan deskripsi singkat tentang perubahan yang Anda buat',
     'pages_edit_enter_changelog' => 'Masuk ke Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Komentar',
     'comments' => 'Komentar',
     'comment_add' => 'Tambah Komentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Tinggalkan komentar disini',
-    'comment_count' => '{0} Tidak ada komentar |{1} 1 Komentar |[2,*] :count Komentar',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Simpan Komentar',
     'comment_new' => 'Komentar Baru',
     'comment_created' => 'dikomentari oleh :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentar telah dihapus',
     'comment_created_success' => 'Komentar telah di tambahkan',
     'comment_updated_success' => 'Komentar Telah diperbaharui',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Anda yakin ingin menghapus komentar ini?',
     'comment_in_reply_to' => 'Sebagai balasan untuk :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/is/common.php b/lang/is/common.php
index 721d844ed1d..84651be1736 100644
--- a/lang/is/common.php
+++ b/lang/is/common.php
@@ -30,6 +30,8 @@
     'create' => 'Búa til',
     'update' => 'Uppfæra',
     'edit' => 'Breyta',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Flokka',
     'move' => 'Færa',
     'copy' => 'Afrita',
diff --git a/lang/is/entities.php b/lang/is/entities.php
index 1e5b0d9bc30..931f53ac646 100644
--- a/lang/is/entities.php
+++ b/lang/is/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Skipta yfir í WYSIWYG ritil',
     'pages_edit_switch_to_new_wysiwyg' => 'Skipta yfir í nýja WYSIWYG ritilinn',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Í alfa prófun)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Stilla breytingarskrá',
     'pages_edit_enter_changelog_desc' => 'Skrifaðu stutta lýsingu á breytingunum sem þú gerðir',
     'pages_edit_enter_changelog' => 'Færa í breytingaskrá',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/it/common.php b/lang/it/common.php
index d45f93c5e42..fbbac2be7bb 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -30,6 +30,8 @@
     'create' => 'Crea',
     'update' => 'Aggiorna',
     'edit' => 'Modifica',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordina',
     'move' => 'Sposta',
     'copy' => 'Copia',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 2762f1933ce..b032997d698 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenuto stabile)',
     'pages_edit_switch_to_wysiwyg' => 'Passa all\'editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Passa al nuovo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In test alpha)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Imposta changelog',
     'pages_edit_enter_changelog_desc' => 'Inserisci una breve descrizione dei cambiamenti che hai apportato',
     'pages_edit_enter_changelog' => 'Inserisci changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Commento',
     'comments' => 'Commenti',
     'comment_add' => 'Aggiungi commento',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Scrivi un commento',
-    'comment_count' => '{0} Nessun commento|{1} 1 commento|[2,*] :count commenti',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Salva commento',
     'comment_new' => 'Nuovo commento',
     'comment_created' => 'ha commentato :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Commento eliminato',
     'comment_created_success' => 'Commento aggiunto',
     'comment_updated_success' => 'Commento aggiornato',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Sei sicuro di voler eliminare questo commento?',
     'comment_in_reply_to' => 'In risposta a :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Ecco i commenti che sono stati lasciati in questa pagina. I commenti possono essere aggiunti e gestiti quando si visualizza la pagina salvata.',
 
     // Revision
diff --git a/lang/ja/common.php b/lang/ja/common.php
index 4f15bafbb9d..73799db5bb2 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -30,6 +30,8 @@
     'create' => '作成',
     'update' => '更新',
     'edit' => '編集',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => '並び順',
     'move' => '移動',
     'copy' => 'コピー',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index afd7765782e..c6449bb341a 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(安定したコンテンツ)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYGエディタに切り替え',
     'pages_edit_switch_to_new_wysiwyg' => '新しいWYSIWYGエディタに切り替える',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(アルファテスト版)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => '編集内容についての説明',
     'pages_edit_enter_changelog_desc' => 'どのような変更を行ったのかを記録してください',
     'pages_edit_enter_changelog' => '編集内容を入力',
@@ -393,8 +393,11 @@
     'comment' => 'コメント',
     'comments' => 'コメント',
     'comment_add' => 'コメント追加',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'コメントを記入してください',
-    'comment_count' => '{0} コメントはありません|[1,*] :count 件のコメント',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'コメントを保存',
     'comment_new' => '新規コメント作成',
     'comment_created' => 'コメントを作成しました :createDiff',
@@ -403,8 +406,14 @@
     'comment_deleted_success' => 'コメントを削除しました',
     'comment_created_success' => 'コメントを追加しました',
     'comment_updated_success' => 'コメントを更新しました',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '本当にこのコメントを削除しますか?',
     'comment_in_reply_to' => ':commentIdへ返信',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'ここにはページに付けられたコメントを表示します。 コメントの追加と管理は保存されたページの表示時に行うことができます。',
 
     // Revision
diff --git a/lang/ka/common.php b/lang/ka/common.php
index b05169bb2c4..06a9e855ce3 100644
--- a/lang/ka/common.php
+++ b/lang/ka/common.php
@@ -30,6 +30,8 @@
     'create' => 'Create',
     'update' => 'Update',
     'edit' => 'Edit',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sort',
     'move' => 'Move',
     'copy' => 'Copy',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index a74785eaacd..561022ad6b6 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/ko/common.php b/lang/ko/common.php
index 00caf4f5498..ff35f097179 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -30,6 +30,8 @@
     'create' => '만들기',
     'update' => '바꾸기',
     'edit' => '수정',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => '정렬',
     'move' => '이동',
     'copy' => '복사',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index c13f493710b..3de3c12b9a4 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG 편집기로 전환',
     'pages_edit_switch_to_new_wysiwyg' => '새 위지윅 편집기로 변경',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '알파 테스트 중',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => '수정본 설명',
     'pages_edit_enter_changelog_desc' => '수정본 설명',
     'pages_edit_enter_changelog' => '변경 로그 입력란',
@@ -392,8 +392,11 @@
     'comment' => '댓글',
     'comments' => '댓글',
     'comment_add' => '댓글 쓰기',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => '이곳에 댓글을 쓰세요...',
-    'comment_count' => '{0} 댓글 없음|{1} 댓글 1개|[2,*] 댓글 :count개',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => '등록',
     'comment_new' => '새로운 댓글',
     'comment_created' => '댓글 등록함 :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => '댓글 지움',
     'comment_created_success' => '댓글 등록함',
     'comment_updated_success' => '댓글 수정함',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '이 댓글을 지울 건가요?',
     'comment_in_reply_to' => ':commentId(을)를 향한 답글',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => '이 페이지에 남겨진 댓글은 다음과 같습니다. 저장된 페이지를 볼 때 댓글을 추가하고 관리할 수 있습니다.',
 
     // Revision
diff --git a/lang/ku/common.php b/lang/ku/common.php
index d1481e0ecc3..8d799d028bc 100644
--- a/lang/ku/common.php
+++ b/lang/ku/common.php
@@ -30,6 +30,8 @@
     'create' => 'دروستکردن',
     'update' => 'نوێکردنەوە',
     'edit' => 'دەسکاریکردن',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'ڕیزکردن',
     'move' => 'جوڵاندن',
     'copy' => 'لەبەرگرتنەوە',
diff --git a/lang/ku/entities.php b/lang/ku/entities.php
index a74785eaacd..561022ad6b6 100644
--- a/lang/ku/entities.php
+++ b/lang/ku/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/lt/common.php b/lang/lt/common.php
index e375c835ceb..bbafc347c59 100644
--- a/lang/lt/common.php
+++ b/lang/lt/common.php
@@ -30,6 +30,8 @@
     'create' => 'Sukurti',
     'update' => 'Atnaujinti',
     'edit' => 'Redaguoti',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Rūšiuoti',
     'move' => 'Perkelti',
     'copy' => 'Kopijuoti',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 1687195c5f0..6f73e7cb858 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Nustatyti keitimo žurnalą',
     'pages_edit_enter_changelog_desc' => 'Įveskite trumpus, jūsų atliktus, pokyčių aprašymus',
     'pages_edit_enter_changelog' => 'Įeiti į keitimo žurnalą',
@@ -392,8 +392,11 @@
     'comment' => 'Komentaras',
     'comments' => 'Komentarai',
     'comment_add' => 'Pridėti komentarą',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Palikite komentarą čia',
-    'comment_count' => '{0} Nėra komentarų|{1} 1 komentaras|[2,*] :count komentarai',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Išsaugoti komentarą',
     'comment_new' => 'Naujas komentaras',
     'comment_created' => 'Pakomentuota :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentaras ištrintas',
     'comment_created_success' => 'Komentaras pridėtas',
     'comment_updated_success' => 'Komentaras atnaujintas',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Esate tikri, kad norite ištrinti šį komentarą?',
     'comment_in_reply_to' => 'Atsakydamas į :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/lv/common.php b/lang/lv/common.php
index 05c4629773c..4917ad3d717 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -30,6 +30,8 @@
     'create' => 'Izveidot',
     'update' => 'Atjaunināt',
     'edit' => 'Rediģēt',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Kārtot',
     'move' => 'Pārvietot',
     'copy' => 'Kopēt',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 1c6e6def4b9..6958e82480e 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilais saturs)',
     'pages_edit_switch_to_wysiwyg' => 'Pārslēgties uz WYSIWYG redaktoru',
     'pages_edit_switch_to_new_wysiwyg' => 'Pārslēgties uz jauno WYSIWYG redaktoru',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa testēšanā)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Pievienot izmaiņu aprakstu',
     'pages_edit_enter_changelog_desc' => 'Ievadi nelielu aprakstu par vaiktajām izmaiņām',
     'pages_edit_enter_changelog' => 'Izmaiņu apraksts',
@@ -392,8 +392,11 @@
     'comment' => 'Komentārs',
     'comments' => 'Komentāri',
     'comment_add' => 'Pievienot komentāru',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Pievieno komentāru',
-    'comment_count' => '{0} Nav komentāru |{1} 1 Komentārs|[2,*] :count Komentāri',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Saglabāt komentāru',
     'comment_new' => 'Jauns komentārs',
     'comment_created' => 'komentējis :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentārs ir dzēsts',
     'comment_created_success' => 'Komentārs ir pievienots',
     'comment_updated_success' => 'Komentārs ir atjaunināts',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Vai esat pārliecināts, ka vēlaties dzēst šo komentāru?',
     'comment_in_reply_to' => 'Atbildēt uz :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 1214e81c52b..38104ba0396 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -30,6 +30,8 @@
     'create' => 'Opprett',
     'update' => 'Oppdater',
     'edit' => 'Rediger',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortér',
     'move' => 'Flytt',
     'copy' => 'Kopier',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 85faf1e852d..8d0d5c6c481 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
     'pages_edit_switch_to_new_wysiwyg' => 'Bytt til ny WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(I Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi en kort beskrivelse av endringene dine',
     'pages_edit_enter_changelog' => 'Se endringslogg',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Skriv kommentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Skriv en kommentar her',
-    'comment_count' => '{0} Ingen kommentarer|{1} 1 kommentar|[2,*] :count kommentarer',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Publiser kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterte :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar fjernet',
     'comment_created_success' => 'Kommentar skrevet',
     'comment_updated_success' => 'Kommentar endret',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Er du sikker på at du vil fjerne kommentaren?',
     'comment_in_reply_to' => 'Som svar til :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Her er kommentarene som er på denne siden. Kommentarer kan legges til og administreres når du ser på den lagrede siden.',
 
     // Revision
diff --git a/lang/nl/common.php b/lang/nl/common.php
index ca713a24323..0feddcd5d7b 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -30,6 +30,8 @@
     'create' => 'Aanmaken',
     'update' => 'Bijwerken',
     'edit' => 'Bewerk',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sorteer',
     'move' => 'Verplaats',
     'copy' => 'Kopieer',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 198123018c0..28f0ef3b935 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiele Inhoud)',
     'pages_edit_switch_to_wysiwyg' => 'Schakel naar de WYSIWYG Bewerker',
     'pages_edit_switch_to_new_wysiwyg' => 'Schakel naar de nieuwe WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alfa-testfase)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Logboek instellen',
     'pages_edit_enter_changelog_desc' => 'Geef een korte omschrijving van de wijzigingen die je gemaakt hebt',
     'pages_edit_enter_changelog' => 'Voeg toe aan logboek',
@@ -392,8 +392,11 @@
     'comment' => 'Reactie',
     'comments' => 'Reacties',
     'comment_add' => 'Reactie toevoegen',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Laat hier een reactie achter',
-    'comment_count' => '{0} Geen reacties|{1} 1 Reactie|[2,*] :count Reacties',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Sla reactie op',
     'comment_new' => 'Nieuwe reactie',
     'comment_created' => 'reactie gegeven :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Reactie verwijderd',
     'comment_created_success' => 'Reactie toegevoegd',
     'comment_updated_success' => 'Reactie bijgewerkt',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Weet je zeker dat je deze reactie wilt verwijderen?',
     'comment_in_reply_to' => 'Als antwoord op :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Hier zijn de opmerkingen die zijn achtergelaten op deze pagina. Opmerkingen kunnen worden toegevoegd en beheerd wanneer u de opgeslagen pagina bekijkt.',
 
     // Revision
diff --git a/lang/nn/common.php b/lang/nn/common.php
index 3d623dbc492..4247563e0fb 100644
--- a/lang/nn/common.php
+++ b/lang/nn/common.php
@@ -30,6 +30,8 @@
     'create' => 'Opprett',
     'update' => 'Oppdater',
     'edit' => 'Rediger',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortér',
     'move' => 'Flytt',
     'copy' => 'Kopier',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 2689e1b0d33..b8b62ebe37a 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi ei kort skildring av endringane dine',
     'pages_edit_enter_changelog' => 'Sjå endringslogg',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Skriv kommentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Skriv en kommentar her',
-    'comment_count' => '{0} Ingen kommentarer|{1} 1 kommentar|[2,*] :count kommentarer',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Publiser kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterte :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar fjernet',
     'comment_created_success' => 'Kommentar skrevet',
     'comment_updated_success' => 'Kommentar endret',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Er du sikker på at du vil fjerne kommentaren?',
     'comment_in_reply_to' => 'Som svar til :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Her er kommentarene som er på denne siden. Kommentarer kan legges til og administreres når du ser på den lagrede siden.',
 
     // Revision
diff --git a/lang/pl/common.php b/lang/pl/common.php
index a690cdb041e..e21302928b6 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -30,6 +30,8 @@
     'create' => 'Utwórz',
     'update' => 'Zaktualizuj',
     'edit' => 'Edytuj',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortuj',
     'move' => 'Przenieś',
     'copy' => 'Skopiuj',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 87a74ca2103..cbe75e79d95 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Statyczna zawartość)',
     'pages_edit_switch_to_wysiwyg' => 'Przełącz na edytor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Przełącz na nowy WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alfa testy)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Ustaw dziennik zmian',
     'pages_edit_enter_changelog_desc' => 'Opisz zmiany, które zostały wprowadzone',
     'pages_edit_enter_changelog' => 'Wyświetl dziennik zmian',
@@ -392,8 +392,11 @@
     'comment' => 'Komentarz',
     'comments' => 'Komentarze',
     'comment_add' => 'Dodaj komentarz',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Napisz swój komentarz tutaj',
-    'comment_count' => '{0} Brak komentarzy |{1} 1 komentarz|[2,*] :count komentarzy',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Zapisz komentarz',
     'comment_new' => 'Nowy komentarz',
     'comment_created' => 'Skomentowano :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentarz usunięty',
     'comment_created_success' => 'Komentarz dodany',
     'comment_updated_success' => 'Komentarz zaktualizowany',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Czy na pewno chcesz usunąc ten komentarz?',
     'comment_in_reply_to' => 'W odpowiedzi na :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Oto komentarze pozostawione na tej stronie. Komentarze mogą być dodawane i zarządzane podczas przeglądania zapisanej strony.',
 
     // Revision
diff --git a/lang/pt/common.php b/lang/pt/common.php
index 3e005700245..43a0f331333 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -30,6 +30,8 @@
     'create' => 'Criar',
     'update' => 'Atualizar',
     'edit' => 'Editar',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index b9e52c1af0e..d25982e9543 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por si',
     'pages_edit_enter_changelog' => 'Inserir Alterações',
@@ -392,8 +392,11 @@
     'comment' => 'Comentário',
     'comments' => 'Comentários',
     'comment_add' => 'Adicionar Comentário',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Digite aqui os seus comentários',
-    'comment_count' => '{0} Nenhum comentário|{1} 1 Comentário|[2,*] :count Comentários',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Guardar comentário',
     'comment_new' => 'Comentário Novo',
     'comment_created' => 'comentado :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comentário removido',
     'comment_created_success' => 'Comentário adicionado',
     'comment_updated_success' => 'Comentário editado',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Tem a certeza de que deseja eliminar este comentário?',
     'comment_in_reply_to' => 'Em resposta à :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Aqui estão os comentários que foram deixados nesta página. Comentários podem ser adicionados e geridos ao visualizar a página guardada.',
 
     // Revision
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 4a07cfb5b2b..4529d1a4eef 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -35,6 +35,8 @@
     'create' => 'Criar',
     'update' => 'Atualizar',
     'edit' => 'Editar',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index ba536808e2c..6fc5d6775d8 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Mudar para o novo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Em teste alfa)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por você',
     'pages_edit_enter_changelog' => 'Insira Alterações',
@@ -392,8 +392,11 @@
     'comment' => 'Comentário',
     'comments' => 'Comentários',
     'comment_add' => 'Adicionar Comentário',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Digite seus comentários aqui',
-    'comment_count' => '{0} Nenhum comentário|{1} 1 Comentário|[2,*] :count Comentários',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Salvar comentário',
     'comment_new' => 'Novo Comentário',
     'comment_created' => 'comentado :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comentário removido',
     'comment_created_success' => 'Comentário adicionado',
     'comment_updated_success' => 'Comentário editado',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Você tem certeza de que deseja excluir este comentário?',
     'comment_in_reply_to' => 'Em resposta à :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Aqui estão os comentários que foram deixados nesta página. Comentários podem ser adicionados e gerenciados ao visualizar a página salva.',
 
     // Revision
diff --git a/lang/ro/common.php b/lang/ro/common.php
index 1de631183f6..fe4bfe8b9dd 100644
--- a/lang/ro/common.php
+++ b/lang/ro/common.php
@@ -30,6 +30,8 @@
     'create' => 'Crează',
     'update' => 'Actualzează',
     'edit' => 'Editează',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortează',
     'move' => 'Mută',
     'copy' => 'Copiază',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index ca13d90ffd2..293ec396a67 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Conținut stabil)',
     'pages_edit_switch_to_wysiwyg' => 'Comută la editorul WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Setare jurnal modificări',
     'pages_edit_enter_changelog_desc' => 'Adaugă o scurtă descriere a modificărilor făcute',
     'pages_edit_enter_changelog' => 'Intră în jurnalul de modificări',
@@ -392,8 +392,11 @@
     'comment' => 'Comentariu',
     'comments' => 'Comentarii',
     'comment_add' => 'Adaugă comentariu',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Lasă un comentariu aici',
-    'comment_count' => '{0} Niciun comentariu|{1} 1 Comentariu [2,*] :count Comentarii',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Salvează comentariul',
     'comment_new' => 'Comentariu nou',
     'comment_created' => 'comentat :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comentariu șters',
     'comment_created_success' => 'Comentariu adăugat',
     'comment_updated_success' => 'Comentariu actualizat',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ești sigur că vrei să ștergi acest comentariu?',
     'comment_in_reply_to' => 'Ca răspuns la :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/ru/common.php b/lang/ru/common.php
index de2da532d9a..fa9969c32af 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -30,6 +30,8 @@
     'create' => 'Создание',
     'update' => 'Обновление',
     'edit' => 'Редактировать',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Сортировать',
     'move' => 'Переместить',
     'copy' => 'Скопировать',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 2246be0435a..2d5e0f4e71f 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => 'Полное сохранение форматирования (HTML)',
     'pages_edit_switch_to_wysiwyg' => 'Переключиться в WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(В Альфа-тестировании)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Задать список изменений',
     'pages_edit_enter_changelog_desc' => 'Введите краткое описание внесенных изменений',
     'pages_edit_enter_changelog' => 'Введите список изменений',
@@ -392,8 +392,11 @@
     'comment' => 'Комментарий',
     'comments' => 'Комментарии',
     'comment_add' => 'Комментировать',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Оставить комментарий здесь',
-    'comment_count' => '{0} Нет комментариев|{1} 1 комментарий|[2,*] :count комментария',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Сохранить комментарий',
     'comment_new' => 'Новый комментарий',
     'comment_created' => 'прокомментировал :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Комментарий удален',
     'comment_created_success' => 'Комментарий добавлен',
     'comment_updated_success' => 'Комментарий обновлен',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Удалить этот комментарий?',
     'comment_in_reply_to' => 'В ответ на :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Вот комментарии, которые были оставлены на этой странице. Комментарии могут быть добавлены и управляться при просмотре сохраненной страницы.',
 
     // Revision
diff --git a/lang/sk/common.php b/lang/sk/common.php
index 12828d6c2e5..6f116006b12 100644
--- a/lang/sk/common.php
+++ b/lang/sk/common.php
@@ -30,6 +30,8 @@
     'create' => 'Vytvoriť',
     'update' => 'Aktualizovať',
     'edit' => 'Editovať',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Zoradiť',
     'move' => 'Presunúť',
     'copy' => 'Kopírovať',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 347434fd01b..996682e2a79 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilný obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Prepnite na WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Nastaviť záznam zmien',
     'pages_edit_enter_changelog_desc' => 'Zadajte krátky popis zmien, ktoré ste urobili',
     'pages_edit_enter_changelog' => 'Zadať záznam zmien',
@@ -392,8 +392,11 @@
     'comment' => 'Komentár',
     'comments' => 'Komentáre',
     'comment_add' => 'Pridať komentár',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Tu zadajte svoje pripomienky',
-    'comment_count' => '{0} Bez komentárov|{1} 1 komentár|[2,3,4] :count komentáre|[5,*] :count komentárov',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Uložiť komentár',
     'comment_new' => 'Nový komentár',
     'comment_created' => 'komentované :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentár odstránený',
     'comment_created_success' => 'Komentár pridaný',
     'comment_updated_success' => 'Komentár aktualizovaný',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ste si istý, že chcete odstrániť tento komentár?',
     'comment_in_reply_to' => 'Odpovedať na :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/sl/common.php b/lang/sl/common.php
index 29e2a0252cd..0309237a973 100644
--- a/lang/sl/common.php
+++ b/lang/sl/common.php
@@ -30,6 +30,8 @@
     'create' => 'Ustvari',
     'update' => 'Posodobi',
     'edit' => 'Uredi',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Razvrsti',
     'move' => 'Premakni',
     'copy' => 'Kopiraj',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index 9a7b73488db..0e4c0e1d641 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Opiši spremembe na dokumentu',
     'pages_edit_enter_changelog_desc' => 'Vnesite kratek opis sprememb, ki ste jih naredili',
     'pages_edit_enter_changelog' => 'Vpišite vsebino sprememb',
@@ -392,8 +392,11 @@
     'comment' => 'Komentar',
     'comments' => 'Komentarji',
     'comment_add' => 'Dodaj komentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Dodaj komentar',
-    'comment_count' => '{0} Ni komentarjev|{1} 1 Komentar|[2,*] :count Komentarji',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Shrani komentar',
     'comment_new' => 'Nov kometar',
     'comment_created' => 'komentirano :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Komentar je izbrisan',
     'comment_created_success' => 'Komentar dodan',
     'comment_updated_success' => 'Komentar posodobljen',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ste prepričani, da želite izbrisati ta komentar?',
     'comment_in_reply_to' => 'Odgovor na :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/sq/common.php b/lang/sq/common.php
index b05169bb2c4..06a9e855ce3 100644
--- a/lang/sq/common.php
+++ b/lang/sq/common.php
@@ -30,6 +30,8 @@
     'create' => 'Create',
     'update' => 'Update',
     'edit' => 'Edit',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sort',
     'move' => 'Move',
     'copy' => 'Copy',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index a74785eaacd..561022ad6b6 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/sr/common.php b/lang/sr/common.php
index 3eaf4fb50cf..e185c99f5bf 100644
--- a/lang/sr/common.php
+++ b/lang/sr/common.php
@@ -30,6 +30,8 @@
     'create' => 'Креирај',
     'update' => 'Ажурирање',
     'edit' => 'Уреди',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Разврстај',
     'move' => 'Премести',
     'copy' => 'Умножи',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 0aa531750ab..facf933ade6 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/sv/common.php b/lang/sv/common.php
index 9ca2122dbb8..23a98d9e36a 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -30,6 +30,8 @@
     'create' => 'Skapa',
     'update' => 'Uppdatera',
     'edit' => 'Redigera',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sortera',
     'move' => 'Flytta',
     'copy' => 'Kopiera',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index e13ff95add8..06dbecf7ea7 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilt innehåll)',
     'pages_edit_switch_to_wysiwyg' => 'Växla till WYSIWYG-redigerare',
     'pages_edit_switch_to_new_wysiwyg' => 'Växla till ny WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Under alfatestning)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Beskriv dina ändringar',
     'pages_edit_enter_changelog_desc' => 'Ange en kort beskrivning av de ändringar du har gjort',
     'pages_edit_enter_changelog' => 'Ändringslogg',
@@ -392,8 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Lägg till kommentar',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Lämna en kommentar här',
-    'comment_count' => '{0} Inga kommentarer|{1} 1 kommentar|[2,*] :count kommentarer',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Spara kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterade :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Kommentar borttagen',
     'comment_created_success' => 'Kommentaren har sparats',
     'comment_updated_success' => 'Kommentaren har uppdaterats',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Är du säker på att du vill ta bort den här kommentaren?',
     'comment_in_reply_to' => 'Som svar på :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Här är kommentarer som lämnats på denna sida. Kommentarer kan läggas till och hanteras när den sparade sidan visas.',
 
     // Revision
diff --git a/lang/tk/common.php b/lang/tk/common.php
index b05169bb2c4..06a9e855ce3 100644
--- a/lang/tk/common.php
+++ b/lang/tk/common.php
@@ -30,6 +30,8 @@
     'create' => 'Create',
     'update' => 'Update',
     'edit' => 'Edit',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sort',
     'move' => 'Move',
     'copy' => 'Copy',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index a74785eaacd..561022ad6b6 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Set Changelog',
     'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
     'pages_edit_enter_changelog' => 'Enter Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Comment',
     'comments' => 'Comments',
     'comment_add' => 'Add Comment',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Leave a comment here',
-    'comment_count' => '{0} No Comments|{1} 1 Comment|[2,*] :count Comments',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Save Comment',
     'comment_new' => 'New Comment',
     'comment_created' => 'commented :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Comment deleted',
     'comment_created_success' => 'Comment added',
     'comment_updated_success' => 'Comment updated',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
     'comment_in_reply_to' => 'In reply to :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/tr/common.php b/lang/tr/common.php
index 3e416d37bfc..5b5e753873a 100644
--- a/lang/tr/common.php
+++ b/lang/tr/common.php
@@ -30,6 +30,8 @@
     'create' => 'Oluştur',
     'update' => 'Güncelle',
     'edit' => 'Düzenle',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sırala',
     'move' => 'Taşı',
     'copy' => 'Kopyala',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index 4e98df9b3ee..02eda9823eb 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Kararlı İçerik)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG düzenleyiciye geç',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Değişim Günlüğünü Ayarla',
     'pages_edit_enter_changelog_desc' => 'Yaptığınız değişiklikler hakkında kısa bir açıklama girin',
     'pages_edit_enter_changelog' => 'Değişim Günlüğünü Yazın',
@@ -392,8 +392,11 @@
     'comment' => 'Yorum',
     'comments' => 'Yorumlar',
     'comment_add' => 'Yorum Ekle',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Buraya bir yorum yazın',
-    'comment_count' => '{0} Yorum Yapılmamış|{1} 1 Yorum|[2,*] :count Yorum',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Yorumu Gönder',
     'comment_new' => 'Yeni Yorum',
     'comment_created' => ':createDiff yorum yaptı',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Yorum silindi',
     'comment_created_success' => 'Yorum gönderildi',
     'comment_updated_success' => 'Yorum güncellendi',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Bu yorumu silmek istediğinize emin misiniz?',
     'comment_in_reply_to' => ':commentId yorumuna yanıt olarak',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'İşte bu sayfaya bırakılan yorumlar. Kaydedilen sayfayı görüntülerken yorumlar eklenebilir ve yönetilebilir.',
 
     // Revision
diff --git a/lang/uk/common.php b/lang/uk/common.php
index aed4880f124..8539a93cf2e 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -30,6 +30,8 @@
     'create' => 'Створити',
     'update' => 'Оновити',
     'edit' => 'Редагувати',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Сортувати',
     'move' => 'Перемістити',
     'copy' => 'Копіювати',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 577fd129633..ea74e882308 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Стабілізувати вміст)',
     'pages_edit_switch_to_wysiwyg' => 'Змінити редактор на WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Перейти на новий WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(В альфа-тестуванні)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Встановити журнал змін',
     'pages_edit_enter_changelog_desc' => 'Введіть короткий опис внесених вами змін',
     'pages_edit_enter_changelog' => 'Введіть список змін',
@@ -392,8 +392,11 @@
     'comment' => 'Коментар',
     'comments' => 'Коментарі',
     'comment_add' => 'Додати коментар',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Залиште коментар тут',
-    'comment_count' => '{0} Без коментарів|{1} 1 коментар|[2,*] :count коментарі(в)',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Зберегти коментар',
     'comment_new' => 'Новий коментар',
     'comment_created' => 'прокоментував :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Коментар видалено',
     'comment_created_success' => 'Коментар додано',
     'comment_updated_success' => 'Коментар оновлено',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Ви впевнені, що хочете видалити цей коментар?',
     'comment_in_reply_to' => 'У відповідь на :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Ось коментарі, які залишилися на цій сторінці. Коментарі можна додати та керовані при перегляді збереженої сторінки.',
 
     // Revision
diff --git a/lang/uz/common.php b/lang/uz/common.php
index fcbb2ea84a8..2c1788bee01 100644
--- a/lang/uz/common.php
+++ b/lang/uz/common.php
@@ -30,6 +30,8 @@
     'create' => 'Yaratish',
     'update' => 'Yangilash',
     'edit' => 'Tahrirlash',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Saralash',
     'move' => 'Ko‘chirish',
     'copy' => 'Nusxalash',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index 24f5a1acf63..7edd8449f8d 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Barqaror tarkib)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYG muharririga o\'ting',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'O\'zgarishlar jurnalini o\'rnating',
     'pages_edit_enter_changelog_desc' => 'Siz kiritgan o\'zgarishlarning qisqacha tavsifini kiriting',
     'pages_edit_enter_changelog' => 'O\'zgarishlar jurnaliga kiring',
@@ -392,8 +392,11 @@
     'comment' => 'Izoh',
     'comments' => 'Izohlar',
     'comment_add' => 'Fikr qo\'shish',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Bu yerda fikr qoldiring',
-    'comment_count' => '{0} Sharhlar yoʻq|{1} 1 ta fikr|[2,*] :sharhlar soni',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Fikrni saqlash',
     'comment_new' => 'Yangi izoh',
     'comment_created' => 'izoh berdi:createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Fikr o‘chirildi',
     'comment_created_success' => 'Fikr qo\'shildi',
     'comment_updated_success' => 'Fikr yangilandi',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Haqiqatan ham bu fikrni oʻchirib tashlamoqchimisiz?',
     'comment_in_reply_to' => ':commentId ga javoban',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Mana shu sahifada qolgan izohlar. Saqlangan sahifani ko\'rishda sharhlar qo\'shilishi va boshqarilishi mumkin.',
 
     // Revision
diff --git a/lang/vi/common.php b/lang/vi/common.php
index 16929a2fbae..ffde7183b12 100644
--- a/lang/vi/common.php
+++ b/lang/vi/common.php
@@ -30,6 +30,8 @@
     'create' => 'Tạo',
     'update' => 'Cập nhật',
     'edit' => 'Sửa',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => 'Sắp xếp',
     'move' => 'Di chuyển',
     'copy' => 'Sao chép',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 889af774937..1f349e65e71 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
     'pages_edit_switch_to_wysiwyg' => 'Chuyển sang trình soạn thảo WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Alpha Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => 'Đặt Changelog',
     'pages_edit_enter_changelog_desc' => 'Viết mô tả ngắn gọn cho các thay đổi mà bạn tạo',
     'pages_edit_enter_changelog' => 'Viết Changelog',
@@ -392,8 +392,11 @@
     'comment' => 'Bình luận',
     'comments' => 'Các bình luận',
     'comment_add' => 'Thêm bình luận',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Đăng bình luận tại đây',
-    'comment_count' => '{0} Không có bình luận|{1} 1 Bình luận|[2,*] :count Bình luận',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Lưu bình luận',
     'comment_new' => 'Bình luận mới',
     'comment_created' => 'đã bình luận :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => 'Bình luận đã bị xóa',
     'comment_created_success' => 'Đã thêm bình luận',
     'comment_updated_success' => 'Bình luận đã được cập nhật',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Bạn có chắc bạn muốn xóa bình luận này?',
     'comment_in_reply_to' => 'Trả lời cho :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
     // Revision
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index b1be3c73fa6..59a70f78e56 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -30,6 +30,8 @@
     'create' => '创建',
     'update' => '更新',
     'edit' => '编辑',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => '排序',
     'move' => '移动',
     'copy' => '复制',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index f7d22973ada..ac0f04351c3 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '（保留内容）',
     'pages_edit_switch_to_wysiwyg' => '切换到所见即所得编辑器',
     'pages_edit_switch_to_new_wysiwyg' => '切换到新的所见即所得',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(Alpha 测试)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => '更新说明',
     'pages_edit_enter_changelog_desc' => '输入对您所做更改的简要说明',
     'pages_edit_enter_changelog' => '输入更新说明',
@@ -392,8 +392,11 @@
     'comment' => '评论',
     'comments' => '评论',
     'comment_add' => '添加评论',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => '在这里评论',
-    'comment_count' => '{0} 无评论|{1} 1 条评论|[2,*] :count 条评论',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => '保存评论',
     'comment_new' => '新评论',
     'comment_created' => '评论于 :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => '评论已删除',
     'comment_created_success' => '评论已添加',
     'comment_updated_success' => '评论已更新',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '您确定要删除这条评论？',
     'comment_in_reply_to' => '回复 :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => '这里是此页面上留下的评论。查看已保存的页面时可以添加和管理评论。',
 
     // Revision
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index f8023bdd5ea..30388c3f4a0 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -30,6 +30,8 @@
     'create' => '建立',
     'update' => '更新',
     'edit' => '編輯',
+    'archive' => 'Archive',
+    'unarchive' => 'Un-Archive',
     'sort' => '排序',
     'move' => '移動',
     'copy' => '複製',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index d3a684f8fd2..fccf0ef592f 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(保留內容)',
     'pages_edit_switch_to_wysiwyg' => '切換到所見即所得編輯器',
     'pages_edit_switch_to_new_wysiwyg' => '切換為新的所見即所得編輯器',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '（仍在開發測試階段）',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
     'pages_edit_set_changelog' => '設定變更日誌',
     'pages_edit_enter_changelog_desc' => '輸入對您所做變動的簡易描述',
     'pages_edit_enter_changelog' => '輸入變更日誌',
@@ -392,8 +392,11 @@
     'comment' => '評論',
     'comments' => '評論',
     'comment_add' => '新增評論',
+    'comment_none' => 'No comments to display',
     'comment_placeholder' => '在這裡評論',
-    'comment_count' => '{0} 無評論 |{1} :count 則評論 |[2,*] :count 則評論',
+    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_archived_count' => ':count Archived',
+    'comment_archived_threads' => 'Archived Threads',
     'comment_save' => '儲存評論',
     'comment_new' => '新評論',
     'comment_created' => '評論於 :createDiff',
@@ -402,8 +405,14 @@
     'comment_deleted_success' => '評論已刪除',
     'comment_created_success' => '評論已加入',
     'comment_updated_success' => '評論已更新',
+    'comment_archive_success' => 'Comment archived',
+    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_view' => 'View comment',
+    'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '您確定要刪除這則評論？',
     'comment_in_reply_to' => '回覆 :commentId',
+    'comment_reference' => 'Reference',
+    'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => '此為頁面上的評論。在查看檢視與儲存頁面的同時，可以新增和管理評論。',
 
     // Revision

From 074f193e2fb2a3bf0d970c83de4ca2c4c99cfc9a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 31 May 2025 12:35:47 +0100
Subject: [PATCH 562/666] Updated translation attribution and licenses before
 release

---
 dev/licensing/js-library-licenses.txt | 44 ++++++---------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index 14c0c8f4977..d09010142b3 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -1751,13 +1751,6 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git://github.com/isaacs/node-lru-cache.git
 Link: git://github.com/isaacs/node-lru-cache.git
 -----------
-magic-string
-License: MIT
-License File: node_modules/magic-string/LICENSE
-Copyright: Copyright 2018 Rich Harris
-Source: https://github.com/rich-harris/magic-string
-Link: https://github.com/rich-harris/magic-string
------------
 make-dir
 License: MIT
 License File: node_modules/make-dir/license
@@ -1935,9 +1928,9 @@ Link: sindresorhus/npm-run-path
 nwsapi
 License: MIT
 License File: node_modules/nwsapi/LICENSE
-Copyright: Copyright (c) 2007-2024 Diego Perini (http://www.iport.it/)
+Copyright: Copyright (c) 2007-2025 Diego Perini (http://www.iport.it/)
 Source: git://github.com/dperini/nwsapi.git
-Link: http://javascript.nwbox.com/nwsapi/
+Link: https://javascript.nwbox.com/nwsapi/
 -----------
 object-inspect
 License: MIT
@@ -2281,18 +2274,6 @@ Copyright: Copyright (c) 2012 James Halliday
 Source: git://github.com/browserify/resolve.git
 Link: git://github.com/browserify/resolve.git
 -----------
-rollup-plugin-dts
-License: LGPL-3.0
-Source: git+https://github.com/Swatinem/rollup-plugin-dts.git
-Link: https://github.com/Swatinem/rollup-plugin-dts#readme
------------
-rollup
-License: MIT
-License File: node_modules/rollup/LICENSE.md
-Copyright: Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
-Source: rollup/rollup
-Link: https://rollupjs.org/
------------
 safe-array-concat
 License: MIT
 License File: node_modules/safe-array-concat/LICENSE
@@ -3057,6 +3038,7 @@ Link: https://github.com/babel/babel.git
 License: MIT
 License File: node_modules/@babel/helpers/LICENSE
 Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) 2014-present, Facebook, Inc. (ONLY ./src/helpers/regeneratorRuntime.js)
 Source: https://github.com/babel/babel.git
 Link: https://babel.dev/docs/en/next/babel-helpers
 -----------
@@ -3357,6 +3339,12 @@ License File: node_modules/@eslint/config-array/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
 Link: https://github.com/eslint/rewrite#readme
 -----------
+@eslint/config-helpers
+License: Apache-2.0
+License File: node_modules/@eslint/config-helpers/LICENSE
+Source: git+https://github.com/eslint/rewrite.git
+Link: https://github.com/eslint/rewrite/tree/main/packages/config-helpers#readme
+-----------
 @eslint/core
 License: Apache-2.0
 License File: node_modules/@eslint/core/LICENSE
@@ -3635,13 +3623,6 @@ Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and
 Source: https://github.com/lezer-parser/xml.git
 Link: https://github.com/lezer-parser/xml.git
 -----------
-@marijn/buildtool
-License: MIT
-License File: node_modules/@marijn/buildtool/LICENSE
-Copyright: Copyright (C) 2022 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/marijnh/buildtool.git
-Link: https://github.com/marijnh/buildtool.git
------------
 @marijn/find-cluster-break
 License: MIT
 License File: node_modules/@marijn/find-cluster-break/LICENSE
@@ -3832,13 +3813,6 @@ License: MIT
 Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 -----------
-@types/mocha
-License: MIT
-License File: node_modules/@types/mocha/LICENSE
-Copyright: Copyright (c) Microsoft Corporation.
-Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mocha
------------
 @types/node
 License: MIT
 License File: node_modules/@types/node/LICENSE

From aac547934cf9300ad449ea460e3074c4ddb633d8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Jun 2025 15:28:11 +0100
Subject: [PATCH 563/666] Deps: Bumped composer php package versions

---
 composer.lock | 194 +++++++++++++++++++++++---------------------------
 1 file changed, 90 insertions(+), 104 deletions(-)

diff --git a/composer.lock b/composer.lock
index c8e4d16b63d..b7369550aae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.22",
+            "version": "3.344.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3"
+                "reference": "eb0bc621472592545539329499961a15a3f9f6dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/174cc187df3bde52c21e9c00a4e99610a08732a3",
-                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb0bc621472592545539329499961a15a3f9f6dc",
+                "reference": "eb0bc621472592545539329499961a15a3f9f6dc",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.22"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.344.6"
             },
-            "time": "2025-05-30T18:11:02+00:00"
+            "time": "2025-06-12T18:03:59+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1740,16 +1740,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.45.0",
+            "version": "v11.45.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e"
+                "reference": "b09ba32795b8e71df10856a2694706663984a239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d0730deb427632004d24801be7ca1ed2c10fbc4e",
-                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b09ba32795b8e71df10856a2694706663984a239",
+                "reference": "b09ba32795b8e71df10856a2694706663984a239",
                 "shasum": ""
             },
             "require": {
@@ -1951,7 +1951,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-05-20T15:15:58+00:00"
+            "time": "2025-06-03T14:01:40+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.9.1",
+            "version": "3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d"
+                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d",
-                "reference": "ced71f79398ece168e24f7f7710462f462310d4d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
+                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
                 "shasum": ""
             },
             "require": {
@@ -3302,9 +3302,9 @@
                 "ext-json": "*",
                 "php": "^8.1",
                 "psr/clock": "^1.0",
-                "symfony/clock": "^6.3 || ^7.0",
+                "symfony/clock": "^6.3.12 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
@@ -3312,14 +3312,13 @@
             "require-dev": {
                 "doctrine/dbal": "^3.6.3 || ^4.0",
                 "doctrine/orm": "^2.15.2 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "friendsofphp/php-cs-fixer": "^3.75.0",
                 "kylekatarnls/multi-tester": "^2.5.3",
-                "ondrejmirtes/better-reflection": "^6.25.0.4",
                 "phpmd/phpmd": "^2.15.0",
-                "phpstan/extension-installer": "^1.3.1",
-                "phpstan/phpstan": "^1.11.2",
-                "phpunit/phpunit": "^10.5.20",
-                "squizlabs/php_codesniffer": "^3.9.0"
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.17",
+                "phpunit/phpunit": "^10.5.46",
+                "squizlabs/php_codesniffer": "^3.13.0"
             },
             "bin": [
                 "bin/carbon"
@@ -3387,7 +3386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-01T19:51:51+00:00"
+            "time": "2025-06-12T10:24:28+00:00"
         },
         {
             "name": "nette/schema",
@@ -3453,16 +3452,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.6",
+            "version": "v4.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309"
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309",
+                "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
                 "shasum": ""
             },
             "require": {
@@ -3533,9 +3532,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.6"
+                "source": "https://github.com/nette/utils/tree/v4.0.7"
             },
-            "time": "2025-03-30T21:06:30+00:00"
+            "time": "2025-06-03T04:55:08+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4775,20 +4774,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.6",
+            "version": "4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -4797,26 +4796,23 @@
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "captainhook/captainhook": "^5.10",
+                "captainhook/captainhook": "^5.25",
                 "captainhook/plugin-composer": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.8",
-                "ergebnis/composer-normalize": "^2.15",
-                "mockery/mockery": "^1.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "ergebnis/composer-normalize": "^2.47",
+                "mockery/mockery": "^1.6",
                 "paragonie/random-lib": "^2",
-                "php-mock/php-mock": "^2.2",
-                "php-mock/php-mock-mockery": "^1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpbench/phpbench": "^1.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9",
-                "ramsey/composer-repl": "^1.4",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.9"
+                "php-mock/php-mock": "^2.6",
+                "php-mock/php-mock-mockery": "^1.5",
+                "php-parallel-lint/php-parallel-lint": "^1.4.0",
+                "phpbench/phpbench": "^1.2.14",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "slevomat/coding-standard": "^8.18",
+                "squizlabs/php_codesniffer": "^3.13"
             },
             "suggest": {
                 "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@@ -4851,19 +4847,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
+                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-27T21:32:50+00:00"
+            "time": "2025-06-01T06:28:46+00:00"
         },
         {
             "name": "robrichards/xmlseclibs",
@@ -7906,16 +7892,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.0",
+            "version": "2.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
+                "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/89dabca1490bc77dbcab41c2b20968c7e44bf7c3",
+                "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3",
                 "shasum": ""
             },
             "require": {
@@ -7965,7 +7951,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.0"
+                "source": "https://github.com/filp/whoops/tree/2.18.2"
             },
             "funding": [
                 {
@@ -7973,7 +7959,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-15T12:00:00+00:00"
+            "time": "2025-06-11T20:42:19+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8145,16 +8131,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222"
+                "reference": "36706736a0c51d3337478fab9c919d78d2e03404"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/1042fa0c2ee490bb6da7381f3323f7292ad68222",
-                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/36706736a0c51d3337478fab9c919d78d2e03404",
+                "reference": "36706736a0c51d3337478fab9c919d78d2e03404",
                 "shasum": ""
             },
             "require": {
@@ -8222,7 +8208,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.4.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -8230,7 +8216,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-04-22T09:44:59+00:00"
+            "time": "2025-06-10T09:34:58+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8377,23 +8363,23 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.8.0",
+            "version": "v8.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8"
+                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4cf9f3b47afff38b139fb79ce54fc71799022ce8",
-                "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
+                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.18.0",
-                "nunomaduro/termwind": "^2.3.0",
+                "filp/whoops": "^2.18.1",
+                "nunomaduro/termwind": "^2.3.1",
                 "php": "^8.2.0",
-                "symfony/console": "^7.2.5"
+                "symfony/console": "^7.3.0"
             },
             "conflict": {
                 "laravel/framework": "<11.44.2 || >=13.0.0",
@@ -8401,15 +8387,15 @@
             },
             "require-dev": {
                 "brianium/paratest": "^7.8.3",
-                "larastan/larastan": "^3.2",
-                "laravel/framework": "^11.44.2 || ^12.6",
-                "laravel/pint": "^1.21.2",
-                "laravel/sail": "^1.41.0",
-                "laravel/sanctum": "^4.0.8",
+                "larastan/larastan": "^3.4.2",
+                "laravel/framework": "^11.44.2 || ^12.18",
+                "laravel/pint": "^1.22.1",
+                "laravel/sail": "^1.43.1",
+                "laravel/sanctum": "^4.1.1",
                 "laravel/tinker": "^2.10.1",
-                "orchestra/testbench-core": "^9.12.0 || ^10.1",
-                "pestphp/pest": "^3.8.0",
-                "sebastian/environment": "^7.2.0 || ^8.0"
+                "orchestra/testbench-core": "^9.12.0 || ^10.4",
+                "pestphp/pest": "^3.8.2",
+                "sebastian/environment": "^7.2.1 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -8472,7 +8458,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-04-03T14:33:09+00:00"
+            "time": "2025-06-11T01:04:21+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8975,16 +8961,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.21",
+            "version": "11.5.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289"
+                "reference": "86ebcd8a3dbcd1857d88505109b2a2b376501cde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
-                "reference": "d565e2cdc21a7db9dc6c399c1fc2083b8010f289",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86ebcd8a3dbcd1857d88505109b2a2b376501cde",
+                "reference": "86ebcd8a3dbcd1857d88505109b2a2b376501cde",
                 "shasum": ""
             },
             "require": {
@@ -9056,7 +9042,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.21"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.23"
             },
             "funding": [
                 {
@@ -9080,7 +9066,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-21T12:35:00+00:00"
+            "time": "2025-06-13T05:47:49+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10022,16 +10008,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.0",
+            "version": "3.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "65ff2489553b83b4597e89c3b8b721487011d186"
+                "reference": "1b71b4dd7e7ef651ac749cea67e513c0c832f4bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186",
-                "reference": "65ff2489553b83b4597e89c3b8b721487011d186",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1b71b4dd7e7ef651ac749cea67e513c0c832f4bd",
+                "reference": "1b71b4dd7e7ef651ac749cea67e513c0c832f4bd",
                 "shasum": ""
             },
             "require": {
@@ -10102,7 +10088,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-05-11T03:36:00+00:00"
+            "time": "2025-06-12T15:04:34+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",

From fda242d3da40b1352298bf6ddf3fc902b7690e3b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Jun 2025 15:58:59 +0100
Subject: [PATCH 564/666] Lexical: Fixed tiny image resizer on image insert

Added specific focus on image insert, and updated resize handler to
watch for load events and toggle a resize once loaded.
---
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |  1 +
 .../ui/framework/helpers/node-resizer.ts      | 60 ++++++++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 4eb4c5a4e68..41f6061b648 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -92,6 +92,7 @@ export const image: EditorButtonDefinition = {
                 context.editor.update(() => {
                     const link = $createLinkedImageNodeFromImageData(image);
                     $insertNodes([link]);
+                    link.select();
                 });
             })
         });
diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index fa8ff48be56..934ac5763b3 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -12,17 +12,21 @@ function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
 
 class NodeResizer {
     protected context: EditorUiContext;
-    protected dom: HTMLElement|null = null;
+    protected resizerDOM: HTMLElement|null = null;
+    protected targetDOM: HTMLElement|null = null;
     protected scrollContainer: HTMLElement;
 
     protected mouseTracker: MouseDragTracker|null = null;
     protected activeSelection: string = '';
+    protected loadAbortController = new AbortController();
 
     constructor(context: EditorUiContext) {
         this.context = context;
         this.scrollContainer = context.scrollDOM;
 
         this.onSelectionChange = this.onSelectionChange.bind(this);
+        this.onTargetDOMLoad = this.onTargetDOMLoad.bind(this);
+
         context.manager.onSelectionChange(this.onSelectionChange);
     }
 
@@ -47,56 +51,68 @@ class NodeResizer {
         }
     }
 
+    onTargetDOMLoad(): void {
+        this.updateResizerPosition();
+    }
+
     teardown() {
         this.context.manager.offSelectionChange(this.onSelectionChange);
         this.hide();
     }
 
-    protected showForNode(node: NodeHasSize&LexicalNode, dom: HTMLElement) {
-        this.dom = this.buildDOM();
+    protected showForNode(node: NodeHasSize&LexicalNode, targetDOM: HTMLElement) {
+        this.resizerDOM = this.buildDOM();
+        this.targetDOM = targetDOM;
 
         let ghost = el('span', {class: 'editor-node-resizer-ghost'});
         if ($isImageNode(node)) {
-            ghost = el('img', {src: dom.getAttribute('src'), class: 'editor-node-resizer-ghost'});
+            ghost = el('img', {src: targetDOM.getAttribute('src'), class: 'editor-node-resizer-ghost'});
         }
-        this.dom.append(ghost);
+        this.resizerDOM.append(ghost);
 
-        this.context.scrollDOM.append(this.dom);
-        this.updateDOMPosition(dom);
+        this.context.scrollDOM.append(this.resizerDOM);
+        this.updateResizerPosition();
 
-        this.mouseTracker = this.setupTracker(this.dom, node, dom);
+        this.mouseTracker = this.setupTracker(this.resizerDOM, node, targetDOM);
         this.activeSelection = node.getKey();
+
+        if (targetDOM.matches('img, embed, iframe, object')) {
+            this.loadAbortController = new AbortController();
+            targetDOM.addEventListener('load', this.onTargetDOMLoad, { signal: this.loadAbortController.signal });
+        }
     }
 
-    protected updateDOMPosition(nodeDOM: HTMLElement) {
-        if (!this.dom) {
+    protected updateResizerPosition() {
+        if (!this.resizerDOM || !this.targetDOM) {
             return;
         }
 
         const scrollAreaRect = this.scrollContainer.getBoundingClientRect();
-        const nodeRect = nodeDOM.getBoundingClientRect();
+        const nodeRect = this.targetDOM.getBoundingClientRect();
         const top = nodeRect.top - (scrollAreaRect.top - this.scrollContainer.scrollTop);
         const left = nodeRect.left - scrollAreaRect.left;
 
-        this.dom.style.top = `${top}px`;
-        this.dom.style.left = `${left}px`;
-        this.dom.style.width = nodeRect.width + 'px';
-        this.dom.style.height = nodeRect.height + 'px';
+        this.resizerDOM.style.top = `${top}px`;
+        this.resizerDOM.style.left = `${left}px`;
+        this.resizerDOM.style.width = nodeRect.width + 'px';
+        this.resizerDOM.style.height = nodeRect.height + 'px';
     }
 
     protected updateDOMSize(width: number, height: number): void {
-        if (!this.dom) {
+        if (!this.resizerDOM) {
             return;
         }
 
-        this.dom.style.width = width + 'px';
-        this.dom.style.height = height + 'px';
+        this.resizerDOM.style.width = width + 'px';
+        this.resizerDOM.style.height = height + 'px';
     }
 
     protected hide() {
         this.mouseTracker?.teardown();
-        this.dom?.remove();
+        this.resizerDOM?.remove();
+        this.targetDOM = null;
         this.activeSelection = '';
+        this.loadAbortController.abort();
     }
 
     protected buildDOM() {
@@ -140,7 +156,7 @@ class NodeResizer {
 
         return new MouseDragTracker(container, '.editor-node-resizer-handle', {
             down(event: MouseEvent, handle: HTMLElement) {
-                _this.dom?.classList.add('active');
+                _this.resizerDOM?.classList.add('active');
                 _this.context.editor.getEditorState().read(() => {
                     const domRect = nodeDOM.getBoundingClientRect();
                     startingWidth = node.getWidth() || domRect.width;
@@ -165,10 +181,10 @@ class NodeResizer {
                     node.setHeight(hasHeight ? size.height : 0);
                     _this.context.manager.triggerLayoutUpdate();
                     requestAnimationFrame(() => {
-                        _this.updateDOMPosition(nodeDOM);
+                        _this.updateResizerPosition();
                     })
                 });
-                _this.dom?.classList.remove('active');
+                _this.resizerDOM?.classList.remove('active');
             }
         });
     }

From 717b5163414124422899d4270e41db4267e316c9 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Jun 2025 16:38:53 +0100
Subject: [PATCH 565/666] Lexical: Made table resize handles more efficent &
 less buggy

Fine mouse movement and handles will now only be active when actually
within a table, otherwise less frequent mouseovers are used to track if
in/out a table.
Hides handles when out of a table, preventing a range of issues with
stray handles floating about.
---
 .../ui/framework/helpers/table-resizer.ts     | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
index 4256fdafc65..ef1d3cb5f23 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/table-resizer.ts
@@ -15,6 +15,7 @@ class TableResizer {
     protected targetCell: HTMLElement|null = null;
     protected xMarkerAtStart : boolean = false;
     protected yMarkerAtStart : boolean = false;
+    protected activeInTable: boolean = false;
 
     constructor(editor: LexicalEditor, editScrollContainer: HTMLElement) {
         this.editor = editor;
@@ -33,9 +34,10 @@ class TableResizer {
     }
 
     protected setupListeners() {
+        this.onTableMouseOver = this.onTableMouseOver.bind(this);
         this.onCellMouseMove = this.onCellMouseMove.bind(this);
         this.onScrollOrResize = this.onScrollOrResize.bind(this);
-        this.editScrollContainer.addEventListener('mousemove', this.onCellMouseMove);
+        this.editScrollContainer.addEventListener('mouseover', this.onTableMouseOver, { passive: true });
         window.addEventListener('scroll', this.onScrollOrResize, {capture: true, passive: true});
         window.addEventListener('resize', this.onScrollOrResize, {passive: true});
     }
@@ -44,8 +46,26 @@ class TableResizer {
         this.updateCurrentMarkerTargetPosition();
     }
 
+    protected onTableMouseOver(event: MouseEvent): void {
+        if (this.dragging) {
+            return;
+        }
+
+        const table = (event.target as HTMLElement).closest('table') as HTMLElement|null;
+
+        if (table && !this.activeInTable) {
+            this.editScrollContainer.addEventListener('mousemove', this.onCellMouseMove, { passive: true });
+            this.onCellMouseMove(event);
+            this.activeInTable = true;
+        } else if (!table && this.activeInTable) {
+            this.editScrollContainer.removeEventListener('mousemove', this.onCellMouseMove);
+            this.hideMarkers();
+            this.activeInTable = false;
+        }
+    }
+
     protected onCellMouseMove(event: MouseEvent) {
-        const cell = (event.target as HTMLElement).closest('td,th') as HTMLElement;
+        const cell = (event.target as HTMLElement).closest('td,th') as HTMLElement|null;
         if (!cell || this.dragging) {
             return;
         }
@@ -66,10 +86,16 @@ class TableResizer {
     protected updateMarkersTo(cell: HTMLElement, xPos: number, yPos: number) {
         const markers: MarkerDomRecord = this.getMarkers();
         const table = cell.closest('table') as HTMLElement;
+        const caption: HTMLTableCaptionElement|null = table.querySelector('caption');
         const tableRect = table.getBoundingClientRect();
         const editBounds = this.editScrollContainer.getBoundingClientRect();
 
-        const maxTop = Math.max(tableRect.top, editBounds.top);
+        let tableTop = tableRect.top;
+        if (caption) {
+            tableTop = caption.getBoundingClientRect().bottom;
+        }
+
+        const maxTop = Math.max(tableTop, editBounds.top);
         const maxBottom = Math.min(tableRect.bottom, editBounds.bottom);
         const maxHeight = maxBottom - maxTop;
         markers.x.style.left = xPos + 'px';
@@ -85,6 +111,13 @@ class TableResizer {
         markers.x.hidden = tableRect.top > editBounds.bottom || tableRect.bottom < editBounds.top;
     }
 
+    protected hideMarkers(): void {
+        if (this.markerDom) {
+            this.markerDom.x.hidden = true;
+            this.markerDom.y.hidden = true;
+        }
+    }
+
     protected updateCurrentMarkerTargetPosition(): void {
         if (!this.targetCell) {
             return;

From 8b062d47951825e04f9a65ea3b09d9c70ee8b59d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 13 Jun 2025 19:40:13 +0100
Subject: [PATCH 566/666] Lexical: Fixed strange paragraph formatting behaviour

Formatting was not persisted on empty paragraphs, and was instead based
upon last format encountered in selection.
This was due to overly-hasty removal of other formatting code, which
this got caught it.
Restored required parts from prior codebase.

Also updated inline format button active indicator to reflect formats
using the above, so correct buttons are shown as active even when just
in an empty paragraph.
---
 resources/js/wysiwyg/index.ts                 |  2 +-
 .../js/wysiwyg/lexical/core/LexicalEvents.ts  |  1 +
 .../core/nodes/LexicalParagraphNode.ts        | 25 ++++++++++++++++++-
 resources/js/wysiwyg/utils/selection.ts       | 11 ++++++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index ffdc7d7e82c..7ecf91d230e 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -84,7 +84,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     // @ts-ignore
     window.debugEditorState = () => {
-        console.log(editor.getEditorState().toJSON());
+        return editor.getEditorState().toJSON();
     };
 
     registerCommonNodeMutationListeners(context);
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
index c70a906a08e..26cf25a800d 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
@@ -355,6 +355,7 @@ function onSelectionChange(
               lastNode instanceof ParagraphNode &&
               lastNode.getChildrenSize() === 0
             ) {
+              selection.format = lastNode.getTextFormat();
               selection.style = lastNode.getTextStyle();
             } else {
               selection.format = 0;
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index f6f57c91c75..e8d044b218b 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -19,7 +19,7 @@ import type {
   LexicalNode,
   NodeKey,
 } from '../LexicalNode';
-import type {RangeSelection} from 'lexical';
+import {RangeSelection, TEXT_TYPE_TO_FORMAT, TextFormatType} from 'lexical';
 
 import {
   $applyNodeReplacement,
@@ -36,6 +36,7 @@ import {CommonBlockNode, copyCommonBlockProperties, SerializedCommonBlockNode} f
 
 export type SerializedParagraphNode = Spread<
   {
+    textFormat: number;
     textStyle: string;
   },
   SerializedCommonBlockNode
@@ -45,10 +46,12 @@ export type SerializedParagraphNode = Spread<
 export class ParagraphNode extends CommonBlockNode {
   ['constructor']!: KlassConstructor<typeof ParagraphNode>;
   /** @internal */
+  __textFormat: number;
   __textStyle: string;
 
   constructor(key?: NodeKey) {
     super(key);
+    this.__textFormat = 0;
     this.__textStyle = '';
   }
 
@@ -56,6 +59,22 @@ export class ParagraphNode extends CommonBlockNode {
     return 'paragraph';
   }
 
+  getTextFormat(): number {
+    const self = this.getLatest();
+    return self.__textFormat;
+  }
+
+  setTextFormat(type: number): this {
+    const self = this.getWritable();
+    self.__textFormat = type;
+    return self;
+  }
+
+  hasTextFormat(type: TextFormatType): boolean {
+    const formatFlag = TEXT_TYPE_TO_FORMAT[type];
+    return (this.getTextFormat() & formatFlag) !== 0;
+  }
+
   getTextStyle(): string {
     const self = this.getLatest();
     return self.__textStyle;
@@ -73,6 +92,7 @@ export class ParagraphNode extends CommonBlockNode {
 
   afterCloneFrom(prevNode: this) {
     super.afterCloneFrom(prevNode);
+    this.__textFormat = prevNode.__textFormat;
     this.__textStyle = prevNode.__textStyle;
     copyCommonBlockProperties(prevNode, this);
   }
@@ -125,12 +145,14 @@ export class ParagraphNode extends CommonBlockNode {
   static importJSON(serializedNode: SerializedParagraphNode): ParagraphNode {
     const node = $createParagraphNode();
     deserializeCommonBlockNode(serializedNode, node);
+    node.setTextFormat(serializedNode.textFormat);
     return node;
   }
 
   exportJSON(): SerializedParagraphNode {
     return {
       ...super.exportJSON(),
+      textFormat: this.getTextFormat(),
       textStyle: this.getTextStyle(),
       type: 'paragraph',
       version: 1,
@@ -144,6 +166,7 @@ export class ParagraphNode extends CommonBlockNode {
     restoreSelection: boolean,
   ): ParagraphNode {
     const newElement = $createParagraphNode();
+    newElement.setTextFormat(rangeSelection.format);
     newElement.setTextStyle(rangeSelection.style);
     const direction = this.getDirection();
     newElement.setDirection(direction);
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index 167ab32adca..e4b5bf2dce6 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -3,7 +3,7 @@ import {
     $createParagraphNode, $createRangeSelection,
     $getRoot,
     $getSelection, $isBlockElementNode, $isDecoratorNode,
-    $isElementNode,
+    $isElementNode, $isParagraphNode,
     $isTextNode,
     $setSelection,
     BaseSelection, DecoratorNode,
@@ -60,12 +60,19 @@ export function $selectionContainsTextFormat(selection: BaseSelection | null, fo
         return false;
     }
 
-    for (const node of selection.getNodes()) {
+    // Check text nodes
+    const nodes = selection.getNodes();
+    for (const node of nodes) {
         if ($isTextNode(node) && node.hasFormat(format)) {
             return true;
         }
     }
 
+    // If we're in an empty paragraph, check the paragraph format
+    if (nodes.length === 1 && $isParagraphNode(nodes[0]) && nodes[0].hasTextFormat(format)) {
+        return true;
+    }
+
     return false;
 }
 

From 77a88618c21d66cf663bb37979260539df7528e3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 14 Jun 2025 14:50:10 +0100
Subject: [PATCH 567/666] Lexical: Fixed double-bold text, updated tests

Double bold was due to text field exporting wrapping the output in <b>
tags when the main tag would already be strong.
---
 .../lexical/core/__tests__/unit/LexicalEditor.test.ts        | 2 ++
 .../lexical/core/__tests__/unit/LexicalEditorState.test.ts   | 3 ++-
 .../lexical/core/__tests__/unit/LexicalSerialization.test.ts | 4 ++--
 resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts   | 5 +++--
 .../core/nodes/__tests__/unit/LexicalParagraphNode.test.ts   | 1 +
 .../core/nodes/__tests__/unit/LexicalTextNode.test.ts        | 2 +-
 .../table/__tests__/unit/LexicalTableSelection.test.ts       | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index 5d763291972..a54d33ca4a4 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -1069,6 +1069,7 @@ describe('LexicalEditor tests', () => {
           __prev: null,
           __size: 1,
           __style: '',
+          __textFormat: 0,
           __textStyle: '',
           __type: 'paragraph',
         });
@@ -1149,6 +1150,7 @@ describe('LexicalEditor tests', () => {
           __prev: null,
           __size: 1,
           __style: '',
+          __textFormat: 0,
           __textStyle: '',
           __type: 'paragraph',
         });
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
index 97b63450323..12fcfbf735d 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditorState.test.ts
@@ -76,6 +76,7 @@ describe('LexicalEditorState tests', () => {
         __prev: null,
         __size: 1,
         __style: '',
+        __textFormat: 0,
         __textStyle: '',
         __type: 'paragraph',
       });
@@ -111,7 +112,7 @@ describe('LexicalEditorState tests', () => {
       });
 
       expect(JSON.stringify(editor.getEditorState().toJSON())).toEqual(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Hello world","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"root","version":1}}`,
       );
     });
 
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
index e08547c13b6..23b5ffdd5ae 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalSerialization.test.ts
@@ -107,7 +107,7 @@ describe('LexicalSerialization tests', () => {
       });
 
       const stringifiedEditorState = JSON.stringify(editor.getEditorState());
-      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`;
+      const expectedStringifiedEditorState = `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`;
 
       expect(stringifiedEditorState).toBe(expectedStringifiedEditorState);
 
@@ -116,7 +116,7 @@ describe('LexicalSerialization tests', () => {
       const otherStringifiedEditorState = JSON.stringify(editorState);
 
       expect(otherStringifiedEditorState).toBe(
-        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`,
+        `{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome to the playground","type":"text","version":1}],"direction":null,"type":"heading","version":1,"id":"","alignment":"","inset":0,"tag":"h1"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"In case you were wondering what the black box at the bottom is – it's the debug view, showing the current state of the editor. You can disable it by pressing on the settings control in the bottom-left of your screen and toggling the debug view setting.","type":"text","version":1}],"direction":null,"type":"quote","version":1,"id":"","alignment":"","inset":0},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"The playground is a demo environment built with ","type":"text","version":1},{"detail":0,"format":16,"mode":"normal","style":"","text":"@lexical/react","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":". Try typing in ","type":"text","version":1},{"detail":0,"format":1,"mode":"normal","style":"","text":"some text","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" with ","type":"text","version":1},{"detail":0,"format":2,"mode":"normal","style":"","text":"different","type":"text","version":1},{"detail":0,"format":0,"mode":"normal","style":"","text":" formats.","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Make sure to check out the various plugins in the toolbar. You can also use #hashtags or @-mentions too!","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"If you'd like to find out more about Lexical, you can:","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Visit the ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lexical website","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://lexical.dev/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" for documentation and more information.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Check out the code on our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"GitHub repository","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":2},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Playground code can be found ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"here","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://github.com/facebook/lexical/tree/main/packages/lexical-playground"},{"detail":0,"format":0,"mode":"normal","style":"","text":".","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":3},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Join our ","type":"text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Discord Server","type":"text","version":1}],"direction":null,"type":"link","version":1,"rel":null,"target":null,"title":null,"url":"https://discord.com/invite/KmG4wQnnD9"},{"detail":0,"format":0,"mode":"normal","style":"","text":" and chat with the team.","type":"text","version":1}],"direction":null,"type":"listitem","version":1,"value":4}],"direction":null,"type":"list","version":1,"listType":"bullet","start":1,"tag":"ul","id":""},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Lastly, we're constantly adding cool new features to this playground. So make sure you check back here when you next get a chance :).","type":"text","version":1}],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""},{"children":[{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":3,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":1,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0},{"children":[{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":2,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""},{"children":[{"children":[],"direction":null,"type":"paragraph","version":1,"id":"","alignment":"","inset":0,"textFormat":0,"textStyle":""}],"direction":null,"type":"tablecell","version":1,"backgroundColor":null,"colSpan":1,"headerState":0,"rowSpan":1,"styles":{},"alignment":""}],"direction":null,"type":"tablerow","version":1,"styles":{},"height":0}],"direction":null,"type":"table","version":1,"id":"","alignment":"","inset":0,"colWidths":[],"styles":{}}],"direction":null,"type":"root","version":1}}`,
       );
     });
   });
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
index 7f1b4f30515..9a486749421 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -620,6 +620,7 @@ export class TextNode extends LexicalNode {
   // HTML content and not have the ability to use CSS classes.
   exportDOM(editor: LexicalEditor): DOMExportOutput {
     let {element} = super.exportDOM(editor);
+    const originalElementName = (element?.nodeName || '').toLowerCase()
     invariant(
       element !== null && isHTMLElement(element),
       'Expected TextNode createDOM to always return a HTMLElement',
@@ -649,8 +650,8 @@ export class TextNode extends LexicalNode {
     // This is the only way to properly add support for most clients,
     // even if it's semantically incorrect to have to resort to using
     // <b>, <u>, <s>, <i> elements.
-    if (this.hasFormat('bold')) {
-      element = wrapElementWith(element, 'b');
+    if (this.hasFormat('bold') && originalElementName !== 'strong') {
+      element = wrapElementWith(element, 'strong');
     }
     if (this.hasFormat('italic')) {
       element = wrapElementWith(element, 'em');
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
index 7bf485ca1d4..00db14e8554 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalParagraphNode.test.ts
@@ -53,6 +53,7 @@ describe('LexicalParagraphNode tests', () => {
           direction: null,
           id: '',
           inset: 0,
+          textFormat: 0,
           textStyle: '',
           type: 'paragraph',
           version: 1,
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index c54760ff242..0dbf9b94ed7 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -839,7 +839,7 @@ describe('LexicalTextNode tests', () => {
         paragraph.append(textNode);
 
         const html = $generateHtmlFromNodes($getEditor(), null);
-        expect(html).toBe('<p><u><em><b><code spellcheck="false"><strong>hello</strong></code></b></em></u></p>');
+        expect(html).toBe('<p><u><em><strong><code spellcheck="false"><strong>hello</strong></code></strong></em></u></p>');
       });
     });
 
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
index 1548216cf1a..b28f2958e8d 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableSelection.test.ts
@@ -123,6 +123,7 @@ describe('table selection', () => {
       __prev: null,
       __size: 1,
       __style: '',
+      __textFormat: 0,
       __textStyle: '',
       __type: 'paragraph',
     });

From 8d4b8ff4f375c014d36ccbf034dfc77bb8481804 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Jun 2025 13:55:42 +0100
Subject: [PATCH 568/666] Lexical: Fixed media resize handling

- Updating height/width setting to clear any inline CSS width/height
  rules which would override and prevent resizes showing. This was
  common when switching media from old editor.
  Added test to cover.
- Updated resizer to track node so that it is retained & displayed
  across node DOM changes, which was previously causing the
  resizer/focus to disappear.
---
 .../lexical/core/__tests__/utils/index.ts     |  2 +
 .../lexical/rich-text/LexicalMediaNode.ts     | 34 ++++++++++----
 .../__tests__/unit/LexicalMediaNode.test.ts   | 31 +++++++++++++
 .../ui/framework/helpers/node-resizer.ts      | 45 ++++++++++++-------
 resources/js/wysiwyg/utils/dom.ts             | 22 ++++++++-
 resources/sass/_editor.scss                   |  2 +-
 6 files changed, 107 insertions(+), 29 deletions(-)
 create mode 100644 resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts

diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 6a8e457248b..e18ef97560b 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -38,6 +38,7 @@ import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {EditorUiContext} from "../../../../ui/framework/core";
 import {EditorUIManager} from "../../../../ui/framework/manager";
 import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 
 type TestEnv = {
   readonly container: HTMLDivElement;
@@ -487,6 +488,7 @@ export function createTestContext(): EditorUiContext {
     theme: {},
     nodes: [
         ImageNode,
+        MediaNode,
     ]
   });
 
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 1dd159f510d..6e9c24717c3 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -8,7 +8,7 @@ import {
 } from 'lexical';
 import type {EditorConfig} from "lexical/LexicalEditor";
 
-import {el, setOrRemoveAttribute, sizeToPixels} from "../../utils/dom";
+import {el, setOrRemoveAttribute, sizeToPixels, styleMapToStyleString, styleStringToStyleMap} from "../../utils/dom";
 import {
     CommonBlockAlignment, deserializeCommonBlockNode,
     setCommonBlockPropsFromElement,
@@ -46,6 +46,19 @@ function filterAttributes(attributes: Record<string, string>): Record<string, st
     return filtered;
 }
 
+function removeStyleFromAttributes(attributes: Record<string, string>, styleName: string): Record<string, string> {
+    const attrCopy = Object.assign({}, attributes);
+    if (!attributes.style) {
+        return attrCopy;
+    }
+
+    const map = styleStringToStyleMap(attributes.style);
+    map.delete(styleName);
+
+    attrCopy.style = styleMapToStyleString(map);
+    return attrCopy;
+}
+
 function domElementToNode(tag: MediaNodeTag, element: HTMLElement): MediaNode {
     const node = $createMediaNode(tag);
 
@@ -118,7 +131,7 @@ export class MediaNode extends ElementNode {
 
     getAttributes(): Record<string, string> {
         const self = this.getLatest();
-        return self.__attributes;
+        return Object.assign({}, self.__attributes);
     }
 
     setSources(sources: MediaNodeSource[]) {
@@ -132,7 +145,7 @@ export class MediaNode extends ElementNode {
     }
 
     setSrc(src: string): void {
-        const attrs = Object.assign({}, this.getAttributes());
+        const attrs = this.getAttributes();
         if (this.__tag ==='object') {
             attrs.data = src;
         } else {
@@ -142,11 +155,13 @@ export class MediaNode extends ElementNode {
     }
 
     setWidthAndHeight(width: string, height: string): void {
-        const attrs = Object.assign(
-            {},
+        let attrs: Record<string, string> = Object.assign(
             this.getAttributes(),
             {width, height},
         );
+
+        attrs = removeStyleFromAttributes(attrs, 'width');
+        attrs = removeStyleFromAttributes(attrs, 'height');
         this.setAttributes(attrs);
     }
 
@@ -185,8 +200,8 @@ export class MediaNode extends ElementNode {
             return;
         }
 
-        const attrs = Object.assign({}, this.getAttributes(), {height});
-        this.setAttributes(attrs);
+        const attrs = Object.assign(this.getAttributes(), {height});
+        this.setAttributes(removeStyleFromAttributes(attrs, 'height'));
     }
 
     getHeight(): number {
@@ -195,8 +210,9 @@ export class MediaNode extends ElementNode {
     }
 
     setWidth(width: number): void {
-        const attrs = Object.assign({}, this.getAttributes(), {width});
-        this.setAttributes(attrs);
+        const existingAttrs = this.getAttributes();
+        const attrs: Record<string, string> = Object.assign(existingAttrs, {width});
+        this.setAttributes(removeStyleFromAttributes(attrs, 'width'));
     }
 
     getWidth(): number {
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts
new file mode 100644
index 00000000000..c55ae669edd
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts
@@ -0,0 +1,31 @@
+import {createTestContext} from "lexical/__tests__/utils";
+import {$createMediaNode} from "@lexical/rich-text/LexicalMediaNode";
+
+
+describe('LexicalMediaNode', () => {
+
+    test('setWidth/setHeight/setWidthAndHeight functions remove relevant styles', () => {
+        const {editor} = createTestContext();
+        editor.updateAndCommit(() => {
+            const mediaMode = $createMediaNode('video');
+            const defaultStyles = {style: 'width:20px;height:40px;color:red'};
+
+            mediaMode.setAttributes(defaultStyles);
+            mediaMode.setWidth(60);
+            expect(mediaMode.getWidth()).toBe(60);
+            expect(mediaMode.getAttributes().style).toBe('height:40px;color:red');
+
+            mediaMode.setAttributes(defaultStyles);
+            mediaMode.setHeight(77);
+            expect(mediaMode.getHeight()).toBe(77);
+            expect(mediaMode.getAttributes().style).toBe('width:20px;color:red');
+
+            mediaMode.setAttributes(defaultStyles);
+            mediaMode.setWidthAndHeight('6', '7');
+            expect(mediaMode.getWidth()).toBe(6);
+            expect(mediaMode.getHeight()).toBe(7);
+            expect(mediaMode.getAttributes().style).toBe('color:red');
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index 934ac5763b3..8b0a1d2d7d0 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -13,7 +13,7 @@ function isNodeWithSize(node: LexicalNode): node is NodeHasSize&LexicalNode {
 class NodeResizer {
     protected context: EditorUiContext;
     protected resizerDOM: HTMLElement|null = null;
-    protected targetDOM: HTMLElement|null = null;
+    protected targetNode: LexicalNode|null = null;
     protected scrollContainer: HTMLElement;
 
     protected mouseTracker: MouseDragTracker|null = null;
@@ -38,12 +38,7 @@ class NodeResizer {
 
         if (nodes.length === 1 && isNodeWithSize(nodes[0])) {
             const node = nodes[0];
-            const nodeKey = node.getKey();
-            let nodeDOM = this.context.editor.getElementByKey(nodeKey);
-
-            if (nodeDOM && nodeDOM.nodeName === 'SPAN') {
-                nodeDOM = nodeDOM.firstElementChild as HTMLElement;
-            }
+            let nodeDOM = this.getTargetDOM(node)
 
             if (nodeDOM) {
                 this.showForNode(node, nodeDOM);
@@ -51,7 +46,19 @@ class NodeResizer {
         }
     }
 
-    onTargetDOMLoad(): void {
+    protected getTargetDOM(targetNode: LexicalNode|null): HTMLElement|null {
+        if (targetNode == null) {
+            return null;
+        }
+
+        let nodeDOM =  this.context.editor.getElementByKey(targetNode.__key)
+        if (nodeDOM && nodeDOM.nodeName === 'SPAN') {
+            nodeDOM = nodeDOM.firstElementChild as HTMLElement;
+        }
+        return nodeDOM;
+    }
+
+    protected onTargetDOMLoad(): void {
         this.updateResizerPosition();
     }
 
@@ -62,7 +69,7 @@ class NodeResizer {
 
     protected showForNode(node: NodeHasSize&LexicalNode, targetDOM: HTMLElement) {
         this.resizerDOM = this.buildDOM();
-        this.targetDOM = targetDOM;
+        this.targetNode = node;
 
         let ghost = el('span', {class: 'editor-node-resizer-ghost'});
         if ($isImageNode(node)) {
@@ -83,12 +90,13 @@ class NodeResizer {
     }
 
     protected updateResizerPosition() {
-        if (!this.resizerDOM || !this.targetDOM) {
+        const targetDOM = this.getTargetDOM(this.targetNode);
+        if (!this.resizerDOM || !targetDOM) {
             return;
         }
 
         const scrollAreaRect = this.scrollContainer.getBoundingClientRect();
-        const nodeRect = this.targetDOM.getBoundingClientRect();
+        const nodeRect = targetDOM.getBoundingClientRect();
         const top = nodeRect.top - (scrollAreaRect.top - this.scrollContainer.scrollTop);
         const left = nodeRect.left - scrollAreaRect.left;
 
@@ -110,7 +118,7 @@ class NodeResizer {
     protected hide() {
         this.mouseTracker?.teardown();
         this.resizerDOM?.remove();
-        this.targetDOM = null;
+        this.targetNode = null;
         this.activeSelection = '';
         this.loadAbortController.abort();
     }
@@ -126,7 +134,7 @@ class NodeResizer {
         }, handleElems);
     }
 
-    setupTracker(container: HTMLElement, node: NodeHasSize, nodeDOM: HTMLElement): MouseDragTracker {
+    setupTracker(container: HTMLElement, node: NodeHasSize&LexicalNode, nodeDOM: HTMLElement): MouseDragTracker {
         let startingWidth: number = 0;
         let startingHeight: number = 0;
         let startingRatio: number = 0;
@@ -179,10 +187,13 @@ class NodeResizer {
                 _this.context.editor.update(() => {
                     node.setWidth(size.width);
                     node.setHeight(hasHeight ? size.height : 0);
-                    _this.context.manager.triggerLayoutUpdate();
-                    requestAnimationFrame(() => {
-                        _this.updateResizerPosition();
-                    })
+                }, {
+                    onUpdate: () => {
+                        requestAnimationFrame(() => {
+                            _this.context.manager.triggerLayoutUpdate();
+                            _this.updateResizerPosition();
+                        });
+                    }
                 });
                 _this.resizerDOM?.classList.remove('active');
             }
diff --git a/resources/js/wysiwyg/utils/dom.ts b/resources/js/wysiwyg/utils/dom.ts
index bbb07cb414d..8bacd100224 100644
--- a/resources/js/wysiwyg/utils/dom.ts
+++ b/resources/js/wysiwyg/utils/dom.ts
@@ -52,12 +52,19 @@ export type StyleMap = Map<string, string>;
 /**
  * Creates a map from an element's styles.
  * Uses direct attribute value string handling since attempting to iterate
- * over .style will expand out any shorthand properties (like 'padding') making
+ * over .style will expand out any shorthand properties (like 'padding')
  * rather than being representative of the actual properties set.
  */
 export function extractStyleMapFromElement(element: HTMLElement): StyleMap {
-    const map: StyleMap = new Map();
     const styleText= element.getAttribute('style') || '';
+    return styleStringToStyleMap(styleText);
+}
+
+/**
+ * Convert string-formatted styles into a StyleMap.
+ */
+export function styleStringToStyleMap(styleText: string): StyleMap {
+    const map: StyleMap = new Map();
 
     const rules = styleText.split(';');
     for (const rule of rules) {
@@ -72,6 +79,17 @@ export function extractStyleMapFromElement(element: HTMLElement): StyleMap {
     return map;
 }
 
+/**
+ * Convert a StyleMap into inline string style text.
+ */
+export function styleMapToStyleString(map: StyleMap): string {
+    const parts = [];
+    for (const [style, value] of map.entries()) {
+        parts.push(`${style}:${value}`);
+    }
+    return parts.join(';');
+}
+
 export function setOrRemoveAttribute(element: HTMLElement, name: string, value: string|null|undefined) {
     if (value) {
         element.setAttribute(name, value);
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 4112f62888c..633fa78a6b1 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -454,7 +454,7 @@ body.editor-is-fullscreen {
 .editor-media-wrap {
   display: inline-block;
   cursor: not-allowed;
-  iframe {
+  iframe, video {
     pointer-events: none;
   }
   &.align-left {

From 1611b0399f2ccfcf5f261642a12076cde91b9600 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Jun 2025 15:22:27 +0100
Subject: [PATCH 569/666] Lexical: Added a media toolbar, improved toolbars and
 media selection

- Updated toolbars to auto-refresh ui if it attempts to update targeting
  a DOM element which no longer exists.
- Removed MediaNode dom specific click handling which was causing
  selection issues, and did not seem to be needed now.
---
 .../js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts      | 8 +-------
 resources/js/wysiwyg/ui/defaults/toolbars.ts              | 4 ++++
 resources/js/wysiwyg/ui/framework/toolbars.ts             | 6 +++++-
 resources/js/wysiwyg/ui/index.ts                          | 6 +++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 6e9c24717c3..4f4b1d82af8 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -238,15 +238,9 @@ export class MediaNode extends ElementNode {
 
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const media = this.createInnerDOM();
-        const wrap = el('span', {
+        return el('span', {
             class: media.className + ' editor-media-wrap',
         }, [media]);
-
-        wrap.addEventListener('click', e => {
-            _editor.update(() => $selectSingleNode(this));
-        });
-
-        return wrap;
     }
 
     updateDOM(prevNode: MediaNode, dom: HTMLElement): boolean {
diff --git a/resources/js/wysiwyg/ui/defaults/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
index b09a7530f1f..cdc451d088b 100644
--- a/resources/js/wysiwyg/ui/defaults/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -224,6 +224,10 @@ export function getImageToolbarContent(): EditorUiElement[] {
     return [new EditorButton(image)];
 }
 
+export function getMediaToolbarContent(): EditorUiElement[] {
+    return [new EditorButton(media)];
+}
+
 export function getLinkToolbarContent(): EditorUiElement[] {
     return [
         new EditorButton(link),
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index b4e49af950c..de2255444eb 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -34,7 +34,11 @@ export class EditorContextToolbar extends EditorContainerUiElement {
 
         dom.hidden = !showing;
 
-        if (!showing) {
+        if (!this.target.isConnected) {
+            // If our target is no longer in the DOM, tell the manager an update is needed.
+            this.getContext().manager.triggerFutureStateRefresh();
+            return;
+        } else if (!showing) {
             return;
         }
 
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index fda37085ef3..e7ec6adbcd5 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -3,7 +3,7 @@ import {
     getCodeToolbarContent, getDetailsToolbarContent,
     getImageToolbarContent,
     getLinkToolbarContent,
-    getMainEditorFullToolbar, getTableToolbarContent
+    getMainEditorFullToolbar, getMediaToolbarContent, getTableToolbarContent
 } from "./defaults/toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {EditorUiContext} from "./framework/core";
@@ -44,6 +44,10 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         selector: 'img:not([drawio-diagram] img)',
         content: getImageToolbarContent(),
     });
+    manager.registerContextToolbar('media', {
+        selector: '.editor-media-wrap',
+        content: getMediaToolbarContent(),
+    });
     manager.registerContextToolbar('link', {
         selector: 'a',
         content: getLinkToolbarContent(),

From b913ae703deb29c0e4bca42a0d8938587dbc2e75 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 15 Jun 2025 20:00:28 +0100
Subject: [PATCH 570/666] Lexical: Media form improvements

- Allowed re-editing of existing embed HTML code.
- Handled "src" form field when video is using child source tags.
---
 .../lexical/rich-text/LexicalMediaNode.ts     | 13 +++++++++++--
 .../__tests__/unit/LexicalMediaNode.test.ts   | 15 +++++++++++++++
 .../js/wysiwyg/ui/defaults/forms/objects.ts   | 19 ++++++++++++++++---
 resources/js/wysiwyg/ui/framework/forms.ts    |  5 ++++-
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
index 4f4b1d82af8..a7acc4ad340 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalMediaNode.ts
@@ -14,7 +14,6 @@ import {
     setCommonBlockPropsFromElement,
     updateElementWithCommonBlockProps
 } from "lexical/nodes/common";
-import {$selectSingleNode} from "../../utils/selection";
 import {SerializedCommonBlockNode} from "lexical/nodes/CommonBlockNode";
 
 export type MediaNodeTag = 'iframe' | 'embed' | 'object' | 'video' | 'audio';
@@ -141,16 +140,26 @@ export class MediaNode extends ElementNode {
 
     getSources(): MediaNodeSource[] {
         const self = this.getLatest();
-        return self.__sources;
+        return self.__sources.map(s => Object.assign({}, s))
     }
 
     setSrc(src: string): void {
         const attrs = this.getAttributes();
+        const sources = this.getSources();
+
         if (this.__tag ==='object') {
             attrs.data = src;
+        } if (this.__tag === 'video' && sources.length > 0) {
+            sources[0].src = src;
+            delete attrs.src;
+            if (sources.length > 1) {
+                sources.splice(1, sources.length - 1);
+            }
+            this.setSources(sources);
         } else {
             attrs.src = src;
         }
+
         this.setAttributes(attrs);
     }
 
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts
index c55ae669edd..b142e95a085 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalMediaNode.test.ts
@@ -28,4 +28,19 @@ describe('LexicalMediaNode', () => {
         });
     });
 
+    test('setSrc on video uses sources if existing', () => {
+        const {editor} = createTestContext();
+        editor.updateAndCommit(() => {
+            const mediaMode = $createMediaNode('video');
+            mediaMode.setAttributes({src: 'z'});
+            mediaMode.setSources([{src: 'a', type: 'video'}, {src: 'b', type: 'video'}]);
+
+            mediaMode.setSrc('c');
+
+            expect(mediaMode.getAttributes().src).toBeUndefined();
+            expect(mediaMode.getSources()).toHaveLength(1);
+            expect(mediaMode.getSources()[0].src).toBe('c');
+        });
+    });
+
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index 0effdc1715e..cdf464cb4f7 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -192,11 +192,17 @@ export function $showMediaForm(media: MediaNode|null, context: EditorUiContext):
     let formDefaults = {};
     if (media) {
         const nodeAttrs = media.getAttributes();
+        const nodeDOM = media.exportDOM(context.editor).element;
+        const nodeHtml = (nodeDOM instanceof HTMLElement) ? nodeDOM.outerHTML : '';
+
         formDefaults = {
-            src: nodeAttrs.src || nodeAttrs.data || '',
+            src: nodeAttrs.src || nodeAttrs.data || media.getSources()[0]?.src || '',
             width: nodeAttrs.width,
             height: nodeAttrs.height,
-            embed: '',
+            embed: nodeHtml,
+
+            // This is used so we can check for edits against the embed field on submit
+            embed_check: nodeHtml,
         }
     }
 
@@ -214,7 +220,8 @@ export const media: EditorFormDefinition = {
         }));
 
         const embedCode = (formData.get('embed') || '').toString().trim();
-        if (embedCode) {
+        const embedCheck = (formData.get('embed_check') || '').toString().trim();
+        if (embedCode && embedCode !== embedCheck) {
             context.editor.update(() => {
                 const node = $createMediaNodeFromHtml(embedCode);
                 if (selectedNode && node) {
@@ -236,6 +243,7 @@ export const media: EditorFormDefinition = {
             if (selectedNode) {
                 selectedNode.setSrc(src);
                 selectedNode.setWidthAndHeight(width, height);
+                context.manager.triggerFutureStateRefresh();
                 return;
             }
 
@@ -281,6 +289,11 @@ export const media: EditorFormDefinition = {
                                 name: 'embed',
                                 type: 'textarea',
                             },
+                            {
+                                label: '',
+                                name: 'embed_check',
+                                type: 'hidden',
+                            },
                         ],
                     }
                 ])
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index 08edb214e2a..b12d9f692fc 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -11,7 +11,7 @@ import {el} from "../../utils/dom";
 export interface EditorFormFieldDefinition {
     label: string;
     name: string;
-    type: 'text' | 'select' | 'textarea' | 'checkbox';
+    type: 'text' | 'select' | 'textarea' | 'checkbox' | 'hidden';
 }
 
 export interface EditorSelectFormFieldDefinition extends EditorFormFieldDefinition {
@@ -67,6 +67,9 @@ export class EditorFormField extends EditorUiElement {
             input = el('textarea', {id, name: this.definition.name, class: 'editor-form-field-input'});
         } else if (this.definition.type === 'checkbox') {
             input = el('input', {id, name: this.definition.name, type: 'checkbox', class: 'editor-form-field-input-checkbox', value: 'true'});
+        } else if (this.definition.type === 'hidden') {
+            input = el('input', {id, name: this.definition.name, type: 'hidden'});
+            return el('div', {hidden: 'true'}, [input]);
         } else {
             input = el('input', {id, name: this.definition.name, class: 'editor-form-field-input'});
         }

From 0208f066c5fdac676cfd7dc7fd9476db68e55609 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Jun 2025 13:42:25 +0100
Subject: [PATCH 571/666] Comments: Fixed update notification text

For #5642
---
 resources/js/components/page-comment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 0c3e19f4b1a..a0bb7a55bf8 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -40,7 +40,7 @@ export class PageComment extends Component {
         this.commentId = this.$opts.commentId;
         this.commentLocalId = this.$opts.commentLocalId;
         this.deletedText = this.$opts.deletedText;
-        this.deletedText = this.$opts.deletedText;
+        this.updatedText = this.$opts.updatedText;
         this.archiveText = this.$opts.archiveText;
 
         // Editor reference and text options

From f518a3be373500b0382b49ef814b9c5ee76c3d8e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Jun 2025 13:59:28 +0100
Subject: [PATCH 572/666] Search: Updated indexer to handle non-breaking-spaces

Related to #5640
---
 app/Search/SearchIndex.php          |  4 +++-
 tests/Search/SearchIndexingTest.php | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index 36f71f6ccc7..844e3584b20 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -160,7 +160,9 @@ protected function generateTermScoreMapFromHtml(string $html): array
         /** @var DOMNode $child */
         foreach ($doc->getBodyChildren() as $child) {
             $nodeName = $child->nodeName;
-            $termCounts = $this->textToTermCountMap(trim($child->textContent));
+            $text = trim($child->textContent);
+            $text = str_replace("\u{00A0}", ' ', $text);
+            $termCounts = $this->textToTermCountMap($text);
             foreach ($termCounts as $term => $count) {
                 $scoreChange = $count * ($elementScoreAdjustmentMap[$nodeName] ?? 1);
                 $scoresByTerm[$term] = ($scoresByTerm[$term] ?? 0) + $scoreChange;
diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
index 64779dec632..d2bbb2905b4 100644
--- a/tests/Search/SearchIndexingTest.php
+++ b/tests/Search/SearchIndexingTest.php
@@ -106,4 +106,14 @@ public function test_terms_containing_punctuation_within_retain_original_form_an
             $this->assertNull($scoreByTerm->get($term), "Failed asserting that \"$term\" is not indexed");
         }
     }
+
+    public function test_non_breaking_spaces_handled_as_spaces()
+    {
+        $page = $this->entities->newPage(['html' => '<p>a&nbsp;tigerbadger is a dangerous&nbsp;animal</p>']);
+
+        $scoreByTerm = $page->searchTerms()->pluck('score', 'term');
+        $this->assertNotNull($scoreByTerm->get('tigerbadger'));
+        $this->assertNotNull($scoreByTerm->get('dangerous'));
+        $this->assertNotNull($scoreByTerm->get('animal'));
+    }
 }

From a5751a584c09934cd7b214e2e812276ddfd669e2 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Tue, 17 Jun 2025 15:16:25 +0100
Subject: [PATCH 573/666] Updated translations with latest Crowdin changes
 (#5637)

---
 lang/cs/common.php            |  4 ++--
 lang/cs/entities.php          | 22 +++++++++++-----------
 lang/de/common.php            |  4 ++--
 lang/de/entities.php          | 22 +++++++++++-----------
 lang/de_informal/common.php   |  4 ++--
 lang/de_informal/entities.php | 22 +++++++++++-----------
 lang/es/common.php            |  4 ++--
 lang/es/entities.php          | 22 +++++++++++-----------
 lang/es_AR/entities.php       |  2 +-
 lang/et/entities.php          |  2 +-
 lang/fi/errors.php            | 26 +++++++++++++-------------
 lang/it/common.php            |  4 ++--
 lang/it/entities.php          | 20 ++++++++++----------
 lang/ja/common.php            |  4 ++--
 lang/ja/entities.php          | 22 +++++++++++-----------
 lang/nl/common.php            |  4 ++--
 lang/nl/entities.php          | 24 ++++++++++++------------
 lang/pt_BR/common.php         |  4 ++--
 lang/pt_BR/entities.php       | 22 +++++++++++-----------
 lang/zh_TW/activities.php     |  2 +-
 lang/zh_TW/errors.php         |  2 +-
 21 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/lang/cs/common.php b/lang/cs/common.php
index 32d8f4b61da..25c32b0397c 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -30,8 +30,8 @@
     'create' => 'Vytvořit',
     'update' => 'Aktualizovat',
     'edit' => 'Upravit',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archivovat',
+    'unarchive' => 'Od-Archivovat',
     'sort' => 'Seřadit',
     'move' => 'Přesunout',
     'copy' => 'Kopírovat',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 3af8f389b33..eaeac76c525 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
     'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Přepnout na nový WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(V beta testování)',
     'pages_edit_set_changelog' => 'Nastavit protokol změn',
     'pages_edit_enter_changelog_desc' => 'Zadejte stručný popis změn, které jste provedli',
     'pages_edit_enter_changelog' => 'Zadejte protokol změn',
@@ -392,11 +392,11 @@
     'comment' => 'Komentář',
     'comments' => 'Komentáře',
     'comment_add' => 'Přidat komentář',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Žádné komentáře k zobrazení',
     'comment_placeholder' => 'Zde zadejte komentář',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count vlákno komentáře|:count vláken komentářů',
+    'comment_archived_count' => ':count archivováno',
+    'comment_archived_threads' => 'Archivovaná vlákna',
     'comment_save' => 'Uložit komentář',
     'comment_new' => 'Nový komentář',
     'comment_created' => 'komentováno :createDiff',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Komentář odstraněn',
     'comment_created_success' => 'Komentář přidán',
     'comment_updated_success' => 'Komentář aktualizován',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Komentář archivován',
+    'comment_unarchive_success' => 'Komentář od-archivován',
+    'comment_view' => 'Zobrazit komentář',
+    'comment_jump_to_thread' => 'Přejít na vlákno',
     'comment_delete_confirm' => 'Opravdu chcete odstranit tento komentář?',
     'comment_in_reply_to' => 'Odpověď na :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Odkaz',
+    'comment_reference_outdated' => '(Zastaralý)',
     'comment_editor_explain' => 'Zde jsou komentáře, které zůstaly na této stránce. Komentáře lze přidat a spravovat při prohlížení uložené stránky.',
 
     // Revision
diff --git a/lang/de/common.php b/lang/de/common.php
index bbf8d8f238a..4f2ae54d272 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -30,8 +30,8 @@
     'create' => 'Erstellen',
     'update' => 'Aktualisieren',
     'edit' => 'Bearbeiten',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archivieren',
+    'unarchive' => 'Nicht mehr archivieren',
     'sort' => 'Sortieren',
     'move' => 'Verschieben',
     'copy' => 'Kopieren',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 2b86577452c..144a93636a6 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
     'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Im Beta-Test)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,11 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Keine Kommentare vorhanden',
     'comment_placeholder' => 'Geben Sie hier Ihre Kommentare ein',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Thema|:count Themen',
+    'comment_archived_count' => ':count archiviert',
+    'comment_archived_threads' => 'Archivierte Themen',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
     'comment_created' => ':createDiff kommentiert',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Kommentar gelöscht',
     'comment_created_success' => 'Kommentar hinzugefügt',
     'comment_updated_success' => 'Kommentar aktualisiert',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Kommentar archiviert',
+    'comment_unarchive_success' => 'Kommentar nicht mehr archiviert',
+    'comment_view' => 'Kommentar ansehen',
+    'comment_jump_to_thread' => 'Zum Thema springen',
     'comment_delete_confirm' => 'Möchten Sie diesen Kommentar wirklich löschen?',
     'comment_in_reply_to' => 'Antwort auf :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referenz',
+    'comment_reference_outdated' => '(Veraltet)',
     'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
 
     // Revision
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index 47ba2683497..d07fa056fd5 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -30,8 +30,8 @@
     'create' => 'Anlegen',
     'update' => 'Aktualisieren',
     'edit' => 'Bearbeiten',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archivieren',
+    'unarchive' => 'Nicht mehr archivieren',
     'sort' => 'Sortieren',
     'move' => 'Verschieben',
     'copy' => 'Kopieren',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 12a3dd8fe9a..d78addf2a42 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
     'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
     'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Im Beta-Test)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
     'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,11 +392,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentare',
     'comment_add' => 'Kommentieren',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Keine Kommentare vorhanden',
     'comment_placeholder' => 'Gib hier deine Kommentare ein',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Thema|:count Themen',
+    'comment_archived_count' => ':count archiviert',
+    'comment_archived_threads' => 'Archivierte Themen',
     'comment_save' => 'Kommentar speichern',
     'comment_new' => 'Neuer Kommentar',
     'comment_created' => ':createDiff kommentiert',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Kommentar gelöscht',
     'comment_created_success' => 'Kommentar hinzugefügt',
     'comment_updated_success' => 'Kommentar aktualisiert',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Kommentar archiviert',
+    'comment_unarchive_success' => 'Kommentar nicht mehr archiviert',
+    'comment_view' => 'Kommentar ansehen',
+    'comment_jump_to_thread' => 'Zum Thema springen',
     'comment_delete_confirm' => 'Möchtst du diesen Kommentar wirklich löschen?',
     'comment_in_reply_to' => 'Antwort auf :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referenz',
+    'comment_reference_outdated' => '(Veraltet)',
     'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
 
     // Revision
diff --git a/lang/es/common.php b/lang/es/common.php
index cff4fced6f6..399d1d862aa 100644
--- a/lang/es/common.php
+++ b/lang/es/common.php
@@ -30,8 +30,8 @@
     'create' => 'Crear',
     'update' => 'Actualizar',
     'edit' => 'Editar',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archivar',
+    'unarchive' => 'Desarchivar',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index bff9ff47e9d..303730f039a 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En prueba beta)',
     'pages_edit_set_changelog' => 'Ajustar Log de cambios',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar al Log de cambios',
@@ -392,11 +392,11 @@
     'comment' => 'Comentario',
     'comments' => 'Comentarios',
     'comment_add' => 'Añadir Comentario',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'No hay comentarios para mostrar',
     'comment_placeholder' => 'Introduzca su comentario aquí',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count hilo de comentarios|:count hilos de comentarios',
+    'comment_archived_count' => ':count Archivados',
+    'comment_archived_threads' => 'Hilos archivados',
     'comment_save' => 'Guardar comentario',
     'comment_new' => 'Nuevo Comentario',
     'comment_created' => 'comentado :createDiff',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Comentario borrado',
     'comment_created_success' => 'Comentario añadido',
     'comment_updated_success' => 'Comentario actualizado',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Comentario archivado',
+    'comment_unarchive_success' => 'Comentario desarchivado',
+    'comment_view' => 'Ver comentario',
+    'comment_jump_to_thread' => 'Ir al hilo',
     'comment_delete_confirm' => '¿Está seguro de que quiere borrar este comentario?',
     'comment_in_reply_to' => 'En respuesta a :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referencia',
+    'comment_reference_outdated' => '(obsoleto)',
     'comment_editor_explain' => 'Estos son los comentarios que se han escrito en esta página. Los comentarios se pueden añadir y administrar cuando se ve la página guardada.',
 
     // Revision
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index bb21300c2fe..729d190278a 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenido Estable)',
     'pages_edit_switch_to_wysiwyg' => 'Cambiar a Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Cambiar a nuevo editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En prueba beta)',
     'pages_edit_set_changelog' => 'Establecer cambios de registro',
     'pages_edit_enter_changelog_desc' => 'Introduzca una breve descripción de los cambios que ha realizado',
     'pages_edit_enter_changelog' => 'Entrar en cambio de registro',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index dc263081b33..cc34d0a77b6 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiilne sisu)',
     'pages_edit_switch_to_wysiwyg' => 'Kasuta WYSIWYG redaktorit',
     'pages_edit_switch_to_new_wysiwyg' => 'Kasuta uut tekstiredaktorit',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(beetatestimisel)',
     'pages_edit_set_changelog' => 'Muudatuste logi',
     'pages_edit_enter_changelog_desc' => 'Sisesta tehtud muudatuste lühikirjeldus',
     'pages_edit_enter_changelog' => 'Salvesta muudatuste logi',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index d948b556bf8..9af7490d521 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Sähköpostiosoite :email on jo käytössä toisessa käyttäjätunnuksessa.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Käyttäjätiliä ei voitu rekisteröidä annetuille tiedoille',
     'email_already_confirmed' => 'Sähköposti on jo vahvistettu, yritä kirjautua sisään.',
     'email_confirmation_invalid' => 'Tämä vahvistuslinkki ei ole voimassa tai sitä on jo käytetty, yritä rekisteröityä uudelleen.',
     'email_confirmation_expired' => 'Vahvistuslinkki on vanhentunut, uusi vahvistussähköposti on lähetetty.',
@@ -38,7 +38,7 @@
     'social_driver_not_found' => 'Sosiaalisen median tilin ajuria ei löytynyt',
     'social_driver_not_configured' => ':socialAccount-tilin asetuksia ei ole määritetty oikein.',
     'invite_token_expired' => 'Tämä kutsulinkki on vanhentunut. Voit sen sijaan yrittää palauttaa tilisi salasanan.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Käyttäjää tälle toiminnolle ei löytynyt.',
 
     // System
     'path_not_writable' => 'Tiedostopolkuun :filePath ei voitu ladata tiedostoa. Tarkista polun kirjoitusoikeudet.',
@@ -79,7 +79,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Ainoaa ylläpitäjää ei voi poistaa',
     'users_cannot_delete_guest' => 'Vieraskäyttäjää ei voi poistaa',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Käyttäjää ei voitu luoda kutsun lähettämisen jälkeen',
 
     // Roles
     'role_cannot_be_edited' => 'Tätä roolia ei voi muokata',
@@ -107,16 +107,16 @@
     'back_soon' => 'Se palautetaan pian.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'ZIP-tiedostoa ei voitu lukea.',
+    'import_zip_cant_decode_data' => 'ZIP-tiedoston data.json sisältöä ei löydy eikä sitä voitu purkaa.',
+    'import_zip_no_data' => 'ZIP-tiedostoilla ei ole odotettua kirjaa, lukua tai sivun sisältöä.',
+    'import_validation_failed' => 'Tuonti ZIP epäonnistui virheiden kanssa:',
+    'import_zip_failed_notification' => 'ZIP-tiedoston tuominen epäonnistui.',
+    'import_perms_books' => 'Sinulla ei ole tarvittavia oikeuksia luoda kirjoja.',
+    'import_perms_chapters' => 'Sinulla ei ole tarvittavia oikeuksia luoda kappaleita.',
+    'import_perms_pages' => 'Sinulla ei ole tarvittavia oikeuksia luoda sivuja.',
+    'import_perms_images' => 'Sinulla ei ole tarvittavia oikeuksia luoda kuvia.',
+    'import_perms_attachments' => 'Sinulla ei ole tarvittavaa lupaa luoda liitteitä.',
 
     // API errors
     'api_no_authorization_found' => 'Pyynnöstä ei löytynyt valtuutuskoodia',
diff --git a/lang/it/common.php b/lang/it/common.php
index fbbac2be7bb..9eba738a4e5 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -30,8 +30,8 @@
     'create' => 'Crea',
     'update' => 'Aggiorna',
     'edit' => 'Modifica',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archivia',
+    'unarchive' => 'Ripristina',
     'sort' => 'Ordina',
     'move' => 'Sposta',
     'copy' => 'Copia',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index b032997d698..d615b0c0624 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenuto stabile)',
     'pages_edit_switch_to_wysiwyg' => 'Passa all\'editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Passa al nuovo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Test)',
     'pages_edit_set_changelog' => 'Imposta changelog',
     'pages_edit_enter_changelog_desc' => 'Inserisci una breve descrizione dei cambiamenti che hai apportato',
     'pages_edit_enter_changelog' => 'Inserisci changelog',
@@ -392,11 +392,11 @@
     'comment' => 'Commento',
     'comments' => 'Commenti',
     'comment_add' => 'Aggiungi commento',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Nessun commento da visualizzare',
     'comment_placeholder' => 'Scrivi un commento',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_archived_count' => ':count Archiviato',
+    'comment_archived_threads' => 'Discussioni Archiviate',
     'comment_save' => 'Salva commento',
     'comment_new' => 'Nuovo commento',
     'comment_created' => 'ha commentato :createDiff',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Commento eliminato',
     'comment_created_success' => 'Commento aggiunto',
     'comment_updated_success' => 'Commento aggiornato',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Commento archiviato',
+    'comment_unarchive_success' => 'Commento ripristinato',
+    'comment_view' => 'Visualizza commento',
+    'comment_jump_to_thread' => 'Vai al thread',
     'comment_delete_confirm' => 'Sei sicuro di voler eliminare questo commento?',
     'comment_in_reply_to' => 'In risposta a :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Riferimento',
+    'comment_reference_outdated' => '(Obsoleto)',
     'comment_editor_explain' => 'Ecco i commenti che sono stati lasciati in questa pagina. I commenti possono essere aggiunti e gestiti quando si visualizza la pagina salvata.',
 
     // Revision
diff --git a/lang/ja/common.php b/lang/ja/common.php
index 73799db5bb2..e888c43f651 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -30,8 +30,8 @@
     'create' => '作成',
     'update' => '更新',
     'edit' => '編集',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'アーカイブ',
+    'unarchive' => 'アーカイブ解除',
     'sort' => '並び順',
     'move' => '移動',
     'copy' => 'コピー',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index c6449bb341a..cdb04b7b077 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(安定したコンテンツ)',
     'pages_edit_switch_to_wysiwyg' => 'WYSIWYGエディタに切り替え',
     'pages_edit_switch_to_new_wysiwyg' => '新しいWYSIWYGエディタに切り替える',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '（ベータテスト版）',
     'pages_edit_set_changelog' => '編集内容についての説明',
     'pages_edit_enter_changelog_desc' => 'どのような変更を行ったのかを記録してください',
     'pages_edit_enter_changelog' => '編集内容を入力',
@@ -393,11 +393,11 @@
     'comment' => 'コメント',
     'comments' => 'コメント',
     'comment_add' => 'コメント追加',
-    'comment_none' => 'No comments to display',
+    'comment_none' => '表示するコメントがありません',
     'comment_placeholder' => 'コメントを記入してください',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count 個のコメントスレッド|:count 個のコメントスレッド',
+    'comment_archived_count' => ':count 個のアーカイブ',
+    'comment_archived_threads' => 'アーカイブされたスレッド',
     'comment_save' => 'コメントを保存',
     'comment_new' => '新規コメント作成',
     'comment_created' => 'コメントを作成しました :createDiff',
@@ -406,14 +406,14 @@
     'comment_deleted_success' => 'コメントを削除しました',
     'comment_created_success' => 'コメントを追加しました',
     'comment_updated_success' => 'コメントを更新しました',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'コメントをアーカイブしました',
+    'comment_unarchive_success' => 'コメントのアーカイブを解除しました',
+    'comment_view' => 'コメントを表示',
+    'comment_jump_to_thread' => 'スレッドにジャンプ',
     'comment_delete_confirm' => '本当にこのコメントを削除しますか?',
     'comment_in_reply_to' => ':commentIdへ返信',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => '参照箇所',
+    'comment_reference_outdated' => '（以前の記述）',
     'comment_editor_explain' => 'ここにはページに付けられたコメントを表示します。 コメントの追加と管理は保存されたページの表示時に行うことができます。',
 
     // Revision
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 0feddcd5d7b..47d8703cad9 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -30,8 +30,8 @@
     'create' => 'Aanmaken',
     'update' => 'Bijwerken',
     'edit' => 'Bewerk',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archiveer',
+    'unarchive' => 'Terughalen',
     'sort' => 'Sorteer',
     'move' => 'Verplaats',
     'copy' => 'Kopieer',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 28f0ef3b935..a3f03a16cad 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Bijgewerkt: :timeLength',
     'meta_updated_name' => 'Bijgewerkt: :timeLength door :user',
     'meta_owned_name' => 'Eigendom van :user',
-    'meta_reference_count' => 'Gerefereerd door :count item|Gerefereerd door :count items',
+    'meta_reference_count' => 'Verwijzing in :count item|Verwijzing in :count items',
     'entity_select' => 'Entiteit selecteren',
     'entity_select_lack_permission' => 'Je hebt niet de vereiste machtiging om dit item te selecteren',
     'images' => 'Afbeeldingen',
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabiele Inhoud)',
     'pages_edit_switch_to_wysiwyg' => 'Schakel naar de WYSIWYG Bewerker',
     'pages_edit_switch_to_new_wysiwyg' => 'Schakel naar de nieuwe WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta-testfase)',
     'pages_edit_set_changelog' => 'Logboek instellen',
     'pages_edit_enter_changelog_desc' => 'Geef een korte omschrijving van de wijzigingen die je gemaakt hebt',
     'pages_edit_enter_changelog' => 'Voeg toe aan logboek',
@@ -392,11 +392,11 @@
     'comment' => 'Reactie',
     'comments' => 'Reacties',
     'comment_add' => 'Reactie toevoegen',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Geen opmerkingen om weer te geven',
     'comment_placeholder' => 'Laat hier een reactie achter',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Reactie Thread|:count Reactie Threads',
+    'comment_archived_count' => ':count Gearchiveerd',
+    'comment_archived_threads' => 'Gearchiveerde Threads',
     'comment_save' => 'Sla reactie op',
     'comment_new' => 'Nieuwe reactie',
     'comment_created' => 'reactie gegeven :createDiff',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Reactie verwijderd',
     'comment_created_success' => 'Reactie toegevoegd',
     'comment_updated_success' => 'Reactie bijgewerkt',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Opmerking gearchiveerd',
+    'comment_unarchive_success' => 'Opmerking teruggehaald',
+    'comment_view' => 'Opmerking weergeven',
+    'comment_jump_to_thread' => 'Ga naar thread',
     'comment_delete_confirm' => 'Weet je zeker dat je deze reactie wilt verwijderen?',
     'comment_in_reply_to' => 'Als antwoord op :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Verwijzing',
+    'comment_reference_outdated' => '(Verouderd)',
     'comment_editor_explain' => 'Hier zijn de opmerkingen die zijn achtergelaten op deze pagina. Opmerkingen kunnen worden toegevoegd en beheerd wanneer u de opgeslagen pagina bekijkt.',
 
     // Revision
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index 4529d1a4eef..b4ff95e99ed 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -35,8 +35,8 @@
     'create' => 'Criar',
     'update' => 'Atualizar',
     'edit' => 'Editar',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Arquivar',
+    'unarchive' => 'Desarquivar',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 6fc5d6775d8..3d3c7e78a42 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o Editor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Mudar para o novo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Em teste beta)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por você',
     'pages_edit_enter_changelog' => 'Insira Alterações',
@@ -392,11 +392,11 @@
     'comment' => 'Comentário',
     'comments' => 'Comentários',
     'comment_add' => 'Adicionar Comentário',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Nenhum comentário para exibir',
     'comment_placeholder' => 'Digite seus comentários aqui',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Tópico de Comentário|:count Tópicos de Comentários',
+    'comment_archived_count' => ':count Arquivado',
+    'comment_archived_threads' => 'Tópicos Arquivados',
     'comment_save' => 'Salvar comentário',
     'comment_new' => 'Novo Comentário',
     'comment_created' => 'comentado :createDiff',
@@ -405,14 +405,14 @@
     'comment_deleted_success' => 'Comentário removido',
     'comment_created_success' => 'Comentário adicionado',
     'comment_updated_success' => 'Comentário editado',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Comentário arquivado',
+    'comment_unarchive_success' => 'Comentário desarquivado',
+    'comment_view' => 'Ver comentário',
+    'comment_jump_to_thread' => 'Ir para o tópico',
     'comment_delete_confirm' => 'Você tem certeza de que deseja excluir este comentário?',
     'comment_in_reply_to' => 'Em resposta à :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referência',
+    'comment_reference_outdated' => '(Desatualizado)',
     'comment_editor_explain' => 'Aqui estão os comentários que foram deixados nesta página. Comentários podem ser adicionados e gerenciados ao visualizar a página salva.',
 
     // Revision
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index d33e4d4b742..65ba0a56597 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -47,7 +47,7 @@
     'bookshelf_update'                 => '更新書棧',
     'bookshelf_update_notification'    => '書棧已更新',
     'bookshelf_delete'                 => '刪除書棧',
-    'bookshelf_delete_notification'    => '書棧已刪除',
+    'bookshelf_delete_notification'    => '書架已刪除',
 
     // Revisions
     'revision_restore' => '還原的版本',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index 7a42ce5119c..d4239ed6c64 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -67,7 +67,7 @@
 
     // Entities
     'entity_not_found' => '找不到實體',
-    'bookshelf_not_found' => '未找到書棧',
+    'bookshelf_not_found' => '未找到書架',
     'book_not_found' => '找不到書本',
     'page_not_found' => '找不到頁面',
     'chapter_not_found' => '找不到章節',

From c4839c783ae0ac678c5a3a3eb7f47ac360793816 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 17 Jun 2025 15:29:12 +0100
Subject: [PATCH 574/666] Updated translator & dependency attribution before
 release v25.05.1

---
 .github/translators.txt                | 2 ++
 dev/licensing/php-library-licenses.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index aab08d76413..01260990a24 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -487,3 +487,5 @@ jellium :: French
 Qxlkdr :: Swedish
 Hari (muhhari) :: Indonesian
 仙君御 (xjy) :: Chinese Simplified
+TapioM :: Finnish
+lingb58 :: Chinese Traditional
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 86e40a055b6..30b74ece051 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -486,7 +486,7 @@ Link: https://github.com/ramsey/collection.git
 ramsey/uuid
 License: MIT
 License File: vendor/ramsey/uuid/LICENSE
-Copyright: Copyright (c) 2012-2023 Ben Ramsey <***@*********.***>
+Copyright: Copyright (c) 2012-2025 Ben Ramsey <***@*********.***>
 Source: https://github.com/ramsey/uuid.git
 Link: https://github.com/ramsey/uuid.git
 -----------

From 3617ab1540840ca1b12ee6dd40e3eeccbfffc94b Mon Sep 17 00:00:00 2001
From: Shresth Kapoor <shresthkapoor7@gmail.com>
Date: Wed, 18 Jun 2025 20:10:20 -0400
Subject: [PATCH 575/666] Enhance changelog input to textarea with character
 counter

---
 resources/js/components/page-editor.js             |  7 ++++++-
 .../views/pages/parts/editor-toolbar.blade.php     | 14 +++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 81378e944c0..2a155f37fb8 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -75,7 +75,12 @@ export class PageEditor extends Component {
 
         // Changelog controls
         const updateChangelogDebounced = debounce(this.updateChangelogDisplay.bind(this), 300, false);
-        this.changelogInput.addEventListener('input', updateChangelogDebounced);
+        this.changelogInput.addEventListener('input', () => {
+            const count = this.changelogInput.value.length;
+            const counterEl = document.getElementById('changelog-count');
+            if (counterEl) counterEl.innerText = `${count} / 250`;
+            updateChangelogDebounced();
+        });
 
         // Draft Controls
         onSelect(this.saveDraftButton, this.saveDraft.bind(this));
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index 341fbf67d6c..deddc3cd321 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -106,11 +106,15 @@ class="dropdown-container">
             <ul refs="dropdown@menu" class="wide dropdown-menu">
                 <li class="px-l py-m">
                     <p class="text-muted pb-s">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
-                    <input refs="page-editor@changelogInput"
-                           name="summary"
-                           id="summary-input"
-                           type="text"
-                           placeholder="{{ trans('entities.pages_edit_enter_changelog') }}" />
+                    <textarea
+                        refs="page-editor@changelogInput"
+                        name="summary"
+                        id="summary-input"
+                        rows="2"
+                        maxlength="250"
+                        placeholder="{{ trans('entities.pages_edit_enter_changelog') }}"
+                    ></textarea>
+                    <small class="text-muted mt-xs" id="changelog-count">0 / 250</small>
                 </li>
             </ul>
             <span>{{-- Prevents button jumping on menu show --}}</span>

From 3476d83ecc552d216798807c0c9437e96c19054f Mon Sep 17 00:00:00 2001
From: bumperbox <bumperbox@gmail.com>
Date: Mon, 23 Jun 2025 09:31:39 +1200
Subject: [PATCH 576/666] CommentDisplayTest correct namespace

Class Entity\CommentDisplayTest located in ./tests/Entity/CommentDisplayTest.php does not comply with psr-4 autoloading standard (rule: Tests\ => ./tests). Skipping.
---
 tests/Entity/CommentDisplayTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Entity/CommentDisplayTest.php b/tests/Entity/CommentDisplayTest.php
index 4e9640baeed..22e96c250b9 100644
--- a/tests/Entity/CommentDisplayTest.php
+++ b/tests/Entity/CommentDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace Tests\Entity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Comment;

From c606970e38625d1d41c0707c4aca37249fb55a1b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 24 Jun 2025 17:47:53 +0100
Subject: [PATCH 577/666] Lexical: Started comment implementation

Refactors some UI and toolbar code for better abstract use across editor
versions.
---
 resources/js/wysiwyg/index.ts                 | 102 ++++++++++------
 resources/js/wysiwyg/ui/defaults/toolbars.ts  | 109 ++++++++++--------
 resources/js/wysiwyg/ui/framework/manager.ts  |   2 +-
 resources/js/wysiwyg/ui/framework/toolbars.ts |   2 +-
 resources/js/wysiwyg/ui/index.ts              |  78 ++++---------
 5 files changed, 149 insertions(+), 144 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 7ecf91d230e..8e98780d585 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,4 +1,4 @@
-import {$getSelection, createEditor, CreateEditorArgs, LexicalEditor} from 'lexical';
+import {createEditor, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
@@ -11,65 +11,66 @@ import {listen as listenToCommonEvents} from "./services/common-events";
 import {registerDropPasteHandling} from "./services/drop-paste-handling";
 import {registerTaskListHandler} from "./ui/framework/helpers/task-list-handler";
 import {registerTableSelectionHandler} from "./ui/framework/helpers/table-selection-handler";
-import {el} from "./utils/dom";
 import {registerShortcuts} from "./services/shortcuts";
 import {registerNodeResizer} from "./ui/framework/helpers/node-resizer";
 import {registerKeyboardHandling} from "./services/keyboard-handling";
 import {registerAutoLinks} from "./services/auto-links";
+import {contextToolbars, getMainEditorFullToolbar} from "./ui/defaults/toolbars";
+import {modals} from "./ui/defaults/modals";
+import {CodeBlockDecorator} from "./ui/decorators/code-block";
+import {DiagramDecorator} from "./ui/decorators/diagram";
+
+const theme = {
+    text: {
+        bold: 'editor-theme-bold',
+        code: 'editor-theme-code',
+        italic: 'editor-theme-italic',
+        strikethrough: 'editor-theme-strikethrough',
+        subscript: 'editor-theme-subscript',
+        superscript: 'editor-theme-superscript',
+        underline: 'editor-theme-underline',
+        underlineStrikethrough: 'editor-theme-underline-strikethrough',
+    }
+};
 
 export function createPageEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
-    const config: CreateEditorArgs = {
+    const editor = createEditor({
         namespace: 'BookStackPageEditor',
         nodes: getNodesForPageEditor(),
         onError: console.error,
-        theme: {
-            text: {
-                bold: 'editor-theme-bold',
-                code: 'editor-theme-code',
-                italic: 'editor-theme-italic',
-                strikethrough: 'editor-theme-strikethrough',
-                subscript: 'editor-theme-subscript',
-                superscript: 'editor-theme-superscript',
-                underline: 'editor-theme-underline',
-                underlineStrikethrough: 'editor-theme-underline-strikethrough',
-            }
-        }
-    };
-
-    const editArea = el('div', {
-        contenteditable: 'true',
-        class: 'editor-content-area page-content',
+        theme: theme,
     });
-    const editWrap = el('div', {
-        class: 'editor-content-wrap',
-    }, [editArea]);
-
-    container.append(editWrap);
-    container.classList.add('editor-container');
-    container.setAttribute('dir', options.textDirection);
-    if (options.darkMode) {
-        container.classList.add('editor-dark');
-    }
-
-    const editor = createEditor(config);
-    editor.setRootElement(editArea);
-    const context: EditorUiContext = buildEditorUI(container, editArea, editWrap, editor, options);
+    const context: EditorUiContext = buildEditorUI(container, editor, {
+        ...options,
+        editorClass: 'page-content',
+    });
+    editor.setRootElement(context.editorDOM);
 
     mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerShortcuts(context),
         registerKeyboardHandling(context),
-        registerTableResizer(editor, editWrap),
+        registerTableResizer(editor, context.scrollDOM),
         registerTableSelectionHandler(editor),
-        registerTaskListHandler(editor, editArea),
+        registerTaskListHandler(editor, context.editorDOM),
         registerDropPasteHandling(context),
         registerNodeResizer(context),
         registerAutoLinks(editor),
     );
 
-    listenToCommonEvents(editor);
+    // Register toolbars, modals & decorators
+    context.manager.setToolbar(getMainEditorFullToolbar(context));
+    for (const key of Object.keys(contextToolbars)) {
+        context.manager.registerContextToolbar(key, contextToolbars[key]);
+    }
+    for (const key of Object.keys(modals)) {
+        context.manager.registerModal(key, modals[key]);
+    }
+    context.manager.registerDecoratorType('code', CodeBlockDecorator);
+    context.manager.registerDecoratorType('diagram', DiagramDecorator);
 
+    listenToCommonEvents(editor);
     setEditorContentFromHtml(editor, htmlContent);
 
     const debugView = document.getElementById('lexical-debug');
@@ -92,6 +93,33 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     return new SimpleWysiwygEditorInterface(editor);
 }
 
+export function createCommentEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
+    const editor = createEditor({
+        namespace: 'BookStackCommentEditor',
+        nodes: getNodesForPageEditor(),
+        onError: console.error,
+        theme: theme,
+    });
+    const context: EditorUiContext = buildEditorUI(container, editor, options);
+    editor.setRootElement(context.editorDOM);
+
+    mergeRegister(
+        registerRichText(editor),
+        registerHistory(editor, createEmptyHistoryState(), 300),
+        registerShortcuts(context),
+        registerAutoLinks(editor),
+    );
+
+    // Register toolbars, modals & decorators
+    context.manager.setToolbar(getMainEditorFullToolbar(context)); // TODO - Create comment toolbar
+    context.manager.registerContextToolbar('link', contextToolbars.link);
+    context.manager.registerModal('link', modals.link);
+
+    setEditorContentFromHtml(editor, htmlContent);
+
+    return new SimpleWysiwygEditorInterface(editor);
+}
+
 export class SimpleWysiwygEditorInterface {
     protected editor: LexicalEditor;
 
diff --git a/resources/js/wysiwyg/ui/defaults/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
index cdc451d088b..fc413bb8f80 100644
--- a/resources/js/wysiwyg/ui/defaults/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -79,6 +79,7 @@ import {
 import {el} from "../../utils/dom";
 import {EditorButtonWithMenu} from "../framework/blocks/button-with-menu";
 import {EditorSeparator} from "../framework/blocks/separator";
+import {EditorContextToolbarDefinition} from "../framework/toolbars";
 
 export function getMainEditorFullToolbar(context: EditorUiContext): EditorContainerUiElement {
 
@@ -220,50 +221,64 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
     ]);
 }
 
-export function getImageToolbarContent(): EditorUiElement[] {
-    return [new EditorButton(image)];
-}
-
-export function getMediaToolbarContent(): EditorUiElement[] {
-    return [new EditorButton(media)];
-}
-
-export function getLinkToolbarContent(): EditorUiElement[] {
-    return [
-        new EditorButton(link),
-        new EditorButton(unlink),
-    ];
-}
-
-export function getCodeToolbarContent(): EditorUiElement[] {
-    return [
-        new EditorButton(editCodeBlock),
-    ];
-}
-
-export function getTableToolbarContent(): EditorUiElement[] {
-    return [
-        new EditorOverflowContainer(2, [
-            new EditorButton(tableProperties),
-            new EditorButton(deleteTable),
-        ]),
-        new EditorOverflowContainer(3, [
-            new EditorButton(insertRowAbove),
-            new EditorButton(insertRowBelow),
-            new EditorButton(deleteRow),
-        ]),
-        new EditorOverflowContainer(3, [
-            new EditorButton(insertColumnBefore),
-            new EditorButton(insertColumnAfter),
-            new EditorButton(deleteColumn),
-        ]),
-    ];
-}
-
-export function getDetailsToolbarContent(): EditorUiElement[] {
-    return [
-        new EditorButton(detailsEditLabel),
-        new EditorButton(detailsToggle),
-        new EditorButton(detailsUnwrap),
-    ];
-}
\ No newline at end of file
+export const contextToolbars: Record<string, EditorContextToolbarDefinition> = {
+    image: {
+        selector: 'img:not([drawio-diagram] img)',
+        content: () => [new EditorButton(image)],
+    },
+    media: {
+        selector: '.editor-media-wrap',
+        content: () => [new EditorButton(media)],
+    },
+    link: {
+        selector: 'a',
+        content() {
+            return [
+                new EditorButton(link),
+                new EditorButton(unlink),
+            ]
+        },
+        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
+            const image = originalTarget.querySelector('img');
+            return image || originalTarget;
+        }
+    },
+    code: {
+        selector: '.editor-code-block-wrap',
+        content: () => [new EditorButton(editCodeBlock)],
+    },
+    table: {
+        selector: 'td,th',
+        content() {
+            return [
+                new EditorOverflowContainer(2, [
+                    new EditorButton(tableProperties),
+                    new EditorButton(deleteTable),
+                ]),
+                new EditorOverflowContainer(3, [
+                    new EditorButton(insertRowAbove),
+                    new EditorButton(insertRowBelow),
+                    new EditorButton(deleteRow),
+                ]),
+                new EditorOverflowContainer(3, [
+                    new EditorButton(insertColumnBefore),
+                    new EditorButton(insertColumnAfter),
+                    new EditorButton(deleteColumn),
+                ]),
+            ];
+        },
+        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
+            return originalTarget.closest('table') as HTMLTableElement;
+        }
+    },
+    details: {
+        selector: 'details',
+        content() {
+            return [
+                new EditorButton(detailsEditLabel),
+                new EditorButton(detailsToggle),
+                new EditorButton(detailsUnwrap),
+            ]
+        },
+    },
+};
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 2d15b341bdb..c40206607c6 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -198,7 +198,7 @@ export class EditorUIManager {
                     contentByTarget.set(targetEl, [])
                 }
                 // @ts-ignore
-                contentByTarget.get(targetEl).push(...definition.content);
+                contentByTarget.get(targetEl).push(...definition.content());
             }
         }
 
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index de2255444eb..323b1745008 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -4,7 +4,7 @@ import {el} from "../../utils/dom";
 
 export type EditorContextToolbarDefinition = {
     selector: string;
-    content: EditorUiElement[],
+    content: () => EditorUiElement[],
     displayTargetLocator?: (originalTarget: HTMLElement) => HTMLElement;
 };
 
diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index e7ec6adbcd5..c48386bb492 100644
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,23 +1,30 @@
 import {LexicalEditor} from "lexical";
-import {
-    getCodeToolbarContent, getDetailsToolbarContent,
-    getImageToolbarContent,
-    getLinkToolbarContent,
-    getMainEditorFullToolbar, getMediaToolbarContent, getTableToolbarContent
-} from "./defaults/toolbars";
 import {EditorUIManager} from "./framework/manager";
 import {EditorUiContext} from "./framework/core";
-import {CodeBlockDecorator} from "./decorators/code-block";
-import {DiagramDecorator} from "./decorators/diagram";
-import {modals} from "./defaults/modals";
+import {el} from "../utils/dom";
+
+export function buildEditorUI(containerDOM: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
+    const editorDOM = el('div', {
+        contenteditable: 'true',
+        class: `editor-content-area ${options.editorClass || ''}`,
+    });
+    const scrollDOM = el('div', {
+        class: 'editor-content-wrap',
+    }, [editorDOM]);
+
+    containerDOM.append(scrollDOM);
+    containerDOM.classList.add('editor-container');
+    containerDOM.setAttribute('dir', options.textDirection);
+    if (options.darkMode) {
+        containerDOM.classList.add('editor-dark');
+    }
 
-export function buildEditorUI(container: HTMLElement, element: HTMLElement, scrollContainer: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
     const manager = new EditorUIManager();
     const context: EditorUiContext = {
         editor,
-        containerDOM: container,
-        editorDOM: element,
-        scrollDOM: scrollContainer,
+        containerDOM: containerDOM,
+        editorDOM: editorDOM,
+        scrollDOM: scrollDOM,
         manager,
         translate(text: string): string {
             const translations = options.translations;
@@ -31,50 +38,5 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
     };
     manager.setContext(context);
 
-    // Create primary toolbar
-    manager.setToolbar(getMainEditorFullToolbar(context));
-
-    // Register modals
-    for (const key of Object.keys(modals)) {
-        manager.registerModal(key, modals[key]);
-    }
-
-    // Register context toolbars
-    manager.registerContextToolbar('image', {
-        selector: 'img:not([drawio-diagram] img)',
-        content: getImageToolbarContent(),
-    });
-    manager.registerContextToolbar('media', {
-        selector: '.editor-media-wrap',
-        content: getMediaToolbarContent(),
-    });
-    manager.registerContextToolbar('link', {
-        selector: 'a',
-        content: getLinkToolbarContent(),
-        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
-            const image = originalTarget.querySelector('img');
-            return image || originalTarget;
-        }
-    });
-    manager.registerContextToolbar('code', {
-        selector: '.editor-code-block-wrap',
-        content: getCodeToolbarContent(),
-    });
-    manager.registerContextToolbar('table', {
-        selector: 'td,th',
-        content: getTableToolbarContent(),
-        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
-            return originalTarget.closest('table') as HTMLTableElement;
-        }
-    });
-    manager.registerContextToolbar('details', {
-        selector: 'details',
-        content: getDetailsToolbarContent(),
-    });
-
-    // Register image decorator listener
-    manager.registerDecoratorType('code', CodeBlockDecorator);
-    manager.registerDecoratorType('diagram', DiagramDecorator);
-
     return context;
 }
\ No newline at end of file

From b80992ca59a4803fe81d577add6a0611e976c83b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 25 Jun 2025 14:16:01 +0100
Subject: [PATCH 578/666] Comments: Switched to lexical editor

Required a lot of changes to provide at least a decent attempt at proper
editor teardown control.
Also updates HtmlDescriptionFilter and testing to address issue with bad
child iteration which could lead to missed items.
Renamed editor version from comments to basic as it'll also be used for
item descriptions.
---
 app/Util/HtmlDescriptionFilter.php            |  6 +--
 resources/js/components/page-comment.ts       | 34 +++++++------
 resources/js/components/page-comments.ts      | 33 ++++++-------
 resources/js/wysiwyg/index.ts                 | 38 +++++++++------
 resources/js/wysiwyg/nodes.ts                 | 14 ++++--
 resources/js/wysiwyg/ui/defaults/toolbars.ts  | 10 ++++
 resources/js/wysiwyg/ui/framework/core.ts     | 17 ++++++-
 .../js/wysiwyg/ui/framework/decorator.ts      |  2 +-
 .../wysiwyg/ui/framework/helpers/dropdowns.ts | 15 ++++--
 resources/js/wysiwyg/ui/framework/manager.ts  | 48 +++++++++++++++----
 resources/js/wysiwyg/ui/framework/modals.ts   |  2 +-
 resources/js/wysiwyg/ui/framework/toolbars.ts | 13 -----
 resources/js/wysiwyg/utils/actions.ts         |  2 +-
 resources/views/comments/comment.blade.php    |  1 -
 resources/views/comments/comments.blade.php   |  2 -
 tests/Entity/CommentStoreTest.php             | 31 ++++++++++--
 16 files changed, 176 insertions(+), 92 deletions(-)

diff --git a/app/Util/HtmlDescriptionFilter.php b/app/Util/HtmlDescriptionFilter.php
index cb091b869f8..d4f7d2c8fa2 100644
--- a/app/Util/HtmlDescriptionFilter.php
+++ b/app/Util/HtmlDescriptionFilter.php
@@ -4,7 +4,6 @@
 
 use DOMAttr;
 use DOMElement;
-use DOMNamedNodeMap;
 use DOMNode;
 
 /**
@@ -25,6 +24,7 @@ class HtmlDescriptionFilter
         'ul' => [],
         'li' => [],
         'strong' => [],
+        'span' => [],
         'em' => [],
         'br' => [],
     ];
@@ -59,7 +59,6 @@ protected static function filterElement(DOMElement $element): void
             return;
         }
 
-        /** @var DOMNamedNodeMap $attrs */
         $attrs = $element->attributes;
         for ($i = $attrs->length - 1; $i >= 0; $i--) {
             /** @var DOMAttr $attr */
@@ -70,7 +69,8 @@ protected static function filterElement(DOMElement $element): void
             }
         }
 
-        foreach ($element->childNodes as $child) {
+        $childNodes = [...$element->childNodes];
+        foreach ($childNodes as $child) {
             if ($child instanceof DOMElement) {
                 static::filterElement($child);
             }
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index a0bb7a55bf8..8334ebb8a09 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -1,8 +1,9 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from '../wysiwyg-tinymce/config';
 import {PageCommentReference} from "./page-comment-reference";
 import {HttpError} from "../services/http";
+import {SimpleWysiwygEditorInterface} from "../wysiwyg";
+import {el} from "../wysiwyg/utils/dom";
 
 export interface PageCommentReplyEventData {
     id: string; // ID of comment being replied to
@@ -21,8 +22,7 @@ export class PageComment extends Component {
     protected updatedText!: string;
     protected archiveText!: string;
 
-    protected wysiwygEditor: any = null;
-    protected wysiwygLanguage!: string;
+    protected wysiwygEditor: SimpleWysiwygEditorInterface|null = null;
     protected wysiwygTextDirection!: string;
 
     protected container!: HTMLElement;
@@ -44,7 +44,6 @@ export class PageComment extends Component {
         this.archiveText = this.$opts.archiveText;
 
         // Editor reference and text options
-        this.wysiwygLanguage = this.$opts.wysiwygLanguage;
         this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
 
         // Element references
@@ -90,7 +89,7 @@ export class PageComment extends Component {
         this.form.toggleAttribute('hidden', !show);
     }
 
-    protected startEdit() : void {
+    protected async startEdit(): Promise<void> {
         this.toggleEditMode(true);
 
         if (this.wysiwygEditor) {
@@ -98,21 +97,20 @@ export class PageComment extends Component {
             return;
         }
 
-        const config = buildForInput({
-            language: this.wysiwygLanguage,
-            containerElement: this.input,
+        type WysiwygModule = typeof import('../wysiwyg');
+        const wysiwygModule = (await window.importVersioned('wysiwyg')) as WysiwygModule;
+        const editorContent = this.input.value;
+        const container = el('div', {class: 'comment-editor-container'});
+        this.input.parentElement?.appendChild(container);
+        this.input.hidden = true;
+
+        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, editorContent, {
             darkMode: document.documentElement.classList.contains('dark-mode'),
-            textDirection: this.wysiwygTextDirection,
-            drawioUrl: '',
-            pageId: 0,
-            translations: {},
-            translationMap: (window as unknown as Record<string, Object>).editor_translations,
+            textDirection: this.$opts.textDirection,
+            translations: (window as unknown as Record<string, Object>).editor_translations,
         });
 
-        (window as unknown as {tinymce: {init: (arg0: Object) => Promise<any>}}).tinymce.init(config).then(editors => {
-            this.wysiwygEditor = editors[0];
-            setTimeout(() => this.wysiwygEditor.focus(), 50);
-        });
+        this.wysiwygEditor.focus();
     }
 
     protected async update(event: Event): Promise<void> {
@@ -121,7 +119,7 @@ export class PageComment extends Component {
         this.form.toggleAttribute('hidden', true);
 
         const reqData = {
-            html: this.wysiwygEditor.getContent(),
+            html: await this.wysiwygEditor?.getContentAsHtml() || '',
         };
 
         try {
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index 5c1cd014c54..e988343cabb 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -1,10 +1,11 @@
 import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
-import {buildForInput} from '../wysiwyg-tinymce/config';
 import {Tabs} from "./tabs";
 import {PageCommentReference} from "./page-comment-reference";
 import {scrollAndHighlightElement} from "../services/util";
 import {PageCommentArchiveEventData, PageCommentReplyEventData} from "./page-comment";
+import {el} from "../wysiwyg/utils/dom";
+import {SimpleWysiwygEditorInterface} from "../wysiwyg";
 
 export class PageComments extends Component {
 
@@ -28,9 +29,8 @@ export class PageComments extends Component {
     private hideFormButton!: HTMLElement;
     private removeReplyToButton!: HTMLElement;
     private removeReferenceButton!: HTMLElement;
-    private wysiwygLanguage!: string;
     private wysiwygTextDirection!: string;
-    private wysiwygEditor: any = null;
+    private wysiwygEditor: SimpleWysiwygEditorInterface|null = null;
     private createdText!: string;
     private countText!: string;
     private archivedCountText!: string;
@@ -63,7 +63,6 @@ export class PageComments extends Component {
         this.removeReferenceButton = this.$refs.removeReferenceButton;
 
         // WYSIWYG options
-        this.wysiwygLanguage = this.$opts.wysiwygLanguage;
         this.wysiwygTextDirection = this.$opts.wysiwygTextDirection;
 
         // Translations
@@ -107,7 +106,7 @@ export class PageComments extends Component {
         }
     }
 
-    protected saveComment(event: SubmitEvent): void {
+    protected async saveComment(event: SubmitEvent): Promise<void> {
         event.preventDefault();
         event.stopPropagation();
 
@@ -117,7 +116,7 @@ export class PageComments extends Component {
         this.form.toggleAttribute('hidden', true);
 
         const reqData = {
-            html: this.wysiwygEditor.getContent(),
+            html: (await this.wysiwygEditor?.getContentAsHtml()) || '',
             parent_id: this.parentId || null,
             content_ref: this.contentReference,
         };
@@ -189,27 +188,25 @@ export class PageComments extends Component {
         this.addButtonContainer.toggleAttribute('hidden', false);
     }
 
-    protected loadEditor(): void {
+    protected async loadEditor(): Promise<void> {
         if (this.wysiwygEditor) {
             this.wysiwygEditor.focus();
             return;
         }
 
-        const config = buildForInput({
-            language: this.wysiwygLanguage,
-            containerElement: this.formInput,
+        type WysiwygModule = typeof import('../wysiwyg');
+        const wysiwygModule = (await window.importVersioned('wysiwyg')) as WysiwygModule;
+        const container = el('div', {class: 'comment-editor-container'});
+        this.formInput.parentElement?.appendChild(container);
+        this.formInput.hidden = true;
+
+        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, '', {
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.wysiwygTextDirection,
-            drawioUrl: '',
-            pageId: 0,
-            translations: {},
-            translationMap: (window as unknown as Record<string, Object>).editor_translations,
+            translations: (window as unknown as Record<string, Object>).editor_translations,
         });
 
-        (window as unknown as {tinymce: {init: (arg0: Object) => Promise<any>}}).tinymce.init(config).then(editors => {
-            this.wysiwygEditor = editors[0];
-            setTimeout(() => this.wysiwygEditor.focus(), 50);
-        });
+        this.wysiwygEditor.focus();
     }
 
     protected removeEditor(): void {
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 8e98780d585..8f6c41c1ac4 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -2,9 +2,9 @@ import {createEditor, LexicalEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
-import {getNodesForPageEditor, registerCommonNodeMutationListeners} from './nodes';
+import {getNodesForBasicEditor, getNodesForPageEditor, registerCommonNodeMutationListeners} from './nodes';
 import {buildEditorUI} from "./ui";
-import {getEditorContentAsHtml, setEditorContentFromHtml} from "./utils/actions";
+import {focusEditor, getEditorContentAsHtml, setEditorContentFromHtml} from "./utils/actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
 import {EditorUiContext} from "./ui/framework/core";
 import {listen as listenToCommonEvents} from "./services/common-events";
@@ -15,7 +15,7 @@ import {registerShortcuts} from "./services/shortcuts";
 import {registerNodeResizer} from "./ui/framework/helpers/node-resizer";
 import {registerKeyboardHandling} from "./services/keyboard-handling";
 import {registerAutoLinks} from "./services/auto-links";
-import {contextToolbars, getMainEditorFullToolbar} from "./ui/defaults/toolbars";
+import {contextToolbars, getBasicEditorToolbar, getMainEditorFullToolbar} from "./ui/defaults/toolbars";
 import {modals} from "./ui/defaults/modals";
 import {CodeBlockDecorator} from "./ui/decorators/code-block";
 import {DiagramDecorator} from "./ui/decorators/diagram";
@@ -90,20 +90,20 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     registerCommonNodeMutationListeners(context);
 
-    return new SimpleWysiwygEditorInterface(editor);
+    return new SimpleWysiwygEditorInterface(context);
 }
 
-export function createCommentEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
+export function createBasicEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
     const editor = createEditor({
-        namespace: 'BookStackCommentEditor',
-        nodes: getNodesForPageEditor(),
+        namespace: 'BookStackBasicEditor',
+        nodes: getNodesForBasicEditor(),
         onError: console.error,
         theme: theme,
     });
     const context: EditorUiContext = buildEditorUI(container, editor, options);
     editor.setRootElement(context.editorDOM);
 
-    mergeRegister(
+    const editorTeardown = mergeRegister(
         registerRichText(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerShortcuts(context),
@@ -111,23 +111,33 @@ export function createCommentEditorInstance(container: HTMLElement, htmlContent:
     );
 
     // Register toolbars, modals & decorators
-    context.manager.setToolbar(getMainEditorFullToolbar(context)); // TODO - Create comment toolbar
+    context.manager.setToolbar(getBasicEditorToolbar(context));
     context.manager.registerContextToolbar('link', contextToolbars.link);
     context.manager.registerModal('link', modals.link);
+    context.manager.onTeardown(editorTeardown);
 
     setEditorContentFromHtml(editor, htmlContent);
 
-    return new SimpleWysiwygEditorInterface(editor);
+    return new SimpleWysiwygEditorInterface(context);
 }
 
 export class SimpleWysiwygEditorInterface {
-    protected editor: LexicalEditor;
+    protected context: EditorUiContext;
 
-    constructor(editor: LexicalEditor) {
-        this.editor = editor;
+    constructor(context: EditorUiContext) {
+        this.context = context;
     }
 
     async getContentAsHtml(): Promise<string> {
-        return await getEditorContentAsHtml(this.editor);
+        return await getEditorContentAsHtml(this.context.editor);
+    }
+
+    focus(): void {
+        focusEditor(this.context.editor);
+    }
+
+    remove() {
+        this.context.editorDOM.remove();
+        this.context.manager.teardown();
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/nodes.ts b/resources/js/wysiwyg/nodes.ts
index c1db0f0869f..413e2c4cd3f 100644
--- a/resources/js/wysiwyg/nodes.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -20,9 +20,6 @@ import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 import {CaptionNode} from "@lexical/table/LexicalCaptionNode";
 
-/**
- * Load the nodes for lexical.
- */
 export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
     return [
         CalloutNode,
@@ -45,6 +42,15 @@ export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> |
     ];
 }
 
+export function getNodesForBasicEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
+    return [
+        ListNode,
+        ListItemNode,
+        ParagraphNode,
+        LinkNode,
+    ];
+}
+
 export function registerCommonNodeMutationListeners(context: EditorUiContext): void {
     const decorated = [ImageNode, CodeBlockNode, DiagramNode];
 
@@ -53,7 +59,7 @@ export function registerCommonNodeMutationListeners(context: EditorUiContext): v
             if (mutation === "destroyed") {
                 const decorator = context.manager.getDecoratorByNodeKey(nodeKey);
                 if (decorator) {
-                    decorator.destroy(context);
+                    decorator.teardown();
                 }
             }
         }
diff --git a/resources/js/wysiwyg/ui/defaults/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
index fc413bb8f80..33468e0a23a 100644
--- a/resources/js/wysiwyg/ui/defaults/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -221,6 +221,16 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
     ]);
 }
 
+export function getBasicEditorToolbar(context: EditorUiContext): EditorContainerUiElement {
+    return new EditorSimpleClassContainer('editor-toolbar-main', [
+        new EditorButton(bold),
+        new EditorButton(italic),
+        new EditorButton(link),
+        new EditorButton(bulletList),
+        new EditorButton(numberList),
+    ]);
+}
+
 export const contextToolbars: Record<string, EditorContextToolbarDefinition> = {
     image: {
         selector: 'img:not([drawio-diagram] img)',
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index ca2ba40c6fc..9c524dff057 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -30,6 +30,7 @@ export function isUiBuilderDefinition(object: any): object is EditorUiBuilderDef
 export abstract class EditorUiElement {
     protected dom: HTMLElement|null = null;
     private context: EditorUiContext|null = null;
+    private abortController: AbortController = new AbortController();
 
     protected abstract buildDOM(): HTMLElement;
 
@@ -79,9 +80,16 @@ export abstract class EditorUiElement {
         if (target) {
             target.addEventListener('editor::' + name, ((event: CustomEvent) => {
                 callback(event.detail);
-            }) as EventListener);
+            }) as EventListener, { signal: this.abortController.signal });
         }
     }
+
+    teardown(): void {
+        if (this.dom && this.dom.isConnected) {
+            this.dom.remove();
+        }
+        this.abortController.abort('teardown');
+    }
 }
 
 export class EditorContainerUiElement extends EditorUiElement {
@@ -129,6 +137,13 @@ export class EditorContainerUiElement extends EditorUiElement {
             child.setContext(context);
         }
     }
+
+    teardown() {
+        for (const child of this.children) {
+            child.teardown();
+        }
+        super.teardown();
+    }
 }
 
 export class EditorSimpleClassContainer extends EditorContainerUiElement {
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
index 570b8222b9c..6ea0b8b3934 100644
--- a/resources/js/wysiwyg/ui/framework/decorator.ts
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -48,7 +48,7 @@ export abstract class EditorDecorator {
      * Destroy this decorator. Used for tear-down operations upon destruction
      * of the underlying node this decorator is attached to.
      */
-    destroy(context: EditorUiContext): void {
+    teardown(): void {
         for (const callback of this.onDestroyCallbacks) {
             callback();
         }
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index 751c1b3f207..890d5b325fe 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -41,11 +41,18 @@ export class DropDownManager {
 
     constructor() {
         this.onMenuMouseOver = this.onMenuMouseOver.bind(this);
+        this.onWindowClick = this.onWindowClick.bind(this);
 
-        window.addEventListener('click', (event: MouseEvent) => {
-            const target = event.target as HTMLElement;
-            this.closeAllNotContainingElement(target);
-        });
+        window.addEventListener('click', this.onWindowClick);
+    }
+
+    teardown(): void {
+        window.removeEventListener('click', this.onWindowClick);
+    }
+
+    protected onWindowClick(event: MouseEvent): void {
+        const target = event.target as HTMLElement;
+        this.closeAllNotContainingElement(target);
     }
 
     protected closeAllNotContainingElement(element: HTMLElement): void {
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index c40206607c6..3f46455da63 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -12,6 +12,8 @@ export type SelectionChangeHandler = (selection: BaseSelection|null) => void;
 
 export class EditorUIManager {
 
+    public dropdowns: DropDownManager = new DropDownManager();
+
     protected modalDefinitionsByKey: Record<string, EditorFormModalDefinition> = {};
     protected activeModalsByKey: Record<string, EditorFormModal> = {};
     protected decoratorConstructorsByType: Record<string, typeof EditorDecorator> = {};
@@ -21,12 +23,12 @@ export class EditorUIManager {
     protected contextToolbarDefinitionsByKey: Record<string, EditorContextToolbarDefinition> = {};
     protected activeContextToolbars: EditorContextToolbar[] = [];
     protected selectionChangeHandlers: Set<SelectionChangeHandler> = new Set();
-
-    public dropdowns: DropDownManager = new DropDownManager();
+    protected domEventAbortController = new AbortController();
+    protected teardownCallbacks: (()=>void)[] = [];
 
     setContext(context: EditorUiContext) {
         this.context = context;
-        this.setupEventListeners(context);
+        this.setupEventListeners();
         this.setupEditor(context.editor);
     }
 
@@ -99,7 +101,7 @@ export class EditorUIManager {
 
     setToolbar(toolbar: EditorContainerUiElement) {
         if (this.toolbar) {
-            this.toolbar.getDOMElement().remove();
+            this.toolbar.teardown();
         }
 
         this.toolbar = toolbar;
@@ -170,10 +172,40 @@ export class EditorUIManager {
         return this.getContext().options.textDirection === 'rtl' ? 'rtl' : 'ltr';
     }
 
+    onTeardown(callback: () => void): void {
+        this.teardownCallbacks.push(callback);
+    }
+
+    teardown(): void {
+        this.domEventAbortController.abort('teardown');
+
+        for (const [_, modal] of Object.entries(this.activeModalsByKey)) {
+            modal.teardown();
+        }
+
+        for (const [_, decorator] of Object.entries(this.decoratorInstancesByNodeKey)) {
+            decorator.teardown();
+        }
+
+        if (this.toolbar) {
+            this.toolbar.teardown();
+        }
+
+        for (const toolbar of this.activeContextToolbars) {
+            toolbar.teardown();
+        }
+
+        this.dropdowns.teardown();
+
+        for (const callback of this.teardownCallbacks) {
+            callback();
+        }
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (let i = this.activeContextToolbars.length - 1; i >= 0; i--) {
             const toolbar = this.activeContextToolbars[i];
-            toolbar.destroy();
+            toolbar.teardown();
             this.activeContextToolbars.splice(i, 1);
         }
 
@@ -253,9 +285,9 @@ export class EditorUIManager {
         });
     }
 
-    protected setupEventListeners(context: EditorUiContext) {
+    protected setupEventListeners() {
         const layoutUpdate = this.triggerLayoutUpdate.bind(this);
-        window.addEventListener('scroll', layoutUpdate, {capture: true, passive: true});
-        window.addEventListener('resize', layoutUpdate, {passive: true});
+        window.addEventListener('scroll', layoutUpdate, {capture: true, passive: true, signal: this.domEventAbortController.signal});
+        window.addEventListener('resize', layoutUpdate, {passive: true, signal: this.domEventAbortController.signal});
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 3eea62ebb94..4dbe9d962c5 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -34,8 +34,8 @@ export class EditorFormModal extends EditorContainerUiElement {
     }
 
     hide() {
-        this.getDOMElement().remove();
         this.getContext().manager.setModalInactive(this.key);
+        this.teardown();
     }
 
     getForm(): EditorForm {
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index 323b1745008..cf5ec4ad151 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -60,17 +60,4 @@ export class EditorContextToolbar extends EditorContainerUiElement {
         const dom = this.getDOMElement();
         dom.append(...children.map(child => child.getDOMElement()));
     }
-
-    protected empty() {
-        const children = this.getChildren();
-        for (const child of children) {
-            child.getDOMElement().remove();
-        }
-        this.removeChildren(...children);
-    }
-
-    destroy() {
-        this.empty();
-        this.getDOMElement().remove();
-    }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/utils/actions.ts b/resources/js/wysiwyg/utils/actions.ts
index ae829bae3a3..b7ce65eeb6c 100644
--- a/resources/js/wysiwyg/utils/actions.ts
+++ b/resources/js/wysiwyg/utils/actions.ts
@@ -64,6 +64,6 @@ export function getEditorContentAsHtml(editor: LexicalEditor): Promise<string> {
     });
 }
 
-export function focusEditor(editor: LexicalEditor) {
+export function focusEditor(editor: LexicalEditor): void {
     editor.focus(() => {}, {defaultSelection: "rootStart"});
 }
\ No newline at end of file
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index eadf3518722..d70a8c1d909 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -7,7 +7,6 @@
      option:page-comment:updated-text="{{ trans('entities.comment_updated_success') }}"
      option:page-comment:deleted-text="{{ trans('entities.comment_deleted_success') }}"
      option:page-comment:archive-text="{{ $comment->archived ? trans('entities.comment_unarchive_success') : trans('entities.comment_archive_success') }}"
-     option:page-comment:wysiwyg-language="{{ $locale->htmlLang() }}"
      option:page-comment:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
      id="comment{{$comment->local_id}}"
      class="comment-box">
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index f27127e9732..a5f0168a5c8 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -3,7 +3,6 @@
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
          option:page-comments:count-text="{{ trans('entities.comment_thread_count') }}"
          option:page-comments:archived-count-text="{{ trans('entities.comment_archived_count') }}"
-         option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
          class="comments-list tab-container"
          aria-label="{{ trans('entities.comments') }}">
@@ -73,7 +72,6 @@ class="comment-container no-outline">
 
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
         @push('body-end')
-            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
             @include('form.editor-translations')
             @include('entities.selector-popup')
         @endpush
diff --git a/tests/Entity/CommentStoreTest.php b/tests/Entity/CommentStoreTest.php
index 8b8a5d488b8..c5fe4ce5064 100644
--- a/tests/Entity/CommentStoreTest.php
+++ b/tests/Entity/CommentStoreTest.php
@@ -193,13 +193,14 @@ public function test_scripts_cannot_be_injected_via_comment_html()
     {
         $page = $this->entities->page();
 
-        $script = '<script>const a = "script";</script><p onclick="1">My lovely comment</p>';
+        $script = '<script>const a = "script";</script><script>const b = "sneakyscript";</script><p onclick="1">My lovely comment</p>';
         $this->asAdmin()->postJson("/comment/$page->id", [
             'html' => $script,
         ]);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($script, false);
+        $pageView->assertDontSee('sneakyscript', false);
         $pageView->assertSee('<p>My lovely comment</p>', false);
 
         $comment = $page->comments()->first();
@@ -209,6 +210,7 @@ public function test_scripts_cannot_be_injected_via_comment_html()
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($script, false);
+        $pageView->assertDontSee('sneakyscript', false);
         $pageView->assertSee('<p>My lovely comment</p><p>updated</p>');
     }
 
@@ -216,7 +218,7 @@ public function test_scripts_are_removed_even_if_already_in_db()
     {
         $page = $this->entities->page();
         Comment::factory()->create([
-            'html' => '<script>superbadscript</script><p onclick="superbadonclick">scriptincommentest</p>',
+            'html' => '<script>superbadscript</script><script>superbadscript</script><p onclick="superbadonclick">scriptincommentest</p>',
             'entity_type' => 'page', 'entity_id' => $page
         ]);
 
@@ -229,7 +231,7 @@ public function test_scripts_are_removed_even_if_already_in_db()
     public function test_comment_html_is_limited()
     {
         $page = $this->entities->page();
-        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" data-a="b">a</a><section>Hello</section></p>';
+        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" data-a="b">a</a><section>Hello</section><section>there</section></p>';
         $expected = '<p>Content<a href="#cat">a</a></p>';
 
         $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
@@ -248,4 +250,27 @@ public function test_comment_html_is_limited()
             'html' => $expected,
         ]);
     }
+
+    public function test_comment_html_spans_are_cleaned()
+    {
+        $page = $this->entities->page();
+        $input = '<p><span class="beans">Hello</span> do you have <span style="white-space: discard;">biscuits</span>?</p>';
+        $expected = '<p><span>Hello</span> do you have <span>biscuits</span>?</p>';
+
+        $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
+        $resp->assertOk();
+        $this->assertDatabaseHas('comments', [
+            'entity_type' => 'page',
+            'entity_id' => $page->id,
+            'html' => $expected,
+        ]);
+
+        $comment = $page->comments()->first();
+        $resp = $this->put("/comment/{$comment->id}", ['html' => $input]);
+        $resp->assertOk();
+        $this->assertDatabaseHas('comments', [
+            'id'   => $comment->id,
+            'html' => $expected,
+        ]);
+    }
 }

From 02a35b6db4234e9256b2c0b38e12d3eadb9b0b38 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 26 Jun 2025 11:00:17 +0100
Subject: [PATCH 579/666] Lexical: Added new WYSIWYG to chapter/book/shelf
 descriptions

---
 resources/js/components/wysiwyg-input.js      | 23 ---------
 resources/js/components/wysiwyg-input.ts      | 32 +++++++++++++
 resources/js/wysiwyg-tinymce/config.js        | 48 -------------------
 resources/js/wysiwyg/index.ts                 | 22 +++++++++
 resources/views/books/parts/form.blade.php    |  4 --
 resources/views/chapters/parts/form.blade.php |  4 --
 .../form/description-html-input.blade.php     |  1 -
 resources/views/shelves/parts/form.blade.php  |  4 --
 8 files changed, 54 insertions(+), 84 deletions(-)
 delete mode 100644 resources/js/components/wysiwyg-input.js
 create mode 100644 resources/js/components/wysiwyg-input.ts

diff --git a/resources/js/components/wysiwyg-input.js b/resources/js/components/wysiwyg-input.js
deleted file mode 100644
index aa21a63717f..00000000000
--- a/resources/js/components/wysiwyg-input.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {Component} from './component';
-import {buildForInput} from '../wysiwyg-tinymce/config';
-
-export class WysiwygInput extends Component {
-
-    setup() {
-        this.elem = this.$el;
-
-        const config = buildForInput({
-            language: this.$opts.language,
-            containerElement: this.elem,
-            darkMode: document.documentElement.classList.contains('dark-mode'),
-            textDirection: this.$opts.textDirection,
-            translations: {},
-            translationMap: window.editor_translations,
-        });
-
-        window.tinymce.init(config).then(editors => {
-            this.editor = editors[0];
-        });
-    }
-
-}
diff --git a/resources/js/components/wysiwyg-input.ts b/resources/js/components/wysiwyg-input.ts
new file mode 100644
index 00000000000..85ebceab994
--- /dev/null
+++ b/resources/js/components/wysiwyg-input.ts
@@ -0,0 +1,32 @@
+import {Component} from './component';
+import {el} from "../wysiwyg/utils/dom";
+import {SimpleWysiwygEditorInterface} from "../wysiwyg";
+
+export class WysiwygInput extends Component {
+    private elem!: HTMLTextAreaElement;
+    private wysiwygEditor!: SimpleWysiwygEditorInterface;
+    private textDirection!: string;
+
+    async setup() {
+        this.elem = this.$el as HTMLTextAreaElement;
+        this.textDirection = this.$opts.textDirection;
+
+        type WysiwygModule = typeof import('../wysiwyg');
+        const wysiwygModule = (await window.importVersioned('wysiwyg')) as WysiwygModule;
+        const container = el('div', {class: 'comment-editor-container'});
+        this.elem.parentElement?.appendChild(container);
+        this.elem.hidden = true;
+
+        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, this.elem.value, {
+            darkMode: document.documentElement.classList.contains('dark-mode'),
+            textDirection: this.textDirection,
+            translations: (window as unknown as Record<string, Object>).editor_translations,
+        });
+
+        this.wysiwygEditor.onChange(() => {
+            this.wysiwygEditor.getContentAsHtml().then(html => {
+                this.elem.value = html;
+            });
+        });
+    }
+}
diff --git a/resources/js/wysiwyg-tinymce/config.js b/resources/js/wysiwyg-tinymce/config.js
index 1666aa50066..c0cfd37d97b 100644
--- a/resources/js/wysiwyg-tinymce/config.js
+++ b/resources/js/wysiwyg-tinymce/config.js
@@ -310,54 +310,6 @@ export function buildForEditor(options) {
     };
 }
 
-/**
- * @param {WysiwygConfigOptions} options
- * @return {RawEditorOptions}
- */
-export function buildForInput(options) {
-    // Set language
-    window.tinymce.addI18n(options.language, options.translationMap);
-
-    // BookStack Version
-    const version = document.querySelector('script[src*="/dist/app.js"]').getAttribute('src').split('?version=')[1];
-
-    // Return config object
-    return {
-        width: '100%',
-        height: '185px',
-        target: options.containerElement,
-        cache_suffix: `?version=${version}`,
-        content_css: [
-            window.baseUrl('/dist/styles.css'),
-        ],
-        branding: false,
-        skin: options.darkMode ? 'tinymce-5-dark' : 'tinymce-5',
-        body_class: 'wysiwyg-input',
-        browser_spellcheck: true,
-        relative_urls: false,
-        language: options.language,
-        directionality: options.textDirection,
-        remove_script_host: false,
-        document_base_url: window.baseUrl('/'),
-        end_container_on_empty_block: true,
-        remove_trailing_brs: false,
-        statusbar: false,
-        menubar: false,
-        plugins: 'link autolink lists',
-        contextmenu: false,
-        toolbar: 'bold italic link bullist numlist',
-        content_style: getContentStyle(options),
-        file_picker_types: 'file',
-        valid_elements: 'p,a[href|title|target],ol,ul,li,strong,em,br',
-        file_picker_callback: filePickerCallback,
-        init_instance_callback(editor) {
-            addCustomHeadContent(editor.getDoc());
-
-            editor.contentDocument.documentElement.classList.toggle('dark-mode', options.darkMode);
-        },
-    };
-}
-
 /**
  * @typedef {Object} WysiwygConfigOptions
  * @property {Element} containerElement
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 8f6c41c1ac4..b9770219de9 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -123,6 +123,8 @@ export function createBasicEditorInstance(container: HTMLElement, htmlContent: s
 
 export class SimpleWysiwygEditorInterface {
     protected context: EditorUiContext;
+    protected onChangeListeners: (() => void)[] = [];
+    protected editorListenerTeardown: (() => void)|null = null;
 
     constructor(context: EditorUiContext) {
         this.context = context;
@@ -132,6 +134,11 @@ export class SimpleWysiwygEditorInterface {
         return await getEditorContentAsHtml(this.context.editor);
     }
 
+    onChange(listener: () => void) {
+        this.onChangeListeners.push(listener);
+        this.startListeningToChanges();
+    }
+
     focus(): void {
         focusEditor(this.context.editor);
     }
@@ -139,5 +146,20 @@ export class SimpleWysiwygEditorInterface {
     remove() {
         this.context.editorDOM.remove();
         this.context.manager.teardown();
+        if (this.editorListenerTeardown) {
+            this.editorListenerTeardown();
+        }
+    }
+
+    protected startListeningToChanges(): void {
+        if (this.editorListenerTeardown) {
+            return;
+        }
+
+        this.editorListenerTeardown = this.context.editor.registerUpdateListener(() => {
+             for (const listener of this.onChangeListeners) {
+                 listener();
+             }
+        });
     }
 }
\ No newline at end of file
diff --git a/resources/views/books/parts/form.blade.php b/resources/views/books/parts/form.blade.php
index ee261e72d4a..44d495c2777 100644
--- a/resources/views/books/parts/form.blade.php
+++ b/resources/views/books/parts/form.blade.php
@@ -1,7 +1,3 @@
-@push('head')
-    <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
-@endpush
-
 {{ csrf_field() }}
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>
diff --git a/resources/views/chapters/parts/form.blade.php b/resources/views/chapters/parts/form.blade.php
index 602693916ea..70721631d43 100644
--- a/resources/views/chapters/parts/form.blade.php
+++ b/resources/views/chapters/parts/form.blade.php
@@ -1,7 +1,3 @@
-@push('head')
-    <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
-@endpush
-
 {{ csrf_field() }}
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>
diff --git a/resources/views/form/description-html-input.blade.php b/resources/views/form/description-html-input.blade.php
index 3cf726ba489..52244eda6f9 100644
--- a/resources/views/form/description-html-input.blade.php
+++ b/resources/views/form/description-html-input.blade.php
@@ -1,5 +1,4 @@
 <textarea component="wysiwyg-input"
-          option:wysiwyg-input:language="{{ $locale->htmlLang() }}"
           option:wysiwyg-input:text-direction="{{ $locale->htmlDirection() }}"
           id="description_html" name="description_html" rows="5"
           @if($errors->has('description_html')) class="text-neg" @endif>@if(isset($model) || old('description_html')){{ old('description_html') ?? $model->descriptionHtml()}}@endif</textarea>
diff --git a/resources/views/shelves/parts/form.blade.php b/resources/views/shelves/parts/form.blade.php
index 7790ba5a4e7..0207d72780b 100644
--- a/resources/views/shelves/parts/form.blade.php
+++ b/resources/views/shelves/parts/form.blade.php
@@ -1,7 +1,3 @@
-@push('head')
-    <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
-@endpush
-
 {{ csrf_field() }}
 <div class="form-group title-input">
     <label for="name">{{ trans('common.name') }}</label>

From 054475135aa6e35f7f50549c34815b190bf93b17 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Jun 2025 10:19:45 +0100
Subject: [PATCH 580/666] Lexical: Added some styling and tweaks for basic
 editors

---
 resources/js/components/page-comments.ts |  2 +-
 resources/js/components/wysiwyg-input.ts |  2 +-
 resources/js/wysiwyg/index.ts            |  2 +-
 resources/sass/_editor.scss              | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index e988343cabb..a1eeda1f9d9 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -200,7 +200,7 @@ export class PageComments extends Component {
         this.formInput.parentElement?.appendChild(container);
         this.formInput.hidden = true;
 
-        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, '', {
+        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, '<p></p>', {
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.wysiwygTextDirection,
             translations: (window as unknown as Record<string, Object>).editor_translations,
diff --git a/resources/js/components/wysiwyg-input.ts b/resources/js/components/wysiwyg-input.ts
index 85ebceab994..1d914adb966 100644
--- a/resources/js/components/wysiwyg-input.ts
+++ b/resources/js/components/wysiwyg-input.ts
@@ -13,7 +13,7 @@ export class WysiwygInput extends Component {
 
         type WysiwygModule = typeof import('../wysiwyg');
         const wysiwygModule = (await window.importVersioned('wysiwyg')) as WysiwygModule;
-        const container = el('div', {class: 'comment-editor-container'});
+        const container = el('div', {class: 'basic-editor-container'});
         this.elem.parentElement?.appendChild(container);
         this.elem.hidden = true;
 
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index b9770219de9..f572f9de5ec 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -144,8 +144,8 @@ export class SimpleWysiwygEditorInterface {
     }
 
     remove() {
-        this.context.editorDOM.remove();
         this.context.manager.teardown();
+        this.context.containerDOM.remove();
         if (this.editorListenerTeardown) {
             this.editorListenerTeardown();
         }
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 633fa78a6b1..de43540a31d 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -52,6 +52,25 @@ body.editor-is-fullscreen {
   flex: 1;
 }
 
+// Variation specific styles
+.comment-editor-container,
+.basic-editor-container {
+  border-left: 1px solid #DDD;
+  border-right: 1px solid #DDD;
+  border-bottom: 1px solid #DDD;
+  border-radius: 3px;
+  @include mixins.lightDark(border-color, #DDD, #000);
+
+  .editor-toolbar-main {
+    border-radius: 3px 3px 0 0;
+    justify-content: end;
+  }
+}
+
+.basic-editor-container .editor-content-area {
+  padding-bottom: 0;
+}
+
 // Buttons
 .editor-button {
   font-size: 12px;

From a37d0c57dc44c762a0b4bca9e1ca817d8e879327 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 27 Jun 2025 10:33:28 +0100
Subject: [PATCH 581/666] Tests: Updated comment test to account for new editor
 usage

---
 tests/Entity/CommentDisplayTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/Entity/CommentDisplayTest.php b/tests/Entity/CommentDisplayTest.php
index 22e96c250b9..bffe29fa95b 100644
--- a/tests/Entity/CommentDisplayTest.php
+++ b/tests/Entity/CommentDisplayTest.php
@@ -60,7 +60,6 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
         $page = $this->entities->page();
 
         $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertSee('tinymce.min.js?', false);
         $resp->assertSee('window.editor_translations', false);
         $resp->assertSee('component="entity-selector"', false);
 
@@ -68,7 +67,6 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
         $this->permissions->grantUserRolePermissions($editor, ['comment-update-own']);
 
         $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertDontSee('tinymce.min.js?', false);
         $resp->assertDontSee('window.editor_translations', false);
         $resp->assertDontSee('component="entity-selector"', false);
 
@@ -79,7 +77,6 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
         ]);
 
         $resp = $this->actingAs($editor)->get($page->getUrl());
-        $resp->assertSee('tinymce.min.js?', false);
         $resp->assertSee('window.editor_translations', false);
         $resp->assertSee('component="entity-selector"', false);
     }

From dca9765d5d432333630d12a62445dca2e863600a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 28 Jun 2025 22:27:28 +0100
Subject: [PATCH 582/666] Customization: Added parent tag classes

For #5217
---
 app/Activity/Models/Tag.php                   |  2 +
 app/Activity/Tools/TagClassGenerator.php      | 53 +++++++++++++------
 .../views/entities/body-tag-classes.blade.php |  2 +-
 tests/Entity/TagTest.php                      | 35 ++++++++++++
 4 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/app/Activity/Models/Tag.php b/app/Activity/Models/Tag.php
index 0af0a65ac76..0e7c68a270a 100644
--- a/app/Activity/Models/Tag.php
+++ b/app/Activity/Models/Tag.php
@@ -12,6 +12,8 @@
  * @property int    $id
  * @property string $name
  * @property string $value
+ * @property int    $entity_id
+ * @property string $entity_type
  * @property int    $order
  */
 class Tag extends Model
diff --git a/app/Activity/Tools/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.php
index 1a1bd16c881..5bcb44113d6 100644
--- a/app/Activity/Tools/TagClassGenerator.php
+++ b/app/Activity/Tools/TagClassGenerator.php
@@ -3,17 +3,15 @@
 namespace BookStack\Activity\Tools;
 
 use BookStack\Activity\Models\Tag;
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
 
 class TagClassGenerator
 {
-    protected array $tags;
-
-    /**
-     * @param Tag[] $tags
-     */
-    public function __construct(array $tags)
-    {
-        $this->tags = $tags;
+    public function __construct(
+        protected Entity $entity
+    ) {
     }
 
     /**
@@ -22,14 +20,23 @@ public function __construct(array $tags)
     public function generate(): array
     {
         $classes = [];
+        $tags = $this->entity->tags->all();
+
+        foreach ($tags as $tag) {
+             array_push($classes, ...$this->generateClassesForTag($tag));
+        }
+
+        if ($this->entity instanceof BookChild && userCan('view', $this->entity->book)) {
+            $bookTags = $this->entity->book->tags;
+            foreach ($bookTags as $bookTag) {
+                 array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));
+            }
+        }
 
-        foreach ($this->tags as $tag) {
-            $name = $this->normalizeTagClassString($tag->name);
-            $value = $this->normalizeTagClassString($tag->value);
-            $classes[] = 'tag-name-' . $name;
-            if ($value) {
-                $classes[] = 'tag-value-' . $value;
-                $classes[] = 'tag-pair-' . $name . '-' . $value;
+        if ($this->entity instanceof Page && $this->entity->chapter && userCan('view', $this->entity->chapter)) {
+            $chapterTags = $this->entity->chapter->tags;
+            foreach ($chapterTags as $chapterTag) {
+                 array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));
             }
         }
 
@@ -41,6 +48,22 @@ public function generateAsString(): string
         return implode(' ', $this->generate());
     }
 
+    /**
+     * @return string[]
+     */
+    protected function generateClassesForTag(Tag $tag, string $prefix = ''): array
+    {
+        $classes = [];
+        $name = $this->normalizeTagClassString($tag->name);
+        $value = $this->normalizeTagClassString($tag->value);
+        $classes[] = "{$prefix}tag-name-{$name}";
+        if ($value) {
+            $classes[] = "{$prefix}tag-value-{$value}";
+            $classes[] = "{$prefix}tag-pair-{$name}-{$value}";
+        }
+        return $classes;
+    }
+
     protected function normalizeTagClassString(string $value): string
     {
         $value = str_replace(' ', '', strtolower($value));
diff --git a/resources/views/entities/body-tag-classes.blade.php b/resources/views/entities/body-tag-classes.blade.php
index 08427f1a5ed..f9ba023c37e 100644
--- a/resources/views/entities/body-tag-classes.blade.php
+++ b/resources/views/entities/body-tag-classes.blade.php
@@ -1 +1 @@
-@push('body-class', e((new \BookStack\Activity\Tools\TagClassGenerator($entity->tags->all()))->generateAsString() . ' '))
\ No newline at end of file
+@push('body-class', e((new \BookStack\Activity\Tools\TagClassGenerator($entity))->generateAsString() . ' '))
\ No newline at end of file
diff --git a/tests/Entity/TagTest.php b/tests/Entity/TagTest.php
index 729f9390358..63f037d9cc0 100644
--- a/tests/Entity/TagTest.php
+++ b/tests/Entity/TagTest.php
@@ -230,4 +230,39 @@ public function test_tag_classes_are_escaped()
         $resp->assertDontSee('tag-name-<>', false);
         $resp->assertSee('tag-name-&lt;&gt;', false);
     }
+
+    public function test_parent_tag_classes_visible()
+    {
+        $page = $this->entities->pageWithinChapter();
+        $page->chapter->tags()->create(['name' => 'My Chapter Tag', 'value' => 'abc123']);
+        $page->book->tags()->create(['name' => 'My Book Tag', 'value' => 'def456']);
+        $this->asEditor();
+
+        $html = $this->withHtml($this->get($page->getUrl()));
+        $html->assertElementExists('body.chapter-tag-pair-mychaptertag-abc123');
+        $html->assertElementExists('body.book-tag-pair-mybooktag-def456');
+
+        $html = $this->withHtml($this->get($page->chapter->getUrl()));
+        $html->assertElementExists('body.book-tag-pair-mybooktag-def456');
+    }
+
+    public function test_parent_tag_classes_not_visible_if_cannot_see_parent()
+    {
+        $page = $this->entities->pageWithinChapter();
+        $page->chapter->tags()->create(['name' => 'My Chapter Tag', 'value' => 'abc123']);
+        $page->book->tags()->create(['name' => 'My Book Tag', 'value' => 'def456']);
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $this->permissions->setEntityPermissions($page, ['view'], [$editor->roles()->first()]);
+        $this->permissions->disableEntityInheritedPermissions($page->chapter);
+
+        $html = $this->withHtml($this->get($page->getUrl()));
+        $html->assertElementNotExists('body.chapter-tag-pair-mychaptertag-abc123');
+        $html->assertElementExists('body.book-tag-pair-mybooktag-def456');
+
+        $this->permissions->disableEntityInheritedPermissions($page->book);
+        $html = $this->withHtml($this->get($page->getUrl()));
+        $html->assertElementNotExists('body.book-tag-pair-mybooktag-def456');
+    }
 }

From 6045aff33a3c57f03b380bd10919bb47a55440c6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 30 Jun 2025 13:19:45 +0100
Subject: [PATCH 583/666] Layout: Improved sidebar sizing, and dropdown
 consideration

- Updated tri-layout sidebars to have less padding and to avoid cutting
  off content when in single-sidebar mode.
- Updated dropdown handling to consider the parent scroll container when
  deciding to drop upwards, to help prevent cut-off.
---
 resources/js/components/dropdown.js |  5 +++--
 resources/js/services/dom.ts        | 18 ++++++++++++++++++
 resources/sass/_layout.scss         |  5 ++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/dropdown.js b/resources/js/components/dropdown.js
index 5dd5dd93b01..d2b044ee1ca 100644
--- a/resources/js/components/dropdown.js
+++ b/resources/js/components/dropdown.js
@@ -1,4 +1,4 @@
-import {onSelect} from '../services/dom.ts';
+import {findClosestScrollContainer, onSelect} from '../services/dom.ts';
 import {KeyboardNavigationHandler} from '../services/keyboard-navigation.ts';
 import {Component} from './component';
 
@@ -33,7 +33,8 @@ export class Dropdown extends Component {
         const menuOriginalRect = this.menu.getBoundingClientRect();
         let heightOffset = 0;
         const toggleHeight = this.toggle.getBoundingClientRect().height;
-        const dropUpwards = menuOriginalRect.bottom > window.innerHeight;
+        const containerBounds = findClosestScrollContainer(this.menu).getBoundingClientRect();
+        const dropUpwards = menuOriginalRect.bottom > containerBounds.bottom;
         const containerRect = this.container.getBoundingClientRect();
 
         // If enabled, Move to body to prevent being trapped within scrollable sections
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index c3817536c85..8696fe81639 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -256,4 +256,22 @@ export function findTargetNodeAndOffset(parentNode: HTMLElement, offset: number)
 export function hashElement(element: HTMLElement): string {
     const normalisedElemText = (element.textContent || '').replace(/\s{2,}/g, '');
     return cyrb53(normalisedElemText);
+}
+
+/**
+ * Find the closest scroll container parent for the given element
+ * otherwise will default to the body element.
+ */
+export function findClosestScrollContainer(start: HTMLElement): HTMLElement {
+    let el: HTMLElement|null = start;
+    do {
+        const computed = window.getComputedStyle(el);
+        if (computed.overflowY === 'scroll') {
+            return el;
+        }
+
+        el = el.parentElement;
+    } while (el);
+
+    return document.body;
 }
\ No newline at end of file
diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 8175db948a5..58c06f4ac99 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -431,7 +431,8 @@ body.flexbox {
     grid-template-areas:  "a b b";
     grid-template-columns: 1fr 3fr;
     grid-template-rows: min-content min-content 1fr;
-    padding-inline-end: vars.$l;
+    margin-inline-start: (vars.$m + vars.$xxs);
+    margin-inline-end: (vars.$m + vars.$xxs);
   }
   .tri-layout-sides {
     grid-column-start: a;
@@ -452,6 +453,8 @@ body.flexbox {
     height: 100%;
     scrollbar-width: none;
     -ms-overflow-style: none;
+    padding-inline: vars.$m;
+    margin-inline: -(vars.$m);
     &::-webkit-scrollbar {
       display: none;
     }

From 9186e77d27ea9c620ba0e45de77bdb64c198ca8c Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 30 Jun 2025 14:10:48 +0100
Subject: [PATCH 584/666] Layout: Added scroll fade to the sidebars

---
 resources/js/components/tri-layout.js | 27 +++++++++++++++++++++++++++
 resources/sass/_layout.scss           | 24 ++++++++++++++++++++++++
 resources/views/layouts/tri.blade.php |  6 +++---
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/tri-layout.js b/resources/js/components/tri-layout.js
index be9388e8d46..85533da5eed 100644
--- a/resources/js/components/tri-layout.js
+++ b/resources/js/components/tri-layout.js
@@ -5,6 +5,7 @@ export class TriLayout extends Component {
     setup() {
         this.container = this.$refs.container;
         this.tabs = this.$manyRefs.tab;
+        this.sidebarScrollContainers = this.$manyRefs.sidebarScrollContainer;
 
         this.lastLayoutType = 'none';
         this.onDestroy = null;
@@ -22,6 +23,8 @@ export class TriLayout extends Component {
         window.addEventListener('resize', () => {
             this.updateLayout();
         }, {passive: true});
+
+        this.setupSidebarScrollHandlers();
     }
 
     updateLayout() {
@@ -108,4 +111,28 @@ export class TriLayout extends Component {
         this.lastTabShown = tabName;
     }
 
+    setupSidebarScrollHandlers() {
+        for (const sidebar of this.sidebarScrollContainers) {
+            sidebar.addEventListener('scroll', () => this.handleSidebarScroll(sidebar), {
+                passive: true,
+            });
+            this.handleSidebarScroll(sidebar);
+        }
+
+        window.addEventListener('resize', () => {
+            for (const sidebar of this.sidebarScrollContainers) {
+                this.handleSidebarScroll(sidebar);
+            }
+        });
+    }
+
+    handleSidebarScroll(sidebar) {
+        const scrollable = sidebar.clientHeight !== sidebar.scrollHeight;
+        const atTop = sidebar.scrollTop === 0;
+        const atBottom = (sidebar.scrollTop + sidebar.clientHeight) === sidebar.scrollHeight;
+
+        sidebar.parentElement.classList.toggle('scroll-away-from-top', !atTop && scrollable);
+        sidebar.parentElement.classList.toggle('scroll-away-from-bottom', !atBottom && scrollable);
+    }
+
 }
diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 58c06f4ac99..48b4b0ca22e 100644
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -389,10 +389,12 @@ body.flexbox {
 .tri-layout-right {
   grid-area: c;
   min-width: 0;
+  position: relative;
 }
 .tri-layout-left {
   grid-area: a;
   min-width: 0;
+  position: relative;
 }
 
 @include mixins.larger-than(vars.$bp-xxl) {
@@ -523,4 +525,26 @@ body.flexbox {
     margin-inline-start: 0;
     margin-inline-end: 0;
   }
+}
+
+/**
+ * Scroll Indicators
+ */
+.scroll-away-from-top:before,
+.scroll-away-from-bottom:after {
+  content: '';
+  display: block;
+  position: absolute;
+  @include mixins.lightDark(color, #F2F2F2, #111);
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 50px;
+  background: linear-gradient(to bottom, currentColor, transparent);
+  z-index: 2;
+}
+.scroll-away-from-bottom:after {
+  top: auto;
+  bottom: 0;
+  background: linear-gradient(to top, currentColor, transparent);
 }
\ No newline at end of file
diff --git a/resources/views/layouts/tri.blade.php b/resources/views/layouts/tri.blade.php
index c3cedf0fbc2..061cc69945c 100644
--- a/resources/views/layouts/tri.blade.php
+++ b/resources/views/layouts/tri.blade.php
@@ -28,15 +28,15 @@ class="tri-layout-mobile-tab px-m py-m text-link active">
     <div refs="tri-layout@container" class="tri-layout-container" @yield('container-attrs') >
 
         <div class="tri-layout-sides print-hidden">
-            <div class="tri-layout-sides-content">
+            <div refs="tri-layout@sidebar-scroll-container" class="tri-layout-sides-content">
                 <div class="tri-layout-right print-hidden">
-                    <aside class="tri-layout-right-contents">
+                    <aside refs="tri-layout@sidebar-scroll-container" class="tri-layout-right-contents">
                         @yield('right')
                     </aside>
                 </div>
 
                 <div class="tri-layout-left print-hidden" id="sidebar">
-                    <aside class="tri-layout-left-contents">
+                    <aside refs="tri-layout@sidebar-scroll-container" class="tri-layout-left-contents">
                         @yield('left')
                     </aside>
                 </div>

From 0dcb2ec78c27db8a01d7902e443482bc87c6005d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 30 Jun 2025 15:36:27 +0100
Subject: [PATCH 585/666] Layout: Converted tri-layout component to ts

---
 .../{tri-layout.js => tri-layout.ts}          | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)
 rename resources/js/components/{tri-layout.js => tri-layout.ts} (75%)

diff --git a/resources/js/components/tri-layout.js b/resources/js/components/tri-layout.ts
similarity index 75%
rename from resources/js/components/tri-layout.js
rename to resources/js/components/tri-layout.ts
index 85533da5eed..40a2d369104 100644
--- a/resources/js/components/tri-layout.js
+++ b/resources/js/components/tri-layout.ts
@@ -1,20 +1,23 @@
 import {Component} from './component';
 
 export class TriLayout extends Component {
-
-    setup() {
+    private container!: HTMLElement;
+    private tabs!: HTMLElement[];
+    private sidebarScrollContainers!: HTMLElement[];
+
+    private lastLayoutType = 'none';
+    private onDestroy: (()=>void)|null = null;
+    private scrollCache: Record<string, number> = {
+        content: 0,
+        info: 0,
+    };
+    private lastTabShown = 'content';
+
+    setup(): void {
         this.container = this.$refs.container;
         this.tabs = this.$manyRefs.tab;
         this.sidebarScrollContainers = this.$manyRefs.sidebarScrollContainer;
 
-        this.lastLayoutType = 'none';
-        this.onDestroy = null;
-        this.scrollCache = {
-            content: 0,
-            info: 0,
-        };
-        this.lastTabShown = 'content';
-
         // Bind any listeners
         this.mobileTabClick = this.mobileTabClick.bind(this);
 
@@ -27,7 +30,7 @@ export class TriLayout extends Component {
         this.setupSidebarScrollHandlers();
     }
 
-    updateLayout() {
+    updateLayout(): void {
         let newLayout = 'tablet';
         if (window.innerWidth <= 1000) newLayout = 'mobile';
         if (window.innerWidth > 1400) newLayout = 'desktop';
@@ -59,16 +62,15 @@ export class TriLayout extends Component {
         };
     }
 
-    setupDesktop() {
+    setupDesktop(): void {
         //
     }
 
     /**
      * Action to run when the mobile info toggle bar is clicked/tapped
-     * @param event
      */
-    mobileTabClick(event) {
-        const {tab} = event.target.dataset;
+    mobileTabClick(event: MouseEvent): void {
+        const tab = (event.target as HTMLElement).dataset.tab || '';
         this.showTab(tab);
     }
 
@@ -76,16 +78,14 @@ export class TriLayout extends Component {
      * Show the content tab.
      * Used by the page-display component.
      */
-    showContent() {
+    showContent(): void {
         this.showTab('content', false);
     }
 
     /**
      * Show the given tab
-     * @param {String} tabName
-     * @param {Boolean }scroll
      */
-    showTab(tabName, scroll = true) {
+    showTab(tabName: string, scroll: boolean = true): void {
         this.scrollCache[this.lastTabShown] = document.documentElement.scrollTop;
 
         // Set tab status
@@ -100,7 +100,7 @@ export class TriLayout extends Component {
 
         // Set the scroll position from cache
         if (scroll) {
-            const pageHeader = document.querySelector('header');
+            const pageHeader = document.querySelector('header') as HTMLElement;
             const defaultScrollTop = pageHeader.getBoundingClientRect().bottom;
             document.documentElement.scrollTop = this.scrollCache[tabName] || defaultScrollTop;
             setTimeout(() => {
@@ -111,7 +111,7 @@ export class TriLayout extends Component {
         this.lastTabShown = tabName;
     }
 
-    setupSidebarScrollHandlers() {
+    setupSidebarScrollHandlers(): void {
         for (const sidebar of this.sidebarScrollContainers) {
             sidebar.addEventListener('scroll', () => this.handleSidebarScroll(sidebar), {
                 passive: true,
@@ -126,13 +126,15 @@ export class TriLayout extends Component {
         });
     }
 
-    handleSidebarScroll(sidebar) {
+    handleSidebarScroll(sidebar: HTMLElement): void {
         const scrollable = sidebar.clientHeight !== sidebar.scrollHeight;
         const atTop = sidebar.scrollTop === 0;
         const atBottom = (sidebar.scrollTop + sidebar.clientHeight) === sidebar.scrollHeight;
 
-        sidebar.parentElement.classList.toggle('scroll-away-from-top', !atTop && scrollable);
-        sidebar.parentElement.classList.toggle('scroll-away-from-bottom', !atBottom && scrollable);
+        if (sidebar.parentElement) {
+            sidebar.parentElement.classList.toggle('scroll-away-from-top', !atTop && scrollable);
+            sidebar.parentElement.classList.toggle('scroll-away-from-bottom', !atBottom && scrollable);
+        }
     }
 
 }

From 3d017594a8d4a9f52d4f1f3651995531c2e7eeb0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 1 Jul 2025 11:29:16 +0100
Subject: [PATCH 586/666] Opensearch: Fixed XML declaration when php short tags
 enabled

For #5673
---
 resources/views/misc/opensearch.blade.php | 2 +-
 tests/Meta/OpensearchTest.php             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/misc/opensearch.blade.php b/resources/views/misc/opensearch.blade.php
index 5c1503fc487..3d3a0ec5f7c 100644
--- a/resources/views/misc/opensearch.blade.php
+++ b/resources/views/misc/opensearch.blade.php
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+@php echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n"; @endphp
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
   <ShortName>{{ mb_strimwidth(setting('app-name'), 0, 16) }}</ShortName>
   <Description>{{ trans('common.opensearch_description', ['appName' => setting('app-name')]) }}</Description>
diff --git a/tests/Meta/OpensearchTest.php b/tests/Meta/OpensearchTest.php
index 38e1587168b..0c9ec9f4468 100644
--- a/tests/Meta/OpensearchTest.php
+++ b/tests/Meta/OpensearchTest.php
@@ -15,6 +15,7 @@ public function test_opensearch_endpoint()
 
         $resp = $this->get('/opensearch.xml');
         $resp->assertOk();
+        $resp->assertSee('<?xml version="1.0" encoding="UTF-8"?>' . "\n", false);
 
         $html = $this->withHtml($resp);
 

From add091305c0e23face6070f40f52c24e2d0f6df4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Jul 2025 12:15:25 +0100
Subject: [PATCH 587/666] Perms: Removed entity perm regen on general update

Should not be needed here as this is not directly used for information
which should impact permissions.
Been through uses to ensure that this is the case.
---
 app/Entities/Repos/BaseRepo.php | 3 +--
 app/Entities/Repos/PageRepo.php | 3 ++-
 app/Sorting/BookSorter.php      | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 151d5b0555b..ac5a44e679d 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -77,7 +77,6 @@ public function update(Entity $entity, array $input)
             $entity->touch();
         }
 
-        $entity->rebuildPermissions();
         $entity->indexForSearch();
         $this->referenceStore->updateForEntity($entity);
 
@@ -139,7 +138,7 @@ public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): vo
 
     /**
      * Sort the parent of the given entity, if any auto sort actions are set for it.
-     * Typical ran during create/update/insert events.
+     * Typically ran during create/update/insert events.
      */
     public function sortParent(Entity $entity): void
     {
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index c3be6d826a2..f081b33dc3a 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -77,6 +77,7 @@ public function publishDraft(Page $draft, array $input): Page
         $draft->priority = $this->getNewPriority($draft);
         $this->updateTemplateStatusAndContentFromInput($draft, $input);
         $this->baseRepo->update($draft, $input);
+        $draft->rebuildPermissions();
 
         $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
         $this->revisionRepo->storeNewForPage($draft, $summary);
@@ -91,7 +92,7 @@ public function publishDraft(Page $draft, array $input): Page
     /**
      * Directly update the content for the given page from the provided input.
      * Used for direct content access in a way that performs required changes
-     * (Search index & reference regen) without performing an official update.
+     * (Search index and reference regen) without performing an official update.
      */
     public function setContentFromInput(Page $page, array $input): void
     {
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index 6710f070ad6..cf41a6a94d0 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Sorting;
 
-use BookStack\App\Model;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;

From 47fd578edb0df2cc1613d7a823da6becc98e1f1a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 2 Jul 2025 22:25:59 +0100
Subject: [PATCH 588/666] Perms: Added transactions around permission effecting
 actions

---
 app/Entities/Controllers/BookController.php   |  5 +-
 .../Controllers/ChapterController.php         |  5 +-
 app/Entities/Repos/BookRepo.php               | 26 ++++----
 app/Entities/Repos/BookshelfRepo.php          | 15 ++---
 app/Entities/Repos/ChapterRepo.php            | 33 +++++-----
 app/Entities/Repos/PageRepo.php               | 57 +++++++++--------
 app/Entities/Tools/HierarchyTransformer.php   | 17 ++---
 app/Entities/Tools/TrashCan.php               | 28 +++++----
 app/Permissions/JointPermissionBuilder.php    | 36 +++++------
 app/Permissions/PermissionsController.php     | 22 +++++--
 app/Permissions/PermissionsRepo.php           | 63 ++++++++++---------
 app/Sorting/BookSortController.php            | 19 +++---
 app/Util/DatabaseTransaction.php              | 42 +++++++++++++
 13 files changed, 223 insertions(+), 145 deletions(-)
 create mode 100644 app/Util/DatabaseTransaction.php

diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index b1685081a3d..5d3d67f645c 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -18,6 +18,7 @@
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
+use BookStack\Util\DatabaseTransaction;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -263,7 +264,9 @@ public function convertToShelf(HierarchyTransformer $transformer, string $bookSl
         $this->checkPermission('bookshelf-create-all');
         $this->checkPermission('book-create-all');
 
-        $shelf = $transformer->transformBookToShelf($book);
+        $shelf = (new DatabaseTransaction(function () use ($book, $transformer) {
+            return $transformer->transformBookToShelf($book);
+        }))->run();
 
         return redirect($shelf->getUrl());
     }
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 4274589e260..677745500c3 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -18,6 +18,7 @@
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
+use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
@@ -269,7 +270,9 @@ public function convertToBook(HierarchyTransformer $transformer, string $bookSlu
         $this->checkOwnablePermission('chapter-delete', $chapter);
         $this->checkPermission('book-create-all');
 
-        $book = $transformer->transformChapterToBook($chapter);
+        $book = (new DatabaseTransaction(function () use ($chapter, $transformer) {
+            return $transformer->transformChapterToBook($chapter);
+        }))->run();
 
         return redirect($book->getUrl());
     }
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 92e6a81c337..6d28d5d6aab 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -10,6 +10,7 @@
 use BookStack\Facades\Activity;
 use BookStack\Sorting\SortRule;
 use BookStack\Uploads\ImageRepo;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 use Illuminate\Http\UploadedFile;
 
@@ -28,19 +29,22 @@ public function __construct(
      */
     public function create(array $input): Book
     {
-        $book = new Book();
-        $this->baseRepo->create($book, $input);
-        $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
-        $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
-        Activity::add(ActivityType::BOOK_CREATE, $book);
+        return (new DatabaseTransaction(function () use ($input) {
+            $book = new Book();
 
-        $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
-        if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
-            $book->sort_rule_id = $defaultBookSortSetting;
-            $book->save();
-        }
+            $this->baseRepo->create($book, $input);
+            $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
+            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
+            Activity::add(ActivityType::BOOK_CREATE, $book);
 
-        return $book;
+            $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
+            if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
+                $book->sort_rule_id = $defaultBookSortSetting;
+                $book->save();
+            }
+
+            return $book;
+        }))->run();
     }
 
     /**
diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index a00349ef1ae..5d4d604bc30 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Facades\Activity;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class BookshelfRepo
@@ -23,13 +24,13 @@ public function __construct(
      */
     public function create(array $input, array $bookIds): Bookshelf
     {
-        $shelf = new Bookshelf();
-        $this->baseRepo->create($shelf, $input);
-        $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
-        $this->updateBooks($shelf, $bookIds);
-        Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
-
-        return $shelf;
+        return (new DatabaseTransaction(function () use ($input, $bookIds) {
+            $shelf = new Bookshelf();
+            $this->baseRepo->create($shelf, $input);
+            $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
+            $this->updateBooks($shelf, $bookIds);
+            Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
+        }))->run();
     }
 
     /**
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index fdf2de4e202..2ab6e671f6d 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -11,6 +11,7 @@
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class ChapterRepo
@@ -27,16 +28,16 @@ public function __construct(
      */
     public function create(array $input, Book $parentBook): Chapter
     {
-        $chapter = new Chapter();
-        $chapter->book_id = $parentBook->id;
-        $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
-        $this->baseRepo->create($chapter, $input);
-        $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
-        Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
-
-        $this->baseRepo->sortParent($chapter);
-
-        return $chapter;
+        return (new DatabaseTransaction(function () use ($input, $parentBook) {
+            $chapter = new Chapter();
+            $chapter->book_id = $parentBook->id;
+            $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
+            $this->baseRepo->create($chapter, $input);
+            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
+            Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
+
+            $this->baseRepo->sortParent($chapter);
+        }))->run();
     }
 
     /**
@@ -88,12 +89,14 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 
-        $chapter->changeBook($parent->id);
-        $chapter->rebuildPermissions();
-        Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
+        return (new DatabaseTransaction(function () use ($chapter, $parent) {
+            $chapter->changeBook($parent->id);
+            $chapter->rebuildPermissions();
+            Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
 
-        $this->baseRepo->sortParent($chapter);
+            $this->baseRepo->sortParent($chapter);
 
-        return $parent;
+            return $parent;
+        }))->run();
     }
 }
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index f081b33dc3a..63e8b8370ee 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -18,6 +18,7 @@
 use BookStack\Facades\Activity;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 
 class PageRepo
@@ -61,8 +62,10 @@ public function getNewDraftPage(Entity $parent)
             ]);
         }
 
-        $page->save();
-        $page->refresh()->rebuildPermissions();
+        (new DatabaseTransaction(function () use ($page) {
+            $page->save();
+            $page->refresh()->rebuildPermissions();
+        }))->run();
 
         return $page;
     }
@@ -72,21 +75,23 @@ public function getNewDraftPage(Entity $parent)
      */
     public function publishDraft(Page $draft, array $input): Page
     {
-        $draft->draft = false;
-        $draft->revision_count = 1;
-        $draft->priority = $this->getNewPriority($draft);
-        $this->updateTemplateStatusAndContentFromInput($draft, $input);
-        $this->baseRepo->update($draft, $input);
-        $draft->rebuildPermissions();
-
-        $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
-        $this->revisionRepo->storeNewForPage($draft, $summary);
-        $draft->refresh();
-
-        Activity::add(ActivityType::PAGE_CREATE, $draft);
-        $this->baseRepo->sortParent($draft);
-
-        return $draft;
+        return (new DatabaseTransaction(function () use ($draft, $input) {
+            $draft->draft = false;
+            $draft->revision_count = 1;
+            $draft->priority = $this->getNewPriority($draft);
+            $this->updateTemplateStatusAndContentFromInput($draft, $input);
+            $this->baseRepo->update($draft, $input);
+            $draft->rebuildPermissions();
+
+            $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+            $this->revisionRepo->storeNewForPage($draft, $summary);
+            $draft->refresh();
+
+            Activity::add(ActivityType::PAGE_CREATE, $draft);
+            $this->baseRepo->sortParent($draft);
+
+            return $draft;
+        }))->run();
     }
 
     /**
@@ -117,7 +122,7 @@ public function update(Page $page, array $input): Page
         $page->revision_count++;
         $page->save();
 
-        // Remove all update drafts for this user & page.
+        // Remove all update drafts for this user and page.
         $this->revisionRepo->deleteDraftsForCurrentUser($page);
 
         // Save a revision after updating
@@ -270,16 +275,18 @@ public function move(Page $page, string $parentIdentifier): Entity
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 
-        $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
-        $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
-        $page->changeBook($newBookId);
-        $page->rebuildPermissions();
+        return (new DatabaseTransaction(function () use ($page, $parent) {
+            $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
+            $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
+            $page->changeBook($newBookId);
+            $page->rebuildPermissions();
 
-        Activity::add(ActivityType::PAGE_MOVE, $page);
+            Activity::add(ActivityType::PAGE_MOVE, $page);
 
-        $this->baseRepo->sortParent($page);
+            $this->baseRepo->sortParent($page);
 
-        return $parent;
+            return $parent;
+        }))->run();
     }
 
     /**
diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php
index cd6c548fe58..b0d8880f402 100644
--- a/app/Entities/Tools/HierarchyTransformer.php
+++ b/app/Entities/Tools/HierarchyTransformer.php
@@ -13,17 +13,12 @@
 
 class HierarchyTransformer
 {
-    protected BookRepo $bookRepo;
-    protected BookshelfRepo $shelfRepo;
-    protected Cloner $cloner;
-    protected TrashCan $trashCan;
-
-    public function __construct(BookRepo $bookRepo, BookshelfRepo $shelfRepo, Cloner $cloner, TrashCan $trashCan)
-    {
-        $this->bookRepo = $bookRepo;
-        $this->shelfRepo = $shelfRepo;
-        $this->cloner = $cloner;
-        $this->trashCan = $trashCan;
+    public function __construct(
+        protected BookRepo $bookRepo,
+        protected BookshelfRepo $shelfRepo,
+        protected Cloner $cloner,
+        protected TrashCan $trashCan
+    ) {
     }
 
     /**
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index 39c982cdc92..5e8a9371942 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -15,6 +15,7 @@
 use BookStack\Facades\Activity;
 use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\ImageService;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -357,25 +358,26 @@ protected function restoreEntity(Entity $entity): int
 
     /**
      * Destroy the given entity.
+     * Returns the number of total entities destroyed in the operation.
      *
      * @throws Exception
      */
     public function destroyEntity(Entity $entity): int
     {
-        if ($entity instanceof Page) {
-            return $this->destroyPage($entity);
-        }
-        if ($entity instanceof Chapter) {
-            return $this->destroyChapter($entity);
-        }
-        if ($entity instanceof Book) {
-            return $this->destroyBook($entity);
-        }
-        if ($entity instanceof Bookshelf) {
-            return $this->destroyShelf($entity);
-        }
+        $result = (new DatabaseTransaction(function () use ($entity) {
+            if ($entity instanceof Page) {
+                return $this->destroyPage($entity);
+            } else if ($entity instanceof Chapter) {
+                return $this->destroyChapter($entity);
+            } else if ($entity instanceof Book) {
+                return $this->destroyBook($entity);
+            } else if ($entity instanceof Bookshelf) {
+                return $this->destroyShelf($entity);
+            }
+            return null;
+        }))->run();
 
-        return 0;
+        return $result ?? 0;
     }
 
     /**
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index c2922cdc961..56b22ad1604 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -29,7 +29,7 @@ public function __construct(
     /**
      * Re-generate all entity permission from scratch.
      */
-    public function rebuildForAll()
+    public function rebuildForAll(): void
     {
         JointPermission::query()->truncate();
 
@@ -51,7 +51,7 @@ public function rebuildForAll()
     /**
      * Rebuild the entity jointPermissions for a particular entity.
      */
-    public function rebuildForEntity(Entity $entity)
+    public function rebuildForEntity(Entity $entity): void
     {
         $entities = [$entity];
         if ($entity instanceof Book) {
@@ -119,7 +119,7 @@ protected function bookFetchQuery(): Builder
     /**
      * Build joint permissions for the given book and role combinations.
      */
-    protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false)
+    protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false): void
     {
         $entities = clone $books;
 
@@ -143,7 +143,7 @@ protected function buildJointPermissionsForBooks(EloquentCollection $books, arra
     /**
      * Rebuild the entity jointPermissions for a collection of entities.
      */
-    protected function buildJointPermissionsForEntities(array $entities)
+    protected function buildJointPermissionsForEntities(array $entities): void
     {
         $roles = Role::query()->get()->values()->all();
         $this->deleteManyJointPermissionsForEntities($entities);
@@ -155,21 +155,19 @@ protected function buildJointPermissionsForEntities(array $entities)
      *
      * @param Entity[] $entities
      */
-    protected function deleteManyJointPermissionsForEntities(array $entities)
+    protected function deleteManyJointPermissionsForEntities(array $entities): void
     {
         $simpleEntities = $this->entitiesToSimpleEntities($entities);
         $idsByType = $this->entitiesToTypeIdMap($simpleEntities);
 
-        DB::transaction(function () use ($idsByType) {
-            foreach ($idsByType as $type => $ids) {
-                foreach (array_chunk($ids, 1000) as $idChunk) {
-                    DB::table('joint_permissions')
-                        ->where('entity_type', '=', $type)
-                        ->whereIn('entity_id', $idChunk)
-                        ->delete();
-                }
+        foreach ($idsByType as $type => $ids) {
+            foreach (array_chunk($ids, 1000) as $idChunk) {
+                DB::table('joint_permissions')
+                    ->where('entity_type', '=', $type)
+                    ->whereIn('entity_id', $idChunk)
+                    ->delete();
             }
-        });
+        }
     }
 
     /**
@@ -195,7 +193,7 @@ protected function entitiesToSimpleEntities(array $entities): array
      * @param Entity[] $originalEntities
      * @param Role[]   $roles
      */
-    protected function createManyJointPermissions(array $originalEntities, array $roles)
+    protected function createManyJointPermissions(array $originalEntities, array $roles): void
     {
         $entities = $this->entitiesToSimpleEntities($originalEntities);
         $jointPermissions = [];
@@ -225,11 +223,9 @@ protected function createManyJointPermissions(array $originalEntities, array $ro
             }
         }
 
-        DB::transaction(function () use ($jointPermissions) {
-            foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
-                DB::table('joint_permissions')->insert($jointPermissionChunk);
-            }
-        });
+        foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
+            DB::table('joint_permissions')->insert($jointPermissionChunk);
+        }
     }
 
     /**
diff --git a/app/Permissions/PermissionsController.php b/app/Permissions/PermissionsController.php
index 5d2035870bc..9dcfe242ec0 100644
--- a/app/Permissions/PermissionsController.php
+++ b/app/Permissions/PermissionsController.php
@@ -7,6 +7,7 @@
 use BookStack\Http\Controller;
 use BookStack\Permissions\Models\EntityPermission;
 use BookStack\Users\Models\Role;
+use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 
 class PermissionsController extends Controller
@@ -40,7 +41,9 @@ public function updateForPage(Request $request, string $bookSlug, string $pageSl
         $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 
-        $this->permissionsUpdater->updateFromPermissionsForm($page, $request);
+        (new DatabaseTransaction(function () use ($page, $request) {
+            $this->permissionsUpdater->updateFromPermissionsForm($page, $request);
+        }))->run();
 
         $this->showSuccessNotification(trans('entities.pages_permissions_success'));
 
@@ -70,7 +73,9 @@ public function updateForChapter(Request $request, string $bookSlug, string $cha
         $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 
-        $this->permissionsUpdater->updateFromPermissionsForm($chapter, $request);
+        (new DatabaseTransaction(function () use ($chapter, $request) {
+            $this->permissionsUpdater->updateFromPermissionsForm($chapter, $request);
+        }))->run();
 
         $this->showSuccessNotification(trans('entities.chapters_permissions_success'));
 
@@ -100,7 +105,9 @@ public function updateForBook(Request $request, string $slug)
         $book = $this->queries->books->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $book);
 
-        $this->permissionsUpdater->updateFromPermissionsForm($book, $request);
+        (new DatabaseTransaction(function () use ($book, $request) {
+            $this->permissionsUpdater->updateFromPermissionsForm($book, $request);
+        }))->run();
 
         $this->showSuccessNotification(trans('entities.books_permissions_updated'));
 
@@ -130,7 +137,9 @@ public function updateForShelf(Request $request, string $slug)
         $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
-        $this->permissionsUpdater->updateFromPermissionsForm($shelf, $request);
+        (new DatabaseTransaction(function () use ($shelf, $request) {
+            $this->permissionsUpdater->updateFromPermissionsForm($shelf, $request);
+        }))->run();
 
         $this->showSuccessNotification(trans('entities.shelves_permissions_updated'));
 
@@ -145,7 +154,10 @@ public function copyShelfPermissionsToBooks(string $slug)
         $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
-        $updateCount = $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf);
+        $updateCount = (new DatabaseTransaction(function () use ($shelf) {
+            return $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf);
+        }))->run();
+
         $this->showSuccessNotification(trans('entities.shelves_copy_permission_success', ['count' => $updateCount]));
 
         return redirect($shelf->getUrl());
diff --git a/app/Permissions/PermissionsRepo.php b/app/Permissions/PermissionsRepo.php
index b41612968b4..6ced7b7511c 100644
--- a/app/Permissions/PermissionsRepo.php
+++ b/app/Permissions/PermissionsRepo.php
@@ -7,6 +7,7 @@
 use BookStack\Facades\Activity;
 use BookStack\Permissions\Models\RolePermission;
 use BookStack\Users\Models\Role;
+use BookStack\Util\DatabaseTransaction;
 use Exception;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -48,38 +49,42 @@ public function getRoleById(int $id): Role
      */
     public function saveNewRole(array $roleData): Role
     {
-        $role = new Role($roleData);
-        $role->mfa_enforced = boolval($roleData['mfa_enforced'] ?? false);
-        $role->save();
+        return (new DatabaseTransaction(function () use ($roleData) {
+            $role = new Role($roleData);
+            $role->mfa_enforced = boolval($roleData['mfa_enforced'] ?? false);
+            $role->save();
 
-        $permissions = $roleData['permissions'] ?? [];
-        $this->assignRolePermissions($role, $permissions);
-        $this->permissionBuilder->rebuildForRole($role);
+            $permissions = $roleData['permissions'] ?? [];
+            $this->assignRolePermissions($role, $permissions);
+            $this->permissionBuilder->rebuildForRole($role);
 
-        Activity::add(ActivityType::ROLE_CREATE, $role);
+            Activity::add(ActivityType::ROLE_CREATE, $role);
 
-        return $role;
+            return $role;
+        }))->run();
     }
 
     /**
      * Updates an existing role.
-     * Ensures Admin system role always have core permissions.
+     * Ensures the Admin system role always has core permissions.
      */
     public function updateRole($roleId, array $roleData): Role
     {
         $role = $this->getRoleById($roleId);
 
-        if (isset($roleData['permissions'])) {
-            $this->assignRolePermissions($role, $roleData['permissions']);
-        }
+        return (new DatabaseTransaction(function () use ($role, $roleData) {
+            if (isset($roleData['permissions'])) {
+                $this->assignRolePermissions($role, $roleData['permissions']);
+            }
 
-        $role->fill($roleData);
-        $role->save();
-        $this->permissionBuilder->rebuildForRole($role);
+            $role->fill($roleData);
+            $role->save();
+            $this->permissionBuilder->rebuildForRole($role);
 
-        Activity::add(ActivityType::ROLE_UPDATE, $role);
+            Activity::add(ActivityType::ROLE_UPDATE, $role);
 
-        return $role;
+            return $role;
+        }))->run();
     }
 
     /**
@@ -114,7 +119,7 @@ protected function assignRolePermissions(Role $role, array $permissionNameArray
     /**
      * Delete a role from the system.
      * Check it's not an admin role or set as default before deleting.
-     * If a migration Role ID is specified the users assign to the current role
+     * If a migration Role ID is specified, the users assigned to the current role
      * will be added to the role of the specified id.
      *
      * @throws PermissionsException
@@ -131,17 +136,19 @@ public function deleteRole(int $roleId, int $migrateRoleId = 0): void
             throw new PermissionsException(trans('errors.role_registration_default_cannot_delete'));
         }
 
-        if ($migrateRoleId !== 0) {
-            $newRole = Role::query()->find($migrateRoleId);
-            if ($newRole) {
-                $users = $role->users()->pluck('id')->toArray();
-                $newRole->users()->sync($users);
+        (new DatabaseTransaction(function () use ($migrateRoleId, $role) {
+            if ($migrateRoleId !== 0) {
+                $newRole = Role::query()->find($migrateRoleId);
+                if ($newRole) {
+                    $users = $role->users()->pluck('id')->toArray();
+                    $newRole->users()->sync($users);
+                }
             }
-        }
 
-        $role->entityPermissions()->delete();
-        $role->jointPermissions()->delete();
-        Activity::add(ActivityType::ROLE_DELETE, $role);
-        $role->delete();
+            $role->entityPermissions()->delete();
+            $role->jointPermissions()->delete();
+            Activity::add(ActivityType::ROLE_DELETE, $role);
+            $role->delete();
+        }))->run();
     }
 }
diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index 479d1972440..d70d0e6565a 100644
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
+use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 
 class BookSortController extends Controller
@@ -55,16 +56,18 @@ public function update(Request $request, BookSorter $sorter, string $bookSlug)
 
         // Sort via map
         if ($request->filled('sort-tree')) {
-            $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
-            $booksInvolved = $sorter->sortUsingMap($sortMap);
+            (new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) {
+                $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
+                $booksInvolved = $sorter->sortUsingMap($sortMap);
 
-            // Rebuild permissions and add activity for involved books.
-            foreach ($booksInvolved as $bookInvolved) {
-                Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
-                if ($bookInvolved->id === $book->id) {
-                    $loggedActivityForBook = true;
+                // Add activity for involved books.
+                foreach ($booksInvolved as $bookInvolved) {
+                    Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+                    if ($bookInvolved->id === $book->id) {
+                        $loggedActivityForBook = true;
+                    }
                 }
-            }
+            }))->run();
         }
 
         if ($request->filled('auto-sort')) {
diff --git a/app/Util/DatabaseTransaction.php b/app/Util/DatabaseTransaction.php
new file mode 100644
index 00000000000..e36bd2ef310
--- /dev/null
+++ b/app/Util/DatabaseTransaction.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace BookStack\Util;
+
+use Closure;
+use Illuminate\Support\Facades\DB;
+use Throwable;
+
+/**
+ * Run the given code within a database transactions.
+ * Wraps Laravel's own transaction method, but sets a specific runtime isolation method.
+ * This sets a session level since this won't cause issues if already within a transaction,
+ * and this should apply to the next transactions anyway.
+ *
+ * "READ COMMITTED" ensures that changes from other transactions can be read within
+ * a transaction, even if started afterward (and for example, it was blocked by the initial
+ * transaction). This is quite important for things like permission generation, where we would
+ * want to consider the changes made by other committed transactions by the time we come to
+ * regenerate permission access.
+ *
+ * @throws Throwable
+ * @template TReturn of mixed
+ */
+class DatabaseTransaction
+{
+    /**
+     * @param  (Closure(static): TReturn)  $callback
+     */
+    public function __construct(
+        protected Closure $callback
+    ) {
+    }
+
+    /**
+     * @return TReturn
+     */
+    public function run(): mixed
+    {
+        DB::statement('SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED');
+        return DB::transaction($this->callback);
+    }
+}

From 35a51197cee66385f61a0f8616aac3ff232dc089 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 6 Jul 2025 22:52:06 +0100
Subject: [PATCH 589/666] Perms: Fixed some issues made when adding
 transactions

---
 app/Entities/Repos/BookshelfRepo.php | 1 +
 app/Entities/Repos/ChapterRepo.php   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index 5d4d604bc30..8e60f58c42f 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -30,6 +30,7 @@ public function create(array $input, array $bookIds): Bookshelf
             $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
             $this->updateBooks($shelf, $bookIds);
             Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
+            return $shelf;
         }))->run();
     }
 
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 2ab6e671f6d..6503e63cfaf 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -37,6 +37,8 @@ public function create(array $input, Book $parentBook): Chapter
             Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
             $this->baseRepo->sortParent($chapter);
+
+            return $chapter;
         }))->run();
     }
 

From c934b9319f09ea9e20d6e2d5999de8e243888aad Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 7 Jul 2025 14:24:04 +0100
Subject: [PATCH 590/666] PHP: Updated composer packages

Main intent was to get latest ssddanbrown/htmldiff version so better
handle non-ascii languages.
---
 composer.json |   2 +-
 composer.lock | 292 ++++++++++++++++++++++++++------------------------
 2 files changed, 153 insertions(+), 141 deletions(-)

diff --git a/composer.json b/composer.json
index b77c90dd31c..09f08daee17 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
         "socialiteproviders/microsoft-azure": "^5.1",
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
-        "ssddanbrown/htmldiff": "^1.0.2",
+        "ssddanbrown/htmldiff": "^2.0.0",
         "ssddanbrown/symfony-mailer": "7.2.x-dev"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index b7369550aae..c4f1a1638e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "95a803e4d7797c8ab6c9803a6a3e99e5",
+    "content-hash": "d9b8455cf3ec02c21bea7ee94463331b",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.344.6",
+            "version": "3.349.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "eb0bc621472592545539329499961a15a3f9f6dc"
+                "reference": "63cc727845f077d17cb94791deb327249e1626ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb0bc621472592545539329499961a15a3f9f6dc",
-                "reference": "eb0bc621472592545539329499961a15a3f9f6dc",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/63cc727845f077d17cb94791deb327249e1626ce",
+                "reference": "63cc727845f077d17cb94791deb327249e1626ce",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.344.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.349.2"
             },
-            "time": "2025-06-12T18:03:59+00:00"
+            "time": "2025-07-03T18:08:27+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2402,16 +2402,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.29.1",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
                 "shasum": ""
             },
             "require": {
@@ -2435,13 +2435,13 @@
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
-                "ext-mongodb": "^1.3",
+                "ext-mongodb": "^1.3|^2",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
                 "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
-                "mongodb/mongodb": "^1.2",
+                "mongodb/mongodb": "^1.2|^2",
                 "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
@@ -2479,9 +2479,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
             },
-            "time": "2024-10-08T08:58:34+00:00"
+            "time": "2025-06-25T13:29:59+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -2540,16 +2540,16 @@
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.29.0",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
                 "shasum": ""
             },
             "require": {
@@ -2583,9 +2583,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
             },
-            "time": "2024-08-09T21:24:39+00:00"
+            "time": "2025-05-21T10:34:19+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.0",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
                 "shasum": ""
             },
             "require": {
@@ -3386,7 +3386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-12T10:24:28+00:00"
+            "time": "2025-06-21T15:19:35+00:00"
         },
         {
             "name": "nette/schema",
@@ -3939,16 +3939,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.43",
+            "version": "3.0.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
                 "shasum": ""
             },
             "require": {
@@ -4029,7 +4029,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46"
             },
             "funding": [
                 {
@@ -4045,7 +4045,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-14T21:12:59+00:00"
+            "time": "2025-06-26T16:29:55+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -4575,16 +4575,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.8",
+            "version": "v0.12.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
+                "reference": "1b801844becfe648985372cb4b12ad6840245ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
-                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1b801844becfe648985372cb4b12ad6840245ace",
+                "reference": "1b801844becfe648985372cb4b12ad6840245ace",
                 "shasum": ""
             },
             "require": {
@@ -4648,9 +4648,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.9"
             },
-            "time": "2025-03-16T03:05:19+00:00"
+            "time": "2025-06-23T02:35:06+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -4774,21 +4774,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.8.1",
+            "version": "4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
-                "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -4847,9 +4846,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
             },
-            "time": "2025-06-01T06:28:46+00:00"
+            "time": "2025-06-25T14:20:11+00:00"
         },
         {
             "name": "robrichards/xmlseclibs",
@@ -5276,22 +5275,23 @@
         },
         {
             "name": "ssddanbrown/htmldiff",
-            "version": "v1.0.4",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://codeberg.org/danb/HtmlDiff",
-                "reference": "d5cbd43f66c4e512cc0ab71d0e0b07271e7d6af6"
+                "reference": "b7bc848b01ae6e26a3e4ad4f07cd816e6faa8fe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://codeberg.org/api/v1/repos/danb/HtmlDiff/archive/%prettyVersion%.zip"
+                "url": "https://codeberg.org/api/v1/repos/danb/HtmlDiff/archive/%prettyVersion%.zip",
+                "reference": "b7bc848b01ae6e26a3e4ad4f07cd816e6faa8fe8"
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=7.2"
+                "php": ">=8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5|^9.5.9",
+                "phpunit/phpunit": "^9.6.22",
                 "vimeo/psalm": "^4.10"
             },
             "type": "library",
@@ -5323,7 +5323,7 @@
                     "type": "kofi"
                 }
             ],
-            "time": "2024-12-12T16:45:37+00:00"
+            "time": "2025-07-07T11:55:59+00:00"
         },
         {
             "name": "ssddanbrown/symfony-mailer",
@@ -5475,16 +5475,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
                 "shasum": ""
             },
             "require": {
@@ -5549,7 +5549,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -5565,7 +5565,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5701,16 +5701,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83"
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf68d225bc43629de4ff54778029aee6dc191b83",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/35b55b166f6752d6aaf21aa042fc5ed280fce235",
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235",
                 "shasum": ""
             },
             "require": {
@@ -5758,7 +5758,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.3.0"
+                "source": "https://github.com/symfony/error-handler/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -5774,7 +5774,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-13T07:48:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5998,16 +5998,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "4236baf01609667d53b20371486228231eb135fd"
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4236baf01609667d53b20371486228231eb135fd",
-                "reference": "4236baf01609667d53b20371486228231eb135fd",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/23dd60256610c86a3414575b70c596e5deff6ed9",
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9",
                 "shasum": ""
             },
             "require": {
@@ -6057,7 +6057,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -6073,20 +6073,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-12T14:48:23+00:00"
+            "time": "2025-06-23T15:07:14+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f"
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ac7b8e163e8c83dce3abcc055a502d4486051a9f",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1644879a66e4aa29c36fe33dfa6c54b450ce1831",
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831",
                 "shasum": ""
             },
             "require": {
@@ -6171,7 +6171,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -6187,7 +6187,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:47:32+00:00"
+            "time": "2025-06-28T08:24:55+00:00"
         },
         {
             "name": "symfony/mime",
@@ -7224,16 +7224,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/241d5ac4910d256660238a7ecf250deba4c73063",
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063",
                 "shasum": ""
             },
             "require": {
@@ -7300,7 +7300,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.0"
+                "source": "https://github.com/symfony/translation/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7316,7 +7316,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7398,16 +7398,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3"
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/a69f69f3159b852651a6bf45a9fdd149520525bb",
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb",
                 "shasum": ""
             },
             "require": {
@@ -7452,7 +7452,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.3.0"
+                "source": "https://github.com/symfony/uid/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7468,20 +7468,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T14:28:13+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e"
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/548f6760c54197b1084e1e5c71f6d9d523f2f78e",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
                 "shasum": ""
             },
             "require": {
@@ -7536,7 +7536,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.0"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7552,7 +7552,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-27T18:39:23+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7892,16 +7892,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.2",
+            "version": "2.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3"
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/89dabca1490bc77dbcab41c2b20968c7e44bf7c3",
-                "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
+                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
                 "shasum": ""
             },
             "require": {
@@ -7951,7 +7951,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.2"
+                "source": "https://github.com/filp/whoops/tree/2.18.3"
             },
             "funding": [
                 {
@@ -7959,7 +7959,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-11T20:42:19+00:00"
+            "time": "2025-06-16T00:02:10+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8131,16 +8131,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404"
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/36706736a0c51d3337478fab9c919d78d2e03404",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/e8ccd73008487ba91da9877b373f8c447743f1ce",
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce",
                 "shasum": ""
             },
             "require": {
@@ -8208,7 +8208,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.4.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -8216,7 +8216,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-10T09:34:58+00:00"
+            "time": "2025-06-19T22:41:50+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8303,16 +8303,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.1",
+            "version": "1.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36",
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36",
                 "shasum": ""
             },
             "require": {
@@ -8351,7 +8351,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3"
             },
             "funding": [
                 {
@@ -8359,20 +8359,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-29T12:36:36+00:00"
+            "time": "2025-07-05T12:25:42+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.8.1",
+            "version": "v8.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5"
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
                 "shasum": ""
             },
             "require": {
@@ -8458,7 +8458,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-06-11T01:04:21+00:00"
+            "time": "2025-06-25T02:12:12+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8638,16 +8638,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.9",
+            "version": "11.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7"
+                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
-                "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1a800a7446add2d79cc6b3c01c45381810367d76",
+                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76",
                 "shasum": ""
             },
             "require": {
@@ -8704,15 +8704,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/show"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-25T13:26:39+00:00"
+            "time": "2025-06-18T08:56:18+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -8961,16 +8973,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.23",
+            "version": "11.5.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "86ebcd8a3dbcd1857d88505109b2a2b376501cde"
+                "reference": "4ad8fe263a0b55b54a8028c38a18e3c5bef312e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86ebcd8a3dbcd1857d88505109b2a2b376501cde",
-                "reference": "86ebcd8a3dbcd1857d88505109b2a2b376501cde",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ad8fe263a0b55b54a8028c38a18e3c5bef312e0",
+                "reference": "4ad8fe263a0b55b54a8028c38a18e3c5bef312e0",
                 "shasum": ""
             },
             "require": {
@@ -8984,7 +8996,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.9",
+                "phpunit/php-code-coverage": "^11.0.10",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
@@ -9042,7 +9054,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.23"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.26"
             },
             "funding": [
                 {
@@ -9066,7 +9078,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-13T05:47:49+00:00"
+            "time": "2025-07-04T05:58:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10008,16 +10020,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.1",
+            "version": "3.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "1b71b4dd7e7ef651ac749cea67e513c0c832f4bd"
+                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1b71b4dd7e7ef651ac749cea67e513c0c832f4bd",
-                "reference": "1b71b4dd7e7ef651ac749cea67e513c0c832f4bd",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c",
+                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c",
                 "shasum": ""
             },
             "require": {
@@ -10088,7 +10100,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-06-12T15:04:34+00:00"
+            "time": "2025-06-17T22:17:01+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
@@ -10188,16 +10200,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "0fabbc3d6a9c473b716a93fc8e7a537adb396166"
+                "reference": "8b2ee2e06ab99fa5f067b6699296d4e35c156bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0fabbc3d6a9c473b716a93fc8e7a537adb396166",
-                "reference": "0fabbc3d6a9c473b716a93fc8e7a537adb396166",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8b2ee2e06ab99fa5f067b6699296d4e35c156bb9",
+                "reference": "8b2ee2e06ab99fa5f067b6699296d4e35c156bb9",
                 "shasum": ""
             },
             "require": {
@@ -10235,7 +10247,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.0"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -10251,7 +10263,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-05T10:15:41+00:00"
+            "time": "2025-06-15T10:07:06+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 2be892be70adc615ad9bc79da72abd7151bf3089 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 7 Jul 2025 14:35:19 +0100
Subject: [PATCH 591/666] Updated translations with latest Crowdin changes
 (#5659)

---
 lang/cs/entities.php      |  12 +-
 lang/fr/entities.php      |  12 +-
 lang/it/entities.php      |   2 +-
 lang/ne/activities.php    | 140 +++++++++++
 lang/ne/auth.php          | 117 ++++++++++
 lang/ne/common.php        | 115 ++++++++++
 lang/ne/components.php    |  46 ++++
 lang/ne/editor.php        | 181 +++++++++++++++
 lang/ne/entities.php      | 471 ++++++++++++++++++++++++++++++++++++++
 lang/ne/errors.php        | 133 +++++++++++
 lang/ne/notifications.php |  27 +++
 lang/ne/pagination.php    |  12 +
 lang/ne/passwords.php     |  15 ++
 lang/ne/preferences.php   |  51 +++++
 lang/ne/settings.php      | 369 +++++++++++++++++++++++++++++
 lang/ne/validation.php    | 122 ++++++++++
 lang/vi/activities.php    |  42 ++--
 lang/vi/auth.php          |   8 +-
 lang/vi/common.php        |  15 +-
 lang/vi/components.php    |   4 +-
 lang/vi/editor.php        |  92 ++++----
 lang/vi/entities.php      | 336 +++++++++++++--------------
 lang/vi/errors.php        |  46 ++--
 lang/vi/settings.php      | 220 +++++++++---------
 lang/vi/validation.php    |   8 +-
 lang/zh_CN/entities.php   |   4 +-
 26 files changed, 2200 insertions(+), 400 deletions(-)
 create mode 100644 lang/ne/activities.php
 create mode 100644 lang/ne/auth.php
 create mode 100644 lang/ne/common.php
 create mode 100644 lang/ne/components.php
 create mode 100644 lang/ne/editor.php
 create mode 100644 lang/ne/entities.php
 create mode 100644 lang/ne/errors.php
 create mode 100644 lang/ne/notifications.php
 create mode 100644 lang/ne/pagination.php
 create mode 100644 lang/ne/passwords.php
 create mode 100644 lang/ne/preferences.php
 create mode 100644 lang/ne/settings.php
 create mode 100644 lang/ne/validation.php

diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index eaeac76c525..2f7f09ebc9b 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -134,7 +134,7 @@
     'shelves_copy_permissions_to_books' => 'Kopírovat oprávnění na knihy',
     'shelves_copy_permissions' => 'Kopírovat oprávnění',
     'shelves_copy_permissions_explain' => 'Tímto se použije aktuální nastavení oprávnění police na všechny knihy v ní obsažené. Před aktivací se ujistěte, že byly uloženy všechny změny oprávnění této police.',
-    'shelves_copy_permission_success' => 'Oprávnění police byla zkopírována na :count knih',
+    'shelves_copy_permission_success' => '{1}Oprávnění police byla zkopírována na :count knihu|[2,4]Oprávnění police byla zkopírována na :count knihy|[5,*]Oprávnění police byla zkopírována na :count knih',
 
     // Books
     'book' => 'Kniha',
@@ -194,7 +194,7 @@
     // Chapters
     'chapter' => 'Kapitola',
     'chapters' => 'Kapitoly',
-    'x_chapters' => '{0}:count Kapitol|{1}:count Kapitola|[2,4]:count Kapitoly|[5,*]:count Kapitol',
+    'x_chapters' => '{0}:count kapitol|{1}:count kapitola|[2,4]:count kapitoly|[5,*]:count kapitol',
     'chapters_popular' => 'Populární kapitoly',
     'chapters_new' => 'Nová kapitola',
     'chapters_create' => 'Vytvořit novou kapitolu',
@@ -219,7 +219,7 @@
     // Pages
     'page' => 'Stránka',
     'pages' => 'Stránky',
-    'x_pages' => '{0}:count Stran|{1}:count Strana|[2,4]:count Strany|[5,*]:count Stran',
+    'x_pages' => '{0}:count stran|{1}:count strana|[2,4]:count strany|[5,*]:count stran',
     'pages_popular' => 'Populární stránky',
     'pages_new' => 'Nová stránka',
     'pages_attachments' => 'Přílohy',
@@ -312,7 +312,7 @@
     'pages_draft_edited_notification' => 'Tato stránka se od té doby změnila. Je doporučeno aktuální koncept zahodit.',
     'pages_draft_page_changed_since_creation' => 'Tato stránka byla aktualizována od vytvoření tohoto konceptu. Doporučuje se zrušit tento koncept nebo se postarat o to, abyste si nepřepsali žádné již zadané změny.',
     'pages_draft_edit_active' => [
-        'start_a' => 'Uživatelé začali upravovat tuto stránku (celkem :count)',
+        'start_a' => '{1}:count uživatel začal upravovat tuto stránku|[2,4]:count uživatelé začali upravovat tuto stránku|[5,*]:count uživatelů začalo upravovat tuto stránku',
         'start_b' => ':userName začal/a upravovat tuto stránku',
         'time_a' => 'od doby, kdy byla tato stránky naposledy aktualizována',
         'time_b' => 'v posledních minutách (:minCount min.)',
@@ -342,7 +342,7 @@
     'tags_assigned_chapters' => 'Přiřazeno ke kapitolám',
     'tags_assigned_books' => 'Přiřazeno ke knihám',
     'tags_assigned_shelves' => 'Přiřazeno k policím',
-    'tags_x_unique_values' => ':count jedinečných hodnot',
+    'tags_x_unique_values' => '{1}:count jedinečná hodnota|[2,4]:count jedinečné hodnoty|[5,*]:count jedinečných hodnot',
     'tags_all_values' => 'Všechny hodnoty',
     'tags_view_tags' => 'Zobrazit štítky',
     'tags_view_existing_tags' => 'Zobrazit existující štítky',
@@ -394,7 +394,7 @@
     'comment_add' => 'Přidat komentář',
     'comment_none' => 'Žádné komentáře k zobrazení',
     'comment_placeholder' => 'Zde zadejte komentář',
-    'comment_thread_count' => ':count vlákno komentáře|:count vláken komentářů',
+    'comment_thread_count' => '{0}:count vláken komentářů|{1}:count vlákno komentářů|[2,4]:count vlákna komentářů|[5,*]:count vláken komentářů',
     'comment_archived_count' => ':count archivováno',
     'comment_archived_threads' => 'Archivovaná vlákna',
     'comment_save' => 'Uložit komentář',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 0202f98a754..f538307ae2d 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Contenu stable)',
     'pages_edit_switch_to_wysiwyg' => 'Basculer vers l\'éditeur WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Basculer vers le nouveau WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En bêta-test)',
     'pages_edit_set_changelog' => 'Remplir le journal des changements',
     'pages_edit_enter_changelog_desc' => 'Entrez une brève description des changements effectués',
     'pages_edit_enter_changelog' => 'Ouvrir le journal des changements',
@@ -394,9 +394,9 @@
     'comment_add' => 'Ajouter un commentaire',
     'comment_none' => 'Aucun commentaire à afficher',
     'comment_placeholder' => 'Entrez vos commentaires ici',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_thread_count' => ':count Fil de commentaires|:count Fils de commentaires',
     'comment_archived_count' => ':count Archivé',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_archived_threads' => 'Fils archivés',
     'comment_save' => 'Enregistrer le commentaire',
     'comment_new' => 'Nouveau commentaire',
     'comment_created' => 'commenté :createDiff',
@@ -407,12 +407,12 @@
     'comment_updated_success' => 'Commentaire mis à jour',
     'comment_archive_success' => 'Commentaire archivé',
     'comment_unarchive_success' => 'Commentaire désarchiver',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_view' => 'Voir le commentaire',
+    'comment_jump_to_thread' => 'Aller au fil',
     'comment_delete_confirm' => 'Êtes-vous sûr de vouloir supprimer ce commentaire ?',
     'comment_in_reply_to' => 'En réponse à :commentId',
     'comment_reference' => 'Référence',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference_outdated' => '(Obsolète)',
     'comment_editor_explain' => 'Voici les commentaires qui ont été laissés sur cette page. Les commentaires peuvent être ajoutés et gérés en visualisant la page enregistrée.',
 
     // Revision
diff --git a/lang/it/entities.php b/lang/it/entities.php
index d615b0c0624..34a6a1015e3 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -394,7 +394,7 @@
     'comment_add' => 'Aggiungi commento',
     'comment_none' => 'Nessun commento da visualizzare',
     'comment_placeholder' => 'Scrivi un commento',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_thread_count' => ':count Commento Thread| :count Commenti Threads',
     'comment_archived_count' => ':count Archiviato',
     'comment_archived_threads' => 'Discussioni Archiviate',
     'comment_save' => 'Salva commento',
diff --git a/lang/ne/activities.php b/lang/ne/activities.php
new file mode 100644
index 00000000000..4b4edf7be3a
--- /dev/null
+++ b/lang/ne/activities.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'पाना सिर्जना गरियो',
+    'page_create_notification'    => 'पाना सफलतापूर्वक सिर्जना गरियो',
+    'page_update'                 => 'पाना अद्यावधिक गरियो',
+    'page_update_notification'    => 'पाना सफलतापूर्वक अद्यावधिक गरियो',
+    'page_delete'                 => 'पाना हटाइयो',
+    'page_delete_notification'    => 'पाना सफलतापूर्वक हटाइयो',
+    'page_restore'                => 'पाना पुनर्स्थापित गरियो',
+    'page_restore_notification'   => 'पाना सफलतापूर्वक पुनर्स्थापित गरियो',
+    'page_move'                   => 'पाना सारियो',
+    'page_move_notification'      => 'पाना सफलतापूर्वक सारियो',
+
+    // Chapters
+    'chapter_create'              => 'अध्याय सिर्जना गरियो',
+    'chapter_create_notification' => 'अध्याय सफलतापूर्वक सिर्जना गरियो',
+    'chapter_update'              => 'अध्याय अद्यावधिक गरियो',
+    'chapter_update_notification' => 'अध्याय सफलतापूर्वक अद्यावधिक गरियो',
+    'chapter_delete'              => 'अध्याय हटाइयो',
+    'chapter_delete_notification' => 'अध्याय सफलतापूर्वक हटाइयो',
+    'chapter_move'                => 'अध्याय सारियो',
+    'chapter_move_notification' => 'अध्याय सफलतापूर्वक सारियो',
+
+    // Books
+    'book_create'                 => 'पुस्तक सिर्जना गरियो',
+    'book_create_notification'    => 'पुस्तक सफलतापूर्वक सिर्जना गरियो',
+    'book_create_from_chapter'              => 'अध्यायलाई पुस्तकमा परिणत गरियो',
+    'book_create_from_chapter_notification' => 'अध्यायलाई पुस्तकमा सफलतापूर्वक परिणत गरियो',
+    'book_update'                 => 'पुस्तक अद्यावधिक गरियो',
+    'book_update_notification'    => 'पुस्तक सफलतापूर्वक अद्यावधिक गरियो',
+    'book_delete'                 => 'पुस्तक हटाइयो',
+    'book_delete_notification'    => 'पुस्तक सफलतापूर्वक हटाइयो',
+    'book_sort'                   => 'पुस्तक क्रमबद्ध गरियो',
+    'book_sort_notification'      => 'पुस्तक सफलतापूर्वक क्रमबद्ध गरियो',
+
+    // Bookshelves
+    'bookshelf_create'            => 'दराज बनाइयो',
+    'bookshelf_create_notification'    => 'दराज सफलतापूर्वक बनाइयो',
+    'bookshelf_create_from_book'    => 'पुस्तकलाई दराजमा परिणत गरियो',
+    'bookshelf_create_from_book_notification'    => 'पुस्तकलाई दराजमा सफलतापूर्वक परिणत गरियो',
+    'bookshelf_update'                 => 'दराज अद्यावधिक गरियो',
+    'bookshelf_update_notification'    => 'दराज सफलतापूर्वक अद्यावधिक गरियो',
+    'bookshelf_delete'                 => 'दराज हटाइयो',
+    'bookshelf_delete_notification'    => 'दराज सफलतापूर्वक हटाइयो',
+
+    // Revisions
+    'revision_restore' => 'संशोधन पुनर्स्थापित गरियो',
+    'revision_delete' => 'संशोधन हटाइयो',
+    'revision_delete_notification' => 'संशोधन सफलतापूर्वक हटाइयो',
+
+    // Favourites
+    'favourite_add_notification' => '":name" तपाईंको मनपर्नेमा थपिएको छ',
+    'favourite_remove_notification' => '":name" तपाईंको मनपर्नेबाट हटाइएको छ',
+
+    // Watching
+    'watch_update_level_notification' => 'हेर्ने अभिरुचि सफलतापूर्वक अद्यावधिक गरियो',
+
+    // Auth
+    'auth_login' => 'लग इन भयो',
+    'auth_register' => 'नयाँ प्रयोगकर्ता रूपमा दर्ता गरियो',
+    'auth_password_reset_request' => 'प्रयोगकर्ताको पासवर्ड रिसेटको अनुरोध गरियो',
+    'auth_password_reset_update' => 'प्रयोगकर्ता पासवर्ड रिसेट गर्नुहोस्',
+    'mfa_setup_method' => 'MFA विधि सेटअप गरियो',
+    'mfa_setup_method_notification' => 'बहु-कारक प्रमाणीकरण विधि सफलतापूर्वक सेटअप गरियो',
+    'mfa_remove_method' => 'MFA हटाइयो',
+    'mfa_remove_method_notification' => 'बहु-कारक प्रमाणीकरण विधि सफलतापूर्वक हटाइयो',
+
+    // Settings
+    'settings_update' => 'सेटिङहरू अद्यावधिक गरियो',
+    'settings_update_notification' => 'सेटिङहरू सफलतापूर्वक अद्यावधिक गरियो',
+    'maintenance_action_run' => 'मर्मत कार्य सञ्चालन गरियो',
+
+    // Webhooks
+    'webhook_create' => 'वेबहुक सिर्जना गरियो',
+    'webhook_create_notification' => 'वेबहुक सफलतापूर्वक सिर्जना गरियो',
+    'webhook_update' => 'वेबहुकअद्यावधिक गरियो',
+    'webhook_update_notification' => 'वेबहुक सफलतापूर्वक अद्यावधिक गरियो',
+    'webhook_delete' => 'वेबहुक हटाइयो',
+    'webhook_delete_notification' => 'वेबहुक सफलतापूर्वक हटाइयो',
+
+    // Imports
+    'import_create' => 'आयात सिर्जना गरियो',
+    'import_create_notification' => 'आयात सफलतापूर्वक अपलोड गरियो',
+    'import_run' => 'आयात अद्यावधिक गरियो',
+    'import_run_notification' => 'सामग्री सफलतापूर्वक आयात गरियो',
+    'import_delete' => 'आयात हटाइयो',
+    'import_delete_notification' => 'आयात सफलतापूर्वक हटाइयो',
+
+    // Users
+    'user_create' => 'प्रयोगकर्ता सिर्जना गरियो',
+    'user_create_notification' => 'प्रयोगकर्ता सफलतापूर्वक सिर्जना गरियो',
+    'user_update' => 'प्रयोगकर्ता अद्यावधिक गरियो',
+    'user_update_notification' => 'प्रयोगकर्ता सफलतापूर्वक अद्यावधिक गरियो',
+    'user_delete' => 'प्रयोगकर्ता हटाइयो',
+    'user_delete_notification' => 'प्रयोगकर्ता सफलतापूर्वक हटाइयो',
+
+    // API Tokens
+    'api_token_create' => 'API टोकन सिर्जना गरियो',
+    'api_token_create_notification' => 'API टोकन सफलतापूर्वक सिर्जना गरियो',
+    'api_token_update' => 'API टोकन अद्यावधिक गरियो',
+    'api_token_update_notification' => 'API टोकन सफलतापूर्वक अद्यावधिक गरियो',
+    'api_token_delete' => 'API टोकन हटाइयो',
+    'api_token_delete_notification' => 'API टोकन सफलतापूर्वक हटाइयो',
+
+    // Roles
+    'role_create' => 'भूमिका सिर्जना गरियो',
+    'role_create_notification' => 'भूमिका सफलतापूर्वक सिर्जना गरियो',
+    'role_update' => 'भूमिका अद्यावधिक गरियो',
+    'role_update_notification' => 'भूमिका सफलतापूर्वक अद्यावधिक गरियो',
+    'role_delete' => 'भूमिका हटाइयो',
+    'role_delete_notification' => 'भूमिका सफलतापूर्वक हटाइयो',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'पुनः प्रयोगको डब्बा खाली गरियो',
+    'recycle_bin_restore' => 'पुनः प्रयोगको डब्बाबाट पुनर्स्थापित गरियो',
+    'recycle_bin_destroy' => 'पुनः प्रयोगको डब्बाबाट हटाइयो',
+
+    // Comments
+    'commented_on'                => 'मा टिप्पणी गरियो',
+    'comment_create'              => 'टिप्पणी थपियो',
+    'comment_update'              => 'टिप्पणी अद्यावधिक गरियो',
+    'comment_delete'              => 'टिप्पणी मेटाइयो',
+
+    // Sort Rules
+    'sort_rule_create' => 'क्रम नियम सिर्जना गरियो',
+    'sort_rule_create_notification' => 'क्रम नियम सफलतापूर्वक सिर्जना गरियो',
+    'sort_rule_update' => 'क्रम नियम अद्यावधिक गरियो',
+    'sort_rule_update_notification' => 'क्रम नियम सफलतापूर्वक अद्यावधिक गरियो',
+    'sort_rule_delete' => 'क्रम नियम हटाइयो',
+    'sort_rule_delete_notification' => 'क्रम नियम सफलतापूर्वक हटाइयो',
+
+    // Other
+    'permissions_update'          => 'अनुमतिहरू अद्यावधिक गरियो',
+];
diff --git a/lang/ne/auth.php b/lang/ne/auth.php
new file mode 100644
index 00000000000..cd875a226cb
--- /dev/null
+++ b/lang/ne/auth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'यी प्रमाणिकरण जानकारी हाम्रो अभिलेखसँग मेल खाँदैन।',
+    'throttle' => 'लगइन प्रयासहरूको संख्या धेरै भएको छ। कृपया :seconds सेकेन्ड पछि पुनः प्रयास गर्नुहोस्।',
+
+    // Login & Register
+    'sign_up' => 'साइन अप गर्नुहोस्',
+    'log_in' => 'लग इन गर्नुहोस्',
+    'log_in_with' => ':socialDriver मार्फत लगइन गर्नुहोस्',
+    'sign_up_with' => ':socialDriver प्रयोग गरेर साइन अप गर्नुहोस्',
+    'logout' => 'लगआउट',
+
+    'name' => 'नाम',
+    'username' => 'प्रयोगकर्ता नाम',
+    'email' => 'ईमेल',
+    'password' => 'पासवर्ड',
+    'password_confirm' => 'पासवर्ड पक्का गर्नुहोस्',
+    'password_hint' => 'कम्तिमा 8 अङ्कको हुनुपर्छ',
+    'forgot_password' => 'पासवर्ड भुल्नुभयो?',
+    'remember_me' => 'मलाई सम्झनुहोस्',
+    'ldap_email_hint' => 'कृपया यस खाताको लागि प्रयोग गर्नको लागि इमेल प्रविष्ट गर्नुहोस्।',
+    'create_account' => 'खाता बनाउनुहोस्',
+    'already_have_account' => 'तपाईंको पहिले नै खाता छ?',
+    'dont_have_account' => 'के तपाईंको खाता छैन?',
+    'social_login' => 'सामाजिक लगइन',
+    'social_registration' => 'सामाजिक दर्ता',
+    'social_registration_text' => 'अर्को सेवाबाट दर्ता गर्नुहोस् र लगइन गर्नुहोस्।',
+
+    'register_thanks' => 'दर्ता गर्नुभएकोमा धन्यवाद!',
+    'register_confirm' => 'कृपया तपाईंको इमेल जाँच गर्नुहोस् र :appName मा पहुँच पाउनको लागि पुष्टिकरण बटनमा क्लिक गर्नुहोस्।',
+    'registrations_disabled' => 'दर्ता हाल बन्द गरिएको छ',
+    'registration_email_domain_invalid' => 'त्यो इमेल डोमेनलाई यस आवेदनमा पहुँच छैन',
+    'register_success' => 'साइन अप गर्नुभएकोमा धन्यवाद! तपाईं अब दर्ता र लगइन भइसकेका हुनुहुन्छ।',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'लगइन प्रयास गर्दै',
+    'auto_init_starting_desc' => 'हामी तपाईंको प्रमाणीकरण प्रणालीलाई लगइन प्रक्रिया सुरु गर्नका लागि सम्पर्क गर्दैछौं। यदि 5 सेकेन्डपछि प्रगति हुँदैन भने तलको लिङ्कमा क्लिक गर्न प्रयास गर्नुहोस्।',
+    'auto_init_start_link' => 'प्रमाणीकरणसँग अगाडि बढ्नुहोस्',
+
+    // Password Reset
+    'reset_password' => 'पासवर्ड रिसेट गर्नुहोस्',
+    'reset_password_send_instructions' => 'तपाईंको इमेल तल प्रविष्ट गर्नुहोस् र तपाईंलाई पासवर्ड रिसेट लिङ्क सहितको इमेल पठाइनेछ।',
+    'reset_password_send_button' => 'रिसेट लिङ्क पठाउनुहोस्',
+    'reset_password_sent' => ':email इमेलमा पासवर्ड रिसेट लिङ्क पठाइनेछ यदि त्यो इमेल ठेगाना प्रणालीमा फेला पारिन्छ भने।',
+    'reset_password_success' => 'तपाईंको पासवर्ड सफलतापूर्वक रिसेट गरिएको छ।',
+    'email_reset_subject' => ':appName पासवर्ड रिसेट गर्नुहोस्',
+    'email_reset_text' => 'तपाईं यो इमेल प्राप्त गर्दै हुनुहुन्छ किनकि हामीले तपाईंको खाताको लागि पासवर्ड रिसेट अनुरोध प्राप्त गर्यौं।',
+    'email_reset_not_requested' => 'यदि तपाईंले पासवर्ड रिसेट अनुरोध गर्नुभएको छैन भने, अगाडि कुनै कार्य आवश्यक पर्दैन।',
+
+    // Email Confirmation
+    'email_confirm_subject' => ':appName मा तपाईंको इमेल पुष्टि गर्नुहोस्',
+    'email_confirm_greeting' => ':appName मा सामेल हुनुभएकोमा धन्यवाद!',
+    'email_confirm_text' => 'कृपया तलको बटनमा क्लिक गरेर तपाईंको इमेल ठेगाना पुष्टि गर्नुहोस्:',
+    'email_confirm_action' => 'इमेल पुष्टि गर्नुहोस्',
+    'email_confirm_send_error' => 'इमेल पुष्टिकरण आवश्यक छ तर प्रणालीले इमेल पठाउन सकेन। इमेल सही तरिकाले सेटअप गरिएको छ भनी सुनिश्चित गर्न प्रशासकलाई सम्पर्क गर्नुहोस्।',
+    'email_confirm_success' => 'तपाईंको इमेल पुष्टि भएको छ! अब तपाईं यो इमेल ठेगाना प्रयोग गरेर लगइन गर्न सक्षम हुनुहुनेछ।',
+    'email_confirm_resent' => 'पुष्टिकरण इमेल पुनः पठाइएको छ, कृपया तपाईंको इनबक्स जाँच गर्नुहोस्।',
+    'email_confirm_thanks' => 'पुष्टिकरणको लागि धन्यवाद!',
+    'email_confirm_thanks_desc' => 'कृपया केही समय कुर्नुहोस् जबकि तपाईंको पुष्टिकरण प्रक्रिया गरिन्छ। यदि तपाईंलाई 3 सेकेन्ड पछि पुनः रिडिरेक्ट गरिएको छैन भने, तलको "अगाडि बढ्नुहोस्" लिङ्कमा क्लिक गर्नुहोस्।',
+
+    'email_not_confirmed' => 'इमेल ठेगाना पुष्टि गरिएको छैन',
+    'email_not_confirmed_text' => 'तपाईंको इमेल ठेगाना अझै पुष्टि भएको छैन।',
+    'email_not_confirmed_click_link' => 'कृपया तपाईंले दर्ता गर्दा पठाइएको इमेलमा रहेको लिङ्कमा क्लिक गर्नुहोस्।',
+    'email_not_confirmed_resend' => 'यदि तपाईंलाई इमेल भेट्न गाह्रो भइरहेको छ भने, तपाईं तलको फारम द्वारा पुष्टिकरण इमेल पुनः पठाउन सक्नुहुन्छ।',
+    'email_not_confirmed_resend_button' => 'पुष्टिकरण इमेल पुनः पठाउनुहोस्',
+
+    // User Invite
+    'user_invite_email_subject' => ':appName मा सामेल हुनका लागि तपाईंलाई आमन्त्रित गरिएको छ!',
+    'user_invite_email_greeting' => ':appName मा तपाईंको खाता सिर्जना गरिएको छ।',
+    'user_invite_email_text' => 'खाता पासवर्ड सेट गर्न र पहुँच प्राप्त गर्न तलको बटनमा क्लिक गर्नुहोस्:',
+    'user_invite_email_action' => 'खाता पासवर्ड सेट गर्नुहोस्',
+    'user_invite_page_welcome' => ':appName मा स्वागत छ!',
+    'user_invite_page_text' => 'तपाईंको खाता अन्तिम रूप दिन र पहुँच प्राप्त गर्न तपाईंलाई पासवर्ड सेट गर्न आवश्यक छ जुन भविष्यका भ्रमणमा :appName मा लगइन गर्न प्रयोग हुनेछ।',
+    'user_invite_page_confirm_button' => 'पासवर्ड पक्का गर्नुहोस्',
+    'user_invite_success_login' => 'पासवर्ड सेट गरिएको छ, तपाईं अब तपाईंको सेट गरिएको पासवर्ड प्रयोग गरेर :appName मा लगइन गर्न सक्षम हुनुहुनेछ!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'मल्टि-फ्याक्टर प्रमाणीकरण सेटअप गर्नुहोस्',
+    'mfa_setup_desc' => 'तपाईंको प्रयोगकर्ता खाता सुरक्षा थप गर्न मल्टि-फ्याक्टर प्रमाणीकरण सेटअप गर्नुहोस्।',
+    'mfa_setup_configured' => 'पहिले नै कन्फिगर गरिएको',
+    'mfa_setup_reconfigure' => 'पुनः कन्फिगर गर्नुहोस्',
+    'mfa_setup_remove_confirmation' => 'के तपाईं यो मल्टि-फ्याक्टर प्रमाणीकरण विधि हटाउन चाहानुहुन्छ?',
+    'mfa_setup_action' => 'सेटअप',
+    'mfa_backup_codes_usage_limit_warning' => 'तपाईंको ५ भन्दा कम ब्याकअप कोड बाँकी छन्, कृपया नयाँ सेट उत्पन्न गर्नुहोस् र सुरक्षित स्थानमा राख्नुहोस् ताकि तपाईंको खाता लकडाउन नहोस्।',
+    'mfa_option_totp_title' => 'मोबाइल एप',
+    'mfa_option_totp_desc' => 'मल्टि-फ्याक्टर प्रमाणीकरण प्रयोग गर्नको लागि तपाईंलाई Google Authenticator, Authy वा Microsoft Authenticator जस्ता TOTP समर्थित मोबाइल एपको आवश्यकता पर्छ।',
+    'mfa_option_backup_codes_title' => 'ब्याकअप कोड',
+    'mfa_option_backup_codes_desc' => 'एक सेट ब्याकअप कोड उत्पन्न गर्दछ जसलाई तपाईंले लगइन गर्दा आफ्नो पहिचान प्रमाणित गर्न प्रयोग गर्नुहुनेछ। यी सुरक्षित स्थानमा राख्नुहोस्।',
+    'mfa_gen_confirm_and_enable' => 'पुष्टिकरण र सक्षम गर्नुहोस्',
+    'mfa_gen_backup_codes_title' => 'ब्याकअप कोड सेटअप',
+    'mfa_gen_backup_codes_desc' => 'तलको कोडहरूको सूची सुरक्षित स्थानमा राख्नुहोस्। प्रणालीमा पहुँच गर्दा तपाईंले एक कोडलाई दोस्रो प्रमाणीकरण विधिका रूपमा प्रयोग गर्नुहुनेछ।',
+    'mfa_gen_backup_codes_download' => 'कोडहरू डाउनलोड गर्नुहोस्',
+    'mfa_gen_backup_codes_usage_warning' => 'प्रत्येक कोड एक पटक मात्र प्रयोग गर्न सकिन्छ।',
+    'mfa_gen_totp_title' => 'मोबाइल एप सेटअप',
+    'mfa_gen_totp_desc' => 'मल्टि-फ्याक्टर प्रमाणीकरण प्रयोग गर्नको लागि तपाईंलाई Google Authenticator, Authy वा Microsoft Authenticator जस्ता TOTP समर्थित मोबाइल एपको आवश्यकता पर्छ।',
+    'mfa_gen_totp_scan' => 'सुरु गर्नको लागि तलको QR कोड स्क्यान गर्नुहोस्।',
+    'mfa_gen_totp_verify_setup' => 'सेटअप प्रमाणित गर्नुहोस्',
+    'mfa_gen_totp_verify_setup_desc' => 'सुनिश्चित गर्नका लागि एक कोड प्रविष्ट गर्नुहोस्, तपाईंको प्रमाणीकरण एपबाट उत्पन्न गरिएको, तलको इनपुट बक्समा:',
+    'mfa_gen_totp_provide_code_here' => 'तपाईंको एपबाट उत्पन्न गरिएको कोड यहाँ प्रदान गर्नुहोस्।',
+    'mfa_verify_access' => 'पहुँच प्रमाणित गर्नुहोस्',
+    'mfa_verify_access_desc' => 'तपाईंको प्रयोगकर्ता खाता थप प्रमाणीकरणको माध्यमबाट आफ्नो पहिचान प्रमाणित गर्नको लागि आवश्यक छ। कृपया अगाडि बढ्नको लागि तपाईंको कन्फिगर गरिएको विधि प्रयोग गर्नुहोस्।',
+    'mfa_verify_no_methods' => 'कुनै तरिका कन्फिगर गरिएको छैन',
+    'mfa_verify_no_methods_desc' => 'तपाईंको खातामा मल्टि-फ्याक्टर प्रमाणीकरण विधिहरू फेला परेका छैनन्। तपाईंलाई पहुँच प्राप्त गर्न कम्तिमा एक विधि सेटअप गर्न आवश्यक छ।',
+    'mfa_verify_use_totp' => 'मोबाइल एप प्रयोग गरेर प्रमाणित गर्नुहोस्',
+    'mfa_verify_use_backup_codes' => 'ब्याकअप कोड प्रयोग गरेर प्रमाणित गर्नुहोस्',
+    'mfa_verify_backup_code' => 'ब्याकअप कोड',
+    'mfa_verify_backup_code_desc' => 'तल तपाईंको बाँकी रहेका ब्याकअप कोडहरू मध्ये एउटा प्रविष्ट गर्नुहोस्:',
+    'mfa_verify_backup_code_enter_here' => 'यहाँ ब्याकअप कोड प्रविष्ट गर्नुहोस्',
+    'mfa_verify_totp_desc' => 'तपाईंको मोबाइल एपबाट उत्पन्न गरिएको कोड तल प्रविष्ट गर्नुहोस्:',
+    'mfa_setup_login_notification' => 'मल्टि-फ्याक्टर विधि कन्फिगर गरिएको छ, कृपया अब कन्फिगर गरिएको विधि प्रयोग गरेर फेरि लगइन गर्नुहोस्।',
+];
diff --git a/lang/ne/common.php b/lang/ne/common.php
new file mode 100644
index 00000000000..696ddc6b4dc
--- /dev/null
+++ b/lang/ne/common.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'रद्द गर्नुहोस्',
+    'close' => 'बन्द गर्नुहोस्',
+    'confirm' => 'पुष्टि गर्नुहोस्',
+    'back' => 'फिर्ता',
+    'save' => 'सेभ गर्नुहोस्',
+    'continue' => 'जारी राख्नुहोस्',
+    'select' => 'छान्नुहोस्',
+    'toggle_all' => 'सबै टगल गर्नुहोस्',
+    'more' => 'थप',
+
+    // Form Labels
+    'name' => 'नाम',
+    'description' => 'विवरण',
+    'role' => 'भूमिका',
+    'cover_image' => 'आवरण चित्र',
+    'cover_image_description' => 'यो चित्र करिब 440x250px हुनुपर्छ, यद्यपि यो प्रयोगकर्ता इन्टरफेसमा आवश्यकताअनुसार लचिलो रूपमा स्केल र काटिने भएकाले देखिने वास्तविक आकार फरक हुन सक्छ।',
+
+    // Actions
+    'actions' => 'कार्यहरू',
+    'view' => 'हेर्नुहोस्',
+    'view_all' => 'सबै हेर्नुहोस्',
+    'new' => 'नयाँ',
+    'create' => 'सिर्जना गर्नुहोस्',
+    'update' => 'अद्यावधिक गर्नुहोस्',
+    'edit' => 'सम्पादन गर्नुहोस्',
+    'archive' => 'अभिलेख राख्नुहोस्',
+    'unarchive' => 'अभिलेख हटाउनुहोस्',
+    'sort' => 'क्रमबद्ध गर्नुहोस्',
+    'move' => 'सार्नुहोस्',
+    'copy' => 'प्रतिलिपि गर्नुहोस्',
+    'reply' => 'जवाफ दिनुहोस्',
+    'delete' => 'हटाउनुहोस्',
+    'delete_confirm' => 'हटाउने पुष्टि गर्नुहोस्',
+    'search' => 'खोज्नुहोस्',
+    'search_clear' => 'खोज हटाउनुहोस्',
+    'reset' => 'रीसेट गर्नुहोस्',
+    'remove' => 'हटाउनुहोस्',
+    'add' => 'थप्नुहोस्',
+    'configure' => 'कन्फिगर गर्नुहोस्',
+    'manage' => 'व्यवस्थापन गर्नुहोस्',
+    'fullscreen' => 'पूर्ण स्क्रिन',
+    'favourite' => 'मनपर्ने',
+    'unfavourite' => 'मनपर्नेबाट हटाउनुहोस्',
+    'next' => 'अर्को',
+    'previous' => 'अघिल्लो',
+    'filter_active' => 'सक्रिय फिल्टर:',
+    'filter_clear' => 'फिल्टर हटाउनुहोस्',
+    'download' => 'डाउनलोड गर्नुहोस्',
+    'open_in_tab' => 'ट्याबमा खोल्नुहोस्',
+    'open' => 'खोल्नुहोस्',
+
+    // Sort Options
+    'sort_options' => 'क्रमबद्ध विकल्पहरू',
+    'sort_direction_toggle' => 'क्रमबद्ध दिशा टगल',
+    'sort_ascending' => 'बढ्दो क्रममा क्रमबद्ध गर्नुहोस्',
+    'sort_descending' => 'घट्दो क्रममा क्रमबद्ध गर्नुहोस्',
+    'sort_name' => 'नाम',
+    'sort_default' => 'पूर्वनिर्धारित',
+    'sort_created_at' => 'सिर्जना मिति',
+    'sort_updated_at' => 'अद्यावधिक मिति',
+
+    // Misc
+    'deleted_user' => 'हटाइएको प्रयोगकर्ता',
+    'no_activity' => 'देखाउनका लागि कुनै गतिविधि छैन',
+    'no_items' => 'कुनै वस्तुहरू उपलब्ध छैनन्',
+    'back_to_top' => 'शीर्षमा फर्कनुहोस्',
+    'skip_to_main_content' => 'मुख्य सामग्रीमा जानुहोस्',
+    'toggle_details' => 'विवरण टगल गर्नुहोस्',
+    'toggle_thumbnails' => 'थम्बनेल टगल गर्नुहोस्',
+    'details' => 'विवरण',
+    'grid_view' => 'ग्रिड दृश्य',
+    'list_view' => 'सूची दृश्य',
+    'default' => 'पूर्वनिर्धारित',
+    'breadcrumb' => 'ब्रेडक्रम्ब',
+    'status' => 'स्थिति',
+    'status_active' => 'सक्रिय',
+    'status_inactive' => 'निष्क्रिय',
+    'never' => 'कहिल्यै होइन',
+    'none' => 'कुनै पनि होइन',
+
+    // Header
+    'homepage' => 'गृहपृष्ठ',
+    'header_menu_expand' => 'हेडर मेनु विस्तार गर्नुहोस्',
+    'profile_menu' => 'प्रोफाइल मेनु',
+    'view_profile' => 'प्रोफाइल हेर्नुहोस्',
+    'edit_profile' => 'प्रोफाइल सम्पादन गर्नुहोस्',
+    'dark_mode' => 'गाढा मोड',
+    'light_mode' => 'हल्का मोड',
+    'global_search' => 'विश्वव्यापी खोज',
+
+    // Layout tabs
+    'tab_info' => 'जानकारी',
+    'tab_info_label' => 'ट्याब: द्वितीय जानकारी देखाउनुहोस्',
+    'tab_content' => 'सामग्री',
+    'tab_content_label' => 'ट्याब: प्राथमिक सामग्री देखाउनुहोस्',
+
+    // Email Content
+    'email_action_help' => 'यदि तपाईं ":actionText" बटनमा क्लिक गर्न समस्या भइरहेको छ भने, तलको URL आफ्नो वेब ब्राउजरमा कपी गरेर पेस्ट गर्नुहोस्:',
+    'email_rights' => 'सर्वाधिकार सुरक्षित',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'गोपनीयता नीति',
+    'terms_of_service' => 'सेवा सर्तहरू',
+
+    // OpenSearch
+    'opensearch_description' => ':appName खोज्नुहोस्',
+];
diff --git a/lang/ne/components.php b/lang/ne/components.php
new file mode 100644
index 00000000000..d488842e481
--- /dev/null
+++ b/lang/ne/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'चित्र चयन गर्नुहोस्',
+    'image_list' => 'चित्र सूची',
+    'image_details' => 'चित्र विवरण',
+    'image_upload' => 'चित्र अपलोड गर्नुहोस्',
+    'image_intro' => 'यहाँ तपाईंले पहिले अपलोड गरिएका चित्रहरू चयन र व्यवस्थापन गर्न सक्नुहुन्छ।',
+    'image_intro_upload' => '"चित्र अपलोड गर्नुहोस्" बटन प्रयोग गरेर वा चित्र फाइललाई यो विन्डोमा तानेर नयाँ चित्र अपलोड गर्नुहोस्।',
+    'image_all' => 'सबै',
+    'image_all_title' => 'सबै चित्रहरू हेर्नुहोस्',
+    'image_book_title' => 'यस पुस्तकमा अपलोड गरिएका चित्रहरू हेर्नुहोस्',
+    'image_page_title' => 'यस पृष्ठमा अपलोड गरिएका चित्रहरू हेर्नुहोस्',
+    'image_search_hint' => 'चित्र नामद्वारा खोज्नुहोस्',
+    'image_uploaded' => 'अपलोड गरिएको :uploadedDate',
+    'image_uploaded_by' => ':userName द्वारा अपलोड गरिएको',
+    'image_uploaded_to' => ':pageLink मा अपलोड गरिएको',
+    'image_updated' => 'अद्यावधिक गरिएको :updateDate',
+    'image_load_more' => 'थप लोड गर्नुहोस्',
+    'image_image_name' => 'चित्र नाम',
+    'image_delete_used' => 'यो चित्र तलका पृष्ठहरूमा प्रयोग भइरहेको छ।',
+    'image_delete_confirm_text' => 'के तपाईं यो चित्र मेटाउन निश्चित हुनुहुन्छ?',
+    'image_select_image' => 'चित्र चयन गर्नुहोस्',
+    'image_dropzone' => 'चित्र ड्रप गर्नुहोस् वा अपलोड गर्न यहाँ क्लिक गर्नुहोस्',
+    'image_dropzone_drop' => 'अपलोड गर्न यहाँ चित्र ड्रप गर्नुहोस्',
+    'images_deleted' => 'चित्रहरू मेटाइयो',
+    'image_preview' => 'चित्र पूर्वावलोकन',
+    'image_upload_success' => 'चित्र सफलतापूर्वक अपलोड गरियो',
+    'image_update_success' => 'चित्र विवरण सफलतापूर्वक अद्यावधिक गरियो',
+    'image_delete_success' => 'चित्र सफलतापूर्वक मेटाइयो',
+    'image_replace' => 'चित्र प्रतिस्थापन गर्नुहोस्',
+    'image_replace_success' => 'चित्र फाइल सफलतापूर्वक अद्यावधिक गरियो',
+    'image_rebuild_thumbs' => 'आकारका भेरिएसनहरू पुनर्निर्माण गर्नुहोस्',
+    'image_rebuild_thumbs_success' => 'चित्र आकार भेरिएसनहरू सफलतापूर्वक पुनर्निर्माण गरियो!',
+
+    // Code Editor
+    'code_editor' => 'कोड सम्पादन गर्नुहोस्',
+    'code_language' => 'कोड भाषा',
+    'code_content' => 'कोड सामग्री',
+    'code_session_history' => 'सेसन इतिहास',
+    'code_save' => 'कोड सेभ गर्नुहोस्',
+];
diff --git a/lang/ne/editor.php b/lang/ne/editor.php
new file mode 100644
index 00000000000..77c32ff304c
--- /dev/null
+++ b/lang/ne/editor.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'सामान्य',
+    'advanced' => 'उन्नत',
+    'none' => 'कुनै पनि छैन',
+    'cancel' => 'रद्द गर्नुहोस्',
+    'save' => 'सेभ गर्नुहोस्',
+    'close' => 'बन्द गर्नुहोस्',
+    'apply' => 'लागु गर्नुहोस्',
+    'undo' => 'पूर्ववत् गर्नुहोस्',
+    'redo' => 'पुन: गर्नुहोस्',
+    'left' => 'बायाँ',
+    'center' => 'केन्द्र',
+    'right' => 'दायाँ',
+    'top' => 'माथि',
+    'middle' => 'बीच',
+    'bottom' => 'तल',
+    'width' => 'चौडाइ',
+    'height' => 'उचाइ',
+    'More' => 'थप',
+    'select' => 'छान्नुहोस्...',
+
+    // Toolbar
+    'formats' => 'ढाँचा',
+    'header_large' => 'ठुलो शीर्षक',
+    'header_medium' => 'मध्यम शीर्षक',
+    'header_small' => 'सानो शीर्षक',
+    'header_tiny' => 'अत्यन्त सानो शीर्षक',
+    'paragraph' => 'प्याराग्राफ',
+    'blockquote' => 'ब्लकउद्धरण',
+    'inline_code' => 'इनलाइन कोड',
+    'callouts' => 'कौलआउटहरू',
+    'callout_information' => 'सूचना',
+    'callout_success' => 'सफलता',
+    'callout_warning' => 'चेतावनी',
+    'callout_danger' => 'खतरा',
+    'bold' => 'मोठो अक्षर',
+    'italic' => 'तेरियो',
+    'underline' => 'रेखाङ्कन',
+    'strikethrough' => 'रेखाले काटिएको',
+    'superscript' => 'सुपरस्क्रिप्ट',
+    'subscript' => 'सबस्क्रिप्ट',
+    'text_color' => 'पाठको रंग',
+    'custom_color' => 'अनुकूलित रंग',
+    'remove_color' => 'रंग हटाउनुहोस्',
+    'background_color' => 'पृष्ठभूमि रंग',
+    'align_left' => 'बायाँ संरेखण',
+    'align_center' => 'केन्द्र संरेखण',
+    'align_right' => 'दायाँ संरेखण',
+    'align_justify' => 'समायोजन',
+    'list_bullet' => 'बुलेट सूची',
+    'list_numbered' => 'संख्याबद्ध सूची',
+    'list_task' => 'कार्य सूची',
+    'indent_increase' => 'इनडेन्ट बढाउनुहोस्',
+    'indent_decrease' => 'इनडेन्ट घटाउनुहोस्',
+    'table' => 'टेबल',
+    'insert_image' => 'चित्र राख्नुहोस्',
+    'insert_image_title' => 'चित्र राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'insert_link' => 'लिंक राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'insert_link_title' => 'लिंक राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'insert_horizontal_line' => 'क्षैतिज रेखा राख्नुहोस्',
+    'insert_code_block' => 'कोड ब्लक राख्नुहोस्',
+    'edit_code_block' => 'कोड ब्लक सम्पादन गर्नुहोस्',
+    'insert_drawing' => 'ड्रइङ राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'drawing_manager' => 'ड्रइङ व्यवस्थापक',
+    'insert_media' => 'मिडिया राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'insert_media_title' => 'मिडिया राख्नुहोस्/सम्पादन गर्नुहोस्',
+    'clear_formatting' => 'ढाँचा सफा गर्नुहोस्',
+    'source_code' => 'स्रोत कोड',
+    'source_code_title' => 'स्रोत कोड',
+    'fullscreen' => 'पूर्ण स्क्रीन',
+    'image_options' => 'चित्र विकल्प',
+
+    // Tables
+    'table_properties' => 'टेबल गुणहरू',
+    'table_properties_title' => 'टेबल गुणहरू',
+    'delete_table' => 'टेबल मेटाउनुहोस्',
+    'table_clear_formatting' => 'टेबलको ढाँचा सफा गर्नुहोस्',
+    'resize_to_contents' => 'सामग्री अनुसार आकार मिलाउनुहोस्',
+    'row_header' => 'पङ्क्ति शीर्षक',
+    'insert_row_before' => 'अगाडिको पङ्क्ति राख्नुहोस्',
+    'insert_row_after' => 'पछिको पङ्क्ति राख्नुहोस्',
+    'delete_row' => 'पङ्क्ति मेटाउनुहोस्',
+    'insert_column_before' => 'अगाडिको स्तम्भ राख्नुहोस्',
+    'insert_column_after' => 'पछिको स्तम्भ राख्नुहोस्',
+    'delete_column' => 'स्तम्भ मेटाउनुहोस्',
+    'table_cell' => 'सेल',
+    'table_row' => 'पङ्क्ति',
+    'table_column' => 'स्तम्भ',
+    'cell_properties' => 'सेल गुणहरू',
+    'cell_properties_title' => 'सेल गुणहरू',
+    'cell_type' => 'सेल प्रकार',
+    'cell_type_cell' => 'सेल',
+    'cell_scope' => 'स्कोप',
+    'cell_type_header' => 'शीर्षक सेल',
+    'merge_cells' => 'सेल मर्ज गर्नुहोस्',
+    'split_cell' => 'सेल विभाजन गर्नुहोस्',
+    'table_row_group' => 'पङ्क्ति समूह',
+    'table_column_group' => 'स्तम्भ समूह',
+    'horizontal_align' => 'क्षैतिज संरेखण',
+    'vertical_align' => 'उर्ध्वाधर संरेखण',
+    'border_width' => 'बोर्डर चौडाइ',
+    'border_style' => 'बोर्डर शैली',
+    'border_color' => 'बोर्डर रंग',
+    'row_properties' => 'पङ्क्ति गुणहरू',
+    'row_properties_title' => 'पङ्क्ति गुणहरू',
+    'cut_row' => 'पङ्क्ति काट्नुहोस्',
+    'copy_row' => 'पङ्क्ति कपी गर्नुहोस्',
+    'paste_row_before' => 'अगाडिको पङ्क्तिमा पेस्ट गर्नुहोस्',
+    'paste_row_after' => 'पछिको पङ्क्तिमा पेस्ट गर्नुहोस्',
+    'row_type' => 'पङ्क्ति प्रकार',
+    'row_type_header' => 'शीर्षक',
+    'row_type_body' => 'शरीर',
+    'row_type_footer' => 'तल',
+    'alignment' => 'संरेखण',
+    'cut_column' => 'स्तम्भ काट्नुहोस्',
+    'copy_column' => 'स्तम्भ कपी गर्नुहोस्',
+    'paste_column_before' => 'अगाडिको स्तम्भमा पेस्ट गर्नुहोस्',
+    'paste_column_after' => 'पछिको स्तम्भमा पेस्ट गर्नुहोस्',
+    'cell_padding' => 'सेल प्याडिङ',
+    'cell_spacing' => 'सेल स्पेसिङ',
+    'caption' => 'क्याप्सन',
+    'show_caption' => 'क्याप्सन देखाउनुहोस्',
+    'constrain' => 'अनुपात सीमित गर्नुहोस्',
+    'cell_border_solid' => 'ठोस',
+    'cell_border_dotted' => 'डटेड',
+    'cell_border_dashed' => 'ड्यास्ड',
+    'cell_border_double' => 'डबल',
+    'cell_border_groove' => 'ग्रूभ',
+    'cell_border_ridge' => 'रिज',
+    'cell_border_inset' => 'इनसेट',
+    'cell_border_outset' => 'आउटसेट',
+    'cell_border_none' => 'कुनै पनि छैन',
+    'cell_border_hidden' => 'लुकेको',
+
+    // Images, links, details/summary & embed
+    'source' => 'स्रोत',
+    'alt_desc' => 'वैकल्पिक विवरण',
+    'embed' => 'एम्बेड',
+    'paste_embed' => 'तपाईंको एम्बेड कोड तल टाँस्नुहोस्:',
+    'url' => 'URL',
+    'text_to_display' => 'देखाउने पाठ',
+    'title' => 'शीर्षक',
+    'browse_links' => 'लिंकहरू ब्राउज गर्नुहोस्',
+    'open_link' => 'लिंक खोल्नुहोस्',
+    'open_link_in' => 'लिंक खोल्नुहोस् ...',
+    'open_link_current' => 'हालको विन्डो',
+    'open_link_new' => 'नयाँ विन्डो',
+    'remove_link' => 'लिंक हटाउनुहोस्',
+    'insert_collapsible' => 'टुंगो लाग्ने ब्लक राख्नुहोस्',
+    'collapsible_unwrap' => 'अनर्याप गर्नुहोस्',
+    'edit_label' => 'लेबल सम्पादन गर्नुहोस्',
+    'toggle_open_closed' => 'खोल्ने/बन्द गर्ने टगल गर्नुहोस्',
+    'collapsible_edit' => 'टुंगो लाग्ने ब्लक सम्पादन गर्नुहोस्',
+    'toggle_label' => 'लेबल टगल गर्नुहोस्',
+
+    // About view
+    'about' => 'संपादकको बारेमा',
+    'about_title' => 'WYSIWYG संपादकको बारेमा',
+    'editor_license' => 'संपादक अनुमति र कपीराइट',
+    'editor_lexical_license' => 'यो संपादक :lexicalLink को फोर्कको रूपमा निर्माण गरिएको हो जुन MIT लाइसेन्स अन्तर्गत वितरण गरिएको छ।',
+    'editor_lexical_license_link' => 'पूरा लाइसेन्स विवरण यहाँ भेट्न सकिन्छ।',
+    'editor_tiny_license' => 'यो संपादक :tinyLink प्रयोग गरेर निर्माण गरिएको हो जुन MIT लाइसेन्स अन्तर्गत उपलब्ध छ।',
+    'editor_tiny_license_link' => 'TinyMCE को कपीराइट र लाइसेन्स विवरण यहाँ भेट्न सकिन्छ।',
+    'save_continue' => 'पृष्ठ सेभ गरी जारी राख्नुहोस्',
+    'callouts_cycle' => '(प्रकारहरू टगल गर्न थिचिरहनुहोस्)',
+    'link_selector' => 'सामग्रीमा लिंक',
+    'shortcuts' => 'सर्टकटहरू',
+    'shortcut' => 'सर्टकट',
+    'shortcuts_intro' => 'संपादकमा निम्न सर्टकटहरू उपलब्ध छन्:',
+    'windows_linux' => '(विन्डोज/लिनक्स)',
+    'mac' => '(म्याक)',
+    'description' => 'विवरण',
+];
diff --git a/lang/ne/entities.php b/lang/ne/entities.php
new file mode 100644
index 00000000000..8044515fadc
--- /dev/null
+++ b/lang/ne/entities.php
@@ -0,0 +1,471 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'हालैमा सिर्जना गरिएको',
+    'recently_created_pages' => 'हालैमा सिर्जना गरिएका पाना',
+    'recently_updated_pages' => 'हालैमा अद्यावधिक गरिएका पाना',
+    'recently_created_chapters' => 'हालैमा सिर्जना गरिएका अध्यायहरू',
+    'recently_created_books' => 'हालैमा सिर्जना गरिएका पुस्तकहरू',
+    'recently_created_shelves' => 'हालैमा सिर्जना गरिएका दराजहरू',
+    'recently_update' => 'हालैमा अद्यावधिक गरिएको',
+    'recently_viewed' => 'हालैमा हेरिएको',
+    'recent_activity' => 'हालको गतिविधि',
+    'create_now' => 'अहिले सिर्जना गर्नुहोस्',
+    'revisions' => 'संशोधनहरू',
+    'meta_revision' => 'संशोधन #:revisionCount',
+    'meta_created' => 'सिर्जना गरिएको :timeLength',
+    'meta_created_name' => ':user द्वारा सिर्जना गरिएको :timeLength',
+    'meta_updated' => 'अद्यावधिक गरिएको :timeLength',
+    'meta_updated_name' => ':user द्वारा अद्यावधिक गरिएको :timeLength',
+    'meta_owned_name' => ':user द्वारा स्वामित्व गरिएको',
+    'meta_reference_count' => ':count वस्तु द्वारा सन्दर्भित|:count वस्तुहरू द्वारा सन्दर्भित',
+    'entity_select' => 'इकाई चयन',
+    'entity_select_lack_permission' => 'तपाईंलाई यो वस्तु चयन गर्नको लागि आवश्यक अनुमति छैन',
+    'images' => 'छविहरू',
+    'my_recent_drafts' => 'मेरो हालका मस्यौदाहरू',
+    'my_recently_viewed' => 'मेरो हालै हेरिएका पाना',
+    'my_most_viewed_favourites' => 'मेरो सबैभन्दा हेरिएका मनपर्ने',
+    'my_favourites' => 'मेरो मनपर्ने',
+    'no_pages_viewed' => 'तपाईंले कुनै पाना हेरिसकेको छैन',
+    'no_pages_recently_created' => 'हालै कुनै पाना सिर्जना गरिएको छैन',
+    'no_pages_recently_updated' => 'हालै कुनै पाना अद्यावधिक गरिएको छैन',
+    'export' => 'निर्यात',
+    'export_html' => 'समाविष्ट वेब फाइल',
+    'export_pdf' => 'PDF फाइल',
+    'export_text' => 'साधारण टेक्स्ट फाइल',
+    'export_md' => 'Markdown फाइल',
+    'export_zip' => 'पोर्टेबल ZIP',
+    'default_template' => 'पूर्वनिर्धारित पृष्ठ ढाँचा',
+    'default_template_explain' => 'यस वस्तु भित्र सिर्जना गरिएका सबै पानाहरूको लागि पूर्वनिर्धारित सामग्रीको रूपमा प्रयोग हुने पृष्ठ ढाँचाको चयन गर्नुहोस्। ध्यान दिनुहोस् कि यो केवल प्रयोगकर्ता चयन गरेको ढाँचाको पृष्ठलाई हेर्ने अनुमति पाउँदा मात्र लागू हुनेछ।',
+    'default_template_select' => 'पृष्ठ ढाँचा चयन गर्नुहोस्',
+    'import' => 'आयात',
+    'import_validate' => 'आयात प्रमाणित गर्नुहोस्',
+    'import_desc' => 'पुस्तकहरू, अध्यायहरू र पृष्ठहरूलाई पोर्टेबल ZIP निर्यातको माध्यमबाट आयात गर्नुहोस्, चाहे त्यसैको, वा अन्य कुनै उदाहरणको। ZIP फाइल चयन गर्न जारी राख्नुहोस्। फाइल अपलोड र प्रमाणित भएपछि, तपाईंलाई आयातको कन्फिगर र पुष्टि गर्ने विकल्प हुनेछ।',
+    'import_zip_select' => 'अपलोड गर्न ZIP फाइल चयन गर्नुहोस्',
+    'import_zip_validation_errors' => 'प्रदान गरिएको ZIP फाइल प्रमाणित गर्दा निम्न त्रुटिहरू भेटिएका छन्:',
+    'import_pending' => 'पर्खाइमा रहेका आयातहरू',
+    'import_pending_none' => 'कुनै आयात सुरू गरिएको छैन।',
+    'import_continue' => 'आयात जारी राख्नुहोस्',
+    'import_continue_desc' => 'अपलोड गरिएको ZIP फाइलबाट आयात गरिने सामग्रीको समीक्षा गर्नुहोस्। तयार भएपछि, आयात सञ्चालन गर्नुहोस् र यसको सामग्री यस प्रणालीमा थप्नुहोस्। सफल आयातपछि, अपलोड गरिएको ZIP आयात फाइल स्वचालित रूपमा मेटाइनेछ।',
+    'import_details' => 'आयात विवरण',
+    'import_run' => 'आयात सञ्चालन गर्नुहोस्',
+    'import_size' => ':size आयात ZIP साइज',
+    'import_uploaded_at' => 'अपलोड गरिएको :relativeTime',
+    'import_uploaded_by' => 'द्वारा अपलोड गरिएको',
+    'import_location' => 'आयात स्थान',
+    'import_location_desc' => 'आयात गरिएको सामग्रीको लागि लक्ष्य स्थान चयन गर्नुहोस्। तपाईंले चयन गरेको स्थानमा सिर्जना गर्नको लागि तपाईंलाई सम्बन्धित अनुमतिहरू आवश्यक पर्नेछन्।',
+    'import_delete_confirm' => 'के तपाईं पक्का हुनुहुन्छ कि तपाईं यो आयात मेट्न चाहनुहुन्छ?',
+    'import_delete_desc' => 'यो अपलोड गरिएको आयात ZIP फाइल मेट्नेछ, र यो कार्य नकारात्मक हुन सक्दैन।',
+    'import_errors' => 'आयात त्रुटिहरू',
+    'import_errors_desc' => 'आयात प्रयासको क्रममा निम्न त्रुटिहरू उत्पन्न भएका छन्:',
+
+    // Permissions and restrictions
+    'permissions' => 'अनुमतिहरू',
+    'permissions_desc' => 'यहाँ अनुमतिहरू सेट गर्नुहोस् जसले प्रयोगकर्ता भूमिकाद्वारा प्रदान गरिएका डिफल्ट अनुमतिहरूलाई ओभरराइड गर्दछ।',
+    'permissions_book_cascade' => 'पुस्तकहरूमा सेट गरिएका अनुमतिहरू स्वचालित रूपमा सन्तान अध्यायहरू र पृष्ठहरूमा लागू हुनेछन्, जबसम्म तिनीहरूले आफ्नै अनुमतिहरू परिभाषित नगरेका हुँदैन।',
+    'permissions_chapter_cascade' => 'अध्याीयमा सेट गरिएका अनुमतिहरू स्वचालित रूपमा सन्तान पृष्ठहरूमा लागू हुनेछन्, जबसम्म तिनीहरूले आफ्नै अनुमतिहरू परिभाषित नगरेका हुँदैन।',
+    'permissions_save' => 'अनुमतिहरू बचत गर्नुहोस्',
+    'permissions_owner' => 'स्वामी',
+    'permissions_role_everyone_else' => 'अरु सबै',
+    'permissions_role_everyone_else_desc' => 'प्रयोगकर्ता भूमिकामा विशेष रूपमा ओभरराइड नगरेको सबैका लागि अनुमतिहरू सेट गर्नुहोस्।',
+    'permissions_role_override' => 'भूमिकाका लागि अनुमतिहरू ओभरराइड गर्नुहोस्',
+    'permissions_inherit_defaults' => 'डिफल्टहरू मर्नुहोस्',
+
+    // Search
+    'search_results' => 'खोज परिणामहरू',
+    'search_total_results_found' => ':count परिणाम फेला परे|:count कुल परिणामहरू फेला परे',
+    'search_clear' => 'खोज मेटाउनुहोस्',
+    'search_no_pages' => 'कुनै पाना यस खोजसँग मेल खाएका छैनन्',
+    'search_for_term' => ':term को लागि खोजी गर्नुहोस्',
+    'search_more' => 'थप परिणामहरू',
+    'search_advanced' => 'उन्नत खोजी',
+    'search_terms' => 'खोजी शब्दहरू',
+    'search_content_type' => 'सामग्री प्रकार',
+    'search_exact_matches' => 'सटीक मेलहरू',
+    'search_tags' => 'ट्याग खोजी',
+    'search_options' => 'विकल्पहरू',
+    'search_viewed_by_me' => 'मैले हेरेको',
+    'search_not_viewed_by_me' => 'मैले नहेरेको',
+    'search_permissions_set' => 'अनुमतिहरू सेट गरिएका',
+    'search_created_by_me' => 'मैले सिर्जना गरेको',
+    'search_updated_by_me' => 'मैले अद्यावधिक गरेको',
+    'search_owned_by_me' => 'मैले स्वामित्व गरेको',
+    'search_date_options' => 'मिति विकल्पहरू',
+    'search_updated_before' => 'अद्यावधिक गरिएको अघि',
+    'search_updated_after' => 'अद्यावधिक गरिएको पछि',
+    'search_created_before' => 'सिर्जना गरिएको अघि',
+    'search_created_after' => 'सिर्जना गरिएको पछि',
+    'search_set_date' => 'मिति सेट गर्नुहोस्',
+    'search_update' => 'खोज अपडेट गर्नुहोस्',
+
+    // Shelves
+    'shelf' => 'दराज',
+    'shelves' => 'दराजहरू',
+    'x_shelves' => ':count दराज|:count दराजहरू',
+    'shelves_empty' => 'कुनै दराज सिर्जना गरिएको छैन',
+    'shelves_create' => 'नयाँ दराज सिर्जना गर्नुहोस्',
+    'shelves_popular' => 'लोकप्रिय दराजहरू',
+    'shelves_new' => 'नयाँ दराजहरू',
+    'shelves_new_action' => 'नयाँ दराज',
+    'shelves_popular_empty' => 'यहाँ सबैभन्दा लोकप्रिय दराजहरू देखिनेछन्।',
+    'shelves_new_empty' => 'यहाँ सबैभन्दा नयाँ सिर्जना गरिएका दराजहरू देखिनेछन्।',
+    'shelves_save' => 'दराज बचत गर्नुहोस्',
+    'shelves_books' => 'यस दराजमा पुस्तकहरू',
+    'shelves_add_books' => 'यस दराजमा पुस्तकहरू थप्नुहोस्',
+    'shelves_drag_books' => 'पुस्तकहरू तल तान्नुहोस् यस दराजमा थप्नका लागि',
+    'shelves_empty_contents' => 'यस दराजमा कुनै पुस्तकहरू असाइन गरिएको छैन',
+    'shelves_edit_and_assign' => 'दराज सम्पादन गरेर पुस्तकहरू असाइन गर्नुहोस्',
+    'shelves_edit_named' => 'दराज सम्पादन गर्नुहोस् :name',
+    'shelves_edit' => 'दराज सम्पादन गर्नुहोस्',
+    'shelves_delete' => 'दराज मेट्नुहोस्',
+    'shelves_delete_named' => 'दराज मेट्नुहोस् :name',
+    'shelves_delete_explain' => "यसले ':name' नामक दराज मेट्नेछ। समावेश गरिएका पुस्तकहरू मेटिने छैनन्।",
+    'shelves_delete_confirmation' => 'के तपाईं यकिन हुनुहुन्छ कि तपाईं यस दराजलाई मेट्न चाहनुहुन्छ?',
+    'shelves_permissions' => 'दराज अनुमतिहरू',
+    'shelves_permissions_updated' => 'दराज अनुमतिहरू अद्यावधिक गरिएका',
+    'shelves_permissions_active' => 'दराज अनुमतिहरू सक्रिय',
+    'shelves_permissions_cascade_warning' => 'दराजमा सेट गरिएका अनुमतिहरू स्वचालित रूपमा समाविष्ट पुस्तकहरूमा क्यास्केड हुँदैनन्। यो कारणले कि पुस्तक एक भन्दा धेरै दराजमा अस्तित्वमा हुन सक्छ।',
+    'shelves_permissions_create' => 'दराज सिर्जना अनुमतिहरू केवल बालक पुस्तकहरूमा अनुमतिहरूको कपी गर्नको लागि प्रयोग गरिन्छ। यी अनुमतिहरू पुस्तक सिर्जना गर्नको लागि छैन।',
+    'shelves_copy_permissions_to_books' => 'पुस्तकहरूमा अनुमतिहरूको कपी गर्नुहोस्',
+    'shelves_copy_permissions' => 'अनुमतिहरूको कपी गर्नुहोस्',
+    'shelves_copy_permissions_explain' => 'यसले यस दराजको वर्तमान अनुमतिहरूलाई यसमा समावेश गरिएका सबै पुस्तकहरूमा लागू गर्नेछ। कृपया सुनिश्चित गर्नुहोस् कि कुनै पनि परिवर्तनहरू सेभ भएका छन्।',
+    'shelves_copy_permission_success' => ':count पुस्तकहरूमा दराज अनुमतिहरू कपी गरिएका',
+
+    // Books
+    'book' => 'पुस्तक',
+    'books' => 'पुस्तकहरू',
+    'x_books' => ':count पुस्तक|:count पुस्तकहरू',
+    'books_empty' => 'कुनै पुस्तकहरू सिर्जना गरिएका छैनन्',
+    'books_popular' => 'लोकप्रिय पुस्तकहरू',
+    'books_recent' => 'हालका पुस्तकहरू',
+    'books_new' => 'नयाँ पुस्तकहरू',
+    'books_new_action' => 'नयाँ पुस्तक',
+    'books_popular_empty' => 'यहाँ सबैभन्दा लोकप्रिय पुस्तकहरू देखा पर्नेछन्।',
+    'books_new_empty' => 'यहाँ सबैभन्दा हालसालै सिर्जना गरिएका पुस्तकहरू देखा पर्नेछन्।',
+    'books_create' => 'नयाँ पुस्तक सिर्जना गर्नुहोस्',
+    'books_delete' => 'पुस्तक मेट्नुहोस्',
+    'books_delete_named' => 'पुस्तक मेट्नुहोस् :bookName',
+    'books_delete_explain' => 'यो पुस्तकलाई नाम \':bookName\' मेट्नेछ। सबै पृष्ठहरू र अध्यायहरू हटाइनेछन्।',
+    'books_delete_confirmation' => 'के तपाईं पक्का हुनुहुन्छ कि तपाईं यस पुस्तकलाई मेट्न चाहनुहुन्छ?',
+    'books_edit' => 'पुस्तक सम्पादन गर्नुहोस्',
+    'books_edit_named' => 'पुस्तक सम्पादन गर्नुहोस् :bookName',
+    'books_form_book_name' => 'पुस्तकको नाम',
+    'books_save' => 'पुस्तक बचत गर्नुहोस्',
+    'books_permissions' => 'पुस्तक अनुमतिहरू',
+    'books_permissions_updated' => 'पुस्तक अनुमतिहरू अद्यावधिक गरियो',
+    'books_empty_contents' => 'यस पुस्तकको लागि कुनै पृष्ठहरू वा अध्यायहरू सिर्जना गरिएका छैनन्।',
+    'books_empty_create_page' => 'नयाँ पृष्ठ सिर्जना गर्नुहोस्',
+    'books_empty_sort_current_book' => 'हालको पुस्तकलाई वर्गीकृत गर्नुहोस्',
+    'books_empty_add_chapter' => 'अध्याय थप्नुहोस्',
+    'books_permissions_active' => 'पुस्तक अनुमतिहरू सक्रिय छन्',
+    'books_search_this' => 'यस पुस्तकमा खोजी गर्नुहोस्',
+    'books_navigation' => 'पुस्तक नेभिगेशन',
+    'books_sort' => 'पुस्तक सामग्रीहरू वर्गीकृत गर्नुहोस्',
+    'books_sort_desc' => 'पुस्तकमा अध्यायहरू र पृष्ठहरूलाई पुनः व्यवस्थित गर्नका लागि सार्नुहोस्। अन्य पुस्तकहरू थप्न सकिन्छ जसले अध्याय र पृष्ठहरूलाई पुस्तकहरू बीच सजिलै सर्न मद्दत गर्दछ। वैकल्पिक रूपमा एक स्वचालित वर्गीकरण नियम सेट गर्न सकिन्छ जसले पुस्तकको सामग्रीहरू परिवर्तन भएपछि स्वत: वर्गीकृत गर्छ।',
+    'books_sort_auto_sort' => 'स्वचालित वर्गीकरण विकल्प',
+    'books_sort_auto_sort_active' => 'स्वचालित वर्गीकरण सक्रिय: :sortName',
+    'books_sort_named' => 'पुस्तक :bookName को वर्गीकरण गर्नुहोस्',
+    'books_sort_name' => 'नाम अनुसार वर्गीकृत गर्नुहोस्',
+    'books_sort_created' => 'सिर्जना मितिअनुसार वर्गीकृत गर्नुहोस्',
+    'books_sort_updated' => 'अद्यावधिक मितिअनुसार वर्गीकृत गर्नुहोस्',
+    'books_sort_chapters_first' => 'पहिले अध्यायहरू',
+    'books_sort_chapters_last' => 'अन्तिममा अध्यायहरू',
+    'books_sort_show_other' => 'अन्य पुस्तकहरू देखाउनुहोस्',
+    'books_sort_save' => 'नयाँ क्रम बचत गर्नुहोस्',
+    'books_sort_show_other_desc' => 'यहाँ अन्य पुस्तकहरू थप्नुहोस् जसले वर्गीकरण प्रक्रिया समावेश गर्न र पुस्तकहरू बीच सामग्री सजिलै पुनः व्यवस्थित गर्न मद्दत पुर्याउँछ।',
+    'books_sort_move_up' => 'माथि सार्नुहोस्',
+    'books_sort_move_down' => 'तल सार्नुहोस्',
+    'books_sort_move_prev_book' => 'अघिल्लो पुस्तकमा सार्नुहोस्',
+    'books_sort_move_next_book' => 'अर्को पुस्तकमा सार्नुहोस्',
+    'books_sort_move_prev_chapter' => 'अघिल्लो अध्यायमा सार्नुहोस्',
+    'books_sort_move_next_chapter' => 'अर्को अध्यायमा सार्नुहोस्',
+    'books_sort_move_book_start' => 'पुस्तकको सुरुवातमा सार्नुहोस्',
+    'books_sort_move_book_end' => 'पुस्तकको अन्त्यमा सार्नुहोस्',
+    'books_sort_move_before_chapter' => 'अध्यानको अघि सार्नुहोस्',
+    'books_sort_move_after_chapter' => 'अध्यानको पछि सार्नुहोस्',
+    'books_copy' => 'पुस्तक प्रतिलिपि गर्नुहोस्',
+    'books_copy_success' => 'पुस्तक सफलतापूर्वक प्रतिलिपि गरियो',
+
+    // Chapters
+    'chapter' => 'अध्याय',
+    'chapters' => 'अध्यायहरू',
+    'x_chapters' => ':count अध्याय|:count अध्यायहरू',
+    'chapters_popular' => 'लोकप्रिय अध्यायहरू',
+    'chapters_new' => 'नयाँ अध्याय',
+    'chapters_create' => 'नयाँ अध्याय सिर्जना गर्नुहोस्',
+    'chapters_delete' => 'अध्याय मेट्नुहोस्',
+    'chapters_delete_named' => 'अध्याय मेट्नुहोस् :chapterName',
+    'chapters_delete_explain' => 'यसले \':chapterName\' नामक अध्याय मेट्नेछ। यस अध्यायमा रहेका सबै पृष्ठहरू पनि मेटिनेछन्।',
+    'chapters_delete_confirm' => 'के तपाईं यस अध्यायलाई मेट्न चाहनुहुन्छ?',
+    'chapters_edit' => 'अध्याय सम्पादन गर्नुहोस्',
+    'chapters_edit_named' => 'अध्याय सम्पादन गर्नुहोस् :chapterName',
+    'chapters_save' => 'अध्याय बचत गर्नुहोस्',
+    'chapters_move' => 'अध्याय सार्नुहोस्',
+    'chapters_move_named' => 'अध्याय सार्नुहोस् :chapterName',
+    'chapters_copy' => 'अध्याय प्रतिलिपि गर्नुहोस्',
+    'chapters_copy_success' => 'अध्याय सफलतापूर्वक प्रतिलिपि गरिएको',
+    'chapters_permissions' => 'अध्याय अनुमतिहरू',
+    'chapters_empty' => 'हाल यस अध्यायमा कुनै पृष्ठहरू छैनन्।',
+    'chapters_permissions_active' => 'अध्याय अनुमतिहरू सक्रिय छन्',
+    'chapters_permissions_success' => 'अध्याय अनुमतिहरू अद्यावधिक गरिएका',
+    'chapters_search_this' => 'यस अध्यायको खोजी गर्नुहोस्',
+    'chapter_sort_book' => 'पुस्तक सॉर्ट गर्नुहोस्',
+
+    // Pages
+    'page' => 'पाना',
+    'pages' => 'पानाहरू',
+    'x_pages' => ':count पाना|:count पानाहरू',
+    'pages_popular' => 'लोकप्रिय पानाहरू',
+    'pages_new' => 'नयाँ पाना',
+    'pages_attachments' => 'जोडिएका फाइलहरू',
+    'pages_navigation' => 'पाना नेविगेसन',
+    'pages_delete' => 'पाना मेट्नुहोस्',
+    'pages_delete_named' => 'पाना मेट्नुहोस् :pageName',
+    'pages_delete_draft_named' => 'मस्यौदा पाना मेट्नुहोस् :pageName',
+    'pages_delete_draft' => 'मस्यौदा पाना मेट्नुहोस्',
+    'pages_delete_success' => 'पाना मेटियो',
+    'pages_delete_draft_success' => 'मस्यौदा पाना मेटियो',
+    'pages_delete_warning_template' => 'यो पाना पुस्तक वा अध्यायको डिफल्ट पृष्ठ ढाँचाको रूपमा सक्रिय छ। यो पाना मेटिएपछि, ती पुस्तक वा अध्यायहरूमा डिफल्ट पृष्ठ ढाँचाको असाइनमेन्ट हट्नेछ।',
+    'pages_delete_confirm' => 'के तपाईं यस पानालाई मेट्न चाहनुहुन्छ?',
+    'pages_delete_draft_confirm' => 'के तपाईं मस्यौदा पानालाई मेट्न चाहनुहुन्छ?',
+    'pages_editing_named' => 'पाना सम्पादन गर्दै :pageName',
+    'pages_edit_draft_options' => 'मस्यौदा विकल्पहरू',
+    'pages_edit_save_draft' => 'मस्यौदा बचत गर्नुहोस्',
+    'pages_edit_draft' => 'पाना मस्यौदा सम्पादन गर्नुहोस्',
+    'pages_editing_draft' => 'मस्यौदा सम्पादन गर्दै',
+    'pages_editing_page' => 'पाना सम्पादन गर्दै',
+    'pages_edit_draft_save_at' => 'मस्यौदा :time मा बचत गरिएको',
+    'pages_edit_delete_draft' => 'मस्यौदा मेट्नुहोस्',
+    'pages_edit_delete_draft_confirm' => 'के तपाईं आफ्नो मस्यौदा परिवर्तनहरू मेट्न चाहनुहुन्छ? सबै परिवर्तनहरू, अन्तिम पूर्ण बचतको पछि, हराउनेछन्।',
+    'pages_edit_discard_draft' => 'मस्यौदा त्याग्नुहोस्',
+    'pages_edit_switch_to_markdown' => 'Markdown सम्पादकमा स्विच गर्नुहोस्',
+    'pages_edit_switch_to_markdown_clean' => '(साफ सामग्री)',
+    'pages_edit_switch_to_markdown_stable' => '(स्थिर सामग्री)',
+    'pages_edit_switch_to_wysiwyg' => 'WYSIWYG सम्पादकमा स्विच गर्नुहोस्',
+    'pages_edit_switch_to_new_wysiwyg' => 'नयाँ WYSIWYG मा स्विच गर्नुहोस्',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(बीटा परीक्षणमा)',
+    'pages_edit_set_changelog' => 'चेंजलग सेट गर्नुहोस्',
+    'pages_edit_enter_changelog_desc' => 'तपाईंले गरेका परिवर्तनहरूको छोटो विवरण लेख्नुहोस्',
+    'pages_edit_enter_changelog' => 'चेंजलग लेख्नुहोस्',
+    'pages_editor_switch_title' => 'संपादक स्विच गर्नुहोस्',
+    'pages_editor_switch_are_you_sure' => 'के तपाईं पक्का हुनुहुन्छ कि तपाईं यस पानाको सम्पादक परिवर्तन गर्न चाहनुहुन्छ?',
+    'pages_editor_switch_consider_following' => 'सम्पादक परिवर्तन गर्दा निम्न कुरा ध्यानमा राख्नुहोस्:',
+    'pages_editor_switch_consideration_a' => 'एकपटक बचत भएपछि, नयाँ सम्पादक विकल्प भविष्यका सम्पादकहरूमा प्रयोग हुनेछ, जसमा त्यस्ता सम्पादकहरू पनि समावेश छन् जुन आफूले सम्पादकको प्रकार परिवर्तन गर्न सक्षम छैनन्।',
+    'pages_editor_switch_consideration_b' => 'यसले केही परिस्थितिहरूमा विवरण र सिन्ट्याक्सको हानि हुन सक्छ।',
+    'pages_editor_switch_consideration_c' => 'ट्याग वा चेंजलग परिवर्तनहरू, अन्तिम बचत पछि, यो परिवर्तनमा कायम रहनेछैन।',
+    'pages_save' => 'पाना बचत गर्नुहोस्',
+    'pages_title' => 'पाना शीर्षक',
+    'pages_name' => 'पाना नाम',
+    'pages_md_editor' => 'संपादक',
+    'pages_md_preview' => 'पूर्वावलोकन',
+    'pages_md_insert_image' => 'छवि समावेश गर्नुहोस्',
+    'pages_md_insert_link' => 'संगठन लिंक समावेश गर्नुहोस्',
+    'pages_md_insert_drawing' => 'चित्र समावेश गर्नुहोस्',
+    'pages_md_show_preview' => 'पूर्वावलोकन देखाउनुहोस्',
+    'pages_md_sync_scroll' => 'पूर्वावलोकन स्क्रोल सिंक गर्नुहोस्',
+    'pages_drawing_unsaved' => 'असुरक्षित चित्र भेटियो',
+    'pages_drawing_unsaved_confirm' => 'अघिल्लो असफल चित्र बचत प्रयासबाट असुरक्षित चित्र डेटा भेटिएको छ। के तपाईं यस असुरक्षित चित्रलाई पुनर्स्थापना गरेर सम्पादन गर्न चाहनुहुन्छ?',
+    'pages_not_in_chapter' => 'पाना कुनै अध्यायमा छैन',
+    'pages_move' => 'पाना सार्नुहोस्',
+    'pages_copy' => 'पाना प्रतिलिपि गर्नुहोस्',
+    'pages_copy_desination' => 'प्रतिलिपि गन्तव्य',
+    'pages_copy_success' => 'पाना सफलतापूर्वक प्रतिलिपि गरियो',
+    'pages_permissions' => 'पाना अनुमतिहरू',
+    'pages_permissions_success' => 'पाना अनुमतिहरू अद्यावधिक गरिएका',
+    'pages_revision' => 'संशोधन',
+    'pages_revisions' => 'पाना संशोधनहरू',
+    'pages_revisions_desc' => 'तल सूचीबद्ध गरिएको छ यो पानाका सबै पुराना संशोधनहरू। तपाईं पुराना पृष्ठ संस्करणहरू फर्केर हेर्न, तुलना गर्न र पुनर्स्थापना गर्न सक्नुहुन्छ, यदि अनुमतिहरूले अनुमति दिएको छ भने। प्रणाली कन्फिगरेसनको आधारमा पुराना संशोधनहरू स्वचालित रूपमा मेटिने हुन सक्छ।',
+    'pages_revisions_named' => ':pageName का पाना संशोधनहरू',
+    'pages_revision_named' => ':pageName का पाना संशोधन',
+    'pages_revision_restored_from' => 'पुनर्स्थापित गरिएको #:id; :summary',
+    'pages_revisions_created_by' => 'द्वारा सिर्जना गरिएको',
+    'pages_revisions_date' => 'संशोधन मिति',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'संशोधन संख्या',
+    'pages_revisions_numbered' => 'संशोधन #:id',
+    'pages_revisions_numbered_changes' => 'संशोधन #:id परिवर्तनहरू',
+    'pages_revisions_editor' => 'संपादक प्रकार',
+    'pages_revisions_changelog' => 'चेंजलग',
+    'pages_revisions_changes' => 'परिवर्तनहरू',
+    'pages_revisions_current' => 'हालको संस्करण:',
+    'pages_revisions_preview' => 'पूर्वावलोकन गर्नुहोस्',
+    'pages_revisions_restore' => 'पुनर्स्थापित गर्नुहोस्',
+    'pages_revisions_none' => 'यस पानामा कुनै संशोधन छैन',
+    'pages_copy_link' => 'लिंक प्रतिलिपि गर्नुहोस्',
+    'pages_edit_content_link' => 'संपादकमा खण्डमा जानुहोस्',
+    'pages_pointer_enter_mode' => 'खण्ड चयन मोडमा जानुहोस्',
+    'pages_pointer_label' => 'पाना खण्ड विकल्पहरू',
+    'pages_pointer_permalink' => 'पाना खण्ड स्थायी लिंक',
+    'pages_pointer_include_tag' => 'पाना खण्ड समावेश ट्याग',
+    'pages_pointer_toggle_link' => 'स्थायी लिंक मोड, समावेश ट्याग देखाउनका लागि थिच्नुहोस्',
+    'pages_pointer_toggle_include' => 'समावेश ट्याग मोड, स्थायी लिंक देखाउनका लागि थिच्नुहोस्',
+    'pages_permissions_active' => 'पाना अनुमतिहरू सक्रिय छन्',
+    'pages_initial_revision' => 'प्रारम्भिक प्रकाशन',
+    'pages_references_update_revision' => 'आन्तरिक लिंकहरूको प्रणाली स्वचालित अद्यावधिक',
+    'pages_initial_name' => 'नयाँ पाना',
+    'pages_editing_draft_notification' => 'तपाईं हाल एक मस्यौदा सम्पादन गर्दै हुनुहुन्छ जुन अन्तिम पटक :timeDiff मा बचत गरिएको थियो।',
+    'pages_draft_edited_notification' => 'यो पाना त्यस समय पछि अद्यावधिक गरिएको छ। यस मस्यौदालाई त्याग्नु उचित हुनेछ।',
+    'pages_draft_page_changed_since_creation' => 'यो पाना मस्यौदा सिर्जना भएपछि अद्यावधिक गरिएको छ। यस मस्यौदालाई त्याग्नुपर्छ वा कुनै पाना परिवर्तनहरू मेटिन नदिनुहोस्।',
+    'pages_draft_edit_active' => [
+        'start_a' => ':count प्रयोगकर्ताले यस पानालाई सम्पादन सुरु गरेका छन्',
+        'start_b' => ':userName ले यस पानालाई सम्पादन सुरु गरेका छन्',
+        'time_a' => 'पृष्ठ अन्तिम पटक अद्यावधिक भएको समयदेखि',
+        'time_b' => ':minCount मिनेटहरूको भित्र',
+        'message' => ':start :time। कृपया एकअर्काका अपडेटहरू मेट्नुहोस्!',
+    ],
+    'pages_draft_discarded' => 'मस्यौदा त्यागियो! सम्पादक वर्तमान पाना सामग्रीसँग अद्यावधिक गरिएको छ',
+    'pages_draft_deleted' => 'मस्यौदा मेटियो! सम्पादक वर्तमान पाना सामग्रीसँग अद्यावधिक गरिएको छ',
+    'pages_specific' => 'विशिष्ट पाना',
+    'pages_is_template' => 'पाना ढांचा',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'साइडबार टगल गर्नुहोस्',
+    'page_tags' => 'पाना ट्यागहरू',
+    'chapter_tags' => 'अध्याय ट्यागहरू',
+    'book_tags' => 'पुस्तक ट्यागहरू',
+    'shelf_tags' => 'शेल्फ ट्यागहरू',
+    'tag' => 'ट्याग',
+    'tags' =>  'ट्यागहरू',
+    'tags_index_desc' => 'ट्यागहरू सिस्टममा सामग्रीसँग लचिलो प्रकारको वर्गीकरण लागू गर्न प्रयोग गर्न सकिन्छ। ट्यागहरूमा किम्बो मान र मान हो सक्छ, जसले वैकल्पिक हुन्छ। एकपटक लागू भए पछि, सामग्रीलाई ट्यागको नाम र मान प्रयोग गरेर खोजी गर्न सकिन्छ।',
+    'tag_name' =>  'ट्याग नाम',
+    'tag_value' => 'ट्याग मान (वैकल्पिक)',
+    'tags_explain' => "आफ्नो सामग्रीलाई राम्रोसँग वर्गीकरण गर्न केही ट्यागहरू थप्नुहोस्। \n तपाई थप संगठनको लागि ट्यागको मान पनि असाइन गर्न सक्नुहुन्छ।",
+    'tags_add' => 'अर्को ट्याग थप्नुहोस्',
+    'tags_remove' => 'यो ट्याग हटाउनुहोस्',
+    'tags_usages' => 'कुल ट्याग प्रयोगहरू',
+    'tags_assigned_pages' => 'पानामा असाइन गरिएको',
+    'tags_assigned_chapters' => 'अध्यायहरूमा असाइन गरिएको',
+    'tags_assigned_books' => 'पुस्तकहरूमा असाइन गरिएको',
+    'tags_assigned_shelves' => 'शेल्फहरूमा असाइन गरिएको',
+    'tags_x_unique_values' => ':count अनन्य मानहरू',
+    'tags_all_values' => 'सबै मानहरू',
+    'tags_view_tags' => 'ट्यागहरू हेर्नुहोस्',
+    'tags_view_existing_tags' => 'अस्तित्वमा रहेका ट्यागहरू हेर्नुहोस्',
+    'tags_list_empty_hint' => 'ट्यागहरू पृष्ठ सम्पादक साइडबार वा पुस्तक, अध्याय वा शेल्फको विवरण सम्पादन गर्दा असाइन गर्न सकिन्छ।',
+    'attachments' => 'जोडिएका फाइलहरू',
+    'attachments_explain' => 'केही फाइलहरू अपलोड गर्नुहोस् वा केही लिङ्कहरू जोड्नुहोस् जसलाई तपाईंको पानामा देखाउन चाहनुहुन्छ। यी पृष्ठ साइडबारमा देखिनेछन्।',
+    'attachments_explain_instant_save' => 'यहाँका परिवर्तनहरू तुरुन्तै बचत हुन्छन्।',
+    'attachments_upload' => 'फाइल अपलोड गर्नुहोस्',
+    'attachments_link' => 'लिङ्क जोड्नुहोस्',
+    'attachments_upload_drop' => 'वैकल्पिक रूपमा तपाईं यहाँ एक फाइल ड्र्याग र ड्रप गरेर अपलोड गर्न सक्नुहुन्छ।',
+    'attachments_set_link' => 'लिङ्क सेट गर्नुहोस्',
+    'attachments_delete' => 'के तपाईं यो जोडिएको फाइल मेट्न चाहनुहुन्छ?',
+    'attachments_dropzone' => 'यहाँ फाइलहरू ड्र्याग गर्न र अपलोड गर्नको लागि ड्रप गर्नुहोस्',
+    'attachments_no_files' => 'कुनै फाइलहरू अपलोड गरिएको छैन',
+    'attachments_explain_link' => 'यदि तपाईंले कुनै फाइल अपलोड नगरीकन लिङ्क जोड्न चाहनुहुन्छ भने, तपाईं यसलाई थप्न सक्नुहुन्छ। यो अर्को पृष्ठको लिङ्क वा क्लाउडमा राखिएको फाइलको लिङ्क हुन सक्छ।',
+    'attachments_link_name' => 'लिङ्कको नाम',
+    'attachment_link' => 'जोडिएको फाइल लिङ्क',
+    'attachments_link_url' => 'फाइलको लिङ्क',
+    'attachments_link_url_hint' => 'साइट वा फाइलको URL',
+    'attach' => 'जोड्नुहोस्',
+    'attachments_insert_link' => 'पृष्ठमा जोडिएको फाइलको लिङ्क थप्नुहोस्',
+    'attachments_edit_file' => 'फाइल सम्पादन गर्नुहोस्',
+    'attachments_edit_file_name' => 'फाइलको नाम',
+    'attachments_edit_drop_upload' => 'फाइलहरू ड्र्याग गर्नुहोस् वा यहाँ क्लिक गरेर अपलोड र ओभरराइट गर्नुहोस्',
+    'attachments_order_updated' => 'जोडिएको फाइलहरूको क्रम अद्यावधिक गरियो',
+    'attachments_updated_success' => 'जोडिएको फाइलको विवरण अद्यावधिक गरियो',
+    'attachments_deleted' => 'जोडिएको फाइल मेटियो',
+    'attachments_file_uploaded' => 'फाइल सफलतापूर्वक अपलोड गरिएको',
+    'attachments_file_updated' => 'फाइल सफलतापूर्वक अद्यावधिक गरिएको',
+    'attachments_link_attached' => 'लिङ्क सफलतापूर्वक पृष्ठसँग जोडिएको',
+    'templates' => 'ढाँचाहरू',
+    'templates_set_as_template' => 'पाना ढाँचाको रूपमा सेट गर्नुहोस्',
+    'templates_explain_set_as_template' => 'तपाईं यस पानालाई ढाँचाको रूपमा सेट गर्न सक्नुहुन्छ ताकि यसको सामग्रीलाई अन्य पानाहरू सिर्जना गर्दा प्रयोग गर्न सकिन्छ। अन्य प्रयोगकर्ताहरू यस ढाँचालाई तब मात्र प्रयोग गर्न सक्छन् जब उनीहरूलाई यस पानाको भ्यू अनुमति छ।',
+    'templates_replace_content' => 'पाना सामग्री प्रतिस्थापन गर्नुहोस्',
+    'templates_append_content' => 'पाना सामग्रीमा थप्नुहोस्',
+    'templates_prepend_content' => 'पाना सामग्री अगाडि थप्नुहोस्',
+
+    // Profile View
+    'profile_user_for_x' => ':time का लागि प्रयोगकर्ता',
+    'profile_created_content' => 'सिर्जना गरिएको सामग्री',
+    'profile_not_created_pages' => ':userName ले कुनै पानाहरू सिर्जना गरेका छैनन्',
+    'profile_not_created_chapters' => ':userName ले कुनै अध्यायहरू सिर्जना गरेका छैनन्',
+    'profile_not_created_books' => ':userName ले कुनै पुस्तकहरू सिर्जना गरेका छैनन्',
+    'profile_not_created_shelves' => ':userName ले कुनै शेल्फहरू सिर्जना गरेका छैनन्',
+
+    // Comments
+    'comment' => 'टिप्पणी',
+    'comments' => 'टिप्पणीहरू',
+    'comment_add' => 'टिप्पणी थप्नुहोस्',
+    'comment_none' => 'प्रदर्शन गर्न कुनै टिप्पणी छैन',
+    'comment_placeholder' => 'यहाँ टिप्पणी छोड्नुहोस्',
+    'comment_thread_count' => 'टिप्पणीहरू',
+    'comment_archived_count' => ':count पुरानो',
+    'comment_archived_threads' => 'पुरानो थ्रेडहरू',
+    'comment_save' => 'टिप्पणी सेभ गर्नुहोस्',
+    'comment_new' => 'नयाँ टिप्पणी',
+    'comment_created' => ':createDiff मा टिप्पणी गरियो',
+    'comment_updated' => ':updateDiff मा :username द्वारा अद्यावधिक गरिएको',
+    'comment_updated_indicator' => 'अद्यावधिक गरिएको',
+    'comment_deleted_success' => 'टिप्पणी मेटियो',
+    'comment_created_success' => 'टिप्पणी थपियो',
+    'comment_updated_success' => 'टिप्पणी अद्यावधिक गरियो',
+    'comment_archive_success' => 'टिप्पणी पुरानो गरियो',
+    'comment_unarchive_success' => 'टिप्पणी पुनः सक्रिय गरियो',
+    'comment_view' => 'टिप्पणी हेर्नुहोस्',
+    'comment_jump_to_thread' => 'थ्रेडमा जानुहोस्',
+    'comment_delete_confirm' => 'के तपाईं यस टिप्पणीलाई मेट्न चाहनुहुन्छ?',
+    'comment_in_reply_to' => ':commentId को जवाफमा',
+    'comment_reference' => 'सन्दर्भ',
+    'comment_reference_outdated' => '(अप्रचलित)',
+    'comment_editor_explain' => 'यहाँ पृष्ठमा छोडिएका टिप्पणीहरू छन्। बचत गरिएको पृष्ठ हेरिरहँदा टिप्पणीहरू थप्न र व्यवस्थापन गर्न सकिन्छ।',
+
+    // Revision
+    'revision_delete_confirm' => 'के तपाईं यस संशोधनलाई मेट्न चाहनुहुन्छ?',
+    'revision_restore_confirm' => 'के तपाईं यस संशोधनलाई पुनर्स्थापित गर्न चाहनुहुन्छ? हालको पृष्ठ सामग्री प्रतिस्थापित हुनेछ।',
+    'revision_cannot_delete_latest' => 'अन्तिम संशोधन मेट्न सकिदैन।',
+
+    // Copy view
+    'copy_consider' => 'कृपया सामग्री प्रतिलिपि गर्दा तलका कुराहरू विचार गर्नुहोस्।',
+    'copy_consider_permissions' => 'कस्टम अनुमति सेटिङहरू प्रतिलिपि गरिने छैन।',
+    'copy_consider_owner' => 'तपाईं सबै प्रतिलिपि गरिएका सामग्रीका मालिक बन्नुहुनेछ।',
+    'copy_consider_images' => 'पृष्ठ चित्र फाइलहरू नक्कल गरिने छैनन् र मौलिक चित्रहरूले ती पृष्ठसँगको सम्बन्ध कायम राख्नेछन् जहाँ तिनीहरू पहिले अपलोड गरिएको थिए।',
+    'copy_consider_attachments' => 'पृष्ठ जडानहरू प्रतिलिपि गरिने छैनन्।',
+    'copy_consider_access' => 'स्थान, मालिक वा अनुमतिहरूको परिवर्तनले यस सामग्रीलाई पहिले पहुँच नभएका प्रयोगकर्ताहरूलाई उपलब्ध गराउन सक्छ।',
+
+    // Conversions
+    'convert_to_shelf' => 'शेल्फमा रूपान्तरण गर्नुहोस्',
+    'convert_to_shelf_contents_desc' => 'तपाईं यस पुस्तकलाई समान सामग्रीसँग नयाँ शेल्फमा रूपान्तरण गर्न सक्नुहुन्छ। यस पुस्तकमा भएका अध्यायहरू नयाँ पुस्तकहरूमा रूपान्तरण गरिनेछन्। यदि यस पुस्तकमा कुनै पृष्ठहरू छन् जुन कुनै अध्यायमा छैनन् भने, यस पुस्तकको नाम परिवर्तन गरिनेछ र ती पृष्ठहरू समावेश गरिनेछन्, र यस पुस्तकलाई नयाँ शेल्फको हिस्सा बनाइनेछ।',
+    'convert_to_shelf_permissions_desc' => 'यस पुस्तकमा सेट गरिएका कुनै पनि अनुमतिहरू नयाँ शेल्फ र सबै नयाँ बाल पुस्तकहरूमा प्रतिलिपि गरिनेछन् जुन आफ्ना अनुमतिहरू लागू गरेका छैनन्। ध्यान दिनुहोस् कि शेल्फहरूमा अनुमतिहरू स्वत: सामग्रीमा लागू हुँदैनन्, जस्तै पुस्तकहरूमा।',
+    'convert_book' => 'पुस्तक रूपान्तरण गर्नुहोस्',
+    'convert_book_confirm' => 'के तपाईं पक्का हुनुहुन्छ कि तपाईं यस पुस्तकलाई रूपान्तरण गर्न चाहनुहुन्छ?',
+    'convert_undo_warning' => 'यो सजिलै उल्टाउन सकिँदैन।',
+    'convert_to_book' => 'पुस्तकमा रूपान्तरण गर्नुहोस्',
+    'convert_to_book_desc' => 'तपाईं यस अध्यायलाई समान सामग्रीसँग नयाँ पुस्तकमा रूपान्तरण गर्न सक्नुहुन्छ। यस अध्यायमा सेट गरिएका कुनै पनि अनुमतिहरू नयाँ पुस्तकमा प्रतिलिपि गरिनेछन्, तर कुनै पनि पितृ पुस्तकबाट परिग्रहीत अनुमतिहरू प्रतिलिपि गरिने छैनन्, जसले पहुँच नियन्त्रणमा परिवर्तन ल्याउन सक्छ।',
+    'convert_chapter' => 'अध्याय रूपान्तरण गर्नुहोस्',
+    'convert_chapter_confirm' => 'के तपाईं पक्का हुनुहुन्छ कि तपाईं यस अध्यायलाई रूपान्तरण गर्न चाहनुहुन्छ?',
+
+    // References
+    'references' => 'सन्दर्भहरू',
+    'references_none' => 'यस वस्तुमा कुनै ट्र्याक गरिएको सन्दर्भहरू छैनन्।',
+    'references_to_desc' => 'तल सूचीबद्ध गरिएको छ सबै जानिएको सामग्री प्रणालीमा जुन यस वस्तुसँग लिंक गरिएको छ।',
+
+    // Watch Options
+    'watch' => 'हेर्नुहोस्',
+    'watch_title_default' => 'पूर्वनिर्धारित प्राथमिकताहरू',
+    'watch_desc_default' => 'हेर्नुहोस् केवल तपाईंका पूर्वनिर्धारित सूचनाको प्राथमिकताहरूमा फर्कनुहोस्।',
+    'watch_title_ignore' => 'बेवास्ता गर्नुहोस्',
+    'watch_desc_ignore' => 'सभी सूचनाहरू बेवास्ता गर्नुहोस्, प्रयोगकर्ता-स्तरका प्राथमिकताहरू सहित।',
+    'watch_title_new' => 'नयाँ पृष्ठहरू',
+    'watch_desc_new' => 'जब यस वस्तुमा कुनै नयाँ पृष्ठ सिर्जना गरिन्छ भने सूचित गर्नुहोस्।',
+    'watch_title_updates' => 'सभी पृष्ठ अपडेटहरू',
+    'watch_desc_updates' => 'सभी नयाँ पृष्ठ र पृष्ठ परिवर्तनहरूमा सूचित गर्नुहोस्।',
+    'watch_desc_updates_page' => 'सभी पृष्ठ परिवर्तनहरूमा सूचित गर्नुहोस्।',
+    'watch_title_comments' => 'सभी पृष्ठ अपडेटहरू र टिप्पणियाँ',
+    'watch_desc_comments' => 'सभी नयाँ पृष्ठहरू, पृष्ठ परिवर्तनहरू र नयाँ टिप्पणीहरूमा सूचित गर्नुहोस्।',
+    'watch_desc_comments_page' => 'पृष्ठ परिवर्तनहरू र नयाँ टिप्पणीहरूमा सूचित गर्नुहोस्।',
+    'watch_change_default' => 'पूर्वनिर्धारित सूचनाका प्राथमिकताहरू परिवर्तन गर्नुहोस्',
+    'watch_detail_ignore' => 'सूचनाहरू बेवास्ता गर्दै',
+    'watch_detail_new' => 'नयाँ पृष्ठहरू हेर्नुहोस्',
+    'watch_detail_updates' => 'नयाँ पृष्ठहरू र अपडेटहरू हेर्नुहोस्',
+    'watch_detail_comments' => 'नयाँ पृष्ठहरू, अपडेटहरू र टिप्पणीहरू हेर्नुहोस्',
+    'watch_detail_parent_book' => 'पितृ पुस्तक मार्फत हेर्नुहोस्',
+    'watch_detail_parent_book_ignore' => 'पितृ पुस्तक मार्फत बेवास्ता गर्दै',
+    'watch_detail_parent_chapter' => 'पितृ अध्याय मार्फत हेर्नुहोस्',
+    'watch_detail_parent_chapter_ignore' => 'पितृ अध्याय मार्फत बेवास्ता गर्दै',
+];
diff --git a/lang/ne/errors.php b/lang/ne/errors.php
new file mode 100644
index 00000000000..79ee27c78d1
--- /dev/null
+++ b/lang/ne/errors.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'तपाईंले अनुरोध गरिएको पाना पहुँच गर्नको लागि अनुमति प्राप्त गर्नुभएको छैन।',
+    'permissionJson' => 'तपाईंले अनुरोध गरिएको क्रियाकलाप गर्नको लागि अनुमति प्राप्त गर्नुभएको छैन।',
+
+    // Auth
+    'error_user_exists_different_creds' => 'इमेल :email संग पहिले नै प्रयोगकर्ता अस्तित्वमा छ तर फरक प्रमाणपत्रहरूका साथ।',
+    'auth_pre_register_theme_prevention' => 'प्रदत्त विवरणका लागि प्रयोगकर्ता खाता दर्ता गर्न सकिएन।',
+    'email_already_confirmed' => 'इमेल पहिले नै प्रमाणित भइसकेको छ, कृपया लगइन प्रयास गर्नुहोस्।',
+    'email_confirmation_invalid' => 'यो पुष्टि टोकन अवैध छ वा पहिले नै प्रयोग भइसकेको छ, कृपया पुनः दर्ता प्रयास गर्नुहोस्।',
+    'email_confirmation_expired' => 'पुष्टि टोकन समाप्त भइसकेको छ, नयाँ पुष्टि इमेल पठाइएको छ।',
+    'email_confirmation_awaiting' => 'यो खाताको इमेल ठेगाना प्रमाणित गर्न बाँकी छ।',
+    'ldap_fail_anonymous' => 'LDAP पहुँच अज्ञात बाइन्ड प्रयोग गरेर असफल भएको छ।',
+    'ldap_fail_authed' => 'LDAP पहुँच निर्दिष्ट dn र पासवर्ड विवरण प्रयोग गरेर असफल भएको छ।',
+    'ldap_extension_not_installed' => 'LDAP PHP एक्स्टेन्सन इन्स्टल गरिएको छैन।',
+    'ldap_cannot_connect' => 'LDAP सर्भरमा जडान गर्न सकिएन, आरम्भिक जडान असफल भएको छ।',
+    'saml_already_logged_in' => 'पहिले नै लगइन हुनुहुन्छ।',
+    'saml_no_email_address' => 'बाह्य प्रमाणीकरण प्रणालीले प्रदान गरेको डाटामा यस प्रयोगकर्ताको इमेल ठेगाना भेट्न सकिएन।',
+    'saml_invalid_response_id' => 'बाह्य प्रमाणीकरण प्रणालीबाट आएको अनुरोध यस एप्लिकेशनद्वारा सुरु गरिएको प्रक्रिया द्वारा मान्यता प्राप्त छैन। लगइन पछि फर्किने प्रयास गर्दा यो समस्या उत्पन्न हुन सक्छ।',
+    'saml_fail_authed' => ':system प्रयोग गरेर लगइन असफल भएको छ, प्रणालीले सफल प्रमाणिकरण प्रदान गरेको छैन।',
+    'oidc_already_logged_in' => 'पहिले नै लगइन हुनुहुन्छ।',
+    'oidc_no_email_address' => 'बाह्य प्रमाणीकरण प्रणालीले प्रदान गरेको डाटामा यस प्रयोगकर्ताको इमेल ठेगाना भेट्न सकिएन।',
+    'oidc_fail_authed' => ':system प्रयोग गरेर लगइन असफल भएको छ, प्रणालीले सफल प्रमाणिकरण प्रदान गरेको छैन।',
+    'social_no_action_defined' => 'कोई क्रियाकलाप परिभाषित गरिएको छैन।',
+    'social_login_bad_response' => ":socialAccount लगइनको समयमा त्रुटि प्राप्त: \n:error",
+    'social_account_in_use' => 'यो :socialAccount खाता पहिले नै प्रयोगमा छ, कृपया :socialAccount विकल्प मार्फत लगइन प्रयास गर्नुहोस्।',
+    'social_account_email_in_use' => 'इमेल :email पहिले नै प्रयोगमा छ। यदि तपाईंको खाता छ भने, तपाईं आफ्नो प्रोफाइल सेटिङमा :socialAccount खाता जडान गर्न सक्नुहुन्छ।',
+    'social_account_existing' => 'यो :socialAccount तपाईंको प्रोफाइलसँग पहिले नै जडान गरिएको छ।',
+    'social_account_already_used_existing' => 'यो :socialAccount खाता पहिले नै अर्को प्रयोगकर्ताद्वारा प्रयोगमा छ।',
+    'social_account_not_used' => 'यो :socialAccount खाता कुनै प्रयोगकर्तासँग जडान गरिएको छैन। कृपया यसलाई आफ्नो प्रोफाइल सेटिङमा जडान गर्नुहोस्।',
+    'social_account_register_instructions' => 'यदि तपाईंको खाता छैन भने, तपाईं :socialAccount विकल्प प्रयोग गरेर खाता दर्ता गर्न सक्नुहुन्छ।',
+    'social_driver_not_found' => 'सामाजिक ड्राइभर फेला पारिएको छैन।',
+    'social_driver_not_configured' => 'तपाईंको :socialAccount सामाजिक सेटिङ सही तरिकाले कन्फिगर गरिएको छैन।',
+    'invite_token_expired' => 'यो निमन्त्रणा लिंक समाप्त भइसकेको छ। तपाईं सट्टा आफ्नो खाता पासवर्ड रिसेट गर्न प्रयास गर्न सक्नुहुन्छ।',
+    'login_user_not_found' => 'यो क्रियाकलापका लागि प्रयोगकर्ता फेला पारिएको छैन।',
+
+    // System
+    'path_not_writable' => 'फाइल पथ :filePath मा अपलोड गर्न सकिएन। कृपया यो पथ सर्भरमा लेख्न योग्य बनाउन सुनिश्चित गर्नुहोस्।',
+    'cannot_get_image_from_url' => ':url बाट चित्र प्राप्त गर्न सकिएन।',
+    'cannot_create_thumbs' => 'सर्भरले थम्बनेल बनाउन सक्दैन। कृपया तपाईंको सिस्टममा GD PHP एक्स्टेन्सन इन्स्टल गरिएको छ भनेर जाँच गर्नुहोस्।',
+    'server_upload_limit' => 'सर्भरले यस आकारको अपलोड अनुमति दिंदैन। कृपया सानो फाइल आकारको प्रयास गर्नुहोस्।',
+    'server_post_limit' => 'सर्भरले दिएको डेटा आकार प्राप्त गर्न सक्दैन। कृपया कम डेटा वा सानो फाइलको प्रयास गर्नुहोस्।',
+    'uploaded'  => 'सर्भरले यस आकारको अपलोड अनुमति दिंदैन। कृपया सानो फाइल आकारको प्रयास गर्नुहोस्।',
+
+    // Drawing & Images
+    'image_upload_error' => 'चित्र अपलोड गर्दा त्रुटि भयो।',
+    'image_upload_type_error' => 'अपलोड गरिएको चित्र प्रकार अवैध छ।',
+    'image_upload_replace_type' => 'चित्र फाइल प्रतिस्थापनहरू समान प्रकारका हुनुपर्छ।',
+    'image_upload_memory_limit' => 'चित्र अपलोड गर्न र/वा थम्बनेल बनाउन असफल भएको छ, यो प्रणाली संसाधन सीमाहरूको कारणले हो।',
+    'image_thumbnail_memory_limit' => 'चित्रको आकार भिन्नताहरू बनाउन असफल भएको छ, यो प्रणाली संसाधन सीमाहरूको कारणले हो।',
+    'image_gallery_thumbnail_memory_limit' => 'ग्यालरी थम्बनेल बनाउन असफल भएको छ, यो प्रणाली संसाधन सीमाहरूको कारणले हो।',
+    'drawing_data_not_found' => 'चित्रको डाटा लोड गर्न सकिएन। चित्र फाइल अब अस्तित्वमा नभएको हुन सक्छ वा तपाईंलाई यसमा पहुँचको अनुमति नहुन सक्छ।',
+
+    // Attachments
+    'attachment_not_found' => 'जोडिएको फाइल फेला परेन।',
+    'attachment_upload_error' => 'जोडिएको फाइल अपलोड गर्दा त्रुटि भयो।',
+
+    // Pages
+    'page_draft_autosave_fail' => 'ड्राफ्ट बचत गर्न असफल भयो। यो पाना बचत गर्नु अघि कृपया इन्टरनेट जडान सुनिश्चित गर्नुहोस्।',
+    'page_draft_delete_fail' => 'पाना ड्राफ्ट मेटाउन र वर्तमान पाना सामग्री ल्याउन असफल भयो।',
+    'page_custom_home_deletion' => 'एक पाना लाई होमपाना को रूपमा सेट गर्दा मेटाउन सकिँदैन।',
+
+    // Entities
+    'entity_not_found' => 'इकाई फेला परेन।',
+    'bookshelf_not_found' => 'शेल्फ फेला परेन।',
+    'book_not_found' => 'पुस्तक फेला परेन।',
+    'page_not_found' => 'पाना फेला परेन।',
+    'chapter_not_found' => 'अध्याय फेला परेन।',
+    'selected_book_not_found' => 'चयन गरिएको पुस्तक फेला परेन।',
+    'selected_book_chapter_not_found' => 'चयन गरिएको पुस्तक वा अध्याय फेला परेन।',
+    'guests_cannot_save_drafts' => 'अतिथिहरू ड्राफ्टहरू बचत गर्न सक्दैनन्।',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'तपाईं केवल व्यवस्थापक भएको प्रयोगकर्तालाई मेटाउन सक्दैनौं।',
+    'users_cannot_delete_guest' => 'तपाईं अतिथि प्रयोगकर्तालाई मेटाउन सक्दैनौं।',
+    'users_could_not_send_invite' => 'प्रयोगकर्ता सिर्जना गर्न सकिएन, निमन्त्रणा इमेल पठाउन असफल भयो।',
+
+    // Roles
+    'role_cannot_be_edited' => 'यो भूमिका सम्पादन गर्न सकिँदैन।',
+    'role_system_cannot_be_deleted' => 'यो भूमिका एक प्रणाली भूमिका हो र मेटाउन सकिँदैन।',
+    'role_registration_default_cannot_delete' => 'यो भूमिका दर्ता गरेको डिफल्ट भूमिका भएकोले मेटाउन सकिँदैन।',
+    'role_cannot_remove_only_admin' => 'यो प्रयोगकर्ता व्यवस्थापक भूमिकामा मात्र एकमात्र प्रयोगकर्ता हो। यसलाई हटाउन प्रयास गर्नु अघि अर्को प्रयोगकर्तालाई व्यवस्थापक भूमिका दिनुहोस्।',
+
+    // Comments
+    'comment_list' => 'टिप्पणीहरू प्राप्त गर्दा त्रुटि भयो।',
+    'cannot_add_comment_to_draft' => 'तपाईं ड्राफ्टमा टिप्पणी थप्न सक्नुहुन्न।',
+    'comment_add' => 'टिप्पणी थप्दा / अद्यावधिक गर्दा त्रुटि भयो।',
+    'comment_delete' => 'टिप्पणी मेट्दा त्रुटि भयो।',
+    'empty_comment' => 'खाली टिप्पणी थप्न सकिँदैन।',
+
+    // Error pages
+    '404_page_not_found' => 'पाना फेला परेन।',
+    'sorry_page_not_found' => 'माफ गर्नुहोस्, तपाईंले खोज्नुभएको पाना फेला परेन।',
+    'sorry_page_not_found_permission_warning' => 'यदि तपाईंलाई यो पाना अस्तित्वमा हुनु पर्ने आशा थियो भने, तपाईंलाई यसलाई हेर्न अनुमति नहुन सक्छ।',
+    'image_not_found' => 'चित्र फेला परेन।',
+    'image_not_found_subtitle' => 'माफ गर्नुहोस्, तपाईंले खोज्नुभएको चित्र फाइल फेला परेन।',
+    'image_not_found_details' => 'यदि तपाईंले यो चित्र फेला पार्नु पर्ने आशा राख्नु भएको थियो भने, यो मेटिएको हुन सक्छ।',
+    'return_home' => 'गृहपृष्ठमा फर्कनुहोस्',
+    'error_occurred' => 'एउटा त्रुटि भयो।',
+    'app_down' => ':appName अहिले डाउन छ।',
+    'back_soon' => 'यो चाँडै पुनः सक्रिय हुनेछ।',
+
+    // Import
+    'import_zip_cant_read' => 'ZIP फाइल पढ्न सकिएन।',
+    'import_zip_cant_decode_data' => 'ZIP डाटा.json सामग्री पत्ता लाग्न र डिकोड गर्न सकिएन।',
+    'import_zip_no_data' => 'ZIP फाइल डाटामा अपेक्षित पुस्तक, अध्याय वा पाना सामग्री छैन।',
+    'import_validation_failed' => 'आयात ZIP प्रमाणीकरण असफल भयो। त्रुटिहरू छन्:',
+    'import_zip_failed_notification' => 'ZIP फाइल आयात गर्न असफल भयो।',
+    'import_perms_books' => 'तपाईंलाई पुस्तकहरू सिर्जना गर्न आवश्यक अनुमति छैन।',
+    'import_perms_chapters' => 'तपाईंलाई अध्यायहरू सिर्जना गर्न आवश्यक अनुमति छैन।',
+    'import_perms_pages' => 'तपाईंलाई पाना सिर्जना गर्न आवश्यक अनुमति छैन।',
+    'import_perms_images' => 'तपाईंलाई चित्रहरू सिर्जना गर्न आवश्यक अनुमति छैन।',
+    'import_perms_attachments' => 'तपाईंलाई अनुलग्नकहरू सिर्जना गर्न आवश्यक अनुमति छैन।',
+
+    // API errors
+    'api_no_authorization_found' => 'अनुरोधमा कुनै प्रमाणीकरण टोकन फेला परेन।',
+    'api_bad_authorization_format' => 'अनुरोधमा प्रमाणीकरण टोकन फेला परे तापनि यसको ढाँचा गलत देखिन्छ।',
+    'api_user_token_not_found' => 'दिएको प्रमाणीकरण टोकनको लागि मिल्दो API टोकन फेला परेन।',
+    'api_incorrect_token_secret' => 'दिइएको API टोकनको लागि प्रदान गरिएको गोप्य सही छैन।',
+    'api_user_no_api_permission' => 'API टोकनको मालिकसँग API कल गर्ने अनुमति छैन।',
+    'api_user_token_expired' => 'प्रमाणीकरण टोकन समाप्त भइसकेको छ।',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'टेस्ट इमेल पठाउँदा त्रुटि:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'URL कन्फिगर गरिएका अनुमत SSR होस्टसँग मेल खाँदैन।',
+];
diff --git a/lang/ne/notifications.php b/lang/ne/notifications.php
new file mode 100644
index 00000000000..1e9c572215a
--- /dev/null
+++ b/lang/ne/notifications.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'नयाँ टिप्पणी: :pageName पानामा',
+    'new_comment_intro' => 'एक प्रयोगकर्ताले :appName मा रहेको पानामा टिप्पणी गरेका छन्:',
+    'new_page_subject' => 'नयाँ पाना: :pageName',
+    'new_page_intro' => ':appName मा नयाँ पाना बनाइएको छ',
+    'updated_page_subject' => 'पाना अपडेट भयो: :pageName',
+    'updated_page_intro' => ':appName मा पाना अपडेट गरिएको छ',
+    'updated_page_debounce' => 'धेरै सूचना नपरोस् भनेर, केही समयको लागि एउटै सम्पादकबाट हुने थप सम्पादनहरूका सूचना तपाईंलाई पठाइने छैन।',
+
+    'detail_page_name' => 'पानाको नाम:',
+    'detail_page_path' => 'पानाको स्थान:',
+    'detail_commenter' => 'टिप्पणी गर्ने:',
+    'detail_comment' => 'टिप्पणी:',
+    'detail_created_by' => 'बनाउने व्यक्ति:',
+    'detail_updated_by' => 'अपडेट गर्ने व्यक्ति:',
+
+    'action_view_comment' => 'टिप्पणी हेर्नुहोस्',
+    'action_view_page' => 'पाना हेर्नुहोस्',
+
+    'footer_reason' => 'तपाईंलाई यो सूचना :link अनुसार पठाइएको हो, जुन यस प्रकारको गतिविधिमा लागु हुन्छ।',
+    'footer_reason_link' => 'तपाईंको सूचना प्राथमिकता',
+];
diff --git a/lang/ne/pagination.php b/lang/ne/pagination.php
new file mode 100644
index 00000000000..3da50cb08d8
--- /dev/null
+++ b/lang/ne/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; अघिल्लो',
+    'next'     => 'अर्को &raquo;',
+
+];
diff --git a/lang/ne/passwords.php b/lang/ne/passwords.php
new file mode 100644
index 00000000000..684201a8e56
--- /dev/null
+++ b/lang/ne/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'पासवर्ड कम्तिमा ८ वर्णको हुनु पर्छ र दाेहाेर्याइएकाे पासवर्ड संग मेल खानु पर्छ।',
+    'user' => "हामीले त्यो इमेल ठेगाना भएको प्रयोगकर्ता फेला पार्न सकेनौं।",
+    'token' => 'यस इमेल ठेगानाको लागि पासवर्ड रिसेट टोकन अमान्य छ।',
+    'sent' => 'हामीले तपाईंको पासवर्ड रिसेट लिङ्क इमेल गरेका छौं!',
+    'reset' => 'पासवर्ड रिसेट भयो!',
+
+];
diff --git a/lang/ne/preferences.php b/lang/ne/preferences.php
new file mode 100644
index 00000000000..70388e8baef
--- /dev/null
+++ b/lang/ne/preferences.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'मेरो खाता',
+
+    'shortcuts' => 'सर्टकटहरू',
+    'shortcuts_interface' => 'UI सर्टकट प्राथमिकताहरू',
+    'shortcuts_toggle_desc' => 'यहाँ तपाईं किबोर्ड प्रणाली इन्टरफेस सर्टकटहरू सक्षम वा असक्षम गर्न सक्नुहुन्छ, जुन नेभिगेशन र क्रियाकलापहरूको लागि प्रयोग गरिन्छ।',
+    'shortcuts_customize_desc' => 'तपाईं तलका प्रत्येक सर्टकटलाई अनुकूलित गर्न सक्नुहुन्छ। केवल सर्टकटको इनपुट चयन गरेपछि आफ्नो इच्छित कीबोर्ड संयोजन थिच्नुहोस्।',
+    'shortcuts_toggle_label' => 'किबोर्ड सर्टकट सक्षम छ',
+    'shortcuts_section_navigation' => 'नेभिगेशन',
+    'shortcuts_section_actions' => 'साधारण क्रियाकलापहरू',
+    'shortcuts_save' => 'सर्टकटहरू बचत गर्नुहोस्',
+    'shortcuts_overlay_desc' => 'नोट: जब सर्टकटहरू सक्षम हुन्छन्, तब "?" थिचेर एक सहायक ओभरले देखाइन्छ जसले स्क्रीनमा हाल देखिएका क्रियाकलापहरूको लागि उपलब्ध सर्टकटहरू हाइलाइट गर्दछ।',
+    'shortcuts_update_success' => 'सर्टकट प्राथमिकताहरू अपडेट गरिएका छन्!',
+    'shortcuts_overview_desc' => 'प्रणाली प्रयोगकर्ता इन्टरफेसमा नेभिगेट गर्न तपाईंले प्रयोग गर्न सक्ने किबोर्ड सर्टकटहरू व्यवस्थापन गर्नुहोस्।',
+
+    'notifications' => 'सूचना प्राथमिकताहरू',
+    'notifications_desc' => 'प्रणालीमा केही क्रियाकलापहरू गर्दा तपाईंलाई प्राप्त हुने इमेल सूचनाहरू नियन्त्रण गर्नुहोस्।',
+    'notifications_opt_own_page_changes' => 'मैले स्वामित्व राख्ने पृष्ठहरूमा परिवर्तन हुँदा सूचित गर्नुहोस्',
+    'notifications_opt_own_page_comments' => 'मैले स्वामित्व राख्ने पृष्ठहरूमा टिप्पणी हुँदा सूचित गर्नुहोस्',
+    'notifications_opt_comment_replies' => 'मेरो टिप्पणीहरूमा उत्तर आएको बेला सूचित गर्नुहोस्',
+    'notifications_save' => 'प्राथमिकताहरू बचत गर्नुहोस्',
+    'notifications_update_success' => 'सूचना प्राथमिकताहरू अपडेट गरिएका छन्!',
+    'notifications_watched' => 'हेर्ने र बेवास्ता गरिएका सामग्रीहरू',
+    'notifications_watched_desc' => 'तल ती सामग्रीहरू छन् जसमा कस्टम वाच प्राथमिकताहरू लागू गरिएका छन्। यीलाई अपडेट गर्नको लागि सामग्री हेरेर, साइडबारमा वाच विकल्पहरू फेला पार्नुहोस्।',
+
+    'auth' => 'प्रवेश र सुरक्षा',
+    'auth_change_password' => 'पासवर्ड परिवर्तन गर्नुहोस्',
+    'auth_change_password_desc' => 'तपाईंको एप्लिकेसनमा लगइन गर्न प्रयोग गरिने पासवर्ड परिवर्तन गर्नुहोस्। यो कम्तिमा ८ अक्षर लामो हुनुपर्छ।',
+    'auth_change_password_success' => 'पासवर्ड अपडेट गरियो!',
+
+    'profile' => 'प्रोफाइल विवरण',
+    'profile_desc' => 'तपाईंको खाता विवरण व्यवस्थापन गर्नुहोस् जसले तपाईंलाई अन्य प्रयोगकर्ताहरूको लागि प्रतिनिधित्व गर्दछ, साथै सम्पर्क र प्रणाली अनुकूलनका लागि प्रयोग गरिने विवरणहरू।',
+    'profile_view_public' => 'सार्वजनिक प्रोफाइल हेर्नुहोस्',
+    'profile_name_desc' => 'तपाईंको प्रदर्शन नाम कन्फिगर गर्नुहोस् जुन प्रणालीमा अन्य प्रयोगकर्ताहरूलाई तपाईंको क्रियाकलाप र स्वामित्व भएको सामग्रीमार्फत देखिनेछ।',
+    'profile_email_desc' => 'यो इमेल सूचनाहरूको लागि प्रयोग हुनेछ र, सक्रिय प्रणाली प्रमाणिकरणमा निर्भर गर्दै, प्रणाली प्रवेशको लागि पनि प्रयोग हुनेछ।',
+    'profile_email_no_permission' => 'दुर्भाग्यवश तपाईंलाई तपाईंको इमेल ठेगाना परिवर्तन गर्ने अनुमति छैन। यदि तपाईं यसलाई परिवर्तन गर्न चाहनुहुन्छ भने, तपाईंलाई एक व्यवस्थापकलाई अनुरोध गर्नु पर्नेछ।',
+    'profile_avatar_desc' => 'तपाईंको प्रतिनिधित्व गर्नको लागि एक छवि चयन गर्नुहोस् जुन प्रणालीमा अन्य प्रयोगकर्ताहरूलाई तपाईंको रूपमा देखाउनेछ। यस छविको आकार वर्गाकार र लगभग २५६px चौडाइ र उचाइ भएको हुनु पर्छ।',
+    'profile_admin_options' => 'व्यवस्थापक विकल्पहरू',
+    'profile_admin_options_desc' => 'अधिकार व्यवस्थापन जस्ता अतिरिक्त व्यवस्थापक-स्तरका विकल्पहरू तपाईंको प्रयोगकर्ता खाता "सेटिंग्स > प्रयोगकर्ताहरू" क्षेत्रमा फेला पार्न सकिन्छ।',
+
+    'delete_account' => 'खाता मेटाउनुहोस्',
+    'delete_my_account' => 'मेरो खाता मेटाउनुहोस्',
+    'delete_my_account_desc' => 'यसले तपाईंको प्रयोगकर्ता खाता प्रणालीबाट पूर्ण रूपमा मेटाउनेछ। तपाईं यो खाता पुन: प्राप्त गर्न वा यो क्रियाकलापलाई फर्काउन सक्नुहुन्न। तपाईंले सिर्जना गरेको सामग्री, जस्तै सिर्जना गरिएका पृष्ठहरू र अपलोड गरिएका चित्रहरू, बाँकी रहनेछन्।',
+    'delete_my_account_warning' => 'के तपाईं यो खाता मेटाउन निश्चित हुनुहुन्छ?',
+];
diff --git a/lang/ne/settings.php b/lang/ne/settings.php
new file mode 100644
index 00000000000..b846c4a09dc
--- /dev/null
+++ b/lang/ne/settings.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'सेटिङ्ग',
+    'settings_save' => 'सेटिङ्ग सुरक्षित गर्नुहोस्',
+    'system_version' => 'सिस्टम संस्करण',
+    'categories' => 'क्याटोगोरीहरु',
+
+    // App Settings
+    'app_customization' => 'अनुकूलन',
+    'app_features_security' => 'फिचरहरू र सुरक्षा',
+    'app_name' => 'एप्लिकेसन नाम',
+    'app_name_desc' => 'यो नाम हेडरमा र कुनै पनि प्रणालीले पठाएको इमेलमा देखाइनेछ।',
+    'app_name_header' => 'हेडरमा नाम देखाउनुहोस्',
+    'app_public_access' => 'सार्वजनिक पहुँच',
+    'app_public_access_desc' => 'यो विकल्प सक्षम गर्दा, लगइन नगरेका आगन्तुकहरूले तपाईंको BookStack मा सामग्री पहुँच गर्न सक्नेछन्।',
+    'app_public_access_desc_guest' => 'सार्वजनिक आगन्तुकहरूको पहुँच "Guest" प्रयोगकर्ताबाट नियन्त्रण गर्न सकिन्छ।',
+    'app_public_access_toggle' => 'सार्वजनिक पहुँच अनुमति दिनुहोस्',
+    'app_public_viewing' => 'सार्वजनिक हेर्न अनुमति दिनुहोस्?',
+    'app_secure_images' => 'उच्च सुरक्षा छवि अपलोडहरू',
+    'app_secure_images_toggle' => 'उच्च सुरक्षा छवि अपलोडहरू सक्षम गर्नुहोस्',
+    'app_secure_images_desc' => 'प्रदर्शन कारणहरूका लागि, सबै छविहरू सार्वजनिक हुन्छन्। यो विकल्पले छवि URL अगाडि एउटा अनियमित, अनुमान गर्न गाह्रो स्ट्रिङ थप्छ। सजिलो पहुँच रोक्न निर्देशिका सूचीकरण निष्क्रिय गर्नुहोस्।',
+    'app_default_editor' => 'डिफल्ट पृष्ठ सम्पादक',
+    'app_default_editor_desc' => 'नयाँ पृष्ठ सम्पादन गर्दा डिफल्ट रूपमा प्रयोग हुने सम्पादक चयन गर्नुहोस्। अनुमति अनुसार पृष्ठ स्तरमा यो परिवर्तन गर्न सकिन्छ।',
+    'app_custom_html' => 'कस्टम HTML हेड सामग्री',
+    'app_custom_html_desc' => 'यहाँ थपिएको कुनै पनि सामग्री प्रत्येक पृष्ठको <head> सेक्सनको तल्लो भागमा समावेश हुनेछ। स्टाइल ओभरराइड वा एनालिटिक्स कोड थप्न उपयोगी।',
+    'app_custom_html_disabled_notice' => 'कस्टम HTML हेड सामग्री यस सेटिङ पृष्ठमा असक्षम गरिएको छ ताकि कुनै समस्या भएमा फर्काउन सकियोस्।',
+    'app_logo' => 'एप्लिकेसन लोगो',
+    'app_logo_desc' => 'यो एप्लिकेसन हेडर बार लगायत अन्य ठाउँहरूमा प्रयोग हुन्छ। यो छवि ८६px उचाइको हुनु पर्नेछ। ठूलो छविहरू सानो गरिनेछ।',
+    'app_icon' => 'एप्लिकेसन आइकन',
+    'app_icon_desc' => 'यो आइकन ब्राउजर ट्याब र छोटोमार्ग आइकनहरूका लागि प्रयोग हुन्छ। PNG २५६px वर्गाकार छवि हुनुपर्छ।',
+    'app_homepage' => 'एप्लिकेसन होमपेज',
+    'app_homepage_desc' => 'डिफल्ट दृश्यको सट्टा होमपेजमा देखाउनको लागि कुनै दृश्य चयन गर्नुहोस्। चयन गरिएका पृष्ठहरूको अनुमति बेवास्ता गरिनेछ।',
+    'app_homepage_select' => 'पृष्ठ चयन गर्नुहोस्',
+    'app_footer_links' => 'फुटर लिंकहरू',
+    'app_footer_links_desc' => 'साइटको फुटरमा देखाउन लिंकहरू थप्नुहोस्। यी प्रायः पृष्ठहरूको तल्लो भागमा देखिनेछन्, जसमा लगइन आवश्यक नभएका पृष्ठहरू पनि समावेश छन्। "trans::<key>" ले प्रणाली-परिभाषित अनुवाद प्रयोग गर्न सकिन्छ। उदाहरण: "trans::common.privacy_policy" ले "गोपनीयता नीति" र "trans::common.terms_of_service" ले "सेवा सर्तहरू" देखाउनेछ।',
+    'app_footer_links_label' => 'लिंक लेबल',
+    'app_footer_links_url' => 'लिंक URL',
+    'app_footer_links_add' => 'फुटर लिंक थप्नुहोस्',
+    'app_disable_comments' => 'टिप्पणीहरू असक्षम पार्नुहोस्',
+    'app_disable_comments_toggle' => 'टिप्पणीहरू असक्षम पार्नुहोस्',
+    'app_disable_comments_desc' => 'एप्लिकेसनका सबै पृष्ठहरूमा टिप्पणीहरू असक्षम पार्दछ। <br> अस्तित्वमा रहेका टिप्पणीहरू देखाइने छैनन्।',
+
+    // Color settings
+    'color_scheme' => 'एप्लिकेसन रंग योजना',
+    'color_scheme_desc' => 'एप्लिकेसनको प्रयोगकर्ता इन्टरफेसमा प्रयोग हुने रंगहरू सेट गर्नुहोस्। रंगहरू डार्क र लाइट मोडका लागि अलग्गै सेट गर्न सकिन्छ जसले विषयवस्तु र पठनीयता सुधार गर्छ।',
+    'ui_colors_desc' => 'एप्लिकेसनको मुख्य रंग र डिफल्ट लिंक रंग सेट गर्नुहोस्। मुख्य रंग मुख्य रूपमा हेडर ब्यानर, बटनहरू र इन्टरफेस सजावटमा प्रयोग हुन्छ। डिफल्ट लिंक रंग लेखिएको सामग्री र इन्टरफेस दुवैमा प्रयोग हुन्छ।',
+    'app_color' => 'मुख्य रंग',
+    'link_color' => 'डिफल्ट लिंक रंग',
+    'content_colors_desc' => 'पृष्ठ संगठन संरचनाका सबै तत्वहरूका लागि रंग सेट गर्नुहोस्। पठनीयताको लागि डिफल्ट रंगहरूसँग मिल्दोजुल्दो चमक छनौट गर्न सुझाव दिइन्छ।',
+    'bookshelf_color' => 'शेल्फ रंग',
+    'book_color' => 'पुस्तक रंग',
+    'chapter_color' => 'अध्याय रंग',
+    'page_color' => 'पृष्ठ रंग',
+    'page_draft_color' => 'पृष्ठ मसौदा रंग',
+
+    // Registration Settings
+    'reg_settings' => 'दर्ता',
+    'reg_enable' => 'दर्ता सक्षम गर्नुहोस्',
+    'reg_enable_toggle' => 'दर्ता सक्षम गर्नुहोस्',
+    'reg_enable_desc' => 'दर्ता सक्षम हुँदा प्रयोगकर्ताले आफैंलाई एप्लिकेसन प्रयोगकर्ताको रूपमा दर्ता गर्न सक्नेछन्। दर्ता हुँदा तिनीहरूलाई डिफल्ट प्रयोगकर्ता भूमिका दिइन्छ।',
+    'reg_default_role' => 'दर्ता पछि डिफल्ट प्रयोगकर्ता भूमिका',
+    'reg_enable_external_warning' => 'बाह्य LDAP वा SAML प्रमाणीकरण सक्रिय हुँदा माथि उल्लेखित विकल्प बेवास्ता गरिनेछ। प्रमाणीकरण सफल भएमा गैर-अस्तित्व प्रयोगकर्ताका खाताहरू स्वचालित सिर्जना हुनेछ।',
+    'reg_email_confirmation' => 'इमेल पुष्टि',
+    'reg_email_confirmation_toggle' => 'इमेल पुष्टि आवश्यक छ',
+    'reg_confirm_email_desc' => 'यदि डोमेन प्रतिबन्ध प्रयोग गरिएको छ भने इमेल पुष्टि आवश्यक हुनेछ र यो विकल्प बेवास्ता गरिनेछ।',
+    'reg_confirm_restrict_domain' => 'डोमेन प्रतिबन्ध',
+    'reg_confirm_restrict_domain_desc' => 'दर्ता सीमित गर्न चाहनु भएको इमेल डोमेन्सलाई अल्पविरामले छुट्याएर प्रविष्ट गर्नुहोस्। प्रयोगकर्ताहरूलाई ठेगाना पुष्टि गर्न इमेल पठाइनेछ। <br> दर्ता सफल भएपछि प्रयोगकर्ताले इमेल ठेगाना परिवर्तन गर्न सक्नेछन्।',
+    'reg_confirm_restrict_domain_placeholder' => 'कुनै प्रतिबन्ध छैन',
+
+    // Sorting Settings
+    'sorting' => 'क्रमबद्धता',
+    'sorting_book_default' => 'डिफल्ट पुस्तक क्रम',
+    'sorting_book_default_desc' => 'नयाँ पुस्तकहरूमा लागु गर्न डिफल्ट क्रम नियम चयन गर्नुहोस्। यो अस्तित्वमा रहेका पुस्तकहरूमा असर पार्दैन र पुस्तक अनुसार ओभरराइड गर्न सकिन्छ।',
+    'sorting_rules' => 'क्रम नियमहरू',
+    'sorting_rules_desc' => 'यी पूर्वनिर्धारित क्रम सञ्चालनहरू हुन् जुन प्रणालीमा सामग्रीमा लागू गर्न सकिन्छ।',
+    'sort_rule_assigned_to_x_books' => ':count पुस्तकमा लागू गरिएको|:count पुस्तकहरूमा लागू गरिएको',
+    'sort_rule_create' => 'क्रम नियम सिर्जना गर्नुहोस्',
+    'sort_rule_edit' => 'क्रम नियम सम्पादन गर्नुहोस्',
+    'sort_rule_delete' => 'क्रम नियम मेटाउनुहोस्',
+    'sort_rule_delete_desc' => 'यस क्रम नियमलाई प्रणालीबाट हटाउनुहोस्। यस नियम प्रयोग गरिएका पुस्तकहरू म्यानुअल क्रमबद्धतामा फर्कनेछन्।',
+    'sort_rule_delete_warn_books' => 'यो क्रम नियम हाल :count पुस्तक(हरू) मा प्रयोग भैरहेको छ। के तपाईं पक्का यो मेटाउन चाहनुहुन्छ?',
+    'sort_rule_delete_warn_default' => 'यो क्रम नियम हाल पुस्तकहरूको डिफल्ट रूपमा प्रयोग भैरहेको छ। के तपाईं पक्का यो मेटाउन चाहनुहुन्छ?',
+    'sort_rule_details' => 'क्रम नियम विवरण',
+    'sort_rule_details_desc' => 'यस क्रम नियमको नाम सेट गर्नुहोस्, जुन प्रयोगकर्ताहरूले क्रम छनौट गर्दा सूचिमा देखिनेछ।',
+    'sort_rule_operations' => 'क्रम सञ्चालनहरू',
+    'sort_rule_operations_desc' => 'उपलब्ध सञ्चालनहरूको सूचीबाट क्रम क्रियाकलापहरू सेट गर्नुहोस्। प्रयोग गर्दा, माथिबाट तल सम्म क्रमसँगै लागू गरिनेछ। यहाँ गरिएको कुनै पनि परिवर्तन सुरक्षित गर्दा सबै लागू पुस्तकहरूमा लागु हुनेछ।',
+    'sort_rule_available_operations' => 'उपलब्ध सञ्चालनहरू',
+    'sort_rule_available_operations_empty' => 'कोही सञ्चालन बाँकी छैनन्',
+    'sort_rule_configured_operations' => 'कन्फिगर गरिएको सञ्चालनहरू',
+    'sort_rule_configured_operations_empty' => '"उपलब्ध सञ्चालनहरू" सूचीबाट सञ्चालनहरू तान्नुहोस्/थप्नुहोस्',
+    'sort_rule_op_asc' => '(Ascending)',
+    'sort_rule_op_desc' => '(Descending)',
+    'sort_rule_op_name' => 'नाम - वर्णानुक्रम',
+    'sort_rule_op_name_numeric' => 'नाम - सङ्ख्यात्मक',
+    'sort_rule_op_created_date' => 'सिर्जना मिति',
+    'sort_rule_op_updated_date' => 'अपडेट मिति',
+    'sort_rule_op_chapters_first' => 'पहिले अध्यायहरू',
+    'sort_rule_op_chapters_last' => 'अन्त्यमा अध्यायहरू',
+
+    // Maintenance settings
+    'maint' => 'सम्भार',
+    'maint_image_cleanup' => 'छविहरू सफा गर्नुहोस्',
+    'maint_image_cleanup_desc' => 'पृष्ठ र संस्करण सामग्री स्क्यान गरी कुन छविहरू र चित्रहरू प्रयोगमा छन् र कुनहरू अनावश्यक छन् जाँच गर्दछ। यो सञ्चालन अघि पूर्ण डाटाबेस र छवि ब्याकअप बनाउनुहोस्।',
+    'maint_delete_images_only_in_revisions' => 'पुराना पृष्ठ संस्करणहरूमा मात्र रहेका छविहरू पनि मेटाउनुहोस्',
+    'maint_image_cleanup_run' => 'सफा गर्ने प्रक्रिया सुरु गर्नुहोस्',
+    'maint_image_cleanup_warning' => ':count सम्भावित अप्रयुक्त छविहरू फेला परे। के तपाईं पक्का यी छविहरू मेटाउन चाहनुहुन्छ?',
+    'maint_image_cleanup_success' => ':count सम्भावित अप्रयुक्त छविहरू फेला परे र मेटाइयो!',
+    'maint_image_cleanup_nothing_found' => 'कुनै अप्रयुक्त छवि फेला परेन, केही मेटाइएन!',
+    'maint_send_test_email' => 'परीक्षण इमेल पठाउनुहोस्',
+    'maint_send_test_email_desc' => 'यो तपाईको प्रोफाइलमा दिइएको इमेल ठेगानामा परीक्षण इमेल पठाउँछ।',
+    'maint_send_test_email_run' => 'परीक्षण इमेल पठाउनुहोस्',
+    'maint_send_test_email_success' => 'इमेल पठाइयो :address',
+    'maint_send_test_email_mail_subject' => 'परीक्षण इमेल',
+    'maint_send_test_email_mail_greeting' => 'इमेल वितरण सफल देखिन्छ!',
+    'maint_send_test_email_mail_text' => 'बधाई छ! तपाईंले यो इमेल प्राप्त गर्नुभएकोले तपाईका इमेल सेटिङहरू ठीकसँग कन्फिगर भएका छन्।',
+    'maint_recycle_bin_desc' => 'मेटाइएका शेल्फ, पुस्तक, अध्याय र पृष्ठहरू रीसायकल बिनमा पठाइन्छ जसबाट पुनर्स्थापना वा स्थायी मेटाई गर्न सकिन्छ। पुराना वस्तुहरू प्रणाली कन्फिगरेसन अनुसार स्वचालित रूपमा हटाउन सकिन्छ।',
+    'maint_recycle_bin_open' => 'रीसायकल बिन खोल्नुहोस्',
+    'maint_regen_references' => 'सन्दर्भहरू पुनः उत्पन्न गर्नुहोस्',
+    'maint_regen_references_desc' => 'यो क्रियाले डाटाबेस भित्र वस्तुहरू बीचको सन्दर्भ सूचकांक पुनः बनाउँछ। सामान्यतया यो स्वतः हुन्छ, तर पुराना वा अनअधिकारिक विधिबाट थपिएको सामग्रीलाई सूचीकृत गर्न उपयोगी हुन्छ।',
+    'maint_regen_references_success' => 'सन्दर्भ सूचकांक पुनः उत्पन्न गरियो!',
+    'maint_timeout_command_note' => 'सूचना: यो क्रियामा समय लाग्न सक्छ जसले केही वेब वातावरणहरूमा टाइमआउट समस्या ल्याउन सक्छ। विकल्पको रूपमा टर्मिनल कमाण्ड प्रयोग गरेर गर्न सकिन्छ।',
+
+    // Recycle Bin
+    'recycle_bin' => 'रीसायकल बिन',
+    'recycle_bin_desc' => 'यहाँ तपाईंले मेटाइएका वस्तुहरू पुनर्स्थापना गर्न वा प्रणालीबाट स्थायी रूपमा हटाउन सक्नुहुन्छ। यो सूची प्रणालीका अन्य गतिविधि सूचिहरू जस्तो फिल्टर नभएको छ।',
+    'recycle_bin_deleted_item' => 'मेटाइएको वस्तु',
+    'recycle_bin_deleted_parent' => 'मूल',
+    'recycle_bin_deleted_by' => 'मेटाउने व्यक्ति',
+    'recycle_bin_deleted_at' => 'मेटाइने समय',
+    'recycle_bin_permanently_delete' => 'स्थायी रूपमा मेटाउनुहोस्',
+    'recycle_bin_restore' => 'पुन: भण्डारण गर्नुहोस्',
+    'recycle_bin_contents_empty' => 'रिसायकल बिन हाल खाली छ',
+    'recycle_bin_empty' => 'रिसायकल बिन खाली गर्नुहोस्',
+    'recycle_bin_empty_confirm' => 'यसले रिसायकल बिनभित्रका सबै वस्तुहरू र तिनीहरूको सामग्री स्थायी रूपमा मेटाउनेछ। के तपाईं पक्का खाली गर्न चाहनुहुन्छ?',
+    'recycle_bin_destroy_confirm' => 'यस क्रियाले यो वस्तु र तल सूचीबद्ध कुनै पनि सन्तान तत्वहरूलाई स्थायी रूपमा प्रणालीबाट मेटाउनेछ र तपाईंले पुनः प्राप्त गर्न सक्नुहुने छैन। के तपाईं पक्का स्थायी रूपमा मेटाउन चाहनुहुन्छ?',
+    'recycle_bin_destroy_list' => 'मेटाइने वस्तुहरू',
+    'recycle_bin_restore_list' => 'पुनर्स्थापना गरिने वस्तुहरू',
+    'recycle_bin_restore_confirm' => 'यो क्रियाले मेटाइएको वस्तु र कुनै पनि सन्तान तत्वहरूलाई मूल स्थानमा पुनर्स्थापना गर्नेछ। यदि मूल स्थान पनि मेटाइएको छ र रिसायकल बिनमा छ भने मूल वस्तुलाई पनि पुनर्स्थापना गर्नुपर्नेछ।',
+    'recycle_bin_restore_deleted_parent' => 'यस वस्तुको मूल पनि मेटाइएको छ। मूल वस्तु पुनर्स्थापित नभएसम्म यो वस्तु मेटिएको नै रहनेछ।',
+    'recycle_bin_restore_parent' => 'मूल पुनर्स्थापना गर्नुहोस्',
+    'recycle_bin_destroy_notification' => 'रिसायकल बिनबाट कुल :count वस्तुहरू मेटाइयो।',
+    'recycle_bin_restore_notification' => 'रिसायकल बिनबाट कुल :count वस्तुहरू पुनर्स्थापित गरियो।',
+
+    // Audit Log
+    'audit' => 'अडिट लग',
+    'audit_desc' => 'यो अडिट लग प्रणालीमा ट्र्याक गरिएका गतिविधिहरूको सूची देखाउँछ। यो सूची प्रणालीका समान गतिविधि सूचीहरू भन्दा फरक फिल्टररहित हुन्छ।',
+    'audit_event_filter' => 'घटना फिल्टर',
+    'audit_event_filter_no_filter' => 'फिल्टर छैन',
+    'audit_deleted_item' => 'मेटाइएको वस्तु',
+    'audit_deleted_item_name' => 'नाम: :name',
+    'audit_table_user' => 'प्रयोगकर्ता',
+    'audit_table_event' => 'घटना',
+    'audit_table_related' => 'सम्बन्धित वस्तु वा विवरण',
+    'audit_table_ip' => 'IP ठेगाना',
+    'audit_table_date' => 'गतिविधि मिति',
+    'audit_date_from' => 'मिति दायरा सुरु',
+    'audit_date_to' => 'मिति दायरा अन्त्य',
+
+    // Role Settings
+    'roles' => 'भूमिकाहरू',
+    'role_user_roles' => 'प्रयोगकर्ता भूमिका',
+    'roles_index_desc' => 'भूमिकाहरू प्रयोगकर्ताहरूलाई समूहमा राख्न र उनीहरूको सदस्यलाई प्रणाली अनुमति दिन प्रयोग हुन्छ। यदि कुनै प्रयोगकर्ता धेरै भूमिका मा छ भने तिनका अधिकारहरू जोडिनेछन् र सबै क्षमता प्राप्त हुनेछन्।',
+    'roles_x_users_assigned' => ':count प्रयोगकर्तालाई भूमिका दिइयो|:count प्रयोगकर्ताहरूलाई भूमिका दिइयो',
+    'roles_x_permissions_provided' => ':count अनुमति दिइयो|:count अनुमति दिइयो',
+    'roles_assigned_users' => 'दिइएका प्रयोगकर्ताहरू',
+    'roles_permissions_provided' => 'दिइएका अनुमति',
+    'role_create' => 'नयाँ भूमिका सिर्जना गर्नुहोस्',
+    'role_delete' => 'भूमिका मेटाउनुहोस्',
+    'role_delete_confirm' => 'यसले \':roleName\' नामको भूमिका मेटाउनेछ।',
+    'role_delete_users_assigned' => 'यस भूमिकामा :userCount प्रयोगकर्ता छन्। यदि तपाईंले यी प्रयोगकर्ताहरूलाई अर्को भूमिकामा सार्न चाहनुहुन्छ भने तल नयाँ भूमिका चयन गर्नुहोस्।',
+    'role_delete_no_migration' => "प्रयोगकर्ताहरू सार्नु हुँदैन",
+    'role_delete_sure' => 'के तपाईं पक्का यो भूमिका मेटाउन चाहनुहुन्छ?',
+    'role_edit' => 'भूमिका सम्पादन गर्नुहोस्',
+    'role_details' => 'भूमिका विवरण',
+    'role_name' => 'भूमिका नाम',
+    'role_desc' => 'भूमिकाको संक्षिप्त विवरण',
+    'role_mfa_enforced' => 'बहु-फ्याक्टर प्रमाणीकरण आवश्यक',
+    'role_external_auth_id' => 'बाह्य प्रमाणीकरण ID हरू',
+    'role_system' => 'प्रणाली अनुमति',
+    'role_manage_users' => 'प्रयोगकर्ताहरू व्यवस्थापन गर्नुहोस्',
+    'role_manage_roles' => 'भूमिका र अनुमति व्यवस्थापन गर्नुहोस्',
+    'role_manage_entity_permissions' => 'सबै पुस्तक, अध्याय र पृष्ठ अनुमति व्यवस्थापन गर्नुहोस्',
+    'role_manage_own_entity_permissions' => 'आफ्नो पुस्तक, अध्याय र पृष्ठ अनुमति व्यवस्थापन गर्नुहोस्',
+    'role_manage_page_templates' => 'पृष्ठ टेम्प्लेट व्यवस्थापन गर्नुहोस्',
+    'role_access_api' => 'प्रणाली API पहुँच',
+    'role_manage_settings' => 'एप सेटिङ व्यवस्थापन गर्नुहोस्',
+    'role_export_content' => 'सामग्री निर्यात गर्नुहोस्',
+    'role_import_content' => 'सामग्री आयात गर्नुहोस्',
+    'role_editor_change' => 'पृष्ठ सम्पादक परिवर्तन गर्नुहोस्',
+    'role_notifications' => 'सूचनाहरू प्राप्त र व्यवस्थापन गर्नुहोस्',
+    'role_asset' => 'संपत्ति अनुमति',
+    'roles_system_warning' => 'माथिका कुनै पनि तीन अनुमति प्रयोगकर्ताले आफैं वा अरूका अधिकार परिवर्तन गर्न सक्छन्। यी अनुमति भएको भूमिका मात्र भरपर्दो प्रयोगकर्तालाई दिनुहोस्।',
+    'role_asset_desc' => 'यी अनुमतिले प्रणालीभित्र सम्पत्तिमा डिफल्ट पहुँच नियन्त्रण गर्छ। पुस्तक, अध्याय र पृष्ठमा अनुमति यी भन्दा प्राथमिक हुन्छ।',
+    'role_asset_admins' => 'प्रशासनकर्ताहरूलाई सबै सामग्रीमा स्वतः पहुँच दिइन्छ, यी विकल्पहरूले UI मा देखिने वा लुकेका विकल्पहरू मात्र प्रभाव पार्न सक्छ।',
+    'role_asset_image_view_note' => 'यो छवि व्यवस्थापक भित्रको दृश्यता सम्बन्धि हो। अपलोड गरिएको छविमा वास्तविक पहुँच प्रणालीको छवि भण्डारण विकल्प अनुसार हुन्छ।',
+    'role_all' => 'सबै',
+    'role_own' => 'आफ्नो',
+    'role_controlled_by_asset' => 'अपलोड गरिएको सम्पत्तिले नियन्त्रण गरेको',
+    'role_save' => 'भूमिका सुरक्षित गर्नुहोस्',
+    'role_users' => 'यस भूमिकाका प्रयोगकर्ताहरू',
+    'role_users_none' => 'यो भूमिकामा हाल कुनै प्रयोगकर्ता छैन',
+
+    // Users
+    'users' => 'प्रयोगकर्ताहरू',
+    'users_index_desc' => 'प्रणालीमा व्यक्तिगत प्रयोगकर्ता खाता सिर्जना र व्यवस्थापन गर्नुहोस्। प्रयोगकर्ता खाता लगइन र सामग्री तथा गतिविधि जिम्मेवारीका लागि प्रयोग हुन्छ। पहुँच अनुमतिहरू मुख्यतया भूमिकामा आधारित छन् तर प्रयोगकर्ताको सामग्री स्वामित्वले पनि असर गर्न सक्छ।',
+    'user_profile' => 'प्रयोगकर्ता प्रोफाइल',
+    'users_add_new' => 'नयाँ प्रयोगकर्ता थप्नुहोस्',
+    'users_search' => 'प्रयोगकर्ताहरू खोज्नुहोस्',
+    'users_latest_activity' => 'हालैको गतिविधि',
+    'users_details' => 'प्रयोगकर्ता विवरण',
+    'users_details_desc' => 'यस प्रयोगकर्ताको प्रदर्शन नाम र इमेल ठेगाना सेट गर्नुहोस्। इमेल ठेगाना लगइनका लागि प्रयोग हुनेछ।',
+    'users_details_desc_no_email' => 'यो प्रयोगकर्तालाई अरूले चिन्नेगरी प्रदर्शन नाम सेट गर्नुहोस्।',
+    'users_role' => 'प्रयोगकर्ता भूमिका',
+    'users_role_desc' => 'यो प्रयोगकर्तालाई दिइने भूमिका चयन गर्नुहोस्। प्रयोगकर्ताले धेरै भूमिका पाएमा सबै भूमिका अधिकारहरू जोडिनेछन्।',
+    'users_password' => 'प्रयोगकर्ता पासवर्ड',
+    'users_password_desc' => 'लगइनका लागि कम्तिमा ८ वर्ण लामो पासवर्ड सेट गर्नुहोस्।',
+    'users_send_invite_text' => 'तपाईं यो प्रयोगकर्तालाई निमन्त्रणा इमेल पठाउन सक्नुहुन्छ जसले उनीहरूलाई आफ्नै पासवर्ड सेट गर्न अनुमति दिन्छ, नभए तपाईंले आफैं पासवर्ड सेट गर्न सक्नुहुन्छ।',
+    'users_send_invite_option' => 'प्रयोगकर्तालाई निमन्त्रणा इमेल पठाउनुहोस्',
+    'users_external_auth_id' => 'बाह्य प्रमाणीकरण ID',
+    'users_external_auth_id_desc' => 'जब बाह्य प्रमाणीकरण प्रणाली प्रयोग हुन्छ (जस्तै SAML2, OIDC, LDAP), यो ID ले यो BookStack प्रयोगकर्तालाई सम्बन्धित प्रणाली खातासँग जोड्छ। सामान्य इमेल प्रमाणीकरणमा यो फिल्ड आवश्यक छैन।',
+    'users_password_warning' => 'यो प्रयोगकर्ताको पासवर्ड परिवर्तन गर्न मात्र तल भर्नुहोस्।',
+    'users_system_public' => 'यो प्रयोगकर्ता कुनै पनि पाहुना प्रयोगकर्तालाई प्रतिनिधित्व गर्दछ। यसले लगइन गर्न सक्दैन तर स्वतः दिइन्छ।',
+    'users_delete' => 'प्रयोगकर्ता मेटाउनुहोस्',
+    'users_delete_named' => ':userName प्रयोगकर्ता मेटाउनुहोस्',
+    'users_delete_warning' => 'यसले \':userName\' नामको प्रयोगकर्तालाई प्रणालीबाट पूर्ण रूपमा मेटाउनेछ।',
+    'users_delete_confirm' => 'के तपाईं पक्का यो प्रयोगकर्ता मेटाउन चाहनुहुन्छ?',
+    'users_migrate_ownership' => 'स्वामित्व सार्नुहोस्',
+    'users_migrate_ownership_desc' => 'यहाँ अर्को प्रयोगकर्ता चयन गर्नुहोस् जसले यस प्रयोगकर्ताका सबै वस्तुहरूको स्वामित्व पाओस्।',
+    'users_none_selected' => 'कुनै प्रयोगकर्ता चयन गरिएको छैन',
+    'users_edit' => 'प्रयोगकर्ता सम्पादन गर्नुहोस्',
+    'users_edit_profile' => 'प्रोफाइल सम्पादन गर्नुहोस्',
+    'users_avatar' => 'प्रयोगकर्ता अवतार',
+    'users_avatar_desc' => 'यो प्रयोगकर्तालाई प्रतिनिधित्व गर्न एउटा चित्र चयन गर्नुहोस्। करिब २५६px वर्गाकार हुनु पर्छ।',
+    'users_preferred_language' => 'रुचाइको भाषा',
+    'users_preferred_language_desc' => 'यस विकल्पले एपको यूजर-इन्टरफेसको भाषा परिवर्तन गर्नेछ। प्रयोगकर्ताले सिर्जना गरेको सामग्रीमा असर पार्दैन।',
+    'users_social_accounts' => 'सामाजिक खाता',
+    'users_social_accounts_desc' => 'यो प्रयोगकर्ताका जडित सामाजिक खाताहरूको स्थिति हेर्नुहोस्। सामाजिक खाताहरू प्रमाणीकरणका लागि प्राथमिक प्रणालीसँगै प्रयोग गर्न सकिन्छ।',
+    'users_social_accounts_info' => 'यहाँ तपाईं आफ्नो अन्य खाताहरू छिटो र सजिलो लगइनका लागि जोड्न सक्नुहुन्छ। यहाँबाट खाता डिस्कनेक्ट गर्दा पूर्व अनुमति रद्द हुँदैन। अनुमति रद्द गर्न सामाजिक खाताको सेटिङ प्रयोग गर्नुहोस्।',
+    'users_social_connect' => 'खाता जडान गर्नुहोस्',
+    'users_social_disconnect' => 'खाता डिस्कनेक्ट गर्नुहोस्',
+    'users_social_status_connected' => 'जडान गरिएको',
+    'users_social_status_disconnected' => 'डिस्कनेक्ट गरिएको',
+    'users_social_connected' => ':socialAccount खाता सफलतापूर्वक प्रोफाइलमा जोडियो।',
+    'users_social_disconnected' => ':socialAccount खाता सफलतापूर्वक प्रोफाइलबाट हटाइयो।',
+    'users_api_tokens' => 'API टोकनहरू',
+    'users_api_tokens_desc' => 'BookStack REST API सँग प्रमाणीकरण गर्न प्रयोग गरिने पहुँच टोकनहरू सिर्जना र व्यवस्थापन गर्नुहोस्। API अनुमतिहरू टोकनधारक प्रयोगकर्ताबाट व्यवस्थापन हुन्छ।',
+    'users_api_tokens_none' => 'यस प्रयोगकर्ताका लागि कुनै API टोकन सिर्जना गरिएको छैन',
+    'users_api_tokens_create' => 'टोकन सिर्जना गर्नुहोस्',
+    'users_api_tokens_expires' => 'म्याद समाप्त',
+    'users_api_tokens_docs' => 'API कागजातहरू',
+    'users_mfa' => 'बहु-फ्याक्टर प्रमाणीकरण',
+    'users_mfa_desc' => 'तपाईंको प्रयोगकर्ता खाताको लागि थप सुरक्षा तहको रूपमा बहु-फ्याक्टर प्रमाणीकरण सेटअप गर्नुहोस्।',
+    'users_mfa_x_methods' => ':count विधि सेटअप गरिएको|:count विधिहरू सेटअप गरिएको',
+    'users_mfa_configure' => 'विधिहरू सेटअप गर्नुहोस्',
+
+    // API Tokens
+    'user_api_token_create' => 'API टोकन सिर्जना गर्नुहोस्',
+    'user_api_token_name' => 'नाम',
+    'user_api_token_name_desc' => 'यो टोकनको उद्देश्य सम्झनको लागि भविष्यमा सम्झन सकिने नाम दिनुहोस्।',
+    'user_api_token_expiry' => 'म्याद समाप्ति मिति',
+    'user_api_token_expiry_desc' => 'यो टोकनको म्याद समाप्त हुने मिति सेट गर्नुहोस्। यस मितिपछि, यस टोकनको प्रयोग गरेर गरिएका अनुरोधहरू काम गर्दैनन्। यो फिल्ड खाली छोड्दा भविष्यमा १०० वर्षको म्याद सेट हुनेछ।',
+    'user_api_token_create_secret_message' => 'यो टोकन सिर्जना गरेपछि "Token ID" र "Token Secret" जनरेट र प्रदर्शन गरिनेछ। यो गोप्य जानकारी एक पटक मात्र देखाइनेछ, त्यसैले कृपया यसलाई सुरक्षित स्थानमा प्रतिलिपि गर्नुहोस् र त्यसपछि मात्र अगाडि बढ्नुहोस्।',
+    'user_api_token' => 'API टोकन',
+    'user_api_token_id' => 'टोकन ID',
+    'user_api_token_id_desc' => 'यो टोकनको लागि प्रणालीद्वारा उत्पन्न गरिएको अ-सम्पादनयोग्य पहिचान हो, जुन API अनुरोधहरूमा प्रदान गर्न आवश्यक हुनेछ।',
+    'user_api_token_secret' => 'टोकन गोप्य जानकारी',
+    'user_api_token_secret_desc' => 'यो टोकनको लागि प्रणालीद्वारा उत्पन्न गरिएको गोप्य जानकारी हो, जुन API अनुरोधहरूमा प्रदान गर्न आवश्यक हुनेछ। यसलाई केवल एक पटक मात्र देखाइनेछ, त्यसैले कृपया यसलाई सुरक्षित स्थानमा प्रतिलिपि गर्नुहोस्।',
+    'user_api_token_created' => 'टोकन सिर्जना भएको :timeAgo',
+    'user_api_token_updated' => 'टोकन अपडेट भएको :timeAgo',
+    'user_api_token_delete' => 'टोकन मेटाउनुहोस्',
+    'user_api_token_delete_warning' => 'यसले \':tokenName\' नामको API टोकनलाई पूर्ण रूपमा प्रणालीबाट मेटाउनेछ।',
+    'user_api_token_delete_confirm' => 'के तपाईं पक्का यो API टोकन मेटाउन चाहनुहुन्छ?',
+
+    // Webhooks
+    'webhooks' => 'वेबहुक्स',
+    'webhooks_index_desc' => 'वेबहुक्स भनेको प्रणाली भित्रका केही क्रियाकलाप र घटनाहरू हुँदा बाह्य URL हरूमा डेटा पठाउने विधि हो, जसले बाह्य प्लेटफर्महरूसँग जस्तै सन्देश वा सूचनासम्बन्धी सिस्टमहरूसँग घटनामा आधारित एकीकरणलाई अनुमति दिन्छ।',
+    'webhooks_x_trigger_events' => ':count ट्रिगर घटना|:count ट्रिगर घटनाहरू',
+    'webhooks_create' => 'नयाँ वेबहुक सिर्जना गर्नुहोस्',
+    'webhooks_none_created' => 'अझै कुनै वेबहुक सिर्जना गरिएको छैन।',
+    'webhooks_edit' => 'वेबहुक सम्पादन गर्नुहोस्',
+    'webhooks_save' => 'वेबहुक बचत गर्नुहोस्',
+    'webhooks_details' => 'वेबहुक विवरण',
+    'webhooks_details_desc' => 'एक प्रयोगकर्ता मैत्री नाम र एक POST इन्डप्वाइंट दिनुहोस् जसलाई वेबहुकको डेटा पठाइने स्थानको रूपमा प्रयोग हुनेछ।',
+    'webhooks_events' => 'वेबहुक घटनाहरू',
+    'webhooks_events_desc' => 'यी घटनाहरू चयन गर्नुहोस् जसले यो वेबहुकलाई ट्रिगर गर्नुपर्नेछ।',
+    'webhooks_events_warning' => 'ध्यान दिनुहोस् कि यी घटनाहरू चयन गरेपछि सबै चयन गरिएका घटनाहरूको लागि वेबहुक ट्रिगर हुनेछ, भले नै कस्टम अनुमतिहरू लागू गरिएका छन्। यो वेबहुक प्रयोग गर्दा गोपनीय सामग्रीको जोखिम नहोस् भन्ने कुरा सुनिश्चित गर्नुहोस्।',
+    'webhooks_events_all' => 'सिस्टमका सबै घटनाहरू',
+    'webhooks_name' => 'वेबहुक नाम',
+    'webhooks_timeout' => 'वेबहुक अनुरोध म्याद समाप्ति (सेकेन्ड)',
+    'webhooks_endpoint' => 'वेबहुक इन्डप्वाइंट',
+    'webhooks_active' => 'वेबहुक सक्रिय',
+    'webhook_events_table_header' => 'घटनाहरू',
+    'webhooks_delete' => 'वेबहुक मेटाउनुहोस्',
+    'webhooks_delete_warning' => 'यसले \':webhookName\' नामको वेबहुकलाई प्रणालीबाट पूर्ण रूपमा मेटाउनेछ।',
+    'webhooks_delete_confirm' => 'के तपाईं पक्का यो वेबहुक मेटाउन चाहनुहुन्छ?',
+    'webhooks_format_example' => 'वेबहुक ढाँचाको उदाहरण',
+    'webhooks_format_example_desc' => 'वेबहुक डेटा POST अनुरोधको रूपमा JSON ढाँचामा निर्धारित इन्डप्वाइंटमा पठाइन्छ। "related_item" र "url" गुणहरू वैकल्पिक छन् र यो ट्रिगर गरिएको घटनाको प्रकारमा निर्भर गर्नेछ।',
+    'webhooks_status' => 'वेबहुक स्थिति',
+    'webhooks_last_called' => 'अन्तिम पटक कल गरिएको: ',
+    'webhooks_last_errored' => 'अन्तिम पटक एरर भएको: ',
+    'webhooks_last_error_message' => 'अन्तिम एरर सन्देश: ',
+
+    // Licensing
+    'licenses' => 'लाइसन्स',
+    'licenses_desc' => 'यस पृष्ठमा BookStack को लाइसेन्स जानकारी र BookStack भित्र प्रयोग भएका परियोजना र पुस्तकालयहरूको जानकारी दिइएको छ। सूचीबद्ध भएका धेरै परियोजनाहरूले केवल विकासको सन्दर्भमा मात्र प्रयोग गर्न सकिन्छ।',
+    'licenses_bookstack' => 'BookStack लाइसेन्स',
+    'licenses_php' => 'PHP पुस्तकालय लाइसेन्स',
+    'licenses_js' => 'JavaScript पुस्तकालय लाइसेन्स',
+    'licenses_other' => 'अन्य लाइसेन्स',
+    'license_details' => 'लाइसेन्स विवरण',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sv' => 'Svenska',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/ne/validation.php b/lang/ne/validation.php
new file mode 100644
index 00000000000..f00c0f73153
--- /dev/null
+++ b/lang/ne/validation.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => ':attribute स्वीकार गर्नुपर्छ।',
+    'active_url'           => ':attribute मान्य URL होइन।',
+    'after'                => ':attribute मिति :date पछिको हुनुपर्छ।',
+    'alpha'                => ':attribute मा अक्षर मात्र हुनुपर्छ।',
+    'alpha_dash'           => ':attribute मा अक्षर, अंक, ड्यास (-) र अन्डरस्कोर (_) मात्र हुनुपर्छ।',
+    'alpha_num'            => ':attribute मा अक्षर र अंक मात्र हुनुपर्छ।',
+    'array'                => ':attribute array हुनुपर्छ।',
+    'backup_codes'         => 'दिइएको कोड गलत छ वा पहिल्यै प्रयोग भइसकेको छ।',
+    'before'               => ':attribute मिति :date भन्दा पहिला हुनुपर्छ।',
+    'between'              => [
+        'numeric' => ':attribute :min देखि :max बीचमा हुनुपर्छ।',
+        'file'    => ':attribute :min देखि :max किलोबाइट बीचमा हुनुपर्छ।',
+        'string'  => ':attribute :min देखि :max क्यारेक्टरबीच हुनुपर्छ।',
+        'array'   => ':attribute मा :min देखि :max वस्तुहरू हुनुपर्छ।',
+    ],
+    'boolean'              => ':attribute साँचो (true) वा झूटो (false) हुनुपर्छ।',
+    'confirmed'            => ':attribute पुष्टि मिलेन।',
+    'date'                 => ':attribute मान्य मिति होइन।',
+    'date_format'          => ':attribute ढाँचा :format सँग मेल खाँदैन।',
+    'different'            => ':attribute र :other फरक हुनुपर्छ।',
+    'digits'               => ':attribute मा ठीक :digits अंक हुनुपर्छ।',
+    'digits_between'       => ':attribute मा :min देखि :max अंक हुनुपर्छ।',
+    'email'                => ':attribute मान्य ईमेल ठेगाना हुनुपर्छ।',
+    'ends_with' => ':attribute यी मध्ये एकले अन्त्य हुनुपर्छ: :values',
+    'file'                 => ':attribute मान्य फाइल हुनुपर्छ।',
+    'filled'               => ':attribute आवश्यक छ।',
+    'gt'                   => [
+        'numeric' => ':attribute :value भन्दा बढी हुनुपर्छ।',
+        'file'    => ':attribute :value किलोबाइटभन्दा बढी हुनुपर्छ।',
+        'string'  => ':attribute :value क्यारेक्टरभन्दा बढी हुनुपर्छ।',
+        'array'   => ':attribute मा :value भन्दा बढी वस्तुहरू हुनुपर्छ।',
+    ],
+    'gte'                  => [
+        'numeric' => ':attribute :value भन्दा बढी वा बराबर हुनुपर्छ।',
+        'file'    => ':attribute :value किलोबाइटभन्दा बढी वा बराबर हुनुपर्छ।',
+        'string'  => ':attribute :value क्यारेक्टरभन्दा बढी वा बराबर हुनुपर्छ।',
+        'array'   => ':attribute मा कम्तीमा :value वस्तुहरू हुनुपर्छ।',
+    ],
+    'exists'               => 'चयन गरिएको :attribute अमान्य छ।',
+    'image'                => ':attribute एउटा तस्बिर हुनुपर्छ।',
+    'image_extension'      => ':attribute मा मान्य र समर्थित तस्बिर विस्तार (extension) हुनुपर्छ।',
+    'in'                   => 'चयन गरिएको :attribute अमान्य छ।',
+    'integer'              => ':attribute पूर्णांक (integer) हुनुपर्छ।',
+    'ip'                   => ':attribute मान्य IP ठेगाना हुनुपर्छ।',
+    'ipv4'                 => ':attribute मान्य IPv4 ठेगाना हुनुपर्छ।',
+    'ipv6'                 => ':attribute मान्य IPv6 ठेगाना हुनुपर्छ।',
+    'json'                 => ':attribute मान्य JSON स्ट्रिङ हुनुपर्छ।',
+    'lt'                   => [
+        'numeric' => ':attribute :value भन्दा कम हुनुपर्छ।',
+        'file'    => ':attribute :value किलोबाइटभन्दा कम हुनुपर्छ।',
+        'string'  => ':attribute :value क्यारेक्टरभन्दा कम हुनुपर्छ।',
+        'array'   => ':attribute मा :value भन्दा कम वस्तुहरू हुनुपर्छ।',
+    ],
+    'lte'                  => [
+        'numeric' => ':attribute :value भन्दा कम वा बराबर हुनुपर्छ।',
+        'file'    => ':attribute :value किलोबाइटभन्दा कम वा बराबर हुनुपर्छ।',
+        'string'  => ':attribute :value क्यारेक्टरभन्दा कम वा बराबर हुनुपर्छ।',
+        'array'   => ':attribute मा :value भन्दा बढी वस्तुहरू हुनु हुँदैन।',
+    ],
+    'max'                  => [
+        'numeric' => ':attribute :max भन्दा बढी हुन सक्दैन।',
+        'file'    => ':attribute :max किलोबाइटभन्दा बढी हुन सक्दैन।',
+        'string'  => ':attribute :max क्यारेक्टरभन्दा बढी हुन सक्दैन।',
+        'array'   => ':attribute मा :max भन्दा बढी वस्तुहरू हुनु हुँदैन।',
+    ],
+    'mimes'                => ':attribute फाइलको प्रकार :values हुनुपर्छ।',
+    'min'                  => [
+        'numeric' => ':attribute कम्तीमा :min हुनुपर्छ।',
+        'file'    => ':attribute कम्तीमा :min किलोबाइट हुनुपर्छ।',
+        'string'  => ':attribute कम्तीमा :min क्यारेक्टर हुनुपर्छ।',
+        'array'   => ':attribute मा कम्तीमा :min वस्तुहरू हुनुपर्छ।',
+    ],
+    'not_in'               => 'चयन गरिएको :attribute अमान्य छ।',
+    'not_regex'            => ':attribute को ढाँचा अमान्य छ।',
+    'numeric'              => ':attribute संख्या हुनुपर्छ।',
+    'regex'                => ':attribute ढाँचा अमान्य छ।',
+    'required'             => ':attribute आवश्यक छ।',
+    'required_if'          => ':other :value हुँदा :attribute आवश्यक हुन्छ।',
+    'required_with'        => ':values भएमा :attribute आवश्यक छ।',
+    'required_with_all'    => ':values भएमा :attribute आवश्यक छ।',
+    'required_without'     => ':values नभएमा :attribute आवश्यक छ।',
+    'required_without_all' => ':values मध्ये कुनै पनि नभएमा :attribute आवश्यक छ।',
+    'same'                 => ':attribute र :other मिल्नुपर्छ।',
+    'safe_url'             => 'दिएको लिङ्क सुरक्षित नहुन सक्छ।',
+    'size'                 => [
+        'numeric' => ':attribute ठीक :size हुनुपर्छ।',
+        'file'    => ':attribute ठीक :size किलोबाइट हुनुपर्छ।',
+        'string'  => ':attribute ठीक :size क्यारेक्टर हुनुपर्छ।',
+        'array'   => ':attribute मा ठीक :size वस्तुहरू हुनुपर्छ।',
+    ],
+    'string'               => ':attribute स्ट्रिङ (पाठ) हुनुपर्छ।',
+    'timezone'             => ':attribute मान्य समय क्षेत्र (timezone) हुनुपर्छ।',
+    'totp'                 => 'दिएको कोड गलत छ वा सकिएको छ।',
+    'unique'               => ':attribute पहिल्यै प्रयोग भइसकेको छ।',
+    'url'                  => ':attribute को ढाँचा अमान्य छ।',
+    'uploaded'             => 'फाइल अपलोड हुन सकेन। सर्भरले यस्तो साइज स्वीकार नगर्न सक्छ।',
+
+    'zip_file' => ':attribute ले ZIP फाइलभित्रको फाइल देखाउनु पर्छ।',
+    'zip_file_mime' => ':attribute मा :validTypes प्रकारको फाइल हुनुपर्छ, तर :foundType भेटियो।',
+    'zip_model_expected' => 'डेटा वस्तु चाहिएको थियो तर ":type" भेटियो।',
+    'zip_unique' => ':attribute ZIP भित्रको वस्तु प्रकारको लागि अद्वितीय हुनुपर्छ।',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'पासवर्ड पुष्टि आवश्यक छ।',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index ef9cf7203c3..00ec6ce04d5 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '":name" đã được gỡ khỏi danh sách yêu thích của bạn',
 
     // Watching
-    'watch_update_level_notification' => 'Watch preferences successfully updated',
+    'watch_update_level_notification' => 'Đã cập nhật tùy chọn xem thành công',
 
     // Auth
     'auth_login' => 'đăng nhập',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook đã được xóa thành công',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'đã tạo nhập',
+    'import_create_notification' => 'Tải lên nhập thành công',
+    'import_run' => 'đã nhập cập nhật',
+    'import_run_notification' => 'Nội dung đã được nhập thành công',
+    'import_delete' => 'Đã xóa nhập',
+    'import_delete_notification' => 'Nhập đã được xóa thành công',
 
     // Users
     'user_create' => 'đã tạo người dùng',
@@ -101,17 +101,17 @@
     'user_delete_notification' => 'Người dùng đã được xóa thành công',
 
     // API Tokens
-    'api_token_create' => 'created API token',
-    'api_token_create_notification' => 'API token successfully created',
-    'api_token_update' => 'updated API token',
-    'api_token_update_notification' => 'API token successfully updated',
-    'api_token_delete' => 'deleted API token',
-    'api_token_delete_notification' => 'API token successfully deleted',
+    'api_token_create' => 'Đã tạo Token API ',
+    'api_token_create_notification' => 'Token API  đã tạo thành công',
+    'api_token_update' => 'Đã cập nhật token API ',
+    'api_token_update_notification' => 'Token API  đã cập nhật thành công',
+    'api_token_delete' => 'Đã xóa token API',
+    'api_token_delete_notification' => 'Đã xóa token API thành công',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => 'Đã tạo vai trò',
     'role_create_notification' => 'Vai trò mới đã được tạo thành công',
-    'role_update' => 'updated role',
+    'role_update' => 'Vai trò đã cập nhật',
     'role_update_notification' => 'Vai trò đã được cập nhật thành công',
     'role_delete' => 'đã xóa vai trò',
     'role_delete_notification' => 'Vai trò đã được xóa thành công',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'đã xóa bình luận',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => '',
+    'sort_rule_create_notification' => '',
+    'sort_rule_update' => 'xóa quy tắc sắp xếp',
+    'sort_rule_update_notification' => 'Đã cập nhật quy tắc sắp xếp thành công',
+    'sort_rule_delete' => 'xóa quy tắc sắp xếp',
+    'sort_rule_delete_notification' => 'Đã xóa quy tắc sắp xếp thành công',
 
     // Other
     'permissions_update'          => 'các quyền đã được cập nhật',
diff --git a/lang/vi/auth.php b/lang/vi/auth.php
index a13b8993e6d..d53d2cf4cb6 100644
--- a/lang/vi/auth.php
+++ b/lang/vi/auth.php
@@ -66,9 +66,9 @@
 
     'email_not_confirmed' => 'Địa chỉ email chưa được xác nhận',
     'email_not_confirmed_text' => 'Địa chỉ email của bạn hiện vẫn chưa được xác nhận.',
-    'email_not_confirmed_click_link' => 'Vui lòng bấm vào liên kết trong mail được gửi trong thời gian ngắn ngay sau khi bạn đăng kí.',
-    'email_not_confirmed_resend' => 'Nếu bạn không tìm thấy email bạn có thể yêu cầu gửi lại email xác nhận bằng cách gửi mẫu dưới đây.',
-    'email_not_confirmed_resend_button' => 'Gửi lại email xác nhận',
+    'email_not_confirmed_click_link' => 'Vui lòng bấm vào liên kết trong email được gửi trong thời gian ngắn ngay sau khi bạn đăng kí.',
+    'email_not_confirmed_resend' => 'Nếu bạn không tìm thấy e-mail bạn có thể yêu cầu gửi lại e-mail xác nhận bằng cách gửi mẫu dưới đây.',
+    'email_not_confirmed_resend_button' => 'Gửi lại e-mail xác nhận',
 
     // User Invite
     'user_invite_email_subject' => 'Bạn được mời tham gia :appName!',
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Ứng dụng di động',
     'mfa_option_totp_desc' => 'Để sử dụng xác thực đa lớp bạn cần ưng dụng trên điện thoại có hỗ trợ TOTP như Google Authenticator, Authy hoặc Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Mã dự phòng',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Tạo một bộ mã dự phòng sử dụng một lần mà bạn sẽ nhập khi đăng nhập để xác minh danh tính của mình. Hãy đảm bảo cất giữ những thứ này ở nơi an toàn và bảo mật.',
     'mfa_gen_confirm_and_enable' => 'Xác nhận và Mở',
     'mfa_gen_backup_codes_title' => 'Cài đặt Mã dự phòng',
     'mfa_gen_backup_codes_desc' => 'Lưu trữ các mã dưới đây ở một nơi an toàn. Khi truy cập vào hệ thống bạn sẽ có thể sử dụng được một trong các đoạn mã đó như là một phương thức xác thực dự phòng.',
diff --git a/lang/vi/common.php b/lang/vi/common.php
index ffde7183b12..5035788f8fd 100644
--- a/lang/vi/common.php
+++ b/lang/vi/common.php
@@ -20,7 +20,7 @@
     'description' => 'Mô tả',
     'role' => 'Vai trò',
     'cover_image' => 'Ảnh bìa',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Hình ảnh này phải có kích thước khoảng 440x250px mặc dù nó sẽ được thu nhỏ & cắt xén linh hoạt để phù hợp với giao diện người dùng trong các trường hợp khác nhau theo yêu cầu, do đó kích thước thực tế để hiển thị sẽ khác nhau.',
 
     // Actions
     'actions' => 'Hành động',
@@ -30,8 +30,8 @@
     'create' => 'Tạo',
     'update' => 'Cập nhật',
     'edit' => 'Sửa',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Lưu trữ',
+    'unarchive' => 'Bỏ lưu trữ',
     'sort' => 'Sắp xếp',
     'move' => 'Di chuyển',
     'copy' => 'Sao chép',
@@ -44,7 +44,7 @@
     'remove' => 'Xóa bỏ',
     'add' => 'Thêm',
     'configure' => 'Cấu hình',
-    'manage' => 'Manage',
+    'manage' => 'Quản lý',
     'fullscreen' => 'Toàn màn hình',
     'favourite' => 'Yêu thích',
     'unfavourite' => 'Bỏ yêu thích',
@@ -54,7 +54,7 @@
     'filter_clear' => 'Xóa bộ lọc',
     'download' => 'Tải về',
     'open_in_tab' => 'Mở trong thẻ mới',
-    'open' => 'Open',
+    'open' => 'Mở',
 
     // Sort Options
     'sort_options' => 'Tùy Chọn Sắp Xếp',
@@ -102,7 +102,8 @@
     'tab_content_label' => 'Tab: Hiển thị nội dung chính',
 
     // Email Content
-    'email_action_help' => 'Nếu bạn đang có vấn đề trong việc bấm nút ":actionText", sao chép và dán địa chỉ URL dưới đây vào trình duyệt web:',
+    'email_action_help' => 'Nếu bạn gặp sự cố khi nhấp vào nút ": actionText", hãy sao chép và dán URL bên dưới
+vào trình duyệt web của bạn:',
     'email_rights' => 'Bản quyền đã được bảo hộ',
 
     // Footer Link Options
@@ -111,5 +112,5 @@
     'terms_of_service' => 'Điều khoản Dịch vụ',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Tìm kiếm :appName',
 ];
diff --git a/lang/vi/components.php b/lang/vi/components.php
index 802d09d0b66..eb17b4acd05 100644
--- a/lang/vi/components.php
+++ b/lang/vi/components.php
@@ -34,8 +34,8 @@
     'image_delete_success' => 'Ảnh đã được xóa thành công',
     'image_replace' => 'Thay thế hình ảnh',
     'image_replace_success' => 'Đã cập nhật thành công tệp hình ảnh',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_rebuild_thumbs' => 'Tái tạo các biến thể kích thước',
+    'image_rebuild_thumbs_success' => 'Các biến thể kích thước hình ảnh được xây dựng lại thành công!',
 
     // Code Editor
     'code_editor' => 'Sửa Mã',
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index ed524610638..ff089f67a64 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -10,15 +10,15 @@
     'general' => 'Tổng quát',
     'advanced' => 'Nâng cao',
     'none' => 'Không',
-    'cancel' => 'Huỷ',
+    'cancel' => 'Hủy',
     'save' => 'Lưu',
     'close' => 'Đóng',
-    'apply' => 'Apply',
+    'apply' => 'Áp dụng',
     'undo' => 'Hoàn tác',
     'redo' => 'Làm lại',
     'left' => 'Bên trái',
     'center' => 'Chính giữa',
-    'right' => 'Bên phải',
+    'right' => 'Bên phải',
     'top' => 'Trên cùng',
     'middle' => 'Giữa',
     'bottom' => 'Dưới cùng',
@@ -30,7 +30,7 @@
     // Toolbar
     'formats' => 'Định dạng',
     'header_large' => 'Tiêu đề lớn',
-    'header_medium' => 'Tiêu đề trung binh',
+    'header_medium' => 'Tiêu đề trung bình',
     'header_small' => 'Tiêu đề nhỏ',
     'header_tiny' => 'Tiêu đề cực nhỏ',
     'paragraph' => 'Đoạn văn',
@@ -39,17 +39,17 @@
     'callouts' => 'Chú thích',
     'callout_information' => 'Thông tin',
     'callout_success' => 'Thành công',
-    'callout_warning' => 'Cánh báo',
+    'callout_warning' => 'Cảnh báo',
     'callout_danger' => 'Nguy hiểm',
     'bold' => 'In đậm',
     'italic' => 'In nghiêng',
     'underline' => 'Gạch chân',
     'strikethrough' => 'Gạch ngang',
     'superscript' => 'Chỉ số trên',
-    'subscript' => 'Đăng ký',
+    'subscript' => 'Chỉ số dưới',
     'text_color' => 'Màu chữ',
     'custom_color' => 'Màu tùy chỉnh',
-    'remove_color' => 'Xoá màu',
+    'remove_color' => 'Xóa màu',
     'background_color' => 'Màu nền',
     'align_left' => 'Canh lề trái',
     'align_center' => 'Căn giữa',
@@ -68,7 +68,7 @@
     'insert_horizontal_line' => 'Chèn đường ngang',
     'insert_code_block' => 'Chèn khối mã',
     'edit_code_block' => 'Chỉnh sửa khối mã',
-    'insert_drawing' => 'Chèn/chỉnh sửa bản vẻ',
+    'insert_drawing' => 'Chèn/chỉnh sửa bản vẽ',
     'drawing_manager' => 'Quản lý hình vẽ',
     'insert_media' => 'Chèn/chỉnh sửa media',
     'insert_media_title' => 'Chèn/chỉnh sửa media',
@@ -76,15 +76,15 @@
     'source_code' => 'Mã nguồn',
     'source_code_title' => 'Mã Nguồn',
     'fullscreen' => 'Toàn màn hình',
-    'image_options' => 'Tuỳ chọn hình ảnh',
+    'image_options' => 'Tùy chọn hình ảnh',
 
     // Tables
     'table_properties' => 'Thuộc tính bảng',
     'table_properties_title' => 'Thuộc tính bảng',
     'delete_table' => 'Xóa bảng',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Xóa định dạng bảng',
+    'resize_to_contents' => 'Thay đổi kích thước theo nội dung',
+    'row_header' => 'Tiêu đề hàng',
     'insert_row_before' => 'Chèn thêm hàng ở trên',
     'insert_row_after' => 'Chèn thêm hàng ở dưới',
     'delete_row' => 'Xóa hàng',
@@ -111,71 +111,71 @@
     'border_color' => 'Màu viền',
     'row_properties' => 'Đặt thuộc tính hàng',
     'row_properties_title' => 'Đặt thuộc tính hàng',
-    'cut_row' => 'Tách cột',
-    'copy_row' => 'Sao chép cột',
-    'paste_row_before' => 'Dán cột vào bên trái',
-    'paste_row_after' => 'Dán cột vào bên phải',
+    'cut_row' => 'Cắt hàng',
+    'copy_row' => 'Sao chép hàng',
+    'paste_row_before' => 'Dán hàng vào bên trên',
+    'paste_row_after' => 'Dán hàng vào bên dưới',
     'row_type' => 'Kiểu hàng',
     'row_type_header' => 'Tiêu đề',
     'row_type_body' => 'Nội dung',
-    'row_type_footer' => 'Cuối trang',
+    'row_type_footer' => 'Chân trang',
     'alignment' => 'Canh lề',
     'cut_column' => 'Cắt cột',
     'copy_column' => 'Sao chép cột',
-    'paste_column_before' => 'Thêm cột phía trước',
-    'paste_column_after' => 'Thêm cột phía sau',
-    'cell_padding' => 'Cell padding',
-    'cell_spacing' => 'Cell spacing',
+    'paste_column_before' => 'Dán cột vào bên trái',
+    'paste_column_after' => 'Dán cột vào bên phải',
+    'cell_padding' => 'Đệm ô',
+    'cell_spacing' => 'Khoảng cách ô',
     'caption' => 'Chú thích',
     'show_caption' => 'Hiện chú thích',
     'constrain' => 'Ràng buộc các thuộc tính',
-    'cell_border_solid' => 'Khối',
-    'cell_border_dotted' => 'Điểm chấm',
-    'cell_border_dashed' => 'Dashed',
-    'cell_border_double' => 'Double',
-    'cell_border_groove' => 'Groove',
-    'cell_border_ridge' => 'Ridge',
-    'cell_border_inset' => 'Inset',
-    'cell_border_outset' => 'Outset',
-    'cell_border_none' => 'None',
+    'cell_border_solid' => 'Đặc',
+    'cell_border_dotted' => 'Chấm chấm',
+    'cell_border_dashed' => 'Nét đứt',
+    'cell_border_double' => 'Đôi',
+    'cell_border_groove' => 'Rãnh',
+    'cell_border_ridge' => 'Gờ',
+    'cell_border_inset' => 'Lõm',
+    'cell_border_outset' => 'Lồi',
+    'cell_border_none' => 'Không',
     'cell_border_hidden' => 'Ẩn',
 
     // Images, links, details/summary & embed
     'source' => 'Nguồn',
     'alt_desc' => 'Mô tả thay thế',
     'embed' => 'Mã nhúng',
-    'paste_embed' => 'Dán mã đính kèm của bạn vào bên dưới:',
+    'paste_embed' => 'Dán mã nhúng của bạn vào bên dưới:',
     'url' => 'Đường dẫn',
-    'text_to_display' => 'Các văn bản hiển thị',
+    'text_to_display' => 'Văn bản hiển thị',
     'title' => 'Tiêu đề',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Duyệt liên kết',
     'open_link' => 'Mở liên kết',
     'open_link_in' => 'Mở liên kết trong...',
     'open_link_current' => 'Cửa sổ hiện tại',
     'open_link_new' => 'Cửa sổ mới',
     'remove_link' => 'Loại bỏ liên kết',
-    'insert_collapsible' => 'Insert collapsible block',
-    'collapsible_unwrap' => 'Unwrap',
+    'insert_collapsible' => 'Chèn khối có thể thu gọn',
+    'collapsible_unwrap' => 'Tháo bỏ',
     'edit_label' => 'Chỉnh sửa nhãn',
-    'toggle_open_closed' => 'Toggle open/closed',
-    'collapsible_edit' => 'Edit collapsible block',
-    'toggle_label' => 'Toggle label',
+    'toggle_open_closed' => 'Chuyển đổi mở/đóng',
+    'collapsible_edit' => 'Chỉnh sửa khối có thể thu gọn',
+    'toggle_label' => 'Chuyển đổi nhãn',
 
     // About view
     'about' => 'Giới thiệu về trình soạn thảo',
     'about_title' => 'Giới thiệu về trình soạn thảo WYSIWYG',
-    'editor_license' => 'Giáy phép & Bản quyền của trình soạn thảo',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
-    'editor_tiny_license' => 'Trình soạn thảo này được xây dựng bằng các sử dụng :tinyLink theo giấy phép MIT.',
+    'editor_license' => 'Giấy phép & Bản quyền của trình soạn thảo',
+    'editor_lexical_license' => 'Trình soạn thảo này được xây dựng dựa trên :lexicalLink được phân phối theo giấy phép MIT.',
+    'editor_lexical_license_link' => 'Chi tiết giấy phép đầy đủ có thể tìm thấy tại đây.',
+    'editor_tiny_license' => 'Trình soạn thảo này được xây dựng bằng cách sử dụng :tinyLink theo giấy phép MIT.',
     'editor_tiny_license_link' => 'Chi tiết về bản quyền và giấy phép của TinyMCE có thể được tìm thấy tại đây.',
     'save_continue' => 'Lưu trang & Tiếp tục',
-    'callouts_cycle' => '(Keep pressing to toggle through types)',
-    'link_selector' => 'Liên kết đến nội dung',
+    'callouts_cycle' => '(Nhấn tiếp để chuyển đổi giữa các loại)',
+    'link_selector' => 'Bộ chọn liên kết',
     'shortcuts' => 'Phím tắt',
     'shortcut' => 'Phím tắt',
-    'shortcuts_intro' => 'The following shortcuts are available in the editor:',
+    'shortcuts_intro' => 'Các phím tắt sau có sẵn trong trình soạn thảo:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
-    'description' => 'Description',
+    'description' => 'Mô tả',
 ];
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 1f349e65e71..c08fd01ddd8 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -23,46 +23,46 @@
     'meta_updated' => 'Được cập nhật :timeLength',
     'meta_updated_name' => 'Được cập nhật :timeLength bởi :user',
     'meta_owned_name' => 'Được sở hữu bởi :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Được tham chiếu bởi :count mục|Được tham chiếu bởi :count mục',
     'entity_select' => 'Chọn thực thể',
     'entity_select_lack_permission' => 'Bạn không có quyền để chọn mục này',
     'images' => 'Ảnh',
     'my_recent_drafts' => 'Bản nháp gần đây của tôi',
-    'my_recently_viewed' => 'Xem gần đây',
+    'my_recently_viewed' => 'Xem gần đây của tôi',
     'my_most_viewed_favourites' => 'Yêu thích được tôi xem nhiều nhất',
     'my_favourites' => 'Danh sách yêu thích của tôi',
     'no_pages_viewed' => 'Bạn chưa xem bất cứ trang nào',
     'no_pages_recently_created' => 'Không có trang nào được tạo gần đây',
     'no_pages_recently_updated' => 'Không có trang nào được cập nhật gần đây',
-    'export' => 'Kết xuất',
+    'export' => 'Xuất',
     'export_html' => 'Đang chứa tệp tin Web',
     'export_pdf' => 'Tệp PDF',
     'export_text' => 'Tệp văn bản thuần túy',
-    'export_md' => 'Tệp Markdown',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'export_md' => 'Tệp Markdown',
+    'export_zip' => 'ZIP di động',
+    'default_template' => 'Mẫu trang mặc định',
+    'default_template_explain' => 'Chỉ định một mẫu trang sẽ được sử dụng làm nội dung mặc định cho tất cả các trang được tạo trong mục này. Hãy chú ý rằng điều này sẽ chỉ được sử dụng nếu người tạo trang có quyền truy cập xem vào trang mẫu đã chọn.',
+    'default_template_select' => 'Chọn một trang mẫu',
+    'import' => 'Nhập',
+    'import_validate' => 'Xác thực nhập',
+    'import_desc' => 'Nhập sách, chương & trang bằng cách sử dụng tệp xuất zip di động từ cùng một phiên bản hoặc một phiên bản khác. Chọn tệp ZIP để tiếp tục. Sau khi tệp được tải lên và xác thực, bạn sẽ có thể cấu hình & xác nhận việc nhập trong chế độ xem tiếp theo.',
+    'import_zip_select' => 'Chọn tệp ZIP để tải lên',
+    'import_zip_validation_errors' => 'Đã phát hiện lỗi khi xác thực tệp ZIP được cung cấp:',
+    'import_pending' => 'Nhập đang chờ xử lý',
+    'import_pending_none' => 'Chưa có lượt nhập nào được bắt đầu.',
+    'import_continue' => 'Tiếp tục nhập',
+    'import_continue_desc' => 'Xem lại nội dung sẽ được nhập từ tệp ZIP đã tải lên. Khi sẵn sàng, hãy chạy nhập để thêm nội dung của nó vào hệ thống này. Tệp nhập ZIP đã tải lên sẽ tự động bị xóa khi nhập thành công.',
+    'import_details' => 'Chi tiết nhập',
+    'import_run' => 'Chạy nhập',
+    'import_size' => 'Kích thước tệp ZIP nhập: :size',
+    'import_uploaded_at' => 'Đã tải lên :relativeTime',
+    'import_uploaded_by' => 'Đã tải lên bởi',
+    'import_location' => 'Vị trí nhập',
+    'import_location_desc' => 'Chọn vị trí đích cho nội dung đã nhập của bạn. Bạn sẽ cần các quyền liên quan để tạo trong vị trí bạn chọn.',
+    'import_delete_confirm' => 'Bạn có chắc chắn muốn xóa lượt nhập này không?',
+    'import_delete_desc' => 'Thao tác này sẽ xóa tệp ZIP nhập đã tải lên và không thể hoàn tác.',
+    'import_errors' => 'Lỗi nhập',
+    'import_errors_desc' => 'Các lỗi sau đã xảy ra trong quá trình nhập:',
 
     // Permissions and restrictions
     'permissions' => 'Quyền',
@@ -79,16 +79,16 @@
     // Search
     'search_results' => 'Kết quả Tìm kiếm',
     'search_total_results_found' => 'Tìm thấy :count kết quả|:count tổng kết quả',
-    'search_clear' => 'Xoá tìm kiếm',
+    'search_clear' => 'Xóa tìm kiếm',
     'search_no_pages' => 'Không trang nào khớp với tìm kiếm này',
     'search_for_term' => 'Tìm kiếm cho :term',
     'search_more' => 'Thêm kết quả',
     'search_advanced' => 'Tìm kiếm Nâng cao',
     'search_terms' => 'Cụm từ Tìm kiếm',
-    'search_content_type' => 'Kiểu Nội dung',
+    'search_content_type' => 'Kiểu Nội dung',
     'search_exact_matches' => 'Hoàn toàn trùng khớp',
-    'search_tags' => 'Tìm kiếm Tag',
-    'search_options' => 'Tuỳ chọn',
+    'search_tags' => 'Tìm kiếm Thẻ',
+    'search_options' => 'Tùy chọn',
     'search_viewed_by_me' => 'Được xem bởi tôi',
     'search_not_viewed_by_me' => 'Không được xem bởi tôi',
     'search_permissions_set' => 'Phân quyền',
@@ -104,37 +104,37 @@
     'search_update' => 'Cập nhật tìm kiếm',
 
     // Shelves
-    'shelf' => 'Giá',
-    'shelves' => 'Giá',
-    'x_shelves' => ':count Giá |:count Giá',
-    'shelves_empty' => 'Không có giá nào được tạo',
-    'shelves_create' => 'Tạo Giá mới',
-    'shelves_popular' => 'Các Giá phổ biến',
-    'shelves_new' => 'Các Giá mới',
-    'shelves_new_action' => 'Giá mới',
-    'shelves_popular_empty' => 'Các giá phổ biến sẽ xuất hiện ở đây.',
-    'shelves_new_empty' => 'Các Giá được tạo gần đây sẽ xuất hiện ở đây.',
-    'shelves_save' => 'Lưu Giá',
-    'shelves_books' => 'Sách trên Giá này',
-    'shelves_add_books' => 'Thêm sách vào Giá này',
+    'shelf' => 'Giá sách',
+    'shelves' => 'Giá sách',
+    'x_shelves' => ':count Giá sách|:count Giá sách',
+    'shelves_empty' => 'Không có giá sách nào được tạo',
+    'shelves_create' => 'Tạo Giá sách mới',
+    'shelves_popular' => 'Các Giá sách phổ biến',
+    'shelves_new' => 'Các Giá sách mới',
+    'shelves_new_action' => 'Giá sách mới',
+    'shelves_popular_empty' => 'Các giá sách phổ biến sẽ xuất hiện ở đây.',
+    'shelves_new_empty' => 'Các Giá sách được tạo gần đây sẽ xuất hiện ở đây.',
+    'shelves_save' => 'Lưu Giá sách',
+    'shelves_books' => 'Sách trên Giá sách này',
+    'shelves_add_books' => 'Thêm sách vào Giá sách này',
     'shelves_drag_books' => 'Kéo sách bên dưới để thêm vào kệ sách này',
-    'shelves_empty_contents' => 'Giá này không có sách nào',
+    'shelves_empty_contents' => 'Giá sách này không có sách nào',
     'shelves_edit_and_assign' => 'Chỉnh sửa kệ để gán sách',
     'shelves_edit_named' => 'Chỉnh sửa kệ :name',
     'shelves_edit' => 'Chỉnh sửa kệ',
     'shelves_delete' => 'Xóa kệ',
     'shelves_delete_named' => 'Xóa kệ :name',
     'shelves_delete_explain' => "Thao tác này sẽ xóa kệ có tên ':name'. Sách chứa sẽ không bị xóa.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_delete_confirmation' => 'Bạn có chắc chắn muốn xóa kệ sách này không?',
+    'shelves_permissions' => 'Quyền cho kệ sách',
+    'shelves_permissions_updated' => 'Quyền cho kệ sách đã được cập nhật',
     'shelves_permissions_active' => 'Quyền của kệ đang hoạt động',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
+    'shelves_permissions_cascade_warning' => 'Quyền trên kệ sách không tự động xếp theo các sách được chứa. Điều này là do một cuốn sách có thể tồn tại trên nhiều kệ. Tuy nhiên, quyền có thể được sao chép xuống sách con bằng cách sử dụng tùy chọn bên dưới.',
+    'shelves_permissions_create' => 'Quyền tạo giá sách chỉ được sử dụng để sao chép quyền vào sách con bằng cách sử dụng tác vụ bên dưới. Chúng không kiểm soát khả năng tạo ra sách.',
     'shelves_copy_permissions_to_books' => 'Sao chép các quyền cho sách',
     'shelves_copy_permissions' => 'Sao chép các quyền',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => 'Thao tác này sẽ áp dụng cài đặt quyền hiện tại của giá sách này cho tất cả sách có trong đó. Trước khi kích hoạt, hãy đảm bảo mọi thay đổi đối với quyền của giá sách này đã được lưu.',
+    'shelves_copy_permission_success' => 'Đã sao chép quyền của kệ vào :count sách',
 
     // Books
     'book' => 'Sách',
@@ -159,16 +159,16 @@
     'books_permissions' => 'Các quyền của cuốn sách',
     'books_permissions_updated' => 'Các quyền của cuốn sách đã được cập nhật',
     'books_empty_contents' => 'Không có trang hay chương nào được tạo cho cuốn sách này.',
-    'books_empty_create_page' => 'Tao một trang mới',
+    'books_empty_create_page' => 'Tạo một trang mới',
     'books_empty_sort_current_book' => 'Sắp xếp cuốn sách này',
     'books_empty_add_chapter' => 'Thêm một chương mới',
     'books_permissions_active' => 'Đang bật các quyền hạn từ Sách',
     'books_search_this' => 'Tìm cuốn sách này',
     'books_navigation' => 'Điều hướng cuốn sách',
     'books_sort' => 'Sắp xếp nội dung cuốn sách',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Di chuyển các chương và trang trong một cuốn sách để sắp xếp lại nội dung của nó. Các sách khác có thể được thêm vào để dễ dàng di chuyển các chương và trang giữa các sách. Tùy chọn, một quy tắc sắp xếp tự động có thể được đặt để tự động sắp xếp nội dung cuốn sách này khi có thay đổi.',
+    'books_sort_auto_sort' => 'Tùy chọn sắp xếp tự động',
+    'books_sort_auto_sort_active' => 'Sắp xếp tự động đang hoạt động: :sortName',
     'books_sort_named' => 'Sắp xếp sách :bookName',
     'books_sort_name' => 'Sắp xếp theo tên',
     'books_sort_created' => 'Sắp xếp theo ngày tạo',
@@ -177,19 +177,19 @@
     'books_sort_chapters_last' => 'Các Chương cuối',
     'books_sort_show_other' => 'Hiển thị các Sách khác',
     'books_sort_save' => 'Lưu thứ tự mới',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
-    'books_copy' => 'Copy Book',
-    'books_copy_success' => 'Book successfully copied',
+    'books_sort_show_other_desc' => 'Thêm các sách khác vào đây để đưa chúng vào thao tác sắp xếp và cho phép sắp xếp lại nhiều sách dễ dàng.',
+    'books_sort_move_up' => 'Đưa lên trên',
+    'books_sort_move_down' => 'Đưa xuống dưới',
+    'books_sort_move_prev_book' => 'Chuyển tới sách phía trước',
+    'books_sort_move_next_book' => 'Chuyển tới sách phía sau',
+    'books_sort_move_prev_chapter' => 'Chuyển sang chương trước',
+    'books_sort_move_next_chapter' => 'Chuyển sang chương tiếp theo',
+    'books_sort_move_book_start' => 'Di chuyển đến đầu sách',
+    'books_sort_move_book_end' => 'Di chuyển đến cuối sách',
+    'books_sort_move_before_chapter' => 'Chuyển về trước chương',
+    'books_sort_move_after_chapter' => 'Chuyển tới chương sau',
+    'books_copy' => 'Sao chép sách',
+    'books_copy_success' => 'Đã sao chép thành công',
 
     // Chapters
     'chapter' => 'Chương',
@@ -207,14 +207,14 @@
     'chapters_save' => 'Lưu Chương',
     'chapters_move' => 'Di chuyển Chương',
     'chapters_move_named' => 'Di chuyển Chương :chapterName',
-    'chapters_copy' => 'Copy Chapter',
-    'chapters_copy_success' => 'Chapter successfully copied',
+    'chapters_copy' => 'Sao chép chương',
+    'chapters_copy_success' => 'Chương đã được sao chép thành công',
     'chapters_permissions' => 'Quyền hạn Chương',
     'chapters_empty' => 'Không có trang nào hiện có trong chương này.',
     'chapters_permissions_active' => 'Đang bật các quyền hạn từ Chương',
     'chapters_permissions_success' => 'Quyền hạn Chương được cập nhật',
     'chapters_search_this' => 'Tìm kiếm trong Chương này',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter_sort_book' => 'Sắp xếp sách',
 
     // Pages
     'page' => 'Trang',
@@ -230,7 +230,7 @@
     'pages_delete_draft' => 'Xóa Trang Nháp',
     'pages_delete_success' => 'Đã xóa Trang',
     'pages_delete_draft_success' => 'Đã xóa trang Nháp',
-    'pages_delete_warning_template' => '.',
+    'pages_delete_warning_template' => 'Trang này đang được sử dụng làm mẫu trang mặc định của sách hoặc chương. Hãy chú ý: Những cuốn sách hoặc chương này sẽ không còn được chỉ định mẫu trang mặc định sau khi trang này bị xóa.',
     'pages_delete_confirm' => 'Bạn có chắc chắn muốn xóa trang này?',
     'pages_delete_draft_confirm' => 'Bạn có chắc chắn muốn xóa trang nháp này?',
     'pages_editing_named' => 'Đang chỉnh sửa Trang :pageName',
@@ -241,23 +241,23 @@
     'pages_editing_page' => 'Đang chỉnh sửa Trang',
     'pages_edit_draft_save_at' => 'Bản nháp đã lưu lúc ',
     'pages_edit_delete_draft' => 'Xóa Bản nháp',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
+    'pages_edit_delete_draft_confirm' => 'Bạn có chắc chắn muốn xóa các thay đổi trên trang nháp của mình không? Tất cả các thay đổi của bạn, kể từ lần lưu đầy đủ gần đây nhất, sẽ bị mất và trình chỉnh sửa sẽ được cập nhật với trạng thái lưu trang không phải bản nháp mới nhất.',
     'pages_edit_discard_draft' => 'Hủy bỏ Bản nháp',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
+    'pages_edit_switch_to_markdown' => 'Chuyển sang trình soạn thảo Markdown',
+    'pages_edit_switch_to_markdown_clean' => '(Nội dung sạch)',
+    'pages_edit_switch_to_markdown_stable' => '(Nội dung ổn định)',
     'pages_edit_switch_to_wysiwyg' => 'Chuyển sang trình soạn thảo WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Chuyển sang WYSIWYG mới',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Đang thử nghiệm Beta)',
     'pages_edit_set_changelog' => 'Đặt Changelog',
     'pages_edit_enter_changelog_desc' => 'Viết mô tả ngắn gọn cho các thay đổi mà bạn tạo',
     'pages_edit_enter_changelog' => 'Viết Changelog',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
+    'pages_editor_switch_title' => 'Đổi trình soạn thảo',
+    'pages_editor_switch_are_you_sure' => 'Bạn có chắc chắn muốn thay đổi trình soạn thảo cho trang này không?',
+    'pages_editor_switch_consider_following' => 'Hãy cân nhắc những điều sau đây khi thay đổi trình soạn thảo:',
     'pages_editor_switch_consideration_a' => 'Sau khi lưu, tùy chọn trình soạn thảo mới sẽ được sử dụng bởi bất kỳ trình chỉnh sửa nào trong tương lai, kể cả những người không thể tự thay đổi loại trình chỉnh sửa.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
+    'pages_editor_switch_consideration_b' => 'Điều này có khả năng dẫn đến mất chi tiết và cú pháp trong một số trường hợp nhất định.',
+    'pages_editor_switch_consideration_c' => 'Các thay đổi thẻ hoặc nhật ký thay đổi, được thực hiện kể từ lần lưu cuối cùng, sẽ không tồn tại sau thay đổi này.',
     'pages_save' => 'Lưu Trang',
     'pages_title' => 'Tiêu đề Trang',
     'pages_name' => 'Tên Trang',
@@ -266,10 +266,10 @@
     'pages_md_insert_image' => 'Chèn hình ảnh',
     'pages_md_insert_link' => 'Chèn liên kết thực thể',
     'pages_md_insert_drawing' => 'Chèn bản vẽ',
-    'pages_md_show_preview' => 'Show preview',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
+    'pages_md_show_preview' => 'Hiển thị bản xem trước',
+    'pages_md_sync_scroll' => 'Đồng bộ hóa cuộn xem trước',
+    'pages_drawing_unsaved' => 'Tìm thấy bản vẽ chưa lưu',
+    'pages_drawing_unsaved_confirm' => 'Dữ liệu bản vẽ chưa lưu được tìm thấy từ lần lưu bản vẽ không thành công trước đó. Bạn có muốn khôi phục và tiếp tục chỉnh sửa bản vẽ chưa lưu này không?',
     'pages_not_in_chapter' => 'Trang không nằm trong một chương',
     'pages_move' => 'Di chuyển Trang',
     'pages_copy' => 'Sao chép Trang',
@@ -279,17 +279,17 @@
     'pages_permissions_success' => 'Quyền hạn Trang được cập nhật',
     'pages_revision' => 'Phiên bản',
     'pages_revisions' => 'Phiên bản Trang',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
+    'pages_revisions_desc' => 'Dưới đây là tất cả các bản sửa đổi trước đây của trang này. Bạn có thể xem lại, so sánh và khôi phục các phiên bản trang cũ nếu được phép. Lịch sử đầy đủ của trang có thể không được phản ánh đầy đủ ở đây vì, tùy thuộc vào cấu hình hệ thống, các bản sửa đổi cũ có thể tự động bị xóa.',
     'pages_revisions_named' => 'Phiên bản Trang cho :pageName',
     'pages_revision_named' => 'Phiên bản Trang cho :pageName',
     'pages_revision_restored_from' => 'Khôi phục từ #:id; :summary',
     'pages_revisions_created_by' => 'Tạo bởi',
     'pages_revisions_date' => 'Ngày của Phiên bản',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
+    'pages_revisions_sort_number' => 'Số phiên bản',
     'pages_revisions_numbered' => 'Phiên bản #:id',
     'pages_revisions_numbered_changes' => 'Các thay đổi của phiên bản #:id',
-    'pages_revisions_editor' => 'Editor Type',
+    'pages_revisions_editor' => 'Loại trình chỉnh sửa',
     'pages_revisions_changelog' => 'Nhật ký thay đổi',
     'pages_revisions_changes' => 'Các thay đổi',
     'pages_revisions_current' => 'Phiên bản hiện tại',
@@ -297,65 +297,65 @@
     'pages_revisions_restore' => 'Khôi phục',
     'pages_revisions_none' => 'Trang này không có phiên bản nào',
     'pages_copy_link' => 'Sao chép Liên kết',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
+    'pages_edit_content_link' => 'Chuyển đến phần trong trình chỉnh sửa',
+    'pages_pointer_enter_mode' => 'Vào chế độ chọn phần',
     'pages_pointer_label' => 'Tùy chọn phần trang',
-    'pages_pointer_permalink' => 'Phần trang Liên kết cố định',
+    'pages_pointer_permalink' => 'Liên kết cố định phần trang',
     'pages_pointer_include_tag' => 'Phần trang bao gồm thẻ',
     'pages_pointer_toggle_link' => 'Chế độ Liên kết cố định, Nhấn để hiển thị thẻ bao gồm',
     'pages_pointer_toggle_include' => 'Bao gồm chế độ thẻ, Nhấn để hiển thị liên kết cố định',
     'pages_permissions_active' => 'Đang bật các quyền hạn từ Trang',
     'pages_initial_revision' => 'Đăng bài mở đầu',
-    'pages_references_update_revision' => 'System auto-update of internal links',
+    'pages_references_update_revision' => 'Hệ thống tự động cập nhật liên kết nội bộ',
     'pages_initial_name' => 'Trang mới',
     'pages_editing_draft_notification' => 'Bạn hiện đang chỉnh sửa một bản nháp được lưu cách đây :timeDiff.',
     'pages_draft_edited_notification' => 'Trang này đã được cập nhật từ lúc đó. Bạn nên loại bỏ bản nháp này.',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_draft_page_changed_since_creation' => 'Trang này đã được cập nhật kể từ khi bản nháp này được tạo. Bạn nên bỏ bản nháp này hoặc cẩn thận không ghi đè bất kỳ thay đổi nào của trang.',
     'pages_draft_edit_active' => [
         'start_a' => ':count người dùng đang bắt đầu chỉnh sửa trang này',
         'start_b' => ':userName đang bắt đầu chỉnh sửa trang này',
-        'time_a' => 'kể từ khi thang được cập nhật lần cuối',
+        'time_a' => 'kể từ khi trang được cập nhật lần cuối',
         'time_b' => 'trong :minCount phút cuối',
         'message' => ':start :time. Hãy cẩn thận đừng ghi đè vào các bản cập nhật của nhau!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
+    'pages_draft_discarded' => 'Bản nháp đã bị loại bỏ! Trình chỉnh sửa đã được cập nhật với nội dung trang hiện tại',
+    'pages_draft_deleted' => 'Bản nháp đã bị xóa! Trình chỉnh sửa đã được cập nhật với nội dung trang hiện tại',
     'pages_specific' => 'Trang cụ thể',
     'pages_is_template' => 'Biểu mẫu trang',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'Chuyển đổi thanh bên',
     'page_tags' => 'Các Thẻ Trang',
     'chapter_tags' => 'Các Thẻ Chương',
     'book_tags' => 'Các Thẻ Sách',
     'shelf_tags' => 'Các Thẻ Kệ',
     'tag' => 'Nhãn',
     'tags' =>  'Các Thẻ',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
+    'tags_index_desc' => 'Thẻ có thể được áp dụng cho nội dung trong hệ thống để áp dụng một hình thức phân loại linh hoạt. Thẻ có thể có cả khóa và giá trị, với giá trị là tùy chọn. Sau khi được áp dụng, nội dung sau đó có thể được truy vấn bằng tên thẻ và giá trị.',
     'tag_name' =>  'Tên Nhãn',
     'tag_value' => 'Giá trị Thẻ (Tùy chọn)',
     'tags_explain' => "Thêm vài thẻ để phân loại nội dung của bạn tốt hơn. \n Bạn có thể đặt giá trị cho thẻ để quản lí kĩ càng hơn.",
     'tags_add' => 'Thêm thẻ khác',
     'tags_remove' => 'Xóa thẻ này',
-    'tags_usages' => 'Total tag usages',
-    'tags_assigned_pages' => 'Assigned to Pages',
-    'tags_assigned_chapters' => 'Assigned to Chapters',
-    'tags_assigned_books' => 'Assigned to Books',
-    'tags_assigned_shelves' => 'Assigned to Shelves',
-    'tags_x_unique_values' => ':count unique values',
-    'tags_all_values' => 'All values',
-    'tags_view_tags' => 'View Tags',
-    'tags_view_existing_tags' => 'View existing tags',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
+    'tags_usages' => 'Tổng số lượt sử dụng thẻ',
+    'tags_assigned_pages' => 'Đã gán cho Trang',
+    'tags_assigned_chapters' => 'Đã gán cho Chương',
+    'tags_assigned_books' => 'Đã gán cho Sách',
+    'tags_assigned_shelves' => 'Đã gán cho Kệ',
+    'tags_x_unique_values' => ':count giá trị duy nhất',
+    'tags_all_values' => 'Tất cả giá trị',
+    'tags_view_tags' => 'Xem Thẻ',
+    'tags_view_existing_tags' => 'Xem các thẻ hiện có',
+    'tags_list_empty_hint' => 'Thẻ có thể được gán thông qua thanh bên của trình chỉnh sửa trang hoặc trong khi chỉnh sửa chi tiết của sách, chương hoặc kệ.',
     'attachments' => 'Các Đính kèm',
     'attachments_explain' => 'Cập nhật một số tập tin và đính một số liên kết để hiển thị trên trang của bạn. Chúng được hiện trong sidebar của trang.',
     'attachments_explain_instant_save' => 'Các thay đổi ở đây sẽ được lưu ngay lập tức.',
     'attachments_upload' => 'Tải lên Tập tin',
     'attachments_link' => 'Đính kèm Liên kết',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => 'Ngoài ra, bạn có thể kéo và thả tệp vào đây để tải lên làm tệp đính kèm.',
     'attachments_set_link' => 'Đặt Liên kết',
     'attachments_delete' => 'Bạn có chắc chắn muốn xóa tập tin đính kèm này?',
-    'attachments_dropzone' => 'Drop files here to upload',
+    'attachments_dropzone' => 'Thả tệp vào đây để tải lên',
     'attachments_no_files' => 'Không có tập tin nào được tải lên',
     'attachments_explain_link' => 'Bạn có thể đính kèm một liên kết nếu bạn lựa chọn không tải lên tập tin. Liên kết này có thể trỏ đến một trang khác hoặc một tập tin ở trên mạng (đám mây).',
     'attachments_link_name' => 'Tên Liên kết',
@@ -375,7 +375,7 @@
     'attachments_link_attached' => 'Liên kết được đính kèm đến trang thành công',
     'templates' => 'Các Mẫu',
     'templates_set_as_template' => 'Trang là một mẫu',
-    'templates_explain_set_as_template' => 'Bạn có thể đặt trang này làm mẫu, nội dung của nó sẽ được sử dụng lại khi tạo các trang mới. Người dùng khác có thể sử dụng mẫu này nếu học có quyền hạn xem trang này.',
+    'templates_explain_set_as_template' => 'Bạn có thể đặt trang này làm mẫu, nội dung của nó sẽ được sử dụng lại khi tạo các trang mới. Người dùng khác có thể sử dụng mẫu này nếu họ có quyền hạn xem trang này.',
     'templates_replace_content' => 'Thay thế nội dung trang',
     'templates_append_content' => 'Viết vào nội dung trang',
     'templates_prepend_content' => 'Thêm vào đầu nội dung trang',
@@ -392,28 +392,28 @@
     'comment' => 'Bình luận',
     'comments' => 'Các bình luận',
     'comment_add' => 'Thêm bình luận',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Không có bình luận nào để hiển thị',
     'comment_placeholder' => 'Đăng bình luận tại đây',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Chuỗi bình luận|:count Chuỗi bình luận',
+    'comment_archived_count' => ':count Đã lưu trữ',
+    'comment_archived_threads' => 'Chuỗi đã lưu trữ',
     'comment_save' => 'Lưu bình luận',
     'comment_new' => 'Bình luận mới',
     'comment_created' => 'đã bình luận :createDiff',
     'comment_updated' => 'Đã cập nhật :updateDiff bởi :username',
-    'comment_updated_indicator' => 'Updated',
+    'comment_updated_indicator' => 'Đã cập nhật',
     'comment_deleted_success' => 'Bình luận đã bị xóa',
     'comment_created_success' => 'Đã thêm bình luận',
     'comment_updated_success' => 'Bình luận đã được cập nhật',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Đã lưu trữ bình luận',
+    'comment_unarchive_success' => 'Đã bỏ lưu trữ bình luận',
+    'comment_view' => 'Xem bình luận',
+    'comment_jump_to_thread' => 'Chuyển đến chuỗi',
     'comment_delete_confirm' => 'Bạn có chắc bạn muốn xóa bình luận này?',
     'comment_in_reply_to' => 'Trả lời cho :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment_reference' => 'Tham chiếu',
+    'comment_reference_outdated' => '(Đã lỗi thời)',
+    'comment_editor_explain' => 'Đây là những bình luận đã được để lại trên trang này. Bình luận có thể được thêm & quản lý khi xem trang đã lưu.',
 
     // Revision
     'revision_delete_confirm' => 'Bạn có chắc bạn muốn xóa phiên bản này?',
@@ -421,51 +421,51 @@
     'revision_cannot_delete_latest' => 'Không thể xóa phiên bản mới nhất.',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => 'Vui lòng xem xét những điều sau đây khi sao chép nội dung.',
+    'copy_consider_permissions' => 'Cài đặt quyền tùy chỉnh sẽ không được sao chép.',
+    'copy_consider_owner' => 'Bạn sẽ trở thành chủ sở hữu của tất cả nội dung được sao chép.',
+    'copy_consider_images' => 'Các tệp hình ảnh trang sẽ không được nhân đôi & các hình ảnh gốc sẽ giữ lại mối quan hệ của chúng với trang mà chúng được tải lên ban đầu.',
+    'copy_consider_attachments' => 'Các tệp đính kèm trang sẽ không được sao chép.',
+    'copy_consider_access' => 'Việc thay đổi vị trí, chủ sở hữu hoặc quyền có thể dẫn đến nội dung này có thể truy cập được đối với những người trước đây không có quyền truy cập.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => 'Chuyển đổi thành Kệ sách',
+    'convert_to_shelf_contents_desc' => 'Bạn có thể chuyển đổi cuốn sách này thành một kệ sách mới với nội dung tương tự. Các chương có trong cuốn sách này sẽ được chuyển đổi thành các cuốn sách mới. Nếu cuốn sách này chứa bất kỳ trang nào không nằm trong một chương, cuốn sách này sẽ được đổi tên và chứa các trang đó, và cuốn sách này sẽ trở thành một phần của kệ sách mới.',
+    'convert_to_shelf_permissions_desc' => 'Bất kỳ quyền nào được đặt trên cuốn sách này sẽ được sao chép sang kệ sách mới và tất cả các cuốn sách con mới không có quyền riêng của chúng. Lưu ý rằng quyền trên kệ sách không tự động xếp tầng xuống nội dung bên trong, như đối với sách.',
+    'convert_book' => 'Chuyển đổi sách',
+    'convert_book_confirm' => 'Bạn có chắc chắn muốn chuyển đổi cuốn sách này?',
+    'convert_undo_warning' => 'Việc này không thể dễ dàng hoàn tác.',
+    'convert_to_book' => 'Chuyển đổi thành Sách',
+    'convert_to_book_desc' => 'Bạn có thể chuyển đổi chương này thành một cuốn sách mới với nội dung tương tự. Bất kỳ quyền nào được đặt trên chương này sẽ được sao chép sang cuốn sách mới nhưng bất kỳ quyền thừa kế nào từ cuốn sách mẹ sẽ không được sao chép, điều này có thể dẫn đến thay đổi kiểm soát truy cập.',
+    'convert_chapter' => 'Chuyển đổi Chương',
+    'convert_chapter_confirm' => 'Bạn có chắc chắn muốn chuyển đổi chương này?',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'Tham chiếu',
+    'references_none' => 'Không có tham chiếu nào được theo dõi đến mục này.',
+    'references_to_desc' => 'Dưới đây là tất cả nội dung đã biết trong hệ thống liên kết đến mục này.',
 
     // Watch Options
-    'watch' => 'Watch',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch' => 'Theo dõi',
+    'watch_title_default' => 'Tùy chọn mặc định',
+    'watch_desc_default' => 'Khôi phục việc theo dõi chỉ về các tùy chọn thông báo mặc định của bạn.',
+    'watch_title_ignore' => 'Bỏ qua',
+    'watch_desc_ignore' => 'Bỏ qua tất cả các thông báo, bao gồm cả những thông báo từ tùy chọn cấp người dùng.',
+    'watch_title_new' => 'Trang mới',
+    'watch_desc_new' => 'Thông báo khi bất kỳ trang mới nào được tạo trong mục này.',
+    'watch_title_updates' => 'Tất cả cập nhật trang',
+    'watch_desc_updates' => 'Thông báo khi có tất cả các trang mới và thay đổi trang.',
+    'watch_desc_updates_page' => 'Thông báo khi có tất cả các thay đổi trang.',
+    'watch_title_comments' => 'Tất cả cập nhật trang & Bình luận',
+    'watch_desc_comments' => 'Thông báo khi có tất cả các trang mới, thay đổi trang và bình luận mới.',
+    'watch_desc_comments_page' => 'Thông báo khi có thay đổi trang và bình luận mới.',
+    'watch_change_default' => 'Thay đổi tùy chọn thông báo mặc định',
+    'watch_detail_ignore' => 'Đang bỏ qua thông báo',
+    'watch_detail_new' => 'Đang theo dõi các trang mới',
+    'watch_detail_updates' => 'Đang theo dõi các trang mới và cập nhật',
+    'watch_detail_comments' => 'Đang theo dõi các trang mới, cập nhật & bình luận',
+    'watch_detail_parent_book' => 'Đang theo dõi thông qua sách cha',
+    'watch_detail_parent_book_ignore' => 'Đang bỏ qua thông qua sách cha',
+    'watch_detail_parent_chapter' => 'Đang theo dõi thông qua chương cha',
+    'watch_detail_parent_chapter_ignore' => 'Đang bỏ qua thông qua chương cha',
 ];
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index 66ad23b7278..bae87dc38cd 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Đã có người sử dụng email :email nhưng với thông tin định danh khác.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Tài khoản người dùng không thể đăng ký với các chi tiết được cung cấp',
     'email_already_confirmed' => 'Email đã được xác nhận trước đó, Đang đăng nhập.',
     'email_confirmation_invalid' => 'Token xác nhận này không hợp lệ hoặc đã được sử dụng trước đó, Xin hãy thử đăng ký lại.',
     'email_confirmation_expired' => 'Token xác nhận đã hết hạn, Một email xác nhận mới đã được gửi.',
@@ -37,37 +37,37 @@
     'social_driver_not_found' => 'Không tìm thấy driver cho MXH',
     'social_driver_not_configured' => 'Cài đặt MXH :socialAccount của bạn đang không được cấu hình hợp lệ.',
     'invite_token_expired' => 'Liên kết mời này đã hết hạn. Bạn có thể thử đặt lại mật khẩu của tài khoản.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Không tìm thấy người dùng cho hành động này.',
 
     // System
     'path_not_writable' => 'Đường dẫn tệp tin :filePath không thể tải đến được. Đảm bảo rằng đường dẫn này có thể ghi được ở trên máy chủ.',
     'cannot_get_image_from_url' => 'Không thể lấy ảnh từ :url',
     'cannot_create_thumbs' => 'Máy chủ không thể tạo ảnh nhỏ. Vui lòng kiểm tra bạn đã cài đặt tiện ích mở rộng GD PHP.',
     'server_upload_limit' => 'Máy chủ không cho phép tải lên kích thước này. Vui lòng thử lại với tệp tin nhỏ hơn.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'Máy chủ không thể nhận lượng dữ liệu được cung cấp. Hãy thử lại với ít dữ liệu hoặc tệp nhỏ hơn.',
     'uploaded'  => 'Máy chủ không cho phép tải lên kích thước này. Vui lòng thử lại với tệp tin nhỏ hơn.',
 
     // Drawing & Images
     'image_upload_error' => 'Đã xảy ra lỗi khi đang tải lên ảnh',
     'image_upload_type_error' => 'Ảnh đang được tải lên không hợp lệ',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_replace_type' => 'Các tệp hình ảnh thay thế phải cùng loại',
+    'image_upload_memory_limit' => 'Không xử lý được hình ảnh tải lên và/hoặc tạo hình thu nhỏ do giới hạn tài nguyên hệ thống.',
+    'image_thumbnail_memory_limit' => 'Không tạo được các biến thể kích thước hình ảnh do giới hạn tài nguyên hệ thống.',
+    'image_gallery_thumbnail_memory_limit' => 'Không tạo được hình thu nhỏ thư viện do giới hạn tài nguyên hệ thống.',
+    'drawing_data_not_found' => 'Không thể tải dữ liệu bản vẽ. Tệp bản vẽ có thể không còn tồn tại hoặc bạn không có quyền truy cập vào nó.',
 
     // Attachments
     'attachment_not_found' => 'Không tìm thấy đính kèm',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Đã xảy ra lỗi khi tải tệp đính kèm',
 
     // Pages
     'page_draft_autosave_fail' => 'Lưu bản nháp thất bại. Đảm bảo rằng bạn có kết nối đến internet trước khi lưu trang này',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Không thể xóa bản nháp trang và lấy nội dung đã lưu của trang hiện tại',
     'page_custom_home_deletion' => 'Không thể xóa trang khi nó đang được đặt là trang chủ',
 
     // Entities
     'entity_not_found' => 'Không tìm thấy thực thể',
-    'bookshelf_not_found' => 'Shelf not found',
+    'bookshelf_not_found' => 'Không tìm thấy giá sách',
     'book_not_found' => 'Không tìm thấy sách',
     'page_not_found' => 'Không tìm thấy trang',
     'chapter_not_found' => 'Không tìm thấy chương',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Bạn không thể xóa quản trị viên duy nhất',
     'users_cannot_delete_guest' => 'Bạn không thể xóa người dùng khách',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Không thể tạo người dùng vì email mời không gửi được',
 
     // Roles
     'role_cannot_be_edited' => 'Không thể chỉnh sửa quyền này',
@@ -106,16 +106,16 @@
     'back_soon' => 'Nó sẽ sớm hoạt động trở lại.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Không thể đọc tệp ZIP.',
+    'import_zip_cant_decode_data' => 'Không thể tìm và giải mã nội dung ZIP data.json.',
+    'import_zip_no_data' => 'Dữ liệu tệp ZIP không có nội dung sách, chương hoặc trang mong đợi.',
+    'import_validation_failed' => 'Nhập tệp ZIP không hợp lệ với các lỗi:',
+    'import_zip_failed_notification' => 'Không thể nhập tệp ZIP.',
+    'import_perms_books' => 'Bạn không có quyền cần thiết để tạo sách.',
+    'import_perms_chapters' => 'Bạn không có quyền cần thiết để tạo chương.',
+    'import_perms_pages' => 'Bạn không có quyền cần thiết để tạo trang.',
+    'import_perms_images' => 'Bạn không có quyền cần thiết để tạo hình ảnh.',
+    'import_perms_attachments' => 'Bạn không có quyền cần thiết để tạo tệp đính kèm.',
 
     // API errors
     'api_no_authorization_found' => 'Không tìm thấy token ủy quyền trong yêu cầu',
@@ -129,5 +129,5 @@
     'maintenance_test_email_failure' => 'Lỗi khi gửi email thử:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'URL không khớp với các máy chủ SSR được cấu hình cho phép',
 ];
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 276891dc70d..ff585429731 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -16,7 +16,7 @@
     'app_customization' => 'Tuỳ biến',
     'app_features_security' => 'Chức năng & Bảo mật',
     'app_name' => 'Tên Ứng dụng',
-    'app_name_desc' => 'Tên này được hiển thị trong header và trong bất kì email hệ thống được gửi.',
+    'app_name_desc' => 'Tên này được hiển thị trong header và trong bất kỳ email hệ thống được gửi.',
     'app_name_header' => 'Hiển thị tên trong header',
     'app_public_access' => 'Quyền truy cập công khai',
     'app_public_access_desc' => 'Bật tùy chọn này sẽ cho phép khách, người không cần đăng nhập, truy cập đến nội dung bản BookStack của bạn.',
@@ -25,7 +25,7 @@
     'app_public_viewing' => 'Cho phép xem công khai?',
     'app_secure_images' => 'Bảo mật tốt hơn cho việc tải lên ảnh',
     'app_secure_images_toggle' => 'Bật bảo mật tốt hơn cho các ảnh được tải lên',
-    'app_secure_images_desc' => 'Vì lí do hiệu năng, tất cả các ảnh đều được truy cập công khai. Tùy chọn này thêm một chuỗi ngẫu nhiên, khó đoán vào phần liên kết đến ảnh. Đảm bảo rằng tránh việc index thư mục để ngăn chặn việc truy cập đến ảnh một cách dễ dàng.',
+    'app_secure_images_desc' => 'Vì lý do hiệu năng, tất cả các ảnh đều được truy cập công khai. Tùy chọn này thêm một chuỗi ngẫu nhiên, khó đoán vào phần liên kết đến ảnh. Đảm bảo rằng tránh việc index thư mục để ngăn chặn việc truy cập đến ảnh một cách dễ dàng.',
     'app_default_editor' => 'Trình soạn thảo mặc định',
     'app_default_editor_desc' => 'Chọn trình soạn thảo nào sẽ được sử dụng theo mặc định khi chỉnh sửa trang mới. Điều này có thể bị ghi đè ở cấp độ trang nơi quyền cho phép.',
     'app_custom_html' => 'Tùy chọn nội dung Head HTML',
@@ -33,24 +33,24 @@
     'app_custom_html_disabled_notice' => 'Nội dung tùy biến HTML head bị tắt tại trang cài đặt này để đảm bảo mọi thay đổi làm hỏng hệ thống có để được khôi phục.',
     'app_logo' => 'Logo Ứng dụng',
     'app_logo_desc' => 'Điều này được sử dụng trong thanh tiêu đề của ứng dụng, trong số những khu vực khác. Hình ảnh này nên có chiều cao 86px. Những hình ảnh lớn sẽ được thu nhỏ lại.',
-    'app_icon' => 'Giểu tượng ứng dụng',
+    'app_icon' => 'Biểu tượng ứng dụng',
     'app_icon_desc' => 'Biểu tượng này được sử dụng cho các tab trình duyệt và các biểu tượng phím tắt. Đây phải là hình ảnh PNG hình vuông 256px.',
     'app_homepage' => 'Trang chủ Ứng dụng',
     'app_homepage_desc' => 'Chọn hiển thị để hiện tại trang chủ thay cho hiển thị mặc định. Quyền cho trang được bỏ qua cho các trang được chọn.',
     'app_homepage_select' => 'Chọn một trang',
-    'app_footer_links' => 'Liên kết cuối trang',
+    'app_footer_links' => 'Liên kết chân trang',
     'app_footer_links_desc' => 'Thêm liên kết để hiển thị trong phần chân trang. Chúng sẽ được hiển thị ở dưới cùng của hầu hết các trang, bao gồm cả những trang không yêu cầu đăng nhập. Bạn có thể sử dụng nhãn "trans::<key>" để dùng bản dịch do hệ thống xác định. Ví dụ: Sử dụng "trans::common.privacy_policy" sẽ cung cấp văn bản được dịch là "Chính sách quyền riêng tư" và "trans::common.terms_of_service" sẽ cung cấp văn bản được dịch là "Điều khoản dịch vụ".',
     'app_footer_links_label' => 'Nhãn liên kết',
     'app_footer_links_url' => 'Địa chỉ liên kết',
-    'app_footer_links_add' => 'Thêm Footer Link',
+    'app_footer_links_add' => 'Thêm liên kết chân trang',
     'app_disable_comments' => 'Tắt bình luận',
     'app_disable_comments_toggle' => 'Tắt bình luận',
     'app_disable_comments_desc' => 'Tắt các bình luận trên tất cả các trang của ứng dụng. <br> Các bình luận đã tồn tại sẽ không được hiển thị.',
 
     // Color settings
-    'color_scheme' => 'Ứng dụng bảng màu',
-    'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
-    'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
+    'color_scheme' => 'Bảng màu ứng dụng',
+    'color_scheme_desc' => 'Đặt các màu được sử dụng trong giao diện người dùng của ứng dụng. Màu sắc có thể được cấu hình riêng cho chế độ tối và sáng để phù hợp nhất với chủ đề và đảm bảo khả năng đọc.',
+    'ui_colors_desc' => 'Đặt màu chính của ứng dụng và màu liên kết mặc định. Màu chính chủ yếu được sử dụng cho biểu ngữ đầu trang, nút và trang trí giao diện. Màu liên kết mặc định được sử dụng cho các liên kết và hành động dựa trên văn bản, cả trong nội dung đã viết và trong giao diện ứng dụng.',
     'app_color' => 'Màu cơ bản',
     'link_color' => 'Màu liên kết mặc định',
     'content_colors_desc' => 'Đặt màu cho tất cả các thành phần trong phân cấp tổ chức trang. Nên chọn màu có độ sáng tương tự với màu mặc định để có thể đọc được.',
@@ -64,8 +64,8 @@
     'reg_settings' => 'Đăng ký',
     'reg_enable' => 'Bật Đăng ký',
     'reg_enable_toggle' => 'Bật đăng ký',
-    'reg_enable_desc' => 'Khi đăng ký được bật người dùng sẽ có thể tự đăng ký để trở thành người dùng của ứng dụng. Khi đăng kí người dùng sẽ được cấp một quyền sử dụng mặc định.',
-    'reg_default_role' => 'Quyền người dùng sử dụng mặc định sau khi đăng kí',
+    'reg_enable_desc' => 'Khi đăng ký được bật, người dùng sẽ có thể tự đăng ký để trở thành người dùng của ứng dụng. Khi đăng kí, người dùng sẽ được cấp một quyền sử dụng mặc định.',
+    'reg_default_role' => 'Quyền người dùng mặc định sau khi đăng kí',
     'reg_enable_external_warning' => 'Tùy chọn trên bị bỏ qua khi xác thực từ bên ngoài LDAP hoặc SAML được bật. Tài khoản người dùng chưa phải là thành viên sẽ được tự động tạo nếu xác thực với hệ thống bên ngoài thành công.',
     'reg_email_confirmation' => 'Xác nhận Email',
     'reg_email_confirmation_toggle' => 'Yêu cầu xác nhận email',
@@ -75,44 +75,44 @@
     'reg_confirm_restrict_domain_placeholder' => 'Không có giới hạn nào được thiết lập',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Sắp xếp',
+    'sorting_book_default' => 'Sắp xếp sách mặc định',
+    'sorting_book_default_desc' => 'Chọn quy tắc sắp xếp mặc định để áp dụng cho sách mới. Điều này sẽ không ảnh hưởng đến các sách hiện có và có thể được ghi đè cho từng sách.',
+    'sorting_rules' => 'Quy tắc sắp xếp',
+    'sorting_rules_desc' => 'Đây là các thao tác sắp xếp được xác định trước có thể được áp dụng cho nội dung trong hệ thống.',
+    'sort_rule_assigned_to_x_books' => 'Được gán cho :count sách|Được gán cho :count sách',
+    'sort_rule_create' => 'Tạo quy tắc sắp xếp',
+    'sort_rule_edit' => 'Chỉnh sửa quy tắc sắp xếp',
+    'sort_rule_delete' => 'Xóa quy tắc sắp xếp',
+    'sort_rule_delete_desc' => 'Xóa quy tắc sắp xếp này khỏi hệ thống. Sách sử dụng quy tắc này sẽ trở lại sắp xếp thủ công.',
+    'sort_rule_delete_warn_books' => 'Quy tắc sắp xếp này hiện đang được sử dụng trên :count sách. Bạn có chắc chắn muốn xóa quy tắc này không?',
+    'sort_rule_delete_warn_default' => 'Quy tắc sắp xếp này hiện đang được sử dụng làm mặc định cho sách. Bạn có chắc chắn muốn xóa quy tắc này không?',
+    'sort_rule_details' => 'Chi tiết quy tắc sắp xếp',
+    'sort_rule_details_desc' => 'Đặt tên cho quy tắc sắp xếp này, tên này sẽ xuất hiện trong danh sách khi người dùng chọn một sắp xếp.',
+    'sort_rule_operations' => 'Thao tác sắp xếp',
+    'sort_rule_operations_desc' => 'Cấu hình các hành động sắp xếp sẽ được thực hiện bằng cách di chuyển chúng từ danh sách các thao tác khả dụng. Khi sử dụng, các thao tác sẽ được áp dụng theo thứ tự, từ trên xuống dưới. Bất kỳ thay đổi nào được thực hiện ở đây sẽ được áp dụng cho tất cả các sách được gán khi lưu.',
+    'sort_rule_available_operations' => 'Thao tác khả dụng',
+    'sort_rule_available_operations_empty' => 'Không còn thao tác nào',
+    'sort_rule_configured_operations' => 'Thao tác đã cấu hình',
+    'sort_rule_configured_operations_empty' => 'Kéo/thêm thao tác từ danh sách "Thao tác khả dụng"',
+    'sort_rule_op_asc' => '(Tăng dần)',
+    'sort_rule_op_desc' => '(Giảm dần)',
+    'sort_rule_op_name' => 'Tên - Theo bảng chữ cái',
+    'sort_rule_op_name_numeric' => 'Tên - Theo số',
+    'sort_rule_op_created_date' => 'Ngày tạo',
+    'sort_rule_op_updated_date' => 'Ngày cập nhật',
+    'sort_rule_op_chapters_first' => 'Chương trước',
+    'sort_rule_op_chapters_last' => 'Chương sau',
 
     // Maintenance settings
     'maint' => 'Bảo trì',
     'maint_image_cleanup' => 'Dọn dẹp ảnh',
-    'maint_image_cleanup_desc' => 'Quét nội dung trang và phiên bản để kiểm tra xem các ảnh và hình vẽ nào đang được sử dụng và ảnh nào dư thừa. Đảm bảo rằng bạn đã tạo bản sao lưu toàn dữ liệu và ảnh trước khi chạy chức năng này.',
+    'maint_image_cleanup_desc' => 'Quét nội dung trang và phiên bản để kiểm tra xem các ảnh và hình vẽ nào đang được sử dụng và ảnh nào dư thừa. Đảm bảo rằng bạn đã tạo bản sao lưu toàn bộ dữ liệu và ảnh trước khi chạy chức năng này.',
     'maint_delete_images_only_in_revisions' => 'Cũng xóa hình ảnh chỉ tồn tại trong các phiên bản trang cũ',
     'maint_image_cleanup_run' => 'Chạy Dọn dẹp',
     'maint_image_cleanup_warning' => 'Đã tìm thấy :count ảnh có thể không được sử dụng. Bạn muốn chắc rằng muốn xóa các ảnh này?',
     'maint_image_cleanup_success' => ':count ảnh có thể không được sử dụng đã được tìm thấy và xóa!',
-    'maint_image_cleanup_nothing_found' => 'Không tìm thấy ảnh nào không được xử dụng, Không có gì để xóa!',
+    'maint_image_cleanup_nothing_found' => 'Không tìm thấy ảnh nào không được sử dụng, Không có gì để xóa!',
     'maint_send_test_email' => 'Gửi một email thử',
     'maint_send_test_email_desc' => 'Chức năng này gửi một email thử đến địa chỉ email bạn chỉ định trong hồ sơ của mình.',
     'maint_send_test_email_run' => 'Gửi email thử',
@@ -139,26 +139,26 @@
     'recycle_bin_contents_empty' => 'Thùng rác hiện đang trống',
     'recycle_bin_empty' => 'Dọn dẹp Thùng Rác',
     'recycle_bin_empty_confirm' => 'Thao tác này sẽ hủy vĩnh viễn tất cả các mục trong thùng rác bao gồm cả nội dung có trong mỗi mục. Bạn có chắc chắn muốn làm trống thùng rác?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
-    'recycle_bin_destroy_list' => 'Items to be Destroyed',
-    'recycle_bin_restore_list' => 'Items to be Restored',
-    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
-    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
-    'recycle_bin_restore_parent' => 'Restore Parent',
-    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
-    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+    'recycle_bin_destroy_confirm' => 'Hành động này sẽ xóa vĩnh viễn mục này khỏi hệ thống, cùng với bất kỳ phần tử con nào được liệt kê bên dưới và bạn sẽ không thể khôi phục nội dung này. Bạn có chắc chắn muốn xóa vĩnh viễn mục này không?',
+    'recycle_bin_destroy_list' => 'Các mục sẽ bị hủy',
+    'recycle_bin_restore_list' => 'Các mục sẽ được khôi phục',
+    'recycle_bin_restore_confirm' => 'Hành động này sẽ khôi phục mục đã xóa, bao gồm mọi phần tử con, về vị trí ban đầu của chúng. Nếu vị trí ban đầu đã bị xóa và hiện đang nằm trong thùng rác, mục cha cũng sẽ cần được khôi phục.',
+    'recycle_bin_restore_deleted_parent' => 'Mục cha của mục này cũng đã bị xóa. Chúng sẽ vẫn bị xóa cho đến khi mục cha đó cũng được khôi phục.',
+    'recycle_bin_restore_parent' => 'Khôi phục mục cha',
+    'recycle_bin_destroy_notification' => 'Đã xóa :count tổng số mục khỏi thùng rác.',
+    'recycle_bin_restore_notification' => 'Đã khôi phục :count tổng số mục khỏi thùng rác.',
 
     // Audit Log
-    'audit' => 'Audit Log',
-    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
-    'audit_event_filter' => 'Event Filter',
+    'audit' => 'Nhật ký kiểm tra',
+    'audit_desc' => 'Nhật ký kiểm tra này hiển thị danh sách các hoạt động được theo dõi trong hệ thống. Danh sách này không được lọc không giống như các danh sách hoạt động tương tự trong hệ thống nơi các bộ lọc quyền được áp dụng.',
+    'audit_event_filter' => 'Bộ lọc sự kiện',
     'audit_event_filter_no_filter' => 'Không Lọc',
     'audit_deleted_item' => 'Mục Đã Xóa',
     'audit_deleted_item_name' => 'Tên: :name',
     'audit_table_user' => 'Người dùng',
     'audit_table_event' => 'Sự kiện',
-    'audit_table_related' => 'Related Item or Detail',
-    'audit_table_ip' => 'IP Address',
+    'audit_table_related' => 'Mục hoặc chi tiết liên quan',
+    'audit_table_ip' => 'Địa chỉ IP',
     'audit_table_date' => 'Ngày hoạt động',
     'audit_date_from' => 'Ngày từ khoảng',
     'audit_date_to' => 'Ngày đến khoảng',
@@ -166,22 +166,22 @@
     // Role Settings
     'roles' => 'Quyền',
     'role_user_roles' => 'Quyền người dùng',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_index_desc' => 'Các quyền được sử dụng để nhóm người dùng và cung cấp quyền hệ thống cho các thành viên của họ. Khi một người dùng là thành viên của nhiều quyền, các đặc quyền được cấp sẽ chồng lên nhau và người dùng sẽ thừa hưởng tất cả các khả năng.',
+    'roles_x_users_assigned' => ':count người dùng được gán|:count người dùng được gán',
+    'roles_x_permissions_provided' => ':count quyền|:count quyền',
+    'roles_assigned_users' => 'Người dùng được gán',
+    'roles_permissions_provided' => 'Quyền được cung cấp',
     'role_create' => 'Tạo quyền mới',
     'role_delete' => 'Xóa quyền',
     'role_delete_confirm' => 'Chức năng này sẽ xóa quyền với tên \':roleName\'.',
     'role_delete_users_assigned' => 'Quyền này có :userCount người dùng được gán. Nếu bạn muốn di dời các người dùng từ quyền này hãy chọn một quyền mới bên dưới.',
-    'role_delete_no_migration' => "Không di dời các người dùng",
+    'role_delete_no_migration' => "Không di dời người dùng",
     'role_delete_sure' => 'Bạn có chắc rằng muốn xóa quyền này?',
     'role_edit' => 'Sửa quyền',
     'role_details' => 'Thông tin chi tiết Quyền',
     'role_name' => 'Tên quyền',
     'role_desc' => 'Thông tin vắn tắt của Quyền',
-    'role_mfa_enforced' => 'Requires Multi-Factor Authentication',
+    'role_mfa_enforced' => 'Yêu cầu xác thực đa yếu tố',
     'role_external_auth_id' => 'Mã của xác thực ngoài',
     'role_system' => 'Quyền Hệ thống',
     'role_manage_users' => 'Quản lý người dùng',
@@ -191,15 +191,15 @@
     'role_manage_page_templates' => 'Quản lý các mẫu trang',
     'role_access_api' => 'Truy cập đến API hệ thống',
     'role_manage_settings' => 'Quản lý cài đặt của ứng dụng',
-    'role_export_content' => 'Export content',
-    'role_import_content' => 'Import content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_export_content' => 'Xuất nội dung',
+    'role_import_content' => 'Nhập nội dung',
+    'role_editor_change' => 'Thay đổi trình soạn thảo trang',
+    'role_notifications' => 'Nhận & quản lý thông báo',
     'role_asset' => 'Quyền tài sản (asset)',
-    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
-    'role_asset_desc' => 'Các quyền này điều khiển truy cập mặc định tới tài sản (asset) nằm trong hệ thống. Quyền tại Sách, Chường và Trang se ghi đè các quyền này.',
+    'roles_system_warning' => 'Cần lưu ý rằng việc truy cập vào bất kỳ ba quyền trên có thể cho phép người dùng thay đổi đặc quyền của chính họ hoặc đặc quyền của những người khác trong hệ thống. Chỉ gán các vai trò có các quyền này cho những người dùng đáng tin cậy.',
+    'role_asset_desc' => 'Các quyền này điều khiển truy cập mặc định tới tài sản (asset) nằm trong hệ thống. Quyền tại Sách, Chương và Trang sẽ ghi đè các quyền này.',
     'role_asset_admins' => 'Quản trị viên được tự động cấp quyền truy cập đến toàn bộ nội dung, tuy nhiên các tùy chọn đó có thể hiện hoặc ẩn tùy chọn giao diện.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_image_view_note' => 'Điều này liên quan đến khả năng hiển thị trong trình quản lý hình ảnh. Quyền truy cập thực tế vào các tệp hình ảnh đã tải lên sẽ phụ thuộc vào tùy chọn lưu trữ hình ảnh của hệ thống.',
     'role_all' => 'Tất cả',
     'role_own' => 'Sở hữu',
     'role_controlled_by_asset' => 'Kiểm soát các tài sản (asset) người dùng tải lên',
@@ -209,7 +209,7 @@
 
     // Users
     'users' => 'Người dùng',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'Tạo và quản lý các tài khoản người dùng riêng lẻ trong hệ thống. Các tài khoản người dùng được sử dụng để đăng nhập và gán nội dung & hoạt động. Quyền truy cập chủ yếu dựa trên vai trò nhưng quyền sở hữu nội dung của người dùng, cùng với các yếu tố khác, cũng có thể ảnh hưởng đến quyền và truy cập.',
     'user_profile' => 'Hồ sơ người dùng',
     'users_add_new' => 'Thêm người dùng mới',
     'users_search' => 'Tìm kiếm người dùng',
@@ -220,45 +220,45 @@
     'users_role' => 'Quyền người dùng',
     'users_role_desc' => 'Chọn quyền mà người dùng sẽ được gán. Nếu người dùng được gán nhiều quyền, các quyền hạn sẽ ghi đè lên nhau và họ sẽ nhận được tất cả các quyền hạn từ quyền được gán.',
     'users_password' => 'Mật khẩu người dùng',
-    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
+    'users_password_desc' => 'Đặt mật khẩu được sử dụng để đăng nhập vào ứng dụng. Mật khẩu phải dài ít nhất 8 ký tự.',
     'users_send_invite_text' => 'Bạn có thể chọn để gửi cho người dùng này một email mời, giúp họ có thể tự đặt mật khẩu cho chính họ. Nếu không bạn có thể đặt mật khẩu cho họ.',
     'users_send_invite_option' => 'Gửi email mời người dùng',
     'users_external_auth_id' => 'Mã của xác thực ngoài',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Khi một hệ thống xác thực bên ngoài đang được sử dụng (chẳng hạn như SAML2, OIDC hoặc LDAP) đây là ID liên kết người dùng BookStack này với tài khoản hệ thống xác thực. Bạn có thể bỏ qua trường này nếu sử dụng xác thực dựa trên email mặc định.',
+    'users_password_warning' => 'Chỉ điền vào phần bên dưới nếu bạn muốn thay đổi mật khẩu cho người dùng này.',
     'users_system_public' => 'Người dùng này đại diện cho bất kỳ khách nào thăm trang của bạn. Nó được tự động gán và không thể dùng để đăng nhập.',
     'users_delete' => 'Xóa Người dùng',
     'users_delete_named' => 'Xóa người dùng :userName',
-    'users_delete_warning' => 'Chức năng này sẽ hoàn toàn xóa người dùng với tên \':userName\' từ hệ thống.',
+    'users_delete_warning' => 'Chức năng này sẽ hoàn toàn xóa người dùng với tên \':userName\' khỏi hệ thống.',
     'users_delete_confirm' => 'Bạn có chắc muốn xóa người dùng này không?',
-    'users_migrate_ownership' => 'Migrate Ownership',
-    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
+    'users_migrate_ownership' => 'Di chuyển quyền sở hữu',
+    'users_migrate_ownership_desc' => 'Chọn một người dùng tại đây nếu bạn muốn một người dùng khác trở thành chủ sở hữu của tất cả các mục hiện thuộc sở hữu của người dùng này.',
     'users_none_selected' => 'Chưa chọn người dùng',
     'users_edit' => 'Sửa người dùng',
     'users_edit_profile' => 'Sửa Hồ sơ',
     'users_avatar' => 'Ảnh đại diện',
-    'users_avatar_desc' => 'Chọn ảnh đê đại hiện cho người dùng này. Ảnh nên có kích cỡ hình vuông 256px.',
+    'users_avatar_desc' => 'Chọn ảnh để đại diện cho người dùng này. Ảnh nên có kích cỡ hình vuông 256px.',
     'users_preferred_language' => 'Ngôn ngữ ưu tiên',
-    'users_preferred_language_desc' => 'Tùy chọn này sẽ thay đổi ngôn ngư sử dụng cho giao diện người dùng của ứng dụng. Nó sẽ không ảnh hưởng đến bất cứ nội dung nào người dùng tạo ra.',
+    'users_preferred_language_desc' => 'Tùy chọn này sẽ thay đổi ngôn ngữ sử dụng cho giao diện người dùng của ứng dụng. Nó sẽ không ảnh hưởng đến bất cứ nội dung nào người dùng tạo ra.',
     'users_social_accounts' => 'Tài khoản MXH',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
-    'users_social_accounts_info' => 'Bạn có thể kết nối đến các tài khoản khác để đăng nhập nhanh chóng và dễ dàng. Ngắt kết nối đến một tài khoản ở đây không thu hồi việc ủy quyền truy cập trước đó. Thu hồi truy cập của các tài khoản kết nối MXH từ trang cài đặt hồ sở của bạn.',
+    'users_social_accounts_desc' => 'Xem trạng thái của các tài khoản xã hội được kết nối cho người dùng này. Các tài khoản xã hội có thể được sử dụng ngoài hệ thống xác thực chính để truy cập hệ thống.',
+    'users_social_accounts_info' => 'Bạn có thể kết nối đến các tài khoản khác để đăng nhập nhanh chóng và dễ dàng. Ngắt kết nối đến một tài khoản ở đây không thu hồi việc ủy quyền truy cập trước đó. Thu hồi truy cập của các tài khoản kết nối MXH từ trang cài đặt hồ sơ của bạn.',
     'users_social_connect' => 'Kết nối tài khoản',
     'users_social_disconnect' => 'Ngắt kết nối tài khoản',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
+    'users_social_status_connected' => 'Đã kết nối',
+    'users_social_status_disconnected' => 'Đã ngắt kết nối',
     'users_social_connected' => 'Tài khoản :socialAccount đã được liên kết với hồ sơ của bạn thành công.',
     'users_social_disconnected' => 'Tài khoản :socialAccount đã được ngắt kết nối khỏi hồ sơ của bạn thành công.',
     'users_api_tokens' => 'Các Token API',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
-    'users_api_tokens_none' => 'Khong có Token API nào được tạo cho người dùng này',
+    'users_api_tokens_desc' => 'Tạo và quản lý các mã thông báo truy cập được sử dụng để xác thực với API REST của BookStack. Quyền cho API được quản lý thông qua người dùng mà mã thông báo thuộc về.',
+    'users_api_tokens_none' => 'Không có Token API nào được tạo cho người dùng này',
     'users_api_tokens_create' => 'Tạo Token',
     'users_api_tokens_expires' => 'Hết hạn',
     'users_api_tokens_docs' => 'Tài liệu API',
-    'users_mfa' => 'Multi-Factor Authentication',
-    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
-    'users_mfa_configure' => 'Configure Methods',
+    'users_mfa' => 'Xác thực đa yếu tố',
+    'users_mfa_desc' => 'Thiết lập xác thực đa yếu tố như một lớp bảo mật bổ sung cho tài khoản người dùng của bạn.',
+    'users_mfa_x_methods' => ':count phương thức đã cấu hình|:count phương thức đã cấu hình',
+    'users_mfa_configure' => 'Cấu hình phương thức',
 
     // API Tokens
     'user_api_token_create' => 'Tạo Token API',
@@ -275,46 +275,46 @@
     'user_api_token_created' => 'Token được tạo :timeAgo',
     'user_api_token_updated' => 'Token được cập nhật :timeAgo',
     'user_api_token_delete' => 'Xóa Token',
-    'user_api_token_delete_warning' => 'Chức năng này sẽ hoàn toàn xóa token API với tên \':tokenName\' từ hệ thống.',
+    'user_api_token_delete_warning' => 'Chức năng này sẽ hoàn toàn xóa token API với tên \':tokenName\' khỏi hệ thống.',
     'user_api_token_delete_confirm' => 'Bạn có chắc rằng muốn xóa token API này?',
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_index_desc' => 'Webhooks là một cách để gửi dữ liệu đến các URL bên ngoài khi một số hành động và sự kiện nhất định xảy ra trong hệ thống, cho phép tích hợp dựa trên sự kiện với các nền tảng bên ngoài như hệ thống nhắn tin hoặc thông báo.',
+    'webhooks_x_trigger_events' => ':count sự kiện kích hoạt|:count sự kiện kích hoạt',
     'webhooks_create' => 'Tạo Webhook mới',
     'webhooks_none_created' => 'Chưa có webhooks nào được tạo.',
     'webhooks_edit' => 'Chỉnh sửa Webhook',
     'webhooks_save' => 'Lưu Webhook',
     'webhooks_details' => 'Chi tiết Webhook',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
-    'webhooks_events_all' => 'All system events',
+    'webhooks_details_desc' => 'Cung cấp một tên thân thiện với người dùng và một điểm cuối POST làm vị trí để dữ liệu webhook được gửi đến.',
+    'webhooks_events' => 'Sự kiện Webhook',
+    'webhooks_events_desc' => 'Chọn tất cả các sự kiện sẽ kích hoạt webhook này được gọi.',
+    'webhooks_events_warning' => 'Hãy nhớ rằng các sự kiện này sẽ được kích hoạt cho tất cả các sự kiện đã chọn, ngay cả khi các quyền tùy chỉnh được áp dụng. Đảm bảo rằng việc sử dụng webhook này sẽ không làm lộ nội dung bí mật.',
+    'webhooks_events_all' => 'Tất cả các sự kiện hệ thống',
     'webhooks_name' => 'Tên Webhook',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
-    'webhook_events_table_header' => 'Events',
-    'webhooks_delete' => 'Delete Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
-    'webhooks_format_example' => 'Webhook Format Example',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
+    'webhooks_timeout' => 'Thời gian chờ yêu cầu Webhook (Giây)',
+    'webhooks_endpoint' => 'Điểm cuối Webhook',
+    'webhooks_active' => 'Webhook hoạt động',
+    'webhook_events_table_header' => 'Sự kiện',
+    'webhooks_delete' => 'Xóa Webhook',
+    'webhooks_delete_warning' => 'Điều này sẽ xóa hoàn toàn webhook này, với tên \':webhookName\', khỏi hệ thống.',
+    'webhooks_delete_confirm' => 'Bạn có chắc chắn muốn xóa webhook này không?',
+    'webhooks_format_example' => 'Ví dụ định dạng Webhook',
+    'webhooks_format_example_desc' => 'Dữ liệu webhook được gửi dưới dạng yêu cầu POST đến điểm cuối đã cấu hình dưới dạng JSON theo định dạng bên dưới. Các thuộc tính "related_item" và "url" là tùy chọn và sẽ phụ thuộc vào loại sự kiện được kích hoạt.',
     'webhooks_status' => 'Trạng thái Webhook',
     'webhooks_last_called' => 'Lần cuối được gọi:',
     'webhooks_last_errored' => 'Lần cuối xảy ra lỗi:',
     'webhooks_last_error_message' => 'Nội dung lỗi gần nhất:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Giấy phép',
+    'licenses_desc' => 'Trang này trình bày chi tiết thông tin giấy phép cho BookStack ngoài các dự án & thư viện được sử dụng trong BookStack. Nhiều dự án được liệt kê có thể chỉ được sử dụng trong ngữ cảnh phát triển.',
+    'licenses_bookstack' => 'Giấy phép BookStack',
+    'licenses_php' => 'Giấy phép thư viện PHP',
+    'licenses_js' => 'Giấy phép thư viện JavaScript',
+    'licenses_other' => 'Các giấy phép khác',
+    'license_details' => 'Chi tiết giấy phép',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/vi/validation.php b/lang/vi/validation.php
index 9683c085726..bc6fc0e39fd 100644
--- a/lang/vi/validation.php
+++ b/lang/vi/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'Định dạng của :attribute không hợp lệ.',
     'uploaded'             => 'Tệp tin đã không được tải lên. Máy chủ không chấp nhận các tệp tin với dung lượng lớn như tệp tin trên.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute cần tham chiếu đến một tệp trong ZIP.',
+    'zip_file_mime' => ':attribute cần tham chiếu đến một tệp có kiểu: :validTypes, tìm thấy :foundType.',
+    'zip_model_expected' => 'Đối tượng dữ liệu được mong đợi nhưng tìm thấy ":type".',
+    'zip_unique' => ':attribute phải là duy nhất cho kiểu đối tượng trong ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index ac0f04351c3..5b67ee0c451 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -392,7 +392,7 @@
     'comment' => '评论',
     'comments' => '评论',
     'comment_add' => '添加评论',
-    'comment_none' => 'No comments to display',
+    'comment_none' => '没有要显示的评论',
     'comment_placeholder' => '在这里评论',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
     'comment_archived_count' => ':count Archived',
@@ -407,7 +407,7 @@
     'comment_updated_success' => '评论已更新',
     'comment_archive_success' => 'Comment archived',
     'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
+    'comment_view' => '查看评论',
     'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '您确定要删除这条评论？',
     'comment_in_reply_to' => '回复 :commentId',

From f83074d50e9f0e4c760f57fe5a853acd84c0c898 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 7 Jul 2025 14:43:21 +0100
Subject: [PATCH 592/666] Languages: Added Nepali as a language option

---
 app/Translation/LocaleManager.php | 1 +
 lang/en/settings.php              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index 86e712beec9..d23c2361004 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -50,6 +50,7 @@ class LocaleManager
         'ku'          => 'ku_TR',
         'lt'          => 'lt_LT',
         'lv'          => 'lv_LV',
+        'ne'          => 'ne_NP',
         'nb'          => 'nb_NO',
         'nl'          => 'nl_NL',
         'nn'          => 'nn_NO',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',

From c1d76d2571fcd125064d245796e909240c79d86b Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 7 Jul 2025 14:51:45 +0100
Subject: [PATCH 593/666] Updated translations with latest Crowdin changes
 (#5695)

---
 lang/ar/settings.php          | 1 +
 lang/bg/settings.php          | 1 +
 lang/bn/settings.php          | 1 +
 lang/bs/settings.php          | 1 +
 lang/ca/settings.php          | 1 +
 lang/cs/settings.php          | 1 +
 lang/cy/settings.php          | 1 +
 lang/da/settings.php          | 1 +
 lang/de/settings.php          | 1 +
 lang/de_informal/settings.php | 1 +
 lang/el/settings.php          | 1 +
 lang/es/settings.php          | 1 +
 lang/es_AR/settings.php       | 1 +
 lang/et/settings.php          | 1 +
 lang/eu/settings.php          | 1 +
 lang/fa/settings.php          | 1 +
 lang/fi/settings.php          | 1 +
 lang/fr/settings.php          | 1 +
 lang/he/settings.php          | 1 +
 lang/hr/settings.php          | 1 +
 lang/hu/settings.php          | 1 +
 lang/id/settings.php          | 1 +
 lang/is/settings.php          | 1 +
 lang/it/settings.php          | 1 +
 lang/ja/settings.php          | 1 +
 lang/ka/settings.php          | 1 +
 lang/ko/settings.php          | 1 +
 lang/ku/settings.php          | 1 +
 lang/lt/settings.php          | 1 +
 lang/lv/settings.php          | 1 +
 lang/nb/settings.php          | 1 +
 lang/ne/settings.php          | 1 +
 lang/nl/settings.php          | 1 +
 lang/nn/settings.php          | 1 +
 lang/pl/settings.php          | 1 +
 lang/pt/settings.php          | 1 +
 lang/pt_BR/settings.php       | 1 +
 lang/ro/settings.php          | 1 +
 lang/ru/settings.php          | 1 +
 lang/sk/settings.php          | 1 +
 lang/sl/settings.php          | 1 +
 lang/sq/settings.php          | 1 +
 lang/sr/settings.php          | 1 +
 lang/sv/settings.php          | 1 +
 lang/tk/settings.php          | 1 +
 lang/tr/settings.php          | 1 +
 lang/uk/settings.php          | 1 +
 lang/uz/settings.php          | 1 +
 lang/vi/settings.php          | 1 +
 lang/zh_CN/settings.php       | 1 +
 lang/zh_TW/settings.php       | 1 +
 51 files changed, 51 insertions(+)

diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 8e615fc9cb9..9006ac2277f 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index b5ed1e4a7ca..6dd27d74a57 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/bn/settings.php b/lang/bn/settings.php
index 8e584abea45..04aca4f2e0f 100644
--- a/lang/bn/settings.php
+++ b/lang/bn/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 3cabbe1a3f0..e25a4a0325e 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index e4708f6b9eb..e72d4b403ad 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index fb1457e1e54..cb08e8c9068 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index d964ed61745..a4136f6fd90 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index a6b6482e3ab..250668e8a78 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -349,6 +349,7 @@
         'lt' => 'Litauisch',
         'lv' => 'Lettisch',
         'nb' => 'Norwegisch (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Niederländisch',
         'pl' => 'Polnisch',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 0b7b74c0d4a..50003c58ee7 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -349,6 +349,7 @@
         'lt' => 'Litauisch',
         'lv' => 'Lettisch',
         'nb' => 'Norwegisch (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Niederländisch',
         'pl' => 'Polnisch',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 386921b8a7a..172038fd014 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 0a4a9303daa..55eb498d630 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lituano',
         'lv' => 'Letón',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Holanda',
         'pl' => 'Polaco',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 5d99f05f7d2..5cbcff86eae 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -349,6 +349,7 @@
         'lt' => 'Lituano',
         'lv' => 'Letón',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Holanda',
         'pl' => 'Polaco',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index bfb8a51ac67..003238cfebe 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba (leedu keel)',
         'lv' => 'Latviešu Valoda (läti keel)',
         'nb' => 'Norsk (Bokmål) (norra keel)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands (hollandi keel)',
         'pl' => 'Polski (poola keel)',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index 2bc284c062d..e93f3c96469 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index 09783312eb2..7909864f7c3 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index d37ff79f45e..d9e91d4fa88 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index fa125680b47..e73d8a4b19d 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lituanien',
         'lv' => 'Letton',
         'nb' => 'Norvegien',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Néerlandais',
         'pl' => 'Polonais',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index 0e7efe048f4..5b405072f86 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index 1b9ec4896b0..5f000742631 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index b4e2e62072d..813fee7b054 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 53d1b576a30..51c0613cbae 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/is/settings.php b/lang/is/settings.php
index 08f922f7334..3765db061cc 100644
--- a/lang/is/settings.php
+++ b/lang/is/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 3b57db1b160..8bda7f8ffe9 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lituano',
         'lv' => 'Lettone',
         'nb' => 'Norvegese (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Olandese',
         'pl' => 'Polacco',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index 1a0e64cb41d..db14f3ccc5a 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index b78333385fd..797c12043a1 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ku/settings.php b/lang/ku/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/ku/settings.php
+++ b/lang/ku/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index e3bd927dc91..563038bf267 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index ff7db39ef2d..9901f781190 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index a719d41cc48..68bab6f3038 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ne/settings.php b/lang/ne/settings.php
index b846c4a09dc..eb99f26bdf7 100644
--- a/lang/ne/settings.php
+++ b/lang/ne/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 3bba35cb554..1aeabed10ed 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba (Litouws)',
         'lv' => 'Latviešu Valoda (Lets)',
         'nb' => 'Norsk (Bokmål) (Noors)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski (Pools)',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index f71ffb20413..c098ac75386 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index b1f0c1582ff..7c84ce34b87 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index b321d2eda1c..0c765fb9851 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index 39007cbccec..b940e57d4c0 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index c9bbaf06ea0..a28dca22c57 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 6cd29286982..69c13e46dd3 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index b07586b8de6..2731fd01a2b 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index c49b6b79b55..904978f4705 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -349,6 +349,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index 09033109530..b7213e905b0 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 4af72c7f79a..fdf8ebd0633 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/tk/settings.php b/lang/tk/settings.php
index 82a4ade5df5..81c2c0a93c3 100644
--- a/lang/tk/settings.php
+++ b/lang/tk/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 11ab1b6df4a..1eb15d9d4c0 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index 5ab70d1ae69..3798f1b6078 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index 873642c2ad0..83fedc569ef 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index ff585429731..1ff252702c0 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index bc52b4ccc10..2114c36480c 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -348,6 +348,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => '挪威语 (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index ec2682cf173..752d3f2a74e 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -349,6 +349,7 @@
         'lt' => 'Lietuvių Kalba',
         'lv' => 'Latviešu Valoda',
         'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
         'nn' => 'Nynorsk',
         'nl' => 'Nederlands',
         'pl' => 'Polski',

From 306f41b6f03f0ade63a7c1ffaa5f16da9270429e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 7 Jul 2025 14:57:45 +0100
Subject: [PATCH 594/666] Updated translator & dependency attribution before
 release v25.05.2

---
 .github/translators.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index 01260990a24..ac5fa766f59 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -489,3 +489,7 @@ Hari (muhhari) :: Indonesian
 仙君御 (xjy) :: Chinese Simplified
 TapioM :: Finnish
 lingb58 :: Chinese Traditional
+Angel Pandey (angel-pandey) :: Nepali
+Supriya Shrestha (supriyashrestha) :: Nepali
+gprabhat :: Nepali
+CellCat :: Chinese Simplified

From 795b28162a93343fb8c2d605d0829b5ecad609c0 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 14 Jul 2025 14:18:24 +0100
Subject: [PATCH 595/666] Readme: Added SiteSpeakAI sponsor

---
 readme.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index e1c890e0b69..b5470af5723 100644
--- a/readme.md
+++ b/readme.md
@@ -87,9 +87,12 @@ Big thanks to these companies for supporting the project.
 </a></td>
 </tr>
 <tr>
-<td colspan="2" align="center"><a href="https://phamos.eu" target="_blank">
+<td align="center"><a href="https://phamos.eu" target="_blank">
     <img width="136" src="https://www.bookstackapp.com/images/sponsors/phamos.png" alt="phamos">
 </a></td>
+<td align="center"><a href="https://sitespeak.ai/bookstack" target="_blank">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/sitespeak.png" alt="SiteSpeakAI">
+</a></td>
 </tr>
 </tbody></table>
 
@@ -103,7 +106,7 @@ Details about BookStack's versioning scheme and the general release process [can
 
 ## 🌎 Translations
 
-Translations for text within BookStack is managed through the [BookStack project on Crowdin](https://crowdin.com/project/bookstack). Some strings have colon-prefixed variables such as `:userName`. Leave these values as they are as they will be replaced at run-time.
+Translations for text within BookStack are managed through the [BookStack project on Crowdin](https://crowdin.com/project/bookstack). Some strings have colon-prefixed variables such as `:userName`. Leave these values as they are as they will be replaced at run-time.
 
 Please use [Crowdin](https://crowdin.com/project/bookstack) to contribute translations instead of opening a pull request. The translations within the working codebase can be out-of-date, and merging via code can cause conflicts & sync issues. If for some reason you can't use Crowdin feel free to open an issue to discuss alternative options. 
 

From d13abc7e1d9c204640fe9a6624a162a7cc106de6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 15 Jul 2025 15:24:31 +0100
Subject: [PATCH 596/666] Mail: Removed custom symfony/mailer fork

Moved to standard symfony mailer now that my patches have been
upstreamed. This changes the config to work with the symfony option,
following the same overall logic.
Also updated testing to allow test runs via mulitple custom env options.

Closes #5636
---
 app/Config/mail.php          |   5 +-
 composer.json                |   3 +-
 composer.lock                | 213 ++++++++++++++++++-----------------
 tests/SecurityHeaderTest.php |   8 +-
 tests/TestCase.php           |  27 +++--
 tests/ThemeTest.php          |   6 +-
 tests/Unit/ConfigTest.php    |  49 +++-----
 tests/UrlTest.php            |   4 +-
 8 files changed, 156 insertions(+), 159 deletions(-)

diff --git a/app/Config/mail.php b/app/Config/mail.php
index 038864f8cf4..7256ce8848e 100644
--- a/app/Config/mail.php
+++ b/app/Config/mail.php
@@ -11,6 +11,7 @@
 // Configured mail encryption method.
 // STARTTLS should still be attempted, but tls/ssl forces TLS usage.
 $mailEncryption = env('MAIL_ENCRYPTION', null);
+$mailPort = intval(env('MAIL_PORT', 587));
 
 return [
 
@@ -33,13 +34,13 @@
             'transport' => 'smtp',
             'scheme' => null,
             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-            'port' => env('MAIL_PORT', 587),
+            'port' => $mailPort,
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'verify_peer' => env('MAIL_VERIFY_SSL', true),
             'timeout' => null,
             'local_domain' => null,
-            'tls_required' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl'),
+            'require_tls' => ($mailEncryption === 'tls' || $mailEncryption === 'ssl' || $mailPort === 465),
         ],
 
         'sendmail' => [
diff --git a/composer.json b/composer.json
index 09f08daee17..2ea1d802b59 100644
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,7 @@
         "socialiteproviders/microsoft-azure": "^5.1",
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
-        "ssddanbrown/htmldiff": "^2.0.0",
-        "ssddanbrown/symfony-mailer": "7.2.x-dev"
+        "ssddanbrown/htmldiff": "^2.0.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
diff --git a/composer.lock b/composer.lock
index c4f1a1638e9..1f7cbf88497 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d9b8455cf3ec02c21bea7ee94463331b",
+    "content-hash": "b7695cb9945ec550970c67da96934daf",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.349.2",
+            "version": "3.349.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "63cc727845f077d17cb94791deb327249e1626ce"
+                "reference": "b2d4718786398f47626add9c29840fc416175ef2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/63cc727845f077d17cb94791deb327249e1626ce",
-                "reference": "63cc727845f077d17cb94791deb327249e1626ce",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b2d4718786398f47626add9c29840fc416175ef2",
+                "reference": "b2d4718786398f47626add9c29840fc416175ef2",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.349.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.349.3"
             },
-            "time": "2025-07-03T18:08:27+00:00"
+            "time": "2025-07-09T18:10:17+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1955,16 +1955,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.5",
+            "version": "v0.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/86a8b692e8661d0fb308cec64f3d176821323077",
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077",
                 "shasum": ""
             },
             "require": {
@@ -2008,9 +2008,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.5"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.6"
             },
-            "time": "2025-02-11T13:34:40+00:00"
+            "time": "2025-07-07T14:17:42+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -4894,16 +4894,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.8.0",
+            "version": "v8.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740"
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/3de493bdddfd1f051249af725c7e0d2c38fed740",
-                "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
                 "shasum": ""
             },
             "require": {
@@ -4911,7 +4911,8 @@
                 "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
+                "rawr/cross-data-providers": "^2.0.0"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -4953,9 +4954,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.8.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
             },
-            "time": "2025-03-23T17:59:05+00:00"
+            "time": "2025-07-11T13:20:48+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5325,80 +5326,6 @@
             ],
             "time": "2025-07-07T11:55:59+00:00"
         },
-        {
-            "name": "ssddanbrown/symfony-mailer",
-            "version": "7.2.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ssddanbrown/symfony-mailer.git",
-                "reference": "e9de8dccd76a63fc23475016e6574da6f5f12a2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ssddanbrown/symfony-mailer/zipball/e9de8dccd76a63fc23475016e6574da6f5f12a2d",
-                "reference": "e9de8dccd76a63fc23475016e6574da6f5f12a2d",
-                "shasum": ""
-            },
-            "require": {
-                "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.2",
-                "psr/event-dispatcher": "^1",
-                "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/mime": "^7.2",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<6.4",
-                "symfony/messenger": "<6.4",
-                "symfony/mime": "<6.4",
-                "symfony/twig-bridge": "<6.4"
-            },
-            "replace": {
-                "symfony/mailer": "^7.0"
-            },
-            "require-dev": {
-                "symfony/console": "^6.4|^7.0",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/twig-bridge": "^6.4|^7.0"
-            },
-            "default-branch": true,
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Mailer\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dan Brown",
-                    "homepage": "https://danb.me"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Helps sending emails",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/ssddanbrown/symfony-mailer/tree/7.2"
-            },
-            "time": "2025-01-11T14:57:07+00:00"
-        },
         {
             "name": "symfony/clock",
             "version": "v7.3.0",
@@ -6189,6 +6116,86 @@
             ],
             "time": "2025-06-28T08:24:55+00:00"
         },
+        {
+            "name": "symfony/mailer",
+            "version": "v7.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v7.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-27T19:55:54+00:00"
+        },
         {
             "name": "symfony/mime",
             "version": "v7.3.0",
@@ -8973,16 +8980,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.26",
+            "version": "11.5.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4ad8fe263a0b55b54a8028c38a18e3c5bef312e0"
+                "reference": "446d43867314781df7e9adf79c3ec7464956fd8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ad8fe263a0b55b54a8028c38a18e3c5bef312e0",
-                "reference": "4ad8fe263a0b55b54a8028c38a18e3c5bef312e0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/446d43867314781df7e9adf79c3ec7464956fd8f",
+                "reference": "446d43867314781df7e9adf79c3ec7464956fd8f",
                 "shasum": ""
             },
             "require": {
@@ -8992,7 +8999,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.1",
+                "myclabs/deep-copy": "^1.13.3",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
@@ -9054,7 +9061,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.26"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.27"
             },
             "funding": [
                 {
@@ -9078,7 +9085,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-04T05:58:21+00:00"
+            "time": "2025-07-11T04:10:06+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10318,9 +10325,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "ssddanbrown/symfony-mailer": 20
-    },
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/tests/SecurityHeaderTest.php b/tests/SecurityHeaderTest.php
index 5d354e5539e..fe98e32080b 100644
--- a/tests/SecurityHeaderTest.php
+++ b/tests/SecurityHeaderTest.php
@@ -17,7 +17,7 @@ public function test_cookies_samesite_lax_by_default()
 
     public function test_cookies_samesite_none_when_iframe_hosts_set()
     {
-        $this->runWithEnv('ALLOWED_IFRAME_HOSTS', 'http://example.com', function () {
+        $this->runWithEnv(['ALLOWED_IFRAME_HOSTS' => 'http://example.com'], function () {
             $resp = $this->get('/');
             foreach ($resp->headers->getCookies() as $cookie) {
                 $this->assertEquals('none', $cookie->getSameSite());
@@ -27,14 +27,14 @@ public function test_cookies_samesite_none_when_iframe_hosts_set()
 
     public function test_secure_cookies_controlled_by_app_url()
     {
-        $this->runWithEnv('APP_URL', 'http://example.com', function () {
+        $this->runWithEnv(['APP_URL' => 'http://example.com'], function () {
             $resp = $this->get('/');
             foreach ($resp->headers->getCookies() as $cookie) {
                 $this->assertFalse($cookie->isSecure());
             }
         });
 
-        $this->runWithEnv('APP_URL', 'https://example.com', function () {
+        $this->runWithEnv(['APP_URL' => 'https://example.com'], function () {
             $resp = $this->get('/');
             foreach ($resp->headers->getCookies() as $cookie) {
                 $this->assertTrue($cookie->isSecure());
@@ -52,7 +52,7 @@ public function test_iframe_csp_self_only_by_default()
 
     public function test_iframe_csp_includes_extra_hosts_if_configured()
     {
-        $this->runWithEnv('ALLOWED_IFRAME_HOSTS', 'https://a.example.com https://b.example.com', function () {
+        $this->runWithEnv(['ALLOWED_IFRAME_HOSTS' => 'https://a.example.com https://b.example.com'], function () {
             $resp = $this->get('/');
             $frameHeader = $this->getCspHeader($resp, 'frame-ancestors');
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0fb899ea99e..a8636fb158e 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -118,15 +118,18 @@ protected function mockHttpClient(array $responses = []): HttpClientHistory
      * Database config is juggled so the value can be restored when
      * parallel testing are used, where multiple databases exist.
      */
-    protected function runWithEnv(string $name, $value, callable $callback, bool $handleDatabase = true)
+    protected function runWithEnv(array $valuesByKey, callable $callback, bool $handleDatabase = true): void
     {
         Env::disablePutenv();
-        $originalVal = $_SERVER[$name] ?? null;
-
-        if (is_null($value)) {
-            unset($_SERVER[$name]);
-        } else {
-            $_SERVER[$name] = $value;
+        $originals = [];
+        foreach ($valuesByKey as $key => $value) {
+            $originals[$key] = $_SERVER[$key] ?? null;
+
+            if (is_null($value)) {
+                unset($_SERVER[$key]);
+            } else {
+                $_SERVER[$key] = $value;
+            }
         }
 
         $database = config('database.connections.mysql_testing.database');
@@ -144,10 +147,12 @@ protected function runWithEnv(string $name, $value, callable $callback, bool $ha
             DB::rollBack();
         }
 
-        if (is_null($originalVal)) {
-            unset($_SERVER[$name]);
-        } else {
-            $_SERVER[$name] = $originalVal;
+        foreach ($originals as $key => $value) {
+            if (is_null($value)) {
+                unset($_SERVER[$key]);
+            } else {
+                $_SERVER[$key] = $value;
+            }
         }
     }
 
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index b3c85d8f724..4dff384186c 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -46,7 +46,7 @@ public function test_theme_functions_file_used_and_app_boot_event_runs()
             $functionsFile = theme_path('functions.php');
             app()->alias('cat', 'dog');
             file_put_contents($functionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");
-            $this->runWithEnv('APP_THEME', $themeFolder, function () {
+            $this->runWithEnv(['APP_THEME' => $themeFolder], function () {
                 $this->assertEquals('cat', $this->app->getAlias('dog'));
             });
         });
@@ -61,7 +61,7 @@ public function test_theme_functions_loads_errors_are_caught_and_logged()
             $this->expectException(ThemeException::class);
             $this->expectExceptionMessageMatches('/Failed loading theme functions file at ".*?" with error: Class "BookStack\\\\Biscuits" not found/');
 
-            $this->runWithEnv('APP_THEME', $themeFolder, fn() => null);
+            $this->runWithEnv(['APP_THEME' => $themeFolder], fn() => null);
         });
     }
 
@@ -504,7 +504,7 @@ protected function usingThemeFolder(callable $callback)
         $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));
 
         // Run provided callback with theme env option set
-        $this->runWithEnv('APP_THEME', $themeFolderName, function () use ($callback, $themeFolderName) {
+        $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {
             call_user_func($callback, $themeFolderName);
         });
     }
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 2883fddb8fc..7795a861a0c 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -16,7 +16,7 @@ class ConfigTest extends TestCase
 {
     public function test_filesystem_images_falls_back_to_storage_type_var()
     {
-        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function () {
+        $this->runWithEnv(['STORAGE_TYPE' => 'local_secure'], function () {
             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3');
             $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure');
         });
@@ -24,7 +24,7 @@ public function test_filesystem_images_falls_back_to_storage_type_var()
 
     public function test_filesystem_attachments_falls_back_to_storage_type_var()
     {
-        $this->runWithEnv('STORAGE_TYPE', 'local_secure', function () {
+        $this->runWithEnv(['STORAGE_TYPE' => 'local_secure'], function () {
             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3');
             $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure');
         });
@@ -114,7 +114,7 @@ public function test_mail_disable_ssl_verification_alters_mailer()
         $this->assertEmpty($getStreamOptions());
 
 
-        $this->runWithEnv('MAIL_VERIFY_SSL', 'false', function () use ($getStreamOptions) {
+        $this->runWithEnv(['MAIL_VERIFY_SSL' => 'false'], function () use ($getStreamOptions) {
             $options = $getStreamOptions();
             $this->assertArrayHasKey('ssl', $options);
             $this->assertFalse($options['ssl']['verify_peer']);
@@ -124,9 +124,9 @@ public function test_mail_disable_ssl_verification_alters_mailer()
 
     public function test_non_null_mail_encryption_options_enforce_smtp_scheme()
     {
-        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'tls', 'mail.mailers.smtp.tls_required', true);
-        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'ssl', 'mail.mailers.smtp.tls_required', true);
-        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'null', 'mail.mailers.smtp.tls_required', false);
+        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'tls', 'mail.mailers.smtp.require_tls', true);
+        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'ssl', 'mail.mailers.smtp.require_tls', true);
+        $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'null', 'mail.mailers.smtp.require_tls', false);
     }
 
     public function test_smtp_scheme_and_certain_port_forces_tls_usage()
@@ -135,29 +135,18 @@ public function test_smtp_scheme_and_certain_port_forces_tls_usage()
             /** @var EsmtpTransport $transport */
             $transport = Mail::mailer('smtp')->getSymfonyTransport();
             Mail::purge('smtp');
-            return $transport->getTlsRequirement();
+            return $transport->isTlsRequired();
         };
 
-        config()->set([
-            'mail.mailers.smtp.tls_required' => null,
-            'mail.mailers.smtp.port' => 587,
-        ]);
-
-        $this->assertFalse($isMailTlsRequired());
-
-        config()->set([
-            'mail.mailers.smtp.tls_required' => 'tls',
-            'mail.mailers.smtp.port' => 587,
-        ]);
-
-        $this->assertTrue($isMailTlsRequired());
-
-        config()->set([
-            'mail.mailers.smtp.tls_required' => null,
-            'mail.mailers.smtp.port' => 465,
-        ]);
+        $runTest = function (string $tlsOption, int $port, bool $expectedResult) use ($isMailTlsRequired) {
+            $this->runWithEnv(['MAIL_ENCRYPTION' => $tlsOption, 'MAIL_PORT' => $port], function () use ($isMailTlsRequired, $port, $expectedResult) {
+                $this->assertEquals($expectedResult, $isMailTlsRequired());
+            });
+        };
 
-        $this->assertTrue($isMailTlsRequired());
+        $runTest('null', 587, false);
+        $runTest('tls', 587, true);
+        $runTest('null', 465, true);
     }
 
     public function test_mysql_host_parsed_as_expected()
@@ -174,7 +163,7 @@ public function test_mysql_host_parsed_as_expected()
         ];
 
         foreach ($cases as $host => [$expectedHost, $expectedPort]) {
-            $this->runWithEnv("DB_HOST", $host, function () use ($expectedHost, $expectedPort) {
+            $this->runWithEnv(["DB_HOST" => $host], function () use ($expectedHost, $expectedPort) {
                 $this->assertEquals($expectedHost, config("database.connections.mysql.host"));
                 $this->assertEquals($expectedPort, config("database.connections.mysql.port"));
             }, false);
@@ -185,12 +174,10 @@ public function test_mysql_host_parsed_as_expected()
      * Set an environment variable of the given name and value
      * then check the given config key to see if it matches the given result.
      * Providing a null $envVal clears the variable.
-     *
-     * @param mixed $expectedResult
      */
-    protected function checkEnvConfigResult(string $envName, ?string $envVal, string $configKey, $expectedResult)
+    protected function checkEnvConfigResult(string $envName, ?string $envVal, string $configKey, mixed $expectedResult): void
     {
-        $this->runWithEnv($envName, $envVal, function () use ($configKey, $expectedResult) {
+        $this->runWithEnv([$envName => $envVal], function () use ($configKey, $expectedResult) {
             $this->assertEquals($expectedResult, config($configKey));
         });
     }
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
index c1e133804df..c1a4d4f1c27 100644
--- a/tests/UrlTest.php
+++ b/tests/UrlTest.php
@@ -8,14 +8,14 @@ class UrlTest extends TestCase
 {
     public function test_url_helper_takes_custom_url_into_account()
     {
-        $this->runWithEnv('APP_URL', 'http://example.com/bookstack', function () {
+        $this->runWithEnv(['APP_URL' => 'http://example.com/bookstack'], function () {
             $this->assertEquals('http://example.com/bookstack/books', url('/books'));
         });
     }
 
     public function test_url_helper_sets_correct_scheme_even_when_request_scheme_is_different()
     {
-        $this->runWithEnv('APP_URL', 'https://example.com/', function () {
+        $this->runWithEnv(['APP_URL' => 'https://example.com/'], function () {
             $this->get('http://example.com/login')->assertSee('https://example.com/dist/styles.css');
         });
     }

From d15eb129b0a372181ec77e9f7c3897e80a525613 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Jul 2025 09:54:49 +0100
Subject: [PATCH 597/666] API: Initial review pass of zip import/export
 endpoints

Review of #5592
---
 .../Controllers/BookExportApiController.php   |  8 +-
 .../ChapterExportApiController.php            |  5 +-
 .../Controllers/ImportApiController.php       | 92 +++++++++----------
 .../Controllers/PageExportApiController.php   |  7 +-
 routes/api.php                                | 12 +--
 5 files changed, 55 insertions(+), 69 deletions(-)

diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index 431afef143d..e2d0addc30c 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -65,18 +65,14 @@ public function exportMarkdown(int $id)
         return $this->download()->directly($markdown, $book->slug . '.md');
     }
 
-    
     /**
      * Export a book to a contained ZIP export file.
-     * @throws NotFoundException
      */
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
         $book = $this->queries->findVisibleByIdOrFail($id);
-        $bookName= $book->getShortName();
-     
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $bookName . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $book->slug . '.zip', true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index 58df4c9b087..66e2276b5ce 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -68,9 +68,8 @@ public function exportMarkdown(int $id)
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
         $chapter = $this->queries->findVisibleByIdOrFail($id);
-        $chapterName= $chapter->getShortName();
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapterName . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $chapter->slug . '.zip', true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.php
index 682d340b3b4..13bc9d83ea5 100644
--- a/app/Exports/Controllers/ImportApiController.php
+++ b/app/Exports/Controllers/ImportApiController.php
@@ -7,12 +7,13 @@
 use BookStack\Exceptions\ZipImportException;
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ImportRepo;
-use BookStack\Http\Controller;
+use BookStack\Http\ApiController;
 use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
 
-class ImportApiController extends Controller
+class ImportApiController extends ApiController
 {
     public function __construct(
         protected ImportRepo $imports,
@@ -21,101 +22,94 @@ public function __construct(
     }
 
     /**
-     * List existing imports visible to the user.
+     * List existing ZIP imports visible to the user.
      */
     public function list(): JsonResponse
     {
-        $imports = $this->imports->getVisibleImports();
+        $imports = $this->imports->getVisibleImports()->all();
 
-        return response()->json([
-            'status' => 'success',
-            'imports' => $imports,
-        ]);
+        return response()->json($imports);
     }
 
     /**
-     * Upload, validate and store an import file.
+     * Upload, validate and store a ZIP import file.
+     * This does not run the import. That is performed via a separate endpoint.
      */
     public function upload(Request $request): JsonResponse
     {
-        $this->validate($request, [
-            'file' => ['required', ...AttachmentService::getFileValidationRules()]
-        ]);
+        $this->validate($request, $this->rules()['upload']);
 
         $file = $request->file('file');
 
         try {
             $import = $this->imports->storeFromUpload($file);
         } catch (ZipValidationException $exception) {
-            return response()->json([
-                'status' => 'error',
-                'message' => 'Validation failed',
-                'errors' => $exception->errors,
-            ], 422);
+            $message = "ZIP upload failed with the following validation errors: \n" . implode("\n", $exception->errors);
+            return $this->jsonError($message, 422);
         }
 
-        return response()->json([
-            'status' => 'success',
-            'import' => $import,
-        ], 201);
+        return response()->json($import);
     }
 
     /**
-     * Show details of a pending import.
+     * Read details of a pending ZIP import.
      */
     public function read(int $id): JsonResponse
     {
         $import = $this->imports->findVisible($id);
 
-        return response()->json([
-            'status' => 'success',
-            'import' => $import,
-            'data' => $import->decodeMetadata(),
-        ]);
+        return response()->json($import);
     }
 
     /**
-     * Run the import process.
+     * Run the import process for an uploaded ZIP import.
+     * The parent_id and parent_type parameters are required when the import type is 'chapter' or 'page'.
+     * On success, returns the imported item.
      */
-    public function create(int $id, Request $request): JsonResponse
+    public function run(int $id, Request $request): JsonResponse
     {
         $import = $this->imports->findVisible($id);
         $parent = null;
+        $rules = $this->rules()['run'];
 
         if ($import->type === 'page' || $import->type === 'chapter') {
-            $data = $this->validate($request, [
-                'parent' => ['required', 'string'],
-            ]);
-            $parent = $data['parent'];
+            $rules['parent_type'][] = 'required';
+            $rules['parent_id'][] = 'required';
+            $data = $this->validate($request, $rules);
+            $parent = "{$data['parent_type']}:{$data['parent_id']}";
         }
 
         try {
             $entity = $this->imports->runImport($import, $parent);
         } catch (ZipImportException $exception) {
-            return response()->json([
-                'status' => 'error',
-                'message' => 'Import failed',
-                'errors' => $exception->errors,
-            ], 500);
+            $message = "ZIP import failed with the following errors: \n" . implode("\n", $exception->errors);
+            return $this->jsonError($message);
         }
 
-        return response()->json([
-            'status' => 'success',
-            'entity' => $entity,
-        ]);
+        return response()->json($entity);
     }
 
     /**
-     * Delete a pending import.
+     * Delete a pending ZIP import.
      */
-    public function delete(int $id): JsonResponse
+    public function delete(int $id): Response
     {
         $import = $this->imports->findVisible($id);
         $this->imports->deleteImport($import);
 
-        return response()->json([
-            'status' => 'success',
-            'message' => 'Import deleted successfully',
-        ]);
+        return response('', 204);
     }
-}
\ No newline at end of file
+
+    protected function rules(): array
+    {
+        return [
+            'upload' => [
+                'file' => ['required', ...AttachmentService::getFileValidationRules()],
+            ],
+            'run' => [
+                'parent_type' => ['string', 'in:book,chapter'],
+                'parent_id' => ['int'],
+            ],
+        ];
+    }
+}
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index ef564da3e5c..d6412614c45 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -65,14 +65,11 @@ public function exportMarkdown(int $id)
         return $this->download()->directly($markdown, $page->slug . '.md');
     }
 
-
-
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
         $page = $this->queries->findVisibleByIdOrFail($id);
-        $pageSlug = $page->slug;
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', filesize($zip), true);
+        return $this->download()->streamedFileDirectly($zip, $page->slug . '.zip', true);
     }
-}
\ No newline at end of file
+}
diff --git a/routes/api.php b/routes/api.php
index 5bdf5361130..efb7b258c6f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -88,6 +88,12 @@
 Route::put('roles/{id}', [RoleApiController::class, 'update']);
 Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
 
+Route::get('import', [ExportControllers\ImportApiController::class, 'list']);
+Route::post('import', [ExportControllers\ImportApiController::class, 'upload']);
+Route::get('import/{id}', [ExportControllers\ImportApiController::class, 'read']);
+Route::post('import/{id}', [ExportControllers\ImportApiController::class, 'run']);
+Route::delete('import/{id}', [ExportControllers\ImportApiController::class, 'delete']);
+
 Route::get('recycle-bin', [EntityControllers\RecycleBinApiController::class, 'list']);
 Route::put('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'restore']);
 Route::delete('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'destroy']);
@@ -98,9 +104,3 @@
 Route::get('audit-log', [AuditLogApiController::class, 'list']);
 
 Route::get('system', [SystemApiController::class, 'read']);
-
-Route::get('import', [ExportControllers\ImportApiController::class, 'list']);
-Route::post('import', [ExportControllers\ImportApiController::class, 'upload']);
-Route::get('import/{id}', [ExportControllers\ImportApiController::class, 'read']);
-Route::post('import/{id}/create', [ExportControllers\ImportApiController::class, 'create']);
-Route::delete('import/{id}', [ExportControllers\ImportApiController::class, 'destroy']);
\ No newline at end of file

From d55684531f56fc1f029aeb473b9bccee8edc841e Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Jul 2025 10:58:10 +0100
Subject: [PATCH 598/666] API: Added zip export tests, reorganised tests

Extracted an extra method into helper for reuse.
---
 tests/Api/BooksApiTest.php      |  58 ---------
 tests/Api/ChaptersApiTest.php   |  57 ---------
 tests/Api/ExportsApiTest.php    | 210 ++++++++++++++++++++++++++++++++
 tests/Api/PagesApiTest.php      |  56 ---------
 tests/Exports/ZipExportTest.php |  64 +++-------
 tests/Exports/ZipTestHelper.php |  27 ++++
 6 files changed, 256 insertions(+), 216 deletions(-)
 create mode 100644 tests/Api/ExportsApiTest.php

diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index 084cb59bd5c..22ccfb482c9 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -287,62 +287,4 @@ public function test_delete_endpoint()
         $resp->assertStatus(204);
         $this->assertActivityExists('book_delete');
     }
-
-    public function test_export_html_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $book = $this->entities->book();
-
-        $resp = $this->get($this->baseEndpoint . "/{$book->id}/export/html");
-        $resp->assertStatus(200);
-        $resp->assertSee($book->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
-    }
-
-    public function test_export_plain_text_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $book = $this->entities->book();
-
-        $resp = $this->get($this->baseEndpoint . "/{$book->id}/export/plaintext");
-        $resp->assertStatus(200);
-        $resp->assertSee($book->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
-    }
-
-    public function test_export_pdf_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $book = $this->entities->book();
-
-        $resp = $this->get($this->baseEndpoint . "/{$book->id}/export/pdf");
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
-    }
-
-    public function test_export_markdown_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $book = Book::visible()->has('pages')->has('chapters')->first();
-
-        $resp = $this->get($this->baseEndpoint . "/{$book->id}/export/markdown");
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.md"');
-        $resp->assertSee('# ' . $book->name);
-        $resp->assertSee('# ' . $book->pages()->first()->name);
-        $resp->assertSee('# ' . $book->chapters()->first()->name);
-    }
-
-    public function test_cant_export_when_not_have_permission()
-    {
-        $types = ['html', 'plaintext', 'pdf', 'markdown'];
-        $this->actingAsApiEditor();
-        $this->permissions->removeUserRolePermissions($this->users->editor(), ['content-export']);
-
-        $book = $this->entities->book();
-        foreach ($types as $type) {
-            $resp = $this->get($this->baseEndpoint . "/{$book->id}/export/{$type}");
-            $this->assertPermissionError($resp);
-        }
-    }
 }
diff --git a/tests/Api/ChaptersApiTest.php b/tests/Api/ChaptersApiTest.php
index 9698d4dd9c2..5d7b0530891 100644
--- a/tests/Api/ChaptersApiTest.php
+++ b/tests/Api/ChaptersApiTest.php
@@ -269,61 +269,4 @@ public function test_delete_endpoint()
         $resp->assertStatus(204);
         $this->assertActivityExists('chapter_delete');
     }
-
-    public function test_export_html_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $chapter = $this->entities->chapter();
-
-        $resp = $this->get($this->baseEndpoint . "/{$chapter->id}/export/html");
-        $resp->assertStatus(200);
-        $resp->assertSee($chapter->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
-    }
-
-    public function test_export_plain_text_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $chapter = $this->entities->chapter();
-
-        $resp = $this->get($this->baseEndpoint . "/{$chapter->id}/export/plaintext");
-        $resp->assertStatus(200);
-        $resp->assertSee($chapter->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
-    }
-
-    public function test_export_pdf_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $chapter = $this->entities->chapter();
-
-        $resp = $this->get($this->baseEndpoint . "/{$chapter->id}/export/pdf");
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
-    }
-
-    public function test_export_markdown_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $chapter = Chapter::visible()->has('pages')->first();
-
-        $resp = $this->get($this->baseEndpoint . "/{$chapter->id}/export/markdown");
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.md"');
-        $resp->assertSee('# ' . $chapter->name);
-        $resp->assertSee('# ' . $chapter->pages()->first()->name);
-    }
-
-    public function test_cant_export_when_not_have_permission()
-    {
-        $types = ['html', 'plaintext', 'pdf', 'markdown'];
-        $this->actingAsApiEditor();
-        $this->permissions->removeUserRolePermissions($this->users->editor(), ['content-export']);
-
-        $chapter = Chapter::visible()->has('pages')->first();
-        foreach ($types as $type) {
-            $resp = $this->get($this->baseEndpoint . "/{$chapter->id}/export/{$type}");
-            $this->assertPermissionError($resp);
-        }
-    }
 }
diff --git a/tests/Api/ExportsApiTest.php b/tests/Api/ExportsApiTest.php
new file mode 100644
index 00000000000..d427c1a4da5
--- /dev/null
+++ b/tests/Api/ExportsApiTest.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace Api;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use Tests\Api\TestsApi;
+use Tests\Exports\ZipTestHelper;
+use Tests\TestCase;
+
+class ExportsApiTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_book_html_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+
+        $resp = $this->get("/api/books/{$book->id}/export/html");
+        $resp->assertStatus(200);
+        $resp->assertSee($book->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
+    }
+
+    public function test_book_plain_text_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+
+        $resp = $this->get("/api/books/{$book->id}/export/plaintext");
+        $resp->assertStatus(200);
+        $resp->assertSee($book->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
+    }
+
+    public function test_book_pdf_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+
+        $resp = $this->get("/api/books/{$book->id}/export/pdf");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
+    }
+
+    public function test_book_markdown_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $book = Book::visible()->has('pages')->has('chapters')->first();
+
+        $resp = $this->get("/api/books/{$book->id}/export/markdown");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.md"');
+        $resp->assertSee('# ' . $book->name);
+        $resp->assertSee('# ' . $book->pages()->first()->name);
+        $resp->assertSee('# ' . $book->chapters()->first()->name);
+    }
+
+    public function test_book_zip_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $book = Book::visible()->has('pages')->has('chapters')->first();
+
+        $resp = $this->get("/api/books/{$book->id}/export/zip");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.zip"');
+
+        $zip = ZipTestHelper::extractFromZipResponse($resp);
+        $this->assertArrayHasKey('book', $zip->data);
+    }
+
+    public function test_chapter_html_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $chapter = $this->entities->chapter();
+
+        $resp = $this->get("/api/chapters/{$chapter->id}/export/html");
+        $resp->assertStatus(200);
+        $resp->assertSee($chapter->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
+    }
+
+    public function test_chapter_plain_text_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $chapter = $this->entities->chapter();
+
+        $resp = $this->get("/api/chapters/{$chapter->id}/export/plaintext");
+        $resp->assertStatus(200);
+        $resp->assertSee($chapter->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
+    }
+
+    public function test_chapter_pdf_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $chapter = $this->entities->chapter();
+
+        $resp = $this->get("/api/chapters/{$chapter->id}/export/pdf");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
+    }
+
+    public function test_chapter_markdown_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $chapter = Chapter::visible()->has('pages')->first();
+
+        $resp = $this->get("/api/chapters/{$chapter->id}/export/markdown");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.md"');
+        $resp->assertSee('# ' . $chapter->name);
+        $resp->assertSee('# ' . $chapter->pages()->first()->name);
+    }
+
+    public function test_chapter_zip_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $chapter = Chapter::visible()->has('pages')->first();
+
+        $resp = $this->get("/api/chapters/{$chapter->id}/export/zip");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.zip"');
+
+        $zip = ZipTestHelper::extractFromZipResponse($resp);
+        $this->assertArrayHasKey('chapter', $zip->data);
+    }
+
+    public function test_page_html_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+
+        $resp = $this->get("/api/pages/{$page->id}/export/html");
+        $resp->assertStatus(200);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
+    }
+
+    public function test_page_plain_text_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+
+        $resp = $this->get("/api/pages/{$page->id}/export/plaintext");
+        $resp->assertStatus(200);
+        $resp->assertSee($page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
+    }
+
+    public function test_page_pdf_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+
+        $resp = $this->get("/api/pages/{$page->id}/export/pdf");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
+    }
+
+    public function test_page_markdown_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+
+        $resp = $this->get("/api/pages/{$page->id}/export/markdown");
+        $resp->assertStatus(200);
+        $resp->assertSee('# ' . $page->name);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
+    }
+
+    public function test_page_zip_endpoint()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+
+        $resp = $this->get("/api/pages/{$page->id}/export/zip");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.zip"');
+
+        $zip = ZipTestHelper::extractFromZipResponse($resp);
+        $this->assertArrayHasKey('page', $zip->data);
+    }
+
+    public function test_cant_export_when_not_have_permission()
+    {
+        $types = ['html', 'plaintext', 'pdf', 'markdown', 'zip'];
+        $this->actingAsApiEditor();
+        $this->permissions->removeUserRolePermissions($this->users->editor(), ['content-export']);
+
+        $book = $this->entities->book();
+        foreach ($types as $type) {
+            $resp = $this->get("/api/books/{$book->id}/export/{$type}");
+            $this->assertPermissionError($resp);
+        }
+
+        $chapter = Chapter::visible()->has('pages')->first();
+        foreach ($types as $type) {
+            $resp = $this->get("/api/chapters/{$chapter->id}/export/{$type}");
+            $this->assertPermissionError($resp);
+        }
+
+        $page = $this->entities->page();
+        foreach ($types as $type) {
+            $resp = $this->get("/api/pages/{$page->id}/export/{$type}");
+            $this->assertPermissionError($resp);
+        }
+    }
+}
diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php
index 22659d5bb72..ced8954eb11 100644
--- a/tests/Api/PagesApiTest.php
+++ b/tests/Api/PagesApiTest.php
@@ -308,60 +308,4 @@ public function test_delete_endpoint()
         $resp->assertStatus(204);
         $this->assertActivityExists('page_delete', $page);
     }
-
-    public function test_export_html_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $page = $this->entities->page();
-
-        $resp = $this->get($this->baseEndpoint . "/{$page->id}/export/html");
-        $resp->assertStatus(200);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
-    }
-
-    public function test_export_plain_text_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $page = $this->entities->page();
-
-        $resp = $this->get($this->baseEndpoint . "/{$page->id}/export/plaintext");
-        $resp->assertStatus(200);
-        $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
-    }
-
-    public function test_export_pdf_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $page = $this->entities->page();
-
-        $resp = $this->get($this->baseEndpoint . "/{$page->id}/export/pdf");
-        $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
-    }
-
-    public function test_export_markdown_endpoint()
-    {
-        $this->actingAsApiEditor();
-        $page = $this->entities->page();
-
-        $resp = $this->get($this->baseEndpoint . "/{$page->id}/export/markdown");
-        $resp->assertStatus(200);
-        $resp->assertSee('# ' . $page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
-    }
-
-    public function test_cant_export_when_not_have_permission()
-    {
-        $types = ['html', 'plaintext', 'pdf', 'markdown'];
-        $this->actingAsApiEditor();
-        $this->permissions->removeUserRolePermissions($this->users->editor(), ['content-export']);
-
-        $page = $this->entities->page();
-        foreach ($types as $type) {
-            $resp = $this->get($this->baseEndpoint . "/{$page->id}/export/{$type}");
-            $this->assertPermissionError($resp);
-        }
-    }
 }
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 1434c013f73..1310dcc2456 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -41,7 +41,7 @@ public function test_export_metadata()
     {
         $page = $this->entities->page();
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $this->assertEquals($page->id, $zip->data['page']['id'] ?? null);
         $this->assertArrayNotHasKey('book', $zip->data);
@@ -83,7 +83,7 @@ public function test_page_export()
     {
         $page = $this->entities->page();
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $pageData = $zip->data['page'];
         $this->assertEquals([
@@ -105,7 +105,7 @@ public function test_page_export_with_markdown()
         $page->save();
 
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $pageData = $zip->data['page'];
         $this->assertEquals($markdown, $pageData['markdown']);
@@ -121,7 +121,7 @@ public function test_page_export_with_tags()
         ]);
 
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $pageData = $zip->data['page'];
         $this->assertEquals([
@@ -147,7 +147,7 @@ public function test_page_export_with_images()
         $image = Image::findOrFail($result['response']->id);
 
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $pageData = $zip->data['page'];
 
         $this->assertCount(1, $pageData['images']);
@@ -173,7 +173,7 @@ public function test_page_export_file_attachments()
         $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'PageAttachmentExport.txt', $contents, 'text/plain');
 
         $zipResp = $this->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $pageData = $zip->data['page'];
         $this->assertCount(1, $pageData['attachments']);
@@ -203,7 +203,7 @@ public function test_page_export_link_attachments()
         ]);
 
         $zipResp = $this->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $pageData = $zip->data['page'];
         $this->assertCount(1, $pageData['attachments']);
@@ -221,7 +221,7 @@ public function test_book_export()
         $book->tags()->saveMany(Tag::factory()->count(2)->make());
 
         $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $this->assertArrayHasKey('book', $zip->data);
 
         $bookData = $zip->data['book'];
@@ -243,7 +243,7 @@ public function test_book_export_with_cover_image()
         $coverImage = $book->cover()->first();
 
         $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
 
         $this->assertArrayHasKey('cover', $zip->data['book']);
         $coverRef = $zip->data['book']['cover'];
@@ -258,7 +258,7 @@ public function test_chapter_export()
         $chapter->tags()->saveMany(Tag::factory()->count(2)->make());
 
         $zipResp = $this->asEditor()->get($chapter->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $this->assertArrayHasKey('chapter', $zip->data);
 
         $chapterData = $zip->data['chapter'];
@@ -284,18 +284,18 @@ public function test_draft_pages_are_not_included()
         $page->save();
 
         $zipResp = $this->actingAs($editor)->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $this->assertCount(0, $zip->data['book']['chapters'][0]['pages'] ?? ['cat']);
 
         $zipResp = $this->actingAs($editor)->get($chapter->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $this->assertCount(0, $zip->data['chapter']['pages'] ?? ['cat']);
 
         $page->chapter_id = 0;
         $page->save();
 
         $zipResp = $this->actingAs($editor)->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $this->assertCount(0, $zip->data['book']['pages'] ?? ['cat']);
     }
 
@@ -314,7 +314,7 @@ public function test_cross_reference_links_are_converted()
         $page->save();
 
         $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $bookData = $zip->data['book'];
         $chapterData = $bookData['chapters'][0];
         $pageData = $chapterData['pages'][0];
@@ -342,7 +342,7 @@ public function test_book_and_chapter_description_links_to_images_in_pages_are_c
         $chapter->save();
 
         $zipResp = $this->get($book->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $bookData = $zip->data['book'];
         $chapterData = $bookData['chapters'][0];
 
@@ -367,7 +367,7 @@ public function test_image_links_are_handled_when_using_external_storage_url()
         $page->save();
 
         $zipResp = $this->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $pageData = $zip->data['page'];
 
         $ref = '[[bsexport:image:' . $image->id . ']]';
@@ -381,7 +381,7 @@ public function test_cross_reference_links_external_to_export_are_not_converted(
         $page->save();
 
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $pageData = $zip->data['page'];
 
         $this->assertStringContainsString('href="' . $page->book->getUrl() . '"', $pageData['html']);
@@ -402,7 +402,7 @@ public function test_attachments_links_are_converted()
         $page->save();
 
         $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $pageData = $zip->data['page'];
 
         $this->assertStringContainsString('href="[[bsexport:attachment:' . $attachment->id . ']]?open=true"', $pageData['html']);
@@ -417,7 +417,7 @@ public function test_links_in_markdown_are_parsed()
         $page->save();
 
         $zipResp = $this->asEditor()->get($chapter->getUrl("/export/zip"));
-        $zip = $this->extractZipResponse($zipResp);
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
         $pageData = $zip->data['chapter']['pages'][0];
 
         $this->assertStringContainsString("[Link to chapter]([[bsexport:chapter:{$chapter->id}]])", $pageData['markdown']);
@@ -444,30 +444,4 @@ public function test_exports_rate_limited_higher_for_logged_in_viewers()
         }
         $this->get($page->getUrl("/export/zip"))->assertStatus(429);
     }
-
-    protected function extractZipResponse(TestResponse $response): ZipResultData
-    {
-        $zipData = $response->streamedContent();
-        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
-
-        file_put_contents($zipFile, $zipData);
-        $extractDir = tempnam(sys_get_temp_dir(), 'bstestextracted-');
-        if (file_exists($extractDir)) {
-            unlink($extractDir);
-        }
-        mkdir($extractDir);
-
-        $zip = new ZipArchive();
-        $zip->open($zipFile, ZipArchive::RDONLY);
-        $zip->extractTo($extractDir);
-
-        $dataJson = file_get_contents($extractDir . DIRECTORY_SEPARATOR . "data.json");
-        $data = json_decode($dataJson, true);
-
-        return new ZipResultData(
-            $zipFile,
-            $extractDir,
-            $data,
-        );
-    }
 }
diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
index d830d8eb6bf..50517a87d02 100644
--- a/tests/Exports/ZipTestHelper.php
+++ b/tests/Exports/ZipTestHelper.php
@@ -4,6 +4,7 @@
 
 use BookStack\Exports\Import;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Testing\TestResponse;
 use ZipArchive;
 
 class ZipTestHelper
@@ -56,4 +57,30 @@ public static function zipUploadFromData(array $data, array $files = []): Upload
 
         return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
     }
+
+    public static function extractFromZipResponse(TestResponse $response): ZipResultData
+    {
+        $zipData = $response->streamedContent();
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+
+        file_put_contents($zipFile, $zipData);
+        $extractDir = tempnam(sys_get_temp_dir(), 'bstestextracted-');
+        if (file_exists($extractDir)) {
+            unlink($extractDir);
+        }
+        mkdir($extractDir);
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::RDONLY);
+        $zip->extractTo($extractDir);
+
+        $dataJson = file_get_contents($extractDir . DIRECTORY_SEPARATOR . "data.json");
+        $data = json_decode($dataJson, true);
+
+        return new ZipResultData(
+            $zipFile,
+            $extractDir,
+            $data,
+        );
+    }
 }

From 73025719a4bc06457de1d753aa6e6fefd0ba8777 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Jul 2025 14:05:32 +0100
Subject: [PATCH 599/666] ZIP Imports: Added API test cases

---
 .../Controllers/ImportApiController.php       |  27 ++-
 app/Exports/Import.php                        |   2 +
 app/Exports/ImportRepo.php                    |   8 +-
 app/Http/ApiController.php                    |   2 +-
 database/factories/Exports/ImportFactory.php  |   1 +
 routes/api.php                                |  10 +-
 tests/Api/ImportsApiTest.php                  | 175 ++++++++++++++++++
 7 files changed, 214 insertions(+), 11 deletions(-)
 create mode 100644 tests/Api/ImportsApiTest.php

diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.php
index 13bc9d83ea5..0749ff9330a 100644
--- a/app/Exports/Controllers/ImportApiController.php
+++ b/app/Exports/Controllers/ImportApiController.php
@@ -26,9 +26,11 @@ public function __construct(
      */
     public function list(): JsonResponse
     {
-        $imports = $this->imports->getVisibleImports()->all();
+        $query = $this->imports->queryVisible();
 
-        return response()->json($imports);
+        return $this->apiListingResponse($query, [
+            'id', 'name', 'size', 'type', 'created_by', 'created_at', 'updated_at'
+        ]);
     }
 
     /**
@@ -44,7 +46,7 @@ public function upload(Request $request): JsonResponse
         try {
             $import = $this->imports->storeFromUpload($file);
         } catch (ZipValidationException $exception) {
-            $message = "ZIP upload failed with the following validation errors: \n" . implode("\n", $exception->errors);
+            $message = "ZIP upload failed with the following validation errors: \n" . $this->formatErrors($exception->errors);
             return $this->jsonError($message, 422);
         }
 
@@ -53,11 +55,15 @@ public function upload(Request $request): JsonResponse
 
     /**
      * Read details of a pending ZIP import.
+     * The "details" property contains high-level metadata regarding the ZIP import content,
+     * and the structure of this will change depending on import "type".
      */
     public function read(int $id): JsonResponse
     {
         $import = $this->imports->findVisible($id);
 
+        $import->setAttribute('details', $import->decodeMetadata());
+
         return response()->json($import);
     }
 
@@ -82,7 +88,7 @@ public function run(int $id, Request $request): JsonResponse
         try {
             $entity = $this->imports->runImport($import, $parent);
         } catch (ZipImportException $exception) {
-            $message = "ZIP import failed with the following errors: \n" . implode("\n", $exception->errors);
+            $message = "ZIP import failed with the following errors: \n" . $this->formatErrors($exception->errors);
             return $this->jsonError($message);
         }
 
@@ -112,4 +118,17 @@ protected function rules(): array
             ],
         ];
     }
+
+    protected function formatErrors(array $errors): string
+    {
+        $parts = [];
+        foreach ($errors as $key => $error) {
+            if (is_string($key)) {
+                $parts[] = "[{$key}] {$error}";
+            } else {
+                $parts[] = $error;
+            }
+        }
+        return implode("\n", $parts);
+    }
 }
diff --git a/app/Exports/Import.php b/app/Exports/Import.php
index 9c1771c468f..ca4f529815f 100644
--- a/app/Exports/Import.php
+++ b/app/Exports/Import.php
@@ -28,6 +28,8 @@ class Import extends Model implements Loggable
 {
     use HasFactory;
 
+    protected $hidden = ['metadata'];
+
     public function getSizeString(): string
     {
         $mb = round($this->size / 1000000, 2);
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index f72386c47bc..e030a88d261 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -17,6 +17,7 @@
 use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\FileStorage;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -34,6 +35,11 @@ public function __construct(
      * @return Collection<Import>
      */
     public function getVisibleImports(): Collection
+    {
+        return $this->queryVisible()->get();
+    }
+
+    public function queryVisible(): Builder
     {
         $query = Import::query();
 
@@ -41,7 +47,7 @@ public function getVisibleImports(): Collection
             $query->where('created_by', user()->id);
         }
 
-        return $query->get();
+        return $query;
     }
 
     public function findVisible(int $id): Import
diff --git a/app/Http/ApiController.php b/app/Http/ApiController.php
index c0dbe2fca4a..1a92afa3380 100644
--- a/app/Http/ApiController.php
+++ b/app/Http/ApiController.php
@@ -8,7 +8,7 @@
 
 abstract class ApiController extends Controller
 {
-    protected $rules = [];
+    protected array $rules = [];
 
     /**
      * Provide a paginated listing JSON response in a standard format
diff --git a/database/factories/Exports/ImportFactory.php b/database/factories/Exports/ImportFactory.php
index 5d0b4f89299..cdb019dd362 100644
--- a/database/factories/Exports/ImportFactory.php
+++ b/database/factories/Exports/ImportFactory.php
@@ -24,6 +24,7 @@ public function definition(): array
             'path' => 'uploads/files/imports/' . Str::random(10) . '.zip',
             'name' => $this->faker->words(3, true),
             'type' => 'book',
+            'size' => rand(1, 1001),
             'metadata' => '{"name": "My book"}',
             'created_at' => User::factory(),
         ];
diff --git a/routes/api.php b/routes/api.php
index efb7b258c6f..98af4bb2616 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -88,11 +88,11 @@
 Route::put('roles/{id}', [RoleApiController::class, 'update']);
 Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
 
-Route::get('import', [ExportControllers\ImportApiController::class, 'list']);
-Route::post('import', [ExportControllers\ImportApiController::class, 'upload']);
-Route::get('import/{id}', [ExportControllers\ImportApiController::class, 'read']);
-Route::post('import/{id}', [ExportControllers\ImportApiController::class, 'run']);
-Route::delete('import/{id}', [ExportControllers\ImportApiController::class, 'delete']);
+Route::get('imports', [ExportControllers\ImportApiController::class, 'list']);
+Route::post('imports', [ExportControllers\ImportApiController::class, 'upload']);
+Route::get('imports/{id}', [ExportControllers\ImportApiController::class, 'read']);
+Route::post('imports/{id}', [ExportControllers\ImportApiController::class, 'run']);
+Route::delete('imports/{id}', [ExportControllers\ImportApiController::class, 'delete']);
 
 Route::get('recycle-bin', [EntityControllers\RecycleBinApiController::class, 'list']);
 Route::put('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'restore']);
diff --git a/tests/Api/ImportsApiTest.php b/tests/Api/ImportsApiTest.php
new file mode 100644
index 00000000000..523034324fc
--- /dev/null
+++ b/tests/Api/ImportsApiTest.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace Api;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Exports\Import;
+use Tests\Api\TestsApi;
+use Tests\Exports\ZipTestHelper;
+use Tests\TestCase;
+
+class ImportsApiTest extends TestCase
+{
+    use TestsApi;
+
+    protected string $baseEndpoint = '/api/imports';
+
+    public function test_upload_and_run(): void
+    {
+        $book = $this->entities->book();
+        $zip = ZipTestHelper::zipUploadFromData([
+            'page' => [
+                'name' => 'My API import page',
+                'tags' => [
+                    [
+                        'name' => 'My api tag',
+                        'value' => 'api test value'
+                    ]
+                ],
+            ],
+        ]);
+
+        $resp = $this->actingAsApiAdmin()->call('POST', $this->baseEndpoint, [], [], ['file' => $zip]);
+        $resp->assertStatus(200);
+
+        $importId = $resp->json('id');
+        $import = Import::query()->findOrFail($importId);
+        $this->assertEquals('page', $import->type);
+
+        $resp = $this->post($this->baseEndpoint . "/{$import->id}", [
+            'parent_type' => 'book',
+            'parent_id' => $book->id,
+        ]);
+        $resp->assertJson([
+            'name' => 'My API import page',
+            'book_id' => $book->id,
+        ]);
+
+        $page = Page::query()->where('name', '=', 'My API import page')->first();
+        $this->assertEquals('My api tag', $page->tags()->first()->name);
+    }
+
+    public function test_upload_validation_error(): void
+    {
+        $zip = ZipTestHelper::zipUploadFromData([
+            'page' => [
+                'tags' => [
+                    [
+                        'name' => 'My api tag',
+                        'value' => 'api test value'
+                    ]
+                ],
+            ],
+        ]);
+
+        $resp = $this->actingAsApiAdmin()->call('POST', $this->baseEndpoint, [], [], ['file' => $zip]);
+        $resp->assertStatus(422);
+        $message = $resp->json('message');
+
+        $this->assertStringContainsString('ZIP upload failed with the following validation errors:', $message);
+        $this->assertStringContainsString('[page.name] The name field is required.', $message);
+    }
+
+    public function test_list(): void
+    {
+        $imports = Import::factory()->count(10)->create();
+
+        $resp = $this->actingAsApiAdmin()->get($this->baseEndpoint);
+        $resp->assertJsonCount(10, 'data');
+        $resp->assertJsonPath('total', 10);
+
+        $firstImport = $imports->first();
+        $resp = $this->actingAsApiAdmin()->get($this->baseEndpoint . '?filter[id]=' . $firstImport->id);
+        $resp->assertJsonCount(1, 'data');
+        $resp->assertJsonPath('data.0.id', $firstImport->id);
+        $resp->assertJsonPath('data.0.name', $firstImport->name);
+        $resp->assertJsonPath('data.0.size', $firstImport->size);
+        $resp->assertJsonPath('data.0.type', $firstImport->type);
+    }
+
+    public function test_list_visibility_limited(): void
+    {
+        $user = $this->users->editor();
+        $admin = $this->users->admin();
+        $userImport = Import::factory()->create(['name' => 'MySuperUserImport', 'created_by' => $user->id]);
+        $adminImport = Import::factory()->create(['name' => 'MySuperAdminImport', 'created_by' => $admin->id]);
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        $resp = $this->actingAsForApi($user)->get($this->baseEndpoint);
+        $resp->assertJsonCount(1, 'data');
+        $resp->assertJsonPath('data.0.name', 'MySuperUserImport');
+
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);
+
+        $resp = $this->actingAsForApi($user)->get($this->baseEndpoint);
+        $resp->assertJsonCount(2, 'data');
+        $resp->assertJsonPath('data.1.name', 'MySuperAdminImport');
+    }
+
+    public function test_read(): void
+    {
+        $zip = ZipTestHelper::zipUploadFromData([
+            'book' => [
+                'name' => 'My API import book',
+                'pages' => [
+                    [
+                        'name' => 'My import page',
+                        'tags' => [
+                            [
+                                'name' => 'My api tag',
+                                'value' => 'api test value'
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+        ]);
+
+        $resp = $this->actingAsApiAdmin()->call('POST', $this->baseEndpoint, [], [], ['file' => $zip]);
+        $resp->assertStatus(200);
+
+        $resp = $this->get($this->baseEndpoint . "/{$resp->json('id')}");
+        $resp->assertStatus(200);
+
+        $resp->assertJsonPath('details.name', 'My API import book');
+        $resp->assertJsonPath('details.pages.0.name', 'My import page');
+        $resp->assertJsonPath('details.pages.0.tags.0.name', 'My api tag');
+        $resp->assertJsonMissingPath('metadata');
+    }
+
+    public function test_delete(): void
+    {
+        $import = Import::factory()->create();
+
+        $resp = $this->actingAsApiAdmin()->delete($this->baseEndpoint . "/{$import->id}");
+        $resp->assertStatus(204);
+    }
+
+    public function test_content_import_permissions_needed(): void
+    {
+        $user = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($user, ['access-api']);
+        $this->actingAsForApi($user);
+        $requests = [
+             ['GET', $this->baseEndpoint],
+             ['POST', $this->baseEndpoint],
+             ['GET', $this->baseEndpoint . "/1"],
+             ['POST', $this->baseEndpoint . "/1"],
+             ['DELETE', $this->baseEndpoint . "/1"],
+        ];
+
+        foreach ($requests as $request) {
+            [$method, $endpoint] = $request;
+            $resp = $this->json($method, $endpoint);
+            $resp->assertStatus(403);
+        }
+
+        $this->permissions->grantUserRolePermissions($user, ['content-import']);
+
+        foreach ($requests as $request) {
+            [$method, $endpoint] = $request;
+            $resp = $this->call($method, $endpoint);
+            $this->assertNotEquals(403, $resp->status(), "A {$method} request to {$endpoint} returned 403");
+        }
+    }
+}

From 32ba3a591f982ddd99aa44e4f67b1ee6e20d91ba Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Jul 2025 16:19:14 +0100
Subject: [PATCH 600/666] ZIP Imports: Added API examples, finished testing

Also updated some types on a couple of controllers.
---
 .../Controllers/ChapterApiController.php      |  3 +-
 .../Controllers/PageApiController.php         |  2 +-
 .../Controllers/ImportApiController.php       | 28 ++++++----
 .../ContentPermissionApiController.php        |  2 +-
 app/Search/SearchApiController.php            |  2 +-
 app/Users/Controllers/RoleApiController.php   |  2 +-
 dev/api/requests/imports-run.json             |  4 ++
 dev/api/responses/imports-create.json         | 10 ++++
 dev/api/responses/imports-list.json           | 23 +++++++++
 dev/api/responses/imports-read.json           | 51 +++++++++++++++++++
 dev/api/responses/imports-run.json            | 14 +++++
 routes/api.php                                |  2 +-
 tests/Api/ImportsApiTest.php                  |  5 +-
 13 files changed, 130 insertions(+), 18 deletions(-)
 create mode 100644 dev/api/requests/imports-run.json
 create mode 100644 dev/api/responses/imports-create.json
 create mode 100644 dev/api/responses/imports-list.json
 create mode 100644 dev/api/responses/imports-read.json
 create mode 100644 dev/api/responses/imports-run.json

diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index 430654330f3..8ac0c7a60a2 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -9,12 +9,11 @@
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
 use Exception;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\Request;
 
 class ChapterApiController extends ApiController
 {
-    protected $rules = [
+    protected array $rules = [
         'create' => [
             'book_id'             => ['required', 'integer'],
             'name'                => ['required', 'string', 'max:255'],
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index 40598e20983..8fcba3dc6a1 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -12,7 +12,7 @@
 
 class PageApiController extends ApiController
 {
-    protected $rules = [
+    protected array $rules = [
         'create' => [
             'book_id'    => ['required_without:chapter_id', 'integer'],
             'chapter_id' => ['required_without:book_id', 'integer'],
diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.php
index 0749ff9330a..cac155c7c1b 100644
--- a/app/Exports/Controllers/ImportApiController.php
+++ b/app/Exports/Controllers/ImportApiController.php
@@ -23,6 +23,7 @@ public function __construct(
 
     /**
      * List existing ZIP imports visible to the user.
+     * Requires permission to import content.
      */
     public function list(): JsonResponse
     {
@@ -34,12 +35,18 @@ public function list(): JsonResponse
     }
 
     /**
-     * Upload, validate and store a ZIP import file.
-     * This does not run the import. That is performed via a separate endpoint.
+     * Start a new import from a ZIP file.
+     * This does not actually run the import since that is performed via the "run" endpoint.
+     * This uploads, validates and stores the ZIP file so it's ready to be imported.
+     *
+     * This "file" parameter must be a BookStack-compatible ZIP file, and this must be
+     * sent via a 'multipart/form-data' type request.
+     *
+     * Requires permission to import content.
      */
-    public function upload(Request $request): JsonResponse
+    public function create(Request $request): JsonResponse
     {
-        $this->validate($request, $this->rules()['upload']);
+        $this->validate($request, $this->rules()['create']);
 
         $file = $request->file('file');
 
@@ -57,6 +64,7 @@ public function upload(Request $request): JsonResponse
      * Read details of a pending ZIP import.
      * The "details" property contains high-level metadata regarding the ZIP import content,
      * and the structure of this will change depending on import "type".
+     * Requires permission to import content.
      */
     public function read(int $id): JsonResponse
     {
@@ -69,8 +77,9 @@ public function read(int $id): JsonResponse
 
     /**
      * Run the import process for an uploaded ZIP import.
-     * The parent_id and parent_type parameters are required when the import type is 'chapter' or 'page'.
-     * On success, returns the imported item.
+     * The "parent_id" and "parent_type" parameters are required when the import type is "chapter" or "page".
+     * On success, this endpoint returns the imported item.
+     * Requires permission to import content.
      */
     public function run(int $id, Request $request): JsonResponse
     {
@@ -92,11 +101,12 @@ public function run(int $id, Request $request): JsonResponse
             return $this->jsonError($message);
         }
 
-        return response()->json($entity);
+        return response()->json($entity->withoutRelations());
     }
 
     /**
-     * Delete a pending ZIP import.
+     * Delete a pending ZIP import from the system.
+     * Requires permission to import content.
      */
     public function delete(int $id): Response
     {
@@ -109,7 +119,7 @@ public function delete(int $id): Response
     protected function rules(): array
     {
         return [
-            'upload' => [
+            'create' => [
                 'file' => ['required', ...AttachmentService::getFileValidationRules()],
             ],
             'run' => [
diff --git a/app/Permissions/ContentPermissionApiController.php b/app/Permissions/ContentPermissionApiController.php
index 23b75db359a..bddbc2c7d95 100644
--- a/app/Permissions/ContentPermissionApiController.php
+++ b/app/Permissions/ContentPermissionApiController.php
@@ -16,7 +16,7 @@ public function __construct(
     ) {
     }
 
-    protected $rules = [
+    protected array $rules = [
         'update' => [
             'owner_id'  => ['int'],
 
diff --git a/app/Search/SearchApiController.php b/app/Search/SearchApiController.php
index 79cd8cfabd0..cd4a14a3931 100644
--- a/app/Search/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -9,7 +9,7 @@
 
 class SearchApiController extends ApiController
 {
-    protected $rules = [
+    protected array $rules = [
         'all' => [
             'query' => ['required'],
             'page'  => ['integer', 'min:1'],
diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 2e96602faae..2f3638cd3e2 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -16,7 +16,7 @@ class RoleApiController extends ApiController
         'display_name', 'description', 'mfa_enforced', 'external_auth_id', 'created_at', 'updated_at',
     ];
 
-    protected $rules = [
+    protected array $rules = [
         'create' => [
             'display_name'  => ['required', 'string', 'min:3', 'max:180'],
             'description'   => ['string', 'max:180'],
diff --git a/dev/api/requests/imports-run.json b/dev/api/requests/imports-run.json
new file mode 100644
index 00000000000..836a66f3a94
--- /dev/null
+++ b/dev/api/requests/imports-run.json
@@ -0,0 +1,4 @@
+{
+  "parent_type": "book",
+  "parent_id": 28
+}
\ No newline at end of file
diff --git a/dev/api/responses/imports-create.json b/dev/api/responses/imports-create.json
new file mode 100644
index 00000000000..997758799a4
--- /dev/null
+++ b/dev/api/responses/imports-create.json
@@ -0,0 +1,10 @@
+{
+  "type": "chapter",
+  "name": "Pension Providers",
+  "created_by": 1,
+  "size": 2757,
+  "path": "uploads\/files\/imports\/ghnxmS3u9QxLWu82.zip",
+  "updated_at": "2025-07-18T14:50:27.000000Z",
+  "created_at": "2025-07-18T14:50:27.000000Z",
+  "id": 31
+}
\ No newline at end of file
diff --git a/dev/api/responses/imports-list.json b/dev/api/responses/imports-list.json
new file mode 100644
index 00000000000..7451e443783
--- /dev/null
+++ b/dev/api/responses/imports-list.json
@@ -0,0 +1,23 @@
+{
+  "data": [
+    {
+      "id": 25,
+      "name": "IT Department",
+      "size": 618462,
+      "type": "book",
+      "created_by": 1,
+      "created_at": "2024-12-20T18:40:38.000000Z",
+      "updated_at": "2024-12-20T18:40:38.000000Z"
+    },
+    {
+      "id": 27,
+      "name": "Clients",
+      "size": 15364,
+      "type": "chapter",
+      "created_by": 1,
+      "created_at": "2025-03-20T12:41:44.000000Z",
+      "updated_at": "2025-03-20T12:41:44.000000Z"
+    }
+  ],
+  "total": 2
+}
\ No newline at end of file
diff --git a/dev/api/responses/imports-read.json b/dev/api/responses/imports-read.json
new file mode 100644
index 00000000000..e256854d127
--- /dev/null
+++ b/dev/api/responses/imports-read.json
@@ -0,0 +1,51 @@
+{
+  "id": 25,
+  "name": "IT Department",
+  "path": "uploads\/files\/imports\/7YOpZ6sGIEbYdRFL.zip",
+  "size": 618462,
+  "type": "book",
+  "created_by": 1,
+  "created_at": "2024-12-20T18:40:38.000000Z",
+  "updated_at": "2024-12-20T18:40:38.000000Z",
+  "details": {
+    "id": 4,
+    "name": "IT Department",
+    "chapters": [
+      {
+        "id": 3,
+        "name": "Server Systems",
+        "priority": 1,
+        "pages": [
+          {
+            "id": 22,
+            "name": "prod-aws-stonehawk",
+            "priority": 0,
+            "attachments": [],
+            "images": [],
+            "tags": []
+          }
+        ],
+        "tags": []
+      }
+    ],
+    "pages": [
+      {
+        "id": 23,
+        "name": "Member Onboarding Guide",
+        "priority": 0,
+        "attachments": [],
+        "images": [],
+        "tags": []
+      },
+      {
+        "id": 25,
+        "name": "IT Holiday Party Event",
+        "priority": 2,
+        "attachments": [],
+        "images": [],
+        "tags": []
+      }
+    ],
+    "tags": []
+  }
+}
\ No newline at end of file
diff --git a/dev/api/responses/imports-run.json b/dev/api/responses/imports-run.json
new file mode 100644
index 00000000000..90b34d6aa09
--- /dev/null
+++ b/dev/api/responses/imports-run.json
@@ -0,0 +1,14 @@
+{
+  "id": 1067,
+  "book_id": 28,
+  "slug": "pension-providers",
+  "name": "Pension Providers",
+  "description": "Details on the various pension providers that are available",
+  "priority": 7,
+  "created_at": "2025-07-18T14:53:35.000000Z",
+  "updated_at": "2025-07-18T14:53:36.000000Z",
+  "created_by": 1,
+  "updated_by": 1,
+  "owned_by": 1,
+  "default_template_id": null
+}
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 98af4bb2616..99df24aed0a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -89,7 +89,7 @@
 Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
 
 Route::get('imports', [ExportControllers\ImportApiController::class, 'list']);
-Route::post('imports', [ExportControllers\ImportApiController::class, 'upload']);
+Route::post('imports', [ExportControllers\ImportApiController::class, 'create']);
 Route::get('imports/{id}', [ExportControllers\ImportApiController::class, 'read']);
 Route::post('imports/{id}', [ExportControllers\ImportApiController::class, 'run']);
 Route::delete('imports/{id}', [ExportControllers\ImportApiController::class, 'delete']);
diff --git a/tests/Api/ImportsApiTest.php b/tests/Api/ImportsApiTest.php
index 523034324fc..f6df074ee38 100644
--- a/tests/Api/ImportsApiTest.php
+++ b/tests/Api/ImportsApiTest.php
@@ -14,7 +14,7 @@ class ImportsApiTest extends TestCase
 
     protected string $baseEndpoint = '/api/imports';
 
-    public function test_upload_and_run(): void
+    public function test_create_and_run(): void
     {
         $book = $this->entities->book();
         $zip = ZipTestHelper::zipUploadFromData([
@@ -44,12 +44,13 @@ public function test_upload_and_run(): void
             'name' => 'My API import page',
             'book_id' => $book->id,
         ]);
+        $resp->assertJsonMissingPath('book');
 
         $page = Page::query()->where('name', '=', 'My API import page')->first();
         $this->assertEquals('My api tag', $page->tags()->first()->name);
     }
 
-    public function test_upload_validation_error(): void
+    public function test_create_validation_error(): void
     {
         $zip = ZipTestHelper::zipUploadFromData([
             'page' => [

From 61f8d18af53112c874270df64826e24344f4bd8a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 19 Jul 2025 14:53:02 +0100
Subject: [PATCH 601/666] Changelog: Tweaked spacing, count and element
 referencing

During review of #5663
---
 resources/js/components/page-editor.js               | 4 ++--
 resources/views/pages/parts/editor-toolbar.blade.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 2a155f37fb8..54245350489 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -25,6 +25,7 @@ export class PageEditor extends Component {
         this.draftDisplayIcon = this.$refs.draftDisplayIcon;
         this.changelogInput = this.$refs.changelogInput;
         this.changelogDisplay = this.$refs.changelogDisplay;
+        this.changelogCounter = this.$refs.changelogCounter;
         this.changeEditorButtons = this.$manyRefs.changeEditor || [];
         this.switchDialogContainer = this.$refs.switchDialog;
         this.deleteDraftDialogContainer = this.$refs.deleteDraftDialog;
@@ -77,8 +78,7 @@ export class PageEditor extends Component {
         const updateChangelogDebounced = debounce(this.updateChangelogDisplay.bind(this), 300, false);
         this.changelogInput.addEventListener('input', () => {
             const count = this.changelogInput.value.length;
-            const counterEl = document.getElementById('changelog-count');
-            if (counterEl) counterEl.innerText = `${count} / 250`;
+            this.changelogCounter.innerText = `${count} / 180`;
             updateChangelogDebounced();
         });
 
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index deddc3cd321..2dfbe9e6982 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -104,17 +104,17 @@ class="dropdown-container">
                 <span refs="page-editor@changelogDisplay">{{ trans('entities.pages_edit_set_changelog') }}</span>
             </button>
             <ul refs="dropdown@menu" class="wide dropdown-menu">
-                <li class="px-l py-m">
+                <li class="px-m py-s">
                     <p class="text-muted pb-s">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
                     <textarea
                         refs="page-editor@changelogInput"
                         name="summary"
                         id="summary-input"
                         rows="2"
-                        maxlength="250"
+                        maxlength="180"
                         placeholder="{{ trans('entities.pages_edit_enter_changelog') }}"
                     ></textarea>
-                    <small class="text-muted mt-xs" id="changelog-count">0 / 250</small>
+                    <small refs="page-editor@changelogCounter" class="text-muted mt-xs">0 / 180</small>
                 </li>
             </ul>
             <span>{{-- Prevents button jumping on menu show --}}</span>

From 7bbf591a7fdb46bb0da30669354b8768ac950506 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 20 Jul 2025 12:33:22 +0100
Subject: [PATCH 602/666] MD Editor: Starting conversion to typescript

---
 dev/build/esbuild.js                          |   2 +-
 lang/en/entities.php                          |   1 +
 ...ctor-popup.js => entity-selector-popup.ts} |  40 ++---
 ...{entity-selector.js => entity-selector.ts} |  82 ++++-----
 resources/js/components/image-manager.js      |   4 +
 .../js/markdown/{actions.js => actions.ts}    | 161 ++++++++----------
 resources/js/markdown/codemirror.js           |   2 +-
 resources/js/markdown/common-events.js        |  32 ----
 resources/js/markdown/common-events.ts        |  36 ++++
 resources/js/markdown/index.mjs               |  51 ------
 resources/js/markdown/index.mts               |  52 ++++++
 resources/js/markdown/settings.js             |   1 +
 .../pages/parts/markdown-editor.blade.php     |   4 +
 13 files changed, 238 insertions(+), 230 deletions(-)
 rename resources/js/components/{entity-selector-popup.js => entity-selector-popup.ts} (58%)
 rename resources/js/components/{entity-selector.js => entity-selector.ts} (74%)
 rename resources/js/markdown/{actions.js => actions.ts} (82%)
 delete mode 100644 resources/js/markdown/common-events.js
 create mode 100644 resources/js/markdown/common-events.ts
 delete mode 100644 resources/js/markdown/index.mjs
 create mode 100644 resources/js/markdown/index.mts

diff --git a/dev/build/esbuild.js b/dev/build/esbuild.js
index cd8bf279f28..63387d612ce 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.js
@@ -13,7 +13,7 @@ const entryPoints = {
     app: path.join(__dirname, '../../resources/js/app.ts'),
     code: path.join(__dirname, '../../resources/js/code/index.mjs'),
     'legacy-modes': path.join(__dirname, '../../resources/js/code/legacy-modes.mjs'),
-    markdown: path.join(__dirname, '../../resources/js/markdown/index.mjs'),
+    markdown: path.join(__dirname, '../../resources/js/markdown/index.mts'),
     wysiwyg: path.join(__dirname, '../../resources/js/wysiwyg/index.ts'),
 };
 
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/resources/js/components/entity-selector-popup.js b/resources/js/components/entity-selector-popup.ts
similarity index 58%
rename from resources/js/components/entity-selector-popup.js
rename to resources/js/components/entity-selector-popup.ts
index 29c06e90951..468f074b5d4 100644
--- a/resources/js/components/entity-selector-popup.js
+++ b/resources/js/components/entity-selector-popup.ts
@@ -1,15 +1,23 @@
 import {Component} from './component';
+import {EntitySelector, EntitySelectorEntity, EntitySelectorSearchOptions} from "./entity-selector";
+import {Popup} from "./popup";
+
+export type EntitySelectorPopupCallback = (entity: EntitySelectorEntity) => void;
 
 export class EntitySelectorPopup extends Component {
 
+    protected container!: HTMLElement;
+    protected selectButton!: HTMLElement;
+    protected selectorEl!: HTMLElement;
+
+    protected callback: EntitySelectorPopupCallback|null = null;
+    protected selection: EntitySelectorEntity|null = null;
+
     setup() {
         this.container = this.$el;
         this.selectButton = this.$refs.select;
         this.selectorEl = this.$refs.selector;
 
-        this.callback = null;
-        this.selection = null;
-
         this.selectButton.addEventListener('click', this.onSelectButtonClick.bind(this));
         window.$events.listen('entity-select-change', this.onSelectionChange.bind(this));
         window.$events.listen('entity-select-confirm', this.handleConfirmedSelection.bind(this));
@@ -17,10 +25,8 @@ export class EntitySelectorPopup extends Component {
 
     /**
      * Show the selector popup.
-     * @param {Function} callback
-     * @param {EntitySelectorSearchOptions} searchOptions
      */
-    show(callback, searchOptions = {}) {
+    show(callback: EntitySelectorPopupCallback, searchOptions: Partial<EntitySelectorSearchOptions> = {}) {
         this.callback = callback;
         this.getSelector().configureSearchOptions(searchOptions);
         this.getPopup().show();
@@ -32,34 +38,28 @@ export class EntitySelectorPopup extends Component {
         this.getPopup().hide();
     }
 
-    /**
-     * @returns {Popup}
-     */
-    getPopup() {
-        return window.$components.firstOnElement(this.container, 'popup');
+    getPopup(): Popup {
+        return window.$components.firstOnElement(this.container, 'popup') as Popup;
     }
 
-    /**
-     * @returns {EntitySelector}
-     */
-    getSelector() {
-        return window.$components.firstOnElement(this.selectorEl, 'entity-selector');
+    getSelector(): EntitySelector {
+        return window.$components.firstOnElement(this.selectorEl, 'entity-selector') as EntitySelector;
     }
 
     onSelectButtonClick() {
         this.handleConfirmedSelection(this.selection);
     }
 
-    onSelectionChange(entity) {
-        this.selection = entity;
-        if (entity === null) {
+    onSelectionChange(entity: EntitySelectorEntity|{}) {
+        this.selection = (entity.hasOwnProperty('id') ? entity : null) as EntitySelectorEntity|null;
+        if (!this.selection) {
             this.selectButton.setAttribute('disabled', 'true');
         } else {
             this.selectButton.removeAttribute('disabled');
         }
     }
 
-    handleConfirmedSelection(entity) {
+    handleConfirmedSelection(entity: EntitySelectorEntity|null): void {
         this.hide();
         this.getSelector().reset();
         if (this.callback && entity) this.callback(entity);
diff --git a/resources/js/components/entity-selector.js b/resources/js/components/entity-selector.ts
similarity index 74%
rename from resources/js/components/entity-selector.js
rename to resources/js/components/entity-selector.ts
index 7491119a137..0ae9710f75e 100644
--- a/resources/js/components/entity-selector.js
+++ b/resources/js/components/entity-selector.ts
@@ -1,24 +1,36 @@
-import {onChildEvent} from '../services/dom.ts';
+import {onChildEvent} from '../services/dom';
 import {Component} from './component';
 
-/**
- * @typedef EntitySelectorSearchOptions
- * @property entityTypes string
- * @property entityPermission string
- * @property searchEndpoint string
- * @property initialValue string
- */
-
-/**
- * Entity Selector
- */
+export interface EntitySelectorSearchOptions {
+    entityTypes: string;
+    entityPermission: string;
+    searchEndpoint: string;
+    initialValue: string;
+}
+
+export type EntitySelectorEntity = {
+    id: number,
+    name: string,
+    link: string,
+};
+
 export class EntitySelector extends Component {
+    protected elem!: HTMLElement;
+    protected input!: HTMLInputElement;
+    protected searchInput!: HTMLInputElement;
+    protected loading!: HTMLElement;
+    protected resultsContainer!: HTMLElement;
+
+    protected searchOptions!: EntitySelectorSearchOptions;
+
+    protected search = '';
+    protected lastClick = 0;
 
     setup() {
         this.elem = this.$el;
 
-        this.input = this.$refs.input;
-        this.searchInput = this.$refs.search;
+        this.input = this.$refs.input as HTMLInputElement;
+        this.searchInput = this.$refs.search as HTMLInputElement;
         this.loading = this.$refs.loading;
         this.resultsContainer = this.$refs.results;
 
@@ -29,9 +41,6 @@ export class EntitySelector extends Component {
             initialValue: this.searchInput.value || '',
         };
 
-        this.search = '';
-        this.lastClick = 0;
-
         this.setupListeners();
         this.showLoading();
 
@@ -40,16 +49,13 @@ export class EntitySelector extends Component {
         }
     }
 
-    /**
-     * @param {EntitySelectorSearchOptions} options
-     */
-    configureSearchOptions(options) {
+    configureSearchOptions(options: Partial<EntitySelectorSearchOptions>): void {
         Object.assign(this.searchOptions, options);
         this.reset();
         this.searchInput.value = this.searchOptions.initialValue;
     }
 
-    setupListeners() {
+    setupListeners(): void {
         this.elem.addEventListener('click', this.onClick.bind(this));
 
         let lastSearch = 0;
@@ -67,7 +73,7 @@ export class EntitySelector extends Component {
         });
 
         // Keyboard navigation
-        onChildEvent(this.$el, '[data-entity-type]', 'keydown', event => {
+        onChildEvent(this.$el, '[data-entity-type]', 'keydown', ((event: KeyboardEvent) => {
             if (event.ctrlKey && event.code === 'Enter') {
                 const form = this.$el.closest('form');
                 if (form) {
@@ -83,7 +89,7 @@ export class EntitySelector extends Component {
             if (event.code === 'ArrowUp') {
                 this.focusAdjacent(false);
             }
-        });
+        }) as (event: Event) => void);
 
         this.searchInput.addEventListener('keydown', event => {
             if (event.code === 'ArrowDown') {
@@ -93,10 +99,10 @@ export class EntitySelector extends Component {
     }
 
     focusAdjacent(forward = true) {
-        const items = Array.from(this.resultsContainer.querySelectorAll('[data-entity-type]'));
+        const items: (Element|null)[] = Array.from(this.resultsContainer.querySelectorAll('[data-entity-type]'));
         const selectedIndex = items.indexOf(document.activeElement);
         const newItem = items[selectedIndex + (forward ? 1 : -1)] || items[0];
-        if (newItem) {
+        if (newItem instanceof HTMLElement) {
             newItem.focus();
         }
     }
@@ -132,7 +138,7 @@ export class EntitySelector extends Component {
         }
 
         window.$http.get(this.searchUrl()).then(resp => {
-            this.resultsContainer.innerHTML = resp.data;
+            this.resultsContainer.innerHTML = resp.data as string;
             this.hideLoading();
         });
     }
@@ -142,7 +148,7 @@ export class EntitySelector extends Component {
         return `${this.searchOptions.searchEndpoint}?${query}`;
     }
 
-    searchEntities(searchTerm) {
+    searchEntities(searchTerm: string) {
         if (!this.searchOptions.searchEndpoint) {
             throw new Error('Search endpoint not set for entity-selector load');
         }
@@ -150,7 +156,7 @@ export class EntitySelector extends Component {
         this.input.value = '';
         const url = `${this.searchUrl()}&term=${encodeURIComponent(searchTerm)}`;
         window.$http.get(url).then(resp => {
-            this.resultsContainer.innerHTML = resp.data;
+            this.resultsContainer.innerHTML = resp.data as string;
             this.hideLoading();
         });
     }
@@ -162,16 +168,16 @@ export class EntitySelector extends Component {
         return answer;
     }
 
-    onClick(event) {
-        const listItem = event.target.closest('[data-entity-type]');
-        if (listItem) {
+    onClick(event: MouseEvent) {
+        const listItem = (event.target as HTMLElement).closest('[data-entity-type]');
+        if (listItem instanceof HTMLElement) {
             event.preventDefault();
             event.stopPropagation();
             this.selectItem(listItem);
         }
     }
 
-    selectItem(item) {
+    selectItem(item: HTMLElement): void {
         const isDblClick = this.isDoubleClick();
         const type = item.getAttribute('data-entity-type');
         const id = item.getAttribute('data-entity-id');
@@ -180,14 +186,14 @@ export class EntitySelector extends Component {
         this.unselectAll();
         this.input.value = isSelected ? `${type}:${id}` : '';
 
-        const link = item.getAttribute('href');
-        const name = item.querySelector('.entity-list-item-name').textContent;
-        const data = {id: Number(id), name, link};
+        const link = item.getAttribute('href') || '';
+        const name = item.querySelector('.entity-list-item-name')?.textContent || '';
+        const data: EntitySelectorEntity = {id: Number(id), name, link};
 
         if (isSelected) {
             item.classList.add('selected');
         } else {
-            window.$events.emit('entity-select-change', null);
+            window.$events.emit('entity-select-change');
         }
 
         if (!isDblClick && !isSelected) return;
@@ -200,7 +206,7 @@ export class EntitySelector extends Component {
         }
     }
 
-    confirmSelection(data) {
+    confirmSelection(data: EntitySelectorEntity) {
         window.$events.emit('entity-select-confirm', data);
     }
 
diff --git a/resources/js/components/image-manager.js b/resources/js/components/image-manager.js
index c8108ab28c1..84ba333f9da 100644
--- a/resources/js/components/image-manager.js
+++ b/resources/js/components/image-manager.js
@@ -127,6 +127,10 @@ export class ImageManager extends Component {
         });
     }
 
+    /**
+     * @param {({ thumbs: { display: string; }; url: string; name: string; }) => void} callback
+     * @param {String} type
+     */
     show(callback, type = 'gallery') {
         this.resetAll();
 
diff --git a/resources/js/markdown/actions.js b/resources/js/markdown/actions.ts
similarity index 82%
rename from resources/js/markdown/actions.js
rename to resources/js/markdown/actions.ts
index e99bbf3e14f..c6210809cce 100644
--- a/resources/js/markdown/actions.js
+++ b/resources/js/markdown/actions.ts
@@ -1,16 +1,25 @@
-import * as DrawIO from '../services/drawio.ts';
+import * as DrawIO from '../services/drawio';
+import {MarkdownEditor} from "./index.mjs";
+import {EntitySelectorPopup, ImageManager} from "../components";
+import {ChangeSpec, SelectionRange, TransactionSpec} from "@codemirror/state";
+
+interface ImageManagerImage {
+    id: number;
+    name: string;
+    thumbs: { display: string; };
+    url: string;
+}
 
 export class Actions {
 
-    /**
-     * @param {MarkdownEditor} editor
-     */
-    constructor(editor) {
+    protected readonly editor: MarkdownEditor;
+    protected lastContent: { html: string; markdown: string } = {
+        html: '',
+        markdown: '',
+    };
+
+    constructor(editor: MarkdownEditor) {
         this.editor = editor;
-        this.lastContent = {
-            html: '',
-            markdown: '',
-        };
     }
 
     updateAndRender() {
@@ -30,10 +39,9 @@ export class Actions {
     }
 
     showImageInsert() {
-        /** @type {ImageManager} * */
-        const imageManager = window.$components.first('image-manager');
+        const imageManager = window.$components.first('image-manager') as ImageManager;
 
-        imageManager.show(image => {
+        imageManager.show((image: ImageManagerImage) => {
             const imageUrl = image.thumbs?.display || image.url;
             const selectedText = this.#getSelectionText();
             const newText = `[![${selectedText || image.name}](${imageUrl})](${image.url})`;
@@ -55,9 +63,8 @@ export class Actions {
 
     showImageManager() {
         const selectionRange = this.#getSelectionRange();
-        /** @type {ImageManager} * */
-        const imageManager = window.$components.first('image-manager');
-        imageManager.show(image => {
+        const imageManager = window.$components.first('image-manager') as ImageManager;
+        imageManager.show((image: ImageManagerImage) => {
             this.#insertDrawing(image, selectionRange);
         }, 'drawio');
     }
@@ -66,8 +73,7 @@ export class Actions {
     showLinkSelector() {
         const selectionRange = this.#getSelectionRange();
 
-        /** @type {EntitySelectorPopup} * */
-        const selector = window.$components.first('entity-selector-popup');
+        const selector = window.$components.first('entity-selector-popup') as EntitySelectorPopup;
         const selectionText = this.#getSelectionText(selectionRange);
         selector.show(entity => {
             const selectedText = selectionText || entity.name;
@@ -96,7 +102,7 @@ export class Actions {
 
             try {
                 const resp = await window.$http.post('/images/drawio', data);
-                this.#insertDrawing(resp.data, selectionRange);
+                this.#insertDrawing(resp.data as ImageManagerImage, selectionRange);
                 DrawIO.close();
             } catch (err) {
                 this.handleDrawingUploadError(err);
@@ -105,20 +111,23 @@ export class Actions {
         });
     }
 
-    #insertDrawing(image, originalSelectionRange) {
+    #insertDrawing(image: ImageManagerImage, originalSelectionRange: SelectionRange) {
         const newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
         this.#replaceSelection(newText, newText.length, originalSelectionRange);
     }
 
     // Show draw.io if enabled and handle save.
-    editDrawing(imgContainer) {
+    editDrawing(imgContainer: HTMLElement) {
         const {drawioUrl} = this.editor.config;
         if (!drawioUrl) {
             return;
         }
 
         const selectionRange = this.#getSelectionRange();
-        const drawingId = imgContainer.getAttribute('drawio-diagram');
+        const drawingId = imgContainer.getAttribute('drawio-diagram') || '';
+        if (!drawingId) {
+            return;
+        }
 
         DrawIO.show(drawioUrl, () => DrawIO.load(drawingId), async pngData => {
             const data = {
@@ -128,7 +137,8 @@ export class Actions {
 
             try {
                 const resp = await window.$http.post('/images/drawio', data);
-                const newText = `<div drawio-diagram="${resp.data.id}"><img src="${resp.data.url}"></div>`;
+                const image = resp.data as ImageManagerImage;
+                const newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
                 const newContent = this.#getText().split('\n').map(line => {
                     if (line.indexOf(`drawio-diagram="${drawingId}"`) !== -1) {
                         return newText;
@@ -144,7 +154,7 @@ export class Actions {
         });
     }
 
-    handleDrawingUploadError(error) {
+    handleDrawingUploadError(error: any): void {
         if (error.status === 413) {
             window.$events.emit('error', this.editor.config.text.serverUploadLimit);
         } else {
@@ -162,7 +172,7 @@ export class Actions {
     }
 
     // Scroll to a specified text
-    scrollToText(searchText) {
+    scrollToText(searchText: string): void {
         if (!searchText) {
             return;
         }
@@ -195,17 +205,15 @@ export class Actions {
 
     /**
      * Insert content into the editor.
-     * @param {String} content
      */
-    insertContent(content) {
+    insertContent(content: string) {
         this.#replaceSelection(content, content.length);
     }
 
     /**
      * Prepend content to the editor.
-     * @param {String} content
      */
-    prependContent(content) {
+    prependContent(content: string): void {
         content = this.#cleanTextForEditor(content);
         const selectionRange = this.#getSelectionRange();
         const selectFrom = selectionRange.from + content.length + 1;
@@ -215,19 +223,18 @@ export class Actions {
 
     /**
      * Append content to the editor.
-     * @param {String} content
      */
-    appendContent(content) {
+    appendContent(content: string): void {
         content = this.#cleanTextForEditor(content);
-        this.#dispatchChange(this.editor.cm.state.doc.length, `\n${content}`);
+        const end = this.editor.cm.state.doc.length;
+        this.#dispatchChange(end, end, `\n${content}`);
         this.focus();
     }
 
     /**
      * Replace the editor's contents
-     * @param {String} content
      */
-    replaceContent(content) {
+    replaceContent(content: string): void {
         this.#setText(content);
     }
 
@@ -235,7 +242,7 @@ export class Actions {
      * Replace the start of the line
      * @param {String} newStart
      */
-    replaceLineStart(newStart) {
+    replaceLineStart(newStart: string): void {
         const selectionRange = this.#getSelectionRange();
         const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
 
@@ -264,10 +271,8 @@ export class Actions {
 
     /**
      * Wrap the selection in the given contents start and end contents.
-     * @param {String} start
-     * @param {String} end
      */
-    wrapSelection(start, end) {
+    wrapSelection(start: string, end: string): void {
         const selectRange = this.#getSelectionRange();
         const selectionText = this.#getSelectionText(selectRange);
         if (!selectionText) {
@@ -321,7 +326,7 @@ export class Actions {
         const formats = ['info', 'success', 'warning', 'danger'];
         const joint = formats.join('|');
         const regex = new RegExp(`class="((${joint})\\s+callout|callout\\s+(${joint}))"`, 'i');
-        const matches = regex.exec(line.text);
+        const matches = regex.exec(line.text) || [''];
         const format = (matches ? (matches[2] || matches[3]) : '').toLowerCase();
 
         if (format === formats[formats.length - 1]) {
@@ -343,9 +348,9 @@ export class Actions {
         }
     }
 
-    syncDisplayPosition(event) {
+    syncDisplayPosition(event: Event): void {
         // Thanks to http://liuhao.im/english/2015/11/10/the-sync-scroll-of-markdown-editor-in-javascript.html
-        const scrollEl = event.target;
+        const scrollEl = event.target as HTMLElement;
         const atEnd = Math.abs(scrollEl.scrollHeight - scrollEl.clientHeight - scrollEl.scrollTop) < 1;
         if (atEnd) {
             this.editor.display.scrollToIndex(-1);
@@ -363,25 +368,19 @@ export class Actions {
     /**
      * Fetch and insert the template of the given ID.
      * The page-relative position provided can be used to determine insert location if possible.
-     * @param {String} templateId
-     * @param {Number} posX
-     * @param {Number} posY
      */
-    async insertTemplate(templateId, posX, posY) {
+    async insertTemplate(templateId: string, posX: number, posY: number): Promise<void> {
         const cursorPos = this.editor.cm.posAtCoords({x: posX, y: posY}, false);
-        const {data} = await window.$http.get(`/templates/${templateId}`);
-        const content = data.markdown || data.html;
+        const responseData = (await window.$http.get(`/templates/${templateId}`)).data as {markdown: string, html: string};
+        const content = responseData.markdown || responseData.html;
         this.#dispatchChange(cursorPos, cursorPos, content, cursorPos);
     }
 
     /**
      * Insert multiple images from the clipboard from an event at the provided
      * screen coordinates (Typically form a paste event).
-     * @param {File[]} images
-     * @param {Number} posX
-     * @param {Number} posY
      */
-    insertClipboardImages(images, posX, posY) {
+    insertClipboardImages(images: File[], posX: number, posY: number): void {
         const cursorPos = this.editor.cm.posAtCoords({x: posX, y: posY}, false);
         for (const image of images) {
             this.uploadImage(image, cursorPos);
@@ -390,10 +389,8 @@ export class Actions {
 
     /**
      * Handle image upload and add image into markdown content
-     * @param {File} file
-     * @param {?Number} position
      */
-    async uploadImage(file, position = null) {
+    async uploadImage(file: File, position: number|null = null): Promise<void> {
         if (file === null || file.type.indexOf('image') !== 0) return;
         let ext = 'png';
 
@@ -403,7 +400,9 @@ export class Actions {
 
         if (file.name) {
             const fileNameMatches = file.name.match(/\.(.+)$/);
-            if (fileNameMatches.length > 1) ext = fileNameMatches[1];
+            if (fileNameMatches && fileNameMatches.length > 1) {
+                ext = fileNameMatches[1];
+            }
         }
 
         // Insert image into markdown
@@ -418,10 +417,10 @@ export class Actions {
         formData.append('uploaded_to', this.editor.config.pageId);
 
         try {
-            const {data} = await window.$http.post('/images/gallery', formData);
-            const newContent = `[![](${data.thumbs.display})](${data.url})`;
+            const image = (await window.$http.post('/images/gallery', formData)).data as ImageManagerImage;
+            const newContent = `[![](${image.thumbs.display})](${image.url})`;
             this.#findAndReplaceContent(placeHolderText, newContent);
-        } catch (err) {
+        } catch (err: any) {
             window.$events.error(err?.data?.message || this.editor.config.text.imageUploadError);
             this.#findAndReplaceContent(placeHolderText, '');
             console.error(err);
@@ -438,10 +437,8 @@ export class Actions {
 
     /**
      * Set the text of the current editor instance.
-     * @param {String} text
-     * @param {?SelectionRange} selectionRange
      */
-    #setText(text, selectionRange = null) {
+    #setText(text: string, selectionRange: SelectionRange|null = null) {
         selectionRange = selectionRange || this.#getSelectionRange();
         const newDoc = this.editor.cm.state.toText(text);
         const newSelectFrom = Math.min(selectionRange.from, newDoc.length);
@@ -457,12 +454,9 @@ export class Actions {
      * Replace the current selection and focus the editor.
      * Takes an offset for the cursor, after the change, relative to the start of the provided string.
      * Can be provided a selection range to use instead of the current selection range.
-     * @param {String} newContent
-     * @param {Number} cursorOffset
-     * @param {?SelectionRange} selectionRange
      */
-    #replaceSelection(newContent, cursorOffset = 0, selectionRange = null) {
-        selectionRange = selectionRange || this.editor.cm.state.selection.main;
+    #replaceSelection(newContent: string, cursorOffset: number = 0, selectionRange: SelectionRange|null = null) {
+        selectionRange = selectionRange || this.#getSelectionRange();
         const selectFrom = selectionRange.from + cursorOffset;
         this.#dispatchChange(selectionRange.from, selectionRange.to, newContent, selectFrom);
         this.focus();
@@ -470,48 +464,39 @@ export class Actions {
 
     /**
      * Get the text content of the main current selection.
-     * @param {SelectionRange} selectionRange
-     * @return {string}
      */
-    #getSelectionText(selectionRange = null) {
+    #getSelectionText(selectionRange: SelectionRange|null = null): string {
         selectionRange = selectionRange || this.#getSelectionRange();
         return this.editor.cm.state.sliceDoc(selectionRange.from, selectionRange.to);
     }
 
     /**
      * Get the range of the current main selection.
-     * @return {SelectionRange}
      */
-    #getSelectionRange() {
+    #getSelectionRange(): SelectionRange {
         return this.editor.cm.state.selection.main;
     }
 
     /**
      * Cleans the given text to work with the editor.
      * Standardises line endings to what's expected.
-     * @param {String} text
-     * @return {String}
      */
-    #cleanTextForEditor(text) {
+    #cleanTextForEditor(text: string): string {
         return text.replace(/\r\n|\r/g, '\n');
     }
 
     /**
      * Find and replace the first occurrence of [search] with [replace]
-     * @param {String} search
-     * @param {String} replace
      */
-    #findAndReplaceContent(search, replace) {
+    #findAndReplaceContent(search: string, replace: string): void {
         const newText = this.#getText().replace(search, replace);
         this.#setText(newText);
     }
 
     /**
      * Wrap the line in the given start and end contents.
-     * @param {String} start
-     * @param {String} end
      */
-    #wrapLine(start, end) {
+    #wrapLine(start: string, end: string): void {
         const selectionRange = this.#getSelectionRange();
         const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
         const lineContent = line.text;
@@ -531,14 +516,16 @@ export class Actions {
 
     /**
      * Dispatch changes to the editor.
-     * @param {Number} from
-     * @param {?Number} to
-     * @param {?String} text
-     * @param {?Number} selectFrom
-     * @param {?Number} selectTo
      */
-    #dispatchChange(from, to = null, text = null, selectFrom = null, selectTo = null) {
-        const tr = {changes: {from, to, insert: text}};
+    #dispatchChange(from: number, to: number|null = null, text: string|null = null, selectFrom: number|null = null, selectTo: number|null = null): void {
+        const change: ChangeSpec = {from};
+        if (to) {
+            change.to = to;
+        }
+        if (text) {
+            change.insert = text;
+        }
+        const tr: TransactionSpec = {changes: change};
 
         if (selectFrom) {
             tr.selection = {anchor: selectFrom};
@@ -557,7 +544,7 @@ export class Actions {
      * @param {Number} to
      * @param {Boolean} scrollIntoView
      */
-    #setSelection(from, to, scrollIntoView = false) {
+    #setSelection(from: number, to: number, scrollIntoView = false) {
         this.editor.cm.dispatch({
             selection: {anchor: from, head: to},
             scrollIntoView,
diff --git a/resources/js/markdown/codemirror.js b/resources/js/markdown/codemirror.js
index 664767605b8..61b2e84573d 100644
--- a/resources/js/markdown/codemirror.js
+++ b/resources/js/markdown/codemirror.js
@@ -5,7 +5,7 @@ import {Clipboard} from '../services/clipboard.ts';
 /**
  * Initiate the codemirror instance for the markdown editor.
  * @param {MarkdownEditor} editor
- * @returns {Promise<void>}
+ * @returns {Promise<EditorView>}
  */
 export async function init(editor) {
     const Code = await window.importVersioned('code');
diff --git a/resources/js/markdown/common-events.js b/resources/js/markdown/common-events.js
deleted file mode 100644
index c3d803f7048..00000000000
--- a/resources/js/markdown/common-events.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function getContentToInsert({html, markdown}) {
-    return markdown || html;
-}
-
-/**
- * @param {MarkdownEditor} editor
- */
-export function listen(editor) {
-    window.$events.listen('editor::replace', eventContent => {
-        const markdown = getContentToInsert(eventContent);
-        editor.actions.replaceContent(markdown);
-    });
-
-    window.$events.listen('editor::append', eventContent => {
-        const markdown = getContentToInsert(eventContent);
-        editor.actions.appendContent(markdown);
-    });
-
-    window.$events.listen('editor::prepend', eventContent => {
-        const markdown = getContentToInsert(eventContent);
-        editor.actions.prependContent(markdown);
-    });
-
-    window.$events.listen('editor::insert', eventContent => {
-        const markdown = getContentToInsert(eventContent);
-        editor.actions.insertContent(markdown);
-    });
-
-    window.$events.listen('editor::focus', () => {
-        editor.actions.focus();
-    });
-}
diff --git a/resources/js/markdown/common-events.ts b/resources/js/markdown/common-events.ts
new file mode 100644
index 00000000000..4bfc4bb4619
--- /dev/null
+++ b/resources/js/markdown/common-events.ts
@@ -0,0 +1,36 @@
+import {MarkdownEditor} from "./index.mjs";
+
+export interface HtmlOrMarkdown {
+    html: string;
+    markdown: string;
+}
+
+function getContentToInsert({html, markdown}: {html: string, markdown: string}): string {
+    return markdown || html;
+}
+
+export function listenToCommonEvents(editor: MarkdownEditor): void {
+    window.$events.listen('editor::replace', (eventContent: HtmlOrMarkdown) => {
+        const markdown = getContentToInsert(eventContent);
+        editor.actions.replaceContent(markdown);
+    });
+
+    window.$events.listen('editor::append', (eventContent: HtmlOrMarkdown) => {
+        const markdown = getContentToInsert(eventContent);
+        editor.actions.appendContent(markdown);
+    });
+
+    window.$events.listen('editor::prepend', (eventContent: HtmlOrMarkdown) => {
+        const markdown = getContentToInsert(eventContent);
+        editor.actions.prependContent(markdown);
+    });
+
+    window.$events.listen('editor::insert', (eventContent: HtmlOrMarkdown) => {
+        const markdown = getContentToInsert(eventContent);
+        editor.actions.insertContent(markdown);
+    });
+
+    window.$events.listen('editor::focus', () => {
+        editor.actions.focus();
+    });
+}
diff --git a/resources/js/markdown/index.mjs b/resources/js/markdown/index.mjs
deleted file mode 100644
index 46c35c850ac..00000000000
--- a/resources/js/markdown/index.mjs
+++ /dev/null
@@ -1,51 +0,0 @@
-import {Markdown} from './markdown';
-import {Display} from './display';
-import {Actions} from './actions';
-import {Settings} from './settings';
-import {listen} from './common-events';
-import {init as initCodemirror} from './codemirror';
-
-/**
- * Initiate a new markdown editor instance.
- * @param {MarkdownEditorConfig} config
- * @returns {Promise<MarkdownEditor>}
- */
-export async function init(config) {
-    /**
-     * @type {MarkdownEditor}
-     */
-    const editor = {
-        config,
-        markdown: new Markdown(),
-        settings: new Settings(config.settingInputs),
-    };
-
-    editor.actions = new Actions(editor);
-    editor.display = new Display(editor);
-    editor.cm = await initCodemirror(editor);
-
-    listen(editor);
-
-    return editor;
-}
-
-/**
- * @typedef MarkdownEditorConfig
- * @property {String} pageId
- * @property {Element} container
- * @property {Element} displayEl
- * @property {HTMLTextAreaElement} inputEl
- * @property {String} drawioUrl
- * @property {HTMLInputElement[]} settingInputs
- * @property {Object<String, String>} text
- */
-
-/**
- * @typedef MarkdownEditor
- * @property {MarkdownEditorConfig} config
- * @property {Display} display
- * @property {Markdown} markdown
- * @property {Actions} actions
- * @property {EditorView} cm
- * @property {Settings} settings
- */
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
new file mode 100644
index 00000000000..46345ccfd6f
--- /dev/null
+++ b/resources/js/markdown/index.mts
@@ -0,0 +1,52 @@
+import {Markdown} from './markdown';
+import {Display} from './display';
+import {Actions} from './actions';
+import {Settings} from './settings';
+import {listenToCommonEvents} from './common-events';
+import {init as initCodemirror} from './codemirror';
+import {EditorView} from "@codemirror/view";
+
+export interface MarkdownEditorConfig {
+    pageId: string;
+    container: Element;
+    displayEl: Element;
+    inputEl: HTMLTextAreaElement;
+    drawioUrl: string;
+    settingInputs: HTMLInputElement[];
+    text: Record<string, string>;
+}
+
+export interface MarkdownEditor {
+    config: MarkdownEditorConfig;
+    display: Display;
+    markdown: Markdown;
+    actions: Actions;
+    cm: EditorView;
+    settings: Settings;
+}
+
+/**
+ * Initiate a new Markdown editor instance.
+ * @param {MarkdownEditorConfig} config
+ * @returns {Promise<MarkdownEditor>}
+ */
+export async function init(config) {
+    /**
+     * @type {MarkdownEditor}
+     */
+    const editor: MarkdownEditor = {
+        config,
+        markdown: new Markdown(),
+        settings: new Settings(config.settingInputs),
+    };
+
+    editor.actions = new Actions(editor);
+    editor.display = new Display(editor);
+    editor.cm = await initCodemirror(editor);
+
+    listenToCommonEvents(editor);
+
+    return editor;
+}
+
+
diff --git a/resources/js/markdown/settings.js b/resources/js/markdown/settings.js
index b843aaa8a2b..e2e1fce5e37 100644
--- a/resources/js/markdown/settings.js
+++ b/resources/js/markdown/settings.js
@@ -5,6 +5,7 @@ export class Settings {
             scrollSync: true,
             showPreview: true,
             editorWidth: 50,
+            plainEditor: false,
         };
         this.changeListeners = {};
         this.loadFromLocalStorage();
diff --git a/resources/views/pages/parts/markdown-editor.blade.php b/resources/views/pages/parts/markdown-editor.blade.php
index ac62443f985..5b1761b7656 100644
--- a/resources/views/pages/parts/markdown-editor.blade.php
+++ b/resources/views/pages/parts/markdown-editor.blade.php
@@ -26,6 +26,10 @@ class="flex-fill flex code-fill">
                     <div class="px-m">
                         @include('form.custom-checkbox', ['name' => 'md-scrollSync', 'label' => trans('entities.pages_md_sync_scroll'), 'value' => true, 'checked' => true])
                     </div>
+                    <hr class="m-none">
+                    <div class="px-m">
+                        @include('form.custom-checkbox', ['name' => 'md-plainEditor', 'label' => trans('entities.pages_md_plain_editor'), 'value' => true, 'checked' => false])
+                    </div>
                 </div>
             </div>
         </div>

From 61adc735c8d525907dbb8b1b554c24d303cec229 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 20 Jul 2025 15:05:19 +0100
Subject: [PATCH 603/666] MD Editor: Finished conversion to Typescript

---
 package-lock.json                             | 26 ++++++
 package.json                                  |  1 +
 .../markdown/{codemirror.js => codemirror.ts} | 38 +++++----
 .../js/markdown/{display.js => display.ts}    | 78 ++++++++++--------
 resources/js/markdown/index.mts               | 11 +--
 .../js/markdown/{markdown.js => markdown.ts}  | 11 ++-
 resources/js/markdown/settings.js             | 64 ---------------
 resources/js/markdown/settings.ts             | 82 +++++++++++++++++++
 .../markdown/{shortcuts.js => shortcuts.ts}   | 15 ++--
 9 files changed, 188 insertions(+), 138 deletions(-)
 rename resources/js/markdown/{codemirror.js => codemirror.ts} (68%)
 rename resources/js/markdown/{display.js => display.ts} (52%)
 rename resources/js/markdown/{markdown.js => markdown.ts} (68%)
 delete mode 100644 resources/js/markdown/settings.js
 create mode 100644 resources/js/markdown/settings.ts
 rename resources/js/markdown/{shortcuts.js => shortcuts.ts} (85%)

diff --git a/package-lock.json b/package-lock.json
index 926a6d9e3f5..0348fd1ed42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,7 @@
       "devDependencies": {
         "@eslint/js": "^9.21.0",
         "@lezer/generator": "^1.7.2",
+        "@types/markdown-it": "^14.1.2",
         "@types/sortablejs": "^1.15.8",
         "chokidar-cli": "^3.0",
         "esbuild": "^0.25.0",
@@ -2508,6 +2509,31 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/node": {
       "version": "22.15.21",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
diff --git a/package.json b/package.json
index 5d94537d140..151338d8c6e 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@eslint/js": "^9.21.0",
     "@lezer/generator": "^1.7.2",
+    "@types/markdown-it": "^14.1.2",
     "@types/sortablejs": "^1.15.8",
     "chokidar-cli": "^3.0",
     "esbuild": "^0.25.0",
diff --git a/resources/js/markdown/codemirror.js b/resources/js/markdown/codemirror.ts
similarity index 68%
rename from resources/js/markdown/codemirror.js
rename to resources/js/markdown/codemirror.ts
index 61b2e84573d..a3b81418f9f 100644
--- a/resources/js/markdown/codemirror.js
+++ b/resources/js/markdown/codemirror.ts
@@ -1,19 +1,16 @@
 import {provideKeyBindings} from './shortcuts';
-import {debounce} from '../services/util.ts';
-import {Clipboard} from '../services/clipboard.ts';
+import {debounce} from '../services/util';
+import {Clipboard} from '../services/clipboard';
+import {EditorView, ViewUpdate} from "@codemirror/view";
+import {MarkdownEditor} from "./index.mjs";
 
 /**
  * Initiate the codemirror instance for the markdown editor.
- * @param {MarkdownEditor} editor
- * @returns {Promise<EditorView>}
  */
-export async function init(editor) {
-    const Code = await window.importVersioned('code');
+export async function init(editor: MarkdownEditor): Promise<EditorView> {
+    const Code = await window.importVersioned('code') as (typeof import('../code/index.mjs'));
 
-    /**
-     * @param {ViewUpdate} v
-     */
-    function onViewUpdate(v) {
+    function onViewUpdate(v: ViewUpdate) {
         if (v.docChanged) {
             editor.actions.updateAndRender();
         }
@@ -27,9 +24,13 @@ export async function init(editor) {
 
     const domEventHandlers = {
         // Handle scroll to sync display view
-        scroll: event => syncActive && onScrollDebounced(event),
+        scroll: (event: Event) => syncActive && onScrollDebounced(event),
         // Handle image & content drag n drop
-        drop: event => {
+        drop: (event: DragEvent) => {
+            if (!event.dataTransfer) {
+                return;
+            }
+
             const templateId = event.dataTransfer.getData('bookstack/template');
             if (templateId) {
                 event.preventDefault();
@@ -45,12 +46,16 @@ export async function init(editor) {
             }
         },
         // Handle dragover event to allow as drop-target in chrome
-        dragover: event => {
+        dragover: (event: DragEvent) => {
             event.preventDefault();
         },
         // Handle image paste
-        paste: event => {
-            const clipboard = new Clipboard(event.clipboardData || event.dataTransfer);
+        paste: (event: ClipboardEvent) => {
+            if (!event.clipboardData) {
+                return;
+            }
+
+            const clipboard = new Clipboard(event.clipboardData);
 
             // Don't handle the event ourselves if no items exist of contains table-looking data
             if (!clipboard.hasItems() || clipboard.containsTabularData()) {
@@ -71,8 +76,9 @@ export async function init(editor) {
         provideKeyBindings(editor),
     );
 
-    // Add editor view to window for easy access/debugging.
+    // Add editor view to the window for easy access/debugging.
     // Not part of official API/Docs
+    // @ts-ignore
     window.mdEditorView = cm;
 
     return cm;
diff --git a/resources/js/markdown/display.js b/resources/js/markdown/display.ts
similarity index 52%
rename from resources/js/markdown/display.js
rename to resources/js/markdown/display.ts
index 60be26b5fb7..3eb7e5c6aa2 100644
--- a/resources/js/markdown/display.js
+++ b/resources/js/markdown/display.ts
@@ -1,35 +1,36 @@
-import {patchDomFromHtmlString} from '../services/vdom.ts';
+import { patchDomFromHtmlString } from '../services/vdom';
+import {MarkdownEditor} from "./index.mjs";
 
 export class Display {
+    protected editor: MarkdownEditor;
+    protected container: HTMLIFrameElement;
+    protected doc: Document | null = null;
+    protected lastDisplayClick: number = 0;
 
-    /**
-     * @param {MarkdownEditor} editor
-     */
-    constructor(editor) {
+    constructor(editor: MarkdownEditor) {
         this.editor = editor;
         this.container = editor.config.displayEl;
 
-        this.doc = null;
-        this.lastDisplayClick = 0;
-
-        if (this.container.contentDocument.readyState === 'complete') {
+        if (this.container.contentDocument?.readyState === 'complete') {
             this.onLoad();
         } else {
             this.container.addEventListener('load', this.onLoad.bind(this));
         }
 
-        this.updateVisibility(editor.settings.get('showPreview'));
-        editor.settings.onChange('showPreview', show => this.updateVisibility(show));
+        this.updateVisibility(Boolean(editor.settings.get('showPreview')));
+        editor.settings.onChange('showPreview', (show) => this.updateVisibility(Boolean(show)));
     }
 
-    updateVisibility(show) {
-        const wrap = this.container.closest('.markdown-editor-wrap');
-        wrap.style.display = show ? null : 'none';
+    protected updateVisibility(show: boolean): void {
+        const wrap = this.container.closest('.markdown-editor-wrap') as HTMLElement;
+        wrap.style.display = show ? '' : 'none';
     }
 
-    onLoad() {
+    protected onLoad(): void {
         this.doc = this.container.contentDocument;
 
+        if (!this.doc) return;
+
         this.loadStylesIntoDisplay();
         this.doc.body.className = 'page-content';
 
@@ -37,20 +38,20 @@ export class Display {
         this.doc.addEventListener('click', this.onDisplayClick.bind(this));
     }
 
-    /**
-     * @param {MouseEvent} event
-     */
-    onDisplayClick(event) {
+    protected onDisplayClick(event: MouseEvent): void {
         const isDblClick = Date.now() - this.lastDisplayClick < 300;
 
-        const link = event.target.closest('a');
+        const link = (event.target as Element).closest('a');
         if (link !== null) {
             event.preventDefault();
-            window.open(link.getAttribute('href'));
+            const href = link.getAttribute('href');
+            if (href) {
+                window.open(href);
+            }
             return;
         }
 
-        const drawing = event.target.closest('[drawio-diagram]');
+        const drawing = (event.target as Element).closest('[drawio-diagram]') as HTMLElement;
         if (drawing !== null && isDblClick) {
             this.editor.actions.editDrawing(drawing);
             return;
@@ -59,10 +60,12 @@ export class Display {
         this.lastDisplayClick = Date.now();
     }
 
-    loadStylesIntoDisplay() {
+    protected loadStylesIntoDisplay(): void {
+        if (!this.doc) return;
+
         this.doc.documentElement.classList.add('markdown-editor-display');
 
-        // Set display to be dark mode if parent is
+        // Set display to be dark mode if the parent is
         if (document.documentElement.classList.contains('dark-mode')) {
             this.doc.documentElement.style.backgroundColor = '#222';
             this.doc.documentElement.classList.add('dark-mode');
@@ -71,24 +74,25 @@ export class Display {
         this.doc.head.innerHTML = '';
         const styles = document.head.querySelectorAll('style,link[rel=stylesheet]');
         for (const style of styles) {
-            const copy = style.cloneNode(true);
+            const copy = style.cloneNode(true) as HTMLElement;
             this.doc.head.appendChild(copy);
         }
     }
 
     /**
      * Patch the display DOM with the given HTML content.
-     * @param {String} html
      */
-    patchWithHtml(html) {
-        const {body} = this.doc;
+    public patchWithHtml(html: string): void {
+        if (!this.doc) return;
+
+        const { body } = this.doc;
 
         if (body.children.length === 0) {
             const wrap = document.createElement('div');
             this.doc.body.append(wrap);
         }
 
-        const target = body.children[0];
+        const target = body.children[0] as HTMLElement;
 
         patchDomFromHtmlString(target, html);
     }
@@ -96,14 +100,16 @@ export class Display {
     /**
      * Scroll to the given block index within the display content.
      * Will scroll to the end if the index is -1.
-     * @param {Number} index
      */
-    scrollToIndex(index) {
-        const elems = this.doc.body?.children[0]?.children;
-        if (elems && elems.length <= index) return;
+    public scrollToIndex(index: number): void {
+        const elems = this.doc?.body?.children[0]?.children;
+        if (!elems || elems.length <= index) return;
 
         const topElem = (index === -1) ? elems[elems.length - 1] : elems[index];
-        topElem.scrollIntoView({block: 'start', inline: 'nearest', behavior: 'smooth'});
+        (topElem as Element).scrollIntoView({
+            block: 'start',
+            inline: 'nearest',
+            behavior: 'smooth'
+        });
     }
-
-}
+}
\ No newline at end of file
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index 46345ccfd6f..d487b7972e8 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -9,7 +9,7 @@ import {EditorView} from "@codemirror/view";
 export interface MarkdownEditorConfig {
     pageId: string;
     container: Element;
-    displayEl: Element;
+    displayEl: HTMLIFrameElement;
     inputEl: HTMLTextAreaElement;
     drawioUrl: string;
     settingInputs: HTMLInputElement[];
@@ -27,18 +27,13 @@ export interface MarkdownEditor {
 
 /**
  * Initiate a new Markdown editor instance.
- * @param {MarkdownEditorConfig} config
- * @returns {Promise<MarkdownEditor>}
  */
-export async function init(config) {
-    /**
-     * @type {MarkdownEditor}
-     */
+export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor> {
     const editor: MarkdownEditor = {
         config,
         markdown: new Markdown(),
         settings: new Settings(config.settingInputs),
-    };
+    } as MarkdownEditor;
 
     editor.actions = new Actions(editor);
     editor.display = new Display(editor);
diff --git a/resources/js/markdown/markdown.js b/resources/js/markdown/markdown.ts
similarity index 68%
rename from resources/js/markdown/markdown.js
rename to resources/js/markdown/markdown.ts
index e63184accaf..07ea09e9113 100644
--- a/resources/js/markdown/markdown.js
+++ b/resources/js/markdown/markdown.ts
@@ -1,7 +1,9 @@
 import MarkdownIt from 'markdown-it';
+// @ts-ignore
 import mdTasksLists from 'markdown-it-task-lists';
 
 export class Markdown {
+    protected renderer: MarkdownIt;
 
     constructor() {
         this.renderer = new MarkdownIt({html: true});
@@ -9,19 +11,16 @@ export class Markdown {
     }
 
     /**
-     * Get the front-end render used to convert markdown to HTML.
-     * @returns {MarkdownIt}
+     * Get the front-end render used to convert Markdown to HTML.
      */
-    getRenderer() {
+    getRenderer(): MarkdownIt {
         return this.renderer;
     }
 
     /**
      * Convert the given Markdown to HTML.
-     * @param {String} markdown
-     * @returns {String}
      */
-    render(markdown) {
+    render(markdown: string): string {
         return this.renderer.render(markdown);
     }
 
diff --git a/resources/js/markdown/settings.js b/resources/js/markdown/settings.js
deleted file mode 100644
index e2e1fce5e37..00000000000
--- a/resources/js/markdown/settings.js
+++ /dev/null
@@ -1,64 +0,0 @@
-export class Settings {
-
-    constructor(settingInputs) {
-        this.settingMap = {
-            scrollSync: true,
-            showPreview: true,
-            editorWidth: 50,
-            plainEditor: false,
-        };
-        this.changeListeners = {};
-        this.loadFromLocalStorage();
-        this.applyToInputs(settingInputs);
-        this.listenToInputChanges(settingInputs);
-    }
-
-    applyToInputs(inputs) {
-        for (const input of inputs) {
-            const name = input.getAttribute('name').replace('md-', '');
-            input.checked = this.settingMap[name];
-        }
-    }
-
-    listenToInputChanges(inputs) {
-        for (const input of inputs) {
-            input.addEventListener('change', () => {
-                const name = input.getAttribute('name').replace('md-', '');
-                this.set(name, input.checked);
-            });
-        }
-    }
-
-    loadFromLocalStorage() {
-        const lsValString = window.localStorage.getItem('md-editor-settings');
-        if (!lsValString) {
-            return;
-        }
-
-        const lsVals = JSON.parse(lsValString);
-        for (const [key, value] of Object.entries(lsVals)) {
-            if (value !== null && this.settingMap[key] !== undefined) {
-                this.settingMap[key] = value;
-            }
-        }
-    }
-
-    set(key, value) {
-        this.settingMap[key] = value;
-        window.localStorage.setItem('md-editor-settings', JSON.stringify(this.settingMap));
-        for (const listener of (this.changeListeners[key] || [])) {
-            listener(value);
-        }
-    }
-
-    get(key) {
-        return this.settingMap[key] || null;
-    }
-
-    onChange(key, callback) {
-        const listeners = this.changeListeners[key] || [];
-        listeners.push(callback);
-        this.changeListeners[key] = listeners;
-    }
-
-}
diff --git a/resources/js/markdown/settings.ts b/resources/js/markdown/settings.ts
new file mode 100644
index 00000000000..c446cbe052e
--- /dev/null
+++ b/resources/js/markdown/settings.ts
@@ -0,0 +1,82 @@
+type ChangeListener = (value: boolean|number) => void;
+
+export class Settings {
+    protected changeListeners: Record<string, ChangeListener[]> = {};
+
+    protected settingMap: Record<string, boolean|number> = {
+        scrollSync: true,
+        showPreview: true,
+        editorWidth: 50,
+        plainEditor: false,
+    };
+
+    constructor(settingInputs: HTMLInputElement[]) {
+        this.loadFromLocalStorage();
+        this.applyToInputs(settingInputs);
+        this.listenToInputChanges(settingInputs);
+    }
+
+    protected applyToInputs(inputs: HTMLInputElement[]): void {
+        for (const input of inputs) {
+            const name = input.getAttribute('name')?.replace('md-', '');
+            if (name && name in this.settingMap) {
+                const value = this.settingMap[name];
+                if (typeof value === 'boolean') {
+                    input.checked = value;
+                } else {
+                    input.value = value.toString();
+                }
+            }
+        }
+    }
+
+    protected listenToInputChanges(inputs: HTMLInputElement[]): void {
+        for (const input of inputs) {
+            input.addEventListener('change', () => {
+                const name = input.getAttribute('name')?.replace('md-', '');
+                if (name && name in this.settingMap) {
+                    let value = (input.type === 'checkbox') ? input.checked : Number(input.value);
+                    this.set(name, value);
+                }
+            });
+        }
+    }
+
+    protected loadFromLocalStorage(): void {
+        const lsValString = window.localStorage.getItem('md-editor-settings');
+        if (!lsValString) {
+            return;
+        }
+
+        try {
+            const lsVals = JSON.parse(lsValString);
+            for (const [key, value] of Object.entries(lsVals)) {
+                if (value !== null && value !== undefined && key in this.settingMap) {
+                    this.settingMap[key] = value as boolean|number;
+                }
+            }
+        } catch (error) {
+            console.warn('Failed to parse settings from localStorage:', error);
+        }
+    }
+
+    public set(key: string, value: boolean|number): void {
+        this.settingMap[key] = value;
+        window.localStorage.setItem('md-editor-settings', JSON.stringify(this.settingMap));
+
+        const listeners = this.changeListeners[key] || [];
+        for (const listener of listeners) {
+            listener(value);
+        }
+    }
+
+    public get(key: string): number|boolean|null {
+        return this.settingMap[key] ?? null;
+    }
+
+    public onChange(key: string, callback: ChangeListener): void {
+        const listeners = this.changeListeners[key] || [];
+        listeners.push(callback);
+        this.changeListeners[key] = listeners;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/markdown/shortcuts.js b/resources/js/markdown/shortcuts.ts
similarity index 85%
rename from resources/js/markdown/shortcuts.js
rename to resources/js/markdown/shortcuts.ts
index 543e6dcdde6..c746b52e703 100644
--- a/resources/js/markdown/shortcuts.js
+++ b/resources/js/markdown/shortcuts.ts
@@ -1,10 +1,11 @@
+import {MarkdownEditor} from "./index.mjs";
+import {KeyBinding} from "@codemirror/view";
+
 /**
  * Provide shortcuts for the editor instance.
- * @param {MarkdownEditor} editor
- * @returns {Object<String, Function>}
  */
-function provide(editor) {
-    const shortcuts = {};
+function provide(editor: MarkdownEditor): Record<string, () => void> {
+    const shortcuts: Record<string, () => void> = {};
 
     // Insert Image shortcut
     shortcuts['Shift-Mod-i'] = () => editor.actions.insertImage();
@@ -42,14 +43,12 @@ function provide(editor) {
 
 /**
  * Get the editor shortcuts in CodeMirror keybinding format.
- * @param {MarkdownEditor} editor
- * @return {{key: String, run: function, preventDefault: boolean}[]}
  */
-export function provideKeyBindings(editor) {
+export function provideKeyBindings(editor: MarkdownEditor): KeyBinding[] {
     const shortcuts = provide(editor);
     const keyBindings = [];
 
-    const wrapAction = action => () => {
+    const wrapAction = (action: ()=>void) => () => {
         action();
         return true;
     };

From ec07793cda66d319bf716ef3dcbbe2fe19f0c355 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Jul 2025 11:49:58 +0100
Subject: [PATCH 604/666] MD Editor: Started work on input interface

Created implementation for codemirror, yet to use it.
---
 resources/js/global.d.ts                   |   4 +-
 resources/js/markdown/codemirror.ts        |   7 +-
 resources/js/markdown/index.mts            |   6 +-
 resources/js/markdown/inputs/codemirror.ts | 120 +++++++++++++++++++++
 resources/js/markdown/inputs/interface.ts  |  71 ++++++++++++
 5 files changed, 202 insertions(+), 6 deletions(-)
 create mode 100644 resources/js/markdown/inputs/codemirror.ts
 create mode 100644 resources/js/markdown/inputs/interface.ts

diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts
index b637c97c1b9..239f4b9249a 100644
--- a/resources/js/global.d.ts
+++ b/resources/js/global.d.ts
@@ -15,4 +15,6 @@ declare global {
         baseUrl: (path: string) => string;
         importVersioned: (module: string) => Promise<object>;
     }
-}
\ No newline at end of file
+}
+
+export type CodeModule = (typeof import('./code/index.mjs'));
\ No newline at end of file
diff --git a/resources/js/markdown/codemirror.ts b/resources/js/markdown/codemirror.ts
index a3b81418f9f..1b54c58196b 100644
--- a/resources/js/markdown/codemirror.ts
+++ b/resources/js/markdown/codemirror.ts
@@ -3,13 +3,12 @@ import {debounce} from '../services/util';
 import {Clipboard} from '../services/clipboard';
 import {EditorView, ViewUpdate} from "@codemirror/view";
 import {MarkdownEditor} from "./index.mjs";
+import {CodeModule} from "../global";
 
 /**
- * Initiate the codemirror instance for the markdown editor.
+ * Initiate the codemirror instance for the MarkDown editor.
  */
-export async function init(editor: MarkdownEditor): Promise<EditorView> {
-    const Code = await window.importVersioned('code') as (typeof import('../code/index.mjs'));
-
+export function init(editor: MarkdownEditor, Code: CodeModule): EditorView {
     function onViewUpdate(v: ViewUpdate) {
         if (v.docChanged) {
             editor.actions.updateAndRender();
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index d487b7972e8..b983285d907 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -5,6 +5,8 @@ import {Settings} from './settings';
 import {listenToCommonEvents} from './common-events';
 import {init as initCodemirror} from './codemirror';
 import {EditorView} from "@codemirror/view";
+import {importVersioned} from "../services/util";
+import {CodeModule} from "../global";
 
 export interface MarkdownEditorConfig {
     pageId: string;
@@ -29,6 +31,8 @@ export interface MarkdownEditor {
  * Initiate a new Markdown editor instance.
  */
 export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor> {
+    const Code = await window.importVersioned('code') as CodeModule;
+
     const editor: MarkdownEditor = {
         config,
         markdown: new Markdown(),
@@ -37,7 +41,7 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
 
     editor.actions = new Actions(editor);
     editor.display = new Display(editor);
-    editor.cm = await initCodemirror(editor);
+    editor.cm = initCodemirror(editor, Code);
 
     listenToCommonEvents(editor);
 
diff --git a/resources/js/markdown/inputs/codemirror.ts b/resources/js/markdown/inputs/codemirror.ts
new file mode 100644
index 00000000000..8fc6b686374
--- /dev/null
+++ b/resources/js/markdown/inputs/codemirror.ts
@@ -0,0 +1,120 @@
+import {MarkdownEditorInput, MarkdownEditorInputSelection} from "./interface";
+import {MarkdownEditor} from "../index.mjs";
+import {EditorView} from "@codemirror/view";
+import {ChangeSpec, SelectionRange, TransactionSpec} from "@codemirror/state";
+
+
+export class CodemirrorInput implements MarkdownEditorInput {
+
+    protected editor: MarkdownEditor;
+    protected cm: EditorView;
+
+    constructor(cm: EditorView) {
+        this.cm = cm;
+    }
+
+    focus(): void {
+        if (!this.editor.cm.hasFocus) {
+            this.editor.cm.focus();
+        }
+    }
+
+    getSelection(): MarkdownEditorInputSelection {
+        return this.editor.cm.state.selection.main;
+    }
+
+    getSelectionText(selection: MarkdownEditorInputSelection|null = null): string {
+        selection = selection || this.getSelection();
+        return this.editor.cm.state.sliceDoc(selection.from, selection.to);
+    }
+
+    setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean = false) {
+        this.editor.cm.dispatch({
+            selection: {anchor: selection.from, head: selection.to},
+            scrollIntoView,
+        });
+    }
+
+    getText(): string {
+        return this.editor.cm.state.doc.toString();
+    }
+
+    getTextAboveView(): string {
+        const blockInfo = this.editor.cm.lineBlockAtHeight(scrollEl.scrollTop);
+        return this.editor.cm.state.sliceDoc(0, blockInfo.from);
+    }
+
+    setText(text: string, selection: MarkdownEditorInputSelection | null = null) {
+        selection = selection || this.getSelection();
+        const newDoc = this.editor.cm.state.toText(text);
+        const newSelectFrom = Math.min(selection.from, newDoc.length);
+        const scrollTop = this.editor.cm.scrollDOM.scrollTop;
+        this.dispatchChange(0, this.editor.cm.state.doc.length, text, newSelectFrom);
+        this.focus();
+        window.requestAnimationFrame(() => {
+            this.editor.cm.scrollDOM.scrollTop = scrollTop;
+        });
+    }
+
+    spliceText(from: number, to: number, newText: string, selection: MarkdownEditorInputSelection | null = null) {
+        const end = (selection?.from === selection?.to) ? null : selection?.to;
+        this.dispatchChange(from, to, newText, selection?.from, end)
+    }
+
+    appendText(text: string) {
+        const end = this.editor.cm.state.doc.length;
+        this.dispatchChange(end, end, `\n${text}`);
+    }
+
+    getLineText(lineIndex: number = -1): string {
+        const index = lineIndex > -1 ? lineIndex : this.getSelection().from;
+        return this.editor.cm.state.doc.lineAt(index).text;
+    }
+
+    wrapLine(start: string, end: string) {
+        const selectionRange = this.getSelection();
+        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
+        const lineContent = line.text;
+        let newLineContent;
+        let lineOffset = 0;
+
+        if (lineContent.startsWith(start) && lineContent.endsWith(end)) {
+            newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
+            lineOffset = -(start.length);
+        } else {
+            newLineContent = `${start}${lineContent}${end}`;
+            lineOffset = start.length;
+        }
+
+        this.dispatchChange(line.from, line.to, newLineContent, selectionRange.from + lineOffset);
+    }
+
+    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
+        const cursorPos = this.editor.cm.posAtCoords({x, y}, false);
+        return {from: cursorPos, to: cursorPos};
+    }
+
+    /**
+     * Dispatch changes to the editor.
+     */
+    protected dispatchChange(from: number, to: number|null = null, text: string|null = null, selectFrom: number|null = null, selectTo: number|null = null): void {
+        const change: ChangeSpec = {from};
+        if (to) {
+            change.to = to;
+        }
+        if (text) {
+            change.insert = text;
+        }
+        const tr: TransactionSpec = {changes: change};
+
+        if (selectFrom) {
+            tr.selection = {anchor: selectFrom};
+            if (selectTo) {
+                tr.selection.head = selectTo;
+            }
+        }
+
+        this.cm.dispatch(tr);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/js/markdown/inputs/interface.ts b/resources/js/markdown/inputs/interface.ts
new file mode 100644
index 00000000000..aafd86f9187
--- /dev/null
+++ b/resources/js/markdown/inputs/interface.ts
@@ -0,0 +1,71 @@
+
+export interface MarkdownEditorInputSelection {
+    from: number;
+    to: number;
+}
+
+export interface MarkdownEditorInput {
+    /**
+     * Focus on the editor.
+     */
+    focus(): void;
+
+    /**
+     * Get the current selection range.
+     */
+    getSelection(): MarkdownEditorInputSelection;
+
+    /**
+     * Get the text of the given (or current) selection range.
+     */
+    getSelectionText(selection: MarkdownEditorInputSelection|null = null): string;
+
+    /**
+     * Set the selection range of the editor.
+     */
+    setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean = false): void;
+
+    /**
+     * Get the full text of the input.
+     */
+    getText(): string;
+
+    /**
+     * Get just the text which is above (out) the current view range.
+     * This is used for position estimation.
+     */
+    getTextAboveView(): string;
+
+    /**
+     * Set the full text of the input.
+     * Optionally can provide a selection to restore after setting text.
+     */
+    setText(text: string, selection: MarkdownEditorInputSelection|null = null): void;
+
+    /**
+     * Splice in/out text within the input.
+     * Optionally can provide a selection to restore after setting text.
+     */
+    spliceText(from: number, to: number, newText: string, selection: MarkdownEditorInputSelection|null = null): void;
+
+    /**
+     * Append text to the end of the editor.
+     */
+    appendText(text: string): void;
+
+    /**
+     * Get the text of the given line number otherwise the text
+     * of the current selected line.
+     */
+    getLineText(lineIndex:number = -1): string;
+
+    /**
+     * Wrap the current line in the given start/end contents.
+     */
+    wrapLine(start: string, end: string): void;
+
+    /**
+     * Convert the given screen coords to a selection position within the input.
+     */
+    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection;
+}
\ No newline at end of file

From 5ffec2c52d6b6c1cf61e53813fe4bfbece3da1aa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Jul 2025 14:24:51 +0100
Subject: [PATCH 605/666] MD Editor: Updated actions to use input interface

---
 resources/js/markdown/actions.ts           | 241 +++++++--------------
 resources/js/markdown/index.mts            |  10 +-
 resources/js/markdown/inputs/codemirror.ts |  82 +++----
 resources/js/markdown/inputs/interface.ts  |  19 +-
 4 files changed, 136 insertions(+), 216 deletions(-)

diff --git a/resources/js/markdown/actions.ts b/resources/js/markdown/actions.ts
index c6210809cce..ed4ee5904ba 100644
--- a/resources/js/markdown/actions.ts
+++ b/resources/js/markdown/actions.ts
@@ -1,7 +1,7 @@
 import * as DrawIO from '../services/drawio';
 import {MarkdownEditor} from "./index.mjs";
 import {EntitySelectorPopup, ImageManager} from "../components";
-import {ChangeSpec, SelectionRange, TransactionSpec} from "@codemirror/state";
+import {MarkdownEditorInputSelection} from "./inputs/interface";
 
 interface ImageManagerImage {
     id: number;
@@ -23,7 +23,7 @@ export class Actions {
     }
 
     updateAndRender() {
-        const content = this.#getText();
+        const content = this.editor.input.getText();
         this.editor.config.inputEl.value = content;
 
         const html = this.editor.markdown.render(content);
@@ -43,26 +43,26 @@ export class Actions {
 
         imageManager.show((image: ImageManagerImage) => {
             const imageUrl = image.thumbs?.display || image.url;
-            const selectedText = this.#getSelectionText();
+            const selectedText = this.editor.input.getSelectionText();
             const newText = `[![${selectedText || image.name}](${imageUrl})](${image.url})`;
             this.#replaceSelection(newText, newText.length);
         }, 'gallery');
     }
 
     insertImage() {
-        const newText = `![${this.#getSelectionText()}](http://)`;
+        const newText = `![${this.editor.input.getSelectionText()}](http://)`;
         this.#replaceSelection(newText, newText.length - 1);
     }
 
     insertLink() {
-        const selectedText = this.#getSelectionText();
+        const selectedText = this.editor.input.getSelectionText();
         const newText = `[${selectedText}]()`;
         const cursorPosDiff = (selectedText === '') ? -3 : -1;
         this.#replaceSelection(newText, newText.length + cursorPosDiff);
     }
 
     showImageManager() {
-        const selectionRange = this.#getSelectionRange();
+        const selectionRange = this.editor.input.getSelection();
         const imageManager = window.$components.first('image-manager') as ImageManager;
         imageManager.show((image: ImageManagerImage) => {
             this.#insertDrawing(image, selectionRange);
@@ -71,10 +71,10 @@ export class Actions {
 
     // Show the popup link selector and insert a link when finished
     showLinkSelector() {
-        const selectionRange = this.#getSelectionRange();
+        const selectionRange = this.editor.input.getSelection();
 
         const selector = window.$components.first('entity-selector-popup') as EntitySelectorPopup;
-        const selectionText = this.#getSelectionText(selectionRange);
+        const selectionText = this.editor.input.getSelectionText(selectionRange);
         selector.show(entity => {
             const selectedText = selectionText || entity.name;
             const newText = `[${selectedText}](${entity.link})`;
@@ -92,7 +92,7 @@ export class Actions {
         const url = this.editor.config.drawioUrl;
         if (!url) return;
 
-        const selectionRange = this.#getSelectionRange();
+        const selectionRange = this.editor.input.getSelection();
 
         DrawIO.show(url, () => Promise.resolve(''), async pngData => {
             const data = {
@@ -111,7 +111,7 @@ export class Actions {
         });
     }
 
-    #insertDrawing(image: ImageManagerImage, originalSelectionRange: SelectionRange) {
+    #insertDrawing(image: ImageManagerImage, originalSelectionRange: MarkdownEditorInputSelection) {
         const newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
         this.#replaceSelection(newText, newText.length, originalSelectionRange);
     }
@@ -123,7 +123,7 @@ export class Actions {
             return;
         }
 
-        const selectionRange = this.#getSelectionRange();
+        const selectionRange = this.editor.input.getSelection();
         const drawingId = imgContainer.getAttribute('drawio-diagram') || '';
         if (!drawingId) {
             return;
@@ -139,13 +139,13 @@ export class Actions {
                 const resp = await window.$http.post('/images/drawio', data);
                 const image = resp.data as ImageManagerImage;
                 const newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
-                const newContent = this.#getText().split('\n').map(line => {
+                const newContent = this.editor.input.getText().split('\n').map(line => {
                     if (line.indexOf(`drawio-diagram="${drawingId}"`) !== -1) {
                         return newText;
                     }
                     return line;
                 }).join('\n');
-                this.#setText(newContent, selectionRange);
+                this.editor.input.setText(newContent, selectionRange);
                 DrawIO.close();
             } catch (err) {
                 this.handleDrawingUploadError(err);
@@ -177,30 +177,15 @@ export class Actions {
             return;
         }
 
-        const text = this.editor.cm.state.doc;
-        let lineCount = 1;
-        let scrollToLine = -1;
-        for (const line of text.iterLines()) {
-            if (line.includes(searchText)) {
-                scrollToLine = lineCount;
-                break;
-            }
-            lineCount += 1;
+        const lineRange = this.editor.input.searchForLineContaining(searchText);
+        if (lineRange) {
+            this.editor.input.setSelection(lineRange, true);
+            this.editor.input.focus();
         }
-
-        if (scrollToLine === -1) {
-            return;
-        }
-
-        const line = text.line(scrollToLine);
-        this.#setSelection(line.from, line.to, true);
-        this.focus();
     }
 
     focus() {
-        if (!this.editor.cm.hasFocus) {
-            this.editor.cm.focus();
-        }
+        this.editor.input.focus();
     }
 
     /**
@@ -215,10 +200,10 @@ export class Actions {
      */
     prependContent(content: string): void {
         content = this.#cleanTextForEditor(content);
-        const selectionRange = this.#getSelectionRange();
+        const selectionRange = this.editor.input.getSelection();
         const selectFrom = selectionRange.from + content.length + 1;
-        this.#dispatchChange(0, 0, `${content}\n`, selectFrom);
-        this.focus();
+        this.editor.input.spliceText(0, 0, `${content}\n`, {from: selectFrom});
+        this.editor.input.focus();
     }
 
     /**
@@ -226,16 +211,15 @@ export class Actions {
      */
     appendContent(content: string): void {
         content = this.#cleanTextForEditor(content);
-        const end = this.editor.cm.state.doc.length;
-        this.#dispatchChange(end, end, `\n${content}`);
-        this.focus();
+        this.editor.input.appendText(content);
+        this.editor.input.focus();
     }
 
     /**
      * Replace the editor's contents
      */
     replaceContent(content: string): void {
-        this.#setText(content);
+        this.editor.input.setText(content);
     }
 
     /**
@@ -243,17 +227,16 @@ export class Actions {
      * @param {String} newStart
      */
     replaceLineStart(newStart: string): void {
-        const selectionRange = this.#getSelectionRange();
-        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
-
-        const lineContent = line.text;
+        const selectionRange = this.editor.input.getSelection();
+        const lineRange = this.editor.input.getLineRangeFromPosition(selectionRange.from);
+        const lineContent = this.editor.input.getSelectionText(lineRange);
         const lineStart = lineContent.split(' ')[0];
 
         // Remove symbol if already set
         if (lineStart === newStart) {
             const newLineContent = lineContent.replace(`${newStart} `, '');
             const selectFrom = selectionRange.from + (newLineContent.length - lineContent.length);
-            this.#dispatchChange(line.from, line.to, newLineContent, selectFrom);
+            this.editor.input.spliceText(selectionRange.from, selectionRange.to, newLineContent, {from: selectFrom});
             return;
         }
 
@@ -266,46 +249,46 @@ export class Actions {
         }
 
         const selectFrom = selectionRange.from + (newLineContent.length - lineContent.length);
-        this.#dispatchChange(line.from, line.to, newLineContent, selectFrom);
+        this.editor.input.spliceText(lineRange.from, lineRange.to, newLineContent, {from: selectFrom});
     }
 
     /**
      * Wrap the selection in the given contents start and end contents.
      */
     wrapSelection(start: string, end: string): void {
-        const selectRange = this.#getSelectionRange();
-        const selectionText = this.#getSelectionText(selectRange);
+        const selectRange = this.editor.input.getSelection();
+        const selectionText = this.editor.input.getSelectionText(selectRange);
         if (!selectionText) {
             this.#wrapLine(start, end);
             return;
         }
 
-        let newSelectionText = selectionText;
-        let newRange;
+        let newSelectionText: string;
+        let newRange = {from: selectRange.from, to: selectRange.to};
 
         if (selectionText.startsWith(start) && selectionText.endsWith(end)) {
             newSelectionText = selectionText.slice(start.length, selectionText.length - end.length);
-            newRange = selectRange.extend(selectRange.from, selectRange.to - (start.length + end.length));
+            newRange.to = selectRange.to - (start.length + end.length);
         } else {
             newSelectionText = `${start}${selectionText}${end}`;
-            newRange = selectRange.extend(selectRange.from, selectRange.to + (start.length + end.length));
+            newRange.to = selectRange.to + (start.length + end.length);
         }
 
-        this.#dispatchChange(
+        this.editor.input.spliceText(
             selectRange.from,
             selectRange.to,
             newSelectionText,
-            newRange.anchor,
-            newRange.head,
+            newRange,
         );
     }
 
     replaceLineStartForOrderedList() {
-        const selectionRange = this.#getSelectionRange();
-        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
-        const prevLine = this.editor.cm.state.doc.line(line.number - 1);
+        const selectionRange = this.editor.input.getSelection();
+        const lineRange = this.editor.input.getLineRangeFromPosition(selectionRange.from);
+        const prevLineRange = this.editor.input.getLineRangeFromPosition(lineRange.from - 1);
+        const prevLineText = this.editor.input.getSelectionText(prevLineRange);
 
-        const listMatch = prevLine.text.match(/^(\s*)(\d)([).])\s/) || [];
+        const listMatch = prevLineText.match(/^(\s*)(\d)([).])\s/) || [];
 
         const number = (Number(listMatch[2]) || 0) + 1;
         const whiteSpace = listMatch[1] || '';
@@ -320,30 +303,32 @@ export class Actions {
      * Creates a callout block if none existing, and removes it if cycling past the danger type.
      */
     cycleCalloutTypeAtSelection() {
-        const selectionRange = this.#getSelectionRange();
-        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
+        const selectionRange = this.editor.input.getSelection();
+        const lineRange = this.editor.input.getLineRangeFromPosition(selectionRange.from);
+        const lineText = this.editor.input.getSelectionText(lineRange);
 
         const formats = ['info', 'success', 'warning', 'danger'];
         const joint = formats.join('|');
         const regex = new RegExp(`class="((${joint})\\s+callout|callout\\s+(${joint}))"`, 'i');
-        const matches = regex.exec(line.text) || [''];
+        const matches = regex.exec(lineText);
         const format = (matches ? (matches[2] || matches[3]) : '').toLowerCase();
 
         if (format === formats[formats.length - 1]) {
             this.#wrapLine(`<p class="callout ${formats[formats.length - 1]}">`, '</p>');
         } else if (format === '') {
             this.#wrapLine('<p class="callout info">', '</p>');
-        } else {
+        } else if (matches) {
             const newFormatIndex = formats.indexOf(format) + 1;
             const newFormat = formats[newFormatIndex];
-            const newContent = line.text.replace(matches[0], matches[0].replace(format, newFormat));
-            const lineDiff = newContent.length - line.text.length;
-            this.#dispatchChange(
-                line.from,
-                line.to,
+            const newContent = lineText.replace(matches[0], matches[0].replace(format, newFormat));
+            const lineDiff = newContent.length - lineText.length;
+            const anchor = Math.min(selectionRange.from, selectionRange.to);
+            const head = Math.max(selectionRange.from, selectionRange.to);
+            this.editor.input.spliceText(
+                lineRange.from,
+                lineRange.to,
                 newContent,
-                selectionRange.anchor + lineDiff,
-                selectionRange.head + lineDiff,
+                {from: anchor + lineDiff, to: head + lineDiff}
             );
         }
     }
@@ -357,8 +342,7 @@ export class Actions {
             return;
         }
 
-        const blockInfo = this.editor.cm.lineBlockAtHeight(scrollEl.scrollTop);
-        const range = this.editor.cm.state.sliceDoc(0, blockInfo.from);
+        const range = this.editor.input.getTextAboveView();
         const parser = new DOMParser();
         const doc = parser.parseFromString(this.editor.markdown.render(range), 'text/html');
         const totalLines = doc.documentElement.querySelectorAll('body > *');
@@ -370,10 +354,10 @@ export class Actions {
      * The page-relative position provided can be used to determine insert location if possible.
      */
     async insertTemplate(templateId: string, posX: number, posY: number): Promise<void> {
-        const cursorPos = this.editor.cm.posAtCoords({x: posX, y: posY}, false);
+        const cursorPos = this.editor.input.coordsToSelection(posX, posY).from;
         const responseData = (await window.$http.get(`/templates/${templateId}`)).data as {markdown: string, html: string};
         const content = responseData.markdown || responseData.html;
-        this.#dispatchChange(cursorPos, cursorPos, content, cursorPos);
+        this.editor.input.spliceText(cursorPos, cursorPos, content, {from: cursorPos});
     }
 
     /**
@@ -381,21 +365,21 @@ export class Actions {
      * screen coordinates (Typically form a paste event).
      */
     insertClipboardImages(images: File[], posX: number, posY: number): void {
-        const cursorPos = this.editor.cm.posAtCoords({x: posX, y: posY}, false);
+        const cursorPos = this.editor.input.coordsToSelection(posX, posY).from;
         for (const image of images) {
             this.uploadImage(image, cursorPos);
         }
     }
 
     /**
-     * Handle image upload and add image into markdown content
+     * Handle image upload and add image into Markdown content
      */
     async uploadImage(file: File, position: number|null = null): Promise<void> {
         if (file === null || file.type.indexOf('image') !== 0) return;
         let ext = 'png';
 
         if (position === null) {
-            position = this.#getSelectionRange().from;
+            position = this.editor.input.getSelection().from;
         }
 
         if (file.name) {
@@ -409,7 +393,7 @@ export class Actions {
         const id = `image-${Math.random().toString(16).slice(2)}`;
         const placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
         const placeHolderText = `![](${placeholderImage})`;
-        this.#dispatchChange(position, position, placeHolderText, position);
+        this.editor.input.spliceText(position, position, placeHolderText, {from: position});
 
         const remoteFilename = `image-${Date.now()}.${ext}`;
         const formData = new FormData();
@@ -427,54 +411,16 @@ export class Actions {
         }
     }
 
-    /**
-     * Get the current text of the editor instance.
-     * @return {string}
-     */
-    #getText() {
-        return this.editor.cm.state.doc.toString();
-    }
-
-    /**
-     * Set the text of the current editor instance.
-     */
-    #setText(text: string, selectionRange: SelectionRange|null = null) {
-        selectionRange = selectionRange || this.#getSelectionRange();
-        const newDoc = this.editor.cm.state.toText(text);
-        const newSelectFrom = Math.min(selectionRange.from, newDoc.length);
-        const scrollTop = this.editor.cm.scrollDOM.scrollTop;
-        this.#dispatchChange(0, this.editor.cm.state.doc.length, text, newSelectFrom);
-        this.focus();
-        window.requestAnimationFrame(() => {
-            this.editor.cm.scrollDOM.scrollTop = scrollTop;
-        });
-    }
-
     /**
      * Replace the current selection and focus the editor.
      * Takes an offset for the cursor, after the change, relative to the start of the provided string.
      * Can be provided a selection range to use instead of the current selection range.
      */
-    #replaceSelection(newContent: string, cursorOffset: number = 0, selectionRange: SelectionRange|null = null) {
-        selectionRange = selectionRange || this.#getSelectionRange();
-        const selectFrom = selectionRange.from + cursorOffset;
-        this.#dispatchChange(selectionRange.from, selectionRange.to, newContent, selectFrom);
-        this.focus();
-    }
-
-    /**
-     * Get the text content of the main current selection.
-     */
-    #getSelectionText(selectionRange: SelectionRange|null = null): string {
-        selectionRange = selectionRange || this.#getSelectionRange();
-        return this.editor.cm.state.sliceDoc(selectionRange.from, selectionRange.to);
-    }
-
-    /**
-     * Get the range of the current main selection.
-     */
-    #getSelectionRange(): SelectionRange {
-        return this.editor.cm.state.selection.main;
+    #replaceSelection(newContent: string, offset: number = 0, selection: MarkdownEditorInputSelection|null = null) {
+        selection = selection || this.editor.input.getSelection();
+        const selectFrom = selection.from + offset;
+        this.editor.input.spliceText(selection.from, selection.to, newContent, {from: selectFrom, to: selectFrom});
+        this.editor.input.focus();
     }
 
     /**
@@ -489,19 +435,19 @@ export class Actions {
      * Find and replace the first occurrence of [search] with [replace]
      */
     #findAndReplaceContent(search: string, replace: string): void {
-        const newText = this.#getText().replace(search, replace);
-        this.#setText(newText);
+        const newText = this.editor.input.getText().replace(search, replace);
+        this.editor.input.setText(newText);
     }
 
     /**
      * Wrap the line in the given start and end contents.
      */
     #wrapLine(start: string, end: string): void {
-        const selectionRange = this.#getSelectionRange();
-        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
-        const lineContent = line.text;
-        let newLineContent;
-        let lineOffset = 0;
+        const selectionRange = this.editor.input.getSelection();
+        const lineRange = this.editor.input.getLineRangeFromPosition(selectionRange.from);
+        const lineContent = this.editor.input.getSelectionText(lineRange);
+        let newLineContent: string;
+        let lineOffset: number;
 
         if (lineContent.startsWith(start) && lineContent.endsWith(end)) {
             newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
@@ -511,44 +457,7 @@ export class Actions {
             lineOffset = start.length;
         }
 
-        this.#dispatchChange(line.from, line.to, newLineContent, selectionRange.from + lineOffset);
-    }
-
-    /**
-     * Dispatch changes to the editor.
-     */
-    #dispatchChange(from: number, to: number|null = null, text: string|null = null, selectFrom: number|null = null, selectTo: number|null = null): void {
-        const change: ChangeSpec = {from};
-        if (to) {
-            change.to = to;
-        }
-        if (text) {
-            change.insert = text;
-        }
-        const tr: TransactionSpec = {changes: change};
-
-        if (selectFrom) {
-            tr.selection = {anchor: selectFrom};
-            if (selectTo) {
-                tr.selection.head = selectTo;
-            }
-        }
-
-        this.editor.cm.dispatch(tr);
-    }
-
-    /**
-     * Set the current selection range.
-     * Optionally will scroll the new range into view.
-     * @param {Number} from
-     * @param {Number} to
-     * @param {Boolean} scrollIntoView
-     */
-    #setSelection(from: number, to: number, scrollIntoView = false) {
-        this.editor.cm.dispatch({
-            selection: {anchor: from, head: to},
-            scrollIntoView,
-        });
+        this.editor.input.spliceText(lineRange.from, lineRange.to, newLineContent, {from: selectionRange.from + lineOffset});
     }
 
 }
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index b983285d907..5385e27cc46 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -4,9 +4,9 @@ import {Actions} from './actions';
 import {Settings} from './settings';
 import {listenToCommonEvents} from './common-events';
 import {init as initCodemirror} from './codemirror';
-import {EditorView} from "@codemirror/view";
-import {importVersioned} from "../services/util";
 import {CodeModule} from "../global";
+import {MarkdownEditorInput} from "./inputs/interface";
+import {CodemirrorInput} from "./inputs/codemirror";
 
 export interface MarkdownEditorConfig {
     pageId: string;
@@ -23,7 +23,7 @@ export interface MarkdownEditor {
     display: Display;
     markdown: Markdown;
     actions: Actions;
-    cm: EditorView;
+    input: MarkdownEditorInput;
     settings: Settings;
 }
 
@@ -41,7 +41,9 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
 
     editor.actions = new Actions(editor);
     editor.display = new Display(editor);
-    editor.cm = initCodemirror(editor, Code);
+
+    const codeMirror = initCodemirror(editor, Code);
+    editor.input = new CodemirrorInput(codeMirror);
 
     listenToCommonEvents(editor);
 
diff --git a/resources/js/markdown/inputs/codemirror.ts b/resources/js/markdown/inputs/codemirror.ts
index 8fc6b686374..029d238fe85 100644
--- a/resources/js/markdown/inputs/codemirror.ts
+++ b/resources/js/markdown/inputs/codemirror.ts
@@ -1,12 +1,9 @@
 import {MarkdownEditorInput, MarkdownEditorInputSelection} from "./interface";
-import {MarkdownEditor} from "../index.mjs";
 import {EditorView} from "@codemirror/view";
-import {ChangeSpec, SelectionRange, TransactionSpec} from "@codemirror/state";
+import {ChangeSpec, TransactionSpec} from "@codemirror/state";
 
 
 export class CodemirrorInput implements MarkdownEditorInput {
-
-    protected editor: MarkdownEditor;
     protected cm: EditorView;
 
     constructor(cm: EditorView) {
@@ -14,84 +11,91 @@ export class CodemirrorInput implements MarkdownEditorInput {
     }
 
     focus(): void {
-        if (!this.editor.cm.hasFocus) {
-            this.editor.cm.focus();
+        if (!this.cm.hasFocus) {
+            this.cm.focus();
         }
     }
 
     getSelection(): MarkdownEditorInputSelection {
-        return this.editor.cm.state.selection.main;
+        return this.cm.state.selection.main;
     }
 
-    getSelectionText(selection: MarkdownEditorInputSelection|null = null): string {
+    getSelectionText(selection?: MarkdownEditorInputSelection): string {
         selection = selection || this.getSelection();
-        return this.editor.cm.state.sliceDoc(selection.from, selection.to);
+        return this.cm.state.sliceDoc(selection.from, selection.to);
     }
 
     setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean = false) {
-        this.editor.cm.dispatch({
+        this.cm.dispatch({
             selection: {anchor: selection.from, head: selection.to},
             scrollIntoView,
         });
     }
 
     getText(): string {
-        return this.editor.cm.state.doc.toString();
+        return this.cm.state.doc.toString();
     }
 
     getTextAboveView(): string {
-        const blockInfo = this.editor.cm.lineBlockAtHeight(scrollEl.scrollTop);
-        return this.editor.cm.state.sliceDoc(0, blockInfo.from);
+        const blockInfo = this.cm.lineBlockAtHeight(this.cm.scrollDOM.scrollTop);
+        return this.cm.state.sliceDoc(0, blockInfo.from);
     }
 
-    setText(text: string, selection: MarkdownEditorInputSelection | null = null) {
+    setText(text: string, selection?: MarkdownEditorInputSelection) {
         selection = selection || this.getSelection();
-        const newDoc = this.editor.cm.state.toText(text);
+        const newDoc = this.cm.state.toText(text);
         const newSelectFrom = Math.min(selection.from, newDoc.length);
-        const scrollTop = this.editor.cm.scrollDOM.scrollTop;
-        this.dispatchChange(0, this.editor.cm.state.doc.length, text, newSelectFrom);
+        const scrollTop = this.cm.scrollDOM.scrollTop;
+        this.dispatchChange(0, this.cm.state.doc.length, text, newSelectFrom);
         this.focus();
         window.requestAnimationFrame(() => {
-            this.editor.cm.scrollDOM.scrollTop = scrollTop;
+            this.cm.scrollDOM.scrollTop = scrollTop;
         });
     }
 
-    spliceText(from: number, to: number, newText: string, selection: MarkdownEditorInputSelection | null = null) {
+    spliceText(from: number, to: number, newText: string, selection: Partial<MarkdownEditorInputSelection> | null = null) {
         const end = (selection?.from === selection?.to) ? null : selection?.to;
         this.dispatchChange(from, to, newText, selection?.from, end)
     }
 
     appendText(text: string) {
-        const end = this.editor.cm.state.doc.length;
+        const end = this.cm.state.doc.length;
         this.dispatchChange(end, end, `\n${text}`);
     }
 
     getLineText(lineIndex: number = -1): string {
         const index = lineIndex > -1 ? lineIndex : this.getSelection().from;
-        return this.editor.cm.state.doc.lineAt(index).text;
+        return this.cm.state.doc.lineAt(index).text;
     }
 
-    wrapLine(start: string, end: string) {
-        const selectionRange = this.getSelection();
-        const line = this.editor.cm.state.doc.lineAt(selectionRange.from);
-        const lineContent = line.text;
-        let newLineContent;
-        let lineOffset = 0;
-
-        if (lineContent.startsWith(start) && lineContent.endsWith(end)) {
-            newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
-            lineOffset = -(start.length);
-        } else {
-            newLineContent = `${start}${lineContent}${end}`;
-            lineOffset = start.length;
-        }
+    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
+        const cursorPos = this.cm.posAtCoords({x, y}, false);
+        return {from: cursorPos, to: cursorPos};
+    }
 
-        this.dispatchChange(line.from, line.to, newLineContent, selectionRange.from + lineOffset);
+    getLineRangeFromPosition(position: number): MarkdownEditorInputSelection {
+        const line = this.cm.state.doc.lineAt(position);
+        return {from: line.from, to: line.to};
     }
 
-    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
-        const cursorPos = this.editor.cm.posAtCoords({x, y}, false);
-        return {from: cursorPos, to: cursorPos};
+    searchForLineContaining(text: string): MarkdownEditorInputSelection | null {
+        const docText = this.cm.state.doc;
+        let lineCount = 1;
+        let scrollToLine = -1;
+        for (const line of docText.iterLines()) {
+            if (line.includes(text)) {
+                scrollToLine = lineCount;
+                break;
+            }
+            lineCount += 1;
+        }
+
+        if (scrollToLine === -1) {
+            return null;
+        }
+
+        const line = docText.line(scrollToLine);
+        return {from: line.from, to: line.to};
     }
 
     /**
diff --git a/resources/js/markdown/inputs/interface.ts b/resources/js/markdown/inputs/interface.ts
index aafd86f9187..c0397ecd09d 100644
--- a/resources/js/markdown/inputs/interface.ts
+++ b/resources/js/markdown/inputs/interface.ts
@@ -18,12 +18,12 @@ export interface MarkdownEditorInput {
     /**
      * Get the text of the given (or current) selection range.
      */
-    getSelectionText(selection: MarkdownEditorInputSelection|null = null): string;
+    getSelectionText(selection?: MarkdownEditorInputSelection): string;
 
     /**
      * Set the selection range of the editor.
      */
-    setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean = false): void;
+    setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean): void;
 
     /**
      * Get the full text of the input.
@@ -40,13 +40,13 @@ export interface MarkdownEditorInput {
      * Set the full text of the input.
      * Optionally can provide a selection to restore after setting text.
      */
-    setText(text: string, selection: MarkdownEditorInputSelection|null = null): void;
+    setText(text: string, selection?: MarkdownEditorInputSelection): void;
 
     /**
      * Splice in/out text within the input.
      * Optionally can provide a selection to restore after setting text.
      */
-    spliceText(from: number, to: number, newText: string, selection: MarkdownEditorInputSelection|null = null): void;
+    spliceText(from: number, to: number, newText: string, selection: Partial<MarkdownEditorInputSelection>|null): void;
 
     /**
      * Append text to the end of the editor.
@@ -57,15 +57,20 @@ export interface MarkdownEditorInput {
      * Get the text of the given line number otherwise the text
      * of the current selected line.
      */
-    getLineText(lineIndex:number = -1): string;
+    getLineText(lineIndex:number): string;
 
     /**
-     * Wrap the current line in the given start/end contents.
+     * Get a selection representing the line range from the given position.
      */
-    wrapLine(start: string, end: string): void;
+    getLineRangeFromPosition(position: number): MarkdownEditorInputSelection;
 
     /**
      * Convert the given screen coords to a selection position within the input.
      */
     coordsToSelection(x: number, y: number): MarkdownEditorInputSelection;
+
+    /**
+     * Search and return a line range which includes the provided text.
+     */
+    searchForLineContaining(text: string): MarkdownEditorInputSelection|null;
 }
\ No newline at end of file

From 6b4b500a3313f30c92a8a6ffa1d8427fdf4d2aaa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 21 Jul 2025 18:53:22 +0100
Subject: [PATCH 606/666] MD Editor: Added plaintext input implementation

---
 resources/js/markdown/codemirror.ts      |  59 +---------
 resources/js/markdown/dom-handlers.ts    |  62 ++++++++++
 resources/js/markdown/index.mts          |  18 ++-
 resources/js/markdown/inputs/textarea.ts | 137 +++++++++++++++++++++++
 resources/js/markdown/shortcuts.ts       |   8 +-
 resources/sass/_forms.scss               |   3 +
 6 files changed, 225 insertions(+), 62 deletions(-)
 create mode 100644 resources/js/markdown/dom-handlers.ts
 create mode 100644 resources/js/markdown/inputs/textarea.ts

diff --git a/resources/js/markdown/codemirror.ts b/resources/js/markdown/codemirror.ts
index 1b54c58196b..82aeb11418f 100644
--- a/resources/js/markdown/codemirror.ts
+++ b/resources/js/markdown/codemirror.ts
@@ -1,72 +1,19 @@
 import {provideKeyBindings} from './shortcuts';
-import {debounce} from '../services/util';
-import {Clipboard} from '../services/clipboard';
 import {EditorView, ViewUpdate} from "@codemirror/view";
 import {MarkdownEditor} from "./index.mjs";
 import {CodeModule} from "../global";
+import {MarkdownEditorEventMap} from "./dom-handlers";
 
 /**
- * Initiate the codemirror instance for the MarkDown editor.
+ * Initiate the codemirror instance for the Markdown editor.
  */
-export function init(editor: MarkdownEditor, Code: CodeModule): EditorView {
+export function init(editor: MarkdownEditor, Code: CodeModule, domEventHandlers: MarkdownEditorEventMap): EditorView {
     function onViewUpdate(v: ViewUpdate) {
         if (v.docChanged) {
             editor.actions.updateAndRender();
         }
     }
 
-    const onScrollDebounced = debounce(editor.actions.syncDisplayPosition.bind(editor.actions), 100, false);
-    let syncActive = editor.settings.get('scrollSync');
-    editor.settings.onChange('scrollSync', val => {
-        syncActive = val;
-    });
-
-    const domEventHandlers = {
-        // Handle scroll to sync display view
-        scroll: (event: Event) => syncActive && onScrollDebounced(event),
-        // Handle image & content drag n drop
-        drop: (event: DragEvent) => {
-            if (!event.dataTransfer) {
-                return;
-            }
-
-            const templateId = event.dataTransfer.getData('bookstack/template');
-            if (templateId) {
-                event.preventDefault();
-                editor.actions.insertTemplate(templateId, event.pageX, event.pageY);
-            }
-
-            const clipboard = new Clipboard(event.dataTransfer);
-            const clipboardImages = clipboard.getImages();
-            if (clipboardImages.length > 0) {
-                event.stopPropagation();
-                event.preventDefault();
-                editor.actions.insertClipboardImages(clipboardImages, event.pageX, event.pageY);
-            }
-        },
-        // Handle dragover event to allow as drop-target in chrome
-        dragover: (event: DragEvent) => {
-            event.preventDefault();
-        },
-        // Handle image paste
-        paste: (event: ClipboardEvent) => {
-            if (!event.clipboardData) {
-                return;
-            }
-
-            const clipboard = new Clipboard(event.clipboardData);
-
-            // Don't handle the event ourselves if no items exist of contains table-looking data
-            if (!clipboard.hasItems() || clipboard.containsTabularData()) {
-                return;
-            }
-
-            const images = clipboard.getImages();
-            for (const image of images) {
-                editor.actions.uploadImage(image);
-            }
-        },
-    };
 
     const cm = Code.markdownEditor(
         editor.config.inputEl,
diff --git a/resources/js/markdown/dom-handlers.ts b/resources/js/markdown/dom-handlers.ts
new file mode 100644
index 00000000000..db3f2b57676
--- /dev/null
+++ b/resources/js/markdown/dom-handlers.ts
@@ -0,0 +1,62 @@
+import {Clipboard} from "../services/clipboard";
+import {MarkdownEditor} from "./index.mjs";
+import {debounce} from "../services/util";
+
+
+export type MarkdownEditorEventMap = Record<string, (event: any) => void>;
+
+export function getMarkdownDomEventHandlers(editor: MarkdownEditor): MarkdownEditorEventMap {
+
+    const onScrollDebounced = debounce(editor.actions.syncDisplayPosition.bind(editor.actions), 100, false);
+    let syncActive = editor.settings.get('scrollSync');
+    editor.settings.onChange('scrollSync', val => {
+        syncActive = val;
+    });
+
+    return {
+        // Handle scroll to sync display view
+        scroll: (event: Event) => syncActive && onScrollDebounced(event),
+        // Handle image & content drag n drop
+        drop: (event: DragEvent) => {
+            if (!event.dataTransfer) {
+                return;
+            }
+
+            const templateId = event.dataTransfer.getData('bookstack/template');
+            if (templateId) {
+                event.preventDefault();
+                editor.actions.insertTemplate(templateId, event.pageX, event.pageY);
+            }
+
+            const clipboard = new Clipboard(event.dataTransfer);
+            const clipboardImages = clipboard.getImages();
+            if (clipboardImages.length > 0) {
+                event.stopPropagation();
+                event.preventDefault();
+                editor.actions.insertClipboardImages(clipboardImages, event.pageX, event.pageY);
+            }
+        },
+        // Handle dragover event to allow as drop-target in chrome
+        dragover: (event: DragEvent) => {
+            event.preventDefault();
+        },
+        // Handle image paste
+        paste: (event: ClipboardEvent) => {
+            if (!event.clipboardData) {
+                return;
+            }
+
+            const clipboard = new Clipboard(event.clipboardData);
+
+            // Don't handle the event ourselves if no items exist of contains table-looking data
+            if (!clipboard.hasItems() || clipboard.containsTabularData()) {
+                return;
+            }
+
+            const images = clipboard.getImages();
+            for (const image of images) {
+                editor.actions.uploadImage(image);
+            }
+        },
+    };
+}
\ No newline at end of file
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index 5385e27cc46..7edf80d4fb4 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -7,6 +7,9 @@ import {init as initCodemirror} from './codemirror';
 import {CodeModule} from "../global";
 import {MarkdownEditorInput} from "./inputs/interface";
 import {CodemirrorInput} from "./inputs/codemirror";
+import {TextareaInput} from "./inputs/textarea";
+import {provideShortcutMap} from "./shortcuts";
+import {getMarkdownDomEventHandlers} from "./dom-handlers";
 
 export interface MarkdownEditorConfig {
     pageId: string;
@@ -31,7 +34,7 @@ export interface MarkdownEditor {
  * Initiate a new Markdown editor instance.
  */
 export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor> {
-    const Code = await window.importVersioned('code') as CodeModule;
+    // const Code = await window.importVersioned('code') as CodeModule;
 
     const editor: MarkdownEditor = {
         config,
@@ -42,8 +45,17 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
     editor.actions = new Actions(editor);
     editor.display = new Display(editor);
 
-    const codeMirror = initCodemirror(editor, Code);
-    editor.input = new CodemirrorInput(codeMirror);
+    const eventHandlers = getMarkdownDomEventHandlers(editor);
+    // TODO - Switching
+    // const codeMirror = initCodemirror(editor, Code);
+    // editor.input = new CodemirrorInput(codeMirror);
+    editor.input = new TextareaInput(
+        config.inputEl,
+        provideShortcutMap(editor),
+        eventHandlers
+    );
+
+    // window.devinput = editor.input;
 
     listenToCommonEvents(editor);
 
diff --git a/resources/js/markdown/inputs/textarea.ts b/resources/js/markdown/inputs/textarea.ts
new file mode 100644
index 00000000000..d1eabd27027
--- /dev/null
+++ b/resources/js/markdown/inputs/textarea.ts
@@ -0,0 +1,137 @@
+import {MarkdownEditorInput, MarkdownEditorInputSelection} from "./interface";
+import {MarkdownEditorShortcutMap} from "../shortcuts";
+import {MarkdownEditorEventMap} from "../dom-handlers";
+
+
+export class TextareaInput implements MarkdownEditorInput {
+
+    protected input: HTMLTextAreaElement;
+    protected shortcuts: MarkdownEditorShortcutMap;
+    protected events: MarkdownEditorEventMap;
+
+    constructor(input: HTMLTextAreaElement, shortcuts: MarkdownEditorShortcutMap, events: MarkdownEditorEventMap) {
+        this.input = input;
+        this.shortcuts = shortcuts;
+        this.events = events;
+
+        this.onKeyDown = this.onKeyDown.bind(this);
+        this.configureListeners();
+    }
+
+    configureListeners(): void {
+        // TODO - Teardown handling
+        this.input.addEventListener('keydown', this.onKeyDown);
+
+        for (const [name, listener] of Object.entries(this.events)) {
+            this.input.addEventListener(name, listener);
+        }
+    }
+
+    onKeyDown(e: KeyboardEvent) {
+        const isApple = navigator.platform.startsWith("Mac") || navigator.platform === "iPhone";
+        const keyParts = [
+            e.shiftKey ? 'Shift' : null,
+            isApple && e.metaKey ? 'Mod' : null,
+            !isApple && e.ctrlKey ? 'Mod' : null,
+            e.key,
+        ];
+
+        const keyString = keyParts.filter(Boolean).join('-');
+        if (this.shortcuts[keyString]) {
+            e.preventDefault();
+            this.shortcuts[keyString]();
+        }
+    }
+
+    appendText(text: string): void {
+        this.input.value += `\n${text}`;
+    }
+
+    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
+        // TODO
+        return this.getSelection();
+    }
+
+    focus(): void {
+        this.input.focus();
+    }
+
+    getLineRangeFromPosition(position: number): MarkdownEditorInputSelection {
+        const lines = this.getText().split('\n');
+        let lineStart = 0;
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const newEnd = lineStart + line.length + 1;
+            if (position < newEnd) {
+                return {from: lineStart, to: newEnd};
+            }
+            lineStart = newEnd;
+        }
+
+        return {from: 0, to: 0};
+    }
+
+    getLineText(lineIndex: number): string {
+        const text = this.getText();
+        const lines = text.split("\n");
+        return lines[lineIndex] || '';
+    }
+
+    getSelection(): MarkdownEditorInputSelection {
+        return {from: this.input.selectionStart, to: this.input.selectionEnd};
+    }
+
+    getSelectionText(selection?: MarkdownEditorInputSelection): string {
+        const text = this.getText();
+        const range = selection || this.getSelection();
+        return text.slice(range.from, range.to);
+    }
+
+    getText(): string {
+        return this.input.value;
+    }
+
+    getTextAboveView(): string {
+        const scrollTop = this.input.scrollTop;
+        const computedStyles = window.getComputedStyle(this.input);
+        const lines = this.getText().split('\n');
+        const paddingTop = Number(computedStyles.paddingTop.replace('px', ''));
+        const paddingBottom = Number(computedStyles.paddingBottom.replace('px', ''));
+
+        const avgLineHeight = (this.input.scrollHeight - paddingBottom - paddingTop) / lines.length;
+        const roughLinePos = Math.max(Math.floor((scrollTop - paddingTop) / avgLineHeight), 0);
+        const linesAbove = this.getText().split('\n').slice(0, roughLinePos);
+        return linesAbove.join('\n');
+    }
+
+    searchForLineContaining(text: string): MarkdownEditorInputSelection | null {
+        const textPosition = this.getText().indexOf(text);
+        if (textPosition > -1) {
+            return this.getLineRangeFromPosition(textPosition);
+        }
+
+        return null;
+    }
+
+    setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean): void {
+        this.input.selectionStart = selection.from;
+        this.input.selectionEnd = selection.to;
+    }
+
+    setText(text: string, selection?: MarkdownEditorInputSelection): void {
+        this.input.value = text;
+        if (selection) {
+            this.setSelection(selection, false);
+        }
+    }
+
+    spliceText(from: number, to: number, newText: string, selection: Partial<MarkdownEditorInputSelection> | null): void {
+        const text = this.getText();
+        const updatedText = text.slice(0, from) + newText + text.slice(to);
+        this.setText(updatedText);
+        if (selection && selection.from) {
+            const newSelection = {from: selection.from, to: selection.to || selection.from};
+            this.setSelection(newSelection, false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/markdown/shortcuts.ts b/resources/js/markdown/shortcuts.ts
index c746b52e703..734160f29f0 100644
--- a/resources/js/markdown/shortcuts.ts
+++ b/resources/js/markdown/shortcuts.ts
@@ -1,11 +1,13 @@
 import {MarkdownEditor} from "./index.mjs";
 import {KeyBinding} from "@codemirror/view";
 
+export type MarkdownEditorShortcutMap = Record<string, () => void>;
+
 /**
  * Provide shortcuts for the editor instance.
  */
-function provide(editor: MarkdownEditor): Record<string, () => void> {
-    const shortcuts: Record<string, () => void> = {};
+export function provideShortcutMap(editor: MarkdownEditor): MarkdownEditorShortcutMap {
+    const shortcuts: MarkdownEditorShortcutMap = {};
 
     // Insert Image shortcut
     shortcuts['Shift-Mod-i'] = () => editor.actions.insertImage();
@@ -45,7 +47,7 @@ function provide(editor: MarkdownEditor): Record<string, () => void> {
  * Get the editor shortcuts in CodeMirror keybinding format.
  */
 export function provideKeyBindings(editor: MarkdownEditor): KeyBinding[] {
-    const shortcuts = provide(editor);
+    const shortcuts = provideShortcutMap(editor);
     const keyBindings = [];
 
     const wrapAction = (action: ()=>void) => () => {
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index b66688f8d20..e71edc1d757 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -57,6 +57,9 @@
     padding: vars.$xs vars.$m;
     color: #444;
     border-radius: 0;
+    height: 100%;
+    font-size: 14px;
+    line-height: 1.2;
     max-height: 100%;
     flex: 1;
     border: 0;

From d55db06c01302c8a2e597c91620fbfb8ddfc6982 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 22 Jul 2025 10:34:29 +0100
Subject: [PATCH 607/666] MD Editor: Added plaintext/cm switching

Also aligned the construction of the inputs where possible.
---
 resources/js/markdown/codemirror.ts        | 39 +++++++++++++++++-----
 resources/js/markdown/index.mts            | 29 ++++++++++------
 resources/js/markdown/inputs/codemirror.ts |  4 +++
 resources/js/markdown/inputs/interface.ts  |  5 +++
 resources/js/markdown/inputs/textarea.ts   | 30 ++++++++++++++---
 resources/js/markdown/shortcuts.ts         | 20 -----------
 6 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/resources/js/markdown/codemirror.ts b/resources/js/markdown/codemirror.ts
index 82aeb11418f..1ae01847704 100644
--- a/resources/js/markdown/codemirror.ts
+++ b/resources/js/markdown/codemirror.ts
@@ -1,25 +1,48 @@
-import {provideKeyBindings} from './shortcuts';
-import {EditorView, ViewUpdate} from "@codemirror/view";
-import {MarkdownEditor} from "./index.mjs";
+import {EditorView, KeyBinding, ViewUpdate} from "@codemirror/view";
 import {CodeModule} from "../global";
 import {MarkdownEditorEventMap} from "./dom-handlers";
+import {MarkdownEditorShortcutMap} from "./shortcuts";
+
+/**
+ * Convert editor shortcuts to CodeMirror keybinding format.
+ */
+export function shortcutsToKeyBindings(shortcuts: MarkdownEditorShortcutMap): KeyBinding[] {
+    const keyBindings = [];
+
+    const wrapAction = (action: () => void) => () => {
+        action();
+        return true;
+    };
+
+    for (const [shortcut, action] of Object.entries(shortcuts)) {
+        keyBindings.push({key: shortcut, run: wrapAction(action), preventDefault: true});
+    }
+
+    return keyBindings;
+}
 
 /**
  * Initiate the codemirror instance for the Markdown editor.
  */
-export function init(editor: MarkdownEditor, Code: CodeModule, domEventHandlers: MarkdownEditorEventMap): EditorView {
+export async function init(
+    input: HTMLTextAreaElement,
+    shortcuts: MarkdownEditorShortcutMap,
+    domEventHandlers: MarkdownEditorEventMap,
+    onChange: () => void
+): Promise<EditorView> {
+    const Code = await window.importVersioned('code') as CodeModule;
+
     function onViewUpdate(v: ViewUpdate) {
         if (v.docChanged) {
-            editor.actions.updateAndRender();
+            onChange();
         }
     }
 
-
     const cm = Code.markdownEditor(
-        editor.config.inputEl,
+        input,
         onViewUpdate,
         domEventHandlers,
-        provideKeyBindings(editor),
+        shortcutsToKeyBindings(shortcuts),
     );
 
     // Add editor view to the window for easy access/debugging.
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index 7edf80d4fb4..4cd89c0777f 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -4,7 +4,6 @@ import {Actions} from './actions';
 import {Settings} from './settings';
 import {listenToCommonEvents} from './common-events';
 import {init as initCodemirror} from './codemirror';
-import {CodeModule} from "../global";
 import {MarkdownEditorInput} from "./inputs/interface";
 import {CodemirrorInput} from "./inputs/codemirror";
 import {TextareaInput} from "./inputs/textarea";
@@ -34,8 +33,6 @@ export interface MarkdownEditor {
  * Initiate a new Markdown editor instance.
  */
 export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor> {
-    // const Code = await window.importVersioned('code') as CodeModule;
-
     const editor: MarkdownEditor = {
         config,
         markdown: new Markdown(),
@@ -46,15 +43,25 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
     editor.display = new Display(editor);
 
     const eventHandlers = getMarkdownDomEventHandlers(editor);
-    // TODO - Switching
-    // const codeMirror = initCodemirror(editor, Code);
-    // editor.input = new CodemirrorInput(codeMirror);
-    editor.input = new TextareaInput(
-        config.inputEl,
-        provideShortcutMap(editor),
-        eventHandlers
-    );
+    const shortcuts = provideShortcutMap(editor);
+    const onInputChange = () => editor.actions.updateAndRender();
+
+    const initCodemirrorInput: () => Promise<MarkdownEditorInput> = async () => {
+        const codeMirror = await initCodemirror(config.inputEl, shortcuts, eventHandlers, onInputChange);
+        return new CodemirrorInput(codeMirror);
+    };
+    const initTextAreaInput: () => Promise<MarkdownEditorInput> = async () => {
+        return new TextareaInput(config.inputEl, shortcuts, eventHandlers, onInputChange);
+    };
 
+    const isPlainEditor = Boolean(editor.settings.get('plainEditor'));
+    editor.input = await (isPlainEditor ? initTextAreaInput() : initCodemirrorInput());
+    editor.settings.onChange('plainEditor', async (value) => {
+        const isPlain = Boolean(value);
+        const newInput = await (isPlain ? initTextAreaInput() : initCodemirrorInput());
+        editor.input.teardown();
+        editor.input = newInput;
+    });
     // window.devinput = editor.input;
 
     listenToCommonEvents(editor);
diff --git a/resources/js/markdown/inputs/codemirror.ts b/resources/js/markdown/inputs/codemirror.ts
index 029d238fe85..3ab219a6330 100644
--- a/resources/js/markdown/inputs/codemirror.ts
+++ b/resources/js/markdown/inputs/codemirror.ts
@@ -10,6 +10,10 @@ export class CodemirrorInput implements MarkdownEditorInput {
         this.cm = cm;
     }
 
+    teardown(): void {
+        this.cm.destroy();
+    }
+
     focus(): void {
         if (!this.cm.hasFocus) {
             this.cm.focus();
diff --git a/resources/js/markdown/inputs/interface.ts b/resources/js/markdown/inputs/interface.ts
index c0397ecd09d..66a8c07e798 100644
--- a/resources/js/markdown/inputs/interface.ts
+++ b/resources/js/markdown/inputs/interface.ts
@@ -73,4 +73,9 @@ export interface MarkdownEditorInput {
      * Search and return a line range which includes the provided text.
      */
     searchForLineContaining(text: string): MarkdownEditorInputSelection|null;
+
+    /**
+     * Tear down the input.
+     */
+    teardown(): void;
 }
\ No newline at end of file
diff --git a/resources/js/markdown/inputs/textarea.ts b/resources/js/markdown/inputs/textarea.ts
index d1eabd27027..25c8779fc73 100644
--- a/resources/js/markdown/inputs/textarea.ts
+++ b/resources/js/markdown/inputs/textarea.ts
@@ -8,23 +8,43 @@ export class TextareaInput implements MarkdownEditorInput {
     protected input: HTMLTextAreaElement;
     protected shortcuts: MarkdownEditorShortcutMap;
     protected events: MarkdownEditorEventMap;
-
-    constructor(input: HTMLTextAreaElement, shortcuts: MarkdownEditorShortcutMap, events: MarkdownEditorEventMap) {
+    protected onChange: () => void;
+    protected eventController = new AbortController();
+
+    constructor(
+        input: HTMLTextAreaElement,
+        shortcuts: MarkdownEditorShortcutMap,
+        events: MarkdownEditorEventMap,
+        onChange: () => void
+    ) {
         this.input = input;
         this.shortcuts = shortcuts;
         this.events = events;
+        this.onChange = onChange;
 
         this.onKeyDown = this.onKeyDown.bind(this);
         this.configureListeners();
+
+        this.input.style.removeProperty("display");
+    }
+
+    teardown() {
+        this.eventController.abort('teardown');
     }
 
     configureListeners(): void {
-        // TODO - Teardown handling
-        this.input.addEventListener('keydown', this.onKeyDown);
+        // Keyboard shortcuts
+        this.input.addEventListener('keydown', this.onKeyDown, {signal: this.eventController.signal});
 
+        // Shared event listeners
         for (const [name, listener] of Object.entries(this.events)) {
-            this.input.addEventListener(name, listener);
+            this.input.addEventListener(name, listener, {signal: this.eventController.signal});
         }
+
+        // Input change handling
+        this.input.addEventListener('input', () => {
+            this.onChange();
+        }, {signal: this.eventController.signal});
     }
 
     onKeyDown(e: KeyboardEvent) {
diff --git a/resources/js/markdown/shortcuts.ts b/resources/js/markdown/shortcuts.ts
index 734160f29f0..175e8f4f04b 100644
--- a/resources/js/markdown/shortcuts.ts
+++ b/resources/js/markdown/shortcuts.ts
@@ -1,5 +1,4 @@
 import {MarkdownEditor} from "./index.mjs";
-import {KeyBinding} from "@codemirror/view";
 
 export type MarkdownEditorShortcutMap = Record<string, () => void>;
 
@@ -42,22 +41,3 @@ export function provideShortcutMap(editor: MarkdownEditor): MarkdownEditorShortc
 
     return shortcuts;
 }
-
-/**
- * Get the editor shortcuts in CodeMirror keybinding format.
- */
-export function provideKeyBindings(editor: MarkdownEditor): KeyBinding[] {
-    const shortcuts = provideShortcutMap(editor);
-    const keyBindings = [];
-
-    const wrapAction = (action: ()=>void) => () => {
-        action();
-        return true;
-    };
-
-    for (const [shortcut, action] of Object.entries(shortcuts)) {
-        keyBindings.push({key: shortcut, run: wrapAction(action), preventDefault: true});
-    }
-
-    return keyBindings;
-}

From 6621d55f3d2248a273554c0f780dbeef465e6b15 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 22 Jul 2025 16:42:47 +0100
Subject: [PATCH 608/666] MD Editor: Worked to improve/fix positioning code

Still pending testing. Old logic did not work when lines would wrap, so
changing things to a character/line measuring technique.
Fixed some other isues too while testing shortcuts.
---
 resources/js/markdown/actions.ts           |  10 +-
 resources/js/markdown/dom-handlers.ts      |   4 +-
 resources/js/markdown/index.mts            |   2 +-
 resources/js/markdown/inputs/codemirror.ts |   4 +-
 resources/js/markdown/inputs/interface.ts  |   4 +-
 resources/js/markdown/inputs/textarea.ts   | 103 +++++++++++++++++++--
 6 files changed, 108 insertions(+), 19 deletions(-)

diff --git a/resources/js/markdown/actions.ts b/resources/js/markdown/actions.ts
index ed4ee5904ba..36d21ab1dc6 100644
--- a/resources/js/markdown/actions.ts
+++ b/resources/js/markdown/actions.ts
@@ -236,7 +236,7 @@ export class Actions {
         if (lineStart === newStart) {
             const newLineContent = lineContent.replace(`${newStart} `, '');
             const selectFrom = selectionRange.from + (newLineContent.length - lineContent.length);
-            this.editor.input.spliceText(selectionRange.from, selectionRange.to, newLineContent, {from: selectFrom});
+            this.editor.input.spliceText(lineRange.from, lineRange.to, newLineContent, {from: selectFrom});
             return;
         }
 
@@ -353,8 +353,8 @@ export class Actions {
      * Fetch and insert the template of the given ID.
      * The page-relative position provided can be used to determine insert location if possible.
      */
-    async insertTemplate(templateId: string, posX: number, posY: number): Promise<void> {
-        const cursorPos = this.editor.input.coordsToSelection(posX, posY).from;
+    async insertTemplate(templateId: string, event: MouseEvent): Promise<void> {
+        const cursorPos = this.editor.input.eventToPosition(event).from;
         const responseData = (await window.$http.get(`/templates/${templateId}`)).data as {markdown: string, html: string};
         const content = responseData.markdown || responseData.html;
         this.editor.input.spliceText(cursorPos, cursorPos, content, {from: cursorPos});
@@ -364,8 +364,8 @@ export class Actions {
      * Insert multiple images from the clipboard from an event at the provided
      * screen coordinates (Typically form a paste event).
      */
-    insertClipboardImages(images: File[], posX: number, posY: number): void {
-        const cursorPos = this.editor.input.coordsToSelection(posX, posY).from;
+    insertClipboardImages(images: File[], event: MouseEvent): void {
+        const cursorPos = this.editor.input.eventToPosition(event).from;
         for (const image of images) {
             this.uploadImage(image, cursorPos);
         }
diff --git a/resources/js/markdown/dom-handlers.ts b/resources/js/markdown/dom-handlers.ts
index db3f2b57676..37e1723de35 100644
--- a/resources/js/markdown/dom-handlers.ts
+++ b/resources/js/markdown/dom-handlers.ts
@@ -25,7 +25,7 @@ export function getMarkdownDomEventHandlers(editor: MarkdownEditor): MarkdownEdi
             const templateId = event.dataTransfer.getData('bookstack/template');
             if (templateId) {
                 event.preventDefault();
-                editor.actions.insertTemplate(templateId, event.pageX, event.pageY);
+                editor.actions.insertTemplate(templateId, event);
             }
 
             const clipboard = new Clipboard(event.dataTransfer);
@@ -33,7 +33,7 @@ export function getMarkdownDomEventHandlers(editor: MarkdownEditor): MarkdownEdi
             if (clipboardImages.length > 0) {
                 event.stopPropagation();
                 event.preventDefault();
-                editor.actions.insertClipboardImages(clipboardImages, event.pageX, event.pageY);
+                editor.actions.insertClipboardImages(clipboardImages, event);
             }
         },
         // Handle dragover event to allow as drop-target in chrome
diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index 4cd89c0777f..7538c197255 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -62,7 +62,7 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
         editor.input.teardown();
         editor.input = newInput;
     });
-    // window.devinput = editor.input;
+    window.devinput = editor.input;
 
     listenToCommonEvents(editor);
 
diff --git a/resources/js/markdown/inputs/codemirror.ts b/resources/js/markdown/inputs/codemirror.ts
index 3ab219a6330..827068238e0 100644
--- a/resources/js/markdown/inputs/codemirror.ts
+++ b/resources/js/markdown/inputs/codemirror.ts
@@ -72,8 +72,8 @@ export class CodemirrorInput implements MarkdownEditorInput {
         return this.cm.state.doc.lineAt(index).text;
     }
 
-    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
-        const cursorPos = this.cm.posAtCoords({x, y}, false);
+    eventToPosition(event: MouseEvent): MarkdownEditorInputSelection {
+        const cursorPos = this.cm.posAtCoords({x: event.screenX, y: event.screenY}, false);
         return {from: cursorPos, to: cursorPos};
     }
 
diff --git a/resources/js/markdown/inputs/interface.ts b/resources/js/markdown/inputs/interface.ts
index 66a8c07e798..1f7474a5088 100644
--- a/resources/js/markdown/inputs/interface.ts
+++ b/resources/js/markdown/inputs/interface.ts
@@ -65,9 +65,9 @@ export interface MarkdownEditorInput {
     getLineRangeFromPosition(position: number): MarkdownEditorInputSelection;
 
     /**
-     * Convert the given screen coords to a selection position within the input.
+     * Convert the given event position to a selection position within the input.
      */
-    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection;
+    eventToPosition(event: MouseEvent): MarkdownEditorInputSelection;
 
     /**
      * Search and return a line range which includes the provided text.
diff --git a/resources/js/markdown/inputs/textarea.ts b/resources/js/markdown/inputs/textarea.ts
index 25c8779fc73..a80054ee24a 100644
--- a/resources/js/markdown/inputs/textarea.ts
+++ b/resources/js/markdown/inputs/textarea.ts
@@ -11,6 +11,8 @@ export class TextareaInput implements MarkdownEditorInput {
     protected onChange: () => void;
     protected eventController = new AbortController();
 
+    protected textSizeCache: {x: number; y: number}|null = null;
+
     constructor(
         input: HTMLTextAreaElement,
         shortcuts: MarkdownEditorShortcutMap,
@@ -25,6 +27,8 @@ export class TextareaInput implements MarkdownEditorInput {
         this.onKeyDown = this.onKeyDown.bind(this);
         this.configureListeners();
 
+        // TODO - Undo/Redo
+
         this.input.style.removeProperty("display");
     }
 
@@ -45,15 +49,24 @@ export class TextareaInput implements MarkdownEditorInput {
         this.input.addEventListener('input', () => {
             this.onChange();
         }, {signal: this.eventController.signal});
+
+        this.input.addEventListener('click', (event: MouseEvent) => {
+            const x = event.clientX;
+            const y = event.clientY;
+            const range = this.eventToPosition(event);
+            const text = this.getText().split('');
+            console.log(range, text.slice(0, 20));
+        });
     }
 
     onKeyDown(e: KeyboardEvent) {
         const isApple = navigator.platform.startsWith("Mac") || navigator.platform === "iPhone";
+        const key = e.key.length > 1 ? e.key : e.key.toLowerCase();
         const keyParts = [
             e.shiftKey ? 'Shift' : null,
             isApple && e.metaKey ? 'Mod' : null,
             !isApple && e.ctrlKey ? 'Mod' : null,
-            e.key,
+            key,
         ];
 
         const keyString = keyParts.filter(Boolean).join('-');
@@ -65,10 +78,37 @@ export class TextareaInput implements MarkdownEditorInput {
 
     appendText(text: string): void {
         this.input.value += `\n${text}`;
+        this.input.dispatchEvent(new Event('input'));
     }
 
-    coordsToSelection(x: number, y: number): MarkdownEditorInputSelection {
-        // TODO
+    eventToPosition(event: MouseEvent): MarkdownEditorInputSelection {
+        const eventCoords = this.mouseEventToTextRelativeCoords(event);
+        const textSize = this.measureTextSize();
+        const lineWidth = this.measureLineCharCount(textSize.x);
+
+        const lines = this.getText().split('\n');
+
+        // TODO - Check this
+
+        let currY = 0;
+        let currPos = 0;
+        for (const line of lines) {
+            let linePos = 0;
+            const wrapCount = Math.max(Math.ceil(line.length / lineWidth), 1);
+            for (let i = 0; i < wrapCount; i++) {
+                currY += textSize.y;
+                if (currY > eventCoords.y) {
+                    const targetX = Math.floor(eventCoords.x / textSize.x);
+                    const maxPos = Math.min(currPos + linePos + targetX, currPos + line.length);
+                    return {from: maxPos, to: maxPos};
+                }
+
+                linePos += lineWidth;
+            }
+
+            currPos += line.length + 1;
+        }
+
         return this.getSelection();
     }
 
@@ -81,11 +121,11 @@ export class TextareaInput implements MarkdownEditorInput {
         let lineStart = 0;
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i];
-            const newEnd = lineStart + line.length + 1;
-            if (position < newEnd) {
-                return {from: lineStart, to: newEnd};
+            const lineEnd = lineStart + line.length;
+            if (position <= lineEnd) {
+                return {from: lineStart, to: lineEnd};
             }
-            lineStart = newEnd;
+            lineStart = lineEnd + 1;
         }
 
         return {from: 0, to: 0};
@@ -140,6 +180,7 @@ export class TextareaInput implements MarkdownEditorInput {
 
     setText(text: string, selection?: MarkdownEditorInputSelection): void {
         this.input.value = text;
+        this.input.dispatchEvent(new Event('input'));
         if (selection) {
             this.setSelection(selection, false);
         }
@@ -154,4 +195,52 @@ export class TextareaInput implements MarkdownEditorInput {
             this.setSelection(newSelection, false);
         }
     }
+
+    protected measureTextSize(): {x: number; y: number} {
+        if (this.textSizeCache) {
+            return this.textSizeCache;
+        }
+
+        const el = document.createElement("div");
+        el.textContent = `a\nb`;
+        const inputStyles = window.getComputedStyle(this.input)
+        el.style.font = inputStyles.font;
+        el.style.lineHeight = inputStyles.lineHeight;
+        el.style.padding = '0px';
+        el.style.display = 'inline-block';
+        el.style.visibility = 'hidden';
+        el.style.position = 'absolute';
+        el.style.whiteSpace = 'pre';
+        this.input.after(el);
+
+        const bounds = el.getBoundingClientRect();
+        el.remove();
+        this.textSizeCache = {
+            x: bounds.width,
+            y: bounds.height / 2,
+        };
+        return this.textSizeCache;
+    }
+
+    protected measureLineCharCount(textWidth: number): number {
+        const inputStyles = window.getComputedStyle(this.input);
+        const paddingLeft = Number(inputStyles.paddingLeft.replace('px', ''));
+        const paddingRight = Number(inputStyles.paddingRight.replace('px', ''));
+        const width = Number(inputStyles.width.replace('px', ''));
+        const textSpace = width - (paddingLeft + paddingRight);
+
+        return Math.floor(textSpace / textWidth);
+    }
+
+    protected mouseEventToTextRelativeCoords(event: MouseEvent): {x: number; y: number} {
+        const inputBounds = this.input.getBoundingClientRect();
+        const inputStyles = window.getComputedStyle(this.input);
+        const paddingTop = Number(inputStyles.paddingTop.replace('px', ''));
+        const paddingLeft = Number(inputStyles.paddingLeft.replace('px', ''));
+
+        const xPos = Math.max(event.clientX - (inputBounds.left + paddingLeft), 0);
+        const yPos = Math.max((event.clientY - (inputBounds.top + paddingTop)) + this.input.scrollTop, 0);
+
+        return {x: xPos, y: yPos};
+    }
 }
\ No newline at end of file

From 7ca8bdc23172c258fe1466d803e4992a3551ee06 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Jul 2025 12:17:36 +0100
Subject: [PATCH 609/666] MD Editor: Added custom textarea undo/redo, updated
 positioning methods

---
 resources/js/markdown/inputs/textarea.ts | 161 ++++++++++++++++-------
 resources/sass/_forms.scss               |   1 +
 2 files changed, 116 insertions(+), 46 deletions(-)

diff --git a/resources/js/markdown/inputs/textarea.ts b/resources/js/markdown/inputs/textarea.ts
index a80054ee24a..e0c3ac37cf2 100644
--- a/resources/js/markdown/inputs/textarea.ts
+++ b/resources/js/markdown/inputs/textarea.ts
@@ -1,7 +1,70 @@
 import {MarkdownEditorInput, MarkdownEditorInputSelection} from "./interface";
 import {MarkdownEditorShortcutMap} from "../shortcuts";
 import {MarkdownEditorEventMap} from "../dom-handlers";
+import {debounce} from "../../services/util";
 
+type UndoStackEntry = {
+    content: string;
+    selection: MarkdownEditorInputSelection;
+}
+
+class UndoStack {
+    protected onChangeDebounced: (callback: () => UndoStackEntry) => void;
+
+    protected stack: UndoStackEntry[] = [];
+    protected pointer: number = -1;
+    protected lastActionTime: number = 0;
+
+    constructor() {
+        this.onChangeDebounced = debounce(this.onChange, 1000, false);
+    }
+
+    undo(): UndoStackEntry|null {
+        if (this.pointer < 1) {
+            return null;
+        }
+
+        this.lastActionTime = Date.now();
+        this.pointer -= 1;
+        return this.stack[this.pointer];
+    }
+
+    redo(): UndoStackEntry|null {
+        const atEnd = this.pointer === this.stack.length - 1;
+        if (atEnd) {
+            return null;
+        }
+
+        this.lastActionTime = Date.now();
+        this.pointer++;
+        return this.stack[this.pointer];
+    }
+
+    push(getValueCallback: () => UndoStackEntry): void {
+        // Ignore changes made via undo/redo actions
+        if (Date.now() - this.lastActionTime < 100) {
+            return;
+        }
+
+        this.onChangeDebounced(getValueCallback);
+    }
+
+    protected onChange(getValueCallback: () => UndoStackEntry) {
+        // Trim the end of the stack from the pointer since we're branching away
+        if (this.pointer !== this.stack.length - 1) {
+            this.stack = this.stack.slice(0, this.pointer)
+        }
+
+        this.stack.push(getValueCallback());
+
+        // Limit stack size
+        if (this.stack.length > 50) {
+            this.stack = this.stack.slice(this.stack.length - 50);
+        }
+
+        this.pointer = this.stack.length - 1;
+    }
+}
 
 export class TextareaInput implements MarkdownEditorInput {
 
@@ -10,6 +73,7 @@ export class TextareaInput implements MarkdownEditorInput {
     protected events: MarkdownEditorEventMap;
     protected onChange: () => void;
     protected eventController = new AbortController();
+    protected undoStack = new UndoStack();
 
     protected textSizeCache: {x: number; y: number}|null = null;
 
@@ -25,17 +89,34 @@ export class TextareaInput implements MarkdownEditorInput {
         this.onChange = onChange;
 
         this.onKeyDown = this.onKeyDown.bind(this);
+        this.configureLocalShortcuts();
         this.configureListeners();
 
-        // TODO - Undo/Redo
-
         this.input.style.removeProperty("display");
+        this.undoStack.push(() => ({content: this.getText(), selection: this.getSelection()}));
     }
 
     teardown() {
         this.eventController.abort('teardown');
     }
 
+    configureLocalShortcuts(): void {
+        this.shortcuts['Mod-z'] = () => {
+            const undoEntry = this.undoStack.undo();
+            if (undoEntry) {
+                this.setText(undoEntry.content);
+                this.setSelection(undoEntry.selection, false);
+            }
+        };
+        this.shortcuts['Mod-y'] = () => {
+            const redoContent = this.undoStack.redo();
+            if (redoContent) {
+                this.setText(redoContent.content);
+                this.setSelection(redoContent.selection, false);
+            }
+        }
+    }
+
     configureListeners(): void {
         // Keyboard shortcuts
         this.input.addEventListener('keydown', this.onKeyDown, {signal: this.eventController.signal});
@@ -48,15 +129,8 @@ export class TextareaInput implements MarkdownEditorInput {
         // Input change handling
         this.input.addEventListener('input', () => {
             this.onChange();
+            this.undoStack.push(() => ({content: this.input.value, selection: this.getSelection()}));
         }, {signal: this.eventController.signal});
-
-        this.input.addEventListener('click', (event: MouseEvent) => {
-            const x = event.clientX;
-            const y = event.clientY;
-            const range = this.eventToPosition(event);
-            const text = this.getText().split('');
-            console.log(range, text.slice(0, 20));
-        });
     }
 
     onKeyDown(e: KeyboardEvent) {
@@ -83,33 +157,7 @@ export class TextareaInput implements MarkdownEditorInput {
 
     eventToPosition(event: MouseEvent): MarkdownEditorInputSelection {
         const eventCoords = this.mouseEventToTextRelativeCoords(event);
-        const textSize = this.measureTextSize();
-        const lineWidth = this.measureLineCharCount(textSize.x);
-
-        const lines = this.getText().split('\n');
-
-        // TODO - Check this
-
-        let currY = 0;
-        let currPos = 0;
-        for (const line of lines) {
-            let linePos = 0;
-            const wrapCount = Math.max(Math.ceil(line.length / lineWidth), 1);
-            for (let i = 0; i < wrapCount; i++) {
-                currY += textSize.y;
-                if (currY > eventCoords.y) {
-                    const targetX = Math.floor(eventCoords.x / textSize.x);
-                    const maxPos = Math.min(currPos + linePos + targetX, currPos + line.length);
-                    return {from: maxPos, to: maxPos};
-                }
-
-                linePos += lineWidth;
-            }
-
-            currPos += line.length + 1;
-        }
-
-        return this.getSelection();
+        return this.inputPositionToSelection(eventCoords.x, eventCoords.y);
     }
 
     focus(): void {
@@ -153,15 +201,8 @@ export class TextareaInput implements MarkdownEditorInput {
 
     getTextAboveView(): string {
         const scrollTop = this.input.scrollTop;
-        const computedStyles = window.getComputedStyle(this.input);
-        const lines = this.getText().split('\n');
-        const paddingTop = Number(computedStyles.paddingTop.replace('px', ''));
-        const paddingBottom = Number(computedStyles.paddingBottom.replace('px', ''));
-
-        const avgLineHeight = (this.input.scrollHeight - paddingBottom - paddingTop) / lines.length;
-        const roughLinePos = Math.max(Math.floor((scrollTop - paddingTop) / avgLineHeight), 0);
-        const linesAbove = this.getText().split('\n').slice(0, roughLinePos);
-        return linesAbove.join('\n');
+        const selection = this.inputPositionToSelection(0, scrollTop);
+        return this.getSelectionText({from: 0, to: selection.to});
     }
 
     searchForLineContaining(text: string): MarkdownEditorInputSelection | null {
@@ -243,4 +284,32 @@ export class TextareaInput implements MarkdownEditorInput {
 
         return {x: xPos, y: yPos};
     }
+
+    protected inputPositionToSelection(x: number, y: number): MarkdownEditorInputSelection {
+        const textSize = this.measureTextSize();
+        const lineWidth = this.measureLineCharCount(textSize.x);
+
+        const lines = this.getText().split('\n');
+
+        let currY = 0;
+        let currPos = 0;
+        for (const line of lines) {
+            let linePos = 0;
+            const wrapCount = Math.max(Math.ceil(line.length / lineWidth), 1);
+            for (let i = 0; i < wrapCount; i++) {
+                currY += textSize.y;
+                if (currY > y) {
+                    const targetX = Math.floor(x / textSize.x);
+                    const maxPos = Math.min(currPos + linePos + targetX, currPos + line.length);
+                    return {from: maxPos, to: maxPos};
+                }
+
+                linePos += lineWidth;
+            }
+
+            currPos += line.length + 1;
+        }
+
+        return this.getSelection();
+    }
 }
\ No newline at end of file
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index e71edc1d757..c16f0609499 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -64,6 +64,7 @@
     flex: 1;
     border: 0;
     width: 100%;
+    margin: 0;
     &:focus {
       outline: 0;
     }

From 53f32849a9fceefab4bc2029c3b7790655184861 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Jul 2025 14:49:41 +0100
Subject: [PATCH 610/666] MD Editor: Last tests/check over plaintext
 use/switching

---
 resources/js/markdown/index.mts | 1 -
 resources/js/services/util.ts   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index 7538c197255..0a6e974b74a 100644
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -62,7 +62,6 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
         editor.input.teardown();
         editor.input = newInput;
     });
-    window.devinput = editor.input;
 
     listenToCommonEvents(editor);
 
diff --git a/resources/js/services/util.ts b/resources/js/services/util.ts
index 61a02a3d24d..74ae1a93515 100644
--- a/resources/js/services/util.ts
+++ b/resources/js/services/util.ts
@@ -5,7 +5,7 @@
  * leading edge, instead of the trailing.
  * @attribution https://davidwalsh.name/javascript-debounce-function
  */
-export function debounce(func: Function, waitMs: number, immediate: boolean): Function {
+export function debounce<T extends (...args: any[]) => any>(func: T, waitMs: number, immediate: boolean): T {
     let timeout: number|null = null;
     return function debouncedWrapper(this: any, ...args: any[]) {
         const context: any = this;
@@ -19,7 +19,7 @@ export function debounce(func: Function, waitMs: number, immediate: boolean): Fu
         }
         timeout = window.setTimeout(later, waitMs);
         if (callNow) func.apply(context, args);
-    };
+    } as T;
 }
 
 function isDetailsElement(element: HTMLElement): element is HTMLDetailsElement {

From 3b9c0b34ae811d14ae39d014fc9e427dafe8aad5 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Jul 2025 14:59:26 +0100
Subject: [PATCH 611/666] MD Editor: Fixed plaintext dark styles, updated npm
 packages

---
 package-lock.json          | 691 ++++++++++++++++++++-----------------
 resources/sass/_forms.scss |   3 +-
 2 files changed, 368 insertions(+), 326 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0348fd1ed42..079e397700a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,9 +77,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.3.tgz",
-      "integrity": "sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -87,22 +87,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.3.tgz",
-      "integrity": "sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.27.3",
+        "@babel/generator": "^7.28.0",
         "@babel/helper-compilation-targets": "^7.27.2",
         "@babel/helper-module-transforms": "^7.27.3",
-        "@babel/helpers": "^7.27.3",
-        "@babel/parser": "^7.27.3",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.28.0",
         "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.27.3",
-        "@babel/types": "^7.27.3",
+        "@babel/traverse": "^7.28.0",
+        "@babel/types": "^7.28.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -118,16 +118,16 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.3.tgz",
-      "integrity": "sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.3",
-        "@babel/types": "^7.27.3",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@babel/parser": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
       },
       "engines": {
@@ -151,6 +151,16 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
@@ -223,27 +233,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.3.tgz",
-      "integrity": "sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.27.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.3.tgz",
-      "integrity": "sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/types": "^7.28.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -507,38 +517,28 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.3.tgz",
-      "integrity": "sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.27.3",
-        "@babel/parser": "^7.27.3",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.0",
         "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.3",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
+        "@babel/types": "^7.28.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.3.tgz",
-      "integrity": "sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==",
+      "version": "7.28.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",
+      "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -626,9 +626,9 @@
       }
     },
     "node_modules/@codemirror/lang-json": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
-      "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.2.tgz",
+      "integrity": "sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -636,9 +636,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.2.tgz",
-      "integrity": "sha512-c/5MYinGbFxYl4itE9q/rgN/sMTjOr8XL5OWnC+EaRMLfCbVUmmubTJfdgpfcSS2SCaT7b+Q+xi3l6CgoE+BsA==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.3.tgz",
+      "integrity": "sha512-1fn1hQAPWlSSMCvnF810AkhWpNLkJpl66CRfIy3vVl20Sl4NwChkorCHqpMtNbXr1EuMJsrDnhEpjZxKZ2UX3A==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
@@ -651,9 +651,9 @@
       }
     },
     "node_modules/@codemirror/lang-php": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.1.tgz",
-      "integrity": "sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.2.tgz",
+      "integrity": "sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/lang-html": "^6.0.0",
@@ -678,9 +678,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.0.tgz",
-      "integrity": "sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==",
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.2.tgz",
+      "integrity": "sha512-p44TsNArL4IVXDTbapUmEkAlvWs2CFQbcfc0ymDsis1kH2wh0gcY96AS29c/vp2d0y2Tquk1EDSaawpzilUiAw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -732,9 +732,9 @@
       }
     },
     "node_modules/@codemirror/theme-one-dark": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
-      "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
+      "integrity": "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -744,12 +744,13 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
-      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
+      "version": "6.38.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
+      "integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.5.0",
+        "crelt": "^1.0.6",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -779,9 +780,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
+      "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
       "cpu": [
         "ppc64"
       ],
@@ -796,9 +797,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
+      "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
       "cpu": [
         "arm"
       ],
@@ -813,9 +814,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
+      "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
       "cpu": [
         "arm64"
       ],
@@ -830,9 +831,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
+      "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
       "cpu": [
         "x64"
       ],
@@ -847,9 +848,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
+      "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
       "cpu": [
         "arm64"
       ],
@@ -864,9 +865,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
+      "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
       "cpu": [
         "x64"
       ],
@@ -881,9 +882,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
       "cpu": [
         "arm64"
       ],
@@ -898,9 +899,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
+      "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
       "cpu": [
         "x64"
       ],
@@ -915,9 +916,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
+      "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
       "cpu": [
         "arm"
       ],
@@ -932,9 +933,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
+      "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
       "cpu": [
         "arm64"
       ],
@@ -949,9 +950,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
+      "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
       "cpu": [
         "ia32"
       ],
@@ -966,9 +967,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
+      "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
       "cpu": [
         "loong64"
       ],
@@ -983,9 +984,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
+      "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
       "cpu": [
         "mips64el"
       ],
@@ -1000,9 +1001,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
+      "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1017,9 +1018,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
+      "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
       "cpu": [
         "riscv64"
       ],
@@ -1034,9 +1035,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
+      "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
       "cpu": [
         "s390x"
       ],
@@ -1051,9 +1052,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
+      "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
       "cpu": [
         "x64"
       ],
@@ -1068,9 +1069,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
       "cpu": [
         "arm64"
       ],
@@ -1085,9 +1086,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
+      "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
       "cpu": [
         "x64"
       ],
@@ -1102,9 +1103,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
       "cpu": [
         "arm64"
       ],
@@ -1119,9 +1120,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
+      "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
       "cpu": [
         "x64"
       ],
@@ -1135,10 +1136,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
+      "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
+      "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
       "cpu": [
         "x64"
       ],
@@ -1153,9 +1171,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
+      "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
       "cpu": [
         "arm64"
       ],
@@ -1170,9 +1188,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
+      "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
       "cpu": [
         "ia32"
       ],
@@ -1187,9 +1205,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
+      "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
       "cpu": [
         "x64"
       ],
@@ -1246,9 +1264,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1261,9 +1279,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1271,9 +1289,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1308,9 +1326,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1331,13 +1349,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
+      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.1",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1817,18 +1835,14 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -1841,27 +1855,17 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1876,9 +1880,9 @@
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.2.1.tgz",
-      "integrity": "sha512-2F5tOqzKEKbCUNraIXc0f6HKeyKlmMWJnBB0i4XW6dJgssrZO/YlZ2pY5xgyqDleqqhiNJ3dQhbrV2aClZQMvg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.0.tgz",
+      "integrity": "sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -1887,9 +1891,9 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.7.3.tgz",
-      "integrity": "sha512-vAI2O1tPF8QMMgp+bdUeeJCneJNkOZvqsrtyb4ohnFVFdboSqPwBEacnt0HH4E+5h+qsIwTHUSAhffU4hzKl1A==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.8.0.tgz",
+      "integrity": "sha512-/SF4EDWowPqV1jOgoGSGTIFsE7Ezdr7ZYxyihl5eMKVO5tlnpIhFcDavgm1hHY5GEonoOAEnJ0CU0x+tvuAuUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1962,9 +1966,9 @@
       }
     },
     "node_modules/@lezer/php": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.2.tgz",
-      "integrity": "sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.4.tgz",
+      "integrity": "sha512-D2dJ0t8Z28/G1guztRczMFvPDUqzeMLSQbdWQmaiHV7urc8NlEOnjYk9UrZ531OcLiRxD4Ihcbv7AsDpNKDRaQ==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2433,9 +2437,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
@@ -2535,12 +2539,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
-      "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
+      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.21.0"
+        "undici-types": "~7.8.0"
       }
     },
     "node_modules/@types/sortablejs": {
@@ -2587,9 +2591,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -2749,18 +2753,20 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3028,9 +3034,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3051,9 +3057,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "dev": true,
       "funding": [
         {
@@ -3071,8 +3077,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
+        "caniuse-lite": "^1.0.30001726",
+        "electron-to-chromium": "^1.5.173",
         "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.3"
       },
@@ -3184,9 +3190,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
-      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
+      "version": "1.0.30001727",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
+      "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
       "dev": true,
       "funding": [
         {
@@ -3343,9 +3349,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz",
+      "integrity": "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -3584,9 +3590,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
       "dev": true,
       "license": "MIT"
     },
@@ -3770,9 +3776,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.158",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.158.tgz",
-      "integrity": "sha512-9vcp2xHhkvraY6AHw2WMi+GDSLPX42qe2xjYaVoZqFRJiOcilVQFq9mZmpuHEQpzlgGDelKlV7ZiGcmMsc8WxQ==",
+      "version": "1.5.190",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz",
+      "integrity": "sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==",
       "dev": true,
       "license": "ISC"
     },
@@ -3819,9 +3825,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.10",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
-      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3852,7 +3858,9 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
@@ -3867,6 +3875,7 @@
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -3965,9 +3974,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
+      "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3978,31 +3987,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.5",
-        "@esbuild/android-arm": "0.25.5",
-        "@esbuild/android-arm64": "0.25.5",
-        "@esbuild/android-x64": "0.25.5",
-        "@esbuild/darwin-arm64": "0.25.5",
-        "@esbuild/darwin-x64": "0.25.5",
-        "@esbuild/freebsd-arm64": "0.25.5",
-        "@esbuild/freebsd-x64": "0.25.5",
-        "@esbuild/linux-arm": "0.25.5",
-        "@esbuild/linux-arm64": "0.25.5",
-        "@esbuild/linux-ia32": "0.25.5",
-        "@esbuild/linux-loong64": "0.25.5",
-        "@esbuild/linux-mips64el": "0.25.5",
-        "@esbuild/linux-ppc64": "0.25.5",
-        "@esbuild/linux-riscv64": "0.25.5",
-        "@esbuild/linux-s390x": "0.25.5",
-        "@esbuild/linux-x64": "0.25.5",
-        "@esbuild/netbsd-arm64": "0.25.5",
-        "@esbuild/netbsd-x64": "0.25.5",
-        "@esbuild/openbsd-arm64": "0.25.5",
-        "@esbuild/openbsd-x64": "0.25.5",
-        "@esbuild/sunos-x64": "0.25.5",
-        "@esbuild/win32-arm64": "0.25.5",
-        "@esbuild/win32-ia32": "0.25.5",
-        "@esbuild/win32-x64": "0.25.5"
+        "@esbuild/aix-ppc64": "0.25.8",
+        "@esbuild/android-arm": "0.25.8",
+        "@esbuild/android-arm64": "0.25.8",
+        "@esbuild/android-x64": "0.25.8",
+        "@esbuild/darwin-arm64": "0.25.8",
+        "@esbuild/darwin-x64": "0.25.8",
+        "@esbuild/freebsd-arm64": "0.25.8",
+        "@esbuild/freebsd-x64": "0.25.8",
+        "@esbuild/linux-arm": "0.25.8",
+        "@esbuild/linux-arm64": "0.25.8",
+        "@esbuild/linux-ia32": "0.25.8",
+        "@esbuild/linux-loong64": "0.25.8",
+        "@esbuild/linux-mips64el": "0.25.8",
+        "@esbuild/linux-ppc64": "0.25.8",
+        "@esbuild/linux-riscv64": "0.25.8",
+        "@esbuild/linux-s390x": "0.25.8",
+        "@esbuild/linux-x64": "0.25.8",
+        "@esbuild/netbsd-arm64": "0.25.8",
+        "@esbuild/netbsd-x64": "0.25.8",
+        "@esbuild/openbsd-arm64": "0.25.8",
+        "@esbuild/openbsd-x64": "0.25.8",
+        "@esbuild/openharmony-arm64": "0.25.8",
+        "@esbuild/sunos-x64": "0.25.8",
+        "@esbuild/win32-arm64": "0.25.8",
+        "@esbuild/win32-ia32": "0.25.8",
+        "@esbuild/win32-x64": "0.25.8"
       }
     },
     "node_modules/escalade": {
@@ -4051,19 +4061,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
-        "@eslint/core": "^0.14.0",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
+        "@eslint/core": "^0.15.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.31.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -4075,9 +4085,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -4134,9 +4144,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
-      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4162,30 +4172,30 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
-      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.8",
-        "array.prototype.findlastindex": "^1.2.5",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.12.0",
+        "eslint-module-utils": "^2.12.1",
         "hasown": "^2.0.2",
-        "is-core-module": "^2.15.1",
+        "is-core-module": "^2.16.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.8",
         "object.groupby": "^1.0.3",
-        "object.values": "^1.2.0",
+        "object.values": "^1.2.1",
         "semver": "^6.3.1",
-        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimend": "^1.0.9",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
@@ -4206,9 +4216,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -4223,9 +4233,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4249,15 +4259,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4430,9 +4440,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4519,15 +4529,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -4970,9 +4981,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
-      "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
+      "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
       "dev": true,
       "license": "MIT"
     },
@@ -5303,6 +5314,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -7349,9 +7373,9 @@
       }
     },
     "node_modules/parse5/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -7876,9 +7900,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.89.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
-      "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
+      "version": "1.89.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
+      "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8029,9 +8053,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
-      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8250,6 +8274,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -8528,16 +8566,15 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.3.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
-      "integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
+      "version": "29.4.0",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.0.tgz",
+      "integrity": "sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "ejs": "^3.1.10",
         "fast-json-stable-stringify": "^2.1.0",
-        "jest-util": "^29.0.0",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
@@ -8553,10 +8590,11 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/transform": "^29.0.0",
-        "@jest/types": "^29.0.0",
-        "babel-jest": "^29.0.0",
-        "jest": "^29.0.0",
+        "@jest/transform": "^29.0.0 || ^30.0.0",
+        "@jest/types": "^29.0.0 || ^30.0.0",
+        "babel-jest": "^29.0.0 || ^30.0.0",
+        "jest": "^29.0.0 || ^30.0.0",
+        "jest-util": "^29.0.0 || ^30.0.0",
         "typescript": ">=4.3 <6"
       },
       "peerDependenciesMeta": {
@@ -8574,6 +8612,9 @@
         },
         "esbuild": {
           "optional": true
+        },
+        "jest-util": {
+          "optional": true
         }
       }
     },
@@ -8837,9 +8878,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
       "license": "MIT"
     },
     "node_modules/universalify": {
@@ -9225,9 +9266,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index c16f0609499..12fb3385f96 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -55,7 +55,8 @@
     font-style: normal;
     font-weight: 400;
     padding: vars.$xs vars.$m;
-    color: #444;
+    @include mixins.lightDark(color, #444, #aaa);
+    @include mixins.lightDark(background-color, #fff, #222);
     border-radius: 0;
     height: 100%;
     font-size: 14px;

From 2668aae09b93feb95ac81aceb19e296879052dbb Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 23 Jul 2025 15:41:55 +0100
Subject: [PATCH 612/666] TypeScript: Updated compile target, addressed issues

---
 resources/js/wysiwyg/lexical/core/LexicalNode.ts                | 2 +-
 resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts | 2 +-
 resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts   | 2 +-
 resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts | 2 +-
 resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts | 2 +-
 resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts      | 2 +-
 tsconfig.json                                                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index 7306e6bca27..6d79c01ccb1 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -175,7 +175,7 @@ export type NodeKey = string;
 
 export class LexicalNode {
   // Allow us to look up the type including static props
-  ['constructor']!: KlassConstructor<typeof LexicalNode>;
+  declare ['constructor']: KlassConstructor<typeof LexicalNode>;
   /** @internal */
   __type: string;
   /** @internal */
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
index 99d2669d92f..5015f593ed9 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
@@ -24,7 +24,7 @@ export interface DecoratorNode<T> {
 /** @noInheritDoc */
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class DecoratorNode<T> extends LexicalNode {
-  ['constructor']!: KlassConstructor<typeof DecoratorNode<T>>;
+  declare ['constructor']: KlassConstructor<typeof DecoratorNode<T>>;
   constructor(key?: NodeKey) {
     super(key);
   }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 9ad50841141..a2760377368 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -55,7 +55,7 @@ export interface ElementNode {
 /** @noInheritDoc */
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class ElementNode extends LexicalNode {
-  ['constructor']!: KlassConstructor<typeof ElementNode>;
+  declare ['constructor']: KlassConstructor<typeof ElementNode>;
   /** @internal */
   __first: null | NodeKey;
   /** @internal */
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
index 2d28db08c12..b1746e7f842 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
@@ -22,7 +22,7 @@ export type SerializedLineBreakNode = SerializedLexicalNode;
 
 /** @noInheritDoc */
 export class LineBreakNode extends LexicalNode {
-  ['constructor']!: KlassConstructor<typeof LineBreakNode>;
+  declare ['constructor']: KlassConstructor<typeof LineBreakNode>;
   static getType(): string {
     return 'linebreak';
   }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
index e8d044b218b..6711936da00 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalParagraphNode.ts
@@ -44,7 +44,7 @@ export type SerializedParagraphNode = Spread<
 
 /** @noInheritDoc */
 export class ParagraphNode extends CommonBlockNode {
-  ['constructor']!: KlassConstructor<typeof ParagraphNode>;
+  declare ['constructor']: KlassConstructor<typeof ParagraphNode>;
   /** @internal */
   __textFormat: number;
   __textStyle: string;
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
index 9a486749421..35cc073a0ba 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -284,7 +284,7 @@ export interface TextNode {
 /** @noInheritDoc */
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class TextNode extends LexicalNode {
-  ['constructor']!: KlassConstructor<typeof TextNode>;
+  declare ['constructor']: KlassConstructor<typeof TextNode>;
   __text: string;
   /** @internal */
   __format: number;
diff --git a/tsconfig.json b/tsconfig.json
index 8bffc25f898..dacaefea279 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "include": ["resources/js/**/*"],
   "exclude": ["resources/js/wysiwyg/lexical/yjs/*"],
   "compilerOptions": {
-    "target": "es2019",
+    "target": "es2022",
     "module": "commonjs",
     "rootDir": "./resources/js/",
     "baseUrl": "./",

From 5fc19b0edf3cf4bf88e54ff11c63a82d8664218f Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 24 Jul 2025 13:48:00 +0100
Subject: [PATCH 613/666] Lexical: Fixed highlight format action, changed label

---
 lang/en/editor.php                                         | 1 +
 resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lang/en/editor.php b/lang/en/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/en/editor.php
+++ b/lang/en/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
index c5b7ad29ad9..11411e14041 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -32,7 +32,7 @@ export const bold: EditorButtonDefinition = buildFormatButton('Bold', 'bold', bo
 export const italic: EditorButtonDefinition = buildFormatButton('Italic', 'italic', italicIcon);
 export const underline: EditorButtonDefinition = buildFormatButton('Underline', 'underline', underlinedIcon);
 export const textColor: EditorBasicButtonDefinition = {label: 'Text color', icon: textColorIcon};
-export const highlightColor: EditorBasicButtonDefinition = {label: 'Background color', icon: highlightIcon};
+export const highlightColor: EditorBasicButtonDefinition = {label: 'Highlight color', icon: highlightIcon};
 
 function colorAction(context: EditorUiContext, property: string, color: string): void {
     context.editor.update(() => {
@@ -44,7 +44,7 @@ function colorAction(context: EditorUiContext, property: string, color: string):
 }
 
 export const textColorAction = (color: string, context: EditorUiContext) => colorAction(context, 'color', color);
-export const highlightColorAction = (color: string, context: EditorUiContext) => colorAction(context, 'color', color);
+export const highlightColorAction = (color: string, context: EditorUiContext) => colorAction(context, 'background-color', color);
 
 export const strikethrough: EditorButtonDefinition = buildFormatButton('Strikethrough', 'strikethrough', strikethroughIcon);
 export const superscript: EditorButtonDefinition = buildFormatButton('Superscript', 'superscript', superscriptIcon);

From ae4d1d804a8dbe3e95511afb2470e36a0d4a38fa Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 24 Jul 2025 16:51:11 +0100
Subject: [PATCH 614/666] Lexical: Table cell bg and format setting fixes

- Updated table cell background color setting to be stable by
  specifically using the background property over the general styles.
- Updated format shorcuts to be correct header levels as per old editor
  and format menu.
- Updated format changes to properly update UI afterwards.
---
 .../lexical/table/LexicalTableCellNode.ts        |  9 ++++++++-
 resources/js/wysiwyg/services/shortcuts.ts       | 16 +++++++++-------
 .../ui/defaults/buttons/inline-formats.ts        |  1 -
 resources/js/wysiwyg/ui/defaults/forms/tables.ts |  4 ++--
 resources/js/wysiwyg/utils/tables.ts             |  1 +
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
index 1fc6b42bbeb..1c9d7ecf692 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -353,10 +353,17 @@ export function $convertTableCellNodeElement(
   const hasUnderlineTextDecoration = textDecoration.includes('underline');
 
   if (domNode instanceof HTMLElement) {
-    tableCellNode.setStyles(extractStyleMapFromElement(domNode));
+    const styleMap = extractStyleMapFromElement(domNode);
+    styleMap.delete('background-color');
+    tableCellNode.setStyles(styleMap);
     tableCellNode.setAlignment(extractAlignmentFromElement(domNode));
   }
 
+  const background = style.backgroundColor || null;
+  if (background) {
+    tableCellNode.setBackgroundColor(background);
+  }
+
   return {
     after: (childLexicalNodes) => {
       if (childLexicalNodes.length === 0) {
diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
index 0384a3bf133..ead4c38d432 100644
--- a/resources/js/wysiwyg/services/shortcuts.ts
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -13,14 +13,16 @@ import {$showLinkForm} from "../ui/defaults/forms/objects";
 import {showLinkSelector} from "../utils/links";
 import {HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
 
-function headerHandler(editor: LexicalEditor, tag: HeadingTagType): boolean {
-    toggleSelectionAsHeading(editor, tag);
+function headerHandler(context: EditorUiContext, tag: HeadingTagType): boolean {
+    toggleSelectionAsHeading(context.editor, tag);
+    context.manager.triggerFutureStateRefresh();
     return true;
 }
 
 function wrapFormatAction(formatAction: (editor: LexicalEditor) => any): ShortcutAction {
-    return (editor: LexicalEditor) => {
+    return (editor: LexicalEditor, context: EditorUiContext) => {
         formatAction(editor);
+        context.manager.triggerFutureStateRefresh();
         return true;
     };
 }
@@ -45,10 +47,10 @@ const actionsByKeys: Record<string, ShortcutAction> = {
         window.$events.emit('editor-save-page');
         return true;
     },
-    'meta+1': (editor) => headerHandler(editor, 'h1'),
-    'meta+2': (editor) => headerHandler(editor, 'h2'),
-    'meta+3': (editor) => headerHandler(editor, 'h3'),
-    'meta+4': (editor) => headerHandler(editor, 'h4'),
+    'meta+1': (editor, context) => headerHandler(context, 'h2'),
+    'meta+2': (editor, context) => headerHandler(context, 'h3'),
+    'meta+3': (editor, context) => headerHandler(context, 'h4'),
+    'meta+4': (editor, context) => headerHandler(context, 'h5'),
     'meta+5': wrapFormatAction(toggleSelectionAsParagraph),
     'meta+d': wrapFormatAction(toggleSelectionAsParagraph),
     'meta+6': wrapFormatAction(toggleSelectionAsBlockquote),
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
index 11411e14041..dea78d24f37 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/inline-formats.ts
@@ -13,7 +13,6 @@ import codeIcon from "@icons/editor/code.svg";
 import formatClearIcon from "@icons/editor/format-clear.svg";
 import {$selectionContainsTextFormat} from "../../../utils/selection";
 import {$patchStyleText} from "@lexical/selection";
-import {context} from "esbuild";
 
 function buildFormatButton(label: string, format: TextFormatType, icon: string): EditorButtonDefinition {
     return {
diff --git a/resources/js/wysiwyg/ui/defaults/forms/tables.ts b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
index 5b484310d9a..031e0098368 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/tables.ts
@@ -75,7 +75,7 @@ export function $showCellPropertiesForm(cell: TableCellNode, context: EditorUiCo
         border_width: styles.get('border-width') || '',
         border_style: styles.get('border-style') || '',
         border_color: styles.get('border-color') || '',
-        background_color: styles.get('background-color') || '',
+        background_color: cell.getBackgroundColor() || styles.get('background-color') || '',
     });
     return modalForm;
 }
@@ -91,6 +91,7 @@ export const cellProperties: EditorFormDefinition = {
                 $setTableCellColumnWidth(cell, width);
                 cell.updateTag(formData.get('type')?.toString() || '');
                 cell.setAlignment((formData.get('h_align')?.toString() || '') as CommonBlockAlignment);
+                cell.setBackgroundColor(formData.get('background_color')?.toString() || '');
 
                 const styles = cell.getStyles();
                 styles.set('height', formatSizeValue(formData.get('height')?.toString() || ''));
@@ -98,7 +99,6 @@ export const cellProperties: EditorFormDefinition = {
                 styles.set('border-width', formatSizeValue(formData.get('border_width')?.toString() || ''));
                 styles.set('border-style', formData.get('border_style')?.toString() || '');
                 styles.set('border-color', formData.get('border_color')?.toString() || '');
-                styles.set('background-color', formData.get('background_color')?.toString() || '');
 
                 cell.setStyles(styles);
             }
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index 8f4a6599f9a..15cc3cbbeb8 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -282,6 +282,7 @@ export function $clearTableFormatting(table: TableNode): void {
         const cells = row.getChildren().filter(c => $isTableCellNode(c));
         for (const cell of cells) {
             cell.setStyles(new Map);
+            cell.setBackgroundColor(null);
             cell.clearWidth();
         }
     }

From 865e5aecc99ebb8051f7b1c99b11710bd9709383 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 24 Jul 2025 17:24:59 +0100
Subject: [PATCH 615/666] Lexical: Source code input changes

- Increased default source code view size.
- Updated HTML generation to output each top-level block on its own
  line.
---
 .../html/__tests__/unit/LexicalHtml.test.ts   |  2 +-
 resources/js/wysiwyg/lexical/html/index.ts    | 13 ++++++++-
 .../unit/LexicalUtilsSplitNode.test.ts        | 12 ++++----
 ...exlcaiUtilsInsertNodeToNearestRoot.test.ts | 28 +++++++++----------
 resources/sass/_editor.scss                   |  8 ++++++
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
index e5064121ab5..b466ee34a2c 100644
--- a/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
+++ b/resources/js/wysiwyg/lexical/html/__tests__/unit/LexicalHtml.test.ts
@@ -146,7 +146,7 @@ describe('HTML', () => {
     });
 
     expect(html).toBe(
-      '<p>Hello</p><p>World</p>',
+      '<p>Hello</p>\n<p>World</p>',
     );
   });
 
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index 5018e10b4f2..de5e53bb8c4 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -85,7 +85,18 @@ export function $generateHtmlFromNodes(
     $appendNodesToHTML(editor, topLevelNode, container, selection);
   }
 
-  return container.innerHTML;
+  const nodeCode = [];
+  for (const node of container.childNodes) {
+    if ("outerHTML" in node) {
+      nodeCode.push(node.outerHTML)
+    } else {
+      const wrap = document.createElement('div');
+      wrap.appendChild(node.cloneNode(true));
+      nodeCode.push(wrap.innerHTML);
+    }
+  }
+
+  return nodeCode.join('\n');
 }
 
 function $appendNodesToHTML(
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
index 54cd8b54f1e..6a415d00810 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexicalUtilsSplitNode.test.ts
@@ -38,7 +38,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph in between two text nodes',
       expectedHtml:
-        '<p>Hello</p><p>world</p>',
+        '<p>Hello</p>\n<p>world</p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 1,
       splitPath: [0],
@@ -46,7 +46,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph before the first text node',
       expectedHtml:
-        '<p><br></p><p>Helloworld</p>',
+        '<p><br></p>\n<p>Helloworld</p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 0,
       splitPath: [0],
@@ -54,7 +54,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split paragraph after the last text node',
       expectedHtml:
-        '<p>Helloworld</p><p><br></p>',
+        '<p>Helloworld</p>\n<p><br></p>',
       initialHtml: '<p><span>Hello</span><span>world</span></p>',
       splitOffset: 2, // Any offset that is higher than children size
       splitPath: [0],
@@ -62,7 +62,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split list items between two text nodes',
       expectedHtml:
-        '<ul><li>Hello</li></ul>' +
+        '<ul><li>Hello</li></ul>\n' +
         '<ul><li>world</li></ul>',
       initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
       splitOffset: 1, // Any offset that is higher than children size
@@ -71,7 +71,7 @@ describe('LexicalUtils#splitNode', () => {
     {
       _: 'split list items before the first text node',
       expectedHtml:
-        '<ul><li></li></ul>' +
+        '<ul><li></li></ul>\n' +
         '<ul><li>Helloworld</li></ul>',
       initialHtml: '<ul><li><span>Hello</span><span>world</span></li></ul>',
       splitOffset: 0, // Any offset that is higher than children size
@@ -83,7 +83,7 @@ describe('LexicalUtils#splitNode', () => {
         '<ul>' +
         '<li>Before</li>' +
         '<li style="list-style: none;"><ul><li>Hello</li></ul></li>' +
-        '</ul>' +
+        '</ul>\n' +
         '<ul>' +
         '<li style="list-style: none;"><ul><li>world</li></ul></li>' +
         '<li>After</li>' +
diff --git a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
index 8c31496de5a..f13aed4086e 100644
--- a/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
+++ b/resources/js/wysiwyg/lexical/utils/__tests__/unit/LexlcaiUtilsInsertNodeToNearestRoot.test.ts
@@ -46,7 +46,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert into paragraph in between two text nodes',
       expectedHtml:
-        '<p>Hello</p><test-decorator></test-decorator><p>world</p>',
+        '<p>Hello</p>\n<test-decorator></test-decorator>\n<p>world</p>',
       initialHtml: '<p><span>Helloworld</span></p>',
       selectionOffset: 5, // Selection on text node after "Hello" world
       selectionPath: [0, 0],
@@ -57,8 +57,8 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
         '<ul>' +
         '<li>Before</li>' +
         '<li style="list-style: none;"><ul><li>Hello</li></ul></li>' +
-        '</ul>' +
-        '<test-decorator></test-decorator>' +
+        '</ul>\n' +
+        '<test-decorator></test-decorator>\n' +
         '<ul>' +
         '<li style="list-style: none;"><ul><li>world</li></ul></li>' +
         '<li>After</li>' +
@@ -74,7 +74,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     },
     {
       _: 'insert into empty paragraph',
-      expectedHtml: '<p><br></p><test-decorator></test-decorator><p><br></p>',
+      expectedHtml: '<p><br></p>\n<test-decorator></test-decorator>\n<p><br></p>',
       initialHtml: '<p></p>',
       selectionOffset: 0, // Selection on text node after "Hello" world
       selectionPath: [0],
@@ -82,8 +82,8 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert in the end of paragraph',
       expectedHtml:
-        '<p>Hello world</p>' +
-        '<test-decorator></test-decorator>' +
+        '<p>Hello world</p>\n' +
+        '<test-decorator></test-decorator>\n' +
         '<p><br></p>',
       initialHtml: '<p>Hello world</p>',
       selectionOffset: 12, // Selection on text node after "Hello" world
@@ -92,8 +92,8 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert in the beginning of paragraph',
       expectedHtml:
-        '<p><br></p>' +
-        '<test-decorator></test-decorator>' +
+        '<p><br></p>\n' +
+        '<test-decorator></test-decorator>\n' +
         '<p>Hello world</p>',
       initialHtml: '<p>Hello world</p>',
       selectionOffset: 0, // Selection on text node after "Hello" world
@@ -102,9 +102,9 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert with selection on root start',
       expectedHtml:
-        '<test-decorator></test-decorator>' +
-        '<test-decorator></test-decorator>' +
-        '<p>Before</p>' +
+        '<test-decorator></test-decorator>\n' +
+        '<test-decorator></test-decorator>\n' +
+        '<p>Before</p>\n' +
         '<p>After</p>',
       initialHtml:
         '<test-decorator></test-decorator>' +
@@ -116,8 +116,8 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert with selection on root child',
       expectedHtml:
-        '<p>Before</p>' +
-        '<test-decorator></test-decorator>' +
+        '<p>Before</p>\n' +
+        '<test-decorator></test-decorator>\n' +
         '<p>After</p>',
       initialHtml: '<p>Before</p><p>After</p>',
       selectionOffset: 1,
@@ -126,7 +126,7 @@ describe('LexicalUtils#insertNodeToNearestRoot', () => {
     {
       _: 'insert with selection on root end',
       expectedHtml:
-        '<p>Before</p>' +
+        '<p>Before</p>\n' +
         '<test-decorator></test-decorator>',
       initialHtml: '<p>Before</p>',
       selectionOffset: 1,
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index de43540a31d..a7f5ab387d5 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -681,6 +681,14 @@ textarea.editor-form-field-input {
   }
 }
 
+// Specific field styles
+textarea.editor-form-field-input[name="source"] {
+  width: 1000px;
+  height: 600px;
+  max-height: 60vh;
+  max-width: 80vw;
+}
+
 // Editor theme styles
 .editor-theme-bold {
   font-weight: bold;

From c54101c603a3e8e06c372de673a811d41a1f1f9d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 25 Jul 2025 13:58:48 +0100
Subject: [PATCH 616/666] Lexical: Updated URL handling, added mouse handling

- Removed URL protocol allow-list to allow any as per old editor.
- Added mouse handling, so that clicks below many last hard-to-escape
  block types will add an empty new paragraph for easy escaping &
  editing.
---
 resources/js/wysiwyg/index.ts                 |  2 +
 .../lexical/core/__tests__/utils/index.ts     | 16 +++++
 resources/js/wysiwyg/lexical/link/index.ts    | 23 +------
 .../services/__tests__/mouse-handling.test.ts | 51 +++++++++++++++
 .../js/wysiwyg/services/mouse-handling.ts     | 63 +++++++++++++++++++
 5 files changed, 133 insertions(+), 22 deletions(-)
 create mode 100644 resources/js/wysiwyg/services/__tests__/mouse-handling.test.ts
 create mode 100644 resources/js/wysiwyg/services/mouse-handling.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index f572f9de5ec..e01b4e8f499 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -19,6 +19,7 @@ import {contextToolbars, getBasicEditorToolbar, getMainEditorFullToolbar} from "
 import {modals} from "./ui/defaults/modals";
 import {CodeBlockDecorator} from "./ui/decorators/code-block";
 import {DiagramDecorator} from "./ui/decorators/diagram";
+import {registerMouseHandling} from "./services/mouse-handling";
 
 const theme = {
     text: {
@@ -51,6 +52,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerHistory(editor, createEmptyHistoryState(), 300),
         registerShortcuts(context),
         registerKeyboardHandling(context),
+        registerMouseHandling(context),
         registerTableResizer(editor, context.scrollDOM),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, context.editorDOM),
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index e18ef97560b..fd87877eefb 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -848,4 +848,20 @@ export function dispatchKeydownEventForSelectedNode(editor: LexicalEditor, key:
       dispatchKeydownEventForNode(node, editor, key);
     }
   });
+}
+
+export function dispatchEditorMouseClick(editor: LexicalEditor, clientX: number, clientY: number) {
+  const dom = editor.getRootElement();
+  if (!dom) {
+    return;
+  }
+
+  const event = new MouseEvent('click', {
+    clientX: clientX,
+    clientY: clientY,
+    bubbles: true,
+    cancelable: true,
+  });
+  dom?.dispatchEvent(event);
+  editor.commitUpdates();
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/link/index.ts b/resources/js/wysiwyg/lexical/link/index.ts
index 884fe9153a0..336bb15467a 100644
--- a/resources/js/wysiwyg/lexical/link/index.ts
+++ b/resources/js/wysiwyg/lexical/link/index.ts
@@ -48,14 +48,6 @@ export type SerializedLinkNode = Spread<
 
 type LinkHTMLElementType = HTMLAnchorElement | HTMLSpanElement;
 
-const SUPPORTED_URL_PROTOCOLS = new Set([
-  'http:',
-  'https:',
-  'mailto:',
-  'sms:',
-  'tel:',
-]);
-
 /** @noInheritDoc */
 export class LinkNode extends ElementNode {
   /** @internal */
@@ -90,7 +82,7 @@ export class LinkNode extends ElementNode {
 
   createDOM(config: EditorConfig): LinkHTMLElementType {
     const element = document.createElement('a');
-    element.href = this.sanitizeUrl(this.__url);
+    element.href = this.__url;
     if (this.__target !== null) {
       element.target = this.__target;
     }
@@ -166,19 +158,6 @@ export class LinkNode extends ElementNode {
     return node;
   }
 
-  sanitizeUrl(url: string): string {
-    try {
-      const parsedUrl = new URL(url);
-      // eslint-disable-next-line no-script-url
-      if (!SUPPORTED_URL_PROTOCOLS.has(parsedUrl.protocol)) {
-        return 'about:blank';
-      }
-    } catch {
-      return url;
-    }
-    return url;
-  }
-
   exportJSON(): SerializedLinkNode | SerializedAutoLinkNode {
     return {
       ...super.exportJSON(),
diff --git a/resources/js/wysiwyg/services/__tests__/mouse-handling.test.ts b/resources/js/wysiwyg/services/__tests__/mouse-handling.test.ts
new file mode 100644
index 00000000000..a3da35206b2
--- /dev/null
+++ b/resources/js/wysiwyg/services/__tests__/mouse-handling.test.ts
@@ -0,0 +1,51 @@
+import {
+    createTestContext, destroyFromContext, dispatchEditorMouseClick,
+} from "lexical/__tests__/utils";
+import {
+    $getRoot, LexicalEditor, LexicalNode,
+    ParagraphNode,
+} from "lexical";
+import {registerRichText} from "@lexical/rich-text";
+import {EditorUiContext} from "../../ui/framework/core";
+import {registerMouseHandling} from "../mouse-handling";
+import {$createTableNode, TableNode} from "@lexical/table";
+
+describe('Mouse-handling service tests', () => {
+
+    let context!: EditorUiContext;
+    let editor!: LexicalEditor;
+
+    beforeEach(() => {
+        context = createTestContext();
+        editor = context.editor;
+        registerRichText(editor);
+        registerMouseHandling(context);
+    });
+
+    afterEach(() => {
+        destroyFromContext(context);
+    });
+
+    test('Click below last table inserts new empty paragraph', () => {
+        let tableNode!: TableNode;
+        let lastRootChild!: LexicalNode|null;
+
+        editor.updateAndCommit(() => {
+            tableNode = $createTableNode();
+            $getRoot().append(tableNode);
+            lastRootChild = $getRoot().getLastChild();
+        });
+
+        expect(lastRootChild).toBeInstanceOf(TableNode);
+
+        const tableDOM = editor.getElementByKey(tableNode.getKey());
+        const rect = tableDOM?.getBoundingClientRect();
+        dispatchEditorMouseClick(editor, 0, (rect?.bottom || 0) + 1)
+
+        editor.getEditorState().read(() => {
+            lastRootChild = $getRoot().getLastChild();
+        });
+
+        expect(lastRootChild).toBeInstanceOf(ParagraphNode);
+    });
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/mouse-handling.ts b/resources/js/wysiwyg/services/mouse-handling.ts
new file mode 100644
index 00000000000..058efc8d226
--- /dev/null
+++ b/resources/js/wysiwyg/services/mouse-handling.ts
@@ -0,0 +1,63 @@
+import {EditorUiContext} from "../ui/framework/core";
+import {
+    $createParagraphNode, $getRoot,
+    $getSelection,
+    $isDecoratorNode, CLICK_COMMAND,
+    COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
+    KEY_BACKSPACE_COMMAND,
+    KEY_DELETE_COMMAND,
+    KEY_ENTER_COMMAND, KEY_TAB_COMMAND,
+    LexicalEditor,
+    LexicalNode
+} from "lexical";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
+import {getLastSelection} from "../utils/selection";
+import {$getNearestNodeBlockParent, $getParentOfType, $selectOrCreateAdjacent} from "../utils/nodes";
+import {$setInsetForSelection} from "../utils/lists";
+import {$isListItemNode} from "@lexical/list";
+import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+import {$isDiagramNode} from "../utils/diagrams";
+import {$isTableNode} from "@lexical/table";
+
+function isHardToEscapeNode(node: LexicalNode): boolean {
+    return $isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node) || $isTableNode(node);
+}
+
+function insertBelowLastNode(context: EditorUiContext, event: MouseEvent): boolean {
+    const lastNode = $getRoot().getLastChild();
+    if (!lastNode || !isHardToEscapeNode(lastNode)) {
+        return false;
+    }
+
+    const lastNodeDom = context.editor.getElementByKey(lastNode.getKey());
+    if (!lastNodeDom) {
+        return false;
+    }
+
+    const nodeBounds = lastNodeDom.getBoundingClientRect();
+    const isClickBelow = event.clientY > nodeBounds.bottom;
+    if (isClickBelow) {
+        context.editor.update(() => {
+            const newNode = $createParagraphNode();
+            $getRoot().append(newNode);
+            newNode.select();
+        });
+        return true;
+    }
+
+    return false;
+}
+
+
+export function registerMouseHandling(context: EditorUiContext): () => void {
+    const unregisterClick = context.editor.registerCommand(CLICK_COMMAND, (event): boolean => {
+        insertBelowLastNode(context, event);
+        return false;
+    }, COMMAND_PRIORITY_LOW);
+
+
+    return () => {
+        unregisterClick();
+    };
+}
\ No newline at end of file

From d145efb6f6eac73947c7f3c53173f42b4dd9a615 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 25 Jul 2025 14:25:02 +0100
Subject: [PATCH 617/666] Lexical: Updated tests after link changes

---
 .../link/__tests__/unit/LexicalAutoLinkNode.test.ts  | 12 ------------
 .../link/__tests__/unit/LexicalLinkNode.test.ts      | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
index 0f35136821b..1103f73d3dc 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalAutoLinkNode.test.ts
@@ -273,18 +273,6 @@ describe('LexicalAutoAutoLinkNode tests', () => {
       });
     });
 
-    test('AutoLinkNode.createDOM() sanitizes javascript: URLs', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        // eslint-disable-next-line no-script-url
-        const autoLinkNode = new AutoLinkNode('javascript:alert(0)');
-        expect(autoLinkNode.createDOM(editorConfig).outerHTML).toBe(
-          '<a href="about:blank" class="my-autolink-class"></a>',
-        );
-      });
-    });
-
     test('AutoLinkNode.updateDOM()', async () => {
       const {editor} = testEnv;
 
diff --git a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
index 1aff9186306..c50450302f8 100644
--- a/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
+++ b/resources/js/wysiwyg/lexical/link/__tests__/unit/LexicalLinkNode.test.ts
@@ -218,18 +218,6 @@ describe('LexicalLinkNode tests', () => {
       });
     });
 
-    test('LinkNode.createDOM() sanitizes javascript: URLs', async () => {
-      const {editor} = testEnv;
-
-      await editor.update(() => {
-        // eslint-disable-next-line no-script-url
-        const linkNode = new LinkNode('javascript:alert(0)');
-        expect(linkNode.createDOM(editorConfig).outerHTML).toBe(
-          '<a href="about:blank" class="my-link-class"></a>',
-        );
-      });
-    });
-
     test('LinkNode.updateDOM()', async () => {
       const {editor} = testEnv;
 

From 6d7ffab115e5979c128c1583c89be9926721f5dc Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Jul 2025 11:24:54 +0100
Subject: [PATCH 618/666] Deps: Updated PHP composer dependancy versions, fixed
 test namespaces

---
 composer.lock                | 68 ++++++++++++++++++------------------
 tests/Api/ExportsApiTest.php |  3 +-
 tests/Api/ImportsApiTest.php |  3 +-
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1f7cbf88497..c42f19156a1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.349.3",
+            "version": "3.351.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "b2d4718786398f47626add9c29840fc416175ef2"
+                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b2d4718786398f47626add9c29840fc416175ef2",
-                "reference": "b2d4718786398f47626add9c29840fc416175ef2",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9506d7fdb3cb84f8d7b175c594db9993264814be",
+                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.349.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.351.7"
             },
-            "time": "2025-07-09T18:10:17+00:00"
+            "time": "2025-07-25T18:06:34+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2075,16 +2075,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.21.0",
+            "version": "v5.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "d83639499ad14985c9a6a9713b70073300ce998d"
+                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/d83639499ad14985c9a6a9713b70073300ce998d",
-                "reference": "d83639499ad14985c9a6a9713b70073300ce998d",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
+                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
                 "shasum": ""
             },
             "require": {
@@ -2143,7 +2143,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-05-19T12:56:37+00:00"
+            "time": "2025-07-23T14:16:08+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -2213,16 +2213,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca",
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca",
                 "shasum": ""
             },
             "require": {
@@ -2251,7 +2251,7 @@
                 "symfony/process": "^5.4 | ^6.0 | ^7.0",
                 "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
-                "vimeo/psalm": "^4.24.0 || ^5.0.0"
+                "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
             },
             "suggest": {
                 "symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -2316,7 +2316,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-05T12:20:28+00:00"
+            "time": "2025-07-20T12:47:49+00:00"
         },
         {
             "name": "league/config",
@@ -3049,16 +3049,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.9.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6"
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
-                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
                 "shasum": ""
             },
             "require": {
@@ -3110,9 +3110,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.9.0"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
             },
-            "time": "2024-03-31T07:05:07+00:00"
+            "time": "2025-07-25T09:04:22+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -8138,16 +8138,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce"
+                "reference": "6431d010dd383a9279eb8874a76ddb571738564a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/e8ccd73008487ba91da9877b373f8c447743f1ce",
-                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/6431d010dd383a9279eb8874a76ddb571738564a",
+                "reference": "6431d010dd383a9279eb8874a76ddb571738564a",
                 "shasum": ""
             },
             "require": {
@@ -8215,7 +8215,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.5.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -8223,7 +8223,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-19T22:41:50+00:00"
+            "time": "2025-07-11T06:52:52+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8587,16 +8587,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.17",
+            "version": "2.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
+                "reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a9ccfef95210f92ba6feea6e8d1eef42b5605499",
+                "reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499",
                 "shasum": ""
             },
             "require": {
@@ -8641,7 +8641,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-21T20:55:28+00:00"
+            "time": "2025-07-26T20:45:26+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/tests/Api/ExportsApiTest.php b/tests/Api/ExportsApiTest.php
index d427c1a4da5..e1ac698d0a4 100644
--- a/tests/Api/ExportsApiTest.php
+++ b/tests/Api/ExportsApiTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Api;
+namespace Tests\Api;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
-use Tests\Api\TestsApi;
 use Tests\Exports\ZipTestHelper;
 use Tests\TestCase;
 
diff --git a/tests/Api/ImportsApiTest.php b/tests/Api/ImportsApiTest.php
index f6df074ee38..7026868c913 100644
--- a/tests/Api/ImportsApiTest.php
+++ b/tests/Api/ImportsApiTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Api;
+namespace Tests\Api;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Exports\Import;
-use Tests\Api\TestsApi;
 use Tests\Exports\ZipTestHelper;
 use Tests\TestCase;
 

From 4ab17157b1c74c9155fc15860b97ba3e21f343f4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 30 Jul 2025 09:13:58 +0100
Subject: [PATCH 619/666] API: Added ZIP export endpoint comments

---
 app/Exports/Controllers/BookExportApiController.php    | 2 +-
 app/Exports/Controllers/ChapterExportApiController.php | 3 +++
 app/Exports/Controllers/PageExportApiController.php    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index e2d0addc30c..87f1d7eef0e 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -66,7 +66,7 @@ public function exportMarkdown(int $id)
     }
 
     /**
-     * Export a book to a contained ZIP export file.
+     * Export a book as a contained ZIP export file.
      */
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index 66e2276b5ce..bccd414af65 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -65,6 +65,9 @@ public function exportMarkdown(int $id)
         return $this->download()->directly($markdown, $chapter->slug . '.md');
     }
 
+    /**
+     * Export a chapter as a contained ZIP file.
+     */
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
         $chapter = $this->queries->findVisibleByIdOrFail($id);
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index d6412614c45..73af01afa52 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -65,6 +65,9 @@ public function exportMarkdown(int $id)
         return $this->download()->directly($markdown, $page->slug . '.md');
     }
 
+    /**
+     * Export a page as a contained ZIP file.
+     */
     public function exportZip(int $id, ZipExportBuilder $builder)
     {
         $page = $this->queries->findVisibleByIdOrFail($id);

From 8aa6bdc8abf9d544f0490baad53ed40bf04bd721 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 30 Jul 2025 09:27:17 +0100
Subject: [PATCH 620/666] Updated translator & dependency attribution before
 release v25.07

---
 .github/translators.txt                |  7 +++
 dev/licensing/js-library-licenses.txt  | 87 ++++++++++++++++++--------
 dev/licensing/php-library-licenses.txt | 14 ++---
 3 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index ac5fa766f59..dfaa8d621fb 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -493,3 +493,10 @@ Angel Pandey (angel-pandey) :: Nepali
 Supriya Shrestha (supriyashrestha) :: Nepali
 gprabhat :: Nepali
 CellCat :: Chinese Simplified
+Al Desrahim (aldesrahim) :: Indonesian
+ahmad abbaspour (deshneh.dar.diss) :: Persian
+Erjon K. (ekr) :: Albanian
+LiZerui (iamzrli) :: Chinese Traditional
+Ticker (ticker.com) :: Hebrew
+CrazyComputer :: Chinese Simplified
+Firr (FirrV) :: Russian
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index d09010142b3..b5fa446a468 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -345,7 +345,7 @@ Link: tj/co
 codemirror
 License: MIT
 License File: node_modules/codemirror/LICENSE
-Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
 Source: https://github.com/codemirror/basic-setup.git
 Link: https://github.com/codemirror/basic-setup.git
 -----------
@@ -711,13 +711,13 @@ eslint-scope
 License: BSD-2-Clause
 License File: node_modules/eslint-scope/LICENSE
 Copyright: Copyright (C) 2012-2013 Yusuke Suzuki (twitter: @Constellation) and other contributors.
-Source: eslint/js
+Source: https://github.com/eslint/js.git
 Link: https://github.com/eslint/js/blob/main/packages/eslint-scope/README.md
 -----------
 eslint-visitor-keys
 License: Apache-2.0
 License File: node_modules/eslint-visitor-keys/LICENSE
-Source: eslint/js
+Source: https://github.com/eslint/js.git
 Link: https://github.com/eslint/js/blob/main/packages/eslint-visitor-keys/README.md
 -----------
 eslint
@@ -731,7 +731,7 @@ License: BSD-2-Clause
 License File: node_modules/espree/LICENSE
 Copyright: Copyright (c) Open JS Foundation
 All rights reserved.
-Source: eslint/js
+Source: https://github.com/eslint/js.git
 Link: https://github.com/eslint/js/blob/main/packages/espree/README.md
 -----------
 esprima
@@ -1252,6 +1252,13 @@ Copyright: Copyright (c) 2019 Inspect JS
 Source: git+https://github.com/inspect-js/is-map.git
 Link: https://github.com/inspect-js/is-map#readme
 -----------
+is-negative-zero
+License: MIT
+License File: node_modules/is-negative-zero/LICENSE
+Copyright: Copyright (c) 2014 Jordan Harband
+Source: git://github.com/inspect-js/is-negative-zero.git
+Link: https://github.com/inspect-js/is-negative-zero
+-----------
 is-number-object
 License: MIT
 License File: node_modules/is-number-object/LICENSE
@@ -2493,6 +2500,13 @@ Copyright: Copyright (c) 2016-2022 Isaac Z. Schlueter <*@***.**>, James Talmage
 Source: tapjs/stack-utils
 Link: tapjs/stack-utils
 -----------
+stop-iteration-iterator
+License: MIT
+License File: node_modules/stop-iteration-iterator/LICENSE
+Copyright: Copyright (c) 2023 Jordan Harband
+Source: git+https://github.com/ljharb/stop-iteration-iterator.git
+Link: https://github.com/ljharb/stop-iteration-iterator#readme
+-----------
 string-length
 License: MIT
 License File: node_modules/string-length/license
@@ -2992,6 +3006,13 @@ Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
 Source: https://github.com/babel/babel.git
 Link: https://github.com/babel/babel.git
 -----------
+@babel/helper-globals
+License: MIT
+License File: node_modules/@babel/helper-globals/LICENSE
+Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Source: https://github.com/babel/babel.git
+Link: https://github.com/babel/babel.git
+-----------
 @babel/helper-module-imports
 License: MIT
 License File: node_modules/@babel/helper-module-imports/LICENSE
@@ -3038,7 +3059,7 @@ Link: https://github.com/babel/babel.git
 License: MIT
 License File: node_modules/@babel/helpers/LICENSE
 Copyright: Copyright (c) 2014-present Sebastian McKenzie and other contributors
-Copyright (c) 2014-present, Facebook, Inc. (ONLY ./src/helpers/regeneratorRuntime.js)
+Copyright (c) 2014-present, Facebook, Inc. (ONLY ./src/helpers/regenerator* files)
 Source: https://github.com/babel/babel.git
 Link: https://babel.dev/docs/en/next/babel-helpers
 -----------
@@ -3233,7 +3254,7 @@ Link: https://github.com/codemirror/lang-javascript.git
 @codemirror/lang-json
 License: MIT
 License File: node_modules/@codemirror/lang-json/LICENSE
-Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
 Source: https://github.com/codemirror/lang-json.git
 Link: https://github.com/codemirror/lang-json.git
 -----------
@@ -3247,7 +3268,7 @@ Link: https://github.com/codemirror/lang-markdown.git
 @codemirror/lang-php
 License: MIT
 License File: node_modules/@codemirror/lang-php/LICENSE
-Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <*******@*****.***> and others
+Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
 Source: https://github.com/codemirror/lang-php.git
 Link: https://github.com/codemirror/lang-php.git
 -----------
@@ -3337,7 +3358,7 @@ Link: https://github.com/eslint-community/regexpp#readme
 License: Apache-2.0
 License File: node_modules/@eslint/config-array/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
-Link: https://github.com/eslint/rewrite#readme
+Link: https://github.com/eslint/rewrite/tree/main/packages/config-array#readme
 -----------
 @eslint/config-helpers
 License: Apache-2.0
@@ -3349,7 +3370,7 @@ Link: https://github.com/eslint/rewrite/tree/main/packages/config-helpers#readme
 License: Apache-2.0
 License File: node_modules/@eslint/core/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
-Link: https://github.com/eslint/rewrite#readme
+Link: https://github.com/eslint/rewrite/tree/main/packages/core#readme
 -----------
 @eslint/eslintrc
 License: MIT
@@ -3373,7 +3394,7 @@ Link: https://github.com/eslint/rewrite#readme
 License: Apache-2.0
 License File: node_modules/@eslint/plugin-kit/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
-Link: https://github.com/eslint/rewrite#readme
+Link: https://github.com/eslint/rewrite/tree/main/packages/plugin-kit#readme
 -----------
 @humanfs/core
 License: Apache-2.0
@@ -3514,9 +3535,9 @@ Link: https://github.com/jestjs/jest.git
 @jridgewell/gen-mapping
 License: MIT
 License File: node_modules/@jridgewell/gen-mapping/LICENSE
-Copyright: Copyright 2022 Justin Ridgewell <**********@******.***>
-Source: https://github.com/jridgewell/gen-mapping
-Link: https://github.com/jridgewell/gen-mapping
+Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
+Source: git+https://github.com/jridgewell/sourcemaps.git
+Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/gen-mapping
 -----------
 @jridgewell/resolve-uri
 License: MIT
@@ -3525,26 +3546,19 @@ Copyright: Copyright 2019 Justin Ridgewell <**********@******.***>
 Source: https://github.com/jridgewell/resolve-uri
 Link: https://github.com/jridgewell/resolve-uri
 -----------
-@jridgewell/set-array
-License: MIT
-License File: node_modules/@jridgewell/set-array/LICENSE
-Copyright: Copyright 2022 Justin Ridgewell <**********@******.***>
-Source: https://github.com/jridgewell/set-array
-Link: https://github.com/jridgewell/set-array
------------
 @jridgewell/sourcemap-codec
 License: MIT
 License File: node_modules/@jridgewell/sourcemap-codec/LICENSE
-Copyright: Copyright (c) 2015 Rich Harris
-Source: git+https://github.com/jridgewell/sourcemap-codec.git
-Link: git+https://github.com/jridgewell/sourcemap-codec.git
+Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
+Source: git+https://github.com/jridgewell/sourcemaps.git
+Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/sourcemap-codec
 -----------
 @jridgewell/trace-mapping
 License: MIT
 License File: node_modules/@jridgewell/trace-mapping/LICENSE
-Copyright: Copyright 2022 Justin Ridgewell <******@*********.****>
-Source: git+https://github.com/jridgewell/trace-mapping.git
-Link: git+https://github.com/jridgewell/trace-mapping.git
+Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
+Source: git+https://github.com/jridgewell/sourcemaps.git
+Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/trace-mapping
 -----------
 @lezer/common
 License: MIT
@@ -3813,6 +3827,27 @@ License: MIT
 Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 -----------
+@types/linkify-it
+License: MIT
+License File: node_modules/@types/linkify-it/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/linkify-it
+-----------
+@types/markdown-it
+License: MIT
+License File: node_modules/@types/markdown-it/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/markdown-it
+-----------
+@types/mdurl
+License: MIT
+License File: node_modules/@types/mdurl/LICENSE
+Copyright: Copyright (c) Microsoft Corporation.
+Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mdurl
+-----------
 @types/node
 License: MIT
 License File: node_modules/@types/node/LICENSE
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index 30b74ece051..cd4c1d490dd 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -543,13 +543,6 @@ Copyright: Copyright (c) 2024 Nathan Herald, Rohland de Charmoy, Dan Brown
 Source: https://codeberg.org/danb/HtmlDiff
 Link: https://codeberg.org/danb/HtmlDiff
 -----------
-ssddanbrown/symfony-mailer
-License: MIT
-License File: vendor/ssddanbrown/symfony-mailer/LICENSE
-Copyright: Copyright (c) 2019-present Fabien Potencier
-Source: https://github.com/ssddanbrown/symfony-mailer.git
-Link: https://symfony.com
------------
 symfony/clock
 License: MIT
 License File: vendor/symfony/clock/LICENSE
@@ -620,6 +613,13 @@ Copyright: Copyright (c) 2004-present Fabien Potencier
 Source: https://github.com/symfony/http-kernel.git
 Link: https://symfony.com
 -----------
+symfony/mailer
+License: MIT
+License File: vendor/symfony/mailer/LICENSE
+Copyright: Copyright (c) 2019-present Fabien Potencier
+Source: https://github.com/symfony/mailer.git
+Link: https://symfony.com
+-----------
 symfony/mime
 License: MIT
 License File: vendor/symfony/mime/LICENSE

From 776ec7b9e7a2bc460e119a041709cdd4cee14214 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Wed, 30 Jul 2025 09:36:34 +0100
Subject: [PATCH 621/666] Updated translations with latest Crowdin changes
 (#5696)

---
 lang/ar/common.php            |   4 +-
 lang/ar/editor.php            |   1 +
 lang/ar/entities.php          |   3 +-
 lang/bg/editor.php            |   1 +
 lang/bg/entities.php          |   1 +
 lang/bn/editor.php            |   1 +
 lang/bn/entities.php          |   1 +
 lang/bs/editor.php            |   1 +
 lang/bs/entities.php          |   1 +
 lang/ca/editor.php            |   1 +
 lang/ca/entities.php          |   1 +
 lang/cs/editor.php            |   1 +
 lang/cs/entities.php          |   3 +-
 lang/cy/editor.php            |   1 +
 lang/cy/entities.php          |   1 +
 lang/da/editor.php            |   1 +
 lang/da/entities.php          |   1 +
 lang/de/editor.php            |   1 +
 lang/de/entities.php          |   1 +
 lang/de_informal/editor.php   |   1 +
 lang/de_informal/entities.php |   1 +
 lang/el/editor.php            |   1 +
 lang/el/entities.php          |   1 +
 lang/es/editor.php            |   1 +
 lang/es/entities.php          |   1 +
 lang/es_AR/editor.php         |   1 +
 lang/es_AR/entities.php       |   1 +
 lang/et/editor.php            |   1 +
 lang/et/entities.php          |   1 +
 lang/eu/editor.php            |   1 +
 lang/eu/entities.php          |   1 +
 lang/fa/activities.php        |  26 ++++-----
 lang/fa/auth.php              |   2 +-
 lang/fa/common.php            |   6 +-
 lang/fa/components.php        |   4 +-
 lang/fa/editor.php            |  15 ++---
 lang/fa/entities.php          |  92 ++++++++++++++++---------------
 lang/fa/errors.php            |  28 +++++-----
 lang/fa/notifications.php     |   2 +-
 lang/fa/settings.php          |  60 ++++++++++----------
 lang/fa/validation.php        |   8 +--
 lang/fi/editor.php            |   1 +
 lang/fi/entities.php          |   1 +
 lang/fr/editor.php            |   1 +
 lang/fr/entities.php          |   1 +
 lang/he/editor.php            |   1 +
 lang/he/entities.php          |   1 +
 lang/hr/editor.php            |   1 +
 lang/hr/entities.php          |   1 +
 lang/hu/editor.php            |   1 +
 lang/hu/entities.php          |   1 +
 lang/id/activities.php        |  44 +++++++--------
 lang/id/auth.php              |  46 ++++++++--------
 lang/id/common.php            |  38 ++++++-------
 lang/id/components.php        |  26 ++++-----
 lang/id/editor.php            | 101 +++++++++++++++++-----------------
 lang/id/entities.php          |   1 +
 lang/id/errors.php            |  52 ++++++++---------
 lang/id/notifications.php     |  34 ++++++------
 lang/is/editor.php            |   1 +
 lang/is/entities.php          |   1 +
 lang/it/editor.php            |   1 +
 lang/it/entities.php          |   1 +
 lang/ja/editor.php            |   1 +
 lang/ja/entities.php          |   1 +
 lang/ka/editor.php            |   1 +
 lang/ka/entities.php          |   1 +
 lang/ko/editor.php            |   1 +
 lang/ko/entities.php          |   1 +
 lang/ku/editor.php            |   1 +
 lang/ku/entities.php          |   1 +
 lang/lt/editor.php            |   1 +
 lang/lt/entities.php          |   1 +
 lang/lv/editor.php            |   1 +
 lang/lv/entities.php          |   1 +
 lang/nb/editor.php            |   1 +
 lang/nb/entities.php          |   1 +
 lang/ne/editor.php            |   1 +
 lang/ne/entities.php          |   1 +
 lang/nl/editor.php            |   1 +
 lang/nl/entities.php          |   1 +
 lang/nn/editor.php            |   1 +
 lang/nn/entities.php          |   1 +
 lang/pl/editor.php            |   1 +
 lang/pl/entities.php          |   1 +
 lang/pt/editor.php            |   1 +
 lang/pt/entities.php          |   1 +
 lang/pt_BR/editor.php         |   1 +
 lang/pt_BR/entities.php       |   1 +
 lang/ro/editor.php            |   1 +
 lang/ro/entities.php          |   1 +
 lang/ru/activities.php        |   2 +-
 lang/ru/editor.php            |   1 +
 lang/ru/entities.php          |   1 +
 lang/sk/editor.php            |   1 +
 lang/sk/entities.php          |   1 +
 lang/sl/editor.php            |   1 +
 lang/sl/entities.php          |   1 +
 lang/sq/activities.php        |  30 +++++-----
 lang/sq/auth.php              |  46 ++++++++--------
 lang/sq/editor.php            |   1 +
 lang/sq/entities.php          |   1 +
 lang/sr/editor.php            |   1 +
 lang/sr/entities.php          |   1 +
 lang/sv/editor.php            |   1 +
 lang/sv/entities.php          |   1 +
 lang/tk/editor.php            |   1 +
 lang/tk/entities.php          |   1 +
 lang/tr/editor.php            |   1 +
 lang/tr/entities.php          |   1 +
 lang/uk/editor.php            |   1 +
 lang/uk/entities.php          |   1 +
 lang/uz/editor.php            |   1 +
 lang/uz/entities.php          |   1 +
 lang/vi/editor.php            |   1 +
 lang/vi/entities.php          |   1 +
 lang/zh_CN/common.php         |   4 +-
 lang/zh_CN/editor.php         |   1 +
 lang/zh_CN/entities.php       |  19 ++++---
 lang/zh_TW/common.php         |   2 +-
 lang/zh_TW/editor.php         |   1 +
 lang/zh_TW/entities.php       |   1 +
 122 files changed, 449 insertions(+), 344 deletions(-)

diff --git a/lang/ar/common.php b/lang/ar/common.php
index a8fb18e865c..44d057d7eb1 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -30,8 +30,8 @@
     'create' => 'إنشاء',
     'update' => 'تحديث',
     'edit' => 'تعديل',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'أرشف',
+    'unarchive' => 'إلغاء الأرشفة',
     'sort' => 'سرد',
     'move' => 'نقل',
     'copy' => 'نسخ',
diff --git a/lang/ar/editor.php b/lang/ar/editor.php
index c656ba5a007..b3a8fd3c7be 100644
--- a/lang/ar/editor.php
+++ b/lang/ar/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'نص مرتفع',
     'subscript' => 'نص منخفض',
     'text_color' => 'لون النص',
+    'highlight_color' => 'لون التمييز',
     'custom_color' => 'لون مخصص',
     'remove_color' => 'إزالة اللون',
     'background_color' => 'لون الخلفية',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index c07fba5422f..54c3f7447e7 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '(محتوى مستقر)',
     'pages_edit_switch_to_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه -WYSIWYG-',
     'pages_edit_switch_to_new_wysiwyg' => 'التبديل إلى محرر ما تراه هو ما تحصل عليه الجديد -new WYSIWYG-',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(في الاختبار التجريبي)',
     'pages_edit_set_changelog' => 'تثبيت سجل التعديل',
     'pages_edit_enter_changelog_desc' => 'ضع وصف مختصر للتعديلات التي تمت',
     'pages_edit_enter_changelog' => 'أدخل سجل التعديل',
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'إدخال رسمة',
     'pages_md_show_preview' => 'عرض المعاينة',
     'pages_md_sync_scroll' => 'مزامنة معاينة التمرير',
+    'pages_md_plain_editor' => 'محرر النصوص العادي',
     'pages_drawing_unsaved' => 'تم العثور على رسم غير محفوظ',
     'pages_drawing_unsaved_confirm' => 'تم العثور على بيانات رسم غير محفوظة من محاولة حفظ رسم سابقة فاشلة. هل ترغب في استعادة هذا الرسم غير المحفوظ ومواصلة تحريره؟',
     'pages_not_in_chapter' => 'صفحة ليست في فصل',
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index e01206e4ae9..a75128953eb 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Горен индекс',
     'subscript' => 'Долен индекс',
     'text_color' => 'Цвят на текста',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Цвят по избор',
     'remove_color' => 'Премахване на цвят',
     'background_color' => 'Фонов цвят',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index 050b7e319c4..973a305ea8e 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Вмъкни рисунка',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Страницата не принадлежи в никоя глава',
diff --git a/lang/bn/editor.php b/lang/bn/editor.php
index 50b4ce4d83d..d8476eeaed2 100644
--- a/lang/bn/editor.php
+++ b/lang/bn/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/bn/entities.php
+++ b/lang/bn/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/bs/editor.php b/lang/bs/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/bs/editor.php
+++ b/lang/bs/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index 1f77db56855..28b5c548377 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index 331e596315f..5115a1c1512 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superíndex',
     'subscript' => 'Subíndex',
     'text_color' => 'Color del text',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Color personalitzat',
     'remove_color' => 'Elimina el color',
     'background_color' => 'Color de fons',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index af62a4c0b27..1b01cea3909 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insereix un dibuix',
     'pages_md_show_preview' => 'Mostra la visualització prèvia',
     'pages_md_sync_scroll' => 'Sincronitza el desplaçament de la visualització prèvia',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'S’ha trobat un dibuix sense desar',
     'pages_drawing_unsaved_confirm' => 'S’han trobat dades d’un dibuix d’un intent anterior de desar un dibuix. Voleu restaurar aquest dibuix no desat per a reprendre’n l’edició?',
     'pages_not_in_chapter' => 'La pàgina no és un capítol',
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index 15daa778c06..d67283b72b2 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'horní index',
     'subscript' => 'Dolní index',
     'text_color' => 'Barva textu:',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Vlastní barva',
     'remove_color' => 'Odstranit barvu',
     'background_color' => 'Barva pozadí',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 2f7f09ebc9b..687f1503e42 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Vložit kresbu',
     'pages_md_show_preview' => 'Zobrazit náhled',
     'pages_md_sync_scroll' => 'Synchronizovat náhled',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Nalezen neuložený výkres',
     'pages_drawing_unsaved_confirm' => 'Byly nalezeny neuložené kresby z předchozí neúspěšné pokusu o uložení kresby. Chcete je obnovit a pokračovat v úpravě této neuložené kresby?',
     'pages_not_in_chapter' => 'Stránka není v kapitole',
@@ -395,7 +396,7 @@
     'comment_none' => 'Žádné komentáře k zobrazení',
     'comment_placeholder' => 'Zde zadejte komentář',
     'comment_thread_count' => '{0}:count vláken komentářů|{1}:count vlákno komentářů|[2,4]:count vlákna komentářů|[5,*]:count vláken komentářů',
-    'comment_archived_count' => ':count archivováno',
+    'comment_archived_count' => '[0,1]:count archivováno|[2,4]:count archivována|[5,*]:count archivováno',
     'comment_archived_threads' => 'Archivovaná vlákna',
     'comment_save' => 'Uložit komentář',
     'comment_new' => 'Nový komentář',
diff --git a/lang/cy/editor.php b/lang/cy/editor.php
index 93e1aed2019..980099ffd7a 100644
--- a/lang/cy/editor.php
+++ b/lang/cy/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Uwchysgrif',
     'subscript' => 'Isysgrif',
     'text_color' => 'Lliw testun',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Lliw addasu',
     'remove_color' => 'Dileu lliw',
     'background_color' => 'Lliw cefnder',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index 7ddc29e7be7..3a5473ecb05 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Mewnosod Llun',
     'pages_md_show_preview' => 'Dangos rhagolwg',
     'pages_md_sync_scroll' => 'Cydamseru sgrôl ragolwg',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Canfuwyd Llun heb ei Gadw',
     'pages_drawing_unsaved_confirm' => 'Canfuwyd data llun heb ei gadw o ymgais aflwyddiannus blaenorol i gadw llun. Hoffech chi adfer a pharhau i olygu\'r llun heb ei gadw?',
     'pages_not_in_chapter' => 'Nid yw\'r dudalen mewn pennod',
diff --git a/lang/da/editor.php b/lang/da/editor.php
index 2f9b9f93662..4c8aa0f7212 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Hævet',
     'subscript' => 'Sænket',
     'text_color' => 'Tekstfarve',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Tilpasset farve',
     'remove_color' => 'Fjern farve',
     'background_color' => 'Baggrundsfarve',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index 1ef9ee4d525..a90f6e605e4 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Indsæt tegning',
     'pages_md_show_preview' => 'Vis forhåndsvisning',
     'pages_md_sync_scroll' => 'Rulning af forhåndsvisning af synkronisering',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Ikke gemt tegning fundet',
     'pages_drawing_unsaved_confirm' => 'Der blev fundet ikke-gemte tegningsdata fra et tidligere mislykket forsøg på at gemme en tegning. Vil du gendanne og fortsætte med at redigere denne ikke-gemte tegning?',
     'pages_not_in_chapter' => 'Side er ikke i et kapitel',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index 41ec74e52e1..c824466ff4f 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Hochgestellt',
     'subscript' => 'Tiefgestellt',
     'text_color' => 'Schriftfarbe',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Benutzerdefinierte Farbe',
     'remove_color' => 'Farbe entfernen',
     'background_color' => 'Hintergrundfarbe',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 144a93636a6..e4e1bdafd52 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Zeichnung einfügen',
     'pages_md_show_preview' => 'Vorschau anzeigen',
     'pages_md_sync_scroll' => 'Vorschau synchronisieren',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Ungespeicherte Zeichnung gefunden',
     'pages_drawing_unsaved_confirm' => 'Es wurden ungespeicherte Zeichnungsdaten von einem früheren, fehlgeschlagenen Versuch, die Zeichnung zu speichern, gefunden. Möchten Sie diese ungespeicherte Zeichnung wiederherstellen und weiter bearbeiten?',
     'pages_not_in_chapter' => 'Seite ist in keinem Kapitel',
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 3d6e24a230a..7f232659b4a 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Hochgestellt',
     'subscript' => 'Tiefgestellt',
     'text_color' => 'Textfarbe',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Benutzerdefinierte Farbe',
     'remove_color' => 'Farbe entfernen',
     'background_color' => 'Hintergrundfarbe',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index d78addf2a42..38f4eeb56e5 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Zeichnung einfügen',
     'pages_md_show_preview' => 'Vorschau anzeigen',
     'pages_md_sync_scroll' => 'Vorschau synchronisieren',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Ungespeicherte Zeichnung gefunden',
     'pages_drawing_unsaved_confirm' => 'Es wurden ungespeicherte Zeichnungsdaten von einem früheren, fehlgeschlagenen Versuch, die Zeichnung zu speichern, gefunden. Möchtest du diese ungespeicherte Zeichnung wiederherstellen und weiter bearbeiten?',
     'pages_not_in_chapter' => 'Seite ist in keinem Kapitel',
diff --git a/lang/el/editor.php b/lang/el/editor.php
index 701b384bd51..9952e7fdff4 100644
--- a/lang/el/editor.php
+++ b/lang/el/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Εκθέτης',
     'subscript' => 'Δείκτης',
     'text_color' => 'Χρώμα κειμένου',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Προσαρμογή χρώματος',
     'remove_color' => 'Αφαίρεση χρώματος',
     'background_color' => 'Χρώμα φόντου',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index 3220933cded..b9ccd6464bd 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Εισαγωγή Σχεδίου',
     'pages_md_show_preview' => 'Εμφάνιση προεπισκόπησης',
     'pages_md_sync_scroll' => 'Συγχρονισμός προεπισκόπησης',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Η σελίδα δεν είναι σε κεφάλαιο',
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 15f1dd9b7c4..78920720d22 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superíndice',
     'subscript' => 'Subíndice',
     'text_color' => 'Color de texto',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Color personalizado',
     'remove_color' => 'Eliminar color',
     'background_color' => 'Color de fondo',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 303730f039a..9263f06e14d 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insertar Dibujo',
     'pages_md_show_preview' => 'Mostrar vista previa',
     'pages_md_sync_scroll' => 'Sincronizar desplazamiento de vista previa',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Encontrado dibujo sin guardar',
     'pages_drawing_unsaved_confirm' => 'Se encontraron datos no guardados del dibujo de un intento de guardado fallido. ¿Desea restaurar y continuar editando el dibujo no guardado?',
     'pages_not_in_chapter' => 'La página no está en un capítulo',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 7f4f7a0b88e..73d8e6f0815 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superíndice',
     'subscript' => 'Subíndice',
     'text_color' => 'Color del texto',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Color personalizado',
     'remove_color' => 'Eliminar color',
     'background_color' => 'Color de fondo',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index 729d190278a..f0b13ed1a71 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insertar Dibujo',
     'pages_md_show_preview' => 'Mostrar vista previa',
     'pages_md_sync_scroll' => 'Sincronizar desplazamiento de vista previa',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Encontrado dibujo sin guardar',
     'pages_drawing_unsaved_confirm' => 'Se encontraron datos del dibujo no guardados durante un intento de guardado fallido anterior. ¿Desea restaurar y continuar editando el dibujo no guardado?',
     'pages_not_in_chapter' => 'La página no esá en el capítulo',
diff --git a/lang/et/editor.php b/lang/et/editor.php
index e67e9b0f522..3728658669e 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Ülaindeks',
     'subscript' => 'Alaindeks',
     'text_color' => 'Teksti värv',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Kohandatud värv',
     'remove_color' => 'Eemalda värv',
     'background_color' => 'Taustavärv',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index cc34d0a77b6..3193001da58 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Lisa joonis',
     'pages_md_show_preview' => 'Näita eelvaadet',
     'pages_md_sync_scroll' => 'Sünkrooni eelvaate kerimine',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Leiti salvestamata joonis',
     'pages_drawing_unsaved_confirm' => 'Varasemast ebaõnnestunud salvestuskatsest leiti salvestamata joonis. Kas soovid salvestamata joonise taastada ja selle muutmist jätkata?',
     'pages_not_in_chapter' => 'Leht ei kuulu peatüki alla',
diff --git a/lang/eu/editor.php b/lang/eu/editor.php
index f6974e0561e..3ec398cb7d5 100644
--- a/lang/eu/editor.php
+++ b/lang/eu/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Gain-eskripta',
     'subscript' => 'Azpi-script',
     'text_color' => 'Testuaren kolorea',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Kolore pertsonalizatua',
     'remove_color' => 'Kolorea ezabatu',
     'background_color' => 'Atzeko planoaren kolorea',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index f42ce1d027a..6d7bcbf81f1 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Txertatu marrazki berria',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index cd7e52ed24d..07eb78f3709 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -6,7 +6,7 @@
 return [
 
     // Pages
-    'page_create'                 => 'تاریخ ایجاد',
+    'page_create'                 => 'صفحه ایجاد شد',
     'page_create_notification'    => 'صفحه با موفقیت ایجاد شد',
     'page_update'                 => 'به روزرسانی صفحه',
     'page_update_notification'    => 'صفحه با موفقیت به روزرسانی شد',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'وب هوک با موفقیت حذف شد',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'ورودی ایجاد شد',
+    'import_create_notification' => 'فایل با موفقیت آپلود شد',
+    'import_run' => 'آیتم واردشده بروزرسانی شد',
+    'import_run_notification' => 'محتوا با موفقیت انتقال یافت',
+    'import_delete' => 'آیتم ورودی حدف شده',
+    'import_delete_notification' => 'آیتم واردشده با موفقیت حذف شد',
 
     // Users
     'user_create' => 'کاربر ایجاد شده',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'نظر حذف شده',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'قانون مرتب‌سازی ایجاد شد',
+    'sort_rule_create_notification' => 'قانون مرتب‌سازی با موفقیت ایجاد شد',
+    'sort_rule_update' => 'قانون مرتب‌سازی به‌روزرسانی شد',
+    'sort_rule_update_notification' => 'قانون مرتب‌سازی با موفقیت به‌روزرسانی شد',
+    'sort_rule_delete' => 'قانون مرتب‌سازی حذف شد',
+    'sort_rule_delete_notification' => 'قانون مرتب‌سازی با موفقیت حذف شد',
 
     // Other
     'permissions_update'          => 'به روزرسانی مجوزها',
diff --git a/lang/fa/auth.php b/lang/fa/auth.php
index c0902d4f984..c92f5f22b8a 100644
--- a/lang/fa/auth.php
+++ b/lang/fa/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'برنامه ی موبایل',
     'mfa_option_totp_desc' => 'برای استفاده از احراز هویت چند عاملی به یک برنامه موبایلی نیاز دارید که از TOTP پشتیبانی کند، مانند Google Authenticator، Authy یا Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'کدهای پشتیبان',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'این فرایند مجموعه‌ای از کدهای پشتیبان یک‌بار مصرف تولید می‌کند که هنگام ورود به سامانه جهت تأیید هویت باید از آن‌ها استفاده کنید. توصیه می‌شود این کدها را در محلّی امن و محفوظ نگهداری نمایید.',
     'mfa_gen_confirm_and_enable' => 'تایید و فعال کنید',
     'mfa_gen_backup_codes_title' => 'راه اندازی کدهای پشتیبان',
     'mfa_gen_backup_codes_desc' => 'لیست کدهای زیر را در مکانی امن ذخیره کنید. هنگام دسترسی به سیستم، می توانید از یکی از کدها به عنوان مکانیزم احراز هویت دوم استفاده کنید.',
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 9672ce2c1ae..49667a47c42 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -30,8 +30,8 @@
     'create' => 'ایجاد',
     'update' => 'به‌روز رسانی',
     'edit' => 'ويرايش',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'انتقال به بایگانی',
+    'unarchive' => 'فعّال‌سازی دوباره (خروج از بایگانی)',
     'sort' => 'مرتب سازی',
     'move' => 'جابجایی',
     'copy' => 'کپی',
@@ -111,5 +111,5 @@
     'terms_of_service' => 'شرایط خدمات',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'جست‌وجو در :appName',
 ];
diff --git a/lang/fa/components.php b/lang/fa/components.php
index 576a50ccac2..18a01dc5d52 100644
--- a/lang/fa/components.php
+++ b/lang/fa/components.php
@@ -34,8 +34,8 @@
     'image_delete_success' => 'تصویر با موفقیت حذف شد',
     'image_replace' => 'جایگزینی تصویر',
     'image_replace_success' => 'تصویر با موفقیت به روز شد',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_rebuild_thumbs' => 'بازتولید اندازه‌های گوناگونی از تصویر',
+    'image_rebuild_thumbs_success' => 'اندازه‌های گوناگونی از تصویر با موفقیت بازتولید شدند.',
 
     // Code Editor
     'code_editor' => 'ویرایش کد',
diff --git a/lang/fa/editor.php b/lang/fa/editor.php
index fa95bb10b99..a8b3d211a94 100644
--- a/lang/fa/editor.php
+++ b/lang/fa/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'لغو',
     'save' => 'ذخیره',
     'close' => 'بستن',
-    'apply' => 'Apply',
+    'apply' => 'اعمال',
     'undo' => 'برگشت',
     'redo' => 'از نو',
     'left' => 'چپ',
@@ -48,6 +48,7 @@
     'superscript' => 'بالانویسی',
     'subscript' => 'پایین نویسی',
     'text_color' => 'رنگ متن',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'رنگ دلخواه',
     'remove_color' => 'حذف رنگ',
     'background_color' => 'رنگ زمینه',
@@ -82,9 +83,9 @@
     'table_properties' => 'تنظیمات جدول',
     'table_properties_title' => 'تنظیمات جدول',
     'delete_table' => 'حذف جدول',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'حذف قالب‌بندی جدول',
+    'resize_to_contents' => 'تغییر اندازه بر اساس محتوا',
+    'row_header' => 'عنوان سطر',
     'insert_row_before' => 'افزودن سطر به قبل',
     'insert_row_after' => 'افزودن سطر به بعد',
     'delete_row' => 'حذف سطر',
@@ -148,7 +149,7 @@
     'url' => 'آدرس',
     'text_to_display' => 'متن جهت نمایش',
     'title' => 'عنوان',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'مرور پیوندها',
     'open_link' => 'بازکردن لینک',
     'open_link_in' => 'باز کردن لینک در ...',
     'open_link_current' => 'پنجره کنونی',
@@ -165,8 +166,8 @@
     'about' => 'درباره ویرایشگر',
     'about_title' => 'درباره ویرایشگر WYSIWYG',
     'editor_license' => 'مجوز و حق کپی رایت ویرایشگر',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'این ویرایشگر بر پایه‌ی نسخه‌ای مشتق‌شده از «:lexicalLink» ساخته شده است که تحت مجوز MIT منتشر می‌شود.',
+    'editor_lexical_license_link' => 'جزئیات کامل مجوز را می‌توانید این‌جا مشاهده کنید.',
     'editor_tiny_license' => 'این ویرایشگر توسط :tinyLink و تحت مجوز MIT ساخته شده است.',
     'editor_tiny_license_link' => 'جزئیات کپی رایت و مجوز TinyMCE را می توانید در اینجا پیدا کنید.',
     'save_continue' => 'ذخیره صفحه و ادامه',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index c9924a478e2..01db74a92dc 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'فایل PDF',
     'export_text' => 'پرونده متنی ساده',
     'export_md' => 'راهنما مارک‌دون',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'export_zip' => 'فایل فشرده‌ی قابل‌حمل (ZIP)',
+    'default_template' => 'قالب پیش‌فرض صفحه',
+    'default_template_explain' => 'قالبی برای صفحه تعیین کنید که به‌عنوان محتوای پیش‌فرض در تمام صفحاتی که در این مورد ایجاد می‌شوند، به‌کار رود. توجه داشته باشید این قالب تنها در صورتی اعمال می‌شود که سازندهٔ صفحه به صفحهٔ قالب انتخاب‌شده دسترسی نمایشی داشته باشد.',
+    'default_template_select' => 'انتخاب صفحهٔ قالب',
+    'import' => 'وارد کردن',
+    'import_validate' => 'اعتبارسنجی آیتم‌های واردشده',
+    'import_desc' => 'می‌توانید کتاب‌ها، فصل‌ها و صفحات را با استفاده از یک فایل فشرده (ZIP) که از همین سامانه یا نمونه‌ای دیگر استخراج شده، وارد کنید. برای ادامه، یک فایل ZIP انتخاب نمایید. پس از بارگذاری و اعتبارسنجی فایل، در مرحله بعد می‌توانید تنظیمات انتقال را انجام داده و انتقال را تأیید کنید.',
+    'import_zip_select' => 'انتخاب فایل ZIP برای بارگذاری',
+    'import_zip_validation_errors' => 'هنگام اعتبارسنجی فایل ZIP ارائه‌شده، خطاهایی شناسایی شد:',
+    'import_pending' => 'ورودی‌های در انتظار انتقال',
+    'import_pending_none' => 'هیچ انتقال ورودی آغاز نشده است.',
+    'import_continue' => 'ادامه فرآیند انتقال ورودی',
+    'import_continue_desc' => 'محتوای فایل ZIP بارگذاری‌شده را که قرار است وارد سامانه شود، مرور کنید. پس از اطمینان از صحت آن، انتقال را آغاز نمایید تا محتوا به این سامانه افزوده شود. توجه داشته باشید که پس از انتقال موفق، فایل ZIP بارگذاری‌شده به‌صورت خودکار حذف خواهد شد.',
+    'import_details' => 'جزئیات انتقال ورودی',
+    'import_run' => 'شروع فرایند انتقال ورودی',
+    'import_size' => 'حجم فایل ZIP واردشده: :size',
+    'import_uploaded_at' => 'زمان بارگذاری: :relativeTime',
+    'import_uploaded_by' => 'بارگذاری شده توسط:',
+    'import_location' => 'مکان انتقال',
+    'import_location_desc' => 'برای محتوای واردشده، مقصدی انتخاب کنید. برای ایجاد محتوا در آن مقصد، داشتن مجوزهای لازم ضروری است.',
+    'import_delete_confirm' => 'مطمئن هستید که می‌خواهید آیتم واردشده را حدف کنید؟',
+    'import_delete_desc' => 'با انجام این کار، فایل ZIP واردشده حذف می‌شود و این عمل بازگشت‌ناپذیر است.',
+    'import_errors' => 'خطای انتقال ورودی',
+    'import_errors_desc' => 'در جریان تلاش برای انتقال ورودی، خطاهای زیر رخ داد:',
 
     // Permissions and restrictions
     'permissions' => 'مجوزها',
@@ -166,9 +166,9 @@
     'books_search_this' => 'این کتاب را جستجو کنید',
     'books_navigation' => 'ناوبری کتاب',
     'books_sort' => 'مرتب سازی مطالب کتاب',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'برای سامان‌دهی محتوای یک کتاب، می‌توانید فصل‌ها و صفحات آن را جابه‌جا کنید. همچنین می‌توانید کتاب‌های دیگری بیفزایید تا جابه‌جایی فصل‌ها و صفحات میان کتاب‌ها آسان شود. در صورت تمایل، می‌توانید قاعده‌ای برای مرتب‌سازی خودکار تعیین کنید تا محتوای کتاب در صورت ایجاد تغییرات، به طور خودکار مرتب شود.',
+    'books_sort_auto_sort' => 'گزینه مرتب‌سازی خودکار',
+    'books_sort_auto_sort_active' => 'مرتب‌سازی خودکار با قاعده: :sortName فعال است',
     'books_sort_named' => 'مرتب‌سازی کتاب:bookName',
     'books_sort_name' => 'مرتب سازی بر اساس نام',
     'books_sort_created' => 'مرتب سازی بر اساس تاریخ ایجاد',
@@ -230,7 +230,9 @@
     'pages_delete_draft' => 'حذف صفحه پیش نویس',
     'pages_delete_success' => 'صفحه حذف شد',
     'pages_delete_draft_success' => 'صفحه پیش نویس حذف شد',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'این صفحه هم‌اکنون به‌عنوان قالب پیش‌فرض صفحه برای یک کتاب یا فصل در حال استفاده است. پس از حذف این صفحه، کتاب‌ها یا فصل‌های مربوطه دیگر قالب پیش‌فرض صفحه نخواهند داشت.
+
+',
     'pages_delete_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه را حذف کنید؟',
     'pages_delete_draft_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه پیش نویس را حذف کنید؟',
     'pages_editing_named' => 'ویرایش صفحه :pageName',
@@ -247,8 +249,9 @@
     'pages_edit_switch_to_markdown_clean' => '(مطالب تمیز)',
     'pages_edit_switch_to_markdown_stable' => '(محتوای پایدار)',
     'pages_edit_switch_to_wysiwyg' => 'به ویرایشگر WYSIWYG بروید',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'تغییر به ویرایشگر جدید WYSIWYG
+(ویرایشگر WYSIWYG: «آنچه می‌بینید همان است که به‌دست می‌آورید»)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(در مرحله آزمایش بتا)',
     'pages_edit_set_changelog' => 'تنظیم تغییرات',
     'pages_edit_enter_changelog_desc' => 'توضیح مختصری از تغییراتی که ایجاد کرده اید وارد کنید',
     'pages_edit_enter_changelog' => 'وارد کردن تغییرات',
@@ -268,6 +271,7 @@
     'pages_md_insert_drawing' => 'درج طرح',
     'pages_md_show_preview' => 'دیدن پیش نمایش',
     'pages_md_sync_scroll' => 'هماهنگ سازی اسکرول پیش نمایش',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'نقاشی ذخیره نشده پیدا شد',
     'pages_drawing_unsaved_confirm' => 'نسخه‌ای ذخیره‌نشده از طراحی‌های قبلی پیدا شد. آیا می‌خواهید این طراحی ذخیره‌نشده را بازیابی کنید و به ویرایش آن ادامه دهید؟',
     'pages_not_in_chapter' => 'صفحه در یک فصل نیست',
@@ -301,9 +305,9 @@
     'pages_pointer_enter_mode' => 'ورود به حالت انتخاب قسمت',
     'pages_pointer_label' => 'گزینه‌های قسمت صفحه',
     'pages_pointer_permalink' => 'لینک ثابت قسمت صفحه',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_pointer_include_tag' => 'افزودن برچسب برای این بخش از صفحه',
+    'pages_pointer_toggle_link' => 'حالت پیوند دائمی؛ برای مشاهده برچسب افزوده شده، کلیک کنید',
+    'pages_pointer_toggle_include' => 'حالت افزودن برچسب؛ برای نمایش پیوند دائمی کلیک کنید',
     'pages_permissions_active' => 'مجوزهای صفحه فعال است',
     'pages_initial_revision' => 'انتشار اولیه',
     'pages_references_update_revision' => 'به‌روز‌رسانی خودکار لینک‌های داخلی سیستم',
@@ -324,7 +328,7 @@
     'pages_is_template' => 'الگوی صفحه',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
+    'toggle_sidebar' => 'نمایش/پنهان‌سازی نوار کناری',
     'page_tags' => 'برچسب‌های صفحه',
     'chapter_tags' => 'برچسب‌های فصل',
     'book_tags' => 'برچسب های کتاب',
@@ -392,11 +396,11 @@
     'comment' => 'اظهار نظر',
     'comments' => 'نظرات',
     'comment_add' => 'افزودن توضیح',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'نظری برای نمایش وجود ندارد',
     'comment_placeholder' => 'اینجا نظر بدهید',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count رشته گفت‌وگو',
+    'comment_archived_count' => ':count مورد بایگانی‌شده',
+    'comment_archived_threads' => 'رشته‌ گفت‌وگوهای بایگانی‌شده',
     'comment_save' => 'ذخیره نظر',
     'comment_new' => 'نظر جدید',
     'comment_created' => ':createDiff نظر داد',
@@ -405,14 +409,14 @@
     'comment_deleted_success' => 'نظر حذف شد',
     'comment_created_success' => 'نظر اضافه شد',
     'comment_updated_success' => 'نظر به روز شد',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'نظر بایگانی شد',
+    'comment_unarchive_success' => 'نظر از بایگانی خارج شد',
+    'comment_view' => 'دیدن نظر',
+    'comment_jump_to_thread' => 'رفتن به رشته گفت‌وگو',
     'comment_delete_confirm' => 'آیا مطمئن هستید که می خواهید این نظر را حذف کنید؟',
     'comment_in_reply_to' => 'در پاسخ به :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'مرجع',
+    'comment_reference_outdated' => '(نسخه قدیمی)',
     'comment_editor_explain' => 'در اینجا نظراتی که در این صفحه گذاشته شده است، مشاهده می‌شود. نظرات را می‌توان در هنگام مشاهده صفحه ذخیره شده، اضافه و مدیریت کرد.',
 
     // Revision
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index c4bc6963ae6..9d5257fcf79 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -18,10 +18,10 @@
     'ldap_fail_anonymous' => 'دسترسی LDAP با استفاده از صحافی ناشناس انجام نشد',
     'ldap_fail_authed' => 'دسترسی به LDAP با استفاده از جزئیات داده شده و رمز عبور انجام نشد',
     'ldap_extension_not_installed' => 'افزونه PHP LDAP نصب نشده است',
-    'ldap_cannot_connect' => 'اتصال به سرور LDAP امکان پذیر نیست، اتصال اولیه برقرار نشد',
+    'ldap_cannot_connect' => 'اتصال به سرور LDAP امکان‌پذیر نیست، اتصال اولیه برقرار نشد',
     'saml_already_logged_in' => 'قبلا وارد سیستم شده اید',
     'saml_no_email_address' => 'آدرس داده ای برای این کاربر در داده های ارائه شده توسط سیستم احراز هویت خارجی یافت نشد',
-    'saml_invalid_response_id' => 'درخواست از سیستم احراز هویت خارجی توسط فرایندی که توسط این نرم افزار آغاز شده است شناخته نمی شود. بازگشت به سیستم پس از ورود به سیستم می تواند باعث این مسئله شود.',
+    'saml_invalid_response_id' => 'درخواست ارسال‌شده از سامانه احراز هویت خارجی، توسط فرآیند آغازشده از سوی این نرم‌افزار شناسایی نشد. ممکن است بازگشت به صفحه قبل پس از ورود، موجب ایجاد این مشکل شده باشد.',
     'saml_fail_authed' => 'ورود به سیستم :system انجام نشد، سیستم مجوز موفقیت آمیز ارائه نکرد',
     'oidc_already_logged_in' => 'قبلا وارد شده اید',
     'oidc_no_email_address' => 'آدرس ایمیلی برای این کاربر در داده های ارائه شده توسط سیستم احراز هویت خارجی یافت نشد',
@@ -43,7 +43,7 @@
     'path_not_writable' => 'مسیر فایل :filePath را نمی توان در آن آپلود کرد. مطمئن شوید که روی سرور قابل نوشتن است.',
     'cannot_get_image_from_url' => 'نمی توان تصویر را از :url دریافت کرد',
     'cannot_create_thumbs' => 'سرور نمی تواند تصاویر کوچک ایجاد کند. لطفاً بررسی کنید که پسوند GD PHP را نصب کرده اید.',
-    'server_upload_limit' => 'سرور اجازه آپلود در این اندازه را نمی دهد. لطفا اندازه فایل کوچکتر را امتحان کنید.',
+    'server_upload_limit' => 'سرور اجازه آپلود با این حجم را نمی دهد. لطفا فایلی با حجم کم‌تر را امتحان کنید.',
     'server_post_limit' => 'سرور نمی‌تواند داده مقادیر ارائه شده داده را دریافت کند. با مقدار کمتر و فایل کوچکتر دوباره امتحان کنید.',
     'uploaded'  => 'سرور اجازه آپلود در این اندازه را نمی دهد. لطفا اندازه فایل کوچکتر را امتحان کنید.',
 
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'شما نمی توانید تنها ادمین را حذف کنید',
     'users_cannot_delete_guest' => 'شما نمی توانید کاربر مهمان را حذف کنید',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'امکان ایجاد کاربر وجود ندارد؛ زیرا ارسال ایمیل دعوت با خطا مواجه شد.',
 
     // Roles
     'role_cannot_be_edited' => 'این نقش قابل ویرایش نیست',
@@ -106,16 +106,16 @@
     'back_soon' => 'به زودی پشتیبان خواهد شد.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'امکان ایجاد کاربر وجود ندارد؛ زیرا ارسال ایمیل دعوت با خطا مواجه شد.',
+    'import_zip_cant_decode_data' => 'محتوای data.json در فایل ZIP پیدا یا رمزگشایی نشد.',
+    'import_zip_no_data' => 'داده‌های فایل ZIP فاقد محتوای کتاب، فصل یا صفحه مورد انتظار است.',
+    'import_validation_failed' => 'اعتبارسنجی فایل ZIP واردشده با خطا مواجه شد:',
+    'import_zip_failed_notification' => ' فایل ZIP وارد نشد.',
+    'import_perms_books' => 'شما مجوز لازم برای ایجاد کتاب را ندارید.',
+    'import_perms_chapters' => 'شما مجوز لازم برای ایجاد فصل را ندارید.',
+    'import_perms_pages' => 'شما مجوز لازم برای ایجاد صفحه را ندارید.',
+    'import_perms_images' => 'شما مجوز لازم برای ایجاد تصویر را ندارید.',
+    'import_perms_attachments' => 'شما مجوز لازم برای ایجاد پیوست را ندارید.',
 
     // API errors
     'api_no_authorization_found' => 'هیچ نشانه مجوزی در درخواست یافت نشد',
diff --git a/lang/fa/notifications.php b/lang/fa/notifications.php
index 12f4230a13e..4595fd8252a 100644
--- a/lang/fa/notifications.php
+++ b/lang/fa/notifications.php
@@ -22,6 +22,6 @@
     'action_view_comment' => 'مشاهده نظر',
     'action_view_page' => 'مشاهده صفحه',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
+    'footer_reason' => 'این اعلان برای شما ارسال شده است، زیرا پیوند (:link) فعالیتی از این نوع را برای این مورد پوشش می‌دهد.',
     'footer_reason_link' => 'تنظیمات اطلاع‌رسانی شما',
 ];
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index 7909864f7c3..e4cb9018ebf 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -15,7 +15,7 @@
     // App Settings
     'app_customization' => 'سفارشی‌سازی',
     'app_features_security' => 'ویژگی‌ها و امنیت',
-    'app_name' => 'نام نرم افزار',
+    'app_name' => 'نام نرم‌افزار',
     'app_name_desc' => 'این نام در هدر و در هر ایمیل ارسال شده توسط سیستم نشان داده شده است.',
     'app_name_header' => 'نمایش نام در هدر',
     'app_public_access' => 'دسترسی عمومی',
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'بدون محدودیت',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'مرتب‌سازی',
+    'sorting_book_default' => 'مرتب‌سازی پیش‌فرض کتاب',
+    'sorting_book_default_desc' => 'قانون پیش‌فرض مرتب‌سازی را برای کتاب‌های جدید انتخاب کنید. تغییر قانون بر ترتیب کتاب‌های موجود تأثیری ندارد و می‌تواند برای هر کتاب به‌صورت جداگانه تغییر یابد.',
+    'sorting_rules' => 'قوانین مرتب‌سازی',
+    'sorting_rules_desc' => 'این‌ها عملیات مرتب‌سازی از پیش تعریف‌شده‌ای هستند که می‌توانید آن‌ها را بر محتوای سیستم اعمال کنید.',
+    'sort_rule_assigned_to_x_books' => 'اختصاص داده شده به :count کتاب',
+    'sort_rule_create' => 'ایجاد قانون مرتب‌سازی',
+    'sort_rule_edit' => 'ویرایش قانون مرتب‌سازی',
+    'sort_rule_delete' => 'حذف قانون مرتب‌سازی',
+    'sort_rule_delete_desc' => 'این قانون مرتب‌سازی را از سیستم حذف کنید. کتاب‌هایی که از این شیوه مرتب‌سازی استفاده می‌کنند، به حالت مرتب‌سازی دستی بازخواهند گشت.',
+    'sort_rule_delete_warn_books' => 'در حال حاضر این قانون مرتب‌سازی برای :count کتاب به‌کار می‌رود. آیا مطمئن هستید که می‌خواهید آن را حذف کنید؟',
+    'sort_rule_delete_warn_default' => 'این قانون مرتب‌سازی هم‌اکنون به عنوان پیش‌فرض کتاب‌ها تعیین شده است. آیا مطمئن هستید که می‌خواهید آن را حذف کنید؟',
+    'sort_rule_details' => 'جزئیات قانون مرتب‌سازی',
+    'sort_rule_details_desc' => 'برای این قانون مرتب‌سازی یک نام انتخاب کنید. این نام هنگام انتخاب شیوه مرتب‌سازی در فهرست‌ها نمایش داده خواهد شد.',
+    'sort_rule_operations' => 'عملیات مرتب‌سازی',
+    'sort_rule_operations_desc' => 'عملیات مرتب‌سازی را پیکربندی کنید. برای این منظور، آن‌ها را در فهرست عملیاتِ در دسترس جابه‌جا کنید تا ترتیب اجرای آن‌ها مشخص شود. هنگام استفاده، این عملیات به‌ترتیب از بالا به پایین اعمال خواهند شد. هر تغییری که در این بخش ایجاد کنید، پس از ذخیره، برای همه کتاب‌های اختصاص‌یافته اجرا می‌شود.',
+    'sort_rule_available_operations' => 'عملیات موجود',
+    'sort_rule_available_operations_empty' => 'عملیاتی باقی نمانده است',
+    'sort_rule_configured_operations' => 'عملیات پیکربندی‌شده',
+    'sort_rule_configured_operations_empty' => 'عملیات را از فهرست «عملیات موجود» حذف یا اضافه کنید',
+    'sort_rule_op_asc' => '(صعودی)',
+    'sort_rule_op_desc' => '(نزولی)',
+    'sort_rule_op_name' => 'نام - الفبایی',
+    'sort_rule_op_name_numeric' => 'نام - عددی',
+    'sort_rule_op_created_date' => 'تاریخ ایجاد',
+    'sort_rule_op_updated_date' => 'تاریخ به‌روزرسانی',
+    'sort_rule_op_chapters_first' => 'ابتدا فصل‌ها',
+    'sort_rule_op_chapters_last' => 'فصل‌ها در آخر',
 
     // Maintenance settings
     'maint' => 'نگهداری',
@@ -192,7 +192,7 @@
     'role_access_api' => 'دسترسی به API سیستم',
     'role_manage_settings' => 'تنظیمات برنامه را مدیریت کنید',
     'role_export_content' => 'صادرات محتوا',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'وارد کردن محتوا',
     'role_editor_change' => 'تغییر ویرایشگر صفحه',
     'role_notifications' => 'دریافت و مدیریت اعلان‌ها',
     'role_asset' => 'مجوزهای دارایی',
diff --git a/lang/fa/validation.php b/lang/fa/validation.php
index 10432471f64..e1c69ece9a1 100644
--- a/lang/fa/validation.php
+++ b/lang/fa/validation.php
@@ -105,10 +105,10 @@
     'url'                  => ':attribute معتبر نمی‌باشد.',
     'uploaded'             => 'بارگذاری فایل :attribute موفقیت آمیز نبود.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'ویژگی :attribute باید به یک فایل درون پرونده فشرده شده اشاره کند.',
+    'zip_file_mime' => 'ویژگی :attribute باید به فایلی با نوع :validTypes اشاره کند، اما نوع یافت‌شده :foundType است.',
+    'zip_model_expected' => 'سیستم در این بخش انتظار دریافت یک شیء داده‌ای را داشت، اما «:type» دریافت گردید',
+    'zip_unique' => 'برای هر نوع شیء در فایل ZIP، مقدار ویژگی :attribute باید یکتا و بدون تکرار باشد.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/fi/editor.php b/lang/fi/editor.php
index 6b5683d38da..8b72b4e5e3e 100644
--- a/lang/fi/editor.php
+++ b/lang/fi/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Yläindeksi',
     'subscript' => 'Alaindeksi',
     'text_color' => 'Tekstin väri',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Mukautettu väri',
     'remove_color' => 'Poista väri',
     'background_color' => 'Taustaväri',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index 3183abe5d58..e6dad19e85f 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Lisää piirustus',
     'pages_md_show_preview' => 'Näytä esikatselu',
     'pages_md_sync_scroll' => 'Vieritä esikatselua koodin vierityksen mukaan',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Tallentamaton piirustus löytyi',
     'pages_drawing_unsaved_confirm' => 'Järjestelmä löysi tallentamattoman piirustuksen. Haluatko palauttaa piirustuksen ja jatkaa sen muokkaamista?',
     'pages_not_in_chapter' => 'Sivu ei kuulu mihinkään lukuun',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index fa620c52071..8c64354249c 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Exposant',
     'subscript' => 'Indice',
     'text_color' => 'Couleur Texte',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Couleur personnalisée',
     'remove_color' => 'Supprimer la couleur',
     'background_color' => 'Couleur d\'arrière-plan',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index f538307ae2d..02b53e80b53 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insérer un dessin',
     'pages_md_show_preview' => 'Prévisualisation',
     'pages_md_sync_scroll' => 'Défilement prévisualisation',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Dessin non enregistré trouvé',
     'pages_drawing_unsaved_confirm' => 'Des données de dessin non enregistrées ont été trouvées à partir d\'une tentative de sauvegarde de dessin échouée. Voulez-vous restaurer et continuer à modifier ce dessin non sauvegardé ?',
     'pages_not_in_chapter' => 'La page n\'est pas dans un chapitre',
diff --git a/lang/he/editor.php b/lang/he/editor.php
index f119041b691..6390389b803 100644
--- a/lang/he/editor.php
+++ b/lang/he/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'כתב עילי',
     'subscript' => 'כתב תחתי',
     'text_color' => 'צבע טקסט',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'צבע מותאם',
     'remove_color' => 'הסר צבע',
     'background_color' => 'צבע רקע',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index ce1d4fa801e..495e2c66a83 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'הכנס סרטוט',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'דף אינו חלק מפרק',
diff --git a/lang/hr/editor.php b/lang/hr/editor.php
index 274f41c84e8..4ac9083188f 100644
--- a/lang/hr/editor.php
+++ b/lang/hr/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Gornji indeks',
     'subscript' => 'Donji indeks',
     'text_color' => 'Boja teksta',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Prilagođena boja',
     'remove_color' => 'Ukloni boju',
     'background_color' => 'Boja pozadine',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 62918c367ed..71f591b0f18 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Umetni crtež',
     'pages_md_show_preview' => 'Prikaži pregled',
     'pages_md_sync_scroll' => 'Sinkroniziraj pomicanje pregleda',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Pronađen je Nespremljen Crtež',
     'pages_drawing_unsaved_confirm' => 'Pronađeni su nespremljeni podaci crteža iz prethodnog neuspjelog pokušaja spremanja crteža. Želite li obnoviti i nastaviti uređivati ovaj nespremljeni crtež?',
     'pages_not_in_chapter' => 'Stranica nije u poglavlju',
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index d5c6baed67f..705bc6d54c0 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Felső index',
     'subscript' => 'Alsó index',
     'text_color' => 'Szöveg szín',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Egyéni szín',
     'remove_color' => 'Szín eltávolítása',
     'background_color' => 'Háttérszín',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 8686908f069..1af563d5ed9 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Rajz beillesztése',
     'pages_md_show_preview' => 'Előnézet megjelenítése',
     'pages_md_sync_scroll' => 'Előnézet pozíció szinkronizálása',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Nem mentett rajz található',
     'pages_drawing_unsaved_confirm' => 'A rendszer nem mentett rajzadatokat talált egy korábbi sikertelen rajzmentési kísérletből. Szeretné visszaállítani és folytatni a nem mentett rajz szerkesztését?',
     'pages_not_in_chapter' => 'Az oldal nincs fejezetben',
diff --git a/lang/id/activities.php b/lang/id/activities.php
index 380236439f8..6e1583a94e7 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -72,7 +72,7 @@
     'mfa_remove_method_notification' => 'Metode multi-faktor sukses dihapus',
 
     // Settings
-    'settings_update' => 'updated settings',
+    'settings_update' => 'memperbarui setelan',
     'settings_update_notification' => 'Pengaturan berhasil diperbarui',
     'maintenance_action_run' => 'menjalankan tindakan pemeliharaan',
 
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook berhasil dihapus',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'telat membuat impor',
+    'import_create_notification' => 'Impor berhasil diunggah',
+    'import_run' => 'telah memperbarui impor',
+    'import_run_notification' => 'Konten berhasil diimpor',
+    'import_delete' => 'telah menghapus impor',
+    'import_delete_notification' => 'Impor berhasil dihapus',
 
     // Users
     'user_create' => 'pengguna yang dibuat',
@@ -109,31 +109,31 @@
     'api_token_delete_notification' => 'token API berhasil dihapus ',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => 'telah membuat peran',
     'role_create_notification' => 'Peran berhasil dibuat',
-    'role_update' => 'updated role',
+    'role_update' => 'telah memperbarui peran',
     'role_update_notification' => 'Peran berhasil diperbarui',
-    'role_delete' => 'deleted role',
+    'role_delete' => 'telah menghapus peran',
     'role_delete_notification' => 'Peran berhasil dihapus',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'emptied recycle bin',
-    'recycle_bin_restore' => 'restored from recycle bin',
-    'recycle_bin_destroy' => 'removed from recycle bin',
+    'recycle_bin_empty' => 'telah mengosongkan tempat sampah',
+    'recycle_bin_restore' => 'telah mengembalikan dari tempat sampah',
+    'recycle_bin_destroy' => 'telah menghapus dari tempat sampah',
 
     // Comments
     'commented_on'                => 'berkomentar pada',
-    'comment_create'              => 'added comment',
-    'comment_update'              => 'updated comment',
-    'comment_delete'              => 'deleted comment',
+    'comment_create'              => 'telah menambah komentar',
+    'comment_update'              => 'telah memperbarui komentar',
+    'comment_delete'              => 'telah menghapus komentar',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'telah membuat aturan penyortiran',
+    'sort_rule_create_notification' => 'Aturan penyortiran berhasil dibuat',
+    'sort_rule_update' => 'telah mengubah aturan penyortiran',
+    'sort_rule_update_notification' => 'Aturan penyortiran berhasil diubah',
+    'sort_rule_delete' => 'telah menghapus aturan penyortiran',
+    'sort_rule_delete_notification' => 'Aturan penyortiran berhasil dihapus',
 
     // Other
     'permissions_update'          => 'izin diperbarui',
diff --git a/lang/id/auth.php b/lang/id/auth.php
index 552742bc6fe..6af60ca80b1 100644
--- a/lang/id/auth.php
+++ b/lang/id/auth.php
@@ -86,32 +86,32 @@
     'mfa_setup_configured' => 'Sudah dikonfigurasi',
     'mfa_setup_reconfigure' => 'Konfigurasi ulang',
     'mfa_setup_remove_confirmation' => 'Apakah Anda yakin ingin menghapus metode autentikasi multi-faktor ini?',
-    'mfa_setup_action' => 'Setup',
-    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
+    'mfa_setup_action' => 'Atur',
+    'mfa_backup_codes_usage_limit_warning' => 'Anda memiliki kurang dari 5 kode cadangan yang tersisa. Harap buat dan simpan set baru sebelum Anda kehabisan kode untuk mencegah akun Anda terkunci.',
     'mfa_option_totp_title' => 'Aplikasi Seluler',
-    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'Untuk menggunakan autentikasi multi-faktor, Anda memerlukan aplikasi seluler yang mendukung TOTP seperti Google Authenticator, Authy, atau Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Kode Cadangan',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
-    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
-    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
-    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
-    'mfa_gen_backup_codes_download' => 'Download Codes',
-    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
-    'mfa_gen_totp_title' => 'Mobile App Setup',
-    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
-    'mfa_gen_totp_verify_setup' => 'Verify Setup',
-    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
-    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
-    'mfa_verify_access' => 'Verify Access',
-    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
-    'mfa_verify_no_methods' => 'No Methods Configured',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_option_backup_codes_desc' => 'Menghasilkan serangkaian kode cadangan sekali pakai yang akan Anda masukkan saat masuk untuk memverifikasi identitas Anda. Pastikan untuk menyimpannya di tempat yang aman.',
+    'mfa_gen_confirm_and_enable' => 'Konfirmasi dan Aktifkan',
+    'mfa_gen_backup_codes_title' => 'Pengaturan Kode Cadangan',
+    'mfa_gen_backup_codes_desc' => 'Simpan daftar kode di bawah ini di tempat yang aman. Saat mengakses sistem, Anda dapat menggunakan salah satu kode sebagai mekanisme autentikasi kedua.',
+    'mfa_gen_backup_codes_download' => 'Unduh Kode',
+    'mfa_gen_backup_codes_usage_warning' => 'Setiap kode hanya dapat digunakan satu kali',
+    'mfa_gen_totp_title' => 'Pengaturan Aplikasi Seluler',
+    'mfa_gen_totp_desc' => 'Untuk menggunakan autentikasi multi-faktor, Anda memerlukan aplikasi seluler yang mendukung TOTP seperti Google Authenticator, Authy, atau Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Pindai kode QR di bawah ini menggunakan aplikasi autentikasi pilihan Anda untuk memulai.',
+    'mfa_gen_totp_verify_setup' => 'Verifikasi Pengaturan',
+    'mfa_gen_totp_verify_setup_desc' => 'Verifikasi bahwa semuanya berfungsi dengan memasukkan kode yang dibuat dalam aplikasi autentikasi Anda pada kolom input di bawah ini:',
+    'mfa_gen_totp_provide_code_here' => 'Berikan kode yang dihasilkan aplikasi Anda di sini',
+    'mfa_verify_access' => 'Verifikasi Akses',
+    'mfa_verify_access_desc' => 'Akun pengguna Anda mengharuskan Anda mengonfirmasi identitas Anda melalui tingkat verifikasi tambahan sebelum Anda diberikan akses. Verifikasi menggunakan salah satu metode yang telah Anda konfigurasikan untuk melanjutkan.',
+    'mfa_verify_no_methods' => 'Tidak Ada Metode yang Dikonfigurasi',
+    'mfa_verify_no_methods_desc' => 'Tidak ada metode autentikasi multi-faktor yang ditemukan untuk akun Anda. Anda perlu menyiapkan setidaknya satu metode sebelum mendapatkan akses.',
     'mfa_verify_use_totp' => 'Verifikasi menggunakan aplikasi seluler',
     'mfa_verify_use_backup_codes' => 'Verifikasi menggunakan kode cadangan',
     'mfa_verify_backup_code' => 'Kode Cadangan',
-    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
-    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
-    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_verify_backup_code_desc' => 'Masukkan salah satu kode cadangan Anda yang tersisa di bawah ini:',
+    'mfa_verify_backup_code_enter_here' => 'Masukkan kode cadangan di sini',
+    'mfa_verify_totp_desc' => 'Masukkan kode yang dibuat menggunakan aplikasi seluler Anda di bawah ini:',
+    'mfa_setup_login_notification' => 'Metode multi-faktor dikonfigurasi. Silakan masuk lagi menggunakan metode yang dikonfigurasi.',
 ];
diff --git a/lang/id/common.php b/lang/id/common.php
index f6520420f73..cee2d327ff0 100644
--- a/lang/id/common.php
+++ b/lang/id/common.php
@@ -6,7 +6,7 @@
 
     // Buttons
     'cancel' => 'Batal',
-    'close' => 'Close',
+    'close' => 'Tutup',
     'confirm' => 'Konfirmasi',
     'back' => 'Kembali',
     'save' => 'Simpan',
@@ -20,18 +20,18 @@
     'description' => 'Deskripsi',
     'role' => 'Peran',
     'cover_image' => 'Sampul gambar',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Gambar ini harus berukuran sekitar 440x250px walaupun nanti akan disesuaikan & terpotong secara fleksibel agar sesuai dengan tampilan pengguna, sehingga dimensi sebenarnya untuk tampilan akan berbeda.',
 
     // Actions
     'actions' => 'Tindakan',
     'view' => 'Lihat',
     'view_all' => 'Lihat Semua',
-    'new' => 'New',
+    'new' => 'Buat Baru',
     'create' => 'Buat',
     'update' => 'Perbarui',
     'edit' => 'Sunting',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Buat Arsip',
+    'unarchive' => 'Batalkan Arsip',
     'sort' => 'Sortir',
     'move' => 'Pindahkan',
     'copy' => 'Salin',
@@ -43,18 +43,18 @@
     'reset' => 'Atur ulang',
     'remove' => 'Hapus',
     'add' => 'Tambah',
-    'configure' => 'Configure',
-    'manage' => 'Manage',
+    'configure' => 'Atur',
+    'manage' => 'Kelola',
     'fullscreen' => 'Layar Penuh',
     'favourite' => 'Favorit',
     'unfavourite' => 'Batal favorit',
     'next' => 'Selanjutnya',
     'previous' => 'Sebelumnya',
-    'filter_active' => 'Active Filter:',
-    'filter_clear' => 'Clear Filter',
-    'download' => 'Download',
-    'open_in_tab' => 'Open in Tab',
-    'open' => 'Open',
+    'filter_active' => 'Filter Aktif:',
+    'filter_clear' => 'Hapus Filter',
+    'download' => 'Unduh',
+    'open_in_tab' => 'Buka di tab baru',
+    'open' => 'Buka',
 
     // Sort Options
     'sort_options' => 'Opsi Sortir',
@@ -80,20 +80,20 @@
     'default' => 'Bawaan',
     'breadcrumb' => 'Breadcrumb',
     'status' => 'Status',
-    'status_active' => 'Active',
-    'status_inactive' => 'Inactive',
-    'never' => 'Never',
-    'none' => 'None',
+    'status_active' => 'Aktif',
+    'status_inactive' => 'Tidak Aktif',
+    'never' => 'Jangan Pernah',
+    'none' => 'Tidak Satupun',
 
     // Header
-    'homepage' => 'Homepage',
+    'homepage' => 'Beranda',
     'header_menu_expand' => 'Perluas Menu Tajuk',
     'profile_menu' => 'Menu Profil',
     'view_profile' => 'Tampilkan Profil',
     'edit_profile' => 'Sunting Profil',
     'dark_mode' => 'Mode Gelap',
     'light_mode' => 'Mode Terang',
-    'global_search' => 'Global Search',
+    'global_search' => 'Pencarian Global',
 
     // Layout tabs
     'tab_info' => 'Informasi',
@@ -111,5 +111,5 @@
     'terms_of_service' => 'Ketentuan Layanan',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Cari :appName',
 ];
diff --git a/lang/id/components.php b/lang/id/components.php
index 373d6ace516..45aa72fba22 100644
--- a/lang/id/components.php
+++ b/lang/id/components.php
@@ -6,36 +6,36 @@
 
     // Image Manager
     'image_select' => 'Pilih Gambar',
-    'image_list' => 'Image List',
-    'image_details' => 'Image Details',
-    'image_upload' => 'Upload Image',
-    'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
-    'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_list' => 'Daftar Gambar',
+    'image_details' => 'Detail Gambar',
+    'image_upload' => 'Unggah Gambar',
+    'image_intro' => 'Di sini Anda dapat memilih dan mengelola gambar yang sebelumnya diunggah ke sistem.',
+    'image_intro_upload' => 'Unggah gambar baru dengan menyeret berkas gambar ke jendela ini, atau dengan menggunakan tombol "Unggah Gambar" di atas.',
     'image_all' => 'Semua',
     'image_all_title' => 'Lihat semua gambar',
     'image_book_title' => 'Lihat gambar yang diunggah ke buku ini',
     'image_page_title' => 'Lihat gambar yang diunggah ke halaman ini',
     'image_search_hint' => 'Cari berdasarkan nama gambar',
     'image_uploaded' => 'Diunggah :uploadedDate',
-    'image_uploaded_by' => 'Uploaded by :userName',
-    'image_uploaded_to' => 'Uploaded to :pageLink',
-    'image_updated' => 'Updated :updateDate',
+    'image_uploaded_by' => 'Diunggah oleh :userName',
+    'image_uploaded_to' => 'Diunggah ke :pageLink',
+    'image_updated' => 'Diperbarui :updateDate',
     'image_load_more' => 'Muat lebih banyak',
     'image_image_name' => 'Muat lebih banyak',
     'image_delete_used' => 'Gambar ini digunakan untuk halaman dibawah ini.',
     'image_delete_confirm_text' => 'Anda yakin ingin menghapus gambar ini?',
     'image_select_image' => 'Pilih gambar',
     'image_dropzone' => 'Lepaskan gambar atau klik di sini untuk mengunggah',
-    'image_dropzone_drop' => 'Drop images here to upload',
+    'image_dropzone_drop' => 'Letakkan gambar di sini untuk diunggah',
     'images_deleted' => 'Gambar Dihapus',
     'image_preview' => 'Pratinjau Gambar',
     'image_upload_success' => 'Gambar berhasil diunggah',
     'image_update_success' => 'Detail gambar berhasil diperbarui',
     'image_delete_success' => 'Gambar berhasil dihapus',
-    'image_replace' => 'Replace Image',
-    'image_replace_success' => 'Image file successfully updated',
-    'image_rebuild_thumbs' => 'Regenerate Size Variations',
-    'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!',
+    'image_replace' => 'Ganti Gambar',
+    'image_replace_success' => 'Berkas gambar berhasil diperbarui',
+    'image_rebuild_thumbs' => 'Buat Ulang Variasi Ukuran',
+    'image_rebuild_thumbs_success' => 'Variasi ukuran gambar berhasil dibuat ulang!',
 
     // Code Editor
     'code_editor' => 'Edit Kode',
diff --git a/lang/id/editor.php b/lang/id/editor.php
index 40fc4a5abfd..04999368930 100644
--- a/lang/id/editor.php
+++ b/lang/id/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Batal',
     'save' => 'Simpan',
     'close' => 'Tutup',
-    'apply' => 'Apply',
+    'apply' => 'Terapkan',
     'undo' => 'Undo',
     'redo' => 'Ulangi',
     'left' => 'Kiri',
@@ -29,69 +29,70 @@
 
     // Toolbar
     'formats' => 'Format',
-    'header_large' => 'Large Header',
-    'header_medium' => 'Medium Header',
-    'header_small' => 'Small Header',
-    'header_tiny' => 'Tiny Header',
-    'paragraph' => 'Paragraph',
-    'blockquote' => 'Blockquote',
-    'inline_code' => 'Inline code',
-    'callouts' => 'Callouts',
-    'callout_information' => 'Information',
+    'header_large' => 'Header Besar',
+    'header_medium' => 'Header Sedang',
+    'header_small' => 'Header Kecil',
+    'header_tiny' => 'Header Sangat Kecil',
+    'paragraph' => 'Paragraf',
+    'blockquote' => 'Kutipan blok',
+    'inline_code' => 'Kode sebaris',
+    'callouts' => 'Anotasi',
+    'callout_information' => 'Informasi',
     'callout_success' => 'Sukses',
     'callout_warning' => 'Peringatan',
     'callout_danger' => 'Bahaya',
     'bold' => 'Berani',
     'italic' => 'Italic',
     'underline' => 'Garis Bawah',
-    'strikethrough' => 'Strikethrough',
-    'superscript' => 'Superscript',
+    'strikethrough' => 'Coret',
+    'superscript' => 'Superskrip',
     'subscript' => 'Berlangganan',
     'text_color' => 'Warna teks',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Warna khusus',
     'remove_color' => 'Hapus Warna',
     'background_color' => 'Warna latar',
     'align_left' => 'Rata Kiri',
-    'align_center' => 'Align center',
-    'align_right' => 'Align right',
-    'align_justify' => 'Justify',
-    'list_bullet' => 'Bullet list',
-    'list_numbered' => 'Numbered list',
-    'list_task' => 'Task list',
-    'indent_increase' => 'Increase indent',
-    'indent_decrease' => 'Decrease indent',
-    'table' => 'Table',
-    'insert_image' => 'Insert image',
-    'insert_image_title' => 'Insert/Edit Image',
-    'insert_link' => 'Insert/edit link',
-    'insert_link_title' => 'Insert/Edit Link',
-    'insert_horizontal_line' => 'Insert horizontal line',
-    'insert_code_block' => 'Insert code block',
-    'edit_code_block' => 'Edit code block',
-    'insert_drawing' => 'Insert/edit drawing',
-    'drawing_manager' => 'Drawing manager',
-    'insert_media' => 'Insert/edit media',
-    'insert_media_title' => 'Insert/Edit Media',
-    'clear_formatting' => 'Clear formatting',
-    'source_code' => 'Source code',
-    'source_code_title' => 'Source Code',
-    'fullscreen' => 'Fullscreen',
-    'image_options' => 'Image options',
+    'align_center' => 'Rata tengah',
+    'align_right' => 'Rata kanan',
+    'align_justify' => 'Rata kanan kiri',
+    'list_bullet' => 'Daftar poin',
+    'list_numbered' => 'Daftar bernomor',
+    'list_task' => 'Daftar tugas',
+    'indent_increase' => 'Tambah indentasi',
+    'indent_decrease' => 'Kurangi indentasi',
+    'table' => 'Tabel',
+    'insert_image' => 'Sisipkan gambar',
+    'insert_image_title' => 'Sisipkan/Ubah Gambar',
+    'insert_link' => 'Sisipkan/ubah tautan',
+    'insert_link_title' => 'Sisipkan/Ubah Tautan',
+    'insert_horizontal_line' => 'Sisipkan garis horizontal',
+    'insert_code_block' => 'Sisipkan blok kode',
+    'edit_code_block' => 'Ubah blok kode',
+    'insert_drawing' => 'Sisipkan/ubah gambaran',
+    'drawing_manager' => 'Manajer Gambaran',
+    'insert_media' => 'Sisipkan/ubah media',
+    'insert_media_title' => 'Sisipkan/Ubah Media',
+    'clear_formatting' => 'Bersihkan format',
+    'source_code' => 'Kode sumber',
+    'source_code_title' => 'Kode Sumber',
+    'fullscreen' => 'Layar penuh',
+    'image_options' => 'Opsi gambar',
 
     // Tables
-    'table_properties' => 'Table properties',
-    'table_properties_title' => 'Table Properties',
-    'delete_table' => 'Delete table',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
-    'insert_row_before' => 'Insert row before',
-    'insert_row_after' => 'Insert row after',
-    'delete_row' => 'Delete row',
-    'insert_column_before' => 'Insert column before',
-    'insert_column_after' => 'Insert column after',
-    'delete_column' => 'Delete column',
-    'table_cell' => 'Cell',
+    'table_properties' => 'Properti tabel',
+    'table_properties_title' => 'Properti Tabel',
+    'delete_table' => 'Hapus tabel',
+    'table_clear_formatting' => 'Bersihkan format tabel',
+    'resize_to_contents' => 'Sesuaikan dengan ukuran konten',
+    'row_header' => 'Judul baris',
+    'insert_row_before' => 'Sisipkan baris sebelum',
+    'insert_row_after' => 'Sisipkan baris setelah',
+    'delete_row' => 'Hapus baris',
+    'insert_column_before' => 'Sisipkan kolom sebelum',
+    'insert_column_after' => 'Sisipkan kolom sesudah',
+    'delete_column' => 'Hapus kolom',
+    'table_cell' => 'Sel',
     'table_row' => 'Row',
     'table_column' => 'Column',
     'cell_properties' => 'Cell properties',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 7fd76f44912..6cd88b51b69 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Sisipkan Gambar',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Halaman tidak dalam satu bab',
diff --git a/lang/id/errors.php b/lang/id/errors.php
index b4e2c6feb11..6f766173874 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Pengguna dengan email :email sudah ada tetapi dengan kredensial berbeda.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Akun pengguna tidak dapat didaftarkan untuk rincian yang diberikan',
     'email_already_confirmed' => 'Email telah dikonfirmasi, Coba masuk.',
     'email_confirmation_invalid' => 'Token konfirmasi ini tidak valid atau telah digunakan, Silakan coba mendaftar lagi.',
     'email_confirmation_expired' => 'Token konfirmasi telah kedaluwarsa, Email konfirmasi baru telah dikirim.',
@@ -23,9 +23,9 @@
     'saml_no_email_address' => 'Tidak dapat menemukan sebuah alamat email untuk pengguna ini, dalam data yang diberikan oleh sistem autentikasi eksternal',
     'saml_invalid_response_id' => 'Permintaan dari sistem otentikasi eksternal tidak dikenali oleh sebuah proses yang dimulai oleh aplikasi ini. Menavigasi kembali setelah masuk dapat menyebabkan masalah ini.',
     'saml_fail_authed' => 'Masuk menggunakan :system gagal, sistem tidak memberikan otorisasi yang berhasil',
-    'oidc_already_logged_in' => 'Already logged in',
-    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
-    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
+    'oidc_already_logged_in' => 'Sudah masuk',
+    'oidc_no_email_address' => 'Tidak dapat menemukan alamat email untuk pengguna ini dalam data yang diberikan oleh sistem autentikasi eksternal',
+    'oidc_fail_authed' => 'Masuk menggunakan :system gagal, sistem tidak memberikan otorisasi yang berhasil',
     'social_no_action_defined' => 'Tidak ada tindakan yang ditentukan',
     'social_login_bad_response' => "Kesalahan yang diterima selama masuk menggunakan :socialAccount : \n:error",
     'social_account_in_use' => 'Akun :socialAccount ini sudah digunakan, Coba masuk melalui opsi :socialAccount.',
@@ -37,37 +37,37 @@
     'social_driver_not_found' => 'Pengemudi sosial tidak ditemukan',
     'social_driver_not_configured' => 'Pengaturan sosial :socialAccount Anda tidak dikonfigurasi dengan benar.',
     'invite_token_expired' => 'Tautan undangan ini telah kedaluwarsa. Sebagai gantinya, Anda dapat mencoba mengatur ulang kata sandi akun Anda.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Pengguna untuk tindakan ini tidak dapat ditemukan.',
 
     // System
     'path_not_writable' => 'Jalur berkas :filePath tidak dapat diunggah. Pastikan berkas tersebut dapat ditulis ke server.',
     'cannot_get_image_from_url' => 'Tidak dapat mengambil gambar dari :url',
     'cannot_create_thumbs' => 'Server tidak dapat membuat thumbnail. Harap periksa apakah Anda telah memasang ekstensi GD PHP.',
     'server_upload_limit' => 'Server tidak mengizinkan unggahan dengan ukuran ini. Harap coba ukuran berkas yang lebih kecil.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
+    'server_post_limit' => 'Server tidak dapat menerima jumlah data yang diberikan. Coba lagi dengan data yang lebih sedikit atau berkas yang lebih kecil.',
     'uploaded'  => 'Server tidak mengizinkan unggahan dengan ukuran ini. Harap coba ukuran berkas yang lebih kecil.',
 
     // Drawing & Images
     'image_upload_error' => 'Terjadi kesalahan saat mengunggah gambar',
     'image_upload_type_error' => 'Jenis gambar yang diunggah tidak valid',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_replace_type' => 'Penggantian file gambar harus berjenis sama',
+    'image_upload_memory_limit' => 'Gagal menangani pengunggahan gambar dan/atau membuat thumbnail karena keterbatasan sumber daya sistem.',
+    'image_thumbnail_memory_limit' => 'Gagal membuat variasi ukuran gambar karena keterbatasan sumber daya sistem.',
+    'image_gallery_thumbnail_memory_limit' => 'Gagal membuat thumbnail galeri karena keterbatasan sumber daya sistem.',
+    'drawing_data_not_found' => 'Data gambar tidak dapat dimuat. Berkas gambar mungkin sudah tidak ada atau Anda mungkin tidak memiliki izin untuk mengaksesnya.',
 
     // Attachments
     'attachment_not_found' => 'Lampiran tidak ditemukan',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Terjadi kesalahan saat mengunggah berkas',
 
     // Pages
     'page_draft_autosave_fail' => 'Gagal menyimpan draf. Pastikan Anda memiliki koneksi internet sebelum menyimpan halaman ini',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Gagal menghapus draf halaman dan mengambil konten tersimpan halaman saat ini',
     'page_custom_home_deletion' => 'Tidak dapat menghapus sebuah halaman saat diatur sebagai sebuah halaman beranda',
 
     // Entities
     'entity_not_found' => 'Entitas tidak ditemukan',
-    'bookshelf_not_found' => 'Shelf not found',
+    'bookshelf_not_found' => 'Rak tidak ditemukan',
     'book_not_found' => 'Buku tidak ditemukan',
     'page_not_found' => 'Halaman tidak ditemukan',
     'chapter_not_found' => 'Bab tidak ditemukan',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Anda tidak dapat menghapus satu-satunya admin',
     'users_cannot_delete_guest' => 'Anda tidak dapat menghapus pengguna tamu',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Tidak dapat membuat pengguna karena email undangan gagal dikirim',
 
     // Roles
     'role_cannot_be_edited' => 'Peran ini tidak dapat disunting',
@@ -106,16 +106,16 @@
     'back_soon' => 'Ini akan segera kembali.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Tidak dapat membaca berkas ZIP.',
+    'import_zip_cant_decode_data' => 'Tidak dapat menemukan dan mendekode konten ZIP data.json.',
+    'import_zip_no_data' => 'Data berkas ZIP tidak berisi konten buku, bab, atau halaman yang diharapkan.',
+    'import_validation_failed' => 'Impor ZIP gagal divalidasi dengan kesalahan:',
+    'import_zip_failed_notification' => 'Gagal mengimpor berkas ZIP.',
+    'import_perms_books' => 'Anda tidak memiliki izin yang diperlukan untuk membuat buku.',
+    'import_perms_chapters' => 'Anda tidak memiliki izin yang diperlukan untuk membuat bab.',
+    'import_perms_pages' => 'Anda tidak memiliki izin yang diperlukan untuk membuat halaman.',
+    'import_perms_images' => 'Anda tidak memiliki izin yang diperlukan untuk membuat gambar.',
+    'import_perms_attachments' => 'Anda tidak memiliki izin yang diperlukan untuk membuat lampiran.',
 
     // API errors
     'api_no_authorization_found' => 'Tidak ada token otorisasi yang ditemukan pada permintaan tersebut',
@@ -129,5 +129,5 @@
     'maintenance_test_email_failure' => 'Kesalahan dilempar saat mengirim email uji:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'URL tidak cocok dengan host SSR yang diizinkan yang dikonfigurasi',
 ];
diff --git a/lang/id/notifications.php b/lang/id/notifications.php
index 1afd23f1dc4..b22af1f730e 100644
--- a/lang/id/notifications.php
+++ b/lang/id/notifications.php
@@ -4,24 +4,24 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Komentar baru di halaman: :pageName',
+    'new_comment_intro' => 'Seorang pengguna telah mengomentari halaman di :appName:',
+    'new_page_subject' => 'Halaman baru: :pageName',
+    'new_page_intro' => 'Halaman baru telah dibuat di :appName:',
+    'updated_page_subject' => 'Halaman yang diperbarui: :pageName',
+    'updated_page_intro' => 'Halaman telah diperbarui di :appName:',
+    'updated_page_debounce' => 'Untuk mencegah banyaknya pemberitahuan, untuk sementara Anda tidak akan dikirimi pemberitahuan untuk pengeditan lebih lanjut pada halaman ini oleh editor yang sama.',
 
-    'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
-    'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_page_name' => 'Nama Halaman:',
+    'detail_page_path' => 'Jalur Halaman:',
+    'detail_commenter' => 'Komentator:',
+    'detail_comment' => 'Komentar:',
+    'detail_created_by' => 'Dibuat Oleh:',
+    'detail_updated_by' => 'Diperbarui Oleh:',
 
-    'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_comment' => 'Lihat Komentar',
+    'action_view_page' => 'Lihat Halaman',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Pemberitahuan ini dikirimkan kepada Anda karena :link mencakup jenis aktivitas untuk item ini.',
+    'footer_reason_link' => 'preferensi notifikasi Anda',
 ];
diff --git a/lang/is/editor.php b/lang/is/editor.php
index 95b8c54e653..2c4a24616ad 100644
--- a/lang/is/editor.php
+++ b/lang/is/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Háletur',
     'subscript' => 'Lágletur',
     'text_color' => 'Litur texta',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Sérsniðinn litur',
     'remove_color' => 'Fjarlægja lit',
     'background_color' => 'Bakgrunnslitur',
diff --git a/lang/is/entities.php b/lang/is/entities.php
index 931f53ac646..9176100271c 100644
--- a/lang/is/entities.php
+++ b/lang/is/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Setja inn teikningu',
     'pages_md_show_preview' => 'Sýna forskoðun',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Síðan tilheyrir engum kafla',
diff --git a/lang/it/editor.php b/lang/it/editor.php
index 3fb517ffb5f..47734019794 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Apice',
     'subscript' => 'Pedice',
     'text_color' => 'Colore del testo',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Colore personalizzato',
     'remove_color' => 'Rimuovi colore',
     'background_color' => 'Colore di sfondo',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index 34a6a1015e3..e4d8eb9d49b 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Inserisci disegno',
     'pages_md_show_preview' => 'Visualizza anteprima',
     'pages_md_sync_scroll' => 'Sincronizza scorrimento anteprima',
+    'pages_md_plain_editor' => 'Editor di testo semplice',
     'pages_drawing_unsaved' => 'Trovato disegno non salvato',
     'pages_drawing_unsaved_confirm' => 'Sono stati trovati i dati di un disegno non salvato da un precedente tentativo di salvataggio di disegno non riuscito. Ripristinare e continuare a modificare questo disegno non salvato?',
     'pages_not_in_chapter' => 'La pagina non è in un capitolo',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index 6d4d8506e05..e5bf6af8e72 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -48,6 +48,7 @@
     'superscript' => '上付き',
     'subscript' => '下付き',
     'text_color' => 'テキストの色',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'カスタムカラー',
     'remove_color' => '色設定を解除',
     'background_color' => '背景色',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index cdb04b7b077..f0f86d61188 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => '図を追加',
     'pages_md_show_preview' => 'プレビューを表示',
     'pages_md_sync_scroll' => 'プレビューとスクロールを同期',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => '未保存の図が見つかりました',
     'pages_drawing_unsaved_confirm' => '以前に保存操作が失敗した、未保存の図が見つかりました。
 未保存の図面を復元して編集を続けますか？',
diff --git a/lang/ka/editor.php b/lang/ka/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/ka/editor.php
+++ b/lang/ka/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index ac4d8d53d7a..b5c4ae8070c 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -48,6 +48,7 @@
     'superscript' => '윗첨자',
     'subscript' => '아랫첨자',
     'text_color' => '글자 색상',
+    'highlight_color' => 'Highlight color',
     'custom_color' => '사용자 지정 색상',
     'remove_color' => '색상 제거',
     'background_color' => '배경 색상',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index 3de3c12b9a4..f3fea491384 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => '드로잉 추가',
     'pages_md_show_preview' => '미리보기 표시',
     'pages_md_sync_scroll' => '미리보기 스크롤 동기화',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => '저장되지 않은 드로잉 발견',
     'pages_drawing_unsaved_confirm' => '이전에 실패한 드로잉 저장 시도에서 저장되지 않은 드로잉 데이터가 발견되었습니다. 이 저장되지 않은 드로잉을 복원하고 계속 편집하시겠습니까?',
     'pages_not_in_chapter' => '챕터에 있는 문서가 아닙니다.',
diff --git a/lang/ku/editor.php b/lang/ku/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/ku/editor.php
+++ b/lang/ku/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/ku/entities.php b/lang/ku/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/ku/entities.php
+++ b/lang/ku/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/lt/editor.php b/lang/lt/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/lt/editor.php
+++ b/lang/lt/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 6f73e7cb858..9677b62890d 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Įterpti piešinį',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Puslapio nėra skyriuje',
diff --git a/lang/lv/editor.php b/lang/lv/editor.php
index ad794da9c15..8b2907ddd2a 100644
--- a/lang/lv/editor.php
+++ b/lang/lv/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Augšraksts',
     'subscript' => 'Apakšraksts',
     'text_color' => 'Teksta krāsa',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Pielāgot krāsu',
     'remove_color' => 'Noņemt krāsu',
     'background_color' => 'Fona krāsa',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 6958e82480e..407900f79dd 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Ievietot zīmējumu',
     'pages_md_show_preview' => 'Rādīt priekšskatu',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Atrasts nesaglabāts attēls',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Lapa nav nodaļā',
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index ddb266626a4..77b01f17ba9 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Hevet skrift',
     'subscript' => 'Senket skrift',
     'text_color' => 'Tekstfarge',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Egenvalgt farge',
     'remove_color' => 'Fjern farge',
     'background_color' => 'Bakgrunnsfarge',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 8d0d5c6c481..4fcbd05340c 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Sett inn tegning',
     'pages_md_show_preview' => 'Forhåndsvisning',
     'pages_md_sync_scroll' => 'Synkroniser forhåndsvisningsrulle',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Ulagret tegning funnet',
     'pages_drawing_unsaved_confirm' => 'Ulagret tegningsdata ble funnet fra en tidligere mislykket lagring. Vil du gjenopprette og fortsette å redigere denne ulagrede tegningen?',
     'pages_not_in_chapter' => 'Siden tilhører ingen kapittel',
diff --git a/lang/ne/editor.php b/lang/ne/editor.php
index 77c32ff304c..f3b760ba8ea 100644
--- a/lang/ne/editor.php
+++ b/lang/ne/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'सुपरस्क्रिप्ट',
     'subscript' => 'सबस्क्रिप्ट',
     'text_color' => 'पाठको रंग',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'अनुकूलित रंग',
     'remove_color' => 'रंग हटाउनुहोस्',
     'background_color' => 'पृष्ठभूमि रंग',
diff --git a/lang/ne/entities.php b/lang/ne/entities.php
index 8044515fadc..da1a7e393ae 100644
--- a/lang/ne/entities.php
+++ b/lang/ne/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'चित्र समावेश गर्नुहोस्',
     'pages_md_show_preview' => 'पूर्वावलोकन देखाउनुहोस्',
     'pages_md_sync_scroll' => 'पूर्वावलोकन स्क्रोल सिंक गर्नुहोस्',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'असुरक्षित चित्र भेटियो',
     'pages_drawing_unsaved_confirm' => 'अघिल्लो असफल चित्र बचत प्रयासबाट असुरक्षित चित्र डेटा भेटिएको छ। के तपाईं यस असुरक्षित चित्रलाई पुनर्स्थापना गरेर सम्पादन गर्न चाहनुहुन्छ?',
     'pages_not_in_chapter' => 'पाना कुनै अध्यायमा छैन',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index e3d6df6bc33..0963df71f08 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Tekstkleur',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Aangepaste kleur',
     'remove_color' => 'Verwijder kleur',
     'background_color' => 'Tekstmarkeringskleur',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index a3f03a16cad..e5a8b85e1e2 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Tekening invoegen',
     'pages_md_show_preview' => 'Toon voorbeeld',
     'pages_md_sync_scroll' => 'Synchroniseer scrollen van voorbeeld',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Niet-opgeslagen Tekening Gevonden',
     'pages_drawing_unsaved_confirm' => 'Er zijn niet-opgeslagen tekeninggegevens gevonden van een eerdere mislukte poging om de tekening op te slaan. Wil je deze niet-opgeslagen tekening herstellen en verder bewerken?',
     'pages_not_in_chapter' => 'Pagina is niet in een hoofdstuk',
diff --git a/lang/nn/editor.php b/lang/nn/editor.php
index 74b31748a19..6128223a91d 100644
--- a/lang/nn/editor.php
+++ b/lang/nn/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Heva skrift',
     'subscript' => 'Senka skrift',
     'text_color' => 'Tekstfarge',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Eigenvalgt farge',
     'remove_color' => 'Fjern farge',
     'background_color' => 'Bakgrunnsfarge',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index b8b62ebe37a..3449792cb31 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Sett inn tegning',
     'pages_md_show_preview' => 'Førhandsvisning',
     'pages_md_sync_scroll' => 'Synkroniser førehandsvisingsrulle',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Ulagra teikning funne',
     'pages_drawing_unsaved_confirm' => 'Ulagra teikninga vart funne frå ei tidligare mislykka lagring. Vil du gjenopprette og fortsette å redigere denne ulagra teikninga?',
     'pages_not_in_chapter' => 'Sida tilhøyrer ingen kapittel',
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index 7ba9220cf56..a93b5dd7880 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Indeks górny',
     'subscript' => 'Indeks dolny',
     'text_color' => 'Kolor tekstu',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Kolor niestandardowy',
     'remove_color' => 'Usuń kolor',
     'background_color' => 'Kolor tła',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index cbe75e79d95..8b590722157 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Wstaw rysunek',
     'pages_md_show_preview' => 'Pokaż podgląd',
     'pages_md_sync_scroll' => 'Synchronizuj przewijanie podglądu',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Znaleziono niezapisany rysunek',
     'pages_drawing_unsaved_confirm' => 'Znaleziono niezapisane dane rysowania z poprzedniej nieudanej próby zapisu. Czy chcesz przywrócić i kontynuować edycję tego niezapisanego rysunku?',
     'pages_not_in_chapter' => 'Strona nie została umieszczona w rozdziale',
diff --git a/lang/pt/editor.php b/lang/pt/editor.php
index 222163102b9..b60f813b51b 100644
--- a/lang/pt/editor.php
+++ b/lang/pt/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superior à linha',
     'subscript' => 'Inferior à linha',
     'text_color' => 'Cor do texto',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Cor personalizada',
     'remove_color' => 'Remover cor',
     'background_color' => 'Cor de fundo',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index d25982e9543..b5c2fe5454f 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Inserir Desenho',
     'pages_md_show_preview' => 'Mostrar pré-visualização',
     'pages_md_sync_scroll' => 'Sincronizar pré-visualização',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Encontrado um rascunho não guardado',
     'pages_drawing_unsaved_confirm' => 'Dados de um rascunho não guardado foi encontrado de um tentativa anteriormente falhada. Deseja restaurar e continuar a edição desse rascunho?',
     'pages_not_in_chapter' => 'A página não está dentro de um capítulo',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index ea4035a275c..797c3ae888e 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Sobrescrito',
     'subscript' => 'Subscrito',
     'text_color' => 'Cor do texto',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Cor personalizada',
     'remove_color' => 'Remover cor',
     'background_color' => 'Cor de fundo',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 3d3c7e78a42..37eb64e1f6a 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Inserir Diagrama',
     'pages_md_show_preview' => 'Mostrar pré-visualização',
     'pages_md_sync_scroll' => 'Sincronizar pré-visualização',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Diagrama não-salvo encontrado',
     'pages_drawing_unsaved_confirm' => 'Foram encontrados dados não-salvos de uma tentativa anterior de salvar o diagrama. Você gostaria de restaurá-los e continuar editando este diagrama?',
     'pages_not_in_chapter' => 'Página não está dentro de um capítulo',
diff --git a/lang/ro/editor.php b/lang/ro/editor.php
index a61fdc6c83c..951e027fec1 100644
--- a/lang/ro/editor.php
+++ b/lang/ro/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Scris sus',
     'subscript' => 'Scris jos',
     'text_color' => 'Culoare text',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Culoare personalizată',
     'remove_color' => 'Elimină culoarea',
     'background_color' => 'Culoare fundal',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index 293ec396a67..649b6fe863a 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Inserează desen',
     'pages_md_show_preview' => 'Arată previzualizarea',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Pagina nu este într-un capitol',
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index 3a13ecf467f..d353b7a7640 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -87,7 +87,7 @@
     // Imports
     'import_create' => 'created import',
     'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
+    'import_run' => 'обновлен импорт',
     'import_run_notification' => 'Content successfully imported',
     'import_delete' => 'deleted import',
     'import_delete_notification' => 'Import successfully deleted',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index 264ab7ec33e..bd0c45f31b5 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Надстрочный',
     'subscript' => 'Подстрочный',
     'text_color' => 'Цвет текста',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Пользовательский цвет',
     'remove_color' => 'Удалить цвет',
     'background_color' => 'Цвет фона',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 2d5e0f4e71f..0d3c98e5680 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Вставить рисунок',
     'pages_md_show_preview' => 'Предпросмотр',
     'pages_md_sync_scroll' => 'Синхронизировать прокрутку',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Найден несохраненный чертеж',
     'pages_drawing_unsaved_confirm' => 'Несохраненные данные были найдены из предыдущей неудачной попытки сохранения рисунка. Вы хотите восстановить и продолжить редактирование несохраненного рисунка?',
     'pages_not_in_chapter' => 'Страница не находится в главе',
diff --git a/lang/sk/editor.php b/lang/sk/editor.php
index 3c098e3b342..7d1781ef457 100644
--- a/lang/sk/editor.php
+++ b/lang/sk/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Horný index',
     'subscript' => 'Dolný index',
     'text_color' => 'Farba textu',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Vlastná farba',
     'remove_color' => 'Odstrániť farbu',
     'background_color' => 'Farba pozadia',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 996682e2a79..20f2b294eef 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Vložiť kresbu',
     'pages_md_show_preview' => 'Zobraziť náhľad',
     'pages_md_sync_scroll' => 'Posúvanie ukážky synchronizácie',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Stránka nie je v kapitole',
diff --git a/lang/sl/editor.php b/lang/sl/editor.php
index c050d6b37c5..3afcc23124e 100644
--- a/lang/sl/editor.php
+++ b/lang/sl/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Nadpisano',
     'subscript' => 'Podpisano',
     'text_color' => 'Barva besedila',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Barva po meri',
     'remove_color' => 'Odstrani barvo',
     'background_color' => 'Barva ozadja',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index 0e4c0e1d641..cd1a0b488c6 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Vstavi risbo',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Stran ni v poglavju',
diff --git a/lang/sq/activities.php b/lang/sq/activities.php
index fbe7e3179f4..9296d1759ca 100644
--- a/lang/sq/activities.php
+++ b/lang/sq/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Uebhook-u u fshi me sukses',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'importi i krijuar',
+    'import_create_notification' => 'Importi u ngarkua me sukses',
+    'import_run' => 'Importi i përditësuar',
+    'import_run_notification' => 'Përmbajtja u importua me sukses',
+    'import_delete' => 'Importi i fshirë',
+    'import_delete_notification' => 'Importi u fshi me sukses',
 
     // Users
     'user_create' => 'krijoi përdorues',
@@ -101,11 +101,11 @@
     'user_delete_notification' => 'Përdoruesi u fshi me sukses',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'Krijoi token API',
     'api_token_create_notification' => 'Token API u krijua me sukses',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'Token i përditësuar i API-t',
     'api_token_update_notification' => 'Token API u përditësua me sukses',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'Fshiu tokenin API',
     'api_token_delete_notification' => 'Token API u fshi me sukses',
 
     // Roles
@@ -128,12 +128,12 @@
     'comment_delete'              => 'fshiu koment',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'Rregull i krijuar renditjeje',
+    'sort_rule_create_notification' => 'Rregulli i renditjes u krijua me sukses',
+    'sort_rule_update' => 'rregulli i renditjes i përditësuar',
+    'sort_rule_update_notification' => 'Rregulli i renditjes u përditësua me sukses',
+    'sort_rule_delete' => 'rregulli i renditjes është fshirë',
+    'sort_rule_delete_notification' => 'Rregulli i renditjes u fshi me sukses',
 
     // Other
     'permissions_update'          => 'përditësoi lejet',
diff --git a/lang/sq/auth.php b/lang/sq/auth.php
index e3259a9618f..6fdc4ee4a6d 100644
--- a/lang/sq/auth.php
+++ b/lang/sq/auth.php
@@ -50,34 +50,34 @@
     'reset_password_sent' => 'Një link për rikthimin e fjalëkalimit do ju dërgohet në :email nëse adresa e email-it ndodhet në sistem.',
     'reset_password_success' => 'Fjalëkalimi juaj u rikthye me sukses.',
     'email_reset_subject' => 'Rikthe fjalëkalimin për :appName',
-    'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
-    'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
+    'email_reset_text' => 'Ju po e merrni këtë email sepse ne morëm një kërkesë për rivendosjen e fjalëkalimit për llogarinë tuaj.',
+    'email_reset_not_requested' => 'Nëse nuk keni kërkuar rivendosjen e fjalëkalimit, nuk kërkohet asnjë veprim i mëtejshëm.',
 
     // Email Confirmation
-    'email_confirm_subject' => 'Confirm your email on :appName',
-    'email_confirm_greeting' => 'Thanks for joining :appName!',
-    'email_confirm_text' => 'Please confirm your email address by clicking the button below:',
-    'email_confirm_action' => 'Confirm Email',
-    'email_confirm_send_error' => 'Email confirmation required but the system could not send the email. Contact the admin to ensure email is set up correctly.',
-    'email_confirm_success' => 'Your email has been confirmed! You should now be able to login using this email address.',
-    'email_confirm_resent' => 'Confirmation email resent, Please check your inbox.',
-    'email_confirm_thanks' => 'Thanks for confirming!',
-    'email_confirm_thanks_desc' => 'Please wait a moment while your confirmation is handled. If you are not redirected after 3 seconds press the "Continue" link below to proceed.',
+    'email_confirm_subject' => 'Konfirmo email-in tënd në :appName',
+    'email_confirm_greeting' => 'Faleminderit që u bashkuat me :appName!',
+    'email_confirm_text' => 'Ju lutemi konfirmoni adresën tuaj të email-it duke klikuar butonin më poshtë:',
+    'email_confirm_action' => 'Konfirmo email-in',
+    'email_confirm_send_error' => 'Kërkohet konfirmimi i email-it, por sistemi nuk mundi ta dërgonte email-in. Kontaktoni administratorin për t\'u siguruar që email-i është konfiguruar saktë.',
+    'email_confirm_success' => 'Email-i juaj është konfirmuar! Tani duhet të jeni në gjendje të hyni në sistem duke përdorur këtë adresë email-i.',
+    'email_confirm_resent' => 'Emaili i konfirmimit u ridërgua, ju lutem kontrolloni kutinë tuaj postare.',
+    'email_confirm_thanks' => 'Faleminderit që konfirmuat!',
+    'email_confirm_thanks_desc' => 'Ju lutemi prisni një moment ndërsa konfirmimi juaj përpunohet. Nëse nuk ridrejtoheni pas 3 sekondash, shtypni linkun "Vazhdo" më poshtë për të vazhduar.',
 
-    'email_not_confirmed' => 'Email Address Not Confirmed',
-    'email_not_confirmed_text' => 'Your email address has not yet been confirmed.',
-    'email_not_confirmed_click_link' => 'Please click the link in the email that was sent shortly after you registered.',
-    'email_not_confirmed_resend' => 'If you cannot find the email you can re-send the confirmation email by submitting the form below.',
-    'email_not_confirmed_resend_button' => 'Resend Confirmation Email',
+    'email_not_confirmed' => 'Adresa e email-it nuk është konfirmuar',
+    'email_not_confirmed_text' => 'Adresa juaj e email-it nuk është konfirmuar ende.',
+    'email_not_confirmed_click_link' => 'Ju lutemi klikoni linkun në emailin që ju është dërguar menjëherë pasi u regjistruat.',
+    'email_not_confirmed_resend' => 'Nëse nuk mund ta gjeni email-in, mund ta ridërgoni email-in e konfirmimit duke plotësuar formularin më poshtë.',
+    'email_not_confirmed_resend_button' => 'Ridërgo emailin e konfirmimit',
 
     // User Invite
-    'user_invite_email_subject' => 'You have been invited to join :appName!',
-    'user_invite_email_greeting' => 'An account has been created for you on :appName.',
-    'user_invite_email_text' => 'Click the button below to set an account password and gain access:',
-    'user_invite_email_action' => 'Set Account Password',
-    'user_invite_page_welcome' => 'Welcome to :appName!',
-    'user_invite_page_text' => 'To finalise your account and gain access you need to set a password which will be used to log-in to :appName on future visits.',
-    'user_invite_page_confirm_button' => 'Confirm Password',
+    'user_invite_email_subject' => 'Je ftuar të bashkohesh me :appName!',
+    'user_invite_email_greeting' => 'Një llogari është krijuar për ty në :appName.',
+    'user_invite_email_text' => 'Klikoni butonin më poshtë për të vendosur një fjalëkalim llogarie dhe për të fituar akses:',
+    'user_invite_email_action' => 'Vendos fjalëkalimin e llogarisë',
+    'user_invite_page_welcome' => 'Mirë se vini në :appName!',
+    'user_invite_page_text' => 'Për të finalizuar llogarinë tuaj dhe për të fituar akses, duhet të vendosni një fjalëkalim i cili do të përdoret për t\'u kyçur në :appName në vizitat e ardhshme.',
+    'user_invite_page_confirm_button' => 'Konfirmo fjalëkalimin',
     'user_invite_success_login' => 'Password set, you should now be able to login using your set password to access :appName!',
 
     // Multi-factor Authentication
diff --git a/lang/sq/editor.php b/lang/sq/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/sq/editor.php
+++ b/lang/sq/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index 5db25faf34b..e5052595ceb 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Надскрипт',
     'subscript' => 'Субкрипт',
     'text_color' => 'Боја текста',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Боја текста',
     'remove_color' => 'Уклоните боју',
     'background_color' => 'Боја позадине',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index facf933ade6..86921916589 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/sv/editor.php b/lang/sv/editor.php
index a1e175ade04..c2485817dee 100644
--- a/lang/sv/editor.php
+++ b/lang/sv/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Upphöjd',
     'subscript' => 'Nedsänkt',
     'text_color' => 'Textfärg',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Anpassad färg',
     'remove_color' => 'Ta bort färg',
     'background_color' => 'Bakgrundsfärg',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 06dbecf7ea7..adb497c2afb 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Infoga teckning',
     'pages_md_show_preview' => 'Visa förhandsgranskning',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Osparad ritning hittades',
     'pages_drawing_unsaved_confirm' => 'Osparade ritningsdata hittades från ett tidigare misslyckat sparförsök. Vill du återställa och fortsätta redigera den osparade ritningen?',
     'pages_not_in_chapter' => 'Sidan ligger inte i något kapitel',
diff --git a/lang/tk/editor.php b/lang/tk/editor.php
index 752c6f3f702..0d250e9a7bd 100644
--- a/lang/tk/editor.php
+++ b/lang/tk/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Text color',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Custom color',
     'remove_color' => 'Remove color',
     'background_color' => 'Background color',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index 561022ad6b6..ef625a3d261 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Insert Drawing',
     'pages_md_show_preview' => 'Show preview',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Page is not in a chapter',
diff --git a/lang/tr/editor.php b/lang/tr/editor.php
index 6bb1d5db861..c020c82fddf 100644
--- a/lang/tr/editor.php
+++ b/lang/tr/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Üst simge',
     'subscript' => 'Alt simge',
     'text_color' => 'Metin rengi',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Özel renk',
     'remove_color' => 'Rengi kaldır',
     'background_color' => 'Arka plan rengi',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index 02eda9823eb..a9c6eebd8a0 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Çizim Ekle',
     'pages_md_show_preview' => 'Önizlemeyi göster',
     'pages_md_sync_scroll' => 'Sync preview scroll',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Unsaved Drawing Found',
     'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
     'pages_not_in_chapter' => 'Bu sayfa, bir bölüme ait değil',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index f887b32031a..6dbeb509bc4 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Верхній індекс',
     'subscript' => 'Нижній індекс',
     'text_color' => 'Колір тексту',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Власний колір',
     'remove_color' => 'Видалити колір',
     'background_color' => 'Колір фону',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index ea74e882308..a72fac1a434 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Вставити малюнок',
     'pages_md_show_preview' => 'Показати попередній перегляд',
     'pages_md_sync_scroll' => 'Синхронізація прокручування попереднього перегляду',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Знайдено незбережену чернетку',
     'pages_drawing_unsaved_confirm' => 'Незбережені чернетки були знайдені з попередньої спроби зберегти звіт. Хочете відновити і продовжити редагування цієї чернетки?',
     'pages_not_in_chapter' => 'Сторінка не знаходиться в розділі',
diff --git a/lang/uz/editor.php b/lang/uz/editor.php
index 905855b4c44..a7f91d76916 100644
--- a/lang/uz/editor.php
+++ b/lang/uz/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Yuqori yozuv',
     'subscript' => 'Subscript',
     'text_color' => 'Matn rangi',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Maxsus rang',
     'remove_color' => 'Rangni olib tashlash',
     'background_color' => 'Fon rangi',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index 7edd8449f8d..7c88e346c9d 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Chizma kiritish',
     'pages_md_show_preview' => 'Ko‘rish',
     'pages_md_sync_scroll' => 'Sinxronizatsiyani oldindan ko\'rish aylantirish',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => 'Saqlanmagan chizma topildi',
     'pages_drawing_unsaved_confirm' => 'Saqlanmagan chizma maʼlumotlari avvalgi muvaffaqiyatsiz chizmani saqlash urinishidan topildi. Ushbu saqlanmagan chizmani qayta tiklash va tahrirlashni davom ettirmoqchimisiz?',
     'pages_not_in_chapter' => 'Sahifa bir bobda emas',
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index ff089f67a64..d76a70815d7 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -48,6 +48,7 @@
     'superscript' => 'Chỉ số trên',
     'subscript' => 'Chỉ số dưới',
     'text_color' => 'Màu chữ',
+    'highlight_color' => 'Highlight color',
     'custom_color' => 'Màu tùy chỉnh',
     'remove_color' => 'Xóa màu',
     'background_color' => 'Màu nền',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index c08fd01ddd8..6d740f1bc15 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => 'Chèn bản vẽ',
     'pages_md_show_preview' => 'Hiển thị bản xem trước',
     'pages_md_sync_scroll' => 'Đồng bộ hóa cuộn xem trước',
+    'pages_md_plain_editor' => 'Trình soạn thảo văn bản thuần túy',
     'pages_drawing_unsaved' => 'Tìm thấy bản vẽ chưa lưu',
     'pages_drawing_unsaved_confirm' => 'Dữ liệu bản vẽ chưa lưu được tìm thấy từ lần lưu bản vẽ không thành công trước đó. Bạn có muốn khôi phục và tiếp tục chỉnh sửa bản vẽ chưa lưu này không?',
     'pages_not_in_chapter' => 'Trang không nằm trong một chương',
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index 59a70f78e56..dde4bdf7db0 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -30,8 +30,8 @@
     'create' => '创建',
     'update' => '更新',
     'edit' => '编辑',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => '存档',
+    'unarchive' => '取消存档',
     'sort' => '排序',
     'move' => '移动',
     'copy' => '复制',
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index 8eb335ea2f6..6dbca56e313 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -48,6 +48,7 @@
     'superscript' => '上标',
     'subscript' => '下标',
     'text_color' => '文本颜色',
+    'highlight_color' => 'Highlight color',
     'custom_color' => '自定义颜色',
     'remove_color' => '移除颜色',
     'background_color' => '背景色',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index 5b67ee0c451..d60e01e0b7d 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -168,7 +168,7 @@
     'books_sort' => '排序图书内容',
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => '自动排序选项',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_active' => '自动排序已激活：::sortName',
     'books_sort_named' => '排序图书「:bookName」',
     'books_sort_name' => '按名称排序',
     'books_sort_created' => '创建时间排序',
@@ -248,7 +248,7 @@
     'pages_edit_switch_to_markdown_stable' => '（保留内容）',
     'pages_edit_switch_to_wysiwyg' => '切换到所见即所得编辑器',
     'pages_edit_switch_to_new_wysiwyg' => '切换到新的所见即所得',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '（正在Beta测试中）',
     'pages_edit_set_changelog' => '更新说明',
     'pages_edit_enter_changelog_desc' => '输入对您所做更改的简要说明',
     'pages_edit_enter_changelog' => '输入更新说明',
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => '插入图表',
     'pages_md_show_preview' => '显示预览',
     'pages_md_sync_scroll' => '同步预览滚动',
+    'pages_md_plain_editor' => '纯文本编辑器',
     'pages_drawing_unsaved' => '找到未保存的绘图',
     'pages_drawing_unsaved_confirm' => '从之前保存失败的绘图中发现了可恢复的数据。您想恢复并继续编辑这个未保存的绘图吗？',
     'pages_not_in_chapter' => '本页面不在某章节中',
@@ -395,8 +396,8 @@
     'comment_none' => '没有要显示的评论',
     'comment_placeholder' => '在这里评论',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_archived_count' => ':count 条评论已存档',
+    'comment_archived_threads' => '已存档的贴子',
     'comment_save' => '保存评论',
     'comment_new' => '新评论',
     'comment_created' => '评论于 :createDiff',
@@ -405,14 +406,14 @@
     'comment_deleted_success' => '评论已删除',
     'comment_created_success' => '评论已添加',
     'comment_updated_success' => '评论已更新',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_archive_success' => '评论已存档',
+    'comment_unarchive_success' => '评论已取消存档',
     'comment_view' => '查看评论',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_jump_to_thread' => '跳转到贴子',
     'comment_delete_confirm' => '您确定要删除这条评论？',
     'comment_in_reply_to' => '回复 :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => '参考',
+    'comment_reference_outdated' => '（已过时）',
     'comment_editor_explain' => '这里是此页面上留下的评论。查看已保存的页面时可以添加和管理评论。',
 
     // Revision
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 30388c3f4a0..0c64ac8357a 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -30,7 +30,7 @@
     'create' => '建立',
     'update' => '更新',
     'edit' => '編輯',
-    'archive' => 'Archive',
+    'archive' => '歸檔',
     'unarchive' => 'Un-Archive',
     'sort' => '排序',
     'move' => '移動',
diff --git a/lang/zh_TW/editor.php b/lang/zh_TW/editor.php
index 9319e64a437..93c8d571d2d 100644
--- a/lang/zh_TW/editor.php
+++ b/lang/zh_TW/editor.php
@@ -48,6 +48,7 @@
     'superscript' => '上標',
     'subscript' => '下標',
     'text_color' => '文本顏色',
+    'highlight_color' => 'Highlight color',
     'custom_color' => '自訂顏色',
     'remove_color' => '移除颜色',
     'background_color' => '背景顏色',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index fccf0ef592f..21ff15124de 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -268,6 +268,7 @@
     'pages_md_insert_drawing' => '插入繪圖',
     'pages_md_show_preview' => '顯示預覽',
     'pages_md_sync_scroll' => '預覽頁面同步捲動',
+    'pages_md_plain_editor' => 'Plaintext editor',
     'pages_drawing_unsaved' => '偵測到未儲存的繪圖',
     'pages_drawing_unsaved_confirm' => '從之前保存失敗的繪圖中發現了可恢復的數據。您想恢復並繼續編輯這個未保存的繪圖嗎？',
     'pages_not_in_chapter' => '頁面不在章節中',

From a961552c23101bcf260aaf930a8362277852f67b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 5 Aug 2025 13:39:30 +0100
Subject: [PATCH 622/666] Commands: Updated create admin comment to accept
 extra flags

Added flags to target changes to the first default admin user, and to
generate a password.
This is related to #4575.
---
 app/Console/Commands/CreateAdminCommand.php | 93 ++++++++++++++++-----
 app/Users/UserRepo.php                      | 19 ++++-
 2 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/app/Console/Commands/CreateAdminCommand.php b/app/Console/Commands/CreateAdminCommand.php
index 82b6e50aa52..ce619e05d1a 100644
--- a/app/Console/Commands/CreateAdminCommand.php
+++ b/app/Console/Commands/CreateAdminCommand.php
@@ -21,7 +21,9 @@ class CreateAdminCommand extends Command
                             {--email= : The email address for the new admin user}
                             {--name= : The name of the new admin user}
                             {--password= : The password to assign to the new admin user}
-                            {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}';
+                            {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}
+                            {--generate-password : Generate a random password for the new admin user}
+                            {--first-admin : Indicate if this should set/update the details of the initial admin user}';
 
     /**
      * The console command description.
@@ -35,23 +37,9 @@ class CreateAdminCommand extends Command
      */
     public function handle(UserRepo $userRepo): int
     {
-        $details = $this->snakeCaseOptions();
-
-        if (empty($details['email'])) {
-            $details['email'] = $this->ask('Please specify an email address for the new admin user');
-        }
-
-        if (empty($details['name'])) {
-            $details['name'] = $this->ask('Please specify a name for the new admin user');
-        }
-
-        if (empty($details['password'])) {
-            if (empty($details['external_auth_id'])) {
-                $details['password'] = $this->ask('Please specify a password for the new admin user (8 characters min)');
-            } else {
-                $details['password'] = Str::random(32);
-            }
-        }
+        $firstAdminOnly = $this->option('first-admin');
+        $shouldGeneratePassword = $this->option('generate-password');
+        $details = $this->gatherDetails($shouldGeneratePassword);
 
         $validator = Validator::make($details, [
             'email'            => ['required', 'email', 'min:5', new Unique('users', 'email')],
@@ -68,16 +56,81 @@ public function handle(UserRepo $userRepo): int
             return 1;
         }
 
+        $adminRole = Role::getSystemRole('admin');
+
+        if ($firstAdminOnly) {
+            $handled = $this->handleFirstAdminIfExists($userRepo, $details, $shouldGeneratePassword, $adminRole);
+            if ($handled) {
+                return 0;
+            }
+        }
+
         $user = $userRepo->createWithoutActivity($validator->validated());
-        $user->attachRole(Role::getSystemRole('admin'));
+        $user->attachRole($adminRole);
         $user->email_confirmed = true;
         $user->save();
 
-        $this->info("Admin account with email \"{$user->email}\" successfully created!");
+        if ($shouldGeneratePassword) {
+            $this->line($details['password']);
+        } else {
+            $this->info("Admin account with email \"{$user->email}\" successfully created!");
+        }
 
         return 0;
     }
 
+    /**
+     * Handle updates to the first admin if exists.
+     * Returns true if the action has been handled (user updated or already a non-default admin user) otherwise
+     * returns false if no action has been taken, and we therefore need to proceed with a normal account creation.
+     */
+    protected function handleFirstAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): bool
+    {
+        $defaultAdmin = $userRepo->getByEmail('admin@admin.com');
+        if ($defaultAdmin && $defaultAdmin->hasSystemRole('admin')) {
+            $userRepo->updateWithoutActivity($defaultAdmin, $data, true);
+            if ($generatePassword) {
+                $this->line($data['password']);
+            } else {
+                $this->info("The default admin user has been updated with the provided details!");
+            }
+
+            return true;
+        } else if ($adminRole->users()->count() > 0) {
+            $this->warn('Non-default admin user already exists. Skipping creation of new admin user.');
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function gatherDetails(bool $generatePassword): array
+    {
+        $details = $this->snakeCaseOptions();
+
+        if (empty($details['email'])) {
+            $details['email'] = $this->ask('Please specify an email address for the new admin user');
+        }
+
+        if (empty($details['name'])) {
+            $details['name'] = $this->ask('Please specify a name for the new admin user');
+        }
+
+        if (empty($details['password'])) {
+            if (empty($details['external_auth_id'])) {
+                if ($generatePassword) {
+                    $details['password'] = Str::random(32);
+                } else {
+                    $details['password'] = $this->ask('Please specify a password for the new admin user (8 characters min)');
+                }
+            } else {
+                $details['password'] = Str::random(32);
+            }
+        }
+
+        return $details;
+    }
+
     protected function snakeCaseOptions(): array
     {
         $returnOpts = [];
diff --git a/app/Users/UserRepo.php b/app/Users/UserRepo.php
index 5c8ace8faca..d24f7002e71 100644
--- a/app/Users/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -100,13 +100,13 @@ public function create(array $data, bool $sendInvite = false): User
     }
 
     /**
-     * Update the given user with the given data.
+     * Update the given user with the given data, but do not create an activity.
      *
      * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
      *
      * @throws UserUpdateException
      */
-    public function update(User $user, array $data, bool $manageUsersAllowed): User
+    public function updateWithoutActivity(User $user, array $data, bool $manageUsersAllowed): User
     {
         if (!empty($data['name'])) {
             $user->name = $data['name'];
@@ -134,6 +134,21 @@ public function update(User $user, array $data, bool $manageUsersAllowed): User
         }
 
         $user->save();
+
+        return $user;
+    }
+
+    /**
+     * Update the given user with the given data.
+     *
+     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
+     *
+     * @throws UserUpdateException
+     */
+    public function update(User $user, array $data, bool $manageUsersAllowed): User
+    {
+        $user = $this->updateWithoutActivity($user, $data, $manageUsersAllowed);
+
         Activity::add(ActivityType::USER_UPDATE, $user);
 
         return $user;

From 2eefbd21c1cdb6a3b32529fd6db10f9bbfd4b9da Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 5 Aug 2025 16:43:06 +0100
Subject: [PATCH 623/666] Commands: Added testing for initial admin changes

- Also changed first-admin to initial.
- Updated initial handling to not require email/name to be passed, using
  defaults instead.
- Adds missing existing email use check.
---
 app/Console/Commands/CreateAdminCommand.php |  53 ++++--
 tests/Commands/CreateAdminCommandTest.php   | 185 +++++++++++++++++++-
 2 files changed, 212 insertions(+), 26 deletions(-)

diff --git a/app/Console/Commands/CreateAdminCommand.php b/app/Console/Commands/CreateAdminCommand.php
index ce619e05d1a..520f0822a66 100644
--- a/app/Console/Commands/CreateAdminCommand.php
+++ b/app/Console/Commands/CreateAdminCommand.php
@@ -8,7 +8,6 @@
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Password;
-use Illuminate\Validation\Rules\Unique;
 
 class CreateAdminCommand extends Command
 {
@@ -23,7 +22,7 @@ class CreateAdminCommand extends Command
                             {--password= : The password to assign to the new admin user}
                             {--external-auth-id= : The external authentication system id for the new admin user (SAML2/LDAP/OIDC)}
                             {--generate-password : Generate a random password for the new admin user}
-                            {--first-admin : Indicate if this should set/update the details of the initial admin user}';
+                            {--initial : Indicate if this should set/update the details of the initial admin user}';
 
     /**
      * The console command description.
@@ -37,12 +36,12 @@ class CreateAdminCommand extends Command
      */
     public function handle(UserRepo $userRepo): int
     {
-        $firstAdminOnly = $this->option('first-admin');
+        $initialAdminOnly = $this->option('initial');
         $shouldGeneratePassword = $this->option('generate-password');
-        $details = $this->gatherDetails($shouldGeneratePassword);
+        $details = $this->gatherDetails($shouldGeneratePassword, $initialAdminOnly);
 
         $validator = Validator::make($details, [
-            'email'            => ['required', 'email', 'min:5', new Unique('users', 'email')],
+            'email'            => ['required', 'email', 'min:5'],
             'name'             => ['required', 'min:2'],
             'password'         => ['required_without:external_auth_id', Password::default()],
             'external_auth_id' => ['required_without:password'],
@@ -58,13 +57,20 @@ public function handle(UserRepo $userRepo): int
 
         $adminRole = Role::getSystemRole('admin');
 
-        if ($firstAdminOnly) {
-            $handled = $this->handleFirstAdminIfExists($userRepo, $details, $shouldGeneratePassword, $adminRole);
-            if ($handled) {
-                return 0;
+        if ($initialAdminOnly) {
+            $handled = $this->handleInitialAdminIfExists($userRepo, $details, $shouldGeneratePassword, $adminRole);
+            if ($handled !== null) {
+                return $handled ? 0 : 1;
             }
         }
 
+        $emailUsed = $userRepo->getByEmail($details['email']) !== null;
+        if ($emailUsed) {
+            $this->error("Could not create admin account.");
+            $this->error("An account with the email address \"{$details['email']}\" already exists.");
+            return 1;
+        }
+
         $user = $userRepo->createWithoutActivity($validator->validated());
         $user->attachRole($adminRole);
         $user->email_confirmed = true;
@@ -80,14 +86,19 @@ public function handle(UserRepo $userRepo): int
     }
 
     /**
-     * Handle updates to the first admin if exists.
-     * Returns true if the action has been handled (user updated or already a non-default admin user) otherwise
-     * returns false if no action has been taken, and we therefore need to proceed with a normal account creation.
+     * Handle updates to the original admin account if it exists.
+     * Returns true if it's been successfully handled, false if unsuccessful, or null if not handled.
      */
-    protected function handleFirstAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): bool
+    protected function handleInitialAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): bool|null
     {
         $defaultAdmin = $userRepo->getByEmail('admin@admin.com');
         if ($defaultAdmin && $defaultAdmin->hasSystemRole('admin')) {
+            if ($defaultAdmin->email !== $data['email'] && $userRepo->getByEmail($data['email']) !== null) {
+                $this->error("Could not create admin account.");
+                $this->error("An account with the email address \"{$data['email']}\" already exists.");
+                return false;
+            }
+
             $userRepo->updateWithoutActivity($defaultAdmin, $data, true);
             if ($generatePassword) {
                 $this->line($data['password']);
@@ -101,19 +112,27 @@ protected function handleFirstAdminIfExists(UserRepo $userRepo, array $data, boo
             return true;
         }
 
-        return false;
+        return null;
     }
 
-    protected function gatherDetails(bool $generatePassword): array
+    protected function gatherDetails(bool $generatePassword, bool $initialAdmin): array
     {
         $details = $this->snakeCaseOptions();
 
         if (empty($details['email'])) {
-            $details['email'] = $this->ask('Please specify an email address for the new admin user');
+            if ($initialAdmin) {
+                $details['email'] = 'admin@example.com';
+            } else {
+                $details['email'] = $this->ask('Please specify an email address for the new admin user');
+            }
         }
 
         if (empty($details['name'])) {
-            $details['name'] = $this->ask('Please specify a name for the new admin user');
+            if ($initialAdmin) {
+                $details['name'] = 'Admin';
+            } else {
+                $details['name'] = $this->ask('Please specify a name for the new admin user');
+            }
         }
 
         if (empty($details['password'])) {
diff --git a/tests/Commands/CreateAdminCommandTest.php b/tests/Commands/CreateAdminCommandTest.php
index 95a39c497e4..fa1329ad322 100644
--- a/tests/Commands/CreateAdminCommandTest.php
+++ b/tests/Commands/CreateAdminCommandTest.php
@@ -2,8 +2,11 @@
 
 namespace Tests\Commands;
 
+use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
 
 class CreateAdminCommandTest extends TestCase
@@ -11,14 +14,14 @@ class CreateAdminCommandTest extends TestCase
     public function test_standard_command_usage()
     {
         $this->artisan('bookstack:create-admin', [
-            '--email'    => 'admintest@example.com',
-            '--name'     => 'Admin Test',
+            '--email' => 'admintest@example.com',
+            '--name' => 'Admin Test',
             '--password' => 'testing-4',
         ])->assertExitCode(0);
 
         $this->assertDatabaseHas('users', [
             'email' => 'admintest@example.com',
-            'name'  => 'Admin Test',
+            'name' => 'Admin Test',
         ]);
 
         /** @var User $user */
@@ -30,14 +33,14 @@ public function test_standard_command_usage()
     public function test_providing_external_auth_id()
     {
         $this->artisan('bookstack:create-admin', [
-            '--email'            => 'admintest@example.com',
-            '--name'             => 'Admin Test',
+            '--email' => 'admintest@example.com',
+            '--name' => 'Admin Test',
             '--external-auth-id' => 'xX_admin_Xx',
         ])->assertExitCode(0);
 
         $this->assertDatabaseHas('users', [
-            'email'            => 'admintest@example.com',
-            'name'             => 'Admin Test',
+            'email' => 'admintest@example.com',
+            'name' => 'Admin Test',
             'external_auth_id' => 'xX_admin_Xx',
         ]);
 
@@ -50,14 +53,178 @@ public function test_password_required_if_external_auth_id_not_given()
     {
         $this->artisan('bookstack:create-admin', [
             '--email' => 'admintest@example.com',
-            '--name'  => 'Admin Test',
+            '--name' => 'Admin Test',
         ])->expectsQuestion('Please specify a password for the new admin user (8 characters min)', 'hunter2000')
             ->assertExitCode(0);
 
         $this->assertDatabaseHas('users', [
             'email' => 'admintest@example.com',
-            'name'  => 'Admin Test',
+            'name' => 'Admin Test',
         ]);
         $this->assertTrue(Auth::attempt(['email' => 'admintest@example.com', 'password' => 'hunter2000']));
     }
+
+    public function test_generate_password_option()
+    {
+        $this->withoutMockingConsoleOutput()
+            ->artisan('bookstack:create-admin', [
+                '--email' => 'admintest@example.com',
+                '--name' => 'Admin Test',
+                '--generate-password' => true,
+            ]);
+
+        $output = trim(Artisan::output());
+        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9]{32}$/', $output);
+
+        $user = User::query()->where('email', '=', 'admintest@example.com')->first();
+        $this->assertTrue(Hash::check($output, $user->password));
+    }
+
+    public function test_initial_option_updates_default_admin()
+    {
+        $defaultAdmin = User::query()->where('email', '=', 'admin@admin.com')->first();
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'Admin Test',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput('The default admin user has been updated with the provided details!')
+            ->assertExitCode(0);
+
+        $defaultAdmin->refresh();
+
+        $this->assertEquals('firstadmin@example.com', $defaultAdmin->email);
+    }
+
+    public function test_initial_option_does_not_update_if_only_non_default_admin_exists()
+    {
+        $defaultAdmin = User::query()->where('email', '=', 'admin@admin.com')->first();
+        $defaultAdmin->email = 'testadmin@example.com';
+        $defaultAdmin->save();
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'Admin Test',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput('Non-default admin user already exists. Skipping creation of new admin user.')
+            ->assertExitCode(0);
+
+        $defaultAdmin->refresh();
+
+        $this->assertEquals('testadmin@example.com', $defaultAdmin->email);
+    }
+
+    public function test_initial_option_updates_creates_new_admin_if_none_exists()
+    {
+        $adminRole = Role::getSystemRole('admin');
+        $adminRole->users()->delete();
+        $this->assertEquals(0, $adminRole->users()->count());
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'My initial admin',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput("Admin account with email \"firstadmin@example.com\" successfully created!")
+            ->assertExitCode(0);
+
+        $this->assertEquals(1, $adminRole->users()->count());
+        $this->assertDatabaseHas('users', [
+            'email' => 'firstadmin@example.com',
+            'name' => 'My initial admin',
+        ]);
+    }
+
+    public function test_initial_rerun_does_not_error_but_skips()
+    {
+        $adminRole = Role::getSystemRole('admin');
+        $adminRole->users()->delete();
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'My initial admin',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput("Admin account with email \"firstadmin@example.com\" successfully created!")
+            ->assertExitCode(0);
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'My initial admin',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput("Non-default admin user already exists. Skipping creation of new admin user.")
+            ->assertExitCode(0);
+    }
+
+    public function test_initial_option_creation_errors_if_email_already_exists()
+    {
+        $adminRole = Role::getSystemRole('admin');
+        $adminRole->users()->delete();
+        $editor = $this->users->editor();
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => $editor->email,
+            '--name' => 'My initial admin',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput("Could not create admin account.")
+            ->expectsOutput("An account with the email address \"{$editor->email}\" already exists.")
+            ->assertExitCode(1);
+    }
+
+    public function test_initial_option_updating_errors_if_email_already_exists()
+    {
+        $editor = $this->users->editor();
+        $defaultAdmin = User::query()->where('email', '=', 'admin@admin.com')->first();
+        $this->assertNotNull($defaultAdmin);
+
+        $this->artisan('bookstack:create-admin', [
+            '--email' => $editor->email,
+            '--name' => 'My initial admin',
+            '--password' => 'testing-7',
+            '--initial' => true,
+        ])->expectsOutput("Could not create admin account.")
+            ->expectsOutput("An account with the email address \"{$editor->email}\" already exists.")
+            ->assertExitCode(1);
+    }
+
+    public function test_initial_option_does_not_require_name_or_email_to_be_passed()
+    {
+        $adminRole = Role::getSystemRole('admin');
+        $adminRole->users()->delete();
+        $this->assertEquals(0, $adminRole->users()->count());
+
+        $this->artisan('bookstack:create-admin', [
+            '--generate-password' => true,
+            '--initial' => true,
+        ])->assertExitCode(0);
+
+        $this->assertEquals(1, $adminRole->users()->count());
+        $this->assertDatabaseHas('users', [
+            'email' => 'admin@example.com',
+            'name' => 'Admin',
+        ]);
+    }
+
+    public function test_initial_option_updating_existing_user_with_generate_password_only_outputs_password()
+    {
+        $defaultAdmin = User::query()->where('email', '=', 'admin@admin.com')->first();
+
+        $this->withoutMockingConsoleOutput()
+            ->artisan('bookstack:create-admin', [
+            '--email' => 'firstadmin@example.com',
+            '--name' => 'Admin Test',
+            '--generate-password' => true,
+            '--initial' => true,
+        ]);
+
+        $output = Artisan::output();
+        $this->assertMatchesRegularExpression('/^[a-zA-Z0-9]{32}$/', $output);
+
+        $defaultAdmin->refresh();
+        $this->assertEquals('firstadmin@example.com', $defaultAdmin->email);
+    }
 }

From 7bc0d54af18e494ec6a8cd416bdcdd536a01a80d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 5 Aug 2025 22:00:55 +0100
Subject: [PATCH 624/666] Readme: Swapped codeclimate reference for custom
 phpmetrics

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b5470af5723..d5c1a60100d 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@
 [![Crowdin](https://badges.crowdin.net/bookstack/localized.svg)](https://crowdin.com/project/bookstack)
 [![Build Status](https://github.com/BookStackApp/BookStack/workflows/test-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
 [![Lint Status](https://github.com/BookStackApp/BookStack/workflows/lint-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
-[![Maintainability](https://api.codeclimate.com/v1/badges/5551731994dd22fa1f4f/maintainability)](https://codeclimate.com/github/BookStackApp/BookStack/maintainability)
+[![php-metrics](https://img.shields.io/static/v1?label=Metrics&message=php&color=4F5B93)](https://source.bookstackapp.com/php-stats/index.html)
 <br>
 [![Alternate Source](https://img.shields.io/static/v1?label=Alt+Source&message=Git&color=ef391a&logo=git)](https://source.bookstackapp.com/)
 [![Repo Stats](https://img.shields.io/static/v1?label=GitHub+project&message=stats&color=f27e3f)](https://gh-stats.bookstackapp.com/)

From f36e6fb929d50a2713d1b01f064f2f087188bb69 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 7 Aug 2025 13:16:49 +0100
Subject: [PATCH 625/666] Commands: Updated create admin skip return

Return status for skipped --initial creation will now return 2, so that
it can be identified seperate from a creation and from an error.
---
 app/Console/Commands/CreateAdminCommand.php | 12 ++++++------
 tests/Commands/CreateAdminCommandTest.php   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/CreateAdminCommand.php b/app/Console/Commands/CreateAdminCommand.php
index 520f0822a66..bf72553f72a 100644
--- a/app/Console/Commands/CreateAdminCommand.php
+++ b/app/Console/Commands/CreateAdminCommand.php
@@ -60,7 +60,7 @@ public function handle(UserRepo $userRepo): int
         if ($initialAdminOnly) {
             $handled = $this->handleInitialAdminIfExists($userRepo, $details, $shouldGeneratePassword, $adminRole);
             if ($handled !== null) {
-                return $handled ? 0 : 1;
+                return $handled;
             }
         }
 
@@ -87,16 +87,16 @@ public function handle(UserRepo $userRepo): int
 
     /**
      * Handle updates to the original admin account if it exists.
-     * Returns true if it's been successfully handled, false if unsuccessful, or null if not handled.
+     * Returns an int return status if handled, otherwise returns null if not handled (new user to be created).
      */
-    protected function handleInitialAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): bool|null
+    protected function handleInitialAdminIfExists(UserRepo $userRepo, array $data, bool $generatePassword, Role $adminRole): int|null
     {
         $defaultAdmin = $userRepo->getByEmail('admin@admin.com');
         if ($defaultAdmin && $defaultAdmin->hasSystemRole('admin')) {
             if ($defaultAdmin->email !== $data['email'] && $userRepo->getByEmail($data['email']) !== null) {
                 $this->error("Could not create admin account.");
                 $this->error("An account with the email address \"{$data['email']}\" already exists.");
-                return false;
+                return 1;
             }
 
             $userRepo->updateWithoutActivity($defaultAdmin, $data, true);
@@ -106,10 +106,10 @@ protected function handleInitialAdminIfExists(UserRepo $userRepo, array $data, b
                 $this->info("The default admin user has been updated with the provided details!");
             }
 
-            return true;
+            return 0;
         } else if ($adminRole->users()->count() > 0) {
             $this->warn('Non-default admin user already exists. Skipping creation of new admin user.');
-            return true;
+            return 2;
         }
 
         return null;
diff --git a/tests/Commands/CreateAdminCommandTest.php b/tests/Commands/CreateAdminCommandTest.php
index fa1329ad322..f389dd94235 100644
--- a/tests/Commands/CreateAdminCommandTest.php
+++ b/tests/Commands/CreateAdminCommandTest.php
@@ -109,7 +109,7 @@ public function test_initial_option_does_not_update_if_only_non_default_admin_ex
             '--password' => 'testing-7',
             '--initial' => true,
         ])->expectsOutput('Non-default admin user already exists. Skipping creation of new admin user.')
-            ->assertExitCode(0);
+            ->assertExitCode(2);
 
         $defaultAdmin->refresh();
 
@@ -156,7 +156,7 @@ public function test_initial_rerun_does_not_error_but_skips()
             '--password' => 'testing-7',
             '--initial' => true,
         ])->expectsOutput("Non-default admin user already exists. Skipping creation of new admin user.")
-            ->assertExitCode(0);
+            ->assertExitCode(2);
     }
 
     public function test_initial_option_creation_errors_if_email_already_exists()

From c66f3b2a3754db0543e996e533554772b6a8b50a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 7 Aug 2025 14:32:20 +0100
Subject: [PATCH 626/666] A11y: Improved tagging of profile menu

- Swapped toggle out to actual button.
- Ensured menu items have proper menu item role.
- Added extra roles/labels where is makes sense.
---
 resources/sass/_header.scss                   |  1 +
 .../views/common/dark-mode-toggle.blade.php   |  4 +--
 .../layouts/parts/header-user-menu.blade.php  | 32 ++++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss
index 3ec7275a480..a23f92d3faf 100644
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -65,6 +65,7 @@ header {
     margin: 0 (-(vars.$s));
     border-radius: 3px;
     gap: vars.$xs;
+    color: #FFF;
     > span {
       padding-inline-start: vars.$xs;
       display: inline-block;
diff --git a/resources/views/common/dark-mode-toggle.blade.php b/resources/views/common/dark-mode-toggle.blade.php
index 531755109ad..38493251902 100644
--- a/resources/views/common/dark-mode-toggle.blade.php
+++ b/resources/views/common/dark-mode-toggle.blade.php
@@ -3,8 +3,8 @@
     {{ method_field('patch') }}
     <input type="hidden" name="_return" value="{{ url()->current() }}">
     @if(setting()->getForCurrentUser('dark-mode-enabled'))
-        <button class="{{ $classes ?? '' }}"><span>@icon('light-mode')</span><span>{{ trans('common.light_mode') }}</span></button>
+        <button class="{{ $classes ?? '' }}" role="{{ $butonRole ?? '' }}"><span>@icon('light-mode')</span><span>{{ trans('common.light_mode') }}</span></button>
     @else
-        <button class="{{ $classes ?? '' }}"><span>@icon('dark-mode')</span><span>{{ trans('common.dark_mode') }}</span></button>
+        <button class="{{ $classes ?? '' }}" role="{{ $butonRole ?? '' }}"><span>@icon('dark-mode')</span><span>{{ trans('common.dark_mode') }}</span></button>
     @endif
 </form>
\ No newline at end of file
diff --git a/resources/views/layouts/parts/header-user-menu.blade.php b/resources/views/layouts/parts/header-user-menu.blade.php
index db4820a4d8a..c252deb8218 100644
--- a/resources/views/layouts/parts/header-user-menu.blade.php
+++ b/resources/views/layouts/parts/header-user-menu.blade.php
@@ -1,33 +1,43 @@
 <div class="dropdown-container" component="dropdown" option:dropdown:bubble-escapes="true">
-    <span class="user-name py-s hide-under-l" refs="dropdown@toggle"
-          aria-haspopup="true" aria-expanded="false" aria-label="{{ trans('common.profile_menu') }}" tabindex="0">
+    <button class="user-name py-s hide-under-l" refs="dropdown@toggle"
+          aria-haspopup="menu"
+          aria-expanded="false"
+          aria-label="{{ trans('common.profile_menu') }}">
         <img class="avatar" src="{{$user->getAvatar(30)}}" alt="{{ $user->name }}">
         <span class="name">{{ $user->getShortName(9) }}</span> @icon('caret-down')
-    </span>
-    <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
+    </button>
+    <ul refs="dropdown@menu" class="dropdown-menu" role="menu" aria-label="{{ trans('common.profile_menu') }}">
         <li>
-            <a href="{{ url('/favourites') }}" data-shortcut="favourites_view" class="icon-item">
+            <a href="{{ url('/favourites') }}"
+               role="menuitem"
+               data-shortcut="favourites_view"
+               class="icon-item">
                 @icon('star')
                 <div>{{ trans('entities.my_favourites') }}</div>
             </a>
         </li>
         <li>
-            <a href="{{ $user->getProfileUrl() }}" data-shortcut="profile_view" class="icon-item">
+            <a href="{{ $user->getProfileUrl() }}"
+               role="menuitem"
+               data-shortcut="profile_view"
+               class="icon-item">
                 @icon('user')
                 <div>{{ trans('common.view_profile') }}</div>
             </a>
         </li>
         <li>
-            <a href="{{ url('/my-account') }}" class="icon-item">
+            <a href="{{ url('/my-account') }}"
+               role="menuitem"
+               class="icon-item">
                 @icon('user-preferences')
                 <div>{{ trans('preferences.my_account') }}</div>
             </a>
         </li>
-        <li><hr></li>
+        <li role="presentation"><hr></li>
         <li>
-            @include('common.dark-mode-toggle', ['classes' => 'icon-item'])
+            @include('common.dark-mode-toggle', ['classes' => 'icon-item', 'buttonRole' => 'menuitem'])
         </li>
-        <li><hr></li>
+        <li role="presentation"><hr></li>
         <li>
             @php
                 $logoutPath = match (config('auth.method')) {
@@ -38,7 +48,7 @@
             @endphp
             <form action="{{ url($logoutPath) }}" method="post">
                 {{ csrf_field() }}
-                <button class="icon-item" data-shortcut="logout">
+                <button class="icon-item" role="menuitem" data-shortcut="logout">
                     @icon('logout')
                     <div>{{ trans('auth.logout') }}</div>
                 </button>

From 0bc9ddd780754d4e562da2d8bcc4b19440550598 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 7 Aug 2025 16:37:18 +0100
Subject: [PATCH 627/666] A11y: Updated other dropdown menus with correct
 tagging

Made some form improvements at the same time.
---
 lang/en/entities.php                          |  4 ++++
 resources/sass/_components.scss               |  5 ++++-
 resources/sass/styles.scss                    | 11 ++++++++--
 resources/views/common/sort.blade.php         | 10 ++++++---
 .../entities/breadcrumb-listing.blade.php     | 15 +++++++------
 .../views/entities/export-menu.blade.php      | 19 ++++++++---------
 .../views/entities/list-item-basic.blade.php  |  5 ++++-
 .../views/entities/watch-controls.blade.php   | 14 +++++++++----
 .../views/pages/parts/code-editor.blade.php   |  6 +++---
 .../pages/parts/editor-toolbar.blade.php      | 21 ++++++++++---------
 .../parts/recycle-bin-list-item.blade.php     | 12 +++++++----
 .../views/settings/roles/index.blade.php      |  1 +
 resources/views/users/index.blade.php         |  1 +
 13 files changed, 80 insertions(+), 44 deletions(-)

diff --git a/lang/en/entities.php b/lang/en/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 9e96b39fbb4..8ea15de8044 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -904,8 +904,11 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   border-radius: 4px;
   line-height: normal;
   padding: vars.$xs;
+  opacity: 0.6;
+  cursor: pointer;
   &:hover {
-    border-color: #DDD;
+    opacity: 1;
+    @include mixins.lightDark(border-color, #DDD, #444);
   }
   .svg-icon {
     margin-inline-end: 0;
diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index c6642d0cad6..4bae5da66cc 100644
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -232,13 +232,15 @@ $loadingSize: 10px;
   .list-sort-label {
     font-weight: bold;
     display: inline-block;
+  }
+  .list-sort-label, .list-sort-toggle {
     @include mixins.lightDark(color, #555, #888);
   }
   .list-sort-type {
     text-align: start;
   }
-  .list-sort-type, .list-sort-dir {
-    padding: vars.$xs vars.$s;
+  .list-sort-toggle, .list-sort-dir {
+    padding: (vars.$xs + 2) vars.$s;
     cursor: pointer;
   }
   .list-sort-dir {
@@ -252,6 +254,11 @@ $loadingSize: 10px;
       transform: rotate(180deg);
     }
   }
+  .list-sort-toggle {
+    display: block;
+    width: 100%;
+    text-align: start;
+  }
 }
 
 .import-item {
diff --git a/resources/views/common/sort.blade.php b/resources/views/common/sort.blade.php
index e5336d3a255..d47351cb347 100644
--- a/resources/views/common/sort.blade.php
+++ b/resources/views/common/sort.blade.php
@@ -29,10 +29,14 @@
 
         <div class="list-sort">
             <div component="dropdown" class="list-sort-type dropdown-container">
-                <div refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" aria-label="{{ trans('common.sort_options') }}" tabindex="0">{{ $options[$selectedSort] }}</div>
-                <ul refs="dropdown@menu list-sort-control@menu" class="dropdown-menu">
+                <button refs="dropdown@toggle"
+                        aria-haspopup="true"
+                        aria-expanded="false"
+                        aria-label="{{ trans('common.sort_options') }}"
+                        class="list-sort-toggle">{{ $options[$selectedSort] }}</button>
+                <ul refs="dropdown@menu list-sort-control@menu" class="dropdown-menu" role="menu">
                     @foreach($options as $key => $label)
-                        <li @if($key === $selectedSort) class="active" @endif><a href="#" data-sort-value="{{$key}}" class="text-item">{{ $label }}</a></li>
+                        <li @if($key === $selectedSort) class="active" @endif><a href="#" data-sort-value="{{$key}}" role="menuitem" class="text-item">{{ $label }}</a></li>
                     @endforeach
                 </ul>
             </div>
diff --git a/resources/views/entities/breadcrumb-listing.blade.php b/resources/views/entities/breadcrumb-listing.blade.php
index 4f751a93f21..180e2d211cb 100644
--- a/resources/views/entities/breadcrumb-listing.blade.php
+++ b/resources/views/entities/breadcrumb-listing.blade.php
@@ -2,11 +2,14 @@
      option:dropdown-search:url="/search/entity/siblings?entity_type={{$entity->getType()}}&entity_id={{ $entity->id }}"
      option:dropdown-search:local-search-selector=".entity-list-item"
      class="dropdown-search">
-    <div class="dropdown-search-toggle-breadcrumb" refs="dropdown@toggle"
-         aria-haspopup="true" aria-expanded="false" tabindex="0">
-        <div class="separator">@icon('chevron-right')</div>
-    </div>
-    <div refs="dropdown@menu" class="dropdown-search-dropdown card" role="menu">
+    <button class="dropdown-search-toggle-breadcrumb"
+            refs="dropdown@toggle"
+            aria-haspopup="true"
+            aria-expanded="false"
+            title="{{ trans('entities.breadcrumb_siblings_for_' . $entity->getType()) }}">
+        <div role="presentation" class="separator">@icon('chevron-right')</div>
+    </button>
+    <div refs="dropdown@menu" class="dropdown-search-dropdown card">
         <div class="dropdown-search-search">
             @icon('search')
             <input refs="dropdown-search@searchInput"
@@ -18,6 +21,6 @@ class="dropdown-search">
         <div refs="dropdown-search@loading">
             @include('common.loading-icon')
         </div>
-        <div refs="dropdown-search@listContainer" class="dropdown-search-list px-m" tabindex="-1"></div>
+        <div refs="dropdown-search@listContainer" class="dropdown-search-list px-m" tabindex="-1" role="list"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/entities/export-menu.blade.php b/resources/views/entities/export-menu.blade.php
index e58c842ba42..7b5f889cab7 100644
--- a/resources/views/entities/export-menu.blade.php
+++ b/resources/views/entities/export-menu.blade.php
@@ -2,23 +2,22 @@
      class="dropdown-container"
      id="export-menu">
 
-    <div refs="dropdown@toggle"
-         class="icon-list-item"
+    <button refs="dropdown@toggle"
+         class="icon-list-item text-link"
          aria-haspopup="true"
          aria-expanded="false"
          aria-label="{{ trans('entities.export') }}"
-         data-shortcut="export"
-         tabindex="0">
+         data-shortcut="export">
         <span>@icon('export')</span>
         <span>{{ trans('entities.export') }}</span>
-    </div>
+    </button>
 
     <ul refs="dropdown@menu" class="wide dropdown-menu" role="menu">
-        <li><a href="{{ $entity->getUrl('/export/html') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_html') }}</span><span>.html</span></a></li>
-        <li><a href="{{ $entity->getUrl('/export/pdf') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_pdf') }}</span><span>.pdf</span></a></li>
-        <li><a href="{{ $entity->getUrl('/export/plaintext') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_text') }}</span><span>.txt</span></a></li>
-        <li><a href="{{ $entity->getUrl('/export/markdown') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_md') }}</span><span>.md</span></a></li>
-        <li><a href="{{ $entity->getUrl('/export/zip') }}" target="_blank" class="label-item"><span>{{ trans('entities.export_zip') }}</span><span>.zip</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/html') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_html') }}</span><span>.html</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/pdf') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_pdf') }}</span><span>.pdf</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/plaintext') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_text') }}</span><span>.txt</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/markdown') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_md') }}</span><span>.md</span></a></li>
+        <li><a href="{{ $entity->getUrl('/export/zip') }}" target="_blank" role="menuitem" class="label-item"><span>{{ trans('entities.export_zip') }}</span><span>.zip</span></a></li>
     </ul>
 
 </div>
diff --git a/resources/views/entities/list-item-basic.blade.php b/resources/views/entities/list-item-basic.blade.php
index 398c33b93f6..4c66eec3dfa 100644
--- a/resources/views/entities/list-item-basic.blade.php
+++ b/resources/views/entities/list-item-basic.blade.php
@@ -1,5 +1,8 @@
 <?php $type = $entity->getType(); ?>
-<a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}">
+<a href="{{ $entity->getUrl() }}"
+   class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item"
+   data-entity-type="{{$type}}"
+   data-entity-id="{{$entity->id}}">
     <span role="presentation" class="icon text-{{$type}}">@icon($type)</span>
     <div class="content">
             <h4 class="entity-list-item-name break-text">{{ $entity->preview_name ?? $entity->name }}</h4>
diff --git a/resources/views/entities/watch-controls.blade.php b/resources/views/entities/watch-controls.blade.php
index 4a119c272cd..81e80ed981c 100644
--- a/resources/views/entities/watch-controls.blade.php
+++ b/resources/views/entities/watch-controls.blade.php
@@ -1,6 +1,11 @@
 <div component="dropdown"
      class="dropdown-container block my-xxs">
-    <a refs="dropdown@toggle" href="#" class="entity-meta-item my-none">
+    <a refs="dropdown@toggle"
+       aria-haspopup="menu"
+       aria-expanded="false"
+       role="button"
+       href="#"
+       class="entity-meta-item my-none">
         @icon(($ignoring ? 'watch-ignore' : 'watch'))
         <span>{{ $label }}</span>
     </a>
@@ -10,10 +15,10 @@ class="dropdown-container block my-xxs">
         <input type="hidden" name="type" value="{{ $entity->getMorphClass() }}">
         <input type="hidden" name="id" value="{{ $entity->id }}">
 
-        <ul refs="dropdown@menu" class="dropdown-menu xl-limited anchor-left pb-none">
+        <ul refs="dropdown@menu" class="dropdown-menu xl-limited anchor-left pb-none" role="menu">
             @foreach(\BookStack\Activity\WatchLevels::allSuitedFor($entity) as $option => $value)
                 <li>
-                    <button name="level" value="{{ $option }}" class="icon-item">
+                    <button name="level" value="{{ $option }}" class="icon-item" role="menuitem">
                         @if($watchLevel === $option)
                             <span class="text-pos pt-m"
                                   title="{{ trans('common.status_active') }}">@icon('check-circle')</span>
@@ -32,12 +37,13 @@ class="dropdown-container block my-xxs">
                         </div>
                     </button>
                 </li>
-                <li>
+                <li role="presentation">
                     <hr class="my-none">
                 </li>
             @endforeach
             <li>
                 <a href="{{ url('/my-account/notifications') }}"
+                   role="menuitem"
                    target="_blank"
                    class="text-item text-muted text-small break-text">{{ trans('entities.watch_change_default') }}</a>
             </li>
diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index fc8852a32b8..303b3b0bee3 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -13,7 +13,7 @@ class="popup-background code-editor">
                     </button>
                     <ul refs="dropdown@menu code-editor@historyList" class="dropdown-menu"></ul>
                 </div>
-                <button class="popup-header-close" refs="popup@hide">@icon('close')</button>
+                <button class="popup-header-close" refs="popup@hide" title="{{ trans('common.close') }}">@icon('close')</button>
             </div>
 
             <div class="code-editor-body-wrap flex-container-row flex-fill">
@@ -34,8 +34,8 @@ class="popup-background code-editor">
                         @foreach($languages as $language)
                             <div class="relative">
                                 <button type="button" refs="code-editor@language-button" data-favourite="false" data-lang="{{ strtolower($language) }}">{{ $language }}</button>
-                                <button class="lang-option-favorite-toggle action-favourite" data-title="{{ trans('common.favourite') }}">@icon('star-outline')</button>
-                                <button class="lang-option-favorite-toggle action-unfavourite" data-title="{{ trans('common.unfavourite') }}">@icon('star')</button>
+                                <button class="lang-option-favorite-toggle action-favourite" title="{{ trans('common.favourite') }}">@icon('star-outline')</button>
+                                <button class="lang-option-favorite-toggle action-unfavourite" title="{{ trans('common.unfavourite') }}">@icon('star')</button>
                             </div>
                         @endforeach
                     </div>
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index 2dfbe9e6982..ceb5dd64a7e 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -14,7 +14,7 @@ class="dropdown-container  draft-display text {{ $draftsEnabled ? '' : 'hidden'
             <div class="flex-container-row items-center justify-center">
                 <button type="button"
                         refs="dropdown@toggle"
-                        aria-haspopup="true"
+                        aria-haspopup="menu"
                         aria-expanded="false"
                         title="{{ trans('entities.pages_edit_draft_options') }}"
                         class="text-link icon-list-item">
@@ -25,38 +25,38 @@ class="text-link icon-list-item">
             </div>
             <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
                 <li>
-                    <button refs="page-editor@saveDraft" type="button" class="text-pos icon-item">
+                    <button refs="page-editor@saveDraft" type="button" role="menuitem" class="text-pos icon-item">
                         @icon('save')
                         <div>{{ trans('entities.pages_edit_save_draft') }}</div>
                     </button>
                 </li>
                 @if($isDraft)
                     <li>
-                        <a href="{{ $model->getUrl('/delete') }}" class="text-neg icon-item">
+                        <a href="{{ $model->getUrl('/delete') }}" role="menuitem" class="text-neg icon-item">
                             @icon('delete')
                             {{ trans('entities.pages_edit_delete_draft') }}
                         </a>
                     </li>
                 @endif
                 <li refs="page-editor@discard-draft-wrap" {{ $isDraftRevision ? '' : 'hidden' }}>
-                    <button refs="page-editor@discard-draft" type="button" class="text-warn icon-item">
+                    <button refs="page-editor@discard-draft" type="button" role="menuitem" class="text-warn icon-item">
                         @icon('cancel')
                         <div>{{ trans('entities.pages_edit_discard_draft') }}</div>
                     </button>
                 </li>
                 <li refs="page-editor@delete-draft-wrap" {{ $isDraftRevision ? '' : 'hidden' }}>
-                    <button refs="page-editor@delete-draft" type="button" class="text-neg icon-item">
+                    <button refs="page-editor@delete-draft" type="button" role="menuitem" class="text-neg icon-item">
                         @icon('delete')
                         <div>{{ trans('entities.pages_edit_delete_draft') }}</div>
                     </button>
                 </li>
                 @if(userCan('editor-change'))
-                    <li>
+                    <li role="presentation">
                         <hr>
                     </li>
                     <li>
                         @if($editor !== \BookStack\Entities\Tools\PageEditorType::Markdown)
-                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-clean" refs="page-editor@changeEditor" class="icon-item">
+                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-clean" refs="page-editor@changeEditor" role="menuitem" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>
                                     {{ trans('entities.pages_edit_switch_to_markdown') }}
@@ -64,7 +64,7 @@ class="text-link icon-list-item">
                                     <small>{{ trans('entities.pages_edit_switch_to_markdown_clean') }}</small>
                                 </div>
                             </a>
-                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-stable" refs="page-editor@changeEditor" class="icon-item">
+                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=markdown-stable" refs="page-editor@changeEditor" role="menuitem" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>
                                     {{ trans('entities.pages_edit_switch_to_markdown') }}
@@ -74,13 +74,13 @@ class="text-link icon-list-item">
                             </a>
                         @endif
                         @if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygTinymce)
-                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg" refs="page-editor@changeEditor" class="icon-item">
+                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg" refs="page-editor@changeEditor" role="menuitem" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>{{ trans('entities.pages_edit_switch_to_wysiwyg') }}</div>
                             </a>
                         @endif
                         @if($editor !== \BookStack\Entities\Tools\PageEditorType::WysiwygLexical)
-                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg2024" refs="page-editor@changeEditor" class="icon-item">
+                            <a href="{{ $model->getUrl($isDraft ? '' : '/edit') }}?editor=wysiwyg2024" refs="page-editor@changeEditor" role="menuitem" class="icon-item">
                                 @icon('swap-horizontal')
                                 <div>
                                     {{ trans('entities.pages_edit_switch_to_new_wysiwyg') }}
@@ -112,6 +112,7 @@ class="dropdown-container">
                         id="summary-input"
                         rows="2"
                         maxlength="180"
+                        title="{{ trans('entities.pages_edit_enter_changelog') }}"
                         placeholder="{{ trans('entities.pages_edit_enter_changelog') }}"
                     ></textarea>
                     <small refs="page-editor@changelogCounter" class="text-muted mt-xs">0 / 180</small>
diff --git a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
index 8af598b1e51..b18f9cbe08c 100644
--- a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
+++ b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
@@ -38,10 +38,14 @@
     <div class="flex px-m py-xs min-width-s"><strong class="hide-over-l">{{ trans('settings.recycle_bin_deleted_at') }}:<br></strong>{{ $deletion->created_at }}</div>
     <div class="flex px-m py-xs text-m-right min-width-s">
         <div component="dropdown" class="dropdown-container">
-            <button type="button" refs="dropdown@toggle" class="button outline">{{ trans('common.actions') }}</button>
-            <ul refs="dropdown@menu" class="dropdown-menu">
-                <li><a class="text-item" href="{{ $deletion->getUrl('/restore') }}">{{ trans('settings.recycle_bin_restore') }}</a></li>
-                <li><a class="text-item" href="{{ $deletion->getUrl('/destroy') }}">{{ trans('settings.recycle_bin_permanently_delete') }}</a></li>
+            <button type="button"
+                    refs="dropdown@toggle"
+                    aria-haspopup="menu"
+                    aria-expanded="false"
+                    class="button outline">{{ trans('common.actions') }}</button>
+            <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
+                <li><a class="text-item" href="{{ $deletion->getUrl('/restore') }}" role="menuitem">{{ trans('settings.recycle_bin_restore') }}</a></li>
+                <li><a class="text-item" href="{{ $deletion->getUrl('/destroy') }}" role="menuitem">{{ trans('settings.recycle_bin_permanently_delete') }}</a></li>
             </ul>
         </div>
     </div>
diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php
index 27ee9ce3f90..3ccdd9b851c 100644
--- a/resources/views/settings/roles/index.blade.php
+++ b/resources/views/settings/roles/index.blade.php
@@ -24,6 +24,7 @@
                         <form method="get" action="{{ url("/settings/roles") }}">
                             <input type="text"
                                    name="search"
+                                   title="{{ trans('common.search') }}"
                                    placeholder="{{ trans('common.search') }}"
                                    value="{{ $listOptions->getSearch() }}">
                         </form>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 0dd607f8c7d..5d546076f98 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -22,6 +22,7 @@
                         <form method="get" action="{{ url("/settings/users") }}">
                             <input type="text"
                                    name="search"
+                                   title="{{ trans('settings.users_search') }}"
                                    placeholder="{{ trans('settings.users_search') }}"
                                    value="{{ $listOptions->getSearch() }}">
                         </form>

From f4f243585608346de614b0ec177be549e976c4bf Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 8 Aug 2025 17:43:58 +0100
Subject: [PATCH 628/666] Imports: Fixed errors causing user logout on import
 run

Fixes #5754
---
 app/Exports/Controllers/ImportController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index b938dac8e29..0d3e2414bdd 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -89,7 +89,7 @@ public function run(int $id, Request $request)
         try {
             $entity = $this->imports->runImport($import, $parent);
         } catch (ZipImportException $exception) {
-            session()->flush();
+            session()->forget(['success', 'warning']);
             $this->showErrorNotification(trans('errors.import_zip_failed_notification'));
             return redirect($import->getUrl())->with('import_errors', $exception->errors);
         }

From a6b5733ec200649aceeda666962542eb557b12d3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Aug 2025 10:12:24 +0100
Subject: [PATCH 629/666] Deps: Updated PHP packages via composer

---
 composer.lock | 335 +++++++++++++++++++++++++++++---------------------
 1 file changed, 196 insertions(+), 139 deletions(-)

diff --git a/composer.lock b/composer.lock
index c42f19156a1..b6d53faec0d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.351.7",
+            "version": "3.352.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be"
+                "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9506d7fdb3cb84f8d7b175c594db9993264814be",
-                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e226dcc96c0a1165d9c8248ec637d1006b883609",
+                "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.351.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.352.5"
             },
-            "time": "2025-07-25T18:06:34+00:00"
+            "time": "2025-08-08T18:09:38+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1597,16 +1597,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "3.11.3",
+            "version": "3.11.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17"
+                "reference": "8c49eb21a6d2572532d1bc425964264f3e496846"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/d0f097b8a3fa8fb758efc9440b513aa3833cda17",
-                "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/8c49eb21a6d2572532d1bc425964264f3e496846",
+                "reference": "8c49eb21a6d2572532d1bc425964264f3e496846",
                 "shasum": ""
             },
             "require": {
@@ -1653,7 +1653,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.11.3"
+                "source": "https://github.com/Intervention/image/tree/3.11.4"
             },
             "funding": [
                 {
@@ -1669,7 +1669,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-05-22T17:26:23+00:00"
+            "time": "2025-07-30T13:13:19+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -3285,16 +3285,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.1",
+            "version": "3.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00"
+                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
-                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
+                "reference": "76b5c07b8a9d2025ed1610e14cef1f3fd6ad2c24",
                 "shasum": ""
             },
             "require": {
@@ -3386,7 +3386,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-21T15:19:35+00:00"
+            "time": "2025-08-02T09:36:06+00:00"
         },
         {
             "name": "nette/schema",
@@ -3452,29 +3452,29 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.7",
+            "version": "v4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
+                "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
-                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
+                "url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
+                "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
                 "shasum": ""
             },
             "require": {
-                "php": "8.0 - 8.4"
+                "php": "8.0 - 8.5"
             },
             "conflict": {
                 "nette/finder": "<3",
                 "nette/schema": "<1.2.2"
             },
             "require-dev": {
-                "jetbrains/phpstorm-attributes": "dev-master",
+                "jetbrains/phpstorm-attributes": "^1.2",
                 "nette/tester": "^2.5",
-                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-nette": "^2.0@stable",
                 "tracy/tracy": "^2.9"
             },
             "suggest": {
@@ -3492,6 +3492,9 @@
                 }
             },
             "autoload": {
+                "psr-4": {
+                    "Nette\\": "src"
+                },
                 "classmap": [
                     "src/"
                 ]
@@ -3532,22 +3535,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.7"
+                "source": "https://github.com/nette/utils/tree/v4.0.8"
             },
-            "time": "2025-06-03T04:55:08+00:00"
+            "time": "2025-08-06T21:43:34+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.5.0",
+            "version": "v5.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
+                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
                 "shasum": ""
             },
             "require": {
@@ -3590,9 +3593,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
             },
-            "time": "2025-05-31T08:24:38+00:00"
+            "time": "2025-07-27T20:03:57+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -4575,16 +4578,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.9",
+            "version": "v0.12.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "1b801844becfe648985372cb4b12ad6840245ace"
+                "reference": "6e80abe6f2257121f1eb9a4c55bf29d921025b22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1b801844becfe648985372cb4b12ad6840245ace",
-                "reference": "1b801844becfe648985372cb4b12ad6840245ace",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6e80abe6f2257121f1eb9a4c55bf29d921025b22",
+                "reference": "6e80abe6f2257121f1eb9a4c55bf29d921025b22",
                 "shasum": ""
             },
             "require": {
@@ -4634,12 +4637,11 @@
             "authors": [
                 {
                     "name": "Justin Hileman",
-                    "email": "justin@justinhileman.info",
-                    "homepage": "http://justinhileman.com"
+                    "email": "justin@justinhileman.info"
                 }
             ],
             "description": "An interactive shell for modern PHP.",
-            "homepage": "http://psysh.org",
+            "homepage": "https://psysh.org",
             "keywords": [
                 "REPL",
                 "console",
@@ -4648,9 +4650,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.9"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.10"
             },
-            "time": "2025-06-23T02:35:06+00:00"
+            "time": "2025-08-04T12:39:37+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -5402,16 +5404,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
+                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
-                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
                 "shasum": ""
             },
             "require": {
@@ -5476,7 +5478,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.1"
+                "source": "https://github.com/symfony/console/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -5487,12 +5489,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T19:55:54+00:00"
+            "time": "2025-07-30T17:13:41+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5628,16 +5634,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235"
+                "reference": "0b31a944fcd8759ae294da4d2808cbc53aebd0c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/35b55b166f6752d6aaf21aa042fc5ed280fce235",
-                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/0b31a944fcd8759ae294da4d2808cbc53aebd0c3",
+                "reference": "0b31a944fcd8759ae294da4d2808cbc53aebd0c3",
                 "shasum": ""
             },
             "require": {
@@ -5685,7 +5691,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.3.1"
+                "source": "https://github.com/symfony/error-handler/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -5696,12 +5702,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-13T07:48:40+00:00"
+            "time": "2025-07-07T08:17:57+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5861,16 +5871,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
-                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
                 "shasum": ""
             },
             "require": {
@@ -5905,7 +5915,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.0"
+                "source": "https://github.com/symfony/finder/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -5916,25 +5926,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:26+00:00"
+            "time": "2025-07-15T13:41:35+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9"
+                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/23dd60256610c86a3414575b70c596e5deff6ed9",
-                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6",
+                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6",
                 "shasum": ""
             },
             "require": {
@@ -5984,7 +5998,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.1"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -5995,25 +6009,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-23T15:07:14+00:00"
+            "time": "2025-07-10T08:47:49+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831"
+                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1644879a66e4aa29c36fe33dfa6c54b450ce1831",
-                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6ecc895559ec0097e221ed2fd5eb44d5fede083c",
+                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c",
                 "shasum": ""
             },
             "require": {
@@ -6098,7 +6116,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.1"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -6109,25 +6127,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-28T08:24:55+00:00"
+            "time": "2025-07-31T10:45:04+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368"
+                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/b5db5105b290bdbea5ab27b89c69effcf1cb3368",
-                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
+                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
                 "shasum": ""
             },
             "require": {
@@ -6178,7 +6200,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.1"
+                "source": "https://github.com/symfony/mailer/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -6189,25 +6211,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T19:55:54+00:00"
+            "time": "2025-07-15T11:36:08+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9"
+                "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
-                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/e0a0f859148daf1edf6c60b398eb40bfc96697d1",
+                "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1",
                 "shasum": ""
             },
             "require": {
@@ -6262,7 +6288,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.3.0"
+                "source": "https://github.com/symfony/mime/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -6273,12 +6299,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-19T08:51:26+00:00"
+            "time": "2025-07-15T13:41:35+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6980,16 +7010,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8e213820c5fea844ecea29203d2a308019007c15"
+                "reference": "7614b8ca5fa89b9cd233e21b627bfc5774f586e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8e213820c5fea844ecea29203d2a308019007c15",
-                "reference": "8e213820c5fea844ecea29203d2a308019007c15",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/7614b8ca5fa89b9cd233e21b627bfc5774f586e4",
+                "reference": "7614b8ca5fa89b9cd233e21b627bfc5774f586e4",
                 "shasum": ""
             },
             "require": {
@@ -7041,7 +7071,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.3.0"
+                "source": "https://github.com/symfony/routing/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -7052,12 +7082,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T20:43:28+00:00"
+            "time": "2025-07-15T11:36:08+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7144,16 +7178,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.0",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
+                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
-                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
                 "shasum": ""
             },
             "require": {
@@ -7211,7 +7245,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.0"
+                "source": "https://github.com/symfony/string/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -7222,25 +7256,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-20T20:19:01+00:00"
+            "time": "2025-07-10T08:47:49+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "241d5ac4910d256660238a7ecf250deba4c73063"
+                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/241d5ac4910d256660238a7ecf250deba4c73063",
-                "reference": "241d5ac4910d256660238a7ecf250deba4c73063",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/81b48f4daa96272efcce9c7a6c4b58e629df3c90",
+                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90",
                 "shasum": ""
             },
             "require": {
@@ -7307,7 +7345,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.1"
+                "source": "https://github.com/symfony/translation/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -7318,12 +7356,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T19:55:54+00:00"
+            "time": "2025-07-30T17:31:46+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7479,16 +7521,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.3.1",
+            "version": "v7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42"
+                "reference": "53205bea27450dc5c65377518b3275e126d45e75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
-                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53205bea27450dc5c65377518b3275e126d45e75",
+                "reference": "53205bea27450dc5c65377518b3275e126d45e75",
                 "shasum": ""
             },
             "require": {
@@ -7500,7 +7542,6 @@
                 "symfony/console": "<6.4"
             },
             "require-dev": {
-                "ext-iconv": "*",
                 "symfony/console": "^6.4|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
                 "symfony/process": "^6.4|^7.0",
@@ -7543,7 +7584,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.1"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.2"
             },
             "funding": [
                 {
@@ -7554,12 +7595,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T19:55:54+00:00"
+            "time": "2025-07-29T20:02:46+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7899,16 +7944,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.3",
+            "version": "2.18.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d",
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d",
                 "shasum": ""
             },
             "require": {
@@ -7958,7 +8003,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.3"
+                "source": "https://github.com/filp/whoops/tree/2.18.4"
             },
             "funding": [
                 {
@@ -7966,7 +8011,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-16T00:02:10+00:00"
+            "time": "2025-08-08T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -8310,16 +8355,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.3",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36",
-                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
@@ -8358,7 +8403,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
@@ -8366,7 +8411,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-05T12:25:42+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -8587,16 +8632,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.20",
+            "version": "2.1.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499"
+                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a9ccfef95210f92ba6feea6e8d1eef42b5605499",
-                "reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
+                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
                 "shasum": ""
             },
             "require": {
@@ -8641,7 +8686,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-07-26T20:45:26+00:00"
+            "time": "2025-08-04T19:17:37+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8980,16 +9025,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.27",
+            "version": "11.5.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "446d43867314781df7e9adf79c3ec7464956fd8f"
+                "reference": "804ac91b99e3a36a23f1584a9c4347fd69b0a384"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/446d43867314781df7e9adf79c3ec7464956fd8f",
-                "reference": "446d43867314781df7e9adf79c3ec7464956fd8f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/804ac91b99e3a36a23f1584a9c4347fd69b0a384",
+                "reference": "804ac91b99e3a36a23f1584a9c4347fd69b0a384",
                 "shasum": ""
             },
             "require": {
@@ -8999,7 +9044,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.3",
+                "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
@@ -9016,7 +9061,7 @@
                 "sebastian/exporter": "^6.3.0",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
-                "sebastian/type": "^5.1.2",
+                "sebastian/type": "^5.1.3",
                 "sebastian/version": "^5.0.2",
                 "staabm/side-effects-detector": "^1.0.5"
             },
@@ -9061,7 +9106,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.29"
             },
             "funding": [
                 {
@@ -9085,7 +9130,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-11T04:10:06+00:00"
+            "time": "2025-08-09T07:11:30+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9916,16 +9961,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "5.1.2",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e"
+                "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
-                "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f77d2d4e78738c98d9a68d2596fe5e8fa380f449",
+                "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449",
                 "shasum": ""
             },
             "require": {
@@ -9961,15 +10006,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "security": "https://github.com/sebastianbergmann/type/security/policy",
-                "source": "https://github.com/sebastianbergmann/type/tree/5.1.2"
+                "source": "https://github.com/sebastianbergmann/type/tree/5.1.3"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/type",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-03-18T13:35:50+00:00"
+            "time": "2025-08-09T06:55:48+00:00"
         },
         {
             "name": "sebastian/version",

From bd966ef99e1b48cce48fd247792beae45f654093 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 9 Aug 2025 11:09:50 +0100
Subject: [PATCH 630/666] phpstan: Address a range of level 2 issues

---
 app/Access/Guards/LdapSessionGuard.php              |  7 ++-----
 app/Activity/ActivityQueries.php                    |  2 ++
 .../Handlers/PageUpdateNotificationHandler.php      |  3 ++-
 app/Activity/Tools/WebhookFormatter.php             |  6 ++----
 app/Entities/Controllers/ChapterApiController.php   |  6 +++++-
 app/Entities/Models/Entity.php                      | 13 +++++++++----
 app/Exports/ZipExports/ZipExportReferences.php      |  2 +-
 app/Users/Models/HasCreatorAndUpdater.php           |  2 ++
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/Access/Guards/LdapSessionGuard.php b/app/Access/Guards/LdapSessionGuard.php
index a417d3e61cb..bd020f70b95 100644
--- a/app/Access/Guards/LdapSessionGuard.php
+++ b/app/Access/Guards/LdapSessionGuard.php
@@ -57,16 +57,13 @@ public function validate(array $credentials = [])
     /**
      * Attempt to authenticate a user using the given credentials.
      *
-     * @param array $credentials
      * @param bool  $remember
      *
-     * @throws LdapException*@throws \BookStack\Exceptions\JsonDebugException
+     * @throws LdapException
      * @throws LoginAttemptException
      * @throws JsonDebugException
-     *
-     * @return bool
      */
-    public function attempt(array $credentials = [], $remember = false)
+    public function attempt(array $credentials = [], $remember = false): bool
     {
         $username = $credentials['username'];
         $userDetails = $this->ldapService->getUserDetails($username);
diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index 86326fb80af..d5b047937fb 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -11,6 +11,7 @@
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
 class ActivityQueries
@@ -67,6 +68,7 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
 
         $activity = $query->orderBy('created_at', 'desc')
             ->with(['loggable' => function (Relation $query) {
+                /** @var MorphTo<Entity, Activity> $query */
                 $query->withTrashed();
             }, 'user.avatar'])
             ->skip($count * ($page - 1))
diff --git a/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php b/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
index 744aba18f63..20dc0fc4d8e 100644
--- a/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
@@ -20,7 +20,8 @@ public function handle(Activity $activity, Loggable|string $detail, User $user):
             throw new \InvalidArgumentException("Detail for page update notifications must be a page");
         }
 
-        // Get last update from activity
+        // Get the last update from activity
+        /** @var ?Activity $lastUpdate */
         $lastUpdate = $detail->activity()
             ->where('type', '=', ActivityType::PAGE_UPDATE)
             ->where('id', '!=', $activity->id)
diff --git a/app/Activity/Tools/WebhookFormatter.php b/app/Activity/Tools/WebhookFormatter.php
index 6ccb084b8de..cb4e9cb0a9c 100644
--- a/app/Activity/Tools/WebhookFormatter.php
+++ b/app/Activity/Tools/WebhookFormatter.php
@@ -50,7 +50,7 @@ public function format(): array
         }
 
         if ($this->detail instanceof Model) {
-            $data['related_item'] = $this->formatModel();
+            $data['related_item'] = $this->formatModel($this->detail);
         }
 
         return $data;
@@ -83,10 +83,8 @@ public function addDefaultModelFormatters(): void
         );
     }
 
-    protected function formatModel(): array
+    protected function formatModel(Model $model): array
     {
-        /** @var Model $model */
-        $model = $this->detail;
         $model->unsetRelations();
 
         foreach ($this->modelFormatters as $formatter) {
diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index 8ac0c7a60a2..6ba2e9fd2bf 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Entities\Controllers;
 
+use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Queries\EntityQueries;
@@ -143,7 +144,10 @@ protected function forJsonDisplay(Chapter $chapter): Chapter
         $chapter->load(['tags']);
         $chapter->makeVisible('description_html');
         $chapter->setAttribute('description_html', $chapter->descriptionHtml());
-        $chapter->setAttribute('book_slug', $chapter->book()->first()->slug);
+
+        /** @var Book $book */
+        $book = $chapter->book()->first();
+        $chapter->setAttribute('book_slug', $book->slug);
 
         return $chapter;
     }
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 0de83c93869..1ef4e618df9 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -26,6 +26,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -283,10 +284,14 @@ abstract public function getUrl(string $path = '/'): string;
     public function getParent(): ?self
     {
         if ($this instanceof Page) {
-            return $this->chapter_id ? $this->chapter()->withTrashed()->first() : $this->book()->withTrashed()->first();
+            /** @var BelongsTo<Chapter|Book, Page>  $builder */
+            $builder = $this->chapter_id ? $this->chapter() : $this->book();
+            return $builder->withTrashed()->first();
         }
         if ($this instanceof Chapter) {
-            return $this->book()->withTrashed()->first();
+            /** @var BelongsTo<Book, Page>  $builder */
+            $builder = $this->book();
+            return $builder->withTrashed()->first();
         }
 
         return null;
@@ -295,7 +300,7 @@ public function getParent(): ?self
     /**
      * Rebuild the permissions for this entity.
      */
-    public function rebuildPermissions()
+    public function rebuildPermissions(): void
     {
         app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);
     }
@@ -303,7 +308,7 @@ public function rebuildPermissions()
     /**
      * Index the current entity for search.
      */
-    public function indexForSearch()
+    public function indexForSearch(): void
     {
         app()->make(SearchIndex::class)->indexEntity(clone $this);
     }
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index bf5e02133ef..b9f356a6a5e 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -134,7 +134,7 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
 
             // Find and include images if in visibility
             $page = $model->getPage();
-            if ($page && userCan('view', $page)) {
+            if ($page && userCan('view', $page) && $exportModel instanceof ZipExportPage) {
                 if (!isset($this->images[$model->id])) {
                     $exportImage = ZipExportImage::fromModel($model, $files);
                     $this->images[$model->id] = $exportImage;
diff --git a/app/Users/Models/HasCreatorAndUpdater.php b/app/Users/Models/HasCreatorAndUpdater.php
index 5ff46bc3cb7..9fb24ead9ec 100644
--- a/app/Users/Models/HasCreatorAndUpdater.php
+++ b/app/Users/Models/HasCreatorAndUpdater.php
@@ -7,6 +7,8 @@
 /**
  * @property int $created_by
  * @property int $updated_by
+ * @property ?User $createdBy
+ * @property ?User $updatedBy
  */
 trait HasCreatorAndUpdater
 {

From a2d13124af4ea4b5b817e0604ce58bbb412be085 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 11 Aug 2025 13:33:57 +0100
Subject: [PATCH 631/666] Testing: Added mail port to testing env options

Prevents conflict with potential user-set option.
For #5755
---
 phpunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml b/phpunit.xml
index b72c6e5f13e..6ce994bf652 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -21,6 +21,7 @@
     <server name="DB_CONNECTION" value="mysql_testing"/>
     <server name="BCRYPT_ROUNDS" value="4"/>
     <server name="MAIL_DRIVER" value="array"/>
+    <server name="MAIL_PORT" value="587"/>
     <server name="MAIL_VERIFY_SSL" value="true"/>
     <server name="LOG_CHANNEL" value="single"/>
     <server name="AUTH_METHOD" value="standard"/>

From 777cca76dac6a5b0bcf912f6628709258688f9ca Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 11 Aug 2025 13:36:06 +0100
Subject: [PATCH 632/666] Deps: Bumped PHP composer deps again

---
 composer.lock | 63 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/composer.lock b/composer.lock
index b6d53faec0d..70d68f085f7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -467,33 +467,32 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.0",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25 || ^5.4"
+                "doctrine/coding-standard": "^12.0 || ^13.0",
+                "phpstan/phpstan": "^1.12 || ^2.0",
+                "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
+                "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^12.2"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                    "Doctrine\\Inflector\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -538,7 +537,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "source": "https://github.com/doctrine/inflector/tree/2.1.0"
             },
             "funding": [
                 {
@@ -554,7 +553,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2025-08-10T19:31:58+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -9025,16 +9024,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.29",
+            "version": "11.5.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "804ac91b99e3a36a23f1584a9c4347fd69b0a384"
+                "reference": "fc44414e0779e94640663b809557b0b599548260"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/804ac91b99e3a36a23f1584a9c4347fd69b0a384",
-                "reference": "804ac91b99e3a36a23f1584a9c4347fd69b0a384",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc44414e0779e94640663b809557b0b599548260",
+                "reference": "fc44414e0779e94640663b809557b0b599548260",
                 "shasum": ""
             },
             "require": {
@@ -9055,7 +9054,7 @@
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
                 "sebastian/code-unit": "^3.0.3",
-                "sebastian/comparator": "^6.3.1",
+                "sebastian/comparator": "^6.3.2",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.1",
                 "sebastian/exporter": "^6.3.0",
@@ -9106,7 +9105,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.29"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.31"
             },
             "funding": [
                 {
@@ -9130,7 +9129,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-09T07:11:30+00:00"
+            "time": "2025-08-11T05:27:39+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9304,16 +9303,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.3.1",
+            "version": "6.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959"
+                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
-                "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85c77556683e6eee4323e4c5468641ca0237e2e8",
+                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8",
                 "shasum": ""
             },
             "require": {
@@ -9372,15 +9371,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.2"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-03-07T06:57:01+00:00"
+            "time": "2025-08-10T08:07:46+00:00"
         },
         {
             "name": "sebastian/complexity",

From 1256b30ad43893800b868f42a56b4cd89a80e829 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Mon, 11 Aug 2025 13:38:47 +0100
Subject: [PATCH 633/666] Updated translations with latest Crowdin changes
 (#5740)

---
 lang/ar/entities.php          |  4 ++++
 lang/bg/entities.php          |  4 ++++
 lang/bn/entities.php          |  4 ++++
 lang/bs/entities.php          |  4 ++++
 lang/ca/editor.php            |  2 +-
 lang/ca/entities.php          |  4 ++++
 lang/cs/editor.php            |  4 ++--
 lang/cs/entities.php          | 10 ++++++---
 lang/cy/entities.php          |  4 ++++
 lang/da/entities.php          |  4 ++++
 lang/de/editor.php            |  2 +-
 lang/de/entities.php          |  4 ++++
 lang/de_informal/editor.php   |  2 +-
 lang/de_informal/entities.php |  4 ++++
 lang/el/entities.php          |  4 ++++
 lang/es/editor.php            |  2 +-
 lang/es/entities.php          |  6 +++++-
 lang/es_AR/editor.php         |  2 +-
 lang/es_AR/entities.php       |  6 +++++-
 lang/et/editor.php            |  2 +-
 lang/et/entities.php          |  6 +++++-
 lang/eu/entities.php          |  4 ++++
 lang/fa/entities.php          |  4 ++++
 lang/fi/entities.php          |  4 ++++
 lang/fr/editor.php            |  2 +-
 lang/fr/entities.php          |  4 ++++
 lang/he/entities.php          |  4 ++++
 lang/hr/entities.php          |  4 ++++
 lang/hu/entities.php          |  4 ++++
 lang/id/entities.php          |  4 ++++
 lang/is/entities.php          |  4 ++++
 lang/it/editor.php            |  2 +-
 lang/it/entities.php          |  4 ++++
 lang/ja/editor.php            |  4 ++--
 lang/ja/entities.php          |  8 +++++--
 lang/ka/entities.php          |  4 ++++
 lang/ko/entities.php          |  4 ++++
 lang/ku/entities.php          |  4 ++++
 lang/lt/entities.php          |  4 ++++
 lang/lv/entities.php          |  4 ++++
 lang/nb/entities.php          |  4 ++++
 lang/ne/entities.php          |  4 ++++
 lang/nl/entities.php          |  4 ++++
 lang/nn/entities.php          |  4 ++++
 lang/pl/entities.php          |  4 ++++
 lang/pt/activities.php        | 40 +++++++++++++++++------------------
 lang/pt/auth.php              |  2 +-
 lang/pt/common.php            |  2 +-
 lang/pt/entities.php          |  4 ++++
 lang/pt_BR/editor.php         |  2 +-
 lang/pt_BR/entities.php       |  6 +++++-
 lang/ro/entities.php          |  4 ++++
 lang/ru/entities.php          |  4 ++++
 lang/sk/entities.php          |  4 ++++
 lang/sl/entities.php          |  4 ++++
 lang/sq/entities.php          |  4 ++++
 lang/sr/entities.php          |  4 ++++
 lang/sv/entities.php          |  4 ++++
 lang/tk/entities.php          |  4 ++++
 lang/tr/entities.php          |  4 ++++
 lang/uk/entities.php          |  4 ++++
 lang/uz/entities.php          |  4 ++++
 lang/vi/entities.php          |  4 ++++
 lang/zh_CN/entities.php       |  6 +++++-
 lang/zh_TW/entities.php       |  4 ++++
 65 files changed, 249 insertions(+), 45 deletions(-)

diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 54c3f7447e7..1f1d4e4117a 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'سيؤدي هذا إلى حذف مِلَفّ الاستيراد المضغوط ZIP، ولا يمكن التراجع عنه.',
     'import_errors' => 'أخطاء الاستيراد',
     'import_errors_desc' => 'حدثت الأخطاء التالية خلال محاولة الاستيراد:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'الأذونات',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index 973a305ea8e..42cdad801a9 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Права',
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/bn/entities.php
+++ b/lang/bn/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index 28b5c548377..f671e1b4527 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Dozvole',
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index 5115a1c1512..8cc04c1cae3 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Cancel·la',
     'save' => 'Desa',
     'close' => 'Tanca',
-    'apply' => 'Apply',
+    'apply' => 'Aplicar',
     'undo' => 'Desfés',
     'redo' => 'Refés',
     'left' => 'Esquerra',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index 1b01cea3909..51bb4aecbad 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
diff --git a/lang/cs/editor.php b/lang/cs/editor.php
index d67283b72b2..2a6b344d549 100644
--- a/lang/cs/editor.php
+++ b/lang/cs/editor.php
@@ -47,8 +47,8 @@
     'strikethrough' => 'Proškrtnuté',
     'superscript' => 'horní index',
     'subscript' => 'Dolní index',
-    'text_color' => 'Barva textu:',
-    'highlight_color' => 'Highlight color',
+    'text_color' => 'Barva textu',
+    'highlight_color' => 'Barva zvýraznění',
     'custom_color' => 'Vlastní barva',
     'remove_color' => 'Odstranit barvu',
     'background_color' => 'Barva pozadí',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index 687f1503e42..cda6b6c82f5 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Potvrzením odstraníte nahraný ZIP soubor. Tento krok nelze vrátit zpět.',
     'import_errors' => 'Chyby importu',
     'import_errors_desc' => 'Při pokusu o import došlo k následujícím chybám:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnění',
@@ -244,8 +248,8 @@
     'pages_edit_delete_draft_confirm' => 'Jste si jisti, že chcete odstranit změny vašich konceptů? Všechny vaše změny, od posledního úplného uložení, budou ztraceny a editor bude aktualizován s nejnovějším stavem nekonceptu stránky.',
     'pages_edit_discard_draft' => 'Zahodit koncept',
     'pages_edit_switch_to_markdown' => 'Přepnout na Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Vytvořený obsah)',
-    'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
+    'pages_edit_switch_to_markdown_clean' => '(Prostý zápis)',
+    'pages_edit_switch_to_markdown_stable' => '(Formátovaný zápis)',
     'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
     'pages_edit_switch_to_new_wysiwyg' => 'Přepnout na nový WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(V beta testování)',
@@ -268,7 +272,7 @@
     'pages_md_insert_drawing' => 'Vložit kresbu',
     'pages_md_show_preview' => 'Zobrazit náhled',
     'pages_md_sync_scroll' => 'Synchronizovat náhled',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Upravovat prostý text',
     'pages_drawing_unsaved' => 'Nalezen neuložený výkres',
     'pages_drawing_unsaved_confirm' => 'Byly nalezeny neuložené kresby z předchozí neúspěšné pokusu o uložení kresby. Chcete je obnovit a pokračovat v úpravě této neuložené kresby?',
     'pages_not_in_chapter' => 'Stránka není v kapitole',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index 3a5473ecb05..e6df4317b1d 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Bydd hwn yn dileu\'r mewnforyn ffeil ZIP sy wedi\'i lwytho i fyny, a fydd e ddim gallu cael ei ddadwneud.',
     'import_errors' => 'Gwallau Mewnforyn',
     'import_errors_desc' => 'Digwyddodd y gwallau canlynol yn ystod cynnig y mewnforyn:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Caniatâd',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index a90f6e605e4..c9177219071 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Dette vil slette den uploadede ZIP-fil og kan ikke fortrydes.',
     'import_errors' => 'Importfejl',
     'import_errors_desc' => 'Følgende fejl opstod under importforsøget:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Rettigheder',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index c824466ff4f..1be31551987 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Hochgestellt',
     'subscript' => 'Tiefgestellt',
     'text_color' => 'Schriftfarbe',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Markierungsfarbe',
     'custom_color' => 'Benutzerdefinierte Farbe',
     'remove_color' => 'Farbe entfernen',
     'background_color' => 'Hintergrundfarbe',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index e4e1bdafd52..ac70c2a9f61 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
     'import_errors' => 'Importfehler',
     'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
diff --git a/lang/de_informal/editor.php b/lang/de_informal/editor.php
index 7f232659b4a..30c38271cfa 100644
--- a/lang/de_informal/editor.php
+++ b/lang/de_informal/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Hochgestellt',
     'subscript' => 'Tiefgestellt',
     'text_color' => 'Textfarbe',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Markierungsfarbe',
     'custom_color' => 'Benutzerdefinierte Farbe',
     'remove_color' => 'Farbe entfernen',
     'background_color' => 'Hintergrundfarbe',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 38f4eeb56e5..346cd891ead 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
     'import_errors' => 'Importfehler',
     'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index b9ccd6464bd..3779cd18a61 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Δικαιώματα',
diff --git a/lang/es/editor.php b/lang/es/editor.php
index 78920720d22..2df05dede86 100644
--- a/lang/es/editor.php
+++ b/lang/es/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Superíndice',
     'subscript' => 'Subíndice',
     'text_color' => 'Color de texto',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Color de resaltado',
     'custom_color' => 'Color personalizado',
     'remove_color' => 'Eliminar color',
     'background_color' => 'Color de fondo',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index 9263f06e14d..23ec5f442de 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
     'import_errors' => 'Errores de Importación',
     'import_errors_desc' => 'Se han producido los siguientes errores durante el intento de importación:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -268,7 +272,7 @@
     'pages_md_insert_drawing' => 'Insertar Dibujo',
     'pages_md_show_preview' => 'Mostrar vista previa',
     'pages_md_sync_scroll' => 'Sincronizar desplazamiento de vista previa',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Editor de texto plano',
     'pages_drawing_unsaved' => 'Encontrado dibujo sin guardar',
     'pages_drawing_unsaved_confirm' => 'Se encontraron datos no guardados del dibujo de un intento de guardado fallido. ¿Desea restaurar y continuar editando el dibujo no guardado?',
     'pages_not_in_chapter' => 'La página no está en un capítulo',
diff --git a/lang/es_AR/editor.php b/lang/es_AR/editor.php
index 73d8e6f0815..94fd55b0998 100644
--- a/lang/es_AR/editor.php
+++ b/lang/es_AR/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Superíndice',
     'subscript' => 'Subíndice',
     'text_color' => 'Color del texto',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Color de resaltado',
     'custom_color' => 'Color personalizado',
     'remove_color' => 'Eliminar color',
     'background_color' => 'Color de fondo',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index f0b13ed1a71..6c54a000413 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
     'import_errors' => 'Errores de Importación',
     'import_errors_desc' => 'Se produjeron los siguientes errores durante el intento de importación:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -268,7 +272,7 @@
     'pages_md_insert_drawing' => 'Insertar Dibujo',
     'pages_md_show_preview' => 'Mostrar vista previa',
     'pages_md_sync_scroll' => 'Sincronizar desplazamiento de vista previa',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Editor de texto plano',
     'pages_drawing_unsaved' => 'Encontrado dibujo sin guardar',
     'pages_drawing_unsaved_confirm' => 'Se encontraron datos del dibujo no guardados durante un intento de guardado fallido anterior. ¿Desea restaurar y continuar editando el dibujo no guardado?',
     'pages_not_in_chapter' => 'La página no esá en el capítulo',
diff --git a/lang/et/editor.php b/lang/et/editor.php
index 3728658669e..66561c3c858 100644
--- a/lang/et/editor.php
+++ b/lang/et/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Ülaindeks',
     'subscript' => 'Alaindeks',
     'text_color' => 'Teksti värv',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Esiletõstuvärv',
     'custom_color' => 'Kohandatud värv',
     'remove_color' => 'Eemalda värv',
     'background_color' => 'Taustavärv',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 3193001da58..72f09eca030 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'See kustutab üleslaaditud ZIP-faili, ja seda ei saa tagasi võtta.',
     'import_errors' => 'Importimise vead',
     'import_errors_desc' => 'Importimisel esinesid järgmised vead:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
@@ -268,7 +272,7 @@
     'pages_md_insert_drawing' => 'Lisa joonis',
     'pages_md_show_preview' => 'Näita eelvaadet',
     'pages_md_sync_scroll' => 'Sünkrooni eelvaate kerimine',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Lihttekstiredaktor',
     'pages_drawing_unsaved' => 'Leiti salvestamata joonis',
     'pages_drawing_unsaved_confirm' => 'Varasemast ebaõnnestunud salvestuskatsest leiti salvestamata joonis. Kas soovid salvestamata joonise taastada ja selle muutmist jätkata?',
     'pages_not_in_chapter' => 'Leht ei kuulu peatüki alla',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index 6d7bcbf81f1..cc51012d50f 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Baimenak',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index 01db74a92dc..34a12689afc 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'با انجام این کار، فایل ZIP واردشده حذف می‌شود و این عمل بازگشت‌ناپذیر است.',
     'import_errors' => 'خطای انتقال ورودی',
     'import_errors_desc' => 'در جریان تلاش برای انتقال ورودی، خطاهای زیر رخ داد:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'مجوزها',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index e6dad19e85f..c64621f0d12 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Käyttöoikeudet',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 8c64354249c..73bc6ad21db 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Exposant',
     'subscript' => 'Indice',
     'text_color' => 'Couleur Texte',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Couleur de surlignage',
     'custom_color' => 'Couleur personnalisée',
     'remove_color' => 'Supprimer la couleur',
     'background_color' => 'Couleur d\'arrière-plan',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index 02b53e80b53..827e88a1b6d 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Ceci supprimera le fichier ZIP importé et ne pourra pas être annulé.',
     'import_errors' => 'Erreurs d\'importation',
     'import_errors_desc' => 'Les erreurs suivantes se sont produites lors de la tentative d\'importation :',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Autorisations',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 495e2c66a83..0cf2bb7fd32 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'תקלות יבוא',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'הרשאות',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 71f591b0f18..99df50ea33c 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Dopuštenja',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 1af563d5ed9..570120dfa99 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Jogosultságok',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 6cd88b51b69..2f932992571 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Izin',
diff --git a/lang/is/entities.php b/lang/is/entities.php
index 9176100271c..4308835c7d8 100644
--- a/lang/is/entities.php
+++ b/lang/is/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Þetta mun eyða innsendri ZIP skrá, þessa aðgerð er ekki hægt að afturkalla.',
     'import_errors' => 'Villur í innflutningi',
     'import_errors_desc' => 'Eftirfarandi villur komu upp við innflutning:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Réttindi',
diff --git a/lang/it/editor.php b/lang/it/editor.php
index 47734019794..8e614770836 100644
--- a/lang/it/editor.php
+++ b/lang/it/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Apice',
     'subscript' => 'Pedice',
     'text_color' => 'Colore del testo',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Colore evidenziazione',
     'custom_color' => 'Colore personalizzato',
     'remove_color' => 'Rimuovi colore',
     'background_color' => 'Colore di sfondo',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index e4d8eb9d49b..eb9868973e5 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Questa operazione cancella il file ZIP di importazione caricato e non può essere annullata.',
     'import_errors' => 'Errori di importazione',
     'import_errors_desc' => 'Gli seguenti errori si sono verificati durante il tentativo di importazione:',
+    'breadcrumb_siblings_for_page' => 'Naviga tra le pagine correlate',
+    'breadcrumb_siblings_for_chapter' => 'Naviga tra i capitoli correlati',
+    'breadcrumb_siblings_for_book' => 'Naviga tra i libri correlati',
+    'breadcrumb_siblings_for_bookshelf' => 'Naviga tra le librerie correlate',
 
     // Permissions and restrictions
     'permissions' => 'Permessi',
diff --git a/lang/ja/editor.php b/lang/ja/editor.php
index e5bf6af8e72..40307dd5281 100644
--- a/lang/ja/editor.php
+++ b/lang/ja/editor.php
@@ -47,8 +47,8 @@
     'strikethrough' => '取消線',
     'superscript' => '上付き',
     'subscript' => '下付き',
-    'text_color' => 'テキストの色',
-    'highlight_color' => 'Highlight color',
+    'text_color' => 'テキスト色',
+    'highlight_color' => 'テキスト背景色',
     'custom_color' => 'カスタムカラー',
     'remove_color' => '色設定を解除',
     'background_color' => '背景色',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index f0f86d61188..eed0c92ca81 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'アップロードされたインポートZIPファイルは削除され、元に戻すことはできません。',
     'import_errors' => 'インポートエラー',
     'import_errors_desc' => 'インポート中に次のエラーが発生しました：',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => '権限',
@@ -261,14 +265,14 @@
     'pages_save' => 'ページを保存',
     'pages_title' => 'ページタイトル',
     'pages_name' => 'ページ名',
-    'pages_md_editor' => 'エディター',
+    'pages_md_editor' => 'エディタ',
     'pages_md_preview' => 'プレビュー',
     'pages_md_insert_image' => '画像を挿入',
     'pages_md_insert_link' => 'エンティティへのリンクを挿入',
     'pages_md_insert_drawing' => '図を追加',
     'pages_md_show_preview' => 'プレビューを表示',
     'pages_md_sync_scroll' => 'プレビューとスクロールを同期',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'プレーンテキスト エディタ',
     'pages_drawing_unsaved' => '未保存の図が見つかりました',
     'pages_drawing_unsaved_confirm' => '以前に保存操作が失敗した、未保存の図が見つかりました。
 未保存の図面を復元して編集を続けますか？',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index f3fea491384..b5624f2213b 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => '업로드된 ZIP 파일이 삭제되며, 실행 취소할 수 없습니다.',
     'import_errors' => '가져오기 오류',
     'import_errors_desc' => '가져오기 중 에러가 발생했습니다.',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => '권한',
diff --git a/lang/ku/entities.php b/lang/ku/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/ku/entities.php
+++ b/lang/ku/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 9677b62890d..5624567811f 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Leidimai',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 407900f79dd..5f921048e52 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Šis izdzēsīs augšupielādēto importa ZIP failu, un šo darbību nevarēs atcelt.',
     'import_errors' => 'Importa kļūdas',
     'import_errors_desc' => 'Importa mēģinājumā atgadījās šīs kļūdas:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Atļaujas',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 4fcbd05340c..50f3847d867 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Dette vil slette den opplastede importen av ZIP-filen og kan ikke angres.',
     'import_errors' => 'Import feil',
     'import_errors_desc' => 'Feil oppstod under importforsøket:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Tilganger',
diff --git a/lang/ne/entities.php b/lang/ne/entities.php
index da1a7e393ae..88b202deed3 100644
--- a/lang/ne/entities.php
+++ b/lang/ne/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'यो अपलोड गरिएको आयात ZIP फाइल मेट्नेछ, र यो कार्य नकारात्मक हुन सक्दैन।',
     'import_errors' => 'आयात त्रुटिहरू',
     'import_errors_desc' => 'आयात प्रयासको क्रममा निम्न त्रुटिहरू उत्पन्न भएका छन्:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'अनुमतिहरू',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index e5a8b85e1e2..967b7ecfbd0 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Dit zal het Zip-bestand van de import permanent verwijderen.',
     'import_errors' => 'Importeerfouten',
     'import_errors_desc' => 'De volgende fouten deden zich voor tijdens het importeren:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 3449792cb31..4c75d501986 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Tilgongar',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 8b590722157..72389500b65 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Uprawnienia',
diff --git a/lang/pt/activities.php b/lang/pt/activities.php
index 9e458bffcf7..33d9e2ca686 100644
--- a/lang/pt/activities.php
+++ b/lang/pt/activities.php
@@ -30,7 +30,7 @@
     // Books
     'book_create'                 => 'livro criado',
     'book_create_notification'    => 'Livro criado com sucesso',
-    'book_create_from_chapter'              => 'capítulo convertido para lívro',
+    'book_create_from_chapter'              => 'capítulo convertido para livro',
     'book_create_from_chapter_notification' => 'Capítulo convertido em livro com sucesso',
     'book_update'                 => 'livro atualizado',
     'book_update_notification'    => 'Livro atualizado com sucesso',
@@ -46,12 +46,12 @@
     'bookshelf_create_from_book_notification'    => 'Livro convertido em prateleira com sucesso',
     'bookshelf_update'                 => 'estante atualizada',
     'bookshelf_update_notification'    => 'Estante atualizada com sucesso',
-    'bookshelf_delete'                 => 'prateleira excluída',
+    'bookshelf_delete'                 => 'excluiu a estante',
     'bookshelf_delete_notification'    => 'Estante eliminada com sucesso',
 
     // Revisions
-    'revision_restore' => 'revisão restaurada',
-    'revision_delete' => 'revisão eliminada',
+    'revision_restore' => 'restaurou a revisão',
+    'revision_delete' => 'eliminou a revisão',
     'revision_delete_notification' => 'Revisão eliminada com sucesso',
 
     // Favourites
@@ -62,7 +62,7 @@
     'watch_update_level_notification' => 'Ver preferências atualizadas com sucesso',
 
     // Auth
-    'auth_login' => 'sessão iniciada',
+    'auth_login' => 'iniciou sessão',
     'auth_register' => 'registado como novo utilizador',
     'auth_password_reset_request' => 'pedido a redefinição da palavra-passe',
     'auth_password_reset_update' => 'redifinir palavra-passe do utilizador',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook criado com sucesso',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'importação criada',
+    'import_create_notification' => 'Importação carregada com sucesso',
+    'import_run' => 'importação atualizada',
+    'import_run_notification' => 'Conteúdo importado com sucesso',
+    'import_delete' => 'importação apagada',
+    'import_delete_notification' => 'Importação eliminada com sucesso',
 
     // Users
     'user_create' => 'utilizador criado',
@@ -101,11 +101,11 @@
     'user_delete_notification' => 'Utilizador removido com sucesso',
 
     // API Tokens
-    'api_token_create' => 'created API token',
+    'api_token_create' => 'token API criado',
     'api_token_create_notification' => 'API token criado com sucesso',
-    'api_token_update' => 'updated API token',
+    'api_token_update' => 'token API atualizado',
     'api_token_update_notification' => 'API token atualizado com sucesso',
-    'api_token_delete' => 'deleted API token',
+    'api_token_delete' => 'token API apagado',
     'api_token_delete_notification' => 'API token atualizado com sucesso',
 
     // Roles
@@ -128,12 +128,12 @@
     'comment_delete'              => 'comentário eliminado',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'regra de ordenação criada',
+    'sort_rule_create_notification' => 'Regra de ordenação criada com sucesso',
+    'sort_rule_update' => 'regra de ordenação atualizada',
+    'sort_rule_update_notification' => 'Regra de ordenação atualizada com sucesso',
+    'sort_rule_delete' => 'regra de ordenação apagada',
+    'sort_rule_delete_notification' => 'Regra de ordenação apagada com sucesso',
 
     // Other
     'permissions_update'          => 'permissões atualizadas',
diff --git a/lang/pt/auth.php b/lang/pt/auth.php
index 81956161d19..8807e1a87d3 100644
--- a/lang/pt/auth.php
+++ b/lang/pt/auth.php
@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Aplicação móvel',
     'mfa_option_totp_desc' => 'Para usar a autenticação multi-fator, você precisa de uma aplicação móvel que suporte TOTP como o Autenticador do Google, Authy ou o autenticador Microsoft.',
     'mfa_option_backup_codes_title' => 'Códigos de Backup',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Gera um conjunto de códigos de reserva de utilização única, que deverá usar no início de sessão para verificar a sua identidade. Certifique-se de que os guarda num local seguro.',
     'mfa_gen_confirm_and_enable' => 'Confirmar e ativar',
     'mfa_gen_backup_codes_title' => 'Configuração dos Códigos de Backup',
     'mfa_gen_backup_codes_desc' => 'Armazene a lista de códigos abaixo em um lugar seguro. Ao acessar o sistema você poderá usar um dos códigos como um segundo mecanismo de autenticação.',
diff --git a/lang/pt/common.php b/lang/pt/common.php
index 43a0f331333..a0d83ac1e73 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -111,5 +111,5 @@
     'terms_of_service' => 'Termos de Utilização',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Procurar :appName',
 ];
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index b5c2fe5454f..91fe6d90cd1 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
diff --git a/lang/pt_BR/editor.php b/lang/pt_BR/editor.php
index 797c3ae888e..9a0eb45c9fe 100644
--- a/lang/pt_BR/editor.php
+++ b/lang/pt_BR/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Sobrescrito',
     'subscript' => 'Subscrito',
     'text_color' => 'Cor do texto',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Cor de destaque',
     'custom_color' => 'Cor personalizada',
     'remove_color' => 'Remover cor',
     'background_color' => 'Cor de fundo',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 37eb64e1f6a..fecd47e8227 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Isto irá excluir o arquivo ZIP de importação carregado e não poderá ser desfeito.',
     'import_errors' => 'Erros de importação',
     'import_errors_desc' => 'Os seguintes erros ocorreram durante a tentativa de importação:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -268,7 +272,7 @@
     'pages_md_insert_drawing' => 'Inserir Diagrama',
     'pages_md_show_preview' => 'Mostrar pré-visualização',
     'pages_md_sync_scroll' => 'Sincronizar pré-visualização',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Editor de texto simples',
     'pages_drawing_unsaved' => 'Diagrama não-salvo encontrado',
     'pages_drawing_unsaved_confirm' => 'Foram encontrados dados não-salvos de uma tentativa anterior de salvar o diagrama. Você gostaria de restaurá-los e continuar editando este diagrama?',
     'pages_not_in_chapter' => 'Página não está dentro de um capítulo',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index 649b6fe863a..ac8c9d32609 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permisiuni',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 0d3c98e5680..50f061115d9 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Разрешения',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index 20f2b294eef..eb52545357c 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnenia',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index cd1a0b488c6..00ac991811e 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Dovoljenja',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 86921916589..456a76ceb17 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Дозволе',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index adb497c2afb..a1e826b3080 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Detta kommer att ta bort den uppladdade ZIP-baserade importfilen och kan inte ångras.',
     'import_errors' => 'Importfel',
     'import_errors_desc' => 'Följande fel inträffade under importförsöket:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Rättigheter',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index ef625a3d261..74c50be3b2f 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index a9c6eebd8a0..39feb7e3917 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'İzinler',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index a72fac1a434..72853697b9b 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Це видалить завантажений імпорт файлу ZIP, і його не можна буде скасувати.',
     'import_errors' => 'Помилки імпорту',
     'import_errors_desc' => 'Під час спроби імпорту відбулися наступні помилки:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index 7c88e346c9d..e35a485b65d 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
     'import_errors' => 'Import Errors',
     'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Huquqlar',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 6d740f1bc15..1914d32c80f 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => 'Thao tác này sẽ xóa tệp ZIP nhập đã tải lên và không thể hoàn tác.',
     'import_errors' => 'Lỗi nhập',
     'import_errors_desc' => 'Các lỗi sau đã xảy ra trong quá trình nhập:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => 'Quyền',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index d60e01e0b7d..89c23c281c5 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => '这将删除上传的ZIP文件，不能撤消。',
     'import_errors' => '导入错误',
     'import_errors_desc' => '在尝试导入过程中出现了以下错误:',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => '权限',
@@ -166,7 +170,7 @@
     'books_search_this' => '搜索这本书',
     'books_navigation' => '图书导航',
     'books_sort' => '排序图书内容',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
+    'books_sort_desc' => '在书籍内部移动章节与页面以重组内容；支持添加其他书籍，实现跨书籍便捷移动章节与页面；还可设置自动排序规则，在内容发生变更时自动对本书内容进行排序。',
     'books_sort_auto_sort' => '自动排序选项',
     'books_sort_auto_sort_active' => '自动排序已激活：::sortName',
     'books_sort_named' => '排序图书「:bookName」',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 21ff15124de..06db353b215 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -63,6 +63,10 @@
     'import_delete_desc' => '這將會刪除已上傳的匯入 ZIP 檔案，且無法還原。',
     'import_errors' => '匯入錯誤',
     'import_errors_desc' => '嘗試匯入時發生以下錯誤：',
+    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
+    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
+    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
 
     // Permissions and restrictions
     'permissions' => '權限',

From 4830248a1e0a32bb8c3b8657d4c7a61b11c41acd Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 11 Aug 2025 13:40:55 +0100
Subject: [PATCH 634/666] Release: Updated licenses and translator attribution

---
 .github/translators.txt                | 5 ++++-
 dev/licensing/php-library-licenses.txt | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/translators.txt b/.github/translators.txt
index dfaa8d621fb..bcedaaf62a2 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -438,7 +438,7 @@ javadataherian :: Persian
 Ludo-code :: French
 hollsten :: Swedish
 Ngoc Lan Phung (lanpncz) :: Vietnamese
-Worive :: Catalan
+Worive :: Catalan; French
 Илья Скаба (skabailya) :: Russian
 Irjan Olsen (Irch) :: Norwegian Bokmal
 Aleksandar Jovanovic (jovanoviczaleksandar) :: Serbian (Cyrillic)
@@ -500,3 +500,6 @@ LiZerui (iamzrli) :: Chinese Traditional
 Ticker (ticker.com) :: Hebrew
 CrazyComputer :: Chinese Simplified
 Firr (FirrV) :: Russian
+João Faro (FaroJoaoFaro) :: Portuguese
+Danilo dos Santos Barbosa (bozochegou) :: Portuguese, Brazilian
+Chris (furesoft) :: German
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index cd4c1d490dd..f1ca23c9f56 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -467,7 +467,7 @@ License: MIT
 License File: vendor/psy/psysh/LICENSE
 Copyright: Copyright (c) 2012-2023 Justin Hileman
 Source: https://github.com/bobthecow/psysh.git
-Link: http://psysh.org
+Link: https://psysh.org
 -----------
 ralouphie/getallheaders
 License: MIT

From a50a256939ea6907f156859f4ba16c10c180cfae Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 11 Aug 2025 14:19:48 +0100
Subject: [PATCH 635/666] ZIP Exports: Fixed reference handling for images

Recent changes could mean missed references for images in non-page
locations. This fixes that, and tries to ensure images are used if we
already have a page-based image as part of the ZIP, otherwise ensure we
have a page as part of the export to attach the image to.
---
 app/Exports/ZipExports/ZipExportReferences.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index b9f356a6a5e..b21248ffd8c 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -17,17 +17,17 @@
 
 class ZipExportReferences
 {
-    /** @var ZipExportPage[] */
+    /** @var array<int, ZipExportPage> */
     protected array $pages = [];
-    /** @var ZipExportChapter[] */
+    /** @var array<int, ZipExportChapter> */
     protected array $chapters = [];
-    /** @var ZipExportBook[] */
+    /** @var array<int, ZipExportBook> */
     protected array $books = [];
 
-    /** @var ZipExportAttachment[] */
+    /** @var array<int, ZipExportAttachment> */
     protected array $attachments = [];
 
-    /** @var ZipExportImage[] */
+    /** @var array<int, ZipExportImage> */
     protected array $images = [];
 
     public function __construct(
@@ -134,11 +134,12 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
 
             // Find and include images if in visibility
             $page = $model->getPage();
-            if ($page && userCan('view', $page) && $exportModel instanceof ZipExportPage) {
+            $pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);
+            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan('view', $page))) {
                 if (!isset($this->images[$model->id])) {
                     $exportImage = ZipExportImage::fromModel($model, $files);
                     $this->images[$model->id] = $exportImage;
-                    $exportModel->images[] = $exportImage;
+                    $pageExportModel->images[] = $exportImage;
                 }
                 return "[[bsexport:image:{$model->id}]]";
             }

From 0311e3d2d7d11a6ff9dbec042888fdc2dd634176 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 14 Aug 2025 16:00:46 +0100
Subject: [PATCH 636/666] Readme: Updated sponsor link

Was leading to a 404.
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index d5c1a60100d..50b9081073e 100644
--- a/readme.md
+++ b/readme.md
@@ -48,7 +48,7 @@ Big thanks to these companies for supporting the project.
 #### Gold Sponsor
 
 <table><tbody><tr>
-<td align="center"><a href="https://www.federated.computer/bookstack-wiki" target="_blank">
+<td align="center"><a href="https://www.federated.computer/bookstack" target="_blank">
     <img width="480" src="https://www.bookstackapp.com/images/sponsors/federated-computer.png" alt="Federated.computer">
 </a></td>
 </tr></tbody></table>

From 9443682ae45cb8ac1898fd6fda5a403b93da07ec Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 15 Aug 2025 12:20:35 +0100
Subject: [PATCH 637/666] Maintenance: Addressed a range of deprecations

Updated deps to address deprecations fixed in newer Laravel framework
version.
---
 app/Exports/ZipExports/ZipExportBuilder.php   |  2 +-
 composer.lock                                 | 76 +++++++++++--------
 .../factories/Entities/Models/PageFactory.php |  2 +
 tests/Exports/ZipImportTest.php               |  2 +-
 tests/Exports/ZipTestHelper.php               |  2 +-
 5 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/app/Exports/ZipExports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
index 9937d158975..1a7d88020dd 100644
--- a/app/Exports/ZipExports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -76,7 +76,7 @@ protected function build(): string
 
         $zipFile = tempnam(sys_get_temp_dir(), 'bszip-');
         $zip = new ZipArchive();
-        $opened = $zip->open($zipFile, ZipArchive::CREATE);
+        $opened = $zip->open($zipFile, ZipArchive::OVERWRITE);
         if ($opened !== true) {
             throw new ZipExportException('Failed to create zip file for export.');
         }
diff --git a/composer.lock b/composer.lock
index 70d68f085f7..54ea9927511 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.352.5",
+            "version": "3.354.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609"
+                "reference": "014ce3465277cf78a05e60c04ce04c9893733bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e226dcc96c0a1165d9c8248ec637d1006b883609",
-                "reference": "e226dcc96c0a1165d9c8248ec637d1006b883609",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/014ce3465277cf78a05e60c04ce04c9893733bf2",
+                "reference": "014ce3465277cf78a05e60c04ce04c9893733bf2",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.352.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.354.0"
             },
-            "time": "2025-08-08T18:09:38+00:00"
+            "time": "2025-08-14T18:10:08+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1739,16 +1739,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.45.1",
+            "version": "v11.45.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b09ba32795b8e71df10856a2694706663984a239"
+                "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b09ba32795b8e71df10856a2694706663984a239",
-                "reference": "b09ba32795b8e71df10856a2694706663984a239",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/d134bf11e2208c0c5bd488cf19e612ca176b820a",
+                "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a",
                 "shasum": ""
             },
             "require": {
@@ -1856,7 +1856,7 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.13.2",
+                "orchestra/testbench-core": "^9.16.0",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^2.0",
@@ -1950,7 +1950,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-03T14:01:40+00:00"
+            "time": "2025-08-13T20:28:00+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3540,16 +3540,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56"
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
-                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
                 "shasum": ""
             },
             "require": {
@@ -3568,7 +3568,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -3592,9 +3592,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
             },
-            "time": "2025-07-27T20:03:57+00:00"
+            "time": "2025-08-13T20:13:15+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -9024,16 +9024,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.31",
+            "version": "11.5.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc44414e0779e94640663b809557b0b599548260"
+                "reference": "101e132dcf9e74a1eb3a309b4f686114ae8f7f36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc44414e0779e94640663b809557b0b599548260",
-                "reference": "fc44414e0779e94640663b809557b0b599548260",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/101e132dcf9e74a1eb3a309b4f686114ae8f7f36",
+                "reference": "101e132dcf9e74a1eb3a309b4f686114ae8f7f36",
                 "shasum": ""
             },
             "require": {
@@ -9105,7 +9105,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.31"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.32"
             },
             "funding": [
                 {
@@ -9129,7 +9129,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-11T05:27:39+00:00"
+            "time": "2025-08-12T07:32:49+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9908,23 +9908,23 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "6.0.2",
+            "version": "6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16"
+                "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16",
-                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/f6458abbf32a6c8174f8f26261475dc133b3d9dc",
+                "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
@@ -9960,15 +9960,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
                 "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.3"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T05:10:34+00:00"
+            "time": "2025-08-13T04:42:22+00:00"
         },
         {
             "name": "sebastian/type",
diff --git a/database/factories/Entities/Models/PageFactory.php b/database/factories/Entities/Models/PageFactory.php
index 319d97880ca..8115700950c 100644
--- a/database/factories/Entities/Models/PageFactory.php
+++ b/database/factories/Entities/Models/PageFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories\Entities\Models;
 
+use BookStack\Entities\Tools\PageEditorType;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
@@ -29,6 +30,7 @@ public function definition()
             'html'           => $html,
             'text'           => strip_tags($html),
             'revision_count' => 1,
+            'editor'         => 'wysiwyg',
         ];
     }
 }
diff --git a/tests/Exports/ZipImportTest.php b/tests/Exports/ZipImportTest.php
index ad0e6b24137..54e589aa39e 100644
--- a/tests/Exports/ZipImportTest.php
+++ b/tests/Exports/ZipImportTest.php
@@ -76,7 +76,7 @@ public function test_error_shown_if_missing_data()
     {
         $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
         $zip = new ZipArchive();
-        $zip->open($zipFile, ZipArchive::CREATE);
+        $zip->open($zipFile, ZipArchive::OVERWRITE);
         $zip->addFromString('beans', 'cat');
         $zip->close();
 
diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
index 50517a87d02..c5a7235a0c4 100644
--- a/tests/Exports/ZipTestHelper.php
+++ b/tests/Exports/ZipTestHelper.php
@@ -46,7 +46,7 @@ public static function zipUploadFromData(array $data, array $files = []): Upload
         $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
 
         $zip = new ZipArchive();
-        $zip->open($zipFile, ZipArchive::CREATE);
+        $zip->open($zipFile, ZipArchive::OVERWRITE);
         $zip->addFromString('data.json', json_encode($data));
 
         foreach ($files as $name => $file) {

From 5c481b428242d4a53a1382365e654a076d32f8d2 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 15 Aug 2025 12:42:44 +0100
Subject: [PATCH 638/666] Testing: Added more deprecation output

---
 phpunit.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml b/phpunit.xml
index 6ce994bf652..243c3d3bc84 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         colors="true">
   <testsuites>
     <testsuite name="Application Test Suite">
       <directory>./tests/</directory>

From 7c79b10fb6520f5bbd84e7de1369775d78ccadc3 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 24 Aug 2025 14:02:21 +0100
Subject: [PATCH 639/666] Imports: Fixed drawing IDs not being updated in
 content

Would leave imported content with inaccessible images in many cases (or
wrong references) although the drawing was still being uploaded &
related to the page.
Added test to cover.

For #5761
---
 .../ZipExports/ZipImportReferences.php        | 23 ++++++++++-
 tests/Exports/ZipImportRunnerTest.php         | 38 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app/Exports/ZipExports/ZipImportReferences.php b/app/Exports/ZipExports/ZipImportReferences.php
index da0581df6f5..662dfdf6c5b 100644
--- a/app/Exports/ZipExports/ZipImportReferences.php
+++ b/app/Exports/ZipExports/ZipImportReferences.php
@@ -29,7 +29,10 @@ class ZipImportReferences
     /** @var Image[] */
     protected array $images = [];
 
-    /** @var array<string, Model> */
+    /**
+     * Mapping keyed by "type:old-reference-id" with values being the new imported equivalent model.
+     * @var array<string, Model>
+     */
     protected array $referenceMap = [];
 
     /** @var array<int, ZipExportPage> */
@@ -108,6 +111,22 @@ protected function handleReference(string $type, int $id): ?string
         return null;
     }
 
+    protected function replaceDrawingIdReferences(string $content): string
+    {
+        $referenceRegex = '/\sdrawio-diagram=[\'"](\d+)[\'"]/';
+
+        $result = preg_replace_callback($referenceRegex, function ($matches) {
+            $key = 'image:' . $matches[1];
+            $model = $this->referenceMap[$key] ?? null;
+            if ($model instanceof Image && $model->type === 'drawio') {
+                return ' drawio-diagram="' . $model->id . '"';
+            }
+            return $matches[0];
+        }, $content);
+
+        return $result ?: $content;
+    }
+
     public function replaceReferences(): void
     {
         foreach ($this->books as $book) {
@@ -134,7 +153,9 @@ public function replaceReferences(): void
             $exportPage = $this->zipExportPageMap[$page->id];
             $contentType = $exportPage->markdown ? 'markdown' : 'html';
             $content = $exportPage->markdown ?: ($exportPage->html ?: '');
+
             $parsed = $this->parser->parseReferences($content, $this->handleReference(...));
+            $parsed = $this->replaceDrawingIdReferences($parsed);
 
             $this->pageRepo->setContentFromInput($page, [
                 $contentType => $parsed,
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index d3af6df76a6..68ffb4231bd 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -393,4 +393,42 @@ public function test_imported_images_have_their_detected_extension_added()
 
         ZipTestHelper::deleteZipForImport($import);
     }
+
+    public function test_drawing_references_are_updated_within_content()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+        $parent = $this->entities->chapter();
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<div drawio-diagram="1125"><img src="[[bsexport:image:1125]]"></div>',
+                'images' => [
+                    [
+                        'id' => 1125,
+                        'name' => 'Cat',
+                        'type' => 'drawio',
+                        'file' => 'my_drawing'
+                    ]
+                ],
+            ],
+        ], [
+            'my_drawing' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+        /** @var Page $page */
+        $page = $this->runner->run($import, $parent);
+
+        $pageImages = Image::where('uploaded_to', '=', $page->id)->whereIn('type', ['gallery', 'drawio'])->get();
+        $this->assertCount(1, $pageImages);
+        $this->assertEquals('drawio', $pageImages[0]->type);
+
+        $drawingId = $pageImages[0]->id;
+        $this->assertStringContainsString("drawio-diagram=\"{$drawingId}\"", $page->html);
+        $this->assertStringNotContainsString('[[bsexport:image:1125]]', $page->html);
+        $this->assertStringNotContainsString('drawio-diagram="1125"', $page->html);
+
+        ZipTestHelper::deleteZipForImport($import);
+    }
 }

From 13a79b3f96c7525d6c4807c5ec83f9d96885f74e Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 25 Aug 2025 14:17:55 +0100
Subject: [PATCH 640/666] Shelves: Addressed book edits removing non-visible
 books

Tracks the non-visible existing books on change, to retain as part of
the assigned books sync.
Added test to cover.

For #5728
---
 app/Entities/Repos/BookshelfRepo.php | 29 ++++++++++++++++++++++------
 tests/Entity/BookShelfTest.php       | 29 ++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index 8e60f58c42f..b870ec37747 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -56,20 +56,37 @@ public function update(Bookshelf $shelf, array $input, ?array $bookIds): Bookshe
 
     /**
      * Update which books are assigned to this shelf by syncing the given book ids.
-     * Function ensures the books are visible to the current user and existing.
+     * Function ensures the managed books are visible to the current user and existing,
+     * and that the user does not alter the assignment of books that are not visible to them.
      */
-    protected function updateBooks(Bookshelf $shelf, array $bookIds)
+    protected function updateBooks(Bookshelf $shelf, array $bookIds): void
     {
         $numericIDs = collect($bookIds)->map(function ($id) {
             return intval($id);
         });
 
-        $syncData = $this->bookQueries->visibleForList()
+        $existingBookIds = $shelf->books()->pluck('id')->toArray();
+        $visibleExistingBookIds = $this->bookQueries->visibleForList()
+            ->whereIn('id', $existingBookIds)
+            ->pluck('id')
+            ->toArray();
+        $nonVisibleExistingBookIds = array_values(array_diff($existingBookIds, $visibleExistingBookIds));
+
+        $newIdsToAssign = $this->bookQueries->visibleForList()
             ->whereIn('id', $bookIds)
             ->pluck('id')
-            ->mapWithKeys(function ($bookId) use ($numericIDs) {
-                return [$bookId => ['order' => $numericIDs->search($bookId)]];
-            });
+            ->toArray();
+
+        $maxNewIndex = max($numericIDs->keys()->toArray() ?: [0]);
+
+        $syncData = [];
+        foreach ($newIdsToAssign as $id) {
+            $syncData[$id] = ['order' => $numericIDs->search($id)];
+        }
+
+        foreach ($nonVisibleExistingBookIds as $index => $id) {
+            $syncData[$id] = ['order' => $maxNewIndex + ($index + 1)];
+        }
 
         $shelf->books()->sync($syncData);
     }
diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php
index fb9862931ae..ad1d64e7126 100644
--- a/tests/Entity/BookShelfTest.php
+++ b/tests/Entity/BookShelfTest.php
@@ -259,6 +259,35 @@ public function test_shelf_edit()
         $this->assertDatabaseHas('bookshelves_books', ['bookshelf_id' => $shelf->id, 'book_id' => $booksToInclude[1]->id]);
     }
 
+    public function test_shelf_edit_does_not_alter_books_we_dont_have_access_to()
+    {
+        $shelf = $this->entities->shelf();
+        $shelf->books()->detach();
+        $this->entities->book();
+        $this->entities->book();
+
+        $newBooks = [$this->entities->book(), $this->entities->book()];
+        $originalBooks = [$this->entities->book(), $this->entities->book()];
+        foreach ($originalBooks as $book) {
+            $this->permissions->disableEntityInheritedPermissions($book);
+            $shelf->books()->attach($book->id);
+        }
+
+        $this->asEditor()->put($shelf->getUrl(), [
+            'name' => $shelf->name,
+            'books' => "{$newBooks[0]->id},{$newBooks[1]->id}",
+        ])->assertRedirect($shelf->getUrl());
+
+        $resultingBooksById = $shelf->books()->get()->keyBy('id')->toArray();
+        $this->assertCount(4, $resultingBooksById);
+        foreach ($newBooks as $book) {
+            $this->assertArrayHasKey($book->id, $resultingBooksById);
+        }
+        foreach ($originalBooks as $book) {
+            $this->assertArrayHasKey($book->id, $resultingBooksById);
+        }
+    }
+
     public function test_shelf_create_new_book()
     {
         $shelf = $this->entities->shelf();

From ee994fa2b712ddf51befba2bba0ab106edc5e339 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 25 Aug 2025 15:01:13 +0100
Subject: [PATCH 641/666] Testing: Addressed deprecation in test helper

Also updated version in phpunit config
---
 phpunit.xml                      |  2 +-
 tests/Helpers/EntityProvider.php | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 243c3d3bc84..a8e725d4106 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          displayDetailsOnTestsThatTriggerDeprecations="true"
          colors="true">
diff --git a/tests/Helpers/EntityProvider.php b/tests/Helpers/EntityProvider.php
index 22e554f74b5..c794f9478ab 100644
--- a/tests/Helpers/EntityProvider.php
+++ b/tests/Helpers/EntityProvider.php
@@ -6,7 +6,6 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
@@ -34,9 +33,9 @@ class EntityProvider
     ];
 
     /**
-     * Get an un-fetched page from the system.
+     * Get an unfetched page from the system.
      */
-    public function page(callable $queryFilter = null): Page
+    public function page(callable|null $queryFilter = null): Page
     {
         /** @var Page $page */
         $page = Page::query()->when($queryFilter, $queryFilter)->whereNotIn('id', $this->fetchCache['page'])->first();
@@ -64,9 +63,9 @@ public function templatePage(): Page
     }
 
     /**
-     * Get an un-fetched chapter from the system.
+     * Get an unfetched chapter from the system.
      */
-    public function chapter(callable $queryFilter = null): Chapter
+    public function chapter(callable|null $queryFilter = null): Chapter
     {
         /** @var Chapter $chapter */
         $chapter = Chapter::query()->when($queryFilter, $queryFilter)->whereNotIn('id', $this->fetchCache['chapter'])->first();
@@ -80,9 +79,9 @@ public function chapterHasPages(): Chapter
     }
 
     /**
-     * Get an un-fetched book from the system.
+     * Get an unfetched book from the system.
      */
-    public function book(callable $queryFilter = null): Book
+    public function book(callable|null $queryFilter = null): Book
     {
         /** @var Book $book */
         $book = Book::query()->when($queryFilter, $queryFilter)->whereNotIn('id', $this->fetchCache['book'])->first();
@@ -101,9 +100,9 @@ public function bookHasChaptersAndPages(): Book
     }
 
     /**
-     * Get an un-fetched shelf from the system.
+     * Get an unfetched shelf from the system.
      */
-    public function shelf(callable $queryFilter = null): Bookshelf
+    public function shelf(callable|null $queryFilter = null): Bookshelf
     {
         /** @var Bookshelf $shelf */
         $shelf = Bookshelf::query()->when($queryFilter, $queryFilter)->whereNotIn('id', $this->fetchCache['bookshelf'])->first();

From 849bc4d6c3b1fbeb09035a0099509a00c2684b93 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 26 Aug 2025 14:41:42 +0100
Subject: [PATCH 642/666] Lexical: Improved nested details interaction

- Set to open by default on insert.
- Updated selection handling not to always fully cascade to lowest
  editable child on selection, so parents can be reliably selected.
- Updated mouse handling to treat details panes like the root element,
  inserting within-details where relevant.
---
 resources/js/wysiwyg/index.ts                 |  5 ++-
 .../js/wysiwyg/lexical/core/LexicalNode.ts    |  8 ++++
 .../wysiwyg/lexical/core/LexicalSelection.ts  |  6 +--
 .../lexical/core/nodes/LexicalElementNode.ts  | 32 ++++++++++++++-
 .../lexical/rich-text/LexicalDetailsNode.ts   | 15 ++++++-
 .../js/wysiwyg/services/mouse-handling.ts     | 41 +++++++++++--------
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |  2 +
 resources/sass/_editor.scss                   | 10 +++++
 8 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index e01b4e8f499..9928ad8bfb1 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -1,4 +1,4 @@
-import {createEditor, LexicalEditor} from 'lexical';
+import {createEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
@@ -89,6 +89,9 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     window.debugEditorState = () => {
         return editor.getEditorState().toJSON();
     };
+    context.manager.onSelectionChange((selection) => {
+        console.log(selection, context.editor.getEditorState());
+    });
 
     registerCommonNodeMutationListeners(context);
 
diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index 6d79c01ccb1..95a7234694a 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -383,6 +383,14 @@ export class LexicalNode {
     return isSelected;
   }
 
+    /**
+     * Indicate if this node should be selected directly instead of the default
+     * where the selection would descend to the nearest initial child element.
+     */
+  shouldSelectDirectly(): boolean {
+      return false;
+  }
+
   /**
    * Returns this nodes key.
    */
diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
index 297286a4b8c..7051336d57e 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -476,12 +476,12 @@ export class RangeSelection implements BaseSelection {
     const startOffset = firstPoint.offset;
     const endOffset = lastPoint.offset;
 
-    if ($isElementNode(firstNode)) {
+    if ($isElementNode(firstNode) && !firstNode.shouldSelectDirectly()) {
       const firstNodeDescendant =
         firstNode.getDescendantByIndex<ElementNode>(startOffset);
       firstNode = firstNodeDescendant != null ? firstNodeDescendant : firstNode;
     }
-    if ($isElementNode(lastNode)) {
+    if ($isElementNode(lastNode) && !lastNode.shouldSelectDirectly()) {
       let lastNodeDescendant =
         lastNode.getDescendantByIndex<ElementNode>(endOffset);
       // We don't want to over-select, as node selection infers the child before
@@ -499,7 +499,7 @@ export class RangeSelection implements BaseSelection {
     let nodes: Array<LexicalNode>;
 
     if (firstNode.is(lastNode)) {
-      if ($isElementNode(firstNode) && firstNode.getChildrenSize() > 0) {
+      if ($isElementNode(firstNode) && firstNode.getChildrenSize() > 0 && !firstNode.shouldSelectDirectly()) {
         nodes = [];
       } else {
         nodes = [firstNode];
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index a2760377368..ce4dbc46766 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -150,6 +150,20 @@ export class ElementNode extends LexicalNode {
     }
     return node;
   }
+    getFirstSelectableDescendant<T extends LexicalNode>(): null | T {
+      if (this.shouldSelectDirectly()) {
+          return null;
+      }
+        let node = this.getFirstChild<T>();
+        while ($isElementNode(node) && !node.shouldSelectDirectly()) {
+            const child = node.getFirstChild<T>();
+            if (child === null) {
+                break;
+            }
+            node = child;
+        }
+        return node;
+    }
   getLastDescendant<T extends LexicalNode>(): null | T {
     let node = this.getLastChild<T>();
     while ($isElementNode(node)) {
@@ -161,6 +175,20 @@ export class ElementNode extends LexicalNode {
     }
     return node;
   }
+    getLastSelectableDescendant<T extends LexicalNode>(): null | T {
+      if (this.shouldSelectDirectly()) {
+          return null;
+      }
+        let node = this.getLastChild<T>();
+        while ($isElementNode(node) && !node.shouldSelectDirectly()) {
+            const child = node.getLastChild<T>();
+            if (child === null) {
+                break;
+            }
+            node = child;
+        }
+        return node;
+    }
   getDescendantByIndex<T extends LexicalNode>(index: number): null | T {
     const children = this.getChildren<T>();
     const childrenLength = children.length;
@@ -319,11 +347,11 @@ export class ElementNode extends LexicalNode {
     return selection;
   }
   selectStart(): RangeSelection {
-    const firstNode = this.getFirstDescendant();
+    const firstNode = this.getFirstSelectableDescendant();
     return firstNode ? firstNode.selectStart() : this.select();
   }
   selectEnd(): RangeSelection {
-    const lastNode = this.getLastDescendant();
+    const lastNode = this.getLastSelectableDescendant();
     return lastNode ? lastNode.selectEnd() : this.select();
   }
   clear(): this {
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 3c845359aec..5e5d6b73526 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -75,6 +75,9 @@ export class DetailsNode extends ElementNode {
 
         if (this.__open) {
             el.setAttribute('open', 'true');
+            el.removeAttribute('contenteditable');
+        } else {
+            el.setAttribute('contenteditable', 'false');
         }
 
         const summary = document.createElement('summary');
@@ -84,7 +87,7 @@ export class DetailsNode extends ElementNode {
             event.preventDefault();
             _editor.update(() => {
                 this.select();
-            })
+            });
         });
 
         el.append(summary);
@@ -96,6 +99,11 @@ export class DetailsNode extends ElementNode {
 
         if (prevNode.__open !== this.__open) {
             dom.toggleAttribute('open', this.__open);
+            if (this.__open) {
+                dom.removeAttribute('contenteditable');
+            } else {
+                dom.setAttribute('contenteditable', 'false');
+            }
         }
 
         return prevNode.__id !== this.__id
@@ -144,6 +152,7 @@ export class DetailsNode extends ElementNode {
         }
 
         element.removeAttribute('open');
+        element.removeAttribute('contenteditable');
 
         return {element};
     }
@@ -165,6 +174,10 @@ export class DetailsNode extends ElementNode {
         return node;
     }
 
+    shouldSelectDirectly(): boolean {
+        return true;
+    }
+
 }
 
 export function $createDetailsNode() {
diff --git a/resources/js/wysiwyg/services/mouse-handling.ts b/resources/js/wysiwyg/services/mouse-handling.ts
index 058efc8d226..100dd44ff32 100644
--- a/resources/js/wysiwyg/services/mouse-handling.ts
+++ b/resources/js/wysiwyg/services/mouse-handling.ts
@@ -1,31 +1,41 @@
 import {EditorUiContext} from "../ui/framework/core";
 import {
-    $createParagraphNode, $getRoot,
-    $getSelection,
+    $createParagraphNode, $getNearestNodeFromDOMNode, $getRoot,
     $isDecoratorNode, CLICK_COMMAND,
-    COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
-    KEY_BACKSPACE_COMMAND,
-    KEY_DELETE_COMMAND,
-    KEY_ENTER_COMMAND, KEY_TAB_COMMAND,
-    LexicalEditor,
+    COMMAND_PRIORITY_LOW, ElementNode,
     LexicalNode
 } from "lexical";
 import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
-import {getLastSelection} from "../utils/selection";
-import {$getNearestNodeBlockParent, $getParentOfType, $selectOrCreateAdjacent} from "../utils/nodes";
-import {$setInsetForSelection} from "../utils/lists";
-import {$isListItemNode} from "@lexical/list";
-import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {$isDiagramNode} from "../utils/diagrams";
 import {$isTableNode} from "@lexical/table";
+import {$isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 function isHardToEscapeNode(node: LexicalNode): boolean {
-    return $isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node) || $isTableNode(node);
+    return $isDecoratorNode(node)
+        || $isImageNode(node)
+        || $isMediaNode(node)
+        || $isDiagramNode(node)
+        || $isTableNode(node)
+        || $isDetailsNode(node);
+}
+
+function $getContextNode(event: MouseEvent): ElementNode {
+    if (event.target instanceof HTMLElement) {
+        const nearestDetails = event.target.closest('details');
+        if (nearestDetails) {
+            const detailsNode = $getNearestNodeFromDOMNode(nearestDetails);
+            if ($isDetailsNode(detailsNode)) {
+                return detailsNode;
+            }
+        }
+    }
+    return $getRoot();
 }
 
 function insertBelowLastNode(context: EditorUiContext, event: MouseEvent): boolean {
-    const lastNode = $getRoot().getLastChild();
+    const contextNode = $getContextNode(event);
+    const lastNode = contextNode.getLastChild();
     if (!lastNode || !isHardToEscapeNode(lastNode)) {
         return false;
     }
@@ -40,7 +50,7 @@ function insertBelowLastNode(context: EditorUiContext, event: MouseEvent): boole
     if (isClickBelow) {
         context.editor.update(() => {
             const newNode = $createParagraphNode();
-            $getRoot().append(newNode);
+            contextNode.append(newNode);
             newNode.select();
         });
         return true;
@@ -49,7 +59,6 @@ function insertBelowLastNode(context: EditorUiContext, event: MouseEvent): boole
     return false;
 }
 
-
 export function registerMouseHandling(context: EditorUiContext): () => void {
     const unregisterClick = context.editor.registerCommand(CLICK_COMMAND, (event): boolean => {
         insertBelowLastNode(context, event);
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 41f6061b648..1f78f448718 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -193,6 +193,8 @@ export const details: EditorButtonDefinition = {
                 .filter(n => n !== null) as ElementNode[];
             const uniqueTopLevels = [...new Set(topLevels)];
 
+            detailsNode.setOpen(true);
+
             if (uniqueTopLevels.length > 0) {
                 uniqueTopLevels[0].insertAfter(detailsNode);
             } else {
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index a7f5ab387d5..966c11d3a5c 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -437,6 +437,16 @@ body.editor-is-fullscreen {
 .editor-node-resizer.active .editor-node-resizer-ghost {
   display: block;
 }
+.editor-content-area details[contenteditable="false"],
+.editor-content-area summary[contenteditable="false"] {
+  user-select: none;
+}
+.editor-content-area details[contenteditable="false"] > details * {
+  pointer-events: none;
+}
+.editor-content-area details summary {
+  caret-color: transparent;
+}
 
 .editor-table-marker {
   position: fixed;

From 519acaf324f5ce806f6e819683756ba175690ea1 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 27 Aug 2025 12:51:36 +0100
Subject: [PATCH 643/666] Lexical: Added better selection display for
 collapisble blocks

---
 resources/js/wysiwyg/index.ts                 |  2 +
 .../js/wysiwyg/services/selection-handling.ts | 49 +++++++++++++++++++
 resources/sass/_editor.scss                   |  4 ++
 3 files changed, 55 insertions(+)
 create mode 100644 resources/js/wysiwyg/services/selection-handling.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 9928ad8bfb1..5568b896392 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -20,6 +20,7 @@ import {modals} from "./ui/defaults/modals";
 import {CodeBlockDecorator} from "./ui/decorators/code-block";
 import {DiagramDecorator} from "./ui/decorators/diagram";
 import {registerMouseHandling} from "./services/mouse-handling";
+import {registerSelectionHandling} from "./services/selection-handling";
 
 const theme = {
     text: {
@@ -53,6 +54,7 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
         registerShortcuts(context),
         registerKeyboardHandling(context),
         registerMouseHandling(context),
+        registerSelectionHandling(context),
         registerTableResizer(editor, context.scrollDOM),
         registerTableSelectionHandler(editor),
         registerTaskListHandler(editor, context.editorDOM),
diff --git a/resources/js/wysiwyg/services/selection-handling.ts b/resources/js/wysiwyg/services/selection-handling.ts
new file mode 100644
index 00000000000..e3ea965f28d
--- /dev/null
+++ b/resources/js/wysiwyg/services/selection-handling.ts
@@ -0,0 +1,49 @@
+import {EditorUiContext} from "../ui/framework/core";
+import {
+    $getSelection,
+    COMMAND_PRIORITY_LOW,
+    SELECTION_CHANGE_COMMAND
+} from "lexical";
+import {$isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+
+
+const trackedDomNodes = new Set<HTMLElement>();
+
+/**
+ * Set a selection indicator on nodes which require it.
+ * @param context
+ */
+function setSelectionIndicator(context: EditorUiContext): boolean {
+
+    for (const domNode of trackedDomNodes) {
+        domNode.classList.remove('selected');
+        trackedDomNodes.delete(domNode);
+    }
+
+    const selection = $getSelection();
+    const nodes = selection?.getNodes() || [];
+
+    if (nodes.length === 1) {
+        if ($isDetailsNode(nodes[0])) {
+            const domEl = context.editor.getElementByKey(nodes[0].getKey());
+            if (domEl) {
+                domEl.classList.add('selected');
+                trackedDomNodes.add(domEl);
+            }
+        }
+    }
+
+    return false;
+}
+
+export function registerSelectionHandling(context: EditorUiContext): () => void {
+    const unregisterSelectionChange = context.editor.registerCommand(SELECTION_CHANGE_COMMAND, (): boolean => {
+        setSelectionIndicator(context);
+        return false;
+    }, COMMAND_PRIORITY_LOW);
+
+
+    return () => {
+        unregisterSelectionChange();
+    };
+}
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index 966c11d3a5c..cd4bb5d2ef0 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -447,6 +447,10 @@ body.editor-is-fullscreen {
 .editor-content-area details summary {
   caret-color: transparent;
 }
+.editor-content-area details.selected {
+  outline: 1px dashed var(--editor-color-primary);
+  outline-offset: 1px;
+}
 
 .editor-table-marker {
   position: fixed;

From 46613f76f61902db4dca5f54c308b8dadf02a14c Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 27 Aug 2025 14:09:38 +0100
Subject: [PATCH 644/666] Lexical: Added backspace handling for details

Allows more reliable removal of details block on backspace at first
child position with the details block.
---
 resources/js/wysiwyg/index.ts                 |  3 --
 .../lexical/core/nodes/LexicalElementNode.ts  |  2 +-
 .../lexical/rich-text/LexicalDetailsNode.ts   |  4 +++
 .../js/wysiwyg/services/keyboard-handling.ts  | 34 +++++++++++++++++--
 .../js/wysiwyg/ui/defaults/buttons/objects.ts |  7 ++--
 resources/js/wysiwyg/utils/details.ts         |  9 +++++
 6 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 resources/js/wysiwyg/utils/details.ts

diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 5568b896392..2c8c3b9525b 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -91,9 +91,6 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
     window.debugEditorState = () => {
         return editor.getEditorState().toJSON();
     };
-    context.manager.onSelectionChange((selection) => {
-        console.log(selection, context.editor.getEditorState());
-    });
 
     registerCommonNodeMutationListeners(context);
 
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index ce4dbc46766..0329aed6f4e 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -307,7 +307,7 @@ export class ElementNode extends LexicalNode {
     let anchorOffset = _anchorOffset;
     let focusOffset = _focusOffset;
     const childrenCount = this.getChildrenSize();
-    if (!this.canBeEmpty()) {
+    if (!this.canBeEmpty() && !this.shouldSelectDirectly()) {
       if (_anchorOffset === 0 && _focusOffset === 0) {
         const firstChild = this.getFirstChild();
         if ($isTextNode(firstChild) || $isElementNode(firstChild)) {
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index 5e5d6b73526..cdf32fdcbb1 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -178,6 +178,10 @@ export class DetailsNode extends ElementNode {
         return true;
     }
 
+    canBeEmpty(): boolean {
+        return false;
+    }
+
 }
 
 export function $createDetailsNode() {
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index b4f546117bb..aba0b1aa893 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -18,6 +18,7 @@ import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 import {$isDiagramNode} from "../utils/diagrams";
+import {$unwrapDetailsNode} from "../utils/details";
 
 function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
     if (nodes.length === 1) {
@@ -172,6 +173,35 @@ function getDetailsScenario(editor: LexicalEditor): {
     }
 }
 
+function unwrapDetailsNode(context: EditorUiContext, event: KeyboardEvent): boolean {
+    const selection = $getSelection();
+    const nodes = selection?.getNodes() || [];
+
+    if (nodes.length !== 1) {
+        return false;
+    }
+
+    const selectedNearestBlock = $getNearestNodeBlockParent(nodes[0]);
+    if (!selectedNearestBlock) {
+        return false;
+    }
+
+    const selectedParentBlock = selectedNearestBlock.getParent();
+    const selectRange = selection?.getStartEndPoints();
+
+    if (selectRange && $isDetailsNode(selectedParentBlock) && selectRange[0].offset === 0 && selectedNearestBlock.getIndexWithinParent() === 0) {
+        event.preventDefault();
+        context.editor.update(() => {
+            $unwrapDetailsNode(selectedParentBlock);
+            selectedNearestBlock.selectStart();
+            context.manager.triggerLayoutUpdate();
+        });
+        return true;
+    }
+
+    return false;
+}
+
 function $isSingleListItem(nodes: LexicalNode[]): boolean {
     if (nodes.length !== 1) {
         return false;
@@ -201,9 +231,9 @@ function handleInsetOnTab(editor: LexicalEditor, event: KeyboardEvent|null): boo
 }
 
 export function registerKeyboardHandling(context: EditorUiContext): () => void {
-    const unregisterBackspace = context.editor.registerCommand(KEY_BACKSPACE_COMMAND, (): boolean => {
+    const unregisterBackspace = context.editor.registerCommand(KEY_BACKSPACE_COMMAND, (event): boolean => {
         deleteSingleSelectedNode(context.editor);
-        return false;
+        return unwrapDetailsNode(context, event);
     }, COMMAND_PRIORITY_LOW);
 
     const unregisterDelete = context.editor.registerCommand(KEY_DELETE_COMMAND, (): boolean => {
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 1f78f448718..00dc9500ec8 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -34,6 +34,7 @@ import {$isDiagramNode, $openDrawingEditorForNode, showDiagramManagerForInsert}
 import {$createLinkedImageNodeFromImageData, showImageManager} from "../../../utils/images";
 import {$showDetailsForm, $showImageForm, $showLinkForm, $showMediaForm} from "../forms/objects";
 import {formatCodeBlock} from "../../../utils/formats";
+import {$unwrapDetailsNode} from "../../../utils/details";
 
 export const link: EditorButtonDefinition = {
     label: 'Insert/edit link',
@@ -251,11 +252,7 @@ export const detailsUnwrap: EditorButtonDefinition = {
         context.editor.update(() => {
             const details = $getNodeFromSelection($getSelection(), $isDetailsNode);
             if ($isDetailsNode(details)) {
-                const children = details.getChildren();
-                for (const child of children) {
-                    details.insertBefore(child);
-                }
-                details.remove();
+                $unwrapDetailsNode(details);
                 context.manager.triggerLayoutUpdate();
             }
         })
diff --git a/resources/js/wysiwyg/utils/details.ts b/resources/js/wysiwyg/utils/details.ts
new file mode 100644
index 00000000000..79e8600d084
--- /dev/null
+++ b/resources/js/wysiwyg/utils/details.ts
@@ -0,0 +1,9 @@
+import {DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
+
+export function $unwrapDetailsNode(node: DetailsNode) {
+    const children = node.getChildren();
+    for (const child of children) {
+        node.insertBefore(child);
+    }
+    node.remove();
+}
\ No newline at end of file

From f5da31037d79a5701610ef8f619ab3c2b38b5fa6 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 28 Aug 2025 11:17:18 +0100
Subject: [PATCH 645/666] Lexical: Fixed details tests

Updated to use new test pattern while there.
---
 .../__tests__/unit/LexicalDetailsNode.test.ts | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
index faa31d8874d..828aad83938 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
@@ -1,6 +1,5 @@
-import {dispatchKeydownEventForNode, initializeUnitTest} from "lexical/__tests__/utils";
-import {$createDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
-import {$createParagraphNode, $getRoot, LexicalNode, ParagraphNode} from "lexical";
+import {createTestContext} from "lexical/__tests__/utils";
+import {$createDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 const editorConfig = Object.freeze({
     namespace: '',
@@ -9,32 +8,28 @@ const editorConfig = Object.freeze({
 });
 
 describe('LexicalDetailsNode tests', () => {
-    initializeUnitTest((testEnv) => {
+    test('createDOM()', () => {
+        const {editor} = createTestContext();
+        let html!: string;
 
-        test('createDOM()', () => {
-            const {editor} = testEnv;
-            let html!: string;
-
-            editor.updateAndCommit(() => {
-                const details = $createDetailsNode();
-                html = details.createDOM(editorConfig, editor).outerHTML;
-            });
-
-            expect(html).toBe(`<details><summary contenteditable="false"></summary></details>`);
+        editor.updateAndCommit(() => {
+            const details = $createDetailsNode();
+            html = details.createDOM(editorConfig, editor).outerHTML;
         });
 
-        test('exportDOM()', () => {
-            const {editor} = testEnv;
-            let html!: string;
+        expect(html).toBe(`<details contenteditable="false"><summary contenteditable="false"></summary></details>`);
+    });
 
-            editor.updateAndCommit(() => {
-                const details = $createDetailsNode();
-                html = (details.exportDOM(editor).element as HTMLElement).outerHTML;
-            });
+    test('exportDOM()', () => {
+        const {editor} = createTestContext();
+        let html!: string;
 
-            expect(html).toBe(`<details><summary></summary></details>`);
+        editor.updateAndCommit(() => {
+            const details = $createDetailsNode();
+            details.setSummary('Hello there<>!')
+            html = (details.exportDOM(editor).element as HTMLElement).outerHTML;
         });
 
-
+        expect(html).toBe(`<details><summary>Hello there&lt;&gt;!</summary></details>`);
     });
 })
\ No newline at end of file

From 0436ccfebf7a22459f9272206fd8ef35cdf3b396 Mon Sep 17 00:00:00 2001
From: Dan Brown <email@danb.me>
Date: Thu, 28 Aug 2025 14:59:36 +0100
Subject: [PATCH 646/666] Updated translations with latest Crowdin changes
 (#5759)

---
 lang/ca/activities.php    | 42 +++++++++---------
 lang/ca/common.php        |  6 +--
 lang/ca/editor.php        | 10 ++---
 lang/ca/entities.php      | 90 +++++++++++++++++++--------------------
 lang/ca/errors.php        | 38 ++++++++---------
 lang/ca/notifications.php |  2 +-
 lang/ca/settings.php      | 76 ++++++++++++++++-----------------
 lang/ca/validation.php    |  8 ++--
 lang/da/auth.php          | 22 +++++-----
 lang/da/common.php        |  8 ++--
 lang/da/components.php    |  4 +-
 lang/da/entities.php      | 10 ++---
 lang/da/passwords.php     |  2 +-
 lang/da/preferences.php   |  8 ++--
 lang/da/settings.php      |  4 +-
 lang/et/entities.php      |  8 ++--
 lang/ja/entities.php      |  8 ++--
 lang/nl/activities.php    |  2 +-
 lang/nl/common.php        |  2 +-
 lang/nl/editor.php        |  2 +-
 lang/nl/entities.php      | 50 +++++++++++-----------
 lang/nl/errors.php        | 10 ++---
 lang/nl/notifications.php |  4 +-
 lang/nl/preferences.php   |  2 +-
 lang/nl/settings.php      |  6 +--
 lang/ru/editor.php        |  8 ++--
 lang/uk/common.php        |  4 +-
 lang/uk/editor.php        |  2 +-
 lang/uk/entities.php      | 32 +++++++-------
 lang/vi/editor.php        |  2 +-
 lang/vi/entities.php      | 12 +++---
 31 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index 8decaa739cd..4894c279aad 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -18,35 +18,35 @@
     'page_move_notification'      => 'S’ha mogut la pàgina',
 
     // Chapters
-    'chapter_create'              => 'ha creat el capítol',
+    'chapter_create'              => 'S\'ha creat el capítol',
     'chapter_create_notification' => 'S’ha creat el capítol',
     'chapter_update'              => 'ha actualitzat el capítol',
     'chapter_update_notification' => 'S’ha actualitzat el capítol',
     'chapter_delete'              => 'ha suprimit el capítol',
     'chapter_delete_notification' => 'S’ha suprimit el capítol',
-    'chapter_move'                => 'ha mogut el capítol',
+    'chapter_move'                => 's\'ha mogut el capítol',
     'chapter_move_notification' => 'S’ha mogut el capítol',
 
     // Books
-    'book_create'                 => 'ha creat el llibre',
+    'book_create'                 => 'llibre creat',
     'book_create_notification'    => 'S’ha creat el llibre',
     'book_create_from_chapter'              => 'ha convertit el capítol a llibre',
     'book_create_from_chapter_notification' => 'S’ha convertit el capítol a llibre',
-    'book_update'                 => 'ha actualitzat el llibre',
+    'book_update'                 => 'llibre actualitzat',
     'book_update_notification'    => 'S’ha actualitzat el llibre',
-    'book_delete'                 => 'ha suprimit el llibre',
+    'book_delete'                 => 'llibre suprimit',
     'book_delete_notification'    => 'S’ha suprimit el llibre',
-    'book_sort'                   => 'ha ordenat el llibre',
+    'book_sort'                   => 'llibre ordenat',
     'book_sort_notification'      => 'S’ha tornat a ordenar el llibre',
 
     // Bookshelves
     'bookshelf_create'            => 'ha creat el prestatge',
     'bookshelf_create_notification'    => 'S’ha creat el prestatge',
-    'bookshelf_create_from_book'    => 'ha convertit el llibre a prestatge',
+    'bookshelf_create_from_book'    => 'llibre convertit a prestatge',
     'bookshelf_create_from_book_notification'    => 'S’ha convertit el llibre a prestatge',
-    'bookshelf_update'                 => 'ha actualitzat el prestatge',
+    'bookshelf_update'                 => 'prestatge actualitzat',
     'bookshelf_update_notification'    => 'S’ha actualitzat el prestatge',
-    'bookshelf_delete'                 => 'ha suprimit el prestatge',
+    'bookshelf_delete'                 => 'prestatge suprimit',
     'bookshelf_delete_notification'    => 'S’ha suprimit el prestatge',
 
     // Revisions
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'S’ha suprimit el webhook',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'importació creada',
+    'import_create_notification' => 'L\'importació s\'ha carregat correctament',
+    'import_run' => 'importació actualitzada',
+    'import_run_notification' => 'Contingut importat correctament',
+    'import_delete' => 'importació eliminada',
+    'import_delete_notification' => 'Importació eliminada correctament',
 
     // Users
     'user_create' => 'ha creat l’usuari',
@@ -128,12 +128,12 @@
     'comment_delete'              => 'ha suprimit un comentari',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'crear regla d\'ordenació',
+    'sort_rule_create_notification' => 'Regla d\'ordenació creada correctament',
+    'sort_rule_update' => 'regla d\'ordenació actualitzada',
+    'sort_rule_update_notification' => 'Regla d\'ordenació actualitzada correctament',
+    'sort_rule_delete' => 'regla d\'ordenació eliminada',
+    'sort_rule_delete_notification' => 'Regla d\'ordenació eliminada correctament',
 
     // Other
     'permissions_update'          => 'ha actualitzat els permisos',
diff --git a/lang/ca/common.php b/lang/ca/common.php
index 698956601bf..8976edaa127 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -30,8 +30,8 @@
     'create' => 'Crea',
     'update' => 'Actualitza',
     'edit' => 'Edita',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Arxivar',
+    'unarchive' => 'Desarxivar',
     'sort' => 'Ordena',
     'move' => 'Mou',
     'copy' => 'Copia',
@@ -111,5 +111,5 @@
     'terms_of_service' => 'Condicions del servei',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Buscar :appName',
 ];
diff --git a/lang/ca/editor.php b/lang/ca/editor.php
index 8cc04c1cae3..e19d82f8f3c 100644
--- a/lang/ca/editor.php
+++ b/lang/ca/editor.php
@@ -25,7 +25,7 @@
     'width' => 'Amplada',
     'height' => 'Altura',
     'More' => 'Més',
-    'select' => 'Selecciona…',
+    'select' => 'Selecciona …',
 
     // Toolbar
     'formats' => 'Formats',
@@ -48,7 +48,7 @@
     'superscript' => 'Superíndex',
     'subscript' => 'Subíndex',
     'text_color' => 'Color del text',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Color ressaltat',
     'custom_color' => 'Color personalitzat',
     'remove_color' => 'Elimina el color',
     'background_color' => 'Color de fons',
@@ -149,7 +149,7 @@
     'url' => 'URL',
     'text_to_display' => 'Text per a mostrar',
     'title' => 'Títol',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Explorar enllaços',
     'open_link' => 'Obre l’enllaç',
     'open_link_in' => 'Obre l’enllaç…',
     'open_link_current' => 'A la finestra actual',
@@ -166,8 +166,8 @@
     'about' => 'Quant a l’Editor',
     'about_title' => 'Quant a l’Editor WYSIWYG',
     'editor_license' => 'Llicència i copyright de l’Editor',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Aquest editor està construït com una bifurcació de :lexicalLink i es distribueix sota la llicència MIT.',
+    'editor_lexical_license_link' => 'Tots els detalls complets de la llicència es poden trobar aquí.',
     'editor_tiny_license' => 'Aquest editor s’ha creat amb :tinyLink que es proporciona amb la llicència MIT.',
     'editor_tiny_license_link' => 'Detalls de la llicència i el copyright de TinyMCE.',
     'save_continue' => 'Desa la pàgina i continua',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index 51bb4aecbad..108a38c2c50 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -39,34 +39,34 @@
     'export_pdf' => 'Fitxer PDF',
     'export_text' => 'Fitxer de text sense format',
     'export_md' => 'Fitxer Markdown',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'export_zip' => 'ZIP portable',
+    'default_template' => 'Plantilla de pàgina per defecte',
+    'default_template_explain' => 'Assigna una plantilla de pàgina que s\'utilitzarà com a contingut predeterminat per a totes les pàgines creades en aquest element. Tingues en compte que això només s\'utilitzarà si el creador de pàgines té accés a la plantilla de pàgina triada.',
+    'default_template_select' => 'Seleccioneu una plantilla de pàgina',
+    'import' => 'Importar',
+    'import_validate' => 'Validar importació',
+    'import_desc' => 'Importar llibres, capítols i pàgines utilitzant una exportació ZIP portable de la mateixa o una altra instància. Selecciona un arxiu ZIP per continuar. Després que l\'arxiu s\'hagi penjat i validat, podrà configurar i confirmar l\'importació en la següent vista.',
+    'import_zip_select' => 'Seleccioneu un fitxer ZIP per pujar',
+    'import_zip_validation_errors' => 'S\'han detectat errors al validar l\'arxiu ZIP proporcionat:',
+    'import_pending' => 'Importació pendent',
+    'import_pending_none' => 'No s\'han iniciat les importacions.',
+    'import_continue' => 'Continuar importació',
+    'import_continue_desc' => 'Revisa el contingut que s\'ha d\'importar de l\'arxiu ZIP penjat. Quan estigui llest, executa l\'importació per afegir el seu contingut al sistema. L\'arxiu d\'importació ZIP penjat s\'eliminarà automàticament al finalitzar l\'importació correctament.',
+    'import_details' => 'Detalls d\'importació',
+    'import_run' => 'Executar importació',
+    'import_size' => ':size Mida de l\'arxiu ZIP',
+    'import_uploaded_at' => 'Penjat :relativeTime',
+    'import_uploaded_by' => 'Actualitzat per',
+    'import_location' => 'Importar ubicació',
+    'import_location_desc' => 'Selecciona una ubicació de destí pel contingut importat. Necessitarà els permisos pertinents per crear-lo dins de la ubicació triada.',
+    'import_delete_confirm' => 'Esteu segur que voleu suplir aquesta importació?',
+    'import_delete_desc' => 'Això eliminarà l\'arxiu ZIP d\'importació penjat i no es pot desfer.',
+    'import_errors' => 'Importar errors',
+    'import_errors_desc' => 'S\'han produït els següents errors durant l\'intent d\'importació:',
+    'breadcrumb_siblings_for_page' => 'Navegar entre pàgines del mateix nivell',
+    'breadcrumb_siblings_for_chapter' => 'Navegar entre capítols del mateix nivell',
+    'breadcrumb_siblings_for_book' => 'Navegar entre llibres del mateix nivell',
+    'breadcrumb_siblings_for_bookshelf' => 'Navegar entre llibreries del mateix nivell',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -170,9 +170,9 @@
     'books_search_this' => 'Cerca en aquest llibre',
     'books_navigation' => 'Navegació del llibre',
     'books_sort' => 'Ordena el contingut d’un llibre',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Mou capítols i pàgines dins d\'un llibre per reorganitzar el seu contingut. Es poden afegir altres llibres que permetin moure fàcilment capítols i pàgines entre llibres. De manera opcional, es poden establir regles d\'ordenació automàtica per ordenar automàticament el contingut d\'aquest llibre quan hi hagi canvis.',
+    'books_sort_auto_sort' => 'Opció d\'ordenació automàtica',
+    'books_sort_auto_sort_active' => 'Opció d\'ordenació activa :sortName',
     'books_sort_named' => 'Ordena el llibre &laquo;:bookName&raquo;',
     'books_sort_name' => 'Ordena pel nom',
     'books_sort_created' => 'Ordena per la data de creació',
@@ -234,7 +234,7 @@
     'pages_delete_draft' => 'Suprimeix l’esborrany de pàgina',
     'pages_delete_success' => 'S’ha suprimit la pàgina',
     'pages_delete_draft_success' => 'S’ha suprimit l’esborrany de pàgina',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Aquesta pàgina està en ús com a plantilla de pàgina predeterminada de llibre o capítol. Aquests llibres o capítols ja no tindran una plantilla de pàgina predeterminada assignada després d\'eliminar aquesta pàgina.',
     'pages_delete_confirm' => 'Esteu segur que voleu suprimir aquesta pàgina?',
     'pages_delete_draft_confirm' => 'Esteu segur que voleu suprimir aquest esborrany de pàgina?',
     'pages_editing_named' => 'Edició de la pàgina &laquo;:pageName&raquo;',
@@ -251,8 +251,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Contingut net)',
     'pages_edit_switch_to_markdown_stable' => '(Contingut estable)',
     'pages_edit_switch_to_wysiwyg' => 'Canvia a l’editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Canviar al nou editor WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(En Beta Test)',
     'pages_edit_set_changelog' => 'Registre de canvis',
     'pages_edit_enter_changelog_desc' => 'Introduïu una descripció breu dels canvis que heu fet',
     'pages_edit_enter_changelog' => 'Registra un canvi',
@@ -272,7 +272,7 @@
     'pages_md_insert_drawing' => 'Insereix un dibuix',
     'pages_md_show_preview' => 'Mostra la visualització prèvia',
     'pages_md_sync_scroll' => 'Sincronitza el desplaçament de la visualització prèvia',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Editor de text pla',
     'pages_drawing_unsaved' => 'S’ha trobat un dibuix sense desar',
     'pages_drawing_unsaved_confirm' => 'S’han trobat dades d’un dibuix d’un intent anterior de desar un dibuix. Voleu restaurar aquest dibuix no desat per a reprendre’n l’edició?',
     'pages_not_in_chapter' => 'La pàgina no és un capítol',
@@ -397,11 +397,11 @@
     'comment' => 'Comentari',
     'comments' => 'Comentaris',
     'comment_add' => 'Afegeix un comentari',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'No hi ha comentaris per mostrar',
     'comment_placeholder' => 'Deixa un comentari aquí',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count fil de comentaris|:count fils de comentaris',
+    'comment_archived_count' => ':count Arxivats',
+    'comment_archived_threads' => 'Fils arxivats',
     'comment_save' => 'Desa el comentari',
     'comment_new' => 'Crea un comentari',
     'comment_created' => 'ha comentat :createDiff',
@@ -410,14 +410,14 @@
     'comment_deleted_success' => 'S’ha suprimit el comentari',
     'comment_created_success' => 'S’ha afegit un comentari',
     'comment_updated_success' => 'S’ha actualitzat un comentari',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Comentari arxivat',
+    'comment_unarchive_success' => 'Comentari desarxivat',
+    'comment_view' => 'Mostra el comentari',
+    'comment_jump_to_thread' => 'Anar al fil',
     'comment_delete_confirm' => 'Esteu segur que voleu suprimir aquest comentari?',
     'comment_in_reply_to' => 'En resposta a :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referència',
+    'comment_reference_outdated' => '(Obsolet)',
     'comment_editor_explain' => 'Vet aquí els comentaris que s’han fet en aquesta pàgina. Els comentaris es poden fer i gestionar quan es visualitza la pàgina desada.',
 
     // Revision
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 76fb293dab6..6f3784c2cff 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -6,17 +6,17 @@
 
     // Permissions
     'permission' => 'No teniu permís per a accedir a la pàgina sol·licitada.',
-    'permissionJson' => 'No teniu permís per a fer l’acció sol·licitada.',
+    'permissionJson' => 'No teniu permís per a executar l’acció sol·licitada.',
 
     // Auth
     'error_user_exists_different_creds' => 'Ja existeix un usuari amb el correu electrònic :email però amb unes credencials diferents.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
-    'email_already_confirmed' => 'Ja s’ha confirmat el correu electrònic. Proveu d’iniciar sessió.',
+    'auth_pre_register_theme_prevention' => 'El compte d\'usuari no s\'ha pogut registrar amb els detalls proporcionats',
+    'email_already_confirmed' => 'L’adreça electrònica ja està confirmada. Proveu d’iniciar la sessió.',
     'email_confirmation_invalid' => 'Aquest testimoni de confirmació no és vàlid o ja s’ha utilitzat. Proveu de tornar-vos a registrar.',
     'email_confirmation_expired' => 'Aquest testimoni de confirmació ha caducat. S’ha enviat un altre correu electrònic de confirmació.',
-    'email_confirmation_awaiting' => 'Cal confirmar l’adreça electrònica del compte que utilitzeu.',
+    'email_confirmation_awaiting' => 'Cal confirmar l’adreça electrònica del compte que utilitzeu',
     'ldap_fail_anonymous' => 'L’accés LDAP anònim ha fallat',
-    'ldap_fail_authed' => 'L’accés LDAP amb el nom distintiu i la contrasenya proporcionades',
+    'ldap_fail_authed' => 'L’accés LDAP amb el nom distintiu i la contrasenya proporcionats ha fallat',
     'ldap_extension_not_installed' => 'L’extensió PHP de l’LDAP no està instal·lada',
     'ldap_cannot_connect' => 'No s’ha pogut connectar amb el servidor LDAP perquè la connexió inicial ha fallat',
     'saml_already_logged_in' => 'Ja heu iniciat sessió',
@@ -29,15 +29,15 @@
     'social_no_action_defined' => 'No s’ha definit cap acció',
     'social_login_bad_response' => "S’ha produït un error en l’inici de sessió amb :socialAccount: \n:error",
     'social_account_in_use' => 'Aquest compte de :socialAccount ja s’està utilitzant. Proveu d’iniciar sessió amb :socialAccount.',
-    'social_account_email_in_use' => 'L’adreça electrònica :email ja s’està utilitzant. Si ja teniu uns compte podeu connectar-hi el vostre compte de :socialAccount des de la configuració del vostre perfil.',
+    'social_account_email_in_use' => 'L’adreça electrònica :email ja està en ús. Si ja teniu un compte, podeu connectar-hi el vostre compte de :socialAccount a la configuració del vostre perfil.',
     'social_account_existing' => 'Aquest compte de :socialAccount ja està associat al vostre perfil.',
     'social_account_already_used_existing' => 'Aquest compte de :socialAccount ja està associat a un altre usuari.',
     'social_account_not_used' => 'Aquest compte de :socialAccount no està associat a cap usuari. Associeu-lo a la configuració del vostre perfil. ',
     'social_account_register_instructions' => 'Si encara no teniu un compte, podeu registrar-vos amb l’opció :socialAccount.',
     'social_driver_not_found' => 'No s’ha trobat el controlador social',
     'social_driver_not_configured' => 'La configuració de :socialAccount no és correcta.',
-    'invite_token_expired' => 'Aquest enllaç d’invitació ha caducat. Proveu de reinicialitzar la contrasenya.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'invite_token_expired' => 'Aquest enllaç d’invitació ha caducat. Podeu provar de restablir la contrasenya del vostre compte.',
+    'login_user_not_found' => 'No s\'ha pogut trobar un usuari per aquesta acció.',
 
     // System
     'path_not_writable' => 'No s’ha pogut pujar a :filePath. Assegureu-vos que teniu permisos d’escriptura al servidor.',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'No podeu suprimir l’administrador únic.',
     'users_cannot_delete_guest' => 'No podeu suprimir l’usuari convidat.',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'No s\'ha pogut crear l\'usuari, ja que no s\'ha pogut enviar el correu d\'invitació',
 
     // Roles
     'role_cannot_be_edited' => 'No es pot editar aquest rol.',
@@ -106,16 +106,16 @@
     'back_soon' => 'Aviat ho arreglarem.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'No es pot llegir el fitxer ZIP.',
+    'import_zip_cant_decode_data' => 'No s\'ha pogut trobar i descodificar el fitxer data.json en el fitxer ZIP.',
+    'import_zip_no_data' => 'Les dades del fitxer ZIP no contenen cap llibre, capítol o contingut de pàgina.',
+    'import_validation_failed' => 'Error en validar la importació del ZIP amb els errors:',
+    'import_zip_failed_notification' => 'Error en importar l\'arxiu ZIP.',
+    'import_perms_books' => 'Li falten els permisos necessaris per crear llibres.',
+    'import_perms_chapters' => 'Li falten els permisos necessaris per crear capítols.',
+    'import_perms_pages' => 'Li falten els permisos necessaris per crear pàgines.',
+    'import_perms_images' => 'Li falten els permisos necessaris per crear imatges.',
+    'import_perms_attachments' => 'Li falten els permisos necessaris per crear adjunts.',
 
     // API errors
     'api_no_authorization_found' => 'No s’ha trobat cap testimoni d’autorització en aquesta sol·licitud.',
diff --git a/lang/ca/notifications.php b/lang/ca/notifications.php
index fdea33436de..49b986ad063 100644
--- a/lang/ca/notifications.php
+++ b/lang/ca/notifications.php
@@ -13,7 +13,7 @@
     'updated_page_debounce' => 'Per a evitar que s’acumulin les notificacions, durant un temps no se us notificarà cap canvi fet en aquesta pàgina pel mateix usuari.',
 
     'detail_page_name' => 'Nom de la pàgina:',
-    'detail_page_path' => 'Camí de la pàgina:',
+    'detail_page_path' => 'Ruta de la pàgina:',
     'detail_commenter' => 'Autor del comentari:',
     'detail_comment' => 'Comentari:',
     'detail_created_by' => 'Creada per:',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index e25a4a0325e..63352147e0b 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -8,7 +8,7 @@
 
     // Common Messages
     'settings' => 'Configuració',
-    'settings_save' => 'Configuració de desat',
+    'settings_save' => 'Guardar configuració',
     'system_version' => 'Versió de sistema',
     'categories' => 'Categories',
 
@@ -19,8 +19,8 @@
     'app_name_desc' => 'El nom es mostra a la capçalera i als correus electrònics enviats pel sistema.',
     'app_name_header' => 'Mostra el nom a la capçalera',
     'app_public_access' => 'Accés públic',
-    'app_public_access_desc' => 'Si activeu aquesta opció les visitants podran accedir a la vostra instància del BookStack sense iniciar sessió.',
-    'app_public_access_desc_guest' => 'L’accés per als visitants públics es pot gestionar amb l’usuari &laquo;Convidat&raquo;.',
+    'app_public_access_desc' => 'Si activeu aquesta opció permetrà als visitants, accedir a la vostra instància del BookStack sense iniciar sessió.',
+    'app_public_access_desc_guest' => 'L’accés per als visitants públics es pot gestionar amb l’usuari Convidat.',
     'app_public_access_toggle' => 'Permet l’accés públic',
     'app_public_viewing' => 'Esteu segur que voleu permetre l’accés públic?',
     'app_secure_images' => 'Pujada d’imatges amb més seguretat',
@@ -75,34 +75,34 @@
     'reg_confirm_restrict_domain_placeholder' => 'No hi ha cap restricció',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sorting' => 'Ordenar',
+    'sorting_book_default' => 'Ordre predeterminat del llibre',
+    'sorting_book_default_desc' => 'Selecciona la regla d\'ordenació predeterminada per aplicar a nous llibres. Això no afectarà els llibres existents, i pot ser anul·lat per llibre.',
+    'sorting_rules' => 'Regles d\'ordenació',
+    'sorting_rules_desc' => 'Són operacions d\'ordenació predefinides que es poden aplicar al contingut en el sistema.',
+    'sort_rule_assigned_to_x_books' => 'Assignat a :count llibre | Assignat a :count llibres',
+    'sort_rule_create' => 'Crear regla d\'ordenació',
+    'sort_rule_edit' => 'Editar regla d\'ordenació',
+    'sort_rule_delete' => 'Eliminar regla d\'ordenació',
+    'sort_rule_delete_desc' => 'Eliminar aquesta regla d\'ordenació del sistema. Els llibres que utilitzin aquest tipus, es revertiran a l\'ordenació manual.',
+    'sort_rule_delete_warn_books' => 'Aquesta regla d\'ordenació s\'utilitza actualment en :count llibre(s). Està segur que vol eliminar-la?',
+    'sort_rule_delete_warn_default' => 'Aquesta regla d\'ordenació s\'utilitza actualment com a predeterminada per als llibres. Està segur que vol eliminar-la?',
+    'sort_rule_details' => 'Detalls de la regla d\'ordenació',
+    'sort_rule_details_desc' => 'Defineix un nom per aquesta regla d\'ordenació, que apareixerà a les llistes quan els usuaris estiguin seleccionant un ordre.',
+    'sort_rule_operations' => 'Operacions d\'ordenació',
+    'sort_rule_operations_desc' => 'Configura les accions d\'ordenació a realitzar movent-les de la llista d\'operacions disponibles. En utilitzar-se, les operacions s\'aplicaran en ordre, de dalt cap a baix. Qualsevol canvi realitzat aquí, s\'aplicarà a tots els llibres assignats en guardar.',
+    'sort_rule_available_operations' => 'Operacions disponibles',
+    'sort_rule_available_operations_empty' => 'No hi ha operacions pendents',
+    'sort_rule_configured_operations' => 'Operacions configurades',
+    'sort_rule_configured_operations_empty' => 'Arrossegar/afegir operacions des de la llista d\'Operacions Disponibles',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_name' => 'Nom - Alfabètic',
+    'sort_rule_op_name_numeric' => 'Nom - Numèric',
+    'sort_rule_op_created_date' => 'Data de creació',
+    'sort_rule_op_updated_date' => 'Data d\'actualització',
+    'sort_rule_op_chapters_first' => 'Capítols a l\'inici',
+    'sort_rule_op_chapters_last' => 'Capítols al final',
 
     // Maintenance settings
     'maint' => 'Manteniment',
@@ -139,7 +139,7 @@
     'recycle_bin_contents_empty' => 'La paperera és buida',
     'recycle_bin_empty' => 'Buida la paperera',
     'recycle_bin_empty_confirm' => 'Se suprimiran permanentment tots els elements que hi ha a la paperera incloent-hi el contingut que hi hagi a cada element. Esteu segur que voleu buidar la paperera?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Aquesta acció suprimirà del sistema de manera permanent aquest element, juntament amb tots els fills que es llisten a sota, i no podreu restaurar aquest contingut. Segur que voleu suprimir de manera permanent aquest element?',
     'recycle_bin_destroy_list' => 'Elements per destruir',
     'recycle_bin_restore_list' => 'Elements per restaurar',
     'recycle_bin_restore_confirm' => 'Aquesta acció restaurarà l’element suprimit, incloent-hi els elements fills, a la seva ubicació original. Si la ubicació original s’ha suprimit i és a la paperera, l’element pare també s’haurà de restaurar.',
@@ -192,7 +192,7 @@
     'role_access_api' => 'Accés a l’API del sistema',
     'role_manage_settings' => 'Gestió de la configuració de l’aplicació',
     'role_export_content' => 'Exportació de contingut',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importar contingut',
     'role_editor_change' => 'Canvi de l’editor de pàgina',
     'role_notifications' => 'Recepció i gestió de notificacions',
     'role_asset' => 'Permisos de recursos',
@@ -308,13 +308,13 @@
     'webhooks_last_error_message' => 'Darrer missatge d’error:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Llicències',
+    'licenses_desc' => 'Aquesta pàgina detalla informació sobre la llicència de BookStack a més dels projectes i biblioteques que s\'utilitzen en BookStack. Molts projectes enumerats aquí poden ser utilitzats només en un context de desenvolupament.',
+    'licenses_bookstack' => 'Llicència de BookStack',
+    'licenses_php' => 'Llicències de Biblioteques de PHP',
+    'licenses_js' => 'Llicències de Biblioteques de JavaScript',
+    'licenses_other' => 'Altres llicències',
+    'license_details' => 'Detalls de la llicència',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
diff --git a/lang/ca/validation.php b/lang/ca/validation.php
index e33ae336f20..bc821749a25 100644
--- a/lang/ca/validation.php
+++ b/lang/ca/validation.php
@@ -105,10 +105,10 @@
     'url'                  => 'El format :attribute no és vàlid.',
     'uploaded'             => 'No s’ha pogut pujar el fitxer. És possible que el servidor no admeti fitxers d’aquesta mida.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'El :attribute necessita fer referència a un arxiu dins del ZIP.',
+    'zip_file_mime' => 'El :attribute necessita fer referència a un arxiu de tipus :validTyes, trobat :foundType.',
+    'zip_model_expected' => 'S\'esperava un objecte de dades, però s\'ha trobat ":type".',
+    'zip_unique' => 'El :attribute ha de ser únic pel tipus d\'objecte dins del ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/da/auth.php b/lang/da/auth.php
index 9f717a3d563..dcc531125d5 100644
--- a/lang/da/auth.php
+++ b/lang/da/auth.php
@@ -6,11 +6,11 @@
  */
 return [
 
-    'failed' => 'Dee indtastede brugeroplysninger stemmer ikke overens med vores registreringer.',
+    'failed' => 'De indtastede brugeroplysninger stemmer ikke overens med vores registreringer.',
     'throttle' => 'For mange mislykkede loginforsøg. Prøv igen om :seconds sekunder.',
 
     // Login & Register
-    'sign_up' => 'Registrér',
+    'sign_up' => 'Registrer',
     'log_in' => 'Log ind',
     'log_in_with' => 'Log ind med :socialDriver',
     'sign_up_with' => 'Registrér med :socialDriver',
@@ -45,28 +45,28 @@
 
     // Password Reset
     'reset_password' => 'Nulstil adgangskode',
-    'reset_password_send_instructions' => 'Indtast din E-Mail herunder og du vil blive sendt en E-Mail med et link til at nulstille din adgangskode.',
+    'reset_password_send_instructions' => 'Indtast din e-mail herunder og du vil blive sendt en e-mail med et link til at nulstille din adgangskode.',
     'reset_password_send_button' => 'Send link til nulstilling',
     'reset_password_sent' => 'Et link til nulstilling af adgangskode sendes til :email, hvis den e-mail-adresse findes i systemet.',
     'reset_password_success' => 'Din adgangskode er blevet nulstillet.',
     'email_reset_subject' => 'Nulstil din :appName adgangskode',
-    'email_reset_text' => 'Du modtager denne E-Mail fordi vi har modtaget en anmodning om at nulstille din adgangskode.',
+    'email_reset_text' => 'Du modtager denne e-mail fordi vi har modtaget en anmodning om at nulstille din adgangskode.',
     'email_reset_not_requested' => 'Hvis du ikke har anmodet om at få din adgangskode nulstillet, behøver du ikke at foretage dig noget.',
 
     // Email Confirmation
     'email_confirm_subject' => 'Bekræft din E-Mail på :appName',
     'email_confirm_greeting' => 'Tak for at oprette dig på :appName!',
-    'email_confirm_text' => 'Bekræft venligst din E-Mail adresse ved at klikke på linket nedenfor:',
-    'email_confirm_action' => 'Bekræft E-Mail',
-    'email_confirm_send_error' => 'E-Mail-bekræftelse kræves, men systemet kunne ikke sende E-Mailen. Kontakt administratoren for at sikre, at E-Mail er konfigureret korrekt.',
-    'email_confirm_success' => 'Din email er blevet bekræftet! Du bør nu kune logge ind med denne emailadresse.',
+    'email_confirm_text' => 'Bekræft venligst din e-mail adresse ved at klikke på linket nedenfor:',
+    'email_confirm_action' => 'Bekræft e-mail',
+    'email_confirm_send_error' => 'E-mailbekræftelse kræves, men systemet kunne ikke sende e-mailen. Kontakt administratoren for at sikre, at e-mail er konfigureret korrekt.',
+    'email_confirm_success' => 'Din e-mail er blevet bekræftet! Du bør nu kunne logge ind med denne e-mailadresse.',
     'email_confirm_resent' => 'Bekræftelsesmail sendt, tjek venligst din indboks.',
     'email_confirm_thanks' => 'Tak for bekræftelsen!',
     'email_confirm_thanks_desc' => 'Vent venligst et øjeblik, mens din bekræftelse behandles. Hvis du ikke bliver omdirigeret efter 3 sekunder, skal du trykke på linket "Fortsæt" nedenfor for at fortsætte.',
 
-    'email_not_confirmed' => 'E-Mail adresse ikke bekræftet',
-    'email_not_confirmed_text' => 'Din E-Mail adresse er endnu ikke blevet bekræftet.',
-    'email_not_confirmed_click_link' => 'Klik venligst på linket i E-Mailen der blev sendt kort efter du registrerede dig.',
+    'email_not_confirmed' => 'E-mailadresse ikke bekræftet',
+    'email_not_confirmed_text' => 'Din e-mailadresse er endnu ikke blevet bekræftet.',
+    'email_not_confirmed_click_link' => 'Klik venligst på linket i e-mailen der blev sendt kort efter du registrerede dig.',
     'email_not_confirmed_resend' => 'Hvis du ikke kan finde E-Mailen, kan du du få gensendt bekræftelsesemailen ved at trykke herunder.',
     'email_not_confirmed_resend_button' => 'Gensend bekræftelsesemail',
 
diff --git a/lang/da/common.php b/lang/da/common.php
index 69c80e84425..db75772c857 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -30,8 +30,8 @@
     'create' => 'Opret',
     'update' => 'Opdater',
     'edit' => 'Rediger',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Arkiver',
+    'unarchive' => 'Tilbagekald',
     'sort' => 'Sorter',
     'move' => 'Flyt',
     'copy' => 'Kopier',
@@ -50,8 +50,8 @@
     'unfavourite' => 'Fjern som foretrukken',
     'next' => 'Næste',
     'previous' => 'Forrige',
-    'filter_active' => 'Aktivt Filter:',
-    'filter_clear' => 'Nulstil Filter',
+    'filter_active' => 'Aktivt filter:',
+    'filter_clear' => 'Nulstil filter',
     'download' => 'Hent',
     'open_in_tab' => 'Åben i ny fane',
     'open' => 'Åbn',
diff --git a/lang/da/components.php b/lang/da/components.php
index 410ed4fc5ea..3deeadf485d 100644
--- a/lang/da/components.php
+++ b/lang/da/components.php
@@ -6,8 +6,8 @@
 
     // Image Manager
     'image_select' => 'Billedselektion',
-    'image_list' => 'Billede Liste',
-    'image_details' => 'Billede Detaljer',
+    'image_list' => 'Billedliste',
+    'image_details' => 'Billeddetaljer',
     'image_upload' => 'Upload billede',
     'image_intro' => 'Her kan du vælge og administrere billeder, der tidligere er blevet uploadet til systemet.',
     'image_intro_upload' => 'Upload et nyt billede ved at trække en billedfil ind i dette vindue, eller ved at bruge knappen "Upload billede" ovenfor.',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index c9177219071..66e3fd2063b 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -272,7 +272,7 @@
     'pages_md_insert_drawing' => 'Indsæt tegning',
     'pages_md_show_preview' => 'Vis forhåndsvisning',
     'pages_md_sync_scroll' => 'Rulning af forhåndsvisning af synkronisering',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Klartekst editor',
     'pages_drawing_unsaved' => 'Ikke gemt tegning fundet',
     'pages_drawing_unsaved_confirm' => 'Der blev fundet ikke-gemte tegningsdata fra et tidligere mislykket forsøg på at gemme en tegning. Vil du gendanne og fortsætte med at redigere denne ikke-gemte tegning?',
     'pages_not_in_chapter' => 'Side er ikke i et kapitel',
@@ -400,7 +400,7 @@
     'comment_none' => 'No comments to display',
     'comment_placeholder' => 'Skriv en kommentar her',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
+    'comment_archived_count' => ':count Arkiveret',
     'comment_archived_threads' => 'Archived Threads',
     'comment_save' => 'Gem kommentar',
     'comment_new' => 'Ny kommentar',
@@ -412,12 +412,12 @@
     'comment_updated_success' => 'Kommentaren er opdateret',
     'comment_archive_success' => 'Comment archived',
     'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_view' => 'Se kommentar',
+    'comment_jump_to_thread' => 'Hop til tråd',
     'comment_delete_confirm' => 'Er du sikker på, at du vil slette denne kommentar?',
     'comment_in_reply_to' => 'Som svar til :commentId',
     'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference_outdated' => '(Forældet)',
     'comment_editor_explain' => 'Her er de kommentarer, der er blevet efterladt på denne side. Kommentarer kan tilføjes og administreres, når du ser den gemte side.',
 
     // Revision
diff --git a/lang/da/passwords.php b/lang/da/passwords.php
index 343fa2b8524..b58a4c94b78 100644
--- a/lang/da/passwords.php
+++ b/lang/da/passwords.php
@@ -7,7 +7,7 @@
 return [
 
     'password' => 'Adgangskoder skal være mindst otte tegn og svare til bekræftelsen.',
-    'user' => "Vi kan ikke finde en bruger med den e-mail adresse.",
+    'user' => "Vi kan ikke finde en bruger med den e-mailadresse.",
     'token' => 'Linket til nulstilling af adgangskode er ugyldigt for denne e-mail-adresse.',
     'sent' => 'Vi har sendt dig en e-mail med et link til at nulstille adgangskoden!',
     'reset' => 'Dit kodeord er blevet nulstillet!',
diff --git a/lang/da/preferences.php b/lang/da/preferences.php
index 9b9436dbab2..143405a163c 100644
--- a/lang/da/preferences.php
+++ b/lang/da/preferences.php
@@ -24,12 +24,12 @@
     'notifications_opt_own_page_changes' => 'Adviser ved ændringer af sider, jeg ejer',
     'notifications_opt_own_page_comments' => 'Adviser ved kommentarer på sider, jeg ejer',
     'notifications_opt_comment_replies' => 'Adviser ved svar på mine kommentarer',
-    'notifications_save' => 'Gem Indstillinger',
+    'notifications_save' => 'Gem indstillinger',
     'notifications_update_success' => 'Indstillinger for notifikationer er blevet opdateret!',
-    'notifications_watched' => 'Overvågede & Ignorerede',
+    'notifications_watched' => 'Overvågede og ignorerede',
     'notifications_watched_desc' => 'Nedenfor er de elementer, der har brugerdefinerede overvågning aktivt. For at opdatere dine præferencer for disse, gå til elementet og find derefter overvågning i sidepanelet.',
 
-    'auth' => 'Adgang & Sikkerhed',
+    'auth' => 'Adgang og sikkerhed',
     'auth_change_password' => 'Skift adgangskode',
     'auth_change_password_desc' => 'Skift den adgangskode, du bruger til at logge ind med. Den skal være mindst 8 tegn lang.',
     'auth_change_password_success' => 'Adgangskoden er blevet opdateret!',
@@ -41,7 +41,7 @@
     'profile_email_desc' => 'Denne e-mail vil blive brugt til notifikationer og, afhængigt af aktiv systemgodkendelse, systemadgang.',
     'profile_email_no_permission' => 'Desværre har du ikke tilladelse til at ændre din e-mailadresse. Hvis du ønsker at ændre dette, skal du bede en administrator om at ændre dette for dig.',
     'profile_avatar_desc' => 'Vælg et billede som vil blive brugt til at repræsentere dig selv over for andre i systemet. Ideelt set bør dette billede være kvadrat og omkring 256px i bredde og højde.',
-    'profile_admin_options' => 'Administrator Indstillinger',
+    'profile_admin_options' => 'Administratorindstillinger',
     'profile_admin_options_desc' => 'Yderligere indstillinger på administratorniveau, såsom dem der håndterer rolleopgaver, kan findes for din brugerkonto i området "Indstillinger > Brugere".',
 
     'delete_account' => 'Slet konto',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index a4136f6fd90..34d3975bec0 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -26,14 +26,14 @@
     'app_secure_images' => 'Højere sikkerhed for billeduploads',
     'app_secure_images_toggle' => 'Aktiver højere sikkerhed for billeduploads',
     'app_secure_images_desc' => 'Af performanceårsager er alle billeder offentlige. Denne funktion tilføjer en tilfældig, vanskelig at gætte streng foran billed-url\'er. Sørg for, at mappeindeksering ikke er aktiveret for at forhindre nem adgang.',
-    'app_default_editor' => 'Standard Side Editor',
+    'app_default_editor' => 'Standard sideeditor',
     'app_default_editor_desc' => 'Vælg hvilken editor der som standard skal bruges ved redigering af nye sider. Dette kan tilsidesættes på side niveau, hvor tilladelser tillader det.',
     'app_custom_html' => 'Tilpasset HTML head indhold',
     'app_custom_html_desc' => 'Alt indhold tilføjet her, vil blive indsat i bunden af <head> sektionen på alle sider. Dette er brugbart til overskrivning af styles og tilføjelse af analytics kode.',
     'app_custom_html_disabled_notice' => 'Brugerdefineret HTML head indhold er deaktiveret på denne indstillingsside for at, at ændringer kan rulles tilbage.',
     'app_logo' => 'Applikationslogo',
     'app_logo_desc' => 'Det bruges blandt andet i applikationens headerbar. Dette billede skal være 86px i højden. Store billeder vil blive skaleret ned.',
-    'app_icon' => 'Program ikon',
+    'app_icon' => 'Programikon',
     'app_icon_desc' => 'Dette ikon bruges til browserfaner og genvejsikoner. Det skal være et 256px kvadratisk PNG-billede.',
     'app_homepage' => 'Applikationsforside',
     'app_homepage_desc' => 'Vælg en visning, der skal vises på forsiden i stedet for standardvisningen. Sidetilladelser ignoreres for de valgte sider.',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 72f09eca030..323985b2d4a 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'See kustutab üleslaaditud ZIP-faili, ja seda ei saa tagasi võtta.',
     'import_errors' => 'Importimise vead',
     'import_errors_desc' => 'Importimisel esinesid järgmised vead:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Sirvi teisi lehti',
+    'breadcrumb_siblings_for_chapter' => 'Sirvi teisi peatükke',
+    'breadcrumb_siblings_for_book' => 'Sirvi teisi raamatuid',
+    'breadcrumb_siblings_for_bookshelf' => 'Sirvi teisi riiuleid',
 
     // Permissions and restrictions
     'permissions' => 'Õigused',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index eed0c92ca81..551a2e49672 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'アップロードされたインポートZIPファイルは削除され、元に戻すことはできません。',
     'import_errors' => 'インポートエラー',
     'import_errors_desc' => 'インポート中に次のエラーが発生しました：',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => '階層内のページ',
+    'breadcrumb_siblings_for_chapter' => '階層内のチャプタ',
+    'breadcrumb_siblings_for_book' => '階層内のブック',
+    'breadcrumb_siblings_for_bookshelf' => '階層内の棚',
 
     // Permissions and restrictions
     'permissions' => '権限',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 3d548e2a7c7..230c7a58b3a 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -122,7 +122,7 @@
     'recycle_bin_destroy' => 'verwijderde van prullenbak',
 
     // Comments
-    'commented_on'                => 'reageerde op',
+    'commented_on'                => 'plaatste opmerking in',
     'comment_create'              => 'voegde opmerking toe',
     'comment_update'              => 'paste opmerking aan',
     'comment_delete'              => 'verwijderde opmerking',
diff --git a/lang/nl/common.php b/lang/nl/common.php
index 47d8703cad9..bcd7fbe0853 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -40,7 +40,7 @@
     'delete_confirm' => 'Verwijdering bevestigen',
     'search' => 'Zoek',
     'search_clear' => 'Zoekopdracht wissen',
-    'reset' => 'Reset',
+    'reset' => 'Wissen',
     'remove' => 'Verwijder',
     'add' => 'Voeg toe',
     'configure' => 'Configureer',
diff --git a/lang/nl/editor.php b/lang/nl/editor.php
index 0963df71f08..cc3ad108c03 100644
--- a/lang/nl/editor.php
+++ b/lang/nl/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Superscript',
     'subscript' => 'Subscript',
     'text_color' => 'Tekstkleur',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Accentkleur',
     'custom_color' => 'Aangepaste kleur',
     'remove_color' => 'Verwijder kleur',
     'background_color' => 'Tekstmarkeringskleur',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index 967b7ecfbd0..b9be1f42b3c 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Dit zal het Zip-bestand van de import permanent verwijderen.',
     'import_errors' => 'Importeerfouten',
     'import_errors_desc' => 'De volgende fouten deden zich voor tijdens het importeren:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Navigeer pagina\'s op hetzelfde niveau',
+    'breadcrumb_siblings_for_chapter' => 'Navigeer hoofdstukken op hetzelfde niveau',
+    'breadcrumb_siblings_for_book' => 'Navigeer boeken op hetzelfde niveau',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigeer boekenplanken op hetzelfde niveau',
 
     // Permissions and restrictions
     'permissions' => 'Machtigingen',
@@ -272,11 +272,11 @@
     'pages_md_insert_drawing' => 'Tekening invoegen',
     'pages_md_show_preview' => 'Toon voorbeeld',
     'pages_md_sync_scroll' => 'Synchroniseer scrollen van voorbeeld',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Normale tekst bewerker',
     'pages_drawing_unsaved' => 'Niet-opgeslagen Tekening Gevonden',
     'pages_drawing_unsaved_confirm' => 'Er zijn niet-opgeslagen tekeninggegevens gevonden van een eerdere mislukte poging om de tekening op te slaan. Wil je deze niet-opgeslagen tekening herstellen en verder bewerken?',
     'pages_not_in_chapter' => 'Pagina is niet in een hoofdstuk',
-    'pages_move' => 'Pagina verplaatsten',
+    'pages_move' => 'Pagina Verplaatsen',
     'pages_copy' => 'Pagina kopiëren',
     'pages_copy_desination' => 'Kopieër bestemming',
     'pages_copy_success' => 'Pagina succesvol gekopieerd',
@@ -394,27 +394,27 @@
     'profile_not_created_shelves' => ':userName heeft geen boekenplanken gemaakt',
 
     // Comments
-    'comment' => 'Reactie',
-    'comments' => 'Reacties',
-    'comment_add' => 'Reactie toevoegen',
+    'comment' => 'Opmerking',
+    'comments' => 'Opmerkingen',
+    'comment_add' => 'Opmerking toevoegen',
     'comment_none' => 'Geen opmerkingen om weer te geven',
-    'comment_placeholder' => 'Laat hier een reactie achter',
-    'comment_thread_count' => ':count Reactie Thread|:count Reactie Threads',
+    'comment_placeholder' => 'Laat hier een opmerking achter',
+    'comment_thread_count' => ':count Opmerking Thread|:count Opmerking Threads',
     'comment_archived_count' => ':count Gearchiveerd',
     'comment_archived_threads' => 'Gearchiveerde Threads',
-    'comment_save' => 'Sla reactie op',
-    'comment_new' => 'Nieuwe reactie',
-    'comment_created' => 'reactie gegeven :createDiff',
+    'comment_save' => 'Sla opmerking op',
+    'comment_new' => 'Nieuwe opmerking',
+    'comment_created' => 'opmerking gegeven :createDiff',
     'comment_updated' => 'Updatet :updateDiff door :username',
     'comment_updated_indicator' => 'Bijgewerkt',
-    'comment_deleted_success' => 'Reactie verwijderd',
-    'comment_created_success' => 'Reactie toegevoegd',
-    'comment_updated_success' => 'Reactie bijgewerkt',
+    'comment_deleted_success' => 'Opmerking verwijderd',
+    'comment_created_success' => 'Opmerking toegevoegd',
+    'comment_updated_success' => 'Opmerking bijgewerkt',
     'comment_archive_success' => 'Opmerking gearchiveerd',
     'comment_unarchive_success' => 'Opmerking teruggehaald',
     'comment_view' => 'Opmerking weergeven',
     'comment_jump_to_thread' => 'Ga naar thread',
-    'comment_delete_confirm' => 'Weet je zeker dat je deze reactie wilt verwijderen?',
+    'comment_delete_confirm' => 'Weet je zeker dat je deze opmerking wilt verwijderen?',
     'comment_in_reply_to' => 'Als antwoord op :commentId',
     'comment_reference' => 'Verwijzing',
     'comment_reference_outdated' => '(Verouderd)',
@@ -466,11 +466,11 @@
     'watch_desc_comments_page' => 'Geef een melding van pagina wijzigingen en nieuwe opmerkingen.',
     'watch_change_default' => 'Standaardvoorkeuren voor meldingen wijzigen',
     'watch_detail_ignore' => 'Meldingen negeren',
-    'watch_detail_new' => 'Op de uitkijk voor nieuwe pagina\'s',
-    'watch_detail_updates' => 'Op de uitkijk voor nieuwe pagina\'s en aanpassingen',
-    'watch_detail_comments' => 'Op de uitkijk voor nieuwe pagina\'s, aanpassingen en opmerkingen',
-    'watch_detail_parent_book' => 'Op de uitkijk via hogerliggend boek',
-    'watch_detail_parent_book_ignore' => 'Aan het negeren via hogerliggend boek',
-    'watch_detail_parent_chapter' => 'Op de uitkijk via hogerliggend hoofdstuk',
-    'watch_detail_parent_chapter_ignore' => 'Aan het negeren via hogerliggend hoofdstuk',
+    'watch_detail_new' => 'Nieuwe pagina\'s aan het volgen',
+    'watch_detail_updates' => 'Nieuwe pagina\'s en aanpassingen aan het volgen',
+    'watch_detail_comments' => 'Nieuwe pagina\'s, aanpassingen en opmerkingen aan het volgen',
+    'watch_detail_parent_book' => 'Aan het volgen via bovenliggend boek',
+    'watch_detail_parent_book_ignore' => 'Aan het negeren via bovenliggend boek',
+    'watch_detail_parent_chapter' => 'Aan het volgen via bovenliggend hoofdstuk',
+    'watch_detail_parent_chapter_ignore' => 'Aan het negeren via bovenliggend hoofdstuk',
 ];
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index d8d5af7239c..9829986a2a7 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -87,11 +87,11 @@
     'role_cannot_remove_only_admin' => 'Deze gebruiker is de enige gebruiker die is toegewezen aan de beheerdersrol. Wijs de beheerdersrol toe aan een andere gebruiker voordat u probeert deze hier te verwijderen.',
 
     // Comments
-    'comment_list' => 'Er is een fout opgetreden tijdens het ophalen van de reacties.',
-    'cannot_add_comment_to_draft' => 'Je kunt geen reacties toevoegen aan een concept.',
-    'comment_add' => 'Er is een fout opgetreden tijdens het aanpassen / toevoegen van de reactie.',
-    'comment_delete' => 'Er is een fout opgetreden tijdens het verwijderen van de reactie.',
-    'empty_comment' => 'Kan geen lege reactie toevoegen.',
+    'comment_list' => 'Er is een fout opgetreden tijdens het ophalen van de opmerkingen.',
+    'cannot_add_comment_to_draft' => 'Je kunt geen opmerkingen toevoegen aan een concept.',
+    'comment_add' => 'Er is een fout opgetreden tijdens het aanpassen / toevoegen van de opmerking.',
+    'comment_delete' => 'Er is een fout opgetreden tijdens het verwijderen van de opmerking.',
+    'empty_comment' => 'Kan geen lege opmerking toevoegen.',
 
     // Error pages
     '404_page_not_found' => 'Pagina Niet Gevonden',
diff --git a/lang/nl/notifications.php b/lang/nl/notifications.php
index bc5f380c3cf..1e7035670da 100644
--- a/lang/nl/notifications.php
+++ b/lang/nl/notifications.php
@@ -5,7 +5,7 @@
 return [
 
     'new_comment_subject' => 'Nieuwe opmerking op pagina: :pageName',
-    'new_comment_intro' => 'Een gebruiker heeft gereageerd op een pagina in :appName:',
+    'new_comment_intro' => 'Een gebruiker heeft een opmerking geplaatst op een pagina in :appName:',
     'new_page_subject' => 'Nieuwe pagina: :pageName',
     'new_page_intro' => 'Een nieuwe pagina is gemaakt in :appName:',
     'updated_page_subject' => 'Aangepaste pagina: :pageName',
@@ -14,7 +14,7 @@
 
     'detail_page_name' => 'Pagina Naam:',
     'detail_page_path' => 'Paginapad:',
-    'detail_commenter' => 'Reageerder:',
+    'detail_commenter' => 'Commentator:',
     'detail_comment' => 'Opmerking:',
     'detail_created_by' => 'Gemaakt Door:',
     'detail_updated_by' => 'Aangepast Door:',
diff --git a/lang/nl/preferences.php b/lang/nl/preferences.php
index 5e385276c1a..d0e3623b9cc 100644
--- a/lang/nl/preferences.php
+++ b/lang/nl/preferences.php
@@ -27,7 +27,7 @@
     'notifications_save' => 'Voorkeuren opslaan',
     'notifications_update_success' => 'Voorkeuren voor meldingen zijn bijgewerkt!',
     'notifications_watched' => 'Gevolgde & Genegeerde Items',
-    'notifications_watched_desc' => 'Hieronder staan de items waarvoor aangepaste \'Volg\'-voorkeuren zijn toegepast. Om je voorkeuren voor deze items bij te werken, bekijk je het item en zoek je naar de \'Volg\' opties in de zijbalk.',
+    'notifications_watched_desc' => 'Hieronder staan de items waarvoor aangepaste volgvoorkeuren zijn toegepast. Om je voorkeuren voor deze items bij te werken, bekijk je het item en zoek je naar de volgopties in de zijbalk.',
 
     'auth' => 'Toegang & Beveiliging',
     'auth_change_password' => 'Wachtwoord Wijzigen',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 1aeabed10ed..3b4da75a985 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -43,9 +43,9 @@
     'app_footer_links_label' => 'Link label',
     'app_footer_links_url' => 'Link URL',
     'app_footer_links_add' => 'Voettekst link toevoegen',
-    'app_disable_comments' => 'Reacties uitschakelen',
-    'app_disable_comments_toggle' => 'Reacties uitschakelen',
-    'app_disable_comments_desc' => 'Schakel reacties uit op alle pagina\'s in de applicatie. <br> Bestaande reacties worden niet getoond.',
+    'app_disable_comments' => 'Opmerkingen uitschakelen',
+    'app_disable_comments_toggle' => 'Opmerkingen uitschakelen',
+    'app_disable_comments_desc' => 'Schakel opmerkingen uit op alle pagina\'s in de applicatie. <br> Bestaande opmerkingen worden niet getoond.',
 
     // Color settings
     'color_scheme' => 'Kleurenschema van applicatie',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index bd0c45f31b5..d26f7edfe08 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -29,10 +29,10 @@
 
     // Toolbar
     'formats' => 'Форматы',
-    'header_large' => 'Большой',
-    'header_medium' => 'Средний',
-    'header_small' => 'Маленький',
-    'header_tiny' => 'Крошечный',
+    'header_large' => 'Крупный заголовок',
+    'header_medium' => 'Средний заголовок',
+    'header_small' => 'Небольшой заголовок',
+    'header_tiny' => 'Маленький заголовок',
     'paragraph' => 'Обычный текст',
     'blockquote' => 'Цитата',
     'inline_code' => 'Встроенный код',
diff --git a/lang/uk/common.php b/lang/uk/common.php
index 8539a93cf2e..d71f5716200 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -30,8 +30,8 @@
     'create' => 'Створити',
     'update' => 'Оновити',
     'edit' => 'Редагувати',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Архів',
+    'unarchive' => 'Розархівувати',
     'sort' => 'Сортувати',
     'move' => 'Перемістити',
     'copy' => 'Копіювати',
diff --git a/lang/uk/editor.php b/lang/uk/editor.php
index 6dbeb509bc4..b9024e052b4 100644
--- a/lang/uk/editor.php
+++ b/lang/uk/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Верхній індекс',
     'subscript' => 'Нижній індекс',
     'text_color' => 'Колір тексту',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Колір підсвічування',
     'custom_color' => 'Власний колір',
     'remove_color' => 'Видалити колір',
     'background_color' => 'Колір фону',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index 72853697b9b..cf79b530cff 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Це видалить завантажений імпорт файлу ZIP, і його не можна буде скасувати.',
     'import_errors' => 'Помилки імпорту',
     'import_errors_desc' => 'Під час спроби імпорту відбулися наступні помилки:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Переглянути інші сторінки',
+    'breadcrumb_siblings_for_chapter' => 'Переглянути інші розділи',
+    'breadcrumb_siblings_for_book' => 'Переглянути інші книги',
+    'breadcrumb_siblings_for_bookshelf' => 'Переглянути інші полиці',
 
     // Permissions and restrictions
     'permissions' => 'Дозволи',
@@ -252,7 +252,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Стабілізувати вміст)',
     'pages_edit_switch_to_wysiwyg' => 'Змінити редактор на WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Перейти на новий WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(На бета-тестування)',
     'pages_edit_set_changelog' => 'Встановити журнал змін',
     'pages_edit_enter_changelog_desc' => 'Введіть короткий опис внесених вами змін',
     'pages_edit_enter_changelog' => 'Введіть список змін',
@@ -272,7 +272,7 @@
     'pages_md_insert_drawing' => 'Вставити малюнок',
     'pages_md_show_preview' => 'Показати попередній перегляд',
     'pages_md_sync_scroll' => 'Синхронізація прокручування попереднього перегляду',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Текстовий редактор',
     'pages_drawing_unsaved' => 'Знайдено незбережену чернетку',
     'pages_drawing_unsaved_confirm' => 'Незбережені чернетки були знайдені з попередньої спроби зберегти звіт. Хочете відновити і продовжити редагування цієї чернетки?',
     'pages_not_in_chapter' => 'Сторінка не знаходиться в розділі',
@@ -397,11 +397,11 @@
     'comment' => 'Коментар',
     'comments' => 'Коментарі',
     'comment_add' => 'Додати коментар',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Немає коментарів для відображення',
     'comment_placeholder' => 'Залиште коментар тут',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count тема коментарів|:count теми коментарів',
+    'comment_archived_count' => 'Архівовано :count',
+    'comment_archived_threads' => 'Архівовані теми',
     'comment_save' => 'Зберегти коментар',
     'comment_new' => 'Новий коментар',
     'comment_created' => 'прокоментував :createDiff',
@@ -410,14 +410,14 @@
     'comment_deleted_success' => 'Коментар видалено',
     'comment_created_success' => 'Коментар додано',
     'comment_updated_success' => 'Коментар оновлено',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Коментар архівовано',
+    'comment_unarchive_success' => 'Коментар розархівовано',
+    'comment_view' => 'Переглянути коментар',
+    'comment_jump_to_thread' => 'Перейти до теми',
     'comment_delete_confirm' => 'Ви впевнені, що хочете видалити цей коментар?',
     'comment_in_reply_to' => 'У відповідь на :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'По посиланню',
+    'comment_reference_outdated' => '(Застарілий)',
     'comment_editor_explain' => 'Ось коментарі, які залишилися на цій сторінці. Коментарі можна додати та керовані при перегляді збереженої сторінки.',
 
     // Revision
diff --git a/lang/vi/editor.php b/lang/vi/editor.php
index d76a70815d7..fd3dbdfb12e 100644
--- a/lang/vi/editor.php
+++ b/lang/vi/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Chỉ số trên',
     'subscript' => 'Chỉ số dưới',
     'text_color' => 'Màu chữ',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Màu đánh dấu',
     'custom_color' => 'Màu tùy chỉnh',
     'remove_color' => 'Xóa màu',
     'background_color' => 'Màu nền',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index 1914d32c80f..f538f993ca2 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -60,13 +60,13 @@
     'import_location' => 'Vị trí nhập',
     'import_location_desc' => 'Chọn vị trí đích cho nội dung đã nhập của bạn. Bạn sẽ cần các quyền liên quan để tạo trong vị trí bạn chọn.',
     'import_delete_confirm' => 'Bạn có chắc chắn muốn xóa lượt nhập này không?',
-    'import_delete_desc' => 'Thao tác này sẽ xóa tệp ZIP nhập đã tải lên và không thể hoàn tác.',
-    'import_errors' => 'Lỗi nhập',
+    'import_delete_desc' => 'Thao tác này sẽ xóa tệp ZIP đã tải lên, và không thể hoàn tác.',
+    'import_errors' => 'Lỗi khi nhập dữ liệu',
     'import_errors_desc' => 'Các lỗi sau đã xảy ra trong quá trình nhập:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Điều hướng anh chị em cho trang',
+    'breadcrumb_siblings_for_chapter' => 'Điều hướng anh chị em cho chương',
+    'breadcrumb_siblings_for_book' => 'Điều hướng anh chị em cho sách',
+    'breadcrumb_siblings_for_bookshelf' => 'Điều hướng anh chị em cho kệ sách',
 
     // Permissions and restrictions
     'permissions' => 'Quyền',

From 955837c9aa16e72f3e701bd8737e05c8ae715b26 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 28 Aug 2025 15:02:26 +0100
Subject: [PATCH 647/666] Packages: Upgraded php deps to latest versions

---
 composer.lock | 202 +++++++++++++++++++++++++++++---------------------
 1 file changed, 117 insertions(+), 85 deletions(-)

diff --git a/composer.lock b/composer.lock
index 54ea9927511..fe7bfbb389b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.354.0",
+            "version": "3.356.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "014ce3465277cf78a05e60c04ce04c9893733bf2"
+                "reference": "079d1936bef94cb7d76113b62e993f2996db6e24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/014ce3465277cf78a05e60c04ce04c9893733bf2",
-                "reference": "014ce3465277cf78a05e60c04ce04c9893733bf2",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/079d1936bef94cb7d76113b62e993f2996db6e24",
+                "reference": "079d1936bef94cb7d76113b62e993f2996db6e24",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.354.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.356.6"
             },
-            "time": "2025-08-14T18:10:08+00:00"
+            "time": "2025-08-27T18:06:10+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1117,22 +1117,22 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.9.3",
+            "version": "7.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
-                "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
-                "guzzlehttp/psr7": "^2.7.0",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1223,7 +1223,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
             },
             "funding": [
                 {
@@ -1239,20 +1239,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-27T13:37:11+00:00"
+            "time": "2025-08-23T22:36:01+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.2.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
-                "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
                 "shasum": ""
             },
             "require": {
@@ -1260,7 +1260,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "type": "library",
             "extra": {
@@ -1306,7 +1306,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.2.0"
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
             },
             "funding": [
                 {
@@ -1322,20 +1322,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-27T13:27:01+00:00"
+            "time": "2025-08-22T14:34:08+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.7.1",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
+                "reference": "21dc724a0583619cd1652f673303492272778051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
-                "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+                "reference": "21dc724a0583619cd1652f673303492272778051",
                 "shasum": ""
             },
             "require": {
@@ -1351,7 +1351,7 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "http-interop/http-factory-tests": "0.9.0",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1422,7 +1422,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.7.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
             },
             "funding": [
                 {
@@ -1438,20 +1438,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-27T12:30:47+00:00"
+            "time": "2025-08-23T21:21:41+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.4",
+            "version": "v1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
+                "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
-                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/4f4bbd4e7172148801e76e3decc1e559bdee34e1",
+                "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1",
                 "shasum": ""
             },
             "require": {
@@ -1460,7 +1460,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25",
                 "uri-template/tests": "1.0.0"
             },
             "type": "library",
@@ -1508,7 +1508,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.5"
             },
             "funding": [
                 {
@@ -1524,7 +1524,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-03T10:55:03+00:00"
+            "time": "2025-08-22T14:27:06+00:00"
         },
         {
             "name": "intervention/gif",
@@ -3866,16 +3866,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.3",
+            "version": "1.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
+                "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
-                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
+                "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
                 "shasum": ""
             },
             "require": {
@@ -3883,7 +3883,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
             },
             "type": "library",
             "extra": {
@@ -3925,7 +3925,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.4"
             },
             "funding": [
                 {
@@ -3937,7 +3937,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-20T21:41:07+00:00"
+            "time": "2025-08-21T11:53:16+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -6311,7 +6311,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -6370,7 +6370,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6381,6 +6381,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6390,16 +6394,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
-                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
                 "shasum": ""
             },
             "require": {
@@ -6448,7 +6452,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6459,16 +6463,20 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-06-27T09:58:17+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
@@ -6531,7 +6539,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6542,6 +6550,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6551,7 +6563,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -6612,7 +6624,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6623,6 +6635,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6632,7 +6648,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -6693,7 +6709,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6704,6 +6720,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6713,7 +6733,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -6773,7 +6793,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6784,6 +6804,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -6793,16 +6817,16 @@
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
-                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
                 "shasum": ""
             },
             "require": {
@@ -6849,7 +6873,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6860,16 +6884,20 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-07-08T02:45:35+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
@@ -6928,7 +6956,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -6939,6 +6967,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -8182,16 +8214,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "6431d010dd383a9279eb8874a76ddb571738564a"
+                "reference": "3c223047e374befd1b64959784685d6ecccf66aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/6431d010dd383a9279eb8874a76ddb571738564a",
-                "reference": "6431d010dd383a9279eb8874a76ddb571738564a",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/3c223047e374befd1b64959784685d6ecccf66aa",
+                "reference": "3c223047e374befd1b64959784685d6ecccf66aa",
                 "shasum": ""
             },
             "require": {
@@ -8259,7 +8291,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.6.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.6.1"
             },
             "funding": [
                 {
@@ -8267,7 +8299,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-07-11T06:52:52+00:00"
+            "time": "2025-08-25T07:24:56+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -8689,16 +8721,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.10",
+            "version": "11.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76"
+                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1a800a7446add2d79cc6b3c01c45381810367d76",
-                "reference": "1a800a7446add2d79cc6b3c01c45381810367d76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
+                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
                 "shasum": ""
             },
             "require": {
@@ -8755,7 +8787,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/show"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.11"
             },
             "funding": [
                 {
@@ -8775,7 +8807,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-18T08:56:18+00:00"
+            "time": "2025-08-27T14:37:49+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9024,16 +9056,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.32",
+            "version": "11.5.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "101e132dcf9e74a1eb3a309b4f686114ae8f7f36"
+                "reference": "d341ee94ee5007b286fc7907b383aae6b5b3cc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/101e132dcf9e74a1eb3a309b4f686114ae8f7f36",
-                "reference": "101e132dcf9e74a1eb3a309b4f686114ae8f7f36",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d341ee94ee5007b286fc7907b383aae6b5b3cc91",
+                "reference": "d341ee94ee5007b286fc7907b383aae6b5b3cc91",
                 "shasum": ""
             },
             "require": {
@@ -9047,7 +9079,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.10",
+                "phpunit/php-code-coverage": "^11.0.11",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
@@ -9105,7 +9137,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.32"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.35"
             },
             "funding": [
                 {
@@ -9129,7 +9161,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-12T07:32:49+00:00"
+            "time": "2025-08-28T05:13:54+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From 481f35606881432fbb1a73dad55e4cc66bf40917 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 28 Aug 2025 17:39:10 +0100
Subject: [PATCH 648/666] Updated translator & dependency attribution before
 release v25.07.2

---
 .github/translators.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/translators.txt b/.github/translators.txt
index bcedaaf62a2..cd08062056c 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -503,3 +503,5 @@ Firr (FirrV) :: Russian
 João Faro (FaroJoaoFaro) :: Portuguese
 Danilo dos Santos Barbosa (bozochegou) :: Portuguese, Brazilian
 Chris (furesoft) :: German
+Silvia Isern (eiendragon) :: Catalan
+Dennis Kron Pedersen (ahjdp) :: Danish

From cdbac63b401a74ca53a307e78e86da4b02b33c6e Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 30 Aug 2025 11:10:11 +0100
Subject: [PATCH 649/666] Framework: Updated to Laravel 12

---
 app/Config/cache.php    |   2 +-
 app/Config/database.php |   6 +-
 composer.json           |   4 +-
 composer.lock           | 392 +++++++++++++++++++++++++++++-----------
 4 files changed, 288 insertions(+), 116 deletions(-)

diff --git a/app/Config/cache.php b/app/Config/cache.php
index 9a0be8eabfc..01c822a653b 100644
--- a/app/Config/cache.php
+++ b/app/Config/cache.php
@@ -85,6 +85,6 @@
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'),
+    'prefix' => env('CACHE_PREFIX', 'bookstack_cache_'),
 
 ];
diff --git a/app/Config/database.php b/app/Config/database.php
index 8d38a86dfed..5edafa777c8 100644
--- a/app/Config/database.php
+++ b/app/Config/database.php
@@ -75,7 +75,7 @@
             'collation'      => 'utf8mb4_unicode_ci',
             // Prefixes are only semi-supported and may be unstable
             // since they are not tested as part of our automated test suite.
-            // If used, the prefix should not be changed otherwise you will likely receive errors.
+            // If used, the prefix should not be changed; otherwise you will likely receive errors.
             'prefix'         => env('DB_TABLE_PREFIX', ''),
             'prefix_indexes' => true,
             'strict'         => false,
@@ -103,9 +103,7 @@
     ],
 
     // Migration Repository Table
-    // This table keeps track of all the migrations that have already run for
-    // your application. Using this information, we can determine which of
-    // the migrations on disk haven't actually been run in the database.
+    // This table keeps track of all the migrations that have already run for the application.
     'migrations' => 'migrations',
 
     // Redis configuration to use if set
diff --git a/composer.json b/composer.json
index 2ea1d802b59..52fc4581b1e 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
-        "laravel/framework": "^v11.37",
+        "laravel/framework": "^v12.26.4",
         "laravel/socialite": "^5.10",
         "laravel/tinker": "^2.8",
         "league/commonmark": "^2.3",
@@ -44,7 +44,7 @@
         "fakerphp/faker": "^1.21",
         "itsgoingd/clockwork": "^5.1",
         "mockery/mockery": "^1.5",
-        "nunomaduro/collision": "^8.1",
+        "nunomaduro/collision": "^8.6",
         "larastan/larastan": "^v3.0",
         "phpunit/phpunit": "^11.5",
         "squizlabs/php_codesniffer": "^3.7",
diff --git a/composer.lock b/composer.lock
index fe7bfbb389b..2c7d2cede0f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b7695cb9945ec550970c67da96934daf",
+    "content-hash": "e5783454db9e549054438a448bcc9570",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.356.6",
+            "version": "3.356.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "079d1936bef94cb7d76113b62e993f2996db6e24"
+                "reference": "3efa8c62c11fedb17b90f60b2d3a9f815b406e63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/079d1936bef94cb7d76113b62e993f2996db6e24",
-                "reference": "079d1936bef94cb7d76113b62e993f2996db6e24",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3efa8c62c11fedb17b90f60b2d3a9f815b406e63",
+                "reference": "3efa8c62c11fedb17b90f60b2d3a9f815b406e63",
                 "shasum": ""
             },
             "require": {
@@ -153,9 +153,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.356.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.356.8"
             },
-            "time": "2025-08-27T18:06:10+00:00"
+            "time": "2025-08-29T18:06:18+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -213,16 +213,16 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.3",
+            "version": "0.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
                 "shasum": ""
             },
             "require": {
@@ -261,7 +261,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.3"
+                "source": "https://github.com/brick/math/tree/0.13.1"
             },
             "funding": [
                 {
@@ -269,7 +269,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-28T13:11:00+00:00"
+            "time": "2025-03-29T13:50:30+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -1739,20 +1739,20 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.45.2",
+            "version": "v12.26.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a"
+                "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d134bf11e2208c0c5bd488cf19e612ca176b820a",
-                "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/085a367a32ba86fcfa647bfc796098ae6f795b09",
+                "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
+                "brick/math": "^0.11|^0.12|^0.13",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
                 "dragonmantank/cron-expression": "^3.4",
@@ -1767,32 +1767,34 @@
                 "fruitcake/php-cors": "^1.3",
                 "guzzlehttp/guzzle": "^7.8.2",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
+                "laravel/prompts": "^0.3.0",
                 "laravel/serializable-closure": "^1.3|^2.0",
                 "league/commonmark": "^2.7",
                 "league/flysystem": "^3.25.1",
                 "league/flysystem-local": "^3.25.1",
                 "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.72.6|^3.8.4",
+                "nesbot/carbon": "^3.8.4",
                 "nunomaduro/termwind": "^2.0",
                 "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^7.0.3",
-                "symfony/error-handler": "^7.0.3",
-                "symfony/finder": "^7.0.3",
+                "symfony/console": "^7.2.0",
+                "symfony/error-handler": "^7.2.0",
+                "symfony/finder": "^7.2.0",
                 "symfony/http-foundation": "^7.2.0",
-                "symfony/http-kernel": "^7.0.3",
-                "symfony/mailer": "^7.0.3",
-                "symfony/mime": "^7.0.3",
-                "symfony/polyfill-php83": "^1.31",
-                "symfony/process": "^7.0.3",
-                "symfony/routing": "^7.0.3",
-                "symfony/uid": "^7.0.3",
-                "symfony/var-dumper": "^7.0.3",
+                "symfony/http-kernel": "^7.2.0",
+                "symfony/mailer": "^7.2.0",
+                "symfony/mime": "^7.2.0",
+                "symfony/polyfill-php83": "^1.33",
+                "symfony/polyfill-php84": "^1.33",
+                "symfony/polyfill-php85": "^1.33",
+                "symfony/process": "^7.2.0",
+                "symfony/routing": "^7.2.0",
+                "symfony/uid": "^7.2.0",
+                "symfony/var-dumper": "^7.2.0",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
                 "vlucas/phpdotenv": "^5.6.1",
                 "voku/portable-ascii": "^2.0.2"
@@ -1856,17 +1858,17 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.16.0",
-                "pda/pheanstalk": "^5.0.6",
+                "orchestra/testbench-core": "^10.6.3",
+                "pda/pheanstalk": "^5.0.6|^7.0.0",
                 "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^2.0",
-                "phpunit/phpunit": "^10.5.35|^11.3.6|^12.0.1",
-                "predis/predis": "^2.3",
+                "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
+                "predis/predis": "^2.3|^3.0",
                 "resend/resend-php": "^0.10.0",
-                "symfony/cache": "^7.0.3",
-                "symfony/http-client": "^7.0.3",
-                "symfony/psr-http-message-bridge": "^7.0.3",
-                "symfony/translation": "^7.0.3"
+                "symfony/cache": "^7.2.0",
+                "symfony/http-client": "^7.2.0",
+                "symfony/psr-http-message-bridge": "^7.2.0",
+                "symfony/translation": "^7.2.0"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
@@ -1892,22 +1894,22 @@
                 "mockery/mockery": "Required to use mocking (^1.6).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
                 "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.3.6|^12.0.1).",
-                "predis/predis": "Required to use the predis connector (^2.3).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.5.3|^12.0.1).",
+                "predis/predis": "Required to use the predis connector (^2.3|^3.0).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
                 "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.2).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "11.x-dev"
+                    "dev-master": "12.x-dev"
                 }
             },
             "autoload": {
@@ -1950,7 +1952,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-08-13T20:28:00+00:00"
+            "time": "2025-08-29T14:15:53+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -5403,16 +5405,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
                 "shasum": ""
             },
             "require": {
@@ -5477,7 +5479,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.2"
+                "source": "https://github.com/symfony/console/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -5497,7 +5499,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-30T17:13:41+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5714,16 +5716,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
                 "shasum": ""
             },
             "require": {
@@ -5774,7 +5776,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -5785,12 +5787,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-22T09:11:45+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -5938,16 +5944,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6"
+                "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7475561ec27020196c49bb7c4f178d33d7d3dc00",
+                "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00",
                 "shasum": ""
             },
             "require": {
@@ -5997,7 +6003,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -6017,20 +6023,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-20T08:04:18+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c"
+                "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6ecc895559ec0097e221ed2fd5eb44d5fede083c",
-                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/72c304de37e1a1cec6d5d12b81187ebd4850a17b",
+                "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b",
                 "shasum": ""
             },
             "require": {
@@ -6115,7 +6121,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -6135,20 +6141,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-31T10:45:04+00:00"
+            "time": "2025-08-29T08:23:45+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b"
+                "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
-                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/a32f3f45f1990db8c4341d5122a7d3a381c7e575",
+                "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575",
                 "shasum": ""
             },
             "require": {
@@ -6199,7 +6205,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.2"
+                "source": "https://github.com/symfony/mailer/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -6219,7 +6225,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
         },
         {
             "name": "symfony/mime",
@@ -6895,6 +6901,166 @@
             ],
             "time": "2025-07-08T02:45:35+00:00"
         },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-24T13:30:11+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php85",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php85.git",
+                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
+                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php85\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-23T16:12:55+00:00"
+        },
         {
             "name": "symfony/polyfill-uuid",
             "version": "v1.33.0",
@@ -6980,16 +7146,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "url": "https://api.github.com/repos/symfony/process/zipball/32241012d521e2e8a9d713adb0812bb773b907f1",
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1",
                 "shasum": ""
             },
             "require": {
@@ -7021,7 +7187,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.0"
+                "source": "https://github.com/symfony/process/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -7032,12 +7198,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-17T09:11:12+00:00"
+            "time": "2025-08-18T09:42:54+00:00"
         },
         {
             "name": "symfony/routing",
@@ -7209,16 +7379,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
                 "shasum": ""
             },
             "require": {
@@ -7276,7 +7446,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -7296,20 +7466,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90"
+                "reference": "e0837b4cbcef63c754d89a4806575cada743a38d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/81b48f4daa96272efcce9c7a6c4b58e629df3c90",
-                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e0837b4cbcef63c754d89a4806575cada743a38d",
+                "reference": "e0837b4cbcef63c754d89a4806575cada743a38d",
                 "shasum": ""
             },
             "require": {
@@ -7376,7 +7546,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.2"
+                "source": "https://github.com/symfony/translation/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -7396,7 +7566,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-30T17:31:46+00:00"
+            "time": "2025-08-01T21:02:37+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7552,16 +7722,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "53205bea27450dc5c65377518b3275e126d45e75"
+                "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53205bea27450dc5c65377518b3275e126d45e75",
-                "reference": "53205bea27450dc5c65377518b3275e126d45e75",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/34d8d4c4b9597347306d1ec8eb4e1319b1e6986f",
+                "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f",
                 "shasum": ""
             },
             "require": {
@@ -7615,7 +7785,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.2"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -7635,7 +7805,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-29T20:02:46+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -10319,16 +10489,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.3.1",
+            "version": "v7.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "8b2ee2e06ab99fa5f067b6699296d4e35c156bb9"
+                "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8b2ee2e06ab99fa5f067b6699296d4e35c156bb9",
-                "reference": "8b2ee2e06ab99fa5f067b6699296d4e35c156bb9",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/efa076ea0eeff504383ff0dcf827ea5ce15690ba",
+                "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba",
                 "shasum": ""
             },
             "require": {
@@ -10366,7 +10536,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.1"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.3"
             },
             "funding": [
                 {
@@ -10377,12 +10547,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-15T10:07:06+00:00"
+            "time": "2025-08-06T20:13:54+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 64b06bcf618455f348648aeac2cf1f295726e955 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 30 Aug 2025 11:47:22 +0100
Subject: [PATCH 650/666] Packages: Updated predis

---
 composer.json |  2 +-
 composer.lock | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 52fc4581b1e..2285a22cb18 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "onelogin/php-saml": "^4.0",
         "phpseclib/phpseclib": "^3.0",
         "pragmarx/google2fa": "^8.0",
-        "predis/predis": "^2.1",
+        "predis/predis": "^3.2",
         "socialiteproviders/discord": "^4.1",
         "socialiteproviders/gitlab": "^4.1",
         "socialiteproviders/microsoft-azure": "^5.1",
diff --git a/composer.lock b/composer.lock
index 2c7d2cede0f..1dbb752034f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e5783454db9e549054438a448bcc9570",
+    "content-hash": "506bcb9f80a5fd736b79c8e138efafa0",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -4105,26 +4105,27 @@
         },
         {
             "name": "predis/predis",
-            "version": "v2.4.0",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b"
+                "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/f49e13ee3a2a825631562aa0223ac922ec5d058b",
-                "reference": "f49e13ee3a2a825631562aa0223ac922ec5d058b",
+                "url": "https://api.github.com/repos/predis/predis/zipball/9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",
+                "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.2 || ^8.0",
+                "psr/http-message": "^1.0|^2.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.3",
                 "phpstan/phpstan": "^1.9",
                 "phpunit/phpcov": "^6.0 || ^8.0",
-                "phpunit/phpunit": "^8.0 || ^9.4"
+                "phpunit/phpunit": "^8.0 || ~9.4.4"
             },
             "suggest": {
                 "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
@@ -4155,7 +4156,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.4.0"
+                "source": "https://github.com/predis/predis/tree/v3.2.0"
             },
             "funding": [
                 {
@@ -4163,7 +4164,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-04-30T15:16:02+00:00"
+            "time": "2025-08-06T06:41:24+00:00"
         },
         {
             "name": "psr/clock",

From a27ce6e9154387ac24ad3d3df3321ddb19dd7592 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sat, 30 Aug 2025 22:18:09 +0100
Subject: [PATCH 651/666] Packages: Updated npm packages

Spent way too many hours debugging through issues from jsdom changes.
---
 package-lock.json                             | 3213 ++++++++++-------
 package.json                                  |   46 +-
 .../wysiwyg/lexical/core/LexicalSelection.ts  |    2 +
 .../core/__tests__/unit/LexicalEditor.test.ts |    4 +-
 .../core/__tests__/unit/LexicalNode.test.ts   |    2 +-
 .../lexical/core/__tests__/utils/index.ts     |   22 +
 .../__tests__/unit/LexicalElementNode.test.ts |   13 +-
 .../unit/LexicalHeadlessEditor.test.ts        |    8 +-
 .../__tests__/unit/LexicalSelection.test.ts   |   31 +-
 .../selection/__tests__/utils/index.ts        |    5 +-
 .../__tests__/unit/LexicalTableNode.test.ts   |    2 +-
 11 files changed, 2071 insertions(+), 1277 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 079e397700a..fb6a1d4fa01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,47 +5,47 @@
   "packages": {
     "": {
       "dependencies": {
-        "@codemirror/commands": "^6.8.0",
+        "@codemirror/commands": "^6.8.1",
         "@codemirror/lang-css": "^6.3.1",
         "@codemirror/lang-html": "^6.4.9",
-        "@codemirror/lang-javascript": "^6.2.3",
-        "@codemirror/lang-json": "^6.0.1",
-        "@codemirror/lang-markdown": "^6.3.2",
-        "@codemirror/lang-php": "^6.0.1",
+        "@codemirror/lang-javascript": "^6.2.4",
+        "@codemirror/lang-json": "^6.0.2",
+        "@codemirror/lang-markdown": "^6.3.4",
+        "@codemirror/lang-php": "^6.0.2",
         "@codemirror/lang-xml": "^6.1.0",
-        "@codemirror/language": "^6.10.8",
-        "@codemirror/legacy-modes": "^6.4.3",
+        "@codemirror/language": "^6.11.3",
+        "@codemirror/legacy-modes": "^6.5.1",
         "@codemirror/state": "^6.5.2",
-        "@codemirror/theme-one-dark": "^6.1.2",
-        "@codemirror/view": "^6.36.3",
+        "@codemirror/theme-one-dark": "^6.1.3",
+        "@codemirror/view": "^6.38.1",
         "@lezer/highlight": "^1.2.1",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-        "@types/jest": "^29.5.14",
-        "codemirror": "^6.0.1",
-        "idb-keyval": "^6.2.1",
+        "@types/jest": "^30.0.0",
+        "codemirror": "^6.0.2",
+        "idb-keyval": "^6.2.2",
         "markdown-it": "^14.1.0",
         "markdown-it-task-lists": "^2.1.1",
         "snabbdom": "^3.6.2",
         "sortablejs": "^1.15.6"
       },
       "devDependencies": {
-        "@eslint/js": "^9.21.0",
-        "@lezer/generator": "^1.7.2",
+        "@eslint/js": "^9.34.0",
+        "@lezer/generator": "^1.8.0",
         "@types/markdown-it": "^14.1.2",
         "@types/sortablejs": "^1.15.8",
         "chokidar-cli": "^3.0",
-        "esbuild": "^0.25.0",
-        "eslint": "^9.21.0",
-        "eslint-plugin-import": "^2.31.0",
-        "jest": "^29.7.0",
-        "jest-environment-jsdom": "^29.7.0",
-        "livereload": "^0.9.3",
+        "esbuild": "^0.25.9",
+        "eslint": "^9.34.0",
+        "eslint-plugin-import": "^2.32.0",
+        "jest": "^30.1.1",
+        "jest-environment-jsdom": "^30.1.1",
+        "livereload": "^0.10.3",
         "npm-run-all": "^4.1.5",
-        "sass": "^1.85.0",
-        "ts-jest": "^29.2.6",
+        "sass": "^1.91.0",
+        "ts-jest": "^29.4.1",
         "ts-node": "^10.9.2",
-        "typescript": "5.7.*"
+        "typescript": "5.9.*"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -62,6 +62,27 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@asamuzakjp/css-color": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
+      "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.3",
+        "@csstools/css-color-parser": "^3.0.9",
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3",
+        "lru-cache": "^10.4.3"
+      }
+    },
+    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -536,9 +557,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",
-      "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -636,9 +657,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.3.tgz",
-      "integrity": "sha512-1fn1hQAPWlSSMCvnF810AkhWpNLkJpl66CRfIy3vVl20Sl4NwChkorCHqpMtNbXr1EuMJsrDnhEpjZxKZ2UX3A==",
+      "version": "6.3.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.4.tgz",
+      "integrity": "sha512-fBm0BO03azXnTAsxhONDYHi/qWSI+uSEIpzKM7h/bkIc9fHnFp9y7KTMXKON0teNT97pFhc1a9DQTtWBYEZ7ug==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
@@ -678,9 +699,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.2.tgz",
-      "integrity": "sha512-p44TsNArL4IVXDTbapUmEkAlvWs2CFQbcfc0ymDsis1kH2wh0gcY96AS29c/vp2d0y2Tquk1EDSaawpzilUiAw==",
+      "version": "6.11.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.3.tgz",
+      "integrity": "sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -779,10 +800,159 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@csstools/color-helpers": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/css-calc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-color-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.1.0",
+        "@csstools/css-calc": "^2.1.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@emnapi/core": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz",
+      "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.1.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
+      "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
+      "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
-      "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
       "cpu": [
         "ppc64"
       ],
@@ -797,9 +967,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
-      "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
       "cpu": [
         "arm"
       ],
@@ -814,9 +984,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
-      "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
       "cpu": [
         "arm64"
       ],
@@ -831,9 +1001,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
-      "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
       "cpu": [
         "x64"
       ],
@@ -848,9 +1018,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
-      "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
       "cpu": [
         "arm64"
       ],
@@ -865,9 +1035,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
-      "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
       "cpu": [
         "x64"
       ],
@@ -882,9 +1052,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
-      "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
       "cpu": [
         "arm64"
       ],
@@ -899,9 +1069,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
-      "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
       "cpu": [
         "x64"
       ],
@@ -916,9 +1086,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
-      "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
       "cpu": [
         "arm"
       ],
@@ -933,9 +1103,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
-      "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
       "cpu": [
         "arm64"
       ],
@@ -950,9 +1120,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
-      "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
       "cpu": [
         "ia32"
       ],
@@ -967,9 +1137,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
-      "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
       "cpu": [
         "loong64"
       ],
@@ -984,9 +1154,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
-      "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
       "cpu": [
         "mips64el"
       ],
@@ -1001,9 +1171,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
-      "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
       "cpu": [
         "ppc64"
       ],
@@ -1018,9 +1188,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
-      "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
       "cpu": [
         "riscv64"
       ],
@@ -1035,9 +1205,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
-      "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
       "cpu": [
         "s390x"
       ],
@@ -1052,9 +1222,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
-      "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
       "cpu": [
         "x64"
       ],
@@ -1069,9 +1239,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
-      "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
       "cpu": [
         "arm64"
       ],
@@ -1086,9 +1256,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
-      "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
       "cpu": [
         "x64"
       ],
@@ -1103,9 +1273,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
-      "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
       "cpu": [
         "arm64"
       ],
@@ -1120,9 +1290,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
-      "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
       "cpu": [
         "x64"
       ],
@@ -1137,9 +1307,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
-      "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
       "cpu": [
         "arm64"
       ],
@@ -1154,9 +1324,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
-      "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
       "cpu": [
         "x64"
       ],
@@ -1171,9 +1341,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
-      "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
       "cpu": [
         "arm64"
       ],
@@ -1188,9 +1358,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
-      "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
       "cpu": [
         "ia32"
       ],
@@ -1205,9 +1375,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
-      "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+      "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
       "cpu": [
         "x64"
       ],
@@ -1279,9 +1449,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1289,9 +1459,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1326,9 +1496,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.31.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
-      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
+      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1349,13 +1519,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-      "integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1428,6 +1598,80 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -1546,61 +1790,61 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.1.1.tgz",
+      "integrity": "sha512-f7TGqR1k4GtN5pyFrKmq+ZVndesiwLU33yDpJIGMS9aW+j6hKjue7ljeAdznBsH9kAnxUWe2Y+Y3fLV/FJt3gA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "chalk": "^4.1.2",
+        "jest-message-util": "30.1.0",
+        "jest-util": "30.0.5",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.1.1.tgz",
+      "integrity": "sha512-3ncU9peZ3D2VdgRkdZtUceTrDgX5yiDRwAFjtxNfU22IiZrpVWlv/FogzDLYSJQptQGfFo3PcHK86a2oG6WUGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/reporters": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/console": "30.1.1",
+        "@jest/pattern": "30.0.1",
+        "@jest/reporters": "30.1.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/transform": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.7.0",
-        "jest-config": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-resolve-dependencies": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-changed-files": "30.0.5",
+        "jest-config": "30.1.1",
+        "jest-haste-map": "30.1.0",
+        "jest-message-util": "30.1.0",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.1.0",
+        "jest-resolve-dependencies": "30.1.1",
+        "jest-runner": "30.1.1",
+        "jest-runtime": "30.1.1",
+        "jest-snapshot": "30.1.1",
+        "jest-util": "30.0.5",
+        "jest-validate": "30.1.0",
+        "jest-watcher": "30.1.1",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.5",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -1611,116 +1855,174 @@
         }
       }
     },
+    "node_modules/@jest/diff-sequences": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz",
+      "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==",
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
     "node_modules/@jest/environment": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.1.1.tgz",
+      "integrity": "sha512-yWHbU+3j7ehQE+NRpnxRvHvpUhoohIjMePBbIr8lfe0cWVb0WeTf80DNux1GPJa18CDHiIU5DtksGUfxcDE+Rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "30.1.1",
+        "@jest/types": "30.0.5",
+        "@types/node": "*",
+        "jest-mock": "30.0.5"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/environment-jsdom-abstract": {
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.1.1.tgz",
+      "integrity": "sha512-d7pP9SeIOI6qnrNIS/ds1hlS9jpqh8EywHK0dALSLODZKo2QEGnDNvnPvhRKI0FHWDnE2EMl8CDTP0jM9lhlOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.1.1",
+        "@jest/fake-timers": "30.1.1",
+        "@jest/types": "30.0.5",
+        "@types/jsdom": "^21.1.7",
         "@types/node": "*",
-        "jest-mock": "^29.7.0"
+        "jest-mock": "30.0.5",
+        "jest-util": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^3.0.0",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.1.1.tgz",
+      "integrity": "sha512-3vHIHsF+qd3D8FU2c7U5l3rg1fhDwAYcGyHyZAi94YIlTwcJ+boNhRyJf373cl4wxbOX+0Q7dF40RTrTFTSuig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.7.0",
-        "jest-snapshot": "^29.7.0"
+        "expect": "30.1.1",
+        "jest-snapshot": "30.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.1.1.tgz",
+      "integrity": "sha512-5YUHr27fpJ64dnvtu+tt11ewATynrHkGYD+uSFgRr8V2eFJis/vEXgToyLwccIwqBihVfz9jwio+Zr1ab1Zihw==",
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.6.3"
+        "@jest/get-type": "30.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.1.1.tgz",
+      "integrity": "sha512-fK/25dNgBNYPw3eLi2CRs57g1H04qBAFNMsUY3IRzkfx/m4THe0E1zF+yGQBOMKKc2XQVdc9EYbJ4hEm7/2UtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@sinonjs/fake-timers": "^10.0.2",
+        "@jest/types": "30.0.5",
+        "@sinonjs/fake-timers": "^13.0.0",
         "@types/node": "*",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "jest-message-util": "30.1.0",
+        "jest-mock": "30.0.5",
+        "jest-util": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/get-type": {
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
+      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.1.1.tgz",
+      "integrity": "sha512-NNUUkHT2TU/xztZl6r1UXvJL+zvCwmZsQDmK69fVHHcB9fBtlu3FInnzOve/ZoyKnWY8JXWJNT+Lkmu1+ubXUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "jest-mock": "^29.7.0"
+        "@jest/environment": "30.1.1",
+        "@jest/expect": "30.1.1",
+        "@jest/types": "30.0.5",
+        "jest-mock": "30.0.5"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/pattern": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
+      "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-regex-util": "30.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.1.1.tgz",
+      "integrity": "sha512-Hb2Bq80kahOC6Sv2waEaH1rEU6VdFcM6WHaRBWQF9tf30+nJHxhl/Upbgo9+25f0mOgbphxvbwSMjSgy9gW/FA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
+        "@jest/console": "30.1.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/transform": "30.1.1",
+        "@jest/types": "30.0.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
+        "chalk": "^4.1.2",
+        "collect-v8-coverage": "^1.0.2",
+        "exit-x": "^0.2.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
+        "jest-message-util": "30.1.0",
+        "jest-util": "30.0.5",
+        "jest-worker": "30.1.0",
         "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
+        "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -1732,106 +2034,123 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/snapshot-utils": {
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.1.1.tgz",
+      "integrity": "sha512-TkVBc9wuN22TT8hESRFmjjg/xIMu7z0J3UDYtIRydzCqlLPTB7jK1DDBKdnTUZ4zL3z3rnPpzV6rL1Uzh87sXg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "@jest/types": "30.0.5",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "natural-compare": "^1.4.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
+      "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "callsites": "^3.1.0",
+        "graceful-fs": "^4.2.11"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.1.1.tgz",
+      "integrity": "sha512-bMdj7fNu8iZuBPSnbVir5ezvWmVo4jrw7xDE+A33Yb3ENCoiJK9XgOLgal+rJ9XSKjsL7aPUMIo87zhN7I5o2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@jest/console": "30.1.1",
+        "@jest/types": "30.0.5",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "collect-v8-coverage": "^1.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.1.1.tgz",
+      "integrity": "sha512-yruRdLXSA3HYD/MTNykgJ6VYEacNcXDFRMqKVAwlYegmxICUiT/B++CNuhJnYJzKYks61iYnjVsMwbUqmmAYJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
+        "@jest/test-result": "30.1.1",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.1.0",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+      "integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
+        "@babel/core": "^7.27.4",
+        "@jest/types": "30.0.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "babel-plugin-istanbul": "^7.0.0",
+        "chalk": "^4.1.2",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.1.0",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.5",
+        "micromatch": "^4.0.8",
+        "pirates": "^4.0.7",
         "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.2"
+        "write-file-atomic": "^5.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+      "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.5",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
         "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -1993,6 +2312,19 @@
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "license": "MIT"
     },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.10.0"
+      }
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
@@ -2303,6 +2635,30 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -2311,9 +2667,9 @@
       "license": "MIT"
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "version": "0.34.41",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
+      "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==",
       "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
@@ -2327,13 +2683,13 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^3.0.0"
+        "@sinonjs/commons": "^3.0.1"
       }
     },
     "node_modules/@ssddanbrown/codemirror-lang-smarty": {
@@ -2353,16 +2709,6 @@
         "@lezer/lr": "^1.0.0"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -2391,6 +2737,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
+      "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -2427,13 +2784,13 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
-      "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.20.7"
+        "@babel/types": "^7.28.2"
       }
     },
     "node_modules/@types/estree": {
@@ -2443,16 +2800,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -2478,19 +2825,19 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "version": "30.0.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
+      "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
+        "expect": "^30.0.0",
+        "pretty-format": "^30.0.0"
       }
     },
     "node_modules/@types/jsdom": {
-      "version": "20.0.1",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
-      "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
+      "version": "21.1.7",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.7.tgz",
+      "integrity": "sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2582,36 +2929,293 @@
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "license": "MIT"
     },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "ISC"
     },
-    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "optional": true,
+      "os": [
+        "android"
+      ]
     },
-    "node_modules/acorn-globals": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+    "node_modules/@unrs/resolver-binding-android-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-freebsd-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "cpu": [
+        "wasm32"
+      ],
       "dev": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
+        "@napi-rs/wasm-runtime": "^0.2.11"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
     "node_modules/acorn-jsx": {
@@ -2638,16 +3242,13 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/ajv": {
@@ -2684,13 +3285,16 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
@@ -2857,13 +3461,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/async-function": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
@@ -2874,13 +3471,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -2898,75 +3488,57 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.1.1.tgz",
+      "integrity": "sha512-1bZfC/V03qBCzASvZpNFhx3Ouj6LgOd4KFJm4br/fYOS+tSSvVCE61QmcAVbMTwq/GoB7KN4pzGMoyr9cMxSvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "^29.7.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.6.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
+        "@jest/transform": "30.1.1",
+        "@types/babel__core": "^7.20.5",
+        "babel-plugin-istanbul": "^7.0.0",
+        "babel-preset-jest": "30.0.1",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.8.0"
+        "@babel/core": "^7.11.0"
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+      "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-instrument": "^6.0.2",
         "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz",
+      "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3",
+        "@types/babel__core": "^7.20.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
@@ -2997,20 +3569,20 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz",
+      "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "babel-plugin-jest-hoist": "30.0.1",
+        "babel-preset-current-node-syntax": "^1.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.11.0"
       }
     },
     "node_modules/balanced-match": {
@@ -3281,9 +3853,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
       "funding": [
         {
           "type": "github",
@@ -3296,9 +3868,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
-      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz",
+      "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==",
       "dev": true,
       "license": "MIT"
     },
@@ -3388,19 +3960,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "license": "MIT"
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3415,28 +3974,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -3465,46 +4002,32 @@
         "node": ">= 8"
       }
     },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz",
+      "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssom": "~0.3.6"
+        "@asamuzakjp/css-color": "^3.2.0",
+        "rrweb-cssom": "^0.8.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/data-view-buffer": {
@@ -3664,16 +4187,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -3708,15 +4221,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "license": "MIT",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -3730,20 +4234,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -3759,21 +4249,12 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
       "version": "1.5.190",
@@ -3974,9 +4455,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
-      "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+      "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3987,32 +4468,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.8",
-        "@esbuild/android-arm": "0.25.8",
-        "@esbuild/android-arm64": "0.25.8",
-        "@esbuild/android-x64": "0.25.8",
-        "@esbuild/darwin-arm64": "0.25.8",
-        "@esbuild/darwin-x64": "0.25.8",
-        "@esbuild/freebsd-arm64": "0.25.8",
-        "@esbuild/freebsd-x64": "0.25.8",
-        "@esbuild/linux-arm": "0.25.8",
-        "@esbuild/linux-arm64": "0.25.8",
-        "@esbuild/linux-ia32": "0.25.8",
-        "@esbuild/linux-loong64": "0.25.8",
-        "@esbuild/linux-mips64el": "0.25.8",
-        "@esbuild/linux-ppc64": "0.25.8",
-        "@esbuild/linux-riscv64": "0.25.8",
-        "@esbuild/linux-s390x": "0.25.8",
-        "@esbuild/linux-x64": "0.25.8",
-        "@esbuild/netbsd-arm64": "0.25.8",
-        "@esbuild/netbsd-x64": "0.25.8",
-        "@esbuild/openbsd-arm64": "0.25.8",
-        "@esbuild/openbsd-x64": "0.25.8",
-        "@esbuild/openharmony-arm64": "0.25.8",
-        "@esbuild/sunos-x64": "0.25.8",
-        "@esbuild/win32-arm64": "0.25.8",
-        "@esbuild/win32-ia32": "0.25.8",
-        "@esbuild/win32-x64": "0.25.8"
+        "@esbuild/aix-ppc64": "0.25.9",
+        "@esbuild/android-arm": "0.25.9",
+        "@esbuild/android-arm64": "0.25.9",
+        "@esbuild/android-x64": "0.25.9",
+        "@esbuild/darwin-arm64": "0.25.9",
+        "@esbuild/darwin-x64": "0.25.9",
+        "@esbuild/freebsd-arm64": "0.25.9",
+        "@esbuild/freebsd-x64": "0.25.9",
+        "@esbuild/linux-arm": "0.25.9",
+        "@esbuild/linux-arm64": "0.25.9",
+        "@esbuild/linux-ia32": "0.25.9",
+        "@esbuild/linux-loong64": "0.25.9",
+        "@esbuild/linux-mips64el": "0.25.9",
+        "@esbuild/linux-ppc64": "0.25.9",
+        "@esbuild/linux-riscv64": "0.25.9",
+        "@esbuild/linux-s390x": "0.25.9",
+        "@esbuild/linux-x64": "0.25.9",
+        "@esbuild/netbsd-arm64": "0.25.9",
+        "@esbuild/netbsd-x64": "0.25.9",
+        "@esbuild/openbsd-arm64": "0.25.9",
+        "@esbuild/openbsd-x64": "0.25.9",
+        "@esbuild/openharmony-arm64": "0.25.9",
+        "@esbuild/sunos-x64": "0.25.9",
+        "@esbuild/win32-arm64": "0.25.9",
+        "@esbuild/win32-ia32": "0.25.9",
+        "@esbuild/win32-x64": "0.25.9"
       }
     },
     "node_modules/escalade": {
@@ -4038,43 +4519,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
     "node_modules/eslint": {
-      "version": "9.31.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
-      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
+      "version": "9.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
+      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.15.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.31.0",
-        "@eslint/plugin-kit": "^0.3.1",
+        "@eslint/js": "9.34.0",
+        "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -4360,29 +4819,31 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/exit-x": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz",
+      "integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.1.1.tgz",
+      "integrity": "sha512-OKe7cdic4qbfWd/CcgwJvvCrNX2KWfuMZee9AfJHL1gTYmvqjBjZG1a2NwfhspBzxzlXwsN75WWpKTYfsJpBxg==",
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "@jest/expect-utils": "30.1.1",
+        "@jest/get-type": "30.1.0",
+        "jest-matcher-utils": "30.1.1",
+        "jest-message-util": "30.1.0",
+        "jest-mock": "30.0.5",
+        "jest-util": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/fast-deep-equal": {
@@ -4429,39 +4890,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -4528,21 +4956,34 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/fs.realpath": {
@@ -4709,22 +5150,21 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -4743,6 +5183,32 @@
         "node": ">= 6"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -4792,6 +5258,28 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "license": "ISC"
     },
+    "node_modules/handlebars": {
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
     "node_modules/has-bigints": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
@@ -4893,16 +5381,16 @@
       "license": "ISC"
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "whatwg-encoding": "^2.0.0"
+        "whatwg-encoding": "^3.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/html-escaper": {
@@ -4913,32 +5401,31 @@
       "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/human-signals": {
@@ -5588,24 +6075,24 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
         "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "istanbul-lib-coverage": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -5616,42 +6103,39 @@
         "node": ">=8"
       }
     },
-    "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "@isaacs/cliui": "^8.0.2"
       },
-      "bin": {
-        "jake": "bin/cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       },
-      "engines": {
-        "node": ">=10"
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
     "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-30.1.1.tgz",
+      "integrity": "sha512-yC3JvpP/ZcAZX5rYCtXO/g9k6VTCQz0VFE2v1FpxytWzUqfDtu0XL/pwnNvptzYItvGwomh1ehomRNMOyhCJKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
+        "@jest/core": "30.1.1",
+        "@jest/types": "30.0.5",
+        "import-local": "^3.2.0",
+        "jest-cli": "30.1.1"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -5663,76 +6147,75 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz",
+      "integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
+        "execa": "^5.1.1",
+        "jest-util": "30.0.5",
         "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.1.1.tgz",
+      "integrity": "sha512-M3Vd4x5wD7eSJspuTvRF55AkOOBndRxgW3gqQBDlFvbH3X+ASdi8jc+EqXEeAFd/UHulVYIlC4XKJABOhLw6UA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.1.1",
+        "@jest/expect": "30.1.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.2",
         "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "dedent": "^1.6.0",
+        "is-generator-fn": "^2.1.0",
+        "jest-each": "30.1.0",
+        "jest-matcher-utils": "30.1.1",
+        "jest-message-util": "30.1.0",
+        "jest-runtime": "30.1.1",
+        "jest-snapshot": "30.1.1",
+        "jest-util": "30.0.5",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
+        "pretty-format": "30.0.5",
+        "pure-rand": "^7.0.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.1.1.tgz",
+      "integrity": "sha512-xm9llxuh5OoI5KZaYzlMhklryHBwg9LZy/gEaaMlXlxb+cZekGNzukU0iblbDo3XOBuN6N0CgK4ykgNRYSEb6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
+        "@jest/core": "30.1.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/types": "30.0.5",
+        "chalk": "^4.1.2",
+        "exit-x": "^0.2.2",
+        "import-local": "^3.2.0",
+        "jest-config": "30.1.1",
+        "jest-util": "30.0.5",
+        "jest-validate": "30.1.0",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -5743,6 +6226,16 @@
         }
       }
     },
+    "node_modules/jest-cli/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-cli/node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -5790,6 +6283,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-cli/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-cli/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -5838,117 +6344,120 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.1.1.tgz",
+      "integrity": "sha512-xuPGUGDw+9fPPnGmddnLnHS/mhKUiJOW7K65vErYmglEPKq65NKwSRchkQ7iv6gqjs2l+YNEsAtbsplxozdOWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/get-type": "30.1.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/test-sequencer": "30.1.1",
+        "@jest/types": "30.0.5",
+        "babel-jest": "30.1.1",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "deepmerge": "^4.3.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-circus": "30.1.1",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.1.1",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.1.0",
+        "jest-runner": "30.1.1",
+        "jest-util": "30.0.5",
+        "jest-validate": "30.1.0",
+        "micromatch": "^4.0.8",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
+        "pretty-format": "30.0.5",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "@types/node": "*",
+        "esbuild-register": ">=3.4.0",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "esbuild-register": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.1.1.tgz",
+      "integrity": "sha512-LUU2Gx8EhYxpdzTR6BmjL1ifgOAQJQELTHOiPv9KITaKjZvJ9Jmgigx01tuZ49id37LorpGc9dPBPlXTboXScw==",
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz",
+      "integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "detect-newline": "^3.0.0"
+        "detect-newline": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.1.0.tgz",
+      "integrity": "sha512-A+9FKzxPluqogNahpCv04UJvcZ9B3HamqpDNWNKDjtxVRYB8xbZLFuCr8JAJFpNp83CA0anGQFlpQna9Me+/tQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.0.5",
+        "chalk": "^4.1.2",
+        "jest-util": "30.0.5",
+        "pretty-format": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.1.1.tgz",
+      "integrity": "sha512-fInyXsHSuPaERmRiub4V6jl6KERXowGqY8AISJrXZjOq7vdP46qecm+GnTngjcUPeHFqrxp1PfP0XuFfKTzA2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/jsdom": "^20.0.0",
+        "@jest/environment": "30.1.1",
+        "@jest/environment-jsdom-abstract": "30.1.1",
+        "@types/jsdom": "^21.1.7",
         "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jsdom": "^20.0.0"
+        "jsdom": "^26.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "canvas": "^2.5.0"
+        "canvas": "^3.0.0"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -5957,120 +6466,110 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.1.1.tgz",
+      "integrity": "sha512-IaMoaA6saxnJimqCppUDqKck+LKM0Jg+OxyMUIvs1yGd2neiC22o8zXo90k04+tO+49OmgMR4jTgM5e4B0S62Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.1.1",
+        "@jest/fake-timers": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "jest-mock": "30.0.5",
+        "jest-util": "30.0.5",
+        "jest-validate": "30.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "license": "MIT",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+      "integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
+        "anymatch": "^3.1.3",
+        "fb-watchman": "^2.0.2",
+        "graceful-fs": "^4.2.11",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.0.5",
+        "jest-worker": "30.1.0",
+        "micromatch": "^4.0.8",
         "walker": "^1.0.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "fsevents": "^2.3.3"
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.1.0.tgz",
+      "integrity": "sha512-AoFvJzwxK+4KohH60vRuHaqXfWmeBATFZpzpmzNmYTtmRMiyGPVhkXpBqxUQunw+dQB48bDf4NpUs6ivVbRv1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "pretty-format": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.1.1.tgz",
+      "integrity": "sha512-SuH2QVemK48BNTqReti6FtjsMPFsSOD/ZzRxU1TttR7RiRsRSe78d03bb4Cx6D4bQC/80Q8U4VnaaAH9FlbZ9w==",
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.1.1",
+        "pretty-format": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.1.0.tgz",
+      "integrity": "sha512-HizKDGG98cYkWmaLUHChq4iN+oCENohQLb7Z5guBPumYs+/etonmNFlg1Ps6yN9LTPyZn+M+b/9BbnHx3WTMDg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.0.5",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.0.5",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dev": true,
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz",
+      "integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "jest-util": "^29.7.0"
+        "jest-util": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-pnp-resolver": {
@@ -6092,147 +6591,147 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "dev": true,
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+      "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
       "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.1.0.tgz",
+      "integrity": "sha512-hASe7D/wRtZw8Cm607NrlF7fi3HWC5wmA5jCVc2QjQAB2pTwP9eVZILGEi6OeSLNUtE1zb04sXRowsdh5CUjwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.1.0",
+        "jest-pnp-resolver": "^1.2.3",
+        "jest-util": "30.0.5",
+        "jest-validate": "30.1.0",
+        "slash": "^3.0.0",
+        "unrs-resolver": "^1.7.11"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.1.1.tgz",
+      "integrity": "sha512-tRtaaoH8Ws1Gn1o/9pedt19dvVgr81WwdmvJSP9Ow3amOUOP2nN9j94u5jC9XlIfa2Q1FQKIWWQwL4ajqsjCGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
+        "jest-regex-util": "30.0.1",
+        "jest-snapshot": "30.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.1.1.tgz",
+      "integrity": "sha512-ATe6372SOfJvCRExtCAr06I4rGujwFdKg44b6i7/aOgFnULwjxzugJ0Y4AnG+jeSeQi8dU7R6oqLGmsxRUbErQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/console": "30.1.1",
+        "@jest/environment": "30.1.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/transform": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-docblock": "30.0.1",
+        "jest-environment-node": "30.1.1",
+        "jest-haste-map": "30.1.0",
+        "jest-leak-detector": "30.1.0",
+        "jest-message-util": "30.1.0",
+        "jest-resolve": "30.1.0",
+        "jest-runtime": "30.1.1",
+        "jest-util": "30.0.5",
+        "jest-watcher": "30.1.1",
+        "jest-worker": "30.1.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.1.1.tgz",
+      "integrity": "sha512-7sOyR0Oekw4OesQqqBHuYJRB52QtXiq0NNgLRzVogiMSxKCMiliUd6RrXHCnG5f12Age/ggidCBiQftzcA9XKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.1.1",
+        "@jest/fake-timers": "30.1.1",
+        "@jest/globals": "30.1.1",
+        "@jest/source-map": "30.0.1",
+        "@jest/test-result": "30.1.1",
+        "@jest/transform": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "chalk": "^4.1.2",
+        "cjs-module-lexer": "^2.1.0",
+        "collect-v8-coverage": "^1.0.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.1.0",
+        "jest-message-util": "30.1.0",
+        "jest-mock": "30.0.5",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.1.0",
+        "jest-snapshot": "30.1.1",
+        "jest-util": "30.0.5",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.1.1.tgz",
+      "integrity": "sha512-7/iBEzoJqEt2TjkQY+mPLHP8cbPhLReZVkkxjTMzIzoTC4cZufg7HzKo/n9cIkXKj2LG0x3mmBHsZto+7TOmFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1",
+        "@babel/types": "^7.27.3",
+        "@jest/expect-utils": "30.1.1",
+        "@jest/get-type": "30.1.0",
+        "@jest/snapshot-utils": "30.1.1",
+        "@jest/transform": "30.1.1",
+        "@jest/types": "30.0.5",
+        "babel-preset-current-node-syntax": "^1.1.0",
+        "chalk": "^4.1.2",
+        "expect": "30.1.1",
+        "graceful-fs": "^4.2.11",
+        "jest-diff": "30.1.1",
+        "jest-matcher-utils": "30.1.1",
+        "jest-message-util": "30.1.0",
+        "jest-util": "30.0.5",
+        "pretty-format": "30.0.5",
+        "semver": "^7.7.2",
+        "synckit": "^0.11.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
@@ -6249,38 +6748,50 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+      "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.1.0.tgz",
+      "integrity": "sha512-7P3ZlCFW/vhfQ8pE7zW6Oi4EzvuB4sgR72Q1INfW9m0FGo0GADYlPwIkf4CyPq7wq85g+kPMtPOHNAdWHeBOaA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.0.5",
+        "camelcase": "^6.3.0",
+        "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
+        "pretty-format": "30.0.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/camelcase": {
@@ -6297,39 +6808,40 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.1.1.tgz",
+      "integrity": "sha512-CrAQ73LlaS6KGQQw6NBi71g7qvP7scy+4+2c0jKX6+CWaYg85lZiig5nQQVTsS5a5sffNPL3uxXnaE9d7v9eQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/test-result": "30.1.1",
+        "@jest/types": "30.0.5",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
+        "jest-util": "30.0.5",
+        "string-length": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+      "integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.7.0",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.0.5",
         "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "supports-color": "^8.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
@@ -6368,44 +6880,38 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
-      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.1",
-        "acorn-globals": "^7.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.2",
-        "decimal.js": "^10.4.2",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
+      "version": "26.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
+      "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssstyle": "^4.2.1",
+        "data-urls": "^5.0.0",
+        "decimal.js": "^10.5.0",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
-        "parse5": "^7.1.1",
+        "nwsapi": "^2.2.16",
+        "parse5": "^7.2.1",
+        "rrweb-cssom": "^0.8.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
+        "tough-cookie": "^5.1.1",
+        "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0",
-        "ws": "^8.11.0",
-        "xml-name-validator": "^4.0.0"
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.1.1",
+        "ws": "^8.18.0",
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "canvas": "^2.5.0"
+        "canvas": "^3.0.0"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -6484,16 +6990,6 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -6535,16 +7031,16 @@
       }
     },
     "node_modules/livereload": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz",
-      "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.10.3.tgz",
+      "integrity": "sha512-llSb8HrtSH7ByPFMc8WTTeW3oy++smwgSA8JVGzEn8KiDPESq6jt1M4ZKKkhKTrhn2wvUOadQq4ip10E5daZ3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": "^3.5.0",
-        "livereload-js": "^3.3.1",
-        "opts": ">= 1.2.0",
-        "ws": "^7.4.3"
+        "chokidar": "^4.0.3",
+        "livereload-js": "^4.0.2",
+        "opts": "^2.0.2",
+        "ws": "^8.4.3"
       },
       "bin": {
         "livereload": "bin/livereload.js"
@@ -6554,32 +7050,40 @@
       }
     },
     "node_modules/livereload-js": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.4.1.tgz",
-      "integrity": "sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-4.0.2.tgz",
+      "integrity": "sha512-Fy7VwgQNiOkynYyNBTo3v9hQUhcW5pFAheJN148+DTgpShjsy/22pLHKKwDK5v0kOsZsJBK+6q1PMgLvRmrwFQ==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/livereload/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+    "node_modules/livereload/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">= 14.16.0"
       },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/livereload/node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/load-json-file": {
@@ -6790,33 +7294,10 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6846,6 +7327,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -6853,6 +7344,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/napi-postinstall": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
+      "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "napi-postinstall": "lib/cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/napi-postinstall"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -6860,6 +7367,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -7113,9 +7627,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.20",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
-      "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+      "version": "2.2.21",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.21.tgz",
+      "integrity": "sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==",
       "dev": true,
       "license": "MIT"
     },
@@ -7327,6 +7841,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -7422,6 +7943,30 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/path-type": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -7576,17 +8121,17 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
+      "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
@@ -7601,33 +8146,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/psl": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
-      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/lupomontero"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -7648,9 +8166,9 @@
       }
     },
     "node_modules/pure-rand": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz",
+      "integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==",
       "dev": true,
       "funding": [
         {
@@ -7664,13 +8182,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -7766,13 +8277,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/resolve": {
       "version": "1.22.10",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
@@ -7827,15 +8331,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/resolve.exports": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+    "node_modules/rrweb-cssom": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "MIT"
     },
     "node_modules/safe-array-concat": {
       "version": "1.1.3",
@@ -7900,9 +8401,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.89.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz",
-      "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==",
+      "version": "1.91.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
+      "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8148,13 +8649,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -8302,6 +8796,29 @@
         "node": ">=10"
       }
     },
+    "node_modules/string-length/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-length/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -8317,6 +8834,62 @@
         "node": ">=6"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string-width/node_modules/ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -8419,6 +8992,23 @@
       }
     },
     "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
@@ -8431,6 +9021,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -8502,6 +9102,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/synckit": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
+      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.9"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -8517,6 +9133,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tldts": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
+      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^6.1.86"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -8537,44 +9195,41 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "tldts": "^6.1.32"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=16"
       }
     },
     "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "punycode": "^2.1.1"
+        "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.4.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.0.tgz",
-      "integrity": "sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==",
+      "version": "29.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz",
+      "integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
-        "ejs": "^3.1.10",
         "fast-json-stable-stringify": "^2.1.0",
+        "handlebars": "^4.7.8",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
@@ -8724,6 +9379,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD",
+      "optional": true
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -8839,9 +9502,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -8858,6 +9521,20 @@
       "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "license": "MIT"
     },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -8883,14 +9560,39 @@
       "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
       "license": "MIT"
     },
-    "node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+    "node_modules/unrs-resolver": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
+      "dependencies": {
+        "napi-postinstall": "^0.3.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unrs-resolver"
+      },
+      "optionalDependencies": {
+        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+        "@unrs/resolver-binding-android-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-x64": "1.11.1",
+        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
       }
     },
     "node_modules/update-browserslist-db": {
@@ -8934,17 +9636,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
@@ -8985,16 +9676,16 @@
       "license": "MIT"
     },
     "node_modules/w3c-xmlserializer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "xml-name-validator": "^4.0.0"
+        "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/walker": {
@@ -9018,40 +9709,40 @@
       }
     },
     "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "^3.0.0",
+        "tr46": "^5.1.0",
         "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/which": {
@@ -9176,6 +9867,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -9191,6 +9889,80 @@
         "node": ">=6"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -9252,17 +10024,30 @@
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/ws": {
@@ -9288,13 +10073,13 @@
       }
     },
     "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/xmlchars": {
diff --git a/package.json b/package.json
index 151338d8c6e..9ec94acc29a 100644
--- a/package.json
+++ b/package.json
@@ -19,43 +19,43 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
-    "@lezer/generator": "^1.7.2",
+    "@eslint/js": "^9.34.0",
+    "@lezer/generator": "^1.8.0",
     "@types/markdown-it": "^14.1.2",
     "@types/sortablejs": "^1.15.8",
     "chokidar-cli": "^3.0",
-    "esbuild": "^0.25.0",
-    "eslint": "^9.21.0",
-    "eslint-plugin-import": "^2.31.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "livereload": "^0.9.3",
+    "esbuild": "^0.25.9",
+    "eslint": "^9.34.0",
+    "eslint-plugin-import": "^2.32.0",
+    "jest": "^30.1.1",
+    "jest-environment-jsdom": "^30.1.1",
+    "livereload": "^0.10.3",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.85.0",
-    "ts-jest": "^29.2.6",
+    "sass": "^1.91.0",
+    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",
-    "typescript": "5.7.*"
+    "typescript": "5.9.*"
   },
   "dependencies": {
-    "@codemirror/commands": "^6.8.0",
+    "@codemirror/commands": "^6.8.1",
     "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.9",
-    "@codemirror/lang-javascript": "^6.2.3",
-    "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/lang-markdown": "^6.3.2",
-    "@codemirror/lang-php": "^6.0.1",
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/lang-php": "^6.0.2",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/language": "^6.10.8",
-    "@codemirror/legacy-modes": "^6.4.3",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/legacy-modes": "^6.5.1",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.36.3",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.38.1",
     "@lezer/highlight": "^1.2.1",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-    "@types/jest": "^29.5.14",
-    "codemirror": "^6.0.1",
-    "idb-keyval": "^6.2.1",
+    "@types/jest": "^30.0.0",
+    "codemirror": "^6.0.2",
+    "idb-keyval": "^6.2.2",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "snabbdom": "^3.6.2",
diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
index 7051336d57e..36e2db5470a 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -2708,6 +2708,8 @@ export function updateDOMSelection(
         const range = document.createRange();
         range.selectNode(selectionTarget);
         selectionRect = range.getBoundingClientRect();
+      } else if (selectionTarget instanceof Range) {
+          selectionRect = selectionTarget.getBoundingClientRect();
       } else {
         selectionRect = selectionTarget.getBoundingClientRect();
       }
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
index a54d33ca4a4..f195974d049 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalEditor.test.ts
@@ -2510,8 +2510,8 @@ describe('LexicalEditor tests', () => {
       );
     });
 
-    expect(onError).toBeCalledWith(updateError);
-    expect(textListener).toBeCalledWith('Hello\n\nworld');
+    expect(onError).toHaveBeenCalledWith(updateError);
+    expect(textListener).toHaveBeenCalledWith('Hello\n\nworld');
     expect(updateListener.mock.lastCall[0].prevEditorState).toBe(editorState);
   });
 
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
index fcf666213d6..33c59bf5fcb 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/unit/LexicalNode.test.ts
@@ -138,7 +138,7 @@ describe('LexicalNode tests', () => {
           const validNode = new TextNode(textNode.__text, textNode.__key);
           expect(textNode.getLatest()).toBe(textNode);
           expect(validNode.getLatest()).toBe(textNode);
-          expect(() => new TestNode(textNode.__key)).toThrowError(
+          expect(() => new TestNode(textNode.__key)).toThrow(
             /TestNode.*re-use key.*TextNode/,
           );
         });
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index fd87877eefb..00c5ec79646 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -864,4 +864,26 @@ export function dispatchEditorMouseClick(editor: LexicalEditor, clientX: number,
   });
   dom?.dispatchEvent(event);
   editor.commitUpdates();
+}
+
+export function patchRange() {
+    const RangePrototype = Object.getPrototypeOf(document.createRange());
+    RangePrototype.getBoundingClientRect = function (): DOMRect {
+        const rect = {
+            bottom: 0,
+            height: 0,
+            left: 0,
+            right: 0,
+            top: 0,
+            width: 0,
+            x: 0,
+            y: 0,
+        };
+        return {
+            ...rect,
+            toJSON() {
+                return rect;
+            },
+        };
+    };
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
index 6e3a3861ae5..0bc7646c961 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalElementNode.test.ts
@@ -18,10 +18,12 @@ import {
 } from 'lexical';
 
 import {
-  $createTestElementNode,
-  createTestEditor,
+    $createTestElementNode,
+    createTestEditor, patchRange,
 } from '../../../__tests__/utils';
 
+patchRange();
+
 describe('LexicalElementNode tests', () => {
   let container: HTMLElement;
 
@@ -54,6 +56,7 @@ describe('LexicalElementNode tests', () => {
 
     editor = createTestEditor();
     editor.setRootElement(root);
+    root.focus();
 
     // Insert initial block
     await update(() => {
@@ -63,11 +66,11 @@ describe('LexicalElementNode tests', () => {
       // Prevent text nodes from combining.
       text2.setMode('segmented');
       const text3 = $createTextNode('Baz');
-      // Some operations require a selection to exist, hence
-      // we make a selection in the setup code.
-      text.select(0, 0);
       block.append(text, text2, text3);
       $getRoot().append(block);
+        // Some operations require a selection to exist, hence
+        // we make a selection in the setup code.
+        text.select(0, 0);
     });
   }
 
diff --git a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
index c03f1bdb2fb..cee4149193b 100644
--- a/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
+++ b/resources/js/wysiwyg/lexical/headless/__tests__/unit/LexicalHeadlessEditor.test.ts
@@ -146,12 +146,12 @@ describe('LexicalHeadlessEditor', () => {
       editor.dispatchCommand(CONTROLLED_TEXT_INSERTION_COMMAND, 'foo');
     });
 
-    expect(onUpdate).toBeCalled();
-    expect(onCommand).toBeCalledWith('foo', expect.anything());
-    expect(onTransform).toBeCalledWith(
+    expect(onUpdate).toHaveBeenCalled();
+    expect(onCommand).toHaveBeenCalledWith('foo', expect.anything());
+    expect(onTransform).toHaveBeenCalledWith(
       expect.objectContaining({__type: 'paragraph'}),
     );
-    expect(onTextContent).toBeCalledWith('Helloworld');
+    expect(onTextContent).toHaveBeenCalledWith('Helloworld');
   });
 
   it('can preserve selection for pending editor state (within update loop)', async () => {
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
index cc09d1735cc..14c8b5121a3 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/unit/LexicalSelection.test.ts
@@ -37,12 +37,12 @@ import {
   TextNode,
 } from 'lexical';
 import {
-  $assertRangeSelection,
-  $createTestDecoratorNode,
-  $createTestElementNode,
-  createTestEditor,
-  initializeClipboard,
-  invariant,
+    $assertRangeSelection,
+    $createTestDecoratorNode,
+    $createTestElementNode,
+    createTestEditor,
+    initializeClipboard,
+    invariant, patchRange,
 } from 'lexical/__tests__/utils';
 
 import {
@@ -91,24 +91,7 @@ jest.mock('lexical/shared/environment', () => {
   return {...originalModule, IS_FIREFOX: true};
 });
 
-Range.prototype.getBoundingClientRect = function (): DOMRect {
-  const rect = {
-    bottom: 0,
-    height: 0,
-    left: 0,
-    right: 0,
-    top: 0,
-    width: 0,
-    x: 0,
-    y: 0,
-  };
-  return {
-    ...rect,
-    toJSON() {
-      return rect;
-    },
-  };
-};
+patchRange();
 
 describe('LexicalSelection tests', () => {
   let container: HTMLElement;
diff --git a/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
index 84c82edecfa..39d4a04bd08 100644
--- a/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/selection/__tests__/utils/index.ts
@@ -422,9 +422,6 @@ export function setNativeSelection(
   range.setEnd(focusNode, focusOffset);
   domSelection.removeAllRanges();
   domSelection.addRange(range);
-  Promise.resolve().then(() => {
-    document.dispatchEvent(new Event('selectionchange'));
-  });
 }
 
 export function setNativeSelectionWithPaths(
@@ -647,6 +644,8 @@ export async function applySelectionInputs(
   editor: LexicalEditor,
 ) {
   const rootElement = editor.getRootElement()!;
+  // Set initial focus as if we're in the editor
+  rootElement.focus();
 
   for (let i = 0; i < inputs.length; i++) {
     const input = inputs[i];
diff --git a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
index 2879decdad7..560d316fec2 100644
--- a/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
+++ b/resources/js/wysiwyg/lexical/table/__tests__/unit/LexicalTableNode.test.ts
@@ -114,7 +114,7 @@ describe('LexicalTableNode tests', () => {
         });
         // Make sure paragraph is inserted inside empty cells
         expect(testEnv.innerHTML).toBe(
-          `<table style="border-collapse: collapse; table-layout: fixed; width: 468pt;"><colgroup><col><col></colgroup><tr style="height: 22.015pt;"><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello there</span></p></td><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">General Kenobi!</span></p></td></tr><tr style="height: 22.015pt;"><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Lexical is nice</span></p></td><td style="border-left: 1pt solid #000000; border-right: 1pt solid #000000; border-bottom: 1pt solid #000000; border-top: 1pt solid #000000; vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><br></p></td></tr></table>`,
+          `<table style="border-collapse: collapse; table-layout: fixed; width: 468pt;"><colgroup><col><col></colgroup><tr style="height: 22.015pt;"><td style="border-left: 1pt solid rgb(0, 0, 0); border-right: 1pt solid rgb(0, 0, 0); border-bottom: 1pt solid rgb(0, 0, 0); border-top: 1pt solid rgb(0, 0, 0); vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Hello there</span></p></td><td style="border-left: 1pt solid rgb(0, 0, 0); border-right: 1pt solid rgb(0, 0, 0); border-bottom: 1pt solid rgb(0, 0, 0); border-top: 1pt solid rgb(0, 0, 0); vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">General Kenobi!</span></p></td></tr><tr style="height: 22.015pt;"><td style="border-left: 1pt solid rgb(0, 0, 0); border-right: 1pt solid rgb(0, 0, 0); border-bottom: 1pt solid rgb(0, 0, 0); border-top: 1pt solid rgb(0, 0, 0); vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><span style="color: rgb(0, 0, 0);" data-lexical-text="true">Lexical is nice</span></p></td><td style="border-left: 1pt solid rgb(0, 0, 0); border-right: 1pt solid rgb(0, 0, 0); border-bottom: 1pt solid rgb(0, 0, 0); border-top: 1pt solid rgb(0, 0, 0); vertical-align: top; padding: 5pt 5pt 5pt 5pt; overflow: hidden; overflow-wrap: break-word;"><p><br></p></td></tr></table>`,
         );
       });
 

From 5ea4e1e935624e060ad2b4e257a76539ec1a4746 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 2 Sep 2025 10:20:10 +0100
Subject: [PATCH 652/666] Maintenance: Removed unused comments text column

Has been redundant and unused for a about a year now.
Closes #4821
---
 ..._02_111542_remove_comments_text_column.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 database/migrations/2025_09_02_111542_remove_comments_text_column.php

diff --git a/database/migrations/2025_09_02_111542_remove_comments_text_column.php b/database/migrations/2025_09_02_111542_remove_comments_text_column.php
new file mode 100644
index 00000000000..8caa05e5443
--- /dev/null
+++ b/database/migrations/2025_09_02_111542_remove_comments_text_column.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->dropColumn('text');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->longText('text')->nullable();
+        });
+    }
+};

From 1e34954554d672446693bcc74bf7f9aae1936802 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 2 Sep 2025 11:10:47 +0100
Subject: [PATCH 653/666] Maintenance: Continued work towards PHPstan level 2

Updated html description code to be behind a proper interface.
Set new convention for mode traits/interfaces.
---
 app/Entities/Models/Book.php                  |  5 +--
 app/Entities/Models/Bookshelf.php             |  4 +--
 app/Entities/Models/Chapter.php               |  4 +--
 ...CoverImage.php => CoverImageInterface.php} |  2 +-
 .../{Deletable.php => DeletableInterface.php} |  2 +-
 app/Entities/Models/Deletion.php              |  2 +-
 app/Entities/Models/Entity.php                |  2 +-
 app/Entities/Models/HasHtmlDescription.php    | 21 -----------
 .../Models/HtmlDescriptionInterface.php       | 17 +++++++++
 app/Entities/Models/HtmlDescriptionTrait.php  | 35 +++++++++++++++++++
 app/Entities/Queries/PageQueries.php          |  3 ++
 app/Entities/Repos/BaseRepo.php               | 20 +++++------
 app/Entities/Tools/Cloner.php                 |  4 +--
 app/Entities/Tools/PageIncludeParser.php      |  7 ++--
 app/Entities/Tools/TrashCan.php               |  4 +--
 app/References/ReferenceUpdater.php           | 13 ++++---
 app/Sorting/SortRuleController.php            |  2 +-
 .../Controllers/ImageGalleryApiController.php |  4 +--
 18 files changed, 94 insertions(+), 57 deletions(-)
 rename app/Entities/Models/{HasCoverImage.php => CoverImageInterface.php} (92%)
 rename app/Entities/Models/{Deletable.php => DeletableInterface.php} (90%)
 delete mode 100644 app/Entities/Models/HasHtmlDescription.php
 create mode 100644 app/Entities/Models/HtmlDescriptionInterface.php
 create mode 100644 app/Entities/Models/HtmlDescriptionTrait.php

diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index ede4fc7d5a6..88e3b85baf9 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -26,10 +26,10 @@
  * @property ?Page                                    $defaultTemplate
  * @property ?SortRule                                 $sortRule
  */
-class Book extends Entity implements HasCoverImage
+class Book extends Entity implements CoverImageInterface, HtmlDescriptionInterface
 {
     use HasFactory;
-    use HasHtmlDescription;
+    use HtmlDescriptionTrait;
 
     public float $searchFactor = 1.2;
 
@@ -111,6 +111,7 @@ public function directPages(): HasMany
 
     /**
      * Get all chapters within this book.
+     * @return HasMany<Chapter>
      */
     public function chapters(): HasMany
     {
diff --git a/app/Entities/Models/Bookshelf.php b/app/Entities/Models/Bookshelf.php
index 9ffa0ea9cab..5b403d9c0fa 100644
--- a/app/Entities/Models/Bookshelf.php
+++ b/app/Entities/Models/Bookshelf.php
@@ -8,10 +8,10 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-class Bookshelf extends Entity implements HasCoverImage
+class Bookshelf extends Entity implements CoverImageInterface, HtmlDescriptionInterface
 {
     use HasFactory;
-    use HasHtmlDescription;
+    use HtmlDescriptionTrait;
 
     protected $table = 'bookshelves';
 
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index 088d199da67..03e819c06ff 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -14,10 +14,10 @@
  * @property ?int             $default_template_id
  * @property ?Page            $defaultTemplate
  */
-class Chapter extends BookChild
+class Chapter extends BookChild implements HtmlDescriptionInterface
 {
     use HasFactory;
-    use HasHtmlDescription;
+    use HtmlDescriptionTrait;
 
     public float $searchFactor = 1.2;
 
diff --git a/app/Entities/Models/HasCoverImage.php b/app/Entities/Models/CoverImageInterface.php
similarity index 92%
rename from app/Entities/Models/HasCoverImage.php
rename to app/Entities/Models/CoverImageInterface.php
index f665efce6d2..5f781fe02ab 100644
--- a/app/Entities/Models/HasCoverImage.php
+++ b/app/Entities/Models/CoverImageInterface.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-interface HasCoverImage
+interface CoverImageInterface
 {
     /**
      * Get the cover image for this item.
diff --git a/app/Entities/Models/Deletable.php b/app/Entities/Models/DeletableInterface.php
similarity index 90%
rename from app/Entities/Models/Deletable.php
rename to app/Entities/Models/DeletableInterface.php
index a2c7fad81b5..f771d9c6913 100644
--- a/app/Entities/Models/Deletable.php
+++ b/app/Entities/Models/DeletableInterface.php
@@ -8,7 +8,7 @@
  * A model that can be deleted in a manner that deletions
  * are tracked to be part of the recycle bin system.
  */
-interface Deletable
+interface DeletableInterface
 {
     public function deletions(): MorphMany;
 }
diff --git a/app/Entities/Models/Deletion.php b/app/Entities/Models/Deletion.php
index a73437c94a4..55589f61ec9 100644
--- a/app/Entities/Models/Deletion.php
+++ b/app/Entities/Models/Deletion.php
@@ -13,7 +13,7 @@
  * @property int       $deleted_by
  * @property string    $deletable_type
  * @property int       $deletable_id
- * @property Deletable $deletable
+ * @property DeletableInterface $deletable
  */
 class Deletion extends Model implements Loggable
 {
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 1ef4e618df9..46b29f93b83 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -49,7 +49,7 @@
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
-abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, Deletable, Loggable
+abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, DeletableInterface, Loggable
 {
     use SoftDeletes;
     use HasCreatorAndUpdater;
diff --git a/app/Entities/Models/HasHtmlDescription.php b/app/Entities/Models/HasHtmlDescription.php
deleted file mode 100644
index c9f08616dbd..00000000000
--- a/app/Entities/Models/HasHtmlDescription.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Util\HtmlContentFilter;
-
-/**
- * @property string $description
- * @property string $description_html
- */
-trait HasHtmlDescription
-{
-    /**
-     * Get the HTML description for this book.
-     */
-    public function descriptionHtml(): string
-    {
-        $html = $this->description_html ?: '<p>' . nl2br(e($this->description)) . '</p>';
-        return HtmlContentFilter::removeScriptsFromHtmlString($html);
-    }
-}
diff --git a/app/Entities/Models/HtmlDescriptionInterface.php b/app/Entities/Models/HtmlDescriptionInterface.php
new file mode 100644
index 00000000000..ffe7f0c5ff1
--- /dev/null
+++ b/app/Entities/Models/HtmlDescriptionInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+interface HtmlDescriptionInterface
+{
+    /**
+     * Get the HTML-based description for this item.
+     * By default, the content should be sanitised unless raw is set to true.
+     */
+    public function descriptionHtml(bool $raw = false): string;
+
+    /**
+     * Set the HTML-based description for this item.
+     */
+    public function setDescriptionHtml(string $html, string|null $plaintext = null): void;
+}
diff --git a/app/Entities/Models/HtmlDescriptionTrait.php b/app/Entities/Models/HtmlDescriptionTrait.php
new file mode 100644
index 00000000000..ed726ccaee3
--- /dev/null
+++ b/app/Entities/Models/HtmlDescriptionTrait.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Util\HtmlContentFilter;
+
+/**
+ * @property string $description
+ * @property string $description_html
+ */
+trait HtmlDescriptionTrait
+{
+    public function descriptionHtml(bool $raw = false): string
+    {
+        $html = $this->description_html ?: '<p>' . nl2br(e($this->description)) . '</p>';
+        if ($raw) {
+            return $html;
+        }
+
+        return HtmlContentFilter::removeScriptsFromHtmlString($html);
+    }
+
+    public function setDescriptionHtml(string $html, string|null $plaintext = null): void
+    {
+        $this->description_html = $html;
+
+        if ($plaintext !== null) {
+            $this->description = $plaintext;
+        }
+
+        if (empty($html) && !empty($plaintext)) {
+            $this->description_html = $this->descriptionHtml();
+        }
+    }
+}
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index 06298f470b9..f821ee86a58 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -66,6 +66,9 @@ public function usingSlugs(string $bookSlug, string $pageSlug): Builder
             });
     }
 
+    /**
+     * @return Builder<Page>
+     */
     public function visibleForList(): Builder
     {
         return $this->start()
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index ac5a44e679d..f4d05d8af21 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -7,8 +7,9 @@
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasCoverImage;
-use BookStack\Entities\Models\HasHtmlDescription;
+use BookStack\Entities\Models\CoverImageInterface;
+use BookStack\Entities\Models\HtmlDescriptionInterface;
+use BookStack\Entities\Models\HtmlDescriptionTrait;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
@@ -88,7 +89,7 @@ public function update(Entity $entity, array $input)
     /**
      * Update the given items' cover image, or clear it.
      *
-     * @param Entity&HasCoverImage $entity
+     * @param Entity&CoverImageInterface $entity
      *
      * @throws ImageUploadException
      * @throws \Exception
@@ -150,18 +151,17 @@ public function sortParent(Entity $entity): void
 
     protected function updateDescription(Entity $entity, array $input): void
     {
-        if (!in_array(HasHtmlDescription::class, class_uses($entity))) {
+        if (!($entity instanceof HtmlDescriptionInterface)) {
             return;
         }
 
-        /** @var HasHtmlDescription $entity */
         if (isset($input['description_html'])) {
-            $entity->description_html = HtmlDescriptionFilter::filterFromString($input['description_html']);
-            $entity->description = html_entity_decode(strip_tags($input['description_html']));
+            $entity->setDescriptionHtml(
+                HtmlDescriptionFilter::filterFromString($input['description_html']),
+                html_entity_decode(strip_tags($input['description_html']))
+            );
         } else if (isset($input['description'])) {
-            $entity->description = $input['description'];
-            $entity->description_html = '';
-            $entity->description_html = $entity->descriptionHtml();
+            $entity->setDescriptionHtml('', $input['description']);
         }
     }
 }
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 2be6083e3dd..87aa770c047 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -7,7 +7,7 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasCoverImage;
+use BookStack\Entities\Models\CoverImageInterface;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
@@ -105,7 +105,7 @@ public function entityToInputData(Entity $entity): array
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity
-        if ($entity instanceof HasCoverImage) {
+        if ($entity instanceof CoverImageInterface) {
             $cover = $entity->cover()->first();
             if ($cover) {
                 $inputData['image'] = $this->imageToUploadedFile($cover);
diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index e0b89f15870..329a7633f7a 100644
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -7,7 +7,6 @@
 use DOMDocument;
 use DOMElement;
 use DOMNode;
-use DOMText;
 
 class PageIncludeParser
 {
@@ -159,7 +158,7 @@ protected function moveTagNodeToBesideParent(PageIncludeTag $tag, DOMNode $paren
 
     /**
      * Splits the given $parentNode at the location of the $domNode within it.
-     * Attempts replicate the original $parentNode, moving some of their parent
+     * Attempts to replicate the original $parentNode, moving some of their parent
      * children in where needed, before adding the $domNode between.
      */
     protected function splitNodeAtChildNode(DOMElement $parentNode, DOMNode $domNode): void
@@ -171,6 +170,10 @@ protected function splitNodeAtChildNode(DOMElement $parentNode, DOMNode $domNode
         }
 
         $parentClone = $parentNode->cloneNode();
+        if (!($parentClone instanceof DOMElement)) {
+            return;
+        }
+
         $parentNode->parentNode->insertBefore($parentClone, $parentNode);
         $parentClone->removeAttribute('id');
 
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index 5e8a9371942..d457d4f48db 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -8,7 +8,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasCoverImage;
+use BookStack\Entities\Models\CoverImageInterface;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\NotifyException;
@@ -398,7 +398,7 @@ protected function destroyCommonRelations(Entity $entity)
         $entity->referencesTo()->delete();
         $entity->referencesFrom()->delete();
 
-        if ($entity instanceof HasCoverImage && $entity->cover()->exists()) {
+        if ($entity instanceof CoverImageInterface && $entity->cover()->exists()) {
             $imageService = app()->make(ImageService::class);
             $imageService->destroy($entity->cover()->first());
         }
diff --git a/app/References/ReferenceUpdater.php b/app/References/ReferenceUpdater.php
index db355f21130..5f1d711e9c6 100644
--- a/app/References/ReferenceUpdater.php
+++ b/app/References/ReferenceUpdater.php
@@ -4,7 +4,8 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HasHtmlDescription;
+use BookStack\Entities\Models\HtmlDescriptionInterface;
+use BookStack\Entities\Models\HtmlDescriptionTrait;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\RevisionRepo;
 use BookStack\Util\HtmlDocument;
@@ -61,20 +62,18 @@ protected function updateReferencesWithinEntity(Entity $entity, string $oldLink,
     {
         if ($entity instanceof Page) {
             $this->updateReferencesWithinPage($entity, $oldLink, $newLink);
-            return;
         }
 
-        if (in_array(HasHtmlDescription::class, class_uses($entity))) {
+        if ($entity instanceof HtmlDescriptionInterface) {
             $this->updateReferencesWithinDescription($entity, $oldLink, $newLink);
         }
     }
 
-    protected function updateReferencesWithinDescription(Entity $entity, string $oldLink, string $newLink): void
+    protected function updateReferencesWithinDescription(Entity&HtmlDescriptionInterface $entity, string $oldLink, string $newLink): void
     {
-        /** @var HasHtmlDescription&Entity $entity */
         $entity = (clone $entity)->refresh();
-        $html = $this->updateLinksInHtml($entity->description_html ?: '', $oldLink, $newLink);
-        $entity->description_html = $html;
+        $html = $this->updateLinksInHtml($entity->descriptionHtml(true) ?: '', $oldLink, $newLink);
+        $entity->setDescriptionHtml($html);
         $entity->save();
     }
 
diff --git a/app/Sorting/SortRuleController.php b/app/Sorting/SortRuleController.php
index 96b8e8ef53e..a124ffa9c46 100644
--- a/app/Sorting/SortRuleController.php
+++ b/app/Sorting/SortRuleController.php
@@ -29,7 +29,7 @@ public function store(Request $request)
 
         $operations = SortRuleOperation::fromSequence($request->input('sequence'));
         if (count($operations) === 0) {
-            return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
+            return redirect('/settings/sorting/rules/new')->withInput()->withErrors(['sequence' => 'No operations set.']);
         }
 
         $rule = new SortRule();
diff --git a/app/Uploads/Controllers/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
index 6d4657a7a5a..d2a750c4555 100644
--- a/app/Uploads/Controllers/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -146,10 +146,10 @@ protected function formatForSingleResponse(Image $image): array
             $data['content']['html'] = "<div drawio-diagram=\"{$image->id}\"><img src=\"{$escapedUrl}\"></div>";
             $data['content']['markdown'] = $data['content']['html'];
         } else {
-            $escapedDisplayThumb = htmlentities($image->thumbs['display']);
+            $escapedDisplayThumb = htmlentities($image->getAttribute('thumbs')['display']);
             $data['content']['html'] = "<a href=\"{$escapedUrl}\" target=\"_blank\"><img src=\"{$escapedDisplayThumb}\" alt=\"{$escapedName}\"></a>";
             $mdEscapedName = str_replace(']', '', str_replace('[', '', $image->name));
-            $mdEscapedThumb = str_replace(']', '', str_replace('[', '', $image->thumbs['display']));
+            $mdEscapedThumb = str_replace(']', '', str_replace('[', '', $image->getAttribute('thumbs')['display']));
             $data['content']['markdown'] = "![{$mdEscapedName}]({$mdEscapedThumb})";
         }
 

From cee23de6c5350101e16e1aead59e0219e9e2771e Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 2 Sep 2025 16:02:52 +0100
Subject: [PATCH 654/666] Maintenance: Reached PHPstan level 2

Reworked some stuff around slugs to use interface in a better way.
Also standardised phpdoc to use @return instead of @returns
---
 app/Access/Saml2Service.php                   |  2 +-
 app/Access/SocialDriverManager.php            |  2 +-
 app/Activity/Models/Comment.php               |  7 +++--
 app/Activity/WatchLevels.php                  |  4 +--
 app/App/Model.php                             |  2 +-
 .../{Sluggable.php => SluggableInterface.php} |  5 +--
 .../Controllers/RecycleBinApiController.php   | 19 ++++++++----
 app/Entities/Models/Book.php                  |  3 +-
 app/Entities/Models/Bookshelf.php             |  1 +
 app/Entities/Models/Chapter.php               |  4 +--
 app/Entities/Models/Entity.php                | 31 ++++++++++++++++---
 app/Entities/Queries/BookQueries.php          |  3 ++
 app/Entities/Queries/BookshelfQueries.php     |  3 ++
 app/Entities/Queries/EntityQueries.php        |  2 +-
 .../Queries/ProvidesEntityQueries.php         |  3 +-
 app/Entities/Repos/BaseRepo.php               |  6 ++--
 app/Entities/Tools/SlugGenerator.php          | 12 +++----
 app/Permissions/PermissionApplicator.php      | 15 ++++-----
 app/References/CrossLinkParser.php            |  2 +-
 app/Search/SearchIndex.php                    | 12 +++----
 app/Sorting/BookSorter.php                    |  2 +-
 app/Theming/ThemeEvents.php                   | 12 +++----
 app/Uploads/Attachment.php                    |  3 +-
 app/Uploads/Image.php                         |  3 +-
 app/Uploads/ImageService.php                  |  2 +-
 app/Uploads/ImageStorageDisk.php              |  2 +-
 app/Users/Controllers/UserApiController.php   |  2 +-
 app/Users/Models/HasCreatorAndUpdater.php     |  5 +++
 app/Users/Models/HasOwner.php                 | 19 ------------
 app/Users/Models/OwnableInterface.php         |  8 +++++
 app/Users/Models/Role.php                     |  1 +
 app/Users/Models/User.php                     |  6 ++--
 phpcs.xml                                     |  2 +-
 phpstan.neon.dist                             |  2 +-
 34 files changed, 118 insertions(+), 89 deletions(-)
 rename app/App/{Sluggable.php => SluggableInterface.php} (75%)
 delete mode 100644 app/Users/Models/HasOwner.php
 create mode 100644 app/Users/Models/OwnableInterface.php

diff --git a/app/Access/Saml2Service.php b/app/Access/Saml2Service.php
index bb7e9b572e2..106a7a22906 100644
--- a/app/Access/Saml2Service.php
+++ b/app/Access/Saml2Service.php
@@ -51,7 +51,7 @@ public function login(): array
      * Returns the SAML2 request ID, and the URL to redirect the user to.
      *
      * @throws Error
-     * @returns array{url: string, id: ?string}
+     * @return array{url: string, id: ?string}
      */
     public function logout(User $user): array
     {
diff --git a/app/Access/SocialDriverManager.php b/app/Access/SocialDriverManager.php
index dafc0e82d14..efafab560ce 100644
--- a/app/Access/SocialDriverManager.php
+++ b/app/Access/SocialDriverManager.php
@@ -55,7 +55,7 @@ public function isAutoConfirmEmailEnabled(string $driver): bool
 
     /**
      * Gets the names of the active social drivers, keyed by driver id.
-     * @returns array<string, string>
+     * @return array<string, string>
      */
     public function getActive(): array
     {
diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 91cea4fe0e3..6b05a9baba8 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -4,6 +4,8 @@
 
 use BookStack\App\Model;
 use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\OwnableInterface;
+use BookStack\Users\Models\User;
 use BookStack\Util\HtmlContentFilter;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,12 +19,10 @@
  * @property int      $local_id
  * @property string   $entity_type
  * @property int      $entity_id
- * @property int      $created_by
- * @property int      $updated_by
  * @property string   $content_ref
  * @property bool     $archived
  */
-class Comment extends Model implements Loggable
+class Comment extends Model implements Loggable, OwnableInterface
 {
     use HasFactory;
     use HasCreatorAndUpdater;
@@ -39,6 +39,7 @@ public function entity(): MorphTo
 
     /**
      * Get the parent comment this is in reply to (if existing).
+     * @return BelongsTo<Comment, Comment>
      */
     public function parent(): BelongsTo
     {
diff --git a/app/Activity/WatchLevels.php b/app/Activity/WatchLevels.php
index de3c5e12288..edbece2d371 100644
--- a/app/Activity/WatchLevels.php
+++ b/app/Activity/WatchLevels.php
@@ -36,7 +36,7 @@ class WatchLevels
 
     /**
      * Get all the possible values as an option_name => value array.
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     public static function all(): array
     {
@@ -50,7 +50,7 @@ public static function all(): array
 
     /**
      * Get the watch options suited for the given entity.
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     public static function allSuitedFor(Entity $entity): array
     {
diff --git a/app/App/Model.php b/app/App/Model.php
index 8de5a276205..e1c7511c14f 100644
--- a/app/App/Model.php
+++ b/app/App/Model.php
@@ -8,7 +8,7 @@ class Model extends EloquentModel
 {
     /**
      * Provides public access to get the raw attribute value from the model.
-     * Used in areas where no mutations are required but performance is critical.
+     * Used in areas where no mutations are required, but performance is critical.
      *
      * @return mixed
      */
diff --git a/app/App/Sluggable.php b/app/App/SluggableInterface.php
similarity index 75%
rename from app/App/Sluggable.php
rename to app/App/SluggableInterface.php
index f8da2e26517..96af49cd323 100644
--- a/app/App/Sluggable.php
+++ b/app/App/SluggableInterface.php
@@ -5,11 +5,8 @@
 /**
  * Assigned to models that can have slugs.
  * Must have the below properties.
- *
- * @property int    $id
- * @property string $name
  */
-interface Sluggable
+interface SluggableInterface
 {
     /**
      * Regenerate the slug for this model.
diff --git a/app/Entities/Controllers/RecycleBinApiController.php b/app/Entities/Controllers/RecycleBinApiController.php
index bf22d7dcd0c..fdc24ddf8e2 100644
--- a/app/Entities/Controllers/RecycleBinApiController.php
+++ b/app/Entities/Controllers/RecycleBinApiController.php
@@ -6,10 +6,10 @@
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Deletion;
+use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Http\ApiController;
-use Closure;
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecycleBinApiController extends ApiController
 {
@@ -40,7 +40,7 @@ public function list()
             'updated_at',
             'deletable_type',
             'deletable_id',
-        ], [Closure::fromCallable([$this, 'listFormatter'])]);
+        ], [$this->listFormatter(...)]);
     }
 
     /**
@@ -72,7 +72,6 @@ public function destroy(DeletionRepo $deletionRepo, string $deletionId)
     protected function listFormatter(Deletion $deletion)
     {
         $deletable = $deletion->deletable;
-        $withTrashedQuery = fn (Builder $query) => $query->withTrashed();
 
         if ($deletable instanceof BookChild) {
             $parent = $deletable->getParent();
@@ -81,11 +80,19 @@ protected function listFormatter(Deletion $deletion)
         }
 
         if ($deletable instanceof Book || $deletable instanceof Chapter) {
-            $countsToLoad = ['pages' => $withTrashedQuery];
+            $countsToLoad = ['pages' => static::withTrashedQuery(...)];
             if ($deletable instanceof Book) {
-                $countsToLoad['chapters'] = $withTrashedQuery;
+                $countsToLoad['chapters'] = static::withTrashedQuery(...);
             }
             $deletable->loadCount($countsToLoad);
         }
     }
+
+    /**
+     * @param HasMany<Chapter|Page, Book|Chapter> $query
+     */
+    protected static function withTrashedQuery(HasMany $query): void
+    {
+        $query->withTrashed();
+    }
 }
diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 88e3b85baf9..5f54e0f6af6 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -95,6 +95,7 @@ public function sortRule(): BelongsTo
 
     /**
      * Get all pages within this book.
+     * @return HasMany<Page, $this>
      */
     public function pages(): HasMany
     {
@@ -111,7 +112,7 @@ public function directPages(): HasMany
 
     /**
      * Get all chapters within this book.
-     * @return HasMany<Chapter>
+     * @return HasMany<Chapter, $this>
      */
     public function chapters(): HasMany
     {
diff --git a/app/Entities/Models/Bookshelf.php b/app/Entities/Models/Bookshelf.php
index 5b403d9c0fa..9ae52abcb0a 100644
--- a/app/Entities/Models/Bookshelf.php
+++ b/app/Entities/Models/Bookshelf.php
@@ -70,6 +70,7 @@ public function getBookCover(int $width = 440, int $height = 250): string
 
     /**
      * Get the cover image of the shelf.
+     * @return BelongsTo<Image, $this>
      */
     public function cover(): BelongsTo
     {
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index 03e819c06ff..d70a49e7a98 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -27,7 +27,7 @@ class Chapter extends BookChild implements HtmlDescriptionInterface
     /**
      * Get the pages that this chapter contains.
      *
-     * @return HasMany<Page>
+     * @return HasMany<Page, $this>
      */
     public function pages(string $dir = 'ASC'): HasMany
     {
@@ -60,7 +60,7 @@ public function defaultTemplate(): BelongsTo
 
     /**
      * Get the visible pages in this chapter.
-     * @returns Collection<Page>
+     * @return Collection<Page>
      */
     public function getVisiblePages(): Collection
     {
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 46b29f93b83..31511aa832d 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -12,7 +12,7 @@
 use BookStack\Activity\Models\Viewable;
 use BookStack\Activity\Models\Watch;
 use BookStack\App\Model;
-use BookStack\App\Sluggable;
+use BookStack\App\SluggableInterface;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Permissions\JointPermissionBuilder;
 use BookStack\Permissions\Models\EntityPermission;
@@ -22,7 +22,8 @@
 use BookStack\Search\SearchIndex;
 use BookStack\Search\SearchTerm;
 use BookStack\Users\Models\HasCreatorAndUpdater;
-use BookStack\Users\Models\HasOwner;
+use BookStack\Users\Models\OwnableInterface;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -43,17 +44,23 @@
  * @property Carbon     $deleted_at
  * @property int        $created_by
  * @property int        $updated_by
+ * @property int        $owned_by
  * @property Collection $tags
  *
  * @method static Entity|Builder visible()
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
-abstract class Entity extends Model implements Sluggable, Favouritable, Viewable, DeletableInterface, Loggable
+abstract class Entity extends Model implements
+    SluggableInterface,
+    Favouritable,
+    Viewable,
+    DeletableInterface,
+    OwnableInterface,
+    Loggable
 {
     use SoftDeletes;
     use HasCreatorAndUpdater;
-    use HasOwner;
 
     /**
      * @var string - Name of property where the main text content is found
@@ -200,6 +207,20 @@ public function jointPermissions(): MorphMany
         return $this->morphMany(JointPermission::class, 'entity');
     }
 
+    /**
+     * Get the user who owns this entity.
+     * @return BelongsTo<User, $this>
+     */
+    public function ownedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'owned_by');
+    }
+
+    public function getOwnerFieldName(): string
+    {
+        return 'owned_by';
+    }
+
     /**
      * Get the related delete records for this entity.
      */
@@ -318,7 +339,7 @@ public function indexForSearch(): void
      */
     public function refreshSlug(): string
     {
-        $this->slug = app()->make(SlugGenerator::class)->generate($this);
+        $this->slug = app()->make(SlugGenerator::class)->generate($this, $this->name);
 
         return $this->slug;
     }
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 534640621ee..5ff22252c14 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -13,6 +13,9 @@ class BookQueries implements ProvidesEntityQueries
         'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
+    /**
+     * @return Builder<Book>
+     */
     public function start(): Builder
     {
         return Book::query();
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 19717fb7cd4..874bc7f2f58 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -13,6 +13,9 @@ class BookshelfQueries implements ProvidesEntityQueries
         'created_at', 'updated_at', 'image_id', 'owned_by',
     ];
 
+    /**
+     * @return Builder<Bookshelf>
+     */
     public function start(): Builder
     {
         return Bookshelf::query();
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 36dc6c0bc8a..0d2cd7acf64 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -35,6 +35,7 @@ public function findVisibleByStringIdentifier(string $identifier): ?Entity
     /**
      * Start a query of visible entities of the given type,
      * suitable for listing display.
+     * @return Builder<Entity>
      */
     public function visibleForList(string $entityType): Builder
     {
@@ -44,7 +45,6 @@ public function visibleForList(string $entityType): Builder
 
     protected function getQueriesForType(string $type): ProvidesEntityQueries
     {
-        /** @var ?ProvidesEntityQueries $queries */
         $queries = match ($type) {
             'page' => $this->pages,
             'chapter' => $this->chapters,
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index 611d0ae526b..1f8a71ae230 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -22,13 +22,14 @@ interface ProvidesEntityQueries
     public function start(): Builder;
 
     /**
-     * Find the entity of the given ID, or return null if not found.
+     * Find the entity of the given ID or return null if not found.
      */
     public function findVisibleById(int $id): ?Entity;
 
     /**
      * Start a query for items that are visible, with selection
      * configured for list display of this item.
+     * @return Builder<Entity>
      */
     public function visibleForList(): Builder;
 }
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index f4d05d8af21..bfc01a58d1d 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -89,12 +89,10 @@ public function update(Entity $entity, array $input)
     /**
      * Update the given items' cover image, or clear it.
      *
-     * @param Entity&CoverImageInterface $entity
-     *
      * @throws ImageUploadException
      * @throws \Exception
      */
-    public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $removeImage = false)
+    public function updateCoverImage(Entity&CoverImageInterface $entity, ?UploadedFile $coverImage, bool $removeImage = false)
     {
         if ($coverImage) {
             $imageType = $entity->coverImageTypeKey();
@@ -106,7 +104,7 @@ public function updateCoverImage($entity, ?UploadedFile $coverImage, bool $remov
 
         if ($removeImage) {
             $this->imageRepo->destroyImage($entity->cover()->first());
-            $entity->image_id = 0;
+            $entity->cover()->dissociate();
             $entity->save();
         }
     }
diff --git a/app/Entities/Tools/SlugGenerator.php b/app/Entities/Tools/SlugGenerator.php
index 5df300bb04c..fb912318750 100644
--- a/app/Entities/Tools/SlugGenerator.php
+++ b/app/Entities/Tools/SlugGenerator.php
@@ -3,7 +3,7 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\App\Model;
-use BookStack\App\Sluggable;
+use BookStack\App\SluggableInterface;
 use BookStack\Entities\Models\BookChild;
 use Illuminate\Support\Str;
 
@@ -13,9 +13,9 @@ class SlugGenerator
      * Generate a fresh slug for the given entity.
      * The slug will be generated so that it doesn't conflict within the same parent item.
      */
-    public function generate(Sluggable $model): string
+    public function generate(SluggableInterface&Model $model, string $slugSource): string
     {
-        $slug = $this->formatNameAsSlug($model->name);
+        $slug = $this->formatNameAsSlug($slugSource);
         while ($this->slugInUse($slug, $model)) {
             $slug .= '-' . Str::random(3);
         }
@@ -24,7 +24,7 @@ public function generate(Sluggable $model): string
     }
 
     /**
-     * Format a name as a url slug.
+     * Format a name as a URL slug.
      */
     protected function formatNameAsSlug(string $name): string
     {
@@ -39,10 +39,8 @@ protected function formatNameAsSlug(string $name): string
     /**
      * Check if a slug is already in-use for this
      * type of model within the same parent.
-     *
-     * @param Sluggable&Model $model
      */
-    protected function slugInUse(string $slug, Sluggable $model): bool
+    protected function slugInUse(string $slug, SluggableInterface&Model $model): bool
     {
         $query = $model->newQuery()->where('slug', '=', $slug);
 
diff --git a/app/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php
index ce4a543fd83..e59b8ab6759 100644
--- a/app/Permissions/PermissionApplicator.php
+++ b/app/Permissions/PermissionApplicator.php
@@ -7,8 +7,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Permissions\Models\EntityPermission;
-use BookStack\Users\Models\HasCreatorAndUpdater;
-use BookStack\Users\Models\HasOwner;
+use BookStack\Users\Models\OwnableInterface;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -24,10 +23,8 @@ public function __construct(
 
     /**
      * Checks if an entity has a restriction set upon it.
-     *
-     * @param Model&(HasCreatorAndUpdater|HasOwner) $ownable
      */
-    public function checkOwnableUserAccess(Model $ownable, string $permission): bool
+    public function checkOwnableUserAccess(Model&OwnableInterface $ownable, string $permission): bool
     {
         $explodedPermission = explode('-', $permission);
         $action = $explodedPermission[1] ?? $explodedPermission[0];
@@ -39,7 +36,7 @@ public function checkOwnableUserAccess(Model $ownable, string $permission): bool
         $allRolePermission = $user->can($fullPermission . '-all');
         $ownRolePermission = $user->can($fullPermission . '-own');
         $nonJointPermissions = ['restrictions', 'image', 'attachment', 'comment'];
-        $ownerField = ($ownable instanceof Entity) ? 'owned_by' : 'created_by';
+        $ownerField = $ownable->getOwnerFieldName();
         $ownableFieldVal = $ownable->getAttribute($ownerField);
 
         if (is_null($ownableFieldVal)) {
@@ -49,11 +46,15 @@ public function checkOwnableUserAccess(Model $ownable, string $permission): bool
         $isOwner = $user->id === $ownableFieldVal;
         $hasRolePermission = $allRolePermission || ($isOwner && $ownRolePermission);
 
-        // Handle non entity specific jointPermissions
+        // Handle non-entity-specific jointPermissions
         if (in_array($explodedPermission[0], $nonJointPermissions)) {
             return $hasRolePermission;
         }
 
+        if (!($ownable instanceof Entity)) {
+            return false;
+        }
+
         $hasApplicableEntityPermissions = $this->hasEntityPermission($ownable, $userRoleIds, $action);
 
         return is_null($hasApplicableEntityPermissions) ? $hasRolePermission : $hasApplicableEntityPermissions;
diff --git a/app/References/CrossLinkParser.php b/app/References/CrossLinkParser.php
index 1fd4c1b3e3c..3fb00be84c4 100644
--- a/app/References/CrossLinkParser.php
+++ b/app/References/CrossLinkParser.php
@@ -48,7 +48,7 @@ public function extractLinkedModels(string $html): array
     /**
      * Get a list of href values from the given document.
      *
-     * @returns string[]
+     * @return string[]
      */
     protected function getLinksFromContent(string $html): array
     {
diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index 844e3584b20..117d069ea77 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -119,7 +119,7 @@ protected function insertTerms(array $terms): void
      * Create a scored term array from the given text, where the keys are the terms
      * and the values are their scores.
      *
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     protected function generateTermScoreMapFromText(string $text, float $scoreAdjustment = 1): array
     {
@@ -136,7 +136,7 @@ protected function generateTermScoreMapFromText(string $text, float $scoreAdjust
      * Create a scored term array from the given HTML, where the keys are the terms
      * and the values are their scores.
      *
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     protected function generateTermScoreMapFromHtml(string $html): array
     {
@@ -177,7 +177,7 @@ protected function generateTermScoreMapFromHtml(string $html): array
      *
      * @param Tag[] $tags
      *
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     protected function generateTermScoreMapFromTags(array $tags): array
     {
@@ -199,7 +199,7 @@ protected function generateTermScoreMapFromTags(array $tags): array
      * For the given text, return an array where the keys are the unique term words
      * and the values are the frequency of that term.
      *
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     protected function textToTermCountMap(string $text): array
     {
@@ -243,7 +243,7 @@ protected function textToTermCountMap(string $text): array
      * For the given entity, Generate an array of term data details.
      * Is the raw term data, not instances of SearchTerm models.
      *
-     * @returns array{term: string, score: float, entity_id: int, entity_type: string}[]
+     * @return array{term: string, score: float, entity_id: int, entity_type: string}[]
      */
     protected function entityToTermDataArray(Entity $entity): array
     {
@@ -279,7 +279,7 @@ protected function entityToTermDataArray(Entity $entity): array
      *
      * @param array<string, int>[] ...$scoreMaps
      *
-     * @returns array<string, int>
+     * @return array<string, int>
      */
     protected function mergeTermScoreMaps(...$scoreMaps): array
     {
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index cf41a6a94d0..e627d66fdfe 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -78,7 +78,7 @@ public function runBookAutoSort(Book $book): void
      * Sort the books content using the given sort map.
      * Returns a list of books that were involved in the operation.
      *
-     * @returns Book[]
+     * @return Book[]
      */
     public function sortUsingMap(BookSortMap $sortMap): array
     {
diff --git a/app/Theming/ThemeEvents.php b/app/Theming/ThemeEvents.php
index 2d4900c962c..44630acaeb1 100644
--- a/app/Theming/ThemeEvents.php
+++ b/app/Theming/ThemeEvents.php
@@ -62,7 +62,7 @@ class ThemeEvents
      *
      * @param string $authSystem
      * @param array $userData
-     * @returns bool|null
+     * @return bool|null
      */
     const AUTH_PRE_REGISTER = 'auth_pre_register';
 
@@ -83,7 +83,7 @@ class ThemeEvents
      * If the listener returns a non-null value, that will be used as an environment instead.
      *
      * @param \League\CommonMark\Environment\Environment $environment
-     * @returns \League\CommonMark\Environment\Environment|null
+     * @return \League\CommonMark\Environment\Environment|null
      */
     const COMMONMARK_ENVIRONMENT_CONFIGURE = 'commonmark_environment_configure';
 
@@ -96,7 +96,7 @@ class ThemeEvents
      *
      * @param array $idTokenData
      * @param array $accessTokenData
-     * @returns array|null
+     * @return array|null
      */
     const OIDC_ID_TOKEN_PRE_VALIDATE = 'oidc_id_token_pre_validate';
 
@@ -142,7 +142,7 @@ class ThemeEvents
      * Return values, if provided, will be used as a new response to use.
      *
      * @param \Illuminate\Http\Request $request
-     * @returns \Illuminate\Http\Response|null
+     * @return \Illuminate\Http\Response|null
      */
     const WEB_MIDDLEWARE_BEFORE = 'web_middleware_before';
 
@@ -154,7 +154,7 @@ class ThemeEvents
      *
      * @param \Illuminate\Http\Request $request
      * @param \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\BinaryFileResponse $response
-     * @returns \Illuminate\Http\Response|null
+     * @return \Illuminate\Http\Response|null
      */
     const WEB_MIDDLEWARE_AFTER = 'web_middleware_after';
 
@@ -173,7 +173,7 @@ class ThemeEvents
      * @param string|\BookStack\Activity\Models\Loggable $detail
      * @param \BookStack\Users\Models\User $initiator
      * @param int $initiatedTime
-     * @returns array|null
+     * @return array|null
      */
     const WEBHOOK_CALL_BEFORE = 'webhook_call_before';
 }
diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php
index 57d7cb3346c..05227243a76 100644
--- a/app/Uploads/Attachment.php
+++ b/app/Uploads/Attachment.php
@@ -8,6 +8,7 @@
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\OwnableInterface;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -27,7 +28,7 @@
  *
  * @method static Entity|Builder visible()
  */
-class Attachment extends Model
+class Attachment extends Model implements OwnableInterface
 {
     use HasCreatorAndUpdater;
     use HasFactory;
diff --git a/app/Uploads/Image.php b/app/Uploads/Image.php
index 0a267a64465..ec8f8be0fb1 100644
--- a/app/Uploads/Image.php
+++ b/app/Uploads/Image.php
@@ -7,6 +7,7 @@
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\OwnableInterface;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -21,7 +22,7 @@
  * @property int    $created_by
  * @property int    $updated_by
  */
-class Image extends Model
+class Image extends Model implements OwnableInterface
 {
     use HasFactory;
     use HasCreatorAndUpdater;
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index a8f14451737..458f0102d77 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -138,7 +138,7 @@ public function getImageData(Image $image): string
      * Get the raw data content from an image.
      *
      * @throws Exception
-     * @returns ?resource
+     * @return ?resource
      */
     public function getImageStream(Image $image): mixed
     {
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index f2667d993a8..36d6721de6c 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -61,7 +61,7 @@ public function get(string $path): ?string
 
     /**
      * Get a stream to the file at the given path.
-     * @returns ?resource
+     * @return ?resource
      */
     public function stream(string $path): mixed
     {
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index bb2570b3108..351893b032b 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -81,7 +81,7 @@ public function list()
         return $this->apiListingResponse($users, [
             'id', 'name', 'slug', 'email', 'external_auth_id',
             'created_at', 'updated_at', 'last_activity_at',
-        ], [Closure::fromCallable([$this, 'listFormatter'])]);
+        ], [$this->listFormatter(...)]);
     }
 
     /**
diff --git a/app/Users/Models/HasCreatorAndUpdater.php b/app/Users/Models/HasCreatorAndUpdater.php
index 9fb24ead9ec..bb05de11af7 100644
--- a/app/Users/Models/HasCreatorAndUpdater.php
+++ b/app/Users/Models/HasCreatorAndUpdater.php
@@ -27,4 +27,9 @@ public function updatedBy(): BelongsTo
     {
         return $this->belongsTo(User::class, 'updated_by');
     }
+
+    public function getOwnerFieldName(): string
+    {
+        return 'created_by';
+    }
 }
diff --git a/app/Users/Models/HasOwner.php b/app/Users/Models/HasOwner.php
deleted file mode 100644
index eb830ef6fda..00000000000
--- a/app/Users/Models/HasOwner.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace BookStack\Users\Models;
-
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-/**
- * @property int $owned_by
- */
-trait HasOwner
-{
-    /**
-     * Relation for the user that owns this entity.
-     */
-    public function ownedBy(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'owned_by');
-    }
-}
diff --git a/app/Users/Models/OwnableInterface.php b/app/Users/Models/OwnableInterface.php
new file mode 100644
index 00000000000..8f738487f2d
--- /dev/null
+++ b/app/Users/Models/OwnableInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace BookStack\Users\Models;
+
+interface OwnableInterface
+{
+    public function getOwnerFieldName(): string;
+}
diff --git a/app/Users/Models/Role.php b/app/Users/Models/Role.php
index d1452e66bae..912ae81c980 100644
--- a/app/Users/Models/Role.php
+++ b/app/Users/Models/Role.php
@@ -53,6 +53,7 @@ public function jointPermissions(): HasMany
 
     /**
      * The RolePermissions that belong to the role.
+     * @return BelongsToMany<RolePermission, $this>
      */
     public function permissions(): BelongsToMany
     {
diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index 0d437418bb9..b6989ce2dae 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -10,7 +10,7 @@
 use BookStack\Activity\Models\Watch;
 use BookStack\Api\ApiToken;
 use BookStack\App\Model;
-use BookStack\App\Sluggable;
+use BookStack\App\SluggableInterface;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Translation\LocaleDefinition;
 use BookStack\Translation\LocaleManager;
@@ -47,7 +47,7 @@
  * @property Collection $mfaValues
  * @property ?Image     $avatar
  */
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, SluggableInterface
 {
     use HasFactory;
     use Authenticatable;
@@ -372,7 +372,7 @@ public function logDescriptor(): string
      */
     public function refreshSlug(): string
     {
-        $this->slug = app()->make(SlugGenerator::class)->generate($this);
+        $this->slug = app()->make(SlugGenerator::class)->generate($this, $this->name);
 
         return $this->slug;
     }
diff --git a/phpcs.xml b/phpcs.xml
index 8d4c6b70208..8337d5aac50 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -14,7 +14,7 @@
     <arg name="parallel" value="75"/>
     <arg value="np"/>
 
-    <rule  ref="PSR12"/>
+    <rule ref="PSR12"/>
 
     <rule ref="PSR1.Methods.CamelCapsMethodName">
         <exclude-pattern>./tests/*</exclude-pattern>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 0f20213836c..9dfd9d29e7c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,7 +7,7 @@ parameters:
         - app
 
     # The level 8 is the highest level
-    level: 1
+    level: 2
 
     phpVersion:
         min: 80200

From e05ec7da361027126e538bbe5908d0bfdf1ede4a Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 3 Sep 2025 10:47:45 +0100
Subject: [PATCH 655/666] Maintenance: Addressed a range of phpstan level 3
 issues

---
 app/Access/ExternalBaseUserProvider.php       |  24 +---
 .../Guards/ExternalBaseSessionGuard.php       | 111 ++++--------------
 app/Activity/Models/Comment.php               |   2 +-
 app/App/Providers/AuthServiceProvider.php     |   4 +-
 app/App/Providers/EventServiceProvider.php    |   2 +-
 .../Controllers/PageRevisionController.php    |   2 +-
 app/Entities/Models/PageRevision.php          |   2 +-
 app/Exceptions/Handler.php                    |   4 +-
 app/Exports/ImportRepo.php                    |   3 +
 .../ZipExports/Models/ZipExportAttachment.php |   6 +-
 .../ZipExports/Models/ZipExportBook.php       |   6 +-
 .../ZipExports/Models/ZipExportChapter.php    |   6 +-
 .../ZipExports/Models/ZipExportImage.php      |   6 +-
 .../ZipExports/Models/ZipExportModel.php      |   4 +-
 .../ZipExports/Models/ZipExportPage.php       |   6 +-
 .../ZipExports/Models/ZipExportTag.php        |   6 +-
 app/Http/Kernel.php                           |   6 +-
 app/Http/Middleware/EncryptCookies.php        |   2 +-
 .../PreventRequestsDuringMaintenance.php      |   2 +-
 app/Http/Middleware/TrimStrings.php           |   2 +-
 app/Http/Middleware/TrustProxies.php          |   2 +-
 app/Http/Middleware/VerifyCsrfToken.php       |   2 +-
 app/Search/SearchOptionSet.php                |   3 +
 app/Search/SearchRunner.php                   |   2 +-
 app/Users/Models/User.php                     |  13 +-
 app/Util/OutOfMemoryHandler.php               |   7 +-
 26 files changed, 84 insertions(+), 151 deletions(-)

diff --git a/app/Access/ExternalBaseUserProvider.php b/app/Access/ExternalBaseUserProvider.php
index 2b5ddfbf3d0..2165fd4591e 100644
--- a/app/Access/ExternalBaseUserProvider.php
+++ b/app/Access/ExternalBaseUserProvider.php
@@ -2,33 +2,18 @@
 
 namespace BookStack\Access;
 
+use BookStack\Users\Models\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
-use Illuminate\Database\Eloquent\Model;
 
 class ExternalBaseUserProvider implements UserProvider
 {
-    public function __construct(
-        protected string $model
-    ) {
-    }
-
-    /**
-     * Create a new instance of the model.
-     */
-    public function createModel(): Model
-    {
-        $class = '\\' . ltrim($this->model, '\\');
-
-        return new $class();
-    }
-
     /**
      * Retrieve a user by their unique identifier.
      */
     public function retrieveById(mixed $identifier): ?Authenticatable
     {
-        return $this->createModel()->newQuery()->find($identifier);
+        return User::query()->find($identifier);
     }
 
     /**
@@ -59,10 +44,7 @@ public function updateRememberToken(Authenticatable $user, $token)
      */
     public function retrieveByCredentials(array $credentials): ?Authenticatable
     {
-        // Search current user base by looking up a uid
-        $model = $this->createModel();
-
-        return $model->newQuery()
+        return User::query()
             ->where('external_auth_id', $credentials['external_auth_id'])
             ->first();
     }
diff --git a/app/Access/Guards/ExternalBaseSessionGuard.php b/app/Access/Guards/ExternalBaseSessionGuard.php
index 2d15422a5ae..899e93c3670 100644
--- a/app/Access/Guards/ExternalBaseSessionGuard.php
+++ b/app/Access/Guards/ExternalBaseSessionGuard.php
@@ -4,7 +4,7 @@
 
 use BookStack\Access\RegistrationService;
 use Illuminate\Auth\GuardHelpers;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Session\Session;
@@ -24,43 +24,31 @@ class ExternalBaseSessionGuard implements StatefulGuard
      * The name of the Guard. Typically "session".
      *
      * Corresponds to guard name in authentication configuration.
-     *
-     * @var string
      */
-    protected $name;
+    protected readonly string $name;
 
     /**
      * The user we last attempted to retrieve.
-     *
-     * @var \Illuminate\Contracts\Auth\Authenticatable
      */
-    protected $lastAttempted;
+    protected Authenticatable $lastAttempted;
 
     /**
      * The session used by the guard.
-     *
-     * @var \Illuminate\Contracts\Session\Session
      */
-    protected $session;
+    protected Session $session;
 
     /**
      * Indicates if the logout method has been called.
-     *
-     * @var bool
      */
-    protected $loggedOut = false;
+    protected bool $loggedOut = false;
 
     /**
      * Service to handle common registration actions.
-     *
-     * @var RegistrationService
      */
-    protected $registrationService;
+    protected RegistrationService $registrationService;
 
     /**
      * Create a new authentication guard.
-     *
-     * @return void
      */
     public function __construct(string $name, UserProvider $provider, Session $session, RegistrationService $registrationService)
     {
@@ -72,13 +60,11 @@ public function __construct(string $name, UserProvider $provider, Session $sessi
 
     /**
      * Get the currently authenticated user.
-     *
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public function user()
+    public function user(): Authenticatable|null
     {
         if ($this->loggedOut) {
-            return;
+            return null;
         }
 
         // If we've already retrieved the user for the current request we can just
@@ -101,13 +87,11 @@ public function user()
 
     /**
      * Get the ID for the currently authenticated user.
-     *
-     * @return int|null
      */
-    public function id()
+    public function id(): int|null
     {
         if ($this->loggedOut) {
-            return;
+            return null;
         }
 
         return $this->user()
@@ -117,12 +101,8 @@ public function id()
 
     /**
      * Log a user into the application without sessions or cookies.
-     *
-     * @param array $credentials
-     *
-     * @return bool
      */
-    public function once(array $credentials = [])
+    public function once(array $credentials = []): bool
     {
         if ($this->validate($credentials)) {
             $this->setUser($this->lastAttempted);
@@ -135,12 +115,8 @@ public function once(array $credentials = [])
 
     /**
      * Log the given user ID into the application without sessions or cookies.
-     *
-     * @param mixed $id
-     *
-     * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
-    public function onceUsingId($id)
+    public function onceUsingId($id): Authenticatable|false
     {
         if (!is_null($user = $this->provider->retrieveById($id))) {
             $this->setUser($user);
@@ -153,38 +129,26 @@ public function onceUsingId($id)
 
     /**
      * Validate a user's credentials.
-     *
-     * @param array $credentials
-     *
-     * @return bool
      */
-    public function validate(array $credentials = [])
+    public function validate(array $credentials = []): bool
     {
         return false;
     }
 
     /**
      * Attempt to authenticate a user using the given credentials.
-     *
-     * @param array $credentials
-     * @param bool  $remember
-     *
-     * @return bool
+     * @param bool $remember
      */
-    public function attempt(array $credentials = [], $remember = false)
+    public function attempt(array $credentials = [], $remember = false): bool
     {
         return false;
     }
 
     /**
      * Log the given user ID into the application.
-     *
-     * @param mixed $id
      * @param bool  $remember
-     *
-     * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
-    public function loginUsingId($id, $remember = false)
+    public function loginUsingId(mixed $id, $remember = false): Authenticatable|false
     {
         // Always return false as to disable this method,
         // Logins should route through LoginService.
@@ -194,12 +158,9 @@ public function loginUsingId($id, $remember = false)
     /**
      * Log a user into the application.
      *
-     * @param \Illuminate\Contracts\Auth\Authenticatable $user
-     * @param bool                                       $remember
-     *
-     * @return void
+     * @param bool $remember
      */
-    public function login(AuthenticatableContract $user, $remember = false)
+    public function login(Authenticatable $user, $remember = false): void
     {
         $this->updateSession($user->getAuthIdentifier());
 
@@ -208,12 +169,8 @@ public function login(AuthenticatableContract $user, $remember = false)
 
     /**
      * Update the session with the given ID.
-     *
-     * @param string $id
-     *
-     * @return void
      */
-    protected function updateSession($id)
+    protected function updateSession(string|int $id): void
     {
         $this->session->put($this->getName(), $id);
 
@@ -222,10 +179,8 @@ protected function updateSession($id)
 
     /**
      * Log the user out of the application.
-     *
-     * @return void
      */
-    public function logout()
+    public function logout(): void
     {
         $this->clearUserDataFromStorage();
 
@@ -239,62 +194,48 @@ public function logout()
 
     /**
      * Remove the user data from the session and cookies.
-     *
-     * @return void
      */
-    protected function clearUserDataFromStorage()
+    protected function clearUserDataFromStorage(): void
     {
         $this->session->remove($this->getName());
     }
 
     /**
      * Get the last user we attempted to authenticate.
-     *
-     * @return \Illuminate\Contracts\Auth\Authenticatable
      */
-    public function getLastAttempted()
+    public function getLastAttempted(): Authenticatable
     {
         return $this->lastAttempted;
     }
 
     /**
      * Get a unique identifier for the auth session value.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return 'login_' . $this->name . '_' . sha1(static::class);
     }
 
     /**
      * Determine if the user was authenticated via "remember me" cookie.
-     *
-     * @return bool
      */
-    public function viaRemember()
+    public function viaRemember(): bool
     {
         return false;
     }
 
     /**
      * Return the currently cached user.
-     *
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public function getUser()
+    public function getUser(): Authenticatable|null
     {
         return $this->user;
     }
 
     /**
      * Set the current user.
-     *
-     * @param \Illuminate\Contracts\Auth\Authenticatable $user
-     *
-     * @return $this
      */
-    public function setUser(AuthenticatableContract $user)
+    public function setUser(Authenticatable $user): self
     {
         $this->user = $user;
 
diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 6b05a9baba8..0cb83d61e8d 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -39,7 +39,7 @@ public function entity(): MorphTo
 
     /**
      * Get the parent comment this is in reply to (if existing).
-     * @return BelongsTo<Comment, Comment>
+     * @return BelongsTo<Comment, $this>
      */
     public function parent(): BelongsTo
     {
diff --git a/app/App/Providers/AuthServiceProvider.php b/app/App/Providers/AuthServiceProvider.php
index 23c33907965..6a816252131 100644
--- a/app/App/Providers/AuthServiceProvider.php
+++ b/app/App/Providers/AuthServiceProvider.php
@@ -59,8 +59,8 @@ public function boot(): void
      */
     public function register(): void
     {
-        Auth::provider('external-users', function ($app, array $config) {
-            return new ExternalBaseUserProvider($config['model']);
+        Auth::provider('external-users', function () {
+            return new ExternalBaseUserProvider();
         });
 
         // Bind and provide the default system user as a singleton to the app instance when needed.
diff --git a/app/App/Providers/EventServiceProvider.php b/app/App/Providers/EventServiceProvider.php
index 34ab7cfefea..60e78efe0e9 100644
--- a/app/App/Providers/EventServiceProvider.php
+++ b/app/App/Providers/EventServiceProvider.php
@@ -15,7 +15,7 @@ class EventServiceProvider extends ServiceProvider
     /**
      * The event listener mappings for the application.
      *
-     * @var array<class-string, array<int, class-string>>
+     * @var array<class-string, array<int, string>>
      */
     protected $listen = [
         SocialiteWasCalled::class => [
diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index 4985c39f351..c43eea08baf 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -98,7 +98,7 @@ public function changes(string $bookSlug, string $pageSlug, int $revisionId)
             throw new NotFoundException();
         }
 
-        $prev = $revision->getPrevious();
+        $prev = $revision->getPreviousRevision();
         $prevContent = $prev->html ?? '';
         $diff = Diff::excecute($prevContent, $revision->html);
 
diff --git a/app/Entities/Models/PageRevision.php b/app/Entities/Models/PageRevision.php
index 10ff6d901c4..1a6c980e109 100644
--- a/app/Entities/Models/PageRevision.php
+++ b/app/Entities/Models/PageRevision.php
@@ -60,7 +60,7 @@ public function getUrl(string $path = ''): string
     /**
      * Get the previous revision for the same page if existing.
      */
-    public function getPrevious(): ?PageRevision
+    public function getPreviousRevision(): ?PageRevision
     {
         $id = static::newQuery()->where('page_id', '=', $this->page_id)
             ->where('id', '<', $this->id)
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 61e1263273b..b8c3fa192a6 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -94,7 +94,7 @@ public function render($request, Throwable $e)
      * If the callable returns a response, this response will be returned
      * to the request upon error.
      */
-    public function prepareForOutOfMemory(callable $onOutOfMemory)
+    public function prepareForOutOfMemory(callable $onOutOfMemory): void
     {
         $this->onOutOfMemory = $onOutOfMemory;
     }
@@ -102,7 +102,7 @@ public function prepareForOutOfMemory(callable $onOutOfMemory)
     /**
      * Forget the current out of memory handler, if existing.
      */
-    public function forgetOutOfMemoryHandler()
+    public function forgetOutOfMemoryHandler(): void
     {
         $this->onOutOfMemory = null;
     }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index e030a88d261..896af903a6b 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -39,6 +39,9 @@ public function getVisibleImports(): Collection
         return $this->queryVisible()->get();
     }
 
+    /**
+     * @return Builder<Import>
+     */
     public function queryVisible(): Builder
     {
         $query = Import::query();
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index 4f5b2f23699..97995738ffe 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -6,7 +6,7 @@
 use BookStack\Exports\ZipExports\ZipValidationHelper;
 use BookStack\Uploads\Attachment;
 
-class ZipExportAttachment extends ZipExportModel
+final class ZipExportAttachment extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
@@ -52,9 +52,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $context->validateData($data, $rules);
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 39176ded420..6c51ea3379c 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -8,7 +8,7 @@
 use BookStack\Exports\ZipExports\ZipExportFiles;
 use BookStack\Exports\ZipExports\ZipValidationHelper;
 
-class ZipExportBook extends ZipExportModel
+final class ZipExportBook extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
@@ -101,9 +101,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $errors;
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index bf2dc78f8de..260191a3e78 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -7,7 +7,7 @@
 use BookStack\Exports\ZipExports\ZipExportFiles;
 use BookStack\Exports\ZipExports\ZipValidationHelper;
 
-class ZipExportChapter extends ZipExportModel
+final class ZipExportChapter extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
@@ -79,9 +79,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $errors;
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index e0e7d11986d..4c71af0c3a2 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -7,7 +7,7 @@
 use BookStack\Uploads\Image;
 use Illuminate\Validation\Rule;
 
-class ZipExportImage extends ZipExportModel
+final class ZipExportImage extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
@@ -43,9 +43,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $context->validateData($data, $rules);
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
diff --git a/app/Exports/ZipExports/Models/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.php
index d3a8c35674b..38001c628c6 100644
--- a/app/Exports/ZipExports/Models/ZipExportModel.php
+++ b/app/Exports/ZipExports/Models/ZipExportModel.php
@@ -30,12 +30,12 @@ abstract public static function validate(ZipValidationHelper $context, array $da
     /**
      * Decode the array of data into this export model.
      */
-    abstract public static function fromArray(array $data): self;
+    abstract public static function fromArray(array $data): static;
 
     /**
      * Decode an array of array data into an array of export models.
      * @param array[] $data
-     * @return self[]
+     * @return static[]
      */
     public static function fromManyArray(array $data): array
     {
diff --git a/app/Exports/ZipExports/Models/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
index 097443df02b..6de7f9446f3 100644
--- a/app/Exports/ZipExports/Models/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -7,7 +7,7 @@
 use BookStack\Exports\ZipExports\ZipExportFiles;
 use BookStack\Exports\ZipExports\ZipValidationHelper;
 
-class ZipExportPage extends ZipExportModel
+final class ZipExportPage extends ZipExportModel
 {
     public ?int $id = null;
     public string $name;
@@ -86,9 +86,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $errors;
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->id = $data['id'] ?? null;
         $model->name = $data['name'];
diff --git a/app/Exports/ZipExports/Models/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
index 6b4720fca7e..8ac7f3c4d72 100644
--- a/app/Exports/ZipExports/Models/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -5,7 +5,7 @@
 use BookStack\Activity\Models\Tag;
 use BookStack\Exports\ZipExports\ZipValidationHelper;
 
-class ZipExportTag extends ZipExportModel
+final class ZipExportTag extends ZipExportModel
 {
     public string $name;
     public ?string $value = null;
@@ -39,9 +39,9 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         return $context->validateData($data, $rules);
     }
 
-    public static function fromArray(array $data): self
+    public static function fromArray(array $data): static
     {
-        $model = new self();
+        $model = new static();
 
         $model->name = $data['name'];
         $model->value = $data['value'] ?? null;
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 30714e2ac59..00bf8cbe1c5 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -9,6 +9,8 @@ class Kernel extends HttpKernel
     /**
      * The application's global HTTP middleware stack.
      * These middleware are run during every request to your application.
+     *
+     * @var list<class-string>
      */
     protected $middleware = [
         \BookStack\Http\Middleware\PreventRequestsDuringMaintenance::class,
@@ -21,7 +23,7 @@ class Kernel extends HttpKernel
     /**
      * The application's route middleware groups.
      *
-     * @var array
+     * @var array<string, array<int, class-string>>
      */
     protected $middlewareGroups = [
         'web' => [
@@ -47,7 +49,7 @@ class Kernel extends HttpKernel
     /**
      * The application's middleware aliases.
      *
-     * @var array
+     * @var array<string, class-string>
      */
     protected $middlewareAliases = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 484c15ae87e..2d7d5d9d4e0 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -9,7 +9,7 @@ class EncryptCookies extends Middleware
     /**
      * The names of the cookies that should not be encrypted.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //
diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
index dfb9592e106..c1a02c8cc1a 100644
--- a/app/Http/Middleware/PreventRequestsDuringMaintenance.php
+++ b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -9,7 +9,7 @@ class PreventRequestsDuringMaintenance extends Middleware
     /**
      * The URIs that should be reachable while maintenance mode is enabled.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         //
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index cbdc88fb9b7..ec5725d67c7 100644
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -9,7 +9,7 @@ class TrimStrings extends Middleware
     /**
      * The names of the attributes that should not be trimmed.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         'password',
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 0fe0247b829..ecf6cb18aa2 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -11,7 +11,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array<int,string>|string|null
      */
     protected $proxies;
 
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 804a22bc09a..7c8689b8bcd 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -16,7 +16,7 @@ class VerifyCsrfToken extends Middleware
     /**
      * The URIs that should be excluded from CSRF verification.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
         'saml2/*',
diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
index bd5e5a5b222..844d145e6fc 100644
--- a/app/Search/SearchOptionSet.php
+++ b/app/Search/SearchOptionSet.php
@@ -14,6 +14,9 @@ class SearchOptionSet
      */
     protected array $options = [];
 
+    /**
+     * @param T[] $options
+     */
     public function __construct(array $options = [])
     {
         $this->options = $options;
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 9716f8053be..c14d1c642d9 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -285,7 +285,7 @@ protected function getTermAdjustments(SearchOptions $options): array
      *
      * @param array<string, int> $termCounts
      *
-     * @return array<string, int>
+     * @return array<string, float>
      */
     protected function rawTermCountsToAdjustments(array $termCounts): array
     {
diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index b6989ce2dae..f83e120887b 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -26,6 +26,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Collection;
 
@@ -64,7 +65,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     /**
      * The attributes that are mass assignable.
      *
-     * @var array
+     * @var list<string>
      */
     protected $fillable = ['name', 'email'];
 
@@ -73,7 +74,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     /**
      * The attributes excluded from the model's JSON form.
      *
-     * @var array
+     * @var list<string>
      */
     protected $hidden = [
         'password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email',
@@ -118,14 +119,10 @@ public function hasAppAccess(): bool
     /**
      * The roles that belong to the user.
      *
-     * @return BelongsToMany
+     * @return BelongsToMany<Role, $this>
      */
-    public function roles()
+    public function roles(): BelongsToMany
     {
-        if ($this->id === 0) {
-            return;
-        }
-
         return $this->belongsToMany(Role::class);
     }
 
diff --git a/app/Util/OutOfMemoryHandler.php b/app/Util/OutOfMemoryHandler.php
index 88e9581f492..6632d22a5d5 100644
--- a/app/Util/OutOfMemoryHandler.php
+++ b/app/Util/OutOfMemoryHandler.php
@@ -42,7 +42,7 @@ protected function handle(): mixed
     }
 
     /**
-     * Forget the handler so no action is taken place on out of memory.
+     * Forget the handler, so no action is taken place on out of memory.
      */
     public function forget(): void
     {
@@ -53,6 +53,11 @@ public function forget(): void
 
     protected function getHandler(): Handler
     {
+        /**
+         * We want to resolve our specific BookStack handling via the set app handler
+         * singleton, but phpstan will only infer based on the interface.
+         * @phpstan-ignore return.type
+         */
         return app()->make(ExceptionHandler::class);
     }
 }

From 318b486e0b7601a00dc02bd1adcef22066bfef5d Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 3 Sep 2025 15:18:49 +0100
Subject: [PATCH 656/666] Maintenance: Finished changes to meet phpstan level 3

---
 .../Guards/AsyncExternalBaseSessionGuard.php  | 20 ++++--------
 app/Access/Guards/LdapSessionGuard.php        |  6 +---
 app/Access/LoginService.php                   | 10 +++---
 app/Entities/Queries/BookQueries.php          |  3 ++
 app/Entities/Queries/BookshelfQueries.php     |  3 ++
 app/Entities/Queries/ChapterQueries.php       |  3 ++
 app/Entities/Queries/PageQueries.php          |  6 ++++
 .../Queries/ProvidesEntityQueries.php         |  7 +++--
 app/Entities/Tools/PageIncludeParser.php      |  6 ++--
 app/Exceptions/Handler.php                    | 31 +++++++------------
 app/Permissions/EntityPermissionEvaluator.php |  4 +--
 11 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/app/Access/Guards/AsyncExternalBaseSessionGuard.php b/app/Access/Guards/AsyncExternalBaseSessionGuard.php
index ab982a6b088..b66fbe95e09 100644
--- a/app/Access/Guards/AsyncExternalBaseSessionGuard.php
+++ b/app/Access/Guards/AsyncExternalBaseSessionGuard.php
@@ -3,23 +3,18 @@
 namespace BookStack\Access\Guards;
 
 /**
- * Saml2 Session Guard.
+ * External Auth Session Guard.
  *
- * The saml2 login process is async in nature meaning it does not fit very well
- * into the default laravel 'Guard' auth flow. Instead most of the logic is done
- * via the Saml2 controller & Saml2Service. This class provides a safer, thin
- * version of SessionGuard.
+ * The login process for external auth (SAML2/OIDC) is async in nature, meaning it does not fit very well
+ * into the default laravel 'Guard' auth flow. Instead, most of the logic is done via the relevant
+ * controller and services. This class provides a safer, thin version of SessionGuard.
  */
 class AsyncExternalBaseSessionGuard extends ExternalBaseSessionGuard
 {
     /**
      * Validate a user's credentials.
-     *
-     * @param array $credentials
-     *
-     * @return bool
      */
-    public function validate(array $credentials = [])
+    public function validate(array $credentials = []): bool
     {
         return false;
     }
@@ -27,12 +22,9 @@ public function validate(array $credentials = [])
     /**
      * Attempt to authenticate a user using the given credentials.
      *
-     * @param array $credentials
      * @param bool  $remember
-     *
-     * @return bool
      */
-    public function attempt(array $credentials = [], $remember = false)
+    public function attempt(array $credentials = [], $remember = false): bool
     {
         return false;
     }
diff --git a/app/Access/Guards/LdapSessionGuard.php b/app/Access/Guards/LdapSessionGuard.php
index bd020f70b95..9455d530dfe 100644
--- a/app/Access/Guards/LdapSessionGuard.php
+++ b/app/Access/Guards/LdapSessionGuard.php
@@ -35,13 +35,9 @@ public function __construct(
     /**
      * Validate a user's credentials.
      *
-     * @param array $credentials
-     *
      * @throws LdapException
-     *
-     * @return bool
      */
-    public function validate(array $credentials = [])
+    public function validate(array $credentials = []): bool
     {
         $userDetails = $this->ldapService->getUserDetails($credentials['username']);
 
diff --git a/app/Access/LoginService.php b/app/Access/LoginService.php
index 6607969afae..76ae1938da0 100644
--- a/app/Access/LoginService.php
+++ b/app/Access/LoginService.php
@@ -95,7 +95,7 @@ protected function getLastLoginAttemptDetails(): array
     {
         $value = session()->get(self::LAST_LOGIN_ATTEMPTED_SESSION_KEY);
         if (!$value) {
-            return ['user_id' => null, 'method' => null];
+            return ['user_id' => null, 'method' => null, 'remember' => false];
         }
 
         [$id, $method, $remember, $time] = explode(':', $value);
@@ -103,18 +103,18 @@ protected function getLastLoginAttemptDetails(): array
         if ($time < $hourAgo) {
             $this->clearLastLoginAttempted();
 
-            return ['user_id' => null, 'method' => null];
+            return ['user_id' => null, 'method' => null, 'remember' => false];
         }
 
         return ['user_id' => $id, 'method' => $method, 'remember' => boolval($remember)];
     }
 
     /**
-     * Set the last login attempted user.
+     * Set the last login-attempted user.
      * Must be only used when credentials are correct and a login could be
-     * achieved but a secondary factor has stopped the login.
+     * achieved, but a secondary factor has stopped the login.
      */
-    protected function setLastLoginAttemptedForUser(User $user, string $method, bool $remember)
+    protected function setLastLoginAttemptedForUser(User $user, string $method, bool $remember): void
     {
         session()->put(
             self::LAST_LOGIN_ATTEMPTED_SESSION_KEY,
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 5ff22252c14..2492f81318a 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -6,6 +6,9 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * @implements ProvidesEntityQueries<Book>
+ */
 class BookQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 874bc7f2f58..842011a8781 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -6,6 +6,9 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * @implements ProvidesEntityQueries<Bookshelf>
+ */
 class BookshelfQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index 53c5bc9d842..9bf0ff65bfd 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -6,6 +6,9 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * @implements ProvidesEntityQueries<Chapter>
+ */
 class ChapterQueries implements ProvidesEntityQueries
 {
     protected static array $listAttributes = [
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index f821ee86a58..ee7b201bc1a 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -6,6 +6,9 @@
 use BookStack\Exceptions\NotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
+/**
+ * @implements ProvidesEntityQueries<Page>
+ */
 class PageQueries implements ProvidesEntityQueries
 {
     protected static array $contentAttributes = [
@@ -18,6 +21,9 @@ class PageQueries implements ProvidesEntityQueries
         'template', 'text', 'created_at', 'updated_at', 'priority', 'owned_by',
     ];
 
+    /**
+     * @return Builder<Page>
+     */
     public function start(): Builder
     {
         return Page::query();
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index 1f8a71ae230..79fc64b3ab8 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -7,17 +7,20 @@
 
 /**
  * Interface for our classes which provide common queries for our
- * entity objects. Ideally all queries for entities should run through
+ * entity objects. Ideally, all queries for entities should run through
  * these classes.
  * Any added methods should return a builder instances to allow extension
  * via building on the query, unless the method starts with 'find'
  * in which case an entity object should be returned.
  * (nullable unless it's a *OrFail method).
+ *
+ * @template TModel of Entity
  */
 interface ProvidesEntityQueries
 {
     /**
      * Start a new query for this entity type.
+     * @return Builder<TModel>
      */
     public function start(): Builder;
 
@@ -29,7 +32,7 @@ public function findVisibleById(int $id): ?Entity;
     /**
      * Start a query for items that are visible, with selection
      * configured for list display of this item.
-     * @return Builder<Entity>
+     * @return Builder<TModel>
      */
     public function visibleForList(): Builder;
 }
diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index 329a7633f7a..af7ed4fc6a1 100644
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -13,8 +13,8 @@ class PageIncludeParser
     protected static string $includeTagRegex = "/{{@\s?([0-9].*?)}}/";
 
     /**
-     * Elements to clean up and remove if left empty after a parsing operation.
-     * @var DOMElement[]
+     * Nodes to clean up and remove if left empty after a parsing operation.
+     * @var DOMNode[]
      */
     protected array $toCleanup = [];
 
@@ -206,7 +206,7 @@ protected function getParentParagraph(DOMNode $parent): ?DOMNode
     }
 
     /**
-     * Cleanup after a parse operation.
+     * Clean up after a parse operation.
      * Removes stranded elements we may have left during the parse.
      */
     protected function cleanup(): void
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index b8c3fa192a6..08d326ad81c 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Exceptions;
 
-use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -12,6 +11,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\ErrorHandler\Error\FatalError;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Throwable;
 
@@ -20,7 +20,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
-     * @var array<int, class-string<\Throwable>>
+     * @var array<int, class-string<Throwable>>
      */
     protected $dontReport = [
         NotFoundException::class,
@@ -50,11 +50,11 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param \Throwable $exception
-     *
-     * @throws \Throwable
+     * @param Throwable $exception
      *
      * @return void
+     *@throws Throwable
+     *
      */
     public function report(Throwable $exception)
     {
@@ -64,12 +64,9 @@ public function report(Throwable $exception)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param Exception                $e
-     *
-     * @return \Illuminate\Http\Response
+     * @param Request $request
      */
-    public function render($request, Throwable $e)
+    public function render($request, Throwable $e): SymfonyResponse
     {
         if ($e instanceof FatalError && str_contains($e->getMessage(), 'bytes exhausted (tried to allocate') && $this->onOutOfMemory) {
             $response = call_user_func($this->onOutOfMemory);
@@ -152,12 +149,9 @@ protected function renderApiException(Throwable $e): JsonResponse
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param \Illuminate\Http\Request                 $request
-     * @param \Illuminate\Auth\AuthenticationException $exception
-     *
-     * @return \Illuminate\Http\Response
+     * @param Request $request
      */
-    protected function unauthenticated($request, AuthenticationException $exception)
+    protected function unauthenticated($request, AuthenticationException $exception): SymfonyResponse
     {
         if ($request->expectsJson()) {
             return response()->json(['error' => 'Unauthenticated.'], 401);
@@ -169,12 +163,9 @@ protected function unauthenticated($request, AuthenticationException $exception)
     /**
      * Convert a validation exception into a JSON response.
      *
-     * @param \Illuminate\Http\Request                   $request
-     * @param \Illuminate\Validation\ValidationException $exception
-     *
-     * @return \Illuminate\Http\JsonResponse
+     * @param Request $request
      */
-    protected function invalidJson($request, ValidationException $exception)
+    protected function invalidJson($request, ValidationException $exception): JsonResponse
     {
         return response()->json($exception->errors(), $exception->status);
     }
diff --git a/app/Permissions/EntityPermissionEvaluator.php b/app/Permissions/EntityPermissionEvaluator.php
index 98ec0330649..30c97b700c6 100644
--- a/app/Permissions/EntityPermissionEvaluator.php
+++ b/app/Permissions/EntityPermissionEvaluator.php
@@ -30,7 +30,7 @@ public function evaluateEntityForUser(Entity $entity, array $userRoleIds): ?bool
     }
 
     /**
-     * @param array<string, array<string, int>> $permitsByType
+     * @param array<string, array<int, string>> $permitsByType
      */
     protected function evaluatePermitsByType(array $permitsByType): ?int
     {
@@ -50,7 +50,7 @@ protected function evaluatePermitsByType(array $permitsByType): ?int
     /**
      * @param string[] $typeIdChain
      * @param array<string, EntityPermission[]> $permissionMapByTypeId
-     * @return array<string, array<string, int>>
+     * @return array<string, array<int, string>>
      */
     protected function collapseAndCategorisePermissions(array $typeIdChain, array $permissionMapByTypeId): array
     {

From 7d1c31620213599fdc07ce5cda776d91f5642afc Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 3 Sep 2025 15:42:50 +0100
Subject: [PATCH 657/666] Maintenance: Updated larastan target level, fixed
 issues from tests

---
 app/Access/Guards/ExternalBaseSessionGuard.php       | 2 +-
 app/Console/Commands/UpdateUrlCommand.php            | 2 +-
 app/Entities/Controllers/RecycleBinApiController.php | 7 ++++---
 phpstan.neon.dist                                    | 2 +-
 tests/Entity/CommentStoreTest.php                    | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Access/Guards/ExternalBaseSessionGuard.php b/app/Access/Guards/ExternalBaseSessionGuard.php
index 899e93c3670..91239599ba9 100644
--- a/app/Access/Guards/ExternalBaseSessionGuard.php
+++ b/app/Access/Guards/ExternalBaseSessionGuard.php
@@ -30,7 +30,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * The user we last attempted to retrieve.
      */
-    protected Authenticatable $lastAttempted;
+    protected Authenticatable|null $lastAttempted;
 
     /**
      * The session used by the guard.
diff --git a/app/Console/Commands/UpdateUrlCommand.php b/app/Console/Commands/UpdateUrlCommand.php
index e155878d331..71f0b92fe41 100644
--- a/app/Console/Commands/UpdateUrlCommand.php
+++ b/app/Console/Commands/UpdateUrlCommand.php
@@ -52,7 +52,7 @@ public function handle(Connection $db): int
             'page_revisions' => ['html', 'text', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],
-            'comments'    => ['html', 'text'],
+            'comments'    => ['html'],
         ];
 
         foreach ($columnsToUpdateByTable as $table => $columns) {
diff --git a/app/Entities/Controllers/RecycleBinApiController.php b/app/Entities/Controllers/RecycleBinApiController.php
index fdc24ddf8e2..89bd3f41ad5 100644
--- a/app/Entities/Controllers/RecycleBinApiController.php
+++ b/app/Entities/Controllers/RecycleBinApiController.php
@@ -9,6 +9,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Http\ApiController;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecycleBinApiController extends ApiController
@@ -69,7 +70,7 @@ public function destroy(DeletionRepo $deletionRepo, string $deletionId)
     /**
      * Load some related details for the deletion listing.
      */
-    protected function listFormatter(Deletion $deletion)
+    protected function listFormatter(Deletion $deletion): void
     {
         $deletable = $deletion->deletable;
 
@@ -89,9 +90,9 @@ protected function listFormatter(Deletion $deletion)
     }
 
     /**
-     * @param HasMany<Chapter|Page, Book|Chapter> $query
+     * @param Builder<Chapter|Page> $query
      */
-    protected static function withTrashedQuery(HasMany $query): void
+    protected static function withTrashedQuery(Builder $query): void
     {
         $query->withTrashed();
     }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 9dfd9d29e7c..72189222fcf 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,7 +7,7 @@ parameters:
         - app
 
     # The level 8 is the highest level
-    level: 2
+    level: 3
 
     phpVersion:
         min: 80200
diff --git a/tests/Entity/CommentStoreTest.php b/tests/Entity/CommentStoreTest.php
index c5fe4ce5064..de093a3a6e9 100644
--- a/tests/Entity/CommentStoreTest.php
+++ b/tests/Entity/CommentStoreTest.php
@@ -27,7 +27,6 @@ public function test_add_comment()
             'local_id'    => 1,
             'entity_id'   => $page->id,
             'entity_type' => Page::newModelInstance()->getMorphClass(),
-            'text'        => null,
             'parent_id'   => 2,
         ]);
 

From 579c1bf4241270f96f527101f89a2c90c9b9cb6b Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 4 Sep 2025 15:06:58 +0100
Subject: [PATCH 658/666] Timezones: Seperated out store & display timezones to
 two options

---
 .env.example.complete                         |  8 +++-
 .../Providers/ViewTweaksServiceProvider.php   | 13 +++++++
 app/Config/app.php                            |  8 ++--
 app/Util/DateFormatter.php                    | 25 +++++++++++++
 resources/views/entities/meta.blade.php       |  8 ++--
 tests/Util/DateFormatterTest.php              | 37 +++++++++++++++++++
 6 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 app/Util/DateFormatter.php
 create mode 100644 tests/Util/DateFormatterTest.php

diff --git a/.env.example.complete b/.env.example.complete
index 25687aaac38..18e7bd00d9c 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -36,10 +36,14 @@ APP_LANG=en
 # APP_LANG will be used if such a header is not provided.
 APP_AUTO_LANG_PUBLIC=true
 
-# Application timezone
-# Used where dates are displayed such as on exported content.
+# Application timezones
+# The first option is used to determine what timezone is used for date storage.
+# Leaving that as "UTC" is advised.
+# The second option is used to set the timezone which will be used for date
+# formatting and display. This defaults to the "APP_TIMEZONE" value.
 # Valid timezone values can be found here: https://www.php.net/manual/en/timezones.php
 APP_TIMEZONE=UTC
+APP_DISPLAY_TIMEZONE=UTC
 
 # Application theme
 # Used to specific a themes/<APP_THEME> folder where BookStack UI
diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 7115dcb5114..6771e513fa6 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -3,6 +3,7 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
+use BookStack\Util\DateFormatter;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -10,6 +11,15 @@
 
 class ViewTweaksServiceProvider extends ServiceProvider
 {
+    public function register()
+    {
+        $this->app->singleton(DateFormatter::class, function ($app) {
+            return new DateFormatter(
+                $app['config']->get('app.display_timezone'),
+            );
+        });
+    }
+
     /**
      * Bootstrap services.
      */
@@ -21,6 +31,9 @@ public function boot(): void
         // View Composers
         View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
 
+        // View Globals
+        View::share('dates', $this->app->make(DateFormatter::class));
+
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
             return "<?php echo (new \BookStack\Util\SvgIcon($expression))->toHtml(); ?>";
diff --git a/app/Config/app.php b/app/Config/app.php
index b96d0bdb788..40e542d3e16 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -70,8 +70,8 @@
     // A list of the sources/hostnames that can be reached by application SSR calls.
     // This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
     // Host-specific functionality (usually controlled via other options) like auth
-    // or user avatars for example, won't use this list.
-    // Space seperated if multiple. Can use '*' as a wildcard.
+    // or user avatars, for example, won't use this list.
+    // Space separated if multiple. Can use '*' as a wildcard.
     // Values will be compared prefix-matched, case-insensitive, against called SSR urls.
     // Defaults to allow all hosts.
     'ssr_hosts' => env('ALLOWED_SSR_HOSTS', '*'),
@@ -80,8 +80,10 @@
     // Integer value between 0 (IP hidden) to 4 (Full IP usage)
     'ip_address_precision' => env('IP_ADDRESS_PRECISION', 4),
 
-    // Application timezone for back-end date functions.
+    // Application timezone for stored date/time values.
     'timezone' => env('APP_TIMEZONE', 'UTC'),
+    // Application timezone for displayed date/time values in the UI.
+    'display_timezone' => env('APP_DISPLAY_TIMEZONE', env('APP_TIMEZONE', 'UTC')),
 
     // Default locale to use
     // A default variant is also stored since Laravel can overwrite
diff --git a/app/Util/DateFormatter.php b/app/Util/DateFormatter.php
new file mode 100644
index 00000000000..489ed54e2ca
--- /dev/null
+++ b/app/Util/DateFormatter.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\Util;
+
+use Carbon\Carbon;
+
+class DateFormatter
+{
+    public function __construct(
+        protected string $displayTimezone,
+    ) {
+    }
+
+    public function isoWithTimezone(Carbon $date): string
+    {
+        $withDisplayTimezone = $date->clone()->setTimezone($this->displayTimezone);
+
+        return $withDisplayTimezone->format('Y-m-d H:i:s T');
+    }
+
+    public function relative(Carbon $date): string
+    {
+        return $date->diffForHumans();
+    }
+}
diff --git a/resources/views/entities/meta.blade.php b/resources/views/entities/meta.blade.php
index 9d3c4b956a7..c9d301aa354 100644
--- a/resources/views/entities/meta.blade.php
+++ b/resources/views/entities/meta.blade.php
@@ -31,7 +31,7 @@
             @icon('star')
             <div>
                 {!! trans('entities.meta_created_name', [
-                    'timeLength' => '<span title="'.$entity->created_at->toDayDateTimeString().'">'.$entity->created_at->diffForHumans() . '</span>',
+                    'timeLength' => '<span title="'. $dates->isoWithTimezone($entity->created_at) .'">'. $dates->relative($entity->created_at) . '</span>',
                     'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".e($entity->createdBy->name). "</a>"
                 ]) !!}
             </div>
@@ -39,7 +39,7 @@
     @else
         <div class="entity-meta-item">
             @icon('star')
-            <span title="{{$entity->created_at->toDayDateTimeString()}}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span>
+            <span title="{{ $dates->isoWithTimezone($entity->created_at) }}">{{ trans('entities.meta_created', ['timeLength' => $dates->relative($entity->created_at)]) }}</span>
         </div>
     @endif
 
@@ -48,7 +48,7 @@
             @icon('edit')
             <div>
                 {!! trans('entities.meta_updated_name', [
-                    'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
+                    'timeLength' => '<span title="' . $dates->isoWithTimezone($entity->updated_at) .'">' . $dates->relative($entity->updated_at) .'</span>',
                     'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".e($entity->updatedBy->name). "</a>"
                 ]) !!}
             </div>
@@ -56,7 +56,7 @@
     @elseif (!$entity->isA('revision'))
         <div class="entity-meta-item">
             @icon('edit')
-            <span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>
+            <span title="{{ $dates->isoWithTimezone($entity->updated_at) }}">{{ trans('entities.meta_updated', ['timeLength' => $dates->relative($entity->updated_at)]) }}</span>
         </div>
     @endif
 
diff --git a/tests/Util/DateFormatterTest.php b/tests/Util/DateFormatterTest.php
new file mode 100644
index 00000000000..c9004b5a570
--- /dev/null
+++ b/tests/Util/DateFormatterTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Util;
+
+use BookStack\Util\DateFormatter;
+use Carbon\Carbon;
+use Tests\TestCase;
+
+class DateFormatterTest extends TestCase
+{
+    public function test_iso_with_timezone_alters_from_stored_to_display_timezone()
+    {
+        $formatter = new DateFormatter('Europe/London');
+        $dateTime = new Carbon('2020-06-01 12:00:00', 'UTC');
+
+        $result = $formatter->isoWithTimezone($dateTime);
+        $this->assertEquals('2020-06-01 13:00:00 BST', $result);
+    }
+
+    public function test_iso_with_timezone_works_from_non_utc_dates()
+    {
+        $formatter = new DateFormatter('Asia/Shanghai');
+        $dateTime = new Carbon('2025-06-10 15:25:00', 'America/New_York');
+
+        $result = $formatter->isoWithTimezone($dateTime);
+        $this->assertEquals('2025-06-11 03:25:00 CST', $result);
+    }
+
+    public function test_relative()
+    {
+        $formatter = new DateFormatter('Europe/London');
+        $dateTime = (new Carbon('now', 'UTC'))->subMinutes(50);
+
+        $result = $formatter->relative($dateTime);
+        $this->assertEquals('50 minutes ago', $result);
+    }
+}

From 36cb243d5e47afbdf6c7c847bed5c34454abfa48 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 4 Sep 2025 16:11:35 +0100
Subject: [PATCH 659/666] Timezones: Updated date displays to use consistent
 formats

---
 app/Entities/Tools/PageEditActivity.php       | 19 ++---
 app/Util/DateFormatter.php                    |  7 +-
 phpunit.xml                                   |  2 +
 resources/views/comments/comment.blade.php    | 84 +++++++++++--------
 .../views/common/activity-item.blade.php      |  2 +-
 resources/views/entities/grid-item.blade.php  |  4 +-
 resources/views/entities/list-item.blade.php  |  4 +-
 resources/views/entities/meta.blade.php       |  8 +-
 resources/views/exports/import-show.blade.php |  2 +-
 .../views/exports/parts/import.blade.php      |  2 +-
 resources/views/exports/parts/meta.blade.php  |  4 +-
 .../pages/parts/image-manager-form.blade.php  |  8 +-
 .../pages/parts/revisions-index-row.blade.php |  4 +-
 .../parts/template-manager-list.blade.php     |  2 +-
 .../views/settings/webhooks/edit.blade.php    | 12 ++-
 .../views/users/api-tokens/edit.blade.php     |  8 +-
 .../users/parts/users-list-item.blade.php     |  2 +-
 resources/views/users/profile.blade.php       |  2 +-
 tests/Exports/HtmlExportTest.php              |  4 +-
 tests/Util/DateFormatterTest.php              |  4 +-
 20 files changed, 100 insertions(+), 84 deletions(-)

diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php
index 646b200f1da..22f89bf62be 100644
--- a/app/Entities/Tools/PageEditActivity.php
+++ b/app/Entities/Tools/PageEditActivity.php
@@ -4,19 +4,15 @@
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
+use BookStack\Util\DateFormatter;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 
 class PageEditActivity
 {
-    protected Page $page;
-
-    /**
-     * PageEditActivity constructor.
-     */
-    public function __construct(Page $page)
-    {
-        $this->page = $page;
+    public function __construct(
+        protected Page $page
+    ) {
     }
 
     /**
@@ -50,11 +46,9 @@ public function activeEditingMessage(): string
     /**
      * Get any editor clash warning messages to show for the given draft revision.
      *
-     * @param PageRevision|Page $draft
-     *
      * @return string[]
      */
-    public function getWarningMessagesForDraft($draft): array
+    public function getWarningMessagesForDraft(Page|PageRevision $draft): array
     {
         $warnings = [];
 
@@ -82,7 +76,8 @@ protected function hasPageBeenUpdatedSinceDraftCreated(PageRevision $draft): boo
      */
     public function getEditingActiveDraftMessage(PageRevision $draft): string
     {
-        $message = trans('entities.pages_editing_draft_notification', ['timeDiff' => $draft->updated_at->diffForHumans()]);
+        $formatter = resolve(DateFormatter::class);
+        $message = trans('entities.pages_editing_draft_notification', ['timeDiff' => $formatter->relative($draft->updated_at)]);
         if ($draft->page->updated_at->timestamp <= $draft->updated_at->timestamp) {
             return $message;
         }
diff --git a/app/Util/DateFormatter.php b/app/Util/DateFormatter.php
index 489ed54e2ca..c6e60bd5399 100644
--- a/app/Util/DateFormatter.php
+++ b/app/Util/DateFormatter.php
@@ -3,6 +3,7 @@
 namespace BookStack\Util;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterface;
 
 class DateFormatter
 {
@@ -11,15 +12,15 @@ public function __construct(
     ) {
     }
 
-    public function isoWithTimezone(Carbon $date): string
+    public function absolute(Carbon $date): string
     {
         $withDisplayTimezone = $date->clone()->setTimezone($this->displayTimezone);
 
         return $withDisplayTimezone->format('Y-m-d H:i:s T');
     }
 
-    public function relative(Carbon $date): string
+    public function relative(Carbon $date, bool $includeSuffix = true): string
     {
-        return $date->diffForHumans();
+        return $date->diffForHumans(null, $includeSuffix ? null : CarbonInterface::DIFF_ABSOLUTE);
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index a8e725d4106..8a7ab9cb7a3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,6 +16,8 @@
     <server name="APP_THEME" value="none"/>
     <server name="APP_AUTO_LANG_PUBLIC" value="true"/>
     <server name="APP_URL" value="http://bookstack.dev"/>
+    <server name="APP_TIMEZONE" value="UTC"/>
+    <server name="APP_DISPLAY_TIMEZONE" value="UTC"/>
     <server name="ALLOWED_IFRAME_HOSTS" value=""/>
     <server name="ALLOWED_IFRAME_SOURCES" value="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"/>
     <server name="ALLOWED_SSR_HOSTS" value="*"/>
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index d70a8c1d909..67aac720357 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -14,7 +14,8 @@ class="comment-box">
         <div class="flex-container-row wrap items-center gap-x-xs">
             @if ($comment->createdBy)
                 <div>
-                    <img width="50" src="{{ $comment->createdBy->getAvatar(50) }}" class="avatar block mr-xs" alt="{{ $comment->createdBy->name }}">
+                    <img width="50" src="{{ $comment->createdBy->getAvatar(50) }}" class="avatar block mr-xs"
+                         alt="{{ $comment->createdBy->name }}">
                 </div>
             @endif
             <div class="meta text-muted flex-container-row wrap items-center flex text-small">
@@ -23,50 +24,55 @@ class="comment-box">
                 @else
                     {{ trans('common.deleted_user') }}
                 @endif
-                <span title="{{ $comment->created_at }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $comment->created_at->diffForHumans() ]) }}</span>
+                <span title="{{ $dates->absolute($comment->created_at) }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $dates->relative($comment->created_at) ]) }}</span>
                 @if($comment->isUpdated())
                     <span class="mx-xs">&bull;</span>
-                    <span title="{{ trans('entities.comment_updated', ['updateDiff' => $comment->updated_at, 'username' => $comment->updatedBy->name ?? trans('common.deleted_user')]) }}">
+                    <span title="{{ trans('entities.comment_updated', ['updateDiff' => $dates->absolute($comment->updated_at), 'username' => $comment->updatedBy->name ?? trans('common.deleted_user')]) }}">
                  {{ trans('entities.comment_updated_indicator') }}
                     </span>
                 @endif
             </div>
             <div class="right-meta flex-container-row justify-flex-end items-center px-s">
                 @if(!$readOnly && (userCan('comment-create-all') || userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
-                <div class="actions mr-s">
-                    @if(userCan('comment-create-all'))
-                        <button refs="page-comment@reply-button" type="button" class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>
-                    @endif
-                    @if(!$comment->parent_id && (userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
-                        <button refs="page-comment@archive-button"
-                                type="button"
-                                data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"
-                                class="text-button text-muted hover-underline text-small p-xs">@icon('archive') {{ trans('common.' . ($comment->archived ? 'unarchive' : 'archive')) }}</button>
-                    @endif
-                    @if(userCan('comment-update', $comment))
-                        <button refs="page-comment@edit-button" type="button" class="text-button text-muted hover-underline text-small p-xs">@icon('edit') {{ trans('common.edit') }}</button>
-                    @endif
-                    @if(userCan('comment-delete', $comment))
-                        <div component="dropdown" class="dropdown-container">
-                            <button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" class="text-button text-muted hover-underline text-small p-xs">@icon('delete') {{ trans('common.delete') }}</button>
-                            <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
-                                <li class="px-m text-small text-muted pb-s">{{trans('entities.comment_delete_confirm')}}</li>
-                                <li>
-                                    <button refs="page-comment@delete-button" type="button" class="text-button text-neg icon-item">
-                                        @icon('delete')
-                                        <div>{{ trans('common.delete') }}</div>
-                                    </button>
-                                </li>
-                            </ul>
-                        </div>
-                    @endif
-                    <span class="text-muted">
+                    <div class="actions mr-s">
+                        @if(userCan('comment-create-all'))
+                            <button refs="page-comment@reply-button" type="button"
+                                    class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>
+                        @endif
+                        @if(!$comment->parent_id && (userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
+                            <button refs="page-comment@archive-button"
+                                    type="button"
+                                    data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"
+                                    class="text-button text-muted hover-underline text-small p-xs">@icon('archive') {{ trans('common.' . ($comment->archived ? 'unarchive' : 'archive')) }}</button>
+                        @endif
+                        @if(userCan('comment-update', $comment))
+                            <button refs="page-comment@edit-button" type="button"
+                                    class="text-button text-muted hover-underline text-small p-xs">@icon('edit') {{ trans('common.edit') }}</button>
+                        @endif
+                        @if(userCan('comment-delete', $comment))
+                            <div component="dropdown" class="dropdown-container">
+                                <button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false"
+                                        class="text-button text-muted hover-underline text-small p-xs">@icon('delete') {{ trans('common.delete') }}</button>
+                                <ul refs="dropdown@menu" class="dropdown-menu" role="menu">
+                                    <li class="px-m text-small text-muted pb-s">{{trans('entities.comment_delete_confirm')}}</li>
+                                    <li>
+                                        <button refs="page-comment@delete-button" type="button"
+                                                class="text-button text-neg icon-item">
+                                            @icon('delete')
+                                            <div>{{ trans('common.delete') }}</div>
+                                        </button>
+                                    </li>
+                                </ul>
+                            </div>
+                        @endif
+                        <span class="text-muted">
                         &nbsp;&bull;&nbsp;
                     </span>
-                </div>
+                    </div>
                 @endif
                 <div>
-                    <a class="bold text-muted text-small" href="#comment{{$comment->local_id}}">#{{$comment->local_id}}</a>
+                    <a class="bold text-muted text-small"
+                       href="#comment{{$comment->local_id}}">#{{$comment->local_id}}</a>
                 </div>
             </div>
         </div>
@@ -76,7 +82,8 @@ class="text-button text-muted hover-underline text-small p-xs">@icon('archive')
     <div refs="page-comment@content-container" class="content">
         @if ($comment->parent_id)
             <p class="comment-reply">
-                <a class="text-muted text-small" href="#comment{{ $comment->parent_id }}">@icon('reply'){{ trans('entities.comment_in_reply_to', ['commentId' => '#' . $comment->parent_id]) }}</a>
+                <a class="text-muted text-small"
+                   href="#comment{{ $comment->parent_id }}">@icon('reply'){{ trans('entities.comment_in_reply_to', ['commentId' => '#' . $comment->parent_id]) }}</a>
             </p>
         @endif
         @if($comment->content_ref)
@@ -86,7 +93,8 @@ class="text-button text-muted hover-underline text-small p-xs">@icon('archive')
                    option:page-comment-reference:view-comment-text="{{ trans('entities.comment_view') }}"
                    option:page-comment-reference:jump-to-thread-text="{{ trans('entities.comment_jump_to_thread') }}"
                    option:page-comment-reference:close-text="{{ trans('common.close') }}"
-                   href="#">@icon('bookmark'){{ trans('entities.comment_reference') }} <span>{{ trans('entities.comment_reference_outdated') }}</span></a>
+                   href="#">@icon('bookmark'){{ trans('entities.comment_reference') }}
+                    <span>{{ trans('entities.comment_reference_outdated') }}</span></a>
             </div>
         @endif
         {!! $commentHtml  !!}
@@ -95,10 +103,12 @@ class="text-button text-muted hover-underline text-small p-xs">@icon('archive')
     @if(!$readOnly && userCan('comment-update', $comment))
         <form novalidate refs="page-comment@form" hidden class="content pt-s px-s block">
             <div class="form-group description-input">
-                <textarea refs="page-comment@input" name="html" rows="3" placeholder="{{ trans('entities.comment_placeholder') }}">{{ $commentHtml }}</textarea>
+                <textarea refs="page-comment@input" name="html" rows="3"
+                          placeholder="{{ trans('entities.comment_placeholder') }}">{{ $commentHtml }}</textarea>
             </div>
             <div class="form-group text-right">
-                <button type="button" class="button outline" refs="page-comment@form-cancel">{{ trans('common.cancel') }}</button>
+                <button type="button" class="button outline"
+                        refs="page-comment@form-cancel">{{ trans('common.cancel') }}</button>
                 <button type="submit" class="button">{{ trans('entities.comment_save') }}</button>
             </div>
         </form>
diff --git a/resources/views/common/activity-item.blade.php b/resources/views/common/activity-item.blade.php
index 1c970084f6a..1d3c7bd755f 100644
--- a/resources/views/common/activity-item.blade.php
+++ b/resources/views/common/activity-item.blade.php
@@ -26,5 +26,5 @@
 
     <br>
 
-    <span class="text-muted"><small>@icon('time'){{ $activity->created_at->diffForHumans() }}</small></span>
+    <span class="text-muted" title="{{ $dates->absolute($activity->created_at) }}"><small>@icon('time'){{ $dates->relative($activity->created_at) }}</small></span>
 </div>
diff --git a/resources/views/entities/grid-item.blade.php b/resources/views/entities/grid-item.blade.php
index ee31b53f2e9..17c54e26353 100644
--- a/resources/views/entities/grid-item.blade.php
+++ b/resources/views/entities/grid-item.blade.php
@@ -10,7 +10,7 @@
         <p class="text-muted">{{ $entity->getExcerpt(130) }}</p>
     </div>
     <div class="grid-card-footer text-muted ">
-        <p>@icon('star')<span title="{{ $entity->created_at->toDayDateTimeString() }}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span></p>
-        <p>@icon('edit')<span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span></p>
+        <p>@icon('star')<span title="{{ $dates->absolute($entity->created_at) }}">{{ trans('entities.meta_created', ['timeLength' => $dates->relative($entity->created_at)]) }}</span></p>
+        <p>@icon('edit')<span title="{{ $dates->absolute($entity->updated_at) }}">{{ trans('entities.meta_updated', ['timeLength' => $dates->relative($entity->updated_at)]) }}</span></p>
     </div>
 </a>
\ No newline at end of file
diff --git a/resources/views/entities/list-item.blade.php b/resources/views/entities/list-item.blade.php
index 2fadef19193..5174de43197 100644
--- a/resources/views/entities/list-item.blade.php
+++ b/resources/views/entities/list-item.blade.php
@@ -27,9 +27,9 @@
 @endif
 
 @if(($showUpdatedBy ?? false) && $entity->relationLoaded('updatedBy') && $entity->updatedBy)
-    <small title="{{ $entity->updated_at->toDayDateTimeString() }}">
+    <small title="{{ $dates->absolute($entity->updated_at) }}">
         {!! trans('entities.meta_updated_name', [
-            'timeLength' => $entity->updated_at->diffForHumans(),
+            'timeLength' => $dates->relative($entity->updated_at),
             'user' => e($entity->updatedBy->name)
         ]) !!}
     </small>
diff --git a/resources/views/entities/meta.blade.php b/resources/views/entities/meta.blade.php
index c9d301aa354..060c197a466 100644
--- a/resources/views/entities/meta.blade.php
+++ b/resources/views/entities/meta.blade.php
@@ -31,7 +31,7 @@
             @icon('star')
             <div>
                 {!! trans('entities.meta_created_name', [
-                    'timeLength' => '<span title="'. $dates->isoWithTimezone($entity->created_at) .'">'. $dates->relative($entity->created_at) . '</span>',
+                    'timeLength' => '<span title="'. $dates->absolute($entity->created_at) .'">'. $dates->relative($entity->created_at) . '</span>',
                     'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".e($entity->createdBy->name). "</a>"
                 ]) !!}
             </div>
@@ -39,7 +39,7 @@
     @else
         <div class="entity-meta-item">
             @icon('star')
-            <span title="{{ $dates->isoWithTimezone($entity->created_at) }}">{{ trans('entities.meta_created', ['timeLength' => $dates->relative($entity->created_at)]) }}</span>
+            <span title="{{ $dates->absolute($entity->created_at) }}">{{ trans('entities.meta_created', ['timeLength' => $dates->relative($entity->created_at)]) }}</span>
         </div>
     @endif
 
@@ -48,7 +48,7 @@
             @icon('edit')
             <div>
                 {!! trans('entities.meta_updated_name', [
-                    'timeLength' => '<span title="' . $dates->isoWithTimezone($entity->updated_at) .'">' . $dates->relative($entity->updated_at) .'</span>',
+                    'timeLength' => '<span title="' . $dates->absolute($entity->updated_at) .'">' . $dates->relative($entity->updated_at) .'</span>',
                     'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".e($entity->updatedBy->name). "</a>"
                 ]) !!}
             </div>
@@ -56,7 +56,7 @@
     @elseif (!$entity->isA('revision'))
         <div class="entity-meta-item">
             @icon('edit')
-            <span title="{{ $dates->isoWithTimezone($entity->updated_at) }}">{{ trans('entities.meta_updated', ['timeLength' => $dates->relative($entity->updated_at)]) }}</span>
+            <span title="{{ $dates->absolute($entity->updated_at) }}">{{ trans('entities.meta_updated', ['timeLength' => $dates->relative($entity->updated_at)]) }}</span>
         </div>
     @endif
 
diff --git a/resources/views/exports/import-show.blade.php b/resources/views/exports/import-show.blade.php
index a28b79bb35c..1c46b7a0b87 100644
--- a/resources/views/exports/import-show.blade.php
+++ b/resources/views/exports/import-show.blade.php
@@ -26,7 +26,7 @@
                     </div>
                     <div class="text-right text-muted">
                         <div>{{ trans('entities.import_size', ['size' => $import->getSizeString()]) }}</div>
-                        <div><span title="{{ $import->created_at->toISOString() }}">{{ trans('entities.import_uploaded_at', ['relativeTime' => $import->created_at->diffForHumans()]) }}</span></div>
+                        <div><span title="{{ $dates->absolute($import->created_at) }}">{{ trans('entities.import_uploaded_at', ['relativeTime' => $dates->relative($import->created_at)]) }}</span></div>
                         @if($import->createdBy)
                             <div>
                                 {{ trans('entities.import_uploaded_by') }}
diff --git a/resources/views/exports/parts/import.blade.php b/resources/views/exports/parts/import.blade.php
index 2f7659c469e..dc287370e70 100644
--- a/resources/views/exports/parts/import.blade.php
+++ b/resources/views/exports/parts/import.blade.php
@@ -5,6 +5,6 @@ class="text-{{ $import->type }}">@icon($import->type) {{ $import->name }}</a>
     </div>
     <div class="px-m py-s flex-container-row gap-m items-center">
         <div class="bold opacity-80 text-muted">{{ $import->getSizeString() }}</div>
-        <div class="bold opacity-80 text-muted min-width-xs text-right" title="{{ $import->created_at->toISOString() }}">@icon('time'){{ $import->created_at->diffForHumans() }}</div>
+        <div class="bold opacity-80 text-muted min-width-xs text-right" title="{{ $dates->absolute($import->created_at) }}">@icon('time'){{ $dates->relative($import->created_at) }}</div>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/exports/parts/meta.blade.php b/resources/views/exports/parts/meta.blade.php
index d4128898bc8..00117f4a157 100644
--- a/resources/views/exports/parts/meta.blade.php
+++ b/resources/views/exports/parts/meta.blade.php
@@ -4,13 +4,13 @@
     @endif
 
     @icon('star'){!! trans('entities.meta_created' . ($entity->createdBy ? '_name' : ''), [
-        'timeLength' => $entity->created_at->isoFormat('D MMMM Y HH:mm:ss'),
+        'timeLength' => $dates->absolute($entity->created_at),
         'user' => e($entity->createdBy->name ?? ''),
         ]) !!}
     <br>
 
     @icon('edit'){!! trans('entities.meta_updated' . ($entity->updatedBy ? '_name' : ''), [
-            'timeLength' => $entity->updated_at->isoFormat('D MMMM Y HH:mm:ss'),
+            'timeLength' => $dates->absolute($entity->updated_at),
             'user' => e($entity->updatedBy->name ?? '')
         ]) !!}
 </div>
\ No newline at end of file
diff --git a/resources/views/pages/parts/image-manager-form.blade.php b/resources/views/pages/parts/image-manager-form.blade.php
index bd84e247d91..452a0aaa166 100644
--- a/resources/views/pages/parts/image-manager-form.blade.php
+++ b/resources/views/pages/parts/image-manager-form.blade.php
@@ -94,12 +94,12 @@ class="text-neg">{{ $page->name }}</a>
 
     <div class="text-muted text-small">
         <hr class="my-m">
-        <div title="{{ $image->created_at->format('Y-m-d H:i:s') }}">
-            @icon('star') {{ trans('components.image_uploaded', ['uploadedDate' => $image->created_at->diffForHumans()]) }}
+        <div title="{{ $dates->absolute($image->created_at) }}">
+            @icon('star') {{ trans('components.image_uploaded', ['uploadedDate' => $dates->relative($image->created_at)]) }}
         </div>
         @if($image->created_at->valueOf() !== $image->updated_at->valueOf())
-            <div title="{{ $image->updated_at->format('Y-m-d H:i:s') }}">
-                @icon('edit') {{ trans('components.image_updated', ['updateDate' => $image->updated_at->diffForHumans()]) }}
+            <div title="{{ $dates->absolute($image->updated_at) }}">
+                @icon('edit') {{ trans('components.image_updated', ['updateDate' => $dates->relative($image->updated_at)]) }}
             </div>
         @endif
         @if($image->createdBy)
diff --git a/resources/views/pages/parts/revisions-index-row.blade.php b/resources/views/pages/parts/revisions-index-row.blade.php
index 48bea5b577c..19b924763c3 100644
--- a/resources/views/pages/parts/revisions-index-row.blade.php
+++ b/resources/views/pages/parts/revisions-index-row.blade.php
@@ -17,8 +17,8 @@
                 @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif
                 <br>
                 <div class="text-muted">
-                    <small>{{ $revision->created_at->isoFormat('D MMMM Y HH:mm:ss') }}</small>
-                    <small>({{ $revision->created_at->diffForHumans() }})</small>
+                    <small>{{ $dates->absolute($revision->created_at) }}</small>
+                    <small>({{ $dates->relative($revision->created_at) }})</small>
                 </div>
             </div>
         </div>
diff --git a/resources/views/pages/parts/template-manager-list.blade.php b/resources/views/pages/parts/template-manager-list.blade.php
index f2f70c14221..990583a710a 100644
--- a/resources/views/pages/parts/template-manager-list.blade.php
+++ b/resources/views/pages/parts/template-manager-list.blade.php
@@ -6,7 +6,7 @@
          draggable="true" template-id="{{ $template->id }}">
         <div class="template-item-content" title="{{ trans('entities.templates_replace_content') }}">
             <div>{{ $template->name }}</div>
-            <div class="text-muted">{{ trans('entities.meta_updated', ['timeLength' => $template->updated_at->diffForHumans()]) }}</div>
+            <div class="text-muted" title="{{ $dates->absolute($template->updated_at) }}">{{ trans('entities.meta_updated', ['timeLength' => $dates->relative($template->updated_at)]) }}</div>
         </div>
         <div class="template-item-actions">
             <button type="button"
diff --git a/resources/views/settings/webhooks/edit.blade.php b/resources/views/settings/webhooks/edit.blade.php
index 680fc1207b0..22d0c0183c2 100644
--- a/resources/views/settings/webhooks/edit.blade.php
+++ b/resources/views/settings/webhooks/edit.blade.php
@@ -14,9 +14,17 @@
                 <div>
                     <label class="setting-list-label">{{ trans('settings.webhooks_status') }}</label>
                     <p class="mb-none">
-                        {{ trans('settings.webhooks_last_called') }} {{ $webhook->last_called_at ? $webhook->last_called_at->diffForHumans() : trans('common.never') }}
+                        @if($webhook->last_called_at)
+                            <span title="{{ $dates->absolute($webhook->last_called_at) }}">{{ trans('settings.webhooks_last_called') }} {{  $dates->relative($webhook->last_called_at) }}</span>
+                        @else
+                            <span>{{ trans('settings.webhooks_last_called') }} {{ trans('common.never') }}</span>
+                        @endif
                         <br>
-                        {{ trans('settings.webhooks_last_errored') }} {{ $webhook->last_errored_at ? $webhook->last_errored_at->diffForHumans() : trans('common.never') }}
+                        @if($webhook->last_errored_at)
+                            <span title="{{ $dates->absolute($webhook->last_errored_at) }}">{{ trans('settings.webhooks_last_errored') }} {{  $dates->relative($webhook->last_errored_at) }}</span>
+                        @else
+                            <span>{{ trans('settings.webhooks_last_errored') }} {{ trans('common.never') }}</span>
+                        @endif
                     </p>
                 </div>
                 <div class="text-muted">
diff --git a/resources/views/users/api-tokens/edit.blade.php b/resources/views/users/api-tokens/edit.blade.php
index aa3e49dedf8..3a1ff49d3c9 100644
--- a/resources/views/users/api-tokens/edit.blade.php
+++ b/resources/views/users/api-tokens/edit.blade.php
@@ -42,12 +42,12 @@
                 <div class="grid half gap-xl v-center">
 
                     <div class="text-muted text-small">
-                        <span title="{{ $token->created_at }}">
-                            {{ trans('settings.user_api_token_created', ['timeAgo' => $token->created_at->diffForHumans()]) }}
+                        <span title="{{ $dates->absolute($token->created_at) }}">
+                            {{ trans('settings.user_api_token_created', ['timeAgo' => $dates->relative($token->created_at)]) }}
                         </span>
                         <br>
-                        <span title="{{ $token->updated_at }}">
-                            {{ trans('settings.user_api_token_updated', ['timeAgo' => $token->created_at->diffForHumans()]) }}
+                        <span title="{{ $dates->absolute($token->updated_at) }}">
+                            {{ trans('settings.user_api_token_updated', ['timeAgo' => $dates->relative($token->created_at)]) }}
                         </span>
                     </div>
 
diff --git a/resources/views/users/parts/users-list-item.blade.php b/resources/views/users/parts/users-list-item.blade.php
index dc7c9f272b8..9c7ecd14761 100644
--- a/resources/views/users/parts/users-list-item.blade.php
+++ b/resources/views/users/parts/users-list-item.blade.php
@@ -20,7 +20,7 @@
             @if($user->last_activity_at)
                 <small>{{ trans('settings.users_latest_activity') }}</small>
                 <br>
-                <small title="{{ $user->last_activity_at->format('Y-m-d H:i:s') }}">{{ $user->last_activity_at->diffForHumans() }}</small>
+                <small title="{{ $dates->absolute($user->last_activity_at) }}">{{ $dates->relative($user->last_activity_at) }}</small>
             @endif
         </div>
     </div>
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index a8be8a4c198..9879091a5b9 100644
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -23,7 +23,7 @@
                             <div>
                                 <h4 class="mt-md">{{ $user->name }}</h4>
                                 <p class="text-muted">
-                                    {{ trans('entities.profile_user_for_x', ['time' => $user->created_at->diffForHumans(null, true)]) }}
+                                    {{ trans('entities.profile_user_for_x', ['time' => $dates->relative($user->created_at, false)]) }}
                                 </p>
                             </div>
                         </div>
diff --git a/tests/Exports/HtmlExportTest.php b/tests/Exports/HtmlExportTest.php
index 069cf280167..e039fb2cc2b 100644
--- a/tests/Exports/HtmlExportTest.php
+++ b/tests/Exports/HtmlExportTest.php
@@ -99,9 +99,9 @@ public function test_page_html_export_use_absolute_dates()
         $page = $this->entities->page();
 
         $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-        $resp->assertSee($page->created_at->isoFormat('D MMMM Y HH:mm:ss'));
+        $resp->assertSee($page->created_at->format('Y-m-d H:i:s T'));
         $resp->assertDontSee($page->created_at->diffForHumans());
-        $resp->assertSee($page->updated_at->isoFormat('D MMMM Y HH:mm:ss'));
+        $resp->assertSee($page->updated_at->format('Y-m-d H:i:s T'));
         $resp->assertDontSee($page->updated_at->diffForHumans());
     }
 
diff --git a/tests/Util/DateFormatterTest.php b/tests/Util/DateFormatterTest.php
index c9004b5a570..1c0a458e078 100644
--- a/tests/Util/DateFormatterTest.php
+++ b/tests/Util/DateFormatterTest.php
@@ -13,7 +13,7 @@ public function test_iso_with_timezone_alters_from_stored_to_display_timezone()
         $formatter = new DateFormatter('Europe/London');
         $dateTime = new Carbon('2020-06-01 12:00:00', 'UTC');
 
-        $result = $formatter->isoWithTimezone($dateTime);
+        $result = $formatter->absolute($dateTime);
         $this->assertEquals('2020-06-01 13:00:00 BST', $result);
     }
 
@@ -22,7 +22,7 @@ public function test_iso_with_timezone_works_from_non_utc_dates()
         $formatter = new DateFormatter('Asia/Shanghai');
         $dateTime = new Carbon('2025-06-10 15:25:00', 'America/New_York');
 
-        $result = $formatter->isoWithTimezone($dateTime);
+        $result = $formatter->absolute($dateTime);
         $this->assertEquals('2025-06-11 03:25:00 CST', $result);
     }
 

From c8716df284e74fad780ed8d36b23669d725b164a Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 8 Sep 2025 15:59:25 +0100
Subject: [PATCH 660/666] Permissions: Removed unused role-perm columns, added
 permission enum

Updated main permission check methods to support our new enum.
---
 app/App/helpers.php                           |   3 +-
 app/Entities/Tools/PermissionsUpdater.php     |  11 +-
 app/Permissions/Models/EntityPermission.php   |   2 -
 app/Permissions/Models/RolePermission.php     |   1 -
 app/Permissions/Permission.php                | 151 ++++++++++++++++++
 app/Permissions/PermissionApplicator.php      |  16 +-
 app/Users/Models/Role.php                     |   3 +-
 app/Users/Models/User.php                     |  21 ++-
 ...25_09_02_111542_remove_unused_columns.php} |   5 +
 tests/Helpers/PermissionsProvider.php         |   5 +-
 10 files changed, 190 insertions(+), 28 deletions(-)
 create mode 100644 app/Permissions/Permission.php
 rename database/migrations/{2025_09_02_111542_remove_comments_text_column.php => 2025_09_02_111542_remove_unused_columns.php} (76%)

diff --git a/app/App/helpers.php b/app/App/helpers.php
index 2305c2d72a1..0e26d9974a9 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -3,6 +3,7 @@
 use BookStack\App\AppVersion;
 use BookStack\App\Model;
 use BookStack\Facades\Theme;
+use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\User;
@@ -39,7 +40,7 @@ function user(): User
  * Check if the current user has a permission. If an ownable element
  * is passed in the jointPermissions are checked against that particular item.
  */
-function userCan(string $permission, ?Model $ownable = null): bool
+function userCan(string|Permission $permission, ?Model $ownable = null): bool
 {
     if (is_null($ownable)) {
         return user()->can($permission);
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index 9f3b8f95277..4ca53982a45 100644
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
 use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
@@ -93,8 +94,9 @@ protected function formatPermissionsFromRequestToEntityPermissions(array $permis
 
         foreach ($permissions as $roleId => $info) {
             $entityPermissionData = ['role_id' => $roleId];
-            foreach (EntityPermission::PERMISSIONS as $permission) {
-                $entityPermissionData[$permission] = (($info[$permission] ?? false) === "true");
+            foreach (Permission::genericForEntity() as $permission) {
+                $permName = $permission->value;
+                $entityPermissionData[$permName] = (($info[$permName] ?? false) === "true");
             }
             $formatted[] = $entityPermissionData;
         }
@@ -108,8 +110,9 @@ protected function formatPermissionsFromApiRequestToEntityPermissions(array $per
 
         foreach ($permissions as $requestPermissionData) {
             $entityPermissionData = ['role_id' => $requestPermissionData['role_id']];
-            foreach (EntityPermission::PERMISSIONS as $permission) {
-                $entityPermissionData[$permission] = boolval($requestPermissionData[$permission] ?? false);
+            foreach (Permission::genericForEntity() as $permission) {
+                $permName = $permission->value;
+                $entityPermissionData[$permName] = boolval($requestPermissionData[$permName] ?? false);
             }
             $formatted[] = $entityPermissionData;
         }
diff --git a/app/Permissions/Models/EntityPermission.php b/app/Permissions/Models/EntityPermission.php
index 1ef9c2886f5..efad2ba39a0 100644
--- a/app/Permissions/Models/EntityPermission.php
+++ b/app/Permissions/Models/EntityPermission.php
@@ -18,8 +18,6 @@
  */
 class EntityPermission extends Model
 {
-    public const PERMISSIONS = ['view', 'create', 'update', 'delete'];
-
     protected $fillable = ['role_id', 'view', 'create', 'update', 'delete'];
     public $timestamps = false;
     protected $hidden = ['entity_id', 'entity_type', 'id'];
diff --git a/app/Permissions/Models/RolePermission.php b/app/Permissions/Models/RolePermission.php
index d43313ea0d8..67b1c55f55d 100644
--- a/app/Permissions/Models/RolePermission.php
+++ b/app/Permissions/Models/RolePermission.php
@@ -9,7 +9,6 @@
 /**
  * @property int $id
  * @property string $name
- * @property string $display_name
  */
 class RolePermission extends Model
 {
diff --git a/app/Permissions/Permission.php b/app/Permissions/Permission.php
new file mode 100644
index 00000000000..539bbe8087d
--- /dev/null
+++ b/app/Permissions/Permission.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace BookStack\Permissions;
+
+/**
+ * Enum to represent the permissions which may be used in checks.
+ * These generally align with RolePermission names, although some are abstract or truncated as some checks
+ * are performed across a range of different items which may be subject to inheritance and other complications.
+ *
+ * We use and still allow the string values in usage to allow for compatibility with scenarios where
+ * users have customised their instance with additional permissions via the theme system.
+ * This enum primarily exists for alignment within the codebase.
+ */
+enum Permission: string
+{
+    // Generic Actions
+    // Used for more abstract entity permission checks
+    case View = 'view';
+    case Create = 'create';
+    case Update = 'update';
+    case Delete = 'delete';
+
+    // System Permissions
+    case AccessApi = 'access-api';
+    case ContentExport = 'content-export';
+    case ContentImport = 'content-import';
+    case EditorChange = 'editor-change';
+    case ReceiveNotifications = 'receive-notifications';
+    case RestrictionsManageAll = 'restrictions-manage-all';
+    case RestrictionsManageOwn = 'restrictions-manage-own';
+    case SettingsManage = 'settings-manage';
+    case TemplatesManage = 'templates-manage';
+    case UserRolesManage = 'user-roles-manage';
+    case UsersManage = 'users-manage';
+
+    // Entity permissions
+    // Each has 'all' or 'own' in it's RolePermission, with the base non-suffix name being used
+    // in actual checking logic, with the permission system handling the assessment of the underlying RolePermission.
+    case AttachmentCreate = 'attachment-create';
+    case AttachmentCreateAll = 'attachment-create-all';
+    case AttachmentCreateOwn = 'attachment-create-own';
+
+    case AttachmentDelete = 'attachment-delete';
+    case AttachmentDeleteAll = 'attachment-delete-all';
+    case AttachmentDeleteOwn = 'attachment-delete-own';
+
+    case AttachmentUpdate = 'attachment-update';
+    case AttachmentUpdateAll = 'attachment-update-all';
+    case AttachmentUpdateOwn = 'attachment-update-own';
+
+    case BookCreate = 'book-create';
+    case BookCreateAll = 'book-create-all';
+    case BookCreateOwn = 'book-create-own';
+
+    case BookDelete = 'book-delete';
+    case BookDeleteAll = 'book-delete-all';
+    case BookDeleteOwn = 'book-delete-own';
+
+    case BookUpdate = 'book-update';
+    case BookUpdateAll = 'book-update-all';
+    case BookUpdateOwn = 'book-update-own';
+
+    case BookView = 'book-view';
+    case BookViewAll = 'book-view-all';
+    case BookViewOwn = 'book-view-own';
+
+    case BookshelfCreate = 'bookshelf-create';
+    case BookshelfCreateAll = 'bookshelf-create-all';
+    case BookshelfCreateOwn = 'bookshelf-create-own';
+
+    case BookshelfDelete = 'bookshelf-delete';
+    case BookshelfDeleteAll = 'bookshelf-delete-all';
+    case BookshelfDeleteOwn = 'bookshelf-delete-own';
+
+    case BookshelfUpdate = 'bookshelf-update';
+    case BookshelfUpdateAll = 'bookshelf-update-all';
+    case BookshelfUpdateOwn = 'bookshelf-update-own';
+
+    case BookshelfView = 'bookshelf-view';
+    case BookshelfViewAll = 'bookshelf-view-all';
+    case BookshelfViewOwn = 'bookshelf-view-own';
+
+    case ChapterCreate = 'chapter-create';
+    case ChapterCreateAll = 'chapter-create-all';
+    case ChapterCreateOwn = 'chapter-create-own';
+
+    case ChapterDelete = 'chapter-delete';
+    case ChapterDeleteAll = 'chapter-delete-all';
+    case ChapterDeleteOwn = 'chapter-delete-own';
+
+    case ChapterUpdate = 'chapter-update';
+    case ChapterUpdateAll = 'chapter-update-all';
+    case ChapterUpdateOwn = 'chapter-update-own';
+
+    case ChapterView = 'chapter-view';
+    case ChapterViewAll = 'chapter-view-all';
+    case ChapterViewOwn = 'chapter-view-own';
+
+    case CommentCreate = 'comment-create';
+    case CommentCreateAll = 'comment-create-all';
+    case CommentCreateOwn = 'comment-create-own';
+
+    case CommentDelete = 'comment-delete';
+    case CommentDeleteAll = 'comment-delete-all';
+    case CommentDeleteOwn = 'comment-delete-own';
+
+    case CommentUpdate = 'comment-update';
+    case CommentUpdateAll = 'comment-update-all';
+    case CommentUpdateOwn = 'comment-update-own';
+
+    case ImageCreate = 'image-create';
+    case ImageCreateAll = 'image-create-all';
+    case ImageCreateOwn = 'image-create-own';
+
+    case ImageDelete = 'image-delete';
+    case ImageDeleteAll = 'image-delete-all';
+    case ImageDeleteOwn = 'image-delete-own';
+
+    case ImageUpdate = 'image-update';
+    case ImageUpdateAll = 'image-update-all';
+    case ImageUpdateOwn = 'image-update-own';
+
+    case PageCreate = 'page-create';
+    case PageCreateAll = 'page-create-all';
+    case PageCreateOwn = 'page-create-own';
+
+    case PageDelete = 'page-delete';
+    case PageDeleteAll = 'page-delete-all';
+    case PageDeleteOwn = 'page-delete-own';
+
+    case PageUpdate = 'page-update';
+    case PageUpdateAll = 'page-update-all';
+    case PageUpdateOwn = 'page-update-own';
+
+    case PageView = 'page-view';
+    case PageViewAll = 'page-view-all';
+    case PageViewOwn = 'page-view-own';
+
+    /**
+     * Get the generic permissions which may be queried for entities.
+     */
+    public static function genericForEntity(): array
+    {
+        return [
+            self::View,
+            self::Create,
+            self::Update,
+            self::Delete,
+        ];
+    }
+}
diff --git a/app/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php
index e59b8ab6759..47f30c8f949 100644
--- a/app/Permissions/PermissionApplicator.php
+++ b/app/Permissions/PermissionApplicator.php
@@ -24,11 +24,12 @@ public function __construct(
     /**
      * Checks if an entity has a restriction set upon it.
      */
-    public function checkOwnableUserAccess(Model&OwnableInterface $ownable, string $permission): bool
+    public function checkOwnableUserAccess(Model&OwnableInterface $ownable, string|Permission $permission): bool
     {
-        $explodedPermission = explode('-', $permission);
+        $permissionName = is_string($permission) ? $permission : $permission->value;
+        $explodedPermission = explode('-', $permissionName);
         $action = $explodedPermission[1] ?? $explodedPermission[0];
-        $fullPermission = count($explodedPermission) > 1 ? $permission : $ownable->getMorphClass() . '-' . $permission;
+        $fullPermission = count($explodedPermission) > 1 ? $permissionName : $ownable->getMorphClass() . '-' . $permissionName;
 
         $user = $this->currentUser();
         $userRoleIds = $this->getCurrentUserRoleIds();
@@ -235,8 +236,13 @@ protected function getCurrentUserRoleIds(): array
      */
     protected function ensureValidEntityAction(string $action): void
     {
-        if (!in_array($action, EntityPermission::PERMISSIONS)) {
-            throw new InvalidArgumentException('Action should be a simple entity permission action, not a role permission');
+        $allowed = Permission::genericForEntity();
+        foreach ($allowed as $permission) {
+            if ($permission->value === $action) {
+                return;
+            }
         }
+
+        throw new InvalidArgumentException('Action should be a simple entity permission action, not a role permission');
     }
 }
diff --git a/app/Users/Models/Role.php b/app/Users/Models/Role.php
index 912ae81c980..92be224580f 100644
--- a/app/Users/Models/Role.php
+++ b/app/Users/Models/Role.php
@@ -57,7 +57,8 @@ public function jointPermissions(): HasMany
      */
     public function permissions(): BelongsToMany
     {
-        return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id');
+        return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id')
+            ->select(['id', 'name']);
     }
 
     /**
diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index f83e120887b..0017653b53d 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -12,6 +12,7 @@
 use BookStack\App\Model;
 use BookStack\App\SluggableInterface;
 use BookStack\Entities\Tools\SlugGenerator;
+use BookStack\Permissions\Permission;
 use BookStack\Translation\LocaleDefinition;
 use BookStack\Translation\LocaleManager;
 use BookStack\Uploads\Image;
@@ -26,7 +27,6 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Collection;
 
@@ -156,8 +156,9 @@ public function attachDefaultRole(): void
     /**
      * Check if the user has a particular permission.
      */
-    public function can(string $permissionName): bool
+    public function can(string|Permission $permission): bool
     {
+        $permissionName = is_string($permission) ? $permission : $permission->value;
         return $this->permissions()->contains($permissionName);
     }
 
@@ -181,9 +182,9 @@ protected function permissions(): Collection
     }
 
     /**
-     * Clear any cached permissions on this instance.
+     * Clear any cached permissions in this instance.
      */
-    public function clearPermissionCache()
+    public function clearPermissionCache(): void
     {
         $this->permissions = null;
     }
@@ -191,7 +192,7 @@ public function clearPermissionCache()
     /**
      * Attach a role to this user.
      */
-    public function attachRole(Role $role)
+    public function attachRole(Role $role): void
     {
         $this->roles()->attach($role->id);
         $this->unsetRelation('roles');
@@ -207,15 +208,11 @@ public function socialAccounts(): HasMany
 
     /**
      * Check if the user has a social account,
-     * If a driver is passed it checks for that single account type.
-     *
-     * @param bool|string $socialDriver
-     *
-     * @return bool
+     * If a driver is passed, it checks for that single account type.
      */
-    public function hasSocialAccount($socialDriver = false)
+    public function hasSocialAccount(string $socialDriver = ''): bool
     {
-        if ($socialDriver === false) {
+        if (empty($socialDriver)) {
             return $this->socialAccounts()->count() > 0;
         }
 
diff --git a/database/migrations/2025_09_02_111542_remove_comments_text_column.php b/database/migrations/2025_09_02_111542_remove_unused_columns.php
similarity index 76%
rename from database/migrations/2025_09_02_111542_remove_comments_text_column.php
rename to database/migrations/2025_09_02_111542_remove_unused_columns.php
index 8caa05e5443..1ec2dfdf991 100644
--- a/database/migrations/2025_09_02_111542_remove_comments_text_column.php
+++ b/database/migrations/2025_09_02_111542_remove_unused_columns.php
@@ -14,6 +14,11 @@ public function up(): void
         Schema::table('comments', function (Blueprint $table) {
             $table->dropColumn('text');
         });
+
+        Schema::table('role_permissions', function (Blueprint $table) {
+            $table->dropColumn('display_name');
+            $table->dropColumn('description');
+        });
     }
 
     /**
diff --git a/tests/Helpers/PermissionsProvider.php b/tests/Helpers/PermissionsProvider.php
index cb036fe97c7..c9ae309196e 100644
--- a/tests/Helpers/PermissionsProvider.php
+++ b/tests/Helpers/PermissionsProvider.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Permissions\Models\EntityPermission;
 use BookStack\Permissions\Models\RolePermission;
+use BookStack\Permissions\Permission;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
@@ -139,8 +140,8 @@ protected function addEntityPermissionEntries(Entity $entity, array $entityPermi
     protected function actionListToEntityPermissionData(array $actionList, int $roleId = 0): array
     {
         $permissionData = ['role_id' => $roleId];
-        foreach (EntityPermission::PERMISSIONS as $possibleAction) {
-            $permissionData[$possibleAction] = in_array($possibleAction, $actionList);
+        foreach (Permission::genericForEntity() as $permission) {
+            $permissionData[$permission->value] = in_array($permission->value, $actionList);
         }
 
         return $permissionData;

From 5fc11d46d5115b96a2571fa371671c26900fab8f Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 8 Sep 2025 16:15:42 +0100
Subject: [PATCH 661/666] Permissions: Added enum usage to controller helpers

Also fixed various missing types or spelling/formatting points.
Added down action for role_permission table changes in migration.
---
 app/Http/Controller.php                       | 27 +++++++++----------
 app/Users/Controllers/RoleApiController.php   | 13 ++++-----
 ...025_09_02_111542_remove_unused_columns.php |  5 ++++
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 7f2134dd87a..5d3be4951ca 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -6,6 +6,7 @@
 use BookStack\App\Model;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\JsonResponse;
@@ -27,10 +28,9 @@ protected function isSignedIn(): bool
     }
 
     /**
-     * Stops the application and shows a permission error if
-     * the application is in demo mode.
+     * Stops the application and shows a permission error if the application is in demo mode.
      */
-    protected function preventAccessInDemoMode()
+    protected function preventAccessInDemoMode(): void
     {
         if (config('app.env') === 'demo') {
             $this->showPermissionError();
@@ -40,14 +40,13 @@ protected function preventAccessInDemoMode()
     /**
      * Adds the page title into the view.
      */
-    public function setPageTitle(string $title)
+    public function setPageTitle(string $title): void
     {
         view()->share('pageTitle', $title);
     }
 
     /**
-     * On a permission error redirect to home and display.
-     * the error as a notification.
+     * On a permission error redirect to home and display the error as a notification.
      *
      * @throws NotifyException
      */
@@ -61,7 +60,7 @@ protected function showPermissionError(string $redirectLocation = '/'): never
     /**
      * Checks that the current user has the given permission otherwise throw an exception.
      */
-    protected function checkPermission(string $permission): void
+    protected function checkPermission(string|Permission $permission): void
     {
         if (!user() || !user()->can($permission)) {
             $this->showPermissionError();
@@ -81,7 +80,7 @@ protected function preventGuestAccess(): void
     /**
      * Check the current user's permissions against an ownable item otherwise throw an exception.
      */
-    protected function checkOwnablePermission(string $permission, Model $ownable, string $redirectLocation = '/'): void
+    protected function checkOwnablePermission(string|Permission $permission, Model $ownable, string $redirectLocation = '/'): void
     {
         if (!userCan($permission, $ownable)) {
             $this->showPermissionError($redirectLocation);
@@ -92,7 +91,7 @@ protected function checkOwnablePermission(string $permission, Model $ownable, st
      * Check if a user has a permission or bypass the permission
      * check if the given callback resolves true.
      */
-    protected function checkPermissionOr(string $permission, callable $callback): void
+    protected function checkPermissionOr(string|Permission $permission, callable $callback): void
     {
         if ($callback() !== true) {
             $this->checkPermission($permission);
@@ -103,7 +102,7 @@ protected function checkPermissionOr(string $permission, callable $callback): vo
      * Check if the current user has a permission or bypass if the provided user
      * id matches the current user.
      */
-    protected function checkPermissionOrCurrentUser(string $permission, int $userId): void
+    protected function checkPermissionOrCurrentUser(string|Permission $permission, int $userId): void
     {
         $this->checkPermissionOr($permission, function () use ($userId) {
             return $userId === user()->id;
@@ -111,7 +110,7 @@ protected function checkPermissionOrCurrentUser(string $permission, int $userId)
     }
 
     /**
-     * Send back a json error message.
+     * Send back a JSON error message.
      */
     protected function jsonError(string $messageText = '', int $statusCode = 500): JsonResponse
     {
@@ -127,7 +126,7 @@ protected function download(): DownloadResponseFactory
     }
 
     /**
-     * Show a positive, successful notification to the user on next view load.
+     * Show a positive, successful notification to the user on the next view load.
      */
     protected function showSuccessNotification(string $message): void
     {
@@ -135,7 +134,7 @@ protected function showSuccessNotification(string $message): void
     }
 
     /**
-     * Show a warning notification to the user on next view load.
+     * Show a warning notification to the user on the next view load.
      */
     protected function showWarningNotification(string $message): void
     {
@@ -143,7 +142,7 @@ protected function showWarningNotification(string $message): void
     }
 
     /**
-     * Show an error notification to the user on next view load.
+     * Show an error notification to the user on the next view load.
      */
     protected function showErrorNotification(string $message): void
     {
diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 2f3638cd3e2..6d87c9e275e 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -10,8 +10,6 @@
 
 class RoleApiController extends ApiController
 {
-    protected PermissionsRepo $permissionsRepo;
-
     protected array $fieldsToExpose = [
         'display_name', 'description', 'mfa_enforced', 'external_auth_id', 'created_at', 'updated_at',
     ];
@@ -35,10 +33,9 @@ class RoleApiController extends ApiController
         ]
     ];
 
-    public function __construct(PermissionsRepo $permissionsRepo)
-    {
-        $this->permissionsRepo = $permissionsRepo;
-
+    public function __construct(
+        protected PermissionsRepo $permissionsRepo
+    ) {
         // Checks for all endpoints in this controller
         $this->middleware(function ($request, $next) {
             $this->checkPermission('user-roles-manage');
@@ -125,9 +122,9 @@ public function delete(string $id)
     }
 
     /**
-     * Format the given role model for single-result display.
+     * Format the given role model for a single-result display.
      */
-    protected function singleFormatter(Role $role)
+    protected function singleFormatter(Role $role): void
     {
         $role->load('users:id,name,slug');
         $role->unsetRelation('permissions');
diff --git a/database/migrations/2025_09_02_111542_remove_unused_columns.php b/database/migrations/2025_09_02_111542_remove_unused_columns.php
index 1ec2dfdf991..3a36e5ad603 100644
--- a/database/migrations/2025_09_02_111542_remove_unused_columns.php
+++ b/database/migrations/2025_09_02_111542_remove_unused_columns.php
@@ -29,5 +29,10 @@ public function down(): void
         Schema::table('comments', function (Blueprint $table) {
             $table->longText('text')->nullable();
         });
+
+        Schema::table('role_permissions', function (Blueprint $table) {
+            $table->string('display_name')->nullable();
+            $table->string('description')->nullable();
+        });
     }
 };

From 33a0237f875170e4750ea537604307dd9d5a0bde Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Mon, 8 Sep 2025 18:14:38 +0100
Subject: [PATCH 662/666] Permissions: Updated usage of controller methods to
 use enum

---
 app/Access/LoginService.php                   |  3 +-
 .../Controllers/AuditLogApiController.php     |  5 +-
 .../Controllers/AuditLogController.php        |  5 +-
 .../Controllers/CommentController.php         | 17 ++---
 app/Activity/Controllers/WatchController.php  |  3 +-
 .../Handlers/BaseNotificationHandler.php      |  3 +-
 app/Activity/Tools/UserEntityWatchOptions.php |  3 +-
 app/Api/ApiTokenGuard.php                     |  3 +-
 app/Api/UserApiTokenController.php            | 13 ++--
 app/App/helpers.php                           |  2 +-
 .../Controllers/BookApiController.php         |  7 +-
 app/Entities/Controllers/BookController.php   | 31 ++++-----
 .../Controllers/BookshelfApiController.php    |  7 +-
 .../Controllers/BookshelfController.php       | 15 +++--
 .../Controllers/ChapterApiController.php      |  9 +--
 .../Controllers/ChapterController.php         | 32 +++++----
 .../Controllers/PageApiController.php         |  9 +--
 app/Entities/Controllers/PageController.php   | 38 +++++------
 .../Controllers/PageRevisionController.php    |  5 +-
 .../Controllers/RecycleBinApiController.php   |  5 +-
 .../Controllers/RecycleBinController.php      |  5 +-
 app/Entities/Tools/PageContent.php            |  3 +-
 app/Http/Middleware/ApiAuthenticate.php       |  3 +-
 .../Middleware/CheckUserHasPermission.php     |  7 +-
 .../ContentPermissionApiController.php        |  4 +-
 app/Permissions/Permission.php                | 66 +++++++------------
 app/Permissions/PermissionsController.php     | 20 +++---
 app/Settings/MaintenanceController.php        |  9 +--
 app/Settings/SettingController.php            |  5 +-
 app/Sorting/BookSortController.php            |  5 +-
 .../Controllers/AttachmentApiController.php   | 13 ++--
 .../Controllers/AttachmentController.php      | 32 ++++-----
 .../Controllers/DrawioImageController.php     |  3 +-
 .../Controllers/GalleryImageController.php    |  3 +-
 app/Uploads/Controllers/ImageController.php   | 11 ++--
 .../Controllers/ImageGalleryApiController.php | 11 ++--
 app/Users/Controllers/RoleApiController.php   |  3 +-
 app/Users/Controllers/RoleController.php      | 15 +++--
 .../Controllers/UserAccountController.php     |  5 +-
 app/Users/Controllers/UserApiController.php   |  4 +-
 app/Users/Controllers/UserController.php      | 15 +++--
 resources/views/home/books.blade.php          |  2 +-
 resources/views/home/shelves.blade.php        |  2 +-
 43 files changed, 235 insertions(+), 226 deletions(-)

diff --git a/app/Access/LoginService.php b/app/Access/LoginService.php
index 76ae1938da0..c81e955722c 100644
--- a/app/Access/LoginService.php
+++ b/app/Access/LoginService.php
@@ -9,6 +9,7 @@
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
+use BookStack\Permissions\Permission;
 use BookStack\Theming\ThemeEvents;
 use BookStack\Users\Models\User;
 use Exception;
@@ -50,7 +51,7 @@ public function login(User $user, string $method, bool $remember = false): void
         Theme::dispatch(ThemeEvents::AUTH_LOGIN, $method, $user);
 
         // Authenticate on all session guards if a likely admin
-        if ($user->can('users-manage') && $user->can('user-roles-manage')) {
+        if ($user->can(Permission::UsersManage) && $user->can(Permission::UserRolesManage)) {
             $guards = ['standard', 'ldap', 'saml2', 'oidc'];
             foreach ($guards as $guard) {
                 auth($guard)->login($user);
diff --git a/app/Activity/Controllers/AuditLogApiController.php b/app/Activity/Controllers/AuditLogApiController.php
index 650d17446d5..0cb4d9cb6da 100644
--- a/app/Activity/Controllers/AuditLogApiController.php
+++ b/app/Activity/Controllers/AuditLogApiController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\Models\Activity;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 
 class AuditLogApiController extends ApiController
 {
@@ -16,8 +17,8 @@ class AuditLogApiController extends ApiController
      */
     public function list()
     {
-        $this->checkPermission('settings-manage');
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::SettingsManage);
+        $this->checkPermission(Permission::UsersManage);
 
         $query = Activity::query()->with(['user']);
 
diff --git a/app/Activity/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.php
index 66ca301977c..c4f9b91edb8 100644
--- a/app/Activity/Controllers/AuditLogController.php
+++ b/app/Activity/Controllers/AuditLogController.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Activity;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Sorting\SortUrl;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
@@ -13,8 +14,8 @@ class AuditLogController extends Controller
 {
     public function index(Request $request)
     {
-        $this->checkPermission('settings-manage');
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::SettingsManage);
+        $this->checkPermission(Permission::UsersManage);
 
         $sort = $request->get('sort', 'activity_date');
         $order = $request->get('order', 'desc');
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 479d57c4db9..fd5463dff18 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -7,6 +7,7 @@
 use BookStack\Activity\Tools\CommentTreeNode;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
@@ -42,7 +43,7 @@ public function savePageComment(Request $request, int $pageId)
         }
 
         // Create a new comment.
-        $this->checkPermission('comment-create-all');
+        $this->checkPermission(Permission::CommentCreateAll);
         $contentRef = $input['content_ref'] ?? '';
         $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $contentRef);
 
@@ -64,8 +65,8 @@ public function update(Request $request, int $commentId)
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
-        $this->checkOwnablePermission('page-view', $comment->entity);
-        $this->checkOwnablePermission('comment-update', $comment);
+        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        $this->checkOwnablePermission(Permission::CommentUpdate, $comment);
 
         $comment = $this->commentRepo->update($comment, $input['html']);
 
@@ -81,8 +82,8 @@ public function update(Request $request, int $commentId)
     public function archive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission('page-view', $comment->entity);
-        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
             $this->showPermissionError();
         }
 
@@ -101,8 +102,8 @@ public function archive(int $id)
     public function unarchive(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission('page-view', $comment->entity);
-        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
             $this->showPermissionError();
         }
 
@@ -121,7 +122,7 @@ public function unarchive(int $id)
     public function destroy(int $id)
     {
         $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission('comment-delete', $comment);
+        $this->checkOwnablePermission(Permission::CommentDelete, $comment);
 
         $this->commentRepo->delete($comment);
 
diff --git a/app/Activity/Controllers/WatchController.php b/app/Activity/Controllers/WatchController.php
index 5df75da39cd..b77a893ea58 100644
--- a/app/Activity/Controllers/WatchController.php
+++ b/app/Activity/Controllers/WatchController.php
@@ -5,13 +5,14 @@
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Tools\MixedEntityRequestHelper;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 
 class WatchController extends Controller
 {
     public function update(Request $request, MixedEntityRequestHelper $entityHelper)
     {
-        $this->checkPermission('receive-notifications');
+        $this->checkPermission(Permission::ReceiveNotifications);
         $this->preventGuestAccess();
 
         $requestData = $this->validate($request, array_merge([
diff --git a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
index 3a9b0c1dc80..bc6f2e22fc0 100644
--- a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Notifications\Messages\BaseActivityNotification;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Log;
@@ -26,7 +27,7 @@ protected function sendNotificationToUserIds(string $notification, array $userId
             }
 
             // Prevent sending of the user does not have notification permissions
-            if (!$user->can('receive-notifications')) {
+            if (!$user->can(Permission::ReceiveNotifications)) {
                 continue;
             }
 
diff --git a/app/Activity/Tools/UserEntityWatchOptions.php b/app/Activity/Tools/UserEntityWatchOptions.php
index 559d7903d6f..8e5f70758af 100644
--- a/app/Activity/Tools/UserEntityWatchOptions.php
+++ b/app/Activity/Tools/UserEntityWatchOptions.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -22,7 +23,7 @@ public function __construct(
 
     public function canWatch(): bool
     {
-        return $this->user->can('receive-notifications') && !$this->user->isGuest();
+        return $this->user->can(Permission::ReceiveNotifications) && !$this->user->isGuest();
     }
 
     public function getWatchLevel(): string
diff --git a/app/Api/ApiTokenGuard.php b/app/Api/ApiTokenGuard.php
index 6302884a912..9f4537b296b 100644
--- a/app/Api/ApiTokenGuard.php
+++ b/app/Api/ApiTokenGuard.php
@@ -4,6 +4,7 @@
 
 use BookStack\Access\LoginService;
 use BookStack\Exceptions\ApiAuthException;
+use BookStack\Permissions\Permission;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Guard;
@@ -146,7 +147,7 @@ protected function validateToken(?ApiToken $token, string $secret): void
             throw new ApiAuthException(trans('errors.api_user_token_expired'), 403);
         }
 
-        if (!$token->user->can('access-api')) {
+        if (!$token->user->can(Permission::AccessApi)) {
             throw new ApiAuthException(trans('errors.api_user_no_api_permission'), 403);
         }
     }
diff --git a/app/Api/UserApiTokenController.php b/app/Api/UserApiTokenController.php
index 3606e826094..2ca9e22352e 100644
--- a/app/Api/UserApiTokenController.php
+++ b/app/Api/UserApiTokenController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -16,8 +17,8 @@ class UserApiTokenController extends Controller
      */
     public function create(Request $request, int $userId)
     {
-        $this->checkPermission('access-api');
-        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+        $this->checkPermission(Permission::AccessApi);
+        $this->checkPermissionOrCurrentUser(Permission::UsersManage, $userId);
         $this->updateContext($request);
 
         $user = User::query()->findOrFail($userId);
@@ -35,8 +36,8 @@ public function create(Request $request, int $userId)
      */
     public function store(Request $request, int $userId)
     {
-        $this->checkPermission('access-api');
-        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+        $this->checkPermission(Permission::AccessApi);
+        $this->checkPermissionOrCurrentUser(Permission::UsersManage, $userId);
 
         $this->validate($request, [
             'name'       => ['required', 'max:250'],
@@ -143,8 +144,8 @@ public function destroy(int $userId, int $tokenId)
      */
     protected function checkPermissionAndFetchUserToken(int $userId, int $tokenId): array
     {
-        $this->checkPermissionOr('users-manage', function () use ($userId) {
-            return $userId === user()->id && userCan('access-api');
+        $this->checkPermissionOr(Permission::UsersManage, function () use ($userId) {
+            return $userId === user()->id && userCan(Permission::AccessApi);
         });
 
         $user = User::query()->findOrFail($userId);
diff --git a/app/App/helpers.php b/app/App/helpers.php
index 0e26d9974a9..0e357e36aee 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -56,7 +56,7 @@ function userCan(string|Permission $permission, ?Model $ownable = null): bool
  * Check if the current user can perform the given action on any items in the system.
  * Can be provided the class name of an entity to filter ability to that specific entity type.
  */
-function userCanOnAny(string $action, string $entityClass = ''): bool
+function userCanOnAny(string|Permission $action, string $entityClass = ''): bool
 {
     $permissions = app()->make(PermissionApplicator::class);
 
diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index a617ee2da68..5baea163fd6 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -11,6 +11,7 @@
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
@@ -47,7 +48,7 @@ public function list()
      */
     public function create(Request $request)
     {
-        $this->checkPermission('book-create-all');
+        $this->checkPermission(Permission::BookCreateAll);
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $book = $this->bookRepo->create($requestData);
@@ -92,7 +93,7 @@ public function read(string $id)
     public function update(Request $request, string $id)
     {
         $book = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
 
         $requestData = $this->validate($request, $this->rules()['update']);
         $book = $this->bookRepo->update($book, $requestData);
@@ -109,7 +110,7 @@ public function update(Request $request, string $id)
     public function delete(string $id)
     {
         $book = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkOwnablePermission(Permission::BookDelete, $book);
 
         $this->bookRepo->destroy($book);
 
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index 5d3d67f645c..cbf7ffb7984 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -17,6 +17,7 @@
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use BookStack\Util\SimpleListOptions;
@@ -73,12 +74,12 @@ public function index(Request $request)
      */
     public function create(?string $shelfSlug = null)
     {
-        $this->checkPermission('book-create-all');
+        $this->checkPermission(Permission::BookCreateAll);
 
         $bookshelf = null;
         if ($shelfSlug !== null) {
             $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
-            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+            $this->checkOwnablePermission(Permission::BookshelfUpdate, $bookshelf);
         }
 
         $this->setPageTitle(trans('entities.books_create'));
@@ -96,7 +97,7 @@ public function create(?string $shelfSlug = null)
      */
     public function store(Request $request, ?string $shelfSlug = null)
     {
-        $this->checkPermission('book-create-all');
+        $this->checkPermission(Permission::BookCreateAll);
         $validated = $this->validate($request, [
             'name'                => ['required', 'string', 'max:255'],
             'description_html'    => ['string', 'max:2000'],
@@ -108,7 +109,7 @@ public function store(Request $request, ?string $shelfSlug = null)
         $bookshelf = null;
         if ($shelfSlug !== null) {
             $bookshelf = $this->shelfQueries->findVisibleBySlugOrFail($shelfSlug);
-            $this->checkOwnablePermission('bookshelf-update', $bookshelf);
+            $this->checkOwnablePermission(Permission::BookshelfUpdate, $bookshelf);
         }
 
         $book = $this->bookRepo->create($validated);
@@ -154,7 +155,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
     public function edit(string $slug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
         $this->setPageTitle(trans('entities.books_edit_named', ['bookName' => $book->getShortName()]));
 
         return view('books.edit', ['book' => $book, 'current' => $book]);
@@ -170,7 +171,7 @@ public function edit(string $slug)
     public function update(Request $request, string $slug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
 
         $validated = $this->validate($request, [
             'name'                => ['required', 'string', 'max:255'],
@@ -197,7 +198,7 @@ public function update(Request $request, string $slug)
     public function showDelete(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkOwnablePermission(Permission::BookDelete, $book);
         $this->setPageTitle(trans('entities.books_delete_named', ['bookName' => $book->getShortName()]));
 
         return view('books.delete', ['book' => $book, 'current' => $book]);
@@ -211,7 +212,7 @@ public function showDelete(string $bookSlug)
     public function destroy(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-delete', $book);
+        $this->checkOwnablePermission(Permission::BookDelete, $book);
 
         $this->bookRepo->destroy($book);
 
@@ -226,7 +227,7 @@ public function destroy(string $bookSlug)
     public function showCopy(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-view', $book);
+        $this->checkOwnablePermission(Permission::BookView, $book);
 
         session()->flashInput(['name' => $book->name]);
 
@@ -243,8 +244,8 @@ public function showCopy(string $bookSlug)
     public function copy(Request $request, Cloner $cloner, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-view', $book);
-        $this->checkPermission('book-create-all');
+        $this->checkOwnablePermission(Permission::BookView, $book);
+        $this->checkPermission(Permission::BookCreateAll);
 
         $newName = $request->get('name') ?: $book->name;
         $bookCopy = $cloner->cloneBook($book, $newName);
@@ -259,10 +260,10 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug)
     public function convertToShelf(HierarchyTransformer $transformer, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
-        $this->checkOwnablePermission('book-delete', $book);
-        $this->checkPermission('bookshelf-create-all');
-        $this->checkPermission('book-create-all');
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
+        $this->checkOwnablePermission(Permission::BookDelete, $book);
+        $this->checkPermission(Permission::BookshelfCreateAll);
+        $this->checkPermission(Permission::BookCreateAll);
 
         $shelf = (new DatabaseTransaction(function () use ($book, $transformer) {
             return $transformer->transformBookToShelf($book);
diff --git a/app/Entities/Controllers/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
index b512f2d0553..f4bd394a9e7 100644
--- a/app/Entities/Controllers/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
@@ -45,7 +46,7 @@ public function list()
      */
     public function create(Request $request)
     {
-        $this->checkPermission('bookshelf-create-all');
+        $this->checkPermission(Permission::BookshelfCreateAll);
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $bookIds = $request->get('books', []);
@@ -84,7 +85,7 @@ public function read(string $id)
     public function update(Request $request, string $id)
     {
         $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('bookshelf-update', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
 
         $requestData = $this->validate($request, $this->rules()['update']);
         $bookIds = $request->get('books', null);
@@ -103,7 +104,7 @@ public function update(Request $request, string $id)
     public function delete(string $id)
     {
         $shelf = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('bookshelf-delete', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
 
         $this->bookshelfRepo->destroy($shelf);
 
diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index 6cedd23e7df..f47742ffaa6 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -11,6 +11,7 @@
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Exception;
@@ -68,7 +69,7 @@ public function index(Request $request)
      */
     public function create()
     {
-        $this->checkPermission('bookshelf-create-all');
+        $this->checkPermission(Permission::BookshelfCreateAll);
         $books = $this->bookQueries->visibleForList()->orderBy('name')->get(['name', 'id', 'slug', 'created_at', 'updated_at']);
         $this->setPageTitle(trans('entities.shelves_create'));
 
@@ -83,7 +84,7 @@ public function create()
      */
     public function store(Request $request)
     {
-        $this->checkPermission('bookshelf-create-all');
+        $this->checkPermission(Permission::BookshelfCreateAll);
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
             'description_html' => ['string', 'max:2000'],
@@ -105,7 +106,7 @@ public function store(Request $request)
     public function show(Request $request, ActivityQueries $activities, string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('bookshelf-view', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfView, $shelf);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
             'default' => trans('common.sort_default'),
@@ -143,7 +144,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
     public function edit(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('bookshelf-update', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
 
         $shelfBookIds = $shelf->books()->get(['id'])->pluck('id');
         $books = $this->bookQueries->visibleForList()
@@ -169,7 +170,7 @@ public function edit(string $slug)
     public function update(Request $request, string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('bookshelf-update', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
         $validated = $this->validate($request, [
             'name'             => ['required', 'string', 'max:255'],
             'description_html' => ['string', 'max:2000'],
@@ -195,7 +196,7 @@ public function update(Request $request, string $slug)
     public function showDelete(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('bookshelf-delete', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
 
         $this->setPageTitle(trans('entities.shelves_delete_named', ['name' => $shelf->getShortName()]));
 
@@ -210,7 +211,7 @@ public function showDelete(string $slug)
     public function destroy(string $slug)
     {
         $shelf = $this->queries->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('bookshelf-delete', $shelf);
+        $this->checkOwnablePermission(Permission::BookshelfDelete, $shelf);
 
         $this->shelfRepo->destroy($shelf);
 
diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index 6ba2e9fd2bf..80eab7bb8c1 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -9,6 +9,7 @@
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Exception;
 use Illuminate\Http\Request;
 
@@ -65,7 +66,7 @@ public function create(Request $request)
 
         $bookId = $request->get('book_id');
         $book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId));
-        $this->checkOwnablePermission('chapter-create', $book);
+        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
 
         $chapter = $this->chapterRepo->create($requestData, $book);
 
@@ -101,10 +102,10 @@ public function update(Request $request, string $id)
     {
         $requestData = $this->validate($request, $this->rules()['update']);
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
 
         if ($request->has('book_id') && $chapter->book_id !== intval($requestData['book_id'])) {
-            $this->checkOwnablePermission('chapter-delete', $chapter);
+            $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
             try {
                 $this->chapterRepo->move($chapter, "book:{$requestData['book_id']}");
@@ -129,7 +130,7 @@ public function update(Request $request, string $id)
     public function delete(string $id)
     {
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
         $this->chapterRepo->destroy($chapter);
 
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 677745500c3..9335e0a7034 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -17,6 +17,7 @@
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
@@ -39,7 +40,7 @@ public function __construct(
     public function create(string $bookSlug)
     {
         $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('chapter-create', $book);
+        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
 
         $this->setPageTitle(trans('entities.chapters_create'));
 
@@ -64,7 +65,7 @@ public function store(Request $request, string $bookSlug)
         ]);
 
         $book = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('chapter-create', $book);
+        $this->checkOwnablePermission(Permission::ChapterCreate, $book);
 
         $chapter = $this->chapterRepo->create($validated, $book);
 
@@ -77,7 +78,6 @@ public function store(Request $request, string $bookSlug)
     public function show(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-view', $chapter);
 
         $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)->get();
@@ -106,7 +106,7 @@ public function show(string $bookSlug, string $chapterSlug)
     public function edit(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
 
         $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()]));
 
@@ -128,7 +128,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
         ]);
 
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
 
         $this->chapterRepo->update($chapter, $validated);
 
@@ -143,7 +143,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
     public function showDelete(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
         $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()]));
 
@@ -159,7 +159,7 @@ public function showDelete(string $bookSlug, string $chapterSlug)
     public function destroy(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
         $this->chapterRepo->destroy($chapter);
 
@@ -175,8 +175,8 @@ public function showMove(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()]));
-        $this->checkOwnablePermission('chapter-update', $chapter);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
         return view('chapters.move', [
             'chapter' => $chapter,
@@ -192,8 +192,8 @@ public function showMove(string $bookSlug, string $chapterSlug)
     public function move(Request $request, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
@@ -221,7 +221,6 @@ public function move(Request $request, string $bookSlug, string $chapterSlug)
     public function showCopy(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-view', $chapter);
 
         session()->flashInput(['name' => $chapter->name]);
 
@@ -240,7 +239,6 @@ public function showCopy(string $bookSlug, string $chapterSlug)
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-view', $chapter);
 
         $entitySelection = $request->get('entity_selection') ?: null;
         $newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent();
@@ -251,7 +249,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
             return redirect($chapter->getUrl('/copy'));
         }
 
-        $this->checkOwnablePermission('chapter-create', $newParentBook);
+        $this->checkOwnablePermission(Permission::ChapterCreate, $newParentBook);
 
         $newName = $request->get('name') ?: $chapter->name;
         $chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName);
@@ -266,9 +264,9 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
     public function convertToBook(HierarchyTransformer $transformer, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('chapter-update', $chapter);
-        $this->checkOwnablePermission('chapter-delete', $chapter);
-        $this->checkPermission('book-create-all');
+        $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
+        $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
+        $this->checkPermission(Permission::BookCreateAll);
 
         $book = (new DatabaseTransaction(function () use ($chapter, $transformer) {
             return $transformer->transformChapterToBook($chapter);
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index 8fcba3dc6a1..033c19a7a33 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Exception;
 use Illuminate\Http\Request;
 
@@ -76,7 +77,7 @@ public function create(Request $request)
         } else {
             $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
         }
-        $this->checkOwnablePermission('page-create', $parent);
+        $this->checkOwnablePermission(Permission::PageCreate, $parent);
 
         $draft = $this->pageRepo->getNewDraftPage($parent);
         $this->pageRepo->publishDraft($draft, $request->only(array_keys($this->rules['create'])));
@@ -116,7 +117,7 @@ public function update(Request $request, string $id)
         $requestData = $this->validate($request, $this->rules['update']);
 
         $page = $this->queries->findVisibleByIdOrFail($id);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $parent = null;
         if ($request->has('chapter_id')) {
@@ -126,7 +127,7 @@ public function update(Request $request, string $id)
         }
 
         if ($parent && !$parent->matches($page->getParent())) {
-            $this->checkOwnablePermission('page-delete', $page);
+            $this->checkOwnablePermission(Permission::PageDelete, $page);
 
             try {
                 $this->pageRepo->move($page, $parent->getType() . ':' . $parent->id);
@@ -151,7 +152,7 @@ public function update(Request $request, string $id)
     public function delete(string $id)
     {
         $page = $this->queries->findVisibleByIdOrFail($id);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $this->pageRepo->destroy($page);
 
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index de3aed7d9a7..d4bde300b1d 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -20,6 +20,7 @@
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceFetcher;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -50,7 +51,7 @@ public function create(string $bookSlug, ?string $chapterSlug = null)
             $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         }
 
-        $this->checkOwnablePermission('page-create', $parent);
+        $this->checkOwnablePermission(Permission::PageCreate, $parent);
 
         // Redirect to draft edit screen if signed in
         if ($this->isSignedIn()) {
@@ -82,7 +83,7 @@ public function createAsGuest(Request $request, string $bookSlug, ?string $chapt
             $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);
         }
 
-        $this->checkOwnablePermission('page-create', $parent);
+        $this->checkOwnablePermission(Permission::PageCreate, $parent);
 
         $page = $this->pageRepo->getNewDraftPage($parent);
         $this->pageRepo->publishDraft($page, [
@@ -100,7 +101,7 @@ public function createAsGuest(Request $request, string $bookSlug, ?string $chapt
     public function editDraft(Request $request, string $bookSlug, int $pageId)
     {
         $draft = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-create', $draft->getParent());
+        $this->checkOwnablePermission(Permission::PageCreate, $draft->getParent());
 
         $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));
         $this->setPageTitle(trans('entities.pages_edit_draft'));
@@ -120,7 +121,7 @@ public function store(Request $request, string $bookSlug, int $pageId)
             'name' => ['required', 'string', 'max:255'],
         ]);
         $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-create', $draftPage->getParent());
+        $this->checkOwnablePermission(Permission::PageCreate, $draftPage->getParent());
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
 
@@ -148,8 +149,6 @@ public function show(string $bookSlug, string $pageSlug)
             return redirect($page->getUrl());
         }
 
-        $this->checkOwnablePermission('page-view', $page);
-
         $pageContent = (new PageContent($page));
         $page->html = $pageContent->render();
         $pageNav = $pageContent->getNavigation($page->html);
@@ -197,7 +196,7 @@ public function getPageAjax(int $pageId)
     public function edit(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page, $page->getUrl());
+        $this->checkOwnablePermission(Permission::PageUpdate, $page, $page->getUrl());
 
         $editorData = new PageEditorData($page, $this->entityQueries, $request->query('editor', ''));
         if ($editorData->getWarnings()) {
@@ -221,7 +220,7 @@ public function update(Request $request, string $bookSlug, string $pageSlug)
             'name' => ['required', 'string', 'max:255'],
         ]);
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $this->pageRepo->update($page, $request->all());
 
@@ -236,7 +235,7 @@ public function update(Request $request, string $bookSlug, string $pageSlug)
     public function saveDraft(Request $request, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         if (!$this->isSignedIn()) {
             return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);
@@ -273,7 +272,7 @@ public function redirectFromLink(int $pageId)
     public function showDelete(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -295,7 +294,7 @@ public function showDelete(string $bookSlug, string $pageSlug)
     public function showDeleteDraft(string $bookSlug, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -318,7 +317,7 @@ public function showDeleteDraft(string $bookSlug, int $pageId)
     public function destroy(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
         $parent = $page->getParent();
 
         $this->pageRepo->destroy($page);
@@ -337,7 +336,7 @@ public function destroyDraft(string $bookSlug, int $pageId)
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $book = $page->book;
         $chapter = $page->chapter;
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $this->pageRepo->destroy($page);
 
@@ -384,8 +383,8 @@ public function showRecentlyUpdated()
     public function showMove(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         return view('pages.move', [
             'book' => $page->book,
@@ -402,8 +401,8 @@ public function showMove(string $bookSlug, string $pageSlug)
     public function move(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
@@ -431,7 +430,6 @@ public function move(Request $request, string $bookSlug, string $pageSlug)
     public function showCopy(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-view', $page);
         session()->flashInput(['name' => $page->name]);
 
         return view('pages.copy', [
@@ -449,7 +447,7 @@ public function showCopy(string $bookSlug, string $pageSlug)
     public function copy(Request $request, Cloner $cloner, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-view', $page);
+        $this->checkOwnablePermission(Permission::PageView, $page);
 
         $entitySelection = $request->get('entity_selection') ?: null;
         $newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent();
@@ -460,7 +458,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
             return redirect($page->getUrl('/copy'));
         }
 
-        $this->checkOwnablePermission('page-create', $newParent);
+        $this->checkOwnablePermission(Permission::PageCreate, $newParent);
 
         $newName = $request->get('name') ?: $page->name;
         $pageCopy = $cloner->clonePage($page, $newParent, $newName);
diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index c43eea08baf..35f1e8daf0e 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -11,6 +11,7 @@
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Ssddanbrown\HtmlDiff\Diff;
@@ -124,7 +125,7 @@ public function changes(string $bookSlug, string $pageSlug, int $revisionId)
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)
     {
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $page = $this->pageRepo->restoreRevision($page, $revisionId);
 
@@ -139,7 +140,7 @@ public function restore(string $bookSlug, string $pageSlug, int $revisionId)
     public function destroy(string $bookSlug, string $pageSlug, int $revId)
     {
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('page-delete', $page);
+        $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
         if ($revision === null) {
diff --git a/app/Entities/Controllers/RecycleBinApiController.php b/app/Entities/Controllers/RecycleBinApiController.php
index 89bd3f41ad5..6146851366b 100644
--- a/app/Entities/Controllers/RecycleBinApiController.php
+++ b/app/Entities/Controllers/RecycleBinApiController.php
@@ -9,6 +9,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
@@ -17,8 +18,8 @@ class RecycleBinApiController extends ApiController
     public function __construct()
     {
         $this->middleware(function ($request, $next) {
-            $this->checkPermission('settings-manage');
-            $this->checkPermission('restrictions-manage-all');
+            $this->checkPermission(Permission::SettingsManage);
+            $this->checkPermission(Permission::RestrictionsManageAll);
 
             return $next($request);
         });
diff --git a/app/Entities/Controllers/RecycleBinController.php b/app/Entities/Controllers/RecycleBinController.php
index d11dde4dd73..f3c2b6a01cc 100644
--- a/app/Entities/Controllers/RecycleBinController.php
+++ b/app/Entities/Controllers/RecycleBinController.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 
 class RecycleBinController extends Controller
 {
@@ -20,8 +21,8 @@ class RecycleBinController extends Controller
     public function __construct()
     {
         $this->middleware(function ($request, $next) {
-            $this->checkPermission('settings-manage');
-            $this->checkPermission('restrictions-manage-all');
+            $this->checkPermission(Permission::SettingsManage);
+            $this->checkPermission(Permission::RestrictionsManageAll);
 
             return $next($request);
         });
diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index d2f5de65c3e..4b1d77db720 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Facades\Theme;
+use BookStack\Permissions\Permission;
 use BookStack\Theming\ThemeEvents;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
@@ -122,7 +123,7 @@ protected function base64ImageUriToUploadedImageUrl(string $uri, User $updater):
         $imageInfo = $this->parseBase64ImageUri($uri);
 
         // Validate user has permission to create images
-        if (!$updater->can('image-create-all')) {
+        if (!$updater->can(Permission::ImageCreateAll)) {
             return '';
         }
 
diff --git a/app/Http/Middleware/ApiAuthenticate.php b/app/Http/Middleware/ApiAuthenticate.php
index 5f3ad3168a0..15b5a325a10 100644
--- a/app/Http/Middleware/ApiAuthenticate.php
+++ b/app/Http/Middleware/ApiAuthenticate.php
@@ -3,6 +3,7 @@
 namespace BookStack\Http\Middleware;
 
 use BookStack\Exceptions\ApiAuthException;
+use BookStack\Permissions\Permission;
 use Closure;
 use Illuminate\Http\Request;
 
@@ -51,7 +52,7 @@ protected function ensureAuthorizedBySessionOrToken(): void
      */
     protected function sessionUserHasApiAccess(): bool
     {
-        $hasApiPermission = user()->can('access-api');
+        $hasApiPermission = user()->can(Permission::AccessApi);
 
         return $hasApiPermission && user()->hasAppAccess();
     }
diff --git a/app/Http/Middleware/CheckUserHasPermission.php b/app/Http/Middleware/CheckUserHasPermission.php
index b5678e734fb..ea4ff652ae8 100644
--- a/app/Http/Middleware/CheckUserHasPermission.php
+++ b/app/Http/Middleware/CheckUserHasPermission.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Middleware;
 
+use BookStack\Permissions\Permission;
 use Closure;
 use Illuminate\Http\Request;
 
@@ -10,13 +11,9 @@ class CheckUserHasPermission
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     * @param string                   $permission
-     *
      * @return mixed
      */
-    public function handle($request, Closure $next, $permission)
+    public function handle(Request $request, Closure $next, string|Permission $permission)
     {
         if (!user()->can($permission)) {
             return $this->errorResponse($request);
diff --git a/app/Permissions/ContentPermissionApiController.php b/app/Permissions/ContentPermissionApiController.php
index bddbc2c7d95..0720cc4782b 100644
--- a/app/Permissions/ContentPermissionApiController.php
+++ b/app/Permissions/ContentPermissionApiController.php
@@ -51,7 +51,7 @@ public function read(string $contentType, string $contentId)
         $entity = $this->entities->get($contentType)
             ->newQuery()->scopes(['visible'])->findOrFail($contentId);
 
-        $this->checkOwnablePermission('restrictions-manage', $entity);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $entity);
 
         return response()->json($this->formattedPermissionDataForEntity($entity));
     }
@@ -71,7 +71,7 @@ public function update(Request $request, string $contentType, string $contentId)
         $entity = $this->entities->get($contentType)
             ->newQuery()->scopes(['visible'])->findOrFail($contentId);
 
-        $this->checkOwnablePermission('restrictions-manage', $entity);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $entity);
 
         $data = $this->validate($request, $this->rules()['update']);
         $this->permissionsUpdater->updateFromApiRequestData($entity, $data);
diff --git a/app/Permissions/Permission.php b/app/Permissions/Permission.php
index 539bbe8087d..492ca262188 100644
--- a/app/Permissions/Permission.php
+++ b/app/Permissions/Permission.php
@@ -10,6 +10,9 @@
  * We use and still allow the string values in usage to allow for compatibility with scenarios where
  * users have customised their instance with additional permissions via the theme system.
  * This enum primarily exists for alignment within the codebase.
+ *
+ * Permissions with all/own suffixes may also be represented as a higher-level alias without the own/all
+ * suffix, which are used and assessed in the permission system logic.
  */
 enum Permission: string
 {
@@ -26,6 +29,7 @@ enum Permission: string
     case ContentImport = 'content-import';
     case EditorChange = 'editor-change';
     case ReceiveNotifications = 'receive-notifications';
+    case RestrictionsManage = 'restrictions-manage';
     case RestrictionsManageAll = 'restrictions-manage-all';
     case RestrictionsManageOwn = 'restrictions-manage-own';
     case SettingsManage = 'settings-manage';
@@ -33,33 +37,46 @@ enum Permission: string
     case UserRolesManage = 'user-roles-manage';
     case UsersManage = 'users-manage';
 
-    // Entity permissions
-    // Each has 'all' or 'own' in it's RolePermission, with the base non-suffix name being used
-    // in actual checking logic, with the permission system handling the assessment of the underlying RolePermission.
+    // Non-entity content permissions
     case AttachmentCreate = 'attachment-create';
     case AttachmentCreateAll = 'attachment-create-all';
     case AttachmentCreateOwn = 'attachment-create-own';
-
     case AttachmentDelete = 'attachment-delete';
     case AttachmentDeleteAll = 'attachment-delete-all';
     case AttachmentDeleteOwn = 'attachment-delete-own';
-
     case AttachmentUpdate = 'attachment-update';
     case AttachmentUpdateAll = 'attachment-update-all';
     case AttachmentUpdateOwn = 'attachment-update-own';
 
+    case CommentCreate = 'comment-create';
+    case CommentCreateAll = 'comment-create-all';
+    case CommentCreateOwn = 'comment-create-own';
+    case CommentDelete = 'comment-delete';
+    case CommentDeleteAll = 'comment-delete-all';
+    case CommentDeleteOwn = 'comment-delete-own';
+    case CommentUpdate = 'comment-update';
+    case CommentUpdateAll = 'comment-update-all';
+    case CommentUpdateOwn = 'comment-update-own';
+
+    case ImageCreateAll = 'image-create-all';
+    case ImageCreateOwn = 'image-create-own';
+    case ImageDelete = 'image-delete';
+    case ImageDeleteAll = 'image-delete-all';
+    case ImageDeleteOwn = 'image-delete-own';
+    case ImageUpdate = 'image-update';
+    case ImageUpdateAll = 'image-update-all';
+    case ImageUpdateOwn = 'image-update-own';
+
+    // Entity content permissions
     case BookCreate = 'book-create';
     case BookCreateAll = 'book-create-all';
     case BookCreateOwn = 'book-create-own';
-
     case BookDelete = 'book-delete';
     case BookDeleteAll = 'book-delete-all';
     case BookDeleteOwn = 'book-delete-own';
-
     case BookUpdate = 'book-update';
     case BookUpdateAll = 'book-update-all';
     case BookUpdateOwn = 'book-update-own';
-
     case BookView = 'book-view';
     case BookViewAll = 'book-view-all';
     case BookViewOwn = 'book-view-own';
@@ -67,15 +84,12 @@ enum Permission: string
     case BookshelfCreate = 'bookshelf-create';
     case BookshelfCreateAll = 'bookshelf-create-all';
     case BookshelfCreateOwn = 'bookshelf-create-own';
-
     case BookshelfDelete = 'bookshelf-delete';
     case BookshelfDeleteAll = 'bookshelf-delete-all';
     case BookshelfDeleteOwn = 'bookshelf-delete-own';
-
     case BookshelfUpdate = 'bookshelf-update';
     case BookshelfUpdateAll = 'bookshelf-update-all';
     case BookshelfUpdateOwn = 'bookshelf-update-own';
-
     case BookshelfView = 'bookshelf-view';
     case BookshelfViewAll = 'bookshelf-view-all';
     case BookshelfViewOwn = 'bookshelf-view-own';
@@ -83,55 +97,25 @@ enum Permission: string
     case ChapterCreate = 'chapter-create';
     case ChapterCreateAll = 'chapter-create-all';
     case ChapterCreateOwn = 'chapter-create-own';
-
     case ChapterDelete = 'chapter-delete';
     case ChapterDeleteAll = 'chapter-delete-all';
     case ChapterDeleteOwn = 'chapter-delete-own';
-
     case ChapterUpdate = 'chapter-update';
     case ChapterUpdateAll = 'chapter-update-all';
     case ChapterUpdateOwn = 'chapter-update-own';
-
     case ChapterView = 'chapter-view';
     case ChapterViewAll = 'chapter-view-all';
     case ChapterViewOwn = 'chapter-view-own';
 
-    case CommentCreate = 'comment-create';
-    case CommentCreateAll = 'comment-create-all';
-    case CommentCreateOwn = 'comment-create-own';
-
-    case CommentDelete = 'comment-delete';
-    case CommentDeleteAll = 'comment-delete-all';
-    case CommentDeleteOwn = 'comment-delete-own';
-
-    case CommentUpdate = 'comment-update';
-    case CommentUpdateAll = 'comment-update-all';
-    case CommentUpdateOwn = 'comment-update-own';
-
-    case ImageCreate = 'image-create';
-    case ImageCreateAll = 'image-create-all';
-    case ImageCreateOwn = 'image-create-own';
-
-    case ImageDelete = 'image-delete';
-    case ImageDeleteAll = 'image-delete-all';
-    case ImageDeleteOwn = 'image-delete-own';
-
-    case ImageUpdate = 'image-update';
-    case ImageUpdateAll = 'image-update-all';
-    case ImageUpdateOwn = 'image-update-own';
-
     case PageCreate = 'page-create';
     case PageCreateAll = 'page-create-all';
     case PageCreateOwn = 'page-create-own';
-
     case PageDelete = 'page-delete';
     case PageDeleteAll = 'page-delete-all';
     case PageDeleteOwn = 'page-delete-own';
-
     case PageUpdate = 'page-update';
     case PageUpdateAll = 'page-update-all';
     case PageUpdateOwn = 'page-update-own';
-
     case PageView = 'page-view';
     case PageViewAll = 'page-view-all';
     case PageViewOwn = 'page-view-own';
diff --git a/app/Permissions/PermissionsController.php b/app/Permissions/PermissionsController.php
index 9dcfe242ec0..d93d9e718ae 100644
--- a/app/Permissions/PermissionsController.php
+++ b/app/Permissions/PermissionsController.php
@@ -24,7 +24,7 @@ public function __construct(
     public function showForPage(string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $page);
 
         $this->setPageTitle(trans('entities.pages_permissions'));
         return view('pages.permissions', [
@@ -39,7 +39,7 @@ public function showForPage(string $bookSlug, string $pageSlug)
     public function updateForPage(Request $request, string $bookSlug, string $pageSlug)
     {
         $page = $this->queries->pages->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $page);
 
         (new DatabaseTransaction(function () use ($page, $request) {
             $this->permissionsUpdater->updateFromPermissionsForm($page, $request);
@@ -56,7 +56,7 @@ public function updateForPage(Request $request, string $bookSlug, string $pageSl
     public function showForChapter(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $chapter);
 
         $this->setPageTitle(trans('entities.chapters_permissions'));
         return view('chapters.permissions', [
@@ -71,7 +71,7 @@ public function showForChapter(string $bookSlug, string $chapterSlug)
     public function updateForChapter(Request $request, string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->queries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
-        $this->checkOwnablePermission('restrictions-manage', $chapter);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $chapter);
 
         (new DatabaseTransaction(function () use ($chapter, $request) {
             $this->permissionsUpdater->updateFromPermissionsForm($chapter, $request);
@@ -88,7 +88,7 @@ public function updateForChapter(Request $request, string $bookSlug, string $cha
     public function showForBook(string $slug)
     {
         $book = $this->queries->books->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $book);
 
         $this->setPageTitle(trans('entities.books_permissions'));
         return view('books.permissions', [
@@ -103,7 +103,7 @@ public function showForBook(string $slug)
     public function updateForBook(Request $request, string $slug)
     {
         $book = $this->queries->books->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('restrictions-manage', $book);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $book);
 
         (new DatabaseTransaction(function () use ($book, $request) {
             $this->permissionsUpdater->updateFromPermissionsForm($book, $request);
@@ -120,7 +120,7 @@ public function updateForBook(Request $request, string $slug)
     public function showForShelf(string $slug)
     {
         $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $shelf);
 
         $this->setPageTitle(trans('entities.shelves_permissions'));
         return view('shelves.permissions', [
@@ -135,7 +135,7 @@ public function showForShelf(string $slug)
     public function updateForShelf(Request $request, string $slug)
     {
         $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $shelf);
 
         (new DatabaseTransaction(function () use ($shelf, $request) {
             $this->permissionsUpdater->updateFromPermissionsForm($shelf, $request);
@@ -152,7 +152,7 @@ public function updateForShelf(Request $request, string $slug)
     public function copyShelfPermissionsToBooks(string $slug)
     {
         $shelf = $this->queries->shelves->findVisibleBySlugOrFail($slug);
-        $this->checkOwnablePermission('restrictions-manage', $shelf);
+        $this->checkOwnablePermission(Permission::RestrictionsManage, $shelf);
 
         $updateCount = (new DatabaseTransaction(function () use ($shelf) {
             return $this->permissionsUpdater->updateBookPermissionsFromShelf($shelf);
@@ -168,7 +168,7 @@ public function copyShelfPermissionsToBooks(string $slug)
      */
     public function formRowForRole(string $entityType, string $roleId)
     {
-        $this->checkPermissionOr('restrictions-manage-all', fn() => userCan('restrictions-manage-own'));
+        $this->checkPermissionOr(Permission::RestrictionsManageAll, fn() => userCan(Permission::RestrictionsManageOwn));
 
         $role = Role::query()->findOrFail($roleId);
 
diff --git a/app/Settings/MaintenanceController.php b/app/Settings/MaintenanceController.php
index ac9dd20ccb2..b2b2226bf98 100644
--- a/app/Settings/MaintenanceController.php
+++ b/app/Settings/MaintenanceController.php
@@ -6,6 +6,7 @@
 use BookStack\App\AppVersion;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceStore;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;
@@ -17,7 +18,7 @@ class MaintenanceController extends Controller
      */
     public function index(TrashCan $trashCan)
     {
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->setPageTitle(trans('settings.maint'));
 
         // Recycle bin details
@@ -34,7 +35,7 @@ public function index(TrashCan $trashCan)
      */
     public function cleanupImages(Request $request, ImageService $imageService)
     {
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'cleanup-images');
 
         $checkRevisions = !($request->get('ignore_revisions', 'false') === 'true');
@@ -62,7 +63,7 @@ public function cleanupImages(Request $request, ImageService $imageService)
      */
     public function sendTestEmail()
     {
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'send-test-email');
 
         try {
@@ -81,7 +82,7 @@ public function sendTestEmail()
      */
     public function regenerateReferences(ReferenceStore $referenceStore)
     {
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'regenerate-references');
 
         try {
diff --git a/app/Settings/SettingController.php b/app/Settings/SettingController.php
index 3b7ba74d58a..f89bc6dab6b 100644
--- a/app/Settings/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\App\AppVersion;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
@@ -24,7 +25,7 @@ public function index()
     public function category(string $category)
     {
         $this->ensureCategoryExists($category);
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->setPageTitle(trans('settings.settings'));
 
         return view('settings.categories.' . $category, [
@@ -41,7 +42,7 @@ public function update(Request $request, AppSettingsStore $store, string $catego
     {
         $this->ensureCategoryExists($category);
         $this->preventAccessInDemoMode();
-        $this->checkPermission('settings-manage');
+        $this->checkPermission(Permission::SettingsManage);
         $this->validate($request, [
             'app_logo' => ['nullable', ...$this->getImageValidationRules()],
             'app_icon' => ['nullable', ...$this->getImageValidationRules()],
diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index d70d0e6565a..7e2ee5465df 100644
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 
@@ -23,7 +24,7 @@ public function __construct(
     public function show(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
 
         $bookChildren = (new BookContents($book))->getTree(false);
 
@@ -51,7 +52,7 @@ public function showItem(string $bookSlug)
     public function update(Request $request, BookSorter $sorter, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
-        $this->checkOwnablePermission('book-update', $book);
+        $this->checkOwnablePermission(Permission::BookUpdate, $book);
         $loggedActivityForBook = false;
 
         // Sort via map
diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index 87e00257cb4..b47d6ff8dd1 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use Exception;
@@ -45,12 +46,12 @@ public function list()
      */
     public function create(Request $request)
     {
-        $this->checkPermission('attachment-create-all');
+        $this->checkPermission(Permission::AttachmentCreateAll);
         $requestData = $this->validate($request, $this->rules()['create']);
 
         $pageId = $request->get('uploaded_to');
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         if ($request->hasFile('file')) {
             $uploadedFile = $request->file('file');
@@ -137,9 +138,9 @@ public function update(Request $request, string $id)
             $attachment->uploaded_to = $requestData['uploaded_to'];
         }
 
-        $this->checkOwnablePermission('page-view', $page);
-        $this->checkOwnablePermission('page-update', $page);
-        $this->checkOwnablePermission('attachment-update', $attachment);
+        $this->checkOwnablePermission(Permission::PageView, $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
 
         if ($request->hasFile('file')) {
             $uploadedFile = $request->file('file');
@@ -160,7 +161,7 @@ public function delete(string $id)
     {
         /** @var Attachment $attachment */
         $attachment = Attachment::visible()->findOrFail($id);
-        $this->checkOwnablePermission('attachment-delete', $attachment);
+        $this->checkOwnablePermission(Permission::AttachmentDelete, $attachment);
 
         $this->attachmentService->deleteFile($attachment);
 
diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
index 809cdfa581f..0886193e46d 100644
--- a/app/Uploads/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -7,6 +7,7 @@
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use Exception;
@@ -40,8 +41,8 @@ public function upload(Request $request)
         $pageId = $request->get('uploaded_to');
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
 
-        $this->checkPermission('attachment-create-all');
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkPermission(Permission::AttachmentCreateAll);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $uploadedFile = $request->file('file');
 
@@ -67,9 +68,9 @@ public function uploadUpdate(Request $request, $attachmentId)
 
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
-        $this->checkOwnablePermission('view', $attachment->page);
-        $this->checkOwnablePermission('page-update', $attachment->page);
-        $this->checkOwnablePermission('attachment-create', $attachment);
+        $this->checkOwnablePermission(Permission::PageView, $attachment->page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
+        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
 
         $uploadedFile = $request->file('file');
 
@@ -90,8 +91,8 @@ public function getUpdateForm(string $attachmentId)
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
 
-        $this->checkOwnablePermission('page-update', $attachment->page);
-        $this->checkOwnablePermission('attachment-create', $attachment);
+        $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
+        $this->checkOwnablePermission(Permission::AttachmentCreate, $attachment);
 
         return view('attachments.manager-edit-form', [
             'attachment' => $attachment,
@@ -118,9 +119,9 @@ public function update(Request $request, string $attachmentId)
             ]), 422);
         }
 
-        $this->checkOwnablePermission('page-view', $attachment->page);
-        $this->checkOwnablePermission('page-update', $attachment->page);
-        $this->checkOwnablePermission('attachment-update', $attachment);
+        $this->checkOwnablePermission(Permission::PageView, $attachment->page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
+        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
 
         $attachment = $this->attachmentService->updateFile($attachment, [
             'name' => $request->get('attachment_edit_name'),
@@ -156,8 +157,8 @@ public function attachLink(Request $request)
 
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
 
-        $this->checkPermission('attachment-create-all');
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkPermission(Permission::AttachmentCreateAll);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $attachmentName = $request->get('attachment_link_name');
         $link = $request->get('attachment_link_url');
@@ -176,7 +177,6 @@ public function attachLink(Request $request)
     public function listForPage(int $pageId)
     {
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-view', $page);
 
         return view('attachments.manager-list', [
             'attachments' => $page->attachments->all(),
@@ -195,7 +195,7 @@ public function sortForPage(Request $request, int $pageId)
             'order' => ['required', 'array'],
         ]);
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $attachmentOrder = $request->get('order');
         $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId);
@@ -220,7 +220,7 @@ public function get(Request $request, string $attachmentId)
             throw new NotFoundException(trans('errors.attachment_not_found'));
         }
 
-        $this->checkOwnablePermission('page-view', $page);
+        $this->checkOwnablePermission(Permission::PageView, $page);
 
         if ($attachment->external) {
             return redirect($attachment->path);
@@ -246,7 +246,7 @@ public function delete(string $attachmentId)
     {
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
-        $this->checkOwnablePermission('attachment-delete', $attachment);
+        $this->checkOwnablePermission(Permission::AttachmentDelete, $attachment);
         $this->attachmentService->deleteFile($attachment);
 
         return response()->json(['message' => trans('entities.attachments_deleted')]);
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
index 6293da4f718..aff27b3b141 100644
--- a/app/Uploads/Controllers/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
 use BookStack\Util\OutOfMemoryHandler;
@@ -57,7 +58,7 @@ public function create(Request $request)
             'uploaded_to' => ['required', 'integer'],
         ]);
 
-        $this->checkPermission('image-create-all');
+        $this->checkPermission(Permission::ImageCreateAll);
         $imageBase64Data = $request->get('image');
 
         try {
diff --git a/app/Uploads/Controllers/GalleryImageController.php b/app/Uploads/Controllers/GalleryImageController.php
index 1bc9da2d724..745efcde812 100644
--- a/app/Uploads/Controllers/GalleryImageController.php
+++ b/app/Uploads/Controllers/GalleryImageController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
 use BookStack\Util\OutOfMemoryHandler;
@@ -52,7 +53,7 @@ public function list(Request $request, ImageResizer $resizer)
      */
     public function create(Request $request)
     {
-        $this->checkPermission('image-create-all');
+        $this->checkPermission(Permission::ImageCreateAll);
 
         try {
             $this->validate($request, [
diff --git a/app/Uploads/Controllers/ImageController.php b/app/Uploads/Controllers/ImageController.php
index c68ffdf6bd0..da67639c16d 100644
--- a/app/Uploads/Controllers/ImageController.php
+++ b/app/Uploads/Controllers/ImageController.php
@@ -6,6 +6,7 @@
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
@@ -50,7 +51,7 @@ public function update(Request $request, string $id)
 
         $image = $this->imageRepo->getById($id);
         $this->checkImagePermission($image);
-        $this->checkOwnablePermission('image-update', $image);
+        $this->checkOwnablePermission(Permission::ImageUpdate, $image);
 
         $image = $this->imageRepo->updateImageDetails($image, $data);
 
@@ -71,7 +72,7 @@ public function updateFile(Request $request, string $id)
 
         $image = $this->imageRepo->getById($id);
         $this->checkImagePermission($image);
-        $this->checkOwnablePermission('image-update', $image);
+        $this->checkOwnablePermission(Permission::ImageUpdate, $image);
         $file = $request->file('file');
 
         new OutOfMemoryHandler(function () {
@@ -125,7 +126,7 @@ public function edit(Request $request, string $id)
     public function destroy(string $id)
     {
         $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('image-delete', $image);
+        $this->checkOwnablePermission(Permission::ImageDelete, $image);
         $this->checkImagePermission($image);
 
         $this->imageRepo->destroyImage($image);
@@ -140,7 +141,7 @@ public function rebuildThumbnails(string $id)
     {
         $image = $this->imageRepo->getById($id);
         $this->checkImagePermission($image);
-        $this->checkOwnablePermission('image-update', $image);
+        $this->checkOwnablePermission(Permission::ImageUpdate, $image);
 
         new OutOfMemoryHandler(function () {
             return $this->jsonError(trans('errors.image_thumbnail_memory_limit'));
@@ -163,7 +164,7 @@ protected function checkImagePermission(Image $image): void
 
         $relatedPage = $image->getPage();
         if ($relatedPage) {
-            $this->checkOwnablePermission('page-view', $relatedPage);
+            $this->checkOwnablePermission(Permission::PageView, $relatedPage);
         }
     }
 }
diff --git a/app/Uploads/Controllers/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
index d2a750c4555..59696dc9ae4 100644
--- a/app/Uploads/Controllers/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
@@ -65,7 +66,7 @@ public function list()
      */
     public function create(Request $request)
     {
-        $this->checkPermission('image-create-all');
+        $this->checkPermission(Permission::ImageCreateAll);
         $data = $this->validate($request, $this->rules()['create']);
         $page = $this->pageQueries->findVisibleByIdOrFail($data['uploaded_to']);
 
@@ -102,8 +103,8 @@ public function update(Request $request, string $id)
     {
         $data = $this->validate($request, $this->rules()['update']);
         $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('page-view', $image->getPage());
-        $this->checkOwnablePermission('image-update', $image);
+        $this->checkOwnablePermission(Permission::PageView, $image->getPage());
+        $this->checkOwnablePermission(Permission::ImageUpdate, $image);
 
         $this->imageRepo->updateImageDetails($image, $data);
         if (isset($data['image'])) {
@@ -121,8 +122,8 @@ public function update(Request $request, string $id)
     public function delete(string $id)
     {
         $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('page-view', $image->getPage());
-        $this->checkOwnablePermission('image-delete', $image);
+        $this->checkOwnablePermission(Permission::PageView, $image->getPage());
+        $this->checkOwnablePermission(Permission::ImageDelete, $image);
         $this->imageRepo->destroyImage($image);
 
         return response('', 204);
diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 6d87c9e275e..93ecc549bb4 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Users\Controllers;
 
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionsRepo;
 use BookStack\Users\Models\Role;
 use Illuminate\Http\Request;
@@ -38,7 +39,7 @@ public function __construct(
     ) {
         // Checks for all endpoints in this controller
         $this->middleware(function ($request, $next) {
-            $this->checkPermission('user-roles-manage');
+            $this->checkPermission(Permission::UserRolesManage);
 
             return $next($request);
         });
diff --git a/app/Users/Controllers/RoleController.php b/app/Users/Controllers/RoleController.php
index 0a7fdcc9ba8..549f6e0ac8f 100644
--- a/app/Users/Controllers/RoleController.php
+++ b/app/Users/Controllers/RoleController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionsRepo;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Queries\RolesAllPaginatedAndSorted;
@@ -23,7 +24,7 @@ public function __construct(
      */
     public function index(Request $request)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'roles')->withSortOptions([
             'display_name' => trans('common.sort_name'),
@@ -49,7 +50,7 @@ public function index(Request $request)
      */
     public function create(Request $request)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
 
         /** @var ?Role $role */
         $role = null;
@@ -71,7 +72,7 @@ public function create(Request $request)
      */
     public function store(Request $request)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
         $data = $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
@@ -92,7 +93,7 @@ public function store(Request $request)
      */
     public function edit(string $id)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
         $role = $this->permissionsRepo->getRoleById($id);
 
         $this->setPageTitle(trans('settings.role_edit'));
@@ -105,7 +106,7 @@ public function edit(string $id)
      */
     public function update(Request $request, string $id)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
         $data = $this->validate($request, [
             'display_name' => ['required', 'min:3', 'max:180'],
             'description'  => ['max:180'],
@@ -127,7 +128,7 @@ public function update(Request $request, string $id)
      */
     public function showDelete(string $id)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
         $role = $this->permissionsRepo->getRoleById($id);
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
@@ -146,7 +147,7 @@ public function showDelete(string $id)
      */
     public function delete(Request $request, string $id)
     {
-        $this->checkPermission('user-roles-manage');
+        $this->checkPermission(Permission::UserRolesManage);
 
         try {
             $migrateRoleId = intval($request->get('migrate_role_id') ?: "0");
diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 708a91e9d4a..54ca69c5d38 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Access\SocialDriverManager;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\UserNotificationPreferences;
 use BookStack\Settings\UserShortcutMap;
@@ -122,7 +123,7 @@ public function updateShortcuts(Request $request)
      */
     public function showNotifications(PermissionApplicator $permissions)
     {
-        $this->checkPermission('receive-notifications');
+        $this->checkPermission(Permission::ReceiveNotifications);
 
         $preferences = (new UserNotificationPreferences(user()));
 
@@ -145,7 +146,7 @@ public function showNotifications(PermissionApplicator $permissions)
     public function updateNotifications(Request $request)
     {
         $this->preventAccessInDemoMode();
-        $this->checkPermission('receive-notifications');
+        $this->checkPermission(Permission::ReceiveNotifications);
         $data = $this->validate($request, [
            'preferences' => ['required', 'array'],
            'preferences.*' => ['required', 'string'],
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 351893b032b..1efc825005a 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -4,9 +4,9 @@
 
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use BookStack\Users\UserRepo;
-use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\Rules\Password;
@@ -26,7 +26,7 @@ public function __construct(UserRepo $userRepo)
 
         // Checks for all endpoints in this controller
         $this->middleware(function ($request, $next) {
-            $this->checkPermission('users-manage');
+            $this->checkPermission(Permission::UsersManage);
             $this->preventAccessInDemoMode();
 
             return $next($request);
diff --git a/app/Users/Controllers/UserController.php b/app/Users/Controllers/UserController.php
index c6e4326e99a..494221b143e 100644
--- a/app/Users/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -7,6 +7,7 @@
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Queries\UsersAllPaginatedAndSorted;
@@ -32,7 +33,7 @@ public function __construct(
      */
     public function index(Request $request)
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'users')->withSortOptions([
             'name' => trans('common.sort_name'),
@@ -58,7 +59,7 @@ public function index(Request $request)
      */
     public function create()
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
         $authMethod = config('auth.method');
         $roles = Role::query()->orderBy('display_name', 'asc')->get();
         $this->setPageTitle(trans('settings.users_add_new'));
@@ -73,7 +74,7 @@ public function create()
      */
     public function store(Request $request)
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $authMethod = config('auth.method');
         $sendInvite = ($request->get('send_invite', 'false') === 'true');
@@ -111,7 +112,7 @@ public function store(Request $request)
      */
     public function edit(int $id, SocialDriverManager $socialDriverManager)
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $user = $this->userRepo->getById($id);
         $user->load(['apiTokens', 'mfaValues']);
@@ -141,7 +142,7 @@ public function edit(int $id, SocialDriverManager $socialDriverManager)
     public function update(Request $request, int $id)
     {
         $this->preventAccessInDemoMode();
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $validated = $this->validate($request, [
             'name'             => ['min:1', 'max:100'],
@@ -182,7 +183,7 @@ public function update(Request $request, int $id)
      */
     public function delete(int $id)
     {
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $user = $this->userRepo->getById($id);
         $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));
@@ -198,7 +199,7 @@ public function delete(int $id)
     public function destroy(Request $request, int $id)
     {
         $this->preventAccessInDemoMode();
-        $this->checkPermission('users-manage');
+        $this->checkPermission(Permission::UsersManage);
 
         $user = $this->userRepo->getById($id);
         $newOwnerId = intval($request->get('new_owner_id')) ?: null;
diff --git a/resources/views/home/books.blade.php b/resources/views/home/books.blade.php
index a2f2bf79605..e0d2aeb1cc9 100644
--- a/resources/views/home/books.blade.php
+++ b/resources/views/home/books.blade.php
@@ -12,7 +12,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(user()->can('book-create-all'))
+            @if(userCan('book-create-all'))
                 <a href="{{ url("/create-book") }}" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.books_create') }}</span>
diff --git a/resources/views/home/shelves.blade.php b/resources/views/home/shelves.blade.php
index 1265db29e53..dd2c81b1616 100644
--- a/resources/views/home/shelves.blade.php
+++ b/resources/views/home/shelves.blade.php
@@ -12,7 +12,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(user()->can('bookshelf-create-all'))
+            @if(userCan('bookshelf-create-all'))
                 <a href="{{ url("/create-shelf") }}" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.shelves_new_action') }}</span>

From 419dbadcfd7176eec8c1e59ab0df92f054363c16 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Tue, 9 Sep 2025 09:48:19 +0100
Subject: [PATCH 663/666] Permissions: Updated use of helpers to use enums

Also added middlware method to Permission enum to allow easier usage
with controller middleware.
---
 .../Controllers/WebhookController.php         |  3 ++-
 app/Activity/Tools/CommentTree.php            |  2 +-
 app/Activity/Tools/TagClassGenerator.php      |  4 ++--
 app/Entities/Controllers/PageController.php   |  2 +-
 app/Entities/Repos/ChapterRepo.php            |  2 +-
 app/Entities/Repos/PageRepo.php               |  8 +++----
 app/Entities/Tools/Cloner.php                 |  8 +++----
 app/Entities/Tools/PageEditorData.php         |  2 +-
 app/Entities/Tools/PermissionsUpdater.php     |  2 +-
 .../Controllers/BookExportApiController.php   |  3 ++-
 .../Controllers/BookExportController.php      |  3 ++-
 .../ChapterExportApiController.php            |  3 ++-
 .../Controllers/ChapterExportController.php   |  3 ++-
 .../Controllers/ImportApiController.php       |  3 ++-
 app/Exports/Controllers/ImportController.php  |  3 ++-
 .../Controllers/PageExportApiController.php   |  3 ++-
 .../Controllers/PageExportController.php      |  3 ++-
 app/Exports/ImportRepo.php                    |  4 ++--
 .../ZipExports/ZipExportReferences.php        |  2 +-
 app/Exports/ZipExports/ZipImportRunner.php    | 10 ++++----
 app/Permissions/Permission.php                |  9 +++++++
 app/Sorting/BookSorter.php                    | 16 ++++++-------
 app/Sorting/SortRuleController.php            |  3 ++-
 .../Controllers/DrawioImageController.php     |  2 +-
 .../Controllers/UserAccountController.php     |  4 ++--
 app/Users/Controllers/UserApiController.php   |  2 +-
 .../Controllers/UserSearchController.php      |  6 ++---
 .../views/attachments/manager-list.blade.php  |  4 ++--
 resources/views/books/edit.blade.php          |  2 +-
 resources/views/books/index.blade.php         |  4 ++--
 resources/views/books/parts/list.blade.php    |  2 +-
 resources/views/books/show.blade.php          | 20 ++++++++--------
 resources/views/chapters/edit.blade.php       |  2 +-
 resources/views/chapters/show.blade.php       | 24 +++++++++----------
 resources/views/comments/comment.blade.php    | 12 +++++-----
 resources/views/comments/comments.blade.php   |  6 ++---
 resources/views/entities/book-tree.blade.php  |  2 +-
 .../views/entities/breadcrumbs.blade.php      |  2 +-
 resources/views/home/books.blade.php          |  2 +-
 resources/views/home/shelves.blade.php        |  2 +-
 .../layouts/parts/header-links.blade.php      |  6 ++---
 .../pages/parts/editor-toolbar.blade.php      |  2 +-
 .../pages/parts/editor-toolbox.blade.php      |  4 ++--
 .../pages/parts/image-manager-form.blade.php  |  8 +++----
 resources/views/pages/parts/pointer.blade.php |  4 ++--
 .../pages/parts/revisions-index-row.blade.php |  4 ++--
 .../pages/parts/template-manager.blade.php    |  2 +-
 resources/views/pages/show.blade.php          | 20 ++++++++--------
 .../settings/categories/features.blade.php    |  2 +-
 .../views/settings/parts/navbar.blade.php     | 10 ++++----
 resources/views/settings/roles/edit.blade.php |  4 ++--
 resources/views/shelves/index.blade.php       |  2 +-
 resources/views/shelves/parts/list.blade.php  |  2 +-
 resources/views/shelves/show.blade.php        | 14 +++++------
 resources/views/users/account/auth.blade.php  |  2 +-
 .../views/users/account/delete.blade.php      |  2 +-
 .../views/users/account/layout.blade.php      |  2 +-
 .../views/users/account/profile.blade.php     |  6 ++---
 .../users/api-tokens/parts/list.blade.php     |  2 +-
 resources/views/users/create.blade.php        |  2 +-
 resources/views/users/parts/form.blade.php    |  4 ++--
 tests/Permissions/EntityPermissionsTest.php   |  7 +++---
 62 files changed, 165 insertions(+), 145 deletions(-)

diff --git a/app/Activity/Controllers/WebhookController.php b/app/Activity/Controllers/WebhookController.php
index dcca1dc413f..6a65b836361 100644
--- a/app/Activity/Controllers/WebhookController.php
+++ b/app/Activity/Controllers/WebhookController.php
@@ -6,6 +6,7 @@
 use BookStack\Activity\Models\Webhook;
 use BookStack\Activity\Queries\WebhooksAllPaginatedAndSorted;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
@@ -14,7 +15,7 @@ class WebhookController extends Controller
     public function __construct()
     {
         $this->middleware([
-            'can:settings-manage',
+            Permission::SettingsManage->middleware()
         ]);
     }
 
diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index a05a9d24726..af9b7ecb292 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -70,7 +70,7 @@ public function getCommentNodeForId(int $commentId): ?CommentTreeNode
     public function canUpdateAny(): bool
     {
         foreach ($this->comments as $comment) {
-            if (userCan('comment-update', $comment)) {
+            if (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment)) {
                 return true;
             }
         }
diff --git a/app/Activity/Tools/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.php
index 5bcb44113d6..03586eb277f 100644
--- a/app/Activity/Tools/TagClassGenerator.php
+++ b/app/Activity/Tools/TagClassGenerator.php
@@ -26,14 +26,14 @@ public function generate(): array
              array_push($classes, ...$this->generateClassesForTag($tag));
         }
 
-        if ($this->entity instanceof BookChild && userCan('view', $this->entity->book)) {
+        if ($this->entity instanceof BookChild && userCan(\BookStack\Permissions\Permission::View, $this->entity->book)) {
             $bookTags = $this->entity->book->tags;
             foreach ($bookTags as $bookTag) {
                  array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));
             }
         }
 
-        if ($this->entity instanceof Page && $this->entity->chapter && userCan('view', $this->entity->chapter)) {
+        if ($this->entity instanceof Page && $this->entity->chapter && userCan(\BookStack\Permissions\Permission::View, $this->entity->chapter)) {
             $chapterTags = $this->entity->chapter->tags;
             foreach ($chapterTags as $chapterTag) {
                  array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index d4bde300b1d..1fe296537d0 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -342,7 +342,7 @@ public function destroyDraft(string $bookSlug, int $pageId)
 
         $this->showSuccessNotification(trans('entities.pages_delete_draft_success'));
 
-        if ($chapter && userCan('view', $chapter)) {
+        if ($chapter && userCan(\BookStack\Permissions\Permission::View, $chapter)) {
             return redirect($chapter->getUrl());
         }
 
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 6503e63cfaf..10b9697ed13 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -87,7 +87,7 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
             throw new MoveOperationException('Book to move chapter into not found');
         }
 
-        if (!userCan('chapter-create', $parent)) {
+        if (!userCan(\BookStack\Permissions\Permission::ChapterCreate, $parent)) {
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 63e8b8370ee..4a9efd31dae 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -55,7 +55,7 @@ public function getNewDraftPage(Entity $parent)
         }
 
         $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
-        if ($defaultTemplate && userCan('view', $defaultTemplate)) {
+        if ($defaultTemplate && userCan(\BookStack\Permissions\Permission::View, $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
                 'markdown' => $defaultTemplate->markdown,
@@ -142,7 +142,7 @@ public function update(Page $page, array $input): Page
 
     protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void
     {
-        if (isset($input['template']) && userCan('templates-manage')) {
+        if (isset($input['template']) && userCan(\BookStack\Permissions\Permission::TemplatesManage)) {
             $page->template = ($input['template'] === 'true');
         }
 
@@ -165,7 +165,7 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
             $pageContent->setNewHTML($input['html'], user());
         }
 
-        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(\BookStack\Permissions\Permission::EditorChange)) {
             $page->editor = $newEditor->value;
         } elseif (empty($page->editor)) {
             $page->editor = $defaultEditor->value;
@@ -271,7 +271,7 @@ public function move(Page $page, string $parentIdentifier): Entity
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
-        if (!userCan('page-create', $parent)) {
+        if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 87aa770c047..0af25a2c129 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -49,7 +49,7 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
 
         $copyChapter = $this->chapterRepo->create($chapterDetails, $parent);
 
-        if (userCan('page-create', $copyChapter)) {
+        if (userCan(\BookStack\Permissions\Permission::PageCreate, $copyChapter)) {
             /** @var Page $page */
             foreach ($original->getVisiblePages() as $page) {
                 $this->clonePage($page, $copyChapter, $page->name);
@@ -74,11 +74,11 @@ public function cloneBook(Book $original, string $newName): Book
         // Clone contents
         $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
-            if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
+            if ($child instanceof Chapter && userCan(\BookStack\Permissions\Permission::ChapterCreate, $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
             }
 
-            if ($child instanceof Page && !$child->draft && userCan('page-create', $copyBook)) {
+            if ($child instanceof Page && !$child->draft && userCan(\BookStack\Permissions\Permission::PageCreate, $copyBook)) {
                 $this->clonePage($child, $copyBook, $child->name);
             }
         }
@@ -86,7 +86,7 @@ public function cloneBook(Book $original, string $newName): Book
         // Clone bookshelf relationships
         /** @var Bookshelf $shelf */
         foreach ($original->shelves as $shelf) {
-            if (userCan('bookshelf-update', $shelf)) {
+            if (userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf)) {
                 $shelf->appendBook($copyBook);
             }
         }
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index e4fe2fd25bb..fc32e9a434b 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -100,7 +100,7 @@ protected function getEditorType(Page $page): PageEditorType
 
         // Use requested editor if valid and if we have permission
         $requestedType = PageEditorType::fromRequestValue($this->requestedEditor);
-        if ($requestedType && userCan('editor-change')) {
+        if ($requestedType && userCan(\BookStack\Permissions\Permission::EditorChange)) {
             $editorType = $requestedType;
         }
 
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index 4ca53982a45..fbf92e2033e 100644
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -150,7 +150,7 @@ public function updateBookPermissionsFromShelf(Bookshelf $shelf, $checkUserPermi
 
         /** @var Book $book */
         foreach ($shelfBooks as $book) {
-            if ($checkUserPermissions && !userCan('restrictions-manage', $book)) {
+            if ($checkUserPermissions && !userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book)) {
                 continue;
             }
             $book->permissions()->delete();
diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index 87f1d7eef0e..21f276f8a4f 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -6,6 +6,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class BookExportApiController extends ApiController
@@ -14,7 +15,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
         protected BookQueries $queries,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
     }
 
     /**
diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index 67247598c31..f6bb66666dd 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -7,6 +7,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class BookExportController extends Controller
@@ -15,7 +16,7 @@ public function __construct(
         protected BookQueries $queries,
         protected ExportFormatter $exportFormatter,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
         $this->middleware('throttle:exports');
     }
 
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index bccd414af65..7e5a23c7059 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -6,6 +6,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class ChapterExportApiController extends ApiController
@@ -14,7 +15,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
         protected ChapterQueries $queries,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
     }
 
     /**
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index 8490243439a..fdb2bba9457 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -7,6 +7,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class ChapterExportController extends Controller
@@ -15,7 +16,7 @@ public function __construct(
         protected ChapterQueries $queries,
         protected ExportFormatter $exportFormatter,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
         $this->middleware('throttle:exports');
     }
 
diff --git a/app/Exports/Controllers/ImportApiController.php b/app/Exports/Controllers/ImportApiController.php
index cac155c7c1b..f8eaea5a131 100644
--- a/app/Exports/Controllers/ImportApiController.php
+++ b/app/Exports/Controllers/ImportApiController.php
@@ -8,6 +8,7 @@
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ImportRepo;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -18,7 +19,7 @@ class ImportApiController extends ApiController
     public function __construct(
         protected ImportRepo $imports,
     ) {
-        $this->middleware('can:content-import');
+        $this->middleware(Permission::ContentImport->middleware());
     }
 
     /**
diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index 0d3e2414bdd..7ecc09a4132 100644
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -8,6 +8,7 @@
 use BookStack\Exceptions\ZipValidationException;
 use BookStack\Exports\ImportRepo;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\AttachmentService;
 use Illuminate\Http\Request;
 
@@ -16,7 +17,7 @@ class ImportController extends Controller
     public function __construct(
         protected ImportRepo $imports,
     ) {
-        $this->middleware('can:content-import');
+        $this->middleware(Permission::ContentImport->middleware());
     }
 
     /**
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index 73af01afa52..c5b18628924 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -6,6 +6,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class PageExportApiController extends ApiController
@@ -14,7 +15,7 @@ public function __construct(
         protected ExportFormatter $exportFormatter,
         protected PageQueries $queries,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
     }
 
     /**
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 145dce9dd0f..9bc79f24751 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -8,6 +8,7 @@
 use BookStack\Exports\ExportFormatter;
 use BookStack\Exports\ZipExports\ZipExportBuilder;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Throwable;
 
 class PageExportController extends Controller
@@ -16,7 +17,7 @@ public function __construct(
         protected PageQueries $queries,
         protected ExportFormatter $exportFormatter,
     ) {
-        $this->middleware('can:content-export');
+        $this->middleware(Permission::ContentExport->middleware());
         $this->middleware('throttle:exports');
     }
 
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 896af903a6b..071fa532cbd 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -46,7 +46,7 @@ public function queryVisible(): Builder
     {
         $query = Import::query();
 
-        if (!userCan('settings-manage')) {
+        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
@@ -57,7 +57,7 @@ public function findVisible(int $id): Import
     {
         $query = Import::query();
 
-        if (!userCan('settings-manage')) {
+        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index b21248ffd8c..621076acc95 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -135,7 +135,7 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
             // Find and include images if in visibility
             $page = $model->getPage();
             $pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);
-            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan('view', $page))) {
+            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(\BookStack\Permissions\Permission::View, $page))) {
                 if (!isset($this->images[$model->id])) {
                     $exportImage = ZipExportImage::fromModel($model, $files);
                     $this->images[$model->id] = $exportImage;
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index d25a1621f6e..09a946609c8 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -288,7 +288,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         $attachments = [];
 
         if ($exportModel instanceof ZipExportBook) {
-            if (!userCan('book-create-all')) {
+            if (!userCan(\BookStack\Permissions\Permission::BookCreateAll)) {
                 $errors[] = trans('errors.import_perms_books');
             }
             array_push($pages, ...$exportModel->pages);
@@ -317,11 +317,11 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
 
         if (count($pages) > 0) {
             if ($parent) {
-                if (!userCan('page-create', $parent)) {
+                if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
             } else {
-                $hasPermission = userCan('page-create-all') || userCan('page-create-own');
+                $hasPermission = userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn);
                 if (!$hasPermission) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
@@ -329,13 +329,13 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         }
 
         if (count($images) > 0) {
-            if (!userCan('image-create-all')) {
+            if (!userCan(\BookStack\Permissions\Permission::ImageCreateAll)) {
                 $errors[] = trans('errors.import_perms_images');
             }
         }
 
         if (count($attachments) > 0) {
-            if (!userCan('attachment-create-all')) {
+            if (!userCan(\BookStack\Permissions\Permission::AttachmentCreateAll)) {
                 $errors[] = trans('errors.import_perms_attachments');
             }
         }
diff --git a/app/Permissions/Permission.php b/app/Permissions/Permission.php
index 492ca262188..a434e54fd61 100644
--- a/app/Permissions/Permission.php
+++ b/app/Permissions/Permission.php
@@ -132,4 +132,13 @@ public static function genericForEntity(): array
             self::Delete,
         ];
     }
+
+    /**
+     * Return the application permission-check middleware-string for this permission.
+     * Uses registered CheckUserHasPermission middleware.
+     */
+    public function middleware(): string
+    {
+        return 'can:' . $this->value;
+    }
 }
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index e627d66fdfe..e1fd17238c0 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -187,11 +187,11 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
 
         $hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));
         if ($model instanceof Chapter) {
-            $hasPermission = userCan('book-update', $currentParent)
-                && userCan('book-update', $newBook)
-                && userCan('chapter-update', $model)
-                && (!$hasNewParent || userCan('chapter-create', $newBook))
-                && (!$hasNewParent || userCan('chapter-delete', $model));
+            $hasPermission = userCan(\BookStack\Permissions\Permission::BookUpdate, $currentParent)
+                && userCan(\BookStack\Permissions\Permission::BookUpdate, $newBook)
+                && userCan(\BookStack\Permissions\Permission::ChapterUpdate, $model)
+                && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterCreate, $newBook))
+                && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterDelete, $model));
 
             if (!$hasPermission) {
                 return false;
@@ -210,13 +210,13 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
                 return false;
             }
 
-            $hasPageEditPermission = userCan('page-update', $model);
+            $hasPageEditPermission = userCan(\BookStack\Permissions\Permission::PageUpdate, $model);
             $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));
             $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
             $hasNewParentPermission = userCan($newParentPermission, $newParent);
 
-            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan('page-delete', $model));
-            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan('page-create', $newParent));
+            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageDelete, $model));
+            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageCreate, $newParent));
 
             $hasPermission = $hasCurrentParentPermission
                 && $newParentInRightLocation
diff --git a/app/Sorting/SortRuleController.php b/app/Sorting/SortRuleController.php
index a124ffa9c46..bb5540a2a50 100644
--- a/app/Sorting/SortRuleController.php
+++ b/app/Sorting/SortRuleController.php
@@ -4,13 +4,14 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
 
 class SortRuleController extends Controller
 {
     public function __construct()
     {
-        $this->middleware('can:settings-manage');
+        $this->middleware(Permission::SettingsManage->middleware());
     }
 
     public function create()
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
index aff27b3b141..c9b49b8909f 100644
--- a/app/Uploads/Controllers/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -82,7 +82,7 @@ public function getAsBase64($id)
             return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
         }
 
-        if ($image->type !== 'drawio' || !userCan('page-view', $image->getPage())) {
+        if ($image->type !== 'drawio' || !userCan(\BookStack\Permissions\Permission::PageView, $image->getPage())) {
             return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
         }
 
diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 54ca69c5d38..07e384b3a88 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -63,7 +63,7 @@ public function updateProfile(Request $request, ImageRepo $imageRepo)
             'profile_image'    => array_merge(['nullable'], $this->getImageValidationRules()),
         ]);
 
-        $this->userRepo->update($user, $validated, userCan('users-manage'));
+        $this->userRepo->update($user, $validated, userCan(\BookStack\Permissions\Permission::UsersManage));
 
         // Save profile image if in request
         if ($request->hasFile('profile_image')) {
@@ -219,7 +219,7 @@ public function destroy(Request $request)
         $this->preventAccessInDemoMode();
 
         $requestNewOwnerId = intval($request->get('new_owner_id')) ?: null;
-        $newOwnerId = userCan('users-manage') ? $requestNewOwnerId : null;
+        $newOwnerId = userCan(\BookStack\Permissions\Permission::UsersManage) ? $requestNewOwnerId : null;
 
         $this->userRepo->destroy(user(), $newOwnerId);
 
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 1efc825005a..28c4a387619 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -125,7 +125,7 @@ public function update(Request $request, string $id)
     {
         $data = $this->validate($request, $this->rules($id)['update']);
         $user = $this->userRepo->getById($id);
-        $this->userRepo->update($user, $data, userCan('users-manage'));
+        $this->userRepo->update($user, $data, userCan(\BookStack\Permissions\Permission::UsersManage));
         $this->singleFormatter($user);
 
         return response()->json($user);
diff --git a/app/Users/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.php
index b6f37bce08b..a6596046a10 100644
--- a/app/Users/Controllers/UserSearchController.php
+++ b/app/Users/Controllers/UserSearchController.php
@@ -15,9 +15,9 @@ class UserSearchController extends Controller
     public function forSelect(Request $request)
     {
         $hasPermission = !user()->isGuest() && (
-            userCan('users-manage')
-                || userCan('restrictions-manage-own')
-                || userCan('restrictions-manage-all')
+            userCan(\BookStack\Permissions\Permission::UsersManage)
+                || userCan(\BookStack\Permissions\Permission::RestrictionsManageOwn)
+                || userCan(\BookStack\Permissions\Permission::RestrictionsManageAll)
         );
 
         if (!$hasPermission) {
diff --git a/resources/views/attachments/manager-list.blade.php b/resources/views/attachments/manager-list.blade.php
index 6314aa7b5d7..10ede4aae25 100644
--- a/resources/views/attachments/manager-list.blade.php
+++ b/resources/views/attachments/manager-list.blade.php
@@ -16,7 +16,7 @@ class="card drag-card">
                         type="button"
                         title="{{ trans('entities.attachments_insert_link') }}"
                         class="drag-card-action text-center text-link">@icon('link')</button>
-                @if(userCan('attachment-update', $attachment))
+                @if(userCan(\BookStack\Permissions\Permission::AttachmentUpdate, $attachment))
                     <button component="event-emit-select"
                             option:event-emit-select:name="edit"
                             option:event-emit-select:id="{{ $attachment->id }}"
@@ -24,7 +24,7 @@ class="drag-card-action text-center text-link">@icon('link')</button>
                             title="{{ trans('common.edit') }}"
                             class="drag-card-action text-center text-link">@icon('edit')</button>
                 @endif
-                @if(userCan('attachment-delete', $attachment))
+                @if(userCan(\BookStack\Permissions\Permission::AttachmentDelete, $attachment))
                     <div component="dropdown" class="flex-fill relative">
                         <button refs="dropdown@toggle"
                                 type="button"
diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index 6efd1caea92..7f2c8c1b7db 100644
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -26,7 +26,7 @@
         </main>
 
 
-        @if(userCan('book-delete', $book) && userCan('book-create-all') && userCan('bookshelf-create-all'))
+        @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book) && userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
             @include('books.parts.convert-to-shelf', ['book' => $book])
         @endif
     </div>
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 197de011d01..52d23241a6f 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -36,7 +36,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(userCan('book-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
                 <a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.books_create') }}</span>
@@ -50,7 +50,7 @@
                 <span>{{ trans('entities.tags_view_tags') }}</span>
             </a>
 
-            @if(userCan('content-import'))
+            @if(userCan(\BookStack\Permissions\Permission::ContentImport))
                 <a href="{{ url('/import') }}" class="icon-list-item">
                     <span>@icon('upload')</span>
                     <span>{{ trans('entities.import') }}</span>
diff --git a/resources/views/books/parts/list.blade.php b/resources/views/books/parts/list.blade.php
index 8b658c711a1..13784d24e8d 100644
--- a/resources/views/books/parts/list.blade.php
+++ b/resources/views/books/parts/list.blade.php
@@ -24,7 +24,7 @@
         </div>
     @else
         <p class="text-muted">{{ trans('entities.books_empty') }}</p>
-        @if(userCan('book-create-all'))
+        @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
             <div class="icon-list block inline">
                 <a href="{{ url("/create-book") }}"
                    class="icon-list-item text-book">
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index dbb09fc9e87..e28d9564829 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -43,13 +43,13 @@
                     <p class="text-muted italic mb-m mt-xl">{{ trans('entities.books_empty_contents') }}</p>
 
                     <div class="icon-list block inline">
-                        @if(userCan('page-create', $book))
+                        @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))
                             <a href="{{ $book->getUrl('/create-page') }}" class="icon-list-item text-page">
                                 <span class="icon">@icon('page')</span>
                                 <span>{{ trans('entities.books_empty_create_page') }}</span>
                             </a>
                         @endif
-                        @if(userCan('chapter-create', $book))
+                        @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))
                             <a href="{{ $book->getUrl('/create-chapter') }}" class="icon-list-item text-chapter">
                                 <span class="icon">@icon('chapter')</span>
                                 <span>{{ trans('entities.books_empty_add_chapter') }}</span>
@@ -73,7 +73,7 @@
             @include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions])
             @if($book->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $book))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
                         <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.books_permissions_active') }}</div>
@@ -93,13 +93,13 @@
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
 
-            @if(userCan('page-create', $book))
+            @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))
                 <a href="{{ $book->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.pages_new') }}</span>
                 </a>
             @endif
-            @if(userCan('chapter-create', $book))
+            @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))
                 <a href="{{ $book->getUrl('/create-chapter') }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.chapters_new') }}</span>
@@ -108,7 +108,7 @@
 
             <hr class="primary-background">
 
-            @if(userCan('book-update', $book))
+            @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))
                 <a href="{{ $book->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
                     <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
@@ -118,19 +118,19 @@
                     <span>{{ trans('common.sort') }}</span>
                 </a>
             @endif
-            @if(userCan('book-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
                 <a href="{{ $book->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
             @endif
-            @if(userCan('restrictions-manage', $book))
+            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
                 <a href="{{ $book->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
                     <span>@icon('lock')</span>
                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
-            @if(userCan('book-delete', $book))
+            @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book))
                 <a href="{{ $book->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
                     <span>@icon('delete')</span>
                     <span>{{ trans('common.delete') }}</span>
@@ -145,7 +145,7 @@
             @if(!user()->isGuest())
                 @include('entities.favourite-action', ['entity' => $book])
             @endif
-            @if(userCan('content-export'))
+            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
                 @include('entities.export-menu', ['entity' => $book])
             @endif
         </div>
diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 36058eff83b..5ace966f584 100644
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -23,7 +23,7 @@
             </form>
         </main>
 
-        @if(userCan('chapter-delete', $chapter) && userCan('book-create-all'))
+        @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter) && userCan(\BookStack\Permissions\Permission::BookCreateAll))
             @include('chapters.parts.convert-to-book')
         @endif
 
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 45e43ad96a9..da914b32d21 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -37,13 +37,13 @@
                     <p class="text-muted italic mb-m mt-xl">{{ trans('entities.chapters_empty') }}</p>
 
                     <div class="icon-list block inline">
-                        @if(userCan('page-create', $chapter))
+                        @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))
                             <a href="{{ $chapter->getUrl('/create-page') }}" class="icon-list-item text-page">
                                 <span class="icon">@icon('page')</span>
                                 <span>{{ trans('entities.books_empty_create_page') }}</span>
                             </a>
                         @endif
-                        @if(userCan('book-update', $book))
+                        @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))
                             <a href="{{ $book->getUrl('/sort') }}" class="icon-list-item text-book">
                                 <span class="icon">@icon('book')</span>
                                 <span>{{ trans('entities.books_empty_sort_current_book') }}</span>
@@ -71,7 +71,7 @@
 
             @if($book->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $book))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
                         <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.books_permissions_active') }}</div>
@@ -87,7 +87,7 @@
 
             @if($chapter->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $chapter))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
                         <a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.chapters_permissions_active') }}</div>
@@ -107,7 +107,7 @@
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
 
-            @if(userCan('page-create', $chapter))
+            @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))
                 <a href="{{ $chapter->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.pages_new') }}</span>
@@ -116,38 +116,38 @@
 
             <hr class="primary-background"/>
 
-            @if(userCan('chapter-update', $chapter))
+            @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter))
                 <a href="{{ $chapter->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
                     <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
-            @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCan('chapter-create-all') || userCan('chapter-create-own'))
+            @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCan(\BookStack\Permissions\Permission::ChapterCreateAll) || userCan(\BookStack\Permissions\Permission::ChapterCreateOwn))
                 <a href="{{ $chapter->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
             @endif
-            @if(userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter))
+            @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter) && userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
                 <a href="{{ $chapter->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
                     <span>@icon('folder')</span>
                     <span>{{ trans('common.move') }}</span>
                 </a>
             @endif
-            @if(userCan('restrictions-manage', $chapter))
+            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
                 <a href="{{ $chapter->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
                     <span>@icon('lock')</span>
                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
-            @if(userCan('chapter-delete', $chapter))
+            @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
                 <a href="{{ $chapter->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
                     <span>@icon('delete')</span>
                     <span>{{ trans('common.delete') }}</span>
                 </a>
             @endif
 
-            @if($chapter->book && userCan('book-update', $chapter->book))
+            @if($chapter->book && userCan(\BookStack\Permissions\Permission::BookUpdate, $chapter->book))
                 <hr class="primary-background"/>
                 <a href="{{ $chapter->book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
                     <span>@icon('sort')</span>
@@ -163,7 +163,7 @@
             @if(!user()->isGuest())
                 @include('entities.favourite-action', ['entity' => $chapter])
             @endif
-            @if(userCan('content-export'))
+            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
                 @include('entities.export-menu', ['entity' => $chapter])
             @endif
         </div>
diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index 67aac720357..10cd02035fd 100644
--- a/resources/views/comments/comment.blade.php
+++ b/resources/views/comments/comment.blade.php
@@ -33,23 +33,23 @@ class="comment-box">
                 @endif
             </div>
             <div class="right-meta flex-container-row justify-flex-end items-center px-s">
-                @if(!$readOnly && (userCan('comment-create-all') || userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
+                @if(!$readOnly && (userCan(\BookStack\Permissions\Permission::CommentCreateAll) || userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment) || userCan(\BookStack\Permissions\Permission::CommentDelete, $comment)))
                     <div class="actions mr-s">
-                        @if(userCan('comment-create-all'))
+                        @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll))
                             <button refs="page-comment@reply-button" type="button"
                                     class="text-button text-muted hover-underline text-small p-xs">@icon('reply') {{ trans('common.reply') }}</button>
                         @endif
-                        @if(!$comment->parent_id && (userCan('comment-update', $comment) || userCan('comment-delete', $comment)))
+                        @if(!$comment->parent_id && (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment) || userCan(\BookStack\Permissions\Permission::CommentDelete, $comment)))
                             <button refs="page-comment@archive-button"
                                     type="button"
                                     data-is-archived="{{ $comment->archived ? 'true' : 'false' }}"
                                     class="text-button text-muted hover-underline text-small p-xs">@icon('archive') {{ trans('common.' . ($comment->archived ? 'unarchive' : 'archive')) }}</button>
                         @endif
-                        @if(userCan('comment-update', $comment))
+                        @if(userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment))
                             <button refs="page-comment@edit-button" type="button"
                                     class="text-button text-muted hover-underline text-small p-xs">@icon('edit') {{ trans('common.edit') }}</button>
                         @endif
-                        @if(userCan('comment-delete', $comment))
+                        @if(userCan(\BookStack\Permissions\Permission::CommentDelete, $comment))
                             <div component="dropdown" class="dropdown-container">
                                 <button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false"
                                         class="text-button text-muted hover-underline text-small p-xs">@icon('delete') {{ trans('common.delete') }}</button>
@@ -100,7 +100,7 @@ class="text-button text-neg icon-item">
         {!! $commentHtml  !!}
     </div>
 
-    @if(!$readOnly && userCan('comment-update', $comment))
+    @if(!$readOnly && userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment))
         <form novalidate refs="page-comment@form" hidden class="content pt-s px-s block">
             <div class="form-group description-input">
                 <textarea refs="page-comment@input" name="html" rows="3"
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index a5f0168a5c8..9dc0a9b8982 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -22,7 +22,7 @@ class="comments-list tab-container"
                     refs="page-comments@archived-tab"
                     aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
         </div>
-        @if ($commentTree->empty() && userCan('comment-create-all'))
+        @if ($commentTree->empty() && userCan(\BookStack\Permissions\Permission::CommentCreateAll))
             <div refs="page-comments@add-button-container" class="ml-m flex-container-row" >
                 <button type="button"
                         refs="page-comments@add-comment-button"
@@ -45,7 +45,7 @@ class="comment-container no-outline">
 
         <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>
 
-        @if(userCan('comment-create-all'))
+        @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll))
             @include('comments.create')
             @if (!$commentTree->empty())
                 <div refs="page-comments@addButtonContainer" class="ml-m flex-container-row">
@@ -70,7 +70,7 @@ class="comment-container no-outline">
             <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>
     </div>
 
-    @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
+    @if(userCan(\BookStack\Permissions\Permission::CommentCreateAll) || $commentTree->canUpdateAny())
         @push('body-end')
             @include('form.editor-translations')
             @include('entities.selector-popup')
diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.php
index ce016143a30..bcc52130671 100644
--- a/resources/views/entities/book-tree.blade.php
+++ b/resources/views/entities/book-tree.blade.php
@@ -5,7 +5,7 @@ class="book-tree mb-xl"
     <h5>{{ trans('entities.books_navigation') }}</h5>
 
     <ul class="sidebar-page-list mt-xs menu entity-list">
-        @if (userCan('view', $book))
+        @if (userCan(\BookStack\Permissions\Permission::View, $book))
             <li class="list-item-book book">
                 @include('entities.list-item-basic', ['entity' => $book, 'classes' => ($current->matches($book)? 'selected' : '')])
             </li>
diff --git a/resources/views/entities/breadcrumbs.blade.php b/resources/views/entities/breadcrumbs.blade.php
index d078d987322..825909947a3 100644
--- a/resources/views/entities/breadcrumbs.blade.php
+++ b/resources/views/entities/breadcrumbs.blade.php
@@ -38,7 +38,7 @@
                 <span>@icon($crumb['icon'])</span>
                 <span>{{ $crumb['text'] }}</span>
             </a>
-        @elseif($isEntity && userCan('view', $crumb))
+        @elseif($isEntity && userCan(\BookStack\Permissions\Permission::View, $crumb))
             @if($breadcrumbCount > 0)
                 @include('entities.breadcrumb-listing', ['entity' => $crumb])
             @endif
diff --git a/resources/views/home/books.blade.php b/resources/views/home/books.blade.php
index e0d2aeb1cc9..afd3f30fce2 100644
--- a/resources/views/home/books.blade.php
+++ b/resources/views/home/books.blade.php
@@ -12,7 +12,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(userCan('book-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
                 <a href="{{ url("/create-book") }}" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.books_create') }}</span>
diff --git a/resources/views/home/shelves.blade.php b/resources/views/home/shelves.blade.php
index dd2c81b1616..7a4d002a0ac 100644
--- a/resources/views/home/shelves.blade.php
+++ b/resources/views/home/shelves.blade.php
@@ -12,7 +12,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(userCan('bookshelf-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
                 <a href="{{ url("/create-shelf") }}" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.shelves_new_action') }}</span>
diff --git a/resources/views/layouts/parts/header-links.blade.php b/resources/views/layouts/parts/header-links.blade.php
index 697f406c30e..c3d2f58da17 100644
--- a/resources/views/layouts/parts/header-links.blade.php
+++ b/resources/views/layouts/parts/header-links.blade.php
@@ -2,16 +2,16 @@
 
 @if (user()->hasAppAccess())
     <a class="hide-over-l" href="{{ url('/search') }}">@icon('search'){{ trans('common.search') }}</a>
-    @if(userCanOnAny('view', \BookStack\Entities\Models\Bookshelf::class) || userCan('bookshelf-view-all') || userCan('bookshelf-view-own'))
+    @if(userCanOnAny(\BookStack\Permissions\Permission::View, \BookStack\Entities\Models\Bookshelf::class) || userCan(\BookStack\Permissions\Permission::BookshelfViewAll) || userCan(\BookStack\Permissions\Permission::BookshelfViewOwn))
         <a href="{{ url('/shelves') }}"
            data-shortcut="shelves_view">@icon('bookshelf'){{ trans('entities.shelves') }}</a>
     @endif
     <a href="{{ url('/books') }}" data-shortcut="books_view">@icon('books'){{ trans('entities.books') }}</a>
-    @if(!user()->isGuest() && userCan('settings-manage'))
+    @if(!user()->isGuest() && userCan(\BookStack\Permissions\Permission::SettingsManage))
         <a href="{{ url('/settings') }}"
            data-shortcut="settings_view">@icon('settings'){{ trans('settings.settings') }}</a>
     @endif
-    @if(!user()->isGuest() && userCan('users-manage') && !userCan('settings-manage'))
+    @if(!user()->isGuest() && userCan(\BookStack\Permissions\Permission::UsersManage) && !userCan(\BookStack\Permissions\Permission::SettingsManage))
         <a href="{{ url('/settings/users') }}"
            data-shortcut="settings_view">@icon('users'){{ trans('settings.users') }}</a>
     @endif
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index ceb5dd64a7e..a3ea58374d9 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -50,7 +50,7 @@ class="text-link icon-list-item">
                         <div>{{ trans('entities.pages_edit_delete_draft') }}</div>
                     </button>
                 </li>
-                @if(userCan('editor-change'))
+                @if(userCan(\BookStack\Permissions\Permission::EditorChange))
                     <li role="presentation">
                         <hr>
                     </li>
diff --git a/resources/views/pages/parts/editor-toolbox.blade.php b/resources/views/pages/parts/editor-toolbox.blade.php
index 4ecac26a589..8b7a68a9aa7 100644
--- a/resources/views/pages/parts/editor-toolbox.blade.php
+++ b/resources/views/pages/parts/editor-toolbox.blade.php
@@ -4,7 +4,7 @@
         <div class="tabs-inner flex-container-column justify-center">
             <button type="button" refs="editor-toolbox@toggle" title="{{ trans('entities.toggle_sidebar') }}" aria-expanded="false" class="toolbox-toggle">@icon('caret-left-circle')</button>
             <button type="button" refs="editor-toolbox@tab-button" data-tab="tags" title="{{ trans('entities.page_tags') }}" class="active">@icon('tag')</button>
-            @if(userCan('attachment-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::AttachmentCreateAll))
                 <button type="button" refs="editor-toolbox@tab-button" data-tab="files" title="{{ trans('entities.attachments') }}">@icon('attach')</button>
             @endif
             <button type="button" refs="editor-toolbox@tab-button" data-tab="templates" title="{{ trans('entities.templates') }}">@icon('template')</button>
@@ -21,7 +21,7 @@
         </div>
     </div>
 
-    @if(userCan('attachment-create-all'))
+    @if(userCan(\BookStack\Permissions\Permission::AttachmentCreateAll))
         @include('attachments.manager', ['page' => $page])
     @endif
 
diff --git a/resources/views/pages/parts/image-manager-form.blade.php b/resources/views/pages/parts/image-manager-form.blade.php
index 452a0aaa166..2850caba9f3 100644
--- a/resources/views/pages/parts/image-manager-form.blade.php
+++ b/resources/views/pages/parts/image-manager-form.blade.php
@@ -38,17 +38,17 @@ class="anim fadeIn"
             <input id="name" class="input-base" type="text" name="name" value="{{ $image->name }}">
         </div>
         <div class="flex-container-row justify-space-between gap-m">
-            @if(userCan('image-delete', $image) || userCan('image-update', $image))
+            @if(userCan(\BookStack\Permissions\Permission::ImageDelete, $image) || userCan(\BookStack\Permissions\Permission::ImageUpdate, $image))
                 <div component="dropdown"
                      class="dropdown-container">
                     <button refs="dropdown@toggle" type="button" class="button icon outline">@icon('more')</button>
                     <div refs="dropdown@menu" class="dropdown-menu anchor-left">
-                        @if(userCan('image-delete', $image))
+                        @if(userCan(\BookStack\Permissions\Permission::ImageDelete, $image))
                             <button type="button"
                                     id="image-manager-delete"
                                     class="text-item">{{ trans('common.delete') }}</button>
                         @endif
-                        @if(userCan('image-update', $image))
+                        @if(userCan(\BookStack\Permissions\Permission::ImageUpdate, $image))
                             <button type="button"
                                     id="image-manager-replace"
                                     refs="dropzone@select-button"
@@ -105,7 +105,7 @@ class="text-neg">{{ $page->name }}</a>
         @if($image->createdBy)
             <div>@icon('user') {{ trans('components.image_uploaded_by', ['userName' => $image->createdBy->name]) }}</div>
         @endif
-        @if(($page = $image->getPage()) && userCan('view', $page))
+        @if(($page = $image->getPage()) && userCan(\BookStack\Permissions\Permission::View, $page))
             <div>
                 @icon('page')
                 {!! trans('components.image_uploaded_to', [
diff --git a/resources/views/pages/parts/pointer.blade.php b/resources/views/pages/parts/pointer.blade.php
index f6487b66600..6a40c86f02b 100644
--- a/resources/views/pages/parts/pointer.blade.php
+++ b/resources/views/pages/parts/pointer.blade.php
@@ -26,11 +26,11 @@ class="text-button icon px-xs">@icon('include')</button>
                 </div>
             </div>
             <div>
-                @if(userCan('page-update', $page))
+                @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
                     <a href="{{ $page->getUrl('/edit') }}" id="pointer-edit" data-edit-href="{{ $page->getUrl('/edit') }}"
                        class="button primary outline icon heading-edit-icon px-xs" title="{{ trans('entities.pages_edit_content_link')}}">@icon('edit')</a>
                 @endif
-                @if($commentTree->enabled() && userCan('comment-create-all'))
+                @if($commentTree->enabled() && userCan(\BookStack\Permissions\Permission::CommentCreateAll))
                     <button type="button"
                             refs="pointer@comment-button"
                             class="button primary outline icon px-xs m-none" title="{{ trans('entities.comment_add')}}">@icon('comment')</button>
diff --git a/resources/views/pages/parts/revisions-index-row.blade.php b/resources/views/pages/parts/revisions-index-row.blade.php
index 19b924763c3..749cfb763e7 100644
--- a/resources/views/pages/parts/revisions-index-row.blade.php
+++ b/resources/views/pages/parts/revisions-index-row.blade.php
@@ -38,7 +38,7 @@
         @else
             <a href="{{ $revision->getUrl() }}" target="_blank" rel="noopener">{{ trans('entities.pages_revisions_preview') }}</a>
 
-            @if(userCan('page-update', $revision->page))
+            @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $revision->page))
                 <span class="text-muted opacity-70">&nbsp;|&nbsp;</span>
                 <div component="dropdown" class="dropdown-container">
                     <a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('entities.pages_revisions_restore') }}</a>
@@ -58,7 +58,7 @@
                 </div>
             @endif
 
-            @if(userCan('page-delete', $revision->page))
+            @if(userCan(\BookStack\Permissions\Permission::PageDelete, $revision->page))
                 <span class="text-muted opacity-70">&nbsp;|&nbsp;</span>
                 <div component="dropdown" class="dropdown-container">
                     <a refs="dropdown@toggle" href="#" aria-haspopup="true" aria-expanded="false">{{ trans('common.delete') }}</a>
diff --git a/resources/views/pages/parts/template-manager.blade.php b/resources/views/pages/parts/template-manager.blade.php
index ee4467552e4..fffc81b56e1 100644
--- a/resources/views/pages/parts/template-manager.blade.php
+++ b/resources/views/pages/parts/template-manager.blade.php
@@ -1,5 +1,5 @@
 <div component="template-manager">
-    @if(userCan('templates-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::TemplatesManage))
         <p class="text-muted small mb-none">
             {{ trans('entities.templates_explain_set_as_template') }}
         </p>
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 137d43bdb1a..2216cfd1f9c 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -79,7 +79,7 @@ class="page-content clearfix">
 
             @if($book->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $book))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
                         <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.books_permissions_active') }}</div>
@@ -95,7 +95,7 @@ class="page-content clearfix">
 
             @if($page->chapter && $page->chapter->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $page->chapter))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page->chapter))
                         <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.chapters_permissions_active') }}</div>
@@ -111,7 +111,7 @@ class="page-content clearfix">
 
             @if($page->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $page))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
                         <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.pages_permissions_active') }}</div>
@@ -140,20 +140,20 @@ class="page-content clearfix">
         <div class="icon-list text-link">
 
             {{--User Actions--}}
-            @if(userCan('page-update', $page))
+            @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
                 <a href="{{ $page->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
                     <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
-            @if(userCanOnAny('create', \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan('page-create-all') || userCan('page-create-own'))
+            @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn))
                 <a href="{{ $page->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>
                 </a>
             @endif
-            @if(userCan('page-update', $page))
-                @if(userCan('page-delete', $page))
+            @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
+                @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
 	                <a href="{{ $page->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
 	                    <span>@icon('folder')</span>
 	                    <span>{{ trans('common.move') }}</span>
@@ -164,13 +164,13 @@ class="page-content clearfix">
                 <span>@icon('history')</span>
                 <span>{{ trans('entities.revisions') }}</span>
             </a>
-            @if(userCan('restrictions-manage', $page))
+            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
                 <a href="{{ $page->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
                     <span>@icon('lock')</span>
                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
-            @if(userCan('page-delete', $page))
+            @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
                 <a href="{{ $page->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
                     <span>@icon('delete')</span>
                     <span>{{ trans('common.delete') }}</span>
@@ -185,7 +185,7 @@ class="page-content clearfix">
             @if(!user()->isGuest())
                 @include('entities.favourite-action', ['entity' => $page])
             @endif
-            @if(userCan('content-export'))
+            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
                 @include('entities.export-menu', ['entity' => $page])
             @endif
         </div>
diff --git a/resources/views/settings/categories/features.blade.php b/resources/views/settings/categories/features.blade.php
index 5935e21f549..d451a0ba35e 100644
--- a/resources/views/settings/categories/features.blade.php
+++ b/resources/views/settings/categories/features.blade.php
@@ -13,7 +13,7 @@
                 <div>
                     <label for="setting-app-public" class="setting-list-label">{{ trans('settings.app_public_access') }}</label>
                     <p class="small">{!! trans('settings.app_public_access_desc') !!}</p>
-                    @if(userCan('users-manage'))
+                    @if(userCan(\BookStack\Permissions\Permission::UsersManage))
                         <p class="small mb-none">
                             <a href="{{ url($guestUser->getEditUrl()) }}">{!! trans('settings.app_public_access_desc_guest') !!}</a>
                         </p>
diff --git a/resources/views/settings/parts/navbar.blade.php b/resources/views/settings/parts/navbar.blade.php
index e229f5e654f..cda8bdae0c1 100644
--- a/resources/views/settings/parts/navbar.blade.php
+++ b/resources/views/settings/parts/navbar.blade.php
@@ -1,19 +1,19 @@
 
 <nav class="active-link-list py-m flex-container-row justify-center wrap">
-    @if(userCan('settings-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::SettingsManage))
         <a href="{{ url('/settings') }}" @if($selected == 'settings') class="active" @endif>@icon('settings'){{ trans('settings.settings') }}</a>
         <a href="{{ url('/settings/maintenance') }}" @if($selected == 'maintenance') class="active" @endif>@icon('spanner'){{ trans('settings.maint') }}</a>
     @endif
-    @if(userCan('settings-manage') && userCan('users-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::SettingsManage) && userCan(\BookStack\Permissions\Permission::UsersManage))
         <a href="{{ url('/settings/audit') }}" @if($selected == 'audit') class="active" @endif>@icon('open-book'){{ trans('settings.audit') }}</a>
     @endif
-    @if(userCan('users-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::UsersManage))
         <a href="{{ url('/settings/users') }}" @if($selected == 'users') class="active" @endif>@icon('users'){{ trans('settings.users') }}</a>
     @endif
-    @if(userCan('user-roles-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::UserRolesManage))
         <a href="{{ url('/settings/roles') }}" @if($selected == 'roles') class="active" @endif>@icon('lock-open'){{ trans('settings.roles') }}</a>
     @endif
-    @if(userCan('settings-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::SettingsManage))
         <a href="{{ url('/settings/webhooks') }}" @if($selected == 'webhooks') class="active" @endif>@icon('webhooks'){{ trans('settings.webhooks') }}</a>
     @endif
 </nav>
\ No newline at end of file
diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php
index bd1dbb76322..da7835e1a02 100644
--- a/resources/views/settings/roles/edit.blade.php
+++ b/resources/views/settings/roles/edit.blade.php
@@ -35,11 +35,11 @@
                                 <img class="avatar small" src="{{ $user->getAvatar(40) }}" alt="{{ $user->name }}">
                             </div>
                             <div>
-                                @if(userCan('users-manage') || user()->id == $user->id)
+                                @if(userCan(\BookStack\Permissions\Permission::UsersManage) || user()->id == $user->id)
                                     <a href="{{ url("/settings/users/{$user->id}") }}">
                                         @endif
                                         {{ $user->name }}
-                                        @if(userCan('users-manage') || user()->id == $user->id)
+                                        @if(userCan(\BookStack\Permissions\Permission::UsersManage) || user()->id == $user->id)
                                     </a>
                                 @endif
                             </div>
diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index 85663b41307..bb7c57e0fde 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -9,7 +9,7 @@
     <div class="actions mb-xl">
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
-            @if(userCan('bookshelf-create-all'))
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
                 <a href="{{ url("/create-shelf") }}" data-shortcut="new" class="icon-list-item">
                     <span>@icon('add')</span>
                     <span>{{ trans('entities.shelves_new_action') }}</span>
diff --git a/resources/views/shelves/parts/list.blade.php b/resources/views/shelves/parts/list.blade.php
index 7f6e02a8b7c..5be5a7bb6c4 100644
--- a/resources/views/shelves/parts/list.blade.php
+++ b/resources/views/shelves/parts/list.blade.php
@@ -29,7 +29,7 @@
         </div>
     @else
         <p class="text-muted">{{ trans('entities.shelves_empty') }}</p>
-        @if(userCan('bookshelf-create-all'))
+        @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
             <div class="icon-list block inline">
                 <a href="{{ url("/create-shelf") }}"
                    class="icon-list-item text-bookshelf">
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 11baccaf463..633f959f3c9 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -48,13 +48,13 @@
                     <hr>
                     <p class="text-muted italic mt-xl mb-m">{{ trans('entities.shelves_empty_contents') }}</p>
                     <div class="icon-list inline block">
-                        @if(userCan('book-create-all') && userCan('bookshelf-update', $shelf))
+                        @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
                             <a href="{{ $shelf->getUrl('/create-book') }}" class="icon-list-item text-book">
                                 <span class="icon">@icon('add')</span>
                                 <span>{{ trans('entities.books_create') }}</span>
                             </a>
                         @endif
-                        @if(userCan('bookshelf-update', $shelf))
+                        @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
                             <a href="{{ $shelf->getUrl('/edit') }}" class="icon-list-item text-bookshelf">
                                 <span class="icon">@icon('edit')</span>
                                 <span>{{ trans('entities.shelves_edit_and_assign') }}</span>
@@ -82,7 +82,7 @@
             @include('entities.meta', ['entity' => $shelf, 'watchOptions' => null])
             @if($shelf->hasPermissions())
                 <div class="active-restriction">
-                    @if(userCan('restrictions-manage', $shelf))
+                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
                         <a href="{{ $shelf->getUrl('/permissions') }}" class="entity-meta-item">
                             @icon('lock')
                             <div>{{ trans('entities.shelves_permissions_active') }}</div>
@@ -111,7 +111,7 @@
         <h5>{{ trans('common.actions') }}</h5>
         <div class="icon-list text-link">
 
-            @if(userCan('book-create-all') && userCan('bookshelf-update', $shelf))
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
                 <a href="{{ $shelf->getUrl('/create-book') }}" data-shortcut="new" class="icon-list-item">
                     <span class="icon">@icon('add')</span>
                     <span>{{ trans('entities.books_new_action') }}</span>
@@ -122,21 +122,21 @@
 
             <hr class="primary-background">
 
-            @if(userCan('bookshelf-update', $shelf))
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
                 <a href="{{ $shelf->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
                     <span>@icon('edit')</span>
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
 
-            @if(userCan('restrictions-manage', $shelf))
+            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
                 <a href="{{ $shelf->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
                     <span>@icon('lock')</span>
                     <span>{{ trans('entities.permissions') }}</span>
                 </a>
             @endif
 
-            @if(userCan('bookshelf-delete', $shelf))
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfDelete, $shelf))
                 <a href="{{ $shelf->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
                     <span>@icon('delete')</span>
                     <span>{{ trans('common.delete') }}</span>
diff --git a/resources/views/users/account/auth.blade.php b/resources/views/users/account/auth.blade.php
index d6f85093bf3..57e6c1f9cb3 100644
--- a/resources/views/users/account/auth.blade.php
+++ b/resources/views/users/account/auth.blade.php
@@ -81,7 +81,7 @@ class="button small outline">{{ trans('settings.users_social_connect') }}</a>
         </section>
     @endif
 
-    @if(userCan('access-api'))
+    @if(userCan(\BookStack\Permissions\Permission::AccessApi))
         @include('users.api-tokens.parts.list', ['user' => user(), 'context' => 'my-account'])
     @endif
 @stop
diff --git a/resources/views/users/account/delete.blade.php b/resources/views/users/account/delete.blade.php
index 75698d91994..aa051e9adc5 100644
--- a/resources/views/users/account/delete.blade.php
+++ b/resources/views/users/account/delete.blade.php
@@ -12,7 +12,7 @@
 
             <p>{{ trans('preferences.delete_my_account_desc') }}</p>
 
-            @if(userCan('users-manage'))
+            @if(userCan(\BookStack\Permissions\Permission::UsersManage))
                 <hr class="my-l">
 
                 <div class="grid half gap-xl v-center">
diff --git a/resources/views/users/account/layout.blade.php b/resources/views/users/account/layout.blade.php
index f54a51c5ac8..df8ebc2d904 100644
--- a/resources/views/users/account/layout.blade.php
+++ b/resources/views/users/account/layout.blade.php
@@ -12,7 +12,7 @@
                         <a href="{{ url('/my-account/profile') }}" class="{{ $category === 'profile' ? 'active' : '' }}">@icon('user') {{ trans('preferences.profile') }}</a>
                         <a href="{{ url('/my-account/auth') }}" class="{{ $category === 'auth' ? 'active' : '' }}">@icon('security') {{ trans('preferences.auth') }}</a>
                         <a href="{{ url('/my-account/shortcuts') }}" class="{{ $category === 'shortcuts' ? 'active' : '' }}">@icon('shortcuts') {{ trans('preferences.shortcuts_interface') }}</a>
-                        @if(userCan('receive-notifications'))
+                        @if(userCan(\BookStack\Permissions\Permission::ReceiveNotifications))
                             <a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>
                         @endif
                     </nav>
diff --git a/resources/views/users/account/profile.blade.php b/resources/views/users/account/profile.blade.php
index 617c0972302..778e35885f6 100644
--- a/resources/views/users/account/profile.blade.php
+++ b/resources/views/users/account/profile.blade.php
@@ -35,10 +35,10 @@
                             <p class="text-small mb-none">{{ trans('preferences.profile_email_desc') }}</p>
                         </div>
                         <div class="flex stretch-inputs">
-                            @include('form.text', ['name' => 'email', 'disabled' => !userCan('users-manage')])
+                            @include('form.text', ['name' => 'email', 'disabled' => !userCan(\BookStack\Permissions\Permission::UsersManage)])
                         </div>
                     </div>
-                    @if(!userCan('users-manage'))
+                    @if(!userCan(\BookStack\Permissions\Permission::UsersManage))
                         <p class="text-small text-muted">{{ trans('preferences.profile_email_no_permission') }}</p>
                     @endif
                 </div>
@@ -75,7 +75,7 @@ class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
         </form>
     </section>
 
-    @if(userCan('users-manage'))
+    @if(userCan(\BookStack\Permissions\Permission::UsersManage))
         <section class="card content-wrap auto-height">
             <div class="flex-container-row gap-l items-center wrap">
                 <div class="flex">
diff --git a/resources/views/users/api-tokens/parts/list.blade.php b/resources/views/users/api-tokens/parts/list.blade.php
index 70aaa58f3f6..bd8dd53cc35 100644
--- a/resources/views/users/api-tokens/parts/list.blade.php
+++ b/resources/views/users/api-tokens/parts/list.blade.php
@@ -2,7 +2,7 @@
     <div class="flex-container-row wrap justify-space-between items-center mb-s">
         <h2 class="list-heading">{{ trans('settings.users_api_tokens') }}</h2>
         <div class="text-right pt-xs">
-            @if(userCan('access-api'))
+            @if(userCan(\BookStack\Permissions\Permission::AccessApi))
                 <a href="{{ url('/api/docs') }}" class="button outline">{{ trans('settings.users_api_tokens_docs') }}</a>
                 <a href="{{ url('/api-tokens/' . $user->id . '/create?context=' . $context) }}" class="button outline">{{ trans('settings.users_api_tokens_create') }}</a>
             @endif
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index dafc623e120..daffc91a39d 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -18,7 +18,7 @@
                 </div>
 
                 <div class="form-group text-right">
-                    <a href="{{  url(userCan('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <a href="{{  url(userCan(\BookStack\Permissions\Permission::UsersManage) ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
                     <button class="button" type="submit">{{ trans('common.save') }}</button>
                 </div>
 
diff --git a/resources/views/users/parts/form.blade.php b/resources/views/users/parts/form.blade.php
index bf1eb08a760..86287646f05 100644
--- a/resources/views/users/parts/form.blade.php
+++ b/resources/views/users/parts/form.blade.php
@@ -17,9 +17,9 @@
             @include('form.text', ['name' => 'name'])
         </div>
         <div>
-            @if($authMethod !== 'ldap' || userCan('users-manage'))
+            @if($authMethod !== 'ldap' || userCan(\BookStack\Permissions\Permission::UsersManage))
                 <label for="email">{{ trans('auth.email') }}</label>
-                @include('form.text', ['name' => 'email', 'disabled' => !userCan('users-manage')])
+                @include('form.text', ['name' => 'email', 'disabled' => !userCan(\BookStack\Permissions\Permission::UsersManage)])
             @endif
         </div>
     </div>
diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index 43d0cfc5063..ec2756b1213 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Exception;
@@ -25,7 +26,7 @@ protected function setUp(): void
         $this->viewer = $this->users->viewer();
     }
 
-    protected function setRestrictionsForTestRoles(Entity $entity, array $actions = [])
+    protected function setRestrictionsForTestRoles(Entity $entity, array $actions = []): void
     {
         $roles = [
             $this->user->roles->first(),
@@ -676,7 +677,7 @@ public function test_access_to_item_prevented_if_inheritance_active_but_permissi
         $this->permissions->setEntityPermissions($book, ['update'], [$viewerRole], false);
         $this->permissions->setEntityPermissions($chapter, [], [$viewerRole], true);
 
-        $this->assertFalse(userCan('chapter-update', $chapter));
+        $this->assertFalse(userCan(Permission::ChapterUpdate, $chapter));
     }
 
     public function test_access_to_item_allowed_if_inheritance_active_and_permission_prevented_via_role_but_allowed_via_parent()
@@ -692,7 +693,7 @@ public function test_access_to_item_allowed_if_inheritance_active_and_permission
         $this->permissions->setEntityPermissions($chapter, [], [$viewerRole], true);
 
         $this->actingAs($user);
-        $this->assertTrue(userCan('chapter-update', $chapter));
+        $this->assertTrue(userCan(Permission::ChapterUpdate, $chapter));
     }
 
     public function test_book_permissions_can_be_generated_without_error_if_child_chapter_is_in_recycle_bin()

From 573d692a59d97f34e171a7d42527de36a5b8a014 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 10 Sep 2025 10:44:54 +0100
Subject: [PATCH 664/666] Permissions: Fixed check method to allow enum usage

---
 app/Permissions/PermissionApplicator.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php
index 47f30c8f949..23fdcfda9e5 100644
--- a/app/Permissions/PermissionApplicator.php
+++ b/app/Permissions/PermissionApplicator.php
@@ -76,12 +76,13 @@ protected function hasEntityPermission(Entity $entity, array $userRoleIds, strin
      * Checks if a user has the given permission for any items in the system.
      * Can be passed an entity instance to filter on a specific type.
      */
-    public function checkUserHasEntityPermissionOnAny(string $action, string $entityClass = ''): bool
+    public function checkUserHasEntityPermissionOnAny(string|Permission $action, string $entityClass = ''): bool
     {
-        $this->ensureValidEntityAction($action);
+        $permissionName = is_string($action) ? $action : $action->value;
+        $this->ensureValidEntityAction($permissionName);
 
         $permissionQuery = EntityPermission::query()
-            ->where($action, '=', true)
+            ->where($permissionName, '=', true)
             ->whereIn('role_id', $this->getCurrentUserRoleIds());
 
         if (!empty($entityClass)) {

From a70c733f2757f8f145fb784b6306e116a4d54fc2 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Wed, 10 Sep 2025 11:36:54 +0100
Subject: [PATCH 665/666] Permissions: Cleanup after review of enum
 implementation PR

---
 app/Activity/Tools/CommentTree.php              |  3 ++-
 app/Activity/Tools/TagClassGenerator.php        |  5 +++--
 app/Entities/Controllers/PageController.php     |  2 +-
 app/Entities/Repos/ChapterRepo.php              |  3 ++-
 app/Entities/Repos/PageRepo.php                 |  9 +++++----
 app/Entities/Tools/Cloner.php                   | 11 ++++++-----
 app/Entities/Tools/PageEditorData.php           |  5 +++--
 app/Entities/Tools/PermissionsUpdater.php       |  2 +-
 app/Exports/ImportRepo.php                      |  5 +++--
 app/Exports/ZipExports/ZipExportReferences.php  |  3 ++-
 app/Exports/ZipExports/ZipImportRunner.php      | 11 ++++++-----
 app/Sorting/BookSorter.php                      | 17 +++++++++--------
 .../Controllers/DrawioImageController.php       |  2 +-
 app/Users/Controllers/UserAccountController.php |  8 ++++----
 app/Users/Controllers/UserApiController.php     |  2 +-
 app/Users/Controllers/UserSearchController.php  |  7 ++++---
 resources/views/entities/book-tree.blade.php    |  2 +-
 .../pages/parts/image-manager-form.blade.php    |  2 +-
 resources/views/pages/show.blade.php            |  2 +-
 19 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index af9b7ecb292..66df2943086 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 
 class CommentTree
 {
@@ -70,7 +71,7 @@ public function getCommentNodeForId(int $commentId): ?CommentTreeNode
     public function canUpdateAny(): bool
     {
         foreach ($this->comments as $comment) {
-            if (userCan(\BookStack\Permissions\Permission::CommentUpdate, $comment)) {
+            if (userCan(Permission::CommentUpdate, $comment)) {
                 return true;
             }
         }
diff --git a/app/Activity/Tools/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.php
index 03586eb277f..0f7aa1fe0c4 100644
--- a/app/Activity/Tools/TagClassGenerator.php
+++ b/app/Activity/Tools/TagClassGenerator.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 
 class TagClassGenerator
 {
@@ -26,14 +27,14 @@ public function generate(): array
              array_push($classes, ...$this->generateClassesForTag($tag));
         }
 
-        if ($this->entity instanceof BookChild && userCan(\BookStack\Permissions\Permission::View, $this->entity->book)) {
+        if ($this->entity instanceof BookChild && userCan(Permission::BookView, $this->entity->book)) {
             $bookTags = $this->entity->book->tags;
             foreach ($bookTags as $bookTag) {
                  array_push($classes, ...$this->generateClassesForTag($bookTag, 'book-'));
             }
         }
 
-        if ($this->entity instanceof Page && $this->entity->chapter && userCan(\BookStack\Permissions\Permission::View, $this->entity->chapter)) {
+        if ($this->entity instanceof Page && $this->entity->chapter && userCan(Permission::ChapterView, $this->entity->chapter)) {
             $chapterTags = $this->entity->chapter->tags;
             foreach ($chapterTags as $chapterTag) {
                  array_push($classes, ...$this->generateClassesForTag($chapterTag, 'chapter-'));
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 1fe296537d0..67ecb0bb377 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -342,7 +342,7 @@ public function destroyDraft(string $bookSlug, int $pageId)
 
         $this->showSuccessNotification(trans('entities.pages_delete_draft_success'));
 
-        if ($chapter && userCan(\BookStack\Permissions\Permission::View, $chapter)) {
+        if ($chapter && userCan(Permission::ChapterView, $chapter)) {
             return redirect($chapter->getUrl());
         }
 
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 10b9697ed13..5d4b5297841 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -11,6 +11,7 @@
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\Util\DatabaseTransaction;
 use Exception;
 
@@ -87,7 +88,7 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
             throw new MoveOperationException('Book to move chapter into not found');
         }
 
-        if (!userCan(\BookStack\Permissions\Permission::ChapterCreate, $parent)) {
+        if (!userCan(Permission::ChapterCreate, $parent)) {
             throw new PermissionsException('User does not have permission to create a chapter within the chosen book');
         }
 
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 4a9efd31dae..76377f9a6dd 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -16,6 +16,7 @@
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use BookStack\Util\DatabaseTransaction;
@@ -55,7 +56,7 @@ public function getNewDraftPage(Entity $parent)
         }
 
         $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
-        if ($defaultTemplate && userCan(\BookStack\Permissions\Permission::View, $defaultTemplate)) {
+        if ($defaultTemplate && userCan(Permission::PageView, $defaultTemplate)) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
                 'markdown' => $defaultTemplate->markdown,
@@ -142,7 +143,7 @@ public function update(Page $page, array $input): Page
 
     protected function updateTemplateStatusAndContentFromInput(Page $page, array $input): void
     {
-        if (isset($input['template']) && userCan(\BookStack\Permissions\Permission::TemplatesManage)) {
+        if (isset($input['template']) && userCan(Permission::TemplatesManage)) {
             $page->template = ($input['template'] === 'true');
         }
 
@@ -165,7 +166,7 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
             $pageContent->setNewHTML($input['html'], user());
         }
 
-        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(\BookStack\Permissions\Permission::EditorChange)) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan(Permission::EditorChange)) {
             $page->editor = $newEditor->value;
         } elseif (empty($page->editor)) {
             $page->editor = $defaultEditor->value;
@@ -271,7 +272,7 @@ public function move(Page $page, string $parentIdentifier): Entity
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
-        if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
+        if (!userCan(Permission::PageCreate, $parent)) {
             throw new PermissionsException('User does not have permission to create a page within the new parent');
         }
 
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 0af25a2c129..05618fef461 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -12,6 +12,7 @@
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\UploadedFile;
@@ -49,7 +50,7 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
 
         $copyChapter = $this->chapterRepo->create($chapterDetails, $parent);
 
-        if (userCan(\BookStack\Permissions\Permission::PageCreate, $copyChapter)) {
+        if (userCan(Permission::PageCreate, $copyChapter)) {
             /** @var Page $page */
             foreach ($original->getVisiblePages() as $page) {
                 $this->clonePage($page, $copyChapter, $page->name);
@@ -61,7 +62,7 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
 
     /**
      * Clone the given book.
-     * Clones all child chapters & pages.
+     * Clones all child chapters and pages.
      */
     public function cloneBook(Book $original, string $newName): Book
     {
@@ -74,11 +75,11 @@ public function cloneBook(Book $original, string $newName): Book
         // Clone contents
         $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
-            if ($child instanceof Chapter && userCan(\BookStack\Permissions\Permission::ChapterCreate, $copyBook)) {
+            if ($child instanceof Chapter && userCan(Permission::ChapterCreate, $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
             }
 
-            if ($child instanceof Page && !$child->draft && userCan(\BookStack\Permissions\Permission::PageCreate, $copyBook)) {
+            if ($child instanceof Page && !$child->draft && userCan(Permission::PageCreate, $copyBook)) {
                 $this->clonePage($child, $copyBook, $child->name);
             }
         }
@@ -86,7 +87,7 @@ public function cloneBook(Book $original, string $newName): Book
         // Clone bookshelf relationships
         /** @var Bookshelf $shelf */
         foreach ($original->shelves as $shelf) {
-            if (userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf)) {
+            if (userCan(Permission::BookshelfUpdate, $shelf)) {
                 $shelf->appendBook($copyBook);
             }
         }
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index fc32e9a434b..b41b319095e 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
+use BookStack\Permissions\Permission;
 
 class PageEditorData
 {
@@ -98,9 +99,9 @@ protected function getEditorType(Page $page): PageEditorType
     {
         $editorType = PageEditorType::forPage($page) ?: PageEditorType::getSystemDefault();
 
-        // Use requested editor if valid and if we have permission
+        // Use the requested editor if valid and if we have permission
         $requestedType = PageEditorType::fromRequestValue($this->requestedEditor);
-        if ($requestedType && userCan(\BookStack\Permissions\Permission::EditorChange)) {
+        if ($requestedType && userCan(Permission::EditorChange)) {
             $editorType = $requestedType;
         }
 
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index fbf92e2033e..fa9ae753c51 100644
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -150,7 +150,7 @@ public function updateBookPermissionsFromShelf(Bookshelf $shelf, $checkUserPermi
 
         /** @var Book $book */
         foreach ($shelfBooks as $book) {
-            if ($checkUserPermissions && !userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book)) {
+            if ($checkUserPermissions && !userCan(Permission::RestrictionsManage, $book)) {
                 continue;
             }
             $book->permissions()->delete();
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 071fa532cbd..79db69fca8f 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -16,6 +16,7 @@
 use BookStack\Exports\ZipExports\ZipExportValidator;
 use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\FileStorage;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -46,7 +47,7 @@ public function queryVisible(): Builder
     {
         $query = Import::query();
 
-        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
+        if (!userCan(Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
@@ -57,7 +58,7 @@ public function findVisible(int $id): Import
     {
         $query = Import::query();
 
-        if (!userCan(\BookStack\Permissions\Permission::SettingsManage)) {
+        if (!userCan(Permission::SettingsManage)) {
             $query->where('created_by', user()->id);
         }
 
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index 621076acc95..64107cf21aa 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -12,6 +12,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
 
@@ -135,7 +136,7 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
             // Find and include images if in visibility
             $page = $model->getPage();
             $pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);
-            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(\BookStack\Permissions\Permission::View, $page))) {
+            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(Permission::PageView, $page))) {
                 if (!isset($this->images[$model->id])) {
                     $exportImage = ZipExportImage::fromModel($model, $files);
                     $this->images[$model->id] = $exportImage;
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index 09a946609c8..eafb527e87e 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -18,6 +18,7 @@
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
 use BookStack\Exports\ZipExports\Models\ZipExportTag;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use BookStack\Uploads\FileStorage;
@@ -288,7 +289,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         $attachments = [];
 
         if ($exportModel instanceof ZipExportBook) {
-            if (!userCan(\BookStack\Permissions\Permission::BookCreateAll)) {
+            if (!userCan(Permission::BookCreateAll)) {
                 $errors[] = trans('errors.import_perms_books');
             }
             array_push($pages, ...$exportModel->pages);
@@ -317,11 +318,11 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
 
         if (count($pages) > 0) {
             if ($parent) {
-                if (!userCan(\BookStack\Permissions\Permission::PageCreate, $parent)) {
+                if (!userCan(Permission::PageCreate, $parent)) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
             } else {
-                $hasPermission = userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn);
+                $hasPermission = userCan(Permission::PageCreateAll) || userCan(Permission::PageCreateOwn);
                 if (!$hasPermission) {
                     $errors[] = trans('errors.import_perms_pages');
                 }
@@ -329,13 +330,13 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
         }
 
         if (count($images) > 0) {
-            if (!userCan(\BookStack\Permissions\Permission::ImageCreateAll)) {
+            if (!userCan(Permission::ImageCreateAll)) {
                 $errors[] = trans('errors.import_perms_images');
             }
         }
 
         if (count($attachments) > 0) {
-            if (!userCan(\BookStack\Permissions\Permission::AttachmentCreateAll)) {
+            if (!userCan(Permission::AttachmentCreateAll)) {
                 $errors[] = trans('errors.import_perms_attachments');
             }
         }
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index e1fd17238c0..1152101d293 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -8,6 +8,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Permissions\Permission;
 
 class BookSorter
 {
@@ -187,11 +188,11 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
 
         $hasNewParent = $newBook->id !== $model->book_id || ($model instanceof Page && $model->chapter_id !== ($sortMapItem->parentChapterId ?? 0));
         if ($model instanceof Chapter) {
-            $hasPermission = userCan(\BookStack\Permissions\Permission::BookUpdate, $currentParent)
-                && userCan(\BookStack\Permissions\Permission::BookUpdate, $newBook)
-                && userCan(\BookStack\Permissions\Permission::ChapterUpdate, $model)
-                && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterCreate, $newBook))
-                && (!$hasNewParent || userCan(\BookStack\Permissions\Permission::ChapterDelete, $model));
+            $hasPermission = userCan(Permission::BookUpdate, $currentParent)
+                && userCan(Permission::BookUpdate, $newBook)
+                && userCan(Permission::ChapterUpdate, $model)
+                && (!$hasNewParent || userCan(Permission::ChapterCreate, $newBook))
+                && (!$hasNewParent || userCan(Permission::ChapterDelete, $model));
 
             if (!$hasPermission) {
                 return false;
@@ -210,13 +211,13 @@ protected function isSortChangePermissible(BookSortMapItem $sortMapItem, BookChi
                 return false;
             }
 
-            $hasPageEditPermission = userCan(\BookStack\Permissions\Permission::PageUpdate, $model);
+            $hasPageEditPermission = userCan(Permission::PageUpdate, $model);
             $newParentInRightLocation = ($newParent instanceof Book || ($newParent instanceof Chapter && $newParent->book_id === $newBook->id));
             $newParentPermission = ($newParent instanceof Chapter) ? 'chapter-update' : 'book-update';
             $hasNewParentPermission = userCan($newParentPermission, $newParent);
 
-            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageDelete, $model));
-            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(\BookStack\Permissions\Permission::PageCreate, $newParent));
+            $hasDeletePermissionIfMoving = (!$hasNewParent || userCan(Permission::PageDelete, $model));
+            $hasCreatePermissionIfMoving = (!$hasNewParent || userCan(Permission::PageCreate, $newParent));
 
             $hasPermission = $hasCurrentParentPermission
                 && $newParentInRightLocation
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
index c9b49b8909f..f44acd997d2 100644
--- a/app/Uploads/Controllers/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -82,7 +82,7 @@ public function getAsBase64($id)
             return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
         }
 
-        if ($image->type !== 'drawio' || !userCan(\BookStack\Permissions\Permission::PageView, $image->getPage())) {
+        if ($image->type !== 'drawio' || !userCan(Permission::PageView, $image->getPage())) {
             return $this->jsonError(trans('errors.drawing_data_not_found'), 404);
         }
 
diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index 07e384b3a88..a8baba5294b 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -63,9 +63,9 @@ public function updateProfile(Request $request, ImageRepo $imageRepo)
             'profile_image'    => array_merge(['nullable'], $this->getImageValidationRules()),
         ]);
 
-        $this->userRepo->update($user, $validated, userCan(\BookStack\Permissions\Permission::UsersManage));
+        $this->userRepo->update($user, $validated, userCan(Permission::UsersManage));
 
-        // Save profile image if in request
+        // Save the profile image if in request
         if ($request->hasFile('profile_image')) {
             $imageUpload = $request->file('profile_image');
             $imageRepo->destroyImage($user->avatar);
@@ -74,7 +74,7 @@ public function updateProfile(Request $request, ImageRepo $imageRepo)
             $user->save();
         }
 
-        // Delete the profile image if reset option is in request
+        // Delete the profile image if the reset option is in request
         if ($request->has('profile_image_reset')) {
             $imageRepo->destroyImage($user->avatar);
             $user->image_id = 0;
@@ -219,7 +219,7 @@ public function destroy(Request $request)
         $this->preventAccessInDemoMode();
 
         $requestNewOwnerId = intval($request->get('new_owner_id')) ?: null;
-        $newOwnerId = userCan(\BookStack\Permissions\Permission::UsersManage) ? $requestNewOwnerId : null;
+        $newOwnerId = userCan(Permission::UsersManage) ? $requestNewOwnerId : null;
 
         $this->userRepo->destroy(user(), $newOwnerId);
 
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 28c4a387619..9134b3cc13b 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -125,7 +125,7 @@ public function update(Request $request, string $id)
     {
         $data = $this->validate($request, $this->rules($id)['update']);
         $user = $this->userRepo->getById($id);
-        $this->userRepo->update($user, $data, userCan(\BookStack\Permissions\Permission::UsersManage));
+        $this->userRepo->update($user, $data, userCan(Permission::UsersManage));
         $this->singleFormatter($user);
 
         return response()->json($user);
diff --git a/app/Users/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.php
index a6596046a10..a2543b7eed3 100644
--- a/app/Users/Controllers/UserSearchController.php
+++ b/app/Users/Controllers/UserSearchController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Users\Controllers;
 
 use BookStack\Http\Controller;
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
@@ -15,9 +16,9 @@ class UserSearchController extends Controller
     public function forSelect(Request $request)
     {
         $hasPermission = !user()->isGuest() && (
-            userCan(\BookStack\Permissions\Permission::UsersManage)
-                || userCan(\BookStack\Permissions\Permission::RestrictionsManageOwn)
-                || userCan(\BookStack\Permissions\Permission::RestrictionsManageAll)
+            userCan(Permission::UsersManage)
+                || userCan(Permission::RestrictionsManageOwn)
+                || userCan(Permission::RestrictionsManageAll)
         );
 
         if (!$hasPermission) {
diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.php
index bcc52130671..c95b1eebc43 100644
--- a/resources/views/entities/book-tree.blade.php
+++ b/resources/views/entities/book-tree.blade.php
@@ -5,7 +5,7 @@ class="book-tree mb-xl"
     <h5>{{ trans('entities.books_navigation') }}</h5>
 
     <ul class="sidebar-page-list mt-xs menu entity-list">
-        @if (userCan(\BookStack\Permissions\Permission::View, $book))
+        @if (userCan(\BookStack\Permissions\Permission::BookView, $book))
             <li class="list-item-book book">
                 @include('entities.list-item-basic', ['entity' => $book, 'classes' => ($current->matches($book)? 'selected' : '')])
             </li>
diff --git a/resources/views/pages/parts/image-manager-form.blade.php b/resources/views/pages/parts/image-manager-form.blade.php
index 2850caba9f3..4d675b81e11 100644
--- a/resources/views/pages/parts/image-manager-form.blade.php
+++ b/resources/views/pages/parts/image-manager-form.blade.php
@@ -105,7 +105,7 @@ class="text-neg">{{ $page->name }}</a>
         @if($image->createdBy)
             <div>@icon('user') {{ trans('components.image_uploaded_by', ['userName' => $image->createdBy->name]) }}</div>
         @endif
-        @if(($page = $image->getPage()) && userCan(\BookStack\Permissions\Permission::View, $page))
+        @if(($page = $image->getPage()) && userCan(\BookStack\Permissions\Permission::PageView, $page))
             <div>
                 @icon('page')
                 {!! trans('components.image_uploaded_to', [
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 2216cfd1f9c..fcec901571b 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -146,7 +146,7 @@ class="page-content clearfix">
                     <span>{{ trans('common.edit') }}</span>
                 </a>
             @endif
-            @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny('create', \BookStack\Entities\Models\Chapter::class) || userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn))
+            @if(userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Chapter::class))
                 <a href="{{ $page->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
                     <span>@icon('copy')</span>
                     <span>{{ trans('common.copy') }}</span>

From 08dfff05f4dd00bd155cc68990b997544d713373 Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Thu, 11 Sep 2025 18:58:26 +0100
Subject: [PATCH 666/666] Sponsors: Updated diagrams.net sponsor level

---
 readme.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/readme.md b/readme.md
index 50b9081073e..f4b67992c6c 100644
--- a/readme.md
+++ b/readme.md
@@ -51,46 +51,48 @@ Big thanks to these companies for supporting the project.
 <td align="center"><a href="https://www.federated.computer/bookstack" target="_blank">
     <img width="480" src="https://www.bookstackapp.com/images/sponsors/federated-computer.png" alt="Federated.computer">
 </a></td>
-</tr></tbody></table>
+</tr><tr>
+<td align="center"><a href="https://www.diagrams.net/" target="_blank">
+    <img width="480" src="https://www.bookstackapp.com/images/sponsors/diagramsnet.png" alt="Diagrams.net">
+</a></td>
+</tr>
+</tbody></table>
 
 #### Bronze Sponsors
 
 <table><tbody><tr>
-<td align="center"><a href="https://www.diagrams.net/" target="_blank">
-    <img width="240" src="https://www.bookstackapp.com/images/sponsors/diagramsnet.png" alt="Diagrams.net">
-</a></td>
 <td align="center"><a href="https://cloudabove.com/hosting" target="_blank">
     <img width="200" src="https://www.bookstackapp.com/images/sponsors/cloudabove.png" alt="Cloudabove">
 </a></td>
-</tr><tr>
 <td align="center"><a href="https://www.practicali.be" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/practicali.png" alt="Practicali">
 </a></td>
+</tr><tr>
 <td align="center"><a href="https://www.stellarhosted.com/bookstack/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
 </a></td>
-</tr>
-<tr>
 <td align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/netways.png" alt="NETWAYS Web Services">
 </a></td>
+</tr>
+<tr>
 <td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
     <img width="200" src="https://www.bookstackapp.com/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
 </a></td>
-</tr>
-<tr>
 <td align="center"><a href="https://practinet.be/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
+</tr>
+<tr>
 <td align="center"><a href="https://route4me.com/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
-</tr>
-<tr>
 <td align="center"><a href="https://phamos.eu" target="_blank">
     <img width="136" src="https://www.bookstackapp.com/images/sponsors/phamos.png" alt="phamos">
 </a></td>
-<td align="center"><a href="https://sitespeak.ai/bookstack" target="_blank">
+</tr>
+<tr>
+<td align="center" colspan="2"><a href="https://sitespeak.ai/bookstack" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/sitespeak.png" alt="SiteSpeakAI">
 </a></td>
 </tr>